diff --git a/.github/workflows/release-vscode-companion.yml b/.github/workflows/release-vscode-companion.yml new file mode 100644 index 000000000..97d37f403 --- /dev/null +++ b/.github/workflows/release-vscode-companion.yml @@ -0,0 +1,207 @@ +name: 'Release VSCode IDE Companion' + +on: + workflow_dispatch: + inputs: + version: + description: 'The version to release (e.g., v0.1.11). Required for manual patch releases.' + required: false + type: 'string' + ref: + description: 'The branch or ref (full git sha) to release from.' + required: true + type: 'string' + default: 'main' + dry_run: + description: 'Run a dry-run of the release process; no branches, vsix packages or GitHub releases will be created.' + required: true + type: 'boolean' + default: true + create_preview_release: + description: 'Auto apply the preview release tag, input version is ignored.' + required: false + type: 'boolean' + default: false + force_skip_tests: + description: 'Select to skip the "Run Tests" step in testing. Prod releases should run tests' + required: false + type: 'boolean' + default: false + +concurrency: + group: '${{ github.workflow }}' + cancel-in-progress: false + +jobs: + release-vscode-companion: + 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' + + steps: + - name: 'Checkout' + uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5 + with: + ref: '${{ github.event.inputs.ref || github.sha }}' + fetch-depth: 0 + + - name: 'Set booleans for simplified logic' + env: + CREATE_PREVIEW_RELEASE: '${{ github.event.inputs.create_preview_release }}' + DRY_RUN_INPUT: '${{ github.event.inputs.dry_run }}' + id: 'vars' + run: |- + is_preview="false" + if [[ "${CREATE_PREVIEW_RELEASE}" == "true" ]]; then + is_preview="true" + fi + echo "is_preview=${is_preview}" >> "${GITHUB_OUTPUT}" + + is_dry_run="false" + if [[ "${DRY_RUN_INPUT}" == "true" ]]; then + is_dry_run="true" + fi + echo "is_dry_run=${is_dry_run}" >> "${GITHUB_OUTPUT}" + + - 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 and OVSX' + run: |- + npm install -g @vscode/vsce + npm install -g ovsx + + - name: 'Get the version' + id: 'version' + working-directory: 'packages/vscode-ide-companion' + run: | + # Get the base version from package.json regardless of scenario + BASE_VERSION=$(node -p "require('./package.json').version") + + if [[ "${IS_PREVIEW}" == "true" ]]; then + # Generate preview version with timestamp based on actual package version + TIMESTAMP=$(date +%Y%m%d%H%M%S) + PREVIEW_VERSION="${BASE_VERSION}-preview.${TIMESTAMP}" + RELEASE_TAG="preview.${TIMESTAMP}" + + echo "RELEASE_TAG=${RELEASE_TAG}" >> "$GITHUB_OUTPUT" + echo "RELEASE_VERSION=${PREVIEW_VERSION}" >> "$GITHUB_OUTPUT" + echo "VSCODE_TAG=preview" >> "$GITHUB_OUTPUT" + else + # Use specified version or get from package.json + if [[ -n "${MANUAL_VERSION}" ]]; then + RELEASE_VERSION="${MANUAL_VERSION#v}" # Remove 'v' prefix if present + RELEASE_TAG="${MANUAL_VERSION#v}" # Remove 'v' prefix if present + else + RELEASE_VERSION="${BASE_VERSION}" + RELEASE_TAG="${BASE_VERSION}" + fi + + echo "RELEASE_TAG=${RELEASE_TAG}" >> "$GITHUB_OUTPUT" + echo "RELEASE_VERSION=${RELEASE_VERSION}" >> "$GITHUB_OUTPUT" + echo "VSCODE_TAG=latest" >> "$GITHUB_OUTPUT" + fi + env: + 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' }} + working-directory: 'packages/vscode-ide-companion' + run: | + npm run test:ci + env: + OPENAI_API_KEY: '${{ secrets.OPENAI_API_KEY }}' + OPENAI_BASE_URL: '${{ secrets.OPENAI_BASE_URL }}' + OPENAI_MODEL: '${{ secrets.OPENAI_MODEL }}' + + - name: 'Prepare VSCode Extension' + run: | + # Build and stage the extension + bundled CLI once. + npm --workspace=qwen-code-vscode-ide-companion run prepackage + + - name: 'Package VSIX (dry run)' + if: '${{ steps.vars.outputs.is_dry_run == ''true'' }}' + 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 + else + vsce package --out ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix + fi + + - name: 'Upload VSIX Artifact (dry run)' + if: '${{ steps.vars.outputs.is_dry_run == ''true'' }}' + 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' + if-no-files-found: 'error' + + - name: 'Publish to Microsoft Marketplace' + if: '${{ steps.vars.outputs.is_dry_run == ''false'' }}' + working-directory: 'packages/vscode-ide-companion' + 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 + + - name: 'Publish to OpenVSX' + if: '${{ steps.vars.outputs.is_dry_run == ''false'' }}' + working-directory: 'packages/vscode-ide-companion' + 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 --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 + ovsx publish ../qwen-code-vscode-companion-${{ steps.version.outputs.RELEASE_VERSION }}.vsix --pat "${OVSX_TOKEN}" --tag "${VSCODE_TAG}" + fi + + - name: 'Create Issue on Failure' + if: |- + ${{ failure() }} + env: + GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' + 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')" \ + --body "The VSCode IDE Companion release workflow failed. See the full run for details: ${DETAILS_URL}" diff --git a/README.md b/README.md index 75997c715..43398fac5 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ [![Node.js Version](https://img.shields.io/badge/node-%3E%3D20.0.0-brightgreen.svg)](https://nodejs.org/) [![Downloads](https://img.shields.io/npm/dm/@qwen-code/qwen-code.svg)](https://www.npmjs.com/package/@qwen-code/qwen-code) +QwenLM%2Fqwen-code | Trendshift + **An open-source AI agent that lives in your terminal.** 中文 | diff --git a/docs/developers/_meta.ts b/docs/developers/_meta.ts index 154ce1848..a7a316f77 100644 --- a/docs/developers/_meta.ts +++ b/docs/developers/_meta.ts @@ -19,9 +19,6 @@ export default { tools: 'Tools', - extensions: { - display: 'hidden', - }, examples: { display: 'hidden', }, diff --git a/docs/developers/development/npm.md b/docs/developers/development/npm.md index 76dfb72d4..e0c4068b8 100644 --- a/docs/developers/development/npm.md +++ b/docs/developers/development/npm.md @@ -202,7 +202,7 @@ This is the most critical stage where files are moved and transformed into their - Copies README.md and LICENSE to dist/ - Copies locales folder for internationalization - Creates a clean package.json for distribution with only necessary dependencies - - Includes runtime dependencies like tiktoken + - Keeps distribution dependencies minimal (no bundled runtime deps) - Maintains optional dependencies for node-pty 2. The JavaScript Bundle is Created: diff --git a/docs/developers/extensions/extension.md b/docs/developers/extensions/extension.md deleted file mode 100644 index 0d2e93eb0..000000000 --- a/docs/developers/extensions/extension.md +++ /dev/null @@ -1,158 +0,0 @@ -# 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. - -## Extension management - -We offer a suite of extension management tools using `qwen extensions` commands. - -Note that these commands are not supported from within the CLI, although you can list installed extensions using the `/extensions list` subcommand. - -Note that all of these commands will only be reflected in active CLI sessions on restart. - -### Installing an extension - -You can install an extension using `qwen extensions install` with either a GitHub URL or a local path`. - -Note that we create a copy of the installed extension, so you will need to run `qwen extensions update` to pull in changes from both locally-defined extensions and those on GitHub. - -``` -qwen extensions install https://github.com/qwen-cli-extensions/security -``` - -This will install the Qwen Code Security extension, which offers support for a `/security:analyze` command. - -### Uninstalling an extension - -To uninstall, run `qwen extensions uninstall extension-name`, so, in the case of the install example: - -``` -qwen extensions uninstall qwen-cli-security -``` - -### Disabling an extension - -Extensions are, by default, enabled across all workspaces. You can disable an extension entirely or for specific workspace. - -For example, `qwen extensions disable extension-name` will disable the extension at the user level, so it will be disabled everywhere. `qwen extensions disable extension-name --scope=workspace` will only disable the extension in the current workspace. - -### Enabling an extension - -You can enable extensions using `qwen extensions enable extension-name`. You can also enable an extension for a specific workspace using `qwen extensions enable extension-name --scope=workspace` from within that workspace. - -This is useful if you have an extension disabled at the top-level and only enabled in specific places. - -### Updating an extension - -For extensions installed from a local path or a git repository, you can explicitly update to the latest version (as reflected in the `qwen-extension.json` `version` field) with `qwen extensions update extension-name`. - -You can update all extensions with: - -``` -qwen extensions update --all -``` - -## Extension creation - -We offer commands to make extension development easier. - -### Create a boilerplate extension - -We offer several example extensions `context`, `custom-commands`, `exclude-tools` and `mcp-server`. You can view these examples [here](https://github.com/QwenLM/qwen-code/tree/main/packages/cli/src/commands/extensions/examples). - -To copy one of these examples into a development directory using the type of your choosing, run: - -``` -qwen extensions new path/to/directory custom-commands -``` - -### Link a local extension - -The `qwen extensions link` command will create a symbolic link from the extension installation directory to the development path. - -This is useful so you don't have to run `qwen extensions update` every time you make changes you'd like to test. - -``` -qwen extensions link path/to/directory -``` - -## How it works - -On startup, Qwen Code looks for extensions in `/.qwen/extensions` - -Extensions exist as a directory that contains a `qwen-extension.json` file. For example: - -`/.qwen/extensions/my-extension/qwen-extension.json` - -### `qwen-extension.json` - -The `qwen-extension.json` file contains the configuration for the extension. The file has the following structure: - -```json -{ - "name": "my-extension", - "version": "1.0.0", - "mcpServers": { - "my-server": { - "command": "node my-server.js" - } - }, - "contextFileName": "QWEN.md", - "excludeTools": ["run_shell_command"] -} -``` - -- `name`: The name of the extension. This is used to uniquely identify the extension and for conflict resolution when extension commands have the same name as user or project commands. The name should be lowercase or numbers and use dashes instead of underscores or spaces. This is how users will refer to your extension in the CLI. Note that we expect this name to match the extension directory name. -- `version`: The version of the extension. -- `mcpServers`: A map of MCP servers to configure. The key is the name of the server, and the value is the server configuration. These servers will be loaded on startup just like MCP servers configured in a [`settings.json` file](./cli/configuration.md). If both an extension and a `settings.json` file configure an MCP server with the same name, the server defined in the `settings.json` file takes precedence. - - Note that all MCP server configuration options are supported except for `trust`. -- `contextFileName`: The name of the file that contains the context for the extension. This will be used to load the context from the extension directory. If this property is not used but a `QWEN.md` file is present in your extension directory, then that file will be loaded. -- `excludeTools`: An array of tool names to exclude from the model. You can also specify command-specific restrictions for tools that support it, like the `run_shell_command` tool. For example, `"excludeTools": ["run_shell_command(rm -rf)"]` will block the `rm -rf` command. Note that this differs from the MCP server `excludeTools` functionality, which can be listed in the MCP server config. **Important:** Tools specified in `excludeTools` will be disabled for the entire conversation context and will affect all subsequent queries in the current session. - -When Qwen Code starts, it loads all the extensions and merges their configurations. If there are any conflicts, the workspace configuration takes precedence. - -### Custom commands - -Extensions can provide [custom commands](./cli/commands.md#custom-commands) by placing TOML files in a `commands/` subdirectory within the extension directory. These commands follow the same format as user and project custom commands and use standard naming conventions. - -**Example** - -An extension named `gcp` with the following structure: - -``` -.qwen/extensions/gcp/ -├── qwen-extension.json -└── commands/ - ├── deploy.toml - └── gcs/ - └── sync.toml -``` - -Would provide these commands: - -- `/deploy` - Shows as `[gcp] Custom command from deploy.toml` in help -- `/gcs:sync` - Shows as `[gcp] Custom command from sync.toml` in help - -### Conflict resolution - -Extension commands have the lowest precedence. When a conflict occurs with user or project commands: - -1. **No conflict**: Extension command uses its natural name (e.g., `/deploy`) -2. **With conflict**: Extension command is renamed with the extension prefix (e.g., `/gcp.deploy`) - -For example, if both a user and the `gcp` extension define a `deploy` command: - -- `/deploy` - Executes the user's deploy command -- `/gcp.deploy` - Executes the extension's deploy command (marked with `[gcp]` tag) - -## Variables - -Qwen Code extensions allow variable substitution in `qwen-extension.json`. This can be useful if e.g., you need the current directory to run an MCP server using `"cwd": "${extensionPath}${/}run.ts"`. - -**Supported variables:** - -| variable | description | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `${extensionPath}` | The fully-qualified path of the extension in the user's filesystem e.g., '/Users/username/.qwen/extensions/example-extension'. This will not unwrap symlinks. | -| `${workspacePath}` | The fully-qualified path of the current workspace. | -| `${/} or ${pathSeparator}` | The path separator (differs per OS). | diff --git a/docs/users/_meta.ts b/docs/users/_meta.ts index 2ec43d773..a822e8201 100644 --- a/docs/users/_meta.ts +++ b/docs/users/_meta.ts @@ -20,6 +20,7 @@ export default { }, features: 'Features', configuration: 'Configuration', + extension: 'Extension', reference: 'Reference', support: 'Support', // need refine diff --git a/docs/users/configuration/settings.md b/docs/users/configuration/settings.md index 3ce527bdc..877deeb95 100644 --- a/docs/users/configuration/settings.md +++ b/docs/users/configuration/settings.md @@ -74,9 +74,6 @@ Settings are organized into categories. All settings should be placed within the | `ui.customThemes` | object | Custom theme definitions. | `{}` | | `ui.hideWindowTitle` | boolean | Hide the window title bar. | `false` | | `ui.hideTips` | boolean | Hide helpful tips in the UI. | `false` | -| `ui.hideBanner` | boolean | Hide the application banner. | `false` | -| `ui.hideFooter` | boolean | Hide the footer from the UI. | `false` | -| `ui.showMemoryUsage` | boolean | Display memory usage information in the UI. | `false` | | `ui.showLineNumbers` | boolean | Show line numbers in code blocks in the CLI output. | `true` | | `ui.showCitations` | boolean | Show citations for generated text in the chat. | `true` | | `enableWelcomeBack` | boolean | Show welcome back dialog when returning to a project with conversation history. When enabled, Qwen Code will automatically detect if you're returning to a project with a previously generated project summary (`.qwen/PROJECT_SUMMARY.md`) and show a dialog allowing you to continue your previous conversation or start fresh. This feature integrates with the `/summary` command and quit confirmation dialog. | `true` | @@ -273,7 +270,6 @@ If you are experiencing performance issues with file searching (e.g., with `@` c | `tools.enableToolOutputTruncation` | boolean | Enable truncation of large tool outputs. | `true` | Requires restart: Yes | | `tools.truncateToolOutputThreshold` | number | Truncate tool output if it is larger than this many characters. Applies to Shell, Grep, Glob, ReadFile and ReadManyFiles tools. | `25000` | Requires restart: Yes | | `tools.truncateToolOutputLines` | number | Maximum lines or entries kept when truncating tool output. Applies to Shell, Grep, Glob, ReadFile and ReadManyFiles tools. | `1000` | Requires restart: Yes | -| `tools.autoAccept` | boolean | Controls whether the CLI automatically accepts and executes tool calls that are considered safe (e.g., read-only operations) without explicit user confirmation. If set to `true`, the CLI will bypass the confirmation prompt for tools deemed safe. | `false` | | #### mcp @@ -294,14 +290,14 @@ If you are experiencing performance issues with file searching (e.g., with `@` c 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. 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. | `{}` | +| 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] > @@ -381,7 +377,6 @@ Here is an example of a `settings.json` file with the nested structure, new as o }, "ui": { "theme": "GitHub", - "hideBanner": true, "hideTips": false, "customWittyPhrases": [ "You forget a thousand things every day. Make sure this is one of 'em", diff --git a/docs/users/extension/_meta.ts b/docs/users/extension/_meta.ts new file mode 100644 index 000000000..386bb68fc --- /dev/null +++ b/docs/users/extension/_meta.ts @@ -0,0 +1,9 @@ +export default { + introduction: 'Introduction', + 'getting-start-extensions': { + display: 'hidden', + }, + 'extension-releasing': { + display: 'hidden', + }, +}; diff --git a/docs/developers/extensions/extension-releasing.md b/docs/users/extension/extension-releasing.md similarity index 100% rename from docs/developers/extensions/extension-releasing.md rename to docs/users/extension/extension-releasing.md diff --git a/docs/developers/extensions/getting-started-extensions.md b/docs/users/extension/getting-started-extensions.md similarity index 73% rename from docs/developers/extensions/getting-started-extensions.md rename to docs/users/extension/getting-started-extensions.md index db4ed35fb..a09f74c8e 100644 --- a/docs/developers/extensions/getting-started-extensions.md +++ b/docs/users/extension/getting-started-extensions.md @@ -148,22 +148,107 @@ Custom commands provide a way to create shortcuts for complex prompts. Let's add mkdir -p commands/fs ``` -2. Create a file named `commands/fs/grep-code.toml`: +2. Create a file named `commands/fs/grep-code.md`: + + ```markdown + --- + description: Search for a pattern in code and summarize findings + --- - ```toml - prompt = """ Please summarize the findings for the pattern `{{args}}`. Search Results: !{grep -r {{args}} .} - """ ``` This command, `/fs:grep-code`, will take an argument, run the `grep` shell command with it, and pipe the results into a prompt for summarization. +> **Note:** Commands use Markdown format with optional YAML frontmatter. TOML format is deprecated but still supported for backwards compatibility. + After saving the file, restart the Qwen Code. You can now run `/fs:grep-code "some pattern"` to use your new command. -## Step 5: Add a Custom `QWEN.md` +## Step 5: Add Custom Skills and Subagents (Optional) + +Extensions can also provide custom skills and subagents to extend Qwen Code's capabilities. + +### Adding a Custom Skill + +Skills are model-invoked capabilities that the AI can automatically use when relevant. + +1. Create a `skills` directory with a skill subdirectory: + + ```bash + mkdir -p skills/code-analyzer + ``` + +2. Create a `skills/code-analyzer/SKILL.md` file: + + ```markdown + --- + name: code-analyzer + description: Analyzes code structure and provides insights about complexity, dependencies, and potential improvements + --- + + # Code Analyzer + + ## Instructions + + When analyzing code, focus on: + + - Code complexity and maintainability + - Dependencies and coupling + - Potential performance issues + - Suggestions for improvements + + ## Examples + + - "Analyze the complexity of this function" + - "What are the dependencies of this module?" + ``` + +### Adding a Custom Subagent + +Subagents are specialized AI assistants for specific tasks. + +1. Create an `agents` directory: + + ```bash + mkdir -p agents + ``` + +2. Create an `agents/refactoring-expert.md` file: + + ```markdown + --- + name: refactoring-expert + description: Specialized in code refactoring, improving code structure and maintainability + tools: + - read_file + - write_file + - read_many_files + --- + + You are a refactoring specialist focused on improving code quality. + + Your expertise includes: + + - Identifying code smells and anti-patterns + - Applying SOLID principles + - Improving code readability and maintainability + - Safe refactoring with minimal risk + + For each refactoring task: + + 1. Analyze the current code structure + 2. Identify areas for improvement + 3. Propose refactoring steps + 4. Implement changes incrementally + 5. Verify functionality is preserved + ``` + +After restarting Qwen Code, your custom skills will be available via `/skills` and subagents via `/agents manage`. + +## Step 6: Add a Custom `QWEN.md` You can provide persistent context to the model by adding a `QWEN.md` file to your extension. This is useful for giving the model instructions on how to behave or information about your extension's tools. Note that you may not always need this for extensions built to expose commands and prompts. @@ -194,7 +279,7 @@ You can provide persistent context to the model by adding a `QWEN.md` file to yo Restart the CLI again. The model will now have the context from your `QWEN.md` file in every session where the extension is active. -## Step 6: Releasing Your Extension +## Step 7: Releasing Your Extension Once you are happy with your extension, you can share it with others. The two primary ways of releasing extensions are via a Git repository or through GitHub Releases. Using a public Git repository is the simplest method. @@ -207,6 +292,7 @@ You've successfully created a Qwen Code extension! You learned how to: - Bootstrap a new extension from a template. - Add custom tools with an MCP server. - Create convenient custom commands. +- Add custom skills and subagents. - Provide persistent context to the model. - Link your extension for local development. diff --git a/docs/users/extension/introduction.md b/docs/users/extension/introduction.md new file mode 100644 index 000000000..64bc7bc7d --- /dev/null +++ b/docs/users/extension/introduction.md @@ -0,0 +1,290 @@ +# 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. + +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 + +We offer a suite of extension management tools using both `qwen extensions` CLI commands and `/extensions` slash commands within the interactive CLI. + +### Runtime Extension Management (Slash Commands) + +You can manage extensions at runtime within the interactive CLI using `/extensions` slash commands. These commands support hot-reloading, meaning changes take effect immediately without restarting the application. + +| Command | Description | +| ------------------------------------------------------ | ----------------------------------------------------------------- | +| `/extensions` or `/extensions list` | List all installed extensions with their status | +| `/extensions install ` | Install an extension from a git URL, local path, or marketplace | +| `/extensions uninstall ` | Uninstall an extension | +| `/extensions enable --scope ` | Enable an extension | +| `/extensions disable --scope ` | Disable an extension | +| `/extensions update ` | Update a specific extension | +| `/extensions update --all` | Update all extensions with available updates | +| `/extensions explore [source]` | Open extensions source page(Gemini or ClaudeCode) in your browser | + +### CLI Extension Management + +You can also manage extensions using `qwen extensions` CLI commands. Note that changes made via CLI commands will be reflected in active CLI sessions on restart. + +### Installing an extension + +You can install an extension using `qwen extensions install` from multiple sources: + +#### From Gemini CLI Extensions Marketplace + +Qwen Code fully supports extensions from the [Gemini CLI Extensions Marketplace](https://geminicli.com/extensions/). Simply install them using the git URL: + +```bash +qwen extensions install +``` + +Gemini extensions are automatically converted to Qwen Code format during installation: + +- `gemini-extension.json` is converted to `qwen-extension.json` +- 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 +qwen extensions install https://github.com/github/github-mcp-server +``` + +This will install the github mcp server extension. + +#### From Local Path + +```bash +qwen extensions install /path/to/your/extension +``` + +Note that we create a copy of the installed extension, so you will need to run `qwen extensions update` to pull in changes from both locally-defined extensions and those on GitHub. + +### Uninstalling an extension + +To uninstall, run `qwen extensions uninstall extension-name`, so, in the case of the install example: + +``` +qwen extensions uninstall qwen-cli-security +``` + +### Disabling an extension + +Extensions are, by default, enabled across all workspaces. You can disable an extension entirely or for specific workspace. + +For example, `qwen extensions disable extension-name` will disable the extension at the user level, so it will be disabled everywhere. `qwen extensions disable extension-name --scope=workspace` will only disable the extension in the current workspace. + +### Enabling an extension + +You can enable extensions using `qwen extensions enable extension-name`. You can also enable an extension for a specific workspace using `qwen extensions enable extension-name --scope=workspace` from within that workspace. + +This is useful if you have an extension disabled at the top-level and only enabled in specific places. + +### Updating an extension + +For extensions installed from a local path or a git repository, you can explicitly update to the latest version (as reflected in the `qwen-extension.json` `version` field) with `qwen extensions update extension-name`. + +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` + +Extensions exist as a directory that contains a `qwen-extension.json` file. For example: + +`/.qwen/extensions/my-extension/qwen-extension.json` + +### `qwen-extension.json` + +The `qwen-extension.json` file contains the configuration for the extension. The file has the following structure: + +```json +{ + "name": "my-extension", + "version": "1.0.0", + "mcpServers": { + "my-server": { + "command": "node my-server.js" + } + }, + "contextFileName": "QWEN.md", + "commands": "commands", + "skills": "skills", + "agents": "agents", + "settings": [ + { + "name": "API Key", + "description": "Your API key for the service", + "envVar": "MY_API_KEY", + "sensitive": true + } + ] +} +``` + +- `name`: The name of the extension. This is used to uniquely identify the extension and for conflict resolution when extension commands have the same name as user or project commands. The name should be lowercase or numbers and use dashes instead of underscores or spaces. This is how users will refer to your extension in the CLI. Note that we expect this name to match the extension directory name. +- `version`: The version of the extension. +- `mcpServers`: A map of MCP servers to configure. The key is the name of the server, and the value is the server configuration. These servers will be loaded on startup just like MCP servers configured in a [`settings.json` file](./cli/configuration.md). If both an extension and a `settings.json` file configure an MCP server with the same name, the server defined in the `settings.json` file takes precedence. + - Note that all MCP server configuration options are supported except for `trust`. +- `contextFileName`: The name of the file that contains the context for the extension. This will be used to load the context from the extension directory. If this property is not used but a `QWEN.md` file is present in your extension directory, then that file will be loaded. +- `commands`: The directory containing custom commands (default: `commands`). Commands are `.md` files that define prompts. +- `skills`: The directory containing custom skills (default: `skills`). Skills are discovered automatically and become available via the `/skills` command. +- `agents`: The directory containing custom subagents (default: `agents`). Subagents are `.yaml` or `.md` files that define specialized AI assistants. +- `settings`: An array of settings that the extension requires. When installing, users will be prompted to provide values for these settings. The values are stored securely and passed to MCP servers as environment variables. + - Each setting has the following properties: + - `name`: Display name for the setting + - `description`: A description of what this setting is used for + - `envVar`: The environment variable name that will be set + - `sensitive`: Boolean indicating if the value should be hidden (e.g., API keys, passwords) + +### Managing Extension Settings + +Extensions can require configuration through settings (such as API keys or credentials). These settings can be managed using the `qwen extensions settings` CLI command: + +**Set a setting value:** + +```bash +qwen extensions settings set [--scope user|workspace] +``` + +**List all settings for an extension:** + +```bash +qwen extensions settings list +``` + +**View current values (user and workspace):** + +```bash +qwen extensions settings show +``` + +**Remove a setting value:** + +```bash +qwen extensions settings unset [--scope user|workspace] +``` + +Settings can be configured at two levels: + +- **User level** (default): Settings apply across all projects (`~/.qwen/.env`) +- **Workspace level**: Settings apply only to the current project (`.qwen/.env`) + +Workspace settings take precedence over user settings. Sensitive settings are stored securely and never displayed in plain text. + +When Qwen Code starts, it loads all the extensions and merges their configurations. If there are any conflicts, the workspace configuration takes precedence. + +### Custom commands + +Extensions can provide [custom commands](./cli/commands.md#custom-commands) by placing Markdown files in a `commands/` subdirectory within the extension directory. These commands follow the same format as user and project custom commands and use standard naming conventions. + +> **Note:** The command format has been updated from TOML to Markdown. TOML files are deprecated but still supported. You can migrate existing TOML commands using the automatic migration prompt that appears when TOML files are detected. + +**Example** + +An extension named `gcp` with the following structure: + +``` +.qwen/extensions/gcp/ +├── qwen-extension.json +└── commands/ + ├── deploy.md + └── gcs/ + └── sync.md +``` + +Would provide these commands: + +- `/deploy` - Shows as `[gcp] Custom command from deploy.md` in help +- `/gcs:sync` - Shows as `[gcp] Custom command from sync.md` in help + +### Custom skills + +Extensions can provide custom skills by placing skill files in a `skills/` subdirectory within the extension directory. Each skill should have a `SKILL.md` file with YAML frontmatter defining the skill's name and description. + +**Example** + +``` +.qwen/extensions/my-extension/ +├── qwen-extension.json +└── skills/ + └── pdf-processor/ + └── SKILL.md +``` + +The skill will be available via the `/skills` command when the extension is active. + +### Custom subagents + +Extensions can provide custom subagents by placing agent configuration files in an `agents/` subdirectory within the extension directory. Agents are defined using YAML or Markdown files. + +**Example** + +``` +.qwen/extensions/my-extension/ +├── qwen-extension.json +└── agents/ + └── testing-expert.yaml +``` + +Extension subagents appear in the subagent manager dialog under "Extension Agents" section. + +### Conflict resolution + +Extension commands have the lowest precedence. When a conflict occurs with user or project commands: + +1. **No conflict**: Extension command uses its natural name (e.g., `/deploy`) +2. **With conflict**: Extension command is renamed with the extension prefix (e.g., `/gcp.deploy`) + +For example, if both a user and the `gcp` extension define a `deploy` command: + +- `/deploy` - Executes the user's deploy command +- `/gcp.deploy` - Executes the extension's deploy command (marked with `[gcp]` tag) + +## Variables + +Qwen Code extensions allow variable substitution in `qwen-extension.json`. This can be useful if e.g., you need the current directory to run an MCP server using `"cwd": "${extensionPath}${/}run.ts"`. + +**Supported variables:** + +| variable | description | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `${extensionPath}` | The fully-qualified path of the extension in the user's filesystem e.g., '/Users/username/.qwen/extensions/example-extension'. This will not unwrap symlinks. | +| `${workspacePath}` | The fully-qualified path of the current workspace. | +| `${/} or ${pathSeparator}` | The path separator (differs per OS). | diff --git a/docs/users/features/commands.md b/docs/users/features/commands.md index 5583f3494..1ad7ea1d7 100644 --- a/docs/users/features/commands.md +++ b/docs/users/features/commands.md @@ -121,6 +121,8 @@ Environment Variables: Commands executed via `!` will set the `QWEN_CODE=1` envi Save frequently used prompts as shortcut commands to improve work efficiency and ensure consistency. +> **Note:** Custom commands now use Markdown format with optional YAML frontmatter. TOML format is deprecated but still supported for backwards compatibility. When TOML files are detected, an automatic migration prompt will be displayed. + ### Quick Overview | Function | Description | Advantages | Priority | Applicable Scenarios | @@ -135,14 +137,34 @@ Priority Rules: Project commands > User commands (project command used when name #### File Path to Command Name Mapping Table -| File Location | Generated Command | Example Call | -| ---------------------------- | ----------------- | --------------------- | -| `~/.qwen/commands/test.toml` | `/test` | `/test Parameter` | -| `/git/commit.toml` | `/git:commit` | `/git:commit Message` | +| File Location | Generated Command | Example Call | +| -------------------------- | ----------------- | --------------------- | +| `~/.qwen/commands/test.md` | `/test` | `/test Parameter` | +| `/git/commit.md` | `/git:commit` | `/git:commit Message` | Naming Rules: Path separator (`/` or `\`) converted to colon (`:`) -### TOML File Format Specification +### Markdown File Format Specification (Recommended) + +Custom commands use Markdown files with optional YAML frontmatter: + +```markdown +--- +description: Optional description (displayed in /help) +--- + +Your prompt content here. +Use {{args}} for parameter injection. +``` + +| Field | Required | Description | Example | +| ------------- | -------- | ---------------------------------------- | ------------------------------------------ | +| `description` | Optional | Command description (displayed in /help) | `description: Code analysis tool` | +| Prompt body | Required | Prompt content sent to model | Any Markdown content after the frontmatter | + +### TOML File Format (Deprecated) + +> **Deprecated:** TOML format is still supported but will be removed in a future version. Please migrate to Markdown format. | Field | Required | Description | Example | | ------------- | -------- | ---------------------------------------- | ------------------------------------------ | @@ -191,15 +213,19 @@ Naming Rules: Path separator (`/` or `\`) converted to colon (`:`) Example: Git Commit Message Generation -``` -# git/commit.toml -description = "Generate Commit message based on staged changes" -prompt = """ +````markdown +--- +description: Generate Commit message based on staged changes +--- + Please generate a Commit message based on the following diff: -diff + +```diff !{git diff --staged} -""" ``` +```` + +```` #### 4. File Content Injection (`@{...}`) @@ -212,36 +238,38 @@ diff Example: Code Review Command -``` -# review.toml -description = "Code review based on best practices" -prompt = """ +```markdown +--- +description: Code review based on best practices +--- + Review {{args}}, reference standards: @{docs/code-standards.md} -""" -``` +```` ### Practical Creation Example #### "Pure Function Refactoring" Command Creation Steps Table -| Operation | Command/Code | -| ----------------------------- | ------------------------------------------- | -| 1. Create directory structure | `mkdir -p ~/.qwen/commands/refactor` | -| 2. Create command file | `touch ~/.qwen/commands/refactor/pure.toml` | -| 3. Edit command content | Refer to the complete code below. | -| 4. Test command | `@file.js` → `/refactor:pure` | +| Operation | Command/Code | +| ----------------------------- | ----------------------------------------- | +| 1. Create directory structure | `mkdir -p ~/.qwen/commands/refactor` | +| 2. Create command file | `touch ~/.qwen/commands/refactor/pure.md` | +| 3. Edit command content | Refer to the complete code below. | +| 4. Test command | `@file.js` → `/refactor:pure` | -```# ~/.qwen/commands/refactor/pure.toml -description = "Refactor code to pure function" -prompt = """ - Please analyze code in current context, refactor to pure function. - Requirements: - 1. Provide refactored code - 2. Explain key changes and pure function characteristic implementation - 3. Maintain function unchanged - """ +```markdown +--- +description: Refactor code to pure function +--- + +Please analyze code in current context, refactor to pure function. +Requirements: + +1. Provide refactored code +2. Explain key changes and pure function characteristic implementation +3. Maintain function unchanged ``` ### Custom Command Best Practices Summary diff --git a/docs/users/features/skills.md b/docs/users/features/skills.md index 0e55644ab..d5b1be9e6 100644 --- a/docs/users/features/skills.md +++ b/docs/users/features/skills.md @@ -157,6 +157,18 @@ When `--experimental-skills` is enabled, Qwen Code discovers Skills from: - Personal Skills: `~/.qwen/skills/` - Project Skills: `.qwen/skills/` +- Extension Skills: Skills provided by installed extensions + +### Extension Skills + +Extensions can provide custom skills that become available when the extension is enabled. These skills are stored in the extension's `skills/` directory and follow the same format as personal and project skills. + +Extension skills are automatically discovered and loaded when: + +- The extension is installed and enabled +- The `--experimental-skills` flag is enabled + +To see which extensions provide skills, check the extension's `qwen-extension.json` file for a `skills` field. To view available Skills, ask Qwen Code directly: diff --git a/docs/users/features/sub-agents.md b/docs/users/features/sub-agents.md index 3497df09f..85ca4aff9 100644 --- a/docs/users/features/sub-agents.md +++ b/docs/users/features/sub-agents.md @@ -6,11 +6,11 @@ Subagents are specialized AI assistants that handle specific types of tasks with Subagents are independent AI assistants that: -- **Specialize in specific tasks** - Each Subagent is configured with a focused system prompt for particular types of work -- **Have separate context** - They maintain their own conversation history, separate from your main chat -- **Use controlled tools** - You can configure which tools each Subagent has access to -- **Work autonomously** - Once given a task, they work independently until completion or failure -- **Provide detailed feedback** - You can see their progress, tool usage, and execution statistics in real-time +- **Specialize in specific tasks** - Each Subagent is configured with a focused system prompt for particular types of work +- **Have separate context** - They maintain their own conversation history, separate from your main chat +- **Use controlled tools** - You can configure which tools each Subagent has access to +- **Work autonomously** - Once given a task, they work independently until completion or failure +- **Provide detailed feedback** - You can see their progress, tool usage, and execution statistics in real-time ## Key Benefits @@ -59,7 +59,7 @@ AI: I'll delegate this to your testing specialist Subagents. ### CLI Commands -Subagents are managed through the `/agents` slash command and its subcommands: +Subagents are managed through the `/agents` slash command and its subcommands: **Usage:**：`/agents create`。Creates a new Subagent through a guided step wizard. @@ -67,12 +67,26 @@ Subagents are managed through the `/agents` slash command and its subcommands: ### Storage Locations -Subagents are stored as Markdown files in two locations: +Subagents are stored as Markdown files in multiple locations: -- **Project-level**: `.qwen/agents/` (takes precedence) -- **User-level**: `~/.qwen/agents/` (fallback) +- **Project-level**: `.qwen/agents/` (highest precedence) +- **User-level**: `~/.qwen/agents/` (fallback) +- **Extension-level**: Provided by installed extensions -This allows you to have both project-specific agents and personal agents that work across all projects. +This allows you to have project-specific agents, personal agents that work across all projects, and extension-provided agents that add specialized capabilities. + +### Extension Subagents + +Extensions can provide custom subagents that become available when the extension is enabled. These agents are stored in the extension's `agents/` directory and follow the same format as personal and project agents. + +Extension subagents: + +- Are automatically discovered when the extension is enabled +- Appear in the `/agents manage` dialog under "Extension Agents" section +- Cannot be edited directly (edit the extension source instead) +- Follow the same configuration format as user-defined agents + +To see which extensions provide subagents, check the extension's `qwen-extension.json` file for an `agents` field. ### File Format @@ -398,7 +412,7 @@ description: Helps with testing, documentation, code review, and deployment --- ``` -**Why:** Focused agents produce better results and are easier to maintain. +**Why:** Focused agents produce better results and are easier to maintain. #### Clear Specialization @@ -422,7 +436,7 @@ description: Works on frontend development tasks --- ``` -**Why:** Specific expertise leads to more targeted and effective assistance. +**Why:** Specific expertise leads to more targeted and effective assistance. #### Actionable Descriptions @@ -440,7 +454,7 @@ description: Reviews code for security vulnerabilities, performance issues, and description: A helpful code reviewer ``` -**Why:** Clear descriptions help the main AI choose the right agent for each task. +**Why:** Clear descriptions help the main AI choose the right agent for each task. ### Configuration Best Practices diff --git a/docs/users/reference/keyboard-shortcuts.md b/docs/users/reference/keyboard-shortcuts.md index b029c4a03..46f3c8c42 100644 --- a/docs/users/reference/keyboard-shortcuts.md +++ b/docs/users/reference/keyboard-shortcuts.md @@ -20,6 +20,7 @@ This document lists the available keyboard shortcuts in Qwen Code. | Shortcut | Description | | -------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | | `!` | Toggle shell mode when the input is empty. | +| `?` | Toggle keyboard shortcuts display when the input is empty. | | `\` (at end of line) + `Enter` | Insert a newline. | | `Down Arrow` | Navigate down through the input history. | | `Enter` | Submit the current prompt. | @@ -38,6 +39,7 @@ This document lists the available keyboard shortcuts in Qwen Code. | `Ctrl+Left Arrow` / `Meta+Left Arrow` / `Meta+B` | Move the cursor one word to the left. | | `Ctrl+N` | Navigate down through the input history. | | `Ctrl+P` | Navigate up through the input history. | +| `Ctrl+R` | Reverse search through input/shell history. | | `Ctrl+Right Arrow` / `Meta+Right Arrow` / `Meta+F` | Move the cursor one word to the right. | | `Ctrl+U` | Delete from the cursor to the beginning of the line. | | `Ctrl+V` | Paste clipboard content. If the clipboard contains an image, it will be saved and a reference to it will be inserted in the prompt. | diff --git a/esbuild.config.js b/esbuild.config.js index 9f24d0ba5..12ab39d58 100644 --- a/esbuild.config.js +++ b/esbuild.config.js @@ -33,7 +33,6 @@ const external = [ '@lydell/node-pty-linux-x64', '@lydell/node-pty-win32-arm64', '@lydell/node-pty-win32-x64', - 'tiktoken', ]; esbuild diff --git a/package-lock.json b/package-lock.json index 39d10c131..5641b0bde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@qwen-code/qwen-code", - "version": "0.7.1", + "version": "0.8.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@qwen-code/qwen-code", - "version": "0.7.1", + "version": "0.8.0", "workspaces": [ "packages/*" ], @@ -3876,6 +3876,17 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/prompts": { + "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", @@ -10989,6 +11000,15 @@ "json-buffer": "3.0.1" } }, + "node_modules/kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/ky": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/ky/-/ky-1.8.1.tgz", @@ -13398,6 +13418,19 @@ "dev": true, "license": "MIT" }, + "node_modules/prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "license": "MIT", + "dependencies": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/prop-types": { "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", @@ -14755,6 +14788,12 @@ "url": "https://github.com/steveukx/git-js?sponsor=1" } }, + "node_modules/sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "license": "MIT" + }, "node_modules/slash": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", @@ -15690,12 +15729,6 @@ "tslib": "^2" } }, - "node_modules/tiktoken": { - "version": "1.0.22", - "resolved": "https://registry.npmjs.org/tiktoken/-/tiktoken-1.0.22.tgz", - "integrity": "sha512-PKvy1rVF1RibfF3JlXBSP0Jrcw2uq3yXdgcEXtKTYn3QJ/cBRBHDnrJ5jHky+MENZ6DIPwNUGWpkVx+7joCpNA==", - "license": "MIT" - }, "node_modules/tinybench": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", @@ -17318,7 +17351,7 @@ }, "packages/cli": { "name": "@qwen-code/qwen-code", - "version": "0.7.1", + "version": "0.8.0", "dependencies": { "@google/genai": "1.30.0", "@iarna/toml": "^2.2.5", @@ -17330,7 +17363,6 @@ "comment-json": "^4.2.5", "diff": "^7.0.0", "dotenv": "^17.1.0", - "extract-zip": "^2.0.1", "fzf": "^0.5.2", "glob": "^10.5.0", "highlight.js": "^11.11.1", @@ -17348,7 +17380,6 @@ "string-width": "^7.1.0", "strip-ansi": "^7.1.0", "strip-json-comments": "^3.1.1", - "tar": "^7.5.2", "undici": "^6.22.0", "update-notifier": "^7.3.1", "wrap-ansi": "9.0.2", @@ -17372,7 +17403,6 @@ "@types/react-dom": "^19.1.6", "@types/semver": "^7.7.0", "@types/shell-quote": "^1.7.5", - "@types/tar": "^6.1.13", "@types/yargs": "^17.0.32", "archiver": "^7.0.1", "ink-testing-library": "^4.0.0", @@ -17955,11 +17985,12 @@ }, "packages/core": { "name": "@qwen-code/qwen-code-core", - "version": "0.7.1", + "version": "0.8.0", "hasInstallScript": true, "dependencies": { "@anthropic-ai/sdk": "^0.36.1", "@google/genai": "1.30.0", + "@iarna/toml": "^2.2.5", "@modelcontextprotocol/sdk": "^1.25.1", "@opentelemetry/api": "^1.9.0", "@opentelemetry/exporter-logs-otlp-grpc": "^0.203.0", @@ -17979,6 +18010,7 @@ "chokidar": "^4.0.3", "diff": "^7.0.0", "dotenv": "^17.1.0", + "extract-zip": "^2.0.1", "fast-levenshtein": "^2.0.6", "fast-uri": "^3.0.6", "fdir": "^6.4.6", @@ -17995,10 +18027,11 @@ "open": "^10.1.2", "openai": "5.11.0", "picomatch": "^4.0.1", + "prompts": "^2.4.2", "shell-quote": "^1.8.3", "simple-git": "^3.28.0", "strip-ansi": "^7.1.0", - "tiktoken": "^1.0.21", + "tar": "^7.5.2", "undici": "^6.22.0", "uuid": "^9.0.1", "ws": "^8.18.0" @@ -18010,6 +18043,8 @@ "@types/fast-levenshtein": "^0.0.4", "@types/minimatch": "^5.1.2", "@types/picomatch": "^4.0.1", + "@types/prompts": "^2.4.9", + "@types/tar": "^6.1.13", "@types/ws": "^8.5.10", "msw": "^2.3.4", "typescript": "^5.3.3", @@ -18600,7 +18635,6 @@ "license": "Apache-2.0", "dependencies": { "@modelcontextprotocol/sdk": "^1.25.1", - "tiktoken": "^1.0.21", "zod": "^3.25.0" }, "devDependencies": { @@ -21416,7 +21450,7 @@ }, "packages/test-utils": { "name": "@qwen-code/qwen-code-test-utils", - "version": "0.7.1", + "version": "0.8.0", "dev": true, "license": "Apache-2.0", "devDependencies": { @@ -21428,7 +21462,7 @@ }, "packages/vscode-ide-companion": { "name": "qwen-code-vscode-ide-companion", - "version": "0.7.1", + "version": "0.8.0", "license": "LICENSE", "dependencies": { "@modelcontextprotocol/sdk": "^1.25.1", diff --git a/package.json b/package.json index c39d1cc47..2ce6e8146 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@qwen-code/qwen-code", - "version": "0.7.1", + "version": "0.8.0", "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.7.1" + "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.8.0" }, "scripts": { "start": "cross-env node scripts/start.js", diff --git a/packages/cli/package.json b/packages/cli/package.json index f7b26a605..03e5d90e9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@qwen-code/qwen-code", - "version": "0.7.1", + "version": "0.8.0", "description": "Qwen Code", "repository": { "type": "git", @@ -33,13 +33,13 @@ "dist" ], "config": { - "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.7.1" + "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.8.0" }, "dependencies": { "@google/genai": "1.30.0", "@iarna/toml": "^2.2.5", - "@qwen-code/qwen-code-core": "file:../core", "@modelcontextprotocol/sdk": "^1.25.1", + "@qwen-code/qwen-code-core": "file:../core", "@types/update-notifier": "^6.0.8", "ansi-regex": "^6.2.2", "command-exists": "^1.2.9", @@ -63,9 +63,7 @@ "string-width": "^7.1.0", "strip-ansi": "^7.1.0", "strip-json-comments": "^3.1.1", - "tar": "^7.5.2", "undici": "^6.22.0", - "extract-zip": "^2.0.1", "update-notifier": "^7.3.1", "wrap-ansi": "9.0.2", "yargs": "^17.7.2", @@ -74,6 +72,7 @@ "devDependencies": { "@babel/runtime": "^7.27.6", "@google/gemini-cli-test-utils": "file:../test-utils", + "@qwen-code/qwen-code-test-utils": "file:../test-utils", "@testing-library/react": "^16.3.0", "@types/archiver": "^6.0.3", "@types/command-exists": "^1.2.3", @@ -84,7 +83,6 @@ "@types/react-dom": "^19.1.6", "@types/semver": "^7.7.0", "@types/shell-quote": "^1.7.5", - "@types/tar": "^6.1.13", "@types/yargs": "^17.0.32", "archiver": "^7.0.1", "ink-testing-library": "^4.0.0", @@ -92,8 +90,7 @@ "pretty-format": "^30.0.2", "react-dom": "^19.1.0", "typescript": "^5.3.3", - "vitest": "^3.1.1", - "@qwen-code/qwen-code-test-utils": "file:../test-utils" + "vitest": "^3.1.1" }, "engines": { "node": ">=20" diff --git a/packages/cli/src/acp-integration/acpAgent.ts b/packages/cli/src/acp-integration/acpAgent.ts index 373bf67be..6c40bffee 100644 --- a/packages/cli/src/acp-integration/acpAgent.ts +++ b/packages/cli/src/acp-integration/acpAgent.ts @@ -27,10 +27,8 @@ import { Readable, Writable } from 'node:stream'; import type { LoadedSettings } from '../config/settings.js'; import { SettingScope } from '../config/settings.js'; import { z } from 'zod'; -import { ExtensionStorage, type Extension } from '../config/extension.js'; import type { CliArgs } from '../config/config.js'; import { loadCliConfig } from '../config/config.js'; -import { ExtensionEnablementManager } from '../config/extensions/extensionEnablement.js'; // Import the modular Session class import { Session } from './session/Session.js'; @@ -38,7 +36,6 @@ import { Session } from './session/Session.js'; export async function runAcpAgent( config: Config, settings: LoadedSettings, - extensions: Extension[], argv: CliArgs, ) { const stdout = Writable.toWeb(process.stdout) as WritableStream; @@ -51,8 +48,7 @@ export async function runAcpAgent( console.debug = console.error; new acp.AgentSideConnection( - (client: acp.Client) => - new GeminiAgent(config, settings, extensions, argv, client), + (client: acp.Client) => new GeminiAgent(config, settings, argv, client), stdout, stdin, ); @@ -65,7 +61,6 @@ class GeminiAgent { constructor( private config: Config, private settings: LoadedSettings, - private extensions: Extension[], private argv: CliArgs, private client: acp.Client, ) {} @@ -196,16 +191,7 @@ class GeminiAgent { continue: false, }; - const config = await loadCliConfig( - settings, - this.extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - this.argv.extensions, - ), - argvForSession, - cwd, - ); + const config = await loadCliConfig(settings, argvForSession, cwd); await config.initialize(); return config; diff --git a/packages/cli/src/commands/extensions.test.tsx b/packages/cli/src/commands/extensions.test.tsx new file mode 100644 index 000000000..4499fa1ee --- /dev/null +++ b/packages/cli/src/commands/extensions.test.tsx @@ -0,0 +1,106 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { describe, it, expect } from 'vitest'; +import { extensionsCommand } from './extensions.js'; +import { updateCommand } from './extensions/update.js'; +import { disableCommand } from './extensions/disable.js'; +import { enableCommand } from './extensions/enable.js'; +import { linkCommand } from './extensions/link.js'; +import { newCommand } from './extensions/new.js'; +import yargs from 'yargs'; + +describe('extensions command', () => { + it('should have correct command name', () => { + expect(extensionsCommand.command).toBe('extensions '); + }); + + it('should have a description', () => { + expect(extensionsCommand.describe).toBe('Manage Qwen Code extensions.'); + }); + + it('should require a subcommand', () => { + const parser = yargs([]) + .command(extensionsCommand) + .fail(false) + .locale('en'); + + expect(() => parser.parse('extensions')).toThrow(); + }); + + it('should register install subcommand', () => { + const parser = yargs([]) + .command(extensionsCommand) + .fail(false) + .locale('en'); + + // This should throw as 'install' requires a source argument + expect(() => parser.parse('extensions install')).toThrow( + 'Not enough non-option arguments', + ); + }); + + it('should register uninstall subcommand', () => { + const parser = yargs([]) + .command(extensionsCommand) + .fail(false) + .locale('en'); + + expect(() => parser.parse('extensions uninstall')).toThrow( + 'Not enough non-option arguments', + ); + }); + + it('should register list subcommand', () => { + const parser = yargs([]) + .command(extensionsCommand) + .fail(false) + .locale('en'); + + // list doesn't require arguments, so it should not throw + expect(() => parser.parse('extensions list')).not.toThrow(); + }); + + it('should register update subcommand', () => { + const parser = yargs([]).command(updateCommand).fail(false).locale('en'); + + expect(() => parser.parse('update')).toThrow( + 'Either an extension name or --all must be provided', + ); + }); + + it('should register disable subcommand', () => { + const parser = yargs([]).command(disableCommand).fail(false).locale('en'); + + expect(() => parser.parse('disable')).toThrow( + 'Not enough non-option arguments', + ); + }); + + it('should register enable subcommand', () => { + const parser = yargs([]).command(enableCommand).fail(false).locale('en'); + + expect(() => parser.parse('enable')).toThrow( + 'Not enough non-option arguments', + ); + }); + + it('should register link subcommand', () => { + const parser = yargs([]).command(linkCommand).fail(false).locale('en'); + + expect(() => parser.parse('link')).toThrow( + 'Not enough non-option arguments', + ); + }); + + it('should register new subcommand', async () => { + const parser = yargs([]).command(newCommand).fail(false).locale('en'); + + await expect(parser.parseAsync('new')).rejects.toThrow( + 'Not enough non-option arguments', + ); + }); +}); diff --git a/packages/cli/src/commands/extensions.tsx b/packages/cli/src/commands/extensions.tsx index 12b49e894..a69a1d85b 100644 --- a/packages/cli/src/commands/extensions.tsx +++ b/packages/cli/src/commands/extensions.tsx @@ -13,6 +13,7 @@ import { disableCommand } from './extensions/disable.js'; import { enableCommand } from './extensions/enable.js'; import { linkCommand } from './extensions/link.js'; import { newCommand } from './extensions/new.js'; +import { settingsCommand } from './extensions/settings.js'; export const extensionsCommand: CommandModule = { command: 'extensions ', @@ -27,6 +28,7 @@ export const extensionsCommand: CommandModule = { .command(enableCommand) .command(linkCommand) .command(newCommand) + .command(settingsCommand) .demandCommand(1, 'You need at least one command before continuing.') .version(false), handler: () => { diff --git a/packages/cli/src/commands/extensions/consent.test.ts b/packages/cli/src/commands/extensions/consent.test.ts new file mode 100644 index 000000000..3b9808bc4 --- /dev/null +++ b/packages/cli/src/commands/extensions/consent.test.ts @@ -0,0 +1,243 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { describe, it, expect, vi, beforeEach } from 'vitest'; +import { extensionConsentString, requestConsentOrFail } from './consent.js'; +import type { ExtensionConfig } from '@qwen-code/qwen-code-core'; + +vi.mock('../../i18n/index.js', () => ({ + t: vi.fn((str: string, params?: Record) => { + if (params) { + return Object.entries(params).reduce( + (acc, [key, value]) => acc.replace(`{{${key}}}`, value), + str, + ); + } + return str; + }), +})); + +describe('extensionConsentString', () => { + it('should include extension name', () => { + const config: ExtensionConfig = { + name: 'test-extension', + version: '1.0.0', + }; + + const result = extensionConsentString(config); + + expect(result).toContain('Installing extension "test-extension".'); + }); + + it('should include warning message', () => { + const config: ExtensionConfig = { + name: 'test-extension', + version: '1.0.0', + }; + + const result = extensionConsentString(config); + + expect(result).toContain('Extensions may introduce unexpected behavior'); + }); + + it('should include MCP servers when present', () => { + const config: ExtensionConfig = { + name: 'test-extension', + version: '1.0.0', + mcpServers: { + 'test-server': { + command: 'node', + args: ['server.js'], + }, + }, + }; + + const result = extensionConsentString(config); + + expect(result).toContain( + 'This extension will run the following MCP servers', + ); + expect(result).toContain('test-server'); + expect(result).toContain('local'); + expect(result).toContain('node server.js'); + }); + + it('should include remote MCP servers', () => { + const config: ExtensionConfig = { + name: 'test-extension', + version: '1.0.0', + mcpServers: { + 'remote-server': { + httpUrl: 'https://example.com/mcp', + }, + }, + }; + + const result = extensionConsentString(config); + + expect(result).toContain('remote'); + expect(result).toContain('https://example.com/mcp'); + }); + + it('should include commands when present', () => { + const config: ExtensionConfig = { + name: 'test-extension', + version: '1.0.0', + }; + + const result = extensionConsentString(config, ['command1', 'command2']); + + expect(result).toContain('This extension will add the following commands'); + expect(result).toContain('command1, command2'); + }); + + it('should include context file name when present (string)', () => { + const config: ExtensionConfig = { + name: 'test-extension', + version: '1.0.0', + contextFileName: 'CUSTOM.md', + }; + + const result = extensionConsentString(config); + + expect(result).toContain('CUSTOM.md'); + }); + + it('should include context file name when present (array)', () => { + const config: ExtensionConfig = { + name: 'test-extension', + version: '1.0.0', + contextFileName: ['FILE1.md', 'FILE2.md'], + }; + + const result = extensionConsentString(config); + + expect(result).toContain('FILE1.md, FILE2.md'); + }); + + it('should include skills when present', () => { + const config: ExtensionConfig = { + name: 'test-extension', + version: '1.0.0', + }; + + const result = extensionConsentString( + config, + [], + [ + { + name: 'skill1', + description: 'Skill 1 description', + level: 'extension', + filePath: '/test/skill1', + body: 'skill body', + }, + { + name: 'skill2', + description: 'Skill 2 description', + level: 'extension', + filePath: '/test/skill2', + body: 'skill body', + }, + ], + ); + + expect(result).toContain( + 'This extension will install the following skills', + ); + expect(result).toContain('skill1'); + expect(result).toContain('Skill 1 description'); + }); + + it('should include subagents when present', () => { + const config: ExtensionConfig = { + name: 'test-extension', + version: '1.0.0', + }; + + const result = extensionConsentString( + config, + [], + [], + [ + { + name: 'agent1', + description: 'Agent 1 description', + systemPrompt: 'You are agent1', + level: 'extension', + }, + ], + ); + + expect(result).toContain( + 'This extension will install the following subagents', + ); + expect(result).toContain('agent1'); + expect(result).toContain('Agent 1 description'); + }); +}); + +describe('requestConsentOrFail', () => { + let mockRequestConsent: ReturnType; + + beforeEach(() => { + mockRequestConsent = vi.fn(); + vi.clearAllMocks(); + }); + + it('should do nothing when options is undefined', async () => { + await requestConsentOrFail(mockRequestConsent, undefined); + + expect(mockRequestConsent).not.toHaveBeenCalled(); + }); + + it('should request consent for new extension', async () => { + mockRequestConsent.mockResolvedValueOnce(true); + + await requestConsentOrFail(mockRequestConsent, { + extensionConfig: { name: 'test-extension', version: '1.0.0' }, + }); + + expect(mockRequestConsent).toHaveBeenCalled(); + }); + + it('should throw error when user declines consent', async () => { + mockRequestConsent.mockResolvedValueOnce(false); + + await expect( + requestConsentOrFail(mockRequestConsent, { + extensionConfig: { name: 'test-extension', version: '1.0.0' }, + }), + ).rejects.toThrow('Installation cancelled for "test-extension".'); + }); + + it('should skip consent when consent string is unchanged', async () => { + const extensionConfig: ExtensionConfig = { + name: 'test-extension', + version: '1.0.0', + }; + + await requestConsentOrFail(mockRequestConsent, { + extensionConfig, + previousExtensionConfig: extensionConfig, + }); + + expect(mockRequestConsent).not.toHaveBeenCalled(); + }); + + it('should request consent when commands change', async () => { + mockRequestConsent.mockResolvedValueOnce(true); + + await requestConsentOrFail(mockRequestConsent, { + extensionConfig: { name: 'test-extension', version: '1.0.0' }, + commands: ['command1'], + previousExtensionConfig: { name: 'test-extension', version: '1.0.0' }, + previousCommands: [], + }); + + expect(mockRequestConsent).toHaveBeenCalled(); + }); +}); diff --git a/packages/cli/src/commands/extensions/consent.ts b/packages/cli/src/commands/extensions/consent.ts new file mode 100644 index 000000000..c3da6a282 --- /dev/null +++ b/packages/cli/src/commands/extensions/consent.ts @@ -0,0 +1,211 @@ +import type { + ExtensionConfig, + ExtensionRequestOptions, + SkillConfig, + SubagentConfig, +} from '@qwen-code/qwen-code-core'; +import type { ConfirmationRequest } from '../../ui/types.js'; +import chalk from 'chalk'; +import { t } from '../../i18n/index.js'; + +/** + * Requests consent from the user to perform an action, by reading a Y/n + * character from stdin. + * + * This should not be called from interactive mode as it will break the CLI. + * + * @param consentDescription The description of the thing they will be consenting to. + * @returns boolean, whether they consented or not. + */ +export async function requestConsentNonInteractive( + consentDescription: string, +): Promise { + console.info(consentDescription); + const result = await promptForConsentNonInteractive( + t('Do you want to continue? [Y/n]: '), + ); + return result; +} + +/** + * Requests consent from the user to perform an action, in interactive mode. + * + * This should not be called from non-interactive mode as it will not work. + * + * @param consentDescription The description of the thing they will be consenting to. + * @param addExtensionUpdateConfirmationRequest A function to actually add a prompt to the UI. + * @returns boolean, whether they consented or not. + */ +export async function requestConsentInteractive( + consentDescription: string, + addExtensionUpdateConfirmationRequest: (value: ConfirmationRequest) => void, +): Promise { + return promptForConsentInteractive( + consentDescription + '\n\n' + t('Do you want to continue?'), + addExtensionUpdateConfirmationRequest, + ); +} + +/** + * Asks users a prompt and awaits for a y/n response on stdin. + * + * This should not be called from interactive mode as it will break the CLI. + * + * @param prompt A yes/no prompt to ask the user + * @returns Whether or not the user answers 'y' (yes). Defaults to 'yes' on enter. + */ +async function promptForConsentNonInteractive( + prompt: string, +): Promise { + const readline = await import('node:readline'); + const rl = readline.createInterface({ + input: process.stdin, + output: process.stdout, + }); + + return new Promise((resolve) => { + rl.question(prompt, (answer) => { + rl.close(); + resolve(['y', ''].includes(answer.trim().toLowerCase())); + }); + }); +} + +/** + * Asks users an interactive yes/no prompt. + * + * This should not be called from non-interactive mode as it will break the CLI. + * + * @param prompt A markdown prompt to ask the user + * @param addExtensionUpdateConfirmationRequest Function to update the UI state with the confirmation request. + * @returns Whether or not the user answers yes. + */ +async function promptForConsentInteractive( + prompt: string, + addExtensionUpdateConfirmationRequest: (value: ConfirmationRequest) => void, +): Promise { + return new Promise((resolve) => { + addExtensionUpdateConfirmationRequest({ + prompt, + onConfirm: (resolvedConfirmed) => { + resolve(resolvedConfirmed); + }, + }); + }); +} + +/** + * Builds a consent string for installing an extension based on it's + * extensionConfig. + */ +export function extensionConsentString( + extensionConfig: ExtensionConfig, + commands: string[] = [], + skills: SkillConfig[] = [], + subagents: SubagentConfig[] = [], +): string { + const output: string[] = []; + const mcpServerEntries = Object.entries(extensionConfig.mcpServers || {}); + output.push( + t('Installing extension "{{name}}".', { name: extensionConfig.name }), + ); + output.push( + t( + '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**', + ), + ); + + if (mcpServerEntries.length) { + output.push(t('This extension will run the following MCP servers:')); + for (const [key, mcpServer] of mcpServerEntries) { + const isLocal = !!mcpServer.command; + const source = + mcpServer.httpUrl ?? + `${mcpServer.command || ''}${mcpServer.args ? ' ' + mcpServer.args.join(' ') : ''}`; + output.push( + ` * ${key} (${isLocal ? t('local') : t('remote')}): ${source}`, + ); + } + } + if (commands && commands.length > 0) { + output.push( + t('This extension will add the following commands: {{commands}}.', { + commands: commands.join(', '), + }), + ); + } + if (extensionConfig.contextFileName) { + const fileName = Array.isArray(extensionConfig.contextFileName) + ? extensionConfig.contextFileName.join(', ') + : extensionConfig.contextFileName; + output.push( + t( + 'This extension will append info to your QWEN.md context using {{fileName}}', + { fileName }, + ), + ); + } + if (skills.length > 0) { + output.push(t('This extension will install the following skills:')); + for (const skill of skills) { + output.push(` * ${chalk.bold(skill.name)}: ${skill.description}`); + } + } + if (subagents.length > 0) { + output.push(t('This extension will install the following subagents:')); + for (const subagent of subagents) { + output.push(` * ${chalk.bold(subagent.name)}: ${subagent.description}`); + } + } + return output.join('\n'); +} + +/** + * Requests consent from the user to install an extension (extensionConfig), if + * there is any difference between the consent string for `extensionConfig` and + * `previousExtensionConfig`. + * + * Always requests consent if previousExtensionConfig is null. + * + * Throws if the user does not consent. + */ +export const requestConsentOrFail = async ( + requestConsent: (consent: string) => Promise, + options?: ExtensionRequestOptions, +) => { + if (!options) return; + const { + extensionConfig, + commands = [], + skills = [], + subagents = [], + previousExtensionConfig, + previousCommands = [], + previousSkills = [], + previousSubagents = [], + } = options; + const extensionConsent = extensionConsentString( + extensionConfig, + commands, + skills, + subagents, + ); + if (previousExtensionConfig) { + const previousExtensionConsent = extensionConsentString( + previousExtensionConfig, + previousCommands, + previousSkills, + previousSubagents, + ); + if (previousExtensionConsent === extensionConsent) { + return; + } + } + if (!(await requestConsent(extensionConsent))) { + throw new Error( + t('Installation cancelled for "{{name}}".', { + name: extensionConfig.name, + }), + ); + } +}; diff --git a/packages/cli/src/commands/extensions/disable.test.ts b/packages/cli/src/commands/extensions/disable.test.ts new file mode 100644 index 000000000..7bde3ee0a --- /dev/null +++ b/packages/cli/src/commands/extensions/disable.test.ts @@ -0,0 +1,129 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { + describe, + it, + expect, + vi, + beforeEach, + type MockInstance, +} from 'vitest'; +import { disableCommand, handleDisable } from './disable.js'; +import yargs from 'yargs'; +import { SettingScope } from '../../config/settings.js'; + +const mockDisableExtension = vi.hoisted(() => vi.fn()); + +vi.mock('./utils.js', () => ({ + getExtensionManager: vi.fn().mockResolvedValue({ + disableExtension: mockDisableExtension, + }), +})); + +vi.mock('../../utils/errors.js', () => ({ + getErrorMessage: vi.fn((error: Error) => error.message), +})); + +describe('extensions disable command', () => { + it('should fail if no name is provided', () => { + const validationParser = yargs([]) + .command(disableCommand) + .fail(false) + .locale('en'); + expect(() => validationParser.parse('disable')).toThrow( + 'Not enough non-option arguments: got 0, need at least 1', + ); + }); + + it('should fail if invalid scope is provided', () => { + const validationParser = yargs([]) + .command(disableCommand) + .fail(false) + .locale('en'); + expect(() => + validationParser.parse('disable test-extension --scope=invalid'), + ).toThrow(/Invalid scope: invalid/); + }); + + it('should accept valid scope values', () => { + const parser = yargs([]).command(disableCommand).fail(false).locale('en'); + // Just check that the scope option is recognized, actual execution needs name first + expect(() => + parser.parse('disable my-extension --scope=user'), + ).not.toThrow(); + }); +}); + +describe('handleDisable', () => { + let consoleLogSpy: MockInstance; + let consoleErrorSpy: MockInstance; + let processExitSpy: MockInstance; + + beforeEach(() => { + consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {}); + consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}); + processExitSpy = vi + .spyOn(process, 'exit') + .mockImplementation(() => undefined as never); + vi.clearAllMocks(); + }); + + it('should disable an extension with user scope', async () => { + await handleDisable({ + name: 'test-extension', + scope: 'user', + }); + + expect(mockDisableExtension).toHaveBeenCalledWith( + 'test-extension', + SettingScope.User, + ); + expect(consoleLogSpy).toHaveBeenCalledWith( + 'Extension "test-extension" successfully disabled for scope "user".', + ); + }); + + it('should disable an extension with workspace scope', async () => { + await handleDisable({ + name: 'test-extension', + scope: 'workspace', + }); + + expect(mockDisableExtension).toHaveBeenCalledWith( + 'test-extension', + SettingScope.Workspace, + ); + expect(consoleLogSpy).toHaveBeenCalledWith( + 'Extension "test-extension" successfully disabled for scope "workspace".', + ); + }); + + it('should default to user scope when no scope is provided', async () => { + await handleDisable({ + name: 'test-extension', + }); + + expect(mockDisableExtension).toHaveBeenCalledWith( + 'test-extension', + SettingScope.User, + ); + }); + + it('should handle errors and exit with code 1', async () => { + mockDisableExtension.mockImplementationOnce(() => { + throw new Error('Disable failed'); + }); + + await handleDisable({ + name: 'test-extension', + scope: 'user', + }); + + expect(consoleErrorSpy).toHaveBeenCalledWith('Disable failed'); + expect(processExitSpy).toHaveBeenCalledWith(1); + }); +}); diff --git a/packages/cli/src/commands/extensions/disable.ts b/packages/cli/src/commands/extensions/disable.ts index 0a88ce08f..92ebd6fa8 100644 --- a/packages/cli/src/commands/extensions/disable.ts +++ b/packages/cli/src/commands/extensions/disable.ts @@ -5,24 +5,29 @@ */ import { type CommandModule } from 'yargs'; -import { disableExtension } from '../../config/extension.js'; import { SettingScope } from '../../config/settings.js'; import { getErrorMessage } from '../../utils/errors.js'; +import { getExtensionManager } from './utils.js'; +import { t } from '../../i18n/index.js'; interface DisableArgs { name: string; scope?: string; } -export function handleDisable(args: DisableArgs) { +export async function handleDisable(args: DisableArgs) { + const extensionManager = await getExtensionManager(); try { if (args.scope?.toLowerCase() === 'workspace') { - disableExtension(args.name, SettingScope.Workspace); + extensionManager.disableExtension(args.name, SettingScope.Workspace); } else { - disableExtension(args.name, SettingScope.User); + extensionManager.disableExtension(args.name, SettingScope.User); } console.log( - `Extension "${args.name}" successfully disabled for scope "${args.scope}".`, + t('Extension "{{name}}" successfully disabled for scope "{{scope}}".', { + name: args.name, + scope: args.scope || SettingScope.User, + }), ); } catch (error) { console.error(getErrorMessage(error)); @@ -32,15 +37,15 @@ export function handleDisable(args: DisableArgs) { export const disableCommand: CommandModule = { command: 'disable [--scope] ', - describe: 'Disables an extension.', + describe: t('Disables an extension.'), builder: (yargs) => yargs .positional('name', { - describe: 'The name of the extension to disable.', + describe: t('The name of the extension to disable.'), type: 'string', }) .option('scope', { - describe: 'The scope to disable the extenison in.', + describe: t('The scope to disable the extenison in.'), type: 'string', default: SettingScope.User, }) @@ -52,17 +57,18 @@ export const disableCommand: CommandModule = { .includes((argv.scope as string).toLowerCase()) ) { throw new Error( - `Invalid scope: ${argv.scope}. Please use one of ${Object.values( - SettingScope, - ) - .map((s) => s.toLowerCase()) - .join(', ')}.`, + t('Invalid scope: {{scope}}. Please use one of {{scopes}}.', { + scope: argv.scope as string, + scopes: Object.values(SettingScope) + .map((s) => s.toLowerCase()) + .join(', '), + }), ); } return true; }), - handler: (argv) => { - handleDisable({ + handler: async (argv) => { + await handleDisable({ name: argv['name'] as string, scope: argv['scope'] as string, }); diff --git a/packages/cli/src/commands/extensions/enable.test.ts b/packages/cli/src/commands/extensions/enable.test.ts new file mode 100644 index 000000000..374918e0a --- /dev/null +++ b/packages/cli/src/commands/extensions/enable.test.ts @@ -0,0 +1,136 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { + describe, + it, + expect, + vi, + beforeEach, + type MockInstance, +} from 'vitest'; +import { enableCommand, handleEnable } from './enable.js'; +import yargs from 'yargs'; +import { SettingScope } from '../../config/settings.js'; + +const mockEnableExtension = vi.hoisted(() => vi.fn()); + +vi.mock('./utils.js', () => ({ + getExtensionManager: vi.fn().mockResolvedValue({ + enableExtension: mockEnableExtension, + }), +})); + +vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => { + const actual = + await importOriginal(); + return { + ...actual, + FatalConfigError: class FatalConfigError extends Error { + constructor(message: string) { + super(message); + this.name = 'FatalConfigError'; + } + }, + getErrorMessage: (error: Error) => error.message, + }; +}); + +describe('extensions enable command', () => { + it('should fail if no name is provided', () => { + const validationParser = yargs([]) + .command(enableCommand) + .fail(false) + .locale('en'); + expect(() => validationParser.parse('enable')).toThrow( + 'Not enough non-option arguments: got 0, need at least 1', + ); + }); + + it('should fail if invalid scope is provided', () => { + const validationParser = yargs([]) + .command(enableCommand) + .fail(false) + .locale('en'); + expect(() => + validationParser.parse('enable test-extension --scope=invalid'), + ).toThrow(/Invalid scope: invalid/); + }); + + it('should accept valid scope values', () => { + const parser = yargs([]).command(enableCommand).fail(false).locale('en'); + // Just check that the scope option is recognized, actual execution needs name first + expect(() => + parser.parse('enable my-extension --scope=user'), + ).not.toThrow(); + }); +}); + +describe('handleEnable', () => { + let consoleLogSpy: MockInstance; + + beforeEach(() => { + consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {}); + vi.clearAllMocks(); + }); + + it('should enable an extension with user scope', async () => { + await handleEnable({ + name: 'test-extension', + scope: 'user', + }); + + expect(mockEnableExtension).toHaveBeenCalledWith( + 'test-extension', + SettingScope.User, + ); + expect(consoleLogSpy).toHaveBeenCalledWith( + 'Extension "test-extension" successfully enabled for scope "user".', + ); + }); + + it('should enable an extension with workspace scope', async () => { + await handleEnable({ + name: 'test-extension', + scope: 'workspace', + }); + + expect(mockEnableExtension).toHaveBeenCalledWith( + 'test-extension', + SettingScope.Workspace, + ); + expect(consoleLogSpy).toHaveBeenCalledWith( + 'Extension "test-extension" successfully enabled for scope "workspace".', + ); + }); + + it('should default to user scope when no scope is provided', async () => { + await handleEnable({ + name: 'test-extension', + }); + + expect(mockEnableExtension).toHaveBeenCalledWith( + 'test-extension', + SettingScope.User, + ); + expect(consoleLogSpy).toHaveBeenCalledWith( + 'Extension "test-extension" successfully enabled in all scopes.', + ); + }); + + it('should throw FatalConfigError when enable fails', async () => { + mockEnableExtension.mockImplementationOnce(() => { + throw new Error('Enable failed'); + }); + + await expect( + handleEnable({ + name: 'test-extension', + scope: 'user', + }), + ).rejects.toThrow('Enable failed'); + }); +}); diff --git a/packages/cli/src/commands/extensions/enable.ts b/packages/cli/src/commands/extensions/enable.ts index 7a77112d2..b36e50ac9 100644 --- a/packages/cli/src/commands/extensions/enable.ts +++ b/packages/cli/src/commands/extensions/enable.ts @@ -6,28 +6,36 @@ import { type CommandModule } from 'yargs'; import { FatalConfigError, getErrorMessage } from '@qwen-code/qwen-code-core'; -import { enableExtension } from '../../config/extension.js'; import { SettingScope } from '../../config/settings.js'; +import { getExtensionManager } from './utils.js'; +import { t } from '../../i18n/index.js'; interface EnableArgs { name: string; scope?: string; } -export function handleEnable(args: EnableArgs) { +export async function handleEnable(args: EnableArgs) { + const extensionManager = await getExtensionManager(); + try { if (args.scope?.toLowerCase() === 'workspace') { - enableExtension(args.name, SettingScope.Workspace); + extensionManager.enableExtension(args.name, SettingScope.Workspace); } else { - enableExtension(args.name, SettingScope.User); + extensionManager.enableExtension(args.name, SettingScope.User); } if (args.scope) { console.log( - `Extension "${args.name}" successfully enabled for scope "${args.scope}".`, + t('Extension "{{name}}" successfully enabled for scope "{{scope}}".', { + name: args.name, + scope: args.scope, + }), ); } else { console.log( - `Extension "${args.name}" successfully enabled in all scopes.`, + t('Extension "{{name}}" successfully enabled in all scopes.', { + name: args.name, + }), ); } } catch (error) { @@ -37,16 +45,17 @@ export function handleEnable(args: EnableArgs) { export const enableCommand: CommandModule = { command: 'enable [--scope] ', - describe: 'Enables an extension.', + describe: t('Enables an extension.'), builder: (yargs) => yargs .positional('name', { - describe: 'The name of the extension to enable.', + describe: t('The name of the extension to enable.'), type: 'string', }) .option('scope', { - describe: + describe: t( 'The scope to enable the extenison in. If not set, will be enabled in all scopes.', + ), type: 'string', }) .check((argv) => { @@ -57,17 +66,18 @@ export const enableCommand: CommandModule = { .includes((argv.scope as string).toLowerCase()) ) { throw new Error( - `Invalid scope: ${argv.scope}. Please use one of ${Object.values( - SettingScope, - ) - .map((s) => s.toLowerCase()) - .join(', ')}.`, + t('Invalid scope: {{scope}}. Please use one of {{scopes}}.', { + scope: argv.scope as string, + scopes: Object.values(SettingScope) + .map((s) => s.toLowerCase()) + .join(', '), + }), ); } return true; }), - handler: (argv) => { - handleEnable({ + handler: async (argv) => { + await handleEnable({ name: argv['name'] as string, scope: argv['scope'] as string, }); diff --git a/packages/cli/src/commands/extensions/examples/agent/agents/diary.md b/packages/cli/src/commands/extensions/examples/agent/agents/diary.md new file mode 100644 index 000000000..8c0c76a91 --- /dev/null +++ b/packages/cli/src/commands/extensions/examples/agent/agents/diary.md @@ -0,0 +1,87 @@ +--- +name: diary-writer +description: generate a diary for user +color: yellow +tools: + - Glob + - Grep + - ListFiles + - ReadFile + - ReadManyFiles + - NotebookRead + - WebFetch + - TodoWrite + - WebSearch +modelConfig: + model: qwen3-coder-plus +--- + +You are a personal diary writing assistant who helps users capture their daily experiences, thoughts, and reflections in meaningful journal entries. + +## Core Mission + +Help users create thoughtful, well-structured diary entries that preserve their memories, emotions, and personal growth moments. + +## Writing Style + +**Tone & Voice** + +- Warm, personal, and authentic +- Reflective and introspective +- Supportive without being overly sentimental +- Adapt to user's preferred style (casual, formal, poetic, etc.) + +**Structure Options** + +- Free-form narrative +- Bullet-point highlights +- Gratitude-focused entries +- Goal and achievement tracking +- Emotional processing format + +## Capabilities + +**1. Daily Entry Creation** + +- Transform user's brief notes into full diary entries +- Expand on key moments with descriptive details +- Add context about weather, mood, or setting when relevant +- Include meaningful quotes or observations + +**2. Reflection Prompts** + +- Ask thoughtful questions to deepen entries +- Suggest areas worth exploring further +- Help identify patterns in thoughts and behaviors +- Encourage gratitude and positive reflection + +**3. Memory Enhancement** + +- Help recall specific details from the day +- Connect current events to past experiences +- Highlight personal growth and progress +- Preserve important conversations or interactions + +**4. Organization** + +- Suggest tags or themes for entries +- Create summaries for weekly/monthly reviews +- Track recurring topics or goals +- Maintain consistency in formatting + +## Guidelines + +- **Privacy First**: Treat all content as deeply personal and confidential +- **User's Voice**: Write in a way that sounds like the user, not generic +- **No Judgment**: Accept all emotions and experiences without criticism +- **Encourage Honesty**: Create a safe space for authentic expression +- **Balance**: Mix facts with feelings, events with reflections + +## Output Format + +When creating a diary entry, include: + +1. **Date & Title** (optional creative title) +2. **Main Content** - The narrative or bullet points +3. **Reflection** - A brief closing thought or takeaway +4. **Tags** (optional) - For organization and future reference diff --git a/packages/cli/src/commands/extensions/examples/agent/qwen-extension.json b/packages/cli/src/commands/extensions/examples/agent/qwen-extension.json new file mode 100644 index 000000000..a9a8e8a68 --- /dev/null +++ b/packages/cli/src/commands/extensions/examples/agent/qwen-extension.json @@ -0,0 +1,4 @@ +{ + "name": "agent-example", + "version": "1.0.0" +} diff --git a/packages/cli/src/commands/extensions/examples/custom-commands/commands/fs/grep-code.toml b/packages/cli/src/commands/extensions/examples/commands/commands/fs/grep-code.md similarity index 65% rename from packages/cli/src/commands/extensions/examples/custom-commands/commands/fs/grep-code.toml rename to packages/cli/src/commands/extensions/examples/commands/commands/fs/grep-code.md index 87d957542..cb57c52de 100644 --- a/packages/cli/src/commands/extensions/examples/custom-commands/commands/fs/grep-code.toml +++ b/packages/cli/src/commands/extensions/examples/commands/commands/fs/grep-code.md @@ -1,6 +1,3 @@ -prompt = """ Please summarize the findings for the pattern `{{args}}`. Search Results: -!{grep -r {{args}} .} -""" diff --git a/packages/cli/src/commands/extensions/examples/commands/qwen-extension.json b/packages/cli/src/commands/extensions/examples/commands/qwen-extension.json new file mode 100644 index 000000000..277a40548 --- /dev/null +++ b/packages/cli/src/commands/extensions/examples/commands/qwen-extension.json @@ -0,0 +1,4 @@ +{ + "name": "commands-example", + "version": "1.0.0" +} diff --git a/packages/cli/src/commands/extensions/examples/custom-commands/qwen-extension.json b/packages/cli/src/commands/extensions/examples/custom-commands/qwen-extension.json deleted file mode 100644 index d973ab8fe..000000000 --- a/packages/cli/src/commands/extensions/examples/custom-commands/qwen-extension.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "custom-commands", - "version": "1.0.0" -} diff --git a/packages/cli/src/commands/extensions/examples/exclude-tools/qwen-extension.json b/packages/cli/src/commands/extensions/examples/exclude-tools/qwen-extension.json deleted file mode 100644 index 5023fb7ad..000000000 --- a/packages/cli/src/commands/extensions/examples/exclude-tools/qwen-extension.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "excludeTools", - "version": "1.0.0", - "excludeTools": ["run_shell_command(rm -rf)"] -} diff --git a/packages/cli/src/commands/extensions/examples/mcp-server/package.json b/packages/cli/src/commands/extensions/examples/mcp-server/package.json index d38f7ee99..59c1c45c1 100644 --- a/packages/cli/src/commands/extensions/examples/mcp-server/package.json +++ b/packages/cli/src/commands/extensions/examples/mcp-server/package.json @@ -1,7 +1,7 @@ { "name": "mcp-server-example", "version": "1.0.0", - "description": "Example MCP Server for Gemini CLI Extension", + "description": "Example MCP Server for Qwen Code Extension", "type": "module", "main": "example.js", "scripts": { diff --git a/packages/cli/src/commands/extensions/examples/skills/qwen-extension.json b/packages/cli/src/commands/extensions/examples/skills/qwen-extension.json new file mode 100644 index 000000000..2674ef9e0 --- /dev/null +++ b/packages/cli/src/commands/extensions/examples/skills/qwen-extension.json @@ -0,0 +1,4 @@ +{ + "name": "skills-example", + "version": "1.0.0" +} diff --git a/packages/cli/src/commands/extensions/examples/skills/skills/synonyms/SKILL.md b/packages/cli/src/commands/extensions/examples/skills/skills/synonyms/SKILL.md new file mode 100644 index 000000000..ed2878771 --- /dev/null +++ b/packages/cli/src/commands/extensions/examples/skills/skills/synonyms/SKILL.md @@ -0,0 +1,48 @@ +--- +name: synonyms +description: Generate synonyms for words or phrases. Use this skill when the user needs alternative words with similar meanings, wants to expand vocabulary, or seeks varied expressions for writing. +license: Complete terms in LICENSE.txt +--- + +This skill helps generate synonyms and alternative expressions for given words or phrases. It provides contextually appropriate alternatives to enhance vocabulary and improve writing variety. + +The user provides a word, phrase, or sentence where they need synonym suggestions. They may specify the context, tone, or formality level desired. + +## Synonym Generation Guidelines + +When generating synonyms, consider: + +- **Context**: The specific domain or situation where the word will be used +- **Tone**: Formal, informal, neutral, academic, conversational, etc. +- **Nuance**: Subtle differences in meaning between similar words +- **Register**: Appropriate level of formality for the intended audience + +## Output Format + +For each input word or phrase, provide: + +1. **Direct Synonyms**: Words with nearly identical meanings +2. **Related Alternatives**: Words with similar but slightly different connotations +3. **Context Examples**: Brief usage examples when helpful + +## Best Practices + +- Prioritize commonly used synonyms over obscure alternatives +- Note any subtle differences in meaning or usage +- Consider regional variations when relevant +- Indicate formality levels (formal/informal/neutral) +- Provide multiple options to give users choices + +## Example + +**Input**: "happy" + +**Synonyms**: + +- **Direct**: joyful, cheerful, delighted, pleased, content +- **Informal**: thrilled, stoked, over the moon +- **Formal**: elated, gratified, blissful +- **Subtle variations**: + - _content_ - peaceful satisfaction + - _ecstatic_ - intense, overwhelming happiness + - _cheerful_ - outwardly expressing happiness diff --git a/packages/cli/src/commands/extensions/install.test.ts b/packages/cli/src/commands/extensions/install.test.ts index 17a41d8d9..bb18392bc 100644 --- a/packages/cli/src/commands/extensions/install.test.ts +++ b/packages/cli/src/commands/extensions/install.test.ts @@ -4,30 +4,51 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { describe, it, expect, vi, type MockInstance } from 'vitest'; +import { + describe, + it, + expect, + vi, + beforeEach, + afterEach, + type MockInstance, +} from 'vitest'; import { handleInstall, installCommand } from './install.js'; import yargs from 'yargs'; const mockInstallExtension = vi.hoisted(() => vi.fn()); +const mockRefreshCache = vi.hoisted(() => vi.fn()); +const mockParseInstallSource = vi.hoisted(() => vi.fn()); const mockRequestConsentNonInteractive = vi.hoisted(() => vi.fn()); -const mockStat = vi.hoisted(() => vi.fn()); +const mockRequestConsentOrFail = vi.hoisted(() => vi.fn()); +const mockIsWorkspaceTrusted = vi.hoisted(() => vi.fn()); +const mockLoadSettings = vi.hoisted(() => vi.fn()); -vi.mock('../../config/extension.js', () => ({ - installExtension: mockInstallExtension, +vi.mock('@qwen-code/qwen-code-core', () => ({ + ExtensionManager: vi.fn().mockImplementation(() => ({ + installExtension: mockInstallExtension, + refreshCache: mockRefreshCache, + })), + parseInstallSource: mockParseInstallSource, +})); + +vi.mock('./consent.js', () => ({ requestConsentNonInteractive: mockRequestConsentNonInteractive, + requestConsentOrFail: mockRequestConsentOrFail, +})); + +vi.mock('../../config/trustedFolders.js', () => ({ + isWorkspaceTrusted: mockIsWorkspaceTrusted, +})); + +vi.mock('../../config/settings.js', () => ({ + loadSettings: mockLoadSettings, })); vi.mock('../../utils/errors.js', () => ({ getErrorMessage: vi.fn((error: Error) => error.message), })); -vi.mock('node:fs/promises', () => ({ - stat: mockStat, - default: { - stat: mockStat, - }, -})); - describe('extensions install command', () => { it('should fail if no source is provided', () => { const validationParser = yargs([]) @@ -51,17 +72,21 @@ describe('handleInstall', () => { processSpy = vi .spyOn(process, 'exit') .mockImplementation(() => undefined as never); + mockRefreshCache.mockResolvedValue(undefined); + mockLoadSettings.mockReturnValue({ merged: {} }); + mockIsWorkspaceTrusted.mockReturnValue(true); }); afterEach(() => { - mockInstallExtension.mockClear(); - mockRequestConsentNonInteractive.mockClear(); - mockStat.mockClear(); - vi.resetAllMocks(); + vi.clearAllMocks(); }); it('should install an extension from a http source', async () => { - mockInstallExtension.mockResolvedValue('http-extension'); + mockParseInstallSource.mockResolvedValue({ + type: 'http', + url: 'http://google.com', + }); + mockInstallExtension.mockResolvedValue({ name: 'http-extension' }); await handleInstall({ source: 'http://google.com', @@ -73,7 +98,11 @@ describe('handleInstall', () => { }); it('should install an extension from a https source', async () => { - mockInstallExtension.mockResolvedValue('https-extension'); + mockParseInstallSource.mockResolvedValue({ + type: 'https', + url: 'https://google.com', + }); + mockInstallExtension.mockResolvedValue({ name: 'https-extension' }); await handleInstall({ source: 'https://google.com', @@ -85,7 +114,11 @@ describe('handleInstall', () => { }); it('should install an extension from a git source', async () => { - mockInstallExtension.mockResolvedValue('git-extension'); + mockParseInstallSource.mockResolvedValue({ + type: 'git', + url: 'git@some-url', + }); + mockInstallExtension.mockResolvedValue({ name: 'git-extension' }); await handleInstall({ source: 'git@some-url', @@ -97,7 +130,9 @@ describe('handleInstall', () => { }); it('throws an error from an unknown source', async () => { - mockStat.mockRejectedValue(new Error('ENOENT: no such file or directory')); + mockParseInstallSource.mockRejectedValue( + new Error('Install source not found.'), + ); await handleInstall({ source: 'test://google.com', }); @@ -107,7 +142,11 @@ describe('handleInstall', () => { }); it('should install an extension from a sso source', async () => { - mockInstallExtension.mockResolvedValue('sso-extension'); + mockParseInstallSource.mockResolvedValue({ + type: 'sso', + url: 'sso://google.com', + }); + mockInstallExtension.mockResolvedValue({ name: 'sso-extension' }); await handleInstall({ source: 'sso://google.com', @@ -119,8 +158,12 @@ describe('handleInstall', () => { }); it('should install an extension from a local path', async () => { - mockInstallExtension.mockResolvedValue('local-extension'); - mockStat.mockResolvedValue({}); + mockParseInstallSource.mockResolvedValue({ + type: 'local', + path: '/some/path', + }); + mockInstallExtension.mockResolvedValue({ name: 'local-extension' }); + await handleInstall({ source: '/some/path', }); @@ -131,6 +174,10 @@ describe('handleInstall', () => { }); it('should throw an error if install extension fails', async () => { + mockParseInstallSource.mockResolvedValue({ + type: 'git', + url: 'git@some-url', + }); mockInstallExtension.mockRejectedValue( new Error('Install extension failed'), ); diff --git a/packages/cli/src/commands/extensions/install.ts b/packages/cli/src/commands/extensions/install.ts index 2f1675ff9..6a9ce4929 100644 --- a/packages/cli/src/commands/extensions/install.ts +++ b/packages/cli/src/commands/extensions/install.ts @@ -5,58 +5,72 @@ */ import type { CommandModule } from 'yargs'; + import { - installExtension, - requestConsentNonInteractive, -} from '../../config/extension.js'; -import type { ExtensionInstallMetadata } from '@qwen-code/qwen-code-core'; + ExtensionManager, + parseInstallSource, +} from '@qwen-code/qwen-code-core'; import { getErrorMessage } from '../../utils/errors.js'; -import { stat } from 'node:fs/promises'; +import { isWorkspaceTrusted } from '../../config/trustedFolders.js'; +import { loadSettings } from '../../config/settings.js'; +import { + requestConsentOrFail, + requestConsentNonInteractive, +} from './consent.js'; +import { t } from '../../i18n/index.js'; interface InstallArgs { source: string; ref?: string; autoUpdate?: boolean; + allowPreRelease?: boolean; + consent?: boolean; } export async function handleInstall(args: InstallArgs) { try { - let installMetadata: ExtensionInstallMetadata; - const { source } = args; + const installMetadata = await parseInstallSource(args.source); + if ( - source.startsWith('http://') || - source.startsWith('https://') || - source.startsWith('git@') || - source.startsWith('sso://') + installMetadata.type !== 'git' && + installMetadata.type !== 'github-release' ) { - installMetadata = { - source, - type: 'git', - ref: args.ref, - autoUpdate: args.autoUpdate, - }; - } else { if (args.ref || args.autoUpdate) { throw new Error( - '--ref and --auto-update are not applicable for local extensions.', + t( + '--ref and --auto-update are not applicable for marketplace extensions.', + ), ); } - try { - await stat(source); - installMetadata = { - source, - type: 'local', - }; - } catch { - throw new Error('Install source not found.'); - } } - const name = await installExtension( - installMetadata, - requestConsentNonInteractive, + const requestConsent = args.consent + ? () => Promise.resolve() + : requestConsentOrFail.bind(null, requestConsentNonInteractive); + const workspaceDir = process.cwd(); + const extensionManager = new ExtensionManager({ + workspaceDir, + isWorkspaceTrusted: !!isWorkspaceTrusted( + loadSettings(workspaceDir).merged, + ), + requestConsent, + }); + await extensionManager.refreshCache(); + + const extension = await extensionManager.installExtension( + { + ...installMetadata, + ref: args.ref, + autoUpdate: args.autoUpdate, + allowPreRelease: args.allowPreRelease, + }, + requestConsent, + ); + console.log( + t('Extension "{{name}}" installed successfully and enabled.', { + name: extension.name, + }), ); - console.log(`Extension "${name}" installed successfully and enabled.`); } catch (error) { console.error(getErrorMessage(error)); process.exit(1); @@ -65,25 +79,40 @@ export async function handleInstall(args: InstallArgs) { export const installCommand: CommandModule = { command: 'install ', - describe: 'Installs an extension from a git repository URL or a local path.', + describe: t( + 'Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).', + ), builder: (yargs) => yargs .positional('source', { - describe: 'The github URL or local path of the extension to install.', + describe: t( + 'The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.', + ), type: 'string', demandOption: true, }) .option('ref', { - describe: 'The git ref to install from.', + describe: t('The git ref to install from.'), type: 'string', }) .option('auto-update', { - describe: 'Enable auto-update for this extension.', + describe: t('Enable auto-update for this extension.'), type: 'boolean', }) + .option('pre-release', { + describe: t('Enable pre-release versions for this extension.'), + type: 'boolean', + }) + .option('consent', { + describe: t( + 'Acknowledge the security risks of installing an extension and skip the confirmation prompt.', + ), + type: 'boolean', + default: false, + }) .check((argv) => { if (!argv.source) { - throw new Error('The source argument must be provided.'); + throw new Error(t('The source argument must be provided.')); } return true; }), @@ -92,6 +121,8 @@ export const installCommand: CommandModule = { source: argv['source'] as string, ref: argv['ref'] as string | undefined, autoUpdate: argv['auto-update'] as boolean | undefined, + allowPreRelease: argv['pre-release'] as boolean | undefined, + consent: argv['consent'] as boolean | undefined, }); }, }; diff --git a/packages/cli/src/commands/extensions/link.test.ts b/packages/cli/src/commands/extensions/link.test.ts new file mode 100644 index 000000000..babe4ce90 --- /dev/null +++ b/packages/cli/src/commands/extensions/link.test.ts @@ -0,0 +1,95 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { + describe, + it, + expect, + vi, + beforeEach, + type MockInstance, +} from 'vitest'; +import { linkCommand, handleLink } from './link.js'; +import yargs from 'yargs'; + +const mockInstallExtension = vi.hoisted(() => vi.fn()); + +vi.mock('./utils.js', () => ({ + getExtensionManager: vi.fn().mockResolvedValue({ + installExtension: mockInstallExtension, + }), +})); + +vi.mock('./consent.js', () => ({ + requestConsentNonInteractive: vi.fn().mockResolvedValue(true), + requestConsentOrFail: vi.fn(), +})); + +vi.mock('../../utils/errors.js', () => ({ + getErrorMessage: vi.fn((error: Error) => error.message), +})); + +describe('extensions link command', () => { + it('should fail if no path is provided', () => { + const validationParser = yargs([]) + .command(linkCommand) + .fail(false) + .locale('en'); + expect(() => validationParser.parse('link')).toThrow( + 'Not enough non-option arguments: got 0, need at least 1', + ); + }); + + it('should accept a path argument', () => { + const parser = yargs([]).command(linkCommand).fail(false).locale('en'); + expect(() => parser.parse('link /some/path')).not.toThrow(); + }); +}); + +describe('handleLink', () => { + let consoleLogSpy: MockInstance; + let consoleErrorSpy: MockInstance; + let processExitSpy: MockInstance; + + beforeEach(() => { + consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {}); + consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}); + processExitSpy = vi + .spyOn(process, 'exit') + .mockImplementation(() => undefined as never); + vi.clearAllMocks(); + }); + + it('should link an extension from a local path', async () => { + mockInstallExtension.mockResolvedValueOnce({ name: 'linked-extension' }); + + await handleLink({ + path: '/some/local/path', + }); + + expect(mockInstallExtension).toHaveBeenCalledWith( + { + source: '/some/local/path', + type: 'link', + }, + expect.any(Function), + ); + expect(consoleLogSpy).toHaveBeenCalledWith( + 'Extension "linked-extension" linked successfully and enabled.', + ); + }); + + it('should handle errors and exit with code 1', async () => { + mockInstallExtension.mockRejectedValueOnce(new Error('Link failed')); + + await handleLink({ + path: '/some/local/path', + }); + + expect(consoleErrorSpy).toHaveBeenCalledWith('Link failed'); + expect(processExitSpy).toHaveBeenCalledWith(1); + }); +}); diff --git a/packages/cli/src/commands/extensions/link.ts b/packages/cli/src/commands/extensions/link.ts index 8104e42b9..545899cda 100644 --- a/packages/cli/src/commands/extensions/link.ts +++ b/packages/cli/src/commands/extensions/link.ts @@ -5,13 +5,14 @@ */ import type { CommandModule } from 'yargs'; -import { - installExtension, - requestConsentNonInteractive, -} from '../../config/extension.js'; -import type { ExtensionInstallMetadata } from '@qwen-code/qwen-code-core'; - +import { type ExtensionInstallMetadata } from '@qwen-code/qwen-code-core'; import { getErrorMessage } from '../../utils/errors.js'; +import { + requestConsentNonInteractive, + requestConsentOrFail, +} from './consent.js'; +import { getExtensionManager } from './utils.js'; +import { t } from '../../i18n/index.js'; interface InstallArgs { path: string; @@ -23,12 +24,20 @@ export async function handleLink(args: InstallArgs) { source: args.path, type: 'link', }; - const extensionName = await installExtension( + const extensionManager = await getExtensionManager(); + + const extension = await extensionManager.installExtension( installMetadata, - requestConsentNonInteractive, + requestConsentOrFail.bind(null, requestConsentNonInteractive), ); + if (!extension) { + console.log(t('Link extension failed to install.')); + return; + } console.log( - `Extension "${extensionName}" linked successfully and enabled.`, + t('Extension "{{name}}" linked successfully and enabled.', { + name: extension.name, + }), ); } catch (error) { console.error(getErrorMessage(error)); @@ -38,12 +47,13 @@ export async function handleLink(args: InstallArgs) { export const linkCommand: CommandModule = { command: 'link ', - describe: + describe: t( 'Links an extension from a local path. Updates made to the local path will always be reflected.', + ), builder: (yargs) => yargs .positional('path', { - describe: 'The name of the extension to link.', + describe: t('The name of the extension to link.'), type: 'string', }) .check((_) => true), diff --git a/packages/cli/src/commands/extensions/list.test.ts b/packages/cli/src/commands/extensions/list.test.ts new file mode 100644 index 000000000..8c7a24951 --- /dev/null +++ b/packages/cli/src/commands/extensions/list.test.ts @@ -0,0 +1,91 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { + describe, + it, + expect, + vi, + beforeEach, + type MockInstance, +} from 'vitest'; +import { listCommand, handleList } from './list.js'; +import yargs from 'yargs'; + +const mockGetLoadedExtensions = vi.hoisted(() => vi.fn()); +const mockToOutputString = vi.hoisted(() => vi.fn()); + +vi.mock('./utils.js', () => ({ + getExtensionManager: vi.fn().mockResolvedValue({ + getLoadedExtensions: mockGetLoadedExtensions, + toOutputString: mockToOutputString, + }), + extensionToOutputString: mockToOutputString, +})); + +vi.mock('../../utils/errors.js', () => ({ + getErrorMessage: vi.fn((error: Error) => error.message), +})); + +describe('extensions list command', () => { + it('should parse the list command', () => { + const parser = yargs([]).command(listCommand).fail(false).locale('en'); + expect(() => parser.parse('list')).not.toThrow(); + }); +}); + +describe('handleList', () => { + let consoleLogSpy: MockInstance; + let consoleErrorSpy: MockInstance; + let processExitSpy: MockInstance; + + beforeEach(() => { + consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {}); + consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}); + processExitSpy = vi + .spyOn(process, 'exit') + .mockImplementation(() => undefined as never); + vi.clearAllMocks(); + }); + + it('should display message when no extensions are installed', async () => { + mockGetLoadedExtensions.mockReturnValueOnce([]); + + await handleList(); + + expect(consoleLogSpy).toHaveBeenCalledWith('No extensions installed.'); + }); + + it('should list installed extensions', async () => { + const mockExtensions = [ + { name: 'extension-1', version: '1.0.0' }, + { name: 'extension-2', version: '2.0.0' }, + ]; + mockGetLoadedExtensions.mockReturnValueOnce(mockExtensions); + mockToOutputString.mockImplementation( + (ext) => `${ext.name} (${ext.version})`, + ); + + await handleList(); + + expect(mockGetLoadedExtensions).toHaveBeenCalled(); + expect(mockToOutputString).toHaveBeenCalledTimes(2); + expect(consoleLogSpy).toHaveBeenCalledWith( + 'extension-1 (1.0.0)\n\nextension-2 (2.0.0)', + ); + }); + + it('should handle errors and exit with code 1', async () => { + mockGetLoadedExtensions.mockImplementationOnce(() => { + throw new Error('List failed'); + }); + + await handleList(); + + expect(consoleErrorSpy).toHaveBeenCalledWith('List failed'); + expect(processExitSpy).toHaveBeenCalledWith(1); + }); +}); diff --git a/packages/cli/src/commands/extensions/list.ts b/packages/cli/src/commands/extensions/list.ts index f6689a3c0..6f5653be3 100644 --- a/packages/cli/src/commands/extensions/list.ts +++ b/packages/cli/src/commands/extensions/list.ts @@ -5,19 +5,24 @@ */ import type { CommandModule } from 'yargs'; -import { loadUserExtensions, toOutputString } from '../../config/extension.js'; import { getErrorMessage } from '../../utils/errors.js'; +import { extensionToOutputString, getExtensionManager } from './utils.js'; +import { t } from '../../i18n/index.js'; export async function handleList() { try { - const extensions = loadUserExtensions(); - if (extensions.length === 0) { - console.log('No extensions installed.'); + const extensionManager = await getExtensionManager(); + const extensions = extensionManager.getLoadedExtensions(); + + if (!extensions || extensions.length === 0) { + console.log(t('No extensions installed.')); return; } console.log( extensions - .map((extension, _): string => toOutputString(extension, process.cwd())) + .map((extension, _): string => + extensionToOutputString(extension, extensionManager, process.cwd()), + ) .join('\n\n'), ); } catch (error) { @@ -28,7 +33,7 @@ export async function handleList() { export const listCommand: CommandModule = { command: 'list', - describe: 'Lists installed extensions.', + describe: t('Lists installed extensions.'), builder: (yargs) => yargs, handler: async () => { await handleList(); diff --git a/packages/cli/src/commands/extensions/settings.test.ts b/packages/cli/src/commands/extensions/settings.test.ts new file mode 100644 index 000000000..042965eec --- /dev/null +++ b/packages/cli/src/commands/extensions/settings.test.ts @@ -0,0 +1,345 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { + describe, + it, + expect, + vi, + beforeEach, + type MockInstance, +} from 'vitest'; +import { settingsCommand } from './settings.js'; +import yargs from 'yargs'; + +const mockGetLoadedExtensions = vi.hoisted(() => vi.fn()); +const mockGetScopedEnvContents = vi.hoisted(() => vi.fn()); +const mockUpdateSetting = vi.hoisted(() => vi.fn()); +const mockPromptForSetting = vi.hoisted(() => vi.fn()); + +vi.mock('./utils.js', () => ({ + getExtensionManager: vi.fn().mockResolvedValue({ + getLoadedExtensions: mockGetLoadedExtensions, + }), +})); + +vi.mock('@qwen-code/qwen-code-core', () => ({ + ExtensionSettingScope: { + USER: 'user', + WORKSPACE: 'workspace', + }, + getScopedEnvContents: mockGetScopedEnvContents, + promptForSetting: mockPromptForSetting, + updateSetting: mockUpdateSetting, +})); + +describe('extensions settings command', () => { + it('should fail if no subcommand is provided', () => { + const validationParser = yargs([]) + .command(settingsCommand) + .fail(false) + .locale('en'); + expect(() => validationParser.parse('settings')).toThrow( + 'Not enough non-option arguments: got 0, need at least 1', + ); + }); + + it('should register set subcommand', () => { + const parser = yargs([]).command(settingsCommand).fail(false).locale('en'); + expect(() => parser.parse('settings set')).toThrow( + 'Not enough non-option arguments', + ); + }); + + it('should register list subcommand', () => { + const parser = yargs([]).command(settingsCommand).fail(false).locale('en'); + expect(() => parser.parse('settings list')).toThrow( + 'Not enough non-option arguments', + ); + }); + + it('should accept set command with name and setting', () => { + const parser = yargs([]).command(settingsCommand).fail(false).locale('en'); + expect(() => + parser.parse('settings set my-extension API_KEY'), + ).not.toThrow(); + }); + + it('should accept set command with scope option', () => { + const parser = yargs([]).command(settingsCommand).fail(false).locale('en'); + expect(() => + parser.parse('settings set my-extension API_KEY --scope=workspace'), + ).not.toThrow(); + }); + + it('should fail set command with invalid scope', () => { + const parser = yargs([]).command(settingsCommand).fail(false).locale('en'); + expect(() => + parser.parse('settings set my-extension API_KEY --scope=invalid'), + ).toThrow(); + }); + + it('should accept list command with name', () => { + const parser = yargs([]).command(settingsCommand).fail(false).locale('en'); + expect(() => parser.parse('settings list my-extension')).not.toThrow(); + }); +}); + +describe('settings set handler', () => { + let consoleLogSpy: MockInstance; + + beforeEach(() => { + consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {}); + vi.clearAllMocks(); + }); + + it('should return early if extension manager is not available', async () => { + const { getExtensionManager } = await import('./utils.js'); + vi.mocked(getExtensionManager).mockResolvedValueOnce(null as never); + + const parser = yargs([]).command(settingsCommand); + await parser.parseAsync('settings set my-extension API_KEY'); + + expect(mockUpdateSetting).not.toHaveBeenCalled(); + }); + + it('should return early if no extensions are loaded', async () => { + mockGetLoadedExtensions.mockReturnValueOnce([]); + + const parser = yargs([]).command(settingsCommand); + await parser.parseAsync('settings set my-extension API_KEY'); + + expect(mockUpdateSetting).not.toHaveBeenCalled(); + }); + + it('should log error if extension is not found', async () => { + mockGetLoadedExtensions.mockReturnValueOnce([ + { name: 'other-extension', id: 'other-id', config: {} }, + ]); + + const parser = yargs([]).command(settingsCommand); + await parser.parseAsync('settings set my-extension API_KEY'); + + expect(consoleLogSpy).toHaveBeenCalledWith( + 'Extension "my-extension" not found.', + ); + expect(mockUpdateSetting).not.toHaveBeenCalled(); + }); + + it('should call updateSetting with correct arguments for user scope', async () => { + const mockExtension = { + name: 'my-extension', + id: 'ext-id-123', + config: { name: 'my-extension', settings: [] }, + }; + mockGetLoadedExtensions.mockReturnValueOnce([mockExtension]); + + const parser = yargs([]).command(settingsCommand); + await parser.parseAsync('settings set my-extension API_KEY'); + + expect(mockUpdateSetting).toHaveBeenCalledWith( + mockExtension.config, + mockExtension.id, + 'API_KEY', + mockPromptForSetting, + 'user', + ); + }); + + it('should call updateSetting with workspace scope when specified', async () => { + const mockExtension = { + name: 'my-extension', + id: 'ext-id-123', + config: { name: 'my-extension', settings: [] }, + }; + mockGetLoadedExtensions.mockReturnValueOnce([mockExtension]); + + const parser = yargs([]).command(settingsCommand); + await parser.parseAsync( + 'settings set my-extension API_KEY --scope=workspace', + ); + + expect(mockUpdateSetting).toHaveBeenCalledWith( + mockExtension.config, + mockExtension.id, + 'API_KEY', + mockPromptForSetting, + 'workspace', + ); + }); +}); + +describe('settings list handler', () => { + let consoleLogSpy: MockInstance; + + beforeEach(() => { + consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {}); + vi.clearAllMocks(); + }); + + it('should return early if extension manager is not available', async () => { + const { getExtensionManager } = await import('./utils.js'); + vi.mocked(getExtensionManager).mockResolvedValueOnce(null as never); + + const parser = yargs([]).command(settingsCommand); + await parser.parseAsync('settings list my-extension'); + + expect(mockGetScopedEnvContents).not.toHaveBeenCalled(); + }); + + it('should return early if no extensions are loaded', async () => { + mockGetLoadedExtensions.mockReturnValueOnce([]); + + const parser = yargs([]).command(settingsCommand); + await parser.parseAsync('settings list my-extension'); + + expect(mockGetScopedEnvContents).not.toHaveBeenCalled(); + }); + + it('should log error if extension is not found', async () => { + mockGetLoadedExtensions.mockReturnValueOnce([ + { name: 'other-extension', id: 'other-id', config: {} }, + ]); + + const parser = yargs([]).command(settingsCommand); + await parser.parseAsync('settings list my-extension'); + + expect(consoleLogSpy).toHaveBeenCalledWith( + 'Extension "my-extension" not found.', + ); + }); + + it('should log message if extension has no settings', async () => { + const mockExtension = { + name: 'my-extension', + id: 'ext-id-123', + config: { name: 'my-extension' }, + settings: [], + }; + mockGetLoadedExtensions.mockReturnValueOnce([mockExtension]); + + const parser = yargs([]).command(settingsCommand); + await parser.parseAsync('settings list my-extension'); + + expect(consoleLogSpy).toHaveBeenCalledWith( + 'Extension "my-extension" has no settings to configure.', + ); + }); + + it('should list settings with their values', async () => { + const mockExtension = { + name: 'my-extension', + id: 'ext-id-123', + config: { name: 'my-extension' }, + settings: [ + { + name: 'API Key', + envVar: 'API_KEY', + description: 'Your API key', + sensitive: false, + }, + { + name: 'Secret Token', + envVar: 'SECRET_TOKEN', + description: 'A secret token', + sensitive: true, + }, + ], + }; + mockGetLoadedExtensions.mockReturnValueOnce([mockExtension]); + mockGetScopedEnvContents + .mockResolvedValueOnce({ API_KEY: 'my-api-key' }) // user scope + .mockResolvedValueOnce({}); // workspace scope + + const parser = yargs([]).command(settingsCommand); + await parser.parseAsync('settings list my-extension'); + + expect(consoleLogSpy).toHaveBeenCalledWith('Settings for "my-extension":'); + expect(consoleLogSpy).toHaveBeenCalledWith('\n- API Key (API_KEY)'); + expect(consoleLogSpy).toHaveBeenCalledWith(' Description: Your API key'); + expect(consoleLogSpy).toHaveBeenCalledWith(' Value: my-api-key (user)'); + }); + + it('should show workspace scope for workspace-scoped settings', async () => { + const mockExtension = { + name: 'my-extension', + id: 'ext-id-123', + config: { name: 'my-extension' }, + settings: [ + { + name: 'API Key', + envVar: 'API_KEY', + description: 'Your API key', + sensitive: false, + }, + ], + }; + mockGetLoadedExtensions.mockReturnValueOnce([mockExtension]); + mockGetScopedEnvContents + .mockResolvedValueOnce({ API_KEY: 'user-value' }) // user scope + .mockResolvedValueOnce({ API_KEY: 'workspace-value' }); // workspace scope + + const parser = yargs([]).command(settingsCommand); + await parser.parseAsync('settings list my-extension'); + + // Workspace should override user, and show (workspace) scope + expect(consoleLogSpy).toHaveBeenCalledWith( + ' Value: workspace-value (workspace)', + ); + }); + + it('should show [not set] for undefined settings', async () => { + const mockExtension = { + name: 'my-extension', + id: 'ext-id-123', + config: { name: 'my-extension' }, + settings: [ + { + name: 'API Key', + envVar: 'API_KEY', + description: 'Your API key', + sensitive: false, + }, + ], + }; + mockGetLoadedExtensions.mockReturnValueOnce([mockExtension]); + mockGetScopedEnvContents + .mockResolvedValueOnce({}) // user scope + .mockResolvedValueOnce({}); // workspace scope + + const parser = yargs([]).command(settingsCommand); + await parser.parseAsync('settings list my-extension'); + + expect(consoleLogSpy).toHaveBeenCalledWith(' Value: [not set]'); + }); + + it('should show [value stored in keychain] for sensitive settings', async () => { + const mockExtension = { + name: 'my-extension', + id: 'ext-id-123', + config: { name: 'my-extension' }, + settings: [ + { + name: 'Secret Token', + envVar: 'SECRET_TOKEN', + description: 'A secret token', + sensitive: true, + }, + ], + }; + mockGetLoadedExtensions.mockReturnValueOnce([mockExtension]); + mockGetScopedEnvContents + .mockResolvedValueOnce({ SECRET_TOKEN: 'secret-value' }) // user scope + .mockResolvedValueOnce({}); // workspace scope + + const parser = yargs([]).command(settingsCommand); + await parser.parseAsync('settings list my-extension'); + + expect(consoleLogSpy).toHaveBeenCalledWith( + ' Value: [value stored in keychain] (user)', + ); + }); +}); diff --git a/packages/cli/src/commands/extensions/settings.ts b/packages/cli/src/commands/extensions/settings.ts new file mode 100644 index 000000000..49baf2cc4 --- /dev/null +++ b/packages/cli/src/commands/extensions/settings.ts @@ -0,0 +1,151 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import type { CommandModule } from 'yargs'; +import { getExtensionManager } from './utils.js'; +import { + ExtensionSettingScope, + getScopedEnvContents, + promptForSetting, + updateSetting, +} from '@qwen-code/qwen-code-core'; +import { t } from '../../i18n/index.js'; + +// --- SET COMMAND --- +interface SetArgs { + name: string; + setting: string; + scope: string; +} + +const setCommand: CommandModule = { + command: 'set [--scope] ', + describe: t('Set a specific setting for an extension.'), + builder: (yargs) => + yargs + .positional('name', { + describe: t('Name of the extension to configure.'), + type: 'string', + demandOption: true, + }) + .positional('setting', { + describe: t('The setting to configure (name or env var).'), + type: 'string', + demandOption: true, + }) + .option('scope', { + describe: t('The scope to set the setting in.'), + type: 'string', + choices: ['user', 'workspace'], + default: 'user', + }), + handler: async (args) => { + const { name, setting, scope } = args; + const extensionManager = await getExtensionManager(); + if (!extensionManager) return; + const extensions = extensionManager.getLoadedExtensions(); + if (!extensions || extensions.length === 0) return; + const extension = extensions.find((e) => e.name === name); + if (!extension) { + console.log(t('Extension "{{name}}" not found.', { name })); + return; + } + await updateSetting( + extension.config, + extension.id, + setting, + promptForSetting, + scope as ExtensionSettingScope, + ); + }, +}; + +// --- LIST COMMAND --- +interface ListArgs { + name: string; +} + +const listCommand: CommandModule = { + command: 'list ', + describe: t('List all settings for an extension.'), + builder: (yargs) => + yargs.positional('name', { + describe: t('Name of the extension.'), + type: 'string', + demandOption: true, + }), + handler: async (args) => { + const { name } = args; + const extensionManager = await getExtensionManager(); + if (!extensionManager) return; + const extensions = extensionManager.getLoadedExtensions(); + if (!extensions || extensions.length === 0) return; + const extension = extensions.find((e) => e.name === name); + if (!extension) { + console.log(t('Extension "{{name}}" not found.', { name })); + return; + } + if (!extension || !extension.settings || extension.settings.length === 0) { + console.log( + t('Extension "{{name}}" has no settings to configure.', { name }), + ); + return; + } + + const userSettings = await getScopedEnvContents( + extension.config, + extension.id, + ExtensionSettingScope.USER, + ); + const workspaceSettings = await getScopedEnvContents( + extension.config, + extension.id, + ExtensionSettingScope.WORKSPACE, + ); + const mergedSettings = { ...userSettings, ...workspaceSettings }; + + console.log(t('Settings for "{{name}}":', { name })); + for (const setting of extension.settings) { + const value = mergedSettings[setting.envVar]; + let displayValue: string; + let scopeInfo = ''; + + if (workspaceSettings[setting.envVar] !== undefined) { + scopeInfo = ' ' + t('(workspace)'); + } else if (userSettings[setting.envVar] !== undefined) { + scopeInfo = ' ' + t('(user)'); + } + + if (value === undefined) { + displayValue = t('[not set]'); + } else if (setting.sensitive) { + displayValue = t('[value stored in keychain]'); + } else { + displayValue = value; + } + console.log(` +- ${setting.name} (${setting.envVar})`); + console.log(` ${t('Description:')} ${setting.description}`); + console.log(` ${t('Value:')} ${displayValue}${scopeInfo}`); + } + }, +}; + +// --- SETTINGS COMMAND --- +export const settingsCommand: CommandModule = { + command: 'settings ', + describe: t('Manage extension settings.'), + builder: (yargs) => + yargs + .command(setCommand) + .command(listCommand) + .demandCommand(1, t('You need to specify a command (set or list).')) + .version(false), + handler: () => { + // This handler is not called when a subcommand is provided. + // Yargs will show the help menu. + }, +}; diff --git a/packages/cli/src/commands/extensions/uninstall.ts b/packages/cli/src/commands/extensions/uninstall.ts index d7c131962..980472a68 100644 --- a/packages/cli/src/commands/extensions/uninstall.ts +++ b/packages/cli/src/commands/extensions/uninstall.ts @@ -5,8 +5,15 @@ */ import type { CommandModule } from 'yargs'; -import { uninstallExtension } from '../../config/extension.js'; import { getErrorMessage } from '../../utils/errors.js'; +import { ExtensionManager } from '@qwen-code/qwen-code-core'; +import { + requestConsentNonInteractive, + requestConsentOrFail, +} from './consent.js'; +import { isWorkspaceTrusted } from '../../config/trustedFolders.js'; +import { loadSettings } from '../../config/settings.js'; +import { t } from '../../i18n/index.js'; interface UninstallArgs { name: string; // can be extension name or source URL. @@ -14,8 +21,22 @@ interface UninstallArgs { export async function handleUninstall(args: UninstallArgs) { try { - await uninstallExtension(args.name); - console.log(`Extension "${args.name}" successfully uninstalled.`); + const workspaceDir = process.cwd(); + const extensionManager = new ExtensionManager({ + workspaceDir, + requestConsent: requestConsentOrFail.bind( + null, + requestConsentNonInteractive, + ), + isWorkspaceTrusted: !!isWorkspaceTrusted( + loadSettings(workspaceDir).merged, + ), + }); + await extensionManager.refreshCache(); + await extensionManager.uninstallExtension(args.name, false); + console.log( + t('Extension "{{name}}" successfully uninstalled.', { name: args.name }), + ); } catch (error) { console.error(getErrorMessage(error)); process.exit(1); @@ -24,17 +45,19 @@ export async function handleUninstall(args: UninstallArgs) { export const uninstallCommand: CommandModule = { command: 'uninstall ', - describe: 'Uninstalls an extension.', + describe: t('Uninstalls an extension.'), builder: (yargs) => yargs .positional('name', { - describe: 'The name or source path of the extension to uninstall.', + describe: t('The name or source path of the extension to uninstall.'), type: 'string', }) .check((argv) => { if (!argv.name) { throw new Error( - 'Please include the name of the extension to uninstall as a positional argument.', + t( + 'Please include the name of the extension to uninstall as a positional argument.', + ), ); } return true; diff --git a/packages/cli/src/commands/extensions/update.test.ts b/packages/cli/src/commands/extensions/update.test.ts new file mode 100644 index 000000000..7dfeec1d6 --- /dev/null +++ b/packages/cli/src/commands/extensions/update.test.ts @@ -0,0 +1,262 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { + describe, + it, + expect, + vi, + beforeEach, + type MockInstance, +} from 'vitest'; +import { updateCommand, handleUpdate } from './update.js'; +import yargs from 'yargs'; +import { ExtensionUpdateState } from '../../ui/state/extensions.js'; + +const mockGetLoadedExtensions = vi.hoisted(() => vi.fn()); +const mockUpdateExtension = vi.hoisted(() => vi.fn()); +const mockCheckForAllExtensionUpdates = vi.hoisted(() => vi.fn()); +const mockUpdateAllUpdatableExtensions = vi.hoisted(() => vi.fn()); +const mockCheckForExtensionUpdate = vi.hoisted(() => vi.fn()); + +vi.mock('./utils.js', () => ({ + getExtensionManager: vi.fn().mockResolvedValue({ + getLoadedExtensions: mockGetLoadedExtensions, + updateExtension: mockUpdateExtension, + checkForAllExtensionUpdates: mockCheckForAllExtensionUpdates, + updateAllUpdatableExtensions: mockUpdateAllUpdatableExtensions, + }), +})); + +vi.mock('@qwen-code/qwen-code-core', () => ({ + checkForExtensionUpdate: mockCheckForExtensionUpdate, +})); + +vi.mock('../../utils/errors.js', () => ({ + getErrorMessage: vi.fn((error: Error) => error.message), +})); + +vi.mock('../../ui/state/extensions.js', () => ({ + ExtensionUpdateState: { + UPDATE_AVAILABLE: 'update available', + UP_TO_DATE: 'up to date', + ERROR: 'error', + }, +})); + +describe('extensions update command', () => { + it('should fail if neither name nor --all is provided', () => { + const validationParser = yargs([]) + .command(updateCommand) + .fail(false) + .locale('en'); + expect(() => validationParser.parse('update')).toThrow( + 'Either an extension name or --all must be provided', + ); + }); + + it('should fail if both name and --all are provided', () => { + const validationParser = yargs([]) + .command(updateCommand) + .fail(false) + .locale('en'); + expect(() => validationParser.parse('update test-extension --all')).toThrow( + /Arguments .* are mutually exclusive/, + ); + }); + + it('should accept --all flag', () => { + const parser = yargs([]).command(updateCommand).fail(false).locale('en'); + expect(() => parser.parse('update --all')).not.toThrow(); + }); + + it('should accept an extension name', () => { + const parser = yargs([]).command(updateCommand).fail(false).locale('en'); + expect(() => parser.parse('update test-extension')).not.toThrow(); + }); +}); + +describe('handleUpdate', () => { + let consoleLogSpy: MockInstance; + let consoleErrorSpy: MockInstance; + + beforeEach(() => { + consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {}); + consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}); + vi.clearAllMocks(); + }); + + describe('update by name', () => { + it('should show message when extension is not found', async () => { + mockGetLoadedExtensions.mockReturnValueOnce([]); + + await handleUpdate({ name: 'non-existent-extension' }); + + expect(consoleLogSpy).toHaveBeenCalledWith( + 'Extension "non-existent-extension" not found.', + ); + }); + + it('should show message when extension has no install metadata', async () => { + mockGetLoadedExtensions.mockReturnValueOnce([ + { name: 'test-extension', installMetadata: undefined }, + ]); + + await handleUpdate({ name: 'test-extension' }); + + expect(consoleLogSpy).toHaveBeenCalledWith( + 'Unable to install extension "test-extension" due to missing install metadata', + ); + }); + + it('should show message when extension is already up to date', async () => { + const mockExtension = { + name: 'test-extension', + installMetadata: { source: 'test' }, + }; + mockGetLoadedExtensions.mockReturnValueOnce([mockExtension]); + mockCheckForExtensionUpdate.mockResolvedValueOnce( + ExtensionUpdateState.UP_TO_DATE, + ); + + await handleUpdate({ name: 'test-extension' }); + + expect(consoleLogSpy).toHaveBeenCalledWith( + 'Extension "test-extension" is already up to date.', + ); + }); + + it('should update extension when update is available', async () => { + const mockExtension = { + name: 'test-extension', + installMetadata: { source: 'test' }, + }; + mockGetLoadedExtensions.mockReturnValueOnce([mockExtension]); + mockCheckForExtensionUpdate.mockResolvedValueOnce( + ExtensionUpdateState.UPDATE_AVAILABLE, + ); + mockUpdateExtension.mockResolvedValueOnce({ + name: 'test-extension', + originalVersion: '1.0.0', + updatedVersion: '2.0.0', + }); + + await handleUpdate({ name: 'test-extension' }); + + expect(mockUpdateExtension).toHaveBeenCalledWith( + mockExtension, + ExtensionUpdateState.UPDATE_AVAILABLE, + expect.any(Function), + ); + expect(consoleLogSpy).toHaveBeenCalledWith( + 'Extension "test-extension" successfully updated: 1.0.0 → 2.0.0.', + ); + }); + + it('should show up to date message when versions are the same after update', async () => { + const mockExtension = { + name: 'test-extension', + installMetadata: { source: 'test' }, + }; + mockGetLoadedExtensions.mockReturnValueOnce([mockExtension]); + mockCheckForExtensionUpdate.mockResolvedValueOnce( + ExtensionUpdateState.UPDATE_AVAILABLE, + ); + mockUpdateExtension.mockResolvedValueOnce({ + name: 'test-extension', + originalVersion: '1.0.0', + updatedVersion: '1.0.0', + }); + + await handleUpdate({ name: 'test-extension' }); + + expect(consoleLogSpy).toHaveBeenCalledWith( + 'Extension "test-extension" is already up to date.', + ); + }); + + it('should handle errors during update', async () => { + const mockExtension = { + name: 'test-extension', + installMetadata: { source: 'test' }, + }; + mockGetLoadedExtensions.mockReturnValueOnce([mockExtension]); + mockCheckForExtensionUpdate.mockRejectedValueOnce( + new Error('Update check failed'), + ); + + await handleUpdate({ name: 'test-extension' }); + + expect(consoleErrorSpy).toHaveBeenCalledWith('Update check failed'); + }); + }); + + describe('update all', () => { + it('should show message when no extensions to update', async () => { + mockCheckForAllExtensionUpdates.mockResolvedValueOnce(undefined); + mockUpdateAllUpdatableExtensions.mockResolvedValueOnce([]); + + await handleUpdate({ all: true }); + + expect(consoleLogSpy).toHaveBeenCalledWith('No extensions to update.'); + }); + + it('should update all extensions with updates available', async () => { + mockCheckForAllExtensionUpdates.mockResolvedValueOnce(undefined); + mockUpdateAllUpdatableExtensions.mockResolvedValueOnce([ + { + name: 'extension-1', + originalVersion: '1.0.0', + updatedVersion: '2.0.0', + }, + { + name: 'extension-2', + originalVersion: '1.0.0', + updatedVersion: '1.5.0', + }, + ]); + + await handleUpdate({ all: true }); + + expect(consoleLogSpy).toHaveBeenCalledWith( + 'Extension "extension-1" successfully updated: 1.0.0 → 2.0.0.\n' + + 'Extension "extension-2" successfully updated: 1.0.0 → 1.5.0.', + ); + }); + + it('should filter out extensions with same version after update', async () => { + mockCheckForAllExtensionUpdates.mockResolvedValueOnce(undefined); + mockUpdateAllUpdatableExtensions.mockResolvedValueOnce([ + { + name: 'extension-1', + originalVersion: '1.0.0', + updatedVersion: '2.0.0', + }, + { + name: 'extension-2', + originalVersion: '1.0.0', + updatedVersion: '1.0.0', + }, + ]); + + await handleUpdate({ all: true }); + + expect(consoleLogSpy).toHaveBeenCalledWith( + 'Extension "extension-1" successfully updated: 1.0.0 → 2.0.0.', + ); + }); + + it('should handle errors during update all', async () => { + mockCheckForAllExtensionUpdates.mockRejectedValueOnce( + new Error('Update all failed'), + ); + + await handleUpdate({ all: true }); + + expect(consoleErrorSpy).toHaveBeenCalledWith('Update all failed'); + }); + }); +}); diff --git a/packages/cli/src/commands/extensions/update.ts b/packages/cli/src/commands/extensions/update.ts index bb200e58f..9325a25f1 100644 --- a/packages/cli/src/commands/extensions/update.ts +++ b/packages/cli/src/commands/extensions/update.ts @@ -5,22 +5,14 @@ */ import type { CommandModule } from 'yargs'; -import { - loadExtensions, - annotateActiveExtensions, - ExtensionStorage, - requestConsentNonInteractive, -} from '../../config/extension.js'; -import { - updateAllUpdatableExtensions, - type ExtensionUpdateInfo, - checkForAllExtensionUpdates, - updateExtension, -} from '../../config/extensions/update.js'; -import { checkForExtensionUpdate } from '../../config/extensions/github.js'; import { getErrorMessage } from '../../utils/errors.js'; import { ExtensionUpdateState } from '../../ui/state/extensions.js'; -import { ExtensionEnablementManager } from '../../config/extensions/extensionEnablement.js'; +import { + checkForExtensionUpdate, + type ExtensionUpdateInfo, +} from '@qwen-code/qwen-code-core'; +import { getExtensionManager } from './utils.js'; +import { t } from '../../i18n/index.js'; interface UpdateArgs { name?: string; @@ -28,50 +20,50 @@ interface UpdateArgs { } const updateOutput = (info: ExtensionUpdateInfo) => - `Extension "${info.name}" successfully updated: ${info.originalVersion} → ${info.updatedVersion}.`; + t( + 'Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.', + { + name: info.name, + oldVersion: info.originalVersion, + newVersion: info.updatedVersion, + }, + ); export async function handleUpdate(args: UpdateArgs) { - const workingDir = process.cwd(); - const extensionEnablementManager = new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - // Force enable named extensions, otherwise we will only update the enabled - // ones. - args.name ? [args.name] : [], - ); - const allExtensions = loadExtensions(extensionEnablementManager); - const extensions = annotateActiveExtensions( - allExtensions, - workingDir, - extensionEnablementManager, - ); + const extensionManager = await getExtensionManager(); + const extensions = extensionManager.getLoadedExtensions(); + if (args.name) { try { const extension = extensions.find( (extension) => extension.name === args.name, ); if (!extension) { - console.log(`Extension "${args.name}" not found.`); + console.log(t('Extension "{{name}}" not found.', { name: args.name })); return; } - let updateState: ExtensionUpdateState | undefined; if (!extension.installMetadata) { console.log( - `Unable to install extension "${args.name}" due to missing install metadata`, + t( + 'Unable to install extension "{{name}}" due to missing install metadata', + { name: args.name }, + ), ); return; } - await checkForExtensionUpdate(extension, (newState) => { - updateState = newState; - }); + const updateState = await checkForExtensionUpdate( + extension, + extensionManager, + ); if (updateState !== ExtensionUpdateState.UPDATE_AVAILABLE) { - console.log(`Extension "${args.name}" is already up to date.`); + console.log( + t('Extension "{{name}}" is already up to date.', { name: args.name }), + ); return; } // TODO(chrstnb): we should list extensions if the requested extension is not installed. - const updatedExtensionInfo = (await updateExtension( + const updatedExtensionInfo = (await extensionManager.updateExtension( extension, - workingDir, - requestConsentNonInteractive, updateState, () => {}, ))!; @@ -80,10 +72,19 @@ export async function handleUpdate(args: UpdateArgs) { updatedExtensionInfo.updatedVersion ) { console.log( - `Extension "${args.name}" successfully updated: ${updatedExtensionInfo.originalVersion} → ${updatedExtensionInfo.updatedVersion}.`, + t( + 'Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.', + { + name: args.name, + oldVersion: updatedExtensionInfo.originalVersion, + newVersion: updatedExtensionInfo.updatedVersion, + }, + ), ); } else { - console.log(`Extension "${args.name}" is already up to date.`); + console.log( + t('Extension "{{name}}" is already up to date.', { name: args.name }), + ); } } catch (error) { console.error(getErrorMessage(error)); @@ -92,18 +93,15 @@ export async function handleUpdate(args: UpdateArgs) { if (args.all) { try { const extensionState = new Map(); - await checkForAllExtensionUpdates(extensions, (action) => { - if (action.type === 'SET_STATE') { - extensionState.set(action.payload.name, { - status: action.payload.state, + await extensionManager.checkForAllExtensionUpdates( + (extensionName, state) => { + extensionState.set(extensionName, { + status: state, processed: true, // No need to process as we will force the update. }); - } - }); - let updateInfos = await updateAllUpdatableExtensions( - workingDir, - requestConsentNonInteractive, - extensions, + }, + ); + let updateInfos = await extensionManager.updateAllUpdatableExtensions( extensionState, () => {}, ); @@ -111,7 +109,7 @@ export async function handleUpdate(args: UpdateArgs) { (info) => info.originalVersion !== info.updatedVersion, ); if (updateInfos.length === 0) { - console.log('No extensions to update.'); + console.log(t('No extensions to update.')); return; } console.log(updateInfos.map((info) => updateOutput(info)).join('\n')); @@ -123,22 +121,25 @@ export async function handleUpdate(args: UpdateArgs) { export const updateCommand: CommandModule = { command: 'update [] [--all]', - describe: + describe: t( 'Updates all extensions or a named extension to the latest version.', + ), builder: (yargs) => yargs .positional('name', { - describe: 'The name of the extension to update.', + describe: t('The name of the extension to update.'), type: 'string', }) .option('all', { - describe: 'Update all extensions.', + describe: t('Update all extensions.'), type: 'boolean', }) .conflicts('name', 'all') .check((argv) => { if (!argv.all && !argv.name) { - throw new Error('Either an extension name or --all must be provided'); + throw new Error( + t('Either an extension name or --all must be provided'), + ); } return true; }), diff --git a/packages/cli/src/commands/extensions/utils.test.ts b/packages/cli/src/commands/extensions/utils.test.ts new file mode 100644 index 000000000..278ee7a54 --- /dev/null +++ b/packages/cli/src/commands/extensions/utils.test.ts @@ -0,0 +1,134 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { describe, it, expect, vi, beforeEach } from 'vitest'; +import { getExtensionManager, extensionToOutputString } from './utils.js'; +import type { Extension, ExtensionManager } from '@qwen-code/qwen-code-core'; + +const mockRefreshCache = vi.fn(); +const mockExtensionManagerInstance = { + refreshCache: mockRefreshCache, +}; + +vi.mock('@qwen-code/qwen-code-core', () => ({ + ExtensionManager: vi + .fn() + .mockImplementation(() => mockExtensionManagerInstance), +})); + +vi.mock('../../config/settings.js', () => ({ + loadSettings: vi.fn().mockReturnValue({ + merged: {}, + }), +})); + +vi.mock('../../config/trustedFolders.js', () => ({ + isWorkspaceTrusted: vi.fn().mockReturnValue({ isTrusted: true }), +})); + +vi.mock('./consent.js', () => ({ + requestConsentOrFail: vi.fn(), + requestConsentNonInteractive: vi.fn(), +})); + +describe('getExtensionManager', () => { + beforeEach(() => { + vi.clearAllMocks(); + mockRefreshCache.mockResolvedValue(undefined); + }); + + it('should return an ExtensionManager instance', async () => { + const manager = await getExtensionManager(); + + expect(manager).toBeDefined(); + expect(manager).toBe(mockExtensionManagerInstance); + }); + + it('should call refreshCache on the ExtensionManager', async () => { + await getExtensionManager(); + + expect(mockRefreshCache).toHaveBeenCalled(); + }); + + it('should use current working directory as workspace', async () => { + const { ExtensionManager } = await import('@qwen-code/qwen-code-core'); + + await getExtensionManager(); + + expect(ExtensionManager).toHaveBeenCalledWith( + expect.objectContaining({ + workspaceDir: process.cwd(), + }), + ); + }); +}); + +describe('extensionToOutputString', () => { + const mockIsEnabled = vi.fn(); + const mockExtensionManager = { + isEnabled: mockIsEnabled, + } as unknown as ExtensionManager; + + const createMockExtension = (overrides = {}): Extension => ({ + id: 'test-ext-id', + name: 'test-extension', + version: '1.0.0', + isActive: true, + path: '/path/to/extension', + contextFiles: [], + config: { name: 'test-extension', version: '1.0.0' }, + ...overrides, + }); + + beforeEach(() => { + vi.clearAllMocks(); + mockIsEnabled.mockReturnValue(true); + }); + + it('should include status icon when inline is false', () => { + const extension = createMockExtension(); + const result = extensionToOutputString( + extension, + mockExtensionManager, + '/workspace', + false, + ); + + // Should contain either ✓ or ✗ (with ANSI color codes) + expect(result).toMatch(/test-extension/); + expect(result).toContain('(1.0.0)'); + }); + + it('should exclude status icon when inline is true', () => { + const extension = createMockExtension(); + const result = extensionToOutputString( + extension, + mockExtensionManager, + '/workspace', + true, + ); + + // Should start with extension name (after stripping potential whitespace) + expect(result.trim()).toMatch(/^test-extension/); + }); + + it('should default inline to false', () => { + const extension = createMockExtension(); + const resultWithoutInline = extensionToOutputString( + extension, + mockExtensionManager, + '/workspace', + ); + const resultWithInlineFalse = extensionToOutputString( + extension, + mockExtensionManager, + '/workspace', + false, + ); + + expect(resultWithoutInline).toEqual(resultWithInlineFalse); + }); +}); diff --git a/packages/cli/src/commands/extensions/utils.ts b/packages/cli/src/commands/extensions/utils.ts new file mode 100644 index 000000000..97e7a8d2f --- /dev/null +++ b/packages/cli/src/commands/extensions/utils.ts @@ -0,0 +1,80 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { ExtensionManager, type Extension } from '@qwen-code/qwen-code-core'; +import { loadSettings } from '../../config/settings.js'; +import { + requestConsentOrFail, + requestConsentNonInteractive, +} from './consent.js'; +import { isWorkspaceTrusted } from '../../config/trustedFolders.js'; +import * as os from 'node:os'; +import chalk from 'chalk'; + +export async function getExtensionManager(): Promise { + const workspaceDir = process.cwd(); + const extensionManager = new ExtensionManager({ + workspaceDir, + requestConsent: requestConsentOrFail.bind( + null, + requestConsentNonInteractive, + ), + isWorkspaceTrusted: !!isWorkspaceTrusted(loadSettings(workspaceDir).merged), + }); + await extensionManager.refreshCache(); + return extensionManager; +} + +export function extensionToOutputString( + extension: Extension, + extensionManager: ExtensionManager, + workspaceDir: string, + inline = false, +): string { + const cwd = workspaceDir; + const userEnabled = extensionManager.isEnabled( + extension.config.name, + os.homedir(), + ); + const workspaceEnabled = extensionManager.isEnabled( + extension.config.name, + cwd, + ); + + const status = workspaceEnabled ? chalk.green('✓') : chalk.red('✗'); + let output = `${inline ? '' : status} ${extension.config.name} (${extension.config.version})`; + output += `\n Path: ${extension.path}`; + if (extension.installMetadata) { + output += `\n Source: ${extension.installMetadata.source} (Type: ${extension.installMetadata.type})`; + if (extension.installMetadata.ref) { + output += `\n Ref: ${extension.installMetadata.ref}`; + } + if (extension.installMetadata.releaseTag) { + output += `\n Release tag: ${extension.installMetadata.releaseTag}`; + } + } + output += `\n Enabled (User): ${userEnabled}`; + output += `\n Enabled (Workspace): ${workspaceEnabled}`; + if (extension.contextFiles.length > 0) { + output += `\n Context files:`; + extension.contextFiles.forEach((contextFile) => { + output += `\n ${contextFile}`; + }); + } + if (extension.commands && extension.commands.length > 0) { + output += `\n Commands:`; + extension.commands.forEach((command) => { + output += `\n /${command}`; + }); + } + if (extension.config.mcpServers) { + output += `\n MCP servers:`; + Object.keys(extension.config.mcpServers).forEach((key) => { + output += `\n ${key}`; + }); + } + return output; +} diff --git a/packages/cli/src/commands/mcp/add.test.ts b/packages/cli/src/commands/mcp/add.test.ts index 357235b5f..94c85f656 100644 --- a/packages/cli/src/commands/mcp/add.test.ts +++ b/packages/cli/src/commands/mcp/add.test.ts @@ -7,11 +7,16 @@ import yargs from 'yargs'; import { addCommand } from './add.js'; import { loadSettings, SettingScope } from '../../config/settings.js'; +import { describe, it, expect, vi, beforeEach } from 'vitest'; -vi.mock('fs/promises', () => ({ - readFile: vi.fn(), - writeFile: vi.fn(), -})); +vi.mock('fs/promises', async (importOriginal) => { + const actual = await importOriginal(); + return { + ...actual, + readFile: vi.fn(), + writeFile: vi.fn(), + }; +}); vi.mock('os', () => { const homedir = vi.fn(() => '/home/user'); diff --git a/packages/cli/src/commands/mcp/add.ts b/packages/cli/src/commands/mcp/add.ts index 254bea604..852f8bdae 100644 --- a/packages/cli/src/commands/mcp/add.ts +++ b/packages/cli/src/commands/mcp/add.ts @@ -139,7 +139,7 @@ export const addCommand: CommandModule = { describe: 'Add a server', builder: (yargs) => yargs - .usage('Usage: gemini mcp add [options] [args...]') + .usage('Usage: qwen mcp add [options] [args...]') .parserConfiguration({ 'unknown-options-as-args': true, // Pass unknown options as server args 'populate--': true, // Populate server args after -- separator diff --git a/packages/cli/src/commands/mcp/list.test.ts b/packages/cli/src/commands/mcp/list.test.ts index 4d9bb083f..438dcad59 100644 --- a/packages/cli/src/commands/mcp/list.test.ts +++ b/packages/cli/src/commands/mcp/list.test.ts @@ -7,18 +7,15 @@ import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest'; import { listMcpServers } from './list.js'; import { loadSettings } from '../../config/settings.js'; -import { ExtensionStorage, loadExtensions } from '../../config/extension.js'; -import { createTransport } from '@qwen-code/qwen-code-core'; +import { isWorkspaceTrusted } from '../../config/trustedFolders.js'; +import { createTransport, ExtensionManager } from '@qwen-code/qwen-code-core'; import { Client } from '@modelcontextprotocol/sdk/client/index.js'; vi.mock('../../config/settings.js', () => ({ loadSettings: vi.fn(), })); -vi.mock('../../config/extension.js', () => ({ - loadExtensions: vi.fn(), - ExtensionStorage: { - getUserExtensionsDir: vi.fn(), - }, +vi.mock('../../config/trustedFolders.js', () => ({ + isWorkspaceTrusted: vi.fn(), })); vi.mock('@qwen-code/qwen-code-core', () => ({ createTransport: vi.fn(), @@ -27,20 +24,15 @@ vi.mock('@qwen-code/qwen-code-core', () => ({ CONNECTING: 'CONNECTING', DISCONNECTED: 'DISCONNECTED', }, - Storage: vi.fn().mockImplementation((_cwd: string) => ({ - getGlobalSettingsPath: () => '/tmp/qwen/settings.json', - getWorkspaceSettingsPath: () => '/tmp/qwen/workspace-settings.json', - getProjectTempDir: () => '/test/home/.qwen/tmp/mocked_hash', - })), - QWEN_CONFIG_DIR: '.qwen', + ExtensionManager: vi.fn(), getErrorMessage: (e: unknown) => (e instanceof Error ? e.message : String(e)), })); vi.mock('@modelcontextprotocol/sdk/client/index.js'); -const mockedExtensionStorage = ExtensionStorage as vi.Mock; const mockedLoadSettings = loadSettings as vi.Mock; -const mockedLoadExtensions = loadExtensions as vi.Mock; +const mockedIsWorkspaceTrusted = isWorkspaceTrusted as vi.Mock; const mockedCreateTransport = createTransport as vi.Mock; +const MockedExtensionManager = ExtensionManager as vi.Mock; const MockedClient = Client as vi.Mock; interface MockClient { @@ -57,6 +49,10 @@ describe('mcp list command', () => { let consoleSpy: vi.SpyInstance; let mockClient: MockClient; let mockTransport: MockTransport; + let mockExtensionManager: { + refreshCache: vi.Mock; + getLoadedExtensions: vi.Mock; + }; beforeEach(() => { vi.resetAllMocks(); @@ -70,12 +66,15 @@ describe('mcp list command', () => { close: vi.fn(), }; + mockExtensionManager = { + refreshCache: vi.fn().mockResolvedValue(undefined), + getLoadedExtensions: vi.fn().mockReturnValue([]), + }; + MockedClient.mockImplementation(() => mockClient); mockedCreateTransport.mockResolvedValue(mockTransport); - mockedLoadExtensions.mockReturnValue([]); - mockedExtensionStorage.getUserExtensionsDir.mockReturnValue( - '/mocked/extensions/dir', - ); + MockedExtensionManager.mockImplementation(() => mockExtensionManager); + mockedIsWorkspaceTrusted.mockReturnValue(true); }); afterEach(() => { @@ -151,8 +150,9 @@ describe('mcp list command', () => { }, }); - mockedLoadExtensions.mockReturnValue([ + mockExtensionManager.getLoadedExtensions.mockReturnValue([ { + isActive: true, config: { name: 'test-extension', mcpServers: { 'extension-server': { command: '/ext/server' } }, diff --git a/packages/cli/src/commands/mcp/list.ts b/packages/cli/src/commands/mcp/list.ts index 09d9bf639..8836e55c0 100644 --- a/packages/cli/src/commands/mcp/list.ts +++ b/packages/cli/src/commands/mcp/list.ts @@ -8,10 +8,13 @@ import type { CommandModule } from 'yargs'; import { loadSettings } from '../../config/settings.js'; import type { MCPServerConfig } from '@qwen-code/qwen-code-core'; -import { MCPServerStatus, createTransport } from '@qwen-code/qwen-code-core'; +import { + MCPServerStatus, + createTransport, + ExtensionManager, +} from '@qwen-code/qwen-code-core'; import { Client } from '@modelcontextprotocol/sdk/client/index.js'; -import { ExtensionStorage, loadExtensions } from '../../config/extension.js'; -import { ExtensionEnablementManager } from '../../config/extensions/extensionEnablement.js'; +import { isWorkspaceTrusted } from '../../config/trustedFolders.js'; const COLOR_GREEN = '\u001b[32m'; const COLOR_YELLOW = '\u001b[33m'; @@ -22,22 +25,27 @@ async function getMcpServersFromConfig(): Promise< Record > { const settings = loadSettings(); - const extensions = loadExtensions( - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - ); + const extensionManager = new ExtensionManager({ + isWorkspaceTrusted: !!isWorkspaceTrusted(settings.merged), + telemetrySettings: settings.merged.telemetry, + }); + await extensionManager.refreshCache(); + const extensions = extensionManager.getLoadedExtensions(); const mcpServers = { ...(settings.merged.mcpServers || {}) }; for (const extension of extensions) { - Object.entries(extension.config.mcpServers || {}).forEach( - ([key, server]) => { - if (mcpServers[key]) { - return; - } - mcpServers[key] = { - ...server, - extensionName: extension.config.name, - }; - }, - ); + if (extension.isActive) { + Object.entries(extension.config.mcpServers || {}).forEach( + ([key, server]) => { + if (mcpServers[key]) { + return; + } + mcpServers[key] = { + ...server, + extensionName: extension.config.name, + }; + }, + ); + } } return mcpServers; } diff --git a/packages/cli/src/commands/mcp/remove.test.ts b/packages/cli/src/commands/mcp/remove.test.ts index eb7dedce5..0f3847e40 100644 --- a/packages/cli/src/commands/mcp/remove.test.ts +++ b/packages/cli/src/commands/mcp/remove.test.ts @@ -9,10 +9,14 @@ import yargs from 'yargs'; import { loadSettings, SettingScope } from '../../config/settings.js'; import { removeCommand } from './remove.js'; -vi.mock('fs/promises', () => ({ - readFile: vi.fn(), - writeFile: vi.fn(), -})); +vi.mock('fs/promises', async (importOriginal) => { + const actual = await importOriginal(); + return { + ...actual, + readFile: vi.fn(), + writeFile: vi.fn(), + }; +}); vi.mock('../../config/settings.js', async () => { const actual = await vi.importActual('../../config/settings.js'); diff --git a/packages/cli/src/config/config.integration.test.ts b/packages/cli/src/config/config.integration.test.ts index a76021f8b..e939a753b 100644 --- a/packages/cli/src/config/config.integration.test.ts +++ b/packages/cli/src/config/config.integration.test.ts @@ -231,18 +231,21 @@ describe('Configuration Integration Tests', () => { expect(config.getExtensionContextFilePaths()).toEqual([]); }); - it('should correctly store and return extension context file paths', () => { - const contextFiles = ['/path/to/file1.txt', '/path/to/file2.js']; + it('should correctly store and return extension context file paths with outputLanguageFilePath', () => { + const outputLanguageFilePath = '/path/to/language.txt'; const configParams: ConfigParameters = { cwd: '/tmp', generationConfig: TEST_CONTENT_GENERATOR_CONFIG, embeddingModel: 'test-embedding-model', targetDir: tempDir, debugMode: false, - extensionContextFilePaths: contextFiles, + outputLanguageFilePath, }; const config = new Config(configParams); - expect(config.getExtensionContextFilePaths()).toEqual(contextFiles); + // outputLanguageFilePath should be included in extension context file paths + expect(config.getExtensionContextFilePaths()).toContain( + outputLanguageFilePath, + ); }); }); diff --git a/packages/cli/src/config/config.test.ts b/packages/cli/src/config/config.test.ts index 5b6715852..4ddd3e3ef 100644 --- a/packages/cli/src/config/config.test.ts +++ b/packages/cli/src/config/config.test.ts @@ -16,10 +16,8 @@ import { } from '@qwen-code/qwen-code-core'; import { loadCliConfig, parseArguments, type CliArgs } from './config.js'; import type { Settings } from './settings.js'; -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 createNativeLspServiceInstance = () => ({ @@ -28,6 +26,16 @@ const createNativeLspServiceInstance = () => ({ 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('../services/lsp/NativeLspService.js', () => ({ @@ -37,6 +45,16 @@ vi.mock('../services/lsp/NativeLspService.js', () => ({ 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), })), })); @@ -547,8 +565,8 @@ describe('loadCliConfig', () => { beforeEach(() => { vi.resetAllMocks(); nativeLspServiceMock.mockReset(); - nativeLspServiceMock.mockImplementation(() => - createNativeLspServiceInstance(), + nativeLspServiceMock.mockImplementation( + () => createNativeLspServiceInstance() as unknown as NativeLspService, ); vi.mocked(os.homedir).mockReturnValue('/mock/home/user'); vi.stubEnv('GEMINI_API_KEY', 'test-api-key'); @@ -572,74 +590,26 @@ describe('loadCliConfig', () => { ]; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getOutputFormat()).toBe('stream-json'); expect(config.getInputFormat()).toBe('stream-json'); expect(config.getIncludePartialMessages()).toBe(true); }); - it('should set showMemoryUsage to true when --show-memory-usage flag is present', async () => { - process.argv = ['node', 'script.js', '--show-memory-usage']; - const argv = await parseArguments({} as Settings); - const settings: Settings = {}; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); - expect(config.getShowMemoryUsage()).toBe(true); - }); - - it('should set showMemoryUsage to false when --memory flag is not present', async () => { - process.argv = ['node', 'script.js']; - const argv = await parseArguments({} as Settings); - const settings: Settings = {}; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); - expect(config.getShowMemoryUsage()).toBe(false); - }); - it('should initialize native LSP service when enabled', async () => { - process.argv = ['node', 'script.js']; + process.argv = ['node', 'script.js', '--experimental-lsp']; 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, - ); + 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']); @@ -655,59 +625,19 @@ describe('loadCliConfig', () => { }); it('should skip native LSP startup when startLsp option is false', async () => { - process.argv = ['node', 'script.js']; + process.argv = ['node', 'script.js', '--experimental-lsp']; const argv = await parseArguments({} as Settings); - const settings: Settings = { lsp: { enabled: true } }; + const settings: Settings = {}; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - undefined, - { startLsp: false }, - ); + const config = await loadCliConfig(settings, argv, undefined, undefined, { + startLsp: false, + }); expect(config.isLspEnabled()).toBe(true); expect(nativeLspServiceMock).not.toHaveBeenCalled(); expect(getLastLspInstance()).toBeUndefined(); }); - 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); - const settings: Settings = { ui: { showMemoryUsage: false } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); - expect(config.getShowMemoryUsage()).toBe(false); - }); - - it('should prioritize CLI flag over settings for showMemoryUsage (CLI true, settings false)', async () => { - process.argv = ['node', 'script.js', '--show-memory-usage']; - const argv = await parseArguments({} as Settings); - const settings: Settings = { ui: { showMemoryUsage: false } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); - expect(config.getShowMemoryUsage()).toBe(true); - }); - describe('Proxy configuration', () => { const originalProxyEnv: { [key: string]: string | undefined } = {}; const proxyEnvVars = [ @@ -738,15 +668,7 @@ describe('loadCliConfig', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getProxy()).toBeFalsy(); }); @@ -787,15 +709,7 @@ describe('loadCliConfig', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getProxy()).toBe(expected); }); }); @@ -804,15 +718,7 @@ describe('loadCliConfig', () => { process.argv = ['node', 'script.js', '--proxy', 'http://localhost:7890']; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getProxy()).toBe('http://localhost:7890'); }); @@ -821,15 +727,7 @@ describe('loadCliConfig', () => { process.argv = ['node', 'script.js', '--proxy', 'http://localhost:7890']; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getProxy()).toBe('http://localhost:7890'); }); }); @@ -854,15 +752,7 @@ describe('loadCliConfig telemetry', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryEnabled()).toBe(false); }); @@ -870,15 +760,7 @@ describe('loadCliConfig telemetry', () => { process.argv = ['node', 'script.js', '--telemetry']; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryEnabled()).toBe(true); }); @@ -886,15 +768,7 @@ describe('loadCliConfig telemetry', () => { process.argv = ['node', 'script.js', '--no-telemetry']; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryEnabled()).toBe(false); }); @@ -902,15 +776,7 @@ describe('loadCliConfig telemetry', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = { telemetry: { enabled: true } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryEnabled()).toBe(true); }); @@ -918,15 +784,7 @@ describe('loadCliConfig telemetry', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = { telemetry: { enabled: false } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryEnabled()).toBe(false); }); @@ -934,15 +792,7 @@ describe('loadCliConfig telemetry', () => { process.argv = ['node', 'script.js', '--telemetry']; const argv = await parseArguments({} as Settings); const settings: Settings = { telemetry: { enabled: false } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryEnabled()).toBe(true); }); @@ -950,15 +800,7 @@ describe('loadCliConfig telemetry', () => { process.argv = ['node', 'script.js', '--no-telemetry']; const argv = await parseArguments({} as Settings); const settings: Settings = { telemetry: { enabled: true } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryEnabled()).toBe(false); }); @@ -968,15 +810,7 @@ describe('loadCliConfig telemetry', () => { const settings: Settings = { telemetry: { otlpEndpoint: 'http://settings.example.com' }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryOtlpEndpoint()).toBe( 'http://settings.example.com', ); @@ -993,15 +827,7 @@ describe('loadCliConfig telemetry', () => { const settings: Settings = { telemetry: { otlpEndpoint: 'http://settings.example.com' }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryOtlpEndpoint()).toBe('http://cli.example.com'); }); @@ -1009,15 +835,7 @@ describe('loadCliConfig telemetry', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = { telemetry: { enabled: true } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryOtlpEndpoint()).toBe('http://localhost:4317'); }); @@ -1027,15 +845,7 @@ describe('loadCliConfig telemetry', () => { const settings: Settings = { telemetry: { target: ServerConfig.DEFAULT_TELEMETRY_TARGET }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryTarget()).toBe( ServerConfig.DEFAULT_TELEMETRY_TARGET, ); @@ -1047,15 +857,7 @@ describe('loadCliConfig telemetry', () => { const settings: Settings = { telemetry: { target: ServerConfig.DEFAULT_TELEMETRY_TARGET }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryTarget()).toBe('gcp'); }); @@ -1063,15 +865,7 @@ describe('loadCliConfig telemetry', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = { telemetry: { enabled: true } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryTarget()).toBe( ServerConfig.DEFAULT_TELEMETRY_TARGET, ); @@ -1081,15 +875,7 @@ describe('loadCliConfig telemetry', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = { telemetry: { logPrompts: false } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryLogPromptsEnabled()).toBe(false); }); @@ -1097,15 +883,7 @@ describe('loadCliConfig telemetry', () => { process.argv = ['node', 'script.js', '--telemetry-log-prompts']; const argv = await parseArguments({} as Settings); const settings: Settings = { telemetry: { logPrompts: false } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryLogPromptsEnabled()).toBe(true); }); @@ -1113,15 +891,7 @@ describe('loadCliConfig telemetry', () => { process.argv = ['node', 'script.js', '--no-telemetry-log-prompts']; const argv = await parseArguments({} as Settings); const settings: Settings = { telemetry: { logPrompts: true } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryLogPromptsEnabled()).toBe(false); }); @@ -1129,15 +899,7 @@ describe('loadCliConfig telemetry', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = { telemetry: { enabled: true } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryLogPromptsEnabled()).toBe(true); }); @@ -1147,15 +909,7 @@ describe('loadCliConfig telemetry', () => { const settings: Settings = { telemetry: { otlpProtocol: 'http' }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryOtlpProtocol()).toBe('http'); }); @@ -1165,15 +919,7 @@ describe('loadCliConfig telemetry', () => { const settings: Settings = { telemetry: { otlpProtocol: 'grpc' }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryOtlpProtocol()).toBe('http'); }); @@ -1181,15 +927,7 @@ describe('loadCliConfig telemetry', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = { telemetry: { enabled: true } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv); expect(config.getTelemetryOtlpProtocol()).toBe('grpc'); }); @@ -1222,138 +960,6 @@ describe('loadCliConfig telemetry', () => { }); }); -describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => { - beforeEach(() => { - vi.resetAllMocks(); - vi.mocked(os.homedir).mockReturnValue('/mock/home/user'); - // Other common mocks would be reset here. - }); - - afterEach(() => { - vi.restoreAllMocks(); - }); - - it('should pass extension context file paths to loadServerHierarchicalMemory', async () => { - process.argv = ['node', 'script.js']; - const settings: Settings = {}; - const extensions: Extension[] = [ - { - path: '/path/to/ext1', - config: { - name: 'ext1', - version: '1.0.0', - }, - contextFiles: ['/path/to/ext1/QWEN.md'], - }, - { - path: '/path/to/ext2', - config: { - name: 'ext2', - version: '1.0.0', - }, - contextFiles: [], - }, - { - path: '/path/to/ext3', - config: { - name: 'ext3', - version: '1.0.0', - }, - contextFiles: [ - '/path/to/ext3/context1.md', - '/path/to/ext3/context2.md', - ], - }, - ]; - const argv = await parseArguments({} as Settings); - await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); - expect(ServerConfig.loadServerHierarchicalMemory).toHaveBeenCalledWith( - expect.any(String), - [], - false, - expect.any(Object), - [ - '/path/to/ext1/QWEN.md', - '/path/to/ext3/context1.md', - '/path/to/ext3/context2.md', - ], - true, - 'tree', - ); - }); - - // NOTE TO FUTURE DEVELOPERS: - // To re-enable tests for loadHierarchicalGeminiMemory, ensure that: - // 1. os.homedir() is reliably mocked *before* the config.ts module is loaded - // and its functions (which use os.homedir()) are called. - // 2. fs/promises and fs mocks correctly simulate file/directory existence, - // readability, and content based on paths derived from the mocked os.homedir(). - // 3. Spies on console functions (for logger output) are correctly set up if needed. - // Example of a previously failing test structure: - it.skip('should correctly use mocked homedir for global path', async () => { - const MOCK_GEMINI_DIR_LOCAL = path.join('/mock/home/user', '.qwen'); - const MOCK_GLOBAL_PATH_LOCAL = path.join(MOCK_GEMINI_DIR_LOCAL, 'QWEN.md'); - mockFs({ - [MOCK_GLOBAL_PATH_LOCAL]: { type: 'file', content: 'GlobalContentOnly' }, - }); - const memory = await loadHierarchicalGeminiMemory('/some/other/cwd', false); - expect(memory).toBe('GlobalContentOnly'); - expect(vi.mocked(os.homedir)).toHaveBeenCalled(); - expect(fsPromises.readFile).toHaveBeenCalledWith( - MOCK_GLOBAL_PATH_LOCAL, - 'utf-8', - ); - }); -}); - -describe('mergeMcpServers', () => { - it('should not modify the original settings object', async () => { - const settings: Settings = { - mcpServers: { - 'test-server': { - url: 'http://localhost:8080', - }, - }, - }; - const extensions: Extension[] = [ - { - path: '/path/to/ext1', - config: { - name: 'ext1', - version: '1.0.0', - mcpServers: { - 'ext1-server': { - url: 'http://localhost:8081', - }, - }, - }, - contextFiles: [], - }, - ]; - const originalSettings = JSON.parse(JSON.stringify(settings)); - process.argv = ['node', 'script.js']; - const argv = await parseArguments({} as Settings); - await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); - expect(settings).toEqual(originalSettings); - }); -}); - describe('mergeExcludeTools', () => { const defaultExcludes = [ShellTool.Name, EditTool.Name, WriteFileTool.Name]; const originalIsTTY = process.stdin.isTTY; @@ -1366,147 +972,21 @@ describe('mergeExcludeTools', () => { process.stdin.isTTY = originalIsTTY; }); - it('should merge excludeTools from settings and extensions', async () => { - const settings: Settings = { tools: { exclude: ['tool1', 'tool2'] } }; - const extensions: Extension[] = [ - { - path: '/path/to/ext1', - config: { - name: 'ext1', - version: '1.0.0', - excludeTools: ['tool3', 'tool4'], - }, - contextFiles: [], - }, - { - path: '/path/to/ext2', - config: { - name: 'ext2', - version: '1.0.0', - excludeTools: ['tool5'], - }, - contextFiles: [], - }, - ]; - process.argv = ['node', 'script.js']; - const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); - expect(config.getExcludeTools()).toEqual( - expect.arrayContaining(['tool1', 'tool2', 'tool3', 'tool4', 'tool5']), - ); - expect(config.getExcludeTools()).toHaveLength(5); - }); - - it('should handle overlapping excludeTools between settings and extensions', async () => { - const settings: Settings = { tools: { exclude: ['tool1', 'tool2'] } }; - const extensions: Extension[] = [ - { - path: '/path/to/ext1', - config: { - name: 'ext1', - version: '1.0.0', - excludeTools: ['tool2', 'tool3'], - }, - contextFiles: [], - }, - ]; - process.argv = ['node', 'script.js']; - const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); - expect(config.getExcludeTools()).toEqual( - expect.arrayContaining(['tool1', 'tool2', 'tool3']), - ); - expect(config.getExcludeTools()).toHaveLength(3); - }); - - it('should handle overlapping excludeTools between extensions', async () => { - const settings: Settings = { tools: { exclude: ['tool1'] } }; - const extensions: Extension[] = [ - { - path: '/path/to/ext1', - config: { - name: 'ext1', - version: '1.0.0', - excludeTools: ['tool2', 'tool3'], - }, - contextFiles: [], - }, - { - path: '/path/to/ext2', - config: { - name: 'ext2', - version: '1.0.0', - excludeTools: ['tool3', 'tool4'], - }, - contextFiles: [], - }, - ]; - process.argv = ['node', 'script.js']; - const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); - expect(config.getExcludeTools()).toEqual( - expect.arrayContaining(['tool1', 'tool2', 'tool3', 'tool4']), - ); - expect(config.getExcludeTools()).toHaveLength(4); - }); - it('should return an empty array when no excludeTools are specified and it is interactive', async () => { process.stdin.isTTY = true; const settings: Settings = {}; - const extensions: Extension[] = []; process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getExcludeTools()).toEqual([]); }); it('should return default excludes when no excludeTools are specified and it is not interactive', async () => { process.stdin.isTTY = false; const settings: Settings = {}; - const extensions: Extension[] = []; process.argv = ['node', 'script.js', '-p', 'test']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getExcludeTools()).toEqual(defaultExcludes); }); @@ -1514,79 +994,12 @@ describe('mergeExcludeTools', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = { tools: { exclude: ['tool1', 'tool2'] } }; - const extensions: Extension[] = []; - const config = await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getExcludeTools()).toEqual( expect.arrayContaining(['tool1', 'tool2']), ); expect(config.getExcludeTools()).toHaveLength(2); }); - - it('should handle extensions with excludeTools but no settings', async () => { - const settings: Settings = {}; - const extensions: Extension[] = [ - { - path: '/path/to/ext', - config: { - name: 'ext1', - version: '1.0.0', - excludeTools: ['tool1', 'tool2'], - }, - contextFiles: [], - }, - ]; - process.argv = ['node', 'script.js']; - const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); - expect(config.getExcludeTools()).toEqual( - expect.arrayContaining(['tool1', 'tool2']), - ); - expect(config.getExcludeTools()).toHaveLength(2); - }); - - it('should not modify the original settings object', async () => { - const settings: Settings = { tools: { exclude: ['tool1'] } }; - const extensions: Extension[] = [ - { - path: '/path/to/ext', - config: { - name: 'ext1', - version: '1.0.0', - excludeTools: ['tool2'], - }, - contextFiles: [], - }, - ]; - const originalSettings = JSON.parse(JSON.stringify(settings)); - process.argv = ['node', 'script.js']; - const argv = await parseArguments({} as Settings); - await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); - expect(settings).toEqual(originalSettings); - }); }); describe('Approval mode tool exclusion logic', () => { @@ -1594,7 +1007,10 @@ describe('Approval mode tool exclusion logic', () => { beforeEach(() => { process.stdin.isTTY = false; // Ensure non-interactive mode - vi.mocked(isWorkspaceTrusted).mockReturnValue(true); + vi.mocked(isWorkspaceTrusted).mockReturnValue({ + isTrusted: true, + source: 'file', + }); }); afterEach(() => { @@ -1605,17 +1021,7 @@ describe('Approval mode tool exclusion logic', () => { process.argv = ['node', 'script.js', '-p', 'test']; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const extensions: Extension[] = []; - - const config = await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); const excludedTools = config.getExcludeTools(); expect(excludedTools).toContain(ShellTool.Name); @@ -1634,17 +1040,7 @@ describe('Approval mode tool exclusion logic', () => { ]; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const extensions: Extension[] = []; - - const config = await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); const excludedTools = config.getExcludeTools(); expect(excludedTools).toContain(ShellTool.Name); @@ -1663,17 +1059,8 @@ describe('Approval mode tool exclusion logic', () => { ]; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const extensions: Extension[] = []; - const config = await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); const excludedTools = config.getExcludeTools(); expect(excludedTools).toContain(ShellTool.Name); @@ -1689,17 +1076,8 @@ describe('Approval mode tool exclusion logic', () => { allowed: [ShellTool.Name], }, }; - const extensions: Extension[] = []; - const config = await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); const excludedTools = config.getExcludeTools(); expect(excludedTools).not.toContain(ShellTool.Name); @@ -1715,17 +1093,8 @@ describe('Approval mode tool exclusion logic', () => { core: [ShellTool.Name], }, }; - const extensions: Extension[] = []; - const config = await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); const excludedTools = config.getExcludeTools(); expect(excludedTools).not.toContain(ShellTool.Name); @@ -1744,17 +1113,8 @@ describe('Approval mode tool exclusion logic', () => { ]; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const extensions: Extension[] = []; - const config = await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); const excludedTools = config.getExcludeTools(); expect(excludedTools).toContain(ShellTool.Name); @@ -1773,17 +1133,8 @@ describe('Approval mode tool exclusion logic', () => { ]; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const extensions: Extension[] = []; - const config = await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); const excludedTools = config.getExcludeTools(); expect(excludedTools).not.toContain(ShellTool.Name); @@ -1795,17 +1146,8 @@ describe('Approval mode tool exclusion logic', () => { process.argv = ['node', 'script.js', '--yolo', '-p', 'test']; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const extensions: Extension[] = []; - const config = await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); const excludedTools = config.getExcludeTools(); expect(excludedTools).not.toContain(ShellTool.Name); @@ -1829,18 +1171,8 @@ describe('Approval mode tool exclusion logic', () => { process.argv = testCase.args; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const extensions: Extension[] = []; - const config = await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); const excludedTools = config.getExcludeTools(); expect(excludedTools).not.toContain(ShellTool.Name); @@ -1860,17 +1192,7 @@ describe('Approval mode tool exclusion logic', () => { ]; const argv = await parseArguments({} as Settings); const settings: Settings = { tools: { exclude: ['custom_tool'] } }; - const extensions: Extension[] = []; - - const config = await loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); const excludedTools = config.getExcludeTools(); expect(excludedTools).toContain('custom_tool'); // From settings @@ -1889,18 +1211,8 @@ describe('Approval mode tool exclusion logic', () => { }; const settings: Settings = {}; - const extensions: Extension[] = []; await expect( - loadCliConfig( - settings, - extensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - invalidArgv.extensions, - ), - - invalidArgv as CliArgs, - ), + loadCliConfig(settings, invalidArgv as CliArgs, undefined, []), ).rejects.toThrow( 'Invalid approval mode: invalid_mode. Valid values are: plan, default, auto-edit, yolo', ); @@ -1933,15 +1245,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => { it('should allow all MCP servers if the flag is not provided', async () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - baseSettings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(baseSettings, argv, undefined, []); expect(config.getMcpServers()).toEqual(baseSettings.mcpServers); }); @@ -1953,15 +1257,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => { 'server1', ]; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - baseSettings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(baseSettings, argv, undefined, []); expect(config.getMcpServers()).toEqual({ server1: { url: 'http://localhost:8080' }, }); @@ -1977,15 +1273,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => { 'server3', ]; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - baseSettings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(baseSettings, argv, undefined, []); expect(config.getMcpServers()).toEqual({ server1: { url: 'http://localhost:8080' }, server3: { url: 'http://localhost:8082' }, @@ -2002,15 +1290,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => { 'server4', ]; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - baseSettings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(baseSettings, argv, undefined, []); expect(config.getMcpServers()).toEqual({ server1: { url: 'http://localhost:8080' }, }); @@ -2019,15 +1299,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => { it('should allow no MCP servers if the flag is provided but empty', async () => { process.argv = ['node', 'script.js', '--allowed-mcp-server-names', '']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - baseSettings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(baseSettings, argv, undefined, []); expect(config.getMcpServers()).toEqual({}); }); @@ -2038,15 +1310,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => { ...baseSettings, mcp: { allowed: ['server1', 'server2'] }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getMcpServers()).toEqual({ server1: { url: 'http://localhost:8080' }, server2: { url: 'http://localhost:8081' }, @@ -2060,15 +1324,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => { ...baseSettings, mcp: { excluded: ['server1', 'server2'] }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getMcpServers()).toEqual({ server3: { url: 'http://localhost:8082' }, }); @@ -2084,15 +1340,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => { allowed: ['server1', 'server2'], }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getMcpServers()).toEqual({ server2: { url: 'http://localhost:8081' }, }); @@ -2113,15 +1361,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => { allowed: ['server2'], }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getMcpServers()).toEqual({ server1: { url: 'http://localhost:8080' }, }); @@ -2144,15 +1384,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => { excluded: ['server3'], // Should be ignored }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getMcpServers()).toEqual({ server2: { url: 'http://localhost:8081' }, server3: { url: 'http://localhost:8082' }, @@ -2160,56 +1392,6 @@ describe('loadCliConfig with allowed-mcp-server-names', () => { }); }); -describe('loadCliConfig extensions', () => { - const mockExtensions: Extension[] = [ - { - path: '/path/to/ext1', - config: { name: 'ext1', version: '1.0.0' }, - contextFiles: ['/path/to/ext1.md'], - }, - { - path: '/path/to/ext2', - config: { name: 'ext2', version: '1.0.0' }, - contextFiles: ['/path/to/ext2.md'], - }, - ]; - - it('should not filter extensions if --extensions flag is not used', async () => { - process.argv = ['node', 'script.js']; - const argv = await parseArguments({} as Settings); - const settings: Settings = {}; - const config = await loadCliConfig( - settings, - mockExtensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); - expect(config.getExtensionContextFilePaths()).toEqual([ - '/path/to/ext1.md', - '/path/to/ext2.md', - ]); - }); - - it('should filter extensions if --extensions flag is used', async () => { - process.argv = ['node', 'script.js', '--extensions', 'ext1']; - const argv = await parseArguments({} as Settings); - const settings: Settings = {}; - const config = await loadCliConfig( - settings, - mockExtensions, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); - expect(config.getExtensionContextFilePaths()).toEqual(['/path/to/ext1.md']); - }); -}); - describe('loadCliConfig model selection', () => { it.skip('selects a model from settings.json if provided', async () => { process.argv = ['node', 'script.js']; @@ -2220,12 +1402,9 @@ describe('loadCliConfig model selection', () => { name: 'qwen3-coder-plus', }, }, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), argv, + undefined, + [], ); expect(config.getModel()).toBe('qwen3-coder-plus'); @@ -2238,12 +1417,9 @@ describe('loadCliConfig model selection', () => { { // No model set. }, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), argv, + undefined, + [], ); expect(config.getModel()).toBe(DEFAULT_QWEN_MODEL); @@ -2265,12 +1441,9 @@ describe('loadCliConfig model selection', () => { name: 'qwen3-coder-flash', }, }, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), argv, + undefined, + [], ); expect(config.getModel()).toBe('qwen3-coder-plus'); @@ -2290,12 +1463,9 @@ describe('loadCliConfig model selection', () => { { // No model provided via settings. }, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), argv, + undefined, + [], ); expect(config.getModel()).toBe('qwen3-coder-plus'); @@ -2327,15 +1497,7 @@ describe('loadCliConfig folderTrust', () => { }, }; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getFolderTrust()).toBe(false); }); @@ -2349,15 +1511,7 @@ describe('loadCliConfig folderTrust', () => { }, }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getFolderTrust()).toBe(true); }); @@ -2365,15 +1519,7 @@ describe('loadCliConfig folderTrust', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getFolderTrust()).toBe(false); }); }); @@ -2414,15 +1560,7 @@ describe('loadCliConfig with includeDirectories', () => { ], }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); const expected = [ mockCwd, path.resolve(path.sep, 'cli', 'path1'), @@ -2465,15 +1603,7 @@ describe('loadCliConfig chatCompression', () => { }, }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getChatCompression()).toEqual({ contextPercentageThreshold: 0.5, }); @@ -2483,15 +1613,7 @@ describe('loadCliConfig chatCompression', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getChatCompression()).toBeUndefined(); }); }); @@ -2515,15 +1637,7 @@ describe('loadCliConfig useRipgrep', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getUseRipgrep()).toBe(true); }); @@ -2531,15 +1645,7 @@ describe('loadCliConfig useRipgrep', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = { tools: { useRipgrep: false } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getUseRipgrep()).toBe(false); }); @@ -2547,15 +1653,7 @@ describe('loadCliConfig useRipgrep', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = { tools: { useRipgrep: true } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getUseRipgrep()).toBe(true); }); }); @@ -2579,15 +1677,7 @@ describe('loadCliConfig useBuiltinRipgrep', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getUseBuiltinRipgrep()).toBe(true); }); @@ -2595,15 +1685,7 @@ describe('loadCliConfig useBuiltinRipgrep', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = { tools: { useBuiltinRipgrep: false } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getUseBuiltinRipgrep()).toBe(false); }); @@ -2611,15 +1693,7 @@ describe('loadCliConfig useBuiltinRipgrep', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = { tools: { useBuiltinRipgrep: true } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getUseBuiltinRipgrep()).toBe(true); }); }); @@ -2645,15 +1719,7 @@ describe('screenReader configuration', () => { const settings: Settings = { ui: { accessibility: { screenReader: true } }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getScreenReader()).toBe(true); }); @@ -2663,15 +1729,7 @@ describe('screenReader configuration', () => { const settings: Settings = { ui: { accessibility: { screenReader: false } }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getScreenReader()).toBe(false); }); @@ -2681,15 +1739,7 @@ describe('screenReader configuration', () => { const settings: Settings = { ui: { accessibility: { screenReader: false } }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getScreenReader()).toBe(true); }); @@ -2697,15 +1747,7 @@ describe('screenReader configuration', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = {}; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getScreenReader()).toBe(false); }); }); @@ -2719,7 +1761,10 @@ describe('loadCliConfig tool exclusions', () => { vi.mocked(os.homedir).mockReturnValue('/mock/home/user'); vi.stubEnv('GEMINI_API_KEY', 'test-api-key'); process.stdin.isTTY = true; - vi.mocked(isWorkspaceTrusted).mockReturnValue(true); + vi.mocked(isWorkspaceTrusted).mockReturnValue({ + isTrusted: true, + source: 'file', + }); }); afterEach(() => { @@ -2733,15 +1778,7 @@ describe('loadCliConfig tool exclusions', () => { process.stdin.isTTY = true; process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getExcludeTools()).not.toContain('run_shell_command'); expect(config.getExcludeTools()).not.toContain('replace'); expect(config.getExcludeTools()).not.toContain('write_file'); @@ -2751,15 +1788,7 @@ describe('loadCliConfig tool exclusions', () => { process.stdin.isTTY = true; process.argv = ['node', 'script.js', '--yolo']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getExcludeTools()).not.toContain('run_shell_command'); expect(config.getExcludeTools()).not.toContain('replace'); expect(config.getExcludeTools()).not.toContain('write_file'); @@ -2769,15 +1798,7 @@ describe('loadCliConfig tool exclusions', () => { process.stdin.isTTY = false; process.argv = ['node', 'script.js', '-p', 'test']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getExcludeTools()).toContain('run_shell_command'); expect(config.getExcludeTools()).toContain('edit'); expect(config.getExcludeTools()).toContain('write_file'); @@ -2787,15 +1808,7 @@ describe('loadCliConfig tool exclusions', () => { process.stdin.isTTY = false; process.argv = ['node', 'script.js', '-p', 'test', '--yolo']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getExcludeTools()).not.toContain('run_shell_command'); expect(config.getExcludeTools()).not.toContain('replace'); expect(config.getExcludeTools()).not.toContain('write_file'); @@ -2824,15 +1837,7 @@ describe('loadCliConfig interactive', () => { process.stdin.isTTY = true; process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.isInteractive()).toBe(true); }); @@ -2840,15 +1845,7 @@ describe('loadCliConfig interactive', () => { process.stdin.isTTY = false; process.argv = ['node', 'script.js', '--prompt-interactive', 'test']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.isInteractive()).toBe(true); }); @@ -2856,15 +1853,7 @@ describe('loadCliConfig interactive', () => { process.stdin.isTTY = false; process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.isInteractive()).toBe(false); }); @@ -2872,15 +1861,7 @@ describe('loadCliConfig interactive', () => { process.stdin.isTTY = true; process.argv = ['node', 'script.js', '--prompt', 'test']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.isInteractive()).toBe(false); }); @@ -2888,15 +1869,7 @@ describe('loadCliConfig interactive', () => { process.stdin.isTTY = true; process.argv = ['node', 'script.js', '--model', 'gemini-1.5-pro', 'Hello']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.isInteractive()).toBe(false); }); @@ -2911,15 +1884,7 @@ describe('loadCliConfig interactive', () => { 'Hello world', ]; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.isInteractive()).toBe(false); // Verify the question is preserved for one-shot execution expect(argv.prompt).toBe('Hello world'); @@ -2930,15 +1895,7 @@ describe('loadCliConfig interactive', () => { process.stdin.isTTY = true; process.argv = ['node', 'script.js', '--model', 'gemini-1.5-pro']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.isInteractive()).toBe(true); }); }); @@ -2951,7 +1908,10 @@ describe('loadCliConfig approval mode', () => { vi.mocked(os.homedir).mockReturnValue('/mock/home/user'); vi.stubEnv('GEMINI_API_KEY', 'test-api-key'); process.argv = ['node', 'script.js']; // Reset argv for each test - vi.mocked(isWorkspaceTrusted).mockReturnValue(true); + vi.mocked(isWorkspaceTrusted).mockReturnValue({ + isTrusted: true, + source: 'file', + }); }); afterEach(() => { @@ -2963,156 +1923,78 @@ describe('loadCliConfig approval mode', () => { it('should default to DEFAULT approval mode when no flags are set', async () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT); }); it('should set PLAN approval mode when --approval-mode=plan', async () => { process.argv = ['node', 'script.js', '--approval-mode', 'plan']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.PLAN); }); it('should set YOLO approval mode when --yolo flag is used', async () => { process.argv = ['node', 'script.js', '--yolo']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.YOLO); }); it('should set YOLO approval mode when -y flag is used', async () => { process.argv = ['node', 'script.js', '-y']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.YOLO); }); it('should set DEFAULT approval mode when --approval-mode=default', async () => { process.argv = ['node', 'script.js', '--approval-mode', 'default']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT); }); it('should set AUTO_EDIT approval mode when --approval-mode=auto-edit', async () => { process.argv = ['node', 'script.js', '--approval-mode', 'auto-edit']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.AUTO_EDIT); }); it('should set YOLO approval mode when --approval-mode=yolo', async () => { process.argv = ['node', 'script.js', '--approval-mode', 'yolo']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.YOLO); }); it('should use approval mode from settings when CLI flags are not provided', async () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); - const settings: Settings = { tools: { approvalMode: 'plan' } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + // Using string value to test normalization + const settings = { tools: { approvalMode: 'plan' } } as unknown as Settings; + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.PLAN); }); it('should normalize approval mode values from settings', async () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); - const settings: Settings = { tools: { approvalMode: 'AutoEdit' } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const settings: Settings = { + tools: { approvalMode: ServerConfig.ApprovalMode.AUTO_EDIT }, + }; + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.AUTO_EDIT); }); it('should throw when approval mode in settings is invalid', async () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); - const settings: Settings = { tools: { approvalMode: 'invalid_mode' } }; - await expect( - loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - - argv, - ), - ).rejects.toThrow( + const settings = { + tools: { approvalMode: 'invalid_mode' }, + } as unknown as Settings; + await expect(loadCliConfig(settings, argv, undefined, [])).rejects.toThrow( 'Invalid approval mode: invalid_mode. Valid values are: plan, default, auto-edit, yolo', ); }); @@ -3124,30 +2006,14 @@ describe('loadCliConfig approval mode', () => { const argv = await parseArguments({} as Settings); // Manually set yolo to true to simulate what would happen if validation didn't prevent it argv.yolo = true; - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT); }); it('should fall back to --yolo behavior when --approval-mode is not set', async () => { process.argv = ['node', 'script.js', '--yolo']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.YOLO); }); @@ -3163,80 +2029,35 @@ describe('loadCliConfig approval mode', () => { it('should override --approval-mode=yolo to DEFAULT', async () => { process.argv = ['node', 'script.js', '--approval-mode', 'yolo']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT); }); it('should override --approval-mode=auto-edit to DEFAULT', async () => { process.argv = ['node', 'script.js', '--approval-mode', 'auto-edit']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT); }); it('should override --yolo flag to DEFAULT', async () => { process.argv = ['node', 'script.js', '--yolo']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT); }); it('should remain DEFAULT when --approval-mode=default', async () => { process.argv = ['node', 'script.js', '--approval-mode', 'default']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT); }); it('should allow PLAN approval mode in untrusted folders', async () => { process.argv = ['node', 'script.js', '--approval-mode', 'plan']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.PLAN); }); }); @@ -3259,7 +2080,9 @@ describe('loadCliConfig fileFiltering', () => { }); const testCases: Array<{ - property: keyof NonNullable; + property: keyof NonNullable< + NonNullable['fileFiltering'] + >; getter: (config: ServerConfig.Config) => boolean; value: boolean; }> = [ @@ -3314,16 +2137,7 @@ describe('loadCliConfig fileFiltering', () => { }, }; const argv = await parseArguments(settings); - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(getter(config)).toBe(value); }, ); @@ -3333,15 +2147,7 @@ describe('Output format', () => { it('should default to TEXT', async () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getOutputFormat()).toBe(OutputFormat.TEXT); }); @@ -3350,12 +2156,9 @@ describe('Output format', () => { const argv = await parseArguments({} as Settings); const config = await loadCliConfig( { output: { format: OutputFormat.JSON } }, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), argv, + undefined, + [], ); expect(config.getOutputFormat()).toBe(OutputFormat.JSON); }); @@ -3365,12 +2168,9 @@ describe('Output format', () => { const argv = await parseArguments({} as Settings); const config = await loadCliConfig( { output: { format: OutputFormat.JSON } }, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), argv, + undefined, + [], ); expect(config.getOutputFormat()).toBe(OutputFormat.JSON); }); @@ -3455,15 +2255,7 @@ describe('Telemetry configuration via environment variables', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = { telemetry: { enabled: false } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getTelemetryEnabled()).toBe(true); }); @@ -3471,16 +2263,10 @@ describe('Telemetry configuration via environment variables', () => { vi.stubEnv('GEMINI_TELEMETRY_TARGET', 'gcp'); process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); - const settings: Settings = { telemetry: { target: 'local' } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const settings: Settings = { + telemetry: { target: 'local' }, + } as unknown as Settings; + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getTelemetryTarget()).toBe('gcp'); }); @@ -3488,19 +2274,10 @@ describe('Telemetry configuration via environment variables', () => { vi.stubEnv('GEMINI_TELEMETRY_TARGET', 'bogus'); process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); - const settings: Settings = { telemetry: { target: 'gcp' } }; - await expect( - loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - - argv, - ), - ).rejects.toThrow( + const settings: Settings = { + telemetry: { target: 'gcp' }, + } as unknown as Settings; + await expect(loadCliConfig(settings, argv, undefined, [])).rejects.toThrow( /Invalid telemetry configuration: .*Invalid telemetry target/i, ); vi.unstubAllEnvs(); @@ -3514,15 +2291,7 @@ describe('Telemetry configuration via environment variables', () => { const settings: Settings = { telemetry: { otlpEndpoint: 'http://settings.com' }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getTelemetryOtlpEndpoint()).toBe('http://gemini.env.com'); }); @@ -3531,15 +2300,7 @@ describe('Telemetry configuration via environment variables', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = { telemetry: { otlpProtocol: 'grpc' } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getTelemetryOtlpProtocol()).toBe('http'); }); @@ -3548,15 +2309,7 @@ describe('Telemetry configuration via environment variables', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = { telemetry: { logPrompts: true } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getTelemetryLogPromptsEnabled()).toBe(false); }); @@ -3567,15 +2320,7 @@ describe('Telemetry configuration via environment variables', () => { const settings: Settings = { telemetry: { outfile: '/settings/telemetry.log' }, }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getTelemetryOutfile()).toBe('/gemini/env/telemetry.log'); }); @@ -3584,15 +2329,7 @@ describe('Telemetry configuration via environment variables', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = { telemetry: { useCollector: false } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getTelemetryUseCollector()).toBe(true); }); @@ -3601,15 +2338,7 @@ describe('Telemetry configuration via environment variables', () => { process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); const settings: Settings = { telemetry: { enabled: true } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getTelemetryEnabled()).toBe(true); }); @@ -3617,16 +2346,10 @@ describe('Telemetry configuration via environment variables', () => { vi.stubEnv('GEMINI_TELEMETRY_TARGET', undefined); process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); - const settings: Settings = { telemetry: { target: 'local' } }; - const config = await loadCliConfig( - settings, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const settings: Settings = { + telemetry: { target: 'local' }, + } as unknown as Settings; + const config = await loadCliConfig(settings, argv, undefined, []); expect(config.getTelemetryTarget()).toBe('local'); }); @@ -3634,15 +2357,7 @@ describe('Telemetry configuration via environment variables', () => { vi.stubEnv('GEMINI_TELEMETRY_ENABLED', '1'); process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getTelemetryEnabled()).toBe(true); }); @@ -3652,12 +2367,9 @@ describe('Telemetry configuration via environment variables', () => { const argv = await parseArguments({} as Settings); const config = await loadCliConfig( { telemetry: { enabled: true } }, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), argv, + undefined, + [], ); expect(config.getTelemetryEnabled()).toBe(false); }); @@ -3666,15 +2378,7 @@ describe('Telemetry configuration via environment variables', () => { vi.stubEnv('GEMINI_TELEMETRY_LOG_PROMPTS', '1'); process.argv = ['node', 'script.js']; const argv = await parseArguments({} as Settings); - const config = await loadCliConfig( - {}, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), - argv, - ); + const config = await loadCliConfig({}, argv, undefined, []); expect(config.getTelemetryLogPromptsEnabled()).toBe(true); }); @@ -3684,12 +2388,9 @@ describe('Telemetry configuration via environment variables', () => { const argv = await parseArguments({} as Settings); const config = await loadCliConfig( { telemetry: { logPrompts: true } }, - [], - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ), argv, + undefined, + [], ); expect(config.getTelemetryLogPromptsEnabled()).toBe(false); }); diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index 95ade13cb..2ca7d5950 100755 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -22,7 +22,6 @@ import { SessionService, ideContextStore, type ResumedSessionData, - type MCPServerConfig, type LspClient, type ToolName, EditTool, @@ -43,15 +42,12 @@ import { homedir } from 'node:os'; import { resolvePath } from '../utils/resolvePath.js'; import { getCliVersion } from '../utils/version.js'; -import type { Extension } from './extension.js'; -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'; import { buildWebSearchConfig } from './webSearch.js'; // Simple console logger for now - replace with actual logger if available @@ -106,7 +102,6 @@ export interface CliArgs { prompt: string | undefined; promptInteractive: string | undefined; allFiles: boolean | undefined; - showMemoryUsage: boolean | undefined; yolo: boolean | undefined; approvalMode: string | undefined; telemetry: boolean | undefined; @@ -436,11 +431,6 @@ export async function parseArguments(settings: Settings): Promise { description: 'Include ALL files in context?', default: false, }) - .option('show-memory-usage', { - type: 'boolean', - description: 'Show memory usage in status bar', - default: false, - }) .option('yolo', { alias: 'y', type: 'boolean', @@ -649,10 +639,6 @@ export async function parseArguments(settings: Settings): Promise { ], description: 'Authentication type', }) - .deprecateOption( - 'show-memory-usage', - 'Use the "ui.showMemoryUsage" setting in settings.json instead. This flag will be removed in a future version.', - ) .deprecateOption( 'sandbox-image', 'Use the "tools.sandbox" setting in settings.json instead. This flag will be removed in a future version.', @@ -711,11 +697,9 @@ export async function parseArguments(settings: Settings): Promise { }), ) // Register MCP subcommands - .command(mcpCommand); - - if (settings?.experimental?.extensionManagement ?? true) { - yargsInstance.command(extensionsCommand); - } + .command(mcpCommand) + // Register Extension subcommands + .command(extensionsCommand); yargsInstance .version(await getCliVersion()) // This will enable the --version flag based on package.json @@ -790,7 +774,6 @@ export async function loadHierarchicalGeminiMemory( includeDirectoriesToReadGemini: readonly string[] = [], debugMode: boolean, fileService: FileDiscoveryService, - settings: Settings, extensionContextFilePaths: string[] = [], folderTrust: boolean, memoryImportFormat: 'flat' | 'tree' = 'tree', @@ -833,31 +816,18 @@ export function isDebugMode(argv: CliArgs): boolean { export async function loadCliConfig( settings: Settings, - extensions: Extension[], - extensionEnablementManager: ExtensionEnablementManager, argv: CliArgs, cwd: string = process.cwd(), + overrideExtensions?: string[], options: LoadCliConfigOptions = {}, ): Promise { const debugMode = isDebugMode(argv); - const memoryImportFormat = settings.context?.importFormat || 'tree'; - const ideMode = settings.ide?.enabled ?? false; const folderTrust = settings.security?.folderTrust?.enabled ?? false; const trustedFolder = isWorkspaceTrusted(settings)?.isTrusted ?? true; - const allExtensions = annotateActiveExtensions( - extensions, - cwd, - extensionEnablementManager, - ); - - const activeExtensions = extensions.filter( - (_, i) => allExtensions[i].isActive, - ); - // Set the context filename in the server's memoryTool module BEFORE loading memory // TODO(b/343434939): This is a bit of a hack. The contextFileName should ideally be passed // directly to the Config constructor in core, and have core handle setGeminiMdFilename. @@ -869,22 +839,19 @@ export async function loadCliConfig( setServerGeminiMdFilename(getCurrentGeminiMdFilename()); } - const extensionContextFilePaths = activeExtensions.flatMap( - (e) => e.contextFiles, - ); - // Automatically load output-language.md if it exists - const outputLanguageFilePath = path.join( + let outputLanguageFilePath: string | undefined = path.join( Storage.getGlobalQwenDir(), 'output-language.md', ); if (fs.existsSync(outputLanguageFilePath)) { - extensionContextFilePaths.push(outputLanguageFilePath); if (debugMode) { logger.debug( `Found output-language.md, adding to context files: ${outputLanguageFilePath}`, ); } + } else { + outputLanguageFilePath = undefined; } const fileService = new FileDiscoveryService(cwd); @@ -894,21 +861,20 @@ export async function loadCliConfig( .concat((argv.includeDirectories || []).map(resolvePath)); // Call the (now wrapper) loadHierarchicalGeminiMemory which calls the server's version - const { memoryContent, fileCount } = await loadHierarchicalGeminiMemory( + const extensionContextFilePaths: string[] = []; + + await loadHierarchicalGeminiMemory( cwd, settings.context?.loadMemoryFromIncludeDirectories ? includeDirectories : [], debugMode, fileService, - settings, extensionContextFilePaths, trustedFolder, - memoryImportFormat, + settings.context?.importFormat || 'tree', ); - let mcpServers = mergeMcpServers(settings, activeExtensions); - // LSP configuration: enabled only via --experimental-lsp flag const lspEnabled = argv.experimentalLsp === true; const lspAllowed = settings.lsp?.allowed ?? settings.mcp?.allowed; @@ -1052,37 +1018,22 @@ export async function loadCliConfig( const excludeTools = mergeExcludeTools( settings, - activeExtensions, extraExcludes.length > 0 ? extraExcludes : undefined, argv.excludeTools, ); - const blockedMcpServers: Array<{ name: string; extensionName: string }> = []; - - if (!argv.allowedMcpServerNames) { - if (settings.mcp?.allowed) { - mcpServers = allowedMcpServers( - mcpServers, - settings.mcp.allowed, - blockedMcpServers, - ); - } - - if (settings.mcp?.excluded) { - const excludedNames = new Set(settings.mcp.excluded.filter(Boolean)); - if (excludedNames.size > 0) { - mcpServers = Object.fromEntries( - Object.entries(mcpServers).filter(([key]) => !excludedNames.has(key)), - ); - } - } - } + let allowedMcpServers: Set | undefined; + let excludedMcpServers: Set | undefined; if (argv.allowedMcpServerNames) { - mcpServers = allowedMcpServers( - mcpServers, - argv.allowedMcpServerNames, - blockedMcpServers, - ); + allowedMcpServers = new Set(argv.allowedMcpServerNames.filter(Boolean)); + excludedMcpServers = undefined; + } else { + allowedMcpServers = settings.mcp?.allowed + ? new Set(settings.mcp.allowed.filter(Boolean)) + : undefined; + excludedMcpServers = settings.mcp?.excluded + ? new Set(settings.mcp.excluded.filter(Boolean)) + : undefined; } const selectedAuthType = @@ -1150,6 +1101,7 @@ export async function loadCliConfig( includeDirectories, loadMemoryFromIncludeDirectories: settings.context?.loadMemoryFromIncludeDirectories || false, + importFormat: settings.context?.importFormat || 'tree', debugMode, question, fullContext: argv.allFiles || false, @@ -1159,12 +1111,14 @@ export async function loadCliConfig( toolDiscoveryCommand: settings.tools?.discoveryCommand, toolCallCommand: settings.tools?.callCommand, mcpServerCommand: settings.mcp?.serverCommand, - mcpServers, - userMemory: memoryContent, - geminiMdFileCount: fileCount, + mcpServers: settings.mcpServers || {}, + allowedMcpServers: allowedMcpServers + ? Array.from(allowedMcpServers) + : undefined, + excludedMcpServers: excludedMcpServers + ? Array.from(excludedMcpServers) + : undefined, approvalMode, - showMemoryUsage: - argv.showMemoryUsage || settings.ui?.showMemoryUsage || false, accessibility: { ...settings.ui?.accessibility, screenReader, @@ -1184,15 +1138,14 @@ export async function loadCliConfig( fileDiscoveryService: fileService, bugCommand: settings.advanced?.bugCommand, model: resolvedModel, - extensionContextFilePaths, + outputLanguageFilePath, sessionTokenLimit: settings.model?.sessionTokenLimit ?? -1, maxSessionTurns: argv.maxSessionTurns ?? settings.model?.maxSessionTurns ?? -1, experimentalZedIntegration: argv.acp || argv.experimentalAcp || false, experimentalSkills: argv.experimentalSkills || false, listExtensions: argv.listExtensions || false, - extensions: allExtensions, - blockedMcpServers, + overrideExtensions: overrideExtensions || argv.extensions, noBrowser: !!process.env['NO_BROWSER'], authType: selectedAuthType, inputFormat, @@ -1267,61 +1220,8 @@ export async function loadCliConfig( return config; } -function allowedMcpServers( - mcpServers: { [x: string]: MCPServerConfig }, - allowMCPServers: string[], - blockedMcpServers: Array<{ name: string; extensionName: string }>, -) { - const allowedNames = new Set(allowMCPServers.filter(Boolean)); - if (allowedNames.size > 0) { - mcpServers = Object.fromEntries( - Object.entries(mcpServers).filter(([key, server]) => { - const isAllowed = allowedNames.has(key); - if (!isAllowed) { - blockedMcpServers.push({ - name: key, - extensionName: server.extensionName || '', - }); - } - return isAllowed; - }), - ); - } else { - blockedMcpServers.push( - ...Object.entries(mcpServers).map(([key, server]) => ({ - name: key, - extensionName: server.extensionName || '', - })), - ); - mcpServers = {}; - } - return mcpServers; -} - -function mergeMcpServers(settings: Settings, extensions: Extension[]) { - const mcpServers = { ...(settings.mcpServers || {}) }; - for (const extension of extensions) { - Object.entries(extension.config.mcpServers || {}).forEach( - ([key, server]) => { - if (mcpServers[key]) { - logger.warn( - `Skipping extension MCP config for server with key "${key}" as it already exists.`, - ); - return; - } - mcpServers[key] = { - ...server, - extensionName: extension.config.name, - }; - }, - ); - } - return mcpServers; -} - function mergeExcludeTools( settings: Settings, - extensions: Extension[], extraExcludes?: string[] | undefined, cliExcludeTools?: string[] | undefined, ): string[] { @@ -1330,10 +1230,5 @@ function mergeExcludeTools( ...(settings.tools?.exclude || []), ...(extraExcludes || []), ]); - for (const extension of extensions) { - for (const tool of extension.config.excludeTools || []) { - allExcludeTools.add(tool); - } - } return [...allExcludeTools]; } diff --git a/packages/cli/src/config/extension.test.ts b/packages/cli/src/config/extension.test.ts deleted file mode 100644 index 2bae9c1ec..000000000 --- a/packages/cli/src/config/extension.test.ts +++ /dev/null @@ -1,1463 +0,0 @@ -/** - * @license - * Copyright 2025 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -import { vi } from 'vitest'; -import * as fs from 'node:fs'; -import * as os from 'node:os'; -import * as path from 'node:path'; -import { - EXTENSIONS_CONFIG_FILENAME, - ExtensionStorage, - INSTALL_METADATA_FILENAME, - annotateActiveExtensions, - disableExtension, - enableExtension, - installExtension, - loadExtension, - loadExtensionConfig, - loadExtensions, - performWorkspaceExtensionMigration, - requestConsentNonInteractive, - uninstallExtension, - type Extension, -} from './extension.js'; -import { - QWEN_DIR, - type GeminiCLIExtension, - ExtensionUninstallEvent, - ExtensionDisableEvent, - ExtensionEnableEvent, -} from '@qwen-code/qwen-code-core'; -import { execSync } from 'node:child_process'; -import { SettingScope } from './settings.js'; -import { isWorkspaceTrusted } from './trustedFolders.js'; -import { createExtension } from '../test-utils/createExtension.js'; -import { ExtensionEnablementManager } from './extensions/extensionEnablement.js'; - -const mockGit = { - clone: vi.fn(), - getRemotes: vi.fn(), - fetch: vi.fn(), - checkout: vi.fn(), - listRemote: vi.fn(), - revparse: vi.fn(), - // Not a part of the actual API, but we need to use this to do the correct - // file system interactions. - path: vi.fn(), -}; - -vi.mock('simple-git', () => ({ - simpleGit: vi.fn((path: string) => { - mockGit.path.mockReturnValue(path); - return mockGit; - }), -})); - -vi.mock('./extensions/github.js', async (importOriginal) => { - const actual = - await importOriginal(); - return { - ...actual, - downloadFromGitHubRelease: vi - .fn() - .mockRejectedValue(new Error('Mocked GitHub release download failure')), - }; -}); - -vi.mock('os', async (importOriginal) => { - const mockedOs = await importOriginal(); - return { - ...mockedOs, - homedir: vi.fn(), - }; -}); - -vi.mock('./trustedFolders.js', async (importOriginal) => { - const actual = await importOriginal(); - return { - ...actual, - isWorkspaceTrusted: vi.fn(), - }; -}); - -const mockLogExtensionEnable = vi.hoisted(() => vi.fn()); -const mockLogExtensionInstallEvent = vi.hoisted(() => vi.fn()); -const mockLogExtensionUninstall = vi.hoisted(() => vi.fn()); -const mockLogExtensionDisable = vi.hoisted(() => vi.fn()); -vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => { - const actual = - await importOriginal(); - return { - ...actual, - logExtensionEnable: mockLogExtensionEnable, - logExtensionInstallEvent: mockLogExtensionInstallEvent, - logExtensionUninstall: mockLogExtensionUninstall, - logExtensionDisable: mockLogExtensionDisable, - ExtensionEnableEvent: vi.fn(), - ExtensionInstallEvent: vi.fn(), - ExtensionUninstallEvent: vi.fn(), - ExtensionDisableEvent: vi.fn(), - }; -}); - -vi.mock('child_process', async (importOriginal) => { - const actual = await importOriginal(); - return { - ...actual, - execSync: vi.fn(), - }; -}); - -const mockQuestion = vi.hoisted(() => vi.fn()); -const mockClose = vi.hoisted(() => vi.fn()); -vi.mock('node:readline', () => ({ - createInterface: vi.fn(() => ({ - question: mockQuestion, - close: mockClose, - })), -})); - -const EXTENSIONS_DIRECTORY_NAME = path.join(QWEN_DIR, 'extensions'); - -describe('extension tests', () => { - let tempHomeDir: string; - let tempWorkspaceDir: string; - let userExtensionsDir: string; - - beforeEach(() => { - tempHomeDir = fs.mkdtempSync( - path.join(os.tmpdir(), 'qwen-code-test-home-'), - ); - tempWorkspaceDir = fs.mkdtempSync( - path.join(tempHomeDir, 'qwen-code-test-workspace-'), - ); - userExtensionsDir = path.join(tempHomeDir, EXTENSIONS_DIRECTORY_NAME); - fs.mkdirSync(userExtensionsDir, { recursive: true }); - - vi.mocked(os.homedir).mockReturnValue(tempHomeDir); - vi.mocked(isWorkspaceTrusted).mockReturnValue(true); - vi.spyOn(process, 'cwd').mockReturnValue(tempWorkspaceDir); - mockQuestion.mockImplementation((_query, callback) => callback('y')); - vi.mocked(execSync).mockClear(); - Object.values(mockGit).forEach((fn) => fn.mockReset()); - }); - - afterEach(() => { - fs.rmSync(tempHomeDir, { recursive: true, force: true }); - fs.rmSync(tempWorkspaceDir, { recursive: true, force: true }); - vi.restoreAllMocks(); - mockQuestion.mockClear(); - mockClose.mockClear(); - }); - - describe('loadExtensions', () => { - it('should include extension path in loaded extension', () => { - const extensionDir = path.join(userExtensionsDir, 'test-extension'); - fs.mkdirSync(extensionDir, { recursive: true }); - - createExtension({ - extensionsDir: userExtensionsDir, - name: 'test-extension', - version: '1.0.0', - }); - - const extensions = loadExtensions( - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - ); - expect(extensions).toHaveLength(1); - expect(extensions[0].path).toBe(extensionDir); - expect(extensions[0].config.name).toBe('test-extension'); - }); - - it('should load context file path when QWEN.md is present', () => { - createExtension({ - extensionsDir: userExtensionsDir, - name: 'ext1', - version: '1.0.0', - addContextFile: true, - }); - createExtension({ - extensionsDir: userExtensionsDir, - name: 'ext2', - version: '2.0.0', - }); - - const extensions = loadExtensions( - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - ); - - expect(extensions).toHaveLength(2); - const ext1 = extensions.find((e) => e.config.name === 'ext1'); - const ext2 = extensions.find((e) => e.config.name === 'ext2'); - expect(ext1?.contextFiles).toEqual([ - path.join(userExtensionsDir, 'ext1', 'QWEN.md'), - ]); - expect(ext2?.contextFiles).toEqual([]); - }); - - it('should load context file path from the extension config', () => { - createExtension({ - extensionsDir: userExtensionsDir, - name: 'ext1', - version: '1.0.0', - addContextFile: false, - contextFileName: 'my-context-file.md', - }); - - const extensions = loadExtensions( - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - ); - - expect(extensions).toHaveLength(1); - const ext1 = extensions.find((e) => e.config.name === 'ext1'); - expect(ext1?.contextFiles).toEqual([ - path.join(userExtensionsDir, 'ext1', 'my-context-file.md'), - ]); - }); - - it('should filter out disabled extensions', () => { - createExtension({ - extensionsDir: userExtensionsDir, - name: 'disabled-extension', - version: '1.0.0', - }); - createExtension({ - extensionsDir: userExtensionsDir, - name: 'enabled-extension', - version: '2.0.0', - }); - disableExtension( - 'disabled-extension', - SettingScope.User, - tempWorkspaceDir, - ); - const manager = new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - ); - const extensions = loadExtensions(manager); - const activeExtensions = annotateActiveExtensions( - extensions, - tempWorkspaceDir, - manager, - ).filter((e) => e.isActive); - expect(activeExtensions).toHaveLength(1); - expect(activeExtensions[0].name).toBe('enabled-extension'); - }); - - it('should hydrate variables', () => { - createExtension({ - extensionsDir: userExtensionsDir, - name: 'test-extension', - version: '1.0.0', - addContextFile: false, - contextFileName: undefined, - mcpServers: { - 'test-server': { - cwd: '${extensionPath}${/}server', - }, - }, - }); - - const extensions = loadExtensions( - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - ); - expect(extensions).toHaveLength(1); - const loadedConfig = extensions[0].config; - const expectedCwd = path.join( - userExtensionsDir, - 'test-extension', - 'server', - ); - expect(loadedConfig.mcpServers?.['test-server'].cwd).toBe(expectedCwd); - }); - - it('should load a linked extension correctly', async () => { - const sourceExtDir = createExtension({ - extensionsDir: tempWorkspaceDir, - name: 'my-linked-extension', - version: '1.0.0', - contextFileName: 'context.md', - }); - fs.writeFileSync(path.join(sourceExtDir, 'context.md'), 'linked context'); - - const extensionName = await installExtension( - { - source: sourceExtDir, - type: 'link', - }, - async (_) => true, - ); - - expect(extensionName).toEqual('my-linked-extension'); - const extensions = loadExtensions( - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - ); - expect(extensions).toHaveLength(1); - - const linkedExt = extensions[0]; - expect(linkedExt.config.name).toBe('my-linked-extension'); - - expect(linkedExt.path).toBe(sourceExtDir); - expect(linkedExt.installMetadata).toEqual({ - source: sourceExtDir, - type: 'link', - }); - expect(linkedExt.contextFiles).toEqual([ - path.join(sourceExtDir, 'context.md'), - ]); - }); - - it('should resolve environment variables in extension configuration', () => { - process.env.TEST_API_KEY = 'test-api-key-123'; - process.env.TEST_DB_URL = 'postgresql://localhost:5432/testdb'; - - try { - const userExtensionsDir = path.join( - tempHomeDir, - EXTENSIONS_DIRECTORY_NAME, - ); - fs.mkdirSync(userExtensionsDir, { recursive: true }); - - const extDir = path.join(userExtensionsDir, 'test-extension'); - fs.mkdirSync(extDir); - - // Write config to a separate file for clarity and good practices - const configPath = path.join(extDir, EXTENSIONS_CONFIG_FILENAME); - const extensionConfig = { - name: 'test-extension', - version: '1.0.0', - mcpServers: { - 'test-server': { - command: 'node', - args: ['server.js'], - env: { - API_KEY: '$TEST_API_KEY', - DATABASE_URL: '${TEST_DB_URL}', - STATIC_VALUE: 'no-substitution', - }, - }, - }, - }; - fs.writeFileSync(configPath, JSON.stringify(extensionConfig)); - - const extensions = loadExtensions( - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - ), - ); - - expect(extensions).toHaveLength(1); - const extension = extensions[0]; - expect(extension.config.name).toBe('test-extension'); - expect(extension.config.mcpServers).toBeDefined(); - - const serverConfig = extension.config.mcpServers?.['test-server']; - expect(serverConfig).toBeDefined(); - expect(serverConfig?.env).toBeDefined(); - expect(serverConfig?.env?.API_KEY).toBe('test-api-key-123'); - expect(serverConfig?.env?.DATABASE_URL).toBe( - 'postgresql://localhost:5432/testdb', - ); - expect(serverConfig?.env?.STATIC_VALUE).toBe('no-substitution'); - } finally { - delete process.env.TEST_API_KEY; - delete process.env.TEST_DB_URL; - } - }); - - it('should handle missing environment variables gracefully', () => { - const userExtensionsDir = path.join( - tempHomeDir, - EXTENSIONS_DIRECTORY_NAME, - ); - fs.mkdirSync(userExtensionsDir, { recursive: true }); - - const extDir = path.join(userExtensionsDir, 'test-extension'); - fs.mkdirSync(extDir); - - const extensionConfig = { - name: 'test-extension', - version: '1.0.0', - mcpServers: { - 'test-server': { - command: 'node', - args: ['server.js'], - env: { - MISSING_VAR: '$UNDEFINED_ENV_VAR', - MISSING_VAR_BRACES: '${ALSO_UNDEFINED}', - }, - }, - }, - }; - - fs.writeFileSync( - path.join(extDir, EXTENSIONS_CONFIG_FILENAME), - JSON.stringify(extensionConfig), - ); - - const extensions = loadExtensions( - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - ); - - expect(extensions).toHaveLength(1); - const extension = extensions[0]; - const serverConfig = extension.config.mcpServers!['test-server']; - expect(serverConfig.env).toBeDefined(); - expect(serverConfig.env!.MISSING_VAR).toBe('$UNDEFINED_ENV_VAR'); - expect(serverConfig.env!.MISSING_VAR_BRACES).toBe('${ALSO_UNDEFINED}'); - }); - - it('should skip extensions with invalid JSON and log a warning', () => { - const consoleSpy = vi - .spyOn(console, 'error') - .mockImplementation(() => {}); - - // Good extension - createExtension({ - extensionsDir: userExtensionsDir, - name: 'good-ext', - version: '1.0.0', - }); - - // Bad extension - const badExtDir = path.join(userExtensionsDir, 'bad-ext'); - fs.mkdirSync(badExtDir); - const badConfigPath = path.join(badExtDir, EXTENSIONS_CONFIG_FILENAME); - fs.writeFileSync(badConfigPath, '{ "name": "bad-ext"'); // Malformed - - const extensions = loadExtensions( - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - ); - - expect(extensions).toHaveLength(1); - expect(extensions[0].config.name).toBe('good-ext'); - expect(consoleSpy).toHaveBeenCalledWith( - expect.stringContaining( - `Warning: Skipping extension in ${badExtDir}: Failed to load extension config from ${badConfigPath}`, - ), - ); - - consoleSpy.mockRestore(); - }); - - it('should skip extensions with missing name and log a warning', () => { - const consoleSpy = vi - .spyOn(console, 'error') - .mockImplementation(() => {}); - - // Good extension - createExtension({ - extensionsDir: userExtensionsDir, - name: 'good-ext', - version: '1.0.0', - }); - - // Bad extension - const badExtDir = path.join(userExtensionsDir, 'bad-ext-no-name'); - fs.mkdirSync(badExtDir); - const badConfigPath = path.join(badExtDir, EXTENSIONS_CONFIG_FILENAME); - fs.writeFileSync(badConfigPath, JSON.stringify({ version: '1.0.0' })); - - const extensions = loadExtensions( - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - ); - - expect(extensions).toHaveLength(1); - expect(extensions[0].config.name).toBe('good-ext'); - expect(consoleSpy).toHaveBeenCalledWith( - expect.stringContaining( - `Warning: Skipping extension in ${badExtDir}: Failed to load extension config from ${badConfigPath}: Invalid configuration in ${badConfigPath}: missing "name"`, - ), - ); - - consoleSpy.mockRestore(); - }); - - it('should filter trust out of mcp servers', () => { - createExtension({ - extensionsDir: userExtensionsDir, - name: 'test-extension', - version: '1.0.0', - mcpServers: { - 'test-server': { - command: 'node', - args: ['server.js'], - trust: true, - }, - }, - }); - - const extensions = loadExtensions( - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - ); - expect(extensions).toHaveLength(1); - const loadedConfig = extensions[0].config; - expect(loadedConfig.mcpServers?.['test-server'].trust).toBeUndefined(); - }); - - it('should throw an error for invalid extension names', () => { - const consoleSpy = vi - .spyOn(console, 'error') - .mockImplementation(() => {}); - const badExtDir = createExtension({ - extensionsDir: userExtensionsDir, - name: 'bad_name', - version: '1.0.0', - }); - - const extension = loadExtension({ - extensionDir: badExtDir, - workspaceDir: tempWorkspaceDir, - }); - - expect(extension).toBeNull(); - expect(consoleSpy).toHaveBeenCalledWith( - expect.stringContaining('Invalid extension name: "bad_name"'), - ); - consoleSpy.mockRestore(); - }); - }); - - describe('annotateActiveExtensions', () => { - const extensions: Extension[] = [ - { - path: '/path/to/ext1', - config: { name: 'ext1', version: '1.0.0' }, - contextFiles: [], - }, - { - path: '/path/to/ext2', - config: { name: 'ext2', version: '1.0.0' }, - contextFiles: [], - }, - { - path: '/path/to/ext3', - config: { name: 'ext3', version: '1.0.0' }, - contextFiles: [], - }, - ]; - - it('should mark all extensions as active if no enabled extensions are provided', () => { - const activeExtensions = annotateActiveExtensions( - extensions, - '/path/to/workspace', - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - ); - expect(activeExtensions).toHaveLength(3); - expect(activeExtensions.every((e) => e.isActive)).toBe(true); - }); - - it('should mark only the enabled extensions as active', () => { - const activeExtensions = annotateActiveExtensions( - extensions, - '/path/to/workspace', - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - ['ext1', 'ext3'], - ), - ); - expect(activeExtensions).toHaveLength(3); - expect(activeExtensions.find((e) => e.name === 'ext1')?.isActive).toBe( - true, - ); - expect(activeExtensions.find((e) => e.name === 'ext2')?.isActive).toBe( - false, - ); - expect(activeExtensions.find((e) => e.name === 'ext3')?.isActive).toBe( - true, - ); - }); - - it('should mark all extensions as inactive when "none" is provided', () => { - const activeExtensions = annotateActiveExtensions( - extensions, - '/path/to/workspace', - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - ['none'], - ), - ); - expect(activeExtensions).toHaveLength(3); - expect(activeExtensions.every((e) => !e.isActive)).toBe(true); - }); - - it('should handle case-insensitivity', () => { - const activeExtensions = annotateActiveExtensions( - extensions, - '/path/to/workspace', - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - ['EXT1'], - ), - ); - expect(activeExtensions.find((e) => e.name === 'ext1')?.isActive).toBe( - true, - ); - }); - - it('should log an error for unknown extensions', () => { - const consoleSpy = vi - .spyOn(console, 'error') - .mockImplementation(() => {}); - annotateActiveExtensions( - extensions, - '/path/to/workspace', - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - ['ext4'], - ), - ); - expect(consoleSpy).toHaveBeenCalledWith('Extension not found: ext4'); - consoleSpy.mockRestore(); - }); - - describe('autoUpdate', () => { - it('should be false if autoUpdate is not set in install metadata', () => { - const activeExtensions = annotateActiveExtensions( - extensions, - tempHomeDir, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - ), - ); - expect( - activeExtensions.every( - (e) => e.installMetadata?.autoUpdate === false, - ), - ).toBe(false); - }); - - it('should be true if autoUpdate is true in install metadata', () => { - const extensionsWithAutoUpdate: Extension[] = extensions.map((e) => ({ - ...e, - installMetadata: { - ...e.installMetadata!, - autoUpdate: true, - }, - })); - const activeExtensions = annotateActiveExtensions( - extensionsWithAutoUpdate, - tempHomeDir, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - ), - ); - expect( - activeExtensions.every((e) => e.installMetadata?.autoUpdate === true), - ).toBe(true); - }); - - it('should respect the per-extension settings from install metadata', () => { - const extensionsWithAutoUpdate: Extension[] = [ - { - path: '/path/to/ext1', - config: { name: 'ext1', version: '1.0.0' }, - contextFiles: [], - installMetadata: { - source: 'test', - type: 'local', - autoUpdate: true, - }, - }, - { - path: '/path/to/ext2', - config: { name: 'ext2', version: '1.0.0' }, - contextFiles: [], - installMetadata: { - source: 'test', - type: 'local', - autoUpdate: false, - }, - }, - { - path: '/path/to/ext3', - config: { name: 'ext3', version: '1.0.0' }, - contextFiles: [], - }, - ]; - const activeExtensions = annotateActiveExtensions( - extensionsWithAutoUpdate, - tempHomeDir, - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - ), - ); - expect( - activeExtensions.find((e) => e.name === 'ext1')?.installMetadata - ?.autoUpdate, - ).toBe(true); - expect( - activeExtensions.find((e) => e.name === 'ext2')?.installMetadata - ?.autoUpdate, - ).toBe(false); - expect( - activeExtensions.find((e) => e.name === 'ext3')?.installMetadata - ?.autoUpdate, - ).toBe(undefined); - }); - }); - }); - - describe('installExtension', () => { - it('should install an extension from a local path', async () => { - const sourceExtDir = createExtension({ - extensionsDir: tempHomeDir, - name: 'my-local-extension', - version: '1.0.0', - }); - const targetExtDir = path.join(userExtensionsDir, 'my-local-extension'); - const metadataPath = path.join(targetExtDir, INSTALL_METADATA_FILENAME); - - await installExtension( - { source: sourceExtDir, type: 'local' }, - async (_) => true, - ); - - expect(fs.existsSync(targetExtDir)).toBe(true); - expect(fs.existsSync(metadataPath)).toBe(true); - const metadata = JSON.parse(fs.readFileSync(metadataPath, 'utf-8')); - expect(metadata).toEqual({ - source: sourceExtDir, - type: 'local', - }); - fs.rmSync(targetExtDir, { recursive: true, force: true }); - }); - - it('should throw an error if the extension already exists', async () => { - const sourceExtDir = createExtension({ - extensionsDir: tempHomeDir, - name: 'my-local-extension', - version: '1.0.0', - }); - await installExtension( - { source: sourceExtDir, type: 'local' }, - async (_) => true, - ); - await expect( - installExtension( - { source: sourceExtDir, type: 'local' }, - async (_) => true, - ), - ).rejects.toThrow( - 'Extension "my-local-extension" is already installed. Please uninstall it first.', - ); - }); - - it('should throw an error and cleanup if qwen-extension.json is missing', async () => { - const sourceExtDir = path.join(tempHomeDir, 'bad-extension'); - fs.mkdirSync(sourceExtDir, { recursive: true }); - const configPath = path.join(sourceExtDir, EXTENSIONS_CONFIG_FILENAME); - - await expect( - installExtension( - { source: sourceExtDir, type: 'local' }, - async (_) => true, - ), - ).rejects.toThrow(`Configuration file not found at ${configPath}`); - - const targetExtDir = path.join(userExtensionsDir, 'bad-extension'); - expect(fs.existsSync(targetExtDir)).toBe(false); - }); - - it('should throw an error for invalid JSON in qwen-extension.json', async () => { - const sourceExtDir = path.join(tempHomeDir, 'bad-json-ext'); - fs.mkdirSync(sourceExtDir, { recursive: true }); - const configPath = path.join(sourceExtDir, EXTENSIONS_CONFIG_FILENAME); - fs.writeFileSync(configPath, '{ "name": "bad-json", "version": "1.0.0"'); // Malformed JSON - - await expect( - installExtension( - { source: sourceExtDir, type: 'local' }, - async (_) => true, - ), - ).rejects.toThrow( - new RegExp( - `^Failed to load extension config from ${configPath.replace( - /\\/g, - '\\\\', - )}`, - ), - ); - }); - - it('should throw an error for missing name in qwen-extension.json', async () => { - const sourceExtDir = createExtension({ - extensionsDir: tempHomeDir, - name: 'missing-name-ext', - version: '1.0.0', - }); - const configPath = path.join(sourceExtDir, EXTENSIONS_CONFIG_FILENAME); - // Overwrite with invalid config - fs.writeFileSync(configPath, JSON.stringify({ version: '1.0.0' })); - - await expect( - installExtension( - { source: sourceExtDir, type: 'local' }, - async (_) => true, - ), - ).rejects.toThrow( - `Invalid configuration in ${configPath}: missing "name"`, - ); - }); - - it('should install an extension from a git URL', async () => { - const gitUrl = 'https://github.com/google/gemini-extensions.git'; - const extensionName = 'qwen-extensions'; - const targetExtDir = path.join(userExtensionsDir, extensionName); - const metadataPath = path.join(targetExtDir, INSTALL_METADATA_FILENAME); - - mockGit.clone.mockImplementation(async (_, destination) => { - fs.mkdirSync(path.join(mockGit.path(), destination), { - recursive: true, - }); - fs.writeFileSync( - path.join(mockGit.path(), destination, EXTENSIONS_CONFIG_FILENAME), - JSON.stringify({ name: extensionName, version: '1.0.0' }), - ); - }); - mockGit.getRemotes.mockResolvedValue([{ name: 'origin' }]); - - await installExtension( - { source: gitUrl, type: 'git' }, - async (_) => true, - ); - - expect(fs.existsSync(targetExtDir)).toBe(true); - expect(fs.existsSync(metadataPath)).toBe(true); - const metadata = JSON.parse(fs.readFileSync(metadataPath, 'utf-8')); - expect(metadata).toEqual({ - source: gitUrl, - type: 'git', - }); - fs.rmSync(targetExtDir, { recursive: true, force: true }); - }); - - it('should install a linked extension', async () => { - const sourceExtDir = createExtension({ - extensionsDir: tempHomeDir, - name: 'my-linked-extension', - version: '1.0.0', - }); - const targetExtDir = path.join(userExtensionsDir, 'my-linked-extension'); - const metadataPath = path.join(targetExtDir, INSTALL_METADATA_FILENAME); - const configPath = path.join(targetExtDir, EXTENSIONS_CONFIG_FILENAME); - - await installExtension( - { source: sourceExtDir, type: 'link' }, - async (_) => true, - ); - - expect(fs.existsSync(targetExtDir)).toBe(true); - expect(fs.existsSync(metadataPath)).toBe(true); - - expect(fs.existsSync(configPath)).toBe(false); - - const metadata = JSON.parse(fs.readFileSync(metadataPath, 'utf-8')); - expect(metadata).toEqual({ - source: sourceExtDir, - type: 'link', - }); - fs.rmSync(targetExtDir, { recursive: true, force: true }); - }); - - it('should log to clearcut on successful install', async () => { - const sourceExtDir = createExtension({ - extensionsDir: tempHomeDir, - name: 'my-local-extension', - version: '1.0.0', - }); - - await installExtension( - { source: sourceExtDir, type: 'local' }, - async (_) => true, - ); - - expect(mockLogExtensionInstallEvent).toHaveBeenCalled(); - }); - - it('should show users information on their mcp server when installing', async () => { - const consoleInfoSpy = vi.spyOn(console, 'info'); - const sourceExtDir = createExtension({ - extensionsDir: tempHomeDir, - name: 'my-local-extension', - version: '1.0.0', - mcpServers: { - 'test-server': { - command: 'node', - args: ['server.js'], - description: 'a local mcp server', - }, - 'test-server-2': { - description: 'a remote mcp server', - httpUrl: 'https://google.com', - }, - }, - }); - - mockQuestion.mockImplementation((_query, callback) => callback('y')); - - await expect( - installExtension( - { source: sourceExtDir, type: 'local' }, - requestConsentNonInteractive, - ), - ).resolves.toBe('my-local-extension'); - - expect(consoleInfoSpy).toHaveBeenCalledWith( - `Installing extension "my-local-extension". -**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.** -This extension will run the following MCP servers: - * test-server (local): node server.js - * test-server-2 (remote): https://google.com`, - ); - }); - - it('should continue installation if user accepts prompt for local extension with mcp servers', async () => { - const sourceExtDir = createExtension({ - extensionsDir: tempHomeDir, - name: 'my-local-extension', - version: '1.0.0', - mcpServers: { - 'test-server': { - command: 'node', - args: ['server.js'], - }, - }, - }); - - mockQuestion.mockImplementation((_query, callback) => callback('y')); - - await expect( - installExtension( - { source: sourceExtDir, type: 'local' }, - requestConsentNonInteractive, - ), - ).resolves.toBe('my-local-extension'); - - expect(mockQuestion).toHaveBeenCalledWith( - expect.stringContaining('Do you want to continue? [Y/n]: '), - expect.any(Function), - ); - }); - - it('should cancel installation if user declines prompt for local extension with mcp servers', async () => { - const sourceExtDir = createExtension({ - extensionsDir: tempHomeDir, - name: 'my-local-extension', - version: '1.0.0', - mcpServers: { - 'test-server': { - command: 'node', - args: ['server.js'], - }, - }, - }); - - mockQuestion.mockImplementation((_query, callback) => callback('n')); - - await expect( - installExtension( - { source: sourceExtDir, type: 'local' }, - requestConsentNonInteractive, - ), - ).rejects.toThrow('Installation cancelled for "my-local-extension".'); - - expect(mockQuestion).toHaveBeenCalledWith( - expect.stringContaining('Do you want to continue? [Y/n]: '), - expect.any(Function), - ); - }); - - it('should save the autoUpdate flag to the install metadata', async () => { - const sourceExtDir = createExtension({ - extensionsDir: tempHomeDir, - name: 'my-local-extension', - version: '1.0.0', - }); - const targetExtDir = path.join(userExtensionsDir, 'my-local-extension'); - const metadataPath = path.join(targetExtDir, INSTALL_METADATA_FILENAME); - - await installExtension( - { - source: sourceExtDir, - type: 'local', - autoUpdate: true, - }, - async (_) => true, - ); - - expect(fs.existsSync(targetExtDir)).toBe(true); - expect(fs.existsSync(metadataPath)).toBe(true); - const metadata = JSON.parse(fs.readFileSync(metadataPath, 'utf-8')); - expect(metadata).toEqual({ - source: sourceExtDir, - type: 'local', - autoUpdate: true, - }); - fs.rmSync(targetExtDir, { recursive: true, force: true }); - }); - - it('should ignore consent flow if not required', async () => { - const sourceExtDir = createExtension({ - extensionsDir: tempHomeDir, - name: 'my-local-extension', - version: '1.0.0', - mcpServers: { - 'test-server': { - command: 'node', - args: ['server.js'], - }, - }, - }); - - const mockRequestConsent = vi.fn(); - - await expect( - installExtension( - { source: sourceExtDir, type: 'local' }, - mockRequestConsent, - process.cwd(), - // Provide its own existing config as the previous config. - await loadExtensionConfig({ - extensionDir: sourceExtDir, - workspaceDir: process.cwd(), - }), - ), - ).resolves.toBe('my-local-extension'); - - expect(mockRequestConsent).not.toHaveBeenCalled(); - }); - - it('should throw an error for invalid extension names', async () => { - const sourceExtDir = createExtension({ - extensionsDir: tempHomeDir, - name: 'bad_name', - version: '1.0.0', - }); - - await expect( - installExtension({ source: sourceExtDir, type: 'local' }), - ).rejects.toThrow('Invalid extension name: "bad_name"'); - }); - }); - - describe('uninstallExtension', () => { - it('should uninstall an extension by name', async () => { - const sourceExtDir = createExtension({ - extensionsDir: userExtensionsDir, - name: 'my-local-extension', - version: '1.0.0', - }); - - await uninstallExtension('my-local-extension'); - - expect(fs.existsSync(sourceExtDir)).toBe(false); - }); - - it('should uninstall an extension by name and retain existing extensions', async () => { - const sourceExtDir = createExtension({ - extensionsDir: userExtensionsDir, - name: 'my-local-extension', - version: '1.0.0', - }); - const otherExtDir = createExtension({ - extensionsDir: userExtensionsDir, - name: 'other-extension', - version: '1.0.0', - }); - - await uninstallExtension('my-local-extension'); - - expect(fs.existsSync(sourceExtDir)).toBe(false); - expect( - loadExtensions( - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - ), - ), - ).toHaveLength(1); - expect(fs.existsSync(otherExtDir)).toBe(true); - }); - - it('should throw an error if the extension does not exist', async () => { - await expect(uninstallExtension('nonexistent-extension')).rejects.toThrow( - 'Extension not found.', - ); - }); - - it('should log uninstall event', async () => { - createExtension({ - extensionsDir: userExtensionsDir, - name: 'my-local-extension', - version: '1.0.0', - }); - - await uninstallExtension('my-local-extension'); - - expect(mockLogExtensionUninstall).toHaveBeenCalled(); - expect(ExtensionUninstallEvent).toHaveBeenCalledWith( - 'my-local-extension', - 'success', - ); - }); - - it('should uninstall an extension by its source URL', async () => { - const gitUrl = 'https://github.com/google/gemini-sql-extension.git'; - const sourceExtDir = createExtension({ - extensionsDir: userExtensionsDir, - name: 'gemini-sql-extension', - version: '1.0.0', - installMetadata: { - source: gitUrl, - type: 'git', - }, - }); - - await uninstallExtension(gitUrl); - - expect(fs.existsSync(sourceExtDir)).toBe(false); - expect(mockLogExtensionUninstall).toHaveBeenCalled(); - expect(ExtensionUninstallEvent).toHaveBeenCalledWith( - 'gemini-sql-extension', - 'success', - ); - }); - - it('should fail to uninstall by URL if an extension has no install metadata', async () => { - createExtension({ - extensionsDir: userExtensionsDir, - name: 'no-metadata-extension', - version: '1.0.0', - // No installMetadata provided - }); - - await expect( - uninstallExtension('https://github.com/google/no-metadata-extension'), - ).rejects.toThrow('Extension not found.'); - }); - }); - - describe('performWorkspaceExtensionMigration', () => { - let workspaceExtensionsDir: string; - - beforeEach(() => { - workspaceExtensionsDir = path.join( - tempWorkspaceDir, - EXTENSIONS_DIRECTORY_NAME, - ); - fs.mkdirSync(workspaceExtensionsDir, { recursive: true }); - }); - - afterEach(() => { - fs.rmSync(workspaceExtensionsDir, { recursive: true, force: true }); - }); - - describe('folder trust', () => { - it('refuses to install extensions from untrusted folders', async () => { - vi.mocked(isWorkspaceTrusted).mockReturnValue(false); - const ext1Path = createExtension({ - extensionsDir: workspaceExtensionsDir, - name: 'ext1', - version: '1.0.0', - }); - - const failed = await performWorkspaceExtensionMigration([ - loadExtension({ - extensionDir: ext1Path, - workspaceDir: tempWorkspaceDir, - })!, - ]); - - expect(failed).toEqual(['ext1']); - }); - - it('does not copy extensions to the user dir', async () => { - vi.mocked(isWorkspaceTrusted).mockReturnValue(false); - const ext1Path = createExtension({ - extensionsDir: workspaceExtensionsDir, - name: 'ext1', - version: '1.0.0', - }); - - await performWorkspaceExtensionMigration( - [ - loadExtension({ - extensionDir: ext1Path, - workspaceDir: tempWorkspaceDir, - })!, - ], - async (_) => true, - ); - - const userExtensionsDir = path.join( - tempHomeDir, - QWEN_DIR, - 'extensions', - ); - expect(fs.readdirSync(userExtensionsDir).length).toBe(0); - }); - - it('does not load any extensions in the workspace config', async () => { - vi.mocked(isWorkspaceTrusted).mockReturnValue(false); - const ext1Path = createExtension({ - extensionsDir: workspaceExtensionsDir, - name: 'ext1', - version: '1.0.0', - }); - - await performWorkspaceExtensionMigration( - [ - loadExtension({ - extensionDir: ext1Path, - workspaceDir: tempWorkspaceDir, - })!, - ], - async (_) => true, - ); - const extensions = loadExtensions( - new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - ), - ); - - expect(extensions).toEqual([]); - }); - }); - - it('should install the extensions in the user directory', async () => { - const ext1Path = createExtension({ - extensionsDir: workspaceExtensionsDir, - name: 'ext1', - version: '1.0.0', - }); - const ext2Path = createExtension({ - extensionsDir: workspaceExtensionsDir, - name: 'ext2', - version: '1.0.0', - }); - const extensionsToMigrate: Extension[] = [ - loadExtension({ - extensionDir: ext1Path, - workspaceDir: tempWorkspaceDir, - })!, - loadExtension({ - extensionDir: ext2Path, - workspaceDir: tempWorkspaceDir, - })!, - ]; - const failed = await performWorkspaceExtensionMigration( - extensionsToMigrate, - async (_) => true, - ); - - expect(failed).toEqual([]); - - const userExtensionsDir = path.join(tempHomeDir, QWEN_DIR, 'extensions'); - const userExt1Path = path.join(userExtensionsDir, 'ext1'); - const extensions = loadExtensions( - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - ); - - expect(extensions).toHaveLength(2); - const metadataPath = path.join(userExt1Path, INSTALL_METADATA_FILENAME); - expect(fs.existsSync(metadataPath)).toBe(true); - const metadata = JSON.parse(fs.readFileSync(metadataPath, 'utf-8')); - expect(metadata).toEqual({ - source: ext1Path, - type: 'local', - }); - }); - - it('should return the names of failed installations', async () => { - const ext1Path = createExtension({ - extensionsDir: workspaceExtensionsDir, - name: 'ext1', - version: '1.0.0', - }); - - const extensions: Extension[] = [ - loadExtension({ - extensionDir: ext1Path, - workspaceDir: tempWorkspaceDir, - })!, - { - path: '/ext/path/1', - config: { name: 'ext2', version: '1.0.0' }, - contextFiles: [], - }, - ]; - - const failed = await performWorkspaceExtensionMigration( - extensions, - async (_) => true, - ); - expect(failed).toEqual(['ext2']); - }); - }); - - describe('disableExtension', () => { - it('should disable an extension at the user scope', () => { - createExtension({ - extensionsDir: userExtensionsDir, - name: 'my-extension', - version: '1.0.0', - }); - - disableExtension('my-extension', SettingScope.User); - expect( - isEnabled({ - name: 'my-extension', - configDir: userExtensionsDir, - enabledForPath: tempWorkspaceDir, - }), - ).toBe(false); - }); - - it('should disable an extension at the workspace scope', () => { - createExtension({ - extensionsDir: userExtensionsDir, - name: 'my-extension', - version: '1.0.0', - }); - - disableExtension( - 'my-extension', - SettingScope.Workspace, - tempWorkspaceDir, - ); - expect( - isEnabled({ - name: 'my-extension', - configDir: userExtensionsDir, - enabledForPath: tempHomeDir, - }), - ).toBe(true); - expect( - isEnabled({ - name: 'my-extension', - configDir: userExtensionsDir, - enabledForPath: tempWorkspaceDir, - }), - ).toBe(false); - }); - - it('should handle disabling the same extension twice', () => { - createExtension({ - extensionsDir: userExtensionsDir, - name: 'my-extension', - version: '1.0.0', - }); - - disableExtension('my-extension', SettingScope.User); - disableExtension('my-extension', SettingScope.User); - expect( - isEnabled({ - name: 'my-extension', - configDir: userExtensionsDir, - enabledForPath: tempWorkspaceDir, - }), - ).toBe(false); - }); - - it('should throw an error if you request system scope', () => { - expect(() => - disableExtension('my-extension', SettingScope.System), - ).toThrow('System and SystemDefaults scopes are not supported.'); - }); - - it('should log a disable event', () => { - createExtension({ - extensionsDir: userExtensionsDir, - name: 'ext1', - version: '1.0.0', - }); - - disableExtension('ext1', SettingScope.Workspace); - - expect(mockLogExtensionDisable).toHaveBeenCalled(); - expect(ExtensionDisableEvent).toHaveBeenCalledWith( - 'ext1', - SettingScope.Workspace, - ); - }); - }); - - describe('enableExtension', () => { - afterAll(() => { - vi.restoreAllMocks(); - }); - - const getActiveExtensions = (): GeminiCLIExtension[] => { - const manager = new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - ); - const extensions = loadExtensions(manager); - const activeExtensions = annotateActiveExtensions( - extensions, - tempWorkspaceDir, - manager, - ); - return activeExtensions.filter((e) => e.isActive); - }; - - it('should enable an extension at the user scope', () => { - createExtension({ - extensionsDir: userExtensionsDir, - name: 'ext1', - version: '1.0.0', - }); - disableExtension('ext1', SettingScope.User); - let activeExtensions = getActiveExtensions(); - expect(activeExtensions).toHaveLength(0); - - enableExtension('ext1', SettingScope.User); - activeExtensions = getActiveExtensions(); - expect(activeExtensions).toHaveLength(1); - expect(activeExtensions[0].name).toBe('ext1'); - }); - - it('should enable an extension at the workspace scope', () => { - createExtension({ - extensionsDir: userExtensionsDir, - name: 'ext1', - version: '1.0.0', - }); - disableExtension('ext1', SettingScope.Workspace); - let activeExtensions = getActiveExtensions(); - expect(activeExtensions).toHaveLength(0); - - enableExtension('ext1', SettingScope.Workspace); - activeExtensions = getActiveExtensions(); - expect(activeExtensions).toHaveLength(1); - expect(activeExtensions[0].name).toBe('ext1'); - }); - - it('should log an enable event', () => { - createExtension({ - extensionsDir: userExtensionsDir, - name: 'ext1', - version: '1.0.0', - }); - disableExtension('ext1', SettingScope.Workspace); - enableExtension('ext1', SettingScope.Workspace); - - expect(mockLogExtensionEnable).toHaveBeenCalled(); - expect(ExtensionEnableEvent).toHaveBeenCalledWith( - 'ext1', - SettingScope.Workspace, - ); - }); - }); -}); - -function isEnabled(options: { - name: string; - configDir: string; - enabledForPath: string; -}) { - const manager = new ExtensionEnablementManager(options.configDir); - return manager.isEnabled(options.name, options.enabledForPath); -} diff --git a/packages/cli/src/config/extension.ts b/packages/cli/src/config/extension.ts deleted file mode 100644 index 2d30cc41f..000000000 --- a/packages/cli/src/config/extension.ts +++ /dev/null @@ -1,786 +0,0 @@ -/** - * @license - * Copyright 2025 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -import type { - MCPServerConfig, - GeminiCLIExtension, - ExtensionInstallMetadata, -} from '@qwen-code/qwen-code-core'; -import { - QWEN_DIR, - Storage, - Config, - ExtensionInstallEvent, - ExtensionUninstallEvent, - ExtensionDisableEvent, - ExtensionEnableEvent, - logExtensionEnable, - logExtensionInstallEvent, - logExtensionUninstall, - logExtensionDisable, -} from '@qwen-code/qwen-code-core'; -import * as fs from 'node:fs'; -import * as path from 'node:path'; -import * as os from 'node:os'; -import { SettingScope, loadSettings } from '../config/settings.js'; -import { getErrorMessage } from '../utils/errors.js'; -import { recursivelyHydrateStrings } from './extensions/variables.js'; -import { isWorkspaceTrusted } from './trustedFolders.js'; -import { resolveEnvVarsInObject } from '../utils/envVarResolver.js'; -import { - cloneFromGit, - downloadFromGitHubRelease, -} from './extensions/github.js'; -import type { LoadExtensionContext } from './extensions/variableSchema.js'; -import { ExtensionEnablementManager } from './extensions/extensionEnablement.js'; -import chalk from 'chalk'; -import type { ConfirmationRequest } from '../ui/types.js'; - -export const EXTENSIONS_DIRECTORY_NAME = path.join(QWEN_DIR, 'extensions'); - -export const EXTENSIONS_CONFIG_FILENAME = 'qwen-extension.json'; -export const INSTALL_METADATA_FILENAME = '.qwen-extension-install.json'; - -export interface Extension { - path: string; - config: ExtensionConfig; - contextFiles: string[]; - installMetadata?: ExtensionInstallMetadata | undefined; -} - -export interface ExtensionConfig { - name: string; - version: string; - mcpServers?: Record; - contextFileName?: string | string[]; - excludeTools?: string[]; -} - -export interface ExtensionUpdateInfo { - name: string; - originalVersion: string; - updatedVersion: string; -} - -export class ExtensionStorage { - private readonly extensionName: string; - - constructor(extensionName: string) { - this.extensionName = extensionName; - } - - getExtensionDir(): string { - return path.join( - ExtensionStorage.getUserExtensionsDir(), - this.extensionName, - ); - } - - getConfigPath(): string { - return path.join(this.getExtensionDir(), EXTENSIONS_CONFIG_FILENAME); - } - - static getUserExtensionsDir(): string { - const storage = new Storage(os.homedir()); - return storage.getExtensionsDir(); - } - - static async createTmpDir(): Promise { - return await fs.promises.mkdtemp(path.join(os.tmpdir(), 'qwen-extension')); - } -} - -export function getWorkspaceExtensions(workspaceDir: string): Extension[] { - // If the workspace dir is the user extensions dir, there are no workspace extensions. - if (path.resolve(workspaceDir) === path.resolve(os.homedir())) { - return []; - } - return loadExtensionsFromDir(workspaceDir); -} - -export async function copyExtension( - source: string, - destination: string, -): Promise { - await fs.promises.cp(source, destination, { recursive: true }); -} - -export async function performWorkspaceExtensionMigration( - extensions: Extension[], - requestConsent: (consent: string) => Promise, -): Promise { - const failedInstallNames: string[] = []; - - for (const extension of extensions) { - try { - const installMetadata: ExtensionInstallMetadata = { - source: extension.path, - type: 'local', - }; - await installExtension(installMetadata, requestConsent); - } catch (_) { - failedInstallNames.push(extension.config.name); - } - } - return failedInstallNames; -} - -function getTelemetryConfig(cwd: string) { - const settings = loadSettings(cwd); - const config = new Config({ - telemetry: settings.merged.telemetry, - interactive: false, - targetDir: cwd, - cwd, - model: '', - debugMode: false, - }); - return config; -} - -export function loadExtensions( - extensionEnablementManager: ExtensionEnablementManager, - workspaceDir: string = process.cwd(), -): Extension[] { - const settings = loadSettings(workspaceDir).merged; - const allExtensions = [...loadUserExtensions()]; - - if ( - (isWorkspaceTrusted(settings) ?? true) && - // Default management setting to true - !(settings.experimental?.extensionManagement ?? true) - ) { - allExtensions.push(...getWorkspaceExtensions(workspaceDir)); - } - - const uniqueExtensions = new Map(); - - for (const extension of allExtensions) { - if ( - !uniqueExtensions.has(extension.config.name) && - extensionEnablementManager.isEnabled(extension.config.name, workspaceDir) - ) { - uniqueExtensions.set(extension.config.name, extension); - } - } - - return Array.from(uniqueExtensions.values()); -} - -export function loadUserExtensions(): Extension[] { - const userExtensions = loadExtensionsFromDir(os.homedir()); - - const uniqueExtensions = new Map(); - for (const extension of userExtensions) { - if (!uniqueExtensions.has(extension.config.name)) { - uniqueExtensions.set(extension.config.name, extension); - } - } - - return Array.from(uniqueExtensions.values()); -} - -export function loadExtensionsFromDir(dir: string): Extension[] { - const storage = new Storage(dir); - const extensionsDir = storage.getExtensionsDir(); - if (!fs.existsSync(extensionsDir)) { - return []; - } - - const extensions: Extension[] = []; - for (const subdir of fs.readdirSync(extensionsDir)) { - const extensionDir = path.join(extensionsDir, subdir); - - const extension = loadExtension({ extensionDir, workspaceDir: dir }); - if (extension != null) { - extensions.push(extension); - } - } - return extensions; -} - -export function loadExtension(context: LoadExtensionContext): Extension | null { - const { extensionDir, workspaceDir } = context; - if (!fs.statSync(extensionDir).isDirectory()) { - return null; - } - - const installMetadata = loadInstallMetadata(extensionDir); - let effectiveExtensionPath = extensionDir; - - if (installMetadata?.type === 'link') { - effectiveExtensionPath = installMetadata.source; - } - - try { - let config = loadExtensionConfig({ - extensionDir: effectiveExtensionPath, - workspaceDir, - }); - - config = resolveEnvVarsInObject(config); - - if (config.mcpServers) { - config.mcpServers = Object.fromEntries( - Object.entries(config.mcpServers).map(([key, value]) => [ - key, - filterMcpConfig(value), - ]), - ); - } - - const contextFiles = getContextFileNames(config) - .map((contextFileName) => - path.join(effectiveExtensionPath, contextFileName), - ) - .filter((contextFilePath) => fs.existsSync(contextFilePath)); - - return { - path: effectiveExtensionPath, - config, - contextFiles, - installMetadata, - }; - } catch (e) { - console.error( - `Warning: Skipping extension in ${effectiveExtensionPath}: ${getErrorMessage( - e, - )}`, - ); - return null; - } -} - -export function loadExtensionByName( - name: string, - workspaceDir: string = process.cwd(), -): Extension | null { - const userExtensionsDir = ExtensionStorage.getUserExtensionsDir(); - if (!fs.existsSync(userExtensionsDir)) { - return null; - } - - for (const subdir of fs.readdirSync(userExtensionsDir)) { - const extensionDir = path.join(userExtensionsDir, subdir); - if (!fs.statSync(extensionDir).isDirectory()) { - continue; - } - const extension = loadExtension({ extensionDir, workspaceDir }); - if ( - extension && - extension.config.name.toLowerCase() === name.toLowerCase() - ) { - return extension; - } - } - - return null; -} - -function filterMcpConfig(original: MCPServerConfig): MCPServerConfig { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - const { trust, ...rest } = original; - return Object.freeze(rest); -} - -export function loadInstallMetadata( - extensionDir: string, -): ExtensionInstallMetadata | undefined { - const metadataFilePath = path.join(extensionDir, INSTALL_METADATA_FILENAME); - try { - const configContent = fs.readFileSync(metadataFilePath, 'utf-8'); - const metadata = JSON.parse(configContent) as ExtensionInstallMetadata; - return metadata; - } catch (_e) { - return undefined; - } -} - -function getContextFileNames(config: ExtensionConfig): string[] { - if (!config.contextFileName) { - return ['QWEN.md']; - } else if (!Array.isArray(config.contextFileName)) { - return [config.contextFileName]; - } - return config.contextFileName; -} - -/** - * Returns an annotated list of extensions. If an extension is listed in enabledExtensionNames, it will be active. - * If enabledExtensionNames is empty, an extension is active unless it is disabled. - * @param extensions The base list of extensions. - * @param enabledExtensionNames The names of explicitly enabled extensions. - * @param workspaceDir The current workspace directory. - */ -export function annotateActiveExtensions( - extensions: Extension[], - workspaceDir: string, - manager: ExtensionEnablementManager, -): GeminiCLIExtension[] { - manager.validateExtensionOverrides(extensions); - return extensions.map((extension) => ({ - name: extension.config.name, - version: extension.config.version, - isActive: manager.isEnabled(extension.config.name, workspaceDir), - path: extension.path, - installMetadata: extension.installMetadata, - })); -} - -/** - * Requests consent from the user to perform an action, by reading a Y/n - * character from stdin. - * - * This should not be called from interactive mode as it will break the CLI. - * - * @param consentDescription The description of the thing they will be consenting to. - * @returns boolean, whether they consented or not. - */ -export async function requestConsentNonInteractive( - consentDescription: string, -): Promise { - console.info(consentDescription); - const result = await promptForConsentNonInteractive( - 'Do you want to continue? [Y/n]: ', - ); - return result; -} - -/** - * Requests consent from the user to perform an action, in interactive mode. - * - * This should not be called from non-interactive mode as it will not work. - * - * @param consentDescription The description of the thing they will be consenting to. - * @param setExtensionUpdateConfirmationRequest A function to actually add a prompt to the UI. - * @returns boolean, whether they consented or not. - */ -export async function requestConsentInteractive( - consentDescription: string, - addExtensionUpdateConfirmationRequest: (value: ConfirmationRequest) => void, -): Promise { - return await promptForConsentInteractive( - consentDescription + '\n\nDo you want to continue?', - addExtensionUpdateConfirmationRequest, - ); -} - -/** - * Asks users a prompt and awaits for a y/n response on stdin. - * - * This should not be called from interactive mode as it will break the CLI. - * - * @param prompt A yes/no prompt to ask the user - * @returns Whether or not the user answers 'y' (yes). Defaults to 'yes' on enter. - */ -async function promptForConsentNonInteractive( - prompt: string, -): Promise { - const readline = await import('node:readline'); - const rl = readline.createInterface({ - input: process.stdin, - output: process.stdout, - }); - - return new Promise((resolve) => { - rl.question(prompt, (answer) => { - rl.close(); - resolve(['y', ''].includes(answer.trim().toLowerCase())); - }); - }); -} - -/** - * Asks users an interactive yes/no prompt. - * - * This should not be called from non-interactive mode as it will break the CLI. - * - * @param prompt A markdown prompt to ask the user - * @param setExtensionUpdateConfirmationRequest Function to update the UI state with the confirmation request. - * @returns Whether or not the user answers yes. - */ -async function promptForConsentInteractive( - prompt: string, - addExtensionUpdateConfirmationRequest: (value: ConfirmationRequest) => void, -): Promise { - return await new Promise((resolve) => { - addExtensionUpdateConfirmationRequest({ - prompt, - onConfirm: (resolvedConfirmed) => { - resolve(resolvedConfirmed); - }, - }); - }); -} - -export async function installExtension( - installMetadata: ExtensionInstallMetadata, - requestConsent: (consent: string) => Promise, - cwd: string = process.cwd(), - previousExtensionConfig?: ExtensionConfig, -): Promise { - const telemetryConfig = getTelemetryConfig(cwd); - let newExtensionConfig: ExtensionConfig | null = null; - let localSourcePath: string | undefined; - - try { - const settings = loadSettings(cwd).merged; - if (!isWorkspaceTrusted(settings)) { - throw new Error( - `Could not install extension from untrusted folder at ${installMetadata.source}`, - ); - } - - const extensionsDir = ExtensionStorage.getUserExtensionsDir(); - await fs.promises.mkdir(extensionsDir, { recursive: true }); - - if ( - !path.isAbsolute(installMetadata.source) && - (installMetadata.type === 'local' || installMetadata.type === 'link') - ) { - installMetadata.source = path.resolve(cwd, installMetadata.source); - } - - let tempDir: string | undefined; - - if ( - installMetadata.type === 'git' || - installMetadata.type === 'github-release' - ) { - tempDir = await ExtensionStorage.createTmpDir(); - try { - const result = await downloadFromGitHubRelease( - installMetadata, - tempDir, - ); - installMetadata.type = result.type; - installMetadata.releaseTag = result.tagName; - } catch (_error) { - await cloneFromGit(installMetadata, tempDir); - installMetadata.type = 'git'; - } - localSourcePath = tempDir; - } else if ( - installMetadata.type === 'local' || - installMetadata.type === 'link' - ) { - localSourcePath = installMetadata.source; - } else { - throw new Error(`Unsupported install type: ${installMetadata.type}`); - } - - try { - newExtensionConfig = loadExtensionConfig({ - extensionDir: localSourcePath, - workspaceDir: cwd, - }); - - const newExtensionName = newExtensionConfig.name; - const extensionStorage = new ExtensionStorage(newExtensionName); - const destinationPath = extensionStorage.getExtensionDir(); - - const installedExtensions = loadUserExtensions(); - if ( - installedExtensions.some( - (installed) => installed.config.name === newExtensionName, - ) - ) { - throw new Error( - `Extension "${newExtensionName}" is already installed. Please uninstall it first.`, - ); - } - await maybeRequestConsentOrFail( - newExtensionConfig, - requestConsent, - previousExtensionConfig, - ); - await fs.promises.mkdir(destinationPath, { recursive: true }); - - if ( - installMetadata.type === 'local' || - installMetadata.type === 'git' || - installMetadata.type === 'github-release' - ) { - await copyExtension(localSourcePath, destinationPath); - } - - const metadataString = JSON.stringify(installMetadata, null, 2); - const metadataPath = path.join( - destinationPath, - INSTALL_METADATA_FILENAME, - ); - await fs.promises.writeFile(metadataPath, metadataString); - } finally { - if (tempDir) { - await fs.promises.rm(tempDir, { recursive: true, force: true }); - } - } - - logExtensionInstallEvent( - telemetryConfig, - new ExtensionInstallEvent( - newExtensionConfig!.name, - newExtensionConfig!.version, - installMetadata.source, - 'success', - ), - ); - - enableExtension(newExtensionConfig!.name, SettingScope.User); - return newExtensionConfig!.name; - } catch (error) { - // Attempt to load config from the source path even if installation fails - // to get the name and version for logging. - if (!newExtensionConfig && localSourcePath) { - try { - newExtensionConfig = loadExtensionConfig({ - extensionDir: localSourcePath, - workspaceDir: cwd, - }); - } catch { - // Ignore error, this is just for logging. - } - } - logExtensionInstallEvent( - telemetryConfig, - new ExtensionInstallEvent( - newExtensionConfig?.name ?? '', - newExtensionConfig?.version ?? '', - installMetadata.source, - 'error', - ), - ); - throw error; - } -} - -/** - * Builds a consent string for installing an extension based on it's - * extensionConfig. - */ -function extensionConsentString(extensionConfig: ExtensionConfig): string { - const output: string[] = []; - const mcpServerEntries = Object.entries(extensionConfig.mcpServers || {}); - output.push(`Installing extension "${extensionConfig.name}".`); - output.push( - '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**', - ); - - if (mcpServerEntries.length) { - output.push('This extension will run the following MCP servers:'); - for (const [key, mcpServer] of mcpServerEntries) { - const isLocal = !!mcpServer.command; - const source = - mcpServer.httpUrl ?? - `${mcpServer.command || ''}${mcpServer.args ? ' ' + mcpServer.args.join(' ') : ''}`; - output.push(` * ${key} (${isLocal ? 'local' : 'remote'}): ${source}`); - } - } - if (extensionConfig.contextFileName) { - output.push( - `This extension will append info to your QWEN.md context using ${extensionConfig.contextFileName}`, - ); - } - if (extensionConfig.excludeTools) { - output.push( - `This extension will exclude the following core tools: ${extensionConfig.excludeTools}`, - ); - } - return output.join('\n'); -} - -/** - * Requests consent from the user to install an extension (extensionConfig), if - * there is any difference between the consent string for `extensionConfig` and - * `previousExtensionConfig`. - * - * Always requests consent if previousExtensionConfig is null. - * - * Throws if the user does not consent. - */ -async function maybeRequestConsentOrFail( - extensionConfig: ExtensionConfig, - requestConsent: (consent: string) => Promise, - previousExtensionConfig?: ExtensionConfig, -) { - const extensionConsent = extensionConsentString(extensionConfig); - if (previousExtensionConfig) { - const previousExtensionConsent = extensionConsentString( - previousExtensionConfig, - ); - if (previousExtensionConsent === extensionConsent) { - return; - } - } - if (!(await requestConsent(extensionConsent))) { - throw new Error(`Installation cancelled for "${extensionConfig.name}".`); - } -} - -export function validateName(name: string) { - if (!/^[a-zA-Z0-9-]+$/.test(name)) { - throw new Error( - `Invalid extension name: "${name}". Only letters (a-z, A-Z), numbers (0-9), and dashes (-) are allowed.`, - ); - } -} - -export function loadExtensionConfig( - context: LoadExtensionContext, -): ExtensionConfig { - const { extensionDir, workspaceDir } = context; - const configFilePath = path.join(extensionDir, EXTENSIONS_CONFIG_FILENAME); - if (!fs.existsSync(configFilePath)) { - throw new Error(`Configuration file not found at ${configFilePath}`); - } - try { - const configContent = fs.readFileSync(configFilePath, 'utf-8'); - const config = recursivelyHydrateStrings(JSON.parse(configContent), { - extensionPath: extensionDir, - workspacePath: workspaceDir, - '/': path.sep, - pathSeparator: path.sep, - }) as unknown as ExtensionConfig; - if (!config.name || !config.version) { - throw new Error( - `Invalid configuration in ${configFilePath}: missing ${!config.name ? '"name"' : '"version"'}`, - ); - } - validateName(config.name); - return config; - } catch (e) { - throw new Error( - `Failed to load extension config from ${configFilePath}: ${getErrorMessage( - e, - )}`, - ); - } -} - -export async function uninstallExtension( - extensionIdentifier: string, - cwd: string = process.cwd(), -): Promise { - const telemetryConfig = getTelemetryConfig(cwd); - const installedExtensions = loadUserExtensions(); - const extensionName = installedExtensions.find( - (installed) => - installed.config.name.toLowerCase() === - extensionIdentifier.toLowerCase() || - installed.installMetadata?.source.toLowerCase() === - extensionIdentifier.toLowerCase(), - )?.config.name; - if (!extensionName) { - throw new Error(`Extension not found.`); - } - const manager = new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - [extensionName], - ); - manager.remove(extensionName); - const storage = new ExtensionStorage(extensionName); - - await fs.promises.rm(storage.getExtensionDir(), { - recursive: true, - force: true, - }); - logExtensionUninstall( - telemetryConfig, - new ExtensionUninstallEvent(extensionName, 'success'), - ); -} - -export function toOutputString( - extension: Extension, - workspaceDir: string, -): string { - const manager = new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - ); - const userEnabled = manager.isEnabled(extension.config.name, os.homedir()); - const workspaceEnabled = manager.isEnabled( - extension.config.name, - workspaceDir, - ); - - const status = workspaceEnabled ? chalk.green('✓') : chalk.red('✗'); - let output = `${status} ${extension.config.name} (${extension.config.version})`; - output += `\n Path: ${extension.path}`; - if (extension.installMetadata) { - output += `\n Source: ${extension.installMetadata.source} (Type: ${extension.installMetadata.type})`; - if (extension.installMetadata.ref) { - output += `\n Ref: ${extension.installMetadata.ref}`; - } - if (extension.installMetadata.releaseTag) { - output += `\n Release tag: ${extension.installMetadata.releaseTag}`; - } - } - output += `\n Enabled (User): ${userEnabled}`; - output += `\n Enabled (Workspace): ${workspaceEnabled}`; - if (extension.contextFiles.length > 0) { - output += `\n Context files:`; - extension.contextFiles.forEach((contextFile) => { - output += `\n ${contextFile}`; - }); - } - if (extension.config.mcpServers) { - output += `\n MCP servers:`; - Object.keys(extension.config.mcpServers).forEach((key) => { - output += `\n ${key}`; - }); - } - if (extension.config.excludeTools) { - output += `\n Excluded tools:`; - extension.config.excludeTools.forEach((tool) => { - output += `\n ${tool}`; - }); - } - return output; -} - -export function disableExtension( - name: string, - scope: SettingScope, - cwd: string = process.cwd(), -) { - const config = getTelemetryConfig(cwd); - if (scope === SettingScope.System || scope === SettingScope.SystemDefaults) { - throw new Error('System and SystemDefaults scopes are not supported.'); - } - const extension = loadExtensionByName(name, cwd); - if (!extension) { - throw new Error(`Extension with name ${name} does not exist.`); - } - - const manager = new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - [name], - ); - const scopePath = scope === SettingScope.Workspace ? cwd : os.homedir(); - manager.disable(name, true, scopePath); - logExtensionDisable(config, new ExtensionDisableEvent(name, scope)); -} - -export function enableExtension( - name: string, - scope: SettingScope, - cwd: string = process.cwd(), -) { - if (scope === SettingScope.System || scope === SettingScope.SystemDefaults) { - throw new Error('System and SystemDefaults scopes are not supported.'); - } - const extension = loadExtensionByName(name, cwd); - if (!extension) { - throw new Error(`Extension with name ${name} does not exist.`); - } - const manager = new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - ); - const scopePath = scope === SettingScope.Workspace ? cwd : os.homedir(); - manager.enable(name, true, scopePath); - const config = getTelemetryConfig(cwd); - logExtensionEnable(config, new ExtensionEnableEvent(name, scope)); -} diff --git a/packages/cli/src/config/extensions/extensionEnablement.test.ts b/packages/cli/src/config/extensions/extensionEnablement.test.ts deleted file mode 100644 index b87fc2d81..000000000 --- a/packages/cli/src/config/extensions/extensionEnablement.test.ts +++ /dev/null @@ -1,424 +0,0 @@ -/** - * @license - * Copyright 2025 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -import * as path from 'node:path'; -import fs from 'node:fs'; -import os from 'node:os'; -import { afterEach, beforeEach, describe, expect, it } from 'vitest'; -import { ExtensionEnablementManager, Override } from './extensionEnablement.js'; -import type { Extension } from '../extension.js'; - -// Helper to create a temporary directory for testing -function createTestDir() { - const dirPath = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-test-')); - return { - path: dirPath, - cleanup: () => fs.rmSync(dirPath, { recursive: true, force: true }), - }; -} - -let testDir: { path: string; cleanup: () => void }; -let configDir: string; -let manager: ExtensionEnablementManager; - -describe('ExtensionEnablementManager', () => { - beforeEach(() => { - testDir = createTestDir(); - configDir = path.join(testDir.path, '.gemini'); - manager = new ExtensionEnablementManager(configDir); - }); - - afterEach(() => { - testDir.cleanup(); - // Reset the singleton instance for test isolation - // eslint-disable-next-line @typescript-eslint/no-explicit-any - (ExtensionEnablementManager as any).instance = undefined; - }); - - describe('isEnabled', () => { - it('should return true if extension is not configured', () => { - expect(manager.isEnabled('ext-test', '/any/path')).toBe(true); - }); - - it('should return true if no overrides match', () => { - manager.disable('ext-test', false, '/another/path'); - expect(manager.isEnabled('ext-test', '/any/path')).toBe(true); - }); - - it('should enable a path based on an override rule', () => { - manager.disable('ext-test', true, '/'); - manager.enable('ext-test', true, '/home/user/projects/'); - expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe( - true, - ); - }); - - it('should disable a path based on a disable override rule', () => { - manager.enable('ext-test', true, '/'); - manager.disable('ext-test', true, '/home/user/projects/'); - expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe( - false, - ); - }); - - it('should respect the last matching rule (enable wins)', () => { - manager.disable('ext-test', true, '/home/user/projects/'); - manager.enable('ext-test', false, '/home/user/projects/my-app'); - expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe( - true, - ); - }); - - it('should respect the last matching rule (disable wins)', () => { - manager.enable('ext-test', true, '/home/user/projects/'); - manager.disable('ext-test', false, '/home/user/projects/my-app'); - expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe( - false, - ); - }); - - it('should handle', () => { - manager.enable('ext-test', true, '/home/user/projects'); - manager.disable('ext-test', false, '/home/user/projects/my-app'); - expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe( - false, - ); - expect( - manager.isEnabled('ext-test', '/home/user/projects/something-else'), - ).toBe(true); - }); - }); - - describe('includeSubdirs', () => { - it('should add a glob when enabling with includeSubdirs', () => { - manager.enable('ext-test', true, '/path/to/dir'); - const config = manager.readConfig(); - expect(config['ext-test'].overrides).toContain('/path/to/dir/*'); - }); - - it('should not add a glob when enabling without includeSubdirs', () => { - manager.enable('ext-test', false, '/path/to/dir'); - const config = manager.readConfig(); - expect(config['ext-test'].overrides).toContain('/path/to/dir/'); - expect(config['ext-test'].overrides).not.toContain('/path/to/dir/*'); - }); - - it('should add a glob when disabling with includeSubdirs', () => { - manager.disable('ext-test', true, '/path/to/dir'); - const config = manager.readConfig(); - expect(config['ext-test'].overrides).toContain('!/path/to/dir/*'); - }); - - it('should remove conflicting glob rule when enabling without subdirs', () => { - manager.enable('ext-test', true, '/path/to/dir'); // Adds /path/to/dir* - manager.enable('ext-test', false, '/path/to/dir'); // Should remove the glob - const config = manager.readConfig(); - expect(config['ext-test'].overrides).toContain('/path/to/dir/'); - expect(config['ext-test'].overrides).not.toContain('/path/to/dir/*'); - }); - - it('should remove conflicting non-glob rule when enabling with subdirs', () => { - manager.enable('ext-test', false, '/path/to/dir'); // Adds /path/to/dir - manager.enable('ext-test', true, '/path/to/dir'); // Should remove the non-glob - const config = manager.readConfig(); - expect(config['ext-test'].overrides).toContain('/path/to/dir/*'); - expect(config['ext-test'].overrides).not.toContain('/path/to/dir/'); - }); - - it('should remove conflicting rules when disabling', () => { - manager.enable('ext-test', true, '/path/to/dir'); // enabled with glob - manager.disable('ext-test', false, '/path/to/dir'); // disabled without - const config = manager.readConfig(); - expect(config['ext-test'].overrides).toContain('!/path/to/dir/'); - expect(config['ext-test'].overrides).not.toContain('/path/to/dir/*'); - }); - - it('should correctly evaluate isEnabled with subdirs', () => { - manager.disable('ext-test', true, '/'); - manager.enable('ext-test', true, '/path/to/dir'); - expect(manager.isEnabled('ext-test', '/path/to/dir/')).toBe(true); - expect(manager.isEnabled('ext-test', '/path/to/dir/sub/')).toBe(true); - expect(manager.isEnabled('ext-test', '/path/to/another/')).toBe(false); - }); - - it('should correctly evaluate isEnabled without subdirs', () => { - manager.disable('ext-test', true, '/*'); - manager.enable('ext-test', false, '/path/to/dir'); - expect(manager.isEnabled('ext-test', '/path/to/dir')).toBe(true); - expect(manager.isEnabled('ext-test', '/path/to/dir/sub')).toBe(false); - }); - }); - - describe('pruning child rules', () => { - it('should remove child rules when enabling a parent with subdirs', () => { - // Pre-existing rules for children - manager.enable('ext-test', false, '/path/to/dir/subdir1'); - manager.disable('ext-test', true, '/path/to/dir/subdir2'); - manager.enable('ext-test', false, '/path/to/another/dir'); - - // Enable the parent directory - manager.enable('ext-test', true, '/path/to/dir'); - - const config = manager.readConfig(); - const overrides = config['ext-test'].overrides; - - // The new parent rule should be present - expect(overrides).toContain(`/path/to/dir/*`); - - // Child rules should be removed - expect(overrides).not.toContain('/path/to/dir/subdir1/'); - expect(overrides).not.toContain(`!/path/to/dir/subdir2/*`); - - // Unrelated rules should remain - expect(overrides).toContain('/path/to/another/dir/'); - }); - - it('should remove child rules when disabling a parent with subdirs', () => { - // Pre-existing rules for children - manager.enable('ext-test', false, '/path/to/dir/subdir1'); - manager.disable('ext-test', true, '/path/to/dir/subdir2'); - manager.enable('ext-test', false, '/path/to/another/dir'); - - // Disable the parent directory - manager.disable('ext-test', true, '/path/to/dir'); - - const config = manager.readConfig(); - const overrides = config['ext-test'].overrides; - - // The new parent rule should be present - expect(overrides).toContain(`!/path/to/dir/*`); - - // Child rules should be removed - expect(overrides).not.toContain('/path/to/dir/subdir1/'); - expect(overrides).not.toContain(`!/path/to/dir/subdir2/*`); - - // Unrelated rules should remain - expect(overrides).toContain('/path/to/another/dir/'); - }); - - it('should not remove child rules if includeSubdirs is false', () => { - manager.enable('ext-test', false, '/path/to/dir/subdir1'); - manager.enable('ext-test', false, '/path/to/dir'); // Not including subdirs - - const config = manager.readConfig(); - const overrides = config['ext-test'].overrides; - - expect(overrides).toContain('/path/to/dir/subdir1/'); - expect(overrides).toContain('/path/to/dir/'); - }); - }); - - it('should enable a path based on an enable override', () => { - manager.disable('ext-test', true, '/Users/chrstn'); - manager.enable('ext-test', true, '/Users/chrstn/gemini-cli'); - - expect(manager.isEnabled('ext-test', '/Users/chrstn/gemini-cli')).toBe( - true, - ); - }); - - it('should ignore subdirs', () => { - manager.disable('ext-test', false, '/Users/chrstn'); - expect(manager.isEnabled('ext-test', '/Users/chrstn/gemini-cli')).toBe( - true, - ); - }); - - describe('extension overrides (-e )', () => { - beforeEach(() => { - manager = new ExtensionEnablementManager(configDir, ['ext-test']); - }); - - it('can enable extensions, case-insensitive', () => { - manager.disable('ext-test', true, '/'); - expect(manager.isEnabled('ext-test', '/')).toBe(true); - expect(manager.isEnabled('Ext-Test', '/')).toBe(true); - // Double check that it would have been disabled otherwise - expect( - new ExtensionEnablementManager(configDir).isEnabled('ext-test', '/'), - ).toBe(false); - }); - - it('disable all other extensions', () => { - manager = new ExtensionEnablementManager(configDir, ['ext-test']); - manager.enable('ext-test-2', true, '/'); - expect(manager.isEnabled('ext-test-2', '/')).toBe(false); - // Double check that it would have been enabled otherwise - expect( - new ExtensionEnablementManager(configDir).isEnabled('ext-test-2', '/'), - ).toBe(true); - }); - - it('none disables all extensions', () => { - manager = new ExtensionEnablementManager(configDir, ['none']); - manager.enable('ext-test', true, '/'); - expect(manager.isEnabled('ext-test', '/path/to/dir')).toBe(false); - // Double check that it would have been enabled otherwise - expect( - new ExtensionEnablementManager(configDir).isEnabled('ext-test', '/'), - ).toBe(true); - }); - }); - - describe('validateExtensionOverrides', () => { - let consoleErrorSpy: ReturnType; - - beforeEach(() => { - consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}); - }); - - afterEach(() => { - consoleErrorSpy.mockRestore(); - }); - - it('should not log an error if enabledExtensionNamesOverride is empty', () => { - const manager = new ExtensionEnablementManager(configDir, []); - manager.validateExtensionOverrides([]); - expect(consoleErrorSpy).not.toHaveBeenCalled(); - }); - - it('should not log an error if all enabledExtensionNamesOverride are valid', () => { - const manager = new ExtensionEnablementManager(configDir, [ - 'ext-one', - 'ext-two', - ]); - const extensions = [ - { config: { name: 'ext-one' } }, - { config: { name: 'ext-two' } }, - ] as Extension[]; - manager.validateExtensionOverrides(extensions); - expect(consoleErrorSpy).not.toHaveBeenCalled(); - }); - - it('should log an error for each invalid extension name in enabledExtensionNamesOverride', () => { - const manager = new ExtensionEnablementManager(configDir, [ - 'ext-one', - 'ext-invalid', - 'ext-another-invalid', - ]); - const extensions = [ - { config: { name: 'ext-one' } }, - { config: { name: 'ext-two' } }, - ] as Extension[]; - manager.validateExtensionOverrides(extensions); - expect(consoleErrorSpy).toHaveBeenCalledTimes(2); - expect(consoleErrorSpy).toHaveBeenCalledWith( - 'Extension not found: ext-invalid', - ); - expect(consoleErrorSpy).toHaveBeenCalledWith( - 'Extension not found: ext-another-invalid', - ); - }); - - it('should not log an error if "none" is in enabledExtensionNamesOverride', () => { - const manager = new ExtensionEnablementManager(configDir, ['none']); - manager.validateExtensionOverrides([]); - expect(consoleErrorSpy).not.toHaveBeenCalled(); - }); - }); -}); - -describe('Override', () => { - it('should create an override from input', () => { - const override = Override.fromInput('/path/to/dir', true); - expect(override.baseRule).toBe(`/path/to/dir/`); - expect(override.isDisable).toBe(false); - expect(override.includeSubdirs).toBe(true); - }); - - it('should create a disable override from input', () => { - const override = Override.fromInput('!/path/to/dir', false); - expect(override.baseRule).toBe(`/path/to/dir/`); - expect(override.isDisable).toBe(true); - expect(override.includeSubdirs).toBe(false); - }); - - it('should create an override from a file rule', () => { - const override = Override.fromFileRule('/path/to/dir'); - expect(override.baseRule).toBe('/path/to/dir'); - expect(override.isDisable).toBe(false); - expect(override.includeSubdirs).toBe(false); - }); - - it('should create a disable override from a file rule', () => { - const override = Override.fromFileRule('!/path/to/dir/'); - expect(override.isDisable).toBe(true); - expect(override.baseRule).toBe('/path/to/dir/'); - expect(override.includeSubdirs).toBe(false); - }); - - it('should create an override with subdirs from a file rule', () => { - const override = Override.fromFileRule('/path/to/dir/*'); - expect(override.baseRule).toBe('/path/to/dir/'); - expect(override.isDisable).toBe(false); - expect(override.includeSubdirs).toBe(true); - }); - - it('should correctly identify conflicting overrides', () => { - const override1 = Override.fromInput('/path/to/dir', true); - const override2 = Override.fromInput('/path/to/dir', false); - expect(override1.conflictsWith(override2)).toBe(true); - }); - - it('should correctly identify non-conflicting overrides', () => { - const override1 = Override.fromInput('/path/to/dir', true); - const override2 = Override.fromInput('/path/to/another/dir', true); - expect(override1.conflictsWith(override2)).toBe(false); - }); - - it('should correctly identify equal overrides', () => { - const override1 = Override.fromInput('/path/to/dir', true); - const override2 = Override.fromInput('/path/to/dir', true); - expect(override1.isEqualTo(override2)).toBe(true); - }); - - it('should correctly identify unequal overrides', () => { - const override1 = Override.fromInput('/path/to/dir', true); - const override2 = Override.fromInput('!/path/to/dir', true); - expect(override1.isEqualTo(override2)).toBe(false); - }); - - it('should generate the correct regex', () => { - const override = Override.fromInput('/path/to/dir', true); - const regex = override.asRegex(); - expect(regex.test('/path/to/dir/')).toBe(true); - expect(regex.test('/path/to/dir/subdir')).toBe(true); - expect(regex.test('/path/to/another/dir')).toBe(false); - }); - - it('should correctly identify child overrides', () => { - const parent = Override.fromInput('/path/to/dir', true); - const child = Override.fromInput('/path/to/dir/subdir', false); - expect(child.isChildOf(parent)).toBe(true); - }); - - it('should correctly identify child overrides with glob', () => { - const parent = Override.fromInput('/path/to/dir/*', true); - const child = Override.fromInput('/path/to/dir/subdir', false); - expect(child.isChildOf(parent)).toBe(true); - }); - - it('should correctly identify non-child overrides', () => { - const parent = Override.fromInput('/path/to/dir', true); - const other = Override.fromInput('/path/to/another/dir', false); - expect(other.isChildOf(parent)).toBe(false); - }); - - it('should generate the correct output string', () => { - const override = Override.fromInput('/path/to/dir', true); - expect(override.output()).toBe(`/path/to/dir/*`); - }); - - it('should generate the correct output string for a disable override', () => { - const override = Override.fromInput('!/path/to/dir', false); - expect(override.output()).toBe(`!/path/to/dir/`); - }); - - it('should disable a path based on a disable override rule', () => { - const override = Override.fromInput('!/path/to/dir', false); - expect(override.output()).toBe(`!/path/to/dir/`); - }); -}); diff --git a/packages/cli/src/config/extensions/extensionEnablement.ts b/packages/cli/src/config/extensions/extensionEnablement.ts deleted file mode 100644 index 737bc08d4..000000000 --- a/packages/cli/src/config/extensions/extensionEnablement.ts +++ /dev/null @@ -1,239 +0,0 @@ -/** - * @license - * Copyright 2025 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -import fs from 'node:fs'; -import path from 'node:path'; -import { type Extension } from '../extension.js'; - -export interface ExtensionEnablementConfig { - overrides: string[]; -} - -export interface AllExtensionsEnablementConfig { - [extensionName: string]: ExtensionEnablementConfig; -} - -export class Override { - constructor( - public baseRule: string, - public isDisable: boolean, - public includeSubdirs: boolean, - ) {} - - static fromInput(inputRule: string, includeSubdirs: boolean): Override { - const isDisable = inputRule.startsWith('!'); - let baseRule = isDisable ? inputRule.substring(1) : inputRule; - baseRule = ensureLeadingAndTrailingSlash(baseRule); - return new Override(baseRule, isDisable, includeSubdirs); - } - - static fromFileRule(fileRule: string): Override { - const isDisable = fileRule.startsWith('!'); - let baseRule = isDisable ? fileRule.substring(1) : fileRule; - const includeSubdirs = baseRule.endsWith('*'); - baseRule = includeSubdirs - ? baseRule.substring(0, baseRule.length - 1) - : baseRule; - return new Override(baseRule, isDisable, includeSubdirs); - } - - conflictsWith(other: Override): boolean { - if (this.baseRule === other.baseRule) { - return ( - this.includeSubdirs !== other.includeSubdirs || - this.isDisable !== other.isDisable - ); - } - return false; - } - - isEqualTo(other: Override): boolean { - return ( - this.baseRule === other.baseRule && - this.includeSubdirs === other.includeSubdirs && - this.isDisable === other.isDisable - ); - } - - asRegex(): RegExp { - return globToRegex(`${this.baseRule}${this.includeSubdirs ? '*' : ''}`); - } - - isChildOf(parent: Override) { - if (!parent.includeSubdirs) { - return false; - } - return parent.asRegex().test(this.baseRule); - } - - output(): string { - return `${this.isDisable ? '!' : ''}${this.baseRule}${this.includeSubdirs ? '*' : ''}`; - } - - matchesPath(path: string) { - return this.asRegex().test(path); - } -} - -const ensureLeadingAndTrailingSlash = function (dirPath: string): string { - // Normalize separators to forward slashes for consistent matching across platforms. - let result = dirPath.replace(/\\/g, '/'); - if (result.charAt(0) !== '/') { - result = '/' + result; - } - if (result.charAt(result.length - 1) !== '/') { - result = result + '/'; - } - return result; -}; - -/** - * Converts a glob pattern to a RegExp object. - * This is a simplified implementation that supports `*`. - * - * @param glob The glob pattern to convert. - * @returns A RegExp object. - */ -function globToRegex(glob: string): RegExp { - const regexString = glob - .replace(/[.+?^${}()|[\]\\]/g, '\\$&') // Escape special regex characters - .replace(/(\/?)\*/g, '($1.*)?'); // Convert * to optional group - - return new RegExp(`^${regexString}$`); -} - -export class ExtensionEnablementManager { - private configFilePath: string; - private configDir: string; - // If non-empty, this overrides all other extension configuration and enables - // only the ones in this list. - private enabledExtensionNamesOverride: string[]; - - constructor(configDir: string, enabledExtensionNames?: string[]) { - this.configDir = configDir; - this.configFilePath = path.join(configDir, 'extension-enablement.json'); - this.enabledExtensionNamesOverride = - enabledExtensionNames?.map((name) => name.toLowerCase()) ?? []; - } - - validateExtensionOverrides(extensions: Extension[]) { - for (const name of this.enabledExtensionNamesOverride) { - if (name === 'none') continue; - if ( - !extensions.some( - (ext) => ext.config.name.toLowerCase() === name.toLowerCase(), - ) - ) { - console.error(`Extension not found: ${name}`); - } - } - } - - /** - * Determines if an extension is enabled based on its name and the current - * path. The last matching rule in the overrides list wins. - * - * @param extensionName The name of the extension. - * @param currentPath The absolute path of the current working directory. - * @returns True if the extension is enabled, false otherwise. - */ - isEnabled(extensionName: string, currentPath: string): boolean { - // If we have a single override called 'none', this disables all extensions. - // Typically, this comes from the user passing `-e none`. - if ( - this.enabledExtensionNamesOverride.length === 1 && - this.enabledExtensionNamesOverride[0] === 'none' - ) { - return false; - } - - // If we have explicit overrides, only enable those extensions. - if (this.enabledExtensionNamesOverride.length > 0) { - // When checking against overrides ONLY, we use a case insensitive match. - // The override names are already lowercased in the constructor. - return this.enabledExtensionNamesOverride.includes( - extensionName.toLocaleLowerCase(), - ); - } - - // Otherwise, we use the configuration settings - const config = this.readConfig(); - const extensionConfig = config[extensionName]; - // Extensions are enabled by default. - let enabled = true; - const allOverrides = extensionConfig?.overrides ?? []; - for (const rule of allOverrides) { - const override = Override.fromFileRule(rule); - if (override.matchesPath(ensureLeadingAndTrailingSlash(currentPath))) { - enabled = !override.isDisable; - } - } - return enabled; - } - - readConfig(): AllExtensionsEnablementConfig { - try { - const content = fs.readFileSync(this.configFilePath, 'utf-8'); - return JSON.parse(content); - } catch (error) { - if ( - error instanceof Error && - 'code' in error && - error.code === 'ENOENT' - ) { - return {}; - } - console.error('Error reading extension enablement config:', error); - return {}; - } - } - - writeConfig(config: AllExtensionsEnablementConfig): void { - fs.mkdirSync(this.configDir, { recursive: true }); - fs.writeFileSync(this.configFilePath, JSON.stringify(config, null, 2)); - } - - enable( - extensionName: string, - includeSubdirs: boolean, - scopePath: string, - ): void { - const config = this.readConfig(); - if (!config[extensionName]) { - config[extensionName] = { overrides: [] }; - } - const override = Override.fromInput(scopePath, includeSubdirs); - const overrides = config[extensionName].overrides.filter((rule) => { - const fileOverride = Override.fromFileRule(rule); - if ( - fileOverride.conflictsWith(override) || - fileOverride.isEqualTo(override) - ) { - return false; // Remove conflicts and equivalent values. - } - return !fileOverride.isChildOf(override); - }); - overrides.push(override.output()); - config[extensionName].overrides = overrides; - this.writeConfig(config); - } - - disable( - extensionName: string, - includeSubdirs: boolean, - scopePath: string, - ): void { - this.enable(extensionName, includeSubdirs, `!${scopePath}`); - } - - remove(extensionName: string): void { - const config = this.readConfig(); - if (config[extensionName]) { - delete config[extensionName]; - this.writeConfig(config); - } - } -} diff --git a/packages/cli/src/config/extensions/update.test.ts b/packages/cli/src/config/extensions/update.test.ts deleted file mode 100644 index 849857e4d..000000000 --- a/packages/cli/src/config/extensions/update.test.ts +++ /dev/null @@ -1,468 +0,0 @@ -/** - * @license - * Copyright 2025 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -import { vi } from 'vitest'; -import * as fs from 'node:fs'; -import * as os from 'node:os'; -import * as path from 'node:path'; -import { - EXTENSIONS_CONFIG_FILENAME, - ExtensionStorage, - INSTALL_METADATA_FILENAME, - annotateActiveExtensions, - loadExtension, -} from '../extension.js'; -import { checkForAllExtensionUpdates, updateExtension } from './update.js'; -import { QWEN_DIR } from '@qwen-code/qwen-code-core'; -import { isWorkspaceTrusted } from '../trustedFolders.js'; -import { ExtensionUpdateState } from '../../ui/state/extensions.js'; -import { createExtension } from '../../test-utils/createExtension.js'; -import { ExtensionEnablementManager } from './extensionEnablement.js'; - -const mockGit = { - clone: vi.fn(), - getRemotes: vi.fn(), - fetch: vi.fn(), - checkout: vi.fn(), - listRemote: vi.fn(), - revparse: vi.fn(), - // Not a part of the actual API, but we need to use this to do the correct - // file system interactions. - path: vi.fn(), -}; - -vi.mock('simple-git', () => ({ - simpleGit: vi.fn((path: string) => { - mockGit.path.mockReturnValue(path); - return mockGit; - }), -})); - -vi.mock('../extensions/github.js', async (importOriginal) => { - const actual = - await importOriginal(); - return { - ...actual, - downloadFromGitHubRelease: vi - .fn() - .mockRejectedValue(new Error('Mocked GitHub release download failure')), - }; -}); - -vi.mock('os', async (importOriginal) => { - const mockedOs = await importOriginal(); - return { - ...mockedOs, - homedir: vi.fn(), - }; -}); - -vi.mock('../trustedFolders.js', async (importOriginal) => { - const actual = await importOriginal(); - return { - ...actual, - isWorkspaceTrusted: vi.fn(), - }; -}); - -const mockLogExtensionInstallEvent = vi.hoisted(() => vi.fn()); -const mockLogExtensionUninstall = vi.hoisted(() => vi.fn()); - -vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => { - const actual = - await importOriginal(); - return { - ...actual, - logExtensionInstallEvent: mockLogExtensionInstallEvent, - logExtensionUninstall: mockLogExtensionUninstall, - ExtensionInstallEvent: vi.fn(), - ExtensionUninstallEvent: vi.fn(), - }; -}); - -describe('update tests', () => { - let tempHomeDir: string; - let tempWorkspaceDir: string; - let userExtensionsDir: string; - - beforeEach(() => { - tempHomeDir = fs.mkdtempSync( - path.join(os.tmpdir(), 'qwen-code-test-home-'), - ); - tempWorkspaceDir = fs.mkdtempSync( - path.join(tempHomeDir, 'qwen-code-test-workspace-'), - ); - vi.mocked(os.homedir).mockReturnValue(tempHomeDir); - userExtensionsDir = path.join(tempHomeDir, QWEN_DIR, 'extensions'); - // Clean up before each test - fs.rmSync(userExtensionsDir, { recursive: true, force: true }); - fs.mkdirSync(userExtensionsDir, { recursive: true }); - vi.mocked(isWorkspaceTrusted).mockReturnValue({ - isTrusted: true, - source: 'file', - }); - vi.spyOn(process, 'cwd').mockReturnValue(tempWorkspaceDir); - Object.values(mockGit).forEach((fn) => fn.mockReset()); - }); - - afterEach(() => { - fs.rmSync(tempHomeDir, { recursive: true, force: true }); - fs.rmSync(tempWorkspaceDir, { recursive: true, force: true }); - }); - - describe('updateExtension', () => { - it('should update a git-installed extension', async () => { - const gitUrl = 'https://github.com/google/gemini-extensions.git'; - const extensionName = 'qwen-extensions'; - const targetExtDir = path.join(userExtensionsDir, extensionName); - const metadataPath = path.join(targetExtDir, INSTALL_METADATA_FILENAME); - - fs.mkdirSync(targetExtDir, { recursive: true }); - fs.writeFileSync( - path.join(targetExtDir, EXTENSIONS_CONFIG_FILENAME), - JSON.stringify({ name: extensionName, version: '1.0.0' }), - ); - fs.writeFileSync( - metadataPath, - JSON.stringify({ source: gitUrl, type: 'git' }), - ); - - mockGit.clone.mockImplementation(async (_, destination) => { - fs.mkdirSync(path.join(mockGit.path(), destination), { - recursive: true, - }); - fs.writeFileSync( - path.join(mockGit.path(), destination, EXTENSIONS_CONFIG_FILENAME), - JSON.stringify({ name: extensionName, version: '1.1.0' }), - ); - }); - mockGit.getRemotes.mockResolvedValue([{ name: 'origin' }]); - const extension = annotateActiveExtensions( - [ - loadExtension({ - extensionDir: targetExtDir, - workspaceDir: tempWorkspaceDir, - })!, - ], - process.cwd(), - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - )[0]; - const updateInfo = await updateExtension( - extension, - tempHomeDir, - async (_) => true, - ExtensionUpdateState.UPDATE_AVAILABLE, - () => {}, - ); - - expect(updateInfo).toEqual({ - name: 'qwen-extensions', - originalVersion: '1.0.0', - updatedVersion: '1.1.0', - }); - - const updatedConfig = JSON.parse( - fs.readFileSync( - path.join(targetExtDir, EXTENSIONS_CONFIG_FILENAME), - 'utf-8', - ), - ); - expect(updatedConfig.version).toBe('1.1.0'); - }); - - it('should call setExtensionUpdateState with UPDATING and then UPDATED_NEEDS_RESTART on success', async () => { - const extensionName = 'test-extension'; - const extensionDir = createExtension({ - extensionsDir: userExtensionsDir, - name: extensionName, - version: '1.0.0', - installMetadata: { - source: 'https://some.git/repo', - type: 'git', - }, - }); - - mockGit.clone.mockImplementation(async (_, destination) => { - fs.mkdirSync(path.join(mockGit.path(), destination), { - recursive: true, - }); - fs.writeFileSync( - path.join(mockGit.path(), destination, EXTENSIONS_CONFIG_FILENAME), - JSON.stringify({ name: extensionName, version: '1.1.0' }), - ); - }); - mockGit.getRemotes.mockResolvedValue([{ name: 'origin' }]); - - const dispatch = vi.fn(); - const extension = annotateActiveExtensions( - [ - loadExtension({ - extensionDir, - workspaceDir: tempWorkspaceDir, - })!, - ], - process.cwd(), - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - )[0]; - await updateExtension( - extension, - tempHomeDir, - async (_) => true, - ExtensionUpdateState.UPDATE_AVAILABLE, - dispatch, - ); - - expect(dispatch).toHaveBeenCalledWith({ - type: 'SET_STATE', - payload: { - name: extensionName, - state: ExtensionUpdateState.UPDATING, - }, - }); - expect(dispatch).toHaveBeenCalledWith({ - type: 'SET_STATE', - payload: { - name: extensionName, - state: ExtensionUpdateState.UPDATED_NEEDS_RESTART, - }, - }); - }); - - it('should call setExtensionUpdateState with ERROR on failure', async () => { - const extensionName = 'test-extension'; - const extensionDir = createExtension({ - extensionsDir: userExtensionsDir, - name: extensionName, - version: '1.0.0', - installMetadata: { - source: 'https://some.git/repo', - type: 'git', - }, - }); - - mockGit.clone.mockRejectedValue(new Error('Git clone failed')); - mockGit.getRemotes.mockResolvedValue([{ name: 'origin' }]); - - const dispatch = vi.fn(); - const extension = annotateActiveExtensions( - [ - loadExtension({ - extensionDir, - workspaceDir: tempWorkspaceDir, - })!, - ], - process.cwd(), - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - )[0]; - await expect( - updateExtension( - extension, - tempHomeDir, - async (_) => true, - ExtensionUpdateState.UPDATE_AVAILABLE, - dispatch, - ), - ).rejects.toThrow(); - - expect(dispatch).toHaveBeenCalledWith({ - type: 'SET_STATE', - payload: { - name: extensionName, - state: ExtensionUpdateState.UPDATING, - }, - }); - expect(dispatch).toHaveBeenCalledWith({ - type: 'SET_STATE', - payload: { - name: extensionName, - state: ExtensionUpdateState.ERROR, - }, - }); - }); - }); - - describe('checkForAllExtensionUpdates', () => { - it('should return UpdateAvailable for a git extension with updates', async () => { - const extensionDir = createExtension({ - extensionsDir: userExtensionsDir, - name: 'test-extension', - version: '1.0.0', - installMetadata: { - source: 'https://some.git/repo', - type: 'git', - }, - }); - const extension = annotateActiveExtensions( - [ - loadExtension({ - extensionDir, - workspaceDir: tempWorkspaceDir, - })!, - ], - process.cwd(), - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - )[0]; - - mockGit.getRemotes.mockResolvedValue([ - { name: 'origin', refs: { fetch: 'https://some.git/repo' } }, - ]); - mockGit.listRemote.mockResolvedValue('remoteHash HEAD'); - mockGit.revparse.mockResolvedValue('localHash'); - - const dispatch = vi.fn(); - await checkForAllExtensionUpdates([extension], dispatch); - expect(dispatch).toHaveBeenCalledWith({ - type: 'SET_STATE', - payload: { - name: 'test-extension', - state: ExtensionUpdateState.UPDATE_AVAILABLE, - }, - }); - }); - - it('should return UpToDate for a git extension with no updates', async () => { - const extensionDir = createExtension({ - extensionsDir: userExtensionsDir, - name: 'test-extension', - version: '1.0.0', - installMetadata: { - source: 'https://some.git/repo', - type: 'git', - }, - }); - const extension = annotateActiveExtensions( - [ - loadExtension({ - extensionDir, - workspaceDir: tempWorkspaceDir, - })!, - ], - process.cwd(), - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - )[0]; - - mockGit.getRemotes.mockResolvedValue([ - { name: 'origin', refs: { fetch: 'https://some.git/repo' } }, - ]); - mockGit.listRemote.mockResolvedValue('sameHash HEAD'); - mockGit.revparse.mockResolvedValue('sameHash'); - - const dispatch = vi.fn(); - await checkForAllExtensionUpdates([extension], dispatch); - expect(dispatch).toHaveBeenCalledWith({ - type: 'SET_STATE', - payload: { - name: 'test-extension', - state: ExtensionUpdateState.UP_TO_DATE, - }, - }); - }); - - it('should return UpToDate for a local extension with no updates', async () => { - const localExtensionSourcePath = path.join(tempHomeDir, 'local-source'); - const sourceExtensionDir = createExtension({ - extensionsDir: localExtensionSourcePath, - name: 'my-local-ext', - version: '1.0.0', - }); - - const installedExtensionDir = createExtension({ - extensionsDir: userExtensionsDir, - name: 'local-extension', - version: '1.0.0', - installMetadata: { source: sourceExtensionDir, type: 'local' }, - }); - const extension = annotateActiveExtensions( - [ - loadExtension({ - extensionDir: installedExtensionDir, - workspaceDir: tempWorkspaceDir, - })!, - ], - process.cwd(), - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - )[0]; - const dispatch = vi.fn(); - await checkForAllExtensionUpdates([extension], dispatch); - expect(dispatch).toHaveBeenCalledWith({ - type: 'SET_STATE', - payload: { - name: 'local-extension', - state: ExtensionUpdateState.UP_TO_DATE, - }, - }); - }); - - it('should return UpdateAvailable for a local extension with updates', async () => { - const localExtensionSourcePath = path.join(tempHomeDir, 'local-source'); - const sourceExtensionDir = createExtension({ - extensionsDir: localExtensionSourcePath, - name: 'my-local-ext', - version: '1.1.0', - }); - - const installedExtensionDir = createExtension({ - extensionsDir: userExtensionsDir, - name: 'local-extension', - version: '1.0.0', - installMetadata: { source: sourceExtensionDir, type: 'local' }, - }); - const extension = annotateActiveExtensions( - [ - loadExtension({ - extensionDir: installedExtensionDir, - workspaceDir: tempWorkspaceDir, - })!, - ], - process.cwd(), - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - )[0]; - const dispatch = vi.fn(); - await checkForAllExtensionUpdates([extension], dispatch); - expect(dispatch).toHaveBeenCalledWith({ - type: 'SET_STATE', - payload: { - name: 'local-extension', - state: ExtensionUpdateState.UPDATE_AVAILABLE, - }, - }); - }); - - it('should return Error when git check fails', async () => { - const extensionDir = createExtension({ - extensionsDir: userExtensionsDir, - name: 'error-extension', - version: '1.0.0', - installMetadata: { - source: 'https://some.git/repo', - type: 'git', - }, - }); - const extension = annotateActiveExtensions( - [ - loadExtension({ - extensionDir, - workspaceDir: tempWorkspaceDir, - })!, - ], - process.cwd(), - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), - )[0]; - - mockGit.getRemotes.mockRejectedValue(new Error('Git error')); - - const dispatch = vi.fn(); - await checkForAllExtensionUpdates([extension], dispatch); - expect(dispatch).toHaveBeenCalledWith({ - type: 'SET_STATE', - payload: { - name: 'error-extension', - state: ExtensionUpdateState.ERROR, - }, - }); - }); - }); -}); diff --git a/packages/cli/src/config/extensions/update.ts b/packages/cli/src/config/extensions/update.ts deleted file mode 100644 index d74be540f..000000000 --- a/packages/cli/src/config/extensions/update.ts +++ /dev/null @@ -1,182 +0,0 @@ -/** - * @license - * Copyright 2025 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -import { - type ExtensionUpdateAction, - ExtensionUpdateState, - type ExtensionUpdateStatus, -} from '../../ui/state/extensions.js'; -import { - copyExtension, - installExtension, - uninstallExtension, - loadExtension, - loadInstallMetadata, - ExtensionStorage, - loadExtensionConfig, -} from '../extension.js'; -import { checkForExtensionUpdate } from './github.js'; -import type { GeminiCLIExtension } from '@qwen-code/qwen-code-core'; -import * as fs from 'node:fs'; -import { getErrorMessage } from '../../utils/errors.js'; - -export interface ExtensionUpdateInfo { - name: string; - originalVersion: string; - updatedVersion: string; -} - -export async function updateExtension( - extension: GeminiCLIExtension, - cwd: string = process.cwd(), - requestConsent: (consent: string) => Promise, - currentState: ExtensionUpdateState, - dispatchExtensionStateUpdate: (action: ExtensionUpdateAction) => void, -): Promise { - if (currentState === ExtensionUpdateState.UPDATING) { - return undefined; - } - dispatchExtensionStateUpdate({ - type: 'SET_STATE', - payload: { name: extension.name, state: ExtensionUpdateState.UPDATING }, - }); - const installMetadata = loadInstallMetadata(extension.path); - - if (!installMetadata?.type) { - dispatchExtensionStateUpdate({ - type: 'SET_STATE', - payload: { name: extension.name, state: ExtensionUpdateState.ERROR }, - }); - throw new Error( - `Extension ${extension.name} cannot be updated, type is unknown.`, - ); - } - if (installMetadata?.type === 'link') { - dispatchExtensionStateUpdate({ - type: 'SET_STATE', - payload: { name: extension.name, state: ExtensionUpdateState.UP_TO_DATE }, - }); - throw new Error(`Extension is linked so does not need to be updated`); - } - const originalVersion = extension.version; - - const tempDir = await ExtensionStorage.createTmpDir(); - try { - await copyExtension(extension.path, tempDir); - const previousExtensionConfig = await loadExtensionConfig({ - extensionDir: extension.path, - workspaceDir: cwd, - }); - await uninstallExtension(extension.name, cwd); - await installExtension( - installMetadata, - requestConsent, - cwd, - previousExtensionConfig, - ); - - const updatedExtensionStorage = new ExtensionStorage(extension.name); - const updatedExtension = loadExtension({ - extensionDir: updatedExtensionStorage.getExtensionDir(), - workspaceDir: cwd, - }); - if (!updatedExtension) { - dispatchExtensionStateUpdate({ - type: 'SET_STATE', - payload: { name: extension.name, state: ExtensionUpdateState.ERROR }, - }); - throw new Error('Updated extension not found after installation.'); - } - const updatedVersion = updatedExtension.config.version; - dispatchExtensionStateUpdate({ - type: 'SET_STATE', - payload: { - name: extension.name, - state: ExtensionUpdateState.UPDATED_NEEDS_RESTART, - }, - }); - return { - name: extension.name, - originalVersion, - updatedVersion, - }; - } catch (e) { - console.error( - `Error updating extension, rolling back. ${getErrorMessage(e)}`, - ); - dispatchExtensionStateUpdate({ - type: 'SET_STATE', - payload: { name: extension.name, state: ExtensionUpdateState.ERROR }, - }); - await copyExtension(tempDir, extension.path); - throw e; - } finally { - await fs.promises.rm(tempDir, { recursive: true, force: true }); - } -} - -export async function updateAllUpdatableExtensions( - cwd: string = process.cwd(), - requestConsent: (consent: string) => Promise, - extensions: GeminiCLIExtension[], - extensionsState: Map, - dispatch: (action: ExtensionUpdateAction) => void, -): Promise { - return ( - await Promise.all( - extensions - .filter( - (extension) => - extensionsState.get(extension.name)?.status === - ExtensionUpdateState.UPDATE_AVAILABLE, - ) - .map((extension) => - updateExtension( - extension, - cwd, - requestConsent, - extensionsState.get(extension.name)!.status, - dispatch, - ), - ), - ) - ).filter((updateInfo) => !!updateInfo); -} - -export interface ExtensionUpdateCheckResult { - state: ExtensionUpdateState; - error?: string; -} - -export async function checkForAllExtensionUpdates( - extensions: GeminiCLIExtension[], - dispatch: (action: ExtensionUpdateAction) => void, -): Promise { - dispatch({ type: 'BATCH_CHECK_START' }); - const promises: Array> = []; - for (const extension of extensions) { - if (!extension.installMetadata) { - dispatch({ - type: 'SET_STATE', - payload: { - name: extension.name, - state: ExtensionUpdateState.NOT_UPDATABLE, - }, - }); - continue; - } - promises.push( - checkForExtensionUpdate(extension, (updatedState) => { - dispatch({ - type: 'SET_STATE', - payload: { name: extension.name, state: updatedState }, - }); - }), - ); - } - await Promise.all(promises); - dispatch({ type: 'BATCH_CHECK_END' }); -} diff --git a/packages/cli/src/config/settings.test.ts b/packages/cli/src/config/settings.test.ts index 6549f6f71..3f3980c10 100644 --- a/packages/cli/src/config/settings.test.ts +++ b/packages/cli/src/config/settings.test.ts @@ -51,7 +51,6 @@ import { import * as fs from 'node:fs'; // fs will be mocked separately import stripJsonComments from 'strip-json-comments'; // Will be mocked separately import { isWorkspaceTrusted } from './trustedFolders.js'; -import { disableExtension } from './extension.js'; // These imports will get the versions from the vi.mock('./settings.js', ...) factory. import { @@ -65,8 +64,6 @@ import { needsMigration, type Settings, loadEnvironment, - migrateDeprecatedSettings, - SettingScope, SETTINGS_VERSION, SETTINGS_VERSION_KEY, } from './settings.js'; @@ -2260,7 +2257,7 @@ describe('Settings Loading and Merging', () => { disableAutoUpdate: true, }, ui: { - hideBanner: true, + hideTips: true, customThemes: { myTheme: {}, }, @@ -2283,7 +2280,7 @@ describe('Settings Loading and Merging', () => { const v1Settings = migrateSettingsToV1(v2Settings); expect(v1Settings).toEqual({ disableAutoUpdate: true, - hideBanner: true, + hideTips: true, customThemes: { myTheme: {}, }, @@ -2730,122 +2727,4 @@ describe('Settings Loading and Merging', () => { }); }); }); - - describe('migrateDeprecatedSettings', () => { - let mockFsExistsSync: Mocked; - let mockFsReadFileSync: Mocked; - let mockDisableExtension: Mocked; - - beforeEach(() => { - vi.resetAllMocks(); - - mockFsExistsSync = vi.mocked(fs.existsSync); - mockFsReadFileSync = vi.mocked(fs.readFileSync); - mockDisableExtension = vi.mocked(disableExtension); - - (mockFsExistsSync as Mock).mockReturnValue(true); - vi.mocked(isWorkspaceTrusted).mockReturnValue(true); - }); - - afterEach(() => { - vi.restoreAllMocks(); - }); - - it('should migrate disabled extensions from user and workspace settings', () => { - const userSettingsContent = { - extensions: { - disabled: ['user-ext-1', 'shared-ext'], - }, - }; - const workspaceSettingsContent = { - extensions: { - disabled: ['workspace-ext-1', 'shared-ext'], - }, - }; - - (mockFsReadFileSync as Mock).mockImplementation( - (p: fs.PathOrFileDescriptor) => { - if (p === USER_SETTINGS_PATH) - return JSON.stringify(userSettingsContent); - if (p === MOCK_WORKSPACE_SETTINGS_PATH) - return JSON.stringify(workspaceSettingsContent); - return '{}'; - }, - ); - - const loadedSettings = loadSettings(MOCK_WORKSPACE_DIR); - const setValueSpy = vi.spyOn(loadedSettings, 'setValue'); - - migrateDeprecatedSettings(loadedSettings, MOCK_WORKSPACE_DIR); - - // Check user settings migration - expect(mockDisableExtension).toHaveBeenCalledWith( - 'user-ext-1', - SettingScope.User, - MOCK_WORKSPACE_DIR, - ); - expect(mockDisableExtension).toHaveBeenCalledWith( - 'shared-ext', - SettingScope.User, - MOCK_WORKSPACE_DIR, - ); - - // Check workspace settings migration - expect(mockDisableExtension).toHaveBeenCalledWith( - 'workspace-ext-1', - SettingScope.Workspace, - MOCK_WORKSPACE_DIR, - ); - expect(mockDisableExtension).toHaveBeenCalledWith( - 'shared-ext', - SettingScope.Workspace, - MOCK_WORKSPACE_DIR, - ); - - // Check that setValue was called to remove the deprecated setting - expect(setValueSpy).toHaveBeenCalledWith( - SettingScope.User, - 'extensions', - { - disabled: undefined, - }, - ); - expect(setValueSpy).toHaveBeenCalledWith( - SettingScope.Workspace, - 'extensions', - { - disabled: undefined, - }, - ); - }); - - it('should not do anything if there are no deprecated settings', () => { - const userSettingsContent = { - extensions: { - enabled: ['user-ext-1'], - }, - }; - const workspaceSettingsContent = { - someOtherSetting: 'value', - }; - - (mockFsReadFileSync as Mock).mockImplementation( - (p: fs.PathOrFileDescriptor) => { - if (p === USER_SETTINGS_PATH) - return JSON.stringify(userSettingsContent); - if (p === MOCK_WORKSPACE_SETTINGS_PATH) - return JSON.stringify(workspaceSettingsContent); - return '{}'; - }, - ); - - const loadedSettings = loadSettings(MOCK_WORKSPACE_DIR); - const setValueSpy = vi.spyOn(loadedSettings, 'setValue'); - - migrateDeprecatedSettings(loadedSettings, MOCK_WORKSPACE_DIR); - - expect(mockDisableExtension).not.toHaveBeenCalled(); - expect(setValueSpy).not.toHaveBeenCalled(); - }); - }); }); diff --git a/packages/cli/src/config/settings.ts b/packages/cli/src/config/settings.ts index 4f132ef46..1e28ceb8d 100644 --- a/packages/cli/src/config/settings.ts +++ b/packages/cli/src/config/settings.ts @@ -30,7 +30,6 @@ import { import { resolveEnvVarsInObject } from '../utils/envVarResolver.js'; import { customDeepMerge, type MergeableObject } from '../utils/deepMerge.js'; import { updateSettingsFilePreservingFormat } from '../utils/commentJson.js'; -import { disableExtension } from './extension.js'; function getMergeStrategyForPath(path: string[]): MergeStrategy | undefined { let current: SettingDefinition | undefined = undefined; @@ -81,7 +80,6 @@ const MIGRATION_MAP: Record = { excludeTools: 'tools.exclude', excludeMCPServers: 'mcp.excluded', excludedProjectEnvVars: 'advanced.excludedEnvVars', - extensionManagement: 'experimental.extensionManagement', extensions: 'extensions', fileFiltering: 'context.fileFiltering', folderTrustFeature: 'security.folderTrust.featureEnabled', @@ -90,13 +88,6 @@ const MIGRATION_MAP: Record = { hideWindowTitle: 'ui.hideWindowTitle', showStatusInTitle: 'ui.showStatusInTitle', hideTips: 'ui.hideTips', - hideBanner: 'ui.hideBanner', - hideFooter: 'ui.hideFooter', - hideCWD: 'ui.footer.hideCWD', - hideSandboxStatus: 'ui.footer.hideSandboxStatus', - hideModelInfo: 'ui.footer.hideModelInfo', - hideContextSummary: 'ui.hideContextSummary', - showMemoryUsage: 'ui.showMemoryUsage', showLineNumbers: 'ui.showLineNumbers', showCitations: 'ui.showCitations', ideMode: 'ide.enabled', @@ -959,24 +950,9 @@ export function loadSettings( export function migrateDeprecatedSettings( loadedSettings: LoadedSettings, - workspaceDir: string = process.cwd(), ): void { const processScope = (scope: SettingScope) => { const settings = loadedSettings.forScope(scope).settings; - if (settings.extensions?.disabled) { - console.log( - `Migrating deprecated extensions.disabled settings from ${scope} settings...`, - ); - for (const extension of settings.extensions.disabled ?? []) { - disableExtension(extension, scope, workspaceDir); - } - - const newExtensionsValue = { ...settings.extensions }; - newExtensionsValue.disabled = undefined; - - loadedSettings.setValue(scope, 'extensions', newExtensionsValue); - } - const legacySkills = ( settings as Settings & { tools?: { experimental?: { skills?: boolean } }; diff --git a/packages/cli/src/config/settingsSchema.test.ts b/packages/cli/src/config/settingsSchema.test.ts index 407d54414..adbc162b5 100644 --- a/packages/cli/src/config/settingsSchema.test.ts +++ b/packages/cli/src/config/settingsSchema.test.ts @@ -157,9 +157,6 @@ describe('SettingsSchema', () => { it('should have showInDialog property configured', () => { // Check that user-facing settings are marked for dialog display - expect( - getSettingsSchema().ui.properties.showMemoryUsage.showInDialog, - ).toBe(true); expect(getSettingsSchema().general.properties.vimMode.showInDialog).toBe( true, ); @@ -171,17 +168,14 @@ describe('SettingsSchema', () => { ).toBe(true); expect( getSettingsSchema().ui.properties.hideWindowTitle.showInDialog, - ).toBe(true); + ).toBe(false); expect(getSettingsSchema().ui.properties.hideTips.showInDialog).toBe( true, ); - expect(getSettingsSchema().ui.properties.hideBanner.showInDialog).toBe( - true, - ); expect( getSettingsSchema().privacy.properties.usageStatisticsEnabled .showInDialog, - ).toBe(false); + ).toBe(true); // Check that advanced settings are hidden from dialog expect(getSettingsSchema().security.properties.auth.showInDialog).toBe( @@ -194,7 +188,7 @@ describe('SettingsSchema', () => { expect(getSettingsSchema().telemetry.showInDialog).toBe(false); // Check that some settings are appropriately hidden - expect(getSettingsSchema().ui.properties.theme.showInDialog).toBe(false); // Changed to false + expect(getSettingsSchema().ui.properties.theme.showInDialog).toBe(true); expect(getSettingsSchema().ui.properties.customThemes.showInDialog).toBe( false, ); // Managed via theme editor @@ -203,13 +197,13 @@ describe('SettingsSchema', () => { ).toBe(false); // Experimental feature expect(getSettingsSchema().ui.properties.accessibility.showInDialog).toBe( false, - ); // Changed to false + ); expect( getSettingsSchema().context.properties.fileFiltering.showInDialog, - ).toBe(false); // Changed to false + ).toBe(false); expect( getSettingsSchema().general.properties.preferredEditor.showInDialog, - ).toBe(false); // Changed to false + ).toBe(true); expect( getSettingsSchema().advanced.properties.autoConfigureMemory .showInDialog, @@ -287,7 +281,7 @@ describe('SettingsSchema', () => { expect( getSettingsSchema().security.properties.folderTrust.properties.enabled .showInDialog, - ).toBe(true); + ).toBe(false); }); it('should have debugKeystrokeLogging setting in schema', () => { @@ -310,7 +304,7 @@ describe('SettingsSchema', () => { expect( getSettingsSchema().general.properties.debugKeystrokeLogging .showInDialog, - ).toBe(true); + ).toBe(false); expect( getSettingsSchema().general.properties.debugKeystrokeLogging .description, diff --git a/packages/cli/src/config/settingsSchema.ts b/packages/cli/src/config/settingsSchema.ts index 72f521373..6390643d0 100644 --- a/packages/cli/src/config/settingsSchema.ts +++ b/packages/cli/src/config/settingsSchema.ts @@ -132,7 +132,7 @@ const SETTINGS_SCHEMA = { requiresRestart: false, default: undefined as string | undefined, description: 'The preferred editor to open files in.', - showInDialog: false, + showInDialog: true, }, vimMode: { type: 'boolean', @@ -163,13 +163,13 @@ const SETTINGS_SCHEMA = { }, gitCoAuthor: { type: 'boolean', - label: 'Git Co-Author', + label: 'Attribution: commit', category: 'General', requiresRestart: false, default: true, description: 'Automatically add a Co-authored-by trailer to git commit messages when commits are made through Qwen Code.', - showInDialog: false, + showInDialog: true, }, checkpointing: { type: 'object', @@ -198,13 +198,13 @@ const SETTINGS_SCHEMA = { requiresRestart: false, default: false, description: 'Enable debug logging of keystrokes to the console.', - showInDialog: true, + showInDialog: false, }, language: { type: 'enum', - label: 'Language', + label: 'Language: UI', category: 'General', - requiresRestart: false, + requiresRestart: true, default: 'auto', description: 'The language for the user interface. Use "auto" to detect from system settings. ' + @@ -219,9 +219,20 @@ const SETTINGS_SCHEMA = { { value: 'de', label: 'Deutsch (German)' }, ], }, + outputLanguage: { + type: 'string', + label: 'Language: Model', + category: 'General', + requiresRestart: true, + default: 'auto', + description: + 'The language for LLM output. Use "auto" to detect from system settings, ' + + 'or set a specific language (e.g., "English", "中文", "日本語").', + showInDialog: true, + }, terminalBell: { type: 'boolean', - label: 'Terminal Bell', + label: 'Terminal Bell Notification', category: 'General', requiresRestart: false, default: true, @@ -257,7 +268,7 @@ const SETTINGS_SCHEMA = { requiresRestart: false, default: 'text', description: 'The format of the CLI output.', - showInDialog: true, + showInDialog: false, options: [ { value: 'text', label: 'Text' }, { value: 'json', label: 'JSON' }, @@ -280,9 +291,9 @@ const SETTINGS_SCHEMA = { label: 'Theme', category: 'UI', requiresRestart: false, - default: undefined as string | undefined, + default: 'Qwen Dark' as string, description: 'The color theme for the UI.', - showInDialog: false, + showInDialog: true, }, customThemes: { type: 'object', @@ -300,7 +311,7 @@ const SETTINGS_SCHEMA = { requiresRestart: true, default: false, description: 'Hide the window title bar', - showInDialog: true, + showInDialog: false, }, showStatusInTitle: { type: 'boolean', @@ -310,7 +321,7 @@ const SETTINGS_SCHEMA = { default: false, description: 'Show Qwen Code status and thoughts in the terminal window title', - showInDialog: true, + showInDialog: false, }, hideTips: { type: 'boolean', @@ -321,89 +332,13 @@ const SETTINGS_SCHEMA = { description: 'Hide helpful tips in the UI', showInDialog: true, }, - hideBanner: { - type: 'boolean', - label: 'Hide Banner', - category: 'UI', - requiresRestart: false, - default: false, - description: 'Hide the application banner', - showInDialog: true, - }, - hideContextSummary: { - type: 'boolean', - label: 'Hide Context Summary', - category: 'UI', - requiresRestart: false, - default: false, - description: - 'Hide the context summary (QWEN.md, MCP servers) above the input.', - showInDialog: true, - }, - footer: { - type: 'object', - label: 'Footer', - category: 'UI', - requiresRestart: false, - default: {}, - description: 'Settings for the footer.', - showInDialog: false, - properties: { - hideCWD: { - type: 'boolean', - label: 'Hide CWD', - category: 'UI', - requiresRestart: false, - default: false, - description: - 'Hide the current working directory path in the footer.', - showInDialog: true, - }, - hideSandboxStatus: { - type: 'boolean', - label: 'Hide Sandbox Status', - category: 'UI', - requiresRestart: false, - default: false, - description: 'Hide the sandbox status indicator in the footer.', - showInDialog: true, - }, - hideModelInfo: { - type: 'boolean', - label: 'Hide Model Info', - category: 'UI', - requiresRestart: false, - default: false, - description: 'Hide the model name and context usage in the footer.', - showInDialog: true, - }, - }, - }, - hideFooter: { - type: 'boolean', - label: 'Hide Footer', - category: 'UI', - requiresRestart: false, - default: false, - description: 'Hide the footer from the UI', - showInDialog: true, - }, - showMemoryUsage: { - type: 'boolean', - label: 'Show Memory Usage', - category: 'UI', - requiresRestart: false, - default: false, - description: 'Display memory usage information in the UI', - showInDialog: true, - }, showLineNumbers: { type: 'boolean', - label: 'Show Line Numbers', + label: 'Show Line Numbers in Code', category: 'UI', requiresRestart: false, default: false, - description: 'Show line numbers in the chat.', + description: 'Show line numbers in the code output.', showInDialog: true, }, showCitations: { @@ -413,7 +348,7 @@ const SETTINGS_SCHEMA = { requiresRestart: false, default: false, description: 'Show citations for generated text in the chat.', - showInDialog: true, + showInDialog: false, }, customWittyPhrases: { type: 'array', @@ -426,7 +361,7 @@ const SETTINGS_SCHEMA = { }, enableWelcomeBack: { type: 'boolean', - label: 'Enable Welcome Back', + label: 'Show Welcome Back Dialog', category: 'UI', requiresRestart: false, default: true, @@ -460,7 +395,7 @@ const SETTINGS_SCHEMA = { requiresRestart: true, default: false, description: 'Disable loading phrases for accessibility', - showInDialog: true, + showInDialog: false, }, screenReader: { type: 'boolean', @@ -470,7 +405,7 @@ const SETTINGS_SCHEMA = { default: undefined as boolean | undefined, description: 'Render output in plain-text to be more screen reader accessible', - showInDialog: true, + showInDialog: false, }, }, }, @@ -497,7 +432,7 @@ const SETTINGS_SCHEMA = { properties: { enabled: { type: 'boolean', - label: 'IDE Mode', + label: 'Auto-connect to IDE', category: 'IDE', requiresRestart: true, default: false, @@ -532,7 +467,7 @@ const SETTINGS_SCHEMA = { requiresRestart: true, default: true, description: 'Enable collection of usage statistics', - showInDialog: false, + showInDialog: true, }, }, }, @@ -573,7 +508,7 @@ const SETTINGS_SCHEMA = { default: -1, description: 'Maximum number of user/model/tool turns to keep in a session. -1 means unlimited.', - showInDialog: true, + showInDialog: false, }, summarizeToolOutput: { type: 'object', @@ -611,7 +546,7 @@ const SETTINGS_SCHEMA = { requiresRestart: false, default: true, description: 'Skip the next speaker check.', - showInDialog: true, + showInDialog: false, }, skipLoopDetection: { type: 'boolean', @@ -620,7 +555,7 @@ const SETTINGS_SCHEMA = { requiresRestart: false, default: false, description: 'Disable all loop detection checks (streaming and LLM).', - showInDialog: true, + showInDialog: false, }, skipStartupContext: { type: 'boolean', @@ -630,7 +565,7 @@ const SETTINGS_SCHEMA = { default: false, description: 'Avoid sending the workspace startup context at the beginning of each session.', - showInDialog: true, + showInDialog: false, }, enableOpenAILogging: { type: 'boolean', @@ -639,7 +574,7 @@ const SETTINGS_SCHEMA = { requiresRestart: false, default: false, description: 'Enable OpenAI logging.', - showInDialog: true, + showInDialog: false, }, openAILoggingDir: { type: 'string', @@ -649,7 +584,7 @@ const SETTINGS_SCHEMA = { default: undefined as string | undefined, description: 'Custom directory path for OpenAI API logs. If not specified, defaults to logs/openai in the current working directory.', - showInDialog: true, + showInDialog: false, }, generationConfig: { type: 'object', @@ -669,7 +604,7 @@ const SETTINGS_SCHEMA = { description: 'Request timeout in milliseconds.', parentKey: 'generationConfig', childKey: 'timeout', - showInDialog: true, + showInDialog: false, }, maxRetries: { type: 'number', @@ -680,7 +615,7 @@ const SETTINGS_SCHEMA = { description: 'Maximum number of retries for failed requests.', parentKey: 'generationConfig', childKey: 'maxRetries', - showInDialog: true, + showInDialog: false, }, disableCacheControl: { type: 'boolean', @@ -691,7 +626,7 @@ const SETTINGS_SCHEMA = { description: 'Disable cache control for DashScope providers.', parentKey: 'generationConfig', childKey: 'disableCacheControl', - showInDialog: true, + showInDialog: false, }, schemaCompliance: { type: 'enum', @@ -703,7 +638,7 @@ const SETTINGS_SCHEMA = { 'The compliance mode for tool schemas sent to the model. Use "openapi_30" for strict OpenAPI 3.0 compatibility (e.g., for Gemini).', parentKey: 'generationConfig', childKey: 'schemaCompliance', - showInDialog: true, + showInDialog: false, options: [ { value: 'auto', label: 'Auto (Default)' }, { value: 'openapi_30', label: 'OpenAPI 3.0 Strict' }, @@ -759,7 +694,7 @@ const SETTINGS_SCHEMA = { requiresRestart: false, default: false, description: 'Whether to load memory files from include directories.', - showInDialog: true, + showInDialog: false, }, fileFiltering: { type: 'object', @@ -795,7 +730,7 @@ const SETTINGS_SCHEMA = { requiresRestart: true, default: true, description: 'Enable recursive file search functionality', - showInDialog: true, + showInDialog: false, }, disableFuzzySearch: { type: 'boolean', @@ -804,7 +739,7 @@ const SETTINGS_SCHEMA = { requiresRestart: true, default: false, description: 'Disable fuzzy search when searching for files.', - showInDialog: true, + showInDialog: false, }, }, }, @@ -841,7 +776,7 @@ const SETTINGS_SCHEMA = { properties: { enableInteractiveShell: { type: 'boolean', - label: 'Enable Interactive Shell', + label: 'Interactive Shell (PTY)', category: 'Tools', requiresRestart: true, default: false, @@ -866,20 +801,10 @@ const SETTINGS_SCHEMA = { requiresRestart: false, default: false, description: 'Show color in shell output.', - showInDialog: true, + showInDialog: false, }, }, }, - autoAccept: { - type: 'boolean', - label: 'Auto Accept', - category: 'Tools', - requiresRestart: false, - default: false, - description: - 'Automatically accept and execute tool calls that are considered safe (e.g., read-only operations).', - showInDialog: true, - }, core: { type: 'array', label: 'Core Tools', @@ -911,7 +836,7 @@ const SETTINGS_SCHEMA = { }, approvalMode: { type: 'enum', - label: 'Approval Mode', + label: 'Tool Approval Mode', category: 'Tools', requiresRestart: false, default: ApprovalMode.DEFAULT, @@ -925,6 +850,16 @@ const SETTINGS_SCHEMA = { { value: ApprovalMode.YOLO, label: 'YOLO' }, ], }, + autoAccept: { + type: 'boolean', + label: 'Auto Accept', + category: 'Tools', + requiresRestart: false, + default: false, + description: + 'Automatically accept and execute tool calls that are considered safe (e.g., read-only operations) without explicit user confirmation.', + showInDialog: false, + }, discoveryCommand: { type: 'string', label: 'Tool Discovery Command', @@ -951,7 +886,7 @@ const SETTINGS_SCHEMA = { default: true, description: 'Use ripgrep for file content search instead of the fallback implementation. Provides faster search performance.', - showInDialog: true, + showInDialog: false, }, useBuiltinRipgrep: { type: 'boolean', @@ -961,7 +896,7 @@ const SETTINGS_SCHEMA = { default: true, description: 'Use the bundled ripgrep binary. When set to false, the system-level "rg" command will be used instead. This setting is only effective when useRipgrep is true.', - showInDialog: true, + showInDialog: false, }, enableToolOutputTruncation: { type: 'boolean', @@ -970,7 +905,7 @@ const SETTINGS_SCHEMA = { requiresRestart: true, default: true, description: 'Enable truncation of large tool outputs.', - showInDialog: true, + showInDialog: false, }, truncateToolOutputThreshold: { type: 'number', @@ -980,7 +915,7 @@ const SETTINGS_SCHEMA = { default: DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD, description: 'Truncate tool output if it is larger than this many characters. Set to -1 to disable.', - showInDialog: true, + showInDialog: false, }, truncateToolOutputLines: { type: 'number', @@ -989,7 +924,7 @@ const SETTINGS_SCHEMA = { requiresRestart: true, default: DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES, description: 'The number of lines to keep when truncating tool output.', - showInDialog: true, + showInDialog: false, }, }, }, @@ -1119,7 +1054,7 @@ const SETTINGS_SCHEMA = { requiresRestart: true, default: false, description: 'Setting to track whether Folder trust is enabled.', - showInDialog: true, + showInDialog: false, }, }, }, @@ -1272,7 +1207,7 @@ const SETTINGS_SCHEMA = { properties: { skills: { type: 'boolean', - label: 'Skills', + label: 'Experimental: Skills', category: 'Experimental', requiresRestart: true, default: false, @@ -1280,15 +1215,6 @@ const SETTINGS_SCHEMA = { 'Enable experimental Agent Skills feature. When enabled, Qwen Code can use Skills from .qwen/skills/ and ~/.qwen/skills/.', showInDialog: true, }, - extensionManagement: { - type: 'boolean', - label: 'Extension Management', - category: 'Experimental', - requiresRestart: true, - default: true, - description: 'Enable extension management features.', - showInDialog: false, - }, visionModelPreview: { type: 'boolean', label: 'Vision Model Preview', @@ -1297,7 +1223,7 @@ const SETTINGS_SCHEMA = { default: true, description: 'Enable vision model support and auto-switching functionality. When disabled, vision models like qwen-vl-max-latest will be hidden and auto-switching will not occur.', - showInDialog: true, + showInDialog: false, }, vlmSwitchMode: { type: 'string', @@ -1311,39 +1237,6 @@ const SETTINGS_SCHEMA = { }, }, }, - - extensions: { - type: 'object', - label: 'Extensions', - category: 'Extensions', - requiresRestart: true, - default: {}, - description: 'Settings for extensions.', - showInDialog: false, - properties: { - disabled: { - type: 'array', - label: 'Disabled Extensions', - category: 'Extensions', - requiresRestart: true, - default: [] as string[], - description: 'List of disabled extensions.', - showInDialog: false, - mergeStrategy: MergeStrategy.UNION, - }, - workspacesWithMigrationNudge: { - type: 'array', - label: 'Workspaces with Migration Nudge', - category: 'Extensions', - requiresRestart: false, - default: [] as string[], - description: - 'List of workspaces for which the migration nudge has been shown.', - showInDialog: false, - mergeStrategy: MergeStrategy.UNION, - }, - }, - }, } as const satisfies SettingsSchema; export type SettingsSchemaType = typeof SETTINGS_SCHEMA; @@ -1365,9 +1258,3 @@ type InferSettings = { }; export type Settings = InferSettings; - -export interface FooterSettings { - hideCWD?: boolean; - hideSandboxStatus?: boolean; - hideModelInfo?: boolean; -} diff --git a/packages/cli/src/core/initializer.ts b/packages/cli/src/core/initializer.ts index 56f65b1c5..c21d637e3 100644 --- a/packages/cli/src/core/initializer.ts +++ b/packages/cli/src/core/initializer.ts @@ -15,7 +15,7 @@ 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 { initializeLlmOutputLanguage } from '../ui/commands/languageCommand.js'; +import { initializeLlmOutputLanguage } from '../utils/languageUtils.js'; export interface InitializationResult { authError: string | null; @@ -43,7 +43,7 @@ export async function initializeApp( await initializeI18n(languageSetting); // Auto-detect and set LLM output language on first use - initializeLlmOutputLanguage(); + initializeLlmOutputLanguage(settings.merged.general?.outputLanguage); // Use authType from modelsConfig which respects CLI --auth-type argument // over settings.security.auth.selectedType diff --git a/packages/cli/src/gemini.test.tsx b/packages/cli/src/gemini.test.tsx index c2f971ec4..25db908c4 100644 --- a/packages/cli/src/gemini.test.tsx +++ b/packages/cli/src/gemini.test.tsx @@ -271,7 +271,6 @@ describe('gemini.tsx main function', () => { ); const { loadSettings } = await import('./config/settings.js'); const cleanupModule = await import('./utils/cleanup.js'); - const extensionModule = await import('./config/extension.js'); const validatorModule = await import('./validateNonInterActiveAuth.js'); const streamJsonModule = await import('./nonInteractive/session.js'); const initializerModule = await import('./core/initializer.js'); @@ -284,11 +283,6 @@ describe('gemini.tsx main function', () => { vi.mocked(cleanupModule.registerCleanup).mockImplementation(() => {}); const runExitCleanupMock = vi.mocked(cleanupModule.runExitCleanup); runExitCleanupMock.mockResolvedValue(undefined); - vi.spyOn(extensionModule, 'loadExtensions').mockReturnValue([]); - vi.spyOn( - extensionModule.ExtensionStorage, - 'getUserExtensionsDir', - ).mockReturnValue('/tmp/extensions'); vi.spyOn(initializerModule, 'initializeApp').mockResolvedValue({ authError: null, themeError: null, @@ -456,7 +450,6 @@ describe('gemini.tsx main function kitty protocol', () => { promptInteractive: undefined, query: undefined, allFiles: undefined, - showMemoryUsage: undefined, yolo: undefined, approvalMode: undefined, telemetry: undefined, @@ -495,6 +488,7 @@ describe('gemini.tsx main function kitty protocol', () => { excludeTools: undefined, authType: undefined, maxSessionTurns: undefined, + experimentalLsp: undefined, channel: undefined, chatRecording: undefined, }); diff --git a/packages/cli/src/gemini.tsx b/packages/cli/src/gemini.tsx index 04e972c88..8ab99413b 100644 --- a/packages/cli/src/gemini.tsx +++ b/packages/cli/src/gemini.tsx @@ -15,13 +15,8 @@ import React from 'react'; import { validateAuthMethod } from './config/auth.js'; import * as cliConfig from './config/config.js'; import { loadCliConfig, parseArguments } from './config/config.js'; -import { ExtensionStorage, loadExtensions } from './config/extension.js'; import type { DnsResolutionOrder, LoadedSettings } from './config/settings.js'; -import { - getSettingsWarnings, - loadSettings, - migrateDeprecatedSettings, -} from './config/settings.js'; +import { getSettingsWarnings, loadSettings } from './config/settings.js'; import { initializeApp, type InitializationResult, @@ -107,7 +102,6 @@ function getNodeMemoryArgs(isDebugMode: boolean): string[] { return []; } -import { ExtensionEnablementManager } from './config/extensions/extensionEnablement.js'; import { loadSandboxConfig } from './config/sandboxConfig.js'; import { runAcpAgent } from './acp-integration/acpAgent.js'; @@ -206,7 +200,6 @@ export async function startInteractiveUI( export async function main() { setupUnhandledRejectionHandler(); const settings = loadSettings(); - migrateDeprecatedSettings(settings); await cleanupCheckpoints(); let argv = await parseArguments(settings.merged); @@ -251,10 +244,9 @@ export async function main() { if (sandboxConfig) { const partialConfig = await loadCliConfig( settings.merged, - [], - new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()), argv, undefined, + [], { startLsp: false }, ); @@ -337,26 +329,22 @@ export async function main() { // to run Gemini CLI. It is now safe to perform expensive initialization that // may have side effects. { - const extensionEnablementManager = new ExtensionEnablementManager( - ExtensionStorage.getUserExtensionsDir(), - argv.extensions, - ); - const extensions = loadExtensions(extensionEnablementManager); const config = await loadCliConfig( settings.merged, - extensions, - extensionEnablementManager, argv, + process.cwd(), + argv.extensions, ); registerCleanup(() => config.shutdown()); - if (config.getListExtensions()) { - console.log('Installed extensions:'); - for (const extension of extensions) { - console.log(`- ${extension.config.name}`); - } - process.exit(0); - } + // FIXME: list extensions after the config initialize + // if (config.getListExtensions()) { + // console.log('Installed extensions:'); + // for (const extension of extensions) { + // console.log(`- ${extension.config.name}`); + // } + // process.exit(0); + // } // Setup unified ConsolePatcher based on interactive mode const isInteractive = config.isInteractive(); @@ -402,7 +390,7 @@ export async function main() { } if (config.getExperimentalZedIntegration()) { - return runAcpAgent(config, settings, extensions, argv); + return runAcpAgent(config, settings, argv); } let input = config.getQuestion(); diff --git a/packages/cli/src/i18n/locales/de.js b/packages/cli/src/i18n/locales/de.js index d358811cf..1dc124c3f 100644 --- a/packages/cli/src/i18n/locales/de.js +++ b/packages/cli/src/i18n/locales/de.js @@ -60,10 +60,15 @@ export default { 'show version info': 'Versionsinformationen anzeigen', 'submit a bug report': 'Fehlerbericht einreichen', 'About Qwen Code': 'Über Qwen Code', + Status: 'Status', // ============================================================================ // System Information Fields // ============================================================================ + 'Qwen Code': 'Qwen Code', + Runtime: 'Laufzeit', + OS: 'Betriebssystem', + Auth: 'Authentifizierung', 'CLI Version': 'CLI-Version', 'Git Commit': 'Git-Commit', Model: 'Modell', @@ -76,6 +81,7 @@ export default { 'Session ID': 'Sitzungs-ID', 'Auth Method': 'Authentifizierungsmethode', 'Base URL': 'Basis-URL', + Proxy: 'Proxy', 'Memory Usage': 'Speichernutzung', 'IDE Client': 'IDE-Client', @@ -97,8 +103,8 @@ export default { Preview: 'Vorschau', '(Use Enter to select, Tab to configure scope)': '(Enter zum Auswählen, Tab zum Konfigurieren des Bereichs)', - '(Use Enter to apply scope, Tab to select theme)': - '(Enter zum Anwenden des Bereichs, Tab zum Auswählen des Designs)', + '(Use Enter to apply scope, Tab to go back)': + '(Enter zum Anwenden des Bereichs, Tab zum Zurückgehen)', 'Theme configuration unavailable due to NO_COLOR env variable.': 'Design-Konfiguration aufgrund der NO_COLOR-Umgebungsvariable nicht verfügbar.', 'Theme "{{themeName}}" not found.': 'Design "{{themeName}}" nicht gefunden.', @@ -151,6 +157,7 @@ export default { 'Project Level ({{path}})': 'Projektebene ({{path}})', 'User Level ({{path}})': 'Benutzerebene ({{path}})', 'Built-in Agents': 'Integrierte Agenten', + 'Extension Agents': 'Erweiterungs-Agenten', 'Using: {{count}} agents': 'Verwendet: {{count}} Agenten', 'View Agent': 'Agent anzeigen', 'Edit Agent': 'Agent bearbeiten', @@ -260,8 +267,6 @@ export default { 'View and edit Qwen Code settings': 'Qwen Code Einstellungen anzeigen und bearbeiten', Settings: 'Einstellungen', - '(Use Enter to select{{tabText}})': '(Enter zum Auswählen{{tabText}})', - ', Tab to change focus': ', Tab zum Fokuswechsel', 'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.': 'Um Änderungen zu sehen, muss Qwen Code neu gestartet werden. Drücken Sie r, um jetzt zu beenden und Änderungen anzuwenden.', 'The command "/{{command}}" is not supported in non-interactive mode.': @@ -271,24 +276,24 @@ export default { // ============================================================================ 'Vim Mode': 'Vim-Modus', 'Disable Auto Update': 'Automatische Updates deaktivieren', + 'Attribution: commit': 'Attribution: Commit', + 'Terminal Bell Notification': 'Terminal-Signalton', + 'Enable Usage Statistics': 'Nutzungsstatistiken aktivieren', + Theme: 'Farbschema', + 'Preferred Editor': 'Bevorzugter Editor', + 'Auto-connect to IDE': 'Automatische Verbindung zur IDE', 'Enable Prompt Completion': 'Eingabevervollständigung aktivieren', 'Debug Keystroke Logging': 'Debug-Protokollierung von Tastatureingaben', - Language: 'Sprache', + 'Language: UI': 'Sprache: Benutzeroberfläche', + 'Language: Model': 'Sprache: Modell', 'Output Format': 'Ausgabeformat', 'Hide Window Title': 'Fenstertitel ausblenden', 'Show Status in Title': 'Status im Titel anzeigen', 'Hide Tips': 'Tipps ausblenden', - 'Hide Banner': 'Banner ausblenden', - 'Hide Context Summary': 'Kontextzusammenfassung ausblenden', - 'Hide CWD': 'Arbeitsverzeichnis ausblenden', - 'Hide Sandbox Status': 'Sandbox-Status ausblenden', - 'Hide Model Info': 'Modellinformationen ausblenden', - 'Hide Footer': 'Fußzeile ausblenden', - 'Show Memory Usage': 'Speichernutzung anzeigen', - 'Show Line Numbers': 'Zeilennummern anzeigen', + 'Show Line Numbers in Code': 'Zeilennummern im Code anzeigen', 'Show Citations': 'Quellenangaben anzeigen', 'Custom Witty Phrases': 'Benutzerdefinierte Witzige Sprüche', - 'Enable Welcome Back': 'Willkommen-zurück aktivieren', + 'Show Welcome Back Dialog': 'Willkommen-zurück-Dialog anzeigen', 'Enable User Feedback': 'Benutzerfeedback aktivieren', 'How is Qwen doing this session? (optional)': 'Wie macht sich Qwen in dieser Sitzung? (optional)', @@ -315,7 +320,7 @@ export default { 'Respect .qwenignore': '.qwenignore beachten', 'Enable Recursive File Search': 'Rekursive Dateisuche aktivieren', 'Disable Fuzzy Search': 'Unscharfe Suche deaktivieren', - 'Enable Interactive Shell': 'Interaktive Shell aktivieren', + 'Interactive Shell (PTY)': 'Interaktive Shell (PTY)', 'Show Color': 'Farbe anzeigen', 'Auto Accept': 'Automatisch akzeptieren', 'Use Ripgrep': 'Ripgrep verwenden', @@ -327,6 +332,7 @@ export default { 'Folder Trust': 'Ordnervertrauen', 'Vision Model Preview': 'Vision-Modell-Vorschau', 'Tool Schema Compliance': 'Werkzeug-Schema-Konformität', + 'Experimental: Skills': 'Experimentell: Fähigkeiten', // Settings enum options 'Auto (detect from system)': 'Automatisch (vom System erkennen)', Text: 'Text', @@ -351,10 +357,156 @@ export default { 'Show all directories in the workspace': 'Alle Verzeichnisse im Arbeitsbereich anzeigen', 'set external editor preference': 'Externen Editor festlegen', + 'Select Editor': 'Editor auswählen', + 'Editor Preference': 'Editor-Einstellung', + 'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.': + 'Diese Editoren werden derzeit unterstützt. Bitte beachten Sie, dass einige Editoren nicht im Sandbox-Modus verwendet werden können.', + 'Your preferred editor is:': 'Ihr bevorzugter Editor ist:', 'Manage extensions': 'Erweiterungen verwalten', 'List active extensions': 'Aktive Erweiterungen auflisten', 'Update extensions. Usage: update |--all': 'Erweiterungen aktualisieren. Verwendung: update |--all', + 'Disable an extension': 'Erweiterung deaktivieren', + 'Enable an extension': 'Erweiterung aktivieren', + 'Install an extension from a git repo or local path': + 'Erweiterung aus Git-Repository oder lokalem Pfad installieren', + 'Uninstall an extension': 'Erweiterung deinstallieren', + 'No extensions installed.': 'Keine Erweiterungen installiert.', + 'Usage: /extensions update |--all': + 'Verwendung: /extensions update |--all', + 'Extension "{{name}}" not found.': 'Erweiterung "{{name}}" nicht gefunden.', + 'No extensions to update.': 'Keine Erweiterungen zum Aktualisieren.', + 'Usage: /extensions install ': + 'Verwendung: /extensions install ', + 'Installing extension from "{{source}}"...': + 'Installiere Erweiterung von "{{source}}"...', + 'Extension "{{name}}" installed successfully.': + 'Erweiterung "{{name}}" erfolgreich installiert.', + 'Failed to install extension from "{{source}}": {{error}}': + 'Fehler beim Installieren der Erweiterung von "{{source}}": {{error}}', + 'Usage: /extensions uninstall ': + 'Verwendung: /extensions uninstall ', + 'Uninstalling extension "{{name}}"...': + 'Deinstalliere Erweiterung "{{name}}"...', + 'Extension "{{name}}" uninstalled successfully.': + 'Erweiterung "{{name}}" erfolgreich deinstalliert.', + 'Failed to uninstall extension "{{name}}": {{error}}': + 'Fehler beim Deinstallieren der Erweiterung "{{name}}": {{error}}', + 'Usage: /extensions {{command}} [--scope=]': + 'Verwendung: /extensions {{command}} [--scope=]', + 'Unsupported scope "{{scope}}", should be one of "user" or "workspace"': + 'Nicht unterstützter Bereich "{{scope}}", sollte "user" oder "workspace" sein', + 'Extension "{{name}}" disabled for scope "{{scope}}"': + 'Erweiterung "{{name}}" für Bereich "{{scope}}" deaktiviert', + 'Extension "{{name}}" enabled for scope "{{scope}}"': + 'Erweiterung "{{name}}" für Bereich "{{scope}}" aktiviert', + 'Do you want to continue? [Y/n]: ': 'Möchten Sie fortfahren? [Y/n]: ', + 'Do you want to continue?': 'Möchten Sie fortfahren?', + 'Installing extension "{{name}}".': + 'Erweiterung "{{name}}" wird installiert.', + '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**': + '**Erweiterungen können unerwartetes Verhalten verursachen. Stellen Sie sicher, dass Sie die Erweiterungsquelle untersucht haben und dem Autor vertrauen.**', + 'This extension will run the following MCP servers:': + 'Diese Erweiterung wird folgende MCP-Server ausführen:', + local: 'lokal', + remote: 'remote', + 'This extension will add the following commands: {{commands}}.': + 'Diese Erweiterung wird folgende Befehle hinzufügen: {{commands}}.', + 'This extension will append info to your QWEN.md context using {{fileName}}': + 'Diese Erweiterung wird Informationen zu Ihrem QWEN.md-Kontext mit {{fileName}} hinzufügen', + 'This extension will exclude the following core tools: {{tools}}': + 'Diese Erweiterung wird folgende Kernwerkzeuge ausschließen: {{tools}}', + 'This extension will install the following skills:': + 'Diese Erweiterung wird folgende Fähigkeiten installieren:', + 'This extension will install the following subagents:': + 'Diese Erweiterung wird folgende Unteragenten installieren:', + 'Installation cancelled for "{{name}}".': + 'Installation von "{{name}}" abgebrochen.', + '--ref and --auto-update are not applicable for marketplace extensions.': + '--ref und --auto-update sind nicht anwendbar für Marketplace-Erweiterungen.', + 'Extension "{{name}}" installed successfully and enabled.': + 'Erweiterung "{{name}}" erfolgreich installiert und aktiviert.', + 'Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).': + 'Installiert eine Erweiterung von einer Git-Repository-URL, einem lokalen Pfad oder dem Claude-Marketplace (marketplace-url:plugin-name).', + 'The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.': + 'Die GitHub-URL, der lokale Pfad oder die Marketplace-Quelle (marketplace-url:plugin-name) der zu installierenden Erweiterung.', + 'The git ref to install from.': 'Die Git-Referenz für die Installation.', + 'Enable auto-update for this extension.': + 'Automatisches Update für diese Erweiterung aktivieren.', + 'Enable pre-release versions for this extension.': + 'Pre-Release-Versionen für diese Erweiterung aktivieren.', + 'Acknowledge the security risks of installing an extension and skip the confirmation prompt.': + 'Sicherheitsrisiken der Erweiterungsinstallation bestätigen und Bestätigungsaufforderung überspringen.', + 'The source argument must be provided.': + 'Das Quellargument muss angegeben werden.', + 'Extension "{{name}}" successfully uninstalled.': + 'Erweiterung "{{name}}" erfolgreich deinstalliert.', + 'Uninstalls an extension.': 'Deinstalliert eine Erweiterung.', + 'The name or source path of the extension to uninstall.': + 'Der Name oder Quellpfad der zu deinstallierenden Erweiterung.', + 'Please include the name of the extension to uninstall as a positional argument.': + 'Bitte geben Sie den Namen der zu deinstallierenden Erweiterung als Positionsargument an.', + 'Enables an extension.': 'Aktiviert eine Erweiterung.', + 'The name of the extension to enable.': + 'Der Name der zu aktivierenden Erweiterung.', + 'The scope to enable the extenison in. If not set, will be enabled in all scopes.': + 'Der Bereich, in dem die Erweiterung aktiviert werden soll. Wenn nicht gesetzt, wird sie in allen Bereichen aktiviert.', + 'Extension "{{name}}" successfully enabled for scope "{{scope}}".': + 'Erweiterung "{{name}}" erfolgreich für Bereich "{{scope}}" aktiviert.', + 'Extension "{{name}}" successfully enabled in all scopes.': + 'Erweiterung "{{name}}" erfolgreich in allen Bereichen aktiviert.', + 'Invalid scope: {{scope}}. Please use one of {{scopes}}.': + 'Ungültiger Bereich: {{scope}}. Bitte verwenden Sie einen von {{scopes}}.', + 'Disables an extension.': 'Deaktiviert eine Erweiterung.', + 'The name of the extension to disable.': + 'Der Name der zu deaktivierenden Erweiterung.', + 'The scope to disable the extenison in.': + 'Der Bereich, in dem die Erweiterung deaktiviert werden soll.', + 'Extension "{{name}}" successfully disabled for scope "{{scope}}".': + 'Erweiterung "{{name}}" erfolgreich für Bereich "{{scope}}" deaktiviert.', + 'Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.': + 'Erweiterung "{{name}}" erfolgreich aktualisiert: {{oldVersion}} → {{newVersion}}.', + 'Unable to install extension "{{name}}" due to missing install metadata': + 'Erweiterung "{{name}}" kann aufgrund fehlender Installationsmetadaten nicht installiert werden', + 'Extension "{{name}}" is already up to date.': + 'Erweiterung "{{name}}" ist bereits aktuell.', + 'Updates all extensions or a named extension to the latest version.': + 'Aktualisiert alle Erweiterungen oder eine benannte Erweiterung auf die neueste Version.', + 'The name of the extension to update.': + 'Der Name der zu aktualisierenden Erweiterung.', + 'Update all extensions.': 'Alle Erweiterungen aktualisieren.', + 'Either an extension name or --all must be provided': + 'Entweder ein Erweiterungsname oder --all muss angegeben werden', + 'Lists installed extensions.': 'Listet installierte Erweiterungen auf.', + 'Link extension failed to install.': + 'Verknüpfte Erweiterung konnte nicht installiert werden.', + 'Extension "{{name}}" linked successfully and enabled.': + 'Erweiterung "{{name}}" erfolgreich verknüpft und aktiviert.', + 'Links an extension from a local path. Updates made to the local path will always be reflected.': + 'Verknüpft eine Erweiterung von einem lokalen Pfad. Änderungen am lokalen Pfad werden immer widergespiegelt.', + 'The name of the extension to link.': + 'Der Name der zu verknüpfenden Erweiterung.', + 'Set a specific setting for an extension.': + 'Legt eine bestimmte Einstellung für eine Erweiterung fest.', + 'Name of the extension to configure.': + 'Name der zu konfigurierenden Erweiterung.', + 'The setting to configure (name or env var).': + 'Die zu konfigurierende Einstellung (Name oder Umgebungsvariable).', + 'The scope to set the setting in.': + 'Der Bereich, in dem die Einstellung gesetzt werden soll.', + 'List all settings for an extension.': + 'Listet alle Einstellungen einer Erweiterung auf.', + 'Name of the extension.': 'Name der Erweiterung.', + 'Extension "{{name}}" has no settings to configure.': + 'Erweiterung "{{name}}" hat keine zu konfigurierenden Einstellungen.', + 'Settings for "{{name}}":': 'Einstellungen für "{{name}}":', + '(workspace)': '(Arbeitsbereich)', + '(user)': '(Benutzer)', + '[not set]': '[nicht gesetzt]', + '[value stored in keychain]': '[Wert in Schlüsselbund gespeichert]', + 'Manage extension settings.': 'Erweiterungseinstellungen verwalten.', + 'You need to specify a command (set or list).': + 'Sie müssen einen Befehl angeben (set oder list).', 'manage IDE integration': 'IDE-Integration verwalten', 'check status of IDE integration': 'Status der IDE-Integration prüfen', 'install required IDE companion for {{ideName}}': @@ -419,6 +571,8 @@ export default { 'Example: /language output English': 'Beispiel: /language output English', 'Example: /language output 日本語': 'Beispiel: /language output Japanisch', 'UI language changed to {{lang}}': 'UI-Sprache geändert zu {{lang}}', + 'LLM output language set to {{lang}}': + 'LLM-Ausgabesprache auf {{lang}} gesetzt', 'LLM output language rule file generated at {{path}}': 'LLM-Ausgabesprach-Regeldatei generiert unter {{path}}', 'Please restart the application for the changes to take effect.': @@ -441,7 +595,7 @@ export default { // ============================================================================ // Commands - Approval Mode // ============================================================================ - 'Approval Mode': 'Genehmigungsmodus', + 'Tool Approval Mode': 'Werkzeug-Genehmigungsmodus', 'Current approval mode: {{mode}}': 'Aktueller Genehmigungsmodus: {{mode}}', 'Available approval modes:': 'Verfügbare Genehmigungsmodi:', 'Approval mode changed to: {{mode}}': @@ -483,8 +637,6 @@ export default { 'Automatically approve all tools': 'Alle Werkzeuge automatisch genehmigen', 'Workspace approval mode exists and takes priority. User-level change will have no effect.': 'Arbeitsbereich-Genehmigungsmodus existiert und hat Vorrang. Benutzerebene-Änderung hat keine Wirkung.', - '(Use Enter to select, Tab to change focus)': - '(Enter zum Auswählen, Tab zum Fokuswechsel)', 'Apply To': 'Anwenden auf', 'User Settings': 'Benutzereinstellungen', 'Workspace Settings': 'Arbeitsbereich-Einstellungen', @@ -992,6 +1144,19 @@ export default { 'Session start time is unavailable, cannot calculate stats.': 'Sitzungsstartzeit nicht verfügbar, Statistiken können nicht berechnet werden.', + // ============================================================================ + // Command Format Migration + // ============================================================================ + 'Command Format Migration': 'Befehlsformat-Migration', + 'Found {{count}} TOML command file:': '{{count}} TOML-Befehlsdatei gefunden:', + 'Found {{count}} TOML command files:': + '{{count}} TOML-Befehlsdateien gefunden:', + '... and {{count}} more': '... und {{count}} weitere', + 'The TOML format is deprecated. Would you like to migrate them to Markdown format?': + 'Das TOML-Format ist veraltet. Möchten Sie sie ins Markdown-Format migrieren?', + '(Backups will be created and original files will be preserved)': + '(Backups werden erstellt und Originaldateien werden beibehalten)', + // ============================================================================ // Loading Phrases // ============================================================================ @@ -1130,4 +1295,54 @@ export default { 'Haben Sie versucht, es aus- und wieder einzuschalten? (Den Ladebildschirm, nicht mich.)', 'Zusätzliche Pylonen werden gebaut...', ], + + // ============================================================================ + // Extension Settings Input + // ============================================================================ + 'Enter value...': 'Wert eingeben...', + 'Enter sensitive value...': 'Sensiblen Wert eingeben...', + 'Press Enter to submit, Escape to cancel': + 'Enter zum Absenden, Escape zum Abbrechen drücken', + + // ============================================================================ + // Command Migration Tool + // ============================================================================ + 'Markdown file already exists: {{filename}}': + 'Markdown-Datei existiert bereits: {{filename}}', + 'TOML Command Format Deprecation Notice': + 'TOML-Befehlsformat Veraltet-Hinweis', + 'Found {{count}} command file(s) in TOML format:': + '{{count}} Befehlsdatei(en) im TOML-Format gefunden:', + 'The TOML format for commands is being deprecated in favor of Markdown format.': + 'Das TOML-Format für Befehle wird zugunsten des Markdown-Formats eingestellt.', + 'Markdown format is more readable and easier to edit.': + 'Das Markdown-Format ist lesbarer und einfacher zu bearbeiten.', + 'You can migrate these files automatically using:': + 'Sie können diese Dateien automatisch migrieren mit:', + 'Or manually convert each file:': 'Oder jede Datei manuell konvertieren:', + 'TOML: prompt = "..." / description = "..."': + 'TOML: prompt = "..." / description = "..."', + 'Markdown: YAML frontmatter + content': 'Markdown: YAML-Frontmatter + Inhalt', + 'The migration tool will:': 'Das Migrationstool wird:', + 'Convert TOML files to Markdown': 'TOML-Dateien in Markdown konvertieren', + 'Create backups of original files': + 'Sicherungen der Originaldateien erstellen', + 'Preserve all command functionality': 'Alle Befehlsfunktionen beibehalten', + 'TOML format will continue to work for now, but migration is recommended.': + 'Das TOML-Format funktioniert vorerst weiter, aber eine Migration wird empfohlen.', + + // ============================================================================ + // Extensions - Explore Command + // ============================================================================ + 'Open extensions page in your browser': 'Erweiterungsseite im Browser öffnen', + 'Unknown extensions source: {{source}}.': + 'Unbekannte Erweiterungsquelle: {{source}}.', + 'Would open extensions page in your browser: {{url}} (skipped in test environment)': + 'Würde Erweiterungsseite im Browser öffnen: {{url}} (übersprungen in Testumgebung)', + 'View available extensions at {{url}}': + 'Verfügbare Erweiterungen ansehen unter {{url}}', + 'Opening extensions page in your browser: {{url}}': + 'Erweiterungsseite wird im Browser geöffnet: {{url}}', + 'Failed to open browser. Check out the extensions gallery at {{url}}': + 'Browser konnte nicht geöffnet werden. Besuchen Sie die Erweiterungsgalerie unter {{url}}', }; diff --git a/packages/cli/src/i18n/locales/en.js b/packages/cli/src/i18n/locales/en.js index e3287731d..929ffc904 100644 --- a/packages/cli/src/i18n/locales/en.js +++ b/packages/cli/src/i18n/locales/en.js @@ -33,6 +33,25 @@ export default { 'Model Context Protocol command (from external servers)': 'Model Context Protocol command (from external servers)', 'Keyboard Shortcuts:': 'Keyboard Shortcuts:', + 'Toggle this help display': 'Toggle this help display', + 'Toggle shell mode': 'Toggle shell mode', + 'Open command menu': 'Open command menu', + 'Add file context': 'Add file context', + 'Accept suggestion / Autocomplete': 'Accept suggestion / Autocomplete', + 'Reverse search history': 'Reverse search history', + 'Press ? again to close': 'Press ? again to close', + // Keyboard shortcuts panel descriptions + 'for shell mode': 'for shell mode', + 'for commands': 'for commands', + 'for file paths': 'for file paths', + 'to clear input': 'to clear input', + 'to cycle approvals': 'to cycle approvals', + 'to quit': 'to quit', + 'for newline': 'for newline', + 'to clear screen': 'to clear screen', + 'to search history': 'to search history', + 'to paste images': 'to paste images', + 'for external editor': 'for external editor', 'Jump through words in the input': 'Jump through words in the input', 'Close dialogs, cancel requests, or quit application': 'Close dialogs, cancel requests, or quit application', @@ -46,6 +65,7 @@ export default { 'Connecting to MCP servers... ({{connected}}/{{total}})': 'Connecting to MCP servers... ({{connected}}/{{total}})', 'Type your message or @path/to/file': 'Type your message or @path/to/file', + '? for shortcuts': '? for shortcuts', "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.": "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.", 'Cancel operation / Clear input (double press)': @@ -59,10 +79,15 @@ export default { 'show version info': 'show version info', 'submit a bug report': 'submit a bug report', 'About Qwen Code': 'About Qwen Code', + Status: 'Status', // ============================================================================ // System Information Fields // ============================================================================ + 'Qwen Code': 'Qwen Code', + Runtime: 'Runtime', + OS: 'OS', + Auth: 'Auth', 'CLI Version': 'CLI Version', 'Git Commit': 'Git Commit', Model: 'Model', @@ -75,6 +100,7 @@ export default { 'Session ID': 'Session ID', 'Auth Method': 'Auth Method', 'Base URL': 'Base URL', + Proxy: 'Proxy', 'Memory Usage': 'Memory Usage', 'IDE Client': 'IDE Client', @@ -98,8 +124,8 @@ export default { Preview: 'Preview', '(Use Enter to select, Tab to configure scope)': '(Use Enter to select, Tab to configure scope)', - '(Use Enter to apply scope, Tab to select theme)': - '(Use Enter to apply scope, Tab to select theme)', + '(Use Enter to apply scope, Tab to go back)': + '(Use Enter to apply scope, Tab to go back)', 'Theme configuration unavailable due to NO_COLOR env variable.': 'Theme configuration unavailable due to NO_COLOR env variable.', 'Theme "{{themeName}}" not found.': 'Theme "{{themeName}}" not found.', @@ -152,6 +178,7 @@ export default { 'Project Level ({{path}})': 'Project Level ({{path}})', 'User Level ({{path}})': 'User Level ({{path}})', 'Built-in Agents': 'Built-in Agents', + 'Extension Agents': 'Extension Agents', 'Using: {{count}} agents': 'Using: {{count}} agents', 'View Agent': 'View Agent', 'Edit Agent': 'Edit Agent', @@ -257,8 +284,6 @@ export default { // ============================================================================ 'View and edit Qwen Code settings': 'View and edit Qwen Code settings', Settings: 'Settings', - '(Use Enter to select{{tabText}})': '(Use Enter to select{{tabText}})', - ', Tab to change focus': ', Tab to change focus', 'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.': 'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.', 'The command "/{{command}}" is not supported in non-interactive mode.': @@ -268,24 +293,24 @@ export default { // ============================================================================ 'Vim Mode': 'Vim Mode', 'Disable Auto Update': 'Disable Auto Update', + 'Attribution: commit': 'Attribution: commit', + 'Terminal Bell Notification': 'Terminal Bell Notification', + 'Enable Usage Statistics': 'Enable Usage Statistics', + Theme: 'Theme', + 'Preferred Editor': 'Preferred Editor', + 'Auto-connect to IDE': 'Auto-connect to IDE', 'Enable Prompt Completion': 'Enable Prompt Completion', 'Debug Keystroke Logging': 'Debug Keystroke Logging', - Language: 'Language', + 'Language: UI': 'Language: UI', + 'Language: Model': 'Language: Model', 'Output Format': 'Output Format', 'Hide Window Title': 'Hide Window Title', 'Show Status in Title': 'Show Status in Title', 'Hide Tips': 'Hide Tips', - 'Hide Banner': 'Hide Banner', - 'Hide Context Summary': 'Hide Context Summary', - 'Hide CWD': 'Hide CWD', - 'Hide Sandbox Status': 'Hide Sandbox Status', - 'Hide Model Info': 'Hide Model Info', - 'Hide Footer': 'Hide Footer', - 'Show Memory Usage': 'Show Memory Usage', - 'Show Line Numbers': 'Show Line Numbers', + 'Show Line Numbers in Code': 'Show Line Numbers in Code', 'Show Citations': 'Show Citations', 'Custom Witty Phrases': 'Custom Witty Phrases', - 'Enable Welcome Back': 'Enable Welcome Back', + 'Show Welcome Back Dialog': 'Show Welcome Back Dialog', 'Enable User Feedback': 'Enable User Feedback', 'How is Qwen doing this session? (optional)': 'How is Qwen doing this session? (optional)', @@ -312,7 +337,7 @@ export default { 'Respect .qwenignore': 'Respect .qwenignore', 'Enable Recursive File Search': 'Enable Recursive File Search', 'Disable Fuzzy Search': 'Disable Fuzzy Search', - 'Enable Interactive Shell': 'Enable Interactive Shell', + 'Interactive Shell (PTY)': 'Interactive Shell (PTY)', 'Show Color': 'Show Color', 'Auto Accept': 'Auto Accept', 'Use Ripgrep': 'Use Ripgrep', @@ -323,6 +348,7 @@ export default { 'Folder Trust': 'Folder Trust', 'Vision Model Preview': 'Vision Model Preview', 'Tool Schema Compliance': 'Tool Schema Compliance', + 'Experimental: Skills': 'Experimental: Skills', // Settings enum options 'Auto (detect from system)': 'Auto (detect from system)', Text: 'Text', @@ -347,10 +373,148 @@ export default { 'Show all directories in the workspace': 'Show all directories in the workspace', 'set external editor preference': 'set external editor preference', + 'Select Editor': 'Select Editor', + 'Editor Preference': 'Editor Preference', + 'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.': + 'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.', + 'Your preferred editor is:': 'Your preferred editor is:', 'Manage extensions': 'Manage extensions', 'List active extensions': 'List active extensions', 'Update extensions. Usage: update |--all': 'Update extensions. Usage: update |--all', + 'Disable an extension': 'Disable an extension', + 'Enable an extension': 'Enable an extension', + 'Install an extension from a git repo or local path': + 'Install an extension from a git repo or local path', + 'Uninstall an extension': 'Uninstall an extension', + 'No extensions installed.': 'No extensions installed.', + 'Usage: /extensions update |--all': + 'Usage: /extensions update |--all', + 'Extension "{{name}}" not found.': 'Extension "{{name}}" not found.', + 'No extensions to update.': 'No extensions to update.', + 'Usage: /extensions install ': 'Usage: /extensions install ', + 'Installing extension from "{{source}}"...': + 'Installing extension from "{{source}}"...', + 'Extension "{{name}}" installed successfully.': + 'Extension "{{name}}" installed successfully.', + 'Failed to install extension from "{{source}}": {{error}}': + 'Failed to install extension from "{{source}}": {{error}}', + 'Usage: /extensions uninstall ': + 'Usage: /extensions uninstall ', + 'Uninstalling extension "{{name}}"...': + 'Uninstalling extension "{{name}}"...', + 'Extension "{{name}}" uninstalled successfully.': + 'Extension "{{name}}" uninstalled successfully.', + 'Failed to uninstall extension "{{name}}": {{error}}': + 'Failed to uninstall extension "{{name}}": {{error}}', + 'Usage: /extensions {{command}} [--scope=]': + 'Usage: /extensions {{command}} [--scope=]', + 'Unsupported scope "{{scope}}", should be one of "user" or "workspace"': + 'Unsupported scope "{{scope}}", should be one of "user" or "workspace"', + 'Extension "{{name}}" disabled for scope "{{scope}}"': + 'Extension "{{name}}" disabled for scope "{{scope}}"', + 'Extension "{{name}}" enabled for scope "{{scope}}"': + 'Extension "{{name}}" enabled for scope "{{scope}}"', + 'Do you want to continue? [Y/n]: ': 'Do you want to continue? [Y/n]: ', + 'Do you want to continue?': 'Do you want to continue?', + 'Installing extension "{{name}}".': 'Installing extension "{{name}}".', + '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**': + '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**', + 'This extension will run the following MCP servers:': + 'This extension will run the following MCP servers:', + local: 'local', + remote: 'remote', + 'This extension will add the following commands: {{commands}}.': + 'This extension will add the following commands: {{commands}}.', + 'This extension will append info to your QWEN.md context using {{fileName}}': + 'This extension will append info to your QWEN.md context using {{fileName}}', + 'This extension will exclude the following core tools: {{tools}}': + 'This extension will exclude the following core tools: {{tools}}', + 'This extension will install the following skills:': + 'This extension will install the following skills:', + 'This extension will install the following subagents:': + 'This extension will install the following subagents:', + 'Installation cancelled for "{{name}}".': + 'Installation cancelled for "{{name}}".', + '--ref and --auto-update are not applicable for marketplace extensions.': + '--ref and --auto-update are not applicable for marketplace extensions.', + 'Extension "{{name}}" installed successfully and enabled.': + 'Extension "{{name}}" installed successfully and enabled.', + 'Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).': + 'Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).', + 'The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.': + 'The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.', + 'The git ref to install from.': 'The git ref to install from.', + 'Enable auto-update for this extension.': + 'Enable auto-update for this extension.', + 'Enable pre-release versions for this extension.': + 'Enable pre-release versions for this extension.', + 'Acknowledge the security risks of installing an extension and skip the confirmation prompt.': + 'Acknowledge the security risks of installing an extension and skip the confirmation prompt.', + 'The source argument must be provided.': + 'The source argument must be provided.', + 'Extension "{{name}}" successfully uninstalled.': + 'Extension "{{name}}" successfully uninstalled.', + 'Uninstalls an extension.': 'Uninstalls an extension.', + 'The name or source path of the extension to uninstall.': + 'The name or source path of the extension to uninstall.', + 'Please include the name of the extension to uninstall as a positional argument.': + 'Please include the name of the extension to uninstall as a positional argument.', + 'Enables an extension.': 'Enables an extension.', + 'The name of the extension to enable.': + 'The name of the extension to enable.', + 'The scope to enable the extenison in. If not set, will be enabled in all scopes.': + 'The scope to enable the extenison in. If not set, will be enabled in all scopes.', + 'Extension "{{name}}" successfully enabled for scope "{{scope}}".': + 'Extension "{{name}}" successfully enabled for scope "{{scope}}".', + 'Extension "{{name}}" successfully enabled in all scopes.': + 'Extension "{{name}}" successfully enabled in all scopes.', + 'Invalid scope: {{scope}}. Please use one of {{scopes}}.': + 'Invalid scope: {{scope}}. Please use one of {{scopes}}.', + 'Disables an extension.': 'Disables an extension.', + 'The name of the extension to disable.': + 'The name of the extension to disable.', + 'The scope to disable the extenison in.': + 'The scope to disable the extenison in.', + 'Extension "{{name}}" successfully disabled for scope "{{scope}}".': + 'Extension "{{name}}" successfully disabled for scope "{{scope}}".', + 'Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.': + 'Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.', + 'Unable to install extension "{{name}}" due to missing install metadata': + 'Unable to install extension "{{name}}" due to missing install metadata', + 'Extension "{{name}}" is already up to date.': + 'Extension "{{name}}" is already up to date.', + 'Updates all extensions or a named extension to the latest version.': + 'Updates all extensions or a named extension to the latest version.', + 'Update all extensions.': 'Update all extensions.', + 'Either an extension name or --all must be provided': + 'Either an extension name or --all must be provided', + 'Lists installed extensions.': 'Lists installed extensions.', + 'Link extension failed to install.': 'Link extension failed to install.', + 'Extension "{{name}}" linked successfully and enabled.': + 'Extension "{{name}}" linked successfully and enabled.', + 'Links an extension from a local path. Updates made to the local path will always be reflected.': + 'Links an extension from a local path. Updates made to the local path will always be reflected.', + 'The name of the extension to link.': 'The name of the extension to link.', + 'Set a specific setting for an extension.': + 'Set a specific setting for an extension.', + 'Name of the extension to configure.': 'Name of the extension to configure.', + 'The setting to configure (name or env var).': + 'The setting to configure (name or env var).', + 'The scope to set the setting in.': 'The scope to set the setting in.', + 'List all settings for an extension.': 'List all settings for an extension.', + 'Name of the extension.': 'Name of the extension.', + 'Extension "{{name}}" has no settings to configure.': + 'Extension "{{name}}" has no settings to configure.', + 'Settings for "{{name}}":': 'Settings for "{{name}}":', + '(workspace)': '(workspace)', + '(user)': '(user)', + '[not set]': '[not set]', + '[value stored in keychain]': '[value stored in keychain]', + 'Value:': 'Value:', + 'Manage extension settings.': 'Manage extension settings.', + 'You need to specify a command (set or list).': + 'You need to specify a command (set or list).', 'manage IDE integration': 'manage IDE integration', 'check status of IDE integration': 'check status of IDE integration', 'install required IDE companion for {{ideName}}': @@ -413,6 +577,7 @@ export default { 'Example: /language output English': 'Example: /language output English', 'Example: /language output 日本語': 'Example: /language output 日本語', '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}}': 'LLM output language rule file generated at {{path}}', 'Please restart the application for the changes to take effect.': @@ -434,7 +599,7 @@ export default { // ============================================================================ // Commands - Approval Mode // ============================================================================ - 'Approval Mode': 'Approval Mode', + 'Tool Approval Mode': 'Tool Approval Mode', 'Current approval mode: {{mode}}': 'Current approval mode: {{mode}}', 'Available approval modes:': 'Available approval modes:', 'Approval mode changed to: {{mode}}': 'Approval mode changed to: {{mode}}', @@ -473,8 +638,6 @@ export default { 'Automatically approve all tools': 'Automatically approve all tools', 'Workspace approval mode exists and takes priority. User-level change will have no effect.': 'Workspace approval mode exists and takes priority. User-level change will have no effect.', - '(Use Enter to select, Tab to change focus)': - '(Use Enter to select, Tab to change focus)', 'Apply To': 'Apply To', 'User Settings': 'User Settings', 'Workspace Settings': 'Workspace Settings', @@ -898,14 +1061,23 @@ export default { // ============================================================================ // Startup Tips // ============================================================================ - 'Tips for getting started:': 'Tips for getting started:', - '1. Ask questions, edit files, or run commands.': - '1. Ask questions, edit files, or run commands.', - '2. Be specific for the best results.': - '2. Be specific for the best results.', - 'files to customize your interactions with Qwen Code.': - 'files to customize your interactions with Qwen Code.', - 'for more information.': 'for more information.', + 'Tips:': 'Tips:', + 'Use /compress when the conversation gets long to summarize history and free up context.': + 'Use /compress when the conversation gets long to summarize history and free up context.', + 'Start a fresh idea with /clear or /new; the previous session stays available in history.': + 'Start a fresh idea with /clear or /new; the previous session stays available in history.', + 'Use /bug to submit issues to the maintainers when something goes off.': + 'Use /bug to submit issues to the maintainers when something goes off.', + 'Switch auth type quickly with /auth.': + 'Switch auth type quickly with /auth.', + 'You can run any shell commands from Qwen Code using ! (e.g. !ls).': + 'You can run any shell commands from Qwen Code using ! (e.g. !ls).', + 'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.': + 'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.', + 'You can resume a previous conversation by running qwen --continue or qwen --resume.': + 'You can resume a previous conversation by running qwen --continue or qwen --resume.', + 'You can switch permission mode quickly with Shift+Tab or /approval-mode.': + 'You can switch permission mode quickly with Shift+Tab or /approval-mode.', // ============================================================================ // Exit Screen / Stats @@ -965,6 +1137,18 @@ export default { 'Session start time is unavailable, cannot calculate stats.': 'Session start time is unavailable, cannot calculate stats.', + // ============================================================================ + // Command Format Migration + // ============================================================================ + 'Command Format Migration': 'Command Format Migration', + 'Found {{count}} TOML command file:': 'Found {{count}} TOML command file:', + 'Found {{count}} TOML command files:': 'Found {{count}} TOML command files:', + '... and {{count}} more': '... and {{count}} more', + 'The TOML format is deprecated. Would you like to migrate them to Markdown format?': + 'The TOML format is deprecated. Would you like to migrate them to Markdown format?', + '(Backups will be created and original files will be preserved)': + '(Backups will be created and original files will be preserved)', + // ============================================================================ // Loading Phrases // ============================================================================ @@ -1103,4 +1287,55 @@ export default { 'Have you tried turning it off and on again? (The loading screen, not me.)', 'Constructing additional pylons...', ], + + // ============================================================================ + // Extension Settings Input + // ============================================================================ + 'Enter value...': 'Enter value...', + 'Enter sensitive value...': 'Enter sensitive value...', + 'Press Enter to submit, Escape to cancel': + 'Press Enter to submit, Escape to cancel', + + // ============================================================================ + // Command Migration Tool + // ============================================================================ + 'Markdown file already exists: {{filename}}': + 'Markdown file already exists: {{filename}}', + 'TOML Command Format Deprecation Notice': + 'TOML Command Format Deprecation Notice', + 'Found {{count}} command file(s) in TOML format:': + 'Found {{count}} command file(s) in TOML format:', + 'The TOML format for commands is being deprecated in favor of Markdown format.': + 'The TOML format for commands is being deprecated in favor of Markdown format.', + 'Markdown format is more readable and easier to edit.': + 'Markdown format is more readable and easier to edit.', + 'You can migrate these files automatically using:': + 'You can migrate these files automatically using:', + 'Or manually convert each file:': 'Or manually convert each file:', + 'TOML: prompt = "..." / description = "..."': + 'TOML: prompt = "..." / description = "..."', + 'Markdown: YAML frontmatter + content': + 'Markdown: YAML frontmatter + content', + 'The migration tool will:': 'The migration tool will:', + 'Convert TOML files to Markdown': 'Convert TOML files to Markdown', + 'Create backups of original files': 'Create backups of original files', + 'Preserve all command functionality': 'Preserve all command functionality', + 'TOML format will continue to work for now, but migration is recommended.': + 'TOML format will continue to work for now, but migration is recommended.', + + // ============================================================================ + // Extensions - Explore Command + // ============================================================================ + 'Open extensions page in your browser': + 'Open extensions page in your browser', + 'Unknown extensions source: {{source}}.': + 'Unknown extensions source: {{source}}.', + 'Would open extensions page in your browser: {{url}} (skipped in test environment)': + 'Would open extensions page in your browser: {{url}} (skipped in test environment)', + 'View available extensions at {{url}}': + 'View available extensions at {{url}}', + 'Opening extensions page in your browser: {{url}}': + 'Opening extensions page in your browser: {{url}}', + 'Failed to open browser. Check out the extensions gallery at {{url}}': + 'Failed to open browser. Check out the extensions gallery at {{url}}', }; diff --git a/packages/cli/src/i18n/locales/ru.js b/packages/cli/src/i18n/locales/ru.js index a91cd0d44..c5108ec5d 100644 --- a/packages/cli/src/i18n/locales/ru.js +++ b/packages/cli/src/i18n/locales/ru.js @@ -33,6 +33,13 @@ export default { 'Model Context Protocol command (from external servers)': 'Команда Model Context Protocol (из внешних серверов)', 'Keyboard Shortcuts:': 'Горячие клавиши:', + 'Toggle this help display': 'Показать/скрыть эту справку', + 'Toggle shell mode': 'Переключить режим оболочки', + 'Open command menu': 'Открыть меню команд', + 'Add file context': 'Добавить файл в контекст', + 'Accept suggestion / Autocomplete': 'Принять подсказку / Автодополнение', + 'Reverse search history': 'Обратный поиск по истории', + 'Press ? again to close': 'Нажмите ? ещё раз, чтобы закрыть', 'Jump through words in the input': 'Переход по словам во вводе', 'Close dialogs, cancel requests, or quit application': 'Закрыть диалоги, отменить запросы или выйти из приложения', @@ -46,6 +53,7 @@ export default { 'Connecting to MCP servers... ({{connected}}/{{total}})': 'Подключение к MCP-серверам... ({{connected}}/{{total}})', 'Type your message or @path/to/file': 'Введите сообщение или @путь/к/файлу', + '? for shortcuts': '? — горячие клавиши', "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.": "Нажмите 'i' для режима ВСТАВКА и 'Esc' для ОБЫЧНОГО режима.", 'Cancel operation / Clear input (double press)': @@ -59,10 +67,28 @@ export default { 'show version info': 'Просмотр информации о версии', 'submit a bug report': 'Отправка отчёта об ошибке', 'About Qwen Code': 'Об Qwen Code', + Status: 'Статус', + + // Keyboard shortcuts panel descriptions + 'for shell mode': 'режим оболочки', + 'for commands': 'меню команд', + 'for file paths': 'пути к файлам', + 'to clear input': 'очистить ввод', + 'to cycle approvals': 'переключить режим', + 'to quit': 'выход', + 'for newline': 'новая строка', + 'to clear screen': 'очистить экран', + 'to search history': 'поиск в истории', + 'to paste images': 'вставить изображения', + 'for external editor': 'внешний редактор', // ============================================================================ // Поля системной информации // ============================================================================ + 'Qwen Code': 'Qwen Code', + Runtime: 'Среда выполнения', + OS: 'ОС', + Auth: 'Аутентификация', 'CLI Version': 'Версия CLI', 'Git Commit': 'Git-коммит', Model: 'Модель', @@ -75,6 +101,7 @@ export default { 'Session ID': 'ID сессии', 'Auth Method': 'Метод авторизации', 'Base URL': 'Базовый URL', + Proxy: 'Прокси', 'Memory Usage': 'Использование памяти', 'IDE Client': 'Клиент IDE', @@ -100,8 +127,8 @@ export default { Preview: 'Предпросмотр', '(Use Enter to select, Tab to configure scope)': '(Enter для выбора, Tab для настройки области)', - '(Use Enter to apply scope, Tab to select theme)': - '(Enter для применения области, Tab для выбора темы)', + '(Use Enter to apply scope, Tab to go back)': + '(Enter для применения области, Tab для возврата)', 'Theme configuration unavailable due to NO_COLOR env variable.': 'Настройка темы недоступна из-за переменной окружения NO_COLOR.', 'Theme "{{themeName}}" not found.': 'Тема "{{themeName}}" не найдена.', @@ -155,6 +182,7 @@ export default { 'Project Level ({{path}})': 'Уровень проекта ({{path}})', 'User Level ({{path}})': 'Уровень пользователя ({{path}})', 'Built-in Agents': 'Встроенные агенты', + 'Extension Agents': 'Агенты расширений', 'Using: {{count}} agents': 'Используется: {{count}} агент(ов)', 'View Agent': 'Просмотреть агента', 'Edit Agent': 'Редактировать агента', @@ -260,8 +288,6 @@ export default { // ============================================================================ 'View and edit Qwen Code settings': 'Просмотр и изменение настроек Qwen Code', Settings: 'Настройки', - '(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.': @@ -271,24 +297,24 @@ export default { // ============================================================================ 'Vim Mode': 'Режим Vim', 'Disable Auto Update': 'Отключить автообновление', + 'Attribution: commit': 'Атрибуция: коммит', + 'Terminal Bell Notification': 'Звуковое уведомление терминала', + 'Enable Usage Statistics': 'Включить сбор статистики использования', + Theme: 'Тема', + 'Preferred Editor': 'Предпочтительный редактор', + 'Auto-connect to IDE': 'Автоподключение к IDE', 'Enable Prompt Completion': 'Включить автодополнение промптов', 'Debug Keystroke Logging': 'Логирование нажатий клавиш для отладки', - Language: 'Язык', + 'Language: UI': 'Язык: интерфейс', + 'Language: Model': 'Язык: модель', 'Output Format': 'Формат вывода', 'Hide Window Title': 'Скрыть заголовок окна', 'Show Status in Title': 'Показывать статус в заголовке', 'Hide Tips': 'Скрыть подсказки', - 'Hide Banner': 'Скрыть баннер', - 'Hide Context Summary': 'Скрыть сводку контекста', - 'Hide CWD': 'Скрыть текущую директорию', - 'Hide Sandbox Status': 'Скрыть статус песочницы', - 'Hide Model Info': 'Скрыть информацию о модели', - 'Hide Footer': 'Скрыть нижний колонтитул', - 'Show Memory Usage': 'Показывать использование памяти', - 'Show Line Numbers': 'Показывать номера строк', + 'Show Line Numbers in Code': 'Показывать номера строк в коде', 'Show Citations': 'Показывать цитаты', 'Custom Witty Phrases': 'Пользовательские остроумные фразы', - 'Enable Welcome Back': 'Включить приветствие при возврате', + 'Show Welcome Back Dialog': 'Показывать диалог приветствия', 'Enable User Feedback': 'Включить отзывы пользователей', 'How is Qwen doing this session? (optional)': 'Как дела у Qwen в этой сессии? (необязательно)', @@ -315,7 +341,7 @@ export default { 'Respect .qwenignore': 'Учитывать .qwenignore', 'Enable Recursive File Search': 'Включить рекурсивный поиск файлов', 'Disable Fuzzy Search': 'Отключить нечеткий поиск', - 'Enable Interactive Shell': 'Включить интерактивный терминал', + 'Interactive Shell (PTY)': 'Интерактивный терминал (PTY)', 'Show Color': 'Показывать цвета', 'Auto Accept': 'Автоподтверждение', 'Use Ripgrep': 'Использовать Ripgrep', @@ -326,6 +352,7 @@ export default { 'Folder Trust': 'Доверие к папке', 'Vision Model Preview': 'Визуальная модель (предпросмотр)', 'Tool Schema Compliance': 'Соответствие схеме инструмента', + 'Experimental: Skills': 'Экспериментальное: Навыки', // Варианты перечислений настроек 'Auto (detect from system)': 'Авто (определить из системы)', Text: 'Текст', @@ -352,10 +379,146 @@ export default { 'Показать все директории в рабочем пространстве', 'set external editor preference': 'Установка предпочитаемого внешнего редактора', + 'Select Editor': 'Выбрать редактор', + 'Editor Preference': 'Настройка редактора', + 'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.': + 'В настоящее время поддерживаются следующие редакторы. Обратите внимание, что некоторые редакторы нельзя использовать в режиме песочницы.', + 'Your preferred editor is:': 'Ваш предпочитаемый редактор:', 'Manage extensions': 'Управление расширениями', 'List active extensions': 'Показать активные расширения', 'Update extensions. Usage: update |--all': 'Обновить расширения. Использование: update |--all', + 'Disable an extension': 'Отключить расширение', + 'Enable an extension': 'Включить расширение', + 'Install an extension from a git repo or local path': + 'Установить расширение из Git-репозитория или локального пути', + 'Uninstall an extension': 'Удалить расширение', + 'No extensions installed.': 'Расширения не установлены.', + 'Usage: /extensions update |--all': + 'Использование: /extensions update <имена-расширений>|--all', + 'Extension "{{name}}" not found.': 'Расширение "{{name}}" не найдено.', + 'No extensions to update.': 'Нет расширений для обновления.', + 'Usage: /extensions install ': + 'Использование: /extensions install <источник>', + 'Installing extension from "{{source}}"...': + 'Установка расширения из "{{source}}"...', + 'Extension "{{name}}" installed successfully.': + 'Расширение "{{name}}" успешно установлено.', + 'Failed to install extension from "{{source}}": {{error}}': + 'Не удалось установить расширение из "{{source}}": {{error}}', + 'Usage: /extensions uninstall ': + 'Использование: /extensions uninstall <имя-расширения>', + 'Uninstalling extension "{{name}}"...': 'Удаление расширения "{{name}}"...', + 'Extension "{{name}}" uninstalled successfully.': + 'Расширение "{{name}}" успешно удалено.', + 'Failed to uninstall extension "{{name}}": {{error}}': + 'Не удалось удалить расширение "{{name}}": {{error}}', + 'Usage: /extensions {{command}} [--scope=]': + 'Использование: /extensions {{command}} <расширение> [--scope=]', + 'Unsupported scope "{{scope}}", should be one of "user" or "workspace"': + 'Неподдерживаемая область "{{scope}}", должна быть "user" или "workspace"', + 'Extension "{{name}}" disabled for scope "{{scope}}"': + 'Расширение "{{name}}" отключено для области "{{scope}}"', + 'Extension "{{name}}" enabled for scope "{{scope}}"': + 'Расширение "{{name}}" включено для области "{{scope}}"', + 'Do you want to continue? [Y/n]: ': 'Хотите продолжить? [Y/n]: ', + 'Do you want to continue?': 'Хотите продолжить?', + 'Installing extension "{{name}}".': 'Установка расширения "{{name}}".', + '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**': + '**Расширения могут вызывать неожиданное поведение. Убедитесь, что вы изучили источник расширения и доверяете автору.**', + 'This extension will run the following MCP servers:': + 'Это расширение запустит следующие MCP-серверы:', + local: 'локальный', + remote: 'удалённый', + 'This extension will add the following commands: {{commands}}.': + 'Это расширение добавит следующие команды: {{commands}}.', + 'This extension will append info to your QWEN.md context using {{fileName}}': + 'Это расширение добавит информацию в ваш контекст QWEN.md с помощью {{fileName}}', + 'This extension will exclude the following core tools: {{tools}}': + 'Это расширение исключит следующие основные инструменты: {{tools}}', + 'This extension will install the following skills:': + 'Это расширение установит следующие навыки:', + 'This extension will install the following subagents:': + 'Это расширение установит следующие подагенты:', + 'Installation cancelled for "{{name}}".': 'Установка "{{name}}" отменена.', + '--ref and --auto-update are not applicable for marketplace extensions.': + '--ref и --auto-update неприменимы для расширений из маркетплейса.', + 'Extension "{{name}}" installed successfully and enabled.': + 'Расширение "{{name}}" успешно установлено и включено.', + 'Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).': + 'Устанавливает расширение из URL Git-репозитория, локального пути или маркетплейса Claude (marketplace-url:plugin-name).', + 'The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.': + 'URL GitHub, локальный путь или источник в маркетплейсе (marketplace-url:plugin-name) устанавливаемого расширения.', + 'The git ref to install from.': 'Git-ссылка для установки.', + 'Enable auto-update for this extension.': + 'Включить автообновление для этого расширения.', + 'Enable pre-release versions for this extension.': + 'Включить пре-релизные версии для этого расширения.', + 'Acknowledge the security risks of installing an extension and skip the confirmation prompt.': + 'Подтвердить риски безопасности установки расширения и пропустить запрос подтверждения.', + 'The source argument must be provided.': + 'Необходимо указать аргумент источника.', + 'Extension "{{name}}" successfully uninstalled.': + 'Расширение "{{name}}" успешно удалено.', + 'Uninstalls an extension.': 'Удаляет расширение.', + 'The name or source path of the extension to uninstall.': + 'Имя или путь к источнику удаляемого расширения.', + 'Please include the name of the extension to uninstall as a positional argument.': + 'Пожалуйста, укажите имя удаляемого расширения как позиционный аргумент.', + 'Enables an extension.': 'Включает расширение.', + 'The name of the extension to enable.': 'Имя включаемого расширения.', + 'The scope to enable the extenison in. If not set, will be enabled in all scopes.': + 'Область для включения расширения. Если не задана, будет включено во всех областях.', + 'Extension "{{name}}" successfully enabled for scope "{{scope}}".': + 'Расширение "{{name}}" успешно включено для области "{{scope}}".', + 'Extension "{{name}}" successfully enabled in all scopes.': + 'Расширение "{{name}}" успешно включено во всех областях.', + 'Invalid scope: {{scope}}. Please use one of {{scopes}}.': + 'Недопустимая область: {{scope}}. Пожалуйста, используйте одну из {{scopes}}.', + 'Disables an extension.': 'Отключает расширение.', + 'The name of the extension to disable.': 'Имя отключаемого расширения.', + 'The scope to disable the extenison in.': + 'Область для отключения расширения.', + 'Extension "{{name}}" successfully disabled for scope "{{scope}}".': + 'Расширение "{{name}}" успешно отключено для области "{{scope}}".', + 'Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.': + 'Расширение "{{name}}" успешно обновлено: {{oldVersion}} → {{newVersion}}.', + 'Unable to install extension "{{name}}" due to missing install metadata': + 'Невозможно установить расширение "{{name}}" из-за отсутствия метаданных установки', + 'Extension "{{name}}" is already up to date.': + 'Расширение "{{name}}" уже актуально.', + 'Updates all extensions or a named extension to the latest version.': + 'Обновляет все расширения или указанное расширение до последней версии.', + 'The name of the extension to update.': 'Имя обновляемого расширения.', + 'Update all extensions.': 'Обновить все расширения.', + 'Either an extension name or --all must be provided': + 'Необходимо указать имя расширения или --all', + 'Lists installed extensions.': 'Показывает установленные расширения.', + 'Link extension failed to install.': + 'Не удалось установить связанное расширение.', + 'Extension "{{name}}" linked successfully and enabled.': + 'Расширение "{{name}}" успешно связано и включено.', + 'Links an extension from a local path. Updates made to the local path will always be reflected.': + 'Связывает расширение из локального пути. Изменения в локальном пути будут всегда отражаться.', + 'The name of the extension to link.': 'Имя связываемого расширения.', + 'Set a specific setting for an extension.': + 'Установить конкретную настройку для расширения.', + 'Name of the extension to configure.': 'Имя настраиваемого расширения.', + 'The setting to configure (name or env var).': + 'Настройка для конфигурирования (имя или переменная окружения).', + 'The scope to set the setting in.': 'Область для установки настройки.', + 'List all settings for an extension.': 'Показать все настройки расширения.', + 'Name of the extension.': 'Имя расширения.', + 'Extension "{{name}}" has no settings to configure.': + 'Расширение "{{name}}" не имеет настроек для конфигурирования.', + 'Settings for "{{name}}":': 'Настройки для "{{name}}":', + '(workspace)': '(рабочее пространство)', + '(user)': '(пользователь)', + '[not set]': '[не задано]', + '[value stored in keychain]': '[значение хранится в связке ключей]', + 'Manage extension settings.': 'Управление настройками расширений.', + 'You need to specify a command (set or list).': + 'Необходимо указать команду (set или list).', 'manage IDE integration': 'Управление интеграцией с IDE', 'check status of IDE integration': 'Проверить статус интеграции с IDE', 'install required IDE companion for {{ideName}}': @@ -419,6 +582,8 @@ export default { 'Example: /language output English': 'Пример: /language output English', 'Example: /language output 日本語': 'Пример: /language output 日本語', 'UI language changed to {{lang}}': 'Язык интерфейса изменен на {{lang}}', + 'LLM output language set to {{lang}}': + 'Язык вывода LLM установлен на {{lang}}', 'LLM output language rule file generated at {{path}}': 'Файл правил языка вывода LLM создан в {{path}}', 'Please restart the application for the changes to take effect.': @@ -441,7 +606,7 @@ export default { // ============================================================================ // Команды - Режим подтверждения // ============================================================================ - 'Approval Mode': 'Режим подтверждения', + 'Tool Approval Mode': 'Режим подтверждения инструментов', 'Current approval mode: {{mode}}': 'Текущий режим подтверждения: {{mode}}', 'Available approval modes:': 'Доступные режимы подтверждения:', 'Approval mode changed to: {{mode}}': @@ -483,8 +648,6 @@ export default { 'Автоматически подтверждать все инструменты', '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': 'Настройки рабочего пространства', @@ -982,6 +1145,19 @@ export default { 'Session start time is unavailable, cannot calculate stats.': 'Время начала сессии недоступно, невозможно рассчитать статистику.', + // ============================================================================ + // Command Format Migration + // ============================================================================ + 'Command Format Migration': 'Миграция формата команд', + 'Found {{count}} TOML command file:': 'Найден {{count}} файл команд TOML:', + 'Found {{count}} TOML command files:': + 'Найдено {{count}} файлов команд TOML:', + '... and {{count}} more': '... и ещё {{count}}', + 'The TOML format is deprecated. Would you like to migrate them to Markdown format?': + 'Формат TOML устарел. Хотите перенести их в формат Markdown?', + '(Backups will be created and original files will be preserved)': + '(Будут созданы резервные копии, исходные файлы будут сохранены)', + // ============================================================================ // Loading Phrases // ============================================================================ @@ -1123,4 +1299,55 @@ export default { 'Пробовали выключить и включить снова? (Экран загрузки, не меня!)', 'Нужно построить больше пилонов...', ], + + // ============================================================================ + // Extension Settings Input + // ============================================================================ + 'Enter value...': 'Введите значение...', + 'Enter sensitive value...': 'Введите секретное значение...', + 'Press Enter to submit, Escape to cancel': + 'Нажмите Enter для отправки, Escape для отмены', + + // ============================================================================ + // Command Migration Tool + // ============================================================================ + 'Markdown file already exists: {{filename}}': + 'Markdown-файл уже существует: {{filename}}', + 'TOML Command Format Deprecation Notice': + 'Уведомление об устаревании формата TOML', + 'Found {{count}} command file(s) in TOML format:': + 'Найдено {{count}} файл(ов) команд в формате TOML:', + 'The TOML format for commands is being deprecated in favor of Markdown format.': + 'Формат TOML для команд устаревает в пользу формата Markdown.', + 'Markdown format is more readable and easier to edit.': + 'Формат Markdown более читаемый и простой для редактирования.', + 'You can migrate these files automatically using:': + 'Вы можете автоматически мигрировать эти файлы с помощью:', + 'Or manually convert each file:': 'Или вручную конвертировать каждый файл:', + 'TOML: prompt = "..." / description = "..."': + 'TOML: prompt = "..." / description = "..."', + 'Markdown: YAML frontmatter + content': + 'Markdown: YAML frontmatter + содержимое', + 'The migration tool will:': 'Инструмент миграции:', + 'Convert TOML files to Markdown': 'Конвертирует TOML-файлы в Markdown', + 'Create backups of original files': 'Создаёт резервные копии исходных файлов', + 'Preserve all command functionality': 'Сохраняет всю функциональность команд', + 'TOML format will continue to work for now, but migration is recommended.': + 'Формат TOML пока продолжит работать, но миграция рекомендуется.', + + // ============================================================================ + // Extensions - Explore Command + // ============================================================================ + 'Open extensions page in your browser': + 'Открыть страницу расширений в браузере', + 'Unknown extensions source: {{source}}.': + 'Неизвестный источник расширений: {{source}}.', + 'Would open extensions page in your browser: {{url}} (skipped in test environment)': + 'Страница расширений была бы открыта в браузере: {{url}} (пропущено в тестовой среде)', + 'View available extensions at {{url}}': + 'Посмотреть доступные расширения на {{url}}', + 'Opening extensions page in your browser: {{url}}': + 'Открываем страницу расширений в браузере: {{url}}', + 'Failed to open browser. Check out the extensions gallery at {{url}}': + 'Не удалось открыть браузер. Посетите галерею расширений по адресу {{url}}', }; diff --git a/packages/cli/src/i18n/locales/zh.js b/packages/cli/src/i18n/locales/zh.js index 466b163e3..d6603207c 100644 --- a/packages/cli/src/i18n/locales/zh.js +++ b/packages/cli/src/i18n/locales/zh.js @@ -32,6 +32,25 @@ export default { 'Model Context Protocol command (from external servers)': '模型上下文协议命令（来自外部服务器）', 'Keyboard Shortcuts:': '键盘快捷键：', + 'Toggle this help display': '切换此帮助显示', + 'Toggle shell mode': '切换命令行模式', + 'Open command menu': '打开命令菜单', + 'Add file context': '添加文件上下文', + 'Accept suggestion / Autocomplete': '接受建议 / 自动补全', + 'Reverse search history': '反向搜索历史', + 'Press ? again to close': '再次按 ? 关闭', + // Keyboard shortcuts panel descriptions + 'for shell mode': '命令行模式', + 'for commands': '命令菜单', + 'for file paths': '文件路径', + 'to clear input': '清空输入', + 'to cycle approvals': '切换审批模式', + 'to quit': '退出', + 'for newline': '换行', + 'to clear screen': '清屏', + 'to search history': '搜索历史', + 'to paste images': '粘贴图片', + 'for external editor': '外部编辑器', 'Jump through words in the input': '在输入中按单词跳转', 'Close dialogs, cancel requests, or quit application': '关闭对话框、取消请求或退出应用程序', @@ -45,6 +64,7 @@ export default { 'Connecting to MCP servers... ({{connected}}/{{total}})': '正在连接到 MCP 服务器... ({{connected}}/{{total}})', 'Type your message or @path/to/file': '输入您的消息或 @ 文件路径', + '? for shortcuts': '按 ? 查看快捷键', "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.": "按 'i' 进入插入模式，按 'Esc' 进入普通模式", 'Cancel operation / Clear input (double press)': @@ -58,10 +78,15 @@ export default { 'show version info': '显示版本信息', 'submit a bug report': '提交错误报告', 'About Qwen Code': '关于 Qwen Code', + Status: '状态', // ============================================================================ // System Information Fields // ============================================================================ + 'Qwen Code': 'Qwen Code', + Runtime: '运行环境', + OS: '操作系统', + Auth: '认证', 'CLI Version': 'CLI 版本', 'Git Commit': 'Git 提交', Model: '模型', @@ -74,6 +99,7 @@ export default { 'Session ID': '会话 ID', 'Auth Method': '认证方式', 'Base URL': '基础 URL', + Proxy: '代理', 'Memory Usage': '内存使用', 'IDE Client': 'IDE 客户端', @@ -97,8 +123,8 @@ export default { Preview: '预览', '(Use Enter to select, Tab to configure scope)': '（使用 Enter 选择，Tab 配置作用域）', - '(Use Enter to apply scope, Tab to select theme)': - '（使用 Enter 应用作用域，Tab 选择主题）', + '(Use Enter to apply scope, Tab to go back)': + '（使用 Enter 应用作用域，Tab 返回）', 'Theme configuration unavailable due to NO_COLOR env variable.': '由于 NO_COLOR 环境变量，主题配置不可用。', 'Theme "{{themeName}}" not found.': '未找到主题 "{{themeName}}"。', @@ -149,6 +175,7 @@ export default { 'Project Level ({{path}})': '项目级 ({{path}})', 'User Level ({{path}})': '用户级 ({{path}})', 'Built-in Agents': '内置代理', + 'Extension Agents': '扩展代理', 'Using: {{count}} agents': '使用中: {{count}} 个代理', 'View Agent': '查看代理', 'Edit Agent': '编辑代理', @@ -248,8 +275,6 @@ export default { // ============================================================================ 'View and edit Qwen Code settings': '查看和编辑 Qwen Code 设置', Settings: '设置', - '(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.': @@ -259,24 +284,24 @@ export default { // ============================================================================ 'Vim Mode': 'Vim 模式', 'Disable Auto Update': '禁用自动更新', + 'Attribution: commit': '署名：提交', + 'Terminal Bell Notification': '终端响铃通知', + 'Enable Usage Statistics': '启用使用统计', + Theme: '主题', + 'Preferred Editor': '首选编辑器', + 'Auto-connect to IDE': '自动连接到 IDE', 'Enable Prompt Completion': '启用提示补全', 'Debug Keystroke Logging': '调试按键记录', - Language: '语言', + 'Language: UI': '语言：界面', + 'Language: Model': '语言：模型', 'Output Format': '输出格式', 'Hide Window Title': '隐藏窗口标题', 'Show Status in Title': '在标题中显示状态', 'Hide Tips': '隐藏提示', - 'Hide Banner': '隐藏横幅', - 'Hide Context Summary': '隐藏上下文摘要', - 'Hide CWD': '隐藏当前工作目录', - 'Hide Sandbox Status': '隐藏沙箱状态', - 'Hide Model Info': '隐藏模型信息', - 'Hide Footer': '隐藏页脚', - 'Show Memory Usage': '显示内存使用', - 'Show Line Numbers': '显示行号', + 'Show Line Numbers in Code': '在代码中显示行号', 'Show Citations': '显示引用', 'Custom Witty Phrases': '自定义诙谐短语', - 'Enable Welcome Back': '启用欢迎回来', + 'Show Welcome Back Dialog': '显示欢迎回来对话框', 'Enable User Feedback': '启用用户反馈', 'How is Qwen doing this session? (optional)': 'Qwen 这次表现如何？（可选）', Bad: '不满意', @@ -301,7 +326,7 @@ export default { 'Respect .qwenignore': '遵守 .qwenignore', 'Enable Recursive File Search': '启用递归文件搜索', 'Disable Fuzzy Search': '禁用模糊搜索', - 'Enable Interactive Shell': '启用交互式 Shell', + 'Interactive Shell (PTY)': '交互式 Shell (PTY)', 'Show Color': '显示颜色', 'Auto Accept': '自动接受', 'Use Ripgrep': '使用 Ripgrep', @@ -312,6 +337,7 @@ export default { 'Folder Trust': '文件夹信任', 'Vision Model Preview': '视觉模型预览', 'Tool Schema Compliance': '工具 Schema 兼容性', + 'Experimental: Skills': '实验性: 技能', // Settings enum options 'Auto (detect from system)': '自动（从系统检测）', Text: '文本', @@ -333,10 +359,137 @@ export default { '将目录添加到工作区。使用逗号分隔多个路径', 'Show all directories in the workspace': '显示工作区中的所有目录', 'set external editor preference': '设置外部编辑器首选项', + 'Select Editor': '选择编辑器', + 'Editor Preference': '编辑器首选项', + 'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.': + '当前支持以下编辑器。请注意，某些编辑器无法在沙箱模式下使用。', + 'Your preferred editor is:': '您的首选编辑器是：', 'Manage extensions': '管理扩展', 'List active extensions': '列出活动扩展', 'Update extensions. Usage: update |--all': '更新扩展。用法：update |--all', + 'Disable an extension': '禁用扩展', + 'Enable an extension': '启用扩展', + 'Install an extension from a git repo or local path': + '从 Git 仓库或本地路径安装扩展', + 'Uninstall an extension': '卸载扩展', + 'No extensions installed.': '未安装扩展。', + 'Usage: /extensions update |--all': + '用法：/extensions update <扩展名>|--all', + 'Extension "{{name}}" not found.': '未找到扩展 "{{name}}"。', + 'No extensions to update.': '没有可更新的扩展。', + 'Usage: /extensions install ': '用法：/extensions install <来源>', + 'Installing extension from "{{source}}"...': + '正在从 "{{source}}" 安装扩展...', + 'Extension "{{name}}" installed successfully.': '扩展 "{{name}}" 安装成功。', + 'Failed to install extension from "{{source}}": {{error}}': + '从 "{{source}}" 安装扩展失败：{{error}}', + 'Usage: /extensions uninstall ': + '用法：/extensions uninstall <扩展名>', + 'Uninstalling extension "{{name}}"...': '正在卸载扩展 "{{name}}"...', + 'Extension "{{name}}" uninstalled successfully.': + '扩展 "{{name}}" 卸载成功。', + 'Failed to uninstall extension "{{name}}": {{error}}': + '卸载扩展 "{{name}}" 失败：{{error}}', + 'Usage: /extensions {{command}} [--scope=]': + '用法：/extensions {{command}} <扩展> [--scope=]', + 'Unsupported scope "{{scope}}", should be one of "user" or "workspace"': + '不支持的作用域 "{{scope}}"，应为 "user" 或 "workspace"', + 'Extension "{{name}}" disabled for scope "{{scope}}"': + '扩展 "{{name}}" 已在作用域 "{{scope}}" 中禁用', + 'Extension "{{name}}" enabled for scope "{{scope}}"': + '扩展 "{{name}}" 已在作用域 "{{scope}}" 中启用', + 'Do you want to continue? [Y/n]: ': '是否继续？[Y/n]：', + 'Do you want to continue?': '是否继续？', + 'Installing extension "{{name}}".': '正在安装扩展 "{{name}}"。', + '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**': + '**扩展可能会引入意外行为。请确保您已调查过扩展源并信任作者。**', + 'This extension will run the following MCP servers:': + '此扩展将运行以下 MCP 服务器：', + local: '本地', + remote: '远程', + 'This extension will add the following commands: {{commands}}.': + '此扩展将添加以下命令：{{commands}}。', + 'This extension will append info to your QWEN.md context using {{fileName}}': + '此扩展将使用 {{fileName}} 向您的 QWEN.md 上下文追加信息', + 'This extension will exclude the following core tools: {{tools}}': + '此扩展将排除以下核心工具：{{tools}}', + 'This extension will install the following skills:': '此扩展将安装以下技能：', + 'This extension will install the following subagents:': + '此扩展将安装以下子代理：', + 'Installation cancelled for "{{name}}".': '已取消安装 "{{name}}"。', + '--ref and --auto-update are not applicable for marketplace extensions.': + '--ref 和 --auto-update 不适用于市场扩展。', + 'Extension "{{name}}" installed successfully and enabled.': + '扩展 "{{name}}" 安装成功并已启用。', + 'Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).': + '从 Git 仓库 URL、本地路径或 Claude 市场（marketplace-url:plugin-name）安装扩展。', + 'The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.': + '要安装的扩展的 GitHub URL、本地路径或市场源（marketplace-url:plugin-name）。', + 'The git ref to install from.': '要安装的 Git 引用。', + 'Enable auto-update for this extension.': '为此扩展启用自动更新。', + 'Enable pre-release versions for this extension.': '为此扩展启用预发布版本。', + 'Acknowledge the security risks of installing an extension and skip the confirmation prompt.': + '确认安装扩展的安全风险并跳过确认提示。', + 'The source argument must be provided.': '必须提供来源参数。', + 'Extension "{{name}}" successfully uninstalled.': + '扩展 "{{name}}" 卸载成功。', + 'Uninstalls an extension.': '卸载扩展。', + 'The name or source path of the extension to uninstall.': + '要卸载的扩展的名称或源路径。', + 'Please include the name of the extension to uninstall as a positional argument.': + '请将要卸载的扩展名称作为位置参数。', + 'Enables an extension.': '启用扩展。', + 'The name of the extension to enable.': '要启用的扩展名称。', + 'The scope to enable the extenison in. If not set, will be enabled in all scopes.': + '启用扩展的作用域。如果未设置，将在所有作用域中启用。', + 'Extension "{{name}}" successfully enabled for scope "{{scope}}".': + '扩展 "{{name}}" 已在作用域 "{{scope}}" 中启用。', + 'Extension "{{name}}" successfully enabled in all scopes.': + '扩展 "{{name}}" 已在所有作用域中启用。', + 'Invalid scope: {{scope}}. Please use one of {{scopes}}.': + '无效的作用域：{{scope}}。请使用 {{scopes}} 之一。', + 'Disables an extension.': '禁用扩展。', + 'The name of the extension to disable.': '要禁用的扩展名称。', + 'The scope to disable the extenison in.': '禁用扩展的作用域。', + 'Extension "{{name}}" successfully disabled for scope "{{scope}}".': + '扩展 "{{name}}" 已在作用域 "{{scope}}" 中禁用。', + 'Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.': + '扩展 "{{name}}" 更新成功：{{oldVersion}} → {{newVersion}}。', + 'Unable to install extension "{{name}}" due to missing install metadata': + '由于缺少安装元数据，无法安装扩展 "{{name}}"', + 'Extension "{{name}}" is already up to date.': + '扩展 "{{name}}" 已是最新版本。', + 'Updates all extensions or a named extension to the latest version.': + '将所有扩展或指定扩展更新到最新版本。', + 'The name of the extension to update.': '要更新的扩展名称。', + 'Update all extensions.': '更新所有扩展。', + 'Either an extension name or --all must be provided': + '必须提供扩展名称或 --all', + 'Lists installed extensions.': '列出已安装的扩展。', + 'Link extension failed to install.': '链接扩展安装失败。', + 'Extension "{{name}}" linked successfully and enabled.': + '扩展 "{{name}}" 链接成功并已启用。', + 'Links an extension from a local path. Updates made to the local path will always be reflected.': + '从本地路径链接扩展。对本地路径的更新将始终反映。', + 'The name of the extension to link.': '要链接的扩展名称。', + 'Set a specific setting for an extension.': '为扩展设置特定配置。', + 'Name of the extension to configure.': '要配置的扩展名称。', + 'The setting to configure (name or env var).': + '要配置的设置（名称或环境变量）。', + 'The scope to set the setting in.': '设置配置的作用域。', + 'List all settings for an extension.': '列出扩展的所有设置。', + 'Name of the extension.': '扩展名称。', + 'Extension "{{name}}" has no settings to configure.': + '扩展 "{{name}}" 没有可配置的设置。', + 'Settings for "{{name}}":': '"{{name}}" 的设置：', + '(workspace)': '（工作区）', + '(user)': '（用户）', + '[not set]': '［未设置］', + '[value stored in keychain]': '［值存储在钥匙串中］', + 'Manage extension settings.': '管理扩展设置。', + 'You need to specify a command (set or list).': + '您需要指定命令（set 或 list）。', 'manage IDE integration': '管理 IDE 集成', 'check status of IDE integration': '检查 IDE 集成状态', 'install required IDE companion for {{ideName}}': @@ -396,6 +549,7 @@ export default { 'Example: /language output English': '示例：/language output English', 'Example: /language output 日本語': '示例：/language output 日本語', 'UI language changed to {{lang}}': 'UI 语言已更改为 {{lang}}', + 'LLM output language set to {{lang}}': 'LLM 输出语言已设置为 {{lang}}', 'LLM output language rule file generated at {{path}}': 'LLM 输出语言规则文件已生成于 {{path}}', 'Please restart the application for the changes to take effect.': @@ -416,7 +570,7 @@ export default { // ============================================================================ // Commands - Approval Mode // ============================================================================ - 'Approval Mode': '审批模式', + 'Tool Approval Mode': '工具审批模式', 'Current approval mode: {{mode}}': '当前审批模式：{{mode}}', 'Available approval modes:': '可用的审批模式：', 'Approval mode changed to: {{mode}}': '审批模式已更改为：{{mode}}', @@ -450,8 +604,6 @@ export default { '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': '工作区设置', @@ -851,13 +1003,22 @@ export default { // ============================================================================ // 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.': '获取更多信息', + 'Tips:': '提示：', + 'Use /compress when the conversation gets long to summarize history and free up context.': + '对话变长时用 /compress，总结历史并释放上下文。', + 'Start a fresh idea with /clear or /new; the previous session stays available in history.': + '用 /clear 或 /new 开启新思路；之前的会话会保留在历史记录中。', + 'Use /bug to submit issues to the maintainers when something goes off.': + '遇到问题时，用 /bug 将问题提交给维护者。', + 'Switch auth type quickly with /auth.': '用 /auth 快速切换认证方式。', + 'You can run any shell commands from Qwen Code using ! (e.g. !ls).': + '在 Qwen Code 中使用 ! 可运行任意 shell 命令（例如 !ls）。', + 'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.': + '输入 / 打开命令弹窗；按 Tab 自动补全斜杠命令和保存的提示词。', + 'You can resume a previous conversation by running qwen --continue or qwen --resume.': + '运行 qwen --continue 或 qwen --resume 可继续之前的会话。', + 'You can switch permission mode quickly with Shift+Tab or /approval-mode.': + '按 Shift+Tab 或输入 /approval-mode 可快速切换权限模式。', // ============================================================================ // Exit Screen / Stats @@ -917,6 +1078,18 @@ export default { 'Session start time is unavailable, cannot calculate stats.': '会话开始时间不可用，无法计算统计信息', + // ============================================================================ + // Command Format Migration + // ============================================================================ + 'Command Format Migration': '命令格式迁移', + 'Found {{count}} TOML command file:': '发现 {{count}} 个 TOML 命令文件：', + 'Found {{count}} TOML command files:': '发现 {{count}} 个 TOML 命令文件：', + '... and {{count}} more': '... 以及其他 {{count}} 个', + 'The TOML format is deprecated. Would you like to migrate them to Markdown format?': + 'TOML 格式已弃用。是否将它们迁移到 Markdown 格式？', + '(Backups will be created and original files will be preserved)': + '（将创建备份，原始文件将保留）', + // ============================================================================ // Loading Phrases // ============================================================================ @@ -957,4 +1130,49 @@ export default { '哪怕只有 0.1% 的进度，也是在向目标靠近...', '加载的是字节，承载的是对技术的热爱...', ], + + // ============================================================================ + // Extension Settings Input + // ============================================================================ + 'Enter value...': '请输入值...', + 'Enter sensitive value...': '请输入敏感值...', + 'Press Enter to submit, Escape to cancel': '按 Enter 提交，Escape 取消', + + // ============================================================================ + // Command Migration Tool + // ============================================================================ + 'Markdown file already exists: {{filename}}': + 'Markdown 文件已存在：{{filename}}', + 'TOML Command Format Deprecation Notice': 'TOML 命令格式弃用通知', + 'Found {{count}} command file(s) in TOML format:': + '发现 {{count}} 个 TOML 格式的命令文件：', + 'The TOML format for commands is being deprecated in favor of Markdown format.': + '命令的 TOML 格式正在被弃用，推荐使用 Markdown 格式。', + 'Markdown format is more readable and easier to edit.': + 'Markdown 格式更易读、更易编辑。', + 'You can migrate these files automatically using:': + '您可以使用以下命令自动迁移这些文件：', + 'Or manually convert each file:': '或手动转换每个文件：', + 'TOML: prompt = "..." / description = "..."': + 'TOML：prompt = "..." / description = "..."', + 'Markdown: YAML frontmatter + content': 'Markdown：YAML frontmatter + 内容', + 'The migration tool will:': '迁移工具将：', + 'Convert TOML files to Markdown': '将 TOML 文件转换为 Markdown', + 'Create backups of original files': '创建原始文件的备份', + 'Preserve all command functionality': '保留所有命令功能', + 'TOML format will continue to work for now, but migration is recommended.': + 'TOML 格式目前仍可使用，但建议迁移。', + + // ============================================================================ + // Extensions - Explore Command + // ============================================================================ + 'Open extensions page in your browser': '在浏览器中打开扩展市场页面', + 'Unknown extensions source: {{source}}.': '未知的扩展来源：{{source}}。', + 'Would open extensions page in your browser: {{url}} (skipped in test environment)': + '将在浏览器中打开扩展页面：{{url}}（测试环境中已跳过）', + 'View available extensions at {{url}}': '在 {{url}} 查看可用扩展', + 'Opening extensions page in your browser: {{url}}': + '正在浏览器中打开扩展页面：{{url}}', + 'Failed to open browser. Check out the extensions gallery at {{url}}': + '打开浏览器失败。请访问扩展市场：{{url}}', }; diff --git a/packages/cli/src/nonInteractiveCliCommands.ts b/packages/cli/src/nonInteractiveCliCommands.ts index 2c9a51072..8e2e28dd4 100644 --- a/packages/cli/src/nonInteractiveCliCommands.ts +++ b/packages/cli/src/nonInteractiveCliCommands.ts @@ -38,6 +38,7 @@ export const ALLOWED_BUILTIN_COMMANDS_NON_INTERACTIVE = [ 'init', 'summary', 'compress', + 'bug', ] as const; /** diff --git a/packages/cli/src/services/BuiltinCommandLoader.test.ts b/packages/cli/src/services/BuiltinCommandLoader.test.ts index 7c8e6fc57..7d4f50421 100644 --- a/packages/cli/src/services/BuiltinCommandLoader.test.ts +++ b/packages/cli/src/services/BuiltinCommandLoader.test.ts @@ -8,7 +8,8 @@ vi.mock('../ui/commands/aboutCommand.js', async () => { const { CommandKind } = await import('../ui/commands/types.js'); return { aboutCommand: { - name: 'about', + name: 'status', + altNames: ['about'], description: 'About the CLI', kind: CommandKind.BUILT_IN, }, @@ -127,8 +128,8 @@ describe('BuiltinCommandLoader', () => { expect(ideCmd).toBeDefined(); // Other commands should still be present. - const aboutCmd = commands.find((c) => c.name === 'about'); - expect(aboutCmd).toBeDefined(); + const statusCmd = commands.find((c) => c.name === 'status'); + expect(statusCmd).toBeDefined(); }); it('should handle a null config gracefully when calling factories', async () => { @@ -143,9 +144,9 @@ describe('BuiltinCommandLoader', () => { const loader = new BuiltinCommandLoader(mockConfig); const commands = await loader.loadCommands(new AbortController().signal); - const aboutCmd = commands.find((c) => c.name === 'about'); - expect(aboutCmd).toBeDefined(); - expect(aboutCmd?.kind).toBe(CommandKind.BUILT_IN); + const statusCmd = commands.find((c) => c.name === 'status'); + expect(statusCmd).toBeDefined(); + expect(statusCmd?.kind).toBe(CommandKind.BUILT_IN); const approvalModeCmd = commands.find((c) => c.name === 'approval-mode'); expect(approvalModeCmd).toBeDefined(); diff --git a/packages/cli/src/services/FileCommandLoader-extension.test.ts b/packages/cli/src/services/FileCommandLoader-extension.test.ts new file mode 100644 index 000000000..7f5790921 --- /dev/null +++ b/packages/cli/src/services/FileCommandLoader-extension.test.ts @@ -0,0 +1,343 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { describe, it, expect, afterEach, vi } from 'vitest'; +import * as path from 'node:path'; +import mock from 'mock-fs'; +import { FileCommandLoader } from './FileCommandLoader.js'; +import type { Config } from '@qwen-code/qwen-code-core'; +import { Storage } from '@qwen-code/qwen-code-core'; + +describe('FileCommandLoader - Extension Commands Support', () => { + const projectRoot = '/test/project'; + const userCommandsDir = Storage.getUserCommandsDir(); + const projectCommandsDir = path.join(projectRoot, '.qwen', 'commands'); + + afterEach(() => { + mock.restore(); + }); + + it('should load commands from extension with config.commands path', async () => { + const extensionDir = path.join( + projectRoot, + '.qwen', + 'extensions', + 'test-ext', + ); + + const extensionConfig = { + name: 'test-ext', + version: '1.0.0', + commands: 'custom-cmds', + }; + + mock({ + [userCommandsDir]: {}, + [projectCommandsDir]: {}, + [extensionDir]: { + 'qwen-extension.json': JSON.stringify(extensionConfig), + 'custom-cmds': { + 'test.md': + '---\ndescription: Test command from extension\n---\nDo something', + }, + }, + }); + + const mockConfig = { + getFolderTrustFeature: vi.fn(() => false), + getFolderTrust: vi.fn(() => true), + getProjectRoot: vi.fn(() => projectRoot), + storage: new Storage(projectRoot), + getExtensions: vi.fn(() => [ + { + id: 'test-ext', + config: extensionConfig, + name: 'test-ext', + version: '1.0.0', + isActive: true, + path: extensionDir, + contextFiles: [], + }, + ]), + } as unknown as Config; + + const loader = new FileCommandLoader(mockConfig); + const commands = await loader.loadCommands(new AbortController().signal); + + expect(commands).toHaveLength(1); + expect(commands[0].name).toBe('test'); + expect(commands[0].extensionName).toBe('test-ext'); + expect(commands[0].description).toBe( + '[test-ext] Test command from extension', + ); + }); + + it('should load commands from extension with multiple commands paths', async () => { + const extensionDir = path.join( + projectRoot, + '.qwen', + 'extensions', + 'multi-ext', + ); + + const extensionConfig = { + name: 'multi-ext', + version: '1.0.0', + commands: ['commands1', 'commands2'], + }; + + mock({ + [userCommandsDir]: {}, + [projectCommandsDir]: {}, + [extensionDir]: { + 'qwen-extension.json': JSON.stringify(extensionConfig), + commands1: { + 'cmd1.md': '---\n---\nCommand 1', + }, + commands2: { + 'cmd2.md': '---\n---\nCommand 2', + }, + }, + }); + + const mockConfig = { + getFolderTrustFeature: vi.fn(() => false), + getFolderTrust: vi.fn(() => true), + getProjectRoot: vi.fn(() => projectRoot), + storage: new Storage(projectRoot), + getExtensions: vi.fn(() => [ + { + id: 'multi-ext', + config: extensionConfig, + contextFiles: [], + name: 'multi-ext', + version: '1.0.0', + isActive: true, + path: extensionDir, + }, + ]), + } as unknown as Config; + + const loader = new FileCommandLoader(mockConfig); + const commands = await loader.loadCommands(new AbortController().signal); + + expect(commands).toHaveLength(2); + const commandNames = commands.map((c) => c.name).sort(); + expect(commandNames).toEqual(['cmd1', 'cmd2']); + expect(commands.every((c) => c.extensionName === 'multi-ext')).toBe(true); + }); + + it('should fallback to default "commands" directory when config.commands not specified', async () => { + const extensionDir = path.join( + projectRoot, + '.qwen', + 'extensions', + 'default-ext', + ); + + const extensionConfig = { + name: 'default-ext', + version: '1.0.0', + }; + + mock({ + [userCommandsDir]: {}, + [projectCommandsDir]: {}, + [extensionDir]: { + 'qwen-extension.json': JSON.stringify(extensionConfig), + commands: { + 'default.md': '---\n---\nDefault command', + }, + }, + }); + + const mockConfig = { + getFolderTrustFeature: vi.fn(() => false), + getFolderTrust: vi.fn(() => true), + getProjectRoot: vi.fn(() => projectRoot), + storage: new Storage(projectRoot), + getExtensions: vi.fn(() => [ + { + id: 'default-ext', + config: extensionConfig, + contextFiles: [], + name: 'default-ext', + version: '1.0.0', + isActive: true, + path: extensionDir, + }, + ]), + } as unknown as Config; + + const loader = new FileCommandLoader(mockConfig); + const commands = await loader.loadCommands(new AbortController().signal); + + expect(commands).toHaveLength(1); + expect(commands[0].name).toBe('default'); + expect(commands[0].extensionName).toBe('default-ext'); + }); + + it('should handle extension without commands directory gracefully', async () => { + const extensionDir = path.join( + projectRoot, + '.qwen', + 'extensions', + 'no-cmds-ext', + ); + + const extensionConfig = { + name: 'no-cmds-ext', + version: '1.0.0', + }; + + mock({ + [userCommandsDir]: {}, + [projectCommandsDir]: {}, + [extensionDir]: { + 'qwen-extension.json': JSON.stringify(extensionConfig), + // No commands directory + }, + }); + + const mockConfig = { + getFolderTrustFeature: vi.fn(() => false), + getFolderTrust: vi.fn(() => true), + getProjectRoot: vi.fn(() => projectRoot), + storage: new Storage(projectRoot), + getExtensions: vi.fn(() => [ + { + id: 'no-cmds-ext', + config: extensionConfig, + contextFiles: [], + name: 'no-cmds-ext', + version: '1.0.0', + isActive: true, + path: extensionDir, + }, + ]), + } as unknown as Config; + + const loader = new FileCommandLoader(mockConfig); + const commands = await loader.loadCommands(new AbortController().signal); + + // Should not throw and return empty array + expect(commands).toHaveLength(0); + }); + + it('should set extensionName property for extension commands', async () => { + const extensionDir = path.join( + projectRoot, + '.qwen', + 'extensions', + 'prefix-ext', + ); + + const extensionConfig = { + name: 'prefix-ext', + version: '1.0.0', + }; + + mock({ + [userCommandsDir]: {}, + [projectCommandsDir]: {}, + [extensionDir]: { + 'qwen-extension.json': JSON.stringify(extensionConfig), + commands: { + 'mycommand.md': '---\n---\nMy command', + }, + }, + }); + + const mockConfig = { + getFolderTrustFeature: vi.fn(() => false), + getFolderTrust: vi.fn(() => true), + getProjectRoot: vi.fn(() => projectRoot), + storage: new Storage(projectRoot), + getExtensions: vi.fn(() => [ + { + id: 'prefix-ext', + config: extensionConfig, + contextFiles: [], + name: 'prefix-ext', + version: '1.0.0', + isActive: true, + path: extensionDir, + }, + ]), + } as unknown as Config; + + const loader = new FileCommandLoader(mockConfig); + const commands = await loader.loadCommands(new AbortController().signal); + + expect(commands).toHaveLength(1); + expect(commands[0].name).toBe('mycommand'); + expect(commands[0].extensionName).toBe('prefix-ext'); + expect(commands[0].description).toMatch(/^\[prefix-ext\]/); + }); + + it('should load commands from multiple extensions in alphabetical order', async () => { + const ext1Dir = path.join(projectRoot, '.qwen', 'extensions', 'ext-b'); + const ext2Dir = path.join(projectRoot, '.qwen', 'extensions', 'ext-a'); + + mock({ + [userCommandsDir]: {}, + [projectCommandsDir]: {}, + [ext1Dir]: { + 'qwen-extension.json': JSON.stringify({ + name: 'ext-b', + version: '1.0.0', + }), + commands: { + 'cmd.md': '---\n---\nCommand B', + }, + }, + [ext2Dir]: { + 'qwen-extension.json': JSON.stringify({ + name: 'ext-a', + version: '1.0.0', + }), + commands: { + 'cmd.md': '---\n---\nCommand A', + }, + }, + }); + + const mockConfig = { + getFolderTrustFeature: vi.fn(() => false), + getFolderTrust: vi.fn(() => true), + getProjectRoot: vi.fn(() => projectRoot), + storage: new Storage(projectRoot), + getExtensions: vi.fn(() => [ + { + id: 'ext-b', + config: { name: 'ext-b', version: '1.0.0' }, + contextFiles: [], + name: 'ext-b', + version: '1.0.0', + isActive: true, + path: ext1Dir, + }, + { + id: 'ext-a', + config: { name: 'ext-a', version: '1.0.0' }, + contextFiles: [], + name: 'ext-a', + version: '1.0.0', + isActive: true, + path: ext2Dir, + }, + ]), + } as unknown as Config; + + const loader = new FileCommandLoader(mockConfig); + const commands = await loader.loadCommands(new AbortController().signal); + + expect(commands).toHaveLength(2); + // Extensions are sorted alphabetically, so ext-a comes before ext-b + expect(commands[0].extensionName).toBe('ext-a'); + expect(commands[1].extensionName).toBe('ext-b'); + }); +}); diff --git a/packages/cli/src/services/FileCommandLoader-markdown.test.ts b/packages/cli/src/services/FileCommandLoader-markdown.test.ts new file mode 100644 index 000000000..590f2d100 --- /dev/null +++ b/packages/cli/src/services/FileCommandLoader-markdown.test.ts @@ -0,0 +1,117 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { describe, it, expect, beforeAll, afterAll } from 'vitest'; +import { promises as fs } from 'node:fs'; +import path from 'node:path'; +import os from 'node:os'; +import { FileCommandLoader } from './FileCommandLoader.js'; + +describe('FileCommandLoader - Markdown support', () => { + let tempDir: string; + + beforeAll(async () => { + // Create a temporary directory for test commands + tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'qwen-md-test-')); + }); + + afterAll(async () => { + // Clean up + await fs.rm(tempDir, { recursive: true, force: true }); + }); + + it('should load markdown commands with frontmatter', async () => { + // Create a test markdown command file + const mdContent = `--- +description: Test markdown command +--- + +This is a test prompt from markdown.`; + + const commandPath = path.join(tempDir, 'test-command.md'); + await fs.writeFile(commandPath, mdContent, 'utf-8'); + + // Create loader with temp dir as command source + const loader = new FileCommandLoader(null); + + // Mock the getCommandDirectories to return our temp dir + const originalMethod = loader['getCommandDirectories']; + loader['getCommandDirectories'] = () => [{ path: tempDir }]; + + try { + const commands = await loader.loadCommands(new AbortController().signal); + + expect(commands).toHaveLength(1); + expect(commands[0].name).toBe('test-command'); + expect(commands[0].description).toBe('Test markdown command'); + } finally { + // Restore original method + loader['getCommandDirectories'] = originalMethod; + } + }); + + it('should load markdown commands without frontmatter', async () => { + // Create a test markdown command file without frontmatter + const mdContent = 'This is a simple prompt without frontmatter.'; + + const commandPath = path.join(tempDir, 'simple-command.md'); + await fs.writeFile(commandPath, mdContent, 'utf-8'); + + const loader = new FileCommandLoader(null); + const originalMethod = loader['getCommandDirectories']; + loader['getCommandDirectories'] = () => [{ path: tempDir }]; + + try { + const commands = await loader.loadCommands(new AbortController().signal); + + const simpleCommand = commands.find( + (cmd) => cmd.name === 'simple-command', + ); + expect(simpleCommand).toBeDefined(); + expect(simpleCommand?.description).toContain('Custom command from'); + } finally { + loader['getCommandDirectories'] = originalMethod; + } + }); + + it('should load both toml and markdown commands', async () => { + // Create both TOML and Markdown files + const tomlContent = `prompt = "TOML prompt" +description = "TOML command"`; + + const mdContent = `--- +description: Markdown command +--- + +Markdown prompt`; + + await fs.writeFile( + path.join(tempDir, 'toml-cmd.toml'), + tomlContent, + 'utf-8', + ); + await fs.writeFile(path.join(tempDir, 'md-cmd.md'), mdContent, 'utf-8'); + + const loader = new FileCommandLoader(null); + const originalMethod = loader['getCommandDirectories']; + loader['getCommandDirectories'] = () => [{ path: tempDir }]; + + try { + const commands = await loader.loadCommands(new AbortController().signal); + + const tomlCommand = commands.find((cmd) => cmd.name === 'toml-cmd'); + const mdCommand = commands.find((cmd) => cmd.name === 'md-cmd'); + + expect(tomlCommand).toBeDefined(); + expect(tomlCommand?.description).toBe('TOML command'); + + expect(mdCommand).toBeDefined(); + expect(mdCommand?.description).toBe('Markdown command'); + } finally { + loader['getCommandDirectories'] = originalMethod; + } + }); +}); diff --git a/packages/cli/src/services/FileCommandLoader.test.ts b/packages/cli/src/services/FileCommandLoader.test.ts index 50c85e66f..a791f4236 100644 --- a/packages/cli/src/services/FileCommandLoader.test.ts +++ b/packages/cli/src/services/FileCommandLoader.test.ts @@ -662,8 +662,8 @@ describe('FileCommandLoader', () => { const result2 = await commands[2].action?.( createMockCommandContext({ invocation: { - raw: '/deploy', - name: 'deploy', + raw: '/test-ext.deploy', + name: 'test-ext.deploy', args: '', }, }), @@ -812,8 +812,8 @@ describe('FileCommandLoader', () => { const result = await nestedCmd!.action?.( createMockCommandContext({ invocation: { - raw: '/b:c', - name: 'b:c', + raw: '/a.b:c', + name: 'a.b:c', args: '', }, }), diff --git a/packages/cli/src/services/FileCommandLoader.ts b/packages/cli/src/services/FileCommandLoader.ts index 5527aa809..ef81f9e69 100644 --- a/packages/cli/src/services/FileCommandLoader.ts +++ b/packages/cli/src/services/FileCommandLoader.ts @@ -5,34 +5,23 @@ */ import { promises as fs } from 'node:fs'; +import * as fsSync from 'node:fs'; import path from 'node:path'; import toml from '@iarna/toml'; import { glob } from 'glob'; import { z } from 'zod'; import type { Config } from '@qwen-code/qwen-code-core'; -import { Storage } from '@qwen-code/qwen-code-core'; +import { EXTENSIONS_CONFIG_FILENAME, Storage } from '@qwen-code/qwen-code-core'; import type { ICommandLoader } from './types.js'; -import type { - CommandContext, - SlashCommand, - SlashCommandActionReturn, -} from '../ui/commands/types.js'; -import { CommandKind } from '../ui/commands/types.js'; -import { DefaultArgumentProcessor } from './prompt-processors/argumentProcessor.js'; -import type { - IPromptProcessor, - PromptPipelineContent, -} from './prompt-processors/types.js'; import { - SHORTHAND_ARGS_PLACEHOLDER, - SHELL_INJECTION_TRIGGER, - AT_FILE_INJECTION_TRIGGER, -} from './prompt-processors/types.js'; + parseMarkdownCommand, + MarkdownCommandDefSchema, +} from './markdown-command-parser.js'; import { - ConfirmationRequiredError, - ShellProcessor, -} from './prompt-processors/shellProcessor.js'; -import { AtFileProcessor } from './prompt-processors/atFileProcessor.js'; + createSlashCommandFromDefinition, + type CommandDefinition, +} from './command-factory.js'; +import type { SlashCommand } from '../ui/commands/types.js'; interface CommandDirectory { path: string; @@ -96,7 +85,12 @@ export class FileCommandLoader implements ICommandLoader { const commandDirs = this.getCommandDirectories(); for (const dirInfo of commandDirs) { try { - const files = await glob('**/*.toml', { + // Scan both .toml and .md files + const tomlFiles = await glob('**/*.toml', { + ...globOptions, + cwd: dirInfo.path, + }); + const mdFiles = await glob('**/*.md', { ...globOptions, cwd: dirInfo.path, }); @@ -105,18 +99,28 @@ export class FileCommandLoader implements ICommandLoader { return []; } - const commandPromises = files.map((file) => - this.parseAndAdaptFile( + // Process TOML files + const tomlCommandPromises = tomlFiles.map((file) => + this.parseAndAdaptTomlFile( path.join(dirInfo.path, file), dirInfo.path, dirInfo.extensionName, ), ); - const commands = (await Promise.all(commandPromises)).filter( - (cmd): cmd is SlashCommand => cmd !== null, + // Process Markdown files + const mdCommandPromises = mdFiles.map((file) => + this.parseAndAdaptMarkdownFile( + path.join(dirInfo.path, file), + dirInfo.path, + dirInfo.extensionName, + ), ); + const commands = ( + await Promise.all([...tomlCommandPromises, ...mdCommandPromises]) + ).filter((cmd): cmd is SlashCommand => cmd !== null); + // Add all commands without deduplication allCommands.push(...commands); } catch (error) { @@ -159,17 +163,73 @@ export class FileCommandLoader implements ICommandLoader { .filter((ext) => ext.isActive) .sort((a, b) => a.name.localeCompare(b.name)); // Sort alphabetically for deterministic loading - const extensionCommandDirs = activeExtensions.map((ext) => ({ - path: path.join(ext.path, 'commands'), - extensionName: ext.name, - })); + // Collect command directories from each extension + for (const ext of activeExtensions) { + // Get commands paths from extension config + const commandsPaths = this.getExtensionCommandsPaths(ext); - dirs.push(...extensionCommandDirs); + for (const cmdPath of commandsPaths) { + dirs.push({ + path: cmdPath, + extensionName: ext.name, + }); + } + } } return dirs; } + /** + * Get commands paths from an extension. + * Returns paths from config.commands if specified, otherwise defaults to 'commands' directory. + */ + private getExtensionCommandsPaths(ext: { + path: string; + name: string; + }): string[] { + // Try to get extension config + try { + const configPath = path.join(ext.path, EXTENSIONS_CONFIG_FILENAME); + if (fsSync.existsSync(configPath)) { + const configContent = fsSync.readFileSync(configPath, 'utf-8'); + const config = JSON.parse(configContent); + + if (config.commands) { + const commandsArray = Array.isArray(config.commands) + ? config.commands + : [config.commands]; + + return commandsArray + .map((cmdPath: string) => + path.isAbsolute(cmdPath) ? cmdPath : path.join(ext.path, cmdPath), + ) + .filter((cmdPath: string) => { + try { + return fsSync.existsSync(cmdPath); + } catch { + return false; + } + }); + } + } + } catch (error) { + console.warn(`Failed to read extension config for ${ext.name}:`, error); + } + + // Default fallback: use 'commands' directory + const defaultPath = path.join(ext.path, 'commands'); + try { + if (fsSync.existsSync(defaultPath)) { + return [defaultPath]; + } + } catch { + // Ignore + } + + return []; + } + /** * Parses a single .toml file and transforms it into a SlashCommand object. * @param filePath The absolute path to the .toml file. @@ -177,7 +237,7 @@ export class FileCommandLoader implements ICommandLoader { * @param extensionName Optional extension name to prefix commands with. * @returns A promise resolving to a SlashCommand, or null if the file is invalid. */ - private async parseAndAdaptFile( + private async parseAndAdaptTomlFile( filePath: string, baseDir: string, extensionName?: string, @@ -216,104 +276,79 @@ export class FileCommandLoader implements ICommandLoader { const validDef = validationResult.data; - const relativePathWithExt = path.relative(baseDir, filePath); - const relativePath = relativePathWithExt.substring( - 0, - relativePathWithExt.length - 5, // length of '.toml' - ); - const baseCommandName = relativePath - .split(path.sep) - // Sanitize each path segment to prevent ambiguity. Since ':' is our - // namespace separator, we replace any literal colons in filenames - // with underscores to avoid naming conflicts. - .map((segment) => segment.replaceAll(':', '_')) - .join(':'); - - // Add extension name tag for extension commands - const defaultDescription = `Custom command from ${path.basename(filePath)}`; - let description = validDef.description || defaultDescription; - if (extensionName) { - description = `[${extensionName}] ${description}`; - } - - const processors: IPromptProcessor[] = []; - const usesArgs = validDef.prompt.includes(SHORTHAND_ARGS_PLACEHOLDER); - const usesShellInjection = validDef.prompt.includes( - SHELL_INJECTION_TRIGGER, - ); - const usesAtFileInjection = validDef.prompt.includes( - AT_FILE_INJECTION_TRIGGER, - ); - - // 1. @-File Injection (Security First). - // This runs first to ensure we're not executing shell commands that - // could dynamically generate malicious @-paths. - if (usesAtFileInjection) { - processors.push(new AtFileProcessor(baseCommandName)); - } - - // 2. Argument and Shell Injection. - // This runs after file content has been safely injected. - if (usesShellInjection || usesArgs) { - processors.push(new ShellProcessor(baseCommandName)); - } - - // 3. Default Argument Handling. - // Appends the raw invocation if no explicit {{args}} are used. - if (!usesArgs) { - processors.push(new DefaultArgumentProcessor()); - } - - return { - name: baseCommandName, - description, - kind: CommandKind.FILE, + // Use factory to create command + return createSlashCommandFromDefinition( + filePath, + baseDir, + validDef, extensionName, - action: async ( - context: CommandContext, - _args: string, - ): Promise => { - if (!context.invocation) { - console.error( - `[FileCommandLoader] Critical error: Command '${baseCommandName}' was executed without invocation context.`, - ); - return { - type: 'submit_prompt', - content: [{ text: validDef.prompt }], // Fallback to unprocessed prompt - }; - } + '.toml', + ); + } - try { - let processedContent: PromptPipelineContent = [ - { text: validDef.prompt }, - ]; - for (const processor of processors) { - processedContent = await processor.process( - processedContent, - context, - ); - } + /** + * Parses a single .md file and transforms it into a SlashCommand object. + * @param filePath The absolute path to the .md file. + * @param baseDir The root command directory for name calculation. + * @param extensionName Optional extension name to prefix commands with. + * @returns A promise resolving to a SlashCommand, or null if the file is invalid. + */ + private async parseAndAdaptMarkdownFile( + filePath: string, + baseDir: string, + extensionName?: string, + ): Promise { + let fileContent: string; + try { + fileContent = await fs.readFile(filePath, 'utf-8'); + } catch (error: unknown) { + console.error( + `[FileCommandLoader] Failed to read file ${filePath}:`, + error instanceof Error ? error.message : String(error), + ); + return null; + } - return { - type: 'submit_prompt', - content: processedContent, - }; - } catch (e) { - // Check if it's our specific error type - if (e instanceof ConfirmationRequiredError) { - // Halt and request confirmation from the UI layer. - return { - type: 'confirm_shell_commands', - commandsToConfirm: e.commandsToConfirm, - originalInvocation: { - raw: context.invocation.raw, - }, - }; - } - // Re-throw other errors to be handled by the global error handler. - throw e; - } - }, + let parsed: ReturnType; + try { + parsed = parseMarkdownCommand(fileContent); + } catch (error: unknown) { + console.error( + `[FileCommandLoader] Failed to parse Markdown file ${filePath}:`, + error instanceof Error ? error.message : String(error), + ); + return null; + } + + const validationResult = MarkdownCommandDefSchema.safeParse(parsed); + + if (!validationResult.success) { + console.error( + `[FileCommandLoader] Skipping invalid command file: ${filePath}. Validation errors:`, + validationResult.error.flatten(), + ); + return null; + } + + const validDef = validationResult.data; + + // Convert to CommandDefinition format + const definition: CommandDefinition = { + prompt: validDef.prompt, + description: + validDef.frontmatter?.description && + typeof validDef.frontmatter.description === 'string' + ? validDef.frontmatter.description + : undefined, }; + + // Use factory to create command + return createSlashCommandFromDefinition( + filePath, + baseDir, + definition, + extensionName, + '.md', + ); } } diff --git a/packages/cli/src/services/command-factory.ts b/packages/cli/src/services/command-factory.ts new file mode 100644 index 000000000..95eec70c3 --- /dev/null +++ b/packages/cli/src/services/command-factory.ts @@ -0,0 +1,154 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +/** + * This file contains helper functions for FileCommandLoader to create SlashCommand + * objects from parsed command definitions (TOML or Markdown). + */ + +import path from 'node:path'; +import type { + CommandContext, + SlashCommand, + SlashCommandActionReturn, +} from '../ui/commands/types.js'; +import { CommandKind } from '../ui/commands/types.js'; +import { DefaultArgumentProcessor } from './prompt-processors/argumentProcessor.js'; +import type { + IPromptProcessor, + PromptPipelineContent, +} from './prompt-processors/types.js'; +import { + SHORTHAND_ARGS_PLACEHOLDER, + SHELL_INJECTION_TRIGGER, + AT_FILE_INJECTION_TRIGGER, +} from './prompt-processors/types.js'; +import { + ConfirmationRequiredError, + ShellProcessor, +} from './prompt-processors/shellProcessor.js'; +import { AtFileProcessor } from './prompt-processors/atFileProcessor.js'; + +export interface CommandDefinition { + prompt: string; + description?: string; +} + +/** + * Creates a SlashCommand from a parsed command definition. + * This function is used by both TOML and Markdown command loaders. + * + * @param filePath The absolute path to the command file + * @param baseDir The root command directory for name calculation + * @param definition The parsed command definition (prompt and optional description) + * @param extensionName Optional extension name to prefix commands with + * @param fileExtension The file extension (e.g., '.toml' or '.md') + * @returns A SlashCommand object + */ +export function createSlashCommandFromDefinition( + filePath: string, + baseDir: string, + definition: CommandDefinition, + extensionName: string | undefined, + fileExtension: string, +): SlashCommand { + const relativePathWithExt = path.relative(baseDir, filePath); + const relativePath = relativePathWithExt.substring( + 0, + relativePathWithExt.length - fileExtension.length, + ); + const baseCommandName = relativePath + .split(path.sep) + // Sanitize each path segment to prevent ambiguity. Since ':' is our + // namespace separator, we replace any literal colons in filenames + // with underscores to avoid naming conflicts. + .map((segment) => segment.replaceAll(':', '_')) + .join(':'); + + // Add extension name tag for extension commands + const defaultDescription = `Custom command from ${path.basename(filePath)}`; + let description = definition.description || defaultDescription; + if (extensionName) { + description = `[${extensionName}] ${description}`; + } + + const processors: IPromptProcessor[] = []; + const usesArgs = definition.prompt.includes(SHORTHAND_ARGS_PLACEHOLDER); + const usesShellInjection = definition.prompt.includes( + SHELL_INJECTION_TRIGGER, + ); + const usesAtFileInjection = definition.prompt.includes( + AT_FILE_INJECTION_TRIGGER, + ); + + // 1. @-File Injection (Security First). + // This runs first to ensure we're not executing shell commands that + // could dynamically generate malicious @-paths. + if (usesAtFileInjection) { + processors.push(new AtFileProcessor(baseCommandName)); + } + + // 2. Argument and Shell Injection. + // This runs after file content has been safely injected. + if (usesShellInjection || usesArgs) { + processors.push(new ShellProcessor(baseCommandName)); + } + + // 3. Default Argument Handling. + // Appends the raw invocation if no explicit {{args}} are used. + if (!usesArgs) { + processors.push(new DefaultArgumentProcessor()); + } + + return { + name: baseCommandName, + description, + kind: CommandKind.FILE, + extensionName, + action: async ( + context: CommandContext, + _args: string, + ): Promise => { + if (!context.invocation) { + console.error( + `[FileCommandLoader] Critical error: Command '${baseCommandName}' was executed without invocation context.`, + ); + return { + type: 'submit_prompt', + content: [{ text: definition.prompt }], // Fallback to unprocessed prompt + }; + } + + try { + let processedContent: PromptPipelineContent = [ + { text: definition.prompt }, + ]; + for (const processor of processors) { + processedContent = await processor.process(processedContent, context); + } + + return { + type: 'submit_prompt', + content: processedContent, + }; + } catch (e) { + // Check if it's our specific error type + if (e instanceof ConfirmationRequiredError) { + // Halt and request confirmation from the UI layer. + return { + type: 'confirm_shell_commands', + commandsToConfirm: e.commandsToConfirm, + originalInvocation: { + raw: context.invocation.raw, + }, + }; + } + // Re-throw other errors to be handled by the global error handler. + throw e; + } + }, + }; +} diff --git a/packages/cli/src/services/command-migration-tool.test.ts b/packages/cli/src/services/command-migration-tool.test.ts new file mode 100644 index 000000000..618a38f94 --- /dev/null +++ b/packages/cli/src/services/command-migration-tool.test.ts @@ -0,0 +1,254 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { describe, it, expect, beforeEach, afterEach } from 'vitest'; +import { promises as fs } from 'node:fs'; +import path from 'node:path'; +import os from 'node:os'; +import { + detectTomlCommands, + migrateTomlCommands, + generateMigrationPrompt, +} from './command-migration-tool.js'; + +describe('command-migration-tool', () => { + let tempDir: string; + + beforeEach(async () => { + tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'qwen-migration-test-')); + }); + + afterEach(async () => { + await fs.rm(tempDir, { recursive: true, force: true }); + }); + + describe('detectTomlCommands', () => { + it('should detect TOML files in directory', async () => { + // Create some TOML files + await fs.writeFile( + path.join(tempDir, 'cmd1.toml'), + 'prompt = "test"', + 'utf-8', + ); + await fs.writeFile( + path.join(tempDir, 'cmd2.toml'), + 'prompt = "test"', + 'utf-8', + ); + + const tomlFiles = await detectTomlCommands(tempDir); + + expect(tomlFiles).toHaveLength(2); + expect(tomlFiles).toContain('cmd1.toml'); + expect(tomlFiles).toContain('cmd2.toml'); + }); + + it('should detect TOML files in subdirectories', async () => { + const subdir = path.join(tempDir, 'subdir'); + await fs.mkdir(subdir); + await fs.writeFile( + path.join(subdir, 'nested.toml'), + 'prompt = "test"', + 'utf-8', + ); + + const tomlFiles = await detectTomlCommands(tempDir); + + expect(tomlFiles).toHaveLength(1); + expect(tomlFiles[0]).toContain('nested.toml'); + }); + + it('should return empty array for non-existent directory', async () => { + const nonExistent = path.join(tempDir, 'does-not-exist'); + + const tomlFiles = await detectTomlCommands(nonExistent); + + expect(tomlFiles).toEqual([]); + }); + + it('should not detect non-TOML files', async () => { + await fs.writeFile(path.join(tempDir, 'file.txt'), 'text', 'utf-8'); + await fs.writeFile(path.join(tempDir, 'file.md'), 'markdown', 'utf-8'); + + const tomlFiles = await detectTomlCommands(tempDir); + + expect(tomlFiles).toHaveLength(0); + }); + }); + + describe('migrateTomlCommands', () => { + it('should migrate TOML file to Markdown', async () => { + const tomlContent = `prompt = "Test prompt" +description = "Test description"`; + + await fs.writeFile(path.join(tempDir, 'test.toml'), tomlContent, 'utf-8'); + + const result = await migrateTomlCommands({ + commandDir: tempDir, + createBackup: true, + deleteOriginal: false, + }); + + expect(result.success).toBe(true); + expect(result.convertedFiles).toContain('test.toml'); + expect(result.failedFiles).toHaveLength(0); + + // Check Markdown file was created + const mdPath = path.join(tempDir, 'test.md'); + const mdContent = await fs.readFile(mdPath, 'utf-8'); + expect(mdContent).toContain('description: Test description'); + expect(mdContent).toContain('Test prompt'); + + // Check backup was created (original renamed to .toml.backup) + const backupPath = path.join(tempDir, 'test.toml.backup'); + const backupExists = await fs + .access(backupPath) + .then(() => true) + .catch(() => false); + expect(backupExists).toBe(true); + + // Original .toml file should not exist (renamed to .backup) + const tomlExists = await fs + .access(path.join(tempDir, 'test.toml')) + .then(() => true) + .catch(() => false); + expect(tomlExists).toBe(false); + }); + + it('should delete original TOML when deleteOriginal is true', async () => { + await fs.writeFile( + path.join(tempDir, 'delete-me.toml'), + 'prompt = "Test"', + 'utf-8', + ); + + await migrateTomlCommands({ + commandDir: tempDir, + createBackup: false, + deleteOriginal: true, + }); + + // Original should be deleted + const tomlExists = await fs + .access(path.join(tempDir, 'delete-me.toml')) + .then(() => true) + .catch(() => false); + expect(tomlExists).toBe(false); + + // Markdown should exist + const mdExists = await fs + .access(path.join(tempDir, 'delete-me.md')) + .then(() => true) + .catch(() => false); + expect(mdExists).toBe(true); + + // Backup should not exist (createBackup was false) + const backupExists = await fs + .access(path.join(tempDir, 'delete-me.toml.backup')) + .then(() => true) + .catch(() => false); + expect(backupExists).toBe(false); + }); + + it('should fail if Markdown file already exists', async () => { + await fs.writeFile( + path.join(tempDir, 'existing.toml'), + 'prompt = "Test"', + 'utf-8', + ); + await fs.writeFile( + path.join(tempDir, 'existing.md'), + 'Already exists', + 'utf-8', + ); + + const result = await migrateTomlCommands({ + commandDir: tempDir, + createBackup: false, + }); + + expect(result.success).toBe(false); + expect(result.failedFiles).toHaveLength(1); + expect(result.failedFiles[0].file).toBe('existing.toml'); + expect(result.failedFiles[0].error).toContain('already exists'); + }); + + it('should handle migration without backup', async () => { + await fs.writeFile( + path.join(tempDir, 'no-backup.toml'), + 'prompt = "Test"', + 'utf-8', + ); + + const result = await migrateTomlCommands({ + commandDir: tempDir, + createBackup: false, + deleteOriginal: false, + }); + + expect(result.success).toBe(true); + + // Original TOML file should still exist (no backup, no delete) + const tomlExists = await fs + .access(path.join(tempDir, 'no-backup.toml')) + .then(() => true) + .catch(() => false); + expect(tomlExists).toBe(true); + + // Backup should not exist + const backupExists = await fs + .access(path.join(tempDir, 'no-backup.toml.backup')) + .then(() => true) + .catch(() => false); + expect(backupExists).toBe(false); + }); + + it('should return success with empty results for no TOML files', async () => { + const result = await migrateTomlCommands({ + commandDir: tempDir, + }); + + expect(result.success).toBe(true); + expect(result.convertedFiles).toHaveLength(0); + expect(result.failedFiles).toHaveLength(0); + }); + }); + + describe('generateMigrationPrompt', () => { + it('should generate prompt for few files', () => { + const files = ['cmd1.toml', 'cmd2.toml']; + + const prompt = generateMigrationPrompt(files); + + expect(prompt).toContain('Found 2 command file(s)'); + expect(prompt).toContain('cmd1.toml'); + expect(prompt).toContain('cmd2.toml'); + expect(prompt).toContain('qwen-code migrate-commands'); + }); + + it('should truncate file list for many files', () => { + const files = Array.from({ length: 10 }, (_, i) => `cmd${i}.toml`); + + const prompt = generateMigrationPrompt(files); + + expect(prompt).toContain('Found 10 command file(s)'); + expect(prompt).toContain('... and 7 more'); + }); + + it('should return empty string for no files', () => { + const prompt = generateMigrationPrompt([]); + + expect(prompt).toBe(''); + }); + + it('should use singular form for single file', () => { + const prompt = generateMigrationPrompt(['single.toml']); + + expect(prompt).toContain('Found 1 command file'); + // Don't check for plural since "files" appears in other parts of the message + }); + }); +}); diff --git a/packages/cli/src/services/command-migration-tool.ts b/packages/cli/src/services/command-migration-tool.ts new file mode 100644 index 000000000..68324ed17 --- /dev/null +++ b/packages/cli/src/services/command-migration-tool.ts @@ -0,0 +1,173 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +/** + * Tool for migrating TOML commands to Markdown format. + */ + +import { promises as fs } from 'node:fs'; +import path from 'node:path'; +import { glob } from 'glob'; +import { convertTomlToMarkdown } from '@qwen-code/qwen-code-core'; +import { t } from '../i18n/index.js'; + +export interface MigrationResult { + success: boolean; + convertedFiles: string[]; + failedFiles: Array<{ file: string; error: string }>; +} + +export interface MigrationOptions { + /** Directory containing command files */ + commandDir: string; + /** Whether to create backups (default: true) */ + createBackup?: boolean; + /** Whether to delete original TOML files after migration (default: false) */ + deleteOriginal?: boolean; +} + +/** + * Scans a directory for TOML command files. + * @param commandDir Directory to scan + * @returns Array of TOML file paths (relative to commandDir) + */ +export async function detectTomlCommands( + commandDir: string, +): Promise { + try { + await fs.access(commandDir); + } catch { + // Directory doesn't exist + return []; + } + + const tomlFiles = await glob('**/*.toml', { + cwd: commandDir, + nodir: true, + dot: false, + }); + + return tomlFiles; +} + +/** + * Migrates TOML command files to Markdown format. + * @param options Migration options + * @returns Migration result with details + */ +export async function migrateTomlCommands( + options: MigrationOptions, +): Promise { + const { commandDir, createBackup = true, deleteOriginal = false } = options; + + const result: MigrationResult = { + success: true, + convertedFiles: [], + failedFiles: [], + }; + + // Detect TOML files + const tomlFiles = await detectTomlCommands(commandDir); + + if (tomlFiles.length === 0) { + return result; + } + + // Process each TOML file + for (const relativeFile of tomlFiles) { + const tomlPath = path.join(commandDir, relativeFile); + + try { + // Read TOML file + const tomlContent = await fs.readFile(tomlPath, 'utf-8'); + + // Convert to Markdown + const markdownContent = convertTomlToMarkdown(tomlContent); + + // Generate Markdown file path (same location, .md extension) + const markdownPath = tomlPath.replace(/\.toml$/, '.md'); + + // Check if Markdown file already exists + try { + await fs.access(markdownPath); + throw new Error( + t('Markdown file already exists: {{filename}}', { + filename: path.basename(markdownPath), + }), + ); + } catch (error) { + if ((error as NodeJS.ErrnoException).code !== 'ENOENT') { + throw error; + } + // File doesn't exist, continue + } + + // Write Markdown file + await fs.writeFile(markdownPath, markdownContent, 'utf-8'); + + // Backup original if requested (rename to .toml.backup) + if (createBackup) { + const backupPath = `${tomlPath}.backup`; + await fs.rename(tomlPath, backupPath); + } else if (deleteOriginal) { + // Delete original if requested and no backup + await fs.unlink(tomlPath); + } + + result.convertedFiles.push(relativeFile); + } catch (error) { + result.success = false; + result.failedFiles.push({ + file: relativeFile, + error: error instanceof Error ? error.message : String(error), + }); + } + } + + return result; +} + +/** + * Generates a migration report message. + * @param tomlFiles List of TOML files found + * @returns Human-readable migration prompt message + */ +export function generateMigrationPrompt(tomlFiles: string[]): string { + if (tomlFiles.length === 0) { + return ''; + } + + const count = tomlFiles.length; + const moreCount = tomlFiles.length - 3; + const fileList = + tomlFiles.length <= 5 + ? tomlFiles.map((f) => ` - ${f}`).join('\n') + : ` - ${tomlFiles.slice(0, 3).join('\n - ')}\n - ${t('... and {{count}} more', { count: String(moreCount) })}`; + + return ` +⚠️ ${t('TOML Command Format Deprecation Notice')} + +${t('Found {{count}} command file(s) in TOML format:', { count: String(count) })} +${fileList} + +${t('The TOML format for commands is being deprecated in favor of Markdown format.')} +${t('Markdown format is more readable and easier to edit.')} + +${t('You can migrate these files automatically using:')} + qwen-code migrate-commands + +${t('Or manually convert each file:')} + - ${t('TOML: prompt = "..." / description = "..."')} + - ${t('Markdown: YAML frontmatter + content')} + +${t('The migration tool will:')} + ✓ ${t('Convert TOML files to Markdown')} + ✓ ${t('Create backups of original files')} + ✓ ${t('Preserve all command functionality')} + +${t('TOML format will continue to work for now, but migration is recommended.')} +`.trim(); +} diff --git a/packages/cli/src/services/lsp/LspConnectionFactory.ts b/packages/cli/src/services/lsp/LspConnectionFactory.ts index 056afc91f..1a1acc059 100644 --- a/packages/cli/src/services/lsp/LspConnectionFactory.ts +++ b/packages/cli/src/services/lsp/LspConnectionFactory.ts @@ -323,13 +323,19 @@ export class LspConnectionFactory { timeoutMs = 10000, ): Promise { return new Promise((resolve, reject) => { - const socketOptions = options.path - ? { path: options.path } - : { host: options.host ?? '127.0.0.1', port: options.port }; + let socketOptions: { path: string } | { host: string; port: number }; - if (!('path' in socketOptions) && !socketOptions.port) { - reject(new Error('Socket transport requires port or path')); - return; + if (options.path) { + socketOptions = { path: options.path }; + } else { + if (!options.port) { + reject(new Error('Socket transport requires port or path')); + return; + } + socketOptions = { + host: options.host ?? '127.0.0.1', + port: options.port, + }; } const socket = net.createConnection(socketOptions); diff --git a/packages/cli/src/services/lsp/NativeLspService.integration.test.ts b/packages/cli/src/services/lsp/NativeLspService.integration.test.ts index 54c00aa25..0f65e70cb 100644 --- a/packages/cli/src/services/lsp/NativeLspService.integration.test.ts +++ b/packages/cli/src/services/lsp/NativeLspService.integration.test.ts @@ -15,16 +15,13 @@ import type { 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': { + initialize: { capabilities: { textDocumentSync: 1, completionProvider: {}, @@ -72,7 +69,8 @@ const MOCK_LSP_RESPONSES = { 'textDocument/hover': { contents: { kind: 'markdown', - value: '```typescript\nfunction testFunc(): void\n```\n\nA test function.', + value: + '```typescript\nfunction testFunc(): void\n```\n\nA test function.', }, range: { start: { line: 10, character: 0 }, @@ -305,7 +303,8 @@ const MOCK_LSP_RESPONSES = { start: { line: 0, character: 0 }, end: { line: 5, character: 0 }, }, - newText: "import { Component } from 'react';\nimport { helper } from './utils';\n", + newText: + "import { Component } from 'react';\nimport { helper } from './utils';\n", }, ], }, @@ -473,7 +472,7 @@ describe('NativeLspService Integration Tests', () => { 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); @@ -494,7 +493,7 @@ describe('NativeLspService Integration Tests', () => { await restrictedService.discoverAndPrepare(); const status = restrictedService.getStatus(); - + // Only allowed servers should be READY const readyServers = Array.from(status.entries()) .filter(([, state]) => state === 'READY') @@ -519,7 +518,7 @@ describe('NativeLspService Integration Tests', () => { 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); @@ -613,7 +612,7 @@ describe('NativeLspService Integration Tests', () => { 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'); @@ -653,9 +652,9 @@ describe('NativeLspService Integration Tests', () => { 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), - ); + const filteredActions = MOCK_LSP_RESPONSES[ + 'textDocument/codeAction' + ].filter((action) => kinds.includes(action.kind)); expect(filteredActions).toHaveLength(2); }); @@ -671,14 +670,15 @@ describe('NativeLspService Integration Tests', () => { 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]; + + const changes = edit?.changes as Record; + const uri = Object.keys(changes ?? {})[0]; expect(uri).toContain('app.tsx'); - - const edits = edit?.changes?.[uri]; + + const edits = changes?.[uri]; expect(edits).toHaveLength(1); expect(edits?.[0]).toHaveProperty('range'); expect(edits?.[0]).toHaveProperty('newText'); @@ -733,7 +733,7 @@ describe('NativeLspService Integration Tests', () => { 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, @@ -747,14 +747,14 @@ describe('NativeLspService Integration Tests', () => { 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(); diff --git a/packages/cli/src/services/lsp/NativeLspService.ts b/packages/cli/src/services/lsp/NativeLspService.ts index 18ecaa276..a19fe49af 100644 --- a/packages/cli/src/services/lsp/NativeLspService.ts +++ b/packages/cli/src/services/lsp/NativeLspService.ts @@ -776,10 +776,7 @@ export class NativeLspService { } 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, - ); + console.warn(`LSP textDocument/diagnostic failed for ${name}:`, error); } } @@ -833,10 +830,7 @@ export class NativeLspService { } } } catch (error) { - console.warn( - `LSP workspace/diagnostic failed for ${name}:`, - error, - ); + console.warn(`LSP workspace/diagnostic failed for ${name}:`, error); } if (results.length >= limit) { @@ -872,7 +866,7 @@ export class NativeLspService { await this.warmupTypescriptServer(handle); // Convert context diagnostics to LSP format - const lspDiagnostics = context.diagnostics.map((d) => + const lspDiagnostics = context.diagnostics.map((d: LspDiagnostic) => this.denormalizeDiagnostic(d), ); @@ -911,10 +905,7 @@ export class NativeLspService { return actions.slice(0, limit); } } catch (error) { - console.warn( - `LSP textDocument/codeAction failed for ${name}:`, - error, - ); + console.warn(`LSP textDocument/codeAction failed for ${name}:`, error); } } @@ -926,20 +917,23 @@ export class NativeLspService { */ async applyWorkspaceEdit( edit: LspWorkspaceEdit, - serverName?: string, + _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); + await this.applyTextEdits(uri, edits as LspTextEdit[]); } } if (edit.documentChanges) { for (const docChange of edit.documentChanges) { - await this.applyTextEdits(docChange.textDocument.uri, docChange.edits); + await this.applyTextEdits( + docChange.textDocument.uri, + docChange.edits, + ); } } @@ -1201,7 +1195,11 @@ export class NativeLspService { const itemObj = item as Record; // Check if this is a Command instead of CodeAction - if (itemObj['command'] && typeof itemObj['title'] === 'string' && !itemObj['kind']) { + if ( + itemObj['command'] && + typeof itemObj['title'] === 'string' && + !itemObj['kind'] + ) { // This is a raw Command, wrap it return { title: itemObj['title'] as string, @@ -1259,9 +1257,7 @@ export class NativeLspService { /** * 规范化工作区编辑 */ - private normalizeWorkspaceEdit( - edit: unknown, - ): LspWorkspaceEdit | null { + private normalizeWorkspaceEdit(edit: unknown): LspWorkspaceEdit | null { if (!edit || typeof edit !== 'object') { return null; } @@ -1335,9 +1331,10 @@ export class NativeLspService { /** * 规范化文本文档编辑 */ - private normalizeTextDocumentEdit( - docEdit: unknown, - ): { textDocument: { uri: string; version?: number | null }; edits: LspTextEdit[] } | null { + private normalizeTextDocumentEdit(docEdit: unknown): { + textDocument: { uri: string; version?: number | null }; + edits: LspTextEdit[]; + } | null { if (!docEdit || typeof docEdit !== 'object') { return null; } diff --git a/packages/cli/src/services/markdown-command-parser.test.ts b/packages/cli/src/services/markdown-command-parser.test.ts new file mode 100644 index 000000000..4de35f0ea --- /dev/null +++ b/packages/cli/src/services/markdown-command-parser.test.ts @@ -0,0 +1,144 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { describe, it, expect } from 'vitest'; +import { + parseMarkdownCommand, + MarkdownCommandDefSchema, +} from './markdown-command-parser.js'; + +describe('parseMarkdownCommand', () => { + it('should parse markdown with YAML frontmatter', () => { + const content = `--- +description: Test command +--- + +This is the prompt content.`; + + const result = parseMarkdownCommand(content); + + expect(result).toEqual({ + frontmatter: { + description: 'Test command', + }, + prompt: 'This is the prompt content.', + }); + }); + + it('should parse markdown without frontmatter', () => { + const content = 'This is just a prompt without frontmatter.'; + + const result = parseMarkdownCommand(content); + + expect(result).toEqual({ + prompt: 'This is just a prompt without frontmatter.', + }); + }); + + it('should handle multi-line prompts', () => { + const content = `--- +description: Multi-line test +--- + +First line of prompt. +Second line of prompt. +Third line of prompt.`; + + const result = parseMarkdownCommand(content); + + expect(result.prompt).toBe( + 'First line of prompt.\nSecond line of prompt.\nThird line of prompt.', + ); + }); + + it('should trim whitespace from prompt', () => { + const content = `--- +description: Whitespace test +--- + + Prompt with leading and trailing spaces +`; + + const result = parseMarkdownCommand(content); + + expect(result.prompt).toBe('Prompt with leading and trailing spaces'); + }); + + it('should handle empty frontmatter', () => { + const content = `--- +--- + +Prompt content after empty frontmatter.`; + + const result = parseMarkdownCommand(content); + + // Empty YAML frontmatter returns undefined, not {} + expect(result.frontmatter).toBeUndefined(); + expect(result.prompt).toBe('Prompt content after empty frontmatter.'); + }); + + it('should handle invalid YAML frontmatter gracefully', () => { + // The YAML parser we use is quite tolerant, so most "invalid" YAML + // actually parses successfully. This test verifies that behavior. + const content = `--- +description: test +--- + +Prompt content.`; + + const result = parseMarkdownCommand(content); + + expect(result.frontmatter).toBeDefined(); + expect(result.prompt).toBe('Prompt content.'); + }); +}); + +describe('MarkdownCommandDefSchema', () => { + it('should validate valid markdown command def', () => { + const validDef = { + frontmatter: { + description: 'Test description', + }, + prompt: 'Test prompt', + }; + + const result = MarkdownCommandDefSchema.safeParse(validDef); + + expect(result.success).toBe(true); + }); + + it('should validate markdown command def without frontmatter', () => { + const validDef = { + prompt: 'Test prompt', + }; + + const result = MarkdownCommandDefSchema.safeParse(validDef); + + expect(result.success).toBe(true); + }); + + it('should reject command def without prompt', () => { + const invalidDef = { + frontmatter: { + description: 'Test description', + }, + }; + + const result = MarkdownCommandDefSchema.safeParse(invalidDef); + + expect(result.success).toBe(false); + }); + + it('should reject command def with non-string prompt', () => { + const invalidDef = { + prompt: 123, + }; + + const result = MarkdownCommandDefSchema.safeParse(invalidDef); + + expect(result.success).toBe(false); + }); +}); diff --git a/packages/cli/src/services/markdown-command-parser.ts b/packages/cli/src/services/markdown-command-parser.ts new file mode 100644 index 000000000..5b6ed38bf --- /dev/null +++ b/packages/cli/src/services/markdown-command-parser.ts @@ -0,0 +1,64 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { z } from 'zod'; +import { parse as parseYaml } from '@qwen-code/qwen-code-core'; + +/** + * Defines the Zod schema for a Markdown command definition file. + * The frontmatter contains optional metadata, and the body is the prompt. + */ +export const MarkdownCommandDefSchema = z.object({ + frontmatter: z + .object({ + description: z.string().optional(), + }) + .optional(), + prompt: z.string({ + required_error: 'The prompt content is required.', + invalid_type_error: 'The prompt content must be a string.', + }), +}); + +export type MarkdownCommandDef = z.infer; + +/** + * Parses a Markdown command file with optional YAML frontmatter. + * @param content The file content + * @returns Parsed command definition with frontmatter and prompt + */ +export function parseMarkdownCommand(content: string): MarkdownCommandDef { + // Match YAML frontmatter pattern: ---\n...\n---\n + // Allow empty frontmatter: ---\n---\n // Use (?:[\s\S]*?) to make the frontmatter content optional + const frontmatterRegex = /^---\n([\s\S]*?)---\n([\s\S]*)$/; + const match = content.match(frontmatterRegex); + + if (!match) { + // No frontmatter, entire content is the prompt + return { + prompt: content.trim(), + }; + } + + const [, frontmatterYaml, body] = match; + + // Parse YAML frontmatter if not empty + let frontmatter: Record | undefined; + if (frontmatterYaml.trim()) { + try { + frontmatter = parseYaml(frontmatterYaml) as Record; + } catch (error) { + throw new Error( + `Failed to parse YAML frontmatter: ${error instanceof Error ? error.message : String(error)}`, + ); + } + } + + return { + frontmatter, + prompt: body.trim(), + }; +} diff --git a/packages/cli/src/services/test-commands/example.md b/packages/cli/src/services/test-commands/example.md new file mode 100644 index 000000000..c876a6700 --- /dev/null +++ b/packages/cli/src/services/test-commands/example.md @@ -0,0 +1,5 @@ +--- +description: Example markdown command +--- + +This is an example prompt from a markdown file. diff --git a/packages/cli/src/test-utils/createExtension.ts b/packages/cli/src/test-utils/createExtension.ts deleted file mode 100644 index cf20c4889..000000000 --- a/packages/cli/src/test-utils/createExtension.ts +++ /dev/null @@ -1,49 +0,0 @@ -/** - * @license - * Copyright 2025 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -import * as fs from 'node:fs'; -import * as path from 'node:path'; -import { - EXTENSIONS_CONFIG_FILENAME, - INSTALL_METADATA_FILENAME, -} from '../config/extension.js'; -import { - type MCPServerConfig, - type ExtensionInstallMetadata, -} from '@qwen-code/qwen-code-core'; - -export function createExtension({ - extensionsDir = 'extensions-dir', - name = 'my-extension', - version = '1.0.0', - addContextFile = false, - contextFileName = undefined as string | undefined, - mcpServers = {} as Record, - installMetadata = undefined as ExtensionInstallMetadata | undefined, -} = {}): string { - const extDir = path.join(extensionsDir, name); - fs.mkdirSync(extDir, { recursive: true }); - fs.writeFileSync( - path.join(extDir, EXTENSIONS_CONFIG_FILENAME), - JSON.stringify({ name, version, contextFileName, mcpServers }), - ); - - if (addContextFile) { - fs.writeFileSync(path.join(extDir, 'QWEN.md'), 'context'); - } - - if (contextFileName) { - fs.writeFileSync(path.join(extDir, contextFileName), 'context'); - } - - if (installMetadata) { - fs.writeFileSync( - path.join(extDir, INSTALL_METADATA_FILENAME), - JSON.stringify(installMetadata), - ); - } - return extDir; -} diff --git a/packages/cli/src/ui/App.tsx b/packages/cli/src/ui/App.tsx index ea8482a16..54684a8c2 100644 --- a/packages/cli/src/ui/App.tsx +++ b/packages/cli/src/ui/App.tsx @@ -5,34 +5,15 @@ */ import { useIsScreenReaderEnabled } from 'ink'; -import { useTerminalSize } from './hooks/useTerminalSize.js'; -import { lerp } from '../utils/math.js'; import { useUIState } from './contexts/UIStateContext.js'; import { StreamingContext } from './contexts/StreamingContext.js'; import { QuittingDisplay } from './components/QuittingDisplay.js'; import { ScreenReaderAppLayout } from './layouts/ScreenReaderAppLayout.js'; import { DefaultAppLayout } from './layouts/DefaultAppLayout.js'; -const getContainerWidth = (terminalWidth: number): string => { - if (terminalWidth <= 80) { - return '98%'; - } - if (terminalWidth >= 132) { - return '90%'; - } - - // Linearly interpolate between 80 columns (98%) and 132 columns (90%). - const t = (terminalWidth - 80) / (132 - 80); - const percentage = lerp(98, 90, t); - - return `${Math.round(percentage)}%`; -}; - export const App = () => { const uiState = useUIState(); const isScreenReaderEnabled = useIsScreenReaderEnabled(); - const { columns } = useTerminalSize(); - const containerWidth = getContainerWidth(columns); if (uiState.quittingMessages) { return ; @@ -40,11 +21,7 @@ export const App = () => { return ( - {isScreenReaderEnabled ? ( - - ) : ( - - )} + {isScreenReaderEnabled ? : } ); }; diff --git a/packages/cli/src/ui/AppContainer.test.tsx b/packages/cli/src/ui/AppContainer.test.tsx index 60426f1dd..5e035d2be 100644 --- a/packages/cli/src/ui/AppContainer.test.tsx +++ b/packages/cli/src/ui/AppContainer.test.tsx @@ -76,7 +76,6 @@ vi.mock('./hooks/useFolderTrust.js'); vi.mock('./hooks/useIdeTrustListener.js'); vi.mock('./hooks/useMessageQueue.js'); vi.mock('./hooks/useAutoAcceptIndicator.js'); -vi.mock('./hooks/useWorkspaceMigration.js'); vi.mock('./hooks/useGitBranchName.js'); vi.mock('./contexts/VimModeContext.js'); vi.mock('./contexts/SessionContext.js'); @@ -103,7 +102,6 @@ import { useFolderTrust } from './hooks/useFolderTrust.js'; import { useIdeTrustListener } from './hooks/useIdeTrustListener.js'; import { useMessageQueue } from './hooks/useMessageQueue.js'; import { useAutoAcceptIndicator } from './hooks/useAutoAcceptIndicator.js'; -import { useWorkspaceMigration } from './hooks/useWorkspaceMigration.js'; import { useGitBranchName } from './hooks/useGitBranchName.js'; import { useVimMode } from './contexts/VimModeContext.js'; import { useSessionStats } from './contexts/SessionContext.js'; @@ -134,7 +132,6 @@ describe('AppContainer State Management', () => { const mockedUseIdeTrustListener = useIdeTrustListener as Mock; const mockedUseMessageQueue = useMessageQueue as Mock; const mockedUseAutoAcceptIndicator = useAutoAcceptIndicator as Mock; - const mockedUseWorkspaceMigration = useWorkspaceMigration as Mock; const mockedUseGitBranchName = useGitBranchName as Mock; const mockedUseVimMode = useVimMode as Mock; const mockedUseSessionStats = useSessionStats as Mock; @@ -239,12 +236,6 @@ describe('AppContainer State Management', () => { getQueuedMessagesText: vi.fn().mockReturnValue(''), }); mockedUseAutoAcceptIndicator.mockReturnValue(false); - mockedUseWorkspaceMigration.mockReturnValue({ - showWorkspaceMigrationDialog: false, - workspaceExtensions: [], - onWorkspaceMigrationDialogOpen: vi.fn(), - onWorkspaceMigrationDialogClose: vi.fn(), - }); mockedUseGitBranchName.mockReturnValue('main'); mockedUseVimMode.mockReturnValue({ isVimEnabled: false, @@ -294,10 +285,7 @@ describe('AppContainer State Management', () => { // Mock LoadedSettings mockSettings = { merged: { - hideBanner: false, - hideFooter: false, hideTips: false, - showMemoryUsage: false, theme: 'default', ui: { showStatusInTitle: false, @@ -445,10 +433,7 @@ describe('AppContainer State Management', () => { it('handles settings with all display options disabled', () => { const settingsAllHidden = { merged: { - hideBanner: true, - hideFooter: true, hideTips: true, - showMemoryUsage: false, }, } as unknown as LoadedSettings; @@ -463,28 +448,6 @@ describe('AppContainer State Management', () => { ); }).not.toThrow(); }); - - it('handles settings with memory usage enabled', () => { - const settingsWithMemory = { - merged: { - hideBanner: false, - hideFooter: false, - hideTips: false, - showMemoryUsage: true, - }, - } as unknown as LoadedSettings; - - expect(() => { - render( - , - ); - }).not.toThrow(); - }); }); describe('Version Handling', () => { diff --git a/packages/cli/src/ui/AppContainer.tsx b/packages/cli/src/ui/AppContainer.tsx index 909d2beec..c1bd7b80c 100644 --- a/packages/cli/src/ui/AppContainer.tsx +++ b/packages/cli/src/ui/AppContainer.tsx @@ -37,6 +37,7 @@ import { getErrorMessage, getAllGeminiMdFilenames, ShellExecutionService, + Storage, } from '@qwen-code/qwen-code-core'; import { buildResumedHistoryItems } from './utils/resumeHistoryUtils.js'; import { validateAuthMethod } from '../config/auth.js'; @@ -76,6 +77,9 @@ import { useLoadingIndicator } from './hooks/useLoadingIndicator.js'; import { useFolderTrust } from './hooks/useFolderTrust.js'; import { useIdeTrustListener } from './hooks/useIdeTrustListener.js'; import { type IdeIntegrationNudgeResult } from './IdeIntegrationNudge.js'; +import { type CommandMigrationNudgeResult } from './CommandFormatMigrationNudge.js'; +import { useCommandMigration } from './hooks/useCommandMigration.js'; +import { migrateTomlCommands } from '../services/command-migration-tool.js'; import { appEvents, AppEvent } from '../utils/events.js'; import { type UpdateObject } from './utils/updateCheck.js'; import { setUpdateHandler } from '../utils/handleAutoUpdate.js'; @@ -83,10 +87,13 @@ import { ConsolePatcher } from './utils/ConsolePatcher.js'; import { registerCleanup, runExitCleanup } from '../utils/cleanup.js'; import { useMessageQueue } from './hooks/useMessageQueue.js'; import { useAutoAcceptIndicator } from './hooks/useAutoAcceptIndicator.js'; -import { useWorkspaceMigration } from './hooks/useWorkspaceMigration.js'; import { useSessionStats } from './contexts/SessionContext.js'; import { useGitBranchName } from './hooks/useGitBranchName.js'; -import { useExtensionUpdates } from './hooks/useExtensionUpdates.js'; +import { + useExtensionUpdates, + useConfirmUpdateRequests, + useSettingInputRequests, +} from './hooks/useExtensionUpdates.js'; import { ShellFocusContext } from './contexts/ShellFocusContext.js'; import { t } from '../i18n/index.js'; import { useWelcomeBack } from './hooks/useWelcomeBack.js'; @@ -97,6 +104,10 @@ import { processVisionSwitchOutcome } from './hooks/useVisionAutoSwitch.js'; import { useSubagentCreateDialog } from './hooks/useSubagentCreateDialog.js'; import { useAgentsManagerDialog } from './hooks/useAgentsManagerDialog.js'; import { useAttentionNotifications } from './hooks/useAttentionNotifications.js'; +import { + requestConsentInteractive, + requestConsentOrFail, +} from '../commands/extensions/consent.js'; const CTRL_EXIT_PROMPT_DURATION_MS = 1000; @@ -157,15 +168,43 @@ export const AppContainer = (props: AppContainerProps) => { config.isTrustedFolder(), ); - const extensions = config.getExtensions(); + const extensionManager = config.getExtensionManager(); + + const { addConfirmUpdateExtensionRequest, confirmUpdateExtensionRequests } = + useConfirmUpdateRequests(); + + const { addSettingInputRequest, settingInputRequests } = + useSettingInputRequests(); + + extensionManager.setRequestConsent( + requestConsentOrFail.bind(null, (description) => + requestConsentInteractive(description, addConfirmUpdateExtensionRequest), + ), + ); + + extensionManager.setRequestSetting( + (setting) => + new Promise((resolve, reject) => { + addSettingInputRequest({ + settingName: setting.name, + settingDescription: setting.description, + sensitive: setting.sensitive ?? false, + onSubmit: (value) => { + resolve(value); + }, + onCancel: () => { + reject(new Error('Setting input cancelled')); + }, + }); + }), + ); + const { extensionsUpdateState, extensionsUpdateStateInternal, dispatchExtensionStateUpdate, - confirmUpdateExtensionRequests, - addConfirmUpdateExtensionRequest, } = useExtensionUpdates( - extensions, + extensionManager, historyManager.addItem, config.getWorkingDir(), ); @@ -272,7 +311,8 @@ export const AppContainer = (props: AppContainerProps) => { calculatePromptWidths(terminalWidth); return { inputWidth, suggestionsWidth }; }, [terminalWidth]); - const mainAreaWidth = Math.floor(terminalWidth * 0.9); + // Uniform width for bordered box components: accounts for margins and caps at 100 + const mainAreaWidth = Math.min(terminalWidth - 4, 100); const staticAreaMaxItemHeight = Math.max(terminalHeight * 4, 100); const isValidPath = useCallback((filePath: string): boolean => { @@ -430,13 +470,6 @@ export const AppContainer = (props: AppContainerProps) => { remount: refreshStatic, }); - const { - showWorkspaceMigrationDialog, - workspaceExtensions, - onWorkspaceMigrationDialogOpen, - onWorkspaceMigrationDialogClose, - } = useWorkspaceMigration(settings); - const { toggleVimEnabled } = useVimMode(); const { @@ -572,7 +605,6 @@ export const AppContainer = (props: AppContainerProps) => { : [], config.getDebugMode(), config.getFileService(), - settings.merged, config.getExtensionContextFilePaths(), config.isTrustedFolder(), settings.merged.context?.importFormat || 'tree', // Use setting or default to 'tree' @@ -838,6 +870,13 @@ export const AppContainer = (props: AppContainerProps) => { !idePromptAnswered, ); + // Command migration nudge + const { + showMigrationNudge: shouldShowCommandMigrationNudge, + tomlFiles: commandMigrationTomlFiles, + setShowMigrationNudge: setShowCommandMigrationNudge, + } = useCommandMigration(settings, config.storage); + const [showErrorDetails, setShowErrorDetails] = useState(false); const [showToolDescriptions, setShowToolDescriptions] = useState(false); @@ -933,6 +972,92 @@ export const AppContainer = (props: AppContainerProps) => { [handleSlashCommand, settings], ); + const handleCommandMigrationComplete = useCallback( + async (result: CommandMigrationNudgeResult) => { + setShowCommandMigrationNudge(false); + + if (result.userSelection === 'yes') { + // Perform migration for both workspace and user levels + try { + const results = []; + + // Migrate workspace commands + const workspaceCommandsDir = config.storage.getProjectCommandsDir(); + const workspaceResult = await migrateTomlCommands({ + commandDir: workspaceCommandsDir, + createBackup: true, + deleteOriginal: false, + }); + if ( + workspaceResult.convertedFiles.length > 0 || + workspaceResult.failedFiles.length > 0 + ) { + results.push({ level: 'workspace', result: workspaceResult }); + } + + // Migrate user commands + const userCommandsDir = Storage.getUserCommandsDir(); + const userResult = await migrateTomlCommands({ + commandDir: userCommandsDir, + createBackup: true, + deleteOriginal: false, + }); + if ( + userResult.convertedFiles.length > 0 || + userResult.failedFiles.length > 0 + ) { + results.push({ level: 'user', result: userResult }); + } + + // Report results + for (const { level, result: migrationResult } of results) { + if ( + migrationResult.success && + migrationResult.convertedFiles.length > 0 + ) { + historyManager.addItem( + { + type: MessageType.INFO, + text: `[${level}] Successfully migrated ${migrationResult.convertedFiles.length} command file${migrationResult.convertedFiles.length > 1 ? 's' : ''} to Markdown format. Original files backed up as .toml.backup`, + }, + Date.now(), + ); + } + + if (migrationResult.failedFiles.length > 0) { + historyManager.addItem( + { + type: MessageType.ERROR, + text: `[${level}] Failed to migrate ${migrationResult.failedFiles.length} file${migrationResult.failedFiles.length > 1 ? 's' : ''}:\n${migrationResult.failedFiles.map((f) => ` • ${f.file}: ${f.error}`).join('\n')}`, + }, + Date.now(), + ); + } + } + + if (results.length === 0) { + historyManager.addItem( + { + type: MessageType.INFO, + text: 'No TOML files found to migrate.', + }, + Date.now(), + ); + } + } catch (error) { + historyManager.addItem( + { + type: MessageType.ERROR, + text: `❌ Migration failed: ${getErrorMessage(error)}`, + }, + Date.now(), + ); + } + } + }, + [historyManager, setShowCommandMigrationNudge, config.storage], + ); + const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator( streamingState, settings.merged.ui?.customWittyPhrases, @@ -1175,12 +1300,13 @@ export const AppContainer = (props: AppContainerProps) => { const dialogsVisible = showWelcomeBackDialog || - showWorkspaceMigrationDialog || shouldShowIdePrompt || + shouldShowCommandMigrationNudge || isFolderTrustDialogOpen || !!shellConfirmationRequest || !!confirmationRequest || confirmUpdateExtensionRequests.length > 0 || + settingInputRequests.length > 0 || !!loopDetectionConfirmationRequest || isThemeDialogOpen || isSettingsDialogOpen || @@ -1242,6 +1368,7 @@ export const AppContainer = (props: AppContainerProps) => { shellConfirmationRequest, confirmationRequest, confirmUpdateExtensionRequests, + settingInputRequests, loopDetectionConfirmationRequest, geminiMdFileCount, streamingState, @@ -1255,6 +1382,8 @@ export const AppContainer = (props: AppContainerProps) => { suggestionsWidth, isInputActive, shouldShowIdePrompt, + shouldShowCommandMigrationNudge, + commandMigrationTomlFiles, isFolderTrustDialogOpen: isFolderTrustDialogOpen ?? false, isTrustedFolder, constrainHeight, @@ -1271,8 +1400,6 @@ export const AppContainer = (props: AppContainerProps) => { historyRemountKey, messageQueue, showAutoAcceptIndicator, - showWorkspaceMigrationDialog, - workspaceExtensions, currentModel, contextFileNames, errorCount, @@ -1333,6 +1460,7 @@ export const AppContainer = (props: AppContainerProps) => { shellConfirmationRequest, confirmationRequest, confirmUpdateExtensionRequests, + settingInputRequests, loopDetectionConfirmationRequest, geminiMdFileCount, streamingState, @@ -1346,6 +1474,8 @@ export const AppContainer = (props: AppContainerProps) => { suggestionsWidth, isInputActive, shouldShowIdePrompt, + shouldShowCommandMigrationNudge, + commandMigrationTomlFiles, isFolderTrustDialogOpen, isTrustedFolder, constrainHeight, @@ -1362,8 +1492,6 @@ export const AppContainer = (props: AppContainerProps) => { historyRemountKey, messageQueue, showAutoAcceptIndicator, - showWorkspaceMigrationDialog, - workspaceExtensions, contextFileNames, errorCount, availableTerminalHeight, @@ -1404,6 +1532,8 @@ export const AppContainer = (props: AppContainerProps) => { const uiActions: UIActions = useMemo( () => ({ + openThemeDialog, + openEditorDialog, handleThemeSelect, handleThemeHighlight, handleApprovalModeSelect, @@ -1419,14 +1549,13 @@ export const AppContainer = (props: AppContainerProps) => { setShellModeActive, vimHandleInput, handleIdePromptComplete, + handleCommandMigrationComplete, handleFolderTrustSelect, setConstrainHeight, onEscapePromptChange: handleEscapePromptChange, refreshStatic, handleFinalSubmit, handleClearScreen, - onWorkspaceMigrationDialogOpen, - onWorkspaceMigrationDialogClose, // Vision switch dialog handleVisionSwitchSelect, // Welcome back dialog @@ -1445,6 +1574,8 @@ export const AppContainer = (props: AppContainerProps) => { submitFeedback, }), [ + openThemeDialog, + openEditorDialog, handleThemeSelect, handleThemeHighlight, handleApprovalModeSelect, @@ -1460,14 +1591,13 @@ export const AppContainer = (props: AppContainerProps) => { setShellModeActive, vimHandleInput, handleIdePromptComplete, + handleCommandMigrationComplete, handleFolderTrustSelect, setConstrainHeight, handleEscapePromptChange, refreshStatic, handleFinalSubmit, handleClearScreen, - onWorkspaceMigrationDialogOpen, - onWorkspaceMigrationDialogClose, handleVisionSwitchSelect, handleWelcomeBackSelection, handleWelcomeBackClose, diff --git a/packages/cli/src/ui/CommandFormatMigrationNudge.tsx b/packages/cli/src/ui/CommandFormatMigrationNudge.tsx new file mode 100644 index 000000000..5e1070e86 --- /dev/null +++ b/packages/cli/src/ui/CommandFormatMigrationNudge.tsx @@ -0,0 +1,94 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { Box, Text } from 'ink'; +import type { RadioSelectItem } from './components/shared/RadioButtonSelect.js'; +import { RadioButtonSelect } from './components/shared/RadioButtonSelect.js'; +import { useKeypress } from './hooks/useKeypress.js'; +import { theme } from './semantic-colors.js'; +import { t } from '../i18n/index.js'; + +export type CommandMigrationNudgeResult = { + userSelection: 'yes' | 'no'; +}; + +interface CommandFormatMigrationNudgeProps { + tomlFiles: string[]; + onComplete: (result: CommandMigrationNudgeResult) => void; +} + +export function CommandFormatMigrationNudge({ + tomlFiles, + onComplete, +}: CommandFormatMigrationNudgeProps) { + useKeypress( + (key) => { + if (key.name === 'escape') { + onComplete({ + userSelection: 'no', + }); + } + }, + { isActive: true }, + ); + + const OPTIONS: Array> = [ + { + label: t('Yes'), + value: { + userSelection: 'yes', + }, + key: 'Yes', + }, + { + label: t('No (esc)'), + value: { + userSelection: 'no', + }, + key: 'No (esc)', + }, + ]; + + const count = tomlFiles.length; + const fileList = + count <= 3 + ? tomlFiles.map((f) => ` • ${f}`).join('\n') + : ` • ${tomlFiles.slice(0, 2).join('\n • ')}\n • ${t('... and {{count}} more', { count: String(count - 2) })}`; + + return ( + + + + {'⚠️ '} + {t('Command Format Migration')} + + + {count > 1 + ? t('Found {{count}} TOML command files:', { count: String(count) }) + : t('Found {{count}} TOML command file:', { count: String(count) })} + + {fileList} + {''} + + {t( + 'The TOML format is deprecated. Would you like to migrate them to Markdown format?', + )} + + + {t('(Backups will be created and original files will be preserved)')} + + + + + ); +} diff --git a/packages/cli/src/ui/colors.ts b/packages/cli/src/ui/colors.ts index a20a99097..0fb75a358 100644 --- a/packages/cli/src/ui/colors.ts +++ b/packages/cli/src/ui/colors.ts @@ -38,6 +38,12 @@ export const Colors: ColorsTheme = { get AccentRed() { return themeManager.getActiveTheme().colors.AccentRed; }, + get AccentYellowDim() { + return themeManager.getActiveTheme().colors.AccentYellowDim; + }, + get AccentRedDim() { + return themeManager.getActiveTheme().colors.AccentRedDim; + }, get DiffAdded() { return themeManager.getActiveTheme().colors.DiffAdded; }, diff --git a/packages/cli/src/ui/commands/aboutCommand.test.ts b/packages/cli/src/ui/commands/aboutCommand.test.ts index 8a1daaeb1..4920f2404 100644 --- a/packages/cli/src/ui/commands/aboutCommand.test.ts +++ b/packages/cli/src/ui/commands/aboutCommand.test.ts @@ -64,7 +64,8 @@ describe('aboutCommand', () => { }); it('should have the correct name and description', () => { - expect(aboutCommand.name).toBe('about'); + expect(aboutCommand.name).toBe('status'); + expect(aboutCommand.altNames).toEqual(['about']); expect(aboutCommand.description).toBe('show version info'); }); diff --git a/packages/cli/src/ui/commands/aboutCommand.ts b/packages/cli/src/ui/commands/aboutCommand.ts index 800b2b000..1570b9e3d 100644 --- a/packages/cli/src/ui/commands/aboutCommand.ts +++ b/packages/cli/src/ui/commands/aboutCommand.ts @@ -11,7 +11,8 @@ import { getExtendedSystemInfo } from '../../utils/systemInfo.js'; import { t } from '../../i18n/index.js'; export const aboutCommand: SlashCommand = { - name: 'about', + name: 'status', + altNames: ['about'], get description() { return t('show version info'); }, diff --git a/packages/cli/src/ui/commands/bugCommand.test.ts b/packages/cli/src/ui/commands/bugCommand.test.ts index 09c28aad9..eac703cfa 100644 --- a/packages/cli/src/ui/commands/bugCommand.test.ts +++ b/packages/cli/src/ui/commands/bugCommand.test.ts @@ -56,27 +56,22 @@ describe('bugCommand', () => { if (!bugCommand.action) throw new Error('Action is not defined'); await bugCommand.action(mockContext, 'A test bug'); - const gitCommitLine = + const qwenCodeLine = GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO) - ? `* **Git Commit:** ${GIT_COMMIT_INFO}\n` - : ''; - const expectedInfo = ` -* **CLI Version:** 0.1.0 -${gitCommitLine}* **Model:** qwen3-coder-plus -* **Sandbox:** test -* **OS Platform:** test-platform -* **OS Arch:** x64 -* **OS Release:** 22.0.0 -* **Node.js Version:** v20.0.0 -* **NPM Version:** 10.0.0 -* **Session ID:** test-session-id -* **Auth Method:** -* **Memory Usage:** 100 MB -* **IDE Client:** VSCode -`; + ? `Qwen Code: 0.1.0 (${GIT_COMMIT_INFO})` + : 'Qwen Code: 0.1.0'; + const expectedInfo = `${qwenCodeLine} +Runtime: Node.js v20.0.0 / npm 10.0.0 +IDE Client: VSCode +OS: test-platform x64 (22.0.0) +Model: qwen3-coder-plus +Session ID: test-session-id +Sandbox: test +Proxy: no proxy +Memory Usage: 100 MB`; const expectedUrl = 'https://github.com/QwenLM/qwen-code/issues/new?template=bug_report.yml&title=A%20test%20bug&info=' + - encodeURIComponent(expectedInfo); + encodeURIComponent(`\n${expectedInfo}\n`); expect(open).toHaveBeenCalledWith(expectedUrl); }); @@ -95,27 +90,22 @@ ${gitCommitLine}* **Model:** qwen3-coder-plus if (!bugCommand.action) throw new Error('Action is not defined'); await bugCommand.action(mockContext, 'A custom bug'); - const gitCommitLine = + const qwenCodeLine = GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO) - ? `* **Git Commit:** ${GIT_COMMIT_INFO}\n` - : ''; - const expectedInfo = ` -* **CLI Version:** 0.1.0 -${gitCommitLine}* **Model:** qwen3-coder-plus -* **Sandbox:** test -* **OS Platform:** test-platform -* **OS Arch:** x64 -* **OS Release:** 22.0.0 -* **Node.js Version:** v20.0.0 -* **NPM Version:** 10.0.0 -* **Session ID:** test-session-id -* **Auth Method:** -* **Memory Usage:** 100 MB -* **IDE Client:** VSCode -`; + ? `Qwen Code: 0.1.0 (${GIT_COMMIT_INFO})` + : 'Qwen Code: 0.1.0'; + const expectedInfo = `${qwenCodeLine} +Runtime: Node.js v20.0.0 / npm 10.0.0 +IDE Client: VSCode +OS: test-platform x64 (22.0.0) +Model: qwen3-coder-plus +Session ID: test-session-id +Sandbox: test +Proxy: no proxy +Memory Usage: 100 MB`; const expectedUrl = customTemplate .replace('{title}', encodeURIComponent('A custom bug')) - .replace('{info}', encodeURIComponent(expectedInfo)); + .replace('{info}', encodeURIComponent(`\n${expectedInfo}\n`)); expect(open).toHaveBeenCalledWith(expectedUrl); }); @@ -152,28 +142,23 @@ ${gitCommitLine}* **Model:** qwen3-coder-plus if (!bugCommand.action) throw new Error('Action is not defined'); await bugCommand.action(mockContext, 'OpenAI bug'); - const gitCommitLine = + const qwenCodeLine = GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO) - ? `* **Git Commit:** ${GIT_COMMIT_INFO}\n` - : ''; - const expectedInfo = ` -* **CLI Version:** 0.1.0 -${gitCommitLine}* **Model:** qwen3-coder-plus -* **Sandbox:** test -* **OS Platform:** test-platform -* **OS Arch:** x64 -* **OS Release:** 22.0.0 -* **Node.js Version:** v20.0.0 -* **NPM Version:** 10.0.0 -* **Session ID:** test-session-id -* **Auth Method:** ${AuthType.USE_OPENAI} -* **Base URL:** https://api.openai.com/v1 -* **Memory Usage:** 100 MB -* **IDE Client:** VSCode -`; + ? `Qwen Code: 0.1.0 (${GIT_COMMIT_INFO})` + : 'Qwen Code: 0.1.0'; + const expectedInfo = `${qwenCodeLine} +Runtime: Node.js v20.0.0 / npm 10.0.0 +IDE Client: VSCode +OS: test-platform x64 (22.0.0) +Auth: ${AuthType.USE_OPENAI} (https://api.openai.com/v1) +Model: qwen3-coder-plus +Session ID: test-session-id +Sandbox: test +Proxy: no proxy +Memory Usage: 100 MB`; const expectedUrl = 'https://github.com/QwenLM/qwen-code/issues/new?template=bug_report.yml&title=OpenAI%20bug&info=' + - encodeURIComponent(expectedInfo); + encodeURIComponent(`\n${expectedInfo}\n`); expect(open).toHaveBeenCalledWith(expectedUrl); }); diff --git a/packages/cli/src/ui/commands/bugCommand.ts b/packages/cli/src/ui/commands/bugCommand.ts index 14cf37598..6bedbfebf 100644 --- a/packages/cli/src/ui/commands/bugCommand.ts +++ b/packages/cli/src/ui/commands/bugCommand.ts @@ -12,10 +12,7 @@ import { } from './types.js'; import { MessageType } from '../types.js'; import { getExtendedSystemInfo } from '../../utils/systemInfo.js'; -import { - getSystemInfoFields, - getFieldValue, -} from '../../utils/systemInfoFields.js'; +import { getSystemInfoFields } from '../../utils/systemInfoFields.js'; import { t } from '../../i18n/index.js'; export const bugCommand: SlashCommand = { @@ -30,11 +27,9 @@ export const bugCommand: SlashCommand = { const fields = getSystemInfoFields(systemInfo); - // Generate bug report info using the same field configuration - let info = '\n'; - for (const field of fields) { - info += `* **${field.label}:** ${getFieldValue(field, systemInfo)}\n`; - } + const info = fields + .map((field) => `${field.label}: ${field.value}`) + .join('\n'); let bugReportUrl = 'https://github.com/QwenLM/qwen-code/issues/new?template=bug_report.yml&title={title}&info={info}'; @@ -46,7 +41,7 @@ export const bugCommand: SlashCommand = { bugReportUrl = bugReportUrl .replace('{title}', encodeURIComponent(bugDescription)) - .replace('{info}', encodeURIComponent(info)); + .replace('{info}', encodeURIComponent(`\n${info}\n`)); context.ui.addItem( { diff --git a/packages/cli/src/ui/commands/extensionsCommand.test.ts b/packages/cli/src/ui/commands/extensionsCommand.test.ts index 459a825b7..c14fdb389 100644 --- a/packages/cli/src/ui/commands/extensionsCommand.test.ts +++ b/packages/cli/src/ui/commands/extensionsCommand.test.ts @@ -4,11 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -import type { GeminiCLIExtension } from '@qwen-code/qwen-code-core'; -import { - updateAllUpdatableExtensions, - updateExtension, -} from '../../config/extensions/update.js'; import { createMockCommandContext } from '../../test-utils/mockCommandContext.js'; import { MessageType } from '../types.js'; import { extensionsCommand } from './extensionsCommand.js'; @@ -22,34 +17,59 @@ import { type MockedFunction, } from 'vitest'; import { ExtensionUpdateState } from '../state/extensions.js'; +import { + type Extension, + ExtensionManager, + parseInstallSource, +} from '@qwen-code/qwen-code-core'; -vi.mock('../../config/extensions/update.js', () => ({ - updateExtension: vi.fn(), - updateAllUpdatableExtensions: vi.fn(), - checkForAllExtensionUpdates: vi.fn(), -})); - -const mockUpdateExtension = updateExtension as MockedFunction< - typeof updateExtension ->; - -const mockUpdateAllUpdatableExtensions = - updateAllUpdatableExtensions as MockedFunction< - typeof updateAllUpdatableExtensions - >; +vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => { + const actual = + await importOriginal(); + return { + ...actual, + parseInstallSource: vi.fn(), + }; +}); const mockGetExtensions = vi.fn(); +const mockUpdateExtension = vi.fn(); +const mockUpdateAllUpdatableExtensions = vi.fn(); +const mockCheckForAllExtensionUpdates = vi.fn(); +const mockInstallExtension = vi.fn(); +const mockUninstallExtension = vi.fn(); +const mockGetLoadedExtensions = vi.fn(); +const mockEnableExtension = vi.fn(); +const mockDisableExtension = vi.fn(); + +const createMockExtensionManager = () => ({ + updateExtension: mockUpdateExtension, + updateAllUpdatableExtensions: mockUpdateAllUpdatableExtensions, + checkForAllExtensionUpdates: mockCheckForAllExtensionUpdates, + installExtension: mockInstallExtension, + uninstallExtension: mockUninstallExtension, + getLoadedExtensions: mockGetLoadedExtensions, + enableExtension: mockEnableExtension, + disableExtension: mockDisableExtension, +}); describe('extensionsCommand', () => { let mockContext: CommandContext; + let mockExtensionManager: ReturnType; beforeEach(() => { vi.resetAllMocks(); + mockExtensionManager = createMockExtensionManager(); + mockGetExtensions.mockReturnValue([]); + mockGetLoadedExtensions.mockReturnValue([]); + mockCheckForAllExtensionUpdates.mockResolvedValue(undefined); mockContext = createMockCommandContext({ services: { config: { getExtensions: mockGetExtensions, getWorkingDir: () => '/test/dir', + getExtensionManager: () => + mockExtensionManager as unknown as ExtensionManager, }, }, ui: { @@ -59,8 +79,9 @@ describe('extensionsCommand', () => { }); describe('list', () => { - it('should add an EXTENSIONS_LIST item to the UI', async () => { + it('should add an EXTENSIONS_LIST item to the UI when extensions exist', async () => { if (!extensionsCommand.action) throw new Error('Action not defined'); + mockGetExtensions.mockReturnValue([{ name: 'test-ext', isActive: true }]); await extensionsCommand.action(mockContext, ''); expect(mockContext.ui.addItem).toHaveBeenCalledWith( @@ -70,6 +91,20 @@ describe('extensionsCommand', () => { expect.any(Number), ); }); + + it('should show info message when no extensions installed', async () => { + if (!extensionsCommand.action) throw new Error('Action not defined'); + mockGetExtensions.mockReturnValue([]); + await extensionsCommand.action(mockContext, ''); + + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.INFO, + text: 'No extensions installed.', + }, + expect.any(Number), + ); + }); }); describe('update', () => { @@ -93,6 +128,7 @@ describe('extensionsCommand', () => { }); it('should inform user if there are no extensions to update with --all', async () => { + mockGetExtensions.mockReturnValue([{ name: 'ext-one', isActive: true }]); mockUpdateAllUpdatableExtensions.mockResolvedValue([]); await updateAction(mockContext, '--all'); expect(mockContext.ui.addItem).toHaveBeenCalledWith( @@ -105,6 +141,7 @@ describe('extensionsCommand', () => { }); it('should call setPendingItem and addItem in a finally block on success', async () => { + mockGetExtensions.mockReturnValue([{ name: 'ext-one', isActive: true }]); mockUpdateAllUpdatableExtensions.mockResolvedValue([ { name: 'ext-one', @@ -131,6 +168,7 @@ describe('extensionsCommand', () => { }); it('should call setPendingItem and addItem in a finally block on failure', async () => { + mockGetExtensions.mockReturnValue([{ name: 'ext-one', isActive: true }]); mockUpdateAllUpdatableExtensions.mockRejectedValue( new Error('Something went wrong'), ); @@ -155,11 +193,14 @@ describe('extensionsCommand', () => { }); it('should update a single extension by name', async () => { - const extension: GeminiCLIExtension = { + const extension: Extension = { + id: 'ext-one', name: 'ext-one', version: '1.0.0', isActive: true, path: '/test/dir/ext-one', + contextFiles: [], + config: { name: 'ext-one', version: '1.0.0' }, installMetadata: { type: 'git', autoUpdate: false, @@ -179,43 +220,56 @@ describe('extensionsCommand', () => { await updateAction(mockContext, 'ext-one'); expect(mockUpdateExtension).toHaveBeenCalledWith( extension, - '/test/dir', - expect.any(Function), ExtensionUpdateState.UPDATE_AVAILABLE, expect.any(Function), ); }); it('should handle errors when updating a single extension', async () => { - mockUpdateExtension.mockRejectedValue(new Error('Extension not found')); - mockGetExtensions.mockReturnValue([]); + // Provide at least one extension so we don't get "No extensions installed" message + const otherExtension: Extension = { + id: 'other-ext', + name: 'other-ext', + version: '1.0.0', + isActive: true, + path: '/test/dir/other-ext', + contextFiles: [], + config: { name: 'other-ext', version: '1.0.0' }, + }; + mockGetExtensions.mockReturnValue([otherExtension]); await updateAction(mockContext, 'ext-one'); expect(mockContext.ui.addItem).toHaveBeenCalledWith( { type: MessageType.ERROR, - text: 'Extension ext-one not found.', + text: 'Extension "ext-one" not found.', }, expect.any(Number), ); }); it('should update multiple extensions by name', async () => { - const extensionOne: GeminiCLIExtension = { + const extensionOne: Extension = { + id: 'ext-one', name: 'ext-one', version: '1.0.0', isActive: true, path: '/test/dir/ext-one', + contextFiles: [], + config: { name: 'ext-one', version: '1.0.0' }, installMetadata: { type: 'git', autoUpdate: false, source: 'https://github.com/some/extension.git', }, }; - const extensionTwo: GeminiCLIExtension = { + const extensionTwo: Extension = { + id: 'ext-two', name: 'ext-two', version: '1.0.0', isActive: true, path: '/test/dir/ext-two', + contextFiles: [], + config: { name: 'ext-two', version: '1.0.0' }, installMetadata: { type: 'git', autoUpdate: false, @@ -223,14 +277,14 @@ describe('extensionsCommand', () => { }, }; mockGetExtensions.mockReturnValue([extensionOne, extensionTwo]); - mockContext.ui.extensionsUpdateState.set( - extensionOne.name, - ExtensionUpdateState.UPDATE_AVAILABLE, - ); - mockContext.ui.extensionsUpdateState.set( - extensionTwo.name, - ExtensionUpdateState.UPDATE_AVAILABLE, - ); + mockContext.ui.extensionsUpdateState.set(extensionOne.name, { + status: ExtensionUpdateState.UPDATE_AVAILABLE, + processed: false, + }); + mockContext.ui.extensionsUpdateState.set(extensionTwo.name, { + status: ExtensionUpdateState.UPDATE_AVAILABLE, + processed: false, + }); mockUpdateExtension .mockResolvedValueOnce({ name: 'ext-one', @@ -265,18 +319,24 @@ describe('extensionsCommand', () => { throw new Error('Update completion not found'); } - const extensionOne: GeminiCLIExtension = { + const extensionOne: Extension = { + id: 'ext-one', name: 'ext-one', version: '1.0.0', isActive: true, path: '/test/dir/ext-one', + contextFiles: [], + config: { name: 'ext-one', version: '1.0.0' }, installMetadata: { type: 'git', autoUpdate: false, source: 'https://github.com/some/extension.git', }, }; - const extensionTwo: GeminiCLIExtension = { + const extensionTwo: Extension = { + id: 'another-ext', + contextFiles: [], + config: { name: 'another-ext', version: '1.0.0' }, name: 'another-ext', version: '1.0.0', isActive: true, @@ -287,8 +347,11 @@ describe('extensionsCommand', () => { source: 'https://github.com/some/extension.git', }, }; - const allExt: GeminiCLIExtension = { + const allExt: Extension = { + id: 'all-ext', name: 'all-ext', + contextFiles: [], + config: { name: 'all-ext', version: '1.0.0' }, version: '1.0.0', isActive: true, path: '/test/dir/all-ext', @@ -331,5 +394,470 @@ describe('extensionsCommand', () => { expect(suggestions).toEqual(expected); }); }); + + it('should call reloadCommands in finally block', async () => { + mockGetExtensions.mockReturnValue([{ name: 'ext-one', isActive: true }]); + mockUpdateAllUpdatableExtensions.mockResolvedValue([ + { + name: 'ext-one', + originalVersion: '1.0.0', + updatedVersion: '1.0.1', + }, + ]); + await updateAction(mockContext, '--all'); + expect(mockContext.ui.reloadCommands).toHaveBeenCalled(); + }); + }); + + describe('install', () => { + const installAction = extensionsCommand.subCommands?.find( + (cmd) => cmd.name === 'install', + )?.action; + + if (!installAction) { + throw new Error('Install action not found'); + } + + const mockParseInstallSource = parseInstallSource as MockedFunction< + typeof parseInstallSource + >; + + // Create a real ExtensionManager mock that passes instanceof check + let realMockExtensionManager: ExtensionManager; + + beforeEach(() => { + vi.resetAllMocks(); + // Create a mock that inherits from ExtensionManager prototype + realMockExtensionManager = Object.create(ExtensionManager.prototype); + realMockExtensionManager.installExtension = mockInstallExtension; + + mockContext = createMockCommandContext({ + services: { + config: { + getExtensions: mockGetExtensions, + getWorkingDir: () => '/test/dir', + getExtensionManager: () => realMockExtensionManager, + }, + }, + ui: { + dispatchExtensionStateUpdate: vi.fn(), + }, + }); + }); + + it('should show usage if no source is provided', async () => { + await installAction(mockContext, ''); + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.ERROR, + text: 'Usage: /extensions install ', + }, + expect.any(Number), + ); + }); + + it('should install extension successfully', async () => { + mockParseInstallSource.mockResolvedValue({ + type: 'git', + source: 'https://github.com/test/extension', + }); + mockInstallExtension.mockResolvedValue({ + name: 'test-extension', + version: '1.0.0', + }); + + await installAction(mockContext, 'https://github.com/test/extension'); + + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.INFO, + text: 'Installing extension from "https://github.com/test/extension"...', + }, + expect.any(Number), + ); + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.INFO, + text: 'Extension "test-extension" installed successfully.', + }, + expect.any(Number), + ); + expect(mockContext.ui.reloadCommands).toHaveBeenCalled(); + }); + + it('should handle install errors', async () => { + mockParseInstallSource.mockRejectedValue( + new Error('Install source not found.'), + ); + + await installAction(mockContext, '/invalid/path'); + + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.ERROR, + text: 'Failed to install extension from "/invalid/path": Install source not found.', + }, + expect.any(Number), + ); + }); + }); + + describe('uninstall', () => { + const uninstallAction = extensionsCommand.subCommands?.find( + (cmd) => cmd.name === 'uninstall', + )?.action; + + if (!uninstallAction) { + throw new Error('Uninstall action not found'); + } + + let realMockExtensionManager: ExtensionManager; + + beforeEach(() => { + vi.resetAllMocks(); + realMockExtensionManager = Object.create(ExtensionManager.prototype); + realMockExtensionManager.uninstallExtension = mockUninstallExtension; + + mockContext = createMockCommandContext({ + services: { + config: { + getExtensions: mockGetExtensions, + getWorkingDir: () => '/test/dir', + getExtensionManager: () => realMockExtensionManager, + }, + }, + ui: { + dispatchExtensionStateUpdate: vi.fn(), + }, + }); + }); + + it('should show usage if no name is provided', async () => { + await uninstallAction(mockContext, ''); + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.ERROR, + text: 'Usage: /extensions uninstall ', + }, + expect.any(Number), + ); + }); + + it('should uninstall extension successfully', async () => { + mockUninstallExtension.mockResolvedValue(undefined); + + await uninstallAction(mockContext, 'test-extension'); + + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.INFO, + text: 'Uninstalling extension "test-extension"...', + }, + expect.any(Number), + ); + expect(mockUninstallExtension).toHaveBeenCalledWith( + 'test-extension', + false, + ); + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.INFO, + text: 'Extension "test-extension" uninstalled successfully.', + }, + expect.any(Number), + ); + expect(mockContext.ui.reloadCommands).toHaveBeenCalled(); + }); + + it('should handle uninstall errors', async () => { + mockUninstallExtension.mockRejectedValue( + new Error('Extension not found.'), + ); + + await uninstallAction(mockContext, 'nonexistent-extension'); + + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.ERROR, + text: 'Failed to uninstall extension "nonexistent-extension": Extension not found.', + }, + expect.any(Number), + ); + }); + }); + + describe('disable', () => { + const disableAction = extensionsCommand.subCommands?.find( + (cmd) => cmd.name === 'disable', + )?.action; + + if (!disableAction) { + throw new Error('Disable action not found'); + } + + let realMockExtensionManager: ExtensionManager; + + beforeEach(() => { + vi.resetAllMocks(); + realMockExtensionManager = Object.create(ExtensionManager.prototype); + realMockExtensionManager.disableExtension = mockDisableExtension; + realMockExtensionManager.getLoadedExtensions = mockGetLoadedExtensions; + + mockContext = createMockCommandContext({ + invocation: { + raw: '/extensions disable', + name: 'disable', + args: '', + }, + services: { + config: { + getExtensions: mockGetExtensions, + getWorkingDir: () => '/test/dir', + getExtensionManager: () => realMockExtensionManager, + }, + }, + ui: { + dispatchExtensionStateUpdate: vi.fn(), + }, + }); + }); + + it('should show usage if invalid args are provided', async () => { + await disableAction(mockContext, ''); + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.ERROR, + text: 'Usage: /extensions disable [--scope=]', + }, + expect.any(Number), + ); + }); + + it('should disable extension at user scope', async () => { + mockDisableExtension.mockResolvedValue(undefined); + + await disableAction(mockContext, 'test-extension --scope=user'); + + expect(mockDisableExtension).toHaveBeenCalledWith( + 'test-extension', + 'User', + ); + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.INFO, + text: 'Extension "test-extension" disabled for scope "User"', + }, + expect.any(Number), + ); + }); + + it('should disable extension at workspace scope', async () => { + mockDisableExtension.mockResolvedValue(undefined); + + await disableAction(mockContext, 'test-extension --scope workspace'); + + expect(mockDisableExtension).toHaveBeenCalledWith( + 'test-extension', + 'Workspace', + ); + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.INFO, + text: 'Extension "test-extension" disabled for scope "Workspace"', + }, + expect.any(Number), + ); + }); + + it('should show error for invalid scope', async () => { + await disableAction(mockContext, 'test-extension --scope=invalid'); + + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.ERROR, + text: 'Unsupported scope "invalid", should be one of "user" or "workspace"', + }, + expect.any(Number), + ); + }); + }); + + describe('enable', () => { + const enableAction = extensionsCommand.subCommands?.find( + (cmd) => cmd.name === 'enable', + )?.action; + + if (!enableAction) { + throw new Error('Enable action not found'); + } + + let realMockExtensionManager: ExtensionManager; + + beforeEach(() => { + vi.resetAllMocks(); + realMockExtensionManager = Object.create(ExtensionManager.prototype); + realMockExtensionManager.enableExtension = mockEnableExtension; + realMockExtensionManager.getLoadedExtensions = mockGetLoadedExtensions; + + mockContext = createMockCommandContext({ + invocation: { + raw: '/extensions enable', + name: 'enable', + args: '', + }, + services: { + config: { + getExtensions: mockGetExtensions, + getWorkingDir: () => '/test/dir', + getExtensionManager: () => realMockExtensionManager, + }, + }, + ui: { + dispatchExtensionStateUpdate: vi.fn(), + }, + }); + }); + + it('should show usage if invalid args are provided', async () => { + await enableAction(mockContext, ''); + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.ERROR, + text: 'Usage: /extensions enable [--scope=]', + }, + expect.any(Number), + ); + }); + + it('should enable extension at user scope', async () => { + mockEnableExtension.mockResolvedValue(undefined); + + await enableAction(mockContext, 'test-extension --scope=user'); + + expect(mockEnableExtension).toHaveBeenCalledWith( + 'test-extension', + 'User', + ); + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.INFO, + text: 'Extension "test-extension" enabled for scope "User"', + }, + expect.any(Number), + ); + }); + + it('should enable extension at workspace scope', async () => { + mockEnableExtension.mockResolvedValue(undefined); + + await enableAction(mockContext, 'test-extension --scope workspace'); + + expect(mockEnableExtension).toHaveBeenCalledWith( + 'test-extension', + 'Workspace', + ); + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.INFO, + text: 'Extension "test-extension" enabled for scope "Workspace"', + }, + expect.any(Number), + ); + }); + + it('should show error for invalid scope', async () => { + await enableAction(mockContext, 'test-extension --scope=invalid'); + + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.ERROR, + text: 'Unsupported scope "invalid", should be one of "user" or "workspace"', + }, + expect.any(Number), + ); + }); + }); + + describe('detail', () => { + const detailAction = extensionsCommand.subCommands?.find( + (cmd) => cmd.name === 'detail', + )?.action; + + if (!detailAction) { + throw new Error('Detail action not found'); + } + + let realMockExtensionManager: ExtensionManager; + + beforeEach(() => { + vi.resetAllMocks(); + realMockExtensionManager = Object.create(ExtensionManager.prototype); + realMockExtensionManager.getLoadedExtensions = mockGetLoadedExtensions; + + mockContext = createMockCommandContext({ + invocation: { + raw: '/extensions detail', + name: 'detail', + args: '', + }, + services: { + config: { + getExtensions: mockGetExtensions, + getWorkingDir: () => '/test/dir', + getExtensionManager: () => realMockExtensionManager, + }, + }, + ui: { + dispatchExtensionStateUpdate: vi.fn(), + }, + }); + }); + + it('should show usage if no name is provided', async () => { + await detailAction(mockContext, ''); + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.ERROR, + text: 'Usage: /extensions detail ', + }, + expect.any(Number), + ); + }); + + it('should show error if extension not found', async () => { + mockGetExtensions.mockReturnValue([]); + await detailAction(mockContext, 'nonexistent-extension'); + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.ERROR, + text: 'Extension "nonexistent-extension" not found.', + }, + expect.any(Number), + ); + }); + + it('should show extension details when found', async () => { + const extension: Extension = { + id: 'test-ext', + name: 'test-ext', + version: '1.0.0', + isActive: true, + path: '/test/dir/test-ext', + contextFiles: [], + config: { name: 'test-ext', version: '1.0.0' }, + }; + mockGetExtensions.mockReturnValue([extension]); + realMockExtensionManager.isEnabled = vi.fn().mockReturnValue(true); + + await detailAction(mockContext, 'test-ext'); + + expect(mockContext.ui.addItem).toHaveBeenCalledWith( + { + type: MessageType.INFO, + text: expect.stringContaining('test-ext'), + }, + expect.any(Number), + ); + }); }); }); diff --git a/packages/cli/src/ui/commands/extensionsCommand.ts b/packages/cli/src/ui/commands/extensionsCommand.ts index b02dcf9ed..e13df24f7 100644 --- a/packages/cli/src/ui/commands/extensionsCommand.ts +++ b/packages/cli/src/ui/commands/extensionsCommand.ts @@ -4,13 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { requestConsentInteractive } from '../../config/extension.js'; -import { - updateAllUpdatableExtensions, - type ExtensionUpdateInfo, - updateExtension, - checkForAllExtensionUpdates, -} from '../../config/extensions/update.js'; import { getErrorMessage } from '../../utils/errors.js'; import { ExtensionUpdateState } from '../state/extensions.js'; import { MessageType } from '../types.js'; @@ -20,8 +13,113 @@ import { CommandKind, } from './types.js'; import { t } from '../../i18n/index.js'; +import { + ExtensionManager, + parseInstallSource, + type ExtensionUpdateInfo, +} from '@qwen-code/qwen-code-core'; +import { SettingScope } from '../../config/settings.js'; +import open from 'open'; +import { extensionToOutputString } from '../../commands/extensions/utils.js'; + +const EXTENSION_EXPLORE_URL = { + Gemini: 'https://geminicli.com/extensions/', + ClaudeCode: 'https://claudemarketplaces.com/', +} as const; + +type ExtensionExploreSource = keyof typeof EXTENSION_EXPLORE_URL; + +function showMessageIfNoExtensions( + context: CommandContext, + extensions: unknown[], +): boolean { + if (extensions.length === 0) { + context.ui.addItem( + { + type: MessageType.INFO, + text: t('No extensions installed.'), + }, + Date.now(), + ); + return true; + } + return false; +} + +async function exploreAction(context: CommandContext, args: string) { + const source = args.trim(); + const extensionsUrl = source + ? EXTENSION_EXPLORE_URL[source as ExtensionExploreSource] + : ''; + if (!extensionsUrl) { + context.ui.addItem( + { + type: MessageType.ERROR, + text: t('Unknown extensions source: {{source}}.', { source }), + }, + Date.now(), + ); + return; + } + // Only check for NODE_ENV for explicit test mode, not for unit test framework + if (process.env['NODE_ENV'] === 'test') { + context.ui.addItem( + { + type: MessageType.INFO, + text: t( + 'Would open extensions page in your browser: {{url}} (skipped in test environment)', + { url: extensionsUrl }, + ), + }, + Date.now(), + ); + } else if ( + process.env['SANDBOX'] && + process.env['SANDBOX'] !== 'sandbox-exec' + ) { + context.ui.addItem( + { + type: MessageType.INFO, + text: t('View available extensions at {{url}}', { url: extensionsUrl }), + }, + Date.now(), + ); + } else { + context.ui.addItem( + { + type: MessageType.INFO, + text: t('Opening extensions page in your browser: {{url}}', { + url: extensionsUrl, + }), + }, + Date.now(), + ); + try { + await open(extensionsUrl); + } catch (_error) { + context.ui.addItem( + { + type: MessageType.ERROR, + text: t( + 'Failed to open browser. Check out the extensions gallery at {{url}}', + { url: extensionsUrl }, + ), + }, + Date.now(), + ); + } + } +} async function listAction(context: CommandContext) { + const extensions = context.services.config + ? context.services.config.getExtensions() + : []; + + if (showMessageIfNoExtensions(context, extensions)) { + return; + } + context.ui.addItem( { type: MessageType.EXTENSIONS_LIST, @@ -34,42 +132,52 @@ async function updateAction(context: CommandContext, args: string) { const updateArgs = args.split(' ').filter((value) => value.length > 0); const all = updateArgs.length === 1 && updateArgs[0] === '--all'; const names = all ? undefined : updateArgs; - let updateInfos: ExtensionUpdateInfo[] = []; if (!all && names?.length === 0) { context.ui.addItem( { type: MessageType.ERROR, - text: 'Usage: /extensions update |--all', + text: t('Usage: /extensions update |--all'), }, Date.now(), ); return; } + let updateInfos: ExtensionUpdateInfo[] = []; + + const extensionManager = context.services.config!.getExtensionManager(); + const extensions = context.services.config + ? context.services.config.getExtensions() + : []; + + if (showMessageIfNoExtensions(context, extensions)) { + return Promise.resolve(); + } + try { - await checkForAllExtensionUpdates( - context.services.config!.getExtensions(), - context.ui.dispatchExtensionStateUpdate, + context.ui.dispatchExtensionStateUpdate({ type: 'BATCH_CHECK_START' }); + await extensionManager.checkForAllExtensionUpdates((extensionName, state) => + context.ui.dispatchExtensionStateUpdate({ + type: 'SET_STATE', + payload: { name: extensionName, state }, + }), ); + context.ui.dispatchExtensionStateUpdate({ type: 'BATCH_CHECK_END' }); + context.ui.setPendingItem({ type: MessageType.EXTENSIONS_LIST, }); if (all) { - updateInfos = await updateAllUpdatableExtensions( - context.services.config!.getWorkingDir(), - // We don't have the ability to prompt for consent yet in this flow. - (description) => - requestConsentInteractive( - description, - context.ui.addConfirmUpdateExtensionRequest, - ), - context.services.config!.getExtensions(), + updateInfos = await extensionManager.updateAllUpdatableExtensions( context.ui.extensionsUpdateState, - context.ui.dispatchExtensionStateUpdate, + (extensionName, state) => + context.ui.dispatchExtensionStateUpdate({ + type: 'SET_STATE', + payload: { name: extensionName, state }, + }), ); } else if (names?.length) { - const workingDir = context.services.config!.getWorkingDir(); const extensions = context.services.config!.getExtensions(); for (const name of names) { const extension = extensions.find( @@ -79,23 +187,21 @@ async function updateAction(context: CommandContext, args: string) { context.ui.addItem( { type: MessageType.ERROR, - text: `Extension ${name} not found.`, + text: t('Extension "{{name}}" not found.', { name }), }, Date.now(), ); continue; } - const updateInfo = await updateExtension( + const updateInfo = await extensionManager.updateExtension( extension, - workingDir, - (description) => - requestConsentInteractive( - description, - context.ui.addConfirmUpdateExtensionRequest, - ), context.ui.extensionsUpdateState.get(extension.name)?.status ?? ExtensionUpdateState.UNKNOWN, - context.ui.dispatchExtensionStateUpdate, + (extensionName, state) => + context.ui.dispatchExtensionStateUpdate({ + type: 'SET_STATE', + payload: { name: extensionName, state }, + }), ); if (updateInfo) updateInfos.push(updateInfo); } @@ -105,7 +211,7 @@ async function updateAction(context: CommandContext, args: string) { context.ui.addItem( { type: MessageType.INFO, - text: 'No extensions to update.', + text: t('No extensions to update.'), }, Date.now(), ); @@ -126,10 +232,361 @@ async function updateAction(context: CommandContext, args: string) { }, Date.now(), ); + context.ui.reloadCommands(); context.ui.setPendingItem(null); } } +async function installAction(context: CommandContext, args: string) { + const extensionManager = context.services.config?.getExtensionManager(); + if (!(extensionManager instanceof ExtensionManager)) { + console.error( + `Cannot ${context.invocation?.name} extensions in this environment`, + ); + return; + } + + const source = args.trim(); + if (!source) { + context.ui.addItem( + { + type: MessageType.ERROR, + text: t('Usage: /extensions install '), + }, + Date.now(), + ); + return; + } + + try { + const installMetadata = await parseInstallSource(source); + context.ui.addItem( + { + type: MessageType.INFO, + text: t('Installing extension from "{{source}}"...', { source }), + }, + Date.now(), + ); + const extension = await extensionManager.installExtension(installMetadata); + context.ui.addItem( + { + type: MessageType.INFO, + text: t('Extension "{{name}}" installed successfully.', { + name: extension.name, + }), + }, + Date.now(), + ); + // FIXME: refresh command controlled by ui for now, cannot be auto refreshed by extensionManager + context.ui.reloadCommands(); + } catch (error) { + context.ui.addItem( + { + type: MessageType.ERROR, + text: t('Failed to install extension from "{{source}}": {{error}}', { + source, + error: getErrorMessage(error), + }), + }, + Date.now(), + ); + return; + } +} + +async function uninstallAction(context: CommandContext, args: string) { + const extensionManager = context.services.config?.getExtensionManager(); + if (!(extensionManager instanceof ExtensionManager)) { + console.error( + `Cannot ${context.invocation?.name} extensions in this environment`, + ); + return; + } + + const name = args.trim(); + if (!name) { + context.ui.addItem( + { + type: MessageType.ERROR, + text: t('Usage: /extensions uninstall '), + }, + Date.now(), + ); + return; + } + + context.ui.addItem( + { + type: MessageType.INFO, + text: t('Uninstalling extension "{{name}}"...', { name }), + }, + Date.now(), + ); + + try { + await extensionManager.uninstallExtension(name, false); + context.ui.addItem( + { + type: MessageType.INFO, + text: t('Extension "{{name}}" uninstalled successfully.', { name }), + }, + Date.now(), + ); + context.ui.reloadCommands(); + } catch (error) { + context.ui.addItem( + { + type: MessageType.ERROR, + text: t('Failed to uninstall extension "{{name}}": {{error}}', { + name, + error: getErrorMessage(error), + }), + }, + Date.now(), + ); + } +} + +function getEnableDisableContext( + context: CommandContext, + argumentsString: string, +): { + extensionManager: ExtensionManager; + names: string[]; + scope: SettingScope; +} | null { + const extensionManager = context.services.config?.getExtensionManager(); + if (!(extensionManager instanceof ExtensionManager)) { + console.error( + `Cannot ${context.invocation?.name} extensions in this environment`, + ); + return null; + } + const parts = argumentsString.split(' '); + const name = parts[0]; + if ( + name === '' || + !( + (parts.length === 2 && parts[1].startsWith('--scope=')) || // --scope= + (parts.length === 3 && parts[1] === '--scope') // --scope + ) + ) { + context.ui.addItem( + { + type: MessageType.ERROR, + text: t( + 'Usage: /extensions {{command}} [--scope=]', + { + command: context.invocation?.name ?? '', + }, + ), + }, + Date.now(), + ); + return null; + } + let scope: SettingScope; + // Transform `--scope=` to `--scope `. + if (parts.length === 2) { + parts.push(...parts[1].split('=')); + parts.splice(1, 1); + } + switch (parts[2].toLowerCase()) { + case 'workspace': + scope = SettingScope.Workspace; + break; + case 'user': + scope = SettingScope.User; + break; + default: + context.ui.addItem( + { + type: MessageType.ERROR, + text: t( + 'Unsupported scope "{{scope}}", should be one of "user" or "workspace"', + { + scope: parts[2], + }, + ), + }, + Date.now(), + ); + return null; + } + let names: string[] = []; + if (name === '--all') { + let extensions = extensionManager.getLoadedExtensions(); + if (context.invocation?.name === 'enable') { + extensions = extensions.filter((ext) => !ext.isActive); + } + if (context.invocation?.name === 'disable') { + extensions = extensions.filter((ext) => ext.isActive); + } + names = extensions.map((ext) => ext.name); + } else { + names = [name]; + } + + return { + extensionManager, + names, + scope, + }; +} + +async function disableAction(context: CommandContext, args: string) { + const enableContext = getEnableDisableContext(context, args); + if (!enableContext) return; + + const { names, scope, extensionManager } = enableContext; + for (const name of names) { + await extensionManager.disableExtension(name, scope); + context.ui.addItem( + { + type: MessageType.INFO, + text: t('Extension "{{name}}" disabled for scope "{{scope}}"', { + name, + scope, + }), + }, + Date.now(), + ); + context.ui.reloadCommands(); + } +} + +async function enableAction(context: CommandContext, args: string) { + const enableContext = getEnableDisableContext(context, args); + if (!enableContext) return; + + const { names, scope, extensionManager } = enableContext; + for (const name of names) { + await extensionManager.enableExtension(name, scope); + context.ui.addItem( + { + type: MessageType.INFO, + text: t('Extension "{{name}}" enabled for scope "{{scope}}"', { + name, + scope, + }), + }, + Date.now(), + ); + context.ui.reloadCommands(); + } +} + +async function detailAction(context: CommandContext, args: string) { + const extensionManager = context.services.config?.getExtensionManager(); + if (!(extensionManager instanceof ExtensionManager)) { + console.error( + `Cannot ${context.invocation?.name} extensions in this environment`, + ); + return; + } + + const name = args.trim(); + if (!name) { + context.ui.addItem( + { + type: MessageType.ERROR, + text: t('Usage: /extensions detail '), + }, + Date.now(), + ); + return; + } + + const extensions = context.services.config!.getExtensions(); + const extension = extensions.find((extension) => extension.name === name); + if (!extension) { + context.ui.addItem( + { + type: MessageType.ERROR, + text: t('Extension "{{name}}" not found.', { name }), + }, + Date.now(), + ); + return; + } + context.ui.addItem( + { + type: MessageType.INFO, + text: extensionToOutputString( + extension, + extensionManager, + process.cwd(), + true, + ), + }, + Date.now(), + ); +} + +export async function completeExtensions( + context: CommandContext, + partialArg: string, +) { + let extensions = context.services.config?.getExtensions() ?? []; + + if (context.invocation?.name === 'enable') { + extensions = extensions.filter((ext) => !ext.isActive); + } + if ( + context.invocation?.name === 'disable' || + context.invocation?.name === 'restart' + ) { + extensions = extensions.filter((ext) => ext.isActive); + } + const extensionNames = extensions.map((ext) => ext.name); + const suggestions = extensionNames.filter((name) => + name.startsWith(partialArg), + ); + + if ( + context.invocation?.name !== 'uninstall' && + context.invocation?.name !== 'detail' + ) { + if ('--all'.startsWith(partialArg) || 'all'.startsWith(partialArg)) { + suggestions.unshift('--all'); + } + } + + return suggestions; +} + +export async function completeExtensionsAndScopes( + context: CommandContext, + partialArg: string, +) { + const completions = await completeExtensions(context, partialArg); + return completions.flatMap((s) => [ + `${s} --scope user`, + `${s} --scope workspace`, + ]); +} + +export async function completeExtensionsExplore( + context: CommandContext, + partialArg: string, +) { + const suggestions = Object.keys(EXTENSION_EXPLORE_URL).filter((name) => + name.startsWith(partialArg), + ); + + return suggestions; +} + +const exploreExtensionsCommand: SlashCommand = { + name: 'explore', + get description() { + return t('Open extensions page in your browser'); + }, + kind: CommandKind.BUILT_IN, + action: exploreAction, + completion: completeExtensionsExplore, +}; + const listExtensionsCommand: SlashCommand = { name: 'list', get description() { @@ -146,19 +603,56 @@ const updateExtensionsCommand: SlashCommand = { }, kind: CommandKind.BUILT_IN, action: updateAction, - completion: async (context, partialArg) => { - const extensions = context.services.config?.getExtensions() ?? []; - const extensionNames = extensions.map((ext) => ext.name); - const suggestions = extensionNames.filter((name) => - name.startsWith(partialArg), - ); + completion: completeExtensions, +}; - if ('--all'.startsWith(partialArg) || 'all'.startsWith(partialArg)) { - suggestions.unshift('--all'); - } - - return suggestions; +const disableCommand: SlashCommand = { + name: 'disable', + get description() { + return t('Disable an extension'); }, + kind: CommandKind.BUILT_IN, + action: disableAction, + completion: completeExtensionsAndScopes, +}; + +const enableCommand: SlashCommand = { + name: 'enable', + get description() { + return t('Enable an extension'); + }, + kind: CommandKind.BUILT_IN, + action: enableAction, + completion: completeExtensionsAndScopes, +}; + +const installCommand: SlashCommand = { + name: 'install', + get description() { + return t('Install an extension from a git repo or local path'); + }, + kind: CommandKind.BUILT_IN, + action: installAction, +}; + +const uninstallCommand: SlashCommand = { + name: 'uninstall', + get description() { + return t('Uninstall an extension'); + }, + kind: CommandKind.BUILT_IN, + action: uninstallAction, + completion: completeExtensions, +}; + +const detailCommand: SlashCommand = { + name: 'detail', + get description() { + return t('Get detail of an extension'); + }, + kind: CommandKind.BUILT_IN, + action: detailAction, + completion: completeExtensions, }; export const extensionsCommand: SlashCommand = { @@ -167,7 +661,16 @@ export const extensionsCommand: SlashCommand = { return t('Manage extensions'); }, kind: CommandKind.BUILT_IN, - subCommands: [listExtensionsCommand, updateExtensionsCommand], + subCommands: [ + listExtensionsCommand, + updateExtensionsCommand, + disableCommand, + enableCommand, + installCommand, + uninstallCommand, + exploreExtensionsCommand, + detailCommand, + ], action: (context, args) => // Default to list if no subcommand is provided listExtensionsCommand.action!(context, args), diff --git a/packages/cli/src/ui/commands/languageCommand.test.ts b/packages/cli/src/ui/commands/languageCommand.test.ts index 719b1780c..9234773eb 100644 --- a/packages/cli/src/ui/commands/languageCommand.test.ts +++ b/packages/cli/src/ui/commands/languageCommand.test.ts @@ -8,6 +8,7 @@ import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'; import * as fs from 'node:fs'; import { type CommandContext, CommandKind } from './types.js'; import { createMockCommandContext } from '../../test-utils/mockCommandContext.js'; +import type { LoadedSettings } from '../../config/settings.js'; // Mock i18n module vi.mock('../../i18n/index.js', () => ({ @@ -71,10 +72,8 @@ vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => { // Import modules after mocking import * as i18n from '../../i18n/index.js'; -import { - languageCommand, - initializeLlmOutputLanguage, -} from './languageCommand.js'; +import { languageCommand } from './languageCommand.js'; +import { initializeLlmOutputLanguage } from '../../utils/languageUtils.js'; describe('languageCommand', () => { let mockContext: CommandContext; @@ -165,11 +164,13 @@ describe('languageCommand', () => { }); }); - it('should show LLM output language when set', async () => { - vi.mocked(fs.existsSync).mockReturnValue(true); - vi.mocked(fs.readFileSync).mockReturnValue( - '# CRITICAL: Chinese Output Language Rule - HIGHEST PRIORITY', - ); + it('should show LLM output language when explicitly set', async () => { + // Set the outputLanguage setting explicitly + mockContext.services.settings = { + ...mockContext.services.settings, + merged: { general: { outputLanguage: 'Chinese' } }, + setValue: vi.fn(), + } as unknown as LoadedSettings; // Make t() function handle interpolation for this test vi.mocked(i18n.t).mockImplementation( @@ -192,7 +193,7 @@ describe('languageCommand', () => { messageType: 'info', content: expect.stringContaining('Current UI language:'), }); - // Verify it correctly parses "Chinese" from the template format + // Verify it shows "Chinese" for the explicitly set language expect(result).toEqual({ type: 'message', messageType: 'info', @@ -200,16 +201,14 @@ describe('languageCommand', () => { }); }); - it('should parse Unicode LLM output language from marker', async () => { - vi.mocked(fs.existsSync).mockReturnValue(true); - vi.mocked(fs.readFileSync).mockReturnValue( - [ - '# ⚠️ CRITICAL: 中文 Output Language Rule - HIGHEST PRIORITY ⚠️', - '', - '', - 'Some other content...', - ].join('\n'), - ); + it('should show auto-detected language when set to auto', async () => { + // Set the outputLanguage setting to 'auto' + mockContext.services.settings = { + ...mockContext.services.settings, + merged: { general: { outputLanguage: 'auto' } }, + setValue: vi.fn(), + } as unknown as LoadedSettings; + vi.mocked(i18n.detectSystemLanguage).mockReturnValue('zh'); vi.mocked(i18n.t).mockImplementation( (key: string, params?: Record) => { @@ -226,10 +225,16 @@ describe('languageCommand', () => { const result = await languageCommand.action(mockContext, ''); + // Verify it shows "Auto (detect from system) → Chinese" expect(result).toEqual({ type: 'message', messageType: 'info', - content: expect.stringContaining('中文'), + content: expect.stringContaining('Auto (detect from system)'), + }); + expect(result).toEqual({ + type: 'message', + messageType: 'info', + content: expect.stringContaining('Chinese'), }); }); }); @@ -404,7 +409,7 @@ describe('languageCommand', () => { }); }); - it('should create LLM output language rule file', async () => { + it('should save LLM output language setting', async () => { if (!languageCommand.action) { throw new Error('The language command must have an action.'); } @@ -414,18 +419,16 @@ describe('languageCommand', () => { 'output Chinese', ); - expect(fs.mkdirSync).toHaveBeenCalled(); - expect(fs.writeFileSync).toHaveBeenCalledWith( - expect.stringContaining('output-language.md'), - expect.stringContaining('Chinese'), - 'utf-8', + // Verify setting was saved (rule file is updated on restart) + expect(mockContext.services.settings?.setValue).toHaveBeenCalledWith( + expect.anything(), // SettingScope.User + 'general.outputLanguage', + 'Chinese', ); expect(result).toEqual({ type: 'message', messageType: 'info', - content: expect.stringContaining( - 'LLM output language rule file generated', - ), + content: expect.stringContaining('LLM output language set to'), }); }); @@ -453,10 +456,11 @@ describe('languageCommand', () => { await languageCommand.action(mockContext, 'output ru'); - expect(fs.writeFileSync).toHaveBeenCalledWith( - expect.stringContaining('output-language.md'), - expect.stringContaining('Russian'), - 'utf-8', + // Verify setting was saved with normalized value + expect(mockContext.services.settings?.setValue).toHaveBeenCalledWith( + expect.anything(), + 'general.outputLanguage', + 'Russian', ); }); @@ -467,28 +471,36 @@ describe('languageCommand', () => { await languageCommand.action(mockContext, 'output de'); - expect(fs.writeFileSync).toHaveBeenCalledWith( - expect.stringContaining('output-language.md'), - expect.stringContaining('German'), - 'utf-8', + // Verify setting was saved with normalized value + expect(mockContext.services.settings?.setValue).toHaveBeenCalledWith( + expect.anything(), + 'general.outputLanguage', + 'German', ); }); - it('should handle file write errors gracefully', async () => { - vi.mocked(fs.writeFileSync).mockImplementation(() => { - throw new Error('Permission denied'); - }); - + it('should save setting without immediate rule file update', async () => { + // Even though rule file updates happen on restart, the setting should still be saved if (!languageCommand.action) { throw new Error('The language command must have an action.'); } - const result = await languageCommand.action(mockContext, 'output German'); + const result = await languageCommand.action( + mockContext, + 'output Spanish', + ); + // Verify setting was saved + expect(mockContext.services.settings?.setValue).toHaveBeenCalledWith( + expect.anything(), + 'general.outputLanguage', + 'Spanish', + ); + // Verify success message (no error about file generation) expect(result).toEqual({ type: 'message', - messageType: 'error', - content: expect.stringContaining('Failed to generate'), + messageType: 'info', + content: expect.stringContaining('LLM output language set to'), }); }); }); @@ -586,24 +598,23 @@ describe('languageCommand', () => { expect(outputSubcommand?.kind).toBe(CommandKind.BUILT_IN); }); - it('should have action that generates rule file', async () => { + it('should have action that saves setting', async () => { if (!outputSubcommand?.action) { throw new Error('Output subcommand must have an action.'); } - // Ensure mocks are properly set for this test - vi.mocked(fs.mkdirSync).mockImplementation(() => undefined); - vi.mocked(fs.writeFileSync).mockImplementation(() => undefined); - const result = await outputSubcommand.action(mockContext, 'French'); - expect(fs.writeFileSync).toHaveBeenCalled(); + // Verify setting was saved (rule file is updated on restart) + expect(mockContext.services.settings?.setValue).toHaveBeenCalledWith( + expect.anything(), + 'general.outputLanguage', + 'French', + ); expect(result).toEqual({ type: 'message', messageType: 'info', - content: expect.stringContaining( - 'LLM output language rule file generated', - ), + content: expect.stringContaining('LLM output language set to'), }); }); }); @@ -688,6 +699,7 @@ describe('languageCommand', () => { vi.mocked(fs.existsSync).mockReturnValue(false); vi.mocked(fs.mkdirSync).mockImplementation(() => undefined); vi.mocked(fs.writeFileSync).mockImplementation(() => undefined); + vi.mocked(fs.readFileSync).mockImplementation(() => ''); }); it('should create file when it does not exist', () => { @@ -704,14 +716,50 @@ describe('languageCommand', () => { ); }); - it('should NOT overwrite existing file', () => { + it('should NOT overwrite existing file when content matches resolved language', () => { vi.mocked(fs.existsSync).mockReturnValue(true); + vi.mocked(i18n.detectSystemLanguage).mockReturnValue('en'); + vi.mocked(fs.readFileSync).mockReturnValue( + `# Output language preference: English + +`, + ); initializeLlmOutputLanguage(); expect(fs.writeFileSync).not.toHaveBeenCalled(); }); + it('should overwrite existing file when output language setting differs', () => { + vi.mocked(fs.existsSync).mockReturnValue(true); + vi.mocked(fs.readFileSync).mockReturnValue( + `# Output language preference: English + +`, + ); + + initializeLlmOutputLanguage('Japanese'); + + expect(fs.writeFileSync).toHaveBeenCalledWith( + expect.stringContaining('output-language.md'), + expect.stringContaining('Japanese'), + 'utf-8', + ); + }); + + it('should resolve auto setting to detected system language', () => { + vi.mocked(fs.existsSync).mockReturnValue(false); + vi.mocked(i18n.detectSystemLanguage).mockReturnValue('zh'); + + initializeLlmOutputLanguage('auto'); + + expect(fs.writeFileSync).toHaveBeenCalledWith( + expect.stringContaining('output-language.md'), + expect.stringContaining('Chinese'), + 'utf-8', + ); + }); + it('should detect Chinese locale and create Chinese rule file', () => { vi.mocked(fs.existsSync).mockReturnValue(false); vi.mocked(i18n.detectSystemLanguage).mockReturnValue('zh'); diff --git a/packages/cli/src/ui/commands/languageCommand.ts b/packages/cli/src/ui/commands/languageCommand.ts index fff4a693a..e4158ce5c 100644 --- a/packages/cli/src/ui/commands/languageCommand.ts +++ b/packages/cli/src/ui/commands/languageCommand.ts @@ -15,25 +15,40 @@ import { SettingScope } from '../../config/settings.js'; import { setLanguageAsync, getCurrentLanguage, - detectSystemLanguage, - getLanguageNameFromLocale, type SupportedLanguage, t, } from '../../i18n/index.js'; +import { SUPPORTED_LANGUAGES } from '../../i18n/languages.js'; import { - SUPPORTED_LANGUAGES, - type LanguageDefinition, -} from '../../i18n/languages.js'; -import * as fs from 'node:fs'; -import * as path from 'node:path'; -import { Storage } from '@qwen-code/qwen-code-core'; + OUTPUT_LANGUAGE_AUTO, + isAutoLanguage, + resolveOutputLanguage, + updateOutputLanguageFile, +} from '../../utils/languageUtils.js'; -const LLM_OUTPUT_LANGUAGE_RULE_FILENAME = 'output-language.md'; -const LLM_OUTPUT_LANGUAGE_MARKER_PREFIX = 'qwen-code:llm-output-language:'; +/** + * Gets the current LLM output language setting and its resolved value. + * Returns an object with both the raw setting and the resolved language. + */ +function getCurrentOutputLanguage(context?: CommandContext): { + setting: string; + resolved: string; +} { + const settingValue = + context?.services?.settings?.merged?.general?.outputLanguage || + OUTPUT_LANGUAGE_AUTO; + const resolved = resolveOutputLanguage(settingValue); + return { setting: settingValue, resolved }; +} +/** + * Parses user input to find a matching supported UI language. + * Accepts locale codes (e.g., "zh"), IDs (e.g., "zh-CN"), or full names (e.g., "Chinese"). + */ function parseUiLanguageArg(input: string): SupportedLanguage | null { const lowered = input.trim().toLowerCase(); if (!lowered) return null; + for (const lang of SUPPORTED_LANGUAGES) { if ( lowered === lang.code || @@ -46,153 +61,22 @@ function parseUiLanguageArg(input: string): SupportedLanguage | null { return null; } +/** + * 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; } -function sanitizeLanguageForMarker(language: string): string { - // HTML comments cannot contain "--" or end markers like "-->" or "--!>" safely. - // Also avoid newlines to keep the marker single-line and robust to parsing. - return language - .replace(/[\r\n]/g, ' ') - .replace(/--!?>/g, '') - .replace(/--/g, ''); -} - /** - * Generates the LLM output language rule template based on the language name. - */ -function generateLlmOutputLanguageRule(language: string): string { - const markerLanguage = sanitizeLanguageForMarker(language); - return `# Output language preference: ${language} - - -## Goal -Prefer responding in **${language}** for normal assistant messages and explanations. - -## Keep technical artifacts unchanged -Do **not** translate or rewrite: -- Code blocks, CLI commands, file paths, stack traces, logs, JSON keys, identifiers -- Exact quoted text from the user (keep quotes verbatim) - -## When a conflict exists -If higher-priority instructions (system/developer) require a different behavior, follow them. - -## Tool / system outputs -Raw tool/system outputs may contain fixed-format English. Preserve them verbatim, and if needed, add a short **${language}** explanation below. -`; -} - -/** - * Gets the path to the LLM output language rule file. - */ -function getLlmOutputLanguageRulePath(): string { - return path.join( - Storage.getGlobalQwenDir(), - LLM_OUTPUT_LANGUAGE_RULE_FILENAME, - ); -} - -/** - * Normalizes a language input to its full English name. - * If the input is a known locale code (e.g., "ru", "zh"), converts it to the full name. - * Otherwise, returns the input as-is (e.g., "Japanese" stays "Japanese"). - */ -function normalizeLanguageName(language: string): string { - const lowered = language.toLowerCase(); - // Check if it's a known locale code and convert to full name - const fullName = getLanguageNameFromLocale(lowered); - // If getLanguageNameFromLocale returned a different value, use it - // Otherwise, use the original input (preserves case for unknown languages) - if (fullName !== 'English' || lowered === 'en') { - return fullName; - } - return language; -} - -function extractLlmOutputLanguageFromRuleFileContent( - content: string, -): string | null { - // Preferred: machine-readable marker that supports Unicode and spaces. - // Example: - const markerMatch = content.match( - new RegExp( - String.raw``, - 'i', - ), - ); - if (markerMatch?.[1]) { - const lang = markerMatch[1].trim(); - if (lang) return lang; - } - - // Backward compatibility: parse the heading line. - // Example: "# CRITICAL: Chinese Output Language Rule - HIGHEST PRIORITY" - // Example: "# ⚠️ CRITICAL: 日本語 Output Language Rule - HIGHEST PRIORITY ⚠️" - const headingMatch = content.match( - /^#.*?CRITICAL:\s*(.*?)\s+Output Language Rule\b/im, - ); - if (headingMatch?.[1]) { - const lang = headingMatch[1].trim(); - if (lang) return lang; - } - - return null; -} - -/** - * Initializes the LLM output language rule file on first startup. - * If the file already exists, it is not overwritten (respects user preference). - */ -export function initializeLlmOutputLanguage(): void { - const filePath = getLlmOutputLanguageRulePath(); - - // Skip if file already exists (user preference) - if (fs.existsSync(filePath)) { - return; - } - - // Detect system language and map to language name - const detectedLocale = detectSystemLanguage(); - const languageName = getLanguageNameFromLocale(detectedLocale); - - // Generate the rule file - const content = generateLlmOutputLanguageRule(languageName); - - // Ensure directory exists - const dir = path.dirname(filePath); - fs.mkdirSync(dir, { recursive: true }); - - // Write file - fs.writeFileSync(filePath, content, 'utf-8'); -} - -/** - * Gets the current LLM output language from the rule file if it exists. - */ -function getCurrentLlmOutputLanguage(): string | null { - const filePath = getLlmOutputLanguageRulePath(); - if (fs.existsSync(filePath)) { - try { - const content = fs.readFileSync(filePath, 'utf-8'); - return extractLlmOutputLanguageFromRuleFileContent(content); - } catch { - // Ignore errors - } - } - return null; -} - -/** - * Sets the UI language and persists it to settings. + * Sets the UI language and persists it to user settings. */ async function setUiLanguage( context: CommandContext, lang: SupportedLanguage, ): Promise { const { services } = context; - const { settings } = services; if (!services.config) { return { @@ -202,19 +86,19 @@ async function setUiLanguage( }; } - // Set language in i18n system (async to support JS translation files) + // Update i18n system await setLanguageAsync(lang); - // Persist to settings (user scope) - if (settings && typeof settings.setValue === 'function') { + // Persist to settings + if (services.settings?.setValue) { try { - settings.setValue(SettingScope.User, 'general.language', lang); + services.settings.setValue(SettingScope.User, 'general.language', lang); } catch (error) { console.warn('Failed to save language setting:', error); } } - // Reload commands to update their descriptions with the new language + // Reload commands to update localized descriptions context.ui.reloadCommands(); return { @@ -227,37 +111,51 @@ async function setUiLanguage( } /** - * Generates the LLM output language rule file. + * Handles the /language output command, updating both the setting and the rule file. + * 'auto' is preserved in settings but resolved to the detected language for the rule file. */ -function generateLlmOutputLanguageRuleFile( +async function setOutputLanguage( + context: CommandContext, language: string, ): Promise { try { - const filePath = getLlmOutputLanguageRulePath(); - // Normalize locale codes (e.g., "ru" -> "Russian") to full language names - const normalizedLanguage = normalizeLanguageName(language); - const content = generateLlmOutputLanguageRule(normalizedLanguage); + const isAuto = isAutoLanguage(language); + const resolved = resolveOutputLanguage(language); + // Save 'auto' as-is to settings, or normalize other values + const settingValue = isAuto ? OUTPUT_LANGUAGE_AUTO : resolved; - // Ensure directory exists - const dir = path.dirname(filePath); - fs.mkdirSync(dir, { recursive: true }); + // Update the rule file with the resolved language + updateOutputLanguageFile(settingValue); - // Write file (overwrite if exists) - fs.writeFileSync(filePath, content, 'utf-8'); + // Save to settings + if (context.services.settings?.setValue) { + try { + context.services.settings.setValue( + SettingScope.User, + 'general.outputLanguage', + settingValue, + ); + } catch (error) { + console.warn('Failed to save output language setting:', error); + } + } - return Promise.resolve({ + // Format display message + const displayLang = isAuto + ? `${t('Auto (detect from system)')} → ${resolved}` + : resolved; + + return { type: 'message', messageType: 'info', content: [ - t('LLM output language rule file generated at {{path}}', { - path: filePath, - }), + t('LLM output language set to {{lang}}', { lang: displayLang }), '', t('Please restart the application for the changes to take effect.'), ].join('\n'), - }); + }; } catch (error) { - return Promise.resolve({ + return { type: 'message', messageType: 'error', content: t( @@ -266,7 +164,7 @@ function generateLlmOutputLanguageRuleFile( error: error instanceof Error ? error.message : String(error), }, ), - }); + }; } } @@ -276,12 +174,12 @@ export const languageCommand: SlashCommand = { return t('View or change the language setting'); }, kind: CommandKind.BUILT_IN, + action: async ( context: CommandContext, args: string, ): Promise => { - const { services } = context; - if (!services.config) { + if (!context.services.config) { return { type: 'message', messageType: 'error', @@ -291,75 +189,83 @@ export const languageCommand: SlashCommand = { const trimmedArgs = args.trim(); - // Handle subcommands if called directly via action (for tests/backward compatibility) - const parts = trimmedArgs.split(/\s+/); - const firstArg = parts[0].toLowerCase(); - const subArgs = parts.slice(1).join(' '); + // Route to subcommands if specified + if (trimmedArgs) { + const [firstArg, ...rest] = trimmedArgs.split(/\s+/); + const subCommandName = firstArg.toLowerCase(); + const subArgs = rest.join(' '); - if (firstArg === 'ui' || firstArg === 'output') { - const subCommand = languageCommand.subCommands?.find( - (s) => s.name === firstArg, - ); - if (subCommand?.action) { - return subCommand.action( - context, - subArgs, - ) as Promise; + if (subCommandName === 'ui' || subCommandName === 'output') { + const subCommand = languageCommand.subCommands?.find( + (s) => s.name === subCommandName, + ); + if (subCommand?.action) { + return subCommand.action( + context, + subArgs, + ) as Promise; + } } + + // Backward compatibility: direct language code (e.g., /language zh) + const targetLang = parseUiLanguageArg(trimmedArgs); + if (targetLang) { + return setUiLanguage(context, targetLang); + } + + // Unknown argument + return { + type: 'message', + messageType: 'error', + content: [ + t('Invalid command. Available subcommands:'), + ` - /language ui [${SUPPORTED_LANGUAGES.map((o) => o.id).join('|')}] - ${t('Set UI language')}`, + ` - /language output - ${t('Set LLM output language')}`, + ].join('\n'), + }; } - // If no arguments, show current language settings and usage - if (!trimmedArgs) { - const currentUiLang = getCurrentLanguage(); - const currentLlmLang = getCurrentLlmOutputLanguage(); - const message = [ + // No arguments: show current status + const currentUiLang = getCurrentLanguage(); + const { setting: outputSetting, resolved: outputResolved } = + getCurrentOutputLanguage(context); + + // Format output language display: show "Auto → English" or just "English" + const outputLangDisplay = isAutoLanguage(outputSetting) + ? `${t('Auto (detect from system)')} → ${outputResolved}` + : outputResolved; + + return { + type: 'message', + messageType: 'info', + content: [ t('Current UI language: {{lang}}', { lang: formatUiLanguageDisplay(currentUiLang as SupportedLanguage), }), - currentLlmLang - ? t('Current LLM output language: {{lang}}', { lang: currentLlmLang }) - : t('LLM output language not set'), + 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 output - ${t('Set LLM output language')}`, - ].join('\n'); - - return { - type: 'message', - messageType: 'info', - content: message, - }; - } - - // Handle backward compatibility for /language [lang] - const targetLang = parseUiLanguageArg(trimmedArgs); - if (targetLang) { - return setUiLanguage(context, targetLang); - } - - return { - type: 'message', - messageType: 'error', - content: [ - t('Invalid command. Available subcommands:'), - ` - /language ui [${SUPPORTED_LANGUAGES.map((o) => o.id).join('|')}] - ${t('Set UI language')}`, - ' - /language output - ' + t('Set LLM output language'), ].join('\n'), }; }, + subCommands: [ + // /language ui subcommand { name: 'ui', get description() { return t('Set UI language'); }, kind: CommandKind.BUILT_IN, + action: async ( context: CommandContext, args: string, ): Promise => { const trimmedArgs = args.trim(); + if (!trimmedArgs) { return { type: 'message', @@ -396,19 +302,45 @@ export const languageCommand: SlashCommand = { return setUiLanguage(context, targetLang); }, - subCommands: SUPPORTED_LANGUAGES.map(createUiLanguageSubCommand), + + // Nested subcommands for each supported language (e.g., /language ui zh-CN) + subCommands: SUPPORTED_LANGUAGES.map( + (lang): SlashCommand => ({ + name: lang.id, + get description() { + return t('Set UI language to {{name}}', { name: lang.fullName }); + }, + kind: CommandKind.BUILT_IN, + action: async (context, args) => { + if (args.trim()) { + return { + type: 'message', + messageType: 'error', + content: t( + 'Language subcommands do not accept additional arguments.', + ), + }; + } + return setUiLanguage(context, lang.code); + }, + }), + ), }, + + // /language output subcommand { name: 'output', get description() { return t('Set LLM output language'); }, kind: CommandKind.BUILT_IN, + action: async ( context: CommandContext, args: string, ): Promise => { const trimmedArgs = args.trim(); + if (!trimmedArgs) { return { type: 'message', @@ -424,33 +356,8 @@ export const languageCommand: SlashCommand = { }; } - return generateLlmOutputLanguageRuleFile(trimmedArgs); + return setOutputLanguage(context, trimmedArgs); }, }, ], }; - -/** - * Helper to create a UI language subcommand. - */ -function createUiLanguageSubCommand(option: LanguageDefinition): SlashCommand { - return { - name: option.id, - get description() { - return t('Set UI language to {{name}}', { name: option.fullName }); - }, - kind: CommandKind.BUILT_IN, - action: async (context, args) => { - if (args.trim().length > 0) { - return { - type: 'message', - messageType: 'error', - content: t( - 'Language subcommands do not accept additional arguments.', - ), - }; - } - return setUiLanguage(context, option.code); - }, - }; -} diff --git a/packages/cli/src/ui/commands/memoryCommand.test.ts b/packages/cli/src/ui/commands/memoryCommand.test.ts index 34df95d0d..ce25c5158 100644 --- a/packages/cli/src/ui/commands/memoryCommand.test.ts +++ b/packages/cli/src/ui/commands/memoryCommand.test.ts @@ -7,7 +7,7 @@ import type { Mock } from 'vitest'; import { vi, describe, it, expect, beforeEach } from 'vitest'; import { memoryCommand } from './memoryCommand.js'; -import type { SlashCommand, type CommandContext } from './types.js'; +import type { SlashCommand, CommandContext } from './types.js'; import { createMockCommandContext } from '../../test-utils/mockCommandContext.js'; import { MessageType } from '../types.js'; import type { LoadedSettings } from '../../config/settings.js'; diff --git a/packages/cli/src/ui/components/AboutBox.tsx b/packages/cli/src/ui/components/AboutBox.tsx index e04fd42c8..70ef13711 100644 --- a/packages/cli/src/ui/components/AboutBox.tsx +++ b/packages/cli/src/ui/components/AboutBox.tsx @@ -8,16 +8,14 @@ import type React from 'react'; import { Box, Text } from 'ink'; import { theme } from '../semantic-colors.js'; import type { ExtendedSystemInfo } from '../../utils/systemInfo.js'; -import { - getSystemInfoFields, - getFieldValue, - type SystemInfoField, -} from '../../utils/systemInfoFields.js'; +import { getSystemInfoFields } from '../../utils/systemInfoFields.js'; import { t } from '../../i18n/index.js'; -type AboutBoxProps = ExtendedSystemInfo; +type AboutBoxProps = ExtendedSystemInfo & { + width?: number; +}; -export const AboutBox: React.FC = (props) => { +export const AboutBox: React.FC = ({ width, ...props }) => { const fields = getSystemInfoFields(props); return ( @@ -26,25 +24,26 @@ export const AboutBox: React.FC = (props) => { borderColor={theme.border.default} flexDirection="column" padding={1} - marginY={1} - width="100%" + width={width} > - {t('About Qwen Code')} + {t('Status')} - {fields.map((field: SystemInfoField) => ( - + {fields.map((field) => ( + {field.label} - - {getFieldValue(field, props)} - + {field.value} ))} diff --git a/packages/cli/src/ui/components/AppHeader.test.tsx b/packages/cli/src/ui/components/AppHeader.test.tsx new file mode 100644 index 000000000..c125bd977 --- /dev/null +++ b/packages/cli/src/ui/components/AppHeader.test.tsx @@ -0,0 +1,93 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { render } from 'ink-testing-library'; +import { describe, expect, it, vi } from 'vitest'; +import { AppHeader } from './AppHeader.js'; +import { ConfigContext } from '../contexts/ConfigContext.js'; +import { SettingsContext } from '../contexts/SettingsContext.js'; +import { type UIState, UIStateContext } from '../contexts/UIStateContext.js'; +import { VimModeProvider } from '../contexts/VimModeContext.js'; +import * as useTerminalSize from '../hooks/useTerminalSize.js'; +import type { LoadedSettings } from '../../config/settings.js'; + +vi.mock('../hooks/useTerminalSize.js'); +const useTerminalSizeMock = vi.mocked(useTerminalSize.useTerminalSize); + +const createSettings = (options?: { hideTips?: boolean }): LoadedSettings => + ({ + merged: { + ui: { + hideTips: options?.hideTips ?? true, + }, + }, + }) as never; + +const createMockConfig = (overrides = {}) => ({ + getContentGeneratorConfig: vi.fn(() => ({ authType: undefined })), + getModel: vi.fn(() => 'gemini-pro'), + getTargetDir: vi.fn(() => '/projects/qwen-code'), + getMcpServers: vi.fn(() => ({})), + getBlockedMcpServers: vi.fn(() => []), + getDebugMode: vi.fn(() => false), + getScreenReader: vi.fn(() => false), + ...overrides, +}); + +const createMockUIState = (overrides: Partial = {}): UIState => + ({ + branchName: 'main', + nightly: false, + debugMessage: '', + sessionStats: { + lastPromptTokenCount: 0, + }, + ...overrides, + }) as UIState; + +const renderWithProviders = ( + uiState: UIState, + settings = createSettings(), + config = createMockConfig(), +) => { + useTerminalSizeMock.mockReturnValue({ columns: 120, rows: 24 }); + return render( + + + + + + + + + , + ); +}; + +describe('', () => { + it('shows the working directory', () => { + const { lastFrame } = renderWithProviders(createMockUIState()); + expect(lastFrame()).toContain('/projects/qwen-code'); + }); + + it('hides the header when screen reader is enabled', () => { + const { lastFrame } = renderWithProviders( + createMockUIState(), + createSettings(), + createMockConfig({ getScreenReader: vi.fn(() => true) }), + ); + // When screen reader is enabled, header is not rendered + expect(lastFrame()).not.toContain('/projects/qwen-code'); + expect(lastFrame()).not.toContain('Qwen Code'); + }); + + it('shows the header with all info when banner is visible', () => { + const { lastFrame } = renderWithProviders(createMockUIState()); + expect(lastFrame()).toContain('>_ Qwen Code'); + expect(lastFrame()).toContain('gemini-pro'); + expect(lastFrame()).toContain('/projects/qwen-code'); + }); +}); diff --git a/packages/cli/src/ui/components/AppHeader.tsx b/packages/cli/src/ui/components/AppHeader.tsx index 9b6c5fc3b..e37d4aef1 100644 --- a/packages/cli/src/ui/components/AppHeader.tsx +++ b/packages/cli/src/ui/components/AppHeader.tsx @@ -9,7 +9,6 @@ import { Header } from './Header.js'; import { Tips } from './Tips.js'; import { useSettings } from '../contexts/SettingsContext.js'; import { useConfig } from '../contexts/ConfigContext.js'; -import { useUIState } from '../contexts/UIStateContext.js'; interface AppHeaderProps { version: string; @@ -18,16 +17,25 @@ interface AppHeaderProps { export const AppHeader = ({ version }: AppHeaderProps) => { const settings = useSettings(); const config = useConfig(); - const { nightly } = useUIState(); + + const contentGeneratorConfig = config.getContentGeneratorConfig(); + const authType = contentGeneratorConfig?.authType; + const model = config.getModel(); + const targetDir = config.getTargetDir(); + const showBanner = !config.getScreenReader(); + const showTips = !(settings.merged.ui?.hideTips || config.getScreenReader()); return ( - {!(settings.merged.ui?.hideBanner || config.getScreenReader()) && ( -
- )} - {!(settings.merged.ui?.hideTips || config.getScreenReader()) && ( - + {showBanner && ( +
)} + {showTips && } ); }; diff --git a/packages/cli/src/ui/components/ApprovalModeDialog.tsx b/packages/cli/src/ui/components/ApprovalModeDialog.tsx index d81b6f4c0..48293ffdc 100644 --- a/packages/cli/src/ui/components/ApprovalModeDialog.tsx +++ b/packages/cli/src/ui/components/ApprovalModeDialog.tsx @@ -54,7 +54,7 @@ export function ApprovalModeDialog({ }: ApprovalModeDialogProps): React.JSX.Element { // Start with User scope by default const [selectedScope, setSelectedScope] = useState( - SettingScope.Workspace, + SettingScope.User, ); // Track the currently highlighted approval mode @@ -90,19 +90,17 @@ export function ApprovalModeDialog({ setSelectedScope(scope); }, []); - const handleScopeSelect = useCallback( - (scope: SettingScope) => { - onSelect(highlightedMode, scope); - }, - [onSelect, highlightedMode], - ); + const handleScopeSelect = useCallback((scope: SettingScope) => { + setSelectedScope(scope); + setMode('mode'); + }, []); - const [focusSection, setFocusSection] = useState<'mode' | 'scope'>('mode'); + const [mode, setMode] = useState<'mode' | 'scope'>('mode'); useKeypress( (key) => { if (key.name === 'tab') { - setFocusSection((prev) => (prev === 'mode' ? 'scope' : 'mode')); + setMode((prev) => (prev === 'mode' ? 'scope' : 'mode')); } if (key.name === 'escape') { onSelect(undefined, selectedScope); @@ -127,59 +125,56 @@ export function ApprovalModeDialog({ - - {/* Approval Mode Selection */} - - {focusSection === 'mode' ? '> ' : ' '} - {t('Approval Mode')}{' '} - {otherScopeModifiedMessage} - - - - - - - {/* Scope Selection */} - - - - - - - {/* Warning when workspace setting will override user setting */} - {showWorkspacePriorityWarning && ( - <> - - ⚠{' '} - {t( - 'Workspace approval mode exists and takes priority. User-level change will have no effect.', - )} + {mode === 'mode' ? ( + + {/* Approval Mode Selection */} + + {mode === 'mode' ? '> ' : ' '} + {t('Approval Mode')}{' '} + + {otherScopeModifiedMessage} - - - )} - - - {t('(Use Enter to select, Tab to change focus)')} + + + + {/* Warning when workspace setting will override user setting */} + {showWorkspacePriorityWarning && ( + + + ⚠{' '} + {t( + 'Workspace approval mode exists and takes priority. User-level change will have no effect.', + )} + + + )} + + ) : ( + + )} + + + {mode === 'mode' + ? t('(Use Enter to select, Tab to configure scope)') + : t('(Use Enter to apply scope, Tab to go back)')} diff --git a/packages/cli/src/ui/components/AsciiArt.ts b/packages/cli/src/ui/components/AsciiArt.ts index 8a37a5df3..c70a38f4c 100644 --- a/packages/cli/src/ui/components/AsciiArt.ts +++ b/packages/cli/src/ui/components/AsciiArt.ts @@ -5,29 +5,10 @@ */ export const shortAsciiLogo = ` - ██████╗ ██╗ ██╗███████╗███╗ ██╗ + ▄▄▄▄▄▄ ▄▄ ▄▄ ▄▄▄▄▄▄▄ ▄▄▄ ▄▄ ██╔═══██╗██║ ██║██╔════╝████╗ ██║ ██║ ██║██║ █╗ ██║█████╗ ██╔██╗ ██║ ██║▄▄ ██║██║███╗██║██╔══╝ ██║╚██╗██║ ╚██████╔╝╚███╔███╔╝███████╗██║ ╚████║ - ╚══▀▀═╝ ╚══╝╚══╝ ╚══════╝╚═╝ ╚═══╝ -`; -export const longAsciiLogo = ` -██╗ ██████╗ ██╗ ██╗███████╗███╗ ██╗ -╚██╗ ██╔═══██╗██║ ██║██╔════╝████╗ ██║ - ╚██╗ ██║ ██║██║ █╗ ██║█████╗ ██╔██╗ ██║ - ██╔╝ ██║▄▄ ██║██║███╗██║██╔══╝ ██║╚██╗██║ -██╔╝ ╚██████╔╝╚███╔███╔╝███████╗██║ ╚████║ -╚═╝ ╚══▀▀═╝ ╚══╝╚══╝ ╚══════╝╚═╝ ╚═══╝ -`; - -export const tinyAsciiLogo = ` - ███ █████████ -░░░███ ███░░░░░███ - ░░░███ ███ ░░░ - ░░░███░███ - ███░ ░███ █████ - ███░ ░░███ ░░███ - ███░ ░░█████████ -░░░ ░░░░░░░░░ + ╚══▀▀═╝ ╚══╝╚══╝ ╚══════╝╚═╝ ╚═══╝ `; diff --git a/packages/cli/src/ui/components/Composer.test.tsx b/packages/cli/src/ui/components/Composer.test.tsx index d660d7040..a12855e4c 100644 --- a/packages/cli/src/ui/components/Composer.test.tsx +++ b/packages/cli/src/ui/components/Composer.test.tsx @@ -14,7 +14,6 @@ import { type UIActions, } from '../contexts/UIActionsContext.js'; import { ConfigContext } from '../contexts/ConfigContext.js'; -import { SettingsContext } from '../contexts/SettingsContext.js'; // Mock VimModeContext hook vi.mock('../contexts/VimModeContext.js', () => ({ useVimMode: vi.fn(() => ({ @@ -146,92 +145,33 @@ const createMockConfig = (overrides = {}) => ({ ...overrides, }); -const createMockSettings = (merged = {}) => ({ - merged: { - hideFooter: false, - showMemoryUsage: false, - ...merged, - }, -}); - /* eslint-disable @typescript-eslint/no-explicit-any */ const renderComposer = ( uiState: UIState, - settings = createMockSettings(), config = createMockConfig(), uiActions = createMockUIActions(), ) => render( - - - - - - - + + + + + , ); /* eslint-enable @typescript-eslint/no-explicit-any */ describe('Composer', () => { - describe('Footer Display Settings', () => { - it('renders Footer by default when hideFooter is false', () => { + describe('Footer Display', () => { + it('renders Footer by default', () => { const uiState = createMockUIState(); - const settings = createMockSettings({ hideFooter: false }); - const { lastFrame } = renderComposer(uiState, settings); + const { lastFrame } = renderComposer(uiState); - // Smoke check that the Footer renders when enabled. + // Smoke check that the Footer renders expect(lastFrame()).toContain('Footer'); }); - - it('does NOT render Footer when hideFooter is true', () => { - const uiState = createMockUIState(); - const settings = createMockSettings({ hideFooter: true }); - - const { lastFrame } = renderComposer(uiState, settings); - - // Check for content that only appears IN the Footer component itself - expect(lastFrame()).not.toContain('[NORMAL]'); // Vim mode indicator - expect(lastFrame()).not.toContain('(main'); // Branch name with parentheses - }); - - it('passes correct props to Footer including vim mode when enabled', async () => { - const uiState = createMockUIState({ - branchName: 'feature-branch', - errorCount: 2, - sessionStats: { - sessionId: 'test-session', - sessionStartTime: new Date(), - // eslint-disable-next-line @typescript-eslint/no-explicit-any - metrics: {} as any, - lastPromptTokenCount: 150, - promptCount: 5, - }, - }); - const config = createMockConfig({ - getModel: vi.fn(() => 'gemini-1.5-flash'), - getTargetDir: vi.fn(() => '/project/path'), - getDebugMode: vi.fn(() => true), - }); - const settings = createMockSettings({ - hideFooter: false, - showMemoryUsage: true, - }); - // Mock vim mode for this test - const { useVimMode } = await import('../contexts/VimModeContext.js'); - vi.mocked(useVimMode).mockReturnValueOnce({ - vimEnabled: true, - vimMode: 'INSERT', - // eslint-disable-next-line @typescript-eslint/no-explicit-any - } as any); - - const { lastFrame } = renderComposer(uiState, settings, config); - - expect(lastFrame()).toContain('Footer'); - // Footer should be rendered with all the state passed through - }); }); describe('Loading Indicator', () => { @@ -261,7 +201,7 @@ describe('Composer', () => { getAccessibility: vi.fn(() => ({ disableLoadingPhrases: true })), }); - const { lastFrame } = renderComposer(uiState, undefined, config); + const { lastFrame } = renderComposer(uiState, config); const output = lastFrame(); expect(output).toContain('LoadingIndicator'); @@ -318,7 +258,8 @@ describe('Composer', () => { }); describe('Context and Status Display', () => { - it('shows ContextSummaryDisplay in normal state', () => { + // Note: ContextSummaryDisplay and status prompts are now rendered in Footer, not Composer + it('shows empty space in normal state (ContextSummaryDisplay moved to Footer)', () => { const uiState = createMockUIState({ ctrlCPressedOnce: false, ctrlDPressedOnce: false, @@ -327,37 +268,43 @@ describe('Composer', () => { const { lastFrame } = renderComposer(uiState); - expect(lastFrame()).toContain('ContextSummaryDisplay'); + // ContextSummaryDisplay is now in Footer, so we just verify normal state renders + expect(lastFrame()).toBeDefined(); }); - it('shows Ctrl+C exit prompt when ctrlCPressedOnce is true', () => { + // Note: Ctrl+C, Ctrl+D, and Escape prompts are now rendered in Footer component + // These are tested in Footer.test.tsx + it('renders Footer which handles Ctrl+C exit prompt', () => { const uiState = createMockUIState({ ctrlCPressedOnce: true, }); const { lastFrame } = renderComposer(uiState); - expect(lastFrame()).toContain('Press Ctrl+C again to exit'); + // Ctrl+C prompt is now inside Footer, verify Footer renders + expect(lastFrame()).toContain('Footer'); }); - it('shows Ctrl+D exit prompt when ctrlDPressedOnce is true', () => { + it('renders Footer which handles Ctrl+D exit prompt', () => { const uiState = createMockUIState({ ctrlDPressedOnce: true, }); const { lastFrame } = renderComposer(uiState); - expect(lastFrame()).toContain('Press Ctrl+D again to exit'); + // Ctrl+D prompt is now inside Footer, verify Footer renders + expect(lastFrame()).toContain('Footer'); }); - it('shows escape prompt when showEscapePrompt is true', () => { + it('renders Footer which handles escape prompt', () => { const uiState = createMockUIState({ showEscapePrompt: true, }); const { lastFrame } = renderComposer(uiState); - expect(lastFrame()).toContain('Press Esc again to clear'); + // Escape prompt is now inside Footer, verify Footer renders + expect(lastFrame()).toContain('Footer'); }); }); @@ -382,7 +329,9 @@ describe('Composer', () => { expect(lastFrame()).not.toContain('InputPrompt'); }); - it('shows AutoAcceptIndicator when approval mode is not default and shell mode is inactive', () => { + // Note: AutoAcceptIndicator and ShellModeIndicator are now rendered inside Footer component + // These are tested in Footer.test.tsx + it('renders Footer which contains AutoAcceptIndicator when approval mode is not default', () => { const uiState = createMockUIState({ showAutoAcceptIndicator: ApprovalMode.YOLO, shellModeActive: false, @@ -390,17 +339,19 @@ describe('Composer', () => { const { lastFrame } = renderComposer(uiState); - expect(lastFrame()).toContain('AutoAcceptIndicator'); + // AutoAcceptIndicator is now inside Footer, verify Footer renders + expect(lastFrame()).toContain('Footer'); }); - it('shows ShellModeIndicator when shell mode is active', () => { + it('renders Footer which contains ShellModeIndicator when shell mode is active', () => { const uiState = createMockUIState({ shellModeActive: true, }); const { lastFrame } = renderComposer(uiState); - expect(lastFrame()).toContain('ShellModeIndicator'); + // ShellModeIndicator is now inside Footer, verify Footer renders + expect(lastFrame()).toContain('Footer'); }); }); diff --git a/packages/cli/src/ui/components/Composer.tsx b/packages/cli/src/ui/components/Composer.tsx index 9052e4f4d..50b04a1d2 100644 --- a/packages/cli/src/ui/components/Composer.tsx +++ b/packages/cli/src/ui/components/Composer.tsx @@ -4,26 +4,20 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Box, Text, useIsScreenReaderEnabled } from 'ink'; -import { useMemo } from 'react'; +import { Box, useIsScreenReaderEnabled } from 'ink'; +import { useCallback, useMemo, useState } from 'react'; import { LoadingIndicator } from './LoadingIndicator.js'; -import { ContextSummaryDisplay } from './ContextSummaryDisplay.js'; -import { AutoAcceptIndicator } from './AutoAcceptIndicator.js'; -import { ShellModeIndicator } from './ShellModeIndicator.js'; import { DetailedMessagesDisplay } from './DetailedMessagesDisplay.js'; import { InputPrompt, calculatePromptWidths } from './InputPrompt.js'; import { Footer } from './Footer.js'; import { ShowMoreLines } from './ShowMoreLines.js'; import { QueuedMessageDisplay } from './QueuedMessageDisplay.js'; +import { KeyboardShortcuts } from './KeyboardShortcuts.js'; import { OverflowProvider } from '../contexts/OverflowContext.js'; -import { theme } from '../semantic-colors.js'; -import { isNarrowWidth } from '../utils/isNarrowWidth.js'; import { useUIState } from '../contexts/UIStateContext.js'; import { useUIActions } from '../contexts/UIActionsContext.js'; import { useVimMode } from '../contexts/VimModeContext.js'; import { useConfig } from '../contexts/ConfigContext.js'; -import { useSettings } from '../contexts/SettingsContext.js'; -import { ApprovalMode } from '@qwen-code/qwen-code-core'; import { StreamingState } from '../types.js'; import { ConfigInitDisplay } from '../components/ConfigInitDisplay.js'; import { FeedbackDialog } from '../FeedbackDialog.js'; @@ -31,16 +25,26 @@ import { t } from '../../i18n/index.js'; export const Composer = () => { const config = useConfig(); - const settings = useSettings(); const isScreenReaderEnabled = useIsScreenReaderEnabled(); const uiState = useUIState(); const uiActions = useUIActions(); const { vimEnabled } = useVimMode(); const terminalWidth = process.stdout.columns; - const isNarrow = isNarrowWidth(terminalWidth); const debugConsoleMaxHeight = Math.floor(Math.max(terminalWidth * 0.2, 5)); - const { contextFileNames, showAutoAcceptIndicator } = uiState; + const { showAutoAcceptIndicator } = uiState; + + // State for keyboard shortcuts display toggle + const [showShortcuts, setShowShortcuts] = useState(false); + const handleToggleShortcuts = useCallback(() => { + setShowShortcuts((prev) => !prev); + }, []); + + // State for suggestions visibility + const [showSuggestions, setShowSuggestions] = useState(false); + const handleSuggestionsVisibilityChange = useCallback((visible: boolean) => { + setShowSuggestions(visible); + }, []); // Use the container width of InputPrompt for width of DetailedMessagesDisplay const { containerWidth } = useMemo( @@ -49,7 +53,7 @@ export const Composer = () => { ); return ( - + {!uiState.embeddedShellFocused && ( { - - - {process.env['GEMINI_SYSTEM_MD'] && ( - |⌐■_■| - )} - {uiState.ctrlCPressedOnce ? ( - - {t('Press Ctrl+C again to exit.')} - - ) : uiState.ctrlDPressedOnce ? ( - - {t('Press Ctrl+D again to exit.')} - - ) : uiState.showEscapePrompt ? ( - - {t('Press Esc again to clear.')} - - ) : ( - !settings.merged.ui?.hideContextSummary && ( - - ) - )} - - - {showAutoAcceptIndicator !== ApprovalMode.DEFAULT && - !uiState.shellModeActive && ( - - )} - {uiState.shellModeActive && } - - - {uiState.showErrorDetails && ( @@ -152,6 +107,9 @@ export const Composer = () => { setShellModeActive={uiActions.setShellModeActive} approvalMode={showAutoAcceptIndicator} onEscapePromptChange={uiActions.onEscapePromptChange} + onToggleShortcuts={handleToggleShortcuts} + showShortcuts={showShortcuts} + onSuggestionsVisibilityChange={handleSuggestionsVisibilityChange} focus={true} vimHandleInput={uiActions.vimHandleInput} isEmbeddedShellFocused={uiState.embeddedShellFocused} @@ -163,7 +121,13 @@ export const Composer = () => { /> )} - {!settings.merged.ui?.hideFooter && !isScreenReaderEnabled &&