@theaux/clawdbot 2026.1.14 → 2026.1.16

package/dist/commands/antigravity-oauth.js

@@ -6,8 +6,6 @@
  */
 import { createHash, randomBytes } from "node:crypto";
 import { readFileSync } from "node:fs";
-import { stdin, stdout } from "node:process";
-import { createInterface } from "node:readline/promises";
 import { loginAntigravity } from "@mariozechner/pi-ai";
 // OAuth constants - decoded from pi-ai's base64 encoded values to stay in sync
 const decode = (s) => Buffer.from(s, "base64").toString();
@@ -247,28 +245,16 @@ async function fetchProjectId(accessToken) {
     // Use fallback project ID
     return DEFAULT_PROJECT_ID;
 }
-/**
- * Prompt user for input via readline.
- */
-async function promptInput(message) {
-    const rl = createInterface({ input: stdin, output: stdout });
-    try {
-        return (await rl.question(message)).trim();
-    }
-    finally {
-        rl.close();
-    }
-}
 /**
  * VPS-aware Antigravity OAuth login.
  *
  * On local machines: Uses the standard pi-ai flow with automatic localhost callback.
  * On VPS/SSH: Shows URL and prompts user to paste the callback URL manually.
  */
-export async function loginAntigravityVpsAware(onUrl, onProgress) {
+export async function loginAntigravityVpsAware(prompter, onUrl, onProgress) {
     // Check if we're in a remote environment
     if (shouldUseManualOAuthFlow()) {
-        return loginAntigravityManual(onUrl, onProgress);
+        return loginAntigravityManual(prompter, onUrl, onProgress);
     }
     // Use the standard pi-ai flow for local environments
     try {
@@ -284,7 +270,7 @@ export async function loginAntigravityVpsAware(onUrl, onProgress) {
                 err.message.includes("port") ||
                 err.message.includes("listen"))) {
             onProgress?.("Local callback server failed. Switching to manual mode...");
-            return loginAntigravityManual(onUrl, onProgress);
+            return loginAntigravityManual(prompter, onUrl, onProgress);
         }
         throw err;
     }
@@ -292,26 +278,32 @@ export async function loginAntigravityVpsAware(onUrl, onProgress) {
 /**
  * Manual Antigravity OAuth login for VPS/headless environments.
  *
- * Shows the OAuth URL and prompts user to paste the callback URL.
+ * Shows the OAuth URL and prompts user to paste the callback URL using prompter.
  */
-export async function loginAntigravityManual(onUrl, onProgress) {
+export async function loginAntigravityManual(prompter, onUrl, onProgress) {
     const { verifier, challenge } = generatePKCESync();
     const authUrl = buildAuthUrl(challenge, verifier);
     // Show the URL to the user
     await onUrl(authUrl);
-    onProgress?.("Waiting for you to paste the callback URL...");
-    console.log("\n");
-    console.log("=".repeat(60));
-    console.log("VPS/Remote Mode - Manual OAuth");
-    console.log("=".repeat(60));
-    console.log("\n1. Open the URL above in your LOCAL browser");
-    console.log("2. Complete the Google sign-in");
-    console.log("3. Your browser will redirect to a localhost URL that won't load");
-    console.log("4. Copy the ENTIRE URL from your browser's address bar");
-    console.log("5. Paste it below\n");
-    console.log("The URL will look like:");
-    console.log("http://localhost:51121/oauth-callback?code=xxx&state=yyy\n");
-    const callbackInput = await promptInput("Paste the redirect URL here: ");
+    // Stop the spinner completely before prompting for input
+    // This prevents the continuous update loop that interferes with input
+    onProgress?.("");
+    // Show instructions using prompter.note for consistent UI
+    await prompter.note([
+        "1. Open the URL above in your LOCAL browser",
+        "2. Complete the Google sign-in",
+        "3. Your browser will redirect to a localhost URL that won't load",
+        "4. Copy the ENTIRE URL from your browser's address bar",
+        "5. Paste it below and press Enter",
+        "",
+        "The URL will look like:",
+        "http://localhost:51121/oauth-callback?code=xxx&state=yyy",
+    ].join("\n"), "VPS/Remote Mode - Manual OAuth");
+    // Use prompter.text() for clean input (same pattern as Telegram bot token)
+    const callbackInput = String(await prompter.text({
+        message: "Paste the redirect URL here",
+        validate: (value) => (value?.trim() ? undefined : "Required"),
+    })).trim();
     const parsed = parseCallbackInput(callbackInput, verifier);
     if ("error" in parsed) {
         throw new Error(parsed.error);

package/dist/commands/auth-choice-options.js

@@ -7,6 +7,12 @@ const AUTH_CHOICE_GROUP_DEFS = [
         hint: "Codex OAuth + API key",
         choices: ["codex-cli", "openai-codex", "openai-api-key"],
     },
+    {
+        value: "custom-openai",
+        label: "Custom OpenAI",
+        hint: "OpenAI-compatible API",
+        choices: ["custom-openai-api-key"],
+    },
     {
         value: "anthropic",
         label: "Anthropic",
@@ -123,6 +129,10 @@ export function buildAuthChoiceOptions(params) {
     });
     options.push({ value: "chutes", label: "Chutes (OAuth)" });
     options.push({ value: "openai-api-key", label: "OpenAI API key" });
+    options.push({
+        value: "custom-openai-api-key",
+        label: "Custom OpenAI (OpenAI-compatible API)"
+    });
     options.push({ value: "openrouter-api-key", label: "OpenRouter API key" });
     options.push({ value: "moonshot-api-key", label: "Moonshot AI API key" });
     options.push({ value: "synthetic-api-key", label: "Synthetic API key" });

package/dist/commands/auth-choice.apply.custom-openai.js

@@ -0,0 +1,116 @@
+import { applyAuthProfileConfig } from "./onboard-auth.js";
+export async function applyAuthChoiceCustomOpenAI(params) {
+    if (params.authChoice !== "custom-openai-api-key") {
+        return null;
+    }
+    let nextConfig = params.config;
+    // Prompt for custom endpoint URL
+    const endpointUrl = await params.prompter.text({
+        message: "Enter OpenAI-compatible API endpoint URL",
+        placeholder: "https://api.example.com/v1",
+        validate: (value) => {
+            if (!value?.trim())
+                return "URL is required";
+            try {
+                new URL(value);
+                return undefined;
+            }
+            catch {
+                return "Invalid URL format";
+            }
+        },
+    });
+    const baseUrl = String(endpointUrl ?? "").trim();
+    if (!baseUrl) {
+        throw new Error("Custom endpoint URL is required");
+    }
+    // Prompt for API key
+    const apiKeyInput = await params.prompter.text({
+        message: "Enter API key for custom endpoint",
+    });
+    const apiKey = String(apiKeyInput ?? "").trim();
+    if (!apiKey) {
+        throw new Error("API key is required");
+    }
+    // Apply to OpenAI provider
+    nextConfig = applyCustomOpenAIConfig(nextConfig, { baseUrl, apiKey });
+    // Set auth profile
+    nextConfig = applyAuthProfileConfig(nextConfig, {
+        profileId: "openai:default",
+        provider: "openai",
+        mode: "api_key",
+    });
+    return { config: nextConfig };
+}
+function applyCustomOpenAIConfig(cfg, params) {
+    const providers = { ...cfg.models?.providers };
+    // Configure OpenAI provider with custom endpoint
+    providers.openai = {
+        ...providers.openai,
+        api: "openai-completions",
+        baseUrl: params.baseUrl,
+        apiKey: params.apiKey,
+        models: [
+            {
+                id: "gpt-4",
+                name: "GPT-4",
+                reasoning: false,
+                input: ["text"],
+                contextWindow: 8192,
+                maxTokens: 4096,
+                cost: {
+                    input: 30,
+                    output: 60,
+                    cacheRead: 3,
+                    cacheWrite: 37.5,
+                },
+            },
+            {
+                id: "gpt-3.5-turbo",
+                name: "GPT-3.5 Turbo",
+                reasoning: false,
+                input: ["text"],
+                contextWindow: 4096,
+                maxTokens: 4096,
+                cost: {
+                    input: 0.5,
+                    output: 1.5,
+                    cacheRead: 0.05,
+                    cacheWrite: 0.625,
+                },
+            },
+        ],
+    };
+    // Add model allowlist entries
+    const models = { ...cfg.agents?.defaults?.models };
+    models["openai/gpt-4"] = {};
+    models["openai/gpt-3.5-turbo"] = {};
+    return {
+        ...cfg,
+        models: {
+            ...cfg.models,
+            providers,
+        },
+        agents: {
+            ...cfg.agents,
+            defaults: {
+                ...cfg.agents?.defaults,
+                models,
+                model: {
+                    ...(cfg.agents?.defaults?.model &&
+                        "fallbacks" in cfg.agents.defaults.model
+                        ? {
+                            fallbacks: cfg.agents.defaults.model.fallbacks,
+                        }
+                        : undefined),
+                    primary: "openai/gpt-4",
+                },
+            },
+        },
+        env: {
+            ...cfg.env,
+            OPENAI_API_KEY: params.apiKey,
+            OPENAI_BASE_URL: params.baseUrl,
+        },
+    };
+}

package/dist/commands/auth-choice.apply.js

@@ -1,11 +1,13 @@
 import { applyAuthChoiceAnthropic } from "./auth-choice.apply.anthropic.js";
 import { applyAuthChoiceApiProviders } from "./auth-choice.apply.api-providers.js";
+import { applyAuthChoiceCustomOpenAI } from "./auth-choice.apply.custom-openai.js";
 import { applyAuthChoiceGitHubCopilot } from "./auth-choice.apply.github-copilot.js";
 import { applyAuthChoiceMiniMax } from "./auth-choice.apply.minimax.js";
 import { applyAuthChoiceOAuth } from "./auth-choice.apply.oauth.js";
 import { applyAuthChoiceOpenAI } from "./auth-choice.apply.openai.js";
 export async function applyAuthChoice(params) {
     const handlers = [
+        applyAuthChoiceCustomOpenAI,
         applyAuthChoiceAnthropic,
         applyAuthChoiceOpenAI,
         applyAuthChoiceOAuth,

package/dist/commands/auth-choice.apply.oauth.js

@@ -97,7 +97,7 @@ export async function applyAuthChoiceOAuth(params) {
         const spin = params.prompter.progress("Starting OAuth flow…");
         let oauthCreds = null;
         try {
-            oauthCreds = await loginAntigravityVpsAware(async (url) => {
+            oauthCreds = await loginAntigravityVpsAware(params.prompter, async (url) => {
                 if (isRemote) {
                     spin.stop("OAuth URL ready");
                     params.runtime.log(`\nOpen this URL in your LOCAL browser:\n\n${url}\n`);
@@ -107,7 +107,15 @@ export async function applyAuthChoiceOAuth(params) {
                     await openUrl(url);
                     params.runtime.log(`Open: ${url}`);
                 }
-            }, (msg) => spin.update(msg));
+            }, (msg) => {
+                // Stop the spinner when signaled (empty message means stop)
+                if (msg === "") {
+                    spin.stop("Waiting for callback URL...");
+                }
+                else {
+                    spin.update(msg);
+                }
+            });
             spin.stop("Antigravity OAuth complete");
             if (oauthCreds) {
                 await writeOAuthCredentials("google-antigravity", oauthCreds, params.agentDir);