@aws/lsp-codewhisperer 0.0.102 → 0.0.104

package/node_modules/@amzn/codewhisperer-runtime/dist-types/models/models_1.d.ts

@@ -1,4 +1,274 @@
-import { CodeGenerationStatus, ConversationState, Intent, IntentContext, TaskAssistPlanStep, WorkspaceState } from "./models_0";
+import { CodeWhispererRuntimeServiceException as __BaseException } from "./CodeWhispererRuntimeServiceException";
+import { Bonus, CodeGenerationStatus, ConversationState, Currency, Intent, IntentContext, OverageConfiguration, ResourceType, SubscriptionInfo, TaskAssistPlanStep, TotalUsage, UsageLimitList, UsageLimitType, UsageLimitUpdateRequestStatus, UserInfo, WorkspaceState } from "./models_0";
+import { ExceptionOptionType as __ExceptionOptionType } from "@smithy/smithy-client";
+/**
+ * @public
+ * @enum
+ */
+export declare const FreeTrialStatus: {
+    readonly ACTIVE: "ACTIVE";
+    readonly EXPIRED: "EXPIRED";
+};
+/**
+ * @public
+ */
+export type FreeTrialStatus = typeof FreeTrialStatus[keyof typeof FreeTrialStatus];
+/**
+ * @public
+ */
+export interface FreeTrialInfo {
+    /**
+     * Status of the free trial for this customer
+     * @public
+     */
+    freeTrialStatus?: FreeTrialStatus | undefined;
+    /**
+     * Unix timestamp of free trial expiry in seconds
+     * @public
+     */
+    freeTrialExpiry?: Date | undefined;
+    /**
+     * Current free trial usage
+     * @public
+     */
+    currentUsage?: number | undefined;
+    /**
+     * Current free trial usage with Precision
+     * @public
+     */
+    currentUsageWithPrecision?: number | undefined;
+    /**
+     * Free trial usage limit
+     * @public
+     */
+    usageLimit?: number | undefined;
+    /**
+     * Free trial usage limit with Precision
+     * @public
+     */
+    usageLimitWithPrecision?: number | undefined;
+}
+/**
+ * @public
+ */
+export interface UsageBreakdown {
+    /**
+     * The resource or dimension being billed, e.g. VIBE or SPEC
+     * @public
+     */
+    resourceType?: ResourceType | undefined;
+    /**
+     * Human-friendly display name of this resource
+     * @public
+     */
+    displayName?: string | undefined;
+    /**
+     * Human-friendly display name of this resource in plural
+     * @public
+     */
+    displayNamePlural?: string | undefined;
+    /**
+     * Current usage count for the billing period
+     * @public
+     */
+    currentUsage: number | undefined;
+    /**
+     * Current usage count for the billing period with Precision
+     * @public
+     */
+    currentUsageWithPrecision?: number | undefined;
+    /**
+     * Current overages count for the billing period
+     * @public
+     */
+    currentOverages: number | undefined;
+    /**
+     * Current overages count for the billing period with Precision
+     * @public
+     */
+    currentOveragesWithPrecision?: number | undefined;
+    /**
+     * Usage limit based on subscription tier
+     * @public
+     */
+    usageLimit: number | undefined;
+    /**
+     * Usage limit based on subscription tier with Precision
+     * @public
+     */
+    usageLimitWithPrecision?: number | undefined;
+    /**
+     * Unit of measurement for the resource, e.g. INVOCATIONS
+     * @public
+     */
+    unit?: string | undefined;
+    /**
+     * Total overage charges
+     * @public
+     */
+    overageCharges: number | undefined;
+    /**
+     * The currency used for overage charges
+     * @public
+     */
+    currency: Currency | undefined;
+    /**
+     * Overage rate for the resource per 1 unit
+     * @public
+     */
+    overageRate?: number | undefined;
+    /**
+     * The next reset date in UTC timezone.
+     * @public
+     */
+    nextDateReset?: Date | undefined;
+    /**
+     * The maximum amount of usage allowed beyond the included quota in a billing period
+     * @public
+     */
+    overageCap?: number | undefined;
+    /**
+     * The maximum amount of usage allowed beyond the included quota in a billing period with Precision
+     * @public
+     */
+    overageCapWithPrecision?: number | undefined;
+    /**
+     * User's free trial info
+     * @public
+     */
+    freeTrialInfo?: FreeTrialInfo | undefined;
+    /**
+     * Redeemed bonuses
+     * @public
+     */
+    bonuses?: (Bonus)[] | undefined;
+}
+/**
+ * @public
+ */
+export interface GetUsageLimitsResponse {
+    limits?: (UsageLimitList)[] | undefined;
+    /**
+     * The next reset date in UTC timezone.
+     * @public
+     */
+    nextDateReset?: Date | undefined;
+    /**
+     * Number of days remaining until the usage metrics reset
+     * @public
+     */
+    daysUntilReset?: number | undefined;
+    /**
+     * @deprecated
+     *
+     * Usage breakdown by SKU type
+     * @public
+     */
+    usageBreakdown?: UsageBreakdown | undefined;
+    /**
+     * List of usage by resource type
+     * @public
+     */
+    usageBreakdownList?: (UsageBreakdown)[] | undefined;
+    /**
+     * Subscription Info
+     * @public
+     */
+    subscriptionInfo?: SubscriptionInfo | undefined;
+    /**
+     * Overage Configuration
+     * @public
+     */
+    overageConfiguration?: OverageConfiguration | undefined;
+    /**
+     * User Information
+     * @public
+     */
+    userInfo?: UserInfo | undefined;
+    /**
+     * Total overage usage information
+     * @public
+     */
+    totalUsage?: TotalUsage | undefined;
+}
+/**
+ * @internal
+ */
+export declare const GetUsageLimitsResponseFilterSensitiveLog: (obj: GetUsageLimitsResponse) => any;
+/**
+ * @public
+ */
+export interface SetUserPreferenceRequest {
+    overageConfiguration?: OverageConfiguration | undefined;
+    profileArn?: string | undefined;
+}
+/**
+ * @public
+ */
+export interface SetUserPreferenceResponse {
+}
+/**
+ * Exception thrown when the number of usage limit update requests exceeds the monthly quota (default 3 requests per month)
+ * @public
+ */
+export declare class UpdateUsageLimitQuotaExceededException extends __BaseException {
+    readonly name: "UpdateUsageLimitQuotaExceededException";
+    readonly $fault: "client";
+    /**
+     * @internal
+     */
+    constructor(opts: __ExceptionOptionType<UpdateUsageLimitQuotaExceededException, __BaseException>);
+}
+/**
+ * @public
+ */
+export interface UpdateUsageLimitsRequest {
+    accountId: string | undefined;
+    accountlessUserId?: string | undefined;
+    directoryId?: string | undefined;
+    featureType: UsageLimitType | undefined;
+    requestedLimit: number | undefined;
+    justification?: string | undefined;
+    permanentOverride?: boolean | undefined;
+}
+/**
+ * @public
+ */
+export interface UpdateUsageLimitsResponse {
+    status: UsageLimitUpdateRequestStatus | undefined;
+    approvedLimit?: number | undefined;
+    remainingRequestsThisMonth?: number | undefined;
+}
+/**
+ * Structure to represent bootstrap conversation request.
+ * @public
+ */
+export interface CreateTaskAssistConversationRequest {
+    profileArn?: string | undefined;
+}
+/**
+ * Structure to represent bootstrap conversation response.
+ * @public
+ */
+export interface CreateTaskAssistConversationResponse {
+    /**
+     * ID which represents a multi-turn conversation
+     * @public
+     */
+    conversationId: string | undefined;
+}
+/**
+ * Structure to represent bootstrap conversation request.
+ * @public
+ */
+export interface DeleteTaskAssistConversationRequest {
+    /**
+     * ID which represents a multi-turn conversation
+     * @public
+     */
+    conversationId: string | undefined;
+    profileArn?: string | undefined;
+}
 /**
  * Structure to represent bootstrap conversation response.
  * @public

package/node_modules/@amzn/codewhisperer-runtime/dist-types/runtimeConfig.browser.d.ts

@@ -16,8 +16,13 @@ export declare const getRuntimeConfig: (config: CodeWhispererRuntimeClientConfig
     streamCollector: import("@smithy/types").StreamCollector;
     useDualstackEndpoint: boolean | import("@smithy/types").Provider<boolean>;
     useFipsEndpoint: boolean | import("@smithy/types").Provider<boolean>;
-    apiVersion: string;
     cacheMiddleware?: boolean | undefined;
+    protocol?: import("@smithy/types").ClientProtocol<any, any> | import("@smithy/types").$ClientProtocol<any, any> | import("@smithy/types").ClientProtocolCtor<any, any> | import("@smithy/types").$ClientProtocolCtor<any, any> | undefined;
+    protocolSettings?: {
+        [setting: string]: unknown;
+        defaultNamespace?: string | undefined;
+    } | undefined;
+    apiVersion: string;
     urlParser: import("@smithy/types").UrlParser;
     base64Decoder: import("@smithy/types").Decoder;
     base64Encoder: (_input: string | Uint8Array) => string;

package/node_modules/@amzn/codewhisperer-runtime/dist-types/runtimeConfig.d.ts

@@ -24,8 +24,13 @@ export declare const getRuntimeConfig: (config: CodeWhispererRuntimeClientConfig
     useDualstackEndpoint: boolean | import("@smithy/types").Provider<boolean>;
     useFipsEndpoint: boolean | import("@smithy/types").Provider<boolean>;
     userAgentAppId: string | import("@smithy/types").Provider<string | undefined>;
-    apiVersion: string;
     cacheMiddleware?: boolean | undefined;
+    protocol?: import("@smithy/types").ClientProtocol<any, any> | import("@smithy/types").$ClientProtocol<any, any> | import("@smithy/types").ClientProtocolCtor<any, any> | import("@smithy/types").$ClientProtocolCtor<any, any> | undefined;
+    protocolSettings?: {
+        [setting: string]: unknown;
+        defaultNamespace?: string | undefined;
+    } | undefined;
+    apiVersion: string;
     urlParser: import("@smithy/types").UrlParser;
     base64Decoder: import("@smithy/types").Decoder;
     base64Encoder: (_input: string | Uint8Array) => string;

package/node_modules/@amzn/codewhisperer-runtime/dist-types/runtimeConfig.native.d.ts

@@ -6,8 +6,13 @@ export declare const getRuntimeConfig: (config: CodeWhispererRuntimeClientConfig
     runtime: string;
     sha256: import("@smithy/types").HashConstructor;
     requestHandler: import("@smithy/types").NodeHttpHandlerOptions | import("@smithy/types").FetchHttpHandlerOptions | Record<string, unknown> | import("@smithy/protocol-http").HttpHandler<any> | import("@smithy/fetch-http-handler").FetchHttpHandler;
-    apiVersion: string;
     cacheMiddleware?: boolean | undefined;
+    protocol?: import("@smithy/types").ClientProtocol<any, any> | import("@smithy/types").$ClientProtocol<any, any> | import("@smithy/types").ClientProtocolCtor<any, any> | import("@smithy/types").$ClientProtocolCtor<any, any> | undefined;
+    protocolSettings?: {
+        [setting: string]: unknown;
+        defaultNamespace?: string | undefined;
+    } | undefined;
+    apiVersion: string;
     urlParser: import("@smithy/types").UrlParser;
     bodyLengthChecker: import("@smithy/types").BodyLengthCalculator;
     streamCollector: import("@smithy/types").StreamCollector;

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@smithy/abort-controller/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smithy/abort-controller",
-  "version": "4.2.5",
+  "version": "4.2.8",
   "description": "A simple abort controller library",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -26,7 +26,7 @@
   "license": "Apache-2.0",
   "sideEffects": false,
   "dependencies": {
-    "@smithy/types": "^4.9.0",
+    "@smithy/types": "^4.12.0",
     "tslib": "^2.6.2"
   },
   "engines": {
@@ -51,7 +51,7 @@
   "devDependencies": {
     "concurrently": "7.0.0",
     "downlevel-dts": "0.10.1",
-    "rimraf": "3.0.2",
+    "rimraf": "5.0.10",
     "typedoc": "0.23.23"
   },
   "typedoc": {

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@smithy/node-http-handler/dist-cjs/index.js

@@ -231,7 +231,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
         });
     }
     resolveDefaultConfig(options) {
-        const { requestTimeout, connectionTimeout, socketTimeout, socketAcquisitionWarningTimeout, httpAgent, httpsAgent, throwOnRequestTimeout, } = options || {};
+        const { requestTimeout, connectionTimeout, socketTimeout, socketAcquisitionWarningTimeout, httpAgent, httpsAgent, throwOnRequestTimeout, logger, } = options || {};
         const keepAlive = true;
         const maxSockets = 50;
         return {
@@ -254,7 +254,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
                 }
                 return new https.Agent({ keepAlive, maxSockets, ...httpsAgent });
             })(),
-            logger: console,
+            logger,
         };
     }
     destroy() {

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@smithy/node-http-handler/dist-es/node-http-handler.js

@@ -61,7 +61,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
         });
     }
     resolveDefaultConfig(options) {
-        const { requestTimeout, connectionTimeout, socketTimeout, socketAcquisitionWarningTimeout, httpAgent, httpsAgent, throwOnRequestTimeout, } = options || {};
+        const { requestTimeout, connectionTimeout, socketTimeout, socketAcquisitionWarningTimeout, httpAgent, httpsAgent, throwOnRequestTimeout, logger, } = options || {};
         const keepAlive = true;
         const maxSockets = 50;
         return {
@@ -84,7 +84,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
                 }
                 return new hsAgent({ keepAlive, maxSockets, ...httpsAgent });
             })(),
-            logger: console,
+            logger,
         };
     }
     destroy() {

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@smithy/node-http-handler/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@smithy/node-http-handler",
-  "version": "4.4.5",
+  "version": "4.4.9",
   "description": "Provides a way to make requests",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",
     "build:cjs": "node ../../scripts/inline node-http-handler",
     "build:es": "yarn g:tsc -p tsconfig.es.json",
     "build:types": "yarn g:tsc -p tsconfig.types.json",
-    "build:types:downlevel": "rimraf dist-types/ts3.4 && downlevel-dts dist-types dist-types/ts3.4",
-    "stage-release": "rimraf ./.release && yarn pack && mkdir ./.release && tar zxvf ./package.tgz --directory ./.release && rm ./package.tgz",
-    "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo || exit 0",
+    "build:types:downlevel": "premove dist-types/ts3.4 && downlevel-dts dist-types dist-types/ts3.4",
+    "stage-release": "premove .release && yarn pack && mkdir ./.release && tar zxvf ./package.tgz --directory ./.release && rm ./package.tgz",
+    "clean": "premove dist-cjs dist-es dist-types tsconfig.cjs.tsbuildinfo tsconfig.es.tsbuildinfo tsconfig.types.tsbuildinfo",
     "lint": "eslint -c ../../.eslintrc.js \"src/**/*.ts\"",
     "format": "prettier --config ../../prettier.config.js --ignore-path ../../.prettierignore --write \"**/*.{ts,md,json}\"",
     "extract:docs": "api-extractor run --local",
@@ -27,17 +27,17 @@
   "module": "./dist-es/index.js",
   "types": "./dist-types/index.d.ts",
   "dependencies": {
-    "@smithy/abort-controller": "^4.2.5",
-    "@smithy/protocol-http": "^5.3.5",
-    "@smithy/querystring-builder": "^4.2.5",
-    "@smithy/types": "^4.9.0",
+    "@smithy/abort-controller": "^4.2.8",
+    "@smithy/protocol-http": "^5.3.8",
+    "@smithy/querystring-builder": "^4.2.8",
+    "@smithy/types": "^4.12.0",
     "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@types/node": "^18.11.9",
     "concurrently": "7.0.0",
     "downlevel-dts": "0.10.1",
-    "rimraf": "3.0.2",
+    "premove": "4.0.0",
     "typedoc": "0.23.23"
   },
   "engines": {

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@smithy/types/dist-types/schema/schema-deprecated.d.ts

@@ -134,3 +134,10 @@ export interface ClientProtocol<Request, Response> extends ConfigurableSerdeCont
     updateServiceEndpoint(request: Request, endpoint: EndpointV2): Request;
     deserializeResponse<Output extends MetadataBearer>(operationSchema: OperationSchema, context: HandlerExecutionContext & SerdeFunctions, response: Response): Promise<Output>;
 }
+/**
+ * @public
+ * @deprecated use $ClientProtocolCtor.
+ */
+export interface ClientProtocolCtor<Request, Response> {
+    new (args: any): ClientProtocol<Request, Response>;
+}

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@smithy/types/dist-types/schema/schema.d.ts

@@ -219,6 +219,12 @@ export interface $ClientProtocol<Request, Response> extends ConfigurableSerdeCon
     updateServiceEndpoint(request: Request, endpoint: EndpointV2): Request;
     deserializeResponse<Output extends MetadataBearer>(operationSchema: $OperationSchema, context: HandlerExecutionContext & SerdeFunctions, response: Response): Promise<Output>;
 }
+/**
+ * @public
+ */
+export interface $ClientProtocolCtor<Request, Response> {
+    new (args: any): $ClientProtocol<Request, Response>;
+}
 /**
  * Allows a protocol, codec, or serde utility to accept the serdeContext
  * from a client configuration or request/response handlerExecutionContext.

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@smithy/types/dist-types/schema/static-schemas.d.ts

@@ -15,6 +15,10 @@ export type StaticSchemaIdMap = 2;
  * @public
  */
 export type StaticSchemaIdStruct = 3;
+/**
+ * @public
+ */
+export type StaticSchemaIdUnion = 4;
 /**
  * @public
  */
@@ -26,7 +30,7 @@ export type StaticSchemaIdOperation = 9;
 /**
  * @public
  */
-export type StaticSchema = StaticSimpleSchema | StaticListSchema | StaticMapSchema | StaticStructureSchema | StaticErrorSchema | StaticOperationSchema;
+export type StaticSchema = StaticSimpleSchema | StaticListSchema | StaticMapSchema | StaticStructureSchema | StaticUnionSchema | StaticErrorSchema | StaticOperationSchema;
 /**
  * @public
  */
@@ -56,6 +60,18 @@ export type StaticStructureSchema = [
     ShapeName,
     SchemaTraits,
     string[],
+    $SchemaRef[],
+    number?
+];
+/**
+ * @public
+ */
+export type StaticUnionSchema = [
+    StaticSchemaIdUnion,
+    ShapeNamespace,
+    ShapeName,
+    SchemaTraits,
+    string[],
     $SchemaRef[]
 ];
 /**
@@ -67,7 +83,8 @@ export type StaticErrorSchema = [
     ShapeName,
     SchemaTraits,
     string[],
-    $SchemaRef[]
+    $SchemaRef[],
+    number?
 ];
 /**
  * @public

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@smithy/types/dist-types/ts3.4/schema/schema-deprecated.d.ts

@@ -140,3 +140,10 @@ export interface ClientProtocol<Request, Response> extends ConfigurableSerdeCont
     updateServiceEndpoint(request: Request, endpoint: EndpointV2): Request;
     deserializeResponse<Output extends MetadataBearer>(operationSchema: OperationSchema, context: HandlerExecutionContext & SerdeFunctions, response: Response): Promise<Output>;
 }
+/**
+ * @public
+ * @deprecated use $ClientProtocolCtor.
+ */
+export interface ClientProtocolCtor<Request, Response> {
+    new (args: any): ClientProtocol<Request, Response>;
+}

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@smithy/types/dist-types/ts3.4/schema/schema.d.ts

@@ -234,6 +234,12 @@ export interface $ClientProtocol<Request, Response> extends ConfigurableSerdeCon
     updateServiceEndpoint(request: Request, endpoint: EndpointV2): Request;
     deserializeResponse<Output extends MetadataBearer>(operationSchema: $OperationSchema, context: HandlerExecutionContext & SerdeFunctions, response: Response): Promise<Output>;
 }
+/**
+ * @public
+ */
+export interface $ClientProtocolCtor<Request, Response> {
+    new (args: any): $ClientProtocol<Request, Response>;
+}
 /**
  * Allows a protocol, codec, or serde utility to accept the serdeContext
  * from a client configuration or request/response handlerExecutionContext.

package/node_modules/@amzn/codewhisperer-runtime/node_modules/@smithy/types/dist-types/ts3.4/schema/static-schemas.d.ts

@@ -15,6 +15,10 @@ export type StaticSchemaIdMap = 2;
  * @public
  */
 export type StaticSchemaIdStruct = 3;
+/**
+ * @public
+ */
+export type StaticSchemaIdUnion = 4;
 /**
  * @public
  */
@@ -26,7 +30,7 @@ export type StaticSchemaIdOperation = 9;
 /**
  * @public
  */
-export type StaticSchema = StaticSimpleSchema | StaticListSchema | StaticMapSchema | StaticStructureSchema | StaticErrorSchema | StaticOperationSchema;
+export type StaticSchema = StaticSimpleSchema | StaticListSchema | StaticMapSchema | StaticStructureSchema | StaticUnionSchema | StaticErrorSchema | StaticOperationSchema;
 /**
  * @public
  */
@@ -75,6 +79,18 @@ export type StaticStructureSchema = [
     ShapeName,
     SchemaTraits,
     string[],
+    $SchemaRef[],
+    number?
+];
+/**
+ * @public
+ */
+export type StaticUnionSchema = [
+    StaticSchemaIdUnion,
+    ShapeNamespace,
+    ShapeName,
+    SchemaTraits,
+    string[],
     $SchemaRef[]
 ];
 /**
@@ -86,7 +102,8 @@ export type StaticErrorSchema = [
     ShapeName,
     SchemaTraits,
     string[],
-    $SchemaRef[]
+    $SchemaRef[],
+    number?
 ];
 /**
  * @public

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

@@ -1,6 +1,6 @@
 {
   "name": "@smithy/types",
-  "version": "4.9.0",
+  "version": "4.12.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",
     "build:cjs": "node ../../scripts/inline types",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "concurrently": "7.0.0",
     "downlevel-dts": "0.10.1",
-    "rimraf": "3.0.2",
+    "rimraf": "5.0.10",
     "typedoc": "0.23.23"
   },
   "typedoc": {

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

@@ -20,6 +20,7 @@ const chatTelemetryController_1 = require("../chat/telemetry/chatTelemetryContro
 const quickActions_1 = require("../chat/quickActions");
 const metric_1 = require("../../shared/telemetry/metric");
 const utils_2 = require("../../shared/utils");
+const languageDetection_1 = require("../../shared/languageDetection");
 const constants_1 = require("../chat/constants");
 const errors_1 = require("../../shared/amazonQServiceManager/errors");
 const AmazonQTokenServiceManager_1 = require("../../shared/amazonQServiceManager/AmazonQTokenServiceManager");
@@ -798,7 +799,7 @@ class AgenticChatController {
         this.#debug('Preparing request input');
         // Get profileArn from the service manager if available
         const profileArn = this.#serviceManager?.getActiveProfileArn();
-        const requestInput = await this.#triggerContext.getChatParamsFromTrigger(params, triggerContext, codewhisperer_streaming_1.ChatTriggerType.MANUAL, this.#customizationArn, chatResultStream, profileArn, this.#getTools(session), additionalContext, session.modelId, this.#origin, images);
+        const requestInput = await this.#triggerContext.getChatParamsFromTrigger(params, triggerContext, codewhisperer_streaming_1.ChatTriggerType.MANUAL, this.#customizationArn, chatResultStream, profileArn, this.#getTools(session), additionalContext, session.modelId, this.#origin, images, session.conversationId);
         return requestInput;
     }
     /**
@@ -808,7 +809,7 @@ class AgenticChatController {
         this.#debug('Preparing compaction request input');
         // Get profileArn from the service manager if available
         const profileArn = this.#serviceManager?.getActiveProfileArn();
-        const requestInput = this.#triggerContext.getCompactionChatCommandInput(profileArn, this.#getTools(session), session.modelId, this.#origin);
+        const requestInput = this.#triggerContext.getCompactionChatCommandInput(profileArn, this.#getTools(session), session.modelId, this.#origin, session.conversationId);
         return requestInput;
     }
     /**
@@ -1466,7 +1467,7 @@ class AgenticChatController {
                 // After approval, add the path to the approved paths in the session
                 const inputPath = toolUse.input?.path || toolUse.input?.cwd;
                 if (inputPath) {
-                    session.addApprovedPath(inputPath);
+                    session.addApprovedPath(inputPath, toolUse.name);
                 }
                 const ws = this.#getWritableStream(chatResultStream, toolUse);
                 const result = await this.#features.agent.runTool(toolUse.name, toolUse.input, token, ws);
@@ -1556,11 +1557,13 @@ class AgenticChatController {
                         this.#telemetryController.emitInteractWithAgenticChat('GeneratedDiff', tabId, session.pairProgrammingMode, session.getConversationType(), this.#abTestingAllocation?.experimentName, this.#abTestingAllocation?.userVariation);
                         // Emit acceptedLineCount when write tool is used and code changes are accepted
                         const acceptedLineCount = (0, fileModificationMetrics_1.calculateModifiedLines)(toolUse, doc?.getText());
+                        const programmingLanguage = (0, languageDetection_1.getCodeWhispererLanguageIdFromPath)(input.path);
                         await this.#telemetryController.emitInteractWithMessageMetric(tabId, {
                             cwsprChatMessageId: chatResult.messageId ?? toolUse.toolUseId,
                             cwsprChatInteractionType: types_1.ChatInteractionType.AgenticCodeAccepted,
                             codewhispererCustomizationArn: this.#customizationArn,
-                        }, acceptedLineCount);
+                            cwsprChatProgrammingLanguage: programmingLanguage,
+                        }, acceptedLineCount, session.conversationId);
                         await chatResultStream.writeResultBlock(chatResult);
                         break;
                     case codeReview_1.CodeReview.toolName: