free-pi-cli 0.4.2 → 0.4.3

package/dist/index.js

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

package/dist/{main-37kszx0y.js → main-xn8n5cb2.js}

@@ -44,7 +44,7 @@ function openBrowser(url, platform = process.platform, spawnImpl = spawn) {
 // package.json
 var package_default = {
   name: "free-pi-cli",
-  version: "0.4.2",
+  version: "0.4.3",
   description: "Free, ad-supported distribution of the pi coding agent. Inference paid for by ads.",
   license: "MIT",
   type: "module",
@@ -53,6 +53,7 @@ var package_default = {
   },
   files: [
     "dist",
+    "skills",
     "README.md"
   ],
   engines: {
@@ -4828,6 +4829,7 @@ var MeResponseSchema = object({
   cap_usd_today: number2(),
   tier: AccountTierSchema,
   credit_usd: number2(),
+  consent_version: string2().nullable().optional(),
   notice: string2().optional(),
   buy_url: string2().optional(),
   allowance_credits: number2().optional(),
@@ -5086,7 +5088,7 @@ function formatCreditsLeftLine(remaining, allowance, refillAt) {
 }
 var SLOW_LANE_METER_LINE = "Slow lane: cheapest model until refill";
 // ../pi-ads/src/api.ts
-var REQUEST_TIMEOUT_MS = 3000;
+var REQUEST_TIMEOUT_MS = 5000;
 async function authedFetch(deps, path, init) {
   const token = await deps.getToken();
   const doFetch = deps.fetchImpl ?? fetch;
@@ -5202,6 +5204,8 @@ function createBannerRenderer(opts = {}) {
   return {
     async render(deps, ctx, config, columnsOverride) {
       const ad = await fetchAdNext(deps, "banner");
+      if (opts.isActive && !opts.isActive())
+        return;
       if (!ad) {
         ctx.ui.setWidget(BANNER_WIDGET_ID, undefined);
         opts.onBannerAd?.(undefined);
@@ -5361,6 +5365,7 @@ async function renderMeter(deps, ctx) {
 
 // ../pi-ads/src/index.ts
 var BANNER_REFRESH_MS = 10 * 60 * 1000;
+var BANNER_MIN_REFRESH_MS = 60 * 1000;
 function createAdsExtension(opts) {
   const deps = {
     baseUrl: opts.baseUrl,
@@ -5372,23 +5377,42 @@ function createAdsExtension(opts) {
   return {
     name: "free-pi-ads",
     factory(pi) {
-      const banner = createBannerRenderer({ onBannerAd: opts.onBannerAd });
+      let stopped = false;
+      const banner = createBannerRenderer({ onBannerAd: opts.onBannerAd, isActive: () => !stopped });
       const inline = createInlineRenderer();
       let bannerInterval;
+      let lastBannerAt = 0;
+      let bannerInFlight = false;
+      const renderBanner = async (ctx, force = false) => {
+        if (stopped)
+          return;
+        if (!force && (bannerInFlight || Date.now() - lastBannerAt < BANNER_MIN_REFRESH_MS))
+          return;
+        bannerInFlight = true;
+        try {
+          await banner.render(deps, ctx, config);
+        } finally {
+          bannerInFlight = false;
+          lastBannerAt = Date.now();
+        }
+      };
       pi.on("session_start", async (_event, ctx) => {
+        stopped = false;
         inline.reset(ctx);
-        await Promise.all([banner.render(deps, ctx, config), renderMeter(deps, ctx)]);
+        await Promise.all([renderBanner(ctx, true), renderMeter(deps, ctx)]);
         if (bannerInterval)
           clearInterval(bannerInterval);
         bannerInterval = setInterval(() => {
-          banner.render(deps, ctx, config);
+          renderBanner(ctx);
         }, BANNER_REFRESH_MS);
         bannerInterval.unref?.();
       });
       pi.on("turn_end", async (_event, ctx) => {
+        renderBanner(ctx);
         await Promise.all([inline.onTurnEnd(deps, ctx, config), renderMeter(deps, ctx)]);
       });
       pi.on("session_shutdown", () => {
+        stopped = true;
         if (bannerInterval) {
           clearInterval(bannerInterval);
           bannerInterval = undefined;
@@ -5399,7 +5423,8 @@ function createAdsExtension(opts) {
 }
 
 // src/pi-launch.ts
-import { join as join3, resolve as resolve2 } from "node:path";
+import { dirname as dirname3, join as join4, resolve as resolve2 } from "node:path";
+import { fileURLToPath as fileURLToPath3 } from "node:url";
 
 // src/provider.ts
 var PROVIDER_NAME = "free-pi";
@@ -6211,6 +6236,64 @@ function createTodoToolExtension(options = {}) {
   };
 }
 
+// src/tool-aliases.ts
+import { homedir as homedir2 } from "node:os";
+import { join as join3 } from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+import {
+  createBashToolDefinition,
+  createReadToolDefinition
+} from "@earendil-works/pi-coding-agent";
+function aliasArgs(input, key, aliases) {
+  if (!input || typeof input !== "object" || key in input)
+    return input;
+  const args = input;
+  const alias = aliases.find((a) => (a in args));
+  if (!alias)
+    return input;
+  const { [alias]: value, ...rest } = args;
+  return { ...rest, [key]: value };
+}
+function normalizeShellPath(input, platform = process.platform, home = homedir2()) {
+  let p = input;
+  if (platform === "win32" && p.startsWith("/") && !p.startsWith("//") && !p.includes("\\")) {
+    const m = p.match(/^\/(?:mnt\/|cygdrive\/)?([a-z])(?:\/(.*))?$/i);
+    if (m)
+      p = `${m[1].toUpperCase()}:\\${m[2]?.replaceAll("/", "\\") ?? ""}`;
+  }
+  if (p === "~")
+    return home;
+  if (p.startsWith("~/") || platform === "win32" && p.startsWith("~\\"))
+    return join3(home, p.slice(2));
+  if (/^file:\/\//.test(p))
+    return fileURLToPath2(p);
+  return p;
+}
+function createToolAliasesExtension() {
+  return {
+    name: "free-pi-tool-aliases",
+    factory: (pi) => {
+      const cwd = process.cwd();
+      const bash = createBashToolDefinition(cwd);
+      const read = createReadToolDefinition(cwd);
+      pi.registerTool({
+        ...bash,
+        prepareArguments: (a) => aliasArgs(bash.prepareArguments ? bash.prepareArguments(a) : a, "command", ["cmd"]),
+        execute: (...args) => {
+          const s = pi.getSettings();
+          const shellPath = s.shellPath ? normalizeShellPath(s.shellPath) : s.shellPath;
+          return createBashToolDefinition(cwd, { commandPrefix: s.shellCommandPrefix, shellPath }).execute(...args);
+        }
+      });
+      pi.registerTool({
+        ...read,
+        prepareArguments: (a) => aliasArgs(read.prepareArguments ? read.prepareArguments(a) : a, "path", ["file", "file_path"]),
+        execute: (...args) => createReadToolDefinition(cwd, { autoResizeImages: pi.getSettings().images?.autoResize ?? true }).execute(...args)
+      });
+    }
+  };
+}
+
 // src/error-notice.ts
 var NOTICE_DEDUPE_MS = 15000;
 function parseErrorEnvelope(errorMessage) {
@@ -6253,6 +6336,16 @@ function createErrorNoticeExtension(opts = {}) {
   };
 }
 
+// src/agent-rules.ts
+var AGENT_RULES = `## Working rules
+- When you say you will run, check, or change something, make that tool call in the same
+  turn. Never end a turn with only a plan or a script printed as text.
+- If the same error appears twice, stop retrying variants. Read the relevant source, docs
+  or full error output, or try a different approach. Do not re-read a file you already read
+  unless it has changed.
+- Before saying a task is done, check the result the user will see: run the program, open
+  the output, or run the specific test. Say plainly what you checked and what you did not.`;
+
 // src/tool-guard.ts
 async function reportToolGuardTrigger(opts, toolName) {
   try {
@@ -6371,6 +6464,13 @@ function installFooterRightAlign(mode) {
 
 // src/changelog.ts
 var CHANGELOG_HIGHLIGHTS = [
+  {
+    version: "0.4.3",
+    highlights: [
+      "The ad banner now refreshes while you work, at most once a minute.",
+      "If our terms have changed since you signed up, you'll be asked to review and accept them."
+    ]
+  },
   {
     version: "0.4.2",
     highlights: ["Credits now sit on the right of the footer, under the model name."]
@@ -6736,12 +6836,89 @@ function createHeaderExtension(opts) {
   };
 }
 
+// src/fusion.ts
+var FUSION_ID = "fusion";
+var FUSION_NAME = "Fusion · Argon plans, DeepSeek builds";
+var FUSION_PLANNER_ID = "gemini-4-argon-flex";
+var FUSION_EXECUTOR_ID = "deepseek-v4-flash";
+function editedThisTurn(messages) {
+  for (let i = messages.length - 1;i >= 0; i--) {
+    const message = messages[i];
+    if (message.role === "user")
+      break;
+    if (message.role === "toolResult" && (message.toolName === "edit" || message.toolName === "write") && !message.isError) {
+      return true;
+    }
+  }
+  return false;
+}
+function hasNewUserInput(request) {
+  const failedAt = request.failed?.message.timestamp;
+  if (failedAt === undefined)
+    return false;
+  for (let i = request.messages.length - 1;i >= 0; i--) {
+    const message = request.messages[i];
+    if (message.role === "assistant")
+      return false;
+    if (message.role === "user")
+      return message.timestamp > failedAt;
+  }
+  return false;
+}
+function routeFusion(request, models) {
+  const phase = request.state?.phase ?? "plan";
+  const restartPlan = request.reason === "user" || request.reason === "retry" && hasNewUserInput(request);
+  const route = (model, nextPhase = phase) => ({
+    model,
+    thinkingLevel: request.thinkingLevel,
+    state: request.reason === "direct" ? undefined : request.state?.phase === nextPhase ? request.state : { phase: nextPhase }
+  });
+  if (!models.planner || !models.executor) {
+    return route(models.defaultModel, restartPlan ? "plan" : phase);
+  }
+  switch (request.reason) {
+    case "user":
+      return route(models.planner, "plan");
+    case "direct":
+      return route(models.executor);
+    case "retry": {
+      if (restartPlan)
+        return route(models.planner, "plan");
+      const failed = request.failed;
+      if (!failed || failed.model.provider === PROVIDER_NAME && failed.model.id === FUSION_PLANNER_ID) {
+        return route(models.executor, "build");
+      }
+      return { ...route(failed.model), thinkingLevel: failed.thinkingLevel ?? request.thinkingLevel };
+    }
+    case "continuation":
+      return phase === "build" || editedThisTurn(request.messages) ? route(models.executor, "build") : route(models.planner, "plan");
+  }
+}
+function createFusionExtension(defaultModelId) {
+  return {
+    name: "free-pi-fusion",
+    factory: (pi) => {
+      pi.registerVirtualModel({
+        provider: PROVIDER_NAME,
+        id: FUSION_ID,
+        name: FUSION_NAME,
+        input: ["text"],
+        route: (request, ctx) => routeFusion(request, {
+          planner: ctx.modelRegistry.find(PROVIDER_NAME, FUSION_PLANNER_ID),
+          executor: ctx.modelRegistry.find(PROVIDER_NAME, FUSION_EXECUTOR_ID),
+          defaultModel: ctx.modelRegistry.find(PROVIDER_NAME, defaultModelId)
+        })
+      });
+    }
+  };
+}
+
 // src/provider-lock.ts
 function resolveFreePiScope(modelRuntime, providerName, modelIds, env = process.env) {
   if (env.FREEPI_KEEP_ENV_PROVIDERS)
     return [];
   const scoped = [];
-  for (const id of modelIds) {
+  for (const id of new Set([...modelIds, FUSION_ID])) {
     const model = modelRuntime.getModel(providerName, id);
     if (model)
       scoped.push({ model });
@@ -6834,6 +7011,7 @@ var SDK_TOOLS = [
   "list_mcp_resource_templates",
   "read_mcp_resource"
 ];
+var SKILLS_DIR = resolve2(dirname3(fileURLToPath3(import.meta.url)), "..", "skills");
 function resolveModelName(opts) {
   return opts.models?.[0]?.name || opts.model || MODEL_ID;
 }
@@ -6895,11 +7073,13 @@ function buildRuntimeOptions(opts, sessionId) {
     updateLatest: opts.updateLatest
   });
   const todoToolExtension = createTodoToolExtension();
+  const toolAliasesExtension = createToolAliasesExtension();
   const mcpExtension = { name: "pi-mcp", factory: createMcpExtension() };
   const codemodeExtension = { name: "pi-codemode", factory: createCodemodeExtension({ models: false }) };
   const toolSearchExtension = { name: "pi-tool-search", factory: createToolSearchExtension() };
   const extensionFactories = [
     providerExtension,
+    createFusionExtension(models[0].id),
     adsExtension,
     usageToolExtension,
     buyToolExtension,
@@ -6909,6 +7089,7 @@ function buildRuntimeOptions(opts, sessionId) {
     commandsExtension,
     headerExtension,
     todoToolExtension,
+    toolAliasesExtension,
     mcpExtension,
     codemodeExtension,
     toolSearchExtension
@@ -6916,7 +7097,11 @@ function buildRuntimeOptions(opts, sessionId) {
   const settingsManager = buildSettingsManager(opts, models, opts.projectTrusted === true);
   return {
     settingsManager,
-    resourceLoaderOptions: { extensionFactories },
+    resourceLoaderOptions: {
+      extensionFactories,
+      additionalSkillPaths: [SKILLS_DIR],
+      appendSystemPromptOverride: (base) => [...base, AGENT_RULES]
+    },
     extensionNames: extensionFactories.map((e) => e.name),
     tools: SDK_TOOLS
   };
@@ -6924,7 +7109,7 @@ function buildRuntimeOptions(opts, sessionId) {
 function getSessionDir(cwd, agentDir) {
   const resolvedCwd = resolve2(cwd);
   const safePath = `--${resolvedCwd.replace(/^[/\\]/, "").replace(/[/\\:]/g, "-")}--`;
-  return join3(resolve2(agentDir), "sessions", safePath);
+  return join4(resolve2(agentDir), "sessions", safePath);
 }
 async function createSessionManager(cwd, sessionDir, sessionId, api = SessionManager) {
   if (sessionId) {
@@ -7023,18 +7208,19 @@ var CONSENT_PROMPT = "Accept? [y/N] ";
 function parseConsentAnswer(answer) {
   return /^\s*y(es)?\s*$/i.test(answer);
 }
+var REPROMPT_CONSENT_TEXT = CONSENT_TEXT.replace("Decline and nothing is sent to the free-pi server.", "Decline and free-pi exits; you will be asked again next time.");
 
 // src/prompt.ts
-async function promptConsent(deps) {
+async function promptConsent(deps, text = CONSENT_TEXT) {
   if (!deps.stdinIsTTY) {
     deps.log(NON_INTERACTIVE_CONSENT_TEXT);
     return false;
   }
-  deps.log(CONSENT_TEXT);
+  deps.log(text);
   const answer = await deps.askLine(CONSENT_PROMPT);
   return parseConsentAnswer(answer);
 }
-async function promptConsentInteractive() {
+async function promptConsentInteractive(text) {
   return promptConsent({
     stdinIsTTY: process.stdin.isTTY === true,
     log: (message) => console.log(message),
@@ -7046,7 +7232,7 @@ async function promptConsentInteractive() {
         rl.close();
       }
     }
-  });
+  }, text);
 }
 
 // src/real-spawn.ts
@@ -7142,6 +7328,24 @@ async function checkToken(baseUrl, jwt) {
   });
   if (res.status === 401)
     throw new UnauthorizedError;
+  if (!res.ok)
+    return;
+  const body = await res.json().catch(() => {
+    return;
+  });
+  const v = body?.consent_version;
+  return typeof v === "string" || v === null ? v : undefined;
+}
+async function submitUserConsent(baseUrl, jwt, consentVersion) {
+  const res = await fetch(new URL("/me/consent", baseUrl), {
+    method: "POST",
+    headers: { authorization: `Bearer ${jwt}`, "content-type": "application/json" },
+    body: JSON.stringify({ consent_version: consentVersion })
+  });
+  if (res.status === 401)
+    throw new UnauthorizedError;
+  if (!res.ok)
+    throw new Error(`consent submission failed: HTTP ${res.status}`);
 }
 
 // src/run.ts
@@ -7175,7 +7379,7 @@ ${INTRO_TEXT}
 
 // src/whats-new.ts
 import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, writeFileSync } from "node:fs";
-import { dirname as dirname3 } from "node:path";
+import { dirname as dirname4 } from "node:path";
 function maybeWhatsNew(cliVersion, agentDir) {
   try {
     const path = getLastSeenVersionPath(agentDir);
@@ -7195,7 +7399,7 @@ function maybeWhatsNew(cliVersion, agentDir) {
   }
 }
 function writeLastSeen(path, version) {
-  mkdirSync(dirname3(path), { recursive: true });
+  mkdirSync(dirname4(path), { recursive: true });
   writeFileSync(path, version, "utf-8");
 }
 
@@ -7235,7 +7439,19 @@ async function run(deps, argv = process.argv) {
   let jwt = await loadJwt(deps.credentialsPath);
   if (jwt) {
     try {
-      await checkToken(deps.baseUrl, jwt);
+      const serverConsent = await checkToken(deps.baseUrl, jwt);
+      if (serverConsent !== undefined && serverConsent !== CONSENT_VERSION) {
+        if (!await deps.promptConsent(REPROMPT_CONSENT_TEXT)) {
+          deps.log("Declined. free-pi needs you to accept the updated terms to continue; you will be asked again next time.");
+          return 1;
+        }
+        try {
+          await submitUserConsent(deps.baseUrl, jwt, CONSENT_VERSION);
+        } catch (err) {
+          if (err instanceof UnauthorizedError)
+            throw err;
+        }
+      }
     } catch (err) {
       if (err instanceof UnauthorizedError) {
         await clearJwt(deps.credentialsPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "free-pi-cli",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Free, ad-supported distribution of the pi coding agent. Inference paid for by ads.",
   "license": "MIT",
   "type": "module",
@@ -9,6 +9,7 @@
   },
   "files": [
     "dist",
+    "skills",
     "README.md"
   ],
   "engines": {

package/skills/long-jobs/SKILL.md

@@ -0,0 +1,14 @@
+---
+name: long-jobs
+description: Use when running builds, test suites, dev servers, downloads, decompilers, or any command expected to take longer than about a minute. Covers checking tools first, running jobs in the background with a log, waiting once, and not hiding errors.
+---
+
+# Long-running jobs
+
+- Before relying on a tool, check it exists once (`command -v gh cmake timeout`) and note what is missing. Do not assume `sudo`.
+- Run the specific test or target first. Run a full suite once, at the end.
+- Before rerunning a long job, check whether its earlier output or log already exists.
+- Start long processes in the background with output to a log file and the PID saved: `nohup cmd > job.log 2>&1 & echo $! > job.pid`. Stop them with `kill $(cat job.pid)`. Never use `pkill -f` with a pattern that also matches your own command line.
+- Wait once, with a time limit, for a marker in the log: `timeout 600 sh -c 'until grep -q "done" job.log; do sleep 5; done'`. To wait for the process instead: `timeout 600 sh -c 'while kill -0 $(cat job.pid) 2>/dev/null; do sleep 5; done'`. Do not poll with repeated short sleep-and-tail calls, and do not use `tail -f | grep` (it keeps waiting after the match).
+- Check a port is free before starting a server, and stop the servers you started.
+- Do not hide errors: no `2>/dev/null` and no `| tail` on a command whose failure you need to diagnose. Test a new parser or script on a small sample first.