Skip to content

feat(ticket-028): adopt conflict-safe merge streaming - #62

Merged
ifuri-validator-agent[bot] merged 3 commits into
mainfrom
ticket/028-merge-streaming
Sep 1, 2026
Merged

feat(ticket-028): adopt conflict-safe merge streaming#62
ifuri-validator-agent[bot] merged 3 commits into
mainfrom
ticket/028-merge-streaming

Conversation

@tom-sapletta-com

@tom-sapletta-com tom-sapletta-com commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

Outcome

Adopt immutable wellmanifest/new-project 0.19.19 at 43999c793a86084b4c3198fe07be350105db59ec and install resumable, conflict-safe streaming governance without weakening exact-HEAD merge authorization.

Delivery model

  • canonical durable worktrees and overlap guard
  • remote-aware ticket allocation and continuity checkpoints
  • draft-PR streaming before a single final HEAD freeze
  • OneDev onedev/local-verify remains the required repository check
  • protected validator-agent provides exact-HEAD review and merge authorization
  • GitHub-hosted checks are not merge requirements

Validation so far

  • Goal adoption: up-to-date at exact published SHA
  • governance gate: 0 errors, 0 warnings
  • agent-host contract: pass
  • worktree overlap: pass
  • Docker Compose config: pass

Ticket: ticket-028
Issues: #41; unblocks #37 without implementing it.

Correlation ID: koru-ticket-028-merge-streaming-20260901

@tom-sapletta-com
tom-sapletta-com marked this pull request as ready for review September 1, 2026 16:02

@ifuri-validator-agent ifuri-validator-agent Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Deterministic Validator approval for exact head dab053e7e919bb6f64e1333f46c02a77515525fd.

Ticket: ticket-028
Correlation ID: koru-pr-62-ticket-028
Model: zai/glm-5.3
Advisory LLM review: LLM_UNAVAILABLE
Reason: advisory_review_budget_exceeded: full review requires 60 chunks; limit is 8
This approval rests on the deterministic checks alone; no advisory opinion was recorded for this head.
Merge will be attempted after this approval when explicitly authorized.

Decision record (recomputable)

DECISION D-028-8681
TICKET ticket-028
HEAD_SHA dab053e7e919bb6f64e1333f46c02a77515525fd
CORRELATION_ID koru-pr-62-ticket-028
ACTOR agent:ifuri-validator-agent[bot]
APPLIED_RULE P-CORE-015
INPUT author_login = "tom-sapletta-com"
INPUT observed_checks = ["governance / remote lifecycle=PASS","governance / enforce=PASS","onedev/local-verify=PASS"]
INPUT required_checks = ["onedev/local-verify"]
INPUT required_checks_source = "protected registry + GitHub applied rules (env/request)"
INPUT reviewer_login = "ifuri-validator-agent[bot]"
INPUT superseded_checks = ["smoke"]
VERDICT APPROVE AUTHORITY DETERMINISTIC
REJECTED REQUEST_CHANGES BECAUSE NO_UNSAFE_CHANGE_REASON_FOUND
ADVISORY llm_verdict = "" MODEL "zai/glm-5.3"
ASSERT VERDICT_AUTHORITY != "ADVISORY"

@ifuri-validator-agent
ifuri-validator-agent Bot merged commit 8bc9775 into main Sep 1, 2026
4 checks passed
@ifuri-validator-agent
ifuri-validator-agent Bot deleted the ticket/028-merge-streaming branch September 1, 2026 16:10
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