rebase

packages/opencode/src/tool/bash.ts

@@ -89,10 +89,10 @@ export const BashTool = Tool.define("bash", async () => {
     parameters: z.object({
       command: z.string().describe("The command to execute"),
       timeout: z.number().describe("Optional timeout in milliseconds").optional(),
-      dir_path: z
+      workdir: z
         .string()
         .describe(
-          `The path of the directory to run the command in, defaults to ${Instance.directory}. Must be a directory that already exists`,
+          `The working directory to run the command in. Defaults to ${Instance.directory}. Use this instead of 'cd' commands.`,
         )
         .optional(),
       description: z
@@ -102,7 +102,7 @@ export const BashTool = Tool.define("bash", async () => {
         ),
     }),
     async execute(params, ctx) {
-      const cwd = params.dir_path || Instance.directory
+      const cwd = params.workdir || Instance.directory
       if (params.timeout !== undefined && params.timeout < 0) {
         throw new Error(`Invalid timeout value: ${params.timeout}. Timeout must be a positive number.`)
       }

packages/opencode/src/tool/bash.txt

@@ -25,18 +25,21 @@ Usage notes:
   - VERY IMPORTANT: You MUST avoid using search commands like `find` and `grep`. Instead use Grep, Glob, or Task to search. You MUST avoid read tools like `cat`, `head`, `tail`, and `ls`, and use Read and List to read files.
   - If you _still_ need to run `grep`, STOP. ALWAYS USE ripgrep at `rg` (or /usr/bin/rg) first, which all opencode users have pre-installed.
   - When issuing multiple commands, use the ';' or '&&' operator to separate them. DO NOT use newlines (newlines are ok in quoted strings).
-  - Avoid using `cd` to change directories when possible. Instead, set the `workdir` parameter or use absolute paths in your commands.
+
+# Working Directory
+
+The `workdir` parameter sets the working directory for command execution. Prefer using `workdir` over `cd <dir> &&` command chains when you simply need to run a command in a different directory.
+
 <good-example>
-    dir_path="/foo/bar", command="pytest tests"
+workdir="/foo/bar", command="pytest tests"
 </good-example>
 <good-example>
-    pytest /foo/bar/tests
+command="pytest /foo/bar/tests"
 </good-example>
 <bad-example>
-    cd /foo/bar && pytest tests
+command="cd /foo/bar && pytest tests"
 </bad-example>
 
-
 # Committing changes with git
 
 IMPORTANT: ONLY COMMIT IF THE USER ASKS YOU TO.