From 7af554aa71c14c3358013b42cc55cb8e43fce085 Mon Sep 17 00:00:00 2001
From: Dotta <bippadotta@protonmail.com>
Date: Thu, 7 May 2026 18:32:52 -0500
Subject: [PATCH] Resolve adapter-utils rebase cwd handling

---
 .../adapter-utils/src/command-managed-runtime.ts  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/adapter-utils/src/command-managed-runtime.ts b/packages/adapter-utils/src/command-managed-runtime.ts
index a47e49ab218..9c7221667eb 100644
--- a/packages/adapter-utils/src/command-managed-runtime.ts
+++ b/packages/adapter-utils/src/command-managed-runtime.ts
@@ -57,7 +57,7 @@ function requireSuccessfulResult(result: RunProcessResult, action: string): void
 
 export function createCommandManagedRuntimeClient(input: {
   runner: CommandManagedRuntimeRunner;
-  remoteCwd: string;
+  commandCwd: string;
   timeoutMs: number;
   shellCommand?: "bash" | "sh" | null;
 }): SandboxManagedRuntimeClient {
@@ -66,7 +66,7 @@ export function createCommandManagedRuntimeClient(input: {
     const result = await input.runner.execute({
       command: shellCommand,
       args: shellCommandArgs(script),
-      cwd: input.remoteCwd,
+      cwd: input.commandCwd,
       stdin: opts.stdin,
       timeoutMs: opts.timeoutMs ?? input.timeoutMs,
     });
@@ -117,7 +117,7 @@ export function createCommandManagedRuntimeClient(input: {
       const result = await input.runner.execute({
         command: shellCommand,
         args: shellCommandArgs(`rm -rf ${shellQuote(remotePath)}`),
-        cwd: input.remoteCwd,
+        cwd: input.commandCwd,
         timeoutMs: input.timeoutMs,
       });
       requireSuccessfulResult(result, `remove ${remotePath}`);
@@ -126,7 +126,7 @@ export function createCommandManagedRuntimeClient(input: {
       const result = await input.runner.execute({
         command: shellCommand,
         args: shellCommandArgs(command),
-        cwd: input.remoteCwd,
+        cwd: input.commandCwd,
         timeoutMs: options.timeoutMs,
       });
       requireSuccessfulResult(result, command);
@@ -149,6 +149,7 @@ export async function prepareCommandManagedRuntime(input: {
 }): Promise<PreparedSandboxManagedRuntime> {
   const timeoutMs = input.spec.timeoutMs && input.spec.timeoutMs > 0 ? input.spec.timeoutMs : 300_000;
   const workspaceRemoteDir = input.workspaceRemoteDir ?? input.spec.remoteCwd;
+  const commandCwd = input.spec.remoteCwd;
   const runtimeSpec: SandboxRemoteExecutionSpec = {
     transport: "sandbox",
     provider: input.spec.providerKey ?? "sandbox",
@@ -159,7 +160,7 @@ export async function prepareCommandManagedRuntime(input: {
   };
   const client = createCommandManagedRuntimeClient({
     runner: input.runner,
-    remoteCwd: workspaceRemoteDir,
+    commandCwd,
     timeoutMs,
     shellCommand: input.spec.shellCommand,
   });
@@ -176,7 +177,7 @@ export async function prepareCommandManagedRuntime(input: {
       const probe = await input.runner.execute({
         command: shellCommand,
         args: shellCommandArgs(`command -v ${shellQuote(detectCommand)} >/dev/null 2>&1`),
-        cwd: workspaceRemoteDir,
+        cwd: commandCwd,
         timeoutMs,
       });
       if (!probe.timedOut && (probe.exitCode ?? 1) === 0) {
@@ -195,7 +196,7 @@ export async function prepareCommandManagedRuntime(input: {
     const result = await input.runner.execute({
       command: shellCommand,
       args: shellCommandArgs(installCommand),
-      cwd: workspaceRemoteDir,
+      cwd: commandCwd,
       timeoutMs,
     });
     // A failed install is not always fatal: the CLI may already be on PATH