clixad 0.0.1-beta.45 → 0.0.1-beta.46

package/dist/{chunk-Y55DBUP6.mjs → chunk-5GX5GUR4.mjs}

@@ -30,22 +30,53 @@ function parseDirectLines(body) {
       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 });
+    const line = readServedLine(e);
+    if (!line) continue;
+    out.push(line);
     seen.add(e.format);
   }
   return out;
 }
+function parseFallbackLines(body) {
+  const raw = body?.fallbacks;
+  if (!Array.isArray(raw)) return [];
+  const out = [];
+  for (const item of raw) {
+    if (!item || typeof item !== "object") continue;
+    const line = readServedLine(item);
+    if (!line || out.some((o) => o.format === line.format)) continue;
+    out.push(line);
+  }
+  return out;
+}
+function readServedLine(e) {
+  if (!isAdFormat(e.format)) return null;
+  if (typeof e.text !== "string" || typeof e.serve_token !== "string" || typeof e.click_url !== "string") return null;
+  const text = sanitizeAdText(e.text).slice(0, MAX_TEXT);
+  if (!text || !e.serve_token || e.serve_token.length > 2e3) return null;
+  let clickUrl;
+  try {
+    const url = new URL(e.click_url);
+    if (url.protocol !== "https:" && url.protocol !== "http:") return null;
+    clickUrl = url.toString();
+  } catch {
+    return null;
+  }
+  return { format: e.format, text, serveToken: e.serve_token, clickUrl };
+}
+var MAX_LINK_TEXT = 40;
+function shortLinkText(clickUrl) {
+  let url;
+  try {
+    url = new URL(clickUrl);
+  } catch {
+    return void 0;
+  }
+  if (url.protocol !== "https:" || url.search || url.hash || url.username || url.password) return void 0;
+  const text = `${url.host}${url.pathname === "/" ? "" : url.pathname}`;
+  if (text.length > MAX_LINK_TEXT || !/^[\x21-\x7e]+$/.test(text)) return void 0;
+  return text;
+}
 
 // src/edge.ts
 function detectEdgeBlock(status, headers, body) {
@@ -1107,7 +1138,9 @@ var GatewayClient = class {
       });
       if (res.status === 404) return { supported: false, lines: [] };
       if (!res.ok) return { supported: true, lines: [], failed: true };
-      return { supported: true, lines: parseDirectLines(await res.json()) };
+      const body = await res.json();
+      const fallbacks = parseFallbackLines(body);
+      return { supported: true, lines: parseDirectLines(body), ...fallbacks.length > 0 ? { fallbacks } : {} };
     } catch {
       return { supported: true, lines: [], failed: true };
     }
@@ -1133,6 +1166,27 @@ var GatewayClient = class {
       return 0;
     }
   }
+  /**
+   * Report the fallback lines a turn drew, in one call, after the turn is
+   * over. They are counted and earn nothing, because nobody pays for them being
+   * shown, so this answers how many were counted. Never throws.
+   */
+  async reportAffiliateImpressions(impressions, signal) {
+    if (impressions.length === 0) return 0;
+    try {
+      const res = await gatewayFetch(`${this.config.gatewayUrl}/v1/sponsor/affiliate/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.counted === "number" ? body.counted : 0;
+    } catch {
+      return 0;
+    }
+  }
   /**
    * Search the web, through the gateway.
    *
@@ -6573,6 +6627,7 @@ export {
   AD_FORMATS,
   EXTRA_AD_FORMATS,
   DIRECT_ASK_TIMEOUT_MS,
+  shortLinkText,
   accessColumn,
   premiumLocked,
   premiumUnlockHint,

package/dist/clixad.mjs

@@ -54,7 +54,7 @@ import {
   takeConfigNotices,
   toolSchemaFor,
   usd
-} from "./chunk-Y55DBUP6.mjs";
+} from "./chunk-5GX5GUR4.mjs";
 
 // src/tui/load.ts
 import * as nodeModule from "node:module";
@@ -133,7 +133,7 @@ async function withProductionReact(load) {
 }
 function loadTui() {
   boundInkCaches();
-  return withProductionReact(() => import("./tui-KH7DNN65.mjs"));
+  return withProductionReact(() => import("./tui-2AEK7HJV.mjs"));
 }
 
 // src/title.ts

package/dist/{tui-KH7DNN65.mjs → tui-2AEK7HJV.mjs}

@@ -89,6 +89,7 @@ import {
   savedEffort,
   shells,
   shortCredits,
+  shortLinkText,
   shortfallHeadline,
   shouldCompact,
   shouldSuggestInit,
@@ -104,7 +105,7 @@ import {
   visibleLength,
   webSearchCostLine,
   welcomeBanner
-} from "./chunk-Y55DBUP6.mjs";
+} from "./chunk-5GX5GUR4.mjs";
 
 // src/tui/index.tsx
 import "react";
@@ -276,21 +277,28 @@ var SIDEBAR_MIN_COLS = 50 + SIDEBAR_CARD_COLS;
 function adFitsFormat(format, cols) {
   return format === "sidebar_card" ? cols >= SIDEBAR_MIN_COLS : adFitsWidth(cols);
 }
-function sidebarCard(line2, cols) {
+var LINK_SEPARATOR = " \xB7 ";
+function sidebarCard(line2, cols, linkText) {
   if (!adFitsFormat("sidebar_card", cols)) return null;
   const text = line2.trim();
   if (!text) return null;
   const body = visibleLength(text) <= SIDEBAR_BODY_COLS ? text : `${sliceColumns(text, SIDEBAR_BODY_COLS - 1).trimEnd()}\u2026`;
-  return { rule: SIDEBAR_RULE, label: `${SPONSOR_SIGIL} ${AD_LABEL}`, body };
+  const label = `${SPONSOR_SIGIL} ${AD_LABEL}`;
+  const link = linkText && visibleLength(label) + visibleLength(LINK_SEPARATOR) + visibleLength(linkText) <= SIDEBAR_BODY_COLS ? linkText : null;
+  return { rule: SIDEBAR_RULE, label, link, body };
 }
-function sponsorRow(line2, cols, origin) {
+function sponsorRow(line2, cols, origin, linkText) {
   const marker = origin === "house" || cols >= AD_FULL_PREFIX_MIN_COLS ? HOUSE_MARKER_ROW : AD_MARKER_ROW;
   const label = origin === "network" ? LABEL_ROW : null;
   if (origin === "network" && !adFitsWidth(cols)) return null;
   const room = cols - visibleLength(marker) - (label ? visibleLength(label) : 0);
   if (room < MIN_BODY_COLS) return null;
+  if (origin === "network" && linkText) {
+    const whole = visibleLength(line2) + visibleLength(LINK_SEPARATOR) + visibleLength(linkText);
+    if (whole <= room) return { marker, label, body: line2, link: linkText, origin };
+  }
   const body = visibleLength(line2) <= room ? line2 : `${sliceColumns(line2, room - 1).trimEnd()}\u2026`;
-  return { marker, label, body, origin };
+  return { marker, label, body, link: null, origin };
 }
 function adColorEnabled({ isTTY, env }) {
   if (!colorEnabled({ isTTY, env })) return false;
@@ -1880,12 +1888,8 @@ function App({
   const [startedAt, setStartedAt] = useState(0);
   const [quitHint, setQuitHint] = useState(false);
   const [busyLabel, setBusyLabel] = useState(WORKING);
-  const [sponsor, setSponsor] = useState(
-    null
-  );
-  const [adSlots, setAdSlots] = useState(
-    {}
-  );
+  const [sponsor, setSponsor] = useState(null);
+  const [adSlots, setAdSlots] = useState({});
   const messagesRef = useRef(messages);
   messagesRef.current = messages;
   const busyRef = useRef(false);
@@ -2010,6 +2014,7 @@ function App({
   const sponsorCallRef = useRef(0);
   const pendingImpressionRef = useRef(/* @__PURE__ */ new Map());
   const pendingDirectRef = useRef(/* @__PURE__ */ new Map());
+  const pendingFallbackRef = useRef(/* @__PURE__ */ new Map());
   const directSupportedRef = useRef(true);
   const knownBookedRef = useRef(/* @__PURE__ */ new Set());
   const drawnRef = useRef(/* @__PURE__ */ new Set());
@@ -2277,9 +2282,13 @@ function App({
       } else {
         setSponsor(null);
       }
-      const fetchNetwork = (format) => {
+      const fetchNetwork = (format, fallback) => {
         void remoteSponsorRef.current[format].fetch().then((line2) => {
-          if (!line2 || call !== sponsorCallRef.current) return;
+          if (call !== sponsorCallRef.current) return;
+          if (!line2) {
+            if (fallback) paintFallback(fallback);
+            return;
+          }
           if (!adFitsFormat(format, colsRef.current)) return;
           if (format !== "top_bar" && modalOpenRef.current) return;
           if (format === "top_bar") {
@@ -2311,9 +2320,27 @@ function App({
         }
         pendingDirectRef.current.set(format, { call, serveToken: line2.serveToken, drawnId });
       };
+      const paintFallback = (line2) => {
+        const { format } = line2;
+        if (call !== sponsorCallRef.current) return;
+        if (!adFitsFormat(format, colsRef.current)) return;
+        if (format !== "top_bar" && modalOpenRef.current) return;
+        const drawnId = `fallback:${call}:${format}`;
+        const link = line2.clickUrl;
+        const linkText = shortLinkText(link);
+        const extra = linkText ? { link, linkText } : { link };
+        if (format === "top_bar") {
+          if (!sponsorRow(line2.text, colsRef.current, "network", linkText)) return;
+          setSponsor({ text: line2.text, origin: "network", impressionId: drawnId, ...extra });
+        } else {
+          setAdSlots((slots) => ({ ...slots, [format]: { text: line2.text, impressionId: drawnId, ...extra } }));
+        }
+        pendingFallbackRef.current.set(format, { call, serveToken: line2.serveToken, drawnId });
+      };
       const fitting = AD_FORMATS.filter((format) => adFitsFormat(format, colsRef.current));
       void (async () => {
         let direct = [];
+        let fallbacks = [];
         let failed2 = false;
         if (directSupportedRef.current && fitting.length > 0) {
           const ask2 = sponsorDirect ?? ((formats, cols2, signal) => client.directSponsor(formats, cols2, signal));
@@ -2326,6 +2353,7 @@ function App({
           if (!answer.supported) directSupportedRef.current = false;
           failed2 = answer.failed === true;
           direct = answer.lines;
+          fallbacks = answer.fallbacks ?? [];
           if (!failed2) knownBookedRef.current = new Set(direct.map((line2) => line2.format));
         }
         if (call !== sponsorCallRef.current) return;
@@ -2335,7 +2363,7 @@ function App({
           if (booked && "hold" in booked) continue;
           if (booked) paintDirect(booked);
           else if (failed2 && knownBookedRef.current.has(format)) continue;
-          else fetchNetwork(format);
+          else fetchNetwork(format, fallbacks.find((line2) => line2.format === format));
         }
       })();
     },
@@ -2344,12 +2372,16 @@ function App({
   const reportSponsor = useCallback(() => {
     const pending = [...pendingImpressionRef.current.values()];
     const pendingDirect = [...pendingDirectRef.current.entries()];
+    const pendingFallback = [...pendingFallbackRef.current.entries()];
     const drawn = drawnRef.current;
     pendingImpressionRef.current = /* @__PURE__ */ new Map();
     pendingDirectRef.current = /* @__PURE__ */ new Map();
+    pendingFallbackRef.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 fallbackReports = pendingFallback.filter(([, p]) => p.call === sponsorCallRef.current && drawn.has(p.drawnId)).map(([format, p]) => ({ format, serveToken: p.serveToken }));
+    if (fallbackReports.length > 0) void client.reportAffiliateImpressions(fallbackReports);
     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 () => {
@@ -3991,13 +4023,13 @@ ${dropped.map((l) => `  \xB7 ${l}`).join("\n")}`
   });
   const elapsed = busy && startedAt ? Math.floor((Date.now() - startedAt) / 1e3) : 0;
   const spinner = spinnerRef.current[Math.floor(tick / SPINNER_TICKS_PER_FRAME) % spinnerRef.current.length];
-  const sponsorLine = busy && sponsor ? sponsorRow(sponsor.text, cols, sponsor.origin) : null;
+  const sponsorLine = busy && sponsor ? sponsorRow(sponsor.text, cols, sponsor.origin, sponsor.linkText) : null;
   const adColor = adColorEnabled({ isTTY: stdout.isTTY, env: process.env });
   const linkable = hyperlinksEnabled({ isTTY: stdout.isTTY, env: process.env });
   const modalOpen = Boolean(picker || ask || plan || buy);
   modalOpenRef.current = modalOpen;
-  const card = busy && !modalOpen && adSlots.sidebar_card ? sidebarCard(adSlots.sidebar_card.text, cols) : null;
-  const statusBarLine = busy && !modalOpen && adSlots.status_bar ? sponsorRow(adSlots.status_bar.text, cols, "network") : null;
+  const card = busy && !modalOpen && adSlots.sidebar_card ? sidebarCard(adSlots.sidebar_card.text, cols, adSlots.sidebar_card.linkText) : null;
+  const statusBarLine = busy && !modalOpen && adSlots.status_bar ? sponsorRow(adSlots.status_bar.text, cols, "network", adSlots.status_bar.linkText) : null;
   const viewport = Math.max(1, rows - 1);
   const inputRows = Math.max(1, Math.min(MAX_INPUT_ROWS, editor.lines.length));
   const inputFrom = windowStart(editor.row, editor.lines.length, inputRows);
@@ -4276,7 +4308,11 @@ ${dropped.map((l) => `  \xB7 ${l}`).join("\n")}`
         /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", width: SIDEBAR_CARD_COLS, children: [
           /* @__PURE__ */ jsxs2(Box2, { children: [
             /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: card.rule }),
-            /* @__PURE__ */ jsx2(Text2, { ...adColor ? { color: AD_MARK } : { dimColor: true }, wrap: "truncate-end", children: card.label })
+            /* @__PURE__ */ jsx2(Text2, { ...adColor ? { color: AD_MARK } : { dimColor: true }, wrap: "truncate-end", children: card.label }),
+            card.link ? /* @__PURE__ */ jsxs2(Text2, { ...adColor ? { color: AD_TEXT } : { dimColor: true }, wrap: "truncate-end", children: [
+              LINK_SEPARATOR,
+              /* @__PURE__ */ jsx2(Text2, { underline: adColor, children: linkable && adSlots.sidebar_card?.link ? osc8(card.link, adSlots.sidebar_card.link) : card.link })
+            ] }) : null
           ] }),
           /* @__PURE__ */ jsxs2(Box2, { children: [
             /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: card.rule }),
@@ -4365,7 +4401,13 @@ function SponsorRowView({ row, adColor, link }) {
   return /* @__PURE__ */ jsxs2(Box2, { children: [
     /* @__PURE__ */ jsx2(Text2, { dimColor: true, wrap: "truncate-end", children: row.marker }),
     row.label ? /* @__PURE__ */ jsx2(Text2, { ...adColor ? { color: AD_MARK } : { dimColor: true }, wrap: "truncate-end", children: row.label }) : null,
-    /* @__PURE__ */ jsx2(Text2, { ...adColor && row.origin === "network" ? { color: AD_TEXT } : { dimColor: true }, wrap: "truncate-end", children: link && row.origin === "network" ? osc8(row.body, link) : row.body })
+    /* @__PURE__ */ jsxs2(Text2, { ...adColor && row.origin === "network" ? { color: AD_TEXT } : { dimColor: true }, wrap: "truncate-end", children: [
+      link && row.origin === "network" ? osc8(row.body, link) : row.body,
+      row.link ? /* @__PURE__ */ jsxs2(Fragment, { children: [
+        LINK_SEPARATOR,
+        /* @__PURE__ */ jsx2(Text2, { underline: adColor, children: link ? osc8(row.link, link) : row.link })
+      ] }) : null
+    ] })
   ] });
 }
 function sleep(ms, signal) {

package/package.json

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