@tpsdev-ai/flair 0.30.0 → 0.31.0

package/dist/lib/scheduler-platform.js

@@ -0,0 +1,128 @@
+/**
+ * Platform-scheduler primitives shared by every Flair-managed background job.
+ *
+ * Two modules install user-session scheduler entries today:
+ *   - src/rem/scheduler.ts        (`flair rem nightly enable`)
+ *   - src/federation/scheduler.ts (`flair federation sync enable`)
+ *
+ * They differ in what they schedule and how often; they do NOT differ in how
+ * you ask launchd/systemd whether a job is really loaded, how you read the
+ * answer, or how you render a template into a unit file. This module exists so
+ * there is exactly ONE implementation of those — same reason src/lib/xml-escape.ts
+ * exists (#918): the second copy of a subtle rule is where it goes wrong.
+ *
+ * `interpretActiveResult()` in particular encodes a production lesson
+ * (flair#850) that took a real outage to learn. It must not be re-derived.
+ */
+import { existsSync, mkdirSync, writeFileSync, readFileSync } from "node:fs";
+import { resolve, dirname } from "node:path";
+import { platform } from "node:os";
+import { spawnSync } from "node:child_process";
+/**
+ * 30s ceiling on launchctl/systemctl invocations so a hung service manager
+ * can't block the CLI indefinitely. Sherlock #415 follow-up.
+ */
+export const SPAWN_TIMEOUT_MS = 30_000;
+/**
+ * Status-check spawns (launchctl print / systemctl is-active) return
+ * near-instantly when the service manager is reachable, and fail fast (no
+ * hang) when it isn't (e.g. "Failed to connect to bus"). A short ceiling
+ * keeps status commands and the Health endpoint responsive even when the
+ * query is inconclusive.
+ */
+export const STATUS_CHECK_TIMEOUT_MS = 5_000;
+export function detectPlatform(label, override) {
+    if (override)
+        return override;
+    const p = platform();
+    if (p === "darwin")
+        return "darwin";
+    if (p === "linux")
+        return "linux";
+    throw new Error(`unsupported platform for ${label}: ${p} (only darwin and linux)`);
+}
+export function spawnReport(cmd, timeoutMs = SPAWN_TIMEOUT_MS) {
+    const r = spawnSync(cmd[0], cmd.slice(1), {
+        encoding: "buffer",
+        timeout: timeoutMs,
+    });
+    return {
+        code: r.status,
+        stdout: r.stdout?.toString("utf-8") ?? "",
+        stderr: r.stderr?.toString("utf-8") ?? "",
+    };
+}
+/**
+ * Interprets the result of a `launchctl print` / `systemctl --user is-active`
+ * probe. Shared by the sync (CLI) and async (server) callers of both
+ * schedulers.
+ *
+ * - true  — the service manager confirms the job is loaded/active.
+ * - false — confirmed NOT active. This includes the "no session bus" case
+ *   (flair#850): when `systemctl --user` can't reach a bus, it fails
+ *   before printing a status word ("Failed to connect to bus: No medium
+ *   found") — but nothing CAN be running without a bus, so `false` is the
+ *   honest answer, not "unknown".
+ * - null  — genuinely inconclusive (the command itself couldn't run at
+ *   all — e.g. the binary is missing — with no output to interpret).
+ */
+export function interpretActiveResult(plat, code, stdout, stderr) {
+    const noOutput = !stdout.trim() && !stderr.trim();
+    if (plat === "darwin") {
+        if (code === 0)
+            return true;
+        if (code === null && noOutput)
+            return null; // spawn itself failed — inconclusive
+        return false; // launchctl ran and reported not-loaded
+    }
+    const out = stdout.trim();
+    if (out === "active" || out === "activating")
+        return true;
+    if (out === "inactive" || out === "failed" || out === "unknown")
+        return false;
+    if (code === null && noOutput)
+        return null; // spawn itself failed — inconclusive
+    return false; // covers the no-bus case: empty stdout, nonzero/failed exit
+}
+/**
+ * Human remedy text for a failed scheduler-load attempt (flair#850). Covers
+ * the one root cause traced so far: a missing systemd user session bus,
+ * which blocks `systemctl --user` entirely in ssh-without-lingering,
+ * container, and CI contexts. Returns null when the failure doesn't match a
+ * known pattern — the caller already prints the raw stderr, so the operator
+ * still has something to go on.
+ *
+ * `enableCommand` is the caller's own enable invocation, named in the remedy
+ * so the operator is told to re-run the command they actually ran.
+ */
+export function describeLoadFailure(plat, loadResult, enableCommand) {
+    const stderr = loadResult.stderr || "";
+    if (plat === "linux" && /failed to connect to bus/i.test(stderr)) {
+        return ("No systemd user session bus is available in this session (common over ssh without lingering, " +
+            "in containers, or under CI). Fix: enable lingering for this user — `loginctl enable-linger <user>` " +
+            `— then re-run \`${enableCommand}\`.`);
+    }
+    return null;
+}
+/** Single-pass `{{KEY}}` substitution, with a per-value escape hook. */
+export function renderTemplateWith(text, subs, escape) {
+    return text.replace(/\{\{([A-Z_]+)\}\}/g, (_, key) => {
+        const value = subs[key];
+        if (value === undefined)
+            throw new Error(`unknown template placeholder: ${key}`);
+        return escape(String(value));
+    });
+}
+export function readTemplate(rootDir, relativePath) {
+    const full = resolve(rootDir, relativePath);
+    if (!existsSync(full)) {
+        throw new Error(`template not found: ${full}`);
+    }
+    return readFileSync(full, "utf-8");
+}
+export function writeFileWithDir(path, contents, mode = 0o600) {
+    const dir = dirname(path);
+    if (!existsSync(dir))
+        mkdirSync(dir, { recursive: true, mode: 0o700 });
+    writeFileSync(path, contents, { mode });
+}

package/dist/lib/xml-escape.js

@@ -0,0 +1,54 @@
+/**
+ * XML entity escaping for the launchd plists this CLI generates.
+ *
+ * A launchd plist is XML, so ANY value interpolated into one has to be
+ * escaped or the document is malformed — and `launchctl load` rejects a
+ * malformed plist outright, so the service silently never registers.
+ *
+ * Two independent writers generate plists, and both go through here:
+ *   - buildLaunchdPlist() in src/cli.ts (the Harper service, `flair init`)
+ *   - renderPlistTemplate() in src/rem/scheduler.ts (`flair rem nightly enable`)
+ *
+ * This module exists so there is exactly ONE implementation to get right.
+ * Anything that interpolates into plist XML imports it rather than
+ * hand-rolling a `.replace()` chain at the call site — a local chain is how
+ * this class of bug got in (and how it stayed partial: the original one
+ * covered three of the five entities).
+ */
+/** The five XML predefined entities, in the order they must be replaced. */
+const XML_ESCAPES = [
+    // `&` MUST be first: replacing it after `<` would turn the `&` of an
+    // already-emitted `&lt;` into `&amp;lt;` and corrupt the value.
+    [/&/g, "&amp;"],
+    [/</g, "&lt;"],
+    [/>/g, "&gt;"],
+    [/"/g, "&quot;"],
+    [/'/g, "&apos;"],
+];
+/**
+ * Escape the five XML predefined entities for use inside an XML text node.
+ *
+ * Safe to apply to any string, including one with no special characters.
+ * The result round-trips exactly through unescapeXml().
+ */
+export function escapeXml(s) {
+    let out = s;
+    for (const [pattern, replacement] of XML_ESCAPES)
+        out = out.replace(pattern, replacement);
+    return out;
+}
+/**
+ * Inverse of escapeXml(), for reading a value back out of a document we wrote.
+ *
+ * `&amp;` MUST be decoded LAST, mirroring escapeXml()'s ordering: decoding it
+ * first would turn `&amp;lt;` (the escaping of a literal "&lt;") into `<`
+ * instead of back into `&lt;`.
+ */
+export function unescapeXml(s) {
+    return s
+        .replace(/&lt;/g, "<")
+        .replace(/&gt;/g, ">")
+        .replace(/&quot;/g, '"')
+        .replace(/&apos;/g, "'")
+        .replace(/&amp;/g, "&");
+}

package/dist/rem/scheduler.js

@@ -13,25 +13,25 @@
  * No daemon code lives here — the scheduler invokes the shim, the shim
  * invokes `flair rem nightly run-once`, the runner module does the work.
  */
-import { existsSync, mkdirSync, writeFileSync, readFileSync, chmodSync, rmSync } from "node:fs";
+import { existsSync, chmodSync, rmSync } from "node:fs";
 import { resolve, dirname } from "node:path";
-import { homedir, platform } from "node:os";
-import { spawn, spawnSync } from "node:child_process";
+import { homedir } from "node:os";
+import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
+import { escapeXml } from "../lib/xml-escape.js";
+import { detectPlatform as detectPlatformFor, spawnReport, readTemplate as readTemplateFrom, renderTemplateWith, writeFileWithDir, interpretActiveResult, describeLoadFailure as describeLoadFailureFor, STATUS_CHECK_TIMEOUT_MS, } from "../lib/scheduler-platform.js";
+// Re-exported so this module's public surface is unchanged by the extraction
+// into src/lib/scheduler-platform.ts (a second scheduler — `flair federation
+// sync enable` — needs the identical launchctl/systemctl interpretation, and
+// flair#850's lesson must have exactly one implementation).
+export { interpretActiveResult };
 export const SHIM_PATH_DEFAULT = resolve(homedir(), ".flair", "bin", "flair-rem-nightly");
 export const LAUNCHD_PLIST_PATH = resolve(homedir(), "Library", "LaunchAgents", "dev.flair.rem.nightly.plist");
 export const SYSTEMD_USER_DIR = resolve(homedir(), ".config", "systemd", "user");
 export const SYSTEMD_TIMER_PATH = resolve(SYSTEMD_USER_DIR, "flair-rem-nightly.timer");
 export const SYSTEMD_SERVICE_PATH = resolve(SYSTEMD_USER_DIR, "flair-rem-nightly.service");
 function detectPlatform(override) {
-    if (override)
-        return override;
-    const p = platform();
-    if (p === "darwin")
-        return "darwin";
-    if (p === "linux")
-        return "linux";
-    throw new Error(`unsupported platform for REM nightly scheduler: ${p} (only darwin and linux)`);
+    return detectPlatformFor("REM nightly scheduler", override);
 }
 function defaultTemplateRoot() {
     // Templates live alongside dist/ in the published package and alongside
@@ -50,19 +50,30 @@ function defaultTemplateRoot() {
     throw new Error(`unable to locate templates directory (looked in: ${candidates.join(", ")})`);
 }
 export function renderTemplate(text, subs) {
-    return text.replace(/\{\{([A-Z_]+)\}\}/g, (_, key) => {
-        const value = subs[key];
-        if (value === undefined)
-            throw new Error(`unknown template placeholder: ${key}`);
-        return String(value);
-    });
+    return renderTemplateWith(text, { ...subs }, (v) => v);
+}
+/**
+ * renderTemplate() for the launchd plist template specifically: substituted
+ * values are XML-escaped.
+ *
+ * A launchd plist is XML, so a substitution carrying `&`, `<`, `>`, `"` or
+ * `'` makes it malformed and `launchctl bootstrap` rejects it — the timer
+ * silently never registers. FLAIR_URL is the realistic carrier (a URL with
+ * more than one query parameter contains `&`), but HOME and SHIM_PATH are
+ * arbitrary paths and equally capable of it. HOUR/MINUTE and AGENT_ID are
+ * validated upstream in buildSubstitutions(), but they are escaped too
+ * rather than exempted — the point of a chokepoint is that no value gets to
+ * argue it is special.
+ *
+ * Deliberately NOT folded into renderTemplate(): the same substitutions are
+ * rendered into the systemd unit files and the shell shim, where XML
+ * escaping would be corruption rather than a fix.
+ */
+export function renderPlistTemplate(text, subs) {
+    return renderTemplateWith(text, { ...subs }, escapeXml);
 }
 export function readTemplate(rootDir, relativePath) {
-    const full = resolve(rootDir, relativePath);
-    if (!existsSync(full)) {
-        throw new Error(`template not found: ${full}`);
-    }
-    return readFileSync(full, "utf-8");
+    return readTemplateFrom(rootDir, relativePath);
 }
 /**
  * Validates the hour:minute schedule. Throws on invalid input rather than
@@ -93,32 +104,6 @@ function buildSubstitutions(opts, shimPath, flairBin) {
         MINUTE_PAD: String(opts.minute).padStart(2, "0"),
     };
 }
-function writeFileWithDir(path, contents, mode = 0o600) {
-    const dir = dirname(path);
-    if (!existsSync(dir))
-        mkdirSync(dir, { recursive: true, mode: 0o700 });
-    writeFileSync(path, contents, { mode });
-}
-// 30s ceiling on launchctl/systemctl invocations so a hung service manager
-// can't block the CLI indefinitely. Sherlock #415 follow-up.
-const SPAWN_TIMEOUT_MS = 30_000;
-// Status-check spawns (launchctl print / systemctl is-active) return
-// near-instantly when the service manager is reachable, and fail fast (no
-// hang) when it isn't (e.g. "Failed to connect to bus"). A short ceiling
-// keeps `flair rem nightly status` and the Health endpoint responsive even
-// when the query is inconclusive.
-const STATUS_CHECK_TIMEOUT_MS = 5_000;
-function spawnReport(cmd, timeoutMs = SPAWN_TIMEOUT_MS) {
-    const r = spawnSync(cmd[0], cmd.slice(1), {
-        encoding: "buffer",
-        timeout: timeoutMs,
-    });
-    return {
-        code: r.status,
-        stdout: r.stdout?.toString("utf-8") ?? "",
-        stderr: r.stderr?.toString("utf-8") ?? "",
-    };
-}
 /**
  * Command to genuinely query the platform scheduler's active/loaded state
  * for a given install (as opposed to the shape of `loadCommand`, which
@@ -131,37 +116,6 @@ function activeCheckCommand(plat) {
     }
     return ["systemctl", "--user", "is-active", "flair-rem-nightly.timer"];
 }
-/**
- * Interprets the result of `activeCheckCommand()`. Shared by the sync
- * (CLI) and async (server) callers.
- *
- * - true  — the service manager confirms the job is loaded/active.
- * - false — confirmed NOT active. This includes the "no session bus" case
- *   (flair#850): when `systemctl --user` can't reach a bus, it fails
- *   before printing a status word ("Failed to connect to bus: No medium
- *   found") — but nothing CAN be running without a bus, so `false` is the
- *   honest answer, not "unknown".
- * - null  — genuinely inconclusive (the command itself couldn't run at
- *   all — e.g. the binary is missing — with no output to interpret).
- */
-export function interpretActiveResult(plat, code, stdout, stderr) {
-    const noOutput = !stdout.trim() && !stderr.trim();
-    if (plat === "darwin") {
-        if (code === 0)
-            return true;
-        if (code === null && noOutput)
-            return null; // spawn itself failed — inconclusive
-        return false; // launchctl ran and reported not-loaded
-    }
-    const out = stdout.trim();
-    if (out === "active" || out === "activating")
-        return true;
-    if (out === "inactive" || out === "failed" || out === "unknown")
-        return false;
-    if (code === null && noOutput)
-        return null; // spawn itself failed — inconclusive
-    return false; // covers the no-bus case: empty stdout, nonzero/failed exit
-}
 /**
  * Synchronous active-state check for CLI use (`flair rem nightly status`).
  * Blocking is fine here — this is a one-shot process and the caller wants
@@ -220,13 +174,7 @@ export async function queryActiveStateAsync(plat, timeoutMs = STATUS_CHECK_TIMEO
  * still has something to go on.
  */
 export function describeLoadFailure(plat, loadResult) {
-    const stderr = loadResult.stderr || "";
-    if (plat === "linux" && /failed to connect to bus/i.test(stderr)) {
-        return ("No systemd user session bus is available in this session (common over ssh without lingering, " +
-            "in containers, or under CI). Fix: enable lingering for this user — `loginctl enable-linger <user>` " +
-            "— then re-run `flair rem nightly enable`.");
-    }
-    return null;
+    return describeLoadFailureFor(plat, loadResult, "flair rem nightly enable");
 }
 /**
  * Formats the `flair rem nightly enable` report from an `EnableResult`.
@@ -330,7 +278,7 @@ export function enableScheduler(opts) {
     // 2. Write the scheduler entry.
     if (plat === "darwin") {
         const plistPath = opts.launchdPlistOverride ?? LAUNCHD_PLIST_PATH;
-        const plistContents = renderTemplate(readTemplate(templateRoot, "launchd/dev.flair.rem.nightly.plist.tmpl"), subs);
+        const plistContents = renderPlistTemplate(readTemplate(templateRoot, "launchd/dev.flair.rem.nightly.plist.tmpl"), subs);
         writeFileWithDir(plistPath, plistContents, 0o600);
         const loadCommand = ["launchctl", "bootstrap", `gui/${process.getuid?.() ?? ""}`, plistPath];
         let loadResult;

package/dist/rem/snapshot.js

@@ -134,6 +134,19 @@ export async function extractSnapshot(opts) {
         throw new Error(`target directory already exists: ${targetDir}`);
     }
     mkdirSync(targetDir, { recursive: true, mode: 0o700 });
+    // Deliberately NOT preservePaths, and deliberately NOT routed through
+    // src/lib/safe-snapshot-extract.ts. The snapshot path comes from the
+    // operator, so provenance here is no more controlled than the data-dir
+    // restore's — the difference is the flag, not the trust. With node-tar's
+    // defaults its own containment applies: it strips a leading "/" from entry
+    // paths, drops ".." entries, and refuses to write through a symlink,
+    // including one created earlier in the same archive. Verified against the
+    // pinned tar (7.5.20) on all four cases — absolute path, ".." traversal,
+    // in-archive symlink, pre-existing symlink in the target — each contained,
+    // with a benign control entry landing to prove the archives were valid.
+    // If `preservePaths` is ever added here, that containment is gone and this
+    // call MUST move to extractSnapshotSafely, which is why the data-dir
+    // restore needs the wrapper and this does not.
     await tarExtract({ file: opts.snapshotPath, cwd: targetDir });
     return { targetDir, entries };
 }