@walwal-harness/cli 6.1.5 → 6.1.6

package/scripts/harness-wake.sh

@@ -11,6 +11,8 @@
 
 set -uo pipefail
 
+export PATH="$HOME/.local/bin:/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:${PATH:-}"
+
 LOG_DIR="${HOME}/.walwal-harness/logs"
 mkdir -p "$LOG_DIR"
 LOG="$LOG_DIR/wake.log"
@@ -57,14 +59,81 @@ find_tmux_session() {
   return 1
 }
 
+resolve_agent_bin() {
+  local executor="$1"
+  local env_name cand
+
+  case "$executor" in
+    codex)
+      env_name="${HARNESS_CODEX_BIN:-${CODEX_BIN:-}}"
+      ;;
+    claude|*)
+      env_name="${HARNESS_CLAUDE_BIN:-${CLAUDE_BIN:-}}"
+      executor="claude"
+      ;;
+  esac
+
+  for cand in "$env_name" "$HOME/.local/bin/$executor" "/opt/homebrew/bin/$executor" "/usr/local/bin/$executor"; do
+    [ -n "$cand" ] && [ -x "$cand" ] && { echo "$cand"; return 0; }
+  done
+
+  command -v "$executor" 2>/dev/null && return 0
+  return 1
+}
+
+run_conductor_fallback() {
+  local project_root="$1"
+  local reason="$2"
+  local tick="$project_root/scripts/conductor-tick.sh"
+  local progress="$project_root/.harness/progress.json"
+  local progress_set="$project_root/scripts/harness-progress-set.sh"
+  local before after status
+
+  [ "${HARNESS_WAKE_CONDUCTOR_FALLBACK:-1}" = "1" ] || return 0
+  [ -x "$tick" ] || return 0
+  [ -f "$progress" ] || return 0
+  command -v jq >/dev/null 2>&1 || return 0
+
+  before="$(jq -c '{current_agent,next_agent,agent_status,conductor:(.conductor.state // null),decision:(.meetings.decision // {})}' "$progress" 2>/dev/null || echo '{}')"
+
+  if [ -x "$progress_set" ] &&
+    jq -e '
+      (.meetings.decision.owner // "") != "" and
+      ((((.meetings.active // []) | length) > 0) or ((.meetings.decision.required_execution // null) != null))
+    ' "$progress" >/dev/null 2>&1 && {
+      [ "$(jq -r '.current_agent // ""' "$progress")" != "meeting-manager" ] ||
+      [ "$(jq -r '.agent_status // ""' "$progress")" != "completed" ];
+    }; then
+    bash "$progress_set" "$project_root" '
+      .current_agent = "meeting-manager" |
+      .agent_status = "completed" |
+      .conductor.state = "running" |
+      .conductor.current_action = "wake-meeting-decision-ready" |
+      .workflow.last_transition = (now | todate) |
+      .workflow.last_reason = "wake-meeting-decision-ready"
+    ' >/dev/null 2>&1 || true
+  fi
+
+  if bash "$tick" "$project_root" >/dev/null 2>&1; then
+    status="ok"
+  else
+    status="failed"
+  fi
+
+  after="$(jq -c '{current_agent,next_agent,agent_status,conductor:(.conductor.state // null),last_action:(.conductor.current_action // null)}' "$progress" 2>/dev/null || echo '{}')"
+  echo "$(date -u "+%Y-%m-%dT%H:%M:%SZ") | wake | conductor-fallback | $status | reason=$reason | before=$before | after=$after" >> "$project_root/.harness/progress.log"
+  say "conductor-fallback: $project_root ($status, reason=$reason)"
+}
+
 start_headless_tick() {
   local project_root="$1"
   local idle="$2"
   local force="$3"
   local review_path="$4"
-  local mode stamp wake_dir ops_dir prompt_rel log_rel prompt_path log_path pid_file old_pid pid status tmux_session
+  local mode executor agent_bin stamp wake_dir ops_dir prompt_rel log_rel prompt_path log_path pid_file old_pid pid status tmux_session session_name session_safe
 
   mode="${HARNESS_WAKE_MODE:-headless}"
+  executor="${HARNESS_WAKE_EXECUTOR:-claude}"
   stamp="$(date -u "+%Y%m%dT%H%M%SZ")"
   wake_dir="$project_root/.harness/actions/wake"
   ops_dir="$project_root/.harness/ops/wake"
@@ -105,7 +174,8 @@ Tasks:
 3. Treat the hourly review as Executive Meeting Minutes. Verify it contains CEO/COO/CTO/CQO/Service-Ops role positions, discussion, decision JSON, and action items.
 4. Check conductor state against the current GOAL and route the next department without waiting for Owner.
 5. If there is an active incident or operational warning, make sure meeting-manager has shared context and an action decision that names CTO/CQO/Service-Ops responsibilities.
-6. Append a short factual summary to .harness/progress.log and any normal harness artifacts used by this project.
+6. Split meaningful progress from paperwork-only artifacts in your summary.
+7. Append a short factual summary to .harness/progress.log and any normal harness artifacts used by this project.
 EOF
 
   case "$mode" in
@@ -113,16 +183,36 @@ EOF
       status="recorded"
       ;;
     headless|"")
-      if command -v claude >/dev/null 2>&1; then
+      if agent_bin="$(resolve_agent_bin "$executor")"; then
         (
           cd "$project_root" || exit 1
-          claude -p "$(cat "$prompt_path")" > "$log_path" 2>&1
+          if [ "$executor" = "codex" ]; then
+            "$agent_bin" exec -C "$project_root" "$(cat "$prompt_path")" > "$log_path" 2>&1
+          else
+            "$agent_bin" -p "$(cat "$prompt_path")" > "$log_path" 2>&1
+          fi
         ) &
         pid=$!
         echo "$pid" > "$pid_file"
-        status="spawned pid=$pid"
+        status="spawned executor=$executor pid=$pid"
       else
-        status="recorded claude-not-found"
+        status="BLOCKED_RUNTIME ${executor}-not-found"
+      fi
+      ;;
+    tmux)
+      if ! command -v tmux >/dev/null 2>&1; then
+        status="BLOCKED_RUNTIME tmux-not-found"
+      elif agent_bin="$(resolve_agent_bin "$executor")"; then
+        session_safe="$(basename "$project_root" | tr -c '[:alnum:]_' '_')"
+        session_name="walwal_${session_safe}_${stamp}"
+        if [ "$executor" = "codex" ]; then
+          tmux new-session -d -s "$session_name" "cd '$project_root' && '$agent_bin' exec -C '$project_root' - < '$prompt_path' 2>&1 | tee '$log_path'"
+        else
+          tmux new-session -d -s "$session_name" "cd '$project_root' && '$agent_bin' -p \"\$(cat '$prompt_path')\" 2>&1 | tee '$log_path'"
+        fi
+        status="spawned-tmux executor=$executor session=$session_name"
+      else
+        status="BLOCKED_RUNTIME ${executor}-not-found"
       fi
       ;;
     *)
@@ -130,8 +220,10 @@ EOF
       ;;
   esac
 
-  echo "$(date -u "+%Y-%m-%dT%H:%M:%SZ") | wake | headless | $status | idle=${idle}s | force=${force} | prompt=$prompt_rel | log=$log_rel" >> "$project_root/.harness/progress.log"
-  say "wake-headless: $project_root (idle ${idle}s, force=${force}, mode=${mode}) → $status $log_rel"
+  echo "$(date -u "+%Y-%m-%dT%H:%M:%SZ") | wake | agent-tick | $status | idle=${idle}s | force=${force} | mode=${mode} | prompt=$prompt_rel | log=$log_rel" >> "$project_root/.harness/progress.log"
+  say "wake-agent: $project_root (idle ${idle}s, force=${force}, mode=${mode}, executor=${executor}) → $status $log_rel"
+
+  run_conductor_fallback "$project_root" "$status"
 
   if tmux_session="$(find_tmux_session "$project_root" 2>/dev/null)"; then
     tmux display-message -t "$tmux_session" "walwal wake headless tick: $status ($log_rel)" 2>/dev/null || true

package/scripts/harness-worker-dispatch.sh

@@ -11,6 +11,7 @@ set -uo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 source "$SCRIPT_DIR/lib/harness-render-progress.sh"
+source "$SCRIPT_DIR/lib/harness-agent-resolver.sh"
 
 PROJECT_ROOT="$(resolve_harness_root "${1:-.}")" || exit 0
 PROGRESS="$PROJECT_ROOT/.harness/progress.json"
@@ -19,6 +20,8 @@ FEATURES="$PROJECT_ROOT/.harness/actions/feature-list.json"
 QUEUE="$PROJECT_ROOT/.harness/actions/feature-queue.json"
 WORKER_DIR="$PROJECT_ROOT/.harness/actions/workers"
 LOG_DIR="$PROJECT_ROOT/.harness/ops/workers"
+DISPATCH_LOCK="$PROJECT_ROOT/.harness/.worker-dispatch-lock"
+DISPATCH_LOCK_STALE_SEC="${DISPATCH_LOCK_STALE_SEC:-900}"
 
 [ -f "$PROGRESS" ] || exit 0
 [ -f "$CONFIG" ] || exit 0
@@ -28,27 +31,41 @@ command -v jq >/dev/null 2>&1 || exit 0
 
 mkdir -p "$WORKER_DIR" "$LOG_DIR"
 
+acquire_dispatch_lock() {
+  if mkdir "$DISPATCH_LOCK" 2>/dev/null; then
+    printf '%s\n' "$$" > "$DISPATCH_LOCK/pid"
+    printf '%s\n' "$(date +%s)" > "$DISPATCH_LOCK/created_at"
+    trap 'rm -rf "$DISPATCH_LOCK" 2>/dev/null || true' EXIT INT TERM
+    return 0
+  fi
+
+  local now created age holder
+  now="$(date +%s)"
+  created="$(cat "$DISPATCH_LOCK/created_at" 2>/dev/null || echo "$now")"
+  holder="$(cat "$DISPATCH_LOCK/pid" 2>/dev/null || echo unknown)"
+  age=$((now - created))
+  if [ "$age" -ge "$DISPATCH_LOCK_STALE_SEC" ]; then
+    rm -rf "$DISPATCH_LOCK" 2>/dev/null || true
+    if mkdir "$DISPATCH_LOCK" 2>/dev/null; then
+      printf '%s\n' "$$" > "$DISPATCH_LOCK/pid"
+      printf '%s\n' "$now" > "$DISPATCH_LOCK/created_at"
+      trap 'rm -rf "$DISPATCH_LOCK" 2>/dev/null || true' EXIT INT TERM
+      return 0
+    fi
+  fi
+
+  echo "$(date -u +%Y-%m-%dT%H:%M:%SZ) | conductor | worker-dispatch | skipped-locked | holder=${holder} age=${age}s" >> "$PROJECT_ROOT/.harness/progress.log"
+  echo "[]"
+  exit 0
+}
+
+acquire_dispatch_lock
+
 spawn_mode="$(jq -r '.company_mode.worker_spawn // "claude"' "$CONFIG" 2>/dev/null || echo claude)"
 pipeline="$(jq -r '.pipeline // "FULLSTACK"' "$PROGRESS" 2>/dev/null || echo FULLSTACK)"
 ts="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
 stamp="$(date -u +%Y%m%dT%H%M%SZ)"
 
-agent_for_feature() {
-  local fid="$1"
-  local layer service title
-  layer="$(jq -r --arg id "$fid" '.features[]? | select(.id == $id) | (.layer // .type // "")' "$FEATURES" 2>/dev/null | head -1)"
-  service="$(jq -r --arg id "$fid" '.features[]? | select(.id == $id) | (.service // "")' "$FEATURES" 2>/dev/null | head -1)"
-  title="$(jq -r --arg id "$fid" '.features[]? | select(.id == $id) | (.title // .name // .description // "")' "$FEATURES" 2>/dev/null | head -1)"
-  case "$(printf '%s %s %s' "$layer" "$service" "$title" | tr '[:upper:]' '[:lower:]')" in
-    *frontend*|*ui*|*web*|*react*|*next*) echo "generator-frontend" ;;
-    *design*|*token*|*component-spec*) echo "generator-designer" ;;
-    *devops*|*infra*|*deploy*|*ci*) echo "generator-devops" ;;
-    *)
-      if [ "$pipeline" = "FE-ONLY" ]; then echo "generator-frontend"; else echo "generator-backend"; fi
-      ;;
-  esac
-}
-
 build_prompt() {
   local team="$1" fid="$2" agent="$3" prompt_path="$4" log_path="$5"
   cat > "$prompt_path" <<EOF
@@ -103,12 +120,24 @@ i=0
 while [ "$i" -lt "$count" ]; do
   team="$(jq -r ".[$i].team" <<<"$pairs")"
   fid="$(jq -r ".[$i].feature" <<<"$pairs")"
-  agent="$(agent_for_feature "$fid")"
+  phase="$(jq -r --arg fid "$fid" '.queue.in_progress[$fid].phase // "gen"' "$QUEUE" 2>/dev/null || echo gen)"
+  agent="$(resolve_feature_agent "$PROJECT_ROOT" "$fid" "$phase" "$pipeline" 2>/dev/null || true)"
   prompt_rel=".harness/actions/workers/T${team}-${fid}-${stamp}.prompt.md"
   log_rel=".harness/ops/workers/T${team}-${fid}-${stamp}.log"
   prompt_path="$PROJECT_ROOT/$prompt_rel"
   log_path="$PROJECT_ROOT/$log_rel"
 
+  if [ -z "$agent" ]; then
+    reason="agent_resolution_failed phase=${phase}"
+    bash "$SCRIPT_DIR/harness-queue-manager.sh" fail "$fid" "$PROJECT_ROOT" >/dev/null 2>&1 || true
+    printf '%s\n' "$reason" > "$log_path"
+    jq -n --argjson team "$team" --arg feature "$fid" --arg phase "$phase" --arg status "blocked" --arg reason "$reason" \
+      '{team:$team, feature:$feature, phase:$phase, agent:null, prompt:null, log:null, status:$status, reason:$reason, pid:null}' >> "$dispatches_file"
+    echo "$ts | conductor | worker-dispatch | blocked | T${team}/${fid} | ${reason}" >> "$PROJECT_ROOT/.harness/progress.log"
+    i=$((i + 1))
+    continue
+  fi
+
   build_prompt "$team" "$fid" "$agent" "$prompt_path" "$log_path"
 
   pid="null"
@@ -123,22 +152,24 @@ while [ "$i" -lt "$count" ]; do
   fi
 
   tmpq="${QUEUE}.tmp.$$.$i"
-  jq --arg tid "$team" --arg agent "$agent" --arg prompt "$prompt_rel" --arg log "$log_rel" --arg status "$status" --argjson pid "$pid" --arg ts "$ts" '
+  jq --arg tid "$team" --arg agent "$agent" --arg phase "$phase" --arg prompt "$prompt_rel" --arg log "$log_rel" --arg status "$status" --argjson pid "$pid" --arg ts "$ts" '
     .teams[$tid].pid = $pid |
     .teams[$tid].agent = $agent |
+    .teams[$tid].phase = $phase |
     .teams[$tid].prompt = $prompt |
     .teams[$tid].log = $log |
     .teams[$tid].spawn_status = $status |
     .teams[$tid].started_at = $ts |
     .queue.in_progress[.teams[$tid].feature].agent = $agent |
+    .queue.in_progress[.teams[$tid].feature].phase = $phase |
     .queue.in_progress[.teams[$tid].feature].prompt = $prompt |
     .queue.in_progress[.teams[$tid].feature].log = $log |
     .queue.in_progress[.teams[$tid].feature].pid = $pid
   ' "$QUEUE" > "$tmpq" && mv "$tmpq" "$QUEUE"
 
-  jq -n --argjson team "$team" --arg feature "$fid" --arg agent "$agent" --arg prompt "$prompt_rel" --arg log "$log_rel" --arg status "$status" --argjson pid "$pid" \
-    '{team:$team, feature:$feature, agent:$agent, prompt:$prompt, log:$log, status:$status, pid:$pid}' >> "$dispatches_file"
-  echo "$ts | conductor | worker-dispatch | $status | T${team}/${fid} | $agent pid=$pid" >> "$PROJECT_ROOT/.harness/progress.log"
+  jq -n --argjson team "$team" --arg feature "$fid" --arg agent "$agent" --arg phase "$phase" --arg prompt "$prompt_rel" --arg log "$log_rel" --arg status "$status" --argjson pid "$pid" \
+    '{team:$team, feature:$feature, agent:$agent, phase:$phase, prompt:$prompt, log:$log, status:$status, pid:$pid}' >> "$dispatches_file"
+  echo "$ts | conductor | worker-dispatch | $status | T${team}/${fid} | $agent phase=$phase pid=$pid" >> "$PROJECT_ROOT/.harness/progress.log"
   i=$((i + 1))
 done
 

package/scripts/lib/harness-agent-resolver.sh

@@ -0,0 +1,127 @@
+#!/bin/bash
+# harness-agent-resolver.sh — canonical feature/phase → harness agent resolver
+#
+# Worker dispatch must not guess the department when Planner already wrote
+# owner_agents/applicable_eval_axes. This resolver is intentionally strict:
+# declared metadata wins; keyword fallback is only allowed when metadata is
+# absent.
+
+set -uo pipefail
+
+resolve_feature_agent() {
+  local project_root="$1" fid="$2" phase="${3:-gen}" pipeline="${4:-FULLSTACK}"
+  local features="$project_root/.harness/actions/feature-list.json"
+
+  [ -f "$features" ] || return 2
+  command -v jq >/dev/null 2>&1 || return 2
+
+  local feature_json
+  feature_json="$(jq -c --arg id "$fid" '.features[]? | select(.id == $id)' "$features" 2>/dev/null | head -1)"
+  [ -n "$feature_json" ] && [ "$feature_json" != "null" ] || return 3
+
+  case "$phase" in
+    eval|eval:*|evaluation|evaluator-*)
+      _resolve_eval_agent "$feature_json" "$phase"
+      return $?
+      ;;
+    *)
+      _resolve_generation_agent "$feature_json" "$pipeline"
+      return $?
+      ;;
+  esac
+}
+
+_resolve_generation_agent() {
+  local feature_json="$1" pipeline="$2"
+  local owner_count agent
+
+  owner_count="$(jq '(.owner_agents // []) | length' <<<"$feature_json")"
+  if [ "${owner_count:-0}" -gt 0 ]; then
+    agent="$(jq -r '
+      (.owner_agents // [])
+      | map(select(
+          . == "generator-backend" or
+          . == "generator-frontend" or
+          . == "generator-designer" or
+          . == "generator-devops"
+        ))
+      | .[0] // empty
+    ' <<<"$feature_json")"
+    [ -n "$agent" ] || return 4
+    echo "$agent"
+    return 0
+  fi
+
+  local layer service title text
+  layer="$(jq -r '(.layer // .type // "")' <<<"$feature_json")"
+  service="$(jq -r '(.service // "")' <<<"$feature_json")"
+  title="$(jq -r '(.title // .name // .description // "")' <<<"$feature_json")"
+  text="$(printf '%s %s %s' "$layer" "$service" "$title" | tr '[:upper:]' '[:lower:]')"
+
+  case "$text" in
+    *frontend*|*ui*|*web*|*react*|*next*) echo "generator-frontend" ;;
+    *design*|*token*|*component-spec*) echo "generator-designer" ;;
+    *devops*|*infra*|*deploy*|*ci*) echo "generator-devops" ;;
+    *)
+      if [ "$pipeline" = "FE-ONLY" ]; then echo "generator-frontend"; else echo "generator-backend"; fi
+      ;;
+  esac
+}
+
+_resolve_eval_agent() {
+  local feature_json="$1" phase="$2"
+  local requested_axis axes_count agent
+
+  requested_axis="${phase#eval:}"
+  requested_axis="${requested_axis#evaluator-}"
+  [ "$requested_axis" = "$phase" ] && requested_axis=""
+  [ "$requested_axis" = "eval" ] && requested_axis=""
+  [ "$requested_axis" = "evaluation" ] && requested_axis=""
+
+  axes_count="$(jq '(.applicable_eval_axes // []) | length' <<<"$feature_json")"
+  [ "${axes_count:-0}" -gt 0 ] || return 5
+
+  if [ -n "$requested_axis" ]; then
+    agent="$(_axis_to_evaluator "$requested_axis")" || return 6
+    jq -e --arg agent "$agent" '
+      def map_axis:
+        if . == "code-quality" or . == "code_quality" or . == "evaluator-code-quality" then "evaluator-code-quality"
+        elif . == "functional" or . == "evaluator-functional" then "evaluator-functional"
+        elif . == "visual" or . == "evaluator-visual" then "evaluator-visual"
+        elif . == "architecture" or . == "evaluator-architecture" then "evaluator-architecture"
+        elif . == "security" or . == "evaluator-security" then "evaluator-security"
+        else empty end;
+      (.applicable_eval_axes // []) | map(map_axis) | index($agent)
+    ' <<<"$feature_json" >/dev/null || return 7
+    echo "$agent"
+    return 0
+  fi
+
+  agent="$(jq -r '
+    def map_axis:
+      if . == "code-quality" or . == "code_quality" or . == "evaluator-code-quality" then "evaluator-code-quality"
+      elif . == "functional" or . == "evaluator-functional" then "evaluator-functional"
+      elif . == "visual" or . == "evaluator-visual" then "evaluator-visual"
+      elif . == "architecture" or . == "evaluator-architecture" then "evaluator-architecture"
+      elif . == "security" or . == "evaluator-security" then "evaluator-security"
+      else empty end;
+    (.applicable_eval_axes // []) | map(map_axis) | .[0] // empty
+  ' <<<"$feature_json")"
+  [ -n "$agent" ] || return 6
+  echo "$agent"
+}
+
+_axis_to_evaluator() {
+  case "$1" in
+    code-quality|code_quality|evaluator-code-quality) echo "evaluator-code-quality" ;;
+    functional|evaluator-functional) echo "evaluator-functional" ;;
+    visual|evaluator-visual) echo "evaluator-visual" ;;
+    architecture|evaluator-architecture) echo "evaluator-architecture" ;;
+    security|evaluator-security) echo "evaluator-security" ;;
+    *) return 1 ;;
+  esac
+}
+
+if [ "${BASH_SOURCE[0]}" = "$0" ]; then
+  resolve_feature_agent "${1:-.}" "${2:-}" "${3:-gen}" "${4:-FULLSTACK}"
+fi