From bea3d0a4877b45f169ff1582ff9704d9d0891511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Padez?= <andre.padez@gmail.com>
Date: Fri, 24 Jul 2026 10:04:17 +0000
Subject: [PATCH] chat: honor the per-session cwd for Super Admin (was
 hardcoded to home)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

claude-manager pinned the spawn cwd to HOST_HOME for Super Admin, ignoring the
cwd passed from the chat handler — so /chat sessions ran in /home/pastilhas
regardless. Now it uses params.cwd when provided (falling back to HOST_HOME),
so /chat actually runs from the dedicated claude_sessions directory.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 src/servers/sidecar/claude/claude-manager.ts | 8 ++++++--
 src/servers/sidecar/protocol.ts              | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/servers/sidecar/claude/claude-manager.ts b/src/servers/sidecar/claude/claude-manager.ts
index d8762de6..80828b88 100644
--- a/src/servers/sidecar/claude/claude-manager.ts
+++ b/src/servers/sidecar/claude/claude-manager.ts
@@ -76,7 +76,9 @@ export async function spawnClaude(params: ClaudeSpawnParams): Promise<ClaudeCode
   }
 
   const spawnCmd = isSuperAdmin ? claudeArgs : [...buildSandboxArgs(email), ...claudeArgs];
-  const spawnCwd = isSuperAdmin ? HOST_HOME : undefined;
+  // Honor a caller-provided working directory (e.g. /chat runs from a dedicated claude_sessions dir);
+  // fall back to the host home for Super Admin, or the sandbox default otherwise.
+  const spawnCwd = isSuperAdmin ? (params.cwd ?? HOST_HOME) : undefined;
 
   const proc = Bun.spawn(spawnCmd, {
     stdin: 'pipe',
@@ -173,7 +175,9 @@ export async function spawnClaudeStreaming(
   }
 
   const spawnCmd = isSuperAdmin ? claudeArgs : [...buildSandboxArgs(email), ...claudeArgs];
-  const spawnCwd = isSuperAdmin ? HOST_HOME : undefined;
+  // Honor a caller-provided working directory (e.g. /chat runs from a dedicated claude_sessions dir);
+  // fall back to the host home for Super Admin, or the sandbox default otherwise.
+  const spawnCwd = isSuperAdmin ? (params.cwd ?? HOST_HOME) : undefined;
 
   const proc = Bun.spawn(spawnCmd, {
     stdin: 'ignore',
diff --git a/src/servers/sidecar/protocol.ts b/src/servers/sidecar/protocol.ts
index c3cc7b60..6c6b476f 100644
--- a/src/servers/sidecar/protocol.ts
+++ b/src/servers/sidecar/protocol.ts
@@ -61,6 +61,7 @@ export type ClaudeSpawnParams = {
   sessionKey: string;
   model?: string;
   role?: string;
+  cwd?: string;
 };
 
 export type ClaudeSpawnStreamingParams = {