fix: remaining pipeline robustness — phase error handling, journal grep, Discord JSON safety, branch cleanup, configurable model/URL, remove local iteragent copy

Author: Patel230

.github/workflows/evolve.yml

@@ -20,21 +20,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: actions/checkout@v4
-        with:
-          repository: GrayCodeAI/iteragent
-          path: iteragent-pkg
-          fetch-depth: 0
-
       - uses: actions/setup-go@v5
         with:
           go-version: '1.25'
 
-      - name: Setup iteragent
-        run: |
-          mkdir -p ..
-          cp -r iteragent-pkg ../iteragent
-
       - name: Configure git
         run: |
           git config user.name "iterate-evolve[bot]"
@@ -43,9 +32,9 @@ jobs:
       - name: Run evolution
         env:
           OPENCODE_API_KEY: ${{ secrets.OPENCODE_API_KEY }}
-          OPENCODE_BASE_URL: https://opencode.ai/zen/go/v1
+          OPENCODE_BASE_URL: ${{ secrets.OPENCODE_BASE_URL || 'https://opencode.ai/zen/go/v1' }}
           ITERATE_PROVIDER: opencode
-          ITERATE_MODEL: kimi-k2.5
+          ITERATE_MODEL: ${{ secrets.ITERATE_MODEL || 'kimi-k2.5' }}
           GH_TOKEN: ${{ secrets.GH_PAT }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}

internal/evolution/phases.go

@@ -165,8 +165,13 @@ func (e *Engine) RunImplementPhase(ctx context.Context, p iteragent.Provider) er
 
 	// Commit any remaining tracked-file changes.
 	// Use git add -u (not -A) to avoid staging untracked artifacts from failed tasks.
+	sessionTitle := extractSessionTitle(plan)
+	finalMsg := "iterate: implement session changes"
+	if sessionTitle != "" {
+		finalMsg = "chore: " + sessionTitle
+	}
 	if _, err := e.runTool(ctx, "bash", map[string]string{
-		"cmd": "git add -u && git diff --cached --quiet || git commit -m 'iterate: implement session changes'",
+		"cmd": fmt.Sprintf("git add -u && git diff --cached --quiet || git commit -m %q", finalMsg),
 	}); err != nil {
 		e.logger.Warn("final commit failed", "err", err)
 	}

internal/evolution/phases_communicate.go

@@ -22,8 +22,8 @@ func (e *Engine) RunCommunicatePhase(ctx context.Context, p iteragent.Provider)
 
 	planBytes, err := os.ReadFile(filepath.Join(e.repoPath, "SESSION_PLAN.md"))
 	if err != nil {
-		e.logger.Warn("SESSION_PLAN.md not found, skipping communicate")
-		return nil
+		e.logger.Warn("SESSION_PLAN.md not found, writing fallback journal entry and skipping issue comments")
+		planBytes = []byte("")
 	}
 
 	day := e.readDayCount()
@@ -96,7 +96,10 @@ Rules:
 
 // persistJournalEntry writes the journal entry, generating a fallback if needed.
 func (e *Engine) persistJournalEntry(journalEntry string, day string) {
-	dayNum, _ := strconv.Atoi(day)
+	dayNum, err := strconv.Atoi(day)
+	if err != nil {
+		dayNum = 0
+	}
 	now := time.Now().UTC().Format("15:04")
 
 	if journalEntry == "" {

scripts/evolution/evolve.sh

@@ -96,7 +96,9 @@ rm -f "$PLAN_FILE"
 
 # ── Phase A: Planning ──
 log "Phase A: Planning..."
-./iterate --phase plan --gh-owner GrayCodeAI --gh-repo iterate 2>>"$LOG_FILE" || true
+if ! ./iterate --phase plan --gh-owner GrayCodeAI --gh-repo iterate 2>>"$LOG_FILE"; then
+  log "WARNING: plan phase exited with error — checking for fallback"
+fi
 
 # Fallback plan if agent didn't create one
 if [[ ! -f "$PLAN_FILE" ]]; then
@@ -134,15 +136,19 @@ fi
 # ── Phase B: Implementation ──
 log "Phase B: Implementation..."
 sleep 5  # Brief pause between phases
-./iterate --phase implement --gh-owner GrayCodeAI --gh-repo iterate 2>>"$LOG_FILE" || true
+if ! ./iterate --phase implement --gh-owner GrayCodeAI --gh-repo iterate 2>>"$LOG_FILE"; then
+  log "WARNING: implement phase exited with error — continuing to communicate"
+fi
 
 # ── Phase C: Communication ──
 log "Phase C: Communication..."
 sleep 5  # Brief pause between phases
-./iterate --phase communicate --gh-owner GrayCodeAI --gh-repo iterate 2>>"$LOG_FILE" || true
+if ! ./iterate --phase communicate --gh-owner GrayCodeAI --gh-repo iterate 2>>"$LOG_FILE"; then
+  log "WARNING: communicate phase exited with error"
+fi
 
 # ── Verify journal was written ──
-if grep -q "^## Day $DAY" "${REPOPATH}/docs/JOURNAL.md" 2>/dev/null; then
+if grep -qP "^## Day ${DAY}(\s|$|—)" "${REPOPATH}/docs/JOURNAL.md" 2>/dev/null || grep -q "^## Day ${DAY} " "${REPOPATH}/docs/JOURNAL.md" 2>/dev/null; then
   log "Journal entry written for Day $DAY"
 else
   log "WARNING: No journal entry found for Day $DAY — writing fallback"
@@ -319,11 +325,11 @@ gh api repos/"$GITHUB_REPO"/branches --jq '.[].name' 2>/dev/null | grep "^evolut
   if [[ "$branch" == "$BRANCH" ]]; then
     continue
   fi
-  # Check if branch's PR is merged or closed
-  PR_STATE=$(gh pr list --repo "$GITHUB_REPO" --head "$branch" --json state --jq '.[0].state' 2>/dev/null)
+  # Use gh pr view for reliable single-branch state (avoids race with gh pr list pagination)
+  PR_STATE=$(gh pr view --repo "$GITHUB_REPO" --json state --jq '.state' --head "$branch" 2>/dev/null || echo "")
   if [[ "$PR_STATE" == "MERGED" || "$PR_STATE" == "CLOSED" ]]; then
-    log "Deleting stale branch: $branch"
-    git push origin --delete "$branch" 2>/dev/null || true
+    log "Deleting stale branch: $branch (PR state: $PR_STATE)"
+    git push origin --delete "$branch" 2>/dev/null || log "Failed to delete branch: $branch"
   fi
 done
 
@@ -343,24 +349,23 @@ log "Duration: ${SESSION_DURATION}s"
 if [[ -n "${DISCORD_WEBHOOK_URL:-}" ]]; then
   log "Sending Discord notification..."
 
-  # Get journal entry for this day
-  JOURNAL_ENTRY=$(grep -A3 "^## Day $DAY" docs/JOURNAL.md 2>/dev/null | head -4 || echo "No journal entry")
-  
-  DISCORD_MSG="{
-    \"embeds\": [{
-      \"title\": \"🧬 Evolution Day $DAY Complete\",
-      \"color\": 5814783,
-      \"fields\": [
-        {\"name\": \"PR\", \"value\": \"${PR_NUMBER:-none}\", \"inline\": true},
-        {\"name\": \"Duration\", \"value\": \"${SESSION_DURATION}s\", \"inline\": true},
-        {\"name\": \"Commits\", \"value\": \"$(git log --oneline origin/main..HEAD 2>/dev/null | wc -l | tr -d ' ')\", \"inline\": true},
-        {\"name\": \"Journal\", \"value\": \"$(echo "$JOURNAL_ENTRY" | head -3 | tr '\n' ' ' | cut -c1-100)\"}
-      ],
-      \"footer\": {\"text\": \"iterate-evolve[bot]\"},
-      \"timestamp\": \"$(date -u +'%Y-%m-%dT%H:%M:%SZ')\"
-    }]
-  }"
-  
+  JOURNAL_ENTRY=$(grep -A3 "^## Day ${DAY} \|^## Day ${DAY}—" docs/JOURNAL.md 2>/dev/null | head -4 || echo "No journal entry")
+  COMMIT_COUNT=$(git log --oneline origin/main..HEAD 2>/dev/null | wc -l | tr -d ' ')
+
+  DISCORD_MSG=$(jq -n \
+    --arg title "🧬 Evolution Day $DAY Complete" \
+    --arg pr "${PR_NUMBER:-none}" \
+    --arg dur "${SESSION_DURATION}s" \
+    --arg commits "$COMMIT_COUNT" \
+    --arg journal "$(echo "$JOURNAL_ENTRY" | head -3 | tr '\n' ' ' | cut -c1-100)" \
+    --arg ts "$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \
+    '{embeds:[{title:$title,color:5814783,fields:[
+      {name:"PR",value:$pr,inline:true},
+      {name:"Duration",value:$dur,inline:true},
+      {name:"Commits",value:$commits,inline:true},
+      {name:"Journal",value:$journal}
+    ],footer:{text:"iterate-evolve[bot]"},timestamp:$ts}]}')
+
   curl -s -H "Content-Type: application/json" \
     -d "$DISCORD_MSG" \
     "$DISCORD_WEBHOOK_URL" >/dev/null 2>&1 || log "Discord notification failed"