diff --git a/bun.lock b/bun.lock index a186ad1c8d5..525627816ae 100644 --- a/bun.lock +++ b/bun.lock @@ -118,7 +118,7 @@ "opencode2": "./bin/opencode2.cjs", }, "dependencies": { - "@agentclientprotocol/sdk": "1.2.1", + "@agentclientprotocol/sdk": "1.6.0", "@clack/core": "1.0.0-alpha.1", "@clack/prompts": "1.0.0-alpha.1", "@effect/platform-node": "catalog:", @@ -1230,7 +1230,7 @@ "@adobe/css-tools": ["@adobe/css-tools@4.5.0", "", {}, "sha512-6OzddxPio9UiWTCemp4N8cYLV2ZN1ncRnV1cVGtve7dhPOtRkleRyx32GQCYSwDYgaHU3USMm84tNsvKzRCa1Q=="], - "@agentclientprotocol/sdk": ["@agentclientprotocol/sdk@1.2.1", "", { "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" } }, "sha512-jwYUdOQR7tc+Zfch53VL4JJyUNK/46q03uUTYb+PjECsmnNl94XFXOfYLJ8RBpMNidXd1rpOAVgb0vqD98xImA=="], + "@agentclientprotocol/sdk": ["@agentclientprotocol/sdk@1.6.0", "", { "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" } }, "sha512-XxXrmX7aZkDgOB0Rg9cu+ZFyiUUc5lF2n9seO3Gc4OR+MTdfZOwIqF6m3LvsmmM8K3qgPmXkDH8/IFM2u9vdcQ=="], "@ai-sdk/cohere": ["@ai-sdk/cohere@3.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-OqcCq2PiFY1dbK/0Ck45KuvE8jfdxRuuAE9Y5w46dAk6U+9vPOeg1CDcmR+ncqmrYrhRl3nmyDttyDahyjCzAw=="], diff --git a/packages/cli/package.json b/packages/cli/package.json index bc867958d98..ddfcc949c92 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -24,7 +24,7 @@ "typecheck": "tsgo -b" }, "dependencies": { - "@agentclientprotocol/sdk": "1.2.1", + "@agentclientprotocol/sdk": "1.6.0", "@clack/core": "1.0.0-alpha.1", "@clack/prompts": "1.0.0-alpha.1", "@effect/platform-node": "catalog:", diff --git a/packages/cli/src/commands/handlers/acp.ts b/packages/cli/src/commands/handlers/acp.ts index 56ece4f82cf..1f10c90bc26 100644 --- a/packages/cli/src/commands/handlers/acp.ts +++ b/packages/cli/src/commands/handlers/acp.ts @@ -1,4 +1,4 @@ -import { ndJsonStream } from "@agentclientprotocol/sdk" +import { MessageTooLargeError, ndJsonStream } from "@agentclientprotocol/sdk" import { OpenCode } from "@opencode/client/promise" import { Service } from "@opencode/client/effect/service" import { CrossSpawnSpawner } from "@opencode/util/cross-spawn-spawner" @@ -16,25 +16,29 @@ export default Runtime.handler( const endpoint = yield* Standalone.start() const client = OpenCode.make({ baseUrl: endpoint.url, headers: Service.headers(endpoint) }) const connection = yield* ACP.connect(client, ndJsonStream(Writable.toWeb(process.stdout), Bun.stdin.stream())) - const code = yield* Effect.raceFirst( - Effect.promise(() => connection.closed).pipe(Effect.as(0)), + const failure = yield* Effect.raceFirst( + Effect.promise(() => connection.closed).pipe( + Effect.map(() => + connection.signal.reason instanceof MessageTooLargeError + ? `incoming message exceeded the ${connection.signal.reason.maxMessageBytes / 1024 / 1024} MiB limit` + : undefined, + ), + ), endpoint.exited.pipe( Effect.match({ onSuccess: (code) => `code ${code}`, onFailure: (error) => error.cause instanceof CrossSpawnSpawner.KilledBySignal ? `signal ${error.cause.signal}` : error.message, }), - // stdout carries ACP, so the diagnostic goes to stderr. - Effect.flatMap((reason) => - Effect.sync(() => { - process.stderr.write(`opencode acp: server exited unexpectedly (${reason})\n`) - return 1 - }), - ), + Effect.map((reason) => `server exited unexpectedly (${reason})`), ), ) // Closing the handler scope would wait for the private server's graceful shutdown; its lease pipe already // ends the server once this process exits. - yield* Effect.sync(() => process.exit(code)) + yield* Effect.sync(() => { + // stdout carries ACP, so the diagnostic goes to stderr. + if (failure) process.stderr.write(`opencode acp: ${failure}\n`) + process.exit(failure ? 1 : 0) + }) }), ) diff --git a/packages/cli/test/acp/lifecycle.subprocess.test.ts b/packages/cli/test/acp/lifecycle.subprocess.test.ts index 0e5c2f2886f..63f0ddd0027 100644 --- a/packages/cli/test/acp/lifecycle.subprocess.test.ts +++ b/packages/cli/test/acp/lifecycle.subprocess.test.ts @@ -17,6 +17,20 @@ describe("acp lifecycle subprocess", () => { expect(await acp.close()).toBe(0) }, 60_000) + test("an incoming message over the size limit exits with an error", async () => { + await using fixture = await createAcpFixture() + const acp = fixture.spawn() + await initialize(acp) + const [code] = await Promise.all([ + acp.exited, + // The agent stops reading partway through the line, so the write may fail. + acp.notify("opencode/oversized", { data: "a".repeat(32 * 1024 * 1024) }).catch(() => undefined), + ]) + await acp[Symbol.asyncDispose]() + expect(code).toBe(1) + expect(acp.stderr()).toContain("opencode acp: incoming message exceeded the 32 MiB limit\n") + }, 60_000) + test("close capability and close request", async () => { await using fixture = await createAcpFixture() const acp = fixture.spawn()