diff --git a/CLAUDE.md b/CLAUDE.md
index 67ceb7cb8..af124f068 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -66,6 +66,15 @@ npm run lint
 - ALWAYS run tests after making code changes
 - ALWAYS verify build succeeds before committing
 
+## Known Issues
+
+The `known_issues/` directory tracks deferred tech debt and surfaced bugs.
+When a referenced GitHub issue is closed, move the corresponding doc to
+`known_issues/resolved/` (do not delete it) so the rationale is preserved.
+Do this in the same PR that closes the issue. A full sweep of the directory
+should happen at the start of each sprint. Full convention and entry format
+are in `CONTRIBUTING.md` under "Known Issues Sweep".
+
 ## Security Rules
 
 - NEVER hardcode API keys, secrets, or credentials in source files
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d3aec8e01..6ff87671a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -238,6 +238,74 @@ the first page. Now properly iterates all pages.
 - [ ] No sensitive data in code or commits
 - [ ] Changes are backwards compatible (or breaking changes documented)
 
+## Known Issues Sweep
+
+The `known_issues/` directory tracks open tech debt, deferred fixes, and
+surfaced bugs that are out of scope for the current PR. To stay useful, it
+needs periodic housekeeping.
+
+### Entry format
+
+Each file must begin with a `# Known Issues: <topic>` heading followed by an
+audit-status line:
+
+```text
+> **Audit status (<YYYY-MM-DD>):** `<N> needs triage · <M> resolved`
+```
+
+Subsequent sections use `## SEVERITY: Short title` (e.g. `## MEDIUM: ...`) and
+include at minimum: **Files** (affected paths), **Description**, **Why
+deferred**, and **Status**.
+
+### When to ADD an entry
+
+- Tech debt or a follow-up bug is discovered during a PR review but is
+  explicitly out of scope for that PR.
+- A test is marked flaky and a root-cause fix is deferred.
+- A deliberate deferral is made (e.g. "fix after the current refactor lands").
+
+Create a new file `known_issues/<NN>_<slug>.md` (sequential number, lowercase
+slug) and open a corresponding GitHub issue so it can be tracked and closed.
+
+### When to REMOVE (archive) an entry
+
+An entry is stale when its corresponding GitHub issue is **closed** OR when the
+entry has had **no recurrence for more than 6 months** and no open issue
+references it. Do not delete stale files; move them to `known_issues/resolved/`
+so the rationale is preserved for future readers.
+
+### Who runs the sweep and when
+
+Any contributor working in a file covered by a `known_issues/` doc should
+check whether that doc's referenced issue is still open; archive it if not.
+
+A dedicated sweep over the whole directory should happen:
+
+- At the start of each sprint (or monthly if sprints are not used).
+- After any PR that explicitly closes multiple issues.
+- When a new contributor is onboarding and doing a codebase walkthrough.
+
+To perform a sweep:
+
+```bash
+# List docs referencing a specific issue number
+grep -rl "#<issue-number>" known_issues/
+
+# Cross-check all referenced issues in bulk
+grep -h "closes #\|Fixes #\|#[0-9]\+" known_issues/*.md \
+  | grep -oE '#[0-9]+' | sort -u \
+  | xargs -I{} gh issue view {} --json state,number,title --jq '[.number,.state,.title]'
+```
+
+Move resolved docs to `known_issues/resolved/`:
+
+```bash
+git mv known_issues/<file>.md known_issues/resolved/
+```
+
+Include the archive in the same PR that closes the underlying issue, or in a
+dedicated `chore(docs): archive resolved known_issues` commit.
+
 ## Security
 
 ### Reporting Vulnerabilities
diff --git a/known_issues/25_federation_azure_gcp_source_identity_failloud.md b/known_issues/resolved/25_federation_azure_gcp_source_identity_failloud.md
similarity index 100%
rename from known_issues/25_federation_azure_gcp_source_identity_failloud.md
rename to known_issues/resolved/25_federation_azure_gcp_source_identity_failloud.md
diff --git a/known_issues/26_federation_target_source_consistency.md b/known_issues/resolved/26_federation_target_source_consistency.md
similarity index 100%
rename from known_issues/26_federation_target_source_consistency.md
rename to known_issues/resolved/26_federation_target_source_consistency.md
diff --git a/known_issues/27_federation_old_bundle_redownload_notice.md b/known_issues/resolved/27_federation_old_bundle_redownload_notice.md
similarity index 100%
rename from known_issues/27_federation_old_bundle_redownload_notice.md
rename to known_issues/resolved/27_federation_old_bundle_redownload_notice.md