Remove createSandboxFetch and inline the one-liner

Author: ghostwriternr

examples/opencode/src/index.ts

@@ -9,6 +9,8 @@ import { getSandbox } from '@cloudflare/sandbox';
 import { createOpencode, proxyToOpencode } from '@cloudflare/sandbox/opencode';
 import type { Config, OpencodeClient } from '@opencode-ai/sdk';
 
+export { Sandbox } from '@cloudflare/sandbox';
+
 const getConfig = (env: Env): Config => ({
   provider: {
     anthropic: {
@@ -52,7 +54,6 @@ async function handleSdkTest(
       config: getConfig(env)
     });
 
-    console.log('Client created:', client);
     // Create a session
     const session = await client.session.create({
       body: { title: 'Test Session' },
@@ -63,7 +64,6 @@ async function handleSdkTest(
       throw new Error(`Failed to create session: ${JSON.stringify(session)}`);
     }
 
-    console.log('Session created:', session.data);
     // Send a prompt using the SDK
     const promptResult = await client.session.prompt({
       path: { id: session.data.id },
@@ -82,7 +82,6 @@ async function handleSdkTest(
       }
     });
 
-    console.log('Prompt result:', promptResult.data);
     // Extract text response from result
     const parts = promptResult.data?.parts ?? [];
     const textPart = parts.find((p: { type: string }) => p.type === 'text') as
@@ -102,6 +101,3 @@ async function handleSdkTest(
     );
   }
 }
-
-// Export Sandbox DO for wrangler
-export { Sandbox } from '@cloudflare/sandbox';

package-lock.json

@@ -39,7 +39,7 @@
     "check": "biome check && npm run typecheck",
     "fix": "biome check --fix && npm run typecheck",
     "typecheck": "tsc --noEmit",
-    "docker:local": "cd ../.. && docker build -f packages/sandbox/Dockerfile --target default --platform linux/amd64 --build-arg SANDBOX_VERSION=$npm_package_version -t cloudflare/sandbox-test:$npm_package_version . && docker build -f packages/sandbox/Dockerfile --target python --platform linux/amd64 --build-arg SANDBOX_VERSION=$npm_package_version -t cloudflare/sandbox-test:$npm_package_version-python .",
+    "docker:local": "cd ../.. && docker build -f packages/sandbox/Dockerfile --target default --platform linux/amd64 --build-arg SANDBOX_VERSION=$npm_package_version -t cloudflare/sandbox-test:$npm_package_version . && docker build -f packages/sandbox/Dockerfile --target python --platform linux/amd64 --build-arg SANDBOX_VERSION=$npm_package_version -t cloudflare/sandbox-test:$npm_package_version-python . && docker build -f packages/sandbox/Dockerfile --target opencode --platform linux/amd64 --build-arg SANDBOX_VERSION=$npm_package_version -t cloudflare/sandbox-test:$npm_package_version-opencode .",
     "test": "vitest run --config vitest.config.ts \"$@\"",
     "test:e2e": "cd ../../tests/e2e/test-worker && ./generate-config.sh && cd ../../.. && vitest run --config vitest.e2e.config.ts \"$@\""
   },

packages/sandbox/package.json

@@ -37,7 +37,6 @@
  * @packageDocumentation
  */
 
-export { createSandboxFetch } from './fetch';
 export { createOpencode, proxyToOpencode } from './opencode';
 export type {
   OpencodeOptions,

packages/sandbox/src/opencode/fetch.ts

@@ -1,7 +1,6 @@
 import type { Config } from '@opencode-ai/sdk';
 import { createLogger, type Logger, type Process } from '@repo/shared';
 import type { Sandbox } from '../sandbox';
-import { createSandboxFetch } from './fetch';
 import type {
   OpencodeOptions,
   OpencodeResult,
@@ -248,7 +247,7 @@ export async function createOpencode<TClient = unknown>(
 
   const client = clientFactory({
     baseUrl: `http://localhost:${port}`,
-    fetch: createSandboxFetch(sandbox, port)
+    fetch: (request: Request) => sandbox.containerFetch(request, port)
   });
 
   // Build server handle

packages/sandbox/src/opencode/index.ts

@@ -158,9 +158,6 @@ describe('createOpencode', () => {
       stderr: 'Server crashed'
     });
 
-    await expect(
-      createOpencode(mockSandbox as unknown as Sandbox)
-    ).rejects.toThrow(OpencodeStartupError);
     await expect(
       createOpencode(mockSandbox as unknown as Sandbox)
     ).rejects.toThrow(/Server crashed/);
@@ -242,9 +239,6 @@ describe('createOpencode', () => {
       });
       mockSandbox.listProcesses.mockResolvedValue([startingProcess]);
 
-      await expect(
-        createOpencode(mockSandbox as unknown as Sandbox)
-      ).rejects.toThrow(OpencodeStartupError);
       await expect(
         createOpencode(mockSandbox as unknown as Sandbox)
       ).rejects.toThrow(/Startup failed/);

packages/sandbox/src/opencode/opencode.ts

@@ -1,14 +1,9 @@
 /**
  * E2E Test: OpenCode Integration Workflow
  *
- * Tests the complete OpenCode integration including:
- * - OpenCode CLI availability in the container
- * - Server startup via SDK
- * - Process reuse for existing servers
- * - Basic SDK client operations
- *
- * These tests require the -opencode container variant which includes
- * the OpenCode CLI pre-installed.
+ * Tests:
+ * - OpenCode CLI availability in the -opencode container variant
+ * - Server startup and lifecycle via process API
  */
 
 import { beforeAll, describe, expect, test } from 'vitest';
@@ -28,31 +23,16 @@ describe('OpenCode Workflow (E2E)', () => {
     headers = sandbox.createOpencodeHeaders(createUniqueSession());
   }, 120000);
 
-  describe('OpenCode CLI availability', () => {
-    test('should have opencode command available', async () => {
-      const res = await fetch(`${workerUrl}/api/execute`, {
-        method: 'POST',
-        headers,
-        body: JSON.stringify({ command: 'which opencode' })
-      });
-      expect(res.status).toBe(200);
-      const result = (await res.json()) as ExecResult;
-      expect(result.exitCode).toBe(0);
-      expect(result.stdout).toContain('opencode');
-    });
-
-    test('should report opencode version', async () => {
-      const res = await fetch(`${workerUrl}/api/execute`, {
-        method: 'POST',
-        headers,
-        body: JSON.stringify({ command: 'opencode --version' })
-      });
-      expect(res.status).toBe(200);
-      const result = (await res.json()) as ExecResult;
-      expect(result.exitCode).toBe(0);
-      // Version output should contain version number
-      expect(result.stdout).toMatch(/\d+\.\d+/);
+  test('should have opencode CLI available', async () => {
+    const res = await fetch(`${workerUrl}/api/execute`, {
+      method: 'POST',
+      headers,
+      body: JSON.stringify({ command: 'opencode --version' })
     });
+    expect(res.status).toBe(200);
+    const result = (await res.json()) as ExecResult;
+    expect(result.exitCode).toBe(0);
+    expect(result.stdout).toMatch(/\d+\.\d+/);
   });
 
   describe('OpenCode server lifecycle', () => {
@@ -100,13 +80,12 @@ describe('OpenCode Workflow (E2E)', () => {
       expect(opencodeProcess).toBeDefined();
       expect(opencodeProcess?.status).toBe('running');
 
-      // Kill the server
+      // Kill the server (DELETE method)
       const killRes = await fetch(
-        `${workerUrl}/api/process/${startResult.id}/kill`,
+        `${workerUrl}/api/process/${startResult.id}`,
         {
-          method: 'POST',
-          headers,
-          body: JSON.stringify({ signal: 'SIGTERM' })
+          method: 'DELETE',
+          headers
         }
       );
       expect(killRes.status).toBe(200);