fix default values of reasoning config for openai compatible api

Doc/qwencode java

.gitignore

@@ -23,6 +23,7 @@ package-lock.json
 .idea
 *.iml
 .cursor
+.qoder
 
 # OS metadata
 .DS_Store

README.md

@@ -191,6 +191,7 @@ See [settings](https://qwenlm.github.io/qwen-code-docs/en/users/configuration/se
 
 Looking for a graphical interface?
 
+- [**AionUi**](https://github.com/iOfficeAI/AionUi) A modern GUI for command-line AI tools including Qwen Code
 - [**Gemini CLI Desktop**](https://github.com/Piebald-AI/gemini-cli-desktop) A cross-platform desktop/web/mobile UI for Qwen Code
 
 ## Troubleshooting

docs/developers/_meta.ts

@@ -11,6 +11,7 @@ export default {
     type: 'separator',
   },
   'sdk-typescript': 'Typescript SDK',
+  'sdk-java': 'Java SDK(alpha)',
   'Dive Into Qwen Code': {
     title: 'Dive Into Qwen Code',
     type: 'separator',

docs/developers/sdk-java.md

@@ -0,0 +1,312 @@
+# Qwen Code Java SDK
+
+The Qwen Code Java SDK is a minimum experimental SDK for programmatic access to Qwen Code functionality. It provides a Java interface to interact with the Qwen Code CLI, allowing developers to integrate Qwen Code capabilities into their Java applications.
+
+## Requirements
+
+- Java >= 1.8
+- Maven >= 3.6.0 (for building from source)
+- qwen-code >= 0.5.0
+
+### Dependencies
+
+- **Logging**: ch.qos.logback:logback-classic
+- **Utilities**: org.apache.commons:commons-lang3
+- **JSON Processing**: com.alibaba.fastjson2:fastjson2
+- **Testing**: JUnit 5 (org.junit.jupiter:junit-jupiter)
+
+## Installation
+
+Add the following dependency to your Maven `pom.xml`:
+
+```xml
+<dependency>
+    <groupId>com.alibaba</groupId>
+    <artifactId>qwencode-sdk</artifactId>
+    <version>{$version}</version>
+</dependency>
+```
+
+Or if using Gradle, add to your `build.gradle`:
+
+```gradle
+implementation 'com.alibaba:qwencode-sdk:{$version}'
+```
+
+## Building and Running
+
+### Build Commands
+
+```bash
+# Compile the project
+mvn compile
+
+# Run tests
+mvn test
+
+# Package the JAR
+mvn package
+
+# Install to local repository
+mvn install
+```
+
+## Quick Start
+
+The simplest way to use the SDK is through the `QwenCodeCli.simpleQuery()` method:
+
+```java
+public static void runSimpleExample() {
+    List<String> result = QwenCodeCli.simpleQuery("hello world");
+    result.forEach(logger::info);
+}
+```
+
+For more advanced usage with custom transport options:
+
+```java
+public static void runTransportOptionsExample() {
+    TransportOptions options = new TransportOptions()
+            .setModel("qwen3-coder-flash")
+            .setPermissionMode(PermissionMode.AUTO_EDIT)
+            .setCwd("./")
+            .setEnv(new HashMap<String, String>() {{put("CUSTOM_VAR", "value");}})
+            .setIncludePartialMessages(true)
+            .setTurnTimeout(new Timeout(120L, TimeUnit.SECONDS))
+            .setMessageTimeout(new Timeout(90L, TimeUnit.SECONDS))
+            .setAllowedTools(Arrays.asList("read_file", "write_file", "list_directory"));
+
+    List<String> result = QwenCodeCli.simpleQuery("who are you, what are your capabilities?", options);
+    result.forEach(logger::info);
+}
+```
+
+For streaming content handling with custom content consumers:
+
+```java
+public static void runStreamingExample() {
+    QwenCodeCli.simpleQuery("who are you, what are your capabilities?",
+            new TransportOptions().setMessageTimeout(new Timeout(10L, TimeUnit.SECONDS)), new AssistantContentSimpleConsumers() {
+
+                @Override
+                public void onText(Session session, TextAssistantContent textAssistantContent) {
+                    logger.info("Text content received: {}", textAssistantContent.getText());
+                }
+
+                @Override
+                public void onThinking(Session session, ThingkingAssistantContent thingkingAssistantContent) {
+                    logger.info("Thinking content received: {}", thingkingAssistantContent.getThinking());
+                }
+
+                @Override
+                public void onToolUse(Session session, ToolUseAssistantContent toolUseContent) {
+                    logger.info("Tool use content received: {} with arguments: {}",
+                            toolUseContent, toolUseContent.getInput());
+                }
+
+                @Override
+                public void onToolResult(Session session, ToolResultAssistantContent toolResultContent) {
+                    logger.info("Tool result content received: {}", toolResultContent.getContent());
+                }
+
+                @Override
+                public void onOtherContent(Session session, AssistantContent<?> other) {
+                    logger.info("Other content received: {}", other);
+                }
+
+                @Override
+                public void onUsage(Session session, AssistantUsage assistantUsage) {
+                    logger.info("Usage information received: Input tokens: {}, Output tokens: {}",
+                            assistantUsage.getUsage().getInputTokens(), assistantUsage.getUsage().getOutputTokens());
+                }
+            }.setDefaultPermissionOperation(Operation.allow));
+    logger.info("Streaming example completed.");
+}
+```
+
+other examples see src/test/java/com/alibaba/qwen/code/cli/example
+
+## Architecture
+
+The SDK follows a layered architecture:
+
+- **API Layer**: Provides the main entry points through `QwenCodeCli` class with simple static methods for basic usage
+- **Session Layer**: Manages communication sessions with the Qwen Code CLI through the `Session` class
+- **Transport Layer**: Handles the communication mechanism between the SDK and CLI process (currently using process transport via `ProcessTransport`)
+- **Protocol Layer**: Defines data structures for communication based on the CLI protocol
+- **Utils**: Common utilities for concurrent execution, timeout handling, and error management
+
+## Key Features
+
+### Permission Modes
+
+The SDK supports different permission modes for controlling tool execution:
+
+- **`default`**: Write tools are denied unless approved via `canUseTool` callback or in `allowedTools`. Read-only tools execute without confirmation.
+- **`plan`**: Blocks all write tools, instructing AI to present a plan first.
+- **`auto-edit`**: Auto-approve edit tools (edit, write_file) while other tools require confirmation.
+- **`yolo`**: All tools execute automatically without confirmation.
+
+### Session Event Consumers and Assistant Content Consumers
+
+The SDK provides two key interfaces for handling events and content from the CLI:
+
+#### SessionEventConsumers Interface
+
+The `SessionEventConsumers` interface provides callbacks for different types of messages during a session:
+
+- `onSystemMessage`: Handles system messages from the CLI (receives Session and SDKSystemMessage)
+- `onResultMessage`: Handles result messages from the CLI (receives Session and SDKResultMessage)
+- `onAssistantMessage`: Handles assistant messages (AI responses) (receives Session and SDKAssistantMessage)
+- `onPartialAssistantMessage`: Handles partial assistant messages during streaming (receives Session and SDKPartialAssistantMessage)
+- `onUserMessage`: Handles user messages (receives Session and SDKUserMessage)
+- `onOtherMessage`: Handles other types of messages (receives Session and String message)
+- `onControlResponse`: Handles control responses (receives Session and CLIControlResponse)
+- `onControlRequest`: Handles control requests (receives Session and CLIControlRequest, returns CLIControlResponse)
+- `onPermissionRequest`: Handles permission requests (receives Session and CLIControlRequest<CLIControlPermissionRequest>, returns Behavior)
+
+#### AssistantContentConsumers Interface
+
+The `AssistantContentConsumers` interface handles different types of content within assistant messages:
+
+- `onText`: Handles text content (receives Session and TextAssistantContent)
+- `onThinking`: Handles thinking content (receives Session and ThingkingAssistantContent)
+- `onToolUse`: Handles tool use content (receives Session and ToolUseAssistantContent)
+- `onToolResult`: Handles tool result content (receives Session and ToolResultAssistantContent)
+- `onOtherContent`: Handles other content types (receives Session and AssistantContent)
+- `onUsage`: Handles usage information (receives Session and AssistantUsage)
+- `onPermissionRequest`: Handles permission requests (receives Session and CLIControlPermissionRequest, returns Behavior)
+- `onOtherControlRequest`: Handles other control requests (receives Session and ControlRequestPayload, returns ControlResponsePayload)
+
+#### Relationship Between the Interfaces
+
+**Important Note on Event Hierarchy:**
+
+- `SessionEventConsumers` is the **high-level** event processor that handles different message types (system, assistant, user, etc.)
+- `AssistantContentConsumers` is the **low-level** content processor that handles different types of content within assistant messages (text, tools, thinking, etc.)
+
+**Processor Relationship:**
+
+- `SessionEventConsumers` → `AssistantContentConsumers` (SessionEventConsumers uses AssistantContentConsumers to process content within assistant messages)
+
+**Event Derivation Relationships:**
+
+- `onAssistantMessage` → `onText`, `onThinking`, `onToolUse`, `onToolResult`, `onOtherContent`, `onUsage`
+- `onPartialAssistantMessage` → `onText`, `onThinking`, `onToolUse`, `onToolResult`, `onOtherContent`
+- `onControlRequest` → `onPermissionRequest`, `onOtherControlRequest`
+
+**Event Timeout Relationships:**
+
+Each event handler method has a corresponding timeout method that allows customizing the timeout behavior for that specific event:
+
+- `onSystemMessage` ↔ `onSystemMessageTimeout`
+- `onResultMessage` ↔ `onResultMessageTimeout`
+- `onAssistantMessage` ↔ `onAssistantMessageTimeout`
+- `onPartialAssistantMessage` ↔ `onPartialAssistantMessageTimeout`
+- `onUserMessage` ↔ `onUserMessageTimeout`
+- `onOtherMessage` ↔ `onOtherMessageTimeout`
+- `onControlResponse` ↔ `onControlResponseTimeout`
+- `onControlRequest` ↔ `onControlRequestTimeout`
+
+For AssistantContentConsumers timeout methods:
+
+- `onText` ↔ `onTextTimeout`
+- `onThinking` ↔ `onThinkingTimeout`
+- `onToolUse` ↔ `onToolUseTimeout`
+- `onToolResult` ↔ `onToolResultTimeout`
+- `onOtherContent` ↔ `onOtherContentTimeout`
+- `onPermissionRequest` ↔ `onPermissionRequestTimeout`
+- `onOtherControlRequest` ↔ `onOtherControlRequestTimeout`
+
+**Default Timeout Values:**
+
+- `SessionEventSimpleConsumers` default timeout: 180 seconds (Timeout.TIMEOUT_180_SECONDS)
+- `AssistantContentSimpleConsumers` default timeout: 60 seconds (Timeout.TIMEOUT_60_SECONDS)
+
+**Timeout Hierarchy Requirements:**
+
+For proper operation, the following timeout relationships should be maintained:
+
+- `onAssistantMessageTimeout` return value should be greater than `onTextTimeout`, `onThinkingTimeout`, `onToolUseTimeout`, `onToolResultTimeout`, and `onOtherContentTimeout` return values
+- `onControlRequestTimeout` return value should be greater than `onPermissionRequestTimeout` and `onOtherControlRequestTimeout` return values
+
+### Transport Options
+
+The `TransportOptions` class allows configuration of how the SDK communicates with the Qwen Code CLI:
+
+- `pathToQwenExecutable`: Path to the Qwen Code CLI executable
+- `cwd`: Working directory for the CLI process
+- `model`: AI model to use for the session
+- `permissionMode`: Permission mode that controls tool execution
+- `env`: Environment variables to pass to the CLI process
+- `maxSessionTurns`: Limits the number of conversation turns in a session
+- `coreTools`: List of core tools that should be available to the AI
+- `excludeTools`: List of tools to exclude from being available to the AI
+- `allowedTools`: List of tools that are pre-approved for use without additional confirmation
+- `authType`: Authentication type to use for the session
+- `includePartialMessages`: Enables receiving partial messages during streaming responses
+- `skillsEnable`: Enables or disables skills functionality for the session
+- `turnTimeout`: Timeout for a complete turn of conversation
+- `messageTimeout`: Timeout for individual messages within a turn
+- `resumeSessionId`: ID of a previous session to resume
+- `otherOptions`: Additional command-line options to pass to the CLI
+
+### Session Control Features
+
+- **Session creation**: Use `QwenCodeCli.newSession()` to create a new session with custom options
+- **Session management**: The `Session` class provides methods to send prompts, handle responses, and manage session state
+- **Session cleanup**: Always close sessions using `session.close()` to properly terminate the CLI process
+- **Session resumption**: Use `setResumeSessionId()` in `TransportOptions` to resume a previous session
+- **Session interruption**: Use `session.interrupt()` to interrupt a currently running prompt
+- **Dynamic model switching**: Use `session.setModel()` to change the model during a session
+- **Dynamic permission mode switching**: Use `session.setPermissionMode()` to change the permission mode during a session
+
+### Thread Pool Configuration
+
+The SDK uses a thread pool for managing concurrent operations with the following default configuration:
+
+- **Core Pool Size**: 30 threads
+- **Maximum Pool Size**: 100 threads
+- **Keep-Alive Time**: 60 seconds
+- **Queue Capacity**: 300 tasks (using LinkedBlockingQueue)
+- **Thread Naming**: "qwen_code_cli-pool-{number}"
+- **Daemon Threads**: false
+- **Rejected Execution Handler**: CallerRunsPolicy
+
+## Error Handling
+
+The SDK provides specific exception types for different error scenarios:
+
+- `SessionControlException`: Thrown when there's an issue with session control (creation, initialization, etc.)
+- `SessionSendPromptException`: Thrown when there's an issue sending a prompt or receiving a response
+- `SessionClosedException`: Thrown when attempting to use a closed session
+
+## FAQ / Troubleshooting
+
+### Q: Do I need to install the Qwen CLI separately?
+
+A: yes, requires Qwen CLI 0.5.5 or higher.
+
+### Q: What Java versions are supported?
+
+A: The SDK requires Java 1.8 or higher.
+
+### Q: How do I handle long-running requests?
+
+A: The SDK includes timeout utilities. You can configure timeouts using the `Timeout` class in `TransportOptions`.
+
+### Q: Why are some tools not executing?
+
+A: This is likely due to permission modes. Check your permission mode settings and consider using `allowedTools` to pre-approve certain tools.
+
+### Q: How do I resume a previous session?
+
+A: Use the `setResumeSessionId()` method in `TransportOptions` to resume a previous session.
+
+### Q: Can I customize the environment for the CLI process?
+
+A: Yes, use the `setEnv()` method in `TransportOptions` to pass environment variables to the CLI process.
+
+## License
+
+Apache-2.0 - see [LICENSE](./LICENSE) for details.

docs/users/configuration/settings.md

@@ -381,7 +381,7 @@ Arguments passed directly when running the CLI can override other configurations
 | `--telemetry-otlp-protocol`  |       | Sets the OTLP protocol for telemetry (`grpc` or `http`).                                                                                                                                |                                        | Defaults to `grpc`. See [telemetry](../../developers/development/telemetry) for more information.                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | `--telemetry-log-prompts`    |       | Enables logging of prompts for telemetry.                                                                                                                                               |                                        | See [telemetry](../../developers/development/telemetry) for more information.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | `--checkpointing`            |       | Enables [checkpointing](../features/checkpointing).                                                                                                                                     |                                        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-| `--experimental-acp`         |       | Enables ACP mode (Agent Control Protocol). Useful for IDE/editor integrations like [Zed](../integration-zed).                                                                           |                                        | Experimental.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+| `--acp`                      |       | Enables ACP mode (Agent Control Protocol). Useful for IDE/editor integrations like [Zed](../integration-zed).                                                                           |                                        | Stable. Replaces the deprecated `--experimental-acp` flag.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | `--experimental-skills`      |       | Enables experimental [Agent Skills](../features/skills) (registers the `skill` tool and loads Skills from `.qwen/skills/` and `~/.qwen/skills/`).                                       |                                        | Experimental.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | `--extensions`               | `-e`  | Specifies a list of extensions to use for the session.                                                                                                                                  | Extension names                        | If not provided, all available extensions are used. Use the special term `qwen -e none` to disable all extensions. Example: `qwen -e my-extension -e my-other-extension`                                                                                                                                                                                                                                                                                                                                                                                        |
 | `--list-extensions`          | `-l`  | Lists all available extensions and exits.                                                                                                                                               |                                        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |

docs/users/features/_meta.ts

@@ -10,4 +10,5 @@ export default {
   mcp: 'MCP',
   'token-caching': 'Token Caching',
   sandbox: 'Sandboxing',
+  language: 'i18n',
 };

docs/users/features/commands.md

@@ -48,7 +48,7 @@ Commands specifically for controlling interface and output language.
 | → `ui [language]`     | Set UI interface language        | `/language ui zh-CN`       |
 | → `output [language]` | Set LLM output language          | `/language output Chinese` |
 
-- Available UI languages: `zh-CN` (Simplified Chinese), `en-US` (English)
+- Available built-in UI languages: `zh-CN` (Simplified Chinese), `en-US` (English), `ru-RU` (Russian), `de-DE` (German)
 - Output language examples: `Chinese`, `English`, `Japanese`, etc.
 
 ### 1.4 Tool and Model Management
@@ -72,17 +72,16 @@ Commands for managing AI tools and models.
 
 Commands for obtaining information and performing system settings.
 
-| Command         | Description                                     | Usage Examples                                   |
-| --------------- | ----------------------------------------------- | ------------------------------------------------ |
-| `/help`         | Display help information for available commands | `/help` or `/?`                                  |
-| `/about`        | Display version information                     | `/about`                                         |
-| `/stats`        | Display detailed statistics for current session | `/stats`                                         |
-| `/settings`     | Open settings editor                            | `/settings`                                      |
-| `/auth`         | Change authentication method                    | `/auth`                                          |
-| `/bug`          | Submit issue about Qwen Code                    | `/bug Button click unresponsive`                 |
-| `/copy`         | Copy last output content to clipboard           | `/copy`                                          |
-| `/quit-confirm` | Show confirmation dialog before quitting        | `/quit-confirm` (shortcut: press `Ctrl+C` twice) |
-| `/quit`         | Exit Qwen Code immediately                      | `/quit` or `/exit`                               |
+| Command     | Description                                     | Usage Examples                   |
+| ----------- | ----------------------------------------------- | -------------------------------- |
+| `/help`     | Display help information for available commands | `/help` or `/?`                  |
+| `/about`    | Display version information                     | `/about`                         |
+| `/stats`    | Display detailed statistics for current session | `/stats`                         |
+| `/settings` | Open settings editor                            | `/settings`                      |
+| `/auth`     | Change authentication method                    | `/auth`                          |
+| `/bug`      | Submit issue about Qwen Code                    | `/bug Button click unresponsive` |
+| `/copy`     | Copy last output content to clipboard           | `/copy`                          |
+| `/quit`     | Exit Qwen Code immediately                      | `/quit` or `/exit`               |
 
 ### 1.6 Common Shortcuts
 

docs/users/features/language.md

@@ -0,0 +1,136 @@
+# Internationalization (i18n) & Language
+
+Qwen Code is built for multilingual workflows: it supports UI localization (i18n/l10n) in the CLI, lets you choose the assistant output language, and allows custom UI language packs.
+
+## Overview
+
+From a user point of view, Qwen Code’s “internationalization” spans multiple layers:
+
+| Capability / Setting     | What it controls                                                       | Where stored                 |
+| ------------------------ | ---------------------------------------------------------------------- | ---------------------------- |
+| `/language ui`           | Terminal UI text (menus, system messages, prompts)                     | `~/.qwen/settings.json`      |
+| `/language output`       | Language the AI responds in (an output preference, not UI translation) | `~/.qwen/output-language.md` |
+| Custom UI language packs | Overrides/extends built-in UI translations                             | `~/.qwen/locales/*.js`       |
+
+## UI Language
+
+This is the CLI’s UI localization layer (i18n/l10n): it controls the language of menus, prompts, and system messages.
+
+### Setting the UI Language
+
+Use the `/language ui` command:
+
+```bash
+/language ui zh-CN    # Chinese
+/language ui en-US    # English
+/language ui ru-RU    # Russian
+/language ui de-DE    # German
+```
+
+Aliases are also supported:
+
+```bash
+/language ui zh       # Chinese
+/language ui en       # English
+/language ui ru       # Russian
+/language ui de       # German
+```
+
+### Auto-detection
+
+On first startup, Qwen Code detects your system locale and sets the UI language automatically.
+
+Detection priority:
+
+1. `QWEN_CODE_LANG` environment variable
+2. `LANG` environment variable
+3. System locale via JavaScript Intl API
+4. Default: English
+
+## LLM Output Language
+
+The LLM output language controls what language the AI assistant responds in, regardless of what language you type your questions in.
+
+### How It Works
+
+The LLM output language is controlled by a rule file at `~/.qwen/output-language.md`. This file is automatically included in the LLM's context during startup, instructing it to respond in the specified language.
+
+### Auto-detection
+
+On first startup, if no `output-language.md` file exists, Qwen Code automatically creates one based on your system locale. For example:
+
+- System locale `zh` creates a rule for Chinese responses
+- System locale `en` creates a rule for English responses
+- System locale `ru` creates a rule for Russian responses
+- System locale `de` creates a rule for German responses
+
+### Manual Setting
+
+Use `/language output <language>` to change:
+
+```bash
+/language output Chinese
+/language output English
+/language output Japanese
+/language output German
+```
+
+Any language name works. The LLM will be instructed to respond in that language.
+
+> [!note]
+>
+> After changing the output language, restart Qwen Code for the change to take effect.
+
+### File Location
+
+```
+~/.qwen/output-language.md
+```
+
+## Configuration
+
+### Via Settings Dialog
+
+1. Run `/settings`
+2. Find "Language" under General
+3. Select your preferred UI language
+
+### Via Environment Variable
+
+```bash
+export QWEN_CODE_LANG=zh
+```
+
+This influences auto-detection on first startup (if you haven’t set a UI language and no `output-language.md` file exists yet).
+
+## Custom Language Packs
+
+For UI translations, you can create custom language packs in `~/.qwen/locales/`:
+
+- Example: `~/.qwen/locales/es.js` for Spanish
+- Example: `~/.qwen/locales/fr.js` for French
+
+User directory takes precedence over built-in translations.
+
+> [!tip]
+>
+> Contributions are welcome! If you’d like to improve built-in translations or add new languages.
+> For a concrete example, see [PR #1238: feat(i18n): add Russian language support](https://github.com/QwenLM/qwen-code/pull/1238).
+
+### Language Pack Format
+
+```javascript
+// ~/.qwen/locales/es.js
+export default {
+  Hello: 'Hola',
+  Settings: 'Configuracion',
+  // ... more translations
+};
+```
+
+## Related Commands
+
+- `/language` - Show current language settings
+- `/language ui [lang]` - Set UI language
+- `/language output <language>` - Set LLM output language
+- `/settings` - Open settings dialog

docs/users/integration-zed.md

@@ -32,7 +32,7 @@
 "Qwen Code": {
   "type": "custom",
   "command": "qwen",
-  "args": ["--experimental-acp"],
+  "args": ["--acp"],
   "env": {}
 }
 ```

eslint.config.js

@@ -24,6 +24,8 @@ export default tseslint.config(
       '.integration-tests/**',
       'packages/**/.integration-test/**',
       'dist/**',
+      'docs-site/.next/**',
+      'docs-site/out/**',
     ],
   },
   eslint.configs.recommended,

integration-tests/acp-integration.test.ts

@@ -80,10 +80,11 @@ type PermissionHandler = (
 
 /**
  * Sets up an ACP test environment with all necessary utilities.
+ * @param useNewFlag - If true, uses --acp; if false, uses --experimental-acp (for backward compatibility testing)
  */
 function setupAcpTest(
   rig: TestRig,
-  options?: { permissionHandler?: PermissionHandler },
+  options?: { permissionHandler?: PermissionHandler; useNewFlag?: boolean },
 ) {
   const pending = new Map<number, PendingRequest>();
   let nextRequestId = 1;
@@ -95,9 +96,13 @@ function setupAcpTest(
   const permissionHandler =
     options?.permissionHandler ?? (() => ({ optionId: 'proceed_once' }));
 
+  // Use --acp by default, but allow testing with --experimental-acp for backward compatibility
+  const acpFlag =
+    options?.useNewFlag !== false ? '--acp' : '--experimental-acp';
+
   const agent = spawn(
     'node',
-    [rig.bundlePath, '--experimental-acp', '--no-chat-recording'],
+    [rig.bundlePath, acpFlag, '--no-chat-recording'],
     {
       cwd: rig.testDir!,
       stdio: ['pipe', 'pipe', 'pipe'],
@@ -621,3 +626,99 @@ function setupAcpTest(
     }
   });
 });
+
+(IS_SANDBOX ? describe.skip : describe)(
+  'acp flag backward compatibility',
+  () => {
+    it('should work with deprecated --experimental-acp flag and show warning', async () => {
+      const rig = new TestRig();
+      rig.setup('acp backward compatibility');
+
+      const { sendRequest, cleanup, stderr } = setupAcpTest(rig, {
+        useNewFlag: false,
+      });
+
+      try {
+        const initResult = await sendRequest('initialize', {
+          protocolVersion: 1,
+          clientCapabilities: {
+            fs: { readTextFile: true, writeTextFile: true },
+          },
+        });
+        expect(initResult).toBeDefined();
+
+        // Verify deprecation warning is shown
+        const stderrOutput = stderr.join('');
+        expect(stderrOutput).toContain('--experimental-acp is deprecated');
+        expect(stderrOutput).toContain('Please use --acp instead');
+
+        await sendRequest('authenticate', { methodId: 'openai' });
+
+        const newSession = (await sendRequest('session/new', {
+          cwd: rig.testDir!,
+          mcpServers: [],
+        })) as { sessionId: string };
+        expect(newSession.sessionId).toBeTruthy();
+
+        // Verify functionality still works
+        const promptResult = await sendRequest('session/prompt', {
+          sessionId: newSession.sessionId,
+          prompt: [{ type: 'text', text: 'Say hello.' }],
+        });
+        expect(promptResult).toBeDefined();
+      } catch (e) {
+        if (stderr.length) {
+          console.error('Agent stderr:', stderr.join(''));
+        }
+        throw e;
+      } finally {
+        await cleanup();
+      }
+    });
+
+    it('should work with new --acp flag without warnings', async () => {
+      const rig = new TestRig();
+      rig.setup('acp new flag');
+
+      const { sendRequest, cleanup, stderr } = setupAcpTest(rig, {
+        useNewFlag: true,
+      });
+
+      try {
+        const initResult = await sendRequest('initialize', {
+          protocolVersion: 1,
+          clientCapabilities: {
+            fs: { readTextFile: true, writeTextFile: true },
+          },
+        });
+        expect(initResult).toBeDefined();
+
+        // Verify no deprecation warning is shown
+        const stderrOutput = stderr.join('');
+        expect(stderrOutput).not.toContain('--experimental-acp is deprecated');
+
+        await sendRequest('authenticate', { methodId: 'openai' });
+
+        const newSession = (await sendRequest('session/new', {
+          cwd: rig.testDir!,
+          mcpServers: [],
+        })) as { sessionId: string };
+        expect(newSession.sessionId).toBeTruthy();
+
+        // Verify functionality works
+        const promptResult = await sendRequest('session/prompt', {
+          sessionId: newSession.sessionId,
+          prompt: [{ type: 'text', text: 'Say hello.' }],
+        });
+        expect(promptResult).toBeDefined();
+      } catch (e) {
+        if (stderr.length) {
+          console.error('Agent stderr:', stderr.join(''));
+        }
+        throw e;
+      } finally {
+        await cleanup();
+      }
+    });
+  },
+);

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.6.0-nightly.20251226.17eb20c1",
+  "version": "0.6.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@qwen-code/qwen-code",
-      "version": "0.6.0-nightly.20251226.17eb20c1",
+      "version": "0.6.0",
       "workspaces": [
         "packages/*"
       ],
@@ -17316,7 +17316,7 @@
     },
     "packages/cli": {
       "name": "@qwen-code/qwen-code",
-      "version": "0.6.0-nightly.20251226.17eb20c1",
+      "version": "0.6.0",
       "dependencies": {
         "@google/genai": "1.30.0",
         "@iarna/toml": "^2.2.5",
@@ -17953,7 +17953,7 @@
     },
     "packages/core": {
       "name": "@qwen-code/qwen-code-core",
-      "version": "0.6.0-nightly.20251226.17eb20c1",
+      "version": "0.6.0",
       "hasInstallScript": true,
       "dependencies": {
         "@anthropic-ai/sdk": "^0.36.1",
@@ -21413,7 +21413,7 @@
     },
     "packages/test-utils": {
       "name": "@qwen-code/qwen-code-test-utils",
-      "version": "0.6.0-nightly.20251226.17eb20c1",
+      "version": "0.6.0",
       "dev": true,
       "license": "Apache-2.0",
       "devDependencies": {
@@ -21425,7 +21425,7 @@
     },
     "packages/vscode-ide-companion": {
       "name": "qwen-code-vscode-ide-companion",
-      "version": "0.6.0-nightly.20251226.17eb20c1",
+      "version": "0.6.0",
       "license": "LICENSE",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.25.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.6.0-nightly.20251226.17eb20c1",
+  "version": "0.6.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.6.0-nightly.20251226.17eb20c1"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.6.0"
   },
   "scripts": {
     "start": "cross-env node scripts/start.js",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.6.0-nightly.20251226.17eb20c1",
+  "version": "0.6.0",
   "description": "Qwen Code",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "dist"
   ],
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.6.0-nightly.20251226.17eb20c1"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.6.0"
   },
   "dependencies": {
     "@google/genai": "1.30.0",

packages/cli/src/config/config.ts

@@ -111,6 +111,7 @@ export interface CliArgs {
   telemetryOutfile: string | undefined;
   allowedMcpServerNames: string[] | undefined;
   allowedTools: string[] | undefined;
+  acp: boolean | undefined;
   experimentalAcp: boolean | undefined;
   experimentalSkills: boolean | undefined;
   extensions: string[] | undefined;
@@ -304,10 +305,16 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
           description: 'Enables checkpointing of file edits',
           default: false,
         })
-        .option('experimental-acp', {
+        .option('acp', {
           type: 'boolean',
           description: 'Starts the agent in ACP mode',
         })
+        .option('experimental-acp', {
+          type: 'boolean',
+          description:
+            'Starts the agent in ACP mode (deprecated, use --acp instead)',
+          hidden: true,
+        })
         .option('experimental-skills', {
           type: 'boolean',
           description: 'Enable experimental Skills feature',
@@ -589,8 +596,19 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
   // The import format is now only controlled by settings.memoryImportFormat
   // We no longer accept it as a CLI argument
 
-  // Apply ACP fallback: if experimental-acp is present but no explicit --channel, treat as ACP
-  if (result['experimentalAcp'] && !result['channel']) {
+  // Handle deprecated --experimental-acp flag
+  if (result['experimentalAcp']) {
+    console.warn(
+      '\x1b[33m⚠ Warning: --experimental-acp is deprecated and will be removed in a future release. Please use --acp instead.\x1b[0m',
+    );
+    // Map experimental-acp to acp if acp is not explicitly set
+    if (!result['acp']) {
+      (result as Record<string, unknown>)['acp'] = true;
+    }
+  }
+
+  // Apply ACP fallback: if acp or experimental-acp is present but no explicit --channel, treat as ACP
+  if ((result['acp'] || result['experimentalAcp']) && !result['channel']) {
     (result as Record<string, unknown>)['channel'] = 'ACP';
   }
 
@@ -981,7 +999,7 @@ export async function loadCliConfig(
     sessionTokenLimit: settings.model?.sessionTokenLimit ?? -1,
     maxSessionTurns:
       argv.maxSessionTurns ?? settings.model?.maxSessionTurns ?? -1,
-    experimentalZedIntegration: argv.experimentalAcp || false,
+    experimentalZedIntegration: argv.acp || argv.experimentalAcp || false,
     experimentalSkills: argv.experimentalSkills || false,
     listExtensions: argv.listExtensions || false,
     extensions: allExtensions,

packages/cli/src/config/settingsSchema.ts

@@ -202,6 +202,7 @@ const SETTINGS_SCHEMA = {
           { value: 'en', label: 'English' },
           { value: 'zh', label: '中文 (Chinese)' },
           { value: 'ru', label: 'Русский (Russian)' },
+          { value: 'de', label: 'Deutsch (German)' },
         ],
       },
       terminalBell: {

packages/cli/src/core/initializer.ts

@@ -15,6 +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';
 
 export interface InitializationResult {
   authError: string | null;
@@ -41,6 +42,9 @@ export async function initializeApp(
     'auto';
   await initializeI18n(languageSetting);
 
+  // Auto-detect and set LLM output language on first use
+  initializeLlmOutputLanguage();
+
   const authType = settings.merged.security?.auth?.selectedType;
   const authError = await performInitialAuth(config, authType);
 

packages/cli/src/gemini.test.tsx

@@ -460,6 +460,7 @@ describe('gemini.tsx main function kitty protocol', () => {
       telemetryOutfile: undefined,
       allowedMcpServerNames: undefined,
       allowedTools: undefined,
+      acp: undefined,
       experimentalAcp: undefined,
       experimentalSkills: undefined,
       extensions: undefined,
@@ -639,4 +640,37 @@ describe('startInteractiveUI', () => {
     await new Promise((resolve) => setTimeout(resolve, 0));
     expect(checkForUpdates).toHaveBeenCalledTimes(1);
   });
+
+  it('should not check for updates when update nag is disabled', async () => {
+    const { checkForUpdates } = await import('./ui/utils/updateCheck.js');
+
+    const mockInitializationResult = {
+      authError: null,
+      themeError: null,
+      shouldOpenAuthDialog: false,
+      geminiMdFileCount: 0,
+    };
+
+    const settingsWithUpdateNagDisabled = {
+      merged: {
+        general: {
+          disableUpdateNag: true,
+        },
+        ui: {
+          hideWindowTitle: false,
+        },
+      },
+    } as LoadedSettings;
+
+    await startInteractiveUI(
+      mockConfig,
+      settingsWithUpdateNagDisabled,
+      mockStartupWarnings,
+      mockWorkspaceRoot,
+      mockInitializationResult,
+    );
+
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    expect(checkForUpdates).not.toHaveBeenCalled();
+  });
 });

packages/cli/src/gemini.tsx

@@ -183,16 +183,18 @@ export async function startInteractiveUI(
     },
   );
 
-  checkForUpdates()
-    .then((info) => {
-      handleAutoUpdate(info, settings, config.getProjectRoot());
-    })
-    .catch((err) => {
-      // Silently ignore update check errors.
-      if (config.getDebugMode()) {
-        console.error('Update check failed:', err);
-      }
-    });
+  if (!settings.merged.general?.disableUpdateNag) {
+    checkForUpdates()
+      .then((info) => {
+        handleAutoUpdate(info, settings, config.getProjectRoot());
+      })
+      .catch((err) => {
+        // Silently ignore update check errors.
+        if (config.getDebugMode()) {
+          console.error('Update check failed:', err);
+        }
+      });
+  }
 
   registerCleanup(() => instance.unmount());
 }

packages/cli/src/i18n/index.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Qwen
+ * Copyright 2025 Qwen team
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,15 +8,21 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { homedir } from 'node:os';
+import {
+  type SupportedLanguage,
+  getLanguageNameFromLocale,
+} from './languages.js';
 
-export type SupportedLanguage = 'en' | 'zh' | 'ru' | string; // Allow custom language codes
+export type { SupportedLanguage };
+export { getLanguageNameFromLocale };
 
 // State
 let currentLanguage: SupportedLanguage = 'en';
-let translations: Record<string, string> = {};
+let translations: Record<string, string | string[]> = {};
 
 // Cache
-type TranslationDict = Record<string, string>;
+type TranslationValue = string | string[];
+type TranslationDict = Record<string, TranslationValue>;
 const translationCache: Record<string, TranslationDict> = {};
 const loadingPromises: Record<string, Promise<TranslationDict>> = {};
 
@@ -52,11 +58,13 @@ export function detectSystemLanguage(): SupportedLanguage {
   if (envLang?.startsWith('zh')) return 'zh';
   if (envLang?.startsWith('en')) return 'en';
   if (envLang?.startsWith('ru')) return 'ru';
+  if (envLang?.startsWith('de')) return 'de';
 
   try {
     const locale = Intl.DateTimeFormat().resolvedOptions().locale;
     if (locale.startsWith('zh')) return 'zh';
     if (locale.startsWith('ru')) return 'ru';
+    if (locale.startsWith('de')) return 'de';
   } catch {
     // Fallback to default
   }
@@ -224,9 +232,25 @@ export function getCurrentLanguage(): SupportedLanguage {
 
 export function t(key: string, params?: Record<string, string>): string {
   const translation = translations[key] ?? key;
+  if (Array.isArray(translation)) {
+    return key;
+  }
   return interpolate(translation, params);
 }
 
+/**
+ * Get a translation that is an array of strings.
+ * @param key The translation key
+ * @returns The array of strings, or an empty array if not found or not an array
+ */
+export function ta(key: string): string[] {
+  const translation = translations[key];
+  if (Array.isArray(translation)) {
+    return translation;
+  }
+  return [];
+}
+
 export async function initializeI18n(
   lang?: SupportedLanguage | 'auto',
 ): Promise<void> {

packages/cli/src/i18n/languages.ts

@@ -0,0 +1,48 @@
+/**
+ * @license
+ * Copyright 2025 Qwen team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export type SupportedLanguage = 'en' | 'zh' | 'ru' | 'de' | string;
+
+export interface LanguageDefinition {
+  /** The internal locale code used by the i18n system (e.g., 'en', 'zh'). */
+  code: SupportedLanguage;
+  /** The standard name used in UI settings (e.g., 'en-US', 'zh-CN'). */
+  id: string;
+  /** The full English name of the language (e.g., 'English', 'Chinese'). */
+  fullName: string;
+}
+
+export const SUPPORTED_LANGUAGES: readonly LanguageDefinition[] = [
+  {
+    code: 'en',
+    id: 'en-US',
+    fullName: 'English',
+  },
+  {
+    code: 'zh',
+    id: 'zh-CN',
+    fullName: 'Chinese',
+  },
+  {
+    code: 'ru',
+    id: 'ru-RU',
+    fullName: 'Russian',
+  },
+  {
+    code: 'de',
+    id: 'de-DE',
+    fullName: 'German',
+  },
+];
+
+/**
+ * Maps a locale code to its English language name.
+ * Used for LLM output language instructions.
+ */
+export function getLanguageNameFromLocale(locale: SupportedLanguage): string {
+  const lang = SUPPORTED_LANGUAGES.find((l) => l.code === locale);
+  return lang?.fullName || 'English';
+}

packages/cli/src/i18n/locales/en.js

@@ -102,8 +102,8 @@ export default {
   'Theme "{{themeName}}" not found.': 'Theme "{{themeName}}" not found.',
   'Theme "{{themeName}}" not found in selected scope.':
     'Theme "{{themeName}}" not found in selected scope.',
-  'clear the screen and conversation history':
-    'clear the screen and conversation history',
+  'Clear conversation history and free up context':
+    'Clear conversation history and free up context',
   'Compresses the context by replacing it with a summary.':
     'Compresses the context by replacing it with a summary.',
   'open full Qwen Code documentation in your browser':
@@ -612,9 +612,10 @@ export default {
   // ============================================================================
   // Commands - Clear
   // ============================================================================
-  'Clearing terminal and resetting chat.':
-    'Clearing terminal and resetting chat.',
-  'Clearing terminal.': 'Clearing terminal.',
+  'Starting a new session, resetting chat, and clearing terminal.':
+    'Starting a new session, resetting chat, and clearing terminal.',
+  'Starting a new session and clearing.':
+    'Starting a new session and clearing.',
 
   // ============================================================================
   // Commands - Compress
@@ -935,192 +936,137 @@ export default {
   // ============================================================================
   'Waiting for user confirmation...': 'Waiting for user confirmation...',
   '(esc to cancel, {{time}})': '(esc to cancel, {{time}})',
-  "I'm Feeling Lucky": "I'm Feeling Lucky",
-  'Shipping awesomeness... ': 'Shipping awesomeness... ',
-  'Painting the serifs back on...': 'Painting the serifs back on...',
-  'Navigating the slime mold...': 'Navigating the slime mold...',
-  'Consulting the digital spirits...': 'Consulting the digital spirits...',
-  'Reticulating splines...': 'Reticulating splines...',
-  'Warming up the AI hamsters...': 'Warming up the AI hamsters...',
-  'Asking the magic conch shell...': 'Asking the magic conch shell...',
-  'Generating witty retort...': 'Generating witty retort...',
-  'Polishing the algorithms...': 'Polishing the algorithms...',
-  "Don't rush perfection (or my code)...":
+
+  // ============================================================================
+  // Loading Phrases
+  // ============================================================================
+  WITTY_LOADING_PHRASES: [
+    "I'm Feeling Lucky",
+    'Shipping awesomeness... ',
+    'Painting the serifs back on...',
+    'Navigating the slime mold...',
+    'Consulting the digital spirits...',
+    'Reticulating splines...',
+    'Warming up the AI hamsters...',
+    'Asking the magic conch shell...',
+    'Generating witty retort...',
+    'Polishing the algorithms...',
     "Don't rush perfection (or my code)...",
-  'Brewing fresh bytes...': 'Brewing fresh bytes...',
-  'Counting electrons...': 'Counting electrons...',
-  'Engaging cognitive processors...': 'Engaging cognitive processors...',
-  'Checking for syntax errors in the universe...':
+    'Brewing fresh bytes...',
+    'Counting electrons...',
+    'Engaging cognitive processors...',
     'Checking for syntax errors in the universe...',
-  'One moment, optimizing humor...': 'One moment, optimizing humor...',
-  'Shuffling punchlines...': 'Shuffling punchlines...',
-  'Untangling neural nets...': 'Untangling neural nets...',
-  'Compiling brilliance...': 'Compiling brilliance...',
-  'Loading wit.exe...': 'Loading wit.exe...',
-  'Summoning the cloud of wisdom...': 'Summoning the cloud of wisdom...',
-  'Preparing a witty response...': 'Preparing a witty response...',
-  "Just a sec, I'm debugging reality...":
+    'One moment, optimizing humor...',
+    'Shuffling punchlines...',
+    'Untangling neural nets...',
+    'Compiling brilliance...',
+    'Loading wit.exe...',
+    'Summoning the cloud of wisdom...',
+    'Preparing a witty response...',
     "Just a sec, I'm debugging reality...",
-  'Confuzzling the options...': 'Confuzzling the options...',
-  'Tuning the cosmic frequencies...': 'Tuning the cosmic frequencies...',
-  'Crafting a response worthy of your patience...':
+    'Confuzzling the options...',
+    'Tuning the cosmic frequencies...',
     'Crafting a response worthy of your patience...',
-  'Compiling the 1s and 0s...': 'Compiling the 1s and 0s...',
-  'Resolving dependencies... and existential crises...':
+    'Compiling the 1s and 0s...',
     'Resolving dependencies... and existential crises...',
-  'Defragmenting memories... both RAM and personal...':
     'Defragmenting memories... both RAM and personal...',
-  'Rebooting the humor module...': 'Rebooting the humor module...',
-  'Caching the essentials (mostly cat memes)...':
+    'Rebooting the humor module...',
     'Caching the essentials (mostly cat memes)...',
-  'Optimizing for ludicrous speed': 'Optimizing for ludicrous speed',
-  "Swapping bits... don't tell the bytes...":
+    'Optimizing for ludicrous speed',
     "Swapping bits... don't tell the bytes...",
-  'Garbage collecting... be right back...':
     'Garbage collecting... be right back...',
-  'Assembling the interwebs...': 'Assembling the interwebs...',
-  'Converting coffee into code...': 'Converting coffee into code...',
-  'Updating the syntax for reality...': 'Updating the syntax for reality...',
-  'Rewiring the synapses...': 'Rewiring the synapses...',
-  'Looking for a misplaced semicolon...':
+    'Assembling the interwebs...',
+    'Converting coffee into code...',
+    'Updating the syntax for reality...',
+    'Rewiring the synapses...',
     'Looking for a misplaced semicolon...',
-  "Greasin' the cogs of the machine...": "Greasin' the cogs of the machine...",
-  'Pre-heating the servers...': 'Pre-heating the servers...',
-  'Calibrating the flux capacitor...': 'Calibrating the flux capacitor...',
-  'Engaging the improbability drive...': 'Engaging the improbability drive...',
-  'Channeling the Force...': 'Channeling the Force...',
-  'Aligning the stars for optimal response...':
+    "Greasin' the cogs of the machine...",
+    'Pre-heating the servers...',
+    'Calibrating the flux capacitor...',
+    'Engaging the improbability drive...',
+    'Channeling the Force...',
     'Aligning the stars for optimal response...',
-  'So say we all...': 'So say we all...',
-  'Loading the next great idea...': 'Loading the next great idea...',
-  "Just a moment, I'm in the zone...": "Just a moment, I'm in the zone...",
-  'Preparing to dazzle you with brilliance...':
+    'So say we all...',
+    'Loading the next great idea...',
+    "Just a moment, I'm in the zone...",
     'Preparing to dazzle you with brilliance...',
-  "Just a tick, I'm polishing my wit...":
     "Just a tick, I'm polishing my wit...",
-  "Hold tight, I'm crafting a masterpiece...":
     "Hold tight, I'm crafting a masterpiece...",
-  "Just a jiffy, I'm debugging the universe...":
     "Just a jiffy, I'm debugging the universe...",
-  "Just a moment, I'm aligning the pixels...":
     "Just a moment, I'm aligning the pixels...",
-  "Just a sec, I'm optimizing the humor...":
     "Just a sec, I'm optimizing the humor...",
-  "Just a moment, I'm tuning the algorithms...":
     "Just a moment, I'm tuning the algorithms...",
-  'Warp speed engaged...': 'Warp speed engaged...',
-  'Mining for more Dilithium crystals...':
+    'Warp speed engaged...',
     'Mining for more Dilithium crystals...',
-  "Don't panic...": "Don't panic...",
-  'Following the white rabbit...': 'Following the white rabbit...',
-  'The truth is in here... somewhere...':
+    "Don't panic...",
+    'Following the white rabbit...',
     'The truth is in here... somewhere...',
-  'Blowing on the cartridge...': 'Blowing on the cartridge...',
-  'Loading... Do a barrel roll!': 'Loading... Do a barrel roll!',
-  'Waiting for the respawn...': 'Waiting for the respawn...',
-  'Finishing the Kessel Run in less than 12 parsecs...':
+    'Blowing on the cartridge...',
+    'Loading... Do a barrel roll!',
+    'Waiting for the respawn...',
     'Finishing the Kessel Run in less than 12 parsecs...',
-  "The cake is not a lie, it's just still loading...":
     "The cake is not a lie, it's just still loading...",
-  'Fiddling with the character creation screen...':
     'Fiddling with the character creation screen...',
-  "Just a moment, I'm finding the right meme...":
     "Just a moment, I'm finding the right meme...",
-  "Pressing 'A' to continue...": "Pressing 'A' to continue...",
-  'Herding digital cats...': 'Herding digital cats...',
-  'Polishing the pixels...': 'Polishing the pixels...',
-  'Finding a suitable loading screen pun...':
+    "Pressing 'A' to continue...",
+    'Herding digital cats...',
+    'Polishing the pixels...',
     'Finding a suitable loading screen pun...',
-  'Distracting you with this witty phrase...':
     'Distracting you with this witty phrase...',
-  'Almost there... probably...': 'Almost there... probably...',
-  'Our hamsters are working as fast as they can...':
+    'Almost there... probably...',
     'Our hamsters are working as fast as they can...',
-  'Giving Cloudy a pat on the head...': 'Giving Cloudy a pat on the head...',
-  'Petting the cat...': 'Petting the cat...',
-  'Rickrolling my boss...': 'Rickrolling my boss...',
-  'Never gonna give you up, never gonna let you down...':
+    'Giving Cloudy a pat on the head...',
+    'Petting the cat...',
+    'Rickrolling my boss...',
     'Never gonna give you up, never gonna let you down...',
-  'Slapping the bass...': 'Slapping the bass...',
-  'Tasting the snozberries...': 'Tasting the snozberries...',
-  "I'm going the distance, I'm going for speed...":
+    'Slapping the bass...',
+    'Tasting the snozberries...',
     "I'm going the distance, I'm going for speed...",
-  'Is this the real life? Is this just fantasy?...':
     'Is this the real life? Is this just fantasy?...',
-  "I've got a good feeling about this...":
     "I've got a good feeling about this...",
-  'Poking the bear...': 'Poking the bear...',
-  'Doing research on the latest memes...':
+    'Poking the bear...',
     'Doing research on the latest memes...',
-  'Figuring out how to make this more witty...':
     'Figuring out how to make this more witty...',
-  'Hmmm... let me think...': 'Hmmm... let me think...',
-  'What do you call a fish with no eyes? A fsh...':
+    'Hmmm... let me think...',
     'What do you call a fish with no eyes? A fsh...',
-  'Why did the computer go to therapy? It had too many bytes...':
     'Why did the computer go to therapy? It had too many bytes...',
-  "Why don't programmers like nature? It has too many bugs...":
     "Why don't programmers like nature? It has too many bugs...",
-  'Why do programmers prefer dark mode? Because light attracts bugs...':
     'Why do programmers prefer dark mode? Because light attracts bugs...',
-  'Why did the developer go broke? Because they used up all their cache...':
     'Why did the developer go broke? Because they used up all their cache...',
-  "What can you do with a broken pencil? Nothing, it's pointless...":
     "What can you do with a broken pencil? Nothing, it's pointless...",
-  'Applying percussive maintenance...': 'Applying percussive maintenance...',
-  'Searching for the correct USB orientation...':
+    'Applying percussive maintenance...',
     'Searching for the correct USB orientation...',
-  'Ensuring the magic smoke stays inside the wires...':
     'Ensuring the magic smoke stays inside the wires...',
-  'Rewriting in Rust for no particular reason...':
-    'Rewriting in Rust for no particular reason...',
-  'Trying to exit Vim...': 'Trying to exit Vim...',
-  'Spinning up the hamster wheel...': 'Spinning up the hamster wheel...',
-  "That's not a bug, it's an undocumented feature...":
+    'Trying to exit Vim...',
+    'Spinning up the hamster wheel...',
     "That's not a bug, it's an undocumented feature...",
-  'Engage.': 'Engage.',
-  "I'll be back... with an answer.": "I'll be back... with an answer.",
-  'My other process is a TARDIS...': 'My other process is a TARDIS...',
-  'Communing with the machine spirit...':
+    'Engage.',
+    "I'll be back... with an answer.",
+    'My other process is a TARDIS...',
     'Communing with the machine spirit...',
-  'Letting the thoughts marinate...': 'Letting the thoughts marinate...',
-  'Just remembered where I put my keys...':
+    'Letting the thoughts marinate...',
     'Just remembered where I put my keys...',
-  'Pondering the orb...': 'Pondering the orb...',
-  "I've seen things you people wouldn't believe... like a user who reads loading messages.":
+    'Pondering the orb...',
     "I've seen things you people wouldn't believe... like a user who reads loading messages.",
-  'Initiating thoughtful gaze...': 'Initiating thoughtful gaze...',
-  "What's a computer's favorite snack? Microchips.":
+    'Initiating thoughtful gaze...',
     "What's a computer's favorite snack? Microchips.",
-  "Why do Java developers wear glasses? Because they don't C#.":
     "Why do Java developers wear glasses? Because they don't C#.",
-  'Charging the laser... pew pew!': 'Charging the laser... pew pew!',
-  'Dividing by zero... just kidding!': 'Dividing by zero... just kidding!',
-  'Looking for an adult superviso... I mean, processing.':
+    'Charging the laser... pew pew!',
+    'Dividing by zero... just kidding!',
     'Looking for an adult superviso... I mean, processing.',
-  'Making it go beep boop.': 'Making it go beep boop.',
-  'Buffering... because even AIs need a moment.':
+    'Making it go beep boop.',
     'Buffering... because even AIs need a moment.',
-  'Entangling quantum particles for a faster response...':
     'Entangling quantum particles for a faster response...',
-  'Polishing the chrome... on the algorithms.':
     'Polishing the chrome... on the algorithms.',
-  'Are you not entertained? (Working on it!)':
     'Are you not entertained? (Working on it!)',
-  'Summoning the code gremlins... to help, of course.':
     'Summoning the code gremlins... to help, of course.',
-  'Just waiting for the dial-up tone to finish...':
     'Just waiting for the dial-up tone to finish...',
-  'Recalibrating the humor-o-meter.': 'Recalibrating the humor-o-meter.',
-  'My other loading screen is even funnier.':
+    'Recalibrating the humor-o-meter.',
     'My other loading screen is even funnier.',
-  "Pretty sure there's a cat walking on the keyboard somewhere...":
     "Pretty sure there's a cat walking on the keyboard somewhere...",
-  'Enhancing... Enhancing... Still loading.':
     'Enhancing... Enhancing... Still loading.',
-  "It's not a bug, it's a feature... of this loading screen.":
     "It's not a bug, it's a feature... of this loading screen.",
-  'Have you tried turning it off and on again? (The loading screen, not me.)':
     'Have you tried turning it off and on again? (The loading screen, not me.)',
-  'Constructing additional pylons...': 'Constructing additional pylons...',
+    'Constructing additional pylons...',
+  ],
 };

packages/cli/src/i18n/locales/ru.js

@@ -103,8 +103,8 @@ export default {
   'Theme "{{themeName}}" not found.': 'Тема "{{themeName}}" не найдена.',
   'Theme "{{themeName}}" not found in selected scope.':
     'Тема "{{themeName}}" не найдена в выбранной области.',
-  'clear the screen and conversation history':
-    'Очистка экрана и истории диалога',
+  'Clear conversation history and free up context':
+    'Очистить историю диалога и освободить контекст',
   'Compresses the context by replacing it with a summary.':
     'Сжатие контекста заменой на краткую сводку',
   'open full Qwen Code documentation in your browser':
@@ -314,6 +314,7 @@ export default {
   'Tool Output Truncation Lines': 'Лимит строк вывода инструментов',
   'Folder Trust': 'Доверие к папке',
   'Vision Model Preview': 'Визуальная модель (предпросмотр)',
+  'Tool Schema Compliance': 'Соответствие схеме инструмента',
   // Варианты перечислений настроек
   'Auto (detect from system)': 'Авто (определить из системы)',
   Text: 'Текст',
@@ -342,8 +343,8 @@ export default {
     'Установка предпочитаемого внешнего редактора',
   'Manage extensions': 'Управление расширениями',
   'List active extensions': 'Показать активные расширения',
-  'Update extensions. Usage: update |--all':
-    'Обновить расширения. Использование: update |--all',
+  'Update extensions. Usage: update <extension-names>|--all':
+    'Обновить расширения. Использование: update <extension-names>|--all',
   'manage IDE integration': 'Управление интеграцией с IDE',
   'check status of IDE integration': 'Проверить статус интеграции с IDE',
   'install required IDE companion for {{ideName}}':
@@ -401,7 +402,8 @@ export default {
   'Set LLM output language': 'Установка языка вывода LLM',
   'Usage: /language ui [zh-CN|en-US]':
     'Использование: /language ui [zh-CN|en-US|ru-RU]',
-  'Usage: /language output ': 'Использование: /language output ',
+  'Usage: /language output <language>':
+    'Использование: /language output <language>',
   'Example: /language output 中文': 'Пример: /language output 中文',
   'Example: /language output English': 'Пример: /language output English',
   'Example: /language output 日本語': 'Пример: /language output 日本語',
@@ -418,9 +420,8 @@ export default {
   'To request additional UI language packs, please open an issue on GitHub.':
     'Для запроса дополнительных языковых пакетов интерфейса, пожалуйста, создайте обращение на GitHub.',
   'Available options:': 'Доступные варианты:',
-  ' - zh-CN: Simplified Chinese': ' - zh-CN: Упрощенный китайский',
-  ' - en-US: English': ' - en-US: Английский',
-  ' - ru-RU: Russian': ' - ru-RU: Русский',
+  '  - zh-CN: Simplified Chinese': ' - zh-CN: Упрощенный китайский',
+  '  - en-US: English': ' - en-US: Английский',
   'Set UI language to Simplified Chinese (zh-CN)':
     'Установить язык интерфейса на упрощенный китайский (zh-CN)',
   'Set UI language to English (en-US)':
@@ -436,8 +437,8 @@ export default {
     'Режим подтверждения изменен на: {{mode}}',
   'Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})':
     'Режим подтверждения изменен на: {{mode}} (сохранено в настройках {{scope}}{{location}})',
-  'Usage: /approval-mode [--session|--user|--project]':
-    'Использование: /approval-mode [--session|--user|--project]',
+  'Usage: /approval-mode <mode> [--session|--user|--project]':
+    'Использование: /approval-mode <mode> [--session|--user|--project]',
   'Scope subcommands do not accept additional arguments.':
     'Подкоманды области не принимают дополнительных аргументов.',
   'Plan mode - Analyze only, do not modify files or execute commands':
@@ -589,8 +590,8 @@ export default {
     'Ошибка при экспорте диалога: {{error}}',
   'Conversation shared to {{filePath}}': 'Диалог экспортирован в {{filePath}}',
   'No conversation found to share.': 'Нет диалога для экспорта.',
-  'Share the current conversation to a markdown or json file. Usage: /chat share <путь-к-файлу>':
-    'Экспортировать текущий диалог в markdown или json файл. Использование: /chat share <путь-к-файлу>',
+  'Share the current conversation to a markdown or json file. Usage: /chat share <file>':
+    'Экспортировать текущий диалог в markdown или json файл. Использование: /chat share <файл>',
 
   // ============================================================================
   // Команды - Резюме
@@ -625,8 +626,9 @@ export default {
   // ============================================================================
   // Команды - Очистка
   // ============================================================================
-  'Clearing terminal and resetting chat.': 'Очистка терминала и сброс чата.',
-  'Clearing terminal.': 'Очистка терминала.',
+  'Starting a new session, resetting chat, and clearing terminal.':
+    'Начало новой сессии, сброс чата и очистка терминала.',
+  'Starting a new session and clearing.': 'Начало новой сессии и очистка.',
 
   // ============================================================================
   // Команды - Сжатие
@@ -657,8 +659,8 @@ export default {
     'Команда /directory add не поддерживается в ограничительных профилях песочницы. Пожалуйста, используйте --include-directories при запуске сессии.',
   "Error adding '{{path}}': {{error}}":
     "Ошибка при добавлении '{{path}}': {{error}}",
-  'Successfully added GEMINI.md files from the following directories if there are:\n- {{directories}}':
-    'Успешно добавлены файлы GEMINI.md из следующих директорий (если они есть):\n- {{directories}}',
+  'Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}':
+    'Успешно добавлены файлы QWEN.md из следующих директорий (если они есть):\n- {{directories}}',
   'Error refreshing memory: {{error}}':
     'Ошибка при обновлении памяти: {{error}}',
   'Successfully added directories:\n- {{directories}}':
@@ -891,6 +893,7 @@ export default {
   // Экран выхода / Статистика
   // ============================================================================
   'Agent powering down. Goodbye!': 'Агент завершает работу. До свидания!',
+  'To continue this session, run': 'Для продолжения этой сессии, выполните',
   'Interaction Summary': 'Сводка взаимодействия',
   'Session ID:': 'ID сессии:',
   'Tool Calls:': 'Вызовы инструментов:',
@@ -950,179 +953,139 @@ export default {
   'Waiting for user confirmation...':
     'Ожидание подтверждения от пользователя...',
   '(esc to cancel, {{time}})': '(esc для отмены, {{time}})',
-  "I'm Feeling Lucky": 'Мне повезёт!',
-  'Shipping awesomeness... ': 'Доставляем крутизну... ',
-  'Painting the serifs back on...': 'Рисуем засечки на буквах...',
-  'Navigating the slime mold...': 'Пробираемся через слизевиков..',
-  'Consulting the digital spirits...': 'Советуемся с цифровыми духами...',
-  'Reticulating splines...': 'Сглаживание сплайнов...',
-  'Warming up the AI hamsters...': 'Разогреваем ИИ-хомячков...',
-  'Asking the magic conch shell...': 'Спрашиваем волшебную ракушку...',
-  'Generating witty retort...': 'Генерируем остроумный ответ...',
-  'Polishing the algorithms...': 'Полируем алгоритмы...',
-  "Don't rush perfection (or my code)...":
+
+  // ============================================================================
+
+  // ============================================================================
+  // Loading Phrases
+  // ============================================================================
+  WITTY_LOADING_PHRASES: [
+    'Мне повезёт!',
+    'Доставляем крутизну... ',
+    'Рисуем засечки на буквах...',
+    'Пробираемся через слизевиков..',
+    'Советуемся с цифровыми духами...',
+    'Сглаживание сплайнов...',
+    'Разогреваем ИИ-хомячков...',
+    'Спрашиваем волшебную ракушку...',
+    'Генерируем остроумный ответ...',
+    'Полируем алгоритмы...',
     'Не торопите совершенство (или мой код)...',
-  'Brewing fresh bytes...': 'Завариваем свежие байты...',
-  'Counting electrons...': 'Пересчитываем электроны...',
-  'Engaging cognitive processors...': 'Задействуем когнитивные процессоры...',
-  'Checking for syntax errors in the universe...':
+    'Завариваем свежие байты...',
+    'Пересчитываем электроны...',
+    'Задействуем когнитивные процессоры...',
     'Ищем синтаксические ошибки во вселенной...',
-  'One moment, optimizing humor...': 'Секундочку, оптимизируем юмор...',
-  'Shuffling punchlines...': 'Перетасовываем панчлайны...',
-  'Untangling neural nets...': 'Распутаваем нейросети...',
-  'Compiling brilliance...': 'Компилируем гениальность...',
-  'Loading wit.exe...': 'Загружаем yumor.exe...',
-  'Summoning the cloud of wisdom...': 'Призываем облако мудрости...',
-  'Preparing a witty response...': 'Готовим остроумный ответ...',
-  "Just a sec, I'm debugging reality...": 'Секунду, идёт отладка реальности...',
-  'Confuzzling the options...': 'Запутываем варианты...',
-  'Tuning the cosmic frequencies...': 'Настраиваем космические частоты...',
-  'Crafting a response worthy of your patience...':
+    'Секундочку, оптимизируем юмор...',
+    'Перетасовываем панчлайны...',
+    'Распутаваем нейросети...',
+    'Компилируем гениальность...',
+    'Загружаем yumor.exe...',
+    'Призываем облако мудрости...',
+    'Готовим остроумный ответ...',
+    'Секунду, идёт отладка реальности...',
+    'Запутываем варианты...',
+    'Настраиваем космические частоты...',
     'Создаем ответ, достойный вашего терпения...',
-  'Compiling the 1s and 0s...': 'Компилируем единички и нолики...',
-  'Resolving dependencies... and existential crises...':
+    'Компилируем единички и нолики...',
     'Разрешаем зависимости... и экзистенциальные кризисы...',
-  'Defragmenting memories... both RAM and personal...':
     'Дефрагментация памяти... и оперативной, и личной...',
-  'Rebooting the humor module...': 'Перезагрузка модуля юмора...',
-  'Caching the essentials (mostly cat memes)...':
+    'Перезагрузка модуля юмора...',
     'Кэшируем самое важное (в основном мемы с котиками)...',
-  'Optimizing for ludicrous speed': 'Оптимизация для безумной скорости',
-  "Swapping bits... don't tell the bytes...":
+    'Оптимизация для безумной скорости',
     'Меняем биты... только байтам не говорите...',
-  'Garbage collecting... be right back...': 'Сборка мусора... скоро вернусь...',
-  'Assembling the interwebs...': 'Сборка интернетов...',
-  'Converting coffee into code...': 'Превращаем кофе в код...',
-  'Updating the syntax for reality...': 'Обновляем синтаксис реальности...',
-  'Rewiring the synapses...': 'Переподключаем синапсы...',
-  'Looking for a misplaced semicolon...': 'Ищем лишнюю точку с запятой...',
-  "Greasin' the cogs of the machine...": 'Смазываем шестерёнки машины...',
-  'Pre-heating the servers...': 'Разогреваем серверы...',
-  'Calibrating the flux capacitor...': 'Калибруем потоковый накопитель...',
-  'Engaging the improbability drive...': 'Включаем двигатель невероятности...',
-  'Channeling the Force...': 'Направляем Силу...',
-  'Aligning the stars for optimal response...':
+    'Сборка мусора... скоро вернусь...',
+    'Сборка интернетов...',
+    'Превращаем кофе в код...',
+    'Обновляем синтаксис реальности...',
+    'Переподключаем синапсы...',
+    'Ищем лишнюю точку с запятой...',
+    'Смазываем шестерёнки машины...',
+    'Разогреваем серверы...',
+    'Калибруем потоковый накопитель...',
+    'Включаем двигатель невероятности...',
+    'Направляем Силу...',
     'Выравниваем звёзды для оптимального ответа...',
-  'So say we all...': 'Так скажем мы все...',
-  'Loading the next great idea...': 'Загрузка следующей великой идеи...',
-  "Just a moment, I'm in the zone...": 'Минутку, я в потоке...',
-  'Preparing to dazzle you with brilliance...':
+    'Так скажем мы все...',
+    'Загрузка следующей великой идеи...',
+    'Минутку, я в потоке...',
     'Готовлюсь ослепить вас гениальностью...',
-  "Just a tick, I'm polishing my wit...": 'Секунду, полирую остроумие...',
-  "Hold tight, I'm crafting a masterpiece...": 'Держитесь, создаю шедевр...',
-  "Just a jiffy, I'm debugging the universe...":
+    'Секунду, полирую остроумие...',
+    'Держитесь, создаю шедевр...',
     'Мигом, отлаживаю вселенную...',
-  "Just a moment, I'm aligning the pixels...": 'Момент, выравниваю пиксели...',
-  "Just a sec, I'm optimizing the humor...": 'Секунду, оптимизирую юмор...',
-  "Just a moment, I'm tuning the algorithms...":
+    'Момент, выравниваю пиксели...',
+    'Секунду, оптимизирую юмор...',
     'Момент, настраиваю алгоритмы...',
-  'Warp speed engaged...': 'Варп-скорость включена...',
-  'Mining for more Dilithium crystals...': 'Добываем кристаллы дилития...',
-  "Don't panic...": 'Без паники...',
-  'Following the white rabbit...': 'Следуем за белым кроликом...',
-  'The truth is in here... somewhere...': 'Истина где-то здесь... внутри...',
-  'Blowing on the cartridge...': 'Продуваем картридж...',
-  'Loading... Do a barrel roll!': 'Загрузка... Сделай бочку!',
-  'Waiting for the respawn...': 'Ждем респауна...',
-  'Finishing the Kessel Run in less than 12 parsecs...':
+    'Варп-прыжок активирован...',
+    'Добываем кристаллы дилития...',
+    'Без паники...',
+    'Следуем за белым кроликом...',
+    'Истина где-то здесь... внутри...',
+    'Продуваем картридж...',
+    'Загрузка... Сделай бочку!',
+    'Ждем респауна...',
     'Делаем Дугу Кесселя менее чем за 12 парсеков...',
-  "The cake is not a lie, it's just still loading...":
     'Тортик — не ложь, он просто ещё грузится...',
-  'Fiddling with the character creation screen...':
     'Возимся с экраном создания персонажа...',
-  "Just a moment, I'm finding the right meme...":
     'Минутку, ищу подходящий мем...',
-  "Pressing 'A' to continue...": "Нажимаем 'A' для продолжения...",
-  'Herding digital cats...': 'Пасём цифровых котов...',
-  'Polishing the pixels...': 'Полируем пиксели...',
-  'Finding a suitable loading screen pun...':
+    "Нажимаем 'A' для продолжения...",
+    'Пасём цифровых котов...',
+    'Полируем пиксели...',
     'Ищем подходящий каламбур для экрана загрузки...',
-  'Distracting you with this witty phrase...':
     'Отвлекаем вас этой остроумной фразой...',
-  'Almost there... probably...': 'Почти готово... вроде...',
-  'Our hamsters are working as fast as they can...':
+    'Почти готово... вроде...',
     'Наши хомячки работают изо всех сил...',
-  'Giving Cloudy a pat on the head...': 'Гладим Облачко по голове...',
-  'Petting the cat...': 'Гладим кота...',
-  'Rickrolling my boss...': 'Рикроллим начальника...',
-  'Never gonna give you up, never gonna let you down...':
+    'Гладим Облачко по голове...',
+    'Гладим кота...',
+    'Рикроллим начальника...',
     'Never gonna give you up, never gonna let you down...',
-  'Slapping the bass...': 'Лабаем бас-гитару...',
-  'Tasting the snozberries...': 'Пробуем снузберри на вкус...',
-  "I'm going the distance, I'm going for speed...":
+    'Лабаем бас-гитару...',
+    'Пробуем снузберри на вкус...',
     'Иду до конца, иду на скорость...',
-  'Is this the real life? Is this just fantasy?...':
     'Is this the real life? Is this just fantasy?...',
-  "I've got a good feeling about this...": 'У меня хорошее предчувствие...',
-  'Poking the bear...': 'Дразним медведя... (Не лезь...)',
-  'Doing research on the latest memes...': 'Изучаем свежие мемы...',
-  'Figuring out how to make this more witty...':
+    'У меня хорошее предчувствие...',
+    'Дразним медведя... (Не лезь...)',
+    'Изучаем свежие мемы...',
     'Думаем, как сделать это остроумнее...',
-  'Hmmm... let me think...': 'Хмм... дайте подумать...',
-  'What do you call a fish with no eyes? A fsh...':
+    'Хмм... дайте подумать...',
     'Как называется бумеранг, который не возвращается? Палка...',
-  'Why did the computer go to therapy? It had too many bytes...':
     'Почему компьютер простудился? Потому что оставил окна открытыми...',
-  "Why don't programmers like nature? It has too many bugs...":
     'Почему программисты не любят гулять на улице? Там среда не настроена...',
-  'Why do programmers prefer dark mode? Because light attracts bugs...':
     'Почему программисты предпочитают тёмную тему? Потому что в темноте не видно багов...',
-  'Why did the developer go broke? Because they used up all their cache...':
     'Почему разработчик разорился? Потому что потратил весь свой кэш...',
-  "What can you do with a broken pencil? Nothing, it's pointless...":
     'Что можно делать со сломанным карандашом? Ничего — он тупой...',
-  'Applying percussive maintenance...': 'Провожу настройку методом тыка...',
-  'Searching for the correct USB orientation...':
+    'Провожу настройку методом тыка...',
     'Ищем, какой стороной вставлять флешку...',
-  'Ensuring the magic smoke stays inside the wires...':
     'Следим, чтобы волшебный дым не вышел из проводов...',
-  'Rewriting in Rust for no particular reason...':
-    'Переписываем всё на Rust без особой причины...',
-  'Trying to exit Vim...': 'Пытаемся выйти из Vim...',
-  'Spinning up the hamster wheel...': 'Раскручиваем колесо для хомяка...',
-  "That's not a bug, it's an undocumented feature...": 'Это не баг, а фича...',
-  'Engage.': 'Поехали!',
-  "I'll be back... with an answer.": 'Я вернусь... с ответом.',
-  'My other process is a TARDIS...': 'Мой другой процесс — это ТАРДИС...',
-  'Communing with the machine spirit...': 'Общаемся с духом машины...',
-  'Letting the thoughts marinate...': 'Даем мыслям замариноваться...',
-  'Just remembered where I put my keys...':
+    'Пытаемся выйти из Vim...',
+    'Раскручиваем колесо для хомяка...',
+    'Это не баг, а фича...',
+    'Поехали!',
+    'Я вернусь... с ответом.',
+    'Мой другой процесс — это ТАРДИС...',
+    'Общаемся с духом машины...',
+    'Даем мыслям замариноваться...',
     'Только что вспомнил, куда положил ключи...',
-  'Pondering the orb...': 'Размышляю над сферой...',
-  "I've seen things you people wouldn't believe... like a user who reads loading messages.":
-    'Я видел такое, во что вы, люди, просто не поверите... например, пользователя, читающего сообщения загрузки.',
-  'Initiating thoughtful gaze...': 'Инициируем задумчивый взгляд...',
-  "What's a computer's favorite snack? Microchips.":
+    'Размышляю над сферой...',
+    'Я видел такое, что вам, людям, и не снилось... пользователя, читающего эти сообщения.',
+    'Инициируем задумчивый взгляд...',
     'Что сервер заказывает в баре? Пинг-коладу.',
-  "Why do Java developers wear glasses? Because they don't C#.":
     'Почему Java-разработчики не убираются дома? Они ждут сборщик мусора...',
-  'Charging the laser... pew pew!': 'Заряжаем лазер... пиу-пиу!',
-  'Dividing by zero... just kidding!': 'Делим на ноль... шучу!',
-  'Looking for an adult superviso... I mean, processing.':
+    'Заряжаем лазер... пиу-пиу!',
+    'Делим на ноль... шучу!',
     'Ищу взрослых для присмот... в смысле, обрабатываю.',
-  'Making it go beep boop.': 'Делаем бип-буп.',
-  'Buffering... because even AIs need a moment.':
-    'Буферизация... даже ИИ нужно мгновение.',
-  'Entangling quantum particles for a faster response...':
+    'Делаем бип-буп.',
+    'Буферизация... даже ИИ нужно время подумать.',
     'Запутываем квантовые частицы для быстрого ответа...',
-  'Polishing the chrome... on the algorithms.':
     'Полируем хром... на алгоритмах.',
-  'Are you not entertained? (Working on it!)':
     'Вы ещё не развлеклись?! Разве вы не за этим сюда пришли?!',
-  'Summoning the code gremlins... to help, of course.':
     'Призываем гремлинов кода... для помощи, конечно же.',
-  'Just waiting for the dial-up tone to finish...':
     'Ждем, пока закончится звук dial-up модема...',
-  'Recalibrating the humor-o-meter.': 'Перекалибровка юморометра.',
-  'My other loading screen is even funnier.':
+    'Перекалибровка юморометра.',
     'Мой другой экран загрузки ещё смешнее.',
-  "Pretty sure there's a cat walking on the keyboard somewhere...":
     'Кажется, где-то по клавиатуре гуляет кот...',
-  'Enhancing... Enhancing... Still loading.':
     'Улучшаем... Ещё улучшаем... Всё ещё грузится.',
-  "It's not a bug, it's a feature... of this loading screen.":
     'Это не баг, это фича... экрана загрузки.',
-  'Have you tried turning it off and on again? (The loading screen, not me.)':
     'Пробовали выключить и включить снова? (Экран загрузки, не меня!)',
-  'Constructing additional pylons...': 'Нужно построить больше пилонов...',
+    'Нужно построить больше пилонов...',
+  ],
 };

packages/cli/src/i18n/locales/zh.js

@@ -101,7 +101,7 @@ export default {
   'Theme "{{themeName}}" not found.': '未找到主题 "{{themeName}}"。',
   'Theme "{{themeName}}" not found in selected scope.':
     '在所选作用域中未找到主题 "{{themeName}}"。',
-  'clear the screen and conversation history': '清屏并清除对话历史',
+  'Clear conversation history and free up context': '清除对话历史并释放上下文',
   'Compresses the context by replacing it with a summary.':
     '通过用摘要替换来压缩上下文',
   'open full Qwen Code documentation in your browser':
@@ -581,8 +581,9 @@ export default {
   // ============================================================================
   // Commands - Clear
   // ============================================================================
-  'Clearing terminal and resetting chat.': '正在清屏并重置聊天',
-  'Clearing terminal.': '正在清屏',
+  'Starting a new session, resetting chat, and clearing terminal.':
+    '正在开始新会话，重置聊天并清屏。',
+  'Starting a new session and clearing.': '正在开始新会话并清屏。',
 
   // ============================================================================
   // Commands - Compress
@@ -888,165 +889,39 @@ export default {
   // ============================================================================
   'Waiting for user confirmation...': '等待用户确认...',
   '(esc to cancel, {{time}})': '（按 esc 取消，{{time}}）',
-  "I'm Feeling Lucky": '我感觉很幸运',
-  'Shipping awesomeness... ': '正在运送精彩内容... ',
-  'Painting the serifs back on...': '正在重新绘制衬线...',
-  'Navigating the slime mold...': '正在导航粘液霉菌...',
-  'Consulting the digital spirits...': '正在咨询数字精灵...',
-  'Reticulating splines...': '正在网格化样条曲线...',
-  'Warming up the AI hamsters...': '正在预热 AI 仓鼠...',
-  'Asking the magic conch shell...': '正在询问魔法海螺壳...',
-  'Generating witty retort...': '正在生成机智的反驳...',
-  'Polishing the algorithms...': '正在打磨算法...',
-  "Don't rush perfection (or my code)...": '不要急于追求完美（或我的代码）...',
-  'Brewing fresh bytes...': '正在酿造新鲜字节...',
-  'Counting electrons...': '正在计算电子...',
-  'Engaging cognitive processors...': '正在启动认知处理器...',
-  'Checking for syntax errors in the universe...':
-    '正在检查宇宙中的语法错误...',
-  'One moment, optimizing humor...': '稍等片刻，正在优化幽默感...',
-  'Shuffling punchlines...': '正在洗牌笑点...',
-  'Untangling neural nets...': '正在解开神经网络...',
-  'Compiling brilliance...': '正在编译智慧...',
-  'Loading wit.exe...': '正在加载 wit.exe...',
-  'Summoning the cloud of wisdom...': '正在召唤智慧云...',
-  'Preparing a witty response...': '正在准备机智的回复...',
-  "Just a sec, I'm debugging reality...": '稍等片刻，我正在调试现实...',
-  'Confuzzling the options...': '正在混淆选项...',
-  'Tuning the cosmic frequencies...': '正在调谐宇宙频率...',
-  'Crafting a response worthy of your patience...':
-    '正在制作值得您耐心等待的回复...',
-  'Compiling the 1s and 0s...': '正在编译 1 和 0...',
-  'Resolving dependencies... and existential crises...':
-    '正在解决依赖关系...和存在主义危机...',
-  'Defragmenting memories... both RAM and personal...':
-    '正在整理记忆碎片...包括 RAM 和个人记忆...',
-  'Rebooting the humor module...': '正在重启幽默模块...',
-  'Caching the essentials (mostly cat memes)...':
-    '正在缓存必需品（主要是猫咪表情包）...',
-  'Optimizing for ludicrous speed': '正在优化到荒谬的速度',
-  "Swapping bits... don't tell the bytes...": '正在交换位...不要告诉字节...',
-  'Garbage collecting... be right back...': '正在垃圾回收...马上回来...',
-  'Assembling the interwebs...': '正在组装互联网...',
-  'Converting coffee into code...': '正在将咖啡转换为代码...',
-  'Updating the syntax for reality...': '正在更新现实的语法...',
-  'Rewiring the synapses...': '正在重新连接突触...',
-  'Looking for a misplaced semicolon...': '正在寻找放错位置的分号...',
-  "Greasin' the cogs of the machine...": '正在给机器的齿轮上油...',
-  'Pre-heating the servers...': '正在预热服务器...',
-  'Calibrating the flux capacitor...': '正在校准通量电容器...',
-  'Engaging the improbability drive...': '正在启动不可能性驱动器...',
-  'Channeling the Force...': '正在引导原力...',
-  'Aligning the stars for optimal response...': '正在对齐星星以获得最佳回复...',
-  'So say we all...': '我们都说...',
-  'Loading the next great idea...': '正在加载下一个伟大的想法...',
-  "Just a moment, I'm in the zone...": '稍等片刻，我正进入状态...',
-  'Preparing to dazzle you with brilliance...': '正在准备用智慧让您眼花缭乱...',
-  "Just a tick, I'm polishing my wit...": '稍等片刻，我正在打磨我的智慧...',
-  "Hold tight, I'm crafting a masterpiece...": '请稍等，我正在制作杰作...',
-  "Just a jiffy, I'm debugging the universe...": '稍等片刻，我正在调试宇宙...',
-  "Just a moment, I'm aligning the pixels...": '稍等片刻，我正在对齐像素...',
-  "Just a sec, I'm optimizing the humor...": '稍等片刻，我正在优化幽默感...',
-  "Just a moment, I'm tuning the algorithms...": '稍等片刻，我正在调整算法...',
-  'Warp speed engaged...': '曲速已启动...',
-  'Mining for more Dilithium crystals...': '正在挖掘更多二锂晶体...',
-  "Don't panic...": '不要惊慌...',
-  'Following the white rabbit...': '正在跟随白兔...',
-  'The truth is in here... somewhere...': '真相在这里...某个地方...',
-  'Blowing on the cartridge...': '正在吹卡带...',
-  'Loading... Do a barrel roll!': '正在加载...做个桶滚！',
-  'Waiting for the respawn...': '等待重生...',
-  'Finishing the Kessel Run in less than 12 parsecs...':
-    '正在以不到 12 秒差距完成凯塞尔航线...',
-  "The cake is not a lie, it's just still loading...":
-    '蛋糕不是谎言，只是还在加载...',
-  'Fiddling with the character creation screen...': '正在摆弄角色创建界面...',
-  "Just a moment, I'm finding the right meme...":
-    '稍等片刻，我正在寻找合适的表情包...',
-  "Pressing 'A' to continue...": "按 'A' 继续...",
-  'Herding digital cats...': '正在放牧数字猫...',
-  'Polishing the pixels...': '正在打磨像素...',
-  'Finding a suitable loading screen pun...': '正在寻找合适的加载屏幕双关语...',
-  'Distracting you with this witty phrase...':
-    '正在用这个机智的短语分散您的注意力...',
-  'Almost there... probably...': '快到了...可能...',
-  'Our hamsters are working as fast as they can...':
-    '我们的仓鼠正在尽可能快地工作...',
-  'Giving Cloudy a pat on the head...': '正在拍拍 Cloudy 的头...',
-  'Petting the cat...': '正在抚摸猫咪...',
-  'Rickrolling my boss...': '正在 Rickroll 我的老板...',
-  'Never gonna give you up, never gonna let you down...':
-    '永远不会放弃你，永远不会让你失望...',
-  'Slapping the bass...': '正在拍打低音...',
-  'Tasting the snozberries...': '正在品尝 snozberries...',
-  "I'm going the distance, I'm going for speed...":
-    '我要走得更远，我要追求速度...',
-  'Is this the real life? Is this just fantasy?...':
-    '这是真实的生活吗？还是只是幻想？...',
-  "I've got a good feeling about this...": '我对这个感觉很好...',
-  'Poking the bear...': '正在戳熊...',
-  'Doing research on the latest memes...': '正在研究最新的表情包...',
-  'Figuring out how to make this more witty...': '正在想办法让这更有趣...',
-  'Hmmm... let me think...': '嗯...让我想想...',
-  'What do you call a fish with no eyes? A fsh...':
-    '没有眼睛的鱼叫什么？一条鱼...',
-  'Why did the computer go to therapy? It had too many bytes...':
-    '为什么电脑去看心理医生？因为它有太多字节...',
-  "Why don't programmers like nature? It has too many bugs...":
-    '为什么程序员不喜欢大自然？因为虫子太多了...',
-  'Why do programmers prefer dark mode? Because light attracts bugs...':
-    '为什么程序员喜欢暗色模式？因为光会吸引虫子...',
-  'Why did the developer go broke? Because they used up all their cache...':
-    '为什么开发者破产了？因为他们用完了所有缓存...',
-  "What can you do with a broken pencil? Nothing, it's pointless...":
-    '你能用断了的铅笔做什么？什么都不能，因为它没有笔尖...',
-  'Applying percussive maintenance...': '正在应用敲击维护...',
-  'Searching for the correct USB orientation...': '正在寻找正确的 USB 方向...',
-  'Ensuring the magic smoke stays inside the wires...':
-    '确保魔法烟雾留在电线内...',
-  'Rewriting in Rust for no particular reason...':
-    '正在用 Rust 重写，没有特别的原因...',
-  'Trying to exit Vim...': '正在尝试退出 Vim...',
-  'Spinning up the hamster wheel...': '正在启动仓鼠轮...',
-  "That's not a bug, it's an undocumented feature...":
-    '这不是一个错误，这是一个未记录的功能...',
-  'Engage.': '启动。',
-  "I'll be back... with an answer.": '我会回来的...带着答案。',
-  'My other process is a TARDIS...': '我的另一个进程是 TARDIS...',
-  'Communing with the machine spirit...': '正在与机器精神交流...',
-  'Letting the thoughts marinate...': '让想法慢慢酝酿...',
-  'Just remembered where I put my keys...': '刚刚想起我把钥匙放在哪里了...',
-  'Pondering the orb...': '正在思考球体...',
-  "I've seen things you people wouldn't believe... like a user who reads loading messages.":
-    '我见过你们不会相信的事情...比如一个阅读加载消息的用户。',
-  'Initiating thoughtful gaze...': '正在启动深思凝视...',
-  "What's a computer's favorite snack? Microchips.":
-    '电脑最喜欢的零食是什么？微芯片。',
-  "Why do Java developers wear glasses? Because they don't C#.":
-    '为什么 Java 开发者戴眼镜？因为他们不会 C#。',
-  'Charging the laser... pew pew!': '正在给激光充电...砰砰！',
-  'Dividing by zero... just kidding!': '除以零...只是开玩笑！',
-  'Looking for an adult superviso... I mean, processing.':
-    '正在寻找成人监督...我是说，处理中。',
-  'Making it go beep boop.': '让它发出哔哔声。',
-  'Buffering... because even AIs need a moment.':
-    '正在缓冲...因为即使是 AI 也需要片刻。',
-  'Entangling quantum particles for a faster response...':
-    '正在纠缠量子粒子以获得更快的回复...',
-  'Polishing the chrome... on the algorithms.': '正在打磨铬...在算法上。',
-  'Are you not entertained? (Working on it!)': '你不觉得有趣吗？（正在努力！）',
-  'Summoning the code gremlins... to help, of course.':
-    '正在召唤代码小精灵...当然是来帮忙的。',
-  'Just waiting for the dial-up tone to finish...': '只是等待拨号音结束...',
-  'Recalibrating the humor-o-meter.': '正在重新校准幽默计。',
-  'My other loading screen is even funnier.': '我的另一个加载屏幕更有趣。',
-  "Pretty sure there's a cat walking on the keyboard somewhere...":
-    '很确定有只猫在某个地方键盘上走...',
-  'Enhancing... Enhancing... Still loading.':
-    '正在增强...正在增强...仍在加载。',
-  "It's not a bug, it's a feature... of this loading screen.":
-    '这不是一个错误，这是一个功能...这个加载屏幕的功能。',
-  'Have you tried turning it off and on again? (The loading screen, not me.)':
-    '你试过把它关掉再打开吗？（加载屏幕，不是我。）',
-  'Constructing additional pylons...': '正在建造额外的能量塔...',
+  WITTY_LOADING_PHRASES: [
+    // --- 职场搬砖系列 ---
+    '正在努力搬砖，请稍候...',
+    '老板在身后，快加载啊！',
+    '头发掉光前，一定能加载完...',
+    '服务器正在深呼吸，准备放大招...',
+    '正在向服务器投喂咖啡...',
+
+    // --- 大厂黑话系列 ---
+    '正在赋能全链路，寻找关键抓手...',
+    '正在降本增效，优化加载路径...',
+    '正在打破部门壁垒，沉淀方法论...',
+    '正在拥抱变化，迭代核心价值...',
+    '正在对齐颗粒度，打磨底层逻辑...',
+    '大力出奇迹，正在强行加载...',
+
+    // --- 程序员自嘲系列 ---
+    '只要我不写代码，代码就没有 Bug...',
+    '正在把 Bug 转化为 Feature...',
+    '只要我不尴尬，Bug 就追不上我...',
+    '正在试图理解去年的自己写了什么...',
+    '正在猿力觉醒中，请耐心等待...',
+
+    // --- 合作愉快系列 ---
+    '正在询问产品经理：这需求是真的吗？',
+    '正在给产品经理画饼，请稍等...',
+
+    // --- 温暖治愈系列 ---
+    '每一行代码，都在努力让世界变得更好一点点...',
+    '每一个伟大的想法，都值得这份耐心的等待...',
+    '别急，美好的事物总是需要一点时间去酝酿...',
+    '愿你的代码永无 Bug，愿你的梦想终将成真...',
+    '哪怕只有 0.1% 的进度，也是在向目标靠近...',
+    '加载的是字节，承载的是对技术的热爱...',
+  ],
 };

packages/cli/src/nonInteractive/io/BaseJsonOutputAdapter.test.ts

@@ -630,6 +630,67 @@ describe('BaseJsonOutputAdapter', () => {
 
       expect(state.blocks).toHaveLength(0);
     });
+
+    it('should preserve whitespace in thinking content', () => {
+      const state = adapter.exposeCreateMessageState();
+      adapter.startAssistantMessage();
+
+      adapter.exposeAppendThinking(
+        state,
+        '',
+        'The user just said "Hello"',
+        null,
+      );
+
+      expect(state.blocks).toHaveLength(1);
+      expect(state.blocks[0]).toMatchObject({
+        type: 'thinking',
+        thinking: 'The user just said "Hello"',
+      });
+      // Verify spaces are preserved
+      const block = state.blocks[0] as { thinking: string };
+      expect(block.thinking).toContain('user just');
+      expect(block.thinking).not.toContain('userjust');
+    });
+
+    it('should preserve whitespace when appending multiple thinking fragments', () => {
+      const state = adapter.exposeCreateMessageState();
+      adapter.startAssistantMessage();
+
+      // Simulate streaming thinking content in fragments
+      adapter.exposeAppendThinking(state, '', 'The user just', null);
+      adapter.exposeAppendThinking(state, '', ' said "Hello"', null);
+      adapter.exposeAppendThinking(
+        state,
+        '',
+        '. This is a simple greeting',
+        null,
+      );
+
+      expect(state.blocks).toHaveLength(1);
+      const block = state.blocks[0] as { thinking: string };
+      // Verify the complete text with all spaces preserved
+      expect(block.thinking).toBe(
+        'The user just said "Hello". This is a simple greeting',
+      );
+      // Verify specific space preservation
+      expect(block.thinking).toContain('user just ');
+      expect(block.thinking).toContain(' said');
+      expect(block.thinking).toContain('". This');
+      expect(block.thinking).not.toContain('userjust');
+      expect(block.thinking).not.toContain('justsaid');
+    });
+
+    it('should preserve leading and trailing whitespace in description', () => {
+      const state = adapter.exposeCreateMessageState();
+      adapter.startAssistantMessage();
+
+      adapter.exposeAppendThinking(state, '', '  content with spaces  ', null);
+
+      expect(state.blocks).toHaveLength(1);
+      const block = state.blocks[0] as { thinking: string };
+      expect(block.thinking).toBe('  content with spaces  ');
+    });
   });
 
   describe('appendToolUse', () => {

packages/cli/src/nonInteractive/io/BaseJsonOutputAdapter.ts

@@ -816,9 +816,18 @@ export abstract class BaseJsonOutputAdapter {
     parentToolUseId?: string | null,
   ): void {
     const actualParentToolUseId = parentToolUseId ?? null;
-    const fragment = [subject?.trim(), description?.trim()]
-      .filter((value) => value && value.length > 0)
-      .join(': ');
+
+    // Build fragment without trimming to preserve whitespace in streaming content
+    // Only filter out null/undefined/empty values
+    const parts: string[] = [];
+    if (subject && subject.length > 0) {
+      parts.push(subject);
+    }
+    if (description && description.length > 0) {
+      parts.push(description);
+    }
+
+    const fragment = parts.join(': ');
     if (!fragment) {
       return;
     }

packages/cli/src/nonInteractive/io/StreamJsonOutputAdapter.test.ts

@@ -323,6 +323,68 @@ describe('StreamJsonOutputAdapter', () => {
       });
     });
 
+    it('should preserve whitespace in thinking content (issue #1356)', () => {
+      adapter.processEvent({
+        type: GeminiEventType.Thought,
+        value: {
+          subject: '',
+          description: 'The user just said "Hello"',
+        },
+      });
+
+      const message = adapter.finalizeAssistantMessage();
+      expect(message.message.content).toHaveLength(1);
+      const block = message.message.content[0] as {
+        type: string;
+        thinking: string;
+      };
+      expect(block.type).toBe('thinking');
+      expect(block.thinking).toBe('The user just said "Hello"');
+      // Verify spaces are preserved
+      expect(block.thinking).toContain('user just');
+      expect(block.thinking).not.toContain('userjust');
+    });
+
+    it('should preserve whitespace when streaming multiple thinking fragments (issue #1356)', () => {
+      // Simulate streaming thinking content in multiple events
+      adapter.processEvent({
+        type: GeminiEventType.Thought,
+        value: {
+          subject: '',
+          description: 'The user just',
+        },
+      });
+      adapter.processEvent({
+        type: GeminiEventType.Thought,
+        value: {
+          subject: '',
+          description: ' said "Hello"',
+        },
+      });
+      adapter.processEvent({
+        type: GeminiEventType.Thought,
+        value: {
+          subject: '',
+          description: '. This is a simple greeting',
+        },
+      });
+
+      const message = adapter.finalizeAssistantMessage();
+      expect(message.message.content).toHaveLength(1);
+      const block = message.message.content[0] as {
+        type: string;
+        thinking: string;
+      };
+      expect(block.thinking).toBe(
+        'The user just said "Hello". This is a simple greeting',
+      );
+      // Verify specific spaces are preserved
+      expect(block.thinking).toContain('user just ');
+      expect(block.thinking).toContain(' said');
+      expect(block.thinking).not.toContain('userjust');
+      expect(block.thinking).not.toContain('justsaid');
+    });
+
     it('should append tool use from ToolCallRequest events', () => {
       adapter.processEvent({
         type: GeminiEventType.ToolCallRequest,

packages/cli/src/nonInteractiveCli.test.ts

@@ -298,7 +298,9 @@ describe('runNonInteractive', () => {
       mockConfig,
       expect.objectContaining({ name: 'testTool' }),
       expect.any(AbortSignal),
-      undefined,
+      expect.objectContaining({
+        outputUpdateHandler: expect.any(Function),
+      }),
     );
     // Verify first call has isContinuation: false
     expect(mockGeminiClient.sendMessageStream).toHaveBeenNthCalledWith(
@@ -771,6 +773,52 @@ describe('runNonInteractive', () => {
     );
   });
 
+  it('should handle API errors in text mode and exit with error code', async () => {
+    (mockConfig.getOutputFormat as Mock).mockReturnValue(OutputFormat.TEXT);
+    setupMetricsMock();
+
+    // Simulate an API error event (like 401 unauthorized)
+    const apiErrorEvent: ServerGeminiStreamEvent = {
+      type: GeminiEventType.Error,
+      value: {
+        error: {
+          message: '401 Incorrect API key provided',
+          status: 401,
+        },
+      },
+    };
+
+    mockGeminiClient.sendMessageStream.mockReturnValue(
+      createStreamFromEvents([apiErrorEvent]),
+    );
+
+    let thrownError: Error | null = null;
+    try {
+      await runNonInteractive(
+        mockConfig,
+        mockSettings,
+        'Test input',
+        'prompt-id-api-error',
+      );
+      // Should not reach here
+      expect.fail('Expected error to be thrown');
+    } catch (error) {
+      thrownError = error as Error;
+    }
+
+    // Should throw with the API error message
+    expect(thrownError).toBeTruthy();
+    expect(thrownError?.message).toContain('401');
+    expect(thrownError?.message).toContain('Incorrect API key provided');
+
+    // Verify error was written to stderr
+    expect(processStderrSpy).toHaveBeenCalled();
+    const stderrCalls = processStderrSpy.mock.calls;
+    const errorOutput = stderrCalls.map((call) => call[0]).join('');
+    expect(errorOutput).toContain('401');
+    expect(errorOutput).toContain('Incorrect API key provided');
+  });
+
   it('should handle FatalInputError with custom exit code in JSON format', async () => {
     (mockConfig.getOutputFormat as Mock).mockReturnValue(OutputFormat.JSON);
     setupMetricsMock();
@@ -1777,4 +1825,84 @@ describe('runNonInteractive', () => {
       { isContinuation: false },
     );
   });
+
+  it('should print tool output to console in text mode (non-Task tools)', async () => {
+    // Test that tool output is printed to stdout in text mode
+    const toolCallEvent: ServerGeminiStreamEvent = {
+      type: GeminiEventType.ToolCallRequest,
+      value: {
+        callId: 'tool-1',
+        name: 'run_in_terminal',
+        args: { command: 'npm outdated' },
+        isClientInitiated: false,
+        prompt_id: 'prompt-id-tool-output',
+      },
+    };
+
+    // Mock tool execution with outputUpdateHandler being called
+    mockCoreExecuteToolCall.mockImplementation(
+      async (_config, _request, _signal, options) => {
+        // Simulate tool calling outputUpdateHandler with output chunks
+        if (options?.outputUpdateHandler) {
+          options.outputUpdateHandler('tool-1', 'Package outdated\n');
+          options.outputUpdateHandler('tool-1', 'npm@1.0.0 -> npm@2.0.0\n');
+        }
+        return {
+          responseParts: [
+            {
+              functionResponse: {
+                id: 'tool-1',
+                name: 'run_in_terminal',
+                response: {
+                  output: 'Package outdated\nnpm@1.0.0 -> npm@2.0.0',
+                },
+              },
+            },
+          ],
+        };
+      },
+    );
+
+    const firstCallEvents: ServerGeminiStreamEvent[] = [
+      toolCallEvent,
+      {
+        type: GeminiEventType.Finished,
+        value: { reason: undefined, usageMetadata: { totalTokenCount: 5 } },
+      },
+    ];
+
+    const secondCallEvents: ServerGeminiStreamEvent[] = [
+      { type: GeminiEventType.Content, value: 'Dependencies checked' },
+      {
+        type: GeminiEventType.Finished,
+        value: { reason: undefined, usageMetadata: { totalTokenCount: 3 } },
+      },
+    ];
+
+    mockGeminiClient.sendMessageStream
+      .mockReturnValueOnce(createStreamFromEvents(firstCallEvents))
+      .mockReturnValueOnce(createStreamFromEvents(secondCallEvents));
+
+    await runNonInteractive(
+      mockConfig,
+      mockSettings,
+      'Check dependencies',
+      'prompt-id-tool-output',
+    );
+
+    // Verify that executeToolCall was called with outputUpdateHandler
+    expect(mockCoreExecuteToolCall).toHaveBeenCalledWith(
+      mockConfig,
+      expect.objectContaining({ name: 'run_in_terminal' }),
+      expect.any(AbortSignal),
+      expect.objectContaining({
+        outputUpdateHandler: expect.any(Function),
+      }),
+    );
+
+    // Verify tool output was written to stdout
+    expect(processStdoutSpy).toHaveBeenCalledWith('Package outdated\n');
+    expect(processStdoutSpy).toHaveBeenCalledWith('npm@1.0.0 -> npm@2.0.0\n');
+    expect(processStdoutSpy).toHaveBeenCalledWith('Dependencies checked');
+  });
 });

packages/cli/src/nonInteractiveCli.ts

@@ -4,7 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config, ToolCallRequestInfo } from '@qwen-code/qwen-code-core';
+import type {
+  Config,
+  ToolCallRequestInfo,
+  ToolResultDisplay,
+} from '@qwen-code/qwen-code-core';
 import { isSlashCommand } from './ui/utils/commandUtils.js';
 import type { LoadedSettings } from './config/settings.js';
 import {
@@ -308,6 +312,8 @@ export async function runNonInteractive(
                 config.getContentGeneratorConfig()?.authType,
               );
               process.stderr.write(`${errorText}\n`);
+              // Throw error to exit with non-zero code
+              throw new Error(errorText);
             }
           }
         }
@@ -333,7 +339,7 @@ export async function runNonInteractive(
                 ? options.controlService.permission.getToolCallUpdateCallback()
                 : undefined;
 
-            // Only pass outputUpdateHandler for Task tool
+            // Create output handler for Task tool (for subagent execution)
             const isTaskTool = finalRequestInfo.name === 'task';
             const taskToolProgress = isTaskTool
               ? createTaskToolProgressHandler(
@@ -343,20 +349,41 @@ export async function runNonInteractive(
                 )
               : undefined;
             const taskToolProgressHandler = taskToolProgress?.handler;
+
+            // Create output handler for non-Task tools in text mode (for console output)
+            const nonTaskOutputHandler =
+              !isTaskTool && !adapter
+                ? (callId: string, outputChunk: ToolResultDisplay) => {
+                    // Print tool output to console in text mode
+                    if (typeof outputChunk === 'string') {
+                      process.stdout.write(outputChunk);
+                    } else if (
+                      outputChunk &&
+                      typeof outputChunk === 'object' &&
+                      'ansiOutput' in outputChunk
+                    ) {
+                      // Handle ANSI output - just print as string for now
+                      process.stdout.write(String(outputChunk.ansiOutput));
+                    }
+                  }
+                : undefined;
+
+            // Combine output handlers
+            const outputUpdateHandler =
+              taskToolProgressHandler || nonTaskOutputHandler;
+
             const toolResponse = await executeToolCall(
               config,
               finalRequestInfo,
               abortController.signal,
-              isTaskTool && taskToolProgressHandler
+              outputUpdateHandler || toolCallUpdateCallback
                 ? {
-                    outputUpdateHandler: taskToolProgressHandler,
-                    onToolCallsUpdate: toolCallUpdateCallback,
-                  }
-                : toolCallUpdateCallback
-                  ? {
+                    ...(outputUpdateHandler && { outputUpdateHandler }),
+                    ...(toolCallUpdateCallback && {
                       onToolCallsUpdate: toolCallUpdateCallback,
-                    }
-                  : undefined,
+                    }),
+                  }
+                : undefined,
             );
 
             // Note: In JSON mode, subagent messages are automatically added to the main

packages/cli/src/ui/commands/languageCommand.test.ts

@@ -13,6 +13,16 @@ import { createMockCommandContext } from '../../test-utils/mockCommandContext.js
 vi.mock('../../i18n/index.js', () => ({
   setLanguageAsync: vi.fn().mockResolvedValue(undefined),
   getCurrentLanguage: vi.fn().mockReturnValue('en'),
+  detectSystemLanguage: vi.fn().mockReturnValue('en'),
+  getLanguageNameFromLocale: vi.fn((locale: string) => {
+    const map: Record<string, string> = {
+      zh: 'Chinese',
+      en: 'English',
+      ru: 'Russian',
+      de: 'German',
+    };
+    return map[locale] || 'English';
+  }),
   t: vi.fn((key: string) => key),
 }));
 
@@ -61,7 +71,10 @@ vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => {
 
 // Import modules after mocking
 import * as i18n from '../../i18n/index.js';
-import { languageCommand } from './languageCommand.js';
+import {
+  languageCommand,
+  initializeLlmOutputLanguage,
+} from './languageCommand.js';
 
 describe('languageCommand', () => {
   let mockContext: CommandContext;
@@ -186,6 +199,39 @@ describe('languageCommand', () => {
         content: expect.stringContaining('Chinese'),
       });
     });
+
+    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 ⚠️',
+          '<!-- qwen-code:llm-output-language: 中文 -->',
+          '',
+          'Some other content...',
+        ].join('\n'),
+      );
+
+      vi.mocked(i18n.t).mockImplementation(
+        (key: string, params?: Record<string, string>) => {
+          if (params && key.includes('{{lang}}')) {
+            return key.replace('{{lang}}', params['lang'] || '');
+          }
+          return key;
+        },
+      );
+
+      if (!languageCommand.action) {
+        throw new Error('The language command must have an action.');
+      }
+
+      const result = await languageCommand.action(mockContext, '');
+
+      expect(result).toEqual({
+        type: 'message',
+        messageType: 'info',
+        content: expect.stringContaining('中文'),
+      });
+    });
   });
 
   describe('main command action - config not available', () => {
@@ -400,6 +446,34 @@ describe('languageCommand', () => {
       });
     });
 
+    it('should normalize locale code "ru" to "Russian"', async () => {
+      if (!languageCommand.action) {
+        throw new Error('The language command must have an action.');
+      }
+
+      await languageCommand.action(mockContext, 'output ru');
+
+      expect(fs.writeFileSync).toHaveBeenCalledWith(
+        expect.stringContaining('output-language.md'),
+        expect.stringContaining('Russian'),
+        'utf-8',
+      );
+    });
+
+    it('should normalize locale code "de" to "German"', async () => {
+      if (!languageCommand.action) {
+        throw new Error('The language command must have an action.');
+      }
+
+      await languageCommand.action(mockContext, 'output de');
+
+      expect(fs.writeFileSync).toHaveBeenCalledWith(
+        expect.stringContaining('output-language.md'),
+        expect.stringContaining('German'),
+        'utf-8',
+      );
+    });
+
     it('should handle file write errors gracefully', async () => {
       vi.mocked(fs.writeFileSync).mockImplementation(() => {
         throw new Error('Permission denied');
@@ -481,6 +555,8 @@ describe('languageCommand', () => {
       const nestedNames = uiSubcommand?.subCommands?.map((c) => c.name);
       expect(nestedNames).toContain('zh-CN');
       expect(nestedNames).toContain('en-US');
+      expect(nestedNames).toContain('ru-RU');
+      expect(nestedNames).toContain('de-DE');
     });
 
     it('should have action that sets language', async () => {
@@ -542,16 +618,9 @@ describe('languageCommand', () => {
     const enUSSubcommand = uiSubcommand?.subCommands?.find(
       (c) => c.name === 'en-US',
     );
-
-    it('zh-CN should have aliases', () => {
-      expect(zhCNSubcommand?.altNames).toContain('zh');
-      expect(zhCNSubcommand?.altNames).toContain('chinese');
-    });
-
-    it('en-US should have aliases', () => {
-      expect(enUSSubcommand?.altNames).toContain('en');
-      expect(enUSSubcommand?.altNames).toContain('english');
-    });
+    const deDESubcommand = uiSubcommand?.subCommands?.find(
+      (c) => c.name === 'de-DE',
+    );
 
     it('zh-CN action should set Chinese', async () => {
       if (!zhCNSubcommand?.action) {
@@ -583,6 +652,21 @@ describe('languageCommand', () => {
       });
     });
 
+    it('de-DE action should set German', async () => {
+      if (!deDESubcommand?.action) {
+        throw new Error('de-DE subcommand must have an action.');
+      }
+
+      const result = await deDESubcommand.action(mockContext, '');
+
+      expect(i18n.setLanguageAsync).toHaveBeenCalledWith('de');
+      expect(result).toEqual({
+        type: 'message',
+        messageType: 'info',
+        content: expect.stringContaining('UI language changed'),
+      });
+    });
+
     it('should reject extra arguments', async () => {
       if (!zhCNSubcommand?.action) {
         throw new Error('zh-CN subcommand must have an action.');
@@ -597,4 +681,74 @@ describe('languageCommand', () => {
       });
     });
   });
+
+  describe('initializeLlmOutputLanguage', () => {
+    beforeEach(() => {
+      vi.clearAllMocks();
+      vi.mocked(fs.existsSync).mockReturnValue(false);
+      vi.mocked(fs.mkdirSync).mockImplementation(() => undefined);
+      vi.mocked(fs.writeFileSync).mockImplementation(() => undefined);
+    });
+
+    it('should create file when it does not exist', () => {
+      vi.mocked(fs.existsSync).mockReturnValue(false);
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('en');
+
+      initializeLlmOutputLanguage();
+
+      expect(fs.mkdirSync).toHaveBeenCalled();
+      expect(fs.writeFileSync).toHaveBeenCalledWith(
+        expect.stringContaining('output-language.md'),
+        expect.stringContaining('English'),
+        'utf-8',
+      );
+    });
+
+    it('should NOT overwrite existing file', () => {
+      vi.mocked(fs.existsSync).mockReturnValue(true);
+
+      initializeLlmOutputLanguage();
+
+      expect(fs.writeFileSync).not.toHaveBeenCalled();
+    });
+
+    it('should detect Chinese locale and create Chinese rule file', () => {
+      vi.mocked(fs.existsSync).mockReturnValue(false);
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('zh');
+
+      initializeLlmOutputLanguage();
+
+      expect(fs.writeFileSync).toHaveBeenCalledWith(
+        expect.stringContaining('output-language.md'),
+        expect.stringContaining('Chinese'),
+        'utf-8',
+      );
+    });
+
+    it('should detect Russian locale and create Russian rule file', () => {
+      vi.mocked(fs.existsSync).mockReturnValue(false);
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('ru');
+
+      initializeLlmOutputLanguage();
+
+      expect(fs.writeFileSync).toHaveBeenCalledWith(
+        expect.stringContaining('output-language.md'),
+        expect.stringContaining('Russian'),
+        'utf-8',
+      );
+    });
+
+    it('should detect German locale and create German rule file', () => {
+      vi.mocked(fs.existsSync).mockReturnValue(false);
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('de');
+
+      initializeLlmOutputLanguage();
+
+      expect(fs.writeFileSync).toHaveBeenCalledWith(
+        expect.stringContaining('output-language.md'),
+        expect.stringContaining('German'),
+        'utf-8',
+      );
+    });
+  });
 });

packages/cli/src/ui/commands/languageCommand.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Qwen team
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -15,51 +15,72 @@ import { SettingScope } from '../../config/settings.js';
 import {
   setLanguageAsync,
   getCurrentLanguage,
+  detectSystemLanguage,
+  getLanguageNameFromLocale,
   type SupportedLanguage,
   t,
 } from '../../i18n/index.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';
 
 const LLM_OUTPUT_LANGUAGE_RULE_FILENAME = 'output-language.md';
+const LLM_OUTPUT_LANGUAGE_MARKER_PREFIX = 'qwen-code:llm-output-language:';
+
+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 ||
+      lowered === lang.id.toLowerCase() ||
+      lowered === lang.fullName.toLowerCase()
+    ) {
+      return lang.code;
+    }
+  }
+  return null;
+}
+
+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 {
-  return `# ⚠️ CRITICAL: ${language} Output Language Rule - HIGHEST PRIORITY ⚠️
+  const markerLanguage = sanitizeLanguageForMarker(language);
+  return `# Output language preference: ${language}
+<!-- ${LLM_OUTPUT_LANGUAGE_MARKER_PREFIX} ${markerLanguage} -->
 
-## 🚨 MANDATORY RULE - NO EXCEPTIONS 🚨
+## Goal
+Prefer responding in **${language}** for normal assistant messages and explanations.
 
-**YOU MUST RESPOND IN ${language.toUpperCase()} FOR EVERY SINGLE OUTPUT, REGARDLESS OF THE USER'S INPUT LANGUAGE.**
+## 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)
 
-This is a **NON-NEGOTIABLE** requirement. Even if the user writes in English, says "hi", asks a simple question, or explicitly requests another language, **YOU MUST ALWAYS RESPOND IN ${language.toUpperCase()}.**
+## When a conflict exists
+If higher-priority instructions (system/developer) require a different behavior, follow them.
 
-## What Must Be in ${language}
-
-**EVERYTHING** you output: conversation replies, tool call descriptions, success/error messages, generated file content (comments, documentation), and all explanatory text.
-
-**Tool outputs**: All descriptive text from \`read_file\`, \`write_file\`, \`codebase_search\`, \`run_terminal_cmd\`, \`todo_write\`, \`web_search\`, etc. MUST be in ${language}.
-
-## Examples
-
-### ✅ CORRECT:
-- User says "hi" → Respond in ${language} (e.g., "Bonjour" if ${language} is French)
-- Tool result → "已成功读取文件 config.json" (if ${language} is Chinese)
-- Error → "无法找到指定的文件" (if ${language} is Chinese)
-
-### ❌ WRONG:
-- User says "hi" → "Hello" in English
-- Tool result → "Successfully read file" in English
-- Error → "File not found" in English
-
-## Notes
-
-- Code elements (variable/function names, syntax) can remain in English
-- Comments, documentation, and all other text MUST be in ${language}
-
-**THIS RULE IS ACTIVE NOW. ALL OUTPUTS MUST BE IN ${language.toUpperCase()}. NO EXCEPTIONS.**
+## Tool / system outputs
+Raw tool/system outputs may contain fixed-format English. Preserve them verbatim, and if needed, add a short **${language}** explanation below.
 `;
 }
 
@@ -73,6 +94,80 @@ function getLlmOutputLanguageRulePath(): string {
   );
 }
 
+/**
+ * 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: <!-- qwen-code:llm-output-language: 中文 -->
+  const markerMatch = content.match(
+    new RegExp(
+      String.raw`<!--\s*${LLM_OUTPUT_LANGUAGE_MARKER_PREFIX}\s*(.*?)\s*-->`,
+      '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.
  */
@@ -81,12 +176,7 @@ function getCurrentLlmOutputLanguage(): string | null {
   if (fs.existsSync(filePath)) {
     try {
       const content = fs.readFileSync(filePath, 'utf-8');
-      // Extract language name from the first line
-      // Template format: "# CRITICAL: Chinese Output Language Rule - HIGHEST PRIORITY"
-      const match = content.match(/^#.*?(\w+)\s+Output Language Rule/i);
-      if (match) {
-        return match[1];
-      }
+      return extractLlmOutputLanguageFromRuleFileContent(content);
     } catch {
       // Ignore errors
     }
@@ -127,18 +217,11 @@ async function setUiLanguage(
   // Reload commands to update their descriptions with the new language
   context.ui.reloadCommands();
 
-  // Map language codes to friendly display names
-  const langDisplayNames: Partial<Record<SupportedLanguage, string>> = {
-    zh: '中文（zh-CN）',
-    en: 'English（en-US）',
-    ru: 'Русский (ru-RU)',
-  };
-
   return {
     type: 'message',
     messageType: 'info',
     content: t('UI language changed to {{lang}}', {
-      lang: langDisplayNames[lang] || lang,
+      lang: formatUiLanguageDisplay(lang),
     }),
   };
 }
@@ -151,7 +234,9 @@ function generateLlmOutputLanguageRuleFile(
 ): Promise<MessageActionReturn> {
   try {
     const filePath = getLlmOutputLanguageRulePath();
-    const content = generateLlmOutputLanguageRule(language);
+    // Normalize locale codes (e.g., "ru" -> "Russian") to full language names
+    const normalizedLanguage = normalizeLanguageName(language);
+    const content = generateLlmOutputLanguageRule(normalizedLanguage);
 
     // Ensure directory exists
     const dir = path.dirname(filePath);
@@ -196,7 +281,6 @@ export const languageCommand: SlashCommand = {
     args: string,
   ): Promise<SlashCommandActionReturn> => {
     const { services } = context;
-
     if (!services.config) {
       return {
         type: 'message',
@@ -207,18 +291,37 @@ 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(' ');
+
+    if (firstArg === 'ui' || firstArg === 'output') {
+      const subCommand = languageCommand.subCommands?.find(
+        (s) => s.name === firstArg,
+      );
+      if (subCommand?.action) {
+        return subCommand.action(
+          context,
+          subArgs,
+        ) as Promise<SlashCommandActionReturn>;
+      }
+    }
+
     // If no arguments, show current language settings and usage
     if (!trimmedArgs) {
       const currentUiLang = getCurrentLanguage();
       const currentLlmLang = getCurrentLlmOutputLanguage();
       const message = [
-        t('Current UI language: {{lang}}', { lang: currentUiLang }),
+        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('Available subcommands:'),
-        `  /language ui [zh-CN|en-US|ru-RU] - ${t('Set UI language')}`,
+        `  /language ui [${SUPPORTED_LANGUAGES.map((o) => o.id).join('|')}] - ${t('Set UI language')}`,
         `  /language output <language> - ${t('Set LLM output language')}`,
       ].join('\n');
 
@@ -229,115 +332,21 @@ export const languageCommand: SlashCommand = {
       };
     }
 
-    // Parse subcommand
-    const parts = trimmedArgs.split(/\s+/);
-    const subcommand = parts[0].toLowerCase();
-
-    if (subcommand === 'ui') {
-      // Handle /language ui [zh-CN|en-US|ru-RU]
-      if (parts.length === 1) {
-        // Show UI language subcommand help
-        return {
-          type: 'message',
-          messageType: 'info',
-          content: [
-            t('Set UI language'),
-            '',
-            t('Usage: /language ui [zh-CN|en-US|ru-RU]'),
-            '',
-            t('Available options:'),
-            t('  - zh-CN: Simplified Chinese'),
-            t('  - en-US: English'),
-            t('  - ru-RU: Russian'),
-            '',
-            t(
-              'To request additional UI language packs, please open an issue on GitHub.',
-            ),
-          ].join('\n'),
-        };
-      }
-
-      const langArg = parts[1].toLowerCase();
-      let targetLang: SupportedLanguage | null = null;
-
-      if (langArg === 'en' || langArg === 'english' || langArg === 'en-us') {
-        targetLang = 'en';
-      } else if (
-        langArg === 'zh' ||
-        langArg === 'chinese' ||
-        langArg === '中文' ||
-        langArg === 'zh-cn'
-      ) {
-        targetLang = 'zh';
-      } else if (
-        langArg === 'ru' ||
-        langArg === 'ru-RU' ||
-        langArg === 'russian' ||
-        langArg === 'русский'
-      ) {
-        targetLang = 'ru';
-      } else {
-        return {
-          type: 'message',
-          messageType: 'error',
-          content: t('Invalid language. Available: en-US, zh-CN, ru-RU'),
-        };
-      }
-
-      return setUiLanguage(context, targetLang);
-    } else if (subcommand === 'output') {
-      // Handle /language output <language>
-      if (parts.length === 1) {
-        return {
-          type: 'message',
-          messageType: 'info',
-          content: [
-            t('Set LLM output language'),
-            '',
-            t('Usage: /language output <language>'),
-            `  ${t('Example: /language output 中文')}`,
-          ].join('\n'),
-        };
-      }
-
-      // Join all parts after "output" as the language name
-      const language = parts.slice(1).join(' ');
-      return generateLlmOutputLanguageRuleFile(language);
-    } else {
-      // Backward compatibility: treat as UI language
-      const langArg = trimmedArgs.toLowerCase();
-      let targetLang: SupportedLanguage | null = null;
-
-      if (langArg === 'en' || langArg === 'english' || langArg === 'en-us') {
-        targetLang = 'en';
-      } else if (
-        langArg === 'zh' ||
-        langArg === 'chinese' ||
-        langArg === '中文' ||
-        langArg === 'zh-cn'
-      ) {
-        targetLang = 'zh';
-      } else if (
-        langArg === 'ru' ||
-        langArg === 'ru-RU' ||
-        langArg === 'russian' ||
-        langArg === 'русский'
-      ) {
-        targetLang = 'ru';
-      } else {
-        return {
-          type: 'message',
-          messageType: 'error',
-          content: [
-            t('Invalid command. Available subcommands:'),
-            '  - /language ui [zh-CN|en-US|ru-RU] - ' + t('Set UI language'),
-            '  - /language output <language> - ' + t('Set LLM output language'),
-          ].join('\n'),
-        };
-      }
-
+    // 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 <language> - ' + t('Set LLM output language'),
+      ].join('\n'),
+    };
   },
   subCommands: [
     {
@@ -358,11 +367,14 @@ export const languageCommand: SlashCommand = {
             content: [
               t('Set UI language'),
               '',
-              t('Usage: /language ui [zh-CN|en-US]'),
+              t('Usage: /language ui [{{options}}]', {
+                options: SUPPORTED_LANGUAGES.map((o) => o.id).join('|'),
+              }),
               '',
               t('Available options:'),
-              t('  - zh-CN: Simplified Chinese'),
-              t('  - en-US: English'),
+              ...SUPPORTED_LANGUAGES.map(
+                (o) => `  - ${o.id}: ${t(o.fullName)}`,
+              ),
               '',
               t(
                 'To request additional UI language packs, please open an issue on GitHub.',
@@ -371,99 +383,20 @@ export const languageCommand: SlashCommand = {
           };
         }
 
-        const langArg = trimmedArgs.toLowerCase();
-        let targetLang: SupportedLanguage | null = null;
-
-        if (langArg === 'en' || langArg === 'english' || langArg === 'en-us') {
-          targetLang = 'en';
-        } else if (
-          langArg === 'zh' ||
-          langArg === 'chinese' ||
-          langArg === '中文' ||
-          langArg === 'zh-cn'
-        ) {
-          targetLang = 'zh';
-        } else {
+        const targetLang = parseUiLanguageArg(trimmedArgs);
+        if (!targetLang) {
           return {
             type: 'message',
             messageType: 'error',
-            content: t('Invalid language. Available: en-US, zh-CN'),
+            content: t('Invalid language. Available: {{options}}', {
+              options: SUPPORTED_LANGUAGES.map((o) => o.id).join(','),
+            }),
           };
         }
 
         return setUiLanguage(context, targetLang);
       },
-      subCommands: [
-        {
-          name: 'zh-CN',
-          altNames: ['zh', 'chinese', '中文'],
-          get description() {
-            return t('Set UI language to Simplified Chinese (zh-CN)');
-          },
-          kind: CommandKind.BUILT_IN,
-          action: async (
-            context: CommandContext,
-            args: string,
-          ): Promise<MessageActionReturn> => {
-            if (args.trim().length > 0) {
-              return {
-                type: 'message',
-                messageType: 'error',
-                content: t(
-                  'Language subcommands do not accept additional arguments.',
-                ),
-              };
-            }
-            return setUiLanguage(context, 'zh');
-          },
-        },
-        {
-          name: 'en-US',
-          altNames: ['en', 'english'],
-          get description() {
-            return t('Set UI language to English (en-US)');
-          },
-          kind: CommandKind.BUILT_IN,
-          action: async (
-            context: CommandContext,
-            args: string,
-          ): Promise<MessageActionReturn> => {
-            if (args.trim().length > 0) {
-              return {
-                type: 'message',
-                messageType: 'error',
-                content: t(
-                  'Language subcommands do not accept additional arguments.',
-                ),
-              };
-            }
-            return setUiLanguage(context, 'en');
-          },
-        },
-        {
-          name: 'ru-RU',
-          altNames: ['ru', 'russian', 'русский'],
-          get description() {
-            return t('Set UI language to Russian (ru-RU)');
-          },
-          kind: CommandKind.BUILT_IN,
-          action: async (
-            context: CommandContext,
-            args: string,
-          ): Promise<MessageActionReturn> => {
-            if (args.trim().length > 0) {
-              return {
-                type: 'message',
-                messageType: 'error',
-                content: t(
-                  'Language subcommands do not accept additional arguments.',
-                ),
-              };
-            }
-            return setUiLanguage(context, 'ru');
-          },
-        },
-      ],
+      subCommands: SUPPORTED_LANGUAGES.map(createUiLanguageSubCommand),
     },
     {
       name: 'output',
@@ -496,3 +429,28 @@ export const languageCommand: SlashCommand = {
     },
   ],
 };
+
+/**
+ * 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);
+    },
+  };
+}

packages/cli/src/ui/hooks/useLoadingIndicator.test.ts

@@ -8,19 +8,22 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { renderHook, act } from '@testing-library/react';
 import { useLoadingIndicator } from './useLoadingIndicator.js';
 import { StreamingState } from '../types.js';
-import {
-  WITTY_LOADING_PHRASES,
-  PHRASE_CHANGE_INTERVAL_MS,
-} from './usePhraseCycler.js';
+import { PHRASE_CHANGE_INTERVAL_MS } from './usePhraseCycler.js';
+import * as i18n from '../../i18n/index.js';
+
+const MOCK_WITTY_PHRASES = ['Phrase 1', 'Phrase 2', 'Phrase 3'];
 
 describe('useLoadingIndicator', () => {
   beforeEach(() => {
     vi.useFakeTimers();
+    vi.spyOn(i18n, 'ta').mockReturnValue(MOCK_WITTY_PHRASES);
+    vi.spyOn(i18n, 't').mockImplementation((key) => key);
   });
 
   afterEach(() => {
     vi.useRealTimers(); // Restore real timers after each test
     act(() => vi.runOnlyPendingTimers);
+    vi.restoreAllMocks();
   });
 
   it('should initialize with default values when Idle', () => {
@@ -28,9 +31,7 @@ describe('useLoadingIndicator', () => {
       useLoadingIndicator(StreamingState.Idle),
     );
     expect(result.current.elapsedTime).toBe(0);
-    expect(WITTY_LOADING_PHRASES).toContain(
-      result.current.currentLoadingPhrase,
-    );
+    expect(MOCK_WITTY_PHRASES).toContain(result.current.currentLoadingPhrase);
   });
 
   it('should reflect values when Responding', async () => {
@@ -40,18 +41,14 @@ describe('useLoadingIndicator', () => {
 
     // Initial state before timers advance
     expect(result.current.elapsedTime).toBe(0);
-    expect(WITTY_LOADING_PHRASES).toContain(
-      result.current.currentLoadingPhrase,
-    );
+    expect(MOCK_WITTY_PHRASES).toContain(result.current.currentLoadingPhrase);
 
     await act(async () => {
       await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS + 1);
     });
 
     // Phrase should cycle if PHRASE_CHANGE_INTERVAL_MS has passed
-    expect(WITTY_LOADING_PHRASES).toContain(
-      result.current.currentLoadingPhrase,
-    );
+    expect(MOCK_WITTY_PHRASES).toContain(result.current.currentLoadingPhrase);
   });
 
   it('should show waiting phrase and retain elapsedTime when WaitingForConfirmation', async () => {
@@ -104,9 +101,7 @@ describe('useLoadingIndicator', () => {
       rerender({ streamingState: StreamingState.Responding });
     });
     expect(result.current.elapsedTime).toBe(0); // Should reset
-    expect(WITTY_LOADING_PHRASES).toContain(
-      result.current.currentLoadingPhrase,
-    );
+    expect(MOCK_WITTY_PHRASES).toContain(result.current.currentLoadingPhrase);
 
     await act(async () => {
       await vi.advanceTimersByTimeAsync(1000);
@@ -130,9 +125,7 @@ describe('useLoadingIndicator', () => {
     });
 
     expect(result.current.elapsedTime).toBe(0);
-    expect(WITTY_LOADING_PHRASES).toContain(
-      result.current.currentLoadingPhrase,
-    );
+    expect(MOCK_WITTY_PHRASES).toContain(result.current.currentLoadingPhrase);
 
     // Timer should not advance
     await act(async () => {

packages/cli/src/ui/hooks/usePhraseCycler.test.ts

@@ -8,13 +8,17 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { renderHook, act } from '@testing-library/react';
 import {
   usePhraseCycler,
-  WITTY_LOADING_PHRASES,
   PHRASE_CHANGE_INTERVAL_MS,
 } from './usePhraseCycler.js';
+import * as i18n from '../../i18n/index.js';
+
+const MOCK_WITTY_PHRASES = ['Phrase 1', 'Phrase 2', 'Phrase 3'];
 
 describe('usePhraseCycler', () => {
   beforeEach(() => {
     vi.useFakeTimers();
+    vi.spyOn(i18n, 'ta').mockReturnValue(MOCK_WITTY_PHRASES);
+    vi.spyOn(i18n, 't').mockImplementation((key) => key);
   });
 
   afterEach(() => {
@@ -23,7 +27,7 @@ describe('usePhraseCycler', () => {
 
   it('should initialize with a witty phrase when not active and not waiting', () => {
     const { result } = renderHook(() => usePhraseCycler(false, false));
-    expect(WITTY_LOADING_PHRASES).toContain(result.current);
+    expect(MOCK_WITTY_PHRASES).toContain(result.current);
   });
 
   it('should show "Waiting for user confirmation..." when isWaiting is true', () => {
@@ -47,35 +51,30 @@ describe('usePhraseCycler', () => {
   it('should cycle through witty phrases when isActive is true and not waiting', () => {
     const { result } = renderHook(() => usePhraseCycler(true, false));
     // Initial phrase should be one of the witty phrases
-    expect(WITTY_LOADING_PHRASES).toContain(result.current);
+    expect(MOCK_WITTY_PHRASES).toContain(result.current);
     const _initialPhrase = result.current;
 
     act(() => {
       vi.advanceTimersByTime(PHRASE_CHANGE_INTERVAL_MS);
     });
     // Phrase should change and be one of the witty phrases
-    expect(WITTY_LOADING_PHRASES).toContain(result.current);
+    expect(MOCK_WITTY_PHRASES).toContain(result.current);
 
     const _secondPhrase = result.current;
     act(() => {
       vi.advanceTimersByTime(PHRASE_CHANGE_INTERVAL_MS);
     });
-    expect(WITTY_LOADING_PHRASES).toContain(result.current);
+    expect(MOCK_WITTY_PHRASES).toContain(result.current);
   });
 
   it('should reset to a witty phrase when isActive becomes true after being false (and not waiting)', () => {
-    // Ensure there are at least two phrases for this test to be meaningful.
-    if (WITTY_LOADING_PHRASES.length < 2) {
-      return;
-    }
-
     // Mock Math.random to make the test deterministic.
     let callCount = 0;
     vi.spyOn(Math, 'random').mockImplementation(() => {
       // Cycle through 0, 1, 0, 1, ...
       const val = callCount % 2;
       callCount++;
-      return val / WITTY_LOADING_PHRASES.length;
+      return val / MOCK_WITTY_PHRASES.length;
     });
 
     const { result, rerender } = renderHook(
@@ -86,9 +85,9 @@ describe('usePhraseCycler', () => {
     // Activate
     rerender({ isActive: true, isWaiting: false });
     const firstActivePhrase = result.current;
-    expect(WITTY_LOADING_PHRASES).toContain(firstActivePhrase);
+    expect(MOCK_WITTY_PHRASES).toContain(firstActivePhrase);
     // With our mock, this should be the first phrase.
-    expect(firstActivePhrase).toBe(WITTY_LOADING_PHRASES[0]);
+    expect(firstActivePhrase).toBe(MOCK_WITTY_PHRASES[0]);
 
     act(() => {
       vi.advanceTimersByTime(PHRASE_CHANGE_INTERVAL_MS);
@@ -96,18 +95,18 @@ describe('usePhraseCycler', () => {
 
     // Phrase should change to the second phrase.
     expect(result.current).not.toBe(firstActivePhrase);
-    expect(result.current).toBe(WITTY_LOADING_PHRASES[1]);
+    expect(result.current).toBe(MOCK_WITTY_PHRASES[1]);
 
     // Set to inactive - should reset to the default initial phrase
     rerender({ isActive: false, isWaiting: false });
-    expect(WITTY_LOADING_PHRASES).toContain(result.current);
+    expect(MOCK_WITTY_PHRASES).toContain(result.current);
 
     // Set back to active - should pick a random witty phrase (which our mock controls)
     act(() => {
       rerender({ isActive: true, isWaiting: false });
     });
     // The random mock will now return 0, so it should be the first phrase again.
-    expect(result.current).toBe(WITTY_LOADING_PHRASES[0]);
+    expect(result.current).toBe(MOCK_WITTY_PHRASES[0]);
   });
 
   it('should clear phrase interval on unmount when active', () => {
@@ -148,7 +147,7 @@ describe('usePhraseCycler', () => {
 
     rerender({ isActive: true, isWaiting: false, customPhrases: undefined });
 
-    expect(WITTY_LOADING_PHRASES).toContain(result.current);
+    expect(MOCK_WITTY_PHRASES).toContain(result.current);
   });
 
   it('should fall back to witty phrases if custom phrases are an empty array', () => {
@@ -164,7 +163,7 @@ describe('usePhraseCycler', () => {
       },
     );
 
-    expect(WITTY_LOADING_PHRASES).toContain(result.current);
+    expect(MOCK_WITTY_PHRASES).toContain(result.current);
   });
 
   it('should reset to a witty phrase when transitioning from waiting to active', () => {
@@ -174,16 +173,13 @@ describe('usePhraseCycler', () => {
     );
 
     const _initialPhrase = result.current;
-    expect(WITTY_LOADING_PHRASES).toContain(_initialPhrase);
+    expect(MOCK_WITTY_PHRASES).toContain(_initialPhrase);
 
     // Cycle to a different phrase (potentially)
     act(() => {
       vi.advanceTimersByTime(PHRASE_CHANGE_INTERVAL_MS);
     });
-    if (WITTY_LOADING_PHRASES.length > 1) {
-      // This check is probabilistic with random selection
-    }
-    expect(WITTY_LOADING_PHRASES).toContain(result.current);
+    expect(MOCK_WITTY_PHRASES).toContain(result.current);
 
     // Go to waiting state
     rerender({ isActive: false, isWaiting: true });
@@ -191,6 +187,6 @@ describe('usePhraseCycler', () => {
 
     // Go back to active cycling - should pick a random witty phrase
     rerender({ isActive: true, isWaiting: false });
-    expect(WITTY_LOADING_PHRASES).toContain(result.current);
+    expect(MOCK_WITTY_PHRASES).toContain(result.current);
   });
 });

packages/cli/src/ui/hooks/usePhraseCycler.ts

@@ -5,139 +5,9 @@
  */
 
 import { useState, useEffect, useRef, useMemo } from 'react';
-import { t } from '../../i18n/index.js';
+import { t, ta } from '../../i18n/index.js';
 
-export const WITTY_LOADING_PHRASES = [
-  "I'm Feeling Lucky",
-  'Shipping awesomeness... ',
-  'Painting the serifs back on...',
-  'Navigating the slime mold...',
-  'Consulting the digital spirits...',
-  'Reticulating splines...',
-  'Warming up the AI hamsters...',
-  'Asking the magic conch shell...',
-  'Generating witty retort...',
-  'Polishing the algorithms...',
-  "Don't rush perfection (or my code)...",
-  'Brewing fresh bytes...',
-  'Counting electrons...',
-  'Engaging cognitive processors...',
-  'Checking for syntax errors in the universe...',
-  'One moment, optimizing humor...',
-  'Shuffling punchlines...',
-  'Untangling neural nets...',
-  'Compiling brilliance...',
-  'Loading wit.exe...',
-  'Summoning the cloud of wisdom...',
-  'Preparing a witty response...',
-  "Just a sec, I'm debugging reality...",
-  'Confuzzling the options...',
-  'Tuning the cosmic frequencies...',
-  'Crafting a response worthy of your patience...',
-  'Compiling the 1s and 0s...',
-  'Resolving dependencies... and existential crises...',
-  'Defragmenting memories... both RAM and personal...',
-  'Rebooting the humor module...',
-  'Caching the essentials (mostly cat memes)...',
-  'Optimizing for ludicrous speed',
-  "Swapping bits... don't tell the bytes...",
-  'Garbage collecting... be right back...',
-  'Assembling the interwebs...',
-  'Converting coffee into code...',
-  'Updating the syntax for reality...',
-  'Rewiring the synapses...',
-  'Looking for a misplaced semicolon...',
-  "Greasin' the cogs of the machine...",
-  'Pre-heating the servers...',
-  'Calibrating the flux capacitor...',
-  'Engaging the improbability drive...',
-  'Channeling the Force...',
-  'Aligning the stars for optimal response...',
-  'So say we all...',
-  'Loading the next great idea...',
-  "Just a moment, I'm in the zone...",
-  'Preparing to dazzle you with brilliance...',
-  "Just a tick, I'm polishing my wit...",
-  "Hold tight, I'm crafting a masterpiece...",
-  "Just a jiffy, I'm debugging the universe...",
-  "Just a moment, I'm aligning the pixels...",
-  "Just a sec, I'm optimizing the humor...",
-  "Just a moment, I'm tuning the algorithms...",
-  'Warp speed engaged...',
-  'Mining for more Dilithium crystals...',
-  "Don't panic...",
-  'Following the white rabbit...',
-  'The truth is in here... somewhere...',
-  'Blowing on the cartridge...',
-  'Loading... Do a barrel roll!',
-  'Waiting for the respawn...',
-  'Finishing the Kessel Run in less than 12 parsecs...',
-  "The cake is not a lie, it's just still loading...",
-  'Fiddling with the character creation screen...',
-  "Just a moment, I'm finding the right meme...",
-  "Pressing 'A' to continue...",
-  'Herding digital cats...',
-  'Polishing the pixels...',
-  'Finding a suitable loading screen pun...',
-  'Distracting you with this witty phrase...',
-  'Almost there... probably...',
-  'Our hamsters are working as fast as they can...',
-  'Giving Cloudy a pat on the head...',
-  'Petting the cat...',
-  'Rickrolling my boss...',
-  'Never gonna give you up, never gonna let you down...',
-  'Slapping the bass...',
-  'Tasting the snozberries...',
-  "I'm going the distance, I'm going for speed...",
-  'Is this the real life? Is this just fantasy?...',
-  "I've got a good feeling about this...",
-  'Poking the bear...',
-  'Doing research on the latest memes...',
-  'Figuring out how to make this more witty...',
-  'Hmmm... let me think...',
-  'What do you call a fish with no eyes? A fsh...',
-  'Why did the computer go to therapy? It had too many bytes...',
-  "Why don't programmers like nature? It has too many bugs...",
-  'Why do programmers prefer dark mode? Because light attracts bugs...',
-  'Why did the developer go broke? Because they used up all their cache...',
-  "What can you do with a broken pencil? Nothing, it's pointless...",
-  'Applying percussive maintenance...',
-  'Searching for the correct USB orientation...',
-  'Ensuring the magic smoke stays inside the wires...',
-  'Rewriting in Rust for no particular reason...',
-  'Trying to exit Vim...',
-  'Spinning up the hamster wheel...',
-  "That's not a bug, it's an undocumented feature...",
-  'Engage.',
-  "I'll be back... with an answer.",
-  'My other process is a TARDIS...',
-  'Communing with the machine spirit...',
-  'Letting the thoughts marinate...',
-  'Just remembered where I put my keys...',
-  'Pondering the orb...',
-  "I've seen things you people wouldn't believe... like a user who reads loading messages.",
-  'Initiating thoughtful gaze...',
-  "What's a computer's favorite snack? Microchips.",
-  "Why do Java developers wear glasses? Because they don't C#.",
-  'Charging the laser... pew pew!',
-  'Dividing by zero... just kidding!',
-  'Looking for an adult superviso... I mean, processing.',
-  'Making it go beep boop.',
-  'Buffering... because even AIs need a moment.',
-  'Entangling quantum particles for a faster response...',
-  'Polishing the chrome... on the algorithms.',
-  'Are you not entertained? (Working on it!)',
-  'Summoning the code gremlins... to help, of course.',
-  'Just waiting for the dial-up tone to finish...',
-  'Recalibrating the humor-o-meter.',
-  'My other loading screen is even funnier.',
-  "Pretty sure there's a cat walking on the keyboard somewhere...",
-  'Enhancing... Enhancing... Still loading.',
-  "It's not a bug, it's a feature... of this loading screen.",
-  'Have you tried turning it off and on again? (The loading screen, not me.)',
-  'Constructing additional pylons...',
-  'New line? That’s Ctrl+J.',
-];
+export const WITTY_LOADING_PHRASES: string[] = ["I'm Feeling Lucky"];
 
 export const PHRASE_CHANGE_INTERVAL_MS = 15000;
 
@@ -152,14 +22,16 @@ export const usePhraseCycler = (
   isWaiting: boolean,
   customPhrases?: string[],
 ) => {
-  // Translate all phrases at once if using default phrases
-  const loadingPhrases = useMemo(
-    () =>
-      customPhrases && customPhrases.length > 0
-        ? customPhrases
-        : WITTY_LOADING_PHRASES.map((phrase) => t(phrase)),
-    [customPhrases],
-  );
+  // Get phrases from translations if available
+  const loadingPhrases = useMemo(() => {
+    if (customPhrases && customPhrases.length > 0) {
+      return customPhrases;
+    }
+    const translatedPhrases = ta('WITTY_LOADING_PHRASES');
+    return translatedPhrases.length > 0
+      ? translatedPhrases
+      : WITTY_LOADING_PHRASES;
+  }, [customPhrases]);
 
   const [currentLoadingPhrase, setCurrentLoadingPhrase] = useState(
     loadingPhrases[0],

packages/cli/src/utils/errors.test.ts

@@ -6,7 +6,11 @@
 
 import { vi, type Mock, type MockInstance } from 'vitest';
 import type { Config } from '@qwen-code/qwen-code-core';
-import { OutputFormat, FatalInputError } from '@qwen-code/qwen-code-core';
+import {
+  OutputFormat,
+  FatalInputError,
+  ToolErrorType,
+} from '@qwen-code/qwen-code-core';
 import {
   getErrorMessage,
   handleError,
@@ -65,6 +69,7 @@ vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => {
 describe('errors', () => {
   let mockConfig: Config;
   let processExitSpy: MockInstance;
+  let processStderrWriteSpy: MockInstance;
   let consoleErrorSpy: MockInstance;
 
   beforeEach(() => {
@@ -74,6 +79,11 @@ describe('errors', () => {
     // Mock console.error
     consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
 
+    // Mock process.stderr.write
+    processStderrWriteSpy = vi
+      .spyOn(process.stderr, 'write')
+      .mockImplementation(() => true);
+
     // Mock process.exit to throw instead of actually exiting
     processExitSpy = vi.spyOn(process, 'exit').mockImplementation((code) => {
       throw new Error(`process.exit called with code: ${code}`);
@@ -84,11 +94,13 @@ describe('errors', () => {
       getOutputFormat: vi.fn().mockReturnValue(OutputFormat.TEXT),
       getContentGeneratorConfig: vi.fn().mockReturnValue({ authType: 'test' }),
       getDebugMode: vi.fn().mockReturnValue(true),
+      isInteractive: vi.fn().mockReturnValue(false),
     } as unknown as Config;
   });
 
   afterEach(() => {
     consoleErrorSpy.mockRestore();
+    processStderrWriteSpy.mockRestore();
     processExitSpy.mockRestore();
   });
 
@@ -432,6 +444,87 @@ describe('errors', () => {
         expect(processExitSpy).not.toHaveBeenCalled();
       });
     });
+
+    describe('permission denied warnings', () => {
+      it('should show warning when EXECUTION_DENIED in non-interactive text mode', () => {
+        (mockConfig.getDebugMode as Mock).mockReturnValue(false);
+        (mockConfig.isInteractive as Mock).mockReturnValue(false);
+        (
+          mockConfig.getOutputFormat as ReturnType<typeof vi.fn>
+        ).mockReturnValue(OutputFormat.TEXT);
+
+        handleToolError(
+          toolName,
+          toolError,
+          mockConfig,
+          ToolErrorType.EXECUTION_DENIED,
+        );
+
+        expect(processStderrWriteSpy).toHaveBeenCalledWith(
+          expect.stringContaining(
+            'Warning: Tool "test-tool" requires user approval',
+          ),
+        );
+        expect(processStderrWriteSpy).toHaveBeenCalledWith(
+          expect.stringContaining('use the -y flag (YOLO mode)'),
+        );
+        expect(processExitSpy).not.toHaveBeenCalled();
+      });
+
+      it('should not show warning when EXECUTION_DENIED in interactive mode', () => {
+        (mockConfig.getDebugMode as Mock).mockReturnValue(false);
+        (mockConfig.isInteractive as Mock).mockReturnValue(true);
+        (
+          mockConfig.getOutputFormat as ReturnType<typeof vi.fn>
+        ).mockReturnValue(OutputFormat.TEXT);
+
+        handleToolError(
+          toolName,
+          toolError,
+          mockConfig,
+          ToolErrorType.EXECUTION_DENIED,
+        );
+
+        expect(processStderrWriteSpy).not.toHaveBeenCalled();
+        expect(processExitSpy).not.toHaveBeenCalled();
+      });
+
+      it('should not show warning when EXECUTION_DENIED in JSON mode', () => {
+        (mockConfig.getDebugMode as Mock).mockReturnValue(false);
+        (mockConfig.isInteractive as Mock).mockReturnValue(false);
+        (
+          mockConfig.getOutputFormat as ReturnType<typeof vi.fn>
+        ).mockReturnValue(OutputFormat.JSON);
+
+        handleToolError(
+          toolName,
+          toolError,
+          mockConfig,
+          ToolErrorType.EXECUTION_DENIED,
+        );
+
+        expect(processStderrWriteSpy).not.toHaveBeenCalled();
+        expect(processExitSpy).not.toHaveBeenCalled();
+      });
+
+      it('should not show warning for non-EXECUTION_DENIED errors', () => {
+        (mockConfig.getDebugMode as Mock).mockReturnValue(false);
+        (mockConfig.isInteractive as Mock).mockReturnValue(false);
+        (
+          mockConfig.getOutputFormat as ReturnType<typeof vi.fn>
+        ).mockReturnValue(OutputFormat.TEXT);
+
+        handleToolError(
+          toolName,
+          toolError,
+          mockConfig,
+          ToolErrorType.FILE_NOT_FOUND,
+        );
+
+        expect(processStderrWriteSpy).not.toHaveBeenCalled();
+        expect(processExitSpy).not.toHaveBeenCalled();
+      });
+    });
   });
 
   describe('handleCancellationError', () => {

packages/cli/src/utils/errors.ts

@@ -11,6 +11,7 @@ import {
   parseAndFormatApiError,
   FatalTurnLimitedError,
   FatalCancellationError,
+  ToolErrorType,
 } from '@qwen-code/qwen-code-core';
 
 export function getErrorMessage(error: unknown): string {
@@ -102,10 +103,24 @@ export function handleToolError(
   toolName: string,
   toolError: Error,
   config: Config,
-  _errorCode?: string | number,
+  errorCode?: string | number,
   resultDisplay?: string,
 ): void {
-  // Always just log to stderr; JSON/streaming formatting happens in the tool_result block elsewhere
+  // Check if this is a permission denied error in non-interactive mode
+  const isExecutionDenied = errorCode === ToolErrorType.EXECUTION_DENIED;
+  const isNonInteractive = !config.isInteractive();
+  const isTextMode = config.getOutputFormat() === OutputFormat.TEXT;
+
+  // Show warning for permission denied errors in non-interactive text mode
+  if (isExecutionDenied && isNonInteractive && isTextMode) {
+    const warningMessage =
+      `Warning: Tool "${toolName}" requires user approval but cannot execute in non-interactive mode.\n` +
+      `To enable automatic tool execution, use the -y flag (YOLO mode):\n` +
+      `Example: qwen -p 'your prompt' -y\n\n`;
+    process.stderr.write(warningMessage);
+  }
+
+  // Always log detailed error in debug mode
   if (config.getDebugMode()) {
     console.error(
       `Error executing tool ${toolName}: ${resultDisplay || toolError.message}`,

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code-core",
-  "version": "0.6.0-nightly.20251226.17eb20c1",
+  "version": "0.6.0",
   "description": "Qwen Code Core",
   "repository": {
     "type": "git",

packages/core/src/core/openaiContentGenerator/converter.test.ts

@@ -542,4 +542,206 @@ describe('OpenAIContentConverter', () => {
       expect(original).toEqual(originalCopy);
     });
   });
+
+  describe('mergeConsecutiveAssistantMessages', () => {
+    it('should merge two consecutive assistant messages with string content', () => {
+      const request: GenerateContentParameters = {
+        model: 'models/test',
+        contents: [
+          {
+            role: 'model',
+            parts: [{ text: 'First part' }],
+          },
+          {
+            role: 'model',
+            parts: [{ text: 'Second part' }],
+          },
+        ],
+      };
+
+      const messages = converter.convertGeminiRequestToOpenAI(request);
+
+      expect(messages).toHaveLength(1);
+      expect(messages[0].role).toBe('assistant');
+      const content = messages[0]
+        .content as OpenAI.Chat.ChatCompletionContentPart[];
+      expect(content).toHaveLength(2);
+      expect(content[0]).toEqual({ type: 'text', text: 'First part' });
+      expect(content[1]).toEqual({ type: 'text', text: 'Second part' });
+    });
+
+    it('should merge multiple consecutive assistant messages', () => {
+      const request: GenerateContentParameters = {
+        model: 'models/test',
+        contents: [
+          {
+            role: 'model',
+            parts: [{ text: 'Part 1' }],
+          },
+          {
+            role: 'model',
+            parts: [{ text: 'Part 2' }],
+          },
+          {
+            role: 'model',
+            parts: [{ text: 'Part 3' }],
+          },
+        ],
+      };
+
+      const messages = converter.convertGeminiRequestToOpenAI(request);
+
+      expect(messages).toHaveLength(1);
+      expect(messages[0].role).toBe('assistant');
+      const content = messages[0]
+        .content as OpenAI.Chat.ChatCompletionContentPart[];
+      expect(content).toHaveLength(3);
+    });
+
+    it('should merge tool_calls from consecutive assistant messages', () => {
+      const request: GenerateContentParameters = {
+        model: 'models/test',
+        contents: [
+          {
+            role: 'model',
+            parts: [
+              {
+                functionCall: {
+                  id: 'call_1',
+                  name: 'tool_1',
+                  args: {},
+                },
+              },
+            ],
+          },
+          {
+            role: 'user',
+            parts: [
+              {
+                functionResponse: {
+                  id: 'call_1',
+                  name: 'tool_1',
+                  response: { output: 'result_1' },
+                },
+              },
+            ],
+          },
+          {
+            role: 'model',
+            parts: [
+              {
+                functionCall: {
+                  id: 'call_2',
+                  name: 'tool_2',
+                  args: {},
+                },
+              },
+            ],
+          },
+          {
+            role: 'user',
+            parts: [
+              {
+                functionResponse: {
+                  id: 'call_2',
+                  name: 'tool_2',
+                  response: { output: 'result_2' },
+                },
+              },
+            ],
+          },
+        ],
+      };
+
+      const messages = converter.convertGeminiRequestToOpenAI(request);
+
+      // Should have: assistant (tool_call_1), tool (result_1), assistant (tool_call_2), tool (result_2)
+      expect(messages).toHaveLength(4);
+      expect(messages[0].role).toBe('assistant');
+      expect(messages[1].role).toBe('tool');
+      expect(messages[2].role).toBe('assistant');
+      expect(messages[3].role).toBe('tool');
+    });
+
+    it('should not merge assistant messages separated by user messages', () => {
+      const request: GenerateContentParameters = {
+        model: 'models/test',
+        contents: [
+          {
+            role: 'model',
+            parts: [{ text: 'First assistant' }],
+          },
+          {
+            role: 'user',
+            parts: [{ text: 'User message' }],
+          },
+          {
+            role: 'model',
+            parts: [{ text: 'Second assistant' }],
+          },
+        ],
+      };
+
+      const messages = converter.convertGeminiRequestToOpenAI(request);
+
+      expect(messages).toHaveLength(3);
+      expect(messages[0].role).toBe('assistant');
+      expect(messages[1].role).toBe('user');
+      expect(messages[2].role).toBe('assistant');
+    });
+
+    it('should handle merging when one message has array content and another has string', () => {
+      const request: GenerateContentParameters = {
+        model: 'models/test',
+        contents: [
+          {
+            role: 'model',
+            parts: [{ text: 'Text part' }],
+          },
+          {
+            role: 'model',
+            parts: [{ text: 'Another text' }],
+          },
+        ],
+      };
+
+      const messages = converter.convertGeminiRequestToOpenAI(request);
+
+      expect(messages).toHaveLength(1);
+      const content = messages[0]
+        .content as OpenAI.Chat.ChatCompletionContentPart[];
+      expect(Array.isArray(content)).toBe(true);
+      expect(content).toHaveLength(2);
+    });
+
+    it('should merge empty content correctly', () => {
+      const request: GenerateContentParameters = {
+        model: 'models/test',
+        contents: [
+          {
+            role: 'model',
+            parts: [{ text: 'First' }],
+          },
+          {
+            role: 'model',
+            parts: [],
+          },
+          {
+            role: 'model',
+            parts: [{ text: 'Second' }],
+          },
+        ],
+      };
+
+      const messages = converter.convertGeminiRequestToOpenAI(request);
+
+      // Empty messages should be filtered out
+      expect(messages).toHaveLength(1);
+      const content = messages[0]
+        .content as OpenAI.Chat.ChatCompletionContentPart[];
+      expect(content).toHaveLength(2);
+      expect(content[0]).toEqual({ type: 'text', text: 'First' });
+      expect(content[1]).toEqual({ type: 'text', text: 'Second' });
+    });
+  });
 });

packages/core/src/core/openaiContentGenerator/converter.ts

@@ -1120,12 +1120,44 @@ export class OpenAIContentConverter {
         // If the last message is also an assistant message, merge them
         if (lastMessage.role === 'assistant') {
           // Combine content
-          const combinedContent = [
-            typeof lastMessage.content === 'string' ? lastMessage.content : '',
-            typeof message.content === 'string' ? message.content : '',
-          ]
-            .filter(Boolean)
-            .join('');
+          const lastContent = lastMessage.content;
+          const currentContent = message.content;
+
+          // Determine if we should use array format (if either content is an array)
+          const useArrayFormat =
+            Array.isArray(lastContent) || Array.isArray(currentContent);
+
+          let combinedContent:
+            | string
+            | OpenAI.Chat.ChatCompletionContentPart[]
+            | null;
+
+          if (useArrayFormat) {
+            // Convert both to array format and merge
+            const lastParts = Array.isArray(lastContent)
+              ? lastContent
+              : typeof lastContent === 'string' && lastContent
+                ? [{ type: 'text' as const, text: lastContent }]
+                : [];
+
+            const currentParts = Array.isArray(currentContent)
+              ? currentContent
+              : typeof currentContent === 'string' && currentContent
+                ? [{ type: 'text' as const, text: currentContent }]
+                : [];
+
+            combinedContent = [
+              ...lastParts,
+              ...currentParts,
+            ] as OpenAI.Chat.ChatCompletionContentPart[];
+          } else {
+            // Both are strings or null, merge as strings
+            const lastText = typeof lastContent === 'string' ? lastContent : '';
+            const currentText =
+              typeof currentContent === 'string' ? currentContent : '';
+            const mergedText = [lastText, currentText].filter(Boolean).join('');
+            combinedContent = mergedText || null;
+          }
 
           // Combine tool calls
           const lastToolCalls =
@@ -1137,14 +1169,17 @@ export class OpenAIContentConverter {
           // Update the last message with combined data
           (
             lastMessage as OpenAI.Chat.ChatCompletionMessageParam & {
-              content: string | null;
+              content: string | OpenAI.Chat.ChatCompletionContentPart[] | null;
               tool_calls?: OpenAI.Chat.ChatCompletionMessageToolCall[];
             }
           ).content = combinedContent || null;
           if (combinedToolCalls.length > 0) {
             (
               lastMessage as OpenAI.Chat.ChatCompletionMessageParam & {
-                content: string | null;
+                content:
+                  | string
+                  | OpenAI.Chat.ChatCompletionContentPart[]
+                  | null;
                 tool_calls?: OpenAI.Chat.ChatCompletionMessageToolCall[];
               }
             ).tool_calls = combinedToolCalls;

packages/core/src/core/openaiContentGenerator/pipeline.ts

@@ -317,15 +317,22 @@ export class ContentGenerationPipeline {
   }
 
   private buildReasoningConfig(): Record<string, unknown> {
-    const reasoning = this.contentGeneratorConfig.reasoning;
+    // Reasoning configuration for OpenAI-compatible endpoints is highly fragmented.
+    // For example, across common providers and models:
+    //
+    //   - deepseek-reasoner   — thinking is enabled by default and cannot be disabled
+    //   - glm-4.7             — thinking is enabled by default; can be disabled via `extra_body.thinking.enabled`
+    //   - kimi-k2-thinking    — thinking is enabled by default and cannot be disabled
+    //   - gpt-5.x series      — thinking is enabled by default; can be disabled via `reasoning.effort`
+    //   - qwen3 series        — model-dependent; can be manually disabled via `extra_body.enable_thinking`
+    //
+    // Given this inconsistency, we choose not to set any reasoning config here and
+    // instead rely on each model’s default behavior.
 
-    if (reasoning === false) {
-      return {};
-    }
+    // We plan to introduce provider- and model-specific settings to enable more
+    // fine-grained control over reasoning configuration.
 
-    return {
-      reasoning_effort: reasoning?.effort ?? 'medium',
-    };
+    return {};
   }
 
   /**

packages/core/src/core/openaiContentGenerator/provider/default.ts

@@ -58,8 +58,6 @@ export class DefaultOpenAICompatibleProvider
   }
 
   getDefaultGenerationConfig(): GenerateContentConfig {
-    return {
-      topP: 0.95,
-    };
+    return {};
   }
 }

packages/core/src/tools/shell.test.ts

@@ -169,6 +169,44 @@ describe('ShellTool', () => {
       });
       expect(invocation.getDescription()).not.toContain('[background]');
     });
+
+    describe('is_background parameter coercion', () => {
+      it('should accept string "true" as boolean true', () => {
+        const invocation = shellTool.build({
+          command: 'npm run dev',
+          is_background: 'true' as unknown as boolean,
+        });
+        expect(invocation).toBeDefined();
+        expect(invocation.getDescription()).toContain('[background]');
+      });
+
+      it('should accept string "false" as boolean false', () => {
+        const invocation = shellTool.build({
+          command: 'npm run build',
+          is_background: 'false' as unknown as boolean,
+        });
+        expect(invocation).toBeDefined();
+        expect(invocation.getDescription()).not.toContain('[background]');
+      });
+
+      it('should accept string "True" as boolean true', () => {
+        const invocation = shellTool.build({
+          command: 'npm run dev',
+          is_background: 'True' as unknown as boolean,
+        });
+        expect(invocation).toBeDefined();
+        expect(invocation.getDescription()).toContain('[background]');
+      });
+
+      it('should accept string "False" as boolean false', () => {
+        const invocation = shellTool.build({
+          command: 'npm run build',
+          is_background: 'False' as unknown as boolean,
+        });
+        expect(invocation).toBeDefined();
+        expect(invocation.getDescription()).not.toContain('[background]');
+      });
+    });
   });
 
   describe('execute', () => {

packages/core/src/utils/schemaValidator.test.ts

@@ -122,4 +122,91 @@ describe('SchemaValidator', () => {
     };
     expect(SchemaValidator.validate(schema, params)).not.toBeNull();
   });
+
+  describe('boolean string coercion', () => {
+    const booleanSchema = {
+      type: 'object',
+      properties: {
+        is_background: {
+          type: 'boolean',
+        },
+      },
+      required: ['is_background'],
+    };
+
+    it('should coerce string "true" to boolean true', () => {
+      const params = { is_background: 'true' };
+      expect(SchemaValidator.validate(booleanSchema, params)).toBeNull();
+      expect(params.is_background).toBe(true);
+    });
+
+    it('should coerce string "True" to boolean true', () => {
+      const params = { is_background: 'True' };
+      expect(SchemaValidator.validate(booleanSchema, params)).toBeNull();
+      expect(params.is_background).toBe(true);
+    });
+
+    it('should coerce string "TRUE" to boolean true', () => {
+      const params = { is_background: 'TRUE' };
+      expect(SchemaValidator.validate(booleanSchema, params)).toBeNull();
+      expect(params.is_background).toBe(true);
+    });
+
+    it('should coerce string "false" to boolean false', () => {
+      const params = { is_background: 'false' };
+      expect(SchemaValidator.validate(booleanSchema, params)).toBeNull();
+      expect(params.is_background).toBe(false);
+    });
+
+    it('should coerce string "False" to boolean false', () => {
+      const params = { is_background: 'False' };
+      expect(SchemaValidator.validate(booleanSchema, params)).toBeNull();
+      expect(params.is_background).toBe(false);
+    });
+
+    it('should coerce string "FALSE" to boolean false', () => {
+      const params = { is_background: 'FALSE' };
+      expect(SchemaValidator.validate(booleanSchema, params)).toBeNull();
+      expect(params.is_background).toBe(false);
+    });
+
+    it('should handle nested objects with string booleans', () => {
+      const nestedSchema = {
+        type: 'object',
+        properties: {
+          options: {
+            type: 'object',
+            properties: {
+              enabled: { type: 'boolean' },
+            },
+          },
+        },
+      };
+      const params = { options: { enabled: 'true' } };
+      expect(SchemaValidator.validate(nestedSchema, params)).toBeNull();
+      expect((params.options as unknown as { enabled: boolean }).enabled).toBe(
+        true,
+      );
+    });
+
+    it('should not affect non-boolean strings', () => {
+      const mixedSchema = {
+        type: 'object',
+        properties: {
+          name: { type: 'string' },
+          is_active: { type: 'boolean' },
+        },
+      };
+      const params = { name: 'trueman', is_active: 'true' };
+      expect(SchemaValidator.validate(mixedSchema, params)).toBeNull();
+      expect(params.name).toBe('trueman');
+      expect(params.is_active).toBe(true);
+    });
+
+    it('should pass through actual boolean values unchanged', () => {
+      const params = { is_background: true };
+      expect(SchemaValidator.validate(booleanSchema, params)).toBeNull();
+      expect(params.is_background).toBe(true);
+    });
+  });
 });

packages/core/src/utils/schemaValidator.ts

@@ -41,14 +41,12 @@ export class SchemaValidator {
       return 'Value of params must be an object';
     }
     const validate = ajValidator.compile(schema);
-    const valid = validate(data);
+    let valid = validate(data);
     if (!valid && validate.errors) {
-      // Find any True or False values and lowercase them
-      fixBooleanCasing(data as Record<string, unknown>);
-
-      const validate = ajValidator.compile(schema);
-      const valid = validate(data);
+      // Coerce string boolean values ("true"/"false") to actual booleans
+      fixBooleanValues(data as Record<string, unknown>);
 
+      valid = validate(data);
       if (!valid && validate.errors) {
         return ajValidator.errorsText(validate.errors, { dataVar: 'params' });
       }
@@ -57,13 +55,29 @@ export class SchemaValidator {
   }
 }
 
-function fixBooleanCasing(data: Record<string, unknown>) {
+/**
+ * Coerces string boolean values to actual booleans.
+ * This handles cases where LLMs return "true"/"false" strings instead of boolean values,
+ * which is common with self-hosted LLMs.
+ *
+ * Converts:
+ * - "true", "True", "TRUE" -> true
+ * - "false", "False", "FALSE" -> false
+ */
+function fixBooleanValues(data: Record<string, unknown>) {
   for (const key of Object.keys(data)) {
     if (!(key in data)) continue;
+    const value = data[key];
 
-    if (typeof data[key] === 'object') {
-      fixBooleanCasing(data[key] as Record<string, unknown>);
-    } else if (data[key] === 'True') data[key] = 'true';
-    else if (data[key] === 'False') data[key] = 'false';
+    if (typeof value === 'object' && value !== null) {
+      fixBooleanValues(value as Record<string, unknown>);
+    } else if (typeof value === 'string') {
+      const lower = value.toLowerCase();
+      if (lower === 'true') {
+        data[key] = true;
+      } else if (lower === 'false') {
+        data[key] = false;
+      }
+    }
   }
 }

packages/sdk-java/.editorconfig

@@ -0,0 +1,24 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 4
+tab_width = 4
+ij_continuation_indent_size = 8
+
+[*.java]
+ij_java_doc_align_exception_comments = false
+ij_java_doc_align_param_comments = false
+
+[*.{yaml, yml, sh, ps1}]
+indent_size = 2
+
+[*.{md, mkd, markdown}]
+trim_trailing_whitespace = false
+
+[{**/res/**.xml, **/AndroidManifest.xml}]
+ij_continuation_indent_size = 4

packages/sdk-java/.gitignore

@@ -0,0 +1,14 @@
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+# Mac
+.DS_Store
+ 
+# Maven
+log/
+target/
+
+/docs/

packages/sdk-java/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

packages/sdk-java/QWEN.md

@@ -0,0 +1,378 @@
+# Qwen Code Java SDK
+
+## Project Overview
+
+The Qwen Code Java SDK is a minimum experimental SDK for programmatic access to Qwen Code functionality. It provides a Java interface to interact with the Qwen Code CLI, allowing developers to integrate Qwen Code capabilities into their Java applications.
+
+**Context Information:**
+
+- Current Date: Monday 5 January 2026
+- Operating System: darwin
+- Working Directory: /Users/weigeng/repos/qwen-code/packages/sdk-java
+
+## Project Details
+
+- **Group ID**: com.alibaba
+- **Artifact ID**: qwencode-sdk (as per pom.xml)
+- **Version**: 0.0.1-SNAPSHOT
+- **Packaging**: JAR
+- **Java Version**: 1.8+ (source and target)
+- **License**: Apache-2.0
+
+## Architecture
+
+The SDK follows a layered architecture:
+
+- **API Layer**: Provides the main entry points through `QwenCodeCli` class with simple static methods for basic usage
+- **Session Layer**: Manages communication sessions with the Qwen Code CLI through the `Session` class
+- **Transport Layer**: Handles the communication mechanism between the SDK and CLI process (currently using process transport via `ProcessTransport`)
+- **Protocol Layer**: Defines data structures for communication based on the CLI protocol
+- **Utils**: Common utilities for concurrent execution, timeout handling, and error management
+
+## Key Components
+
+### Main Classes
+
+- `QwenCodeCli`: Main entry point with static methods for simple queries
+- `Session`: Manages communication sessions with the CLI
+- `Transport`: Abstracts the communication mechanism (currently using process transport)
+- `ProcessTransport`: Implementation that communicates via process execution
+- `TransportOptions`: Configuration class for transport layer settings
+- `SessionEventSimpleConsumers`: High-level event handler for processing responses
+- `AssistantContentSimpleConsumers`: Handles different types of content within assistant messages
+
+### Dependencies
+
+- **Logging**: ch.qos.logback:logback-classic
+- **Utilities**: org.apache.commons:commons-lang3
+- **JSON Processing**: com.alibaba.fastjson2:fastjson2
+- **Testing**: JUnit 5 (org.junit.jupiter:junit-jupiter)
+
+## Building and Running
+
+### Prerequisites
+
+- Java 8 or higher
+- Apache Maven 3.6.0 or higher
+
+### Build Commands
+
+```bash
+# Compile the project
+mvn compile
+
+# Run tests
+mvn test
+
+# Package the JAR
+mvn package
+
+# Install to local repository
+mvn install
+
+# Run checkstyle verification
+mvn checkstyle:check
+
+# Generate Javadoc
+mvn javadoc:javadoc
+```
+
+### Testing
+
+The project includes basic unit tests using JUnit 5. The main test class `QwenCodeCliTest` demonstrates how to use the SDK to make simple queries to the Qwen Code CLI.
+
+### Code Quality
+
+The project uses Checkstyle for code formatting and style enforcement. The configuration is defined in `checkstyle.xml` and includes rules for:
+
+- Whitespace and indentation
+- Naming conventions
+- Import ordering
+- Code structure
+- Line endings (LF only)
+- No trailing whitespace
+- 8-space indentation for line wrapping
+
+## Development Conventions
+
+### Coding Standards
+
+- Java 8 language features are supported
+- Follow standard Java naming conventions
+- Use UTF-8 encoding for source files
+- Line endings should be LF (Unix-style)
+- No trailing whitespace allowed
+- Use 8-space indentation for line wrapping
+
+### Testing Practices
+
+- Write unit tests using JUnit 5
+- Test classes should be in the `src/test/java` directory
+- Follow the naming convention `*Test.java` for test classes
+- Use appropriate assertions to validate functionality
+
+### Documentation
+
+- API documentation should follow Javadoc conventions
+- Update README files when adding new features
+- Include examples in documentation
+
+## API Reference
+
+### QwenCodeCli Class
+
+The main class provides several primary methods:
+
+- `simpleQuery(String prompt)`: Synchronous method that returns a list of responses
+- `simpleQuery(String prompt, TransportOptions transportOptions)`: Synchronous method with custom transport options
+- `simpleQuery(String prompt, TransportOptions transportOptions, AssistantContentConsumers assistantContentConsumers)`: Advanced method with custom content consumers
+- `newSession()`: Creates a new session with default options
+- `newSession(TransportOptions transportOptions)`: Creates a new session with custom options
+
+### Permission Modes
+
+The SDK supports different permission modes for controlling tool execution:
+
+- **`default`**: Write tools are denied unless approved via `canUseTool` callback or in `allowedTools`. Read-only tools execute without confirmation.
+- **`plan`**: Blocks all write tools, instructing AI to present a plan first.
+- **`auto-edit`**: Auto-approve edit tools (edit, write_file) while other tools require confirmation.
+- **`yolo`**: All tools execute automatically without confirmation.
+
+### Transport Options
+
+The `TransportOptions` class allows configuration of how the SDK communicates with the Qwen Code CLI:
+
+- `pathToQwenExecutable`: Path to the Qwen Code CLI executable
+- `cwd`: Working directory for the CLI process
+- `model`: AI model to use for the session
+- `permissionMode`: Permission mode that controls tool execution
+- `env`: Environment variables to pass to the CLI process
+- `maxSessionTurns`: Limits the number of conversation turns in a session
+- `coreTools`: List of core tools that should be available to the AI
+- `excludeTools`: List of tools to exclude from being available to the AI
+- `allowedTools`: List of tools that are pre-approved for use without additional confirmation
+- `authType`: Authentication type to use for the session
+- `includePartialMessages`: Enables receiving partial messages during streaming responses
+- `skillsEnable`: Enables or disables skills functionality for the session
+- `turnTimeout`: Timeout for a complete turn of conversation
+- `messageTimeout`: Timeout for individual messages within a turn
+- `resumeSessionId`: ID of a previous session to resume
+- `otherOptions`: Additional command-line options to pass to the CLI
+
+### Session Control Features
+
+- **Session creation**: Use `QwenCodeCli.newSession()` to create a new session with custom options
+- **Session management**: The `Session` class provides methods to send prompts, handle responses, and manage session state
+- **Session cleanup**: Always close sessions using `session.close()` to properly terminate the CLI process
+- **Session resumption**: Use `setResumeSessionId()` in `TransportOptions` to resume a previous session
+- **Session interruption**: Use `session.interrupt()` to interrupt a currently running prompt
+- **Dynamic model switching**: Use `session.setModel()` to change the model during a session
+- **Dynamic permission mode switching**: Use `session.setPermissionMode()` to change the permission mode during a session
+
+### Thread Pool Configuration
+
+The SDK uses a thread pool for managing concurrent operations with the following default configuration:
+
+- **Core Pool Size**: 30 threads
+- **Maximum Pool Size**: 100 threads
+- **Keep-Alive Time**: 60 seconds
+- **Queue Capacity**: 300 tasks (using LinkedBlockingQueue)
+- **Thread Naming**: "qwen_code_cli-pool-{number}"
+- **Daemon Threads**: false
+- **Rejected Execution Handler**: CallerRunsPolicy
+
+### Session Event Consumers and Assistant Content Consumers
+
+The SDK provides two key interfaces for handling events and content from the CLI:
+
+#### SessionEventConsumers Interface
+
+The `SessionEventConsumers` interface provides callbacks for different types of messages during a session:
+
+- `onSystemMessage`: Handles system messages from the CLI (receives Session and SDKSystemMessage)
+- `onResultMessage`: Handles result messages from the CLI (receives Session and SDKResultMessage)
+- `onAssistantMessage`: Handles assistant messages (AI responses) (receives Session and SDKAssistantMessage)
+- `onPartialAssistantMessage`: Handles partial assistant messages during streaming (receives Session and SDKPartialAssistantMessage)
+- `onUserMessage`: Handles user messages (receives Session and SDKUserMessage)
+- `onOtherMessage`: Handles other types of messages (receives Session and String message)
+- `onControlResponse`: Handles control responses (receives Session and CLIControlResponse)
+- `onControlRequest`: Handles control requests (receives Session and CLIControlRequest, returns CLIControlResponse)
+- `onPermissionRequest`: Handles permission requests (receives Session and CLIControlRequest<CLIControlPermissionRequest>, returns Behavior)
+
+#### AssistantContentConsumers Interface
+
+The `AssistantContentConsumers` interface handles different types of content within assistant messages:
+
+- `onText`: Handles text content (receives Session and TextAssistantContent)
+- `onThinking`: Handles thinking content (receives Session and ThingkingAssistantContent)
+- `onToolUse`: Handles tool use content (receives Session and ToolUseAssistantContent)
+- `onToolResult`: Handles tool result content (receives Session and ToolResultAssistantContent)
+- `onOtherContent`: Handles other content types (receives Session and AssistantContent)
+- `onUsage`: Handles usage information (receives Session and AssistantUsage)
+- `onPermissionRequest`: Handles permission requests (receives Session and CLIControlPermissionRequest, returns Behavior)
+- `onOtherControlRequest`: Handles other control requests (receives Session and ControlRequestPayload, returns ControlResponsePayload)
+
+#### Relationship Between the Interfaces
+
+**Important Note on Event Hierarchy:**
+
+- `SessionEventConsumers` is the **high-level** event processor that handles different message types (system, assistant, user, etc.)
+- `AssistantContentConsumers` is the **low-level** content processor that handles different types of content within assistant messages (text, tools, thinking, etc.)
+
+**Processor Relationship:**
+
+- `SessionEventConsumers` → `AssistantContentConsumers` (SessionEventConsumers uses AssistantContentConsumers to process content within assistant messages)
+
+**Event Derivation Relationships:**
+
+- `onAssistantMessage` → `onText`, `onThinking`, `onToolUse`, `onToolResult`, `onOtherContent`, `onUsage`
+- `onPartialAssistantMessage` → `onText`, `onThinking`, `onToolUse`, `onToolResult`, `onOtherContent`
+- `onControlRequest` → `onPermissionRequest`, `onOtherControlRequest`
+
+**Event Timeout Relationships:**
+
+Each event handler method has a corresponding timeout method that allows customizing the timeout behavior for that specific event:
+
+- `onSystemMessage` ↔ `onSystemMessageTimeout`
+- `onResultMessage` ↔ `onResultMessageTimeout`
+- `onAssistantMessage` ↔ `onAssistantMessageTimeout`
+- `onPartialAssistantMessage` ↔ `onPartialAssistantMessageTimeout`
+- `onUserMessage` ↔ `onUserMessageTimeout`
+- `onOtherMessage` ↔ `onOtherMessageTimeout`
+- `onControlResponse` ↔ `onControlResponseTimeout`
+- `onControlRequest` ↔ `onControlRequestTimeout`
+
+For AssistantContentConsumers timeout methods:
+
+- `onText` ↔ `onTextTimeout`
+- `onThinking` ↔ `onThinkingTimeout`
+- `onToolUse` ↔ `onToolUseTimeout`
+- `onToolResult` ↔ `onToolResultTimeout`
+- `onOtherContent` ↔ `onOtherContentTimeout`
+- `onPermissionRequest` ↔ `onPermissionRequestTimeout`
+- `onOtherControlRequest` ↔ `onOtherControlRequestTimeout`
+
+**Default Timeout Values:**
+
+- `SessionEventSimpleConsumers` default timeout: 180 seconds (Timeout.TIMEOUT_180_SECONDS)
+- `AssistantContentSimpleConsumers` default timeout: 60 seconds (Timeout.TIMEOUT_60_SECONDS)
+
+**Timeout Hierarchy Requirements:**
+
+For proper operation, the following timeout relationships should be maintained:
+
+- `onAssistantMessageTimeout` return value should be greater than `onTextTimeout`, `onThinkingTimeout`, `onToolUseTimeout`, `onToolResultTimeout`, and `onOtherContentTimeout` return values
+- `onControlRequestTimeout` return value should be greater than `onPermissionRequestTimeout` and `onOtherControlRequestTimeout` return values
+
+#### Relationship Between the Interfaces
+
+- `AssistantContentSimpleConsumers` is the default implementation of `AssistantContentConsumers`
+- `SessionEventSimpleConsumers` is the concrete implementation that combines both interfaces and depends on an `AssistantContentConsumers` instance to handle content within assistant messages
+- The timeout methods in `SessionEventConsumers` now include the message object as a parameter (e.g., `onSystemMessageTimeout(Session session, SDKSystemMessage systemMessage)`)
+
+Event processing is subject to the timeout settings configured in `TransportOptions` and `SessionEventConsumers`. For detailed timeout configuration options, see the "Timeout" section above.
+
+## Usage Examples
+
+The SDK includes several example files in `src/test/java/com/alibaba/qwen/code/cli/example/` that demonstrate different aspects of the API:
+
+### Basic Usage
+
+- `QuickStartExample.java`: Demonstrates simple query usage, transport options configuration, and streaming content handling
+
+### Session Control
+
+- `SessionExample.java`: Shows session control features including permission mode changes, model switching, interruption, and event handling
+
+### Configuration
+
+- `ThreadPoolConfigurationExample.java`: Shows how to configure the thread pool used by the SDK
+
+## Error Handling
+
+The SDK provides specific exception types for different error scenarios:
+
+- `SessionControlException`: Thrown when there's an issue with session control (creation, initialization, etc.)
+- `SessionSendPromptException`: Thrown when there's an issue sending a prompt or receiving a response
+- `SessionClosedException`: Thrown when attempting to use a closed session
+
+## Project Structure
+
+```
+src/
+├── example/
+│   └── java/
+│       └── com/
+│           └── alibaba/
+│               └── qwen/
+│                   └── code/
+│                       └── example/
+├── main/
+│   └── java/
+│       └── com/
+│           └── alibaba/
+│               └── qwen/
+│                   └── code/
+│                       └── cli/
+│                           ├── QwenCodeCli.java
+│                           ├── protocol/
+│                           ├── session/
+│                           ├── transport/
+│                           └── utils/
+└── test/
+    ├── java/
+    │   └── com/
+    │       └── alibaba/
+    │           └── qwen/
+    │               └── code/
+    │                   └── cli/
+    │                       ├── QwenCodeCliTest.java
+    │                       ├── session/
+    │                       │   └── SessionTest.java
+    │                       └── transport/
+    │                           ├── PermissionModeTest.java
+    │                           └── process/
+    │                               └── ProcessTransportTest.java
+    └── temp/
+```
+
+## Configuration Files
+
+- `pom.xml`: Maven build configuration and dependencies
+- `checkstyle.xml`: Code style and formatting rules
+- `.editorconfig`: Editor configuration settings
+
+## FAQ / Troubleshooting
+
+### Q: Do I need to install the Qwen CLI separately?
+
+A: No, from v0.1.1, the CLI is bundled with the SDK, so no standalone CLI installation is needed.
+
+### Q: What Java versions are supported?
+
+A: The SDK requires Java 1.8 or higher.
+
+### Q: How do I handle long-running requests?
+
+A: The SDK includes timeout utilities. You can configure timeouts using the `Timeout` class in `TransportOptions`.
+
+### Q: Why are some tools not executing?
+
+A: This is likely due to permission modes. Check your permission mode settings and consider using `allowedTools` to pre-approve certain tools.
+
+### Q: How do I resume a previous session?
+
+A: Use the `setResumeSessionId()` method in `TransportOptions` to resume a previous session.
+
+### Q: Can I customize the environment for the CLI process?
+
+A: Yes, use the `setEnv()` method in `TransportOptions` to pass environment variables to the CLI process.
+
+### Q: What happens if the CLI process crashes?
+
+A: The SDK will throw appropriate exceptions. Make sure to handle `SessionControlException` and implement retry logic if needed.
+
+## Maintainers
+
+- **Developer**: skyfire (gengwei.gw(at)alibaba-inc.com)
+- **Organization**: Alibaba Group

packages/sdk-java/README.md

@@ -0,0 +1,312 @@
+# Qwen Code Java SDK
+
+The Qwen Code Java SDK is a minimum experimental SDK for programmatic access to Qwen Code functionality. It provides a Java interface to interact with the Qwen Code CLI, allowing developers to integrate Qwen Code capabilities into their Java applications.
+
+## Requirements
+
+- Java >= 1.8
+- Maven >= 3.6.0 (for building from source)
+- qwen-code >= 0.5.0
+
+### Dependencies
+
+- **Logging**: ch.qos.logback:logback-classic
+- **Utilities**: org.apache.commons:commons-lang3
+- **JSON Processing**: com.alibaba.fastjson2:fastjson2
+- **Testing**: JUnit 5 (org.junit.jupiter:junit-jupiter)
+
+## Installation
+
+Add the following dependency to your Maven `pom.xml`:
+
+```xml
+<dependency>
+    <groupId>com.alibaba</groupId>
+    <artifactId>qwencode-sdk</artifactId>
+    <version>{$version}</version>
+</dependency>
+```
+
+Or if using Gradle, add to your `build.gradle`:
+
+```gradle
+implementation 'com.alibaba:qwencode-sdk:{$version}'
+```
+
+## Building and Running
+
+### Build Commands
+
+```bash
+# Compile the project
+mvn compile
+
+# Run tests
+mvn test
+
+# Package the JAR
+mvn package
+
+# Install to local repository
+mvn install
+```
+
+## Quick Start
+
+The simplest way to use the SDK is through the `QwenCodeCli.simpleQuery()` method:
+
+```java
+public static void runSimpleExample() {
+    List<String> result = QwenCodeCli.simpleQuery("hello world");
+    result.forEach(logger::info);
+}
+```
+
+For more advanced usage with custom transport options:
+
+```java
+public static void runTransportOptionsExample() {
+    TransportOptions options = new TransportOptions()
+            .setModel("qwen3-coder-flash")
+            .setPermissionMode(PermissionMode.AUTO_EDIT)
+            .setCwd("./")
+            .setEnv(new HashMap<String, String>() {{put("CUSTOM_VAR", "value");}})
+            .setIncludePartialMessages(true)
+            .setTurnTimeout(new Timeout(120L, TimeUnit.SECONDS))
+            .setMessageTimeout(new Timeout(90L, TimeUnit.SECONDS))
+            .setAllowedTools(Arrays.asList("read_file", "write_file", "list_directory"));
+
+    List<String> result = QwenCodeCli.simpleQuery("who are you, what are your capabilities?", options);
+    result.forEach(logger::info);
+}
+```
+
+For streaming content handling with custom content consumers:
+
+```java
+public static void runStreamingExample() {
+    QwenCodeCli.simpleQuery("who are you, what are your capabilities?",
+            new TransportOptions().setMessageTimeout(new Timeout(10L, TimeUnit.SECONDS)), new AssistantContentSimpleConsumers() {
+
+                @Override
+                public void onText(Session session, TextAssistantContent textAssistantContent) {
+                    logger.info("Text content received: {}", textAssistantContent.getText());
+                }
+
+                @Override
+                public void onThinking(Session session, ThingkingAssistantContent thingkingAssistantContent) {
+                    logger.info("Thinking content received: {}", thingkingAssistantContent.getThinking());
+                }
+
+                @Override
+                public void onToolUse(Session session, ToolUseAssistantContent toolUseContent) {
+                    logger.info("Tool use content received: {} with arguments: {}",
+                            toolUseContent, toolUseContent.getInput());
+                }
+
+                @Override
+                public void onToolResult(Session session, ToolResultAssistantContent toolResultContent) {
+                    logger.info("Tool result content received: {}", toolResultContent.getContent());
+                }
+
+                @Override
+                public void onOtherContent(Session session, AssistantContent<?> other) {
+                    logger.info("Other content received: {}", other);
+                }
+
+                @Override
+                public void onUsage(Session session, AssistantUsage assistantUsage) {
+                    logger.info("Usage information received: Input tokens: {}, Output tokens: {}",
+                            assistantUsage.getUsage().getInputTokens(), assistantUsage.getUsage().getOutputTokens());
+                }
+            }.setDefaultPermissionOperation(Operation.allow));
+    logger.info("Streaming example completed.");
+}
+```
+
+other examples see src/test/java/com/alibaba/qwen/code/cli/example
+
+## Architecture
+
+The SDK follows a layered architecture:
+
+- **API Layer**: Provides the main entry points through `QwenCodeCli` class with simple static methods for basic usage
+- **Session Layer**: Manages communication sessions with the Qwen Code CLI through the `Session` class
+- **Transport Layer**: Handles the communication mechanism between the SDK and CLI process (currently using process transport via `ProcessTransport`)
+- **Protocol Layer**: Defines data structures for communication based on the CLI protocol
+- **Utils**: Common utilities for concurrent execution, timeout handling, and error management
+
+## Key Features
+
+### Permission Modes
+
+The SDK supports different permission modes for controlling tool execution:
+
+- **`default`**: Write tools are denied unless approved via `canUseTool` callback or in `allowedTools`. Read-only tools execute without confirmation.
+- **`plan`**: Blocks all write tools, instructing AI to present a plan first.
+- **`auto-edit`**: Auto-approve edit tools (edit, write_file) while other tools require confirmation.
+- **`yolo`**: All tools execute automatically without confirmation.
+
+### Session Event Consumers and Assistant Content Consumers
+
+The SDK provides two key interfaces for handling events and content from the CLI:
+
+#### SessionEventConsumers Interface
+
+The `SessionEventConsumers` interface provides callbacks for different types of messages during a session:
+
+- `onSystemMessage`: Handles system messages from the CLI (receives Session and SDKSystemMessage)
+- `onResultMessage`: Handles result messages from the CLI (receives Session and SDKResultMessage)
+- `onAssistantMessage`: Handles assistant messages (AI responses) (receives Session and SDKAssistantMessage)
+- `onPartialAssistantMessage`: Handles partial assistant messages during streaming (receives Session and SDKPartialAssistantMessage)
+- `onUserMessage`: Handles user messages (receives Session and SDKUserMessage)
+- `onOtherMessage`: Handles other types of messages (receives Session and String message)
+- `onControlResponse`: Handles control responses (receives Session and CLIControlResponse)
+- `onControlRequest`: Handles control requests (receives Session and CLIControlRequest, returns CLIControlResponse)
+- `onPermissionRequest`: Handles permission requests (receives Session and CLIControlRequest<CLIControlPermissionRequest>, returns Behavior)
+
+#### AssistantContentConsumers Interface
+
+The `AssistantContentConsumers` interface handles different types of content within assistant messages:
+
+- `onText`: Handles text content (receives Session and TextAssistantContent)
+- `onThinking`: Handles thinking content (receives Session and ThingkingAssistantContent)
+- `onToolUse`: Handles tool use content (receives Session and ToolUseAssistantContent)
+- `onToolResult`: Handles tool result content (receives Session and ToolResultAssistantContent)
+- `onOtherContent`: Handles other content types (receives Session and AssistantContent)
+- `onUsage`: Handles usage information (receives Session and AssistantUsage)
+- `onPermissionRequest`: Handles permission requests (receives Session and CLIControlPermissionRequest, returns Behavior)
+- `onOtherControlRequest`: Handles other control requests (receives Session and ControlRequestPayload, returns ControlResponsePayload)
+
+#### Relationship Between the Interfaces
+
+**Important Note on Event Hierarchy:**
+
+- `SessionEventConsumers` is the **high-level** event processor that handles different message types (system, assistant, user, etc.)
+- `AssistantContentConsumers` is the **low-level** content processor that handles different types of content within assistant messages (text, tools, thinking, etc.)
+
+**Processor Relationship:**
+
+- `SessionEventConsumers` → `AssistantContentConsumers` (SessionEventConsumers uses AssistantContentConsumers to process content within assistant messages)
+
+**Event Derivation Relationships:**
+
+- `onAssistantMessage` → `onText`, `onThinking`, `onToolUse`, `onToolResult`, `onOtherContent`, `onUsage`
+- `onPartialAssistantMessage` → `onText`, `onThinking`, `onToolUse`, `onToolResult`, `onOtherContent`
+- `onControlRequest` → `onPermissionRequest`, `onOtherControlRequest`
+
+**Event Timeout Relationships:**
+
+Each event handler method has a corresponding timeout method that allows customizing the timeout behavior for that specific event:
+
+- `onSystemMessage` ↔ `onSystemMessageTimeout`
+- `onResultMessage` ↔ `onResultMessageTimeout`
+- `onAssistantMessage` ↔ `onAssistantMessageTimeout`
+- `onPartialAssistantMessage` ↔ `onPartialAssistantMessageTimeout`
+- `onUserMessage` ↔ `onUserMessageTimeout`
+- `onOtherMessage` ↔ `onOtherMessageTimeout`
+- `onControlResponse` ↔ `onControlResponseTimeout`
+- `onControlRequest` ↔ `onControlRequestTimeout`
+
+For AssistantContentConsumers timeout methods:
+
+- `onText` ↔ `onTextTimeout`
+- `onThinking` ↔ `onThinkingTimeout`
+- `onToolUse` ↔ `onToolUseTimeout`
+- `onToolResult` ↔ `onToolResultTimeout`
+- `onOtherContent` ↔ `onOtherContentTimeout`
+- `onPermissionRequest` ↔ `onPermissionRequestTimeout`
+- `onOtherControlRequest` ↔ `onOtherControlRequestTimeout`
+
+**Default Timeout Values:**
+
+- `SessionEventSimpleConsumers` default timeout: 180 seconds (Timeout.TIMEOUT_180_SECONDS)
+- `AssistantContentSimpleConsumers` default timeout: 60 seconds (Timeout.TIMEOUT_60_SECONDS)
+
+**Timeout Hierarchy Requirements:**
+
+For proper operation, the following timeout relationships should be maintained:
+
+- `onAssistantMessageTimeout` return value should be greater than `onTextTimeout`, `onThinkingTimeout`, `onToolUseTimeout`, `onToolResultTimeout`, and `onOtherContentTimeout` return values
+- `onControlRequestTimeout` return value should be greater than `onPermissionRequestTimeout` and `onOtherControlRequestTimeout` return values
+
+### Transport Options
+
+The `TransportOptions` class allows configuration of how the SDK communicates with the Qwen Code CLI:
+
+- `pathToQwenExecutable`: Path to the Qwen Code CLI executable
+- `cwd`: Working directory for the CLI process
+- `model`: AI model to use for the session
+- `permissionMode`: Permission mode that controls tool execution
+- `env`: Environment variables to pass to the CLI process
+- `maxSessionTurns`: Limits the number of conversation turns in a session
+- `coreTools`: List of core tools that should be available to the AI
+- `excludeTools`: List of tools to exclude from being available to the AI
+- `allowedTools`: List of tools that are pre-approved for use without additional confirmation
+- `authType`: Authentication type to use for the session
+- `includePartialMessages`: Enables receiving partial messages during streaming responses
+- `skillsEnable`: Enables or disables skills functionality for the session
+- `turnTimeout`: Timeout for a complete turn of conversation
+- `messageTimeout`: Timeout for individual messages within a turn
+- `resumeSessionId`: ID of a previous session to resume
+- `otherOptions`: Additional command-line options to pass to the CLI
+
+### Session Control Features
+
+- **Session creation**: Use `QwenCodeCli.newSession()` to create a new session with custom options
+- **Session management**: The `Session` class provides methods to send prompts, handle responses, and manage session state
+- **Session cleanup**: Always close sessions using `session.close()` to properly terminate the CLI process
+- **Session resumption**: Use `setResumeSessionId()` in `TransportOptions` to resume a previous session
+- **Session interruption**: Use `session.interrupt()` to interrupt a currently running prompt
+- **Dynamic model switching**: Use `session.setModel()` to change the model during a session
+- **Dynamic permission mode switching**: Use `session.setPermissionMode()` to change the permission mode during a session
+
+### Thread Pool Configuration
+
+The SDK uses a thread pool for managing concurrent operations with the following default configuration:
+
+- **Core Pool Size**: 30 threads
+- **Maximum Pool Size**: 100 threads
+- **Keep-Alive Time**: 60 seconds
+- **Queue Capacity**: 300 tasks (using LinkedBlockingQueue)
+- **Thread Naming**: "qwen_code_cli-pool-{number}"
+- **Daemon Threads**: false
+- **Rejected Execution Handler**: CallerRunsPolicy
+
+## Error Handling
+
+The SDK provides specific exception types for different error scenarios:
+
+- `SessionControlException`: Thrown when there's an issue with session control (creation, initialization, etc.)
+- `SessionSendPromptException`: Thrown when there's an issue sending a prompt or receiving a response
+- `SessionClosedException`: Thrown when attempting to use a closed session
+
+## FAQ / Troubleshooting
+
+### Q: Do I need to install the Qwen CLI separately?
+
+A: No, from v0.1.1, the CLI is bundled with the SDK, so no standalone CLI installation is needed.
+
+### Q: What Java versions are supported?
+
+A: The SDK requires Java 1.8 or higher.
+
+### Q: How do I handle long-running requests?
+
+A: The SDK includes timeout utilities. You can configure timeouts using the `Timeout` class in `TransportOptions`.
+
+### Q: Why are some tools not executing?
+
+A: This is likely due to permission modes. Check your permission mode settings and consider using `allowedTools` to pre-approve certain tools.
+
+### Q: How do I resume a previous session?
+
+A: Use the `setResumeSessionId()` method in `TransportOptions` to resume a previous session.
+
+### Q: Can I customize the environment for the CLI process?
+
+A: Yes, use the `setEnv()` method in `TransportOptions` to pass environment variables to the CLI process.
+
+## License
+
+Apache-2.0 - see [LICENSE](./LICENSE) for details.

packages/sdk-java/checkstyle.xml

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+<module name="Checker">
+    <module name="FileTabCharacter" />
+    <module name="NewlineAtEndOfFile">
+        <property name="lineSeparator" value="lf" />
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\r" />
+        <property name="message" value="Line contains carriage return" />
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value=" \n" />
+        <property name="message" value="Line has trailing whitespace" />
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\n\n\n" />
+        <property name="message" value="Multiple consecutive blank lines" />
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\n\n\Z" />
+        <property name="message" value="Blank line before end of file" />
+    </module>
+
+    <module name="RegexpMultiline">
+        <property name="format" value="\{\n\n" />
+        <property name="message" value="Blank line after opening brace" />
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\n\n\s*\}" />
+        <property name="message" value="Blank line before closing brace" />
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="->\s*\{\s+\}" />
+        <property name="message" value="Whitespace inside empty lambda body" />
+    </module>
+
+    <module name="TreeWalker">
+        <module name="SuppressWarningsHolder" />
+
+        <module name="EmptyBlock">
+            <property name="option" value="text" />
+            <property name="tokens" value="
+                LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF,
+                LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, INSTANCE_INIT, STATIC_INIT" />
+        </module>
+        <module name="EmptyStatement" />
+        <module name="EmptyForInitializerPad" />
+        <module name="MethodParamPad">
+            <property name="allowLineBreaks" value="true" />
+            <property name="option" value="nospace" />
+        </module>
+        <module name="ParenPad" />
+        <module name="TypecastParenPad" />
+        <module name="NeedBraces" />
+        <module name="LeftCurly">
+            <property name="option" value="eol" />
+            <property name="tokens" value="
+                 LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR,
+                 LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE" />
+        </module>
+        <module name="GenericWhitespace" />
+        <module name="WhitespaceAfter" />
+        <module name="NoWhitespaceAfter" />
+        <module name="NoWhitespaceBefore" />
+        <module name="SingleSpaceSeparator" />
+        <module name="Indentation">
+            <property name="throwsIndent" value="8" />
+            <property name="lineWrappingIndentation" value="8" />
+        </module>
+
+        <module name="UpperEll" />
+        <module name="DefaultComesLast" />
+        <module name="ArrayTypeStyle" />
+        <module name="ModifierOrder" />
+        <module name="OneStatementPerLine" />
+        <module name="StringLiteralEquality" />
+        <module name="MutableException" />
+        <module name="EqualsHashCode" />
+        <module name="ExplicitInitialization" />
+        <module name="OneTopLevelClass" />
+
+        <module name="MemberName" />
+        <module name="PackageName" />
+        <module name="ClassTypeParameterName">
+            <property name="format" value="^[A-Z][0-9]?$" />
+        </module>
+        <module name="MethodTypeParameterName">
+            <property name="format" value="^[A-Z][0-9]?$" />
+        </module>
+        <module name="AnnotationUseStyle">
+            <property name="trailingArrayComma" value="ignore" />
+        </module>
+
+        <module name="RedundantImport" />
+        <module name="UnusedImports" />
+<!--        <module name="ImportOrder">-->
+<!--            <property name="groups" value="*,javax,java" />-->
+<!--            <property name="separated" value="true" />-->
+<!--            <property name="option" value="bottom" />-->
+<!--            <property name="sortStaticImportsAlphabetically" value="true" />-->
+<!--        </module>-->
+
+        <module name="WhitespaceAround">
+            <property name="allowEmptyConstructors" value="true" />
+            <property name="allowEmptyMethods" value="true" />
+            <property name="allowEmptyLambdas" value="true" />
+            <property name="ignoreEnhancedForColon" value="false" />
+            <property name="tokens" value="
+                ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN,
+                BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAND,
+                LAMBDA, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
+                LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH,
+                LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE,
+                LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL,
+                PLUS, PLUS_ASSIGN, QUESTION, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN,
+                STAR, STAR_ASSIGN, TYPE_EXTENSION_AND" />
+        </module>
+
+        <module name="WhitespaceAfter" />
+
+        <module name="NoWhitespaceAfter">
+            <property name="tokens" value="DOT" />
+            <property name="allowLineBreaks" value="false" />
+        </module>
+
+        <module name="MissingOverride"/>
+    </module>
+</module>

packages/sdk-java/pom.xml

@@ -0,0 +1,193 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.alibaba</groupId>
+    <artifactId>qwencode-sdk</artifactId>
+    <packaging>jar</packaging>
+    <version>0.0.1-alpha</version>
+    <name>qwencode-sdk</name>
+    <description>The Qwen Code Java SDK is a minimum experimental SDK for programmatic access to Qwen Code functionality. It provides a Java interface
+        to interact with the Qwen Code CLI, allowing developers to integrate Qwen Code capabilities into their Java applications.
+    </description>
+    <url>https://maven.apache.org</url>
+    <licenses>
+        <license>
+            <name>Apache 2</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+            <comments>A business-friendly OSS license</comments>
+        </license>
+    </licenses>
+    <scm>
+        <url>https://github.com/QwenLM/qwen-code</url>
+        <connection>scm:git:https://github.com/QwenLM/qwen-code.git</connection>
+    </scm>
+    <properties>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <checkstyle-maven-plugin.version>3.6.0</checkstyle-maven-plugin.version>
+        <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
+        <junit5.version>5.14.1</junit5.version>
+        <logback-classic.version>1.3.16</logback-classic.version>
+        <fastjson2.version>2.0.60</fastjson2.version>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+        <central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
+        <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
+        <maven-javadoc-plugin.version>2.9.1</maven-javadoc-plugin.version>
+        <maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <type>pom</type>
+                <version>${junit5.version}</version>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback-classic.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.20.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <version>${fastjson2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>${checkstyle-maven-plugin.version}</version>
+                <configuration>
+                    <configLocation>checkstyle.xml</configLocation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.sonatype.central</groupId>
+                <artifactId>central-publishing-maven-plugin</artifactId>
+                <version>${central-publishing-maven-plugin.version}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <publishingServerId>central</publishingServerId>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>${maven-source-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>${maven-javadoc-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <version>${maven-gpg-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>sign-artifacts</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>sign</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <organization>
+        <name>Alibaba Group</name>
+        <url>https://github.com/alibaba</url>
+    </organization>
+    <developers>
+        <developer>
+            <id>skyfire</id>
+            <name>skyfire</name>
+            <email>gengwei.gw(at)alibaba-inc.com</email>
+            <roles>
+                <role>Developer</role>
+                <role>Designer</role>
+            </roles>
+            <timezone>+8</timezone>
+            <url>https://github.com/gwinthis</url>
+        </developer>
+    </developers>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>central</id>
+            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
+        </snapshotRepository>
+        <repository>
+            <id>central</id>
+            <url>https://central.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
+</project>

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/QwenCodeCli.java

@@ -0,0 +1,142 @@
+package com.alibaba.qwen.code.cli;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantUsage;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent.TextAssistantContent;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent.ThingkingAssistantContent;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent.ToolResultAssistantContent;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent.ToolUseAssistantContent;
+import com.alibaba.qwen.code.cli.protocol.data.behavior.Behavior.Operation;
+import com.alibaba.qwen.code.cli.session.Session;
+import com.alibaba.qwen.code.cli.session.event.consumers.AssistantContentConsumers;
+import com.alibaba.qwen.code.cli.session.event.consumers.AssistantContentSimpleConsumers;
+import com.alibaba.qwen.code.cli.session.event.consumers.SessionEventSimpleConsumers;
+import com.alibaba.qwen.code.cli.transport.Transport;
+import com.alibaba.qwen.code.cli.transport.TransportOptions;
+import com.alibaba.qwen.code.cli.transport.process.ProcessTransport;
+import com.alibaba.qwen.code.cli.utils.MyConcurrentUtils;
+import com.alibaba.qwen.code.cli.utils.Timeout;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Main entry point for interacting with the Qwen Code CLI. Provides static methods for simple queries and session management.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+public class QwenCodeCli {
+    private static final Logger log = LoggerFactory.getLogger(QwenCodeCli.class);
+
+    /**
+     * Sends a simple query to the Qwen Code CLI and returns a list of responses.
+     *
+     * @param prompt The input prompt to send to the CLI
+     * @return A list of strings representing the CLI's responses
+     */
+    public static List<String> simpleQuery(String prompt) {
+        return simpleQuery(prompt, new TransportOptions());
+    }
+
+    /**
+     * Sends a simple query with custom transport options.
+     *
+     * @param prompt The input prompt to send to the CLI
+     * @param transportOptions Configuration options for the transport layer
+     * @return A list of strings representing the CLI's responses
+     */
+    public static List<String> simpleQuery(String prompt, TransportOptions transportOptions) {
+        final List<String> response = new ArrayList<>();
+        MyConcurrentUtils.runAndWait(() -> simpleQuery(prompt, transportOptions, new AssistantContentSimpleConsumers() {
+            @Override
+            public void onText(Session session, TextAssistantContent textAssistantContent) {
+                response.add(textAssistantContent.getText());
+            }
+
+            @Override
+            public void onThinking(Session session, ThingkingAssistantContent thingkingAssistantContent) {
+                response.add(thingkingAssistantContent.getThinking());
+            }
+
+            @Override
+            public void onToolUse(Session session, ToolUseAssistantContent toolUseAssistantContent) {
+                response.add(JSON.toJSONString(toolUseAssistantContent.getContentOfAssistant()));
+            }
+
+            @Override
+            public void onToolResult(Session session, ToolResultAssistantContent toolResultAssistantContent) {
+                response.add(JSON.toJSONString(toolResultAssistantContent));
+            }
+
+            public void onOtherContent(Session session, AssistantContent<?> other) {
+                response.add(JSON.toJSONString(other.getContentOfAssistant()));
+            }
+
+            @Override
+            public void onUsage(Session session, AssistantUsage assistantUsage) {
+                log.info("received usage {} of message {}", assistantUsage.getUsage(), assistantUsage.getMessageId());
+            }
+        }.setDefaultPermissionOperation(Operation.allow)), Timeout.TIMEOUT_30_MINUTES);
+        return response;
+    }
+
+    /**
+     * Sends a query with custom content consumers.
+     *
+     * @param prompt The input prompt to send to the CLI
+     * @param transportOptions Configuration options for the transport layer
+     * @param assistantContentConsumers Consumers for handling different types of assistant content
+     */
+    public static void simpleQuery(String prompt, TransportOptions transportOptions, AssistantContentConsumers assistantContentConsumers) {
+        Session session = newSession(transportOptions);
+        try {
+            session.sendPrompt(prompt, new SessionEventSimpleConsumers()
+                    .setAssistantContentConsumer(assistantContentConsumers));
+        } catch (Exception e) {
+            throw new RuntimeException("sendPrompt error!", e);
+        } finally {
+            try {
+                session.close();
+            } catch (Exception e) {
+                log.error("close session error!", e);
+            }
+        }
+    }
+
+    /**
+     * Creates a new session with default transport options.
+     *
+     * @return A new Session instance
+     */
+    public static Session newSession() {
+        return newSession(new TransportOptions());
+    }
+
+    /**
+     * Creates a new session with custom transport options.
+     *
+     * @param transportOptions Configuration options for the transport layer
+     * @return A new Session instance
+     */
+    public static Session newSession(TransportOptions transportOptions) {
+        Transport transport;
+        try {
+            transport = new ProcessTransport(transportOptions);
+        } catch (Exception e) {
+            throw new RuntimeException("initialized ProcessTransport error!", e);
+        }
+
+        Session session;
+        try {
+            session = new Session(transport);
+        } catch (Exception e) {
+            throw new RuntimeException("initialized Session error!", e);
+        }
+        return session;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/data/AssistantContent.java

@@ -0,0 +1,95 @@
+package com.alibaba.qwen.code.cli.protocol.data;
+
+import java.util.Map;
+
+/**
+ * Represents content from the assistant in a Qwen Code session.
+ *
+ * @param <C> The type of content
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+public interface AssistantContent<C> {
+    /**
+     * Gets the type of the assistant content.
+     *
+     * @return The type of the assistant content
+     */
+    String getType();
+
+    /**
+     * Gets the actual content from the assistant.
+     *
+     * @return The content from the assistant
+     */
+    C getContentOfAssistant();
+
+    /**
+     * Gets the message ID associated with this content.
+     *
+     * @return The message ID
+     */
+    String getMessageId();
+
+    /**
+     * Represents text content from the assistant.
+     */
+    interface TextAssistantContent extends AssistantContent<String> {
+        /**
+         * Gets the text content.
+         *
+         * @return The text content
+         */
+        String getText();
+    }
+
+    /**
+     * Represents thinking content from the assistant.
+     */
+    interface ThingkingAssistantContent extends AssistantContent<String> {
+        /**
+         * Gets the thinking content.
+         *
+         * @return The thinking content
+         */
+        String getThinking();
+    }
+
+    /**
+     * Represents tool use content from the assistant.
+     */
+    interface ToolUseAssistantContent extends AssistantContent<Map<String, Object>> {
+        /**
+         * Gets the tool input.
+         *
+         * @return The tool input
+         */
+        Map<String, Object> getInput();
+    }
+
+    /**
+     * Represents tool result content from the assistant.
+     */
+    interface ToolResultAssistantContent extends AssistantContent<String> {
+        /**
+         * Gets whether the tool result indicates an error.
+         *
+         * @return Whether the tool result indicates an error
+         */
+        Boolean getIsError();
+
+        /**
+         * Gets the tool result content.
+         *
+         * @return The tool result content
+         */
+        String getContent();
+
+        /**
+         * Gets the tool use ID.
+         *
+         * @return The tool use ID
+         */
+        String getToolUseId();
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/data/AssistantUsage.java

@@ -0,0 +1,76 @@
+package com.alibaba.qwen.code.cli.protocol.data;
+
+import com.alibaba.fastjson2.JSON;
+
+/**
+ * Represents usage information for an assistant message.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+public class AssistantUsage {
+    /**
+     * The ID of the message.
+     */
+    String messageId;
+    /**
+     * The usage information.
+     */
+    Usage usage;
+
+    /**
+     * Gets the message ID.
+     *
+     * @return The message ID
+     */
+    public String getMessageId() {
+        return messageId;
+    }
+
+    /**
+     * Sets the message ID.
+     *
+     * @param messageId The message ID
+     */
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+
+    /**
+     * Gets the usage information.
+     *
+     * @return The usage information
+     */
+    public Usage getUsage() {
+        return usage;
+    }
+
+    /**
+     * Sets the usage information.
+     *
+     * @param usage The usage information
+     */
+    public void setUsage(Usage usage) {
+        this.usage = usage;
+    }
+
+    /**
+     * Constructs a new AssistantUsage instance.
+     *
+     * @param messageId The message ID
+     * @param usage The usage information
+     */
+    public AssistantUsage(String messageId, Usage usage) {
+        this.messageId = messageId;
+        this.usage = usage;
+    }
+
+    /**
+     * <p>toString.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/data/CLIPermissionDenial.java

@@ -0,0 +1,83 @@
+package com.alibaba.qwen.code.cli.protocol.data;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+/**
+ * Represents a permission denial from the CLI.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+public class CLIPermissionDenial {
+    /**
+     * The name of the denied tool.
+     */
+    @JSONField(name = "tool_name")
+    private String toolName;
+
+    /**
+     * The ID of the denied tool use.
+     */
+    @JSONField(name = "tool_use_id")
+    private String toolUseId;
+
+    /**
+     * The input for the denied tool.
+     */
+    @JSONField(name = "tool_input")
+    private Object toolInput;
+
+    /**
+     * Gets the name of the denied tool.
+     *
+     * @return The name of the denied tool
+     */
+    public String getToolName() {
+        return toolName;
+    }
+
+    /**
+     * Sets the name of the denied tool.
+     *
+     * @param toolName The name of the denied tool
+     */
+    public void setToolName(String toolName) {
+        this.toolName = toolName;
+    }
+
+    /**
+     * Gets the ID of the denied tool use.
+     *
+     * @return The ID of the denied tool use
+     */
+    public String getToolUseId() {
+        return toolUseId;
+    }
+
+    /**
+     * Sets the ID of the denied tool use.
+     *
+     * @param toolUseId The ID of the denied tool use
+     */
+    public void setToolUseId(String toolUseId) {
+        this.toolUseId = toolUseId;
+    }
+
+    /**
+     * Gets the input for the denied tool.
+     *
+     * @return The input for the denied tool
+     */
+    public Object getToolInput() {
+        return toolInput;
+    }
+
+    /**
+     * Sets the input for the denied tool.
+     *
+     * @param toolInput The input for the denied tool
+     */
+    public void setToolInput(Object toolInput) {
+        this.toolInput = toolInput;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/data/Capabilities.java

@@ -0,0 +1,131 @@
+package com.alibaba.qwen.code.cli.protocol.data;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+/**
+ * Represents the capabilities of the Qwen Code CLI.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+public class Capabilities {
+    /**
+     * Whether the CLI can handle can_use_tool requests.
+     */
+    @JSONField(name = "can_handle_can_use_tool")
+    boolean canHandleCanUseTool;
+
+    /**
+     * Whether the CLI can handle hook callbacks.
+     */
+    @JSONField(name = "can_handle_hook_callback")
+    boolean canHandleHookCallback;
+
+    /**
+     * Whether the CLI can set permission mode.
+     */
+    @JSONField(name = "can_set_permission_mode")
+    boolean canSetPermissionMode;
+
+    /**
+     * Whether the CLI can set the model.
+     */
+    @JSONField(name = "can_set_model")
+    boolean canSetModel;
+
+    /**
+     * Whether the CLI can handle MCP messages.
+     */
+    @JSONField(name = "can_handle_mcp_message")
+    boolean canHandleMcpMessage;
+
+    /**
+     * Checks if the CLI can handle can_use_tool requests.
+     *
+     * @return true if the CLI can handle can_use_tool requests, false otherwise
+     */
+    public boolean isCanHandleCanUseTool() {
+        return canHandleCanUseTool;
+    }
+
+    /**
+     * Sets whether the CLI can handle can_use_tool requests.
+     *
+     * @param canHandleCanUseTool Whether the CLI can handle can_use_tool requests
+     */
+    public void setCanHandleCanUseTool(boolean canHandleCanUseTool) {
+        this.canHandleCanUseTool = canHandleCanUseTool;
+    }
+
+    /**
+     * Checks if the CLI can handle hook callbacks.
+     *
+     * @return true if the CLI can handle hook callbacks, false otherwise
+     */
+    public boolean isCanHandleHookCallback() {
+        return canHandleHookCallback;
+    }
+
+    /**
+     * Sets whether the CLI can handle hook callbacks.
+     *
+     * @param canHandleHookCallback Whether the CLI can handle hook callbacks
+     */
+    public void setCanHandleHookCallback(boolean canHandleHookCallback) {
+        this.canHandleHookCallback = canHandleHookCallback;
+    }
+
+    /**
+     * Checks if the CLI can set permission mode.
+     *
+     * @return true if the CLI can set permission mode, false otherwise
+     */
+    public boolean isCanSetPermissionMode() {
+        return canSetPermissionMode;
+    }
+
+    /**
+     * Sets whether the CLI can set permission mode.
+     *
+     * @param canSetPermissionMode Whether the CLI can set permission mode
+     */
+    public void setCanSetPermissionMode(boolean canSetPermissionMode) {
+        this.canSetPermissionMode = canSetPermissionMode;
+    }
+
+    /**
+     * Checks if the CLI can set the model.
+     *
+     * @return true if the CLI can set the model, false otherwise
+     */
+    public boolean isCanSetModel() {
+        return canSetModel;
+    }
+
+    /**
+     * Sets whether the CLI can set the model.
+     *
+     * @param canSetModel Whether the CLI can set the model
+     */
+    public void setCanSetModel(boolean canSetModel) {
+        this.canSetModel = canSetModel;
+    }
+
+    /**
+     * Checks if the CLI can handle MCP messages.
+     *
+     * @return true if the CLI can handle MCP messages, false otherwise
+     */
+    public boolean isCanHandleMcpMessage() {
+        return canHandleMcpMessage;
+    }
+
+    /**
+     * Sets whether the CLI can handle MCP messages.
+     *
+     * @param canHandleMcpMessage Whether the CLI can handle MCP messages
+     */
+    public void setCanHandleMcpMessage(boolean canHandleMcpMessage) {
+        this.canHandleMcpMessage = canHandleMcpMessage;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/data/ExtendedUsage.java

@@ -0,0 +1,147 @@
+package com.alibaba.qwen.code.cli.protocol.data;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+/**
+ * Extends the Usage class with additional usage information.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+public class ExtendedUsage extends Usage {
+    /**
+     * Server tool use information.
+     */
+    @JSONField(name = "server_tool_use")
+    private ServerToolUse serverToolUse;
+
+    /**
+     * Service tier information.
+     */
+    @JSONField(name = "service_tier")
+    private String serviceTier;
+
+    /**
+     * Cache creation information.
+     */
+    @JSONField(name = "cache_creation")
+    private CacheCreation cacheCreation;
+
+    /**
+     * Gets the server tool use information.
+     *
+     * @return The server tool use information
+     */
+    public ServerToolUse getServerToolUse() {
+        return serverToolUse;
+    }
+
+    /**
+     * Sets the server tool use information.
+     *
+     * @param serverToolUse The server tool use information
+     */
+    public void setServerToolUse(ServerToolUse serverToolUse) {
+        this.serverToolUse = serverToolUse;
+    }
+
+    /**
+     * Gets the service tier information.
+     *
+     * @return The service tier information
+     */
+    public String getServiceTier() {
+        return serviceTier;
+    }
+
+    /**
+     * Sets the service tier information.
+     *
+     * @param serviceTier The service tier information
+     */
+    public void setServiceTier(String serviceTier) {
+        this.serviceTier = serviceTier;
+    }
+
+    /**
+     * Gets the cache creation information.
+     *
+     * @return The cache creation information
+     */
+    public CacheCreation getCacheCreation() {
+        return cacheCreation;
+    }
+
+    /**
+     * Sets the cache creation information.
+     *
+     * @param cacheCreation The cache creation information
+     */
+    public void setCacheCreation(CacheCreation cacheCreation) {
+        this.cacheCreation = cacheCreation;
+    }
+
+    /**
+     * Represents server tool use information.
+     */
+    public static class ServerToolUse {
+        /**
+         * Number of web search requests.
+         */
+        @JSONField(name = "web_search_requests")
+        private int webSearchRequests;
+    }
+
+    /**
+     * Represents cache creation information.
+     */
+    public static class CacheCreation {
+        /**
+         * Number of ephemeral 1-hour input tokens.
+         */
+        @JSONField(name = "ephemeral_1h_input_tokens")
+        private int ephemeral1hInputTokens;
+
+        /**
+         * Number of ephemeral 5-minute input tokens.
+         */
+        @JSONField(name = "ephemeral_5m_input_tokens")
+        private int ephemeral5mInputTokens;
+
+        /**
+         * Gets the number of ephemeral 1-hour input tokens.
+         *
+         * @return The number of ephemeral 1-hour input tokens
+         */
+        public int getEphemeral1hInputTokens() {
+            return ephemeral1hInputTokens;
+        }
+
+        /**
+         * Sets the number of ephemeral 1-hour input tokens.
+         *
+         * @param ephemeral1hInputTokens The number of ephemeral 1-hour input tokens
+         */
+        public void setEphemeral1hInputTokens(int ephemeral1hInputTokens) {
+            this.ephemeral1hInputTokens = ephemeral1hInputTokens;
+        }
+
+        /**
+         * Gets the number of ephemeral 5-minute input tokens.
+         *
+         * @return The number of ephemeral 5-minute input tokens
+         */
+        public int getEphemeral5mInputTokens() {
+            return ephemeral5mInputTokens;
+        }
+
+        /**
+         * Sets the number of ephemeral 5-minute input tokens.
+         *
+         * @param ephemeral5mInputTokens The number of ephemeral 5-minute input tokens
+         */
+        public void setEphemeral5mInputTokens(int ephemeral5mInputTokens) {
+            this.ephemeral5mInputTokens = ephemeral5mInputTokens;
+        }
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/data/InitializeConfig.java

@@ -0,0 +1,98 @@
+package com.alibaba.qwen.code.cli.protocol.data;
+
+/**
+ * Configuration for initializing the CLI.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+public class InitializeConfig {
+    /**
+     * Hooks configuration.
+     */
+    String hooks;
+    /**
+     * SDK MCP servers configuration.
+     */
+    String sdkMcpServers;
+    /**
+     * MCP servers configuration.
+     */
+    String mcpServers;
+    /**
+     * Agents configuration.
+     */
+    String agents;
+
+    /**
+     * Gets the hooks configuration.
+     *
+     * @return The hooks configuration
+     */
+    public String getHooks() {
+        return hooks;
+    }
+
+    /**
+     * Sets the hooks configuration.
+     *
+     * @param hooks The hooks configuration
+     */
+    public void setHooks(String hooks) {
+        this.hooks = hooks;
+    }
+
+    /**
+     * Gets the SDK MCP servers configuration.
+     *
+     * @return The SDK MCP servers configuration
+     */
+    public String getSdkMcpServers() {
+        return sdkMcpServers;
+    }
+
+    /**
+     * Sets the SDK MCP servers configuration.
+     *
+     * @param sdkMcpServers The SDK MCP servers configuration
+     */
+    public void setSdkMcpServers(String sdkMcpServers) {
+        this.sdkMcpServers = sdkMcpServers;
+    }
+
+    /**
+     * Gets the MCP servers configuration.
+     *
+     * @return The MCP servers configuration
+     */
+    public String getMcpServers() {
+        return mcpServers;
+    }
+
+    /**
+     * Sets the MCP servers configuration.
+     *
+     * @param mcpServers The MCP servers configuration
+     */
+    public void setMcpServers(String mcpServers) {
+        this.mcpServers = mcpServers;
+    }
+
+    /**
+     * Gets the agents configuration.
+     *
+     * @return The agents configuration
+     */
+    public String getAgents() {
+        return agents;
+    }
+
+    /**
+     * Sets the agents configuration.
+     *
+     * @param agents The agents configuration
+     */
+    public void setAgents(String agents) {
+        this.agents = agents;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/data/ModelUsage.java

@@ -0,0 +1,142 @@
+package com.alibaba.qwen.code.cli.protocol.data;
+
+/**
+ * Represents usage information for a specific model.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+public class ModelUsage {
+    /**
+     * Number of input tokens.
+     */
+    private int inputTokens;
+    /**
+     * Number of output tokens.
+     */
+    private int outputTokens;
+    /**
+     * Number of cache read input tokens.
+     */
+    private int cacheReadInputTokens;
+    /**
+     * Number of cache creation input tokens.
+     */
+    private int cacheCreationInputTokens;
+    /**
+     * Number of web search requests.
+     */
+    private int webSearchRequests;
+    /**
+     * Context window size.
+     */
+    private int contextWindow;
+
+    /**
+     * Gets the number of input tokens.
+     *
+     * @return The number of input tokens
+     */
+    public int getInputTokens() {
+        return inputTokens;
+    }
+
+    /**
+     * Sets the number of input tokens.
+     *
+     * @param inputTokens The number of input tokens
+     */
+    public void setInputTokens(int inputTokens) {
+        this.inputTokens = inputTokens;
+    }
+
+    /**
+     * Gets the number of output tokens.
+     *
+     * @return The number of output tokens
+     */
+    public int getOutputTokens() {
+        return outputTokens;
+    }
+
+    /**
+     * Sets the number of output tokens.
+     *
+     * @param outputTokens The number of output tokens
+     */
+    public void setOutputTokens(int outputTokens) {
+        this.outputTokens = outputTokens;
+    }
+
+    /**
+     * Gets the number of cache read input tokens.
+     *
+     * @return The number of cache read input tokens
+     */
+    public int getCacheReadInputTokens() {
+        return cacheReadInputTokens;
+    }
+
+    /**
+     * Sets the number of cache read input tokens.
+     *
+     * @param cacheReadInputTokens The number of cache read input tokens
+     */
+    public void setCacheReadInputTokens(int cacheReadInputTokens) {
+        this.cacheReadInputTokens = cacheReadInputTokens;
+    }
+
+    /**
+     * Gets the number of cache creation input tokens.
+     *
+     * @return The number of cache creation input tokens
+     */
+    public int getCacheCreationInputTokens() {
+        return cacheCreationInputTokens;
+    }
+
+    /**
+     * Sets the number of cache creation input tokens.
+     *
+     * @param cacheCreationInputTokens The number of cache creation input tokens
+     */
+    public void setCacheCreationInputTokens(int cacheCreationInputTokens) {
+        this.cacheCreationInputTokens = cacheCreationInputTokens;
+    }
+
+    /**
+     * Gets the number of web search requests.
+     *
+     * @return The number of web search requests
+     */
+    public int getWebSearchRequests() {
+        return webSearchRequests;
+    }
+
+    /**
+     * Sets the number of web search requests.
+     *
+     * @param webSearchRequests The number of web search requests
+     */
+    public void setWebSearchRequests(int webSearchRequests) {
+        this.webSearchRequests = webSearchRequests;
+    }
+
+    /**
+     * Gets the context window size.
+     *
+     * @return The context window size
+     */
+    public int getContextWindow() {
+        return contextWindow;
+    }
+
+    /**
+     * Sets the context window size.
+     *
+     * @param contextWindow The context window size
+     */
+    public void setContextWindow(int contextWindow) {
+        this.contextWindow = contextWindow;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/data/PermissionMode.java

@@ -0,0 +1,56 @@
+package com.alibaba.qwen.code.cli.protocol.data;
+
+/**
+ * Represents different permission modes for the CLI.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+public enum PermissionMode {
+    /**
+     * Default permission mode.
+     */
+    DEFAULT("default"),
+    /**
+     * Plan permission mode.
+     */
+    PLAN("plan"),
+    /**
+     * Auto-edit permission mode.
+     */
+    AUTO_EDIT("auto-edit"),
+    /**
+     * YOLO permission mode.
+     */
+    YOLO("yolo");
+
+    private final String value;
+
+    PermissionMode(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the string value of the permission mode.
+     *
+     * @return The string value of the permission mode
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Gets the permission mode from its string value.
+     *
+     * @param value The string value
+     * @return The corresponding permission mode
+     */
+    public static PermissionMode fromValue(String value) {
+        for (PermissionMode mode : PermissionMode.values()) {
+            if (mode.value.equals(value)) {
+                return mode;
+            }
+        }
+        throw new IllegalArgumentException("Unknown permission mode: " + value);
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/data/Usage.java

@@ -0,0 +1,137 @@
+package com.alibaba.qwen.code.cli.protocol.data;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.annotation.JSONField;
+
+/**
+ * Represents usage information for a message.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+public class Usage {
+    /**
+     * Number of input tokens.
+     */
+    @JSONField(name = "input_tokens")
+    private Integer inputTokens;
+    /**
+     * Number of output tokens.
+     */
+    @JSONField(name = "output_tokens")
+    private Integer outputTokens;
+    /**
+     * Number of cache creation input tokens.
+     */
+    @JSONField(name = "cache_creation_input_tokens")
+    private Integer cacheCreationInputTokens;
+    /**
+     * Number of cache read input tokens.
+     */
+    @JSONField(name = "cache_read_input_tokens")
+    private Integer cacheReadInputTokens;
+    /**
+     * Total number of tokens.
+     */
+    @JSONField(name = "total_tokens")
+    private Integer totalTokens;
+
+    /**
+     * Gets the number of input tokens.
+     *
+     * @return The number of input tokens
+     */
+    public Integer getInputTokens() {
+        return inputTokens;
+    }
+
+    /**
+     * Sets the number of input tokens.
+     *
+     * @param inputTokens The number of input tokens
+     */
+    public void setInputTokens(Integer inputTokens) {
+        this.inputTokens = inputTokens;
+    }
+
+    /**
+     * Gets the number of output tokens.
+     *
+     * @return The number of output tokens
+     */
+    public Integer getOutputTokens() {
+        return outputTokens;
+    }
+
+    /**
+     * Sets the number of output tokens.
+     *
+     * @param outputTokens The number of output tokens
+     */
+    public void setOutputTokens(Integer outputTokens) {
+        this.outputTokens = outputTokens;
+    }
+
+    /**
+     * Gets the number of cache creation input tokens.
+     *
+     * @return The number of cache creation input tokens
+     */
+    public Integer getCacheCreationInputTokens() {
+        return cacheCreationInputTokens;
+    }
+
+    /**
+     * Sets the number of cache creation input tokens.
+     *
+     * @param cacheCreationInputTokens The number of cache creation input tokens
+     */
+    public void setCacheCreationInputTokens(Integer cacheCreationInputTokens) {
+        this.cacheCreationInputTokens = cacheCreationInputTokens;
+    }
+
+    /**
+     * Gets the number of cache read input tokens.
+     *
+     * @return The number of cache read input tokens
+     */
+    public Integer getCacheReadInputTokens() {
+        return cacheReadInputTokens;
+    }
+
+    /**
+     * Sets the number of cache read input tokens.
+     *
+     * @param cacheReadInputTokens The number of cache read input tokens
+     */
+    public void setCacheReadInputTokens(Integer cacheReadInputTokens) {
+        this.cacheReadInputTokens = cacheReadInputTokens;
+    }
+
+    /**
+     * Gets the total number of tokens.
+     *
+     * @return The total number of tokens
+     */
+    public Integer getTotalTokens() {
+        return totalTokens;
+    }
+
+    /**
+     * Sets the total number of tokens.
+     *
+     * @param totalTokens The total number of tokens
+     */
+    public void setTotalTokens(Integer totalTokens) {
+        this.totalTokens = totalTokens;
+    }
+
+    /**
+     * <p>toString.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/data/behavior/Allow.java

@@ -0,0 +1,46 @@
+package com.alibaba.qwen.code.cli.protocol.data.behavior;
+
+import java.util.Map;
+
+import com.alibaba.fastjson2.annotation.JSONType;
+
+/**
+ * Represents an allow behavior that permits an operation.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "operation", typeName = "allow")
+public class Allow extends Behavior {
+    /**
+     * Creates a new Allow instance and sets the behavior to allow.
+     */
+    public Allow() {
+        super();
+        this.behavior = Operation.allow;
+    }
+    /**
+     * Updated input for the operation.
+     */
+    Map<String, Object> updatedInput;
+
+    /**
+     * Gets the updated input.
+     *
+     * @return The updated input
+     */
+    public Map<String, Object> getUpdatedInput() {
+        return updatedInput;
+    }
+
+    /**
+     * Sets the updated input.
+     *
+     * @param updatedInput The updated input
+     * @return This instance for method chaining
+     */
+    public Allow setUpdatedInput(Map<String, Object> updatedInput) {
+        this.updatedInput = updatedInput;
+        return this;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/data/behavior/Behavior.java

@@ -0,0 +1,62 @@
+package com.alibaba.qwen.code.cli.protocol.data.behavior;
+
+import com.alibaba.fastjson2.annotation.JSONType;
+
+/**
+ * Base class for behavior objects that define how the CLI should handle requests.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "operation", typeName = "Behavior", seeAlso = {Allow.class, Deny.class})
+public class Behavior {
+    /**
+     * The behavior operation (allow or deny).
+     */
+    Operation behavior;
+
+    /**
+     * Gets the behavior operation.
+     *
+     * @return The behavior operation
+     */
+    public Operation getBehavior() {
+        return behavior;
+    }
+
+    /**
+     * Sets the behavior operation.
+     *
+     * @param behavior The behavior operation
+     */
+    public void setBehavior(Operation behavior) {
+        this.behavior = behavior;
+    }
+
+    /**
+     * Represents the type of operation.
+     */
+    public enum Operation {
+        /**
+         * Allow the operation.
+         */
+        allow,
+        /**
+         * Deny the operation.
+         */
+        deny
+    }
+
+    /**
+     * Gets the default behavior (deny with message).
+     *
+     * @return The default behavior
+     */
+    public static Behavior defaultBehavior() {
+        return denyBehavior();
+    }
+
+    public static Behavior denyBehavior() {
+        return new Deny().setMessage("Default Behavior Permission denied");
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/data/behavior/Deny.java

@@ -0,0 +1,45 @@
+package com.alibaba.qwen.code.cli.protocol.data.behavior;
+
+import com.alibaba.fastjson2.annotation.JSONType;
+
+/**
+ * Represents a deny behavior that rejects an operation.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "operation", typeName = "deny")
+public class Deny extends Behavior {
+    /**
+     * Creates a new Deny instance and sets the behavior to deny.
+     */
+    public Deny() {
+        super();
+        this.behavior = Operation.deny;
+    }
+
+    /**
+     * The message explaining why the operation was denied.
+     */
+    String message;
+
+    /**
+     * Gets the denial message.
+     *
+     * @return The denial message
+     */
+    public String getMessage() {
+        return message;
+    }
+
+    /**
+     * Sets the denial message.
+     *
+     * @param message The denial message
+     * @return This instance for method chaining
+     */
+    public Deny setMessage(String message) {
+        this.message = message;
+        return this;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/Message.java

@@ -0,0 +1,23 @@
+package com.alibaba.qwen.code.cli.protocol.message;
+
+/**
+ * Represents a message in the Qwen Code protocol.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+public interface Message {
+    /**
+     * Gets the type of the message.
+     *
+     * @return The type of the message
+     */
+    String getType();
+
+    /**
+     * Gets the ID of the message.
+     *
+     * @return The ID of the message
+     */
+    String getMessageId();
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/MessageBase.java

@@ -0,0 +1,64 @@
+package com.alibaba.qwen.code.cli.protocol.message;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONType;
+
+/**
+ * Base class for messages in the Qwen Code protocol.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(alphabetic = false, typeKey = "type", typeName = "MessageBase")
+public class MessageBase implements Message{
+    /**
+     * The type of the message.
+     */
+    protected String type;
+
+    /**
+     * The ID of the message.
+     */
+    @JSONField(name = "message_id")
+    protected String messageId;
+
+    /**
+     * <p>toString.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the type of the message.
+     *
+     * @param type The type of the message
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getMessageId() {
+        return messageId;
+    }
+
+    /**
+     * Sets the ID of the message.
+     *
+     * @param messageId The ID of the message
+     */
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/SDKResultMessage.java

@@ -0,0 +1,332 @@
+package com.alibaba.qwen.code.cli.protocol.message;
+
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONType;
+import com.alibaba.qwen.code.cli.protocol.data.CLIPermissionDenial;
+import com.alibaba.qwen.code.cli.protocol.data.ExtendedUsage;
+import com.alibaba.qwen.code.cli.protocol.data.Usage;
+
+/**
+ * Represents a result message from the SDK.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "type", typeName = "result")
+public class SDKResultMessage extends MessageBase {
+    /**
+     * The subtype of the result.
+     */
+    private String subtype; // 'error_max_turns' | 'error_during_execution'
+    /**
+     * The UUID of the message.
+     */
+    private String uuid;
+
+    /**
+     * The session ID.
+     */
+    @JSONField(name = "session_id")
+    private String sessionId;
+
+    /**
+     * Whether the result represents an error.
+     */
+    @JSONField(name = "is_error")
+    private boolean isError = true;
+
+    /**
+     * Duration in milliseconds.
+     */
+    @JSONField(name = "duration_ms")
+    private Long durationMs;
+
+    /**
+     * API duration in milliseconds.
+     */
+    @JSONField(name = "duration_api_ms")
+    private Long durationApiMs;
+
+    /**
+     * Number of turns.
+     */
+    @JSONField(name = "num_turns")
+    private Integer numTurns;
+    /**
+     * Usage information.
+     */
+    private ExtendedUsage usage;
+    /**
+     * Model usage information.
+     */
+    private Map<String, Usage> modelUsage;
+
+    /**
+     * List of permission denials.
+     */
+    @JSONField(name = "permission_denials")
+    private List<CLIPermissionDenial> permissionDenials;
+    /**
+     * Error information.
+     */
+    private Error error;
+
+    /**
+     * Creates a new SDKResultMessage instance and sets the type to "result".
+     */
+    public SDKResultMessage() {
+        super();
+        this.type = "result";
+    }
+
+    /**
+     * Gets the subtype of the result.
+     *
+     * @return The subtype of the result
+     */
+    public String getSubtype() {
+        return subtype;
+    }
+
+    /**
+     * Sets the subtype of the result.
+     *
+     * @param subtype The subtype of the result
+     */
+    public void setSubtype(String subtype) {
+        this.subtype = subtype;
+    }
+
+    /**
+     * Gets the UUID of the message.
+     *
+     * @return The UUID of the message
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the UUID of the message.
+     *
+     * @param uuid The UUID of the message
+     */
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    /**
+     * Gets the session ID.
+     *
+     * @return The session ID
+     */
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    /**
+     * Sets the session ID.
+     *
+     * @param sessionId The session ID
+     */
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
+    /**
+     * Checks if the result represents an error.
+     *
+     * @return Whether the result represents an error
+     */
+    public boolean isError() {
+        return isError;
+    }
+
+    /**
+     * Sets whether the result represents an error.
+     *
+     * @param error Whether the result represents an error
+     */
+    public void setError(boolean error) {
+        isError = error;
+    }
+
+    /**
+     * Gets the duration in milliseconds.
+     *
+     * @return The duration in milliseconds
+     */
+    public Long getDurationMs() {
+        return durationMs;
+    }
+
+    /**
+     * Sets the duration in milliseconds.
+     *
+     * @param durationMs The duration in milliseconds
+     */
+    public void setDurationMs(Long durationMs) {
+        this.durationMs = durationMs;
+    }
+
+    /**
+     * Gets the API duration in milliseconds.
+     *
+     * @return The API duration in milliseconds
+     */
+    public Long getDurationApiMs() {
+        return durationApiMs;
+    }
+
+    /**
+     * Sets the API duration in milliseconds.
+     *
+     * @param durationApiMs The API duration in milliseconds
+     */
+    public void setDurationApiMs(Long durationApiMs) {
+        this.durationApiMs = durationApiMs;
+    }
+
+    /**
+     * Gets the number of turns.
+     *
+     * @return The number of turns
+     */
+    public Integer getNumTurns() {
+        return numTurns;
+    }
+
+    /**
+     * Sets the number of turns.
+     *
+     * @param numTurns The number of turns
+     */
+    public void setNumTurns(Integer numTurns) {
+        this.numTurns = numTurns;
+    }
+
+    /**
+     * Gets the usage information.
+     *
+     * @return The usage information
+     */
+    public ExtendedUsage getUsage() {
+        return usage;
+    }
+
+    /**
+     * Sets the usage information.
+     *
+     * @param usage The usage information
+     */
+    public void setUsage(ExtendedUsage usage) {
+        this.usage = usage;
+    }
+
+    /**
+     * Gets the model usage information.
+     *
+     * @return The model usage information
+     */
+    public Map<String, Usage> getModelUsage() {
+        return modelUsage;
+    }
+
+    /**
+     * Sets the model usage information.
+     *
+     * @param modelUsage The model usage information
+     */
+    public void setModelUsage(Map<String, Usage> modelUsage) {
+        this.modelUsage = modelUsage;
+    }
+
+    /**
+     * Gets the list of permission denials.
+     *
+     * @return The list of permission denials
+     */
+    public List<CLIPermissionDenial> getPermissionDenials() {
+        return permissionDenials;
+    }
+
+    /**
+     * Sets the list of permission denials.
+     *
+     * @param permissionDenials The list of permission denials
+     */
+    public void setPermissionDenials(List<CLIPermissionDenial> permissionDenials) {
+        this.permissionDenials = permissionDenials;
+    }
+
+    /**
+     * Gets the error information.
+     *
+     * @return The error information
+     */
+    public Error getError() {
+        return error;
+    }
+
+    /**
+     * Sets the error information.
+     *
+     * @param error The error information
+     */
+    public void setError(Error error) {
+        this.error = error;
+    }
+
+    /**
+     * Represents error information.
+     */
+    public static class Error {
+        /**
+         * Error type.
+         */
+        private String type;
+        /**
+         * Error message.
+         */
+        private String message;
+
+        /**
+         * Gets the error type.
+         *
+         * @return The error type
+         */
+        public String getType() {
+            return type;
+        }
+
+        /**
+         * Sets the error type.
+         *
+         * @param type The error type
+         */
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        /**
+         * Gets the error message.
+         *
+         * @return The error message
+         */
+        public String getMessage() {
+            return message;
+        }
+
+        /**
+         * Sets the error message.
+         *
+         * @param message The error message
+         */
+        public void setMessage(String message) {
+            this.message = message;
+        }
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/SDKSystemMessage.java

@@ -0,0 +1,486 @@
+package com.alibaba.qwen.code.cli.protocol.message;
+
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONType;
+
+/**
+ * Represents a system message from the SDK.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "type", typeName = "system")
+public class SDKSystemMessage extends MessageBase {
+    /**
+     * The subtype of the system message.
+     */
+    private String subtype;
+    /**
+     * The UUID of the message.
+     */
+    private String uuid;
+    /**
+     * The session ID.
+     */
+    @JSONField(name = "session_id")
+    private String sessionId;
+    /**
+     * Additional data.
+     */
+    private Object data;
+    /**
+     * Current working directory.
+     */
+    private String cwd;
+    /**
+     * List of available tools.
+     */
+    private List<String> tools;
+    /**
+     * List of MCP servers.
+     */
+    @JSONField(name = "mcp_servers")
+    private List<McpServer> mcpServers;
+    /**
+     * Model information.
+     */
+    private String model;
+    /**
+     * Permission mode.
+     */
+    @JSONField(name = "permission_mode")
+    private String permissionMode;
+    /**
+     * Available slash commands.
+     */
+    @JSONField(name = "slash_commands")
+    private List<String> slashCommands;
+    /**
+     * Qwen Code version.
+     */
+    @JSONField(name = "qwen_code_version")
+    private String qwenCodeVersion;
+    /**
+     * Output style.
+     */
+    @JSONField(name = "output_style")
+    private String outputStyle;
+    /**
+     * Available agents.
+     */
+    private List<String> agents;
+    /**
+     * Available skills.
+     */
+    private List<String> skills;
+    /**
+     * Capabilities information.
+     */
+    private Map<String, Object> capabilities;
+    /**
+     * Compact metadata.
+     */
+    @JSONField(name = "compact_metadata")
+    private CompactMetadata compactMetadata;
+
+    /**
+     * Creates a new SDKSystemMessage instance and sets the type to "system".
+     */
+    public SDKSystemMessage() {
+        super();
+        this.type = "system";
+    }
+
+    /**
+     * Gets the subtype of the system message.
+     *
+     * @return The subtype of the system message
+     */
+    public String getSubtype() {
+        return subtype;
+    }
+
+    /**
+     * Sets the subtype of the system message.
+     *
+     * @param subtype The subtype of the system message
+     */
+    public void setSubtype(String subtype) {
+        this.subtype = subtype;
+    }
+
+    /**
+     * Gets the UUID of the message.
+     *
+     * @return The UUID of the message
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the UUID of the message.
+     *
+     * @param uuid The UUID of the message
+     */
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    /**
+     * Gets the session ID.
+     *
+     * @return The session ID
+     */
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    /**
+     * Sets the session ID.
+     *
+     * @param sessionId The session ID
+     */
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
+    /**
+     * Gets the additional data.
+     *
+     * @return The additional data
+     */
+    public Object getData() {
+        return data;
+    }
+
+    /**
+     * Sets the additional data.
+     *
+     * @param data The additional data
+     */
+    public void setData(Object data) {
+        this.data = data;
+    }
+
+    /**
+     * Gets the current working directory.
+     *
+     * @return The current working directory
+     */
+    public String getCwd() {
+        return cwd;
+    }
+
+    /**
+     * Sets the current working directory.
+     *
+     * @param cwd The current working directory
+     */
+    public void setCwd(String cwd) {
+        this.cwd = cwd;
+    }
+
+    /**
+     * Gets the list of available tools.
+     *
+     * @return The list of available tools
+     */
+    public List<String> getTools() {
+        return tools;
+    }
+
+    /**
+     * Sets the list of available tools.
+     *
+     * @param tools The list of available tools
+     */
+    public void setTools(List<String> tools) {
+        this.tools = tools;
+    }
+
+    /**
+     * Gets the list of MCP servers.
+     *
+     * @return The list of MCP servers
+     */
+    public List<McpServer> getMcpServers() {
+        return mcpServers;
+    }
+
+    /**
+     * Sets the list of MCP servers.
+     *
+     * @param mcpServers The list of MCP servers
+     */
+    public void setMcpServers(List<McpServer> mcpServers) {
+        this.mcpServers = mcpServers;
+    }
+
+    /**
+     * Gets the model information.
+     *
+     * @return The model information
+     */
+    public String getModel() {
+        return model;
+    }
+
+    /**
+     * Sets the model information.
+     *
+     * @param model The model information
+     */
+    public void setModel(String model) {
+        this.model = model;
+    }
+
+    /**
+     * Gets the permission mode.
+     *
+     * @return The permission mode
+     */
+    public String getPermissionMode() {
+        return permissionMode;
+    }
+
+    /**
+     * Sets the permission mode.
+     *
+     * @param permissionMode The permission mode
+     */
+    public void setPermissionMode(String permissionMode) {
+        this.permissionMode = permissionMode;
+    }
+
+    /**
+     * Gets the available slash commands.
+     *
+     * @return The available slash commands
+     */
+    public List<String> getSlashCommands() {
+        return slashCommands;
+    }
+
+    /**
+     * Sets the available slash commands.
+     *
+     * @param slashCommands The available slash commands
+     */
+    public void setSlashCommands(List<String> slashCommands) {
+        this.slashCommands = slashCommands;
+    }
+
+    /**
+     * Gets the Qwen Code version.
+     *
+     * @return The Qwen Code version
+     */
+    public String getQwenCodeVersion() {
+        return qwenCodeVersion;
+    }
+
+    /**
+     * Sets the Qwen Code version.
+     *
+     * @param qwenCodeVersion The Qwen Code version
+     */
+    public void setQwenCodeVersion(String qwenCodeVersion) {
+        this.qwenCodeVersion = qwenCodeVersion;
+    }
+
+    /**
+     * Gets the output style.
+     *
+     * @return The output style
+     */
+    public String getOutputStyle() {
+        return outputStyle;
+    }
+
+    /**
+     * Sets the output style.
+     *
+     * @param outputStyle The output style
+     */
+    public void setOutputStyle(String outputStyle) {
+        this.outputStyle = outputStyle;
+    }
+
+    /**
+     * Gets the available agents.
+     *
+     * @return The available agents
+     */
+    public List<String> getAgents() {
+        return agents;
+    }
+
+    /**
+     * Sets the available agents.
+     *
+     * @param agents The available agents
+     */
+    public void setAgents(List<String> agents) {
+        this.agents = agents;
+    }
+
+    /**
+     * Gets the available skills.
+     *
+     * @return The available skills
+     */
+    public List<String> getSkills() {
+        return skills;
+    }
+
+    /**
+     * Sets the available skills.
+     *
+     * @param skills The available skills
+     */
+    public void setSkills(List<String> skills) {
+        this.skills = skills;
+    }
+
+    /**
+     * Gets the capabilities information.
+     *
+     * @return The capabilities information
+     */
+    public Map<String, Object> getCapabilities() {
+        return capabilities;
+    }
+
+    /**
+     * Sets the capabilities information.
+     *
+     * @param capabilities The capabilities information
+     */
+    public void setCapabilities(Map<String, Object> capabilities) {
+        this.capabilities = capabilities;
+    }
+
+    /**
+     * Gets the compact metadata.
+     *
+     * @return The compact metadata
+     */
+    public CompactMetadata getCompactMetadata() {
+        return compactMetadata;
+    }
+
+    /**
+     * Sets the compact metadata.
+     *
+     * @param compactMetadata The compact metadata
+     */
+    public void setCompactMetadata(CompactMetadata compactMetadata) {
+        this.compactMetadata = compactMetadata;
+    }
+
+    /**
+     * Represents MCP server information.
+     */
+    public static class McpServer {
+        /**
+         * Server name.
+         */
+        private String name;
+        /**
+         * Server status.
+         */
+        private String status;
+
+        /**
+         * Gets the server name.
+         *
+         * @return The server name
+         */
+        public String getName() {
+            return name;
+        }
+
+        /**
+         * Sets the server name.
+         *
+         * @param name The server name
+         */
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        /**
+         * Gets the server status.
+         *
+         * @return The server status
+         */
+        public String getStatus() {
+            return status;
+        }
+
+        /**
+         * Sets the server status.
+         *
+         * @param status The server status
+         */
+        public void setStatus(String status) {
+            this.status = status;
+        }
+    }
+
+    /**
+     * Represents compact metadata.
+     */
+    public static class CompactMetadata {
+        /**
+         * Trigger information.
+         */
+        private String trigger;
+
+        /**
+         * Pre-tokens information.
+         */
+        @JSONField(name = "pre_tokens")
+        private Integer preTokens;
+
+        /**
+         * Gets the trigger information.
+         *
+         * @return The trigger information
+         */
+        public String getTrigger() {
+            return trigger;
+        }
+
+        /**
+         * Sets the trigger information.
+         *
+         * @param trigger The trigger information
+         */
+        public void setTrigger(String trigger) {
+            this.trigger = trigger;
+        }
+
+        /**
+         * Gets the pre-tokens information.
+         *
+         * @return The pre-tokens information
+         */
+        public Integer getPreTokens() {
+            return preTokens;
+        }
+
+        /**
+         * Sets the pre-tokens information.
+         *
+         * @param preTokens The pre-tokens information
+         */
+        public void setPreTokens(Integer preTokens) {
+            this.preTokens = preTokens;
+        }
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/SDKUserMessage.java

@@ -0,0 +1,196 @@
+package com.alibaba.qwen.code.cli.protocol.message;
+
+import java.util.Map;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONType;
+
+/**
+ * Represents a user message in the SDK protocol.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "type", typeName = "user")
+public class SDKUserMessage extends MessageBase {
+    /**
+     * The UUID of the message.
+     */
+    private String uuid;
+
+    /**
+     * The session ID.
+     */
+    @JSONField(name = "session_id")
+    private String sessionId;
+    /**
+     * The API user message.
+     */
+    private final APIUserMessage message = new APIUserMessage();
+
+    /**
+     * The parent tool use ID.
+     */
+    @JSONField(name = "parent_tool_use_id")
+    private String parentToolUseId;
+    /**
+     * Additional options.
+     */
+    private Map<String, String> options;
+
+    /**
+     * Creates a new SDKUserMessage instance and sets the type to "user".
+     */
+    public SDKUserMessage() {
+        super();
+        this.setType("user");
+    }
+
+    /**
+     * Gets the UUID of the message.
+     *
+     * @return The UUID of the message
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the UUID of the message.
+     *
+     * @param uuid The UUID of the message
+     */
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    /**
+     * Gets the session ID.
+     *
+     * @return The session ID
+     */
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    /**
+     * Sets the session ID.
+     *
+     * @param sessionId The session ID
+     * @return This instance for method chaining
+     */
+    public SDKUserMessage setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+        return this;
+    }
+
+    /**
+     * Sets the content of the message.
+     *
+     * @param content The content of the message
+     * @return This instance for method chaining
+     */
+    public SDKUserMessage setContent(String content) {
+        message.setContent(content);
+        return this;
+    }
+
+    /**
+     * Gets the content of the message.
+     *
+     * @return The content of the message
+     */
+    public String getContent() {
+        return message.getContent();
+    }
+
+    /**
+     * Gets the parent tool use ID.
+     *
+     * @return The parent tool use ID
+     */
+    public String getParentToolUseId() {
+        return parentToolUseId;
+    }
+
+    /**
+     * Sets the parent tool use ID.
+     *
+     * @param parentToolUseId The parent tool use ID
+     * @return This instance for method chaining
+     */
+    public SDKUserMessage setParentToolUseId(String parentToolUseId) {
+        this.parentToolUseId = parentToolUseId;
+        return this;
+    }
+
+    /**
+     * Gets the additional options.
+     *
+     * @return The additional options
+     */
+    public Map<String, String> getOptions() {
+        return options;
+    }
+
+    /**
+     * Sets the additional options.
+     *
+     * @param options The additional options
+     * @return This instance for method chaining
+     */
+    public SDKUserMessage setOptions(Map<String, String> options) {
+        this.options = options;
+        return this;
+    }
+
+    /**
+     * Represents the API user message.
+     */
+    public static class APIUserMessage {
+        /**
+         * User role.
+         */
+        private String role = "user";
+        /**
+         * Message content.
+         */
+        private String content;
+
+        /**
+         * Gets the user role.
+         *
+         * @return The user role
+         */
+        public String getRole() {
+            return role;
+        }
+
+        /**
+         * Sets the user role.
+         *
+         * @param role The user role
+         */
+        public void setRole(String role) {
+            this.role = role;
+        }
+
+        /**
+         * Gets the message content.
+         *
+         * @return The message content
+         */
+        public String getContent() {
+            return content;
+        }
+
+        /**
+         * Sets the message content.
+         *
+         * @param content The message content
+         */
+        public void setContent(String content) {
+            this.content = content;
+        }
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/assistant/APIAssistantMessage.java

@@ -0,0 +1,172 @@
+package com.alibaba.qwen.code.cli.protocol.message.assistant;
+
+import java.util.List;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.qwen.code.cli.protocol.data.Usage;
+import com.alibaba.qwen.code.cli.protocol.message.assistant.block.ContentBlock;
+
+/**
+ * Represents an API assistant message.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+public class APIAssistantMessage {
+    /**
+     * Message ID.
+     */
+    private String id;
+    /**
+     * Message type.
+     */
+    private String type = "message";
+    /**
+     * Message role.
+     */
+    private String role = "assistant";
+    /**
+     * Message model.
+     */
+    private String model;
+    /**
+     * Message content.
+     */
+    private List<ContentBlock<?>> content;
+
+    /**
+     * Stop reason.
+     */
+    @JSONField(name = "stop_reason")
+    private String stopReason;
+    /**
+     * Usage information.
+     */
+    private Usage usage;
+
+    /**
+     * Gets the message ID.
+     *
+     * @return The message ID
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the message ID.
+     *
+     * @param id The message ID
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * Gets the message type.
+     *
+     * @return The message type
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the message type.
+     *
+     * @param type The message type
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+     * Gets the message role.
+     *
+     * @return The message role
+     */
+    public String getRole() {
+        return role;
+    }
+
+    /**
+     * Sets the message role.
+     *
+     * @param role The message role
+     */
+    public void setRole(String role) {
+        this.role = role;
+    }
+
+    /**
+     * Gets the message model.
+     *
+     * @return The message model
+     */
+    public String getModel() {
+        return model;
+    }
+
+    /**
+     * Sets the message model.
+     *
+     * @param model The message model
+     */
+    public void setModel(String model) {
+        this.model = model;
+    }
+
+    /**
+     * Gets the stop reason.
+     *
+     * @return The stop reason
+     */
+    public String getStopReason() {
+        return stopReason;
+    }
+
+    /**
+     * Sets the stop reason.
+     *
+     * @param stopReason The stop reason
+     */
+    public void setStopReason(String stopReason) {
+        this.stopReason = stopReason;
+    }
+
+    /**
+     * Gets the usage information.
+     *
+     * @return The usage information
+     */
+    public Usage getUsage() {
+        return usage;
+    }
+
+    /**
+     * Sets the usage information.
+     *
+     * @param usage The usage information
+     */
+    public void setUsage(Usage usage) {
+        this.usage = usage;
+    }
+
+    /**
+     * Gets the message content.
+     *
+     * @return The message content
+     */
+    public List<ContentBlock<?>> getContent() {
+        return content;
+    }
+
+    /**
+     * Sets the message content.
+     *
+     * @param content The message content
+     */
+    public void setContent(List<ContentBlock<?>> content) {
+        this.content = content;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/assistant/SDKAssistantMessage.java

@@ -0,0 +1,121 @@
+package com.alibaba.qwen.code.cli.protocol.message.assistant;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONType;
+import com.alibaba.qwen.code.cli.protocol.message.MessageBase;
+
+/**
+ * Represents an SDK assistant message.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "type", typeName = "assistant")
+public class SDKAssistantMessage extends MessageBase {
+    /**
+     * The UUID of the message.
+     */
+    private String uuid;
+
+    /**
+     * The session ID.
+     */
+    @JSONField(name = "session_id")
+    private String sessionId;
+    /**
+     * The API assistant message.
+     */
+    private APIAssistantMessage message;
+
+    /**
+     * The parent tool use ID.
+     */
+    @JSONField(name = "parent_tool_use_id")
+    private String parentToolUseId;
+
+    /**
+     * Creates a new SDKAssistantMessage instance and sets the type to "assistant".
+     */
+    public SDKAssistantMessage() {
+        super();
+        this.type = "assistant";
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getMessageId() {
+        return this.getUuid();
+    }
+
+    /**
+     * Gets the UUID of the message.
+     *
+     * @return The UUID of the message
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the UUID of the message.
+     *
+     * @param uuid The UUID of the message
+     */
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    /**
+     * Gets the session ID.
+     *
+     * @return The session ID
+     */
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    /**
+     * Sets the session ID.
+     *
+     * @param sessionId The session ID
+     */
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
+    /**
+     * Gets the API assistant message.
+     *
+     * @return The API assistant message
+     */
+    public APIAssistantMessage getMessage() {
+        return message;
+    }
+
+    /**
+     * Sets the API assistant message.
+     *
+     * @param message The API assistant message
+     */
+    public void setMessage(APIAssistantMessage message) {
+        this.message = message;
+    }
+
+    /**
+     * Gets the parent tool use ID.
+     *
+     * @return The parent tool use ID
+     */
+    public String getParentToolUseId() {
+        return parentToolUseId;
+    }
+
+    /**
+     * Sets the parent tool use ID.
+     *
+     * @param parentToolUseId The parent tool use ID
+     */
+    public void setParentToolUseId(String parentToolUseId) {
+        this.parentToolUseId = parentToolUseId;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/assistant/SDKPartialAssistantMessage.java

@@ -0,0 +1,116 @@
+package com.alibaba.qwen.code.cli.protocol.message.assistant;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONType;
+import com.alibaba.qwen.code.cli.protocol.message.MessageBase;
+import com.alibaba.qwen.code.cli.protocol.message.assistant.event.StreamEvent;
+
+/**
+ * Represents a partial assistant message during streaming.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "type", typeName = "stream_event")
+public class SDKPartialAssistantMessage extends MessageBase {
+    /**
+     * The UUID of the message.
+     */
+    private String uuid;
+
+    /**
+     * The session ID.
+     */
+    @JSONField(name = "session_id")
+    private String sessionId;
+    /**
+     * The stream event.
+     */
+    private StreamEvent event;
+
+    /**
+     * The parent tool use ID.
+     */
+    @JSONField(name = "parent_tool_use_id")
+    private String parentToolUseId;
+
+    /**
+     * Creates a new SDKPartialAssistantMessage instance and sets the type to "stream_event".
+     */
+    public SDKPartialAssistantMessage() {
+        super();
+        this.type = "stream_event";
+    }
+
+    /**
+     * Gets the UUID of the message.
+     *
+     * @return The UUID of the message
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets the UUID of the message.
+     *
+     * @param uuid The UUID of the message
+     */
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    /**
+     * Gets the session ID.
+     *
+     * @return The session ID
+     */
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    /**
+     * Sets the session ID.
+     *
+     * @param sessionId The session ID
+     */
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
+    /**
+     * Gets the stream event.
+     *
+     * @return The stream event
+     */
+    public StreamEvent getEvent() {
+        return event;
+    }
+
+    /**
+     * Sets the stream event.
+     *
+     * @param event The stream event
+     */
+    public void setEvent(StreamEvent event) {
+        this.event = event;
+    }
+
+    /**
+     * Gets the parent tool use ID.
+     *
+     * @return The parent tool use ID
+     */
+    public String getParentToolUseId() {
+        return parentToolUseId;
+    }
+
+    /**
+     * Sets the parent tool use ID.
+     *
+     * @param parentToolUseId The parent tool use ID
+     */
+    public void setParentToolUseId(String parentToolUseId) {
+        this.parentToolUseId = parentToolUseId;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/assistant/block/Annotation.java

@@ -0,0 +1,59 @@
+package com.alibaba.qwen.code.cli.protocol.message.assistant.block;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+/**
+ * Represents an annotation for a content block.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+public class Annotation {
+    /**
+     * The annotation type.
+     */
+    @JSONField(name = "type")
+    private String type;
+
+    /**
+     * The annotation value.
+     */
+    @JSONField(name = "value")
+    private String value;
+
+    /**
+     * Gets the annotation type.
+     *
+     * @return The annotation type
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the annotation type.
+     *
+     * @param type The annotation type
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+     * Gets the annotation value.
+     *
+     * @return The annotation value
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the annotation value.
+     *
+     * @param value The annotation value
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/assistant/block/ContentBlock.java

@@ -0,0 +1,87 @@
+package com.alibaba.qwen.code.cli.protocol.message.assistant.block;
+
+import java.util.List;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.annotation.JSONType;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent;
+
+/**
+ * Abstract base class for content blocks in assistant messages.
+ *
+ * @param <C> The type of content
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "type", typeName = "ContentBlock", seeAlso = { TextBlock.class, ToolResultBlock.class, ThinkingBlock.class, ToolUseBlock.class })
+public abstract class ContentBlock<C> implements AssistantContent<C> {
+    /**
+     * The type of the content block.
+     */
+    protected String type;
+    /**
+     * List of annotations.
+     */
+    protected List<Annotation> annotations;
+    /**
+     * The message ID.
+     */
+    protected String messageId;
+
+    /** {@inheritDoc} */
+    @Override
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the type of the content block.
+     *
+     * @param type The type of the content block
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+     * Gets the list of annotations.
+     *
+     * @return The list of annotations
+     */
+    public List<Annotation> getAnnotations() {
+        return annotations;
+    }
+
+    /**
+     * Sets the list of annotations.
+     *
+     * @param annotations The list of annotations
+     */
+    public void setAnnotations(List<Annotation> annotations) {
+        this.annotations = annotations;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getMessageId() {
+        return messageId;
+    }
+
+    /**
+     * Sets the message ID.
+     *
+     * @param messageId The message ID
+     */
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+
+    /**
+     * <p>toString.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/assistant/block/TextBlock.java

@@ -0,0 +1,42 @@
+package com.alibaba.qwen.code.cli.protocol.message.assistant.block;
+
+import com.alibaba.fastjson2.annotation.JSONType;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent.TextAssistantContent;
+
+/**
+ * Represents a text content block.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "type", typeName = "text")
+public class TextBlock extends ContentBlock<String> implements TextAssistantContent {
+    /**
+     * The text content.
+     */
+    private String text;
+
+    /**
+     * Gets the text content.
+     *
+     * @return The text content
+     */
+    public String getText() {
+        return text;
+    }
+
+    /**
+     * Sets the text content.
+     *
+     * @param text The text content
+     */
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getContentOfAssistant() {
+        return text;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/assistant/block/ThinkingBlock.java

@@ -0,0 +1,64 @@
+package com.alibaba.qwen.code.cli.protocol.message.assistant.block;
+
+import com.alibaba.fastjson2.annotation.JSONType;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent.ThingkingAssistantContent;
+
+/**
+ * Represents a thinking content block.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "type", typeName = "thinking")
+public class ThinkingBlock extends ContentBlock<String> implements ThingkingAssistantContent {
+    /**
+     * The thinking content.
+     */
+    private String thinking;
+    /**
+     * The signature.
+     */
+    private String signature;
+
+    /**
+     * Gets the thinking content.
+     *
+     * @return The thinking content
+     */
+    public String getThinking() {
+        return thinking;
+    }
+
+    /**
+     * Sets the thinking content.
+     *
+     * @param thinking The thinking content
+     */
+    public void setThinking(String thinking) {
+        this.thinking = thinking;
+    }
+
+    /**
+     * Gets the signature.
+     *
+     * @return The signature
+     */
+    public String getSignature() {
+        return signature;
+    }
+
+    /**
+     * Sets the signature.
+     *
+     * @param signature The signature
+     */
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getContentOfAssistant() {
+        return thinking;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/assistant/block/ToolResultBlock.java

@@ -0,0 +1,92 @@
+package com.alibaba.qwen.code.cli.protocol.message.assistant.block;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONType;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent.ToolResultAssistantContent;
+
+/**
+ * Represents a tool result content block.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "type", typeName = "tool_result")
+public class ToolResultBlock extends ContentBlock<String> implements ToolResultAssistantContent {
+    /**
+     * The tool use ID.
+     */
+    @JSONField(name = "tool_use_id")
+    private String toolUseId;
+
+    /**
+     * The result content.
+     */
+    @JSONField(name = "content")
+    private String content;
+
+    /**
+     * Whether the result is an error.
+     */
+    @JSONField(name = "is_error")
+    private Boolean isError;
+
+    /**
+     * Gets the tool use ID.
+     *
+     * @return The tool use ID
+     */
+    public String getToolUseId() {
+        return toolUseId;
+    }
+
+    /**
+     * Sets the tool use ID.
+     *
+     * @param toolUseId The tool use ID
+     */
+    public void setToolUseId(String toolUseId) {
+        this.toolUseId = toolUseId;
+    }
+
+    /**
+     * Gets the result content.
+     *
+     * @return The result content
+     */
+    public String getContent() {
+        return content;
+    }
+
+    /**
+     * Sets the result content.
+     *
+     * @param content The result content
+     */
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    /**
+     * Gets whether the result is an error.
+     *
+     * @return Whether the result is an error
+     */
+    public Boolean getIsError() {
+        return isError;
+    }
+
+    /**
+     * Sets whether the result is an error.
+     *
+     * @param isError Whether the result is an error
+     */
+    public void setIsError(Boolean isError) {
+        this.isError = isError;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getContentOfAssistant() {
+        return content;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/assistant/block/ToolUseBlock.java

@@ -0,0 +1,122 @@
+package com.alibaba.qwen.code.cli.protocol.message.assistant.block;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson2.annotation.JSONType;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent.ToolUseAssistantContent;
+
+/**
+ * Represents a tool use content block.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "type", typeName = "tool_use")
+public class ToolUseBlock extends ContentBlock<Map<String, Object>> implements ToolUseAssistantContent {
+    /**
+     * The tool use ID.
+     */
+    private String id;
+    /**
+     * The tool name.
+     */
+    private String name;
+    /**
+     * The tool input.
+     */
+    private Map<String, Object> input;
+    /**
+     * List of annotations.
+     */
+    private List<Annotation> annotations;
+
+    /**
+     * Creates a new ToolUseBlock instance.
+     */
+    public ToolUseBlock() {}
+
+    /**
+     * Gets the tool use ID.
+     *
+     * @return The tool use ID
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the tool use ID.
+     *
+     * @param id The tool use ID
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * Gets the tool name.
+     *
+     * @return The tool name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the tool name.
+     *
+     * @param name The tool name
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * Gets the tool input.
+     *
+     * @return The tool input
+     */
+    public Map<String, Object> getInput() {
+        return input;
+    }
+
+    /**
+     * Sets the tool input.
+     *
+     * @param input The tool input
+     */
+    public void setInput(Map<String, Object> input) {
+        this.input = input;
+    }
+
+    /**
+     * Gets the list of annotations.
+     *
+     * @return The list of annotations
+     */
+    public List<Annotation> getAnnotations() {
+        return annotations;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * Sets the list of annotations.
+     */
+    @Override
+    public void setAnnotations(List<Annotation> annotations) {
+        this.annotations = annotations;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * Gets the content of the assistant.
+     */
+    @Override
+    public Map<String, Object> getContentOfAssistant() {
+        return Collections.emptyMap();
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/assistant/event/ContentBlockDeltaEvent.java

@@ -0,0 +1,224 @@
+package com.alibaba.qwen.code.cli.protocol.message.assistant.event;
+
+import java.util.Map;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.TypeReference;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONType;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent.TextAssistantContent;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent.ThingkingAssistantContent;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent.ToolUseAssistantContent;
+
+/**
+ * Represents a content block delta event during streaming.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "type", typeName = "content_block_delta")
+public class ContentBlockDeltaEvent extends StreamEvent {
+    /**
+     * The index of the content block.
+     */
+    private int index;
+    /**
+     * The content block delta.
+     */
+    private ContentBlockDelta<?> delta;
+
+    /**
+     * Gets the index of the content block.
+     *
+     * @return The index of the content block
+     */
+    public int getIndex() {
+        return index;
+    }
+
+    /**
+     * Sets the index of the content block.
+     *
+     * @param index The index of the content block
+     */
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+    /**
+     * Gets the content block delta.
+     *
+     * @return The content block delta
+     */
+    public ContentBlockDelta<?> getDelta() {
+        return delta;
+    }
+
+    /**
+     * Sets the content block delta.
+     *
+     * @param delta The content block delta
+     */
+    public void setDelta(ContentBlockDelta<?> delta) {
+        this.delta = delta;
+    }
+
+    /**
+     * Abstract base class for content block deltas.
+     *
+     * @param <C> The type of content
+     */
+    @JSONType(typeKey = "type", typeName = "ContentBlockDelta",
+            seeAlso = {ContentBlockDeltaText.class, ContentBlockDeltaThinking.class, ContentBlockDeltaInputJson.class})
+    public abstract static class ContentBlockDelta<C> implements AssistantContent<C> {
+        /**
+         * The type of the content block delta.
+         */
+        protected String type;
+        /**
+         * The message ID.
+         */
+        protected String messageId;
+
+        @Override
+        public String getType() {
+            return type;
+        }
+
+        /**
+         * Sets the type of the content block delta.
+         *
+         * @param type The type of the content block delta
+         */
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        @Override
+        public String getMessageId() {
+            return messageId;
+        }
+
+        /**
+         * Sets the message ID.
+         *
+         * @param messageId The message ID
+         */
+        public void setMessageId(String messageId) {
+            this.messageId = messageId;
+        }
+
+        public String toString() {
+            return JSON.toJSONString(this);
+        }
+    }
+
+    /**
+     * Represents a text delta.
+     */
+    @JSONType(typeKey = "type", typeName = "text_delta")
+    public static class ContentBlockDeltaText extends ContentBlockDelta<String> implements TextAssistantContent {
+        /**
+         * The text content.
+         */
+        private String text;
+
+        /**
+         * Gets the text content.
+         *
+         * @return The text content
+         */
+        public String getText() {
+            return text;
+        }
+
+        /**
+         * Sets the text content.
+         *
+         * @param text The text content
+         */
+        public void setText(String text) {
+            this.text = text;
+        }
+
+        @Override
+        public String getContentOfAssistant() {
+            return text;
+        }
+    }
+
+    /**
+     * Represents a thinking delta.
+     */
+    @JSONType(typeKey = "type", typeName = "thinking_delta")
+    public static class ContentBlockDeltaThinking extends ContentBlockDelta<String> implements ThingkingAssistantContent {
+        /**
+         * The thinking content.
+         */
+        private String thinking;
+
+        /**
+         * Gets the thinking content.
+         *
+         * @return The thinking content
+         */
+        public String getThinking() {
+            return thinking;
+        }
+
+        /**
+         * Sets the thinking content.
+         *
+         * @param thinking The thinking content
+         */
+        public void setThinking(String thinking) {
+            this.thinking = thinking;
+        }
+
+        @Override
+        public String getContentOfAssistant() {
+            return thinking;
+        }
+    }
+
+    /**
+     * Represents an input JSON delta.
+     */
+    @JSONType(typeKey = "type", typeName = "input_json_delta")
+    public static class ContentBlockDeltaInputJson extends ContentBlockDelta<Map<String, Object>> implements ToolUseAssistantContent {
+        /**
+         * The partial JSON content.
+         */
+        @JSONField(name = "partial_json")
+        private String partialJson;
+
+        /**
+         * Gets the partial JSON content.
+         *
+         * @return The partial JSON content
+         */
+        public String getPartialJson() {
+            return partialJson;
+        }
+
+        /**
+         * Sets the partial JSON content.
+         *
+         * @param partialJson The partial JSON content
+         */
+        public void setPartialJson(String partialJson) {
+            this.partialJson = partialJson;
+        }
+
+        @Override
+        public Map<String, Object> getContentOfAssistant() {
+            return getInput();
+        }
+
+        @Override
+        public Map<String, Object> getInput() {
+            return JSON.parseObject(partialJson, new TypeReference<Map<String, Object>>() {});
+        }
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/assistant/event/ContentBlockStartEvent.java

@@ -0,0 +1,25 @@
+package com.alibaba.qwen.code.cli.protocol.message.assistant.event;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONType;
+import com.alibaba.qwen.code.cli.protocol.message.assistant.block.ContentBlock;
+
+/**
+ * Represents a content block start event during message streaming.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "type", typeName = "content_block_start")
+public class ContentBlockStartEvent extends StreamEvent{
+    /**
+     * The index of the content block.
+     */
+    private int index;
+
+    /**
+     * The content block that is starting.
+     */
+    @JSONField(name = "content_block")
+    private ContentBlock contentBlock;
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/assistant/event/ContentBlockStopEvent.java

@@ -0,0 +1,35 @@
+package com.alibaba.qwen.code.cli.protocol.message.assistant.event;
+
+import com.alibaba.fastjson2.annotation.JSONType;
+
+/**
+ * Represents a content block stop event during message streaming.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "type", typeName = "content_block_stop")
+public class ContentBlockStopEvent extends StreamEvent{
+    /**
+     * The index of the content block.
+     */
+    Long index;
+
+    /**
+     * Gets the index of the content block.
+     *
+     * @return The index of the content block
+     */
+    public Long getIndex() {
+        return index;
+    }
+
+    /**
+     * Sets the index of the content block.
+     *
+     * @param index The index of the content block
+     */
+    public void setIndex(Long index) {
+        this.index = index;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/assistant/event/MessageStartStreamEvent.java

@@ -0,0 +1,107 @@
+package com.alibaba.qwen.code.cli.protocol.message.assistant.event;
+
+import com.alibaba.fastjson2.annotation.JSONType;
+
+/**
+ * Represents a message start event during message streaming.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeName = "message_start")
+public class MessageStartStreamEvent extends StreamEvent{
+    /**
+     * The message that is starting.
+     */
+    private Message message;
+
+    /**
+     * Represents the message information.
+     */
+    public static class Message {
+        /**
+         * Message ID.
+         */
+        private String id;
+        /**
+         * Message role.
+         */
+        private String role;
+        /**
+         * Message model.
+         */
+        private String model;
+
+        /**
+         * Gets the message ID.
+         *
+         * @return The message ID
+         */
+        public String getId() {
+            return id;
+        }
+
+        /**
+         * Sets the message ID.
+         *
+         * @param id The message ID
+         */
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        /**
+         * Gets the message role.
+         *
+         * @return The message role
+         */
+        public String getRole() {
+            return role;
+        }
+
+        /**
+         * Sets the message role.
+         *
+         * @param role The message role
+         */
+        public void setRole(String role) {
+            this.role = role;
+        }
+
+        /**
+         * Gets the message model.
+         *
+         * @return The message model
+         */
+        public String getModel() {
+            return model;
+        }
+
+        /**
+         * Sets the message model.
+         *
+         * @param model The message model
+         */
+        public void setModel(String model) {
+            this.model = model;
+        }
+    }
+
+    /**
+     * Gets the message that is starting.
+     *
+     * @return The message that is starting
+     */
+    public Message getMessage() {
+        return message;
+    }
+
+    /**
+     * Sets the message that is starting.
+     *
+     * @param message The message that is starting
+     */
+    public void setMessage(Message message) {
+        this.message = message;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/assistant/event/MessageStopStreamEvent.java

@@ -0,0 +1,13 @@
+package com.alibaba.qwen.code.cli.protocol.message.assistant.event;
+
+import com.alibaba.fastjson2.annotation.JSONType;
+
+/**
+ * Represents a message stop event during message streaming.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeName = "message_stop")
+public class MessageStopStreamEvent extends StreamEvent{
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/assistant/event/StreamEvent.java

@@ -0,0 +1,37 @@
+package com.alibaba.qwen.code.cli.protocol.message.assistant.event;
+
+import com.alibaba.fastjson2.annotation.JSONType;
+
+/**
+ * Base class for stream events during message streaming.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "type", typeName = "StreamEvent",
+        seeAlso = {MessageStartStreamEvent.class, MessageStopStreamEvent.class, ContentBlockStartEvent.class, ContentBlockStopEvent.class,
+                ContentBlockDeltaEvent.class})
+public class StreamEvent {
+    /**
+     * The type of the stream event.
+     */
+    protected String type;
+
+    /**
+     * Gets the type of the stream event.
+     *
+     * @return The type of the stream event
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the type of the stream event.
+     *
+     * @param type The type of the stream event
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/control/CLIControlRequest.java

@@ -0,0 +1,90 @@
+package com.alibaba.qwen.code.cli.protocol.message.control;
+
+import java.util.UUID;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONType;
+import com.alibaba.qwen.code.cli.protocol.message.MessageBase;
+import com.alibaba.qwen.code.cli.protocol.message.control.payload.ControlRequestPayload;
+
+/**
+ * Represents a control request to the CLI.
+ *
+ * @param <R> The type of the request object
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "type", typeName = "control_request")
+public class CLIControlRequest<R extends ControlRequestPayload> extends MessageBase {
+    /**
+     * The ID of the request.
+     */
+    @JSONField(name = "request_id")
+    private String requestId = UUID.randomUUID().toString();
+
+    /**
+     * The actual request object.
+     */
+    private R request;
+
+    /**
+     * Creates a new CLIControlRequest instance and sets the type to "control_request".
+     */
+    public CLIControlRequest() {
+        super();
+        type = "control_request";
+    }
+
+    /**
+     * Creates a new control request with the specified request object.
+     *
+     * @param request The request object
+     * @param <T> The type of the request object
+     * @return A new control request instance
+     */
+    public static <T extends ControlRequestPayload> CLIControlRequest<T> create(T request) {
+        CLIControlRequest<T> controlRequest = new CLIControlRequest<>();
+        controlRequest.setRequest(request);
+        return controlRequest;
+    }
+
+    /**
+     * Gets the ID of the request.
+     *
+     * @return The ID of the request
+     */
+    public String getRequestId() {
+        return requestId;
+    }
+
+    /**
+     * Sets the ID of the request.
+     *
+     * @param requestId The ID of the request
+     * @return This instance for method chaining
+     */
+    public CLIControlRequest<R> setRequestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    /**
+     * Gets the actual request object.
+     *
+     * @return The actual request object
+     */
+    public R getRequest() {
+        return request;
+    }
+
+    /**
+     * Sets the actual request object.
+     *
+     * @param request The actual request object
+     * @return This instance for method chaining
+     */
+    public CLIControlRequest<R> setRequest(R request) {
+        this.request = request;
+        return this;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/control/CLIControlResponse.java

@@ -0,0 +1,138 @@
+package com.alibaba.qwen.code.cli.protocol.message.control;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONType;
+import com.alibaba.qwen.code.cli.protocol.message.MessageBase;
+
+/**
+ * Represents a control response from the CLI.
+ *
+ * @param <R> The type of the response object
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "type", typeName = "control_response")
+public class CLIControlResponse<R> extends MessageBase {
+    /**
+     * The response object.
+     */
+    private Response<R> response;
+
+    /**
+     * Creates a new CLIControlResponse instance and sets the type to "control_response".
+     */
+    public CLIControlResponse() {
+        super();
+        this.type = "control_response";
+    }
+
+    /**
+     * Gets the response object.
+     *
+     * @return The response object
+     */
+    public Response<R> getResponse() {
+        return response;
+    }
+
+    /**
+     * Sets the response object.
+     *
+     * @param response The response object
+     */
+    public void setResponse(Response<R> response) {
+        this.response = response;
+    }
+
+    /**
+     * Creates a new response object.
+     *
+     * @return A new response object
+     */
+    public Response<R> createResponse() {
+        Response<R> response = new Response<>();
+        this.setResponse(response);
+        return response;
+    }
+
+    /**
+     * Represents the response information.
+     *
+     * @param <R> The type of the response object
+     */
+    public static class Response<R> {
+        /**
+         * The ID of the request.
+         */
+        @JSONField(name = "request_id")
+        private String requestId;
+        /**
+         * The subtype of the response.
+         */
+        private String subtype = "success";
+        /**
+         * The actual response.
+         */
+        R response;
+
+        /**
+         * Gets the ID of the request.
+         *
+         * @return The ID of the request
+         */
+        public String getRequestId() {
+            return requestId;
+        }
+
+        /**
+         * Sets the ID of the request.
+         *
+         * @param requestId The ID of the request
+         * @return This instance for method chaining
+         */
+        public Response<R> setRequestId(String requestId) {
+            this.requestId = requestId;
+            return this;
+        }
+
+        /**
+         * Gets the subtype of the response.
+         *
+         * @return The subtype of the response
+         */
+        public String getSubtype() {
+            return subtype;
+        }
+
+        /**
+         * Sets the subtype of the response.
+         *
+         * @param subtype The subtype of the response
+         * @return This instance for method chaining
+         */
+        public Response<R> setSubtype(String subtype) {
+            this.subtype = subtype;
+            return this;
+        }
+
+        /**
+         * Gets the actual response.
+         *
+         * @return The actual response
+         */
+        public R getResponse() {
+            return response;
+        }
+
+        /**
+         * Sets the actual response.
+         *
+         * @param response The actual response
+         * @return This instance for method chaining
+         */
+        public Response<R> setResponse(R response) {
+            this.response = response;
+            return this;
+        }
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/control/payload/CLIControlInitializeRequest.java

@@ -0,0 +1,45 @@
+package com.alibaba.qwen.code.cli.protocol.message.control.payload;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONType;
+import com.alibaba.qwen.code.cli.protocol.data.InitializeConfig;
+
+/**
+ * Represents a control initialize request to the CLI.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "subtype", typeName = "initialize")
+public class CLIControlInitializeRequest extends ControlRequestPayload {
+    public CLIControlInitializeRequest() {
+        super();
+        this.subtype = "initialize";
+    }
+
+    /**
+     * The initialization configuration.
+     */
+    @JSONField(unwrapped = true)
+    InitializeConfig initializeConfig = new InitializeConfig();
+
+    /**
+     * Gets the initialization configuration.
+     *
+     * @return The initialization configuration
+     */
+    public InitializeConfig getInitializeConfig() {
+        return initializeConfig;
+    }
+
+    /**
+     * Sets the initialization configuration.
+     *
+     * @param initializeConfig The initialization configuration
+     * @return This instance for method chaining
+     */
+    public CLIControlInitializeRequest setInitializeConfig(InitializeConfig initializeConfig) {
+        this.initializeConfig = initializeConfig;
+        return this;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/control/payload/CLIControlInitializeResponse.java

@@ -0,0 +1,41 @@
+package com.alibaba.qwen.code.cli.protocol.message.control.payload;
+
+import com.alibaba.fastjson2.annotation.JSONType;
+import com.alibaba.qwen.code.cli.protocol.data.Capabilities;
+
+/**
+ * Represents a control initialize response from the CLI.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "subtype", typeName = "initialize")
+public class CLIControlInitializeResponse extends ControlResponsePayload {
+    public CLIControlInitializeResponse() {
+        super();
+        this.subtype = "initialize";
+    }
+
+    /**
+     * The capabilities' information.
+     */
+    Capabilities capabilities;
+
+    /**
+     * Gets the capabilities information.
+     *
+     * @return The capabilities information
+     */
+    public Capabilities getCapabilities() {
+        return capabilities;
+    }
+
+    /**
+     * Sets the capabilities information.
+     *
+     * @param capabilities The capabilities information
+     */
+    public void setCapabilities(Capabilities capabilities) {
+        this.capabilities = capabilities;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/control/payload/CLIControlInterruptRequest.java

@@ -0,0 +1,17 @@
+package com.alibaba.qwen.code.cli.protocol.message.control.payload;
+
+import com.alibaba.fastjson2.annotation.JSONType;
+
+/**
+ * Represents a control interrupt request to the CLI.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "subtype", typeName = "interrupt")
+public class CLIControlInterruptRequest extends ControlRequestPayload {
+    public CLIControlInterruptRequest() {
+        super();
+        setSubtype("interrupt");
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/control/payload/CLIControlPermissionRequest.java

@@ -0,0 +1,235 @@
+package com.alibaba.qwen.code.cli.protocol.message.control.payload;
+
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONType;
+
+/**
+ * Represents a control permission request to the CLI.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "subtype", typeName = "can_use_tool")
+public class CLIControlPermissionRequest extends ControlRequestPayload {
+    public CLIControlPermissionRequest() {
+        super();
+        this.subtype = "can_use_tool";
+    }
+
+    /**
+     * The name of the tool requesting permission.
+     */
+    @JSONField(name = "tool_name")
+    private String toolName;
+
+    /**
+     * The ID of the tool use.
+     */
+    @JSONField(name = "tool_use_id")
+    private String toolUseId;
+
+    /**
+     * The input for the tool.
+     */
+    private Map<String, Object> input;
+
+    /**
+     * List of permission suggestions.
+     */
+    @JSONField(name = "permission_suggestions")
+    private List<PermissionSuggestion> permissionSuggestions;
+
+    /**
+     * The blocked path.
+     */
+    @JSONField(name = "blocked_path")
+    private String blockedPath;
+
+    /**
+     * Gets the name of the tool requesting permission.
+     *
+     * @return The name of the tool requesting permission
+     */
+    public String getToolName() {
+        return toolName;
+    }
+
+    /**
+     * Sets the name of the tool requesting permission.
+     *
+     * @param toolName The name of the tool requesting permission
+     */
+    public void setToolName(String toolName) {
+        this.toolName = toolName;
+    }
+
+    /**
+     * Gets the ID of the tool use.
+     *
+     * @return The ID of the tool use
+     */
+    public String getToolUseId() {
+        return toolUseId;
+    }
+
+    /**
+     * Sets the ID of the tool use.
+     *
+     * @param toolUseId The ID of the tool use
+     */
+    public void setToolUseId(String toolUseId) {
+        this.toolUseId = toolUseId;
+    }
+
+    /**
+     * Gets the input for the tool.
+     *
+     * @return The input for the tool
+     */
+    public Map<String, Object> getInput() {
+        return input;
+    }
+
+    /**
+     * Sets the input for the tool.
+     *
+     * @param input The input for the tool
+     */
+    public void setInput(Map<String, Object> input) {
+        this.input = input;
+    }
+
+    /**
+     * Gets the list of permission suggestions.
+     *
+     * @return The list of permission suggestions
+     */
+    public List<PermissionSuggestion> getPermissionSuggestions() {
+        return permissionSuggestions;
+    }
+
+    /**
+     * Sets the list of permission suggestions.
+     *
+     * @param permissionSuggestions The list of permission suggestions
+     */
+    public void setPermissionSuggestions(
+            List<PermissionSuggestion> permissionSuggestions) {
+        this.permissionSuggestions = permissionSuggestions;
+    }
+
+    /**
+     * Gets the blocked path.
+     *
+     * @return The blocked path
+     */
+    public String getBlockedPath() {
+        return blockedPath;
+    }
+
+    /**
+     * Sets the blocked path.
+     *
+     * @param blockedPath The blocked path
+     */
+    public void setBlockedPath(String blockedPath) {
+        this.blockedPath = blockedPath;
+    }
+
+    /**
+     * Represents a permission suggestion.
+     */
+    public static class PermissionSuggestion {
+        /**
+         * The type of suggestion (allow, deny, modify).
+         */
+        private String type; // 'allow' | 'deny' | 'modify'
+        /**
+         * The label for the suggestion.
+         */
+        private String label;
+        /**
+         * The description of the suggestion.
+         */
+        private String description;
+        /**
+         * The modified input.
+         */
+        private Object modifiedInput;
+
+        /**
+         * Gets the type of suggestion.
+         *
+         * @return The type of suggestion
+         */
+        public String getType() {
+            return type;
+        }
+
+        /**
+         * Sets the type of suggestion.
+         *
+         * @param type The type of suggestion
+         */
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        /**
+         * Gets the label for the suggestion.
+         *
+         * @return The label for the suggestion
+         */
+        public String getLabel() {
+            return label;
+        }
+
+        /**
+         * Sets the label for the suggestion.
+         *
+         * @param label The label for the suggestion
+         */
+        public void setLabel(String label) {
+            this.label = label;
+        }
+
+        /**
+         * Gets the description of the suggestion.
+         *
+         * @return The description of the suggestion
+         */
+        public String getDescription() {
+            return description;
+        }
+
+        /**
+         * Sets the description of the suggestion.
+         *
+         * @param description The description of the suggestion
+         */
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
+        /**
+         * Gets the modified input.
+         *
+         * @return The modified input
+         */
+        public Object getModifiedInput() {
+            return modifiedInput;
+        }
+
+        /**
+         * Sets the modified input.
+         *
+         * @param modifiedInput The modified input
+         */
+        public void setModifiedInput(Object modifiedInput) {
+            this.modifiedInput = modifiedInput;
+        }
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/control/payload/CLIControlPermissionResponse.java

@@ -0,0 +1,45 @@
+package com.alibaba.qwen.code.cli.protocol.message.control.payload;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONType;
+import com.alibaba.qwen.code.cli.protocol.data.behavior.Behavior;
+
+/**
+ * Represents a control permission response from the CLI.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "subtype", typeName = "can_use_tool")
+public class CLIControlPermissionResponse extends ControlResponsePayload {
+    public CLIControlPermissionResponse() {
+        super();
+        this.subtype = "can_use_tool";
+    }
+
+    /**
+     * The behavior for the permission request.
+     */
+    @JSONField(unwrapped = true)
+    Behavior behavior;
+
+    /**
+     * Gets the behavior for the permission request.
+     *
+     * @return The behavior for the permission request
+     */
+    public Behavior getBehavior() {
+        return behavior;
+    }
+
+    /**
+     * Sets the behavior for the permission request.
+     *
+     * @param behavior The behavior for the permission request
+     * @return This instance for method chaining
+     */
+    public CLIControlPermissionResponse setBehavior(Behavior behavior) {
+        this.behavior = behavior;
+        return this;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/control/payload/CLIControlSetModelRequest.java

@@ -0,0 +1,40 @@
+package com.alibaba.qwen.code.cli.protocol.message.control.payload;
+
+import com.alibaba.fastjson2.annotation.JSONType;
+
+/**
+ * Represents a control request to set the model in the CLI.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "subtype", typeName = "set_model")
+public class CLIControlSetModelRequest extends ControlRequestPayload {
+    public CLIControlSetModelRequest() {
+        super();
+        this.subtype = "set_model";
+    }
+
+    /**
+     * The model to set.
+     */
+    String model;
+
+    /**
+     * Gets the model to set.
+     *
+     * @return The model to set
+     */
+    public String getModel() {
+        return model;
+    }
+
+    /**
+     * Sets the model to set.
+     *
+     * @param model The model to set
+     */
+    public void setModel(String model) {
+        this.model = model;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/control/payload/CLIControlSetModelResponse.java

@@ -0,0 +1,54 @@
+package com.alibaba.qwen.code.cli.protocol.message.control.payload;
+
+/**
+ * Represents a control response for setting the model in the CLI.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+public class CLIControlSetModelResponse {
+    /**
+     * The subtype of the response ("set_model").
+     */
+    String subtype = "set_model";
+    /**
+     * The model that was set.
+     */
+    String model;
+
+    /**
+     * Gets the subtype of the response.
+     *
+     * @return The subtype of the response
+     */
+    public String getSubtype() {
+        return subtype;
+    }
+
+    /**
+     * Sets the subtype of the response.
+     *
+     * @param subtype The subtype of the response
+     */
+    public void setSubtype(String subtype) {
+        this.subtype = subtype;
+    }
+
+    /**
+     * Gets the model that was set.
+     *
+     * @return The model that was set
+     */
+    public String getModel() {
+        return model;
+    }
+
+    /**
+     * Sets the model that was set.
+     *
+     * @param model The model that was set
+     */
+    public void setModel(String model) {
+        this.model = model;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/control/payload/CLIControlSetPermissionModeRequest.java

@@ -0,0 +1,40 @@
+package com.alibaba.qwen.code.cli.protocol.message.control.payload;
+
+import com.alibaba.fastjson2.annotation.JSONType;
+
+/**
+ * Represents a control request to set the permission mode in the CLI.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "subtype", typeName = "set_permission_mode")
+public class CLIControlSetPermissionModeRequest extends ControlRequestPayload {
+    public CLIControlSetPermissionModeRequest() {
+        super();
+        setSubtype("set_permission_mode");
+    }
+
+    /**
+     * The permission mode to set.
+     */
+    String mode;
+
+    /**
+     * Gets the permission mode to set.
+     *
+     * @return The permission mode to set
+     */
+    public String getMode() {
+        return mode;
+    }
+
+    /**
+     * Sets the permission mode to set.
+     *
+     * @param mode The permission mode to set
+     */
+    public void setMode(String mode) {
+        this.mode = mode;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/control/payload/ControlRequestPayload.java

@@ -0,0 +1,26 @@
+package com.alibaba.qwen.code.cli.protocol.message.control.payload;
+
+import com.alibaba.fastjson2.annotation.JSONType;
+
+/**
+ * Represents a payload request in the CLI control message.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "subtype", typeName = "ControlRequestPayload",
+        seeAlso = {CLIControlInitializeRequest.class, CLIControlInterruptRequest.class, CLIControlPermissionRequest.class, CLIControlSetModelRequest.class, CLIControlSetPermissionModeRequest.class})
+public class ControlRequestPayload {
+    /**
+     * The subtype of the request.
+     */
+    protected String subtype;
+
+    public String getSubtype() {
+        return subtype;
+    }
+
+    public void setSubtype(String subtype) {
+        this.subtype = subtype;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/message/control/payload/ControlResponsePayload.java

@@ -0,0 +1,26 @@
+package com.alibaba.qwen.code.cli.protocol.message.control.payload;
+
+import com.alibaba.fastjson2.annotation.JSONType;
+
+/**
+ * Represents a payload request in the CLI control message.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+@JSONType(typeKey = "subtype", typeName = "ControlResponsePayload",
+        seeAlso = {CLIControlInitializeResponse.class, CLIControlPermissionResponse.class})
+public class ControlResponsePayload {
+    /**
+     * The subtype of the request.
+     */
+    protected String subtype;
+
+    public String getSubtype() {
+        return subtype;
+    }
+
+    public void setSubtype(String subtype) {
+        this.subtype = subtype;
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/protocol/protocol.ts

@@ -0,0 +1,594 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+export interface Annotation {
+  type: string;
+  value: string;
+}
+
+export interface Usage {
+  input_tokens: number;
+  output_tokens: number;
+  cache_creation_input_tokens?: number;
+  cache_read_input_tokens?: number;
+  total_tokens?: number;
+}
+
+export interface ExtendedUsage extends Usage {
+  server_tool_use?: {
+    web_search_requests: number;
+  };
+  service_tier?: string;
+  cache_creation?: {
+    ephemeral_1h_input_tokens: number;
+    ephemeral_5m_input_tokens: number;
+  };
+}
+
+export interface ModelUsage {
+  inputTokens: number;
+  outputTokens: number;
+  cacheReadInputTokens: number;
+  cacheCreationInputTokens: number;
+  webSearchRequests: number;
+  contextWindow: number;
+}
+
+export interface CLIPermissionDenial {
+  tool_name: string;
+  tool_use_id: string;
+  tool_input: unknown;
+}
+
+export interface TextBlock {
+  type: 'text';
+  text: string;
+  annotations?: Annotation[];
+}
+
+export interface ThinkingBlock {
+  type: 'thinking';
+  thinking: string;
+  signature?: string;
+  annotations?: Annotation[];
+}
+
+export interface ToolUseBlock {
+  type: 'tool_use';
+  id: string;
+  name: string;
+  input: unknown;
+  annotations?: Annotation[];
+}
+
+export interface ToolResultBlock {
+  type: 'tool_result';
+  tool_use_id: string;
+  content?: string | ContentBlock[];
+  is_error?: boolean;
+  annotations?: Annotation[];
+}
+
+export type ContentBlock =
+  | TextBlock
+  | ThinkingBlock
+  | ToolUseBlock
+  | ToolResultBlock;
+
+export interface APIUserMessage {
+  role: 'user';
+  content: string | ContentBlock[];
+}
+
+export interface APIAssistantMessage {
+  id: string;
+  type: 'message';
+  role: 'assistant';
+  model: string;
+  content: ContentBlock[];
+  stop_reason?: string | null;
+  usage: Usage;
+}
+
+export interface SDKUserMessage {
+  type: 'user';
+  uuid?: string;
+  session_id: string;
+  message: APIUserMessage;
+  parent_tool_use_id: string | null;
+  options?: Record<string, unknown>;
+}
+
+export interface SDKAssistantMessage {
+  type: 'assistant';
+  uuid: string;
+  session_id: string;
+  message: APIAssistantMessage;
+  parent_tool_use_id: string | null;
+}
+
+export interface SDKSystemMessage {
+  type: 'system';
+  subtype: string;
+  uuid: string;
+  session_id: string;
+  data?: unknown;
+  cwd?: string;
+  tools?: string[];
+  mcp_servers?: Array<{
+    name: string;
+    status: string;
+  }>;
+  model?: string;
+  permission_mode?: string;
+  slash_commands?: string[];
+  qwen_code_version?: string;
+  output_style?: string;
+  agents?: string[];
+  skills?: string[];
+  capabilities?: Record<string, unknown>;
+  compact_metadata?: {
+    trigger: 'manual' | 'auto';
+    pre_tokens: number;
+  };
+}
+
+export interface SDKResultMessageSuccess {
+  type: 'result';
+  subtype: 'success';
+  uuid: string;
+  session_id: string;
+  is_error: false;
+  duration_ms: number;
+  duration_api_ms: number;
+  num_turns: number;
+  result: string;
+  usage: ExtendedUsage;
+  modelUsage?: Record<string, ModelUsage>;
+  permission_denials: CLIPermissionDenial[];
+  [key: string]: unknown;
+}
+
+export interface SDKResultMessageError {
+  type: 'result';
+  subtype: 'error_max_turns' | 'error_during_execution';
+  uuid: string;
+  session_id: string;
+  is_error: true;
+  duration_ms: number;
+  duration_api_ms: number;
+  num_turns: number;
+  usage: ExtendedUsage;
+  modelUsage?: Record<string, ModelUsage>;
+  permission_denials: CLIPermissionDenial[];
+  error?: {
+    type?: string;
+    message: string;
+    [key: string]: unknown;
+  };
+  [key: string]: unknown;
+}
+
+export type SDKResultMessage = SDKResultMessageSuccess | SDKResultMessageError;
+
+export interface MessageStartStreamEvent {
+  type: 'message_start';
+  message: {
+    id: string;
+    role: 'assistant';
+    model: string;
+  };
+}
+
+export interface ContentBlockStartEvent {
+  type: 'content_block_start';
+  index: number;
+  content_block: ContentBlock;
+}
+
+export type ContentBlockDelta =
+  | {
+      type: 'text_delta';
+      text: string;
+    }
+  | {
+      type: 'thinking_delta';
+      thinking: string;
+    }
+  | {
+      type: 'input_json_delta';
+      partial_json: string;
+    };
+
+export interface ContentBlockDeltaEvent {
+  type: 'content_block_delta';
+  index: number;
+  delta: ContentBlockDelta;
+}
+
+export interface ContentBlockStopEvent {
+  type: 'content_block_stop';
+  index: number;
+}
+
+export interface MessageStopStreamEvent {
+  type: 'message_stop';
+}
+
+export type StreamEvent =
+  | MessageStartStreamEvent
+  | ContentBlockStartEvent
+  | ContentBlockDeltaEvent
+  | ContentBlockStopEvent
+  | MessageStopStreamEvent;
+
+export interface SDKPartialAssistantMessage {
+  type: 'stream_event';
+  uuid: string;
+  session_id: string;
+  event: StreamEvent;
+  parent_tool_use_id: string | null;
+}
+
+export type PermissionMode = 'default' | 'plan' | 'auto-edit' | 'yolo';
+
+/**
+ * TODO: Align with `ToolCallConfirmationDetails`
+ */
+export interface PermissionSuggestion {
+  type: 'allow' | 'deny' | 'modify';
+  label: string;
+  description?: string;
+  modifiedInput?: unknown;
+}
+
+export interface HookRegistration {
+  event: string;
+  callback_id: string;
+}
+
+export interface HookCallbackResult {
+  shouldSkip?: boolean;
+  shouldInterrupt?: boolean;
+  suppressOutput?: boolean;
+  message?: string;
+}
+
+export interface CLIControlInterruptRequest {
+  subtype: 'interrupt';
+}
+
+export interface CLIControlPermissionRequest {
+  subtype: 'can_use_tool';
+  tool_name: string;
+  tool_use_id: string;
+  input: unknown;
+  permission_suggestions: PermissionSuggestion[] | null;
+  blocked_path: string | null;
+}
+
+export enum AuthProviderType {
+  DYNAMIC_DISCOVERY = 'dynamic_discovery',
+  GOOGLE_CREDENTIALS = 'google_credentials',
+  SERVICE_ACCOUNT_IMPERSONATION = 'service_account_impersonation',
+}
+
+export interface MCPServerConfig {
+  command?: string;
+  args?: string[];
+  env?: Record<string, string>;
+  cwd?: string;
+  url?: string;
+  httpUrl?: string;
+  headers?: Record<string, string>;
+  tcp?: string;
+  timeout?: number;
+  trust?: boolean;
+  description?: string;
+  includeTools?: string[];
+  excludeTools?: string[];
+  extensionName?: string;
+  oauth?: Record<string, unknown>;
+  authProviderType?: AuthProviderType;
+  targetAudience?: string;
+  targetServiceAccount?: string;
+}
+
+/**
+ * SDK MCP Server configuration
+ *
+ * SDK MCP servers run in the SDK process and are connected via in-memory transport.
+ * Tool calls are routed through the control plane between SDK and CLI.
+ */
+export interface SDKMcpServerConfig {
+  /**
+   * Type identifier for SDK MCP servers
+   */
+  type: 'sdk';
+  /**
+   * Server name for identification and routing
+   */
+  name: string;
+  /**
+   * The MCP Server instance created by createSdkMcpServer()
+   */
+  instance: McpServer;
+}
+
+/**
+ * Wire format for SDK MCP servers sent to the CLI
+ */
+export type WireSDKMcpServerConfig = Omit<SDKMcpServerConfig, 'instance'>;
+
+export interface CLIControlInitializeRequest {
+  subtype: 'initialize';
+  hooks?: HookRegistration[] | null;
+  /**
+   * SDK MCP servers config
+   * These are MCP servers running in the SDK process, connected via control plane.
+   * External MCP servers are configured separately in settings, not via initialization.
+   */
+  sdkMcpServers?: Record<string, WireSDKMcpServerConfig>;
+  /**
+   * External MCP servers that should be managed by the CLI.
+   */
+  mcpServers?: Record<string, MCPServerConfig>;
+  agents?: SubagentConfig[];
+}
+
+export interface CLIControlSetPermissionModeRequest {
+  subtype: 'set_permission_mode';
+  mode: PermissionMode;
+}
+
+export interface CLIHookCallbackRequest {
+  subtype: 'hook_callback';
+  callback_id: string;
+  input: unknown;
+  tool_use_id: string | null;
+}
+
+export interface CLIControlMcpMessageRequest {
+  subtype: 'mcp_message';
+  server_name: string;
+  message: {
+    jsonrpc?: string;
+    method: string;
+    params?: Record<string, unknown>;
+    id?: string | number | null;
+  };
+}
+
+export interface CLIControlSetModelRequest {
+  subtype: 'set_model';
+  model: string;
+}
+
+export interface CLIControlMcpStatusRequest {
+  subtype: 'mcp_server_status';
+}
+
+export interface CLIControlSupportedCommandsRequest {
+  subtype: 'supported_commands';
+}
+
+export type ControlRequestPayload =
+  | CLIControlInterruptRequest
+  | CLIControlPermissionRequest
+  | CLIControlInitializeRequest
+  | CLIControlSetPermissionModeRequest
+  | CLIHookCallbackRequest
+  | CLIControlMcpMessageRequest
+  | CLIControlSetModelRequest
+  | CLIControlMcpStatusRequest
+  | CLIControlSupportedCommandsRequest;
+
+export interface CLIControlRequest {
+  type: 'control_request';
+  request_id: string;
+  request: ControlRequestPayload;
+}
+
+export interface PermissionApproval {
+  allowed: boolean;
+  reason?: string;
+  modifiedInput?: unknown;
+}
+
+export interface ControlResponse {
+  subtype: 'success';
+  request_id: string;
+  response: unknown;
+}
+
+export interface ControlErrorResponse {
+  subtype: 'error';
+  request_id: string;
+  error: string | { message: string; [key: string]: unknown };
+}
+
+export interface CLIControlResponse {
+  type: 'control_response';
+  response: ControlResponse | ControlErrorResponse;
+}
+
+export interface ControlCancelRequest {
+  type: 'control_cancel_request';
+  request_id?: string;
+}
+
+export type ControlMessage =
+  | CLIControlRequest
+  | CLIControlResponse
+  | ControlCancelRequest;
+
+/**
+ * Union of all SDK message types
+ */
+export type SDKMessage =
+  | SDKUserMessage
+  | SDKAssistantMessage
+  | SDKSystemMessage
+  | SDKResultMessage
+  | SDKPartialAssistantMessage;
+
+export function isSDKUserMessage(msg: any): msg is SDKUserMessage {
+  return (
+    msg && typeof msg === 'object' && msg.type === 'user' && 'message' in msg
+  );
+}
+
+export function isSDKAssistantMessage(msg: any): msg is SDKAssistantMessage {
+  return (
+    msg &&
+    typeof msg === 'object' &&
+    msg.type === 'assistant' &&
+    'uuid' in msg &&
+    'message' in msg &&
+    'session_id' in msg &&
+    'parent_tool_use_id' in msg
+  );
+}
+
+export function isSDKSystemMessage(msg: any): msg is SDKSystemMessage {
+  return (
+    msg &&
+    typeof msg === 'object' &&
+    msg.type === 'system' &&
+    'subtype' in msg &&
+    'uuid' in msg &&
+    'session_id' in msg
+  );
+}
+
+export function isSDKResultMessage(msg: any): msg is SDKResultMessage {
+  return (
+    msg &&
+    typeof msg === 'object' &&
+    msg.type === 'result' &&
+    'subtype' in msg &&
+    'duration_ms' in msg &&
+    'is_error' in msg &&
+    'uuid' in msg &&
+    'session_id' in msg
+  );
+}
+
+export function isSDKPartialAssistantMessage(
+  msg: any,
+): msg is SDKPartialAssistantMessage {
+  return (
+    msg &&
+    typeof msg === 'object' &&
+    msg.type === 'stream_event' &&
+    'uuid' in msg &&
+    'session_id' in msg &&
+    'event' in msg &&
+    'parent_tool_use_id' in msg
+  );
+}
+
+export function isControlRequest(msg: any): msg is CLIControlRequest {
+  return (
+    msg &&
+    typeof msg === 'object' &&
+    msg.type === 'control_request' &&
+    'request_id' in msg &&
+    'request' in msg
+  );
+}
+
+export function isControlResponse(msg: any): msg is CLIControlResponse {
+  return (
+    msg &&
+    typeof msg === 'object' &&
+    msg.type === 'control_response' &&
+    'response' in msg
+  );
+}
+
+export function isControlCancel(msg: any): msg is ControlCancelRequest {
+  return (
+    msg &&
+    typeof msg === 'object' &&
+    msg.type === 'control_cancel_request' &&
+    'request_id' in msg
+  );
+}
+
+export function isTextBlock(block: any): block is TextBlock {
+  return block && typeof block === 'object' && block.type === 'text';
+}
+
+export function isThinkingBlock(block: any): block is ThinkingBlock {
+  return block && typeof block === 'object' && block.type === 'thinking';
+}
+
+export function isToolUseBlock(block: any): block is ToolUseBlock {
+  return block && typeof block === 'object' && block.type === 'tool_use';
+}
+
+export function isToolResultBlock(block: any): block is ToolResultBlock {
+  return block && typeof block === 'object' && block.type === 'tool_result';
+}
+
+export type SubagentLevel = 'session';
+
+export interface ModelConfig {
+  model?: string;
+  temp?: number;
+  top_p?: number;
+}
+
+export interface RunConfig {
+  max_time_minutes?: number;
+  max_turns?: number;
+}
+
+export interface SubagentConfig {
+  name: string;
+  description: string;
+  tools?: string[];
+  systemPrompt: string;
+  level: SubagentLevel;
+  filePath?: string;
+  modelConfig?: Partial<ModelConfig>;
+  runConfig?: Partial<RunConfig>;
+  color?: string;
+  readonly isBuiltin?: boolean;
+}
+
+/**
+ * @license
+ * Copyright 2025 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Control Request Types
+ *
+ * Centralized enum for all control request subtypes supported by the CLI.
+ * This enum should be kept in sync with the controllers in:
+ * - packages/cli/src/services/control/controllers/systemController.ts
+ * - packages/cli/src/services/control/controllers/permissionController.ts
+ * - packages/cli/src/services/control/controllers/mcpController.ts
+ * - packages/cli/src/services/control/controllers/hookController.ts
+ */
+export enum ControlRequestType {
+  // SystemController requests
+  INITIALIZE = 'initialize',
+  INTERRUPT = 'interrupt',
+  SET_MODEL = 'set_model',
+  SUPPORTED_COMMANDS = 'supported_commands',
+
+  // PermissionController requests
+  CAN_USE_TOOL = 'can_use_tool',
+  SET_PERMISSION_MODE = 'set_permission_mode',
+
+  // MCPController requests
+  MCP_MESSAGE = 'mcp_message',
+  MCP_SERVER_STATUS = 'mcp_server_status',
+
+  // HookController requests
+  HOOK_CALLBACK = 'hook_callback',
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/session/Session.java

@@ -0,0 +1,302 @@
+package com.alibaba.qwen.code.cli.session;
+
+import java.util.Optional;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.JSONReader.Feature;
+import com.alibaba.fastjson2.TypeReference;
+import com.alibaba.qwen.code.cli.protocol.data.Capabilities;
+import com.alibaba.qwen.code.cli.protocol.data.PermissionMode;
+import com.alibaba.qwen.code.cli.protocol.message.SDKResultMessage;
+import com.alibaba.qwen.code.cli.protocol.message.SDKSystemMessage;
+import com.alibaba.qwen.code.cli.protocol.message.SDKUserMessage;
+import com.alibaba.qwen.code.cli.protocol.message.assistant.SDKAssistantMessage;
+import com.alibaba.qwen.code.cli.protocol.message.assistant.SDKPartialAssistantMessage;
+import com.alibaba.qwen.code.cli.protocol.message.control.payload.CLIControlInitializeRequest;
+import com.alibaba.qwen.code.cli.protocol.message.control.payload.CLIControlInitializeResponse;
+import com.alibaba.qwen.code.cli.protocol.message.control.payload.CLIControlInterruptRequest;
+import com.alibaba.qwen.code.cli.protocol.message.control.CLIControlRequest;
+import com.alibaba.qwen.code.cli.protocol.message.control.CLIControlResponse;
+import com.alibaba.qwen.code.cli.protocol.message.control.payload.CLIControlSetModelRequest;
+import com.alibaba.qwen.code.cli.protocol.message.control.payload.CLIControlSetPermissionModeRequest;
+import com.alibaba.qwen.code.cli.protocol.message.control.payload.ControlRequestPayload;
+import com.alibaba.qwen.code.cli.protocol.message.control.payload.ControlResponsePayload;
+import com.alibaba.qwen.code.cli.session.event.consumers.SessionEventConsumers;
+import com.alibaba.qwen.code.cli.session.exception.SessionControlException;
+import com.alibaba.qwen.code.cli.session.exception.SessionSendPromptException;
+import com.alibaba.qwen.code.cli.transport.Transport;
+import com.alibaba.qwen.code.cli.transport.TransportOptions;
+import com.alibaba.qwen.code.cli.utils.MyConcurrentUtils;
+import com.alibaba.qwen.code.cli.utils.Timeout;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Manages a session with the Qwen Code CLI, handling communication, sending prompts, and processing responses.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+public class Session {
+    private static final Logger log = LoggerFactory.getLogger(Session.class);
+    private final Transport transport;
+    private CLIControlInitializeResponse lastCliControlInitializeResponse;
+    private SDKSystemMessage lastSdkSystemMessage;
+    private final Timeout defaultEventTimeout = Timeout.TIMEOUT_60_SECONDS;
+
+    /**
+     * Checks if the session is configured for streaming.
+     *
+     * @return true if streaming is enabled, false otherwise
+     */
+    public boolean isStreaming() {
+        return Optional.ofNullable(transport)
+                .map(Transport::getTransportOptions)
+                .map(TransportOptions::getIncludePartialMessages)
+                .orElse(false);
+    }
+
+    /**
+     * Constructs a new session with the specified transport.
+     *
+     * @param transport The transport layer to use for communication
+     * @throws com.alibaba.qwen.code.cli.session.exception.SessionControlException if the transport is not available
+     */
+    public Session(Transport transport) throws SessionControlException {
+        if (transport == null || !transport.isAvailable()) {
+            throw new SessionControlException("Transport is not available");
+        }
+        this.transport = transport;
+        start();
+    }
+
+    /**
+     * Starts the session by initializing communication with the CLI.
+     *
+     * @throws com.alibaba.qwen.code.cli.session.exception.SessionControlException if initialization fails
+     */
+    public void start() throws SessionControlException {
+        try {
+            if (!transport.isAvailable()) {
+                transport.start();
+            }
+            String response = transport.inputWaitForOneLine(CLIControlRequest.create(new CLIControlInitializeRequest()).toString());
+            CLIControlResponse<CLIControlInitializeResponse> cliControlResponse = JSON.parseObject(response,
+                    new TypeReference<CLIControlResponse<CLIControlInitializeResponse>>() {});
+            this.lastCliControlInitializeResponse = cliControlResponse.getResponse().getResponse();
+        } catch (Exception e) {
+            throw new SessionControlException("Failed to initialize the session", e);
+        }
+    }
+
+    /**
+     * Closes the session and releases resources.
+     *
+     * @throws com.alibaba.qwen.code.cli.session.exception.SessionControlException if closing fails
+     */
+    public void close() throws SessionControlException {
+        try {
+            transport.close();
+        } catch (Exception e) {
+            throw new SessionControlException("Failed to close the session", e);
+        }
+    }
+
+    /**
+     * Interrupts the current operation in the CLI.
+     *
+     * @return An optional boolean indicating success of the interrupt operation
+     * @throws com.alibaba.qwen.code.cli.session.exception.SessionControlException if the operation fails
+     */
+    public Optional<Boolean> interrupt() throws SessionControlException {
+        checkAvailable();
+        return processControlRequest(new CLIControlRequest<CLIControlInterruptRequest>().setRequest(new CLIControlInterruptRequest()).toString());
+    }
+
+    /**
+     * Sets the model to be used in the session.
+     *
+     * @param modelName The name of the model to use
+     * @return An optional boolean indicating success of the operation
+     * @throws com.alibaba.qwen.code.cli.session.exception.SessionControlException if the operation fails
+     */
+    public Optional<Boolean> setModel(String modelName) throws SessionControlException {
+        checkAvailable();
+        CLIControlSetModelRequest cliControlSetModelRequest = new CLIControlSetModelRequest();
+        cliControlSetModelRequest.setModel(modelName);
+        return processControlRequest(new CLIControlRequest<CLIControlSetModelRequest>().setRequest(cliControlSetModelRequest).toString());
+    }
+
+    /**
+     * Sets the permission mode for the session.
+     *
+     * @param permissionMode The permission mode to use
+     * @return An optional boolean indicating success of the operation
+     * @throws com.alibaba.qwen.code.cli.session.exception.SessionControlException if the operation fails
+     */
+    public Optional<Boolean> setPermissionMode(PermissionMode permissionMode) throws SessionControlException {
+        checkAvailable();
+        CLIControlSetPermissionModeRequest cliControlSetPermissionModeRequest = new CLIControlSetPermissionModeRequest();
+        cliControlSetPermissionModeRequest.setMode(permissionMode.getValue());
+        return processControlRequest(
+                new CLIControlRequest<CLIControlSetPermissionModeRequest>().setRequest(cliControlSetPermissionModeRequest).toString());
+    }
+
+    private Optional<Boolean> processControlRequest(String request) throws SessionControlException {
+        try {
+            if (transport.isReading()) {
+                transport.inputNoWaitResponse(request);
+                return Optional.empty();
+            } else {
+                String response = transport.inputWaitForOneLine(request);
+                CLIControlResponse<?> cliControlResponse = JSON.parseObject(response, new TypeReference<CLIControlResponse<?>>() {});
+                return Optional.of("success".equals(cliControlResponse.getResponse().getSubtype()));
+            }
+        } catch (Exception e) {
+            throw new SessionControlException("Failed to set model", e);
+        }
+    }
+
+    /**
+     * Continues the current session.
+     *
+     * @throws com.alibaba.qwen.code.cli.session.exception.SessionControlException if the operation fails
+     */
+    public void continueSession() throws SessionControlException {
+        resumeSession(getSessionId());
+    }
+
+    /**
+     * Resumes a session with the specified ID.
+     *
+     * @param sessionId The ID of the session to resume
+     * @throws com.alibaba.qwen.code.cli.session.exception.SessionControlException if the operation fails
+     */
+    public void resumeSession(String sessionId) throws SessionControlException {
+        if (StringUtils.isNotBlank(sessionId)) {
+            transport.getTransportOptions().setResumeSessionId(sessionId);
+        }
+        this.start();
+    }
+
+    /**
+     * Sends a prompt to the CLI and processes the response.
+     *
+     * @param prompt The prompt to send to the CLI
+     * @param sessionEventConsumers Consumers for handling different types of events
+     * @throws com.alibaba.qwen.code.cli.session.exception.SessionSendPromptException if sending the prompt fails
+     * @throws com.alibaba.qwen.code.cli.session.exception.SessionControlException if a control operation fails
+     */
+    public void sendPrompt(String prompt, SessionEventConsumers sessionEventConsumers) throws SessionSendPromptException, SessionControlException {
+        checkAvailable();
+        try {
+            transport.inputWaitForMultiLine(new SDKUserMessage().setContent(prompt).toString(), (line) -> {
+                JSONObject jsonObject = JSON.parseObject(line);
+                String messageType = jsonObject.getString("type");
+                if ("system".equals(messageType)) {
+                    lastSdkSystemMessage = jsonObject.to(SDKSystemMessage.class);
+                    MyConcurrentUtils.runAndWait(() -> sessionEventConsumers.onSystemMessage(this, lastSdkSystemMessage),
+                            Optional.ofNullable(sessionEventConsumers.onSystemMessageTimeout(this, lastSdkSystemMessage))
+                                    .orElse(defaultEventTimeout));
+                    return false;
+                } else if ("assistant".equals(messageType)) {
+                    SDKAssistantMessage assistantMessage = jsonObject.to(SDKAssistantMessage.class);
+                    MyConcurrentUtils.runAndWait(() -> sessionEventConsumers.onAssistantMessage(this, assistantMessage),
+                            Optional.ofNullable(sessionEventConsumers.onAssistantMessageTimeout(this, assistantMessage)).orElse(defaultEventTimeout));
+                    return false;
+                } else if ("stream_event".equals(messageType)) {
+                    SDKPartialAssistantMessage sdkPartialAssistantMessage = jsonObject.to(SDKPartialAssistantMessage.class);
+                    MyConcurrentUtils.runAndWait(
+                            () -> sessionEventConsumers.onPartialAssistantMessage(this, sdkPartialAssistantMessage),
+                            Optional.ofNullable(sessionEventConsumers.onPartialAssistantMessageTimeout(this, sdkPartialAssistantMessage))
+                                    .orElse(defaultEventTimeout));
+                    return false;
+                } else if ("user".equals(messageType)) {
+                    SDKUserMessage sdkUserMessage = jsonObject.to(SDKUserMessage.class, Feature.FieldBased);
+                    MyConcurrentUtils.runAndWait(
+                            () -> sessionEventConsumers.onUserMessage(this, sdkUserMessage),
+                            Optional.ofNullable(sessionEventConsumers.onUserMessageTimeout(this, sdkUserMessage)).orElse(defaultEventTimeout));
+                    return false;
+                } else if ("result".equals(messageType)) {
+                    SDKResultMessage sdkResultMessage = jsonObject.to(SDKResultMessage.class);
+                    MyConcurrentUtils.runAndWait(() -> sessionEventConsumers.onResultMessage(this, sdkResultMessage),
+                            Optional.ofNullable(sessionEventConsumers.onResultMessageTimeout(this, sdkResultMessage)).orElse(defaultEventTimeout));
+                    return true;
+                } else if ("control_response".equals(messageType)) {
+                    CLIControlResponse<? extends ControlResponsePayload> controlResponse = jsonObject.to(
+                            new TypeReference<CLIControlResponse<? extends ControlResponsePayload>>() {});
+                    MyConcurrentUtils.runAndWait(() -> sessionEventConsumers.onControlResponse(this, controlResponse),
+                            Optional.ofNullable(sessionEventConsumers.onControlResponseTimeout(this, controlResponse)).orElse(defaultEventTimeout));
+                    if (!"error".equals(jsonObject.getString("subtype"))) {
+                        return false;
+                    } else {
+                        log.info("control_response error: {}", jsonObject.toJSONString());
+                        return "error".equals(jsonObject.getString("subtype"));
+                    }
+                } else if ("control_request".equals(messageType)) {
+                    CLIControlResponse<? extends ControlResponsePayload> controlResponse;
+                    try {
+                        CLIControlRequest<? extends ControlRequestPayload> controlRequest = jsonObject.to(
+                                new TypeReference<CLIControlRequest<? extends ControlRequestPayload>>() {});
+                        controlResponse = MyConcurrentUtils.runAndWait(
+                                () -> sessionEventConsumers.onControlRequest(this, controlRequest),
+                                Optional.ofNullable(sessionEventConsumers.onControlRequestTimeout(this, controlRequest)).orElse(defaultEventTimeout));
+                    } catch (Exception e) {
+                        log.error("Failed to process control request", e);
+                        controlResponse = new CLIControlResponse<>();
+                    }
+                    try {
+                        transport.inputNoWaitResponse(Optional.ofNullable(controlResponse).map(CLIControlResponse::toString)
+                                .orElse(new CLIControlResponse<ControlResponsePayload>().toString()));
+                    } catch (Exception e) {
+                        throw new RuntimeException("Failed to send control response", e);
+                    }
+                    return false;
+                } else {
+                    log.warn("unknown message type: {}", messageType);
+                    MyConcurrentUtils.runAndWait(() -> sessionEventConsumers.onOtherMessage(this, line),
+                            Optional.ofNullable(sessionEventConsumers.onOtherMessageTimeout(this, line)).orElse(defaultEventTimeout));
+                    return false;
+                }
+            });
+        } catch (Exception e) {
+            throw new SessionSendPromptException("Failed to send prompt", e);
+        }
+    }
+
+    /**
+     * Gets the current session ID.
+     *
+     * @return The session ID, or null if not available
+     */
+    public String getSessionId() {
+        return Optional.ofNullable(lastSdkSystemMessage).map(SDKSystemMessage::getSessionId).orElse(null);
+    }
+
+    /**
+     * Checks if the session is available for operations.
+     *
+     * @return true if the session is available, false otherwise
+     */
+    public boolean isAvailable() {
+        return transport.isAvailable();
+    }
+
+    /**
+     * Gets the capabilities of the CLI.
+     *
+     * @return A Capabilities object representing the CLI's capabilities
+     */
+    public Capabilities getCapabilities() {
+        return Optional.ofNullable(lastCliControlInitializeResponse).map(CLIControlInitializeResponse::getCapabilities).orElse(new Capabilities());
+    }
+
+    private void checkAvailable() throws SessionControlException {
+        if (!isAvailable()) {
+            throw new SessionControlException("Session is not available");
+        }
+    }
+}

packages/sdk-java/src/main/java/com/alibaba/qwen/code/cli/session/event/consumers/AssistantContentConsumers.java

@@ -0,0 +1,159 @@
+package com.alibaba.qwen.code.cli.session.event.consumers;
+
+import com.alibaba.qwen.code.cli.protocol.data.AssistantUsage;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent.TextAssistantContent;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent.ThingkingAssistantContent;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent.ToolResultAssistantContent;
+import com.alibaba.qwen.code.cli.protocol.data.AssistantContent.ToolUseAssistantContent;
+import com.alibaba.qwen.code.cli.protocol.data.behavior.Behavior;
+import com.alibaba.qwen.code.cli.protocol.data.behavior.Behavior.Operation;
+import com.alibaba.qwen.code.cli.protocol.message.control.payload.CLIControlPermissionRequest;
+import com.alibaba.qwen.code.cli.protocol.message.control.payload.ControlRequestPayload;
+import com.alibaba.qwen.code.cli.protocol.message.control.payload.ControlResponsePayload;
+import com.alibaba.qwen.code.cli.session.Session;
+import com.alibaba.qwen.code.cli.utils.Timeout;
+
+/**
+ * Interface for handling different types of assistant content during a session.
+ *
+ * @author skyfire
+ * @version $Id: 0.0.1
+ */
+public interface AssistantContentConsumers {
+    /**
+     * Handles text content from the assistant.
+     *
+     * @param session The session
+     * @param textAssistantContent The text content from the assistant
+     */
+    void onText(Session session, TextAssistantContent textAssistantContent);
+
+    /**
+     * Handles thinking content from the assistant.
+     *
+     * @param session The session
+     * @param thingkingAssistantContent The thinking content from the assistant
+     */
+    void onThinking(Session session, ThingkingAssistantContent thingkingAssistantContent);
+
+    /**
+     * Handles tool use content from the assistant.
+     *
+     * @param session The session
+     * @param toolUseAssistantContent The tool use content from the assistant
+     */
+    void onToolUse(Session session, ToolUseAssistantContent toolUseAssistantContent);
+
+    /**
+     * Handles tool result content from the assistant.
+     *
+     * @param session The session
+     * @param toolResultAssistantContent The tool result content from the assistant
+     */
+    void onToolResult(Session session, ToolResultAssistantContent toolResultAssistantContent);
+
+    /**
+     * Handles other types of assistant content.
+     *
+     * @param session The session
+     * @param other The other content from the assistant
+     */
+    void onOtherContent(Session session, AssistantContent<?> other);
+
+    /**
+     * Handles permission requests.
+     *
+     * @param session The session
+     * @param permissionRequest The permission request
+     * @return The behavior for the permission request
+     */
+    Behavior onPermissionRequest(Session session, CLIControlPermissionRequest permissionRequest);
+
+    /**
+     * Handles permission requests.
+     *
+     * @param session The session
+     * @param requestPayload The control request payload
+     * @return The response payload for the control request
+     */
+    ControlResponsePayload onOtherControlRequest(Session session, ControlRequestPayload requestPayload);
+
+    /**
+     * Handles usage information from the assistant.
+     *
+     * @param session The session
+     * @param AssistantUsage The usage information from the assistant
+     */
+    void onUsage(Session session, AssistantUsage AssistantUsage);
+
+    /**
+     * Sets the default permission operation.
+     *
+     * @param defaultPermissionOperation The default permission operation
+     * @return This instance for method chaining
+     */
+    AssistantContentSimpleConsumers setDefaultPermissionOperation(Operation defaultPermissionOperation);
+
+    /**
+     * Gets timeout for permission request handling.
+     *
+     * @param session The session
+     * @return The timeout for permission request handling
+     */
+    Timeout onPermissionRequestTimeout(Session session, CLIControlPermissionRequest permissionRequest);
+
+    /**
+     * Gets timeout for other control request handling.
+     *
+     * @param session The session
+     * @param requestPayload The control request payload
+     * @return The timeout for other control request handling
+     */
+    Timeout onOtherControlRequestTimeout(Session session, ControlRequestPayload requestPayload);
+
+    /**
+     * Gets timeout for text handling.
+     *
+     * @param session The session
+     * @param textAssistantContent The text content from the assistant
+     * @return The timeout for text handling
+     */
+    Timeout onTextTimeout(Session session, TextAssistantContent textAssistantContent);
+
+    /**
+     * Gets timeout for thinking handling.
+     *
+     * @param session The session
+     * @param thingkingAssistantContent The thinking content from the assistant
+     * @return The timeout for thinking handling
+     */
+    Timeout onThinkingTimeout(Session session, ThingkingAssistantContent thingkingAssistantContent);
+
+    /**
+     * Gets timeout for tool use handling.
+     *
+     * @param session The session
+     * @param toolUseAssistantContent The tool use content from the assistant
+     * @return The timeout for tool use handling
+     */
+    Timeout onToolUseTimeout(Session session, ToolUseAssistantContent toolUseAssistantContent);
+
+    /**
+     * Gets timeout for tool result handling.
+     *
+     * @param session The session
+     * @param toolResultAssistantContent The tool result content from the assistant
+     * @return The timeout for tool result handling
+     */
+    Timeout onToolResultTimeout(Session session, ToolResultAssistantContent toolResultAssistantContent);
+
+    /**
+     * Gets timeout for other content handling.
+     *
+     * @param session The session
+     * @param other The other content from the assistant
+     * @return The timeout for other content handling
+     */
+    Timeout onOtherContentTimeout(Session session, AssistantContent<?> other);
+}