peachsim 0.1.854 → 0.1.871

package/dist-lib/skills.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.854 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.871 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __create = Object.create;
@@ -37069,11 +37069,13 @@ function packageSources(packagePath) {
   }
   return files2;
 }
-function packageSnapshot(project) {
+function packageSnapshot(project, entry) {
   const files2 = packageSources(project.packagePath);
+  const layout = xcodeLayout(project.packagePath);
   const native = nativeSourceDescriptor(project.packagePath);
   return {
     files: files2,
+    entry: layout ? xcodeInputKey(layout, import_node_path20.default.resolve(project.packagePath, entry), entry) : entry,
     resourcePaths: swiftImplicitResourcePaths(
       resourceCandidateFiles(project.packagePath).map(
         (file) => import_node_path20.default.relative(project.packagePath, file).split(import_node_path20.default.sep).join(import_node_path20.default.posix.sep)
@@ -37091,18 +37093,18 @@ function packageSnapshot(project) {
     } : {}
   };
 }
-function snapshotCompileInput(snapshot, entry) {
+function snapshotCompileInput(snapshot) {
   const input = {
     files: snapshot.files,
     resourcePaths: snapshot.resourcePaths,
     resources: snapshot.bundleFiles.files,
     images: snapshot.resources.images,
-    entry,
+    entry: snapshot.entry,
     oneModule: true
   };
   return snapshot.glue ? withNativeSourceGlue(input, snapshot.glue) : input;
 }
-async function compile(packagePath, entry, stamp, moduleRootOverride, hosted, snapshot) {
+async function compile(packagePath, stamp, moduleRootOverride, hosted, snapshot) {
   const resources = {
     table: snapshot.resources.table,
     colors: snapshot.resources.colors,
@@ -37116,7 +37118,7 @@ async function compile(packagePath, entry, stamp, moduleRootOverride, hosted, sn
   };
   if (hosted)
     return {
-      ...await compileRemote(packagePath, entry, snapshot, hosted),
+      ...await compileRemote(packagePath, snapshot, hosted),
       stamp,
       package: content
     };
@@ -37125,12 +37127,12 @@ async function compile(packagePath, entry, stamp, moduleRootOverride, hosted, sn
   ) ?? await swiftDistributionRoot();
   if (!moduleRoot)
     return {
-      ...await compileRemote(packagePath, entry, snapshot),
+      ...await compileRemote(packagePath, snapshot),
       stamp,
       package: content
     };
   const toolchain = swiftModuleToolchain(moduleRoot);
-  const input = snapshotCompileInput(snapshot, entry);
+  const input = snapshotCompileInput(snapshot);
   const targets = compileTargets(input).map((target) => target.name);
   const missing = missingSwiftModules(
     input.files,
@@ -37248,7 +37250,7 @@ async function missingModulesMessage(packagePath, missing) {
     })
   ].join("\n");
 }
-async function compileRemote(packagePath, entry, snapshot, hosted) {
+async function compileRemote(packagePath, snapshot, hosted) {
   const auth = hosted ? null : resolveCliAuth();
   if (!hosted && (!auth || auth.kind === "github")) {
     throw new Error(
@@ -37282,7 +37284,7 @@ async function compileRemote(packagePath, entry, snapshot, hosted) {
       resourcePaths: snapshot.resourcePaths,
       resources: snapshot.bundleFiles.files,
       images: snapshot.resources.images,
-      entry,
+      entry: snapshot.entry,
       packageId: descriptor?.packageId ?? swiftPackageId(packagePath)
     },
     origin,
@@ -37330,13 +37332,12 @@ function artifactFor(project, entry, moduleRoot) {
     const again = () => artifactFor(project, entry, moduleRoot);
     return running.promise.then(again, again);
   }
-  const snapshot = packageSnapshot(project);
+  const snapshot = packageSnapshot(project, entry);
   if (sourceStamp(project.packagePath, moduleRoot, Boolean(project.hosted)) !== stamp) {
     return artifactFor(project, entry, moduleRoot);
   }
   const promise = compile(
     project.packagePath,
-    entry,
     stamp,
     moduleRoot,
     project.hosted,
@@ -47843,7 +47844,8 @@ function findTopAncestor(start, maxDepth = 20) {
   let pid = getParentPid(start);
   if (!pid || pid <= 1) {
     const comm = getProcessComm(start);
-    return start > 1 && comm && !IMMORTAL_HOST_COMM_RE.test(comm) ? start : null;
+    if (!comm || start < 1 || IMMORTAL_HOST_COMM_RE.test(comm)) return null;
+    return start > 1 || !INIT_COMM_RE.test(comm) ? start : null;
   }
   for (let i = 0; i < maxDepth; i++) {
     const comm = getProcessComm(pid);
@@ -47865,7 +47867,7 @@ function getCliIdentity() {
     }
   }
   const topPid = findTopAncestor(process.ppid);
-  if (topPid && topPid > 1) {
+  if (topPid) {
     return { key: `gppid-${topPid}`, source: "grand-ppid", stable: true };
   }
   return { key: `pid-${process.ppid}`, source: "ppid", stable: false };
@@ -47939,7 +47941,7 @@ function saveCurrentSimId(simId) {
 function clearCurrentSimId() {
   (0, import_fs4.rmSync)(getCurrentSimPath(), { force: true });
 }
-var import_fs4, import_os, import_path3, CURRENT_SIM_VERSION, CURRENT_SIM_PATH_ENV, IDENTITY_ENV_VARS, IMMORTAL_HOST_COMM_RE, readCurrentSim;
+var import_fs4, import_os, import_path3, CURRENT_SIM_VERSION, CURRENT_SIM_PATH_ENV, IDENTITY_ENV_VARS, IMMORTAL_HOST_COMM_RE, INIT_COMM_RE, readCurrentSim;
 var init_current_sim = __esm({
   "cli/current-sim.ts"() {
     "use strict";
@@ -47981,6 +47983,7 @@ var init_current_sim = __esm({
       // vscode integrated terminal
     ];
     IMMORTAL_HOST_COMM_RE = /^(?:tmux|screen)|^tm$/i;
+    INIT_COMM_RE = /^(?:init|systemd|launchd|tini|docker-init|dumb-init|catatonit|s6-svscan|runsvdir)$/i;
     readCurrentSim = readCurrentTarget;
   }
 });
@@ -52502,15 +52505,6 @@ function probe() {
     detail: resolved ? `resolved via ${resolved.spec}@${resolved.version}` : `installs playwright-core@${PINNED_PLAYWRIGHT_CORE.version} on first launch`
   };
 }
-function headlessHintForLinuxFailure(opts, detail) {
-  if (process.platform !== "linux") return null;
-  if (opts.headless) return null;
-  if (process.env.DISPLAY || process.env.WAYLAND_DISPLAY) return null;
-  if (!/missing x server|cannot open display|x server|x11/i.test(detail)) {
-    return null;
-  }
-  return "  hint: linux without DISPLAY/WAYLAND_DISPLAY \u2014 rerun without --headed (or add --headless) to run playwright headless.";
-}
 function resolveUserDataDir(opts) {
   if (opts.profileId) {
     return playwrightProfileUserDataDir(ensureProfile(opts.profileId).id);
@@ -52537,7 +52531,7 @@ async function launch(opts) {
     return { launched: false, message: "playwright driver requires a target url" };
   }
   const ownerPid = opts.ownerPid;
-  if (ownerPid === void 0 || !Number.isInteger(ownerPid) || ownerPid <= 1) {
+  if (ownerPid === void 0 || !Number.isInteger(ownerPid) || ownerPid < 1) {
     return {
       launched: false,
       message: "playwright driver requires a valid owning session process"
@@ -52623,23 +52617,6 @@ async function launch(opts) {
       }
     );
     child.unref();
-    const earlyExit = await new Promise((resolve10) => {
-      const timer = setTimeout(() => resolve10(null), 4e3);
-      child.once("exit", (code) => {
-        clearTimeout(timer);
-        resolve10(code ?? 0);
-      });
-    });
-    if (earlyExit !== null) {
-      const detail = (0, import_fs7.readFileSync)(errLog, "utf8").trim();
-      const hint = headlessHintForLinuxFailure(opts, detail);
-      return {
-        launched: false,
-        message: `playwright host exited early (code ${earlyExit}) \u2014 host log ${errLog}${detail ? `:
-${detail}` : ""}${hint ? `
-${hint}` : ""}`
-      };
-    }
     const ownerComm = getProcessComm(ownerPid);
     const idleMinutes = AUTOMATION_SIM_IDLE_REAP_TTL_MS / 6e4;
     const ownerNote = ` \u2014 browser closes after ${idleMinutes} min with no peach command or input, or when pid ${ownerPid}${ownerComm ? ` (${ownerComm})` : ""} exits`;
@@ -54069,7 +54046,11 @@ async function waitForSimReady(wsPort, commandTimeoutMs, simId, opts = {}) {
     bridge.close();
     await sleep(intervalMs);
   }
-  return { bridge: null, attempts, intervalMs, minNodeCount, lastCount, lastError };
+  const observed = lastError ? `last bridge error: ${lastError}` : lastCount === null ? "guest never installed window.__sootsimTest" : `last node count: ${String(lastCount)} (needs > ${minNodeCount})`;
+  return {
+    bridge: null,
+    failure: `after ${attempts} polls over ${Math.round(attempts * intervalMs / 1e3)}s; ${observed}`
+  };
 }
 async function waitForSimMatch(wsPort, commandTimeoutMs, predicate, opts = {}) {
   const attempts = opts.attempts ?? 30;
@@ -54775,15 +54756,14 @@ async function runOpenCommand(args, opts = {}) {
           rnxExit(1);
         }
         targetSim = navigatedSim;
-        const ready = await waitForSimReady(
+        const ready2 = await waitForSimReady(
           parsed.wsPort,
           parsed.commandTimeoutMs,
           targetSim.id
         );
-        if (!ready.bridge) {
-          const observed = ready.lastError ? `last bridge error: ${ready.lastError}` : ready.lastCount === null ? "guest never installed window.__sootsimTest" : `last node count: ${String(ready.lastCount)} (needs > ${ready.minNodeCount})`;
+        if (!ready2.bridge) {
           console.error(
-            `  timed out waiting for current sim to load target after ${ready.attempts} polls over ${Math.round(ready.attempts * ready.intervalMs / 1e3)}s; ${observed}`
+            `  timed out waiting for current sim to load target ${ready2.failure}`
           );
           await printBridgeFailureDiagnostics(bridge, {
             errorsCommand: `peach get errors 5${simHint}`,
@@ -54792,7 +54772,7 @@ async function runOpenCommand(args, opts = {}) {
           });
           rnxExit(1);
         }
-        ready.bridge.close();
+        ready2.bridge.close();
         saveCurrentSimId(targetSim.id);
         printOpenedSim(
           navigatedShellUrl,
@@ -54889,6 +54869,29 @@ async function runOpenCommand(args, opts = {}) {
   if (opts.resources) opts.resources.simId = match.id;
   saveCurrentSimId(match.id);
   signalDriverLaunchConnected(result);
+  const ready = await waitForSimReady(parsed.wsPort, parsed.commandTimeoutMs, match.id, {
+    intervalMs: connectWait.intervalMs,
+    attempts: connectWait.attempts
+  });
+  if (!ready.bridge) {
+    console.error(
+      `  timed out waiting for opened sim ${match.id} to load ${ready.failure}`
+    );
+    const hint = ` --sim ${match.id}`;
+    const bridge = createBridge(parsed.wsPort, {
+      commandTimeoutMs: parsed.commandTimeoutMs,
+      simId: match.id,
+      simIdSource: "flag"
+    });
+    await printBridgeFailureDiagnostics(bridge, {
+      errorsCommand: `peach get errors 5${hint}`,
+      warningsCommand: `peach get warnings 5${hint}`,
+      requestsCommand: `peach get requests 5${hint}`
+    });
+    bridge.close();
+    rnxExit(1);
+  }
+  ready.bridge.close();
   printOpenedSim(openUrl2, match, `${driver.name} driver`, quiet);
   await maybeDescribeAfterOpen(parsed.wsPort, match.id, args);
   printAgentHints(quiet);
@@ -55903,6 +55906,8 @@ async function waitForSootsimIdle({
         if (paintStill && !last.screenPixels) blockers.push('screen pixels unavailable')
         else if (paintStill && !screenUnchanged(last.screenPixels)) blockers.push('screen pixels still changing')
         if (last.requestInFlight > 0) blockers.push(last.requestInFlight + ' requests in flight')
+        else if (last.requestTotal !== lastRequestTotal) blockers.push('new requests issued')
+        if (polls < 2) blockers.push('sim too busy to poll twice')
         return {
           settled: false,
           elapsed: Date.now() - start,

package/dist-lib/swift-compile.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.854 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.871 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/swift-compile.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.854 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.871 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/swift-compile.ts
 import { execFile as execFile2, execFileSync } from "node:child_process";

package/dist-lib/swift-package.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.854 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.871 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/swift-package.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.854 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.871 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/swift-package.ts
 function isSwiftManifestFile(file) {

package/dist-lib/swift-submit.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.854 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.871 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/swift-submit.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.854 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.871 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/swift-submit.ts
 var SWIFT_COMPILE_PATH = "/api/swift-compile";

package/dist-lib/swift-toolchain.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.854 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.871 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/swift.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.854 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.871 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/vite-swift.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.854 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.871 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __create = Object.create;
@@ -8057,11 +8057,13 @@ function packageSources(packagePath) {
   }
   return files2;
 }
-function packageSnapshot(project) {
+function packageSnapshot(project, entry) {
   const files2 = packageSources(project.packagePath);
+  const layout = xcodeLayout(project.packagePath);
   const native = nativeSourceDescriptor(project.packagePath);
   return {
     files: files2,
+    entry: layout ? xcodeInputKey(layout, import_node_path15.default.resolve(project.packagePath, entry), entry) : entry,
     resourcePaths: swiftImplicitResourcePaths(
       resourceCandidateFiles(project.packagePath).map(
         (file) => import_node_path15.default.relative(project.packagePath, file).split(import_node_path15.default.sep).join(import_node_path15.default.posix.sep)
@@ -8079,21 +8081,21 @@ function packageSnapshot(project) {
     } : {}
   };
 }
-function snapshotCompileInput(snapshot, entry) {
+function snapshotCompileInput(snapshot) {
   const input = {
     files: snapshot.files,
     resourcePaths: snapshot.resourcePaths,
     resources: snapshot.bundleFiles.files,
     images: snapshot.resources.images,
-    entry,
+    entry: snapshot.entry,
     oneModule: true
   };
   return snapshot.glue ? withNativeSourceGlue(input, snapshot.glue) : input;
 }
 function compileInput(packagePath, entry) {
-  return snapshotCompileInput(packageSnapshot(projectFor(packagePath)), entry);
+  return snapshotCompileInput(packageSnapshot(projectFor(packagePath), entry));
 }
-async function compile(packagePath, entry, stamp, moduleRootOverride, hosted, snapshot) {
+async function compile(packagePath, stamp, moduleRootOverride, hosted, snapshot) {
   const resources = {
     table: snapshot.resources.table,
     colors: snapshot.resources.colors,
@@ -8107,7 +8109,7 @@ async function compile(packagePath, entry, stamp, moduleRootOverride, hosted, sn
   };
   if (hosted)
     return {
-      ...await compileRemote(packagePath, entry, snapshot, hosted),
+      ...await compileRemote(packagePath, snapshot, hosted),
       stamp,
       package: content
     };
@@ -8116,12 +8118,12 @@ async function compile(packagePath, entry, stamp, moduleRootOverride, hosted, sn
   ) ?? await swiftDistributionRoot();
   if (!moduleRoot)
     return {
-      ...await compileRemote(packagePath, entry, snapshot),
+      ...await compileRemote(packagePath, snapshot),
       stamp,
       package: content
     };
   const toolchain = swiftModuleToolchain(moduleRoot);
-  const input = snapshotCompileInput(snapshot, entry);
+  const input = snapshotCompileInput(snapshot);
   const targets = compileTargets(input).map((target) => target.name);
   const missing = missingSwiftModules(
     input.files,
@@ -8258,7 +8260,7 @@ async function missingModulesMessage(packagePath, missing) {
     })
   ].join("\n");
 }
-async function compileRemote(packagePath, entry, snapshot, hosted) {
+async function compileRemote(packagePath, snapshot, hosted) {
   const auth = hosted ? null : resolveCliAuth();
   if (!hosted && (!auth || auth.kind === "github")) {
     throw new Error(
@@ -8292,7 +8294,7 @@ async function compileRemote(packagePath, entry, snapshot, hosted) {
       resourcePaths: snapshot.resourcePaths,
       resources: snapshot.bundleFiles.files,
       images: snapshot.resources.images,
-      entry,
+      entry: snapshot.entry,
       packageId: descriptor?.packageId ?? swiftPackageId(packagePath)
     },
     origin,
@@ -8340,13 +8342,12 @@ function artifactFor(project, entry, moduleRoot) {
     const again = () => artifactFor(project, entry, moduleRoot);
     return running.promise.then(again, again);
   }
-  const snapshot = packageSnapshot(project);
+  const snapshot = packageSnapshot(project, entry);
   if (sourceStamp(project.packagePath, moduleRoot, Boolean(project.hosted)) !== stamp) {
     return artifactFor(project, entry, moduleRoot);
   }
   const promise = compile(
     project.packagePath,
-    entry,
     stamp,
     moduleRoot,
     project.hosted,

package/dist-lib/vite.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.854 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.871 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/worklet-executable.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.854 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.871 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/worklet-executable.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.854 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.871 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/worklet-executable.ts
 import { parse } from "acorn";

package/kotlin/fork/NOTICE

@@ -1,7 +1,7 @@
 Peach's patched builds of JetBrains Compose Multiplatform UI and Skiko
 
 This directory records modified Compose and Skiko builds under Apache License
-2.0 (LICENSE), and a modified Skia shaping unit under BSD-3-Clause (SKIA_LICENSE).
+2.0 (LICENSE), and modified Skia shaping and paragraph units under BSD-3-Clause (SKIA_LICENSE).
 
 - JetBrains/compose-multiplatform-core at tag v1.13.0-alpha01
   (commit a9e47e8aa04c95cfe572ab4297c770f3cbfb234e), a fork of the Android
@@ -38,4 +38,6 @@ The Compose patch also selects integer static glyph advances on Android and
 scales letter spacing to the integer shaping size, retaining fractional Animated
 text. skia-android-shaping.patch truncates only the measurement-font copy for
 non-subpixel, non-linear shaping. The original run font retains its painting
-size and metrics. The modified Skia unit compiles into the Skiko Wasm runtime.
+size and metrics. Run.cpp uses Android inter-glyph spacing and caret boundaries. TextLine.cpp
+trims line edges, and TextWrapper.cpp applies the same trimming before fitting
+a line. These modified Skia units compile into the Skiko Wasm runtime.

package/kotlin/fork/README.md

@@ -16,6 +16,7 @@ Android behavior for the approved web differences and static text shaping below.
 | Compose `ui-skiko` | `SkiaBackedPaint.nonAndroid.kt` | initial Miter join agrees with the backing paint and Android |
 | Compose `ui-skiko` | `SkikoText.nonAndroid.kt`, `SkikoParagraphBuilder.nonAndroid.kt` | Android static advances and letter-spacing scale; Animated text retains fractional shaping |
 | Skia shaper | `SkShaper_harfbuzz.cpp` | measurement-font copy truncates static shaping size; the painted run font retains the requested size |
+| Skia paragraph | `Run.cpp`, `TextLine.cpp`, `TextWrapper.cpp` | Android inter-glyph spacing, caret boundaries and edge trimming before line fits |
 | Compose `material3` | `PlatformDateFormat.web.kt` | timestamp formatting uses UTC, as Android does |
 | Navigation `navigation-compose` | `DefaultNavTransitions.web.kt` | Android forward fades and predictive pop defaults |
 | Skiko | `OsArch.web.kt` | explicit `setHostOsProvider`; its default lazily retains upstream OS detection |
@@ -30,12 +31,14 @@ this contract.
 
 `fork.json` pins repositories, commits, patch hashes, JDK and Android tools.
 Every changed upstream file carries a modification notice. `LICENSE` and
-`NOTICE` travel with the patches. `SKIA_LICENSE` records the shaping unit’s BSD license. `build.sh` builds the changed KLIBs and Skiko
-runtime jar with the upstream Gradle builds on the Linux builder. The Skia shaping
-unit is fetched at its pinned commit, patched, and compiled into Skiko; the linker
-uses it instead of the same unit in the pinned Skia archive. All other Skia
+`NOTICE` travel with the patches. `SKIA_LICENSE` records the modified Skia units’ BSD license. `build.sh` builds the changed KLIBs and Skiko
+runtime jar with the upstream Gradle builds on the Linux builder. The Skia shaping and paragraph
+units are fetched at their pinned commit, patched, and compiled into Skiko; the linker
+uses them instead of the same units in the pinned Skia archive. All other Skia
 objects retain their upstream build. This adds no allocation beyond the existing
 measurement-font copy, and truncates once per shaped font, outside the glyph loop.
+Paragraph spacing adds constant arithmetic per glyph or cluster; line fits trim
+the same edge half-spaces as completed lines, without allocation.
 
 ```sh
 delivery="scripts/tmp/kotlin-fork-$(date +%s)-$$"
@@ -65,5 +68,8 @@ then rematch the Android pins in `plans/peach/kotlin-everywhere.md`. The prepare
 upstream issue names these hooks and the full guest regression vehicle.
 
 The static shaping correction is measured against the original `textwidth`
-fixture. Styled line-end letter spacing and Animated whole-width rounding
-remain open in the lane plan; the shaping correction does not close those grades.
+fixture. The six original widths, twelve spacing assertions and the 162/164 px
+wrapping threshold pass their paired Android controls. The body Range probe
+retains its existing 0.00098 px difference. Pixel residuals, mixed-font bold
+advances, the primary caret at a style boundary and Animated whole-width rounding
+remain open in the lane plan. These corrections do not certify full text parity.

package/kotlin/fork/build.sh

@@ -118,10 +118,17 @@ checkout 0
 checkout 1
 SKIKO_SOURCE=${SOURCE}
 checkout 2
-# compile the patched shaping unit in Skiko so the linker uses it in place of
-# the upstream archive unit. all other Skia objects remain pinned upstream.
+# compile patched shaping and paragraph units in Skiko instead of their
+# upstream archive units. all other Skia objects remain pinned upstream.
 cmp "${SOURCE}/LICENSE" "${FORK}/SKIA_LICENSE"
 cp "${SOURCE}/modules/skshaper/src/SkShaper_harfbuzz.cpp"   "${SKIKO_SOURCE}/skiko/src/nativeJsMain/cpp/AndroidShaper.cpp"
+# internal paragraph headers come from the same pinned source as the archive.
+rsync -a --include='*/' --include='*.h' --exclude='*' "${SOURCE}/include/" "${SKIKO_SOURCE}/skiko/src/nativeJsMain/cpp/include/"
+rsync -a --include='*/' --include='*.h' --exclude='*' "${SOURCE}/modules/" "${SKIKO_SOURCE}/skiko/src/nativeJsMain/cpp/modules/"
+rsync -a --include='*/' --include='*.h' --exclude='*' "${SOURCE}/src/" "${SKIKO_SOURCE}/skiko/src/nativeJsMain/cpp/src/"
+cp "${SOURCE}/modules/skparagraph/src/Run.cpp" "${SKIKO_SOURCE}/skiko/src/nativeJsMain/cpp/AndroidParagraphRun.cpp"
+cp "${SOURCE}/modules/skparagraph/src/TextLine.cpp" "${SKIKO_SOURCE}/skiko/src/nativeJsMain/cpp/AndroidParagraphTextLine.cpp"
+cp "${SOURCE}/modules/skparagraph/src/TextWrapper.cpp" "${SKIKO_SOURCE}/skiko/src/nativeJsMain/cpp/AndroidParagraphTextWrapper.cpp"
 (
   cd "${SKIKO_SOURCE}/skiko"
   gradle -Pdeploy.version=0.152.0-alpha02 -Pdeploy.release=true \

package/kotlin/fork/fork.json

@@ -36,7 +36,7 @@
       "tag": "m152-2ca5fe6a81",
       "commit": "2ca5fe6a8170e2f55f519d9de083be4dccc06e70",
       "patch": "skia-android-shaping.patch",
-      "patchSha256": "1f1b656d8ae1144e3599dd900859202003784d14a52b3bb1da9349f3f8a322df"
+      "patchSha256": "4e453826e54c1fcaf0e164b5e2ff121399c4316b18653911e1d6b51df840f100"
     }
   ]
 }