@tpsdev-ai/flair 0.4.2 → 0.4.4

package/dist/cli.js

@@ -39,6 +39,46 @@ function readPortFromConfig() {
     catch { /* ignore */ }
     return null;
 }
+// Unified port resolution: --port flag > FLAIR_URL env > config file > default
+// Every command that talks to Harper MUST use these helpers.
+function resolveHttpPort(opts) {
+    if (opts.port !== undefined && opts.port !== null) {
+        const n = Number(opts.port);
+        if (!isNaN(n) && n > 0)
+            return n;
+    }
+    const envUrl = process.env.FLAIR_URL;
+    if (envUrl) {
+        const m = envUrl.match(/:(\d+)/);
+        if (m)
+            return Number(m[1]);
+    }
+    return readPortFromConfig() ?? DEFAULT_PORT;
+}
+// Ops port resolution: --ops-port flag > FLAIR_OPS_PORT env > config opsPort > httpPort - 1
+function resolveOpsPort(opts) {
+    if (opts.opsPort !== undefined && opts.opsPort !== null) {
+        const n = Number(opts.opsPort);
+        if (!isNaN(n) && n > 0)
+            return n;
+    }
+    const envOps = process.env.FLAIR_OPS_PORT;
+    if (envOps)
+        return Number(envOps);
+    // Try reading from config
+    try {
+        const p = configPath();
+        if (existsSync(p)) {
+            const yaml = readFileSync(p, "utf-8");
+            const m = yaml.match(/opsPort:\s*(\d+)/);
+            if (m)
+                return Number(m[1]);
+        }
+    }
+    catch { /* ignore */ }
+    // Default: httpPort - 1
+    return resolveHttpPort(opts) - 1;
+}
 function writeConfig(port) {
     const p = configPath();
     mkdirSync(join(homedir(), ".flair"), { recursive: true });
@@ -251,8 +291,8 @@ program
     .option("--skip-soul", "Skip interactive personality setup")
     .action(async (opts) => {
     const agentId = opts.agentId;
-    const httpPort = Number(opts.port);
-    const opsPort = opts.opsPort ? Number(opts.opsPort) : DEFAULT_OPS_PORT;
+    const httpPort = resolveHttpPort(opts);
+    const opsPort = resolveOpsPort(opts);
     const keysDir = opts.keysDir ?? defaultKeysDir();
     const dataDir = opts.dataDir ?? defaultDataDir();
     // Admin password: generate if not provided, NEVER written to disk
@@ -278,6 +318,12 @@ program
             if (!bin)
                 throw new Error("@harperfast/harper not found in node_modules.\nRun: npm install @harperfast/harper");
             mkdirSync(dataDir, { recursive: true });
+            // Detect whether Harper has already been installed in this data dir.
+            // harper-config.yaml is created during install — its presence means
+            // install already ran. Re-running install against an existing data dir
+            // crashes in Harper v5 beta.6+ (checkForExistingInstall queries the
+            // database before the env is initialized).
+            const alreadyInstalled = existsSync(join(dataDir, "harper-config.yaml"));
             const opsSocket = join(dataDir, "operations-server");
             const harperSetConfig = JSON.stringify({
                 rootPath: dataDir,
@@ -287,8 +333,17 @@ program
                 localStudio: { enabled: false },
                 authentication: { authorizeLocal: true, enableSessions: true },
             });
+            // Isolate from any global Harper install. Harper's installer reads
+            // ~/.harperdb/hdb_boot_properties.file to detect prior installs —
+            // if one exists (unrelated to flair), checkForExistingInstall crashes
+            // in beta.6+ querying databases with an uninitialized env. Setting
+            // HOME to flair's own dir prevents the subprocess from seeing the
+            // global boot file. Flair never uses the boot file (relies on
+            // ROOTPATH), so this is safe.
+            const flairHome = join(dataDir, ".."); // ~/.flair
             const env = {
                 ...process.env,
+                HOME: flairHome,
                 ROOTPATH: dataDir,
                 HARPER_SET_CONFIG: harperSetConfig,
                 DEFAULTS_MODE: "dev",
@@ -300,25 +355,27 @@ program
                 OPERATIONSAPI_NETWORK_PORT: String(opsPort),
                 LOCAL_STUDIO: "false",
             };
-            // Install Harper (creates system database, admin user, config file).
-            // IMPORTANT: Do NOT pre-create harper-config.yaml — Harper's install checks
-            // for its existence to detect existing installations. If found, it skips
-            // install and tries to read the (empty) database, causing a crash.
-            console.log("Installing Harper...");
-            await new Promise((resolve, reject) => {
-                let output = "";
-                const install = spawn(process.execPath, [bin, "install"], { cwd: flairPackageDir(), env });
-                install.stdout?.on("data", (d) => { output += d.toString(); });
-                install.stderr?.on("data", (d) => { output += d.toString(); });
-                install.on("exit", (code) => code === 0 ? resolve() : reject(new Error(`Harper install failed (${code}): ${output}`)));
-                install.on("error", reject);
-                setTimeout(() => { install.kill(); reject(new Error(`Harper install timed out: ${output}`)); }, 60_000);
-            });
-            // Start Harper in dev mode (detached). Dev mode sets authorizeLocal=true
-            // which allows our Ed25519 middleware to handle auth while internal
-            // cross-resource calls (e.g. SemanticSearch → Memory) pass through.
+            if (alreadyInstalled) {
+                console.log("Existing Harper installation found — skipping install.");
+                console.log("If something is wrong, run: flair doctor");
+            }
+            else {
+                console.log("Installing Harper...");
+                await new Promise((resolve, reject) => {
+                    let output = "";
+                    const install = spawn(process.execPath, [bin, "install"], { cwd: flairPackageDir(), env });
+                    install.stdout?.on("data", (d) => { output += d.toString(); });
+                    install.stderr?.on("data", (d) => { output += d.toString(); });
+                    install.on("exit", (code) => code === 0 ? resolve() : reject(new Error(`Harper install failed (${code}): ${output}`)));
+                    install.on("error", reject);
+                    setTimeout(() => { install.kill(); reject(new Error(`Harper install timed out: ${output}`)); }, 60_000);
+                });
+            }
+            // Start Harper with flair loaded as a component (the "." arg).
+            // ROOTPATH in env points to the data dir; authorizeLocal and thread
+            // count are set via HARPER_SET_CONFIG — no need for dev mode.
             console.log(`Starting Harper on port ${httpPort}...`);
-            const proc = spawn(process.execPath, [bin, "dev", "."], { cwd: flairPackageDir(), env, detached: true, stdio: "ignore" });
+            const proc = spawn(process.execPath, [bin, "run", "."], { cwd: flairPackageDir(), env, detached: true, stdio: "ignore" });
             proc.unref();
         }
         console.log("Waiting for Harper health check...");
@@ -425,8 +482,8 @@ agent
     .option("--keys-dir <dir>", "Directory for Ed25519 keys")
     .option("--ops-port <port>", "Harper operations API port")
     .action(async (id, opts) => {
-    const httpPort = Number(opts.port);
-    const opsPort = opts.opsPort ? Number(opts.opsPort) : DEFAULT_OPS_PORT;
+    const httpPort = resolveHttpPort(opts);
+    const opsPort = resolveOpsPort(opts);
     const keysDir = opts.keysDir ?? defaultKeysDir();
     const adminPass = opts.adminPass;
     const adminUser = DEFAULT_ADMIN_USER;
@@ -462,7 +519,32 @@ agent
 agent
     .command("list")
     .description("List all agents")
-    .action(async () => console.log(JSON.stringify(await api("GET", "/Agent"), null, 2)));
+    .option("--admin-pass <pass>", "Admin password (or set FLAIR_ADMIN_PASS env)")
+    .option("--port <port>", "Harper HTTP port")
+    .action(async (opts) => {
+    const port = resolveHttpPort(opts);
+    const adminPass = opts.adminPass ?? process.env.FLAIR_ADMIN_PASS ?? "";
+    if (adminPass) {
+        // Use admin basic auth against ops API to list agents directly
+        const opsPort = resolveOpsPort(opts);
+        const auth = Buffer.from(`${DEFAULT_ADMIN_USER}:${adminPass}`).toString("base64");
+        const res = await fetch(`http://127.0.0.1:${opsPort}/`, {
+            method: "POST",
+            headers: { "Content-Type": "application/json", Authorization: `Basic ${auth}` },
+            body: JSON.stringify({ operation: "sql", sql: "SELECT id, name, createdAt FROM flair.Agent ORDER BY createdAt" }),
+        });
+        if (!res.ok) {
+            const text = await res.text().catch(() => "");
+            console.error(`Error: ${res.status} ${text}`);
+            process.exit(1);
+        }
+        console.log(JSON.stringify(await res.json(), null, 2));
+    }
+    else {
+        // Try agent-authed API (requires FLAIR_AGENT_ID to be set)
+        console.log(JSON.stringify(await api("GET", "/Agent"), null, 2));
+    }
+});
 agent
     .command("show <id>")
     .description("Show agent details")
@@ -475,8 +557,8 @@ agent
     .option("--admin-pass <pass>", "Admin password (or set FLAIR_ADMIN_PASS env)")
     .option("--keys-dir <dir>", "Directory for Ed25519 keys")
     .action(async (id, opts) => {
-    const httpPort = Number(opts.port);
-    const opsPort = opts.opsPort ? Number(opts.opsPort) : DEFAULT_OPS_PORT;
+    const httpPort = resolveHttpPort(opts);
+    const opsPort = resolveOpsPort(opts);
     const adminPass = opts.adminPass ?? process.env.FLAIR_ADMIN_PASS ?? "";
     const adminUser = DEFAULT_ADMIN_USER;
     const keysDir = opts.keysDir ?? defaultKeysDir();
@@ -554,7 +636,7 @@ agent
     .option("--keys-dir <dir>", "Directory for Ed25519 keys")
     .option("--force", "Skip interactive confirmation (required when stdin is not a TTY)")
     .action(async (id, opts) => {
-    const opsPort = opts.opsPort ? Number(opts.opsPort) : Number(opts.port) + 1;
+    const opsPort = resolveOpsPort(opts);
     const adminPass = opts.adminPass ?? process.env.FLAIR_ADMIN_PASS ?? "";
     const adminUser = DEFAULT_ADMIN_USER;
     const keysDir = opts.keysDir ?? defaultKeysDir();
@@ -665,8 +747,8 @@ program
     .option("--admin-pass <pass>", "Admin password (or set FLAIR_ADMIN_PASS env)")
     .option("--keys-dir <dir>", "Directory for Ed25519 keys (for from-agent Ed25519 auth)")
     .action(async (fromAgent, toAgent, opts) => {
-    const httpPort = Number(opts.port);
-    const opsPort = opts.opsPort ? Number(opts.opsPort) : DEFAULT_OPS_PORT;
+    const httpPort = resolveHttpPort(opts);
+    const opsPort = resolveOpsPort(opts);
     const adminPass = opts.adminPass ?? process.env.FLAIR_ADMIN_PASS ?? "";
     const adminUser = DEFAULT_ADMIN_USER;
     const scope = opts.scope ?? "read";
@@ -713,8 +795,8 @@ program
     .option("--ops-port <port>", "Harper operations API port")
     .option("--admin-pass <pass>", "Admin password (or set FLAIR_ADMIN_PASS env)")
     .action(async (fromAgent, toAgent, opts) => {
-    const httpPort = Number(opts.port);
-    const opsPort = opts.opsPort ? Number(opts.opsPort) : DEFAULT_OPS_PORT;
+    const httpPort = resolveHttpPort(opts);
+    const opsPort = resolveOpsPort(opts);
     const adminPass = opts.adminPass ?? process.env.FLAIR_ADMIN_PASS ?? "";
     const adminUser = DEFAULT_ADMIN_USER;
     if (!adminPass) {
@@ -753,7 +835,7 @@ program
     .option("--port <port>", "Harper HTTP port")
     .option("--url <url>", "Flair base URL (overrides --port)")
     .action(async (opts) => {
-    const port = opts.port ? Number(opts.port) : (readPortFromConfig() ?? DEFAULT_PORT);
+    const port = resolveHttpPort(opts);
     const baseUrl = opts.url ?? `http://127.0.0.1:${port}`;
     let healthy = false;
     let agentCount = null;
@@ -831,7 +913,7 @@ program
     .description("Stop the running Flair (Harper) instance")
     .option("--port <port>", "Harper HTTP port")
     .action(async (opts) => {
-    const port = opts.port ? Number(opts.port) : (readPortFromConfig() ?? DEFAULT_PORT);
+    const port = resolveHttpPort(opts);
     const platform = process.platform;
     if (platform === "darwin") {
         // macOS: try launchd first
@@ -874,7 +956,7 @@ program
     .description("Restart the Flair (Harper) instance")
     .option("--port <port>", "Harper HTTP port")
     .action(async (opts) => {
-    const port = opts.port ? Number(opts.port) : (readPortFromConfig() ?? DEFAULT_PORT);
+    const port = resolveHttpPort(opts);
     const platform = process.platform;
     if (platform === "darwin") {
         const label = "ai.tpsdev.flair";
@@ -1034,7 +1116,7 @@ program
     .option("--batch-size <n>", "Records per batch", "50")
     .option("--delay-ms <ms>", "Delay between batches (ms)", "100")
     .action(async (opts) => {
-    const port = opts.port ? Number(opts.port) : (readPortFromConfig() ?? DEFAULT_PORT);
+    const port = resolveHttpPort(opts);
     const baseUrl = `http://127.0.0.1:${port}`;
     const agentId = opts.agent;
     const staleOnly = opts.staleOnly ?? false;
@@ -1115,7 +1197,7 @@ program
     .requiredOption("--agent <id>", "Agent ID to test with")
     .option("--port <port>", "Harper HTTP port")
     .action(async (opts) => {
-    const port = opts.port ? Number(opts.port) : (readPortFromConfig() ?? DEFAULT_PORT);
+    const port = resolveHttpPort(opts);
     const baseUrl = `http://127.0.0.1:${port}`;
     const agentId = opts.agent;
     const keysDir = defaultKeysDir();
@@ -1198,7 +1280,7 @@ program
     .option("--fix", "Automatically fix issues where possible")
     .option("--dry-run", "Show what --fix would do without making changes")
     .action(async (opts) => {
-    const port = opts.port ? Number(opts.port) : (readPortFromConfig() ?? DEFAULT_PORT);
+    const port = resolveHttpPort(opts);
     const autoFix = opts.fix ?? false;
     const dryRun = opts.dryRun ?? false;
     if (dryRun && !autoFix) {
@@ -1472,7 +1554,7 @@ program
     .option("--key <path>", "Ed25519 private key path")
     .action(async (query, opts) => {
     try {
-        const baseUrl = opts.url || `http://127.0.0.1:${opts.port}`;
+        const baseUrl = opts.url || `http://127.0.0.1:${resolveHttpPort(opts)}`;
         const headers = { "content-type": "application/json" };
         const keyPath = opts.key || resolveKeyPath(opts.agent);
         if (keyPath) {
@@ -1516,7 +1598,7 @@ program
     .option("--url <url>", "Flair base URL (overrides --port)")
     .option("--key <path>", "Ed25519 private key path")
     .action(async (opts) => {
-    const baseUrl = opts.url || `http://127.0.0.1:${opts.port}`;
+    const baseUrl = opts.url || `http://127.0.0.1:${resolveHttpPort(opts)}`;
     try {
         const headers = { "content-type": "application/json" };
         const keyPath = opts.key || resolveKeyPath(opts.agent);
@@ -1566,7 +1648,7 @@ program
     .option("--url <url>", "Flair base URL (overrides --port)")
     .option("--admin-pass <pass>", "Admin password (or set FLAIR_ADMIN_PASS env)")
     .action(async (opts) => {
-    const baseUrl = opts.url ?? `http://127.0.0.1:${opts.port}`;
+    const baseUrl = opts.url ?? `http://127.0.0.1:${resolveHttpPort(opts)}`;
     const adminPass = opts.adminPass ?? process.env.FLAIR_ADMIN_PASS ?? "";
     const adminUser = DEFAULT_ADMIN_USER;
     if (!adminPass) {
@@ -1646,7 +1728,7 @@ program
     .option("--admin-pass <pass>", "Admin password (or set FLAIR_ADMIN_PASS env)")
     .option("--dry-run", "Show what would be imported without making changes")
     .action(async (backupPath, opts) => {
-    const baseUrl = opts.url ?? `http://127.0.0.1:${opts.port}`;
+    const baseUrl = opts.url ?? `http://127.0.0.1:${resolveHttpPort(opts)}`;
     const adminPass = opts.adminPass ?? process.env.FLAIR_ADMIN_PASS ?? "";
     const adminUser = DEFAULT_ADMIN_USER;
     const dryRun = Boolean(opts.dryRun);
@@ -1763,7 +1845,7 @@ program
     .option("--admin-pass <pass>", "Admin password (or set FLAIR_ADMIN_PASS env)")
     .option("--keys-dir <dir>", "Keys directory", defaultKeysDir())
     .action(async (agentId, opts) => {
-    const baseUrl = opts.url ?? `http://127.0.0.1:${opts.port}`;
+    const baseUrl = opts.url ?? `http://127.0.0.1:${resolveHttpPort(opts)}`;
     const adminPass = opts.adminPass ?? process.env.FLAIR_ADMIN_PASS ?? "";
     if (!adminPass) {
         console.error("Error: --admin-pass or FLAIR_ADMIN_PASS required");
@@ -1850,8 +1932,8 @@ program
     .option("--admin-pass <pass>", "Admin password (or set FLAIR_ADMIN_PASS env)")
     .option("--keys-dir <dir>", "Keys directory", defaultKeysDir())
     .action(async (importPath, opts) => {
-    const baseUrl = opts.url ?? `http://127.0.0.1:${opts.port}`;
-    const opsPort = opts.opsPort ? Number(opts.opsPort) : DEFAULT_OPS_PORT;
+    const baseUrl = opts.url ?? `http://127.0.0.1:${resolveHttpPort(opts)}`;
+    const opsPort = resolveOpsPort(opts);
     const adminPass = opts.adminPass ?? process.env.FLAIR_ADMIN_PASS ?? "";
     if (!adminPass) {
         console.error("Error: --admin-pass or FLAIR_ADMIN_PASS required");
@@ -1979,7 +2061,7 @@ program
     const fromDir = opts.from;
     const toDir = opts.to;
     const dryRun = opts.dryRun ?? false;
-    const opsPort = opts.opsPort ? Number(opts.opsPort) : Number(opts.port) + 1;
+    const opsPort = resolveOpsPort(opts);
     const adminPass = opts.adminPass ?? process.env.FLAIR_ADMIN_PASS ?? "";
     if (!existsSync(fromDir)) {
         console.log(`Old keys directory not found: ${fromDir}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tpsdev-ai/flair",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Identity, memory, and soul for AI agents. Cryptographic identity (Ed25519), semantic memory with local embeddings, and persistent personality — all in a single process.",
   "type": "module",
   "license": "Apache-2.0",