@rallycry/conveyor-agent 6.0.0 → 6.0.2

package/dist/{chunk-JFIWJVOH.js → chunk-HYWZJYPW.js}

@@ -594,6 +594,33 @@ var ProjectConnection = class {
   }
 };
 
+// src/utils/logger.ts
+import winston from "winston";
+var { combine, timestamp, printf, colorize } = winston.format;
+var customFormat = printf(({ level, message, timestamp: ts, service, ...meta }) => {
+  const svc = service ? `[${service}] ` : "";
+  const metaStr = Object.keys(meta).length ? ` ${JSON.stringify(meta)}` : "";
+  return `${ts} [${level}]: ${svc}${message}${metaStr}`;
+});
+var logger = winston.createLogger({
+  level: process.env.LOG_LEVEL ?? "info",
+  format: combine(timestamp({ format: "YYYY-MM-DD HH:mm:ss" }), combine(colorize(), customFormat)),
+  transports: [new winston.transports.Console()]
+});
+function createServiceLogger(serviceName) {
+  return logger.child({ service: serviceName });
+}
+function errorMeta(error) {
+  if (error instanceof Error) {
+    return {
+      message: error.message,
+      stack: error.stack,
+      ..."code" in error && typeof error.code === "string" ? { code: error.code } : {}
+    };
+  }
+  return { message: String(error) };
+}
+
 // src/runner/worktree.ts
 import { execSync as execSync2 } from "child_process";
 import { existsSync } from "fs";
@@ -675,33 +702,6 @@ function unshallowRepo(workspaceDir) {
   }
 }
 
-// src/utils/logger.ts
-import winston from "winston";
-var { combine, timestamp, printf, colorize } = winston.format;
-var customFormat = printf(({ level, message, timestamp: ts, service, ...meta }) => {
-  const svc = service ? `[${service}] ` : "";
-  const metaStr = Object.keys(meta).length ? ` ${JSON.stringify(meta)}` : "";
-  return `${ts} [${level}]: ${svc}${message}${metaStr}`;
-});
-var logger = winston.createLogger({
-  level: process.env.LOG_LEVEL ?? "info",
-  format: combine(timestamp({ format: "YYYY-MM-DD HH:mm:ss" }), combine(colorize(), customFormat)),
-  transports: [new winston.transports.Console()]
-});
-function createServiceLogger(serviceName) {
-  return logger.child({ service: serviceName });
-}
-function errorMeta(error) {
-  if (error instanceof Error) {
-    return {
-      message: error.message,
-      stack: error.stack,
-      ..."code" in error && typeof error.code === "string" ? { code: error.code } : {}
-    };
-  }
-  return { message: String(error) };
-}
-
 // src/runner/agent-runner.ts
 import { randomUUID as randomUUID2 } from "crypto";
 import { execSync as execSync4 } from "child_process";
@@ -2750,6 +2750,7 @@ function buildCanUseTool(host) {
 }
 
 // src/execution/query-executor.ts
+var logger2 = createServiceLogger("QueryExecutor");
 var API_ERROR_PATTERN2 = /API Error: [45]\d\d/;
 var IMAGE_ERROR_PATTERN2 = /Could not process image/i;
 var RETRY_DELAYS_MS = [6e4, 12e4, 18e4, 3e5];
@@ -2838,7 +2839,10 @@ function buildQueryOptions(host, context) {
     betas: settings.betas,
     maxBudgetUsd: settings.maxBudgetUsd ?? 50,
     disallowedTools: buildDisallowedTools(settings, mode, host.hasExitedPlanMode),
-    enableFileCheckpointing: settings.enableFileCheckpointing
+    enableFileCheckpointing: settings.enableFileCheckpointing,
+    stderr: (data) => {
+      logger2.warn("Claude Code stderr", { data: data.trimEnd() });
+    }
   };
   if (isCloud && isReadOnly) {
     baseOptions.sandbox = buildSandboxConfig(host);
@@ -3429,7 +3433,7 @@ function buildQueryHost(deps) {
 }
 
 // src/runner/agent-runner.ts
-var logger2 = createServiceLogger("AgentRunner");
+var logger3 = createServiceLogger("AgentRunner");
 var HEARTBEAT_INTERVAL_MS = 3e4;
 var IDLE_TIMEOUT_MS = 30 * 60 * 1e3;
 var AgentRunner = class {
@@ -3718,7 +3722,7 @@ var AgentRunner = class {
     const s = this.taskContext.agentSettings ?? this.config.agentSettings ?? {};
     const model = this.taskContext.model || this.config.model;
     const thinking = formatThinkingSetting(s.thinking);
-    logger2.info("Effective agent settings", {
+    logger3.info("Effective agent settings", {
       model,
       mode: this.config.mode ?? "task",
       effort: s.effort ?? "default",
@@ -3762,7 +3766,7 @@ var AgentRunner = class {
       this.idleTimer = setTimeout(() => {
         this.clearIdleTimers();
         this.inputResolver = null;
-        logger2.info("Idle timeout reached, shutting down", {
+        logger3.info("Idle timeout reached, shutting down", {
           idleMinutes: IDLE_TIMEOUT_MS / 6e4
         });
         this.connection.postChatMessage(
@@ -3885,7 +3889,7 @@ import { fileURLToPath } from "url";
 
 // src/runner/project-chat-handler.ts
 import { query as query2 } from "@anthropic-ai/claude-agent-sdk";
-var logger3 = createServiceLogger("ProjectChat");
+var logger4 = createServiceLogger("ProjectChat");
 var FALLBACK_MODEL = "claude-sonnet-4-20250514";
 function buildSystemPrompt2(projectDir, agentCtx) {
   const parts = [];
@@ -3938,7 +3942,7 @@ function processContentBlock(block, responseParts, turnToolCalls) {
       input: inputStr.slice(0, 1e4),
       timestamp: (/* @__PURE__ */ new Date()).toISOString()
     });
-    logger3.debug("Tool use", { tool: block.name });
+    logger4.debug("Tool use", { tool: block.name });
   }
 }
 async function fetchContext(connection) {
@@ -3946,13 +3950,13 @@ async function fetchContext(connection) {
   try {
     agentCtx = await connection.fetchAgentContext();
   } catch {
-    logger3.warn("Could not fetch agent context, using defaults");
+    logger4.warn("Could not fetch agent context, using defaults");
   }
   let chatHistory = [];
   try {
     chatHistory = await connection.fetchChatHistory(30);
   } catch {
-    logger3.warn("Could not fetch chat history, proceeding without it");
+    logger4.warn("Could not fetch chat history, proceeding without it");
   }
   return { agentCtx, chatHistory };
 }
@@ -4026,7 +4030,7 @@ async function handleProjectChatMessage(message, connection, projectDir) {
   try {
     await runChatQuery(message, connection, projectDir);
   } catch (error) {
-    logger3.error("Failed to handle message", errorMeta(error));
+    logger4.error("Failed to handle message", errorMeta(error));
     try {
       await connection.emitChatMessage(
         "I encountered an error processing your message. Please try again."
@@ -4039,7 +4043,7 @@ async function handleProjectChatMessage(message, connection, projectDir) {
 }
 
 // src/runner/project-runner.ts
-var logger4 = createServiceLogger("ProjectRunner");
+var logger5 = createServiceLogger("ProjectRunner");
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = path.dirname(__filename);
 var HEARTBEAT_INTERVAL_MS2 = 3e4;
@@ -4063,7 +4067,7 @@ function setupWorkDir(projectDir, assignment) {
       try {
         execSync5(`git checkout -b ${branch}`, { cwd: workDir, stdio: "ignore" });
       } catch {
-        logger4.warn("Could not checkout branch", { taskId: shortId, branch });
+        logger5.warn("Could not checkout branch", { taskId: shortId, branch });
       }
     }
   }
@@ -4102,13 +4106,13 @@ function spawnChildAgent(assignment, workDir) {
   child.stdout?.on("data", (data) => {
     const lines = data.toString().trimEnd().split("\n");
     for (const line of lines) {
-      logger4.info(line, { taskId: shortId });
+      logger5.info(line, { taskId: shortId });
     }
   });
   child.stderr?.on("data", (data) => {
     const lines = data.toString().trimEnd().split("\n");
     for (const line of lines) {
-      logger4.error(line, { taskId: shortId });
+      logger5.error(line, { taskId: shortId });
     }
   });
   return child;
@@ -4138,9 +4142,9 @@ var ProjectRunner = class {
     try {
       execSync5(`git fetch origin ${workspaceBranch}`, { cwd: this.projectDir, stdio: "pipe" });
       execSync5(`git checkout ${workspaceBranch}`, { cwd: this.projectDir, stdio: "pipe" });
-      logger4.info("Checked out workspace branch", { workspaceBranch });
+      logger5.info("Checked out workspace branch", { workspaceBranch });
     } catch (err) {
-      logger4.warn("Failed to checkout workspace branch, continuing on current branch", {
+      logger5.warn("Failed to checkout workspace branch, continuing on current branch", {
         workspaceBranch,
         ...errorMeta(err)
       });
@@ -4149,15 +4153,15 @@ var ProjectRunner = class {
   async executeSetupCommand() {
     const cmd = process.env.CONVEYOR_SETUP_COMMAND;
     if (!cmd) return;
-    logger4.info("Running setup command", { command: cmd });
+    logger5.info("Running setup command", { command: cmd });
     try {
       await runSetupCommand(cmd, this.projectDir, (stream, data) => {
         this.connection.emitEvent({ type: "setup_output", stream, data });
         (stream === "stderr" ? process.stderr : process.stdout).write(data);
       });
-      logger4.info("Setup command completed");
+      logger5.info("Setup command completed");
     } catch (error) {
-      logger4.error("Setup command failed", errorMeta(error));
+      logger5.error("Setup command failed", errorMeta(error));
       this.connection.emitEvent({
         type: "setup_error",
         message: error instanceof Error ? error.message : "Setup command failed"
@@ -4168,7 +4172,7 @@ var ProjectRunner = class {
   executeStartCommand() {
     const cmd = process.env.CONVEYOR_START_COMMAND;
     if (!cmd) return;
-    logger4.info("Running start command", { command: cmd });
+    logger5.info("Running start command", { command: cmd });
     const child = runStartCommand(cmd, this.projectDir, (stream, data) => {
       this.connection.emitEvent({ type: "start_command_output", stream, data });
       (stream === "stderr" ? process.stderr : process.stdout).write(data);
@@ -4178,7 +4182,7 @@ var ProjectRunner = class {
     child.on("exit", (code, signal) => {
       this.startCommandRunning = false;
       this.startCommandChild = null;
-      logger4.info("Start command exited", { code, signal });
+      logger5.info("Start command exited", { code, signal });
       this.connection.emitEvent({
         type: "start_command_exited",
         code,
@@ -4189,13 +4193,13 @@ var ProjectRunner = class {
     child.on("error", (err) => {
       this.startCommandRunning = false;
       this.startCommandChild = null;
-      logger4.error("Start command error", errorMeta(err));
+      logger5.error("Start command error", errorMeta(err));
     });
   }
   async killStartCommand() {
     const child = this.startCommandChild;
     if (!child || !this.startCommandRunning) return;
-    logger4.info("Killing start command");
+    logger5.info("Killing start command");
     try {
       if (child.pid) process.kill(-child.pid, "SIGTERM");
     } catch {
@@ -4253,7 +4257,7 @@ var ProjectRunner = class {
         startCommandRunning: this.startCommandRunning
       });
     } catch (error) {
-      logger4.error("Environment setup failed", errorMeta(error));
+      logger5.error("Environment setup failed", errorMeta(error));
       this.setupComplete = false;
     }
     this.connection.onTaskAssignment((assignment) => {
@@ -4263,17 +4267,17 @@ var ProjectRunner = class {
       this.handleStopTask(data.taskId);
     });
     this.connection.onShutdown(() => {
-      logger4.info("Received shutdown signal from server");
+      logger5.info("Received shutdown signal from server");
       void this.stop();
     });
     this.connection.onChatMessage((msg) => {
-      logger4.debug("Received project chat message");
+      logger5.debug("Received project chat message");
       void handleProjectChatMessage(msg, this.connection, this.projectDir);
     });
     this.heartbeatTimer = setInterval(() => {
       this.connection.sendHeartbeat();
     }, HEARTBEAT_INTERVAL_MS2);
-    logger4.info("Connected, waiting for task assignments");
+    logger5.info("Connected, waiting for task assignments");
     await new Promise((resolve2) => {
       this.resolveLifecycle = resolve2;
       process.on("SIGTERM", () => void this.stop());
@@ -4284,11 +4288,11 @@ var ProjectRunner = class {
     const { taskId, mode } = assignment;
     const shortId = taskId.slice(0, 8);
     if (this.activeAgents.has(taskId)) {
-      logger4.info("Task already running, skipping", { taskId: shortId });
+      logger5.info("Task already running, skipping", { taskId: shortId });
       return;
     }
     if (this.activeAgents.size >= MAX_CONCURRENT) {
-      logger4.warn("Max concurrent agents reached, rejecting task", {
+      logger5.warn("Max concurrent agents reached, rejecting task", {
         maxConcurrent: MAX_CONCURRENT,
         taskId: shortId
       });
@@ -4299,7 +4303,7 @@ var ProjectRunner = class {
       try {
         execSync5("git fetch origin", { cwd: this.projectDir, stdio: "ignore" });
       } catch {
-        logger4.warn("Git fetch failed", { taskId: shortId });
+        logger5.warn("Git fetch failed", { taskId: shortId });
       }
       const { workDir, usesWorktree } = setupWorkDir(this.projectDir, assignment);
       const child = spawnChildAgent(assignment, workDir);
@@ -4310,12 +4314,12 @@ var ProjectRunner = class {
         usesWorktree
       });
       this.connection.emitTaskStarted(taskId);
-      logger4.info("Started task", { taskId: shortId, mode, workDir });
+      logger5.info("Started task", { taskId: shortId, mode, workDir });
       child.on("exit", (code) => {
         this.activeAgents.delete(taskId);
         const reason = code === 0 ? "completed" : `exited with code ${code}`;
         this.connection.emitTaskStopped(taskId, reason);
-        logger4.info("Task exited", { taskId: shortId, reason });
+        logger5.info("Task exited", { taskId: shortId, reason });
         if (code === 0 && usesWorktree) {
           try {
             removeWorktree(this.projectDir, taskId);
@@ -4324,7 +4328,7 @@ var ProjectRunner = class {
         }
       });
     } catch (error) {
-      logger4.error("Failed to start task", {
+      logger5.error("Failed to start task", {
         taskId: shortId,
         ...errorMeta(error)
       });
@@ -4338,7 +4342,7 @@ var ProjectRunner = class {
     const agent = this.activeAgents.get(taskId);
     if (!agent) return;
     const shortId = taskId.slice(0, 8);
-    logger4.info("Stopping task", { taskId: shortId });
+    logger5.info("Stopping task", { taskId: shortId });
     agent.process.kill("SIGTERM");
     const timer = setTimeout(() => {
       if (this.activeAgents.has(taskId)) {
@@ -4358,7 +4362,7 @@ var ProjectRunner = class {
   async stop() {
     if (this.stopping) return;
     this.stopping = true;
-    logger4.info("Shutting down");
+    logger5.info("Shutting down");
     await this.killStartCommand();
     if (this.heartbeatTimer) {
       clearInterval(this.heartbeatTimer);
@@ -4384,7 +4388,7 @@ var ProjectRunner = class {
       })
     ]);
     this.connection.disconnect();
-    logger4.info("Shutdown complete");
+    logger5.info("Shutdown complete");
     if (this.resolveLifecycle) {
       this.resolveLifecycle();
       this.resolveLifecycle = null;
@@ -4461,13 +4465,13 @@ export {
   runStartCommand,
   ConveyorConnection,
   ProjectConnection,
+  createServiceLogger,
+  errorMeta,
   ensureWorktree,
   removeWorktree,
   loadConveyorConfig,
-  createServiceLogger,
-  errorMeta,
   AgentRunner,
   ProjectRunner,
   FileCache
 };
-//# sourceMappingURL=chunk-JFIWJVOH.js.map
+//# sourceMappingURL=chunk-HYWZJYPW.js.map