The open-source app everyone uses to manage agents at work
TypeScript acpxagent-orchestrationagent-skillsagentic-aiai-agentsai-engineeringai-governanceai-toolsautonomous-agentsclaudeclaude-codeclaude-skillscodexhermesllmmcpmulti-agentopenclawproject-managementworkflow-automation
fix(opencode-local): run in the realized workspace (#11438)
Kilian28e134873ef7
diff --git a/packages/adapters/opencode-local/src/server/execute.remote.test.ts b/packages/adapters/opencode-local/src/server/execute.remote.test.tsindex 7472e11ffe..2271749e33 100644--- a/packages/adapters/opencode-local/src/server/execute.remote.test.ts+++ b/packages/adapters/opencode-local/src/server/execute.remote.test.ts@@ -153,6 +153,7 @@ describe("opencode remote execution", () => {config: {command: "opencode",model: "opencode/gpt-5-nano",+ extraArgs: ["--", "--dir"],...(managed ? {managedAiConnection: { provider: "openrouter", method: "api_key" },} : {}),@@ -236,6 +237,7 @@ describe("opencode remote execution", () => {`${managedRemoteWorkspace}/.paperclip-runtime/opencode/xdgConfig`,);expect(modelProbeCall?.[3].remoteExecution?.remoteCwd).toBe("/remote/workspace");+ expect(runCall?.[2].slice(-4)).toEqual(["--dir", managedRemoteWorkspace, "--", "--dir"]);const call = runCall as| [string, string, string[], { env: Record<string, string>; remoteExecution?: { remoteCwd: string } | null }]| undefined;@@ -335,7 +337,7 @@ describe("opencode remote execution", () => {expect(startAdapterExecutionTargetPaperclipBridge).not.toHaveBeenCalled();});- it("resumes saved OpenCode sessions for remote SSH execution only when the identity matches", async () => {+ it("resumes matching remote sessions and preserves an explicit run directory", async () => {const rootDir = await mkdtemp(path.join(os.tmpdir(), "paperclip-opencode-remote-resume-"));cleanupDirs.push(rootDir);const workspaceDir = path.join(rootDir, "workspace");@@ -370,6 +372,7 @@ describe("opencode remote execution", () => {config: {command: "opencode",model: "opencode/gpt-5-nano",+ extraArgs: ["--dir", "/operator-supplied"],},context: {paperclipWorkspace: {@@ -397,5 +400,7 @@ describe("opencode remote execution", () => {| undefined;expect(call?.[2]).toContain("--session");expect(call?.[2]).toContain("session-123");+ expect(call?.[2].slice(-2)).toEqual(["--dir", "/operator-supplied"]);+ expect(call?.[2].filter((arg) => arg === "--dir" || arg.startsWith("--dir="))).toHaveLength(1);});});diff --git a/packages/adapters/opencode-local/src/server/execute.ts b/packages/adapters/opencode-local/src/server/execute.tsindex a7458fd3d9..7171067d00 100644--- a/packages/adapters/opencode-local/src/server/execute.ts+++ b/packages/adapters/opencode-local/src/server/execute.ts@@ -621,6 +621,13 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecif (resumeSessionId) args.push("--session", resumeSessionId);if (model) args.push("--model", model);if (variant) args.push("--variant", variant);+ // OpenCode prefers the inherited PWD over process.cwd(). Use the realized+ // workspace unless the operator already selected a directory explicitly.+ const optionTerminator = extraArgs.indexOf("--");+ const extraOptionArgs = optionTerminator === -1 ? extraArgs : extraArgs.slice(0, optionTerminator);+ if (!extraOptionArgs.some((arg) => arg === "--dir" || arg.startsWith("--dir="))) {+ args.push("--dir", effectiveExecutionCwd);+ }if (extraArgs.length > 0) args.push(...extraArgs);return args;};