Merge main into feature/auto-debug

Author: aws-toolkit-automation

server/aws-lsp-codewhisperer/src/language-server/netTransform/atxModels.ts

@@ -118,6 +118,18 @@ export interface AtxGetTransformInfoRequest extends ExecuteCommandParams {
     SolutionRootPath: string
     GetCheckpoints?: boolean
     useOrchestratorAgent?: boolean
+    // Beam-to-IDE: when true, this job was beamed to the IDE and its source is
+    // ALREADY the transformed output. The prior transform job's per-step
+    // checkpoint diffs must NOT be re-applied (they're baked into the beamed
+    // source, and their checkpoint folders aren't in the beam bundle) — doing so
+    // produces "Checkpoint folder not available for step" + DiffApplyFailed and
+    // stalls the LBV loop. When set, getTransformInfo skips the completed-step
+    // artifact download/apply pass and only surfaces NEW LBV-round diffs.
+    IsBeam?: boolean
+    // Beam-to-IDE: comma-separated plan-step ids of the LOADED beamed repo's subtree. Used to
+    // select THIS repo's local-build-verification HITL instead of the first LBV HITL in the list
+    // (which may be a sibling's, shadowing the loaded repo's own). Empty/absent = first-match.
+    beamScopeStepIds?: string
 }
 
 export interface AtxGetTransformInfoResponse {

server/aws-lsp-codewhisperer/src/language-server/netTransform/atxNetTransformServer.ts

@@ -47,6 +47,9 @@ const AtxGetJobDashboardCommand = 'aws/atxTransform/getJobDashboard'
 const AtxGetJobReportCommand = 'aws/atxTransform/getJobReport'
 const AtxUploadCustomPlanCommand = 'aws/atxTransform/uploadCustomPlan'
 const AtxLoadOlderWorklogsCommand = 'aws/atxTransform/loadOlderWorklogs'
+// Beam to IDE
+const AtxListBeamedReposCommand = 'aws/atxTransform/listBeamedRepos'
+const AtxDownloadBeamArtifactCommand = 'aws/atxTransform/downloadBeamArtifact'
 
 export const AtxNetTransformServerToken =
     (): Server =>
@@ -170,12 +173,13 @@ export const AtxNetTransformServerToken =
                         return await atxTransformHandler.uploadPackages(request)
                     }
                     case AtxSendMessageCommand: {
-                        const { workspaceId, jobId, text, skipPolling } = params as any
+                        const { workspaceId, jobId, text, skipPolling, beamStepId } = params as any
                         return await atxTransformHandler.sendMessage({
                             workspaceId,
                             jobId,
                             text,
                             skipPolling,
+                            beamStepId,
                         })
                     }
                     case AtxListMessagesCommand: {
@@ -269,6 +273,32 @@ export const AtxNetTransformServerToken =
                             request.nextToken
                         )
                     }
+                    // ---- Beam to IDE ----
+                    case AtxListBeamedReposCommand: {
+                        // PascalCase params/return to match the C# ExecuteCommandParams convention.
+                        const { WorkspaceId, ParentJobId } = params as any
+                        if (!WorkspaceId || !ParentJobId) {
+                            throw new Error('WorkspaceId and ParentJobId are required for listBeamedRepos')
+                        }
+                        const repos = await atxTransformHandler.listBeamedRepos(WorkspaceId, ParentJobId)
+                        return { Repos: repos }
+                    }
+                    case AtxDownloadBeamArtifactCommand: {
+                        // PascalCase params to match the C# ExecuteCommandParams serialization
+                        // convention used by every other C#-backed ATX command (e.g. downloadArtifact).
+                        const { WorkspaceId, ParentJobId, BeamArtifactId, DestDir } = params as any
+                        if (!WorkspaceId || !ParentJobId || !BeamArtifactId || !DestDir) {
+                            throw new Error(
+                                'WorkspaceId, ParentJobId, BeamArtifactId and DestDir are required for downloadBeamArtifact'
+                            )
+                        }
+                        return await atxTransformHandler.downloadBeamArtifact(
+                            WorkspaceId,
+                            ParentJobId,
+                            BeamArtifactId,
+                            DestDir
+                        )
+                    }
                     default: {
                         throw new Error(`Unknown ATX FES command: ${params.command}`)
                     }
@@ -311,6 +341,8 @@ export const AtxNetTransformServerToken =
                             AtxGetJobReportCommand,
                             AtxUploadCustomPlanCommand,
                             AtxLoadOlderWorklogsCommand,
+                            AtxListBeamedReposCommand,
+                            AtxDownloadBeamArtifactCommand,
                         ],
                     },
                 },