Skip to content

docs(workflow): adopt worktree and reviewed rebase delivery - #5

Merged
KnowSky404 merged 1 commit into
mainfrom
docs/development-workflow
Oct 26, 2026
Merged

KnowSky404 merged 1 commit into
mainfrom
docs/development-workflow

Conversation

@KnowSky404

@KnowSky404 KnowSky404 commented Oct 26, 2026 •

Copy link
Copy Markdown
Owner

SubMan had no complete task workflow covering isolated development, current-head review, rebase merge, and safe cleanup. This change documents the sequence in AGENTS.md and the bilingual development guides, adds a PR template, and links it from both READMEs.

Each task uses a dedicated worktree and branch. PRs require current-head Codex Code Review and enabled required reviews before an authorized rebase merge. Completion verifies integration into main, fast-forwards a clean main checkout, and removes only the verified merged task's worktree and branches, with an explicit SHA lease for remote deletion.

SubMan's existing CI, Bun version, and publication/deployment authorization rules are retained. This documentation does not configure GitHub review integrations or rulesets.

Task and verification evidence

  • Worktree: /root/Clouds/SubMan-development-workflow
  • Branch: docs/development-workflow
  • Base SHA: c92e421
  • Tested head SHA: 03811b3
  • Bun 1.3.14: docs:check passed for all 37 bilingual Wiki pages and local links.
  • git diff --check passed; commands and bilingual changes reviewed.
  • Documentation/instruction/template changes only; runtime tests and PRE are not applicable.
  • CI verify passed for the tested head, including unit, sing-box, type, lint, build, Worker integration, deployment dry-run, and browser checks.
  • Codex review evidence: both reviews completed for 03811b3, with no findings or unresolved findings.
    • Code Review: completed 2026-10-26T08:01:58.187946Z.
    • Security Review: completed 2026-10-26T08:04:36.783912Z.
  • No inline review threads or blocking findings.

The user authorized PR creation, rebase merge after gates pass, and cleanup of the corresponding branches/worktree.

Merge and completion

  • Rebase merged on 2026-10-26T08:05:12Z.
  • Original head: 03811b3.
  • Resulting main commit: 99ea564.
  • Verified merge SHA in origin/main, identical final trees, and equivalent original/rebased patches with git range-diff.
  • Original main checkout fast-forwarded and clean; local main, origin/main, and live remote main match.
  • Removed the clean task worktree and local task branch.
  • Deleted the remote task branch using an explicit lease pinned to the merged original head; verified its absence.

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 26, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-26T08:01:58.187946Z 03811b3 PR opened
🔒 Security Review ✅ Completed 2026-10-26T08:04:36.783912Z 03811b3 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@KnowSky404
KnowSky404 merged commit 99ea564 into main Oct 26, 2026
1 check passed
@KnowSky404
KnowSky404 deleted the docs/development-workflow branch October 26, 2026 08:05
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