peachsim 0.1.571 → 0.1.573

package/cli/commands/screenshot.ts

@@ -1,4 +1,4 @@
-// rnx screenshot — capture the canvas as a PNG
+// peach screenshot — capture the canvas as a PNG
 //
 // prefers the WS bridge when one is reachable so the screenshot comes from
 // the user's current sim (and can be cropped to a logical
@@ -36,14 +36,14 @@ export async function runScreenshot(rawArgs: string[], opts: ScreenshotOptions)
   const args = normalizeAliasFlags(rawArgs)
   if (args.includes('--help') || args.includes('-h')) {
     console.log(`
-rnx screenshot — capture the canvas as a PNG
+peach screenshot — capture the canvas as a PNG
 
 usage:
-  rnx screenshot [output] [options]
-  rnx screenshot [options] --output <path>
+  peach screenshot [output] [options]
+  peach screenshot [options] --output <path>
 
 options:
-  --output <path>     output file path (default: /tmp/rnx-inspect.png)
+  --output <path>     output file path (default: /tmp/peach-inspect.png)
                       first positional arg works too: \`screenshot /tmp/x.png\`
   --with-frame        wrap the captured screen in a tight device frame
   --no-frame          capture the raw screen bitmap (default)
@@ -53,16 +53,16 @@ options:
   --shell-only        capture only the shell chrome, no tenant content
   --allow-loading     capture after caller-owned readiness checks even when
                       visible app copy matches a generic loading phrase
-  --area x,y,w,h      crop to a logical rnx rect
+  --area x,y,w,h      crop to a logical peach rect
   --id <testID>       crop to a node's bounding box
   --text <text>       crop to a node found by text content
 
 examples:
-  rnx screenshot
-  rnx screenshot --no-shell --output app.png
-  rnx screenshot --with-frame --output framed.png
-  rnx screenshot --area 0,200,393,400 --output hero.png
-  rnx screenshot --id loginButton --output button.png
+  peach screenshot
+  peach screenshot --no-shell --output app.png
+  peach screenshot --with-frame --output framed.png
+  peach screenshot --area 0,200,393,400 --output hero.png
+  peach screenshot --id loginButton --output button.png
 `)
     rnxExit(0)
   }
@@ -76,7 +76,7 @@ examples:
           : `  unknown flag: ${flag}`,
       )
     }
-    console.error('  run `rnx screenshot --help` for the list of supported flags')
+    console.error('  run `peach screenshot --help` for the list of supported flags')
     rnxExit(1)
   }
 
@@ -115,7 +115,7 @@ examples:
       if (typeof dataUrl !== 'string' || !dataUrl.startsWith(pngPrefix)) {
         throw new Error('remote simulator screenshot returned invalid image data')
       }
-      const outputPath = resolve(process.cwd(), outputArg || '/tmp/rnx-inspect.png')
+      const outputPath = resolve(process.cwd(), outputArg || '/tmp/peach-inspect.png')
       mkdirSync(dirname(outputPath), { recursive: true })
       const png = Buffer.from(dataUrl.slice(pngPrefix.length), 'base64')
       if (png.length === 0)
@@ -151,15 +151,15 @@ examples:
   }
 
   if (withFrame) {
-    console.error('  --with-frame requires a running rnx bridge')
+    console.error('  --with-frame requires a running peach bridge')
     console.error('  open the app in a live sim first, then rerun the command')
     rnxExit(1)
   }
 
   if (rect) {
-    console.error('  --area / --id / --text require a running rnx bridge')
+    console.error('  --area / --id / --text require a running peach bridge')
     console.error(
-      '  start one with `rnx serve`, `rnx desktop`, or your project dev server',
+      '  start one with `peach serve`, `peach desktop`, or your project dev server',
     )
     rnxExit(1)
   }
@@ -229,12 +229,12 @@ async function captureViaBridge(
       process.stderr.write(
         '  ⚠ screenshot will capture the LAST PAINTED canvas — likely stale.\n' +
           '  navigation/`shell` commands sent before this screenshot may not\n' +
-          '  have repainted yet. focus the tab manually or `rnx --sim <id>`\n' +
+          '  have repainted yet. focus the tab manually or `peach --sim <id>`\n' +
           '  to target a visible sim before capturing.\n\n',
       )
     }
     // re-assert readiness on THIS bridge connection right before capturing.
-    // the readiness gate (`rnx wait ready`) and this capture run as
+    // the readiness gate (`peach wait ready`) and this capture run as
     // separate CLI processes; between them the engine can re-enter its
     // boot/connect overlay — a late reload fires `sootsim:externalAppReloadStart`
     // and clears `__sootsimExternalAppReady` — so a capture taken now can grab
@@ -298,10 +298,10 @@ async function captureViaBridge(
     const dataUrl: string = await bridge.send(request)
     const pngPrefix = 'data:image/png;base64,'
     // never write a 0-byte "saved" file from an empty or malformed payload —
-    // the sim may be alive but not painting (check `rnx get errors`)
+    // the sim may be alive but not painting (check `peach get errors`)
     if (typeof dataUrl !== 'string' || dataUrl.length <= pngPrefix.length) {
       throw new Error(
-        'screenshot capture returned no image data — the sim is connected but not painting; check `rnx get errors`',
+        'screenshot capture returned no image data — the sim is connected but not painting; check `peach get errors`',
       )
     }
     const base64 = dataUrl.replace(/^data:image\/png;base64,/, '')
@@ -312,7 +312,7 @@ async function captureViaBridge(
     }
     if (layers) console.log(`  layers: ${layers}`)
 
-    const outputPath = resolve(process.cwd(), outputArg || '/tmp/rnx-inspect.png')
+    const outputPath = resolve(process.cwd(), outputArg || '/tmp/peach-inspect.png')
     mkdirSync(dirname(outputPath), { recursive: true })
     const rawBuffer = Buffer.from(base64, 'base64')
     if (withFrame) {
@@ -359,7 +359,7 @@ function resolveLayers(args: string[]): 'full' | 'tenant' | 'shell' | undefined
   return undefined
 }
 
-// known flags for `rnx screenshot`. booleans take no value, value flags
+// known flags for `peach screenshot`. booleans take no value, value flags
 // consume the next arg. kept local so this validation can't drift from the
 // flags the command actually reads.
 const SCREENSHOT_BOOLEAN_FLAGS = new Set([
@@ -445,7 +445,7 @@ function findUnknownFlags(args: string[]): Array<{ flag: string; suggestion?: st
 }
 
 // resolve output path: prefer --output <path>, fall back to the first
-// positional arg so `rnx screenshot /tmp/foo.png` works the way every
+// positional arg so `peach screenshot /tmp/foo.png` works the way every
 // other screenshot tool does.
 function resolveOutputPath(args: string[]): string | undefined {
   const explicit = args.find((_, i) => args[i - 1] === '--output')
@@ -463,7 +463,7 @@ function resolveOutputPath(args: string[]): string | undefined {
 
 // capture a page in headless chromium when no bridge is running.
 async function runPlaywrightScreenshot(args: string[], opts: ScreenshotOptions) {
-  const output = resolveOutputPath(args) || 'rnx-screenshot.png'
+  const output = resolveOutputPath(args) || 'peach-screenshot.png'
   const url =
     args.find((_, i) => args[i - 1] === '--url') ||
     `http://localhost:${opts.port || 5173}`

package/cli/commands/screenshots-capture.ts

@@ -1,13 +1,13 @@
-// rnx screenshot appstore capture — headlessly (re)capture an app's App-Store
+// peach screenshot appstore capture — headlessly (re)capture an app's App-Store
 // slides as EDITABLE 3-layer refs (captureRef + cleanRef + screenRef, plus
 // threeScene for 3d) and let the shell's existing auto-upload push them to the
 // signed-in user's org deck. NOT a reimplementation of capture/upload: it
 // launches a GPU headless Chrome, loads the org-mode build shell, seeds the
-// `rnx login` session into the page so the in-browser auto-upload PUTs
+// `peach login` session into the page so the in-browser auto-upload PUTs
 // authenticate as the user, drives the same `SootSim.bridges.screenshotControl`
 // surface the rail UI uses, then waits for the deck/capture PUTs to flush.
 //
-// auth: `rnx login` (resolveCliAuth → session token). the token is seeded
+// auth: `peach login` (resolveCliAuth → session token). the token is seeded
 // into the shell page's localStorage (`sootsim.session.token`) — the exact key
 // `getSession()` reads, which both the deck PUT (projects-persistence) and the
 // per-ref capture PUT (capture-store) attach as `Authorization: Bearer`.
@@ -28,14 +28,14 @@ import { resolveCliAuth, type CliAuth } from '../auth'
 import { rnxExit } from '../run-rnx'
 
 const HELP = `
-rnx screenshot appstore capture — headlessly capture + upload App Store slides
+peach screenshot appstore capture — headlessly capture + upload App Store slides
 
 usage:
-  rnx screenshot appstore capture --org <org> --repo <repo> [options]
+  peach screenshot appstore capture --org <org> --repo <repo> [options]
 
 what it does:
   boots the org-mode build shell in headless GPU Chrome (authed via your
-  \`rnx login\` session), captures each slide through the live screenshot
+  \`peach login\` session), captures each slide through the live screenshot
   composer so every slide gets editable layers (captureRef + cleanRef +
   screenRef), and lets the shell auto-upload them to your org deck.
 
@@ -54,8 +54,8 @@ options:
   --json               machine-readable summary
 
 examples:
-  rnx screenshot appstore capture --org acme --repo my-app --dry-run
-  rnx screenshot appstore capture --org acme --repo my-app --branch main --force
+  peach screenshot appstore capture --org acme --repo my-app --dry-run
+  peach screenshot appstore capture --org acme --repo my-app --branch main --force
 `
 
 interface CaptureSlide {
@@ -121,13 +121,13 @@ function parseFlags(args: string[]): Flags {
 // the session token + origin power both the page auth seed and the API calls.
 // only a logged-in session works here (the in-browser PUTs read a bearer); an
 // api-key/github CliAuth has no browser session origin, so we direct those to
-// `rnx login` rather than silently failing mid-capture.
+// `peach login` rather than silently failing mid-capture.
 function resolveSessionAuth(): { token: string; origin: string } {
   const auth: CliAuth | null = resolveCliAuth()
   if (auth && auth.kind === 'session') return { token: auth.token, origin: auth.origin }
   process.stderr.write(
-    '\n  rnx screenshot appstore capture needs a logged-in session.\n' +
-      '  run `rnx login` first (the captured slides upload to that account).\n\n',
+    '\n  peach screenshot appstore capture needs a logged-in session.\n' +
+      '  run `peach login` first (the captured slides upload to that account).\n\n',
   )
   rnxExit(1)
 }
@@ -142,7 +142,7 @@ function isLoopback(hostname: string): boolean {
   )
 }
 
-// the build shell (/build/...) is served by the sootsim PAGES site, a DIFFERENT
+// the build shell (/build/...) is served by the peach PAGES site, a DIFFERENT
 // origin from the contrast API/auth origin. derive it from the api origin:
 // loopback dev pairs the 3000(+offset) app with the 5173(+offset) shell (the
 // inverse of engine origin.ts's pairedLocalAppOrigin); prod's contrast.dev is
@@ -417,7 +417,7 @@ export async function runScreenshotsCapture(args: string[]): Promise<number> {
     `${shellOrigin}/build/${encodeURIComponent(flags.org)}/${encodeURIComponent(flags.repo)}/` +
     `${encodeURIComponent(flags.branch)}?platform=${encodeURIComponent(flags.platform)}&ssMode=1`
 
-  const profileDir = mkdtempSync(join(tmpdir(), 'rnx-capture-'))
+  const profileDir = mkdtempSync(join(tmpdir(), 'peach-capture-'))
   const { browser: ctx, reapNow } = await launchReapedChromeScoped(
     (options) => chromium.launchPersistentContext(profileDir, options),
     {

package/cli/commands/screenshots.ts

@@ -13,10 +13,10 @@ export async function runScreenshots(
 ): Promise<number> {
   if (args.includes('--help') || args.includes('-h')) {
     console.log(`
-rnx screenshot appstore — capture and compose app-store screenshot sets
+peach screenshot appstore — capture and compose app-store screenshot sets
 
 usage:
-  rnx screenshot appstore --plan <plan.yaml> [options]
+  peach screenshot appstore --plan <plan.yaml> [options]
 
 options:
   --plan <path>         screenshot plan yaml
@@ -31,9 +31,9 @@ options:
   --compose-only        skip flow capture, reuse existing raw screenshots
 
 examples:
-  rnx screenshot appstore --plan app-store.yaml
-  rnx screenshot appstore --plan app-store.yaml --sim a9
-  rnx screenshot appstore --plan app-store.yaml --org acme --repo mobile
+  peach screenshot appstore --plan app-store.yaml
+  peach screenshot appstore --plan app-store.yaml --sim a9
+  peach screenshot appstore --plan app-store.yaml --org acme --repo mobile
 `)
     return 0
   }
@@ -77,7 +77,7 @@ examples:
     const auth = resolveCliAuth()
     if (!auth) {
       console.error(
-        '  error: --org/--repo needs auth — run `rnx login` or set RNX_API_KEY.',
+        '  error: --org/--repo needs auth — run `peach login` or set PEACH_API_KEY.',
       )
       return 1
     }

package/cli/commands/serve.ts

@@ -1,4 +1,4 @@
-// rnx serve — foreground bridge host
+// peach serve — foreground bridge host
 //
 // hosts the WS bridge + runtime HTTP server on port 7668 (or --port) so
 // CLI commands and electron windows both work against one bridge. sims
@@ -6,7 +6,7 @@
 // them; electron fetches renderer assets over http from the same port.
 //
 // run in the foreground (ctrl-c to stop). the persistent launchd/systemd
-// daemon installation is handled by `rnx daemon install`.
+// daemon installation is handled by `peach daemon install`.
 
 import { DEFAULT_SOOTSIM_BRIDGE_PORT } from '../../src/bridge-constants'
 import {
@@ -25,22 +25,22 @@ interface ServeOptions {
 export async function runServe(args: string[], opts: ServeOptions = {}) {
   if (args.includes('--help') || args.includes('-h')) {
     console.log(`
-rnx serve — run the rnx bridge in the foreground
+peach serve — run the peach bridge in the foreground
 
-hosts the WS bridge that CLI commands talk to. once running, any rnx
+hosts the WS bridge that CLI commands talk to. once running, any peach
 renderer (browser, electron, headless playwright) that connects to port 7668
-becomes drivable from 'rnx describe', 'rnx do tap', etc.
+becomes drivable from 'peach describe', 'peach do tap', etc.
 
 usage:
-  rnx serve [options]
+  peach serve [options]
 
 options:
   --port <n>        bridge port (defaults to ${DEFAULT_SOOTSIM_BRIDGE_PORT})
   --quiet           suppress per-connection logging
 
 examples:
-  rnx serve
-  rnx serve --port 7668 --quiet
+  peach serve
+  peach serve --port 7668 --quiet
 `)
     rnxExit(0)
   }
@@ -56,15 +56,15 @@ examples:
   }
   const quiet = args.includes('--quiet') || args.includes('-q')
 
-  // only one bridge per rnx home. refuse to start a second one
+  // only one bridge per peach home. refuse to start a second one
   // regardless of requested port, since both would try to write the same
   // daemon.json and electron/cli clients only read one lockfile.
   const existingLock = readDaemonLockfile()
   if (existingLock && isDaemonLockfileFresh(existingLock)) {
     console.error(
-      `  an rnx bridge is already running (pid ${existingLock.pid}, port ${existingLock.bridgePort})`,
+      `  a peach bridge is already running (pid ${existingLock.pid}, port ${existingLock.bridgePort})`,
     )
-    console.error(`  stop it with 'rnx daemon stop' first`)
+    console.error(`  stop it with 'peach daemon stop' first`)
     rnxExit(1)
   }
 
@@ -102,7 +102,7 @@ examples:
     for (const id of currentIds) lastSimIds.add(id)
   }, 500)
 
-  log(`rnx bridge listening on ws://localhost:${boundPort} (runtime http on same port)`)
+  log(`peach bridge listening on ws://localhost:${boundPort} (runtime http on same port)`)
   if (boundPort !== port) {
     log(`  (preferred port ${port} was taken — fell back to ${boundPort})`)
   }

package/cli/commands/setup.ts

@@ -1,4 +1,4 @@
-// rnx setup owns the optional machine and repository choices. rnx itself
+// peach setup owns the optional machine and repository choices. peach itself
 // works without project setup; bare first-run onboarding launches ConnectRN
 // during this flow and leaves the repository choice until the end.
 
@@ -91,7 +91,7 @@ export async function runSetup(
       console.log(`  ${muted('Would enable')} ${accent('the background service')}`)
     }
     if (!service && !serviceStatus.installed && !options.json) {
-      console.log(`  ${muted('Enable it later with')} ${accent('rnx daemon install')}`)
+      console.log(`  ${muted('Enable it later with')} ${accent('peach daemon install')}`)
     }
     const simulatorDriver = await decideSimulatorDriver(options)
     if (options.dryRun && !options.json) {
@@ -102,13 +102,13 @@ export async function runSetup(
 
     const manifest = options.json
       ? await rnxRuntime.fetchManifest()
-      : await withSpinner('Checking the rnx runtime', () => rnxRuntime.fetchManifest())
+      : await withSpinner('Checking the peach runtime', () => rnxRuntime.fetchManifest())
     const runtimeVersion = rnxRuntime.resolveVersion(manifest, {
       channel: 'stable',
     }).version
     const cliVersion = getCliVersion()
     if (cliVersion === '0.0.0') {
-      throw new Error('could not resolve the installed rnx CLI version')
+      throw new Error('could not resolve the installed peach CLI version')
     }
 
     let runtimeInstalled = false
@@ -204,7 +204,7 @@ export async function runSetup(
       console.log(
         options.dryRun
           ? `\n  ${success('✓')} Dry run complete.`
-          : `\n  ${success('✓')} ${launchConnectRN ? 'ConnectRN is open. ' : ''}rnx is ready.`,
+          : `\n  ${success('✓')} ${launchConnectRN ? 'ConnectRN is open. ' : ''}peach is ready.`,
       )
     }
 
@@ -280,7 +280,7 @@ async function decideService(
     if (!options.json) {
       printPromptBlock('Background service', [
         'The persistent service is currently available on macOS and Linux.',
-        'rnx will start the bridge when needed on this platform.',
+        'peach will start the bridge when needed on this platform.',
       ])
     }
     return false
@@ -309,22 +309,22 @@ async function decideSimulatorDriver(
   requireInteractive(options, '--desktop or --browser')
   const desktopDescription =
     process.platform === 'darwin'
-      ? 'Desktop downloads a DMG and installs rnx.app.'
+      ? 'Desktop downloads a DMG and installs peach.app.'
       : process.platform === 'win32'
-        ? 'Desktop downloads and runs the rnx installer.'
-        : 'Desktop downloads the matching rnx AppImage.'
+        ? 'Desktop downloads and runs the peach installer.'
+        : 'Desktop downloads the matching peach AppImage.'
   const desktopChoice =
     process.platform === 'darwin'
-      ? 'Desktop app            Installs rnx.app from a DMG'
+      ? 'Desktop app            Installs peach.app from a DMG'
       : process.platform === 'win32'
-        ? 'Desktop app            Runs the rnx installer'
+        ? 'Desktop app            Runs the peach installer'
         : 'Desktop app            Installs the matching AppImage'
   printPromptBlock('Simulator window', [
     'Browser opens immediately in an isolated Chrome window.',
     desktopDescription,
     'The Desktop app opens in a dedicated native window.',
   ])
-  const choice = await select('Where should rnx open?', [
+  const choice = await select('Where should peach open??', [
     'Browser (recommended)  No additional download',
     desktopChoice,
   ])
@@ -343,7 +343,7 @@ async function decidePrivacy(
     'Reports can contain package compatibility or an error class.',
     'They never contain your code or app data.',
   ])
-  return confirm('Share bounded diagnostics to improve rnx?', false)
+  return confirm('Share bounded diagnostics to improve peach??', false)
 }
 
 async function decideRepository(
@@ -359,11 +359,11 @@ async function decideRepository(
   if (plan.operations.length === 0) return true
   if (options.repository !== undefined) return options.repository
   if (options.yes || options.ci || !process.stdin.isTTY) return false
-  printPromptBlock('Share rnx with your team', [
-    'rnx already works here with no project setup.',
-    'This only adds an exact peachsim dev dependency and an rnx script for teammates.',
+  printPromptBlock('Share peach with your team', [
+    'peach already works here with no project setup.',
+    'This only adds an exact peachsim dev dependency and a peach script for teammates.',
   ])
-  return confirm(`Add rnx to ${path.basename(plan.appDir)}?`, false)
+  return confirm(`Add peach to ${path.basename(plan.appDir)}?`, false)
 }
 
 function requireInteractive(options: SetupOptions, flags: string): void {
@@ -376,7 +376,7 @@ function runtimeCacheMetadata(runtimeVersion: string) {
   const arch = os.arch()
   return {
     path: runtimeDir(runtimeVersion),
-    key: `rnx-runtime-${platform}-${arch}-${runtimeVersion}`,
+    key: `peach-runtime-${platform}-${arch}-${runtimeVersion}`,
     inputs: { platform, arch, runtimeVersion },
   }
 }
@@ -388,17 +388,17 @@ function printIntro(options: SetupOptions): void {
 
 function printHelp(): void {
   console.log(`
-rnx setup - configure optional local conveniences
+peach setup - configure optional local conveniences
 
-rnx works without project setup. This command can enable the faster background
+peach works without project setup. This command can enable the faster background
 service, choose Browser or Desktop, configure private diagnostics, and optionally
-add an exact peachsim dependency plus an rnx script for teammates.
+add an exact peachsim dependency plus a peach script for teammates.
 
 usage:
-  rnx setup
-  rnx setup --yes
-  rnx setup --ci --yes --json
-  rnx setup --dry-run
+  peach setup
+  peach setup --yes
+  peach setup --ci --yes --json
+  peach setup --dry-run
 
 choices:
   --service | --no-service

package/cli/commands/skills.ts

@@ -1,9 +1,9 @@
-// rnx skill - install and inspect agent skill files
+// peach skill - install and inspect agent skill files
 //
 // usage:
-//   rnx skill install              install all skills to supported agents
-//   rnx skill install codex debug  install specific skills to Codex only
-//   rnx skill show [name]          list skills or print one skill
+//   peach skill install              install all skills to supported agents
+//   peach skill install codex debug  install specific skills to Codex only
+//   peach skill show [name]          list skills or print one skill
 
 import * as fs from 'fs'
 import * as os from 'os'
@@ -38,14 +38,14 @@ interface InstallTarget {
 }
 
 function printSkillHelp() {
-  console.log(`rnx skill
+  console.log(`peach skill
 
-install and inspect bundled rnx agent skills.
+install and inspect bundled peach agent skills.
 
 usage:
-  rnx skill install [all|codex|claude] [skill-name...]
-  rnx skill install --target <dir> [skill-name...]
-  rnx skill show [skill-name]
+  peach skill install [all|codex|claude] [skill-name...]
+  peach skill install --target <dir> [skill-name...]
+  peach skill show [skill-name]
 
 commands:
   install   install skills; no target means all supported local agents
@@ -59,25 +59,25 @@ targets:
 }
 
 function printInstallHelp() {
-  console.log(`rnx skill install
+  console.log(`peach skill install
 
-install bundled rnx skills in the agent skill layout: <skill>/SKILL.md.
+install bundled peach skills in the agent skill layout: <skill>/SKILL.md.
 each skill directory is symlinked back to its source, so edits stay live
 without a re-install. an existing install from an older CLI is upgraded in
 place; an unrelated skill directory is left alone unless --force is passed.
 
 usage:
-  rnx skill install [all|codex|claude] [skill-name...]
-  rnx skill install --target <dir> [skill-name...]
+  peach skill install [all|codex|claude] [skill-name...]
+  peach skill install --target <dir> [skill-name...]
 
 options:
   --force, -f   replace a conflicting existing skill with the symlink
 
 examples:
-  rnx skill install
-  rnx skill install codex
-  rnx skill install codex rnx-debug
-  rnx skill install --force rnx-debug
+  peach skill install
+  peach skill install codex
+  peach skill install codex peach-debug
+  peach skill install --force peach-debug
 `)
 }
 
@@ -174,9 +174,11 @@ function matchSkills(skills: SkillInfo[], filters: string[]): SkillInfo[] {
   if (filters.length === 0) return skills
   const matched = skills.filter((skill) =>
     filters.some((filter) => {
-      const needle = filter.replace(/^rnx-/, '')
+      // accept the pre-rename rnx- prefix on filter input so installed docs
+      // and muscle memory keep resolving; installed names are peach- only.
+      const needle = filter.replace(/^(peach|rnx)-/, '')
       return (
-        skill.name.includes(filter) || skill.name.replace(/^rnx-/, '').includes(needle)
+        skill.name.includes(filter) || skill.name.replace(/^peach-/, '').includes(needle)
       )
     }),
   )
@@ -216,7 +218,7 @@ function symlinkPointsTo(dest: string, src: string): boolean {
 }
 
 // a store entry left by an older CLI is safe to upgrade: either a real dir
-// whose only content is a SKILL.md symlink into an rnx skills source (the
+// whose only content is a SKILL.md symlink into a peach skills source (the
 // pre-dir-layout install — possibly broken after the source moved), or a dir
 // holding a byte-identical copy of the skill. only our installer creates
 // those shapes, so replacing them can't lose user work.
@@ -305,6 +307,11 @@ const LEGACY_BUNDLED_SKILL_DIRS = [
   'sootsim-perf',
   'sootsim-test',
   'sootsim-visual',
+  'rnx-setup',
+  'rnx-debug',
+  'rnx-perf',
+  'rnx-test',
+  'rnx-visual',
 ]
 
 function removeLegacyBundledSkills(targetDir: string) {
@@ -331,8 +338,8 @@ function printSkillList(skills: SkillInfo[]) {
     console.log(`  ${skill.name}`)
     console.log(`    ${skill.description}\n`)
   }
-  console.log('  usage: rnx skill install [all|codex|claude] [skill-name...]')
-  console.log('  usage: rnx skill show [skill-name]\n')
+  console.log('  usage: peach skill install [all|codex|claude] [skill-name...]')
+  console.log('  usage: peach skill show [skill-name]\n')
 }
 
 function parseInstallArgs(args: string[]): {
@@ -386,7 +393,7 @@ function parseInstallArgs(args: string[]): {
 async function runInstall(args: string[]) {
   const skills = listSkills()
   if (skills.length === 0) {
-    console.error('  no skills found in rnx package')
+    console.error('  no skills found in peach package')
     rnxExit(1)
   }