Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 0.47.18 - 2026-11-16

- Name path-scoped stack absorb with a new commit for uncommitted primary changes, reserving capture-integration for existing unowned commits. Refuse default amend on an empty stack before changing its base, metadata or worktrees. An empty recipe whose branch has moved from the base also refuses a new-commit absorb, preserving its undeclared history.

## 0.47.17 - 2026-11-16

- Let stack sync update selected manifest metadata while unrelated primary product files are unstaged. Preserve product bytes, indexes, ignore files and unrelated refs; require explicit recovery for pending operations instead of starting promotion recovery or worktree cleanup.
Expand Down
24 changes: 15 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Keep many long-lived pull requests clean, rebuildable, and publishable from one
manifest.

Current version: `0.47.17`
Current version: `0.47.18`

`syncwheel` is a small CLI and workflow model for maintainers who carry several
PR branches against an upstream repository and need those branches to stay
Expand Down Expand Up @@ -515,8 +515,9 @@ warnings for unfinished lanes when stderr is a TTY; `NO_COLOR` removes ANSI
color and JSON output remains free of ANSI sequences.

When an occupied primary checkout stops a mutating command, Syncwheel names
manifest-derived capture and queue commands in the error. Capture committed
primary work with `syncwheel stack capture-integration <stack> HEAD`, or leave
manifest-derived recovery commands in the error. For uncommitted tracked changes,
use `syncwheel stack absorb <stack> <paths> -N -m "message"` after identifying
their owning stack. Capture already committed, unowned primary work with `syncwheel stack capture-integration <stack> HEAD`, or leave
another agent's primary checkout unchanged and use
`syncwheel worktree open <lane> --into <stack>`. Capacity and expired-lane
diagnostics name the corresponding `syncwheel stack add <stack> <base>..<lane>`
Expand Down Expand Up @@ -1115,18 +1116,22 @@ missing, it refuses and names the owner.

### 3. Absorb integration-first work into stacks

When the main checkout is on the integration branch, you can make and test
changes there first, then assign those changes to the PR stack that owns them:
When uncommitted changes already exist on the integration checkout, transfer
them to their owning stack before continuing:

```bash
python3 scripts/syncwheel.py stack absorb feature-a path/to/file.ts
python3 scripts/syncwheel.py stack absorb feature-a --staged
python3 scripts/syncwheel.py stack absorb feature-a path/to/file.ts -N -m "Add feature work"
python3 scripts/syncwheel.py stack absorb feature-a --staged -N -m "Add staged feature work"
```

By default, `stack absorb` amends the stack branch tip, refreshes that stack's
manifest commits, and reverse-applies the absorbed patch from the integration
checkout. Pass `--no-amend -m "message"` when the absorbed change should become
a new stack commit. Use `--staged` after `git add -p` when one file contains
a new stack commit. An empty stack requires this option: default amend is refused
so its base commit cannot be amended. If an empty recipe has a branch that has
already moved away from its base, absorb refuses: preserve that history for
explicit classification and use a fresh draft for the patch. `capture-integration` assigns existing
commits; it does not capture dirty working-tree bytes. Use `--staged` after `git add -p` when one file contains
changes for multiple PR stacks.

Example: two files belong to `feature-a`, one file belongs to `feature-b`, and
Expand Down Expand Up @@ -1305,7 +1310,8 @@ Bounded metadata operations can preserve those changes in place: setting authori
on an untracked personal manifest, setting or clearing the private PR merge policy,
closing an empty non-coordinated draft with the default reason or `--reason closed`,
without forcing or deleting its branch, and
archiving a non-coordinated stack through its exact plan. Existing index conflicts,
archiving a non-coordinated stack through its exact plan, and stack sync without
pending recovery. Existing index conflicts,
unrelated staged paths and a dirty shared control manifest still stop them. Archive
keeps the required recovery refs; close retains the source branch by default.

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.47.17
0.47.18
7 changes: 5 additions & 2 deletions docs/ai-agents.md
Original file line number Diff line number Diff line change
Expand Up @@ -211,14 +211,17 @@ active-active channel must use the coordination remote.
exact current projected tip, and the lane records that commit as its base
- product-changing mutations stop on unrelated dirty primary files. Personal authority
updates, private PR policy set/clear, empty non-coordinated draft close with its default
reason or `closed` and without force or branch deletion, and non-coordinated archive
may proceed while preserving those
reason or `closed` and without force or branch deletion, non-coordinated archive
and stack sync without pending recovery may proceed while preserving those
files. Index conflicts, unrelated staged paths and a dirty shared control manifest
still stop these operations. Pending control recovery requires its explicit remedy
- metadata saves do not normalize ignore files or force-stage authority changes;
use explicit tracking configuration when exclusions need updating
- read-only diagnostics remain usable when the primary is dirty; treat their yellow
dirty-primary warning as foreign work, not permission to repair it
- for uncommitted tracked primary changes, identify their owning stack and use
`syncwheel stack absorb <stack> <paths> -N -m "message"`. Default amend refuses
an empty stack; it must not amend the base commit
- use `syncwheel stack capture-integration <stack> HEAD` only for already committed
primary work named by a refusal; do not create a new primary commit to use it
- use `syncwheel hooks remove --disable --reason "..." --apply` only as a deliberate,
Expand Down
4 changes: 2 additions & 2 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1826,7 +1826,7 @@
<div class="hero-stage" id="top">
<section class="hero" aria-labelledby="hero-heading">
<div class="hero-copy">
<span class="eyebrow"><span class="ai-sigil" aria-hidden="true"></span>AI-ready Git coordination <span class="hero-version">v<!-- syncwheel-version:start -->0.47.17<!-- syncwheel-version:end --></span></span>
<span class="eyebrow"><span class="ai-sigil" aria-hidden="true"></span>AI-ready Git coordination <span class="hero-version">v<!-- syncwheel-version:start -->0.47.18<!-- syncwheel-version:end --></span></span>
<h1 id="hero-heading"><span class="title-line">Move at</span><span class="title-line">machine speed.</span><span class="title-line accent">Stay in control.</span></h1>
<p class="subhead">Syncwheel coordinates every Git lane used by humans, AI agents, CI and delivery systems—without sacrificing review, safety or recovery.</p>
<div class="actions">
Expand Down Expand Up @@ -2602,7 +2602,7 @@ <h2 class="section-title">Your first verified plan in minutes.</h2>
</main>

<footer>
<span>syncwheel v<!-- syncwheel-version:start -->0.47.17<!-- syncwheel-version:end --> · MIT · a NestDevLab project</span>
<span>syncwheel v<!-- syncwheel-version:start -->0.47.18<!-- syncwheel-version:end --> · MIT · a NestDevLab project</span>
<a class="logo-link" href="https://www.nestdev.it/" aria-label="NestDevLab">
<img src="https://www.nestdev.it/assets/logo-nestdev.png" width="22" height="22" alt="">
</a>
Expand Down
2 changes: 1 addition & 1 deletion openpack.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"schemaVersion": 2,
"name": "NestDevLab/syncwheel",
"version": "0.47.17",
"version": "0.47.18",
"provides": [
{
"type": "skills",
Expand Down
Loading
Loading