clixad 0.0.1-beta.24 → 0.0.1-beta.25

package/dist/clixad.mjs

@@ -94,14 +94,62 @@ var init_estimate = __esm({
 });
 
 // src/sponsor/formats.ts
-var EXTRA_AD_FORMATS;
+function isAdFormat(value) {
+  return typeof value === "string" && AD_FORMATS.includes(value);
+}
+var AD_FORMATS, EXTRA_AD_FORMATS;
 var init_formats = __esm({
   "src/sponsor/formats.ts"() {
     "use strict";
+    AD_FORMATS = ["top_bar", "sidebar_card", "status_bar"];
     EXTRA_AD_FORMATS = ["sidebar_card", "status_bar"];
   }
 });
 
+// src/sponsor/direct.ts
+function sanitizeAdText(raw) {
+  return raw.replace(/\u001b\[[0-?]*[ -/]*[@-~]/g, "").replace(/\u001b\][^\u0007\u001b]*(?:\u0007|\u001b\\)?/g, "").replace(/[\u0000-\u001f\u007f-\u009f]/g, " ").replace(/[‪-‮⁦-⁩‎‏؜]/g, "").replace(/[​-‍⁠­]/g, "").replace(/\s+/g, " ").trim();
+}
+function parseDirectLines(body) {
+  const raw = body?.lines;
+  if (!Array.isArray(raw)) return [];
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const item of raw) {
+    if (!item || typeof item !== "object") continue;
+    const e = item;
+    if (!isAdFormat(e.format) || seen.has(e.format)) continue;
+    if (e.hold === true) {
+      out.push({ format: e.format, hold: true });
+      seen.add(e.format);
+      continue;
+    }
+    if (typeof e.text !== "string" || typeof e.serve_token !== "string" || typeof e.click_url !== "string") continue;
+    const text = sanitizeAdText(e.text).slice(0, MAX_TEXT);
+    if (!text || !e.serve_token || e.serve_token.length > 2e3) continue;
+    let clickUrl;
+    try {
+      const url = new URL(e.click_url);
+      if (url.protocol !== "https:" && url.protocol !== "http:") continue;
+      clickUrl = url.toString();
+    } catch {
+      continue;
+    }
+    out.push({ format: e.format, text, serveToken: e.serve_token, clickUrl });
+    seen.add(e.format);
+  }
+  return out;
+}
+var DIRECT_ASK_TIMEOUT_MS, MAX_TEXT;
+var init_direct = __esm({
+  "src/sponsor/direct.ts"() {
+    "use strict";
+    init_formats();
+    DIRECT_ASK_TIMEOUT_MS = 1500;
+    MAX_TEXT = 200;
+  }
+});
+
 // src/edge.ts
 function detectEdgeBlock(status, headers, body) {
   if (status !== 403) return void 0;
@@ -498,6 +546,7 @@ var init_client = __esm({
     "use strict";
     init_estimate();
     init_formats();
+    init_direct();
     init_edge();
     CHAT_ENCODED_CONTENT_TYPE = "application/vnd.clixad.chat+gzip";
     LEDGER_REASONS = {
@@ -645,6 +694,7 @@ var init_client = __esm({
           return { status: "closed", message: closed.message, waitlistUrl: closed.waitlist_url };
         }
         if (!res.ok && !("status" in data && data.status)) {
+          if (res.status >= 500 || res.status === 429) return { status: "unavailable", error: `http ${res.status}` };
           return { status: "error", error: `http ${res.status}` };
         }
         return data;
@@ -981,6 +1031,51 @@ var init_client = __esm({
           return 0;
         }
       }
+      /**
+       * Ask for booked lines (step 2): one ask per model call, naming the slots
+       * that fit the terminal now. See `sponsor/direct.ts` for the contract.
+       *
+       * Never throws, for `sponsorConfig`'s reason. A 404 means a gateway that
+       * does not know the route, so `supported: false` tells the caller to stop
+       * asking for the rest of the session; every other failure (a timeout, a 429,
+       * a 5xx, a malformed body) is simply "nothing booked" this time.
+       */
+      async directSponsor(formats, cols, signal) {
+        try {
+          const res = await gatewayFetch(`${this.config.gatewayUrl}/v1/sponsor/direct`, {
+            method: "POST",
+            headers: this.headers(),
+            ...signal ? { signal } : {},
+            body: JSON.stringify({ formats, cols })
+          });
+          if (res.status === 404) return { supported: false, lines: [] };
+          if (!res.ok) return { supported: true, lines: [] };
+          return { supported: true, lines: parseDirectLines(await res.json()) };
+        } catch {
+          return { supported: true, lines: [] };
+        }
+      }
+      /**
+       * Report the booked lines a turn drew, in one call, after the turn is over.
+       * Never to `/v1/sponsor/impression`, which would credit them as ADtention's.
+       * Never throws; answers what was credited, for the tally and for tests.
+       */
+      async reportDirectImpressions(impressions, signal) {
+        if (impressions.length === 0) return 0;
+        try {
+          const res = await gatewayFetch(`${this.config.gatewayUrl}/v1/sponsor/direct/impression`, {
+            method: "POST",
+            headers: this.headers(),
+            ...signal ? { signal } : {},
+            body: JSON.stringify({ impressions: impressions.map((i) => ({ format: i.format, serve_token: i.serveToken })) })
+          });
+          if (!res.ok) return 0;
+          const body = await res.json();
+          return typeof body.credited === "number" ? body.credited : 0;
+        } catch {
+          return 0;
+        }
+      }
       /**
        * Search the web, through the gateway.
        *
@@ -1443,11 +1538,24 @@ async function githubLogin(client, config, start, invite, report, signal) {
   openBrowser(start.verification_uri);
   const deadline = Date.now() + start.expires_in * 1e3;
   let interval = Math.max(start.interval, 1);
+  let unavailableSince;
   while (Date.now() < deadline) {
     await sleep2(interval * 1e3, signal);
     if (signal?.aborted) return { status: "aborted" };
     report.tick?.();
-    const poll = await client.devicePoll(start.session, invite);
+    let poll;
+    try {
+      poll = await client.devicePoll(start.session, invite);
+    } catch (err) {
+      if (!(err instanceof GatewayUnreachableError)) throw err;
+      poll = { status: "unavailable", error: err.message };
+    }
+    if (poll.status === "unavailable") {
+      unavailableSince ??= Date.now();
+      if (Date.now() - unavailableSince > UNAVAILABLE_GIVE_UP_MS) return { status: "failed", error: poll.error };
+      continue;
+    }
+    unavailableSince = void 0;
     if (poll.status === "pending") {
       if (poll.interval) interval = poll.interval;
       continue;
@@ -1475,10 +1583,19 @@ async function githubLogin(client, config, start, invite, report, signal) {
         }
       };
     }
-    return { status: "failed", error: poll.error ?? poll.status };
+    return { status: "failed", error: describePollError(poll.error ?? poll.status) };
   }
   return { status: "timeout" };
 }
+function describePollError(error) {
+  if (error === "unknown_session") {
+    return "the server restarted while you were signing in, so this code no longer works. Sign in again.";
+  }
+  if (error === "login_unavailable") {
+    return "GitHub approved the sign-in, but the server could not finish it. Try again in a minute.";
+  }
+  return error;
+}
 async function devLogin(client, config, email, invite) {
   let res;
   try {
@@ -1517,7 +1634,7 @@ function sleep2(ms, signal) {
     signal.addEventListener("abort", done, { once: true });
   });
 }
-var TERMS_URL, PRIVACY_URL, TERMS_NOTICE;
+var TERMS_URL, PRIVACY_URL, TERMS_NOTICE, UNAVAILABLE_GIVE_UP_MS;
 var init_login = __esm({
   "src/login.ts"() {
     "use strict";
@@ -1529,6 +1646,7 @@ var init_login = __esm({
     TERMS_NOTICE = `By creating an account you confirm that you are at least 18 and that you agree to
 the Terms \u2014 ${TERMS_URL}
 and the Privacy Policy \u2014 ${PRIVACY_URL}`;
+    UNAVAILABLE_GIVE_UP_MS = 18e4;
   }
 });
 
@@ -5865,6 +5983,7 @@ function App({
   notices: notices2,
   sponsorServe,
   sponsorFormats,
+  sponsorDirect,
   initHint
 }) {
   const { exit } = useApp();
@@ -5973,6 +6092,8 @@ function App({
   const sponsorPrevRef = useRef(void 0);
   const sponsorCallRef = useRef(0);
   const pendingImpressionRef = useRef(/* @__PURE__ */ new Map());
+  const pendingDirectRef = useRef(/* @__PURE__ */ new Map());
+  const directSupportedRef = useRef(true);
   const drawnRef = useRef(/* @__PURE__ */ new Set());
   const sponsorSlotRef = useRef(
     /* @__PURE__ */ new Map()
@@ -6184,8 +6305,7 @@ function App({
       } else {
         setSponsor(null);
       }
-      for (const format of ["top_bar", ...EXTRA_AD_FORMATS]) {
-        if (!adFitsFormat(format, colsRef.current)) continue;
+      const fetchNetwork = (format) => {
         void remoteSponsorRef.current[format].fetch().then((line2) => {
           if (!line2 || call !== sponsorCallRef.current) return;
           if (!adFitsFormat(format, colsRef.current)) return;
@@ -6203,15 +6323,55 @@ function App({
           recordImpression(tallyRef.current, line2.id);
           pendingImpressionRef.current.set(format, { call, impression: line2.impression });
         });
-      }
+      };
+      const paintDirect = (line2) => {
+        const { format } = line2;
+        if (call !== sponsorCallRef.current) return;
+        if (!adFitsFormat(format, colsRef.current)) return;
+        if (format !== "top_bar" && modalOpenRef.current) return;
+        const drawnId = `direct:${call}:${format}`;
+        if (format === "top_bar") {
+          if (!sponsorRow(line2.text, colsRef.current, "network")) return;
+          setSponsor({ text: line2.text, origin: "network", impressionId: drawnId });
+        } else {
+          setAdSlots((slots) => ({ ...slots, [format]: { text: line2.text, impressionId: drawnId } }));
+        }
+        pendingDirectRef.current.set(format, { call, serveToken: line2.serveToken, drawnId });
+      };
+      const fitting = AD_FORMATS.filter((format) => adFitsFormat(format, colsRef.current));
+      void (async () => {
+        let direct = [];
+        if (directSupportedRef.current && fitting.length > 0) {
+          const ask3 = sponsorDirect ?? ((formats, cols2, signal) => client.directSponsor(formats, cols2, signal));
+          let answer = { supported: true, lines: [] };
+          try {
+            answer = await ask3(fitting, colsRef.current, AbortSignal.timeout(DIRECT_ASK_TIMEOUT_MS));
+          } catch {
+          }
+          if (!answer.supported) directSupportedRef.current = false;
+          direct = answer.lines;
+        }
+        if (call !== sponsorCallRef.current) return;
+        for (const format of ["top_bar", ...EXTRA_AD_FORMATS]) {
+          if (!adFitsFormat(format, colsRef.current)) continue;
+          const booked = direct.find((line2) => line2.format === format);
+          if (booked && "hold" in booked) continue;
+          if (booked) paintDirect(booked);
+          else fetchNetwork(format);
+        }
+      })();
     },
-    [config.sponsor, stdout, wallet]
+    [config.sponsor, stdout, wallet, client, sponsorDirect]
   );
   const reportSponsor = useCallback(() => {
     const pending = [...pendingImpressionRef.current.values()];
+    const pendingDirect = [...pendingDirectRef.current.entries()];
     const drawn = drawnRef.current;
     pendingImpressionRef.current = /* @__PURE__ */ new Map();
+    pendingDirectRef.current = /* @__PURE__ */ new Map();
     drawnRef.current = /* @__PURE__ */ new Set();
+    const directReports = pendingDirect.filter(([, p]) => p.call === sponsorCallRef.current && drawn.has(p.drawnId)).map(([format, p]) => ({ format, serveToken: p.serveToken }));
+    if (directReports.length > 0) void client.reportDirectImpressions(directReports);
     const reports = pending.filter((p) => p.call === sponsorCallRef.current).filter((p) => drawn.has(p.impression.impressionId)).map((p) => p.impression);
     if (reports.length === 0) return;
     void (async () => {
@@ -7876,6 +8036,7 @@ var init_app = __esm({
     init_provider();
     init_network();
     init_formats();
+    init_direct();
     init_render();
     init_commands();
     init_editor();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clixad",
-  "version": "0.0.1-beta.24",
+  "version": "0.0.1-beta.25",
   "description": "Free AI coding agent in your terminal, funded by rewarded ads.",
   "license": "UNLICENSED",
   "type": "module",