bugfix: fix InjectEnv resume/clear handling and remove getClaudeSessionId() from JvmScope

- InjectEnv now writes env vars to resumed session dir on source="resume"
- InjectEnv routes source="clear" to handleStartup() for correct env file target
- Removes getClaudeSessionId() from JvmScope; CLI tools now use ClaudeEnv,
  hook handlers use HookInput.getSessionId()

Author: cowwoc

.cat/issues/v2/v2.1/fix-inject-env-resume-session-id/STATE.md

@@ -1,6 +1,6 @@
 # State
 
-- **Status:** open
-- **Progress:** 0%
+- **Status:** closed
+- **Progress:** 100%
 - **Dependencies:** []
 - **Blocks:** []

.cat/issues/v2/v2.1/fix-inject-env-resume-session-id/index.json

@@ -0,0 +1 @@
+{"status":"closed","resolution":"implemented","target_branch":"main"}

client/src/main/java/io/github/cowwoc/cat/hooks/AbstractJvmScope.java

@@ -6,6 +6,8 @@
  */
 package io.github.cowwoc.cat.hooks;
 
+import static io.github.cowwoc.requirements13.java.DefaultJavaValidators.requireThat;
+
 import io.github.cowwoc.cat.hooks.prompt.UserIssues;
 import io.github.cowwoc.cat.hooks.read.post.DetectSequentialTools;
 import io.github.cowwoc.cat.hooks.read.pre.PredictBatchOpportunity;
@@ -113,17 +115,20 @@ public Path getClaudeSessionsPath()
   }
 
   /**
-   * Returns the directory for the current session's tracking files.
+   * Returns the directory for a session's tracking files.
    * <p>
    * Located at {@code {claudeConfigDir}/projects/{encodedProjectRoot}/{sessionId}/}.
    *
+   * @param sessionId the session ID
    * @return the session directory path
+   * @throws NullPointerException if {@code sessionId} is null
    * @throws IllegalStateException if this scope is closed
    */
   @Override
-  public Path getClaudeSessionPath()
+  public Path getClaudeSessionPath(String sessionId)
   {
-    return getClaudeSessionsPath().resolve(getClaudeSessionId());
+    requireThat(sessionId, "sessionId").isNotBlank();
+    return getClaudeSessionsPath().resolve(sessionId);
   }
 
   /**
@@ -147,13 +152,16 @@ public Path getCatWorkPath()
    * <p>
    * Located at {@code {projectPath}/.cat/work/sessions/{sessionId}/}.
    *
+   * @param sessionId the session ID
    * @return the session CAT directory path
+   * @throws NullPointerException if {@code sessionId} is null
    * @throws IllegalStateException if this scope is closed
    */
   @Override
-  public Path getCatSessionPath()
+  public Path getCatSessionPath(String sessionId)
   {
-    return getCatWorkPath().resolve("sessions").resolve(getClaudeSessionId());
+    requireThat(sessionId, "sessionId").isNotBlank();
+    return getCatWorkPath().resolve("sessions").resolve(sessionId);
   }
 
   /**

client/src/main/java/io/github/cowwoc/cat/hooks/JvmScope.java

@@ -79,15 +79,6 @@ public interface JvmScope extends AutoCloseable
    */
   String getPluginPrefix();
 
-  /**
-   * Returns the Claude session ID.
-   *
-   * @return the session ID
-   * @throws AssertionError if the session ID is not configured
-   * @throws IllegalStateException if this scope is closed
-   */
-  String getClaudeSessionId();
-
   /**
    * Returns the Claude config directory.
    * <p>
@@ -109,14 +100,16 @@ public interface JvmScope extends AutoCloseable
   Path getClaudeSessionsPath();
 
   /**
-   * Returns the directory for the current session's tracking files.
+   * Returns the directory for a session's tracking files.
    * <p>
    * Located at {@code {claudeConfigDir}/projects/{encodedProjectRoot}/{sessionId}/}.
    *
+   * @param sessionId the session ID
    * @return the session directory path
+   * @throws NullPointerException if {@code sessionId} is null
    * @throws IllegalStateException if this scope is closed
    */
-  Path getClaudeSessionPath();
+  Path getClaudeSessionPath(String sessionId);
 
   /**
    * Returns the cross-session project CAT directory.
@@ -135,10 +128,12 @@ public interface JvmScope extends AutoCloseable
    * <p>
    * Located at {@code {projectPath}/.cat/work/sessions/{sessionId}/}.
    *
+   * @param sessionId the session ID
    * @return the session CAT directory path
+   * @throws NullPointerException if {@code sessionId} is null
    * @throws IllegalStateException if this scope is closed
    */
-  Path getCatSessionPath();
+  Path getCatSessionPath(String sessionId);
 
   /**
    * Returns the path to the Claude environment file.

client/src/main/java/io/github/cowwoc/cat/hooks/MainJvmScope.java

@@ -41,13 +41,6 @@ public final class MainJvmScope extends AbstractJvmScope
       return Path.of(configDir);
     return Path.of(System.getProperty("user.home"), ".claude");
   });
-  private final ConcurrentLazyReference<String> claudeSessionId = ConcurrentLazyReference.create(() ->
-  {
-    String sessionId = System.getenv("CLAUDE_SESSION_ID");
-    if (sessionId == null || sessionId.isEmpty())
-      throw new AssertionError("CLAUDE_SESSION_ID is not set");
-    return sessionId;
-  });
   private final ConcurrentLazyReference<Path> claudeEnvFile = ConcurrentLazyReference.create(() ->
   {
     String envFile = System.getenv("CLAUDE_ENV_FILE");
@@ -101,13 +94,6 @@ public Path getClaudeConfigDir()
     return claudeConfigDir.getValue();
   }
 
-  @Override
-  public String getClaudeSessionId()
-  {
-    ensureOpen();
-    return claudeSessionId.getValue();
-  }
-
   @Override
   public Path getClaudeEnvFile()
   {

client/src/main/java/io/github/cowwoc/cat/hooks/PostToolUseFailureHook.java

@@ -75,7 +75,7 @@ public HookResult run(HookInput input, HookOutput output)
 
     String sessionId = input.getSessionId();
     // Create handlers using sessionId from HookInput
-    Path sessionDirectory = scope.getCatSessionPath();
+    Path sessionDirectory = scope.getCatSessionPath(sessionId);
     List<PostToolHandler> handlers = List.of(
       new DetectRepeatedFailures(Clock.systemUTC(), sessionDirectory),
       new DetectPreprocessorFailure());

client/src/main/java/io/github/cowwoc/cat/hooks/PostToolUseHook.java

@@ -84,7 +84,7 @@ public HookResult run(HookInput input, HookOutput output)
 
     // Create handlers using sessionId from HookInput
     Path claudeConfigDir = scope.getClaudeConfigDir();
-    Path sessionDirectory = scope.getCatSessionPath();
+    Path sessionDirectory = scope.getCatSessionPath(sessionId);
     List<PostToolHandler> handlers = List.of(
       new SetPendingAgentResult(scope),
       new ResetFailureCounter(sessionDirectory),

client/src/main/java/io/github/cowwoc/cat/hooks/SessionEndHook.java

@@ -114,7 +114,7 @@ public HookResult runWithProjectDir(HookInput input, HookOutput output, Path pro
 
       cleanStaleLocks(messages);
 
-      new SessionEndHandler(scope).clean();
+      new SessionEndHandler(scope).clean(sessionId);
 
       return new HookResult(output.empty(), messages);
     }