neotoma 0.3.2 → 0.3.4

package/README.md

@@ -221,7 +221,7 @@ neotoma mcp config
 
 Marketing site: **https://neotoma.io** (GitHub Pages, deployed from **main**; custom domain set in repo Settings → Pages). See [Deployment](docs/infrastructure/deployment.md#marketing-site-neotomaio).
 
-### Option 2: Clone repository (for development)
+### Option 2: Clone source checkout (for development)
 
 ```bash
 git clone https://github.com/markmhendrickson/neotoma.git

package/dist/cli/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}

package/dist/cli/index.js

@@ -492,7 +492,7 @@ async function validateNeotomaRepo(dir) {
         return null;
     }
 }
-const INIT_REQUIRED_MESSAGE = "Neotoma setup is required. Run 'neotoma init' to set repo path, or set NEOTOMA_REPO_ROOT.";
+const INIT_REQUIRED_MESSAGE = "Neotoma setup is required. Run 'neotoma init' to set your Neotoma path, or set NEOTOMA_REPO_ROOT.";
 async function resolveRepoRootFromInitContext() {
     const config = await readConfig();
     let repoRoot = null;
@@ -511,7 +511,7 @@ async function persistRepoRootIfMissing(config, repoRoot) {
     if (config.repo_root)
         return;
     await writeConfig({ ...config, repo_root: repoRoot });
-    process.stderr.write(dim("Saved repo path to config: ") + pathStyle(CONFIG_PATH) + "\n");
+    process.stderr.write(dim("Saved Neotoma path to config: ") + pathStyle(CONFIG_PATH) + "\n");
 }
 async function resolveAndPersistRepoRootFromInitContext() {
     const { config, repoRoot } = await resolveRepoRootFromInitContext();
@@ -520,8 +520,17 @@ async function resolveAndPersistRepoRootFromInitContext() {
     await persistRepoRootIfMissing(config, repoRoot);
     return repoRoot;
 }
+/** Resolve the Neotoma package root from the running CLI install location. */
+async function resolveRepoRootFromInstalledCli() {
+    const cliDir = path.dirname(fileURLToPath(import.meta.url));
+    return await findRepoRoot(cliDir);
+}
 async function maybeRunInitForMissingRepo(promptEnabled) {
     let repoRoot = await resolveAndPersistRepoRootFromInitContext();
+    if (repoRoot)
+        return repoRoot;
+    // npm global/link installs can run from arbitrary cwd; fallback to the installed package root.
+    repoRoot = await resolveRepoRootFromInstalledCli();
     if (repoRoot)
         return repoRoot;
     if (!promptEnabled)
@@ -543,9 +552,9 @@ async function maybeRunInitForMissingRepo(promptEnabled) {
     return repoRoot;
 }
 async function loadNpmScripts() {
-    const repoRoot = await resolveAndPersistRepoRootFromInitContext();
+    const repoRoot = (await resolveAndPersistRepoRootFromInitContext()) ?? (await resolveRepoRootFromInstalledCli());
     if (!repoRoot) {
-        throw new Error("Not a Neotoma repo. Run from the repo root (package.json name must be 'neotoma'), run 'neotoma init' to set repo path, or set NEOTOMA_REPO_ROOT.");
+        throw new Error("Neotoma source checkout not found. Run from the source root (package.json name must be 'neotoma'), run 'neotoma init' to set your Neotoma path, or set NEOTOMA_REPO_ROOT.");
     }
     const pkgPath = path.join(repoRoot, "package.json");
     const raw = await fs.readFile(pkgPath, "utf-8");
@@ -1271,7 +1280,7 @@ async function pickSessionPorts(repoRoot) {
         return [a, b];
     }
     catch (err) {
-        throw new Error("Failed to pick session ports. Ensure you are in the Neotoma repo and scripts/pick-port.js exists. " +
+        throw new Error("Failed to pick session ports. Ensure you are in a Neotoma source checkout and scripts/pick-port.js exists. " +
             (err instanceof Error ? err.message : String(err)));
     }
 }
@@ -1501,7 +1510,7 @@ program
     .option("--env <env>", "Preferred environment for this run: development or production (overrides configuration when starting session)")
     .option("--tunnel", "Start HTTPS tunnel (ngrok/cloudflared) with development/production servers; off by default")
     .option("--debug", "Show detailed initialization logs when starting session")
-    .option("--log-file <path>", "Append CLI stdout and stderr to this file (development default: repo data/logs/cli.<pid>.log when in a repo, else ~/.config/neotoma/cli.<pid>.log)")
+    .option("--log-file <path>", "Append CLI stdout and stderr to this file (development default: <neotoma>/data/logs/cli.<pid>.log when a Neotoma path is configured, else ~/.config/neotoma/cli.<pid>.log)")
     .option("--no-log-file", "Do not append CLI output to the log file (no-op in prod)")
     .option("--no-update-check", "Disable update availability check");
 function isDebug() {
@@ -3075,12 +3084,12 @@ program
         let envPath = envRepoRoot ? path.join(envRepoRoot, ".env") : null;
         const mcpTokenEncryptionKey = randomBytes(32).toString("hex");
         let envContent = ""; // built after plan with final dataDir
-        // When not in a repo, prompt for repo path so we can create .env there.
+        // When not in a source checkout, prompt for path so we can create .env there.
         // This runs in normal interactive init too (not only --advanced) so
-        // .env setup is not skipped just because init was started outside a repo.
+        // .env setup is not skipped just because init was started outside a source checkout.
         if (!envRepoRoot && process.stdout.isTTY && !opts.skipEnv && !opts.yes) {
-            process.stdout.write(nl() + bullet(heading("Neotoma repo path")) + nl());
-            const raw = await askQuestion("Repo path [default: skip]: ");
+            process.stdout.write(nl() + bullet(heading("Neotoma path")) + nl());
+            const raw = await askQuestion("Neotoma path [default: skip]: ");
             const trimmed = raw.trim().replace(/^~(?=\/|$)/, process.env.HOME || "");
             if (trimmed) {
                 const validated = await validateNeotomaRepo(trimmed);
@@ -3090,10 +3099,10 @@ program
                     await persistRepoRootIfMissing(initConfig, envRepoRoot);
                     envExamplePath = path.join(envRepoRoot, ".env.example");
                     envPath = path.join(envRepoRoot, ".env");
-                    process.stdout.write(bullet(success("Using repo: ") + pathStyle(envRepoRoot)) + "\n");
+                    process.stdout.write(bullet(success("Using Neotoma path: ") + pathStyle(envRepoRoot)) + "\n");
                 }
                 else {
-                    process.stdout.write(bullet(warn("Not a valid Neotoma repo (package.json name must be 'neotoma'). Skipping .env setup.")) + "\n");
+                    process.stdout.write(bullet(warn("Not a valid Neotoma source checkout (package.json name must be 'neotoma'). Skipping .env setup.")) + "\n");
                 }
             }
             process.stdout.write(nl());
@@ -3284,7 +3293,7 @@ program
         }
         // Create data directories and DBs (and build envContent) now that final dataDir is set
         envContent = `# Neotoma Environment Configuration
-# Repo path is stored in ~/.config/neotoma by neotoma init (or set NEOTOMA_REPO_ROOT at runtime to override).
+# Neotoma path is stored in ~/.config/neotoma by neotoma init (or set NEOTOMA_REPO_ROOT at runtime to override).
 
 # Data directory (defaults to ./data)
 NEOTOMA_DATA_DIR=${dataDir}
@@ -3510,7 +3519,7 @@ NEOTOMA_MCP_TOKEN_ENCRYPTION_KEY=${mcpTokenEncryptionKey}
                     if (!apiAlreadyRunning) {
                         if (!repoRoot) {
                             initAuthSummary.oauthDeferredReason =
-                                "OAuth selected but no repo root found for temporary API startup.";
+                                "OAuth selected but no Neotoma source checkout was found for temporary API startup.";
                         }
                         else if (!isLocalHost(baseUrl)) {
                             initAuthSummary.oauthDeferredReason =
@@ -3864,11 +3873,11 @@ NEOTOMA_MCP_TOKEN_ENCRYPTION_KEY=${mcpTokenEncryptionKey}
                 process.stdout.write(dim("Could not check CLI instructions.") + nl());
             }
         }
-        // Persist repo root so "neotoma" can start servers from any cwd
+        // Persist Neotoma source root so "neotoma" can start servers from any cwd
         let configRepoRoot = repoRoot ?? (await readConfig()).repo_root;
-        // In pretty mode (not json), ask for repo root if not found
+        // In pretty mode (not json), ask for Neotoma path if not found
         if (!configRepoRoot && outputMode === "pretty" && useAdvancedPrompts) {
-            const pathInput = await askQuestion("Path to Neotoma repo [default: skip]: ");
+            const pathInput = await askQuestion("Path to Neotoma source checkout [default: skip]: ");
             if (pathInput) {
                 const validated = await validateNeotomaRepo(pathInput);
                 if (validated)
@@ -3897,7 +3906,7 @@ NEOTOMA_MCP_TOKEN_ENCRYPTION_KEY=${mcpTokenEncryptionKey}
                     await fs.writeFile(lateEnvPath, "");
                 }
                 if (outputMode === "pretty") {
-                    process.stdout.write(bullet(success(".env created after repo path was provided.")) + "\n");
+                    process.stdout.write(bullet(success(".env created after Neotoma path was provided.")) + "\n");
                     process.stdout.write(bullet(dim("Path: ") + pathStyle(lateEnvPath)) + "\n");
                 }
             }
@@ -3910,7 +3919,7 @@ NEOTOMA_MCP_TOKEN_ENCRYPTION_KEY=${mcpTokenEncryptionKey}
         process.stdout.write(nl() + heading("✓ Neotoma initialized!") + nl());
         process.stdout.write(dim("Next step: run ") + pathStyle("neotoma") + dim(" to start a session.") + nl());
         if (!envRepoRoot) {
-            process.stdout.write(bullet(dim(".env is created when run from the repo, when a repo path is saved in config, or when you enter a repo path during init. Data is under ~/neotoma/data.")) + "\n");
+            process.stdout.write(bullet(dim(".env is created when run from a Neotoma source checkout, when a Neotoma path is saved in config, or when you enter a Neotoma path during init. Data is under ~/neotoma/data.")) + "\n");
         }
     }
     catch (err) {
@@ -3948,7 +3957,7 @@ siteCommand
         // leave null
     }
     if (!repoRoot) {
-        process.stderr.write("Not a Neotoma repo. Run from the repo root or run " +
+        process.stderr.write("Neotoma source checkout not found. Run from the source root or run " +
             pathStyle("neotoma init") +
             " first.\n");
         process.exitCode = 1;
@@ -6091,7 +6100,7 @@ apiCommand
             stop_ran: ran,
             message: ran
                 ? "Stop command completed for port " + port + "."
-                : "Run from repo root to stop: node scripts/kill_port.js " + port,
+                : "Run from Neotoma source root to stop: node scripts/kill_port.js " + port,
         }, outputMode);
         return;
     }
@@ -6101,7 +6110,7 @@ apiCommand
     else {
         process.stdout.write(bullet("To stop the API server: " +
             pathStyle("node scripts/kill_port.js " + port) +
-            " (from repo root)") + "\n");
+            " (from Neotoma source root)") + "\n");
     }
 });
 apiCommand
@@ -6148,7 +6157,7 @@ apiCommand
         pathStyle("neotoma api stop") +
         dim(" (configured port) or ") +
         pathStyle("node scripts/kill_port.js <port>") +
-        dim(" from repo root.") +
+        dim(" from Neotoma source root.") +
         nl());
 });
 apiCommand
@@ -8694,8 +8703,8 @@ export function buildInstallationBoxLines(mcpConfigs, cliScan, initContext, repo
         lines.push("");
     }
     else {
-        lines.push("Repo path      " + mark(false) + "  Not configured (run " + pathStyle("neotoma init") + " or set NEOTOMA_REPO_ROOT)");
-        lines.push(".env file      " + mark(false) + "  (set repo path first)");
+        lines.push("Neotoma path  " + mark(false) + "  Not configured (run " + pathStyle("neotoma init") + " or set NEOTOMA_REPO_ROOT)");
+        lines.push(".env file      " + mark(false) + "  (set Neotoma path first)");
         lines.push("");
     }
     const mcpByPlatform = getMcpStatusByPlatform(mcpConfigs, repoRoot ?? null);
@@ -9151,12 +9160,12 @@ export async function runCli(argv = process.argv) {
             const repoRoot = await resolveAndPersistRepoRootFromInitContext();
             const guidanceLines = [];
             if (!repoRoot) {
-                guidanceLines.push("Neotoma repo is not configured in this shell.", "Run 'neotoma init' to set repo path, or set NEOTOMA_REPO_ROOT to your Neotoma repo.");
+                guidanceLines.push("Neotoma path is not configured in this shell.", "Run 'neotoma init' to set your Neotoma path, or set NEOTOMA_REPO_ROOT to a Neotoma source checkout.");
             }
             else {
                 const envPath = path.join(repoRoot, ".env");
                 if (!(await pathExists(envPath))) {
-                    guidanceLines.push("Neotoma repo is configured, but .env is missing.", "Run 'neotoma init' to create .env defaults, or create " +
+                    guidanceLines.push("Neotoma path is configured, but .env is missing.", "Run 'neotoma init' to create .env defaults, or create " +
                         pathStyle(envPath) +
                         " manually.");
                 }
@@ -9170,7 +9179,8 @@ export async function runCli(argv = process.argv) {
         if (noSession) {
             debugLog("No-session mode: showing intro panel and command menu (no REPL)");
             const v = version ?? (await getCliVersion());
-            const repoRootForLocal = await findRepoRoot(process.cwd());
+            const repoRootForLocal = (await resolveAndPersistRepoRootFromInitContext()) ??
+                (await resolveRepoRootFromInstalledCli());
             const introStatsOrFallback = repoRootForLocal
                 ? await getDualEnvIntroStats(repoRootForLocal, LOCAL_DEV_USER_ID)
                 : ["Production data: unavailable", "Development data: unavailable"];
@@ -9553,7 +9563,7 @@ export async function runCli(argv = process.argv) {
             }
             else {
                 sessionRepoRoot = undefined;
-                debugLog("No Neotoma repo found; session only (no servers)");
+                debugLog("No Neotoma source checkout found; session only (no servers)");
                 if (version != null) {
                     const introContent = buildIntroBoxContent(version, ["Production data: unavailable", "Development data: unavailable"], undefined);
                     await printIntroBlock(version, [], preferredEnv, {
@@ -9561,7 +9571,7 @@ export async function runCli(argv = process.argv) {
                         title: introContent.title,
                     });
                 }
-                process.stdout.write(dim("Not in a Neotoma repo. Session only, servers are not started.") + "\n\n");
+                process.stdout.write(dim("Not in a Neotoma source checkout. Session only, servers are not started.") + "\n\n");
             }
         }
         else {
@@ -9572,7 +9582,8 @@ export async function runCli(argv = process.argv) {
                 const version = await getCliVersion();
                 const mcpStdioCount = await detectNeotomaMcpStdioProcessCount();
                 const apiLines = buildApiBoxLines(discoveredInstances, mcpStdioCount);
-                const repoRootForLocal = await findRepoRoot(process.cwd());
+                const repoRootForLocal = (await resolveAndPersistRepoRootFromInitContext()) ??
+                    (await resolveRepoRootFromInstalledCli());
                 const introStatsOrFallback = repoRootForLocal
                     ? await getDualEnvIntroStats(repoRootForLocal, LOCAL_DEV_USER_ID)
                     : ["Production data: unavailable", "Development data: unavailable"];
@@ -9766,7 +9777,8 @@ export async function runCli(argv = process.argv) {
                 else {
                     // No sessionRepoRoot (e.g. cwd not in Neotoma repo) but we have API instances: still show full status block.
                     // Resolve repo from cwd for direct local DB reads (intro + recent events) when possible.
-                    const repoRootForLocal = await findRepoRoot(process.cwd());
+                    const repoRootForLocal = (await resolveAndPersistRepoRootFromInitContext()) ??
+                        (await resolveRepoRootFromInstalledCli());
                     const effectiveUserId = userIdForWatch ?? LOCAL_DEV_USER_ID;
                     const introStatsOrFallback = repoRootForLocal
                         ? await getDualEnvIntroStats(repoRootForLocal, effectiveUserId)