gnosys 5.9.4 → 5.10.0

package/dist/cli.js

@@ -4715,6 +4715,101 @@ program
 function isDeadProjectDir(dir) {
     return !existsSync(dir);
 }
+const machineCmd = program
+    .command("machine")
+    .description("Manage this machine's local config (machine.json: machineId, roots, remote)");
+machineCmd
+    .command("show")
+    .description("Show this machine's machine.json")
+    .option("--json", "Output as JSON")
+    .action(async (opts) => {
+    const { readMachineConfig } = await import("./lib/machineConfig.js");
+    const { getMachineConfigPath } = await import("./lib/paths.js");
+    const cfg = readMachineConfig();
+    if (!cfg) {
+        console.log(`No machine.json yet (${getMachineConfigPath()}).`);
+        console.log("Run 'gnosys machine migrate' (existing setup) or 'gnosys scan' to create it.");
+        return;
+    }
+    outputResult(!!opts.json, cfg, () => {
+        console.log(`machine.json: ${getMachineConfigPath()}`);
+        console.log(`  machineId: ${cfg.machineId}`);
+        console.log(`  hostname:  ${cfg.hostname}`);
+        console.log(`  roots:     ${JSON.stringify(cfg.roots)}`);
+        console.log(`  remote:    ${cfg.remote.enabled ? (cfg.remote.path ?? "(enabled, no path)") : "(disabled)"}`);
+    });
+});
+machineCmd
+    .command("migrate")
+    .description("Move machine-local config (machineId, remote) out of the synced DB into machine.json, set roots, and scan")
+    .option("--root <dir>", "Set the 'dev' root for this machine (default: derived from the registry)")
+    .option("--no-scan", "Skip the project scan after migrating")
+    .action(async (opts) => {
+    const { migrateMachine } = await import("./lib/machineMigrate.js");
+    const { getMachineConfigPath } = await import("./lib/paths.js");
+    const db = GnosysDB.openLocal();
+    if (!db.isAvailable()) {
+        console.error("Central DB not available (better-sqlite3 missing).");
+        process.exit(1);
+    }
+    const res = await migrateMachine(db, { root: opts.root, scan: opts.scan });
+    db.close();
+    console.log(`✓ machine.json written: ${getMachineConfigPath()}`);
+    const idNote = res.adoptedMachineId
+        ? " (adopted from synced meta)"
+        : res.regeneratedMachineId ? " (regenerated)" : "";
+    console.log(`  machineId: ${res.machineId}${idNote}`);
+    if (res.adoptedRemotePath) {
+        console.log("  remote: adopted remote_path from synced meta (removed from shared DB)");
+    }
+    console.log(`  roots: ${JSON.stringify(res.rootsConfigured)}`);
+    if (res.scan) {
+        console.log(`  scanned ${res.scan.entries.length} project(s):`);
+        for (const e of res.scan.entries)
+            console.log(`    ${e.name}  [${e.mode}]  ${e.absPath}`);
+    }
+    else {
+        console.log("  (scan skipped — set a root in machine.json, then run 'gnosys scan')");
+    }
+});
+program
+    .command("scan")
+    .description("Discover projects under this machine's roots (machine.json) and record their machine-portable locations")
+    .option("--json", "Output as JSON")
+    .action(async (opts) => {
+    const { ensureMachineConfig } = await import("./lib/machineConfig.js");
+    const { getMachineConfigPath } = await import("./lib/paths.js");
+    const { scanProjects } = await import("./lib/projectScan.js");
+    const ens = ensureMachineConfig();
+    const machine = ens.config;
+    if (Object.keys(machine.roots).length === 0) {
+        console.error("No project roots configured for this machine.");
+        console.error(`Add roots to ${getMachineConfigPath()}, e.g.`);
+        console.error('  { "roots": { "dev": "/Users/edward/MSDev/projects" } }');
+        process.exit(1);
+    }
+    const db = GnosysDB.openCentral();
+    if (!db.isAvailable()) {
+        console.error("Central DB not available (better-sqlite3 missing).");
+        process.exit(1);
+    }
+    const result = await scanProjects(db, machine);
+    db.close();
+    outputResult(!!opts.json, {
+        machineId: machine.machineId,
+        roots: result.roots,
+        count: result.entries.length,
+        entries: result.entries,
+    }, () => {
+        if (ens.regenerated) {
+            console.log("⚠ machine.json hostname mismatch — regenerated machineId for this machine.\n");
+        }
+        console.log(`Scanned ${result.roots.length} root(s); registered ${result.entries.length} project(s):`);
+        for (const e of result.entries) {
+            console.log(`  ${e.name}  [${e.mode}]  ${e.absPath}`);
+        }
+    });
+});
 program
     .command("projects")
     .description("List registered projects from the central DB")
@@ -4732,6 +4827,16 @@ program
             process.exit(1);
         }
         const allProjects = centralDb.getAllProjects();
+        // v5.11: resolve each project's path for THIS machine (machine.json),
+        // falling back to working_directory when machine.json is absent.
+        const { readMachineConfig } = await import("./lib/machineConfig.js");
+        const { effectiveProjectPath } = await import("./lib/projectPaths.js");
+        const machine = readMachineConfig();
+        const resolvedDirOf = (p) => effectiveProjectPath(centralDb, p, machine);
+        const isNotHere = (p) => {
+            const ep = resolvedDirOf(p);
+            return ep === null || !existsSync(ep);
+        };
         if (opts.prune) {
             // Find dead projects first — never just delete without showing
             // them. v5.7.0 adds confirmation by default; --yes skips for
@@ -4776,10 +4881,10 @@ program
             });
             return;
         }
-        // Normal listing — filter dead projects by default
+        // Normal listing — filter dead / not-on-this-machine projects by default
         const visibleProjects = opts.all
             ? allProjects
-            : allProjects.filter((p) => !isDeadProjectDir(p.working_directory));
+            : allProjects.filter((p) => !isNotHere(p));
         if (visibleProjects.length === 0) {
             const deadCount = allProjects.length;
             outputResult(!!opts.json, {
@@ -4800,6 +4905,7 @@ program
         }
         const projectData = visibleProjects.map((p) => ({
             ...p,
+            resolvedDir: resolvedDirOf(p) ?? "(not on this machine)",
             memoryCount: centralDb.getMemoriesByProject(p.id).length,
         }));
         const deadCount = allProjects.length - visibleProjects.length;
@@ -4816,7 +4922,7 @@ program
             for (const p of projectData) {
                 console.log(`  ${p.name}`);
                 console.log(`    ID:        ${p.id}`);
-                console.log(`    Directory: ${p.working_directory}`);
+                console.log(`    Directory: ${p.resolvedDir}`);
                 console.log(`    Memories:  ${p.memoryCount}`);
                 console.log(`    Created:   ${p.created}`);
                 console.log();
@@ -6416,7 +6522,11 @@ if (!isTestEnv()) {
         const centralDb = GnosysDB.openCentral();
         if (centralDb.isAvailable()) {
             const lastVersion = centralDb.getMeta("app_version");
-            const currentVersion = pkg.version;
+            // GNOSYS_FORCE_VERSION lets the upgrade-nag tests pin a synthetic
+            // "running" version independent of the real release number, so a .0
+            // minor release can't break the patch/minor scenarios. Production
+            // always falls through to pkg.version.
+            const currentVersion = process.env.GNOSYS_FORCE_VERSION || pkg.version;
             const isUpgradeCmd = process.argv.slice(2).some(a => a === "upgrade");
             const isSetupSyncCmd = process.argv.slice(2).join(" ").includes("setup sync-projects");
             // CRITICAL: `serve` writes JSON-RPC to stdout for MCP transport. Any