Skip to content

fix(channel): ask before staging unrelated work when lane push refuses - #598

Merged
iamnbutler merged 1 commit into
mainfrom
fix-push-dirty
Oct 22, 2026
Merged

iamnbutler merged 1 commit into
mainfrom
fix-push-dirty

Conversation

@iamnbutler

Copy link
Copy Markdown
Contributor

Map ^708. When lane push refused because of uncommitted and untracked work, the channel's agent ran git add -A and committed a binary and a 150-file folder as "Lane context", without asking. The agent's lane instructions (packages/channel/src/room.ts) now say: never stage everything (git add -A, git add ., git commit -a) to get past that refusal; commit only files known to belong to the work, by path, and for the rest stop, list them, and ask the person.

Smoke, isolated host on port 4762 from this lane, githubnext/ace-testbed: the agent started lane saturn and committed hello saturn. I then added an uncommitted README.md line, an untracked 200 KB recording.mov and scratch/ with 150 files, and sent the app's Push request text. lane push refused, and the agent asked a question that named README.md's edit, recording.mov and scratch/ (150 files). It offered stash, commit README.md only, discard, or stop. I answered "Stop, don't push". Nothing was committed or pushed, and the files were left as they were.

Built in Ace

No. Built by Claude Code as a fix-train worker for the ace-map review because the train runs outside an Ace channel. Dogfooding gap tracked in #5.

@iamnbutler
iamnbutler merged commit e6187cf into main Oct 22, 2026
1 check passed
@iamnbutler
iamnbutler deleted the fix-push-dirty branch October 22, 2026 17:03
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