From: Jakub Czajka <jakub@ekhem.eu.org>
Date: Sun, 12 Jul 2026 08:56:30 +0000 (+0200)
Subject: [ai] Remove resolved merge-conflict TODO, add SetCwd TODO.
X-Git-Url: https://git.ekhem.eu.org/?a=commitdiff_plain;h=728253656a2b02c15aa36960dd99a22a77f1c8a9;p=guix.git

[ai] Remove resolved merge-conflict TODO, add SetCwd TODO.

The TODO was addressed by f8a4bd0 which added Enter
enforcement and a PreToolUse hook for automatic isolation.

Add a TODO to adopt SetCwd after
https://github.com/anthropics/claude-code/issues/69159 is resolved.
---

diff --git a/TODO b/TODO
index 32c1fed..3c9f46e 100644
--- a/TODO
+++ b/TODO
@@ -7,14 +7,6 @@ TODO
   2. Update the version field in conf/home/claude.scm.
   3. Add claude-code at the end, run guix build -f conf/home/claude.scm and
      get the correct hash from the "hash mismatch" error message.
-
-* Avoid merge conflicts when running multiple Claude Code instances.
-
-  1. Work on a separate branch per instance (e.g. claude-<session_id>).
-  2. Or use EnterWorktree for automatic isolation.
-  3. Or add a PreToolUse hook that auto-creates/switches to a per-session
-     branch before Edit/Write.
-
 * Go back to the upstream pi release tarball once Bun's --compile bug is
   fixed.  Bun 1.2.20-1.3.11 produces broken binaries; 1.3.14 fails
   entirely on this system (kernel 7.0.12, glibc 2.39).  As of pi 0.80.5
@@ -40,3 +32,11 @@ TODO
   redirect it.  Remove the explicit CLAUDE_CONFIG_DIR from the paseo
   Shepherd service and find a generic way to set it for all daemons that
   spawn Claude Code.
+
+* Use SetCwd instead of spawning a subshell with cd(1) in hooks once
+  https://github.com/anthropics/claude-code/issues/69159 is resolved.
+
+  Several hooks (block-builds, block-worktrees, create-worktree)
+  currently spawn subshells or cd manually to operate in the right
+  directory.  SetCwd would let them change the harness working
+  directory directly, eliminating the subshell overhead.