Merge branch 'master' into claude/eager-goldberg-fhHjL

Author: duyet

.github/workflows/lint.yml

@@ -1,13 +1,17 @@
+---
 name: Lint
 
-on: # yamllint disable-line rule:truthy
+# yamllint disable rule:truthy
+"on":
   push:
     branches:
       - main
+      - master
       - "claude/**"
   pull_request:
     branches:
       - main
+      - master
 
 permissions: {}
 
@@ -23,12 +27,32 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        # actions/checkout v4.2.2
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
           persist-credentials: false
 
       - name: Super-linter
-        uses: super-linter/super-linter@v8.6.0
+        # super-linter v8.6.0
+        uses: super-linter/super-linter@9e863354e3ff62e0727d37183162c4a88873df41
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DEFAULT_BRANCH: master
+          VALIDATE_ALL_CODEBASE: false
+          VALIDATE_BASH: true
+          VALIDATE_BASH_EXEC: true
+          VALIDATE_CHECKOV: true
+          VALIDATE_GITHUB_ACTIONS: true
+          VALIDATE_GITHUB_ACTIONS_ZIZMOR: true
+          VALIDATE_GITLEAKS: true
+          VALIDATE_GIT_MERGE_CONFLICT_MARKERS: true
+          VALIDATE_JSON: true
+          VALIDATE_JSON_PRETTIER: true
+          VALIDATE_MARKDOWN: true
+          VALIDATE_MARKDOWN_PRETTIER: true
+          VALIDATE_RENOVATE: true
+          VALIDATE_SHELL_SHFMT: true
+          VALIDATE_TRIVY: true
+          VALIDATE_YAML: true
+          VALIDATE_YAML_PRETTIER: true

README.md

@@ -97,6 +97,15 @@ This repository also ships Codex plugin metadata in place:
 # Detects main/master, creates feature/X branch, implements, creates PR
 ```
 
+### PR Babysitting with /goal
+```bash
+# Set a persistent goal to babysit a PR — auto-fix CI, address reviews, wait for green
+/goal /github:babysit-pr https://github.com/duyet/clickhouse-monitoring/pull/1355
+
+# With auto-merge and CI fixing
+/goal /github:babysit-pr --pr 1355 --auto-merge --fix-ci
+```
+
 ---
 
 ## Plugins at a Glance

github/commands/babysit-pr.md

@@ -1,43 +1,80 @@
 ---
-allowed-tools: Bash(git *), Bash(gh *), Read, Edit, Write, Glob, Grep, Agent
-description: Babysit a PR - monitor, fix review bot suggestions, resolve conflicts, and merge when ready
+allowed-tools: Bash(git *), Bash(gh *), Read, Edit, Write, Glob, Grep, Agent, Task(general-purpose,code-review)
+description: Babysit a PR - monitor, auto-fix review comments, ensure CI is green, handle auto-merge, and merge when ready
 ---
 
 # Babysit PR
 
-Continuously monitor a pull request, read AI review bot comments (CodeRabbit, Sourcery, Gemini), fix suggested issues, resolve merge conflicts, and merge when ready. Reports total effort at completion.
+Continuously monitor a pull request with intelligent automation:
+- **Auto-address code review comments** from AI bots (CodeRabbit, Sourcery, Gemini) and human reviewers
+- **Auto-fix CI failures** by analyzing logs, fixing issues, and retrying
+- **Keep PR in green state** by monitoring CI checks and resolving blockers
+- **Smart merge handling** for repos with auto-merge enabled
+- **Effort tracking** — reports total fixes, conflicts, and duration at completion
+
+This command **always** ensures the PR CI is green before considering the job done. It will auto-fix CI failures, auto-address all review comments (from bots and humans), and **wait** until everything is green — CI checks passing, no unresolved review comments, no merge conflicts. Do not stop the loop until all conditions are met or max iterations is reached.
 
 ## Usage
 
 ```bash
 /github:babysit-pr
 /github:babysit-pr --pr 123
 /github:babysit-pr --auto-merge
+/github:babysit-pr --fix-ci                    # Auto-fix CI failures
+/github:babysit-pr --force-merge               # Force merge even if auto-merge is stuck
 /github:babysit-pr --max-iterations 10
+/github:babysit-pr --ci-timeout 30             # CI wait timeout in minutes
 /github:babysit-pr --dry-run
 ```
 
 ## Options
 
 - `--pr <number>`: Specific PR number (default: current branch's PR)
 - `--auto-merge`: Merge PR when CI passes and all review comments are resolved
+- `--fix-ci`: Attempt to auto-fix CI failures by analyzing error logs
+- `--force-merge`: Force merge via API even if auto-merge is stuck (use with caution)
 - `--max-iterations <n>`: Maximum fix iterations (default: 10)
+- `--ci-timeout <n>`: Maximum minutes to wait for CI (default: 15)
 - `--dry-run`: Preview what would happen without making changes
 
 ## How It Works
 
 ### 1. Initial Setup
 - Verify we're on a feature branch (not main/master)
 - Find the PR for current branch (or use `--pr`)
+- Check if repo has auto-merge enabled (for later handling)
 - Record start time for effort tracking
+- Validate git state (no uncommitted changes)
 
 ### 2. Babysit Loop
 
 For each iteration:
 
 #### Step A: Wait for CI and Reviews
-- Poll CI status until all checks complete (or timeout after 15 min)
-- Wait for review bots to post their comments (30s grace period after CI)
+- Poll CI status until all checks complete (timeout per `--ci-timeout`, default 15 min)
+- Track which checks are failing vs passing
+- Wait for review bots to post their comments (30s grace period after CI completes)
+
+**Auto-fix CI Failures (if `--fix-ci`):**
+```bash
+# Get CI workflow run details
+gh api repos/{owner}/{repo}/actions/runs/{run_id}
+
+# Download and analyze CI logs
+gh run view $RUN_ID --log
+
+# Parse error messages and attempt smart fixes:
+# - Linting errors → run linter auto-fix (eslint --fix, prettier, etc.)
+# - Type errors → analyze TS/flow errors and fix types
+# - Test failures → analyze stack trace and fix tests/code
+# - Build errors → fix build config or dependency issues
+```
+
+If CI check fails after analysis:
+1. Attempt automatic fix using code understanding (not trial-and-error)
+2. Run specific failing check locally to verify fix
+3. Commit fix and push (this triggers new CI run)
+4. Re-poll CI status
 
 #### Step B: Fetch ALL Review Comments
 Read all review comments — both from AI bots and human reviewers:
@@ -87,8 +124,15 @@ For each unresolved review comment (bot or human):
 2. Read the suggested change or instruction
 3. For bot comments: extract structured suggestions (code blocks, diffs)
 4. For human comments: read the instruction and apply using code understanding
-5. Apply the fix (not blind text replacement — understand intent)
-6. Track the fix in effort report
+5. Apply the fix intelligently (understand intent, don't blindly replace)
+6. Validate fix (run tests, lint checks if applicable)
+7. Track the fix in effort report
+
+**Auto-integrate suggestions from other agents:**
+- Monitor for comments from other AI agents (autofix agents, ML agents)
+- Parse structured fix suggestions from agent comments
+- Apply verified, safe suggestions automatically
+- Flag suspicious or conflicting suggestions for manual review
 
 #### Step E: Commit and Push
 ```bash
@@ -105,10 +149,44 @@ git push
 
 #### Step F: Check Completion
 Exit loop if:
-- CI passes AND no unresolved review comments → ready to merge
+- CI passes (all green) AND no unresolved review comments → ready to merge
 - Max iterations reached → report and stop
+- Critical error → report and stop
 
-### 3. Merge (if `--auto-merge`)
+### 3. Smart Merge Logic
+
+#### Detect Auto-Merge Status
+```bash
+# Check if auto-merge is enabled and what merge strategy
+gh api repos/{owner}/{repo}/pulls/{pr_number} --jq '.autoMerge'
+
+# Possible states:
+# - enabled: auto-merge queued (will merge when ready)
+# - disabled: auto-merge off
+# - conflicted: enabled but blocked by conflicts or checks
+```
+
+#### Merge Strategy (Priority Order)
+1. **Auto-merge enabled & CI green** → Wait for auto-merge to complete (poll every 30s)
+2. **Auto-merge enabled but stuck** → Use `--force-merge` to manually trigger API merge
+3. **Auto-merge disabled** → Use direct `gh pr merge` command
+4. **Merge conflicts** → Resolve conflicts, push, then retry merge
+
+#### Force Merge (for stuck auto-merge)
+```bash
+# If auto-merge is enabled but not progressing, trigger via API
+gh api repos/{owner}/{repo}/pulls/{pr_number}/merge \
+  --input - <<EOF
+{
+  "commit_title": "Merge PR #{pr_number}",
+  "commit_message": "Merged via babysit-pr auto-merge handler",
+  "merge_method": "squash",
+  "sha": "$(git rev-parse HEAD)"
+}
+EOF
+```
+
+#### Fallback: Simple Direct Merge
 ```bash
 gh pr merge $PR_NUMBER --squash --delete-branch
 ```
@@ -122,25 +200,31 @@ Print summary at completion:
 PR #123: Feature title
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
-Effort Summary:
-  Iterations:        3
-  Fixes applied:     7
-    CodeRabbit:      4
-    Sourcery:        2
-    Gemini:          1
-  Conflicts resolved: 1
-  Total duration:    12m 34s
+Automation Summary:
+  Iterations:           3
+  Review fixes applied: 7
+    CodeRabbit:         4
+    Sourcery:           2
+    Gemini:             1
+    Other agents:       0
+  CI fixes applied:     2
+    Linting fixes:      1
+    Type fixes:         1
+  Conflicts resolved:   1
+  Total duration:       12m 34s
 
 Result: ✅ Merged successfully
+  Auto-merge status: Handled via API (auto-merge was stuck)
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 ```
 
 ## Exit Conditions
 
 The loop exits when:
-- ✅ CI passes AND all review suggestions (bot + human) addressed → merge (if `--auto-merge`)
+- ✅ CI passes (all green) AND all review suggestions (bot + human) addressed → merge (if `--auto-merge`)
+- ✅ Auto-merge successfully triggered or manually merged
 - ⚠️ Max iterations reached → report status and stop
-- ⚠️ Unresolvable conflict or error → report and stop
+- ⚠️ Unresolvable conflict or critical error → report and stop
 - ⚠️ Manual interrupt (Ctrl+C)
 
 ## Supported Review Bots
@@ -164,42 +248,75 @@ The loop exits when:
 
 ## Examples
 
-### Basic babysit
+### Basic babysit (watch and address reviews)
 ```bash
 # On a feature branch with an open PR
 git checkout feat/new-feature
 /github:babysit-pr
 ```
 
-### Babysit and auto-merge
+### Babysit with auto-fix CI and merge
 ```bash
-/github:babysit-pr --auto-merge
+/github:babysit-pr --auto-merge --fix-ci
 ```
 
-### Babysit specific PR with limited iterations
+### Force merge stuck auto-merge
 ```bash
-/github:babysit-pr --pr 456 --max-iterations 3
+# Repo has auto-merge enabled but it's stuck/not progressing
+/github:babysit-pr --auto-merge --force-merge
 ```
 
-### Preview mode
+### Babysit specific PR with aggressive CI fixing
+```bash
+/github:babysit-pr --pr 456 --max-iterations 5 --fix-ci --auto-merge
+```
+
+### Preview mode (dry-run)
 ```bash
 /github:babysit-pr --dry-run
 ```
 
+### Long CI timeout (for slow repos)
+```bash
+/github:babysit-pr --auto-merge --fix-ci --ci-timeout 45
+```
+
 ## Continuous Monitoring with /loop
 
 For long-running PRs, combine with `/loop` for periodic checks:
 
 ```bash
-# Check every 10 minutes, auto-merge when ready
-/loop 10m /github:babysit-pr --auto-merge
+# Check every 10 minutes, auto-fix CI and auto-merge when ready
+/loop 10m /github:babysit-pr --auto-merge --fix-ci
 
-# Check every 5 minutes for a specific PR
-/loop 5m /github:babysit-pr --pr 123 --auto-merge
+# Check every 5 minutes for a specific PR, with force-merge for stuck auto-merge
+/loop 5m /github:babysit-pr --pr 123 --auto-merge --force-merge
+
+# Check every 3 minutes with aggressive CI fixing and extended timeout
+/loop 3m /github:babysit-pr --auto-merge --fix-ci --ci-timeout 30
 ```
 
+## Troubleshooting
+
+### Auto-merge is enabled but PR won't merge
+- Use `--force-merge` flag to manually trigger merge via API
+- Check if all required status checks are passing
+- Verify branch protection rules aren't blocking merge
+- Check if there are dismissed reviews blocking merge
+
+### CI keeps failing on same issue
+- Use `--fix-ci` to enable automatic CI failure analysis and fixing
+- Check CI logs: `gh run view {run_id} --log`
+- Some CI failures may require manual investigation
+
+### Conflicts keep appearing
+- Ensure base branch is fully fetched: `git fetch origin main`
+- Rebase before pushing fixes: `git rebase origin/main`
+- Check for competing changes from other contributors
+
 ## Related Commands
 
 - `/github:watch-and-fix` - Simpler CI-focused watch loop (no bot parsing)
 - `/fix:and-update-pr` - Single-iteration fix and push
 - `/github:bulk-merge-prs` - Merge multiple approved PRs
+- `/github:fix-workflow-failures` - Dedicated CI failure fixing tool

statusline/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "statusline",
-  "version": "1.7.0",
-  "description": "Multi-provider status bar with context health, API rate limits (Anthropic 5h/7d + z.ai GLM tokens/tools), git branch, and active tools. Auto-detects provider from model name. Supports 1/2/3 line layouts with smart hiding.",
+  "version": "1.8.0",
+  "description": "Configurable multi-line status bar with context health, cache hit rate, session duration, API rate limits (Anthropic 5h/7d + z.ai GLM), git branch, and active tools. Supports 1/2/3 line layouts, icon themes, and template presets.",
   "author": {
     "name": "duyet"
   }