free-pi-cli 0.6.20 → 0.6.21

package/README.md

@@ -19,7 +19,7 @@ npm install -g free-pi-cli
 free-pi-cli
 ```
 
-Requires Node 22.19 or newer. The command is `free-pi-cli`, not `pi`.
+Requires Node 22.19 or newer. The command is `free-pi-cli`, not `pi`. If the built-in agent suggests `pi --session ...` on exit, run `npx free-pi-cli@latest --session <id>` instead (or `free-pi-cli --session <id>` if you installed it globally).
 
 ## Usage
 
@@ -63,6 +63,31 @@ free-pi may use your sessions to improve and train models. See the privacy polic
 
 The agent can read files anywhere your user account can, but it only reads what your request needs. Project settings and extensions in a folder load only after you trust that folder.
 
+## Development
+
+```
+bun install
+bun test          # runs against an in-process stub server; no real network or pi TUI
+bun run typecheck
+bun run build
+```
+
+`FREEPI_BASE_URL` overrides the backend base URL (default `https://api.freepi.ai`), for pointing at a local dev server.
+
+## Repo map
+
+| Path | Purpose |
+|---|---|
+| `src/index.ts`, `src/main.ts` | bin entry and top-level wiring |
+| `src/run.ts` | orchestration: consent, login, token check, launch |
+| `src/auth-flow.ts`, `src/credentials.ts` | sign-in clients; token storage (mode 0600) |
+| `src/consent.ts` | consent screen text and parsing |
+| `src/pi-launch.ts`, `src/provider.ts` | pi SDK integration: registers the free-pi provider and launches the TUI |
+| `src/*-tool.ts`, `src/web-tools.ts`, `src/fusion.ts` | agent tools (images, docs, usage, todo, web) and Fusion model selection |
+| `src/vendor/` | copies of the internal `shared` and `pi-ads` packages |
+| `test/` | tests, one file per source module |
+| `skills/` | bundled agent skills |
+
 ## Links
 
 - Website: https://freepi.ai
@@ -70,3 +95,4 @@ The agent can read files anywhere your user account can, but it only reads what
 - Terms: https://freepi.ai/terms
 - Privacy: https://freepi.ai/privacy
 - Changelog: [CHANGELOG.md](CHANGELOG.md)
+- Contributing: [CONTRIBUTING.md](CONTRIBUTING.md). This repo is a one-way mirror of a private monorepo, and the file explains how pull requests flow back.

package/dist/index.js

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

package/dist/{main-qswbbh2q.js → main-7sxf1v5b.js}

@@ -515,7 +515,7 @@ function folderMatches(cwd, sessionCwd) {
 // package.json
 var package_default = {
   name: "free-pi-cli",
-  version: "0.6.20",
+  version: "0.6.21",
   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",
@@ -6021,6 +6021,8 @@ var AdNextResponseSchema = object({
 });
 var GRAVITY_CONTEXT_HEADER = "x-gravity-context";
 var GRAVITY_CONTEXT_MAX_BYTES = 8192;
+var AD_CONTEXT_HEADER = "x-ad-context";
+var AD_CONTEXT_MAX_CHARS = 1000;
 var AdImpressionRequestSchema = object({
   ad_id: string2(),
   click_token: string2(),
@@ -6767,6 +6769,52 @@ function gravityHeader(deps) {
     return {};
   }
 }
+function textParts(content) {
+  if (typeof content === "string")
+    return content;
+  if (!Array.isArray(content))
+    return "";
+  return content.map((p) => p && p.type === "text" && typeof p.text === "string" ? p.text : "").filter(Boolean).join(`
+`);
+}
+function cut(redact, text) {
+  const full = redact(text.slice(0, 20000));
+  const s = full.slice(0, AD_CONTEXT_MAX_CHARS);
+  return full.length > s.length && /\S/.test(full[s.length]) ? s.replace(/\S+$/, "").trimEnd() : s;
+}
+function adContextHeader(deps, ctx, prompt) {
+  if (!deps.adContext || !ctx)
+    return;
+  try {
+    const out = {};
+    const entries = ctx.sessionManager.getBranch();
+    if (prompt?.trim())
+      out.user = cut(deps.adContext.redact, prompt.trim());
+    for (let i = entries.length - 1;i >= 0 && !(out.user && out.assistant); i--) {
+      const m = entries[i].type === "message" ? entries[i].message : undefined;
+      if (m?.role !== "user" && m?.role !== "assistant" || out[m.role])
+        continue;
+      const text = textParts(m.content).trim();
+      if (text)
+        out[m.role] = cut(deps.adContext.redact, text);
+    }
+    if (!out.user && !out.assistant)
+      return;
+    const limit = Math.min(4096, 16 * 1024 - 2500 - (deps.getGravityContext?.()?.length ?? 0));
+    if (limit < 600)
+      return;
+    let encoded = Buffer.from(JSON.stringify(out)).toString("base64url");
+    while (encoded.length > limit && (out.user || out.assistant)) {
+      for (const k of ["user", "assistant"])
+        if (out[k])
+          out[k] = out[k].slice(0, Math.floor(out[k].length / 2));
+      encoded = Buffer.from(JSON.stringify(out)).toString("base64url");
+    }
+    return encoded;
+  } catch {
+    return;
+  }
+}
 var IMP_TIMEOUT_MS = 3000;
 function isGravityImpUrl(raw) {
   if (!raw)
@@ -6786,9 +6834,11 @@ function fireGravityImpression(deps, ad) {
   } catch {}
   return true;
 }
-async function fetchAdNext(deps, slot, trigger) {
+async function fetchAdNext(deps, slot, trigger, ctx, prompt) {
   try {
-    const res = await authedFetch(deps, `/ads/next?slot=${slot}`, trigger ? { headers: { "x-ad-trigger": trigger } } : undefined);
+    const pair = adContextHeader(deps, ctx, prompt);
+    const headers = { ...trigger ? { "x-ad-trigger": trigger } : {}, ...pair ? { [AD_CONTEXT_HEADER]: pair } : {} };
+    const res = await authedFetch(deps, `/ads/next?slot=${slot}`, { headers });
     if (res.status === 204 || !res.ok)
       return;
     return await res.json();
@@ -6888,8 +6938,8 @@ function createBannerRenderer(opts = {}) {
   let lastPostedToken;
   const screen = opts.screen ?? {};
   return {
-    async render(deps, ctx, config, trigger) {
-      const ad = await fetchAdNext(deps, "banner", trigger);
+    async render(deps, ctx, config, trigger, prompt) {
+      const ad = await fetchAdNext(deps, "banner", trigger, ctx, prompt);
       if (opts.isActive && !opts.isActive())
         return;
       if (!ad) {
@@ -6947,7 +6997,7 @@ function createInlineRenderer(screen = {}) {
         return;
       if (screen.banner === "gravity")
         return;
-      const ad = await fetchAdNext(deps, "inline");
+      const ad = await fetchAdNext(deps, "inline", undefined, ctx);
       if (!ad)
         return;
       const isGravity = ad.source === "gravity";
@@ -7165,6 +7215,7 @@ function createAdsExtension(opts) {
     clientVersion: opts.clientVersion,
     fetchImpl: opts.fetchImpl,
     getGravityContext: opts.getGravityContext,
+    adContext: opts.adContext,
     onMe: opts.onMe
   };
   const config = loadConfig();
@@ -7180,14 +7231,14 @@ function createAdsExtension(opts) {
       let launchAt = 0;
       let lastBannerAt = 0;
       let bannerInFlight = false;
-      const renderBanner = async (ctx, trigger, force = false) => {
+      const renderBanner = async (ctx, trigger, force = false, prompt) => {
         if (stopped)
           return;
         if (!force && (bannerInFlight || Date.now() - lastBannerAt < BANNER_MIN_REFRESH_MS))
           return;
         bannerInFlight = true;
         try {
-          await banner.render(deps, ctx, config, trigger);
+          await banner.render(deps, ctx, config, trigger, prompt);
         } finally {
           bannerInFlight = false;
           lastBannerAt = Date.now();
@@ -7211,7 +7262,7 @@ function createAdsExtension(opts) {
         await Promise.all([renderBanner(ctx, "launch", true), renderMeter(deps, ctx)]);
       });
       const LAUNCH_AD_MAX_AGE_MS = 60 * 60000;
-      const newMessage = async (ctx) => {
+      const newMessage = async (ctx, prompt) => {
         if (launchTurnUnused) {
           launchTurnUnused = false;
           const token = await Promise.resolve(deps.getToken()).catch(() => {
@@ -7221,17 +7272,17 @@ function createAdsExtension(opts) {
             return;
         }
         startTurn();
-        renderBanner(ctx, "user_message", true);
+        renderBanner(ctx, "user_message", true, prompt);
       };
       pi.on("before_agent_start", async (event, ctx) => {
         if (event.messageType !== "user")
           return;
-        await newMessage(ctx);
+        await newMessage(ctx, event.prompt);
       });
       pi.on("input", (event, ctx) => {
         const e = event;
         if (e.streamingBehavior && e.source !== "extension")
-          return newMessage(ctx).then(() => ({ action: "continue" }));
+          return newMessage(ctx, e.text).then(() => ({ action: "continue" }));
         return { action: "continue" };
       });
       pi.on("turn_end", async (_event, ctx) => {
@@ -8572,7 +8623,6 @@ session.
 
 ## Commands
 - \`/usage\` — spend and remaining budget today
-- \`/support\` — visit today's advertiser
 - \`/feedback <text>\` — send feedback to the free-pi team
 - \`/tos\` — open the Terms of Service
 - \`/privacy-policy\` — open the Privacy Policy
@@ -8608,9 +8658,6 @@ in to a server that uses OAuth, and \`free-pi-cli mcp logout <server>\`. Add
 Inside a session, \`/mcp\` shows each server and its tools, and lets you sign
 in, reconnect, or turn a server on or off.
 
-## Support
-Today's sponsor keeps free-pi free. When the user asks how to help the
-project, or seems to like free-pi, suggest \`/support\` to visit the sponsor.
 More at https://freepi.ai
 `;
 
@@ -9682,9 +9729,16 @@ function createUpgradeNoticeExtension(opts) {
 
 // src/tool-outcomes.ts
 var MAX_IDS = 50;
+var TOOL_META_HEADER = "x-freepi-tool-meta";
+var COMPACTED_HEADER = "x-freepi-compacted";
+var META_BUDGET = 1500;
 function createToolOutcomesExtension() {
   const failed = [];
   let evicted = false;
+  const meta = [];
+  let metaBytes = 3;
+  let droppedMessages = 0;
+  let pendingDropped = 0;
   return {
     name: "free-pi-tool-outcomes",
     factory(pi) {
@@ -9698,7 +9752,37 @@ function createToolOutcomesExtension() {
           evicted = true;
         }
       });
+      pi.on("tool_execution_end", (event) => {
+        const e = event;
+        if (!e.toolCallId || !/^[\w.:-]{1,100}$/.test(e.toolCallId) || typeof e.durationMs !== "number")
+          return;
+        let exit = "-";
+        if (e.toolName === "bash" || e.toolName === "powershell") {
+          const m = e.isError ? /Command exited with code (\d{1,3})\s*$/.exec(e.result?.content?.map((b) => b.text ?? "").join("") ?? "") : null;
+          exit = m ? m[1] : e.isError ? "-" : "0";
+        }
+        const entry = `${e.toolCallId}~${Math.max(0, Math.round(e.durationMs))}~${exit}~${e.result?.details?.truncation?.truncated ? 1 : 0}`;
+        if (entry.length > 150)
+          return;
+        meta.push(entry);
+        metaBytes += entry.length + 1;
+        while (metaBytes > META_BUDGET && meta.length > 1)
+          metaBytes -= meta.shift().length + 1;
+      });
+      pi.on("session_before_compact", (event) => {
+        const p = event.preparation;
+        pendingDropped = (p?.messagesToSummarize?.length ?? 0) + (p?.turnPrefixMessages?.length ?? 0);
+      });
+      pi.on("session_compact", () => {
+        droppedMessages = pendingDropped;
+      });
       pi.on("before_provider_headers", (event) => {
+        if (meta.length)
+          event.headers[TOOL_META_HEADER] = `v1:${meta.join(",")}`;
+        if (droppedMessages) {
+          event.headers[COMPACTED_HEADER] = `v1:${droppedMessages}`;
+          droppedMessages = 0;
+        }
         event.headers["x-freepi-tool-errors"] = `${evicted ? "v1x" : "v1"}:${failed.join(",")}`;
       });
     }
@@ -10141,6 +10225,10 @@ function mergeAttribution(a, b) {
 
 // src/changelog.ts
 var CHANGELOG_HIGHLIGHTS = [
+  {
+    version: "0.6.21",
+    highlights: ["The /support command is removed."]
+  },
   {
     version: "0.6.20",
     highlights: ["Error messages are now plain sentences instead of raw server text."]
@@ -11634,15 +11722,6 @@ async function buyCredits(opts, ctx) {
   (opts.openBrowserImpl ?? openBrowser)(page.url);
   ctx.ui.notify(buyPageText(page.url), "info");
 }
-async function openAdvertiser(opts, ctx) {
-  const url = opts.getAdvertiserUrl?.();
-  if (!url) {
-    ctx.ui.notify("No advertiser loaded yet.", "info");
-    return;
-  }
-  (opts.openBrowserImpl ?? openBrowser)(url);
-  ctx.ui.notify("Opening today's advertiser in your browser. Thank you for supporting free-pi.", "info");
-}
 var TERMS_URL = "https://freepi.ai/terms";
 var PRIVACY_URL = "https://freepi.ai/privacy";
 async function openTos(opts, ctx) {
@@ -11988,10 +12067,6 @@ function createFreePiCommandsExtension(opts) {
         description: FEEDBACK_DESCRIPTION,
         handler: (args, ctx) => sendFeedback(opts, args, ctx)
       });
-      pi.registerCommand("support", {
-        description: "Open today's advertiser in your browser to support free-pi.",
-        handler: (_args, ctx) => openAdvertiser(opts, ctx)
-      });
       pi.registerCommand("invite", {
         description: "Get your invite code and link: you and a friend both get +5k credits/day.",
         handler: (_args, ctx) => showInvite(opts, ctx)
@@ -12254,7 +12329,6 @@ var ALL_COMMANDS = [
   { name: "/usage", description: "credits left today and refill time" },
   { name: "/import", description: "continue a Claude Code or Codex session" },
   { name: "/hive", description: "share this session with friends" },
-  { name: "/support", description: "visit today's advertiser" },
   { name: "/tos", description: "terms of service" },
   { name: "/privacy-policy", description: "privacy policy" },
   { name: "/buy-credits", description: "get more usage" },
@@ -13477,6 +13551,10 @@ function createHiveExtension(opts) {
         roomWaiter = undefined;
       }
       async function start(ctx) {
+        if (opts.isRemoteAttached?.()) {
+          notify("Hive: turn the Telegram remote off first (/remote off).");
+          return;
+        }
         if (ws || starting) {
           notify(roomUrl ? `Hive room: ${roomUrl}` : "Hive: still connecting...");
           return;
@@ -13805,6 +13883,414 @@ ${decision.reason}`, ACTION_DIALOG_MS);
   };
 }
 
+// src/remote.ts
+import { randomUUID as randomUUID2 } from "node:crypto";
+import { basename as basename5 } from "node:path";
+
+// ../shared/src/remote.ts
+var REMOTE_MAX_TITLE_CHARS = 80;
+var REMOTE_MAX_COMMAND_CHARS = 2000;
+var IdSchema = string2().min(1).max(64);
+var RemoteChoiceSchema = _enum(["once", "turn", "deny"]);
+var RemoteSessionFrameSchema = discriminatedUnion("type", [
+  HiveAuthFrameSchema,
+  object({ type: literal("hello"), session_id: IdSchema, title: string2().max(REMOTE_MAX_TITLE_CHARS) }),
+  object({ type: literal("entry"), entry: HiveEntrySchema }),
+  object({ type: literal("busy"), settled: boolean2() }),
+  object({ type: literal("prompt_result"), prompt_id: IdSchema, accepted: boolean2(), reason: string2().max(100).optional() }),
+  object({ type: literal("question"), id: IdSchema, text: string2().max(500), command: string2().max(REMOTE_MAX_COMMAND_CHARS) }),
+  object({ type: literal("question_closed"), id: IdSchema })
+]);
+var RemoteServerFrameSchema = discriminatedUnion("type", [
+  object({ type: literal("ready"), linked: boolean2(), link_url: string2().optional() }),
+  object({ type: literal("prompt"), prompt_id: IdSchema, text: string2().min(1).max(HIVE_MAX_PROMPT_CHARS) }),
+  object({ type: literal("answer"), question_id: IdSchema, choice: RemoteChoiceSchema }),
+  object({ type: literal("stop") }),
+  object({ type: literal("error"), code: string2() }),
+  object({ type: literal("closed"), reason: string2() })
+]);
+var RemoteLinkCodeResponseSchema = object({ url: string2(), expires_at: string2() });
+var RemoteLinkStatusSchema = object({ linked: boolean2() });
+
+// src/remote.ts
+var OPEN2 = 1;
+var MCP_RESOURCE_TOOLS3 = ["list_mcp_resources", "list_mcp_resource_templates", "read_mcp_resource"];
+var HARD_BLOCKED = new Set([SUBAGENT_TOOL, SEND_MESSAGE_TOOL, BUY_TOOL_NAME]);
+function wsUrl2(baseUrl) {
+  const url = new URL("/remote/ws", baseUrl);
+  url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
+  return url.toString();
+}
+function createRemoteExtension(opts) {
+  return {
+    name: "free-pi-remote",
+    factory(pi) {
+      let ws;
+      let ctxRef;
+      let attachedCwd = "";
+      let title = "";
+      let settled = true;
+      let compacting = false;
+      let allowTurn = false;
+      let localDetach = false;
+      let reconnectAttempt = 0;
+      let reconnectTimer;
+      let injectTimer;
+      let questionChain = Promise.resolve();
+      let openQuestion;
+      const notify = (message, type = "info") => ctxRef?.ui.notify(message, type);
+      const send = (frame) => {
+        if (ws?.readyState === OPEN2)
+          ws.send(JSON.stringify(frame));
+      };
+      const sendEntry = (entry) => send({ type: "entry", entry });
+      function setSettled(next) {
+        if (settled === next)
+          return;
+        settled = next;
+        send({ type: "busy", settled });
+      }
+      function finishQuestion(choice, reason) {
+        const question = openQuestion;
+        if (!question)
+          return;
+        openQuestion = undefined;
+        question.finish(choice, reason);
+        if (choice === undefined)
+          send({ type: "question_closed", id: question.id });
+      }
+      function cancelQuestion(reason) {
+        finishQuestion(undefined, reason);
+      }
+      function clearRemoteState(reason = "turn ended") {
+        opts.state.remoteTurn = false;
+        allowTurn = false;
+        cancelQuestion(reason);
+      }
+      function endApprovals(reason) {
+        allowTurn = false;
+        cancelQuestion(reason);
+      }
+      function recoverRejectedPrompt() {
+        setSettled(true);
+        clearRemoteState();
+      }
+      function clearSocket() {
+        const old = ws;
+        ws = undefined;
+        clearTimeout(reconnectTimer);
+        reconnectTimer = undefined;
+        ctxRef?.ui.setStatus("remote", undefined);
+        cancelQuestion("disconnected");
+        try {
+          old?.close();
+        } catch {}
+      }
+      function detach(notice) {
+        localDetach = true;
+        opts.state.attached = false;
+        endApprovals("detached");
+        clearSocket();
+        attachedCwd = "";
+        reconnectAttempt = 0;
+        if (notice)
+          notify(notice);
+      }
+      function questionFor(event, ctx) {
+        const toolName = String(event.toolName);
+        const input = event.input ?? {};
+        const summary = toolName === "bash" ? String(input.command ?? "") : toolName + " " + JSON.stringify(input);
+        const command = summary.slice(0, 2000);
+        const run = async () => {
+          if (!opts.state.remoteTurn)
+            return { block: true, reason: "Remote: turn ended before approval" };
+          if (allowTurn)
+            return;
+          if (ws?.readyState !== OPEN2)
+            return { block: true, reason: "Remote: disconnected before approval" };
+          const id = randomUUID2();
+          let timer;
+          let abortListener;
+          const answer = await new Promise((resolve) => {
+            openQuestion = {
+              id,
+              finish: (choice, reason) => {
+                clearTimeout(timer);
+                if (abortListener && ctx.signal)
+                  ctx.signal.removeEventListener("abort", abortListener);
+                resolve({ choice, reason });
+              }
+            };
+            const timeoutMs = opts.questionTimeoutMs ?? 5 * 60000;
+            timer = setTimeout(() => finishQuestion(undefined, "timed out"), timeoutMs);
+            timer.unref?.();
+            abortListener = () => finishQuestion(undefined, "turn aborted");
+            if (ctx.signal?.aborted)
+              abortListener();
+            else
+              ctx.signal?.addEventListener("abort", abortListener, { once: true });
+            send({ type: "question", id, text: "The agent wants to run this:", command });
+          });
+          if (answer.choice === "deny")
+            return { block: true, reason: "Remote: denied from Telegram" };
+          if (answer.choice === "turn")
+            allowTurn = true;
+          if (answer.choice === "once" || answer.choice === "turn")
+            return;
+          const why = answer.reason ?? "approval ended";
+          return { block: true, reason: "Remote: " + why };
+        };
+        const current = questionChain.then(run, run);
+        questionChain = current.catch(() => {
+          return;
+        });
+        return current;
+      }
+      function handle(frame) {
+        switch (frame.type) {
+          case "ready":
+            if (!frame.linked && frame.link_url) {
+              notify("Remote: open this link in Telegram to connect your account: " + frame.link_url);
+            } else if (frame.linked) {
+              notify("Remote is on. Messages you send to the free-pi bot in Telegram go to this session.");
+            }
+            ctxRef?.ui.setStatus("remote", "remote: on");
+            reconnectAttempt = 0;
+            if (!settled)
+              send({ type: "busy", settled: false });
+            break;
+          case "prompt": {
+            if (!settled || compacting) {
+              send({ type: "prompt_result", prompt_id: frame.prompt_id, accepted: false, reason: "busy" });
+              break;
+            }
+            opts.state.remoteTurn = true;
+            allowTurn = false;
+            setSettled(false);
+            clearTimeout(injectTimer);
+            injectTimer = setTimeout(() => {
+              injectTimer = undefined;
+              if (ctxRef?.isIdle() !== false)
+                recoverRejectedPrompt();
+            }, opts.injectGraceMs ?? 2000);
+            injectTimer.unref?.();
+            try {
+              Promise.resolve(pi.sendUserMessage(frame.text, { expandPromptTemplates: false })).catch(recoverRejectedPrompt);
+              send({ type: "prompt_result", prompt_id: frame.prompt_id, accepted: true });
+            } catch {
+              recoverRejectedPrompt();
+              send({ type: "prompt_result", prompt_id: frame.prompt_id, accepted: false, reason: "error" });
+            }
+            break;
+          }
+          case "answer":
+            if (openQuestion?.id === frame.question_id)
+              finishQuestion(frame.choice);
+            break;
+          case "stop":
+            cancelQuestion("stopped");
+            if (!settled)
+              ctxRef?.abort();
+            break;
+          case "closed":
+            if (frame.reason === "shutdown")
+              break;
+            detach(frame.reason === "replaced" ? "Remote moved to another session." : "Remote closed.");
+            break;
+          case "error":
+            notify("Remote: the server could not process the connection.", "warning");
+            break;
+        }
+      }
+      function connect() {
+        let socket;
+        try {
+          const Impl = opts.WebSocketImpl ?? WebSocket;
+          socket = new Impl(wsUrl2(opts.baseUrl));
+        } catch {
+          retryConnect();
+          return;
+        }
+        ws = socket;
+        localDetach = false;
+        socket.onopen = async () => {
+          if (ws !== socket)
+            return;
+          try {
+            const token = await opts.getToken();
+            if (ws !== socket)
+              return;
+            socket.send(JSON.stringify({ type: "auth", token }));
+            socket.send(JSON.stringify({ type: "hello", session_id: opts.sessionId, title }));
+          } catch {
+            socket.close();
+          }
+        };
+        socket.onerror = () => {
+          if (ws === socket)
+            socket.close();
+        };
+        socket.onclose = () => {
+          if (ws !== socket)
+            return;
+          ws = undefined;
+          ctxRef?.ui.setStatus("remote", undefined);
+          cancelQuestion("disconnected");
+          if (!localDetach)
+            retryConnect();
+        };
+        socket.onmessage = (event) => {
+          if (ws !== socket || typeof event.data !== "string")
+            return;
+          let json;
+          try {
+            json = JSON.parse(event.data);
+          } catch {
+            return;
+          }
+          const parsed = RemoteServerFrameSchema.safeParse(json);
+          if (parsed.success)
+            handle(parsed.data);
+        };
+      }
+      function retryConnect() {
+        if (localDetach)
+          return;
+        const delays = opts.reconnectDelaysMs ?? [1000, 2000, 5000, 15000, 30000];
+        if (reconnectAttempt >= delays.length) {
+          localDetach = true;
+          opts.state.attached = false;
+          endApprovals("disconnected");
+          notify("Remote: lost the connection. Run /remote to attach again.", "warning");
+          return;
+        }
+        const delay = delays[reconnectAttempt++];
+        reconnectTimer = setTimeout(() => {
+          reconnectTimer = undefined;
+          connect();
+        }, delay);
+        reconnectTimer.unref?.();
+      }
+      function attach(ctx) {
+        if (ws || reconnectTimer) {
+          notify("Remote is already attached.");
+          return;
+        }
+        ctxRef = ctx;
+        if (opts.isHiveOpen?.()) {
+          notify("Remote: end the Hive room first (/hive end).");
+          return;
+        }
+        opts.state.attached = true;
+        attachedCwd = ctx.cwd;
+        title = basename5(ctx.cwd).slice(0, 80);
+        settled = ctx.isIdle();
+        compacting = false;
+        localDetach = false;
+        reconnectAttempt = 0;
+        connect();
+      }
+      pi.on("tool_call", (event, ctx) => {
+        if (!opts.state.remoteTurn)
+          return;
+        ctxRef = ctx;
+        if (HARD_BLOCKED.has(event.toolName)) {
+          return { block: true, reason: "Remote: this tool is not run for a prompt sent from Telegram" };
+        }
+        const needsApproval = event.toolName === "bash" || event.toolName.startsWith("mcp__") || MCP_RESOURCE_TOOLS3.includes(event.toolName) || Boolean(event.parentToolCallId);
+        return needsApproval ? questionFor(event, ctx) : undefined;
+      });
+      pi.on("agent_start", () => {
+        clearTimeout(injectTimer);
+        injectTimer = undefined;
+        setSettled(false);
+      });
+      pi.on("agent_settled", () => {
+        setSettled(true);
+        clearRemoteState();
+        sendEntry({ kind: "settled" });
+      });
+      pi.on("session_before_compact", (_event, ctx) => {
+        ctxRef = ctx;
+        compacting = true;
+        setSettled(false);
+      });
+      const compactionEnded = (_event, ctx) => {
+        ctxRef = ctx;
+        compacting = false;
+        if (ctx.isIdle())
+          setSettled(true);
+      };
+      pi.on("session_compact", compactionEnded);
+      pi.on("session_compact_failed", compactionEnded);
+      pi.on("session_start", (_event, ctx) => {
+        ctxRef = ctx;
+        if (attachedCwd && ctx.cwd !== attachedCwd)
+          detach();
+      });
+      pi.on("session_before_switch", () => detach());
+      pi.on("session_shutdown", () => detach());
+      pi.on("input", (event) => {
+        if (event.source !== "extension")
+          sendEntry({ kind: "prompt", text: event.text.slice(0, HIVE_MAX_PROMPT_CHARS) });
+        return { action: "continue" };
+      });
+      pi.on("message_end", (event) => {
+        const message = event.message;
+        if (message.role !== "assistant" || !Array.isArray(message.content))
+          return;
+        const text = message.content.map((part) => part.type === "text" && typeof part.text === "string" ? part.text : "").join("");
+        for (let i = 0;i < text.length; i += HIVE_MAX_ASSISTANT_CHARS) {
+          sendEntry({ kind: "assistant", text: text.slice(i, i + HIVE_MAX_ASSISTANT_CHARS) });
+        }
+      });
+      pi.on("tool_execution_end", (event) => {
+        sendEntry({ kind: "tool", name: event.toolName, is_error: event.isError });
+      });
+      if (process.env.FREEPI_REMOTE === "1") {
+        pi.registerCommand("remote", {
+          description: "Attach this session to Telegram: /remote, /remote off, /remote unlink",
+          handler: async (args, ctx) => {
+            ctxRef = ctx;
+            const sub = args.trim().toLowerCase();
+            if (sub === "")
+              return attach(ctx);
+            if (sub === "off") {
+              detach();
+              notify("Remote is off.");
+              return;
+            }
+            if (sub === "unlink") {
+              allowTurn = false;
+              cancelQuestion("unlinked");
+              const token = await opts.getToken().catch(() => {
+                return;
+              });
+              if (!token) {
+                notify("Remote: couldn't read your free-pi login.", "error");
+                return;
+              }
+              try {
+                const response = await (opts.fetchImpl ?? fetch)(opts.baseUrl + "/remote/link", {
+                  method: "DELETE",
+                  headers: { authorization: "Bearer " + token }
+                });
+                if (response.ok)
+                  detach();
+                notify(response.ok ? "Remote account unlinked." : "Remote: couldn't unlink the account.", response.ok ? "info" : "warning");
+              } catch {
+                notify("Remote: couldn't unlink the account.", "warning");
+              }
+              return;
+            }
+            notify("Usage: /remote, /remote off, or /remote unlink.");
+          }
+        });
+      }
+    }
+  };
+}
+
 // src/shell-sandbox.ts
 import { spawnSync } from "node:child_process";
 import {
@@ -14765,7 +15251,6 @@ function buildRuntimeOptions(opts, sessionId) {
     name: "free-pi-provider",
     factory: (pi) => registerProviders(pi, sessionId)
   };
-  let advertiserUrl;
   const adsExtension = createAdsExtension({
     registerMeterRefresh: (refresh) => auth.setOnSignedIn(() => void refresh().catch(() => {})),
     baseUrl: opts.baseUrl,
@@ -14773,9 +15258,7 @@ function buildRuntimeOptions(opts, sessionId) {
     sessionId,
     clientVersion: CLI_VERSION,
     getGravityContext: opts.getGravityContext,
-    onBannerAd: (u) => {
-      advertiserUrl = u;
-    },
+    adContext: opts.adContext,
     onMe: (me) => {
       updateAllowanceCache(me);
     }
@@ -14829,7 +15312,6 @@ function buildRuntimeOptions(opts, sessionId) {
   const commandsExtension = createFreePiCommandsExtension({
     baseUrl: opts.baseUrl,
     getToken: () => auth.getJwt(),
-    getAdvertiserUrl: () => advertiserUrl,
     credentialsPath: opts.credentialsPath,
     agentDir: opts.agentDir,
     isGuest: () => auth.isGuest(),
@@ -14860,12 +15342,21 @@ function buildRuntimeOptions(opts, sessionId) {
   const codemodeExtension = { name: "pi-codemode", factory: createCodemodeExtension({ models: false }) };
   const toolSearchExtension = { name: "pi-tool-search", factory: createToolSearchExtension() };
   const hiveRoom = { open: false };
+  const remoteState = { remoteTurn: false, attached: false };
   const hiveExtension = createHiveExtension({
     baseUrl: opts.baseUrl,
     getToken: () => auth.getJwt(),
     knownTools: allowedTools,
     sandbox: shellSandbox,
-    roomState: hiveRoom
+    roomState: hiveRoom,
+    isRemoteAttached: () => remoteState.attached
+  });
+  const remoteExtension = createRemoteExtension({
+    baseUrl: opts.baseUrl,
+    getToken: async () => auth.getJwt(),
+    sessionId,
+    state: remoteState,
+    isHiveOpen: () => hiveRoom.open
   });
   const choiceExtension = choiceOn ? createChoiceToolExtension({
     baseUrl: opts.baseUrl,
@@ -14873,7 +15364,7 @@ function buildRuntimeOptions(opts, sessionId) {
     sessionId,
     arm: () => opts.choiceArm ?? null,
     headless: !(tty.stdin && tty.stdout),
-    isRoomOpen: () => hiveRoom.open
+    isRoomOpen: () => hiveRoom.open || remoteState.remoteTurn
   }) : undefined;
   const subagentsExtension = createSubagentsExtension({
     sessionId,
@@ -14918,6 +15409,7 @@ function buildRuntimeOptions(opts, sessionId) {
     toolSearchExtension,
     subagentsExtension,
     hiveExtension,
+    remoteExtension,
     ...guestLoginExtension ? [guestLoginExtension] : [],
     ...opts.guest ? [createGuestNotesExtension({ isGuest: () => auth.isGuest() })] : []
   ];
@@ -15743,6 +16235,7 @@ Couldn't finish GitHub sign-in. Continuing as a guest.
       getGravityContext = deps.startGravityPixel?.(jwt);
     } catch {}
   }
+  const adContext = consentCurrent && process.env.FREEPI_NO_GRAVITY_PIXEL !== "1" ? { redact: redactSecrets } : undefined;
   if (me)
     updateAllowanceCache(me);
   guestHandoffVariant = me?.experiments?.guest_handoff ?? guestHandoffVariant;
@@ -15868,6 +16361,7 @@ ${r.text}
     costArm: versionCheck.costArm,
     updateLatest,
     getGravityContext,
+    adContext,
     guest: Boolean(me?.guest),
     refillCard: refillSession,
     allowanceLine: allowanceLine(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "free-pi-cli",
-  "version": "0.6.20",
+  "version": "0.6.21",
   "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",