@github/copilot-sdk 1.0.13-preview.0 → 1.0.13-preview.2

package/dist/client.js

@@ -271,6 +271,7 @@ class CopilotClient {
   builtinPluginDirectories = [];
   onGitHubTelemetry;
   clientGlobalHandlers = {};
+  githubTokenProviders = /* @__PURE__ */ new Map();
   /**
    * Typed server-scoped RPC methods.
    * @throws Error if the client is not connected
@@ -528,8 +529,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 = 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.
    *
@@ -646,6 +692,7 @@ class CopilotClient {
       session._markDisconnected();
     }
     this.sessions.clear();
+    this.githubTokenProviders.clear();
     if (this.connection && (this.cliProcess || this.ffiHost) && !this.isExternalServer) {
       const runtimeShutdownStart = Date.now();
       const shutdownPromise = this.rpc.runtime.shutdown();
@@ -800,6 +847,7 @@ class CopilotClient {
       session._markDisconnected();
     }
     this.sessions.clear();
+    this.githubTokenProviders.clear();
     if (this.messageWriter) {
       this.messageWriter.suppressWriteErrors = true;
     }
@@ -965,7 +1013,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 = {};
@@ -975,6 +1024,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;
@@ -984,6 +1034,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;
@@ -999,6 +1051,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();
     }
@@ -1009,6 +1064,11 @@ class CopilotClient {
     const callerSessionId = config.sessionId;
     const useServerGeneratedId = config.cloud != null && callerSessionId == null;
     const localSessionId = useServerGeneratedId ? void 0 : callerSessionId ?? randomUUID();
+    const toolFilterOptions = this.resolveToolFilterOptions(config);
+    const gitHubTokenProviderRegistrationId = this.registerGitHubTokenProvider(
+      config.gitHubTokenProvider,
+      localSessionId
+    );
     const {
       wireProvider: bearerWireProvider,
       wireProviders: bearerWireProviders,
@@ -1025,7 +1085,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);
@@ -1063,10 +1126,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 getTraceContext(this.onGetTraceContext),
@@ -1151,6 +1220,7 @@ class CopilotClient {
         infiniteSessions: config.infiniteSessions,
         memory: config.memory,
         gitHubToken: config.gitHubToken,
+        gitHubTokenProviderRegistrationId,
         remoteSession: config.remoteSession,
         cloud: config.cloud,
         expAssignments: config.expAssignments,
@@ -1174,6 +1244,7 @@ class CopilotClient {
         session = initializeSession(returnedSessionId);
         registeredId = returnedSessionId;
       }
+      this.assignGitHubTokenProvider(gitHubTokenProviderRegistrationId, returnedSessionId);
       if (config.onMcpAuthRequest) {
         await this.connection.sendRequest("session.eventLog.registerInterest", {
           sessionId: returnedSessionId,
@@ -1183,10 +1254,14 @@ class CopilotClient {
       session["_workspacePath"] = workspacePath;
       session.setCapabilities(capabilities);
       await this.updateSessionOptionsForMode(session, config);
+      this.commitGitHubTokenProvider(returnedSessionId, gitHubTokenProviderRegistrationId);
     } catch (e) {
       if (registeredId !== void 0) {
         this.sessions.delete(registeredId);
       }
+      if (gitHubTokenProviderRegistrationId !== void 0) {
+        this.githubTokenProviders.delete(gitHubTokenProviderRegistrationId);
+      }
       throw e;
     }
     return session;
@@ -1223,6 +1298,9 @@ class CopilotClient {
     return this.resumeSessionInternal(sessionId, config, factories, extensionOptions);
   }
   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();
     }
@@ -1280,6 +1358,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 getTraceContext(this.onGetTraceContext),
@@ -1367,6 +1454,7 @@ class CopilotClient {
         disableResume: config.suppressResumeEvent,
         continuePendingWork: config.continuePendingWork,
         gitHubToken: config.gitHubToken,
+        gitHubTokenProviderRegistrationId,
         remoteSession: config.remoteSession,
         openCanvases: config.openCanvases,
         expAssignments: config.expAssignments,
@@ -1396,8 +1484,12 @@ class CopilotClient {
         });
       }
       await this.updateSessionOptionsForMode(session, config);
+      this.commitGitHubTokenProvider(sessionId, gitHubTokenProviderRegistrationId);
     } catch (e) {
       this.sessions.delete(sessionId);
+      if (gitHubTokenProviderRegistrationId !== void 0) {
+        this.githubTokenProviders.delete(gitHubTokenProviderRegistrationId);
+      }
       throw e;
     }
     return session;
@@ -1586,7 +1678,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.
@@ -2134,6 +2228,7 @@ stderr: ${stderrOutput}`
     );
     this.connection.onClose(() => {
       this.state = "disconnected";
+      this.githubTokenProviders.clear();
     });
     this.connection.onError((_error) => {
       this.state = "disconnected";