chore: merge main into simdeck-ios

Author: DjDeveloperr

.codex/local-environment.toml

@@ -0,0 +1,23 @@
+version = 1
+name = "SimDeck"
+
+[setup]
+script = '''
+cd "$CODEX_WORKTREE_PATH"
+npm run codex:setup
+'''
+
+[cleanup]
+script = '''
+cd "$CODEX_WORKTREE_PATH"
+npm run codex:cache:save
+'''
+
+[[actions]]
+name = "Build and Restart Daemon"
+icon = "run"
+command = '''
+cd "$CODEX_WORKTREE_PATH"
+npm run codex:run
+'''
+platform = "darwin"

AGENTS.md

@@ -102,6 +102,15 @@ npm run package:vscode
 
 This now builds the Rust server in `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.
+
 Run the local daemon:
 
 ```sh
@@ -137,6 +146,8 @@ Useful direct commands:
 ./build/simdeck pasteboard set <udid> "hello"
 ./build/simdeck pasteboard get <udid>
 ./build/simdeck screenshot <udid> --output screen.png
+./build/simdeck screenshot <udid> --with-bezel --output screen-bezel.png
+./build/simdeck record <udid> --seconds 5 --output screen-recording.mp4
 ./build/simdeck describe <udid>
 ./build/simdeck tap <udid> 120 240
 ./build/simdeck tap <udid> --label "Continue" --wait-timeout-ms 5000

CONTRIBUTING.md

@@ -138,6 +138,40 @@ npx skills add NativeScript/SimDeck --skill simdeck -a codex -g
 
 The npm postinstall message also prints this command after a global install.
 
+## Codex local worktrees
+
+This repo includes a Codex local environment at
+`.codex/local-environment.toml`. Use it when creating Codex worktrees for
+SimDeck. The setup script runs:
+
+```sh
+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
+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
+for the native Rust build. Set
+`SIMDECK_CODEX_SKIP_BREW=1` if you want setup to report missing Homebrew
+packages instead of installing them.
+
+The cleanup script saves fresh caches with:
+
+```sh
+npm run codex:cache:save
+```
+
+The environment also exposes a **Build and Restart Daemon** Run action:
+
+```sh
+npm run codex:run
+```
+
+It builds the Rust CLI and React client, saves the refreshed caches, and runs
+`./build/simdeck daemon restart` for the current workspace.
+
 ## Releasing
 
 Releases are published from the `Release` GitHub Actions workflow at

README.md

@@ -141,6 +141,8 @@ simdeck toggle-appearance <udid>
 simdeck pasteboard set <udid> "hello"
 simdeck pasteboard get <udid>
 simdeck screenshot <udid> --output screen.png
+simdeck screenshot <udid> --with-bezel --output screen-bezel.png
+simdeck record <udid> --seconds 5 --output screen-recording.mp4
 simdeck stream <udid> --frames 120 > stream.h264
 simdeck describe <udid>
 simdeck describe <udid> --format agent --max-depth 4
@@ -217,6 +219,8 @@ try {
   await sim.tap(0.5, 0.5);
   await sim.waitFor({ label: "Continue" });
   await sim.screenshot();
+  await sim.screenshot({ withBezel: true });
+  await sim.record({ seconds: 5 });
 } finally {
   sim.close();
 }

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

@@ -545,6 +545,58 @@ runs:
         fi
         date +%s > /tmp/sim-boot-end
 
+    - name: Wait for public SimDeck iOS session access
+      shell: bash
+      run: |
+        set -euo pipefail
+
+        udid="${SIMULATOR_UDID}"
+        public_simulators_url="${{ steps.stream.outputs.url }}/api/simulators?simdeckToken=${{ steps.stream.outputs.access_token }}"
+        tunnel_host="${{ steps.stream.outputs.url }}"
+        tunnel_host="${tunnel_host#https://}"
+        tunnel_host="${tunnel_host%%/*}"
+
+        fetch_public_simulators() {
+          curl -fsS "${public_simulators_url}" -o public-simulators.json ||
+            curl -fsS --resolve "${tunnel_host}:443:104.16.230.132" "${public_simulators_url}" -o public-simulators.json ||
+            curl -fsS --resolve "${tunnel_host}:443:104.16.231.132" "${public_simulators_url}" -o public-simulators.json
+        }
+
+        verify_selected_simulator() {
+          SIMDECK_READY_UDID="${udid}" python3 - <<'PY'
+        import json
+        import os
+
+        with open("public-simulators.json", "r", encoding="utf-8") as handle:
+            data = json.load(handle)
+
+        udid = os.environ["SIMDECK_READY_UDID"]
+        simulators = data.get("simulators", data if isinstance(data, list) else [])
+        for simulator in simulators:
+            if simulator.get("udid") == udid and simulator.get("isBooted") is True:
+                raise SystemExit(0)
+
+        raise SystemExit(1)
+        PY
+        }
+
+        for attempt in {1..120}; do
+          if fetch_public_simulators && verify_selected_simulator; then
+            echo "Public SimDeck URL lists booted simulator ${udid}."
+            exit 0
+          fi
+          echo "Waiting for public SimDeck simulator list (${attempt}/120)."
+          sleep 1
+        done
+
+        echo "SimDeck public simulator list did not become accessible for ${udid}" >&2
+        if [[ -f public-simulators.json ]]; then
+          cat public-simulators.json >&2 || true
+        fi
+        cat cloudflared.log >&2 || true
+        cat simdeck-daemon.log >&2 || true
+        exit 1
+
     - name: Update status comment with booted simulator URL
       shell: bash
       run: |

cli/XCWChromeRenderer.h

@@ -15,6 +15,9 @@ NS_ASSUME_NONNULL_BEGIN
                                           error:(NSError * _Nullable * _Nullable)error;
 + (nullable NSData *)screenMaskPNGDataForDeviceName:(NSString *)deviceName
                                               error:(NSError * _Nullable * _Nullable)error;
++ (nullable NSData *)screenshotPNGDataForDeviceName:(NSString *)deviceName
+                                      screenPNGData:(NSData *)screenPNGData
+                                              error:(NSError * _Nullable * _Nullable)error;
 + (nullable NSDictionary<NSString *, id> *)profileForDeviceName:(NSString *)deviceName
                                                           error:(NSError * _Nullable * _Nullable)error;
 

cli/XCWChromeRenderer.m

@@ -249,6 +249,111 @@ + (nullable NSData *)screenMaskPNGDataForDeviceName:(NSString *)deviceName
     return [self PNGDataForPDFAtPath:maskPath scale:1.0 error:error];
 }
 
++ (nullable NSData *)screenshotPNGDataForDeviceName:(NSString *)deviceName
+                                      screenPNGData:(NSData *)screenPNGData
+                                              error:(NSError * _Nullable __autoreleasing *)error {
+    NSDictionary *profile = [self profileForDeviceName:deviceName error:error];
+    if (profile == nil) {
+        return nil;
+    }
+
+    NSData *chromePNGData = [self PNGDataForDeviceName:deviceName includeButtons:YES error:error];
+    if (chromePNGData == nil) {
+        return nil;
+    }
+
+    NSImage *screenImage = [[NSImage alloc] initWithData:screenPNGData];
+    NSImage *chromeImage = [[NSImage alloc] initWithData:chromePNGData];
+    if (screenImage == nil || chromeImage == nil) {
+        if (error != NULL) {
+            *error = [NSError errorWithDomain:XCWChromeRendererErrorDomain
+                                         code:15
+                                     userInfo:@{
+                NSLocalizedDescriptionKey: @"Unable to decode simulator screenshot or chrome PNG data.",
+            }];
+        }
+        return nil;
+    }
+
+    CGFloat scale = 3.0;
+    CGFloat totalWidth = [self numberValue:profile[@"totalWidth"]];
+    CGFloat totalHeight = [self numberValue:profile[@"totalHeight"]];
+    CGFloat screenX = [self numberValue:profile[@"screenX"]];
+    CGFloat screenY = [self numberValue:profile[@"screenY"]];
+    CGFloat screenWidth = [self numberValue:profile[@"screenWidth"]];
+    CGFloat screenHeight = [self numberValue:profile[@"screenHeight"]];
+    NSInteger pixelWidth = MAX((NSInteger)ceil(totalWidth * scale), 1);
+    NSInteger pixelHeight = MAX((NSInteger)ceil(totalHeight * scale), 1);
+    if (totalWidth <= 0.0 || totalHeight <= 0.0 || screenWidth <= 0.0 || screenHeight <= 0.0) {
+        if (error != NULL) {
+            *error = [NSError errorWithDomain:XCWChromeRendererErrorDomain
+                                         code:16
+                                     userInfo:@{
+                NSLocalizedDescriptionKey: @"Device chrome profile did not include usable screenshot geometry.",
+            }];
+        }
+        return nil;
+    }
+
+    NSBitmapImageRep *bitmap = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL
+                                                                       pixelsWide:pixelWidth
+                                                                       pixelsHigh:pixelHeight
+                                                                    bitsPerSample:8
+                                                                  samplesPerPixel:4
+                                                                         hasAlpha:YES
+                                                                         isPlanar:NO
+                                                                   colorSpaceName:NSDeviceRGBColorSpace
+                                                                      bytesPerRow:0
+                                                                     bitsPerPixel:32];
+    if (bitmap == nil) {
+        if (error != NULL) {
+            *error = [NSError errorWithDomain:XCWChromeRendererErrorDomain
+                                         code:17
+                                     userInfo:@{
+                NSLocalizedDescriptionKey: @"Unable to create a bitmap for bezeled screenshot rendering.",
+            }];
+        }
+        return nil;
+    }
+
+    NSGraphicsContext *graphicsContext = [NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap];
+    [NSGraphicsContext saveGraphicsState];
+    [NSGraphicsContext setCurrentContext:graphicsContext];
+    graphicsContext.imageInterpolation = NSImageInterpolationHigh;
+    NSRect outputRect = NSMakeRect(0.0, 0.0, pixelWidth, pixelHeight);
+    [[NSColor clearColor] setFill];
+    NSRectFillUsingOperation(outputRect, NSCompositingOperationClear);
+
+    NSRect screenRect = NSMakeRect(screenX * scale,
+                                   pixelHeight - ((screenY + screenHeight) * scale),
+                                   screenWidth * scale,
+                                   screenHeight * scale);
+    NSDictionary *hints = @{ NSImageHintInterpolation: @(NSImageInterpolationHigh) };
+    [screenImage drawInRect:screenRect
+                   fromRect:NSZeroRect
+                  operation:NSCompositingOperationSourceOver
+                   fraction:1.0
+             respectFlipped:NO
+                      hints:hints];
+    [chromeImage drawInRect:outputRect
+                   fromRect:NSZeroRect
+                  operation:NSCompositingOperationSourceOver
+                   fraction:1.0
+             respectFlipped:NO
+                      hints:hints];
+    [NSGraphicsContext restoreGraphicsState];
+
+    NSData *pngData = [bitmap representationUsingType:NSBitmapImageFileTypePNG properties:@{}];
+    if (pngData.length == 0 && error != NULL) {
+        *error = [NSError errorWithDomain:XCWChromeRendererErrorDomain
+                                     code:18
+                                 userInfo:@{
+            NSLocalizedDescriptionKey: @"Unable to encode bezeled simulator screenshot PNG.",
+        }];
+    }
+    return pngData.length > 0 ? pngData : nil;
+}
+
 + (nullable NSDictionary<NSString *, id> *)profileForChromeInfo:(NSDictionary *)chromeInfo
                                                           error:(NSError * _Nullable __autoreleasing *)error {
     NSDictionary *plist = chromeInfo[@"plist"];

cli/XCWProcessRunner.h

@@ -31,6 +31,13 @@ NS_ASSUME_NONNULL_BEGIN
                          timeoutSec:(NSTimeInterval)timeoutSec
                               error:(NSError * _Nullable * _Nullable)error;
 
++ (XCWProcessResult *)runLaunchPath:(NSString *)launchPath
+                          arguments:(NSArray<NSString *> *)arguments
+                          inputData:(nullable NSData *)inputData
+                         timeoutSec:(NSTimeInterval)timeoutSec
+                      timeoutSignal:(int)timeoutSignal
+                              error:(NSError * _Nullable * _Nullable)error;
+
 @end
 
 NS_ASSUME_NONNULL_END

cli/XCWProcessRunner.m

@@ -119,6 +119,20 @@ + (XCWProcessResult *)runLaunchPath:(NSString *)launchPath
                           inputData:(NSData *)inputData
                          timeoutSec:(NSTimeInterval)timeoutSec
                               error:(NSError * _Nullable __autoreleasing *)error {
+    return [self runLaunchPath:launchPath
+                     arguments:arguments
+                     inputData:inputData
+                    timeoutSec:timeoutSec
+                 timeoutSignal:SIGTERM
+                         error:error];
+}
+
++ (XCWProcessResult *)runLaunchPath:(NSString *)launchPath
+                          arguments:(NSArray<NSString *> *)arguments
+                          inputData:(NSData *)inputData
+                         timeoutSec:(NSTimeInterval)timeoutSec
+                      timeoutSignal:(int)timeoutSignal
+                              error:(NSError * _Nullable __autoreleasing *)error {
     int stdoutFD = -1;
     int stderrFD = -1;
     int stdinPipe[2] = { -1, -1 };
@@ -244,8 +258,10 @@ + (XCWProcessResult *)runLaunchPath:(NSString *)launchPath
         }
         if (hasTimeout && [deadline timeIntervalSinceNow] <= 0) {
             timedOut = YES;
-            kill(pid, SIGTERM);
-            NSDate *killDeadline = [NSDate dateWithTimeIntervalSinceNow:2.0];
+            int signalToSend = timeoutSignal > 0 ? timeoutSignal : SIGTERM;
+            kill(pid, signalToSend);
+            NSTimeInterval graceSeconds = signalToSend == SIGINT ? 10.0 : 2.0;
+            NSDate *killDeadline = [NSDate dateWithTimeIntervalSinceNow:graceSeconds];
             do {
                 waitResult = waitpid(pid, &waitStatus, WNOHANG);
                 if (waitResult == pid || (waitResult < 0 && errno != EINTR)) {

cli/XCWSimctl.h

@@ -19,6 +19,12 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)openURL:(NSString *)urlString simulatorUDID:(NSString *)udid error:(NSError * _Nullable * _Nullable)error;
 - (BOOL)launchBundleID:(NSString *)bundleID simulatorUDID:(NSString *)udid error:(NSError * _Nullable * _Nullable)error;
 - (nullable NSData *)screenshotPNGForSimulatorUDID:(NSString *)udid error:(NSError * _Nullable * _Nullable)error;
+- (nullable NSData *)screenshotPNGForSimulatorUDID:(NSString *)udid
+                                      includeBezel:(BOOL)includeBezel
+                                             error:(NSError * _Nullable * _Nullable)error;
+- (nullable NSData *)screenRecordingMP4ForSimulatorUDID:(NSString *)udid
+                                        durationSeconds:(NSTimeInterval)durationSeconds
+                                                  error:(NSError * _Nullable * _Nullable)error;
 - (BOOL)eraseSimulatorWithUDID:(NSString *)udid error:(NSError * _Nullable * _Nullable)error;
 - (BOOL)installAppAtPath:(NSString *)appPath simulatorUDID:(NSString *)udid error:(NSError * _Nullable * _Nullable)error;
 - (BOOL)uninstallBundleID:(NSString *)bundleID simulatorUDID:(NSString *)udid error:(NSError * _Nullable * _Nullable)error;