Skip to content

chore(governance): migrate Zi to protected main integration #771

Closed
2 of 2 issues completed
Closed

Description

@ss-o

Outcome

Protected-main Zi integration with complete qualification and separately authorized milestones.

Context

Zi currently integrates ordinary work on next and promotes batches to stable main. Move to protected main with short-lived topic branches while preserving qualification before user exposure and separate authorization for milestone releases.

Expected deliverables

Dependencies and risks

Current policy stays operative until replacement checks and live enforcement are verified. Preserve the open next PR and retained history. Downstream references must switch at cutover; no ruleset bypass or automatic release is part of this migration.

Completion criteria

  • Amend ADR-0019 and supersede or amend ADR-0028 through the organization decision procedure; regenerate canonical policy and release guidance.
  • Preserve the full Linux/macOS Zsh matrix, ZD compatibility, Trunk, CodeQL, clean startup and real-object lifecycle qualification before ordinary main merges.
  • Replace promotion-only release identity with a reviewed exact-SHA release plan and explicit publication authority; ordinary merges must not publish releases.
  • Update contribution guidance, templates, Renovate and downstream branch references, including the private meta-repository tracking declaration.
  • Verify required checks on a real main PR, installation and self-update; reconcile retained commits, historical issues and open PRs before separately authorized next retirement.

Delivery uses linked organization-policy and Zi implementation issues. Current policy remains in force until replacement checks and enforcement are verified.

Activity

  1. added
    type:maintenanceNon-feature maintenance, cleanup, or org work.
    area:metaOrganization-wide policy, templates, or meta-repo work.
    status:triageAwaiting initial review or classification.
    meta:initiativeMarks a parent issue coordinating two or more independently deliverable sub-issues.
    meta:org-trackedIndicates this issue has cross-repository tracking implications (synced to Linear).
    on Oct 8, 2026
  2. ss-o commented on Oct 9, 2026

    @ss-o
    MemberAuthor

    Agent handoff

    Status: Complete

    Repository: z-shell/zi, z-shell/.github and z-shell/wiki

    Branch/PR: Delivered Zi #629, #630, #632, #631, organization #773, #778 and wiki #942. Private workspace tracking and local prompt references are delivered.

    Tracker/Issue: Parent #771, policy #772 and Zi #628.

    Completion criteria

    • Policy: Accepted ADR-0039 amends ADR-0019 and supersedes ADR-0028. Final organization delivery b9a3eafbcd7caaf50e6ebf5c99ee981822bf16ac activates the protected-main contribution and separate signed-milestone contract, regenerates canonical guidance and synchronizes template pins. Policy issue docs(governance): define Zi main integration and milestone authorization #772 closed natively and its Project 28 item is Done.
    • Qualification and enforcement: Signed Zi main 22b6da908579e6e8143a0abe02e6da14e7b4d5b8 has eleven strict required contexts, signatures, resolved threads and retained deletion/non-fast-forward protections, with no bypass actors. Full qualification passed all 21 jobs, including all six Linux/macOS Zsh 5.8.1/5.9/5.9.2 legs, eight ZD jobs including compatibility, full Trunk, CodeQL, clean startup and real-object lifecycle checks. Separate push workflows also passed. Actual aggregate regressions reject failed, skipped and cancelled constituents. Fork qualification was verified before removing the old source guard requirement; historical guard failures are retired-check evidence, not a passing check or a bypass.
    • Milestones: Read-only exact-SHA release planning and signed annotated-tag publication replace promotion authorization. Signature, exact current main, latest successful push qualification and semantic-plan verification are enforced; regressions reject stale, failed, PR-only and mismatched evidence. Ordinary merges do not publish a release. Existing tag creation/update/deletion protection and the existing administrator role are retained. No tag or release was created.
    • References and delivery: Contribution guidance, templates, Renovate and workflows target main. Wiki's signed delivery bcd13edf13c64558f22145337a0d1d55cdb403c8 passed its full main build/publication; GitHub Pages and Cloudflare Pages production deployments both succeeded on that SHA. Private workspace branch declarations, three delivered pins, generated instructions and local prompt references are synchronized. The initialized children are clean and match their pins.
    • Consumers, history and issues: Fresh startup and existing-clone main self-update, failed-fetch preservation and successful retry passed on final Zi main. Local runtime probes used Linux Zsh 5.9.2; the hosted matrix is separate platform evidence. Promotion retained historical ancestry and canonical tags. Historical closure reconciliation and its read-only replay found no outstanding unqualified closing clause. Former next PR docs(policy): make acting on review threads part of the done gate #627 is merged; there are no open Zi PRs.
    • Authorized retirement: Remote next at 4a91dbb1b401df7c52a125f0ee1cbb53e1f700ae had zero unique commits against delivered main. After downstream synchronization, the maintainer separately approved remote-only retirement. The exact-tip deletion succeeded and obsolete next-only ruleset 20885504 was deleted. Main/tag rules are unchanged by content comparison; canonical tags, local refs and worktrees match their saved receipts. The different local next tip and all topic work are preserved. Main history and the saved next tip retain recovery evidence; recreating a persistent integration branch remains separately scoped.

    Review and verification limits

    Each normal protected merge has its applicable exact-head review of record. Wiki's explicit ADR-0035 election and additional separate-session review are recorded with the review wrapper's limitations; that scrutiny is not a second human or proof of independence.

    The private workspace change passed 120 Python tests, 42 bootstrap cases, Ruff 0.16.7, ShellCheck and generation checks. Its hosted validation failed before running any jobs and is unavailable validation, not a pass. Unrelated zd/zsh-lint pin drift and other checkouts' runtime currency findings remain recorded outside this migration's scope. Auxiliary local wiki snapshot rebuilding refused its dependency-layout guard; the actual main build and production deployments provide delivery evidence. Completion advisor transport was unavailable because parent runtime identification failed; no advisor approval is claimed.

    No release, unrelated source repair or local branch/worktree cleanup is part of this completion.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    area:metaOrganization-wide policy, templates, or meta-repo work.meta:initiativeMarks a parent issue coordinating two or more independently deliverable sub-issues.meta:org-trackedIndicates this issue has cross-repository tracking implications (synced to Linear).status:triageAwaiting initial review or classification.type:maintenanceNon-feature maintenance, cleanup, or org work.

    Type

    No type

    Projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions