diff --git a/README.md b/README.md
index 6e406ac660bd..f0f528ea32e3 100644
--- a/README.md
+++ b/README.md
@@ -580,6 +580,7 @@ The roadmap is about one thing: making the agent smarter, more autonomous, and m
 
 ### Done
 
+- [x] Pair programming: `bolt pair` shares one live session across two terminals, prompts and replies from either side appear in both (no shared cursor yet; direct shell input may double-render, and permission prompts can be answered by either side)
 - [x] `multiedit`: batch several edits to one file in a single tool call
 - [x] Background process tools: `background` start, output, list, and kill without blocking the loop
 - [x] `test_run`: run tests and hand the agent structured failures
diff --git a/packages/opencode/src/cli/cmd/pair.ts b/packages/opencode/src/cli/cmd/pair.ts
index 9dcaa4032d92..0fe4b87824ad 100644
--- a/packages/opencode/src/cli/cmd/pair.ts
+++ b/packages/opencode/src/cli/cmd/pair.ts
@@ -135,7 +135,6 @@ export const PairCommand = effectCmd({
         username: args.username,
         pair: true,
       }),
-    )
-    yield* Effect.promise(() => server.stop(true))
+    ).pipe(Effect.ensuring(Effect.promise(() => server.stop(true))))
   }),
 })