@aws/lsp-codewhisperer 0.0.88 → 0.0.90

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/lib/aws/partition.d.ts

@@ -0,0 +1,38 @@
+import { EndpointPartition } from "@smithy/types";
+export type PartitionsInfo = {
+    partitions: Array<{
+        id: string;
+        outputs: {
+            dnsSuffix: string;
+            dualStackDnsSuffix: string;
+            name: string;
+            supportsDualStack: boolean;
+            supportsFIPS: boolean;
+        };
+        regionRegex: string;
+        regions: Record<string, {
+            description?: string;
+        } | undefined>;
+    }>;
+};
+/**
+ * Evaluates a single string argument value as a region, and matches the
+ * string value to an AWS partition.
+ * The matcher MUST always return a successful object describing the partition
+ * that the region has been determined to be a part of.
+ */
+export declare const partition: (value: string) => EndpointPartition;
+/**
+ * Set custom partitions.json data.
+ * @internal
+ */
+export declare const setPartitionInfo: (partitionsInfo: PartitionsInfo, userAgentPrefix?: string) => void;
+/**
+ * Reset to the default partitions.json data.
+ * @internal
+ */
+export declare const useDefaultPartitionInfo: () => void;
+/**
+ * @internal
+ */
+export declare const getUserAgentPrefix: () => string;

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/lib/isIpAddress.d.ts

@@ -0,0 +1 @@
+export { isIpAddress } from "@smithy/util-endpoints";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/resolveEndpoint.d.ts

@@ -0,0 +1 @@
+export { resolveEndpoint } from "@smithy/util-endpoints";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/ts3.4/aws.d.ts

@@ -0,0 +1,2 @@
+import { EndpointFunctions } from "@smithy/util-endpoints";
+export declare const awsEndpointFunctions: EndpointFunctions;

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/ts3.4/index.d.ts

@@ -0,0 +1,5 @@
+export * from "./aws";
+export * from "./lib/aws/partition";
+export * from "./lib/isIpAddress";
+export * from "./resolveEndpoint";
+export * from "./types";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/ts3.4/lib/aws/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./isVirtualHostableS3Bucket";
+export * from "./parseArn";
+export * from "./partition";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/ts3.4/lib/aws/isVirtualHostableS3Bucket.d.ts

@@ -0,0 +1,4 @@
+export declare const isVirtualHostableS3Bucket: (
+  value: string,
+  allowSubDomains?: boolean
+) => boolean;

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/ts3.4/lib/aws/parseArn.d.ts

@@ -0,0 +1,2 @@
+import { EndpointARN } from "@smithy/types";
+export declare const parseArn: (value: string) => EndpointARN | null;

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/ts3.4/lib/aws/partition.d.ts

@@ -0,0 +1,28 @@
+import { EndpointPartition } from "@smithy/types";
+export type PartitionsInfo = {
+  partitions: Array<{
+    id: string;
+    outputs: {
+      dnsSuffix: string;
+      dualStackDnsSuffix: string;
+      name: string;
+      supportsDualStack: boolean;
+      supportsFIPS: boolean;
+    };
+    regionRegex: string;
+    regions: Record<
+      string,
+      | {
+          description?: string;
+        }
+      | undefined
+    >;
+  }>;
+};
+export declare const partition: (value: string) => EndpointPartition;
+export declare const setPartitionInfo: (
+  partitionsInfo: PartitionsInfo,
+  userAgentPrefix?: string
+) => void;
+export declare const useDefaultPartitionInfo: () => void;
+export declare const getUserAgentPrefix: () => string;

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/ts3.4/lib/isIpAddress.d.ts

@@ -0,0 +1 @@
+export { isIpAddress } from "@smithy/util-endpoints";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/ts3.4/resolveEndpoint.d.ts

@@ -0,0 +1 @@
+export { resolveEndpoint } from "@smithy/util-endpoints";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/ts3.4/types/EndpointError.d.ts

@@ -0,0 +1 @@
+export { EndpointError } from "@smithy/util-endpoints";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/ts3.4/types/EndpointRuleObject.d.ts

@@ -0,0 +1,6 @@
+export {
+  EndpointObjectProperties,
+  EndpointObjectHeaders,
+  EndpointObject,
+  EndpointRuleObject,
+} from "@smithy/util-endpoints";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/ts3.4/types/ErrorRuleObject.d.ts

@@ -0,0 +1 @@
+export { ErrorRuleObject } from "@smithy/util-endpoints";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/ts3.4/types/RuleSetObject.d.ts

@@ -0,0 +1,5 @@
+export {
+  DeprecatedObject,
+  ParameterObject,
+  RuleSetObject,
+} from "@smithy/util-endpoints";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/ts3.4/types/TreeRuleObject.d.ts

@@ -0,0 +1 @@
+export { RuleSetRules, TreeRuleObject } from "@smithy/util-endpoints";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/ts3.4/types/index.d.ts

@@ -0,0 +1,6 @@
+export * from "./EndpointError";
+export * from "./EndpointRuleObject";
+export * from "./ErrorRuleObject";
+export * from "./RuleSetObject";
+export * from "./TreeRuleObject";
+export * from "./shared";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/ts3.4/types/shared.d.ts

@@ -0,0 +1,12 @@
+export {
+  ReferenceObject,
+  FunctionObject,
+  FunctionArgv,
+  FunctionReturn,
+  ConditionObject,
+  Expression,
+  EndpointParams,
+  EndpointResolverOptions,
+  ReferenceRecord,
+  EvaluateOptions,
+} from "@smithy/util-endpoints";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/types/EndpointError.d.ts

@@ -0,0 +1 @@
+export { EndpointError } from "@smithy/util-endpoints";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/types/EndpointRuleObject.d.ts

@@ -0,0 +1 @@
+export { EndpointObjectProperties, EndpointObjectHeaders, EndpointObject, EndpointRuleObject, } from "@smithy/util-endpoints";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/types/ErrorRuleObject.d.ts

@@ -0,0 +1 @@
+export { ErrorRuleObject } from "@smithy/util-endpoints";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/types/RuleSetObject.d.ts

@@ -0,0 +1 @@
+export { DeprecatedObject, ParameterObject, RuleSetObject } from "@smithy/util-endpoints";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/types/TreeRuleObject.d.ts

@@ -0,0 +1 @@
+export { RuleSetRules, TreeRuleObject } from "@smithy/util-endpoints";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/types/index.d.ts

@@ -0,0 +1,6 @@
+export * from "./EndpointError";
+export * from "./EndpointRuleObject";
+export * from "./ErrorRuleObject";
+export * from "./RuleSetObject";
+export * from "./TreeRuleObject";
+export * from "./shared";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/dist-types/types/shared.d.ts

@@ -0,0 +1 @@
+export { ReferenceObject, FunctionObject, FunctionArgv, FunctionReturn, ConditionObject, Expression, EndpointParams, EndpointResolverOptions, ReferenceRecord, EvaluateOptions, } from "@smithy/util-endpoints";

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@aws-sdk/util-endpoints/package.json

@@ -0,0 +1,58 @@
+{
+  "name": "@aws-sdk/util-endpoints",
+  "version": "3.731.0",
+  "description": "Utilities to help with endpoint resolution",
+  "main": "./dist-cjs/index.js",
+  "module": "./dist-es/index.js",
+  "types": "./dist-types/index.d.ts",
+  "scripts": {
+    "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
+    "build:cjs": "node ../../scripts/compilation/inline util-endpoints",
+    "build:es": "tsc -p tsconfig.es.json",
+    "build:include:deps": "lerna run --scope $npm_package_name --include-dependencies build",
+    "build:types": "tsc -p tsconfig.types.json",
+    "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
+    "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo",
+    "test": "yarn g:vitest run",
+    "test:integration": "yarn g:vitest run -c vitest.config.integ.ts",
+    "test:watch": "yarn g:vitest watch",
+    "test:integration:watch": "yarn g:vitest watch -c vitest.config.integ.ts"
+  },
+  "author": {
+    "name": "AWS SDK for JavaScript Team",
+    "url": "https://aws.amazon.com/javascript/"
+  },
+  "license": "Apache-2.0",
+  "dependencies": {
+    "@aws-sdk/types": "3.731.0",
+    "@smithy/types": "^4.0.0",
+    "@smithy/util-endpoints": "^3.0.0",
+    "tslib": "^2.6.2"
+  },
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "typesVersions": {
+    "<4.0": {
+      "dist-types/*": [
+        "dist-types/ts3.4/*"
+      ]
+    }
+  },
+  "files": [
+    "dist-*/**"
+  ],
+  "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/packages/util-endpoints",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/aws/aws-sdk-js-v3.git",
+    "directory": "packages/util-endpoints"
+  },
+  "devDependencies": {
+    "@tsconfig/recommended": "1.0.1",
+    "concurrently": "7.0.0",
+    "downlevel-dts": "0.10.1",
+    "rimraf": "3.0.2",
+    "typescript": "~5.2.2"
+  }
+}

package/node_modules/@amzn/codewhisperer-runtime/package.json

@@ -27,6 +27,7 @@
         "@aws-sdk/region-config-resolver": "3.731.0",
         "@aws-sdk/token-providers": "3.731.1",
         "@aws-sdk/types": "3.731.0",
+        "@aws-sdk/util-endpoints": "3.731.0",
         "@aws-sdk/util-user-agent-browser": "3.731.0",
         "@aws-sdk/util-user-agent-node": "3.731.0",
         "@smithy/config-resolver": "^4.0.1",
@@ -35,6 +36,7 @@
         "@smithy/hash-node": "^4.0.1",
         "@smithy/invalid-dependency": "^4.0.1",
         "@smithy/middleware-content-length": "^4.0.1",
+        "@smithy/middleware-endpoint": "^4.0.2",
         "@smithy/middleware-retry": "^4.0.3",
         "@smithy/middleware-serde": "^4.0.1",
         "@smithy/middleware-stack": "^4.0.1",
@@ -49,6 +51,7 @@
         "@smithy/util-body-length-node": "^4.0.0",
         "@smithy/util-defaults-mode-browser": "^4.0.3",
         "@smithy/util-defaults-mode-node": "^4.0.3",
+        "@smithy/util-endpoints": "^3.0.1",
         "@smithy/util-middleware": "^4.0.1",
         "@smithy/util-retry": "^4.0.1",
         "@smithy/util-utf8": "^4.0.0",

package/out/client/token/codewhisperer.d.ts

@@ -2,5 +2,5 @@ import { CodeWhispererRuntimeClient, CodeWhispererRuntimeClientConfig } from '@a
 import { SDKInitializator, Logging, CredentialsProvider } from '@aws/language-server-runtimes/server-interface';
 export interface CodeWhispererTokenClientConfigurationOptions extends CodeWhispererRuntimeClientConfig {
 }
-export declare function createCodeWhispererTokenClient(options: CodeWhispererTokenClientConfigurationOptions, sdkInitializator: SDKInitializator, logging: Logging, credentialsProvider: CredentialsProvider, shareCodeWhispererContentWithAWS: boolean): CodeWhispererRuntimeClient;
+export declare function createCodeWhispererTokenClient(options: CodeWhispererTokenClientConfigurationOptions, sdkInitializator: SDKInitializator, logging: Logging, credentialsProvider: CredentialsProvider, shareCodeWhispererContentWithAWS: () => boolean): CodeWhispererRuntimeClient;
 export type CodeWhispererTokenClient = CodeWhispererRuntimeClient;

package/out/client/token/codewhisperer.js

@@ -10,7 +10,7 @@ function createCodeWhispererTokenClient(options, sdkInitializator, logging, cred
     // Add middleware for custom headers
     client.middlewareStack.add(next => async (args) => {
         const request = args.request;
-        request.headers['x-amzn-codewhisperer-optout'] = `${!shareCodeWhispererContentWithAWS}`;
+        request.headers['x-amzn-codewhisperer-optout'] = `${!shareCodeWhispererContentWithAWS()}`;
         if (credentialsProvider.getConnectionType() === 'external_idp') {
             request.headers['TokenType'] = 'EXTERNAL_IDP';
         }

package/out/client/token/codewhisperer.js.map

@@ -1 +1 @@
-{"version":3,"file":"codewhisperer.js","sourceRoot":"","sources":["../../../src/client/token/codewhisperer.ts"],"names":[],"mappings":";;AAQA,wEAsDC;AA9DD,uEAA0G;AAQ1G,SAAgB,8BAA8B,CAC1C,OAAqD,EACrD,gBAAkC,EAClC,OAAgB,EAChB,mBAAwC,EACxC,gCAAyC;IAEzC,OAAO,CAAC,GAAG,CACP,gHAAgH,CACnH,CAAA;IAED,MAAM,MAAM,GAAG,gBAAgB,CAAC,kDAA0B,EAAE;QACxD,GAAG,OAAO;KACb,CAAC,CAAA;IAEF,oCAAoC;IACpC,MAAM,CAAC,eAAe,CAAC,GAAG,CACtB,IAAI,CAAC,EAAE,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;QACjB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAsB,CAAA;QAC3C,OAAO,CAAC,OAAO,CAAC,6BAA6B,CAAC,GAAG,GAAG,CAAC,gCAAgC,EAAE,CAAA;QAEvF,IAAI,mBAAmB,CAAC,iBAAiB,EAAE,KAAK,cAAc,EAAE,CAAC;YAC7D,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,cAAc,CAAA;QACjD,CAAC;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,CAAA;IACrB,CAAC,EACD,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CACtC,CAAA;IAED,yCAAyC;IACzC,MAAM,CAAC,eAAe,CAAC,GAAG,CACtB,IAAI,CAAC,EAAE,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;QACjB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAA;QAE/B,yCAAyC;QACzC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YAClB,MAAM,YAAY,GAAG,MAAM,CAAC,QAAwB,CAAA;YACpD,IAAI,YAAY,CAAC,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC;gBACnD,qCAAqC;gBACrC,CAAC;gBAAC,MAAM,CAAC,MAAM,CAAC,SAAiB,CAAC,WAAW,GAAG,YAAY,CAAC,OAAO,CAAA;YACxE,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAA;IACjB,CAAC,EACD;QACI,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,gBAAgB;QACtB,QAAQ,EAAE,MAAM;KACnB,CACJ,CAAA;IAED,OAAO,MAAM,CAAA;AACjB,CAAC"}
+{"version":3,"file":"codewhisperer.js","sourceRoot":"","sources":["../../../src/client/token/codewhisperer.ts"],"names":[],"mappings":";;AAQA,wEAsDC;AA9DD,uEAA0G;AAQ1G,SAAgB,8BAA8B,CAC1C,OAAqD,EACrD,gBAAkC,EAClC,OAAgB,EAChB,mBAAwC,EACxC,gCAA+C;IAE/C,OAAO,CAAC,GAAG,CACP,gHAAgH,CACnH,CAAA;IAED,MAAM,MAAM,GAAG,gBAAgB,CAAC,kDAA0B,EAAE;QACxD,GAAG,OAAO;KACb,CAAC,CAAA;IAEF,oCAAoC;IACpC,MAAM,CAAC,eAAe,CAAC,GAAG,CACtB,IAAI,CAAC,EAAE,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;QACjB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAsB,CAAA;QAC3C,OAAO,CAAC,OAAO,CAAC,6BAA6B,CAAC,GAAG,GAAG,CAAC,gCAAgC,EAAE,EAAE,CAAA;QAEzF,IAAI,mBAAmB,CAAC,iBAAiB,EAAE,KAAK,cAAc,EAAE,CAAC;YAC7D,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,cAAc,CAAA;QACjD,CAAC;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,CAAA;IACrB,CAAC,EACD,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CACtC,CAAA;IAED,yCAAyC;IACzC,MAAM,CAAC,eAAe,CAAC,GAAG,CACtB,IAAI,CAAC,EAAE,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;QACjB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAA;QAE/B,yCAAyC;QACzC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YAClB,MAAM,YAAY,GAAG,MAAM,CAAC,QAAwB,CAAA;YACpD,IAAI,YAAY,CAAC,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC;gBACnD,qCAAqC;gBACrC,CAAC;gBAAC,MAAM,CAAC,MAAM,CAAC,SAAiB,CAAC,WAAW,GAAG,YAAY,CAAC,OAAO,CAAA;YACxE,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAA;IACjB,CAAC,EACD;QACI,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,gBAAgB;QACtB,QAAQ,EAAE,MAAM;KACnB,CACJ,CAAA;IAED,OAAO,MAAM,CAAA;AACjB,CAAC"}

package/out/language-server/agenticChat/agenticChatController.d.ts

@@ -34,6 +34,13 @@ export declare class AgenticChatController implements ChatHandlers {
     onRuleClick(params: RuleClickParams): Promise<import("@aws/language-server-runtimes/protocol").RuleClickResult>;
     onListRules(params: ListRulesParams): Promise<import("@aws/language-server-runtimes/protocol").ListRulesResult>;
     onListMcpServers(params: ListMcpServersParams): Promise<{
+        header: {
+            title: string;
+            description: string;
+            actions: never[];
+        };
+        list: never[];
+    } | {
         header: {
             title: string;
             description: string;

package/out/language-server/agenticChat/agenticChatController.js

@@ -1372,7 +1372,15 @@ class AgenticChatController {
                     // — DEFAULT ⇒ Only MCP tools, but can also handle generic tool execution messages
                     default:
                         // Get original server and tool names from the mapping
-                        const originalNames = mcpManager_1.McpManager.instance.getOriginalToolNames(toolUse.name);
+                        let originalNames;
+                        try {
+                            originalNames = mcpManager_1.McpManager.instance.getOriginalToolNames(toolUse.name);
+                        }
+                        catch (error) {
+                            // McpManager not initialized, skip MCP tool handling
+                            this.#features.logging.debug(`McpManager not initialized, skipping MCP tool handling with error: ${error}`);
+                            originalNames = undefined;
+                        }
                         // Remove explanation field from toolUse.input for MCP tools
                         // many MCP servers do not support explanation field and it will break the tool if this is altered
                         if (originalNames &&
@@ -1384,9 +1392,16 @@ class AgenticChatController {
                         }
                         if (originalNames) {
                             const { serverName, toolName } = originalNames;
-                            const def = mcpManager_1.McpManager.instance
-                                .getAllTools()
-                                .find(d => d.serverName === serverName && d.toolName === toolName);
+                            let def;
+                            try {
+                                def = mcpManager_1.McpManager.instance
+                                    .getAllTools()
+                                    .find(d => d.serverName === serverName && d.toolName === toolName);
+                            }
+                            catch (error) {
+                                this.#features.logging.debug(`McpManager not initialized, cannot get tool definitions with error: ${error}`);
+                                def = undefined;
+                            }
                             if (def) {
                                 const mcpTool = new mcpTool_1.McpTool(this.#features, def);
                                 const { requiresAcceptance, warning } = await mcpTool.requiresAcceptance(serverName, toolName);
@@ -1608,7 +1623,15 @@ class AgenticChatController {
                     this.#telemetryController.emitToolUseSuggested(toolUse, session.conversationId ?? '', this.#features.runtime.serverInfo.version ?? '', undefined, session.pairProgrammingMode, this.#abTestingAllocation?.experimentName, this.#abTestingAllocation?.userVariation, 'Failed');
                 }
                 // Handle MCP tool failures
-                const originalNames = mcpManager_1.McpManager.instance.getOriginalToolNames(toolUse.name);
+                let originalNames;
+                try {
+                    originalNames = mcpManager_1.McpManager.instance.getOriginalToolNames(toolUse.name);
+                }
+                catch (error) {
+                    // McpManager not initialized, skip MCP error handling
+                    this.#features.logging.debug(`McpManager not initialized, skipping MCP error handling with error: ${error}`);
+                    originalNames = undefined;
+                }
                 if (originalNames && toolUse.toolUseId) {
                     const { toolName } = originalNames;
                     const cachedToolUse = session.toolUseLookup.get(toolUse.toolUseId);
@@ -3541,16 +3564,39 @@ class AgenticChatController {
             return allTools;
         }
         // Clear tool name mapping to avoid conflicts from previous registrations
-        mcpManager_1.McpManager.instance.clearToolNameMapping();
+        try {
+            mcpManager_1.McpManager.instance.clearToolNameMapping();
+        }
+        catch (error) {
+            // McpManager not initialized, return tools without MCP
+            this.#features.logging.debug(`McpManager not initialized in #getTools, returning non-MCP tools with error: ${error}`);
+            return session.pairProgrammingMode
+                ? allTools
+                : allTools.filter(tool => !builtInWriteTools.has(tool.toolSpecification?.name || ''));
+        }
         const tempMapping = new Map();
         // Read Only Tools = All Tools - Restricted Tools (MCP + Write Tools)
         // TODO: mcp tool spec name will be server___tool.
         // TODO: Will also need to handle rare edge cases of long server name + long tool name > 64 char
         const allNamespacedTools = new Set();
-        const mcpToolSpecNames = new Set(mcpManager_1.McpManager.instance
-            .getAllTools()
-            .map(tool => (0, mcpUtils_1.createNamespacedToolName)(tool.serverName, tool.toolName, allNamespacedTools, tempMapping)));
-        mcpManager_1.McpManager.instance.setToolNameMapping(tempMapping);
+        let mcpToolSpecNames;
+        try {
+            mcpToolSpecNames = new Set(mcpManager_1.McpManager.instance
+                .getAllTools()
+                .map(tool => (0, mcpUtils_1.createNamespacedToolName)(tool.serverName, tool.toolName, allNamespacedTools, tempMapping)));
+        }
+        catch (error) {
+            // McpManager not initialized, use empty set
+            this.#features.logging.debug(`McpManager not initialized, cannot get MCP tools because of error: ${error}`);
+            mcpToolSpecNames = new Set();
+        }
+        try {
+            mcpManager_1.McpManager.instance.setToolNameMapping(tempMapping);
+        }
+        catch (error) {
+            // McpManager not initialized, skip setting mapping
+            this.#features.logging.debug(`McpManager not initialized, cannot set tool name mapping because of error: ${error}`);
+        }
         const restrictedToolNames = new Set([...mcpToolSpecNames, ...builtInWriteTools]);
         const readOnlyTools = allTools.filter(tool => {
             const toolName = tool.toolSpecification.name;
@@ -3589,12 +3635,27 @@ class AgenticChatController {
             return;
         }
         // Get original server and tool names from the mapping
-        const originalNames = mcpManager_1.McpManager.instance.getOriginalToolNames(toolUse.name);
+        let originalNames;
+        try {
+            originalNames = mcpManager_1.McpManager.instance.getOriginalToolNames(toolUse.name);
+        }
+        catch (error) {
+            // McpManager not initialized, skip MCP tool result handling
+            this.#features.logging.debug(`McpManager not initialized, cannot handle MCP tool result because of error: ${error}`);
+            originalNames = undefined;
+        }
         if (originalNames) {
             const { serverName, toolName } = originalNames;
-            const def = mcpManager_1.McpManager.instance
-                .getAllTools()
-                .find(d => d.serverName === serverName && d.toolName === toolName);
+            let def;
+            try {
+                def = mcpManager_1.McpManager.instance
+                    .getAllTools()
+                    .find(d => d.serverName === serverName && d.toolName === toolName);
+            }
+            catch (error) {
+                this.#features.logging.debug(`McpManager not initialized, cannot get tool definitions because of error: ${error}`);
+                def = undefined;
+            }
             if (def) {
                 // Format the tool result and input as JSON strings
                 const toolInput = JSON.stringify(toolUse.input, null, 2);