@aion0/bastion 0.1.7 → 0.1.10

package/dist/api.d.ts

@@ -0,0 +1,72 @@
+import type { BastionConfig } from './config/schema.js';
+import type { ConfigManager } from './config/manager.js';
+import type { PluginManager } from './plugins/index.js';
+export interface BastionServerOptions {
+    configPath?: string;
+    config?: Partial<BastionConfig>;
+    port?: number;
+    host?: string;
+    silent?: boolean;
+    logLevel?: 'debug' | 'info' | 'warn' | 'error';
+    dbPath?: string;
+    skipPidFile?: boolean;
+    skipRetention?: boolean;
+}
+export interface DlpFindingEvent {
+    requestId: string;
+    patternName: string;
+    patternCategory: string;
+    action: string;
+    matchCount: number;
+    direction: string;
+}
+export interface ToolGuardAlertEvent {
+    requestId: string;
+    toolName: string;
+    ruleId: string;
+    ruleName: string;
+    severity: string;
+    category: string;
+    action: string;
+    matchedText: string;
+}
+export interface RequestCompleteEvent {
+    requestId: string;
+    statusCode: number;
+    latencyMs: number;
+    isStreaming: boolean;
+    provider: string;
+    model: string;
+    usage: {
+        inputTokens: number;
+        outputTokens: number;
+        cacheCreationTokens: number;
+        cacheReadTokens: number;
+    };
+}
+export interface CertificateInfo {
+    certPath: string;
+    exists: boolean;
+}
+export interface BastionServer {
+    readonly port: number;
+    readonly host: string;
+    readonly url: string;
+    readonly caCertPath: string;
+    readonly dashboardUrl: string;
+    readonly authToken: string | undefined;
+    readonly config: BastionConfig;
+    readonly plugins: PluginManager;
+    readonly configManager: ConfigManager;
+    on(event: 'dlp:finding', handler: (data: DlpFindingEvent) => void): BastionServer;
+    on(event: 'toolguard:alert', handler: (data: ToolGuardAlertEvent) => void): BastionServer;
+    on(event: 'request:complete', handler: (data: RequestCompleteEvent) => void): BastionServer;
+    on(event: 'error', handler: (error: Error) => void): BastionServer;
+    on(event: 'close', handler: () => void): BastionServer;
+    off(event: string, handler: (...args: unknown[]) => void): BastionServer;
+    removeAllListeners(event?: string): BastionServer;
+    close(): Promise<void>;
+}
+export declare function createServer(options?: BastionServerOptions): Promise<BastionServer>;
+export declare function ensureCertificate(): Promise<CertificateInfo>;
+//# sourceMappingURL=api.d.ts.map

package/dist/api.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}

package/dist/api.js

@@ -0,0 +1,121 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createServer = createServer;
+exports.ensureCertificate = ensureCertificate;
+const node_events_1 = require("node:events");
+const bootstrap_js_1 = require("./core/bootstrap.js");
+const certs_js_1 = require("./proxy/certs.js");
+const database_js_1 = require("./storage/database.js");
+const logger_js_1 = require("./utils/logger.js");
+const log = (0, logger_js_1.createLogger)('api');
+// ── Implementation ──
+class BastionServerImpl extends node_events_1.EventEmitter {
+    result;
+    closed = false;
+    constructor(result) {
+        super();
+        this.result = result;
+        this.bridgeEvents(result.eventBus);
+    }
+    get port() {
+        const addr = this.result.server.address();
+        return addr?.port ?? this.result.config.server.port;
+    }
+    get host() {
+        return this.result.config.server.host;
+    }
+    get url() {
+        return `http://${this.host}:${this.port}`;
+    }
+    get caCertPath() {
+        return (0, certs_js_1.getCACertPath)();
+    }
+    get dashboardUrl() {
+        return `${this.url}/dashboard`;
+    }
+    get authToken() {
+        return this.result.authToken;
+    }
+    get config() {
+        return this.result.configManager.get();
+    }
+    get plugins() {
+        return this.result.pluginManager;
+    }
+    get configManager() {
+        return this.result.configManager;
+    }
+    async close() {
+        if (this.closed)
+            return;
+        this.closed = true;
+        log.info('Closing BastionServer');
+        // Stop purge interval
+        if (this.result.purgeInterval) {
+            clearInterval(this.result.purgeInterval);
+        }
+        // Close HTTP server
+        await new Promise((resolve) => {
+            this.result.server.close(() => resolve());
+        });
+        // Run destroy callbacks (external plugins)
+        for (const cb of this.result.destroyCallbacks) {
+            try {
+                await cb();
+            }
+            catch (err) {
+                log.warn('Destroy callback failed', { error: err.message });
+            }
+        }
+        // Clean up event bus
+        this.result.eventBus.removeAllListeners();
+        // Close database
+        (0, database_js_1.closeDatabase)();
+        this.emit('close');
+        this.removeAllListeners();
+        log.info('BastionServer closed');
+    }
+    bridgeEvents(eventBus) {
+        eventBus.on('dlp:finding', (data) => {
+            this.emit('dlp:finding', data);
+        });
+        eventBus.on('toolguard:alert', (data) => {
+            this.emit('toolguard:alert', data);
+        });
+        eventBus.on('request:complete', (data) => {
+            this.emit('request:complete', data);
+        });
+        eventBus.on('request:blocked', (data) => {
+            this.emit('request:blocked', data);
+        });
+    }
+}
+// ── Public API ──
+async function createServer(options) {
+    const result = await (0, bootstrap_js_1.bootstrap)({
+        configPath: options?.configPath,
+        configOverrides: options?.config,
+        silent: options?.silent ?? true,
+        logLevel: options?.logLevel,
+        port: options?.port,
+        host: options?.host,
+        dbPath: options?.dbPath,
+        skipPidFile: options?.skipPidFile ?? true,
+        skipRetention: options?.skipRetention,
+    });
+    const server = new BastionServerImpl(result);
+    log.info('BastionServer created', {
+        port: server.port,
+        host: server.host,
+        url: server.url,
+    });
+    return server;
+}
+async function ensureCertificate() {
+    (0, certs_js_1.ensureCA)();
+    return {
+        certPath: (0, certs_js_1.getCACertPath)(),
+        exists: true,
+    };
+}
+//# sourceMappingURL=api.js.map

package/dist/api.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/openclaw.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openclaw.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/openclaw.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA+dzC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAgsB9D"}
+{"version":3,"file":"openclaw.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/openclaw.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA6hBzC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA41B9D"}

package/dist/cli/commands/openclaw.js

@@ -135,6 +135,57 @@ if (proxyUrl) {
 } else { L('no proxy URL found, skipping'); }
 `;
 // ── shared helpers ───────────────────────────────────────────────────────────
+/**
+ * 3-way merge a fix file into the upstream source using `git merge-file`.
+ * - srcFile:  current upstream file (in the OpenClaw source directory)
+ * - baseFile: the upstream version our fixes were originally based on (.upstream)
+ * - oursFile: our modified version with fixes
+ * Falls back to overwrite if git is unavailable or conflicts are unresolvable.
+ */
+function mergeFixFile(srcFile, baseFile, oursFile, label) {
+    if (!(0, node_fs_1.existsSync)(baseFile)) {
+        // No merge base — just overwrite
+        (0, node_fs_1.copyFileSync)(oursFile, srcFile);
+        console.log(`    Patched ${label} (no merge base, overwrite)`);
+        return;
+    }
+    // Work on a temp copy so merge failures don't corrupt the original
+    const tmpFile = srcFile + '.bastion-merge';
+    (0, node_fs_1.copyFileSync)(srcFile, tmpFile);
+    try {
+        (0, node_child_process_1.execSync)(`git merge-file "${tmpFile}" "${baseFile}" "${oursFile}"`, {
+            stdio: 'pipe',
+        });
+        // Exit 0 — clean merge
+        (0, node_fs_1.copyFileSync)(tmpFile, srcFile);
+        console.log(`    Merged ${label}`);
+    }
+    catch (err) {
+        const exitCode = err.status;
+        if (exitCode !== undefined && exitCode > 0) {
+            // Conflicts exist — check if they contain real conflict markers
+            const merged = (0, node_fs_1.readFileSync)(tmpFile, 'utf-8');
+            if (merged.includes('<<<<<<<')) {
+                console.log(`    WARNING: ${label} merge has conflicts, using our version.`);
+                (0, node_fs_1.copyFileSync)(oursFile, srcFile);
+            }
+            else {
+                // Some changes but no conflict markers — safe to use
+                (0, node_fs_1.copyFileSync)(tmpFile, srcFile);
+                console.log(`    Merged ${label}`);
+            }
+        }
+        else {
+            // git merge-file not available or other error
+            console.log(`    WARNING: git merge-file failed for ${label}, using our version.`);
+            (0, node_fs_1.copyFileSync)(oursFile, srcFile);
+        }
+    }
+    finally {
+        if ((0, node_fs_1.existsSync)(tmpFile))
+            (0, node_fs_1.unlinkSync)(tmpFile);
+    }
+}
 function generateToken() {
     return (0, node_crypto_1.randomBytes)(32).toString('hex');
 }
@@ -185,6 +236,16 @@ function envVal(name, key) {
     const match = content.match(new RegExp(`^${key}=(.*)$`, 'm'));
     return match?.[1] ?? '';
 }
+/** Check if a Docker image has real Homebrew installed (not the brew-shim). */
+function imageHasRealBrew(image) {
+    try {
+        const output = (0, node_child_process_1.execSync)(`docker run --rm --entrypoint sh ${image} -c "test -x /home/linuxbrew/.linuxbrew/bin/brew && echo yes || echo no"`, { stdio: 'pipe', timeout: 15_000 }).toString().trim();
+        return output === 'yes';
+    }
+    catch {
+        return false;
+    }
+}
 function writeEnvFile(dir, vars) {
     const content = Object.entries(vars)
         .map(([k, v]) => `${k}=${v}`)
@@ -241,10 +302,13 @@ function generateComposeFile(image) {
 `;
 }
 /** Bastion proxy overlay — merged via docker compose -f ... -f ... */
-function generateBastionOverride(caPath) {
+function generateBastionOverride(caPath, options) {
+    const brewMount = options?.skipBrewShim ? '' : '\n      - ./brew:/usr/local/bin/brew:ro';
+    // Only run as root when brew-shim is needed (apt-get requires root).
+    // Real Homebrew refuses to run as root, so we must keep the default user (node).
+    const userLine = options?.skipBrewShim ? '' : '\n    user: root';
     return `services:
-  openclaw-gateway:
-    user: root
+  openclaw-gateway:${userLine}
     environment:
       HOME: /home/node
       HTTPS_PROXY: "http://openclaw-gw@host.docker.internal:\${BASTION_PORT:-8420}"
@@ -253,11 +317,9 @@ function generateBastionOverride(caPath) {
       NODE_OPTIONS: "--import /opt/bastion/proxy-bootstrap.mjs"
     volumes:
       - ${caPath}:/etc/ssl/certs/bastion-ca.crt:ro
-      - ./proxy-bootstrap.mjs:/opt/bastion/proxy-bootstrap.mjs:ro
-      - ./brew:/usr/local/bin/brew:ro
+      - ./proxy-bootstrap.mjs:/opt/bastion/proxy-bootstrap.mjs:ro${brewMount}
 
-  openclaw-cli:
-    user: root
+  openclaw-cli:${userLine}
     environment:
       HOME: /home/node
       HTTPS_PROXY: "http://openclaw-cli@host.docker.internal:\${BASTION_PORT:-8420}"
@@ -266,8 +328,7 @@ function generateBastionOverride(caPath) {
       NODE_OPTIONS: "--import /opt/bastion/proxy-bootstrap.mjs"
     volumes:
       - ${caPath}:/etc/ssl/certs/bastion-ca.crt:ro
-      - ./proxy-bootstrap.mjs:/opt/bastion/proxy-bootstrap.mjs:ro
-      - ./brew:/usr/local/bin/brew:ro
+      - ./proxy-bootstrap.mjs:/opt/bastion/proxy-bootstrap.mjs:ro${brewMount}
 `;
 }
 /** Build the list of compose file args for an instance. */
@@ -539,10 +600,17 @@ function registerOpenclawCommand(program) {
         // If instance already exists, update overlay + bootstrap and start
         if ((0, node_fs_1.existsSync)(dir)) {
             console.log(`Instance '${name}' exists, starting...`);
-            // Always update proxy bootstrap + brew shim + Bastion override (idempotent)
+            const instanceImage = envVal(name, 'OPENCLAW_IMAGE') || options.image;
+            const hasRealBrew = imageHasRealBrew(instanceImage);
+            if (hasRealBrew) {
+                console.log('    Image has real Homebrew installed — skipping brew-shim.');
+            }
+            // Always update proxy bootstrap + Bastion override (idempotent)
             (0, node_fs_1.writeFileSync)((0, node_path_1.join)(dir, 'proxy-bootstrap.mjs'), PROXY_BOOTSTRAP_CONTENT, 'utf-8');
-            (0, node_fs_1.writeFileSync)((0, node_path_1.join)(dir, 'brew'), BREW_SHIM_CONTENT, { mode: 0o755 });
-            (0, node_fs_1.writeFileSync)((0, node_path_1.join)(dir, 'docker-compose.bastion.yml'), generateBastionOverride(caPath), 'utf-8');
+            if (!hasRealBrew) {
+                (0, node_fs_1.writeFileSync)((0, node_path_1.join)(dir, 'brew'), BREW_SHIM_CONTENT, { mode: 0o755 });
+            }
+            (0, node_fs_1.writeFileSync)((0, node_path_1.join)(dir, 'docker-compose.bastion.yml'), generateBastionOverride(caPath, { skipBrewShim: hasRealBrew }), 'utf-8');
             // Migrate old-style compose that had Bastion proxy baked in
             const existingCompose = (0, node_fs_1.readFileSync)((0, node_path_1.join)(dir, 'docker-compose.yml'), 'utf-8');
             if (existingCompose.includes('NODE_EXTRA_CA_CERTS')) {
@@ -563,73 +631,80 @@ function registerOpenclawCommand(program) {
             console.log(`Dashboard: http://127.0.0.1:${finalPort}/?token=${finalToken}`);
             return;
         }
-        // Create new instance
+        // Create new instance — delegate to docker-setup.sh for onboarding,
+        // permissions, gateway config, sandbox setup, etc.
         const configDir = options.configDir ?? (0, node_path_1.join)((0, node_os_1.homedir)(), `.openclaw-${name}`);
         const workspaceDir = options.workspace ?? (0, node_path_1.join)((0, node_os_1.homedir)(), `openclaw-${name}`, 'workspace');
         (0, node_fs_1.mkdirSync)(dir, { recursive: true });
-        (0, node_fs_1.mkdirSync)(configDir, { recursive: true });
-        (0, node_fs_1.mkdirSync)(workspaceDir, { recursive: true });
-        (0, node_fs_1.mkdirSync)((0, node_path_1.join)(configDir, 'devices'), { recursive: true });
-        const token = generateToken();
-        writeEnvFile(dir, {
-            OPENCLAW_IMAGE: options.image,
-            OPENCLAW_CONFIG_DIR: configDir,
-            OPENCLAW_WORKSPACE_DIR: workspaceDir,
-            OPENCLAW_GATEWAY_TOKEN: token,
-            OPENCLAW_GATEWAY_PORT: String(port),
-            OPENCLAW_BRIDGE_PORT: String(bridgePort),
-            OPENCLAW_GATEWAY_BIND: 'lan',
-            BASTION_PORT: String(bastionPort),
-            CLAUDE_AI_SESSION_KEY: '',
-            CLAUDE_WEB_SESSION_KEY: '',
-            CLAUDE_WEB_COOKIE: '',
-        });
+        // Generate docker-compose.yml (docker-setup.sh expects it in ROOT_DIR)
         (0, node_fs_1.writeFileSync)((0, node_path_1.join)(dir, 'docker-compose.yml'), generateComposeFile(options.image), 'utf-8');
-        (0, node_fs_1.writeFileSync)((0, node_path_1.join)(dir, 'docker-compose.bastion.yml'), generateBastionOverride(caPath), 'utf-8');
+        // Copy docker-setup.sh from fix-issues
+        const fixesDir = (0, node_path_1.resolve)((0, node_path_1.join)(__dirname, '..', '..', '..', 'integration', 'openclaw-docker', 'fix-issues', 'not-install-brew'));
+        const setupScript = (0, node_path_1.join)(fixesDir, 'docker-setup.sh');
+        if (!(0, node_fs_1.existsSync)(setupScript)) {
+            console.error('docker-setup.sh not found. Bastion installation may be incomplete.');
+            process.exit(1);
+        }
+        (0, node_fs_1.copyFileSync)(setupScript, (0, node_path_1.join)(dir, 'docker-setup.sh'));
+        // Run docker-setup.sh — it handles: .env, permissions, onboarding,
+        // gateway config, controlUi origin, sandbox setup, etc.
+        console.log(`==> Running OpenClaw Docker setup (gateway: ${port}, bridge: ${bridgePort})...`);
+        const setupCode = await new Promise((resolve) => {
+            const child = (0, node_child_process_1.spawn)('bash', [(0, node_path_1.join)(dir, 'docker-setup.sh')], {
+                stdio: 'inherit',
+                env: {
+                    ...process.env,
+                    OPENCLAW_SKIP_BUILD: '1',
+                    OPENCLAW_IMAGE: options.image,
+                    OPENCLAW_CONFIG_DIR: configDir,
+                    OPENCLAW_WORKSPACE_DIR: workspaceDir,
+                    OPENCLAW_GATEWAY_PORT: String(port),
+                    OPENCLAW_BRIDGE_PORT: String(bridgePort),
+                    OPENCLAW_GATEWAY_BIND: 'lan',
+                    // Match project name used by dc() so later commands find the containers
+                    COMPOSE_PROJECT_NAME: `openclaw-${name}`,
+                },
+            });
+            child.on('close', (c) => resolve(c ?? 1));
+            child.on('error', (err) => {
+                console.error(`docker-setup.sh error: ${err.message}`);
+                resolve(1);
+            });
+        });
+        if (setupCode !== 0) {
+            console.error('Docker setup failed.');
+            process.exit(setupCode);
+        }
+        // Append Bastion-specific env vars to .env created by docker-setup.sh
+        const envFile = (0, node_path_1.join)(dir, '.env');
+        let envContent = (0, node_fs_1.existsSync)(envFile) ? (0, node_fs_1.readFileSync)(envFile, 'utf-8') : '';
+        if (!envContent.includes('BASTION_PORT=')) {
+            envContent += `BASTION_PORT=${bastionPort}\n`;
+            (0, node_fs_1.writeFileSync)(envFile, envContent, 'utf-8');
+        }
+        // Add Bastion proxy overlay on top
+        const hasRealBrew = imageHasRealBrew(options.image);
+        if (hasRealBrew) {
+            console.log('    Image has real Homebrew installed — skipping brew-shim.');
+        }
         (0, node_fs_1.writeFileSync)((0, node_path_1.join)(dir, 'proxy-bootstrap.mjs'), PROXY_BOOTSTRAP_CONTENT, 'utf-8');
-        (0, node_fs_1.writeFileSync)((0, node_path_1.join)(dir, 'brew'), BREW_SHIM_CONTENT, { mode: 0o755 });
-        console.log(`==> Instance '${name}' created (gateway: ${port}, bridge: ${bridgePort})`);
-        console.log('==> Initializing gateway config...');
-        let code = await dc(name, ['run', '--rm', 'openclaw-cli', 'config', 'set', 'gateway.mode', 'local']);
-        if (code !== 0) {
-            console.error('Failed to initialize gateway config');
-            process.exit(code);
+        if (!hasRealBrew) {
+            (0, node_fs_1.writeFileSync)((0, node_path_1.join)(dir, 'brew'), BREW_SHIM_CONTENT, { mode: 0o755 });
         }
-        // Patch config before first start (controlUi origin, bind=lan)
-        fixBind(name);
-        console.log('==> Starting gateway...');
-        code = await dc(name, ['up', '-d', 'openclaw-gateway']);
+        (0, node_fs_1.writeFileSync)((0, node_path_1.join)(dir, 'docker-compose.bastion.yml'), generateBastionOverride(caPath, { skipBrewShim: hasRealBrew }), 'utf-8');
+        // Restart gateway with Bastion proxy overlay
+        console.log('==> Restarting gateway with Bastion proxy overlay...');
+        const code = await dc(name, ['up', '-d', '--force-recreate', 'openclaw-gateway']);
         if (code !== 0)
             process.exit(code);
         await sleep(3000);
-        console.log('');
-        console.log('==> Running interactive onboarding...');
-        console.log(`    When prompted for gateway token, use: ${token}`);
-        console.log('');
-        code = await dc(name, ['exec', 'openclaw-gateway', 'node', 'dist/index.js', 'onboard', '--no-install-daemon']);
-        if (code !== 0) {
-            console.error('Onboarding failed');
-            process.exit(code);
-        }
-        console.log('');
-        console.log('==> Applying post-onboard fixes...');
-        syncToken(name);
-        fixBind(name);
-        console.log('==> Restarting gateway...');
-        await dc(name, ['restart', 'openclaw-gateway']);
-        await sleep(3000);
         approveDevices(name);
-        await dc(name, ['restart', 'openclaw-gateway']);
-        await sleep(2000);
         const finalToken = envVal(name, 'OPENCLAW_GATEWAY_TOKEN');
         console.log('');
         console.log(`==> Instance '${name}' is ready!`);
         console.log('');
         console.log(`    Dashboard: http://127.0.0.1:${port}/?token=${finalToken}`);
         console.log('');
-        console.log('    Open the URL above in your browser.');
-        console.log('    If prompted to pair, refresh the page — devices are auto-approved.');
-        console.log('');
     });
     // bastion openclaw docker run
     docker
@@ -1058,5 +1133,135 @@ function registerOpenclawCommand(program) {
             process.exitCode = code ?? 0;
         });
     });
+    // ════════════════════════════════════════════════════════════════════════════
+    // bastion openclaw build ...
+    // ════════════════════════════════════════════════════════════════════════════
+    openclaw
+        .command('build')
+        .description('Build OpenClaw Docker image from source')
+        .option('--tag <tag>', 'Git branch/tag to build', 'main')
+        .option('--brew', 'Install Homebrew (~500MB) for brew-based skills')
+        .option('--browser', 'Install Chromium + Xvfb (~300MB) for browser automation')
+        .option('--docker-cli', 'Install Docker CLI (~50MB) for sandbox container management')
+        .option('--apt-packages <packages>', 'Extra apt packages to install (comma-separated)')
+        .option('--image <name>', 'Docker image name', DEFAULT_IMAGE)
+        .option('--src <path>', 'Path to existing OpenClaw source (skip clone)')
+        .action(async (options) => {
+        checkDocker();
+        const srcDir = options.src ? (0, node_path_1.resolve)(options.src) : (0, node_path_1.join)(OPENCLAW_DIR, 'src');
+        // Clone or update source
+        if (options.src) {
+            if (!(0, node_fs_1.existsSync)(srcDir)) {
+                console.error(`Source directory not found: ${srcDir}`);
+                process.exit(1);
+            }
+            console.log(`==> Using existing source: ${srcDir}`);
+        }
+        else {
+            console.log(`==> Preparing source (branch/tag: ${options.tag})...`);
+            if ((0, node_fs_1.existsSync)(srcDir)) {
+                console.log('    Source directory exists, fetching latest...');
+                (0, node_child_process_1.execSync)(`git -C "${srcDir}" fetch --all --tags`, { stdio: 'inherit' });
+                (0, node_child_process_1.execSync)(`git -C "${srcDir}" checkout "${options.tag}"`, { stdio: 'inherit' });
+                try {
+                    (0, node_child_process_1.execSync)(`git -C "${srcDir}" pull --ff-only`, { stdio: 'pipe' });
+                }
+                catch { /* ignore */ }
+            }
+            else {
+                console.log('    Cloning openclaw repository...');
+                (0, node_fs_1.mkdirSync)((0, node_path_1.join)(OPENCLAW_DIR), { recursive: true });
+                (0, node_child_process_1.execSync)(`git clone --branch "${options.tag}" https://github.com/openclaw/openclaw.git "${srcDir}"`, { stdio: 'inherit' });
+            }
+        }
+        // Apply Bastion fixes — merge into upstream source via 3-way merge
+        const fixesDir = (0, node_path_1.resolve)((0, node_path_1.join)(__dirname, '..', '..', '..', 'integration', 'openclaw-docker', 'fix-issues', 'not-install-brew'));
+        if ((0, node_fs_1.existsSync)(fixesDir)) {
+            console.log('==> Applying Bastion integration fixes...');
+            // Dockerfile: 3-way merge (preserves upstream changes)
+            const upstreamDockerfile = (0, node_path_1.join)(srcDir, 'Dockerfile');
+            const baseDockerfile = (0, node_path_1.join)(fixesDir, 'Dockerfile.upstream');
+            const oursDockerfile = (0, node_path_1.join)(fixesDir, 'Dockerfile');
+            if ((0, node_fs_1.existsSync)(upstreamDockerfile) && (0, node_fs_1.existsSync)(oursDockerfile)) {
+                mergeFixFile(upstreamDockerfile, baseDockerfile, oursDockerfile, 'Dockerfile');
+            }
+            // docker-setup.sh: 3-way merge (preserves upstream changes)
+            const upstreamSetup = (0, node_path_1.join)(srcDir, 'docker-setup.sh');
+            const baseSetup = (0, node_path_1.join)(fixesDir, 'docker-setup.sh.upstream');
+            const oursSetup = (0, node_path_1.join)(fixesDir, 'docker-setup.sh');
+            if ((0, node_fs_1.existsSync)(oursSetup)) {
+                if ((0, node_fs_1.existsSync)(upstreamSetup)) {
+                    mergeFixFile(upstreamSetup, baseSetup, oursSetup, 'docker-setup.sh');
+                }
+                else {
+                    (0, node_fs_1.copyFileSync)(oursSetup, upstreamSetup);
+                    console.log('    Copied docker-setup.sh (upstream has none)');
+                }
+            }
+        }
+        else {
+            console.log('    WARNING: Fix files not found, building with original Dockerfile.');
+        }
+        // Build Docker image
+        console.log(`==> Building Docker image '${options.image}'...`);
+        const buildArgs = ['build'];
+        const extras = [];
+        if (options.brew) {
+            buildArgs.push('--build-arg', 'OPENCLAW_INSTALL_BREW=1');
+            extras.push('Homebrew (~500MB)');
+        }
+        if (options.browser) {
+            buildArgs.push('--build-arg', 'OPENCLAW_INSTALL_BROWSER=1');
+            extras.push('Chromium + Xvfb (~300MB)');
+        }
+        if (options.dockerCli) {
+            buildArgs.push('--build-arg', 'OPENCLAW_INSTALL_DOCKER_CLI=1');
+            extras.push('Docker CLI (~50MB)');
+        }
+        if (options.aptPackages) {
+            buildArgs.push('--build-arg', `OPENCLAW_DOCKER_APT_PACKAGES=${options.aptPackages}`);
+            extras.push(`apt: ${options.aptPackages}`);
+        }
+        if (extras.length > 0) {
+            console.log(`    Optional components: ${extras.join(', ')}`);
+        }
+        // Show hints for unused optional components
+        const hints = [];
+        if (!options.brew) {
+            hints.push('--brew       : Homebrew for brew-based skills (1password-cli, signal-cli, etc.)');
+        }
+        if (!options.browser) {
+            hints.push('--browser    : Chromium for browser automation');
+        }
+        if (!options.dockerCli) {
+            hints.push('--docker-cli : Docker CLI for sandbox container management');
+        }
+        if (hints.length > 0) {
+            console.log('');
+            console.log('    TIP: Optional build flags available:');
+            for (const hint of hints) {
+                console.log(`      ${hint}`);
+            }
+            console.log(`    Example: bastion openclaw build --brew --browser --docker-cli`);
+            console.log('');
+        }
+        buildArgs.push('-t', options.image, '-f', (0, node_path_1.join)(srcDir, 'Dockerfile'), srcDir);
+        const code = await new Promise((resolve) => {
+            const child = (0, node_child_process_1.spawn)('docker', buildArgs, { stdio: 'inherit' });
+            child.on('close', (c) => resolve(c ?? 1));
+            child.on('error', (err) => {
+                console.error(`docker build error: ${err.message}`);
+                resolve(1);
+            });
+        });
+        if (code !== 0) {
+            console.error('Docker build failed.');
+            process.exit(code);
+        }
+        console.log(`==> Build complete: ${options.image}`);
+        if (options.brew) {
+            console.log('    Homebrew installed — brew-shim will NOT be mounted for instances using this image.');
+        }
+    });
 }
 //# sourceMappingURL=openclaw.js.map