Removing Environment state objects from converter and addressing other comments

ashishrp-aws · ashishrp-aws · commit b4b7a3d6a107 · 2025-03-24T18:26:26.000-07:00
diff --git a/packages/core/src/codewhispererChat/constants.ts b/packages/core/src/codewhispererChat/constants.ts
@@ -4,6 +4,8 @@
  */
 import * as path from 'path'
 import fs from '../shared/fs/fs'
+import { Tool } from '@amzn/codewhisperer-streaming'
+import toolsJson from '../codewhispererChat/tools/tool_index.json'
 
 export const promptFileExtension = '.md'
 
@@ -19,3 +21,10 @@ export const getUserPromptsDirectory = () => {
 }
 
 export const createSavedPromptCommandId = 'create-saved-prompt'
+
+export const tools: Tool[] = Object.entries(toolsJson).map(([, toolSpec]) => ({
+    toolSpecification: {
+        ...toolSpec,
+        inputSchema: { json: toolSpec.inputSchema },
+    },
+}))
diff --git a/packages/core/src/codewhispererChat/controllers/chat/chatRequest/converter.ts b/packages/core/src/codewhispererChat/controllers/chat/chatRequest/converter.ts
@@ -7,18 +7,13 @@ import {
     ConversationState,
     CursorState,
     DocumentSymbol,
-    EnvState,
     RelevantTextDocument,
-    ShellState,
     SymbolType,
     TextDocument,
-    Tool,
 } from '@amzn/codewhisperer-streaming'
 import { ChatTriggerType, TriggerPayload } from '../model'
 import { undefinedIfEmpty } from '../../../../shared/utilities/textUtilities'
-import { tryGetCurrentWorkingDirectory } from '../../../../shared/utilities/workspaceUtils'
-import toolsJson from '../../../tools/tool_index.json'
-import { getOperatingSystem } from '../../../../shared/telemetry/util'
+import { tools } from '../../../constants'
 
 const fqnNameSizeDownLimit = 1
 const fqnNameSizeUpLimit = 256
@@ -43,14 +38,6 @@ export const supportedLanguagesList = [
 const filePathSizeLimit = 4_000
 const customerMessageSizeLimit = 4_000
 
-interface ToolSpec {
-    name: string
-    description: string
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    input_schema: Record<string, any>
-    [key: string]: any
-}
-
 export function triggerPayloadToChatRequest(triggerPayload: TriggerPayload): { conversationState: ConversationState } {
     let document: TextDocument | undefined = undefined
     let cursorState: CursorState | undefined = undefined
@@ -116,15 +103,6 @@ export function triggerPayloadToChatRequest(triggerPayload: TriggerPayload): { c
     const customizationArn: string | undefined = undefinedIfEmpty(triggerPayload.customization.arn)
     const chatTriggerType = triggerPayload.trigger === ChatTriggerType.InlineChatMessage ? 'INLINE_CHAT' : 'MANUAL'
 
-    const tools: Tool[] = Object.entries(toolsJson as Record<string, ToolSpec>).map(([toolName, toolSpec]) => ({
-        toolSpecification: {
-            ...toolSpec,
-            // Use the key as name if not already defined in the spec
-            name: toolSpec.name || toolName,
-            inputSchema: { json: toolSpec.input_schema },
-        },
-    }))
-
     return {
         conversationState: {
             currentMessage: {
@@ -138,9 +116,8 @@ export function triggerPayloadToChatRequest(triggerPayload: TriggerPayload): { c
                             cursorState,
                             relevantDocuments,
                             useRelevantDocuments,
+                            // TODO: Need workspace folders here after model update.
                         },
-                        envState: buildEnvState(),
-                        shellState: buildShellState(),
                         additionalContext: triggerPayload.additionalContents,
                         tools,
                         ...(triggerPayload.toolResults !== undefined &&
@@ -157,26 +134,3 @@ export function triggerPayloadToChatRequest(triggerPayload: TriggerPayload): { c
         },
     }
 }
-
-/**
- * Helper function to build environment state
- */
-export function buildEnvState(): EnvState {
-    return {
-        operatingSystem: getOperatingSystem(),
-        currentWorkingDirectory: tryGetCurrentWorkingDirectory(),
-    }
-}
-
-/**
- * Helper function to build shell state
- */
-export function buildShellState(): ShellState {
-    // In a real implementation, you would detect the shell
-    // This is a simplified version
-    const shellName = process.env.SHELL || 'bash'
-    return {
-        shellName: shellName.split('/').pop() || 'bash',
-        shellHistory: undefined,
-    }
-}
diff --git a/packages/core/src/codewhispererChat/storages/chatHistory.ts b/packages/core/src/codewhispererChat/storages/chatHistory.ts
@@ -12,8 +12,7 @@ import {
 } from '@amzn/codewhisperer-streaming'
 import { randomUUID } from '../../shared/crypto'
 import { getLogger } from '../../shared/logger/logger'
-import toolsJson from '../tools/tool_index.json'
-import { buildEnvState, buildShellState } from '../controllers/chat/chatRequest/converter'
+import { tools } from '../constants'
 
 // Maximum number of messages to keep in history
 const MaxConversationHistoryLength = 100
@@ -32,13 +31,7 @@ export class ChatHistoryManager {
     constructor() {
         this.conversationId = randomUUID()
         this.logger.info(`Generated new conversation id: ${this.conversationId}`)
-
-        this.tools = Object.entries(toolsJson).map(([, toolSpec]) => ({
-            toolSpecification: {
-                ...toolSpec,
-                inputSchema: { json: toolSpec.input_schema },
-            },
-        }))
+        this.tools = tools
     }
 
     /**
@@ -76,8 +69,6 @@ export class ChatHistoryManager {
                 content: newMessage.userInputMessage?.content ?? '',
                 userIntent: newMessage.userInputMessage?.userIntent ?? undefined,
                 userInputMessageContext: newMessage.userInputMessage?.userInputMessageContext ?? {
-                    envState: buildEnvState(),
-                    shellState: buildShellState(),
                     tools: this.tools,
                 },
                 origin: newMessage.userInputMessage?.origin ?? undefined,
@@ -184,7 +175,7 @@ export class ChatHistoryManager {
 
                         this.lastUserMessage.userInputMessage.userInputMessageContext = {
                             shellState: undefined,
-                            envState: buildEnvState(),
+                            envState: undefined,
                             toolResults: toolResults,
                             tools: this.tools.length === 0 ? undefined : [...this.tools],
                         }
@@ -200,7 +191,7 @@ export class ChatHistoryManager {
     addToolResults(toolResults: ToolResult[]): void {
         const userInputMessageContext: UserInputMessageContext = {
             shellState: undefined,
-            envState: buildEnvState(),
+            envState: undefined,
             toolResults: toolResults,
             tools: this.tools.length === 0 ? undefined : [...this.tools],
         }
@@ -214,36 +205,4 @@ export class ChatHistoryManager {
             this.lastUserMessage.userInputMessage = msg
         }
     }
-
-    /**
-     * Sets the next user message with "cancelled" tool results.
-     */
-    abandonToolUse(toolsToBeAbandoned: Array<[string, any]>, denyInput: string): void {
-        const toolResults = toolsToBeAbandoned.map(([toolUseId]) => ({
-            toolUseId,
-            content: [
-                {
-                    type: 'Text' as const,
-                    text: 'Tool use was cancelled by the user',
-                },
-            ],
-            status: ToolResultStatus.ERROR,
-        }))
-
-        const userInputMessageContext: UserInputMessageContext = {
-            shellState: undefined,
-            envState: buildEnvState(),
-            toolResults,
-            tools: this.tools.length > 0 ? [...this.tools] : undefined,
-        }
-
-        const msg: ChatMessage = {
-            userInputMessage: {
-                content: denyInput,
-                userInputMessageContext,
-            },
-        }
-
-        this.lastUserMessage = msg
-    }
 }
diff --git a/packages/core/src/codewhispererChat/tools/tool_index.json b/packages/core/src/codewhispererChat/tools/tool_index.json
@@ -1,16 +1,16 @@
 {
-    "fs_read": {
-        "name": "fs_read",
-        "description": "A tool for reading files (e.g. `cat -n`), or listing files/directories (e.g. `ls -la` or `find . -maxdepth 2). The behavior of this tool is determined by the `path` parameter pointing to a file or directory.\n* If `path` is a file, this tool returns the result of running `cat -n`, and the optional `read_range` determines what range of lines will be read from the specified file.\n* If `path` is a directory, this tool returns the listed files and directories of the specified path, as if running `ls -la`. If the `read_range` parameter is provided, the tool acts like the `find . -maxdepth <read_range>`, where `read_range` is the number of subdirectories deep to search, e.g. [2] will run `find . -maxdepth 2`.",
-        "input_schema": {
+    "fsRead": {
+        "name": "fsRead",
+        "description": "A tool for reading files (e.g. `cat -n`), or listing files/directories (e.g. `ls -la` or `find . -maxdepth 2). The behavior of this tool is determined by the `path` parameter pointing to a file or directory.\n* If `path` is a file, this tool returns the result of running `cat -n`, and the optional `readRange` determines what range of lines will be read from the specified file.\n* If `path` is a directory, this tool returns the listed files and directories of the specified path, as if running `ls -la`. If the `readRange` parameter is provided, the tool acts like the `find . -maxdepth <readRange>`, where `readRange` is the number of subdirectories deep to search, e.g. [2] will run `find . -maxdepth 2`.",
+        "inputSchema": {
             "type": "object",
             "properties": {
                 "path": {
                     "description": "Absolute path to file or directory, e.g. `/repo/file.py` or `/repo`.",
                     "type": "string"
                 },
-                "read_range": {
-                    "description": "Optional parameter when reading either files or directories.\n* When `path` is a file, if none is given, the full file is shown. If provided, the file will be shown in the indicated line number range, e.g. [11, 12] will show lines 11 and 12. Indexing at 1 to start. Setting `[start_line, -1]` shows all lines from `start_line` to the end of the file.\n* When `path` is a directory, if none is given, the results of `ls -l` are given. If provided, the current directory and indicated number of subdirectories will be shown, e.g. [2] will show the current directory and directories two levels deep.",
+                "readRange": {
+                    "description": "Optional parameter when reading either files or directories.\n* When `path` is a file, if none is given, the full file is shown. If provided, the file will be shown in the indicated line number range, e.g. [11, 12] will show lines 11 and 12. Indexing at 1 to start. Setting `[startLine, -1]` shows all lines from `startLine` to the end of the file.\n* When `path` is a directory, if none is given, the results of `ls -l` are given. If provided, the current directory and indicated number of subdirectories will be shown, e.g. [2] will show the current directory and directories two levels deep.",
                     "items": {
                         "type": "integer"
                     },
diff --git a/packages/core/src/shared/utilities/workspaceUtils.ts b/packages/core/src/shared/utilities/workspaceUtils.ts
@@ -673,26 +673,8 @@ export async function findStringInDirectory(searchStr: string, dirPath: string)
 }
 
 /**
- * Attempts to determine the current working directory based on the active editor or workspace.
- *
- * This function first checks if there is an active text editor open. If so, it returns
- * the directory containing the active file. If no editor is active, it falls back to
- * the first workspace folder's path.
- *
- * @returns {string | undefined} The path to the current working directory if it can be determined,
- *                              or undefined if no workspace folders are available and no editor is active.
- */
-export function tryGetCurrentWorkingDirectory() {
-    const activeTextEditor = vscode.window.activeTextEditor
-    return activeTextEditor
-        ? path.dirname(activeTextEditor.document.uri.fsPath)
-        : vscode.workspace.workspaceFolders?.[0].uri.fsPath
-}
-
-/**
- * Returns a one-character tag for a directory ('d'), symlink ('l'), or file ('-').
- */
  * Returns a one-character tag for a directory ('d'), symlink ('l'), or file ('-').
+ *
  */
 export function formatListing(name: string, fileType: vscode.FileType, fullPath: string): string {
     let typeChar = '-'
