@tpsdev-ai/flair 0.4.1 → 0.4.3

package/dist/cli.js

@@ -19,7 +19,12 @@ function defaultDataDir() {
     return join(homedir(), ".flair", "data");
 }
 function configPath() {
-    return join(homedir(), ".flair", "config.yaml");
+    // Check both .yaml and .yml extensions
+    const yamlPath = join(homedir(), ".flair", "config.yaml");
+    const ymlPath = join(homedir(), ".flair", "config.yml");
+    if (existsSync(ymlPath) && !existsSync(yamlPath))
+        return ymlPath;
+    return yamlPath;
 }
 function readPortFromConfig() {
     try {
@@ -34,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 });
@@ -246,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
@@ -273,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,
@@ -295,25 +346,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...");
@@ -420,8 +473,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;
@@ -457,7 +510,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")
@@ -470,8 +548,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();
@@ -549,7 +627,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();
@@ -660,8 +738,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";
@@ -708,8 +786,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) {
@@ -748,7 +826,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;
@@ -826,7 +904,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
@@ -869,7 +947,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";
@@ -1029,7 +1107,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;
@@ -1110,7 +1188,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();
@@ -1190,38 +1268,140 @@ program
     .command("doctor")
     .description("Diagnose common Flair problems and suggest fixes")
     .option("--port <port>", "Harper HTTP port")
+    .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 baseUrl = `http://127.0.0.1:${port}`;
+    const port = resolveHttpPort(opts);
+    const autoFix = opts.fix ?? false;
+    const dryRun = opts.dryRun ?? false;
+    if (dryRun && !autoFix) {
+        console.log("  ℹ️  --dry-run only has effect with --fix\n");
+    }
+    let effectivePort = port;
+    let baseUrl = `http://127.0.0.1:${port}`;
     let issues = 0;
+    let harperResponding = false;
     console.log("\n🩺 Flair Doctor\n");
-    // 1. Port check — is something listening?
-    try {
-        const res = await fetch(`${baseUrl}/Health`, { signal: AbortSignal.timeout(3000) });
-        if (res.status > 0) {
-            console.log(`  ✅ Harper responding on port ${port}`);
+    // Helper: try to reach Harper on a given port
+    async function probePort(p) {
+        try {
+            const res = await fetch(`http://127.0.0.1:${p}/Health`, { signal: AbortSignal.timeout(3000) });
+            return res.status > 0;
+        }
+        catch {
+            return false;
         }
     }
-    catch {
-        console.log(`  ❌ Nothing responding on port ${port}`);
-        // Check if port is in use by something else
+    // Helper: discover what port a Harper PID is listening on
+    async function discoverPortFromPid(pid) {
+        // Defense-in-depth: caller already validates, but re-check here
+        if (!/^\d+$/.test(pid))
+            return null;
         try {
             const { execSync } = await import("node:child_process");
-            const lsof = execSync(`lsof -ti :${port}`, { encoding: "utf-8" }).trim();
-            if (lsof) {
-                console.log(`     Port ${port} is in use by PID ${lsof} — might be a stale process`);
-                console.log(`     Fix: kill ${lsof} && flair restart`);
+            const out = execSync(`lsof -aPi -p ${pid} -sTCP:LISTEN -Fn 2>/dev/null || true`, { encoding: "utf-8" });
+            const match = out.match(/:(\d+)$/m);
+            if (match)
+                return Number(match[1]);
+        }
+        catch { /* ignore */ }
+        return null;
+    }
+    // 1. Port check — is something listening?
+    // First, check PID file so we can cross-reference
+    const dataDir0 = defaultDataDir();
+    const pidFile0 = join(dataDir0, "hdb.pid");
+    let pidAlive = false;
+    let pidValue = "";
+    if (existsSync(pidFile0)) {
+        const rawPid = (await import("node:fs")).readFileSync(pidFile0, "utf-8").trim();
+        // Strict integer validation — PID must be purely numeric to prevent injection
+        if (/^\d+$/.test(rawPid)) {
+            pidValue = rawPid;
+            try {
+                process.kill(Number(pidValue), 0);
+                pidAlive = true;
+            }
+            catch { /* dead */ }
+        }
+        else {
+            console.log(`  ⚠️  PID file contains non-numeric value: ${pidFile0} — skipping`);
+        }
+    }
+    if (await probePort(port)) {
+        console.log(`  ✅ Harper responding on port ${port}`);
+        harperResponding = true;
+    }
+    else {
+        // Port didn't respond — but if PID is alive, try to find the real port
+        let discoveredPort = null;
+        if (pidAlive) {
+            discoveredPort = await discoverPortFromPid(pidValue);
+            if (discoveredPort && discoveredPort !== port && await probePort(discoveredPort)) {
+                console.log(`  ⚠️  Harper not on expected port ${port}, but responding on port ${discoveredPort} (PID ${pidValue})`);
+                console.log(`     Your config says port ${port} but Harper is actually running on ${discoveredPort}`);
+                if (autoFix) {
+                    if (dryRun) {
+                        console.log(`     Would update config to port ${discoveredPort}`);
+                    }
+                    else {
+                        writeConfig(discoveredPort);
+                        console.log(`     ✅ Updated config to port ${discoveredPort}`);
+                    }
+                }
+                else {
+                    console.log(`     Fix: flair doctor --fix (updates config to match running port)`);
+                }
+                effectivePort = discoveredPort;
+                baseUrl = `http://127.0.0.1:${discoveredPort}`;
+                harperResponding = true;
+                issues++;
             }
             else {
-                console.log(`     Harper is not running`);
-                console.log(`     Fix: flair init --agent-id <your-agent>`);
+                console.log(`  ❌ Harper process alive (PID ${pidValue}) but not responding on any detected port`);
+                console.log(`     Fix: flair restart`);
+                issues++;
             }
         }
-        catch {
-            console.log(`     Harper is not running`);
-            console.log(`     Fix: flair init --agent-id <your-agent>`);
+        else {
+            // No live PID — Harper genuinely isn't running
+            // Check if something else grabbed the port
+            try {
+                const { execSync } = await import("node:child_process");
+                const lsof = execSync(`lsof -ti :${port}`, { encoding: "utf-8" }).trim();
+                if (lsof) {
+                    console.log(`  ❌ Nothing responding on port ${port} (port occupied by PID ${lsof})`);
+                    console.log(`     Fix: kill ${lsof} && flair restart`);
+                }
+                else {
+                    console.log(`  ❌ Harper is not running`);
+                    console.log(`     Fix: flair restart`);
+                }
+            }
+            catch {
+                console.log(`  ❌ Harper is not running`);
+                if (autoFix) {
+                    if (dryRun) {
+                        console.log(`     Would run: flair restart`);
+                    }
+                    else {
+                        console.log(`     Attempting restart...`);
+                        try {
+                            const { execSync } = await import("node:child_process");
+                            execSync(`${process.argv[0]} ${process.argv[1]} restart --port ${port}`, { stdio: "inherit" });
+                            console.log(`     ✅ Restart attempted`);
+                        }
+                        catch {
+                            console.log(`     ❌ Restart failed — try: flair init --agent-id <your-agent>`);
+                        }
+                    }
+                }
+                else {
+                    console.log(`     Fix: flair restart`);
+                }
+            }
+            issues++;
         }
-        issues++;
     }
     // 2. Keys directory
     const keysDir = defaultKeysDir();
@@ -1242,7 +1422,7 @@ program
         issues++;
     }
     // 3. Config file
-    const cfgPath = join(homedir(), ".flair", "config.yaml");
+    const cfgPath = configPath();
     if (existsSync(cfgPath)) {
         const savedPort = readPortFromConfig();
         console.log(`  ✅ Config: ${cfgPath} (port: ${savedPort ?? "default"})`);
@@ -1250,12 +1430,9 @@ program
     else {
         console.log(`  ⚠️  No config file at ${cfgPath} — using defaults`);
     }
-    // 4. Embeddings check (only if Harper is running)
-    try {
-        const res = await fetch(`${baseUrl}/Health`, { signal: AbortSignal.timeout(3000) });
-        if (res.status > 0) {
-            // Try a test embedding via SemanticSearch with a dummy query
-            // If embedding mode is "none", search will include _warning
+    // 4. Embeddings check (only if Harper is responding)
+    if (harperResponding) {
+        try {
             const testRes = await fetch(`${baseUrl}/SemanticSearch`, {
                 method: "POST",
                 headers: { "Content-Type": "application/json" },
@@ -1275,24 +1452,37 @@ program
                 }
             }
             else if (testRes.status === 401) {
-                // Auth required — can't test embeddings without an agent key
                 console.log(`  ⚠️  Embeddings: cannot verify (auth required for SemanticSearch)`);
             }
         }
+        catch { /* fetch error, already flagged */ }
     }
-    catch { /* Harper not running, already flagged above */ }
-    // 5. Stale PID file
+    // 5. Stale PID file (skip if already reported in port check)
     const dataDir = defaultDataDir();
     const pidFile = join(dataDir, "hdb.pid");
     if (existsSync(pidFile)) {
         const pidContent = (await import("node:fs")).readFileSync(pidFile, "utf-8").trim();
         try {
-            process.kill(Number(pidContent), 0); // check if process exists
-            console.log(`  ✅ PID file: ${pidFile} (process ${pidContent} is alive)`);
+            process.kill(Number(pidContent), 0);
+            if (harperResponding) {
+                console.log(`  ✅ PID file: ${pidFile} (process ${pidContent} is alive)`);
+            }
+            // If not responding, we already reported the issue in step 1
         }
         catch {
             console.log(`  ❌ Stale PID file: ${pidFile} (process ${pidContent} is dead)`);
-            console.log(`     Fix: rm ${pidFile} && flair restart`);
+            if (autoFix) {
+                if (dryRun) {
+                    console.log(`     Would remove: ${pidFile}`);
+                }
+                else {
+                    (await import("node:fs")).unlinkSync(pidFile);
+                    console.log(`     ✅ Removed stale PID file`);
+                }
+            }
+            else {
+                console.log(`     Fix: rm ${pidFile} && flair restart`);
+            }
             issues++;
         }
     }
@@ -1355,7 +1545,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) {
@@ -1399,7 +1589,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);
@@ -1449,7 +1639,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) {
@@ -1529,7 +1719,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);
@@ -1646,7 +1836,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");
@@ -1733,8 +1923,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");
@@ -1862,7 +2052,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.1",
+  "version": "0.4.3",
   "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",