@cyperx/clawforge 1.2.0

package/bin/parse-cost.sh

@@ -0,0 +1,205 @@
+#!/usr/bin/env bash
+# parse-cost.sh — Parse real cost/token data from agent output
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+source "${SCRIPT_DIR}/../lib/common.sh"
+
+usage() {
+  cat <<EOF
+Usage: clawforge parse-cost <id> [options]
+
+Parse token usage and cost from a running or completed agent's tmux output.
+Supports Claude Code and Codex output formats.
+
+Arguments:
+  <id>                 Task ID or short ID (or "all" for all running tasks)
+
+Options:
+  --lines <N>          Lines to scan from tmux (default: 200)
+  --update             Write parsed cost to registry costs.jsonl
+  --json               Output as JSON
+  --help               Show this help
+
+Examples:
+  clawforge parse-cost 1
+  clawforge parse-cost all --update
+  clawforge parse-cost 1 --json
+EOF
+}
+
+TASK_REF="" LINES=200 UPDATE=false JSON_OUTPUT=false
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --lines)   LINES="$2"; shift 2 ;;
+    --update)  UPDATE=true; shift ;;
+    --json)    JSON_OUTPUT=true; shift ;;
+    --help|-h) usage; exit 0 ;;
+    --*)       log_error "Unknown option: $1"; usage; exit 1 ;;
+    *)         TASK_REF="$1"; shift ;;
+  esac
+done
+
+[[ -z "$TASK_REF" ]] && { log_error "Task ID required"; usage; exit 1; }
+
+_ensure_registry
+COSTS_FILE="${CLAWFORGE_DIR}/registry/costs.jsonl"
+
+# Parse cost from captured output
+parse_cost_from_output() {
+  local output="$1"
+  local task_id="$2"
+
+  local total_cost=0
+  local input_tokens=0
+  local output_tokens=0
+  local total_tokens=0
+  local found=false
+
+  # Claude Code patterns:
+  # "Total cost: $1.23"
+  # "Cost: $0.45"
+  # "Input tokens: 12345"
+  # "Output tokens: 6789"
+  # "> Total cost: $X.XX"
+  # "Total input tokens: X"
+  local cost_match
+  cost_match=$(echo "$output" | grep -ioE '(total )?cost:?\s*\$[0-9]+\.[0-9]+' | tail -1 || true)
+  if [[ -n "$cost_match" ]]; then
+    total_cost=$(echo "$cost_match" | grep -oE '[0-9]+\.[0-9]+' | tail -1)
+    found=true
+  fi
+
+  local input_match
+  input_match=$(echo "$output" | grep -ioE '(total )?input tokens?:?\s*[0-9,]+' | tail -1 || true)
+  if [[ -n "$input_match" ]]; then
+    input_tokens=$(echo "$input_match" | grep -oE '[0-9,]+' | tail -1 | tr -d ',')
+    found=true
+  fi
+
+  local output_match
+  output_match=$(echo "$output" | grep -ioE '(total )?output tokens?:?\s*[0-9,]+' | tail -1 || true)
+  if [[ -n "$output_match" ]]; then
+    output_tokens=$(echo "$output_match" | grep -oE '[0-9,]+' | tail -1 | tr -d ',')
+    found=true
+  fi
+
+  # Codex patterns:
+  # "Tokens used: 12345"
+  # "API cost: $1.23"
+  if ! $found; then
+    local codex_cost
+    codex_cost=$(echo "$output" | grep -ioE 'api cost:?\s*\$[0-9]+\.[0-9]+' | tail -1 || true)
+    if [[ -n "$codex_cost" ]]; then
+      total_cost=$(echo "$codex_cost" | grep -oE '[0-9]+\.[0-9]+' | tail -1)
+      found=true
+    fi
+
+    local codex_tokens
+    codex_tokens=$(echo "$output" | grep -ioE 'tokens? used:?\s*[0-9,]+' | tail -1 || true)
+    if [[ -n "$codex_tokens" ]]; then
+      total_tokens=$(echo "$codex_tokens" | grep -oE '[0-9,]+' | tail -1 | tr -d ',')
+      found=true
+    fi
+  fi
+
+  # Calculate total tokens
+  if [[ "$total_tokens" -eq 0 ]]; then
+    total_tokens=$((input_tokens + output_tokens))
+  fi
+
+  if $found; then
+    jq -cn \
+      --arg id "$task_id" \
+      --argjson cost "$total_cost" \
+      --argjson input "$input_tokens" \
+      --argjson output "$output_tokens" \
+      --argjson total "$total_tokens" \
+      --argjson ts "$(epoch_ms)" \
+      '{taskId:$id, totalCost:$cost, inputTokens:$input, outputTokens:$output, totalTokens:$total, timestamp:$ts, source:"parsed"}'
+  else
+    echo ""
+  fi
+}
+
+# Process single task
+process_task() {
+  local task_ref="$1"
+  local task_data=""
+
+  if [[ "$task_ref" =~ ^[0-9]+$ ]]; then
+    task_data=$(jq -r --argjson sid "$task_ref" '.tasks[] | select(.short_id == $sid)' "$REGISTRY_FILE" 2>/dev/null || true)
+  fi
+  if [[ -z "$task_data" ]]; then
+    task_data=$(registry_get "$task_ref" 2>/dev/null || true)
+  fi
+  if [[ -z "$task_data" ]]; then
+    log_warn "Task '$task_ref' not found"
+    return 1
+  fi
+
+  local id=$(echo "$task_data" | jq -r '.id')
+  local sid=$(echo "$task_data" | jq -r '.short_id // 0')
+  local tmux_session=$(echo "$task_data" | jq -r '.tmuxSession // empty')
+  [[ -z "$tmux_session" ]] && tmux_session="agent-${id}"
+
+  # Capture tmux output
+  local output=""
+  if tmux has-session -t "$tmux_session" 2>/dev/null; then
+    output=$(tmux capture-pane -t "$tmux_session" -p -S "-${LINES}" 2>/dev/null || true)
+  fi
+
+  if [[ -z "$output" ]]; then
+    if $JSON_OUTPUT; then
+      jq -cn --arg id "$id" --argjson sid "$sid" '{taskId:$id, shortId:$sid, status:"no_output"}'
+    else
+      echo "  #${sid} ($id): no output available"
+    fi
+    return 0
+  fi
+
+  # Parse
+  local result
+  result=$(parse_cost_from_output "$output" "$id")
+
+  if [[ -z "$result" ]]; then
+    if $JSON_OUTPUT; then
+      jq -cn --arg id "$id" --argjson sid "$sid" '{taskId:$id, shortId:$sid, status:"no_cost_found"}'
+    else
+      echo "  #${sid} ($id): no cost data found in output"
+    fi
+    return 0
+  fi
+
+  # Update registry
+  if $UPDATE; then
+    echo "$result" >> "$COSTS_FILE"
+    local cost=$(echo "$result" | jq -r '.totalCost')
+    registry_update "$id" "cost" "\"$cost\"" 2>/dev/null || true
+    log_info "Updated cost for #${sid}: \$${cost}"
+  fi
+
+  if $JSON_OUTPUT; then
+    echo "$result"
+  else
+    local cost=$(echo "$result" | jq -r '.totalCost')
+    local tokens=$(echo "$result" | jq -r '.totalTokens')
+    echo "  #${sid} ($id): \$${cost} | ${tokens} tokens"
+  fi
+}
+
+# Process all or single
+if [[ "$TASK_REF" == "all" ]]; then
+  echo "── Parsing costs for all running tasks ──"
+  IDS=$(jq -r '.tasks[] | select(.status == "running" or .status == "spawned") | .id' "$REGISTRY_FILE" 2>/dev/null || true)
+  if [[ -z "$IDS" ]]; then
+    echo "No running tasks."
+    exit 0
+  fi
+  while IFS= read -r id; do
+    process_task "$id" || true
+  done <<< "$IDS"
+else
+  process_task "$TASK_REF"
+fi

package/bin/pr.sh

@@ -0,0 +1,167 @@
+#!/usr/bin/env bash
+# pr.sh — Create a PR from a task's branch
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+source "${SCRIPT_DIR}/../lib/common.sh"
+
+usage() {
+  cat <<EOF
+Usage: clawforge pr <id> [options]
+
+Create a GitHub PR from a task's branch. Auto-fills title and body from task data.
+
+Arguments:
+  <id>                 Task ID or short ID
+
+Options:
+  --title <text>       Override PR title (default: task description)
+  --body <text>        Override PR body
+  --draft              Create as draft PR
+  --base <branch>      Base branch (default: main)
+  --reviewers <list>   Comma-separated reviewer list
+  --labels <list>      Comma-separated label list
+  --dry-run            Show what would be created
+  --help               Show this help
+
+Examples:
+  clawforge pr 1
+  clawforge pr 1 --draft
+  clawforge pr 1 --reviewers alice,bob --labels enhancement
+EOF
+}
+
+TASK_REF="" TITLE="" BODY="" DRAFT=false BASE="" REVIEWERS="" LABELS="" DRY_RUN=false
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --title)      TITLE="$2"; shift 2 ;;
+    --body)       BODY="$2"; shift 2 ;;
+    --draft)      DRAFT=true; shift ;;
+    --base)       BASE="$2"; shift 2 ;;
+    --reviewers)  REVIEWERS="$2"; shift 2 ;;
+    --labels)     LABELS="$2"; shift 2 ;;
+    --dry-run)    DRY_RUN=true; shift ;;
+    --help|-h)    usage; exit 0 ;;
+    --*)          log_error "Unknown option: $1"; usage; exit 1 ;;
+    *)            TASK_REF="$1"; shift ;;
+  esac
+done
+
+[[ -z "$TASK_REF" ]] && { log_error "Task ID required"; usage; exit 1; }
+
+_ensure_registry
+
+# Resolve task
+TASK_DATA=""
+if [[ "$TASK_REF" =~ ^[0-9]+$ ]]; then
+  TASK_DATA=$(jq -r --argjson sid "$TASK_REF" '.tasks[] | select(.short_id == $sid)' "$REGISTRY_FILE" 2>/dev/null || true)
+fi
+if [[ -z "$TASK_DATA" ]]; then
+  TASK_DATA=$(registry_get "$TASK_REF" 2>/dev/null || true)
+fi
+if [[ -z "$TASK_DATA" ]]; then
+  log_error "Task '$TASK_REF' not found"
+  exit 1
+fi
+
+TASK_ID=$(echo "$TASK_DATA" | jq -r '.id')
+DESC=$(echo "$TASK_DATA" | jq -r '.description // "—"')
+BRANCH=$(echo "$TASK_DATA" | jq -r '.branch // empty')
+REPO=$(echo "$TASK_DATA" | jq -r '.repo // empty')
+WORKTREE=$(echo "$TASK_DATA" | jq -r '.worktree // empty')
+MODE=$(echo "$TASK_DATA" | jq -r '.mode // "sprint"')
+SHORT_ID=$(echo "$TASK_DATA" | jq -r '.short_id // 0')
+EXISTING_PR=$(echo "$TASK_DATA" | jq -r '.pr // empty')
+
+# Check for existing PR
+if [[ -n "$EXISTING_PR" && "$EXISTING_PR" != "null" ]]; then
+  log_warn "Task #${SHORT_ID} already has PR #${EXISTING_PR}"
+  echo "View: gh pr view $EXISTING_PR --repo $REPO"
+  exit 0
+fi
+
+if [[ -z "$BRANCH" ]]; then
+  log_error "No branch found for task #${SHORT_ID}"
+  exit 1
+fi
+
+# Use worktree or repo for git operations
+GIT_DIR=""
+if [[ -n "$WORKTREE" && -d "$WORKTREE" ]]; then
+  GIT_DIR="$WORKTREE"
+elif [[ -n "$REPO" && -d "$REPO" ]]; then
+  GIT_DIR="$REPO"
+else
+  log_error "Neither worktree nor repo directory found"
+  exit 1
+fi
+
+# Default title from task description
+[[ -z "$TITLE" ]] && TITLE="$DESC"
+
+# Default body
+if [[ -z "$BODY" ]]; then
+  BODY="## Task
+${DESC}
+
+## Details
+- Mode: ${MODE}
+- Task ID: #${SHORT_ID} (${TASK_ID})
+- Branch: ${BRANCH}
+
+_Created by ClawForge_"
+fi
+
+# Default base branch
+if [[ -z "$BASE" ]]; then
+  BASE=$(git -C "$GIT_DIR" symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's|refs/remotes/origin/||' || echo "main")
+fi
+
+# Ensure branch is pushed
+if ! git -C "$GIT_DIR" ls-remote --heads origin "$BRANCH" 2>/dev/null | grep -q "$BRANCH"; then
+  if $DRY_RUN; then
+    echo "[dry-run] Would push branch: $BRANCH"
+  else
+    log_info "Pushing branch $BRANCH..."
+    git -C "$GIT_DIR" push -u origin "$BRANCH" 2>/dev/null || {
+      log_error "Failed to push branch. Check if there are commits."
+      exit 1
+    }
+  fi
+fi
+
+# Build gh pr create args
+PR_ARGS=(--title "$TITLE" --body "$BODY" --base "$BASE" --head "$BRANCH")
+$DRAFT && PR_ARGS+=(--draft)
+[[ -n "$REVIEWERS" ]] && PR_ARGS+=(--reviewer "$REVIEWERS")
+[[ -n "$LABELS" ]] && PR_ARGS+=(--label "$LABELS")
+
+if $DRY_RUN; then
+  echo "=== PR Dry Run ==="
+  echo "  Task:      #${SHORT_ID}"
+  echo "  Title:     $TITLE"
+  echo "  Branch:    $BRANCH → $BASE"
+  echo "  Repo:      $GIT_DIR"
+  $DRAFT && echo "  Draft:     yes"
+  [[ -n "$REVIEWERS" ]] && echo "  Reviewers: $REVIEWERS"
+  [[ -n "$LABELS" ]] && echo "  Labels:    $LABELS"
+  echo ""
+  echo "Body:"
+  echo "$BODY"
+  exit 0
+fi
+
+# Create PR
+log_info "Creating PR..."
+PR_URL=$(gh pr create "${PR_ARGS[@]}" --repo "$REPO" 2>&1)
+PR_NUMBER=$(echo "$PR_URL" | grep -oE '[0-9]+$' || true)
+
+if [[ -n "$PR_NUMBER" ]]; then
+  registry_update "$TASK_ID" "pr" "$PR_NUMBER"
+  log_info "PR created: $PR_URL"
+fi
+
+echo ""
+echo "  #${SHORT_ID}  PR created: $PR_URL"
+echo ""

package/bin/resume.sh

@@ -0,0 +1,183 @@
+#!/usr/bin/env bash
+# resume.sh — Resume a failed/timeout/cancelled agent from where it left off
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+source "${SCRIPT_DIR}/../lib/common.sh"
+
+usage() {
+  cat <<EOF
+Usage: clawforge resume <id> [options]
+
+Resume a failed/timeout/cancelled task. Reuses the same worktree and branch,
+spawns a fresh tmux session, and injects last N lines of output as context.
+
+Arguments:
+  <id>                 Task ID or short ID
+
+Options:
+  --context-lines <N>  Lines of previous output to inject (default: 30)
+  --agent <name>       Override agent (claude/codex)
+  --model <model>      Override model
+  --message <msg>      Additional instructions for the resumed agent
+  --dry-run            Show what would happen
+  --help               Show this help
+
+Examples:
+  clawforge resume 1
+  clawforge resume 1 --message "Focus on fixing the test failures"
+  clawforge resume sprint-jwt --agent codex
+EOF
+}
+
+TASK_REF="" CONTEXT_LINES=30 AGENT_OVERRIDE="" MODEL_OVERRIDE="" MESSAGE="" DRY_RUN=false
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --context-lines) CONTEXT_LINES="$2"; shift 2 ;;
+    --agent)         AGENT_OVERRIDE="$2"; shift 2 ;;
+    --model)         MODEL_OVERRIDE="$2"; shift 2 ;;
+    --message)       MESSAGE="$2"; shift 2 ;;
+    --dry-run)       DRY_RUN=true; shift ;;
+    --help|-h)       usage; exit 0 ;;
+    --*)             log_error "Unknown option: $1"; usage; exit 1 ;;
+    *)               TASK_REF="$1"; shift ;;
+  esac
+done
+
+[[ -z "$TASK_REF" ]] && { log_error "Task ID required"; usage; exit 1; }
+
+_ensure_registry
+
+# Resolve task
+TASK_DATA=""
+if [[ "$TASK_REF" =~ ^[0-9]+$ ]]; then
+  TASK_DATA=$(jq -r --argjson sid "$TASK_REF" '.tasks[] | select(.short_id == $sid)' "$REGISTRY_FILE" 2>/dev/null || true)
+fi
+if [[ -z "$TASK_DATA" ]]; then
+  TASK_DATA=$(registry_get "$TASK_REF" 2>/dev/null || true)
+fi
+if [[ -z "$TASK_DATA" ]]; then
+  log_error "Task '$TASK_REF' not found"
+  exit 1
+fi
+
+TASK_ID=$(echo "$TASK_DATA" | jq -r '.id')
+STATUS=$(echo "$TASK_DATA" | jq -r '.status')
+DESC=$(echo "$TASK_DATA" | jq -r '.description')
+WORKTREE=$(echo "$TASK_DATA" | jq -r '.worktree // empty')
+BRANCH=$(echo "$TASK_DATA" | jq -r '.branch // empty')
+REPO=$(echo "$TASK_DATA" | jq -r '.repo // empty')
+AGENT=$(echo "$TASK_DATA" | jq -r '.agent // "claude"')
+MODEL=$(echo "$TASK_DATA" | jq -r '.model // "claude-sonnet-4-5"')
+TMUX_SESSION=$(echo "$TASK_DATA" | jq -r '.tmuxSession // empty')
+SHORT_ID=$(echo "$TASK_DATA" | jq -r '.short_id // 0')
+
+# Validate status is resumable
+case "$STATUS" in
+  failed|timeout|cancelled) ;;
+  running|spawned)
+    log_error "Task #${SHORT_ID} is still $STATUS. Use 'steer' instead."
+    exit 1 ;;
+  done)
+    log_error "Task #${SHORT_ID} is already done."
+    exit 1 ;;
+  *)
+    log_error "Task #${SHORT_ID} has status '$STATUS' — not resumable."
+    exit 1 ;;
+esac
+
+# Apply overrides
+[[ -n "$AGENT_OVERRIDE" ]] && AGENT="$AGENT_OVERRIDE"
+[[ -n "$MODEL_OVERRIDE" ]] && MODEL="$MODEL_OVERRIDE"
+
+# Check worktree still exists
+if [[ -z "$WORKTREE" || ! -d "$WORKTREE" ]]; then
+  log_error "Worktree not found: ${WORKTREE:-'(none)'}. Cannot resume — worktree was cleaned."
+  echo "Tip: Re-run as a fresh sprint instead."
+  exit 1
+fi
+
+# Kill old tmux session if lingering
+if [[ -n "$TMUX_SESSION" ]]; then
+  tmux kill-session -t "$TMUX_SESSION" 2>/dev/null || true
+fi
+[[ -z "$TMUX_SESSION" ]] && TMUX_SESSION="agent-${TASK_ID}"
+
+# Capture previous output for context
+PREV_OUTPUT=""
+if tmux has-session -t "$TMUX_SESSION" 2>/dev/null; then
+  PREV_OUTPUT=$(tmux capture-pane -t "$TMUX_SESSION" -p -S "-${CONTEXT_LINES}" 2>/dev/null || true)
+fi
+
+# Build resume prompt
+RESUME_PROMPT="You are resuming a previously ${STATUS} task.
+
+Original task: ${DESC}
+Branch: ${BRANCH}
+"
+
+if [[ -n "$PREV_OUTPUT" ]]; then
+  RESUME_PROMPT+="
+Previous session output (last ${CONTEXT_LINES} lines):
+\`\`\`
+${PREV_OUTPUT}
+\`\`\`
+"
+fi
+
+if [[ -n "$MESSAGE" ]]; then
+  RESUME_PROMPT+="
+Additional instructions: ${MESSAGE}
+"
+fi
+
+RESUME_PROMPT+="
+Continue from where the previous agent left off. Check git status and recent changes first.
+
+When complete:
+1. Commit your changes with a descriptive message
+2. Push the branch: git push origin ${BRANCH}
+3. Create a PR: gh pr create --fill --base main"
+
+# Dry run
+if $DRY_RUN; then
+  echo "=== Resume Dry Run ==="
+  echo "  Task:       #${SHORT_ID} ($TASK_ID)"
+  echo "  Status:     $STATUS → running"
+  echo "  Worktree:   $WORKTREE"
+  echo "  Branch:     $BRANCH"
+  echo "  Agent:      $AGENT ($MODEL)"
+  echo "  tmux:       $TMUX_SESSION"
+  echo "  Context:    ${CONTEXT_LINES} lines"
+  [[ -n "$MESSAGE" ]] && echo "  Message:    $MESSAGE"
+  echo ""
+  echo "Resume prompt preview:"
+  echo "$RESUME_PROMPT" | head -20
+  exit 0
+fi
+
+# Spawn fresh agent in existing worktree
+log_info "Resuming #${SHORT_ID} in $WORKTREE..."
+
+if [[ "$AGENT" == "claude" ]]; then
+  AGENT_CMD="claude --model ${MODEL} --dangerously-skip-permissions -p \"$(echo "$RESUME_PROMPT" | sed 's/"/\\"/g')\""
+else
+  AGENT_CMD="codex --model ${MODEL} --dangerously-bypass-approvals-and-sandbox \"$(echo "$RESUME_PROMPT" | sed 's/"/\\"/g')\""
+fi
+
+tmux new-session -d -s "$TMUX_SESSION" -c "$WORKTREE" "$AGENT_CMD"
+
+# Update registry
+registry_update "$TASK_ID" "status" '"running"'
+registry_update "$TASK_ID" "resumedAt" "$(epoch_ms)"
+RETRIES=$(echo "$TASK_DATA" | jq -r '.retries // 0')
+registry_update "$TASK_ID" "retries" "$((RETRIES + 1))"
+
+echo ""
+echo "  #${SHORT_ID}  resumed  $(basename "$REPO")  \"$(echo "$DESC" | head -c 50)\""
+echo ""
+echo "  Agent running in tmux: $TMUX_SESSION"
+echo "  Attach: clawforge attach $SHORT_ID"
+echo "  Steer:  clawforge steer $SHORT_ID \"<message>\""
+echo "  Logs:   clawforge logs $SHORT_ID"