pi-freeflow 1.38.0 → 1.38.2

package/src/commands.ts

@@ -28,6 +28,7 @@ import {
  type DeployPlatform,
 } from "./deploy.ts";
 import {
+ createLogFollower,
  LOG_LEVEL_ORDER,
  getMinLogLevel,
  isDebugEnabled,
@@ -323,9 +324,12 @@ function spawnWithProgress(
 }
 
 /**
- * Follow-mode log poller: tracks the count of matched lines already printed
- * and notifies only lines beyond it, so repeated ticks never re-notify the
- * same tail. One poller at a time — a re-run clears the previous interval.
+ * Follow-mode log poller: one stateful byte-offset follower over the live log
+ * file (createLogFollower), so each tick reads only the bytes appended since
+ * the previous tick instead of re-reading the log file and every rotated
+ * archive. Existing content is the one-shot tail's job — it is printed before
+ * this poller starts, and the follower never re-reports it. One poller at a
+ * time: a re-run clears the previous interval.
  * Stop with stopLogsFollow (session shutdown / non-follow commands).
  */
 let logsFollowTimer: NodeJS.Timeout | null = null;
@@ -339,29 +343,20 @@ function startLogsFollow(
  ctx: ExtensionContext,
  filterLevel: LogLevel | null,
  filterReqId: string | null,
- count: number,
  filterText: string | null,
- baselineMatched: number,
 ): void {
  stopLogsFollow();
- let lastPrinted = baselineMatched;
+ const follower = createLogFollower({
+  level: filterLevel,
+  reqId: filterReqId,
+  text: filterText,
+ });
  logsFollowTimer = setInterval(() => {
   try {
-   const tail = readRecentLogs(filterLevel, filterReqId, count, filterText);
-   if (tail.totalMatched < lastPrinted) {
-    // Log rotated/rewritten below the baseline — re-baseline silently.
-    lastPrinted = tail.totalMatched;
-    return;
-   }
-   const newCount = tail.totalMatched - lastPrinted;
-   if (newCount <= 0) return;
-   const newLines = tail.lines.slice(
-    tail.lines.length - Math.min(newCount, tail.lines.length),
-   ).slice(-50);
+   const newLines = follower.next();
    if (newLines.length > 0) {
     ctx.ui.notify(newLines.join("\n"), "info");
    }
-   lastPrinted = tail.totalMatched;
   } catch { }
  }, 1000);
  // @ts-ignore allow unref to not block process exit in CLI
@@ -514,13 +509,38 @@ export function validateDeployProjectName(
  }
  return { ok: true, name: clean };
 }
+/**
+ * /freeflow update restarts the daemon the session is actually attached to: a
+ * walked port must not keep serving the old build after a successful update.
+ * Three indirections keep that contract testable without module mocking — the
+ * update-step runner, the attached-port lookup and the killer. Production never
+ * calls the setter; the defaults are the real spawnWithProgress, the real
+ * getClientPort() || PORT and the real killPortHolder.
+ */
+let updateStepRunner = spawnWithProgress;
+let attachedPortResolver = (): number => getClientPort() || PORT;
+let attachedPortKiller = (port: number): Promise<unknown> => killPortHolder(port);
+
+/** Test seam for the /freeflow update restart path (null restores the real deps). */
+export function _setUpdateRestartDepsForTest(
+ opts: {
+  runUpdateStep?: (cmd: string, args: string[], ctx: ExtensionContext) => Promise<number>;
+  resolveAttachedPort?: () => number;
+  killAttachedPort?: (port: number) => Promise<unknown>;
+ } | null,
+): void {
+ updateStepRunner = opts?.runUpdateStep ?? spawnWithProgress;
+ attachedPortResolver = opts?.resolveAttachedPort ?? ((): number => getClientPort() || PORT);
+ attachedPortKiller = opts?.killAttachedPort ?? ((port: number): Promise<unknown> => killPortHolder(port));
+}
+
 export function createCommandSpec(
  _pi: ExtensionAPI,
  onCatalogRefreshed?: (models: RegisteredModel[]) => void,
 ): Omit<RegisteredCommand, "name"> {
  return {
   description:
-   "Relay egress: auto | spread | on | off | hide | show | widget hide/show | status | add <URL> [name] | list | use <URL|name|index> [name] | label <target> <name> | remove <target> | test [target|opencode] [--chat] | export [path] [--include-secrets] | import <path> [--merge|--replace] [--dry-run] | logs [level] [n] | debug on|off | refresh | update [auto on|off] | autoupdate [on|off] | deploy cloudflare | deploy deno | deploy vercel | install-startup | uninstall-startup | cline login [--key] [slot] | cline accounts | cline logout [slot]",
+   "Relay egress: auto | spread | on | off | hide | show | widget hide/show | status | kill|stop|shutdown | add <URL> [name] | list | use <URL|name|index> [name] | label <target> <name> | remove <target> | url [value] | test [target|opencode] [--chat] | export [path] [--include-secrets] | import <path> [--merge|--replace] [--dry-run] | logs [level] [n] | trace [reqId] | debug on|off|level <level> | refresh | models|reload | update [auto on|off] | autoupdate [on|off] | deploy cloudflare | deploy deno | deploy vercel | install-startup | uninstall-startup | cline login [--key] [slot] | cline accounts | cline logout [slot] | cline signout|switch",
   getArgumentCompletions: (prefix: string) =>
    [
     "auto",
@@ -531,6 +551,9 @@ export function createCommandSpec(
     "widget hide",
     "widget show",
     "status",
+    "kill",
+    "stop",
+    "shutdown",
     "add",
     "list",
     "use",
@@ -559,10 +582,19 @@ export function createCommandSpec(
     "cline login --key",
     "cline accounts",
     "cline logout",
+    "cline signout",
+    "cline switch",
     "refresh",
     "models",
+    "reload",
     "logs",
     "debug",
+    "debug on",
+    "debug off",
+    "debug level debug",
+    "debug level info",
+    "debug level warn",
+    "debug level error",
     "trace",
    ]
     .filter((s) => s.startsWith(prefix))
@@ -593,22 +625,6 @@ export function createCommandSpec(
     relayState = withRelayState(updater);
     return relayState;
    };
-   const setRelay = (
-    enabled: boolean,
-    url: string,
-    addLabel?: string,
-   ) => {
-    applyRelayState((s) => {
-     s.enabled = enabled;
-     const cleanUrl = (url || "").trim() || "";
-     s.url = cleanUrl;
-     if (cleanUrl) {
-      ensureRelay(s, cleanUrl, addLabel);
-     }
-     return s;
-    });
-   };
-
    const addRelayInteractive = async () => {
     const inputUrl = (
      await ctx.ui.input(
@@ -628,12 +644,17 @@ export function createCommandSpec(
      )
     )?.trim() || defaultLabel;
 
-    applyRelayState((s) => {
-     const added = ensureRelay(s, inputUrl, inputLabel);
-     s.enabled = true;
-     s.url = added.url;
-     return s;
-    });
+    try {
+     applyRelayState((s) => {
+      const added = ensureRelay(s, inputUrl, inputLabel);
+      s.enabled = true;
+      s.url = added.url;
+      return s;
+     });
+    } catch (e) {
+     ctx.ui.notify((e as Error).message, "warning");
+     return;
+    }
     persist();
     flash();
     ctx.ui.notify(
@@ -1255,7 +1276,7 @@ export function createCommandSpec(
          piAvailable: isCommandAvailable("pi"),
         })) {
          if (lastStep !== "") ctx.ui.notify(`${lastStep} exited ${code} — trying ${step.manual}…`, "info");
-         code = await spawnWithProgress(step.cmd, step.args, ctx);
+         code = await updateStepRunner(step.cmd, step.args, ctx);
          manual = step.manual;
          lastStep = step.manual;
          if (code === 0) break;
@@ -1271,11 +1292,13 @@ export function createCommandSpec(
            "info",
           );
           manual = plan.manual;
-          code = await spawnWithProgress(plan.cmd, plan.args, ctx);
+          code = await updateStepRunner(plan.cmd, plan.args, ctx);
          }
         }
         if (code === 0) {
-         try { await killPortHolder(PORT); } catch { }
+         // Restart the daemon that is actually attached — a walked port must
+         // not leave the old build serving after a successful update.
+         try { await attachedPortKiller(attachedPortResolver()); } catch { }
          ctx.ui.notify(`Updated to ${latest} and restarted proxy daemon`, "info");
         } else {
          ctx.ui.notify(
@@ -1442,13 +1465,17 @@ export function createCommandSpec(
      }
     } else {
      const st = loadDebugState();
-     const cur = st?.debug
-      ? "debug (ON)"
-      : st?.level ||
-      process.env.FREEFLOW_LOG_LEVEL ||
-      "info";
+     const minLevel = getMinLogLevel();
+     // Report the level the logger actually filters at, not the raw fields: a
+     // fresh install (no state file) and FREEFLOW_DEBUG=1 both run at debug
+     // without either being persisted anywhere.
+     const effective =
+      (Object.keys(LOG_LEVEL_ORDER) as LogLevel[]).find(
+       (level) => LOG_LEVEL_ORDER[level] === minLevel,
+      ) ?? "info";
+     const cur = st?.debug ? "debug (ON)" : effective;
      ctx.ui.notify(
-      `Debug status: ${cur}\nFile: ${DEBUG_STATE_FILE}\nMinLevel: ${getMinLogLevel()} | isDebug=${isDebugEnabled()}\nUsage: /freeflow debug on|off | /freeflow debug level debug`,
+      `Debug status: ${cur}\nFile: ${DEBUG_STATE_FILE}\nMinLevel: ${minLevel} | isDebug=${isDebugEnabled()}\nUsage: /freeflow debug on|off | /freeflow debug level debug`,
       "info",
      );
     }
@@ -1523,9 +1550,7 @@ export function createCommandSpec(
         ctx,
         filterLevel,
         filterReqId,
-        count,
         filterText,
-        result.totalMatched,
        );
       }
       return;
@@ -1541,9 +1566,7 @@ export function createCommandSpec(
        ctx,
        filterLevel,
        filterReqId,
-       count,
        filterText,
-       result.totalMatched,
       );
      }
     } catch (e) {
@@ -1850,13 +1873,18 @@ export function createCommandSpec(
       relayState.url || "",
      ));
     const cleanInput = (input || "").trim() || "";
-    applyRelayState((s) => {
-     s.url = cleanInput;
-     if (cleanInput) {
-      ensureRelay(s, cleanInput, shortRelayLabel(cleanInput, s.relays));
-     }
-     return s;
-    });
+    try {
+     applyRelayState((s) => {
+      s.url = cleanInput;
+      if (cleanInput) {
+       ensureRelay(s, cleanInput, shortRelayLabel(cleanInput, s.relays));
+      }
+      return s;
+     });
+    } catch (e) {
+     ctx.ui.notify((e as Error).message, "warning");
+     return;
+    }
     persist();
     flash();
    } else if (sub === "deploy") {

package/src/daemon.ts

@@ -1,144 +1,146 @@
-/**
- * Detached proxy daemon entry for pi-freeflow.
- *
- * Spawned as a separate OS process by src/client.ts so the local proxy survives
- * the OMP/Pi session that started it. Owns port 28180, serves the proxy plus
- * the client lease/control endpoints, and retires itself once no client holds
- * a live lease (request-idleness alone never retires it).
- *
- * Run directly: `node --experimental-strip-types src/daemon.ts` (or `bun src/daemon.ts`).
- */
-
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import {
- DAEMON_GC_MS,
- DAEMON_GRACE_MS,
- DAEMON_TTL_MS,
- HOST,
- PKG_VERSION,
- PORT,
-} from "./config.ts";
-import { setShutdownShouldExit } from "./proxy.ts";
-import {
- getAliveCatalog,
- refreshCatalog,
- setAliveCatalog,
-} from "./catalog.ts";
-import { log, logInfo, logWarn } from "./logger.ts";
-import {
- startLeaseGC,
- stopLeaseGC,
- touchActivity,
-} from "./lease.ts";
-import { getActiveRequests, startProxy } from "./proxy.ts";
-import { loadRelayState, setActiveRelayState } from "./relay-state.ts";
-
-/** True when this module was run as the entry script (not imported by tests). */
-export function isDaemonMain(): boolean {
- try {
-  const entry = process.argv[1];
-  if (!entry) return false;
-  return path.resolve(entry) === fileURLToPath(import.meta.url);
- } catch {
-  return false;
- }
-}
-
-/**
- * Load the on-disk relay state into this process's in-memory cache so routing
- * uses the latest client edits without a daemon restart. Non-fatal on failure.
- */
-export function syncRelayStateFromDisk(): void {
- try {
-  setActiveRelayState(loadRelayState(), false);
- } catch (e) {
-  log("warn", "daemon failed to load relay state from disk", { error: String(e) });
- }
-}
-
-/**
- * Serve the static+disk catalog and refresh it in the background, mirroring
- * what the host session did in-process. Keeps /v1/models correct after the
- * 24h cache TTL without requiring a daemon restart.
- */
-export async function seedCatalog(): Promise<void> {
- try {
-  const fresh = await refreshCatalog(false);
-  if (fresh.length > 0) {
-   setAliveCatalog(fresh);
-  }
- } catch (e) {
-  logWarn("daemon catalog refresh failed; retaining static catalog", {
-   error: String(e),
-  });
- }
- logInfo(`daemon catalog ready: ${getAliveCatalog().length} models`);
-}
-
-/**
- * Boot the detached proxy daemon. Binds the port, seeds catalog + relay state,
- * starts the lease GC, and installs signal handlers so the daemon exits
- * cleanly on SIGTERM/SIGINT (e.g. /freeflow kill, taskkill, Ctrl+C).
- */
-export async function runDaemon(): Promise<void> {
- let server: { close(): void } | null = null;
- const retire = (why: string): void => {
-  logInfo(`daemon retiring: ${why}`);
-  stopLeaseGC();
-  try {
-   server?.close();
-  } catch { }
-  process.exit(0);
- };
- process.on("SIGTERM", () => retire("SIGTERM"));
- process.on("SIGINT", () => retire("SIGINT"));
- process.on("uncaughtException", (err) => {
-  log("error", "daemon uncaughtException", { error: String(err), stack: (err as Error)?.stack, activeRequests: getActiveRequests() });
- });
- process.on("unhandledRejection", (reason) => {
-  log("error", "daemon unhandledRejection", { error: String(reason), activeRequests: getActiveRequests() });
- });
- setShutdownShouldExit(true);
- try {
-  const r = await startProxy();
-  if (!r.server) {
-   // Port was taken by another (possibly newer) daemon — the parent
-   // attaches to the winner; this spawn exits quietly.
-   logInfo(`daemon found an existing proxy on http://${HOST}:${r.port} — exiting`);
-   process.exit(0);
-  }
-  server = r.server;
- } catch (e) {
-  log("error", "daemon failed to bind proxy port", { error: String(e) });
-  process.exit(1);
- }
-
- // lastActivityAt is still seeded AT BIND TIME for the /_health snapshot, but
- // retirement no longer reads it — only the zero-lease persistence window
- // gates the GC, so a fresh spawn always survives its re-attach window.
- touchActivity();
- syncRelayStateFromDisk();
- void seedCatalog();
-
- // Retire only when zero leases persist past the grace window with nothing
- // in flight — never for request-idleness.
- startLeaseGC({
-  ttlMs: DAEMON_TTL_MS,
-  gcMs: DAEMON_GC_MS,
-  graceMs: DAEMON_GRACE_MS,
-  getActiveRequests,
-  onIdle: () => retire("no clients"),
- });
-
- logInfo(`pi-freeflow daemon v${PKG_VERSION} listening on http://${HOST}:${PORT}`);
-}
-
-// Entry guard: run only when executed as the entry script. When imported by
-// tests, isDaemonMain() is false and no port is bound.
-if (isDaemonMain()) {
- runDaemon().catch((e) => {
-  log("error", "daemon crashed", { error: String(e) });
-  process.exit(1);
- });
-}
+/**
+ * Detached proxy daemon entry for pi-freeflow.
+ *
+ * Spawned as a separate OS process by src/client.ts so the local proxy survives
+ * the OMP/Pi session that started it. Owns port 28180, serves the proxy plus
+ * the client lease/control endpoints, and retires itself once no client holds
+ * a live lease (request-idleness alone never retires it).
+ *
+ * Run directly: `node --experimental-strip-types src/daemon.ts` (or `bun src/daemon.ts`).
+ */
+
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import {
+ DAEMON_GC_MS,
+ DAEMON_GRACE_MS,
+ DAEMON_TTL_MS,
+ HOST,
+ PKG_VERSION,
+ PORT,
+} from "./config.ts";
+import { setShutdownShouldExit } from "./proxy.ts";
+import {
+ getAliveCatalog,
+ refreshCatalog,
+ setAliveCatalog,
+} from "./catalog.ts";
+import { log, logInfo, logWarn } from "./logger.ts";
+import {
+ startLeaseGC,
+ stopLeaseGC,
+ touchActivity,
+} from "./lease.ts";
+import { getActiveRequests, startProxy } from "./proxy.ts";
+import { loadRelayState, setActiveRelayState } from "./relay-state.ts";
+
+/** True when this module was run as the entry script (not imported by tests). */
+export function isDaemonMain(): boolean {
+ try {
+  const entry = process.argv[1];
+  if (!entry) return false;
+  return path.resolve(entry) === fileURLToPath(import.meta.url);
+ } catch {
+  return false;
+ }
+}
+
+/**
+ * Load the on-disk relay state into this process's in-memory cache so routing
+ * uses the latest client edits without a daemon restart. Non-fatal on failure.
+ */
+export function syncRelayStateFromDisk(): void {
+ try {
+  setActiveRelayState(loadRelayState(), false);
+ } catch (e) {
+  log("warn", "daemon failed to load relay state from disk", { error: String(e) });
+ }
+}
+
+/**
+ * Serve the static+disk catalog and refresh it in the background, mirroring
+ * what the host session did in-process. Keeps /v1/models correct after the
+ * 24h cache TTL without requiring a daemon restart.
+ */
+export async function seedCatalog(): Promise<void> {
+ try {
+  const fresh = await refreshCatalog(false);
+  if (fresh.length > 0) {
+   setAliveCatalog(fresh);
+  }
+ } catch (e) {
+  logWarn("daemon catalog refresh failed; retaining static catalog", {
+   error: String(e),
+  });
+ }
+ logInfo(`daemon catalog ready: ${getAliveCatalog().length} models`);
+}
+
+/**
+ * Boot the detached proxy daemon. Binds the port, seeds catalog + relay state,
+ * starts the lease GC, and installs signal handlers so the daemon exits
+ * cleanly on SIGTERM/SIGINT (e.g. /freeflow kill, taskkill, Ctrl+C).
+ */
+export async function runDaemon(): Promise<void> {
+ let server: { close(): void } | null = null;
+ const retire = (why: string): void => {
+  logInfo(`daemon retiring: ${why}`);
+  stopLeaseGC();
+  try {
+   server?.close();
+  } catch { }
+  process.exit(0);
+ };
+ process.on("SIGTERM", () => retire("SIGTERM"));
+ process.on("SIGINT", () => retire("SIGINT"));
+ process.on("uncaughtException", (err) => {
+  log("error", "daemon uncaughtException", { error: String(err), stack: (err as Error)?.stack, activeRequests: getActiveRequests() });
+ });
+ process.on("unhandledRejection", (reason) => {
+  log("error", "daemon unhandledRejection", { error: String(reason), activeRequests: getActiveRequests() });
+ });
+ setShutdownShouldExit(true);
+ let boundPort = PORT;
+ try {
+  const r = await startProxy();
+  if (!r.server) {
+   // Port was taken by another (possibly newer) daemon — the parent
+   // attaches to the winner; this spawn exits quietly.
+   logInfo(`daemon found an existing proxy on http://${HOST}:${r.port} — exiting`);
+   process.exit(0);
+  }
+  server = r.server;
+  boundPort = r.port;
+ } catch (e) {
+  log("error", "daemon failed to bind proxy port", { error: String(e) });
+  process.exit(1);
+ }
+
+ // lastActivityAt is still seeded AT BIND TIME for the /_health snapshot, but
+ // retirement no longer reads it — only the zero-lease persistence window
+ // gates the GC, so a fresh spawn always survives its re-attach window.
+ touchActivity();
+ syncRelayStateFromDisk();
+ void seedCatalog();
+
+ // Retire only when zero leases persist past the grace window with nothing
+ // in flight — never for request-idleness.
+ startLeaseGC({
+  ttlMs: DAEMON_TTL_MS,
+  gcMs: DAEMON_GC_MS,
+  graceMs: DAEMON_GRACE_MS,
+  getActiveRequests,
+  onIdle: () => retire("no clients"),
+ });
+
+ logInfo(`pi-freeflow daemon v${PKG_VERSION} listening on http://${HOST}:${boundPort}`);
+}
+
+// Entry guard: run only when executed as the entry script. When imported by
+// tests, isDaemonMain() is false and no port is bound.
+if (isDaemonMain()) {
+ runDaemon().catch((e) => {
+  log("error", "daemon crashed", { error: String(e) });
+  process.exit(1);
+ });
+}

package/src/index.ts

@@ -1,7 +1,7 @@
 /**
  * pi-freeflow — Modular, high-resiliency LLM extension for Pi & Oh My Pi (OMP)
  *
- * Provides access to 35 free models (11 OpenCode Zen + 14 KiloCode Gateway + 2 Cline + 8 OVH) with:
+ * Provides access to the free-model catalog (OpenCode Zen, KiloCode Gateway, Cline, OVH) with:
  * - Single-port daemon reuse on 28180 across concurrent subagents
  * - Multi-cloud rolling egress relays (Vercel Edge, Cloudflare, Deno)
  * - 0ms instant startup with verified static catalog and background live health checks
@@ -273,7 +273,7 @@ export default async function(pi: ExtensionAPI): Promise<void> {
       ? `Relay pool ready: ${freshRelayState.relays.length} relay(s). Run /freeflow for pool management.`
       : "Relay pool empty — direct mode. Run /freeflow deploy to add your own egress.";
     ctx.ui?.notify?.(
-     `freeflow ready: ${ALL_MODELS.length} free models via local proxy 127.0.0.1:28180. ${hint}`,
+     `freeflow ready: ${ALL_MODELS.length} free models via local proxy ${HOST}:${actualPort}. ${hint}`,
      "info",
     );
    }