Merge branch 'main' into chore/dco-enforcement

Author: Kavirubc

.github/workflows/auto-close.yml

@@ -24,6 +24,11 @@ on:
         options:
           - 'false'
           - 'true'
+      grace_period_minutes:
+        description: 'Grace period in minutes before a potential-duplicate issue is labelled duplicate and closed (overrides config). Leave empty to use the configured default.'
+        required: false
+        default: ''
+        type: string
 
 permissions:
   contents: read
@@ -47,15 +52,26 @@ jobs:
 
       - name: Run auto-close
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
+          GITHUB_TOKEN: ${{ github.token }}
+          GRACE_PERIOD_INPUT: ${{ inputs.grace_period_minutes }}
         run: |
           DRY_RUN_FLAG=""
           if [ "${{ inputs.dry_run }}" = "true" ]; then
             DRY_RUN_FLAG="--dry-run"
           fi
 
+          GRACE_ARGS=()
+          if [[ -n "$GRACE_PERIOD_INPUT" ]]; then
+            if [[ "$GRACE_PERIOD_INPUT" =~ ^[0-9]+$ ]]; then
+              GRACE_ARGS=("--grace-period-minutes" "$GRACE_PERIOD_INPUT")
+            else
+              echo "::warning::grace_period_minutes must be a positive integer; ignoring value '$GRACE_PERIOD_INPUT'"
+            fi
+          fi
+
           ./simili-cli auto-close \
             --repo "${{ github.repository }}" \
             --config .github/simili.yaml \
             --verbose \
-            $DRY_RUN_FLAG
+            $DRY_RUN_FLAG \
+            "${GRACE_ARGS[@]}"

.github/workflows/e2e-test.yml

@@ -284,6 +284,38 @@ jobs:
           echo "Waiting 15s for GitHub to register the workflow…"
           sleep 15
 
+      # ----- 7b. Create auto-closer test issue -----
+      # Created BEFORE the trigger issue so it ages long enough to exceed the
+      # 1-minute grace-period override we use in the auto-closer E2E step below.
+      # We manually ensure the "potential-duplicate" label exists and apply it
+      # immediately, independent of what the triage bot decides.
+      - name: Setup auto-closer test issue
+        id: ac_setup
+        env:
+          GH_TOKEN: ${{ secrets.BOT_PAT }}
+        run: |
+          REPO="${{ env.BOT_NAME }}/${{ env.TEST_REPO_NAME }}"
+
+          # Ensure the potential-duplicate label exists (bot creates it lazily;
+          # this step runs before the trigger issue is triaged).
+          gh label create "potential-duplicate" \
+            --repo "$REPO" \
+            --color "FBCA04" \
+            --description "Potential duplicate — pending grace period" \
+            2>/dev/null || true
+
+          # Create the AC test issue
+          URL=$(gh issue create --repo "$REPO" \
+            --title "Auto-closer grace period and human-activity E2E test" \
+            --body "This issue is created by the E2E pipeline to verify the auto-closer detects expired grace periods and correctly skips issues with human activity signals.")
+          AC_NUM=$(echo "$URL" | grep -oE '[0-9]+$')
+          echo "ac_issue_number=$AC_NUM" >> "$GITHUB_OUTPUT"
+          echo "AC test issue: #$AC_NUM"
+
+          # Apply potential-duplicate label immediately so the grace period clock starts
+          gh issue edit "$AC_NUM" --repo "$REPO" --add-label "potential-duplicate"
+          echo "✅ Labeled #$AC_NUM as potential-duplicate"
+
       # ----- 8. Create trigger issue (should match seed #1) -----
       - name: Create trigger issue
         id: trigger
@@ -366,6 +398,67 @@ jobs:
           fi
           echo "✅ No loop – single comment"
 
+      # ----- 11b. Auto-closer E2E test -----
+      # By this point the AC test issue (step 7b) and the trigger issue (step 8)
+      # have both been labeled "potential-duplicate" for 6–8 minutes, well past
+      # the 1-minute grace-period override used here.
+      # In dry-run mode the closer reports what it WOULD do, so no issues are
+      # actually closed. We verify:
+      #   • The CLI runs without error and emits valid JSON.
+      #   • At least the AC test issue is processed (processed >= 1).
+      #   • Issues past grace with no human activity are reported as "closed"
+      #     (dry-run), confirming Checks A, B, C found no human signals.
+      - name: Run auto-closer E2E test
+        id: ac_test
+        if: always() && steps.ac_setup.outputs.ac_issue_number != ''
+        env:
+          GITHUB_TOKEN: ${{ secrets.BOT_PAT }}
+          GH_TOKEN: ${{ secrets.BOT_PAT }}
+        run: |
+          REPO="${{ env.BOT_NAME }}/${{ env.TEST_REPO_NAME }}"
+
+          echo "Running auto-closer dry-run (grace-period-minutes=1)…"
+
+          # Use the config from the cloned test-repo working tree.
+          # Qdrant/Gemini sections are ignored by the auto-closer.
+          AC_OUTPUT=$("$RUNNER_TEMP/simili-cli" auto-close \
+            --repo   "$REPO" \
+            --config "test-repo-wf/.github/simili.yaml" \
+            --dry-run \
+            --grace-period-minutes 1 \
+            --verbose \
+            2>/tmp/ac-stderr.txt) || AC_EXIT=$?
+
+          echo "--- stderr ---"
+          cat /tmp/ac-stderr.txt || true
+          echo "--- stdout (JSON) ---"
+          echo "$AC_OUTPUT"
+
+          # Parse summary fields from JSON output
+          PROCESSED=$(echo "$AC_OUTPUT" | jq -r '.processed // 0' 2>/dev/null || echo "0")
+          CLOSED=$(echo "$AC_OUTPUT"    | jq -r '.closed    // 0' 2>/dev/null || echo "0")
+          SKIPPED_GRACE=$(echo "$AC_OUTPUT" | jq -r '.skipped_grace_period   // 0' 2>/dev/null || echo "0")
+          SKIPPED_HUMAN=$(echo "$AC_OUTPUT" | jq -r '.skipped_human_activity // 0' 2>/dev/null || echo "0")
+
+          echo "ac_processed=$PROCESSED"      >> "$GITHUB_OUTPUT"
+          echo "ac_closed=$CLOSED"            >> "$GITHUB_OUTPUT"
+          echo "ac_skipped_grace=$SKIPPED_GRACE" >> "$GITHUB_OUTPUT"
+          echo "ac_skipped_human=$SKIPPED_HUMAN" >> "$GITHUB_OUTPUT"
+
+          echo ""
+          echo "Auto-closer summary: processed=$PROCESSED closed=$CLOSED skipped_grace=$SKIPPED_GRACE skipped_human=$SKIPPED_HUMAN"
+
+          if [ "${AC_EXIT:-0}" -ne 0 ]; then
+            echo "❌ auto-close command failed (exit $AC_EXIT)"
+            exit 1
+          fi
+
+          if [ "$PROCESSED" -gt 0 ]; then
+            echo "✅ Auto-closer processed $PROCESSED issue(s) — dry-run OK"
+          else
+            echo "⚠️  Auto-closer found no issues to process (AC test issue may not be labeled yet)"
+          fi
+
       # ----- 12. Cleanup Qdrant (always) -----
       - name: Cleanup Qdrant collection
         if: always()
@@ -422,12 +515,25 @@ jobs:
           REPO="${{ env.BOT_NAME }}/${{ env.TEST_REPO_NAME }}"
           OK="${{ steps.poll.outputs.bot_commented }}"
           ICON=$([ "$OK" = "true" ] && echo "✅" || echo "❌")
+
+          AC_PROC="${{ steps.ac_test.outputs.ac_processed }}"
+          AC_CLOSED="${{ steps.ac_test.outputs.ac_closed }}"
+          AC_GRACE="${{ steps.ac_test.outputs.ac_skipped_grace }}"
+          AC_HUMAN="${{ steps.ac_test.outputs.ac_skipped_human }}"
+          if [ -n "$AC_PROC" ]; then
+            AC_LINE="| **Auto-closer (dry-run)** | processed: ${AC_PROC}  closed: ${AC_CLOSED}  grace: ${AC_GRACE}  human: ${AC_HUMAN} |"
+          else
+            AC_LINE="| **Auto-closer** | skipped (AC setup failed) |"
+          fi
+
           gh pr comment "$PR_NUM" \
             --repo "${{ github.repository }}" \
             --body "## 🧪 E2E Test
 
           ${ICON} **Bot responded:** $([ "$OK" = "true" ] && echo "yes" || echo "no")
 
+          ${AC_LINE}
+
           **Test repo →** [${REPO}](https://github.com/${REPO})
           **Run →** [logs](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
 
@@ -449,4 +555,10 @@ jobs:
               echo "| Bot responded | ❌ |"
             fi
             echo "| Test repo | [${{ env.BOT_NAME }}/${{ env.TEST_REPO_NAME }}](https://github.com/${{ env.BOT_NAME }}/${{ env.TEST_REPO_NAME }}) |"
+            AC="${{ steps.ac_test.outputs.ac_processed }}"
+            if [ -n "$AC" ]; then
+              echo "| Auto-closer (dry-run) | processed: $AC  closed: ${{ steps.ac_test.outputs.ac_closed }}  grace: ${{ steps.ac_test.outputs.ac_skipped_grace }}  human: ${{ steps.ac_test.outputs.ac_skipped_human }} |"
+            else
+              echo "| Auto-closer | ⚠️ no output |"
+            fi
           } >> "$GITHUB_STEP_SUMMARY"

README.md

@@ -220,6 +220,50 @@ Notes:
 - `llm.api_key` can be omitted if `GEMINI_API_KEY` is set.
 - You can override the model at runtime with `LLM_MODEL`.
 
+### `simili auto-close`
+
+Scan all open issues labelled `potential-duplicate` and close those whose grace period has expired with no human activity. Closed issues are relabelled from `potential-duplicate` → `duplicate`.
+
+```bash
+simili auto-close --repo owner/repo --grace-period-minutes 60
+```
+
+**Flags:**
+- `--repo` (required): Target repository (`owner/name`); falls back to `GITHUB_REPOSITORY` env var
+- `--grace-period-minutes`: Override the grace period in minutes for this run (see precedence below)
+- `--dry-run`: Print what would be closed without making any changes
+- `--config`: Path to `simili.yaml` (auto-discovered if omitted)
+
+**Grace period precedence** (highest → lowest):
+
+| Source | How to set |
+|--------|-----------|
+| `--grace-period-minutes` CLI flag | Pass at runtime — overrides everything |
+| `auto_close.grace_period_hours` in `simili.yaml` | Persistent per-repo config |
+| Built-in default | 72 hours (3 days) |
+
+**`simili.yaml` configuration:**
+
+```yaml
+auto_close:
+  grace_period_hours: 48   # default: 72
+  dry_run: false
+```
+
+**Human activity signals** — any of these prevent auto-close:
+1. A negative reaction (👎 or 😕) on the bot's triage comment by a non-bot user.
+2. The issue was reopened by a human after the `potential-duplicate` label was applied.
+3. A non-bot comment posted after the label was applied.
+
+**GitHub Actions usage** — the `auto-close.yml` workflow runs daily at 10:00 UTC and can be triggered manually via `workflow_dispatch` with an optional `grace_period_minutes` input:
+
+```yaml
+# Trigger from GitHub UI or gh CLI:
+gh workflow run auto-close.yml -f grace_period_minutes=60 -f dry_run=false
+```
+
+Leaving `grace_period_minutes` empty uses the value from `simili.yaml` (or the 72 h default).
+
 ## Development
 
 ```bash

cmd/simili-web/main.go

@@ -17,7 +17,7 @@ import (
 
 	"github.com/similigh/simili-bot/internal/core/config"
 	"github.com/similigh/simili-bot/internal/core/pipeline"
-	"github.com/similigh/simili-bot/internal/integrations/gemini"
+	"github.com/similigh/simili-bot/internal/integrations/ai"
 	"github.com/similigh/simili-bot/internal/integrations/github"
 	"github.com/similigh/simili-bot/internal/integrations/qdrant"
 	"github.com/similigh/simili-bot/internal/steps"
@@ -115,7 +115,7 @@ func initDependencies(cfg *config.Config) (*pipeline.Dependencies, error) {
 	}
 
 	// Embedder (Gemini/OpenAI auto-selected by available keys)
-	embedder, err := gemini.NewEmbedder(cfg.Embedding.APIKey, cfg.Embedding.Model)
+	embedder, err := ai.NewEmbedder(cfg.Embedding.APIKey, cfg.Embedding.Model)
 	if err != nil {
 		return nil, fmt.Errorf("failed to init embedder: %w", err)
 	}
@@ -151,7 +151,7 @@ func initDependencies(cfg *config.Config) (*pipeline.Dependencies, error) {
 	if envModel := os.Getenv("LLM_MODEL"); envModel != "" {
 		llmModel = envModel
 	}
-	llm, err := gemini.NewLLMClient(llmKey, llmModel)
+	llm, err := ai.NewLLMClient(llmKey, llmModel)
 	if err != nil {
 		return nil, fmt.Errorf("failed to init LLM: %w", err)
 	}