opencara 0.6.2 → 0.8.0

package/dist/index.js

@@ -14,9 +14,10 @@ import * as os from "os";
 import { parse, stringify } from "yaml";
 var DEFAULT_PLATFORM_URL = "https://api.opencara.dev";
 var CONFIG_DIR = path.join(os.homedir(), ".opencara");
-var CONFIG_FILE = path.join(CONFIG_DIR, "config.yml");
+var CONFIG_FILE = process.env.OPENCARA_CONFIG && process.env.OPENCARA_CONFIG.trim() ? path.resolve(process.env.OPENCARA_CONFIG) : path.join(CONFIG_DIR, "config.yml");
 function ensureConfigDir() {
-  fs.mkdirSync(CONFIG_DIR, { recursive: true });
+  const dir = path.dirname(CONFIG_FILE);
+  fs.mkdirSync(dir, { recursive: true });
 }
 var DEFAULT_MAX_DIFF_SIZE_KB = 100;
 function parseLimits(data) {
@@ -298,17 +299,17 @@ function calculateDelay(attempt, options = DEFAULT_RECONNECT_OPTIONS) {
   return base;
 }
 function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
+  return new Promise((resolve2) => setTimeout(resolve2, ms));
 }
 
 // src/commands/login.ts
 function promptYesNo(question) {
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     rl.question(question, (answer) => {
       rl.close();
       const normalized = answer.trim().toLowerCase();
-      resolve(normalized === "" || normalized === "y" || normalized === "yes");
+      resolve2(normalized === "" || normalized === "y" || normalized === "yes");
     });
   });
 }
@@ -591,7 +592,7 @@ function executeTool(commandTemplate, prompt, timeoutMs, signal, vars) {
   const promptViaArg = commandTemplate.includes("${PROMPT}");
   const allVars = { ...vars, PROMPT: prompt };
   const { command, args } = parseCommandTemplate(commandTemplate, allVars);
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     if (signal?.aborted) {
       reject(new ToolTimeoutError("Tool execution aborted"));
       return;
@@ -663,7 +664,7 @@ function executeTool(commandTemplate, prompt, timeoutMs, signal, vars) {
             console.warn(`Tool stderr: ${stderr.slice(0, MAX_STDERR_LENGTH)}`);
           }
           const usage2 = parseTokenUsage(stdout, stderr);
-          resolve({ stdout, stderr, tokensUsed: usage2.tokens, tokensParsed: usage2.parsed });
+          resolve2({ stdout, stderr, tokensUsed: usage2.tokens, tokensParsed: usage2.parsed });
           return;
         }
         const errMsg = stderr ? `Tool "${command}" failed (exit code ${code}): ${stderr.slice(0, MAX_STDERR_LENGTH)}` : `Tool "${command}" failed with exit code ${code}`;
@@ -671,7 +672,7 @@ function executeTool(commandTemplate, prompt, timeoutMs, signal, vars) {
         return;
       }
       const usage = parseTokenUsage(stdout, stderr);
-      resolve({ stdout, stderr, tokensUsed: usage.tokens, tokensParsed: usage.parsed });
+      resolve2({ stdout, stderr, tokensUsed: usage.tokens, tokensParsed: usage.parsed });
     });
   });
 }
@@ -955,6 +956,9 @@ function startAgent(agentId, platformUrl, apiKey, reviewDeps, consumptionDeps, o
   const stabilityThreshold = options?.stabilityThresholdMs ?? CONNECTION_STABILITY_THRESHOLD_MS;
   const repoConfig = options?.repoConfig;
   const displayName = options?.displayName;
+  const prefix = options?.label ? `[${options.label}]` : "";
+  const log = (...args) => console.log(...prefix ? [prefix, ...args] : args);
+  const logError = (...args) => console.error(...prefix ? [prefix, ...args] : args);
   let attempt = 0;
   let intentionalClose = false;
   let heartbeatTimer = null;
@@ -986,7 +990,7 @@ function startAgent(agentId, platformUrl, apiKey, reviewDeps, consumptionDeps, o
     clearStabilityTimer();
     clearWsPingTimer();
     if (currentWs) currentWs.close();
-    console.log("Disconnected.");
+    log("Disconnected.");
     process.exit(0);
   }
   process.once("SIGINT", shutdown);
@@ -998,13 +1002,13 @@ function startAgent(agentId, platformUrl, apiKey, reviewDeps, consumptionDeps, o
     function resetHeartbeatTimer() {
       clearHeartbeatTimer();
       heartbeatTimer = setTimeout(() => {
-        console.log("No heartbeat received in 90s. Reconnecting...");
+        log("No heartbeat received in 90s. Reconnecting...");
         ws.terminate();
       }, HEARTBEAT_TIMEOUT_MS);
     }
     ws.on("open", () => {
       connectionOpenedAt = Date.now();
-      console.log("Connected to platform.");
+      log("Connected to platform.");
       resetHeartbeatTimer();
       clearWsPingTimer();
       wsPingTimer = setInterval(() => {
@@ -1016,12 +1020,12 @@ function startAgent(agentId, platformUrl, apiKey, reviewDeps, consumptionDeps, o
         }
       }, WS_PING_INTERVAL_MS);
       if (verbose) {
-        console.log(`[verbose] Connection opened at ${new Date(connectionOpenedAt).toISOString()}`);
+        log(`[verbose] Connection opened at ${new Date(connectionOpenedAt).toISOString()}`);
       }
       clearStabilityTimer();
       stabilityTimer = setTimeout(() => {
         if (verbose) {
-          console.log(
+          log(
             `[verbose] Connection stable for ${stabilityThreshold / 1e3}s \u2014 resetting reconnect counter`
           );
         }
@@ -1043,7 +1047,8 @@ function startAgent(agentId, platformUrl, apiKey, reviewDeps, consumptionDeps, o
         consumptionDeps,
         verbose,
         repoConfig,
-        displayName
+        displayName,
+        prefix
       );
     });
     ws.on("close", (code, reason) => {
@@ -1055,14 +1060,14 @@ function startAgent(agentId, platformUrl, apiKey, reviewDeps, consumptionDeps, o
       if (connectionOpenedAt) {
         const lifetimeMs = Date.now() - connectionOpenedAt;
         const lifetimeSec = (lifetimeMs / 1e3).toFixed(1);
-        console.log(
+        log(
           `Disconnected (code=${code}, reason=${reason.toString()}). Connection was alive for ${lifetimeSec}s.`
         );
       } else {
-        console.log(`Disconnected (code=${code}, reason=${reason.toString()}).`);
+        log(`Disconnected (code=${code}, reason=${reason.toString()}).`);
       }
       if (code === 4002) {
-        console.log("Connection replaced by server \u2014 not reconnecting.");
+        log("Connection replaced by server \u2014 not reconnecting.");
         return;
       }
       connectionOpenedAt = null;
@@ -1070,18 +1075,18 @@ function startAgent(agentId, platformUrl, apiKey, reviewDeps, consumptionDeps, o
     });
     ws.on("pong", () => {
       if (verbose) {
-        console.log(`[verbose] WS pong received at ${(/* @__PURE__ */ new Date()).toISOString()}`);
+        log(`[verbose] WS pong received at ${(/* @__PURE__ */ new Date()).toISOString()}`);
       }
     });
     ws.on("error", (err) => {
-      console.error(`WebSocket error: ${err.message}`);
+      logError(`WebSocket error: ${err.message}`);
     });
   }
   async function reconnect() {
     const delay = calculateDelay(attempt, DEFAULT_RECONNECT_OPTIONS);
     const delaySec = (delay / 1e3).toFixed(1);
     attempt++;
-    console.log(`Reconnecting in ${delaySec}s... (attempt ${attempt})`);
+    log(`Reconnecting in ${delaySec}s... (attempt ${attempt})`);
     await sleep(delay);
     connect();
   }
@@ -1094,16 +1099,17 @@ function trySend(ws, data) {
     console.error("Failed to send message \u2014 WebSocket may be closed");
   }
 }
-async function logPostReviewStats(type, verdict, tokensUsed, tokensEstimated, consumptionDeps) {
+async function logPostReviewStats(type, verdict, tokensUsed, tokensEstimated, consumptionDeps, logPrefix) {
+  const pfx = logPrefix ? `${logPrefix} ` : "";
   const estimateTag = tokensEstimated ? " ~" : " ";
   if (!consumptionDeps) {
     if (verdict) {
       console.log(
-        `${type} complete: ${verdict} (${estimateTag}${tokensUsed} tokens${tokensEstimated ? ", estimated" : ""})`
+        `${pfx}${type} complete: ${verdict} (${estimateTag}${tokensUsed} tokens${tokensEstimated ? ", estimated" : ""})`
       );
     } else {
       console.log(
-        `${type} complete (${estimateTag}${tokensUsed} tokens${tokensEstimated ? ", estimated" : ""})`
+        `${pfx}${type} complete (${estimateTag}${tokensUsed} tokens${tokensEstimated ? ", estimated" : ""})`
       );
     }
     return;
@@ -1111,19 +1117,22 @@ async function logPostReviewStats(type, verdict, tokensUsed, tokensEstimated, co
   recordSessionUsage(consumptionDeps.session, tokensUsed);
   if (verdict) {
     console.log(
-      `${type} complete: ${verdict} (${estimateTag}${tokensUsed.toLocaleString()} tokens${tokensEstimated ? ", estimated" : ""})`
+      `${pfx}${type} complete: ${verdict} (${estimateTag}${tokensUsed.toLocaleString()} tokens${tokensEstimated ? ", estimated" : ""})`
     );
   } else {
     console.log(
-      `${type} complete (${estimateTag}${tokensUsed.toLocaleString()} tokens${tokensEstimated ? ", estimated" : ""})`
+      `${pfx}${type} complete (${estimateTag}${tokensUsed.toLocaleString()} tokens${tokensEstimated ? ", estimated" : ""})`
     );
   }
-  console.log(formatPostReviewStats(tokensUsed, consumptionDeps.session, consumptionDeps.limits));
+  console.log(
+    `${pfx}${formatPostReviewStats(tokensUsed, consumptionDeps.session, consumptionDeps.limits)}`
+  );
 }
-function handleMessage(ws, msg, resetHeartbeat, reviewDeps, consumptionDeps, verbose, repoConfig, displayName) {
+function handleMessage(ws, msg, resetHeartbeat, reviewDeps, consumptionDeps, verbose, repoConfig, displayName, logPrefix) {
+  const pfx = logPrefix ? `${logPrefix} ` : "";
   switch (msg.type) {
     case "connected":
-      console.log(`Authenticated. Protocol v${msg.version ?? "unknown"}`);
+      console.log(`${pfx}Authenticated. Protocol v${msg.version ?? "unknown"}`);
       trySend(ws, {
         type: "agent_preferences",
         id: crypto2.randomUUID(),
@@ -1135,14 +1144,16 @@ function handleMessage(ws, msg, resetHeartbeat, reviewDeps, consumptionDeps, ver
     case "heartbeat_ping":
       ws.send(JSON.stringify({ type: "heartbeat_pong", timestamp: Date.now() }));
       if (verbose) {
-        console.log(`[verbose] Heartbeat ping received, pong sent at ${(/* @__PURE__ */ new Date()).toISOString()}`);
+        console.log(
+          `${pfx}[verbose] Heartbeat ping received, pong sent at ${(/* @__PURE__ */ new Date()).toISOString()}`
+        );
       }
       if (resetHeartbeat) resetHeartbeat();
       break;
     case "review_request": {
       const request = msg;
       console.log(
-        `Review request: task ${request.taskId} for ${request.project.owner}/${request.project.repo}#${request.pr.number}`
+        `${pfx}Review request: task ${request.taskId} for ${request.project.owner}/${request.project.repo}#${request.pr.number}`
       );
       if (!reviewDeps) {
         ws.send(
@@ -1170,7 +1181,7 @@ function handleMessage(ws, msg, resetHeartbeat, reviewDeps, consumptionDeps, ver
               taskId: request.taskId,
               reason: limitResult.reason ?? "consumption_limit_exceeded"
             });
-            console.log(`Review rejected: ${limitResult.reason}`);
+            console.log(`${pfx}Review rejected: ${limitResult.reason}`);
             return;
           }
         }
@@ -1202,7 +1213,8 @@ function handleMessage(ws, msg, resetHeartbeat, reviewDeps, consumptionDeps, ver
             result.verdict,
             result.tokensUsed,
             result.tokensEstimated,
-            consumptionDeps
+            consumptionDeps,
+            logPrefix
           );
         } catch (err) {
           if (err instanceof DiffTooLargeError) {
@@ -1222,7 +1234,7 @@ function handleMessage(ws, msg, resetHeartbeat, reviewDeps, consumptionDeps, ver
               error: err instanceof Error ? err.message : "Unknown error"
             });
           }
-          console.error("Review failed:", err);
+          console.error(`${pfx}Review failed:`, err);
         }
       })();
       break;
@@ -1230,7 +1242,7 @@ function handleMessage(ws, msg, resetHeartbeat, reviewDeps, consumptionDeps, ver
     case "summary_request": {
       const summaryRequest = msg;
       console.log(
-        `Summary request: task ${summaryRequest.taskId} for ${summaryRequest.project.owner}/${summaryRequest.project.repo}#${summaryRequest.pr.number} (${summaryRequest.reviews.length} reviews)`
+        `${pfx}Summary request: task ${summaryRequest.taskId} for ${summaryRequest.project.owner}/${summaryRequest.project.repo}#${summaryRequest.pr.number} (${summaryRequest.reviews.length} reviews)`
       );
       if (!reviewDeps) {
         trySend(ws, {
@@ -1256,7 +1268,7 @@ function handleMessage(ws, msg, resetHeartbeat, reviewDeps, consumptionDeps, ver
               taskId: summaryRequest.taskId,
               reason: limitResult.reason ?? "consumption_limit_exceeded"
             });
-            console.log(`Summary rejected: ${limitResult.reason}`);
+            console.log(`${pfx}Summary rejected: ${limitResult.reason}`);
             return;
           }
         }
@@ -1287,7 +1299,8 @@ function handleMessage(ws, msg, resetHeartbeat, reviewDeps, consumptionDeps, ver
             void 0,
             result.tokensUsed,
             result.tokensEstimated,
-            consumptionDeps
+            consumptionDeps,
+            logPrefix
           );
         } catch (err) {
           if (err instanceof InputTooLargeError) {
@@ -1307,13 +1320,13 @@ function handleMessage(ws, msg, resetHeartbeat, reviewDeps, consumptionDeps, ver
               error: err instanceof Error ? err.message : "Summary failed"
             });
           }
-          console.error("Summary failed:", err);
+          console.error(`${pfx}Summary failed:`, err);
         }
       })();
       break;
     }
     case "error":
-      console.error(`Platform error: ${msg.code ?? "unknown"}`);
+      console.error(`${pfx}Platform error: ${msg.code ?? "unknown"}`);
       if (msg.code === "auth_revoked") process.exit(1);
       break;
     default:
@@ -1720,12 +1733,13 @@ agentCommand.command("start [agentIdOrModel]").description("Connect agent to pla
           limits: resolveAgentLimits(selected.local.limits, config.limits),
           session: createSessionTracker()
         };
-        console.log(`Starting agent ${selected.local.model} (${agentId2})...`);
+        const label = selected.local.name || selected.local.model || "unnamed";
+        console.log(`Starting agent ${label} (${agentId2})...`);
         startAgent(agentId2, config.platformUrl, apiKey2, reviewDeps2, consumptionDeps2, {
           verbose: opts.verbose,
           stabilityThresholdMs,
-          displayName: selected.local.name,
-          repoConfig: selected.local.repos
+          repoConfig: selected.local.repos,
+          label
         });
         startedCount++;
       }
@@ -1754,12 +1768,14 @@ agentCommand.command("start [agentIdOrModel]").description("Connect agent to pla
           limits: config.limits,
           session: createSessionTracker()
         };
-        console.log(`Starting anonymous agent ${anon.model} (${anon.agentId})...`);
+        const anonLabel = anon.name || anon.model || "anonymous";
+        console.log(`Starting anonymous agent ${anonLabel} (${anon.agentId})...`);
         startAgent(anon.agentId, config.platformUrl, anon.apiKey, reviewDeps2, consumptionDeps2, {
           verbose: opts.verbose,
           stabilityThresholdMs,
           displayName: anon.name,
-          repoConfig: anon.repoConfig
+          repoConfig: anon.repoConfig,
+          label: anonLabel
         });
         startedCount++;
       }
@@ -1818,7 +1834,8 @@ agentCommand.command("start [agentIdOrModel]").description("Connect agent to pla
     console.log(`Starting agent ${agentId}...`);
     startAgent(agentId, config.platformUrl, apiKey, reviewDeps, consumptionDeps, {
       verbose: opts.verbose,
-      stabilityThresholdMs
+      stabilityThresholdMs,
+      label: agentId
     });
   }
 );
@@ -1999,7 +2016,7 @@ var statsCommand = new Command3("stats").description("Display agent dashboard: t
 });
 
 // src/index.ts
-var program = new Command4().name("opencara").description("OpenCara \u2014 distributed AI code review agent").version("0.6.1");
+var program = new Command4().name("opencara").description("OpenCara \u2014 distributed AI code review agent").version("0.8.0");
 program.addCommand(loginCommand);
 program.addCommand(agentCommand);
 program.addCommand(statsCommand);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencara",
-  "version": "0.6.2",
+  "version": "0.8.0",
   "type": "module",
   "repository": {
     "type": "git",