From 8cfd9159607d9e4de82497cda118516e21582ffd Mon Sep 17 00:00:00 2001
From: Allen Hutchison <adh@google.com>
Date: Tue, 22 Apr 2025 15:19:40 -0700
Subject: [PATCH] Fix the case where passthrough tools weren't using the
 correct CWD from -d

---
 packages/cli/src/ui/hooks/useGeminiStream.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/ui/hooks/useGeminiStream.ts b/packages/cli/src/ui/hooks/useGeminiStream.ts
index c4d44749..27b68577 100644
--- a/packages/cli/src/ui/hooks/useGeminiStream.ts
+++ b/packages/cli/src/ui/hooks/useGeminiStream.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { exec as _exec } from 'child_process';
+import { exec as _exec, exec } from 'child_process';
 import { useState, useRef, useCallback, useEffect } from 'react';
 import { useInput } from 'ink';
 import {
@@ -115,8 +115,12 @@ export const useGeminiStream = (
           return;
         } else if (config.getPassthroughCommands().includes(maybeCommand)) {
           // Execute and capture output
-          setDebugMessage(`Executing shell command directly: ${query}`);
-          _exec(query, (error, stdout, stderr) => {
+          const targetDir = config.getTargetDir();
+          setDebugMessage(`Executing shell command in ${targetDir}: ${query}`);
+          const execOptions = {
+            cwd: targetDir,
+          };
+          _exec(query, execOptions, (error, stdout, stderr) => {
             const timestamp = getNextMessageId(Date.now());
             if (error) {
               addHistoryItem(