Conversation
…arity with .sh (gate.yml prerequisite)
There was a problem hiding this comment.
Pull request overview
This PR fixes a parity gap between the Bun/TypeScript and shell implementations of the merge-conflict-marker hygiene check. It keeps the TS port aligned with the existing .sh behavior so the upcoming gate.yml migration can rely on equivalent results.
Changes:
- Added the rerere conflict-resolution memory file to the TypeScript script's allowlist.
- Documented why that file is an intentional exception: it contains fenced examples of conflict markers rather than accidental leakage.
- Restored behavioral parity with
tools/hygiene/check-no-conflict-markers.sh, which is a prerequisite for the workflow conversion mentioned in #1376.
AceHack
added a commit
that referenced
this pull request
May 3, 2026
…t tier per #1376) (#1380) The gate.yml workflow ran three lint scripts as .sh: - tools/hygiene/check-tick-history-order.sh - tools/hygiene/check-no-conflict-markers.sh - tools/hygiene/check-archive-header-section33.sh All three have a TS+Bun port in tools/hygiene/<name>.ts with full output / exit-code parity verified locally (179 tick-history rows non-decreasing; 0 conflict-marker violations; 0 §33 archive-header violations). Why this PR closes the .sh→.ts cleanup loop: - #1377 converted memory-index-duplicate-lint.yml (lowest-risk — only fires on memory/MEMORY.md changes) - #1378 converted memory-reference-existence-lint.yml (lowest-risk — only fires on memory/** changes) - This PR converts gate.yml's three lint jobs (highest-risk — fires on every PR via the all-PR gate critical path) - #1379 (rerere ALLOWLIST parity) was a prerequisite — the .ts port of check-no-conflict-markers had to ALLOWLIST the rerere memo to match the .sh version BEFORE running on every PR After this lands and CI verifies green, the 5 deferred .sh files can be removed (audit-memory-index-duplicates.sh, audit-memory-references .sh, check-archive-header-section33.sh, check-no-conflict-markers.sh, check-tick-history-order.sh) — completing the .sh cleanup the maintainer asked for in #1371 ("we should clean up .sh and any .sh where we have the .ts I thought we were fully converted"). Conversion pattern (identical for all three jobs): - Add "Install toolchain via three-way-parity script" step calling ./tools/setup/install.sh — same shape as #1377 + #1378 - Change `run: tools/hygiene/<name>.sh` to `run: bun tools/hygiene/<name>.ts` Three lint jobs run in parallel (one job each), so the bun install cost is bounded by the slowest job's path — does not compound.
3 tasks
AceHack
added a commit
that referenced
this pull request
May 3, 2026
…conversion completed (#1382) The maintainer asked in #1371: *"we should clean up .sh and any .sh where we have the .ts I thought we were fully converted."* Initially 13 zero-ref .sh files were removed; 5 were deferred because they were still referenced from CI workflows. Those 3 workflows are now all converted (#1377 + #1378 + #1380), and #1379 fixed the prerequisite allowlist parity bug in check-no-conflict-markers.ts. Removed: - tools/hygiene/audit-memory-index-duplicates.sh (→ memory-index-duplicate-lint.yml via #1377) - tools/hygiene/audit-memory-references.sh (→ memory-reference-existence-lint.yml via #1378) - tools/hygiene/check-archive-header-section33.sh (→ gate.yml via #1380) - tools/hygiene/check-no-conflict-markers.sh (→ gate.yml via #1380) - tools/hygiene/check-tick-history-order.sh (→ gate.yml via #1380) All 5 .ts ports run clean locally post-deletion (exit 0; same output as the .sh equivalents — verified manually before this commit). Surface-update set (active substrate that pointed at the .sh as a current tool): - tools/hygiene/LOST-FILES-LOCATIONS.md — survey command + composes-with pointers updated from .sh to .ts (the only runtime-bound reference) - docs/trajectories/typescript-bun-migration/RESUME.md — Bucket D listing updated; 5 entries removed; new "Removed 2026-05-03" note added explaining why - tools/hygiene/audit-orphan-role-refs.sh — comment composes-with template updated to .ts - tools/hygiene/check-role-ref-on-current-state-surfaces.sh — comment composes-with sibling-pattern updated to .ts - tools/hygiene/sort-tick-history-canonical.ts — comment composes-with detection-check updated to .ts - tools/hygiene/check-tick-history-shard-schema.sh — comment composes-with legacy-monolithic-check updated to .ts - tools/lint/doc-comment-history-audit.baseline — 2 entries for the deleted audit-memory-references.sh removed (else baseline would diff against the next audit run that no longer matches a deleted path) Historical surfaces deliberately NOT updated (pure history record): - docs/hygiene-history/** (tick shards + loop-tick-history.md) - docs/pr-preservation/** (preservation logs) - docs/research/** (research reports) - memory/** (history-surface attribution carve-out) - docs/backlog/** rows (describe past tickets that referenced .sh) - docs/0-0-0-readiness/CLASSIFICATION.md (sync-classification audit of past LFG↔AceHack divergence) Closes the .sh→.ts cleanup loop opened in #1371. Composes with #1373 + #1374 (stale-ref sweeps that caught earlier comprehensive-ref-check misses).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Real parity bug surfaced during gate.yml conversion preparation: .ts ALLOWLIST was missing
memory/feedback_rerere_conflict_resolution_cache_dividend_amara_2026_04_28.mdwhich the .sh has. The .sh allowlists this file because it's a substrate memo legitimately quoting conflict-marker syntax in a fenced code block (rerere cache dividend rule). Added to .ts ALLOWLIST. Verified: both now produce 'OK: no git merge-conflict markers found' exit 0. Prerequisite for gate.yml conversion (next per #1376 stratification).