Honor explicit sandbox code before chat generation (#629)

Author: chubes4

packages/cli/src/agent-code.ts

@@ -30,10 +30,6 @@ export interface AgentSandboxCodeOptions {
 }
 
 export async function resolveSandboxTaskCode(options: AgentSandboxCodeOptions): Promise<string> {
-  if (options.agent) {
-    return agentChatTaskCode(options)
-  }
-
   if (options.code) {
     return options.code
   }
@@ -42,6 +38,10 @@ export async function resolveSandboxTaskCode(options: AgentSandboxCodeOptions):
     return readFile(resolve(options.codeFile), "utf8")
   }
 
+  if (options.agent) {
+    return agentChatTaskCode(options)
+  }
+
   return `echo json_encode(array('task_received' => true), JSON_PRETTY_PRINT);`
 }
 

scripts/agent-sandbox-code-smoke.ts

@@ -3,6 +3,20 @@ import { recipeExecutionSpec } from "../packages/cli/src/agent-sandbox.ts"
 import { agentSandboxRunCode, resolveSandboxTaskCode } from "../packages/cli/src/agent-code.ts"
 
 async function main() {
+  const explicitInlineCode = await resolveSandboxTaskCode({
+    task: "Run explicit code",
+    agent: "sandbox-agent",
+    code: "echo 'explicit';",
+  })
+  assert.equal(explicitInlineCode, "echo 'explicit';", "explicit sandbox code should take precedence over generated agent chat code")
+
+  const explicitFileCode = await resolveSandboxTaskCode({
+    task: "Run explicit code file",
+    agent: "sandbox-agent",
+    codeFile: "scripts/agent-sandbox-code-smoke.ts",
+  })
+  assert.match(explicitFileCode, /resolveSandboxTaskCode/, "explicit sandbox code files should take precedence over generated agent chat code")
+
   const sandboxWorkspace = {
     schema: "wp-codebox/sandbox-workspace/v1" as const,
     root: "/workspace",