@aws/lsp-codewhisperer 0.0.32 → 0.0.33

package/out/language-server/agenticChat/tools/mcp/mcpManager.js

@@ -0,0 +1,106 @@
+"use strict";
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates.
+ * All Rights Reserved. SPDX-License-Identifier: Apache-2.0
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.McpManager = void 0;
+const index_js_1 = require("@modelcontextprotocol/sdk/client/index.js");
+const stdio_js_1 = require("@modelcontextprotocol/sdk/client/stdio.js");
+const mcpUtils_1 = require("./mcpUtils");
+class McpManager {
+    configPaths;
+    features;
+    static #instance;
+    clients = new Map();
+    mcpTools = [];
+    constructor(configPaths, features) {
+        this.configPaths = configPaths;
+        this.features = features;
+    }
+    static async init(configPaths, features) {
+        if (!McpManager.#instance) {
+            const mgr = new McpManager(configPaths, features);
+            McpManager.#instance = mgr;
+            await mgr.discoverAllServers();
+            features.logging.info(`MCP: discovered ${mgr.mcpTools.length} tools across all servers`);
+        }
+        return McpManager.#instance;
+    }
+    static get instance() {
+        if (!McpManager.#instance) {
+            throw new Error('McpManager not initialized—call McpManager.init(...) first');
+        }
+        return McpManager.#instance;
+    }
+    async close() {
+        this.features.logging.info('MCP: closing all clients');
+        for (const [name, client] of this.clients.entries()) {
+            try {
+                await client.close();
+                this.features.logging.info(`MCP: closed client for ${name}`);
+            }
+            catch (e) {
+                this.features.logging.error(`MCP: error closing client ${name}: ${e.message}`);
+            }
+        }
+        this.clients.clear();
+        this.mcpTools = [];
+        McpManager.#instance = undefined;
+    }
+    async discoverAllServers() {
+        const configs = await (0, mcpUtils_1.loadMcpServerConfigs)(this.features.workspace, this.features.logging, this.configPaths);
+        for (const [name, cfg] of configs.entries()) {
+            if (cfg.disabled) {
+                this.features.logging.info(`MCP: server '${name}' is disabled, skipping`);
+                continue;
+            }
+            await this.initOneServer(name, cfg);
+        }
+    }
+    async initOneServer(serverName, cfg) {
+        try {
+            this.features.logging.debug(`MCP: initializing server [${serverName}]`);
+            const mergedEnv = {
+                ...process.env,
+                ...(cfg.env ?? {}),
+            };
+            const transport = new stdio_js_1.StdioClientTransport({
+                command: cfg.command,
+                args: cfg.args ?? [],
+                env: mergedEnv,
+            });
+            const client = new index_js_1.Client({
+                name: `mcp-client-${serverName}`,
+                version: '1.0.0',
+            });
+            await client.connect(transport);
+            this.clients.set(serverName, client);
+            const resp = (await client.listTools());
+            for (const t of resp.tools) {
+                const toolName = t.name;
+                this.features.logging.info(`MCP: discovered tool ${serverName}::${toolName}`);
+                this.mcpTools.push({
+                    serverName,
+                    toolName,
+                    description: t.description ?? '',
+                    inputSchema: t.inputSchema ?? {},
+                });
+            }
+        }
+        catch (e) {
+            this.features.logging.warn(`MCP: server [${serverName}] init failed: ${e.message}`);
+        }
+    }
+    getAllTools() {
+        return [...this.mcpTools];
+    }
+    async callTool(server, tool, args) {
+        const c = this.clients.get(server);
+        if (!c)
+            throw new Error(`MCP: server '${server}' not connected`);
+        return c.callTool({ name: tool, arguments: args });
+    }
+}
+exports.McpManager = McpManager;
+//# sourceMappingURL=mcpManager.js.map

package/out/language-server/agenticChat/tools/mcp/mcpManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcpManager.js","sourceRoot":"","sources":["../../../../../src/language-server/agenticChat/tools/mcp/mcpManager.ts"],"names":[],"mappings":"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"}

package/out/language-server/agenticChat/tools/mcp/mcpTool.d.ts

@@ -0,0 +1,21 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates.
+ * All Rights Reserved. SPDX-License-Identifier: Apache-2.0
+ */
+import { CommandValidation, InvokeOutput } from '../toolShared';
+import type { McpToolDefinition } from './mcpTypes';
+import type { Features } from '@aws/language-server-runtimes/server-interface/server';
+export declare class McpTool {
+    private readonly features;
+    private readonly def;
+    constructor(features: Pick<Features, 'logging' | 'workspace' | 'lsp'>, def: McpToolDefinition);
+    getSpec(): {
+        readonly name: string;
+        readonly description: string;
+        readonly inputSchema: any;
+    };
+    validate(_input: any): Promise<void>;
+    queueDescription(command: string, updates: WritableStream): Promise<void>;
+    requiresAcceptance(_input: any): CommandValidation;
+    invoke(input: any): Promise<InvokeOutput>;
+}

package/out/language-server/agenticChat/tools/mcp/mcpTool.js

@@ -0,0 +1,54 @@
+"use strict";
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates.
+ * All Rights Reserved. SPDX-License-Identifier: Apache-2.0
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.McpTool = void 0;
+const toolShared_1 = require("../toolShared");
+const mcpManager_1 = require("./mcpManager");
+class McpTool {
+    features;
+    def;
+    constructor(features, def) {
+        this.features = features;
+        this.def = def;
+    }
+    getSpec() {
+        return {
+            name: this.def.toolName,
+            description: this.def.description,
+            inputSchema: this.def.inputSchema,
+        };
+    }
+    validate(_input) {
+        return Promise.resolve();
+    }
+    async queueDescription(command, updates) {
+        const writer = updates.getWriter();
+        await writer.write(`Invoking MCP tool: ${this.def.toolName} on server ${this.def.serverName}`);
+        await writer.close();
+        writer.releaseLock();
+    }
+    requiresAcceptance(_input) {
+        return { requiresAcceptance: false };
+    }
+    async invoke(input) {
+        try {
+            const result = await mcpManager_1.McpManager.instance.callTool(this.def.serverName, this.def.toolName, input);
+            const content = typeof result === 'object' ? JSON.stringify(result) : String(result);
+            return {
+                output: {
+                    kind: toolShared_1.OutputKind.Text,
+                    content: content,
+                },
+            };
+        }
+        catch (err) {
+            this.features.logging.error(`MCP tool ${this.def.toolName} failed: ${err.message}`);
+            throw new Error(`Failed to invoke MCP tool: ${err.message}`);
+        }
+    }
+}
+exports.McpTool = McpTool;
+//# sourceMappingURL=mcpTool.js.map

package/out/language-server/agenticChat/tools/mcp/mcpTool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcpTool.js","sourceRoot":"","sources":["../../../../../src/language-server/agenticChat/tools/mcp/mcpTool.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,8CAA2E;AAG3E,6CAAyC;AAEzC,MAAa,OAAO;IAEK;IACA;IAFrB,YACqB,QAAyD,EACzD,GAAsB;QADtB,aAAQ,GAAR,QAAQ,CAAiD;QACzD,QAAG,GAAH,GAAG,CAAmB;IACxC,CAAC;IAEG,OAAO;QACV,OAAO;YACH,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ;YACvB,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW;YACjC,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW;SAC3B,CAAA;IACd,CAAC;IAEM,QAAQ,CAAC,MAAW;QACvB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;IAC5B,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,OAAe,EAAE,OAAuB;QAClE,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAA;QAClC,MAAM,MAAM,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,GAAG,CAAC,QAAQ,cAAc,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAA;QAC9F,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;QACpB,MAAM,CAAC,WAAW,EAAE,CAAA;IACxB,CAAC;IAEM,kBAAkB,CAAC,MAAW;QACjC,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAA;IACxC,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,KAAU;QAC1B,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,uBAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;YAChG,MAAM,OAAO,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YACpF,OAAO;gBACH,MAAM,EAAE;oBACJ,IAAI,EAAE,uBAAU,CAAC,IAAI;oBACrB,OAAO,EAAE,OAAO;iBACnB;aACJ,CAAA;QACL,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAChB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,GAAG,CAAC,QAAQ,YAAY,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;YACnF,MAAM,IAAI,KAAK,CAAC,8BAA8B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;QAChE,CAAC;IACL,CAAC;CACJ;AA5CD,0BA4CC"}

package/out/language-server/agenticChat/tools/mcp/mcpTypes.d.ts

@@ -0,0 +1,28 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export interface McpToolDefinition {
+    serverName: string;
+    toolName: string;
+    description: string;
+    inputSchema: any;
+}
+export interface MCPServerConfig {
+    command: string;
+    args?: string[];
+    env?: Record<string, string>;
+    disabled?: boolean;
+    autoApprove?: string[];
+}
+export interface MCPConfig {
+    mcpServers: Record<string, MCPServerConfig>;
+}
+export interface ListToolsResponse {
+    tools: {
+        name?: string;
+        description?: string;
+        inputSchema?: object;
+        [key: string]: any;
+    }[];
+}

package/out/language-server/agenticChat/tools/mcp/mcpTypes.js

@@ -0,0 +1,7 @@
+"use strict";
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=mcpTypes.js.map

package/out/language-server/agenticChat/tools/mcp/mcpTypes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcpTypes.js","sourceRoot":"","sources":["../../../../../src/language-server/agenticChat/tools/mcp/mcpTypes.ts"],"names":[],"mappings":";AAAA;;;GAGG"}

package/out/language-server/agenticChat/tools/mcp/mcpUtils.d.ts

@@ -0,0 +1,7 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates.
+ * All Rights Reserved. SPDX-License-Identifier: Apache-2.0
+ */
+import { Logger, Workspace } from '@aws/language-server-runtimes/server-interface';
+import { MCPServerConfig } from './mcpTypes';
+export declare function loadMcpServerConfigs(workspace: Workspace, logging: Logger, rawPaths: string[]): Promise<Map<string, MCPServerConfig>>;

package/out/language-server/agenticChat/tools/mcp/mcpUtils.js

@@ -0,0 +1,78 @@
+"use strict";
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates.
+ * All Rights Reserved. SPDX-License-Identifier: Apache-2.0
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadMcpServerConfigs = loadMcpServerConfigs;
+const vscode_uri_1 = require("vscode-uri");
+async function loadMcpServerConfigs(workspace, logging, rawPaths) {
+    const servers = new Map();
+    for (const raw of rawPaths) {
+        // 1) normalize file:/ URIs → real fs paths
+        let fsPath;
+        try {
+            const uri = vscode_uri_1.URI.parse(raw);
+            fsPath = uri.scheme === 'file' ? uri.fsPath : raw;
+        }
+        catch {
+            fsPath = raw;
+        }
+        // 2) skip missing
+        let exists;
+        try {
+            exists = await workspace.fs.exists(fsPath);
+        }
+        catch (e) {
+            logging.warn(`Could not stat MCP config at ${fsPath}: ${e.message}`);
+            continue;
+        }
+        if (!exists) {
+            logging.warn(`MCP config not found at ${fsPath}, skipping.`);
+            continue;
+        }
+        // 3) read + parse JSON
+        let rawText;
+        try {
+            rawText = (await workspace.fs.readFile(fsPath)).toString();
+        }
+        catch (e) {
+            logging.warn(`Failed to read MCP config at ${fsPath}: ${e.message}`);
+            continue;
+        }
+        let json;
+        try {
+            json = JSON.parse(rawText);
+        }
+        catch (e) {
+            logging.warn(`Invalid JSON in MCP config at ${fsPath}: ${e.message}`);
+            continue;
+        }
+        if (!json.mcpServers || typeof json.mcpServers !== 'object') {
+            logging.warn(`MCP config at ${fsPath} missing or invalid 'mcpServers' field`);
+            continue;
+        }
+        // 4) dedupe and validate
+        for (const [name, entry] of Object.entries(json.mcpServers)) {
+            if (servers.has(name)) {
+                logging.warn(`Duplicate MCP server '${name}' in ${fsPath}, skipping.`);
+                continue;
+            }
+            if (!entry || typeof entry.command !== 'string') {
+                logging.warn(`MCP server '${name}' in ${fsPath} missing required 'command', skipping.`);
+                continue;
+            }
+            const cfg = {
+                command: entry.command,
+                args: Array.isArray(entry.args) ? entry.args : [],
+                env: typeof entry.env === 'object' ? entry.env : {},
+                disabled: !!entry.disabled,
+                autoApprove: Array.isArray(entry.autoApprove) ? entry.autoApprove : [],
+            };
+            servers.set(name, cfg);
+            logging.info(`Loaded MCP server '${name}' from ${fsPath}`);
+        }
+    }
+    return servers;
+}
+//# sourceMappingURL=mcpUtils.js.map

package/out/language-server/agenticChat/tools/mcp/mcpUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcpUtils.js","sourceRoot":"","sources":["../../../../../src/language-server/agenticChat/tools/mcp/mcpUtils.ts"],"names":[],"mappings":"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"}

package/out/language-server/agenticChat/tools/toolServer.d.ts

@@ -1,2 +1,5 @@
 import { Server } from '@aws/language-server-runtimes/server-interface';
 export declare const FsToolsServer: Server;
+export declare const BashToolsServer: Server;
+export declare const LspToolsServer: Server;
+export declare const McpToolsServer: Server;

package/out/language-server/agenticChat/tools/toolServer.js

@@ -1,14 +1,70 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FsToolsServer = void 0;
+exports.McpToolsServer = exports.LspToolsServer = exports.BashToolsServer = exports.FsToolsServer = void 0;
 const fsRead_1 = require("./fsRead");
 const fsWrite_1 = require("./fsWrite");
-const FsToolsServer = ({ workspace, logging, agent }) => {
-    const fsReadTool = new fsRead_1.FsRead({ workspace, logging });
-    const fsWriteTool = new fsWrite_1.FsWrite({ workspace, logging });
-    agent.addTool(fsReadTool.getSpec(), (input) => fsReadTool.invoke(input));
-    agent.addTool(fsWriteTool.getSpec(), (input) => fsWriteTool.invoke(input));
+const listDirectory_1 = require("./listDirectory");
+const executeBash_1 = require("./executeBash");
+const lspGetDocuments_1 = require("./lspGetDocuments");
+const lspReadDocumentContents_1 = require("./lspReadDocumentContents");
+const lspApplyWorkspaceEdit_1 = require("./lspApplyWorkspaceEdit");
+const mcpManager_1 = require("./mcp/mcpManager");
+const mcpTool_1 = require("./mcp/mcpTool");
+const FsToolsServer = ({ workspace, logging, agent, lsp }) => {
+    const fsReadTool = new fsRead_1.FsRead({ workspace, lsp, logging });
+    const fsWriteTool = new fsWrite_1.FsWrite({ workspace, lsp, logging });
+    const listDirectoryTool = new listDirectory_1.ListDirectory({ workspace, logging, lsp });
+    agent.addTool(fsReadTool.getSpec(), async (input) => {
+        // TODO: fill in logic for handling invalid tool invocations
+        // TODO: implement chat streaming via queueDescription.
+        await fsReadTool.validate(input);
+        return await fsReadTool.invoke(input);
+    });
+    agent.addTool(fsWriteTool.getSpec(), async (input) => {
+        // TODO: fill in logic for handling invalid tool invocations
+        // TODO: implement chat streaming via queueDescription.
+        await fsWriteTool.validate(input);
+        return await fsWriteTool.invoke(input);
+    });
+    agent.addTool(listDirectoryTool.getSpec(), (input, token) => listDirectoryTool.invoke(input, token));
     return () => { };
 };
 exports.FsToolsServer = FsToolsServer;
+const BashToolsServer = ({ logging, workspace, agent, lsp }) => {
+    const bashTool = new executeBash_1.ExecuteBash({ logging, workspace, lsp });
+    agent.addTool(bashTool.getSpec(), (input, token, updates) => bashTool.invoke(input, token, updates));
+    return () => { };
+};
+exports.BashToolsServer = BashToolsServer;
+const LspToolsServer = ({ workspace, logging, lsp, agent }) => {
+    const lspGetDocuments = new lspGetDocuments_1.LspGetDocuments({ workspace, logging });
+    const lspReadDocumentContents = new lspReadDocumentContents_1.LspReadDocumentContents({ workspace, logging });
+    const lspApplyWorkspaceEdit = new lspApplyWorkspaceEdit_1.LspApplyWorkspaceEdit({ lsp, logging });
+    agent.addTool(lspGetDocuments_1.LspGetDocuments.getSpec(), (input) => lspGetDocuments.invoke(input));
+    agent.addTool(lspReadDocumentContents_1.LspReadDocumentContents.getSpec(), (input) => lspReadDocumentContents.invoke(input));
+    agent.addTool(lspApplyWorkspaceEdit_1.LspApplyWorkspaceEdit.getSpec(), input => lspApplyWorkspaceEdit.invoke(input));
+    return () => { };
+};
+exports.LspToolsServer = LspToolsServer;
+const McpToolsServer = ({ workspace, logging, lsp, agent }) => {
+    lsp.onInitialized(async () => {
+        // todo: move to constants
+        const wsUris = lsp.getClientInitializeParams()?.workspaceFolders?.map(f => f.uri) ?? [];
+        const wsConfigPaths = wsUris.map(uri => `${uri}/.amazonq/mcp.json`);
+        const globalConfigPath = `${workspace.fs.getUserHomeDir()}/.aws/amazonq/mcp.json`;
+        const allPaths = [...wsConfigPaths, globalConfigPath];
+        const mgr = await mcpManager_1.McpManager.init(allPaths, { logging, workspace, lsp });
+        for (const def of mgr.getAllTools()) {
+            const baseSpec = def;
+            const namespaced = `${def.serverName}_${def.toolName}`;
+            const tool = new mcpTool_1.McpTool({ logging, workspace, lsp }, def);
+            agent.addTool({ name: namespaced, description: baseSpec.description, inputSchema: baseSpec.inputSchema }, (input) => tool.invoke(input));
+            logging.info(`MCP: registered tool ${namespaced}`);
+        }
+    });
+    return async () => {
+        await mcpManager_1.McpManager.instance.close();
+    };
+};
+exports.McpToolsServer = McpToolsServer;
 //# sourceMappingURL=toolServer.js.map

package/out/language-server/agenticChat/tools/toolServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"toolServer.js","sourceRoot":"","sources":["../../../../src/language-server/agenticChat/tools/toolServer.ts"],"names":[],"mappings":";;;AACA,qCAA+C;AAC/C,uCAAkD;AAE3C,MAAM,aAAa,GAAW,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE;IACnE,MAAM,UAAU,GAAG,IAAI,eAAM,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAA;IACrD,MAAM,WAAW,GAAG,IAAI,iBAAO,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAA;IAEvD,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,KAAmB,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IAEtF,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC,KAAoB,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IAEzF,OAAO,GAAG,EAAE,GAAE,CAAC,CAAA;AACnB,CAAC,CAAA;AATY,QAAA,aAAa,iBASzB"}
+{"version":3,"file":"toolServer.js","sourceRoot":"","sources":["../../../../src/language-server/agenticChat/tools/toolServer.ts"],"names":[],"mappings":"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"}

package/out/language-server/agenticChat/tools/toolShared.d.ts

@@ -1,7 +1,50 @@
-export declare const maxToolResponseSize = 30720;
+import { Features } from '@aws/language-server-runtimes/server-interface/server';
+interface Output<Kind, Content> {
+    kind: Kind;
+    content: Content;
+    success?: boolean;
+}
 export interface InvokeOutput {
-    output: {
-        kind: 'text' | 'json';
-        content: string;
-    };
+    output: Output<'text', string> | Output<'json', object>;
+}
+export interface CommandValidation {
+    requiresAcceptance: boolean;
+    warning?: string;
+}
+export declare function validatePath(path: string, exists: (p: string) => Promise<boolean>): Promise<void>;
+export interface CommandValidation {
+    requiresAcceptance: boolean;
+    warning?: string;
+}
+export declare class ToolApprovalException extends Error {
+    readonly message: string;
+    readonly shouldShowMessage: boolean;
+    constructor(message?: string, shouldShowMessage?: boolean);
+}
+export interface ExplanatoryParams {
+    explanation?: string;
+}
+export declare enum OutputKind {
+    Text = "text",
+    Json = "json"
 }
+/**
+ * Checks if a path has already been approved
+ * @param path The path to check
+ * @param approvedPaths Set of approved paths
+ * @returns True if the path or any parent directory has been approved
+ */
+export declare function isPathApproved(filePath: string, approvedPaths?: Set<string>): boolean;
+/**
+ * Shared implementation to check if a file path requires user acceptance.
+ * Returns true when the file is not resolvable within our workspace (i.e., is outside of our workspace).
+ * If the path has already been approved (in approvedPaths), returns false.
+ *
+ * @param path The file path to check
+ * @param lsp The LSP feature to get workspace folders
+ * @param logging Optional logging feature for better error reporting
+ * @param approvedPaths Optional set of paths that have already been approved
+ * @returns CommandValidation object with requiresAcceptance flag
+ */
+export declare function requiresPathAcceptance(path: string, lsp: Features['lsp'], logging: Features['logging'], approvedPaths?: Set<string>): Promise<CommandValidation>;
+export {};

package/out/language-server/agenticChat/tools/toolShared.js

@@ -1,5 +1,112 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.maxToolResponseSize = void 0;
-exports.maxToolResponseSize = 30720; // 30KB
+exports.OutputKind = exports.ToolApprovalException = void 0;
+exports.validatePath = validatePath;
+exports.isPathApproved = isPathApproved;
+exports.requiresPathAcceptance = requiresPathAcceptance;
+const lsp_core_1 = require("@aws/lsp-core");
+const workspaceUtils_1 = require("@aws/lsp-core/out/util/workspaceUtils");
+const path = require("path");
+async function validatePath(path, exists) {
+    if (!path || path.trim().length === 0) {
+        throw new Error('Path cannot be empty.');
+    }
+    const pathExists = await exists(path);
+    if (!pathExists) {
+        throw new Error(`Path "${path}" does not exist or cannot be accessed.`);
+    }
+}
+class ToolApprovalException extends Error {
+    message;
+    shouldShowMessage;
+    constructor(message = 'Tool execution invalidated', shouldShowMessage = true) {
+        super(message);
+        this.message = message;
+        this.shouldShowMessage = shouldShowMessage;
+    }
+}
+exports.ToolApprovalException = ToolApprovalException;
+var OutputKind;
+(function (OutputKind) {
+    OutputKind["Text"] = "text";
+    OutputKind["Json"] = "json";
+})(OutputKind || (exports.OutputKind = OutputKind = {}));
+/**
+ * Checks if a path has already been approved
+ * @param path The path to check
+ * @param approvedPaths Set of approved paths
+ * @returns True if the path or any parent directory has been approved
+ */
+function isPathApproved(filePath, approvedPaths) {
+    if (!approvedPaths || approvedPaths.size === 0) {
+        return false;
+    }
+    // Normalize path separators for consistent comparison
+    const normalizedFilePath = filePath.replace(/\\\\/g, '/');
+    // Check if the exact path is approved (try both original and normalized)
+    if (approvedPaths.has(filePath) || approvedPaths.has(normalizedFilePath)) {
+        return true;
+    }
+    // Get the root directory for traversal limits
+    const rootDir = path.parse(filePath).root.replace(/\\\\/g, '/');
+    // Check if any approved path is a parent of the file path using isParentFolder
+    for (const approvedPath of approvedPaths) {
+        const normalizedApprovedPath = approvedPath.replace(/\\\\/g, '/');
+        // Check using the isParentFolder utility
+        if (lsp_core_1.workspaceUtils.isParentFolder(normalizedApprovedPath, normalizedFilePath)) {
+            return true;
+        }
+        // Also check with trailing slash variations to ensure consistency
+        if (normalizedApprovedPath.endsWith('/')) {
+            // Try without trailing slash
+            const withoutSlash = normalizedApprovedPath.slice(0, -1);
+            if (lsp_core_1.workspaceUtils.isParentFolder(withoutSlash, normalizedFilePath)) {
+                return true;
+            }
+        }
+        else {
+            // Try with trailing slash
+            const withSlash = normalizedApprovedPath + '/';
+            if (lsp_core_1.workspaceUtils.isParentFolder(withSlash, normalizedFilePath)) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+/**
+ * Shared implementation to check if a file path requires user acceptance.
+ * Returns true when the file is not resolvable within our workspace (i.e., is outside of our workspace).
+ * If the path has already been approved (in approvedPaths), returns false.
+ *
+ * @param path The file path to check
+ * @param lsp The LSP feature to get workspace folders
+ * @param logging Optional logging feature for better error reporting
+ * @param approvedPaths Optional set of paths that have already been approved
+ * @returns CommandValidation object with requiresAcceptance flag
+ */
+async function requiresPathAcceptance(path, lsp, logging, approvedPaths) {
+    try {
+        // First check if the path is already approved
+        if (isPathApproved(path, approvedPaths)) {
+            return { requiresAcceptance: false };
+        }
+        const workspaceFolders = (0, workspaceUtils_1.getWorkspaceFolderPaths)(lsp);
+        if (!workspaceFolders || workspaceFolders.length === 0) {
+            if (logging) {
+                logging.debug('No workspace folders found when checking file acceptance');
+            }
+            return { requiresAcceptance: true };
+        }
+        const isInWorkspace = lsp_core_1.workspaceUtils.isInWorkspace(workspaceFolders, path);
+        return { requiresAcceptance: !isInWorkspace };
+    }
+    catch (error) {
+        if (logging) {
+            logging.error(`Error checking file acceptance: ${error}`);
+        }
+        // In case of error, safer to require acceptance
+        return { requiresAcceptance: true };
+    }
+}
 //# sourceMappingURL=toolShared.js.map

package/out/language-server/agenticChat/tools/toolShared.js.map

@@ -1 +1 @@
-{"version":3,"file":"toolShared.js","sourceRoot":"","sources":["../../../../src/language-server/agenticChat/tools/toolShared.ts"],"names":[],"mappings":";;;AAAa,QAAA,mBAAmB,GAAG,KAAK,CAAA,CAAC,OAAO"}
+{"version":3,"file":"toolShared.js","sourceRoot":"","sources":["../../../../src/language-server/agenticChat/tools/toolShared.ts"],"names":[],"mappings":"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"}

package/out/language-server/chat/chatController.d.ts

@@ -1,17 +1,19 @@
-import { FeedbackParams, InlineChatParams, InsertToCursorPositionParams } from '@aws/language-server-runtimes/protocol';
+import { FeedbackParams, InlineChatParams, InsertToCursorPositionParams, InlineChatResultParams, ButtonClickParams, ButtonClickResult } from '@aws/language-server-runtimes/protocol';
 import { CancellationToken, Chat, ChatParams, ChatResult, EndChatParams, QuickActionParams, ResponseError, TabAddParams, TabRemoveParams, TabChangeParams, InlineChatResult } from '@aws/language-server-runtimes/server-interface';
 import { Features, LspHandlers } from '../types';
 import { ChatSessionManagementService } from './chatSessionManagementService';
 import { TelemetryService } from '../../shared/telemetry/telemetryService';
 import { AmazonQWorkspaceConfig } from '../../shared/amazonQServiceManager/configurationUtils';
-import { AmazonQTokenServiceManager } from '../../shared/amazonQServiceManager/AmazonQTokenServiceManager';
-type ChatHandlers = Omit<LspHandlers<Chat>, 'openTab' | 'sendChatUpdate' | 'onFileClicked' | 'onInlineChatPrompt' | 'sendContextCommands' | 'onCreatePrompt' | 'onListConversations' | 'onConversationClick'>;
+import { AmazonQBaseServiceManager } from '../../shared/amazonQServiceManager/BaseAmazonQServiceManager';
+type ChatHandlers = Omit<LspHandlers<Chat>, 'openTab' | 'sendChatUpdate' | 'onFileClicked' | 'onInlineChatPrompt' | 'sendContextCommands' | 'onCreatePrompt' | 'onListConversations' | 'onConversationClick' | 'getSerializedChat' | 'onTabBarAction' | 'chatOptionsUpdate'>;
 export declare class ChatController implements ChatHandlers {
     #private;
-    constructor(chatSessionManagementService: ChatSessionManagementService, features: Features, telemetryService: TelemetryService, amazonQServiceManager: AmazonQTokenServiceManager);
+    constructor(chatSessionManagementService: ChatSessionManagementService, features: Features, telemetryService: TelemetryService, serviceManager: AmazonQBaseServiceManager);
     dispose(): void;
+    onButtonClick(params: ButtonClickParams): Promise<ButtonClickResult>;
     onChatPrompt(params: ChatParams, token: CancellationToken): Promise<ChatResult | ResponseError<ChatResult>>;
     onInlineChatPrompt(params: InlineChatParams, token: CancellationToken): Promise<InlineChatResult | ResponseError<InlineChatResult>>;
+    onInlineChatResult(handler: InlineChatResultParams): Promise<void>;
     onCodeInsertToCursorPosition(params: InsertToCursorPositionParams): Promise<void>;
     onCopyCodeToClipboard(): void;
     onEndChat(params: EndChatParams, _token: CancellationToken): boolean;
@@ -31,6 +33,7 @@ export declare class ChatController implements ChatHandlers {
         messageId: string;
         body: string;
     };
+    onPromptInputOptionChange(): void;
     updateConfiguration: (newConfig: AmazonQWorkspaceConfig) => void;
 }
 export {};