@appchy/jarvis 0.1.4 → 0.1.6

package/dist/bin.js

@@ -1,10 +1,14 @@
 // src/bin.ts
 import dotenv from "dotenv";
-import fs7 from "fs";
-import path7 from "path";
+import fs8 from "fs";
+import path8 from "path";
 
 // src/cli.ts
 import { Command } from "commander";
+import { spawn as spawn2, execSync } from "child_process";
+import fs7 from "fs";
+import path7 from "path";
+import os4 from "os";
 
 // src/config.ts
 import fs from "fs";
@@ -384,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 } : {},
@@ -553,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 } : {},
@@ -2052,7 +2056,7 @@ function createWsProgressHandlers(deps) {
         id: `status-plan-${crypto2.randomUUID()}`,
         role: "assistant",
         type: "status",
-        content: "Planning...",
+        content: "Planning",
         isPartial: true,
         createdAt: now
       });
@@ -2234,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: () => {
@@ -2262,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: () => {
@@ -4660,8 +4664,39 @@ 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");
+function savePid(pid) {
+  fs7.mkdirSync(LOG_DIR, { recursive: true });
+  fs7.writeFileSync(PID_FILE, String(pid));
+}
+function readPid() {
+  try {
+    const pid = parseInt(fs7.readFileSync(PID_FILE, "utf-8").trim(), 10);
+    if (isNaN(pid)) return null;
+    try {
+      process.kill(pid, 0);
+      return pid;
+    } catch {
+      fs7.unlinkSync(PID_FILE);
+      return null;
+    }
+  } catch {
+    return null;
+  }
+}
+function clearPid() {
+  try {
+    fs7.unlinkSync(PID_FILE);
+  } catch {
+  }
+}
 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);
@@ -4687,15 +4722,13 @@ function createCli() {
       process.exit(1);
     }
   });
-  program.command("start").description("Start the local agent").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)").action(async (opts) => {
+  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) => {
     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(`Clients (jarvis chat, VSCode) can connect to it.
-`);
+      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();
@@ -4704,35 +4737,153 @@ Jarvis agent is already running on ws://127.0.0.1:${port}`);
     if (!anthropicApiKey && !config?.useSubscription) {
       console.warn("Warning: No Anthropic API key set. Using subscription mode.");
     }
-    await startAgent({
-      port,
-      workspacePath,
-      anthropicApiKey,
-      useSubscription: !anthropicApiKey,
-      userId,
-      upstream: opts.upstream && config?.apiUrl && config?.token ? { apiUrl: config.apiUrl, token: config.token } : void 0
-    });
+    if (opts.foreground) {
+      await startAgent({
+        port,
+        workspacePath,
+        anthropicApiKey,
+        useSubscription: !anthropicApiKey,
+        userId,
+        upstream: opts.upstream && config?.apiUrl && config?.token ? { apiUrl: config.apiUrl, token: config.token } : void 0
+      });
+      return;
+    }
+    fs7.mkdirSync(LOG_DIR, { recursive: true });
+    const logFd = fs7.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 = 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);
+    console.log(`Jarvis agent started (PID: ${child.pid})`);
+    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}`);
+    }
+    console.log();
+    console.log(`Commands:`);
+    console.log(`  jarvis logs      \u2014 View agent logs`);
+    console.log(`  jarvis stop      \u2014 Stop the agent`);
+    console.log(`  jarvis restart   \u2014 Restart the agent`);
+  });
+  program.command("stop").description("Stop the running agent").action(async () => {
+    const pid = readPid();
+    if (pid) {
+      try {
+        process.kill(pid, "SIGTERM");
+        clearPid();
+        console.log(`Agent stopped (PID: ${pid})`);
+      } catch {
+        clearPid();
+        console.log("Agent process not found. Cleaned up PID file.");
+      }
+      return;
+    }
+    const running = await isPortInUse(7862);
+    if (running) {
+      try {
+        const output = execSync("lsof -ti :7862", { encoding: "utf-8" }).trim();
+        if (output) {
+          const pids = output.split("\n");
+          for (const p of pids) {
+            try {
+              process.kill(parseInt(p, 10), "SIGTERM");
+            } catch {
+            }
+          }
+          console.log("Agent stopped.");
+          return;
+        }
+      } catch {
+      }
+    }
+    console.log("No agent is running.");
+  });
+  program.command("restart").description("Restart the agent").action(async () => {
+    const pid = readPid();
+    if (pid) {
+      try {
+        process.kill(pid, "SIGTERM");
+      } catch {
+      }
+      clearPid();
+      console.log(`Stopped agent (PID: ${pid})`);
+      await new Promise((r) => setTimeout(r, 1e3));
+    }
+    console.log("Starting agent...");
+    await program.parseAsync(["node", "jarvis", "start"]);
+  });
+  program.command("logs").description("View agent logs").option("-f, --follow", "Follow log output (like tail -f)").option("-n, --lines <n>", "Number of lines to show", "50").action((opts) => {
+    if (!fs7.existsSync(LOG_FILE)) {
+      console.log("No log file found. Start the agent first: jarvis start");
+      return;
+    }
+    if (opts.follow) {
+      const tail = spawn2("tail", ["-f", "-n", opts.lines, LOG_FILE], {
+        stdio: "inherit"
+      });
+      process.on("SIGINT", () => {
+        tail.kill();
+        process.exit(0);
+      });
+      tail.on("exit", () => process.exit(0));
+    } else {
+      const content = execSync(`tail -n ${opts.lines} "${LOG_FILE}"`, { encoding: "utf-8" });
+      process.stdout.write(content);
+    }
   });
   program.command("chat").description("Interactive TUI \u2014 chat with Jarvis in your terminal").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 launchChat(opts);
   });
-  program.command("status").description("Show agent configuration and connection status").action(() => {
+  program.command("status").description("Show agent configuration and connection status").action(async () => {
     const config = loadConfig();
-    if (!config) {
-      console.log("No configuration found.");
-      console.log(`Run 'jarvis connect <token>' to set up.`);
-      return;
-    }
-    console.log("Jarvis Agent Config:");
+    const pid = readPid();
+    const port = config?.port ?? 7862;
+    const running = await isPortInUse(port);
+    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()}`);
-    console.log(`  User:       ${config.userId}`);
-    console.log(`  Env:        ${config.envId ?? "local"}`);
-    console.log(`  Workspace:  ${config.workspacePath ?? "(cwd)"}`);
-    console.log(`  Port:       ${config.port ?? 7862}`);
-    console.log(`  Cloud:      ${config.apiUrl ?? "(not connected)"}`);
-    if (config.connectedAt) {
-      console.log(`  Connected:  ${config.connectedAt}`);
+    if (config) {
+      console.log(`  User:       ${config.userId}`);
+      console.log(`  Env:        ${config.envId ?? "local"}`);
+      console.log(`  Workspace:  ${config.workspacePath ?? "(cwd)"}`);
+      console.log(`  Cloud:      ${config.apiUrl ?? "(not connected)"}`);
+      if (config.connectedAt) {
+        console.log(`  Connected:  ${config.connectedAt}`);
+      }
+    } else {
+      console.log(`  Config:     Not set up. Run 'jarvis connect <token>'`);
     }
+    console.log(`  Logs:       ${LOG_FILE}`);
   });
   program.command("logout").description("Clear saved configuration").action(() => {
     clearConfig();
@@ -4744,10 +4895,10 @@ Jarvis agent is already running on ws://127.0.0.1:${port}`);
 // src/bin.ts
 function findEnv() {
   let dir = process.cwd();
-  while (dir !== path7.dirname(dir)) {
-    const envPath = path7.join(dir, ".env");
-    if (fs7.existsSync(envPath)) return envPath;
-    dir = path7.dirname(dir);
+  while (dir !== path8.dirname(dir)) {
+    const envPath = path8.join(dir, ".env");
+    if (fs8.existsSync(envPath)) return envPath;
+    dir = path8.dirname(dir);
   }
   return void 0;
 }