peachsim 0.1.527 → 0.1.570

package/src/screenshots/frame-compose.ts

@@ -5,12 +5,13 @@ import {
   LEGACY_HOME_BUTTON_SIZE,
   LEGACY_SIDE_BEZEL,
   LEGACY_TOP_BEZEL,
-  HINGE_BARREL_BACKGROUND,
-  HINGE_BARREL_SHADOW,
-  HOUSING_RAIL_COLOR,
-  HOUSING_RAIL_OUTLINE,
   SIDE_BUTTON_RESERVE,
-} from 'sootsim-engine/ios/chrome-metrics'
+} from 'peach-engine/ios/chrome-metrics'
+import {
+  housingLayerHtml,
+  resolveHousingArt,
+  type HousingLayer,
+} from 'peach-engine/ios/duo-housing'
 import {
   cornerRadii,
   formatCornerRadii,
@@ -18,7 +19,7 @@ import {
   resolveDeviceFrameGeometry,
   type CornerRadii,
   type DeviceModel,
-} from 'sootsim-engine/settings'
+} from 'peach-engine/settings'
 import { launchReapedChrome } from '../../../../scripts/lib/reap-browser'
 
 const METALLIC_RING_SHADOW =
@@ -56,8 +57,8 @@ export interface FramedScreenshotLayout {
   logicalScreenTop: number
   logicalScreenRadius: CornerRadii
   logicalFrameRadius: CornerRadii
-  // light rail around a black glass ring; null draws one black body
-  housing: ReturnType<typeof resolveDeviceFrameGeometry>['housing']
+  // folding body art, painted before the screen; null draws one black body
+  housingLayers: HousingLayer[] | null
   frameBackground: string
   frameOutline: string
   metallicRingShadow: string | null
@@ -87,7 +88,9 @@ export function getFramedScreenshotLayout(model: DeviceModel): FramedScreenshotL
   const logicalScreenWidth = spec.width
   const logicalScreenHeight = spec.height
   const modernGeometry = resolveDeviceFrameGeometry(spec)
-  const housing = isLegacyHardware ? null : modernGeometry.housing
+  const housingLayers = isLegacyHardware
+    ? null
+    : resolveHousingArt(spec.posture ?? 'closed', modernGeometry)
   const logicalFrameWidth = isLegacyHardware
     ? spec.width + LEGACY_SIDE_BEZEL * 2
     : modernGeometry.frameWidth
@@ -148,18 +151,20 @@ export function getFramedScreenshotLayout(model: DeviceModel): FramedScreenshotL
     logicalScreenTop,
     logicalScreenRadius: isLegacyHardware ? cornerRadii(0) : modernGeometry.screenRadius,
     logicalFrameRadius,
-    housing,
+    housingLayers,
+    // the housing paints its own body layer, shadow included: its frame box is
+    // wider than the body, because the hinge barrel protrudes past the spine.
     frameBackground: isLegacyHardware
       ? 'linear-gradient(180deg, #1b1c20 0%, #0f1012 42%, #050608 100%)'
-      : housing
-        ? HOUSING_RAIL_COLOR
+      : housingLayers
+        ? 'transparent'
         : '#000000',
     frameOutline: isLegacyHardware
       ? '0 0 0 1px #1f2125'
-      : housing
-        ? HOUSING_RAIL_OUTLINE
+      : housingLayers
+        ? 'none'
         : '0 0 0 1px #333',
-    metallicRingShadow: isLegacyHardware || housing ? null : METALLIC_RING_SHADOW,
+    metallicRingShadow: isLegacyHardware || housingLayers ? null : METALLIC_RING_SHADOW,
     buttons,
     legacyHomeButton: isLegacyHardware
       ? {
@@ -230,46 +235,9 @@ function renderFrameHtml(
     `
     : ''
 
-  // black glass ring inside the rail, then the hinge barrel over the leading
-  // rail. the ring carries no z-index so the screen div after it paints on top.
-  const housingHtml = layout.housing
-    ? `
-      <div
-        aria-hidden="true"
-        style="
-          position:absolute;
-          top:${layout.housing.rail.top}px;
-          right:${layout.housing.rail.right}px;
-          bottom:${layout.housing.rail.bottom}px;
-          left:${layout.housing.rail.left}px;
-          border-radius:${formatCornerRadii(layout.housing.glassRadius)};
-          background:#000000;
-          pointer-events:none;
-        "
-      ></div>
-      ${
-        layout.housing.hingeBarrel
-          ? `
-      <div
-        aria-hidden="true"
-        style="
-          position:absolute;
-          top:${layout.housing.hingeBarrel.endInset}px;
-          bottom:${layout.housing.hingeBarrel.endInset}px;
-          left:0;
-          width:${layout.housing.hingeBarrel.width}px;
-          border-radius:${layout.housing.hingeBarrel.width / 2}px 0 0 ${layout.housing.hingeBarrel.width / 2}px;
-          background:${HINGE_BARREL_BACKGROUND};
-          box-shadow:${HINGE_BARREL_SHADOW};
-          pointer-events:none;
-          z-index:11;
-        "
-      ></div>
-      `
-          : ''
-      }
-    `
-    : ''
+  // the folding body's rail, glass ring, corner art, and hinge barrel. no
+  // z-index, so the screen div after it paints on top.
+  const housingHtml = (layout.housingLayers ?? []).map(housingLayerHtml).join('')
 
   const legacyHomeButtonHtml = layout.legacyHomeButton
     ? `
@@ -390,7 +358,7 @@ function renderFrameHtml(
           left:${layout.logicalFrameLeft}px;
           width:${layout.logicalFrameWidth}px;
           height:${layout.logicalFrameHeight}px;
-            border-radius:${formatCornerRadii(layout.logicalFrameRadius)};
+            border-radius:${layout.housingLayers ? '0' : formatCornerRadii(layout.logicalFrameRadius)};
             box-sizing:border-box;
             overflow:visible;
             background:${layout.frameBackground};

package/src/screenshots/org-deck.ts

@@ -6,7 +6,7 @@
 // colors. 3d scenes don't translate to the cli's 2d composer, so only copy and
 // colors carry over (the 3d hero look stays the in-browser screenshot mode).
 
-import { resolveBgColorValue } from 'sootsim-engine/screenshots/tokens'
+import { resolveBgColorValue } from 'peach-engine/screenshots/tokens'
 import type { BackgroundSpec } from './registry'
 import type { NormalizedScreenshotsPlan } from './schema'
 

package/src/screenshots/registry.ts

@@ -6,7 +6,7 @@
 // this module re-exports those tokens plus the composer-specific
 // `FrameComposeSpec` shape.
 
-import type { DeviceModel } from 'sootsim-engine/settings'
+import type { DeviceModel } from 'peach-engine/settings'
 
 export {
   BACKGROUND_PRESETS,
@@ -19,7 +19,7 @@ export {
   cloneBackgroundSpec,
   resolveBackgroundPreset,
   resolveCanvasPreset,
-} from 'sootsim-engine/screenshots/tokens'
+} from 'peach-engine/screenshots/tokens'
 
 export type {
   BackgroundPresetName,
@@ -30,9 +30,9 @@ export type {
   PosePresetName,
   ScreenshotCanvasName,
   TextPresetName,
-} from 'sootsim-engine/screenshots/tokens'
+} from 'peach-engine/screenshots/tokens'
 
-import type { FrameShadowSpec, PosePresetName } from 'sootsim-engine/screenshots/tokens'
+import type { FrameShadowSpec, PosePresetName } from 'peach-engine/screenshots/tokens'
 
 export interface FrameComposeSpec {
   show: boolean

package/src/screenshots/schema.ts

@@ -1,6 +1,6 @@
 import { readFileSync } from 'fs'
 import path from 'path'
-import { devices, type DeviceModel } from 'sootsim-engine/settings'
+import { devices, type DeviceModel } from 'peach-engine/settings'
 import yaml from 'yaml'
 import {
   cloneBackgroundSpec,

package/src/sdk.ts

@@ -1,9 +1,9 @@
-// rnxsim/sdk — the scriptable sim-driving surface.
+// peachsim/sdk — the scriptable sim-driving surface.
 //
 // exports the SimClient class plus the transport-agnostic inspect verbs it is
 // built from. this entry MUST stay browser-safe (Contrast's in-browser agent
 // imports it against an in-process preview bridge), so the node-only ws
-// `connect()` lives on the ROOT `rnxsim` entry, not here.
+// `connect()` lives on the ROOT `peachsim` entry, not here.
 
 export * from './sim-client'
 export * from '../cli/commands/inspect/core'

package/src/settings-bundle.ts

@@ -1,7 +1,7 @@
 import { readFile, readdir, stat } from 'node:fs/promises'
 import { join } from 'node:path'
 import { parsePlistSource } from './plist.ts'
-import type { AppPreferenceValue, AppSettingsSpecifier } from '@rnx/globals'
+import type { AppPreferenceValue, AppSettingsSpecifier } from '@peach/globals'
 
 const MAX_PLIST_BYTES = 1_048_576
 const MAX_CHILD_DEPTH = 8

package/src/sim-client.ts

@@ -60,6 +60,7 @@ import type {
   SimSemanticResolveSelector,
   SimStateOptions,
   SimStateResult,
+  WsBridgeCommand,
 } from './bridge-contract'
 
 // ---------------------------------------------------------------------------
@@ -250,10 +251,7 @@ export class SimClient implements WsBridge, InspectBridge {
 
   // --- transport (WsBridge/InspectBridge) ---
 
-  send(
-    cmd: { type: string; [k: string]: any },
-    opts?: { timeoutMs?: number },
-  ): Promise<any> {
+  send(cmd: WsBridgeCommand, opts?: { timeoutMs?: number }): Promise<any> {
     if (this.closed) {
       return Promise.reject(new SimConnectError('sim client is closed'))
     }

package/src/skills/builtin/compat-check.ts

@@ -22,7 +22,7 @@ export const skill: RNXSkill = {
         const fs = await import('node:fs')
         const path = await import('node:path')
         const { COMPAT_RESULT_CAVEAT, formatPackageStatus, formatScanCounts, scanDeps } =
-          await import('../../../../compat/src/web.ts')
+          await import('../../../../peach-compat/src/web.ts')
 
         const packagePath = path.join(context.projectDir, 'package.json')
         if (!fs.existsSync(packagePath)) {

package/src/vite-plugin-one.ts

@@ -3,7 +3,7 @@
 // bound to that directory across an active-runtime update.
 //
 // usage in vite.config.ts:
-//   import { rnxPlugin } from 'rnxsim/vite'
+//   import { rnxPlugin } from 'peachsim/vite'
 //   export default { plugins: [one(), rnxPlugin()] }
 
 import fs from 'fs'

package/src/vite-plugin-swift.ts

@@ -20,6 +20,7 @@ import {
   enumerateBundleImages,
   enumerateBundleJson,
 } from '../../sootsim-swift/src/bundleAssets'
+import { swiftEntryModuleEsm } from '../../sootsim-swift/src/entryModule'
 import toolchain from '../../sootsim-swift/toolchain.json'
 import type { Plugin, ViteDevServer } from 'vite'
 
@@ -530,7 +531,9 @@ export function swiftPlugin(options: SwiftPluginOptions = {}): Plugin {
       try {
         const built = buildSwiftResourceTable(project, serverOrigin())
         resources = built.table
-        for (const watched of built.watched) this.addWatchFile(watched)
+        for (const watched of built.watched) {
+          this.addWatchFile(path.join(packagePath, ...watched.split(path.posix.sep)))
+        }
       } catch (error) {
         this.warn(
           `swift resources for ${packagePath}: ${error instanceof Error ? error.message : String(error)}`,
@@ -560,11 +563,13 @@ export function swiftPlugin(options: SwiftPluginOptions = {}): Plugin {
       // whether it is a view or an app root at runtime, so the transform
       // never re-derives the conformance from source. the entry is rooted by
       // its package and source path so a hot reload finds the same instance.
-      return [
-        `import { createSwiftEntry } from 'rnxsim/swift'`,
-        `export default createSwiftEntry({ url: ${JSON.stringify(artifactUrl(project, artifact))}, hash: ${JSON.stringify(artifact.hash)}, rootId: ${JSON.stringify(entryRootId(packagePath, file))}, resources: ${JSON.stringify(resources)}, bundleFiles: ${JSON.stringify(bundleFiles)} })`,
-        '',
-      ].join('\n')
+      return swiftEntryModuleEsm({
+        url: artifactUrl(project, artifact),
+        hash: artifact.hash,
+        rootId: entryRootId(packagePath, file),
+        resources,
+        bundleFiles,
+      })
     },
 
     configureServer(server) {

package/src/vite-plugin.ts

@@ -13,7 +13,7 @@ import { createRequire } from 'module'
 import path from 'path'
 import { fileURLToPath } from 'url'
 import { type Plugin, transformWithOxc } from 'vite'
-import { resolveExportsHiddenSubpath } from '../../compat/src/resolve-hidden-subpath.ts'
+import { resolveExportsHiddenSubpath } from '../../peach-compat/src/resolve-hidden-subpath.ts'
 import {
   SOOTSIM_COMPAT_PUBLISHED_BROWSER_ENTRIES,
   SOOTSIM_COMPAT_WRAPPER_REAL_PACKAGES,
@@ -21,7 +21,7 @@ import {
   SOOTSIM_HAPTIC_FEEDBACK_TOUCHABLE_SPECIFIER,
   compatStubsForBuildResolver,
   reactNativeDeepStubsForBuildResolver,
-} from '../../compat/src/stub-manifest.ts'
+} from '../../peach-compat/src/stub-manifest.ts'
 import { resolveSootsimBridgePort } from './bridge-constants.ts'
 import {
   SHELL_BRIDGE_IDENTITY_PATH,
@@ -50,19 +50,32 @@ const sootsimRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '
 const workspaceRoot = path.resolve(sootsimRoot, '..', '..')
 const workspaceNodeModules = path.resolve(workspaceRoot, 'node_modules')
 const workspaceTamaguiDir = path.resolve(workspaceNodeModules, '@tamagui')
-// stubs and the mutable React bridge live in @sootsim/compat.
-const compatRoot = path.resolve(sootsimRoot, '..', 'compat')
+// stubs and the mutable React bridge live in @peach/compat.
+const compatRoot = path.resolve(sootsimRoot, '..', 'peach-compat')
 
 // the rendering engine and its shims live in the private sootsim-engine
 // workspace package. resolve via workspace root rather than relative hops so
 // renames of either package don't break things.
-const engineRoot = path.resolve(workspaceRoot, 'packages/sootsim-engine')
+const engineRoot = path.resolve(workspaceRoot, 'packages/peach-engine')
 const rnShimPath = path.resolve(engineRoot, 'src/react-native/index.ts')
 const reactBridgePath = path.resolve(
   workspaceRoot,
   'packages/contrast-kit/src/react-bridge.ts',
 )
 const sootsimBrowserSourceAliases = [
+  {
+    find: 'peachsim/backend-origin',
+    replacement: path.resolve(sootsimRoot, 'src/backend-origin.ts'),
+  },
+  {
+    find: 'peachsim/bridge-constants',
+    replacement: path.resolve(sootsimRoot, 'src/bridge-constants.ts'),
+  },
+  {
+    find: 'peachsim/dev-bundle-resolution',
+    replacement: path.resolve(sootsimRoot, 'src/dev-bundle-resolution.ts'),
+  },
+  // old specifiers for user code still on rnxsim; remove with packages/sootsim.
   {
     find: 'rnxsim/backend-origin',
     replacement: path.resolve(sootsimRoot, 'src/backend-origin.ts'),
@@ -475,13 +488,13 @@ function rnghUpstreamInternalResolvePlugin(): Plugin {
 export function recordingPluginWorkerRedirect(): Plugin {
   const workerTarget = path.resolve(
     workspaceRoot,
-    'packages/rnx-plugin-recording/src/worker.ts',
+    'packages/peach-plugin-recording/src/worker.ts',
   )
   return {
     name: 'sootsim-recording-plugin-worker-redirect',
     enforce: 'pre',
     resolveId(source) {
-      if (source === '@rnx/plugin-recording') {
+      if (source === '@peach/plugin-recording') {
         return workerTarget
       }
       return null
@@ -542,7 +555,7 @@ const ENGINE_WORKER_BOOT_CLOSURES: WorkerBootClosure[] = [
   // statically instead of require()ing the whole react-native namespace into
   // the boot file.
   { entry: 'src/render-worker/shell-worker-entry.ts', maxBytes: 3_451_000 },
-  { entry: 'src/render-worker/compositor-worker-entry.ts', maxBytes: 1_080_000 },
+  { entry: 'src/render-worker/compositor-worker-entry.ts', maxBytes: 1_085_000 },
   { entry: 'src/render-worker/compositor-worker-ganesh-entry.ts', maxBytes: 1_820_000 },
 ]
 
@@ -670,7 +683,7 @@ export function keyboardControllerBindingsRedirect(): Plugin {
 //
 // per the project policy of not shimming pure-JS libs, we let upstream resolve
 // from node_modules and redirect ONLY the native seam to our compat stub
-// (one file at packages/compat/src/stubs/react-native-reanimated.ts that
+// (one file at packages/peach-compat/src/stubs/react-native-reanimated.ts that
 // exports the right shape — default = turbomodule, named = platform fns).
 //
 // upstream's `assertWorkletsVersion` (DEV-only) imports a build-time script
@@ -1274,11 +1287,11 @@ function reactBridgePlugin(): Plugin {
         // skip during dep scanning / SSR — only active in browser serve mode
         if ((options as { scan?: boolean })?.scan || options?.ssr) return null
 
-        // only redirect imports from sootsim, sootsim-engine, compat, and react-reconciler
+        // only redirect imports from peachsim, peach-engine, peach-compat, and react-reconciler
         const shouldRedirect =
-          importer.includes('/sootsim/src/') ||
-          importer.includes('/sootsim-engine/src/') ||
-          importer.includes('/compat/src/') ||
+          importer.includes('/peachsim/src/') ||
+          importer.includes('/peach-engine/src/') ||
+          importer.includes('/peach-compat/src/') ||
           importer.includes('/contrast-kit/src/') ||
           importer.includes('react-reconciler')
 
@@ -1326,16 +1339,16 @@ export function workerReactBridgePlugin(): Plugin {
         // stub-registry needs the real React (with __CLIENT_INTERNALS) for bundle stubs
         if (importer.includes('stub-registry')) return null
 
-        // redirect react imports from sootsim, sootsim-engine, compat, react-reconciler,
+        // redirect react imports from peachsim, peach-engine, peach-compat, react-reconciler,
         // and any pure-JS RN-ecosystem package the bundle pulls in. without this
         // redirect, packages like react-native-drawer-layout / use-latest-callback
         // call into a separate React instance than the renderer/bridge does, so
         // their useRef/useEffect refs collide with the engine's hooks state and
         // we hit "Maximum update depth exceeded" infinite-loop renders.
         const shouldRedirect =
-          importer.includes('/sootsim/src/') ||
-          importer.includes('/sootsim-engine/src/') ||
-          importer.includes('/compat/src/') ||
+          importer.includes('/peachsim/src/') ||
+          importer.includes('/peach-engine/src/') ||
+          importer.includes('/peach-compat/src/') ||
           importer.includes('/contrast-kit/src/') ||
           importer.includes('react-reconciler') ||
           importer.includes('/node_modules/')

package/src/worklets-babel.ts

@@ -41,8 +41,8 @@ export const REANIMATED_WORKLETIZATION_REGEX = new RegExp(
 // content-gated so most of node_modules skips for free.
 const REANIMATED_IGNORED_PATHS_REGEX =
   /node_modules\/(react|react-dom|react-native|react-native-web)\//
-const SOOTSIM_ENGINE_SRC_PATH = '/packages/sootsim-engine/src/'
-const SOOTSIM_ENGINE_TEST_FIXTURE_PATH = '/packages/sootsim-engine/src/test-fixtures/'
+const SOOTSIM_ENGINE_SRC_PATH = '/packages/peach-engine/src/'
+const SOOTSIM_ENGINE_TEST_FIXTURE_PATH = '/packages/peach-engine/src/test-fixtures/'
 const REANIMATED_IMPORT_REGEX =
   /(?:from\s+['"]react-native-reanimated(?:\/[^'"]*)?['"]|require\(\s*['"]react-native-reanimated(?:\/[^'"]*)?['"]\s*\))/