@covibes/zeroshot 5.3.0 → 5.4.0

package/task-lib/config.js

@@ -2,9 +2,7 @@ import { homedir } from 'os';
 import { join } from 'path';
 
 export const TASKS_DIR = join(homedir(), '.claude-zeroshot');
-export const TASKS_FILE = join(TASKS_DIR, 'tasks.json');
 export const LOGS_DIR = join(TASKS_DIR, 'logs');
-export const SCHEDULES_FILE = join(TASKS_DIR, 'schedules.json');
 export const SCHEDULER_PID_FILE = join(TASKS_DIR, 'scheduler.pid');
 export const SCHEDULER_LOG = join(TASKS_DIR, 'scheduler.log');
 export const DEFAULT_MODEL = 'sonnet';

package/task-lib/runner.js

@@ -20,45 +20,98 @@ export async function spawnTask(prompt, options = {}) {
   const cwd = options.cwd || process.cwd();
 
   const settings = loadSettings();
+  const { providerName, provider, providerSettings, levelOverrides } = resolveProviderContext(
+    options,
+    settings
+  );
+
+  const outputFormat = resolveOutputFormat(options);
+  const jsonSchema = resolveJsonSchema(options, outputFormat);
+  const modelSpec = resolveModelSpec(options, provider, providerSettings, levelOverrides);
+
+  const cliFeatures = await provider.getCliFeatures();
+  const commandSpec = provider.buildCommand(prompt, {
+    modelSpec,
+    outputFormat,
+    jsonSchema,
+    cwd,
+    autoApprove: true,
+    cliFeatures,
+  });
+
+  const finalArgs = resolveFinalArgs(commandSpec, providerName, options);
+  const task = buildTaskRecord({
+    id,
+    prompt,
+    cwd,
+    options,
+    logFile,
+    providerName,
+    modelSpec,
+  });
+
+  addTask(task);
+
+  const watcherConfig = buildWatcherConfig(
+    outputFormat,
+    jsonSchema,
+    options,
+    providerName,
+    commandSpec
+  );
+  const watcherScript = resolveWatcherScript(options);
+  spawnWatcher({
+    watcherScript,
+    id,
+    cwd,
+    logFile,
+    finalArgs,
+    watcherConfig,
+  });
+
+  return task;
+}
+
+function resolveProviderContext(options, settings) {
   const providerName = normalizeProviderName(
     options.provider || settings.defaultProvider || 'claude'
   );
   const provider = getProvider(providerName);
   const providerSettings = settings.providerSettings?.[providerName] || {};
   const levelOverrides = providerSettings.levelOverrides || {};
+  return { providerName, provider, providerSettings, levelOverrides };
+}
 
-  const outputFormat = options.outputFormat || 'stream-json';
+function resolveOutputFormat(options) {
+  return options.outputFormat || 'stream-json';
+}
 
+function resolveJsonSchema(options, outputFormat) {
   let jsonSchema = options.jsonSchema || null;
   if (jsonSchema && outputFormat !== 'json') {
     console.warn('Warning: --json-schema requires --output-format json, ignoring schema');
     jsonSchema = null;
   }
+  return jsonSchema;
+}
 
-  let modelSpec;
+function resolveModelSpec(options, provider, providerSettings, levelOverrides) {
   if (options.model) {
-    modelSpec = {
+    return {
       model: options.model,
       reasoningEffort: options.reasoningEffort,
     };
-  } else {
-    const level = options.modelLevel || providerSettings.defaultLevel || provider.getDefaultLevel();
-    modelSpec = provider.resolveModelSpec(level, levelOverrides);
-    if (options.reasoningEffort) {
-      modelSpec = { ...modelSpec, reasoningEffort: options.reasoningEffort };
-    }
   }
 
-  const cliFeatures = await provider.getCliFeatures();
-  const commandSpec = provider.buildCommand(prompt, {
-    modelSpec,
-    outputFormat,
-    jsonSchema,
-    cwd,
-    autoApprove: true,
-    cliFeatures,
-  });
+  const level = options.modelLevel || providerSettings.defaultLevel || provider.getDefaultLevel();
+  let modelSpec = provider.resolveModelSpec(level, levelOverrides);
+  if (options.reasoningEffort) {
+    modelSpec = { ...modelSpec, reasoningEffort: options.reasoningEffort };
+  }
+  return modelSpec;
+}
 
+function resolveFinalArgs(commandSpec, providerName, options) {
   const finalArgs = [...commandSpec.args];
   if (providerName === 'claude') {
     const promptIndex = finalArgs.length - 1;
@@ -70,8 +123,11 @@ export async function spawnTask(prompt, options = {}) {
   } else if (options.resume || options.continue) {
     console.warn('Warning: resume/continue is only supported for Claude CLI; ignoring.');
   }
+  return finalArgs;
+}
 
-  const task = {
+function buildTaskRecord({ id, prompt, cwd, options, logFile, providerName, modelSpec }) {
+  return {
     id,
     prompt: prompt.slice(0, 200) + (prompt.length > 200 ? '...' : ''),
     fullPrompt: prompt,
@@ -92,10 +148,10 @@ export async function spawnTask(prompt, options = {}) {
     socketPath: null,
     attachable: false,
   };
+}
 
-  addTask(task);
-
-  const watcherConfig = {
+function buildWatcherConfig(outputFormat, jsonSchema, options, providerName, commandSpec) {
+  return {
     outputFormat,
     jsonSchema,
     silentJsonOutput: options.silentJsonOutput || false,
@@ -103,12 +159,14 @@ export async function spawnTask(prompt, options = {}) {
     command: commandSpec.binary,
     env: commandSpec.env || {},
   };
+}
 
+function resolveWatcherScript(options) {
   const useAttachable = options.attachable !== false && !options.jsonSchema;
-  const watcherScript = useAttachable
-    ? join(__dirname, 'attachable-watcher.js')
-    : join(__dirname, 'watcher.js');
+  return useAttachable ? join(__dirname, 'attachable-watcher.js') : join(__dirname, 'watcher.js');
+}
 
+function spawnWatcher({ watcherScript, id, cwd, logFile, finalArgs, watcherConfig }) {
   const watcher = fork(
     watcherScript,
     [id, cwd, logFile, JSON.stringify(finalArgs), JSON.stringify(watcherConfig)],
@@ -119,8 +177,7 @@ export async function spawnTask(prompt, options = {}) {
   );
 
   watcher.unref();
-
-  return task;
+  watcher.disconnect(); // Close IPC channel so parent can exit
 }
 
 export function isProcessRunning(pid) {

package/task-lib/scheduler.js

@@ -17,7 +17,7 @@ const CHECK_INTERVAL = 60000; // 60 seconds
  * Supports: 30s, 5m, 2h, 1d, 1w
  */
 export function parseInterval(str) {
-  const match = str.match(/^(\d+)(s|m|h|d|w)$/i);
+  const match = str.match(/^(\d+)([smhdw])$/i);
   if (!match) return null;
 
   const value = parseInt(match[1], 10);