revert: use cw streaming client from npm (#1552)

ctlai95 · web-flow · commit 788d8ed58f82 · 2025-06-26T16:20:18.000-07:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -14,3 +14,20 @@ updates:
                   - '@typescript-eslint/*'
       commit-message:
           prefix: 'chore'
+    - package-ecosystem: 'npm'
+      directory: '/core/codewhisperer-streaming'
+      target-branch: 'main'
+      schedule:
+          interval: 'weekly'
+      ignore:
+          - dependency-name: 'tslib'
+          - dependency-name: '@aws-crypto/*'
+          - dependency-name: '@aws-sdk/*'
+          - dependency-name: '@smithy/*'
+          - dependency-name: 'uuid'
+          - dependency-name: '@tsconfig/node16'
+          - dependency-name: 'concurrently'
+          - dependency-name: 'downlevel-dts'
+          - dependency-name: 'rimraf'
+          - dependency-name: 'typescript'
+          - dependency-name: '@types/*'
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ build
 .gradle
 .idea
 **/*.tgz
+!core/codewhisperer-streaming/amzn-codewhisperer-streaming-*.tgz
 !core/q-developer-streaming-client/amzn-amazon-q-developer-streaming-client-*.tgz
 !server/aws-lsp-codewhisperer/types/types-local-indexing-*.tgz
 
diff --git a/core/codewhisperer-streaming/amzn-codewhisperer-streaming-1.0.0.tgz b/core/codewhisperer-streaming/amzn-codewhisperer-streaming-1.0.0.tgz
diff --git a/package-lock.json b/package-lock.json
diff --git a/server/aws-lsp-codewhisperer/package.json b/server/aws-lsp-codewhisperer/package.json
@@ -32,10 +32,10 @@
     },
     "dependencies": {
         "@amzn/amazon-q-developer-streaming-client": "file:../../core/q-developer-streaming-client/amzn-amazon-q-developer-streaming-client-1.0.0.tgz",
+        "@amzn/codewhisperer-streaming": "file:../../core/codewhisperer-streaming/amzn-codewhisperer-streaming-1.0.0.tgz",
         "@aws-sdk/util-arn-parser": "^3.723.0",
         "@aws-sdk/util-retry": "^3.374.0",
         "@aws/chat-client-ui-types": "^0.1.40",
-        "@aws/codewhisperer-streaming-client": "^1.0.1",
         "@aws/language-server-runtimes": "^0.2.101",
         "@aws/lsp-core": "^0.0.10",
         "@modelcontextprotocol/sdk": "^1.9.0",
@@ -100,6 +100,7 @@
         "endOfLine": "lf"
     },
     "bundleDependencies": [
+        "@amzn/codewhisperer-streaming",
         "@amzn/amazon-q-developer-streaming-client"
     ]
 }
diff --git a/server/aws-lsp-codewhisperer/src/client/streamingClient/codewhispererStreamingClient.ts b/server/aws-lsp-codewhisperer/src/client/streamingClient/codewhispererStreamingClient.ts
@@ -1,4 +1,4 @@
-import { CodeWhispererStreaming, CodeWhispererStreamingClientConfig } from '@aws/codewhisperer-streaming-client'
+import { CodeWhispererStreaming, CodeWhispererStreamingClientConfig } from '@amzn/codewhisperer-streaming'
 import { ConfiguredRetryStrategy } from '@aws-sdk/util-retry'
 import { SDKInitializator, Logging } from '@aws/language-server-runtimes/server-interface'
 
diff --git a/server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.test.ts b/server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.test.ts
@@ -12,7 +12,7 @@ import {
     ContentType,
     GenerateAssistantResponseCommandInput,
     SendMessageCommandInput,
-} from '@aws/codewhisperer-streaming-client'
+} from '@amzn/codewhisperer-streaming'
 import {
     QDeveloperStreaming,
     SendMessageCommandInput as SendMessageCommandInputQDeveloperStreaming,
diff --git a/server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts b/server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts
@@ -13,7 +13,7 @@ import {
     ToolResultStatus,
     ToolUse,
     ToolUseEvent,
-} from '@aws/codewhisperer-streaming-client'
+} from '@amzn/codewhisperer-streaming'
 import {
     SendMessageCommandInput,
     SendMessageCommandOutput,
diff --git a/server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatEventParser.ts b/server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatEventParser.ts
@@ -3,7 +3,7 @@
  * Will be deleted or merged.
  */
 
-import { ChatResponseStream, Reference, SupplementaryWebLink, ToolUse } from '@aws/codewhisperer-streaming-client'
+import { ChatResponseStream, Reference, SupplementaryWebLink, ToolUse } from '@amzn/codewhisperer-streaming'
 import {
     ChatItemAction,
     ChatResult,
diff --git a/server/aws-lsp-codewhisperer/src/language-server/agenticChat/context/agenticChatTriggerContext.ts b/server/aws-lsp-codewhisperer/src/language-server/agenticChat/context/agenticChatTriggerContext.ts
@@ -13,7 +13,7 @@ import {
     ProgrammingLanguage,
     EnvState,
     Origin,
-} from '@aws/codewhisperer-streaming-client'
+} from '@amzn/codewhisperer-streaming'
 import {
     BedrockTools,
     ChatParams,
@@ -29,7 +29,7 @@ import { workspaceUtils } from '@aws/lsp-core'
 import { URI } from 'vscode-uri'
 import { LocalProjectContextController } from '../../../shared/localProjectContextController'
 import * as path from 'path'
-import { RelevantTextDocument } from '@aws/codewhisperer-streaming-client'
+import { RelevantTextDocument } from '@amzn/codewhisperer-streaming'
 import { languageByExtension } from '../../../shared/languageDetection'
 import { AgenticChatResultStream } from '../agenticChatResultStream'
 import { ContextInfo, mergeFileLists, mergeRelevantTextDocuments } from './contextUtils'
diff --git a/server/aws-lsp-codewhisperer/src/language-server/agenticChat/context/agenticChatTriggerContexts.test.ts b/server/aws-lsp-codewhisperer/src/language-server/agenticChat/context/agenticChatTriggerContexts.test.ts
@@ -11,7 +11,7 @@ import * as path from 'path'
 import * as sinon from 'sinon'
 import { AgenticChatTriggerContext } from './agenticChatTriggerContext'
 import { DocumentContext, DocumentContextExtractor } from '../../chat/contexts/documentContext'
-import { ChatTriggerType, CursorState } from '@aws/codewhisperer-streaming-client'
+import { ChatTriggerType, CursorState } from '@amzn/codewhisperer-streaming'
 import { URI } from 'vscode-uri'
 import { InitializeParams } from '@aws/language-server-runtimes/protocol'
 import { TestFolder } from '@aws/lsp-core/out/test/testFolder'
diff --git a/server/aws-lsp-codewhisperer/src/language-server/agenticChat/errors.ts b/server/aws-lsp-codewhisperer/src/language-server/agenticChat/errors.ts
@@ -1,4 +1,4 @@
-import { CodeWhispererStreamingServiceException } from '@aws/codewhisperer-streaming-client'
+import { CodeWhispererStreamingServiceException } from '@amzn/codewhisperer-streaming'
 
 type AgenticChatErrorCode =
     | 'QModelResponse' // generic backend error.
diff --git a/server/aws-lsp-codewhisperer/src/language-server/agenticChat/textFormatting.ts b/server/aws-lsp-codewhisperer/src/language-server/agenticChat/textFormatting.ts
@@ -1,4 +1,4 @@
-import { ToolUse } from '@aws/codewhisperer-streaming-client'
+import { ToolUse } from '@amzn/codewhisperer-streaming'
 
 function codeBlocked(s: string) {
     const codeBlock = `\`\`\`\``
diff --git a/server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/chatDb/chatDb.test.ts b/server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/chatDb/chatDb.test.ts
@@ -8,7 +8,7 @@ import sinon from 'ts-sinon'
 import { ChatDatabase, ToolResultValidationError } from './chatDb'
 import { Features } from '@aws/language-server-runtimes/server-interface/server'
 import { Message } from './util'
-import { ChatMessage, ToolResultStatus } from '@aws/codewhisperer-streaming-client'
+import { ChatMessage, ToolResultStatus } from '@amzn/codewhisperer-streaming'
 import * as fs from 'fs'
 
 describe('ChatDatabase', () => {
diff --git a/server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/chatDb/chatDb.ts b/server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/chatDb/chatDb.ts
@@ -24,7 +24,7 @@ import * as crypto from 'crypto'
 import * as path from 'path'
 import { Features } from '@aws/language-server-runtimes/server-interface/server'
 import { ContextCommand, ConversationItemGroup } from '@aws/language-server-runtimes/protocol'
-import { ChatMessage, ToolResultStatus } from '@aws/codewhisperer-streaming-client'
+import { ChatMessage, ToolResultStatus } from '@amzn/codewhisperer-streaming'
 import { ChatItemType } from '@aws/mynah-ui'
 import { getUserHomeDir } from '@aws/lsp-core/out/util/path'
 import { ChatHistoryMaintainer } from './chatHistoryMaintainer'
diff --git a/server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/chatDb/util.test.ts b/server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/chatDb/util.test.ts
@@ -21,7 +21,7 @@ import {
 } from './util'
 import { ChatMessage } from '@aws/language-server-runtimes/protocol'
 import { Workspace } from '@aws/language-server-runtimes/server-interface'
-import { ChatMessage as StreamingMessage } from '@aws/codewhisperer-streaming-client'
+import { ChatMessage as StreamingMessage } from '@amzn/codewhisperer-streaming'
 
 describe('ChatDb Utilities', () => {
     describe('messageToStreamingMessage', () => {
diff --git a/server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/chatDb/util.ts b/server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/chatDb/util.ts
@@ -20,7 +20,7 @@ import {
     ToolUse,
     UserInputMessage,
     AssistantResponseMessage,
-} from '@aws/codewhisperer-streaming-client'
+} from '@amzn/codewhisperer-streaming'
 import { Workspace } from '@aws/language-server-runtimes/server-interface'
 import { activeFileCmd } from '../../context/addtionalContextProvider'
 import { ChatItemType } from '@aws/mynah-ui'
diff --git a/server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/codeSearch.ts b/server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/codeSearch.ts
@@ -3,7 +3,7 @@ import { Features } from '@aws/language-server-runtimes/server-interface/server'
 import { getWorkspaceFolderPaths } from '@aws/lsp-core/out/util/workspaceUtils'
 import { LocalProjectContextController } from '../../../shared/localProjectContextController'
 import { Chunk } from 'local-indexing'
-import { RelevantTextDocument } from '@aws/codewhisperer-streaming-client'
+import { RelevantTextDocument } from '@amzn/codewhisperer-streaming'
 import { LineInfo } from '../context/agenticChatTriggerContext'
 import path = require('path')
 
diff --git a/server/aws-lsp-codewhisperer/src/language-server/chat/chatController.test.ts b/server/aws-lsp-codewhisperer/src/language-server/chat/chatController.test.ts
@@ -1,8 +1,4 @@
-import {
-    ChatResponseStream,
-    CodeWhispererStreaming,
-    SendMessageCommandInput,
-} from '@aws/codewhisperer-streaming-client'
+import { ChatResponseStream, CodeWhispererStreaming, SendMessageCommandInput } from '@amzn/codewhisperer-streaming'
 import {
     ChatResult,
     LSPErrorCodes,
diff --git a/server/aws-lsp-codewhisperer/src/language-server/chat/chatController.ts b/server/aws-lsp-codewhisperer/src/language-server/chat/chatController.ts
@@ -1,4 +1,4 @@
-import { ChatTriggerType } from '@aws/codewhisperer-streaming-client'
+import { ChatTriggerType } from '@amzn/codewhisperer-streaming'
 import {
     ApplyWorkspaceEditParams,
     ErrorCodes,
diff --git a/server/aws-lsp-codewhisperer/src/language-server/chat/chatEventParser.ts b/server/aws-lsp-codewhisperer/src/language-server/chat/chatEventParser.ts
@@ -2,7 +2,7 @@ import {
     ChatResponseStream as ChatResponseStreamCodeWhispererStreaming,
     Reference,
     SupplementaryWebLink,
-} from '@aws/codewhisperer-streaming-client'
+} from '@amzn/codewhisperer-streaming'
 import { ChatResponseStream as ChatResponseStreamQDeveloperStreaming } from '@amzn/amazon-q-developer-streaming-client'
 import {
     ChatItemAction,
diff --git a/server/aws-lsp-codewhisperer/src/language-server/chat/chatSessionService.test.ts b/server/aws-lsp-codewhisperer/src/language-server/chat/chatSessionService.test.ts
@@ -1,4 +1,4 @@
-import { SendMessageCommandInput, SendMessageCommandOutput, ChatTriggerType } from '@aws/codewhisperer-streaming-client'
+import { SendMessageCommandInput, SendMessageCommandOutput, ChatTriggerType } from '@amzn/codewhisperer-streaming'
 import * as assert from 'assert'
 import sinon, { StubbedInstance, stubInterface } from 'ts-sinon'
 import { ChatSessionService } from './chatSessionService'
diff --git a/server/aws-lsp-codewhisperer/src/language-server/chat/chatSessionService.ts b/server/aws-lsp-codewhisperer/src/language-server/chat/chatSessionService.ts
@@ -6,7 +6,7 @@ import {
     Origin,
     SendMessageCommand,
     ToolUse,
-} from '@aws/codewhisperer-streaming-client'
+} from '@amzn/codewhisperer-streaming'
 import {
     StreamingClientServiceToken,
     SendMessageCommandInput,
diff --git a/server/aws-lsp-codewhisperer/src/language-server/chat/contexts/documentContext.test.ts b/server/aws-lsp-codewhisperer/src/language-server/chat/contexts/documentContext.test.ts
@@ -1,3 +1,4 @@
+import { EditorState } from '@amzn/codewhisperer-streaming'
 import * as assert from 'assert'
 import sinon from 'ts-sinon'
 import { TextDocument } from 'vscode-languageserver-textdocument'
diff --git a/server/aws-lsp-codewhisperer/src/language-server/chat/contexts/documentContext.ts b/server/aws-lsp-codewhisperer/src/language-server/chat/contexts/documentContext.ts
@@ -1,4 +1,4 @@
-import { EditorState, TextDocument as CwsprTextDocument } from '@aws/codewhisperer-streaming-client'
+import { EditorState, TextDocument as CwsprTextDocument } from '@amzn/codewhisperer-streaming'
 import { CursorState, WorkspaceFolder } from '@aws/language-server-runtimes/server-interface'
 import { Range, TextDocument } from 'vscode-languageserver-textdocument'
 import { getLanguageId } from '../../../shared/languageDetection'
diff --git a/server/aws-lsp-codewhisperer/src/language-server/chat/contexts/triggerContext.ts b/server/aws-lsp-codewhisperer/src/language-server/chat/contexts/triggerContext.ts
@@ -1,11 +1,5 @@
 import { TriggerType } from '@aws/chat-client-ui-types'
-import {
-    ChatTriggerType,
-    UserIntent,
-    Tool,
-    ToolResult,
-    RelevantTextDocument,
-} from '@aws/codewhisperer-streaming-client'
+import { ChatTriggerType, UserIntent, Tool, ToolResult, RelevantTextDocument } from '@amzn/codewhisperer-streaming'
 import { BedrockTools, ChatParams, CursorState, InlineChatParams } from '@aws/language-server-runtimes/server-interface'
 import { Features } from '../../types'
 import { DocumentContext, DocumentContextExtractor } from './documentContext'
diff --git a/server/aws-lsp-codewhisperer/src/language-server/chat/telemetry/chatTelemetryController.ts b/server/aws-lsp-codewhisperer/src/language-server/chat/telemetry/chatTelemetryController.ts
@@ -15,7 +15,7 @@ import {
     RelevancyVoteType,
     isClientTelemetryEvent,
 } from './clientTelemetry'
-import { ToolUse, UserIntent } from '@aws/codewhisperer-streaming-client'
+import { ToolUse, UserIntent } from '@amzn/codewhisperer-streaming'
 import { TriggerContext } from '../contexts/triggerContext'
 
 import { CredentialsProvider, Logging } from '@aws/language-server-runtimes/server-interface'
diff --git a/server/aws-lsp-codewhisperer/src/language-server/chat/tools/relevantTextDocuments.test.ts b/server/aws-lsp-codewhisperer/src/language-server/chat/tools/relevantTextDocuments.test.ts
@@ -1,6 +1,6 @@
 import { convertChunksToRelevantTextDocuments } from './relevantTextDocuments'
 import { Chunk } from 'local-indexing'
-import { RelevantTextDocument } from '@aws/codewhisperer-streaming-client'
+import { RelevantTextDocument } from '@amzn/codewhisperer-streaming'
 import * as assert from 'assert'
 
 describe('relevantTextDocuments', () => {
diff --git a/server/aws-lsp-codewhisperer/src/language-server/chat/tools/relevantTextDocuments.ts b/server/aws-lsp-codewhisperer/src/language-server/chat/tools/relevantTextDocuments.ts
@@ -1,4 +1,4 @@
-import { RelevantTextDocument } from '@aws/codewhisperer-streaming-client'
+import { RelevantTextDocument } from '@amzn/codewhisperer-streaming'
 import { Chunk } from 'local-indexing'
 
 export function convertChunksToRelevantTextDocuments(chunks: Chunk[]): RelevantTextDocument[] {
diff --git a/server/aws-lsp-codewhisperer/src/language-server/netTransform/tests/transformHandler.test.ts b/server/aws-lsp-codewhisperer/src/language-server/netTransform/tests/transformHandler.test.ts
@@ -1,4 +1,4 @@
-import { CodeWhispererStreaming } from '@aws/codewhisperer-streaming-client'
+import { CodeWhispererStreaming } from '@amzn/codewhisperer-streaming'
 import {
     Logging,
     Workspace,
diff --git a/server/aws-lsp-codewhisperer/src/language-server/netTransform/transformHandler.ts b/server/aws-lsp-codewhisperer/src/language-server/netTransform/transformHandler.ts
@@ -1,4 +1,4 @@
-import { ExportIntent } from '@aws/codewhisperer-streaming-client'
+import { ExportIntent } from '@amzn/codewhisperer-streaming'
 import { Logging, Runtime, Workspace } from '@aws/language-server-runtimes/server-interface'
 import * as fs from 'fs'
 import got from 'got'
diff --git a/server/aws-lsp-codewhisperer/src/shared/streamingClientService.test.ts b/server/aws-lsp-codewhisperer/src/shared/streamingClientService.test.ts
@@ -9,7 +9,7 @@ import {
     Origin,
     SendMessageCommandInput,
     SendMessageCommandOutput,
-} from '@aws/codewhisperer-streaming-client'
+} from '@amzn/codewhisperer-streaming'
 import { QDeveloperStreaming } from '@amzn/amazon-q-developer-streaming-client'
 import { rejects } from 'assert'
 
diff --git a/server/aws-lsp-codewhisperer/src/shared/streamingClientService.ts b/server/aws-lsp-codewhisperer/src/shared/streamingClientService.ts
@@ -6,7 +6,7 @@ import {
     SendMessageCommandOutput as SendMessageCommandOutputCodeWhispererStreaming,
     ExportResultArchiveCommandInput as ExportResultArchiveCommandInputCodeWhispererStreaming,
     ExportResultArchiveCommandOutput as ExportResultArchiveCommandOutputCodeWhispererStreaming,
-} from '@aws/codewhisperer-streaming-client'
+} from '@amzn/codewhisperer-streaming'
 import {
     QDeveloperStreaming,
     SendMessageCommandInput as SendMessageCommandInputQDeveloperStreaming,
diff --git a/server/aws-lsp-codewhisperer/src/shared/utils.test.ts b/server/aws-lsp-codewhisperer/src/shared/utils.test.ts
@@ -2,7 +2,7 @@ import {
     ServiceQuotaExceededException,
     ThrottlingException,
     ThrottlingExceptionReason,
-} from '@aws/codewhisperer-streaming-client'
+} from '@amzn/codewhisperer-streaming'
 import { CredentialsProvider, Position } from '@aws/language-server-runtimes/server-interface'
 import * as assert from 'assert'
 import { AWSError } from 'aws-sdk'
diff --git a/server/aws-lsp-codewhisperer/src/shared/utils.ts b/server/aws-lsp-codewhisperer/src/shared/utils.ts
@@ -21,7 +21,7 @@ import {
     ServiceQuotaExceededException,
     ThrottlingException,
     ThrottlingExceptionReason,
-} from '@aws/codewhisperer-streaming-client'
+} from '@amzn/codewhisperer-streaming'
 import * as path from 'path'
 import { ServiceException } from '@smithy/smithy-client'
 import * as ignoreWalk from 'ignore-walk'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { CodeWhispererStreaming, CodeWhispererStreamingClientConfig } from '@aws/codewhisperer-streaming-client'`
	`1`	`+import { CodeWhispererStreaming, CodeWhispererStreamingClientConfig } from '@amzn/codewhisperer-streaming'`
`2`	`2`	`import { ConfiguredRetryStrategy } from '@aws-sdk/util-retry'`
`3`	`3`	`import { SDKInitializator, Logging } from '@aws/language-server-runtimes/server-interface'`
`4`	`4`