docs(lifecycle): define completion invariants and regression scenarios

Document distinct ownership/readiness/exit facts, late cancellation and atomic publication boundaries, partial child cleanup, and diagnostic retention. Link representative regressions and route contributor guidance through AGENTS.md.

Refs: #4227

.github/workflows/ci.yml

@@ -60,6 +60,7 @@ jobs:
       web_runtime: ${{ steps.plan.outputs.web_runtime }}
       web_source_map: ${{ steps.plan.outputs.web_source_map }}
       nativeaot: ${{ steps.plan.outputs.nativeaot }}
+      ghidra_bridge: ${{ steps.plan.outputs.ghidra_bridge }}
       website: ${{ steps.plan.outputs.website }}
       matrix: ${{ steps.plan.outputs.matrix }}
       test_selection: ${{ steps.plan.outputs.test_selection }}
@@ -139,6 +140,11 @@ jobs:
       - name: Validate workflow syntax and expressions
         if: needs.changes.outputs.workflows == 'true'
         run: go run github.com/rhysd/actionlint/cmd/actionlint@v1.7.7 -shellcheck= -pyflakes=
+      # Code tiers run this source-only policy test in their existing shards.
+      # Workflow-only changes need the guard, without preparing runtime artifacts.
+      - name: Check action pins for workflow-only changes
+        if: needs.changes.outputs.workflows == 'true' && needs.changes.outputs.code != 'true'
+        run: node scripts/run-exact-tests.mjs run tests/boundary/filesystem/workflowActionPinning.test.ts
       - name: Record static task source and execution identity
         continue-on-error: true
         if: needs.changes.outputs.code == 'true'
@@ -899,6 +905,11 @@ jobs:
     if: needs.changes.outputs.nativeaot == 'true'
     uses: ./.github/workflows/nativeaot-fixtures.yml
 
+  ghidra_bridge:
+    needs: [changes, static]
+    if: needs.changes.outputs.ghidra_bridge == 'true'
+    uses: ./.github/workflows/ghidra-bridge-sources.yml
+
   website:
     needs: [changes, static]
     if: needs.changes.outputs.website == 'true'
@@ -934,6 +945,7 @@ jobs:
         web_runtime,
         web_source_map,
         nativeaot,
+        ghidra_bridge,
         website,
       ]
     runs-on: ubuntu-24.04

.github/workflows/ghidra-bridge-sources.yml

@@ -0,0 +1,48 @@
+name: Ghidra bridge source compilation
+
+on:
+  workflow_dispatch:
+  workflow_call:
+
+permissions:
+  contents: read
+
+env:
+  HUSKY: "0"
+
+jobs:
+  ghidra-bridge-sources:
+    name: Compile packaged Ghidra bridge sources
+    runs-on: ubuntu-24.04
+    timeout-minutes: 15
+    env:
+      GHIDRA_RELEASE_URL: https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_12.1.4_build/ghidra_12.1.4_PUBLIC_20260921.zip
+      GHIDRA_RELEASE_SHA256: ddac49f903da9d5bac833e5cc79395098b9c33cfd3279be5f31bd00387d2d4db
+    steps:
+      - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        with:
+          node-version-file: .nvmrc
+      - name: Validate the SDK pin against the provider's verified release
+        run: node scripts/verify-ghidra-bridge-sources.mjs --check-sdk-pin >> "$GITHUB_ENV"
+      # Only the jars and application.properties are extracted: the check
+      # compiles against them and never launches Ghidra or imports a target.
+      - name: Acquire checksum-verified Ghidra jars in isolated runner storage
+        shell: bash
+        run: |
+          ghidra_root="${RUNNER_TEMP}/rea-ghidra"
+          mkdir -p "${ghidra_root}"
+          curl -fsSL --retry 3 --write-out 'ghidra_download_bytes=%{size_download} ghidra_download_seconds=%{time_total}\n' -o "${ghidra_root}/ghidra.zip" "${GHIDRA_RELEASE_URL}"
+          echo "${GHIDRA_RELEASE_SHA256}  ${ghidra_root}/ghidra.zip" | sha256sum -c -
+          unzip -q "${ghidra_root}/ghidra.zip" '*/Ghidra/*.jar' '*/Ghidra/application.properties' -d "${ghidra_root}"
+          rm "${ghidra_root}/ghidra.zip"
+          properties="$(find "${ghidra_root}" -path '*/Ghidra/application.properties' -print -quit)"
+          test -n "${properties}"
+          echo "GHIDRA_INSTALL_DIR=$(dirname "$(dirname "${properties}")")" >> "${GITHUB_ENV}"
+      # JAVA_HOME_<major>_X64 comes from the runner image, not the env context.
+      - name: Compile bridge sources with the verified runner JDK
+        shell: bash
+        run: |
+          java_home_variable="JAVA_HOME_${GHIDRA_JAVA_MAJOR}_X64"
+          test -n "${!java_home_variable}"
+          JAVA_HOME="${!java_home_variable}" npm run verify:ghidra:bridge-sources -- --verified-sdk

.github/workflows/real-cutter.yml

@@ -22,7 +22,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install --no-install-recommends -y g++-mingw-w64-x86-64
       - run: npm run build:windows-native
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: cutter-windows-native
           path: native/windows/build/
@@ -53,7 +53,7 @@ jobs:
         uses: ./.github/actions/npm-cache
       - run: npm ci
       - if: matrix.platform == 'Windows'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: cutter-windows-native
           path: native/windows/build/
@@ -67,7 +67,7 @@ jobs:
         env:
           EXPECTED_PLATFORM: ${{ matrix.platform }}
         run: npm run verify:cutter
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: always()
         with:
           name: cutter-upstream-${{ matrix.platform }}

AGENTS.md

@@ -20,6 +20,8 @@ Give each interpretation and resource a clear owner. Consumers must use that own
 
 Keep proof of ownership separate from validity, editability, and readiness. Malformed owned data may still be safely removable. Unresolved identity or applicability must remain unknown rather than be treated as absent, foreign, or aligned.
 
+For lifecycle changes, follow [ownership and completion invariants](docs/tool-design.md#own-the-lifecycle) and select the applicable [lifecycle regressions](docs/testing.md#lifecycle-regressions). Include late handshakes, cancellation during final cleanup, mixed child outcomes, and cleanup retry where those stages exist; active-execution cancellation alone does not cover finalization.
+
 Assess brittleness in touched code during implementation, debugging, review, and maintenance. Fix the producing representation or ownership rule before adding downstream repairs. Normalize once at the owning boundary using format-aware parsers. Remove superseded representations, aliases, wrappers, and redundant tests after verifying affected consumers. Introduce abstractions only when they remove observed complexity.
 
 When fixing a bug, inspect the producing boundary and affected consumers for duplicated interpretation or unclear ownership. Complete any directly related refactor in the same change and remove superseded code. Passing regression tests alone does not establish that the brittleness is resolved. If related cleanup remains, explain what remains and why.

bridge/hopper_bridge.py

@@ -1057,6 +1057,10 @@ def _serve_connection(connection):
                 ):
                     raise PermissionError("Invalid bridge capability")
                 authenticated = True
+                # The connection grace period only bounds unauthenticated idle
+                # clients. Native analysis and a connected owner's idle time
+                # remain unbounded after capability validation.
+                connection.settimeout(None)
                 _write_message(file, {"id": request_id, "event": {
                     "type": "progress",
                     "phase": "hopper_bridge",
@@ -1148,13 +1152,17 @@ def _run():
     server.bind(REA_SOCKET)
     os.chmod(REA_SOCKET, 0o600)
     server.listen(1)
+    # A bridge can start after its caller's startup/cleanup deadline. Bound
+    # the first accept as well as reconnects so an orphan cannot pin Hopper's
+    # dedicated Python thread and prevent later documents from starting REA.
+    server.settimeout(REA_RECONNECT_TIMEOUT_SECONDS)
     try:
         while True:
             try:
                 connection, _ = server.accept()
             except socket.timeout:
                 break
-            connection.settimeout(None)
+            connection.settimeout(REA_RECONNECT_TIMEOUT_SECONDS)
             if _serve_connection(connection):
                 break
             # Match REA's cleanup handshake budget without pinning Hopper's

bridge/native/rea_lldb_tracer.py

@@ -555,6 +555,38 @@ def _failed_launch_description(process):
     return None
 
 
+def _retire_failed_launch(process, config, listener, stdout, stderr):
+    """Reconcile an SBProcess returned alongside a failed Launch error."""
+    if not process.IsValid():
+        stdout.close()
+        stderr.close()
+        return False
+
+    pid = process.GetProcessID()
+    if pid > 0:
+        # Even an already-exited process needs its PID published so the host
+        # can distinguish a completed launch failure from an unknown target.
+        with open(config["pid_path"], "w") as handle:
+            handle.write(str(pid))
+
+    if process.GetState() != lldb.eStateExited:
+        stdout.mark_launched()
+        stderr.mark_launched()
+        if pid > 0:
+            # Hold a surviving target until the host has captured its start
+            # identity. If that proof is unavailable, Kill still addresses
+            # this exact SBProcess created by the current launch request.
+            _wait_for_identity_ack(config)
+        process.Kill()
+        _wait_for_exit(listener, process, 5)
+
+    exit_observed = process.GetState() == lldb.eStateExited
+    expected_exit = exit_observed
+    stdout.close(expected_exit=expected_exit)
+    stderr.close(expected_exit=expected_exit)
+    return exit_observed
+
+
 def trace(debugger, config):
     global _TRACE_CONTEXT
     debugger.SetAsync(True)
@@ -630,8 +662,9 @@ def trace(debugger, config):
             )
         process = target.Launch(_launch_info(target, config, listener), error)
         if not error.Success() or not process.IsValid():
-            stdout.close()
-            stderr.close()
+            exit_observed = _retire_failed_launch(
+                process, config, listener, stdout, stderr
+            )
             return {
                 "status": "launch-error",
                 "error": error.GetCString(),
@@ -640,15 +673,26 @@ def trace(debugger, config):
                     if process.IsValid()
                     else {}
                 ),
+                **(
+                    {"target_process_exit_observed": True}
+                    if exit_observed
+                    else {}
+                ),
             }
         launch_failure = _failed_launch_description(process)
         if launch_failure is not None:
-            stdout.close(expected_exit=True)
-            stderr.close(expected_exit=True)
+            exit_observed = _retire_failed_launch(
+                process, config, listener, stdout, stderr
+            )
             return {
                 "status": "launch-error",
                 "error": launch_failure,
                 "target_process_created": True,
+                **(
+                    {"target_process_exit_observed": True}
+                    if exit_observed
+                    else {}
+                ),
             }
         stdout.mark_launched()
         stderr.mark_launched()

bridge/native/test_rea_lldb_tracer.py

@@ -15,6 +15,8 @@ fake_lldb = sys.modules.setdefault("lldb", types.ModuleType("lldb"))
 fake_lldb.LLDB_INVALID_ADDRESS = -1
 fake_lldb.eLaunchFlagDebug = 2
 fake_lldb.eLaunchFlagStopAtEntry = 4
+fake_lldb.eStateExited = 10
+fake_lldb.SBEvent = lambda: object()
 spec = importlib.util.spec_from_file_location(
     "rea_lldb_tracer", os.path.join(os.path.dirname(__file__), "rea_lldb_tracer.py")
 )
@@ -23,6 +25,136 @@ spec.loader.exec_module(tracer)
 
 
 class NativeTraceBudgetTests(unittest.TestCase):
+    def test_failed_launch_does_not_infer_exit_from_a_failed_kill(self):
+        class Process:
+            def IsValid(self):
+                return True
+
+            def GetProcessID(self):
+                return 12345
+
+            def GetState(self):
+                return 6
+
+            def Kill(self):
+                return None
+
+        class Sink:
+            close_exit = None
+
+            def mark_launched(self):
+                pass
+
+            def close(self, expected_exit=False):
+                self.close_exit = expected_exit
+
+        with tempfile.TemporaryDirectory() as directory:
+            stdout, stderr = Sink(), Sink()
+            with patch.object(tracer, "_wait_for_identity_ack", return_value="unavailable"), patch.object(
+                tracer, "_wait_for_exit", return_value=None
+            ):
+                exited = tracer._retire_failed_launch(
+                    Process(), {"pid_path": os.path.join(directory, "pid")}, object(), stdout, stderr
+                )
+        self.assertFalse(exited)
+        self.assertFalse(stdout.close_exit)
+        self.assertFalse(stderr.close_exit)
+
+    def test_failed_launch_publishes_pid_and_retires_live_process(self):
+        class Process:
+            state = 6
+            killed = False
+
+            def IsValid(self):
+                return True
+
+            def GetProcessID(self):
+                return 12345
+
+            def GetState(self):
+                return self.state
+
+            def Kill(self):
+                self.killed = True
+                self.state = tracer.lldb.eStateExited
+
+        class Sink:
+            launched = False
+            close_exit = None
+
+            def mark_launched(self):
+                self.launched = True
+
+            def close(self, expected_exit=False):
+                self.close_exit = expected_exit
+
+        with tempfile.TemporaryDirectory() as directory:
+            pid_path = os.path.join(directory, "pid")
+            process = Process()
+            stdout, stderr = Sink(), Sink()
+
+            def acknowledge(config):
+                with open(config["pid_path"], "r") as pid_file:
+                    self.assertEqual(pid_file.read(), "12345")
+                return "readable"
+
+            with patch.object(tracer, "_wait_for_identity_ack", acknowledge):
+                exited = tracer._retire_failed_launch(
+                    process,
+                    {"pid_path": pid_path},
+                    object(),
+                    stdout,
+                    stderr,
+                )
+
+        self.assertTrue(exited)
+        self.assertTrue(process.killed)
+        self.assertTrue(stdout.launched)
+        self.assertTrue(stderr.launched)
+        self.assertTrue(stdout.close_exit)
+        self.assertTrue(stderr.close_exit)
+
+    def test_failed_launch_records_when_valid_process_is_already_exited(self):
+        class Process:
+            def IsValid(self):
+                return True
+
+            def GetProcessID(self):
+                return 12345
+
+            def GetState(self):
+                return tracer.lldb.eStateExited
+
+            def Kill(self):
+                raise AssertionError("an exited process must not be killed")
+
+        class Sink:
+            close_exit = None
+
+            def mark_launched(self):
+                raise AssertionError("an exited process has no output to drain")
+
+            def close(self, expected_exit=False):
+                self.close_exit = expected_exit
+
+        with tempfile.TemporaryDirectory() as directory:
+            pid_path = os.path.join(directory, "pid")
+            stdout, stderr = Sink(), Sink()
+            with patch.object(
+                tracer,
+                "_wait_for_identity_ack",
+                side_effect=AssertionError("exit is already observed"),
+            ):
+                exited = tracer._retire_failed_launch(
+                    Process(), {"pid_path": pid_path}, object(), stdout, stderr
+                )
+            with open(pid_path, "r") as pid_file:
+                self.assertEqual(pid_file.read(), "12345")
+
+        self.assertTrue(exited)
+        self.assertTrue(stdout.close_exit)
+        self.assertTrue(stderr.close_exit)
+
     def test_pre_target_integrity_failure_reports_no_process_created(self):
         original_debugger = getattr(tracer.lldb, "SBDebugger", None)
 

docs/installation.md

@@ -635,6 +635,11 @@ bridge readiness. For large targets, set `REA_HOPPER_STARTUP_TIMEOUT_MS` to a
 decimal integer from 1 to 2,147,483,647 milliseconds in the environment that
 starts REA. CLI and MCP use the same setting; invalid values fail configuration
 validation. An MCP client's own request timeout must also allow enough time.
+`open_binary` validates and selects a target without waiting for native provider
+readiness. During Hopper startup, `binary_session.provider_operation_health`
+reports `busy` at stage `launch`; `analysis_activity` describes bridge requests
+and can remain idle until the socket is ready. Cleanup work reports `busy` at
+stage `connection`.
 
 If macOS denies Apple Events, allow the application that starts REA under
 **System Settings → Privacy & Security → Automation**, then retry. REA releases
@@ -644,9 +649,12 @@ Arguments containing quotes, backslashes, or line breaks remain unchanged but
 cannot establish that a failed handoff opened no document. Other failed handoffs
 retain ownership until document closure is confirmed. If a timed-out bridge
 becomes ready later, `close_binary` connects to that run, authenticates its
-identity, and requests document shutdown. After a connection drops, the bridge
-allows 30 seconds for an authenticated cleanup reconnect, then releases Hopper's
-Python execution thread. Expiry does not establish document closure, so REA
+identity, and requests document shutdown. Once its listener is ready, the bridge
+allows 30 seconds for the first connection and capability validation. After a
+connection drops, it allows the same grace period for an authenticated cleanup
+reconnect, then releases Hopper's Python execution thread. Initial analysis is
+outside this listener grace period, and authenticated native work is not bounded
+by it. Expiry does not establish document closure, so REA
 retains unconfirmed ownership. Retry close while the bridge remains available.
 
 If a Linux launcher exists but cannot start, inspect its shared libraries:
@@ -736,9 +744,17 @@ Once document and process closure are confirmed, the lease can be released even
 if temporary-file cleanup fails. Another client can then launch, but the owning
 client must finish its retained cleanup before starting again.
 An unconfirmed external document can be retried while its authenticated bridge
-remains connected. If that bridge has disconnected, another close cannot confirm
-the document: inspect and close the reported document in Hopper before ending
-the owning REA connection.
+remains available. The same authentication and process-identity capture apply
+when the first successful handshake occurs during cleanup after a startup
+timeout. REA can confirm closure if that exact authenticated process exits,
+including while a shutdown request is in flight. A helper exit alone is
+insufficient, and an application that never authenticated has no verified
+process identity. If no matching bridge becomes available, inspect and close
+the reported document in Hopper before ending the owning REA connection.
+Export the Evidence bundle before `close_binary` clears session records.
+`binary_session.cleanup_pending` remains true while provider cleanup is retained,
+and provider health remains visible even with `open: false`; that flag alone
+does not establish successful cleanup.
 
 ### Hopper in CI
 

docs/javascript-application-workflows.md

@@ -95,6 +95,14 @@ matches exactly. Otherwise the result recommends provider-neutral follow-up
 tools and reports `requires-provider-analysis`; it never starts or switches a
 provider implicitly.
 
+A handoff requires the add-on's exact content identity. Unavailable unpacked
+companions remain visible in the trace graph with their canonical path,
+availability and container-backed Evidence. They yield no actionable handoff
+until their bytes are available and the application is reanalyzed; the archive
+digest does not identify the missing add-on. An empty handoff list does not prove
+that the trace contains no native components. Source partial coverage remains
+visible independently of handoff eligibility.
+
 ## Semantic relation tracing
 
 `trace_javascript_semantics` queries the authenticated companion graph without

docs/kuna-provider.md

@@ -48,6 +48,7 @@ The first text or assembly request in a session looks for this target's export i
   - REA starts `kuna decompile-project` in the background on a private copy of the target.
   - Meanwhile, pseudocode comes from one `kuna decompile --addr` run. Name and address lookups, and listings, use the inventory the export takes with `kuna functions --json` before it decompiles. The session runs `kuna functions` itself, under `REA_KUNA_TIMEOUT_MS`, only when no export is building (an inventory-only request does not start one) or the export ends without an inventory.
   - Requests for the same function share one run; it stops when its last waiting request is cancelled. Each run analyzes the whole image again in its own process, so one REA process runs at most as many at once as the host has cores beyond `REA_KUNA_JOBS` (at least one). Further requests wait in order, and a waiting request is answered from the export if it finishes first. A run whose stop REA cannot prove keeps its slot until `close_binary` proves it stopped.
+  - The session keeps each completed single-function text, up to 16 MiB in all with the least recently used dropped first, and answers repeats from it until the export can. After a failed export that lasts for the session.
   - Assembly and data names wait for the export; progress notifications report the wait every ten seconds. A session does not rebuild a failed export: requests that need it fail with `retryable: false`, the export's failure, its captured Kuna output and what to change before reopening the target. A setting such as `REA_KUNA_PROJECT_TIMEOUT_MS` or `REA_KUNA_JOBS` is read when REA starts, so changing it also needs a restart. Pseudocode keeps using single-function runs.
   - A single-function answer says so in its limitations. It lacks the export's whole-program prototypes, so a later request can return different text for the same function.
 

docs/mcp-contracts.md

@@ -402,6 +402,13 @@ is `unavailable` with a reason when ownership could not be revalidated, or
 at that bounded check. These are historical snapshots, not live process
 inventories, and do not claim that no short-lived descendant existed.
 
+`binary_session.cleanup_pending` reports whether the session retains a provider
+client whose cleanup has not succeeded. It can be true with `open: false`;
+target retirement does not establish resource release. Health, activity, and
+lineage remain available from that retained client where the provider supplies
+them. Follow the cleanup error's reported resources and recovery action before
+reopening; a missing health observation does not establish an idle provider.
+
 ## Progress and cancellation
 
 REA accepts ordinary `tools/call` progress tokens. The numeric `progress` counts
@@ -428,6 +435,10 @@ Native call tracing and process capture retain available observations in
 `details.partial_observation` on failure, including when cleanup succeeds.
 The observation reports its partial coverage; cleanup details describe host
 state separately from the execution failure.
+For these tools, cancellation observed during result finalization or owned
+cleanup also returns typed cancellation with the available observations.
+A normal target exit does not establish request completion. Incomplete cleanup
+still takes precedence and retains its resource diagnostics.
 A process capture that fails during a finalization interval keeps every signal
 attempt and its delivery result in `details.partial_observation`, with
 `elapsed_ms` and `exit_code` null when no exit was observed.
@@ -694,6 +705,20 @@ after SDK conversion and check advertised validation and actual calls.
 Individual model APIs can impose additional nesting limits; complete producer
 captures can exceed ten structural levels.
 
+Boolean literal constraints in input schemas are relaxed only in this
+advertisement. For example, a boolean `const` is presented as `type: boolean`;
+an affected `not` is omitted, conditional predicates and their branches are
+omitted together, pure boolean-literal `oneOf` branches collapse to a boolean,
+and other affected `oneOf` branches are presented as `anyOf` to retain branch
+guidance without making overlapping widened branches reject inputs.
+This can make the advertised schema accept inputs the canonical contract
+rejects. The MCP handler still validates every call with the canonical
+contract. The Gemini CLI verifier checks the outgoing
+`parametersJsonSchema` and canonical contract examples against that declaration
+using a loopback model fixture; it does not establish live Google API or
+OpenCode client behavior. Set `REA_VERIFY_GEMINI_SCHEMA_PROFILE=compact` to
+verify the compact advertisement through the same client boundary.
+
 ### Compact input schema profile
 
 Some function-calling providers reject a request while any single tool's

docs/native-investigation.md

@@ -451,6 +451,11 @@ The run ends when the process exits, `max_events` entries are recorded,
 Bounded termination reports partial coverage. REA checks process termination
 using a launch-time OS start identity; if ownership or cleanup cannot be
 verified, the result or error preserves that uncertainty. The result reports:
+Launch errors keep the fact that LLDB created a process separate from whether
+it remains alive. An exited `SBProcess` is reported as exited only after LLDB
+confirms that state; unresolved ownership remains retained for cleanup retry.
+Cancellation observed while output and Evidence are finalized returns partial
+cancellation Evidence, even if the target has already exited.
 
 - the outcome, exit status and captured stdout/stderr (1 MiB kept per stream
   while excess bytes are drained and counted without growing capture files).

docs/process-capture.md

@@ -425,7 +425,9 @@ results for unaffected dimensions and mark affected dimensions unknown; an
 incomplete capture cannot locate the first divergence across all dimensions.
 Trace assertions use coverage for the sources they select, so an assertion
 about complete raw terminal output need not fail because rendered snapshots
-were omitted. Captures missing `truncation_details` are rejected on import;
+were omitted. A trace difference applies to the dimensions identified by its
+diagnostic; unrelated dimensions retain their own comparison, including unknown
+coverage. Captures missing `truncation_details` are rejected on import;
 preserve them as historical files and recapture for current comparisons.
 `limits.file_bytes` is already the cumulative whole-file hashing budget,
 independent of `limits.output_bytes`, which bounds retained terminal content.

docs/sqlite-databases.md

@@ -105,6 +105,14 @@ overall native heap and total resident memory are not capped. Row limits do not
 override these byte and resource limits. Resource-limit failures do not return
 an incomplete schema as successful complete evidence.
 
+If the combined database and WAL exceed the snapshot budget, the refusal is a
+`resource_constraint` and reports both the configured byte limit and the exact
+observed combined size as a decimal string. The remediation directs callers to
+create a smaller consistent offline snapshot containing only relevant data
+through the application's supported export workflow. A generic backup or copy
+does not guarantee a smaller result; REA does not truncate or modify the
+selected source.
+
 MCP also applies its configured response budget to the complete Evidence
 envelope. If delivery exceeds that budget, it reports a transport constraint
 with guidance for exporting retained Evidence, requesting a matching larger

docs/testing.md

@@ -199,6 +199,44 @@ Measure slow cases before pruning capacity coverage. Retain inputs beyond the
 formerly failing size/depth and distinguish cold runs, warm builds, coverage,
 and toolchain conditions when comparing timings.
 
+## Lifecycle regressions
+
+For changes to resource acquisition, readiness, cancellation, or cleanup, select
+the affected owners and applicable scenarios below. Include temporary snapshots
+and one-shot commands. Use public CLI/MCP workflows where practical and a
+controlled production seam for interleavings that cannot be reproduced reliably.
+
+| Scenario                                                                                | Assertion and control                                                                                                                                                                                                          |
+| --------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| Target admitted; startup still pending                                                  | Status preserves the readiness distinction and observed startup activity; readiness requires the provider's documented proof.                                                                                                  |
+| First handshake is late, absent, invalid, or recovered during close                     | Initial and recovery paths retain the same authenticated identity facts. Foreign run/token controls cannot authorize cleanup; authenticated idle/native work survives the unauthenticated listener deadline.                   |
+| Launch returns an error with a valid process handle                                     | Cover already-exited and still-live owned processes. Verify observed exit separately from creation; failed termination or unavailable identity remains unresolved.                                                             |
+| Cancellation arrives after workload exit, during result reads or temporary-root removal | Return typed cancellation with available partial observations and actual cleanup status. The non-aborted control succeeds; existing primary/cleanup failures keep their precedence.                                            |
+| Children have mixed health or cleanup outcomes                                          | Missing peer health does not erase an observed failure or activity. Idle plus unknown stays unknown. Retry a failed child without closing a successful peer again, including after a close-option change.                      |
+| Cleanup fails after success or primary failure                                          | Public output retains the completed observation or primary diagnostic, remaining resources, and owner recovery action. Restore the denied resource and verify the owning cleanup retry.                                        |
+| Target exits without an acknowledgement, or transport disappears while it stays alive   | Positive owned exit proof resolves target lifetime; other resources still need cleanup. Lost transport alone does not prove exit. Verify unrelated/attached targets survive and same-connection recovery works when supported. |
+
+Synchronize cancellation with the finalization boundary being tested; a fixed
+delay after dispatch does not establish that phase. Use markers, barriers, or
+owned cleanup seams while preserving real cleanup where feasible. Check server
+settlement and retained resources even if the MCP SDK rejects the client promise
+before the handler finishes. A cancellation during active execution does not
+cover cancellation during final cleanup.
+
+For atomic writes, exercise cancellation on both sides of the documented commit
+point and preserve any publication receipt. A late interruption does not prove
+that no output was published.
+
+Representative regressions include
+[process cleanup-time SIGINT](https://github.com/morluto/rea/blob/e78455338fe2d06c4cd03d59cbf33473d754998b/tests/boundary/process/processCaptureCancellationAdapters.test.ts),
+[late authenticated cleanup](https://github.com/morluto/rea/blob/e78455338fe2d06c4cd03d59cbf33473d754998b/tests/boundary/providers/hopper/hopperClient.handshakeRecovery.test.ts),
+[LLDB launch and finalization](https://github.com/morluto/rea/blob/e78455338fe2d06c4cd03d59cbf33473d754998b/tests/boundary/providers/native/lldbCallTracerFailures.test.ts),
+[composed child ownership](https://github.com/morluto/rea/blob/e78455338fe2d06c4cd03d59cbf33473d754998b/src/application/binary/CompositeProvider.test.ts),
+and [public CLI cleanup denial](https://github.com/morluto/rea/blob/e78455338fe2d06c4cd03d59cbf33473d754998b/tests/boundary/cli/wasmCleanupCli.test.ts).
+These controlled probes do not replace the matching real-provider lane. Record
+the base failure, passing control, exact host/provider, verified cleanup, and
+unavailable coverage; a missing engine is not a pass.
+
 ## Behavioral depths
 
 | Depth        | Location                | What it proves                                                                                        |
@@ -989,7 +1027,19 @@ the Apple or Windows curated lanes invoke explicitly, which also select that
 lane. Edits to verifier entrypoints run only by manual, licensed or self-hosted
 workflows run static checks and the Linux suite. Website changes run website
 checks. Provider workflow changes validate the workflow and run that provider's
-verifier. Manual-provider/Android workflow changes run workflow validation only.
+verifier. Changes under `bridge/ghidra/` also select the `ghidra_bridge` lane,
+which compiles the packaged bridge sources against the pinned Ghidra 12.1.4
+jars with `npm run verify:ghidra:bridge-sources`. It never launches Ghidra or
+imports a target, so a missing import fails the PR instead of every Ghidra
+session. The launcher, compiler and package checks share named required source
+roles. The manifest must match the complete Java cohort, so deleting a helper
+or adding an unregistered dependency cannot silently change the shipped set.
+The preflight reuses the provider's Java Properties parser with the pinned Node
+toolchain's native type stripping, without an npm install or runtime build.
+The shared release policy owns the verified version and JDK major. CI checks
+the archive pin before downloading and verifies the extracted SDK version;
+changes to these source owners also select the compile lane.
+Manual-provider/Android workflow changes run workflow validation only.
 The four-version SQLite compatibility matrix has its own `sqlite` scope for
 SQLite implementation, contracts, CLI/MCP registration, fixtures, and shared
 runtime boundaries. SQLite and server-lifecycle test edits and the SQLite npm

docs/tool-design.md

@@ -68,6 +68,45 @@ satisfy. A plan without execution does not establish runtime behavior.
   constraints. Report pagination, truncation, cancellation, and partial failure.
   An assumed agent budget is insufficient justification for a limit.
 
+## Own the lifecycle
+
+For tools that acquire resources, identify the owner and the observations that
+establish each transition. Include temporary files and one-shot commands, as
+well as persistent engine sessions. Use the existing provider contracts;
+providers need not expose identical state machines.
+
+- Keep target admission, provider readiness, active work, observed process exit,
+  and resource release separate. A valid process handle, successful launcher,
+  or selected target establishes only its own fact. Publish available identity
+  and exit observations even when launch fails; retain unknown ownership.
+- Authenticate and capture identity through the same boundary on initial and
+  recovery handshakes. Bound abandoned unauthenticated listeners where the
+  protocol permits it; that deadline must not expire authenticated idle sessions
+  or long-running native work. Listener expiry does not prove target closure.
+- For cancellable observations, carry cancellation through result consumption
+  and awaited cleanup. Before returning success, check the signal after the
+  last awaited finalization step.
+  Retain collected observations under typed cancellation. Preserve an existing
+  primary failure and let incomplete cleanup retain its own classification.
+  Client cancellation alone does not prove native work stopped.
+  For atomic publication, document the cancellation cutoff and preserve any
+  committed output's publication receipt.
+- Release only owned resources. Attaching owns a connection or session unless
+  the provider contract explicitly establishes target ownership. A helper exit,
+  missing reply, or missing PID does not establish target exit.
+- Retain successful child cleanup and retry only unresolved children, including
+  when close options change. Preserve observed child failure or activity when
+  another child's health is unavailable; idle plus missing coverage stays
+  unknown.
+- Await one-shot cleanup without discarding the completed result or primary
+  diagnostic. Preserve partial observations, remaining resources, and the cleanup
+  owner's recovery instructions. CLI adapters should reuse
+  [`finishAnalysisCommand`](https://github.com/morluto/rea/blob/main/src/cli/finishAnalysisCommand.ts) where its contract
+  applies rather than duplicate close/finally handling.
+
+Exercise the applicable [lifecycle regression scenarios](testing.md#lifecycle-regressions)
+through the producing owner and affected CLI/MCP consumers.
+
 ## Implement and evaluate
 
 Put provider protocols/parsing in adapters and shared CLI/MCP workflows in the

docs/verification/javascript-native-handoff-identity-2026-10-15.md

@@ -0,0 +1,179 @@
+# Native handoff byte-identity verification
+
+Tracks #3926 under #4027. Baseline: `9f8659e0536e4e50a438f5b9d5661f3c9624f6ac`.
+Final integration base: `62bf09809ef7bb224028916424f8f07652a20f4f`.
+
+The analyst already knows an ASAR-relative native path and supplies prior native
+Evidence. The question is which Evidence can be linked to that component's exact
+bytes. Discovery and native-provider execution are outside this task.
+
+## Observed behavior and correction
+
+The native-node producer distinguishes a content digest from a canonical path
+whose bytes are unavailable. Its unavailable observation legitimately cites the
+containing archive. The handoff consumer previously treated that supporting
+artifact digest as the native component's digest.
+
+Public CLI/stdio MCP regression: the missing-companion case failed and the
+available-byte control passed. Real Joplin reproduced the same result: missing
+keytar bytes produced an `evidence-linked` handoff with the ASAR digest and the
+simulated container observation. CLI/MCP agreed on that incorrect answer.
+
+The consumer now uses only the node owner's content-digest identity. The fallback
+observation scan is removed. Unavailable native nodes retain their canonical
+path, availability, container-backed provenance and partial coverage in the
+inline graph; they yield no false actionable handoff or native Evidence link.
+An empty handoff list describes eligibility, not absence of native components.
+The per-query node index is allocated only after an eligible target exists; no
+persistent cache, schema, tool or target authority is added.
+
+Final real checks passed both cases with exact CLI/MCP trace parity. The available
+control preserved the complete parent/trace Evidence IDs, native facts, links,
+coverage and all token projections. The missing control preserved its parent,
+native node, source provenance and coverage, while removing the wrong handoff
+and container Evidence link.
+
+## Real input and scope
+
+[Official Joplin v3.7.21 Linux AppImage](https://github.com/laurent22/joplin/releases/download/v3.7.21/Joplin-3.7.21.AppImage),
+published 2026-09-25, 201,462,481 bytes, SHA-256
+`5d202dcaca31e14206826aa3f04125e7c218dbc3dc3d98479d811efbd6b856c1`.
+
+Read-only 7z 26.02 inspection found 6,324 ASAR files, 46 unpacked entries and
+three `.node` components. Extract only the ASAR and those three binaries:
+
+```sh
+input_root="$(mktemp -d -t rea-native-handoff-XXXXXX)"
+curl --fail --location --output "$input_root/Joplin-3.7.21.AppImage" \
+  https://github.com/laurent22/joplin/releases/download/v3.7.21/Joplin-3.7.21.AppImage
+sha256sum "$input_root/Joplin-3.7.21.AppImage"
+7z x -mmt=1 "-o$input_root/extracted" "$input_root/Joplin-3.7.21.AppImage" \
+  resources/app.asar \
+  resources/app.asar.unpacked/node_modules/keytar/build/Release/keytar.node \
+  resources/app.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-linux-glibc-x64/node_sqlite3.node \
+  resources/app.asar.unpacked/node_modules/onnxruntime-node/bin/napi-v6/linux/x64/onnxruntime_binding.node
+python3 - "$input_root" <<'PY'
+import os, sys
+from pathlib import Path
+root = Path(sys.argv[1])
+source = root / 'extracted/resources'
+for mode in ('available', 'missing'):
+    case = root / 'cases' / mode
+    case.mkdir(parents=True)
+    os.link(source / 'app.asar', case / 'app.asar')
+    if mode == 'available':
+        for native in (source / 'app.asar.unpacked').rglob('*.node'):
+            target = case / native.relative_to(source)
+            target.parent.mkdir(parents=True, exist_ok=True)
+            os.link(native, target)
+PY
+```
+
+Verify the asset digest above before extraction. The ASAR is 233,575,014 bytes,
+SHA-256 `767df409b18effe60421fbefcca873de237c7e813eac744ecdeebbc5e825a33a`.
+Keytar is 76,960 bytes, SHA-256
+`0700016bcd761cbe02d275f2046c7cc42f39f730a50d66e3d3307aa9d413373a`.
+All extracted component hashes are in the JSON record. 7z reported one
+trailing-data warning for the AppImage's embedded SquashFS and exited 0.
+
+Both cases select only `package.json` for static source analysis while retaining
+the inventory. The available case stages all three native companions; the other
+43 unpacked entries are not staged. The missing case stages none. Whole-application
+coverage is therefore partial in both cases, independently of the selected
+native component's known or unknown byte identity. Neither the application nor
+a native analysis provider is executed. Native Evidence is explicitly simulated
+to test exact subject linkage. Live Electron, real Ghidra/Hopper/IDA behavior and
+Windows/macOS verification are **NOT_ENOUGH_INFO**.
+
+## Reproduce the public workflow
+
+Use pinned Node 24.18.0/npm 11.16.0, `npm ci`, then `npm run build:cached`.
+The verifier returns compact records and deletes its private exported parent and
+CLI input after owned cleanup. No downloadable application or large Evidence is
+archived.
+
+```sh
+for mode in available missing; do
+  node scripts/verify/javascript/native-handoffs.mjs \
+    --artifact "$input_root/cases/$mode/app.asar" \
+    --addon-path node_modules/keytar/build/Release/keytar.node \
+    --native-sha256 0700016bcd761cbe02d275f2046c7cc42f39f730a50d66e3d3307aa9d413373a \
+    --source-path package.json --rounds 3 --cli-parity --require-safe
+done
+```
+
+Add `--tokenizer-python /absolute/path/to/python-with-tiktoken-0.12.0` for the
+reported BPE projections. The npm alias `verify:javascript:native-handoffs`
+builds first; recorded costs use the direct Node invocation above after building.
+For a pre-fix observation, run the saved verifier on the baseline build without
+`--require-safe`; `safe_identity: false` is an incorrect answer, not a passing
+analyst task. Paths affect serialized requests and some Evidence identities.
+
+The exact resource runs additionally used the preserved
+[8 GiB observer](https://github.com/morluto/rea/blob/b3bdabab694af1f9801eff7caf75001b92314a58/experiments/analysis-efficiency/resource-run.py)
+and adjacent `resource_payload.py`; both hashes are pinned in the JSON.
+
+## Completed workflow costs and limits
+
+| Case                   | Revision |  Wall s |      CPU s | Peak cgroup bytes | Identity oracle            |
+| ---------------------- | -------- | ------: | ---------: | ----------------: | -------------------------- |
+| Native bytes available | Before   |  60.369 |  59.806670 |     2,662,629,376 | pass                       |
+| Native bytes available | After    | 258.885 | 106.221003 |     2,678,456,320 | pass, exact baseline facts |
+| Native bytes missing   | Before   |  57.930 |  57.479109 |     2,719,457,280 | wrong identity/linkage     |
+| Native bytes missing   | After    |  59.738 |  59.254776 |     2,571,235,328 | pass, unknown retained     |
+
+Whole-verifier resources include input hashing, analysis, three retained trace
+queries, export, CLI parity and tokenization. One CPU, 8 GiB hard cap, 6 GiB early
+stop, no swap; cleanup verified and no OOM. Memory includes charged file cache,
+not summed RSS. Counters are at payload exit while the observer remains alive.
+The available control's final wall and CPU times are substantially higher than
+baseline. Earlier post-fix controls on the original base took 61.657/74.956 s wall
+and 61.135962/60.352428 s CPU for available/missing cases; their complete receipts
+remain separately recorded. The final missing case took 59.738 s wall. This
+variability is unresolved and cannot be attributed to the native consumer change.
+These runs establish neither speedup nor performance equivalence. Input hashing warms the ASAR
+cache, build/OS caches and shared-host scheduling are uncontrolled. Fresh MCP
+sessions do not establish OS-cold conditions. First post-analysis and repeated
+warm-query samples are preserved separately; query CPU/memory are unmeasured.
+
+One defined task is one analysis summary plus one retained trace, with the path
+and prior Evidence already supplied. Static `cl100k_base`/tiktoken 0.12.0 counts
+include both requests, replies and name/description/inputSchema contracts:
+
+| Available-byte task, unchanged before/after     | BPE tokens |
+| ----------------------------------------------- | ---------: |
+| Selected catalog + structured replies           |     12,340 |
+| Selected catalog + complete tool replies        |     18,906 |
+| Full catalog projection + structured replies    |    202,292 |
+| Full catalog projection + complete tool replies |    208,858 |
+
+These are alternative reply/catalog projections. The selected catalog alone is
+5,570 BPE; the full projection is 195,522. Output schemas, annotations, host
+rendering/replay, reasoning, final answers and model billing are unmeasured.
+Repeated queries/export/CLI/tokenization are validation overhead outside this
+one-task token count, but inside resource receipts. Missing-case structured-task
+counts change 11,372 → 11,103 by removing unsupported claims; the incorrect
+baseline earns no efficiency credit.
+
+## Regression and verification record
+
+The initial four-file focused selection passed 24 tests. The two public cases
+were rerun after adding named summary-result parsing and correcting an optional
+architecture factory input. Omitting that field instead of passing null produced
+byte-identical normalized simulated Evidence in all four real-case inputs.
+The initial CLI-selector harness error and first typecheck failure are retained
+as harness/validation attempts, not product reproductions.
+
+After syncing the reviewed upstream changes, the updated application workflow
+CLI acceptance file passed 34 tests, bringing the focused selection to 58 distinct
+cases across five files. Both Joplin controls were then repeated on the final
+integration base. Canonical byte identity is also used by the related version
+matching/content comparison consumers; no equivalent observation-digest fallback
+was found there.
+
+Final `npm run check && npm run docs:check` passed on the integration base,
+including five documentation consistency tests: 128.732 s wall, 115.518920 s CPU,
+4,301,684,736 B peak cgroup memory, clean owned exit and no OOM.
+
+Final public and static/docs outcomes are recorded in the
+[compact measurements and source pins](javascript-native-handoff-identity-2026-10-15.json).

knip.json

@@ -10,7 +10,6 @@
     "scripts/verify/fridaBindingsCompatibility.ts",
     "scripts/verify/termux/browser.mjs",
     "scripts/verify-real-ghidra-noreturn.mjs",
-    "scripts/run-exact-tests.mjs",
     "tests/processOwnershipRunner.ts"
   ],
   "project": ["src/**/*.ts", "tests/**/*.ts", "scripts/**/*.mjs"],

native/windows/README.md

@@ -111,9 +111,14 @@ automatically. Alternatively, build it using the Linux/MinGW lane above.
 - Cleanup walks locked directory objects, removes files by handle, and unlinks
   reparse entries without traversing their targets. Failed removal retains the
   root and ancestor leases for retry; a partially removed runtime accepts only
-  cleanup, and its registry entry remains until removal succeeds. The owned root
-  handle includes attribute-write access so cleanup can clear a read-only marker,
-  matching the child cleanup handles. Normal close, cancellation,
+  cleanup, and its registry entry remains until removal succeeds. The runtime
+  owner retries only native close failures with Win32 sharing/lock codes 32/33,
+  for at most ten attempts with a 100 ms delay between attempts. Other native
+  errors are returned immediately; exhausting the retry budget preserves the
+  runtime owner for a later explicit close. These cleanup retries do not use an
+  analysis cancellation signal and schedule up to 900 ms of backoff, in
+  addition to native cleanup time. The owned root handle includes attribute-write access so cleanup can clear a
+  read-only marker, matching the child cleanup handles. Normal close, cancellation,
   startup failure, and timeout release provider resources. Abrupt owner death
   kills the owned job. The Android provider additionally uses a detached helper
   that owns its private runtime directory and cleans it when the owner pipe
@@ -133,7 +138,9 @@ text do not establish a safe retry. Analysis errors propagate the producer's
 retry disposition through JavaScript, source-map and WABT workflows; transient
 failures report `category: unavailable` and retain the original reason.
 Incomplete cleanup blocks an operation retry until its owned resources settle.
-REA adds no automatic retry loop or new analysis cache for this behavior.
+The close-stage retry is separate from allocation and analysis retries: it
+repeats only the existing owned cleanup operation, and does not retry provider
+work or create another runtime.
 
 Ordinary drive-absolute paths accept backslashes, forward slashes, or mixed
 separators. File identity retains the original requested spelling. Separator

package.json

@@ -214,6 +214,7 @@
     "verify:javascript:digests": "npm run build:cached && node scripts/verify/javascript/digests.mjs",
     "verify:javascript:output": "npm run build:cached && node scripts/verify/javascript/output.mjs",
     "verify:javascript:module-references": "npm run build:cached && node scripts/verify/javascript/module-references.mjs",
+    "verify:javascript:native-handoffs": "npm run build:cached && node scripts/verify/javascript/native-handoffs.mjs",
     "verify:application-workflows": "npm run build:cached && node scripts/verify/javascript/application-workflows.mjs",
     "verify:managed": "npm run build:cached && node scripts/verify/managed/conformance.mjs",
     "verify:firmware": "npm run build:cached && node scripts/verify/firmware/analysis.mjs",
@@ -272,6 +273,7 @@
     "verify:windows-native": "node scripts/verify-windows-native.mjs",
     "verify:ghidra:windows:package": "node scripts/verify-packaged-ghidra-windows.mjs",
     "build:ghidra:nativeaot": "node scripts/build-ghidra-nativeaot.mjs",
+    "verify:ghidra:bridge-sources": "node scripts/verify-ghidra-bridge-sources.mjs",
     "build:fixtures:nativeaot": "node scripts/generate-nativeaot-fixtures.mjs",
     "verify:ghidra:nativeaot": "npm run build:cached && node scripts/verify-real-ghidra-nativeaot.mjs",
     "verify:browser:scripts": "npm run build:cached && node scripts/verify-browser-scripts.mjs",

scripts/build-ghidra-nativeaot.mjs

@@ -157,7 +157,7 @@ function propertyValue(content, name) {
   return null;
 }
 
-/** Same 12.1 line as GhidraInstallationPolicy, including a distro suffix. */
+/** Release line supported by the separately pinned NativeAOT integration. */
 function ghidraReleaseLineAccepted(raw) {
   const match = /^(\d+)\.(\d+)(?:\.(\d+))?([-+].*)?$/u.exec(raw ?? "");
   return match !== null && Number(match[1]) === 12 && Number(match[2]) === 1;

scripts/ci/scopes.mjs

@@ -104,6 +104,7 @@ export const SCOPES = {
     "tests/boundary/filesystem/npmRelease.test.ts",
     "tests/boundary/process/releaseArtifactCanary.test.ts",
     "src/windows/**",
+    "src/ghidra/GhidraBridgeSources.ts",
     "native/windows/**",
     "src/process/capture/FilesystemSnapshot.ts",
     "src/process/capture/FilesystemSnapshot.test.ts",
@@ -436,6 +437,14 @@ export const SCOPES = {
     "tests/fixtures/nativeaot/**",
     ".github/workflows/nativeaot-fixtures.yml",
   ],
+  ghidra_bridge: [
+    "bridge/ghidra/**",
+    "src/ghidra/GhidraBridgeSources.ts",
+    "src/ghidra/GhidraJavaProperties.ts",
+    "src/ghidra/GhidraReleasePolicy.ts",
+    "scripts/verify-ghidra-bridge-sources.mjs",
+    ".github/workflows/ghidra-bridge-sources.yml",
+  ],
   website: [
     "website/**",
     "scripts/*website*.py",

scripts/lib/test-projects.mjs

@@ -17,7 +17,7 @@ export const SOURCE_TEST_PROJECTS = [
     group: "source",
     include: [
       "src/*.test.ts",
-      "src/{apktool,jeb,adb,artifacts,browser,dotnet,electron,evm,firmware,flutter,pcap,ghidra,go,hopper,ida,inspector,javascript,native,process,reference,rust,server,wasm,windows}/**/*.test.ts",
+      "src/{apktool,jeb,adb,artifacts,browser,dotnet,electron,evm,firmware,flutter,pcap,ghidra,go,hopper,ida,inspector,javascript,native,process,reference,rust,server,sqlite,wasm,windows}/**/*.test.ts",
     ],
   },
   {

scripts/verify-gemini-client.mjs

@@ -5,6 +5,11 @@ import { tmpdir } from "node:os";
 import { join, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
 import Ajv2020 from "ajv/dist/2020.js";
+import {
+  schemaArrays,
+  schemaChildren,
+  schemaMaps,
+} from "../dist/contracts/inputSchemaPresentation.js";
 import {
   TOOL_CONTRACTS,
   toolContract,
@@ -17,6 +22,8 @@ const repo = fileURLToPath(new URL("..", import.meta.url));
 const runtimeRoot = process.env.REA_VERIFY_RUNTIME_ROOT ?? repo;
 const command = process.env.REA_VERIFY_GEMINI_COMMAND ?? "gemini";
 const mode = process.argv[2] ?? "call";
+const schemaProfile = process.env.REA_VERIFY_GEMINI_SCHEMA_PROFILE ?? "full";
+assert(["full", "compact"].includes(schemaProfile));
 // npm installs of Gemini CLI provide a JavaScript entry point; on Windows only a gemini.cmd shim reaches
 // PATH, which Node does not spawn without a shell, so a selected .js entry runs under this Node. It is
 // resolved once, because the preflight runs from the caller's directory and the client from the workspace.
@@ -60,6 +67,7 @@ const environment = {
   GEMINI_CLI_NO_RELAUNCH: "1",
   GEMINI_CLI_TRUST_WORKSPACE: "true",
   REA_PROCESS_RUN_ID: verifier.run_id,
+  REA_MCP_INPUT_SCHEMA_PROFILE: schemaProfile,
 };
 let clientVersion;
 try {
@@ -161,8 +169,43 @@ let skillRequested = false;
 let finalSeen = false;
 let catalogSize = 0;
 let schemasChecked = 0;
+let examplesChecked = 0;
 let artifactDigest;
 const schemaValidator = new Ajv2020({ strict: false, validateFormats: false });
+const booleanLiteralPath = (schema, path = "$", seen = new Set()) => {
+  if (!schema || typeof schema !== "object" || seen.has(schema))
+    return undefined;
+  seen.add(schema);
+  for (const [key, child] of Object.entries(schema)) {
+    const childPath = `${path}.${key}`;
+    if (key === "const" && typeof child === "boolean") return childPath;
+    if (
+      key === "enum" &&
+      Array.isArray(child) &&
+      child.some((item) => typeof item === "boolean")
+    )
+      return childPath;
+    const schemaChildrenAtKey =
+      schemaMaps.has(key) &&
+      child &&
+      typeof child === "object" &&
+      !Array.isArray(child)
+        ? Object.entries(child).map(([name, item]) => [
+            `${childPath}.${name}`,
+            item,
+          ])
+        : schemaArrays.has(key) && Array.isArray(child)
+          ? child.map((item, index) => [`${childPath}[${index}]`, item])
+          : schemaChildren.has(key)
+            ? [[childPath, child]]
+            : [];
+    for (const [nestedPath, nested] of schemaChildrenAtKey) {
+      const found = booleanLiteralPath(nested, nestedPath, seen);
+      if (found !== undefined) return found;
+    }
+  }
+  return undefined;
+};
 const extractEvidence = (value) => {
   if (typeof value === "string") {
     if (
@@ -226,6 +269,22 @@ const fixture = await createGeminiModelFixture({
           schemaValidator.validateSchema(tool.parametersJsonSchema),
           `${tool.name}: invalid advertised JSON Schema: ${JSON.stringify(schemaValidator.errors)}`,
         );
+        const booleanLiteral = booleanLiteralPath(tool.parametersJsonSchema);
+        assert.equal(
+          booleanLiteral,
+          undefined,
+          `${tool.name}: Gemini SDK declaration retains a boolean const/enum at ${booleanLiteral}`,
+        );
+        const name = tool.name.slice(prefix.length);
+        const contract = toolContract(name);
+        const validate = schemaValidator.compile(tool.parametersJsonSchema);
+        for (const example of contract.examples) {
+          assert(
+            validate(example.input),
+            `${tool.name}: Gemini SDK declaration rejects canonical example ${example.title}: ${JSON.stringify(schemaValidator.errors)}`,
+          );
+          examplesChecked++;
+        }
         schemasChecked++;
       }
     }
@@ -356,6 +415,9 @@ try {
     client: "Gemini CLI",
     clientVersion,
     mode,
+    schemaProfile,
+    schemasChecked,
+    examplesChecked,
     passed: failure === undefined,
     artifacts: lab,
     runtimeRoot,

scripts/verify-ghidra-bridge-sources.mjs

@@ -0,0 +1,182 @@
+#!/usr/bin/env node
+// Compile the packaged Ghidra bridge sources against an existing Ghidra
+// installation's jars. Ghidra's script provider compiles the whole bridge
+// directory when a session starts, so one unresolved symbol disables every
+// operation and surfaces only after import and auto-analysis. This check
+// reports the same javac diagnostics without launching Ghidra or selecting,
+// importing or executing a target.
+import { spawnSync } from "node:child_process";
+import { mkdtemp, readdir, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { dirname, join, relative, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+// The pinned Node toolchain strips types from these dependency-free owners;
+// this preflight therefore uses runtime facts without needing npm ci or a build.
+import { GHIDRA_BRIDGE_SOURCES } from "../src/ghidra/GhidraBridgeSources.ts";
+import { parseGhidraJavaProperties } from "../src/ghidra/GhidraJavaProperties.ts";
+import {
+  SUPPORTED_GHIDRA_VERSION,
+  SUPPORTED_GHIDRA_JAVA_MAJOR,
+  ghidraReleaseAccepted,
+  ghidraReleaseLine,
+} from "../src/ghidra/GhidraReleasePolicy.ts";
+
+const args = process.argv.slice(2);
+if (
+  args.length > 1 ||
+  (args.length === 1 &&
+    !["--check-sdk-pin", "--verified-sdk"].includes(args[0]))
+)
+  fail(
+    "Usage: verify-ghidra-bridge-sources.mjs [--check-sdk-pin|--verified-sdk]",
+  );
+if (args[0] === "--check-sdk-pin") {
+  let url;
+  try {
+    url = new URL(process.env.GHIDRA_RELEASE_URL);
+  } catch {
+    fail("GHIDRA_RELEASE_URL must name the checksum-pinned official release");
+  }
+  const prefix = `/NationalSecurityAgency/ghidra/releases/download/Ghidra_${SUPPORTED_GHIDRA_VERSION}_build/ghidra_${SUPPORTED_GHIDRA_VERSION}_PUBLIC_`;
+  if (
+    url.origin !== "https://github.com" ||
+    url.username ||
+    url.password ||
+    url.search ||
+    url.hash ||
+    !url.pathname.startsWith(prefix) ||
+    !url.pathname.endsWith(".zip") ||
+    !/^[a-f0-9]{64}$/iu.test(process.env.GHIDRA_RELEASE_SHA256 ?? "")
+  )
+    fail(
+      `SDK URL and SHA256 must match verified Ghidra ${SUPPORTED_GHIDRA_VERSION}`,
+    );
+  console.log(`GHIDRA_JAVA_MAJOR=${SUPPORTED_GHIDRA_JAVA_MAJOR}`);
+  process.exit(0);
+}
+
+const root = resolve(dirname(fileURLToPath(import.meta.url)), "..");
+const bridge = join(root, "bridge/ghidra");
+const install = process.env.GHIDRA_INSTALL_DIR;
+if (!install)
+  fail(
+    `Set GHIDRA_INSTALL_DIR to an existing Ghidra ${ghidraReleaseLine()} installation (verified with ${SUPPORTED_GHIDRA_VERSION}). REA does not install Ghidra.`,
+  );
+const properties = await readFile(
+  join(install, "Ghidra/application.properties"),
+  "latin1",
+).catch((cause) =>
+  fail(
+    `GHIDRA_INSTALL_DIR has no readable Ghidra/application.properties: ${cause.message}`,
+  ),
+);
+const parsedProperties = parseGhidraJavaProperties(properties);
+if (!parsedProperties.ok) fail(parsedProperties.error);
+const version = parsedProperties.value.get("application.version");
+if (!ghidraReleaseAccepted(version))
+  fail(
+    `Bridge sources require Ghidra ${ghidraReleaseLine()} (verified with ${SUPPORTED_GHIDRA_VERSION}). Observed application.version=${version === undefined ? "missing" : JSON.stringify(version)}.`,
+  );
+if (args[0] === "--verified-sdk" && version !== SUPPORTED_GHIDRA_VERSION)
+  fail(
+    `CI SDK must be verified Ghidra ${SUPPORTED_GHIDRA_VERSION}; observed ${JSON.stringify(version)}`,
+  );
+const sourceNames = (await readdir(bridge, { withFileTypes: true }))
+  .filter((entry) => entry.isFile() && entry.name.endsWith(".java"))
+  .map((entry) => entry.name);
+for (const name of Object.values(GHIDRA_BRIDGE_SOURCES))
+  if (!sourceNames.includes(name))
+    fail(`Required Ghidra bridge source is missing: bridge/ghidra/${name}`);
+const requiredNames = new Set(Object.values(GHIDRA_BRIDGE_SOURCES));
+const unregistered = sourceNames.filter((name) => !requiredNames.has(name));
+if (unregistered.length)
+  fail(
+    `Ghidra bridge sources absent from the manifest: ${unregistered.join(", ")}`,
+  );
+const sources = sourceNames
+  .map((name) => relative(root, join(bridge, name)))
+  .sort();
+
+const javac = process.env.JAVA_HOME
+  ? join(process.env.JAVA_HOME, "bin", "javac")
+  : "javac";
+const banner = run(javac, ["-version"]);
+if (banner.error || banner.status !== 0)
+  fail(`javac is unavailable: ${banner.error?.message ?? output(banner)}`);
+const major = Number(/^javac (\d+)/mu.exec(output(banner))?.[1]);
+if (!Number.isInteger(major) || major < SUPPORTED_GHIDRA_JAVA_MAJOR)
+  fail(
+    `Ghidra ${ghidraReleaseLine()} compiles bridge scripts with Java ${SUPPORTED_GHIDRA_JAVA_MAJOR} or newer. Observed: ${output(banner) || "no version"}. REA does not install or upgrade Java.`,
+  );
+
+const jars = (
+  await readdir(join(install, "Ghidra"), {
+    recursive: true,
+    withFileTypes: true,
+  })
+)
+  .filter((entry) => entry.isFile() && entry.name.endsWith(".jar"))
+  .map((entry) => join(entry.parentPath, entry.name))
+  .sort();
+if (jars.length === 0) fail(`No jars found under ${join(install, "Ghidra")}.`);
+
+const scratch = await mkdtemp(join(tmpdir(), "rea-ghidra-bridge-"));
+try {
+  // An argument file keeps the jar class path below Windows' command length.
+  const argumentFile = join(scratch, "javac.args");
+  await writeFile(
+    argumentFile,
+    [
+      "-proc:none",
+      "-encoding",
+      "UTF-8",
+      "--release",
+      String(SUPPORTED_GHIDRA_JAVA_MAJOR),
+      "-cp",
+      jars.join(process.platform === "win32" ? ";" : ":"),
+      "-d",
+      join(scratch, "classes"),
+      ...sources,
+    ]
+      .map((s) => `"${s.replaceAll("\\", "\\\\").replaceAll('"', '\\"')}"`)
+      .join("\n"),
+  );
+  // Sources are repository-relative, so diagnostics name bridge/ghidra/<file>:<line>.
+  const result = run(javac, ["-J-Xmx1g", `@${argumentFile}`]);
+  if (result.error || result.status !== 0) {
+    // Set the status instead of exiting so the scratch directory is removed.
+    process.stderr.write(
+      `${output(result) || result.error?.message || "javac failed"}\nGhidra ${version} could not compile the packaged bridge sources; the provider would fail at session start.\n`,
+    );
+    process.exitCode = 1;
+  } else {
+    console.log(
+      JSON.stringify({
+        ghidra_version: version,
+        javac: output(banner),
+        class_path_jars: jars.length,
+        sources,
+      }),
+    );
+  }
+} finally {
+  await rm(scratch, { recursive: true, force: true });
+}
+
+function run(command, args) {
+  return spawnSync(command, args, {
+    cwd: root,
+    encoding: "utf8",
+    timeout: 300_000,
+    maxBuffer: 16 * 1024 * 1024,
+  });
+}
+
+function output(result) {
+  return `${result.stdout ?? ""}${result.stderr ?? ""}`.trim();
+}
+
+function fail(message) {
+  process.stderr.write(`${message}\n`);
+  process.exit(1);
+}

scripts/verify-package-pack.mjs

@@ -17,7 +17,10 @@ export async function verifyPackagePack({ root, workspace }) {
       })
     ).stdout.trim(),
   );
-  const packedFiles = (await exec("tar", ["-tf", tarball])).stdout.split("\n");
+  const listing = (await exec("tar", ["-tf", tarball])).stdout;
+  // A bare LF identifies LF output; preceding CRs then belong to filenames.
+  const lineEnding = /(^|[^\r])\n/u.test(listing) ? "\n" : "\r\n";
+  const packedFiles = listing.split(lineEnding);
   const packedManifest = JSON.parse(
     (await exec("tar", ["-xOf", tarball, "package/package.json"])).stdout,
   );

scripts/verify-packaged-wasm-artifact.mjs

@@ -2,6 +2,7 @@
 import { join } from "node:path";
 import { mkdir } from "node:fs/promises";
 import { PrivateRuntimeRoot } from "../dist/process/PrivateRuntimeRoot.js";
+import { closeVerifierResources } from "./lib/verifier-cleanup.mjs";
 import { exec, execNpm } from "./lib/verify-package-core.mjs";
 import { WABT_WORKFLOW_TIMEOUT_MS } from "./lib/wabt-verifier-timeouts.mjs";
 import { verifyPackagePack } from "./verify-package-pack.mjs";
@@ -9,6 +10,7 @@ import { verifyPackagePack } from "./verify-package-pack.mjs";
 const root = await PrivateRuntimeRoot.create({
   prefix: "rea-wabt-package-verifier-",
 });
+let primaryError;
 try {
   const { tarball } = await verifyPackagePack({
     root: process.cwd(),
@@ -56,6 +58,9 @@ try {
     },
   );
   process.stdout.write(verified.stdout);
+} catch (cause) {
+  primaryError = cause;
+  throw cause;
 } finally {
-  await root.close();
+  await closeVerifierResources([() => root.close()], primaryError);
 }

scripts/verify-packed-bridge.mjs

@@ -1,21 +1,20 @@
 import { execFile } from "node:child_process";
 import { join } from "node:path";
 import { promisify } from "node:util";
+import { GHIDRA_BRIDGE_SOURCES } from "../src/ghidra/GhidraBridgeSources.ts";
 
 const exec = promisify(execFile);
 const packedHopperBridge = "package/bridge/hopper_bridge.py";
 const packedCutterBridge = "package/bridge/cutter/rea_bridge.py";
-const packedGhidraBridge = "package/bridge/ghidra/ReaGhidraBridge.java";
-const packedGhidraActivator =
-  "package/bridge/ghidra/ReaGhidraBundleActivator.java";
 
 /** Check shipped bridge files; real-provider lanes verify runtime behavior. */
 export async function verifyPackedBridge({ workspace, tarball, packedFiles }) {
   for (const path of [
     packedHopperBridge,
     packedCutterBridge,
-    packedGhidraBridge,
-    packedGhidraActivator,
+    ...Object.values(GHIDRA_BRIDGE_SOURCES).map(
+      (name) => `package/bridge/ghidra/${name}`,
+    ),
   ]) {
     if (!packedFiles.includes(path)) throw new Error(`package omitted ${path}`);
   }

scripts/verify-packet-capture.mjs

@@ -12,6 +12,7 @@ import { StdioClientTransport } from "@modelcontextprotocol/client/stdio";
 import { Ajv2020 } from "ajv/dist/2020.js";
 import { PrivateRuntimeRoot } from "../dist/process/PrivateRuntimeRoot.js";
 import { parseEvidence } from "../dist/domain/evidence.js";
+import { closeVerifierResources } from "./lib/verifier-cleanup.mjs";
 import { createVerifierRun, completeVerifierRun } from "./lib/verifier-run.mjs";
 
 if (process.platform !== "linux")
@@ -106,6 +107,7 @@ const expectedAddressSpace = Math.min(
     .map((value) => (value === "unlimited" ? Infinity : Number(value))),
 );
 
+let primaryError;
 try {
   await writeFile(path, source);
   await writeFile(bluetooth, bluetoothSource);
@@ -463,10 +465,14 @@ try {
     "network with spaces.pcap",
     "paged.pcap",
   ]);
+} catch (cause) {
+  primaryError = cause;
+  throw cause;
 } finally {
-  await client.close();
-  await transport.close();
-  await root.close();
+  await closeVerifierResources(
+    [() => client.close(), () => transport.close(), () => root.close()],
+    primaryError,
+  );
 }
 console.log(
   JSON.stringify(

scripts/verify-real-ghidra-assertions.mjs

@@ -3,7 +3,7 @@ import { hasTypedSwitchEvidence } from "./verify-real-ghidra-switch-assertions.m
 import { access } from "node:fs/promises";
 
 import { parseBinaryTarget } from "../dist/application/BinaryTargetResolver.js";
-import { SUPPORTED_GHIDRA_VERSION } from "../dist/ghidra/GhidraInstallationPolicy.js";
+import { SUPPORTED_GHIDRA_VERSION } from "../dist/ghidra/GhidraReleasePolicy.js";
 import { GHIDRA_SESSION_CAPABILITIES } from "../dist/ghidra/GhidraSessionValues.js";
 
 export function assertLocalProcedureInfo(info, expectedAddress) {

scripts/verify-real-ghidra-noreturn.mjs

@@ -11,7 +11,7 @@ import { parseBinaryTarget } from "../dist/application/BinaryTargetResolver.js";
 import { parseConfig } from "../dist/config/parseConfig.js";
 import { GhidraClient } from "../dist/ghidra/GhidraClient.js";
 import { inspectGhidraInstallation } from "../dist/ghidra/GhidraInstallation.js";
-import { SUPPORTED_GHIDRA_VERSION } from "../dist/ghidra/GhidraInstallationPolicy.js";
+import { SUPPORTED_GHIDRA_VERSION } from "../dist/ghidra/GhidraReleasePolicy.js";
 import { GhidraProvider } from "../dist/ghidra/GhidraProvider.js";
 import { silentLogger } from "../dist/logger.js";
 import { cleanupOwnedProcessGroup } from "../dist/process/ProcessOwnership.js";

scripts/verify-real-ghidra-windows.mjs

@@ -19,7 +19,7 @@ import {
   parseGhidraInventoryResult,
 } from "../dist/ghidra/GhidraInventoryValues.js";
 import { inspectGhidraInstallation } from "../dist/ghidra/GhidraInstallation.js";
-import { SUPPORTED_GHIDRA_VERSION } from "../dist/ghidra/GhidraInstallationPolicy.js";
+import { SUPPORTED_GHIDRA_VERSION } from "../dist/ghidra/GhidraReleasePolicy.js";
 import { GhidraHeadlessLauncher } from "../dist/ghidra/GhidraLauncher.js";
 import { GHIDRA_PROVIDER_IDENTITY } from "../dist/ghidra/GhidraProviderCapabilities.js";
 import {

scripts/verify-real-ghidra.mjs

@@ -11,7 +11,7 @@ import { parseBinaryTarget } from "../dist/application/BinaryTargetResolver.js";
 import { resolveGhidraAnalysisProfile } from "../dist/ghidra/GhidraAnalysisProfile.js";
 import { GhidraClient } from "../dist/ghidra/GhidraClient.js";
 import { inspectGhidraInstallation } from "../dist/ghidra/GhidraInstallation.js";
-import { SUPPORTED_GHIDRA_VERSION } from "../dist/ghidra/GhidraInstallationPolicy.js";
+import { SUPPORTED_GHIDRA_VERSION } from "../dist/ghidra/GhidraReleasePolicy.js";
 import { GhidraHeadlessLauncher } from "../dist/ghidra/GhidraLauncher.js";
 import { GHIDRA_PROVIDER_IDENTITY } from "../dist/ghidra/GhidraProviderCapabilities.js";
 

scripts/verify-signal-recording.mjs

@@ -12,6 +12,7 @@ import { StdioClientTransport } from "@modelcontextprotocol/client/stdio";
 import { Ajv2020 } from "ajv/dist/2020.js";
 import { PrivateRuntimeRoot } from "../dist/process/PrivateRuntimeRoot.js";
 import { parseEvidence } from "../dist/domain/evidence.js";
+import { closeVerifierResources } from "./lib/verifier-cleanup.mjs";
 import { createVerifierRun, completeVerifierRun } from "./lib/verifier-run.mjs";
 
 if (process.platform !== "linux")
@@ -83,6 +84,7 @@ const expectedAddressSpace = Math.min(
     .map((value) => (value === "unlimited" ? Infinity : Number(value))),
 );
 
+let primaryError;
 try {
   await writeFile(path, source);
   await client.connect(transport);
@@ -383,10 +385,14 @@ try {
     "paged.vcd",
     "recording with spaces.vcd",
   ]);
+} catch (cause) {
+  primaryError = cause;
+  throw cause;
 } finally {
-  await client.close();
-  await transport.close();
-  await root.close();
+  await closeVerifierResources(
+    [() => client.close(), () => transport.close(), () => root.close()],
+    primaryError,
+  );
 }
 console.log(
   JSON.stringify(

scripts/verify-windows-native.mjs

@@ -23,6 +23,7 @@ import { pathToFileURL } from "node:url";
 import { verifyWindowsProtocolInput } from "./lib/windows-protocol-input.mjs";
 import { verifyWindowsJobMemoryLimit } from "./lib/windows-job-memory-limit.mjs";
 import { verifyVolumeRootAppendLease } from "./lib/windows-volume-root-append-lease.mjs";
+import { closeVerifierResources } from "./lib/verifier-cleanup.mjs";
 
 if (process.platform !== "win32")
   throw new Error(
@@ -66,6 +67,49 @@ const exists = (path) =>
     () => true,
     () => false,
   );
+const startDeleteSharingDeniedReader = async (path) => {
+  const child = spawn(
+    "powershell.exe",
+    [
+      "-NoProfile",
+      "-NonInteractive",
+      "-Command",
+      "$ErrorActionPreference = 'Stop'; " +
+        "$stream = [IO.File]::Open($env:REA_CLEANUP_HELD_PATH, [IO.FileMode]::Open, [IO.FileAccess]::Read, [IO.FileShare]::ReadWrite); " +
+        "try { [Console]::WriteLine('ready'); [Console]::In.ReadLine() | Out-Null } " +
+        "finally { $stream.Dispose() }",
+    ],
+    {
+      env: { ...process.env, REA_CLEANUP_HELD_PATH: path },
+      stdio: ["pipe", "pipe", "pipe"],
+    },
+  );
+  const closed = once(child, "close");
+  void closed.catch(() => undefined);
+  try {
+    const [ready] = await once(child.stdout, "data", {
+      signal: AbortSignal.timeout(15_000),
+    });
+    assert.equal(String(ready).trim(), "ready");
+  } catch (cause) {
+    try {
+      child.kill();
+      await closed;
+    } catch (cleanupCause) {
+      throw new AggregateError(
+        [cause, cleanupCause],
+        "Reader startup and child cleanup failed",
+        { cause },
+      );
+    }
+    throw cause;
+  }
+  return { child, closed };
+};
+const stopDeleteSharingDeniedReader = async ({ child, closed }) => {
+  child.kill();
+  await closed;
+};
 const live = (pid) => {
   try {
     process.kill(pid, 0);
@@ -516,32 +560,14 @@ process.stdout.write(JSON.stringify({executable:basename(process.execPath),abiVe
       "cleanup-retry-",
     );
     const heldPath = join(retryRuntime.observation.path, "snapshot.bin");
-    await retryRuntime.snapshot(source, "snapshot.bin");
-    const holder = spawn(
-      "powershell.exe",
-      [
-        "-NoProfile",
-        "-NonInteractive",
-        "-Command",
-        "$ErrorActionPreference = 'Stop'; " +
-          "$stream = [IO.File]::Open($env:REA_CLEANUP_HELD_PATH, [IO.FileMode]::Open, [IO.FileAccess]::Read, [IO.FileShare]::ReadWrite); " +
-          "try { [Console]::WriteLine('ready'); [Console]::In.ReadLine() | Out-Null } " +
-          "finally { $stream.Dispose() }",
-      ],
-      {
-        env: { ...process.env, REA_CLEANUP_HELD_PATH: heldPath },
-        stdio: ["pipe", "pipe", "pipe"],
-      },
-    );
-    const holderClosed = once(holder, "close");
-    void holderClosed.catch(() => undefined);
+    let holder;
+    let primaryError;
     try {
-      const [ready] = await once(holder.stdout, "data", {
-        signal: AbortSignal.timeout(15_000),
-      });
-      assert.equal(String(ready).trim(), "ready");
+      await retryRuntime.snapshot(source, "snapshot.bin");
+      holder = await startDeleteSharingDeniedReader(heldPath);
       // The reader denies delete sharing. Cleanup must retain ownership when
-      // its handle-relative open receives ERROR_SHARING_VIOLATION (32).
+      // its handle-relative open receives ERROR_SHARING_VIOLATION (32) through
+      // the bounded automatic retries; a later explicit close must succeed.
       await assert.rejects(retryRuntime.close(), { win32Code: 32 });
       assert.equal(
         windowsPrivateRuntime(retryRuntime.observation.path),
@@ -552,8 +578,8 @@ process.stdout.write(JSON.stringify({executable:basename(process.execPath),abiVe
         () => retryRuntime.writeFile("after-close.txt", "forbidden"),
         /cleanup is pending/u,
       );
-      holder.stdin.end("\n");
-      const [exitCode] = await holderClosed;
+      holder.child.stdin.end("\n");
+      const [exitCode] = await holder.closed;
       assert.equal(exitCode, 0);
       await retryRuntime.close();
       await retryRuntime.close();
@@ -563,10 +589,73 @@ process.stdout.write(JSON.stringify({executable:basename(process.execPath),abiVe
         /No native private runtime/u,
       );
       report.controls.cleanupFailureRetainsOwnershipForRetry = true;
+    } catch (cause) {
+      primaryError = cause;
+      throw cause;
     } finally {
-      holder.kill();
-      await holderClosed.catch(() => undefined);
-      await retryRuntime.close();
+      await closeVerifierResources(
+        [
+          ...(holder === undefined
+            ? []
+            : [() => stopDeleteSharingDeniedReader(holder)]),
+          () => retryRuntime.close(),
+        ],
+        primaryError,
+      );
+    }
+    const transientRuntime = WindowsPrivateRuntime.create(
+      workspace,
+      "cleanup-transient-",
+    );
+    const transientHeldPath = join(
+      transientRuntime.observation.path,
+      "snapshot.bin",
+    );
+    let transientHolder;
+    let transientPrimaryError;
+    try {
+      await transientRuntime.snapshot(source, "snapshot.bin");
+      transientHolder = await startDeleteSharingDeniedReader(transientHeldPath);
+      // Keep the reader held through the first close attempt. Without retries,
+      // close rejects before the next event-loop turn; with retries, it remains
+      // pending until the caller releases this sharing conflict.
+      let closeSettled = false;
+      const closing = transientRuntime.close();
+      void closing.then(
+        () => {
+          closeSettled = true;
+        },
+        () => {
+          closeSettled = true;
+        },
+      );
+      await new Promise((resolve) => setImmediate(resolve));
+      assert.equal(closeSettled, false);
+      transientHolder.child.stdin.end("\n");
+      const [, [exitCode]] = await Promise.all([
+        closing,
+        transientHolder.closed,
+      ]);
+      assert.equal(exitCode, 0);
+      assert.equal(await exists(transientRuntime.observation.path), false);
+      assert.throws(
+        () => windowsPrivateRuntime(transientRuntime.observation.path),
+        /No native private runtime/u,
+      );
+      report.controls.cleanupTransientConflictRetries = true;
+    } catch (cause) {
+      transientPrimaryError = cause;
+      throw cause;
+    } finally {
+      await closeVerifierResources(
+        [
+          ...(transientHolder === undefined
+            ? []
+            : [() => stopDeleteSharingDeniedReader(transientHolder)]),
+          () => transientRuntime.close(),
+        ],
+        transientPrimaryError,
+      );
     }
     report.controls = {
       ...report.controls,

scripts/verify-windows-package.mjs

@@ -14,6 +14,7 @@ import { join } from "node:path";
 import { parse as parseJsonc } from "jsonc-parser";
 import { supportedClients } from "../dist/application/SupportedClients.js";
 import { promisify } from "node:util";
+import { GHIDRA_BRIDGE_SOURCES } from "../src/ghidra/GhidraBridgeSources.ts";
 
 import { Client } from "@modelcontextprotocol/client";
 import { StdioClientTransport } from "@modelcontextprotocol/client/stdio";
@@ -52,7 +53,9 @@ try {
     );
   const packagedPaths = new Set(packageResult.files.map(({ path }) => path));
   for (const required of [
-    "bridge/ghidra/ReaGhidraBridge.java",
+    ...Object.values(GHIDRA_BRIDGE_SOURCES).map(
+      (name) => `bridge/ghidra/${name}`,
+    ),
     "native/windows/build/manifest.json",
     "native/windows/build/rea-windows-x64.node",
     "dist/android/JadxWorkspaceRoot.js",

scripts/verify/javascript/native-handoffs.mjs

@@ -0,0 +1,348 @@
+#!/usr/bin/env node
+
+import assert from "node:assert/strict";
+import { createHash, randomUUID } from "node:crypto";
+import { createReadStream } from "node:fs";
+import { readFile, writeFile } from "node:fs/promises";
+import { isAbsolute, join } from "node:path";
+import { performance } from "node:perf_hooks";
+import { fileURLToPath } from "node:url";
+import { parseArgs } from "node:util";
+import { Client } from "@modelcontextprotocol/client";
+import { StdioClientTransport } from "@modelcontextprotocol/client/stdio";
+import { createEvidence } from "../../../dist/domain/evidence.js";
+import { PrivateRuntimeRoot } from "../../../dist/process/PrivateRuntimeRoot.js";
+import {
+  OwnedCommandFailure,
+  runOwnedCommand,
+} from "../../../dist/process/OwnedCommand.js";
+import { closeVerifierResources } from "../../lib/verifier-cleanup.mjs";
+
+const { values } = parseArgs({
+  options: {
+    artifact: { type: "string" },
+    "addon-path": { type: "string" },
+    "native-sha256": { type: "string" },
+    "source-path": { type: "string", multiple: true },
+    rounds: { type: "string", default: "3" },
+    "cli-parity": { type: "boolean", default: false },
+    "tokenizer-python": { type: "string" },
+    "require-safe": { type: "boolean", default: false },
+  },
+  strict: true,
+});
+assert.ok(
+  values.artifact && isAbsolute(values.artifact),
+  "--artifact must be absolute",
+);
+assert.ok(
+  values["addon-path"] &&
+    !isAbsolute(values["addon-path"]) &&
+    values["addon-path"]
+      .split("/")
+      .every((part) => part !== "" && part !== "." && part !== ".."),
+  "--addon-path must be a normalized archive-relative path",
+);
+assert.match(
+  values["native-sha256"] ?? "",
+  /^[a-f0-9]{64}$/,
+  "--native-sha256 pins prior native bytes; it does not prove availability",
+);
+const rounds = Number(values.rounds);
+assert.ok(Number.isSafeInteger(rounds) && rounds > 0);
+const environment = {
+  PATH: process.env.PATH ?? "/usr/bin:/bin",
+  REA_LOG_LEVEL: "silent",
+  REA_ANALYSIS_PROVIDER: "auto",
+  HOPPER_LAUNCHER_PATH: "/rea-unconfigured-deep-provider/hopper",
+};
+const transport = new StdioClientTransport({
+  command: process.execPath,
+  args: [fileURLToPath(new URL("../../rea.mjs", import.meta.url)), "mcp"],
+  env: environment,
+  stderr: "pipe",
+});
+const client = new Client({
+  name: "javascript-native-handoff-verifier",
+  version: "1",
+});
+const serialize = (value) => JSON.stringify(value);
+const digest = (value) =>
+  createHash("sha256").update(serialize(value)).digest("hex");
+const fileDigest = async (path) => {
+  const hash = createHash("sha256");
+  for await (const chunk of createReadStream(path)) hash.update(chunk);
+  return hash.digest("hex");
+};
+const simulatedNativeEvidence = (path, sha256) =>
+  createEvidence(
+    { path, sha256, format: "raw-binary" },
+    { id: "ghidra", name: "Ghidra", version: "simulated" },
+    {
+      operation: "binary_overview",
+      parameters: {},
+      result: {
+        summary:
+          "Simulated subject-linkage input; no native provider executed.",
+      },
+      limitations: ["No native provider behavior is established."],
+    },
+  );
+let temporary;
+let primaryError;
+let retainTemporary = false;
+let report;
+const ownedCommand = async (command, arguments_, timeoutMs = 60_000) => {
+  try {
+    return await runOwnedCommand(
+      {
+        command,
+        arguments: arguments_,
+        cwd: temporary.path,
+        env: environment,
+        runId: `rea-native-handoff-${randomUUID()}`,
+        expectedCommand: command === process.execPath ? process.execPath : null,
+        sweepTokenOwnedProcesses: true,
+      },
+      { timeoutMs, diagnosticBytes: 16 * 1024 * 1024 },
+    );
+  } catch (cause) {
+    retainTemporary ||=
+      cause instanceof OwnedCommandFailure && cause.cleanupOwner !== undefined;
+    throw cause;
+  }
+};
+try {
+  const archiveSha256 = await fileDigest(values.artifact);
+  const companion = join(`${values.artifact}.unpacked`, values["addon-path"]);
+  let companionSha256 = null;
+  try {
+    companionSha256 = await fileDigest(companion);
+  } catch (cause) {
+    if (cause?.code !== "ENOENT") throw cause;
+  }
+  if (companionSha256 !== null)
+    assert.equal(companionSha256, values["native-sha256"]);
+  const native = simulatedNativeEvidence(companion, values["native-sha256"]);
+  const container = simulatedNativeEvidence(values.artifact, archiveSha256);
+  await client.connect(transport);
+  transport.stderr?.on("data", () => undefined);
+  const tools = (await client.listTools()).tools;
+  const catalog = tools.map(({ name, description, inputSchema }) => ({
+    name,
+    description,
+    inputSchema,
+  }));
+  const selected = catalog.filter(({ name }) =>
+    ["analyze_javascript_application", "trace_application_feature"].includes(
+      name,
+    ),
+  );
+  assert.equal(selected.length, 2);
+  const call = async (name, arguments_) => {
+    const response = await client.callTool(
+      { name, arguments: arguments_ },
+      { timeout: 360_000 },
+    );
+    assert.notEqual(response.isError, true, serialize(response));
+    assert.ok(response.structuredContent?.evidence_id);
+    return {
+      request: { name, arguments: arguments_ },
+      response: response.structuredContent,
+      wire_response: response,
+    };
+  };
+  const prepStart = performance.now();
+  const preparation = await call("analyze_javascript_application", {
+    input_path: values.artifact,
+    detail: "summary",
+    ...(values["source-path"] === undefined
+      ? {}
+      : { source_paths: values["source-path"] }),
+  });
+  const preparationMs = performance.now() - prepStart;
+  assert.equal(preparation.response.subject.digest.sha256, archiveSha256);
+  const sourceId = preparation.response.normalized_result.parent_evidence_id;
+  assert.match(sourceId, /^ev_[a-f0-9]{64}$/);
+  const query = {
+    application: { kind: "retained-evidence", evidence_id: sourceId },
+    native_observations: [container, native],
+    seed: {
+      kind: "string",
+      value: values["addon-path"],
+      match: "exact",
+      case_sensitive: true,
+    },
+    direction: "outgoing",
+  };
+  const samples = [];
+  let first;
+  for (let round = 0; round < rounds; round++) {
+    const start = performance.now();
+    const result = await call("trace_application_feature", query);
+    const elapsedMs = performance.now() - start;
+    if (first === undefined) first = result;
+    else assert.equal(result.response.evidence_id, first.response.evidence_id);
+    samples.push({
+      round,
+      elapsed_ms: elapsedMs,
+      structured_reply_bytes: Buffer.byteLength(serialize(result.response)),
+      full_tool_reply_bytes: Buffer.byteLength(serialize(result.wire_response)),
+    });
+  }
+  const trace = first.response.normalized_result;
+  const addons = trace.graph.nodes.filter(
+    ({ kind }) => kind === "native-addon",
+  );
+  assert.equal(
+    addons.length,
+    1,
+    "The selected native add-on must remain visible",
+  );
+  const addon = addons[0];
+  const unavailable = addon.observations.some(
+    ({ properties }) => properties.availability === "unavailable",
+  );
+  const expectedLinks = [
+    sourceId,
+    ...(companionSha256 === null ? [] : [native.evidence_id]),
+  ].sort();
+  const safeIdentity =
+    serialize(trace.evidence_links) === serialize(expectedLinks) &&
+    (companionSha256 === null
+      ? unavailable &&
+        addon.identity.strategy !== "content-digest" &&
+        trace.coverage.status === "partial" &&
+        trace.native_handoffs.length === 0
+      : addon.identity.strategy === "content-digest" &&
+        addon.identity.sha256 === companionSha256 &&
+        trace.native_handoffs.length === 1 &&
+        trace.native_handoffs[0].artifact_sha256 === companionSha256 &&
+        trace.native_handoffs[0].status === "evidence-linked" &&
+        serialize(trace.native_handoffs[0].evidence_ids) ===
+          serialize([native.evidence_id]));
+  let cliParity = null;
+  if (values["cli-parity"]) {
+    temporary = await PrivateRuntimeRoot.create({
+      prefix: "rea-native-handoff-verifier-",
+    });
+    const bundlePath = join(temporary.path, "bundle.json");
+    const exported = await client.callTool({
+      name: "export_evidence_bundle",
+      arguments: { path: bundlePath },
+    });
+    assert.notEqual(exported.isError, true, serialize(exported));
+    const bundle = JSON.parse(await readFile(bundlePath, "utf8"));
+    const parent = bundle.records.find(
+      ({ evidence_id }) => evidence_id === sourceId,
+    );
+    assert.ok(parent, "Export omitted the retained parent");
+    const request = join(temporary.path, "trace.json");
+    // The CLI's portable file contract takes complete Evidence; MCP resolves a
+    // same-session reference into the same shared application workflow.
+    await writeFile(request, serialize({ ...query, application: parent }));
+    const result = await ownedCommand(
+      process.execPath,
+      [
+        fileURLToPath(new URL("../../rea.mjs", import.meta.url)),
+        "trace-application-feature",
+        request,
+        "--json",
+      ],
+      120_000,
+    );
+    const evidence = JSON.parse(result.stdout.text);
+    assert.deepEqual(evidence.normalized_result, trace);
+    assert.equal(evidence.evidence_id, first.response.evidence_id);
+    cliParity = {
+      exact_cli_mcp_trace_parity: true,
+      evidence_id: evidence.evidence_id,
+    };
+  }
+  let tokenCosts = null;
+  if (values["tokenizer-python"]) {
+    temporary ??= await PrivateRuntimeRoot.create({
+      prefix: "rea-native-handoff-verifier-",
+    });
+    const input = join(temporary.path, "token-input.json");
+    await writeFile(
+      input,
+      serialize({ catalog, selected, preparation, query: first }),
+    );
+    const result = await ownedCommand(values["tokenizer-python"], [
+      "-c",
+      `import json,sys,tiktoken
+with open(sys.argv[1],encoding='utf-8') as f:d=json.load(f)
+enc=tiktoken.get_encoding('cl100k_base')
+def n(v):return len(enc.encode(json.dumps(v,ensure_ascii=False,separators=(',',':')),disallowed_special=()))
+requests=n(d['preparation']['request'])+n(d['query']['request'])
+structured=n(d['preparation']['response'])+n(d['query']['response'])
+full_reply=n(d['preparation']['wire_response'])+n(d['query']['wire_response'])
+s=n(d['selected']);a=n(d['catalog'])
+print(json.dumps(dict(tokenizer='cl100k_base',tiktoken_version=tiktoken.__version__,selected_catalog=s,full_catalog=a,requests=requests,structured_replies=structured,full_tool_replies=full_reply,selected_catalog_structured_task=s+requests+structured,full_catalog_structured_task=a+requests+structured,selected_catalog_full_reply_task=s+requests+full_reply,full_catalog_full_reply_task=a+requests+full_reply)))`,
+      input,
+    ]);
+    tokenCosts = JSON.parse(result.stdout.text);
+  }
+  report = {
+    scope:
+      "Real shipped-ASAR native identity through public CLI/stdio MCP; simulated native Evidence only, no provider/application executed",
+    artifact: { path: values.artifact, sha256: archiveSha256 },
+    addon_path: values["addon-path"],
+    companion_sha256_observed: companionSha256,
+    prior_native_sha256_supplied: values["native-sha256"],
+    source_paths: values["source-path"] ?? null,
+    parent_evidence_id: sourceId,
+    trace_evidence_id: first.response.evidence_id,
+    preparation_ms: preparationMs,
+    samples,
+    safe_identity: safeIdentity,
+    node: {
+      node_id: addon.node_id,
+      identity: addon.identity,
+      unavailable_observed: unavailable,
+      basis: addon.observations.map(({ evidence }) => ({
+        authority: evidence.authority,
+        state: evidence.state,
+        confidence: evidence.confidence,
+        artifact: evidence.artifact,
+        location: evidence.location,
+      })),
+    },
+    native_handoffs: trace.native_handoffs,
+    evidence_links: trace.evidence_links,
+    source_coverage: trace.coverage,
+    graph_coverage: trace.graph.coverage,
+    facts_sha256: digest({
+      node: addon,
+      native_handoffs: trace.native_handoffs,
+      evidence_links: trace.evidence_links,
+      coverage: trace.coverage,
+    }),
+    cli_parity: cliParity,
+    token_costs: tokenCosts,
+    conditions:
+      "Fresh MCP session, one selected analysis followed by repeated identical retained traces. Filesystem/build caches uncontrolled. Task token counts include one analysis summary and one trace with name/description/inputSchema catalog projections; structured and complete-tool-reply projections are alternatives, not billing. Repeated rounds, export, CLI parity and tokenizer are validation overhead outside that one-task token count but inside total resource receipts. A wrong-identity baseline is not a successful equivalent task or efficiency credit.",
+  };
+  if (values["require-safe"])
+    assert.ok(safeIdentity, "Native identity/linkage oracle failed");
+} catch (cause) {
+  primaryError = cause;
+  throw cause;
+} finally {
+  await closeVerifierResources(
+    [
+      () => client.close(),
+      () => transport.close(),
+      async () => {
+        if (retainTemporary)
+          throw new Error(
+            `Command cleanup incomplete; retaining owned inputs at ${temporary?.path}.`,
+          );
+        await temporary?.close();
+      },
+    ],
+    primaryError,
+  );
+}
+console.log(serialize(report));

src/application/AppBundleExecutable.test.ts

@@ -32,3 +32,46 @@ describe("app bundle Info.plist magic", () => {
     }
   });
 });
+
+describe("app bundle program directory containment", () => {
+  it("rejects an escaping programs directory before resolving its child", async () => {
+    const root = await mkdtemp(join(tmpdir(), "rea-app-programs-"));
+    try {
+      const bundle = join(root, "Fixture.app");
+      const programs = join(bundle, "Contents", "MacOS");
+      const executable = join(programs, "Missing");
+      const canonicalBundle = join(root, "Canonical.app");
+      const outsidePrograms = join(root, "outside");
+      const plist =
+        "<plist><dict><key>CFBundleExecutable</key><string>Missing</string></dict></plist>";
+      await mkdir(join(bundle, "Contents"), { recursive: true });
+      await writeFile(join(bundle, "Contents", "Info.plist"), plist);
+      let childResolved = false;
+
+      const result = await resolveAppBundleExecutable(bundle, {
+        readFile: async () => Buffer.from(plist),
+        realpath: async (path) => {
+          if (path === bundle) return canonicalBundle;
+          if (path === programs) return outsidePrograms;
+          if (path === executable) {
+            childResolved = true;
+            throw Object.assign(new Error("missing executable"), {
+              code: "ENOENT",
+            });
+          }
+          return path;
+        },
+      });
+
+      expect(result).toMatchObject({
+        ok: false,
+        error: {
+          reason: "app program directory leaves Contents/MacOS",
+        },
+      });
+      expect(childResolved).toBe(false);
+    } finally {
+      await rm(root, { recursive: true, force: true });
+    }
+  });
+});

src/application/AppBundleExecutable.ts

@@ -219,11 +219,24 @@ const resolveLayoutExecutable = async (
     );
   const programs = join(bundle, ...layout.programs);
   const executable = join(programs, name);
+  let canonicalBundle: string;
   try {
-    const [canonicalPrograms, canonicalExecutable] = await Promise.all([
-      fileSystem.realpath(programs),
-      fileSystem.realpath(executable),
-    ]);
+    canonicalBundle = await fileSystem.realpath(bundle);
+  } catch (cause: unknown) {
+    return err(
+      new BinaryTargetError(bundle, errorReason(cause, bundle), { cause }),
+    );
+  }
+  try {
+    const canonicalPrograms = await fileSystem.realpath(programs);
+    if (!isPathWithinRoot(canonicalBundle, canonicalPrograms))
+      return err(
+        new BinaryTargetError(
+          bundle,
+          `app program directory leaves ${layout.programsLabel}`,
+        ),
+      );
+    const canonicalExecutable = await fileSystem.realpath(executable);
     if (!isPathWithinRoot(canonicalPrograms, canonicalExecutable))
       return err(
         new BinaryTargetError(

src/application/DirectAnalysisCleanup.ts

@@ -46,6 +46,7 @@ export const directAnalysisCleanupFailure = (
         ...primary.data,
         code: "cleanup_incomplete",
         retryable: false,
+        remediation: cleanup.remediation,
         details: {
           ...primary.data.details,
           cleanup: "incomplete",
@@ -86,6 +87,7 @@ export const managedAnalysisCleanupFailure = (
       "close_binary",
       {
         cause: error,
+        remediationAction: cleanup.remediation.action,
         cleanup: { reason: cleanup.message, resources: error.cleanupResources },
         diagnostics: {
           cleanup_error: cleanup,

src/application/ReferenceSourceImportEntries.ts

@@ -137,7 +137,23 @@ const readPackageMains = (
   return mains;
 };
 
-const RESOLUTION_SUFFIXES = ["", ".ts", ".js", ".mjs", ".cjs", ".tsx", ".jsx"];
+/**
+ * Extension slots in probe order. Within a slot, files precede directory
+ * indexes. The CommonJS loader tries `X.json` after `X.js` and before any
+ * directory index; ESM and TypeScript require an explicit `.json`.
+ */
+const RESOLUTION_SUFFIXES: readonly (readonly string[])[] = [
+  [""],
+  [".ts"],
+  [".js"],
+  [".mjs"],
+  [".cjs"],
+  [".tsx"],
+  [".jsx"],
+];
+const REQUIRE_RESOLUTION_SUFFIXES = RESOLUTION_SUFFIXES.map((slot) =>
+  slot.includes(".js") ? [...slot, ".json"] : slot,
+);
 
 /** Inventory facts an internal specifier resolves against. */
 interface SpecifierContext {
@@ -153,6 +169,7 @@ interface SpecifierContext {
 const selectPackageMain = (
   index: string,
   context: SpecifierContext,
+  slots: readonly (readonly string[])[],
 ): { to: string; resolution: "internal" | "unresolved" } => {
   const directory = posix.dirname(index);
   const manifest = context.packageMains.get(directory);
@@ -170,11 +187,12 @@ const selectPackageMain = (
   // Node would load a declared entry outside the imported root.
   if (logicalPathEscapesRoot(target))
     return { to: target, resolution: "unresolved" };
+  const suffixes = slots.flat();
   const selected = context.lookupPath.resolveCandidates([
-    ...RESOLUTION_SUFFIXES.map((suffix) => `${target}${suffix}`),
-    ...RESOLUTION_SUFFIXES.filter((suffix) => suffix !== "").map((suffix) =>
-      posix.join(target, `index${suffix}`),
-    ),
+    ...suffixes.map((suffix) => `${target}${suffix}`),
+    ...suffixes
+      .filter((suffix) => suffix !== "")
+      .map((suffix) => posix.join(target, `index${suffix}`)),
   ]);
   return { to: selected ?? index, resolution: "internal" };
 };
@@ -183,6 +201,7 @@ const resolveInternalSpecifier = (
   fromPath: string,
   specifier: string,
   context: SpecifierContext,
+  slots: readonly (readonly string[])[],
 ): { to: string; resolution: "internal" | "unresolved" } => {
   if (posix.isAbsolute(specifier))
     return { to: specifier, resolution: "unresolved" };
@@ -196,9 +215,13 @@ const resolveInternalSpecifier = (
     specifier.endsWith("/") || [".", ".."].includes(posix.basename(specifier));
   // A directory resolves only to an index with an extension; neither Node nor
   // TypeScript selects an extensionless `index` file.
-  const candidates = RESOLUTION_SUFFIXES.flatMap((suffix) => [
-    ...(directoryReference ? [] : [`${normalized}${suffix}`]),
-    ...(suffix === "" ? [] : [posix.join(normalized, `index${suffix}`)]),
+  const candidates = slots.flatMap((slot) => [
+    ...(directoryReference
+      ? []
+      : slot.map((suffix) => `${normalized}${suffix}`)),
+    ...slot
+      .filter((suffix) => suffix !== "")
+      .map((suffix) => posix.join(normalized, `index${suffix}`)),
   ]);
   // Retain present runtime files first; substitute only a missing counterpart.
   // Counterparts cover explicit filenames, not directory/index resolution.
@@ -214,7 +237,7 @@ const resolveInternalSpecifier = (
     posix.basename(match).startsWith("index.") &&
     posix.dirname(match).normalize("NFC") === normalized.normalize("NFC");
   return resolvedThroughIndex
-    ? selectPackageMain(match, context)
+    ? selectPackageMain(match, context, slots)
     : { to: match, resolution: "internal" };
 };
 
@@ -250,6 +273,9 @@ const appendFile = (
       relationship.from_path,
       relationship.to,
       context,
+      relationship.kind === "requires"
+        ? REQUIRE_RESOLUTION_SUFFIXES
+        : RESOLUTION_SUFFIXES,
     );
     output.relationships.push({
       ...relationship,

src/application/binary/BinarySession.ts

@@ -596,18 +596,17 @@ export class BinarySession
 
   /** Describe the active binary session. */
   status(): JsonValue {
+    const client = this.#active?.client ?? this.#pendingCleanup?.client;
     return binarySessionStatus({
       target: this.#active?.target,
       route: this.#currentRoute(),
       router: this.#providerRouter,
       runtimeUnavailability: this.#runtimeUnavailability,
       runId: this.#active?.runId,
-      runtimeLineageSnapshots:
-        this.#active?.client.runtimeLineageSnapshots?.() ?? [],
-      requestActivitySnapshots:
-        this.#active?.client.requestActivitySnapshots?.() ?? [],
-      providerOperationHealth:
-        this.#active?.client.operationHealthSnapshot?.() ?? null,
+      runtimeLineageSnapshots: client?.runtimeLineageSnapshots?.() ?? [],
+      requestActivitySnapshots: client?.requestActivitySnapshots?.() ?? [],
+      providerOperationHealth: client?.operationHealthSnapshot?.() ?? null,
+      cleanupPending: this.#pendingCleanup !== undefined,
     });
   }
 

src/application/binary/BinarySessionStatus.ts

@@ -30,6 +30,7 @@ interface BinarySessionStatusInput {
   readonly runtimeLineageSnapshots: readonly ProviderRuntimeLineageSnapshot[];
   readonly requestActivitySnapshots: readonly ProviderRequestActivitySnapshot[];
   readonly providerOperationHealth?: ProviderOperationHealth | null;
+  readonly cleanupPending?: boolean;
 }
 
 /** Project internal provider routing state into the caller-visible session status. */
@@ -42,6 +43,7 @@ export const binarySessionStatus = ({
   runtimeLineageSnapshots,
   requestActivitySnapshots,
   providerOperationHealth,
+  cleanupPending = false,
 }: BinarySessionStatusInput): JsonValue => {
   const routeCapabilities = [...route.capabilities.values()]
     .filter(({ operation }) => operation !== "inventory_artifact")
@@ -84,6 +86,7 @@ export const binarySessionStatus = ({
       ),
     }));
   const common = {
+    cleanup_pending: cleanupPending,
     capabilities,
     analysis_provider_binding: analysisProviderBinding,
     analysis_provider_candidates: analysisProviderCandidates,

src/application/binary/CompositeProvider.test.ts

@@ -9,6 +9,7 @@ import {
   type ProviderIdentity,
 } from "../AnalysisProvider.js";
 import { ProviderCleanupError } from "../../domain/providerCleanupError.js";
+import { projectAnalysisError } from "../../domain/analysisErrorProjection.js";
 import { err, ok } from "../../domain/result.js";
 import { CompositeProvider } from "./CompositeProvider.js";
 
@@ -44,10 +45,15 @@ const failingProvider = (
   resource: string,
 ) => {
   const providerIdentity = identity(id);
-  const cleanupError = new ProviderCleanupError(id, [resource], {
-    reason: `${id} cleanup is unresolved`,
-    child_marker: `${id}-detail`,
-  });
+  const cleanupError = new ProviderCleanupError(
+    id,
+    [resource],
+    {
+      reason: `${id} cleanup is unresolved`,
+      child_marker: `${id}-detail`,
+    },
+    { remediationAction: `Resolve ${resource} before retrying ${id}.` },
+  );
   const close = vi.fn(async () => err(cleanupError));
   const provider: AnalysisProvider = {
     identity: () => providerIdentity,
@@ -98,6 +104,13 @@ it("retains every failed child resource across composite cleanup retries", async
       },
     });
     expect(closed.error).toBeInstanceOf(ProviderCleanupError);
+    const projected = projectAnalysisError(closed.error);
+    expect(projected.remediation.action).toContain(
+      "Resolve left-db before retrying provider-left.",
+    );
+    expect(projected.remediation.action).toContain(
+      "Resolve right-db before retrying provider-right.",
+    );
     expect(closed.error.diagnostics).toMatchObject({
       failures: [
         {
@@ -127,3 +140,97 @@ it("preserves one child's typed cleanup error unchanged", async () => {
   if (closed.ok) throw new Error("Expected child cleanup failure");
   expect(closed.error).toBe(child.cleanupError);
 });
+
+it("does not close a child again after its cleanup succeeded", async () => {
+  const firstIdentity = identity("provider-first");
+  const secondIdentity = identity("provider-second");
+  let secondCloseAttempts = 0;
+  const firstClose = vi.fn(async () => ok(null));
+  const secondClose = vi.fn(async () => {
+    secondCloseAttempts += 1;
+    return secondCloseAttempts === 1
+      ? err(new ProviderCleanupError("provider-second", ["second-db"], {}))
+      : ok(null);
+  });
+  const makeProvider = (
+    providerIdentity: ProviderIdentity,
+    operation: Exclude<AnalysisOperation, "health">,
+    close: AnalysisClient["close"],
+  ): AnalysisProvider => ({
+    identity: () => providerIdentity,
+    capabilities: () => [operationCapability(providerIdentity, operation)],
+    createClient: () => ({
+      execute: async () => ok(createAnalysisExecution(null, providerIdentity)),
+      close,
+    }),
+  });
+  const client = new CompositeProvider([
+    makeProvider(firstIdentity, "address_name", firstClose),
+    makeProvider(secondIdentity, "procedure_info", secondClose),
+  ]).createClient(executableTarget);
+  await client.execute("address_name", {});
+  await client.execute("procedure_info", {});
+
+  expect((await client.close({ retainDocument: true })).ok).toBe(false);
+  expect((await client.close()).ok).toBe(true);
+  expect(firstClose).toHaveBeenCalledTimes(1);
+  expect(secondClose).toHaveBeenCalledTimes(2);
+  expect((await client.close({ retainDocument: true })).ok).toBe(true);
+  expect(firstClose).toHaveBeenCalledTimes(1);
+  expect(secondClose).toHaveBeenCalledTimes(2);
+});
+
+it.each(["busy", "unknown", "idle", undefined] as const)(
+  "keeps partial health truthful with child state %s and an unobserved peer",
+  async (state) => {
+    const observedIdentity = identity("provider-observed");
+    const unobservedIdentity = identity("provider-unobserved");
+    const observed: AnalysisProvider = {
+      identity: () => observedIdentity,
+      capabilities: () => [
+        operationCapability(observedIdentity, "address_name"),
+      ],
+      createClient: () => ({
+        execute: async () =>
+          ok(createAnalysisExecution(null, observedIdentity)),
+        operationHealthSnapshot: () =>
+          state === undefined
+            ? undefined
+            : {
+                state,
+                stage: state === "idle" ? null : "analysis",
+                retryAction:
+                  state === "busy"
+                    ? "wait"
+                    : state === "idle"
+                      ? null
+                      : "unknown",
+                exitCode: null,
+                requests: [],
+              },
+        close: async () => ok(null),
+      }),
+    };
+    const unobserved: AnalysisProvider = {
+      identity: () => unobservedIdentity,
+      capabilities: () => [
+        operationCapability(unobservedIdentity, "procedure_info"),
+      ],
+      createClient: () => ({
+        execute: async () =>
+          ok(createAnalysisExecution(null, unobservedIdentity)),
+        close: async () => ok(null),
+      }),
+    };
+    const client = new CompositeProvider([observed, unobserved]).createClient(
+      executableTarget,
+    );
+    await client.execute("address_name", {});
+    await client.execute("procedure_info", {});
+
+    if (state === "idle" || state === undefined)
+      expect(client.operationHealthSnapshot?.()).toBeUndefined();
+    else expect(client.operationHealthSnapshot?.()).toMatchObject({ state });
+    expect((await client.close()).ok).toBe(true);
+  },
+);

src/application/binary/CompositeProvider.ts

@@ -1,6 +1,7 @@
 import { AnalysisCapabilityUnavailableError } from "../../domain/analysisErrorCore.js";
 import { ProviderCleanupError } from "../../domain/providerCleanupError.js";
 import { ProviderAdapterError } from "../../domain/providerAdapterError.js";
+import { projectAnalysisError } from "../../domain/analysisErrorProjection.js";
 import { err, ok } from "../../domain/result.js";
 import type { BinaryTarget } from "../../domain/binaryTargetTypes.js";
 import type { AnalysisProfileCommitment } from "../../domain/analysisProfile.js";
@@ -27,18 +28,20 @@ const compositeProviderIdentity = (
   version: null,
 });
 
-const closeCompositeClients =
-  (
-    identity: ProviderIdentity,
-    clients: ReadonlyMap<AnalysisProvider, AnalysisClient>,
-  ): AnalysisClient["close"] =>
-  async (options) => {
+const closeCompositeClients = (
+  identity: ProviderIdentity,
+  clients: ReadonlyMap<AnalysisProvider, AnalysisClient>,
+): AnalysisClient["close"] => {
+  const completed = new Set<AnalysisClient>();
+  return async (options) => {
     const outcomes = await Promise.all(
-      [...clients.entries()].map(([provider, client]) =>
-        closeAnalysisClient(client, provider.identity().id, options).then(
-          (result) => ({ providerId: provider.identity().id, result }),
-        ),
-      ),
+      [...clients.entries()].map(async ([provider, client]) => {
+        const providerId = provider.identity().id;
+        if (completed.has(client)) return { providerId, result: ok(null) };
+        const result = await closeAnalysisClient(client, providerId, options);
+        if (result.ok) completed.add(client);
+        return { providerId, result };
+      }),
     );
     const failures = outcomes.flatMap(({ providerId, result }) =>
       result.ok ? [] : [{ providerId, error: result.error }],
@@ -68,6 +71,13 @@ const closeCompositeClients =
           })),
         },
         {
+          remediationAction: [
+            ...new Set(
+              failures.map(
+                ({ error }) => projectAnalysisError(error).remediation.action,
+              ),
+            ),
+          ].join("\n"),
           cause: new AggregateError(
             failures.map(({ error }) => error),
             "Composed provider cleanup failed.",
@@ -76,6 +86,7 @@ const closeCompositeClients =
       ),
     );
   };
+};
 
 const executeCompositeHealth = async (
   identity: ProviderIdentity,
@@ -213,13 +224,21 @@ export class CompositeProvider implements AnalysisProvider {
         const snapshots = [...clients.values()].map((client) =>
           client.operationHealthSnapshot?.(),
         );
+        const failed = snapshots.find(
+          (snapshot) =>
+            snapshot !== undefined &&
+            (snapshot.state === "exited" ||
+              snapshot.state === "unreachable" ||
+              snapshot.state === "not_started"),
+        );
+        if (failed !== undefined) return failed;
+        const nonIdle = snapshots.find(
+          (snapshot) => snapshot !== undefined && snapshot.state !== "idle",
+        );
+        if (nonIdle !== undefined) return nonIdle;
         if (snapshots.some((snapshot) => snapshot === undefined))
           return undefined;
-        return (
-          snapshots.find(
-            (snapshot) => snapshot !== undefined && snapshot.state !== "idle",
-          ) ?? snapshots[0]
-        );
+        return snapshots[0];
       },
       close,
     };

src/artifacts/ZipArtifactReader.ts

@@ -127,6 +127,13 @@ class NodeFileReader extends Reader<string> {
     const handle = this.#handle;
     if (handle === undefined) throw new Error("ZIP reader is not initialized");
     const readBytes = Math.min(length, this.size - index);
+    // A central-directory offset can point past EOF. Type that malformed ZIP
+    // read before a negative size reaches Buffer.alloc and becomes an I/O error.
+    if (readBytes < 0)
+      throw new ArtifactReaderFailure(
+        "format",
+        `ZIP archive is malformed: read at ${index} extends beyond the ${this.size}-byte archive`,
+      );
     if (
       this.maximumReadBytes !== undefined &&
       readBytes > this.maximumReadBytes
@@ -191,6 +198,7 @@ export class ZipArtifactReader implements ArtifactReader {
       // ZIP member identity is its directory occurrence, not its filename.
       // Logical path uniqueness belongs to the artifact inventory boundary.
       const metadata = projectZipEntry(entry, index++);
+      if (metadata === undefined) continue;
       // zip.js enforces each member's declared output size, so this sum bounds streamed work.
       if (
         metadata.kind === "file" &&
@@ -258,19 +266,38 @@ export class ZipArtifactReader implements ArtifactReader {
   }
 }
 
-const projectZipEntry = (entry: Entry, index: number): ArtifactEntry => {
-  const symlink = isSymlink(entry);
+const projectZipEntry = (
+  entry: Entry,
+  index: number,
+): ArtifactEntry | undefined => {
+  const kind = isSymlink(entry)
+    ? "symlink"
+    : entry.directory
+      ? "directory"
+      : "file";
+  const sourcePath = zipEntryPath(entry);
+  const path = sourcePath.replace(/^(?:\.\/)+/u, "");
+  // Root directory markers carry no inventory occurrence. A file with this
+  // spelling is still passed to the shared path validator and rejected there.
+  if (kind === "directory" && (path === "" || path === ".")) return undefined;
   return {
-    path: zipEntryPath(entry),
-    kind: entry.directory ? "directory" : symlink ? "symlink" : "file",
-    declaredSize: entry.directory ? null : entry.uncompressedSize,
-    compressedSize: entry.directory ? null : entry.compressedSize,
+    path,
+    kind,
+    declaredSize: kind === "directory" ? null : entry.uncompressedSize,
+    compressedSize: kind === "directory" ? null : entry.compressedSize,
     executable: entry.executable,
     encrypted: entry.encrypted,
     byteOffset: null,
     declaredSha256: null,
     unpacked: false,
-    limitations: symlink ? ["Archive symlink target was not read."] : [],
+    limitations: [
+      ...(kind === "symlink" ? ["Archive symlink target was not read."] : []),
+      ...(path === sourcePath
+        ? []
+        : [
+            `ZIP member name ${JSON.stringify(sourcePath)} has a leading current-directory prefix omitted from its logical path.`,
+          ]),
+    ],
     adapterKey: `zip-entry:${index}`,
   };
 };

src/browser/BrowserScenarioPartialObservation.ts

@@ -57,6 +57,7 @@ const browserScenarioLimitations = (
       ? [
           "CDP attachment cannot recover pre-attach events or guarantee launch-time context options.",
           `Attached locale ${scenario.environment.locale} applies to Intl formatting only; navigator.language(s) and Accept-Language remain caller-controlled. Use launch mode for matching page and request languages.`,
+          "Detaching a CDP page session may clear caller-owned navigator.platform emulation. REA cannot snapshot the caller's complete user-agent/client-hint state before attachment; use launch mode to avoid mutating that external browser.",
         ]
       : []),
   ];

src/browser/PlaywrightBrowserScenarioProvider.test.ts

@@ -78,6 +78,10 @@ const scenario = (
     },
   });
 
+const connectedPlatformEmulationLimitation = expect.stringContaining(
+  "Detaching a CDP page session may clear caller-owned navigator.platform emulation",
+);
+
 type SnapshotKind = BrowserScenario["capture"]["after_each_step"][number];
 
 interface FakeSessionFailures {
@@ -355,7 +359,9 @@ describe("PlaywrightBrowserScenarioProvider", () => {
     expect(session.closeCalls).toBe(1);
     expect(result.value.completeness.equality_eligible).toBe(false);
   });
+});
 
+describe("connected browser scenario captures", () => {
   it("disconnects external CDP sessions and marks pre-attach events missing", async () => {
     const session = new FakeSession("connect");
     const provider = new PlaywrightBrowserScenarioProvider(() =>
@@ -374,8 +380,37 @@ describe("PlaywrightBrowserScenarioProvider", () => {
       equality_eligible: false,
       missing_sections: ["events"],
     });
+    expect(result.value.limitations).toEqual(
+      expect.arrayContaining([connectedPlatformEmulationLimitation]),
+    );
     expect(session.closeCalls).toBe(1);
   });
+
+  it("retains the attached platform-emulation limitation in partial observations", async () => {
+    const session = new FakeSession("connect", {
+      capture: { call: 1, error: new Error("fixture capture failure") },
+    });
+    const provider = new PlaywrightBrowserScenarioProvider(() =>
+      Promise.resolve(session),
+    );
+    const result = await provider.captureScenario(
+      scenario({ mode: "connect" }),
+    );
+
+    expect(result.ok).toBe(false);
+    if (result.ok) return;
+    expect(projectAnalysisError(result.error)).toMatchObject({
+      details: {
+        partial_observation: {
+          capture: {
+            limitations: expect.arrayContaining([
+              connectedPlatformEmulationLimitation,
+            ]),
+          },
+        },
+      },
+    });
+  });
 });
 
 describe("PlaywrightBrowserScenarioProvider timing", () => {

src/browser/WebSourceMapFetcher.ts

@@ -14,6 +14,7 @@ import { parseJavaScriptSource } from "../domain/javascript/javascriptSourcePars
 import {
   isTypeOnlyExportDeclaration,
   isTypeOnlyImportDeclaration,
+  semanticImportEqualsSpecifier,
 } from "../domain/javascript/javascriptModuleDeclaration.js";
 import { stringValue } from "../domain/javascript/javascriptStaticAnalysisHelpers.js";
 import type {
@@ -1100,16 +1101,11 @@ const originalDependency = (
       : { kind: "require", specifier, requireCallee: node.callee };
   }
   // `import x = require("m")` is only legal at module top level and always
-  // refers to the host loader, so it needs no unbound-`require` check. The
-  // `moduleReference` is an entity name for a local alias instead, which
-  // declares no dependency.
-  if (
-    t.isTSImportEqualsDeclaration(node) &&
-    t.isTSExternalModuleReference(node.moduleReference)
-  )
-    return {
-      kind: "require",
-      specifier: node.moduleReference.expression.value,
-    };
+  // refers to the host loader, so it needs no unbound-`require` check. An
+  // entity-name alias or an erased `import type` declares no dependency.
+  if (t.isTSImportEqualsDeclaration(node)) {
+    const specifier = semanticImportEqualsSpecifier(node);
+    return specifier === null ? null : { kind: "require", specifier };
+  }
   return null;
 };

src/cli/adbCommands.ts

@@ -1,16 +1,15 @@
 import { z } from "incur";
-import { AnalysisError } from "../domain/analysisErrorBase.js";
 import { AnalysisInputError } from "../domain/analysisErrorCore.js";
 import { AdbDeviceAnalysisService } from "../application/adb/AdbDeviceAnalysisService.js";
 import type { AdbDeviceAnalysisPort } from "../application/adb/AdbDeviceAnalysisPort.js";
 import { createAdbDeviceAnalysisProvider } from "../composition/adb.js";
 import { CLI_COMMANDS } from "../cliCommandNames.js";
 import { logCliCommand } from "../cliLogging.js";
-import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
 import type { AdbOperation } from "../domain/adb/adbDeviceAnalysis.js";
 import type { Logger } from "pino";
 import type { CliInstance } from "./types.js";
 import { withCommandCancellation } from "./commandCancellation.js";
+import { finishAnalysisCommand } from "./finishAnalysisCommand.js";
 
 /** Expose the same explicit ADB requests through one-shot CLI commands. */
 export const registerAdbCommands = (
@@ -24,17 +23,14 @@ export const registerAdbCommands = (
   const service = new AdbDeviceAnalysisService(provider);
   const execute = (name: string, operation: AdbOperation, input: unknown) =>
     withCommandCancellation((signal) =>
-      logCliCommand(logger, name, async () => {
-        const result = await service.execute(operation, input, { signal });
-        try {
-          await provider.close();
-        } catch (cause) {
-          if (cause instanceof AnalysisError)
-            return projectAnalysisError(cause);
-          throw cause;
-        }
-        return result.ok ? result.value : projectAnalysisError(result.error);
-      }),
+      logCliCommand(logger, name, () =>
+        finishAnalysisCommand(
+          () => service.execute(operation, input, { signal }),
+          { close: () => provider.close() },
+          "adb",
+          operation,
+        ),
+      ),
     );
 
   const serial = z

src/cli/androidCommands.ts

@@ -1,14 +1,13 @@
 import { z } from "incur";
-import { AnalysisError } from "../domain/analysisErrorBase.js";
 import { AndroidAnalysisService } from "../application/android/AndroidAnalysisService.js";
 import { createAndroidAnalysisProvider } from "../composition/android.js";
 import { CLI_COMMANDS } from "../cliCommandNames.js";
 import { logCliCommand } from "../cliLogging.js";
-import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
 import type { AndroidOperation } from "../domain/android/androidAnalysis.js";
 import type { Logger } from "pino";
 import type { CliInstance } from "./types.js";
 import { withCommandCancellation } from "./commandCancellation.js";
+import { finishAnalysisCommand } from "./finishAnalysisCommand.js";
 
 /** Expose the same explicit APK requests through one-shot CLI commands. */
 export const registerAndroidCommands = (
@@ -20,17 +19,14 @@ export const registerAndroidCommands = (
   const service = new AndroidAnalysisService(provider);
   const execute = (name: string, operation: AndroidOperation, input: unknown) =>
     withCommandCancellation((signal) =>
-      logCliCommand(logger, name, async () => {
-        const result = await service.execute(operation, input, { signal });
-        try {
-          await provider.close();
-        } catch (cause) {
-          if (cause instanceof AnalysisError)
-            return projectAnalysisError(cause);
-          throw cause;
-        }
-        return result.ok ? result.value : projectAnalysisError(result.error);
-      }),
+      logCliCommand(logger, name, () =>
+        finishAnalysisCommand(
+          () => service.execute(operation, input, { signal }),
+          { close: () => provider.close() },
+          "jadx",
+          operation,
+        ),
+      ),
     );
   const path = z.string().describe("Local standalone APK path");
   const className = z.string().describe("Exact fully qualified class name");

src/cli/apktoolCommands.ts

@@ -1,11 +1,9 @@
 import { z } from "incur";
-import { AnalysisError } from "../domain/analysisErrorBase.js";
 import { ApktoolResourceAnalysisService } from "../application/apktool/ApktoolResourceAnalysisService.js";
 import type { ApktoolResourceAnalysisPort } from "../application/apktool/ApktoolResourceAnalysisPort.js";
 import { createApktoolResourceAnalysisProvider } from "../composition/apktool.js";
 import { CLI_COMMANDS } from "../cliCommandNames.js";
 import { logCliCommand } from "../cliLogging.js";
-import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
 import {
   apktoolInputSchemas,
   type ApktoolOperation,
@@ -13,6 +11,7 @@ import {
 import type { Logger } from "pino";
 import type { CliInstance } from "./types.js";
 import { withCommandCancellation } from "./commandCancellation.js";
+import { finishAnalysisCommand } from "./finishAnalysisCommand.js";
 
 /** Expose the same explicit Apktool requests through one-shot CLI commands. */
 export const registerApktoolCommands = (
@@ -26,17 +25,14 @@ export const registerApktoolCommands = (
   const service = new ApktoolResourceAnalysisService(provider);
   const execute = (name: string, operation: ApktoolOperation, input: unknown) =>
     withCommandCancellation((signal) =>
-      logCliCommand(logger, name, async () => {
-        const result = await service.execute(operation, input, { signal });
-        try {
-          await provider.close();
-        } catch (cause) {
-          if (cause instanceof AnalysisError)
-            return projectAnalysisError(cause);
-          throw cause;
-        }
-        return result.ok ? result.value : projectAnalysisError(result.error);
-      }),
+      logCliCommand(logger, name, () =>
+        finishAnalysisCommand(
+          () => service.execute(operation, input, { signal }),
+          { close: () => provider.close() },
+          "apktool",
+          operation,
+        ),
+      ),
     );
 
   cli.command(CLI_COMMANDS.inspectApktoolClient, {

src/cli/cutterCommands.ts

@@ -8,6 +8,7 @@ import { logCliCommand } from "../cliLogging.js";
 import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
 import { withCommandCancellation } from "./commandCancellation.js";
 import type { CliInstance } from "./types.js";
+import { cliIntegerArgument } from "./options.js";
 
 /** Register commands that control an already-running Cutter instance. */
 export const registerCutterCommands = (
@@ -33,11 +34,9 @@ export const registerCutterCommands = (
         .string()
         .uuid()
         .describe("Session ID copied from list-cutter-sessions."),
-      expectedGeneration: z.coerce
-        .number()
-        .int()
-        .nonnegative()
-        .describe("Session generation returned by list-cutter-sessions."),
+      expectedGeneration: cliIntegerArgument(0).describe(
+        "Session generation returned by list-cutter-sessions.",
+      ),
       command: z
         .string()
         .min(1)

src/cli/evmCommands.ts

@@ -1,11 +1,11 @@
 import { z } from "incur";
 import { evmInterfaceModule } from "../composition/evm.js";
 import { logCliCommand } from "../cliLogging.js";
-import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
 import type { Logger } from "pino";
 import type { CliInstance } from "./types.js";
 import { withCommandCancellation } from "./commandCancellation.js";
 import { absoluteCallerPath } from "../filesystem/callerPath.js";
+import { finishAnalysisCommand } from "./finishAnalysisCommand.js";
 
 /** Resolve operator paths and preserve explicit encoding through the shared workflow. */
 export const registerEvmCommands = (
@@ -23,27 +23,22 @@ export const registerEvmCommands = (
         .describe("Selected carrier representation"),
     }),
     run: ({ args }) =>
-      withCommandCancellation(async (signal) => {
-        try {
-          return await logCliCommand(
-            logger,
-            evmInterfaceModule.cliCommand,
-            async () => {
-              const result = await service.inspect(
+      withCommandCancellation((signal) =>
+        logCliCommand(logger, evmInterfaceModule.cliCommand, () =>
+          finishAnalysisCommand(
+            () =>
+              service.inspect(
                 {
                   path: absoluteCallerPath(args.path),
                   encoding: args.encoding,
                 },
                 { signal },
-              );
-              return result.ok
-                ? result.value
-                : projectAnalysisError(result.error);
-            },
-          );
-        } finally {
-          await service.close();
-        }
-      }),
+              ),
+            service,
+            "evmole-interface",
+            "inspect_evm_interface",
+          ),
+        ),
+      ),
   });
 };

src/cli/firmwareCommands.ts

@@ -5,12 +5,12 @@ import { CLI_COMMANDS } from "../cliCommandNames.js";
 import { logCliCommand } from "../cliLogging.js";
 import { firmwareInputSchemas } from "../domain/firmware/firmwareAnalysis.js";
 import { localPathStringSchema } from "../domain/localPath.js";
-import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
 import type { FirmwareOperation } from "../domain/firmware/firmwareAnalysis.js";
 import type { Logger } from "pino";
 import type { CliInstance } from "./types.js";
 import { withCommandCancellation } from "./commandCancellation.js";
 import { absoluteCallerPath } from "../filesystem/callerPath.js";
+import { finishAnalysisCommand } from "./finishAnalysisCommand.js";
 
 /** One-shot firmware CLI commands backed by the same workflows as MCP. */
 export const registerFirmwareCommands = (
@@ -29,14 +29,14 @@ export const registerFirmwareCommands = (
     input: unknown,
   ) =>
     withCommandCancellation((signal) =>
-      logCliCommand(logger, name, async () => {
-        try {
-          const result = await service.execute(operation, input, { signal });
-          return result.ok ? result.value : projectAnalysisError(result.error);
-        } finally {
-          await service.close();
-        }
-      }),
+      logCliCommand(logger, name, () =>
+        finishAnalysisCommand(
+          () => service.execute(operation, input, { signal }),
+          service,
+          operation === "inspect_firmware_regions" ? "binwalk" : "unblob",
+          operation,
+        ),
+      ),
     );
   const path = localPathStringSchema.describe(
     "Local firmware path; never executed",

src/cli/flutterCommands.ts

@@ -1,15 +1,14 @@
 import { z } from "incur";
-import { AnalysisError } from "../domain/analysisErrorBase.js";
 import { FlutterBuildAnalysisService } from "../application/flutter/FlutterBuildAnalysisService.js";
 import type { FlutterBuildAnalysisPort } from "../application/flutter/FlutterBuildAnalysisPort.js";
 import { createFlutterBuildAnalysisProvider } from "../composition/flutter.js";
 import { CLI_COMMANDS } from "../cliCommandNames.js";
 import { logCliCommand } from "../cliLogging.js";
-import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
 import type { FlutterOperation } from "../domain/flutter/flutterBuildAnalysis.js";
 import type { Logger } from "pino";
 import type { CliInstance } from "./types.js";
 import { withCommandCancellation } from "./commandCancellation.js";
+import { finishAnalysisCommand } from "./finishAnalysisCommand.js";
 
 /** One flutter command: CLI shape and the request it produces. */
 interface FlutterCommandSpec {
@@ -74,23 +73,19 @@ export const registerFlutterCommands = (
         : { args: spec.argumentSchema, options: spec.optionSchema }),
       run: ({ args, options }) =>
         withCommandCancellation((signal) =>
-          logCliCommand(logger, spec.command, async () => {
-            const settled = await new FlutterBuildAnalysisService(
-              provider,
-            ).execute(spec.operation, spec.toInput(args, options ?? {}), {
-              signal,
-            });
-            try {
-              await provider.close();
-            } catch (cause) {
-              if (cause instanceof AnalysisError)
-                return projectAnalysisError(cause);
-              throw cause;
-            }
-            return settled.ok
-              ? settled.value
-              : projectAnalysisError(settled.error);
-          }),
+          logCliCommand(logger, spec.command, () =>
+            finishAnalysisCommand(
+              () =>
+                new FlutterBuildAnalysisService(provider).execute(
+                  spec.operation,
+                  spec.toInput(args, options ?? {}),
+                  { signal },
+                ),
+              { close: () => provider.close() },
+              "flutter",
+              spec.operation,
+            ),
+          ),
         ),
     });
   }

src/cli/javascriptRecoveryCommands.ts

@@ -3,10 +3,10 @@ import { JavaScriptRecoveryService } from "../application/javascript/JavaScriptR
 import { createJavaScriptRecoveryProvider } from "../composition/javascriptRecovery.js";
 import { CLI_COMMANDS } from "../cliCommandNames.js";
 import { logCliCommand } from "../cliLogging.js";
-import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
 import type { Logger } from "pino";
 import type { CliInstance } from "./types.js";
 import { withCommandCancellation } from "./commandCancellation.js";
+import { finishAnalysisCommand } from "./finishAnalysisCommand.js";
 
 /** Share source recovery with MCP while keeping CLI spelling at this boundary. */
 export const registerJavaScriptRecoveryCommands = (
@@ -47,13 +47,11 @@ export const registerJavaScriptRecoveryCommands = (
         ),
     }),
     run: ({ args, options }) =>
-      withCommandCancellation(async (signal) => {
-        try {
-          return await logCliCommand(
-            logger,
-            CLI_COMMANDS.recoverJavaScriptSources,
-            async () => {
-              const result = await service.recover(
+      withCommandCancellation((signal) =>
+        logCliCommand(logger, CLI_COMMANDS.recoverJavaScriptSources, () =>
+          finishAnalysisCommand(
+            () =>
+              service.recover(
                 {
                   path: args.path,
                   output_directory: args.outputDirectory,
@@ -68,15 +66,12 @@ export const registerJavaScriptRecoveryCommands = (
                     : { rewrite_level: options.rewriteLevel }),
                 },
                 { signal },
-              );
-              return result.ok
-                ? result.value
-                : projectAnalysisError(result.error);
-            },
-          );
-        } finally {
-          await service.close();
-        }
-      }),
+              ),
+            service,
+            "wakaru",
+            "recover_javascript_sources",
+          ),
+        ),
+      ),
   });
 };

src/cli/jebCommands.ts

@@ -1,15 +1,14 @@
 import { z } from "incur";
-import { AnalysisError } from "../domain/analysisErrorBase.js";
 import { JebAnalysisService } from "../application/jeb/JebAnalysisService.js";
 import type { JebAnalysisPort } from "../application/jeb/JebAnalysisPort.js";
 import { createJebAnalysisProvider } from "../composition/jeb.js";
 import { CLI_COMMANDS } from "../cliCommandNames.js";
 import { logCliCommand } from "../cliLogging.js";
-import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
 import type { JebOperation } from "../domain/jeb/jebAnalysis.js";
 import type { Logger } from "pino";
 import type { CliInstance } from "./types.js";
 import { withCommandCancellation } from "./commandCancellation.js";
+import { finishAnalysisCommand } from "./finishAnalysisCommand.js";
 
 /** Expose the same explicit JEB requests through one-shot CLI commands. */
 export const registerJebCommands = (
@@ -21,17 +20,14 @@ export const registerJebCommands = (
   const service = new JebAnalysisService(provider);
   const execute = (name: string, operation: JebOperation, input: unknown) =>
     withCommandCancellation((signal) =>
-      logCliCommand(logger, name, async () => {
-        const result = await service.execute(operation, input, { signal });
-        try {
-          await provider.close();
-        } catch (cause) {
-          if (cause instanceof AnalysisError)
-            return projectAnalysisError(cause);
-          throw cause;
-        }
-        return result.ok ? result.value : projectAnalysisError(result.error);
-      }),
+      logCliCommand(logger, name, () =>
+        finishAnalysisCommand(
+          () => service.execute(operation, input, { signal }),
+          { close: () => provider.close() },
+          "jeb",
+          operation,
+        ),
+      ),
     );
 
   cli.command(CLI_COMMANDS.inspectJebClient, {

src/cli/options.ts

@@ -1,3 +1,5 @@
+import { z } from "incur";
+
 import {
   executableFormatHintSchema,
   type ExecutableFormatHint,
@@ -11,6 +13,13 @@ import { analysisProviderSelectorSchema } from "../contracts/providerSelection.j
 import type { AnalysisProviderSelector } from "../contracts/providerSelection.js";
 import type { Logger } from "pino";
 
+/** Parse decimal integer tokens before Number coercion can erase their syntax. */
+export const cliIntegerArgument = (min: number) =>
+  z
+    .string()
+    .regex(/^[0-9]+$/u, "Expected a decimal integer")
+    .pipe(z.coerce.number<string>().safe().min(min));
+
 export const providerSelectionOption = analysisProviderSelectorSchema
   .optional()
   .describe(

src/cli/pcapCommands.ts

@@ -1,16 +1,14 @@
 import { z } from "incur";
-import { AnalysisError } from "../domain/analysisErrorBase.js";
-import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js";
 import { PcapAnalysisService } from "../application/pcap/PcapAnalysisService.js";
 import type { PcapAnalysisPort } from "../application/pcap/PcapAnalysisPort.js";
 import { createPcapAnalysisProvider } from "../composition/pcap.js";
 import { CLI_COMMANDS } from "../cliCommandNames.js";
 import { logCliCommand } from "../cliLogging.js";
-import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
 import type { PcapOperation } from "../domain/pcap/pcapAnalysis.js";
 import type { Logger } from "pino";
 import type { CliInstance } from "./types.js";
 import { withCommandCancellation } from "./commandCancellation.js";
+import { finishAnalysisCommand } from "./finishAnalysisCommand.js";
 
 /** Expose the same explicit pcap requests through one-shot CLI commands. */
 export const registerPcapCommands = (
@@ -22,27 +20,14 @@ export const registerPcapCommands = (
   const service = new PcapAnalysisService(provider);
   const execute = (name: string, operation: PcapOperation, input: unknown) =>
     withCommandCancellation((signal) =>
-      logCliCommand(logger, name, async () => {
-        const result = await service.execute(operation, input, { signal });
-        try {
-          await provider.close();
-        } catch (cause) {
-          if (cause instanceof AnalysisError) {
-            if (result.ok) cause.retainPartialObservation(result.value);
-            return projectAnalysisError(
-              result.ok
-                ? cause
-                : analysisErrorWithCleanupFailure(
-                    result.error,
-                    cause,
-                    operation,
-                  ),
-            );
-          }
-          throw cause;
-        }
-        return result.ok ? result.value : projectAnalysisError(result.error);
-      }),
+      logCliCommand(logger, name, () =>
+        finishAnalysisCommand(
+          () => service.execute(operation, input, { signal }),
+          { close: () => provider.close() },
+          "pcap",
+          operation,
+        ),
+      ),
     );
 
   cli.command(CLI_COMMANDS.inspectPcapClient, {

src/cli/sqliteCommands.ts

@@ -2,13 +2,11 @@ import { z } from "incur";
 import { createSqliteDatabaseService } from "../composition/sqlite.js";
 import { CLI_COMMANDS } from "../cliCommandNames.js";
 import { logCliCommand } from "../cliLogging.js";
-import { AnalysisError } from "../domain/analysisErrorBase.js";
-import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js";
-import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
 import type { Logger } from "pino";
 import type { CliInstance } from "./types.js";
 import { withCommandCancellation } from "./commandCancellation.js";
 import { absoluteCallerPath } from "../filesystem/callerPath.js";
+import { finishAnalysisCommand } from "./finishAnalysisCommand.js";
 
 /** Resolve an operator-selected SQLite snapshot through the shared inspection workflow. */
 export const registerSqliteCommands = (
@@ -51,61 +49,32 @@ export const registerSqliteCommands = (
     }),
     run: ({ args, options }) =>
       withCommandCancellation((signal) =>
-        logCliCommand(logger, CLI_COMMANDS.inspectSqliteDatabase, async () => {
-          const inspection = await service
-            .inspect(
-              {
-                path: absoluteCallerPath(args.path),
-                ...(options.table === undefined
-                  ? {}
-                  : { table: options.table }),
-                ...(options.rowLimit === undefined
-                  ? {}
-                  : { row_limit: options.rowLimit }),
-                ...(options.column === undefined
-                  ? {}
-                  : { columns: options.column }),
-                ...(options.schemaScope === undefined
-                  ? {}
-                  : { schema_scope: options.schemaScope }),
-              },
-              { signal },
-            )
-            .then(
-              (result) => ({ result }),
-              (cause: unknown) => ({ cause }),
-            );
-          try {
-            await service.close();
-          } catch (cause: unknown) {
-            const primary =
-              "cause" in inspection
-                ? inspection.cause
-                : inspection.result.ok
-                  ? undefined
-                  : inspection.result.error;
-            if (
-              primary instanceof AnalysisError &&
-              cause instanceof AnalysisError
-            )
-              throw analysisErrorWithCleanupFailure(
-                primary,
-                cause,
-                "inspect_sqlite_database",
-              );
-            if ("cause" in inspection)
-              throw new AggregateError(
-                [inspection.cause, cause],
-                "SQLite inspection and provider cleanup both failed",
-                { cause: inspection.cause },
-              );
-            throw cause;
-          }
-          if ("cause" in inspection) throw inspection.cause;
-          return inspection.result.ok
-            ? inspection.result.value
-            : projectAnalysisError(inspection.result.error);
-        }),
+        logCliCommand(logger, CLI_COMMANDS.inspectSqliteDatabase, () =>
+          finishAnalysisCommand(
+            () =>
+              service.inspect(
+                {
+                  path: absoluteCallerPath(args.path),
+                  ...(options.table === undefined
+                    ? {}
+                    : { table: options.table }),
+                  ...(options.rowLimit === undefined
+                    ? {}
+                    : { row_limit: options.rowLimit }),
+                  ...(options.column === undefined
+                    ? {}
+                    : { columns: options.column }),
+                  ...(options.schemaScope === undefined
+                    ? {}
+                    : { schema_scope: options.schemaScope }),
+                },
+                { signal },
+              ),
+            service,
+            "sqlite",
+            "inspect_sqlite_database",
+          ),
+        ),
       ),
   });
 };

src/cli/wasmCommands.ts

@@ -9,6 +9,7 @@ import type { Logger } from "pino";
 import type { CliInstance } from "./types.js";
 import { withCommandCancellation } from "./commandCancellation.js";
 import { absoluteCallerPath } from "../filesystem/callerPath.js";
+import { finishAnalysisCommand } from "./finishAnalysisCommand.js";
 
 /** Resolve all caller-selected artifact paths through the shared workflow. */
 export const registerWasmCommands = (
@@ -56,13 +57,11 @@ export const registerWasmCommands = (
         .describe("Explicit local WASM candidates"),
     }),
     run: ({ args, options }) =>
-      withCommandCancellation(async (signal) => {
-        try {
-          return await logCliCommand(
-            logger,
-            wasmArtifactModule.cliCommand,
-            async () => {
-              const result = await service.inspect(
+      withCommandCancellation((signal) =>
+        logCliCommand(logger, wasmArtifactModule.cliCommand, () =>
+          finishAnalysisCommand(
+            () =>
+              service.inspect(
                 {
                   path: absoluteCallerPath(args.path),
                   glue_paths: options.glue_paths?.map((path) =>
@@ -73,15 +72,12 @@ export const registerWasmCommands = (
                   ),
                 },
                 { signal },
-              );
-              return result.ok
-                ? result.value
-                : projectAnalysisError(result.error);
-            },
-          );
-        } finally {
-          await service.close();
-        }
-      }),
+              ),
+            service,
+            "wabt-artifact",
+            "inspect_wasm_artifact",
+          ),
+        ),
+      ),
   });
 };

src/cli/webModuleCommands.ts

@@ -2,11 +2,12 @@ import { z } from "incur";
 import { createWebModuleTraceService } from "../composition/webModules.js";
 import { CLI_COMMANDS } from "../cliCommandNames.js";
 import { logCliCommand } from "../cliLogging.js";
-import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
 import { webModuleTraceInputSchema } from "../domain/webModuleTrace.js";
 import type { Logger } from "pino";
 import type { CliInstance } from "./types.js";
+import { cliIntegerArgument } from "./options.js";
 import { withCommandCancellation } from "./commandCancellation.js";
+import { finishAnalysisCommand } from "./finishAnalysisCommand.js";
 
 const importMapInputSchema =
   webModuleTraceInputSchema.shape.import_map.unwrap();
@@ -23,11 +24,9 @@ export const registerWebModuleCommands = (
       "Trace one captured script's native imports to URLs and captured source candidates",
     args: z.object({
       manifestPath: webModuleTraceInputSchema.shape.manifest_path,
-      scriptIndex: z.coerce
-        .number()
-        .int()
-        .min(0)
-        .describe("Zero-based manifest script index"),
+      scriptIndex: cliIntegerArgument(0).describe(
+        "Zero-based manifest script index",
+      ),
     }),
     options: z.object({
       importerUrl: webModuleTraceInputSchema.shape.importer_url,
@@ -41,13 +40,11 @@ export const registerWebModuleCommands = (
         .describe("HTTP(S) import-map base URL; requires --import-map-path"),
     }),
     run: ({ args, options }) =>
-      withCommandCancellation(async (signal) => {
-        try {
-          return await logCliCommand(
-            logger,
-            CLI_COMMANDS.traceWebModuleImports,
-            async () => {
-              const result = await service.trace(
+      withCommandCancellation((signal) =>
+        logCliCommand(logger, CLI_COMMANDS.traceWebModuleImports, () =>
+          finishAnalysisCommand(
+            () =>
+              service.trace(
                 {
                   manifest_path: args.manifestPath,
                   script_index: args.scriptIndex,
@@ -65,15 +62,12 @@ export const registerWebModuleCommands = (
                       }),
                 },
                 { signal },
-              );
-              return result.ok
-                ? result.value
-                : projectAnalysisError(result.error);
-            },
-          );
-        } finally {
-          await service.close();
-        }
-      }),
+              ),
+            service,
+            "web-module-trace",
+            "trace_web_module_imports",
+          ),
+        ),
+      ),
   });
 };

src/cli/webNetworkCaptureCommands.ts

@@ -5,6 +5,7 @@ import { CLI_COMMANDS } from "../cliCommandNames.js";
 import { logCliCommand } from "../cliLogging.js";
 import type { Logger } from "pino";
 import type { CliInstance } from "./types.js";
+import { cliIntegerArgument } from "./options.js";
 import { withCommandCancellation } from "./commandCancellation.js";
 import { finishAnalysisCommand } from "./finishAnalysisCommand.js";
 
@@ -26,7 +27,7 @@ export const registerWebNetworkCaptureCommands = (
     }),
     options: z.object({
       record: z
-        .array(z.coerce.number().int().nonnegative())
+        .array(cliIntegerArgument(0))
         .optional()
         .describe("Zero-based producer ordinals; repeat to select several"),
       sensitiveValue: z

src/cli/webSourceLocationCommands.ts

@@ -2,10 +2,11 @@ import { z } from "incur";
 import { createWebSourceLocationService } from "../composition/webSourceLocations.js";
 import { CLI_COMMANDS } from "../cliCommandNames.js";
 import { logCliCommand } from "../cliLogging.js";
-import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
 import type { Logger } from "pino";
 import type { CliInstance } from "./types.js";
+import { cliIntegerArgument } from "./options.js";
 import { withCommandCancellation } from "./commandCancellation.js";
+import { finishAnalysisCommand } from "./finishAnalysisCommand.js";
 
 /** Expose the same explicit selected map/point contract through the CLI. */
 export const registerWebSourceLocationCommands = (
@@ -21,30 +22,24 @@ export const registerWebSourceLocationCommands = (
       manifestPath: z
         .string()
         .describe("Absolute export_web_scripts manifest path"),
-      scriptIndex: z.coerce
-        .number()
-        .int()
-        .min(0)
-        .describe("Zero-based manifest script index"),
+      scriptIndex: cliIntegerArgument(0).describe(
+        "Zero-based manifest script index",
+      ),
       sourceMapPath: z.string().describe("Absolute local source-map path"),
       sourceMapUrl: z
         .string()
         .describe("Absolute source-map URL context; no fetch"),
-      line: z.coerce.number().int().min(1).describe("One-based generated line"),
-      column: z.coerce
-        .number()
-        .int()
-        .min(0)
-        .describe("Zero-based UTF-16 generated column"),
+      line: cliIntegerArgument(1).describe("One-based generated line"),
+      column: cliIntegerArgument(0).describe(
+        "Zero-based UTF-16 generated column",
+      ),
     }),
     run: ({ args }) =>
-      withCommandCancellation(async (signal) => {
-        try {
-          return await logCliCommand(
-            logger,
-            CLI_COMMANDS.traceWebSourceLocation,
-            async () => {
-              const result = await service.trace(
+      withCommandCancellation((signal) =>
+        logCliCommand(logger, CLI_COMMANDS.traceWebSourceLocation, () =>
+          finishAnalysisCommand(
+            () =>
+              service.trace(
                 {
                   manifest_path: args.manifestPath,
                   script_index: args.scriptIndex,
@@ -55,15 +50,12 @@ export const registerWebSourceLocationCommands = (
                   generated_position: { line: args.line, column: args.column },
                 },
                 { signal },
-              );
-              return result.ok
-                ? result.value
-                : projectAnalysisError(result.error);
-            },
-          );
-        } finally {
-          await service.close();
-        }
-      }),
+              ),
+            service,
+            "web-source-location",
+            "trace_web_source_location",
+          ),
+        ),
+      ),
   });
 };

src/config/parseConfig.ts

@@ -43,7 +43,12 @@ export const defaultHopperLauncherPath = (
 export const parseConfig = (
   environment: Readonly<Record<string, string | undefined>>,
 ): Result<AppConfig, ConfigurationError> => {
-  const parsed = parseEnvironment(environment);
+  // JEB validates its own timeout during optional provider composition. It is
+  // not an AppConfig setting and must not prevent unrelated CLI/MCP startup.
+  // Registration validation still checks the complete environment directly.
+  const { REA_JEB_MCP_TIMEOUT_MS: _jebTimeout, ...appEnvironment } =
+    environment;
+  const parsed = parseEnvironment(appEnvironment);
   if (!parsed.ok) return parsed;
   const env = parsed.value;
   return ok({

src/contracts/inputSchemaPresentation.ts

@@ -146,6 +146,195 @@ const inputGroup = (branch: Readonly<Record<string, unknown>>): string => {
   return [...required, ...optional].join(" + ");
 };
 
+type SchemaNormalization = {
+  readonly schema: unknown;
+  readonly changed: boolean;
+};
+
+const isBooleanLiteralSchema = (schema: unknown): boolean =>
+  isObject(schema) &&
+  (typeof schema.const === "boolean" ||
+    (Array.isArray(schema.enum) &&
+      schema.enum.length > 0 &&
+      schema.enum.every((value) => typeof value === "boolean")));
+
+const isBooleanSchema = (schema: unknown): boolean =>
+  isObject(schema) &&
+  (schema.type === "boolean" || isBooleanLiteralSchema(schema));
+
+const preserveSharedDefault = (
+  schema: Record<string, unknown>,
+  branches: readonly unknown[],
+): void => {
+  if (schema.default !== undefined) return;
+  const defaults = branches
+    .filter(isObject)
+    .map((branch) => branch.default)
+    .filter((value) => value !== undefined);
+  if (
+    defaults.length > 0 &&
+    defaults.every((value) => isDeepStrictEqual(value, defaults[0]))
+  )
+    schema.default = defaults[0];
+};
+
+const normalizeAdvertisedSchema = (value: unknown): SchemaNormalization => {
+  if (!isObject(value)) return { schema: value, changed: false };
+
+  const node: Record<string, unknown> = { ...value };
+  let changed = false;
+  const normalizeMap = (map: Readonly<Record<string, unknown>>) =>
+    Object.fromEntries(
+      Object.entries(map).map(([name, child]) => {
+        const result = normalizeAdvertisedSchema(child);
+        changed ||= result.changed;
+        return [name, result.schema];
+      }),
+    );
+  const normalizeList = (list: readonly unknown[]) =>
+    list.map((child) => {
+      const result = normalizeAdvertisedSchema(child);
+      changed ||= result.changed;
+      return result;
+    });
+
+  for (const [key, child] of Object.entries(value)) {
+    if (schemaMaps.has(key) && isObject(child)) {
+      node[key] = normalizeMap(child);
+    } else if (
+      schemaArrays.has(key) &&
+      key !== "anyOf" &&
+      key !== "oneOf" &&
+      Array.isArray(child)
+    ) {
+      node[key] = normalizeList(child).map((result) => result.schema);
+    } else if (
+      schemaChildren.has(key) &&
+      key !== "not" &&
+      key !== "if" &&
+      key !== "then" &&
+      key !== "else"
+    ) {
+      const results = Array.isArray(child)
+        ? normalizeList(child)
+        : [normalizeAdvertisedSchema(child)];
+      const nestedChanged = results.some((result) => result.changed);
+      if (
+        key === "contains" &&
+        nestedChanged &&
+        value.maxContains !== undefined
+      ) {
+        delete node.contains;
+        delete node.minContains;
+        delete node.maxContains;
+        changed = true;
+      } else {
+        node[key] = Array.isArray(child)
+          ? results.map((result) => result.schema)
+          : results[0]?.schema;
+        changed ||= nestedChanged;
+      }
+    }
+  }
+
+  if (typeof node.const === "boolean") {
+    delete node.const;
+    if (node.type === undefined) node.type = "boolean";
+    changed = true;
+  }
+  if (
+    Array.isArray(node.enum) &&
+    node.enum.length > 0 &&
+    node.enum.every((item) => typeof item === "boolean")
+  ) {
+    delete node.enum;
+    if (node.type === undefined) node.type = "boolean";
+    changed = true;
+  }
+
+  const negated = Object.hasOwn(value, "not")
+    ? normalizeAdvertisedSchema(value.not)
+    : undefined;
+  if (negated?.changed) {
+    // Widening a predicate under `not` narrows the containing schema.
+    changed = true;
+    delete node.not;
+  } else if (negated !== undefined) {
+    node.not = negated.schema;
+  }
+
+  const conditional = Object.hasOwn(value, "if")
+    ? normalizeAdvertisedSchema(value.if)
+    : undefined;
+  const thenBranch = Object.hasOwn(value, "then")
+    ? normalizeAdvertisedSchema(value.then)
+    : undefined;
+  const elseBranch = Object.hasOwn(value, "else")
+    ? normalizeAdvertisedSchema(value.else)
+    : undefined;
+  if (conditional?.changed) {
+    // Changing the predicate can route canonical-valid inputs into a rejecting branch.
+    changed = true;
+    delete node.if;
+    delete node.then;
+    delete node.else;
+  } else {
+    if (conditional !== undefined) node.if = conditional.schema;
+    if (thenBranch !== undefined) {
+      node.then = thenBranch.schema;
+      changed ||= thenBranch.changed;
+    }
+    if (elseBranch !== undefined) {
+      node.else = elseBranch.schema;
+      changed ||= elseBranch.changed;
+    }
+  }
+
+  for (const combinator of ["anyOf", "oneOf"] as const) {
+    const branches = value[combinator];
+    if (!Array.isArray(branches)) continue;
+    const normalized = normalizeList(branches);
+    const schemas = normalized.map((result) => result.schema);
+    const branchesChanged = normalized.some((result) => result.changed);
+    if (combinator === "oneOf" && branchesChanged) {
+      const booleanLiteralsOnly = branches.every(isBooleanLiteralSchema);
+      if (booleanLiteralsOnly) {
+        node.type = "boolean";
+        preserveSharedDefault(node, schemas);
+        delete node.oneOf;
+        changed = true;
+        continue;
+      }
+      // `anyOf` retains branch guidance without allowing widened branches to
+      // reject inputs that were accepted by exactly one canonical branch.
+      delete node.oneOf;
+      if (Array.isArray(node.anyOf)) {
+        const existingAllOf = Array.isArray(node.allOf) ? node.allOf : [];
+        node.allOf = [...existingAllOf, { anyOf: schemas }];
+      } else {
+        node.anyOf = schemas;
+      }
+      changed = true;
+      continue;
+    }
+    if (
+      branchesChanged &&
+      schemas.length > 0 &&
+      schemas.every(isBooleanSchema)
+    ) {
+      node.type = "boolean";
+      preserveSharedDefault(node, schemas);
+      delete node[combinator];
+      changed = true;
+      continue;
+    }
+    node[combinator] = schemas;
+    changed ||= branchesChanged;
+  }
+
+  return { schema: node, changed };
+};
+
 // Anthropic tool input schemas reject anyOf, oneOf, and allOf at the root, and
 // clients then drop the tool or advertise it without parameters. Present a
 // root union of strict object groups as one object whose properties are the
@@ -215,7 +404,11 @@ export const presentInputJsonSchema = (
 ): Record<string, unknown> => {
   const flattened = flattenRootObjectUnion(root);
   const described = describeSchema(flattened, flattened, describeProperty);
-  if (!isObject(described)) return flattened;
+  if (!isObject(described))
+    return normalizeAdvertisedSchema(flattened).schema as Record<
+      string,
+      unknown
+    >;
   const {
     dependencies: _dependencies,
     dependentRequired: _dependentRequired,
@@ -237,85 +430,19 @@ export const presentInputJsonSchema = (
               ]
             : [],
         );
-  if (dependencyGuidance.length === 0) return presentation;
+  if (dependencyGuidance.length === 0)
+    return normalizeAdvertisedSchema(presentation).schema as Record<
+      string,
+      unknown
+    >;
   const description = [
     typeof presentation.description === "string"
       ? presentation.description
       : undefined,
     ...dependencyGuidance,
   ].filter((text) => text !== undefined);
-  return { ...presentation, description: description.join(" ") };
+  return normalizeAdvertisedSchema({
+    ...presentation,
+    description: description.join(" "),
+  }).schema as Record<string, unknown>;
 };
-
-/**
- * Clients that render advertised inputs into SDK declarations expand
- * schema-local references with a shared per-input budget: Pi 1.1.0 code-mode
- * allows 32 expansions and degrades every later reference to `unknown`
- * (morluto/rea#1632), hiding the fields those references describe. The budget
- * counts conservatively — every resolvable, non-cyclic reference occurrence
- * in every schema position — so any reference-resolving client stays within
- * its measured limit.
- */
-export const advertisedReferenceExpansionBudget = 32;
-
-const definitionKeys = new Set(["$defs", "definitions"]);
-
-const countReferenceExpansions = (
-  node: unknown,
-  root: Readonly<Record<string, unknown>>,
-  active: ReadonlySet<string>,
-  count: { value: number },
-): void => {
-  if (Array.isArray(node)) {
-    node.forEach((child) =>
-      countReferenceExpansions(child, root, active, count),
-    );
-    return;
-  }
-  if (!isObject(node)) return;
-  if (typeof node.$ref === "string" && !active.has(node.$ref)) {
-    const target = resolveReference(root, node.$ref);
-    if (target !== undefined) {
-      count.value += 1;
-      countReferenceExpansions(
-        target,
-        root,
-        new Set([...active, node.$ref]),
-        count,
-      );
-      return;
-    }
-  }
-  for (const [key, value] of Object.entries(node)) {
-    if (definitionKeys.has(key)) continue;
-    if (schemaMaps.has(key) && isObject(value)) {
-      for (const child of Object.values(value))
-        countReferenceExpansions(child, root, active, count);
-    } else if (schemaArrays.has(key) || schemaChildren.has(key)) {
-      countReferenceExpansions(value, root, active, count);
-    }
-  }
-};
-
-/** Conservative client expansion count over every schema position. */
-export const countLocalReferenceExpansions = (
-  schema: Record<string, unknown>,
-): number => {
-  const count = { value: 0 };
-  countReferenceExpansions(schema, schema, new Set(), count);
-  return count.value;
-};
-
-/**
- * Keep the shared-definition form of an advertised input while clients can
- * still resolve it. Once rendering would exhaust the reference budget, fall
- * back to the inline projection, which carries no shared definitions for the
- * nonrecursive schemas this repository advertises, so every field renders
- * with complete structure in every reference-resolving client.
- */
-export const inputSchemaWithinReferenceExpansionBudget = (
-  shared: Record<string, unknown>,
-  inline: () => Record<string, unknown>,
-  budget: number,
-): Record<string, unknown> =>
-  countLocalReferenceExpansions(shared) <= budget ? shared : inline();

src/contracts/toolInputReferences.test.ts

@@ -3,12 +3,7 @@ import { Ajv2020 } from "ajv/dist/2020.js";
 import { describe, expect, it } from "vitest";
 import { z } from "zod";
 
-import {
-  advertisedReferenceExpansionBudget,
-  countLocalReferenceExpansions,
-  inputSchemaWithinReferenceExpansionBudget,
-  presentInputJsonSchema,
-} from "./inputSchemaPresentation.js";
+import { presentInputJsonSchema } from "./inputSchemaPresentation.js";
 import { toolContract } from "./toolContracts.js";
 import {
   toolInputSchemaWithMetadata,
@@ -20,27 +15,27 @@ it.each(["draft-2020-12", "draft-07"] as const)(
   "honors projection options independently of cached wire transformations in %s",
   (target) => {
     const range = z.strictObject({ offset: z.number(), length: z.number() });
-    const canonical = toolInputSchemaWithMetadata({
-      ...toolContract("open_binary"),
-      inputSchema: z.strictObject({ before: range, after: range }),
-    });
+    const canonical = z.strictObject({ before: range, after: range });
     const transform = (schema: Record<string, unknown>) => ({
       ...schema,
       title: "Transformed range inputs",
     });
-    const options = { target, libraryOptions: { reused: "inline" as const } };
-    for (const inlineFirst of [false, true]) {
+    const options = { target, libraryOptions: { reused: "ref" as const } };
+    for (const sharedFirst of [false, true]) {
       const wrapped = transformAdvertisedInputJsonSchema(canonical, transform);
       const project = wrapped["~standard"].jsonSchema.input;
-      if (inlineFirst) project(options);
-      const shared = project({ target });
+      if (sharedFirst) project(options);
+      const advertised = project({ target });
+      expect(JSON.stringify(advertised)).not.toContain('"$ref":');
+      expect(advertised).toEqual(
+        transform(canonical["~standard"].jsonSchema.input({ target })),
+      );
+      const shared = project(options);
       expect(JSON.stringify(shared)).toContain('"$ref":');
-      const inline = project(options);
-      expect(inline).toEqual(
+      expect(shared).toEqual(
         transform(canonical["~standard"].jsonSchema.input(options)),
       );
-      expect(JSON.stringify(inline)).not.toContain('"$ref":');
-      expect(project({ target })).toBe(shared);
+      expect(project({ target })).toBe(advertised);
     }
   },
 );
@@ -239,105 +234,6 @@ describe("advertised schema metadata and validation", () => {
   );
 });
 
-describe("advertised reference expansion budget", () => {
-  it("counts references in keyword-named fields, excluding literals", () => {
-    const fields = ["default", "enum", "examples", "const", "$defs"];
-    const schema = {
-      type: "object",
-      properties: Object.fromEntries(
-        fields.map((name) => [name, { $ref: "#/$defs/value" }]),
-      ),
-      $defs: { value: { type: "string" } },
-      default: { $ref: "#/$defs/value" },
-      examples: [{ $ref: "#/$defs/value" }],
-    };
-    expect(countLocalReferenceExpansions(schema)).toBe(fields.length);
-  });
-  const reusedComponent = z
-    .object({ kind: z.literal("rec"), value: z.string() })
-    .strict();
-  const inputWithReusedFields = (count: number) =>
-    z.strictObject(
-      Object.fromEntries(
-        Array.from({ length: count }, (_, index) => [
-          `field_${String(index).padStart(2, "0")}`,
-          reusedComponent,
-        ]),
-      ),
-    );
-  const advertisedInput = (
-    canonical: z.ZodType<Readonly<Record<string, unknown>>>,
-  ) =>
-    toolInputSchemaWithMetadata({
-      ...toolContract("open_binary"),
-      inputSchema: canonical,
-    })["~standard"].jsonSchema.input({ target: "draft-2020-12" });
-
-  it("keeps shared definitions while every client can resolve them", () => {
-    const advertised = advertisedInput(inputWithReusedFields(8));
-    expect(advertised.$defs).toBeDefined();
-    expect(countLocalReferenceExpansions(advertised)).toBe(8);
-  });
-
-  it("keeps shared definitions exactly at the budget", () => {
-    const advertised = advertisedInput(
-      inputWithReusedFields(advertisedReferenceExpansionBudget),
-    );
-    expect(advertised.$defs).toBeDefined();
-    expect(countLocalReferenceExpansions(advertised)).toBe(
-      advertisedReferenceExpansionBudget,
-    );
-  });
-
-  it("re-projects without shared definitions once the budget is exceeded", () => {
-    const advertised = advertisedInput(
-      inputWithReusedFields(advertisedReferenceExpansionBudget + 1),
-    );
-    expect(advertised.$defs).toBeUndefined();
-    expect(countLocalReferenceExpansions(advertised)).toBe(0);
-    const properties = advertised.properties as Record<string, unknown>;
-    expect(properties.field_00).toMatchObject({
-      type: "object",
-      properties: { kind: { const: "rec" }, value: { type: "string" } },
-      required: ["kind", "value"],
-    });
-  });
-
-  it("keeps the shared form untouched when it fits and swaps it when not", () => {
-    const shared = {
-      type: "object",
-      properties: { value: { $ref: "#/$defs/shared" } },
-      $defs: { shared: { type: "string" } },
-    };
-    const inlined = {
-      type: "object",
-      properties: { value: { type: "string" } },
-    };
-    expect(
-      inputSchemaWithinReferenceExpansionBudget(
-        shared,
-        () => inlined,
-        advertisedReferenceExpansionBudget,
-      ),
-    ).toBe(shared);
-    expect(
-      inputSchemaWithinReferenceExpansionBudget(
-        {
-          ...shared,
-          properties: Object.fromEntries(
-            Array.from({ length: 33 }, (_, index) => [
-              `field_${index}`,
-              { $ref: "#/$defs/shared" },
-            ]),
-          ),
-        },
-        () => inlined,
-        advertisedReferenceExpansionBudget,
-      ),
-    ).toBe(inlined);
-  });
-});
-
 describe("root input presentation", () => {
   it("preserves prototype-named properties in object-root presentation", () => {
     const fields = Object.fromEntries([
@@ -483,3 +379,193 @@ describe("root input presentation", () => {
     });
   });
 });
+
+describe("advertised Boolean literals", () => {
+  it("keeps canonical boolean-literal inputs accepted after advertisement", () => {
+    const canonical = {
+      type: "object",
+      properties: {
+        enabled: { type: "boolean", const: false },
+      },
+      required: ["enabled"],
+      additionalProperties: false,
+    };
+    const advertised = presentInputJsonSchema(canonical, () => undefined);
+    const canonicalValidate = new Ajv2020({ strict: false }).compile(canonical);
+    const advertisedValidate = new Ajv2020({ strict: false }).compile(
+      advertised,
+    );
+
+    expect(canonicalValidate({ enabled: false })).toBe(true);
+    expect(canonicalValidate({ enabled: true })).toBe(false);
+    expect(advertisedValidate({ enabled: false })).toBe(true);
+    expect(advertisedValidate({ enabled: true })).toBe(true);
+    expect(advertised.properties).toEqual({ enabled: { type: "boolean" } });
+  });
+
+  it("drops affected negation and conditional groups without rejecting canonical inputs", () => {
+    const negated = {
+      type: "object",
+      properties: {
+        flag: { type: "boolean", not: { const: false } },
+      },
+    };
+    const negatedAdvertisement = presentInputJsonSchema(
+      negated,
+      () => undefined,
+    );
+    const canonicalNegated = new Ajv2020({ strict: false }).compile(negated);
+    const advertisedNegated = new Ajv2020({ strict: false }).compile(
+      negatedAdvertisement,
+    );
+    expect(canonicalNegated({ flag: true })).toBe(true);
+    expect(canonicalNegated({ flag: false })).toBe(false);
+    expect(advertisedNegated({ flag: true })).toBe(true);
+
+    const conditional = {
+      type: "object",
+      properties: {
+        choice: {
+          if: { const: false },
+          then: { type: "string" },
+          else: { type: "boolean" },
+        },
+      },
+    };
+    const conditionalAdvertisement = presentInputJsonSchema(
+      conditional,
+      () => undefined,
+    );
+    const canonicalConditional = new Ajv2020({ strict: false }).compile(
+      conditional,
+    );
+    const advertisedConditional = new Ajv2020({ strict: false }).compile(
+      conditionalAdvertisement,
+    );
+    expect(canonicalConditional({ choice: true })).toBe(true);
+    expect(advertisedConditional({ choice: true })).toBe(true);
+    expect(conditionalAdvertisement.properties).toEqual({
+      choice: {},
+    });
+  });
+});
+
+describe("advertised Boolean schema composition", () => {
+  it("widens an affected oneOf to anyOf when branches could overlap", () => {
+    const canonical = {
+      type: "object",
+      properties: {
+        flag: {
+          oneOf: [{ type: "boolean", const: false }, {}],
+        },
+      },
+    };
+    const advertised = presentInputJsonSchema(canonical, () => undefined);
+    const canonicalValidate = new Ajv2020({ strict: false }).compile(canonical);
+    const advertisedValidate = new Ajv2020({ strict: false }).compile(
+      advertised,
+    );
+    expect(canonicalValidate({ flag: true })).toBe(true);
+    expect(canonicalValidate({ flag: false })).toBe(false);
+    expect(advertisedValidate({ flag: true })).toBe(true);
+    expect(advertised).toHaveProperty(["properties", "flag", "anyOf"]);
+  });
+
+  it("retains nested branch guidance when widening oneOf to anyOf", () => {
+    const canonical = {
+      type: "object",
+      properties: {
+        selection: {
+          oneOf: [
+            {
+              type: "object",
+              properties: {
+                source: { type: "string" },
+                mode: { type: "boolean", const: false },
+              },
+              required: ["source", "mode"],
+              additionalProperties: false,
+            },
+            {
+              type: "object",
+              properties: {
+                target: { type: "string" },
+                mode: { type: "boolean", const: true },
+              },
+              required: ["target", "mode"],
+              additionalProperties: false,
+            },
+          ],
+        },
+      },
+    };
+    const advertised = presentInputJsonSchema(canonical, () => undefined);
+    const canonicalValidate = new Ajv2020({ strict: false }).compile(canonical);
+    const advertisedValidate = new Ajv2020({ strict: false }).compile(
+      advertised,
+    );
+    const example = { selection: { source: "capture.json", mode: false } };
+    expect(canonicalValidate(example)).toBe(true);
+    expect(advertisedValidate(example)).toBe(true);
+    expect(advertised).toMatchObject({
+      properties: {
+        selection: {
+          anyOf: [
+            { properties: { source: { type: "string" } } },
+            { properties: { target: { type: "string" } } },
+          ],
+        },
+      },
+    });
+  });
+
+  it("removes a nested not when widening a boolean item predicate", () => {
+    const canonical = {
+      type: "object",
+      properties: {
+        values: {
+          type: "array",
+          not: { items: { type: "boolean", const: false } },
+        },
+      },
+    };
+    const advertised = presentInputJsonSchema(canonical, () => undefined);
+    const canonicalValidate = new Ajv2020({ strict: false }).compile(canonical);
+    const advertisedValidate = new Ajv2020({ strict: false }).compile(
+      advertised,
+    );
+    expect(canonicalValidate({ values: [true] })).toBe(true);
+    expect(advertisedValidate({ values: [true] })).toBe(true);
+    expect(advertised).toHaveProperty(["properties", "values"], {
+      type: "array",
+    });
+  });
+
+  it("normalizes schema keywords only and preserves literal payloads", () => {
+    const literal = {
+      const: false,
+      enum: [false],
+      properties: { nested: { const: true } },
+    };
+    const presented = presentInputJsonSchema(
+      {
+        type: "object",
+        properties: {
+          default: { type: "boolean", const: false },
+          allowed: { enum: [false, true] },
+          kind: { type: "string", const: "exact" },
+        },
+        default: literal,
+        examples: [literal],
+      },
+      () => undefined,
+    );
+    expect(presented.properties).toEqual({
+      default: { type: "boolean" },
+      allowed: { type: "boolean" },
+      kind: { type: "string", const: "exact" },
+    });
+    expect(presented.default).toEqual(literal);
+    expect(presented.examples).toEqual([literal]);
+  });
+});

src/contracts/toolOutputSchemaPrimitives.ts

@@ -463,6 +463,7 @@ export const expandToolAvailability = (
 
 export const sessionProvider = z
   .object({
+    cleanup_pending: z.boolean(),
     capabilities: z.array(providerCapabilitySet),
     analysis_run: analysisRun,
     analysis_activity: analysisActivity,

src/contracts/toolSchemaMetadata.ts

@@ -2,11 +2,7 @@ import { z } from "zod";
 
 import type { ToolContract } from "./toolContractTypes.js";
 import { advertisedInputExamples } from "./advertisedInputExamples.js";
-import {
-  advertisedReferenceExpansionBudget,
-  inputSchemaWithinReferenceExpansionBudget,
-  presentInputJsonSchema,
-} from "./inputSchemaPresentation.js";
+import { presentInputJsonSchema } from "./inputSchemaPresentation.js";
 import { digestCanonicalValue } from "../domain/canonicalDigest.js";
 
 const PROPERTY_DESCRIPTIONS: Readonly<Record<string, string>> = {
@@ -64,31 +60,16 @@ export const toolInputSchemaWithMetadata = <Contract extends ToolContract>(
     contract.inputSchema,
     "input",
     (project) => (options) => {
-      const shared = project({
+      const inline = project({
         ...options,
-        libraryOptions: { reused: "ref", ...options.libraryOptions },
+        libraryOptions: { ...options.libraryOptions, reused: "inline" },
       });
       const examples = advertisedInputExamples(contract);
       return {
-        // Sharing definitions only helps clients that resolve them. A client
-        // rendering declarations from a shared expansion budget degrades
-        // every reference past it to `unknown`, so an input whose shared form
-        // exceeds the budget is re-projected without shared definitions.
-        ...inputSchemaWithinReferenceExpansionBudget(
-          presentInputJsonSchema(shared, fallbackPropertyDescription),
-          () =>
-            presentInputJsonSchema(
-              project({
-                ...options,
-                libraryOptions: {
-                  ...options.libraryOptions,
-                  reused: "inline",
-                },
-              }),
-              fallbackPropertyDescription,
-            ),
-          advertisedReferenceExpansionBudget,
-        ),
+        // Keep advertised parameters self-contained for clients that do not
+        // resolve local references. The registered canonical schema remains
+        // responsible for runtime validation.
+        ...presentInputJsonSchema(inline, fallbackPropertyDescription),
         ...(examples.length === 0 ? {} : { examples }),
       };
     },

src/domain/analysisErrorCleanup.ts

@@ -19,6 +19,7 @@ export const analysisErrorWithCleanupFailure = (
         { cause: primary },
       ),
       userMessage: projectAnalysisError(primary).message,
+      remediationAction: projected.remediation.action,
       ...(primary.capturedOutput === undefined
         ? {}
         : { capturedOutput: primary.capturedOutput }),

src/domain/analysisErrorPresentation.ts

@@ -27,6 +27,7 @@ import {
   HopperTimeoutError,
 } from "./hopperErrors.js";
 import { ProviderSelectionError } from "./providerSelectionError.js";
+import { ProviderAdapterError } from "./providerAdapterError.js";
 import { UnknownRegistryError } from "./unknownRegistryError.js";
 import { providerRetryAction } from "./providerOperationHealth.js";
 import type { AnalysisError, AnalysisErrorTag } from "./analysisErrorBase.js";
@@ -35,6 +36,11 @@ import type { AnalysisErrorProjection } from "./analysisErrorProjection.js";
 export const analysisErrorRemediationAction = (
   error: AnalysisError,
 ): string => {
+  if (
+    error instanceof ProviderAdapterError &&
+    error.remediationAction !== undefined
+  )
+    return error.remediationAction;
   if (
     error instanceof BrowserObservationError &&
     error.reason === "service_worker_blocked"
@@ -66,7 +72,7 @@ export const analysisErrorRemediationAction = (
     );
   if (error instanceof HopperTimeoutError)
     return error.operation === undefined
-      ? "Inspect Hopper for a loader or license dialog and review details.launcher. Correct the loader configuration or complete Hopper setup, then open the target again."
+      ? "Review details.launcher and inspect Hopper for ongoing initial analysis or a pending loader, demo, or license dialog. For a large target, increase REA_HOPPER_STARTUP_TIMEOUT_MS in the environment that starts REA and allow at least that long in the MCP client. Resolve retained cleanup before reopening."
       : error.providerState === "busy"
         ? "Check binary_session.analysis_activity, wait for the active Hopper request to finish, then retry."
         : "Check binary_session for Hopper health, then retry the operation.";
@@ -287,7 +293,7 @@ export const analysisErrorUserMessage = (error: AnalysisError): string => {
 const hopperErrorUserMessage = (error: AnalysisError): string | undefined => {
   if (error instanceof HopperTimeoutError) {
     if (error.operation === undefined)
-      return "REA timed out waiting for Hopper bridge readiness. Hopper may be waiting for a loader or license dialog; inspect its window and the captured launcher outcome before retrying.";
+      return "REA timed out waiting for Hopper bridge readiness, which includes initial analysis. Hopper may still be analyzing the target or waiting for a loader, demo, or license dialog. Review the captured launcher outcome and resolve retained cleanup before retrying.";
     const request = error.operation;
     return error.providerState === "busy"
       ? `Hopper timed out during ${request} while the provider remained busy. Check binary_session.analysis_activity, wait for the active request to finish, then retry.`

src/domain/apple/interfaceBuilderGraph.test.ts

@@ -481,6 +481,93 @@ describe("Interface Builder hierarchy completeness", () => {
   });
 });
 
+describe("Interface Builder hierarchy record limits", () => {
+  const analyze = (
+    hierarchy: unknown[],
+    maxObjects?: number,
+    objects: Record<string, unknown> = {},
+  ) =>
+    buildInterfaceBuilderAnalysis({
+      targetSha256: hash,
+      toolVersion: "test",
+      documents: [
+        {
+          relativePath: "Main.nib",
+          archiveSha256: hash,
+          documentKind: "nib",
+          raw: {
+            "com.apple.ibtool.document.objects": objects,
+            "com.apple.ibtool.document.hierarchy": hierarchy,
+          },
+        },
+      ],
+      limits: interfaceBuilderLimitsSchema.parse(
+        maxObjects === undefined ? {} : { max_objects: maxObjects },
+      ),
+    });
+  const hierarchyFacet = (result: ReturnType<typeof analyze>) =>
+    result.graph.coverage.find(({ facet }) => facet === "hierarchy:Main.nib");
+
+  it("keeps an identified record after more than 20,000 structural records", () => {
+    const hierarchy: unknown[] = Array.from({ length: 20_001 }, () => ({
+      children: [],
+    }));
+    hierarchy[20_000] = { objectID: "tail", children: [] };
+
+    const result = analyze(hierarchy);
+
+    expect(
+      result.graph.nodes.map(
+        ({ attributes }) => attributes.interface_builder_object_id,
+      ),
+    ).toContain("tail");
+    expect(result.graph.edges).toHaveLength(1);
+    expect(result.graph.truncated).toBe(false);
+    expect(hierarchyFacet(result)).toMatchObject({
+      status: "complete",
+      examined: 1,
+      omitted: 0,
+    });
+  });
+
+  it("counts identified records beyond the object limit as omitted", () => {
+    const result = analyze(
+      ["a", "b", "c", "d"].map((objectID) => ({ objectID, children: [] })),
+      2,
+    );
+
+    expect(result.documents[0]?.hierarchy_complete).toBe(false);
+    expect(result.graph.truncated).toBe(true);
+    expect(hierarchyFacet(result)).toMatchObject({
+      status: "partial",
+      reason: "graph_limit_reached",
+      examined: 2,
+      omitted: 2,
+    });
+  });
+
+  it("stays complete when the identified records exactly reach the object limit", () => {
+    // The root and both objects fill the three graph nodes; the third
+    // hierarchy record reaches the hierarchy limit and has a structural child.
+    const result = analyze(
+      [
+        { objectID: "a", children: [{ objectID: "b", children: [] }] },
+        { objectID: "b", children: [{ children: [] }] },
+      ],
+      3,
+      { a: { class: "UIView" }, b: { class: "UIView" } },
+    );
+
+    expect(result.documents[0]?.hierarchy_complete).toBe(true);
+    expect(result.graph.truncated).toBe(false);
+    expect(hierarchyFacet(result)).toMatchObject({
+      status: "complete",
+      examined: 3,
+      omitted: 0,
+    });
+  });
+});
+
 describe("keyed archive object references", () => {
   it("keeps referenced objects as stubs so shared and cyclic references stay finite", () => {
     // Each view references its window, superview, and next key view, so

src/domain/apple/interfaceBuilderGraph.ts

@@ -211,6 +211,7 @@ export const buildInterfaceBuilderAnalysis = (input: {
       );
     };
     let hierarchyCount = 0;
+    let documentOmittedHierarchyNodes = 0;
     const visitHierarchy = (
       initial: unknown,
       initialParentId: string,
@@ -218,11 +219,6 @@ export const buildInterfaceBuilderAnalysis = (input: {
       const pending: { readonly value: unknown; readonly parentId: string }[] =
         [{ value: initial, parentId: initialParentId }];
       while (pending.length > 0) {
-        if (hierarchyCount >= input.limits.max_objects) {
-          truncated = true;
-          hierarchyTruncated = true;
-          return;
-        }
         const entry = pending.pop();
         if (entry === undefined) break;
         const { value, parentId } = entry;
@@ -242,7 +238,13 @@ export const buildInterfaceBuilderAnalysis = (input: {
           typeof item.archiveUID === "number" ? String(item.archiveUID) : null,
         );
         let nextParent = parentId;
-        if (objectId !== null) {
+        if (objectId !== null && hierarchyCount >= input.limits.max_objects) {
+          // The walk continues over the decoded records so the omission is
+          // counted rather than reported as an unknown remainder.
+          truncated = true;
+          hierarchyTruncated = true;
+          documentOmittedHierarchyNodes += 1;
+        } else if (objectId !== null) {
           const known = objectIds.has(objectId);
           const childId = known
             ? objectNodeId(objectId)
@@ -504,6 +506,7 @@ export const buildInterfaceBuilderAnalysis = (input: {
                   : null,
         examined: hierarchyCount,
         omitted:
+          documentOmittedHierarchyNodes +
           documentOmittedHierarchyEdges +
           parserOmittedHierarchyReferences +
           omittedSerializedHierarchyReferences,

src/domain/apple/interfaceBuilderKeyedArchive.ts

@@ -131,7 +131,7 @@ export const parseInterfaceBuilderRecords = (
   return {
     objects,
     connections,
-    hierarchy: Array.isArray(hierarchyRaw) ? hierarchyRaw.slice(0, 20_000) : [],
+    hierarchy: Array.isArray(hierarchyRaw) ? hierarchyRaw : [],
     classes: classesRaw,
     objectCount: objectEntries.length,
     omittedObjects: Math.max(0, objectEntries.length - 20_000),

src/domain/javascript/javascriptModuleDeclaration.ts

@@ -16,6 +16,19 @@ export const isTypeOnlyExportDeclaration = (
       t.isTSTypeAliasDeclaration(node.declaration) ||
       t.isTSDeclareFunction(node.declaration)));
 
+/**
+ * Runtime external-module target for a value import-equals declaration;
+ * `import type X = require("m")` is erased and declares no dependency.
+ */
+export const semanticImportEqualsSpecifier = (
+  node: t.TSImportEqualsDeclaration,
+): string | null =>
+  node.importKind !== "type" &&
+  t.isTSExternalModuleReference(node.moduleReference) &&
+  t.isStringLiteral(node.moduleReference.expression)
+    ? node.moduleReference.expression.value
+    : null;
+
 /** Whether this import binding is explicitly type-only. */
 export const isTypeOnlyImportSpecifier = (node: t.ImportSpecifier): boolean =>
   node.importKind === "type" || node.importKind === "typeof";

src/domain/javascript/javascriptNativeHandoff.ts

@@ -14,15 +14,21 @@ export const buildJavaScriptNativeHandoffs = (
   edges: readonly ApplicationEdge[],
   nativeEvidence: readonly Evidence[],
 ): NativeHandoff[] => {
-  const nodeById = new Map(nodes.map((node) => [node.node_id, node]));
+  let nodeById: Map<string, ApplicationNode> | undefined;
   return nodes
     .filter(({ kind }) => kind === "native-addon")
     .flatMap((node) => {
-      const digest = artifactDigest(node);
-      if (digest === null) return [];
+      // Observations may describe only a containing archive. A native target
+      // requires the node owner's exact byte identity, independently of its
+      // path, availability labels or the artifact supporting an observation.
+      if (node.identity.strategy !== "content-digest") return [];
+      const digest = node.identity.sha256;
       const linked = nativeEvidence.filter(
         ({ subject }) => subject?.digest.sha256 === digest,
       );
+      nodeById ??= new Map(
+        nodes.map((candidate) => [candidate.node_id, candidate]),
+      );
       const exportNodes = nativeExportNodes(node, edges, nodeById);
       return [
         {
@@ -54,16 +60,6 @@ export const buildJavaScriptNativeHandoffs = (
     );
 };
 
-const artifactDigest = (node: ApplicationNode): string | null => {
-  if (node.identity.strategy === "content-digest") return node.identity.sha256;
-  const observation = node.observations.find(
-    ({ evidence }) => evidence.artifact.available,
-  );
-  return observation?.evidence.artifact.available === true
-    ? observation.evidence.artifact.sha256
-    : null;
-};
-
 const artifactPath = (node: ApplicationNode): string | null => {
   for (const { evidence } of node.observations)
     if (

src/domain/javascript/javascriptSemanticAnalysis.ts

@@ -10,7 +10,6 @@ import {
 import {
   collectSemanticModuleLink,
   collectSemanticCallable,
-  semanticImportEqualsSpecifier,
   collectSemanticReferences,
   collectSemanticReferencesSteps,
   immutableSemanticBindings,
@@ -47,7 +46,10 @@ import { semanticRequireOrigin } from "./javascriptSemanticRequireOrigin.js";
 import { semanticBundledRequireOrigin } from "./javascriptBundledRequireOrigin.js";
 import { collectSemanticMemberMutationsSteps } from "./javascriptSemanticMemberMutations.js";
 import { indexJavaScriptAmbientWritesSteps } from "./javascriptSemanticAmbientWrites.js";
-import { hasUncertainTypeOnlyModuleSideEffect } from "./javascriptModuleDeclaration.js";
+import {
+  hasUncertainTypeOnlyModuleSideEffect,
+  semanticImportEqualsSpecifier,
+} from "./javascriptModuleDeclaration.js";
 import {
   collectSemanticReturns,
   resolveSemanticModuleCallables,
@@ -298,25 +300,21 @@ function* classifyDefinitionReceiversSteps(
     if (client) roots.add(root);
   };
   const classifyOpenReceiver = (node: t.Node): void => {
-    if (
-      (!t.isCallExpression(node) && !t.isOptionalCallExpression(node)) ||
-      (!t.isMemberExpression(node.callee) &&
-        !t.isOptionalMemberExpression(node.callee))
-    )
+    if (!t.isCallExpression(node) && !t.isOptionalCallExpression(node)) return;
+    const callee = unwrapJavaScriptExpression(node.callee).node;
+    if (!t.isMemberExpression(callee) && !t.isOptionalMemberExpression(callee))
       return;
-    const method = semanticStaticPropertyKey(
-      node.callee.property,
-      node.callee.computed,
-    );
+    const object = unwrapJavaScriptExpression(callee.object).node;
+    const method = semanticStaticPropertyKey(callee.property, callee.computed);
     if (method === "get") {
-      if (isConfigurationReceiver(state, node.callee.object))
+      if (isConfigurationReceiver(state, object))
         facts.set(node.start ?? -1, "configuration");
-      else if (isExtensionStateMember(node.callee.object))
+      else if (isExtensionStateMember(object))
         extensionStateReads.push(node.start ?? -1);
       return;
     }
-    if (method !== "open" || !t.isIdentifier(node.callee.object)) return;
-    const receiver = node.callee.object.name;
+    if (method !== "open" || !t.isIdentifier(object)) return;
+    const receiver = object.name;
     const binding = resolveSemanticBindingState(state, node, receiver);
     if (binding === undefined) {
       if (semanticResolutionBlocked(state, node, receiver)) return;
@@ -336,7 +334,9 @@ function* classifyDefinitionReceiversSteps(
       return;
     }
     if (binding.mutable || binding.initializers.length !== 1) return;
-    const initializer = binding.initializers[0]?.node;
+    const initializerSource = binding.initializers[0]?.node;
+    if (initializerSource === undefined) return;
+    const initializer = unwrapJavaScriptExpression(initializerSource).node;
     if (!t.isIdentifier(initializer)) return;
     const initializerBinding = resolveSemanticBindingState(
       state,
@@ -355,7 +355,9 @@ function* classifyDefinitionReceiversSteps(
           initializerBinding.initializers.length !== 1
         )
           return;
-        const nested = initializerBinding.initializers[0]?.node;
+        const nestedSource = initializerBinding.initializers[0]?.node;
+        if (nestedSource === undefined) return;
+        const nested = unwrapJavaScriptExpression(nestedSource).node;
         if (t.isIdentifier(nested)) {
           const nestedFact = resolveGlobalAliasFact(
             state,
@@ -418,16 +420,17 @@ const isConfigurationAccessorCall = (
   state: JavaScriptSemanticAnalysisState,
   node: t.Node,
 ): boolean => {
+  node = unwrapJavaScriptExpression(node).node;
   if (!t.isCallExpression(node) && !t.isOptionalCallExpression(node))
     return false;
-  const callee = node.callee;
+  const callee = unwrapJavaScriptExpression(node.callee).node;
   if (
     (!t.isMemberExpression(callee) && !t.isOptionalMemberExpression(callee)) ||
     semanticStaticPropertyKey(callee.property, callee.computed) !==
       "getConfiguration"
   )
     return false;
-  const host = callee.object;
+  const host = unwrapJavaScriptExpression(callee.object).node;
   const matchesSpelling = t.isIdentifier(host)
     ? host.name === "workspace"
     : (t.isMemberExpression(host) || t.isOptionalMemberExpression(host)) &&
@@ -436,7 +439,7 @@ const isConfigurationAccessorCall = (
   const root = t.isIdentifier(host)
     ? host
     : t.isMemberExpression(host) || t.isOptionalMemberExpression(host)
-      ? host.object
+      ? unwrapJavaScriptExpression(host.object).node
       : undefined;
   if (!t.isIdentifier(root)) return false;
   const binding = resolveSemanticBindingState(state, root, root.name);

src/domain/javascript/javascriptSemanticProjection.ts

@@ -36,6 +36,7 @@ import {
   isTypeOnlyExportSpecifier,
   isTypeOnlyImportDeclaration,
   isTypeOnlyImportSpecifier,
+  semanticImportEqualsSpecifier,
 } from "./javascriptModuleDeclaration.js";
 import {
   commonJsExportName,
@@ -149,16 +150,6 @@ const collectImportEquals = (
   );
 };
 
-/** Runtime external-module target for a value import-equals declaration. */
-export const semanticImportEqualsSpecifier = (
-  node: t.TSImportEqualsDeclaration,
-): string | null =>
-  node.importKind !== "type" &&
-  t.isTSExternalModuleReference(node.moduleReference) &&
-  t.isStringLiteral(node.moduleReference.expression)
-    ? node.moduleReference.expression.value
-    : null;
-
 /** Collect lexical references after definitions exist, optionally for one name. */
 export const collectSemanticReferences = (
   program: t.Program,

src/domain/javascript/javascriptStaticAnalysis.ts

@@ -51,11 +51,11 @@ import {
 } from "./javascriptSourceParser.js";
 
 import { createJavaScriptRpcScan } from "./javascriptRpcEndpoints.js";
-import { semanticImportEqualsSpecifier } from "./javascriptSemanticProjection.js";
 import {
   hasUncertainTypeOnlyModuleSideEffect,
   isTypeOnlyExportDeclaration,
   isTypeOnlyImportDeclaration,
+  semanticImportEqualsSpecifier,
 } from "./javascriptModuleDeclaration.js";
 
 /** Parse one JavaScript artifact and recover static structure only. */

src/domain/javascript/javascriptStaticAnalysisCalleeBoundary.test.ts

@@ -2,6 +2,173 @@ import { describe, expect, it } from "vitest";
 
 import { analyzeJavaScriptStaticSource } from "./javascriptStaticAnalysis.js";
 
+const expressionWrappers = [
+  ["plain", (value: string) => value],
+  ["asserted", (value: string) => `(${value} as any)`],
+  ["non-null", (value: string) => `(${value}!)`],
+  ["satisfies", (value: string) => `(${value} satisfies any)`],
+] as const;
+
+it("shares erased call-target names with endpoint consumers without inventing dynamic keys", () => {
+  const analysis = analyzeJavaScriptStaticSource(`
+    (client.get as typeof client.get)("/api/items");
+    (navigator as typeof navigator).sendBeacon("/api/telemetry", payload);
+    (client[method] as typeof client.get)("/api/unknown");
+    ((choose ? client.get : client.post) as typeof client.get)("/api/conditional");
+  `);
+  expect(analysis.parse_error_count).toBe(0);
+  expect(
+    analysis.endpoints.map(({ value, mechanism }) => [value, mechanism]),
+  ).toEqual([
+    ["/api/items", "call:client.get"],
+    ["/api/telemetry", "call:navigator.sendBeacon"],
+  ]);
+});
+
+it.each(expressionWrappers)(
+  "excludes %s collection and configuration reads while retaining request candidates",
+  (_label, wrap) => {
+    const call = (receiver: string, method: string, value: string) =>
+      `${wrap(`${wrap(receiver)}.${method}`)}(${JSON.stringify(value)});`;
+    const workspace = `${wrap("vscode")}.workspace`;
+    const configuration = `${wrap(`${wrap(workspace)}.getConfiguration`)}("editor")`;
+    const analysis = analyzeJavaScriptStaticSource(`
+    import * as vscode from "vscode";
+    const settings = ${wrap(configuration)};
+    let changed = ${wrap(configuration)};
+    changed = client;
+    const uncertain = flag ? ${wrap(configuration)} : client;
+    ${call(`new ${wrap("Headers")}()`, "get", "content-type")}
+    ${call(`new ${wrap("URLSearchParams")}()`, "delete", "q")}
+    ${call(`new ${wrap("Map")}()`, "get", "setting")}
+    ${call(`${wrap("response")}.headers`, "get", "authorization")}
+    ${call(`${wrap("url")}.searchParams`, "delete", "token")}
+    ${call(configuration, "get", "tabSize")}
+    ${call("settings", "get", "wordWrap")}
+    ${call(`${wrap("context")}.globalState`, "get", "lastSession")}
+    ${call(`${wrap("context")}.workspaceState`, "get", "lastFile")}
+    ${call("client", "get", "setting")}
+    ${call(`new ${wrap("Headers")}()`, "get", "/api/header-shaped")}
+    ${call("settings", "get", "https://api.example.test/config-shaped")}
+    ${call("client", "get", "/api/items")}
+    ${call("changed", "get", "changed-setting")}
+    ${call("uncertain", "get", "conditional-setting")}
+  `);
+    expect(analysis.parse_error_count).toBe(0);
+    expect(analysis.parse_status).toBe("complete");
+    expect(
+      analysis.endpoints.map(({ value, interpretation }) => [
+        value,
+        interpretation ?? null,
+      ]),
+    ).toEqual([
+      ["setting", "candidate"],
+      ["/api/header-shaped", null],
+      ["https://api.example.test/config-shaped", null],
+      ["/api/items", null],
+      ["changed-setting", "candidate"],
+      ["conditional-setting", "candidate"],
+    ]);
+  },
+);
+
+it("retains uncertainty and module evidence for wrapped get receivers", () => {
+  const analysis = analyzeJavaScriptStaticSource(`
+    const vscode = otherLibrary;
+    const settings = vscode.workspace.getConfiguration("editor");
+    (settings.get as any)("unproven-config");
+    (context.globalState.get as any)("unproven-state");
+    ((choose ? new Headers() : client).get as any)("uncertain-receiver");
+    (client[method] as any)("unknown-method");
+    ((choose ? client.get : client.post) as any)("unknown-target");
+  `);
+  expect(analysis.parse_error_count).toBe(0);
+  expect(
+    analysis.endpoints.map(({ value, interpretation }) => [
+      value,
+      interpretation,
+    ]),
+  ).toEqual([
+    ["unproven-config", "candidate"],
+    ["unproven-state", "candidate"],
+    ["uncertain-receiver", "candidate"],
+  ]);
+});
+
+it("retains lexical browser-open facts through erased call and receiver wrappers", () => {
+  const analysis = analyzeJavaScriptStaticSource(`
+    ((window as any).open as any)(method, "browser-context");
+    function local(window) {
+      ((window as any).open as any)(method, "local-request");
+    }
+  `);
+  expect(analysis.parse_error_count).toBe(0);
+  expect(
+    analysis.endpoints.map(({ value, interpretation }) => [
+      value,
+      interpretation,
+    ]),
+  ).toEqual([["local-request", "candidate"]]);
+});
+
+it.each(expressionWrappers)(
+  "retains global and local identity through %s alias initializers",
+  (_label, wrap) => {
+    const analysis = analyzeJavaScriptStaticSource(`
+    const browser = ${wrap("window")};
+    (browser.open as any)(method, "browser-context");
+    const database = ${wrap("indexedDB")};
+    (database.open as any)("fixture-db", "2");
+    const cache = ${wrap("caches")};
+    (cache.open as any)("fixture-cache");
+    {
+      const indexedDB = ${wrap("caches")};
+      const nested = ${wrap("indexedDB")};
+      (nested.open as any)("nested-cache");
+    }
+    {
+      const caches = ${wrap("indexedDB")};
+      const nested = ${wrap("caches")};
+      (nested.open as any)("nested-db", "2");
+    }
+    function local(window, indexedDB, caches) {
+      const browser = ${wrap("window")};
+      (browser.open as any)(method, "local-window");
+      const database = ${wrap("indexedDB")};
+      (database.open as any)("GET", "/local-db");
+      const cache = ${wrap("caches")};
+      (cache.open as any)("GET", "/local-cache");
+    }
+    let replaced = ${wrap("window")};
+    replaced = client;
+    (replaced.open as any)(method, "changed-window");
+    const uncertain = ${wrap("flag ? window : client")};
+    (uncertain.open as any)(method, "uncertain-window");
+  `);
+    expect(analysis.parse_error_count).toBe(0);
+    expect
+      .soft(
+        analysis.endpoints.map(({ value, interpretation }) => [
+          value,
+          interpretation ?? null,
+        ]),
+      )
+      .toEqual([
+        ["local-window", "candidate"],
+        ["/local-db", null],
+        ["/local-cache", null],
+        ["changed-window", "candidate"],
+        ["uncertain-window", "candidate"],
+      ]);
+    expect(analysis.storage.map(({ kind, name }) => [kind, name])).toEqual([
+      ["indexed-db", "fixture-db"],
+      ["cache-storage", "fixture-cache"],
+      ["cache-storage", "nested-cache"],
+      ["indexed-db", "nested-db"],
+    ]);
+  },
+);
+
 it("retains endpoint observations for exact template and TypeScript member keys", () => {
   for (const [get, beacon] of [
     ['"get"', '"sendBeacon"'],

src/domain/javascript/javascriptStaticAnalysisHelpers.ts

@@ -180,9 +180,9 @@ export const staticPathResolutionContext = (
 
 /** Resolve a path composed only from inert literal syntax. */
 export const staticPath = (node: t.Node): string | undefined => {
-  if (t.isStringLiteral(node)) return node.value;
-  if (t.isTemplateLiteral(node) && node.expressions.length === 0)
-    return stringValue(node);
+  node = unwrapJavaScriptExpression(node).node;
+  const value = stringValue(node);
+  if (value !== undefined) return value;
   if (t.isBinaryExpression(node, { operator: "+" }))
     return staticConcatenation(node);
   if (t.isCallExpression(node) || t.isNewExpression(node))
@@ -200,7 +200,7 @@ const staticConcatenation = (node: t.BinaryExpression): string | undefined => {
   let current: t.Node = node;
   while (t.isBinaryExpression(current, { operator: "+" })) {
     operands.push(current.right);
-    current = current.left;
+    current = unwrapJavaScriptExpression(current.left).node;
   }
   const anchored = isDirectoryPath(current);
   if (!anchored) operands.push(current);
@@ -249,8 +249,9 @@ const staticFileUrlPath = (
   node: t.CallExpression | t.NewExpression,
 ): string | undefined => {
   if (node.arguments.length !== 1) return undefined;
-  const argument = argumentNode(node.arguments[0]);
-  if (argument === undefined) return undefined;
+  const rawArgument = argumentNode(node.arguments[0]);
+  if (rawArgument === undefined) return undefined;
+  const argument = unwrapJavaScriptExpression(rawArgument).node;
   if (isSourceFileUrl(argument)) return sourceRelativeFileUrlPath(argument);
   const value = staticPath(argument);
   const rawPath = value?.split(/[?#]/u, 1)[0] ?? "";
@@ -277,8 +278,9 @@ const staticFileUrlPath = (
 };
 
 /** Project a known source-relative URL through the actual file URL decoder. */
-const sourceRelativeFileUrlPath = (node: t.Node): string | undefined => {
-  if (!isSourceFileUrl(node)) return undefined;
+const sourceRelativeFileUrlPath = (
+  node: t.CallExpression | t.NewExpression,
+): string | undefined => {
   const value = stringValue(node.arguments[0]);
   if (
     value === undefined ||
@@ -347,7 +349,9 @@ const staticResolvedPath = (
 };
 
 const isFilesystemPathExpression = (node: t.Node): boolean => {
-  if (t.isStringLiteral(node)) return node.value.startsWith("/");
+  node = unwrapJavaScriptExpression(node).node;
+  const value = stringValue(node);
+  if (value !== undefined) return value.startsWith("/");
   if (isFileIdentity(node) || isDirectoryIdentity(node)) return true;
   if (t.isBinaryExpression(node, { operator: "+" }))
     return (
@@ -377,6 +381,7 @@ const isFilesystemPathExpression = (node: t.Node): boolean => {
 };
 
 const isDirectoryIdentity = (node: t.Node | undefined): boolean => {
+  if (node !== undefined) node = unwrapJavaScriptExpression(node).node;
   if (isDirectoryPath(node)) return true;
   if (!t.isCallExpression(node) && !t.isNewExpression(node)) return false;
   const name = calleeName(node.callee);
@@ -388,6 +393,7 @@ const isDirectoryIdentity = (node: t.Node | undefined): boolean => {
 
 /** `__dirname` or the dirname of the source file, as a string. */
 const isDirectoryPath = (node: t.Node | undefined): boolean => {
+  if (node !== undefined) node = unwrapJavaScriptExpression(node).node;
   if (t.isIdentifier(node, { name: "__dirname" })) return true;
   if (!t.isCallExpression(node)) return false;
   const name = calleeName(node.callee);
@@ -413,6 +419,7 @@ export const isImportMetaUrl = (node: t.Node | undefined): boolean => {
 };
 
 const isFileIdentity = (node: t.Node | undefined): boolean => {
+  if (node !== undefined) node = unwrapJavaScriptExpression(node).node;
   if (t.isIdentifier(node, { name: "__filename" }) || isImportMetaUrl(node))
     return true;
   if (!t.isCallExpression(node)) return false;
@@ -560,14 +567,17 @@ const KEYED_COLLECTION_CONSTRUCTORS = new Set([
  * binding, so callers keep URL and path literals as requests.
  */
 const isKeyedCollectionReceiver = (callee: t.Node): boolean => {
+  callee = unwrapJavaScriptExpression(callee).node;
   if (!t.isMemberExpression(callee) && !t.isOptionalMemberExpression(callee))
     return false;
-  const receiver = callee.object;
-  if (t.isNewExpression(receiver))
+  const receiver = unwrapJavaScriptExpression(callee.object).node;
+  if (t.isNewExpression(receiver)) {
+    const constructor = unwrapJavaScriptExpression(receiver.callee).node;
     return (
-      t.isIdentifier(receiver.callee) &&
-      KEYED_COLLECTION_CONSTRUCTORS.has(receiver.callee.name)
+      t.isIdentifier(constructor) &&
+      KEYED_COLLECTION_CONSTRUCTORS.has(constructor.name)
     );
+  }
   if (
     !t.isMemberExpression(receiver) &&
     !t.isOptionalMemberExpression(receiver)
@@ -669,14 +679,15 @@ export const storageKind = (
   return undefined;
 };
 
-/** Produce a dotted callee name from member syntax. */
+/** Produce a dotted callee name through type-erased expression wrappers. */
 export const calleeName = (node: t.Node): string => {
+  node = unwrapJavaScriptExpression(node).node;
   const segments: string[] = [];
   while (t.isMemberExpression(node) || t.isOptionalMemberExpression(node)) {
     // Dynamic keys retain their syntax identity instead of inventing a name.
     segments.push(memberPropertyName(node));
     if (!t.isNode(node.object)) break;
-    node = node.object;
+    node = unwrapJavaScriptExpression(node.object).node;
   }
   const base = t.isIdentifier(node)
     ? node.name

src/domain/javascript/javascriptStaticPathResolution.test.ts

@@ -5,6 +5,7 @@ import { parseExpression } from "@babel/parser";
 import { describe, expect, it } from "vitest";
 
 import { analyzeJavaScriptStaticSource } from "./javascriptStaticAnalysis.js";
+import { parserPluginsForPath } from "./javascriptSourceParser.js";
 import {
   staticPath,
   staticPathResolutionContext,
@@ -46,8 +47,13 @@ const anchoredExpressions = [
 ] as const;
 
 const unknownExpressions = [
+  "runtimePath as string",
+  "path.join(__dirname as string, runtimeFile as string) as string",
   'path[method](__dirname, "preload.js")',
   'path[`join${suffix}`](__dirname, "preload.js")',
+  '(path[method] as typeof path.join)(__dirname, "preload.js")',
+  '((useJoin ? path.join : path.resolve) as typeof path.join)(__dirname, "preload.js")',
+  'fileURLToPath(new (runtimeURL as typeof URL)("./preload.js", import.meta.url))',
   "path.resolve()",
   "path.posix.resolve()",
   'path.resolve("sub", "../preload.js")',
@@ -69,7 +75,101 @@ const unknownExpressions = [
   'path.dirname(__filename) + "preload.js"',
 ];
 
+const pathValueExpressions = [
+  ['"./preload.js" as const', "./preload.js", "module-specifier"],
+  [
+    'path.join(__dirname, "preload.js") as string',
+    "preload.js",
+    "filesystem-expression",
+  ],
+  [
+    'path.join(__dirname as string, "preload.js" as const)',
+    "preload.js",
+    "filesystem-expression",
+  ],
+  [
+    'path.resolve(__dirname as string, "preload.js" as const)',
+    "preload.js",
+    "filesystem-expression",
+  ],
+  [
+    'fileURLToPath(new URL("./preload.js", import.meta.url as string) as URL) as string',
+    "./preload.js",
+    "filesystem-expression",
+  ],
+  [
+    'path.join(path.dirname(__filename as string), "preload.js")',
+    "preload.js",
+    "filesystem-expression",
+  ],
+  [
+    'path.join(path.dirname(__filename) as string, "preload.js")',
+    "preload.js",
+    "filesystem-expression",
+  ],
+  [
+    '((__dirname + "/lib") as string) + "/preload.js"',
+    "lib/preload.js",
+    "filesystem-expression",
+  ],
+  ['"/app/preload.js"', "/app/preload.js", "filesystem-expression"],
+  ["`/app/preload.js`", "/app/preload.js", "filesystem-expression"],
+  [
+    'path.join(`/app`, "preload.js")',
+    "/app/preload.js",
+    "filesystem-expression",
+  ],
+  ["`./preload.js`", "./preload.js", "module-specifier"],
+] as const;
+
+const pathCallTargetExpressions = [
+  ['(path.join as typeof path.join)(__dirname, "preload.js")', "preload.js"],
+  ['path.join!(__dirname, "preload.js")', "preload.js"],
+  [
+    '(path.resolve satisfies typeof path.resolve)(__dirname, "preload.js")',
+    "preload.js",
+  ],
+  [
+    '((path as typeof path).posix as typeof path.posix).resolve("/app", "preload.js")',
+    "/app/preload.js",
+  ],
+  [
+    '(fileURLToPath as typeof fileURLToPath)(new URL("./preload.js", import.meta.url))',
+    "./preload.js",
+  ],
+  [
+    'fileURLToPath(new (URL as typeof URL)("./preload.js", import.meta.url))',
+    "./preload.js",
+  ],
+  [
+    'fileURLToPath(new (url.URL as typeof URL)("./preload.js", import.meta.url))',
+    "./preload.js",
+  ],
+  [
+    'path.join((path.dirname as typeof path.dirname)(__filename), "preload.js")',
+    "preload.js",
+  ],
+  [
+    'path.join(dirname((fileURLToPath as typeof fileURLToPath)(import.meta.url)), "preload.js")',
+    "preload.js",
+  ],
+] as const;
+
 describe("inert JavaScript path resolution", () => {
+  it.each(pathCallTargetExpressions)(
+    "preserves exact path values and context through call target %s",
+    (expression, path) => {
+      assertPathProjection(expression, path, "filesystem-expression");
+    },
+  );
+
+  it.each(pathValueExpressions)(
+    "preserves exact path values and context through %s",
+    (expression, path, context) => {
+      assertPathProjection(expression, path, context);
+    },
+  );
+
   it.each(absoluteParts)(
     "matches the POSIX resolve oracle for %j",
     (...parts) => {
@@ -141,9 +241,7 @@ describe("inert JavaScript path resolution", () => {
   });
 
   it.each(unknownExpressions)("keeps unsupported %s unknown", (expression) => {
-    expect(
-      staticPath(parseExpression(expression, { sourceType: "module" })),
-    ).toBeUndefined();
+    expect(staticPath(parsePathExpression(expression))).toBeUndefined();
     const { analysis, windowExpression, utilityExpression } =
       analyzePathConsumers(expression);
     expect(analysis.parse_status).toBe("partial");
@@ -210,9 +308,7 @@ describe("inert JavaScript path resolution", () => {
     'path.join("/app", runtimeFile)',
     "path.join(...parts)",
   ])("preserves unresolved join syntax in %s", (expression) =>
-    expect(
-      staticPath(parseExpression(expression, { sourceType: "module" })),
-    ).toBeUndefined(),
+    expect(staticPath(parsePathExpression(expression))).toBeUndefined(),
   );
 });
 
@@ -237,11 +333,15 @@ it.each([
   'fileURLToPath("file:///app/preload.js", options)',
   "fileURLToPath(selectedUrl)",
 ])("leaves platform-dependent or invalid %s unknown", (expression) =>
-  expect(
-    staticPath(parseExpression(expression, { sourceType: "module" })),
-  ).toBeUndefined(),
+  expect(staticPath(parsePathExpression(expression))).toBeUndefined(),
 );
 
+const parsePathExpression = (expression: string) =>
+  parseExpression(expression, {
+    sourceType: "module",
+    plugins: parserPluginsForPath("preload.ts"),
+  });
+
 const analyzePathConsumers = (expression: string) => {
   const property = `preload: ${expression}`;
   const genericPrefix = "const options = { ";
@@ -265,7 +365,7 @@ const assertPathProjection = (
   path: string,
   context: JavaScriptStaticPathContext,
 ) => {
-  const node = parseExpression(expression, { sourceType: "module" });
+  const node = parsePathExpression(expression);
   expect(staticPath(node)).toBe(path);
   expect(staticPathResolutionContext(node)).toBe(context);
   const {

src/domain/process/processComparison.ts

@@ -330,7 +330,8 @@ const applyTraceVerdict = (
   const sources = new Set(specification.events.map(({ source }) => source));
   const covered = dimensionsForTraceSources(sources);
   // A different verdict names the failing events and observations; attribute
-  // it only to their dimensions so equal observations keep their exact status.
+  // it only to their dimensions; unrelated comparisons keep their own status,
+  // including unknown coverage and independently observed additions/removals.
   const diagnosticSources = new Set<ProcessObservationSource>([
     ...specification.events
       .filter(({ id }) => trace.diagnostic?.event_ids.includes(id) === true)
@@ -350,8 +351,7 @@ const applyTraceVerdict = (
     if (!covered.has(dimension)) return exact;
     if (trace.verdict === "nonconforming") return exact;
     if (trace.verdict === "different")
-      return traceShowsDifference &&
-        (exact !== "unchanged" || attributed.has(dimension))
+      return traceShowsDifference && attributed.has(dimension)
         ? "changed"
         : exact;
     if (

src/domain/process/processTraceComparison.test.ts

@@ -360,6 +360,50 @@ describe("unknown process trace evidence", () => {
 });
 
 describe("process trace dimension attribution", () => {
+  it.each([false, true])(
+    "preserves an independently observed terminal addition/removal (reversed: %s)",
+    (reversed) => {
+      const absent = capture({
+        frames: [],
+        process_samples: [],
+        event_journal: [],
+      });
+      const present = capture(values(["terminal", "process"]));
+      const specification = partialSpecification();
+      const result = compareProcessCaptures(
+        reversed ? present : absent,
+        reversed ? absent : present,
+        {
+          traceSpecification: {
+            ...specification,
+            events: specification.events.map((event) =>
+              event.id === "ready"
+                ? { ...event, cardinality: { kind: "optional" } }
+                : event,
+            ),
+            language: {
+              kind: "partial_order",
+              happens_before: [],
+              not_before: [],
+              unordered_groups: [{ events: ["ready", "worker"] }],
+              prefix: [],
+              suffix: [],
+            },
+          },
+        },
+      );
+      expect(result).toMatchObject({
+        terminal: reversed ? "removed" : "added",
+        process: "changed",
+        status: "changed",
+        trace: {
+          verdict: "different",
+          diagnostic: { event_ids: ["worker"], locations: [] },
+        },
+      });
+    },
+  );
+
   it("applies passing filesystem trace timestamp omissions to exact comparison", () => {
     const base = capture(values(["terminal", "process"]));
     const left = base;

src/domain/providerAdapterError.ts

@@ -6,12 +6,14 @@ import {
 /** A provider adapter failed outside its more precise typed variants. */
 export interface ProviderAdapterErrorOptions extends AnalysisErrorOptions {
   readonly userMessage?: string;
+  readonly remediationAction?: string;
 }
 
 /** A provider adapter failed outside its more precise typed variants. */
 export class ProviderAdapterError extends AnalysisError {
   readonly _tag = "ProviderAdapterError";
   override readonly userMessage: string | undefined;
+  readonly remediationAction: string | undefined;
 
   constructor(
     readonly providerId: string,
@@ -20,5 +22,6 @@ export class ProviderAdapterError extends AnalysisError {
   ) {
     super(`Provider ${providerId} adapter failed during ${operation}`, options);
     this.userMessage = options.userMessage;
+    this.remediationAction = options.remediationAction;
   }
 }

src/domain/providerCleanupError.ts

@@ -17,6 +17,7 @@ export class ProviderCleanupError extends ProviderAdapterError {
     options?: ErrorOptions & {
       readonly operation?: string;
       readonly partialObservation?: AnalysisPartialObservation;
+      readonly remediationAction?: string;
     },
   ) {
     const {

src/ghidra/GhidraAnalysisSeeds.ts

@@ -11,7 +11,6 @@ import { err, ok, type Result } from "../domain/result.js";
 
 /** Seed file format admitted by this adapter. */
 export const GHIDRA_SEED_FORMAT = "rea-ghidra-seeds-v1";
-export const GHIDRA_SEED_SCRIPT = "ReaGhidraApplySeeds.java";
 export const MAX_GHIDRA_SEED_BYTES = 32 * 1024 * 1024;
 export const MAX_GHIDRA_SEED_ENTRIES = 1_000_000;
 const MAX_SEED_NAME_LENGTH = 2000;

src/ghidra/GhidraBridgeSources.ts

@@ -0,0 +1,12 @@
+/** Required packaged sources, selected by their runtime role rather than order. */
+export const GHIDRA_BRIDGE_SOURCES = Object.freeze({
+  bridge: "ReaGhidraBridge.java",
+  bundleActivator: "ReaGhidraBundleActivator.java",
+  extensions: "ReaGhidraExtensions.java",
+  prepareCom: "ReaGhidraPrepareCom.java",
+  prepareRaw: "ReaGhidraPrepareRaw.java",
+  applySeeds: "ReaGhidraApplySeeds.java",
+  analysisOptions: "ReaGhidraAnalysisOptions.java",
+  noReturnFix: "ReaGhidraNoReturnFix.java",
+  mipsSoftFloat: "ReaGhidraMipsSoftFloat.java",
+} as const);

src/ghidra/GhidraInstallation.test.ts

@@ -15,11 +15,13 @@ import {
   type GhidraJavaObservation,
 } from "./GhidraInstallation.js";
 import {
-  SUPPORTED_GHIDRA_JAVA_MAJOR,
-  SUPPORTED_GHIDRA_VERSION,
   ghidraApplicationProperties,
   ghidraJavaRequirement,
 } from "./GhidraInstallationPolicy.js";
+import {
+  SUPPORTED_GHIDRA_JAVA_MAJOR,
+  SUPPORTED_GHIDRA_VERSION,
+} from "./GhidraReleasePolicy.js";
 import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js";
 
 // The real Java probe shells out via spawnSync; stub it so one test can run

src/ghidra/GhidraInstallation.ts

@@ -28,14 +28,16 @@ import {
   ghidraJavaMajorAccepted,
   ghidraJavaRangeLabel,
   ghidraJavaRequirement,
+  type GhidraApplicationProperties,
+  type GhidraJavaRequirement,
+} from "./GhidraInstallationPolicy.js";
+import {
   ghidraReleaseAccepted,
   ghidraReleaseCompatibility,
   ghidraReleaseLine,
   ghidraVersionDetail,
   SUPPORTED_GHIDRA_VERSION,
-  type GhidraApplicationProperties,
-  type GhidraJavaRequirement,
-} from "./GhidraInstallationPolicy.js";
+} from "./GhidraReleasePolicy.js";
 
 const NATIVE_PLATFORMS: Readonly<
   Partial<

src/ghidra/GhidraInstallationPolicy.ts

@@ -1,36 +1,5 @@
 import { parseGhidraJavaProperties } from "./GhidraJavaProperties.js";
 
-/** Ghidra build whose bridge behavior this REA release verifies. */
-export const SUPPORTED_GHIDRA_VERSION = "12.1.4";
-/** Verified JDK major; admission uses the installation's declared bounds. */
-export const SUPPORTED_GHIDRA_JAVA_MAJOR = 21;
-
-/** Numeric Ghidra release read from `application.version`. */
-interface GhidraReleaseVersion {
-  readonly major: number;
-  readonly minor: number;
-  readonly patch: number;
-}
-
-/** How an observed Ghidra release relates to this adapter's bridge. */
-type GhidraReleaseCompatibility =
-  | {
-      readonly status: "verified";
-      readonly version: GhidraReleaseVersion;
-      readonly raw: string;
-    }
-  | {
-      readonly status: "compatible";
-      readonly version: GhidraReleaseVersion;
-      readonly raw: string;
-    }
-  | {
-      readonly status: "unsupported";
-      readonly version: GhidraReleaseVersion;
-      readonly raw: string;
-    }
-  | { readonly status: "unresolved"; readonly raw: string | null };
-
 /** One Java major bound declared by `application.properties`. */
 type GhidraJavaBound =
   | { readonly status: "absent" }
@@ -55,8 +24,6 @@ export interface GhidraApplicationProperties {
   readonly parseError: string | null;
 }
 
-const GHIDRA_RELEASE_PATTERN = /^(\d+)\.(\d+)(?:\.(\d+))?([-+].*)?$/u;
-
 /** Read the version and Java bounds Ghidra publishes for one installation. */
 export const ghidraApplicationProperties = (
   content: string,
@@ -82,67 +49,6 @@ export const ghidraApplicationProperties = (
   };
 };
 
-/** Classify `application.version` against the verified release line. */
-export const ghidraReleaseCompatibility = (
-  raw: string | null | undefined,
-): GhidraReleaseCompatibility => {
-  if (raw === null || raw === undefined)
-    return { status: "unresolved", raw: null };
-  const version = parseGhidraRelease(raw);
-  if (version === undefined) return { status: "unresolved", raw };
-  if (raw === SUPPORTED_GHIDRA_VERSION)
-    return { status: "verified", version, raw };
-  const verified = verifiedGhidraRelease();
-  return version.major === verified.major && version.minor === verified.minor
-    ? { status: "compatible", version, raw }
-    : { status: "unsupported", version, raw };
-};
-
-/**
- * Limitation recorded when a session runs a compatible build other than the
- * verified release. The observed version stays on the provider identity.
- */
-export const unverifiedGhidraBuildLimitation = (
-  providerVersion: string,
-): string | undefined => {
-  const compatibility = ghidraReleaseCompatibility(providerVersion);
-  if (compatibility.status !== "compatible") return undefined;
-  return `This session uses Ghidra ${providerVersion}. The bridge is verified against ${SUPPORTED_GHIDRA_VERSION}; other ${ghidraReleaseLine()} builds are accepted and the observed version is reported.`;
-};
-
-/** Release line accepted by this bridge, such as `12.1.x`. */
-export const ghidraReleaseLine = (): string => {
-  const verified = verifiedGhidraRelease();
-  return `${String(verified.major)}.${String(verified.minor)}.x`;
-};
-
-/** Detail for the installation version check, including the accepted line. */
-export const ghidraVersionDetail = (raw: string | null | undefined): string => {
-  const compatibility = ghidraReleaseCompatibility(raw);
-  switch (compatibility.status) {
-    case "unresolved":
-      return compatibility.raw ?? "unknown";
-    case "verified":
-      return compatibility.raw;
-    case "compatible":
-      return `${compatibility.raw}; compatible ${ghidraReleaseLine()} release (verified build ${SUPPORTED_GHIDRA_VERSION})`;
-    case "unsupported":
-      return `${compatibility.raw}; accepted releases are ${ghidraReleaseLine()} (verified build ${SUPPORTED_GHIDRA_VERSION})`;
-    default: {
-      const unreachable: never = compatibility;
-      return unreachable;
-    }
-  }
-};
-
-/** Whether this release line can run the packaged bridge. */
-export const ghidraReleaseAccepted = (
-  raw: string | null | undefined,
-): boolean => {
-  const status = ghidraReleaseCompatibility(raw).status;
-  return status === "verified" || status === "compatible";
-};
-
 /** Resolve JDK majors from `application.java.min` and `application.java.max`. */
 export const ghidraJavaRequirement = (
   properties: GhidraApplicationProperties | undefined,
@@ -192,25 +98,6 @@ export const ghidraJavaMajorAccepted = (
   major >= requirement.minimumMajor &&
   (requirement.maximumMajor === null || major <= requirement.maximumMajor);
 
-const verifiedGhidraRelease = (): GhidraReleaseVersion => {
-  const version = parseGhidraRelease(SUPPORTED_GHIDRA_VERSION);
-  if (version === undefined)
-    throw new TypeError(
-      `SUPPORTED_GHIDRA_VERSION ${SUPPORTED_GHIDRA_VERSION} is not a Ghidra release`,
-    );
-  return version;
-};
-
-const parseGhidraRelease = (raw: string): GhidraReleaseVersion | undefined => {
-  const match = GHIDRA_RELEASE_PATTERN.exec(raw);
-  const major = integerGroup(match?.[1]);
-  const minor = integerGroup(match?.[2]);
-  if (match === null || major === undefined || minor === undefined)
-    return undefined;
-  const patch = match[3] === undefined ? 0 : integerGroup(match[3]);
-  return patch === undefined ? undefined : { major, minor, patch };
-};
-
 const parseJavaBound = (raw: string): GhidraJavaBound => {
   const major = parseJavaInteger(raw);
   return major === undefined
@@ -261,16 +148,8 @@ const javaDecimalDigit = (character: string): number | undefined => {
   return (code - blockStart) % 10;
 };
 
-const integerGroup = (value: string | undefined): number | undefined => {
-  if (value === undefined) return undefined;
-  const parsed = Number(value);
-  return Number.isSafeInteger(parsed) ? parsed : undefined;
-};
-
 const unresolvedJavaRequirement = (
   unresolved: string,
 ): GhidraJavaRequirement => ({
   unresolved,
 });
-
-/** Parse Java Properties.load(InputStream) syntax from its ISO-8859-1 text. */

src/ghidra/GhidraJavaProperties.ts

@@ -1,4 +1,4 @@
-import { err, ok, type Result } from "../domain/result.js";
+import type { Result } from "../domain/result.js";
 
 /** Parse Java Properties.load(InputStream) syntax from its ISO-8859-1 text. */
 export const parseGhidraJavaProperties = (
@@ -30,12 +30,12 @@ export const parseGhidraJavaProperties = (
     if (line[valueStart] === "=" || line[valueStart] === ":") valueStart += 1;
     while (isPropertyWhitespace(line[valueStart])) valueStart += 1;
     const key = decodePropertyEscapes(line.slice(start, end));
-    if (!key.ok) return err(key.error);
+    if (!key.ok) return key;
     const value = decodePropertyEscapes(line.slice(valueStart));
-    if (!value.ok) return err(value.error);
+    if (!value.ok) return value;
     values.set(key.value, value.value);
   }
-  return ok(values);
+  return { ok: true, value: values };
 };
 
 const isPropertyWhitespace = (value: string | undefined): boolean =>
@@ -98,7 +98,7 @@ const decodePropertyEscapes = (value: string): Result<string, string> => {
     }
     const escaped = value[++index];
     if (escaped === undefined)
-      return err("Trailing escape in Java properties value");
+      return { ok: false, error: "Trailing escape in Java properties value" };
     if (escaped === "t") result += "\t";
     else if (escaped === "n") result += "\n";
     else if (escaped === "r") result += "\r";
@@ -106,10 +106,13 @@ const decodePropertyEscapes = (value: string): Result<string, string> => {
     else if (escaped === "u") {
       const digits = value.slice(index + 1, index + 5);
       if (digits.length !== 4 || !/^[0-9a-f]{4}$/iu.test(digits))
-        return err("Malformed Unicode escape in Java properties file");
+        return {
+          ok: false,
+          error: "Malformed Unicode escape in Java properties file",
+        };
       result += String.fromCharCode(Number.parseInt(digits, 16));
       index += 4;
     } else result += escaped;
   }
-  return ok(result);
+  return { ok: true, value: result };
 };

src/ghidra/GhidraLauncher.ts

@@ -1,6 +1,6 @@
 import { parseGhidraJavaProperties } from "./GhidraJavaProperties.js";
+import { GHIDRA_BRIDGE_SOURCES } from "./GhidraBridgeSources.js";
 import {
-  GHIDRA_SEED_SCRIPT,
   snapshotGhidraAnalysisSeeds,
   type GhidraSeedCommitment,
 } from "./GhidraAnalysisSeeds.js";
@@ -668,14 +668,14 @@ export const ghidraHeadlessArguments = (
     ...(options.dosCom === true
       ? [
           "-preScript",
-          scriptPath.join(bridgeDirectory, "ReaGhidraPrepareCom.java"),
+          scriptPath.join(bridgeDirectory, GHIDRA_BRIDGE_SOURCES.prepareCom),
         ]
       : []),
     ...(rawBinary === undefined
       ? []
       : [
           "-preScript",
-          scriptPath.join(bridgeDirectory, "ReaGhidraPrepareRaw.java"),
+          scriptPath.join(bridgeDirectory, GHIDRA_BRIDGE_SOURCES.prepareRaw),
           rawBinary.languageId,
           rawBinary.baseAddr,
         ]),
@@ -684,7 +684,7 @@ export const ghidraHeadlessArguments = (
       ? []
       : [
           "-preScript",
-          scriptPath.join(bridgeDirectory, GHIDRA_SEED_SCRIPT),
+          scriptPath.join(bridgeDirectory, GHIDRA_BRIDGE_SOURCES.applySeeds),
           options.seedPath,
         ]),
     // Analyzer options must apply before default auto-analysis and before the
@@ -694,20 +694,23 @@ export const ghidraHeadlessArguments = (
       ? []
       : [
           "-preScript",
-          scriptPath.join(bridgeDirectory, "ReaGhidraAnalysisOptions.java"),
+          scriptPath.join(
+            bridgeDirectory,
+            GHIDRA_BRIDGE_SOURCES.analysisOptions,
+          ),
           options.disabledAnalyzers.join(","),
         ]),
     ...((options.platform ?? process.platform) === "win32"
       ? []
       : [
           "-postScript",
-          scriptPath.join(bridgeDirectory, "ReaGhidraNoReturnFix.java"),
+          scriptPath.join(bridgeDirectory, GHIDRA_BRIDGE_SOURCES.noReturnFix),
         ]),
     // After analysis and the no-return refit, before the bridge serves results.
     ...(options.mipsSoftFloat === true
       ? [
           "-postScript",
-          scriptPath.join(bridgeDirectory, "ReaGhidraMipsSoftFloat.java"),
+          scriptPath.join(bridgeDirectory, GHIDRA_BRIDGE_SOURCES.mipsSoftFloat),
         ]
       : []),
     "-postScript",

src/ghidra/GhidraProviderClient.ts

@@ -1,5 +1,6 @@
 import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js";
 import { fileURLToPath } from "node:url";
+import { GHIDRA_BRIDGE_SOURCES } from "./GhidraBridgeSources.js";
 
 import {
   createAnalysisExecution,
@@ -74,7 +75,7 @@ import {
 } from "./GhidraMipsProfile.js";
 import { ghidraRiscvLimitations } from "./GhidraRiscvProfile.js";
 import { ghidraPePdbLimitations } from "./GhidraPeProfile.js";
-import { unverifiedGhidraBuildLimitation } from "./GhidraInstallationPolicy.js";
+import { unverifiedGhidraBuildLimitation } from "./GhidraReleasePolicy.js";
 import { GhidraHeadlessLauncher } from "./GhidraLauncher.js";
 import { attestGhidraNativeLoadImage } from "./GhidraLoadImageAttest.js";
 import {
@@ -584,7 +585,10 @@ export const createGhidraProviderClient = (input: {
         ? {}
         : { javaVmName: installation.javaVmName }),
       bridgeScriptPath: fileURLToPath(
-        new URL("../../bridge/ghidra/ReaGhidraBridge.java", import.meta.url),
+        new URL(
+          `../../bridge/ghidra/${GHIDRA_BRIDGE_SOURCES.bridge}`,
+          import.meta.url,
+        ),
       ),
       ...(pspExtension?.success === true
         ? { pspExtension: pspExtension.data }

src/ghidra/GhidraReleasePolicy.ts

@@ -0,0 +1,118 @@
+/** Ghidra build whose bridge behavior this REA release verifies. */
+export const SUPPORTED_GHIDRA_VERSION = "12.1.4";
+/** Verified JDK major; admission uses the installation's declared bounds. */
+export const SUPPORTED_GHIDRA_JAVA_MAJOR = 21;
+
+/** Numeric Ghidra release read from `application.version`. */
+interface GhidraReleaseVersion {
+  readonly major: number;
+  readonly minor: number;
+  readonly patch: number;
+}
+
+/** How an observed Ghidra release relates to this adapter's bridge. */
+type GhidraReleaseCompatibility =
+  | {
+      readonly status: "verified";
+      readonly version: GhidraReleaseVersion;
+      readonly raw: string;
+    }
+  | {
+      readonly status: "compatible";
+      readonly version: GhidraReleaseVersion;
+      readonly raw: string;
+    }
+  | {
+      readonly status: "unsupported";
+      readonly version: GhidraReleaseVersion;
+      readonly raw: string;
+    }
+  | { readonly status: "unresolved"; readonly raw: string | null };
+
+const GHIDRA_RELEASE_PATTERN = /^(\d+)\.(\d+)(?:\.(\d+))?([-+].*)?$/u;
+
+/** Classify `application.version` against the verified release line. */
+export const ghidraReleaseCompatibility = (
+  raw: string | null | undefined,
+): GhidraReleaseCompatibility => {
+  if (raw === null || raw === undefined)
+    return { status: "unresolved", raw: null };
+  const version = parseGhidraRelease(raw);
+  if (version === undefined) return { status: "unresolved", raw };
+  if (raw === SUPPORTED_GHIDRA_VERSION)
+    return { status: "verified", version, raw };
+  const verified = verifiedGhidraRelease();
+  return version.major === verified.major && version.minor === verified.minor
+    ? { status: "compatible", version, raw }
+    : { status: "unsupported", version, raw };
+};
+
+/**
+ * Limitation recorded when a session runs a compatible build other than the
+ * verified release. The observed version stays on the provider identity.
+ */
+export const unverifiedGhidraBuildLimitation = (
+  providerVersion: string,
+): string | undefined => {
+  const compatibility = ghidraReleaseCompatibility(providerVersion);
+  if (compatibility.status !== "compatible") return undefined;
+  return `This session uses Ghidra ${providerVersion}. The bridge is verified against ${SUPPORTED_GHIDRA_VERSION}; other ${ghidraReleaseLine()} builds are accepted and the observed version is reported.`;
+};
+
+/** Release line accepted by this bridge, such as `12.1.x`. */
+export const ghidraReleaseLine = (): string => {
+  const verified = verifiedGhidraRelease();
+  return `${String(verified.major)}.${String(verified.minor)}.x`;
+};
+
+/** Detail for the installation version check, including the accepted line. */
+export const ghidraVersionDetail = (raw: string | null | undefined): string => {
+  const compatibility = ghidraReleaseCompatibility(raw);
+  switch (compatibility.status) {
+    case "unresolved":
+      return compatibility.raw ?? "unknown";
+    case "verified":
+      return compatibility.raw;
+    case "compatible":
+      return `${compatibility.raw}; compatible ${ghidraReleaseLine()} release (verified build ${SUPPORTED_GHIDRA_VERSION})`;
+    case "unsupported":
+      return `${compatibility.raw}; accepted releases are ${ghidraReleaseLine()} (verified build ${SUPPORTED_GHIDRA_VERSION})`;
+    default: {
+      const unreachable: never = compatibility;
+      return unreachable;
+    }
+  }
+};
+
+/** Whether this release line can run the packaged bridge. */
+export const ghidraReleaseAccepted = (
+  raw: string | null | undefined,
+): boolean => {
+  const status = ghidraReleaseCompatibility(raw).status;
+  return status === "verified" || status === "compatible";
+};
+
+const verifiedGhidraRelease = (): GhidraReleaseVersion => {
+  const version = parseGhidraRelease(SUPPORTED_GHIDRA_VERSION);
+  if (version === undefined)
+    throw new TypeError(
+      `SUPPORTED_GHIDRA_VERSION ${SUPPORTED_GHIDRA_VERSION} is not a Ghidra release`,
+    );
+  return version;
+};
+
+const parseGhidraRelease = (raw: string): GhidraReleaseVersion | undefined => {
+  const match = GHIDRA_RELEASE_PATTERN.exec(raw);
+  const major = integerGroup(match?.[1]);
+  const minor = integerGroup(match?.[2]);
+  if (match === null || major === undefined || minor === undefined)
+    return undefined;
+  const patch = match[3] === undefined ? 0 : integerGroup(match[3]);
+  return patch === undefined ? undefined : { major, minor, patch };
+};
+
+const integerGroup = (value: string | undefined): number | undefined => {
+  if (value === undefined) return undefined;
+  const parsed = Number(value);
+  return Number.isSafeInteger(parsed) ? parsed : undefined;
+};

src/hopper/HopperCleanup.ts

@@ -99,6 +99,12 @@ export const cleanupHopperSession = async (
   )
     input.releaseTransport(input.socket);
   await stopProcess(input, state);
+  // A late authenticated application may exit while shutdown is in flight.
+  await confirmExternalApplicationExit(
+    input.resources,
+    input.socket,
+    input.releaseTransport,
+  );
   recordUnconfirmedDocument(input, state);
   await report(input.progress, 0.75, "removing Hopper private runtime files");
   if (
@@ -379,15 +385,33 @@ const cleanupOutcome = (
 ): Result<null, AnalysisError> => {
   if (state.issues.length === 0) return ok(null);
   return err(
-    new ProviderCleanupError("hopper", [...state.resources], {
-      issues: cleanupIssueDetails(state.issues),
-      ...(input.resources.runtimeRoot === undefined
-        ? {}
-        : { runtime_root: input.resources.runtimeRoot.path }),
-      ...(input.activeRequest === null
-        ? {}
-        : { active_request: activityDetails(input.activeRequest) }),
-    }),
+    new ProviderCleanupError(
+      "hopper",
+      [...state.resources],
+      {
+        issues: cleanupIssueDetails(state.issues),
+        ...(input.resources.runtimeRoot === undefined
+          ? {}
+          : { runtime_root: input.resources.runtimeRoot.path }),
+        ...(input.activeRequest === null
+          ? {}
+          : { active_request: activityDetails(input.activeRequest) }),
+        ...(state.resources.has("hopper-document")
+          ? {
+              authenticated_application:
+                input.resources.externalApplication === undefined
+                  ? "not_observed"
+                  : input.resources.externalApplication.identity.state,
+            }
+          : {}),
+      },
+      state.resources.has("hopper-document")
+        ? {
+            remediationAction:
+              "Export the Evidence bundle before close_binary clears session records. Let Hopper finish initial analysis or complete its pending dialog, then retry close_binary on this connection so REA can authenticate and close the retained document. If no matching bridge becomes available, manually close the reported document in Hopper, then restart the MCP connection. A helper exit or open:false does not establish that retained cleanup is complete.",
+          }
+        : undefined,
+    ),
   );
 };
 

src/hopper/HopperClient.ts

@@ -142,7 +142,12 @@ export class HopperClient {
     this.#rememberProcessFailure(error, []);
   };
   readonly #onSocketClose = (): void => {
-    if (this.#closing) return;
+    if (this.#closing) {
+      this.#failAll(
+        new HopperProcessError(null, { providerState: "unreachable" }),
+      );
+      return;
+    }
     const launch = this.#resources.launch;
     if (
       launch?.providerLifetime === "launcher-process" &&
@@ -215,6 +220,24 @@ export class HopperClient {
    * A recorded exit remains visible after request activity returns to idle.
    */
   operationHealth(): ProviderOperationHealth {
+    if (
+      this.#closing ||
+      this.#closePromise !== undefined ||
+      (!this.#ready &&
+        this.#startupController !== undefined &&
+        this.#operationFailure === undefined)
+    ) {
+      return {
+        state: "busy",
+        stage:
+          this.#closing || this.#closePromise !== undefined
+            ? "connection"
+            : "launch",
+        retryAction: "wait",
+        exitCode: null,
+        requests: [],
+      };
+    }
     const failure = this.#operationFailure;
     if (failure !== undefined) {
       const requests: readonly ProviderOperationRequest[] =
@@ -340,6 +363,7 @@ export class HopperClient {
     this.#operationFailure = undefined;
     this.#startupFailureResult = undefined;
     this.#resources.shutdownConfirmed = false;
+    this.#resources.externalApplication = undefined;
     const deadline = new ProviderStartupDeadline(
       this.#options.startupTimeoutMs,
       signal,
@@ -437,9 +461,31 @@ export class HopperClient {
           : health.error,
       );
     }
-    const parsed = parseHopperServerInfo(health.value, runId);
+    const parsed = await this.#authenticateServerInfo(health.value, runId);
     if (!parsed.ok) return this.#startupFailure(parsed.error);
+    await this.#lineage.observe(this.#resources.launch);
+    return parsed;
+  }
+
+  /** Bind process identity for both initial and late cleanup handshakes. */
+  async #authenticateServerInfo(
+    value: JsonValue,
+    runId: string,
+  ): Promise<Result<HopperServerInfo, HopperProtocolError>> {
+    const parsed = parseHopperServerInfo(value, runId);
+    if (!parsed.ok) return parsed;
     if (this.#resources.launch?.providerLifetime === "external-application") {
+      const application = this.#resources.externalApplication;
+      if (
+        application !== undefined &&
+        application.pid !== parsed.value.processId
+      )
+        return err(
+          new HopperProtocolError(
+            "Hopper bridge process changed within the same run",
+          ),
+        );
+      if (application?.identity.state === "readable") return parsed;
       let identity;
       try {
         identity = await observeProcessStartIdentity(parsed.value.processId);
@@ -460,7 +506,6 @@ export class HopperClient {
         },
       };
     }
-    await this.#lineage.observe(this.#resources.launch);
     return parsed;
   }
 
@@ -631,7 +676,11 @@ export class HopperClient {
           timeoutMs: HOPPER_SHUTDOWN_TIMEOUT_MS,
         },
       );
-      if (health.ok && parseHopperServerInfo(health.value, runId).ok) return;
+      if (
+        health.ok &&
+        (await this.#authenticateServerInfo(health.value, runId)).ok
+      )
+        return;
       this.#releaseTransport();
     } finally {
       this.#closing = false;

src/ida/IdaNativeProtocol.ts

@@ -5,7 +5,6 @@ import {
   disassemblySchema,
   idaAddressSchema,
   modernCalleesSchema,
-  modernStringsSchema,
   modernXrefsSchema,
 } from "./IdaProtocolValues.js";
 
@@ -83,17 +82,6 @@ export const nativeXrefsSchema = z
   .array(modernXrefsSchema.element.extend({ error: nativeErrorSchema }))
   .length(1);
 
-/** Native regex failures carry an empty page, which must not imply absence. */
-export const nativeStringsSchema = modernStringsSchema
-  .extend({ error: z.string().optional() })
-  .transform((page) => {
-    if (page.error !== undefined)
-      throw new AnalysisProtocolError(
-        `Native IDA string search failed: ${page.error}`,
-      );
-    return page;
-  });
-
 /**
  * Native regexes fold bytes, while REA's insensitive literal search folds
  * Unicode strings. Include every non-ASCII value as a candidate, then apply