@tanstack/ai-sandbox 0.3.1 → 0.3.3

package/src/middleware.ts

@@ -48,6 +48,7 @@ import {
 } from './tool-history'
 import { watchWorkspace } from './watch'
 import { DEFAULT_WORKSPACE_ROOT } from './bootstrap'
+import { resolveHarnessCwd } from './harness-cwd'
 import type { InternalLogger } from '@tanstack/ai/adapter-internals'
 import type { LockStore } from '@tanstack/ai/locks'
 import type {
@@ -293,6 +294,7 @@ function buildEnsureCtx(
     locks: options?.locks ?? ctx.getOptional(LocksCapability),
     tenant: tenantFrom(ctx.context),
     signal: ctx.signal,
+    adapterName: ctx.provider,
   }
 }
 
@@ -570,7 +572,8 @@ export function withSandbox<TOffset extends string = string>(
 
       const workspace = definition.workspace
       if (workspace !== undefined) {
-        const root = workspace.root ?? DEFAULT_WORKSPACE_ROOT
+        const virtualRoot = workspace.root ?? DEFAULT_WORKSPACE_ROOT
+        const root = resolveHarnessCwd(handle, virtualRoot)
         const workspaceHash = computeWorkspaceHash(workspace)
         const secrets = workspace.secrets
         provideWorkspaceProjection(ctx, {

package/src/sandbox.ts

@@ -76,6 +76,8 @@ export interface SandboxEnsureContext {
   locks?: LockStore
   tenant?: { userId?: string; orgId?: string }
   signal?: AbortSignal
+  /** Harness adapter name (`grok-build`, `claude-code`, `codex`, `opencode`). Optional. */
+  adapterName?: string
 }
 
 export interface SandboxDefinition {
@@ -123,6 +125,24 @@ const DESTROY_TIMEOUT_MS = 60 * 1000
 const fallbackStore = new InMemorySandboxInstanceStore()
 const fallbackLocks = new InMemoryLockStore()
 
+/**
+ * Put workspace secrets onto a live handle. Resume and snapshot restore skip
+ * bootstrap, so this is the only path that re-injects them after reconnect.
+ * Create injects secrets via `provider.create({ env })`, but resume/restore
+ * return a handle whose process env is empty unless we set it here. sbx in
+ * particular has no Docker Env on resume, so this is the only way secrets
+ * come back for that provider.
+ */
+async function applyWorkspaceSecrets(
+  handle: SandboxHandle,
+  workspace: WorkspaceDefinition | undefined,
+): Promise<void> {
+  if (workspace?.secrets === undefined) return
+  const resolved = resolveAllSecrets(workspace.secrets)
+  if (Object.keys(resolved).length === 0) return
+  await handle.env.set(resolved)
+}
+
 export function defineSandbox(config: SandboxConfig): SandboxDefinition {
   const keyInputFor = (ctx: SandboxEnsureContext): SandboxKeyInput => ({
     threadId:
@@ -160,6 +180,7 @@ export function defineSandbox(config: SandboxConfig): SandboxDefinition {
             signal: ctx.signal,
           })
           if (resumed) {
+            await applyWorkspaceSecrets(resumed, config.workspace)
             await store.upsert({
               ...existing,
               latestRunId: ctx.runId,
@@ -183,6 +204,7 @@ export function defineSandbox(config: SandboxConfig): SandboxDefinition {
                   : undefined,
               signal: ctx.signal,
             })
+            await applyWorkspaceSecrets(restored, config.workspace)
             await store.upsert({
               ...existing,
               providerSandboxId: restored.id,
@@ -208,6 +230,7 @@ export function defineSandbox(config: SandboxConfig): SandboxDefinition {
             ? resolveAllSecrets(config.workspace.secrets)
             : undefined,
         signal: ctx.signal,
+        adapterName: ctx.adapterName,
       })
 
       if (config.workspace) {

package/src/tool-bridge.ts

@@ -38,7 +38,9 @@ export const BRIDGED_MCP_SERVER_NAME = 'tanstack'
 
 /** Hostname the sandbox uses to reach the bridge endpoint, per provider. */
 export function hostForSandbox(provider: string): string {
-  return provider === 'docker' ? 'host.docker.internal' : '127.0.0.1'
+  return provider === 'docker' || provider === 'sbx'
+    ? 'host.docker.internal'
+    : '127.0.0.1'
 }
 
 /** Result of a permission decision returned to the harness's prompt tool. */