Skip to content

Conversation

@Will-ShaoHua
Copy link
Contributor

Problem

Solution

License

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@Will-ShaoHua Will-ShaoHua requested a review from a team as a code owner June 17, 2025 21:15
@Will-ShaoHua Will-ShaoHua merged commit bf596bf into aws:main Jun 17, 2025
6 checks passed
@Will-ShaoHua Will-ShaoHua deleted the merge-15 branch June 17, 2025 22:29
Copy link
Contributor

@floralph floralph left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NOTE: This comment is for reference and not actionable.

Based on my git blame analysis of both the origin/floralph/nep-flare branch (for additions) and origin/main branch (for
deletions), here are the original authors of the code lines being changed:

ADDED LINES (from origin/floralph/nep-flare branch):

1. Import Statement Reorganization (Lines 25-34) - ADDED

Lines 25, 33:
Author: ege0zcan ([email protected])
Timestamp: 2023-09-26 10:39:39 +0200
Commit: ba0d1f8
Message: "Implement CodeWhisperer LSP server using server interface (#21)"
Description: Initial implementation of CodeWhisperer LSP server with credential logic updates

Lines 27-32:
Author: Will Lo ([email protected])
Timestamp: 2025-06-11 14:55:10 -0700
Commit: 6e974d1
Message: "chore: sync nep branch with main (#1623)"
Description: Synchronization commit

Line 34:
Author: Dhanasekar Karuppasamy ([email protected])
Timestamp: 2025-04-29 08:46:00 -0700
Commit: c9486ca
Message: "feat: flare mvp implementation"
Description: Initial FLARE MVP implementation

2. SuggestionType Enum (Lines 54-57) - ADDED

Author: Dhanasekar Karuppasamy ([email protected])
Timestamp: 2025-04-29 08:46:00 -0700
Commit: c9486ca
Message: "feat: flare mvp implementation"
Description: Initial FLARE MVP implementation

3. suggestionType Property in Interface (Line 61) - ADDED

Author: Dhanasekar Karuppasamy ([email protected])
Timestamp: 2025-04-29 08:46:00 -0700
Commit: c9486ca
Message: "feat: flare mvp implementation"
Description: Initial FLARE MVP implementation

4. Enhanced Request Handlers (Lines 253-268) - ADDED

Line 253:
Author: Dhanasekar Karuppasamy ([email protected])
Timestamp: 2025-04-29 08:46:00 -0700
Commit: c9486ca
Message: "feat: flare mvp implementation"

Lines 254-257:
Author: Dhanasekar Karuppasamy ([email protected])
Timestamp: 2025-06-02 09:09:09 -0700
Commit: 32edd8d
Message: "feat: log request responses to tmp file"

Lines 258-259:
Author: Dhanasekar Karuppasamy ([email protected])
Timestamp: 2025-06-04 00:27:47 -0700
Commit: d7c8e5f
Message: "feat: simplify logging. remove graphql"

Line 260:
Author: pras0131 ([email protected])
Timestamp: 2025-03-20 14:14:36 +0100
Commit: 681889b
Message: "feat: abort all inflight requests when resetCodewhispererService is invoked (#848)"

Lines 261-268 (error handler):
Author: Dhanasekar Karuppasamy ([email protected])
Timestamps: 2025-06-02 09:09:09 -0700 / 2025-06-04 00:27:47 -0700
Commits: 32edd8d / d7c8e5f
Messages: "feat: log request responses to tmp file" / "feat: simplify logging. remove graphql"

5. mapCodeWhispererApiResponseToSuggestion Method (Lines 533-555) - ADDED

Primary Author: Dhanasekar Karuppasamy ([email protected])
Timestamps: 2025-04-29 08:46:00 -0700 / 2025-06-02 09:09:09 -0700
Commits: c9486ca / 32edd8d
Messages: "feat: flare mvp implementation" / "feat: log request responses to tmp file"
Line 550: Viktor Shcherba ([email protected]) - 2023-11-02 09:28:53 +0100

6. suggestionType in Return Objects (Line 196) - ADDED

Author: Dhanasekar Karuppasamy ([email protected])
Timestamp: 2025-04-29 08:46:00 -0700
Commit: c9486ca
Message: "feat: flare mvp implementation"

DELETED LINES (from origin/main branch):

1. Comment Line (Line 26) - DELETED

Author: ege0zcan ([email protected])
Timestamp: 2023-10-05 12:10:22 +0300
Commit: 833dc4d
Message: "Move LSP Server logic into the Server and use Service as thin wrapper (#33)"
Description: Architectural refactoring to move LSP logic
Deleted Text: "// Define our own Suggestion interface to wrap the differences between Token and IAM Client"

2. Import Statements (Lines 50-52) - DELETED

Lines 50-51:
Author: Shailaja Yadav ([email protected])
Timestamp: 2024-02-28 08:40:30 -0800
Commit: 9833d58
Message: "Added Script to create the CWSPR client (#144)"
Deleted Text: Import statements for CodeWhispererSigv4Client and CodeWhispererTokenClient

Line 52:
Author: Justin M. Keyes ([email protected])
Timestamp: 2025-06-09 18:04:24 -0400
Commit: d25bcb6
Message: "feat(q): builderid "paid tier" #1197"
Description: Paid tier feature implementation with service model updates
Deleted Text: import { getErrorId } from './utils'

3. Original req.on('complete') Handler (Lines 196-198) - DELETED

Author: pras0131 ([email protected])
Timestamp: 2025-03-20 14:14:36 +0100
Commit: 681889b
Message: "feat: abort all inflight requests when resetCodewhispererService is invoked (#848)"
Description: Feature to abort inflight requests with comprehensive state management
Deleted Text: Simple req.on('complete', () => { this.completeRequest(req) }) handler

4. Comment Line (Line 54) - DELETED

Author: ege0zcan ([email protected])
Timestamp: 2023-10-05 12:10:22 +0300
Commit: 833dc4d
Message: "Move LSP Server logic into the Server and use Service as thin wrapper (#33)"
Deleted Text: "// Right now the only difference between the token client and the IAM client for codewhsiperer is the
difference in function name"

Summary of Key Contributors by Timeline:

2023:
ege0zcan (Sep-Oct 2023) - Original CodeWhisperer LSP server implementation and architectural refactoring
Viktor Shcherba (Nov 2023) - Telemetry and session management scaffolding

2024:
Shailaja Yadav (Feb 2024) - Client creation scripts

2025:
pras0131 (Mar 2025) - Request lifecycle management features
Dhanasekar Karuppasamy (Apr-Jun 2025) - Primary contributor for FLARE MVP implementation (most additions)
Justin M. Keyes (Jun 2025) - Paid tier features and service model updates
Will Lo (Jun 2025) - Branch synchronization and maintenance

Change Pattern Analysis:

Most Recent Changes (2025): Primarily FLARE MVP implementation by Dhanasekar Karuppasamy
Oldest Affected Code (2023): Original architectural decisions by ege0zcan being modified/removed
Code Movement: Import statements and comments being reorganized rather than fundamentally changed
Feature Evolution: Simple request handlers being replaced with enhanced logging and telemetry

The majority of the ADDED functionality represents new FLARE MVP features, while the DELETED code represents cleanup of
older architectural patterns and import organization.

Copy link
Contributor

@dk19y dk19y left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

Will-ShaoHua added a commit to Will-ShaoHua/language-servers that referenced this pull request Jun 18, 2025
Will-ShaoHua added a commit that referenced this pull request Jun 18, 2025
Will-ShaoHua added a commit to Will-ShaoHua/language-servers that referenced this pull request Jun 18, 2025
Will-ShaoHua added a commit that referenced this pull request Jun 18, 2025
Will-ShaoHua added a commit to Will-ShaoHua/language-servers that referenced this pull request Jun 18, 2025
dungdong-aws added a commit that referenced this pull request Jun 19, 2025
* feat: update list of models and set default to 4 (#1659)

* fix(agenticChat): UX fixes for MCP (#1661)

* fix: setting mute as false for mcp tools

* fix: set muted as false for mcp

* feat(amazonq): model throttling message as card instead of chat message (#1657)

* feat(amazonq): model throttling message as card instead of chat message

* fix empty message bug for VS

* fix(amazonq): properly deposit workspace context server resources on exit (#1647)

* fix(amazonq): cancel workspace context server initialization workflow on exit

* fix(amazonq): cancel message queue consumer interval on exit

* fix(amazonq): add check before start workspace context server init workflow

---------

Co-authored-by: Jiatong Li <[email protected]>

* chore(amazonq): extend remote workspace monitor interval from 5 mins to 30 mins (#1637)

Co-authored-by: Jiatong Li <[email protected]>

* fix: increase timeout value for the streaming client (#1654)

* feat: add EnableWebFormsToBlazorTransform flag to support WebForms to Blazor transformation (#1577)

* feat(amazonq): edit predition auto trigger (#1662)

Co-authored-by: Dhanasekar Karuppasamy <[email protected]>
Co-authored-by: Flora <[email protected]>

* feat(amazonq): add capability to log into a local file for dev purpose (#1633)

Co-authored-by: Dhanasekar Karuppasamy <[email protected]>
Co-authored-by: Flora <[email protected]>

* feat(amazonq): pinned context and rules (#1663)

* feat(amazonq): pinned context and rules

* test: unit test fixes

* chore: update mynah-ui and language-server-runtimes to latest

* test: fix unit tests

* chore(release): release packages from branch main (#1660)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* feat: add packageId property to references in req.json (#1570)

* fix: adding normalizePathFromUri to mcpUtils to handle uri paths (#1653)

* fix: when user add a new server, it would load global persona at first time (#1667)

* fix: use NodeHttpHandler when configuring requestHandler (#1670)

* fix: timeout only works for the first time in the loop (#1675)

* fix(amazonq): prevent workspace context server initialization workflow from overlapping (#1668)

Co-authored-by: Jiatong Li <[email protected]>

* fix: clear IDE context for auto-retry requests not initiated by the user (#1680)

* fix: add latency metrics for invokeLLM metric (#1681)

* feat: support per region model selection (#1683)

* chore(release): release packages from branch main (#1666)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* chore(amazonq): bump mynah-ui to 4.35.5 (#1686)

* fix: update MCP tools implementation (#1676)

* fix: send AmazonQ.md as a rule, do not automatically send README.md (#1688)

* fix(amazonq): filter languages at workspace context server onDeleteFiles (#1684)

Co-authored-by: Jiatong Li <[email protected]>

* chore(amazonq): nep cherrypick codewhispererService.ts (#1689)

* chore(release): release packages from branch main (#1687)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* revert(amazonq): nep cherrypick codewhispererService.ts (#1689)" (#1692)

This reverts commit bf596bf.

* revert(amazonq): fix filter languages at workspace context server onDeleteFiles

This reverts commit 4272eec.

Co-authored-by: Jiatong Li <[email protected]>

* chore(release): release packages from branch main (#1693)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* feat: adding current working directory to the stdio transport for mcp… (#1691)

* feat: adding current working directory to the stdio transport for mcp server initialization

* fix(amazonq): profile is not set after re-auth (#1690)

* revert(amazonq): bring back #1689

* fix: add fsReplace tool to batch edits (#1533)

* fix: add fsReplace tool to batch edits

* fix: update toolSpec, add special character handling/escaped characters

* fix(amazonq): itemid was accidentally removed by #1689 (#1698)

* revert(amazonq): bring back #1684 (#1697)

This reverts commit 403c26a.

Co-authored-by: Jiatong Li <[email protected]>

* fix: diff reports no lines added or removed (#1549)

Co-authored-by: Jason Guo <[email protected]>

* fix: thinking doesn't get removed if response is empty (#1699)

* fix: thinking doesn't get removed if response is empty

* fix lint

* chore(release): release packages from branch main (#1695)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix(amazonq): serialize S3 uploads for file events from workspace context server (#1700)

Co-authored-by: Jiatong Li <[email protected]>

* chore: bump runtimes (#1705)

* chore(release): release packages from branch main (#1704)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: Tai Lai <[email protected]>
Co-authored-by: Laxman Reddy <[email protected]>
Co-authored-by: Yaofu Zuo <[email protected]>
Co-authored-by: Jiatong Li <[email protected]>
Co-authored-by: Jiatong Li <[email protected]>
Co-authored-by: Jason Guo <[email protected]>
Co-authored-by: Rajanna-Karthik <[email protected]>
Co-authored-by: Will Lo <[email protected]>
Co-authored-by: Dhanasekar Karuppasamy <[email protected]>
Co-authored-by: Flora <[email protected]>
Co-authored-by: Avi Alpert <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Chris <[email protected]>
Co-authored-by: invictus <[email protected]>
Co-authored-by: Randall-Jiang <[email protected]>
Co-authored-by: Jiatong Li <[email protected]>
Co-authored-by: chungjac <[email protected]>
Co-authored-by: Christopher Christou <[email protected]>
BlakeLazarine pushed a commit to singhAws/language-servers that referenced this pull request Jun 20, 2025
BlakeLazarine pushed a commit to singhAws/language-servers that referenced this pull request Jun 20, 2025
BlakeLazarine pushed a commit to singhAws/language-servers that referenced this pull request Jun 20, 2025
BlakeLazarine pushed a commit to singhAws/language-servers that referenced this pull request Jun 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants