@appchy/jarvis 0.1.12 → 0.1.14

package/dist/bin.js

@@ -1,8 +1,3 @@
-// src/bin.ts
-import dotenv from "dotenv";
-import fs8 from "fs";
-import path8 from "path";
-
 // src/cli.ts
 import { Command } from "commander";
 import { spawn as spawn2, execSync } from "child_process";
@@ -14,7 +9,7 @@ import os4 from "os";
 import fs from "fs";
 import path from "path";
 import os from "os";
-var CONFIG_DIR = path.join(os.homedir(), ".jarvis");
+var CONFIG_DIR = process.env.JARVIS_CONFIG_DIR ?? path.join(os.homedir(), ".jarvis");
 var CONFIG_FILE = path.join(CONFIG_DIR, "config.json");
 function loadConfig() {
   try {
@@ -2632,6 +2627,7 @@ function createUpstreamClient(config) {
       }
     });
     ws.on("close", (code) => {
+      console.error("[Upstream] Connection closed, code:", code);
       if (closed) return;
       if (code === 4001 || code === 4003) {
         if (config.refreshToken) {
@@ -2683,6 +2679,7 @@ function createUpstreamClient(config) {
       reconnectTimer = setTimeout(connect, 3e3);
     });
     ws.on("error", (err) => {
+      console.error("[Upstream] Connection error:", err.message);
       logger.sys.error("[Upstream] Connection error", {
         error: err.message
       });
@@ -4915,17 +4912,21 @@ async function ensureSetup() {
   if (config?.token || config?.anthropicApiKey || config?.useSubscription) {
     return true;
   }
-  return browserAuth(APP_URL);
+  const ok = await browserAuth(APP_URL);
+  if (!ok) return false;
+  const pid = readPid();
+  if (pid) {
+    try {
+      process.kill(pid, "SIGTERM");
+    } catch {
+    }
+    clearPid();
+    await new Promise((r) => setTimeout(r, 1e3));
+  }
+  return true;
 }
 function createCli() {
   const program = new Command().name("jarvis").description("Jarvis local agent \u2014 runs Claude Code on your machine").version(PKG_VERSION);
-  program.argument("[message]", "Optional initial message to send").option("--model <id>", "Model (e.g., claude-opus-4-20250514)").option("--mode <mode>", "Permission mode: supervised|auto|plan|yolo").option("--thinking <config>", "Thinking: adaptive|enabled|disabled").option("--thinking-budget <n>", "Token budget when thinking=enabled").option("--max-turns <n>", "Max turns per task").option("-p, --port <port>", "Agent server port", "7862").option("-w, --workspace <path>", "Workspace root path").option("--no-server", "Connect to existing server, don't auto-start").action(async (message, opts) => {
-    if (message && program.commands.some((c) => c.name() === message)) {
-      return;
-    }
-    await ensureSetup();
-    await launchChat(opts);
-  });
   program.command("connect <token>").description("Connect to Jarvis cloud using a token from the web UI").option("-w, --workspace <path>", "Workspace root path for repo operations").action((token, opts) => {
     try {
       const parsed = parseConnectToken(token);
@@ -4953,14 +4954,18 @@ function createCli() {
     }
   });
   program.command("start").description("Start the local agent (runs as background daemon)").option("-p, --port <port>", "Local WS server port", "7862").option("-w, --workspace <path>", "Workspace root path").option("--api-key <key>", "Anthropic API key (for local-only use)").option("--no-upstream", "Don't connect to cloud (local-only mode)").option("--foreground", "Run in foreground (don't daemonize)").action(async (opts) => {
-    await ensureSetup();
+    if (!opts.foreground) {
+      await ensureSetup();
+    }
     const config = loadConfig();
     const port = parseInt(opts.port, 10);
-    const alreadyRunning = await isPortInUse(port);
-    if (alreadyRunning) {
-      console.log(`Jarvis agent is already running on ws://127.0.0.1:${port}`);
-      console.log(`Use 'jarvis restart' to restart, or 'jarvis logs' to view logs.`);
-      return;
+    if (!opts.foreground) {
+      const alreadyRunning = await isPortInUse(port);
+      if (alreadyRunning) {
+        console.log(`Jarvis agent is already running on ws://127.0.0.1:${port}`);
+        console.log(`Use 'jarvis restart' to restart, or 'jarvis logs' to view logs.`);
+        return;
+      }
     }
     const workspacePath = opts.workspace ?? config?.workspacePath ?? process.cwd();
     const userId = config?.userId ?? process.env.JARVIS_USER_ID ?? "local";
@@ -4968,6 +4973,9 @@ function createCli() {
     const useSubscription = !explicitApiKey;
     const anthropicApiKey = explicitApiKey;
     if (opts.foreground) {
+      if (useSubscription && process.env.ANTHROPIC_API_KEY) {
+        delete process.env.ANTHROPIC_API_KEY;
+      }
       await startAgent({
         port,
         workspacePath,
@@ -5012,7 +5020,12 @@ function createCli() {
         detached: true,
         stdio: ["ignore", logFd, logFd],
         cwd: workspacePath,
-        env: { ...process.env, NODE_NO_WARNINGS: "1" }
+        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();
@@ -5123,19 +5136,13 @@ function createCli() {
     clearConfig();
     console.log("Configuration cleared.");
   });
+  program.command("chat", { isDefault: true, hidden: true }).description("Interactive TUI").option("--model <id>", "Model (e.g., claude-opus-4-20250514)").option("--mode <mode>", "Permission mode: supervised|auto|plan|yolo").option("--thinking <config>", "Thinking: adaptive|enabled|disabled").option("--thinking-budget <n>", "Token budget when thinking=enabled").option("--max-turns <n>", "Max turns per task").option("-p, --port <port>", "Agent server port", "7862").option("-w, --workspace <path>", "Workspace root path").option("--no-server", "Connect to existing server, don't auto-start").action(async (opts) => {
+    await ensureSetup();
+    await launchChat(opts);
+  });
   return program;
 }
 
 // src/bin.ts
-function findEnv() {
-  let dir = process.cwd();
-  while (dir !== path8.dirname(dir)) {
-    const envPath = path8.join(dir, ".env");
-    if (fs8.existsSync(envPath)) return envPath;
-    dir = path8.dirname(dir);
-  }
-  return void 0;
-}
-dotenv.config({ path: findEnv() });
 createCli().parse();
 //# sourceMappingURL=bin.js.map