peachsim 0.1.1406 → 0.1.1465

package/cli/commands/inspect.ts

@@ -84,7 +84,7 @@ import {
 } from './inspect/resolve-target'
 import { runScreensSubcommand } from './inspect/screens'
 import { runSettleSubcommand } from './inspect/settle'
-import { waitForSootsimIdle } from './inspect/settling'
+import { IdleObservationError, waitForSootsimIdle } from './inspect/settling'
 import {
   callShellCommand,
   callShellCommandWhenReady,
@@ -1369,8 +1369,14 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           `  ⚠ auto-wait timed out after ${elapsed ?? budgetMs}ms (${blockedBy}) — next command may see mid-animation state. use \`peach do settle\` for a longer wait.\n`,
         )
       }
-    } catch {
-      // best-effort — never fail the command because of a post-wait probe.
+    } catch (error) {
+      // the write already landed. an unread idle probe must not fail it or
+      // claim the screen was watched until the budget.
+      if (error instanceof IdleObservationError) {
+        process.stderr.write(
+          `  ⚠ ${error.message}. next command may see mid-animation state. use \`peach do settle\` to retry.\n`,
+        )
+      }
     }
   }
 
@@ -1721,7 +1727,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           break
         }
         if (args.includes('--json')) {
-          console.log(JSON.stringify(nodes, null, 2))
+          printJson(nodes)
         } else {
           console.log(`  accessibility tree (${nodes.length} nodes):\n`)
           for (const n of nodes) {
@@ -1845,19 +1851,15 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         }
         const absolute = Reflect.get(node, 'absolutePosition')
         const size = Reflect.get(node, 'layout')
-        console.log(
-          JSON.stringify(
-            absolute && size
-              ? {
-                  x: Reflect.get(absolute, 'x'),
-                  y: Reflect.get(absolute, 'y'),
-                  width: Reflect.get(size, 'width'),
-                  height: Reflect.get(size, 'height'),
-                }
-              : null,
-            null,
-            2,
-          ),
+        printJson(
+          absolute && size
+            ? {
+                x: Reflect.get(absolute, 'x'),
+                y: Reflect.get(absolute, 'y'),
+                width: Reflect.get(size, 'width'),
+                height: Reflect.get(size, 'height'),
+              }
+            : null,
         )
         break
       }
@@ -1899,7 +1901,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           code: buildSampleColorEval(rect),
         })
         if (args.includes('--json')) {
-          console.log(JSON.stringify(result, null, 2))
+          printJson(result)
         } else {
           const { r, g, b, a, hex, samples } = result as {
             r: number
@@ -1933,19 +1935,15 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             ? null
             : await inspectFind(bridge, { text: matcher })
           const node = byTestId?.result ?? byText?.result ?? null
-          console.log(
-            JSON.stringify(
-              node
-                ? {
-                    matcher,
-                    found: true,
-                    resolvedVia: byTestId?.result ? 'testID' : 'text',
-                    node,
-                  }
-                : { matcher, found: false },
-              null,
-              2,
-            ),
+          printJson(
+            node
+              ? {
+                  matcher,
+                  found: true,
+                  resolvedVia: byTestId?.result ? 'testID' : 'text',
+                  node,
+                }
+              : { matcher, found: false },
           )
           break
         }
@@ -1956,7 +1954,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           type: 'evaluate',
           code: buildGetNodeEval(matcher),
         })
-        console.log(JSON.stringify(result, null, 2))
+        printJson(result)
         break
       }
 
@@ -2013,16 +2011,10 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           if (candidate) {
             await recordInspectAction('inspect tap', candidate.step, candidate.summary)
           }
-          console.log(
-            JSON.stringify(
-              {
-                ...(outcome.attempts > 1 ? { attempts: outcome.attempts } : {}),
-                ...outcome.result,
-              },
-              null,
-              2,
-            ),
-          )
+          printJson({
+            ...(outcome.attempts > 1 ? { attempts: outcome.attempts } : {}),
+            ...outcome.result,
+          })
           break
         }
         if (!Number.isFinite(x) || !Number.isFinite(y)) {
@@ -2036,7 +2028,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
         if (candidate) {
           await recordInspectAction('inspect tap', candidate.step, candidate.summary)
         }
-        console.log(JSON.stringify(result, null, 2))
+        printJson(result)
         break
       }
 
@@ -2087,7 +2079,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             `${subcommand} ${fromX},${fromY} -> ${toX},${toY}`,
           )
         }
-        console.log(JSON.stringify(result, null, 2))
+        printJson(result)
         break
       }
 
@@ -2149,7 +2141,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             `pinch (${fromX1},${fromY1}) (${fromX2},${fromY2}) -> (${toX1},${toY1}) (${toX2},${toY2})`,
           )
         }
-        console.log(JSON.stringify(result, null, 2))
+        printJson(result)
         break
       }
 
@@ -2302,33 +2294,27 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           'text',
         )
         await recordInspectAction('inspect tap-text', candidate.step, candidate.summary)
-        console.log(
-          JSON.stringify(
-            {
-              matched: payload.match,
-              tapped: {
-                nodeId: payload.target?.nodeId ?? null,
-                id: payload.target?.id ?? null,
-                testID: payload.target?.testID ?? null,
-                type: payload.target?.type ?? null,
-                cx: payload.cx,
-                cy: payload.cy,
-              },
-              ...(payload.strategy && payload.strategy !== 'matched-node'
-                ? { strategy: payload.strategy }
-                : {}),
-              // expose the disambiguation outcome so agents can confirm which
-              // of the N matches was tapped, or notice that only one exists.
-              ...(payload.total > 1 || nthIndex !== null
-                ? { nth: { index: payload.idx, total: payload.total } }
-                : {}),
-              ...(outcome.attempts > 1 ? { attempts: outcome.attempts } : {}),
-              result: outcome.result,
-            },
-            null,
-            2,
-          ),
-        )
+        printJson({
+          matched: payload.match,
+          tapped: {
+            nodeId: payload.target?.nodeId ?? null,
+            id: payload.target?.id ?? null,
+            testID: payload.target?.testID ?? null,
+            type: payload.target?.type ?? null,
+            cx: payload.cx,
+            cy: payload.cy,
+          },
+          ...(payload.strategy && payload.strategy !== 'matched-node'
+            ? { strategy: payload.strategy }
+            : {}),
+          // expose the disambiguation outcome so agents can confirm which
+          // of the N matches was tapped, or notice that only one exists.
+          ...(payload.total > 1 || nthIndex !== null
+            ? { nth: { index: payload.idx, total: payload.total } }
+            : {}),
+          ...(outcome.attempts > 1 ? { attempts: outcome.attempts } : {}),
+          result: outcome.result,
+        })
         break
       }
 
@@ -2400,25 +2386,19 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           payload.strategy === 'testid' ? 'id' : 'text',
         )
         await recordInspectAction('inspect tap-best', candidate.step, candidate.summary)
-        console.log(
-          JSON.stringify(
-            {
-              matched: {
-                strategy: payload.strategy,
-                nodeId: node.nodeId,
-                id: node.id,
-                testID: node.testID,
-                type: node.type,
-                text: node.text,
-              },
-              tapped: { cx: payload.cx, cy: payload.cy },
-              ...(outcome.attempts > 1 ? { attempts: outcome.attempts } : {}),
-              result: outcome.result,
-            },
-            null,
-            2,
-          ),
-        )
+        printJson({
+          matched: {
+            strategy: payload.strategy,
+            nodeId: node.nodeId,
+            id: node.id,
+            testID: node.testID,
+            type: node.type,
+            text: node.text,
+          },
+          tapped: { cx: payload.cx, cy: payload.cy },
+          ...(outcome.attempts > 1 ? { attempts: outcome.attempts } : {}),
+          result: outcome.result,
+        })
         break
       }
 
@@ -2577,20 +2557,14 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             ? `type-into #${targetId} ${SECURE_TEXT_REDACTION}`
             : `type-into #${targetId} ${JSON.stringify(text)}`,
         )
-        console.log(
-          JSON.stringify(
-            {
-              target: targetId,
-              isTextInput: tiPayload.isTextInput,
-              secureTextEntry,
-              keyboardOpened: keyboardState.visible ?? tapResult?.keyboardOpened ?? false,
-              focusedInput,
-              typed: outputText,
-            },
-            null,
-            2,
-          ),
-        )
+        printJson({
+          target: targetId,
+          isTextInput: tiPayload.isTextInput,
+          secureTextEntry,
+          keyboardOpened: keyboardState.visible ?? tapResult?.keyboardOpened ?? false,
+          focusedInput,
+          typed: outputText,
+        })
         break
       }
 
@@ -2770,7 +2744,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             `double-tap @${x},${y}`,
           )
         }
-        console.log(JSON.stringify(result, null, 2))
+        printJson(result)
         break
       }
 
@@ -2828,7 +2802,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             `long-press @${x},${y}`,
           )
         }
-        console.log(JSON.stringify(result, null, 2))
+        printJson(result)
         break
       }
 
@@ -2955,13 +2929,12 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             `gesture ${preset}`,
           )
         }
-        console.log(
-          JSON.stringify(
-            { preset, from: { x: fromX, y: fromY }, to: { x: toX, y: toY }, result },
-            null,
-            2,
-          ),
-        )
+        printJson({
+          preset,
+          from: { x: fromX, y: fromY },
+          to: { x: toX, y: toY },
+          result,
+        })
         break
       }
 
@@ -2996,16 +2969,10 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             `scroll #${id} -> ${x},${y}`,
           )
         }
-        console.log(
-          JSON.stringify(
-            {
-              ...result,
-              ...(scrollNode ? { at: { x: scrollNode.cx, y: scrollNode.cy } } : {}),
-            },
-            null,
-            2,
-          ),
-        )
+        printJson({
+          ...result,
+          ...(scrollNode ? { at: { x: scrollNode.cx, y: scrollNode.cy } } : {}),
+        })
         break
       }
 
@@ -3032,7 +2999,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
               if (shell) base.shell = shell
             } catch {}
           }
-          console.log(JSON.stringify(base, null, 2))
+          printJson(base)
           break
         }
         if (!stateCmd || stateCmd === '--help' || stateCmd === '-h') {
@@ -3225,7 +3192,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             console.error(`  unknown state subcommand: ${stateCmd}`)
             peachExit(1)
         }
-        console.log(JSON.stringify(result, null, 2))
+        printJson(result)
         break
       }
 
@@ -3410,7 +3377,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           console.error(`  unknown shell subcommand: ${shellCmd}`)
           peachExit(1)
         }
-        console.log(JSON.stringify({ ok, settled, state }, null, 2))
+        printJson({ ok, settled, state })
         break
       }
 
@@ -3686,7 +3653,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             type: 'evaluate',
             code: `(async () => SootSim.bridges.test.evalInTenant(${JSON.stringify(tenantCode)}))()`,
           })
-          console.log(JSON.stringify(result, null, 2))
+          printJson(result)
           break
         }
         // wrap in async to support await in worker mode. no identifier
@@ -3701,7 +3668,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             : `(async () => ${expandedCode})()`
         }
         const result = await bridge.send({ type: 'evaluate', code: expandedCode })
-        console.log(JSON.stringify(result, null, 2))
+        printJson(result)
 
         // suggest CLI commands for common verbose eval patterns
         const lc = code.toLowerCase()
@@ -4124,7 +4091,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           (await callTestBridge<Array<Record<string, any>>>(bridge, 'listAnimations')) ??
           []
         if (args.includes('--json')) {
-          console.log(JSON.stringify(anims, null, 2))
+          printJson(anims)
           break
         }
         if (anims.length === 0) {
@@ -4171,7 +4138,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           peachExit(1)
         }
         const result = await callTestBridge(bridge, 'getAnimation', id)
-        console.log(JSON.stringify(result, null, 2))
+        printJson(result)
         break
       }
 
@@ -4302,7 +4269,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
             peachExit(1)
           }
           if (jsonOut) {
-            console.log(JSON.stringify(entry, null, 2))
+            printJson(entry)
           } else {
             printNetworkDetail(entry)
           }
@@ -4365,7 +4332,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           const all = await fetchEntries()
           const filtered = applyFilter(all).slice(-limit)
           if (jsonOut) {
-            console.log(JSON.stringify(filtered, null, 2))
+            printJson(filtered)
             break
           }
           if (filtered.length === 0) {
@@ -4506,7 +4473,7 @@ export async function runInspect(args: string[], opts: InspectOptions) {
           const all = await fetchEntries()
           const filtered = applyFilter(all).slice(-limit)
           if (jsonOut) {
-            console.log(JSON.stringify(filtered, null, 2))
+            printJson(filtered)
             break
           }
           if (filtered.length === 0) {

package/cli/commands/setup.ts

@@ -6,7 +6,7 @@ import os from 'node:os'
 import path from 'node:path'
 import { DEFAULT_SOOTSIM_BRIDGE_PORT } from '../../src/bridge-constants'
 import { getCliVersion } from '../../src/cli-version'
-import { desktopHostPlatform } from '../../src/desktop-host-delivery'
+import { desktopHostDelivery, desktopHostPlatform } from '../../src/desktop-host-delivery'
 import {
   readActiveRuntime,
   readPrivacyPreferences,
@@ -129,6 +129,13 @@ export async function runSetup(
         ? await install()
         : await withSpinner(`Preparing runtime ${runtimeVersion}`, install)
       runtimeInstalled = result.installed
+      // headless runs on linux attach the standalone host; fetching it here keeps
+      // the download out of the first `peach open`
+      if (desktopHostPlatform() === 'linux-x64') {
+        const host = () => desktopHostDelivery().install({ quiet: !options.json })
+        if (options.json) await host()
+        else await withSpinner('Preparing the native host', host)
+      }
     }
 
     let serviceInstalled = serviceStatus.installed
@@ -150,6 +157,7 @@ export async function runSetup(
 
     if (
       simulatorDriver !== 'playwright' &&
+      process.platform !== 'darwin' &&
       !options.dryRun &&
       (simulatorDriver === 'desktop' || !findDesktopCompanion({ native: false }))
     ) {
@@ -315,27 +323,29 @@ async function decideService(
 async function decideSimulatorDriver(
   options: SetupOptions,
 ): Promise<SimulatorDriverPreference> {
+  if (process.platform === 'darwin' && !findDesktopCompanion()) {
+    if (options.simulatorDriver && options.simulatorDriver !== 'playwright') {
+      throw new Error('install the Mac app with `peach desktop install --native` first')
+    }
+    return 'playwright'
+  }
   if (options.simulatorDriver) return options.simulatorDriver
   const current = readSimulatorDriverPreference()
   if (current) return current
   if (options.ci || options.yes || options.dryRun) return 'playwright'
   requireInteractive(options, '--desktop or --browser')
   const desktopDescription =
-    desktopHostPlatform() === 'mac-arm64'
-      ? 'Desktop installs the signed native Peach.app.'
-      : process.platform === 'darwin'
-        ? 'Desktop downloads a DMG and installs peach.app.'
-        : process.platform === 'win32'
-          ? 'Desktop downloads and runs the peach installer.'
-          : 'Desktop downloads the matching peach AppImage.'
+    process.platform === 'darwin'
+      ? 'Desktop opens your installed native app.'
+      : process.platform === 'win32'
+        ? 'Desktop downloads and runs the peach installer.'
+        : 'Desktop downloads the matching peach AppImage.'
   const desktopChoice =
-    desktopHostPlatform() === 'mac-arm64'
-      ? 'Desktop app            Installs the signed native host'
-      : process.platform === 'darwin'
-        ? 'Desktop app            Installs peach.app from a DMG'
-        : process.platform === 'win32'
-          ? 'Desktop app            Runs the peach installer'
-          : 'Desktop app            Installs the matching AppImage'
+    process.platform === 'darwin'
+      ? 'Desktop app            Opens your installed native host'
+      : process.platform === 'win32'
+        ? 'Desktop app            Runs the peach installer'
+        : 'Desktop app            Installs the matching AppImage'
   printPromptBlock('Simulator window', [
     'Browser opens immediately in an isolated Chrome window.',
     desktopDescription,
@@ -347,7 +357,7 @@ async function decideSimulatorDriver(
   ])
   return choice === 0
     ? 'playwright'
-    : desktopHostPlatform() === 'mac-arm64'
+    : process.platform === 'darwin'
       ? 'desktop'
       : 'electron'
 }

package/cli/commands/upgrade.ts

@@ -1,6 +1,9 @@
-// peach upgrade updates the separately delivered runtime first, then atomically
-// replaces the standalone cli executable. runtime stays first because replacing
-// the running cli's files before later dynamic imports can strand the command.
+// peach upgrade updates the separately delivered runtime (and on linux the native
+// host headless runs attach) first, then atomically replaces the standalone cli
+// executable. runtime stays first because replacing the running cli's files
+// before later dynamic imports can strand the command.
+// once both are in place, a running background daemon is restarted by the new
+// executable, so nobody has to restart it by hand after upgrading.
 
 import { spawnSync } from 'node:child_process'
 import { createHash } from 'node:crypto'
@@ -8,7 +11,14 @@ import fs from 'node:fs'
 import path from 'node:path'
 import { compareSemver } from '@contrast/runtime-delivery'
 import { getCliVersion } from '../../src/cli-version'
-import { isSootsimDevCheckout, readActiveRuntime, runtimeDir } from '../../src/home-paths'
+import { desktopHostDelivery, desktopHostPlatform } from '../../src/desktop-host-delivery'
+import {
+  isDaemonLockfileFresh,
+  isSootsimDevCheckout,
+  readActiveRuntime,
+  readDaemonLockfile,
+  runtimeDir,
+} from '../../src/home-paths'
 import { resolveRNXAppConfig } from '../app-config'
 import {
   DEFAULT_CLI_RELEASE_ORIGIN,
@@ -17,7 +27,9 @@ import {
 } from '../cli-update'
 import { peachExit } from '../run-rnx'
 import { fetchRuntimeReleaseNotes, formatRuntimeReleaseNotes } from '../runtime-notes'
+import { rnxSelfInvocation } from '../self-invocation'
 import { IS_STANDALONE } from '../standalone'
+import { getDaemonServiceStatus } from './daemon'
 import { runRuntime } from './runtime'
 
 const SHA256_PATTERN = /^[a-f0-9]{64}$/
@@ -88,20 +100,51 @@ export async function runUpgrade(
       ? await fetchRuntimeReleaseNotes(installedRuntime)
       : null
 
+  if (desktopHostPlatform() === 'linux-x64') {
+    // the first headless open would otherwise download the host it attaches
+    console.log('\nnative host:')
+    const host = await desktopHostDelivery().install({ quiet: true })
+    console.log(
+      `  result:  v${host.version} ${host.installed ? 'installed' : 'already current'}`,
+    )
+  }
+
   console.log('\ncli:')
-  await upgradeCli({ ...options, cliVersion })
+  const cliChanged = await upgradeCli({ ...options, cliVersion })
+  if (cliChanged || readActiveRuntime() !== beforeRuntime) restartRunningDaemon()
 
   if (installedRuntime && options.includeReleaseNotes !== false) {
     console.log(`\n${formatRuntimeReleaseNotes(installedRuntime, releaseNotes)}`)
   }
 }
 
-export async function upgradeCli(options: UpgradeOptions = {}): Promise<void> {
+// the daemon process holds the cli code and runtime it started with. the
+// service points at the executable path upgrade just replaced, so restarting
+// it through the new executable is all a running daemon needs.
+function restartRunningDaemon(): void {
+  if (!getDaemonServiceStatus().installed) return
+  if (!isDaemonLockfileFresh(readDaemonLockfile())) return
+  console.log('\ndaemon:')
+  const invocation = rnxSelfInvocation()
+  const result = spawnSync(
+    invocation.executable,
+    [...invocation.prefixArgs, 'daemon', 'restart'],
+    { stdio: 'inherit' },
+  )
+  if (result.status !== 0) {
+    throw new Error(
+      `the background daemon did not restart onto the upgraded peach (exit ${result.status}); check \`peach daemon logs\``,
+    )
+  }
+}
+
+/** returns whether the executable was replaced. */
+export async function upgradeCli(options: UpgradeOptions = {}): Promise<boolean> {
   const standalone = options.standalone ?? IS_STANDALONE
   if (!standalone) {
     if (isSootsimDevCheckout()) {
       console.log('  running from the Contrast checkout; pull instead of upgrading')
-      return
+      return false
     }
     throw new Error(
       'this is not the standalone peach executable; reinstall from https://peachsim.com/install.sh',
@@ -117,11 +160,11 @@ export async function upgradeCli(options: UpgradeOptions = {}): Promise<void> {
     options.cliVersion ?? (await refreshCliUpdateCache({ releaseOrigin })).latestVersion
   if (options.cliVersion === current) {
     console.log(`  v${current} (requested)`)
-    return
+    return false
   }
   if (!options.cliVersion && compareSemver(latest, current) <= 0) {
     console.log(`  v${current} (latest)`)
-    return
+    return false
   }
 
   const artifact = cliArtifactName()
@@ -157,6 +200,7 @@ export async function upgradeCli(options: UpgradeOptions = {}): Promise<void> {
     fs.rmSync(tempDir, { recursive: true, force: true })
   }
   console.log(`  updated to v${latest}`)
+  return true
 }
 
 function cliArtifactName(): string {

package/cli/desktop-companion.ts

@@ -143,7 +143,7 @@ function findWindowsInstall(): DesktopCompanionInstall | null {
 
 export interface DesktopCompanionOptions {
   // the native host: PEACH_DESKTOP_APP, else the active version
-  // `peach desktop install --native` installed under ~/.peach/desktop.
+  // explicit `peach desktop install --native` places the mac app in /Applications.
   native?: boolean
 }