Supersede ACE

.gitignore

@@ -21,4 +21,5 @@ test-git-repo-diff-utils/
 test-cs-diagnostics/
 coverage/
 .cs-prod-build
+bin/cs-agent
 bench-results/

.vscodeignore

@@ -19,6 +19,9 @@ cs-*
 !cs-cwf/
 !cs-cwf/**
 
+## Include the agent binary
+!bin/
+
 ## Misc dotfiles
 .mocharc.json
 Makefile

CLAUDE.md

@@ -12,4 +12,12 @@ Validate your work using `make lint`. Satifying all linter faults is mandatory -
 
 If you find an issue at any stage, you must fix it immediately, regardless of whether you think it's pre-existing.
 
+This project is a VS Code extension. You might need to study the VS Code accordingly. It might be cloned at `../vscode`.
+This project uses CWF for rendering views, and can typically be found at `../cs-webview`.
+This project uses cs-agent for performing refactorings, and can typically be found at `../cs-agent`.
+This project uses the CodeScene CLI for performing various code analysis tasks, and can typically be found at `../codescene/cli`.
+This project used in the past ACE where cs-agent is now used, and can typically be found at `../automated-refactoring`.
+
+When querying external projects, please use subagents.
+
 Commit messages follow Conventional Commits. Keep the subject line (`type: imperative summary`) to at most 100 characters and do not end it with a period. Put the why in the body after a blank line, wrapped near 80 columns. The commit-msg hook rejects messages that fail commitlint. `make lint` checks every commit from `main` to `HEAD`.

Makefile

@@ -1,4 +1,4 @@
-.PHONY: build package tsc clean lint watch test pretest test-release updatecwf benchmark benchmark-isolated
+.PHONY: build package package-darwin-arm64 package-darwin-x64 package-linux-arm64 package-linux-x64 package-win32-x64 package-all tsc clean lint watch test pretest test-release updatecwf benchmark benchmark-isolated
 
 .DEFAULT_GOAL := build
 
@@ -14,6 +14,34 @@ package: lint pretest
 	npx @vscode/vsce@4.0.0 package; \
 	git checkout .vscodeignore; \
 
+package-darwin-arm64: lint pretest
+	npm i
+	cd ~/cs-agent/agent && $(MAKE) build-all
+	mkdir -p ./bin
+	cp ~/cs-agent/agent/target/aarch64-apple-darwin/release/cs-agent ./bin/cs-agent
+	node ./scripts/package-platform.js darwin arm64
+
+package-darwin-x64: lint pretest
+	npm i
+	cd ~/cs-agent/agent && $(MAKE) build-all
+	mkdir -p ./bin
+	cp ~/cs-agent/agent/target/x86_64-apple-darwin/release/cs-agent ./bin/cs-agent
+	node ./scripts/package-platform.js darwin x64
+
+package-linux-arm64: lint pretest
+	npm i
+	node ./scripts/package-platform.js linux arm64
+
+package-linux-x64: lint pretest
+	npm i
+	node ./scripts/package-platform.js linux x64
+
+package-win32-x64: lint pretest
+	npm i
+	node ./scripts/package-platform.js win32 x64
+
+package-all: package-darwin-arm64 package-darwin-x64 package-linux-arm64 package-linux-x64 package-win32-x64
+
 tsc:
 	npx tsc --noEmit
 

README.md

@@ -71,7 +71,7 @@ Location: `Code Health Monitor` > `Extension Settings`
 | **Enable Review Code Lenses** | Boolean | true | Enables/Disables showing Code Health Score and Code Smells in the active documents |
 | **Enable Auto Refactor** | Boolean | false | Enables/Disables ACE, CodeScenes automatic refactoring tool |
 | **Server URL** | String | - | CodeScene server for browser sign-in. Empty uses `CS_ONPREM_URL`, then CodeScene Cloud. Used when Experimental: Sign In is on. |
-| **Auth Token** | String | - | Personal access token — fallback for WSL, remote and headless environments. Browser sign-in is recommended. Also used for Automatic Refactoring in ACE. |
+| **Auth Token** | String | - | Personal access token — an alternative to signing in, for WSL, remote and headless environments. Also used for refactoring. Browser sign-in is recommended. |
 | **Experimental: Sign In** | Boolean | false | Sign in to CodeScene in the browser (experimental). Requires a CodeScene IDE server with sign-in support. |
 | **Enable Telemetry** | Boolean | true | Enable/Disable collecting anonymized telemetry for tracking usage and feature engagement. |
 

package.json

@@ -84,6 +84,10 @@
         "command": "codescene.copyDeviceId",
         "title": "CodeScene: copy Device ID"
       },
+      {
+        "command": "codescene.testConnectivity",
+        "title": "CodeScene: test provider connectivity"
+      },
       {
         "command": "codescene.browserSignIn",
         "title": "CodeScene: Sign in"
@@ -140,6 +144,10 @@
           "command": "codescene.startAutomaticAnalysis",
           "when": "!config.codescene.enableAutomaticAnalysis"
         },
+        {
+          "command": "codescene.testConnectivity",
+          "when": "codescene.aceUsable"
+        },
         {
           "command": "codescene.browserSignIn",
           "when": "codescene.signInActive"
@@ -172,9 +180,84 @@
         "codescene.enableAutoRefactor": {
           "type": "boolean",
           "default": true,
-          "description": "Enable CodeScene ACE",
+          "description": "Enable CodeScene Refactoring Agent",
           "order": 15
         },
+        "codescene.agentModel": {
+          "type": "string",
+          "default": "amazon-bedrock/eu.anthropic.claude-sonnet-4-6",
+          "enum": [
+            "amazon-bedrock/eu.anthropic.claude-sonnet-4-6",
+            "amazon-bedrock/eu.anthropic.claude-opus-5",
+            "amazon-bedrock/eu.anthropic.claude-opus-4-8",
+            "amazon-bedrock/eu.anthropic.claude-sonnet-4-5-20250929-v1:0",
+            "amazon-bedrock/eu.anthropic.claude-haiku-4-5-20251001-v1:0",
+            "amazon-bedrock/us.anthropic.claude-opus-5",
+            "amazon-bedrock/us.anthropic.claude-sonnet-4-6",
+            "anthropic/claude-sonnet-4-0",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-haiku-3-5-sonnet",
+            "openai/gpt-4o",
+            "openai/gpt-4-turbo",
+            "openai/o3",
+            "google/gemini-2.5-pro",
+            "google/gemini-2.5-flash"
+          ],
+          "enumDescriptions": [
+            "Claude Sonnet 4.6 via Amazon Bedrock (EU)",
+            "Claude Opus 5 via Amazon Bedrock (EU) - Most advanced",
+            "Claude Opus 4.8 via Amazon Bedrock (EU) - Optimized for coding",
+            "Claude Sonnet 4.5 via Amazon Bedrock (EU) - Optimized for agents",
+            "Claude Haiku 4.5 via Amazon Bedrock (EU) - Fast and lightweight",
+            "Claude Opus 5 via Amazon Bedrock (US) - Most advanced",
+            "Claude Sonnet 4.6 via Amazon Bedrock (US)",
+            "Claude Sonnet 4.0 via Anthropic API",
+            "Claude Opus 4 via Anthropic API",
+            "Claude Haiku 3.5 via Anthropic API - Fast and lightweight",
+            "GPT-4o via OpenAI API",
+            "GPT-4 Turbo via OpenAI API",
+            "o3 via OpenAI API - Advanced reasoning",
+            "Gemini 2.5 Pro via Google API",
+            "Gemini 2.5 Flash via Google API - Fast and efficient"
+          ],
+          "description": "Model to use for the Refactoring Agent.",
+          "order": 16
+        },
+        "codescene.agentModelOverride": {
+          "type": "string",
+          "default": "",
+          "description": "Custom model identifier. If set, overrides the dropdown selection above.",
+          "order": 17
+        },
+        "codescene.providerOptions": {
+          "type": "object",
+          "properties": {
+            "amazon-bedrock:profile": {
+              "type": "string",
+              "description": "AWS profile name for Amazon Bedrock"
+            },
+            "amazon-bedrock:region": {
+              "type": "string",
+              "description": "AWS region for Amazon Bedrock"
+            },
+            "anthropic:api-key": {
+              "type": "string",
+              "description": "API key for Anthropic"
+            },
+            "openai:api-key": {
+              "type": "string",
+              "description": "API key for OpenAI"
+            },
+            "google:api-key": {
+              "type": "string",
+              "description": "API key for Google (Gemini)"
+            }
+          },
+          "additionalProperties": false,
+          "default": {},
+          "markdownDescription": "Provider-specific options for the Refactoring Agent. Use this to authenticate into your preferred model.\n\n**[Test connectivity](command:codescene.testConnectivity)**",
+          "order": 18
+        },
         "codescene.serverUrl": {
           "type": "string",
           "default": "",
@@ -184,7 +267,7 @@
         "codescene.authToken": {
           "type": "string",
           "default": "",
-          "description": "Personal access token — fallback for WSL, remote and headless environments. Browser sign-in is recommended.",
+          "description": "Personal access token — an alternative to signing in, for WSL, remote and headless environments. Also used for refactoring. Browser sign-in is recommended.",
           "order": 19.5
         },
         "codescene.experimental.signIn": {

scripts/cli-config.js

@@ -6,7 +6,7 @@
  * - TypeScript source files (via artifact-info.ts) that import from this file
  */
 
-const requiredDevtoolsVersion = 'eff2f1fd6e7d928b0abd2f59f2243c63cefdf885';
+const requiredDevtoolsVersion = '4a1fe05787f040c67f8a9da547108c87082e6ec5';
 
 const nativeOsNames = { darwin: 'macos', linux: 'linux', win32: 'windows' };
 const nativeArchNames = { x64: 'amd64', arm64: 'aarch64' };

src/auth/ace-credential.ts

@@ -3,7 +3,7 @@ import { MissingAuthTokenError } from '../missing-auth-token-error';
 
 export interface AceAuthState {
   active: boolean;
-  status: Pick<AuthStatus, 'ace-credential'> | null;
+  status: Pick<AuthStatus, 'state'> | null;
 }
 
 function nonBlank(value: string | undefined): string | undefined {
@@ -16,7 +16,7 @@ export function resolveAceToken(settingToken: string | undefined, legacyToken: s
 }
 
 export function isAceAvailable(token: string | undefined, auth: AceAuthState): boolean {
-  return token !== undefined || (auth.active && auth.status?.['ace-credential'] === true);
+  return token !== undefined || (auth.active && auth.status?.state === 'signed-in');
 }
 
 export function refactorToken(token: string | undefined, auth: AceAuthState): string | undefined {

src/auth/auth-token.ts

@@ -0,0 +1,9 @@
+export interface AuthTokenResponse {
+  'credential-source': 'env-token' | 'setting-token' | 'oauth';
+  'access-token': string;
+}
+
+export function tokenFromResponse(response: Partial<AuthTokenResponse> | null | undefined): string | undefined {
+  const token = response?.['access-token']?.trim();
+  return token ? token : undefined;
+}

src/centralized-webview-framework/types/index.d.ts

@@ -93,6 +93,7 @@ export interface AceContextViewProps extends AuthField {
     error?: string;
     isStale: boolean;
     loading: boolean;
+    progressMessage?: string;
   };
 }
 

src/code-health-monitor/codelens.ts

@@ -1,6 +1,7 @@
 import vscode, { Uri } from 'vscode';
 import { ACE_ENABLED } from '../build-flags';
 import { onDidChangeConfiguration, reviewCodeLensesEnabled } from '../configuration';
+import { aceUsable } from '../devtools-api';
 import { issueToDocsParams } from '../documentation/commands';
 import { reviewDocumentSelector } from '../language-support';
 import { DeltaFunctionInfo } from './delta-function-info';
@@ -18,6 +19,10 @@ export function register(context: vscode.ExtensionContext) {
   );
 }
 
+function canOfferRefactoring(functionInfo: DeltaFunctionInfo): boolean {
+  return ACE_ENABLED && aceUsable() && functionInfo.isRefactoringSupported;
+}
+
 export class CodeHealthMonitorCodeLens implements vscode.CodeLensProvider<vscode.CodeLens> {
   private changeCodeLensesEmitter = new vscode.EventEmitter<void>();
   onDidChangeCodeLenses = this.changeCodeLensesEmitter.event;
@@ -55,7 +60,7 @@ export class CodeHealthMonitorCodeLens implements vscode.CodeLensProvider<vscode
     const functionStartLine = functionInfo.range.start.with({ character: 0 });
 
     const requestAceLens = new vscode.CodeLens(new vscode.Range(functionStartLine, functionStartLine), {
-      title: '$(sparkle) CodeScene ACE',
+      title: '$(sparkle) CodeScene Agent',
       command: 'codescene.requestAndPresentRefactoring',
       arguments: [functionInfo.parent.document, 'codelens (code-health-monitor)', functionInfo.fnToRefactor],
     });
@@ -65,7 +70,7 @@ export class CodeHealthMonitorCodeLens implements vscode.CodeLensProvider<vscode
       arguments: [functionInfo.parent.document.uri],
     });
 
-    if (ACE_ENABLED && functionInfo.fnToRefactor) {
+    if (canOfferRefactoring(functionInfo)) {
       codeLenses.push(requestAceLens, dismissAceLens);
     }
     let order = 1;

src/code-health-monitor/home/cwf-message-handlers.ts

@@ -84,7 +84,7 @@ function handleOpenDocs(homeView: HomeView, payload: OpenDocsMessage['payload'])
 /**
  * Open settings in editor
  */
-function handleOpenSettings() {
+export function handleOpenSettings() {
   Telemetry.logUsage('control-center/open-settings');
   vscode.commands.executeCommand('workbench.action.openWorkspaceSettings', getExtensionSettingsFilter()).then(
     () => {},

src/code-health-monitor/home/home-view.ts

@@ -114,9 +114,8 @@ export class HomeView implements WebviewViewProvider, Disposable {
 
   // Detect changes to the delta result, updates the list and lastly converts the data to CWF webview format
   private updateFileDeltaData(event: DeltaAnalysisEvent) {
-    const { document, result, updateMonitor, enrichment } = event;
+    const { document, result, updateMonitor } = event;
     if (!updateMonitor) return;
-    if (enrichment && !this.fileIssueMap.has(document.uri.fsPath)) return;
 
     const evtData = (fileWithIssues: FileWithIssues) => {
       const { nIssues, scoreChange } = fileWithIssues;

src/codescene-tab/webview/ace/ace-data-mapper.ts

@@ -11,10 +11,11 @@ interface CwfAceData {
   isStale: boolean;
   error?: string;
   loading: boolean;
+  progressMessage?: string;
 }
 
 export function getAceData(data: CwfAceData): AceContextViewProps {
-  const { request, result, isStale, error, loading } = data;
+  const { request, result, isStale, error, loading, progressMessage } = data;
 
   return {
     view: 'ace',
@@ -40,6 +41,7 @@ export function getAceData(data: CwfAceData): AceContextViewProps {
       isStale,
       loading,
       error,
+      progressMessage,
     },
   };
 }

src/codescene-tab/webview/ace/acknowledgement/ace-acknowledgement-mapper.ts

@@ -23,13 +23,13 @@ export function getAutoRefactorConfig(): AutoRefactorConfig {
     return { disabled: true, activated: false, visible: false };
   }
 
-  const hasToken = aceAvailable();
+  const authenticated = aceAvailable();
   const acknowledged = CsExtensionState.acknowledgedAceUsage === true;
-  const activated = !(!acknowledged && hasToken);
+  const activated = !(!acknowledged && authenticated);
 
   return {
-    disabled: !hasToken,
+    disabled: !authenticated,
     activated,
-    visible: CsExtensionState.stateProperties.features.ace.state === 'enabled',
+    visible: authenticated && CsExtensionState.stateProperties.features.ace.state === 'enabled',
   };
 }

src/codescene-tab/webview/ace/acknowledgement/cwf-webview-ace-acknowledgement-panel.ts

@@ -10,6 +10,7 @@ import { highlightCode } from '../../../../refactoring/utils';
 import Telemetry from '../../../../telemetry';
 import { reportError, showDocAtPosition } from '../../../../utils';
 import { commonResourceRoots } from '../../../../webview-utils';
+import { handleOpenSettings } from '../../../../code-health-monitor/home/cwf-message-handlers';
 import { CsExtensionState } from '../../../../cs-extension-state';
 import { getAceAcknowledgeData } from './ace-acknowledgement-mapper';
 
@@ -37,7 +38,7 @@ export class CodeSceneCWFAceAcknowledgementTabPanel implements Disposable {
   constructor() {
     this.webViewPanel = vscode.window.createWebviewPanel(
       CodeSceneCWFAceAcknowledgementTabPanel.viewType,
-      'CodeScene ACE - AI-Powered Refactoring',
+      'CodeScene Refactoring Agent - AI-Powered Refactoring',
       { viewColumn: ViewColumn.Beside, preserveFocus: true },
       {
         enableScripts: true,
@@ -71,7 +72,7 @@ export class CodeSceneCWFAceAcknowledgementTabPanel implements Disposable {
       if (!this.state) return;
       await this.handleMessage(this.state.request, message);
     } catch (e) {
-      reportError({ context: 'An error occurred in the CodeScene ACE Acknowledgement panel', e });
+      reportError({ context: 'An error occurred in the CodeScene Agent Acknowledgement panel', e });
     }
   }
 
@@ -82,6 +83,7 @@ export class CodeSceneCWFAceAcknowledgementTabPanel implements Disposable {
         await showDocAtPosition(request.document, request.fnToRefactor.vscodeRange.start);
         void highlightCode(request, false);
       },
+      'open-settings': handleOpenSettings,
       acknowledged: async () => {
         const document = this.state?.request.document;
         const fnToRefactor = this.state?.request.fnToRefactor;