regen client

Hweinstock · Hweinstock · commit c36b13b94750 · 2025-01-13T12:44:39.000-05:00
diff --git a/buildspec/release/10changeversion.yml b/buildspec/release/10changeversion.yml
@@ -25,7 +25,7 @@ phases:
                 DATE=$(date)
                 npm version --no-git-tag-version "$VERSION" -w packages/${TARGET_EXTENSION}
                 # 'createRelease' uses ts-node.
-                # Ignore broken "postinstall" script in "src.gen/@amzn/codewhisperer-streaming/package.json".
+                # Ignore broken "postinstall" script in "src.gen/@amzn/amazon-codewhisperer-streaming/package.json".
                 npm install --ignore-scripts ts-node
             - |
                 npm run createRelease -w packages/${TARGET_EXTENSION}
diff --git a/docs/build.md b/docs/build.md
@@ -2,7 +2,7 @@
 
 The AmazonQ features rely on the `codewhisperer-streaming` service, to support both Sigv4 and Bearer token modes of this service,
 two clients are generated from the service's smithy models and placed in
-`src.gen/@amzn/amazon-q-developer-streaming-client` and `src.gen/@amzn/codewhisperer-streaming` respectively (For more
+`src.gen/@amzn/amazon-q-developer-streaming-client` and `src.gen/@amzn/amazon-codewhisperer-streaming` respectively (For more
 information about these clients and how they are generated, please see this
 [quip document](https://quip-amazon.com/2dAWAvTIYXXr/Build-instructions-for-AWS-CodeWhisperer-Streaming-Typescript-client)).
 
@@ -16,12 +16,12 @@ built before the toolkit project itself. Workspaces are automatically ready to
 be imported in the root toolkit project by their declared package.json name,
 (`@amzn/amazon-q-developer-streaming` in this case).
 
-## @amzn/codewhisperer-streaming client
+## @amzn/amazon-codewhisperer-streaming client
 
 This client is a standalone npm project in typescript, and it is added to
-the project as a workspace in the project's root `package.json` with the line `"workspaces": [ ..., "src.gen/@amzn/codewhisperer-streaming" ]`.
-The client may be manually built using `npm run build -w @amzn/codewhisperer-streaming"`.
+the project as a workspace in the project's root `package.json` with the line `"workspaces": [ ..., "src.gen/@amzn/amazon-codewhisperer-streaming" ]`.
+The client may be manually built using `npm run build -w @amzn/amazon-codewhisperer-streaming"`.
 The `generateClients` run script ensures that this dependency is
 built before the toolkit project itself. Workspaces are automatically ready to
 be imported in the root toolkit project by their declared package.json name,
-(`@amzn/codewhisperer-streaming` in this case).
+(`@amzn/amazon-codewhisperer-streaming` in this case).
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     },
     "scripts": {
         "prepare": "ts-node ./scripts/prepare.ts",
-        "preinstall": "cd src.gen/@amzn/codewhisperer-streaming && npm i && cd ../amazon-q-developer-streaming-client && npm i",
+        "preinstall": "cd src.gen/@amzn/amazon-codewhisperer-streaming && npm i && cd ../amazon-q-developer-streaming-client && npm i",
         "postinstall": "npm run buildCustomLintPlugin && npm run postinstall -ws --if-present",
         "buildCustomLintPlugin": "npm run build -w plugins/eslint-plugin-aws-toolkits",
         "compile": "npm run compile -w packages/",
diff --git a/packages/amazonq/src/api.ts b/packages/amazonq/src/api.ts
@@ -4,7 +4,10 @@
  */
 
 import { SendMessageCommandOutput, SendMessageRequest } from '@amzn/amazon-q-developer-streaming-client'
-import { GenerateAssistantResponseCommandOutput, GenerateAssistantResponseRequest } from '@amzn/codewhisperer-streaming'
+import {
+    GenerateAssistantResponseCommandOutput,
+    GenerateAssistantResponseRequest,
+} from '@amzn/amazon-codewhisperer-streaming'
 import { AuthUtil } from 'aws-core-vscode/codewhisperer'
 import { ChatSession } from 'aws-core-vscode/codewhispererChat'
 import { api } from 'aws-core-vscode/amazonq'
diff --git a/packages/amazonq/src/inlineChat/provider/inlineChatProvider.ts b/packages/amazonq/src/inlineChat/provider/inlineChatProvider.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode'
 import {
     CodeWhispererStreamingServiceException,
     GenerateAssistantResponseCommandOutput,
-} from '@amzn/codewhisperer-streaming'
+} from '@amzn/amazon-codewhisperer-streaming'
 import { AuthUtil, getSelectedCustomization } from 'aws-core-vscode/codewhisperer'
 import {
     ChatSessionStorage,
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -495,7 +495,7 @@
     },
     "dependencies": {
         "@amzn/amazon-q-developer-streaming-client": "file:../../src.gen/@amzn/amazon-q-developer-streaming-client",
-        "@amzn/codewhisperer-streaming": "file:../../src.gen/@amzn/codewhisperer-streaming",
+        "@amzn/amazon-codewhisperer-streaming": "file:../../src.gen/@amzn/amazon-codewhisperer-streaming",
         "@aws-sdk/client-cloudformation": "^3.667.0",
         "@aws-sdk/client-cloudwatch-logs": "^3.666.0",
         "@aws-sdk/client-cognito-identity": "^3.637.0",
diff --git a/packages/core/src/amazonq/extApi.ts b/packages/core/src/amazonq/extApi.ts
@@ -6,7 +6,10 @@
 import vscode from 'vscode'
 import { VSCODE_EXTENSION_ID } from '../shared/utilities'
 import { SendMessageCommandOutput, SendMessageRequest } from '@amzn/amazon-q-developer-streaming-client'
-import { GenerateAssistantResponseCommandOutput, GenerateAssistantResponseRequest } from '@amzn/codewhisperer-streaming'
+import {
+    GenerateAssistantResponseCommandOutput,
+    GenerateAssistantResponseRequest,
+} from '@amzn/amazon-codewhisperer-streaming'
 import { FeatureAuthState } from '../codewhisperer/util/authUtil'
 import { ToolkitError } from '../shared'
 
diff --git a/packages/core/src/amazonq/lsp/lspController.ts b/packages/core/src/amazonq/lsp/lspController.ts
@@ -13,7 +13,7 @@ import fetch from 'node-fetch'
 import request from '../../shared/request'
 import { LspClient } from './lspClient'
 import AdmZip from 'adm-zip'
-import { RelevantTextDocument } from '@amzn/codewhisperer-streaming'
+import { RelevantTextDocument } from '@amzn/amazon-codewhisperer-streaming'
 import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../shared/filesystemUtilities'
 import { activate as activateLsp } from './lspClient'
 import { telemetry } from '../../shared/telemetry'
diff --git a/packages/core/src/amazonq/webview/ui/connector.ts b/packages/core/src/amazonq/webview/ui/connector.ts
@@ -25,7 +25,7 @@ import { TabType, TabsStorage } from './storages/tabsStorage'
 import { WelcomeFollowupType } from './apps/amazonqCommonsConnector'
 import { AuthFollowUpType } from './followUps/generator'
 import { DiffTreeFileInfo } from './diffTree/types'
-import { UserIntent } from '@amzn/codewhisperer-streaming'
+import { UserIntent } from '@amzn/amazon-codewhisperer-streaming'
 
 export interface CodeReference {
     licenseName?: string
diff --git a/packages/core/src/amazonqTest/chat/controller/controller.ts b/packages/core/src/amazonqTest/chat/controller/controller.ts
@@ -53,7 +53,7 @@ import {
     runBuildCommand,
     startTestGenerationProcess,
 } from '../../../codewhisperer/commands/startTestGeneration'
-import { UserIntent } from '@amzn/codewhisperer-streaming'
+import { UserIntent } from '@amzn/amazon-codewhisperer-streaming'
 import { getSelectedCustomization } from '../../../codewhisperer/util/customizationUtil'
 import { createCodeWhispererChatStreamingClient } from '../../../shared/clients/codewhispererChatClient'
 import { ChatTriggerType } from '../../../codewhispererChat/controllers/chat/model'
diff --git a/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts b/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts
@@ -30,7 +30,7 @@ import { TriggerPayload } from '../../../../codewhispererChat/controllers/chat/m
 import {
     CodeWhispererStreamingServiceException,
     GenerateAssistantResponseCommandOutput,
-} from '@amzn/codewhisperer-streaming'
+} from '@amzn/amazon-codewhisperer-streaming'
 import { Session } from '../../session/session'
 import { CodeReference } from '../../../../amazonq/webview/ui/apps/amazonqCommonsConnector'
 import { getHttpStatusCode, getRequestId, getTelemetryReasonDesc, ToolkitError } from '../../../../shared/errors'
diff --git a/packages/core/src/applicationcomposer/messageHandlers/generateResourceHandler.ts b/packages/core/src/applicationcomposer/messageHandlers/generateResourceHandler.ts
@@ -7,7 +7,7 @@ import {
     SupplementaryWebLink,
     Reference,
     UserIntent,
-} from '@amzn/codewhisperer-streaming'
+} from '@amzn/amazon-codewhisperer-streaming'
 
 import {
     GenerateResourceRequestMessage,
diff --git a/packages/core/src/codewhisperer/service/testGenHandler.ts b/packages/core/src/codewhisperer/service/testGenHandler.ts
@@ -22,7 +22,7 @@ import { createCodeWhispererChatStreamingClient } from '../../shared/clients/cod
 import { downloadExportResultArchive } from '../../shared/utilities/download'
 import AdmZip from 'adm-zip'
 import path from 'path'
-import { ExportIntent } from '@amzn/codewhisperer-streaming'
+import { ExportIntent } from '@amzn/amazon-codewhisperer-streaming'
 import { glob } from 'glob'
 
 // TODO: Get TestFileName and Framework and to error message
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts
@@ -43,7 +43,7 @@ import { JobStoppedError, ZipExceedsSizeLimitError } from '../../../amazonqGumby
 import { writeLogs } from './transformFileHandler'
 import { createCodeWhispererChatStreamingClient } from '../../../shared/clients/codewhispererChatClient'
 import { downloadExportResultArchive } from '../../../shared/utilities/download'
-import { ExportIntent, TransformationDownloadArtifactType } from '@amzn/codewhisperer-streaming'
+import { ExportIntent, TransformationDownloadArtifactType } from '@amzn/amazon-codewhisperer-streaming'
 import fs from '../../../shared/fs/fs'
 import { ChatSessionManager } from '../../../amazonqGumby/chat/storages/chatSession'
 import { encodeHTML } from '../../../shared/utilities/textUtilities'
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts
@@ -9,7 +9,7 @@ import fs from 'fs' // eslint-disable-line no-restricted-imports
 import { parsePatch, applyPatches, ParsedDiff } from 'diff'
 import path from 'path'
 import vscode from 'vscode'
-import { ExportIntent } from '@amzn/codewhisperer-streaming'
+import { ExportIntent } from '@amzn/amazon-codewhisperer-streaming'
 import {
     TransformByQReviewStatus,
     transformByQState,
diff --git a/packages/core/src/codewhispererChat/clients/chat/v0/chat.ts b/packages/core/src/codewhispererChat/clients/chat/v0/chat.ts
@@ -4,7 +4,10 @@
  */
 
 import { SendMessageCommandOutput, SendMessageRequest } from '@amzn/amazon-q-developer-streaming-client'
-import { GenerateAssistantResponseCommandOutput, GenerateAssistantResponseRequest } from '@amzn/codewhisperer-streaming'
+import {
+    GenerateAssistantResponseCommandOutput,
+    GenerateAssistantResponseRequest,
+} from '@amzn/amazon-codewhisperer-streaming'
 import * as vscode from 'vscode'
 import { ToolkitError } from '../../../../shared/errors'
 import { createCodeWhispererChatStreamingClient } from '../../../../shared/clients/codewhispererChatClient'
diff --git a/packages/core/src/codewhispererChat/controllers/chat/chatRequest/converter.ts b/packages/core/src/codewhispererChat/controllers/chat/chatRequest/converter.ts
@@ -10,7 +10,7 @@ import {
     RelevantTextDocument,
     SymbolType,
     TextDocument,
-} from '@amzn/codewhisperer-streaming'
+} from '@amzn/amazon-codewhisperer-streaming'
 import { ChatTriggerType, TriggerPayload } from '../model'
 import { undefinedIfEmpty } from '../../../../shared'
 
diff --git a/packages/core/src/codewhispererChat/controllers/chat/controller.ts b/packages/core/src/codewhispererChat/controllers/chat/controller.ts
@@ -35,7 +35,7 @@ import { EditorContextCommand } from '../../commands/registerCommands'
 import { PromptsGenerator } from './prompts/promptsGenerator'
 import { TriggerEventsStorage } from '../../storages/triggerEvents'
 import { SendMessageRequest } from '@amzn/amazon-q-developer-streaming-client'
-import { CodeWhispererStreamingServiceException } from '@amzn/codewhisperer-streaming'
+import { CodeWhispererStreamingServiceException } from '@amzn/amazon-codewhisperer-streaming'
 import { UserIntentRecognizer } from './userIntent/userIntentRecognizer'
 import { CWCTelemetryHelper, recordTelemetryChatRunCommand } from './telemetryHelper'
 import { CodeWhispererTracker } from '../../../codewhisperer/tracker/codewhispererTracker'
diff --git a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
@@ -18,7 +18,7 @@ import {
     ChatResponseStream as cwChatResponseStream,
     CodeWhispererStreamingServiceException,
     SupplementaryWebLink,
-} from '@amzn/codewhisperer-streaming'
+} from '@amzn/amazon-codewhisperer-streaming'
 import { ChatMessage, ErrorMessage, FollowUp, Suggestion } from '../../../view/connector/connector'
 import { ChatSession } from '../../../clients/chat/v0/chat'
 import { ChatException } from './model'
diff --git a/packages/core/src/codewhispererChat/controllers/chat/model.ts b/packages/core/src/codewhispererChat/controllers/chat/model.ts
@@ -4,7 +4,7 @@
  */
 
 import * as vscode from 'vscode'
-import { RelevantTextDocument, UserIntent } from '@amzn/codewhisperer-streaming'
+import { RelevantTextDocument, UserIntent } from '@amzn/amazon-codewhisperer-streaming'
 import { MatchPolicy, CodeQuery } from '../../clients/chat/v0/model'
 import { Selection } from 'vscode'
 import { TabOpenType } from '../../../amazonq/webview/ui/storages/tabsStorage'
diff --git a/packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts b/packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts
@@ -2,7 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { UserIntent } from '@amzn/codewhisperer-streaming'
+import { UserIntent } from '@amzn/amazon-codewhisperer-streaming'
 import {
     AmazonqAddMessage,
     AmazonqInteractWithMessage,
diff --git a/packages/core/src/codewhispererChat/controllers/chat/userIntent/userIntentRecognizer.ts b/packages/core/src/codewhispererChat/controllers/chat/userIntent/userIntentRecognizer.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { UserIntent } from '@amzn/codewhisperer-streaming'
+import { UserIntent } from '@amzn/amazon-codewhisperer-streaming'
 import { EditorContextCommand } from '../../../commands/registerCommands'
 import { PromptMessage } from '../model'
 import { Auth } from '../../../../auth'
diff --git a/packages/core/src/shared/clients/codewhispererChatClient.ts b/packages/core/src/shared/clients/codewhispererChatClient.ts
@@ -2,7 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { CodeWhispererStreaming } from '@amzn/codewhisperer-streaming'
+import { CodeWhispererStreaming } from '@amzn/amazon-codewhisperer-streaming'
 import { ConfiguredRetryStrategy } from '@smithy/util-retry'
 import { getCodewhispererConfig } from '../../codewhisperer/client/codewhisperer'
 import { AuthUtil } from '../../codewhisperer/util/authUtil'
diff --git a/packages/core/src/shared/errors.ts b/packages/core/src/shared/errors.ts
@@ -12,7 +12,7 @@ import { CancellationError } from './utilities/timeoutUtils'
 import { hasKey, isNonNullable } from './utilities/tsUtils'
 import type * as nodefs from 'fs' // eslint-disable-line no-restricted-imports
 import type * as os from 'os'
-import { CodeWhispererStreamingServiceException } from '@amzn/codewhisperer-streaming'
+import { CodeWhispererStreamingServiceException } from '@amzn/amazon-codewhisperer-streaming'
 import { driveLetterRegex } from './utilities/pathUtils'
 import { getLogger } from './logger/logger'
 import { crashMonitoringDirName } from './constants'
diff --git a/packages/core/src/shared/utilities/download.ts b/packages/core/src/shared/utilities/download.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { CodeWhispererStreaming, ExportResultArchiveCommandInput } from '@amzn/codewhisperer-streaming'
+import { CodeWhispererStreaming, ExportResultArchiveCommandInput } from '@amzn/amazon-codewhisperer-streaming'
 import { ToolkitError } from '../errors'
 import fs from '../fs/fs'
 
diff --git a/packages/core/src/testInteg/perf/downloadExportResultArchive.test.ts b/packages/core/src/testInteg/perf/downloadExportResultArchive.test.ts
@@ -4,7 +4,7 @@
  */
 import assert from 'assert'
 import { WorkspaceFolder } from 'vscode'
-import { ExportResultArchiveCommandInput } from '@amzn/codewhisperer-streaming'
+import { ExportResultArchiveCommandInput } from '@amzn/amazon-codewhisperer-streaming'
 import * as sinon from 'sinon'
 import path from 'path'
 import { fs, getRandomString } from '../../shared'
diff --git a/src.gen/@amzn/amazon-codewhisperer-streaming/package.json b/src.gen/@amzn/amazon-codewhisperer-streaming/package.json
@@ -9,7 +9,8 @@
         "build:types": "tsc -p tsconfig.types.json",
         "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
         "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo || exit 0",
-        "prepack": "npm run clean && npm run build"
+        "prepack": "npm run clean && npm run build",
+	"postinstall": "npm run build"
     },
     "main": "./dist-cjs/index.js",
     "types": "./dist-types/index.d.ts",
@@ -85,4 +86,4 @@
     "react-native": {
         "./dist-es/runtimeConfig": "./dist-es/runtimeConfig.native"
     }
-}
+}
