@umsai/ums-code 0.3.0-v2 → 0.6.0-v1

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@umsai/ums-code",
-    "version": "0.3.0-v2",
+    "version": "0.6.0-v1",
     "description": "UMS Code CLI",
     "repository": {
         "type": "git",
@@ -36,13 +36,13 @@
         "dist"
     ],
     "config": {
-        "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.3.0"
+        "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.6.0"
     },
     "dependencies": {
-        "@google/genai": "1.16.0",
+        "@google/genai": "1.30.0",
         "@iarna/toml": "^2.2.5",
         "@umsai/ums-code-core": "file:../core",
-        "@modelcontextprotocol/sdk": "^1.15.1",
+        "@modelcontextprotocol/sdk": "^1.25.1",
         "@types/update-notifier": "^6.0.8",
         "ansi-regex": "^6.2.2",
         "command-exists": "^1.2.9",
@@ -51,7 +51,7 @@
         "dotenv": "^17.1.0",
         "extract-zip": "^2.0.1",
         "fzf": "^0.5.2",
-        "glob": "^10.4.5",
+        "glob": "^10.5.0",
         "highlight.js": "^11.11.1",
         "ink": "^6.4.0",
         "ink-gradient": "^3.0.0",
@@ -67,7 +67,7 @@
         "string-width": "^7.1.0",
         "strip-ansi": "^7.1.0",
         "strip-json-comments": "^3.1.1",
-        "tar": "^7.5.1",
+        "tar": "^7.5.2",
         "undici": "^7.10.0",
         "update-notifier": "^7.3.1",
         "wrap-ansi": "9.0.2",

package/dist/src/{zed-integration → acp-integration}/acp.d.ts

@@ -13,6 +13,15 @@ export declare class AgentSideConnection implements Client {
      * Streams new content to the client including text, tool calls, etc.
      */
     sessionUpdate(params: schema.SessionNotification): Promise<void>;
+    /**
+     * Streams authentication updates (e.g. Qwen OAuth authUri) to the client.
+     */
+    authenticateUpdate(params: schema.AuthenticateUpdate): Promise<void>;
+    /**
+     * Sends a custom notification to the client.
+     * Used for extension-specific notifications that are not part of the core ACP protocol.
+     */
+    sendCustomNotification<T>(method: string, params: T): Promise<void>;
     /**
      * Request permission before running a tool
      *
@@ -50,6 +59,8 @@ export declare class RequestError extends Error {
 export interface Client {
     requestPermission(params: schema.RequestPermissionRequest): Promise<schema.RequestPermissionResponse>;
     sessionUpdate(params: schema.SessionNotification): Promise<void>;
+    authenticateUpdate(params: schema.AuthenticateUpdate): Promise<void>;
+    sendCustomNotification<T>(method: string, params: T): Promise<void>;
     writeTextFile(params: schema.WriteTextFileRequest): Promise<schema.WriteTextFileResponse>;
     readTextFile(params: schema.ReadTextFileRequest): Promise<schema.ReadTextFileResponse>;
 }
@@ -57,7 +68,9 @@ export interface Agent {
     initialize(params: schema.InitializeRequest): Promise<schema.InitializeResponse>;
     newSession(params: schema.NewSessionRequest): Promise<schema.NewSessionResponse>;
     loadSession?(params: schema.LoadSessionRequest): Promise<schema.LoadSessionResponse>;
+    listSessions?(params: schema.ListSessionsRequest): Promise<schema.ListSessionsResponse>;
     authenticate(params: schema.AuthenticateRequest): Promise<void>;
     prompt(params: schema.PromptRequest): Promise<schema.PromptResponse>;
     cancel(params: schema.CancelNotification): Promise<void>;
+    setMode?(params: schema.SetModeRequest): Promise<schema.SetModeResponse>;
 }

package/dist/src/{zed-integration → acp-integration}/acp.js

@@ -28,6 +28,13 @@ export class AgentSideConnection {
                     const validatedParams = schema.loadSessionRequestSchema.parse(params);
                     return agent.loadSession(validatedParams);
                 }
+                case schema.AGENT_METHODS.session_list: {
+                    if (!agent.listSessions) {
+                        throw RequestError.methodNotFound();
+                    }
+                    const validatedParams = schema.listSessionsRequestSchema.parse(params);
+                    return agent.listSessions(validatedParams);
+                }
                 case schema.AGENT_METHODS.authenticate: {
                     const validatedParams = schema.authenticateRequestSchema.parse(params);
                     return agent.authenticate(validatedParams);
@@ -40,6 +47,13 @@ export class AgentSideConnection {
                     const validatedParams = schema.cancelNotificationSchema.parse(params);
                     return agent.cancel(validatedParams);
                 }
+                case schema.AGENT_METHODS.session_set_mode: {
+                    if (!agent.setMode) {
+                        throw RequestError.methodNotFound();
+                    }
+                    const validatedParams = schema.setModeRequestSchema.parse(params);
+                    return agent.setMode(validatedParams);
+                }
                 default:
                     throw RequestError.methodNotFound(method);
             }
@@ -52,6 +66,19 @@ export class AgentSideConnection {
     async sessionUpdate(params) {
         return await this.#connection.sendNotification(schema.CLIENT_METHODS.session_update, params);
     }
+    /**
+     * Streams authentication updates (e.g. Qwen OAuth authUri) to the client.
+     */
+    async authenticateUpdate(params) {
+        return await this.#connection.sendNotification(schema.CLIENT_METHODS.authenticate_update, params);
+    }
+    /**
+     * Sends a custom notification to the client.
+     * Used for extension-specific notifications that are not part of the core ACP protocol.
+     */
+    async sendCustomNotification(method, params) {
+        return await this.#connection.sendNotification(method, params);
+    }
     /**
      * Request permission before running a tool
      *
@@ -128,8 +155,10 @@ class Connection {
             if (error instanceof z.ZodError) {
                 return RequestError.invalidParams(JSON.stringify(error.format(), undefined, 2)).toResult();
             }
+            let errorName;
             let details;
             if (error instanceof Error) {
+                errorName = error.name;
                 details = error.message;
             }
             else if (typeof error === 'object' &&
@@ -138,6 +167,9 @@ class Connection {
                 typeof error.message === 'string') {
                 details = error.message;
             }
+            if (errorName === 'TokenManagerError') {
+                return RequestError.authRequired(details).toResult();
+            }
             return RequestError.internalError(details).toResult();
         }
     }

package/dist/src/acp-integration/acp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"acp.js","sourceRoot":"","sources":["../../../src/acp-integration/acp.ts"],"names":[],"mappings":"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"}

package/dist/src/acp-integration/acpAgent.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type Config } from '@umsai/ums-code-core';
+import type { LoadedSettings } from '../config/settings.js';
+import { type Extension } from '../config/extension.js';
+import type { CliArgs } from '../config/config.js';
+export declare function runAcpAgent(config: Config, settings: LoadedSettings, extensions: Extension[], argv: CliArgs): Promise<void>;

package/dist/src/acp-integration/acpAgent.js

@@ -0,0 +1,264 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { APPROVAL_MODE_INFO, APPROVAL_MODES, AuthType, clearCachedCredentialFile, QwenOAuth2Event, qwenOAuth2Events, MCPServerConfig, SessionService, tokenLimit, } from '@umsai/ums-code-core';
+import * as acp from './acp.js';
+import { AcpFileSystemService } from './service/filesystem.js';
+import { Readable, Writable } from 'node:stream';
+import { SettingScope } from '../config/settings.js';
+import { z } from 'zod';
+import { ExtensionStorage } from '../config/extension.js';
+import { loadCliConfig } from '../config/config.js';
+import { ExtensionEnablementManager } from '../config/extensions/extensionEnablement.js';
+// Import the modular Session class
+import { Session } from './session/Session.js';
+export async function runAcpAgent(config, settings, extensions, argv) {
+    const stdout = Writable.toWeb(process.stdout);
+    const stdin = Readable.toWeb(process.stdin);
+    // Stdout is used to send messages to the client, so console.log/console.info
+    // messages to stderr so that they don't interfere with ACP.
+    console.log = console.error;
+    console.info = console.error;
+    console.debug = console.error;
+    new acp.AgentSideConnection((client) => new GeminiAgent(config, settings, extensions, argv, client), stdout, stdin);
+}
+class GeminiAgent {
+    config;
+    settings;
+    extensions;
+    argv;
+    client;
+    sessions = new Map();
+    clientCapabilities;
+    constructor(config, settings, extensions, argv, client) {
+        this.config = config;
+        this.settings = settings;
+        this.extensions = extensions;
+        this.argv = argv;
+        this.client = client;
+    }
+    async initialize(args) {
+        this.clientCapabilities = args.clientCapabilities;
+        const authMethods = [
+            {
+                id: AuthType.USE_OPENAI,
+                name: 'Use OpenAI API key',
+                description: 'Requires setting the `OPENAI_API_KEY` environment variable',
+            },
+            {
+                id: AuthType.QWEN_OAUTH,
+                name: 'Qwen OAuth',
+                description: 'OAuth authentication for Qwen models with 2000 daily requests',
+            },
+        ];
+        // Get current approval mode from config
+        const currentApprovalMode = this.config.getApprovalMode();
+        // Build available modes from shared APPROVAL_MODE_INFO
+        const availableModes = APPROVAL_MODES.map((mode) => ({
+            id: mode,
+            name: APPROVAL_MODE_INFO[mode].name,
+            description: APPROVAL_MODE_INFO[mode].description,
+        }));
+        const version = process.env['CLI_VERSION'] || process.version;
+        return {
+            protocolVersion: acp.PROTOCOL_VERSION,
+            agentInfo: {
+                name: 'qwen-code',
+                title: 'UMS Code',
+                version,
+            },
+            authMethods,
+            modes: {
+                currentModeId: currentApprovalMode,
+                availableModes,
+            },
+            agentCapabilities: {
+                loadSession: true,
+                promptCapabilities: {
+                    image: true,
+                    audio: true,
+                    embeddedContext: true,
+                },
+            },
+        };
+    }
+    async authenticate({ methodId }) {
+        const method = z.nativeEnum(AuthType).parse(methodId);
+        let authUri;
+        const authUriHandler = (deviceAuth) => {
+            authUri = deviceAuth.verification_uri_complete;
+            // Send the auth URL to ACP client as soon as it's available (refreshAuth is blocking).
+            void this.client.authenticateUpdate({ _meta: { authUri } });
+        };
+        if (method === AuthType.QWEN_OAUTH) {
+            qwenOAuth2Events.once(QwenOAuth2Event.AuthUri, authUriHandler);
+        }
+        await clearCachedCredentialFile();
+        try {
+            await this.config.refreshAuth(method);
+            this.settings.setValue(SettingScope.User, 'security.auth.selectedType', method);
+        }
+        finally {
+            // Ensure we don't leak listeners if auth fails early.
+            if (method === AuthType.QWEN_OAUTH) {
+                qwenOAuth2Events.off(QwenOAuth2Event.AuthUri, authUriHandler);
+            }
+        }
+        return;
+    }
+    async newSession({ cwd, mcpServers, }) {
+        const config = await this.newSessionConfig(cwd, mcpServers);
+        await this.ensureAuthenticated(config);
+        this.setupFileSystem(config);
+        const session = await this.createAndStoreSession(config);
+        const configuredModel = (config.getModel() ||
+            this.config.getModel() ||
+            '').trim();
+        const modelId = configuredModel || 'default';
+        const modelName = configuredModel || modelId;
+        return {
+            sessionId: session.getId(),
+            models: {
+                currentModelId: modelId,
+                availableModels: [
+                    {
+                        modelId,
+                        name: modelName,
+                        description: null,
+                        _meta: {
+                            contextLimit: tokenLimit(modelId),
+                        },
+                    },
+                ],
+                _meta: null,
+            },
+        };
+    }
+    async newSessionConfig(cwd, mcpServers, sessionId) {
+        const mergedMcpServers = { ...this.settings.merged.mcpServers };
+        for (const { command, args, env: rawEnv, name } of mcpServers) {
+            const env = {};
+            for (const { name: envName, value } of rawEnv) {
+                env[envName] = value;
+            }
+            mergedMcpServers[name] = new MCPServerConfig(command, args, env, cwd);
+        }
+        const settings = { ...this.settings.merged, mcpServers: mergedMcpServers };
+        const argvForSession = {
+            ...this.argv,
+            resume: sessionId,
+            continue: false,
+        };
+        const config = await loadCliConfig(settings, this.extensions, new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir(), this.argv.extensions), argvForSession, cwd);
+        await config.initialize();
+        return config;
+    }
+    async cancel(params) {
+        const session = this.sessions.get(params.sessionId);
+        if (!session) {
+            throw new Error(`Session not found: ${params.sessionId}`);
+        }
+        await session.cancelPendingPrompt();
+    }
+    async prompt(params) {
+        const session = this.sessions.get(params.sessionId);
+        if (!session) {
+            throw new Error(`Session not found: ${params.sessionId}`);
+        }
+        return session.prompt(params);
+    }
+    async loadSession(params) {
+        const sessionService = new SessionService(params.cwd);
+        const exists = await sessionService.sessionExists(params.sessionId);
+        if (!exists) {
+            throw acp.RequestError.invalidParams(`Session not found for id: ${params.sessionId}`);
+        }
+        const config = await this.newSessionConfig(params.cwd, params.mcpServers, params.sessionId);
+        await this.ensureAuthenticated(config);
+        this.setupFileSystem(config);
+        const sessionData = config.getResumedSessionData();
+        if (!sessionData) {
+            throw acp.RequestError.internalError(`Failed to load session data for id: ${params.sessionId}`);
+        }
+        await this.createAndStoreSession(config, sessionData.conversation);
+        return null;
+    }
+    async listSessions(params) {
+        const sessionService = new SessionService(params.cwd);
+        const result = await sessionService.listSessions({
+            cursor: params.cursor,
+            size: params.size,
+        });
+        return {
+            items: result.items.map((item) => ({
+                sessionId: item.sessionId,
+                cwd: item.cwd,
+                startTime: item.startTime,
+                mtime: item.mtime,
+                prompt: item.prompt,
+                gitBranch: item.gitBranch,
+                filePath: item.filePath,
+                messageCount: item.messageCount,
+            })),
+            nextCursor: result.nextCursor,
+            hasMore: result.hasMore,
+        };
+    }
+    async setMode(params) {
+        const session = this.sessions.get(params.sessionId);
+        if (!session) {
+            throw new Error(`Session not found: ${params.sessionId}`);
+        }
+        return session.setMode(params);
+    }
+    async ensureAuthenticated(config) {
+        const selectedType = this.settings.merged.security?.auth?.selectedType;
+        if (!selectedType) {
+            throw acp.RequestError.authRequired('No Selected Type');
+        }
+        try {
+            // Use true for the second argument to ensure only cached credentials are used
+            await config.refreshAuth(selectedType, true);
+        }
+        catch (e) {
+            console.error(`Authentication failed: ${e}`);
+            throw acp.RequestError.authRequired('Authentication failed: ' + e.message);
+        }
+    }
+    setupFileSystem(config) {
+        if (!this.clientCapabilities?.fs) {
+            return;
+        }
+        const acpFileSystemService = new AcpFileSystemService(this.client, config.getSessionId(), this.clientCapabilities.fs, config.getFileSystemService());
+        config.setFileSystemService(acpFileSystemService);
+    }
+    async createAndStoreSession(config, conversation) {
+        const sessionId = config.getSessionId();
+        const geminiClient = config.getGeminiClient();
+        // Use GeminiClient to manage chat lifecycle properly
+        // This ensures geminiClient.chat is in sync with the session's chat
+        //
+        // Note: When loading a session, config.initialize() has already been called
+        // in newSessionConfig(), which in turn calls geminiClient.initialize().
+        // The GeminiClient.initialize() method checks config.getResumedSessionData()
+        // and automatically loads the conversation history into the chat instance.
+        // So we only need to initialize if it hasn't been done yet.
+        if (!geminiClient.isInitialized()) {
+            await geminiClient.initialize();
+        }
+        // Now get the chat instance that's managed by GeminiClient
+        const chat = geminiClient.getChat();
+        const session = new Session(sessionId, chat, config, this.client, this.settings);
+        this.sessions.set(sessionId, session);
+        setTimeout(async () => {
+            await session.sendAvailableCommandsUpdate();
+        }, 0);
+        if (conversation && conversation.messages) {
+            await session.replayHistory(conversation.messages);
+        }
+        return session;
+    }
+}
+//# sourceMappingURL=acpAgent.js.map

package/dist/src/acp-integration/acpAgent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"acpAgent.js","sourceRoot":"","sources":["../../../src/acp-integration/acpAgent.ts"],"names":[],"mappings":"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"}