happy-stacks 0.6.9 → 0.6.11

package/docs/commit-audits/happy/leeroy-wip.commit-inventory.md

@@ -45,7 +45,7 @@ Progress tracking (update manually while auditing):
 - Next unreviewed commit: n/a (complete)
 - Pass 2 full-diff verification markers: `249/249` (each `## NNN` has a `Pass2FullDiff:` line; patch artifacts under `/tmp/leeroy-wip-pass2/NNN.patch`)
 - Pass 2 diff capture: `249/249` (`/tmp/leeroy-wip-pass2/NNN.patch` exists; hash/size recorded in each `Pass2FullDiff:` line)
-- Pass 2 notes verification (manual): `77/249` (this requires reading the patch and confirming/updating `### Manual Review Notes`)
+- Pass 2 notes verification (manual): `110/249` (this requires reading the patch and confirming/updating `### Manual Review Notes`)
 
 Current state (2026-01-24):
 

package/docs/commit-audits/happy/leeroy-wip.commit-manual-review.md

@@ -19,7 +19,7 @@ This document is only trustworthy if every commit section is derived from the ac
 For every commit `NNN`, even if the diff is very large:
 
 1. Generate the full patch to disk (this is the non-negotiable “full diff” evidence):
-   - `happys wt git happy slopus/tmp/leeroy-wip -- show --no-color --format=fuller <sha> > /tmp/leeroy-wip-pass2-<NNN>.patch`
+   - `happys wt git happy slopus/tmp/leeroy-wip -- show --no-color --format=fuller <sha> > /tmp/leeroy-wip-pass2/<NNN>.patch`
 2. Record verifiable evidence for the patch:
    - `patchSha256` (sha256 of the patch file)
    - `patchBytes` and `patchLines`
@@ -2792,7 +2792,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=cd5771e50881 patchFile=/
 ---
 
 ## 079 2026-01-12 456e2ad8e2b8 `resume`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=456e2ad8e2b8 patchFile=/tmp/leeroy-wip-pass2/079.patch patchSha256=1038412aa6be537c540443b64b6437f4eb00d0315c79e4e819e2c68d0eb0a234 patchBytes=10666 patchLines=265 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=456e2ad8e2b8 patchFile=/tmp/leeroy-wip-pass2/079.patch patchSha256=1038412aa6be537c540443b64b6437f4eb00d0315c79e4e819e2c68d0eb0a234 patchBytes=10666 patchLines=265 notesReviewed=yes reviewedAt=2026-01-24T20:30:50+0100 notesUpdated=yes
 
 - Subject: refactor(resume): don't require agentSessionId from UI
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -2804,11 +2804,13 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=456e2ad8e2b8 patchFile=/
   - `sync/ops.ts` / `SessionView.tsx`:
     - Removes `agentSessionId` from the resume request shape; UI resumes by Happy session id and agent type only.
     - This pushes “derive vendor resume id” responsibility to the machine/daemon (more secure + less UI coupling to vendor internals).
+    - Likely leaves an unused `getAgentSessionId` import in `SessionView.tsx` (the callsite is removed but the patch does not remove the import); clean up during history rewrite.
   - `utils/agentCapabilities.ts`:
     - Broadens `canAgentResume(...)` to accept unknown strings safely.
     - Adds `SessionMetadata` shape + helpers:
       - `getAgentSessionIdField(...)`, `canResumeSession(...)`, and `getAgentSessionId(...)`.
   - Adds session-state translation keys (`session.resuming`, `session.resumeFailed`, etc.).
+    - Noted: Spanish `inactiveResumable` uses `reanundable` (likely a typo for `reanudable`).
 - Coherence:
   - Matches subject and is a solid architectural improvement for the resume feature.
 
@@ -2824,7 +2826,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=456e2ad8e2b8 patchFile=/
 ---
 
 ## 080 2026-01-11 9b0069e3d30c `fork`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=9b0069e3d30c patchFile=/tmp/leeroy-wip-pass2/080.patch patchSha256=d0775d17447e5f09b0c0043294929d4b05c4f7a900063c95323c37df142a214b patchBytes=13508 patchLines=247 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=9b0069e3d30c patchFile=/tmp/leeroy-wip-pass2/080.patch patchSha256=d0775d17447e5f09b0c0043294929d4b05c4f7a900063c95323c37df142a214b patchBytes=13508 patchLines=247 notesReviewed=yes reviewedAt=2026-01-24T20:32:11+0100 notesUpdated=yes
 
 - Subject: feat(fork): enable Codex resume support
 - Reasons: fork-only behavior (should not go upstream as-is)
@@ -2836,9 +2838,9 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=9b0069e3d30c patchFile=/
   - `utils/agentCapabilities.ts` adds `'codex'` to `RESUMABLE_AGENTS` with an explicit “Fork” note.
   - Session Info UX in `app/(app)/session/[id]/info.tsx`:
     - Adds a “Codex Session ID” item with copy-to-clipboard behavior (uses translation keys added earlier).
-    - Refactors copy-command handlers (`handleCopyCommand` helper) and unifies “copy resume command” logic (now `copyResumeCommand`).
+    - Refactors copy-command handlers (`handleCopyCommand` helper) and unifies “copy resume command” into `happy resume <happySessionId>` (shown only for inactive sessions that have an agent session ID in metadata).
   - `sync/storageTypes.ts` appears to add/validate `codexSessionId` metadata shape (schema alignment).
-  - Adds/updates i18n keys (`sessionInfo.copyResumeCommand`, `sessionInfo.codexSessionId`, etc.).
+  - Adds i18n key `sessionInfo.copyResumeCommand` across locales (Codex Session ID translation keys were added earlier in 076).
 - Coherence:
   - This is still within the “resume support” topic, but it’s fork-specific (Codex resume enablement) and should be isolated from any upstream PR stack.
 
@@ -2854,7 +2856,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=9b0069e3d30c patchFile=/
 ---
 
 ## 081 2026-01-22 4ddaef02210e `sync`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=4ddaef02210e patchFile=/tmp/leeroy-wip-pass2/081.patch patchSha256=4898c477cf549a2bf357661b4ade980ba45511fb0c0b93ad24c80baa3e93323d patchBytes=1566 patchLines=43 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=4ddaef02210e patchFile=/tmp/leeroy-wip-pass2/081.patch patchSha256=4898c477cf549a2bf357661b4ade980ba45511fb0c0b93ad24c80baa3e93323d patchBytes=1566 patchLines=43 notesReviewed=yes reviewedAt=2026-01-24T20:33:19+0100 notesUpdated=yes
 
 - Subject: fix(sync): omit model meta for queued messages
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -2864,7 +2866,9 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=4ddaef02210e patchFile=/
 - Diffstat: `1 file changed, 7 insertions(+), 6 deletions(-)`
 - What changed:
   - `sync/sync.ts`:
-    - Computes `model` from `(session.metadata.flavor, session.modelMode)` and includes it in outgoing message meta only for Gemini when a non-default model is selected.
+    - Computes `model` from `(session.metadata.flavor, session.modelMode)`:
+      - For Gemini: defaults `modelMode` to `'gemini-2.5-pro'` when unset, and includes `model` in outgoing message meta when `modelMode !== 'default'`.
+      - For non-Gemini: omits `model` (`undefined`) from outgoing meta.
     - Switches meta construction to `buildOutgoingMessageMeta({ ... })` and drops `fallbackModel`.
 - Coherence:
   - Matches subject; this is a small correctness tweak to avoid sending irrelevant/incorrect model metadata in queued/outgoing messages.
@@ -2881,7 +2885,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=4ddaef02210e patchFile=/
 ---
 
 ## 082 2026-01-12 3fbdc10018fe `tmux`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=3fbdc10018fe patchFile=/tmp/leeroy-wip-pass2/082.patch patchSha256=f2cc8568717d548920cea037c3b6e362272f870517c93ed7e2a86d9115651d03 patchBytes=30647 patchLines=723 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=3fbdc10018fe patchFile=/tmp/leeroy-wip-pass2/082.patch patchSha256=f2cc8568717d548920cea037c3b6e362272f870517c93ed7e2a86d9115651d03 patchBytes=30647 patchLines=723 notesReviewed=yes reviewedAt=2026-01-24T20:34:54+0100 notesUpdated=yes
 
 - Subject: fix: tmux parsing/targeting + review feedback
 - Reasons: safety/reliability-sensitive area (process control) + non-Conventional-Commits subject
@@ -2899,8 +2903,10 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=3fbdc10018fe patchFile=/
     - Removes env-derived session/window fields from `TmuxSessionInfo` (only keeps `env_pane` + socket path, and relies on tmux query for session/window).
   - Additional review feedback items are included (mixed into the same commit):
     - Aligns `Machine.metadata` typing to runtime (nullable).
-    - Tightens some script/test behavior (`ripgrep_launcher`, env wrapper, etc.).
-    - Deletes a CLI doc file (`cli/docs/bug-fix-plan-2025-01-15-athundt.md`).
+    - Tightens script/test behavior (`ripgrep_launcher`, `env-wrapper`, continue-test script) and clarifies failure modes (missing args, signal termination).
+    - Adjusts CLI API sending behavior: introduces `ApiSessionClient.canSend(...)` and now returns early (drops the emit) when the socket is disconnected for multiple message/event types (may change socket.io buffering semantics vs prior behavior).
+    - Improves resume/continue ergonomics and cancellation: supports `-r` as `--resume` alias and wires SIGINT/SIGTERM to abort offline `claudeLocal` runs.
+    - Edits a CLI doc file (`cli/docs/bug-fix-plan-2025-01-15-athundt.md`) rather than deleting it.
 - Coherence:
   - The tmux portion is cohesive and important for correctness.
   - The extra “misc scripts/tests/typing” changes make the commit mixed; during rewrite we should consider splitting to keep tmux fixes isolated and bisectable.
@@ -2922,7 +2928,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=3fbdc10018fe patchFile=/
 ---
 
 ## 083 2026-01-13 7292a29822bb `daemon`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=7292a29822bb patchFile=/tmp/leeroy-wip-pass2/083.patch patchSha256=40cb173cb1aa03a44ac0c18b4e07de6b8872336399fb768bf21f7a60daef97ab patchBytes=5066 patchLines=99 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=7292a29822bb patchFile=/tmp/leeroy-wip-pass2/083.patch patchSha256=40cb173cb1aa03a44ac0c18b4e07de6b8872336399fb768bf21f7a60daef97ab patchBytes=5066 patchLines=99 notesReviewed=yes reviewedAt=2026-01-24T20:36:02+0100 notesUpdated=no
 
 - Subject: fix(daemon): do not apply CLI active profile to GUI-spawned sessions
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -2950,7 +2956,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=7292a29822bb patchFile=/
 ---
 
 ## 084 2026-01-13 ce94cfa512ac `session`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=ce94cfa512ac patchFile=/tmp/leeroy-wip-pass2/084.patch patchSha256=1386819edc6fc6248c2b34ad7ce7260a18396dfd78afa8cbf88eb473d8fc0c87 patchBytes=5925 patchLines=128 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=ce94cfa512ac patchFile=/tmp/leeroy-wip-pass2/084.patch patchSha256=1386819edc6fc6248c2b34ad7ce7260a18396dfd78afa8cbf88eb473d8fc0c87 patchBytes=5925 patchLines=128 notesReviewed=yes reviewedAt=2026-01-24T20:38:18+0100 notesUpdated=no
 
 - Subject: feat(session): persist profileId in session metadata via daemon spawn
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -2983,7 +2989,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=ce94cfa512ac patchFile=/
 ---
 
 ## 085 2026-01-13 e58e97fd7ff4 `pr107`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=e58e97fd7ff4 patchFile=/tmp/leeroy-wip-pass2/085.patch patchSha256=d61afad1a74bec40de6ef5fd636e9b200d023a14d4216037b207f4886e009b55 patchBytes=5232 patchLines=122 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=e58e97fd7ff4 patchFile=/tmp/leeroy-wip-pass2/085.patch patchSha256=d61afad1a74bec40de6ef5fd636e9b200d023a14d4216037b207f4886e009b55 patchBytes=5232 patchLines=122 notesReviewed=yes reviewedAt=2026-01-24T20:38:46+0100 notesUpdated=yes
 
 - Subject: fix(pr107): harden daemon spawn + align profile schema
 - Reasons: safety/reliability-sensitive area
@@ -3001,6 +3007,8 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=e58e97fd7ff4 patchFile=/
       - URL fields (`baseUrl` / `endpoint`) accept either real URLs or `${VAR}` / `${VAR:-default}` template strings.
   - `cli/src/utils/expandEnvVars.ts`:
     - Adds support for `${VAR:=default}` in addition to `${VAR:-default}` when expanding environment variables.
+- Notes:
+  - `expandEnvVars` supports `${VAR:=default}`, but `URL_OR_TEMPLATE_REGEX` only validates `${VAR}` / `${VAR:-default}` (and the error string doesn’t mention `:=`). If the GUI starts emitting `:=` templates for URL fields, CLI schema validation would still reject them; consider aligning during history rewrite.
 - Coherence:
   - All changes relate to daemon spawn robustness and profile schema/env handling; matches subject.
 
@@ -3016,7 +3024,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=e58e97fd7ff4 patchFile=/
 ---
 
 ## 086 2026-01-13 86330e263595 `security`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=86330e263595 patchFile=/tmp/leeroy-wip-pass2/086.patch patchSha256=224fab84d0ef8c04aec8a6ed629c18d85daddae88165e4534d53eff01447f39b patchBytes=3404 patchLines=70 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=86330e263595 patchFile=/tmp/leeroy-wip-pass2/086.patch patchSha256=224fab84d0ef8c04aec8a6ed629c18d85daddae88165e4534d53eff01447f39b patchBytes=3404 patchLines=70 notesReviewed=yes reviewedAt=2026-01-24T20:39:34+0100 notesUpdated=no
 
 - Subject: fix(security): redact spawn secrets from daemon logs
 - Reasons: safety/security-sensitive area
@@ -3054,7 +3062,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=86330e263595 patchFile=/
 ---
 
 ## 087 2026-01-15 a25acab22b64 `socket`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=a25acab22b64 patchFile=/tmp/leeroy-wip-pass2/087.patch patchSha256=ed7c94b65ed87f75dc10b59af9dc200f2ced915784eb5334567e70f9ed48a4ce patchBytes=6610 patchLines=170 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=a25acab22b64 patchFile=/tmp/leeroy-wip-pass2/087.patch patchSha256=ed7c94b65ed87f75dc10b59af9dc200f2ced915784eb5334567e70f9ed48a4ce patchBytes=6610 patchLines=170 notesReviewed=yes reviewedAt=2026-01-24T20:41:19+0100 notesUpdated=yes
 
 - Subject: fix(socket): restore offline buffering for sends
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3064,7 +3072,10 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=a25acab22b64 patchFile=/
 - Diffstat: `3 files changed, 39 insertions(+), 31 deletions(-)`
 - What changed:
   - `cli/src/api/apiSession.ts` removes the “hard guard” that refused to `emit('message', ...)` while the socket is disconnected, relying on socket.io client buffering instead.
+    - It still keeps a disconnected guard for `sendSessionEvent(...)` (returns early before doing encryption/UUID work), but that guard still calls `this.canSend(...)` even though the `canSend` method is removed in this commit’s diff (possible compile error unless `canSend` exists elsewhere in the file/version; verify during rewrite).
+    - Introduces calls to `this.logSendWhileDisconnected(...)` for Codex + ACP messages, but that helper is not defined/added in this diff (likely already exists or is added in a neighboring commit).
   - Adds test coverage in `cli/src/api/apiSession.test.ts` asserting that `sendClaudeSessionMessage(...)` still calls `socket.emit(...)` even when `socket.connected = false`.
+  - `cli/src/claude/runClaude.ts` moves abort-controller + signal handler registration outside the `try` block (behaviorally minor; likely to ensure handlers are always registered before `claudeLocal`).
   - Minor related change in `cli/src/claude/runClaude.ts`: moves signal wiring outside the try block (no behavior change intended).
 - Coherence:
   - The intent is clear and the tests cover the socket buffering assumption.
@@ -3082,7 +3093,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=a25acab22b64 patchFile=/
 ---
 
 ## 088 2026-01-15 a7d23148c311 `logging`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=a7d23148c311 patchFile=/tmp/leeroy-wip-pass2/088.patch patchSha256=0f5bed2f94785e97c26294a861d2e95871e3b1775459989ee1f0f821d6dd42a5 patchBytes=10775 patchLines=280 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=a7d23148c311 patchFile=/tmp/leeroy-wip-pass2/088.patch patchSha256=0f5bed2f94785e97c26294a861d2e95871e3b1775459989ee1f0f821d6dd42a5 patchBytes=10775 patchLines=280 notesReviewed=yes reviewedAt=2026-01-24T20:42:12+0100 notesUpdated=no
 
 - Subject: fix(logging): gate debug output and redact templates
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3115,7 +3126,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=a7d23148c311 patchFile=/
 ---
 
 ## 089 2026-01-13 ef418bc4dda3 `pr107`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=ef418bc4dda3 patchFile=/tmp/leeroy-wip-pass2/089.patch patchSha256=bf155c744980506ceceb29720199a8f0ddcc98737887771636a03accfe55b292 patchBytes=2577 patchLines=50 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=ef418bc4dda3 patchFile=/tmp/leeroy-wip-pass2/089.patch patchSha256=bf155c744980506ceceb29720199a8f0ddcc98737887771636a03accfe55b292 patchBytes=2577 patchLines=50 notesReviewed=yes reviewedAt=2026-01-24T20:42:51+0100 notesUpdated=no
 
 - Subject: fix(pr107): redact profile secrets in doctor + align tmux tmpDir
 - Reasons: safety/security-sensitive area
@@ -3146,7 +3157,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=ef418bc4dda3 patchFile=/
 ---
 
 ## 090 2026-01-13 1f90659694be `profiles`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=1f90659694be patchFile=/tmp/leeroy-wip-pass2/090.patch patchSha256=11d16d45035d579a8eb333ac99ff09a2f7a3225147dd595843238eb3d8130ffe patchBytes=4699 patchLines=137 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=1f90659694be patchFile=/tmp/leeroy-wip-pass2/090.patch patchSha256=11d16d45035d579a8eb333ac99ff09a2f7a3225147dd595843238eb3d8130ffe patchBytes=4699 patchLines=137 notesReviewed=yes reviewedAt=2026-01-24T20:43:32+0100 notesUpdated=no
 
 - Subject: refactor(profiles): remove unwired startup script and local env cache
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3177,7 +3188,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=1f90659694be patchFile=/
 ---
 
 ## 091 2026-01-15 7aed8aaee02f `profiles`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=7aed8aaee02f patchFile=/tmp/leeroy-wip-pass2/091.patch patchSha256=bd0fd2c41227435a67a7fc7de0f8410764f24a886f6f181cb099cb8f416d7467 patchBytes=11805 patchLines=278 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=7aed8aaee02f patchFile=/tmp/leeroy-wip-pass2/091.patch patchSha256=bd0fd2c41227435a67a7fc7de0f8410764f24a886f6f181cb099cb8f416d7467 patchBytes=11805 patchLines=278 notesReviewed=yes reviewedAt=2026-01-24T20:44:29+0100 notesUpdated=no
 
 - Subject: refactor(profiles): drop provider config objects
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3208,7 +3219,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=7aed8aaee02f patchFile=/
 ---
 
 ## 092 2026-01-15 6b0bfe546d9e `runtime`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=6b0bfe546d9e patchFile=/tmp/leeroy-wip-pass2/092.patch patchSha256=f2911b6ee75672a1cddd503f1e9ab32e95b736288b19eb1218217e972c4aaf14 patchBytes=7229 patchLines=195 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=6b0bfe546d9e patchFile=/tmp/leeroy-wip-pass2/092.patch patchSha256=f2911b6ee75672a1cddd503f1e9ab32e95b736288b19eb1218217e972c4aaf14 patchBytes=7229 patchLines=195 notesReviewed=yes reviewedAt=2026-01-24T21:51:01+0100 notesUpdated=yes
 
 - Subject: feat(runtime): support bun for daemon-spawned subprocesses
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3219,6 +3230,8 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=6b0bfe546d9e patchFile=/
 - What changed:
   - `cli/src/utils/spawnHappyCLI.ts` introduces a single “runtime invocation builder” for spawning subprocesses with `node` vs `bun`.
   - Allows overriding runtime via `HAPPY_CLI_SUBPROCESS_RUNTIME`.
+  - Ensures Node subprocesses include `--no-warnings` / `--no-deprecation` flags (mirrors wrapper behavior); bun subprocesses do not.
+  - Adds a helpful “entrypoint missing” error if `dist/index.mjs` is missing.
   - Adds solid unit tests for invocation building and spawn behavior (`spawnHappyCLI.invocation.test.ts`, `spawnHappyCLI.test.ts`).
 - Coherence:
   - Matches subject; this is a scoped runtime feature with good tests.
@@ -3235,7 +3248,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=6b0bfe546d9e patchFile=/
 ---
 
 ## 093 2026-01-15 4071466545ab `rpc`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=4071466545ab patchFile=/tmp/leeroy-wip-pass2/093.patch patchSha256=901ae5fe7520f97b4eeb1e33bd3982c80b2bc3488c641697e4653c4290b734a0 patchBytes=2411 patchLines=52 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=4071466545ab patchFile=/tmp/leeroy-wip-pass2/093.patch patchSha256=901ae5fe7520f97b4eeb1e33bd3982c80b2bc3488c641697e4653c4290b734a0 patchBytes=2411 patchLines=52 notesReviewed=yes reviewedAt=2026-01-24T21:51:52+0100 notesUpdated=no
 
 - Subject: refactor(rpc): accept arbitrary env var maps for spawn
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3261,7 +3274,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=4071466545ab patchFile=/
 ---
 
 ## 094 2026-01-17 809be82b53e7 `env`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=809be82b53e7 patchFile=/tmp/leeroy-wip-pass2/094.patch patchSha256=21ee926dbf4f14df07d8bb300909dca832ee0c6fb0f7e26b9d52148bd3344522 patchBytes=4976 patchLines=112 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=809be82b53e7 patchFile=/tmp/leeroy-wip-pass2/094.patch patchSha256=21ee926dbf4f14df07d8bb300909dca832ee0c6fb0f7e26b9d52148bd3344522 patchBytes=4976 patchLines=112 notesReviewed=yes reviewedAt=2026-01-24T21:52:35+0100 notesUpdated=no
 
 - Subject: fix(env): implement default assignment semantics
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3289,7 +3302,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=809be82b53e7 patchFile=/
 ---
 
 ## 095 2026-01-17 4c2a671dc3f4 `rpc`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=4c2a671dc3f4 patchFile=/tmp/leeroy-wip-pass2/095.patch patchSha256=6aa8fddd2772556524f0568d5a2bccfccdaab0fb4a1df234ae6f8bd33867c558 patchBytes=17576 patchLines=426 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=4c2a671dc3f4 patchFile=/tmp/leeroy-wip-pass2/095.patch patchSha256=6aa8fddd2772556524f0568d5a2bccfccdaab0fb4a1df234ae6f8bd33867c558 patchBytes=17576 patchLines=426 notesReviewed=yes reviewedAt=2026-01-24T21:53:26+0100 notesUpdated=yes
 
 - Subject: feat(rpc): add preview-env handler
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3303,6 +3316,8 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=4c2a671dc3f4 patchFile=/
     - Includes strong secret-handling controls:
       - policy determined by `HAPPY_ENV_PREVIEW_SECRETS` (`none` | `redacted` | `full`)
       - supports caller-supplied `sensitiveKeys` hints, plus daemon-side forced sensitivity heuristics (regex overridable via `HAPPY_ENV_PREVIEW_SECRET_NAME_REGEX` with safe fallback on invalid regex).
+    - Validates key names (`^[A-Z_][A-Z0-9_]*$`) and caps requests to 200 keys.
+    - Returns per-key metadata (`isSet`, `isSensitive`, `isForcedSensitive`, `sensitivitySource`, `display`) for UI correctness.
   - Adds `registerCommonHandlers.previewEnv.test.ts` with thorough behavioral coverage (policy modes, expansion correctness, regex override/fallback).
 - Coherence:
   - Strong match to subject, and the tests are high value for a security-sensitive feature.
@@ -3319,7 +3334,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=4c2a671dc3f4 patchFile=/
 ---
 
 ## 096 2026-01-15 2973f7fe6861 `codex`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=2973f7fe6861 patchFile=/tmp/leeroy-wip-pass2/096.patch patchSha256=3e1f48b2afe0e7844cc032ad624ff3bc7f63a1950862666d53aaccd9557490c6 patchBytes=9238 patchLines=242 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=2973f7fe6861 patchFile=/tmp/leeroy-wip-pass2/096.patch patchSha256=3e1f48b2afe0e7844cc032ad624ff3bc7f63a1950862666d53aaccd9557490c6 patchBytes=9238 patchLines=242 notesReviewed=yes reviewedAt=2026-01-24T21:54:17+0100 notesUpdated=no
 
 - Subject: fix(codex): harden MCP command detection
 - Reasons: safety/security-sensitive area
@@ -3354,7 +3369,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=2973f7fe6861 patchFile=/
 ---
 
 ## 097 2026-01-15 c863db3d5bbc `offline`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=c863db3d5bbc patchFile=/tmp/leeroy-wip-pass2/097.patch patchSha256=32bf80f2b0853267c5ae8073e09dc4052cf05cc241006c168614da2cffca5439 patchBytes=4754 patchLines=130 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=c863db3d5bbc patchFile=/tmp/leeroy-wip-pass2/097.patch patchSha256=32bf80f2b0853267c5ae8073e09dc4052cf05cc241006c168614da2cffca5439 patchBytes=4754 patchLines=130 notesReviewed=yes reviewedAt=2026-01-24T21:55:09+0100 notesUpdated=no
 
 - Subject: refactor(offline): make offline session stub safer
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3382,7 +3397,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=c863db3d5bbc patchFile=/
 ---
 
 ## 098 2026-01-15 0a1a91a631e7 `tmux`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=0a1a91a631e7 patchFile=/tmp/leeroy-wip-pass2/098.patch patchSha256=a82d831612efb8e049226844eb4012087d4937724779ec76fa3c899be2a45af2 patchBytes=20638 patchLines=479 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=0a1a91a631e7 patchFile=/tmp/leeroy-wip-pass2/098.patch patchSha256=a82d831612efb8e049226844eb4012087d4937724779ec76fa3c899be2a45af2 patchBytes=20638 patchLines=479 notesReviewed=yes reviewedAt=2026-01-24T21:56:06+0100 notesUpdated=yes
 
 - Subject: feat(tmux): support per-instance socket path
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3398,9 +3413,16 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=0a1a91a631e7 patchFile=/
   - Hardens parsing/escaping:
     - Adds POSIX-safe quoting helpers for building shell commands.
     - Adjusts session/window identifier validation to allow spaces (while keeping separators unambiguous).
+    - Improves parsing helpers to allow spaces in `session:window` output while still enforcing end-of-line matches + name constraints.
   - Refines tmux session selection behavior in `spawnInTmux(...)`:
     - Differentiates `undefined` (use default session name) vs `''` (pick current/most-recent deterministically).
     - Extends return type to include `sessionName`/`windowName` for better caller UX messaging.
+    - Switches `new-window` invocation to:
+      - explicitly target the session via `-t <sessionName>` (correct option ordering),
+      - capture pane PID via `-P -F '#{pane_pid}'`,
+      - and avoid quoting/escaping env values passed via `-e KEY=VALUE` (tmux does not do shell parsing for these).
+    - Changes global caching from a single `_tmuxUtils` to a keyed cache (`sessionName` + socketPath + tmuxCommandEnv) to support multiple isolated tmux instances.
+    - Simplifies `listWindows` to use `-F '#W'` rather than parsing human output.
   - Adds `cli/src/utils/tmux.socketPath.test.ts` asserting `-S <socket>` is used when configured.
 - Coherence:
   - Matches subject; this is a cohesive tmux capability upgrade + test.
@@ -3417,7 +3439,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=0a1a91a631e7 patchFile=/
 ---
 
 ## 099 2026-01-15 c52227082c2b `tmux`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=c52227082c2b patchFile=/tmp/leeroy-wip-pass2/099.patch patchSha256=8fcb1e38cd9e571e2e71d652bef92d1ff58ecb5c94531bca1ea5c12fcf58de10 patchBytes=68578 patchLines=1678 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=c52227082c2b patchFile=/tmp/leeroy-wip-pass2/099.patch patchSha256=8fcb1e38cd9e571e2e71d652bef92d1ff58ecb5c94531bca1ea5c12fcf58de10 patchBytes=68578 patchLines=1678 notesReviewed=yes reviewedAt=2026-01-24T21:59:16+0100 notesUpdated=yes
 
 - Subject: fix(tmux): correct env, tmpdir, and session selection
 - Reasons: safety/security-sensitive area
@@ -3437,11 +3459,12 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=c52227082c2b patchFile=/
     - Restores safe sequencing for Codex auth token persistence:
       - `await fs.writeFile(..., auth.json, token)` (this reverts the non-awaited write introduced in commit 086, avoiding a race).
       - Adds cleanup hooks for the temporary `CODEX_HOME` directory keyed by PID so it can be removed when spawning fails or after session tracking is established.
+    - Improves safety of log redaction by truncating the list of env var keys logged in `apiMachine` (logs a sample of up to 20 keys + a “truncated” flag).
   - `cli/src/utils/tmux.*.test.ts` and new `cli/src/utils/tmux.commandEnv.test.ts`:
     - Asserts `TMUX_TMPDIR` is passed via the **tmux subprocess environment** when provided.
     - Tightens spawn mocks/types so tests more accurately reflect node child-process behavior.
     - Preserves failure semantics by treating signal-terminated tmux commands (`exitCode === null`) as non-zero (via `normalizeExitCode`).
-    - Updates identifier parsing rules (notably: allows spaces in session names; keeps stricter rules for window names).
+    - Updates identifier parsing rules (notably: allows spaces in session/window names but rejects special characters like `@` that would break identifier safety).
   - Adds opt-in integration tests `cli/src/utils/tmux.real.integration.test.ts`:
     - Guarded by `HAPPY_CLI_TMUX_INTEGRATION=1` and designed to use isolated tmux servers so it shouldn’t touch user sessions.
   - Adds targeted daemon tests:
@@ -3450,6 +3473,8 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=c52227082c2b patchFile=/
   - `cli/src/codex/codexMcpClient.ts`: adds Zod validation for elicitation params before calling the permission handler (deny-by-default on invalid payloads).
   - `cli/src/ui/logger.test.ts`: changes assertions to validate on-disk log output rather than checking append-file calls.
   - Small correctness tweaks (e.g. `createSessionMetadata` env trimming, offline stub test import path).
+  - `cli/src/api/apiSession.ts`: reintroduces “emit while disconnected” behavior safely by adding `logSendWhileDisconnected(...)` (logs once per connection) and resetting the flag on reconnect (fixes gaps from commit 087).
+  - `cli/src/persistence.ts`: drops `tmuxConfig.updateEnvironment` from the schema and stops exporting `TMUX_UPDATE_ENVIRONMENT` (schema alignment cleanup).
 
 ### Verdict
 
@@ -3473,7 +3498,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=c52227082c2b patchFile=/
 ---
 
 ## 100 2026-01-16 7a01a8e42629 `claude`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=7a01a8e42629 patchFile=/tmp/leeroy-wip-pass2/100.patch patchSha256=3a5b6360339afeb6ed3363fb66a332db4d008bee9b3f1abeb2b0ab6bd473924f patchBytes=4948 patchLines=117 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=7a01a8e42629 patchFile=/tmp/leeroy-wip-pass2/100.patch patchSha256=3a5b6360339afeb6ed3363fb66a332db4d008bee9b3f1abeb2b0ab6bd473924f patchBytes=4948 patchLines=117 notesReviewed=yes reviewedAt=2026-01-24T22:00:22+0100 notesUpdated=no
 
 - Subject: test(claude): align sessionScanner path mapping
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3501,7 +3526,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=7a01a8e42629 patchFile=/
 ---
 
 ## 101 2026-01-17 1075a768e551 `rpc`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=1075a768e551 patchFile=/tmp/leeroy-wip-pass2/101.patch patchSha256=d999914eba7a69d93fcfd4671ba844a8b853acf80605549454970438f9ba4f41 patchBytes=7789 patchLines=208 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=1075a768e551 patchFile=/tmp/leeroy-wip-pass2/101.patch patchSha256=d999914eba7a69d93fcfd4671ba844a8b853acf80605549454970438f9ba4f41 patchBytes=7789 patchLines=208 notesReviewed=yes reviewedAt=2026-01-24T22:01:26+0100 notesUpdated=yes
 
 - Subject: feat(rpc): add detect-cli handler
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3514,6 +3539,8 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=1075a768e551 patchFile=/
     - checks whether `claude`, `codex`, and `gemini` are resolvable on the daemon’s `PATH` (without relying on a login shell).
     - returns `path` + a per-cli `{ available, resolvedPath? }` map.
   - Adds `registerCommonHandlers.detectCli.test.ts` using a temporary fake executable to validate detection.
+- Notes:
+  - Implementation uses a manual PATH scan (`resolveCommandOnPath`) with `fs.access` and PATHEXT handling on Windows (rather than `which`/shell), which matches the “daemon spawn resolution” goal.
 - Coherence:
   - Strong match to subject and a good foundation for UI gating and diagnostics.
 
@@ -3529,7 +3556,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=1075a768e551 patchFile=/
 ---
 
 ## 102 2026-01-21 c988f68ca4d0 `ui`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=c988f68ca4d0 patchFile=/tmp/leeroy-wip-pass2/102.patch patchSha256=11ecb4a4e4ea947f09aa214e51377caec83ba779a548578217f2a7ee5cec5ec7 patchBytes=24188 patchLines=527 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=c988f68ca4d0 patchFile=/tmp/leeroy-wip-pass2/102.patch patchSha256=11ecb4a4e4ea947f09aa214e51377caec83ba779a548578217f2a7ee5cec5ec7 patchBytes=24188 patchLines=527 notesReviewed=yes reviewedAt=2026-01-24T22:11:23+0100 notesUpdated=yes
 
 - Subject: feat(ui): surface Codex/Gemini errors in session UI
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3545,6 +3572,9 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=c988f68ca4d0 patchFile=/
     - `cli/src/codex/runCodex.ts` forwards MCP startup/stream/tool errors to both the Ink UI buffer and `session.sendSessionEvent({ type:'message', ... })` so the app UI doesn’t silently hang.
   - Gemini:
     - Extracts and centralizes error formatting into `formatGeminiErrorForUi(...)` (+ tests) so users get actionable messages instead of silent failure.
+- Notes / risks:
+  - `formatErrorForUi` has a minimum `maxChars` of 1000 even if a smaller value is requested (good for preserving meaningful info; slightly surprising API).
+  - `runCodex.ts` now treats `startSession`/`continueSession` tool responses with `isError=true` as “hard failures” and clears the session state immediately; this is likely correct UX-wise, but it is a behavior change worth keeping adjacent to any Codex resume/retry logic during rewrite.
 - Coherence:
   - Matches subject; a high-value UX reliability improvement for non-Claude agents.
 
@@ -3560,7 +3590,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=c988f68ca4d0 patchFile=/
 ---
 
 ## 103 2026-01-21 b2269ee11252 `claude`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=b2269ee11252 patchFile=/tmp/leeroy-wip-pass2/103.patch patchSha256=cf9d1c3d1c11b8f947a6829d1151207b278740561e7e9c0c62812f9979e641b2 patchBytes=62570 patchLines=1600 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=b2269ee11252 patchFile=/tmp/leeroy-wip-pass2/103.patch patchSha256=cf9d1c3d1c11b8f947a6829d1151207b278740561e7e9c0c62812f9979e641b2 patchBytes=62570 patchLines=1600 notesReviewed=yes reviewedAt=2026-01-24T22:15:19+0100 notesUpdated=yes
 
 - Subject: fix(claude): use hook transcript path across switching
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3579,9 +3609,17 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=b2269ee11252 patchFile=/
   - Switch RPC hardening:
     - Makes the `switch` RPC idempotent by accepting `{ to: 'local'|'remote' }` and returning `boolean`; retains legacy “toggle” semantics when params are missing.
     - Waits briefly for hook session info before switching to avoid null sessionId/transcript races.
-  - Misc reliability:
-    - KeepAlive reports correct mode.
-    - Remote init no longer blocks on a long file wait.
+- Misc reliability:
+  - KeepAlive reports correct mode.
+  - Remote init no longer blocks on a long file wait.
+- Additional (diff-confirmed) details worth preserving in rewrite:
+  - `Session` now tracks `transcriptPath` derived from hook data (`transcript_path`/`transcriptPath`) and notifies sessionFound callbacks with `{ sessionId, transcriptPath }`.
+  - `Session.waitForSessionFound({ timeoutMs, requireTranscriptPath })` is introduced so launchers can avoid switching before session/transcript info exists.
+  - `sessionScanner` supports per-session transcript path overrides:
+    - initial `transcriptPath` is applied before “mark existing messages as processed” to avoid replaying history from the wrong file.
+    - watcher restarts when a session’s resolved file path changes (e.g., hook provides a new transcript path later).
+    - optional `onTranscriptMissing` warning fires after `transcriptMissingWarningMs` (default `5000`), and is guarded to avoid spamming.
+  - Hook server data shape is widened to accept camelCase keys (`transcriptPath`, `hookEventName`) in addition to snake_case.
 - Coherence:
   - Large, but cohesive: all changes serve “reliable switching + transcript discovery in hook mode”.
 
@@ -3600,7 +3638,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=b2269ee11252 patchFile=/
 ---
 
 ## 104 2026-01-21 f53cf71d416c `persistence`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=f53cf71d416c patchFile=/tmp/leeroy-wip-pass2/104.patch patchSha256=c6a15de58398ba05150e0c76876ff207f0cb46324c1e763401111140eaf9158d patchBytes=2622 patchLines=63 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=f53cf71d416c patchFile=/tmp/leeroy-wip-pass2/104.patch patchSha256=c6a15de58398ba05150e0c76876ff207f0cb46324c1e763401111140eaf9158d patchBytes=2622 patchLines=63 notesReviewed=yes reviewedAt=2026-01-24T22:16:05+0100 notesUpdated=no
 
 - Subject: refactor(persistence): remove deprecated tmuxConfig
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3627,7 +3665,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=f53cf71d416c patchFile=/
 ---
 
 ## 105 2026-01-21 8dae65f6c585 `rpc`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=8dae65f6c585 patchFile=/tmp/leeroy-wip-pass2/105.patch patchSha256=2c7d6936b9a9bb12b20a6419899b34039e91bfcb58076ee36ea8189da7804a87 patchBytes=17844 patchLines=416 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=8dae65f6c585 patchFile=/tmp/leeroy-wip-pass2/105.patch patchSha256=2c7d6936b9a9bb12b20a6419899b34039e91bfcb58076ee36ea8189da7804a87 patchBytes=17844 patchLines=416 notesReviewed=yes reviewedAt=2026-01-24T22:16:51+0100 notesUpdated=yes
 
 - Subject: feat(rpc): include tmux in detect-cli
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3643,8 +3681,10 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=8dae65f6c585 patchFile=/
   - Adds helper utilities:
     - safe “first line” extraction and version parsing (`extractSemver`, `extractTmuxVersion`)
     - best-effort `execFile` wrappers with timeouts and non-throwing behavior.
+    - Windows nuance: `.cmd/.bat` are invoked via `cmd.exe /c` for probes (`--version` / `-V` / login status) instead of direct `execFile`.
   - Tests:
     - expands `registerCommonHandlers.detectCli.test.ts` to validate version parsing and optional login status behavior using fake scripts.
+  - Also updates `SpawnSessionOptions` to prefer `terminal?: TerminalSpawnOptions` over legacy `TMUX_*` env vars (doc-level shape change, consumed in later tmux/terminal commits).
 - Coherence:
   - Matches subject; this turns detect-cli into a more complete diagnostics primitive for UI gating.
 - Security/reliability note:
@@ -3662,7 +3702,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=8dae65f6c585 patchFile=/
 ---
 
 ## 106 2026-01-21 ad66c6aaa3ae `terminal`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=ad66c6aaa3ae patchFile=/tmp/leeroy-wip-pass2/106.patch patchSha256=3d6e395250cebf51ffe4f82a279b4407665c893d55d42dee5bd7a69c541c82a0 patchBytes=47830 patchLines=1371 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=ad66c6aaa3ae patchFile=/tmp/leeroy-wip-pass2/106.patch patchSha256=3d6e395250cebf51ffe4f82a279b4407665c893d55d42dee5bd7a69c541c82a0 patchBytes=47830 patchLines=1371 notesReviewed=yes reviewedAt=2026-01-24T22:18:04+0100 notesUpdated=yes
 
 - Subject: feat(terminal): add tmux metadata + attach tooling
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3675,10 +3715,13 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=ad66c6aaa3ae patchFile=/
     - `cli/src/api/types.ts` adds `Metadata.terminal` describing runtime mode (`plain|tmux`), requested mode, fallback reasons, and tmux target/tmpDir (non-secret).
     - `cli/src/claude/runClaude.ts` builds `terminal` metadata from internal terminal runtime flags and persists best-effort local attachment info once a session ID exists.
     - When tmux was requested but unavailable, sends a UI-facing status message into the session transcript (fallback reason).
+    - `cli/src/codex/runCodex.ts` and `cli/src/gemini/runGemini.ts` mirror the same “persist attachment info + fallback message” behavior once a real session ID exists.
   - Adds attach workflows + utilities:
     - New `happy attach` command (planning + attach selection behavior).
     - Adds terminal planning modules (`terminalAttachPlan`, `tmuxSessionSelector`, `terminalAttachmentInfo`, etc.) with a strong test suite.
   - Adds headless tmux launcher support (`--tmux`) and internal terminal runtime flags plumbing for spawners (daemon/tmux wrapper).
+    - Internal runtime flags are explicitly parsed + stripped before CLI subcommand parsing (`--happy-terminal-*`, `--happy-tmux-*`) to avoid leaking internal implementation details to users.
+    - Attachment info is persisted per-session under `happyHomeDir/terminal/sessions/<sessionId>.json` using a `*.tmp` write + `rename` (atomic on POSIX).
 - Coherence:
   - Large but coherent: all changes support “spawn + attach” workflows and consistent UI/metadata reporting.
 
@@ -3697,7 +3740,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=ad66c6aaa3ae patchFile=/
 ---
 
 ## 107 2026-01-21 c13d51ee4638 `daemon`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=c13d51ee4638 patchFile=/tmp/leeroy-wip-pass2/107.patch patchSha256=f1b4d85a17e6b6eb2e3b3623b47a9ce05e4634756a9f584ed2873eb0693ed53a patchBytes=28540 patchLines=665 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=c13d51ee4638 patchFile=/tmp/leeroy-wip-pass2/107.patch patchSha256=f1b4d85a17e6b6eb2e3b3623b47a9ce05e4634756a9f584ed2873eb0693ed53a patchBytes=28540 patchLines=665 notesReviewed=yes reviewedAt=2026-01-24T22:18:59+0100 notesUpdated=yes
 
 - Subject: feat(daemon): support tmux spawn + harden runtime
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3711,10 +3754,15 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=c13d51ee4638 patchFile=/
     - Adds `cli/src/api/apiMachine.spawnSession.test.ts` ensuring terminal spawn options are forwarded.
   - Adds daemon tmux spawn support:
     - Updates `cli/src/daemon/run.ts` to spawn sessions in tmux when requested (including isolated tmux server option) and to record tmux target/fallback metadata.
+    - Uses `resolveTerminalRequestFromSpawnOptions` (typed `terminal` config preferred; legacy `TMUX_*` respected as fallback) and strips `TMUX_SESSION_NAME` / `TMUX_TMPDIR` from the child env (daemon/runtime concerns, not agent-runtime env).
+    - Resolves empty tmux session names (“current/most recent”) deterministically via `tmux list-sessions` + `selectPreferredTmuxSessionName`; builds a per-window target (`<session>:happy-<timestamp>-<agent>`).
+    - On fallback to plain spawn when tmux was requested, injects internal runtime flags (`--happy-terminal-mode plain --happy-terminal-requested tmux --happy-terminal-fallback-reason ...`) so the started CLI can surface the reason + metadata.
   - Runtime hardening:
-    - Adds a no-op short-circuit when machine metadata updates do not change (avoids unnecessary writes).
-    - Makes `ApiMachineClient.connect` accept an optional `onConnect` hook that is best-effort (errors ignored).
-    - Tightens backoff/time utilities and makes best-effort log-file writes non-fatal.
+    - Adds a no-op short-circuit when machine metadata updates do not change (avoids unnecessary writes); note this uses `JSON.stringify` equality which assumes stable key ordering.
+    - Makes `ApiMachineClient.connect` accept an optional best-effort `onConnect` hook (errors ignored) and uses it in the daemon to refresh machine metadata once after connect.
+    - On macOS, prefers a more user-friendly/stable host name via `scutil --get HostName|LocalHostName|ComputerName` with short timeouts.
+    - Logging is made strictly non-fatal (even with `DEBUG=1`): first file write failure is surfaced once, then silenced.
+    - Backoff utilities are hardened: delay clamps/jitter avoids <minDelay, default `maxFailureCount` is reduced to `8`, adds `shouldRetry` gates (`retryable:false` / `canTryAgain:false`) and introduces `backoffForever` for “keep retrying” flows (`InvalidateSync` now uses `backoffForever`).
 - Coherence:
   - Matches subject; this is the daemon-side counterpart to the terminal/attach tooling series.
 
@@ -3730,7 +3778,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=c13d51ee4638 patchFile=/
 ---
 
 ## 108 2026-01-21 f7db44dea458 `docs`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=f7db44dea458 patchFile=/tmp/leeroy-wip-pass2/108.patch patchSha256=f5fd09d2bb72379dfd58d163dae1326f5eb30d40f128b29dee41121a0b595514 patchBytes=524 patchLines=18 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=f7db44dea458 patchFile=/tmp/leeroy-wip-pass2/108.patch patchSha256=f5fd09d2bb72379dfd58d163dae1326f5eb30d40f128b29dee41121a0b595514 patchBytes=524 patchLines=18 notesReviewed=yes reviewedAt=2026-01-24T22:20:24+0100 notesUpdated=no
 
 - Subject: docs: add AGENTS.md symlink
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3755,7 +3803,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=f7db44dea458 patchFile=/
 ---
 
 ## 109 2026-01-21 af5000ea6318 `ui`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=af5000ea6318 patchFile=/tmp/leeroy-wip-pass2/109.patch patchSha256=60b9f67574d7599d92a182dfa55f618b98bd11e5ce8fee5403d42b1f5de1d361 patchBytes=3587 patchLines=75 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=af5000ea6318 patchFile=/tmp/leeroy-wip-pass2/109.patch patchSha256=60b9f67574d7599d92a182dfa55f618b98bd11e5ce8fee5403d42b1f5de1d361 patchBytes=3587 patchLines=75 notesReviewed=yes reviewedAt=2026-01-24T22:20:50+0100 notesUpdated=no
 
 - Subject: fix(ui): polish Codex and Gemini error messages
 - Reasons: full manual review coverage (was not in the manual-review queue)
@@ -3781,7 +3829,7 @@ Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=af5000ea6318 patchFile=/
 ---
 
 ## 110 2026-01-21 f68552d03ab9 `tmux`
-Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=f68552d03ab9 patchFile=/tmp/leeroy-wip-pass2/110.patch patchSha256=1a6a3abf018cc15fd95308d7fcabfefbf83bbb49904de901318da0a125378761 patchBytes=3791 patchLines=109 notesReviewed=no reviewedAt=- notesUpdated=no
+Pass2FullDiff: CAPTURED at 2026-01-24T17:39:06+0100 sha=f68552d03ab9 patchFile=/tmp/leeroy-wip-pass2/110.patch patchSha256=1a6a3abf018cc15fd95308d7fcabfefbf83bbb49904de901318da0a125378761 patchBytes=3791 patchLines=109 notesReviewed=yes reviewedAt=2026-01-24T22:21:22+0100 notesUpdated=no
 
 - Subject: fix(tmux): print attach instructions in correct order
 - Reasons: full manual review coverage (was not in the manual-review queue)

package/docs/happy-development.md

@@ -32,6 +32,21 @@ npx happy-stacks setup --profile=dev
 
 This will guide you through workspace setup, bootstrapping components, and the recommended developer auth flow (`dev-auth` seed stack + optional mobile dev-client install).
 
+### LLM helpers (optional)
+
+Happy Stacks has “LLM prompt” helpers for the two most common “LLM is useful here” flows:
+
+```bash
+# Import + migrate legacy split repos (pre-monorepo)
+happys import llm --mode=import --launch
+happys import llm --mode=migrate --stack=<stack> --launch
+
+# Port commits into a monorepo checkout (conflict-resolution helper)
+happys monorepo port llm --target=/abs/path/to/monorepo --launch
+```
+
+If `--launch` isn’t available on your system, use `--copy` instead and paste the prompt into any LLM UI.
+
 ### Components
 
 Happy Stacks is a launcher/orchestrator repo. The actual product code lives in component repos under:

package/docs/monorepo-migration.md

@@ -57,6 +57,25 @@ happys monorepo port continue --target=/abs/path/to/monorepo
 - `port status` shows whether a `git am` session is in progress, the current patch subject, and conflicted files.
 - `port continue` runs `git am --continue` for the target repo (after you staged resolved files). If you started from `port guide`, it can also resume the remaining port automatically after each continue.
 
+### LLM-assisted conflict resolution (optional)
+
+If you want to use an LLM to drive the port and resolve conflicts:
+
+- **Best UX (guided)**: run `port guide` and pick **LLM** when it previews the first likely conflict.
+- **Direct prompt helper**:
+
+```bash
+# Launch an LLM CLI in a new terminal (best-effort)
+happys monorepo port llm --target=/abs/path/to/monorepo --launch
+
+# Or: print + copy a prompt for copy/paste
+happys monorepo port llm --target=/abs/path/to/monorepo --copy
+```
+
+Notes:
+- Conflict resolution is **incremental**: `git am` stops at the **first** conflict; resolve it, then continue, and repeat.
+- If no supported LLM CLI is installed (or terminal launching isn’t available), use `--copy` and paste into any LLM UI.
+
 How to bring “the changes you want to port” into this environment:
 
 - **If you already have local checkouts** of your legacy repos (recommended for forks/branches that aren’t PRs yet):

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "happy-stacks",
   "type": "module",
-  "version": "0.6.9",
+  "version": "0.6.11",
   "packageManager": "pnpm@10.18.3",
   "bin": {
     "happys": "./bin/happys.mjs",