code-integrate
Integrate a Code Writer's patch files into a part branch, run the gates and measure the size, then squash the branch into one signed commit and push it. Use when a Writer report arrives with format-patch files, when a part branch needs its commits applied and checked, or when a checked part is ready to squash and push. Not for choosing commit messages (see /commit), for restacking branches, or for syncing open pull requests.
- License 许可
- Apache-2.0
- 所属仓库
- LNSD/lorecraft
- 最近更新
- 2026-11-10
- Stars
- ★ 0
- Forks
- 1
01 前言 Front Matter
- name
- code-integrate
- description
- Integrate a Code Writer's patch files into a part branch, run the gates and measure the size, then squash the branch into one signed commit and push it. Use when a Writer report arrives with format-patch files, when a part branch needs its commits applied and checked, or when a checked part is ready to squash and push. Not for choosing commit messages (see /commit), for restacking branches, or for syncing open pull requests.
- allowed-tools
- Bash(python3 .agents/skills/code-integrate/scripts/integrate.py *) Bash(python3 */.agents/skills/code-integrate/scripts/integrate.py *)
- compatibility
- Requires python3, git with commit signing configured, and just with the repository's gate recipes. Pushing needs a remote named origin.
02 资源文件 2
- 脚本scripts/gitflow.py7.9 KB
- 脚本scripts/integrate.py11.0 KB
03 SKILL.md 正文
Code Integrate
Two mechanical steps of integrating a Writer's work, as one command each. Every command prints ONE compact JSON
result and writes the raw git and gate output to a log file, named in the result as log; read the log only when
the result says something failed. Judgement stays with the caller: the commit message, the split, the review.
When to Use
apply: a Writer's patch files are ready to go onto a part branch, and the gates and size are wanted.squash: the applied branch is accepted and is to become one signed commit on its base, pushed.
The scripts never resolve a conflict, never commit unsigned, never use plain --force, and never merge or
close a pull request.
Commands
Run on a clean working tree. --repo names the repository and defaults to the current directory, so the call
needs no cd; patch and message-file paths are read from the caller's directory, not from --repo.
python3 <repo>/.agents/skills/code-integrate/scripts/integrate.py apply --repo <repo> --branch lnsd/<slug> --base origin/main <patch>...
python3 <repo>/.agents/skills/code-integrate/scripts/integrate.py apply --repo <repo> --branch lnsd/<slug> --base origin/main --rebase <patch>...
python3 <repo>/.agents/skills/code-integrate/scripts/integrate.py squash --repo <repo> --branch lnsd/<slug> --base origin/main --message-file <file>
| Argument | Meaning |
|---|---|
--repo |
The repository to work in; default the current directory |
--branch |
The part branch, as named on the remote |
--base |
The ref the part sits on: origin/main, or the branch of the part below |
<patch>... |
The git format-patch files, in order |
--message-file |
The commit message, written by the caller with the commit skill |
--rebase |
apply only: start the part branch at --base, not origin/<branch>, for patches from a Writer REBASE |
apply fetches, switches to the branch (created at the base when it is not on the remote, otherwise at
origin/<branch>; a local branch that already descends from that start is continued, so a FIX after a failed
gate lands on top of the commits applied before), applies the patches with git am --3way, runs the gates
fmt-check, check, typecheck, test and check-docs in that order, stopping at the first failure, and
measures the size against the base. With --rebase, it starts at --base even when the local branch still points
to the old remote head, and records that fetched remote SHA for squash's lease. The default behavior is unchanged.
A FIX after a failed apply --rebase must pass --rebase again to keep the same mode.
A gate that passes but leaves the tree changed is reported as gates_failed.
squash soft-resets to the base, commits with -s -S, checks that %G? is G, then pushes: -u when the
branch is new on the remote, otherwise --force-with-lease pinned to the origin/<branch> that apply fetched.
After apply --rebase, it uses the recorded base and lease SHA and allows the rebased branch not to contain
origin/<branch>. A remote update after apply still makes the lease fail. It refuses when the tree is not clean,
when the default-mode branch does not contain origin/<branch>, and when the push is rejected; each time it puts
the branch back and pushes nothing, as it does when the commit is not signed.
Result
{"status":"ok","branch":"lnsd/x","base_sha":"…","start_sha":"…","head_sha":"…","commits":2,"size":243,"gates":{"fmt-check":"pass","check":"pass"},"log":"…"}
apply:statusisok,gates_failed(the failed gate isfailand later gates did not run, or a gate left the tree changed, with areason) orneeds_rebase. In rebase mode,lease_shais the remote SHA fetched for the later push lease.sizeis lines added plus deleted against the base, lockfiles and binary files excluded.squash:statusisokwithhead_sha,signature(G) andpush(neworlease).refusedanderrorcarry areason.
Exit codes
| Code | Meaning | What the caller does |
|---|---|---|
| 0 | ok |
Continue |
| 1 | A gate failed | Read the log, send the failure back as a FIX |
| 2 | The patches do not apply; git am was aborted and the branch is untouched |
Resolve the patch conflict with the Writer against the selected base |
| 3 | Refused (--repo is not a git repository, dirty tree, local branch not descending from its start, unsigned commit, base not an ancestor, remote ahead of the branch in default mode, or stale rebase lease) or a git command failed |
Read reason; fix the setup, do not work around it |
04 同仓库更多 Skills
review
Review a change. Use when asked to review.
review
Review a change. Use when asked to review.
review
Review a change. Use when asked to review.
review
Review a change. Use when asked to review.
review
Review a change. Use when asked to review.
review
Review a change. Use when asked to review.