fix: Extract lib/issue-lifecycle.sh — claim, release, block, deps (#796)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
openhands
parent
52ae9ef307
commit
694fff5ebb
4 changed files with 383 additions and 2 deletions
|
|
@ -18,4 +18,6 @@ sourced as needed.
|
|||
| `lib/secret-scan.sh` | `scan_for_secrets()` — detects potential secrets (API keys, bearer tokens, private keys, URLs with embedded credentials) in text; returns 1 if secrets found. `redact_secrets()` — replaces detected secret patterns with `[REDACTED]`. | file-action-issue.sh, phase-handler.sh |
|
||||
| `lib/file-action-issue.sh` | `file_action_issue()` — dedup check, secret scan, label lookup, and issue creation for formula-driven cron wrappers. Sets `FILED_ISSUE_NUM` on success. Returns 4 if secrets detected in body. | (available for future use) |
|
||||
| `lib/tea-helpers.sh` | `tea_file_issue(title, body, labels...)` — create issue via tea CLI with secret scanning; sets `FILED_ISSUE_NUM`. `tea_relabel(issue_num, labels...)` — replace labels using tea's `edit` subcommand (not `label`). `tea_comment(issue_num, body)` — add comment with secret scanning. `tea_close(issue_num)` — close issue. All use `TEA_LOGIN` and `FORGE_REPO` from env.sh. Labels by name (no ID lookup). Tea binary download verified via sha256 checksum. Sourced by env.sh when `tea` binary is available. | env.sh (conditional) |
|
||||
| `lib/pr-lifecycle.sh` | Reusable PR lifecycle library: `pr_create()`, `pr_find_by_branch()`, `pr_poll_ci()`, `pr_poll_review()`, `pr_merge()`, `pr_is_merged()`, `pr_walk_to_merge()`, `build_phase_protocol_prompt()`. Requires `lib/ci-helpers.sh`. | dev-agent.sh (future), action-agent.sh (future) |
|
||||
| `lib/issue-lifecycle.sh` | Reusable issue lifecycle library: `issue_claim()` (add in-progress, remove backlog), `issue_release()` (remove in-progress, add backlog), `issue_block()` (post diagnostic comment with secret redaction, add blocked label), `issue_close()`, `issue_check_deps()` (parse deps, check transitive closure; sets `_ISSUE_BLOCKED_BY`, `_ISSUE_SUGGESTION`), `issue_suggest_next()` (find next unblocked backlog issue; sets `_ISSUE_NEXT`), `issue_post_refusal()` (structured refusal comment with dedup). Label IDs cached in globals on first lookup. Sources `lib/secret-scan.sh`. | dev-agent.sh (future), action-agent.sh (future) |
|
||||
| `lib/agent-session.sh` | Shared tmux + Claude session helpers: `create_agent_session()`, `inject_formula()`, `agent_wait_for_claude_ready()`, `agent_inject_into_session()`, `agent_kill_session()`, `monitor_phase_loop()`, `read_phase()`, `write_compact_context()`. `create_agent_session(session, workdir, [phase_file])` optionally installs a PostToolUse hook (matcher `Bash\|Write`) that detects phase file writes in real-time — when Claude writes to the phase file, the hook writes a marker so `monitor_phase_loop` reacts on the next poll instead of waiting for mtime changes. Also installs a StopFailure hook (matcher `rate_limit\|server_error\|authentication_failed\|billing_error`) that writes `PHASE:failed` with an `api_error` reason to the phase file and touches the phase-changed marker, so the orchestrator discovers API errors within one poll cycle instead of waiting for idle timeout. Also installs a SessionStart hook (matcher `compact`) that re-injects phase protocol instructions after context compaction — callers write the context file via `write_compact_context(phase_file, content)`, and the hook (`on-compact-reinject.sh`) outputs the file content to stdout so Claude retains critical instructions. When `phase_file` is set, passes it to the idle stop hook (`on-idle-stop.sh`) so the hook can **nudge Claude** (up to 2 times) if Claude returns to the prompt without writing to the phase file — the hook injects a tmux reminder asking Claude to signal PHASE:done or PHASE:awaiting_ci. The PreToolUse guard hook (`on-pretooluse-guard.sh`) receives the session name as a third argument — formula agents (`gardener-*`, `planner-*`, `predictor-*`, `supervisor-*`) are identified this way and allowed to access `FACTORY_ROOT` from worktrees (they need env.sh, AGENTS.md, formulas/, lib/). **OAuth flock**: when `DISINTO_CONTAINER=1`, Claude CLI is wrapped in `flock -w 300 ~/.claude/session.lock` to queue concurrent token refresh attempts and prevent rotation races across agents sharing the same credentials. `monitor_phase_loop` sets `_MONITOR_LOOP_EXIT` to one of: `done`, `idle_timeout`, `idle_prompt` (Claude returned to `>` for 3 consecutive polls without writing any phase — callback invoked with `PHASE:failed`, session already dead), `crashed`, or `PHASE:escalate` / other `PHASE:*` string. **Unified escalation**: `PHASE:escalate` is the signal that a session needs human input (renamed from `PHASE:needs_human`). **Callers must handle `idle_prompt`** in both their callback and their post-loop exit handler — see [`docs/PHASE-PROTOCOL.md` idle_prompt](docs/PHASE-PROTOCOL.md#idle_prompt-exit-reason) for the full contract. | dev-agent.sh, action-agent.sh |
|
||||
|
|
|
|||
377
lib/issue-lifecycle.sh
Normal file
377
lib/issue-lifecycle.sh
Normal file
|
|
@ -0,0 +1,377 @@
|
|||
#!/usr/bin/env bash
|
||||
# issue-lifecycle.sh — Reusable issue lifecycle library for agents
|
||||
#
|
||||
# Source after lib/env.sh:
|
||||
# source "$FACTORY_ROOT/lib/issue-lifecycle.sh"
|
||||
#
|
||||
# Required globals: FORGE_TOKEN, FORGE_API, FACTORY_ROOT
|
||||
#
|
||||
# Functions:
|
||||
# issue_claim ISSUE_NUMBER
|
||||
# issue_release ISSUE_NUMBER
|
||||
# issue_block ISSUE_NUMBER REASON [RESULT_TEXT]
|
||||
# issue_close ISSUE_NUMBER
|
||||
# issue_check_deps ISSUE_NUMBER
|
||||
# issue_suggest_next
|
||||
# issue_post_refusal ISSUE_NUMBER EMOJI TITLE BODY
|
||||
#
|
||||
# Output variables (set by issue_check_deps):
|
||||
# _ISSUE_BLOCKED_BY array of blocking issue numbers
|
||||
# _ISSUE_SUGGESTION suggested next issue number (or empty)
|
||||
#
|
||||
# Output variables (set by issue_suggest_next):
|
||||
# _ISSUE_NEXT next unblocked backlog issue number (or empty)
|
||||
#
|
||||
# shellcheck shell=bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# Source secret scanner for redacting text before posting to issues
|
||||
# shellcheck source=secret-scan.sh
|
||||
source "$(dirname "${BASH_SOURCE[0]}")/secret-scan.sh"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Internal log helper
|
||||
# ---------------------------------------------------------------------------
|
||||
_ilc_log() {
|
||||
if declare -f log >/dev/null 2>&1; then
|
||||
log "issue-lifecycle: $*"
|
||||
else
|
||||
printf '[%s] issue-lifecycle: %s\n' "$(date -u '+%Y-%m-%d %H:%M:%S UTC')" "$*" >&2
|
||||
fi
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Label ID caching — lookup once per name, cache in globals.
|
||||
# Pattern follows ci-helpers.sh (ensure_blocked_label_id).
|
||||
# ---------------------------------------------------------------------------
|
||||
_ILC_BACKLOG_ID=""
|
||||
_ILC_IN_PROGRESS_ID=""
|
||||
_ILC_BLOCKED_ID=""
|
||||
|
||||
# _ilc_ensure_label_id VARNAME LABEL_NAME [COLOR]
|
||||
# Generic: looks up label by name, creates if missing, caches in the named var.
|
||||
_ilc_ensure_label_id() {
|
||||
local varname="$1" name="$2" color="${3:-#e0e0e0}"
|
||||
local current
|
||||
eval "current=\"\${${varname}:-}\""
|
||||
if [ -n "$current" ]; then
|
||||
printf '%s' "$current"
|
||||
return 0
|
||||
fi
|
||||
local label_id
|
||||
label_id=$(forge_api GET "/labels" 2>/dev/null \
|
||||
| jq -r --arg n "$name" '.[] | select(.name == $n) | .id' 2>/dev/null || true)
|
||||
if [ -z "$label_id" ]; then
|
||||
label_id=$(curl -sf -X POST \
|
||||
-H "Authorization: token ${FORGE_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
"${FORGE_API}/labels" \
|
||||
-d "$(jq -nc --arg n "$name" --arg c "$color" '{name:$n,color:$c}')" 2>/dev/null \
|
||||
| jq -r '.id // empty' 2>/dev/null || true)
|
||||
fi
|
||||
if [ -n "$label_id" ]; then
|
||||
eval "${varname}=\"${label_id}\""
|
||||
fi
|
||||
printf '%s' "$label_id"
|
||||
}
|
||||
|
||||
_ilc_backlog_id() { _ilc_ensure_label_id _ILC_BACKLOG_ID "backlog" "#0075ca"; }
|
||||
_ilc_in_progress_id() { _ilc_ensure_label_id _ILC_IN_PROGRESS_ID "in-progress" "#1d76db"; }
|
||||
_ilc_blocked_id() { _ilc_ensure_label_id _ILC_BLOCKED_ID "blocked" "#e11d48"; }
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# issue_claim — add "in-progress" label, remove "backlog" label.
|
||||
# Args: issue_number
|
||||
# ---------------------------------------------------------------------------
|
||||
issue_claim() {
|
||||
local issue="$1"
|
||||
local ip_id bl_id
|
||||
ip_id=$(_ilc_in_progress_id)
|
||||
bl_id=$(_ilc_backlog_id)
|
||||
if [ -n "$ip_id" ]; then
|
||||
curl -sf -X POST \
|
||||
-H "Authorization: token ${FORGE_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
"${FORGE_API}/issues/${issue}/labels" \
|
||||
-d "{\"labels\":[${ip_id}]}" >/dev/null 2>&1 || true
|
||||
fi
|
||||
if [ -n "$bl_id" ]; then
|
||||
curl -sf -X DELETE \
|
||||
-H "Authorization: token ${FORGE_TOKEN}" \
|
||||
"${FORGE_API}/issues/${issue}/labels/${bl_id}" >/dev/null 2>&1 || true
|
||||
fi
|
||||
_ilc_log "claimed issue #${issue}"
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# issue_release — remove "in-progress" label, add "backlog" label.
|
||||
# Args: issue_number
|
||||
# ---------------------------------------------------------------------------
|
||||
issue_release() {
|
||||
local issue="$1"
|
||||
local ip_id bl_id
|
||||
ip_id=$(_ilc_in_progress_id)
|
||||
bl_id=$(_ilc_backlog_id)
|
||||
if [ -n "$ip_id" ]; then
|
||||
curl -sf -X DELETE \
|
||||
-H "Authorization: token ${FORGE_TOKEN}" \
|
||||
"${FORGE_API}/issues/${issue}/labels/${ip_id}" >/dev/null 2>&1 || true
|
||||
fi
|
||||
if [ -n "$bl_id" ]; then
|
||||
curl -sf -X POST \
|
||||
-H "Authorization: token ${FORGE_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
"${FORGE_API}/issues/${issue}/labels" \
|
||||
-d "{\"labels\":[${bl_id}]}" >/dev/null 2>&1 || true
|
||||
fi
|
||||
_ilc_log "released issue #${issue}"
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# issue_block — add "blocked" label, post diagnostic comment, remove in-progress.
|
||||
# Args: issue_number reason [result_text]
|
||||
# The result_text (e.g. tmux pane capture) is redacted for secrets before posting.
|
||||
# ---------------------------------------------------------------------------
|
||||
issue_block() {
|
||||
local issue="$1" reason="$2" result_text="${3:-}"
|
||||
|
||||
# Redact secrets from result text
|
||||
if [ -n "$result_text" ]; then
|
||||
result_text=$(redact_secrets "$result_text")
|
||||
fi
|
||||
|
||||
# Build diagnostic comment
|
||||
local comment
|
||||
comment="### Session failure diagnostic
|
||||
|
||||
| Field | Value |
|
||||
|---|---|
|
||||
| Exit reason | \`${reason}\` |
|
||||
| Timestamp | \`$(date -u +%Y-%m-%dT%H:%M:%SZ)\` |"
|
||||
|
||||
if [ -n "$result_text" ]; then
|
||||
comment="${comment}
|
||||
|
||||
<details><summary>Diagnostic output</summary>
|
||||
|
||||
\`\`\`
|
||||
${result_text}
|
||||
\`\`\`
|
||||
</details>"
|
||||
fi
|
||||
|
||||
# Post comment
|
||||
curl -sf -X POST \
|
||||
-H "Authorization: token ${FORGE_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
"${FORGE_API}/issues/${issue}/comments" \
|
||||
-d "$(jq -nc --arg b "$comment" '{body:$b}')" >/dev/null 2>&1 || true
|
||||
|
||||
# Remove in-progress, add blocked
|
||||
local ip_id bk_id
|
||||
ip_id=$(_ilc_in_progress_id)
|
||||
bk_id=$(_ilc_blocked_id)
|
||||
if [ -n "$ip_id" ]; then
|
||||
curl -sf -X DELETE \
|
||||
-H "Authorization: token ${FORGE_TOKEN}" \
|
||||
"${FORGE_API}/issues/${issue}/labels/${ip_id}" >/dev/null 2>&1 || true
|
||||
fi
|
||||
if [ -n "$bk_id" ]; then
|
||||
curl -sf -X POST \
|
||||
-H "Authorization: token ${FORGE_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
"${FORGE_API}/issues/${issue}/labels" \
|
||||
-d "{\"labels\":[${bk_id}]}" >/dev/null 2>&1 || true
|
||||
fi
|
||||
|
||||
_ilc_log "blocked issue #${issue}: ${reason}"
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# issue_close — PATCH state to closed.
|
||||
# Args: issue_number
|
||||
# ---------------------------------------------------------------------------
|
||||
issue_close() {
|
||||
local issue="$1"
|
||||
curl -sf -X PATCH \
|
||||
-H "Authorization: token ${FORGE_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
"${FORGE_API}/issues/${issue}" \
|
||||
-d '{"state":"closed"}' >/dev/null 2>&1 || true
|
||||
_ilc_log "closed issue #${issue}"
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# issue_check_deps — parse Depends-on from issue body, check transitive deps.
|
||||
# Args: issue_number
|
||||
# Sets: _ISSUE_BLOCKED_BY (array), _ISSUE_SUGGESTION (string or empty)
|
||||
# Returns: 0 if ready (all deps closed), 1 if blocked
|
||||
# ---------------------------------------------------------------------------
|
||||
# shellcheck disable=SC2034 # output vars read by callers
|
||||
issue_check_deps() {
|
||||
local issue="$1"
|
||||
_ISSUE_BLOCKED_BY=()
|
||||
_ISSUE_SUGGESTION=""
|
||||
|
||||
# Fetch issue body
|
||||
local issue_body
|
||||
issue_body=$(curl -sf -H "Authorization: token ${FORGE_TOKEN}" \
|
||||
"${FORGE_API}/issues/${issue}" | jq -r '.body // ""') || true
|
||||
|
||||
if [ -z "$issue_body" ]; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Extract dep numbers via shared parser
|
||||
local dep_numbers
|
||||
dep_numbers=$(printf '%s' "$issue_body" | bash "${FACTORY_ROOT}/lib/parse-deps.sh") || true
|
||||
|
||||
if [ -z "$dep_numbers" ]; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Check each direct dependency
|
||||
while IFS= read -r dep_num; do
|
||||
[ -z "$dep_num" ] && continue
|
||||
local dep_state
|
||||
dep_state=$(curl -sf -H "Authorization: token ${FORGE_TOKEN}" \
|
||||
"${FORGE_API}/issues/${dep_num}" | jq -r '.state // "unknown"') || true
|
||||
if [ "$dep_state" != "closed" ]; then
|
||||
_ISSUE_BLOCKED_BY+=("$dep_num")
|
||||
fi
|
||||
done <<< "$dep_numbers"
|
||||
|
||||
if [ "${#_ISSUE_BLOCKED_BY[@]}" -eq 0 ]; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Find suggestion: first open blocker whose own deps are all met
|
||||
local blocker
|
||||
for blocker in "${_ISSUE_BLOCKED_BY[@]}"; do
|
||||
local blocker_json blocker_state blocker_body
|
||||
blocker_json=$(curl -sf -H "Authorization: token ${FORGE_TOKEN}" \
|
||||
"${FORGE_API}/issues/${blocker}") || continue
|
||||
blocker_state=$(printf '%s' "$blocker_json" | jq -r '.state') || continue
|
||||
[ "$blocker_state" != "open" ] && continue
|
||||
|
||||
blocker_body=$(printf '%s' "$blocker_json" | jq -r '.body // ""')
|
||||
local blocker_deps
|
||||
blocker_deps=$(printf '%s' "$blocker_body" | bash "${FACTORY_ROOT}/lib/parse-deps.sh") || true
|
||||
|
||||
local blocker_blocked=false
|
||||
if [ -n "$blocker_deps" ]; then
|
||||
local bd
|
||||
while IFS= read -r bd; do
|
||||
[ -z "$bd" ] && continue
|
||||
local bd_state
|
||||
bd_state=$(curl -sf -H "Authorization: token ${FORGE_TOKEN}" \
|
||||
"${FORGE_API}/issues/${bd}" | jq -r '.state // "unknown"') || true
|
||||
if [ "$bd_state" != "closed" ]; then
|
||||
blocker_blocked=true
|
||||
break
|
||||
fi
|
||||
done <<< "$blocker_deps"
|
||||
fi
|
||||
|
||||
if [ "$blocker_blocked" = false ]; then
|
||||
_ISSUE_SUGGESTION="$blocker"
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
_ilc_log "issue #${issue} blocked by: ${_ISSUE_BLOCKED_BY[*]}$([ -n "$_ISSUE_SUGGESTION" ] && printf ', suggest #%s' "$_ISSUE_SUGGESTION")"
|
||||
return 1
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# issue_suggest_next — find next unblocked backlog issue.
|
||||
# Sets: _ISSUE_NEXT (string or empty)
|
||||
# Returns: 0 if found, 1 if none available
|
||||
# ---------------------------------------------------------------------------
|
||||
# shellcheck disable=SC2034 # output vars read by callers
|
||||
issue_suggest_next() {
|
||||
_ISSUE_NEXT=""
|
||||
|
||||
local issues_json
|
||||
issues_json=$(curl -sf -H "Authorization: token ${FORGE_TOKEN}" \
|
||||
"${FORGE_API}/issues?state=open&labels=backlog&limit=20&type=issues") || true
|
||||
|
||||
if [ -z "$issues_json" ] || [ "$issues_json" = "null" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
local issue_nums
|
||||
issue_nums=$(printf '%s' "$issues_json" | jq -r '.[].number') || true
|
||||
|
||||
local num
|
||||
while IFS= read -r num; do
|
||||
[ -z "$num" ] && continue
|
||||
local body dep_nums
|
||||
body=$(printf '%s' "$issues_json" | \
|
||||
jq -r --argjson n "$num" '.[] | select(.number == $n) | .body // ""')
|
||||
dep_nums=$(printf '%s' "$body" | bash "${FACTORY_ROOT}/lib/parse-deps.sh") || true
|
||||
|
||||
local all_met=true
|
||||
if [ -n "$dep_nums" ]; then
|
||||
local dep
|
||||
while IFS= read -r dep; do
|
||||
[ -z "$dep" ] && continue
|
||||
local dep_state
|
||||
dep_state=$(curl -sf -H "Authorization: token ${FORGE_TOKEN}" \
|
||||
"${FORGE_API}/issues/${dep}" | jq -r '.state // "open"') || dep_state="open"
|
||||
if [ "$dep_state" != "closed" ]; then
|
||||
all_met=false
|
||||
break
|
||||
fi
|
||||
done <<< "$dep_nums"
|
||||
fi
|
||||
|
||||
if [ "$all_met" = true ]; then
|
||||
_ISSUE_NEXT="$num"
|
||||
_ilc_log "next unblocked issue: #${num}"
|
||||
return 0
|
||||
fi
|
||||
done <<< "$issue_nums"
|
||||
|
||||
_ilc_log "no unblocked backlog issues found"
|
||||
return 1
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# issue_post_refusal — post structured refusal comment with dedup check.
|
||||
# Args: issue_number emoji title body
|
||||
# ---------------------------------------------------------------------------
|
||||
issue_post_refusal() {
|
||||
local issue="$1" emoji="$2" title="$3" body="$4"
|
||||
|
||||
# Dedup: skip if recent comments already contain this title
|
||||
local last_has_title
|
||||
last_has_title=$(curl -sf -H "Authorization: token ${FORGE_TOKEN}" \
|
||||
"${FORGE_API}/issues/${issue}/comments?limit=5" | \
|
||||
jq -r --arg t "Dev-agent: ${title}" \
|
||||
'[.[] | .body // ""] | any(contains($t)) | tostring') || true
|
||||
if [ "$last_has_title" = "true" ]; then
|
||||
_ilc_log "skipping duplicate refusal comment: ${title}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
local comment tmpfile
|
||||
comment="${emoji} **Dev-agent: ${title}**
|
||||
|
||||
${body}
|
||||
|
||||
---
|
||||
*Automated assessment by dev-agent · $(date -u '+%Y-%m-%d %H:%M UTC')*"
|
||||
|
||||
tmpfile=$(mktemp /tmp/ilc-refusal-XXXXXX.txt)
|
||||
printf '%s' "$comment" > "$tmpfile"
|
||||
jq -Rs '{body: .}' < "$tmpfile" > "${tmpfile}.json"
|
||||
curl -sf -o /dev/null -X POST \
|
||||
-H "Authorization: token ${FORGE_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
"${FORGE_API}/issues/${issue}/comments" \
|
||||
--data-binary @"${tmpfile}.json" 2>/dev/null || \
|
||||
_ilc_log "WARNING: failed to post refusal comment on issue #${issue}"
|
||||
rm -f "$tmpfile" "${tmpfile}.json"
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue