@bitkyc08/opencodex 2.100.2 → 2.100.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (561) hide show
  1. package/README.md +1 -1
  2. package/bin/ocx.mjs +32 -18
  3. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  4. package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
  5. package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
  6. package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
  7. package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
  8. package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
  9. package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
  10. package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
  11. package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
  12. package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
  13. package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
  14. package/gui/dist/classic/index.html +1 -1
  15. package/gui/dist/index.html +2 -2
  16. package/native/ocx-child/Cargo.toml +9 -0
  17. package/native/ocx-child/src/cli.rs +402 -20
  18. package/native/ocx-child/src/codex_home.rs +98 -14
  19. package/native/ocx-child/src/daemon.rs +2 -1
  20. package/native/ocx-child/src/lib.rs +3 -0
  21. package/native/ocx-child/src/link_ws.rs +2598 -0
  22. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  23. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  24. package/native/ocx-child/src/parity.rs +5 -1
  25. package/native/ocx-child/src/platform.rs +152 -6
  26. package/native/ocx-child/src/relay.rs +150 -19
  27. package/package.json +3 -3
  28. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  29. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  30. package/src/adapters/anthropic/client-identity.ts +3 -1
  31. package/src/adapters/anthropic/passthrough.ts +9 -3
  32. package/src/adapters/anthropic.ts +31 -14
  33. package/src/adapters/client-fingerprint.ts +3 -3
  34. package/src/adapters/cursor/discovery.ts +17 -0
  35. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  36. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  37. package/src/adapters/cursor/protobuf-request.ts +8 -8
  38. package/src/adapters/cursor.ts +7 -6
  39. package/src/adapters/google-antigravity-wire.ts +7 -5
  40. package/src/adapters/google-wire-compiler.ts +2 -2
  41. package/src/adapters/google.ts +9 -2
  42. package/src/adapters/kiro/payload.ts +7 -4
  43. package/src/adapters/kiro/reasoning.ts +44 -1
  44. package/src/adapters/kiro/structured-output.ts +10 -8
  45. package/src/adapters/kiro-tools.ts +61 -15
  46. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  47. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  48. package/src/adapters/zed.ts +3 -0
  49. package/src/advisor/consult.ts +15 -4
  50. package/src/advisor/context.ts +12 -3
  51. package/src/advisor/runtime.ts +35 -5
  52. package/src/advisor/settings.ts +8 -0
  53. package/src/advisor/synthetic-tool.ts +21 -8
  54. package/src/bridge/response-json.ts +11 -2
  55. package/src/bridge/sse.ts +43 -8
  56. package/src/claude/auth-detect.ts +21 -33
  57. package/src/claude/desktop-3p.ts +11 -5
  58. package/src/claude/desktop-gateway-state.ts +2 -0
  59. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  60. package/src/claude/desktop-remote-store.ts +24 -4
  61. package/src/claude/inbound-content-options.ts +31 -16
  62. package/src/claude/outbound.ts +13 -3
  63. package/src/cli/account-api.ts +17 -1
  64. package/src/cli/account-auth.ts +54 -21
  65. package/src/cli/account-key-quota.ts +34 -5
  66. package/src/cli/account.ts +4 -2
  67. package/src/cli/advisor.ts +7 -4
  68. package/src/cli/alias.ts +38 -1
  69. package/src/cli/capabilities-access-remote.ts +128 -3
  70. package/src/cli/capabilities-accounts.ts +3 -3
  71. package/src/cli/capabilities-agents-routing.ts +17 -10
  72. package/src/cli/capabilities-base.ts +41 -16
  73. package/src/cli/capabilities-integrations.ts +2 -2
  74. package/src/cli/capabilities-provider-models.ts +18 -2
  75. package/src/cli/capabilities-route-to.ts +43 -0
  76. package/src/cli/capabilities.ts +2 -0
  77. package/src/cli/capability-contracts.ts +1 -1
  78. package/src/cli/claude-desktop.ts +30 -11
  79. package/src/cli/claude.ts +17 -3
  80. package/src/cli/codex-launcher.ts +3 -1
  81. package/src/cli/codex-shim-autorestore.ts +5 -42
  82. package/src/cli/config-command.ts +14 -1
  83. package/src/cli/config-root-startup.ts +34 -0
  84. package/src/cli/connect.ts +88 -16
  85. package/src/cli/desktop-runtime-guidance.ts +1 -1
  86. package/src/cli/disconnect-runtime.ts +168 -0
  87. package/src/cli/dispatch.ts +54 -12
  88. package/src/cli/export-command.ts +1 -1
  89. package/src/cli/gui-pair-client.ts +6 -3
  90. package/src/cli/gui.ts +10 -5
  91. package/src/cli/help-catalog.ts +11 -0
  92. package/src/cli/help.ts +4 -3
  93. package/src/cli/index.ts +83 -92
  94. package/src/cli/inspect.ts +11 -2
  95. package/src/cli/integrations.ts +26 -1
  96. package/src/cli/link-capture.ts +64 -0
  97. package/src/cli/link-child-ops.ts +218 -40
  98. package/src/cli/link-cleanup.ts +8 -5
  99. package/src/cli/link-diagnostics.ts +67 -0
  100. package/src/cli/link-enrollment.ts +158 -12
  101. package/src/cli/link-operations.ts +52 -0
  102. package/src/cli/link-recover.ts +152 -0
  103. package/src/cli/link-routes.ts +87 -0
  104. package/src/cli/link-status-child.ts +44 -1
  105. package/src/cli/link-status-traffic.ts +34 -0
  106. package/src/cli/link.ts +314 -37
  107. package/src/cli/message-command.ts +1 -1
  108. package/src/cli/message-mcp-command.ts +23 -10
  109. package/src/cli/models-runtime.ts +3 -3
  110. package/src/cli/opencode.ts +3 -1
  111. package/src/cli/pi-sync.ts +35 -0
  112. package/src/cli/preflight-exemptions.ts +46 -0
  113. package/src/cli/registry.ts +28 -12
  114. package/src/cli/restart-failure.ts +5 -2
  115. package/src/cli/root.ts +5 -1
  116. package/src/cli/route-to.ts +172 -0
  117. package/src/cli/runtime-api.ts +5 -8
  118. package/src/cli/status.ts +3 -1
  119. package/src/cli/stop-approval.ts +66 -19
  120. package/src/cli/stop-report.ts +23 -0
  121. package/src/cli/stop-windows-checked.ts +304 -0
  122. package/src/cli/sync-command.ts +70 -15
  123. package/src/cli/sync-fanout.ts +74 -19
  124. package/src/cli/sync-flags.ts +40 -3
  125. package/src/cli/sync-link-status.ts +18 -2
  126. package/src/cli/sync-update-guard.ts +7 -2
  127. package/src/cli/system-restart-client.ts +3 -2
  128. package/src/cli/uninstall-plan.ts +77 -5
  129. package/src/cli/uninstall-stop.ts +152 -0
  130. package/src/cli/v2-input.ts +10 -6
  131. package/src/cli/v2-local-output.ts +3 -2
  132. package/src/cli/v2-runtime.ts +10 -3
  133. package/src/cli/v2.ts +22 -7
  134. package/src/client/connect.ts +321 -34
  135. package/src/client/link-home-features.ts +27 -0
  136. package/src/client/link-home.ts +92 -4
  137. package/src/client/link-ingress.ts +21 -3
  138. package/src/client/link-join.ts +12 -2
  139. package/src/client/link-parity-reporter.ts +60 -6
  140. package/src/client/link-relay-transport.ts +161 -36
  141. package/src/client/link-relay.ts +150 -6
  142. package/src/client/link-request-compression.ts +84 -0
  143. package/src/client/link-state.ts +11 -5
  144. package/src/client/link-status.ts +39 -1
  145. package/src/client/link-teardown.ts +1 -0
  146. package/src/client/link-tunnel.ts +56 -5
  147. package/src/client/link-websocket-limits.ts +89 -0
  148. package/src/client/link-websocket.ts +586 -0
  149. package/src/client/link-ws-advertisement.ts +100 -0
  150. package/src/client/link-ws-framer.ts +241 -0
  151. package/src/client/link-ws-transport.ts +177 -0
  152. package/src/client/machine-api.ts +13 -2
  153. package/src/client/machine-listener.ts +48 -7
  154. package/src/client/route-intent-apply.ts +293 -0
  155. package/src/client/route-intent-file-originals.ts +97 -0
  156. package/src/client/route-intent-native-originals.ts +201 -0
  157. package/src/client/route-intent-watch.ts +141 -0
  158. package/src/client/runtime-restart.ts +127 -5
  159. package/src/client/runtime.ts +61 -15
  160. package/src/client/state.ts +30 -0
  161. package/src/client/sync-expectation.ts +36 -2
  162. package/src/client/sync-runtime.ts +7 -0
  163. package/src/clients/config-export/alias-selectors.ts +63 -40
  164. package/src/clients/config-export/contracts.ts +2 -0
  165. package/src/clients/config-export/nested-selectors.ts +42 -0
  166. package/src/clients/config-export.ts +22 -3
  167. package/src/codex/account-store.ts +12 -3
  168. package/src/codex/account-usability.ts +13 -0
  169. package/src/codex/auth-api/account-list.ts +29 -3
  170. package/src/codex/auth-collision.ts +23 -22
  171. package/src/codex/auth-context.ts +21 -6
  172. package/src/codex/catalog/gather-capture.ts +8 -2
  173. package/src/codex/catalog/parsing.ts +7 -3
  174. package/src/codex/catalog/provider-models.ts +54 -15
  175. package/src/codex/catalog/retained-sync.ts +2 -1
  176. package/src/codex/catalog/routed-gather.ts +1 -1
  177. package/src/codex/catalog-auto-refresh.ts +11 -0
  178. package/src/codex/cli-update-job.ts +35 -13
  179. package/src/codex/convergence.ts +2 -2
  180. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  181. package/src/codex/features.ts +2 -2
  182. package/src/codex/history-provider.ts +31 -0
  183. package/src/codex/inject/multi-agent-v2.ts +9 -3
  184. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  185. package/src/codex/inject/plan.ts +20 -2
  186. package/src/codex/inject.ts +2 -0
  187. package/src/codex/journal-config-restore.ts +217 -0
  188. package/src/codex/journal.ts +75 -6
  189. package/src/codex/main-account.ts +23 -30
  190. package/src/codex/native-main-auth-file.ts +104 -0
  191. package/src/codex/native-profile-manager.ts +4 -3
  192. package/src/codex/native-profile-store.ts +3 -61
  193. package/src/codex/orca-import.ts +10 -1
  194. package/src/codex/quota-history.ts +13 -0
  195. package/src/codex/quota-window-conflict.ts +103 -0
  196. package/src/codex/quota.ts +23 -1
  197. package/src/codex/subagent-model-fallback.ts +3 -1
  198. package/src/codex/websocket-activity.ts +171 -16
  199. package/src/codex/websocket-registry.ts +11 -4
  200. package/src/combos/cooldown-store.ts +25 -5
  201. package/src/combos/failover.ts +330 -2
  202. package/src/config/dashboard-trusted-proxy.ts +83 -0
  203. package/src/config/diagnostics.ts +28 -0
  204. package/src/config/feature-flags.ts +9 -0
  205. package/src/config/live-reconcile.ts +10 -1
  206. package/src/config/load-degrade.ts +12 -1
  207. package/src/config/multi-agent-surface.ts +28 -5
  208. package/src/config/pending-teardown.ts +60 -3
  209. package/src/config/process-state.ts +175 -4
  210. package/src/config/provider-validation.ts +4 -4
  211. package/src/config/schema/config-schema.ts +6 -0
  212. package/src/config/schema/leaf-validators.ts +9 -2
  213. package/src/config/windows-process-command-line.ts +107 -0
  214. package/src/generated/compatibility-version.json +948 -392
  215. package/src/generated/model-metadata.ts +1 -1
  216. package/src/images/loop.ts +3 -0
  217. package/src/integrations/model-name-guard.ts +25 -0
  218. package/src/integrations/route-intent-catalog.ts +26 -0
  219. package/src/integrations/route-intent-connected.ts +262 -0
  220. package/src/integrations/route-intent-contract.ts +55 -0
  221. package/src/integrations/route-intent-disconnect.ts +109 -0
  222. package/src/integrations/route-intent-initial.ts +64 -0
  223. package/src/integrations/route-intent-state.ts +117 -0
  224. package/src/integrations/route-intent-tick.ts +65 -0
  225. package/src/integrations/route-intent.ts +212 -0
  226. package/src/integrations/writer.ts +44 -11
  227. package/src/lib/client-retry-after.ts +29 -0
  228. package/src/lib/config-ownership.ts +13 -0
  229. package/src/lib/desktop-gui-origin.ts +28 -0
  230. package/src/lib/errors.ts +1 -1
  231. package/src/lib/gui-pair-capability.ts +2 -1
  232. package/src/lib/messages-error-body.ts +4 -1
  233. package/src/lib/outbound-credential-registry.ts +362 -4
  234. package/src/lib/paced-stream.ts +34 -0
  235. package/src/lib/passive-key-fetch-proof.ts +30 -0
  236. package/src/lib/passive-read.ts +5 -0
  237. package/src/lib/process-control.ts +76 -12
  238. package/src/lib/redact.ts +84 -8
  239. package/src/lib/state-store-registrations.ts +11 -0
  240. package/src/lib/state-store-sweeper.ts +4 -0
  241. package/src/lib/supervisor-markers.ts +18 -0
  242. package/src/lib/terminal-safe-text.ts +58 -0
  243. package/src/lib/translator-budget.ts +3 -2
  244. package/src/lib/upstream-retry.ts +14 -4
  245. package/src/link/alias-lock.ts +119 -0
  246. package/src/link/child-activity.ts +28 -2
  247. package/src/link/child-binary-cache-fill.d.mts +50 -0
  248. package/src/link/child-binary-cache-fill.mjs +494 -0
  249. package/src/link/child-binary-cache-start.ts +73 -0
  250. package/src/link/child-binary-source.ts +12 -5
  251. package/src/link/child-gated-ocx.ts +29 -11
  252. package/src/link/child-observations.ts +2 -1
  253. package/src/link/child-observe.ts +2 -2
  254. package/src/link/child-ops-engine.ts +159 -91
  255. package/src/link/child-ops-host.ts +138 -0
  256. package/src/link/child-ops-runners.ts +319 -0
  257. package/src/link/child-ops-scheduler.ts +207 -0
  258. package/src/link/child-ops-types.ts +89 -0
  259. package/src/link/child-parity.ts +23 -4
  260. package/src/link/child-policy.ts +93 -0
  261. package/src/link/child-update-contract.ts +12 -3
  262. package/src/link/codex-settings.ts +1 -1
  263. package/src/link/compatibility.ts +18 -1
  264. package/src/link/diagnostics-read.ts +163 -0
  265. package/src/link/diagnostics.ts +20 -7
  266. package/src/link/explicit-route.ts +209 -0
  267. package/src/link/link-recover.ts +113 -0
  268. package/src/link/management-routes.ts +3 -1
  269. package/src/link/operation-recovery-slot.ts +44 -0
  270. package/src/link/operations-journal.ts +408 -0
  271. package/src/link/peer-report.ts +1 -1
  272. package/src/link/relay-auth.ts +14 -0
  273. package/src/link/remote-plant.ts +152 -14
  274. package/src/link/remote-platform.ts +21 -10
  275. package/src/link/remote-probe.ts +11 -3
  276. package/src/link/remote-windows.ts +50 -10
  277. package/src/link/request-compression.ts +30 -0
  278. package/src/link/residual-recovery.ts +54 -0
  279. package/src/link/retirement.ts +128 -0
  280. package/src/link/route-intent-watch.ts +41 -0
  281. package/src/link/route-intent.ts +209 -0
  282. package/src/link/route-proof.ts +82 -0
  283. package/src/link/route-rounds.ts +579 -0
  284. package/src/link/route-select.ts +95 -0
  285. package/src/link/route-trust.ts +96 -0
  286. package/src/link/ssh-argv.ts +172 -24
  287. package/src/link/ssh-capture-redact.ts +253 -0
  288. package/src/link/ssh-capture.ts +497 -0
  289. package/src/link/ssh-runner.ts +141 -14
  290. package/src/link/status-projection.ts +87 -0
  291. package/src/link/store.ts +54 -1
  292. package/src/link/supervisor.ts +543 -55
  293. package/src/link/sync-fanout-classify.ts +16 -0
  294. package/src/link/sync-then-restart.ts +65 -0
  295. package/src/link/tombstones.ts +209 -0
  296. package/src/link/traffic.ts +178 -0
  297. package/src/link/ws-activity-holds.ts +474 -0
  298. package/src/local-credentials/publication-fence.ts +20 -1
  299. package/src/messaging/mcp-queue-rpc.ts +1 -1
  300. package/src/messaging/mcp-queue-server.ts +16 -1
  301. package/src/messaging/mcp-resume-tools.ts +25 -0
  302. package/src/messaging/remote-enrollment.ts +3 -3
  303. package/src/messaging/remote-tunnels.ts +2 -2
  304. package/src/messaging/resume-permissions.ts +27 -0
  305. package/src/messaging/rpc.ts +46 -2
  306. package/src/oauth/anthropic-continuity.ts +23 -7
  307. package/src/oauth/anthropic-routing.ts +5 -2
  308. package/src/oauth/anthropic.ts +22 -2
  309. package/src/oauth/claude-keychain-read.ts +78 -68
  310. package/src/oauth/index.ts +24 -6
  311. package/src/oauth/local-token-detect.ts +8 -29
  312. package/src/oauth/login-cli-errors.ts +5 -1
  313. package/src/oauth/login-cli.ts +33 -18
  314. package/src/oauth/login-flow-state.ts +26 -3
  315. package/src/oauth/meta-muse.ts +1 -1
  316. package/src/oauth/store.ts +7 -0
  317. package/src/oauth/xai.ts +248 -14
  318. package/src/protocols/contract.ts +4 -0
  319. package/src/protocols/encoders/messages.ts +1 -0
  320. package/src/providers/alias-template.ts +48 -0
  321. package/src/providers/anthropic-billing-ownership.ts +2 -0
  322. package/src/providers/anthropic-output-caps.ts +46 -0
  323. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  324. package/src/providers/antigravity-effort-families.ts +11 -3
  325. package/src/providers/antigravity-models.ts +32 -9
  326. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  327. package/src/providers/api-key-pause.ts +3 -0
  328. package/src/providers/api-key-resolve.ts +49 -7
  329. package/src/providers/api-key-response-ownership.ts +2 -0
  330. package/src/providers/api-key-selection.ts +51 -9
  331. package/src/providers/api-keys.ts +6 -2
  332. package/src/providers/cache-affinity-identity.ts +73 -0
  333. package/src/providers/cache-affinity.ts +256 -0
  334. package/src/providers/default-aliases.ts +98 -20
  335. package/src/providers/google-vertex-model-discovery.ts +510 -0
  336. package/src/providers/key-failover.ts +123 -8
  337. package/src/providers/key-store.ts +3 -3
  338. package/src/providers/kiro-models.ts +3 -5
  339. package/src/providers/label.ts +31 -5
  340. package/src/providers/mistral-transport.ts +17 -4
  341. package/src/providers/model-rename-fields.ts +3 -0
  342. package/src/providers/muse-key-quota.ts +14 -6
  343. package/src/providers/new-model-policy-runtime.ts +17 -4
  344. package/src/providers/new-model-policy.ts +30 -4
  345. package/src/providers/passive-key-observation.ts +252 -0
  346. package/src/providers/quota/account-cache.ts +2 -1
  347. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  348. package/src/providers/quota/passive-key-limits.ts +272 -0
  349. package/src/providers/quota/passive-wire-model.ts +126 -0
  350. package/src/providers/quota/report-cache.ts +61 -2
  351. package/src/providers/quota-key-accounts.ts +11 -6
  352. package/src/providers/quota-types.ts +18 -0
  353. package/src/providers/quota.ts +11 -12
  354. package/src/providers/registry/entries-core.ts +34 -16
  355. package/src/providers/registry/entries-extended.ts +32 -0
  356. package/src/providers/registry/model-seeds.ts +35 -0
  357. package/src/providers/resolved-model-policy.ts +7 -0
  358. package/src/providers/routed-config.ts +8 -3
  359. package/src/providers/xai-transport.ts +3 -0
  360. package/src/remote/features.ts +17 -0
  361. package/src/responses/anthropic-progress.ts +10 -4
  362. package/src/responses/citation-markers.ts +231 -0
  363. package/src/responses/spill-store.ts +5 -1
  364. package/src/responses/state/replay-input.ts +50 -0
  365. package/src/responses/state/replay-owner.ts +24 -0
  366. package/src/responses/state/snapshot-codec.ts +9 -0
  367. package/src/responses/state/spill-queue.ts +1 -0
  368. package/src/responses/state.ts +42 -60
  369. package/src/router.ts +2 -2
  370. package/src/routing/home-route-capture.ts +123 -0
  371. package/src/routing/home-route-intent.ts +200 -0
  372. package/src/routing/route-intent-state.ts +178 -0
  373. package/src/routing/route-to-live-settings.ts +35 -0
  374. package/src/routing/route-to-local.ts +145 -0
  375. package/src/routing/route-to-status.ts +94 -0
  376. package/src/routing/route-to-sync-child.ts +32 -0
  377. package/src/server/adapter-resolve.ts +21 -1
  378. package/src/server/admitted-http-turn.ts +3 -0
  379. package/src/server/auth-cors.ts +98 -0
  380. package/src/server/bare-upstream-error.ts +220 -0
  381. package/src/server/chat-native.ts +14 -5
  382. package/src/server/claude-messages.ts +6 -4
  383. package/src/server/codex-model-list.ts +2 -1
  384. package/src/server/configured-credentials.ts +37 -5
  385. package/src/server/gui-desktop-authorization.ts +36 -0
  386. package/src/server/gui-pair-delivery.ts +6 -3
  387. package/src/server/gui-session.ts +10 -1
  388. package/src/server/inbound-body-admission.ts +17 -4
  389. package/src/server/index/link-listener.ts +190 -12
  390. package/src/server/index/link-management.ts +15 -1
  391. package/src/server/index/link-relay-sessions.ts +87 -8
  392. package/src/server/index/link-websocket-limits.ts +136 -0
  393. package/src/server/index/link-websocket.ts +692 -0
  394. package/src/server/index/optional-listeners.ts +97 -7
  395. package/src/server/index/route-intent-watch.ts +47 -0
  396. package/src/server/index/serve-contract.ts +86 -0
  397. package/src/server/index/serve-options.ts +35 -86
  398. package/src/server/index/startup-warnings.ts +8 -2
  399. package/src/server/index/websocket-handler.ts +26 -4
  400. package/src/server/index.ts +12 -2
  401. package/src/server/inference/client-encoder-delivery.ts +2 -0
  402. package/src/server/inspection-tee.ts +39 -2
  403. package/src/server/lifecycle.ts +2 -0
  404. package/src/server/link-turn.ts +137 -0
  405. package/src/server/management/advisor-routes.ts +10 -2
  406. package/src/server/management/agent-settings-routes.ts +50 -16
  407. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  408. package/src/server/management/context.ts +9 -2
  409. package/src/server/management/desktop-authorization.ts +41 -0
  410. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  411. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  412. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  413. package/src/server/management/home-integration-decision.ts +89 -0
  414. package/src/server/management/integration-routes.ts +208 -81
  415. package/src/server/management/link-child-ops-routes.ts +145 -43
  416. package/src/server/management/link-child-preflight.ts +31 -0
  417. package/src/server/management/link-diagnostics-route.ts +29 -0
  418. package/src/server/management/link-enrollment.ts +199 -47
  419. package/src/server/management/link-operation.ts +609 -0
  420. package/src/server/management/link-recover-route.ts +103 -0
  421. package/src/server/management/link-route-edit.ts +173 -0
  422. package/src/server/management/link-route-request.ts +62 -0
  423. package/src/server/management/link-route-state.ts +83 -7
  424. package/src/server/management/link-routes.ts +553 -51
  425. package/src/server/management/link-traffic-status.ts +13 -0
  426. package/src/server/management/model-routes.ts +122 -36
  427. package/src/server/management/model-rows.ts +2 -1
  428. package/src/server/management/native-integration-routes.ts +176 -70
  429. package/src/server/management/oauth-account-routes.ts +36 -13
  430. package/src/server/management/protocol-routes.ts +7 -0
  431. package/src/server/management/provider-completion-test.ts +4 -4
  432. package/src/server/management/provider-overwrite-carry.ts +11 -0
  433. package/src/server/management/provider-routes.ts +64 -61
  434. package/src/server/management/provider-routing-quota.ts +45 -0
  435. package/src/server/management/route-registry.ts +22 -3
  436. package/src/server/management/route-to-routes.ts +257 -0
  437. package/src/server/management/system-restart.ts +4 -2
  438. package/src/server/management/usage-aggregate-cache.ts +101 -66
  439. package/src/server/management-api.ts +17 -3
  440. package/src/server/management-auth.ts +13 -1
  441. package/src/server/messages-native-preflight.ts +27 -4
  442. package/src/server/messages-native.ts +17 -5
  443. package/src/server/persistent-gui-session.ts +6 -3
  444. package/src/server/proxy-liveness.ts +33 -6
  445. package/src/server/relay-eager.ts +36 -12
  446. package/src/server/relay.ts +183 -116
  447. package/src/server/request-body-facts.ts +48 -0
  448. package/src/server/request-decompress.ts +65 -2
  449. package/src/server/request-log-account-rotation.ts +6 -0
  450. package/src/server/request-log-attempt-usage.ts +69 -0
  451. package/src/server/request-log-cache-affinity.ts +60 -0
  452. package/src/server/request-log-conversation.ts +45 -2
  453. package/src/server/request-log-terminal-status.ts +210 -24
  454. package/src/server/request-log.ts +71 -79
  455. package/src/server/responses/adapter-continuation.ts +2 -1
  456. package/src/server/responses/adapter-delivery.ts +2 -0
  457. package/src/server/responses/adapter-dispatch.ts +5 -7
  458. package/src/server/responses/advisor-plan-slot.ts +33 -1
  459. package/src/server/responses/advisor-question.ts +21 -0
  460. package/src/server/responses/advisor-slot.ts +10 -3
  461. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  462. package/src/server/responses/buffered-sse-json.ts +9 -3
  463. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  464. package/src/server/responses/codex-tool-catalog.ts +156 -0
  465. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  466. package/src/server/responses/combo-stream-preflight.ts +557 -54
  467. package/src/server/responses/compact.ts +32 -8
  468. package/src/server/responses/core-codex-account.ts +17 -3
  469. package/src/server/responses/core-combo-failure.ts +8 -0
  470. package/src/server/responses/core-combo.ts +32 -4
  471. package/src/server/responses/core-errors.ts +5 -2
  472. package/src/server/responses/core-lifetime.ts +3 -2
  473. package/src/server/responses/core-normalize.ts +3 -1
  474. package/src/server/responses/core-options.ts +6 -0
  475. package/src/server/responses/core.ts +2 -0
  476. package/src/server/responses/fetch-helpers.ts +15 -10
  477. package/src/server/responses/native-replay-guard.ts +57 -0
  478. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  479. package/src/server/responses/outbound-request-body.ts +29 -0
  480. package/src/server/responses/passthrough-completion.ts +105 -8
  481. package/src/server/responses/passthrough-delivery.ts +31 -11
  482. package/src/server/responses/passthrough-dispatch.ts +74 -73
  483. package/src/server/responses/policy-fallback.ts +13 -1
  484. package/src/server/responses/request-prepare.ts +50 -6
  485. package/src/server/responses/request-transport.ts +10 -3
  486. package/src/server/responses/reset-replay.ts +46 -2
  487. package/src/server/responses/run-turn-execution.ts +2 -0
  488. package/src/server/responses/sidecar-execution.ts +14 -0
  489. package/src/server/responses/terminal-error-redaction.ts +222 -25
  490. package/src/server/responses/ws-upstream.ts +2 -2
  491. package/src/server/sse-payload-rewrite.ts +3 -2
  492. package/src/server/stop-service-route.ts +85 -0
  493. package/src/server/system-env-shell.ts +12 -1
  494. package/src/server/system-env.ts +5 -3
  495. package/src/server/windows-tcp-drop.ts +21 -4
  496. package/src/server/workflow-refusal.ts +8 -0
  497. package/src/server/ws-bridge.ts +191 -12
  498. package/src/service/cli-windows-stop.ts +189 -0
  499. package/src/service/cli.ts +41 -12
  500. package/src/service/disconnected-client-restart.ts +60 -0
  501. package/src/service/guarded-manager-target.ts +18 -1
  502. package/src/service/health.ts +99 -6
  503. package/src/service/launchd.ts +84 -31
  504. package/src/service/orchestration.ts +418 -91
  505. package/src/service/repair.ts +223 -6
  506. package/src/service/restart-proxy-stop.ts +79 -0
  507. package/src/service/service-child-ownership.ts +6 -2
  508. package/src/service/windows-checked-stop-live.ts +467 -0
  509. package/src/service/windows-checked-stop.ts +435 -0
  510. package/src/service/windows-command-line-token.ts +23 -0
  511. package/src/service/windows-guarded-manager.ts +77 -34
  512. package/src/service/windows-ops.ts +38 -56
  513. package/src/service/windows-process-evidence.ts +292 -0
  514. package/src/service/windows-process-native.ts +262 -0
  515. package/src/service/windows-service-stop.ts +321 -0
  516. package/src/service/windows-stop-binding.ts +187 -0
  517. package/src/service/windows-stop-budget.ts +123 -0
  518. package/src/service/windows-stop-confirm.ts +158 -0
  519. package/src/service/windows-stop-deadline.ts +56 -0
  520. package/src/service.ts +2 -2
  521. package/src/types/config.ts +42 -18
  522. package/src/types/link.ts +20 -0
  523. package/src/types/multi-agent.ts +13 -0
  524. package/src/types/provider.ts +47 -2
  525. package/src/types/request.ts +4 -0
  526. package/src/types.ts +3 -0
  527. package/src/update/guarded-runtime-ops.ts +5 -7
  528. package/src/update/index.ts +25 -10
  529. package/src/update/install-detection.mjs +3 -1
  530. package/src/update/job-pinned-start.ts +2 -0
  531. package/src/update/job-windows-restart.ts +19 -32
  532. package/src/update/job.ts +12 -5
  533. package/src/update/npm-install.d.mts +11 -0
  534. package/src/update/npm-install.mjs +44 -7
  535. package/src/update/orchestrated-entry.ts +1 -1
  536. package/src/update/orchestrated-node-driver.mjs +3 -2
  537. package/src/update/orchestrated-pnpm.d.mts +4 -0
  538. package/src/update/orchestrated-pnpm.mjs +50 -6
  539. package/src/update/orchestrated-session.d.mts +3 -1
  540. package/src/update/orchestrated-session.mjs +21 -6
  541. package/src/update/pnpm-global-install.d.mts +21 -3
  542. package/src/update/pnpm-global-install.mjs +322 -19
  543. package/src/update/pnpm-store-layout.mjs +46 -0
  544. package/src/update/sync-update-mutex.d.mts +3 -2
  545. package/src/update/sync-update-mutex.mjs +57 -8
  546. package/src/update/transactional-install.d.mts +3 -1
  547. package/src/update/transactional-install.mjs +545 -12
  548. package/src/update/windows-installer-marker.d.mts +1 -0
  549. package/src/update/windows-installer-marker.mjs +44 -0
  550. package/src/usage/expected-prices.ts +8 -0
  551. package/src/usage/filter-index.ts +326 -77
  552. package/src/usage/ledger-scanner.ts +15 -0
  553. package/src/usage/link-log-fields.ts +48 -0
  554. package/src/usage/log.ts +43 -2
  555. package/src/usage/request-body.ts +37 -0
  556. package/src/web-search/loop.ts +3 -0
  557. package/gui/dist/assets/App-BpJOzw4F.js +0 -59
  558. package/gui/dist/assets/index-Bbor_y80.js +0 -94
  559. package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
  560. package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
  561. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -24,8 +24,9 @@ import { guardedRenameSync, ownedArtifactRm } from "./mutation-guard.mjs";
24
24
  */
25
25
  import { probeSpawnSync } from "./mutation-guard.mjs";
26
26
  import { randomBytes } from "node:crypto";
27
- import { existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, realpathSync, statSync, writeFileSync } from "node:fs";
28
- import { basename, dirname, join } from "node:path";
27
+ import { existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, readlinkSync, realpathSync, statSync, writeFileSync } from "node:fs";
28
+ import { basename, delimiter, dirname, isAbsolute, join, parse, relative, resolve, sep } from "node:path";
29
+ import { isInMarkedPnpmCustomStore } from "./pnpm-store-layout.mjs";
29
30
 
30
31
  /**
31
32
  * Dependency lookup confined to the candidate's OWN tree. This is the npm contract and it
@@ -68,14 +69,179 @@ function isPnpmManagedRoot(nodeModulesDir) {
68
69
  return existsSync(join(nodeModulesDir, ".pnpm")) || existsSync(join(nodeModulesDir, ".modules.yaml"));
69
70
  }
70
71
 
72
+ /**
73
+ * Containment is checked on canonical paths, with a separator boundary rather than a
74
+ * string prefix so a sibling with a similar name cannot count as part of the store.
75
+ */
76
+ function inside(path, root) {
77
+ const rel = relative(root, path);
78
+ return rel === "" || (rel !== ".." && !rel.startsWith(".." + sep) && !isAbsolute(rel));
79
+ }
80
+
81
+ /**
82
+ * Follow one link's own text component by component, as the operating system does. Collapsing ".."
83
+ * first would hide a relay such as `../outside/relay/../../store/...`. A step down must land inside
84
+ * an allowed root or on an ancestor of one (pnpm's relative links climb through those ancestors); a
85
+ * step through another link before the last component is refused, because ".." after it would be
86
+ * resolved from that link's target rather than from the spelling checked here.
87
+ */
88
+ function followLinkText(linkPath, text, spellings) {
89
+ const raw = String(text);
90
+ const root = isAbsolute(raw) ? parse(raw).root : "";
91
+ const parts = raw.slice(root.length).split(sep === "\\" ? /[\\/]+/ : /\/+/).filter(part => part && part !== ".");
92
+ let current = root ? resolve(root) : dirname(linkPath);
93
+ for (let index = 0; index < parts.length; index += 1) {
94
+ if (parts[index] === "..") { current = dirname(current); continue; }
95
+ current = join(current, parts[index]);
96
+ if (!spellings.some(root => inside(current, root) || inside(root, current))) throw new Error("link is outside the selected store");
97
+ if (index < parts.length - 1) {
98
+ let stat;
99
+ try { stat = lstatSync(current); } catch { throw new Error("link is outside the selected store"); }
100
+ if (stat.isSymbolicLink()) throw new Error("link is outside the selected store");
101
+ }
102
+ }
103
+ return current;
104
+ }
105
+
106
+ /** Resolve every link after entering a store; an external hop cannot vouch for a later return. */
107
+ function resolveStoreLinkChain(path, store, alias, alternateRoot, alternateAlias) {
108
+ const roots = alternateRoot ? [store, alternateRoot] : [store];
109
+ const spellings = [store, alias, alternateRoot, alternateAlias].filter(Boolean);
110
+ const normalize = value => {
111
+ const target = resolve(value);
112
+ if (alias && inside(target, alias)) return resolve(store, relative(alias, target));
113
+ if (alternateAlias && inside(target, alternateAlias)) return resolve(alternateRoot, relative(alternateAlias, target));
114
+ return target;
115
+ };
116
+ let pending = normalize(path), hops = 0;
117
+ for (;;) {
118
+ const root = roots.find(candidate => inside(pending, candidate));
119
+ if (!root) throw new Error("link is outside the selected store");
120
+ const parts = relative(root, pending).split(sep).filter(Boolean);
121
+ let prefix = root, changed = false;
122
+ for (let index = 0; index < parts.length; index += 1) {
123
+ prefix = join(prefix, parts[index]);
124
+ if (!lstatSync(prefix).isSymbolicLink()) continue;
125
+ if (++hops > 64) throw new Error("too many store link hops");
126
+ const target = normalize(followLinkText(prefix, readlinkSync(prefix), spellings));
127
+ if (!roots.some(candidate => inside(target, candidate))) throw new Error("link is outside the selected store");
128
+ pending = resolve(target, ...parts.slice(index + 1));
129
+ changed = true;
130
+ break;
131
+ }
132
+ if (!changed) return prefix;
133
+ }
134
+ }
135
+
136
+ /** "none" without a v<N>/links component, "isolated" when a .pnpm store sits below the last one, else "links". */
137
+ function linksComponentState(path) {
138
+ const parts = String(path).split(/[\\/]+/);
139
+ let links = -1;
140
+ for (let i = 1; i < parts.length; i += 1) {
141
+ if (/^links$/i.test(parts[i]) && /^v\d+$/i.test(parts[i - 1])) links = i;
142
+ }
143
+ if (links < 0) return "none";
144
+ for (let i = links + 1; i < parts.length - 1; i += 1) {
145
+ if (/^node_modules$/i.test(parts[i]) && /^\.pnpm$/i.test(parts[i + 1])) return "isolated";
146
+ }
147
+ return "links";
148
+ }
149
+
150
+ /** The spelling up to and including its last v<N>/links component, or null without one. */
151
+ function linksRoot(path) {
152
+ const parts = String(path).split(/[\\/]+/);
153
+ let links = -1;
154
+ for (let i = 1; i < parts.length; i += 1) {
155
+ if (/^links$/i.test(parts[i]) && /^v\d+$/i.test(parts[i - 1])) links = i;
156
+ }
157
+ return links < 0 ? null : parts.slice(0, links + 1).join(sep) || sep;
158
+ }
159
+
160
+ /** Retain intermediate spellings: realpath alone hides a links directory behind another symlink. */
161
+ function packagePathUsesGlobalLinks(packageDir, store, storeAlias = store) {
162
+ let path = resolve(packageDir);
163
+ let found = false;
164
+ // Spellings with a v<N>/links component. Each classifies unless the package finally lands in an isolated
165
+ // install (a node_modules/.pnpm store) inside that same links directory: an isolated group's top-level link
166
+ // into its own .pnpm store is not a global-store link, while a link that leaves for anywhere else is.
167
+ const linkRoots = [];
168
+ for (let hop = 0; hop < 64; hop += 1) {
169
+ if (store && (inside(path, store) || (storeAlias && inside(path, storeAlias)))) {
170
+ resolveStoreLinkChain(path, store, storeAlias);
171
+ }
172
+ // Every effective spelling, the listed one first, is judged. The isolated-install exception covers the
173
+ // default store/v<N>/links spelling too: a global-store link instance never contains node_modules/.pnpm
174
+ // below its links directory.
175
+ const state = linksComponentState(path);
176
+ if (state === "links") linkRoots.push(linksRoot(path));
177
+ found ||= state === "none" && Boolean(store && inside(path, join(store, "links")));
178
+ // Store markers classify on every effective spelling, not only the final realpath, so a listed path below a
179
+ // marked store whose package link points elsewhere still demands the store proof.
180
+ found ||= isInMarkedPnpmCustomStore(path.replaceAll("\\", "/"), existsSync);
181
+ const root = parse(path).root;
182
+ const parts = path.slice(root.length).split(sep).filter(Boolean);
183
+ let prefix = root, changed = false;
184
+ for (let i = 0; i < parts.length; i += 1) {
185
+ prefix = join(prefix, parts[i]);
186
+ if (lstatSync(prefix).isSymbolicLink()) {
187
+ const target = resolve(dirname(prefix), readlinkSync(prefix));
188
+ const remaining = parts.slice(i + 1);
189
+ // Judge the effective spelling (target plus the rest of the path), so a package reached through a
190
+ // group link classifies exactly as the same location reached directly.
191
+ path = resolve(target, ...remaining);
192
+ changed = true;
193
+ break;
194
+ }
195
+ }
196
+ // The joined spelling after a hop is judged at the top of the next iteration; the final location was
197
+ // judged in this one (owner decision B: a package listed directly inside v<N>/links needs the proof).
198
+ if (!changed) {
199
+ const isolated = linksComponentState(path) === "isolated";
200
+ return found || linkRoots.some(root => !(isolated && inside(path, root)));
201
+ }
202
+ }
203
+ throw new Error("pnpm package symlink chain is too long");
204
+ }
205
+
206
+ /**
207
+ * True unless this root spelling is canonical: no "." or ".." segment (path.resolve would delete them
208
+ * without visiting the links they cross), no link or junction component, and realpath returns the same
209
+ * path (case folded; a case-only symlink is caught by the component walk).
210
+ */
211
+ function spellingHasLinkComponent(path) {
212
+ const raw = String(path);
213
+ const { root } = parse(raw);
214
+ const parts = raw.slice(root.length).split(/[\\/]+/).filter(Boolean);
215
+ if (!root || parts.some(part => part === "." || part === "..")) return true;
216
+ let current = root;
217
+ for (const part of parts) {
218
+ current = join(current, part);
219
+ if (lstatSync(current).isSymbolicLink()) return true;
220
+ }
221
+ const fold = value => resolve(value).replaceAll("\\", "/").replace(/\/+$/, "").toLowerCase();
222
+ return fold(realpathSync.native(raw)) !== fold(raw);
223
+ }
224
+
225
+ /**
226
+ * Whether any spelling of this package passes through pnpm store links. This only classifies which
227
+ * proof the updater must obtain; it never accepts a package. An unreadable chain throws.
228
+ */
229
+ export function pnpmPackageUsesGlobalStoreLinks(packageDir) {
230
+ if (packagePathUsesGlobalLinks(packageDir, undefined)) return true;
231
+ // A configured virtual-store directory inside a custom store has no \`links\` component; pnpm's
232
+ // store markers route it to the same store proof.
233
+ return isInMarkedPnpmCustomStore(realpathSync(packageDir).replaceAll("\\", "/"), existsSync);
234
+ }
235
+
71
236
  /**
72
237
  * Dependency roots this package INSTANCE owns. pnpm exposes dependencies in several shapes —
73
238
  * symlinks inside the package's own node_modules, a package root that is itself a symlink into
74
239
  * the virtual store, or a hoisted group root — so the npm rule alone rejects healthy trees.
75
240
  * Ownership is still bounded: an enclosing node_modules counts only when pnpm's own metadata
76
- * says pnpm manages it, which keeps an unrelated ancestor installation out.
241
+ * says pnpm manages it, or when the package's realpath group sits in pnpm's global virtual
242
+ * store, which keeps an unrelated ancestor installation out.
77
243
  */
78
- function ownedDependencyRoots(packageDir) {
244
+ function ownedDependencyRoots(packageDir, store) {
79
245
  const roots = [];
80
246
  const add = dir => { if (dir && !roots.includes(dir)) roots.push(dir); };
81
247
  const lexicalGroup = enclosingNodeModules(packageDir);
@@ -85,7 +251,7 @@ function ownedDependencyRoots(packageDir) {
85
251
  if (real && real !== packageDir) add(join(real, "node_modules"));
86
252
  if (isPnpmManagedRoot(lexicalGroup)) add(lexicalGroup);
87
253
  const realGroup = real ? enclosingNodeModules(real) : undefined;
88
- if (isPnpmManagedRoot(realGroup)) add(realGroup);
254
+ if (isPnpmManagedRoot(realGroup) || (store && realGroup && inside(realGroup, store))) add(realGroup);
89
255
  return roots;
90
256
  }
91
257
 
@@ -96,16 +262,328 @@ function ownedDependencyRoots(packageDir) {
96
262
  * as a virtual-store path that no lexical ownership test can recognise. existsSync follows
97
263
  * the symlink, which is exactly the pnpm graph edge that proves ownership.
98
264
  */
99
- function pnpmOwnedDependencyDir(packageDir, name) {
100
- for (const root of ownedDependencyRoots(packageDir)) {
265
+ function pnpmOwnedDependencyDir(packageDir, name, store, globalLinks, escaped, roots = ownedDependencyRoots(packageDir, store), storeAlias = store) {
266
+ let matched;
267
+ for (const root of roots) {
101
268
  const dir = join(root, ...name.split("/"));
102
- if (existsSync(join(dir, "package.json"))) return dir;
269
+ if (globalLinks) {
270
+ if (name.startsWith("@") && name.includes("/")) {
271
+ const scope = join(root, name.split("/")[0]);
272
+ let scopeStat;
273
+ try { scopeStat = lstatSync(scope); } catch (error) {
274
+ if (error?.code !== "ENOENT" && error?.code !== "ENOTDIR") escaped.add("pnpm dependency link could not be resolved: " + name);
275
+ continue;
276
+ }
277
+ if (scopeStat.isSymbolicLink()) {
278
+ try { if (!inside(realpathSync(scope), store)) { escaped.add("pnpm dependency link escapes the selected store: " + name); continue; } }
279
+ catch { escaped.add("pnpm dependency link could not be resolved: " + name); continue; }
280
+ }
281
+ }
282
+ try { lstatSync(dir); } catch (error) {
283
+ if (error?.code !== "ENOENT" && error?.code !== "ENOTDIR") escaped.add("pnpm dependency link could not be resolved: " + name);
284
+ continue;
285
+ }
286
+ try {
287
+ const realRoot = realpathSync(root);
288
+ if (!inside(realRoot, store)) { escaped.add("pnpm dependency root is outside the selected store: " + name); continue; }
289
+ if (!inside(realpathSync(dir), store)) { escaped.add("pnpm dependency link escapes the selected store: " + name); continue; }
290
+ if (!inside(resolveStoreLinkChain(join(realRoot, ...name.split("/")), store, storeAlias), store)) { escaped.add("pnpm dependency link escapes the selected store: " + name); continue; }
291
+ } catch (error) {
292
+ escaped.add(error?.message === "link is outside the selected store"
293
+ ? "pnpm dependency link escapes the selected store: " + name : "pnpm dependency link could not be resolved: " + name);
294
+ continue;
295
+ }
296
+ }
297
+ if (globalLinks) {
298
+ try {
299
+ if (statSync(dir).isDirectory() && !existsSync(join(dir, "package.json"))) {
300
+ escaped.add("pnpm dependency manifest could not be read: " + name); continue;
301
+ }
302
+ } catch { escaped.add("pnpm dependency link could not be resolved: " + name); continue; }
303
+ }
304
+ if (!matched && existsSync(join(dir, "package.json"))) matched = dir;
305
+ }
306
+ return matched;
307
+ }
308
+
309
+ /** A missing owned entry may still resolve through Node's ancestor lookup. */
310
+ function inspectAncestorDependency(packageDir, name, store, escaped) {
311
+ for (let parent = dirname(packageDir); ; parent = dirname(parent)) {
312
+ const candidate = join(parent, "node_modules", ...name.split("/"));
313
+ for (const path of [candidate, candidate + ".js", candidate + ".json", candidate + ".node"]) {
314
+ try { lstatSync(path); } catch (error) {
315
+ if (error?.code !== "ENOENT" && error?.code !== "ENOTDIR") escaped.add("pnpm dependency fallback could not be inspected: " + name);
316
+ continue;
317
+ }
318
+ try {
319
+ const resolved = realpathSync(path);
320
+ escaped.add(inside(resolved, store) ? "pnpm dependency resolves outside its package group: " + name
321
+ : "pnpm dependency can resolve outside the selected store: " + name);
322
+ } catch { escaped.add("pnpm dependency fallback could not be resolved: " + name); }
323
+ return;
324
+ }
325
+ if (parent === dirname(parent)) return;
326
+ }
327
+ }
328
+
329
+ /**
330
+ * Ancestor node_modules inside the store must keep their links in the store. Above the store the walk
331
+ * stops: a user's ~/node_modules is not part of the package. A declared dependency that is missing in
332
+ * the store and resolves from outside is refused separately (inspectAncestorDependency). With
333
+ * preserved symlinks Node walks the lexical ancestors, so that walk keeps every root.
334
+ */
335
+ function inspectAncestorRoots(packageDir, store, escaped, preserved = false, storeAlias = store, metadataSeen) {
336
+ for (let parent = dirname(packageDir); ; parent = dirname(parent)) {
337
+ if (!preserved && !inside(parent, store)) return;
338
+ if (basename(parent) !== "node_modules") {
339
+ const root = join(parent, "node_modules");
340
+ let exists = true;
341
+ try { lstatSync(root); } catch (error) {
342
+ exists = false;
343
+ if (error?.code !== "ENOENT" && error?.code !== "ENOTDIR") escaped.add("pnpm ancestor dependency root could not be resolved");
344
+ }
345
+ if (exists) {
346
+ try {
347
+ if (!inside(realpathSync(root), store)) escaped.add(preserved
348
+ ? "pnpm preserved-symlink lookup root is outside the selected store" : "pnpm ancestor dependency root is outside the selected store");
349
+ else {
350
+ resolveStoreLinkChain(root, store, storeAlias);
351
+ inspectPnpmMetadata(root, store, escaped, "ancestor dependency lookup", storeAlias, metadataSeen);
352
+ }
353
+ }
354
+ catch { escaped.add("pnpm ancestor dependency root could not be resolved"); }
355
+ }
356
+ }
357
+ if (parent === dirname(parent)) return;
358
+ }
359
+ }
360
+
361
+ /** Resolve existing ancestors too, so a missing entry cannot hide an escaping symlink. */
362
+ function canonicalProspectivePath(path) {
363
+ const missing = [];
364
+ for (let current = path; ; current = dirname(current)) {
365
+ try { return resolve(realpathSync(current), ...missing.reverse()); }
366
+ catch (error) {
367
+ if ((error?.code !== "ENOENT" && error?.code !== "ENOTDIR") || current === dirname(current)) throw error;
368
+ missing.push(basename(current));
369
+ }
370
+ }
371
+ }
372
+
373
+ function inspectPackageEntries(packageDir, manifest, store, escaped, alternateRoot) {
374
+ const values = [manifest.main, manifest.module, manifest.bin, manifest.exports];
375
+ const pending = [...values];
376
+ while (pending.length) {
377
+ const entry = pending.pop();
378
+ if (entry && typeof entry === "object") { pending.push(...Object.values(entry)); continue; }
379
+ if (typeof entry !== "string" || !entry) continue;
380
+ try {
381
+ const target = canonicalProspectivePath(resolve(packageDir, entry));
382
+ if (!inside(target, store) && (!alternateRoot || !inside(target, alternateRoot))) {
383
+ escaped.add("pnpm package entry point is outside the selected store");
384
+ }
385
+ } catch { escaped.add("pnpm package entry point could not be resolved"); }
386
+ }
387
+ }
388
+
389
+ /** pnpm's metadata and executable directories are not packages, but their links still must stay inside the store. */
390
+ function inspectPnpmMetadata(path, store, escaped, kind, storeAlias = store, seen = new Set()) {
391
+ const pending = [path];
392
+ while (pending.length) {
393
+ const current = pending.pop();
394
+ let real;
395
+ try {
396
+ if (inside(current, store) && (current === path || lstatSync(current).isSymbolicLink())) {
397
+ resolveStoreLinkChain(current, store, storeAlias);
398
+ }
399
+ real = realpathSync(current);
400
+ }
401
+ catch (error) {
402
+ escaped.add("pnpm " + kind + (error?.message === "link is outside the selected store"
403
+ ? " link escapes the selected store: " : " link could not be resolved: ") + basename(current));
404
+ continue;
405
+ }
406
+ if (!inside(real, store)) { escaped.add("pnpm " + kind + " link escapes the selected store: " + basename(current)); continue; }
407
+ if (seen.has(real)) continue;
408
+ if (seen.size >= 10000) { escaped.add("pnpm metadata graph exceeds verification limit"); return; }
409
+ seen.add(real);
410
+ try {
411
+ if (statSync(real).isDirectory()) for (const entry of readdirSync(real, { withFileTypes: true })) {
412
+ if (!entry.isFile()) pending.push(join(real, entry.name));
413
+ }
414
+ }
415
+ catch { escaped.add("pnpm " + kind + " link could not be resolved: " + basename(current)); }
416
+ }
417
+ }
418
+
419
+ /**
420
+ * Node's built-in global lookup paths, computed the way Node's module loader builds Module.globalPaths
421
+ * (before NODE_PATH): $HOME/.node_modules and $HOME/.node_libraries (USERPROFILE on Windows), then
422
+ * <prefix>/lib/node, where prefix is the executable's directory on Windows and its parent elsewhere.
423
+ */
424
+ function nodeGlobalLookupPaths() {
425
+ const home = process.platform === "win32" ? process.env.USERPROFILE : process.env.HOME;
426
+ const prefix = process.platform === "win32" ? resolve(process.execPath, "..") : resolve(process.execPath, "..", "..");
427
+ return [...(home ? [resolve(home, ".node_modules"), resolve(home, ".node_libraries")] : []), resolve(prefix, "lib", "node")];
428
+ }
429
+
430
+ /**
431
+ * Node's global search paths (Module.globalPaths, NODE_PATH) that lie inside the store must keep their
432
+ * links there. Paths outside the store are the user's environment, not the package: they are not
433
+ * evidence that the package left its store, and a missing declared dependency they could supply is
434
+ * refused by inspectAncestorDependency's missing-dependency rule.
435
+ */
436
+ function inspectGlobalLookupRoots(store, escaped, storeAlias = store) {
437
+ const lookupRoots = new Set([...nodeGlobalLookupPaths(), ...String(process.env.NODE_PATH ?? "").split(delimiter).filter(Boolean)]);
438
+ for (const raw of lookupRoots) {
439
+ const root = resolve(raw);
440
+ try { lstatSync(root); } catch (error) {
441
+ if (error?.code !== "ENOENT" && error?.code !== "ENOTDIR") escaped.add("pnpm global dependency lookup root could not be resolved");
442
+ continue;
443
+ }
444
+ try {
445
+ let real;
446
+ // A dangling entry supplies nothing, like a missing one.
447
+ try { real = realpathSync(root); } catch (error) { if (error?.code === "ENOENT" || error?.code === "ENOTDIR") continue; throw error; }
448
+ // Only a root whose own spelling lies in the store is part of it; an outside link into the store is
449
+ // the user's environment, like any other outside entry. An in-store spelling must stay in the store.
450
+ if (!(inside(root, store) || (storeAlias && inside(root, resolve(storeAlias))))) continue;
451
+ if (!inside(real, store)) { escaped.add("pnpm global dependency lookup root is outside the selected store"); continue; }
452
+ resolveStoreLinkChain(root, store, storeAlias);
453
+ } catch { escaped.add("pnpm global dependency lookup root could not be resolved"); continue; }
454
+ inspectPnpmMetadata(root, store, escaped, "global dependency lookup", storeAlias);
455
+ }
456
+ }
457
+
458
+ /** Find nested module roots and validate package links without following them outside the store. */
459
+ function nestedPnpmRoots(packageDir, store, escaped, budget, storeAlias = store) {
460
+ const pending = [packageDir], seen = new Set(), roots = [];
461
+ while (pending.length) {
462
+ const current = pending.pop();
463
+ let real;
464
+ try { real = realpathSync(current); } catch { escaped.add("pnpm package path could not be resolved"); continue; }
465
+ if (!inside(real, store)) { escaped.add("pnpm package link escapes the selected store"); continue; }
466
+ const manifestPath = join(current, "package.json");
467
+ try {
468
+ lstatSync(manifestPath);
469
+ try {
470
+ const manifest = JSON.parse(readFileSync(manifestPath, "utf8"));
471
+ inspectPackageEntries(current, manifest, store, escaped);
472
+ if (current !== real) inspectPackageEntries(real, manifest, store, escaped);
473
+ } catch { escaped.add("pnpm nested package manifest could not be read"); }
474
+ } catch (error) {
475
+ if (error?.code !== "ENOENT") escaped.add("pnpm nested package manifest could not be read");
476
+ }
477
+ if (seen.has(real)) continue;
478
+ if (budget.remaining-- <= 0) { escaped.add("pnpm package traversal exceeds verification limit"); return roots; }
479
+ seen.add(real);
480
+ try {
481
+ for (const entry of readdirSync(real, { withFileTypes: true })) {
482
+ const child = join(current, entry.name);
483
+ if (entry.name === "node_modules") {
484
+ try { roots.push(resolveStoreLinkChain(child, store, storeAlias)); }
485
+ catch { escaped.add("pnpm dependency root could not be resolved"); }
486
+ continue;
487
+ }
488
+ // On Windows readdir reports junctions and directory symlinks as directories; lstat decides there.
489
+ let isLink = entry.isSymbolicLink();
490
+ if (!isLink && entry.isDirectory() && process.platform === "win32") {
491
+ try { isLink = lstatSync(join(real, entry.name)).isSymbolicLink(); }
492
+ catch { escaped.add("pnpm package link could not be resolved"); continue; }
493
+ }
494
+ if (!isLink && entry.isDirectory()) pending.push(child);
495
+ else if (isLink) {
496
+ try {
497
+ const target = resolveStoreLinkChain(child, store, storeAlias);
498
+ if (!inside(target, store)) escaped.add("pnpm package link escapes the selected store");
499
+ else if (statSync(target).isDirectory()) pending.push(target);
500
+ } catch (error) { escaped.add(error?.message === "link is outside the selected store"
501
+ ? "pnpm package link escapes the selected store" : "pnpm package link could not be resolved"); }
502
+ }
503
+ }
504
+ } catch { escaped.add("pnpm package directory could not be inspected"); }
505
+ }
506
+ return roots;
507
+ }
508
+
509
+ /** Check reachable global-store package roots and declared dependency links, including cycles. */
510
+ function inspectGlobalPnpmGraph(packageDir, store, escaped, storeAlias = store) {
511
+ const pending = [packageDir], seen = new Set(), enumeratedRoots = new Set();
512
+ const ancestorMetadataSeen = new Set(), metadataSeen = new Map(), budget = { remaining: 100000 };
513
+ inspectGlobalLookupRoots(store, escaped, storeAlias);
514
+ while (pending.length) {
515
+ const spelling = pending.pop();
516
+ let path;
517
+ try { path = realpathSync(spelling); } catch { escaped.add("pnpm dependency package could not be resolved"); continue; }
518
+ let manifest;
519
+ try { manifest = JSON.parse(readFileSync(join(spelling, "package.json"), "utf8")); }
520
+ catch { escaped.add("pnpm dependency manifest could not be read"); continue; }
521
+ inspectPackageEntries(spelling, manifest, store, escaped);
522
+ if (path !== spelling) inspectPackageEntries(path, manifest, store, escaped);
523
+ if (seen.has(path)) continue;
524
+ if (seen.size >= 10000) { escaped.add("pnpm dependency graph exceeds verification limit"); return; }
525
+ seen.add(path);
526
+ inspectAncestorRoots(path, store, escaped, false, storeAlias, ancestorMetadataSeen);
527
+ const names = new Set();
528
+ const nestedRoots = nestedPnpmRoots(spelling, store, escaped, budget, storeAlias);
529
+ const ownRoot = join(path, "node_modules"), groupRoot = enclosingNodeModules(path);
530
+ const enqueueRootEntry = (root, name) => {
531
+ const dependency = pnpmOwnedDependencyDir(path, name, store, true, escaped, [root], storeAlias);
532
+ if (dependency) pending.push(dependency);
533
+ };
534
+ for (const root of [...new Set([ownRoot, groupRoot, ...nestedRoots])]) {
535
+ if (!root) continue;
536
+ try { lstatSync(root); } catch (error) {
537
+ if (error?.code !== "ENOENT" && error?.code !== "ENOTDIR") escaped.add("pnpm dependency root could not be resolved");
538
+ continue;
539
+ }
540
+ try {
541
+ const realRoot = realpathSync(root);
542
+ if (!inside(realRoot, store)) { escaped.add("pnpm dependency root is outside the selected store"); continue; }
543
+ if (inside(root, store) || (storeAlias && inside(root, storeAlias))) resolveStoreLinkChain(root, store, storeAlias);
544
+ // Link hops for each spelling were checked above; expand the physical group once.
545
+ if (enumeratedRoots.has(realRoot)) continue;
546
+ enumeratedRoots.add(realRoot);
547
+ for (const name of readdirSync(root)) {
548
+ if ([".bin", ".pnpm", ".modules.yaml"].includes(name)) {
549
+ const kind = name === ".bin" ? "binary" : "metadata";
550
+ if (!metadataSeen.has(kind)) metadataSeen.set(kind, new Set());
551
+ inspectPnpmMetadata(join(root, name), store, escaped, kind, storeAlias, metadataSeen.get(kind));
552
+ continue;
553
+ }
554
+ if (!name.startsWith("@")) { enqueueRootEntry(root, name); continue; }
555
+ const scope = join(root, name);
556
+ try {
557
+ if (!inside(realpathSync(scope), store)) { escaped.add("pnpm dependency scope is outside the selected store: " + name); continue; }
558
+ if (statSync(scope).isDirectory()) for (const child of readdirSync(scope)) enqueueRootEntry(root, name + "/" + child);
559
+ } catch { escaped.add("pnpm dependency scope could not be resolved: " + name); }
560
+ }
561
+ } catch { escaped.add("pnpm dependency root could not be resolved"); }
562
+ }
563
+ for (const name of [...Object.keys(manifest.dependencies ?? {}), ...Object.keys(manifest.optionalDependencies ?? {}), ...Object.keys(manifest.peerDependencies ?? {})]) names.add(name);
564
+ for (const name of names) {
565
+ const dependency = pnpmOwnedDependencyDir(path, name, store, true, escaped, undefined, storeAlias);
566
+ if (dependency) pending.push(dependency);
567
+ for (const root of nestedRoots) {
568
+ if (root === ownRoot || root === groupRoot) continue;
569
+ const nested = pnpmOwnedDependencyDir(path, name, store, true, escaped, [root], storeAlias);
570
+ if (nested) pending.push(nested);
571
+ }
572
+ if (!dependency) {
573
+ // pnpm can leave even non-optional peers absent when peer auto-install and strict checking are disabled.
574
+ const required = Object.hasOwn(manifest.dependencies ?? {}, name) && !Object.hasOwn(manifest.optionalDependencies ?? {}, name);
575
+ if (required) {
576
+ escaped.add("pnpm required dependency is missing from the selected store: " + name);
577
+ }
578
+ if (Object.hasOwn(manifest.dependencies ?? {}, name) || Object.hasOwn(manifest.optionalDependencies ?? {}, name)
579
+ || Object.hasOwn(manifest.peerDependencies ?? {}, name)) inspectAncestorDependency(path, name, store, escaped);
580
+ }
581
+ }
103
582
  }
104
- return undefined;
105
583
  }
106
584
 
107
585
  /** Verification manifest for a staged (or live) package tree. */
108
- function verifyTreeWithDependencyLookup(packageDir, expectedVersion, dependencyDir) {
586
+ function verifyTreeWithDependencyLookup(packageDir, expectedVersion, dependencyDir, inspectAllLinks = false) {
109
587
  const failures = [];
110
588
  let pkg;
111
589
  try {
@@ -136,6 +614,7 @@ function verifyTreeWithDependencyLookup(packageDir, expectedVersion, dependencyD
136
614
  // Sentinel direct deps: each must have an intact package.json. The bundled Bun dep is
137
615
  // the load-bearing one — without it the launcher cannot start the proxy at all.
138
616
  const deps = Object.keys(pkg.dependencies ?? {});
617
+ if (inspectAllLinks) for (const name of new Set([...deps, ...Object.keys(pkg.optionalDependencies ?? {})])) dependencyDir(packageDir, name);
139
618
  const sentinels = deps.filter(name => name === "bun" || name === "zod").length > 0
140
619
  ? deps.filter(name => name === "bun" || name === "zod")
141
620
  : deps.slice(0, 2);
@@ -159,8 +638,62 @@ export function verifyInstallTree(packageDir, expectedVersion) {
159
638
  * hoisted linker, so the dependency may sit outside the package directory — but it must
160
639
  * still be reachable through a root this package instance owns.
161
640
  */
162
- export function verifyPnpmInstallTree(packageDir, expectedVersion) {
163
- return verifyTreeWithDependencyLookup(packageDir, expectedVersion, pnpmOwnedDependencyDir);
641
+ export function verifyPnpmInstallTree(packageDir, expectedVersion, store, globalRoot, lexicalStore = store) {
642
+ let real, canonicalGlobalRoot;
643
+ try { real = realpathSync(packageDir); } catch { return { ok: false, failures: ["pnpm package path could not be resolved"] }; }
644
+ try { if (store) store = realpathSync(store); } catch { return { ok: false, failures: ["pnpm configured store could not be resolved"] }; }
645
+ if (globalRoot && (!store || !inside(real, store))) {
646
+ try {
647
+ canonicalGlobalRoot = realpathSync(globalRoot);
648
+ if (!inside(real, canonicalGlobalRoot)) return { ok: false, failures: ["pnpm package is outside the selected store and global group"] };
649
+ } catch { return { ok: false, failures: ["pnpm global group could not be resolved"] }; }
650
+ }
651
+ let globalLinks;
652
+ try {
653
+ globalLinks = packagePathUsesGlobalLinks(packageDir, store, lexicalStore) || (store && inside(real, store));
654
+ } catch (error) { return { ok: false, failures: [error?.message === "link is outside the selected store"
655
+ ? "pnpm global links are outside the selected store" : "pnpm package symlink chain could not be resolved"] }; }
656
+ if (globalLinks && (!store || !inside(real, store))) {
657
+ return { ok: false, failures: ["pnpm global links are outside the selected store"] };
658
+ }
659
+ if (globalLinks) {
660
+ // The reported package spelling is walked as written below; resolve() would delete "." and ".."
661
+ // segments without visiting the links they cross, so such a spelling is refused first.
662
+ if (String(packageDir).split(/[\\/]+/).some(part => part === "." || part === "..")) {
663
+ return { ok: false, failures: ["pnpm package path is not canonical"] };
664
+ }
665
+ // Hop roots are only as narrow as their spelling: a link component in the lexical store or global
666
+ // group would make its target, and any relay below it, count as inside.
667
+ for (const root of [lexicalStore, globalRoot]) {
668
+ // A missing group authorizes nothing (see below), so only an existing spelling is inspected.
669
+ if (!root || !existsSync(root)) continue;
670
+ try { if (spellingHasLinkComponent(root)) return { ok: false, failures: ["pnpm store or global group path is not canonical"] }; }
671
+ catch { return { ok: false, failures: ["pnpm store or global group path could not be resolved"] }; }
672
+ }
673
+ // Every hop from the reported spelling to the package must stay inside the selected global group
674
+ // or the selected store; a relay elsewhere cannot vouch for a link that later returns to the store.
675
+ // A group that cannot be resolved authorizes nothing: the path must then start inside the store.
676
+ let canonicalGroup;
677
+ try { if (globalRoot) canonicalGroup = realpathSync(globalRoot); } catch { canonicalGroup = undefined; }
678
+ try {
679
+ const end = canonicalGroup
680
+ ? resolveStoreLinkChain(resolve(packageDir), store, lexicalStore, canonicalGroup, resolve(globalRoot))
681
+ : resolveStoreLinkChain(resolve(packageDir), store, lexicalStore);
682
+ if (!inside(end, store)) throw new Error("link is outside the selected store");
683
+ } catch (error) {
684
+ return { ok: false, failures: [error?.message === "link is outside the selected store"
685
+ ? "pnpm global links are outside the selected store" : "pnpm package symlink chain could not be resolved"] };
686
+ }
687
+ }
688
+ const escaped = new Set();
689
+ if (globalLinks && /(?:^|[\s"'])--preserve-symlinks(?:-main)?(?=$|[\s"'])/.test([...process.execArgv, process.env.NODE_OPTIONS ?? ""].join(" "))) {
690
+ inspectAncestorRoots(resolve(packageDir), store, escaped, true, lexicalStore);
691
+ }
692
+ const result = verifyTreeWithDependencyLookup(packageDir, expectedVersion,
693
+ (path, name) => pnpmOwnedDependencyDir(path, name, store, globalLinks, escaped, undefined, lexicalStore), globalLinks);
694
+ if (globalLinks) inspectGlobalPnpmGraph(real, store, escaped, lexicalStore);
695
+ if (escaped.size) return { ok: false, failures: [...escaped].concat(result.failures) };
696
+ return result;
164
697
  }
165
698
 
166
699
  function stampedName(prefix) {
@@ -0,0 +1 @@
1
+ export declare function publishWindowsInstallerPid(markerPath: string, pid: number, options?: { gone?: (pid: number) => boolean }): void;
@@ -0,0 +1,44 @@
1
+ import { randomUUID } from "node:crypto";
2
+ import { readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
3
+ import { dirname } from "node:path";
4
+ import { probeProcessAlive } from "./mutation-guard.mjs";
5
+ import { assertNotRealHomeUnderTest } from "./test-home-guard.mjs";
6
+
7
+ // The Windows installer runs inside a private kill-on-close Job Object whose only handle lives in
8
+ // its PowerShell supervisor (npm-install-job.ps1). Once that supervisor process is gone, the job is
9
+ // closed and its tree terminated, so the supervisor pid is the Windows witness for an installer the
10
+ // launcher could not confirm, the counterpart of the POSIX process group (#8524).
11
+
12
+ function supervisorGone(pid) {
13
+ try { probeProcessAlive(pid); return false; }
14
+ catch (error) { return error?.code === "ESRCH"; }
15
+ }
16
+
17
+ /**
18
+ * Record `pid` as the installer supervisor in the update marker before the supervisor receives its
19
+ * request. The marker must be exactly in the state noteUntrackedInstaller writes: mutating,
20
+ * termination unconfirmed, no POSIX group. An earlier supervisor pid may be replaced only once that
21
+ * process is gone; a live or unprobeable one is kept and the publish refuses with EINSTALLWITNESS.
22
+ */
23
+ export function publishWindowsInstallerPid(markerPath, pid, { gone = supervisorGone } = {}) {
24
+ assertNotRealHomeUnderTest(dirname(markerPath));
25
+ if (!Number.isSafeInteger(pid) || pid <= 0) throw Error("invalid installer supervisor pid");
26
+ const marker = JSON.parse(readFileSync(markerPath, "utf8"));
27
+ if (!marker || typeof marker !== "object" || marker.phase !== "mutating" || marker.terminationUnconfirmed !== true
28
+ || !Number.isSafeInteger(marker.pid) || !Number.isSafeInteger(marker.startedAt) || marker.installerPgid !== undefined) {
29
+ throw Error("update marker is not awaiting an installer");
30
+ }
31
+ if (marker.installerPid !== undefined && !(Number.isSafeInteger(marker.installerPid) && gone(marker.installerPid))) {
32
+ throw Object.assign(Error("an earlier installer supervisor is still running"), { code: "EINSTALLWITNESS" });
33
+ }
34
+ const temp = `${markerPath}.${randomUUID()}.tmp`;
35
+ let created = false;
36
+ try {
37
+ writeFileSync(temp, JSON.stringify({ ...marker, installerPid: pid }), { flag: "wx", mode: 0o600 });
38
+ created = true;
39
+ renameSync(temp, markerPath);
40
+ created = false;
41
+ } finally {
42
+ if (created) try { unlinkSync(temp); } catch (error) { if (error.code !== "ENOENT") throw error; }
43
+ }
44
+ }