Skip to content

fix(sandbox): auto-bypass CSB free-tier trust interstitial and guard preload script race #3088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Fizza-Mukhtar wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(sandbox): auto-bypass CSB free-tier trust interstitial and guard preload script race #3088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86fa4ed
fix(sandbox): auto-bypass CSB trust interstitial and guard preload sc…
Fizza-Mukhtar Mar 6, 2026
cfc5c93
fix: clear preload retry timeout on sandbox cleanup
Fizza-Mukhtar Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions apps/web/client/src/app/project/[id]/_components/canvas/frame/view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type { IframeHTMLAttributes } from 'react';
import { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
import { observer } from 'mobx-react-lite';
import { connect, WindowMessenger } from 'penpal';
import { PreloadScriptState } from '@/components/store/editor/sandbox';

import type { Frame } from '@onlook/models';
import type {
Expand Down Expand Up @@ -86,6 +87,12 @@ export const FrameComponent = observer(

const setupPenpalConnection = () => {
try {
const sandbox = editorEngine.activeSandbox;
if (sandbox?.preloadScriptState === PreloadScriptState.LOADING) {
console.log(`${PENPAL_PARENT_CHANNEL} (${frame.id}) - Preload script still loading, will retry on next load`);
return;
}

if (!iframeRef.current?.contentWindow) {
console.error(`${PENPAL_PARENT_CHANNEL} (${frame.id}) - No iframe found`);
onConnectionFailed();
Expand Down
26 changes: 17 additions & 9 deletions apps/web/client/src/components/store/editor/sandbox/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export class SandboxManager {
readonly gitManager: GitManager;
private providerReactionDisposer?: () => void;
private sync: CodeProviderSync | null = null;
private preloadRetryTimeoutId?: ReturnType<typeof setTimeout>;
preloadScriptState: PreloadScriptState = PreloadScriptState.NOT_INJECTED
routerConfig: RouterConfig | null = null;

Expand Down Expand Up @@ -110,9 +111,13 @@ export class SandboxManager {
this.preloadScriptState = PreloadScriptState.INJECTED
} catch (error) {
console.error('[SandboxManager] Failed to ensure preload script exists:', error);
// Mark as injected to prevent blocking frames indefinitely
// Frames will handle the missing preload script gracefully
this.preloadScriptState = PreloadScriptState.NOT_INJECTED
this.preloadScriptState = PreloadScriptState.NOT_INJECTED;
this.preloadRetryTimeoutId = setTimeout(() => {
if (this.preloadScriptState === PreloadScriptState.NOT_INJECTED) {
console.log('[SandboxManager] Retrying preload script injection...');
void this.ensurePreloadScriptExists();
}
}, 3000);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
}

Expand Down Expand Up @@ -214,11 +219,14 @@ export class SandboxManager {
}

clear() {
this.providerReactionDisposer?.();
this.providerReactionDisposer = undefined;
this.sync?.release();
this.sync = null;
this.preloadScriptState = PreloadScriptState.NOT_INJECTED
this.session.clear();
if (this.preloadRetryTimeoutId) {
clearTimeout(this.preloadRetryTimeoutId);
this.preloadRetryTimeoutId = undefined;
}
this.providerReactionDisposer = undefined;
this.sync?.release();
this.sync = null;
this.preloadScriptState = PreloadScriptState.NOT_INJECTED
this.session.clear();
}
}
11 changes: 6 additions & 5 deletions apps/web/client/src/server/api/routers/project/project.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,16 @@ export const projectRouter = createTRPCRouter({
const url = getSandboxPreviewUrl(branch.sandboxId, port);
const app = new FirecrawlApp({ apiKey: env.FIRECRAWL_API_KEY });

// Optional: Add actions to click the button for CSB free tier
// const _csbFreeActions = [{
// type: 'click',
// selector: '#btn-answer-yes',
// }];
const csbFreeActions = [{
type: 'click',
selector: '#btn-answer-yes',
}];

const result = await app.scrapeUrl(url, {
formats: ['screenshot'],
onlyMainContent: true,
timeout: 10000,
actions: csbFreeActions,
});

if (!result.success) {
Expand Down