@nbardy/oompa 0.7.2 → 0.7.3

package/bin/oompa.js

@@ -15,7 +15,11 @@ if (!fs.existsSync(swarmScript) || !fs.existsSync(classpath)) {
   process.exit(1);
 }
 
-const result = spawnSync("bb", ["--classpath", classpath, swarmScript, ...argv], {
+// Try to use the locally bundled bb if it exists (from postinstall)
+const localBb = path.join(__dirname, "bb");
+const bbPath = fs.existsSync(localBb) ? localBb : "bb";
+
+const result = spawnSync(bbPath, ["--classpath", classpath, swarmScript, ...argv], {
   stdio: "inherit",
   cwd: process.cwd(),
   env: { ...process.env, OOMPA_PACKAGE_ROOT: packageRoot }

package/config/prompts/_task_header.md

@@ -33,6 +33,6 @@ Always read/write queue files via `{{TASKS_ROOT}}/...` (not hard-coded local `ta
 
 - **`CLAIM(id, ...)`** — Claim one or more pending tasks. Batch related tasks together.
 - **`COMPLETE_AND_READY_FOR_MERGE`** — Your work is done and ready for review. Framework reviews, merges, and marks your claimed tasks complete.
-- **`__DONE__`** — No more useful work exists. Stops your worker.
+- **`NEEDS_FOLLOWUP`** — Last resort continuation signal. Use only if you tried hard and still cannot produce a merge-ready artifact from the current context. Explain the remaining work after the signal. The framework will keep your claimed tasks and resume you with a sharper follow-up prompt. This is not success.
 
-One signal per output. Claim before working.
+One signal per output. Claim before working. Do not output `DONE`.

package/oompa.example.json

@@ -3,28 +3,28 @@
     {
       "model": "claude:opus",
       "prompt": ["config/prompts/planner.md"],
-      "iterations": 5,
+      "max_cycle": 5,
       "count": 1,
       "wait_between": 60
     },
     {
       "model": "codex:gpt-5.3-codex:medium",
       "prompt": ["config/prompts/executor.md"],
-      "iterations": 10,
+      "max_cycle": 10,
       "count": 2,
       "can_plan": false
     },
     {
       "model": "opencode:opencode/kimi-k2.5-free",
       "prompt": ["config/prompts/executor.md"],
-      "iterations": 10,
+      "max_cycle": 10,
       "count": 1,
       "can_plan": false
     },
     {
       "model": "gemini:gemini-3-pro-preview",
       "prompt": ["config/prompts/executor.md"],
-      "iterations": 10,
+      "max_cycle": 10,
       "count": 1,
       "can_plan": false
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nbardy/oompa",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "Git-worktree multi-agent swarm orchestrator for Codex, Claude, and Opencode",
   "license": "MIT",
   "type": "commonjs",
@@ -14,12 +14,14 @@
     "agentnet/src/",
     "config/prompts/",
     "oompa.example.json",
-    "README.md"
+    "README.md",
+    "scripts/"
   ],
   "scripts": {
     "check": "node bin/oompa.js check",
     "help": "node bin/oompa.js help",
-    "pack:dry": "npm pack --dry-run"
+    "pack:dry": "npm pack --dry-run",
+    "postinstall": "node scripts/install-babashka.js"
   },
   "engines": {
     "node": ">=18"

package/scripts/README.md

@@ -0,0 +1,6 @@
+# Scripts
+
+Reserved for helper shell scripts (smoke tests, lint wiring, etc.).
+Populate as the orchestrator matures.
+
+- `copy-repo-code.sh`: copies implementation code files by default (or all tracked text files via `--all-files`) with filename headers to macOS clipboard (`pbcopy`).

package/scripts/copy-repo-code.sh

@@ -0,0 +1,110 @@
+#!/usr/bin/env bash
+# Copy tracked code files in this repo to clipboard with file headers.
+#
+# Usage:
+#   ./scripts/copy-repo-code.sh
+#   ./scripts/copy-repo-code.sh --all-files
+
+set -euo pipefail
+
+usage() {
+  cat <<'EOF'
+Usage:
+  ./scripts/copy-repo-code.sh
+  ./scripts/copy-repo-code.sh --all-files
+
+Default mode:
+  Copies implementation-oriented files only (src, scripts, bins, tests, and
+  top-level shell/babashka entrypoints).
+
+--all-files:
+  Copies all tracked text files in the repository.
+EOF
+}
+
+mode="implementation"
+if [ "${1:-}" = "--all-files" ]; then
+  mode="all"
+  shift
+fi
+
+if [ "${1:-}" = "-h" ] || [ "${1:-}" = "--help" ]; then
+  usage
+  exit 0
+fi
+
+if [ "$#" -gt 0 ]; then
+  usage >&2
+  exit 1
+fi
+
+if ! command -v git >/dev/null 2>&1; then
+  echo "Error: git is required." >&2
+  exit 1
+fi
+
+if ! command -v pbcopy >/dev/null 2>&1; then
+  echo "Error: pbcopy is not available on this system." >&2
+  exit 1
+fi
+
+script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+repo_root=$(git -C "$script_dir" rev-parse --show-toplevel 2>/dev/null || true)
+if [ -z "$repo_root" ]; then
+  echo "Error: could not determine git repo root." >&2
+  exit 1
+fi
+
+tmp_file=$(mktemp)
+cleanup() {
+  rm -f "$tmp_file"
+}
+trap cleanup EXIT
+
+copied=0
+skipped=0
+
+if [ "$mode" = "all" ]; then
+  file_source_cmd=(git -C "$repo_root" ls-files -z)
+else
+  file_source_cmd=(
+    git -C "$repo_root" ls-files -z --
+    "src/**"
+    "agentnet/src/**"
+    "bin/**"
+    "scripts/**"
+    "tests/**"
+    "agentnet/test/**"
+    "*.sh"
+    "*.bb"
+    "bb.edn"
+    "package.json"
+  )
+fi
+
+while IFS= read -r -d '' file; do
+  full_path="$repo_root/$file"
+  [ -f "$full_path" ] || continue
+
+  # Skip files that look binary.
+  if ! grep -Iq . "$full_path"; then
+    skipped=$((skipped + 1))
+    continue
+  fi
+
+  copied=$((copied + 1))
+  {
+    printf '===== FILE: %s =====\n' "$file"
+    cat "$full_path"
+    printf '\n\n'
+  } >> "$tmp_file"
+done < <("${file_source_cmd[@]}")
+
+if [ "$copied" -eq 0 ]; then
+  echo "No tracked text files found to copy." >&2
+  exit 1
+fi
+
+pbcopy < "$tmp_file"
+bytes=$(wc -c < "$tmp_file" | tr -d '[:space:]')
+echo "Copied $copied files ($bytes bytes) to clipboard in '$mode' mode. Skipped $skipped binary files."

package/scripts/install-babashka.js

@@ -0,0 +1,97 @@
+#!/usr/bin/env node
+
+const os = require('os');
+const fs = require('fs');
+const path = require('path');
+const https = require('https');
+const { execSync } = require('child_process');
+
+const BB_VERSION = '1.3.191'; // A stable release version
+
+// Map Node.js os/arch to Babashka release asset names
+const platforms = {
+  darwin: {
+    arm64: `babashka-${BB_VERSION}-macos-aarch64.tar.gz`,
+    x64: `babashka-${BB_VERSION}-macos-amd64.tar.gz`,
+  },
+  linux: {
+    arm64: `babashka-${BB_VERSION}-linux-aarch64-static.tar.gz`,
+    x64: `babashka-${BB_VERSION}-linux-amd64-static.tar.gz`,
+  },
+  // We can add Windows later if needed, but it requires zip extraction
+};
+
+async function downloadBabashka() {
+  const osType = os.platform();
+  const arch = os.arch();
+
+  // If already installed globally and accessible, we can skip downloading!
+  try {
+    const existing = execSync('which bb', { encoding: 'utf-8' }).trim();
+    if (existing) {
+      console.log(`[oompa] System Babashka found at ${existing}. Skipping download.`);
+      return;
+    }
+  } catch (e) {
+    // Not found, continue with download
+  }
+
+  const assetName = platforms[osType]?.[arch];
+  if (!assetName) {
+    console.warn(`[oompa] Automatic Babashka download not supported for ${osType} ${arch}.`);
+    console.warn('[oompa] Please install manually: https://github.com/babashka/babashka#installation');
+    return;
+  }
+
+  const downloadUrl = `https://github.com/babashka/babashka/releases/download/v${BB_VERSION}/${assetName}`;
+  const binDir = path.join(__dirname, '..', 'bin');
+  const tempTar = path.join(binDir, 'bb.tar.gz');
+  const bbDest = path.join(binDir, 'bb');
+
+  if (!fs.existsSync(binDir)) {
+    fs.mkdirSync(binDir, { recursive: true });
+  }
+
+  console.log(`[oompa] Downloading Babashka (native engine) from ${downloadUrl}...`);
+
+  return new Promise((resolve, reject) => {
+    // Handle GitHub's redirects (302)
+    https.get(downloadUrl, (res) => {
+      if (res.statusCode === 301 || res.statusCode === 302) {
+        https.get(res.headers.location, (redirectRes) => {
+          const fileStream = fs.createWriteStream(tempTar);
+          redirectRes.pipe(fileStream);
+          fileStream.on('finish', () => {
+            fileStream.close();
+            extract(tempTar, binDir, bbDest, resolve, reject);
+          });
+        }).on('error', reject);
+      } else {
+        reject(new Error(`Failed to download: ${res.statusCode}`));
+      }
+    }).on('error', reject);
+  });
+}
+
+function extract(tarPath, destDir, bbDest, resolve, reject) {
+  console.log('[oompa] Extracting native binary...');
+  try {
+    execSync(`tar -xzf ${tarPath} -C ${destDir}`);
+    fs.unlinkSync(tarPath); // cleanup
+
+    if (fs.existsSync(bbDest)) {
+      fs.chmodSync(bbDest, 0o755); // Make it executable
+      console.log('[oompa] ✅ Native engine installed successfully!');
+      resolve();
+    } else {
+      reject(new Error('Extraction failed: bb binary not found.'));
+    }
+  } catch (e) {
+    reject(e);
+  }
+}
+
+downloadBabashka().catch((err) => {
+  console.error(`[oompa] Failed to install Babashka natively: ${err.message}`);
+  console.warn('[oompa] Please install manually: https://github.com/babashka/babashka#installation');
+});

package/scripts/test-harness-resume.sh

@@ -0,0 +1,229 @@
+#!/usr/bin/env bash
+# test-harness-resume.sh — Smoke test session create + resume for each harness.
+#
+# For each available harness CLI:
+#   1. Create a session: "Remember the word FOOBAR"
+#   2. Resume that session: "What word were you supposed to remember?"
+#   3. Check the response contains FOOBAR
+#
+# Usage:
+#   ./scripts/test-harness-resume.sh           # test all available
+#   ./scripts/test-harness-resume.sh claude     # test one harness
+#
+# Requires the CLI binaries to be on PATH.
+
+set -euo pipefail
+
+PASS=0
+FAIL=0
+SKIP=0
+
+# Unset CLAUDECODE so we can run nested claude sessions
+unset CLAUDECODE 2>/dev/null || true
+
+green()  { printf "\033[32m%s\033[0m\n" "$*"; }
+red()    { printf "\033[31m%s\033[0m\n" "$*"; }
+yellow() { printf "\033[33m%s\033[0m\n" "$*"; }
+
+check_binary() {
+  command -v "$1" >/dev/null 2>&1
+}
+
+# ── Claude ────────────────────────────────────────────────────────────────────
+
+test_claude() {
+  local uuid
+  uuid=$(python3 -c "import uuid; print(str(uuid.uuid4()))")
+
+  echo "  Session ID: $uuid"
+
+  # Step 1: Create session
+  echo "  Creating session..."
+  local create_out
+  create_out=$(claude --dangerously-skip-permissions \
+    --session-id "$uuid" \
+    -p "Remember the word FOOBAR. Say only: OK, remembered." 2>&1)
+  local create_exit=$?
+
+  if [ $create_exit -ne 0 ]; then
+    red "  FAIL: create exited $create_exit"
+    echo "  Output: $create_out"
+    return 1
+  fi
+  echo "  Create output: $create_out"
+
+  # Step 2: Resume session
+  echo "  Resuming session..."
+  local resume_out
+  resume_out=$(claude --dangerously-skip-permissions \
+    --resume "$uuid" \
+    -p "What word were you supposed to remember? Say only the word." 2>&1)
+  local resume_exit=$?
+
+  if [ $resume_exit -ne 0 ]; then
+    red "  FAIL: resume exited $resume_exit"
+    echo "  Output: $resume_out"
+    return 1
+  fi
+  echo "  Resume output: $resume_out"
+
+  # Step 3: Check for FOOBAR
+  if echo "$resume_out" | grep -qi "FOOBAR"; then
+    green "  PASS: resume recalled FOOBAR"
+    return 0
+  else
+    red "  FAIL: resume did not recall FOOBAR"
+    return 1
+  fi
+}
+
+# ── Opencode ──────────────────────────────────────────────────────────────────
+
+test_opencode() {
+  # Step 1: Create session, extract session-id from NDJSON
+  echo "  Creating session..."
+  local create_out
+  create_out=$(opencode run --format json --print-logs --log-level WARN \
+    "Remember the word FOOBAR. Say only: OK, remembered." 2>&1)
+  local create_exit=$?
+
+  if [ $create_exit -ne 0 ]; then
+    red "  FAIL: create exited $create_exit"
+    return 1
+  fi
+
+  # Extract session ID from NDJSON
+  local sid
+  sid=$(echo "$create_out" | grep -o '"sessionI[Dd]":"[^"]*"' | head -1 | cut -d'"' -f4)
+  if [ -z "$sid" ]; then
+    # Try alternate pattern
+    sid=$(echo "$create_out" | grep -oE 'ses_[A-Za-z0-9]+' | head -1)
+  fi
+
+  if [ -z "$sid" ]; then
+    red "  FAIL: could not extract session ID"
+    echo "  Output: $create_out"
+    return 1
+  fi
+  echo "  Session ID: $sid"
+
+  # Step 2: Resume
+  echo "  Resuming session..."
+  local resume_out
+  resume_out=$(opencode run --format json --print-logs --log-level WARN \
+    -s "$sid" --continue \
+    "What word were you supposed to remember? Say only the word." 2>&1)
+  local resume_exit=$?
+
+  if [ $resume_exit -ne 0 ]; then
+    red "  FAIL: resume exited $resume_exit"
+    return 1
+  fi
+
+  if echo "$resume_out" | grep -qi "FOOBAR"; then
+    green "  PASS: resume recalled FOOBAR"
+    return 0
+  else
+    red "  FAIL: resume did not recall FOOBAR"
+    echo "  Output: $resume_out"
+    return 1
+  fi
+}
+
+# ── Gemini ────────────────────────────────────────────────────────────────────
+
+test_gemini() {
+  # Gemini uses implicit sessions (by cwd) and --resume latest
+  local tmpdir
+  tmpdir=$(mktemp -d)
+
+  echo "  Working dir: $tmpdir"
+
+  # Step 1: Create session
+  echo "  Creating session..."
+  local create_out
+  create_out=$(cd "$tmpdir" && gemini --yolo \
+    -p "Remember the word FOOBAR. Say only: OK, remembered." 2>&1)
+  local create_exit=$?
+
+  if [ $create_exit -ne 0 ]; then
+    red "  FAIL: create exited $create_exit"
+    rm -rf "$tmpdir"
+    return 1
+  fi
+  echo "  Create output: $create_out"
+
+  # Step 2: Resume
+  echo "  Resuming session..."
+  local resume_out
+  resume_out=$(cd "$tmpdir" && gemini --yolo --resume latest \
+    -p "What word were you supposed to remember? Say only the word." 2>&1)
+  local resume_exit=$?
+
+  rm -rf "$tmpdir"
+
+  if [ $resume_exit -ne 0 ]; then
+    red "  FAIL: resume exited $resume_exit"
+    return 1
+  fi
+
+  if echo "$resume_out" | grep -qi "FOOBAR"; then
+    green "  PASS: resume recalled FOOBAR"
+    return 0
+  else
+    red "  FAIL: resume did not recall FOOBAR"
+    echo "  Output: $resume_out"
+    return 1
+  fi
+}
+
+# ── Codex ─────────────────────────────────────────────────────────────────────
+
+test_codex() {
+  # Codex has resume-fn: nil — resume is not supported.
+  # This is a known limitation, not a silent skip. Fail so it stays visible.
+  red "  FAIL: codex does not support session resume (resume-fn is nil in registry)"
+  return 1
+}
+
+# ── Runner ────────────────────────────────────────────────────────────────────
+
+run_test() {
+  local harness=$1
+  echo ""
+  echo "=== Testing $harness ==="
+
+  if ! check_binary "$harness"; then
+    yellow "  SKIP: $harness not found on PATH"
+    SKIP=$((SKIP + 1))
+    return
+  fi
+
+  local result=0
+  "test_$harness" || result=$?
+
+  if [ $result -eq 0 ]; then
+    PASS=$((PASS + 1))
+  else
+    FAIL=$((FAIL + 1))
+  fi
+}
+
+# ── Main ──────────────────────────────────────────────────────────────────────
+
+HARNESSES="${1:-claude codex opencode gemini}"
+
+echo "Harness Resume Smoke Tests"
+echo "=========================="
+
+for h in $HARNESSES; do
+  run_test "$h"
+done
+
+echo ""
+echo "=========================="
+echo "Results: $(green "$PASS pass"), $(red "$FAIL fail"), $(yellow "$SKIP skip")"
+
+if [ $FAIL -gt 0 ]; then
+  exit 1
+fi