Merge branch 'main' into chore/dco-enforcement

Author: Kavirubc

.github/workflows/auto-close.yml

@@ -0,0 +1,61 @@
+# =============================================================================
+# Auto-Close Duplicate Issues
+# =============================================================================
+# Runs daily at 10:00 UTC to close issues whose grace period has expired.
+# Also supports manual trigger via workflow_dispatch.
+#
+# Required secrets:
+#   GH_PAT         – Token with issues:write permission
+# =============================================================================
+
+name: Auto-Close Duplicates
+
+on:
+  schedule:
+    # Daily at 10:00 UTC
+    - cron: '0 10 * * *'
+  workflow_dispatch:
+    inputs:
+      dry_run:
+        description: 'Run in dry-run mode (no side effects)'
+        required: false
+        default: 'false'
+        type: choice
+        options:
+          - 'false'
+          - 'true'
+
+permissions:
+  contents: read
+  issues: write
+
+jobs:
+  auto-close:
+    name: Auto-Close Expired Duplicates
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+
+      - name: Build CLI
+        run: go build -o simili-cli ./cmd/simili/main.go
+
+      - name: Run auto-close
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
+        run: |
+          DRY_RUN_FLAG=""
+          if [ "${{ inputs.dry_run }}" = "true" ]; then
+            DRY_RUN_FLAG="--dry-run"
+          fi
+
+          ./simili-cli auto-close \
+            --repo "${{ github.repository }}" \
+            --config .github/simili.yaml \
+            --verbose \
+            $DRY_RUN_FLAG

internal/core/config/config.go

@@ -44,12 +44,22 @@ type Config struct {
 	// Transfer configures cross-repository issue routing.
 	Transfer TransferConfig `yaml:"transfer,omitempty"`
 
+	// AutoClose configures the automatic closure of confirmed duplicate issues.
+	AutoClose AutoCloseConfig `yaml:"auto_close,omitempty"`
+
 	// BotUsers is a list of GitHub usernames whose events should be ignored
 	// to prevent infinite comment loops. Built-in heuristics (e.g. "[bot]" suffix,
 	// "gh-simili" prefix) always apply in addition to this list.
 	BotUsers []string `yaml:"bot_users,omitempty"`
 }
 
+// AutoCloseConfig configures the auto-close behavior for duplicate issues.
+type AutoCloseConfig struct {
+	GracePeriodHours           int  `yaml:"grace_period_hours"` // Hours after labeling before auto-close (default: 72)
+	GracePeriodMinutesOverride int  `yaml:"-"`                  // CLI-only override in minutes (for testing; 0 = use GracePeriodHours)
+	DryRun                     bool `yaml:"dry_run,omitempty"`  // If true, log actions without executing
+}
+
 // QdrantConfig holds Qdrant connection settings.
 type QdrantConfig struct {
 	URL        string `yaml:"url"`
@@ -286,6 +296,10 @@ func (c *Config) applyDefaults() {
 	if c.Transfer.RepoCollection == "" {
 		c.Transfer.RepoCollection = "simili_repos"
 	}
+	// Auto-close defaults
+	if c.AutoClose.GracePeriodHours == 0 {
+		c.AutoClose.GracePeriodHours = 72
+	}
 }
 
 // mergeConfigs merges a child config onto a parent config.
@@ -376,6 +390,14 @@ func mergeConfigs(parent, child *Config) *Config {
 		result.Transfer.RepoCollection = child.Transfer.RepoCollection
 	}
 
+	// AutoClose: override if fields are set
+	if child.AutoClose.GracePeriodHours != 0 {
+		result.AutoClose.GracePeriodHours = child.AutoClose.GracePeriodHours
+	}
+	if child.AutoClose.DryRun {
+		result.AutoClose.DryRun = child.AutoClose.DryRun
+	}
+
 	return &result
 }
 

internal/integrations/github/client.go

@@ -58,6 +58,36 @@ func (c *Client) AddLabels(ctx context.Context, org, repo string, number int, la
 	return nil
 }
 
+// CloseIssue closes a GitHub issue by setting its state to "closed".
+func (c *Client) CloseIssue(ctx context.Context, org, repo string, number int) error {
+	closed := "closed"
+	_, _, err := c.client.Issues.Edit(ctx, org, repo, number, &github.IssueRequest{
+		State: &closed,
+	})
+	if err != nil {
+		return fmt.Errorf("failed to close issue #%d: %w", number, err)
+	}
+	return nil
+}
+
+// RemoveLabel removes a single label from an issue.
+// Returns nil if the label was not present (GitHub API returns 404, which we treat as success).
+func (c *Client) RemoveLabel(ctx context.Context, org, repo string, number int, label string) error {
+	if strings.TrimSpace(label) == "" {
+		return fmt.Errorf("label cannot be empty")
+	}
+
+	_, err := c.client.Issues.RemoveLabelForIssue(ctx, org, repo, number, label)
+	if err != nil {
+		// If the label wasn't on the issue, GitHub returns 404 — not an error for us.
+		if ghErr, ok := err.(*github.ErrorResponse); ok && ghErr.Response.StatusCode == 404 {
+			return nil
+		}
+		return fmt.Errorf("failed to remove label %q from issue #%d: %w", label, number, err)
+	}
+	return nil
+}
+
 // TransferIssue transfers an issue to another repository using GitHub GraphQL API.
 // Requires the user to have admin/write access to both repositories.
 // targetRepo should be in "owner/repo" format.

internal/integrations/github/client_test.go

@@ -69,3 +69,17 @@ func TestTransferIssueValidation(t *testing.T) {
 		})
 	}
 }
+
+func TestRemoveLabelValidation(t *testing.T) {
+	client := &Client{client: nil}
+
+	err := client.RemoveLabel(context.Background(), "org", "repo", 1, "")
+	if err == nil {
+		t.Error("Expected error for empty label")
+	}
+
+	err = client.RemoveLabel(context.Background(), "org", "repo", 1, "   ")
+	if err == nil {
+		t.Error("Expected error for whitespace-only label")
+	}
+}