@the-open-engine/zeroshot 6.7.0 → 6.7.1

package/task-lib/runner.js

@@ -7,6 +7,12 @@ import { createRequire } from 'module';
 
 const require = createRequire(import.meta.url);
 const { prepareSingleAgentProviderCommand } = require('./provider-helper-runtime.js');
+export {
+  isOwnedProcessTreeRunning,
+  isProcessRunning,
+  killTask,
+  terminateProcess,
+} from './process-termination.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
@@ -136,6 +142,8 @@ function buildTaskRecord({ id, prompt, cwd, options, logFile, providerName, mode
     // Attach support
     socketPath: null,
     attachable: false,
+    processGroupId: null,
+    terminationStrategy: null,
   };
 }
 
@@ -176,23 +184,3 @@ function spawnWatcher({ watcherScript, id, cwd, logFile, finalArgs, watcherConfi
   watcher.unref();
   watcher.disconnect(); // Close IPC channel so parent can exit
 }
-
-export function isProcessRunning(pid) {
-  if (!pid) return false;
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-export function killTask(pid) {
-  if (!pid) return false;
-  try {
-    process.kill(pid, 'SIGTERM');
-    return true;
-  } catch {
-    return false;
-  }
-}

package/task-lib/store.js

@@ -50,7 +50,9 @@ function getDb() {
       model TEXT,
       schedule_id TEXT,
       socket_path TEXT,
-      attachable INTEGER DEFAULT 0
+      attachable INTEGER DEFAULT 0,
+      process_group_id INTEGER,
+      termination_strategy TEXT
     );
 
     CREATE INDEX IF NOT EXISTS idx_tasks_status ON tasks(status);
@@ -75,9 +77,19 @@ function getDb() {
     CREATE INDEX IF NOT EXISTS idx_schedules_enabled ON schedules(enabled);
   `);
 
+  ensureTaskColumn(db, 'process_group_id', 'INTEGER');
+  ensureTaskColumn(db, 'termination_strategy', 'TEXT');
+
   return db;
 }
 
+function ensureTaskColumn(database, name, definition) {
+  const columns = database.pragma('table_info(tasks)');
+  if (!columns.some((column) => column.name === name)) {
+    database.exec(`ALTER TABLE tasks ADD COLUMN ${name} ${definition}`);
+  }
+}
+
 export function ensureDirs() {
   if (!existsSync(TASKS_DIR)) mkdirSync(TASKS_DIR, { recursive: true });
   if (!existsSync(LOGS_DIR)) mkdirSync(LOGS_DIR, { recursive: true });
@@ -110,6 +122,8 @@ function rowToTask(row) {
     scheduleId: row.schedule_id,
     socketPath: row.socket_path,
     attachable: Boolean(row.attachable),
+    processGroupId: row.process_group_id,
+    terminationStrategy: row.termination_strategy,
   };
 }
 
@@ -137,11 +151,11 @@ export function saveTasks(tasks) {
     INSERT OR REPLACE INTO tasks (
       id, prompt, full_prompt, cwd, status, pid, session_id, log_file,
       created_at, updated_at, exit_code, error, provider, model,
-      schedule_id, socket_path, attachable
+      schedule_id, socket_path, attachable, process_group_id, termination_strategy
     ) VALUES (
       @id, @prompt, @fullPrompt, @cwd, @status, @pid, @sessionId, @logFile,
       @createdAt, @updatedAt, @exitCode, @error, @provider, @model,
-      @scheduleId, @socketPath, @attachable
+      @scheduleId, @socketPath, @attachable, @processGroupId, @terminationStrategy
     )
   `);
 
@@ -168,6 +182,8 @@ export function saveTasks(tasks) {
         scheduleId: task.scheduleId || null,
         socketPath: task.socketPath || null,
         attachable: task.attachable ? 1 : 0,
+        processGroupId: task.processGroupId || null,
+        terminationStrategy: task.terminationStrategy || null,
       });
     }
   });
@@ -232,7 +248,9 @@ export function updateTask(id, updates) {
       model = @model,
       schedule_id = @scheduleId,
       socket_path = @socketPath,
-      attachable = @attachable
+      attachable = @attachable,
+      process_group_id = @processGroupId,
+      termination_strategy = @terminationStrategy
     WHERE id = @id
   `
     )
@@ -253,6 +271,8 @@ export function updateTask(id, updates) {
       scheduleId: updated.scheduleId || null,
       socketPath: updated.socketPath || null,
       attachable: updated.attachable ? 1 : 0,
+      processGroupId: updated.processGroupId || null,
+      terminationStrategy: updated.terminationStrategy || null,
     });
 
   return updated;
@@ -277,11 +297,11 @@ export function addTask(task) {
     INSERT INTO tasks (
       id, prompt, full_prompt, cwd, status, pid, session_id, log_file,
       created_at, updated_at, exit_code, error, provider, model,
-      schedule_id, socket_path, attachable
+      schedule_id, socket_path, attachable, process_group_id, termination_strategy
     ) VALUES (
       @id, @prompt, @fullPrompt, @cwd, @status, @pid, @sessionId, @logFile,
       @createdAt, @updatedAt, @exitCode, @error, @provider, @model,
-      @scheduleId, @socketPath, @attachable
+      @scheduleId, @socketPath, @attachable, @processGroupId, @terminationStrategy
     )
   `
     )
@@ -303,6 +323,8 @@ export function addTask(task) {
       scheduleId: fullTask.scheduleId || null,
       socketPath: fullTask.socketPath || null,
       attachable: fullTask.attachable ? 1 : 0,
+      processGroupId: fullTask.processGroupId || null,
+      terminationStrategy: fullTask.terminationStrategy || null,
     });
 
   return fullTask;

package/task-lib/watcher.js

@@ -45,10 +45,15 @@ const child = spawn(command, finalArgs, {
   cwd: commandSpec.cwd || cwd,
   env,
   stdio: ['ignore', 'pipe', 'pipe'],
+  detached: process.platform !== 'win32',
   windowsHide: true,
 });
 
-updateTask(taskId, { pid: child.pid });
+updateTask(taskId, {
+  pid: child.pid,
+  processGroupId: process.platform === 'win32' ? null : child.pid,
+  terminationStrategy: process.platform === 'win32' ? 'process-tree' : 'process-group',
+});
 
 const silentJsonMode =
   config.outputFormat === 'json' &&
@@ -285,6 +290,8 @@ child.on('close', async (code, signal) => {
   try {
     await updateTask(taskId, {
       status,
+      pid: null,
+      processGroupId: null,
       exitCode: resolvedCode,
       error: fatalError || (resolvedCode !== 0 && signal ? `Killed by ${signal}` : null),
     });
@@ -298,7 +305,12 @@ child.on('error', async (err) => {
   log(`\nError: ${err.message}\n`);
   cleanupCommandSpecSync();
   try {
-    await updateTask(taskId, { status: 'failed', error: err.message });
+    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`);
   }