From 8ebb7664702a18dcbb119e2cddf259a00ed4af9b Mon Sep 17 00:00:00 2001
From: Greg Pstrucha <875316+gricha@users.noreply.github.com>
Date: Thu, 22 Jan 2026 11:19:08 -0800
Subject: [PATCH] fix(attach): allow remote --dir (#8969)

---
 packages/opencode/src/cli/cmd/tui/attach.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/attach.ts b/packages/opencode/src/cli/cmd/tui/attach.ts
index 3f9285f63..f641ff098 100644
--- a/packages/opencode/src/cli/cmd/tui/attach.ts
+++ b/packages/opencode/src/cli/cmd/tui/attach.ts
@@ -21,11 +21,19 @@ export const AttachCommand = cmd({
         describe: "session id to continue",
       }),
   handler: async (args) => {
-    if (args.dir) process.chdir(args.dir)
+    let directory = args.dir
+    if (args.dir) {
+      try {
+        process.chdir(args.dir)
+        directory = process.cwd()
+      } catch {
+        // If the directory doesn't exist locally (remote attach), pass it through.
+      }
+    }
     await tui({
       url: args.url,
       args: { sessionID: args.session },
-      directory: args.dir ? process.cwd() : undefined,
+      directory,
     })
   },
 })