theclawbay 0.3.50 → 0.3.52

package/dist/commands/setup.js

@@ -970,6 +970,23 @@ function summarizeModelFetchFailure(detail) {
         return normalized;
     return `${normalized.slice(0, 137).trimEnd()}...`;
 }
+function isCredentialRejectedFailure(detail) {
+    if (!detail)
+        return false;
+    const normalized = detail.toLowerCase();
+    return (normalized.includes("http 401") ||
+        normalized.includes("invalid api key") ||
+        normalized.includes("missing bearer token") ||
+        normalized.includes("device session not found") ||
+        normalized.includes("billing access required"));
+}
+function describeCredentialRejection(authType, failure) {
+    const detail = failure?.trim() || "credential rejected by backend";
+    if (authType === "device-session") {
+        return `The saved device-session credential was rejected by the backend (${detail}). Re-link this machine in the browser or run \`theclawbay logout\` before rerunning setup.`;
+    }
+    return `The provided API key was rejected by the backend (${detail}). Update the key and rerun setup.`;
+}
 async function fetchBackendModelIds(backendUrl, apiKey) {
     const url = `${openAiCompatibleProxyUrl(backendUrl)}/models`;
     try {
@@ -1194,6 +1211,7 @@ async function resolveModels(backendUrl, apiKey) {
     const available = new Set(ids ?? []);
     let selected = DEFAULT_CODEX_MODEL;
     let note;
+    const authRejected = isCredentialRejectedFailure(failure);
     for (const preferred of PREFERRED_MODELS) {
         if (available.has(preferred)) {
             selected = preferred;
@@ -1224,20 +1242,27 @@ async function resolveModels(backendUrl, apiKey) {
         model: selected,
         models: unique.map((modelId) => ({ id: modelId, name: modelDisplayName(modelId) })),
         note,
+        failure,
+        authRejected,
     };
 }
 async function resolveClaudeAccess(backendUrl, apiKey) {
     const { ids, failure } = await fetchClaudeModelIds(backendUrl, apiKey);
+    const authRejected = isCredentialRejectedFailure(failure);
     if (!ids?.length) {
         return {
             enabled: false,
             models: [],
             note: failure ? `Claude Code auto-setup skipped (${failure}).` : undefined,
+            failure,
+            authRejected,
         };
     }
     return {
         enabled: true,
         models: ids,
+        failure,
+        authRejected,
     };
 }
 async function writeCodexConfig(params) {
@@ -2112,7 +2137,7 @@ class SetupCommand extends base_command_1.BaseCommand {
             if (flags["migrate-conversations"] !== undefined && !selectedSetupClients.has("codex")) {
                 throw new Error("--migrate-conversations requires Codex to be selected for setup.");
             }
-            if (!authCredential) {
+            const linkFreshDeviceSession = async () => {
                 deviceLabel = await resolveDeviceLabel({
                     flagValue: flags["device-name"],
                     managedValue: managed?.deviceLabel,
@@ -2128,6 +2153,16 @@ class SetupCommand extends base_command_1.BaseCommand {
                 authCredential = browserAuth.credential;
                 deviceSessionId = browserAuth.deviceSessionId;
                 deviceLabel = browserAuth.deviceLabel;
+            };
+            if (!authCredential) {
+                await linkFreshDeviceSession();
+            }
+            else if (!explicitApiKey && managedAuthType === "device-session") {
+                const managedProbe = await fetchBackendModelIds(backendUrl, authCredential);
+                if (isCredentialRejectedFailure(managedProbe.failure)) {
+                    this.log(`Saved device-session credential was rejected by the backend (${managedProbe.failure}). Re-linking this machine now.`);
+                    await linkFreshDeviceSession();
+                }
             }
             const progress = this.createProgressHandle(!debugOutput);
             let resolved = null;
@@ -2156,9 +2191,15 @@ class SetupCommand extends base_command_1.BaseCommand {
                 if (selectedSetupClients.size > 0) {
                     progress.update("Resolving supported models");
                     resolved = await resolveModels(backendUrl, authCredential);
+                    if (resolved.authRejected) {
+                        throw new Error(describeCredentialRejection(authType, resolved.failure));
+                    }
                 }
                 progress.update("Checking Claude access");
                 claudeAccess = await resolveClaudeAccess(backendUrl, authCredential);
+                if (!resolved?.authRejected && claudeAccess.authRejected) {
+                    throw new Error(describeCredentialRejection(authType, claudeAccess.failure));
+                }
                 progress.update("Saving shared machine config");
                 await (0, config_1.writeManagedConfig)({
                     backendUrl,
@@ -2470,6 +2511,7 @@ class SetupCommand extends base_command_1.BaseCommand {
             const openCodeDetected = setupClients.find((client) => client.id === "opencode")?.detected ?? false;
             if (selectedSetupClients.has("opencode")) {
                 this.log(`- OpenCode: configured (${openCodeConfigPaths.join(", ")})`);
+                this.log("- OpenCode note: plain OpenAI-compatible config is preferred. If you add a quota/auth plugin manually, use /api/codex-auth/v1/quota?format=legacy_codex for legacy Codex-style quota responses.");
                 const openCodeProjectConfig = findOpenCodeProjectConfigFile();
                 const openCodeConfigEnv = process.env.OPENCODE_CONFIG?.trim() || "";
                 if (openCodeConfigEnv) {

package/dist/lib/device-session-auth.js

@@ -237,6 +237,7 @@ async function createBrowserLinkedDeviceSession(params) {
     const callbackServer = await createLocalCallbackServer(state);
     const exchangeAbortController = new AbortController();
     const exchangeSignal = exchangeAbortController.signal;
+    let exchangeInFlight = null;
     try {
         const startResponse = await fetch(`${params.backendUrl}/api/setup/device-session/start`, {
             method: "POST",
@@ -261,25 +262,31 @@ async function createBrowserLinkedDeviceSession(params) {
         const deadlineMs = Date.now() + BROWSER_SETUP_TIMEOUT_MS;
         let fallbackNoticeShown = false;
         const timeoutError = new Error("browser setup timed out");
-        const waitForLocalCallbackExchange = async () => {
-            const callback = await withTimeout(callbackServer.waitForCallback(), BROWSER_SETUP_TIMEOUT_MS, exchangeSignal);
-            return exchangeBrowserSetupSession({
+        const performExchange = (code) => {
+            if (exchangeInFlight)
+                return exchangeInFlight;
+            const promise = exchangeBrowserSetupSession({
                 backendUrl: params.backendUrl,
-                sessionId: callback.sessionId,
-                state: callback.state,
-                code: callback.code,
+                sessionId: setupSessionId,
+                state,
+                code,
+            });
+            exchangeInFlight = promise.catch((error) => {
+                exchangeInFlight = null;
+                throw error;
             });
+            return exchangeInFlight;
+        };
+        const waitForLocalCallbackExchange = async () => {
+            const callback = await withTimeout(callbackServer.waitForCallback(), BROWSER_SETUP_TIMEOUT_MS, exchangeSignal);
+            return performExchange(callback.code);
         };
         const waitForPolledExchange = async () => {
             while (Date.now() < deadlineMs) {
                 if (exchangeSignal.aborted)
                     throw createSetupAbortError();
                 try {
-                    return await exchangeBrowserSetupSession({
-                        backendUrl: params.backendUrl,
-                        sessionId: setupSessionId,
-                        state,
-                    });
+                    return await performExchange();
                 }
                 catch (error) {
                     const message = error.message || "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "theclawbay",
-  "version": "0.3.50",
+  "version": "0.3.52",
   "description": "CLI for connecting Codex, Continue, Cline, OpenClaw, OpenCode, Kilo, Roo Code, Aider, experimental Trae, and experimental Zo to The Claw Bay.",
   "license": "MIT",
   "bin": {