free-pi-cli 0.6.2 → 0.6.3

package/dist/index.js

@@ -30,4 +30,4 @@ if (err) {
   console.error(err);
   process.exit(1);
 }
-await import("./main-cwwgr8bh.js");
+await import("./main-q0zat1nk.js");

package/dist/{main-cwwgr8bh.js → main-q0zat1nk.js}

@@ -5,8 +5,10 @@ import {
 } from "./index-n5qs9pq1.js";
 
 // src/main.ts
-import { realpathSync as realpathSync4, writeFileSync as writeFileSync3 } from "node:fs";
-import { dirname as dirname10, join as join12 } from "node:path";
+import { spawn as spawn3 } from "node:child_process";
+import { realpathSync as realpathSync5, writeFileSync as writeFileSync3 } from "node:fs";
+import { homedir as homedir7 } from "node:os";
+import { dirname as dirname11, join as join13 } from "node:path";
 
 // src/browser.ts
 import { spawn } from "node:child_process";
@@ -15057,7 +15059,7 @@ var HiveClassifyResponseSchema = exports_external.object({
 // package.json
 var package_default = {
   name: "free-pi-cli",
-  version: "0.6.2",
+  version: "0.6.3",
   description: "Free, ad-supported distribution of the pi coding agent. Inference paid for by ads.",
   license: "MIT",
   type: "module",
@@ -21270,6 +21272,12 @@ function mergeAttribution(a, b) {
 
 // src/changelog.ts
 var CHANGELOG_HIGHLIGHTS = [
+  {
+    version: "0.6.3",
+    highlights: [
+      "When your version is older than the minimum, free-pi now updates itself and restarts in the same folder, instead of asking you to run a command."
+    ]
+  },
   {
     version: "0.6.2",
     highlights: [
@@ -24562,6 +24570,140 @@ function createRealSpawn(io = { platform: process.platform, spawnSyncImpl: spawn
   };
 }
 
+// src/relaunch.ts
+import { existsSync as existsSync5, mkdtempSync as mkdtempSync2, realpathSync as realpathSync3, rmSync as rmSync2, statSync as statSync3 } from "node:fs";
+import { constants as osConstants, tmpdir as tmpdir2 } from "node:os";
+import { delimiter, dirname as dirname9, isAbsolute as isAbsolute2, join as join11, resolve as resolve4, sep as sep2, win32 } from "node:path";
+function applyRelaunchCwd(env, chdir = (d) => process.chdir(d), isDir = (p) => {
+  try {
+    return statSync3(p).isDirectory();
+  } catch {
+    return false;
+  }
+}) {
+  const dir = env.FREEPI_RELAUNCH_CWD;
+  delete env.FREEPI_RELAUNCH_CWD;
+  if (!dir)
+    return;
+  const fail2 = `free-pi: could not return to your project folder (${dir}) after updating. Run free-pi again from that folder.`;
+  if (!isDir(dir))
+    return fail2;
+  try {
+    chdir(dir);
+  } catch {
+    return fail2;
+  }
+  return;
+}
+var SEMVER = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/;
+function canon(p, fold) {
+  let r;
+  try {
+    r = realpathSync3.native(p);
+  } catch {
+    r = resolve4(p);
+  }
+  return fold ? r.toLowerCase() : r;
+}
+function isInside2(e, d) {
+  return e === d || e.startsWith(d.endsWith(sep2) ? d : d + sep2);
+}
+function hasNodeModulesBin(entry) {
+  const parts = entry.split(/[\\/]+/).map((x) => x.toLowerCase());
+  return parts.some((x, i) => x === "node_modules" && parts[i + 1] === ".bin");
+}
+function sanitizedEnv(env, nodeDir, project, home, win) {
+  const proj = canon(project, win);
+  const broad = proj === canon(home, win) || dirname9(proj) === proj;
+  const out = {};
+  let pathKey = "PATH";
+  let oldPath = "";
+  for (const [k, v] of Object.entries(env)) {
+    const lk = k.toLowerCase();
+    if (lk.startsWith("npm_") || lk === "node_options" || lk === "node_path")
+      continue;
+    if (lk === "path") {
+      pathKey = k;
+      oldPath = v ?? "";
+      continue;
+    }
+    if (win && lk === "comspec")
+      continue;
+    out[k] = v;
+  }
+  if (win) {
+    const sysRoot = Object.entries(env).find(([k]) => k.toLowerCase() === "systemroot")?.[1];
+    const root = sysRoot && win32.isAbsolute(sysRoot) ? sysRoot : "C:\\Windows";
+    const comKey = Object.keys(env).find((k) => k.toLowerCase() === "comspec") ?? "ComSpec";
+    out[comKey] = win32.join(root, "System32", "cmd.exe");
+  }
+  const kept = oldPath.split(delimiter).filter((e) => e && isAbsolute2(e) && (broad || !isInside2(canon(e, win), proj)) && !hasNodeModulesBin(e));
+  out[pathKey] = [nodeDir, ...kept].join(delimiter);
+  return out;
+}
+async function relaunchViaNpx(latest, deps) {
+  const { env } = deps;
+  if ("FREEPI_NO_AUTO_UPDATE" in env || !deps.autoUpdateEnabled())
+    return;
+  if (env.FREEPI_AUTO_UPDATED)
+    return;
+  const win = deps.platform === "win32";
+  if (!latest || !SEMVER.test(latest))
+    return;
+  const target2 = latest;
+  const nodeDir = dirname9(deps.execPath);
+  const npxCli = win ? join11(nodeDir, "node_modules", "npm", "bin", "npx-cli.js") : join11(dirname9(nodeDir), "lib", "node_modules", "npm", "bin", "npx-cli.js");
+  const exists = deps.exists ?? existsSync5;
+  const distroNpxCli = "/usr/share/nodejs/npm/bin/npx-cli.js";
+  let npxCliPath = npxCli;
+  if (!exists(npxCli)) {
+    if (!win && deps.execPath === "/usr/bin/node" && exists(distroNpxCli))
+      npxCliPath = distroNpxCli;
+    else
+      return;
+  }
+  const childEnv = sanitizedEnv(env, nodeDir, deps.cwd, deps.homedir, win);
+  const readyDir = mkdtempSync2(join11(tmpdir2(), "free-pi-relaunch-"));
+  const readyFile = join11(readyDir, "started");
+  try {
+    deps.log(`Updating free-pi to ${target2}…`);
+    return await new Promise((resolve5) => {
+      let child;
+      try {
+        child = deps.spawn(deps.execPath, [npxCliPath, "--yes", `free-pi-cli@${target2}`, ...deps.argv], {
+          stdio: "inherit",
+          cwd: deps.homedir,
+          env: { ...childEnv, FREEPI_AUTO_UPDATED: target2, FREEPI_RELAUNCH_READY: readyFile, FREEPI_RELAUNCH_CWD: deps.cwd },
+          shell: false
+        });
+      } catch {
+        resolve5(undefined);
+        return;
+      }
+      const handlers = win ? [] : [
+        ["SIGINT", () => {}],
+        ["SIGTERM", () => void child.kill("SIGTERM")],
+        ["SIGHUP", () => void child.kill("SIGTERM")]
+      ];
+      for (const [sig, cb] of handlers)
+        deps.proc.on(sig, cb);
+      const done3 = (code) => {
+        for (const [sig, cb] of handlers)
+          deps.proc.off(sig, cb);
+        resolve5(code);
+      };
+      child.on("error", () => done3(undefined));
+      child.on("exit", (code, signal) => {
+        const exitCode = code ?? 128 + (signal ? osConstants.signals[signal] ?? 0 : 0);
+        const cancelled = signal === "SIGINT" || signal === "SIGTERM" || signal === "SIGHUP" || exitCode === 130 || exitCode === 143 || exitCode === 129;
+        done3(exitCode !== 0 && !cancelled && !existsSync5(readyFile) ? undefined : exitCode);
+      });
+    });
+  } finally {
+    rmSync2(readyDir, { recursive: true, force: true });
+  }
+}
+
 // src/run.ts
 import { SessionManager as SessionManager2 } from "@earendil-works/pi-coding-agent";
 
@@ -24692,13 +24834,13 @@ async function readOneKeypress(prompt, stdin = process.stdin, stdout = process.s
   if (typeof stdin.setRawMode === "function")
     stdin.setRawMode(true);
   stdin.resume();
-  return await new Promise((resolve4) => {
+  return await new Promise((resolve5) => {
     const onData = (chunk) => {
       stdin.off("data", onData);
       if (typeof stdin.setRawMode === "function")
         stdin.setRawMode(wasRaw ?? false);
       stdin.pause();
-      resolve4(typeof chunk === "string" ? chunk : chunk.toString("utf8"));
+      resolve5(typeof chunk === "string" ? chunk : chunk.toString("utf8"));
     };
     stdin.once("data", onData);
   });
@@ -24714,9 +24856,9 @@ async function promptResumeInteractive(session) {
 }
 
 // src/onboarding.ts
-import { existsSync as existsSync5, readdirSync as readdirSync3, realpathSync as realpathSync3 } from "node:fs";
+import { existsSync as existsSync6, readdirSync as readdirSync3, realpathSync as realpathSync4 } from "node:fs";
 import { homedir as homedir6 } from "node:os";
-import { join as join11 } from "node:path";
+import { join as join12 } from "node:path";
 var INTRO_ENV_SKIP = "FREEPI_NO_INTRO";
 var INTRO_TEXT = `
 Welcome to free-pi — a free coding agent in your terminal.
@@ -24745,9 +24887,9 @@ var FIRST_TASK_EXPERIMENT = "retain.first_task";
 var PROJECT_MARKERS = [".git", "package.json", "pyproject.toml", "Cargo.toml", "go.mod", "pom.xml", "Gemfile", "composer.json"];
 function looksLikeProject(cwd, home = homedir6()) {
   try {
-    if (realpathSync3(cwd) === realpathSync3(home))
+    if (realpathSync4(cwd) === realpathSync4(home))
       return false;
-    if (PROJECT_MARKERS.some((m) => existsSync5(join11(cwd, m))))
+    if (PROJECT_MARKERS.some((m) => existsSync6(join12(cwd, m))))
       return true;
     return readdirSync3(cwd).some((f) => /\.(sln|csproj)$/.test(f));
   } catch {
@@ -24774,12 +24916,12 @@ ${text}
 }
 
 // src/whats-new.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync2, readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "node:fs";
-import { dirname as dirname9 } from "node:path";
+import { existsSync as existsSync7, mkdirSync as mkdirSync2, readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "node:fs";
+import { dirname as dirname10 } from "node:path";
 function maybeWhatsNew(cliVersion, agentDir) {
   try {
     const path = getLastSeenVersionPath(agentDir);
-    const lastSeen = existsSync6(path) ? readFileSync4(path, "utf-8").trim() : undefined;
+    const lastSeen = existsSync7(path) ? readFileSync4(path, "utf-8").trim() : undefined;
     writeLastSeen(path, cliVersion);
     if (lastSeen === undefined)
       return;
@@ -24795,7 +24937,7 @@ function maybeWhatsNew(cliVersion, agentDir) {
   }
 }
 function writeLastSeen(path, version3) {
-  mkdirSync2(dirname9(path), { recursive: true });
+  mkdirSync2(dirname10(path), { recursive: true });
   writeFileSync2(path, version3, "utf-8");
 }
 
@@ -24950,6 +25092,9 @@ Guest trial is not available right now.
     if (outcome === "updated-exit")
       return 0;
     if (outcome === "blocked") {
+      const relaunched = await deps.relaunchLatest?.(versionCheck.latest);
+      if (relaunched !== undefined)
+        return relaunched;
       deps.log("free-pi-cli needs an update. From a trusted folder (for example: cd ~), run: npx --yes free-pi-cli@latest   (or: npm i -g free-pi-cli@latest)");
       return 1;
     }
@@ -25118,12 +25263,17 @@ async function checkClientVersion(baseUrl, cliVersion, fetchImpl = fetch, jwt2)
 // src/main.ts
 function resolveCliRealpath() {
   try {
-    return realpathSync4(process.argv[1] ?? "");
+    return realpathSync5(process.argv[1] ?? "");
   } catch {
     return "";
   }
 }
 async function main() {
+  const cwdError = applyRelaunchCwd(process.env);
+  if (cwdError) {
+    console.error(cwdError);
+    process.exit(1);
+  }
   if (process.env.FREEPI_RELAUNCH_READY) {
     try {
       writeFileSync3(process.env.FREEPI_RELAUNCH_READY, "");
@@ -25169,11 +25319,23 @@ ${HELP_TEXT}`);
     credentialsPath: getCredentialsPath(agentDir),
     promptConsent: promptConsentInteractive,
     openBrowser,
-    sleep: (ms) => new Promise((resolve4) => setTimeout(resolve4, ms)),
+    sleep: (ms) => new Promise((resolve5) => setTimeout(resolve5, ms)),
     launchPi,
     log: (message) => console.log(message),
     checkClientVersion: (baseUrl, cliVersion, jwt2) => checkClientVersion(baseUrl, cliVersion, fetch, jwt2),
-    startGravityPixel: (jwt2) => startGravityPixel(jwt2, join12(dirname10(agentDir), "gravity")),
+    startGravityPixel: (jwt2) => startGravityPixel(jwt2, join13(dirname11(agentDir), "gravity")),
+    relaunchLatest: (latest) => relaunchViaNpx(latest, {
+      env: process.env,
+      argv: process.argv.slice(2),
+      platform: process.platform,
+      cwd: process.cwd(),
+      homedir: homedir7(),
+      execPath: process.execPath,
+      autoUpdateEnabled: () => readAutoUpdate(getConfigPath()),
+      spawn: (cmd, args, opts) => spawn3(cmd, args, opts),
+      proc: process,
+      log: (message) => console.log(message)
+    }),
     maybeSelfUpdate: (action2, latest) => maybeSelfUpdate(action2, latest, {
       env: process.env,
       autoUpdateEnabled: () => readAutoUpdate(getConfigPath()),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "free-pi-cli",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "Free, ad-supported distribution of the pi coding agent. Inference paid for by ads.",
   "license": "MIT",
   "type": "module",