refactor: move app code into packages

Author: DjDeveloperr

.github/workflows/ci.yml

@@ -36,19 +36,19 @@ jobs:
           path: |
             ~/.cargo/git
             ~/.cargo/registry
-            server/target
-          key: rust-${{ runner.os }}-${{ hashFiles('server/Cargo.lock', 'server/Cargo.toml', 'server/build.rs', 'server/src/**/*.rs', 'cli/**/*.m') }}
+            packages/server/target
+          key: rust-${{ runner.os }}-${{ hashFiles('packages/server/Cargo.lock', 'packages/server/Cargo.toml', 'packages/server/build.rs', 'packages/server/src/**/*.rs', 'packages/server/native/**/*.m') }}
           restore-keys: |
             rust-${{ runner.os }}-
 
       - name: Check Rust formatting
-        run: cargo fmt --manifest-path server/Cargo.toml --check
+        run: cargo fmt --manifest-path packages/server/Cargo.toml --check
 
       - name: Clippy
-        run: cargo clippy --manifest-path server/Cargo.toml --all-targets -- -D warnings
+        run: cargo clippy --manifest-path packages/server/Cargo.toml --all-targets -- -D warnings
 
       - name: Rust unit tests
-        run: cargo test --manifest-path server/Cargo.toml
+        run: cargo test --manifest-path packages/server/Cargo.toml
 
   client:
     name: Client lint, build, and tests
@@ -63,13 +63,13 @@ jobs:
           cache: npm
           cache-dependency-path: |
             package-lock.json
-            client/package-lock.json
+            packages/client/package-lock.json
 
       - name: Install root dependencies
         run: npm ci --ignore-scripts --force
 
       - name: Install client dependencies
-        run: npm ci --prefix client
+        run: npm ci --prefix packages/client
 
       - name: Check Prettier formatting
         run: npx prettier --check .
@@ -81,13 +81,13 @@ jobs:
         run: npm run test:integration-harness
 
       - name: Typecheck client
-        run: npm run --prefix client typecheck
+        run: npm run --prefix packages/client typecheck
 
       - name: Test client
-        run: npm run --prefix client test
+        run: npm run --prefix packages/client test
 
       - name: Build client
-        run: npm run --prefix client build
+        run: npm run --prefix packages/client build
 
   packages:
     name: Packages and VS Code extension
@@ -135,7 +135,7 @@ jobs:
           cache: npm
           cache-dependency-path: |
             package-lock.json
-            client/package-lock.json
+            packages/client/package-lock.json
 
       - uses: dtolnay/rust-toolchain@stable
 
@@ -148,17 +148,17 @@ jobs:
           path: |
             ~/.cargo/git
             ~/.cargo/registry
-            server/target
+            packages/server/target
             .cache/simdeck/fixture
-          key: rust-${{ runner.os }}-${{ hashFiles('server/Cargo.lock', 'server/Cargo.toml', 'server/build.rs', 'server/src/**/*.rs', 'cli/**/*.m', 'scripts/integration/fixture.mjs') }}
+          key: rust-${{ runner.os }}-${{ hashFiles('packages/server/Cargo.lock', 'packages/server/Cargo.toml', 'packages/server/build.rs', 'packages/server/src/**/*.rs', 'packages/server/native/**/*.m', 'scripts/integration/fixture.mjs') }}
           restore-keys: |
             rust-${{ runner.os }}-
 
       - name: Install root dependencies
         run: npm ci --ignore-scripts
 
       - name: Install client dependencies
-        run: npm ci --prefix client
+        run: npm ci --prefix packages/client
 
       - name: Build CLI, client, and JS test API
         run: |
@@ -176,7 +176,7 @@ jobs:
           path: |
             build/simdeck
             build/simdeck-bin
-            client/dist
+            packages/client/dist
             packages/simdeck-test/dist
             .cache/simdeck/fixture
 

.github/workflows/release.yml

@@ -101,7 +101,7 @@ jobs:
           cache: npm
           cache-dependency-path: |
             package-lock.json
-            client/package-lock.json
+            packages/client/package-lock.json
             packages/react-native-inspector/package-lock.json
             packages/nativescript-inspector/package-lock.json
 
@@ -162,7 +162,7 @@ jobs:
 
       - name: Install client dependencies (root simdeck only)
         if: ${{ steps.meta.outputs.kind == 'npm-cli' }}
-        run: npm ci --prefix client
+        run: npm ci --prefix packages/client
 
       - name: Install package dependencies
         if: ${{ steps.meta.outputs.kind == 'npm' }}

.github/workflows/simdeck-provider.yml

@@ -124,11 +124,11 @@ jobs:
             ./simdeck-src/scripts/build-client.sh
             ./simdeck-src/scripts/build-cli.sh
             mkdir -p build
-            mkdir -p client
+            mkdir -p packages/client
             cp simdeck-src/build/simdeck build/simdeck
             cp simdeck-src/build/simdeck-bin build/simdeck-bin
-            rm -rf client/dist
-            cp -R simdeck-src/client/dist client/dist
+            rm -rf packages/client/dist
+            cp -R simdeck-src/packages/client/dist packages/client/dist
             chmod +x build/simdeck
             chmod +x build/simdeck-bin
           fi
@@ -218,7 +218,7 @@ jobs:
               --port 4310 \
               --bind 127.0.0.1 \
               --access-token "$PROVIDER_TOKEN" \
-              --client-root "$PWD/client/dist" \
+              --client-root "$PWD/packages/client/dist" \
               --video-codec software \
               --stream-quality "${SIMDECK_STREAM_QUALITY:-ci-software}" \
               >> simdeck.log 2>&1 &

.gitignore

@@ -4,8 +4,8 @@
 dist/
 build/
 target/
-server/target/
-client/dist/
+packages/server/target/
+packages/client/dist/
 packages/inspector-agent/.build/
 packages/inspector-agent/.swiftpm/
 packages/nativescript-inspector/build/
@@ -28,7 +28,7 @@ simdeck-snapshot.md
 
 # Package manager installs and caches
 node_modules/
-client/node_modules/
+packages/client/node_modules/
 packages/nativescript-inspector/node_modules/
 packages/react-native-inspector/node_modules/
 

AGENTS.md

@@ -4,8 +4,8 @@ This repository is a local-first simulator control plane. The product goal is a
 
 ## Product Shape
 
-- `cli/` is the native boundary.
-- `client/` is the browser UI.
+- `packages/server/native/` is the native boundary.
+- `packages/client/` is the browser UI.
 - `skills/simdeck/SKILL.md` is the operator guide for using the tool from Codex.
 - `scripts/` holds repeatable build entrypoints.
 - `docs/` is the public VitePress documentation site (deployed to GitHub Pages by `.github/workflows/docs.yml`).
@@ -14,34 +14,34 @@ The native side should own anything that depends on macOS frameworks, `xcrun sim
 
 ## Current Architecture
 
-- `server/src/main.rs`
+- `packages/server/src/main.rs`
   Owns the CLI entrypoint, Rust subcommands, HTTP server, and static asset serving.
-- `server/src/api/routes.rs`
+- `packages/server/src/api/routes.rs`
   Defines REST routes for simulator control, health, metrics, and chrome assets.
-- `server/src/transport/webrtc.rs`
+- `packages/server/src/transport/webrtc.rs`
   Exposes the H.264 WebRTC offer/answer endpoint for browser live video.
-- `server/src/webkit.rs`
+- `packages/server/src/webkit.rs`
   Discovers simulator WebKit Remote Inspector targets and bridges WebInspectorUI
   WebSocket traffic to the simulator `webinspectord` binary-plist socket.
-- `server/src/simulators/registry.rs`
+- `packages/server/src/simulators/registry.rs`
   Tracks Rust-side simulator session state and lazy native attachment by UDID.
-- `cli/XCWSimctl.*`
+- `packages/server/native/XCWSimctl.*`
   Wraps `xcrun simctl` for discovery, lifecycle management, app launching, URL opening, appearance toggles, and simulator log capture.
-- `cli/DFPrivateSimulatorDisplayBridge.*`
+- `packages/server/native/DFPrivateSimulatorDisplayBridge.*`
   Owns headless private display frames plus HID-based touch and keyboard injection.
-- `cli/XCWAccessibilityBridge.*`
+- `packages/server/native/XCWAccessibilityBridge.*`
   Owns private CoreSimulator accessibility snapshots through `AccessibilityPlatformTranslation`.
-- `cli/XCWPrivateSimulatorSession.*`
+- `packages/server/native/XCWPrivateSimulatorSession.*`
   Owns one private display bridge per booted simulator plus selectable hardware/software H.264 encode.
-- `cli/native/XCWNativeBridge.*`
+- `packages/server/native/bridge/XCWNativeBridge.*`
   Narrow C ABI for simulator control, chrome rendering, and native frame callbacks into Rust.
-- `cli/native/XCWNativeSession.*`
+- `packages/server/native/bridge/XCWNativeSession.*`
   Wraps one Objective-C private simulator session handle for the Rust registry.
-- `cli/XCWPrivateSimulatorBooter.*`
+- `packages/server/native/XCWPrivateSimulatorBooter.*`
   Uses private `CoreSimulator` APIs for direct simulator boot without launching Simulator.app.
-- `cli/XCWChromeRenderer.*`
+- `packages/server/native/XCWChromeRenderer.*`
   Renders Apple’s CoreSimulator device-type PDF chrome assets into PNGs for the browser.
-- `client/src/app/App.tsx`
+- `packages/client/src/app/App.tsx`
   Browser entrypoint for the React control surface.
 - `packages/nativescript-inspector/src/index.ts`
   NativeScript in-app inspector runtime that connects to the Rust server over
@@ -58,9 +58,9 @@ The native side should own anything that depends on macOS frameworks, `xcrun sim
 
 ## Working Rules
 
-- Keep simulator-native logic in Objective-C under `cli/`.
-- Keep Rust server logic under `server/`.
-- Keep browser-only presentation logic in `client/`.
+- Keep simulator-native logic in Objective-C under `packages/server/native/`.
+- Keep Rust server logic under `packages/server/`.
+- Keep browser-only presentation logic in `packages/client/`.
 - Keep NativeScript app runtime inspection logic in `packages/nativescript-inspector/`.
 - Keep React Native app runtime inspection logic in `packages/react-native-inspector/`.
 - Keep Flutter app runtime inspection logic in `packages/flutter-inspector/`.
@@ -73,11 +73,11 @@ The native side should own anything that depends on macOS frameworks, `xcrun sim
 
 Private simulator behavior is implemented locally in:
 
-- Boot path: `cli/XCWPrivateSimulatorBooter.*`
-- Full live display bridge: `cli/DFPrivateSimulatorDisplayBridge.*`
-- Accessibility bridge: `cli/XCWAccessibilityBridge.*`
+- Boot path: `packages/server/native/XCWPrivateSimulatorBooter.*`
+- Full live display bridge: `packages/server/native/DFPrivateSimulatorDisplayBridge.*`
+- Accessibility bridge: `packages/server/native/XCWAccessibilityBridge.*`
 
-The current repo uses the private boot path, private display bridge, and private accessibility translation bridge directly. The browser streams frames from that bridge, injects touch and keyboard events through the same native session layer, inspects accessibility through `AccessibilityPlatformTranslation`, and renders device chrome from `cli/XCWChromeRenderer.*`.
+The current repo uses the private boot path, private display bridge, and private accessibility translation bridge directly. The browser streams frames from that bridge, injects touch and keyboard events through the same native session layer, inspects accessibility through `AccessibilityPlatformTranslation`, and renders device chrome from `packages/server/native/XCWChromeRenderer.*`.
 CoreSimulator service contexts resolve the active developer directory from `DEVELOPER_DIR`, then `xcode-select -p`, then `/Applications/Xcode.app/Contents/Developer`. The display bridge prefers direct CoreSimulator screen IOSurface callbacks and activates the SimulatorKit offscreen renderable view only if direct callbacks are unavailable.
 Accessibility recovery may use simulator launchctl UIKit application state plus hit-tested translations to recover candidate foreground pids; the returned tree must still be rooted at tokenized `AXPTranslator` application objects, because `translationApplicationObjectForPid:` can omit the bridge delegate token after private display lifecycle changes. Full-tree snapshots merge those recovered roots with the private frontmost application translation. Shallow snapshots with `maxDepth <= 2` use the tokenized frontmost application translation directly when it is available, and only run the expensive recovery sweep if frontmost lookup fails, so agent-oriented describe loops avoid launchctl and hit-test recovery overhead. Interactive-only snapshots also prune non-actionable native AX leaves during Objective-C serialization before the Rust-side compacting pass; keep this native pruning conservative so selector taps still retain actionable rows plus their ancestors. When multiple candidate application roots are discovered, serialize all of them in preferred order: non-extension app roots first, then largest translated roots, with `.appex`/PlugIns processes de-prioritized so SpringBoard and Safari app roots stay primary while widgets and WebContent roots remain debuggable. Widget renderer extension roots may report local frames; normalize those roots and children against matching SpringBoard widget placeholder frames before returning the snapshot.
 Physical chrome button support uses DeviceKit `chrome.json` input geometry for browser hit targets. Volume, action, mute, Apple Watch digital crown, Watch side button, and Watch left-side button dispatch through `IndigoHIDMessageForHIDArbitrary` with consumer/telephony/vendor HID usage pairs from the device chrome metadata; home, lock, and app-switcher remain on the existing SimulatorKit button paths. Apple Watch Digital Crown rotation dispatches through `IndigoHIDMessageForDigitalCrownEvent` when SimulatorKit exposes it, with `IndigoHIDMessageForScrollEvent(..., target=0x34)` as the fallback. tvOS simulators do not support direct screen touch; browser/API tap maps to Enter, swipe maps to arrow keys, and the native bridge rejects tvOS touch packets before they reach guest `SimulatorHID`. watchOS/tvOS skip dynamic pointer/mouse service warm-up because those guest runtimes abort on unsupported virtual services. Apple TV and Apple Watch simulators are fixed-orientation devices, so client and server rotation paths must not expose or dispatch device rotation for those families.
@@ -101,16 +101,17 @@ npm run build:all
 npm run package:vscode
 ```
 
-This now builds the Rust server in `server/` and copies the resulting binary to `build/simdeck`.
+This now builds the Rust server in `packages/server/` and copies the resulting binary to `build/simdeck`.
 
 Codex worktrees can use the checked-in local environment config at
 `.codex/local-environment.toml`. Its setup runs `npm run codex:setup`, which
-hydrates root/client `node_modules` and `server/target` from the shared cache
-under `~/.cache/simdeck/codex-worktree-cache` or from another SimDeck checkout
-before falling back to `npm ci` for missing package installs and ensuring
-Homebrew `pkgconf`/`x264` are available for native builds. Its Run action
-executes `npm run codex:run`, which builds the CLI and client, saves fresh
-caches, and restarts the workspace-local daemon.
+hydrates root and `packages/client` `node_modules` plus
+`packages/server/target` from the shared cache under
+`~/.cache/simdeck/codex-worktree-cache` or from another SimDeck checkout before
+falling back to `npm ci` for missing package installs and ensuring Homebrew
+`pkgconf`/`x264` are available for native builds. Its Run action executes
+`npm run codex:run`, which builds the CLI and client, saves fresh caches, and
+restarts the workspace-local daemon.
 
 Run the local daemon:
 
@@ -182,9 +183,3 @@ only booted simulator, in that order. For agent navigation, prefer
 - If you expand the private framework bridge, document the Xcode/runtime assumptions here.
 - If a feature depends on a booted simulator, fail with a clear JSON error instead of silently returning an empty asset.
 - Do not reintroduce legacy `/stream.h264` handling. The supported live path is the Rust-managed WebRTC H.264 offer endpoint.
-
-## Near-Term Roadmap
-
-- Compose the private frame stream and CoreSimulator chrome into a single server-side render path.
-- Keep private Indigo multi-touch packet assumptions documented when Xcode runtimes change.
-- Add simulator creation and log streaming commands.

CONTRIBUTING.md

@@ -36,19 +36,19 @@ Granular targets:
 
 ```sh
 npm run build:cli                    # Rust server -> build/simdeck-bin
-npm run build:client                 # browser bundle -> client/dist
+npm run build:client                 # browser bundle -> packages/client/dist
 npm run build:inspectors             # nativescript + react-native inspectors
 npm run build:simdeck-test           # simdeck/test subpath export
 npm run build:vscode-extension       # alias for package:vscode-extension
 ```
 
-`scripts/build-cli.sh` builds the Rust server in `server/` and copies the
+`scripts/build-cli.sh` builds the Rust server in `packages/server/` and copies the
 resulting binary to `build/simdeck-bin`. The default is a host-arch build for
 fast iteration. Set `SIMDECK_BUILD_TARGET=<rust-target-triple>` to pin the
 output to an explicit Rust target — the release workflow uses
 `SIMDECK_BUILD_TARGET=aarch64-apple-darwin` for deterministic arm64 builds.
 
-SimDeck is **arm64-only** by design: `cli/*.m` contains AArch64 inline asm
+SimDeck is **arm64-only** by design: `packages/server/native/*.m` contains AArch64 inline asm
 that does not compile on x86_64, and the npm package is gated by
 `"cpu": ["arm64"]` so installs on Intel Macs fail fast.
 
@@ -133,7 +133,7 @@ npm run docs:preview
 Install the agent skill from a source checkout with [skills.sh](https://skills.sh/):
 
 ```sh
-npx skills add NativeScript/SimDeck --skill simdeck -a codex -g
+npx skills add NativeScript/SimDeck --skill simdeck -g
 ```
 
 The npm postinstall message also prints this command after a global install.
@@ -148,8 +148,8 @@ SimDeck. The setup script runs:
 npm run codex:setup
 ```
 
-That hydrates the root `node_modules`, `client/node_modules`, and
-`server/target` from `~/.cache/simdeck/codex-worktree-cache` or a matching
+That hydrates the root `node_modules`, `packages/client/node_modules`, and
+`packages/server/target` from `~/.cache/simdeck/codex-worktree-cache` or a matching
 existing SimDeck checkout. If either `node_modules` directory is still missing,
 it falls back to `npm ci` for that package so lockfiles stay unchanged. On
 macOS it also ensures the Homebrew `pkgconf` and `x264` packages are available

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img width="180" src="./client/public/simdeck.png">
+  <img width="180" src="./packages/client/public/simdeck.png">
 
   <h1 align="center">SimDeck</h1>
 

actions/run-android-comment-session/action.yml

@@ -263,8 +263,12 @@ runs:
           version="$(SIMDECK_METADATA="${metadata}" python3 -c 'import json, os; print(json.loads(os.environ["SIMDECK_METADATA"])["version"])')"
           rm -rf "${simdeck_dir:?}/"*
           curl -fsSL "${tarball}" | tar -xz -C "${simdeck_dir}" --strip-components=1
-          chmod +x "${simdeck_dir}/bin/simdeck.mjs" "${simdeck_dir}/build/simdeck-bin"
-          ln -sf "${simdeck_dir}/bin/simdeck.mjs" "${bin_dir}/simdeck"
+          simdeck_launcher="${simdeck_dir}/packages/cli/bin/simdeck.mjs"
+          if [[ ! -f "${simdeck_launcher}" ]]; then
+            simdeck_launcher="${simdeck_dir}/bin/simdeck.mjs"
+          fi
+          chmod +x "${simdeck_launcher}" "${simdeck_dir}/build/simdeck-bin"
+          ln -sf "${simdeck_launcher}" "${bin_dir}/simdeck"
           echo "Installed ${SIMDECK_PACKAGE} ${version}"
         ) &
         simdeck_install_pid="$!"

actions/run-ios-comment-session/action.yml

@@ -228,8 +228,12 @@ runs:
           version="$(SIMDECK_METADATA="${metadata}" python3 -c 'import json, os; print(json.loads(os.environ["SIMDECK_METADATA"])["version"])')"
           rm -rf "${simdeck_dir:?}/"*
           curl -fsSL "${tarball}" | tar -xz -C "${simdeck_dir}" --strip-components=1
-          chmod +x "${simdeck_dir}/bin/simdeck.mjs" "${simdeck_dir}/build/simdeck-bin"
-          ln -sf "${simdeck_dir}/bin/simdeck.mjs" "${bin_dir}/simdeck"
+          simdeck_launcher="${simdeck_dir}/packages/cli/bin/simdeck.mjs"
+          if [[ ! -f "${simdeck_launcher}" ]]; then
+            simdeck_launcher="${simdeck_dir}/bin/simdeck.mjs"
+          fi
+          chmod +x "${simdeck_launcher}" "${simdeck_dir}/build/simdeck-bin"
+          ln -sf "${simdeck_launcher}" "${bin_dir}/simdeck"
           echo "Installed ${SIMDECK_PACKAGE} ${version}"
         ) &
         simdeck_install_pid="$!"