@rallycry/conveyor-agent 5.9.1 → 5.9.3

package/dist/{chunk-X2QE27GN.js → chunk-MTIMRYLD.js}

@@ -1,3 +1,62 @@
+// src/setup/commands.ts
+import { spawn, execSync } from "child_process";
+function runSetupCommand(cmd, cwd, onOutput) {
+  return new Promise((resolve2, reject) => {
+    const child = spawn("sh", ["-c", cmd], {
+      cwd,
+      stdio: ["ignore", "pipe", "pipe"],
+      env: { ...process.env }
+    });
+    child.stdout.on("data", (chunk) => {
+      onOutput("stdout", chunk.toString());
+    });
+    child.stderr.on("data", (chunk) => {
+      onOutput("stderr", chunk.toString());
+    });
+    child.on("close", (code) => {
+      if (code === 0) {
+        resolve2();
+      } else {
+        reject(new Error(`Setup command exited with code ${code}`));
+      }
+    });
+    child.on("error", (err) => {
+      reject(err);
+    });
+  });
+}
+var AUTH_TOKEN_TIMEOUT_MS = 3e4;
+function runAuthTokenCommand(cmd, userEmail, cwd) {
+  try {
+    const output = execSync(`${cmd} ${JSON.stringify(userEmail)}`, {
+      cwd,
+      timeout: AUTH_TOKEN_TIMEOUT_MS,
+      stdio: ["ignore", "pipe", "ignore"],
+      env: { ...process.env }
+    });
+    const token = output.toString().trim();
+    return token || null;
+  } catch {
+    return null;
+  }
+}
+function runStartCommand(cmd, cwd, onOutput) {
+  const child = spawn("sh", ["-c", cmd], {
+    cwd,
+    stdio: ["ignore", "pipe", "pipe"],
+    detached: true,
+    env: { ...process.env }
+  });
+  child.stdout.on("data", (chunk) => {
+    onOutput("stdout", chunk.toString());
+  });
+  child.stderr.on("data", (chunk) => {
+    onOutput("stderr", chunk.toString());
+  });
+  child.unref();
+  return child;
+}
+
 // src/connection/task-connection.ts
 import { io } from "socket.io-client";
 
@@ -161,6 +220,10 @@ var ConveyorConnection = class _ConveyorConnection {
       this.socket.on("agentRunner:runStartCommand", () => {
         if (this.runStartCommandCallback) this.runStartCommandCallback();
       });
+      this.socket.on(
+        "agentRunner:runAuthTokenCommand",
+        (data, cb) => this.handleRunAuthTokenCommand(data.userEmail, cb)
+      );
       this.socket.on("connect", () => {
         if (!settled) {
           settled = true;
@@ -260,6 +323,33 @@ var ConveyorConnection = class _ConveyorConnection {
   onRunStartCommand(callback) {
     this.runStartCommandCallback = callback;
   }
+  handleRunAuthTokenCommand(userEmail, cb) {
+    try {
+      if (process.env.CODESPACES !== "true") {
+        cb({ ok: false, error: "Auth token command only available in codespace environments" });
+        return;
+      }
+      const authCmd = process.env.CONVEYOR_AUTH_TOKEN_COMMAND;
+      if (!authCmd) {
+        cb({ ok: false, error: "CONVEYOR_AUTH_TOKEN_COMMAND not configured" });
+        return;
+      }
+      const token = runAuthTokenCommand(authCmd, userEmail, this.config.workspaceDir);
+      if (!token) {
+        cb({
+          ok: false,
+          error: `Auth token command returned empty output. Command: ${authCmd}, Working Dir: ${this.config.workspaceDir}`
+        });
+        return;
+      }
+      cb({ ok: true, token });
+    } catch (error) {
+      cb({
+        ok: false,
+        error: error instanceof Error ? error.message : "Auth token command failed"
+      });
+    }
+  }
   emitModeChanged(agentMode) {
     if (!this.socket) return;
     this.socket.emit("agentRunner:modeChanged", { agentMode });
@@ -272,10 +362,6 @@ var ConveyorConnection = class _ConveyorConnection {
     if (!this.socket) return;
     this.socket.emit("agentRunner:statusUpdate", { status });
   }
-  emitAuthToken(token) {
-    if (!this.socket) return;
-    this.socket.emit("agentRunner:authToken", { token });
-  }
   emitRateLimitPause(resetsAt) {
     if (!this.socket) return;
     this.socket.emit("agentRunner:rateLimitPause", { resetsAt });
@@ -509,7 +595,7 @@ var ProjectConnection = class {
 };
 
 // src/runner/worktree.ts
-import { execSync } from "child_process";
+import { execSync as execSync2 } from "child_process";
 import { existsSync } from "fs";
 import { join } from "path";
 var WORKTREE_DIR = ".worktrees";
@@ -521,7 +607,7 @@ function ensureWorktree(projectDir, taskId, branch) {
   if (existsSync(worktreePath)) {
     if (branch) {
       try {
-        execSync(`git checkout --detach origin/${branch}`, {
+        execSync2(`git checkout --detach origin/${branch}`, {
           cwd: worktreePath,
           stdio: "ignore"
         });
@@ -531,7 +617,7 @@ function ensureWorktree(projectDir, taskId, branch) {
     return worktreePath;
   }
   const ref = branch ? `origin/${branch}` : "HEAD";
-  execSync(`git worktree add --detach "${worktreePath}" ${ref}`, {
+  execSync2(`git worktree add --detach "${worktreePath}" ${ref}`, {
     cwd: projectDir,
     stdio: "ignore"
   });
@@ -541,7 +627,7 @@ function removeWorktree(projectDir, taskId) {
   const worktreePath = join(projectDir, WORKTREE_DIR, taskId);
   if (!existsSync(worktreePath)) return;
   try {
-    execSync(`git worktree remove "${worktreePath}" --force`, {
+    execSync2(`git worktree remove "${worktreePath}" --force`, {
       cwd: projectDir,
       stdio: "ignore"
     });
@@ -552,7 +638,6 @@ function removeWorktree(projectDir, taskId) {
 // src/setup/config.ts
 import { readFile } from "fs/promises";
 import { join as join2 } from "path";
-var CONVEYOR_CONFIG_PATH = ".conveyor/config.json";
 var DEVCONTAINER_PATH = ".devcontainer/conveyor/devcontainer.json";
 async function loadForwardPorts(workspaceDir) {
   try {
@@ -563,87 +648,20 @@ async function loadForwardPorts(workspaceDir) {
     return [];
   }
 }
-async function loadConveyorConfig(workspaceDir) {
+function loadConveyorConfig(_workspaceDir) {
   const envSetup = process.env.CONVEYOR_SETUP_COMMAND;
   const envStart = process.env.CONVEYOR_START_COMMAND;
   const envPort = process.env.CONVEYOR_PREVIEW_PORT;
-  const envAuth = process.env.CONVEYOR_AUTH_TOKEN_COMMAND;
   if (envSetup || envStart) {
     return {
       setupCommand: envSetup,
       startCommand: envStart,
-      previewPort: envPort ? Number(envPort) : void 0,
-      authTokenCommand: envAuth
+      previewPort: envPort ? Number(envPort) : void 0
     };
   }
-  try {
-    const raw = await readFile(join2(workspaceDir, CONVEYOR_CONFIG_PATH), "utf-8");
-    const parsed = JSON.parse(raw);
-    if (parsed.setupCommand || parsed.startCommand) return parsed;
-  } catch {
-  }
   return null;
 }
 
-// src/setup/commands.ts
-import { spawn, execSync as execSync2 } from "child_process";
-function runSetupCommand(cmd, cwd, onOutput) {
-  return new Promise((resolve2, reject) => {
-    const child = spawn("sh", ["-c", cmd], {
-      cwd,
-      stdio: ["ignore", "pipe", "pipe"],
-      env: { ...process.env }
-    });
-    child.stdout.on("data", (chunk) => {
-      onOutput("stdout", chunk.toString());
-    });
-    child.stderr.on("data", (chunk) => {
-      onOutput("stderr", chunk.toString());
-    });
-    child.on("close", (code) => {
-      if (code === 0) {
-        resolve2();
-      } else {
-        reject(new Error(`Setup command exited with code ${code}`));
-      }
-    });
-    child.on("error", (err) => {
-      reject(err);
-    });
-  });
-}
-var AUTH_TOKEN_TIMEOUT_MS = 3e4;
-function runAuthTokenCommand(cmd, userEmail, cwd) {
-  try {
-    const output = execSync2(`${cmd} ${JSON.stringify(userEmail)}`, {
-      cwd,
-      timeout: AUTH_TOKEN_TIMEOUT_MS,
-      stdio: ["ignore", "pipe", "ignore"],
-      env: { ...process.env }
-    });
-    const token = output.toString().trim();
-    return token || null;
-  } catch {
-    return null;
-  }
-}
-function runStartCommand(cmd, cwd, onOutput) {
-  const child = spawn("sh", ["-c", cmd], {
-    cwd,
-    stdio: ["ignore", "pipe", "pipe"],
-    detached: true,
-    env: { ...process.env }
-  });
-  child.stdout.on("data", (chunk) => {
-    onOutput("stdout", chunk.toString());
-  });
-  child.stderr.on("data", (chunk) => {
-    onOutput("stderr", chunk.toString());
-  });
-  child.unref();
-  return child;
-}
-
 // src/setup/codespace.ts
 import { execSync as execSync3 } from "child_process";
 function unshallowRepo(workspaceDir) {
@@ -3048,17 +3066,6 @@ The agent cannot start until this is resolved.`
     return { ok: false, conveyorConfig: null };
   }
 }
-function runAuthTokenSafe(config, connection, taskContext) {
-  const authCmd = process.env.CONVEYOR_AUTH_TOKEN_COMMAND;
-  if (!authCmd || !taskContext.userEmail) return;
-  try {
-    const token = runAuthTokenCommand(authCmd, taskContext.userEmail, config.workspaceDir);
-    if (token) {
-      connection.emitAuthToken(token);
-    }
-  } catch {
-  }
-}
 function rerunStartCommand(conveyorConfig, runnerConfig, connection, setupLog) {
   if (!conveyorConfig.startCommand) return;
   pushSetupLog(setupLog, `$ ${conveyorConfig.startCommand} &  (background, re-trigger)`);
@@ -3288,9 +3295,6 @@ var AgentRunner = class {
     }
     this.tryInitWorktree();
     if (!await this.fetchAndInitContext()) return;
-    if (process.env.CODESPACES === "true" && this.taskContext) {
-      runAuthTokenSafe(this.config, this.connection, this.taskContext);
-    }
     this.tryPostContextWorktree();
     this.checkoutWorktreeBranch();
     await this.executeInitialMode();
@@ -4102,17 +4106,17 @@ var FileCache = class {
 };
 
 export {
+  runSetupCommand,
+  runStartCommand,
   ConveyorConnection,
   ProjectConnection,
   ensureWorktree,
   removeWorktree,
   loadConveyorConfig,
-  runSetupCommand,
-  runStartCommand,
   createServiceLogger,
   errorMeta,
   AgentRunner,
   ProjectRunner,
   FileCache
 };
-//# sourceMappingURL=chunk-X2QE27GN.js.map
+//# sourceMappingURL=chunk-MTIMRYLD.js.map