@appchy/jarvis 0.1.5 → 0.1.7

package/dist/bin.js

@@ -388,7 +388,7 @@ function claudeCodeProvider(config = {}) {
         options: {
           model: req.model,
           systemPrompt: systemPromptOption,
-          maxTurns: config.maxTurns ?? 50,
+          ...config.maxTurns ? { maxTurns: config.maxTurns } : {},
           ...permissionOptions,
           ...config.mcpServers ? { mcpServers: config.mcpServers } : {},
           ...config.workingDirectory ? { cwd: config.workingDirectory } : {},
@@ -557,7 +557,7 @@ function claudeCodeProvider(config = {}) {
         options: {
           model: req.model,
           systemPrompt: streamSystemPromptOption,
-          maxTurns: config.maxTurns ?? 50,
+          ...config.maxTurns ? { maxTurns: config.maxTurns } : {},
           ...permissionOptions,
           ...config.mcpServers ? { mcpServers: config.mcpServers } : {},
           ...config.workingDirectory ? { cwd: config.workingDirectory } : {},
@@ -2056,7 +2056,7 @@ function createWsProgressHandlers(deps) {
         id: `status-plan-${crypto2.randomUUID()}`,
         role: "assistant",
         type: "status",
-        content: "Planning...",
+        content: "Planning",
         isPartial: true,
         createdAt: now
       });
@@ -2238,7 +2238,7 @@ function createAgent(deps) {
         systemPrompt: systemMsg?.content ?? "",
         workingDirectory: wsPath,
         tools: claudeCodeTools,
-        maxTurns: msg.maxTurns ?? 200,
+        ...msg.maxTurns ? { maxTurns: msg.maxTurns } : {},
         userId: deps.userId,
         abortController,
         heartbeat: () => {
@@ -2266,7 +2266,7 @@ function createAgent(deps) {
             ...deps.useSubscription ? { useSubscription: true } : { apiKey: deps.anthropicApiKey },
             workingDirectory: wsPath,
             tools: claudeCodeTools,
-            maxTurns: msg.maxTurns ?? 200,
+            ...msg.maxTurns ? { maxTurns: msg.maxTurns } : {},
             userId: deps.userId,
             abortController,
             heartbeat: () => {
@@ -2520,12 +2520,15 @@ function createUpstreamClient(config) {
   let messageHandler = null;
   let reconnectTimer = null;
   let closed = false;
+  let authFailures = 0;
+  const MAX_AUTH_RETRIES = 3;
   function connect() {
     if (closed) return;
     ws = new WebSocket2(config.apiUrl, {
       headers: { authorization: `Bearer ${config.token}` }
     });
     ws.on("open", () => {
+      authFailures = 0;
       logger.sys.info("[Upstream] Connected to cloud", { apiUrl: config.apiUrl });
     });
     ws.on("message", (raw) => {
@@ -2539,11 +2542,25 @@ function createUpstreamClient(config) {
       } catch {
       }
     });
-    ws.on("close", () => {
-      if (!closed) {
-        logger.sys.info("[Upstream] Disconnected, reconnecting in 3s...");
-        reconnectTimer = setTimeout(connect, 3e3);
+    ws.on("close", (code) => {
+      if (closed) return;
+      if (code === 4001 || code === 4003) {
+        authFailures++;
+        if (authFailures >= MAX_AUTH_RETRIES) {
+          logger.sys.error("[Upstream] Auth failed after max retries, giving up", {
+            code,
+            attempts: authFailures
+          });
+          return;
+        }
+        logger.sys.warn("[Upstream] Auth failed, retrying...", {
+          code,
+          attempt: authFailures,
+          maxRetries: MAX_AUTH_RETRIES
+        });
       }
+      logger.sys.info("[Upstream] Disconnected, reconnecting in 3s...");
+      reconnectTimer = setTimeout(connect, 3e3);
     });
     ws.on("error", (err) => {
       logger.sys.error("[Upstream] Connection error", {
@@ -4664,6 +4681,9 @@ async function waitForAgent(port, maxAttempts = 30) {
 }
 
 // src/cli.ts
+import { createRequire } from "module";
+var _require = createRequire(import.meta.url);
+var PKG_VERSION = _require("../package.json").version ?? "dev";
 var LOG_DIR = path7.join(os4.homedir(), ".jarvis");
 var LOG_FILE = path7.join(LOG_DIR, "agent.log");
 var PID_FILE = path7.join(LOG_DIR, "agent.pid");
@@ -4693,7 +4713,7 @@ function clearPid() {
   }
 }
 function createCli() {
-  const program = new Command().name("jarvis").description("Jarvis local agent \u2014 runs Claude Code on your machine").version("0.0.0");
+  const program = new Command().name("jarvis").description("Jarvis local agent \u2014 runs Claude Code on your machine").version(PKG_VERSION);
   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);
@@ -4762,12 +4782,19 @@ function createCli() {
       args.push("--api-key", anthropicApiKey);
     }
     const binPath = process.argv[1];
-    const child = spawn2(process.execPath, [binPath, ...args], {
-      detached: true,
-      stdio: ["ignore", logFd, logFd],
-      cwd: workspacePath,
-      env: { ...process.env, NODE_NO_WARNINGS: "1" }
-    });
+    const cliRoot = path7.resolve(path7.dirname(binPath), "..");
+    const distEntry = path7.join(cliRoot, "dist", "bin.js");
+    const useDistEntry = fs7.existsSync(distEntry);
+    const child = spawn2(
+      process.execPath,
+      useDistEntry ? [distEntry, ...args] : [binPath, ...args],
+      {
+        detached: true,
+        stdio: ["ignore", logFd, logFd],
+        cwd: workspacePath,
+        env: { ...process.env, NODE_NO_WARNINGS: "1" }
+      }
+    );
     child.unref();
     fs7.closeSync(logFd);
     savePid(child.pid);
@@ -4858,7 +4885,7 @@ function createCli() {
     const pid = readPid();
     const port = config?.port ?? 7862;
     const running = await isPortInUse(port);
-    console.log("Jarvis Agent:");
+    console.log(`Jarvis Agent v${PKG_VERSION}:`);
     console.log(`  Status:     ${running ? `\x1B[32mrunning\x1B[0m` : `\x1B[31mstopped\x1B[0m`}${pid ? ` (PID: ${pid})` : ""}`);
     console.log(`  Port:       ${port}`);
     console.log(`  Config:     ${getConfigPath()}`);