@bitkyc08/opencodex 2.100.5 → 2.100.6
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 +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
package/src/link/route-rounds.ts
CHANGED
|
@@ -20,7 +20,7 @@ import type { RouteProofHandle, RouteProofRegistry } from "./route-proof";
|
|
|
20
20
|
import { SSH_MAX_OUTPUT_BYTES, type SshChild, type SshRunner } from "./ssh-runner";
|
|
21
21
|
import { effectiveLinkRoutes, type LinkRecord } from "./store";
|
|
22
22
|
import { exitCause, type TunnelCause } from "./tunnel-history";
|
|
23
|
-
import type
|
|
23
|
+
import { classifySshStderr, type StderrClass, type TunnelEvent, type TunnelState } from "./tunnel-state";
|
|
24
24
|
|
|
25
25
|
/** One route probe, supervisor clock. */
|
|
26
26
|
export const ROUTE_PROBE_MS = 10_000;
|
|
@@ -84,7 +84,10 @@ export interface RouteRoundHost {
|
|
|
84
84
|
warn(message: string): void;
|
|
85
85
|
}
|
|
86
86
|
|
|
87
|
-
interface RouteBook {
|
|
87
|
+
interface RouteBook {
|
|
88
|
+
name: string; outcome: RouteOutcomeClass | null; outcomeAt: number | null; probeFailures: number; tunnelFailures: number; eligibleAt: number;
|
|
89
|
+
remoteForwardConflict?: boolean;
|
|
90
|
+
}
|
|
88
91
|
|
|
89
92
|
interface Proof {
|
|
90
93
|
platform?: "posix" | "windows";
|
|
@@ -130,7 +133,7 @@ export interface RouteRounds {
|
|
|
130
133
|
begin(record: LinkRecord): boolean;
|
|
131
134
|
tick(linkId: string): void;
|
|
132
135
|
/** True when this child belonged to a multi-route round or proven tunnel (the exit is handled). */
|
|
133
|
-
exited(linkId: string, child: SshChild, stderr: string): boolean;
|
|
136
|
+
exited(linkId: string, child: SshChild, stderr: string, deferForwardRelease?: (resume: (allowed: boolean) => void) => boolean): boolean;
|
|
134
137
|
/** Drop rounds and proofs: a stop, hold, reconnect or removal is taking the link down. */
|
|
135
138
|
cancel(linkId: string): void;
|
|
136
139
|
/** Forget everything about a link (removed, or no longer multi-route). */
|
|
@@ -168,12 +171,13 @@ export function createRouteRounds(host: RouteRoundHost): RouteRounds {
|
|
|
168
171
|
|
|
169
172
|
const current = (linkId: string, round: Round): boolean => !stopped && links.get(linkId)?.round === round && !host.blocked(linkId);
|
|
170
173
|
|
|
171
|
-
const fail = (link: LinkRoutes, route: string, outcome: RouteOutcomeClass, kind: "probe" | "tunnel"): void => {
|
|
174
|
+
const fail = (link: LinkRoutes, route: string, outcome: RouteOutcomeClass, kind: "probe" | "tunnel", remoteForwardConflict = false): void => {
|
|
172
175
|
const book = link.books.get(route);
|
|
173
176
|
if (!book) return;
|
|
174
177
|
const n = kind === "probe" ? ++book.probeFailures : ++book.tunnelFailures;
|
|
175
178
|
book.outcome = outcome;
|
|
176
179
|
book.outcomeAt = host.now();
|
|
180
|
+
book.remoteForwardConflict = remoteForwardConflict;
|
|
177
181
|
book.eligibleAt = host.now() + routeCooldownMs(outcome, n, host.random);
|
|
178
182
|
};
|
|
179
183
|
|
|
@@ -185,7 +189,9 @@ export function createRouteRounds(host: RouteRoundHost): RouteRounds {
|
|
|
185
189
|
const endRound = (linkId: string, link: LinkRoutes): void => {
|
|
186
190
|
link.round = undefined;
|
|
187
191
|
host.routeProof?.forget(linkId);
|
|
188
|
-
const
|
|
192
|
+
const outcome = aggregate(link);
|
|
193
|
+
const cls = outcome === "forward" && [...link.books.values()].some(book => book.outcome === "forward" && book.remoteForwardConflict)
|
|
194
|
+
? "remote_forward" : outcome;
|
|
189
195
|
host.setEvent(linkId, { type: "exit", now: host.now(), stderrClass: cls }, exitCause(cls));
|
|
190
196
|
host.deferRetry(linkId, minEligible(link));
|
|
191
197
|
};
|
|
@@ -459,7 +465,7 @@ export function createRouteRounds(host: RouteRoundHost): RouteRounds {
|
|
|
459
465
|
void attempt(linkId, link, round, phase);
|
|
460
466
|
}
|
|
461
467
|
},
|
|
462
|
-
exited(linkId, child, stderr) {
|
|
468
|
+
exited(linkId, child, stderr, deferForwardRelease) {
|
|
463
469
|
const link = links.get(linkId);
|
|
464
470
|
if (!link) return false;
|
|
465
471
|
if (link.active?.child === child) {
|
|
@@ -472,13 +478,30 @@ export function createRouteRounds(host: RouteRoundHost): RouteRounds {
|
|
|
472
478
|
const round = link.round;
|
|
473
479
|
const phase = round?.phase;
|
|
474
480
|
if (!round || !phase || (phase.kind !== "candidate" && phase.kind !== "halted") || phase.child !== child) return false;
|
|
481
|
+
const stderrClass = classifySshStderr(stderr);
|
|
482
|
+
const remoteRefused = phase.kind === "candidate" && phase.stopAt === undefined && phase.grantedAt === undefined
|
|
483
|
+
&& (stderrClass === "remote_forward" || (phase.refused && stderrClass !== "auth" && stderrClass !== "hostkey"));
|
|
475
484
|
const failure = phase.kind === "halted" ? phase.failure
|
|
476
|
-
: phase.failure ?? (
|
|
485
|
+
: phase.failure ?? (remoteRefused ? "forward" : routeOutcomeOfStderr(stderr));
|
|
477
486
|
if (phase.kind === "candidate") { phase.abort.abort(); phase.proof.handle?.dispose(); }
|
|
478
487
|
host.routeProof?.forget(linkId);
|
|
479
488
|
if (link.blocked === "stop_unconfirmed") link.blocked = null;
|
|
480
|
-
|
|
481
|
-
|
|
489
|
+
const advance = (): void => {
|
|
490
|
+
fail(link, phase.route, failure, "tunnel", remoteRefused);
|
|
491
|
+
if (current(linkId, round)) next(linkId, link, round);
|
|
492
|
+
};
|
|
493
|
+
if (remoteRefused && deferForwardRelease) {
|
|
494
|
+
const deferred: Phase = { kind: "deferred" };
|
|
495
|
+
if (deferForwardRelease(allowed => {
|
|
496
|
+
if (!current(linkId, round) || round.phase !== deferred) return;
|
|
497
|
+
if (allowed) candidate(linkId, link, round, phase.route);
|
|
498
|
+
else advance();
|
|
499
|
+
})) {
|
|
500
|
+
round.phase = deferred;
|
|
501
|
+
return true;
|
|
502
|
+
}
|
|
503
|
+
}
|
|
504
|
+
advance();
|
|
482
505
|
return true;
|
|
483
506
|
},
|
|
484
507
|
cancel(linkId) {
|
|
@@ -6,7 +6,7 @@ import { EMPTY_LINK_CHILD_PARITY, type LinkChildParity } from "./child-parity";
|
|
|
6
6
|
import { linkPeerStatus, type LinkLocalPeer, type LinkPeerStatus } from "./compatibility";
|
|
7
7
|
import type { LinkPeerEntry } from "./peer-report";
|
|
8
8
|
import type { OcxClientConnectionConfig } from "../types";
|
|
9
|
-
import { isLinkIdle, type LinkActivitySnapshot } from "./child-activity";
|
|
9
|
+
import { isLinkIdle, LINK_DELIVERY_DEGRADED_THRESHOLD, type LinkActivitySnapshot } from "./child-activity";
|
|
10
10
|
import { catalogVerdict, type CatalogPull, type CatalogRevision, type CatalogState } from "./child-catalog-freshness";
|
|
11
11
|
import type { ChildObservation, ChildOp, ChildOperationSummary } from "./child-observations";
|
|
12
12
|
import type { InstallKind, UpdateRoute } from "./child-update-contract";
|
|
@@ -35,6 +35,8 @@ export interface LinkStatusDto {
|
|
|
35
35
|
peer?: LinkPeerStatus;
|
|
36
36
|
/** Home-initiated links on request (`?diagnostics=1`): retry progress and the last failure. */
|
|
37
37
|
tunnel?: LinkTunnelDiagnostics;
|
|
38
|
+
/** Home-initiated links on request (`?relayHealth=1`): delivery evidence for the current tunnel. */
|
|
39
|
+
relayHealth?: LinkRelayHealth;
|
|
38
40
|
/** Home rows on request (`?children=1`): versions, update route, catalog freshness, activity and operations. */
|
|
39
41
|
child?: LinkChildOpsStatus;
|
|
40
42
|
/** Links with several routes, on request (`?routes=1`): each route's rest and last outcome. */
|
|
@@ -70,6 +72,41 @@ export interface LinkTunnelDiagnostics {
|
|
|
70
72
|
lastFailure: { cause: string; at: string } | null;
|
|
71
73
|
}
|
|
72
74
|
|
|
75
|
+
export const LINK_RELAY_DEGRADED_GUIDANCE =
|
|
76
|
+
"Run ocx link check --link-id <id>. If requests keep dropping, run ocx link reconnect --link-id <id> when the link is idle.";
|
|
77
|
+
|
|
78
|
+
export interface LinkRelayHealth {
|
|
79
|
+
relayAuthentication: "observed" | "unknown";
|
|
80
|
+
delivery: "degraded" | "observed" | "unknown";
|
|
81
|
+
inferenceReadiness: "unknown";
|
|
82
|
+
recentInterruptions: number;
|
|
83
|
+
guidance?: typeof LINK_RELAY_DEGRADED_GUIDANCE;
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
/** No probe or routing decision. Only authenticated HTTP model delivery seen on the current Home tunnel. */
|
|
87
|
+
export function attachLinkRelayHealth(
|
|
88
|
+
dto: LinkStatusDto,
|
|
89
|
+
generationOf: (linkId: string) => string | undefined,
|
|
90
|
+
activityOf: (linkId: string) => LinkActivitySnapshot | undefined,
|
|
91
|
+
): void {
|
|
92
|
+
if (dto.role !== "home") return;
|
|
93
|
+
for (const link of dto.links) {
|
|
94
|
+
if (link.direction !== "hub-initiated") continue;
|
|
95
|
+
const generation = link.state === "connected" ? generationOf(link.id) : undefined;
|
|
96
|
+
const snapshot = generation === undefined ? undefined : activityOf(link.id)?.httpDelivery;
|
|
97
|
+
const evidence = snapshot?.generation === generation ? snapshot : undefined;
|
|
98
|
+
const recentInterruptions = evidence?.recentInterruptions ?? 0;
|
|
99
|
+
const degraded = recentInterruptions >= LINK_DELIVERY_DEGRADED_THRESHOLD;
|
|
100
|
+
link.relayHealth = {
|
|
101
|
+
relayAuthentication: evidence?.recentAuthentication ? "observed" : "unknown",
|
|
102
|
+
delivery: degraded ? "degraded" : evidence?.recentSettled ? "observed" : "unknown",
|
|
103
|
+
inferenceReadiness: "unknown",
|
|
104
|
+
recentInterruptions,
|
|
105
|
+
...(degraded ? { guidance: LINK_RELAY_DEGRADED_GUIDANCE } : {}),
|
|
106
|
+
};
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
|
|
73
110
|
function iso(at: number): string {
|
|
74
111
|
return new Date(at).toISOString();
|
|
75
112
|
}
|
|
@@ -132,12 +169,12 @@ export function attachLinkTunnelDiagnostics(dto: LinkStatusDto, supervisorStates
|
|
|
132
169
|
for (const link of dto.links) {
|
|
133
170
|
const status = byId.get(link.id);
|
|
134
171
|
if (!status || status.direction !== "hub-initiated") continue;
|
|
135
|
-
const { state, history } = status;
|
|
136
|
-
const due = (state.kind === "failed" || state.kind === "reconnecting") && state.
|
|
137
|
-
? state.retryAt :
|
|
172
|
+
const { state, history, forwardRetryAt } = status;
|
|
173
|
+
const due = forwardRetryAt ?? ((state.kind === "failed" || state.kind === "reconnecting") && state.inFlight !== true
|
|
174
|
+
? state.retryAt : undefined);
|
|
138
175
|
link.tunnel = {
|
|
139
176
|
attempt: history?.attempt ?? 0,
|
|
140
|
-
nextRetryAt: due ===
|
|
177
|
+
nextRetryAt: due === undefined ? null : iso(due),
|
|
141
178
|
lastTransition: history?.lastTransition
|
|
142
179
|
? { from: history.lastTransition.from, to: history.lastTransition.to, at: iso(history.lastTransition.at), cause: history.lastTransition.cause }
|
|
143
180
|
: null,
|
package/src/link/supervisor.ts
CHANGED
|
@@ -32,6 +32,8 @@ export type LinkTunnelStatus =
|
|
|
32
32
|
orphan?: "orphan-unverified";
|
|
33
33
|
/** Attempts, last change and last failure cause of this tunnel (`tunnel-history.ts`). */
|
|
34
34
|
history?: TunnelHistory;
|
|
35
|
+
/** A same-route forward retry due before the current route round advances. */
|
|
36
|
+
forwardRetryAt?: number;
|
|
35
37
|
/** Links with several routes only (src/link/route-rounds.ts). */
|
|
36
38
|
routes?: LinkRouteStatus;
|
|
37
39
|
/** An unsettled revoke keeps this link down (revokeSuspendsLink); absent otherwise. */
|
|
@@ -132,6 +134,16 @@ export interface LinkSupervisorDeps {
|
|
|
132
134
|
|
|
133
135
|
const TIMER_MS = 1_000;
|
|
134
136
|
const SPAWN_GRACE_MS = 5_000;
|
|
137
|
+
const FORWARD_RELEASE_DELAYS_MS = [1_000, 2_000] as const;
|
|
138
|
+
const FORWARD_RELEASE_WINDOW_MS = 8_000;
|
|
139
|
+
|
|
140
|
+
interface ForwardRelease {
|
|
141
|
+
generation: number;
|
|
142
|
+
deadline: number;
|
|
143
|
+
attempts: number;
|
|
144
|
+
pending?: { at: number; resume: (allowed: boolean) => void };
|
|
145
|
+
}
|
|
146
|
+
|
|
135
147
|
/**
|
|
136
148
|
* A retry runs while the network may still be down, and ssh can wait out its whole ConnectTimeout
|
|
137
149
|
* (10 s for the TCP connect, the SSH handshake and key exchange, see ssh-argv.ts) before it exits.
|
|
@@ -268,6 +280,8 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
268
280
|
const linkRevisions = new Map<string, number>();
|
|
269
281
|
/** Reconnects in flight, so overlapping requests for one link restart it once. */
|
|
270
282
|
const reconnects = new Map<string, Promise<boolean | "suspended">>();
|
|
283
|
+
/** Only a manual reconnect that drained an owned child can open this short retry window. */
|
|
284
|
+
const forwardReleases = new Map<string, ForwardRelease>();
|
|
271
285
|
const holds = new Map<string, number>();
|
|
272
286
|
const orphanUnverified = new Set<string>();
|
|
273
287
|
/** The generation of the child whose exit is still being classified, per link. */
|
|
@@ -496,15 +510,39 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
496
510
|
const put = (linkId: string, next: TunnelState, cause: TunnelCause | null = null): TunnelState => {
|
|
497
511
|
const before = states.get(linkId) ?? IDLE;
|
|
498
512
|
states.set(linkId, next);
|
|
499
|
-
|
|
513
|
+
// Keep ordinary backoff in the reducer for when the short window expires or is cancelled.
|
|
514
|
+
const shortRetryAt = forwardReleases.get(linkId)?.pending?.at;
|
|
515
|
+
history.observe(linkId, before, next.kind === "failed" && shortRetryAt !== undefined ? { ...next, retryAt: shortRetryAt } : next, cause, now());
|
|
500
516
|
return next;
|
|
501
517
|
};
|
|
502
518
|
|
|
503
519
|
const setEvent = (linkId: string, event: Parameters<typeof reduceTunnel>[1], cause: TunnelCause | null = null): TunnelState =>
|
|
504
520
|
put(linkId, reduceTunnel(states.get(linkId) ?? IDLE, event, deps.random, HOME_TUNNEL_RETRY_POLICY), cause);
|
|
505
521
|
|
|
522
|
+
const registerGeneration = (linkId: string): number => {
|
|
523
|
+
const previous = generations.get(linkId) ?? 0;
|
|
524
|
+
const generation = previous + 1;
|
|
525
|
+
generations.set(linkId, generation);
|
|
526
|
+
const release = forwardReleases.get(linkId);
|
|
527
|
+
if (release?.generation === previous) release.generation = generation;
|
|
528
|
+
return generation;
|
|
529
|
+
};
|
|
530
|
+
|
|
531
|
+
const scheduleForwardRelease = (linkId: string, generation: number, resume: (allowed: boolean) => void): boolean => {
|
|
532
|
+
const release = forwardReleases.get(linkId);
|
|
533
|
+
if (!release || release.generation !== generation || stopping || holds.has(linkId)) return false;
|
|
534
|
+
const delay = FORWARD_RELEASE_DELAYS_MS[release.attempts];
|
|
535
|
+
if (delay === undefined) return false;
|
|
536
|
+
const at = now() + delay;
|
|
537
|
+
if (at >= release.deadline) return false;
|
|
538
|
+
release.attempts++;
|
|
539
|
+
release.pending = { at, resume };
|
|
540
|
+
return true;
|
|
541
|
+
};
|
|
542
|
+
|
|
506
543
|
/** Fail a link whose attempt could not start; a due retry that fails this way counts as one. */
|
|
507
544
|
const failAttempt = (linkId: string, prior: TunnelState | undefined, reason: TunnelFailure, cause: TunnelCause): void => {
|
|
545
|
+
forwardReleases.delete(linkId);
|
|
508
546
|
put(linkId, failedSpawnTunnel(prior, reason, now(), HOME_TUNNEL_RETRY_POLICY), cause);
|
|
509
547
|
};
|
|
510
548
|
|
|
@@ -522,8 +560,17 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
522
560
|
try { stderr = child.stderr ? await child.stderr : ""; } catch { /* classified as unknown */ }
|
|
523
561
|
// A reconnect may have started a fresh child meanwhile; its own lifecycle owns the state.
|
|
524
562
|
if (generations.get(linkId) !== generation) return;
|
|
525
|
-
if (rounds.exited(linkId, child, stderr))
|
|
563
|
+
if (rounds.exited(linkId, child, stderr, resume => scheduleForwardRelease(linkId, generation, resume))) {
|
|
564
|
+
if (forwardReleases.get(linkId)?.pending) history.recordFailure(linkId, "remote_forward_conflict", now());
|
|
565
|
+
else forwardReleases.delete(linkId);
|
|
566
|
+
return;
|
|
567
|
+
}
|
|
526
568
|
const stderrClass = classifySshStderr(stderr);
|
|
569
|
+
const shortRetry = stderrClass === "remote_forward" && scheduleForwardRelease(linkId, generation, allowed => {
|
|
570
|
+
const record = store.links.find(record => record.id === linkId);
|
|
571
|
+
if (allowed && record) spawnFor(record, true);
|
|
572
|
+
});
|
|
573
|
+
if (!shortRetry) forwardReleases.delete(linkId);
|
|
527
574
|
setEvent(linkId, { type: "exit", now: now(), stderrClass }, exitCause(stderrClass));
|
|
528
575
|
} finally {
|
|
529
576
|
if (exiting.get(linkId) === generation) exiting.delete(linkId);
|
|
@@ -533,6 +580,7 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
533
580
|
children.delete(linkId);
|
|
534
581
|
conditionalRemovePidfile(linkId, child.pid);
|
|
535
582
|
if (stopping) return;
|
|
583
|
+
forwardReleases.delete(linkId);
|
|
536
584
|
if (rounds.exited(linkId, child, "")) return;
|
|
537
585
|
setEvent(linkId, { type: "exit", now: now(), stderrClass: "network" }, "network");
|
|
538
586
|
});
|
|
@@ -564,8 +612,7 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
564
612
|
route: record.explicitRoute ?? null,
|
|
565
613
|
});
|
|
566
614
|
const child = runner.spawnTunnel(argv, { stderrLine });
|
|
567
|
-
const generation = (
|
|
568
|
-
generations.set(record.id, generation);
|
|
615
|
+
const generation = registerGeneration(record.id);
|
|
569
616
|
const connection = nextLinkConnectionGeneration();
|
|
570
617
|
connectionNames.set(record.id, connection);
|
|
571
618
|
exiting.delete(record.id);
|
|
@@ -576,6 +623,7 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
576
623
|
const startTime = readProcessStartTime(child.pid);
|
|
577
624
|
writePidfile(pidfilePath(record.id), { version: 1, linkId: record.id, pid: child.pid, argv, ...(startTime === null ? {} : { startTime }) });
|
|
578
625
|
} catch {
|
|
626
|
+
forwardReleases.delete(record.id);
|
|
579
627
|
return { child, generation: connection, setupFailed: true };
|
|
580
628
|
}
|
|
581
629
|
return { child, generation: connection };
|
|
@@ -584,7 +632,10 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
584
632
|
const capture = openSshCapture(sshCapture, "home", linkId);
|
|
585
633
|
return capture ? line => capture.stderrLine(line) : undefined;
|
|
586
634
|
},
|
|
587
|
-
setEvent
|
|
635
|
+
setEvent(linkId, event, cause) {
|
|
636
|
+
if (event.type === "ready") forwardReleases.delete(linkId);
|
|
637
|
+
return setEvent(linkId, event, cause ?? null);
|
|
638
|
+
},
|
|
588
639
|
deferRetry(linkId, at) {
|
|
589
640
|
const state = states.get(linkId);
|
|
590
641
|
if (state && (state.kind === "reconnecting" || state.kind === "failed") && state.retryAt !== undefined && state.retryAt < at) {
|
|
@@ -596,14 +647,14 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
596
647
|
warn,
|
|
597
648
|
});
|
|
598
649
|
|
|
599
|
-
const spawnFor = (record: LinkRecord): void => {
|
|
650
|
+
const spawnFor = (record: LinkRecord, forwardRelease = false): void => {
|
|
600
651
|
if (stopping || holds.has(record.id) || record.direction !== "hub-initiated" || children.has(record.id)) return;
|
|
601
652
|
// A revoke that reached the Child's cleanup and stopped unknown may have purged it: no reconnect until resolved.
|
|
602
653
|
if (linkSuspendedByRevoke(journalPath, record.id)) return;
|
|
603
654
|
// Only a fresh link or a due attempt spawns. A reload must neither skip the backoff nor start
|
|
604
655
|
// a second child while an exited one is still reporting its stderr.
|
|
605
656
|
const prior = states.get(record.id);
|
|
606
|
-
if (prior && prior.kind !== "idle" && !dueForSpawn(prior, now())) return;
|
|
657
|
+
if (!forwardRelease && prior && prior.kind !== "idle" && !dueForSpawn(prior, now())) return;
|
|
607
658
|
if (store.listenerPort === null) {
|
|
608
659
|
// Retried like any forward failure; a reload that brings the listener back starts it fresh.
|
|
609
660
|
failAttempt(record.id, prior, "forward", "listener_unavailable");
|
|
@@ -625,8 +676,7 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
625
676
|
route: record.explicitRoute ?? null,
|
|
626
677
|
});
|
|
627
678
|
const child = capture ? runner.spawnTunnel(argv, { stderrLine: capture.stderrLine }) : runner.spawnTunnel(argv);
|
|
628
|
-
const generation = (
|
|
629
|
-
generations.set(record.id, generation);
|
|
679
|
+
const generation = registerGeneration(record.id);
|
|
630
680
|
connectionNames.set(record.id, nextLinkConnectionGeneration());
|
|
631
681
|
// An older child's exit still being classified no longer speaks for this link.
|
|
632
682
|
exiting.delete(record.id);
|
|
@@ -670,6 +720,21 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
670
720
|
// The exit is still being classified. Failing the link on the outage clock now would make
|
|
671
721
|
// a later host-key or auth exit land on a failed state that ignores it.
|
|
672
722
|
if (exiting.has(record.id)) continue;
|
|
723
|
+
const release = forwardReleases.get(record.id);
|
|
724
|
+
if (release) {
|
|
725
|
+
const expired = current >= release.deadline || release.generation !== generations.get(record.id);
|
|
726
|
+
const pending = release.pending;
|
|
727
|
+
if (expired) forwardReleases.delete(record.id);
|
|
728
|
+
if (pending && (expired || current >= pending.at)) {
|
|
729
|
+
delete release.pending;
|
|
730
|
+
if (linkSuspendedByRevoke(journalPath, record.id)) {
|
|
731
|
+
forwardReleases.delete(record.id);
|
|
732
|
+
rounds.cancel(record.id);
|
|
733
|
+
} else {
|
|
734
|
+
pending.resume(!expired);
|
|
735
|
+
}
|
|
736
|
+
}
|
|
737
|
+
}
|
|
673
738
|
const before = states.get(record.id) ?? IDLE;
|
|
674
739
|
const child = children.get(record.id);
|
|
675
740
|
if (rounds.isMultiRoute(record)) {
|
|
@@ -749,6 +814,7 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
749
814
|
};
|
|
750
815
|
|
|
751
816
|
const stopChild = async (linkId: string): Promise<void> => {
|
|
817
|
+
forwardReleases.delete(linkId);
|
|
752
818
|
rounds.cancel(linkId);
|
|
753
819
|
const current = children.get(linkId);
|
|
754
820
|
if (!current) {
|
|
@@ -768,6 +834,7 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
768
834
|
};
|
|
769
835
|
|
|
770
836
|
const invalidateLink = (linkId: string): void => {
|
|
837
|
+
forwardReleases.delete(linkId);
|
|
771
838
|
linkRevisions.set(linkId, (linkRevisions.get(linkId) ?? 0) + 1);
|
|
772
839
|
generations.set(linkId, (generations.get(linkId) ?? 0) + 1);
|
|
773
840
|
rounds.cancel(linkId);
|
|
@@ -852,6 +919,7 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
852
919
|
// a replaced instance); one with nothing watched is settled again from its pidfile below.
|
|
853
920
|
const flaggedChanged = [...changed].filter(linkId => orphanUnverified.has(linkId));
|
|
854
921
|
for (const linkId of changed) {
|
|
922
|
+
forwardReleases.delete(linkId);
|
|
855
923
|
rounds.cancel(linkId);
|
|
856
924
|
const watch = orphanWatches.get(linkId);
|
|
857
925
|
const next = nextStore.links.find(link => link.id === linkId);
|
|
@@ -866,6 +934,7 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
866
934
|
// A removed link takes its block with it; a link added again later is settled from its pidfile below.
|
|
867
935
|
for (const linkId of recordInstances.keys()) {
|
|
868
936
|
if (nextInstances.has(linkId)) continue;
|
|
937
|
+
forwardReleases.delete(linkId);
|
|
869
938
|
rounds.cancel(linkId);
|
|
870
939
|
orphanWatches.delete(linkId);
|
|
871
940
|
orphanUnverified.delete(linkId);
|
|
@@ -882,7 +951,10 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
882
951
|
recheckPidfile(record);
|
|
883
952
|
}
|
|
884
953
|
if (routesEdited.some(record => rounds.isMultiRoute(record))) rounds.recheckClient();
|
|
885
|
-
for (const record of routesEdited)
|
|
954
|
+
for (const record of routesEdited) {
|
|
955
|
+
forwardReleases.delete(record.id);
|
|
956
|
+
if (rounds.isMultiRoute(record)) rounds.routesChanged(record);
|
|
957
|
+
}
|
|
886
958
|
for (const [linkId] of [...children]) {
|
|
887
959
|
if (nextInstances.has(linkId) && !changed.has(linkId)) continue;
|
|
888
960
|
await stopChild(linkId);
|
|
@@ -949,6 +1021,7 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
949
1021
|
if (rounds.isMultiRoute(record) && orphanUnverified.has(linkId)) return;
|
|
950
1022
|
// A preceding reload may have spawned a new generation; it is the current one we drain.
|
|
951
1023
|
const generation = generations.get(linkId);
|
|
1024
|
+
const ownedChild = children.has(linkId);
|
|
952
1025
|
const revision = lifecycleRevision;
|
|
953
1026
|
const instance = recordInstance(record, store.listenerPort);
|
|
954
1027
|
await stopChild(linkId);
|
|
@@ -960,6 +1033,9 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
960
1033
|
restarted = "suspended";
|
|
961
1034
|
return;
|
|
962
1035
|
}
|
|
1036
|
+
if (ownedChild && generation !== undefined) {
|
|
1037
|
+
forwardReleases.set(linkId, { generation, deadline: now() + FORWARD_RELEASE_WINDOW_MS, attempts: 0 });
|
|
1038
|
+
}
|
|
963
1039
|
spawnFor(fresh);
|
|
964
1040
|
restarted = true;
|
|
965
1041
|
}).then(() => restarted).finally(() => { reconnects.delete(linkId); });
|
|
@@ -971,6 +1047,9 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
971
1047
|
// A multi-route link is promoted only by its candidate's correlated readiness proof.
|
|
972
1048
|
if (rounds.isMultiRoute(record)) continue;
|
|
973
1049
|
if (record.direction === "hub-initiated" && record.apiKeyId === apiKeyId && children.has(record.id)) {
|
|
1050
|
+
// An authenticated catalog request proves the forward. The timed SSH liveness
|
|
1051
|
+
// promotion alone cannot close the window while a forward request may still be pending.
|
|
1052
|
+
forwardReleases.delete(record.id);
|
|
974
1053
|
const state = states.get(record.id);
|
|
975
1054
|
if (state?.kind === "connecting" || state?.kind === "reconnecting" || (state && retryInFlight(state))) {
|
|
976
1055
|
setEvent(record.id, { type: "ready", now: now() });
|
|
@@ -988,13 +1067,18 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
988
1067
|
const recorded = history.get(record.id);
|
|
989
1068
|
const routes = rounds.isMultiRoute(record) ? rounds.status(record.id) : undefined;
|
|
990
1069
|
const suspension = suspensionOf(record.id);
|
|
1070
|
+
const state = states.get(record.id) ?? IDLE;
|
|
1071
|
+
const release = forwardReleases.get(record.id);
|
|
1072
|
+
const retryAt = release && !stopping && !suspension && release.generation === generations.get(record.id)
|
|
1073
|
+
&& now() < release.deadline ? release.pending?.at : undefined;
|
|
991
1074
|
return {
|
|
992
1075
|
linkId: record.id,
|
|
993
1076
|
direction: record.direction,
|
|
994
|
-
state:
|
|
1077
|
+
state: state.kind === "failed" && retryAt !== undefined ? { ...state, retryAt } : state,
|
|
995
1078
|
pid: child?.child.pid ?? null,
|
|
996
1079
|
...(orphanUnverified.has(record.id) ? { orphan: "orphan-unverified" as const } : {}),
|
|
997
1080
|
...(recorded ? { history: recorded } : {}),
|
|
1081
|
+
...(routes && retryAt !== undefined ? { forwardRetryAt: retryAt } : {}),
|
|
998
1082
|
...(routes ? { routes } : {}),
|
|
999
1083
|
...(suspension ? { suspended: { operationId: suspension.operationId, since: suspension.since } } : {}),
|
|
1000
1084
|
};
|
|
@@ -1002,6 +1086,7 @@ export function createLinkSupervisor(deps: LinkSupervisorDeps = {}): LinkSupervi
|
|
|
1002
1086
|
},
|
|
1003
1087
|
async stop() {
|
|
1004
1088
|
stopping = true;
|
|
1089
|
+
forwardReleases.clear();
|
|
1005
1090
|
rounds.stop();
|
|
1006
1091
|
try {
|
|
1007
1092
|
await runLifecycle(async () => {
|
|
@@ -50,6 +50,8 @@ function retryFailedAgain(before: TunnelState, after: TunnelState): boolean {
|
|
|
50
50
|
export interface TunnelHistoryBook {
|
|
51
51
|
/** Count one ssh attempt for the link. */
|
|
52
52
|
spawned(linkId: string): void;
|
|
53
|
+
/** Record a failed attempt that leaves the link in its current state. */
|
|
54
|
+
recordFailure(linkId: string, cause: TunnelCause, at: number): void;
|
|
53
55
|
/** Record a state change; `cause` names why the link left a working state, when known. */
|
|
54
56
|
observe(linkId: string, before: TunnelState, after: TunnelState, cause: TunnelCause | null, at: number): void;
|
|
55
57
|
get(linkId: string): TunnelHistory | undefined;
|
|
@@ -72,6 +74,9 @@ export function createTunnelHistoryBook(
|
|
|
72
74
|
spawned(linkId) {
|
|
73
75
|
entry(linkId).attempt += 1;
|
|
74
76
|
},
|
|
77
|
+
recordFailure(linkId, cause, at) {
|
|
78
|
+
entry(linkId).lastFailure = { cause, at };
|
|
79
|
+
},
|
|
75
80
|
observe(linkId, before, after, cause, at) {
|
|
76
81
|
const refailed = retryFailedAgain(before, after);
|
|
77
82
|
if (before.kind === after.kind && !refailed) return;
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { AccountPauseEvidence, AccountPauseReason } from "../types/account-auto-pause";
|
|
2
2
|
import { readBoundedResponseBody } from "../lib/bounded-body";
|
|
3
|
+
import { sanitizeUpstreamErrorText } from "../adapters/upstream-http-error";
|
|
4
|
+
import { normalizeCloudCodeAppealText, normalizeCloudCodeAppealUrl } from "../lib/cloud-code-appeal-link";
|
|
3
5
|
|
|
4
6
|
/** Only whole, account-scoped messages are authority; model/resource policy errors are not. */
|
|
5
7
|
export function classifyPermanentAccountRefusal(status: number, payload: unknown): AccountPauseReason | undefined {
|
|
@@ -17,41 +19,92 @@ export function classifyPermanentAccountRefusal(status: number, payload: unknown
|
|
|
17
19
|
if (/^(?:(?:Your |The )?(?:Claude |ChatGPT )?subscription is inactive|Your account does not have an active subscription)[.!]?$/i.test(text)) return "subscription_inactive";
|
|
18
20
|
if (/^Your (?:account|plan) (?:has been |was )?downgraded to (?:the )?free(?: plan)? (?:and |with )?(?:has )?(?:no|without) (?:remaining )?credits[.!]?$/i.test(text)) return "plan_downgraded";
|
|
19
21
|
if (type === "permission_error" && /^Your account (?:does not have access to Claude Code|is (?:disabled|suspended)|is not permitted to use (?:the |this )?API)[.!]?$/i.test(text)) return "account_permission_denied";
|
|
20
|
-
// Cloud Code Assist (Antigravity / Gemini CLI OAuth) account ban (#7803).
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
22
|
+
// Cloud Code Assist (Antigravity / Gemini CLI OAuth) account ban (#7803).
|
|
23
|
+
if (isConclusiveAccountBan(status, payload)) return "account_permission_denied";
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* A refusal the upstream itself marks permanent for the whole account: the Cloud Code Assist Terms
|
|
28
|
+
* of Service ban. Google's backend has returned the sentence alone and with exactly two closing
|
|
29
|
+
* sentences (google-gemini/gemini-cli #19501, #20813, #27199, #27388); only those whole messages,
|
|
30
|
+
* on a consistent 403 / numeric 403 / PERMISSION_DENIED envelope, qualify. Project-scoped
|
|
31
|
+
* CONSUMER_SUSPENDED, SERVICE_DISABLED and model-permission errors name a project or a model, not
|
|
32
|
+
* the sending identity.
|
|
33
|
+
*/
|
|
34
|
+
export function isConclusiveAccountBan(status: number, payload: unknown): boolean {
|
|
35
|
+
if (status !== 403 || !payload || typeof payload !== "object" || Array.isArray(payload)) return false;
|
|
36
|
+
const error = (payload as { error?: unknown }).error;
|
|
37
|
+
if (!error || typeof error !== "object" || Array.isArray(error)) return false;
|
|
38
|
+
const { type, code, message, status: googleStatus } = error as Record<string, unknown>;
|
|
39
|
+
// The same type gate classifyPermanentAccountRefusal applies before reaching this envelope.
|
|
40
|
+
if (type !== undefined && !["permission_error", "authentication_error", "invalid_request_error"].includes(String(type))) return false;
|
|
41
|
+
return code === 403 && googleStatus === "PERMISSION_DENIED" && typeof message === "string"
|
|
42
|
+
&& CCA_TOS_ACCOUNT_BAN.test(message.trim().replace(/\s+/g, " "));
|
|
27
43
|
}
|
|
28
44
|
|
|
29
45
|
const CCA_TOS_ACCOUNT_BAN = new RegExp("^This service has been disabled in this account for violation of Terms of Service\\."
|
|
30
46
|
+ "(?: If you believe this is an error, contact gemini-code-assist-user-feedback@google\\.com\\."
|
|
31
47
|
+ "| Please submit an appeal to continue using this product\\.)?$");
|
|
32
48
|
|
|
33
|
-
export
|
|
49
|
+
export interface PermanentAccountRefusalEvidence extends AccountPauseEvidence {
|
|
50
|
+
reason: AccountPauseReason;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/** Preserve line breaks for the first redaction pass, then redact again before capping. */
|
|
54
|
+
export function pauseEvidenceMessage(raw: string): string {
|
|
55
|
+
const redacted = sanitizeUpstreamErrorText(raw);
|
|
56
|
+
const normalized = redacted.replace(/\s+/g, " ").trim();
|
|
57
|
+
return sanitizeUpstreamErrorText(normalized).slice(0, 300);
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/** `conclusiveOnly` admits only {@link isConclusiveAccountBan}, the Cloud Code Assist default. */
|
|
61
|
+
export async function permanentAccountRefusalEvidence(
|
|
62
|
+
response: Response, signal?: AbortSignal, conclusiveOnly = false, firstPartyCloudCodeSend = false,
|
|
63
|
+
): Promise<PermanentAccountRefusalEvidence | undefined> {
|
|
34
64
|
if (response.status !== 401 && response.status !== 403) return;
|
|
35
65
|
try {
|
|
36
66
|
const body = await readBoundedResponseBody(response.clone(), { signal, fatalUtf8: true,
|
|
37
67
|
maxBytes: 16_384, totalTimeoutMs: 250, inactivityTimeoutMs: 250 });
|
|
38
68
|
if (!body.displaySafe || body.truncated) return;
|
|
39
|
-
|
|
69
|
+
const payload: unknown = JSON.parse(body.text);
|
|
70
|
+
const conclusiveBan = (conclusiveOnly || firstPartyCloudCodeSend) && isConclusiveAccountBan(response.status, payload);
|
|
71
|
+
const reason = conclusiveBan ? "account_permission_denied"
|
|
72
|
+
: conclusiveOnly ? undefined : classifyPermanentAccountRefusal(response.status, payload);
|
|
73
|
+
if (!reason) return;
|
|
74
|
+
const error = (payload as { error?: { message?: unknown; details?: unknown } }).error;
|
|
75
|
+
const raw = error?.message;
|
|
76
|
+
const message = typeof raw === "string" ? pauseEvidenceMessage(raw) : "";
|
|
77
|
+
const appeal = firstPartyCloudCodeSend && conclusiveBan ? cloudCodeAppealEvidence(error?.details) : undefined;
|
|
78
|
+
return { reason, statusCode: response.status, ...(message ? { message } : {}), ...appeal };
|
|
40
79
|
} catch { return; }
|
|
41
80
|
}
|
|
42
81
|
|
|
43
|
-
|
|
44
|
-
if (
|
|
45
|
-
const
|
|
46
|
-
|
|
82
|
+
function cloudCodeAppealEvidence(details: unknown): Pick<AccountPauseEvidence, "appealUrl" | "appealText"> | undefined {
|
|
83
|
+
if (!Array.isArray(details)) return;
|
|
84
|
+
for (const candidate of details as unknown[]) {
|
|
85
|
+
if (!candidate || typeof candidate !== "object" || Array.isArray(candidate)) continue;
|
|
86
|
+
const detail = candidate as Record<string, unknown>;
|
|
87
|
+
if (detail["@type"] !== "type.googleapis.com/google.rpc.ErrorInfo"
|
|
88
|
+
|| detail.reason !== "TOS_VIOLATION" || detail.domain !== "cloudcode-pa.googleapis.com") continue;
|
|
89
|
+
if (!detail.metadata || typeof detail.metadata !== "object" || Array.isArray(detail.metadata)) continue;
|
|
90
|
+
const metadata = detail.metadata as Record<string, unknown>;
|
|
91
|
+
const appealUrl = normalizeCloudCodeAppealUrl(metadata.appeal_url);
|
|
92
|
+
if (!appealUrl) continue;
|
|
93
|
+
const appealText = normalizeCloudCodeAppealText(metadata.appeal_url_link_text);
|
|
94
|
+
return { appealUrl, ...(appealText ? { appealText } : {}) };
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
export async function permanentAccountRefusal(response: Response, signal?: AbortSignal, conclusiveOnly = false): Promise<AccountPauseReason | undefined> {
|
|
99
|
+
return (await permanentAccountRefusalEvidence(response, signal, conclusiveOnly))?.reason;
|
|
47
100
|
}
|
|
48
101
|
|
|
49
102
|
type Streak = { incarnation: string; count: number; tail: Promise<unknown>; paused: boolean };
|
|
50
103
|
/** Process-local streaks, serialized in response-arrival order, including asynchronous reads/writes. */
|
|
51
104
|
export class AccountRefusalStreaks {
|
|
52
105
|
private readonly accounts = new Map<string, Streak>();
|
|
53
|
-
observe(key: string, incarnation: string, threshold: number, verdict: Promise<
|
|
54
|
-
current: () => boolean, pause: (
|
|
106
|
+
observe(key: string, incarnation: string, threshold: number, verdict: Promise<PermanentAccountRefusalEvidence | undefined>, success: boolean,
|
|
107
|
+
current: () => boolean, pause: (refusal: PermanentAccountRefusalEvidence) => Promise<boolean>): Promise<boolean> {
|
|
55
108
|
if (!current()) return Promise.resolve(false);
|
|
56
109
|
let streak = this.accounts.get(key);
|
|
57
110
|
if (!streak || streak.incarnation !== incarnation) {
|
|
@@ -62,13 +115,13 @@ export class AccountRefusalStreaks {
|
|
|
62
115
|
}
|
|
63
116
|
const owned = streak;
|
|
64
117
|
const result = owned.tail.catch(() => undefined).then(async () => {
|
|
65
|
-
const
|
|
118
|
+
const refusal = await verdict;
|
|
66
119
|
if (this.accounts.get(key) !== owned || owned.paused || !current()) return false;
|
|
67
120
|
if (success) { owned.count = 0; return false; }
|
|
68
|
-
if (!
|
|
121
|
+
if (!refusal) return false;
|
|
69
122
|
owned.count = Math.min(owned.count + 1, threshold);
|
|
70
123
|
if (owned.count < threshold) return false;
|
|
71
|
-
owned.paused = await pause(
|
|
124
|
+
owned.paused = await pause(refusal);
|
|
72
125
|
return owned.paused;
|
|
73
126
|
});
|
|
74
127
|
owned.tail = result;
|