@appchy/jarvis 0.1.15 → 0.1.16

package/dist/bin.js

@@ -5237,10 +5237,6 @@ var PKG_VERSION = _require("../package.json").version ?? "dev";
 var LOG_DIR = path8.join(os5.homedir(), ".jarvis");
 var LOG_FILE = path8.join(LOG_DIR, "agent.log");
 var PID_FILE = path8.join(LOG_DIR, "agent.pid");
-function savePid(pid) {
-  fs8.mkdirSync(LOG_DIR, { recursive: true });
-  fs8.writeFileSync(PID_FILE, String(pid));
-}
 function readPid() {
   try {
     const pid = parseInt(fs8.readFileSync(PID_FILE, "utf-8").trim(), 10);
@@ -5308,7 +5304,7 @@ async function findFreePort() {
 async function browserAuth(appUrl) {
   const config = loadConfig();
   const callbackPort = await findFreePort();
-  const loginUrl = `${appUrl}/api/auth/cli?port=${callbackPort}`;
+  const loginUrl = `${appUrl}/auth/cli?port=${callbackPort}`;
   console.log();
   console.log("Opening browser for sign in...");
   console.log(`  If it doesn't open, visit: ${loginUrl}`);
@@ -5339,7 +5335,7 @@ async function browserAuth(appUrl) {
   }
 }
 function getAppUrl() {
-  return process.env.APP_URL ?? "https://jarvis.appchy.com" ?? "https://jarvis.appchy.com";
+  return "https://jarvis.appchy.com";
 }
 function getTokenExpiry(token) {
   try {
@@ -5372,24 +5368,25 @@ async function tryRefreshToken(config) {
 }
 async function ensureSetup() {
   const config = loadConfig();
-  if (!config?.token && !config?.anthropicApiKey && !config?.useSubscription) {
-    return browserAuth(getAppUrl());
-  }
   if (config?.anthropicApiKey || config?.useSubscription) {
     return true;
   }
-  if (config?.token && isTokenExpired(config.token)) {
-    console.log("Token expired, attempting refresh...");
-    const newToken = await tryRefreshToken(config);
-    if (newToken) {
-      saveConfig({ ...config, token: newToken, connectedAt: (/* @__PURE__ */ new Date()).toISOString() });
-      console.log("Token refreshed successfully.");
-      return true;
-    }
-    console.log("Token refresh failed. Re-authenticating...");
+  if (!config?.token) {
     return browserAuth(getAppUrl());
   }
-  return true;
+  if (!isTokenExpired(config.token)) {
+    return true;
+  }
+  console.log("Token expired, attempting refresh...");
+  const newToken = await tryRefreshToken(config);
+  if (newToken) {
+    saveConfig({ ...config, token: newToken, connectedAt: (/* @__PURE__ */ new Date()).toISOString() });
+    console.log("Token refreshed successfully.");
+    return true;
+  }
+  console.log("Token refresh failed. Re-authenticating...");
+  clearConfig();
+  return browserAuth(getAppUrl());
 }
 function createCli() {
   const program = new Command().name("jarvis").description("Jarvis local agent \u2014 runs Claude Code on your machine").version(PKG_VERSION);
@@ -5457,16 +5454,6 @@ function createCli() {
         return;
       }
       const service = createServiceManager();
-      if (service.isInstalled()) {
-        try {
-          service.stop();
-        } catch {
-        }
-        await new Promise((r) => setTimeout(r, 1e3));
-        service.start();
-        console.log("Jarvis agent started via OS service.");
-        return;
-      }
       const stalePid = readPid();
       if (stalePid) {
         try {
@@ -5475,6 +5462,12 @@ function createCli() {
         }
         clearPid();
       }
+      if (service.isInstalled()) {
+        try {
+          service.stop();
+        } catch {
+        }
+      }
       if (await isPortInUse(port)) {
         try {
           const output = execSync2(`lsof -ti :${port}`, { encoding: "utf-8" }).trim();
@@ -5490,51 +5483,28 @@ function createCli() {
         }
         await new Promise((r) => setTimeout(r, 1e3));
       }
-      fs8.mkdirSync(LOG_DIR, { recursive: true });
-      const logFd = fs8.openSync(LOG_FILE, "a");
-      const args = [
-        "start",
-        "--foreground",
-        "--port",
-        String(port),
-        "--workspace",
-        workspacePath
-      ];
-      if (!opts.upstream) {
-        args.push("--no-upstream");
-      }
-      if (anthropicApiKey) {
-        args.push("--api-key", anthropicApiKey);
-      }
       const binPath = process.argv[1];
       const cliRoot = path8.resolve(path8.dirname(binPath), "..");
       const distEntry = path8.join(cliRoot, "dist", "bin.js");
-      const useDistEntry = fs8.existsSync(distEntry);
-      const child = spawn3(
-        process.execPath,
-        useDistEntry ? [distEntry, ...args] : [binPath, ...args],
-        {
-          detached: true,
-          stdio: ["ignore", logFd, logFd],
-          cwd: workspacePath,
-          env: {
-            ...process.env,
-            NODE_NO_WARNINGS: "1",
-            // Strip API key when using subscription to prevent SDK from picking it up
-            ...useSubscription ? { ANTHROPIC_API_KEY: "" } : {}
-          }
-        }
-      );
-      child.unref();
-      fs8.closeSync(logFd);
-      savePid(child.pid);
-      console.log(`Jarvis agent started (PID: ${child.pid})`);
+      const entryPath = fs8.existsSync(distEntry) ? distEntry : binPath;
+      service.install({
+        port,
+        workspacePath,
+        nodePath: process.execPath,
+        entryPath,
+        upstream: opts.upstream
+      });
+      const status = service.status();
+      console.log(`Jarvis agent started`);
       console.log(`  Local:     ws://127.0.0.1:${port}`);
       console.log(`  Workspace: ${workspacePath}`);
       console.log(`  Logs:      ${LOG_FILE}`);
       if (config?.apiUrl) {
         console.log(`  Cloud:     ${config.apiUrl}`);
       }
+      if (status.os) {
+        console.log(`  Service:   ${status.os} (auto-start on login, crash recovery)`);
+      }
     }
   );
   program.command("stop").description("Stop the running agent").action(async () => {