shipwright-cli 2.4.0 → 3.0.0

package/scripts/sw-code-review.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.4.0"
+VERSION="3.0.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -21,24 +21,6 @@ REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 [[ "$(type -t success 2>/dev/null)" == "function" ]] || success() { echo -e "\033[38;2;74;222;128m\033[1m✓\033[0m $*"; }
 [[ "$(type -t warn 2>/dev/null)" == "function" ]]    || warn()    { echo -e "\033[38;2;250;204;21m\033[1m⚠\033[0m $*"; }
 [[ "$(type -t error 2>/dev/null)" == "function" ]]   || error()   { echo -e "\033[38;2;248;113;113m\033[1m✗\033[0m $*" >&2; }
-if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
-  emit_event() {
-    local event_type="$1"; shift; mkdir -p "${HOME}/.shipwright"
-    local payload="{\"ts\":\"$(date -u +%Y-%m-%dT%H:%M:%SZ)\",\"type\":\"$event_type\""
-    while [[ $# -gt 0 ]]; do local key="${1%%=*}" val="${1#*=}"; payload="${payload},\"${key}\":\"${val}\""; shift; done
-    echo "${payload}}" >> "${HOME}/.shipwright/events.jsonl"
-  }
-fi
-CYAN="${CYAN:-\033[38;2;0;212;255m}"
-PURPLE="${PURPLE:-\033[38;2;124;58;237m}"
-BLUE="${BLUE:-\033[38;2;0;102;255m}"
-GREEN="${GREEN:-\033[38;2;74;222;128m}"
-YELLOW="${YELLOW:-\033[38;2;250;204;21m}"
-RED="${RED:-\033[38;2;248;113;113m}"
-DIM="${DIM:-\033[2m}"
-BOLD="${BOLD:-\033[1m}"
-RESET="${RESET:-\033[0m}"
-
 # ─── Configuration ───────────────────────────────────────────────────────
 REVIEW_CONFIG="${REPO_DIR}/.claude/code-review.json"
 QUALITY_METRICS_FILE="${REPO_DIR}/.claude/pipeline-artifacts/quality-metrics.json"
@@ -335,17 +317,16 @@ auto_fix() {
     local backup="${target_file}.review-backup"
     cp "$target_file" "$backup"
 
-    # Fix 1: Run shellcheck and capture warnings
-    if command -v shellcheck &>/dev/null; then
-        local shellcheck_fixes=0
+    # Report shellcheck issues (informational — auto-fix is limited to whitespace)
+    if command -v shellcheck >/dev/null 2>&1; then
         local warnings_file
         warnings_file=$(mktemp)
         shellcheck -f json "$target_file" > "$warnings_file" 2>/dev/null || true
 
         if [[ -s "$warnings_file" ]]; then
-            shellcheck_fixes=$(jq 'length' "$warnings_file" 2>/dev/null || echo "0")
-            info "shellcheck found $shellcheck_fixes issues in $target_file"
-            fixed=$((fixed + shellcheck_fixes))
+            local shellcheck_count
+            shellcheck_count=$(jq 'length' "$warnings_file" 2>/dev/null || echo "0")
+            [[ "$shellcheck_count" -gt 0 ]] && info "shellcheck found $shellcheck_count issues in $target_file (manual review recommended)"
         fi
         rm -f "$warnings_file"
     fi
@@ -381,7 +362,7 @@ run_claude_semantic_review() {
     local diff_content="$1"
     local requirements="${2:-}"
     [[ -z "$diff_content" ]] && return 0
-    if ! command -v claude &>/dev/null; then
+    if ! command -v claude >/dev/null 2>&1; then
         return 0
     fi
 
@@ -437,13 +418,12 @@ review_changes() {
     local review_output="{\"timestamp\":\"$(date -u +%Y-%m-%dT%H:%M:%SZ)\",\"scope\":\"$review_scope\",\"findings\":{}}"
     local total_issues=0
 
-    # Get changed files
+    # Get changed files (Bash 3.2 compatible — no mapfile)
     local changed_files=()
     if [[ "$review_scope" == "staged" ]]; then
-        mapfile -t changed_files < <(cd "$REPO_DIR" && git diff --cached --name-only 2>/dev/null || true)
+        while IFS= read -r _f; do [[ -n "$_f" ]] && changed_files+=("$_f"); done < <(cd "$REPO_DIR" && git diff --cached --name-only 2>/dev/null || true)
     else
-        # For PR: get diff against main
-        mapfile -t changed_files < <(cd "$REPO_DIR" && git diff main...HEAD --name-only 2>/dev/null || true)
+        while IFS= read -r _f; do [[ -n "$_f" ]] && changed_files+=("$_f"); done < <(cd "$REPO_DIR" && git diff main...HEAD --name-only 2>/dev/null || true)
     fi
 
     [[ ${#changed_files[@]} -eq 0 ]] && { success "No changes to review"; return 0; }
@@ -456,9 +436,9 @@ review_changes() {
         diff_content=$(cd "$REPO_DIR" && git diff main...HEAD 2>/dev/null || true)
     fi
     local semantic_issues=()
-    if [[ -n "$diff_content" ]] && command -v claude &>/dev/null; then
+    if [[ -n "$diff_content" ]] && command -v claude >/dev/null 2>&1; then
         info "Running Claude semantic review (logic, race conditions, API usage)..."
-        mapfile -t semantic_issues < <(run_claude_semantic_review "$diff_content" "${REVIEW_REQUIREMENTS:-}" || true)
+        while IFS= read -r _si; do [[ -n "$_si" ]] && semantic_issues+=("$_si"); done < <(run_claude_semantic_review "$diff_content" "${REVIEW_REQUIREMENTS:-}" || true)
         if [[ ${#semantic_issues[@]} -gt 0 ]]; then
             total_issues=$((total_issues + ${#semantic_issues[@]}))
             review_output=$(echo "$review_output" | jq --argjson arr "$(printf '%s\n' "${semantic_issues[@]}" | jq -R . | jq -s .)" '.semantic_findings = $arr' 2>/dev/null || echo "$review_output")
@@ -476,10 +456,10 @@ review_changes() {
         local arch_issues=()
         local style_issues=()
 
-        mapfile -t smells < <(detect_code_smells "$file_path")
-        mapfile -t solids < <(check_solid_principles "$file_path")
-        mapfile -t arch_issues < <(check_architecture_boundaries "$file_path")
-        mapfile -t style_issues < <(check_style_consistency "$file_path")
+        while IFS= read -r _s; do [[ -n "$_s" ]] && smells+=("$_s"); done < <(detect_code_smells "$file_path")
+        while IFS= read -r _s; do [[ -n "$_s" ]] && solids+=("$_s"); done < <(check_solid_principles "$file_path")
+        while IFS= read -r _s; do [[ -n "$_s" ]] && arch_issues+=("$_s"); done < <(check_architecture_boundaries "$file_path")
+        while IFS= read -r _s; do [[ -n "$_s" ]] && style_issues+=("$_s"); done < <(check_style_consistency "$file_path")
 
         local file_issues=$((${#smells[@]} + ${#solids[@]} + ${#arch_issues[@]} + ${#style_issues[@]}))
         total_issues=$((total_issues + file_issues))

package/scripts/sw-connect.sh

@@ -8,7 +8,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.4.0"
+VERSION="3.0.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # ─── Cross-platform compatibility ──────────────────────────────────────────
@@ -18,8 +18,11 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # Canonical helpers (colors, output, events)
 # shellcheck source=lib/helpers.sh
 [[ -f "$SCRIPT_DIR/lib/helpers.sh" ]] && source "$SCRIPT_DIR/lib/helpers.sh"
+[[ -f "$SCRIPT_DIR/lib/config.sh" ]] && source "$SCRIPT_DIR/lib/config.sh"
 # Fallbacks when helpers not loaded (e.g. test env with overridden SCRIPT_DIR)
 [[ "$(type -t info 2>/dev/null)" == "function" ]]    || info()    { echo -e "\033[38;2;0;212;255m\033[1m▸\033[0m $*"; }
+# Color fallbacks when helpers not loaded
+: "${CYAN:=}" "${BOLD:=}" "${RESET:=}" "${DIM:=}" "${GREEN:=}" "${RED:=}" "${YELLOW:=}" "${PURPLE:=}" "${WHITE:=}" "${BLUE:=}"
 [[ "$(type -t success 2>/dev/null)" == "function" ]] || success() { echo -e "\033[38;2;74;222;128m\033[1m✓\033[0m $*"; }
 [[ "$(type -t warn 2>/dev/null)" == "function" ]]    || warn()    { echo -e "\033[38;2;250;204;21m\033[1m⚠\033[0m $*"; }
 [[ "$(type -t error 2>/dev/null)" == "function" ]]   || error()   { echo -e "\033[38;2;248;113;113m\033[1m✗\033[0m $*" >&2; }
@@ -35,16 +38,6 @@ if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
     echo "${payload}}" >> "${HOME}/.shipwright/events.jsonl"
   }
 fi
-CYAN="${CYAN:-\033[38;2;0;212;255m}"
-PURPLE="${PURPLE:-\033[38;2;124;58;237m}"
-BLUE="${BLUE:-\033[38;2;0;102;255m}"
-GREEN="${GREEN:-\033[38;2;74;222;128m}"
-YELLOW="${YELLOW:-\033[38;2;250;204;21m}"
-RED="${RED:-\033[38;2;248;113;113m}"
-DIM="${DIM:-\033[2m}"
-BOLD="${BOLD:-\033[1m}"
-RESET="${RESET:-\033[0m}"
-
 # ─── Constants ──────────────────────────────────────────────────────────────
 SHIPWRIGHT_DIR="$HOME/.shipwright"
 PID_FILE="$SHIPWRIGHT_DIR/connect.pid"
@@ -53,7 +46,7 @@ DAEMON_PID_FILE="$SHIPWRIGHT_DIR/daemon.pid"
 DAEMON_STATE_FILE="$SHIPWRIGHT_DIR/daemon-state.json"
 EVENTS_FILE="$SHIPWRIGHT_DIR/events.jsonl"
 CONNECT_LOG="$SHIPWRIGHT_DIR/connect.log"
-DEFAULT_URL="http://localhost:8767"
+DEFAULT_URL="http://localhost:$(_config_get_int "dashboard.port" 8767)"
 HEARTBEAT_INTERVAL=10
 
 ensure_dir() {

package/scripts/sw-context.sh

@@ -6,9 +6,9 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.4.0"
+VERSION="3.0.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
+REPO_DIR="${SHIPWRIGHT_REPO_DIR:-$(cd "$SCRIPT_DIR/.." && pwd)}"
 
 # ─── Cross-platform compatibility ──────────────────────────────────────────
 # shellcheck source=lib/compat.sh
@@ -26,24 +26,6 @@ if [[ "$(type -t now_iso 2>/dev/null)" != "function" ]]; then
   now_iso()   { date -u +"%Y-%m-%dT%H:%M:%SZ"; }
   now_epoch() { date +%s; }
 fi
-if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
-  emit_event() {
-    local event_type="$1"; shift; mkdir -p "${HOME}/.shipwright"
-    local payload="{\"ts\":\"$(date -u +%Y-%m-%dT%H:%M:%SZ)\",\"type\":\"$event_type\""
-    while [[ $# -gt 0 ]]; do local key="${1%%=*}" val="${1#*=}"; payload="${payload},\"${key}\":\"${val}\""; shift; done
-    echo "${payload}}" >> "${HOME}/.shipwright/events.jsonl"
-  }
-fi
-CYAN="${CYAN:-\033[38;2;0;212;255m}"
-PURPLE="${PURPLE:-\033[38;2;124;58;237m}"
-BLUE="${BLUE:-\033[38;2;0;102;255m}"
-GREEN="${GREEN:-\033[38;2;74;222;128m}"
-YELLOW="${YELLOW:-\033[38;2;250;204;21m}"
-RED="${RED:-\033[38;2;248;113;113m}"
-DIM="${DIM:-\033[2m}"
-BOLD="${BOLD:-\033[1m}"
-RESET="${RESET:-\033[0m}"
-
 # ─── Paths ────────────────────────────────────────────────────────────────
 ARTIFACTS_DIR="${REPO_DIR}/.claude/pipeline-artifacts"
 CONTEXT_BUNDLE="${ARTIFACTS_DIR}/context-bundle.md"
@@ -124,7 +106,7 @@ extract_recent_prs() {
         return
     fi
 
-    if ! command -v gh &>/dev/null; then
+    if ! command -v gh >/dev/null 2>&1; then
         echo "(gh CLI not available, using git log)"
         echo ""
         local recent_commits
@@ -405,6 +387,7 @@ gather_context() {
 
     local tmp_file
     tmp_file=$(mktemp "${TMPDIR:-/tmp}/sw-context-bundle.XXXXXX")
+    trap "rm -f '$tmp_file'" RETURN
 
     # Write bundle header
     {
@@ -484,9 +467,9 @@ gather_context() {
 # ─── Show current bundle ───────────────────────────────────────────────────
 show_context() {
     if [[ ! -f "$CONTEXT_BUNDLE" ]]; then
-        warn "No context bundle found at ${CONTEXT_BUNDLE}"
-        echo "Run '${CYAN}shipwright context gather --goal \"...\" --stage plan${RESET}' first"
-        return 1
+        echo "Pipeline Context — No bundle generated yet"
+        echo "Run '${CYAN}shipwright context gather --goal \"...\" --stage plan${RESET}' to create one"
+        return 0
     fi
 
     cat "$CONTEXT_BUNDLE"
@@ -498,7 +481,7 @@ clear_context() {
         rm -f "$CONTEXT_BUNDLE"
         success "Context bundle cleared"
     else
-        warn "No context bundle to clear"
+        info "No context bundle to clear — already cleared"
     fi
 }
 
@@ -584,7 +567,7 @@ main() {
 
             # If issue provided, fetch from GitHub
             if [[ -n "$issue" ]]; then
-                if [[ "${NO_GITHUB:-}" == "true" ]] || ! command -v gh &>/dev/null; then
+                if [[ "${NO_GITHUB:-}" == "true" ]] || ! command -v gh >/dev/null 2>&1; then
                     goal="GitHub issue #$issue (fetch unavailable)"
                 else
                     goal=$(gh issue view "$issue" --json title,body --template '{{.title}}: {{.body}}' 2>/dev/null || echo "GitHub issue #$issue")

package/scripts/sw-cost.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.4.0"
+VERSION="3.0.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -34,16 +34,6 @@ if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
     echo "${payload}}" >> "${HOME}/.shipwright/events.jsonl"
   }
 fi
-CYAN="${CYAN:-\033[38;2;0;212;255m}"
-PURPLE="${PURPLE:-\033[38;2;124;58;237m}"
-BLUE="${BLUE:-\033[38;2;0;102;255m}"
-GREEN="${GREEN:-\033[38;2;74;222;128m}"
-YELLOW="${YELLOW:-\033[38;2;250;204;21m}"
-RED="${RED:-\033[38;2;248;113;113m}"
-DIM="${DIM:-\033[2m}"
-BOLD="${BOLD:-\033[1m}"
-RESET="${RESET:-\033[0m}"
-
 format_duration() {
     local secs="$1"
     if [[ "$secs" -ge 3600 ]]; then
@@ -153,13 +143,13 @@ cost_record() {
     cost_usd=$(cost_calculate "$input_tokens" "$output_tokens" "$model")
 
     # Try SQLite first
-    if type db_record_cost &>/dev/null; then
+    if type db_record_cost >/dev/null 2>&1; then
         db_record_cost "$input_tokens" "$output_tokens" "$model" "$stage" "$cost_usd" "$issue" 2>/dev/null || true
     fi
 
     # Always write to JSON (dual-write period)
     (
-        if command -v flock &>/dev/null; then
+        if command -v flock >/dev/null 2>&1; then
             flock -w 10 200 2>/dev/null || { warn "Cost lock timeout"; }
         fi
         local tmp_file
@@ -202,7 +192,7 @@ cost_check_budget() {
 
     # Try DB for budget info
     local budget_enabled budget_usd
-    if type db_get_budget &>/dev/null && type db_available &>/dev/null && db_available 2>/dev/null; then
+    if type db_get_budget >/dev/null 2>&1 && type db_available >/dev/null 2>&1 && db_available 2>/dev/null; then
         local db_budget
         db_budget=$(db_get_budget 2>/dev/null || true)
         if [[ -n "$db_budget" ]]; then
@@ -259,7 +249,7 @@ cost_remaining_budget() {
     ensure_cost_dir
 
     # Try DB for remaining budget (single query)
-    if type db_remaining_budget &>/dev/null && type db_available &>/dev/null && db_available 2>/dev/null; then
+    if type db_remaining_budget >/dev/null 2>&1 && type db_available >/dev/null 2>&1 && db_available 2>/dev/null; then
         local db_result
         db_result=$(db_remaining_budget 2>/dev/null || true)
         if [[ -n "$db_result" ]]; then
@@ -818,7 +808,7 @@ budget_set() {
     ensure_cost_dir
 
     # Write to DB if available
-    if type db_set_budget &>/dev/null; then
+    if type db_set_budget >/dev/null 2>&1; then
         db_set_budget "$amount" 2>/dev/null || true
     fi
 

package/scripts/sw-daemon.sh

@@ -9,7 +9,7 @@ trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 # Allow spawning Claude CLI from within a Claude Code session (daemon, fleet, etc.)
 unset CLAUDECODE 2>/dev/null || true
 
-VERSION="2.4.0"
+VERSION="3.0.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -20,6 +20,7 @@ REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 # Canonical helpers (colors, output, events)
 # shellcheck source=lib/helpers.sh
 [[ -f "$SCRIPT_DIR/lib/helpers.sh" ]] && source "$SCRIPT_DIR/lib/helpers.sh"
+[[ -f "$SCRIPT_DIR/lib/config.sh" ]] && source "$SCRIPT_DIR/lib/config.sh"
 # Fallbacks when helpers not loaded (e.g. test env with overridden SCRIPT_DIR)
 [[ "$(type -t info 2>/dev/null)" == "function" ]]    || info()    { echo -e "\033[38;2;0;212;255m\033[1m▸\033[0m $*"; }
 [[ "$(type -t success 2>/dev/null)" == "function" ]] || success() { echo -e "\033[38;2;74;222;128m\033[1m✓\033[0m $*"; }
@@ -29,23 +30,6 @@ if [[ "$(type -t now_iso 2>/dev/null)" != "function" ]]; then
   now_iso()   { date -u +"%Y-%m-%dT%H:%M:%SZ"; }
   now_epoch() { date +%s; }
 fi
-if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
-  emit_event() {
-    local event_type="$1"; shift; mkdir -p "${HOME}/.shipwright"
-    local payload="{\"ts\":\"$(date -u +%Y-%m-%dT%H:%M:%SZ)\",\"type\":\"$event_type\""
-    while [[ $# -gt 0 ]]; do local key="${1%%=*}" val="${1#*=}"; payload="${payload},\"${key}\":\"${val}\""; shift; done
-    echo "${payload}}" >> "${HOME}/.shipwright/events.jsonl"
-  }
-fi
-CYAN="${CYAN:-\033[38;2;0;212;255m}"
-PURPLE="${PURPLE:-\033[38;2;124;58;237m}"
-BLUE="${BLUE:-\033[38;2;0;102;255m}"
-GREEN="${GREEN:-\033[38;2;74;222;128m}"
-YELLOW="${YELLOW:-\033[38;2;250;204;21m}"
-RED="${RED:-\033[38;2;248;113;113m}"
-DIM="${DIM:-\033[2m}"
-BOLD="${BOLD:-\033[1m}"
-RESET="${RESET:-\033[0m}"
 
 # Policy (config/policy.json) — daemon defaults when daemon-config.json missing or silent
 [[ -f "$SCRIPT_DIR/lib/policy.sh" ]] && source "$SCRIPT_DIR/lib/policy.sh"
@@ -109,28 +93,6 @@ format_duration() {
     fi
 }
 
-# ─── Structured Event Log ──────────────────────────────────────────────────
-EVENTS_FILE="${HOME}/.shipwright/events.jsonl"
-
-emit_event() {
-    local event_type="$1"
-    shift
-    local json_fields=""
-    for kv in "$@"; do
-        local key="${kv%%=*}"
-        local val="${kv#*=}"
-        if [[ "$val" =~ ^-?[0-9]+\.?[0-9]*$ ]]; then
-            json_fields="${json_fields},\"${key}\":${val}"
-        else
-            local escaped_val
-            escaped_val=$(printf '%s' "$val" | jq -Rs '.' 2>/dev/null || printf '"%s"' "${val//\"/\\\"}")
-            json_fields="${json_fields},\"${key}\":${escaped_val}"
-        fi
-    done
-    mkdir -p "${HOME}/.shipwright"
-    echo "{\"ts\":\"$(now_iso)\",\"ts_epoch\":$(now_epoch),\"type\":\"${event_type}\"${json_fields}}" >> "$EVENTS_FILE"
-}
-
 # ─── Event Log Rotation ─────────────────────────────────────────────────────
 rotate_event_log() {
     local max_size=$((50 * 1024 * 1024))  # 50MB
@@ -167,8 +129,8 @@ rotate_event_log() {
 daemon_github_context() {
     # Skip if no GitHub
     [[ "${NO_GITHUB:-false}" == "true" ]] && return 0
-    type gh_repo_context &>/dev/null 2>&1 || return 0
-    type _gh_detect_repo &>/dev/null 2>&1 || return 0
+    type gh_repo_context >/dev/null 2>&1 || return 0
+    type _gh_detect_repo >/dev/null 2>&1 || return 0
 
     _gh_detect_repo 2>/dev/null || return 0
     local owner="${GH_OWNER:-}" repo="${GH_REPO:-}"
@@ -192,8 +154,8 @@ gh_retry() {
 
     while [[ $attempt -lt $max_retries ]]; do
         attempt=$((attempt + 1))
-        # Run the gh command; capture exit code
-        if output=$("$@" 2>&1); then
+        # Run the gh command with per-call timeout; capture exit code
+        if output=$(_timeout "$(_config_get_int "network.gh_timeout" 30 2>/dev/null || echo 30)" "$@" 2>&1); then
             echo "$output"
             return 0
         fi
@@ -227,17 +189,18 @@ LOG_DIR=""
 WORKTREE_DIR=""
 
 # Config defaults (overridden by daemon-config.json; policy overrides when present)
-WATCH_LABEL="ready-to-build"
-POLL_INTERVAL=60
-if type policy_get &>/dev/null 2>&1; then
+WATCH_LABEL="$(_config_get "labels.watch" "shipwright" 2>/dev/null || echo "shipwright")"
+POLL_INTERVAL=$(_config_get_int "daemon.poll_interval" 60 2>/dev/null || echo 60)
+if type policy_get >/dev/null 2>&1; then
     POLL_INTERVAL=$(policy_get ".daemon.poll_interval_seconds" "60")
 fi
-MAX_PARALLEL=2
+MAX_PARALLEL=$(_config_get_int "daemon.max_parallel" 4 2>/dev/null || echo 4)
+ISSUE_LIMIT=$(_config_get_int "daemon.issue_limit" 100 2>/dev/null || echo 100)
 PIPELINE_TEMPLATE="autonomous"
 SKIP_GATES=true
 MODEL="opus"
 BASE_BRANCH="main"
-ON_SUCCESS_REMOVE_LABEL="ready-to-build"
+ON_SUCCESS_REMOVE_LABEL="shipwright"
 ON_SUCCESS_ADD_LABEL="pipeline/complete"
 ON_SUCCESS_CLOSE_ISSUE=false
 ON_FAILURE_ADD_LABEL="pipeline/failed"
@@ -257,7 +220,7 @@ REPO_FILTER=""
 # Auto-scaling defaults (policy overrides when present)
 AUTO_SCALE=false
 AUTO_SCALE_INTERVAL=5
-if type policy_get &>/dev/null 2>&1; then
+if type policy_get >/dev/null 2>&1; then
     AUTO_SCALE_INTERVAL=$(policy_get ".daemon.auto_scale_interval_cycles" "5")
 fi
 MAX_WORKERS=8
@@ -280,7 +243,7 @@ PATROL_RETRY_THRESHOLD=2
 LAST_PATROL_EPOCH=0
 
 # Team dashboard coordination
-DASHBOARD_URL="${DASHBOARD_URL:-http://localhost:8767}"
+DASHBOARD_URL="${DASHBOARD_URL:-$(_config_get "dashboard.url" "http://localhost:8767" 2>/dev/null || echo "http://localhost:8767")}"
 
 # Runtime
 NO_GITHUB=false
@@ -370,7 +333,7 @@ show_help() {
     echo -e "  ${DIM}shipwright daemon patrol --once${RESET}               # Run patrol once and exit"
     echo ""
     echo -e "${BOLD}CONFIG FILE${RESET}  ${DIM}(.claude/daemon-config.json)${RESET}"
-    echo -e "  ${DIM}watch_label${RESET}         GitHub label to watch for         ${DIM}(default: ready-to-build)${RESET}"
+    echo -e "  ${DIM}watch_label${RESET}         GitHub label to watch for         ${DIM}(default: shipwright)${RESET}"
     echo -e "  ${DIM}poll_interval${RESET}       Seconds between polls             ${DIM}(default: 60)${RESET}"
     echo -e "  ${DIM}max_parallel${RESET}        Max concurrent pipeline jobs      ${DIM}(default: 2)${RESET}"
     echo -e "  ${DIM}pipeline_template${RESET}   Pipeline template to use          ${DIM}(default: autonomous)${RESET}"
@@ -411,16 +374,17 @@ load_config() {
 
     info "Loading config: ${DIM}${config_file}${RESET}"
 
-    WATCH_LABEL=$(jq -r '.watch_label // "ready-to-build"' "$config_file")
-    POLL_INTERVAL=$(jq -r '.poll_interval // '"$(type policy_get &>/dev/null 2>&1 && policy_get ".daemon.poll_interval_seconds" "60" || echo "60")"'' "$config_file")
+    WATCH_LABEL=$(jq -r '.watch_label // "shipwright"' "$config_file")
+    POLL_INTERVAL=$(jq -r '.poll_interval // '"$(type policy_get >/dev/null 2>&1 && policy_get ".daemon.poll_interval_seconds" "60" || echo "60")"'' "$config_file")
     MAX_PARALLEL=$(jq -r '.max_parallel // 2' "$config_file")
+    ISSUE_LIMIT=$(jq -r '.issue_limit // 100' "$config_file")
     PIPELINE_TEMPLATE=$(jq -r '.pipeline_template // "autonomous"' "$config_file")
     SKIP_GATES=$(jq -r '.skip_gates // true' "$config_file")
     MODEL=$(jq -r '.model // "opus"' "$config_file")
     BASE_BRANCH=$(jq -r '.base_branch // "main"' "$config_file")
 
     # on_success settings
-    ON_SUCCESS_REMOVE_LABEL=$(jq -r '.on_success.remove_label // "ready-to-build"' "$config_file")
+    ON_SUCCESS_REMOVE_LABEL=$(jq -r '.on_success.remove_label // "shipwright"' "$config_file")
     ON_SUCCESS_ADD_LABEL=$(jq -r '.on_success.add_label // "pipeline/complete"' "$config_file")
     ON_SUCCESS_CLOSE_ISSUE=$(jq -r '.on_success.close_issue // false' "$config_file")
 
@@ -472,12 +436,41 @@ load_config() {
 
     # self-optimization
     SELF_OPTIMIZE=$(jq -r '.self_optimize // false' "$config_file")
-    OPTIMIZE_INTERVAL=$(jq -r '.optimize_interval // '"$(type policy_get &>/dev/null 2>&1 && policy_get ".daemon.optimize_interval_cycles" "10" || echo "10")"'' "$config_file")
+    OPTIMIZE_INTERVAL=$(jq -r '.optimize_interval // '"$(type policy_get >/dev/null 2>&1 && policy_get ".daemon.optimize_interval_cycles" "10" || echo "10")"'' "$config_file")
 
-    # intelligence engine settings
-    INTELLIGENCE_ENABLED=$(jq -r '.intelligence.enabled // false' "$config_file")
+    # intelligence engine settings (default "auto" = enable when Claude CLI available)
+    INTELLIGENCE_ENABLED=$(jq -r '.intelligence.enabled // "auto"' "$config_file")
     INTELLIGENCE_CACHE_TTL=$(jq -r '.intelligence.cache_ttl_seconds // 3600' "$config_file")
-    COMPOSER_ENABLED=$(jq -r '.intelligence.composer_enabled // false' "$config_file")
+    COMPOSER_ENABLED=$(jq -r '.intelligence.composer_enabled // "auto"' "$config_file")
+
+    # Auto-enable intelligence when Claude is available (unless explicitly disabled)
+    if [[ "${INTELLIGENCE_ENABLED}" == "false" && "${INTELLIGENCE_EXPLICIT_DISABLE:-false}" != "true" ]]; then
+        if command -v claude &>/dev/null; then
+            INTELLIGENCE_ENABLED=true
+            type daemon_log &>/dev/null && daemon_log INFO "Intelligence auto-enabled (Claude CLI detected). Disable with intelligence.enabled=false in daemon-config.json"
+        fi
+    elif [[ "${INTELLIGENCE_ENABLED}" == "auto" ]]; then
+        if command -v claude &>/dev/null; then
+            INTELLIGENCE_ENABLED=true
+            type daemon_log &>/dev/null && daemon_log INFO "Intelligence enabled (auto: Claude CLI detected)"
+        else
+            INTELLIGENCE_ENABLED=false
+        fi
+    fi
+
+    # Auto-enable composer when Claude is available (unless explicitly disabled)
+    if [[ "${COMPOSER_ENABLED}" == "false" && "${COMPOSER_EXPLICIT_DISABLE:-false}" != "true" ]]; then
+        if command -v claude &>/dev/null; then
+            COMPOSER_ENABLED=true
+            type daemon_log &>/dev/null && daemon_log INFO "Composer auto-enabled (Claude CLI detected). Disable with intelligence.composer_enabled=false in daemon-config.json"
+        fi
+    elif [[ "${COMPOSER_ENABLED}" == "auto" ]]; then
+        if command -v claude &>/dev/null; then
+            COMPOSER_ENABLED=true
+        else
+            COMPOSER_ENABLED=false
+        fi
+    fi
     OPTIMIZATION_ENABLED=$(jq -r '.intelligence.optimization_enabled // false' "$config_file")
     PREDICTION_ENABLED=$(jq -r '.intelligence.prediction_enabled // false' "$config_file")
     ANOMALY_THRESHOLD=$(jq -r '.intelligence.anomaly_threshold // 3.0' "$config_file")
@@ -491,7 +484,7 @@ load_config() {
 
     # stale state reaper: clean old worktrees, artifacts, state entries
     STALE_REAPER_ENABLED=$(jq -r '.stale_reaper // true' "$config_file")
-    STALE_REAPER_INTERVAL=$(jq -r '.stale_reaper_interval // '"$(type policy_get &>/dev/null 2>&1 && policy_get ".daemon.stale_reaper_interval_cycles" "10" || echo "10")"'' "$config_file")
+    STALE_REAPER_INTERVAL=$(jq -r '.stale_reaper_interval // '"$(type policy_get >/dev/null 2>&1 && policy_get ".daemon.stale_reaper_interval_cycles" "10" || echo "10")"'' "$config_file")
     STALE_REAPER_AGE_DAYS=$(jq -r '.stale_reaper_age_days // 7' "$config_file")
 
     # priority lane settings
@@ -508,14 +501,14 @@ load_config() {
 
     # auto-scaling
     AUTO_SCALE=$(jq -r '.auto_scale // false' "$config_file")
-    AUTO_SCALE_INTERVAL=$(jq -r '.auto_scale_interval // '"$(type policy_get &>/dev/null 2>&1 && policy_get ".daemon.auto_scale_interval_cycles" "5" || echo "5")"'' "$config_file")
+    AUTO_SCALE_INTERVAL=$(jq -r '.auto_scale_interval // '"$(type policy_get >/dev/null 2>&1 && policy_get ".daemon.auto_scale_interval_cycles" "5" || echo "5")"'' "$config_file")
     MAX_WORKERS=$(jq -r '.max_workers // 8' "$config_file")
     MIN_WORKERS=$(jq -r '.min_workers // 1' "$config_file")
     WORKER_MEM_GB=$(jq -r '.worker_mem_gb // 4' "$config_file")
     EST_COST_PER_JOB=$(jq -r '.estimated_cost_per_job_usd // 5.0' "$config_file")
 
     # heartbeat + checkpoint recovery (policy fallback when config silent)
-    HEALTH_HEARTBEAT_TIMEOUT=$(jq -r '.health.heartbeat_timeout_s // '"$(type policy_get &>/dev/null 2>&1 && policy_get ".daemon.health_heartbeat_timeout" "120" || echo "120")"'' "$config_file")
+    HEALTH_HEARTBEAT_TIMEOUT=$(jq -r '.health.heartbeat_timeout_s // '"$(type policy_get >/dev/null 2>&1 && policy_get ".daemon.health_heartbeat_timeout" "120" || echo "120")"'' "$config_file")
     CHECKPOINT_ENABLED=$(jq -r '.health.checkpoint_enabled // true' "$config_file")
 
     # progress-based health monitoring (replaces static timeouts)
@@ -603,6 +596,18 @@ cleanup_on_exit() {
                 done <<< "$child_pids"
             fi
         fi
+
+        # Release claims on active issues before exit
+        local active_issues
+        active_issues=$(jq -r '.active_jobs[].issue // empty' "$STATE_FILE" 2>/dev/null || true)
+        if [[ -n "$active_issues" ]]; then
+            local machine_name
+            machine_name=$(jq -r '.machines[] | select(.role == "primary") | .name' "$HOME/.shipwright/machines.json" 2>/dev/null || hostname -s)
+            for issue_num in $active_issues; do
+                [[ -z "$issue_num" ]] && continue
+                release_claim "$issue_num" "$machine_name" 2>/dev/null || true
+            done
+        fi
     fi
 
     rm -f "$PID_FILE" "$SHUTDOWN_FLAG"
@@ -647,7 +652,7 @@ daemon_start() {
 
     # Detach mode: re-exec in a tmux session
     if [[ "$DETACH" == "true" ]]; then
-        if ! command -v tmux &>/dev/null; then
+        if ! command -v tmux >/dev/null 2>&1; then
             error "tmux required for --detach mode"
             exit 1
         fi
@@ -689,7 +694,7 @@ daemon_start() {
     rm -f "$SHUTDOWN_FLAG"
 
     # Initialize SQLite database (if available)
-    if type init_schema &>/dev/null; then
+    if type init_schema >/dev/null 2>&1; then
         init_schema 2>/dev/null || true
     fi
 
@@ -761,7 +766,7 @@ daemon_start() {
         if [[ -f "$STATE_FILE" ]]; then
             if ! jq '.' "$STATE_FILE" >/dev/null 2>&1; then
                 daemon_log WARN "Watchdog: state file corrupt — recovering from backup"
-                type validate_json &>/dev/null 2>&1 && validate_json "$STATE_FILE" || true
+                type validate_json >/dev/null 2>&1 && validate_json "$STATE_FILE" || true
             fi
         fi
     done
@@ -931,7 +936,7 @@ daemon_init() {
 
     cat > "$config_file" << 'CONFIGEOF'
 {
-  "watch_label": "ready-to-build",
+  "watch_label": "shipwright",
   "poll_interval": 60,
   "max_parallel": 2,
   "pipeline_template": "autonomous",
@@ -939,7 +944,7 @@ daemon_init() {
   "model": "opus",
   "base_branch": "main",
   "on_success": {
-    "remove_label": "ready-to-build",
+    "remove_label": "shipwright",
     "add_label": "pipeline/complete",
     "close_issue": false
   },
@@ -993,9 +998,9 @@ daemon_init() {
   "worker_mem_gb": 4,
   "estimated_cost_per_job_usd": 5.0,
   "intelligence": {
-    "enabled": true,
+    "enabled": "auto",
     "cache_ttl_seconds": 3600,
-    "composer_enabled": true,
+    "composer_enabled": "auto",
     "optimization_enabled": true,
     "prediction_enabled": true,
     "adversarial_enabled": false,
@@ -1052,7 +1057,7 @@ daemon_metrics() {
         exit 1
     fi
 
-    if ! command -v jq &>/dev/null; then
+    if ! command -v jq >/dev/null 2>&1; then
         error "jq is required for metrics. Install: brew install jq"
         exit 1
     fi