Clarify git flow #1005

Merged

coilysiren merged 2 commits from aos/claude/qa57 into main

2026-08-12 19:56:01 +00:00

coilysiren commented

2026-08-12 08:12:19 +00:00

Owner

No description provided.

coilysiren added 2 commits

2026-08-12 08:12:19 +00:00

docs(git-workflow): name merge-remote-main as the canonical lane

ci / aos-cli-tests (pull_request) Successful in 26s

Details

ci / ward-doctor (pull_request) Successful in 11s

Details

ci / gate (pull_request) Successful in 51s

Details

f698cf2526

Ward's enum is merge-remote-main | pull-request | pull-request-and-merge |
remote-branch-only, defaulting to merge-remote-main. Both AGENTS.md and the
composed coding-core-git-workflow skill taught direct-to-main, which Ward
accepts only as a deprecated alias and warns on, and neither named
merge-remote-main at all despite 25 of 34 active repos declaring it.

Verified against `ward agent --help` on v0.879.0 and by round-tripping a
ward.yaml through `ward doctor`, which emits the deprecation warning.

Both files sit near the documentation-layout cap, so the alias detail lives
in the tracking issue rather than inline.

Scope is the vocabulary only. The prose/config/branch-protection conflicts
the fleet sweep surfaced need decisions or operator authority.

refs #994

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: Kai Siren <coilysiren@gmail.com>
Co-authored-by: Claude <noreply@anthropic.com>

docs(agents): stamp the PR-lane git workflow into AGENTS.md

ci / aos-cli-tests (pull_request) Successful in 42s

Details

ci / ward-doctor (pull_request) Successful in 16s

Details

ci / gate (pull_request) Successful in 53s

Details

d8bc8a2eb0

agentic-os declares agent.workflow: pull-request-and-merge but AGENTS.md
listed the four lanes generically without ever saying which one this repo
runs. Adds the fleet-standard stamp, byte-identical with deploy,
infrastructure, and ward.

The composed git-workflow skill's infrastructure exception said
"auto-commit/push code/CI", which contradicted that repo's declared PR lane.
Restated as branch-and-PR.

AGENTS.md opts its char cap up by 400 to carry the stamp, on the same
cross-repo parity argument the engineer/QA live-deploy block already uses:
the text cannot be reworded per-repo without breaking the four-repo match.

refs #994

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: Kai Siren <coilysiren@gmail.com>
Co-authored-by: Claude <noreply@anthropic.com>

coilysiren changed title from ~~aos/claude/qa57~~ to Clarify git flow

2026-08-12 19:51:48 +00:00

coilysiren merged commit a8e4bddf3e into main

2026-08-12 19:56:01 +00:00

coilysiren deleted branch aos/claude/qa57

2026-08-12 19:56:02 +00:00

coilysiren referenced this pull request from a commit

2026-08-12 19:56:03 +00:00

Clarify git flow (#1005)