Skip to content

Commit 36fb0eb

Browse files
ctlai95ctlai95
committed
Merge remote-tracking branch 'aws/master' into HEAD
2 parents ee0a8c4 + 5768cf5 commit 36fb0eb

16 files changed

+212
-47
lines changed

‎CONTRIBUTING.md‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ Then clone the repository and install NPM packages:
4242

4343
### Run
4444

45-
Due to the monorepo structure of the project, you must have the `aws-toolkit-vscode/packages/toolkit` folder open as root folder in the workspace.
46-
The easiest way to open the project: File > Open Workspace from File > choose `aws-toolkit-vscode/aws-toolkit-vscode.code-workspace`
45+
Due to the monorepo structure of the project, you must open the project using the
46+
`aws-toolkit-vscode.code-workspace` project file.
47+
48+
1. Run the `File: Open Workspace from File...` command in vscode.
49+
2. Select the `aws-toolkit-vscode.code-workspace` project file.
4750

4851
To run the extension from VSCode as a Node.js app:
4952

@@ -164,8 +167,7 @@ See [web.md](./docs/web.md) for working with the web mode implementation of the
164167
See [TESTPLAN.md](./docs/TESTPLAN.md) to understand the project's test
165168
structure, mechanics and philosophy.
166169
167-
You can run tests directly from VSCode. Due to the monorepo structure of the project, you must have the `aws-toolkit-vscode/packages/toolkit` folder open as root folder in the workspace.
168-
The easiest way to open the project: File > Open Workspace from File > choose `aws-toolkit-vscode/aws-toolkit-vscode.code-workspace`
170+
You can run tests directly from VSCode. Due to the monorepo structure of the project, you must [open the project via the `aws-toolkit-vscode.code-workspace` project file](#run).
169171
170172
1. Select `View > Debug`, or select the Debug pane from the sidebar.
171173
2. From the dropdown at the top of the Debug pane, select the `Extension Tests` configuration.
@@ -180,12 +182,13 @@ Tests will write logs to `./.test-reports/testLog.log`.
180182
181183
#### Run a specific test
182184
183-
To run a single test in VSCode, do any one of:
185+
To run a single test in VSCode, do any _one_ of the following:
184186
185187
- Run the _Extension Tests (current file)_ launch-config.
186-
- Use Mocha's [it.only()](https://mochajs.org/#exclusive-tests) or `describe.only()`.
187-
- Run in your terminal:
188-
188+
- Note: if you don't see this in the vscode debug menu, confirm that you opened the project
189+
[via the `aws-toolkit-vscode.code-workspace` project file](#run).
190+
- or... Use Mocha's [it.only()](https://mochajs.org/#exclusive-tests) or `describe.only()`.
191+
- or... Run in your terminal:
189192
- Unix/macOS/POSIX shell:
190193
```
191194
TEST_FILE=../core/src/test/foo.test.ts npm run test
@@ -194,8 +197,7 @@ To run a single test in VSCode, do any one of:
194197
```
195198
$Env:TEST_FILE = "../core/src/test/foo.test.ts"; npm run test
196199
```
197-
198-
- To run all tests in a particular subdirectory, you can edit
200+
- or... To run all tests in a particular subdirectory, you can edit
199201
`src/test/index.ts:rootTestsPath` to point to a subdirectory:
200202
```
201203
rootTestsPath: __dirname + '/shared/sam/debugger/'

‎package-lock.json‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/amazonq/.changes/1.53.0.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"date": "2025-03-28",
3+
"version": "1.53.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Amazon Q Chat: Choosing a nested subfolder for `/doc` on Windows results in `The folder you chose did not contain any source files` error"
8+
},
9+
{
10+
"type": "Feature",
11+
"description": "Add support for Code search in Q chat"
12+
},
13+
{
14+
"type": "Feature",
15+
"description": "(Experimental) Amazon Q inline code suggestions via Amazon Q Language Server. (enable with `aws.experiments.amazonqLSP: true`)"
16+
},
17+
{
18+
"type": "Feature",
19+
"description": "Command Palette: Add `Amazon Q: Open Chat` command."
20+
}
21+
]
22+
}

‎packages/amazonq/.changes/next-release/Bug Fix-3f6a2026-9dd8-4b50-8a73-765ead8717b4.json‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎packages/amazonq/.changes/next-release/Feature-5f829ea1-e33b-4687-bc6d-76ed1558cd7e.json‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎packages/amazonq/.changes/next-release/Feature-7a3c930e-cc8e-4323-9ecd-c1bf767fd2ed.json‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎packages/amazonq/.changes/next-release/Feature-fa845e78-1e76-407a-be8a-e64c63b98795.json‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎packages/amazonq/CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## 1.53.0 2025-03-28
2+
3+
- **Bug Fix** Amazon Q Chat: Choosing a nested subfolder for `/doc` on Windows results in `The folder you chose did not contain any source files` error
4+
- **Feature** Add support for Code search in Q chat
5+
- **Feature** (Experimental) Amazon Q inline code suggestions via Amazon Q Language Server. (enable with `aws.experiments.amazonqLSP: true`)
6+
- **Feature** Command Palette: Add `Amazon Q: Open Chat` command.
7+
18
## 1.52.0 2025-03-20
29

310
- **Bug Fix** Amazon Q chat: @Folders and @Files are missing `@` prefix in chat history

‎packages/amazonq/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "amazon-q-vscode",
33
"displayName": "Amazon Q",
44
"description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
5-
"version": "1.53.0-SNAPSHOT",
5+
"version": "1.54.0-SNAPSHOT",
66
"extensionKind": [
77
"workspace"
88
],

‎packages/core/src/codewhisperer/client/user-service-2.json‎

Lines changed: 145 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,22 @@
280280
],
281281
"documentation": "<p>Lists the findings from a particular code analysis job.</p>"
282282
},
283+
"ListEvents": {
284+
"name": "ListEvents",
285+
"http": {
286+
"method": "POST",
287+
"requestUri": "/"
288+
},
289+
"input": { "shape": "ListEventsRequest" },
290+
"output": { "shape": "ListEventsResponse" },
291+
"errors": [
292+
{ "shape": "ThrottlingException" },
293+
{ "shape": "InternalServerException" },
294+
{ "shape": "ValidationException" },
295+
{ "shape": "AccessDeniedException" }
296+
],
297+
"documentation": "<p>List events for agent activity</p>"
298+
},
283299
"ListFeatureEvaluations": {
284300
"name": "ListFeatureEvaluations",
285301
"http": {
@@ -689,7 +705,9 @@
689705
"acceptedLineCount": { "shape": "Integer" },
690706
"acceptedSnippetHasReference": { "shape": "Boolean" },
691707
"hasProjectLevelContext": { "shape": "Boolean" },
692-
"userIntent": { "shape": "UserIntent" }
708+
"userIntent": { "shape": "UserIntent" },
709+
"addedIdeDiagnostics": { "shape": "IdeDiagnosticList" },
710+
"removedIdeDiagnostics": { "shape": "IdeDiagnosticList" }
693711
}
694712
},
695713
"ChatInteractWithMessageEventInteractionTargetString": {
@@ -1079,7 +1097,8 @@
10791097
"CreateWorkspaceRequestWorkspaceRootString": {
10801098
"type": "string",
10811099
"max": 1024,
1082-
"min": 1
1100+
"min": 1,
1101+
"sensitive": true
10831102
},
10841103
"CreateWorkspaceResponse": {
10851104
"type": "structure",
@@ -1394,6 +1413,10 @@
13941413
"useRelevantDocuments": {
13951414
"shape": "Boolean",
13961415
"documentation": "<p>Whether service should use relevant document in prompt</p>"
1416+
},
1417+
"workspaceFolders": {
1418+
"shape": "WorkspaceFolderList",
1419+
"documentation": "<p>Represents IDE provided list of workspace folders</p>"
13971420
}
13981421
},
13991422
"documentation": "<p>Represents the state of an Editor</p>"
@@ -1476,6 +1499,34 @@
14761499
"max": 2048,
14771500
"min": 0
14781501
},
1502+
"Event": {
1503+
"type": "structure",
1504+
"required": ["eventId", "generationId", "eventTimestamp", "eventType", "eventBlob"],
1505+
"members": {
1506+
"eventId": { "shape": "UUID" },
1507+
"generationId": { "shape": "UUID" },
1508+
"eventTimestamp": { "shape": "SyntheticTimestamp_date_time" },
1509+
"eventType": { "shape": "EventType" },
1510+
"eventBlob": { "shape": "EventBlob" }
1511+
}
1512+
},
1513+
"EventBlob": {
1514+
"type": "blob",
1515+
"max": 400000,
1516+
"min": 1,
1517+
"sensitive": true
1518+
},
1519+
"EventList": {
1520+
"type": "list",
1521+
"member": { "shape": "Event" },
1522+
"max": 10,
1523+
"min": 1
1524+
},
1525+
"EventType": {
1526+
"type": "string",
1527+
"max": 100,
1528+
"min": 1
1529+
},
14791530
"ExternalIdentityDetails": {
14801531
"type": "structure",
14811532
"members": {
@@ -1629,7 +1680,8 @@
16291680
"TASK_ASSIST",
16301681
"TRANSFORMATIONS",
16311682
"CHAT_CUSTOMIZATION",
1632-
"TRANSFORMATIONS_WEBAPP"
1683+
"TRANSFORMATIONS_WEBAPP",
1684+
"FEATURE_DEVELOPMENT"
16331685
],
16341686
"max": 64,
16351687
"min": 1
@@ -1807,6 +1859,46 @@
18071859
"max": 64,
18081860
"min": 1
18091861
},
1862+
"IdeDiagnostic": {
1863+
"type": "structure",
1864+
"required": ["ideDiagnosticType"],
1865+
"members": {
1866+
"range": {
1867+
"shape": "Range",
1868+
"documentation": "<p>The range at which the message applies.</p>"
1869+
},
1870+
"source": {
1871+
"shape": "IdeDiagnosticSourceString",
1872+
"documentation": "<p>A human-readable string describing the source of the diagnostic</p>"
1873+
},
1874+
"severity": {
1875+
"shape": "DiagnosticSeverity",
1876+
"documentation": "<p>Diagnostic Error type</p>"
1877+
},
1878+
"ideDiagnosticType": {
1879+
"shape": "IdeDiagnosticType",
1880+
"documentation": "<p>Type of the diagnostic</p>"
1881+
}
1882+
},
1883+
"documentation": "<p>Structure to represent metadata about a Diagnostic from user local IDE</p>"
1884+
},
1885+
"IdeDiagnosticList": {
1886+
"type": "list",
1887+
"member": { "shape": "IdeDiagnostic" },
1888+
"documentation": "<p>List of IDE Diagnostics</p>",
1889+
"max": 1024,
1890+
"min": 0
1891+
},
1892+
"IdeDiagnosticSourceString": {
1893+
"type": "string",
1894+
"max": 1024,
1895+
"min": 0,
1896+
"sensitive": true
1897+
},
1898+
"IdeDiagnosticType": {
1899+
"type": "string",
1900+
"enum": ["SYNTAX_ERROR", "TYPE_ERROR", "REFERENCE_ERROR", "BEST_PRACTICE", "SECURITY", "OTHER"]
1901+
},
18101902
"IdempotencyToken": {
18111903
"type": "string",
18121904
"max": 256,
@@ -1995,6 +2087,30 @@
19952087
"codeAnalysisFindings": { "shape": "SensitiveString" }
19962088
}
19972089
},
2090+
"ListEventsRequest": {
2091+
"type": "structure",
2092+
"required": ["conversationId"],
2093+
"members": {
2094+
"conversationId": { "shape": "UUID" },
2095+
"maxResults": { "shape": "ListEventsRequestMaxResultsInteger" },
2096+
"nextToken": { "shape": "NextToken" }
2097+
}
2098+
},
2099+
"ListEventsRequestMaxResultsInteger": {
2100+
"type": "integer",
2101+
"box": true,
2102+
"max": 50,
2103+
"min": 1
2104+
},
2105+
"ListEventsResponse": {
2106+
"type": "structure",
2107+
"required": ["conversationId", "events"],
2108+
"members": {
2109+
"conversationId": { "shape": "UUID" },
2110+
"events": { "shape": "EventList" },
2111+
"nextToken": { "shape": "NextToken" }
2112+
}
2113+
},
19982114
"ListFeatureEvaluationsRequest": {
19992115
"type": "structure",
20002116
"required": ["userContext"],
@@ -2023,7 +2139,8 @@
20232139
"ListWorkspaceMetadataRequestWorkspaceRootString": {
20242140
"type": "string",
20252141
"max": 1024,
2026-
"min": 1
2142+
"min": 1,
2143+
"sensitive": true
20272144
},
20282145
"ListWorkspaceMetadataResponse": {
20292146
"type": "structure",
@@ -2066,6 +2183,11 @@
20662183
"min": 1,
20672184
"pattern": "[-a-zA-Z0-9._]*"
20682185
},
2186+
"NextToken": {
2187+
"type": "string",
2188+
"max": 1000,
2189+
"min": 0
2190+
},
20692191
"Notifications": {
20702192
"type": "list",
20712193
"member": { "shape": "NotificationsFeature" },
@@ -2893,6 +3015,10 @@
28933015
"type": "string",
28943016
"enum": ["DECLARATION", "USAGE"]
28953017
},
3018+
"SyntheticTimestamp_date_time": {
3019+
"type": "timestamp",
3020+
"timestampFormat": "iso8601"
3021+
},
28963022
"TargetCode": {
28973023
"type": "structure",
28983024
"required": ["relativeTargetPath"],
@@ -3752,7 +3878,9 @@
37523878
"generatedLine": { "shape": "PrimitiveInteger" },
37533879
"numberOfRecommendations": { "shape": "PrimitiveInteger" },
37543880
"perceivedLatencyMilliseconds": { "shape": "Double" },
3755-
"acceptedCharacterCount": { "shape": "PrimitiveInteger" }
3881+
"acceptedCharacterCount": { "shape": "PrimitiveInteger" },
3882+
"addedIdeDiagnostics": { "shape": "IdeDiagnosticList" },
3883+
"removedIdeDiagnostics": { "shape": "IdeDiagnosticList" }
37563884
}
37573885
},
37583886
"ValidationException": {
@@ -3786,6 +3914,18 @@
37863914
"programmingLanguage": { "shape": "ProgrammingLanguage" }
37873915
}
37883916
},
3917+
"WorkspaceFolderList": {
3918+
"type": "list",
3919+
"member": { "shape": "WorkspaceFolderListMemberString" },
3920+
"max": 100,
3921+
"min": 0
3922+
},
3923+
"WorkspaceFolderListMemberString": {
3924+
"type": "string",
3925+
"max": 4096,
3926+
"min": 1,
3927+
"sensitive": true
3928+
},
37893929
"WorkspaceList": {
37903930
"type": "list",
37913931
"member": { "shape": "WorkspaceMetadata" }

0 commit comments

Comments
 (0)