From f9fcd36b34c1b954e86a2a88a5538660552cf363 Mon Sep 17 00:00:00 2001 From: iamnbutler Date: Thu, 22 Oct 2026 13:02:03 -0400 Subject: [PATCH] fix(channel): ask before staging unrelated work when lane push refuses --- packages/channel/src/room.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/channel/src/room.ts b/packages/channel/src/room.ts index 8c249653..abbd0fa3 100644 --- a/packages/channel/src/room.ts +++ b/packages/channel/src/room.ts @@ -235,6 +235,9 @@ export function section(room: Room): PromptSection { "changes to something unrelated. Your working directory is your current lane.", "Lanes are lane CLI worktrees: push one for a pull request with `lane push`, which rebases it", "onto its base and commits lane's context memory, not with a plain `git push`.", + "If `lane push` refuses because of uncommitted or untracked files, never stage everything", + "(`git add -A`, `git add .`, `git commit -a`) to get past it. Commit only files you know belong", + "to the work, by path; for the rest, stop, list them, and ask the person what to do.", ].join("\n"); }, };