@fugood/bricks-project 2.22.0-beta.2 → 2.22.0-beta.22

package/compile/action-name-map.ts

@@ -100,6 +100,9 @@ export const templateActionNameMap = {
       payloadType: 'CHANNEL_PUBLISH_PAYLOAD_TYPE',
       payload: 'CHANNEL_PUBLISH_PAYLOAD',
     },
+    DELAY: {
+      time: 'DELAY_TIME',
+    },
     USE_SHARE_APPLICATION: {
       applicationId: 'APPLICATION_ID',
       releaseVersion: 'RELEASE_VERSION',
@@ -126,6 +129,12 @@ export const templateActionNameMap = {
       behavior: 'BEHAVIOR',
       exceptionMessage: 'EXCEPTION_MESSAGE',
     },
+    TRIGGER_APPLICATION_FILTER: {
+      name: 'NAME',
+      variables: 'VARIABLES',
+      result: 'RESULT',
+      error: 'ERROR',
+    },
   },
 
   BRICK_TEXT_INPUT: {
@@ -142,6 +151,13 @@ export const templateActionNameMap = {
     },
   },
 
+  BRICK_VIDEO: {
+    BRICK_VIDEO_SEEK: {
+      seekTime: 'BRICK_VIDEO_SEEK_TIME',
+      play: 'BRICK_VIDEO_PLAY',
+    },
+  },
+
   BRICK_SLIDESHOW: {
     BRICK_SLIDESHOW_JUMP_TO_INDEX: {
       index: 'BRICK_SLIDESHOW_INDEX',
@@ -231,7 +247,12 @@ export const templateActionNameMap = {
       index: 'BRICK_ITEMS_INDEX',
     },
   },
-
+  BRICK_LOTTIE: {
+    BRICK_LOTTIE_PLAY: {
+      startFrame: 'BRICK_LOTTIE_START_FRAME',
+      endFrame: 'BRICK_LOTTIE_END_FRAME',
+    },
+  },
   BRICK_RIVE: {
     BRICK_RIVE_PLAY: {
       animationName: 'BRICK_RIVE_ANIMATION_NAME',
@@ -257,6 +278,10 @@ export const templateActionNameMap = {
     BRICK_WEBVIEW_INJECT_JAVASCRIPT: {
       javascriptCode: 'BRICK_WEBVIEW_JAVASCRIPT_CODE',
     },
+    BRICK_WEBVIEW_QUERY_SELECTOR: {
+      querySelector: 'BRICK_WEBVIEW_QUERY_SELECTOR',
+      expression: 'BRICK_WEBVIEW_EXPRESSION',
+    },
   },
   BRICK_CAMERA: {
     BRICK_CAMERA_TAKE_PICTURE: {
@@ -512,6 +537,36 @@ export const templateActionNameMap = {
       paramsString: 'GENERATOR_SQLITE_PARAMS_STRING',
     },
   },
+
+  GENERATOR_MCP: {
+    GENERATOR_MCP_LIST_RESOURCES: {
+      requestId: 'GENERATOR_MCP_REQUEST_ID',
+    },
+    GENERATOR_MCP_LIST_RESOURCE_TEMPLATES: {
+      requestId: 'GENERATOR_MCP_REQUEST_ID',
+    },
+    GENERATOR_MCP_READ_RESOURCE: {
+      requestId: 'GENERATOR_MCP_REQUEST_ID',
+      uri: 'GENERATOR_MCP_URI',
+      variables: 'GENERATOR_MCP_VARIABLES',
+    },
+    GENERATOR_MCP_LIST_TOOLS: {
+      requestId: 'GENERATOR_MCP_REQUEST_ID',
+    },
+    GENERATOR_MCP_CALL_TOOL: {
+      requestId: 'GENERATOR_MCP_REQUEST_ID',
+      name: 'GENERATOR_MCP_NAME',
+      variables: 'GENERATOR_MCP_VARIABLES',
+    },
+    GENERATOR_MCP_LIST_PROMPTS: {
+      requestId: 'GENERATOR_MCP_REQUEST_ID',
+    },
+    GENERATOR_MCP_GET_PROMPT: {
+      requestId: 'GENERATOR_MCP_REQUEST_ID',
+      name: 'GENERATOR_MCP_NAME',
+      variables: 'GENERATOR_MCP_VARIABLES',
+    },
+  },
   GENERATOR_TTS: {
     GENERATOR_TTS_GENERATE: {
       text: 'GENERATOR_TTS_TEXT',
@@ -521,6 +576,9 @@ export const templateActionNameMap = {
     GENERATOR_ONNX_LLM_INFER: {
       prompt: 'GENERATOR_ONNX_LLM_PROMPT',
       chat: 'GENERATOR_ONNX_LLM_CHAT',
+      images: 'GENERATOR_ONNX_LLM_IMAGES',
+      tools: 'GENERATOR_ONNX_LLM_TOOLS',
+      toolChoice: 'GENERATOR_ONNX_LLM_TOOL_CHOICE',
     },
   },
   GENERATOR_ONNX_STT: {
@@ -558,7 +616,37 @@ export const templateActionNameMap = {
       realtimeVadFreqThold: 'GENERATOR_SPEECH_INFERENCE_REALTIME_VAD_FREQ_THOLD',
     },
   },
+  GENERATOR_VAD_INFERENCE: {
+    GENERATOR_VAD_INFERENCE_DETECT_FILE: {
+      fileUrl: 'GENERATOR_VAD_INFERENCE_FILE_URL',
+      threshold: 'GENERATOR_VAD_INFERENCE_THRESHOLD',
+      minSpeechDurationMs: 'GENERATOR_VAD_INFERENCE_MIN_SPEECH_DURATION_MS',
+      minSilenceDurationMs: 'GENERATOR_VAD_INFERENCE_MIN_SILENCE_DURATION_MS',
+      maxSpeechDurationS: 'GENERATOR_VAD_INFERENCE_MAX_SPEECH_DURATION_S',
+      speechPadMs: 'GENERATOR_VAD_INFERENCE_SPEECH_PAD_MS',
+      samplesOverlap: 'GENERATOR_VAD_INFERENCE_SAMPLES_OVERLAP',
+    },
+    GENERATOR_VAD_INFERENCE_DETECT_DATA: {
+      data: 'GENERATOR_VAD_INFERENCE_DATA',
+      threshold: 'GENERATOR_VAD_INFERENCE_THRESHOLD',
+      minSpeechDurationMs: 'GENERATOR_VAD_INFERENCE_MIN_SPEECH_DURATION_MS',
+      minSilenceDurationMs: 'GENERATOR_VAD_INFERENCE_MIN_SILENCE_DURATION_MS',
+      maxSpeechDurationS: 'GENERATOR_VAD_INFERENCE_MAX_SPEECH_DURATION_S',
+      speechPadMs: 'GENERATOR_VAD_INFERENCE_SPEECH_PAD_MS',
+      samplesOverlap: 'GENERATOR_VAD_INFERENCE_SAMPLES_OVERLAP',
+    },
+  },
+
   GENERATOR_LLM: {
+    GENERATOR_LLM_TOKENIZE: {
+      mode: 'GENERATOR_LLM_MODE',
+      prompt: 'GENERATOR_LLM_PROMPT',
+      promptMediaPaths: 'GENERATOR_LLM_PROMPT_MEDIA_PATHS',
+      messages: 'GENERATOR_LLM_MESSAGES',
+    },
+    GENERATOR_LLM_DETOKENIZE: {
+      tokens: 'GENERATOR_LLM_TOKENS',
+    },
     GENERATOR_LLM_PROCESS_PROMPT: {
       sessionKey: 'GENERATOR_LLM_SESSION_KEY',
       mode: 'GENERATOR_LLM_MODE',
@@ -566,7 +654,9 @@ export const templateActionNameMap = {
       tools: 'GENERATOR_LLM_TOOLS',
       parallelToolCalls: 'GENERATOR_LLM_PARALLEL_TOOL_CALLS',
       toolChoice: 'GENERATOR_LLM_TOOL_CHOICE',
+      enableThinking: 'GENERATOR_LLM_ENABLE_THINKING',
       prompt: 'GENERATOR_LLM_PROMPT',
+      promptMediaPaths: 'GENERATOR_LLM_PROMPT_MEDIA_PATHS',
       promptTemplateData: 'GENERATOR_LLM_PROMPT_TEMPLATE_DATA',
       promptTemplateType: 'GENERATOR_LLM_PROMPT_TEMPLATE_TYPE',
       responseFormat: 'GENERATOR_LLM_RESPONSE_FORMAT',
@@ -578,7 +668,9 @@ export const templateActionNameMap = {
       tools: 'GENERATOR_LLM_TOOLS',
       parallelToolCalls: 'GENERATOR_LLM_PARALLEL_TOOL_CALLS',
       toolChoice: 'GENERATOR_LLM_TOOL_CHOICE',
+      enableThinking: 'GENERATOR_LLM_ENABLE_THINKING',
       prompt: 'GENERATOR_LLM_PROMPT',
+      promptMediaPaths: 'GENERATOR_LLM_PROMPT_MEDIA_PATHS',
       promptTemplateData: 'GENERATOR_LLM_PROMPT_TEMPLATE_DATA',
       promptTemplateType: 'GENERATOR_LLM_PROMPT_TEMPLATE_TYPE',
       responseFormat: 'GENERATOR_LLM_RESPONSE_FORMAT',
@@ -615,6 +707,24 @@ export const templateActionNameMap = {
       sessionCustomKey: 'GENERATOR_LLM_SESSION_CUSTOM_KEY',
     },
   },
+  GENERATOR_GGML_TTS: {
+    GENERATOR_GGML_TTS_GENERATE: {
+      text: 'GENERATOR_GGML_TTS_TEXT',
+    },
+  },
+  GENERATOR_RERANKER: {
+    GENERATOR_RERANKER_RERANK: {
+      query: 'GENERATOR_RERANKER_QUERY',
+      documents: 'GENERATOR_RERANKER_DOCUMENTS',
+    },
+  },
+  GENERATOR_QNN_LLM: {
+    GENERATOR_QNN_LLM_GENERATE: {
+      prompt: 'GENERATOR_QNN_LLM_PROMPT',
+      messages: 'GENERATOR_QNN_LLM_MESSAGES',
+      tools: 'GENERATOR_QNN_LLM_TOOLS',
+    },
+  },
   GENERATOR_OPENAI_LLM: {
     GENERATOR_OPENAI_LLM_COMPLETION: {
       messages: 'GENERATOR_OPENAI_LLM_MESSAGES',
@@ -630,10 +740,16 @@ export const templateActionNameMap = {
       responseFormat: 'GENERATOR_OPENAI_LLM_RESPONSE_FORMAT',
     },
   },
+  GENERATOR_OPENAI_TTS: {
+    GENERATOR_OPENAI_TTS_GENERATE: {
+      text: 'GENERATOR_OPENAI_TTS_TEXT',
+    },
+  },
   GENERATOR_ASSISTANT: {
     GENERATOR_ASSISTANT_ADD_MESSAGE: {
       role: 'GENERATOR_ASSISTANT_ROLE',
       content: 'GENERATOR_ASSISTANT_CONTENT',
+      image: 'GENERATOR_ASSISTANT_IMAGE',
       payload: 'GENERATOR_ASSISTANT_PAYLOAD',
       useFileSearch: 'GENERATOR_ASSISTANT_USE_FILE_SEARCH',
       filePath: 'GENERATOR_ASSISTANT_FILE_PATH',
@@ -643,15 +759,28 @@ export const templateActionNameMap = {
       fileSearchCitationCount: 'GENERATOR_ASSISTANT_FILE_SEARCH_CITATION_COUNT',
       fileSearchInsertMethod: 'GENERATOR_ASSISTANT_FILE_SEARCH_INSERT_METHOD',
     },
+    GENERATOR_ASSISTANT_INIT_MCP_PROMPT: {
+      mcpClientName: 'GENERATOR_ASSISTANT_MCP_CLIENT_NAME',
+      mcpPromptName: 'GENERATOR_ASSISTANT_MCP_PROMPT_NAME',
+      mcpArguments: 'GENERATOR_ASSISTANT_MCP_ARGUMENTS',
+      firstMessageAsSystem: 'GENERATOR_ASSISTANT_FIRST_MESSAGE_AS_SYSTEM',
+    },
+    GENERATOR_ASSISTANT_ADD_MCP_PROMPT_MESSAGE: {
+      mcpClientName: 'GENERATOR_ASSISTANT_MCP_CLIENT_NAME',
+      mcpPromptName: 'GENERATOR_ASSISTANT_MCP_PROMPT_NAME',
+      mcpArguments: 'GENERATOR_ASSISTANT_MCP_ARGUMENTS',
+    },
     GENERATOR_ASSISTANT_UPDATE_MESSAGE_AT_INDEX: {
       index: 'GENERATOR_ASSISTANT_INDEX',
       content: 'GENERATOR_ASSISTANT_CONTENT',
+      image: 'GENERATOR_ASSISTANT_IMAGE',
       payload: 'GENERATOR_ASSISTANT_PAYLOAD',
     },
     GENERATOR_ASSISTANT_ADD_AUDIO_MESSAGE: {
       role: 'GENERATOR_ASSISTANT_ROLE',
       contentFile: 'GENERATOR_ASSISTANT_CONTENT_FILE',
       contentBase64: 'GENERATOR_ASSISTANT_CONTENT_BASE64',
+      image: 'GENERATOR_ASSISTANT_IMAGE',
       useFileSearch: 'GENERATOR_ASSISTANT_USE_FILE_SEARCH',
       payload: 'GENERATOR_ASSISTANT_PAYLOAD',
       filePath: 'GENERATOR_ASSISTANT_FILE_PATH',
@@ -674,11 +803,27 @@ export const templateActionNameMap = {
       index: 'GENERATOR_ASSISTANT_INDEX',
       contentFile: 'GENERATOR_ASSISTANT_CONTENT_FILE',
       contentBase64: 'GENERATOR_ASSISTANT_CONTENT_BASE64',
+      image: 'GENERATOR_ASSISTANT_IMAGE',
       payload: 'GENERATOR_ASSISTANT_PAYLOAD',
     },
     GENERATOR_ASSISTANT_REMOVE_MESSAGE_AT_INDEX: {
       index: 'GENERATOR_ASSISTANT_INDEX',
     },
+    GENERATOR_ASSISTANT_SUBMIT: {
+      continueOnToolCallConfirm: 'GENERATOR_ASSISTANT_CONTINUE_ON_TOOL_CALL_CONFIRM',
+      continueOnToolCallStrategy: 'GENERATOR_ASSISTANT_CONTINUE_ON_TOOL_CALL_STRATEGY',
+      continueOnToolCallLimit: 'GENERATOR_ASSISTANT_CONTINUE_ON_TOOL_CALL_LIMIT',
+    },
+    GENERATOR_ASSISTANT_INSERT_MCP_RESOURCE: {
+      mcpClientName: 'GENERATOR_ASSISTANT_MCP_CLIENT_NAME',
+      mcpResourceUri: 'GENERATOR_ASSISTANT_MCP_RESOURCE_URI',
+      mcpVariables: 'GENERATOR_ASSISTANT_MCP_VARIABLES',
+      role: 'GENERATOR_ASSISTANT_ROLE',
+    },
+    GENERATOR_ASSISTANT_SUMMARY_MESSAGES: {
+      summaryMessages: 'GENERATOR_ASSISTANT_SUMMARY_MESSAGES',
+      summarySessionKey: 'GENERATOR_ASSISTANT_SUMMARY_SESSION_KEY',
+    },
   },
   GENERATOR_VECTOR_STORE: {
     GENERATOR_VECTOR_STORE_RESET: {

package/compile/index.ts

@@ -856,6 +856,7 @@ export const compile = async (app: Application) => {
     fonts: app.fonts,
     ...compileApplicationSettings(app.settings),
     test_map: app.metadata?.TEMP_test_map || {},
+    automation_map: app.metadata?.TEMP_automation_map || {},
   }
   return config
 }

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@fugood/bricks-project",
-  "version": "2.22.0-beta.2",
+  "version": "2.22.0-beta.22",
   "main": "index.ts",
   "scripts": {
     "build": "node scripts/build.js"
   },
   "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.15.0",
     "@types/escodegen": "^0.0.10",
     "@types/lodash": "^4.17.12",
     "acorn": "^8.13.0",
@@ -13,5 +14,5 @@
     "lodash": "^4.17.4",
     "uuid": "^8.3.1"
   },
-  "gitHead": "a230efafdd33bc1dd02ed6397cf5741b318e172f"
+  "gitHead": "f1a67a715ee30aac5067df53b8b640511a81fc83"
 }

package/tools/mcp-server.ts

@@ -0,0 +1,86 @@
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
+import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'
+import { z } from 'zod'
+import { $ } from 'bun'
+
+const server = new McpServer({
+  name: 'bricks-project',
+  version: '1.0.0',
+})
+
+const dirname = import.meta.dirname
+const projectDir = String(dirname).split('/node_modules/')[0]
+
+server.tool('compile', {}, async () => {
+  let log
+  try {
+    log = await $`bun compile`.cwd(projectDir).text()
+  } catch (err) {
+    log = err.stdout.toString() + '\n' + err.stderr.toString()
+  }
+  return {
+    content: [{ type: 'text', text: log || 'Compiled successfully' }],
+  }
+})
+
+// NOTE: Cursor (Or VSCode) seems set ELECTRON_RUN_AS_NODE to 1, so we need to unset it
+process.env.ELECTRON_RUN_AS_NODE = ''
+
+server.tool(
+  'take-preview-screenshot',
+  {
+    delay: z
+      .number()
+      .describe('Delay in milliseconds before taking screenshot')
+      .optional()
+      .default(3000),
+    width: z.number().describe('Width of the screenshot').optional().default(600),
+    height: z.number().optional().default(480),
+    responseImage: z
+      .boolean()
+      .describe(
+        'Whether to response image content (base64 encoded jpeg). If false, only saved path will be responded as text.',
+      )
+      .optional()
+      .default(false),
+  } as any,
+  async ({ delay, width, height, responseImage }: any) => {
+    let log = ''
+    let error = false
+    try {
+      const args = [
+        '--take-screenshot',
+        JSON.stringify({
+          delay,
+          width,
+          height,
+          path: `${dirname}/screenshot.jpg`,
+          closeAfter: true,
+          headless: true,
+        }),
+      ]
+      log = await $`bunx --bun electron ${dirname}/preview-main.mjs ${args}`.cwd(projectDir).text()
+    } catch (err) {
+      log = err.stdout.toString() + '\n' + err.stderr.toString()
+      error = true
+    }
+    let screenshotBase64: any = null
+    if (!error && responseImage) {
+      const screenshot = await Bun.file(`${dirname}/screenshot.jpg`).arrayBuffer()
+      screenshotBase64 = Buffer.from(screenshot).toString('base64')
+    }
+    return {
+      content: [
+        { type: 'text', text: log },
+        screenshotBase64 && {
+          type: 'image',
+          data: screenshotBase64,
+          mimeType: 'image/jpeg',
+        },
+      ].filter(Boolean),
+    }
+  },
+)
+
+const transport = new StdioServerTransport()
+await server.connect(transport)

package/tools/postinstall.ts

@@ -1,12 +1,70 @@
 import { $ } from 'bun'
+import { stat, readFile, writeFile } from 'fs/promises'
 
 const cwd = process.cwd()
 
-const libFiles = ['types', 'utils', 'index.ts']
+async function exists(f: string) {
+  try {
+    await stat(f)
+    return true
+  } catch {
+    return false
+  }
+}
+
+// handle flag --skip-copy
+const skipCopyProject = process.argv.includes('--skip-copy-project')
+if (skipCopyProject) {
+  console.log('Skipping copy of files to project/')
+} else {
+
+  const libFiles = ['types', 'utils', 'index.ts']
+  
+  await $`mkdir -p ${cwd}/project`
+  for (const file of libFiles) {
+    await $`cp -r ${__dirname}/../${file} ${cwd}/project`
+  }
+  console.log('Copied files to project/')
+}
 
-await $`mkdir -p ${cwd}/project`
-for (const file of libFiles) {
-  await $`cp -r ${__dirname}/../${file} ${cwd}/project`
+const projectMcpServer = {
+  command: 'bun',
+  args: [`${cwd}/node_modules/@fugood/bricks-project/tools/mcp-server.ts`],
 }
 
-console.log('Copied files to project/')
+const defaultMcpConfig = {
+  mcpServers: {
+    'bricks-project': projectMcpServer,
+  },
+}
+
+const handleMcpConfigOverride = async (mcpConfigPath: string) => {
+  let mcpConfig: { mcpServers: Record<string, typeof projectMcpServer> } | null = null
+  if (await exists(mcpConfigPath)) {
+    const configStr = await readFile(mcpConfigPath, 'utf-8')
+    try {
+      mcpConfig = JSON.parse(configStr)
+      if (!mcpConfig?.mcpServers) throw new Error('mcpServers is not defined')
+      mcpConfig.mcpServers['bricks-project'] = projectMcpServer
+    } catch (e) {
+      mcpConfig = defaultMcpConfig
+    }
+  } else {
+    mcpConfig = defaultMcpConfig
+  }
+
+  await writeFile(mcpConfigPath, `${JSON.stringify(mcpConfig, null, 2)}\n`)
+
+  console.log(`Updated ${mcpConfigPath}`)
+}
+
+if (await exists(`${cwd}/.cursor/rules/instructions.mdc`)) {
+  const cursorMcpConfigPath = `${cwd}/.cursor/mcp.json`
+  await handleMcpConfigOverride(cursorMcpConfigPath)
+}
+
+if (await exists(`${cwd}/CLAUDE.md`)) {
+  await $`mkdir -p ${cwd}/.cursor`
+  const claudeCodeMcpConfigPath = `${cwd}/.mcp.json`
+  await handleMcpConfigOverride(claudeCodeMcpConfigPath)
+}

package/tools/preview-main.mjs

@@ -20,7 +20,7 @@ let takeScreenshotConfig = null
 try {
   if (values['take-screenshot']) {
     takeScreenshotConfig = JSON.parse(values['take-screenshot'])
-    if (!takeScreenshotConfig.path) takeScreenshotConfig.path = `${cwd}/screenshot.png`
+    if (!takeScreenshotConfig.path) takeScreenshotConfig.path = `${cwd}/screenshot.jpg`
     if (!takeScreenshotConfig.width) takeScreenshotConfig.width = 1280
     if (!takeScreenshotConfig.height) takeScreenshotConfig.height = 768
     if (!takeScreenshotConfig.delay) takeScreenshotConfig.delay = 1000
@@ -46,8 +46,13 @@ if (!previewUrl) throw new Error(`Invalid BRICKS_STAGE: ${stage}`)
 
 app.on('ready', () => {
   let show = true
-  if (takeScreenshotConfig?.headless) show = false
-  const mainWindow = new BrowserWindow({ width: 1280, height: 768, show })
+  if (takeScreenshotConfig && !takeScreenshotConfig.noHeadless) show = false
+  const mainWindow = new BrowserWindow({
+    width: takeScreenshotConfig?.width || 1280,
+    height: takeScreenshotConfig?.height || 768,
+    frame: !takeScreenshotConfig,
+    show,
+  })
   mainWindow.setBackgroundColor('#333')
   mainWindow.loadURL(previewUrl)
 
@@ -56,18 +61,19 @@ app.on('ready', () => {
       type: 'config',
       configFile: { _originTitle: 'Test', ...config, title: Math.random().toString() },
       workspace: { billing: { lock: {}, plan: 'free' } },
+      showMenu: false,
     }
     mainWindow.webContents.executeJavaScript(
       `window.postMessage(JSON.stringify(${JSON.stringify(payload)}))`,
     )
     if (takeScreenshotConfig) {
-      const { delay, width, height, path, closeAfter } = takeScreenshotConfig
+      const { delay, width, height, path, keepOpen = false } = takeScreenshotConfig
       setTimeout(() => {
         console.log('Taking screenshot')
-        mainWindow.webContents.capturePage({ width, height }).then((image) => {
+        mainWindow.webContents.capturePage().then((image) => {
           console.log('Writing screenshot to', path)
-          writeFile(path, image.toPNG())
-          if (closeAfter) {
+          writeFile(path, image.resize({ width, height }).toJPEG(75))
+          if (!keepOpen) {
             console.log('Closing app')
             app.quit()
           }

package/tools/preview.ts

@@ -1,5 +1,6 @@
 import { $ } from 'bun'
 import { watch } from 'fs'
+import type { FSWatcher } from 'fs'
 import { parseArgs } from 'util'
 import { debounce } from 'lodash'
 
@@ -8,55 +9,60 @@ const { values } = parseArgs({
   options: {
     'skip-typecheck': { type: 'boolean' },
     'clear-cache': { type: 'boolean' },
-    'screenshot': { type: 'boolean' },
+    screenshot: { type: 'boolean' },
     'screenshot-delay': { type: 'string' },
     'screenshot-width': { type: 'string' },
     'screenshot-height': { type: 'string' },
     'screenshot-path': { type: 'string' },
-    'screenshot-close-after': { type: 'boolean' },
-    'screenshot-headless': { type: 'boolean' },
+    'screenshot-keep-open': { type: 'boolean' },
+    'screenshot-no-headless': { type: 'boolean' },
   },
   strict: true,
   allowPositionals: true,
 })
 
-const useTypecheck = !values['skip-typecheck']
-
-const compile = async () => {
-  if (useTypecheck) await $`bun typecheck`
-  await $`bun compile`
-}
-
-await compile()
-
-const compileDebounced = debounce(compile, 500)
-
 const cwd = process.cwd()
 
-const watcher = watch(`${cwd}/subspaces`, { recursive: true }, async (event, filename) => {
-  console.log(`Detected ${event} in ${filename}`)
-  compileDebounced()
-})
-
 const app = await Bun.file(`${cwd}/application.json`).json()
 
 let args: string[] = []
 if (values['clear-cache']) args.push('--clear-cache')
 
+let needWatcher = true
 if (values['screenshot']) {
   args.push(`--take-screenshot`)
+  const keepOpen = values['screenshot-keep-open'] ?? false
   args.push(
     JSON.stringify({
       delay: Number(values['screenshot-delay']) || 1000,
-      width: Number(values['screenshot-width']) || 1920,
-      height: Number(values['screenshot-height']) || 1080,
-      path: values['screenshot-path'] || `${cwd}/screenshot.png`,
-      closeAfter: values['screenshot-close-after'] ?? true,
-      headless: values['screenshot-headless'] ?? true,
+      width: Number(values['screenshot-width']) || 600,
+      height: Number(values['screenshot-height']) || 480,
+      path: values['screenshot-path'] || `${cwd}/screenshot.jpg`,
+      keepOpen,
+      noHeadless: values['screenshot-no-headless'] ?? false,
     }),
   )
+  needWatcher = keepOpen
+}
+
+const useTypecheck = !values['skip-typecheck']
+
+const compile = async () => {
+  if (useTypecheck) await $`bun typecheck`
+  await $`bun compile`
+}
+
+await compile()
+
+let watcher: FSWatcher | null = null
+if (needWatcher) {
+  const compileDebounced = debounce(compile, 500)
+  watcher = watch(`${cwd}/subspaces`, { recursive: true }, async (event, filename) => {
+    console.log(`Detected ${event} in ${filename}`)
+    compileDebounced()
+  })
 }
 
 await $`BRICKS_STAGE=${app.stage || 'production'} bunx --bun electron ${__dirname}/preview-main.mjs ${args}`
 
-watcher.close()
+if (watcher) watcher.close()