deepflow 0.1.64 → 0.1.66

package/bin/deepflow-auto.sh

@@ -168,32 +168,28 @@ discover_specs() {
 # Context-monitored claude -p wrapper
 # ---------------------------------------------------------------------------
 
-# run_claude_monitored <working_dir> <prompt_text> [session_id]
+# run_claude_monitored <working_dir> <prompt_text>
 #
 # Runs `claude -p --output-format stream-json` and monitors token usage in
 # real time. If usage reaches CONTEXT_THRESHOLD_PCT% of the context window the
-# process is killed and automatically restarted with `--resume <session_id>` so
-# it gets a fresh context window.
+# process is killed and restarted with a fresh context (same prompt, clean
+# session). Prior work persists in the worktree via committed files.
 #
 # The final result text is written to stdout. A side-effect context.json is
 # written to <working_dir>/.deepflow/context.json for statusline consumption.
 run_claude_monitored() {
   local working_dir="$1"
   local prompt_text="$2"
-  local session_id="${3:-}"
 
   local result_tmp
   result_tmp="$(mktemp)"
   local error_log
   error_log="$(mktemp)"
 
-  # Outer loop: may restart with --resume when threshold is hit
+  # Outer loop: restart with fresh context when threshold is hit
   while true; do
     # Build command arguments
     local -a cmd_args=(claude -p --output-format stream-json --dangerously-skip-permissions)
-    if [[ -n "$session_id" ]]; then
-      cmd_args+=(--resume --session-id "$session_id")
-    fi
 
     # Accumulated token count and context window size across events
     local total_tokens=0
@@ -207,13 +203,8 @@ run_claude_monitored() {
     fifo_path="$(mktemp -u)"
     mkfifo "$fifo_path"
 
-    if [[ -n "$session_id" ]]; then
-      "${cmd_args[@]}" < /dev/null > "$fifo_path" 2>>"$error_log" &
-      claude_pid=$!
-    else
-      echo "$prompt_text" | "${cmd_args[@]}" > "$fifo_path" 2>>"$error_log" &
-      claude_pid=$!
-    fi
+    echo "$prompt_text" | "${cmd_args[@]}" > "$fifo_path" 2>>"$error_log" &
+    claude_pid=$!
 
     # Read the FIFO line-by-line (set +e to tolerate EINTR from signals)
     local capturing_result=false
@@ -304,12 +295,10 @@ run_claude_monitored() {
       : > "$error_log"
     fi
 
-    if [[ "$threshold_hit" == "true" && -n "$current_session_id" ]]; then
-      # Restart with --resume and the captured session_id
-      session_id="$current_session_id"
-      total_tokens=0
-      context_window=0
-      auto_log "Restarting claude -p with --resume session_id=${session_id}"
+    if [[ "$threshold_hit" == "true" ]]; then
+      # Restart with fresh context — the prompt is re-sent but prior work
+      # persists in the worktree (committed files, etc.)
+      auto_log "Restarting claude -p with fresh context (prior work is in worktree)"
       continue
     fi
 
@@ -1149,70 +1138,129 @@ generate_report() {
   # Build report
   # -----------------------------------------------------------------
   {
-    # Section 1: Resultado
-    echo "## Resultado"
+    # Header
+    echo "# deepflow auto report"
     echo ""
-    echo "Status: ${overall_status}"
+    echo "**Status:** ${overall_status}  "
+    echo "**Date:** $(date -u '+%Y-%m-%d %H:%M UTC')"
     echo ""
 
-    # Winner info (if converged)
-    if [[ "$overall_status" == "converged" ]]; then
-      for sname in "${all_spec_names[@]}"; do
-        local w="$(_spec_get WINNER "$sname")"
-        if [[ -n "$w" ]]; then
-          local summary=""
-          local winner_file="${PROJECT_ROOT}/.deepflow/selection/${sname}-winner.json"
-          if [[ -f "$winner_file" ]]; then
-            summary="$(grep -o '"winner"[[:space:]]*:[[:space:]]*"[^"]*"' "$winner_file" | sed 's/.*"\([^"]*\)".*/\1/')" || summary=""
+    # Per-spec details
+    for sname in "${all_spec_names[@]}"; do
+      local s="$(_spec_get STATUS "$sname" "unknown")"
+      local w="$(_spec_get WINNER "$sname")"
+
+      echo "---"
+      echo ""
+      echo "## ${sname}"
+      echo ""
+      echo "**Status:** ${s}"
+      if [[ -n "$w" ]]; then
+        echo "**Winner:** ${w}"
+      fi
+      echo ""
+
+      # Hypotheses
+      local hyp_file="${PROJECT_ROOT}/.deepflow/hypotheses/${sname}-cycle-0.json"
+      if [[ -f "$hyp_file" ]]; then
+        echo "### Hypotheses"
+        echo ""
+        # Parse each hypothesis slug + description
+        local slug_list hyp_list
+        slug_list="$(grep -o '"slug"[[:space:]]*:[[:space:]]*"[^"]*"' "$hyp_file" | sed 's/.*"\([^"]*\)".*/\1/')" || slug_list=""
+        hyp_list="$(grep -o '"hypothesis"[[:space:]]*:[[:space:]]*"[^"]*"' "$hyp_file" | sed 's/.*"hypothesis"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/')" || hyp_list=""
+
+        paste <(echo "$slug_list") <(echo "$hyp_list") | while IFS=$'\t' read -r hslug hhyp; do
+          [[ -z "$hslug" ]] && continue
+          echo "- **${hslug}:** ${hhyp}"
+        done
+        echo ""
+      fi
+
+      # Spike results
+      local has_spikes=false
+      for wt_dir in "${PROJECT_ROOT}/.deepflow/worktrees/${sname}-"*; do
+        [[ -d "$wt_dir" ]] || continue
+        local wt_slug
+        wt_slug="$(basename "$wt_dir")"
+        wt_slug="${wt_slug#${sname}-}"
+
+        local spike_yaml="${wt_dir}/.deepflow/results/spike-${wt_slug}.yaml"
+        if [[ -f "$spike_yaml" ]]; then
+          if [[ "$has_spikes" == "false" ]]; then
+            echo "### Spike Results"
+            echo ""
+            has_spikes=true
           fi
-          echo "Winner: ${w} (spec: ${sname})"
+          local spike_status spike_summary
+          spike_status="$(grep -m1 '^status:' "$spike_yaml" | sed 's/^status:[[:space:]]*//')" || spike_status="unknown"
+          spike_summary="$(grep -m1 '^summary:' "$spike_yaml" | sed 's/^summary:[[:space:]]*//')" || spike_summary=""
+          local status_icon="✅"
+          [[ "$spike_status" =~ fail ]] && status_icon="❌"
+          echo "- ${status_icon} **${wt_slug}** — ${spike_summary}"
         fi
       done
-      echo ""
-    fi
+      if [[ "$has_spikes" == "true" ]]; then
+        echo ""
+      fi
 
-    # Per-spec status table
-    echo "| Spec | Status | Winner |"
-    echo "|------|--------|--------|"
-    for sname in "${all_spec_names[@]}"; do
-      local s="$(_spec_get STATUS "$sname" "unknown")"
-      local w="$(_spec_get WINNER "$sname" "-")"
-      echo "| ${sname} | ${s} | ${w} |"
-    done
-    echo ""
+      # Selection rationale
+      local winner_file="${PROJECT_ROOT}/.deepflow/selection/${sname}-winner.json"
+      if [[ -f "$winner_file" ]]; then
+        echo "### Selection Rationale"
+        echo ""
 
-    # Section 2: Mudancas
-    echo "## Mudancas"
-    echo ""
+        # Parse rankings from winner file
+        local rankings
+        rankings="$(node -e "
+          try {
+            const d = JSON.parse(require('fs').readFileSync('${winner_file}','utf8'));
+            if (d.selection_output && d.selection_output.rankings) {
+              d.selection_output.rankings.forEach(r => {
+                const icon = r.rank === 1 ? '🏆' : '  ';
+                console.log(icon + ' **#' + r.rank + ' ' + r.slug + ':** ' + r.rationale);
+              });
+            }
+          } catch(e) {}
+        " 2>/dev/null)" || rankings=""
+
+        if [[ -n "$rankings" ]]; then
+          echo "$rankings"
+        fi
+        echo ""
+      fi
 
-    local has_changes=false
-    for sname in "${all_spec_names[@]}"; do
-      local w="$(_spec_get WINNER "$sname")"
+      # Changes (git diff stat)
       if [[ -n "$w" ]]; then
-        has_changes=true
         local branch_name="df/${sname}-${w}"
-        echo "### ${sname} (winner: ${w})"
+        echo "### Changes"
         echo ""
         echo '```'
-        git diff --stat "main...${branch_name}" 2>/dev/null || echo "(branch ${branch_name} not found)"
+        git -C "$PROJECT_ROOT" diff --stat "main...${branch_name}" 2>/dev/null || echo "(branch ${branch_name} not found)"
         echo '```'
         echo ""
       fi
     done
-    if [[ "$has_changes" == "false" ]]; then
-      echo "No changes selected"
-      echo ""
-    fi
 
-    # Section 3: Decisoes
-    echo "## Decisoes"
+    # Next steps
+    echo "---"
     echo ""
-
-    local decisions_log="${PROJECT_ROOT}/.deepflow/auto-decisions.log"
-    if [[ -f "$decisions_log" ]]; then
-      cat "$decisions_log"
+    echo "## Next Steps"
+    echo ""
+    if [[ "$overall_status" == "converged" ]]; then
+      for sname in "${all_spec_names[@]}"; do
+        local w="$(_spec_get WINNER "$sname")"
+        if [[ -n "$w" ]]; then
+          echo "To merge the winner:"
+          echo '```bash'
+          echo "git merge df/${sname}-${w}"
+          echo '```'
+        fi
+      done
+    elif [[ "$overall_status" == "in-progress" ]]; then
+      echo "Run \`deepflow auto --continue\` to resume."
     else
-      echo "No decisions logged"
+      echo "Review the spec and run \`deepflow auto\` again."
     fi
     echo ""
   } > "$report_file"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepflow",
-  "version": "0.1.64",
+  "version": "0.1.66",
   "description": "Stay in flow state - lightweight spec-driven task orchestration for Claude Code",
   "keywords": [
     "claude",