@the-open-engine/zeroshot 6.37.0 → 6.38.0

package/src/orchestrator.js

@@ -111,6 +111,35 @@ function applyModelOverride(agentConfig, modelOverride) {
  */
 const VALID_OPERATIONS = ['add_agents', 'remove_agents', 'update_agent', 'publish', 'load_config'];
 
+function isValidPreparedWorktreeDescriptor(prepared, cwd) {
+  if (!prepared) return false;
+  if (typeof prepared !== 'object') return false;
+  if (path.resolve(String(prepared.path)) !== cwd) return false;
+  if (path.resolve(String(prepared.repoRoot)) !== cwd) return false;
+  if (typeof prepared.branch !== 'string') return false;
+  if (prepared.branch.length === 0) return false;
+  if (prepared.branch.length > 255) return false;
+  return /^[0-9a-f]{40}$/.test(String(prepared.baseSha));
+}
+
+function resolvePreparedWorktree(options) {
+  const prepared = options.preparedWorktree;
+  if (!prepared) return null;
+  const cwd = path.resolve(options.cwd || process.cwd());
+  if (options.worktree !== true || options.isolation) {
+    throw new Error('Invalid prepared worktree authority');
+  }
+  if (!isValidPreparedWorktreeDescriptor(prepared, cwd)) {
+    throw new Error('Invalid prepared worktree authority');
+  }
+  return Object.freeze({
+    path: cwd,
+    repoRoot: cwd,
+    branch: prepared.branch,
+    baseSha: prepared.baseSha,
+  });
+}
+
 /**
  * Workflow-triggering topics that indicate cluster state progression
  * These are the topics that MATTER for resume - not AGENT_OUTPUT noise
@@ -1854,7 +1883,10 @@ class Orchestrator {
     let worktreeInfo = null;
     let isolationImage = null;
 
-    if (options.isolation) {
+    if (options.preparedWorktree) {
+      worktreeInfo = resolvePreparedWorktree(options);
+      this._log(`[Orchestrator] Using prepared worktree: ${worktreeInfo.path}`);
+    } else if (options.isolation) {
       // Resolve the provider first so the capability gate and the cluster's image variant (which
       // installs the provider CLI as a Docker-cached layer) both see the same provider. Providers
       // baked into the base image (e.g. Claude) resolve back to the base image unchanged.

package/task-lib/watcher-output-runtime.js

@@ -103,7 +103,12 @@ function createCodexOutputPassthrough({ log, captureProviderSession }) {
   };
 }
 
-function createBoundedLinePassthrough({ log, handleLine, deferRawUntilOverflow = false }) {
+function createBoundedLinePassthrough({
+  log,
+  handleLine,
+  deferRawUntilOverflow = false,
+  linePrefix = '',
+}) {
   const decoder = new StringDecoder('utf8');
   let atLineStart = true;
   let lineTimestamp = null;
@@ -160,7 +165,7 @@ function createBoundedLinePassthrough({ log, handleLine, deferRawUntilOverflow =
     while (offset < text.length) {
       if (atLineStart) {
         lineTimestamp = Date.now();
-        appendRaw(logged, `[${lineTimestamp}]`);
+        appendRaw(logged, `[${lineTimestamp}]${linePrefix}`);
         atLineStart = false;
       }
       const newline = text.indexOf('\n', offset);
@@ -361,6 +366,10 @@ export function createWatcherOutputRuntime({
       });
   const stderrPassthrough = createBoundedLinePassthrough({
     log,
+    // Pi reserves stdout for its JSON protocol and deliberately routes ordinary writes to
+    // stderr. Keep those diagnostics in the task log with explicit provenance so followers can
+    // exclude them from strict JSON validation.
+    linePrefix: providerName === 'pi' ? '[ZEROSHOT][PROVIDER_STDERR] ' : '',
     handleLine: (line, timestamp) => maybeHandleFatalError(line, timestamp),
   });
 
@@ -370,7 +379,7 @@ export function createWatcherOutputRuntime({
     if (!detected) return false;
     fatalError = detected;
     if (silentJsonMode) log(`[${timestamp}]${line}\n`);
-    log(`[${timestamp}][FATAL] ${detected}\n`);
+    log(`[${timestamp}][ZEROSHOT][FATAL] ${detected}\n`);
     stopProvider(timestamp);
     return true;
   }
@@ -396,13 +405,15 @@ export function createWatcherOutputRuntime({
       fatalError =
         `Provider structured output exceeded the ${MAX_WATCHER_CONTROL_RECORD_BYTES}-byte ` +
         'watcher inspection limit; complete output remains in the task log';
-      log(`[${timestamp}][FATAL] ${fatalError}\n`);
+      log(`[${timestamp}][ZEROSHOT][FATAL] ${fatalError}\n`);
       stopProvider(timestamp);
       return;
     }
     captureProviderSession(line);
     if (silentJsonMode && !line.trim()) return;
-    maybeHandleFatalError(line, timestamp);
+    // Pi reserves stdout for JSON lifecycle events. Error text inside an assistant message may be
+    // followed by an automatic retry, so only Pi stderr can prove a pre-agent startup failure.
+    if (providerName !== 'pi') maybeHandleFatalError(line, timestamp);
     if (captureStreamingError(line, timestamp)) return;
     if (silentJsonMode) {
       maybeCaptureStructuredOutput(line);