@covibes/zeroshot 5.2.1 → 5.4.0

package/lib/stream-json-parser.js

@@ -1,244 +1,10 @@
 /**
- * Stream JSON Parser for Claude Code output
- *
- * Parses NDJSON (newline-delimited JSON) streaming output from Claude Code.
- * Extracts: text output, tool calls, tool results, thinking, errors.
- *
- * Event types from Claude Code stream-json format:
- * - system: Session initialization
- * - stream_event: Real-time streaming (content_block_start, content_block_delta, etc.)
- * - assistant: Complete assistant message with content array
- * - user: Tool results
- * - result: Final task result
+ * Compatibility wrapper for Claude stream-json parsing.
+ * Prefer provider-specific parsers in src/providers.
  */
-
-/**
- * Parse a single JSON line and extract displayable content
- * @param {string} line - Single line of NDJSON
- * @returns {Object|null} Parsed event with type and content, or null if not displayable
- */
-function parseStreamLine(line) {
-  const trimmed = line.trim();
-  if (!trimmed || !trimmed.startsWith('{') || !trimmed.endsWith('}')) {
-    return null;
-  }
-
-  let event;
-  try {
-    event = JSON.parse(trimmed);
-  } catch {
-    return null;
-  }
-
-  // stream_event - real-time streaming updates
-  if (event.type === 'stream_event' && event.event) {
-    return parseStreamEvent(event.event);
-  }
-
-  // assistant - complete message with content blocks
-  if (event.type === 'assistant' && event.message?.content) {
-    return parseAssistantMessage(event.message);
-  }
-
-  // user - tool result
-  if (event.type === 'user' && event.message?.content) {
-    return parseUserMessage(event.message);
-  }
-
-  // result - final task result (includes token usage and cost)
-  if (event.type === 'result') {
-    const usage = event.usage || {};
-    return {
-      type: 'result',
-      success: event.subtype === 'success',
-      result: event.result,
-      error: event.is_error ? event.result : null,
-      cost: event.total_cost_usd,
-      duration: event.duration_ms,
-      // Token usage from Claude API
-      inputTokens: usage.input_tokens || 0,
-      outputTokens: usage.output_tokens || 0,
-      cacheReadInputTokens: usage.cache_read_input_tokens || 0,
-      cacheCreationInputTokens: usage.cache_creation_input_tokens || 0,
-      // Per-model breakdown (for multi-model tasks)
-      modelUsage: event.modelUsage || null,
-    };
-  }
-
-  // system - session init (skip, not user-facing)
-  if (event.type === 'system') {
-    return null;
-  }
-
-  return null;
-}
-
-/**
- * Parse stream_event inner event
- */
-function parseStreamEvent(inner) {
-  // content_block_start - tool use or text block starting
-  if (inner.type === 'content_block_start' && inner.content_block) {
-    const block = inner.content_block;
-
-    if (block.type === 'tool_use') {
-      return {
-        type: 'tool_start',
-        toolName: block.name,
-        toolId: block.id,
-      };
-    }
-
-    if (block.type === 'thinking') {
-      return {
-        type: 'thinking_start',
-      };
-    }
-
-    // text block start - usually empty, skip
-    return null;
-  }
-
-  // content_block_delta - incremental content
-  if (inner.type === 'content_block_delta' && inner.delta) {
-    const delta = inner.delta;
-
-    if (delta.type === 'text_delta' && delta.text) {
-      return {
-        type: 'text',
-        text: delta.text,
-      };
-    }
-
-    if (delta.type === 'thinking_delta' && delta.thinking) {
-      return {
-        type: 'thinking',
-        text: delta.thinking,
-      };
-    }
-
-    if (delta.type === 'input_json_delta' && delta.partial_json) {
-      return {
-        type: 'tool_input',
-        json: delta.partial_json,
-      };
-    }
-  }
-
-  // content_block_stop - block ended
-  if (inner.type === 'content_block_stop') {
-    return {
-      type: 'block_end',
-      index: inner.index,
-    };
-  }
-
-  // message_start - skip text extraction here since it will come via text_delta events
-  // (extracting here causes duplicate text output)
-
-  return null;
-}
-
-/**
- * Parse assistant message content blocks
- * NOTE: Skip text blocks here since they were already streamed via text_delta events.
- * Extracting text here would cause duplicate output.
- */
-function parseAssistantMessage(message) {
-  const results = [];
-
-  for (const block of message.content) {
-    // Skip text blocks - already streamed via text_delta events
-    // Extracting here causes duplicate output
-
-    if (block.type === 'tool_use') {
-      results.push({
-        type: 'tool_call',
-        toolName: block.name,
-        toolId: block.id,
-        input: block.input,
-      });
-    }
-
-    if (block.type === 'thinking' && block.thinking) {
-      // Skip thinking blocks too - already streamed via thinking_delta
-      // But keep for non-streaming contexts (direct API responses)
-      // Only emit if we haven't seen streaming deltas (detected by having results already)
-    }
-  }
-
-  if (results.length === 1) {
-    return results[0];
-  }
-
-  if (results.length > 1) {
-    return {
-      type: 'multi',
-      events: results,
-    };
-  }
-
-  return null;
-}
-
-/**
- * Parse user message (tool results)
- */
-function parseUserMessage(message) {
-  const results = [];
-
-  for (const block of message.content) {
-    if (block.type === 'tool_result') {
-      results.push({
-        type: 'tool_result',
-        toolId: block.tool_use_id,
-        content: typeof block.content === 'string' ? block.content : JSON.stringify(block.content),
-        isError: block.is_error || false,
-      });
-    }
-  }
-
-  if (results.length === 1) {
-    return results[0];
-  }
-
-  if (results.length > 1) {
-    return {
-      type: 'multi',
-      events: results,
-    };
-  }
-
-  return null;
-}
-
-/**
- * Parse multiple lines of NDJSON
- * @param {string} chunk - Chunk of text potentially containing multiple JSON lines
- * @returns {Array} Array of parsed events
- */
-function parseChunk(chunk) {
-  const events = [];
-  const lines = chunk.split('\n');
-
-  for (const line of lines) {
-    const event = parseStreamLine(line);
-    if (event) {
-      if (event.type === 'multi') {
-        events.push(...event.events);
-      } else {
-        events.push(event);
-      }
-    }
-  }
-
-  return events;
-}
+const { parseEvent, parseChunk } = require('../src/providers/anthropic/output-parser');
 
 module.exports = {
-  parseStreamLine,
+  parseEvent,
   parseChunk,
-  parseStreamEvent,
-  parseAssistantMessage,
-  parseUserMessage,
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@covibes/zeroshot",
-  "version": "5.2.1",
-  "description": "Multi-agent orchestration engine for Claude - cluster coordinator and CLI",
+  "version": "5.4.0",
+  "description": "Multi-agent orchestration engine for Claude, Codex, and Gemini",
   "main": "src/orchestrator.js",
   "bin": {
     "zeroshot": "./cli/index.js"
@@ -11,14 +11,18 @@
     "test": "tests"
   },
   "scripts": {
-    "test": "mocha 'tests/**/*.test.js'",
-    "test:coverage": "c8 npm test",
-    "test:coverage:report": "c8 --reporter=html npm test && echo 'Coverage report generated at coverage/index.html'",
+    "test": "mocha 'tests/unit/**/*.test.js' 'tests/*.test.js' --parallel",
+    "test:unit": "mocha 'tests/unit/**/*.test.js' 'tests/*.test.js' --parallel",
+    "test:slow": "mocha 'tests/integration/**/*.test.js' --timeout 180000",
+    "test:all": "npm run test && npm run test:slow",
+    "test:coverage": "c8 npm run test:unit",
+    "test:coverage:report": "c8 --reporter=html npm run test:unit && echo 'Coverage report generated at coverage/index.html'",
     "postinstall": "node scripts/fix-node-pty-permissions.js",
     "start": "node cli/index.js",
     "typecheck": "tsc --noEmit",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
+    "validate:templates": "node scripts/validate-templates.js",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
     "deadcode": "ts-prune --skip node_modules",
@@ -55,6 +59,8 @@
     "multi-agent",
     "orchestration",
     "claude",
+    "codex",
+    "gemini",
     "automation"
   ],
   "author": "Covibes",
@@ -112,10 +118,14 @@
     "depcheck": "^1.4.7",
     "eslint": "^9.39.1",
     "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-security": "^3.0.1",
+    "eslint-plugin-sonarjs": "^3.0.5",
     "eslint-plugin-unused-imports": "^4.3.0",
     "husky": "^9.1.7",
     "jscpd": "^3.5.10",
+    "lint-staged": "^16.2.7",
     "mocha": "^11.7.5",
+    "prettier": "^3.7.4",
     "semantic-release": "^25.0.2",
     "sinon": "^21.0.0",
     "ts-prune": "^0.10.3",
@@ -123,6 +133,17 @@
     "unimported": "^1.31.0"
   },
   "overrides": {
-    "xml2js": "^0.5.0"
+    "xml2js": "^0.5.0",
+    "diff": ">=8.0.3",
+    "tar": ">=7.5.3",
+    "undici": ">=7.18.2"
+  },
+  "lint-staged": {
+    "*.{js,mjs,cjs}": [
+      "eslint --fix"
+    ],
+    "*.{js,mjs,cjs,json,md}": [
+      "prettier --write"
+    ]
   }
 }

package/scripts/setup-merge-queue.sh

@@ -0,0 +1,170 @@
+#!/bin/bash
+# Setup GitHub merge queue and branch protection for zeroshot
+# Run once after creating the repo or to update settings
+
+set -e
+
+REPO="covibes/zeroshot"
+
+echo "╔═══════════════════════════════════════════════════════════════════╗"
+echo "║  Setting up merge queue for $REPO                         ║"
+echo "╚═══════════════════════════════════════════════════════════════════╝"
+echo ""
+
+# Check gh is authenticated
+if ! gh auth status &>/dev/null; then
+  echo "❌ ERROR: Not authenticated with GitHub CLI"
+  echo "   Run: gh auth login"
+  exit 1
+fi
+
+# Check we have admin access
+if ! gh api "repos/$REPO" --jq '.permissions.admin' | grep -q true; then
+  echo "❌ ERROR: You need admin access to $REPO"
+  exit 1
+fi
+
+echo "✓ Authenticated with admin access"
+echo ""
+
+# ============================================================================
+# Configure 'dev' branch protection (merge target)
+# ============================================================================
+
+echo "→ Configuring 'dev' branch protection..."
+
+gh api --method PUT "repos/$REPO/branches/dev/protection" \
+  --input - <<EOF
+{
+  "required_status_checks": {
+    "strict": true,
+    "contexts": ["check", "install-matrix (ubuntu-latest, 20)", "install-matrix (macos-latest, 20)"]
+  },
+  "enforce_admins": false,
+  "required_pull_request_reviews": null,
+  "restrictions": null,
+  "allow_force_pushes": false,
+  "allow_deletions": false,
+  "required_linear_history": true,
+  "required_conversation_resolution": false
+}
+EOF
+
+echo "✓ 'dev' branch protection configured"
+
+# Enable merge queue for dev branch
+echo "→ Enabling merge queue for 'dev' branch..."
+
+# Note: Merge queue requires GitHub Enterprise or public repos with Actions
+# Using the ruleset API which supports merge queue
+gh api --method POST "repos/$REPO/rulesets" \
+  --input - <<EOF 2>/dev/null || echo "   (ruleset may already exist)"
+{
+  "name": "dev-merge-queue",
+  "target": "branch",
+  "enforcement": "active",
+  "conditions": {
+    "ref_name": {
+      "include": ["refs/heads/dev"],
+      "exclude": []
+    }
+  },
+  "rules": [
+    {
+      "type": "merge_queue",
+      "parameters": {
+        "check_response_timeout_minutes": 30,
+        "grouping_strategy": "ALLGREEN",
+        "max_entries_to_build": 5,
+        "max_entries_to_merge": 5,
+        "merge_method": "SQUASH",
+        "min_entries_to_merge": 1,
+        "min_entries_to_merge_wait_minutes": 1
+      }
+    }
+  ]
+}
+EOF
+
+echo "✓ Merge queue enabled for 'dev'"
+
+# ============================================================================
+# Configure 'main' branch protection (release branch)
+# ============================================================================
+
+echo "→ Configuring 'main' branch protection..."
+
+gh api --method PUT "repos/$REPO/branches/main/protection" \
+  --input - <<EOF
+{
+  "required_status_checks": {
+    "strict": true,
+    "contexts": ["check", "install-matrix (ubuntu-latest, 20)", "install-matrix (macos-latest, 20)"]
+  },
+  "enforce_admins": false,
+  "required_pull_request_reviews": {
+    "required_approving_review_count": 1,
+    "dismiss_stale_reviews": true,
+    "require_code_owner_reviews": false
+  },
+  "restrictions": null,
+  "allow_force_pushes": false,
+  "allow_deletions": false,
+  "required_linear_history": true,
+  "required_conversation_resolution": false
+}
+EOF
+
+echo "✓ 'main' branch protection configured"
+
+# ============================================================================
+# Configure repository settings
+# ============================================================================
+
+echo "→ Configuring repository settings..."
+
+gh api --method PATCH "repos/$REPO" \
+  --input - <<EOF
+{
+  "allow_squash_merge": true,
+  "allow_merge_commit": false,
+  "allow_rebase_merge": false,
+  "squash_merge_commit_title": "PR_TITLE",
+  "squash_merge_commit_message": "PR_BODY",
+  "delete_branch_on_merge": true,
+  "allow_auto_merge": true
+}
+EOF
+
+echo "✓ Repository settings configured"
+
+# ============================================================================
+# Summary
+# ============================================================================
+
+echo ""
+echo "╔═══════════════════════════════════════════════════════════════════╗"
+echo "║  ✓ Merge queue setup complete!                                    ║"
+echo "╚═══════════════════════════════════════════════════════════════════╝"
+echo ""
+echo "Workflow:"
+echo "  feature-branch (local)"
+echo "  ↓"
+echo "  pre-push hook → lint + typecheck (~5s)"
+echo "  ↓"
+echo "  push to origin/feature-branch"
+echo "  ↓"
+echo "  gh pr create --base dev"
+echo "  ↓"
+echo "  CI runs tests on PR branch"
+echo "  ↓"
+echo "  gh pr merge --auto --squash → enters merge queue"
+echo "  ↓"
+echo "  Queue rebases PR on latest dev + runs CI again"
+echo "  ↓"
+echo "  Merge to dev (only if CI passes on rebased code)"
+echo ""
+echo "Release workflow:"
+echo "  gh pr create --base main --head dev --title \"Release\""
+echo "  → CI passes → merge → semantic-release publishes"
+echo ""

package/scripts/validate-templates.js

@@ -0,0 +1,100 @@
+#!/usr/bin/env node
+/**
+ * Validate all cluster templates for config errors
+ * Run in CI to prevent broken templates from being merged
+ *
+ * Usage: node scripts/validate-templates.js
+ * Exit codes: 0 = all valid, 1 = validation errors found
+ */
+
+const fs = require('fs');
+const path = require('path');
+const { validateConfig } = require('../src/config-validator');
+
+const TEMPLATES_DIR = path.join(__dirname, '../cluster-templates');
+
+function findJsonFiles(dir) {
+  const files = [];
+  if (!fs.existsSync(dir)) return files;
+
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const fullPath = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      files.push(...findJsonFiles(fullPath));
+    } else if (entry.name.endsWith('.json')) {
+      files.push(fullPath);
+    }
+  }
+  return files;
+}
+
+function validateTemplate(filePath) {
+  const relativePath = path.relative(process.cwd(), filePath);
+
+  try {
+    const content = fs.readFileSync(filePath, 'utf-8');
+    const config = JSON.parse(content);
+
+    // Skip non-cluster configs (like package.json)
+    if (!config.agents && !config.name) {
+      return { valid: true, skipped: true };
+    }
+
+    const result = validateConfig(config);
+
+    if (!result.valid) {
+      console.error(`\n❌ ${relativePath}`);
+      for (const error of result.errors) {
+        console.error(`   ERROR: ${error}`);
+      }
+    } else if (result.warnings.length > 0) {
+      console.warn(`\n⚠️  ${relativePath}`);
+      for (const warning of result.warnings) {
+        console.warn(`   WARN: ${warning}`);
+      }
+    } else {
+      console.log(`✓ ${relativePath}`);
+    }
+
+    return result;
+  } catch (err) {
+    console.error(`\n❌ ${relativePath}`);
+    console.error(`   PARSE ERROR: ${err.message}`);
+    return { valid: false, errors: [err.message], warnings: [] };
+  }
+}
+
+function main() {
+  console.log('Validating cluster templates...\n');
+
+  const templateFiles = [...findJsonFiles(TEMPLATES_DIR)];
+
+  let hasErrors = false;
+  let validated = 0;
+  let skipped = 0;
+
+  for (const file of templateFiles) {
+    const result = validateTemplate(file);
+    if (result.skipped) {
+      skipped++;
+    } else {
+      validated++;
+      if (!result.valid) {
+        hasErrors = true;
+      }
+    }
+  }
+
+  console.log(`\n${'='.repeat(60)}`);
+  console.log(`Validated: ${validated} templates, Skipped: ${skipped} files`);
+
+  if (hasErrors) {
+    console.error('\n❌ VALIDATION FAILED - Fix errors above before merging\n');
+    process.exit(1);
+  } else {
+    console.log('\n✓ All templates valid\n');
+    process.exit(0);
+  }
+}
+
+main();