Skip to content

feat(verify-workspace-config): flag tracked .automaker-lock (fleet PR-conflict source)#47

Merged
mabry1985 merged 1 commit into
mainfrom
feat/verify-automaker-lock-not-tracked
Jun 7, 2026
Merged

feat(verify-workspace-config): flag tracked .automaker-lock (fleet PR-conflict source)#47
mabry1985 merged 1 commit into
mainfrom
feat/verify-automaker-lock-not-tracked

Conversation

@mabry1985

Copy link
Copy Markdown
Contributor

Adds two workspace-standard rules (mirroring .beads/beads.db): automaker-lock-gitignored + automaker-lock-not-committed. A tracked .automaker-lock (auto-mode's runtime lock) makes every concurrent auto-mode PR collide on it — the cascade that stranded protoContent's PRs (and cf. protoMaker #4109/#4120). Gitignore alone doesn't fix an already-tracked file; it needs git rm --cached. Also added to REQUIRED_GITIGNORE so the scaffold covers new repos. Runs in both per-repo CI (local) and the --repo fleet audit. 60/60 tests pass.

🤖 Generated with Claude Code

…ict source)

.automaker-lock is auto-mode's runtime lock; it's rewritten on every run. When
it's committed, every concurrent auto-mode PR mutates it and they all collide on
it — a branch's PRs go CONFLICTING/DIRTY the moment one merges (observed across
the fleet; cf. protoMaker #4109/#4120, protoContent). Gitignoring alone does NOT
fix an already-tracked file — it must be `git rm --cached`.

Adds two workspace-standard rules (mirroring the .beads/beads.db pair):
- automaker-lock-gitignored (error): .automaker-lock is in .gitignore
- automaker-lock-not-committed (error): .automaker-lock is not tracked
Adds .automaker-lock to REQUIRED_GITIGNORE so the scaffold (init-workspace-config)
gitignores it for new repos. Both local-CI and remote (--repo) fleet-audit modes
get the check for free. Tests updated; release-tools' own .gitignore patched.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@protoquinn

protoquinn Bot commented Jun 7, 2026

Copy link
Copy Markdown

👀 Quinn is reviewing — verdict (PASS / WARN / FAIL) + findings to follow.

@protoquinn protoquinn Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

QA Audit — PR #47 | feat(verify-workspace-config): flag tracked .automaker-lock

VERDICT: WARN (pending CI)


CI Status

  • Lint + smoke test: queued ⏳

Diff Review

  • Adds two rules mirroring the established .beads/beads.db pattern: automaker-lock-gitignored (error if not in .gitignore) and automaker-lock-not-committed (error if tracked — the core fix for fleet-wide PR collision).
  • Adds .automaker-lock to REQUIRED_GITIGNORE scaffold list and .gitignore itself.
  • Tests updated: error count bumped from 4→5, new pass assertion for automaker-lock-not-committed, and .automaker-lock added to the "good manifest" gitignore list.
  • Logic is correct: absent file satisfies not-committed (zero false positives); gitignore check uses the same resolveIgnored helper as beads-db-gitignored.

Observations

  • GAP: Clawpatch structural review unavailable (repo ref validation failed) — cross-file interaction between the two new rules and the existing ruleset was not formally verified.
  • CI is non-terminal — PASS/FAIL verdict is pending the lint+smoke run.

— Quinn, QA Engineer

@protoquinn

protoquinn Bot commented Jun 7, 2026

Copy link
Copy Markdown

Submitted COMMENT review on #47. CI is still queued — a CI-completion event will re-dispatch for the formal PASS/FAIL verdict once checks settle.

@mabry1985 mabry1985 merged commit ea7c2ea into main Jun 7, 2026
1 check passed
@mabry1985 mabry1985 deleted the feat/verify-automaker-lock-not-tracked branch June 7, 2026 02:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant