Skip to content

release: dev -> master - #13

Merged
xormania merged 11 commits into
masterfrom
release/dev-into-master
Sep 2, 2026
Merged

release: dev -> master#13
xormania merged 11 commits into
masterfrom
release/dev-into-master

Conversation

@xor-machine

Copy link
Copy Markdown
Contributor

Release: dev merged into master, conflicts resolved to dev. Earlier rebase releases left master with copies of dev commits, so a plain merge conflicts on files changed since; the resulting tree is identical to dev. Needs a merge commit: linear history off on master.

🤖 Generated with Claude Code

https://claude.ai/code/session_012Jj94rkp3tfHAxUkTCthgY

xormania and others added 11 commits September 1, 2026 13:43
Findings applied from the independent audit (CHANGES verdict):
workflow-level permissions contents:read; persist-credentials false
on checkout; every action pinned to a reviewed commit SHA with its
tag in a comment; Serena pinned in .mcp.json to the audited git
commit instead of floating uvx resolution.

Finding: [P1] workflows ran with default token permissions
Finding: [P1] .mcp.json launched unversioned uvx serena
Finding: [P2] mutable action tags across all repositories
Verified: python yaml.safe_load + json.load on the changed files

Source: original
Co-Authored-By: GPT-5 Codex <noreply@openai.com>
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Reviewed-by: GPT-5 Codex <noreply@openai.com>
Claude-Session: https://claude.ai/code/session_01XehTac5TJNmPAskwrPp7rJ
repo: workflow and MCP hardening from the security audit
Add the organisation's term wall to the `ci` job, right after
checkout, pinned to the commit under review in minspec/.github#8.
The step reads its pattern from the repository variable TERM_WALL
and refuses when that is unset, so an unconfigured repository fails
instead of passing.

Source: original
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012Jj94rkp3tfHAxUkTCthgY
Apply-Push-Job: 20260901T230938Z-apply-push-37f496
Patch-SHA256: b4531359ae7de13e8c3971798360d09faad4bb1369d9460ef9d09472c51e51e7
repo: run the term wall in CI
`pull_request` without `types` fires on opened, synchronize and
reopened only, so a title or body edited after the checks passed
reached the merge unscanned. Name the types and add `edited`; the
wall then runs against the current text.

Source: original
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012Jj94rkp3tfHAxUkTCthgY
Apply-Push-Job: 20260901T234700Z-apply-push-f50b1d
Patch-SHA256: 2a0805c0fffd8c391d021298a54e94a005628bc080ab5fa7f622a67ff5137d9c
repo: scan a pull request again when its text is edited
minspec/.github#10 pins the content surface to every tracked blob,
read from the object store, bytewise, symlinks never followed. Point
the wall step at that merge.

Source: original
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012Jj94rkp3tfHAxUkTCthgY
Apply-Push-Job: 20260902T004053Z-apply-push-b507a7
Patch-SHA256: 6e2ac3b46cc179bb7757c9e87d797f7304beb2346b944b3db8dadb6829f53c2f
repo: move the wall to the object-store scan
Workflows name master where they named main, and CODEOWNERS makes
the release branch the owner's to approve.

Source: original
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012Jj94rkp3tfHAxUkTCthgY
Apply-Push-Job: 20260902T222649Z-apply-push-6a0f71
Patch-SHA256: 7dd99a9140904ef4c750a03228fe34172bb28ee74d20c374ef642cb9557ee5b2
repo: master is the release branch
Earlier rebase releases left master with copies of dev's commits, so
the merge conflicts on files changed since. Resolved to dev, the trunk.

Source: original
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012Jj94rkp3tfHAxUkTCthgY
@xor-machine
xor-machine marked this pull request as ready for review September 2, 2026 22:44
@xormania
xormania merged commit 9fa6df3 into master Sep 2, 2026
1 check passed
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.

2 participants