copillm 0.3.0-beta.1 → 0.3.0-beta.3

package/dist/cli/auth/runAuth.js

@@ -1,5 +1,6 @@
+import { setTimeout as sleep } from "node:timers/promises";
 import { clearStoredCredential, loadStoredCredential, loadStoredCredentialForAccount, registerExistingCredentialAsDefault, saveStoredCredential } from "../../auth/credentials.js";
-import { readAccountsIndex, assertValidAccountId, InvalidAccountIdError, UnknownAccountError } from "../../auth/accounts.js";
+import { readAccountsIndex, findAccount, assertValidAccountId, InvalidAccountIdError, UnknownAccountError } from "../../auth/accounts.js";
 import { addAccount, listAccountsDetailed, removeAccountAndCredential, removeAllAccounts, switchDefaultAccount } from "../../auth/accountManager.js";
 import { loginViaDeviceFlow } from "../../auth/deviceFlow.js";
 import { inspectGithubIdentity } from "../../auth/githubIdentity.js";
@@ -11,26 +12,37 @@ import { writeCommandOutput } from "../shared/output.js";
 /**
  * Derive a friendly, path-safe account id from the GitHub login behind a token.
  * Returns null when the lookup fails or the login isn't a valid id.
+ *
+ * Multi-account routing now depends on this, so it retries a few times with a
+ * generous timeout: GitHub's `/user` can briefly throttle or lag right after a
+ * device-flow token exchange, and a single failed probe must not cause the
+ * caller to mis-identify (and overwrite) the wrong account.
  */
 async function deriveAccountId(token) {
-    let identity;
-    try {
-        identity = await inspectGithubIdentity({ token });
-    }
-    catch {
-        return null;
-    }
-    const login = identity?.login;
-    if (!login) {
-        return null;
-    }
-    try {
-        assertValidAccountId(login);
-        return login;
-    }
-    catch {
-        return null;
+    const attempts = 3;
+    for (let attempt = 1; attempt <= attempts; attempt += 1) {
+        let identity = null;
+        try {
+            identity = await inspectGithubIdentity({ token, timeoutMs: 8_000 });
+        }
+        catch {
+            identity = null;
+        }
+        const login = identity?.login;
+        if (login) {
+            try {
+                assertValidAccountId(login);
+                return login;
+            }
+            catch {
+                return null;
+            }
+        }
+        if (attempt < attempts) {
+            await sleep(400 * attempt);
+        }
     }
+    return null;
 }
 export async function runAuthLogin(opts, options) {
     if (options.forceSession) {
@@ -53,9 +65,41 @@ export async function runAuthLogin(opts, options) {
     const token = await loginViaDeviceFlow();
     const saveMode = options.forceSession ? "session" : "auto";
     const index = readAccountsIndex();
-    // Pure single-account login: no index and no explicit name. Preserve the
-    // historical behaviour exactly — legacy storage, no accounts index created.
-    if (!index && !namedRequested) {
+    // ---- Explicit name (`--as`) -------------------------------------------
+    if (namedRequested) {
+        const accountId = opts.as.trim();
+        // First time we materialize the index via an explicit name: preserve any
+        // pre-existing single account as the default so its token isn't clobbered.
+        if (!index) {
+            const existing = await loadStoredCredential();
+            if (existing) {
+                const existingId = (await deriveAccountId(existing.token)) ?? "default";
+                if (existingId !== accountId) {
+                    registerExistingCredentialAsDefault(existingId, existing.accountType);
+                }
+            }
+        }
+        const result = await addAccount({ id: accountId, accountType, token, mode: saveMode });
+        emitLoginResult(opts, result, false);
+        return;
+    }
+    // ---- No name: auto-manage by the token's GitHub login -----------------
+    // Identify the account from its GitHub login so a second `auth login` for a
+    // DIFFERENT account is kept alongside the first instead of overwriting it.
+    // The cardinal rule: never replace an existing credential unless we have
+    // positively confirmed it's the SAME GitHub account.
+    const newLogin = await deriveAccountId(token);
+    const existing = await loadStoredCredential();
+    if (!existing) {
+        // Nothing stored yet.
+        if (index) {
+            // An index exists but its default account has no credential — restore it.
+            const targetId = newLogin ?? index.defaultAccount;
+            const result = await addAccount({ id: targetId, accountType, token, mode: saveMode });
+            emitLoginResult(opts, result, !result.isDefault);
+            return;
+        }
+        // Fresh single-account install: store without creating an index.
         const backend = await saveStoredCredential(token, accountType, { mode: saveMode });
         writeCommandOutput(opts, `Login succeeded. Credentials stored via ${describeBackend(backend)}.`, {
             status: "ok",
@@ -64,21 +108,45 @@ export async function runAuthLogin(opts, options) {
         });
         return;
     }
-    const accountId = namedRequested ? opts.as.trim() : index.defaultAccount;
-    // First time we materialize the index via an explicit name: preserve any
-    // pre-existing single account as the default so its token isn't clobbered.
-    if (!index && namedRequested) {
-        const existing = await loadStoredCredential();
-        if (existing) {
-            const existingId = (await deriveAccountId(existing.token)) ?? "default";
-            if (existingId !== accountId) {
-                registerExistingCredentialAsDefault(existingId, existing.accountType);
-            }
-        }
+    // A credential already exists. We must know which GitHub account just signed
+    // in before we touch anything, or we risk clobbering a different account.
+    if (!newLogin) {
+        writeCommandOutput(opts, "Login failed: couldn't verify which GitHub account you signed in as (the GitHub user lookup didn't succeed). " +
+            "Your existing credentials were left untouched. Re-run `copillm auth login`, or name this account explicitly with `copillm auth login --as <name>`.", { status: "error", action: "login", error: "github_identity_unresolved" });
+        process.exitCode = 1;
+        return;
+    }
+    if (index) {
+        // Add the new login as its own account, or refresh it in place if known.
+        const wasKnown = findAccount(newLogin) !== null;
+        const result = await addAccount({ id: newLogin, accountType, token, mode: saveMode });
+        emitLoginResult(opts, result, !wasKnown && !result.isDefault);
+        return;
     }
-    const result = await addAccount({ id: accountId, accountType, token, mode: saveMode });
+    // No index yet. Compare against the existing single account.
+    const existingLogin = await deriveAccountId(existing.token);
+    if (existingLogin === newLogin) {
+        // Confirmed the SAME account → refresh in place, no index created.
+        const backend = await saveStoredCredential(token, accountType, { mode: saveMode });
+        writeCommandOutput(opts, `Login succeeded. Credentials stored via ${describeBackend(backend)}.`, {
+            status: "ok",
+            action: "login",
+            credential_backend: backend
+        });
+        return;
+    }
+    // A different (or unverifiable) prior account → transition to multi-account,
+    // preserving the prior login as the default and adding the new one.
+    registerExistingCredentialAsDefault(existingLogin ?? "default", existing.accountType);
+    const result = await addAccount({ id: newLogin, accountType, token, mode: saveMode });
+    emitLoginResult(opts, result, !result.isDefault);
+}
+function emitLoginResult(opts, result, hintSwitch) {
     const defaultSuffix = result.isDefault ? " (default)" : "";
-    writeCommandOutput(opts, `Login succeeded for account "${result.id}"${defaultSuffix}. Credentials stored via ${describeBackend(result.backend)}.`, {
+    const switchHint = hintSwitch
+        ? ` It is not the default — run \`copillm auth switch ${result.id}\` to make it so.`
+        : "";
+    writeCommandOutput(opts, `Login succeeded for account "${result.id}"${defaultSuffix}. Credentials stored via ${describeBackend(result.backend)}.${switchHint}`, {
         status: "ok",
         action: "login",
         account: result.id,

package/dist/cli/packageInfo.js

@@ -1,7 +1,7 @@
 import { createRequire } from "node:module";
 const FALLBACK_PACKAGE_INFO = {
     name: "copillm",
-    version: "0.3.0-beta.1"
+    version: "0.3.0-beta.3"
 };
 export function getPackageInfo() {
     const envName = cleanPackageValue(process.env.COPILLM_PACKAGE_NAME);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "copillm",
-  "version": "0.3.0-beta.1",
+  "version": "0.3.0-beta.3",
   "description": "Local Copilot proxy CLI (OpenAI/Anthropic-compatible)",
   "license": "MIT",
   "type": "module",