letsfg 2026.5.70 → 2026.5.72

package/dist/cli.js

@@ -6,13 +6,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
-};
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -30,139 +23,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// src/auth.ts
-var auth_exports = {};
-__export(auth_exports, {
-  BearerTokenError: () => BearerTokenError,
-  getBearerToken: () => getBearerToken,
-  paymentAuth: () => paymentAuth,
-  requestEnrolment: () => requestEnrolment,
-  saveToken: () => saveToken,
-  verifyPaymentMethod: () => verifyPaymentMethod
-});
-function configPath() {
-  const base = (0, import_node_os.platform)() === "win32" ? process.env.APPDATA || (0, import_node_os.homedir)() : (0, import_node_os.homedir)();
-  return (0, import_node_path.join)(base, ".letsfg", "config.json");
-}
-function loadConfig() {
-  const p = configPath();
-  if (!(0, import_node_fs.existsSync)(p)) return {};
-  try {
-    return JSON.parse((0, import_node_fs.readFileSync)(p, "utf-8"));
-  } catch {
-    return {};
-  }
-}
-function saveConfig(cfg) {
-  const p = configPath();
-  (0, import_node_fs.mkdirSync)((0, import_node_path.dirname)(p), { recursive: true });
-  (0, import_node_fs.writeFileSync)(p, JSON.stringify(cfg, null, 2));
-  try {
-    (0, import_node_fs.chmodSync)(p, 384);
-  } catch {
-  }
-}
-function getBearerToken() {
-  const env = process.env.LETSFG_BEARER_TOKEN;
-  if (env) return env;
-  const auth = loadConfig().pfs_auth;
-  if (auth?.token && Date.now() < auth.expires_at - 36e5) {
-    return auth.token;
-  }
-  throw new BearerTokenError(
-    "No valid LetsFG Bearer token.\n  Run:  letsfg auth        (adds a payment method \u2014 nothing is charged)\n  Or:   export LETSFG_BEARER_TOKEN=<token>"
-  );
-}
-function saveToken(token, expiresAt) {
-  const cfg = loadConfig();
-  cfg.pfs_auth = { token, expires_at: expiresAt ?? Date.now() + TOKEN_TTL_MS };
-  saveConfig(cfg);
-}
-async function postJson(path, payload) {
-  const resp = await fetch(`${BASE_URL}${path}`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json", "User-Agent": "LetsFG-js/0.1.0", "X-Client-Type": "js-sdk" },
-    body: JSON.stringify(payload)
-  });
-  const data = await resp.json().catch(() => ({}));
-  return { status: resp.status, data };
-}
-function parseExpiry(raw) {
-  if (typeof raw === "number") return raw * 1e3;
-  if (typeof raw === "string") {
-    const ms = Date.parse(raw);
-    if (!Number.isNaN(ms)) return ms;
-  }
-  return Date.now() + TOKEN_TTL_MS;
-}
-async function requestEnrolment() {
-  const { status, data } = await postJson("/api/agent-access/request", {});
-  if (status !== 200 && status !== 402) {
-    throw new BearerTokenError(`Could not start authentication (HTTP ${status}): ${data.error || ""}`);
-  }
-  return data;
-}
-async function verifyPaymentMethod(opts) {
-  const payload = {};
-  if (opts.setupSessionId) payload.setup_session_id = opts.setupSessionId;
-  else if (opts.paymentMethodId) payload.payment_method_id = opts.paymentMethodId;
-  else if (opts.cardToken) payload.card_token = opts.cardToken;
-  else throw new BearerTokenError("Provide one of setupSessionId, paymentMethodId, or cardToken.");
-  const { status, data } = await postJson("/api/agent-access/verify", payload);
-  if (status !== 200 || !data.token) {
-    throw new BearerTokenError(`Verification failed (HTTP ${status}). ${data.hint || data.error || ""}`.trim());
-  }
-  const token = data.token;
-  saveToken(token, parseExpiry(data.expires_at));
-  return token;
-}
-function openBrowser(url) {
-  import("child_process").then(({ exec }) => {
-    const cmd = (0, import_node_os.platform)() === "win32" ? `start "" "${url}"` : (0, import_node_os.platform)() === "darwin" ? `open "${url}"` : `xdg-open "${url}"`;
-    exec(cmd, () => {
-    });
-  }).catch(() => {
-  });
-}
-async function paymentAuth(openBrowserFlag = true) {
-  console.log("\n  Connecting to LetsFG...");
-  const data = await requestEnrolment();
-  const setupUrl = data.setup_url;
-  const sessionId = data.setup_session_id;
-  if (!setupUrl || !sessionId) {
-    throw new BearerTokenError("Server did not return a setup URL. Check https://letsfg.co/for-agents");
-  }
-  console.log("\n  LetsFG needs a payment method on file before it can search or book.");
-  console.log("  Nothing is charged now \u2014 this is a zero-amount card setup.\n");
-  console.log("  Step 1 \u2014 add a card here:\n");
-  console.log(`     ${setupUrl}
-`);
-  if (openBrowserFlag) openBrowser(setupUrl);
-  console.log("  Step 2 \u2014 press Enter once you've finished.");
-  const readline = await import("readline/promises");
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  await rl.question("");
-  rl.close();
-  process.stdout.write("  Verifying... ");
-  const token = await verifyPaymentMethod({ setupSessionId: sessionId });
-  const expiresAt = loadConfig().pfs_auth?.expires_at ?? Date.now() + TOKEN_TTL_MS;
-  console.log(`done. Token valid until ${new Date(expiresAt).toISOString().slice(0, 10)}.`);
-  return token;
-}
-var import_node_fs, import_node_os, import_node_path, BASE_URL, TOKEN_TTL_MS, BearerTokenError;
-var init_auth = __esm({
-  "src/auth.ts"() {
-    "use strict";
-    import_node_fs = require("fs");
-    import_node_os = require("os");
-    import_node_path = require("path");
-    BASE_URL = process.env.LETSFG_BASE_URL || "https://letsfg.co";
-    TOKEN_TTL_MS = 90 * 24 * 3600 * 1e3;
-    BearerTokenError = class extends Error {
-    };
-  }
-});
-
 // src/ranking.ts
 var W = {
   // Generic solo / default — price-driven
@@ -454,8 +314,12 @@ function offerSummary(offer) {
   return `${offer.currency} ${offer.price.toFixed(2)} | ${airline} | ${route} | ${dur} | ${offer.outbound.stopovers} stop(s)`;
 }
 var DEFAULT_BASE_URL = "https://letsfg.co";
-var PFS_POLL_INTERVAL_MS = 1e4;
+var PFS_POLL_INTERVAL_MS = 2e3;
 var PFS_POLL_TIMEOUT_MS = 12e4;
+var LATE_MERGE_POLL_MS = 3e3;
+var LATE_MERGE_GRACE_MS = 9e4;
+var WAIT_FOR_SPLIT = (process.env.LETSFG_WAIT_FOR_SPLIT || "").trim() !== "0";
+var NON_TERMINAL = ["pending", "searching"];
 var LetsFG = class {
   bearerToken;
   apiKey;
@@ -491,7 +355,7 @@ var LetsFG = class {
    *
    * Uses PFS (Bearer token) or Developer API (X-API-Key) depending on config.
    * PFS: async polling (POST /api/search -> poll /api/results/<id> every 10s).
-   * Developer API: synchronous 60-90s call.
+   * Developer API: synchronous call.
    *
    * @param origin - IATA code (e.g., "GDN", "LON")
    * @param destination - IATA code (e.g., "BER", "BCN")
@@ -523,17 +387,28 @@ var LetsFG = class {
   /** PFS path: POST /api/search -> poll /api/results/<id> */
   async searchPFS(body) {
     const { search_id } = await this.postWithBearer("/api/search", body);
+    const poll = () => this.getNoAuth(`/api/results/${search_id}`);
+    const inbound = (r) => Boolean(r.split_ticket_pending || r.gf_enrich_pending);
     const deadline = Date.now() + PFS_POLL_TIMEOUT_MS;
+    let terminal = null;
     while (Date.now() < deadline) {
-      await new Promise((r) => setTimeout(r, PFS_POLL_INTERVAL_MS));
-      const result = await this.getNoAuth(
-        `/api/results/${search_id}`
-      );
-      if (!["pending", "searching"].includes(result.status)) {
-        return result;
+      const result = await poll();
+      if (!NON_TERMINAL.includes(result.status)) {
+        terminal = result;
+        break;
       }
+      await new Promise((r) => setTimeout(r, PFS_POLL_INTERVAL_MS));
+    }
+    if (!terminal) {
+      throw new LetsFGError("Search timed out after 120s. Try polling /api/results/<id> directly.", 504);
+    }
+    const lateDeadline = Date.now() + LATE_MERGE_GRACE_MS;
+    while (WAIT_FOR_SPLIT && inbound(terminal) && Date.now() < lateDeadline) {
+      await new Promise((r) => setTimeout(r, LATE_MERGE_POLL_MS));
+      const merged = await poll();
+      if (!NON_TERMINAL.includes(merged.status)) terminal = merged;
     }
-    throw new LetsFGError("Search timed out after 120s. Try polling /api/results/<id> directly.", 504);
+    return terminal;
   }
   /**
    * Resolve a city/airport name to IATA codes.
@@ -553,8 +428,8 @@ var LetsFG = class {
   }
   /**
    * Unlock a flight offer — confirms live price, reveals direct airline booking URL.
-   * Cost: 1% of ticket price, min $3. Developer API only — there is no unlock
-   * endpoint on a PFS Bearer token, so PFS callers use book() directly.
+   * Developer API only, legacy — there is no unlock endpoint on a PFS Bearer
+   * token, so PFS callers use book() directly.
    */
   async unlock(offerId) {
     this.requireApiKey();
@@ -852,8 +727,213 @@ var LetsFG = class {
   }
 };
 
+// src/auth.ts
+var import_node_fs = require("fs");
+var import_node_os = require("os");
+var import_node_path = require("path");
+var import_node_crypto = require("crypto");
+var import_node_http = require("http");
+var BASE_URL = process.env.LETSFG_BASE_URL || "https://letsfg.co";
+var DEV_ROOT = `${BASE_URL}/developers/api`;
+var FALLBACK_TTL_MS = 55 * 60 * 1e3;
+var REFRESH_SKEW_MS = 5 * 60 * 1e3;
+var BearerTokenError = class extends Error {
+};
+function configPath() {
+  const base = (0, import_node_os.platform)() === "win32" ? process.env.APPDATA || (0, import_node_os.homedir)() : (0, import_node_os.homedir)();
+  return (0, import_node_path.join)(base, ".letsfg", "config.json");
+}
+function loadConfig() {
+  const p = configPath();
+  if (!(0, import_node_fs.existsSync)(p)) return {};
+  try {
+    return JSON.parse((0, import_node_fs.readFileSync)(p, "utf-8"));
+  } catch {
+    return {};
+  }
+}
+function saveConfig(cfg) {
+  const p = configPath();
+  (0, import_node_fs.mkdirSync)((0, import_node_path.dirname)(p), { recursive: true });
+  (0, import_node_fs.writeFileSync)(p, JSON.stringify(cfg, null, 2));
+  try {
+    (0, import_node_fs.chmodSync)(p, 384);
+  } catch {
+  }
+}
+function saveToken(token, expiresAt, extra) {
+  const cfg = loadConfig();
+  cfg.pfs_auth = {
+    ...cfg.pfs_auth ?? {},
+    ...extra ?? {},
+    token,
+    expires_at: expiresAt ?? Date.now() + FALLBACK_TTL_MS
+  };
+  saveConfig(cfg);
+}
+function getBearerToken() {
+  const env = process.env.LETSFG_BEARER_TOKEN;
+  if (env) return env;
+  const auth = loadConfig().pfs_auth;
+  if (auth?.token && Date.now() < auth.expires_at - REFRESH_SKEW_MS) {
+    return auth.token;
+  }
+  if (auth?.refresh_token) {
+    throw new BearerTokenError(
+      "LetsFG token expired. Call ensureBearerToken() to refresh it, or run:  letsfg auth"
+    );
+  }
+  throw new BearerTokenError(
+    "No valid LetsFG Bearer token.\n  Run:  letsfg auth        (connects a card at letsfg.co/connect - nothing is charged)\n  Or:   export LETSFG_BEARER_TOKEN=<token>"
+  );
+}
+async function discover() {
+  const fallback = {
+    authorization_endpoint: `${BASE_URL}/connect`,
+    token_endpoint: `${DEV_ROOT}/oauth/token`,
+    registration_endpoint: `${DEV_ROOT}/oauth/register`
+  };
+  try {
+    const resp = await fetch(`${DEV_ROOT}/.well-known/oauth-authorization-server`);
+    if (!resp.ok) return fallback;
+    const d = await resp.json();
+    return {
+      authorization_endpoint: d.authorization_endpoint || fallback.authorization_endpoint,
+      token_endpoint: d.token_endpoint || fallback.token_endpoint,
+      registration_endpoint: d.registration_endpoint || fallback.registration_endpoint
+    };
+  } catch {
+    return fallback;
+  }
+}
+function pkce() {
+  const verifier = (0, import_node_crypto.randomBytes)(32).toString("base64url");
+  const challenge = (0, import_node_crypto.createHash)("sha256").update(verifier).digest("base64url");
+  return { verifier, challenge };
+}
+async function postForm(url, form) {
+  const resp = await fetch(url, {
+    method: "POST",
+    // RFC 6749 4.1.3 - the token endpoint takes form encoding. The server also
+    // accepts JSON, but sending the spec encoding keeps this honest.
+    headers: { "Content-Type": "application/x-www-form-urlencoded", "X-Client-Type": "js-sdk" },
+    body: new URLSearchParams(form).toString()
+  });
+  const data = await resp.json().catch(() => ({}));
+  return { status: resp.status, data };
+}
+function openBrowser(url) {
+  import("child_process").then(({ exec }) => {
+    const cmd = (0, import_node_os.platform)() === "win32" ? `start "" "${url}"` : (0, import_node_os.platform)() === "darwin" ? `open "${url}"` : `xdg-open "${url}"`;
+    exec(cmd, () => {
+    });
+  }).catch(() => {
+  });
+}
+function startCallbackServer(expectedState) {
+  return new Promise((resolve, reject) => {
+    let settle = null;
+    let fail = null;
+    const codePromise = new Promise((res, rej) => {
+      settle = res;
+      fail = rej;
+    });
+    const server = (0, import_node_http.createServer)((req, res) => {
+      const url = new URL(req.url || "/", "http://127.0.0.1");
+      if (!url.pathname.startsWith("/callback")) {
+        res.writeHead(404).end();
+        return;
+      }
+      const err = url.searchParams.get("error");
+      const code = url.searchParams.get("code");
+      const state = url.searchParams.get("state");
+      res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
+      if (err || !code) {
+        res.end("<h1>LetsFG</h1><p>That did not complete. Nothing was charged - run <code>letsfg auth</code> again.</p>");
+        fail?.(new BearerTokenError(`Authorisation failed: ${err || "no code returned"}`));
+        return;
+      }
+      if (state !== expectedState) {
+        res.end("<h1>LetsFG</h1><p>State mismatch - nothing was charged. Run <code>letsfg auth</code> again.</p>");
+        fail?.(new BearerTokenError("State mismatch on the OAuth callback - aborted."));
+        return;
+      }
+      res.end("<h1>LetsFG</h1><p>Connected. You can close this tab and go back to your terminal.</p>");
+      settle?.(code);
+    });
+    server.on("error", reject);
+    server.listen(0, "127.0.0.1", () => {
+      const addr = server.address();
+      const port = typeof addr === "object" && addr ? addr.port : 0;
+      if (!port) {
+        reject(new BearerTokenError("Could not open a local callback port."));
+        return;
+      }
+      resolve({ port, waitForCode: () => codePromise, close: () => server.close() });
+    });
+  });
+}
+async function connectAuth(openBrowserFlag = true) {
+  const meta = await discover();
+  const { verifier, challenge } = pkce();
+  const state = (0, import_node_crypto.randomBytes)(16).toString("base64url");
+  const { port, waitForCode, close } = await startCallbackServer(state);
+  const redirectUri = `http://127.0.0.1:${port}/callback`;
+  try {
+    const reg = await fetch(meta.registration_endpoint, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        client_name: "letsfg-cli",
+        redirect_uris: [redirectUri],
+        grant_types: ["authorization_code", "refresh_token"],
+        response_types: ["code"],
+        token_endpoint_auth_method: "none"
+      })
+    });
+    const regData = await reg.json().catch(() => ({}));
+    const clientId = typeof regData.client_id === "string" ? regData.client_id : "";
+    if (!reg.ok || !clientId) {
+      throw new BearerTokenError(
+        `Could not register with LetsFG (HTTP ${reg.status}). See ${BASE_URL}/for-agents`
+      );
+    }
+    const authUrl = `${meta.authorization_endpoint}?response_type=code&client_id=${encodeURIComponent(clientId)}&redirect_uri=${encodeURIComponent(redirectUri)}&code_challenge=${challenge}&code_challenge_method=S256&state=${encodeURIComponent(state)}&scope=flights`;
+    console.log("\n  LetsFG needs a card connected before it can search or book.");
+    console.log("  Nothing is charged now - you pay the fare only when you book,");
+    console.log("  and it is held, not taken, until the airline confirms.\n");
+    console.log("  Open this and add a card (or pay 0.00 with Revolut Pay):\n");
+    console.log(`     ${authUrl}
+`);
+    if (openBrowserFlag) openBrowser(authUrl);
+    process.stdout.write("  Waiting for you to finish... ");
+    const code = await waitForCode();
+    const { status, data } = await postForm(meta.token_endpoint, {
+      grant_type: "authorization_code",
+      code,
+      client_id: clientId,
+      redirect_uri: redirectUri,
+      code_verifier: verifier
+    });
+    if (status !== 200 || !data.access_token) {
+      throw new BearerTokenError(
+        `Could not complete authentication (HTTP ${status}). ${String(data.error_description || data.error || "")}`.trim()
+      );
+    }
+    const expiresIn = typeof data.expires_in === "number" ? data.expires_in * 1e3 : FALLBACK_TTL_MS;
+    saveToken(String(data.access_token), Date.now() + expiresIn, {
+      refresh_token: typeof data.refresh_token === "string" ? data.refresh_token : void 0,
+      client_id: clientId
+    });
+    console.log("done. Card connected - the token refreshes itself from now on.");
+    return String(data.access_token);
+  } finally {
+    close();
+  }
+}
+var paymentAuth = connectAuth;
+
 // src/cli.ts
-init_auth();
 function resolveCredentials(apiKeyFlag) {
   const apiKey = apiKeyFlag || process.env.LETSFG_API_KEY;
   if (apiKey) return { apiKey };
@@ -1089,17 +1169,19 @@ async function cmdLocations(args) {
   }
 }
 async function cmdAuth(args) {
-  const cardToken = getFlag(args, "--card-token");
-  const paymentMethodId = getFlag(args, "--payment-method");
-  const noBrowser = hasFlag(args, "--no-browser");
-  if (cardToken || paymentMethodId) {
-    const { verifyPaymentMethod: verifyPaymentMethod2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
-    await verifyPaymentMethod2({ cardToken: cardToken || void 0, paymentMethodId: paymentMethodId || void 0 });
-    console.log("\n  \u2713 Authenticated. Nothing was charged.");
-  } else {
-    await paymentAuth(!noBrowser);
+  for (const dead of ["--card-token", "--payment-method"]) {
+    if (getFlag(args, dead)) {
+      console.error(
+        `
+  ${dead} was part of the Stripe enrolment, retired 2026-09-02.
+  Run plain \`letsfg auth\` instead - it opens letsfg.co/connect to add a card.
+`
+      );
+      process.exit(1);
+    }
   }
-  console.log("\n  You're all set. Run: letsfg search WAW BCN 2026-07-15\n");
+  await paymentAuth(!hasFlag(args, "--no-browser"));
+  console.log("\n  You are all set. Run: letsfg search WAW BCN 2026-07-15\n");
 }
 async function cmdRegister(args) {
   const jsonOut = hasFlag(args, "--json") || hasFlag(args, "-j");
@@ -1177,11 +1259,12 @@ var HELP = `
 LetsFG \u2014 Agent-native flight search & booking.
 
 Search hundreds of airlines via the LetsFG cloud engine.
-Authenticate once with letsfg auth \u2014 a zero-amount card setup, nothing is
-charged \u2014 then search and book.
+Authenticate once with letsfg auth \u2014 it opens letsfg.co/connect so you can add
+a card. Nothing is charged; you pay the fare only when you book, and it is held,
+not taken, until the airline confirms.
 
 Commands:
-  auth                             Put a card on file -> 90-day token. Nothing charged
+  auth                             Connect a card at letsfg.co/connect. Nothing charged
   search <origin> <dest> <date>    Search for flights (free), prints search_id
   locations <query>                Resolve city name to IATA codes
   book <offer_id> --search-id ...  Book a flight. No LetsFG fee, no unlock step
@@ -1191,15 +1274,13 @@ Developer API only (a SEPARATE paid product \u2014 most agents should not use th
 they create a billing account. Use auth above instead):
   register --name ... --email ... Create a paid Developer API account
   setup-payment                   Attach a card to that paid account
-  unlock <offer_id>               [Developer API only] Unlock offer \u2014 1% of ticket (min $3)
+  unlock <offer_id>               [Developer API only] Unlock offer (legacy)
 
 Options:
   --json, -j          Output raw JSON
   --api-key, -k       Developer API key (or set LETSFG_API_KEY) \u2014 switches book/search to the paid path
   --base-url          API URL (default: https://letsfg.co)
-  --card-token        (auth only) Stripe tok_... you already hold, for a headless auth
-  --payment-method    (auth only) Stripe pm_... you already hold, for a headless auth
-  --no-browser        (auth only) Don't try to auto-open the card setup page
+  --no-browser        (auth only) Print the connect URL instead of opening a browser
 
 Examples:
   letsfg auth