@rallycry/conveyor-agent 10.2.2 → 10.2.5

package/dist/cli.js

@@ -1,27 +1,33 @@
 #!/usr/bin/env node
 import {
   AgentConnection,
+  ClaudeTuiAdapter,
   DEFAULT_LIFECYCLE_CONFIG,
   DEFAULT_SONNET_MODEL,
   Lifecycle,
   PtyHarness,
   SessionRunner,
+  TUI_KINDS,
   applyBootstrapToEnv,
   awaitGitReady,
+  buildPromptBytes,
   buildSessionPreviewPorts,
+  cleanTerminalOutput,
   createServiceLogger,
   fetchBootstrap,
+  inheritedEnv,
   loadConveyorConfig,
   loadForwardPorts,
   resolveSessionStart,
   runSetupCommand,
   runStartCommand,
   sampleKeyUsage
-} from "./chunk-53ZLFIAI.js";
+} from "./chunk-CFELRV35.js";
+import "./chunk-7TQO4ZF4.js";
 
 // src/cli.ts
 import { readFileSync } from "fs";
-import { join, dirname as dirname2 } from "path";
+import { join as join2, dirname as dirname2 } from "path";
 import { fileURLToPath } from "url";
 
 // src/setup/sidecars.ts
@@ -169,6 +175,29 @@ async function checkSessionTaskIdentity(params) {
   return "match";
 }
 
+// src/utils/agent-exit.ts
+function exitLogLevel(reason) {
+  return reason === "clean" ? "info" : "warn";
+}
+function buildAgentExitLog(args) {
+  const log = {
+    event: "agent_exit",
+    reason: args.reason,
+    exitCode: args.exitCode,
+    uptimeSec: Math.round(args.uptimeSec * 10) / 10
+  };
+  if (args.signal !== void 0) log.signal = args.signal;
+  if (args.finalState !== void 0) log.finalState = args.finalState;
+  const id = args.identity;
+  if (id) {
+    if (id.sessionId !== void 0) log.sessionId = id.sessionId;
+    if (id.taskId !== void 0) log.taskId = id.taskId;
+    if (id.workspaceId !== void 0) log.workspaceId = id.workspaceId;
+    if (id.runnerMode !== void 0) log.runnerMode = id.runnerMode;
+  }
+  return log;
+}
+
 // src/setup/project-identity.ts
 function resolveProjectRunnerIdentity(env) {
   if (env.CONVEYOR_TASK_ID) return null;
@@ -317,11 +346,118 @@ var ProjectSessionRunner = class {
   }
 };
 
+// src/harness/pty/adapters/types.ts
+import { accessSync, constants, statSync } from "fs";
+import { join } from "path";
+var TuiUnavailableError = class extends Error {
+  constructor(tui, message) {
+    super(message);
+    this.tui = tui;
+    this.name = "TuiUnavailableError";
+  }
+  tui;
+};
+function isExecutable(path) {
+  try {
+    if (!statSync(path).isFile()) return false;
+    accessSync(path, constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function findOnPath(binary, env = process.env) {
+  if (binary.includes("/")) {
+    return isExecutable(binary) ? binary : null;
+  }
+  for (const dir of (env.PATH ?? "").split(":")) {
+    if (!dir) continue;
+    const candidate = join(dir, binary);
+    if (isExecutable(candidate)) return candidate;
+  }
+  return null;
+}
+
+// src/harness/pty/adapters/opencode.ts
+var PROVIDER_KEY_ENV = {
+  openai: "OPENAI_API_KEY",
+  anthropic: "ANTHROPIC_API_KEY"
+};
+var OpenCodeTuiAdapter = class {
+  constructor(env = process.env) {
+    this.env = env;
+  }
+  env;
+  id = "opencode";
+  capabilities = {
+    resume: false,
+    structuredEvents: false,
+    prefill: false,
+    passiveTurns: false
+  };
+  resolveBinary(env = this.env) {
+    const override = env.CONVEYOR_OPENCODE_BIN;
+    const found = override ? findOnPath(override, env) : findOnPath("opencode", env);
+    if (!found) {
+      throw new TuiUnavailableError(
+        "opencode",
+        "The opencode CLI is not available in this environment. It must be baked into the pod image (see Dockerfile.base) \u2014 re-run Build Image for this project, or set CONVEYOR_OPENCODE_BIN to its absolute path."
+      );
+    }
+    return found;
+  }
+  buildSpawn(input) {
+    const env = { ...inheritedEnv() };
+    delete env.CONVEYOR_AGENT_KEY;
+    const key = this.env.CONVEYOR_AGENT_KEY;
+    const provider = this.env.CONVEYOR_AGENT_PROVIDER ?? "openai";
+    const keyEnvVar = PROVIDER_KEY_ENV[provider];
+    if (key && keyEnvVar) env[keyEnvVar] = key;
+    const model = this.env.CONVEYOR_AGENT_MODEL ?? input.options.model;
+    const args = [];
+    if (model) args.push("--model", model.includes("/") ? model : `${provider}/${model}`);
+    return { file: this.resolveBinary(), args, env };
+  }
+  async prepareEnvironment() {
+  }
+  spawnFingerprint(input) {
+    return JSON.stringify(["opencode", input.model, input.cwd]);
+  }
+  encodePromptBytes(text) {
+    return buildPromptBytes(text);
+  }
+  buildExitErrors(exitCode, rawOutput) {
+    const errors = [`opencode exited (code ${exitCode}) without a result`];
+    const tail = cleanTerminalOutput(rawOutput);
+    if (tail) errors.push(`Last terminal output before exit:
+${tail}`);
+    return errors;
+  }
+};
+
+// src/harness/pty/adapters/index.ts
+function resolveTuiAdapter(kind = "claude-code") {
+  switch (kind) {
+    case "claude-code":
+      return new ClaudeTuiAdapter();
+    case "opencode":
+      return new OpenCodeTuiAdapter();
+    default:
+      throw new Error(`Unknown TUI kind: ${kind}`);
+  }
+}
+
 // src/runner/adhoc-session-runner.ts
 var ADHOC_SYSTEM_NOTE = "You are running in an ad-hoc Conveyor scratch pod \u2014 an interactive terminal on the project's repository checked out at its default branch. There is no task or plan; help the human with whatever they ask directly.";
+function resolveAdhocTui(env) {
+  const raw = env.CONVEYOR_TUI ?? "claude-code";
+  if (TUI_KINDS.includes(raw)) return raw;
+  throw new Error(`Unknown TUI "${raw}" in CONVEYOR_TUI (expected: ${TUI_KINDS.join(", ")})`);
+}
 function buildAdhocPtyBridge(connection) {
   return {
     sendOutput: (data, dims) => connection.sendPtyOutput(data, dims),
+    sendChatEvent: (event) => connection.sendPtyChatEvent(event),
     onInput: (handler) => connection.onPtyInput(handler),
     onResize: (handler) => connection.onPtyResize(handler)
   };
@@ -359,7 +495,10 @@ var AdhocSessionRunner = class {
     this.config = config;
     this.callbacks = callbacks;
     this.connection = deps?.connection ?? new AgentConnection(config.connection);
-    this.harness = deps?.harness ?? new PtyHarness(buildAdhocPtyBridge(this.connection));
+    this.harness = deps?.harness ?? new PtyHarness(
+      buildAdhocPtyBridge(this.connection),
+      resolveTuiAdapter(resolveAdhocTui(process.env))
+    );
     this.lifecycle = new Lifecycle(
       // No git flush: the WIP snapshot machinery is branch/task-shaped; the human
       // commits/pushes explicitly from the interactive shell.
@@ -419,7 +558,7 @@ var AdhocSessionRunner = class {
    * loop blocks (keeping the pod alive) until the human exits or stop() aborts.
    */
   async runInteractiveTui() {
-    const model = this.config.model ?? process.env.CONVEYOR_ADHOC_MODEL ?? DEFAULT_SONNET_MODEL;
+    const model = this.config.model ?? process.env.CONVEYOR_AGENT_MODEL ?? process.env.CONVEYOR_ADHOC_MODEL ?? DEFAULT_SONNET_MODEL;
     const session = resolveSessionStart(this.config.workspaceId, this.config.workspaceDir);
     const options = buildAdhocQueryOptions(
       this.config.workspaceDir,
@@ -428,8 +567,11 @@ var AdhocSessionRunner = class {
       session
     );
     try {
-      for await (const _event of this.harness.executeQuery({ prompt: "", options })) {
+      for await (const event of this.harness.executeQuery({ prompt: "", options })) {
         if (this.stopped) break;
+        if (event.type === "result" && event.subtype === "error") {
+          throw new Error(event.errors.join("\n"));
+        }
       }
     } catch (error) {
       if (!this.stopped) throw error;
@@ -628,12 +770,27 @@ var ReviewChildSupervisor = class {
 // src/cli.ts
 if (process.argv.includes("--version")) {
   const __dirname = dirname2(fileURLToPath(import.meta.url));
-  const pkgPath = join(__dirname, "..", "package.json");
+  const pkgPath = join2(__dirname, "..", "package.json");
   const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
   process.stdout.write(pkg.version + "\n");
   process.exit(0);
 }
 var logger2 = createServiceLogger("CLI");
+var exitContext = {};
+var exitLogged = false;
+function logAgentExit(reason, opts) {
+  if (exitLogged) return;
+  exitLogged = true;
+  const payload = buildAgentExitLog({
+    reason,
+    exitCode: opts.exitCode,
+    signal: opts.signal,
+    finalState: opts.finalState,
+    uptimeSec: process.uptime(),
+    identity: exitContext
+  });
+  logger2[exitLogLevel(reason)]("agent_exit", payload);
+}
 async function bootstrapFromCodespace(apiUrl, instanceName) {
   const bootstrapToken = process.env.CONVEYOR_BOOTSTRAP_TOKEN;
   const apiUrlFromEnv = Boolean(process.env.CONVEYOR_API_URL);
@@ -680,6 +837,7 @@ process.on("uncaughtException", (err) => {
     return;
   }
   logger2.error("Uncaught exception", { error: err.message, code: err.code });
+  logAgentExit("uncaught_exception", { exitCode: 1 });
   process.exit(1);
 });
 process.on("unhandledRejection", (reason) => {
@@ -689,6 +847,7 @@ process.on("unhandledRejection", (reason) => {
     return;
   }
   logger2.error("Unhandled rejection", { error: err.message });
+  logAgentExit("unhandled_rejection", { exitCode: 1 });
   process.exit(1);
 });
 var DEFAULT_CONVEYOR_API_URL = "https://api.conveyor.rallycryapp.com";
@@ -708,6 +867,10 @@ var CONVEYOR_WORKSPACE = process.env.CONVEYOR_WORKSPACE ?? process.cwd();
 var CONVEYOR_MODE = process.env.CONVEYOR_MODE ?? "task";
 var CONVEYOR_AGENT_MODE = process.env.CONVEYOR_AGENT_MODE || void 0;
 var CONVEYOR_IS_AUTO = CONVEYOR_AGENT_MODE ? CONVEYOR_AGENT_MODE === "auto" : process.env.CONVEYOR_IS_AUTO === "true";
+exitContext.taskId = CONVEYOR_TASK_ID;
+exitContext.workspaceId = process.env.CONVEYOR_WORKSPACE_ID;
+exitContext.runnerMode = CONVEYOR_MODE;
+exitContext.sessionId = process.env.CONVEYOR_SESSION_ID ?? CONVEYOR_TASK_ID;
 var projectIdentity = resolveProjectRunnerIdentity(process.env);
 if (!CONVEYOR_TASK_ID && projectIdentity && CONVEYOR_MODE === "adhoc") {
   logger2.info("Starting ad-hoc agent", { projectId: projectIdentity.projectId });
@@ -730,10 +893,18 @@ if (!CONVEYOR_TASK_ID && projectIdentity && CONVEYOR_MODE === "adhoc") {
       }
     }
   );
+  exitContext.sessionId = projectIdentity.sessionId;
+  exitContext.workspaceId = projectIdentity.workspaceId;
+  exitContext.runnerMode = "adhoc";
   process.on("SIGTERM", () => adhocRunner.stop());
   process.on("SIGINT", () => adhocRunner.stop());
   await adhocRunner.run();
-  process.exit(adhocRunner.finalState === "error" ? 1 : 0);
+  const adhocError = adhocRunner.finalState === "error";
+  logAgentExit(adhocError ? "error" : "clean", {
+    exitCode: adhocError ? 1 : 0,
+    finalState: adhocRunner.finalState ?? void 0
+  });
+  process.exit(adhocError ? 1 : 0);
 }
 if (!CONVEYOR_TASK_ID && projectIdentity) {
   logger2.info("Starting project agent", { projectId: projectIdentity.projectId });
@@ -755,10 +926,18 @@ if (!CONVEYOR_TASK_ID && projectIdentity) {
       }
     }
   );
+  exitContext.sessionId = projectIdentity.sessionId;
+  exitContext.workspaceId = projectIdentity.workspaceId;
+  exitContext.runnerMode = "pm";
   process.on("SIGTERM", () => projectRunner.stop());
   process.on("SIGINT", () => projectRunner.stop());
   await projectRunner.run();
-  process.exit(projectRunner.finalState === "error" ? 1 : 0);
+  const projectError = projectRunner.finalState === "error";
+  logAgentExit(projectError ? "error" : "clean", {
+    exitCode: projectError ? 1 : 0,
+    finalState: projectRunner.finalState ?? void 0
+  });
+  process.exit(projectError ? 1 : 0);
 }
 if (!CONVEYOR_TASK_TOKEN || !CONVEYOR_TASK_ID) {
   logger2.error("Missing required environment variables");
@@ -813,8 +992,10 @@ var runner = new SessionRunner(
   }
 );
 var reviewChildren = new ReviewChildSupervisor(runner.connection, CONVEYOR_WORKSPACE);
+var shutdownSignal;
 var shutdownAgent = (signal) => {
   logger2.info(`Received ${signal}, flushing git and stopping agent`);
+  shutdownSignal = signal;
   void (async () => {
     try {
       await reviewChildren.stopAll();
@@ -828,6 +1009,17 @@ var shutdownAgent = (signal) => {
   })();
   setTimeout(() => {
     logger2.warn(`Forcing exit after ${signal} timeout`);
+    logger2.warn(
+      "agent_exit",
+      buildAgentExitLog({
+        reason: "force_timeout",
+        exitCode: 1,
+        signal,
+        finalState: runner.finalState ?? void 0,
+        uptimeSec: process.uptime(),
+        identity: exitContext
+      })
+    );
     process.exit(1);
   }, 45e3).unref();
 };
@@ -964,16 +1156,23 @@ if (conveyorConfig) {
     runner.connection.sendEvent({
       type: "setup_complete",
       startCommandRunning,
-      previewPort: conveyorConfig.previewPort,
       ...previewPorts.length > 0 ? { previewPorts } : {}
     });
   })();
 }
 runner.run().then(() => {
-  process.exit(runner.finalState === "error" ? 1 : 0);
+  const errored = runner.finalState === "error";
+  const reason = shutdownSignal ? "signal" : errored ? "error" : "clean";
+  logAgentExit(reason, {
+    exitCode: errored ? 1 : 0,
+    signal: shutdownSignal,
+    finalState: runner.finalState ?? void 0
+  });
+  process.exit(errored ? 1 : 0);
 }).catch((error) => {
   const msg = error instanceof Error ? error.message : String(error);
   logger2.error("Agent runner failed", { error: msg });
+  logAgentExit("error", { exitCode: 1, finalState: runner.finalState ?? void 0 });
   process.exit(1);
 });
 //# sourceMappingURL=cli.js.map