@appchy/jarvis 0.1.7 → 0.1.9

package/dist/bin.js

@@ -400,6 +400,7 @@ function claudeCodeProvider(config = {}) {
           } : {},
           ...config.disallowedTools?.length ? { disallowedTools: config.disallowedTools } : {},
           ...config.abortController ? { abortController: config.abortController } : {},
+          ...config.thinking ? { thinking: config.thinking } : {},
           // Session resume/persistence options
           ...config.session?.sessionId ? { sessionId: config.session.sessionId } : {},
           ...config.session?.resume ? { resume: config.session.resume } : {},
@@ -569,6 +570,7 @@ function claudeCodeProvider(config = {}) {
           } : {},
           ...config.disallowedTools?.length ? { disallowedTools: config.disallowedTools } : {},
           ...config.abortController ? { abortController: config.abortController } : {},
+          ...config.thinking ? { thinking: config.thinking } : {},
           // Session resume/persistence options
           ...config.session?.sessionId ? { sessionId: config.session.sessionId } : {},
           ...config.session?.resume ? { resume: config.session.resume } : {},
@@ -2018,6 +2020,8 @@ function createWsProgressHandlers(deps) {
   let currentThinkingId = null;
   let currentTextId = null;
   let currentTextContent = "";
+  let planFileContent = null;
+  let planFilePath = null;
   async function onMessage(msg) {
     broadcast({ type: "agent:onMessage", taskId, message: msg });
   }
@@ -2045,10 +2049,27 @@ function createWsProgressHandlers(deps) {
     const now = (/* @__PURE__ */ new Date()).toISOString();
     if (toolName === "askUser") return waitForInput(input);
     if (toolName === "ExitPlanMode") {
+      const now2 = (/* @__PURE__ */ new Date()).toISOString();
+      if (planFileContent) {
+        await onMessage({
+          id: `plan-${crypto2.randomUUID()}`,
+          role: "assistant",
+          type: "ui",
+          content: planFileContent,
+          ui: {
+            uri: "ui://agent/plan",
+            title: "Plan",
+            data: { content: planFileContent, path: planFilePath }
+          },
+          isPartial: false,
+          createdAt: now2
+        });
+      }
       return waitForInput({
         ...input,
         type: "plan",
-        reason: input.input?.allowedPrompts || "Plan ready for review"
+        reason: input.input?.allowedPrompts || "Plan ready for review",
+        output: planFileContent ? { content: planFileContent, path: planFilePath } : input.output
       });
     }
     if (toolName === "EnterPlanMode") {
@@ -2108,6 +2129,11 @@ function createWsProgressHandlers(deps) {
             isComplete: false
           });
         }
+        if (block.type === "tool_use" && block.name === "Write" && typeof block.input?.file_path === "string" && block.input.file_path.endsWith(".md")) {
+          const input = block.input;
+          planFileContent = input.content ?? null;
+          planFilePath = input.file_path ?? null;
+        }
         if (block.type === "tool_use" && block.id && block.name) {
           if (currentTextId) {
             broadcast({
@@ -2233,6 +2259,8 @@ function createAgent(deps) {
         worktreePath: wsPath,
         messageCount: msg.messages.length
       });
+      const askModeTools = msg.permissionMode === "ask" ? ["Edit", "Write", "MultiEdit", "NotebookEdit"] : [];
+      const allDisallowed = [...msg.disallowedTools ?? [], ...askModeTools];
       const provider2 = claudeCodeProvider({
         ...deps.useSubscription ? { useSubscription: true } : { apiKey: deps.anthropicApiKey },
         systemPrompt: systemMsg?.content ?? "",
@@ -2247,7 +2275,8 @@ function createAgent(deps) {
         onProgress: handlers.handleProgress,
         onUserInput: handlers.handleUserInput,
         permissionMode: msg.permissionMode === "plan" ? "plan" : "default",
-        ...msg.disallowedTools?.length ? { disallowedTools: msg.disallowedTools } : {},
+        ...allDisallowed.length ? { disallowedTools: allDisallowed } : {},
+        ...msg.thinking ? { thinking: msg.thinking } : {},
         ...msg.session ? { session: msg.session } : {}
       });
       const ctx = { requestId: taskId, userId: deps.userId };
@@ -2303,7 +2332,7 @@ function createAgent(deps) {
         deps.broadcast({
           type: "agent:output",
           taskId,
-          output: { success: false, content: "", error: "Aborted" }
+          output: { success: false, content: "", error: "Aborted", sessionId: msg.session?.resume }
         });
       } else {
         const error = err instanceof Error ? err.message : String(err);
@@ -2519,17 +2548,77 @@ function createUpstreamClient(config) {
   let ws = null;
   let messageHandler = null;
   let reconnectTimer = null;
+  let refreshTimer = null;
   let closed = false;
   let authFailures = 0;
+  let retries = 0;
+  let currentToken = config.token;
   const MAX_AUTH_RETRIES = 3;
+  const MAX_RETRIES = 3;
+  const REFRESH_BUFFER_MS = 5 * 60 * 1e3;
+  function getRefreshUrl() {
+    if (config.refreshUrl) return config.refreshUrl;
+    if (!config.refreshToken) return null;
+    return config.apiUrl.replace(/^wss:/, "https:").replace(/^ws:/, "http:") + "/refresh";
+  }
+  function getTokenExpiry(token) {
+    try {
+      const payload = JSON.parse(Buffer.from(token.split(".")[1], "base64").toString());
+      return payload.exp ?? null;
+    } catch {
+      return null;
+    }
+  }
+  function scheduleRefresh() {
+    if (refreshTimer) clearTimeout(refreshTimer);
+    if (!config.refreshToken) return;
+    const exp = getTokenExpiry(currentToken);
+    if (!exp) return;
+    const msUntilExpiry = exp * 1e3 - Date.now();
+    const refreshIn = Math.max(msUntilExpiry - REFRESH_BUFFER_MS, 0);
+    logger.sys.info("[Upstream] Token refresh scheduled", {
+      expiresIn: `${Math.round(msUntilExpiry / 1e3)}s`,
+      refreshIn: `${Math.round(refreshIn / 1e3)}s`
+    });
+    refreshTimer = setTimeout(refreshToken, refreshIn);
+  }
+  async function refreshToken() {
+    const url = getRefreshUrl();
+    if (!url || !config.refreshToken) return false;
+    try {
+      logger.sys.info("[Upstream] Refreshing token...");
+      const res = await fetch(url, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ refreshToken: config.refreshToken })
+      });
+      if (!res.ok) {
+        logger.sys.error("[Upstream] Token refresh failed", { status: res.status });
+        return false;
+      }
+      const { token } = await res.json();
+      currentToken = token;
+      logger.sys.info("[Upstream] Token refreshed successfully");
+      ws?.close();
+      scheduleRefresh();
+      return true;
+    } catch (err) {
+      logger.sys.error("[Upstream] Token refresh error", {
+        error: err instanceof Error ? err.message : String(err)
+      });
+      return false;
+    }
+  }
   function connect() {
     if (closed) return;
     ws = new WebSocket2(config.apiUrl, {
-      headers: { authorization: `Bearer ${config.token}` }
+      headers: { authorization: `Bearer ${currentToken}` }
     });
     ws.on("open", () => {
       authFailures = 0;
+      retries = 0;
       logger.sys.info("[Upstream] Connected to cloud", { apiUrl: config.apiUrl });
+      scheduleRefresh();
     });
     ws.on("message", (raw) => {
       try {
@@ -2545,6 +2634,24 @@ function createUpstreamClient(config) {
     ws.on("close", (code) => {
       if (closed) return;
       if (code === 4001 || code === 4003) {
+        if (config.refreshToken) {
+          refreshToken().then((ok) => {
+            if (ok) {
+              reconnectTimer = setTimeout(connect, 1e3);
+            } else {
+              authFailures++;
+              if (authFailures >= MAX_AUTH_RETRIES) {
+                logger.sys.error("[Upstream] Auth failed after max retries, giving up", {
+                  code,
+                  attempts: authFailures
+                });
+                return;
+              }
+              reconnectTimer = setTimeout(connect, 3e3);
+            }
+          });
+          return;
+        }
         authFailures++;
         if (authFailures >= MAX_AUTH_RETRIES) {
           logger.sys.error("[Upstream] Auth failed after max retries, giving up", {
@@ -2558,8 +2665,21 @@ function createUpstreamClient(config) {
           attempt: authFailures,
           maxRetries: MAX_AUTH_RETRIES
         });
+        reconnectTimer = setTimeout(connect, 3e3);
+        return;
+      }
+      retries++;
+      if (retries >= MAX_RETRIES) {
+        logger.sys.error("[Upstream] Max reconnect attempts reached, giving up", {
+          attempts: retries
+        });
+        return;
       }
-      logger.sys.info("[Upstream] Disconnected, reconnecting in 3s...");
+      logger.sys.info("[Upstream] Disconnected, reconnecting in 3s...", {
+        code,
+        attempt: retries,
+        maxRetries: MAX_RETRIES
+      });
       reconnectTimer = setTimeout(connect, 3e3);
     });
     ws.on("error", (err) => {
@@ -2582,6 +2702,7 @@ function createUpstreamClient(config) {
   function close() {
     closed = true;
     if (reconnectTimer) clearTimeout(reconnectTimer);
+    if (refreshTimer) clearTimeout(refreshTimer);
     ws?.close();
   }
   return { connect, send, onMessage, isConnected, close };
@@ -4712,8 +4833,99 @@ function clearPid() {
   } catch {
   }
 }
+async function waitForBrowserAuth(port) {
+  const http = await import("http");
+  return new Promise((resolve, reject) => {
+    const timeout = setTimeout(() => {
+      server.close();
+      reject(new Error("Browser authentication timed out (2 minutes)"));
+    }, 12e4);
+    const server = http.createServer((req, res) => {
+      const url = new URL(req.url ?? "/", `http://127.0.0.1:${port}`);
+      if (url.pathname === "/callback") {
+        const token = url.searchParams.get("token");
+        res.setHeader("Access-Control-Allow-Origin", "*");
+        res.setHeader("Access-Control-Allow-Methods", "GET");
+        if (token) {
+          res.writeHead(200, { "Content-Type": "text/plain" });
+          res.end("OK");
+          clearTimeout(timeout);
+          server.close();
+          resolve(token);
+        } else {
+          res.writeHead(400, { "Content-Type": "text/plain" });
+          res.end("Missing token");
+        }
+        return;
+      }
+      res.writeHead(404);
+      res.end();
+    });
+    server.listen(port, "127.0.0.1");
+  });
+}
+async function findFreePort() {
+  const net = await import("net");
+  return new Promise((resolve, reject) => {
+    const server = net.createServer();
+    server.listen(0, "127.0.0.1", () => {
+      const addr = server.address();
+      const port = typeof addr === "object" && addr ? addr.port : 0;
+      server.close(() => resolve(port));
+    });
+    server.on("error", reject);
+  });
+}
+async function browserAuth(appUrl) {
+  const config = loadConfig();
+  const callbackPort = await findFreePort();
+  const loginUrl = `${appUrl}/login?callback=cli&port=${callbackPort}`;
+  console.log();
+  console.log("Opening browser for sign in...");
+  console.log(`  If it doesn't open, visit: ${loginUrl}`);
+  console.log();
+  const { exec: exec3 } = await import("child_process");
+  const platform = process.platform;
+  const openCmd = platform === "darwin" ? "open" : platform === "win32" ? "start" : "xdg-open";
+  exec3(`${openCmd} "${loginUrl}"`);
+  console.log("Waiting for authentication...");
+  try {
+    const token = await waitForBrowserAuth(callbackPort);
+    const parsed = parseConnectToken(token);
+    saveConfig({
+      ...config,
+      apiUrl: parsed.apiUrl,
+      token: parsed.jwt,
+      refreshToken: parsed.refreshToken,
+      userId: parsed.userId,
+      envId: parsed.envId,
+      connectedAt: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    console.log();
+    console.log(`Signed in as ${parsed.userId}`);
+    return true;
+  } catch (err) {
+    console.error(`Authentication failed: ${err instanceof Error ? err.message : err}`);
+    return false;
+  }
+}
+var DEFAULT_APP_URL = process.env.APP_URL ?? "http://localhost:3000";
+async function ensureSetup() {
+  const config = loadConfig();
+  if (config?.token || config?.anthropicApiKey || config?.useSubscription) {
+    return true;
+  }
+  return browserAuth(config?.apiUrl ?? DEFAULT_APP_URL);
+}
 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);
@@ -4722,6 +4934,7 @@ function createCli() {
         ...existing,
         apiUrl: parsed.apiUrl,
         token: parsed.jwt,
+        refreshToken: parsed.refreshToken,
         userId: parsed.userId,
         envId: parsed.envId,
         ...opts.workspace ? { workspacePath: opts.workspace } : {},
@@ -4740,6 +4953,7 @@ 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();
     const config = loadConfig();
     const port = parseInt(opts.port, 10);
     const alreadyRunning = await isPortInUse(port);
@@ -4761,7 +4975,14 @@ function createCli() {
         anthropicApiKey,
         useSubscription: !anthropicApiKey,
         userId,
-        upstream: opts.upstream && config?.apiUrl && config?.token ? { apiUrl: config.apiUrl, token: config.token } : void 0
+        upstream: (() => {
+          const apiUrl = process.env.JARVIS_UPSTREAM_URL ?? config?.apiUrl;
+          const token = process.env.JARVIS_UPSTREAM_TOKEN ?? config?.token;
+          if (opts.upstream && apiUrl && token) {
+            return { apiUrl, token, refreshToken: config?.refreshToken };
+          }
+          return void 0;
+        })()
       });
       return;
     }
@@ -4877,9 +5098,6 @@ function createCli() {
       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(async () => {
     const config = loadConfig();
     const pid = readPid();