@cyperx/clawforge 1.2.0

package/bin/clean.sh

@@ -0,0 +1,257 @@
+#!/usr/bin/env bash
+# clean.sh — Module 8: Clean up completed tasks (worktrees, tmux, registry)
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+source "${SCRIPT_DIR}/../lib/common.sh"
+
+CLEANUP_LOG="${CLAWFORGE_DIR}/registry/cleanup-log.jsonl"
+COMPLETED_TASKS="${CLAWFORGE_DIR}/registry/completed-tasks.jsonl"
+
+# ── Help ───────────────────────────────────────────────────────────────
+usage() {
+  cat <<EOF
+Usage: clean.sh [options]
+
+Options:
+  --task-id <id>      Clean a specific task
+  --all-done          Clean all tasks with status "done"
+  --stale-days <n>    Clean tasks older than N days
+  --force             Allow cleaning running tasks
+  --dry-run           Show what would be cleaned without doing it
+  --prune-days <n>    Remove archived tasks older than N days from registry
+  --keep-branch       Skip branch deletion after cleaning
+  --help              Show this help
+EOF
+}
+
+# ── Parse args ─────────────────────────────────────────────────────────
+TASK_ID="" ALL_DONE=false STALE_DAYS="" FORCE=false DRY_RUN=false PRUNE_DAYS="" KEEP_BRANCH=false
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --task-id)     TASK_ID="$2"; shift 2 ;;
+    --all-done)    ALL_DONE=true; shift ;;
+    --stale-days)  STALE_DAYS="$2"; shift 2 ;;
+    --force)       FORCE=true; shift ;;
+    --dry-run)     DRY_RUN=true; shift ;;
+    --prune-days)  PRUNE_DAYS="$2"; shift 2 ;;
+    --keep-branch) KEEP_BRANCH=true; shift ;;
+    --help|-h)     usage; exit 0 ;;
+    *)             log_error "Unknown option: $1"; usage; exit 1 ;;
+  esac
+done
+
+if [[ -z "$TASK_ID" ]] && ! $ALL_DONE && [[ -z "$STALE_DAYS" ]] && [[ -z "$PRUNE_DAYS" ]]; then
+  log_error "Specify --task-id, --all-done, or --stale-days"
+  usage
+  exit 1
+fi
+
+_ensure_registry
+mkdir -p "$(dirname "$CLEANUP_LOG")"
+
+# ── Clean one task ────────────────────────────────────────────────────
+clean_task() {
+  local id="$1"
+  local task_data
+  task_data=$(registry_get "$id")
+
+  if [[ -z "$task_data" ]]; then
+    log_warn "Task '$id' not found in registry"
+    return 1
+  fi
+
+  local status worktree tmux_session repo
+  status=$(echo "$task_data" | jq -r '.status')
+  worktree=$(echo "$task_data" | jq -r '.worktree // empty')
+  tmux_session=$(echo "$task_data" | jq -r '.tmuxSession // empty')
+  repo=$(echo "$task_data" | jq -r '.repo // empty')
+
+  # Safety check
+  if [[ "$status" == "running" || "$status" == "spawned" ]] && ! $FORCE; then
+    log_warn "Skipping '$id' — status is '$status' (use --force to override)"
+    return 1
+  fi
+
+  local cleaned_items=()
+
+  # Kill tmux session
+  if [[ -n "$tmux_session" ]]; then
+    if tmux has-session -t "$tmux_session" 2>/dev/null; then
+      if $DRY_RUN; then
+        echo "[dry-run] Would kill tmux session: $tmux_session"
+      else
+        tmux kill-session -t "$tmux_session" 2>/dev/null || true
+        log_info "Killed tmux session: $tmux_session"
+      fi
+      cleaned_items+=("tmux:$tmux_session")
+    fi
+  fi
+
+  # Remove worktree
+  if [[ -n "$worktree" && -d "$worktree" ]]; then
+    if $DRY_RUN; then
+      echo "[dry-run] Would remove worktree: $worktree"
+    else
+      if [[ -n "$repo" && -d "$repo" ]]; then
+        git -C "$repo" worktree remove "$worktree" --force 2>/dev/null || {
+          log_warn "git worktree remove failed, removing directory"
+          rm -rf "$worktree"
+        }
+      else
+        rm -rf "$worktree"
+      fi
+      log_info "Removed worktree: $worktree"
+    fi
+    cleaned_items+=("worktree:$worktree")
+  fi
+
+
+  # Delete merged branch
+  if ! $KEEP_BRANCH; then
+    local branch
+    branch=$(echo "$task_data" | jq -r '.branch // empty')
+    if [[ -n "$branch" && -n "$repo" && -d "$repo" ]]; then
+      # Only delete if merged into main/master
+      local main_branch
+      main_branch=$(git -C "$repo" symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's|refs/remotes/origin/||' || echo "main")
+      if git -C "$repo" branch --merged "$main_branch" 2>/dev/null | grep -qF "$branch"; then
+        if $DRY_RUN; then
+          echo "[dry-run] Would delete merged branch: $branch"
+        else
+          git -C "$repo" branch -d "$branch" 2>/dev/null || true
+          log_info "Deleted merged branch: $branch"
+        fi
+        cleaned_items+=("branch:$branch")
+      fi
+    fi
+  fi
+
+  # Update registry (archive instead of remove)
+  if $DRY_RUN; then
+    echo "[dry-run] Would archive task: $id"
+  else
+    registry_update "$id" "status" '"archived"'
+    registry_update "$id" "cleanedAt" "$(epoch_ms)"
+    log_info "Archived task: $id"
+  fi
+  cleaned_items+=("registry:$id")
+
+  # Log cleanup
+  if ! $DRY_RUN; then
+    local log_entry
+    log_entry=$(jq -cn \
+      --arg id "$id" \
+      --arg status "$status" \
+      --argjson timestamp "$(epoch_ms)" \
+      --argjson items "$(printf '%s\n' "${cleaned_items[@]}" | jq -R . | jq -s .)" \
+      '{timestamp: $timestamp, taskId: $id, previousStatus: $status, cleaned: $items}')
+    echo "$log_entry" >> "$CLEANUP_LOG"
+
+    # Append to completed-tasks history
+    local desc mode agent model started_at completed_at dur_min cost pr
+    desc=$(echo "$task_data" | jq -r '.description // "—"')
+    mode=$(echo "$task_data" | jq -r '.mode // "—"')
+    agent=$(echo "$task_data" | jq -r '.agent // "—"')
+    model=$(echo "$task_data" | jq -r '.model // "—"')
+    started_at=$(echo "$task_data" | jq -r '.startedAt // 0')
+    completed_at=$(echo "$task_data" | jq -r '.completedAt // 0')
+    dur_min=0
+    if [[ "$started_at" -gt 0 && "$completed_at" -gt 0 ]]; then
+      dur_min=$(( (completed_at - started_at) / 60000 ))
+    fi
+    cost=$(echo "$task_data" | jq -r '.cost // null')
+    pr=$(echo "$task_data" | jq -r '.pr // null')
+
+    local hist_entry
+    hist_entry=$(jq -cn \
+      --arg id "$id" \
+      --arg description "$desc" \
+      --arg mode "$mode" \
+      --arg status "$status" \
+      --arg agent "$agent" \
+      --arg model "$model" \
+      --arg repo "$(echo "$task_data" | jq -r '.repo // ""')" \
+      --argjson duration_minutes "$dur_min" \
+      --argjson completedAt "$(epoch_ms)" \
+      --argjson timestamp "$(epoch_ms)" \
+      '{id:$id, description:$description, mode:$mode, status:$status, agent:$agent, model:$model, repo:$repo, duration_minutes:$duration_minutes, completedAt:$completedAt, timestamp:$timestamp}')
+    # Add cost and pr only if they exist
+    [[ "$cost" != "null" ]] && hist_entry=$(echo "$hist_entry" | jq --arg c "$cost" '. + {cost:$c}')
+    [[ "$pr" != "null" ]] && hist_entry=$(echo "$hist_entry" | jq --arg p "$pr" '. + {pr:$p}')
+    echo "$hist_entry" >> "$COMPLETED_TASKS"
+  fi
+
+  echo "Cleaned: $id (${cleaned_items[*]})"
+}
+
+# ── Execute ──────────────────────────────────────────────────────────
+CLEANED=0
+
+if [[ -n "$TASK_ID" ]]; then
+  clean_task "$TASK_ID" && CLEANED=$((CLEANED + 1))
+fi
+
+if $ALL_DONE; then
+  DONE_IDS=$(jq -r '.tasks[] | select(.status == "done") | .id' "$REGISTRY_FILE" 2>/dev/null || true)
+  if [[ -n "$DONE_IDS" ]]; then
+    while IFS= read -r id; do
+      clean_task "$id" && CLEANED=$((CLEANED + 1)) || true
+    done <<< "$DONE_IDS"
+  else
+    log_info "No tasks with status 'done'"
+  fi
+fi
+
+if [[ -n "$STALE_DAYS" ]]; then
+  NOW_MS=$(epoch_ms)
+  STALE_MS=$((STALE_DAYS * 86400 * 1000))
+  CUTOFF=$((NOW_MS - STALE_MS))
+
+  STALE_IDS=$(jq -r --argjson cutoff "$CUTOFF" \
+    '.tasks[] | select(.startedAt < $cutoff and .status != "running" and .status != "spawned") | .id' \
+    "$REGISTRY_FILE" 2>/dev/null || true)
+
+  if $FORCE; then
+    STALE_IDS=$(jq -r --argjson cutoff "$CUTOFF" \
+      '.tasks[] | select(.startedAt < $cutoff) | .id' \
+      "$REGISTRY_FILE" 2>/dev/null || true)
+  fi
+
+  if [[ -n "$STALE_IDS" ]]; then
+    while IFS= read -r id; do
+      clean_task "$id" && CLEANED=$((CLEANED + 1)) || true
+    done <<< "$STALE_IDS"
+  else
+    log_info "No stale tasks older than $STALE_DAYS days"
+  fi
+fi
+
+echo ""
+echo "Total cleaned: $CLEANED"
+
+# ── Registry pruning ────────────────────────────────────────────────
+if [[ -n "$PRUNE_DAYS" ]]; then
+  NOW_MS=$(epoch_ms)
+  PRUNE_MS=$((PRUNE_DAYS * 86400 * 1000))
+  CUTOFF=$((NOW_MS - PRUNE_MS))
+
+  ARCHIVED_IDS=$(jq -r --argjson cutoff "$CUTOFF"     '.tasks[] | select(.status == "archived" and (.cleanedAt // 0) < $cutoff) | .id'     "$REGISTRY_FILE" 2>/dev/null || true)
+
+  if [[ -n "$ARCHIVED_IDS" ]]; then
+    local pruned=0
+    while IFS= read -r id; do
+      if $DRY_RUN; then
+        echo "[dry-run] Would prune archived task: $id"
+      else
+        registry_remove "$id"
+        log_info "Pruned archived task: $id"
+      fi
+      pruned=$((pruned + 1))
+    done <<< "$ARCHIVED_IDS"
+    echo "Pruned: $pruned archived tasks older than $PRUNE_DAYS days"
+  else
+    log_info "No archived tasks older than $PRUNE_DAYS days to prune"
+  fi
+fi

package/bin/config.sh

@@ -0,0 +1,111 @@
+#!/usr/bin/env bash
+# config.sh — Manage ClawForge user configuration
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+source "${SCRIPT_DIR}/../lib/common.sh"
+
+usage() {
+  cat <<EOF
+Usage: clawforge config <subcommand> [args]
+
+Manage user configuration at ~/.clawforge/config.json.
+User config overrides project defaults.
+
+Subcommands:
+  show                 Show all config (user + defaults)
+  get <key>            Get a config value
+  set <key> <value>    Set a config value
+  unset <key>          Remove a config key
+  init                 Create default user config with common settings
+  path                 Show config file path
+  --help               Show this help
+
+Common config keys:
+  default_agent        Default agent: claude or codex
+  default_model_claude Default Claude model
+  default_model_codex  Default Codex model
+  auto_clean           Auto-clean on completion (true/false)
+  default_timeout      Default timeout in minutes
+  max_agents           Default max parallel agents for swarm
+  routing              Default routing strategy (auto/cheap/quality)
+  review_models        Comma-separated models for multi-model review
+  disk_warn_gb         Disk space warning threshold
+  disk_error_gb        Disk space error threshold
+
+Examples:
+  clawforge config show
+  clawforge config set default_agent claude
+  clawforge config set auto_clean true
+  clawforge config set default_timeout 30
+  clawforge config set review_models "claude-sonnet-4-5,gpt-5.2-codex,claude-opus-4"
+  clawforge config init
+EOF
+}
+
+[[ $# -eq 0 ]] && { usage; exit 0; }
+
+case "$1" in
+  show)
+    config_list
+    ;;
+  get)
+    [[ -z "${2:-}" ]] && { log_error "Key required"; exit 1; }
+    val=$(config_get "$2" "")
+    if [[ -n "$val" ]]; then
+      echo "$val"
+    else
+      echo "(not set)"
+      exit 1
+    fi
+    ;;
+  set)
+    [[ -z "${2:-}" || -z "${3:-}" ]] && { log_error "Key and value required"; exit 1; }
+    config_set "$2" "$3"
+    echo "Set $2 = $3"
+    ;;
+  unset)
+    [[ -z "${2:-}" ]] && { log_error "Key required"; exit 1; }
+    mkdir -p "$(dirname "$USER_CONFIG_FILE")"
+    if [[ -f "$USER_CONFIG_FILE" ]]; then
+      tmp=$(mktemp)
+      jq --arg k "$2" 'del(.[$k])' "$USER_CONFIG_FILE" > "$tmp" && mv "$tmp" "$USER_CONFIG_FILE"
+      echo "Unset $2"
+    fi
+    ;;
+  init)
+    mkdir -p "$(dirname "$USER_CONFIG_FILE")"
+    if [[ -f "$USER_CONFIG_FILE" ]]; then
+      echo "Config already exists at $USER_CONFIG_FILE"
+      echo "Use 'clawforge config set' to modify individual values."
+      exit 0
+    fi
+    cat > "$USER_CONFIG_FILE" << 'INITJSON'
+{
+  "default_agent": "claude",
+  "default_model_claude": "claude-sonnet-4-5",
+  "default_model_codex": "gpt-5.3-codex",
+  "auto_clean": "false",
+  "default_timeout": "",
+  "max_agents": "3",
+  "routing": "",
+  "review_models": "claude-sonnet-4-5,gpt-5.2-codex",
+  "disk_warn_gb": "5",
+  "disk_error_gb": "1"
+}
+INITJSON
+    echo "Created config at $USER_CONFIG_FILE"
+    echo "Edit with: clawforge config set <key> <value>"
+    ;;
+  path)
+    echo "$USER_CONFIG_FILE"
+    ;;
+  --help|-h)
+    usage
+    ;;
+  *)
+    log_error "Unknown subcommand: $1"
+    usage
+    exit 1
+    ;;
+esac

package/bin/conflicts.sh

@@ -0,0 +1,224 @@
+#!/usr/bin/env bash
+# conflicts.sh — Swarm conflict resolution: detect overlapping file changes
+# Usage: clawforge conflicts [--json]
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+source "${SCRIPT_DIR}/../lib/common.sh"
+
+CONFLICTS_FILE="${CLAWFORGE_DIR}/registry/conflicts.jsonl"
+
+# ── Help ───────────────────────────────────────────────────────────────
+usage() {
+  cat <<EOF
+Usage: clawforge conflicts [options]
+
+Show and manage swarm file conflicts.
+
+Commands:
+  clawforge conflicts              Show current/recent conflicts
+  clawforge conflicts --check      Run conflict detection now
+  clawforge conflicts --resolve    Spawn coordinator to resolve conflicts
+
+Flags:
+  --check       Run conflict detection across active worktrees
+  --resolve     Spawn a coordinator agent to merge conflicting changes
+  --json        Output as JSON
+  --help        Show this help
+EOF
+}
+
+# ── Parse args ─────────────────────────────────────────────────────────
+CHECK=false RESOLVE=false JSON_OUTPUT=false
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --check)    CHECK=true; shift ;;
+    --resolve)  RESOLVE=true; shift ;;
+    --json)     JSON_OUTPUT=true; shift ;;
+    --help|-h)  usage; exit 0 ;;
+    --*)        log_error "Unknown option: $1"; usage; exit 1 ;;
+    *)          shift ;;
+  esac
+done
+
+mkdir -p "$(dirname "$CONFLICTS_FILE")"
+touch "$CONFLICTS_FILE"
+
+# ── Conflict detection ─────────────────────────────────────────────────
+_detect_conflicts() {
+  _ensure_registry
+  local running_tasks
+  running_tasks=$(jq -c '[.tasks[] | select(
+    (.status == "running" or .status == "spawned" or .status == "pr-created") and
+    .worktree != "" and .worktree != null
+  )]' "$REGISTRY_FILE" 2>/dev/null || echo "[]")
+
+  local task_count
+  task_count=$(echo "$running_tasks" | jq 'length' 2>/dev/null || echo 0)
+
+  if [[ "$task_count" -lt 2 ]]; then
+    if $JSON_OUTPUT; then
+      echo '{"conflicts":[],"message":"Need at least 2 active agents for conflict detection"}'
+    else
+      echo "No conflicts possible (fewer than 2 active agents)."
+    fi
+    return
+  fi
+
+  # Collect changed files per agent
+  local agent_files=()
+  local agent_ids=()
+  local i=0
+  while IFS= read -r task; do
+    local id worktree branch repo
+    id=$(echo "$task" | jq -r '.id')
+    worktree=$(echo "$task" | jq -r '.worktree')
+    branch=$(echo "$task" | jq -r '.branch')
+    repo=$(echo "$task" | jq -r '.repo')
+
+    local files=""
+    if [[ -d "$worktree" ]]; then
+      # Get changed files in worktree relative to base
+      files=$(git -C "$worktree" diff --name-only HEAD~1 2>/dev/null || \
+              git -C "$worktree" diff --name-only 2>/dev/null || true)
+    fi
+
+    # Also check files_touched from registry
+    local reg_files
+    reg_files=$(echo "$task" | jq -r '.files_touched // [] | .[]' 2>/dev/null || true)
+    if [[ -n "$reg_files" ]]; then
+      files=$(printf "%s\n%s" "$files" "$reg_files" | sort -u)
+    fi
+
+    agent_files[i]="$files"
+    agent_ids[i]="$id"
+    ((i++)) || true
+  done < <(echo "$running_tasks" | jq -c '.[]' 2>/dev/null)
+
+  # Compare file lists between all agent pairs
+  local conflict_count=0
+  local now
+  now=$(epoch_ms)
+
+  for ((a=0; a<i; a++)); do
+    for ((b=a+1; b<i; b++)); do
+      local overlap
+      overlap=$(comm -12 <(echo "${agent_files[a]}" | sort) <(echo "${agent_files[b]}" | sort) 2>/dev/null || true)
+      if [[ -n "$overlap" ]]; then
+        local overlap_json
+        overlap_json=$(echo "$overlap" | jq -R . | jq -s .)
+        local conflict_entry
+        conflict_entry=$(jq -cn \
+          --arg agent1 "${agent_ids[a]}" \
+          --arg agent2 "${agent_ids[b]}" \
+          --argjson files "$overlap_json" \
+          --argjson timestamp "$now" \
+          --arg status "detected" \
+          '{
+            agent1: $agent1,
+            agent2: $agent2,
+            overlapping_files: $files,
+            timestamp: $timestamp,
+            status: $status
+          }')
+        echo "$conflict_entry" >> "$CONFLICTS_FILE"
+        ((conflict_count++)) || true
+
+        if ! $JSON_OUTPUT; then
+          echo "  ⚠ Conflict: ${agent_ids[a]} ↔ ${agent_ids[b]}"
+          echo "$overlap" | sed 's/^/    /'
+          echo ""
+        fi
+
+        # Update registry with conflict info
+        registry_update "${agent_ids[a]}" "has_conflict" 'true' 2>/dev/null || true
+        registry_update "${agent_ids[b]}" "has_conflict" 'true' 2>/dev/null || true
+      fi
+    done
+  done
+
+  if $JSON_OUTPUT; then
+    local recent
+    recent=$(tail -20 "$CONFLICTS_FILE" | jq -s '.' 2>/dev/null || echo "[]")
+    echo "$recent" | jq --argjson count "$conflict_count" '{conflicts: ., new_conflicts: $count}'
+  elif [[ "$conflict_count" -eq 0 ]]; then
+    echo "No file conflicts detected."
+  else
+    echo "Detected $conflict_count conflict(s)."
+  fi
+}
+
+# ── Show conflicts ─────────────────────────────────────────────────────
+_show_conflicts() {
+  if [[ ! -s "$CONFLICTS_FILE" ]]; then
+    if $JSON_OUTPUT; then
+      echo '{"conflicts":[]}'
+    else
+      echo "No conflicts recorded."
+    fi
+    return
+  fi
+
+  if $JSON_OUTPUT; then
+    cat "$CONFLICTS_FILE" | jq -s '{
+      conflicts: .,
+      total: length,
+      detected: [.[] | select(.status == "detected")] | length,
+      resolved: [.[] | select(.status == "resolved")] | length
+    }'
+    return
+  fi
+
+  echo "=== Swarm Conflicts ==="
+  echo ""
+
+  local total detected resolved
+  total=$(wc -l < "$CONFLICTS_FILE" | tr -d ' ')
+  detected=$(grep -c '"detected"' "$CONFLICTS_FILE" 2>/dev/null || echo 0)
+  resolved=$(grep -c '"resolved"' "$CONFLICTS_FILE" 2>/dev/null || echo 0)
+
+  echo "  Total: $total  |  Detected: $detected  |  Resolved: $resolved"
+  echo ""
+
+  echo "  Recent conflicts:"
+  tail -10 "$CONFLICTS_FILE" | jq -r '"  [\(.timestamp | . / 1000 | strftime("%H:%M:%S"))] \(.agent1) ↔ \(.agent2) [\(.status)] — \(.overlapping_files | length) files"' 2>/dev/null || true
+}
+
+# ── Resolve conflicts ──────────────────────────────────────────────────
+_resolve_conflicts() {
+  local unresolved
+  unresolved=$(grep '"detected"' "$CONFLICTS_FILE" 2>/dev/null | tail -1 || true)
+
+  if [[ -z "$unresolved" ]]; then
+    echo "No unresolved conflicts to resolve."
+    return
+  fi
+
+  local agent1 agent2
+  agent1=$(echo "$unresolved" | jq -r '.agent1')
+  agent2=$(echo "$unresolved" | jq -r '.agent2')
+  local files
+  files=$(echo "$unresolved" | jq -r '.overlapping_files | join(", ")')
+
+  echo "Resolving conflict between $agent1 and $agent2"
+  echo "Overlapping files: $files"
+  echo ""
+  echo "Note: Automatic coordinator agent spawning requires both agents to be completed."
+  echo "Use 'clawforge steer' to manually coordinate or wait for completion."
+
+  # Mark as being resolved
+  local tmp
+  tmp=$(mktemp)
+  sed "s/\"agent1\":\"${agent1}\",\"agent2\":\"${agent2}\".*\"status\":\"detected\"/&/" "$CONFLICTS_FILE" > "$tmp"
+  mv "$tmp" "$CONFLICTS_FILE"
+}
+
+# ── Route ──────────────────────────────────────────────────────────────
+if $CHECK; then
+  _detect_conflicts
+elif $RESOLVE; then
+  _resolve_conflicts
+else
+  _show_conflicts
+fi