@the-open-engine/zeroshot 6.9.1 → 6.10.1

package/task-lib/attachable-watcher.js

@@ -5,15 +5,11 @@
  * Runs detached from parent, provides Unix socket for attach clients.
  */
 
-import { appendFileSync, unlinkSync } from 'fs';
-import { unlink } from 'fs/promises';
-import { updateTask } from './store.js';
-import {
-  detectProviderFatalError,
-  detectProviderStreamingModeError,
-  recoverProviderStructuredOutput,
-  supportsProviderStructuredOutputRecovery,
-} from './provider-helper-runtime.js';
+import { appendFileSync } from 'fs';
+import { getTask, updateTask } from './store.js';
+import { createCommandSpecCleanup } from './command-spec-cleanup.js';
+import { createProviderSessionCapture } from './provider-session-capture.js';
+import * as watcherOutputRuntime from './watcher-output-runtime.js';
 import { createRequire } from 'module';
 
 // ═══════════════════════════════════════════════════════════════════════════
@@ -22,8 +18,9 @@ import { createRequire } from 'module';
 // ═══════════════════════════════════════════════════════════════════════════
 
 const [, , taskIdArg, cwdArg, logFileArg, argsJsonArg, configJsonArg] = process.argv;
-let commandSpecCleanup = [];
-let cleanupStarted = false;
+let commandCleanup = watcherOutputRuntime.COMMAND_CLEANUP_UNINITIALIZED;
+let crashStarted = false;
+let server = null;
 
 function emergencyLog(msg) {
   if (logFileArg) {
@@ -37,37 +34,47 @@ function emergencyLog(msg) {
   }
 }
 
-function crashWithError(error, source) {
-  const timestamp = Date.now();
-  const errorMsg = error instanceof Error ? error.stack || error.message : String(error);
-
-  emergencyLog(`\n[${timestamp}][CRASH] ${source}: ${errorMsg}\n`);
-  emergencyLog(`[${timestamp}][CRASH] Process terminating due to unhandled error\n`);
-  cleanupCommandSpecSync();
+function stopAttachableProvider(exitObserved = false) {
+  return watcherOutputRuntime.terminateWatcherProvider(server, { exitObserved });
+}
 
+async function failWatcher(error, source) {
+  if (crashStarted) return;
+  crashStarted = true;
   if (taskIdArg) {
-    try {
-      updateTask(taskIdArg, {
-        status: 'failed',
-        error: `${source}: ${errorMsg}`,
-        socketPath: null,
-      });
-    } catch (updateError) {
-      emergencyLog(`[${timestamp}][CRASH] Failed to update task status: ${updateError.message}\n`);
-    }
+    await watcherOutputRuntime.completeWatcherFailure({
+      taskId: taskIdArg,
+      error,
+      source,
+      commandCleanup,
+      terminateProvider: stopAttachableProvider,
+      updateTask,
+      emergencyLog,
+      terminalUpdates: { socketPath: null },
+    });
   }
 
   process.exit(1);
 }
 
 process.on('uncaughtException', (error) => {
-  crashWithError(error, 'uncaughtException');
+  void failWatcher(error, 'uncaughtException');
 });
 
 process.on('unhandledRejection', (reason) => {
-  crashWithError(reason, 'unhandledRejection');
+  void failWatcher(reason, 'unhandledRejection');
 });
 
+const persistedTask = taskIdArg ? getTask(taskIdArg) : null;
+if (persistedTask) {
+  commandCleanup = createCommandSpecCleanup(
+    persistedTask.commandCleanup || { cleanup: [], cleanupMetadata: [] },
+    (cleanupPath, error) => {
+      emergencyLog(`[${Date.now()}][CLEANUP] Failed to delete ${cleanupPath}: ${error.message}\n`);
+    }
+  );
+}
+
 const require = createRequire(import.meta.url);
 const { AttachServer } = require('../src/attach');
 const { getTaskSocketPath } = require('../src/attach/socket-paths');
@@ -84,188 +91,57 @@ const commandSpec = config.commandSpec || {
   env: config.env || {},
   cleanup: [],
 };
-commandSpecCleanup = commandSpec.cleanup || [];
-let server = null;
-
 const socketPath = getTaskSocketPath(taskId);
 
 function log(msg) {
   appendFileSync(logFile, msg);
 }
 
-const providerName = normalizeProviderName(config.provider || 'claude');
-const enableRecovery = supportsProviderStructuredOutputRecovery(providerName);
-
-const env = { ...process.env, ...(commandSpec.env || {}) };
-const command = commandSpec.binary;
-const finalArgs = [...(commandSpec.args || args)];
-
-const silentJsonMode =
-  config.outputFormat === 'json' &&
-  config.jsonSchema &&
-  config.silentJsonOutput &&
-  supportsProviderStructuredOutputRecovery(providerName);
-
-let finalResultJson = null;
+const { providerName, env, command, finalArgs } = watcherOutputRuntime.resolveWatcherCommand(
+  config,
+  commandSpec,
+  args,
+  normalizeProviderName
+);
+const providerSessionCapture = createProviderSessionCapture({
+  providerName,
+  taskId,
+  updateTask,
+  log,
+  requestedSessionId: persistedTask?.requestedResumeSessionId || null,
+  initialSessionId: persistedTask?.sessionId || null,
+  initialSessionIdConflict: persistedTask?.sessionIdConflict === true,
+});
 let outputBuffer = '';
-let streamingModeError = null;
-let fatalError = null;
-
-function splitBufferLines(buffer, chunk) {
-  const nextBuffer = buffer + chunk;
-  const lines = nextBuffer.split('\n');
-  const remaining = lines.pop() || '';
-  return { lines, remaining };
-}
-
-function maybeHandleFatalError(line, timestamp) {
-  if (fatalError) {
-    return false;
-  }
-
-  const detected = detectProviderFatalError(providerName, line);
-  if (!detected) {
-    return false;
-  }
-
-  fatalError = detected;
-
-  if (silentJsonMode) {
-    log(`[${timestamp}]${line}\n`);
-  }
-  log(`[${timestamp}][FATAL] ${detected}\n`);
 
+function stopProviderAfterFatalOutput(timestamp) {
   if (server) {
     server.stop('SIGTERM').catch((error) => {
       log(`[${timestamp}][FATAL] Attach server stop failed: ${error.message}\n`);
     });
   }
-  return true;
-}
-
-function captureStreamingError(line, timestamp) {
-  const detectedError = detectProviderStreamingModeError(providerName, line);
-  if (!detectedError) {
-    return false;
-  }
-
-  streamingModeError = { ...detectedError, timestamp };
-  return true;
-}
-
-function maybeCaptureStructuredOutput(line) {
-  try {
-    const json = JSON.parse(line);
-    if (json.structured_output) {
-      finalResultJson = line;
-    }
-  } catch {
-    // Not JSON, skip
-  }
 }
 
-function handleSilentJsonLines(lines, timestamp) {
-  for (const line of lines) {
-    if (!line.trim()) continue;
-    maybeHandleFatalError(line, timestamp);
-    if (captureStreamingError(line, timestamp)) {
-      continue;
-    }
-    maybeCaptureStructuredOutput(line);
-  }
-}
-
-function handleStreamingLines(lines, timestamp) {
-  for (const line of lines) {
-    maybeHandleFatalError(line, timestamp);
-    if (captureStreamingError(line, timestamp)) {
-      continue;
-    }
-    log(`[${timestamp}]${line}\n`);
-  }
-}
-
-function flushOutputBuffer(timestamp) {
-  if (!outputBuffer.trim()) {
-    return;
-  }
-
-  if (!enableRecovery) {
-    if (!silentJsonMode) {
-      log(`[${timestamp}]${outputBuffer}\n`);
-    }
-    return;
-  }
-
-  maybeHandleFatalError(outputBuffer, timestamp);
-  if (captureStreamingError(outputBuffer, timestamp)) {
-    return;
-  }
-
-  if (silentJsonMode) {
-    maybeCaptureStructuredOutput(outputBuffer);
-    return;
-  }
-
-  log(`[${timestamp}]${outputBuffer}\n`);
-}
-
-function attemptRecovery(code, timestamp) {
-  if (!(code !== 0 && streamingModeError?.sessionId)) {
-    return null;
-  }
-
-  const recovered = recoverProviderStructuredOutput(providerName, streamingModeError.sessionId);
-  if (recovered?.payload) {
-    const recoveredLine = JSON.stringify(recovered.payload);
-    if (silentJsonMode) {
-      finalResultJson = recoveredLine;
-    } else {
-      log(`[${timestamp}]${recoveredLine}\n`);
-    }
-  } else if (streamingModeError.line) {
-    if (silentJsonMode) {
-      log(streamingModeError.line + '\n');
-    } else {
-      log(`[${streamingModeError.timestamp}]${streamingModeError.line}\n`);
-    }
-  }
-
-  return recovered;
-}
-
-async function cleanupCommandSpec() {
-  if (cleanupStarted) return;
-  cleanupStarted = true;
-  for (const file of commandSpecCleanup) {
-    try {
-      await unlink(file);
-    } catch (error) {
-      log(`[${Date.now()}][CLEANUP] Failed to delete ${file}: ${error.message}\n`);
-    }
-  }
-}
-
-function cleanupCommandSpecSync() {
-  if (cleanupStarted) return;
-  cleanupStarted = true;
-  for (const file of commandSpecCleanup) {
-    try {
-      unlinkSync(file);
-    } catch (error) {
-      emergencyLog(`[${Date.now()}][CLEANUP] Failed to delete ${file}: ${error.message}\n`);
-    }
-  }
-}
-
-function writeCompletionFooter(code, signal) {
-  if (config.outputFormat === 'json') {
-    return;
-  }
+const outputRuntime = watcherOutputRuntime.createWatcherOutputRuntime({
+  config,
+  providerName,
+  log,
+  stopProvider: stopProviderAfterFatalOutput,
+  providerSessionCapture,
+});
 
-  log(`\n${'='.repeat(50)}\n`);
-  log(`Finished: ${new Date().toISOString()}\n`);
-  log(`Exit code: ${code}, Signal: ${signal}\n`);
+if (
+  await watcherOutputRuntime.completePendingWatcherCancellation({
+    taskId,
+    getTask,
+    commandCleanup,
+    terminateProvider: () => true,
+    updateTask,
+    emergencyLog,
+    terminalUpdates: { socketPath: null },
+  })
+) {
+  process.exit(0);
 }
 
 server = new AttachServer({
@@ -280,48 +156,21 @@ server = new AttachServer({
 });
 
 server.on('output', (data) => {
-  const chunk = data.toString();
-  const timestamp = Date.now();
-
-  const { lines, remaining } = splitBufferLines(outputBuffer, chunk);
-  outputBuffer = remaining;
-
-  if (silentJsonMode) {
-    handleSilentJsonLines(lines, timestamp);
-  } else {
-    handleStreamingLines(lines, timestamp);
-  }
+  outputBuffer = outputRuntime.consumeOutput(outputBuffer, data);
 });
 
 server.on('exit', async ({ exitCode, signal }) => {
-  const timestamp = Date.now();
-  const code = exitCode;
-
-  flushOutputBuffer(timestamp);
-
-  const recovered = attemptRecovery(code, timestamp);
-
-  if (silentJsonMode && finalResultJson) {
-    log(finalResultJson + '\n');
-  }
-
-  writeCompletionFooter(code, signal);
-  await cleanupCommandSpec();
-
-  const resolvedCode = fatalError ? 1 : recovered?.payload ? 0 : code;
-  const status = resolvedCode === 0 ? 'completed' : 'failed';
-  try {
-    await updateTask(taskId, {
-      status,
-      pid: null,
-      processGroupId: null,
-      exitCode: resolvedCode,
-      error: fatalError || (resolvedCode !== 0 && signal ? `Killed by ${signal}` : null),
-      socketPath: null,
-    });
-  } catch (updateError) {
-    log(`[${Date.now()}][ERROR] Failed to update task status: ${updateError.message}\n`);
-  }
+  if (crashStarted) return;
+  const completion = outputRuntime.complete({ code: exitCode, signal, outputBuffer });
+  await watcherOutputRuntime.completeWatcherTask({
+    taskId,
+    completion,
+    commandCleanup,
+    terminateProvider: () => stopAttachableProvider(true),
+    updateTask,
+    emergencyLog,
+    terminalUpdates: { socketPath: null },
+  });
 
   setTimeout(() => {
     process.exit(0);
@@ -329,19 +178,7 @@ server.on('exit', async ({ exitCode, signal }) => {
 });
 
 server.on('error', async (err) => {
-  log(`\nError: ${err.message}\n`);
-  await cleanupCommandSpec();
-  try {
-    await updateTask(taskId, {
-      status: 'failed',
-      pid: null,
-      processGroupId: null,
-      error: err.message,
-    });
-  } catch (updateError) {
-    log(`[${Date.now()}][ERROR] Failed to update task status: ${updateError.message}\n`);
-  }
-  process.exit(1);
+  await failWatcher(err, 'attach server error');
 });
 
 server.on('clientAttach', ({ clientId }) => {
@@ -363,22 +200,33 @@ try {
     terminationStrategy: process.platform === 'win32' ? 'process-tree' : 'process-group',
   });
 
+  if (getTask(taskId)?.cancelRequested) {
+    crashStarted = true;
+    await watcherOutputRuntime.completePendingWatcherCancellation({
+      taskId,
+      getTask,
+      commandCleanup,
+      terminateProvider: stopAttachableProvider,
+      updateTask,
+      emergencyLog,
+      terminalUpdates: { socketPath: null },
+    });
+    process.exit(0);
+  }
+
   log(`[${Date.now()}][SYSTEM] Started with PTY (attachable)\n`);
   log(`[${Date.now()}][SYSTEM] Socket: ${socketPath}\n`);
   log(`[${Date.now()}][SYSTEM] PID: ${server.pid}\n`);
 } catch (err) {
-  log(`\nFailed to start: ${err.message}\n`);
-  await cleanupCommandSpec();
-  updateTask(taskId, { status: 'failed', error: err.message });
-  process.exit(1);
+  await failWatcher(err, 'attach server start');
 }
 
 process.on('SIGTERM', async () => {
   log(`[${Date.now()}][SYSTEM] Received SIGTERM, stopping...\n`);
-  await server.stop('SIGTERM');
+  await stopAttachableProvider();
 });
 
 process.on('SIGINT', async () => {
   log(`[${Date.now()}][SYSTEM] Received SIGINT, stopping...\n`);
-  await server.stop('SIGINT');
+  await stopAttachableProvider();
 });

package/task-lib/command-spec-cleanup.js

@@ -0,0 +1,219 @@
+import { lstat, realpath, rm, unlink } from 'fs/promises';
+import { lstatSync, realpathSync, rmSync, unlinkSync } from 'fs';
+import { tmpdir } from 'os';
+import { basename, dirname, isAbsolute, resolve } from 'path';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+const {
+  isCanonicalClaudeSettingsOverlayDirectory,
+  isClaudeSettingsOverlayDirectory,
+} = require('../src/worktree-claude-config');
+
+const CLEANUP_METADATA_KEYS = ['kind', 'path', 'provider', 'reason'];
+const SCHEMA_DIRECTORY_PATTERN = /^zeroshot-schema-[A-Za-z0-9_-]+$/u;
+const SCHEMA_FILE_PATTERN =
+  /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\.json$/u;
+
+function assertClosedCleanupMetadata(cleanupPath, metadata) {
+  if (!metadata || typeof metadata !== 'object' || Array.isArray(metadata)) {
+    throw new Error(`Refusing cleanup without closed ownership metadata: ${cleanupPath}`);
+  }
+  const keys = Object.keys(metadata).sort();
+  if (
+    keys.length !== CLEANUP_METADATA_KEYS.length ||
+    keys.some((key, index) => key !== CLEANUP_METADATA_KEYS[index])
+  ) {
+    throw new Error(`Refusing cleanup with open ownership metadata: ${cleanupPath}`);
+  }
+  if (metadata.path !== cleanupPath) {
+    throw new Error(`Refusing cleanup with mismatched ownership path: ${cleanupPath}`);
+  }
+}
+
+function createCleanupPlan(commandSpec) {
+  if (!Array.isArray(commandSpec?.cleanup) || !Array.isArray(commandSpec?.cleanupMetadata)) {
+    throw new Error('Refusing cleanup with malformed cleanup collections');
+  }
+  if (commandSpec.cleanup.length !== commandSpec.cleanupMetadata.length) {
+    throw new Error('Refusing cleanup without one closed metadata receipt per path');
+  }
+  const uniquePaths = new Set(commandSpec.cleanup);
+  if (uniquePaths.size !== commandSpec.cleanup.length) {
+    throw new Error('Refusing cleanup with duplicate cleanup paths');
+  }
+
+  return commandSpec.cleanup.map((cleanupPath) => {
+    if (typeof cleanupPath !== 'string' || cleanupPath.length === 0) {
+      throw new Error('Refusing cleanup with a non-string or empty path');
+    }
+    const matches = commandSpec.cleanupMetadata.filter(
+      (metadata) => metadata?.path === cleanupPath
+    );
+    if (matches.length !== 1) {
+      throw new Error(`Refusing cleanup without exact ownership metadata: ${cleanupPath}`);
+    }
+    assertClosedCleanupMetadata(cleanupPath, matches[0]);
+    return { cleanupPath, metadata: matches[0] };
+  });
+}
+
+function assertOwnedTempDirectory(cleanupPath, metadata) {
+  if (
+    metadata.provider !== 'claude' ||
+    metadata.reason !== 'settings-overlay' ||
+    !isCanonicalClaudeSettingsOverlayDirectory(cleanupPath)
+  ) {
+    throw new Error(`Refusing unowned temporary directory cleanup: ${cleanupPath}`);
+  }
+  if (isClaudeSettingsOverlayDirectory(cleanupPath)) {
+    return false;
+  }
+  try {
+    lstatSync(cleanupPath);
+  } catch (error) {
+    if (error?.code === 'ENOENT') return true;
+    throw error;
+  }
+  throw new Error(`Refusing unowned temporary directory cleanup: ${cleanupPath}`);
+}
+
+function assertCanonicalSchemaPath(cleanupPath, metadata) {
+  if (
+    metadata.kind !== 'temp-file' ||
+    metadata.provider !== 'codex' ||
+    metadata.reason !== 'output-schema' ||
+    !isAbsolute(cleanupPath) ||
+    resolve(cleanupPath) !== cleanupPath
+  ) {
+    throw new Error(`Refusing unowned output-schema cleanup: ${cleanupPath}`);
+  }
+  const schemaDirectory = dirname(cleanupPath);
+  if (
+    dirname(schemaDirectory) !== resolve(tmpdir()) ||
+    !SCHEMA_DIRECTORY_PATTERN.test(basename(schemaDirectory)) ||
+    !SCHEMA_FILE_PATTERN.test(basename(cleanupPath))
+  ) {
+    throw new Error(`Refusing non-canonical output-schema cleanup: ${cleanupPath}`);
+  }
+}
+
+async function assertOwnedSchemaFile(cleanupPath, metadata) {
+  assertCanonicalSchemaPath(cleanupPath, metadata);
+  const schemaDirectory = dirname(cleanupPath);
+  const [tempRoot, realSchemaDirectory, directoryStat, schemaStat] = await Promise.all([
+    realpath(tmpdir()),
+    realpath(schemaDirectory),
+    lstat(schemaDirectory),
+    lstat(cleanupPath),
+  ]);
+  if (
+    directoryStat.isSymbolicLink() ||
+    !directoryStat.isDirectory() ||
+    dirname(realSchemaDirectory) !== tempRoot ||
+    basename(realSchemaDirectory) !== basename(schemaDirectory) ||
+    schemaStat.isSymbolicLink() ||
+    !schemaStat.isFile()
+  ) {
+    throw new Error(`Refusing non-regular or escaped output-schema cleanup: ${cleanupPath}`);
+  }
+}
+
+function assertOwnedSchemaFileSync(cleanupPath, metadata) {
+  assertCanonicalSchemaPath(cleanupPath, metadata);
+  const schemaDirectory = dirname(cleanupPath);
+  const tempRoot = realpathSync(tmpdir());
+  const realSchemaDirectory = realpathSync(schemaDirectory);
+  const directoryStat = lstatSync(schemaDirectory);
+  const schemaStat = lstatSync(cleanupPath);
+  if (
+    directoryStat.isSymbolicLink() ||
+    !directoryStat.isDirectory() ||
+    dirname(realSchemaDirectory) !== tempRoot ||
+    basename(realSchemaDirectory) !== basename(schemaDirectory) ||
+    schemaStat.isSymbolicLink() ||
+    !schemaStat.isFile()
+  ) {
+    throw new Error(`Refusing non-regular or escaped output-schema cleanup: ${cleanupPath}`);
+  }
+}
+
+async function removeCleanupPath(cleanupPath, metadata) {
+  if (metadata.kind === 'temp-directory') {
+    if (assertOwnedTempDirectory(cleanupPath, metadata)) return;
+    await rm(cleanupPath, { recursive: true, force: true });
+    return;
+  }
+  await assertOwnedSchemaFile(cleanupPath, metadata);
+  await unlink(cleanupPath);
+}
+
+function removeCleanupPathSync(cleanupPath, metadata) {
+  if (metadata.kind === 'temp-directory') {
+    if (assertOwnedTempDirectory(cleanupPath, metadata)) return;
+    rmSync(cleanupPath, { recursive: true, force: true });
+    return;
+  }
+  assertOwnedSchemaFileSync(cleanupPath, metadata);
+  unlinkSync(cleanupPath);
+}
+
+/**
+ * Build one idempotent cleanup owner for a provider command. Callers may run it
+ * only after the persisted provider termination boundary is terminal.
+ */
+export function createCommandSpecCleanup(commandSpec, logFailure) {
+  let started = false;
+  let result = true;
+
+  return {
+    async run() {
+      if (started) return result;
+      started = true;
+      let cleanupPlan;
+      try {
+        cleanupPlan = createCleanupPlan(commandSpec);
+      } catch (error) {
+        logFailure('<command-cleanup>', error);
+        result = false;
+        return result;
+      }
+      let succeeded = true;
+      for (const { cleanupPath, metadata } of cleanupPlan) {
+        try {
+          await removeCleanupPath(cleanupPath, metadata);
+        } catch (error) {
+          if (error?.code === 'ENOENT') continue;
+          succeeded = false;
+          logFailure(cleanupPath, error);
+        }
+      }
+      result = succeeded;
+      return result;
+    },
+    runSync() {
+      if (started) return result;
+      started = true;
+      let cleanupPlan;
+      try {
+        cleanupPlan = createCleanupPlan(commandSpec);
+      } catch (error) {
+        logFailure('<command-cleanup>', error);
+        result = false;
+        return result;
+      }
+      let succeeded = true;
+      for (const { cleanupPath, metadata } of cleanupPlan) {
+        try {
+          removeCleanupPathSync(cleanupPath, metadata);
+        } catch (error) {
+          if (error?.code === 'ENOENT') continue;
+          succeeded = false;
+          logFailure(cleanupPath, error);
+        }
+      }
+      result = succeeded;
+      return result;
+    },
+  };
+}