traderclaw-cli 1.0.114 → 1.0.116

package/bin/installer-step-engine.mjs

@@ -1827,12 +1827,13 @@ function configureOpenClawLlmModelPrimaryOnly({ provider, model }, configPath =
 }
 
 /**
- * Spawns `openclaw models auth login --provider openai-codex` with a pseudo-TTY when possible.
+ * Spawns `openclaw models auth login --provider openai-codex --method oauth` with a pseudo-TTY when possible.
+ * `--method oauth` skips the interactive Browser vs Device pairing menu (OpenClaw 2026.4.29+); device flow is `device-code`.
  * The CLI often exits immediately when stdin/stdout are plain pipes (no TTY). On Unix, `script(1)`
  * allocates a PTY so the same flow works as in an interactive terminal.
  */
 export function spawnOpenClawCodexAuthLoginChild() {
-  const argv = ["models", "auth", "login", "--provider", "openai-codex"];
+  const argv = ["models", "auth", "login", "--provider", "openai-codex", "--method", "oauth"];
   if (process.platform === "win32") {
     return spawn("openclaw", argv, { stdio: ["pipe", "pipe", "pipe"], shell: false });
   }
@@ -1840,14 +1841,19 @@ export function spawnOpenClawCodexAuthLoginChild() {
     return spawn("unbuffer", ["openclaw", ...argv], { stdio: ["pipe", "pipe", "pipe"], shell: false });
   }
   if (commandExists("script")) {
-    const cmdline = "openclaw models auth login --provider openai-codex";
-    // --return propagates the inner command's exit code (util-linux 2.38+).
-    // Without it, script may exit 0 even if openclaw fails.
-    // -f/--flush: when the wizard reads script's stdout via a pipe, default
-    // block buffering can delay OAuth URLs until the buffer fills (e.g. 4KiB+),
-    // tripping the install wizard's URL detection timeout (OpenClaw 2026.4.x+).
+    // stty cols 32767: set an extremely wide PTY column so OpenClaw/Clack never
+    // wraps the OAuth URL across lines (default PTY width when spawned via pipe is 80).
+    // A wrapped URL causes the wizard's regex to only capture the first segment.
+    // --return propagates openclaw's exit code (util-linux 2.38+).
+    // -f/--flush: force immediate forwarding of each PTY write to the pipe so the
+    // wizard sees the URL as soon as OpenClaw prints it (default is block-buffered).
+    const cmdline =
+      "stty cols 32767 rows 50 2>/dev/null; openclaw models auth login --provider openai-codex --method oauth";
     return spawn("script", ["--return", "-f", "-q", "-c", cmdline, "/dev/null"], {
       stdio: ["pipe", "pipe", "pipe"],
+      // COLUMNS/LINES: belt-and-suspenders env fallback for programs that read env
+      // instead of ioctl(TIOCGWINSZ) to determine terminal dimensions.
+      env: { ...process.env, COLUMNS: "32767", LINES: "50" },
       shell: false,
     });
   }
@@ -1855,7 +1861,7 @@ export function spawnOpenClawCodexAuthLoginChild() {
 }
 
 /**
- * Runs `openclaw models auth login --provider openai-codex` and feeds the pasted redirect URL or code on stdin
+ * Runs `openclaw models auth login --provider openai-codex --method oauth` and feeds the pasted redirect URL or code on stdin
  * when the CLI prompts (with a timed fallback for non-interactive / SSH).
  */
 function runOpenClawCodexOAuthLogin(paste, emitLog) {
@@ -2329,7 +2335,7 @@ export class InstallerStepEngine {
         } catch (err) {
           const tail = `${err?.stderr || ""}\n${err?.stdout || ""}\n${err?.message || ""}`.trim();
           throw new Error(
-            `${tail}\n\nIf OAuth cannot complete from the wizard, run in a shell: openclaw models auth login --provider openai-codex — then re-run the wizard with "already logged in" checked.`,
+            `${tail}\n\nIf OAuth cannot complete from the wizard, run in a shell: openclaw models auth login --provider openai-codex --method oauth — then re-run the wizard with "already logged in" checked.`,
           );
         }
       }
@@ -2343,7 +2349,7 @@ export class InstallerStepEngine {
         throw new Error(
           "No OAuth credentials found at " + authFile + ". " +
           "The wizard OAuth flow did not save tokens (the callback may not have reached the OpenClaw CLI). " +
-          "Run 'openclaw models auth login --provider openai-codex' in a terminal, " +
+          "Run 'openclaw models auth login --provider openai-codex --method oauth' in a terminal, " +
           "then re-run the wizard with the 'already logged in' option.",
         );
       }

package/bin/openclaw-trader.mjs

@@ -3043,7 +3043,11 @@ function wizardHtml(defaults) {
             setOauthStep(oauthStepOpen, "error");
             setOauthStep(oauthStepComplete, "error");
             setOauthStep(oauthStepVerify, "error");
-            setOauthStatus((data && (data.message || data.error)) || "Could not start OAuth sign-in.", true);
+            let msg = (data && (data.message || data.error)) || "Could not start OAuth sign-in.";
+            if (data && typeof data.detail === "string" && data.detail.trim()) {
+              msg += " " + data.detail.trim().slice(0, 1500);
+            }
+            setOauthStatus(msg, true);
             if (oauthRetryBtn) oauthRetryBtn.classList.remove("hidden");
             updateStartButtonState();
             return;
@@ -3629,6 +3633,27 @@ async function cmdInstall(args) {
   // The \S+ (non-whitespace) tail captures the full query string; see trySendUrl()
   // for why we run this against a stripAnsi+CR-stripped copy of the output.
   const OPENAI_OAUTH_AUTHORIZE_RE = /https:\/\/auth\.openai\.com\/(?:oauth\/authorize|authorize)[^\s"]*/;
+  const OPENAI_OAUTH_AUTHORIZE_RE_LOOSE =
+    /https:\/\/(?:[a-z0-9-]+\.)*openai\.com\/[^\s"]*?(?:oauth\/authorize|\/authorize[^\s"]*)/i;
+
+  /** Best-effort: primary regex, then subdomain/openai authorize URLs, then token-like query heuristics. */
+  function tryExtractOpenAiCodexAuthorizeUrl(cleaned) {
+    let m = cleaned.match(OPENAI_OAUTH_AUTHORIZE_RE);
+    if (m?.[0]) return m[0];
+    m = cleaned.match(OPENAI_OAUTH_AUTHORIZE_RE_LOOSE);
+    if (m?.[0]) return m[0];
+    const candidates = cleaned.match(/https:\/\/[^\s"]+/g) || [];
+    for (const u of candidates) {
+      if (
+        /openai\.com/i.test(u)
+        && /authorize/i.test(u)
+        && /oauth|response_type|client_id|redirect_uri|scope=/i.test(u)
+      ) {
+        return u;
+      }
+    }
+    return null;
+  }
   const oauthSessionTtlMs = 15 * 60 * 1000;
 
   // Long-lived callback proxy on port 1455. Bound at wizard startup so
@@ -3856,6 +3881,10 @@ async function cmdInstall(args) {
       const urlTimeout = setTimeout(() => {
         if (responded) return;
         responded = true;
+        const detail = stripAnsi(combined).slice(-4000);
+        if (process.env.TRADERCLAW_WIZARD_OAUTH_DEBUG === "1") {
+          printWarn(`[TRADERCLAW_WIZARD_OAUTH_DEBUG] OpenClaw output tail before oauth_url_timeout:\n${detail}`);
+        }
         try {
           child.kill("SIGTERM");
         } catch {
@@ -3868,20 +3897,31 @@ async function cmdInstall(args) {
           error: "oauth_url_timeout",
           message:
             "OpenClaw did not provide a ChatGPT sign-in URL in time. Try again.",
+          detail,
         });
       }, 120_000);
 
       const trySendUrl = () => {
         if (responded) return;
-        // Strip ANSI escape codes and carriage returns before matching.
-        // Newer OpenClaw uses rich terminal output (spinners, colors) and PTY
-        // column-wrapping inserts \r\n in the middle of long OAuth URLs, causing
-        // the regex to fail on the raw byte stream. Clean first, then match.
-        const cleanedForUrl = stripAnsi(combined).replace(/\r/g, "");
-        const m = cleanedForUrl.match(OPENAI_OAUTH_AUTHORIZE_RE);
-        if (!m || !m[0]) return;
-        // Strip any trailing ANSI remnants that slipped through (e.g. \x1b[0m appended by colour reset)
-        const authUrl = m[0].replace(/\x1b[^a-zA-Z]*[a-zA-Z]?$/g, "").trim();
+        // Layer 1: strip ANSI codes and carriage returns, then join any URL continuation
+        // lines caused by PTY column-wrapping (e.g. at 80-col default). When the URL is
+        // split across lines the [^\s] tail of the regex stops at the newline and only the
+        // first fragment is captured. Removing newlines that are sandwiched between URL-safe
+        // characters reconnects all fragments before matching.
+        const cleanedForUrl = stripAnsi(combined)
+          .replace(/\r/g, "")
+          .replace(/([A-Za-z0-9%&=+?#:/@._~!$'()*,;-])\n([A-Za-z0-9%&=+?#:/@._~!$'()*,;-])/g, "$1$2");
+        let authUrl = tryExtractOpenAiCodexAuthorizeUrl(cleanedForUrl);
+        // Layer 2: try the raw combined buffer in case stripAnsi dropped a character that
+        // broke the URL detection (raw ANSI seqs don't include space so regex still works).
+        if (!authUrl) {
+          const rawCleaned = combined.replace(/\r/g, "")
+            .replace(/([A-Za-z0-9%&=+?#:/@._~!$'()*,;-])\n([A-Za-z0-9%&=+?#:/@._~!$'()*,;-])/g, "$1$2");
+          authUrl = tryExtractOpenAiCodexAuthorizeUrl(rawCleaned);
+        }
+        if (!authUrl) return;
+        // Strip any trailing ANSI remnants (e.g. \x1b[0m appended by colour reset)
+        authUrl = stripAnsi(authUrl).replace(/\r/g, "").trim();
         if (!authUrl.startsWith("https://")) return;
         clearTimeout(urlTimeout);
         responded = true;
@@ -3944,7 +3984,7 @@ async function cmdInstall(args) {
             pending.status = "failed";
             pending.message =
               "OpenClaw exited OK but no auth tokens were saved. " +
-              "Run 'openclaw models auth login --provider openai-codex' in a terminal, " +
+              "Run 'openclaw models auth login --provider openai-codex --method oauth' in a terminal, " +
               "then re-run the wizard with the already-logged-in option.";
           } else {
             pending.status = "failed";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "traderclaw-cli",
-  "version": "1.0.114",
+  "version": "1.0.116",
   "description": "Global TraderClaw CLI (install --wizard, setup, precheck). Installs solana-traderclaw as a dependency for OpenClaw plugin files.",
   "type": "module",
   "bin": {
@@ -17,7 +17,7 @@
     "node": ">=22"
   },
   "dependencies": {
-    "solana-traderclaw": "^1.0.114"
+    "solana-traderclaw": "^1.0.116"
   },
   "keywords": [
     "traderclaw",