Cleanup

Author: SteveSandersonMS

nodejs/samples/chat.ts

@@ -1,9 +1,6 @@
+import { CopilotClient, approveAll, type SessionEvent } from "@github/copilot-sdk";
 import * as readline from "node:readline";
 
-// Normally these should be imported from @github/copilot-sdk, but within this repo
-// we import from source to enable debugging into the SDK code.
-import { CopilotClient, approveAll, type SessionEvent } from "../src/index.js";
-
 async function main() {
     const client = new CopilotClient();
     const session = await client.createSession({

nodejs/src/client.ts

@@ -308,10 +308,11 @@ export class CopilotClient {
         this.onListModels = options.onListModels;
         this.onGetTraceContext = options.onGetTraceContext;
 
+        const effectiveEnv = options.env ?? process.env;
         this.options = {
             cliPath: options.cliUrl
                 ? undefined
-                : options.cliPath || process.env.COPILOT_CLI_PATH || getBundledCliPath(),
+                : options.cliPath || effectiveEnv.COPILOT_CLI_PATH || getBundledCliPath(),
             cliArgs: options.cliArgs ?? [],
             cwd: options.cwd ?? process.cwd(),
             port: options.port || 0,
@@ -322,7 +323,7 @@ export class CopilotClient {
             autoStart: options.autoStart ?? true,
             autoRestart: false,
 
-            env: options.env ?? process.env,
+            env: effectiveEnv,
             githubToken: options.githubToken,
             // Default useLoggedInUser to false when githubToken is provided, otherwise true
             useLoggedInUser: options.useLoggedInUser ?? (options.githubToken ? false : true),