@github/copilot-language-server 1.543.0 → 1.545.0

package/dist/node_modules/@github/copilot-sdk/dist/cjs/client.js

@@ -34,20 +34,19 @@ module.exports = __toCommonJS(client_exports);
 var import_node_child_process = require("node:child_process");
 var import_node_crypto = require("node:crypto");
 var import_node_fs = require("node:fs");
-var import_node_module = require("node:module");
 var import_node_net = require("node:net");
 var import_node_path = require("node:path");
-var import_node_url = require("node:url");
 var import_node = require("vscode-jsonrpc/node.js");
 var import_rpc = require("./generated/rpc.js");
 var import_sdkProtocolVersion = require("./sdkProtocolVersion.js");
 var import_session = require("./session.js");
+var import_runtimeArtifacts = require("./runtimeArtifacts.js");
+var import_cliVersion = require("./cliVersion.js");
 var import_sessionFsProvider = require("./sessionFsProvider.js");
 var import_copilotRequestHandler = require("./copilotRequestHandler.js");
 var import_telemetry = require("./telemetry.js");
 var import_toolSet = require("./toolSet.js");
 var import_types = require("./types.js");
-const import_meta = {};
 const MIN_PROTOCOL_VERSION = 3;
 const RUNTIME_SHUTDOWN_TIMEOUT_MS = 1e4;
 function isZodSchema(value) {
@@ -72,7 +71,7 @@ async function waitForChildExit(child, timeoutMs) {
   if (child.exitCode != null || child.signalCode != null) {
     return true;
   }
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     let timeout;
     let settled = false;
     const onExit = () => {
@@ -81,7 +80,7 @@ async function waitForChildExit(child, timeoutMs) {
       }
       settled = true;
       clearTimeout(timeout);
-      resolve(true);
+      resolve2(true);
     };
     timeout = setTimeout(() => {
       if (settled) {
@@ -89,7 +88,7 @@ async function waitForChildExit(child, timeoutMs) {
       }
       settled = true;
       child.off("exit", onExit);
-      resolve(false);
+      resolve2(false);
     }, timeoutMs);
     child.once("exit", onExit);
     if (child.exitCode != null || child.signalCode != null) {
@@ -150,6 +149,15 @@ function toWireCustomAgents(agents) {
     return { ...rest, mcpServers: toWireMcpServers(mcpServers) };
   });
 }
+function clientInfoToWire(info) {
+  if (info == null) return void 0;
+  const wire = {};
+  if (info.applicationName) wire.editorName = info.applicationName;
+  if (info.applicationVersion) wire.editorVersion = info.applicationVersion;
+  if (info.integrationName) wire.extensionName = info.integrationName;
+  if (info.integrationVersion) wire.extensionVersion = info.integrationVersion;
+  return Object.keys(wire).length > 0 ? wire : void 0;
+}
 function toWireLargeOutput(config) {
   if (!config) return void 0;
   const { outputDirectory, ...rest } = config;
@@ -207,39 +215,8 @@ function getNodeExecPath() {
   }
   return process.execPath;
 }
-function getCliPlatformPackageNames() {
-  const arch = process.arch;
-  const variants = process.platform === "linux" ? ["linux", "linuxmusl"] : [process.platform];
-  return variants.map((variant) => `@github/copilot-${variant}-${arch}`);
-}
-function getBundledCliPath() {
-  const packageNames = getCliPlatformPackageNames();
-  if (typeof import_meta.resolve === "function") {
-    for (const packageName of packageNames) {
-      try {
-        const sdkUrl = import_meta.resolve(`${packageName}/sdk`);
-        const sdkPath = (0, import_node_url.fileURLToPath)(sdkUrl);
-        return (0, import_node_path.join)((0, import_node_path.dirname)((0, import_node_path.dirname)(sdkPath)), "index.js");
-      } catch {
-      }
-    }
-    throw new Error(
-      `Could not resolve a @github/copilot platform package (tried ${packageNames.join(", ")}). Ensure @github/copilot is installed, or pass cliPath/cliUrl to CopilotClient.`
-    );
-  }
-  const req = (0, import_node_module.createRequire)(__filename);
-  const searchPaths = req.resolve.paths("@github/copilot") ?? [];
-  for (const base of searchPaths) {
-    for (const packageName of packageNames) {
-      const candidate = (0, import_node_path.join)(base, ...packageName.split("/"), "index.js");
-      if ((0, import_node_fs.existsSync)(candidate)) {
-        return candidate;
-      }
-    }
-  }
-  throw new Error(
-    `Could not find a @github/copilot platform package (tried ${packageNames.join(", ")}). Searched ${searchPaths.length} paths. Ensure @github/copilot is installed, or pass cliPath/cliUrl to CopilotClient.`
-  );
+function getBundledRuntimePath() {
+  return (0, import_runtimeArtifacts.ensureRuntimeBundle)(import_cliVersion.COPILOT_CLI_VERSION);
 }
 class TeardownResilientStreamMessageWriter extends import_node.StreamMessageWriter {
   suppressWriteErrors = false;
@@ -259,6 +236,7 @@ class CopilotClient {
   ffiHost = null;
   connection = null;
   messageWriter = null;
+  connectionClosed = false;
   socket = null;
   runtimePort = null;
   actualHost = "localhost";
@@ -287,6 +265,7 @@ class CopilotClient {
   _internalRpc = null;
   processExitPromise = null;
   // Rejects when CLI process exits
+  processTransportError = null;
   negotiatedProtocolVersion = null;
   /** Connection-level session filesystem config, set via constructor option. */
   sessionFsConfig = null;
@@ -294,6 +273,7 @@ class CopilotClient {
   builtinPluginDirectories = [];
   onGitHubTelemetry;
   clientGlobalHandlers = {};
+  githubTokenProviders = /* @__PURE__ */ new Map();
   /**
    * Typed server-scoped RPC methods.
    * @throws Error if the client is not connected
@@ -452,7 +432,12 @@ class CopilotClient {
     const connEnv = conn.kind === "stdio" || conn.kind === "tcp" ? conn.env : void 0;
     const effectiveEnv = connEnv ?? options.env ?? process.env;
     this.resolvedEnv = effectiveEnv;
-    this.resolvedCliPath = conn.kind === "stdio" || conn.kind === "tcp" ? conn.path ?? effectiveEnv.COPILOT_CLI_PATH ?? getBundledCliPath() : void 0;
+    if (conn.kind === "stdio" || conn.kind === "tcp") {
+      const explicitCliPath = conn.path ?? effectiveEnv.COPILOT_CLI_PATH;
+      if (explicitCliPath) {
+        this.resolvedCliPath = explicitCliPath;
+      }
+    }
     const connArgs = conn.kind === "stdio" || conn.kind === "tcp" ? conn.args ?? [] : [];
     this.connectionExtraArgs = [...connArgs];
     this.options = {
@@ -465,7 +450,8 @@ class CopilotClient {
       baseDirectory: options.baseDirectory,
       sessionIdleTimeoutSeconds: options.sessionIdleTimeoutSeconds ?? 0,
       enableRemoteSessions: options.enableRemoteSessions ?? false,
-      mode: options.mode ?? "copilot-cli"
+      mode: options.mode ?? "copilot-cli",
+      clientInfo: options.clientInfo
     };
     if (this.options.mode === "empty") {
       const hasPersistence = this.options.baseDirectory !== void 0 || this.sessionFsConfig !== null || // External runtimes manage their own persistence layer; the SDK
@@ -481,17 +467,29 @@ class CopilotClient {
   connectionExtraArgs = [];
   /**
    * Parse CLI URL into host and port
-   * Supports formats: "host:port", "http://host:port", "https://host:port", or just "port"
+   * Supports formats: "host:port", "[ipv6]:port", "http://host:port", "https://host:port", or just "port"
    */
   parseCliUrl(url) {
-    let cleanUrl = url.replace(/^https?:\/\//, "");
+    const cleanUrl = url.replace(/^https?:\/\//, "");
     if (/^\d+$/.test(cleanUrl)) {
       return { host: "localhost", port: parseInt(cleanUrl, 10) };
     }
+    const ipv6Match = cleanUrl.match(/^\[([^\]]+)\]:(\d+)$/);
+    if (ipv6Match) {
+      const host2 = ipv6Match[1];
+      if (!(0, import_node_net.isIPv6)(host2)) {
+        throw new Error(`Invalid cliUrl format: ${url}`);
+      }
+      const port2 = parseInt(ipv6Match[2], 10);
+      if (isNaN(port2) || port2 <= 0 || port2 > 65535) {
+        throw new Error(`Invalid port in cliUrl: ${url}`);
+      }
+      return { host: host2, port: port2 };
+    }
     const parts = cleanUrl.split(":");
     if (parts.length !== 2) {
       throw new Error(
-        `Invalid cliUrl format: ${url}. Expected "host:port", "http://host:port", or "port"`
+        `Invalid cliUrl format: ${url}. Expected "host:port", "[ipv6]:port", "http://host:port", or "port"`
       );
     }
     const host = parts[0] || "localhost";
@@ -551,8 +549,53 @@ class CopilotClient {
         }
       };
     }
+    handlers.gitHubToken = {
+      getToken: (params) => this.acquireGitHubToken(params)
+    };
     this.clientGlobalHandlers = handlers;
   }
+  async acquireGitHubToken(params) {
+    const registration = this.githubTokenProviders.get(params.registrationId);
+    if (!registration) {
+      throw new Error(
+        `No GitHub token provider registered for registration ID "${params.registrationId}"`
+      );
+    }
+    return await registration.provider({
+      host: params.host,
+      sessionId: params.sessionId ?? registration.sessionId,
+      reason: params.reason
+    });
+  }
+  registerGitHubTokenProvider(provider, sessionId) {
+    if (!provider) {
+      return void 0;
+    }
+    const registrationId = (0, import_node_crypto.randomUUID)();
+    this.githubTokenProviders.set(registrationId, { provider, sessionId, committed: false });
+    return registrationId;
+  }
+  assignGitHubTokenProvider(registrationId, sessionId) {
+    if (!registrationId) {
+      return;
+    }
+    const registration = this.githubTokenProviders.get(registrationId);
+    if (registration) {
+      registration.sessionId = sessionId;
+    }
+  }
+  commitGitHubTokenProvider(sessionId, registrationId) {
+    for (const [candidateId, registration2] of this.githubTokenProviders) {
+      if (registration2.sessionId === sessionId && registration2.committed) {
+        this.githubTokenProviders.delete(candidateId);
+      }
+    }
+    const registration = registrationId ? this.githubTokenProviders.get(registrationId) : void 0;
+    if (registration) {
+      registration.sessionId = sessionId;
+      registration.committed = true;
+    }
+  }
   /**
    * Starts the CLI server and establishes a connection.
    *
@@ -575,6 +618,9 @@ class CopilotClient {
     if (this.state === "connected") {
       return;
     }
+    this.forceStopping = false;
+    this.connectionClosed = false;
+    this.processTransportError = null;
     this.state = "connecting";
     try {
       if (this.connectionConfig.kind === "inprocess") {
@@ -607,8 +653,10 @@ class CopilotClient {
       }
       this.state = "connected";
     } catch (error) {
+      const startupError = this.processTransportError ?? error;
+      await this.forceStop();
       this.state = "error";
-      throw error;
+      throw startupError;
     }
   }
   /**
@@ -653,7 +701,7 @@ class CopilotClient {
           lastError = error instanceof Error ? error : new Error(String(error));
           if (attempt < 3) {
             const delay = 100 * Math.pow(2, attempt - 1);
-            await new Promise((resolve) => setTimeout(resolve, delay));
+            await new Promise((resolve2) => setTimeout(resolve2, delay));
           }
         }
       }
@@ -669,7 +717,8 @@ class CopilotClient {
       session._markDisconnected();
     }
     this.sessions.clear();
-    if (this.connection && (this.cliProcess || this.ffiHost) && !this.isExternalServer) {
+    this.githubTokenProviders.clear();
+    if (this.connection && !this.connectionClosed && (this.cliProcess || this.ffiHost) && !this.isExternalServer) {
       const runtimeShutdownStart = Date.now();
       const shutdownPromise = this.rpc.runtime.shutdown();
       void shutdownPromise.catch(() => void 0);
@@ -719,8 +768,8 @@ class CopilotClient {
       this.socket = null;
       try {
         if (!socket.destroyed) {
-          await new Promise((resolve) => {
-            socket.once("close", () => resolve());
+          await new Promise((resolve2) => {
+            socket.once("close", () => resolve2());
             socket.end();
           });
         }
@@ -823,6 +872,7 @@ class CopilotClient {
       session._markDisconnected();
     }
     this.sessions.clear();
+    this.githubTokenProviders.clear();
     if (this.messageWriter) {
       this.messageWriter.suppressWriteErrors = true;
     }
@@ -988,7 +1038,8 @@ class CopilotClient {
    *
    * In empty mode, defaults the four overridable feature flags to safe values
    * (caller values from `config` win). `installedPlugins=[]` is unconditional
-   * in empty mode — apps that need custom plugins should switch modes.
+   * in empty mode. `includedBuiltinSkills` defaults to `[]`, but callers can
+   * explicitly allow selected runtime-bundled skills.
    */
   async updateSessionOptionsForMode(session, config) {
     const patch = {};
@@ -998,6 +1049,7 @@ class CopilotClient {
       patch.coauthorEnabled = config.coauthorEnabled ?? false;
       patch.manageScheduleEnabled = config.manageScheduleEnabled ?? false;
       patch.installedPlugins = [];
+      patch.includedBuiltinSkills = config.includedBuiltinSkills ?? [];
     } else {
       if (config.skipCustomInstructions !== void 0)
         patch.skipCustomInstructions = config.skipCustomInstructions;
@@ -1007,6 +1059,8 @@ class CopilotClient {
         patch.coauthorEnabled = config.coauthorEnabled;
       if (config.manageScheduleEnabled !== void 0)
         patch.manageScheduleEnabled = config.manageScheduleEnabled;
+      if (config.includedBuiltinSkills !== void 0)
+        patch.includedBuiltinSkills = config.includedBuiltinSkills;
     }
     if (Object.keys(patch).length === 0) {
       return;
@@ -1022,6 +1076,9 @@ class CopilotClient {
     }
   }
   async createSession(config) {
+    if (config.gitHubToken !== void 0 && config.gitHubTokenProvider !== void 0) {
+      throw new Error("gitHubToken and gitHubTokenProvider are mutually exclusive");
+    }
     if (!this.connection) {
       await this.start();
     }
@@ -1032,6 +1089,11 @@ class CopilotClient {
     const callerSessionId = config.sessionId;
     const useServerGeneratedId = config.cloud != null && callerSessionId == null;
     const localSessionId = useServerGeneratedId ? void 0 : callerSessionId ?? (0, import_node_crypto.randomUUID)();
+    const toolFilterOptions = this.resolveToolFilterOptions(config);
+    const gitHubTokenProviderRegistrationId = this.registerGitHubTokenProvider(
+      config.gitHubTokenProvider,
+      localSessionId
+    );
     const {
       wireProvider: bearerWireProvider,
       wireProviders: bearerWireProviders,
@@ -1048,7 +1110,10 @@ class CopilotClient {
         this.onGetTraceContext,
         {
           mcpAuthHandler: config.onMcpAuthRequest,
-          managedSettingsEnabled: config.enableManagedSettings === true || config.managedSettings !== void 0
+          managedSettingsEnabled: config.enableManagedSettings === true || config.managedSettings !== void 0,
+          onDisconnected: gitHubTokenProviderRegistrationId === void 0 ? void 0 : () => this.githubTokenProviders.delete(
+            gitHubTokenProviderRegistrationId
+          )
         }
       );
       s.registerTools(config.tools);
@@ -1086,10 +1151,16 @@ class CopilotClient {
     let session;
     let registeredId;
     if (localSessionId !== void 0) {
-      session = initializeSession(localSessionId);
-      registeredId = localSessionId;
+      try {
+        session = initializeSession(localSessionId);
+        registeredId = localSessionId;
+      } catch (error) {
+        if (gitHubTokenProviderRegistrationId !== void 0) {
+          this.githubTokenProviders.delete(gitHubTokenProviderRegistrationId);
+        }
+        throw error;
+      }
     }
-    const toolFilterOptions = this.resolveToolFilterOptions(config);
     try {
       const response = await this.connection.sendRequest("session.create", {
         ...await (0, import_telemetry.getTraceContext)(this.onGetTraceContext),
@@ -1119,7 +1190,7 @@ class CopilotClient {
         canvasProvider: config.canvasProvider,
         commands: config.commands?.map((cmd) => ({
           name: cmd.name,
-          description: cmd.description
+          description: cmd.description ?? ""
         })),
         systemMessage: wireSystemMessage,
         availableTools: toolFilterOptions.availableTools,
@@ -1139,6 +1210,7 @@ class CopilotClient {
         requestPermission: !!config.onPermissionRequest,
         requestUserInput: !!config.onUserInputRequest,
         requestElicitation: !!config.onElicitationRequest,
+        askUserVariant: config.askUserVariant,
         ...config.enableMcpApps ? { requestMcpApps: true } : {},
         ...config.githubMcpToolConfig != null ? { githubMcpToolConfig: config.githubMcpToolConfig } : {},
         requestExitPlanMode: !!config.onExitPlanModeRequest,
@@ -1174,8 +1246,10 @@ class CopilotClient {
         infiniteSessions: config.infiniteSessions,
         memory: config.memory,
         gitHubToken: config.gitHubToken,
+        gitHubTokenProviderRegistrationId,
         remoteSession: config.remoteSession,
         cloud: config.cloud,
+        featureFlags: config.featureFlags,
         expAssignments: config.expAssignments,
         enableManagedSettings: config.enableManagedSettings,
         managedSettings: config.managedSettings
@@ -1197,6 +1271,7 @@ class CopilotClient {
         session = initializeSession(returnedSessionId);
         registeredId = returnedSessionId;
       }
+      this.assignGitHubTokenProvider(gitHubTokenProviderRegistrationId, returnedSessionId);
       if (config.onMcpAuthRequest) {
         await this.connection.sendRequest("session.eventLog.registerInterest", {
           sessionId: returnedSessionId,
@@ -1206,10 +1281,15 @@ class CopilotClient {
       session["_workspacePath"] = workspacePath;
       session.setCapabilities(capabilities);
       await this.updateSessionOptionsForMode(session, config);
+      this.commitGitHubTokenProvider(returnedSessionId, gitHubTokenProviderRegistrationId);
     } catch (e) {
+      session?._markDisconnected();
       if (registeredId !== void 0) {
         this.sessions.delete(registeredId);
       }
+      if (gitHubTokenProviderRegistrationId !== void 0) {
+        this.githubTokenProviders.delete(gitHubTokenProviderRegistrationId);
+      }
       throw e;
     }
     return session;
@@ -1242,10 +1322,13 @@ class CopilotClient {
     return this.resumeSessionInternal(sessionId, config);
   }
   /** @internal */
-  async resumeSessionForExtension(sessionId, config, factories) {
-    return this.resumeSessionInternal(sessionId, config, factories);
+  async resumeSessionForExtension(sessionId, config, factories, extensionOptions) {
+    return this.resumeSessionInternal(sessionId, config, factories, extensionOptions);
   }
-  async resumeSessionInternal(sessionId, config, factories) {
+  async resumeSessionInternal(sessionId, config, factories, extensionOptions) {
+    if (config.gitHubToken !== void 0 && config.gitHubTokenProvider !== void 0) {
+      throw new Error("gitHubToken and gitHubTokenProvider are mutually exclusive");
+    }
     if (!this.connection) {
       await this.start();
     }
@@ -1303,6 +1386,15 @@ class CopilotClient {
     this.sessions.set(sessionId, session);
     this.setupSessionFs(session, config);
     const toolFilterOptions = this.resolveToolFilterOptions(config);
+    const gitHubTokenProviderRegistrationId = this.registerGitHubTokenProvider(
+      config.gitHubTokenProvider,
+      sessionId
+    );
+    if (gitHubTokenProviderRegistrationId !== void 0) {
+      session._setOnDisconnected(
+        () => this.githubTokenProviders.delete(gitHubTokenProviderRegistrationId)
+      );
+    }
     try {
       const response = await this.connection.sendRequest("session.resume", {
         ...await (0, import_telemetry.getTraceContext)(this.onGetTraceContext),
@@ -1342,7 +1434,7 @@ class CopilotClient {
         canvasProvider: config.canvasProvider,
         commands: config.commands?.map((cmd) => ({
           name: cmd.name,
-          description: cmd.description
+          description: cmd.description ?? ""
         })),
         provider: bearerWireProvider,
         capi: config.capi,
@@ -1353,6 +1445,7 @@ class CopilotClient {
         requestPermission: config.onPermissionRequest !== import_types.defaultJoinSessionPermissionHandler,
         requestUserInput: !!config.onUserInputRequest,
         requestElicitation: !!config.onElicitationRequest,
+        askUserVariant: config.askUserVariant,
         ...config.enableMcpApps ? { requestMcpApps: true } : {},
         ...config.githubMcpToolConfig != null ? { githubMcpToolConfig: config.githubMcpToolConfig } : {},
         requestExitPlanMode: !!config.onExitPlanModeRequest,
@@ -1390,12 +1483,26 @@ class CopilotClient {
         disableResume: config.suppressResumeEvent,
         continuePendingWork: config.continuePendingWork,
         gitHubToken: config.gitHubToken,
+        gitHubTokenProviderRegistrationId,
         remoteSession: config.remoteSession,
         openCanvases: config.openCanvases,
+        featureFlags: config.featureFlags,
         expAssignments: config.expAssignments,
         enableManagedSettings: config.enableManagedSettings,
-        managedSettings: config.managedSettings
+        managedSettings: config.managedSettings,
+        ...extensionOptions?.requestedEnvironmentVariables ? {
+          requestedEnvironmentVariables: extensionOptions.requestedEnvironmentVariables
+        } : {}
       });
+      if (extensionOptions?.requestedEnvironmentVariables) {
+        const requested = new Set(extensionOptions.requestedEnvironmentVariables);
+        const { grantedEnvironmentVariables } = response;
+        for (const [name, value] of Object.entries(grantedEnvironmentVariables ?? {})) {
+          if (requested.has(name)) {
+            process.env[name] = value;
+          }
+        }
+      }
       const { workspacePath, capabilities, openCanvases } = response;
       session["_workspacePath"] = workspacePath;
       session.setCapabilities(capabilities);
@@ -1407,8 +1514,13 @@ class CopilotClient {
         });
       }
       await this.updateSessionOptionsForMode(session, config);
+      this.commitGitHubTokenProvider(sessionId, gitHubTokenProviderRegistrationId);
     } catch (e) {
+      session._markDisconnected();
       this.sessions.delete(sessionId);
+      if (gitHubTokenProviderRegistrationId !== void 0) {
+        this.githubTokenProviders.delete(gitHubTokenProviderRegistrationId);
+      }
       throw e;
     }
     return session;
@@ -1467,8 +1579,8 @@ class CopilotClient {
   async listModels() {
     await this.modelsCacheLock;
     let resolveLock;
-    this.modelsCacheLock = new Promise((resolve) => {
-      resolveLock = resolve;
+    this.modelsCacheLock = new Promise((resolve2) => {
+      resolveLock = resolve2;
     });
     try {
       if (this.modelsCache !== null) {
@@ -1520,10 +1632,17 @@ class CopilotClient {
     const raceAgainstExit = (p) => this.processExitPromise ? Promise.race([p, this.processExitPromise]) : p;
     let serverVersion;
     try {
-      const connectParams = { token: this.effectiveConnectionToken };
+      const connectParams = {
+        token: this.effectiveConnectionToken,
+        supportedTaskKinds: ["agent", "client", "shell"]
+      };
       if (this.onGitHubTelemetry != null) {
         connectParams.enableGitHubTelemetryForwarding = true;
       }
+      const clientInfo = clientInfoToWire(this.options.clientInfo);
+      if (clientInfo != null) {
+        connectParams.clientInfo = clientInfo;
+      }
       const result = await raceAgainstExit(this.internalRpc.connect(connectParams));
       serverVersion = result.protocolVersion;
     } catch (err) {
@@ -1597,7 +1716,9 @@ class CopilotClient {
     if (!success) {
       throw new Error(`Failed to delete session ${sessionId}: ${error || "Unknown error"}`);
     }
+    const session = this.sessions.get(sessionId);
     this.sessions.delete(sessionId);
+    session?._runOnDisconnected();
   }
   /**
    * List all available sessions.
@@ -1782,7 +1903,8 @@ class CopilotClient {
    * Start the CLI server process
    */
   async startCLIServer() {
-    return new Promise((resolve, reject) => {
+    this.resolvedCliPath ??= await getBundledRuntimePath();
+    return new Promise((resolve2, reject) => {
       this.stderrBuffer = "";
       const args = [...this.connectionExtraArgs, "--headless", "--no-auto-update"];
       if (this.options.logLevel) {
@@ -1819,7 +1941,7 @@ class CopilotClient {
       }
       if (!(0, import_node_fs.existsSync)(this.resolvedCliPath)) {
         throw new Error(
-          `Copilot CLI not found at ${this.resolvedCliPath}. Ensure @github/copilot is installed.`
+          `Copilot CLI not found at ${this.resolvedCliPath}. Set COPILOT_CLI_PATH to use a custom installation.`
         );
       }
       const stdioConfig = this.connectionConfig.kind === "stdio" ? ["pipe", "pipe", "pipe"] : ["ignore", "pipe", "pipe"];
@@ -1843,7 +1965,7 @@ class CopilotClient {
       let resolved = false;
       if (this.connectionConfig.kind === "stdio") {
         resolved = true;
-        resolve();
+        resolve2();
       } else {
         this.cliProcess.stdout?.on("data", (data) => {
           stdout += data.toString();
@@ -1851,7 +1973,7 @@ class CopilotClient {
           if (match && !resolved) {
             this.runtimePort = parseInt(match[1], 10);
             resolved = true;
-            resolve();
+            resolve2();
           }
         });
       }
@@ -1883,26 +2005,27 @@ stderr: ${stderrOutput}`
       });
       this.processExitPromise = new Promise((_, rejectProcessExit) => {
         this.cliProcess.on("exit", (code) => {
-          setTimeout(() => {
-            const stderrOutput = this.stderrBuffer.trim();
-            if (stderrOutput) {
-              rejectProcessExit(
-                new Error(
-                  `CLI server exited with code ${code}
+          if (this.messageWriter) {
+            this.messageWriter.suppressWriteErrors = true;
+          }
+          const stderrOutput = this.stderrBuffer.trim();
+          if (stderrOutput) {
+            rejectProcessExit(
+              new Error(
+                `CLI server exited with code ${code}
 stderr: ${stderrOutput}`
-                )
-              );
-            } else {
-              rejectProcessExit(
-                new Error(`CLI server exited unexpectedly with code ${code}`)
-              );
-            }
-          }, 50);
+              )
+            );
+          } else {
+            rejectProcessExit(
+              new Error(`CLI server exited unexpectedly with code ${code}`)
+            );
+          }
         });
       });
       this.processExitPromise.catch(() => {
       });
-      this.cliProcess.on("exit", (code) => {
+      this.cliProcess.on("close", (code) => {
         if (!resolved) {
           resolved = true;
           const stderrOutput = this.stderrBuffer.trim();
@@ -1944,7 +2067,20 @@ stderr: ${stderrOutput}`
   }
   /** Starts the in-process FFI runtime with SDK-managed typed options. */
   async startInProcessFfi() {
-    const entrypoint = this.resolveCliPathForFfi();
+    const explicitEntrypoint = this.resolvedEnv.COPILOT_CLI_PATH;
+    let runtimeLibrary;
+    if (explicitEntrypoint) {
+      const entrypointDirectory = (0, import_node_path.dirname)((0, import_node_path.resolve)(explicitEntrypoint));
+      const adjacentRuntime = (0, import_node_path.join)(entrypointDirectory, "runtime.node");
+      runtimeLibrary = (0, import_node_fs.existsSync)(adjacentRuntime) ? adjacentRuntime : (0, import_node_path.join)(
+        entrypointDirectory,
+        "prebuilds",
+        CopilotClient.getNapiPrebuildsFolder(explicitEntrypoint),
+        "runtime.node"
+      );
+    } else {
+      runtimeLibrary = (0, import_node_path.join)((0, import_node_path.dirname)(await getBundledRuntimePath()), "runtime.node");
+    }
     const { FfiRuntimeHost } = await import("./ffiRuntimeHost.js");
     const environment = {};
     if (this.options.gitHubToken) {
@@ -1972,12 +2108,7 @@ stderr: ${stderrOutput}`
     if (this.options.enableRemoteSessions) {
       args.push("--remote");
     }
-    const host = FfiRuntimeHost.create(
-      entrypoint,
-      CopilotClient.getNapiPrebuildsFolder(entrypoint),
-      environment,
-      args
-    );
+    const host = FfiRuntimeHost.create(runtimeLibrary, explicitEntrypoint, environment, args);
     this.ffiHost = host;
     await host.start();
   }
@@ -1997,19 +2128,6 @@ stderr: ${stderrOutput}`
     this.attachConnectionHandlers();
     this.connection.listen();
   }
-  /**
-   * Resolves the CLI entrypoint used for in-process FFI hosting: `COPILOT_CLI_PATH`
-   * when set, otherwise the bundled platform-package entrypoint.
-   */
-  resolveCliPathForFfi() {
-    return this.resolvedEnv.COPILOT_CLI_PATH ?? getBundledCliPath();
-  }
-  /**
-   * Returns the napi prebuilds folder name for the current host — the
-   * `<node-platform>-<arch>` convention (e.g. `win32-x64`, `darwin-arm64`,
-   * `linux-x64`, `linuxmusl-x64`) under which the runtime ships
-   * `prebuilds/<folder>/runtime.node`.
-   */
   static getNapiPrebuildsFolder(entrypoint) {
     const arch = process.arch;
     if (arch !== "x64" && arch !== "arm64") {
@@ -2045,6 +2163,11 @@ stderr: ${stderrOutput}`
       }
       this.state = "error";
       const reason = err instanceof Error ? err.stack ?? err.message : String(err);
+      const stderrOutput = this.stderrBuffer.trim();
+      this.processTransportError = new Error(
+        `CLI server connection failed: ${reason}${stderrOutput ? `
+stderr: ${stderrOutput}` : ""}`
+      );
       this.logDebug(`stdin pipe error: ${reason}`);
       try {
         this.connection?.dispose();
@@ -2081,7 +2204,7 @@ stderr: ${stderrOutput}`
     if (!this.runtimePort) {
       throw new Error("Server port not available");
     }
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       this.socket = new import_node_net.Socket();
       const connectionTimeout = setTimeout(() => {
         this.socket?.destroy();
@@ -2096,7 +2219,7 @@ stderr: ${stderrOutput}`
         );
         this.attachConnectionHandlers();
         this.connection.listen();
-        resolve();
+        resolve2();
       });
       this.socket.on("error", (error) => {
         clearTimeout(connectionTimeout);
@@ -2143,11 +2266,24 @@ stderr: ${stderrOutput}`
         return await this.handleHooksInvoke(params);
       }
     );
-    this.connection.onClose(() => {
-      this.state = "disconnected";
-    });
-    this.connection.onError((_error) => {
+    const connection = this.connection;
+    const markDisconnected = () => {
+      if (this.connection !== connection) {
+        return;
+      }
+      this.connectionClosed = true;
       this.state = "disconnected";
+      for (const session of this.sessions.values()) {
+        session._markDisconnected();
+      }
+      this.sessions.clear();
+      this.githubTokenProviders.clear();
+    };
+    this.connection.onClose(markDisconnected);
+    this.connection.onError(() => {
+      if (this.connection === connection) {
+        this.state = "disconnected";
+      }
     });
   }
   handleSessionEventNotification(notification) {