@bitkyc08/opencodex 2.100.1 → 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.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -13
- package/src/cli/sync-fanout.ts +81 -99
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-readiness.ts +16 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel-status.ts +76 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence-types.ts +2 -0
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +134 -7
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +174 -0
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/paths.ts +5 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +285 -43
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/hosted-tool-policy.ts +56 -12
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +4 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +115 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +7 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +218 -0
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +69 -17
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import { clearPendingTeardown } from "../config/pending-teardown";
|
|
2
|
+
import { assertNoClientDisconnectPending, pendingClientConnectMayOwnToken, readClientConnectionState } from "../client/state";
|
|
3
|
+
import { readRuntimePort, verifyPidIdentity } from "../config/process-state";
|
|
4
|
+
import { isProcessAlive } from "../lib/process-control";
|
|
5
|
+
import { findLiveProxy, SERVICE_STOP_LIVENESS } from "../server/proxy-liveness";
|
|
6
|
+
|
|
7
|
+
export interface DisconnectedClientRestartDeps {
|
|
8
|
+
disconnected?: () => boolean;
|
|
9
|
+
findLive?: () => Promise<{ pid?: number; role?: string } | null>;
|
|
10
|
+
stopManager: () => void | Promise<void>;
|
|
11
|
+
beforeStop?: () => void;
|
|
12
|
+
alive?: (pid: number) => boolean;
|
|
13
|
+
verify?: (pid: number) => number | null;
|
|
14
|
+
stop?: (pid: number) => Promise<unknown>;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
/** A service stop can leave a detached Child alive (notably Task Scheduler /end).
|
|
18
|
+
* Settle that exact, home-verified process before the manager starts standalone.
|
|
19
|
+
* Connected Children, foreign/unproven processes and an interrupted disconnect never enter this
|
|
20
|
+
* cleanup path: the restart then proceeds exactly as it did before this cleanup existed, and an
|
|
21
|
+
* interrupted disconnect is finished by running `ocx disconnect` again.
|
|
22
|
+
*/
|
|
23
|
+
export async function prepareDisconnectedClientServiceRestart(deps: DisconnectedClientRestartDeps): Promise<void> {
|
|
24
|
+
const disconnected = deps.disconnected ?? (() => {
|
|
25
|
+
assertNoClientDisconnectPending();
|
|
26
|
+
return readClientConnectionState().kind === "disconnected" && !pendingClientConnectMayOwnToken();
|
|
27
|
+
});
|
|
28
|
+
try { if (!disconnected()) return; }
|
|
29
|
+
catch { return; }
|
|
30
|
+
const live = await (deps.findLive ?? (() => findLiveProxy({ ...SERVICE_STOP_LIVENESS, acceptPackageTreeFenced: true })))();
|
|
31
|
+
if (live?.role !== "client") return;
|
|
32
|
+
const pid = live.pid;
|
|
33
|
+
if (!pid || !Number.isSafeInteger(pid) || pid <= 0) throw new Error("Disconnected client PID is unverified; rerun 'ocx service restart'.");
|
|
34
|
+
const alive = deps.alive ?? isProcessAlive;
|
|
35
|
+
let homeVerified = false;
|
|
36
|
+
const verify = deps.verify ?? (candidate => {
|
|
37
|
+
const runtime = readRuntimePort();
|
|
38
|
+
if (runtime && runtime.pid !== candidate) return null;
|
|
39
|
+
if (runtime?.pid === candidate) homeVerified = true;
|
|
40
|
+
// Shutdown removes its record before it necessarily exits. The pre-stop
|
|
41
|
+
// home binding still applies, but process identity must be proved again.
|
|
42
|
+
return homeVerified ? verifyPidIdentity(candidate) : null;
|
|
43
|
+
});
|
|
44
|
+
// A client proxy this home cannot prove is its own is not ours to stop.
|
|
45
|
+
if (verify(pid) !== pid) return;
|
|
46
|
+
if (!disconnected()) throw new Error("Disconnected client ownership changed; rerun 'ocx disconnect', then 'ocx service restart'.");
|
|
47
|
+
deps.beforeStop?.();
|
|
48
|
+
await deps.stopManager();
|
|
49
|
+
deps.beforeStop?.();
|
|
50
|
+
if (!disconnected()) throw new Error("Client connection changed during service restart; no replacement was started.");
|
|
51
|
+
if (alive(pid)) {
|
|
52
|
+
if (verify(pid) !== pid) throw new Error("Surviving client PID ownership is unverified; service restart stopped without killing it.");
|
|
53
|
+
// Receipt-backed: a Task Scheduler restart keeps the task registered, so a bare stop is refused.
|
|
54
|
+
// The scheduler restart passes a stop that holds the receipt until its replacement serves; a
|
|
55
|
+
// manager that already ended the process never reaches here, so the default releases at once.
|
|
56
|
+
await (deps.stop ?? (async (target: number) => (await import("./restart-proxy-stop")).stopProxyForServiceRestart(target,
|
|
57
|
+
receipt => { clearPendingTeardown(receipt.nonce); })))(pid);
|
|
58
|
+
}
|
|
59
|
+
if (alive(pid)) throw new Error("Disconnected client did not exit; rerun 'ocx service restart'.");
|
|
60
|
+
}
|
|
@@ -30,7 +30,24 @@ export type GuardedManagerTarget =
|
|
|
30
30
|
*/
|
|
31
31
|
childNeedsSeparateStop: boolean;
|
|
32
32
|
}
|
|
33
|
-
| {
|
|
33
|
+
| {
|
|
34
|
+
/**
|
|
35
|
+
* Windows only (#7771): the registered OpenCodex task is not running, but wrappers
|
|
36
|
+
* that the checked stop's binding rule ties to the approved PID survive. Provable,
|
|
37
|
+
* so it reaches Part A; revalidation compares the bound wrapper set.
|
|
38
|
+
*/
|
|
39
|
+
kind: "bound-stray";
|
|
40
|
+
pid: number;
|
|
41
|
+
backend: "scheduler";
|
|
42
|
+
wrappers: { pid: number; startTime: number }[];
|
|
43
|
+
childNeedsSeparateStop: true;
|
|
44
|
+
}
|
|
45
|
+
| {
|
|
46
|
+
kind: "unknown";
|
|
47
|
+
reason: string;
|
|
48
|
+
/** The additive ocx-stop/1 serviceStopReason when the binding rule names one. */
|
|
49
|
+
stopReason?: "unbound-wrapper" | "evidence-unreadable";
|
|
50
|
+
};
|
|
34
51
|
|
|
35
52
|
export type GuardedManagerStopped = "inactive" | "active" | "unknown";
|
|
36
53
|
|
package/src/service/health.ts
CHANGED
|
@@ -41,6 +41,38 @@ export function serviceInstallHealthMs(
|
|
|
41
41
|
return platform === "win32" ? SERVICE_INSTALL_HEALTH_WINDOWS_MS : SERVICE_INSTALL_HEALTH_MS;
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
+
/** One identity read of a proxy: the pid its healthz reports, or null when it reports none. */
|
|
45
|
+
export type ServingIdentity = (port: number, hostname: string) => Promise<{ pid: number | null } | null>;
|
|
46
|
+
|
|
47
|
+
const defaultIdentify: ServingIdentity = async (port, hostname) => {
|
|
48
|
+
const identity = await proxyIdentityAt(port, { hostname });
|
|
49
|
+
return identity ? { pid: identity.pid } : null;
|
|
50
|
+
};
|
|
51
|
+
|
|
52
|
+
/** The pid a restart must replace, or null when there is nothing valid to compare against. */
|
|
53
|
+
function replacedPid(value: number | null | undefined): number | null {
|
|
54
|
+
return typeof value === "number" && Number.isSafeInteger(value) && value > 0 ? value : null;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/**
|
|
58
|
+
* The pid of the proxy answering on the installed service port right now, or null when nothing
|
|
59
|
+
* answers or the answer names no pid. `ocx service restart` reads it before restarting so the
|
|
60
|
+
* serving check can tell the replacement from the runtime it was meant to replace (#7771).
|
|
61
|
+
* Never throws: a failed read only means there is nothing to compare against.
|
|
62
|
+
*/
|
|
63
|
+
export async function servingRuntimePid(
|
|
64
|
+
deps: { port?: number; hostname?: string; identify?: ServingIdentity } = {},
|
|
65
|
+
): Promise<number | null> {
|
|
66
|
+
try {
|
|
67
|
+
const port = deps.port ?? installedServiceListenPort();
|
|
68
|
+
const hostname = deps.hostname ?? loadConfig().hostname ?? "127.0.0.1";
|
|
69
|
+
const pid = (await (deps.identify ?? defaultIdentify)(port, hostname))?.pid;
|
|
70
|
+
return typeof pid === "number" && Number.isSafeInteger(pid) && pid > 0 ? pid : null;
|
|
71
|
+
} catch {
|
|
72
|
+
return null;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
|
|
44
76
|
/**
|
|
45
77
|
* Whether a proxy actually answers on the port this install/start just produced.
|
|
46
78
|
*
|
|
@@ -55,26 +87,53 @@ export function serviceInstallHealthMs(
|
|
|
55
87
|
*
|
|
56
88
|
* Soft: returns the outcome, never throws; the caller chooses between a checkmark and
|
|
57
89
|
* an actionable warning.
|
|
90
|
+
*
|
|
91
|
+
* `replacing` is the pid that answered before a restart. While it is set, only a proxy that
|
|
92
|
+
* reports a different pid counts as serving: a surviving old runtime answers healthz just as
|
|
93
|
+
* well, and counting it reported a restart that never happened (#7771). An answer without a
|
|
94
|
+
* pid cannot be shown to be the old runtime and counts. If the last answer still came from the
|
|
95
|
+
* replaced pid, the result carries it as `staleRuntimePid`.
|
|
58
96
|
*/
|
|
59
97
|
export async function confirmServiceServing(
|
|
60
98
|
deps: {
|
|
61
99
|
port?: number;
|
|
62
100
|
hostname?: string;
|
|
63
101
|
probe?: (port: number, hostname: string) => Promise<boolean>;
|
|
102
|
+
replacing?: number | null;
|
|
103
|
+
/**
|
|
104
|
+
* Stop at the first answer from the replaced pid instead of waiting for a replacement. A
|
|
105
|
+
* restart that already threw usually refused before touching anything, so the old runtime
|
|
106
|
+
* answering is the final answer and polling the whole budget only delays the error.
|
|
107
|
+
*/
|
|
108
|
+
settleOnReplaced?: boolean;
|
|
109
|
+
identify?: ServingIdentity;
|
|
64
110
|
sleep?: (ms: number) => Promise<void>;
|
|
65
111
|
now?: () => number;
|
|
66
112
|
timeoutMs?: number;
|
|
67
113
|
} = {},
|
|
68
|
-
): Promise<{ ok: true; port: number } | { ok: false; port: number }> {
|
|
114
|
+
): Promise<{ ok: true; port: number; runtimePid?: number } | { ok: false; port: number; staleRuntimePid?: number }> {
|
|
69
115
|
const port = deps.port ?? installedServiceListenPort();
|
|
70
116
|
const hostname = deps.hostname ?? loadConfig().hostname ?? "127.0.0.1";
|
|
71
117
|
const now = deps.now ?? Date.now;
|
|
72
118
|
const sleep = deps.sleep ?? ((ms: number) => new Promise<void>(r => setTimeout(r, ms)));
|
|
73
|
-
const
|
|
119
|
+
const replacing = replacedPid(deps.replacing);
|
|
120
|
+
let staleRuntimePid: number | undefined;
|
|
121
|
+
let runtimePid: number | undefined;
|
|
122
|
+
const identify = deps.identify ?? defaultIdentify;
|
|
123
|
+
const probe = replacing !== null
|
|
124
|
+
? async (p: number, h: string) => {
|
|
125
|
+
const identity = await identify(p, h);
|
|
126
|
+
staleRuntimePid = identity?.pid === replacing ? replacing : undefined;
|
|
127
|
+
runtimePid = typeof identity?.pid === "number" && identity.pid !== replacing ? identity.pid : undefined;
|
|
128
|
+
return identity !== null && staleRuntimePid === undefined;
|
|
129
|
+
}
|
|
130
|
+
: deps.probe ?? (async (p: number, h: string) => !!(await proxyIdentityAt(p, { hostname: h })));
|
|
131
|
+
const serving = () => (runtimePid === undefined ? { ok: true as const, port } : { ok: true as const, port, runtimePid });
|
|
74
132
|
const deadline = now() + (deps.timeoutMs ?? serviceInstallHealthMs());
|
|
75
133
|
let waited = false;
|
|
76
134
|
for (;;) {
|
|
77
|
-
if (await probe(port, hostname)) return
|
|
135
|
+
if (await probe(port, hostname)) return serving();
|
|
136
|
+
if (deps.settleOnReplaced && staleRuntimePid !== undefined) return { ok: false, port, staleRuntimePid };
|
|
78
137
|
if (now() >= deadline) break;
|
|
79
138
|
await sleep(500);
|
|
80
139
|
waited = true;
|
|
@@ -85,9 +144,9 @@ export async function confirmServiceServing(
|
|
|
85
144
|
// wait, so it gets exactly the single probe it asked for and nothing more.
|
|
86
145
|
if (waited) {
|
|
87
146
|
await sleep(500);
|
|
88
|
-
if (await probe(port, hostname)) return
|
|
147
|
+
if (await probe(port, hostname)) return serving();
|
|
89
148
|
}
|
|
90
|
-
return { ok: false, port };
|
|
149
|
+
return staleRuntimePid === undefined ? { ok: false, port } : { ok: false, port, staleRuntimePid };
|
|
91
150
|
}
|
|
92
151
|
|
|
93
152
|
/**
|
|
@@ -132,16 +191,41 @@ export async function reportServiceServing(
|
|
|
132
191
|
// judgement about elapsed time (#3009).
|
|
133
192
|
const now = deps.now ?? Date.now;
|
|
134
193
|
const startedAt = now();
|
|
135
|
-
const serving = await confirmServiceServing({
|
|
194
|
+
const serving = await confirmServiceServing({
|
|
195
|
+
...deps, timeoutMs: healthBudgetMs, settleOnReplaced: precedingFailure !== undefined,
|
|
196
|
+
});
|
|
136
197
|
const waitedMs = Math.max(0, now() - startedAt);
|
|
137
198
|
const failureDetail = precedingFailure === undefined
|
|
138
199
|
? null
|
|
139
200
|
: precedingFailure instanceof Error ? precedingFailure.message : String(precedingFailure);
|
|
140
201
|
const operation = SERVICE_OPERATION_NOUN[verb];
|
|
202
|
+
const replacing = replacedPid(deps.replacing);
|
|
203
|
+
const staleRuntimePid = serving.ok ? undefined : serving.staleRuntimePid;
|
|
141
204
|
if (failureDetail !== null) {
|
|
142
205
|
// Serving or not, the operation did not complete, so neither branch may print a
|
|
143
206
|
// checkmark. What differs is whether anything is answering, which is the fact the
|
|
144
207
|
// operator acts on next.
|
|
208
|
+
if (staleRuntimePid !== undefined) {
|
|
209
|
+
console.error(
|
|
210
|
+
`⚠️ Service ${operation} did not complete: ${failureDetail}\n`
|
|
211
|
+
+ ` The previous runtime (PID ${staleRuntimePid}) is still answering on port ${serving.port}; it was kept, not replaced.\n`
|
|
212
|
+
+ ` Log: ${serviceLogPath()}`,
|
|
213
|
+
);
|
|
214
|
+
process.exitCode = 1;
|
|
215
|
+
return;
|
|
216
|
+
}
|
|
217
|
+
if (serving.ok && replacing !== null) {
|
|
218
|
+
console.error(
|
|
219
|
+
`⚠️ Service ${operation} reported a failure: ${failureDetail}\n`
|
|
220
|
+
+ (serving.runtimePid !== undefined
|
|
221
|
+
? ` A new runtime (PID ${serving.runtimePid}) is answering on port ${serving.port}.\n`
|
|
222
|
+
: ` A runtime that reports no pid is answering on port ${serving.port}; it could not be compared with the previous one.\n`)
|
|
223
|
+
+ ` Check the log before relying on it.\n`
|
|
224
|
+
+ ` Log: ${serviceLogPath()}`,
|
|
225
|
+
);
|
|
226
|
+
process.exitCode = 1;
|
|
227
|
+
return;
|
|
228
|
+
}
|
|
145
229
|
console.error(
|
|
146
230
|
serving.ok
|
|
147
231
|
? `⚠️ Service ${operation} did not complete: ${failureDetail}\n`
|
|
@@ -160,6 +244,15 @@ export async function reportServiceServing(
|
|
|
160
244
|
console.log(`✅ opencodex service ${verb} and serving on port ${serving.port}.`);
|
|
161
245
|
return;
|
|
162
246
|
}
|
|
247
|
+
if (staleRuntimePid !== undefined) {
|
|
248
|
+
console.error(
|
|
249
|
+
`⚠️ Service ${operation} requested, but the previous runtime (PID ${staleRuntimePid}) is still serving on port ${serving.port}; `
|
|
250
|
+
+ `the requested replacement was not confirmed after ${Math.round(waitedMs / 1000)}s.\n`
|
|
251
|
+
+ ` Log: ${serviceLogPath()}`,
|
|
252
|
+
);
|
|
253
|
+
process.exitCode = 1;
|
|
254
|
+
return;
|
|
255
|
+
}
|
|
163
256
|
console.error(
|
|
164
257
|
`⚠️ Service ${verb}, but no proxy answered on port ${serving.port} after `
|
|
165
258
|
+ `${Math.round(waitedMs / 1000)}s.\n`
|
package/src/service/launchd.ts
CHANGED
|
@@ -20,6 +20,13 @@ import { encodePlistString, plistKeyedString } from "./plist-xml";
|
|
|
20
20
|
/** Encode a plist value; `field` names it if it holds a character XML cannot carry. */
|
|
21
21
|
const plistString = encodePlistString;
|
|
22
22
|
|
|
23
|
+
/** A concurrent cleanup may already have removed this install-owned file. */
|
|
24
|
+
function unlinkLaunchdOwnedFile(path: string): void {
|
|
25
|
+
try { unlinkSync(path); } catch (error) {
|
|
26
|
+
if ((error as { code?: string }).code !== "ENOENT") throw error;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
|
|
23
30
|
/**
|
|
24
31
|
* Render the launchd plist from the package-local Bun + CLI pair. Unlike systemd, launchd
|
|
25
32
|
* must not hand the service token and proxy environment to a PATH-discovered launcher: a
|
|
@@ -55,6 +62,8 @@ export function buildPlist(
|
|
|
55
62
|
` <key>${name}</key><string>${plistString(value, name)}</string>`),
|
|
56
63
|
].filter((line): line is string => Boolean(line)).join("\n");
|
|
57
64
|
const command = launchdServiceCommand(runtime, resolveServiceListenPort(), homes);
|
|
65
|
+
// This agent serves interactive Codex/GUI requests. launchd's default class
|
|
66
|
+
// throttles CPU and I/O under load; Adaptive requires XPC transactions we do not use.
|
|
58
67
|
return `<?xml version="1.0" encoding="UTF-8"?>
|
|
59
68
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
60
69
|
<plist version="1.0">
|
|
@@ -67,6 +76,7 @@ export function buildPlist(
|
|
|
67
76
|
<string>${plistString(command, "the service command")}</string>
|
|
68
77
|
</array>
|
|
69
78
|
<key>RunAtLoad</key><true/>
|
|
79
|
+
<key>ProcessType</key><string>Interactive</string>
|
|
70
80
|
<key>KeepAlive</key><dict><key>SuccessfulExit</key><false/></dict>
|
|
71
81
|
<key>EnvironmentVariables</key>
|
|
72
82
|
<dict>
|
|
@@ -84,6 +94,7 @@ ${envLines}
|
|
|
84
94
|
* process happens to be repairing.
|
|
85
95
|
*/
|
|
86
96
|
const PLIST_PATH_ENTRY = /^(\s*<key>PATH<\/key><string>)([^\n]*)(<\/string>)$/m;
|
|
97
|
+
const PLIST_INTERACTIVE_POLICY = /^[ \t]*<key>ProcessType<\/key><string>Interactive<\/string>\r?\n/m;
|
|
87
98
|
|
|
88
99
|
function filterPlistPathVariable(plist: string): string {
|
|
89
100
|
return plist.replace(PLIST_PATH_ENTRY, (_match, open: string, value: string, close: string) =>
|
|
@@ -92,7 +103,7 @@ function filterPlistPathVariable(plist: string): string {
|
|
|
92
103
|
|
|
93
104
|
/**
|
|
94
105
|
* The rendered plist with the PREVIOUS definition's `PATH` put back — or null when `PATH`
|
|
95
|
-
*
|
|
106
|
+
* and the addition of the Interactive policy are not the only differences.
|
|
96
107
|
*
|
|
97
108
|
* `buildPlist` bakes `process.env.PATH`, and `ocx service repair` is run by whatever has a
|
|
98
109
|
* shell: a tray helper, `ocx update`'s child, an ssh session, a cron job. Each of those
|
|
@@ -108,10 +119,11 @@ function filterPlistPathVariable(plist: string): string {
|
|
|
108
119
|
* service already runs with is the one that survives.
|
|
109
120
|
*
|
|
110
121
|
* The caller applies this only when the live job is loaded from exactly the exec line this
|
|
111
|
-
* install baked
|
|
112
|
-
*
|
|
122
|
+
* install baked. This preserves the operator's installed PATH, not evidence that a pending
|
|
123
|
+
* definition was loaded; the caller still requires verified bootstrap. Whenever anything ELSE about
|
|
113
124
|
* the definition changed the plist is rewritten in full, PATH included, so a real
|
|
114
|
-
* re-install still updates it.
|
|
125
|
+
* re-install still updates it. Adding the Interactive policy also retains the previous
|
|
126
|
+
* normalized PATH, but keeps the policy line so the caller still reloads the definition.
|
|
115
127
|
*/
|
|
116
128
|
export function reusePreviousPlistPathVariable(previous: string, rendered: string): string | null {
|
|
117
129
|
if (previous === rendered) return null;
|
|
@@ -124,7 +136,8 @@ export function reusePreviousPlistPathVariable(previous: string, rendered: strin
|
|
|
124
136
|
// otherwise be re-expanded into the file.
|
|
125
137
|
const adopted = rendered.replace(PLIST_PATH_ENTRY, (_match, open: string, _value: string, close: string) =>
|
|
126
138
|
`${open}${previousPath}${close}`);
|
|
127
|
-
return adopted === normalizedPrevious
|
|
139
|
+
return adopted.replace(PLIST_INTERACTIVE_POLICY, "") === normalizedPrevious.replace(PLIST_INTERACTIVE_POLICY, "")
|
|
140
|
+
? adopted : null;
|
|
128
141
|
}
|
|
129
142
|
|
|
130
143
|
/** The homes a launchd plist pins, resolved once per definition. */
|
|
@@ -580,9 +593,12 @@ export interface LaunchdInstallOutcome {
|
|
|
580
593
|
* that PAIRS with the bootout target. Legacy `load -w` is domain-implicit: it acts on
|
|
581
594
|
* the caller's own bootstrap domain, so from ssh/cron it deleted the gui-domain job and
|
|
582
595
|
* registered nothing (defect 1a).
|
|
583
|
-
* 4.
|
|
596
|
+
* 4. Verified success needs `launchctl print` agreeing and an accepted bootstrap for changed bytes:
|
|
597
|
+
* a command match alone cannot attest a new policy. Measured on macOS 27.0,
|
|
584
598
|
* `load -w` over a bootstrapped job exits 0 with "Load failed: 5" and does nothing,
|
|
585
599
|
* and `bootstrap` exits 5 with "Bootstrap failed: 5" for the same condition.
|
|
600
|
+
* An unreadable post-bootstrap probe never triggers another eviction or rollback;
|
|
601
|
+
* an accepted bootstrap warns, while a refused bootstrap throws with the new plist retained.
|
|
586
602
|
* 5. On terminal failure restore the previous plist, try to bootstrap it back, and throw
|
|
587
603
|
* an error that says what the probe actually found — down, or up on a different
|
|
588
604
|
* command — and names the manual remedy.
|
|
@@ -615,6 +631,11 @@ export function installLaunchd(deps: {
|
|
|
615
631
|
// The previous definition, kept for rollback. An eviction whose bootstrap fails used to
|
|
616
632
|
// end with the new plist on disk, nothing in launchd, and nothing listening.
|
|
617
633
|
const previousPlist = wasInstalled ? readTextOrNull(p) : null;
|
|
634
|
+
// Disk bytes may be newer than launchd's cached definition after an unreadable probe.
|
|
635
|
+
// Keep this across invocations; neither a matching command nor token rotation confirms it.
|
|
636
|
+
const pendingPath = `${p}.pending`;
|
|
637
|
+
const wasPending = wasInstalled && existsSync(pendingPath);
|
|
638
|
+
const rollbackPlist = wasPending ? readTextOrNull(`${p}.prev`) : previousPlist;
|
|
618
639
|
// Keep launchd bound to the package paths selected by this trusted invocation. A PATH
|
|
619
640
|
// launcher can be replaced later and would inherit the service token and proxy
|
|
620
641
|
// environment.
|
|
@@ -647,9 +668,8 @@ export function installLaunchd(deps: {
|
|
|
647
668
|
|
|
648
669
|
let rendered = buildPlist(resolvedProxyEnv(), { homes });
|
|
649
670
|
if (previousPlist !== null && previousPlist !== rendered && verdict.state === "loaded-current") {
|
|
650
|
-
//
|
|
651
|
-
//
|
|
652
|
-
// it with the repairing process's. See `reusePreviousPlistPathVariable`.
|
|
671
|
+
// Preserve the installed PATH when all other bytes agree. This does not confirm a
|
|
672
|
+
// pending definition; that still needs a verified bootstrap below.
|
|
653
673
|
const adopted = reusePreviousPlistPathVariable(previousPlist, rendered);
|
|
654
674
|
if (adopted !== null) rendered = adopted;
|
|
655
675
|
}
|
|
@@ -657,6 +677,7 @@ export function installLaunchd(deps: {
|
|
|
657
677
|
// `kickstart` can be trusted. `previousPlist === null` (a fresh install) counts: whatever
|
|
658
678
|
// the label may hold did not come from a definition we can see.
|
|
659
679
|
const renderedDiffers = previousPlist !== rendered;
|
|
680
|
+
const needsDefinitionConfirmation = renderedDiffers || wasPending;
|
|
660
681
|
|
|
661
682
|
// ── Writes start here. ──
|
|
662
683
|
if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
|
|
@@ -669,7 +690,7 @@ export function installLaunchd(deps: {
|
|
|
669
690
|
// repair a no-op?" — the plist `cat`s this file at launch.
|
|
670
691
|
const tokenUnchanged = readTextOrNull(tokenFile) === previousToken;
|
|
671
692
|
|
|
672
|
-
if (!
|
|
693
|
+
if (!needsDefinitionConfirmation && tokenUnchanged && verdict.state === "loaded-current") {
|
|
673
694
|
// The plist is not rewritten and launchd is not touched; only the owner-only mode
|
|
674
695
|
// is re-asserted, for a definition an older version may have left at 0644.
|
|
675
696
|
try { chmodSync(p, 0o600); } catch { /* best-effort */ }
|
|
@@ -682,15 +703,31 @@ export function installLaunchd(deps: {
|
|
|
682
703
|
return { reloaded: false };
|
|
683
704
|
}
|
|
684
705
|
|
|
685
|
-
|
|
706
|
+
// With no installed plist, orphaned recovery files belong to an older installation.
|
|
707
|
+
// Remove them before publishing: a later failed repair must not restore that old backup.
|
|
708
|
+
if (!wasInstalled) {
|
|
709
|
+
for (const path of [`${p}.prev`, pendingPath]) unlinkLaunchdOwnedFile(path);
|
|
710
|
+
}
|
|
711
|
+
if (!wasPending) {
|
|
686
712
|
// Best-effort: a backup we could not write must not stop the repair, but it is the
|
|
687
713
|
// only thing that makes the rollback below able to restore bytes rather than guesses.
|
|
688
714
|
//
|
|
689
715
|
// `.plist.prev`, not `.prev.plist`: launchd globs `~/Library/LaunchAgents/*.plist` at
|
|
690
716
|
// login, so a backup ending in `.plist` would be a second registration of the same
|
|
691
717
|
// Label fighting the real one for the port.
|
|
692
|
-
|
|
718
|
+
//
|
|
719
|
+
// Without this run's backup (no readable previous plist, or a failed write), an older
|
|
720
|
+
// run's `.prev` must not survive: the pending marker below makes a later repair roll back
|
|
721
|
+
// to whatever `.prev` holds. Removing it is not best-effort; failing here touches nothing.
|
|
722
|
+
let backedUp = false;
|
|
723
|
+
if (previousPlist !== null) {
|
|
724
|
+
try { writeServiceDefinitionFile(`${p}.prev`, previousPlist, "utf8"); backedUp = true; } catch { /* below */ }
|
|
725
|
+
}
|
|
726
|
+
if (!backedUp) unlinkLaunchdOwnedFile(`${p}.prev`);
|
|
693
727
|
}
|
|
728
|
+
// Persist before replacing the plist or touching launchd, so interruption cannot make
|
|
729
|
+
// the next repair treat unconfirmed bytes as loaded or overwrite the recovery copy.
|
|
730
|
+
if (needsDefinitionConfirmation) writeServiceDefinitionFile(pendingPath, "unconfirmed\n", "utf8");
|
|
694
731
|
writeServiceDefinitionFile(p, rendered, "utf8");
|
|
695
732
|
|
|
696
733
|
// This EVICTS the running job, and from here until the verification below nothing is
|
|
@@ -717,6 +754,7 @@ export function installLaunchd(deps: {
|
|
|
717
754
|
// settle loop above returned at once while `bootstrap` keeps failing 5/EIO until the old
|
|
718
755
|
// process exits (#8362). The FIRST attempt stays a single call so its stderr reaches the
|
|
719
756
|
// operator unchanged; only the recovery path spends the bounded wait.
|
|
757
|
+
/** Retry a transient teardown only after evicting registrations in both user domains. */
|
|
720
758
|
const evictThenBootstrapSettling = () => {
|
|
721
759
|
evictEveryDomain();
|
|
722
760
|
return bootstrapWaitingOutTeardown(run, guiDomain, p, sleepSync);
|
|
@@ -724,9 +762,11 @@ export function installLaunchd(deps: {
|
|
|
724
762
|
|
|
725
763
|
let loaded = evictThenBootstrap();
|
|
726
764
|
verdict = probeLive();
|
|
765
|
+
/** A matching command cannot prove changed policy/environment bytes were loaded. */
|
|
766
|
+
const currentDefinitionLoaded = (): boolean => verdict.state === "loaded-current" && (!needsDefinitionConfirmation || loaded.ok);
|
|
727
767
|
// `unknown` is excluded on purpose: a retry means another eviction, and a probe that
|
|
728
768
|
// could not answer is not a reason to take the job down again.
|
|
729
|
-
if (verdict.state
|
|
769
|
+
if (verdict.state !== "unknown" && !currentDefinitionLoaded()) {
|
|
730
770
|
// ONE more eviction round, which waits out a teardown between bounded bootstrap
|
|
731
771
|
// attempts (see `bootstrapWaitingOutTeardown`). Unbounded would turn a wedged domain
|
|
732
772
|
// into a hang instead of the diagnosable throw below.
|
|
@@ -749,9 +789,9 @@ export function installLaunchd(deps: {
|
|
|
749
789
|
// spelling of it, and it is idempotent on a job that was never disabled — but it
|
|
750
790
|
// runs only here, so an ordinary repair does not quietly undo a deliberate
|
|
751
791
|
// `launchctl disable`.
|
|
752
|
-
const kicked =
|
|
792
|
+
const kicked = needsDefinitionConfirmation ? null : run(["kickstart", "-k", guiTarget]);
|
|
753
793
|
if (kicked?.ok) verdict = probeLive();
|
|
754
|
-
if (
|
|
794
|
+
if (!currentDefinitionLoaded()) {
|
|
755
795
|
run(["enable", guiTarget]);
|
|
756
796
|
loaded = evictThenBootstrapSettling();
|
|
757
797
|
verdict = probeLive();
|
|
@@ -788,13 +828,21 @@ export function installLaunchd(deps: {
|
|
|
788
828
|
return { reloaded: true };
|
|
789
829
|
}
|
|
790
830
|
|
|
791
|
-
if (
|
|
831
|
+
if (!currentDefinitionLoaded()) {
|
|
792
832
|
// Do NOT write install state for a load that did not take: state describing an unused
|
|
793
833
|
// plist is what made this failure invisible.
|
|
794
|
-
let rolledBack: "restored" | "on-disk-only" | "none" = "none";
|
|
795
|
-
if (
|
|
796
|
-
|
|
797
|
-
|
|
834
|
+
let rolledBack: "restored" | "on-disk-only" | "left-running" | "none" = "none";
|
|
835
|
+
if (rollbackPlist !== null) {
|
|
836
|
+
if (verdict.state === "loaded-current") {
|
|
837
|
+
// The job is serving from the expected command; only the changed definition is
|
|
838
|
+
// unconfirmed. Evicting it to reload the old bytes could leave nothing running, so put
|
|
839
|
+
// the previous definition back on disk and keep `.pending` for the next repair.
|
|
840
|
+
try {
|
|
841
|
+
writeServiceDefinitionFile(p, rollbackPlist, "utf8");
|
|
842
|
+
rolledBack = "left-running";
|
|
843
|
+
} catch { /* the new plist stays on disk; .pending keeps it unconfirmed */ }
|
|
844
|
+
} else try {
|
|
845
|
+
writeServiceDefinitionFile(p, rollbackPlist, "utf8");
|
|
798
846
|
evictEveryDomain();
|
|
799
847
|
run(["bootstrap", guiDomain, p]);
|
|
800
848
|
rolledBack = run(["print", guiTarget]).ok ? "restored" : "on-disk-only";
|
|
@@ -805,17 +853,21 @@ export function installLaunchd(deps: {
|
|
|
805
853
|
// What the probe actually found, rather than one sentence for both outcomes: a
|
|
806
854
|
// `loaded-stale` job IS running, and telling its operator "nothing is listening" sends
|
|
807
855
|
// them to fix the wrong thing.
|
|
808
|
-
const state = verdict.state === "loaded-
|
|
809
|
-
? `is still loaded in ${verdict.domain ?? guiDomain}
|
|
810
|
-
:
|
|
811
|
-
? `
|
|
812
|
-
:
|
|
856
|
+
const state = verdict.state === "loaded-current"
|
|
857
|
+
? `is still loaded in ${verdict.domain ?? guiDomain}, but the changed definition was NOT confirmed loaded`
|
|
858
|
+
: verdict.state === "loaded-stale"
|
|
859
|
+
? `is still loaded in ${verdict.domain ?? guiDomain} from a DIFFERENT command than the plist just written`
|
|
860
|
+
: rolledBack === "restored"
|
|
861
|
+
? `was evicted from ${guiDomain}; the PREVIOUS plist was restored and re-bootstrapped`
|
|
862
|
+
: `was evicted from ${guiDomain} and IS NOT RUNNING — nothing is listening`;
|
|
813
863
|
throw new Error(
|
|
814
864
|
`launchctl could not bootstrap ${p}: ${loaded.stderr || "bootstrap reported failure"}\n`
|
|
815
865
|
+ `The ${LABEL} job ${state}.\n`
|
|
816
866
|
+ (rolledBack === "on-disk-only"
|
|
817
867
|
? "The previous plist was restored on disk but could not be bootstrapped either.\n"
|
|
818
|
-
: ""
|
|
868
|
+
: rolledBack === "left-running"
|
|
869
|
+
? "The previous plist was restored on disk; the running job was left in place.\n"
|
|
870
|
+
: "")
|
|
819
871
|
+ `Recover manually with:\n launchctl bootstrap ${guiDomain} ${p}\n`
|
|
820
872
|
+ `Inspect it with:\n launchctl print ${guiTarget}\n launchctl print-disabled ${guiDomain}\n`
|
|
821
873
|
// macOS `service repair` delegates straight to installLaunchd, so this fires for
|
|
@@ -823,6 +875,7 @@ export function installLaunchd(deps: {
|
|
|
823
875
|
+ `then re-run '${wasInstalled ? "ocx service repair" : "ocx service install"}'.`,
|
|
824
876
|
);
|
|
825
877
|
}
|
|
878
|
+
if (needsDefinitionConfirmation) unlinkLaunchdOwnedFile(pendingPath);
|
|
826
879
|
writeServiceInstallState("scheduler");
|
|
827
880
|
// The rollback copy has done its job: the new definition is verified loaded. Leaving it
|
|
828
881
|
// behind makes the NEXT repair's backup ambiguous (which failure did it come from?) and
|
|
@@ -989,13 +1042,13 @@ export function statusLaunchd(deps: { probe?: typeof probeLaunchdLoadState } = {
|
|
|
989
1042
|
return "";
|
|
990
1043
|
}
|
|
991
1044
|
|
|
992
|
-
|
|
993
|
-
|
|
1045
|
+
/** Request a stop and remove the plist/recovery files; only missing-file cleanup is benign. */
|
|
1046
|
+
export function uninstallLaunchd(deps: { launchctl?: typeof runLaunchctl; plistPath?: string } = {}): void {
|
|
1047
|
+
const p = deps.plistPath ?? plistPath();
|
|
994
1048
|
// Same reason as `installLaunchd`: HOME isolation does not move this path, so without
|
|
995
1049
|
// the guard an armed test process deletes the developer's live plist.
|
|
996
1050
|
assertNotRealLaunchAgentsUnderTest(dirname(p));
|
|
997
1051
|
stopLaunchd(deps);
|
|
998
|
-
|
|
999
|
-
|
|
1000
|
-
if (existsSync(`${p}.prev`)) { try { unlinkSync(`${p}.prev`); } catch { /* best-effort */ } }
|
|
1052
|
+
// Recovery artifacts are part of the installation, not user files.
|
|
1053
|
+
for (const suffix of ["", ".prev", ".pending"]) unlinkLaunchdOwnedFile(`${p}${suffix}`);
|
|
1001
1054
|
}
|