@rallycry/conveyor-agent 11.0.14 → 11.0.15

package/dist/{chunk-LZWCJHVN.js → chunk-UP5CGWRY.js}

@@ -6464,6 +6464,15 @@ async function seedOpenCodeOauth(env) {
   }
 }
 
+// src/harness/openai-model.ts
+var DEFAULT_OPENAI_CODING_MODEL = "gpt-5.6-terra";
+function resolveOpenAiCodingModel(model) {
+  if (!model || model.startsWith("claude-") || model.includes("/") && !model.startsWith("openai/")) {
+    return DEFAULT_OPENAI_CODING_MODEL;
+  }
+  return model.replace(/^openai\//, "");
+}
+
 // src/harness/opencode/credentials.ts
 var PROVIDER_KEY_ENV = {
   openai: "OPENAI_API_KEY",
@@ -6496,6 +6505,10 @@ function buildOpenCodeChildEnv(source, configContent) {
 }
 function resolveOpenCodeModel(source, optionsModel) {
   const model = source.CONVEYOR_AGENT_MODEL ?? optionsModel;
+  const configuredProvider = source.CONVEYOR_AGENT_PROVIDER;
+  if (configuredProvider === "openai" || !configuredProvider && !model) {
+    return `openai/${resolveOpenAiCodingModel(model)}`;
+  }
   if (!model) return void 0;
   if (model.startsWith("zen/")) return `opencode/${model.slice("zen/".length)}`;
   if (model.includes("/")) return model;
@@ -6990,9 +7003,8 @@ var CodexTuiAdapter = class {
     if (input.pluginPath) args.push("--profile", basename(dirname3(input.pluginPath)));
     for (const [key, value] of Object.entries(config))
       args.push("-c", `${key}=${tomlValue(value)}`);
-    const model = this.env.CONVEYOR_AGENT_MODEL ?? input.options.model;
-    if (model && !/^(anthropic\/|claude-)/.test(model))
-      args.push("--model", model.replace(/^openai\//, ""));
+    const model = resolveOpenAiCodingModel(this.env.CONVEYOR_AGENT_MODEL ?? input.options.model);
+    args.push("--model", model);
     if (input.resume) args.push("resume", input.resume);
     if (input.initialPrompt) args.push("--", input.initialPrompt);
     return { file: this.resolveBinary(), args, env, cleanupPaths };
@@ -7484,6 +7496,9 @@ function formatBaseSync(packBranch, devBranch) {
 function resolveMergedWorkBranch(context) {
   return context.featureBranch && context.githubBranch ? context.githubBranch : context.baseBranch;
 }
+function resolveSinglePodPackBranch(context) {
+  return context.githubBranch || context.baseBranch;
+}
 function buildPackRunnerSystemPrompt(context, config, setupLog) {
   const mergedWorkBranch = resolveMergedWorkBranch(context);
   const parts = [
@@ -7558,7 +7573,7 @@ function buildPackRunnerSystemPrompt(context, config, setupLog) {
   return parts.join("\n");
 }
 function buildSinglePodPackPrompt(context, config, setupLog) {
-  const packBranch = resolveMergedWorkBranch(context);
+  const packBranch = resolveSinglePodPackBranch(context);
   const parts = [
     `You are an autonomous Pack Runner for the "${context.title}" pack, and you implement the work yourself.`,
     ``,
@@ -7572,7 +7587,7 @@ function buildSinglePodPackPrompt(context, config, setupLog) {
     `- Children get NO branches and NO pull requests here. \`create_pull_request\` always opens the PR for the card you are bound to, so calling it mid-pack opens the PARENT's PR early and strands the remaining children. One PR, at the very end, for this parent.`,
     `- You move each child's status yourself: \`update_task(task_id: <child>, status: ...)\`. No per-child build fires, so a status you do not write is a board that silently lies. A child is "ReviewDev" once its commits are on \`${packBranch}\`.`,
     `- \`start_child_cloud_build\` and \`stop_child_build\` belong to the fan-out model and are not available to you \u2014 you are the implementer.`,
-    `- Merge \`origin/dev\` into \`${packBranch}\` after each child, never rebase: the branch is shared with WIP refs and rewriting it breaks them.`,
+    `- Merge \`origin/${context.baseBranch}\` into \`${packBranch}\` after each child, never rebase: the branch is shared with WIP refs and rewriting it breaks them.`,
     `- Nothing will wake you to start the next child. Go idle only when genuinely blocked on something external.`,
     ``
   ];

package/dist/cli.js

@@ -27,7 +27,7 @@ import {
   resolveTuiKindFromEnv,
   runUsageProbe,
   sampleKeyUsage
-} from "./chunk-LZWCJHVN.js";
+} from "./chunk-UP5CGWRY.js";
 import "./chunk-SR66HQKB.js";
 import {
   inheritedEnv,

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   SessionRunner,
   unshallowRepo
-} from "./chunk-LZWCJHVN.js";
+} from "./chunk-UP5CGWRY.js";
 import "./chunk-SR66HQKB.js";
 import "./chunk-JG3VMWRQ.js";
 import {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rallycry/conveyor-agent",
-  "version": "11.0.14",
+  "version": "11.0.15",
   "description": "Conveyor Agent Runner v10 - PTY harness for the task chat (SDK harness for audit/project-chat). Agent-as-User architecture with BaseService patterns. Works locally too.",
   "keywords": [
     "agent",

package/runtime/entrypoint.sh

@@ -1,10 +1,8 @@
 #!/bin/sh
 # vnext shim — ALL boot logic lives in `conveyor-agent boot`
 # (packages/conveyor-agent/src/boot/). Keep this file dumb: env floor, exec.
-# The npm self-update preflight is no longer a separate blocking process here —
-# `conveyor-agent boot` runs it concurrently with the boot pipeline and gates
-# only the runner spawn / workbench daemon on the result (self-update.ts), so
-# each container saves a full node+npm process launch on the boot critical path.
+# The runtime self-update is deliberately gone: `conveyor-agent boot` runs the
+# image-baked agent. New versions arrive through the image-refresh path.
 set -eu
 export HOME=/home/conveyor
 export PATH="/home/conveyor/.bun/bin:${PATH}"