nemoris 0.1.7 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nemoris",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "type": "module",
   "description": "Personal AI agent runtime — persistent memory, delivery guarantees, task contracts, self-healing. Local-first, no cloud.",
   "license": "MIT",

package/src/cli/runtime-control.js

@@ -487,24 +487,49 @@ export async function cleanupOrphanedDaemonProcesses({
 
 export async function startDirectDaemon({
   projectRoot,
-  cliEntryPath = path.join(projectRoot, "src", "cli.js"),
+  cliEntryPath,
   fsImpl = fs,
   spawnImpl = spawn,
   processImpl = process,
 } = {}) {
+  // Resolve CLI entry: explicit path > source repo > which nemoris > package __dirname
+  if (!cliEntryPath) {
+    const srcCliPath = path.join(projectRoot, "src", "cli.js");
+    if (fsImpl.existsSync(srcCliPath)) {
+      cliEntryPath = srcCliPath;
+    } else {
+      try {
+        const { execFileSync } = await import("node:child_process");
+        const whichOut = execFileSync("which", ["nemoris"], { encoding: "utf8", timeout: 3000 }).trim();
+        if (whichOut) {
+          cliEntryPath = whichOut;
+        }
+      } catch { /* which not available */ }
+    }
+    if (!cliEntryPath) {
+      // Fallback: resolve from this module's own package
+      const __dirname = path.dirname(new URL(import.meta.url).pathname);
+      cliEntryPath = path.join(__dirname, "..", "cli.js");
+    }
+  }
   const { stateDir, pidFile, stdoutLog, stderrLog } = getDaemonPaths(projectRoot);
   fsImpl.mkdirSync(stateDir, { recursive: true });
   const stdoutFd = fsImpl.openSync(stdoutLog, "a");
   const stderrFd = fsImpl.openSync(stderrLog, "a");
 
   try {
+    // Only set NEMORIS_INSTALL_DIR for the child when the path is a clean
+    // data directory. If it's the source repo (has package.json), the child
+    // will detect it via CWD detection instead — avoids the source repo guard.
+    const childEnv = { ...processImpl.env };
+    const looksLikeSourceRepo = fsImpl.existsSync(path.join(projectRoot, "package.json"));
+    if (!looksLikeSourceRepo) {
+      childEnv.NEMORIS_INSTALL_DIR = projectRoot;
+    }
     const child = spawnImpl(processImpl.execPath, [cliEntryPath, "serve-daemon", "live"], {
       cwd: projectRoot,
       detached: true,
-      env: {
-        ...processImpl.env,
-        NEMORIS_INSTALL_DIR: projectRoot,
-      },
+      env: childEnv,
       stdio: ["ignore", stdoutFd, stderrFd],
     });
     child.unref?.();

package/src/cli-main.js

@@ -2745,13 +2745,27 @@ export async function main(argv = process.argv) {
     });
   } else if (command === "doctor") {
     const { runDoctor, formatDoctorReport } = await import("./onboarding/doctor.js");
-    const results = await runDoctor(resolveRuntimeInstallDir());
+    const doctorInstallDir = resolveRuntimeInstallDir();
+    const results = await runDoctor(doctorInstallDir);
     const json = rest.includes("--json");
+    const fix = rest.includes("--fix");
     if (json) {
       console.log(JSON.stringify(results, null, 2));
     } else {
       console.log(formatDoctorReport(results));
     }
+    // Auto-repair: clean stale PID file
+    if (fix && results.daemon?.stalePidFile) {
+      const { pidFile } = getDaemonPaths(doctorInstallDir);
+      try {
+        fs.unlinkSync(pidFile);
+        console.log("\n  \u2705  Cleaned stale PID file. Run: nemoris start");
+      } catch {
+        console.log("\n  \u274c  Could not remove stale PID file.");
+      }
+    } else if (!fix && results.daemon?.stalePidFile) {
+      console.log("\n  Tip: run nemoris doctor --fix to clean the stale PID file.");
+    }
     return results.exitCode;
   } else if (command === "battle") {
     const { runBattle, parseBattleFlags } = await import("./battle.js");

package/src/onboarding/setup-checklist.js

@@ -41,7 +41,18 @@ function detectProvider(installDir) {
     const files = fs.readdirSync(providersDir).filter((f) => f.endsWith(".toml"));
     if (files.length === 0) return { configured: false };
     const name = files[0].replace(/\.toml$/, "");
-    return { configured: true, name, count: files.length };
+    // Read primary model from the first provider config
+    let primaryModel = "";
+    try {
+      const content = fs.readFileSync(path.join(providersDir, files[0]), "utf8");
+      const config = parseToml(content);
+      const models = config.models || {};
+      const firstModelKey = Object.keys(models)[0];
+      if (firstModelKey && models[firstModelKey]?.id) {
+        primaryModel = models[firstModelKey].id;
+      }
+    } catch { /* non-fatal */ }
+    return { configured: true, name, count: files.length, primaryModel };
   } catch {
     return { configured: false };
   }
@@ -96,9 +107,12 @@ export function formatSetupChecklist(checklist) {
     : "Identity";
   item(checklist.identity, idLabel, "nemoris setup");
 
-  const provLabel = checklist.provider.configured
-    ? `Provider       ${checklist.provider.name}${checklist.provider.count > 1 ? ` (+${checklist.provider.count - 1})` : ""}`
-    : "Provider";
+  let provLabel = "Provider";
+  if (checklist.provider.configured) {
+    const model = checklist.provider.primaryModel || "";
+    const modelSuffix = model ? ` \u00b7 ${model}` : "";
+    provLabel = `Provider       ${checklist.provider.name}${modelSuffix}`;
+  }
   item(checklist.provider, provLabel, "nemoris setup");
 
   item(checklist.telegram, "Telegram", "nemoris setup telegram");

package/src/onboarding/wizard.js

@@ -336,16 +336,36 @@ async function runFastPathWizard({ installDir }) {
     "Setup Complete"
   );
 
+  // Offer Telegram setup inline
+  if (!checklist.telegram.configured) {
+    const wantTelegram = await prompter.confirm({
+      message: "Set up Telegram now?",
+      initialValue: false,
+    });
+    if (wantTelegram) {
+      await runTelegramPhase({
+        installDir,
+        agentId,
+      });
+    }
+  }
+
   await prompter.outro("Run: nemoris start");
 
   try {
     const pkg = JSON.parse(fs.readFileSync(new URL("../../package.json", import.meta.url), "utf8"));
+    const caps = { identity: true, provider: true };
+    // Re-check telegram after possible inline setup
+    const updatedChecklist = buildSetupChecklist(installDir);
+    if (updatedChecklist.telegram.configured || updatedChecklist.telegram.pending) {
+      caps.telegram = true;
+    }
     writeWizardMetadata(installDir, {
       lastRunVersion: pkg.version || "",
       lastRunCommand: "setup",
       lastRunMode: "fast",
       lastRunFlow: "interactive",
-      capabilities: { identity: true, provider: true },
+      capabilities: caps,
     });
   } catch {
     // Non-fatal

package/src/utils/env-loader.js

@@ -1,5 +1,33 @@
+import fs from "node:fs";
 import path from "node:path";
+import os from "node:os";
 
+/**
+ * Resolve the .env file path. Priority:
+ * 1. NEMORIS_INSTALL_DIR/.env (explicit data dir)
+ * 2. CWD/.env (dev mode — running from source repo)
+ * 3. ~/.nemoris-data/.env (default install dir)
+ * 4. package dir/.env (legacy fallback)
+ */
 export function resolveEnvPath(srcDir) {
+  // 1. Explicit install dir
+  if (process.env.NEMORIS_INSTALL_DIR) {
+    return path.join(process.env.NEMORIS_INSTALL_DIR, ".env");
+  }
+
+  // 2. Dev mode — CWD is source repo
+  const cwd = process.cwd();
+  if (fs.existsSync(path.join(cwd, "package.json")) &&
+      fs.existsSync(path.join(cwd, "src", "cli.js"))) {
+    return path.join(cwd, ".env");
+  }
+
+  // 3. Default data dir
+  const defaultEnv = path.join(os.homedir(), ".nemoris-data", ".env");
+  if (fs.existsSync(defaultEnv)) {
+    return defaultEnv;
+  }
+
+  // 4. Legacy: package dir
   return path.resolve(srcDir, "..", ".env");
 }