@fugood/bricks-ctor 2.24.9 → 2.24.10

package/compile/index.ts

@@ -4,7 +4,7 @@ import upperFirst from 'lodash/upperFirst'
 import snakeCase from 'lodash/snakeCase'
 import omit from 'lodash/omit'
 import { parse as parseAST } from 'acorn'
-import type { ExportNamedDeclaration, FunctionDeclaration } from 'acorn'
+import type { BlockStatement, ExportNamedDeclaration, FunctionDeclaration } from 'acorn'
 import escodegen from 'escodegen'
 import { makeSeededId } from '../utils/id'
 import { generateCalulationMap } from './util'
@@ -97,17 +97,28 @@ const compileProperty = (property, errorReference: string, result = {}) => {
 const compileScriptCalculationCode = (code = '') => {
   try {
     const program = parseAST(code, { sourceType: 'module', ecmaVersion: 2020 })
-    // export function main() { ... }
-    const declarationBody = (
-      (program.body[0] as ExportNamedDeclaration).declaration as FunctionDeclaration
-    )?.body
-    return escodegen.generate(declarationBody, {
-      format: {
-        indent: { style: '  ' },
-        semicolons: false,
+    // The stored config holds the bare function body, which codegen re-wraps as
+    // `export function main() { <code> }`. Unwrap it back to that body here.
+    let block = ((program.body[0] as ExportNamedDeclaration).declaration as FunctionDeclaration)
+      ?.body as BlockStatement | undefined
+    if (!block) return code || ''
+    // Earlier versions emitted the whole BlockStatement (braces included), so every
+    // compile -> codegen round-trip nested the body in one more `{ }`. Emit the inner
+    // statements instead, collapsing any wrapper blocks previous round-trips added so
+    // existing over-wrapped sandboxes heal on the next compile.
+    while (block.body.length === 1 && block.body[0].type === 'BlockStatement') {
+      block = block.body[0] as BlockStatement
+    }
+    return escodegen.generate(
+      { type: 'Program', body: block.body },
+      {
+        format: {
+          indent: { style: '  ' },
+          semicolons: false,
+        },
+        comment: true,
       },
-      comment: true,
-    })
+    )
   } catch {
     return code || ''
   }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@fugood/bricks-ctor",
-  "version": "2.24.9",
+  "version": "2.24.10",
   "main": "index.ts",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "build": "bun scripts/build.js"
   },
   "dependencies": {
-    "@fugood/bricks-cli": "^2.24.9",
+    "@fugood/bricks-cli": "^2.24.10",
     "@huggingface/gguf": "^0.3.2",
     "@iarna/toml": "^3.0.0",
     "@modelcontextprotocol/sdk": "^1.15.0",

package/skills/bricks-ctor/references/architecture-patterns.md

@@ -25,6 +25,7 @@ The primary way to orchestrate multi-step flows. A single event can contain an a
 - Use `waitAsync: true` to await async actions before the next step
 - Use `dataParams` + `mapping` to pass event data downstream
 - This is the "glue" that wires generators, state, and UI together
+- For Generator result UI: await Generator, write done/version Data; route/current Data stays identity.
 
 Sequential `PROPERTY_BANK` / `PROPERTY_BANK_EXPRESSION` actions in one chain read the data values that existed when the chain started. If a later action needs to read what an earlier action wrote, set `waitAsync: true` on the earlier action.
 

package/skills/bricks-ctor/references/data-calculation.md

@@ -87,6 +87,17 @@ const triggerCalc: EventAction = {
 - When a **later action reads the calc's outputs**, set `waitAsync: true` on the `PROPERTY_BANK_COMMAND` action itself — it awaits the full calc chain including output writes.
 - A dataParam's `value` acts as an execution gate: `{ input: () => d, value: false }` skips that trigger (combine with `mapping` for conditional runs).
 
+## One trigger source per result panel
+
+A panel that shows the result of an async action (Generator HTTP/LLM response, request telemetry) reads from a calc whose **trigger should come from a single source**: either the live async outlet, or a completion marker the action chain writes — not both.
+
+- **Outlet-triggered** (`{ data: () => dResponse, trigger: true }`): the calc reruns as outlets land. Use when each outlet is only written once its value is final.
+- **Marker-triggered**: run the generator with `waitAsync: true`, then write a `done` Data the calc triggers on. Use when several outlets settle separately and the panel must wait for all of them.
+
+Wiring both at once — triggering on the live outlet _and_ gating on a separately-written marker — lets the calc run before the outlets have settled (it renders `undefined`/stale) while the marker path masks it intermittently. A panel that updates "sometimes" usually has two competing triggers: pick one, and order it with `waitAsync` so the trigger fires after the values it reads are written.
+
+Scope the panel's calc to the **single value it derives** (the formatted display string), and write sibling status labels — running/done, progress, selected route — imperatively in the event chain with `PROPERTY_BANK`. A calc rewrites _every_ one of its outputs on each run, so a return that omits a key writes `undefined` to that output Data (see [Field Rules](#field-rules-defaults-and-constraints)): folding status labels into a multi-output result calc resets them to `undefined` on any run that returns only the derived value. If a calc genuinely must drive several outputs, return all of their keys every run.
+
 ## Script Sandbox
 
 Scripts run in `use strict` mode as a function body — top-level `return` returns the calc result. No `fetch`, `XMLHttpRequest`, or `require` in any mode: I/O belongs to Generators.
@@ -220,6 +231,8 @@ const appendHistory: DataCalculationScript = {
 | `PROPERTY_BANK_COMMAND` does nothing | Auto calc + `trigger: false` input, or `input` doesn't reference an input Data of the calc | Command a `trigger: true` input (auto) or any input (manual) |
 | Compile error `Not allow duplicate set property id...` | Auto mode with same Data as input and output | Use `triggerMode: 'manual'`, or split into separate Data |
 | Calc reads stale value written earlier in the same chain | Missing `waitAsync: true` on the preceding write | Set `waitAsync: true` on the write action |
+| Result/telemetry panel shows `undefined` or stale data intermittently | Calc triggered by two sources at once (live outlet + a separately-written marker) | Trigger from one source — see [One trigger source per result panel](#one-trigger-source-per-result-panel) |
+| Sibling status Data (selected/progress) resets to `undefined` after a calc runs | Multi-output result calc whose return omitted those keys on that run | Scope the calc to one output and write status labels imperatively, or return every output key each run — see [One trigger source per result panel](#one-trigger-source-per-result-panel) |
 | Works in Simulator, fails on device | V8 vs Hermes/JSC engine difference | Verify on device (Path 2); avoid engine-sensitive parsing |
 | `console.log` shows nothing | Console only emits during DevTools debug sessions | Attach DevTools, or write debug values to an output Data |
 | `Promise`/`setTimeout` undefined, or `Async mode is required` error | `enableAsync: false` | Set `enableAsync: true` |

package/tools/pull.ts

@@ -1,6 +1,6 @@
-import { readdir, readFile, unlink, writeFile } from 'node:fs/promises'
+import { mkdir, readdir, readFile, unlink, writeFile } from 'node:fs/promises'
 import { existsSync } from 'node:fs'
-import { join, relative } from 'node:path'
+import { dirname, join, relative } from 'node:path'
 import { format } from 'oxfmt'
 import { sh } from './_shell'
 import { extractCliErrorMessage } from './_cli-error'
@@ -86,7 +86,11 @@ const branchName = isModule
   ? 'BRICKS_PROJECT_try-pull-module'
   : 'BRICKS_PROJECT_try-pull-application'
 
+let landingBranch = ''
 if (isGitRepo && !force) {
+  landingBranch = (await sh`cd ${cwd} && git branch --show-current`.text()).trim()
+  if (!landingBranch) throw new Error('Cannot pull from a detached HEAD')
+
   console.log(`Checking commit ${baseCommitId}...`)
   const found = (await sh`cd ${cwd} && git rev-list -1 ${baseCommitId}`.nothrow().text())
     .trim()
@@ -100,8 +104,8 @@ if (isGitRepo && !force) {
 
   // When the base commit isn't reachable in this clone (server stored a
   // nanoid, or the commit was pruned), fall back to forking from current
-  // HEAD. The downstream merge into main collapses both paths into the
-  // same result, just with different merge bases.
+  // HEAD. The downstream merge into the starting branch collapses both paths
+  // into the same result, just with different merge bases.
   if (found) {
     await sh`cd ${cwd} && git checkout -b ${branchName} ${baseCommitId}`.nothrow()
   } else {
@@ -143,7 +147,9 @@ await Promise.all(
       const result = await format(file.name, file.input, oxfmtConfig)
       content = result.code
     }
-    return writeFile(`${cwd}/${file.name}`, content)
+    const target = join(cwd, file.name)
+    await mkdir(dirname(target), { recursive: true })
+    return writeFile(target, content)
   }),
 )
 
@@ -160,11 +166,11 @@ if (isGitRepo) {
     await sh`cd ${cwd} && git ${commitArgs}`
   }
   if (!force) {
-    // Land the pulled commits on main with a single 3-way merge using
+    // Land the pulled commits on the starting branch with a single 3-way merge using
     // baseCommit as the merge base. The user doesn't have to manage a side
-    // branch, and conflicts (if any) land in the working tree on main where
+    // branch, and conflicts (if any) land in the working tree on the starting branch where
     // auto-compile surfaces them as typecheck errors to resolve in-place.
-    await sh`cd ${cwd} && git checkout main`
+    await sh`cd ${cwd} && git checkout ${landingBranch}`
     const mergeResult = await sh`cd ${cwd} && git merge ${branchName} --no-edit`.nothrow()
     if (mergeResult.exitCode !== 0) {
       // Conflict markers are in the working tree — commit them so the tree
@@ -174,7 +180,7 @@ if (isGitRepo) {
       await sh`cd ${cwd} && git add .`
       const conflictArgs = await buildCommitArgs(
         cwd,
-        ['chore(project): merge with conflicts (resolve in main)'],
+        [`chore(project): merge with conflicts (resolve in ${landingBranch})`],
         ['--no-verify'],
       )
       await sh`cd ${cwd} && git ${conflictArgs}`

package/types/bricks/Sketch.d.ts

@@ -191,9 +191,11 @@ Default property:
     /* A stroke was just committed (drawn or added programmatically) */
     onStrokeEnd?: Array<EventAction<string & keyof TemplateEventPropsMap['Sketch']['onStrokeEnd']>>
     /* The canvas was cleared */
-    onClear?: Array<EventAction>
+    onClear?: Array<EventAction<string & keyof TemplateEventPropsMap['Sketch']['onClear']>>
     /* Sketch state changed (any commit, undo, redo, clear, or import) */
-    onStateChange?: Array<EventAction>
+    onStateChange?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['Sketch']['onStateChange']>
+    >
     /* Active tool changed */
     onToolChange?: Array<
       EventAction<string & keyof TemplateEventPropsMap['Sketch']['onToolChange']>

package/types/generators/Tick.d.ts

@@ -33,7 +33,7 @@ Default property:
   property?: {
     /* Start tick on generator initialized */
     init?: boolean | DataLink
-    /* Interval of second for countdown */
+    /* Tick interval in milliseconds for countdown */
     interval?: number | DataLink
     /* Initial value of countdown */
     countdownStartValue?: number | DataLink

package/utils/data.ts

@@ -85,7 +85,7 @@ type SystemDataName =
 type SystemDataInfo = {
   name: SystemDataName
   id: string
-  type: 'string' | 'number' | 'bool' | 'boolean' | 'array' | 'object' | 'any'
+  type: Data['type']
   title?: string
   description?: string
   schema?: object

package/utils/event-props.ts

@@ -142,7 +142,9 @@ export const templateEventPropsMap = {
     },
   },
   Sketch: {
-    onStrokeEnd: { BRICK_SKETCH_STROKE_COUNT: 'number' },
+    onStrokeEnd: { BRICK_SKETCH_STROKE_COUNT: 'number', BRICK_SKETCH_STATE: '{}' },
+    onClear: { BRICK_SKETCH_STATE: '{}' },
+    onStateChange: { BRICK_SKETCH_STATE: '{}' },
     onToolChange: { BRICK_SKETCH_TOOL: 'string' },
     onExportImage: { BRICK_SKETCH_IMAGE_URI: 'string' },
   },