@umsai/ums-code 0.0.14-v1 → 0.0.14-v2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umsai/ums-code",
-  "version": "0.0.14-v1",
+  "version": "0.0.14-v2",
   "description": "UMS Code CLI",
   "repository": {
     "type": "git",
@@ -28,24 +28,25 @@
     "dist"
   ],
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.0.6"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.0.14"
   },
   "dependencies": {
     "@google/genai": "1.9.0",
     "@iarna/toml": "^2.2.5",
+    "@modelcontextprotocol/sdk": "^1.15.1",
     "@types/update-notifier": "^6.0.8",
-    "@umsai/ums-code-core": "0.0.14-v1",
+    "@umsai/ums-code-core": "0.0.14-v2",
     "command-exists": "^1.2.9",
     "diff": "^7.0.0",
     "dotenv": "^17.1.0",
+    "fzf": "^0.5.2",
     "glob": "^10.4.1",
     "highlight.js": "^11.11.1",
-    "ink": "^6.0.1",
-    "ink-big-text": "^2.0.0",
+    "ink": "^6.2.3",
     "ink-gradient": "^3.0.0",
     "ink-link": "^4.1.0",
-    "ink-select-input": "^6.2.0",
     "ink-spinner": "^5.0.0",
+    "lodash-es": "^4.17.21",
     "lowlight": "^3.3.0",
     "mime-types": "^3.0.1",
     "open": "^10.1.2",
@@ -53,10 +54,11 @@
     "react": "^19.1.0",
     "read-package-up": "^11.0.0",
     "shell-quote": "^1.8.3",
+    "simple-git": "^3.28.0",
     "string-width": "^7.1.0",
     "strip-ansi": "^7.1.0",
     "strip-json-comments": "^3.1.1",
-    "tiktoken": "^1.0.21",
+    "undici": "^7.10.0",
     "update-notifier": "^7.3.1",
     "yargs": "^17.7.2",
     "zod": "^3.23.8"
@@ -68,6 +70,7 @@
     "@types/command-exists": "^1.2.3",
     "@types/diff": "^7.0.2",
     "@types/dotenv": "^6.1.1",
+    "@types/lodash-es": "^4.17.12",
     "@types/node": "^20.11.24",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",

package/dist/src/acp/acp.d.ts

@@ -1,208 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-import { Icon } from '@umsai/ums-code-core';
-import { WritableStream, ReadableStream } from 'node:stream/web';
-export declare class ClientConnection implements Client {
-    #private;
-    constructor(agent: (client: Client) => Agent, input: WritableStream<Uint8Array>, output: ReadableStream<Uint8Array>);
-    /**
-     * Streams part of an assistant response to the client
-     */
-    streamAssistantMessageChunk(params: StreamAssistantMessageChunkParams): Promise<void>;
-    /**
-     * Request confirmation before running a tool
-     *
-     * When allowed, the client returns a [`ToolCallId`] which can be used
-     * to update the tool call's `status` and `content` as it runs.
-     */
-    requestToolCallConfirmation(params: RequestToolCallConfirmationParams): Promise<RequestToolCallConfirmationResponse>;
-    /**
-     * pushToolCall allows the agent to start a tool call
-     * when it does not need to request permission to do so.
-     *
-     * The returned id can be used to update the UI for the tool
-     * call as needed.
-     */
-    pushToolCall(params: PushToolCallParams): Promise<PushToolCallResponse>;
-    /**
-     * updateToolCall allows the agent to update the content and status of the tool call.
-     *
-     * The new content replaces what is currently displayed in the UI.
-     *
-     * The [`ToolCallId`] is included in the response of
-     * `pushToolCall` or `requestToolCallConfirmation` respectively.
-     */
-    updateToolCall(params: UpdateToolCallParams): Promise<void>;
-}
-type Result<T> = {
-    result: T;
-} | {
-    error: ErrorResponse;
-};
-type ErrorResponse = {
-    code: number;
-    message: string;
-    data?: {
-        details?: string;
-    };
-};
-export declare class RequestError extends Error {
-    code: number;
-    data?: {
-        details?: string;
-    };
-    constructor(code: number, message: string, details?: string);
-    static parseError(details?: string): RequestError;
-    static invalidRequest(details?: string): RequestError;
-    static methodNotFound(details?: string): RequestError;
-    static invalidParams(details?: string): RequestError;
-    static internalError(details?: string): RequestError;
-    toResult<T>(): Result<T>;
-}
-export declare const LATEST_PROTOCOL_VERSION = "0.0.9";
-export type AssistantMessageChunk = {
-    text: string;
-} | {
-    thought: string;
-};
-export type ToolCallConfirmation = {
-    description?: string | null;
-    type: 'edit';
-} | {
-    description?: string | null;
-    type: 'execute';
-    command: string;
-    rootCommand: string;
-} | {
-    description?: string | null;
-    type: 'mcp';
-    serverName: string;
-    toolDisplayName: string;
-    toolName: string;
-} | {
-    description?: string | null;
-    type: 'fetch';
-    urls: string[];
-} | {
-    description: string;
-    type: 'other';
-};
-export type ToolCallContent = {
-    type: 'markdown';
-    markdown: string;
-} | {
-    type: 'diff';
-    newText: string;
-    oldText: string | null;
-    path: string;
-};
-export type ToolCallStatus = 'running' | 'finished' | 'error';
-export type ToolCallId = number;
-export type ToolCallConfirmationOutcome = 'allow' | 'alwaysAllow' | 'alwaysAllowMcpServer' | 'alwaysAllowTool' | 'reject' | 'cancel';
-/**
- * A part in a user message
- */
-export type UserMessageChunk = {
-    text: string;
-} | {
-    path: string;
-};
-export interface StreamAssistantMessageChunkParams {
-    chunk: AssistantMessageChunk;
-}
-export interface RequestToolCallConfirmationParams {
-    confirmation: ToolCallConfirmation;
-    content?: ToolCallContent | null;
-    icon: Icon;
-    label: string;
-    locations?: ToolCallLocation[];
-}
-export interface ToolCallLocation {
-    line?: number | null;
-    path: string;
-}
-export interface PushToolCallParams {
-    content?: ToolCallContent | null;
-    icon: Icon;
-    label: string;
-    locations?: ToolCallLocation[];
-}
-export interface UpdateToolCallParams {
-    content: ToolCallContent | null;
-    status: ToolCallStatus;
-    toolCallId: ToolCallId;
-}
-export interface RequestToolCallConfirmationResponse {
-    id: ToolCallId;
-    outcome: ToolCallConfirmationOutcome;
-}
-export interface PushToolCallResponse {
-    id: ToolCallId;
-}
-export interface InitializeParams {
-    /**
-     * The version of the protocol that the client supports.
-     * This should be the latest version supported by the client.
-     */
-    protocolVersion: string;
-}
-export interface SendUserMessageParams {
-    chunks: UserMessageChunk[];
-}
-export interface InitializeResponse {
-    /**
-     * Indicates whether the agent is authenticated and
-     * ready to handle requests.
-     */
-    isAuthenticated: boolean;
-    /**
-     * The version of the protocol that the agent supports.
-     * If the agent supports the requested version, it should respond with the same version.
-     * Otherwise, the agent should respond with the latest version it supports.
-     */
-    protocolVersion: string;
-}
-export interface Error {
-    code: number;
-    data?: unknown;
-    message: string;
-}
-export interface Client {
-    streamAssistantMessageChunk(params: StreamAssistantMessageChunkParams): Promise<void>;
-    requestToolCallConfirmation(params: RequestToolCallConfirmationParams): Promise<RequestToolCallConfirmationResponse>;
-    pushToolCall(params: PushToolCallParams): Promise<PushToolCallResponse>;
-    updateToolCall(params: UpdateToolCallParams): Promise<void>;
-}
-export interface Agent {
-    /**
-     * Initializes the agent's state. It should be called before any other method,
-     * and no other methods should be called until it has completed.
-     *
-     * If the agent is not authenticated, then the client should prompt the user to authenticate,
-     * and then call the `authenticate` method.
-     * Otherwise the client can send other messages to the agent.
-     */
-    initialize(params: InitializeParams): Promise<InitializeResponse>;
-    /**
-     * Begins the authentication process.
-     *
-     * This method should only be called if `initialize` indicates the user isn't already authenticated.
-     * The Promise MUST not resolve until authentication is complete.
-     */
-    authenticate(): Promise<void>;
-    /**
-     * Allows the user to send a message to the agent.
-     * This method should complete after the agent is finished, during
-     * which time the agent may update the client by calling
-     * streamAssistantMessageChunk and other methods.
-     */
-    sendUserMessage(params: SendUserMessageParams): Promise<void>;
-    /**
-     * Cancels the current generation.
-     */
-    cancelSendMessage(): Promise<void>;
-}
-export {};

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

@@ -1 +0,0 @@
-{"version":3,"file":"acp.js","sourceRoot":"","sources":["../../../src/acp/acp.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,MAAM,OAAO,gBAAgB;IAC3B,WAAW,CAAoB;IAE/B,YACE,KAAgC,EAChC,KAAiC,EACjC,MAAkC;QAElC,IAAI,CAAC,WAAW,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,2BAA2B,CAC/B,MAAyC;QAEzC,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC;IAC5E,CAAC;IAED;;;;;OAKG;IACH,2BAA2B,CACzB,MAAyC;QAEzC,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC;IAC7E,CAAC;IAED;;;;;;OAMG;IACH,YAAY,CAAC,MAA0B;QACrC,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,cAAc,CAAC,MAA4B;QAC/C,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;CACF;AA+BD,MAAM,UAAU;IACd,iBAAiB,GAAiC,IAAI,GAAG,EAAE,CAAC;IAC5D,cAAc,GAAW,CAAC,CAAC;IAC3B,SAAS,CAAI;IACb,UAAU,CAA6B;IACvC,WAAW,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAC/C,YAAY,CAAc;IAE1B,YACE,QAAW,EACX,SAAqC,EACrC,UAAsC;QAEtC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,YAAY,GAAG,IAAI,WAAW,EAAE,CAAC;QAEtC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAkC;QAC/C,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAClC,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YACjC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YACnD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAClC,OAAO,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;YAE5B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;gBAEhC,IAAI,WAAW,EAAE,CAAC;oBAChB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;oBACxC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;gBAChC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,OAAmB;QACvC,IAAI,QAAQ,IAAI,OAAO,EAAE,CAAC;YACxB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAChD,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,MAAM,CACf,CAAC;YAEF,MAAM,IAAI,CAAC,YAAY,CAAC;gBACtB,OAAO,EAAE,KAAK;gBACd,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,GAAG,QAAQ;aACZ,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,MAAc,EACd,MAAgB;QAEhB,MAAM,UAAU,GAAG,MAAiB,CAAC;QACrC,IAAI,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,UAAU,EAAE,CAAC;YACrD,OAAO,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;QACxD,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;YACxD,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC;QACpC,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,IAAI,KAAK,YAAY,YAAY,EAAE,CAAC;gBAClC,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC1B,CAAC;YAED,IAAI,OAAO,CAAC;YAEZ,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC3B,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;YAC1B,CAAC;iBAAM,IACL,OAAO,KAAK,KAAK,QAAQ;gBACzB,KAAK,IAAI,IAAI;gBACb,SAAS,IAAI,KAAK;gBAClB,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,EACjC,CAAC;gBACD,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;YAC1B,CAAC;YAED,OAAO,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;QACxD,CAAC;IACH,CAAC;IAED,eAAe,CAAC,QAAqB;QACnC,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAChE,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,QAAQ,IAAI,QAAQ,EAAE,CAAC;gBACzB,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC3C,CAAC;iBAAM,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACzC,CAAC;YACD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CAAY,MAAc,EAAE,MAAY;QACvD,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACjC,MAAM,eAAe,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACtD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAChE,OAAO,eAAgC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAgB;QACjC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QAC5C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW;aAChC,IAAI,CAAC,KAAK,IAAI,EAAE;YACf,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;YAC3C,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YACxD,CAAC;oBAAS,CAAC;gBACT,MAAM,CAAC,WAAW,EAAE,CAAC;YACvB,CAAC;QACH,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QACL,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;CACF;AAED,MAAM,OAAO,YAAa,SAAQ,KAAK;IAI5B;IAHT,IAAI,CAAwB;IAE5B,YACS,IAAY,EACnB,OAAe,EACf,OAAgB;QAEhB,KAAK,CAAC,OAAO,CAAC,CAAC;QAJR,SAAI,GAAJ,IAAI,CAAQ;QAKnB,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;QAC3B,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,IAAI,GAAG,EAAE,OAAO,EAAE,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,OAAgB;QAChC,OAAO,IAAI,YAAY,CAAC,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,OAAgB;QACpC,OAAO,IAAI,YAAY,CAAC,CAAC,KAAK,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,OAAgB;QACpC,OAAO,IAAI,YAAY,CAAC,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,OAAgB;QACnC,OAAO,IAAI,YAAY,CAAC,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,OAAgB;QACnC,OAAO,IAAI,YAAY,CAAC,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IAED,QAAQ;QACN,OAAO;YACL,KAAK,EAAE;gBACL,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB;SACF,CAAC;IACJ,CAAC;CACF;AAED,iBAAiB;AAEjB,MAAM,CAAC,MAAM,uBAAuB,GAAG,OAAO,CAAC"}

package/dist/src/acp/acpPeer.d.ts

@@ -1,8 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-import { Config } from '@umsai/ums-code-core';
-import { LoadedSettings } from '../config/settings.js';
-export declare function runAcpPeer(config: Config, settings: LoadedSettings): Promise<void>;