free-pi-cli 0.6.19 → 0.6.21

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

@@ -2,9 +2,9 @@
 
 // src/main.ts
 import { spawn as spawn4 } from "node:child_process";
-import { realpathSync as realpathSync8, writeFileSync as writeFileSync6 } from "node:fs";
+import { realpathSync as realpathSync8, writeFileSync as writeFileSync7 } from "node:fs";
 import { homedir as homedir10 } from "node:os";
-import { dirname as dirname14, join as join15 } from "node:path";
+import { dirname as dirname15, join as join16 } from "node:path";
 
 // src/browser.ts
 import { spawn } from "node:child_process";
@@ -515,7 +515,7 @@ function folderMatches(cwd, sessionCwd) {
 // package.json
 var package_default = {
   name: "free-pi-cli",
-  version: "0.6.19",
+  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",
@@ -554,6 +554,7 @@ var package_default = {
     prepublishOnly: "bun run build"
   },
   dependencies: {
+    "@earendil-works/pi-ai": "1.2.0",
     "@earendil-works/pi-coding-agent": "1.2.0",
     "@earendil-works/pi-tui": "1.2.0",
     "@gravity-ai/api": "1.2.1"
@@ -569,7 +570,7 @@ var package_default = {
 var CLI_VERSION = package_default.version;
 
 // src/output-limit.ts
-var MAX_OUTPUT_TOKENS = 8192;
+var MAX_OUTPUT_TOKENS = 32768;
 var OUTPUT_LIMIT_MESSAGE = "This tool call was cut off by the output limit before it finished. It either did not run or ran with incomplete content, " + "so a file may be partly written. Check what was written, then redo the work in smaller parts " + "(for example write the first part, then add the rest with edit).";
 function createOutputLimitExtension() {
   let truncated = new Set;
@@ -6020,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(),
@@ -6583,14 +6586,15 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 function piMcpCliPath() {
   return join4(dirname5(fileURLToPath(import.meta.resolve("@earendil-works/pi-coding-agent"))), "extensions", "mcp", "cli.js");
 }
+var MCP_UNAVAILABLE = "free-pi-cli mcp isn't available in this install. Reinstall with npx free-pi-cli@latest.";
 async function loadPiRunner() {
   const path = piMcpCliPath();
   if (!existsSync2(path)) {
-    throw new Error(`free-pi-cli mcp is unavailable: the bundled pi package has no ${path}. Reinstall free-pi-cli.`);
+    throw new Error(MCP_UNAVAILABLE);
   }
   const mod = await import(pathToFileURL(path).href);
   if (typeof mod.runMcpCommand !== "function") {
-    throw new Error(`free-pi-cli mcp is unavailable: ${path} does not export runMcpCommand. Reinstall free-pi-cli.`);
+    throw new Error(MCP_UNAVAILABLE);
   }
   return mod.runMcpCommand;
 }
@@ -6608,7 +6612,9 @@ async function runFreePiMcp(args, deps) {
       error: (line) => deps.error(brandMcpLine(line))
     });
   } catch (err) {
-    deps.error(err instanceof Error ? err.message : String(err));
+    const msg = (err instanceof Error ? err.message : String(err)).split(`
+    at `)[0];
+    deps.error(msg === MCP_UNAVAILABLE ? msg : `free-pi-cli mcp failed: ${msg}`);
     return 1;
   }
 }
@@ -6763,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)
@@ -6782,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();
@@ -6884,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) {
@@ -6943,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";
@@ -7161,6 +7215,7 @@ function createAdsExtension(opts) {
     clientVersion: opts.clientVersion,
     fetchImpl: opts.fetchImpl,
     getGravityContext: opts.getGravityContext,
+    adContext: opts.adContext,
     onMe: opts.onMe
   };
   const config = loadConfig();
@@ -7176,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();
@@ -7207,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(() => {
@@ -7217,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) => {
@@ -7243,7 +7298,7 @@ function createAdsExtension(opts) {
 }
 
 // src/pi-launch.ts
-import { dirname as dirname11, join as join11, resolve as resolve4 } from "node:path";
+import { dirname as dirname12, join as join12, resolve as resolve4 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 
 // ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/system/memory/metrics.mjs
@@ -7573,6 +7628,28 @@ var integerKeyPattern = new RegExp("^(?:0|[1-9][0-9]*)$");
 
 // ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/engine/indexed/from_object.mjs
 var NumericKeyPattern = new RegExp(IntegerKey);
+// src/friendly-error.ts
+function friendlyThrown(e) {
+  const name = e instanceof Error ? e.name : "";
+  if (name === "TimeoutError")
+    return "free-pi took too long to answer. Try again.";
+  if (name === "AbortError")
+    return "Cancelled.";
+  if (name === "SyntaxError")
+    return "free-pi sent an unexpected reply. Try again.";
+  return "Couldn't reach free-pi — check your connection.";
+}
+function friendlyStatus(status, audience = "user", message) {
+  if (status === 401) {
+    return audience === "model" ? "The user's free-pi sign-in has expired; tell them to run /login." : "Your free-pi sign-in has expired. Run /login.";
+  }
+  if (message?.trim())
+    return message.trim();
+  if (status >= 500)
+    return `free-pi is having trouble right now (HTTP ${status}). Try again in a minute.`;
+  return `free-pi could not complete the request (HTTP ${status}).`;
+}
+
 // src/usage-tool.ts
 var USAGE_TOOL_NAME = "free_pi_usage";
 var PARAMS = _Object_({});
@@ -7630,11 +7707,11 @@ async function fetchUsageText(opts) {
       signal: AbortSignal.timeout(5000)
     });
     if (!res.ok)
-      return { ok: false, text: `Could not fetch usage (HTTP ${res.status}).` };
+      return { ok: false, text: friendlyStatus(res.status) };
     const stats = await res.json();
     return { ok: true, text: formatStats(stats), stats };
   } catch (err) {
-    return { ok: false, text: `Could not fetch usage: ${String(err)}` };
+    return { ok: false, text: friendlyThrown(err) };
   }
 }
 function createUsageToolExtension(opts) {
@@ -7702,11 +7779,9 @@ async function post(opts, body, signal) {
     const mapped = ERROR_TEXT[code];
     if (mapped)
       return { ok: false, text: mapped };
-    return { ok: false, text: `Request failed (HTTP ${res.status}): ${j.error?.message ?? j.message ?? "no message"}` };
+    return { ok: false, text: friendlyStatus(res.status, "model", j.error?.message ?? j.message) };
   } catch (e) {
-    if (e instanceof Error && e.name === "TimeoutError")
-      return { ok: false, text: "Image generation timed out after 120 seconds." };
-    return { ok: false, text: `Request failed: ${String(e)}` };
+    return { ok: false, text: friendlyThrown(e) };
   }
 }
 function slug(s) {
@@ -7783,7 +7858,8 @@ function createImageToolExtension(opts) {
               await fh.close();
             }
           } catch (e) {
-            return fail(`Could not save the image: ${String(e)}`);
+            const why = { EACCES: "permission denied", EPERM: "permission denied", ENOSPC: "the disk is full", ENOENT: "the folder does not exist" }[e.code ?? ""] ?? "it could not be written";
+            return fail(`Couldn't save the image to images: ${why}.`);
           }
           return done(`Saved image to ${rel} (${ext}, ${buf.length} bytes). You cannot see the image; reference this path in your answer or code, and tell the user you could not check how it looks.`, { ok: true, path: rel, cost_usd: d.cost_usd, model: d.model });
         }
@@ -8392,11 +8468,9 @@ async function post2(opts, path, body, label, signal) {
     const mapped = ERROR_TEXT3[err.code ?? ""];
     if (mapped)
       return { ok: false, text: typeof mapped === "function" ? mapped(label) : mapped };
-    return { ok: false, text: `Request failed (HTTP ${res.status}): ${err.message ?? "no message"}` };
+    return { ok: false, text: friendlyStatus(res.status, "model", err.message) };
   } catch (e) {
-    if (e instanceof Error && e.name === "TimeoutError")
-      return { ok: false, text: "Request timed out after 30 seconds." };
-    return { ok: false, text: `Request failed: ${String(e)}` };
+    return { ok: false, text: friendlyThrown(e) };
   }
 }
 var done3 = (o) => ({ content: [{ type: "text", text: o.text }], details: o.details });
@@ -8465,11 +8539,11 @@ async function resolveBuyPage(opts) {
       signal: AbortSignal.timeout(5000)
     });
     if (!res.ok)
-      return { kind: "error", text: `Could not fetch the buy page (HTTP ${res.status}).` };
+      return { kind: "error", text: friendlyStatus(res.status) };
     const me = await res.json();
     return me.buy_url ? { kind: "url", url: me.buy_url } : { kind: "unavailable" };
   } catch (err) {
-    return { kind: "error", text: `Could not fetch the buy page: ${String(err)}` };
+    return { kind: "error", text: friendlyThrown(err) };
   }
 }
 var BUY_NOT_AVAILABLE_TEXT = "Buying credits is not available on this server yet.";
@@ -8549,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
@@ -8585,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
 `;
 
@@ -8980,6 +9050,142 @@ function createToolAliasesExtension(opts = {}) {
   };
 }
 
+// ../../node_modules/.bun/@earendil-works+pi-ai@1.2.0+a410056ef8f430f0/node_modules/@earendil-works/pi-ai/dist/utils/overflow.js
+var OVERFLOW_PATTERNS = [
+  /prompt (?:is )?too long/i,
+  /prompt exceeds max length/i,
+  /request_too_large/i,
+  /input is too long for requested model/i,
+  /exceeds the context window/i,
+  /exceeds (?:the )?(?:model'?s )?maximum context length(?: of [\d,]+ tokens?|\s*\([\d,]+\))/i,
+  /input token count.*exceeds the maximum/i,
+  /maximum prompt length is \d+/i,
+  /reduce the length of the messages/i,
+  /maximum context length is \d+ tokens/i,
+  /exceeds (?:the )?maximum allowed input length of [\d,]+ tokens?/i,
+  /input \(\d+ tokens\) is longer than the model'?s context length \(\d+ tokens\)/i,
+  /exceeds the limit of \d+/i,
+  /exceeds the available context size/i,
+  /greater than the context length/i,
+  /context window exceeds limit/i,
+  /exceeded model token limit/i,
+  /too large for model with \d+ maximum context length/i,
+  /prompt has [\d,]+ tokens?, but the configured context size is [\d,]+ tokens?/i,
+  /model_context_window_exceeded/i,
+  /prompt too long; exceeded (?:max )?context length/i,
+  /range of input length should be/i,
+  /context[_ ]length[_ ]exceeded/i,
+  /too many tokens/i,
+  /token limit exceeded/i
+];
+var CEREBRAS_BODYLESS_OVERFLOW_PATTERN = /^4(?:00|13)\s*(?:status code)?\s*\(no body\)/i;
+var NON_OVERFLOW_PATTERNS = [
+  /^(Throttling error|Service unavailable):/i,
+  /rate limit/i,
+  /too many requests/i
+];
+function isContextOverflow(message, contextWindow) {
+  if (message.stopReason === "error" && message.errorMessage) {
+    const isNonOverflow = NON_OVERFLOW_PATTERNS.some((p) => p.test(message.errorMessage));
+    if (!isNonOverflow) {
+      if (OVERFLOW_PATTERNS.some((p) => p.test(message.errorMessage))) {
+        return true;
+      }
+      if (message.provider === "cerebras" && CEREBRAS_BODYLESS_OVERFLOW_PATTERN.test(message.errorMessage)) {
+        return true;
+      }
+    }
+  }
+  if (contextWindow && message.stopReason === "stop") {
+    const inputTokens = message.usage.input + message.usage.cacheRead;
+    if (inputTokens > contextWindow) {
+      return true;
+    }
+  }
+  if (contextWindow && message.stopReason === "length" && message.usage.output === 0) {
+    const inputTokens = message.usage.input + message.usage.cacheRead;
+    if (inputTokens >= contextWindow * 0.99) {
+      return true;
+    }
+  }
+  return false;
+}
+
+// ../../node_modules/.bun/@earendil-works+pi-ai@1.2.0+a410056ef8f430f0/node_modules/@earendil-works/pi-ai/dist/utils/retry.js
+function buildProviderErrorPattern(patterns) {
+  return new RegExp(patterns.join("|"), "i");
+}
+var NON_RETRYABLE_PROVIDER_LIMIT_ERROR_PATTERN = buildProviderErrorPattern([
+  "GoUsageLimitError",
+  "FreeUsageLimitError",
+  "Monthly usage limit reached",
+  "available balance",
+  "insufficient_quota",
+  "out of budget",
+  "quota exceeded",
+  "billing",
+  "subscription_sharing_usage_limit_exceeded"
+]);
+var RETRYABLE_PROVIDER_ERROR_PATTERN = buildProviderErrorPattern([
+  "overloaded",
+  "server_busy",
+  "servers are currently busy",
+  "currently experiencing high demand",
+  "model is at capacity",
+  "rate.?limit",
+  "too many requests",
+  "429",
+  "500",
+  "502",
+  "503",
+  "504",
+  "520",
+  "524",
+  "service.?unavailable",
+  "server.?error",
+  "internal.?error",
+  "provider.?returned.?(?:an.?)?error",
+  "exceeded request buffer limit while retrying upstream",
+  "network.?error",
+  "connection.?error",
+  "connection.?refused",
+  "connection.?lost",
+  "other side closed",
+  "fetch failed",
+  "getaddrinfo",
+  "ENOTFOUND",
+  "EAI_AGAIN",
+  "upstream.?connect",
+  "reset before headers",
+  "socket hang up",
+  "socket connection was closed",
+  "timed? out",
+  "timeout",
+  "terminated",
+  "websocket.?closed",
+  "websocket.?error",
+  "ended without",
+  "stream ended before message_stop",
+  "stream ended before a terminal response event",
+  "http2 request did not get a response",
+  "pending stream has been canceled",
+  "retry delay",
+  "you can retry your request",
+  "try your request again",
+  "please retry your request",
+  "ResourceExhausted",
+  "subscription_sharing_usage_unavailable",
+  "subscription_sharing_user_unavailable"
+]);
+function isRetryableAssistantError(message) {
+  if (message.stopReason !== "error" || !message.errorMessage)
+    return false;
+  const errorMessage = message.errorMessage;
+  if (NON_RETRYABLE_PROVIDER_LIMIT_ERROR_PATTERN.test(errorMessage))
+    return false;
+  return RETRYABLE_PROVIDER_ERROR_PATTERN.test(errorMessage);
+}
+
 // src/fusion.ts
 var FUSION_ID = "fusion";
 var FUSION_PICKER_ID = "\uD83E\uDDE8 fusion";
@@ -9175,7 +9381,11 @@ function createFusionExtension(defaultModelId, ids = resolveFusionIds([])) {
 
 // src/error-notice.ts
 var UPSTREAM_ERROR_FRAME_MESSAGE = "upstream returned an error frame";
+var PREMIUM_MODEL_NOTICE = "This model needs premium credits. Get some with /buy-credits, or switch to another model with /model.";
 var PROVIDER_FAILING_NOTICE = "This model's provider is failing right now. Try again in a moment, or switch models with /model.";
+var SIGNIN_EXPIRED_NOTICE = "Your free-pi sign-in has expired. Run /login, or restart free-pi-cli.";
+var CONNECTION_NOTICE = "Can't reach free-pi right now (connection error). Check your internet connection.";
+var CONTENT_FILTER_NOTICE = "The model's reply was blocked by a content filter. Try rephrasing your request.";
 var FREE_OFFER_TITLE = "Switch to the free model and resend this prompt?";
 var FREE_OFFER_ACCEPT = "Switch and resend";
 var FREE_OFFER_DECLINE = "Stay on this model";
@@ -9235,6 +9445,8 @@ function parseErrorEnvelope(errorMessage) {
   }
 }
 function formatLimitEnvelope(env, opts) {
+  if (env.code === "model_requires_credits" && !/premium credit/i.test(env.message))
+    return PREMIUM_MODEL_NOTICE;
   if (env.code === "concurrent_session" || SERVER_MESSAGE_CODES.has(env.code) || env.prompt === "github_signin" || env.copy_variant === "treatment" || typeof env.remaining_credits_today !== "number") {
     return env.message;
   }
@@ -9280,6 +9492,36 @@ function lastUserEntryId(ctx) {
   }
   return "";
 }
+var RAW_ERROR_FIELD = "freePiRawError";
+function rawErrorMessage(msg) {
+  if (!msg)
+    return;
+  const m = msg;
+  return typeof m[RAW_ERROR_FIELD] === "string" ? m[RAW_ERROR_FIELD] : m.errorMessage;
+}
+function envelopeOf(raw) {
+  return raw === UPSTREAM_ERROR_FRAME_MESSAGE ? { status: 502, code: "upstream_error", message: UPSTREAM_ERROR_FRAME_MESSAGE } : parseErrorEnvelope(raw);
+}
+var friendlyText = (env, timeZone) => env.code === "upstream_error" ? PROVIDER_FAILING_NOTICE : env.code === "unauthorized" ? SIGNIN_EXPIRED_NOTICE : formatLimitEnvelope(env, { timeZone });
+var isFreePiProvider = (provider) => provider === PROVIDER_NAME || provider === DEFENSE_PROVIDER_NAME;
+function friendlyRawText(raw) {
+  const text = raw.trim();
+  if (/^(?:connection error\.?|request timed out\.?|terminated|fetch failed)$/i.test(text))
+    return CONNECTION_NOTICE;
+  const http = /^(5\d\d)(?: status code \(no body\)$|\s*<(?:!doctype html|html)\b)/i.exec(text);
+  if (http)
+    return `${PROVIDER_FAILING_NOTICE} (HTTP ${http[1]})`;
+  const finish = /^Provider finish_reason: (\w+)$/.exec(text);
+  if (finish)
+    return finish[1] === "content_filter" ? CONTENT_FILTER_NOTICE : `${PROVIDER_FAILING_NOTICE} (${finish[1].replace(/_/g, " ")})`;
+  return;
+}
+function friendlyError(raw, timeZone) {
+  if (typeof raw !== "string")
+    return;
+  const env = envelopeOf(raw);
+  return env ? friendlyText(env, timeZone) : friendlyRawText(raw);
+}
 function createErrorNoticeExtension(opts = {}) {
   const lastAt = new Map;
   const now = opts.now ?? Date.now;
@@ -9312,21 +9554,44 @@ function createErrorNoticeExtension(opts = {}) {
   return {
     name: "free-pi-error-notice",
     factory(pi) {
+      pi.on("message_end", (event) => {
+        const msg = event.message;
+        if (msg.role !== "assistant" || !isFreePiProvider(msg.provider) || msg.stopReason !== "error" || typeof msg.errorMessage !== "string")
+          return;
+        const env = envelopeOf(msg.errorMessage);
+        const friendly = env ? friendlyText(env, timeZone) : friendlyRawText(msg.errorMessage);
+        if (friendly === undefined)
+          return;
+        const same = (text) => {
+          const next = { ...msg, errorMessage: text };
+          return isRetryableAssistantError(next) === retryable && isContextOverflow(next, 0) === overflow;
+        };
+        const retryable = isRetryableAssistantError(msg);
+        const overflow = isContextOverflow(msg, 0);
+        let text = friendly;
+        if (env && retryable && !isRetryableAssistantError({ ...msg, errorMessage: text }))
+          text += ` (HTTP ${env.status})`;
+        if (!same(text))
+          return;
+        return { message: { ...msg, errorMessage: text, [RAW_ERROR_FIELD]: msg.errorMessage } };
+      });
       pi.on("turn_end", async (event, ctx) => {
         lastTurnEntryId = event.messageEntryId;
         const msg = event.message;
         if (!msg || msg.stopReason !== "error")
           return;
-        const env = msg.errorMessage === UPSTREAM_ERROR_FRAME_MESSAGE ? { status: 502, code: "upstream_error", message: UPSTREAM_ERROR_FRAME_MESSAGE } : parseErrorEnvelope(msg.errorMessage);
+        const env = envelopeOf(rawErrorMessage(msg));
         if (!env)
           return;
         const t = now();
         if (t - (lastAt.get(env.code) ?? -Infinity) >= NOTICE_DEDUPE_MS) {
           lastAt.set(env.code, t);
           const extra = opts.extraNotice?.(env);
-          const text = (env.code === "upstream_error" ? PROVIDER_FAILING_NOTICE : formatLimitEnvelope(env, { timeZone })) + (extra ? `
+          const shown = msg[RAW_ERROR_FIELD] !== undefined;
+          const text = shown ? extra : friendlyText(env, timeZone) + (extra ? `
 ${extra}` : "");
-          ctx.ui.notify(text, LIMIT_CODES.has(env.code) ? "info" : env.status >= 500 ? "error" : "warning");
+          if (text)
+            ctx.ui.notify(text, LIMIT_CODES.has(env.code) ? "info" : env.status >= 500 ? "error" : "warning");
         }
         await offerFreeModel(pi, env, event.messageEntryId, ctx);
       });
@@ -9464,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) {
@@ -9480,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(",")}`;
       });
     }
@@ -9820,6 +10122,20 @@ function installBottomPin(mode) {
     return [...lines, ...Array(bottomPadding(lines.length, other, rows)).fill("")];
   };
 }
+var IMAGE_MARKS = ["\x1B_G", "\x1B]1337;File="];
+function clampLines(lines, width) {
+  return lines.map((l) => IMAGE_MARKS.some((m) => l.includes(m)) || visibleWidth3(l) <= width ? l : truncateToWidth6(l, Math.max(0, width), ""));
+}
+function installWidthGuard(mode) {
+  const m = mode;
+  for (const k of ["headerContainer", "loadedResourcesContainer", "chatContainer", "pendingMessagesContainer", "statusContainer", "widgetContainerAbove", "editorContainer", "widgetContainerBelow", "footerContainer"]) {
+    const c = m[k];
+    if (!c)
+      continue;
+    const render = c.render.bind(c);
+    c.render = (w) => clampLines(render(w), w);
+  }
+}
 
 // src/guest-handoff.ts
 var LOGIN_VALUE_LINE = "sign in free with GitHub: full daily allowance, FREE abliterated DeepSeek, history saved";
@@ -9909,6 +10225,14 @@ 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."]
+  },
   {
     version: "0.6.19",
     highlights: ["The ad banner now refreshes when you send a message, not on a timer."]
@@ -10273,6 +10597,7 @@ function highlightsFor(version) {
 
 // src/commands.ts
 import { access } from "node:fs/promises";
+import { basename as basename3 } from "node:path";
 
 // src/auth-flow.ts
 class UnauthorizedError extends Error {
@@ -10287,13 +10612,23 @@ async function postJson(baseUrl, path, body, extraHeaders = {}) {
     body: JSON.stringify(body)
   });
 }
+var NETWORK_TEXT = "Can't reach free-pi. Check your internet connection and try again.";
+var RATE_LIMIT_TEXT = "Too many sign-in attempts from your network. Wait a minute and try again.";
+var UNEXPECTED_REPLY_TEXT = "free-pi sent an unexpected reply. If you're on public wifi, sign in to the network first, then try again.";
+async function parseReply(res, schema) {
+  try {
+    return schema.parse(await res.json());
+  } catch (err) {
+    throw new Error(UNEXPECTED_REPLY_TEXT, { cause: err });
+  }
+}
 async function postJsonRetry(baseUrl, path, body, attempts = 4, sleep = (ms) => new Promise((r) => setTimeout(r, ms)), extraHeaders = {}) {
   for (let attempt = 1;; attempt++) {
     try {
       return await postJson(baseUrl, path, body, extraHeaders);
     } catch (err) {
       if (attempt >= attempts) {
-        throw new Error(`network unreachable after ${attempts} attempts (${err instanceof Error ? err.message : String(err)})`);
+        throw new Error(NETWORK_TEXT, { cause: err });
       }
       await sleep(1500 * attempt);
     }
@@ -10310,6 +10645,16 @@ function refusalMessage(status, body) {
   }
   return;
 }
+function failureText(status, body) {
+  if (status === 429 || body?.code === "rate_limited" && status < 500)
+    return RATE_LIMIT_TEXT;
+  const refusal = refusalMessage(status, body);
+  if (refusal)
+    return refusal;
+  if (status >= 500)
+    return `free-pi is having trouble right now (HTTP ${status}). Try again in a minute.`;
+  return `free-pi could not complete sign-in (HTTP ${status}). Try again in a minute.`;
+}
 async function readRefusal(res) {
   return await res.json().catch(() => {
     return;
@@ -10318,9 +10663,9 @@ async function readRefusal(res) {
 async function startDeviceFlow(baseUrl) {
   const res = await postJsonRetry(baseUrl, "/auth/github/device", {});
   if (!res.ok) {
-    throw new Error(refusalMessage(res.status, await readRefusal(res)) ?? `device flow start failed: HTTP ${res.status}`);
+    throw new Error(failureText(res.status, await readRefusal(res)));
   }
-  return GithubDeviceResponseSchema.parse(await res.json());
+  return parseReply(res, GithubDeviceResponseSchema);
 }
 async function startConnect(baseUrl, consentVersion, attribution = {}, client = {}) {
   const res = await postJsonRetry(baseUrl, "/auth/connect/start", {
@@ -10330,8 +10675,8 @@ async function startConnect(baseUrl, consentVersion, attribution = {}, client =
     ...attribution.referral_code ? { referral_code: attribution.referral_code } : {}
   }, undefined, undefined, { [SIGNIN_EXP_HEADER]: "1" });
   if (!res.ok)
-    throw new Error(refusalMessage(res.status, await readRefusal(res)) ?? `connect start failed: HTTP ${res.status}`);
-  return ConnectStartResponseSchema.parse(await res.json());
+    throw new Error(failureText(res.status, await readRefusal(res)));
+  return parseReply(res, ConnectStartResponseSchema);
 }
 async function submitConsent(baseUrl, sessionId, consentVersion, attribution = {}) {
   const res = await postJsonRetry(baseUrl, "/auth/consent", {
@@ -10341,7 +10686,7 @@ async function submitConsent(baseUrl, sessionId, consentVersion, attribution = {
     ...attribution.referral_code ? { referral_code: attribution.referral_code } : {}
   });
   if (!res.ok) {
-    throw new Error(refusalMessage(res.status, await readRefusal(res)) ?? `consent submission failed: HTTP ${res.status}`);
+    throw new Error(failureText(res.status, await readRefusal(res)));
   }
 }
 function deviceReport() {
@@ -10374,8 +10719,8 @@ async function startGuestSession(baseUrl, consentVersion, attribution = {}) {
     throw new GuestUnavailableError(body?.reason ?? "disabled");
   }
   if (!res.ok)
-    throw new Error(`guest start failed: HTTP ${res.status}`);
-  const parsed = GuestStartResponseSchema.parse(await res.json());
+    throw new Error(failureText(res.status, await readRefusal(res)));
+  const parsed = await parseReply(res, GuestStartResponseSchema);
   return {
     token: parsed.token,
     allowance_usd: parsed.allowance_usd,
@@ -10455,7 +10800,7 @@ async function pollForToken(baseUrl, sessionId, interval, sleep, opts = {}) {
         throw new PollAbortedError;
       consecutiveNetworkFailures++;
       if (consecutiveNetworkFailures >= 6) {
-        throw new Error(`token poll failed: network unreachable after ${consecutiveNetworkFailures} attempts (${err instanceof Error ? err.message : String(err)})`);
+        throw new Error(NETWORK_TEXT, { cause: err });
       }
       await sleep(Math.max(waitSeconds, 5) * 1000);
       continue;
@@ -10473,9 +10818,9 @@ async function pollForToken(baseUrl, sessionId, interval, sleep, opts = {}) {
         throw new LoginTimeoutError;
       if (isExpiredTokenPoll(body))
         throw new DeviceCodeExpiredError;
-      throw new Error(refusalMessage(res.status, body) ?? `token poll failed: HTTP ${res.status}`);
+      throw new Error(failureText(res.status, body));
     }
-    const parsed = AuthTokenResponseSchema.parse(await res.json());
+    const parsed = await parseReply(res, AuthTokenResponseSchema);
     if (opts.signal?.aborted)
       throw new PollAbortedError;
     if ("token" in parsed)
@@ -11377,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) {
@@ -11449,7 +11785,7 @@ async function runLoginUnguarded(opts, ctx, lead) {
       ctx.ui.notify(LOGIN_DENIED_LINE, "info");
       return false;
     }
-    const reason = err instanceof Error && err.message ? ` (${err.message})` : "";
+    const reason = err instanceof Error && err.message ? `: ${err.message.replace(/\.$/, "")}` : "";
     ctx.ui.notify(`Couldn't finish GitHub sign-in${reason}. Run /login to try again.`, "error");
     return false;
   }
@@ -11467,6 +11803,26 @@ function installLoginHandler(mode, opts) {
     return runLogin(opts, { ui: { notify } });
   };
 }
+var IMPORT_NEXT_STEP = "Run /import again, or start a fresh session.";
+var FS_REASONS = {
+  EACCES: "permission denied",
+  EPERM: "permission denied",
+  ENOENT: "not found",
+  EISDIR: "that is a folder, not a file",
+  EMFILE: "too many files are open",
+  ENOSPC: "the disk is full"
+};
+function friendlyImportError(err, action = "import") {
+  const e = err;
+  const code = typeof e?.code === "string" && /^E[A-Z0-9]+$/.test(e.code) ? e.code : undefined;
+  if (code) {
+    const file = typeof e.path === "string" && e.path ? basename3(e.path) : undefined;
+    const reason = FS_REASONS[code] ?? `error ${code}`;
+    return `Couldn't ${action}${file ? ` ${file}` : ""}: ${reason}. ${IMPORT_NEXT_STEP}`;
+  }
+  const msg = (err instanceof Error ? err.message : String(err)).trim().replace(/[.\s]+$/, "");
+  return `Couldn't ${action}: ${msg || "unknown error"}. ${IMPORT_NEXT_STEP}`;
+}
 function installImportHandler(mode, opts) {
   const m = mode;
   mode.handleImportCommand = async (text) => {
@@ -11489,11 +11845,11 @@ function installImportHandler(mode, opts) {
           for (let waited = 0;m.session.isCompacting && waited < 60000; waited += 100)
             await new Promise((r) => setTimeout(r, 100));
           const options = m.session.isStreaming ? { streamingBehavior: "followUp" } : undefined;
-          m.session.prompt(message, options).catch((err) => m.showError(err instanceof Error ? err.message : String(err)));
+          m.session.prompt(message, options).catch((err) => m.showError(friendlyImportError(err, "send the import")));
         }
       });
     } catch (err) {
-      m.showError(`Couldn't import: ${err instanceof Error ? err.message : String(err)}`);
+      m.showError(friendlyImportError(err));
     }
   };
 }
@@ -11641,7 +11997,7 @@ function createGuestLoginExtension(opts) {
         if (!opts.isGuest?.())
           return;
         const msg = event.message;
-        const envelope = msg?.stopReason === "error" ? parseErrorEnvelope(msg.errorMessage) : undefined;
+        const envelope = msg?.stopReason === "error" ? parseErrorEnvelope(rawErrorMessage(msg)) : undefined;
         if (envelope && (envelope.code === "guest_allowance" || envelope.code === "guest_unavailable" || envelope.prompt === "github_signin")) {
           if (!inFlight && !signedIn) {
             const busy = envelope.code === "guest_allowance" && (envelope.remaining_credits_today ?? 0) > 0;
@@ -11711,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)
@@ -11751,7 +12103,7 @@ import { mkdirSync as mkdirSync2, readFileSync as readFileSync4, writeFileSync a
 import { homedir as homedir4 } from "node:os";
 import { dirname as dirname8 } from "node:path";
 import { ToolExecutionComponent } from "@earendil-works/pi-coding-agent";
-import { Box, Text as Text2, truncateToWidth as truncateToWidth7 } from "@earendil-works/pi-tui";
+import { Box, Text as Text2, truncateToWidth as truncateToWidth7, visibleWidth as visibleWidth4 } from "@earendil-works/pi-tui";
 var TOOL_MODES = ["compact", "full", "hidden"];
 var TOOLS_USAGE = "Usage: /tools compact|full|hidden  (compact: one line per tool call; full: every call in full; hidden: just a count)";
 function readToolMode(path) {
@@ -11851,12 +12203,30 @@ function toolLines(i) {
   }
   return done;
 }
+var graphemes = new Intl.Segmenter(undefined, { granularity: "grapheme" });
+function wrapByWidth(text, room) {
+  const clean = text.replace(/\x1b\][\s\S]*?(?:\x07|\x1b\\)|\x1b\[[0-9;?]*[ -\/]*[@-~]/g, "").replace(/\t/g, "  ").replace(/[\x00-\x08\x0a-\x1f\x7f-\x9f]/g, "");
+  const pieces = [];
+  let cur = "";
+  let curW = 0;
+  for (const { segment } of graphemes.segment(clean)) {
+    const w = visibleWidth4(segment);
+    if (curW + w > room && cur) {
+      pieces.push(cur);
+      cur = "";
+      curW = 0;
+    }
+    cur += segment;
+    curW += w;
+  }
+  return [...pieces, cur];
+}
 function component(rows, theme, pad) {
   return {
     render: (w) => rows.flatMap((r) => {
       const room = Math.max(1, w - pad);
-      const pieces = r.raw ? Array.from(r.text).join("").match(new RegExp(`.{1,${room}}`, "gu")) ?? [""] : [truncateToWidth7(r.text, room, "…")];
-      return pieces.map((t) => " ".repeat(pad) + theme.fg(r.error ? "error" : "dim", t));
+      const pieces = r.raw ? wrapByWidth(r.text, room) : [truncateToWidth7(r.text, room, "…")];
+      return pieces.map((t) => truncateToWidth7(" ".repeat(pad) + theme.fg(r.error ? "error" : "dim", t), Math.max(0, w), ""));
     }),
     invalidate() {}
   };
@@ -11959,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" },
@@ -12128,16 +12497,63 @@ function resolveFreePiScope(modelRuntime, providerName, modelIds, env = process.
   return scoped;
 }
 
+// src/default-model.ts
+import { mkdirSync as mkdirSync3, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "node:fs";
+import { dirname as dirname9, join as join8 } from "node:path";
+var getDefaultModelPath = (agentDir) => join8(agentDir, "default-model.json");
+function readDefaultModel(agentDir) {
+  if (!agentDir)
+    return;
+  try {
+    const v = JSON.parse(readFileSync5(getDefaultModelPath(agentDir), "utf8"));
+    return typeof v.provider === "string" && typeof v.model === "string" && v.provider && v.model ? { provider: v.provider, model: v.model } : undefined;
+  } catch {
+    return;
+  }
+}
+
+class DefaultModelStorage {
+  agentDir;
+  global;
+  project;
+  constructor(agentDir) {
+    this.agentDir = agentDir;
+  }
+  withLock(scope, fn) {
+    const next = fn(scope === "global" ? this.global : this.project);
+    if (next === undefined)
+      return;
+    if (scope === "project") {
+      this.project = next;
+      return;
+    }
+    const before = this.global;
+    this.global = next;
+    if (before === undefined || !this.agentDir)
+      return;
+    try {
+      const a = JSON.parse(before);
+      const b = JSON.parse(next);
+      if (a.defaultProvider === b.defaultProvider && a.defaultModel === b.defaultModel)
+        return;
+      if (!b.defaultProvider || !b.defaultModel)
+        return;
+      mkdirSync3(dirname9(getDefaultModelPath(this.agentDir)), { recursive: true });
+      writeFileSync3(getDefaultModelPath(this.agentDir), JSON.stringify({ provider: b.defaultProvider, model: b.defaultModel }));
+    } catch {}
+  }
+}
+
 // src/hive.ts
 import { createHash as createHash3 } from "node:crypto";
 import { execFileSync } from "node:child_process";
-import { lstatSync as lstatSync2, readFileSync as readFileSync5, readlinkSync as readlinkSync2 } from "node:fs";
-import { join as join9 } from "node:path";
+import { lstatSync as lstatSync2, readFileSync as readFileSync6, readlinkSync as readlinkSync2 } from "node:fs";
+import { join as join10 } from "node:path";
 
 // src/hive-guard.ts
 import { existsSync as existsSync4, lstatSync, readdirSync, readlinkSync, realpathSync as realpathSync3 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
-import { basename as basename3, dirname as dirname9, isAbsolute as isAbsolute2, join as join8, relative as relative2, resolve as resolve2, sep as sep3 } from "node:path";
+import { basename as basename4, dirname as dirname10, isAbsolute as isAbsolute2, join as join9, relative as relative2, resolve as resolve2, sep as sep3 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 
 // src/subagents.ts
@@ -12254,8 +12670,10 @@ function lastAssistant(session) {
       continue;
     const text = Array.isArray(m.content) ? m.content.filter((p) => p.type === "text").map((p) => p.text ?? "").join(`
 `).trim() : "";
-    if (m.stopReason === "error")
-      return { text, error: m.errorMessage || "the model request failed" };
+    if (m.stopReason === "error") {
+      const raw = rawErrorMessage(m);
+      return { text, error: (raw && isFreePiProvider(m.provider) && !raw.includes("subagents_unavailable") ? friendlyError(raw) : undefined) ?? (raw || "the model request failed") };
+    }
     if (m.stopReason === "aborted")
       return { text, error: "aborted" };
     return { text };
@@ -12646,7 +13064,7 @@ var SAFE_READ_TOOLS = ["read", "grep", "find", "ls"];
 var ALWAYS_ASK = ["codemode", "tool_search", FUSION_PLAN_TOOL, WEB_SEARCH_TOOL_NAME, DOCS_LOOKUP_TOOL_NAME];
 var CLASSIFIED = ["bash", "write", "edit"];
 var SECRET_BASENAME = [/^\.env(\..*)?$/, /\.pem$/, /^id_(rsa|dsa|ecdsa|ed25519)/];
-var SECRET_HOME_DIRS = [".ssh", ".aws", join8(".config", "freepi"), ".free-pi"];
+var SECRET_HOME_DIRS = [".ssh", ".aws", join9(".config", "freepi"), ".free-pi"];
 var SECRET_IN_TEXT = /(?:^|[\s"'=:/])\.env(?:\.[\w.-]+)?(?=$|[\s"';|&)])|\.pem\b|\bid_(?:rsa|dsa|ecdsa|ed25519)|\.ssh\b|\.aws\b|\.config\/freepi|\.free-pi\b/;
 var BASH_DENY = [
   [/\brm\s+(?:-\S+\s+)*(?:\/|~|\$HOME)\*?(?:\s|$)/, "destructive command"],
@@ -12669,7 +13087,7 @@ function protectedLinkTargets(root, limit) {
   const note = (link) => {
     let target;
     try {
-      target = resolve2(dirname9(link), readlinkSync(link));
+      target = resolve2(dirname10(link), readlinkSync(link));
     } catch {
       return;
     }
@@ -12679,7 +13097,7 @@ function protectedLinkTargets(root, limit) {
       out.push(real);
   };
   for (const entry of [".git/hooks", ".git/config"]) {
-    const link = join8(root, entry);
+    const link = join9(root, entry);
     try {
       if (lstatSync(link).isSymbolicLink())
         note(link);
@@ -12698,7 +13116,7 @@ function protectedLinkTargets(root, limit) {
     for (const entry of entries) {
       if (++seen > limit)
         return null;
-      const path = join8(dir, entry.name);
+      const path = join9(dir, entry.name);
       if (entry.isSymbolicLink()) {
         if (protectedByName(relative2(root, path)))
           note(path);
@@ -12748,7 +13166,7 @@ function resolveLikePi(raw, cwd, home, platform) {
   if (p === "~")
     p = home;
   else if (p.startsWith("~/") || platform === "win32" && p.startsWith("~\\"))
-    p = join8(home, p.slice(2));
+    p = join9(home, p.slice(2));
   if (/^file:\/\//.test(p))
     p = fileURLToPath3(p);
   return resolve2(cwd, p);
@@ -12758,17 +13176,17 @@ function realpathDeepest(p) {
   const rest = [];
   for (;; ) {
     try {
-      return join8(realpathSync3(current), ...rest.reverse());
+      return join9(realpathSync3(current), ...rest.reverse());
     } catch {
       try {
         lstatSync(current);
         return null;
       } catch {}
     }
-    const parent = dirname9(current);
+    const parent = dirname10(current);
     if (parent === current)
       return null;
-    rest.push(basename3(current));
+    rest.push(basename4(current));
     current = parent;
   }
 }
@@ -12777,10 +13195,10 @@ function isInside(root, target) {
   return rel === "" || rel !== ".." && !rel.startsWith(`..${sep3}`) && !isAbsolute2(rel);
 }
 function isSecret(target, home) {
-  if (SECRET_BASENAME.some((re) => re.test(basename3(target))))
+  if (SECRET_BASENAME.some((re) => re.test(basename4(target))))
     return true;
   return SECRET_HOME_DIRS.some((dir) => {
-    const lexical = join8(home, dir);
+    const lexical = join9(home, dir);
     return isInside(lexical, target) || isInside(realpathDeepest(lexical) ?? lexical, target);
   });
 }
@@ -12801,7 +13219,7 @@ function scanForSecret(dir) {
       if (SECRET_BASENAME.some((re) => re.test(entry.name)))
         return "yes";
       if (entry.isDirectory())
-        queue.push(join8(current, entry.name));
+        queue.push(join9(current, entry.name));
     }
   }
   return "no";
@@ -12925,6 +13343,33 @@ async function decideToolCall(event, opts) {
 }
 
 // src/hive.ts
+var HIVE_ERRORS = new Map(Object.entries({
+  rate_limited: "Hive: slow down, too many messages in a short time.",
+  pending: "Hive: another request is still waiting for an answer.",
+  not_driver: "Hive: only the person driving the room can do that.",
+  already_driver: "Hive: you are already driving the room.",
+  unknown_conn: "Hive: that person has left the room.",
+  unknown_prompt: "Hive: that prompt is no longer waiting.",
+  unknown_request: "Hive: that request is no longer waiting.",
+  bad_frame: "Hive: the room got a message it could not read. Try again.",
+  internal: "Hive: something went wrong on the server. Try again."
+}));
+var HIVE_CLOSED = new Map(Object.entries({
+  replaced: "Hive room closed: you opened a newer room.",
+  host_left: "Hive room closed: the host left.",
+  ended: "Hive room closed: the host ended it.",
+  expired: "Hive room closed: it expired.",
+  kicked: "Hive room closed: you were removed from it.",
+  shutdown: "Hive room closed: the server is restarting.",
+  no_room: "Hive room closed: the room no longer exists.",
+  unauthorized: "Hive room closed: you are not signed in.",
+  auth_timeout: "Hive room closed: sign-in took too long.",
+  busy: "Hive room closed: the server is busy. Try again soon.",
+  overloaded: "Hive room closed: the server is busy. Try again soon.",
+  slow: "Hive room closed: the connection was too slow."
+}));
+var hiveErrorText = (code) => HIVE_ERRORS.get(code) ?? `Hive: ${code}`;
+var hiveClosedText = (reason) => HIVE_CLOSED.get(reason) ?? `Hive room closed (${reason}).`;
 var RUN_IN_SANDBOX = "Run in sandbox";
 var RUN_OUTSIDE = "Run outside the sandbox";
 var DENY = "Deny";
@@ -12948,7 +13393,7 @@ function fingerprint(path) {
       return "";
     if (st.size > HASH_MAX_BYTES)
       return `${st.size}:${st.mtimeMs}`;
-    return createHash3("sha256").update(readFileSync5(path)).digest("hex");
+    return createHash3("sha256").update(readFileSync6(path)).digest("hex");
   } catch {
     return "";
   }
@@ -12978,7 +13423,7 @@ function worktreeSnapshot(g) {
       const status = entry.slice(0, 2);
       if (status[0] === "R" || status[0] === "C")
         i++;
-      files.set(entry.slice(3), `${status}:${fingerprint(join9(root, entry.slice(3)))}`);
+      files.set(entry.slice(3), `${status}:${fingerprint(join10(root, entry.slice(3)))}`);
     }
     return { files, head: runGit(g, "rev-parse", "HEAD")?.trim() };
   } catch (e) {
@@ -13106,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;
@@ -13140,10 +13589,13 @@ function createHiveExtension(opts) {
         };
         socket.onopen = () => socket.send(JSON.stringify({ type: "auth", token }));
         socket.onerror = failed;
-        socket.onclose = () => {
+        socket.onclose = (event) => {
           if (ws !== socket)
             return;
-          if (!roomUrl)
+          const known = event?.reason ? HIVE_CLOSED.get(event.reason) : undefined;
+          if (known)
+            endRoom(known);
+          else if (!roomUrl)
             failed();
           else
             endRoom("Hive room closed.");
@@ -13217,10 +13669,10 @@ Guests sign in with GitHub to watch and chat. They can ask to drive; you approve
             break;
           case "error":
             if (frame.code !== "stale")
-              notify(`Hive: ${frame.code}`, "warning");
+              notify(hiveErrorText(frame.code), "warning");
             break;
           case "closed":
-            endRoom(`Hive room closed (${frame.reason}).`);
+            endRoom(hiveClosedText(frame.reason));
             break;
         }
       }
@@ -13431,22 +13883,440 @@ ${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 {
   chmodSync,
   existsSync as existsSync5,
   lstatSync as lstatSync3,
-  mkdirSync as mkdirSync3,
+  mkdirSync as mkdirSync4,
   mkdtempSync,
   readdirSync as readdirSync2,
   realpathSync as realpathSync4,
   rmSync,
   statSync as statSync3,
-  writeFileSync as writeFileSync3
+  writeFileSync as writeFileSync4
 } from "node:fs";
 import { homedir as homedir6, tmpdir } from "node:os";
-import { dirname as dirname10, join as join10 } from "node:path";
+import { dirname as dirname11, join as join11 } from "node:path";
+var ERRNO_WORDS = { EACCES: "permission denied", EPERM: "operation not permitted", ENOENT: "not found", ENOSPC: "disk full", EROFS: "read-only file system" };
+function sandboxCause(err) {
+  const e = err;
+  if (typeof e?.code === "string") {
+    const where = [e.syscall, e.path].filter((x) => typeof x === "string").join(" ");
+    return `${Object.hasOwn(ERRNO_WORDS, e.code) ? ERRNO_WORDS[e.code] : e.code}${where ? ` (${where})` : ""}`;
+  }
+  return (err instanceof Error ? err.message : String(err)).split(`
+`)[0].replace(/\.$/, "");
+}
 var SECRET_NAME_PATTERNS = [
   "\\.env(\\..*)?",
   "[^/]*\\.pem",
@@ -13482,7 +14352,7 @@ var TOOLCHAIN_ROOTS = [
   "Library/pnpm"
 ];
 function toolchainRoots(home, exists = existsSync5) {
-  return TOOLCHAIN_ROOTS.map((r) => join10(home, r)).filter((p) => exists(p));
+  return TOOLCHAIN_ROOTS.map((r) => join11(home, r)).filter((p) => exists(p));
 }
 var ENV_ALLOW = ["PATH", "LANG", "LC_ALL", "LC_CTYPE", "TERM", "COLORTERM", "TZ", "USER", "LOGNAME", "SHELL", "PI_PROVIDER", "PI_MODEL"];
 function under(path, dir) {
@@ -13500,10 +14370,10 @@ function sandboxEnv(base, o) {
   for (const k of ENV_ALLOW)
     if (base[k] !== undefined)
       env[k] = base[k];
-  env.PATH = [...o.developerDir ? [join10(o.developerDir, "usr/bin")] : [], ...o.pathPrefix ?? [], ...(base.PATH ?? "/usr/bin:/bin").split(":")].filter((p) => p.startsWith("/") && !under(p, o.project) && !under(realOrSelf(p), o.project)).join(":");
+  env.PATH = [...o.developerDir ? [join11(o.developerDir, "usr/bin")] : [], ...o.pathPrefix ?? [], ...(base.PATH ?? "/usr/bin:/bin").split(":")].filter((p) => p.startsWith("/") && !under(p, o.project) && !under(realOrSelf(p), o.project)).join(":");
   if (o.developerDir)
     env.DEVELOPER_DIR = o.developerDir;
-  env.HOME = join10(o.scratch, "home");
+  env.HOME = join11(o.scratch, "home");
   env.TMP = env.TEMP = o.scratch;
   env.TMPDIR = `${o.scratch}/`;
   env.BUN_OPTIONS = "--no-env-file";
@@ -13513,7 +14383,7 @@ function sandboxEnv(base, o) {
   env.GIT_CONFIG_COUNT = "1";
   env.GIT_CONFIG_KEY_0 = "credential.helper";
   env.GIT_CONFIG_VALUE_0 = "";
-  env.npm_config_cache = join10(o.scratch, "npm-cache");
+  env.npm_config_cache = join11(o.scratch, "npm-cache");
   env.FREEPI_HIVE_CALL = o.callId;
   return env;
 }
@@ -13559,7 +14429,7 @@ function scanProject(project, limit = SCAN_LIMIT2) {
         scan.overflow = true;
         break;
       }
-      const path = join10(dir, e.name);
+      const path = join11(dir, e.name);
       if (e.isSymbolicLink())
         continue;
       if (e.isDirectory()) {
@@ -13659,7 +14529,7 @@ function developerDir(o = {}) {
       continue;
     try {
       const real = realpath(c);
-      if (exists(join10(real, "usr/bin/git")))
+      if (exists(join11(real, "usr/bin/git")))
         return real;
     } catch {}
   }
@@ -13677,18 +14547,18 @@ function opensslFiles(o = {}) {
   const files = [];
   const dirs = [];
   for (const prefix of o.prefixes ?? ["/opt/homebrew", "/usr/local"]) {
-    const etc = join10(prefix, "etc");
+    const etc = join11(prefix, "etc");
     for (const name of list(etc)) {
       if (!/^openssl(@[0-9.]+)?$/.test(name))
         continue;
       for (const f of ["openssl.cnf", "ct_log_list.cnf", "cert.pem"])
-        if (exists(join10(etc, name, f)))
-          files.push(join10(etc, name, f));
-      if (exists(join10(etc, name, "certs")))
-        dirs.push(join10(etc, name, "certs"));
+        if (exists(join11(etc, name, f)))
+          files.push(join11(etc, name, f));
+      if (exists(join11(etc, name, "certs")))
+        dirs.push(join11(etc, name, "certs"));
     }
-    if (exists(join10(etc, "ca-certificates/cert.pem")))
-      files.push(join10(etc, "ca-certificates/cert.pem"));
+    if (exists(join11(etc, "ca-certificates/cert.pem")))
+      files.push(join11(etc, "ca-certificates/cert.pem"));
   }
   return { files, dirs };
 }
@@ -13696,7 +14566,7 @@ var MAC_DEV_READ = ["/dev/null", "/dev/zero", "/dev/random", "/dev/urandom", "/d
 var MAC_DEV_WRITE = ["/dev/null", "/dev/tty", "/dev/zero", "/dev/dtracehelper"];
 function ancestors(p) {
   const out = [];
-  for (let d = dirname10(p);; d = dirname10(d)) {
+  for (let d = dirname11(p);; d = dirname11(d)) {
     out.push(d);
     if (d === "/")
       break;
@@ -13732,9 +14602,9 @@ function buildMacProfile(i) {
     L.push(`(deny file-read* file-write* (literal ${sbString(s)}))`);
   for (const f of i.links)
     L.push(`(deny file-write* (literal ${sbString(f)}))`);
-  const guarded = new Set([i.project, join10(i.project, ".git"), ...i.nodeModules ?? []]);
-  for (const f of [...i.sockets, ...i.links, ...i.nodeModules ?? [], join10(i.project, ".git")]) {
-    for (let d = dirname10(f);d.length >= i.project.length && (d === i.project || d.startsWith(i.project + "/")); d = dirname10(d))
+  const guarded = new Set([i.project, join11(i.project, ".git"), ...i.nodeModules ?? []]);
+  for (const f of [...i.sockets, ...i.links, ...i.nodeModules ?? [], join11(i.project, ".git")]) {
+    for (let d = dirname11(f);d.length >= i.project.length && (d === i.project || d.startsWith(i.project + "/")); d = dirname11(d))
       guarded.add(d);
   }
   for (const d of [...guarded].sort())
@@ -13803,10 +14673,10 @@ function buildBwrapArgs(i) {
   a.push("--bind", i.scratch, i.scratch);
   for (const d of i.nodeModules)
     ro(d);
-  if (exists(join10(i.project, ".git/hooks")))
-    ro(join10(i.project, ".git/hooks"));
-  if (exists(join10(i.project, ".git/config")))
-    ro(join10(i.project, ".git/config"));
+  if (exists(join11(i.project, ".git/hooks")))
+    ro(join11(i.project, ".git/hooks"));
+  if (exists(join11(i.project, ".git/config")))
+    ro(join11(i.project, ".git/config"));
   for (const f of i.links)
     ro(f);
   for (const s of i.sockets)
@@ -13836,7 +14706,7 @@ function removeTree(path) {
         return;
       chmodSync(p, 448);
       for (const e of readdirSync2(p))
-        walk(join10(p, e));
+        walk(join11(p, e));
     } catch {}
   };
   walk(path);
@@ -13874,7 +14744,7 @@ function createShellSandbox(deps = {}) {
     if (deps.python !== undefined)
       return deps.python;
     const dev = platform === "darwin" ? macHost().developerDir : null;
-    return dev && existsSync5(join10(dev, "usr/bin/python3")) ? join10(dev, "usr/bin/python3") : null;
+    return dev && existsSync5(join11(dev, "usr/bin/python3")) ? join11(dev, "usr/bin/python3") : null;
   };
   let cached;
   function probe() {
@@ -13992,13 +14862,13 @@ function createShellSandbox(deps = {}) {
         return { ready: false, reason: "a folder in the project cannot be read, so it cannot be checked for sockets and hard links" };
       let scratch;
       try {
-        scratch = mkdtempSync(join10(realpathSync4(tmpdir()), "freepi-hive-"));
+        scratch = mkdtempSync(join11(realpathSync4(tmpdir()), "freepi-hive-"));
         const dir = scratch;
-        mkdirSync3(join10(dir, "home"));
-        mkdirSync3(join10(dir, "npm-cache"));
-        const emptyFile = join10(dir, "empty");
-        const marker = join10(dir, "call.fd");
-        writeFileSync3(emptyFile, "", { mode: 292 });
+        mkdirSync4(join11(dir, "home"));
+        mkdirSync4(join11(dir, "npm-cache"));
+        const emptyFile = join11(dir, "empty");
+        const marker = join11(dir, "call.fd");
+        writeFileSync4(emptyFile, "", { mode: 292 });
         const roots = toolchainRoots(home);
         const mac = platform === "darwin";
         const host = mac ? macHost() : undefined;
@@ -14050,7 +14920,7 @@ function createShellSandbox(deps = {}) {
       } catch (err) {
         if (scratch)
           removeTree(scratch);
-        return { ready: false, reason: `could not prepare the sandbox: ${err instanceof Error ? err.message : String(err)}` };
+        return { ready: false, reason: `Couldn't set up the command sandbox: ${sandboxCause(err)}.` };
       }
     },
     mark(toolCallId, mode) {
@@ -14147,6 +15017,44 @@ function installSafeUrlOpen(mode, open = openLink) {
   });
 }
 
+// src/retry-failed-line.ts
+var RETRY_FAILED = /^Retry failed after (\d+) attempts?: ([\s\S]*)$/;
+var CRASH_WARNING = /^\S+ crashed on /;
+var PRODUCT = "free-pi-cli";
+function installRetryFailedLine(mode) {
+  const m = mode;
+  const original = m.showError.bind(m);
+  m.showError = (msg) => {
+    const hit = typeof msg === "string" ? RETRY_FAILED.exec(msg) : null;
+    if (!hit)
+      return original(msg);
+    const [, n, cause = ""] = hit;
+    if (cause === "Retry cancelled")
+      return m.showWarning("Retry cancelled.");
+    const tries = `${n} ${n === "1" ? "try" : "tries"}`;
+    m.showWarning(`Gave up after ${tries}: ${cause}`);
+  };
+  const warn = m.showWarning.bind(m);
+  m.showWarning = (msg) => warn(typeof msg === "string" ? msg.replace(CRASH_WARNING, `${PRODUCT} crashed on `) : msg);
+  for (const name of ["renderProjectTrustWarningIfNeeded", "suggestBugReport"]) {
+    const orig = m[name]?.bind(m);
+    if (!orig)
+      continue;
+    m[name] = () => {
+      const before = m.chatContainer?.children?.length ?? 0;
+      orig();
+      for (const child of m.chatContainer?.children?.slice(before) ?? []) {
+        const build = child.build;
+        if (typeof build === "function")
+          child.build = () => reword(build.call(child));
+      }
+    };
+  }
+}
+function reword(text) {
+  return text.replace(/restart pi\./, `restart ${PRODUCT}.`).replace(/looks like a pi bug/, "looks like a free-pi bug");
+}
+
 // src/project-trust.ts
 import { createInterface } from "node:readline/promises";
 import { resolve as resolve3 } from "node:path";
@@ -14293,14 +15201,20 @@ var SDK_TOOLS = [
   "list_mcp_resource_templates",
   "read_mcp_resource"
 ];
-var SKILLS_DIR = resolve4(dirname11(fileURLToPath4(import.meta.url)), "..", "skills");
+var SKILLS_DIR = resolve4(dirname12(fileURLToPath4(import.meta.url)), "..", "skills");
 function resolveModelName(opts) {
   return opts.models?.[0]?.name || opts.model || MODEL_ID;
 }
 function buildSettingsManager(opts, models, projectTrusted) {
-  return SettingsManager2.inMemory({
-    defaultProvider: PROVIDER_NAME,
-    defaultModel: models[0].id,
+  const saved = readDefaultModel(opts.agentDir);
+  const known = new Map([
+    [PROVIDER_NAME, new Set([...models.map((m) => m.id), FUSION_PICKER_ID, ...models.some((m) => m.id === ULTRAFAST_CATALOG_ID) ? [ULTRAFAST_PICKER_ID] : []])],
+    [DEFENSE_PROVIDER_NAME, new Set(defenseModelsFor(opts).map((m) => m.id))]
+  ]);
+  const start = saved && known.get(saved.provider)?.has(saved.model) ? saved : undefined;
+  const settings = {
+    defaultProvider: start?.provider ?? PROVIDER_NAME,
+    defaultModel: start?.model ?? models[0].id,
     defaultTools: [...SAFE_TOOLS, TODO_TOOL_NAME],
     packages: [],
     quietStartup: true,
@@ -14310,7 +15224,10 @@ function buildSettingsManager(opts, models, projectTrusted) {
     theme: "light/dark",
     enableInstallTelemetry: false,
     ...compactionSettingsFor(opts.costArm) ? { compaction: compactionSettingsFor(opts.costArm) } : {}
-  }, { projectTrusted });
+  };
+  const storage = new DefaultModelStorage(opts.agentDir);
+  storage.withLock("global", () => JSON.stringify(settings, null, 2));
+  return SettingsManager2.fromStorage(storage, { projectTrusted });
 }
 function settingsForRuntime(opts, rtCwd, launch) {
   return buildSettingsManager(opts, catalogModelsFor(opts), projectTrustForCwd(rtCwd, launch, opts.agentDir));
@@ -14334,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,
@@ -14342,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);
     }
@@ -14398,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(),
@@ -14429,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,
@@ -14442,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,
@@ -14487,6 +15409,7 @@ function buildRuntimeOptions(opts, sessionId) {
     toolSearchExtension,
     subagentsExtension,
     hiveExtension,
+    remoteExtension,
     ...guestLoginExtension ? [guestLoginExtension] : [],
     ...opts.guest ? [createGuestNotesExtension({ isGuest: () => auth.isGuest() })] : []
   ];
@@ -14506,7 +15429,7 @@ ${CHOICE_RULES}` : agentRulesFor(opts.costArm), ...shellPromptLine(shell) ? [she
 function getSessionDir(cwd, agentDir) {
   const resolvedCwd = resolve4(cwd);
   const safePath = `--${resolvedCwd.replace(/^[/\\]/, "").replace(/[/\\:]/g, "-")}--`;
-  return join11(resolve4(agentDir), "sessions", safePath);
+  return join12(resolve4(agentDir), "sessions", safePath);
 }
 async function findLatestSession(cwd, sessionDir, api = SessionManager2) {
   const infos = await api.list(cwd, sessionDir);
@@ -14608,11 +15531,13 @@ async function launchPi(opts) {
   installLogoutHandler(mode, { credentialsPath: opts.credentialsPath, isGuest: () => auth.isGuest() });
   installModelAllowanceHandler(mode);
   installSafeUrlOpen(mode);
+  installRetryFailedLine(mode);
   installFooterRightAlign(mode, () => {
     const id = runtime.session?.model?.id;
     return freeModelBase(pickerModelName(opts, id));
   });
   installEditorPlaceholder(mode);
+  installWidthGuard(mode);
   if (process.stdin.isTTY && process.stdout.isTTY && !process.env.CI) {
     process.stdout.write("\x1B[2J\x1B[H");
     installBottomPin(mode);
@@ -14665,7 +15590,7 @@ function createRealSpawn(io = { platform: process.platform, spawnSyncImpl: spawn
 // src/relaunch.ts
 import { existsSync as existsSync6, mkdtempSync as mkdtempSync2, realpathSync as realpathSync5, rmSync as rmSync2, statSync as statSync4 } from "node:fs";
 import { constants as osConstants, tmpdir as tmpdir2 } from "node:os";
-import { delimiter, dirname as dirname12, isAbsolute as isAbsolute3, join as join12, resolve as resolve5, sep as sep4, win32 } from "node:path";
+import { delimiter, dirname as dirname13, isAbsolute as isAbsolute3, join as join13, resolve as resolve5, sep as sep4, win32 } from "node:path";
 function applyRelaunchCwd(env, chdir = (d) => process.chdir(d), isDir = (p) => {
   try {
     return statSync4(p).isDirectory();
@@ -14706,7 +15631,7 @@ function hasNodeModulesBin(entry) {
 }
 function sanitizedEnv(env, nodeDir, project, home, win) {
   const proj = canon(project, win);
-  const broad = proj === canon(home, win) || dirname12(proj) === proj;
+  const broad = proj === canon(home, win) || dirname13(proj) === proj;
   const out = {};
   let pathKey = "PATH";
   let oldPath = "";
@@ -14743,13 +15668,13 @@ async function relaunchViaNpx(latest, deps) {
   if (!latest || !SEMVER.test(latest))
     return;
   const target = latest;
-  const nodeDir = dirname12(deps.execPath);
-  const npxCli = win ? join12(nodeDir, "node_modules", "npm", "bin", "npx-cli.js") : join12(dirname12(nodeDir), "lib", "node_modules", "npm", "bin", "npx-cli.js");
+  const nodeDir = dirname13(deps.execPath);
+  const npxCli = win ? join13(nodeDir, "node_modules", "npm", "bin", "npx-cli.js") : join13(dirname13(nodeDir), "lib", "node_modules", "npm", "bin", "npx-cli.js");
   const exists = deps.exists ?? existsSync6;
   const distroNpxCli = "/usr/share/nodejs/npm/bin/npx-cli.js";
   const healthy = (cli) => {
-    const root = join12(dirname12(cli), "..");
-    return exists(join12(root, "package.json")) && exists(join12(root, "lib", "cli.js"));
+    const root = join13(dirname13(cli), "..");
+    return exists(join13(root, "package.json")) && exists(join13(root, "lib", "cli.js"));
   };
   let npxCliPath = npxCli;
   if (!exists(npxCli)) {
@@ -14761,8 +15686,8 @@ async function relaunchViaNpx(latest, deps) {
   if (!healthy(npxCliPath))
     return;
   const childEnv = sanitizedEnv(env, nodeDir, deps.cwd, deps.homedir, win);
-  const readyDir = mkdtempSync2(join12(tmpdir2(), "free-pi-relaunch-"));
-  const readyFile = join12(readyDir, "started");
+  const readyDir = mkdtempSync2(join13(tmpdir2(), "free-pi-relaunch-"));
+  const readyFile = join13(readyDir, "started");
   try {
     deps.log(`Updating free-pi to ${target}…`);
     return await new Promise((resolve) => {
@@ -14804,13 +15729,13 @@ async function relaunchViaNpx(latest, deps) {
 
 // src/run.ts
 import { createInterface as createInterface3 } from "node:readline/promises";
-import { mkdirSync as mkdirSync5, writeFileSync as writeFileSync5 } from "node:fs";
+import { mkdirSync as mkdirSync6, writeFileSync as writeFileSync6 } from "node:fs";
 import { SessionManager as SessionManager3 } from "@earendil-works/pi-coding-agent";
 
 // src/onboarding.ts
 import { existsSync as existsSync7, readdirSync as readdirSync3, realpathSync as realpathSync6 } from "node:fs";
 import { homedir as homedir8 } from "node:os";
-import { join as join13 } from "node:path";
+import { join as join14 } from "node:path";
 var INTRO_ENV_SKIP = "FREEPI_NO_INTRO";
 var INTRO_TEXT = "Tell free-pi what to build, fix, or explain. Resume later with: npx free-pi-cli@latest --continue";
 function introSkipped(env = process.env) {
@@ -14830,7 +15755,7 @@ function looksLikeProject(cwd, home = homedir8()) {
   try {
     if (realpathSync6(cwd) === realpathSync6(home))
       return false;
-    if (PROJECT_MARKERS.some((m) => existsSync7(join13(cwd, m))))
+    if (PROJECT_MARKERS.some((m) => existsSync7(join14(cwd, m))))
       return true;
     return readdirSync3(cwd).some((f) => /\.(sln|csproj)$/.test(f));
   } catch {
@@ -14859,7 +15784,7 @@ ${text}
 // src/starter.ts
 import { existsSync as existsSync8, readdirSync as readdirSync4, realpathSync as realpathSync7 } from "node:fs";
 import { homedir as homedir9 } from "node:os";
-import { join as join14 } from "node:path";
+import { join as join15 } from "node:path";
 var STARTER_EXPERIMENT = "first_session_starter";
 var STARTER_PROJECT = [
   {
@@ -14892,7 +15817,7 @@ var STARTER_EMPTY = [
 var STARTER_HEADER_PROJECT = "Not sure where to start? Press 1, 2 or 3 to send one of these, or any other key to skip:";
 var STARTER_HEADER_EMPTY = "This folder is empty. Press 1, 2 or 3 to start with one of these, or any other key to skip:";
 function getStarterMarkerPath(agentDir = getFreePiAgentDir()) {
-  return join14(agentDir, "starter-shown");
+  return join15(agentDir, "starter-shown");
 }
 function starterShownBefore(agentDir) {
   return existsSync8(getStarterMarkerPath(agentDir));
@@ -14924,12 +15849,12 @@ function parseStarterKey(raw, count) {
 }
 
 // src/whats-new.ts
-import { existsSync as existsSync9, mkdirSync as mkdirSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "node:fs";
-import { dirname as dirname13 } from "node:path";
+import { existsSync as existsSync9, mkdirSync as mkdirSync5, readFileSync as readFileSync7, writeFileSync as writeFileSync5 } from "node:fs";
+import { dirname as dirname14 } from "node:path";
 function maybeWhatsNew(cliVersion, agentDir) {
   try {
     const path = getLastSeenVersionPath(agentDir);
-    const lastSeen = existsSync9(path) ? readFileSync6(path, "utf-8").trim() : undefined;
+    const lastSeen = existsSync9(path) ? readFileSync7(path, "utf-8").trim() : undefined;
     writeLastSeen(path, cliVersion);
     if (lastSeen === undefined)
       return;
@@ -14945,8 +15870,8 @@ function maybeWhatsNew(cliVersion, agentDir) {
   }
 }
 function writeLastSeen(path, version) {
-  mkdirSync4(dirname13(path), { recursive: true });
-  writeFileSync4(path, version, "utf-8");
+  mkdirSync5(dirname14(path), { recursive: true });
+  writeFileSync5(path, version, "utf-8");
 }
 
 // src/run.ts
@@ -15197,7 +16122,7 @@ Your free-pi sign-in has expired. Signing in with GitHub again.
             deps.log(SIGNIN_UNFINISHED_LINE);
             return 0;
           }
-          const reason = err instanceof Error && err.message ? err.message : "unknown error";
+          const reason = (err instanceof Error && err.message ? err.message : "unknown error").replace(/\.$/, "");
           deps.log(`Couldn't finish GitHub sign-in: ${reason}. Run npx free-pi-cli again to retry.`);
           return 1;
         }
@@ -15310,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;
@@ -15393,8 +16319,8 @@ ${r.text}
     const choices = starterChoices();
     if (choices) {
       try {
-        mkdirSync5(deps.agentDir, { recursive: true });
-        writeFileSync5(getStarterMarkerPath(deps.agentDir), "1");
+        mkdirSync6(deps.agentDir, { recursive: true });
+        writeFileSync6(getStarterMarkerPath(deps.agentDir), "1");
       } catch {}
       const report = (event) => deps.reportStarterEvent ? deps.reportStarterEvent(event) : reportStarterEvent(deps, jwt, event);
       deps.log(formatStarterMenu(choices));
@@ -15435,6 +16361,7 @@ ${r.text}
     costArm: versionCheck.costArm,
     updateLatest,
     getGravityContext,
+    adContext,
     guest: Boolean(me?.guest),
     refillCard: refillSession,
     allowanceLine: allowanceLine(),
@@ -15547,7 +16474,7 @@ async function main() {
   }
   if (process.env.FREEPI_RELAUNCH_READY) {
     try {
-      writeFileSync6(process.env.FREEPI_RELAUNCH_READY, "");
+      writeFileSync7(process.env.FREEPI_RELAUNCH_READY, "");
     } catch {}
   }
   const command = parseCliArgs(process.argv.slice(2));
@@ -15608,7 +16535,7 @@ ${HELP_TEXT}`);
     launchPi,
     log: (message) => console.log(message),
     checkClientVersion: (baseUrl, cliVersion, jwt) => checkClientVersion(baseUrl, cliVersion, fetch, jwt),
-    startGravityPixel: (jwt) => startGravityPixel(jwt, join15(dirname14(agentDir), "gravity")),
+    startGravityPixel: (jwt) => startGravityPixel(jwt, join16(dirname15(agentDir), "gravity")),
     relaunchLatest: (latest) => relaunchViaNpx(latest, {
       env: process.env,
       argv: process.argv.slice(2),