fix: wait for sandbox agent bootstrap

Author: Gini

server/onecomputer-client.ts

@@ -3,6 +3,8 @@ export type OneComputerSandbox = {
   name?: string
   state?: string
   provider?: string
+  bootstrapped?: boolean
+  desktopReady?: boolean
 }
 
 export type OneComputerClientOptions = {

server/onecomputer-sandbox-runner.test.ts

@@ -12,7 +12,7 @@ afterEach(async () => {
 
 describe('OneComputerSandboxRuntimeAdapter', () => {
   it('only exposes browser MCP controls when the governed runtime explicitly enables them', async () => {
-    const { GOVERNED_BROWSER_TOOLS, browserEvidenceFor, governedClaudeTools, isGovernedBrowserTool } = await import('./onecomputer-sandbox-runner.js')
+    const { GOVERNED_BROWSER_TOOLS, browserEvidenceFor, governedClaudeTools, isGovernedBrowserTool, isSandboxRuntimeReady } = await import('./onecomputer-sandbox-runner.js')
     expect(governedClaudeTools(false)).toEqual(['Read', 'Write', 'Edit', 'Glob', 'Grep'])
     expect(governedClaudeTools(true)).toEqual(expect.arrayContaining([...GOVERNED_BROWSER_TOOLS]))
     expect(GOVERNED_BROWSER_TOOLS).toEqual(expect.arrayContaining(['mcp__playwright__browser_select_option', 'mcp__playwright__browser_wait_for']))
@@ -21,6 +21,9 @@ describe('OneComputerSandboxRuntimeAdapter', () => {
     expect(isGovernedBrowserTool('mcp__playwright__browser_evaluate')).toBe(false)
     expect(browserEvidenceFor('mcp__playwright__browser_navigate', { url: 'https://user:password@example.com/path?token=hidden#fragment' })).toEqual({ tool: 'browser_navigate', url: 'https://example.com/path' })
     expect(browserEvidenceFor('mcp__playwright__browser_navigate', { url: 'file:///tmp/onevibe/task/index.html' })).toEqual({ tool: 'browser_navigate', url: 'file://sandbox-local/index.html' })
+    expect(isSandboxRuntimeReady({ state: 'started', bootstrapped: false })).toBe(false)
+    expect(isSandboxRuntimeReady({ state: 'started', bootstrapped: true })).toBe(true)
+    expect(isSandboxRuntimeReady({ state: 'started' })).toBe(true)
   })
 
   it('builds generated projects only in the sandbox and disables install lifecycle scripts', async () => {

server/onecomputer-sandbox-runner.ts

@@ -90,6 +90,7 @@ export const governedClaudeTools = (browserAutomation: boolean) => [
 ]
 
 export const isGovernedBrowserTool = (name: string) => (GOVERNED_BROWSER_TOOLS as readonly string[]).includes(name)
+export const isSandboxRuntimeReady = (sandbox: { state?: string; bootstrapped?: boolean }) => sandbox.state === 'started' && sandbox.bootstrapped !== false
 
 export const sandboxBuildValidationCommand = (workspace: string) => [
   'set +e',
@@ -212,12 +213,17 @@ export class OneComputerSandboxRuntimeAdapter implements RuntimeAdapter {
       }
       let live = sandbox
       const deadline = Date.now() + 4 * 60_000
-      while (live.state !== 'started') {
+      while (!isSandboxRuntimeReady(live)) {
         if (live.state === 'error' || Date.now() >= deadline) throw new Error(`ONEComputer sandbox failed to start (state=${live.state ?? 'unknown'})`)
         await wait(this.options.pollMilliseconds ?? 2_000, signal)
         live = await this.client.getSandbox(sandbox.id, signal)
         await recordSandboxState(live)
       }
+      await store.appendEvent(task.id, {
+        type: 'activity_delta', lane: 'control', label: 'ONEComputer agent runtime bootstrapped',
+        content: 'The provider reported the retained sandbox ready for Claude execution.',
+        payload: { sandboxId: sandbox.id, state: live.state, bootstrapped: live.bootstrapped ?? 'legacy_unspecified', desktopReady: live.desktopReady },
+      })
       await store.updateTask(task.id, {
         securityContext: {
           mode: 'onecomputer', sandboxId: sandbox.id, provider: sandbox.provider,