Keep default runtime bundles SEA-free

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 3f5c3c30-0cf7-4b9a-9a3b-2b01ca073015

Author: roji

dotnet/test/E2E/RpcExtensionsLoadedE2ETests.cs

@@ -25,12 +25,6 @@ namespace GitHub.Copilot.Test.E2E;
 public class RpcExtensionsLoadedE2ETests(E2ETestFixture fixture, ITestOutputHelper output)
     : E2ETestBase(fixture, "rpc_extensions_loaded", output)
 {
-    // TODO(PR #2395): Temporarily disabled while this PR transitions managed out-of-process SDK
-    // launches to the Rust-only flow. Re-enable when that flow provides the Node extension
-    // subprocess lifecycle required by the EXTENSIONS controller.
-    private const string RustOnlyFlowSkipReason =
-        "Temporarily disabled for the Rust-only out-of-process transition in PR #2395";
-
     /// <summary>
     /// Extension subprocess startup involves Node fork + SDK resolver + JSON-RPC
     /// handshake. Empirically this completes in well under a second on Windows,
@@ -169,7 +163,7 @@ await TestHelper.WaitForConditionAsync(
         return lastSeen!;
     }
 
-    [Theory(Skip = RustOnlyFlowSkipReason)]
+    [Theory]
     [InlineData("user")]
     [InlineData("project")]
     public async Task Discovers_Loads_And_Reports_Running_Extension(string sourceValue)
@@ -212,7 +206,7 @@ public async Task Discovers_Loads_And_Reports_Running_Extension(string sourceVal
         Assert.True(ext.Pid > 0);
     }
 
-    [Fact(Skip = RustOnlyFlowSkipReason)]
+    [Fact]
     public async Task Disable_Then_Enable_Cycles_Extension_Status()
     {
         var extName = CreateUserExtension();
@@ -240,7 +234,7 @@ public async Task Disable_Then_Enable_Cycles_Extension_Status()
         Assert.NotNull(reEnabled.Pid);
     }
 
-    [Fact(Skip = RustOnlyFlowSkipReason)]
+    [Fact]
     public async Task Reload_Picks_Up_Extension_Added_After_Session_Create()
     {
         // Start the session BEFORE writing the extension so the initial discovery sees nothing.
@@ -274,7 +268,7 @@ await TestHelper.WaitForConditionAsync(
         Assert.Equal(ExtensionSource.User, ext.Source);
     }
 
-    [Fact(Skip = RustOnlyFlowSkipReason)]
+    [Fact]
     public async Task Failed_Extension_Reports_Failed_Status()
     {
         // Write an extension whose body throws synchronously at import time.
@@ -302,7 +296,7 @@ public async Task Failed_Extension_Reports_Failed_Status()
         Assert.Equal(ExtensionSource.User, ext.Source);
     }
 
-    [Fact(Skip = RustOnlyFlowSkipReason)]
+    [Fact]
     public async Task Multiple_Extensions_Are_Discovered_Independently()
     {
         var ext1Name = CreateUserExtension(prefix: "multi-a");
@@ -326,7 +320,7 @@ public async Task Multiple_Extensions_Are_Discovered_Independently()
         Assert.Equal(pids.Count, pids.Distinct().Count());
     }
 
-    [Fact(Skip = RustOnlyFlowSkipReason)]
+    [Fact]
     public async Task Reload_Preserves_Disabled_State_Across_Calls()
     {
         var extName = CreateUserExtension(prefix: "persistent-disable");

java/README.md

@@ -560,7 +560,7 @@ mvn clean verify -Dcopilot.native.libc=glibc
 mvn clean package -pl copilot-native -DskipTests -Dcopilot.native.libc=glibc -Dcopilot.native.skip.download=true
 ```
 
-On Linux x64, the classifier JAR contains `native/linux-x64/runtime.node`, `native/linux-x64/platform.properties`, and `native/linux-x64/copilot`. On Windows x64, it contains `native/win32-x64/runtime.node`, `native/win32-x64/platform.properties`, and `native/win32-x64/copilot.exe`. On Apple Silicon macOS, it contains `native/darwin-arm64/runtime.node`, `native/darwin-arm64/platform.properties`, and `native/darwin-arm64/copilot`. The placeholder JAR remains OS-neutral and contains no native binaries. Unsupported hosts retain the placeholder-only behavior.
+Each classifier JAR includes `runtime.node`, `platform.properties`, and `copilot-runtime` (or `copilot-runtime.exe`) under its `native/<classifier>` directory. It does not contain the legacy `copilot` SEA. The placeholder JAR remains OS-neutral and contains no native binaries. Unsupported hosts retain the placeholder-only behavior.
 
 ## License
 

java/copilot-native/pom.xml

@@ -126,8 +126,7 @@
                     <!--
                         Additional classifier JAR containing
                         native/<classifier>/runtime.node,
-                        native/<classifier>/copilot-runtime or copilot-runtime.exe,
-                        native/<classifier>/copilot or copilot.exe, and
+                        native/<classifier>/copilot-runtime or copilot-runtime.exe, and
                         native/<classifier>/platform.properties.
                     -->
                     <execution>
@@ -204,12 +203,6 @@
                                     </resourceexists>
                                 </condition>
                                 <fail unless="native.properties.present" message="Classifier JAR is missing native/${copilot.native.classifier}/platform.properties" />
-                                <condition property="native.cli.present">
-                                    <resourceexists>
-                                        <zipentry zipfile="${project.build.directory}/${project.build.finalName}-${copilot.native.classifier}.jar" name="native/${copilot.native.classifier}/${copilot.native.cli.filename}" />
-                                    </resourceexists>
-                                </condition>
-                                <fail unless="native.cli.present" message="Classifier JAR is missing native/${copilot.native.classifier}/${copilot.native.cli.filename}" />
                                 <condition property="native.wrapper.filename" value="copilot-runtime.exe" else="copilot-runtime">
                                     <matches string="${copilot.native.classifier}" pattern="^win32-" />
                                 </condition>
@@ -253,7 +246,6 @@
             <id>inprocess</id>
             <properties>
                 <copilot.native.classifier>linux-x64</copilot.native.classifier>
-                <copilot.native.cli.filename>copilot</copilot.native.cli.filename>
             </properties>
             <build>
                 <plugins>
@@ -316,7 +308,6 @@
             </activation>
             <properties>
                 <copilot.native.classifier>linux-x64</copilot.native.classifier>
-                <copilot.native.cli.filename>copilot</copilot.native.cli.filename>
             </properties>
             <build>
                 <plugins>
@@ -371,7 +362,6 @@
             </activation>
             <properties>
                 <copilot.native.classifier>win32-x64</copilot.native.classifier>
-                <copilot.native.cli.filename>copilot.exe</copilot.native.cli.filename>
             </properties>
             <build>
                 <plugins>
@@ -426,7 +416,6 @@
             </activation>
             <properties>
                 <copilot.native.classifier>darwin-arm64</copilot.native.classifier>
-                <copilot.native.cli.filename>copilot</copilot.native.cli.filename>
             </properties>
             <build>
                 <plugins>

java/copilot-native/scripts/fetch-native.mjs

@@ -27,6 +27,8 @@ const excludedTopLevel = new Set([
   'app.js',
   'assets',
   'changelog.json',
+  'copilot',
+  'copilot.exe',
   'copilot-sdk',
   'foundry-local-sdk',
   'index.js',
@@ -70,32 +72,32 @@ const outDir = path.join(stagingDir, classifier);
 const resourceDir = path.join(outDir, 'native', classifier);
 const runtimePath = path.join(resourceDir, 'runtime.node');
 const isWindows = classifier.startsWith('win32');
-const cliFilename = isWindows ? 'copilot.exe' : 'copilot';
-const cliPath = path.join(resourceDir, cliFilename);
 const wrapperFilename = isWindows ? 'copilot-runtime.exe' : 'copilot-runtime';
 const wrapperPath = path.join(resourceDir, wrapperFilename);
 const inventoryPath = path.join(resourceDir, 'runtime-assets.list');
 const platformPropertiesPath = path.join(resourceDir, 'platform.properties');
 const expectedPlatformProperties = `classifier=${classifier}\nversion=${version}\n`;
+const stagingSchema = 'hostless-runtime-v2';
 const stampPath = path.join(outDir, '.version');
 
 // Idempotence: skip the download only when every required staged artifact
 // matches the package identity recorded in the stamp.
 if (
   fs.existsSync(runtimePath) &&
   fs.existsSync(wrapperPath) &&
-  fs.existsSync(cliPath) &&
   fs.existsSync(inventoryPath) &&
   fs.existsSync(platformPropertiesPath) &&
   fs.existsSync(stampPath)
 ) {
   const stampLines = fs.readFileSync(stampPath, 'utf8').trim().split('\n');
-  const stampVersion = stampLines[0] || '';
-  const stampIntegrity = stampLines[1] || '';
-  const stampTreeDigest = stampLines[2] || '';
+  const stampSchema = stampLines[0] || '';
+  const stampVersion = stampLines[1] || '';
+  const stampIntegrity = stampLines[2] || '';
+  const stampTreeDigest = stampLines[3] || '';
   const currentTreeDigest = digestTree(resourceDir);
   const currentPlatformProperties = fs.readFileSync(platformPropertiesPath, 'utf8');
   if (
+    stampSchema === stagingSchema &&
     stampVersion === version &&
     stampIntegrity === integrity &&
     stampTreeDigest === currentTreeDigest &&
@@ -162,12 +164,12 @@ fs.writeFileSync(inventoryPath, `${inventory.join('\n')}\n`);
 
 fs.rmSync(tarballPath, { force: true });
 
-if (!fs.existsSync(runtimePath) || !fs.existsSync(wrapperPath) || !fs.existsSync(cliPath)) {
-  throw new Error(`Package ${packageName}@${version} is missing the CLI or runtime wrapper pair`);
+if (!fs.existsSync(runtimePath) || !fs.existsSync(wrapperPath)) {
+  throw new Error(`Package ${packageName}@${version} is missing the runtime wrapper pair`);
 }
 fs.writeFileSync(platformPropertiesPath, expectedPlatformProperties);
 const treeDigest = digestTree(resourceDir);
-fs.writeFileSync(stampPath, `${version}\n${integrity}\n${treeDigest}\n`);
+fs.writeFileSync(stampPath, `${stagingSchema}\n${version}\n${integrity}\n${treeDigest}\n`);
 
 console.log(`Staged ${runtimePath}`);
 

java/copilot-native/scripts/fetch-native.test.mjs

@@ -14,32 +14,34 @@ import test from 'node:test';
 const version = '1.0.79';
 const integrity = 'sha512-test-integrity';
 const runtimeContent = 'runtime content';
-const cliContent = 'cli content';
 const wrapperContent = 'wrapper content';
+const stagingSchema = 'hostless-runtime-v2';
 const scriptPath = fileURLToPath(new URL('./fetch-native.mjs', import.meta.url));
 
 for (const classifier of ['linux-x64', 'win32-x64', 'darwin-arm64']) {
-  test(`${classifier}: missing CLI does not use incremental fast path`, (t) => {
+  test(`${classifier}: complete hostless artifacts use incremental fast path without a CLI`, (t) => {
     const fixture = createFixture(t, classifier);
-    fs.rmSync(fixture.cliPath);
 
     const result = runScript(fixture);
 
-    assertRestagingAttempted(fixture, result);
+    assert.equal(result.status, 0, result.stderr);
+    assert.match(result.stdout, /already staged/);
+    assert.equal(fs.existsSync(fixture.npmMarkerPath), false);
   });
 
-  test(`${classifier}: stale CLI does not use incremental fast path`, (t) => {
+  test(`${classifier}: missing runtime wrapper does not use incremental fast path`, (t) => {
     const fixture = createFixture(t, classifier);
-    fs.writeFileSync(fixture.cliPath, 'stale CLI content');
+    fs.rmSync(fixture.wrapperPath);
 
     const result = runScript(fixture);
 
     assertRestagingAttempted(fixture, result);
   });
 
-  test(`${classifier}: missing runtime wrapper does not use incremental fast path`, (t) => {
+  test(`${classifier}: legacy staging schema does not use incremental fast path`, (t) => {
     const fixture = createFixture(t, classifier);
-    fs.rmSync(fixture.wrapperPath);
+    const stampPath = path.join(fixture.stagingDir, classifier, '.version');
+    fs.writeFileSync(stampPath, fs.readFileSync(stampPath, 'utf8').replace(stagingSchema, 'hostless-runtime-v1'));
 
     const result = runScript(fixture);
 
@@ -82,7 +84,7 @@ test('stages retained package assets and excludes CLI-only content', (t) => {
   fs.mkdirSync(path.join(packageRoot, 'prebuilds', classifier), { recursive: true });
   fs.mkdirSync(path.join(packageRoot, 'ripgrep', 'bin', classifier), { recursive: true });
   fs.mkdirSync(path.join(packageRoot, 'definitions'), { recursive: true });
-  fs.writeFileSync(path.join(packageRoot, 'copilot'), cliContent);
+  fs.writeFileSync(path.join(packageRoot, 'copilot'), 'excluded');
   fs.writeFileSync(path.join(packageRoot, 'prebuilds', classifier, 'runtime.node'), runtimeContent);
   fs.writeFileSync(path.join(packageRoot, 'prebuilds', classifier, 'copilot-runtime'), wrapperContent);
   fs.writeFileSync(path.join(packageRoot, 'ripgrep', 'bin', classifier, 'rg'), 'ripgrep content');
@@ -116,6 +118,7 @@ test('stages retained package assets and excludes CLI-only content', (t) => {
   assert.equal(fs.readFileSync(path.join(resourceDir, 'ripgrep', 'bin', classifier, 'rg'), 'utf8'), 'ripgrep content');
   assert.equal(fs.readFileSync(path.join(resourceDir, 'definitions', 'future.json'), 'utf8'), '{}');
   assert.equal(fs.existsSync(path.join(resourceDir, 'app.js')), false);
+  assert.equal(fs.existsSync(path.join(resourceDir, 'copilot')), false);
   assert.equal(fs.existsSync(path.join(resourceDir, 'LICENSE.md')), false);
   assert.equal(fs.existsSync(path.join(resourceDir, 'README.md')), false);
   assert.match(fs.readFileSync(path.join(resourceDir, 'runtime-assets.list'), 'utf8'), /ripgrep\/bin\/linux-x64\/rg/);
@@ -144,7 +147,6 @@ function createFixture(t, classifier) {
   );
 
   const runtimePath = path.join(resourceDir, 'runtime.node');
-  const cliPath = path.join(resourceDir, classifier.startsWith('win32') ? 'copilot.exe' : 'copilot');
   const wrapperPath = path.join(
     resourceDir,
     classifier.startsWith('win32') ? 'copilot-runtime.exe' : 'copilot-runtime',
@@ -154,17 +156,16 @@ function createFixture(t, classifier) {
   const inventoryPath = path.join(resourceDir, 'runtime-assets.list');
   fs.mkdirSync(path.dirname(ripgrepPath), { recursive: true });
   fs.writeFileSync(runtimePath, runtimeContent);
-  fs.writeFileSync(cliPath, cliContent);
   fs.writeFileSync(wrapperPath, wrapperContent);
   fs.writeFileSync(ripgrepPath, 'ripgrep content');
   fs.writeFileSync(
     inventoryPath,
-    `644\truntime.node\n755\tcopilot\n755\tcopilot-runtime\n755\tripgrep/bin/${classifier}/rg\n`,
+    `644\truntime.node\n755\tcopilot-runtime\n755\tripgrep/bin/${classifier}/rg\n`,
   );
   fs.writeFileSync(platformPropertiesPath, `classifier=${classifier}\nversion=${version}\n`);
   fs.writeFileSync(
     path.join(stagingDir, classifier, '.version'),
-    `${version}\n${integrity}\n${digestTree(resourceDir)}\n`,
+    `${stagingSchema}\n${version}\n${integrity}\n${digestTree(resourceDir)}\n`,
   );
 
   const fakeNpmPath = path.join(fakeBinDir, process.platform === 'win32' ? 'npm.cmd' : 'npm');
@@ -182,7 +183,6 @@ function createFixture(t, classifier) {
     fakeBinDir,
     npmMarkerPath,
     runtimePath,
-    cliPath,
     wrapperPath,
     ripgrepPath,
     platformPropertiesPath,

java/sdk/src/test/java/com/github/copilot/e2e/OutOfProcessTransportIT.java

@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.e2e;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.api.Test;
+
+import com.github.copilot.AllowCopilotExperimental;
+import com.github.copilot.CopilotClient;
+import com.github.copilot.rpc.CopilotClientOptions;
+import com.github.copilot.rpc.PingResponse;
+import com.github.copilot.rpc.RuntimeConnection;
+
+/**
+ * Failsafe smoke test for the managed out-of-process runtime wrapper.
+ */
+@AllowCopilotExperimental
+@RequireInProcess
+class OutOfProcessTransportIT {
+
+    @Test
+    void shouldStartPingAndStopOverStdio() throws Exception {
+        CopilotClientOptions options = new CopilotClientOptions().setConnection(RuntimeConnection.forStdio());
+        try (CopilotClient client = new CopilotClient(options)) {
+            client.start().get();
+
+            PingResponse pong = client.ping("wrapper message").get();
+            assertEquals("pong: wrapper message", pong.message());
+            assertNotNull(pong.timestamp());
+
+            client.stop().get();
+        }
+    }
+}

nodejs/src/runtimeArtifacts.ts

@@ -23,6 +23,8 @@ const EXCLUDED_TOP_LEVEL = new Set([
     "app.js",
     "assets",
     "changelog.json",
+    "copilot",
+    "copilot.exe",
     "copilot-sdk",
     "foundry-local-sdk",
     "index.js",