feat!: new account type option

Author: ericc-ch

README.md

@@ -77,8 +77,7 @@ The following command line options are available for the `start` command:
 | -------------- | ----------------------------------------------------------------------------- | ------- | ----- |
 | --port         | Port to listen on                                                             | 4141    | -p    |
 | --verbose      | Enable verbose logging                                                        | false   | -v    |
-| --business     | Use a business plan GitHub account                                            | false   | none  |
-| --enterprise   | Use an enterprise plan GitHub account                                         | false   | none  |
+| --account-type | Account type to use (individual, business, enterprise)                        | individual | -a    |
 | --manual       | Enable manual request approval                                                | false   | none  |
 | --rate-limit   | Rate limit in seconds between requests                                        | none    | -r    |
 | --wait         | Wait instead of error when rate limit is hit                                  | false   | -w    |
@@ -102,10 +101,10 @@ npx copilot-api@latest start
 npx copilot-api@latest start --port 8080 --verbose
 
 # Use with a business plan GitHub account
-npx copilot-api@latest start --business
+npx copilot-api@latest start --account-type business
 
 # Use with an enterprise plan GitHub account
-npx copilot-api@latest start --enterprise
+npx copilot-api@latest start --account-type enterprise
 
 # Enable manual approval for each request
 npx copilot-api@latest start --manual
@@ -147,9 +146,8 @@ bun run start
 - Consider using free models (e.g., Gemini, Mistral, Openrouter) as the `weak-model`
 - Use architect mode sparingly
 - Disable `yes-always` in your aider configuration
-- Be mindful that Claude 3.7 thinking mode consumes more tokens
 - Enable the `--manual` flag to review and approve each request before processing
-- If you have a GitHub business or enterprise plan account with Copilot, use the `--business` or `--enterprise` flag respectively
+- If you have a GitHub business or enterprise plan account with Copilot, use the `--account-type` flag (e.g., `--account-type business`). See the [official documentation](https://docs.github.com/en/enterprise-cloud@latest/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/managing-github-copilot-access-to-your-organizations-network#configuring-copilot-subscription-based-network-routing-for-your-enterprise-or-organization) for more details.
 
 ### Manual Request Approval
 

src/lib/api-config.ts

@@ -14,7 +14,9 @@ const USER_AGENT = `GitHubCopilotChat/${COPILOT_VERSION}`
 const API_VERSION = "2025-04-01"
 
 export const copilotBaseUrl = (state: State) =>
-  `https://api.${state.accountType}.githubcopilot.com`
+  state.accountType === "individual" ?
+    "https://api.githubcopilot.com"
+  : `https://api.${state.accountType}.githubcopilot.com`
 export const copilotHeaders = (state: State, vision: boolean = false) => {
   const headers: Record<string, string> = {
     Authorization: `Bearer ${state.copilotToken}`,

src/main.ts

@@ -15,8 +15,7 @@ import { server } from "./server"
 interface RunServerOptions {
   port: number
   verbose: boolean
-  business: boolean
-  enterprise: boolean
+  accountType: string
   manual: boolean
   rateLimit?: number
   rateLimitWait: boolean
@@ -29,12 +28,9 @@ export async function runServer(options: RunServerOptions): Promise<void> {
     consola.info("Verbose logging enabled")
   }
 
-  if (options.business) {
-    state.accountType = "business"
-    consola.info("Using business plan GitHub account")
-  } else if (options.enterprise) {
-    state.accountType = "enterprise"
-    consola.info("Using enterprise plan GitHub account")
+  state.accountType = options.accountType
+  if (options.accountType !== "individual") {
+    consola.info(`Using ${options.accountType} plan GitHub account`)
   }
 
   state.manualApprove = options.manual
@@ -81,15 +77,11 @@ const start = defineCommand({
       default: false,
       description: "Enable verbose logging",
     },
-    business: {
-      type: "boolean",
-      default: false,
-      description: "Use a business plan GitHub account",
-    },
-    enterprise: {
-      type: "boolean",
-      default: false,
-      description: "Use an enterprise plan GitHub account",
+    "account-type": {
+      alias: "a",
+      type: "string",
+      default: "individual",
+      description: "Account type to use (individual, business, enterprise)",
     },
     manual: {
       type: "boolean",
@@ -126,8 +118,7 @@ const start = defineCommand({
     return runServer({
       port,
       verbose: args.verbose,
-      business: args.business,
-      enterprise: args.enterprise,
+      accountType: args["account-type"],
       manual: args.manual,
       rateLimit,
       rateLimitWait: Boolean(args.wait),