@tpsdev-ai/flair 0.4.1 → 0.4.2

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 {
@@ -1190,38 +1195,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 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 +1349,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 +1357,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 +1379,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++;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tpsdev-ai/flair",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "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",