free-pi-cli 0.6.17 → 0.6.19

package/dist/index.js

@@ -27,4 +27,4 @@ if (err) {
   console.error(err);
   process.exit(1);
 }
-await import("./main-9s59pfn5.js");
+await import("./main-qn3gsj3n.js");

package/dist/{main-9s59pfn5.js → main-qn3gsj3n.js}

@@ -515,7 +515,7 @@ function folderMatches(cwd, sessionCwd) {
 // package.json
 var package_default = {
   name: "free-pi-cli",
-  version: "0.6.17",
+  version: "0.6.19",
   description: "Free AI coding agent for your terminal. Ads and a daily free allowance pay for the models; sign in with GitHub and run npx free-pi-cli.",
   keywords: [
     "coding agent",
@@ -6614,7 +6614,7 @@ async function runFreePiMcp(args, deps) {
 }
 
 // src/gravity-pixel.ts
-import { createHash } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 var GRAVITY_PIXEL_ID = "6cd74804-0541-4d9b-899d-d7fceb465b6f";
 function userIdFromJwt(jwt) {
   try {
@@ -6661,14 +6661,15 @@ function startGravityPixel(jwt, storageDir, env = process.env, load = () => impo
       pixel = undefined;
     }
   })();
+  const fallbackSessionId = randomUUID();
   return () => {
     try {
-      const sessionId = pixel?.getSessionId();
-      if (!sdk || !pixel || !sessionId)
+      if (!sdk)
         return;
+      const sessionId = pixel?.getSessionId();
       const ctx = sdk.gravityContext({
-        sessionId,
-        user: { userId: userHash, gruid: pixel.getVisitorId(), grclid: pixel.getClickId(), graid: pixel.getGraid() }
+        sessionId: sessionId || fallbackSessionId,
+        user: sessionId && pixel ? { userId: userHash, gruid: pixel.getVisitorId(), grclid: pixel.getClickId(), graid: pixel.getGraid() } : { userId: userHash }
       });
       const encoded = Buffer.from(JSON.stringify(ctx)).toString("base64url");
       return encoded.length <= GRAVITY_CONTEXT_MAX_BYTES ? encoded : undefined;
@@ -6705,6 +6706,29 @@ function loadConfig(env = process.env) {
   };
 }
 
+// ../pi-ads/src/api.ts
+import { arch } from "node:os";
+
+// ../pi-ads/src/turn.ts
+var TURN_HEADER = "x-turn-id";
+var current;
+function startTurn() {
+  current = crypto.randomUUID();
+  return current;
+}
+var currentTurnId = () => current;
+function createTurnHeaderExtension() {
+  return {
+    name: "free-pi-turn-header",
+    factory(pi) {
+      pi.on("before_provider_headers", (event) => {
+        if (current)
+          event.headers[TURN_HEADER] = current;
+      });
+    }
+  };
+}
+
 // ../pi-ads/src/api.ts
 var REQUEST_TIMEOUT_MS = 5000;
 async function authedFetch(deps, path, init) {
@@ -6719,10 +6743,18 @@ async function authedFetch(deps, path, init) {
       Authorization: `Bearer ${token}`,
       "Content-Type": "application/json",
       ...deps.sessionId && (path.startsWith("/ads/next") || path === "/ads/impression") ? { "x-session-id": deps.sessionId } : {},
-      ...path.startsWith("/ads/next") ? gravityHeader(deps) : {}
+      ...path.startsWith("/ads/next") ? { ...currentTurnId() ? { "x-turn-id": currentTurnId() } : {}, ...deps.clientVersion ? { "x-client-version": deps.clientVersion } : {}, "x-client-os": process.platform, "x-client-arch": arch(), ...localeHeaders(), ...gravityHeader(deps) } : {}
     }
   });
 }
+function localeHeaders() {
+  try {
+    const o = Intl.DateTimeFormat().resolvedOptions();
+    return { ...o.timeZone ? { "x-client-timezone": o.timeZone } : {}, ...o.locale ? { "x-client-locale": o.locale } : {} };
+  } catch {
+    return {};
+  }
+}
 function gravityHeader(deps) {
   try {
     const ctx = deps.getGravityContext?.();
@@ -6750,9 +6782,9 @@ function fireGravityImpression(deps, ad) {
   } catch {}
   return true;
 }
-async function fetchAdNext(deps, slot) {
+async function fetchAdNext(deps, slot, trigger) {
   try {
-    const res = await authedFetch(deps, `/ads/next?slot=${slot}`);
+    const res = await authedFetch(deps, `/ads/next?slot=${slot}`, trigger ? { headers: { "x-ad-trigger": trigger } } : undefined);
     if (res.status === 204 || !res.ok)
       return;
     return await res.json();
@@ -6852,8 +6884,8 @@ function createBannerRenderer(opts = {}) {
   let lastPostedToken;
   const screen = opts.screen ?? {};
   return {
-    async render(deps, ctx, config) {
-      const ad = await fetchAdNext(deps, "banner");
+    async render(deps, ctx, config, trigger) {
+      const ad = await fetchAdNext(deps, "banner", trigger);
       if (opts.isActive && !opts.isActive())
         return;
       if (!ad) {
@@ -7119,13 +7151,14 @@ async function renderMeter(deps, ctx, opts = {}) {
 }
 
 // ../pi-ads/src/index.ts
-var BANNER_REFRESH_MS = 10 * 60 * 1000;
+var REFRESH_ON_TURN_END = false;
 var BANNER_MIN_REFRESH_MS = 60 * 1000;
 function createAdsExtension(opts) {
   const deps = {
     baseUrl: opts.baseUrl,
     getToken: opts.getToken,
     sessionId: opts.sessionId,
+    clientVersion: opts.clientVersion,
     fetchImpl: opts.fetchImpl,
     getGravityContext: opts.getGravityContext,
     onMe: opts.onMe
@@ -7138,44 +7171,72 @@ function createAdsExtension(opts) {
       const screen = {};
       const banner = createBannerRenderer({ onBannerAd: opts.onBannerAd, isActive: () => !stopped, screen });
       const inline = createInlineRenderer(screen);
-      let bannerInterval;
+      let launchTurnUnused = false;
+      let launchToken;
+      let launchAt = 0;
       let lastBannerAt = 0;
       let bannerInFlight = false;
-      const renderBanner = async (ctx, force = false) => {
+      const renderBanner = async (ctx, trigger, force = false) => {
         if (stopped)
           return;
         if (!force && (bannerInFlight || Date.now() - lastBannerAt < BANNER_MIN_REFRESH_MS))
           return;
         bannerInFlight = true;
         try {
-          await banner.render(deps, ctx, config);
+          await banner.render(deps, ctx, config, trigger);
         } finally {
           bannerInFlight = false;
           lastBannerAt = Date.now();
         }
       };
+      pi.on("before_provider_headers", (event) => {
+        const id = currentTurnId();
+        if (id)
+          event.headers[TURN_HEADER] = id;
+      });
       pi.on("session_start", async (_event, ctx) => {
         stopped = false;
         inline.reset(ctx);
+        startTurn();
+        launchTurnUnused = true;
+        launchAt = Date.now();
+        launchToken = await Promise.resolve(deps.getToken()).catch(() => {
+          return;
+        });
         opts.registerMeterRefresh?.(() => renderMeter(deps, ctx));
-        await Promise.all([renderBanner(ctx, true), renderMeter(deps, ctx)]);
-        if (bannerInterval)
-          clearInterval(bannerInterval);
-        bannerInterval = setInterval(() => {
-          renderBanner(ctx);
-        }, BANNER_REFRESH_MS);
-        bannerInterval.unref?.();
+        await Promise.all([renderBanner(ctx, "launch", true), renderMeter(deps, ctx)]);
+      });
+      const LAUNCH_AD_MAX_AGE_MS = 60 * 60000;
+      const newMessage = async (ctx) => {
+        if (launchTurnUnused) {
+          launchTurnUnused = false;
+          const token = await Promise.resolve(deps.getToken()).catch(() => {
+            return;
+          });
+          if (token === launchToken && Date.now() - launchAt < LAUNCH_AD_MAX_AGE_MS)
+            return;
+        }
+        startTurn();
+        renderBanner(ctx, "user_message", true);
+      };
+      pi.on("before_agent_start", async (event, ctx) => {
+        if (event.messageType !== "user")
+          return;
+        await newMessage(ctx);
+      });
+      pi.on("input", (event, ctx) => {
+        const e = event;
+        if (e.streamingBehavior && e.source !== "extension")
+          return newMessage(ctx).then(() => ({ action: "continue" }));
+        return { action: "continue" };
       });
       pi.on("turn_end", async (_event, ctx) => {
-        renderBanner(ctx);
-        await Promise.all([inline.onTurnEnd(deps, ctx, config), renderMeter(deps, ctx)]);
+        if (REFRESH_ON_TURN_END)
+          renderBanner(ctx, "turn_end");
+        await renderMeter(deps, ctx);
       });
       pi.on("session_shutdown", () => {
         stopped = true;
-        if (bannerInterval) {
-          clearInterval(bannerInterval);
-          bannerInterval = undefined;
-        }
       });
     }
   };
@@ -9848,6 +9909,14 @@ function mergeAttribution(a, b) {
 
 // src/changelog.ts
 var CHANGELOG_HIGHLIGHTS = [
+  {
+    version: "0.6.19",
+    highlights: ["The ad banner now refreshes when you send a message, not on a timer."]
+  },
+  {
+    version: "0.6.18",
+    highlights: ["Ads load correctly from your first prompt."]
+  },
   {
     version: "0.6.17",
     highlights: [
@@ -14271,6 +14340,7 @@ function buildRuntimeOptions(opts, sessionId) {
     baseUrl: opts.baseUrl,
     getToken: () => auth.getJwt(),
     sessionId,
+    clientVersion: CLI_VERSION,
     getGravityContext: opts.getGravityContext,
     onBannerAd: (u) => {
       advertiserUrl = u;
@@ -14381,6 +14451,7 @@ function buildRuntimeOptions(opts, sessionId) {
     hasCredit: () => (getAllowanceCache()?.boughtCredits ?? 0) > 0,
     extensionsFor: (subSessionId) => [
       { name: "free-pi-subagent-provider", factory: (pi) => registerProviders(pi, subSessionId, { "x-freepi-subagent": "1" }) },
+      createTurnHeaderExtension(),
       createToolGuardExtension({
         baseUrl: opts.baseUrl,
         getToken: () => auth.getJwt(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "free-pi-cli",
-  "version": "0.6.17",
+  "version": "0.6.19",
   "description": "Free AI coding agent for your terminal. Ads and a daily free allowance pay for the models; sign in with GitHub and run npx free-pi-cli.",
   "keywords": [
     "coding agent",