Skip to content

Integrate workspace results locally and publish through one PR - #228

Merged
anvil008 merged 2 commits into
mainfrom
feat/local-integration
Sep 13, 2026
Merged

anvil008 merged 2 commits into
mainfrom
feat/local-integration

Conversation

@anvil008

@anvil008 anvil008 commented Sep 13, 2026

Copy link
Copy Markdown
Owner

Makes verified local integration separate from remote publication: parents integrate ready workspace results into local main promptly, children keep commits local, and accumulated results use one integration bookmark and PR. Delivery includes proof-based cleanup of superseded branches and safe reconciliation after squash/rebase without discarding newer local work.

Strengthens Codex/Claude reminders and adds an Agy adapter: successful invoke_subagent PostToolUse arms a marker; a normal fully idle Stop consumes it and continues once. Hooks never merge or publish, and Flow tracking stays disabled. Updates global instructions, implementer handoffs, JJ guidance, README diagrams, and ADR 0033.

Validation: 129 tests passed; generated guide and package checks passed; isolated offline bootstrap installation and rerun passed for all three harnesses. Packaged Agy commands were executed after relocation and from a project directory. Independent review found no blocking defects. Native model-backed child-completion behavior was not exercised.

Native workspace creation now prefers local main over stale remote/trunk refs, so unpublished integrated work is inherited; real Git and JJ regression tests cover this.

Verified candidate was integrated into local main before publication.

@anvil008
anvil008 merged commit 6388118 into main Sep 13, 2026
1 check passed
@anvil008
anvil008 deleted the feat/local-integration branch September 13, 2026 06:07
anvil008 added a commit that referenced this pull request Sep 14, 2026
Makes verified local integration separate from remote publication:
parents integrate ready workspace results into local main promptly,
children keep commits local, and accumulated results use one integration
bookmark and PR. Delivery includes proof-based cleanup of superseded
branches and safe reconciliation after squash/rebase without discarding
newer local work.

Strengthens Codex/Claude reminders and adds an Agy adapter: successful
invoke_subagent PostToolUse arms a marker; a normal fully idle Stop
consumes it and continues once. Hooks never merge or publish, and Flow
tracking stays disabled. Updates global instructions, implementer
handoffs, JJ guidance, README diagrams, and ADR 0033.

Validation: 129 tests passed; generated guide and package checks passed;
isolated offline bootstrap installation and rerun passed for all three
harnesses. Packaged Agy commands were executed after relocation and from
a project directory. Independent review found no blocking defects.
Native model-backed child-completion behavior was not exercised.

Native workspace creation now prefers local main over stale remote/trunk
refs, so unpublished integrated work is inherited; real Git and JJ
regression tests cover this.

Verified candidate was integrated into local main before publication.
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