rename cwsprChatCurrentFileXXX to cwsprChatFocusFileXXX

andrewyuq · andrewyuq · commit 9b95f3299be1 · 2025-03-24T04:51:04.000-07:00
diff --git a/packages/amazonq/src/inlineChat/provider/inlineChatProvider.ts b/packages/amazonq/src/inlineChat/provider/inlineChatProvider.ts
@@ -86,8 +86,8 @@ export class InlineChatProvider {
                             truncatedWorkspaceContextLength: 0,
                             userInputContextLength: 0,
                             truncatedUserInputContextLength: 0,
-                            currentFileContextLength: 0,
-                            truncatedCurrentFileContextLength: 0,
+                            focusFileContextLength: 0,
+                            truncatedFocusFileContextLength: 0,
                         },
                     },
                     triggerID
diff --git a/packages/amazonq/test/unit/codewhispererChat/controllers/chat/chatRequest/converter.test.ts b/packages/amazonq/test/unit/codewhispererChat/controllers/chat/chatRequest/converter.test.ts
@@ -15,7 +15,7 @@ describe('triggerPayloadToChatRequest', () => {
         trigger: ChatTriggerType.ChatMessage,
         contextLengths: {
             truncatedUserInputContextLength: 0,
-            truncatedCurrentFileContextLength: 0,
+            truncatedFocusFileContextLength: 0,
             truncatedWorkspaceContextLength: 0,
             truncatedAdditionalContextLengths: {
                 promptContextLength: 0,
@@ -29,7 +29,7 @@ describe('triggerPayloadToChatRequest', () => {
             },
             workspaceContextLength: 0,
             userInputContextLength: 0,
-            currentFileContextLength: 0,
+            focusFileContextLength: 0,
         },
         context: [],
         documentReferences: [],
@@ -139,7 +139,7 @@ describe('Context Priority Truncation Tests', () => {
         useRelevantDocuments: true,
         contextLengths: {
             truncatedUserInputContextLength: 0,
-            truncatedCurrentFileContextLength: 0,
+            truncatedFocusFileContextLength: 0,
             truncatedWorkspaceContextLength: 0,
             truncatedAdditionalContextLengths: {
                 promptContextLength: 0,
@@ -153,7 +153,7 @@ describe('Context Priority Truncation Tests', () => {
             },
             workspaceContextLength: 0,
             userInputContextLength: 0,
-            currentFileContextLength: 0,
+            focusFileContextLength: 0,
         },
         query: undefined,
         codeSelection: undefined,
diff --git a/packages/core/src/codewhispererChat/constants.ts b/packages/core/src/codewhispererChat/constants.ts
@@ -37,6 +37,6 @@ export const defaultContextLengths: ContextLengths = {
     truncatedWorkspaceContextLength: 0,
     userInputContextLength: 0,
     truncatedUserInputContextLength: 0,
-    currentFileContextLength: 0,
-    truncatedCurrentFileContextLength: 0,
+    focusFileContextLength: 0,
+    truncatedFocusFileContextLength: 0,
 }
diff --git a/packages/core/src/codewhispererChat/controllers/chat/chatRequest/converter.ts b/packages/core/src/codewhispererChat/controllers/chat/chatRequest/converter.ts
@@ -205,7 +205,7 @@ function preserveContexts(
         case ChatContextType.CurrentFile:
             truncationInfo = truncate(contexts as string, truncationInfo)
             triggerPayload.fileText = truncationInfo.textAfter
-            triggerPayload.contextLengths.truncatedCurrentFileContextLength = truncationInfo.sizeAfter
+            triggerPayload.contextLengths.truncatedFocusFileContextLength = truncationInfo.sizeAfter
             break
         case ChatContextType.UserSpecificPrompts:
             truncationInfo = truncateUserSpecificContexts(
@@ -279,7 +279,7 @@ function truncateWorkspaceContexts(
 function truncate(
     textBefore: string,
     truncationInfo: FlexibleTruncationInfo,
-    isCurrentFile: Boolean = false
+    isCurrentFile: boolean = false
 ): FlexibleTruncationInfo {
     const sizeBefore = truncationInfo.sizeBefore + textBefore.length
 
diff --git a/packages/core/src/codewhispererChat/controllers/chat/controller.ts b/packages/core/src/codewhispererChat/controllers/chat/controller.ts
@@ -1080,7 +1080,7 @@ export class ChatController {
         }
 
         triggerPayload.contextLengths.userInputContextLength = triggerPayload.message.length
-        triggerPayload.contextLengths.currentFileContextLength = triggerPayload.fileText.length
+        triggerPayload.contextLengths.focusFileContextLength = triggerPayload.fileText.length
         const request = triggerPayloadToChatRequest(triggerPayload)
         triggerPayload.documentReferences = this.mergeRelevantTextDocuments(triggerPayload.relevantTextDocuments)
 
diff --git a/packages/core/src/codewhispererChat/controllers/chat/model.ts b/packages/core/src/codewhispererChat/controllers/chat/model.ts
@@ -205,8 +205,8 @@ export type ContextLengths = {
     truncatedWorkspaceContextLength: number
     userInputContextLength: number
     truncatedUserInputContextLength: number
-    currentFileContextLength: number
-    truncatedCurrentFileContextLength: number
+    focusFileContextLength: number
+    truncatedFocusFileContextLength: number
 }
 
 export type AdditionalContextLengths = {
diff --git a/packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts b/packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts
@@ -543,8 +543,8 @@ export class CWCTelemetryHelper {
             cwsprChatPromptContextLength: triggerPayload.contextLengths.additionalContextLengths.promptContextLength,
             cwsprChatPromptContextTruncatedLength:
                 triggerPayload.contextLengths.truncatedAdditionalContextLengths.promptContextLength,
-            cwsprChatCurrentFileContextLength: triggerPayload.contextLengths.currentFileContextLength,
-            cwsprChatCurrentFileContextTruncatedLength: triggerPayload.contextLengths.truncatedCurrentFileContextLength,
+            cwsprChatFocusFileContextLength: triggerPayload.contextLengths.focusFileContextLength,
+            cwsprChatFocusFileContextTruncatedLength: triggerPayload.contextLengths.truncatedFocusFileContextLength,
             cwsprChatUserInputContextLength: triggerPayload.contextLengths.userInputContextLength,
             cwsprChatUserInputContextTruncatedLength: triggerPayload.contextLengths.truncatedUserInputContextLength,
             cwsprChatWorkspaceContextLength: triggerPayload.contextLengths.workspaceContextLength,
diff --git a/packages/core/src/shared/telemetry/vscodeTelemetry.json b/packages/core/src/shared/telemetry/vscodeTelemetry.json
@@ -230,14 +230,14 @@
             "description": "The number of executed operations"
         },
         {
-            "name": "cwsprChatCurrentFileContextLength",
+            "name": "cwsprChatFocusFileContextLength",
             "type": "int",
-            "description": "cwsprChatCurrentFileContextLength"
+            "description": "cwsprChatFocusFileContextLength"
         },
         {
-            "name": "cwsprChatCurrentFileContextTruncatedLength",
+            "name": "cwsprChatFocusFileContextTruncatedLength",
             "type": "int",
-            "description": "cwsprChatCurrentFileContextTruncatedLength"
+            "description": "cwsprChatFocusFileContextTruncatedLength"
         },
         {
             "name": "cwsprChatUserInputContextLength",
@@ -1184,11 +1184,11 @@
                     "type": "cwsprChatConversationType"
                 },
                 {
-                    "type": "cwsprChatCurrentFileContextLength",
+                    "type": "cwsprChatFocusFileContextLength",
                     "required": false
                 },
                 {
-                    "type": "cwsprChatCurrentFileContextTruncatedLength",
+                    "type": "cwsprChatFocusFileContextTruncatedLength",
                     "required": false
                 },
                 {

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ export const defaultContextLengths: ContextLengths = {`
`37`	`37`	`truncatedWorkspaceContextLength: 0,`
`38`	`38`	`userInputContextLength: 0,`
`39`	`39`	`truncatedUserInputContextLength: 0,`
`40`		`- currentFileContextLength: 0,`
`41`		`- truncatedCurrentFileContextLength: 0,`
	`40`	`+ focusFileContextLength: 0,`
	`41`	`+ truncatedFocusFileContextLength: 0,`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1080,7 +1080,7 @@ export class ChatController {`
`1080`	`1080`	`}`
`1081`	`1081`
`1082`	`1082`	`triggerPayload.contextLengths.userInputContextLength = triggerPayload.message.length`
`1083`		`- triggerPayload.contextLengths.currentFileContextLength = triggerPayload.fileText.length`
	`1083`	`+ triggerPayload.contextLengths.focusFileContextLength = triggerPayload.fileText.length`
`1084`	`1084`	`const request = triggerPayloadToChatRequest(triggerPayload)`
`1085`	`1085`	`triggerPayload.documentReferences = this.mergeRelevantTextDocuments(triggerPayload.relevantTextDocuments)`
`1086`	`1086`
Original file line number	Diff line number	Diff line change
`@@ -230,14 +230,14 @@`
`230`	`230`	`"description": "The number of executed operations"`
`231`	`231`	`},`
`232`	`232`	`{`
`233`		`- "name": "cwsprChatCurrentFileContextLength",`
	`233`	`+ "name": "cwsprChatFocusFileContextLength",`
`234`	`234`	`"type": "int",`
`235`		`- "description": "cwsprChatCurrentFileContextLength"`
	`235`	`+ "description": "cwsprChatFocusFileContextLength"`
`236`	`236`	`},`
`237`	`237`	`{`
`238`		`- "name": "cwsprChatCurrentFileContextTruncatedLength",`
	`238`	`+ "name": "cwsprChatFocusFileContextTruncatedLength",`
`239`	`239`	`"type": "int",`
`240`		`- "description": "cwsprChatCurrentFileContextTruncatedLength"`
	`240`	`+ "description": "cwsprChatFocusFileContextTruncatedLength"`
`241`	`241`	`},`
`242`	`242`	`{`
`243`	`243`	`"name": "cwsprChatUserInputContextLength",`
`@@ -1184,11 +1184,11 @@`
`1184`	`1184`	`"type": "cwsprChatConversationType"`
`1185`	`1185`	`},`
`1186`	`1186`	`{`
`1187`		`- "type": "cwsprChatCurrentFileContextLength",`
	`1187`	`+ "type": "cwsprChatFocusFileContextLength",`
`1188`	`1188`	`"required": false`
`1189`	`1189`	`},`
`1190`	`1190`	`{`
`1191`		`- "type": "cwsprChatCurrentFileContextTruncatedLength",`
	`1191`	`+ "type": "cwsprChatFocusFileContextTruncatedLength",`
`1192`	`1192`	`"required": false`
`1193`	`1193`	`},`
`1194`	`1194`	`{`