fix: encode non-ASCII directory paths in HTTP headers (#7145)

jwaterwater · claude · web-flow · commit 2d52a461a0fb · 2026-01-07T06:46:17.000-06:00
Co-authored-by: Claude &lt;noreply@anthropic.com&gt;
diff --git a/packages/opencode/src/server/server.ts b/packages/opencode/src/server/server.ts
@@ -246,7 +246,12 @@ export namespace Server {
         },
       )
       .use(async (c, next) => {
-        const directory = c.req.query("directory") || c.req.header("x-opencode-directory") || process.cwd()
+        let directory = c.req.query("directory") || c.req.header("x-opencode-directory") || process.cwd()
+        try {
+          directory = decodeURIComponent(directory)
+        } catch {
+          // fallback to original value
+        }
         return Instance.provide({
           directory,
           init: InstanceBootstrap,
diff --git a/packages/sdk/js/src/v2/client.ts b/packages/sdk/js/src/v2/client.ts
@@ -19,9 +19,11 @@ export function createOpencodeClient(config?: Config & { directory?: string }) {
   }
 
   if (config?.directory) {
+    const isNonASCII = /[^\x00-\x7F]/.test(config.directory)
+    const encodedDirectory = isNonASCII ? encodeURIComponent(config.directory) : config.directory
     config.headers = {
       ...config.headers,
-      "x-opencode-directory": config.directory,
+      "x-opencode-directory": encodedDirectory,
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,11 @@ export function createOpencodeClient(config?: Config & { directory?: string }) {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`if (config?.directory) {`
	`22`	`+ const isNonASCII = /[^\x00-\x7F]/.test(config.directory)`
	`23`	`+ const encodedDirectory = isNonASCII ? encodeURIComponent(config.directory) : config.directory`
`22`	`24`	`config.headers = {`
`23`	`25`	`...config.headers,`
`24`		`- "x-opencode-directory": config.directory,`
	`26`	`+ "x-opencode-directory": encodedDirectory,`
`25`	`27`	`}`
`26`	`28`	`}`
`27`	`29`