@covibes/zeroshot 5.3.0 → 5.4.0

package/task-lib/tui/formatters.js

@@ -100,6 +100,23 @@ function truncate(str, maxLen) {
  * @returns {object|null} Parsed event with type, text, toolName, error
  */
 function parseEvent(line) {
+  const { trimmed, timestamp } = extractTimestamp(line);
+
+  // Keep non-JSON lines as-is
+  if (!trimmed.startsWith('{')) {
+    return trimmed ? { type: 'raw', text: trimmed, timestamp } : null;
+  }
+
+  // Parse JSON events
+  const event = safeParseEvent(trimmed);
+  if (!event) {
+    return null;
+  }
+
+  return parseStreamEvent(event, timestamp);
+}
+
+function extractTimestamp(line) {
   let trimmed = line.trim();
 
   // Strip timestamp prefix if present: [1234567890]{...} -> {...}
@@ -110,57 +127,89 @@ function parseEvent(line) {
     trimmed = timestampMatch[2];
   }
 
-  // Keep non-JSON lines as-is
-  if (!trimmed.startsWith('{')) {
-    return trimmed ? { type: 'raw', text: trimmed, timestamp } : null;
-  }
+  return { trimmed, timestamp };
+}
 
-  // Parse JSON events
+function safeParseEvent(trimmed) {
   try {
-    const event = JSON.parse(trimmed);
-
-    // Text delta
-    if (event.type === 'stream_event' && event.event?.type === 'content_block_delta') {
-      return {
-        type: 'text',
-        text: event.event?.delta?.text || '',
-        timestamp,
-      };
-    }
-    // Tool use
-    else if (event.type === 'stream_event' && event.event?.type === 'content_block_start') {
-      const block = event.event?.content_block;
-      if (block?.type === 'tool_use' && block?.name) {
-        return {
-          type: 'tool',
-          toolName: block.name,
-          timestamp,
-        };
-      }
-    }
-    // Assistant message
-    else if (event.type === 'assistant' && event.message?.content) {
-      let text = '';
-      for (const content of event.message.content) {
-        if (content.type === 'text') {
-          text += content.text;
-        }
-      }
-      return text ? { type: 'text', text, timestamp } : null;
-    }
-    // Error
-    else if (event.type === 'result' && event.is_error) {
-      return {
-        type: 'error',
-        text: event.result || 'Unknown error',
-        timestamp,
-      };
-    }
+    return JSON.parse(trimmed);
   } catch {
-    // Parse error - skip
+    return null;
+  }
+}
+
+function parseStreamEvent(event, timestamp) {
+  if (event.type === 'stream_event') {
+    return parseStreamDelta(event, timestamp);
+  }
+
+  if (event.type === 'assistant') {
+    return parseAssistantMessage(event, timestamp);
+  }
+
+  if (event.type === 'result') {
+    return parseResultEvent(event, timestamp);
+  }
+
+  return null;
+}
+
+function parseStreamDelta(event, timestamp) {
+  const eventType = event.event?.type;
+
+  if (eventType === 'content_block_delta') {
+    return {
+      type: 'text',
+      text: event.event?.delta?.text || '',
+      timestamp,
+    };
+  }
+
+  if (eventType === 'content_block_start') {
+    return parseToolUseEvent(event.event?.content_block, timestamp);
+  }
+
+  return null;
+}
+
+function parseToolUseEvent(block, timestamp) {
+  if (block?.type === 'tool_use' && block?.name) {
+    return {
+      type: 'tool',
+      toolName: block.name,
+      timestamp,
+    };
   }
 
   return null;
 }
 
+function parseAssistantMessage(event, timestamp) {
+  const contentBlocks = event.message?.content;
+  if (!Array.isArray(contentBlocks)) {
+    return null;
+  }
+
+  let text = '';
+  for (const content of contentBlocks) {
+    if (content.type === 'text') {
+      text += content.text;
+    }
+  }
+
+  return text ? { type: 'text', text, timestamp } : null;
+}
+
+function parseResultEvent(event, timestamp) {
+  if (!event.is_error) {
+    return null;
+  }
+
+  return {
+    type: 'error',
+    text: event.result || 'Unknown error',
+    timestamp,
+  };
+}
+
 export { formatTimestamp, formatBytes, formatCPU, stateIcon, truncate, parseEvent };

package/task-lib/tui/renderer.js

@@ -23,6 +23,18 @@ class Renderer {
     this.screen = screen;
   }
 
+  /**
+   * Format task prompt for display (truncate if needed)
+   * @param {string|undefined} prompt - Task prompt
+   * @returns {string} Formatted prompt or empty string
+   * @private
+   */
+  _formatTaskPrompt(prompt) {
+    if (!prompt) return '';
+    const truncated = prompt.length > 80 ? prompt.substring(0, 80) + '...' : prompt;
+    return `{bold}Task:{/bold} {gray-fg}${truncated}{/}`;
+  }
+
   /**
    * Render task info box
    * @param {object} taskInfo - Task metadata
@@ -40,9 +52,7 @@ class Renderer {
       `${icon} {bold}Status:{/bold} {white-fg}${taskInfo.status || 'unknown'}{/}`,
       `{bold}Runtime:{/bold} {white-fg}${runtime}{/}`,
       `{bold}CPU:{/bold} {white-fg}${cpu}{/}  {bold}Memory:{/bold} {white-fg}${memory}{/}`,
-      taskInfo.prompt
-        ? `{bold}Task:{/bold} {gray-fg}${taskInfo.prompt.substring(0, 80)}${taskInfo.prompt.length > 80 ? '...' : ''}{/}`
-        : '',
+      this._formatTaskPrompt(taskInfo.prompt),
     ]
       .filter(Boolean)
       .join('  ');

package/task-lib/tui.js

@@ -31,38 +31,80 @@ function parseLogLine(line) {
   }
 
   // Parse JSON and extract relevant info
+  const event = safeParseEvent(trimmed);
+  if (!event) {
+    return '';
+  }
+
+  return extractEventText(event);
+}
+
+function safeParseEvent(trimmed) {
   try {
-    const event = JSON.parse(trimmed);
+    return JSON.parse(trimmed);
+  } catch {
+    return null;
+  }
+}
 
-    // Extract text from content_block_delta
-    if (event.type === 'stream_event' && event.event?.type === 'content_block_delta') {
-      return event.event?.delta?.text || '';
-    }
-    // Extract tool use info
-    else if (event.type === 'stream_event' && event.event?.type === 'content_block_start') {
-      const block = event.event?.content_block;
-      if (block?.type === 'tool_use' && block?.name) {
-        return `\n[Tool: ${block.name}]\n`;
-      }
-    }
-    // Extract assistant messages
-    else if (event.type === 'assistant' && event.message?.content) {
-      let output = '';
-      for (const content of event.message.content) {
-        if (content.type === 'text') {
-          output += content.text;
-        }
-      }
-      return output;
-    }
-    // Extract final result
-    else if (event.type === 'result') {
-      if (event.is_error) {
-        return `\n[ERROR] ${event.result || 'Unknown error'}\n`;
-      }
+function extractEventText(event) {
+  if (event.type === 'stream_event') {
+    return extractStreamEventText(event);
+  }
+
+  if (event.type === 'assistant') {
+    return extractAssistantText(event);
+  }
+
+  if (event.type === 'result') {
+    return extractResultText(event);
+  }
+
+  return '';
+}
+
+function extractStreamEventText(event) {
+  const eventType = event.event?.type;
+
+  if (eventType === 'content_block_delta') {
+    return event.event?.delta?.text || '';
+  }
+
+  if (eventType === 'content_block_start') {
+    return extractToolUseText(event.event?.content_block);
+  }
+
+  return '';
+}
+
+function extractToolUseText(block) {
+  if (block?.type === 'tool_use' && block?.name) {
+    return `\n[Tool: ${block.name}]\n`;
+  }
+
+  return '';
+}
+
+function extractAssistantText(event) {
+  const contentBlocks = event.message?.content;
+
+  if (!Array.isArray(contentBlocks)) {
+    return '';
+  }
+
+  let output = '';
+  for (const content of contentBlocks) {
+    if (content.type === 'text') {
+      output += content.text;
     }
-  } catch {
-    // Not JSON or parse error - skip
+  }
+
+  return output;
+}
+
+function extractResultText(event) {
+  if (event.is_error) {
+    return `\n[ERROR] ${event.result || 'Unknown error'}\n`;
   }
 
   return '';
@@ -260,8 +302,8 @@ class TaskTUI {
     const tasks = loadTasks();
     this.tasks = Object.values(tasks);
 
-    // Sort by creation date, newest first
-    this.tasks.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt));
+    // Sort by creation date, oldest first (chronological)
+    this.tasks.sort((a, b) => new Date(a.createdAt) - new Date(b.createdAt));
 
     // Verify running status
     for (const task of this.tasks) {
@@ -334,7 +376,6 @@ class TaskTUI {
         }
 
         // Strip ANSI codes for clean display
-        // eslint-disable-next-line no-control-regex
         content = content.replace(/\x1b\[[0-9;]*m/g, '');
       } catch (error) {
         content = `Error reading log: ${error.message}`;

package/task-lib/watcher.js

@@ -44,61 +44,143 @@ let finalResultJson = null;
 let streamingModeError = null;
 
 let stdoutBuffer = '';
+let stderrBuffer = '';
+
+function splitBufferLines(buffer, chunk) {
+  const nextBuffer = buffer + chunk;
+  const lines = nextBuffer.split('\n');
+  const remaining = lines.pop() || '';
+  return { lines, remaining };
+}
+
+function captureStreamingError(line, timestamp) {
+  if (!enableRecovery) {
+    return false;
+  }
+
+  const detectedError = detectStreamingModeError(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;
+    if (captureStreamingError(line, timestamp)) {
+      continue;
+    }
+    maybeCaptureStructuredOutput(line);
+  }
+}
+
+function handleStreamingLines(lines, timestamp) {
+  for (const line of lines) {
+    if (captureStreamingError(line, timestamp)) {
+      continue;
+    }
+    log(`[${timestamp}]${line}\n`);
+  }
+}
+
+function flushStdoutBuffer(timestamp) {
+  if (!stdoutBuffer.trim()) {
+    return;
+  }
+
+  if (!enableRecovery) {
+    if (!silentJsonMode) {
+      log(`[${timestamp}]${stdoutBuffer}\n`);
+    }
+    return;
+  }
+
+  if (captureStreamingError(stdoutBuffer, timestamp)) {
+    return;
+  }
+
+  if (silentJsonMode) {
+    maybeCaptureStructuredOutput(stdoutBuffer);
+    return;
+  }
+
+  log(`[${timestamp}]${stdoutBuffer}\n`);
+}
+
+function flushStderrBuffer(timestamp) {
+  if (stderrBuffer.trim()) {
+    log(`[${timestamp}]${stderrBuffer}\n`);
+  }
+}
+
+function attemptRecovery(code, timestamp) {
+  if (!(enableRecovery && code !== 0 && streamingModeError?.sessionId)) {
+    return null;
+  }
+
+  const recovered = recoverStructuredOutput(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;
+}
+
+function writeCompletionFooter(code, signal) {
+  if (config.outputFormat === 'json') {
+    return;
+  }
+
+  log(`\n${'='.repeat(50)}\n`);
+  log(`Finished: ${new Date().toISOString()}\n`);
+  log(`Exit code: ${code}, Signal: ${signal}\n`);
+}
 
 child.stdout.on('data', (data) => {
   const chunk = data.toString();
   const timestamp = Date.now();
 
+  const { lines, remaining } = splitBufferLines(stdoutBuffer, chunk);
+  stdoutBuffer = remaining;
+
   if (silentJsonMode) {
-    stdoutBuffer += chunk;
-    const lines = stdoutBuffer.split('\n');
-    stdoutBuffer = lines.pop() || '';
-
-    for (const line of lines) {
-      if (!line.trim()) continue;
-      if (enableRecovery) {
-        const detectedError = detectStreamingModeError(line);
-        if (detectedError) {
-          streamingModeError = { ...detectedError, timestamp };
-          continue;
-        }
-      }
-      try {
-        const json = JSON.parse(line);
-        if (json.structured_output) {
-          finalResultJson = line;
-        }
-      } catch {
-        // Not JSON, skip
-      }
-    }
+    handleSilentJsonLines(lines, timestamp);
   } else {
-    stdoutBuffer += chunk;
-    const lines = stdoutBuffer.split('\n');
-    stdoutBuffer = lines.pop() || '';
-
-    for (const line of lines) {
-      if (enableRecovery) {
-        const detectedError = detectStreamingModeError(line);
-        if (detectedError) {
-          streamingModeError = { ...detectedError, timestamp };
-          continue;
-        }
-      }
-      log(`[${timestamp}]${line}\n`);
-    }
+    handleStreamingLines(lines, timestamp);
   }
 });
 
-let stderrBuffer = '';
-
 child.stderr.on('data', (data) => {
   const chunk = data.toString();
   const timestamp = Date.now();
 
-  stderrBuffer += chunk;
-  const lines = stderrBuffer.split('\n');
-  stderrBuffer = lines.pop() || '';
+  const { lines, remaining } = splitBufferLines(stderrBuffer, chunk);
+  stderrBuffer = remaining;
 
   for (const line of lines) {
     log(`[${timestamp}]${line}\n`);
@@ -108,60 +190,16 @@ child.stderr.on('data', (data) => {
 child.on('close', async (code, signal) => {
   const timestamp = Date.now();
 
-  if (stdoutBuffer.trim()) {
-    if (enableRecovery) {
-      const detectedError = detectStreamingModeError(stdoutBuffer);
-      if (detectedError) {
-        streamingModeError = { ...detectedError, timestamp };
-      } else if (silentJsonMode) {
-        try {
-          const json = JSON.parse(stdoutBuffer);
-          if (json.structured_output) {
-            finalResultJson = stdoutBuffer;
-          }
-        } catch {
-          // Not valid JSON
-        }
-      } else {
-        log(`[${timestamp}]${stdoutBuffer}\n`);
-      }
-    } else if (!silentJsonMode) {
-      log(`[${timestamp}]${stdoutBuffer}\n`);
-    }
-  }
-
-  if (stderrBuffer.trim()) {
-    log(`[${timestamp}]${stderrBuffer}\n`);
-  }
+  flushStdoutBuffer(timestamp);
+  flushStderrBuffer(timestamp);
 
-  let recovered = null;
-  if (enableRecovery && code !== 0 && streamingModeError?.sessionId) {
-    recovered = recoverStructuredOutput(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`);
-      }
-    }
-  }
+  const recovered = attemptRecovery(code, timestamp);
 
   if (silentJsonMode && finalResultJson) {
     log(finalResultJson + '\n');
   }
 
-  if (config.outputFormat !== 'json') {
-    log(`\n${'='.repeat(50)}\n`);
-    log(`Finished: ${new Date().toISOString()}\n`);
-    log(`Exit code: ${code}, Signal: ${signal}\n`);
-  }
+  writeCompletionFooter(code, signal);
 
   const resolvedCode = recovered?.payload ? 0 : code;
   const status = resolvedCode === 0 ? 'completed' : 'failed';
@@ -169,7 +207,7 @@ child.on('close', async (code, signal) => {
     await updateTask(taskId, {
       status,
       exitCode: resolvedCode,
-      error: resolvedCode === 0 ? null : signal ? `Killed by ${signal}` : null,
+      error: resolvedCode !== 0 && signal ? `Killed by ${signal}` : null,
     });
   } catch (updateError) {
     log(`[${Date.now()}][ERROR] Failed to update task status: ${updateError.message}\n`);

package/src/agents/git-pusher-agent.json

@@ -1,20 +0,0 @@
-{
-  "id": "git-pusher",
-  "role": "completion-detector",
-  "modelLevel": "level2",
-  "triggers": [
-    {
-      "topic": "VALIDATION_RESULT",
-      "logic": {
-        "engine": "javascript",
-        "script": "const validators = cluster.getAgentsByRole('validator'); const lastPush = ledger.findLast({ topic: 'IMPLEMENTATION_READY' }); if (!lastPush) return false; if (validators.length === 0) return true; const results = ledger.query({ topic: 'VALIDATION_RESULT', since: lastPush.timestamp }); if (results.length < validators.length) return false; const allApproved = results.every(r => r.content?.data?.approved === 'true' || r.content?.data?.approved === true); if (!allApproved) return false; const hasRealEvidence = results.every(r => { const criteria = r.content?.data?.criteriaResults || []; return criteria.every(c => { return c.evidence?.command && typeof c.evidence?.exitCode === 'number' && c.evidence?.output?.length > 10; }); }); return hasRealEvidence;"
-      },
-      "action": "execute_task"
-    }
-  ],
-  "prompt": "\ud83d\udea8 CRITICAL: ALL VALIDATORS APPROVED. YOU MUST CREATE A PR AND GET IT MERGED. DO NOT STOP UNTIL THE PR IS MERGED. \ud83d\udea8\n\n## MANDATORY STEPS - EXECUTE EACH ONE IN ORDER - DO NOT SKIP ANY STEP\n\n### STEP 1: Stage ALL changes (MANDATORY)\n```bash\ngit add -A\n```\nRun this command. Do not skip it.\n\n### STEP 2: Check what's staged\n```bash\ngit status\n```\nRun this. If nothing to commit, output JSON with pr_url: null and stop.\n\n### STEP 3: Commit the changes (MANDATORY if there are changes)\n```bash\ngit commit -m \"feat: implement #{{issue_number}} - {{issue_title}}\"\n```\nRun this command. Do not skip it.\n\n### STEP 4: Push to origin (MANDATORY)\n```bash\ngit push -u origin HEAD\n```\nRun this. If it fails, check the error and fix it.\n\n\u26a0\ufe0f AFTER PUSH YOU ARE NOT DONE! CONTINUE TO STEP 5! \u26a0\ufe0f\n\n### STEP 5: CREATE THE PR (MANDATORY - YOU MUST RUN THIS COMMAND)\n```bash\ngh pr create --title \"feat: {{issue_title}}\" --body \"Closes #{{issue_number}}\"\n```\n\ud83d\udea8 YOU MUST RUN `gh pr create`! Outputting a link is NOT creating a PR! \ud83d\udea8\nThe push output shows a \"Create a pull request\" link - IGNORE IT.\nYou MUST run the `gh pr create` command above. Save the actual PR URL from the output.\n\n\u26a0\ufe0f AFTER PR CREATION YOU ARE NOT DONE! CONTINUE TO STEP 6! \u26a0\ufe0f\n\n### STEP 6: MERGE THE PR (MANDATORY - THIS IS NOT OPTIONAL)\n```bash\ngh pr merge --merge --auto\n```\nThis sets auto-merge. If it fails (e.g., no auto-merge enabled), try:\n```bash\ngh pr merge --merge\n```\n\n\ud83d\udea8 IF MERGE FAILS DUE TO CONFLICTS - YOU MUST RESOLVE THEM:\na) Pull latest main and rebase:\n   ```bash\n   git fetch origin main\n   git rebase origin/main\n   ```\nb) If conflicts appear - RESOLVE THEM IMMEDIATELY:\n   - Read the conflicting files\n   - Make intelligent decisions about what code to keep\n   - Edit the files to resolve conflicts\n   - `git add <resolved-files>`\n   - `git rebase --continue`\nc) Force push the resolved branch:\n   ```bash\n   git push --force-with-lease\n   ```\nd) Retry merge:\n   ```bash\n   gh pr merge --merge\n   ```\n\nREPEAT UNTIL MERGED. DO NOT GIVE UP. DO NOT SKIP. THE PR MUST BE MERGED.\nIf merge is blocked by CI, wait and retry. If blocked by reviews, set auto-merge.\n\n## CRITICAL RULES\n- Execute EVERY step in order (1, 2, 3, 4, 5, 6)\n- Do NOT skip git add -A\n- Do NOT skip git commit\n- Do NOT skip gh pr create - THE TASK IS NOT DONE UNTIL PR EXISTS\n- Do NOT skip gh pr merge - THE TASK IS NOT DONE UNTIL PR IS MERGED\n- If push fails, debug and fix it\n- If PR creation fails, debug and fix it\n- If merge fails, debug and fix it\n- DO NOT OUTPUT JSON UNTIL PR IS ACTUALLY MERGED\n- A link from git push is NOT a PR - you must run gh pr create\n\n## Final Output\nONLY after the PR is MERGED, output:\n```json\n{\"pr_url\": \"https://github.com/owner/repo/pull/123\", \"pr_number\": 123, \"merged\": true}\n```\n\nIf truly no changes exist, output:\n```json\n{\"pr_url\": null, \"pr_number\": null, \"merged\": false}\n```",
-  "output": {
-    "topic": "PR_CREATED",
-    "publishAfter": "CLUSTER_COMPLETE"
-  }
-}