@bitkyc08/opencodex 2.100.5 → 2.100.6-preview.20261119.1
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-D5qUBOoF.js +60 -0
- package/gui/dist/assets/Tray-DMwQSAli.js +1 -0
- package/gui/dist/assets/brand-mark-ycThul7d.js +1 -0
- package/gui/dist/assets/index-Bp_GaFFu.js +138 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-BLUW2Fb1.js} +1 -1
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/App-D39mkP2w.js +59 -0
- package/gui/dist/classic/assets/Tray-nUmdL7K9.js +1 -0
- package/gui/dist/classic/assets/index-BJ4uxZk0.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-DFoYm2RY.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
|
@@ -0,0 +1,340 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* agy CLI: a marked shell function per profile that exports the AGY_LLM_GATEWAY_* variables for agy only.
|
|
3
|
+
* No agy settings file is changed. Idea follows Magpie (MIT, (c) yetone), internal/agent/agy.go.
|
|
4
|
+
*/
|
|
5
|
+
import { existsSync } from "node:fs";
|
|
6
|
+
import { basename, dirname, join, relative, sep } from "node:path";
|
|
7
|
+
import { redactUserPath } from "../../lib/redact";
|
|
8
|
+
import {
|
|
9
|
+
adminGatewayOverride, assertClientSize, checkedClientDestination, clientRefusal, dropStash, envGatewayOverride,
|
|
10
|
+
inspectClientFile, inspectStashPresence, isRestoreFile, mkdirTracked, mutateClient, readClientFile, readStash,
|
|
11
|
+
removeCreatedClientFile, rmdirsIfEmpty, sha256, writeClientFile, writeStash, type ClientFile,
|
|
12
|
+
} from "./io";
|
|
13
|
+
import { gatewayNote, type GatewayClientConnector, type GatewayClientContext, type GatewayClientResult, type GatewayClientStatus, type GatewayTarget } from "./types";
|
|
14
|
+
|
|
15
|
+
const ID = "agy";
|
|
16
|
+
const START = "# >>> opencodex agy >>>";
|
|
17
|
+
const END = "# <<< opencodex agy <<<";
|
|
18
|
+
type Kind = "posix" | "powershell";
|
|
19
|
+
/** `pathWiseOnly`: the user edited the profile while connected, so disconnect removes only the block. */
|
|
20
|
+
interface Entry {
|
|
21
|
+
path: string;
|
|
22
|
+
kind: Kind;
|
|
23
|
+
resolvedPath?: string;
|
|
24
|
+
originalBytes: string | null;
|
|
25
|
+
createdDirs: string[];
|
|
26
|
+
writtenSha256: string;
|
|
27
|
+
pendingSha256?: string;
|
|
28
|
+
restoredSha256?: string;
|
|
29
|
+
pathWiseOnly?: true;
|
|
30
|
+
}
|
|
31
|
+
interface Stash { version: 1; files: Entry[] }
|
|
32
|
+
|
|
33
|
+
const posixQuote = (v: string) => `'${v.replace(/'/g, "'\\''")}'`;
|
|
34
|
+
const psQuote = (v: string) => `'${v.replace(/'/g, "''")}'`;
|
|
35
|
+
|
|
36
|
+
export function agyBlock(kind: Kind, target: GatewayTarget): string {
|
|
37
|
+
if (kind === "posix") {
|
|
38
|
+
return [START, `agy() { AGY_LLM_GATEWAY_URL=${posixQuote(target.url)} AGY_LLM_GATEWAY_API_KEY=${posixQuote(target.apiKey)} AGY_LLM_GATEWAY_WIRE_PROTOCOL='genai' command agy "$@"; }`, END].join("\n");
|
|
39
|
+
}
|
|
40
|
+
return [
|
|
41
|
+
START,
|
|
42
|
+
"function agy {",
|
|
43
|
+
" $real = Get-Command agy -CommandType Application -ErrorAction SilentlyContinue | Select-Object -First 1",
|
|
44
|
+
" if (-not $real) { Write-Error 'agy was not found on PATH'; return }",
|
|
45
|
+
" $names = 'AGY_LLM_GATEWAY_URL', 'AGY_LLM_GATEWAY_API_KEY', 'AGY_LLM_GATEWAY_WIRE_PROTOCOL'",
|
|
46
|
+
" $saved = @{}",
|
|
47
|
+
" foreach ($n in $names) { $saved[$n] = [Environment]::GetEnvironmentVariable($n, 'Process') }",
|
|
48
|
+
` $env:AGY_LLM_GATEWAY_URL = ${psQuote(target.url)}`,
|
|
49
|
+
` $env:AGY_LLM_GATEWAY_API_KEY = ${psQuote(target.apiKey)}`,
|
|
50
|
+
" $env:AGY_LLM_GATEWAY_WIRE_PROTOCOL = 'genai'",
|
|
51
|
+
" try { & $real @args } finally { foreach ($n in $names) { [Environment]::SetEnvironmentVariable($n, $saved[$n], 'Process') } }",
|
|
52
|
+
"}",
|
|
53
|
+
END,
|
|
54
|
+
].join("\n");
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
type Profile = Pick<Entry, "path" | "kind">;
|
|
58
|
+
|
|
59
|
+
function candidates(ctx: GatewayClientContext): Profile[] {
|
|
60
|
+
const win = ctx.platform === "win32";
|
|
61
|
+
const bash: Profile = { path: join(ctx.home, ".bashrc"), kind: "posix" };
|
|
62
|
+
const posix: Profile[] = win ? [bash] : [bash, { path: join(ctx.home, ".zshrc"), kind: "posix" }];
|
|
63
|
+
const powershell = "Microsoft.PowerShell_profile.ps1";
|
|
64
|
+
const ps7 = win ? join(ctx.home, "Documents", "PowerShell", powershell) : join(ctx.home, ".config", "powershell", powershell);
|
|
65
|
+
const ps: Profile[] = [{ path: ps7, kind: "powershell" }];
|
|
66
|
+
if (win) ps.push({ path: join(ctx.home, "Documents", "WindowsPowerShell", powershell), kind: "powershell" });
|
|
67
|
+
return [...posix, ...ps];
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
/** Existing profiles, plus the active shell's profile when it needs to be created. */
|
|
71
|
+
function targets(ctx: GatewayClientContext, available: Profile[]): Profile[] {
|
|
72
|
+
const posix = available.filter(({ kind, path }) => kind === "posix" && existsSync(path));
|
|
73
|
+
const ps = available.filter(({ kind, path }) => kind === "powershell" && existsSync(path));
|
|
74
|
+
if (ctx.platform === "win32") {
|
|
75
|
+
if (ps.length === 0) ps.push(available[1]!);
|
|
76
|
+
} else {
|
|
77
|
+
const shell = basename(ctx.env.SHELL ?? "");
|
|
78
|
+
const selected = available[shell === "zsh" ? 1 : 0]!;
|
|
79
|
+
if ((posix.length === 0 || shell === "zsh" || shell === "bash") && !posix.includes(selected)) posix.push(selected);
|
|
80
|
+
}
|
|
81
|
+
return [...posix, ...ps];
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
function allowedProfilePaths(available: Profile[], kind: Kind): string[] {
|
|
85
|
+
return available.filter(profile => profile.kind === kind).map(profile => profile.path);
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
function checkedStash(ctx: GatewayClientContext): Stash | null {
|
|
89
|
+
const stash = readStash<Stash>(ctx, ID);
|
|
90
|
+
if (!stash) return null;
|
|
91
|
+
const allowed = new Map(candidates(ctx).map(({ path, kind }) => [path, kind]));
|
|
92
|
+
if (!Array.isArray(stash.files) || stash.files.some(entry =>
|
|
93
|
+
!entry || allowed.get(entry.path) !== entry.kind || !allowed.delete(entry.path)
|
|
94
|
+
|| !isRestoreFile(ctx.home, entry.path, entry))) {
|
|
95
|
+
throw new Error("agy restore record names an invalid shell profile");
|
|
96
|
+
}
|
|
97
|
+
return stash;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
function assertSameTarget(entry: Entry | undefined, target: string | undefined): void {
|
|
101
|
+
if (target && entry?.resolvedPath && entry.resolvedPath !== target) {
|
|
102
|
+
throw new Error(`agy profile now resolves to a different file: ${entry.path}`);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
const recordedHash = (entry: Entry, current: string): boolean =>
|
|
107
|
+
entry.writtenSha256 === current || entry.pendingSha256 === current;
|
|
108
|
+
|
|
109
|
+
const MARKER_LINE = new RegExp(`(?:^\uFEFF?|\n)(${START}|${END})(?=\r?\n|$)`, "g");
|
|
110
|
+
|
|
111
|
+
// Markerless text alone cannot prove removal: even a bare gateway URL can remain.
|
|
112
|
+
function matchesRestoredProfile(entry: Entry, file: ClientFile): boolean {
|
|
113
|
+
return entry.restoredSha256 === file.hash
|
|
114
|
+
|| (entry.originalBytes !== null && file.bytes.equals(Buffer.from(entry.originalBytes, "base64")));
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
type BlockSpan = { start: number; end: number };
|
|
118
|
+
function blockSpan(text: string): BlockSpan | "malformed" | null {
|
|
119
|
+
const markers = text.matchAll(MARKER_LINE);
|
|
120
|
+
const first = markers.next().value;
|
|
121
|
+
if (!first) return null;
|
|
122
|
+
const last = markers.next().value;
|
|
123
|
+
if (first[1] !== START || last?.[1] !== END || !markers.next().done) return "malformed";
|
|
124
|
+
const start = first.index + first[0].length - START.length;
|
|
125
|
+
let end = last.index + last[0].length;
|
|
126
|
+
if (text.startsWith("\r\n", end)) end += 2; else if (text[end] === "\n") end += 1;
|
|
127
|
+
return { start, end };
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
function profileRestoreRefusal(ctx: GatewayClientContext, path: string): GatewayClientResult {
|
|
131
|
+
const profilePath = redactUserPath(`~/${relative(ctx.home, path).split(sep).join("/")}`);
|
|
132
|
+
const message = `OpenCodex could not verify the agy profile at ${profilePath}. Restore the complete marked agy block or the saved original profile, then retry.`;
|
|
133
|
+
return { ...clientRefusal(message, "agy-profile-restore-required"), profilePath };
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
type Encoding = "utf8" | "utf16le";
|
|
137
|
+
const UTF16LE_BOM = Buffer.from([0xff, 0xfe]);
|
|
138
|
+
const strictUtf8 = new TextDecoder("utf-8", { fatal: true, ignoreBOM: true });
|
|
139
|
+
/** Profile text and how to write it back; null for an encoding we cannot round-trip (UTF-16BE, UTF-32, ANSI). */
|
|
140
|
+
function decode(bytes: Buffer): { text: string; encoding: Encoding } | null {
|
|
141
|
+
if (bytes.length >= 2 && bytes[0] === 0xfe && bytes[1] === 0xff) return null;
|
|
142
|
+
if (bytes.length >= 2 && bytes[0] === 0xff && bytes[1] === 0xfe) {
|
|
143
|
+
// Windows PowerShell 5.1 redirection writes UTF-16LE with a BOM; FF FE 00 00 is UTF-32LE.
|
|
144
|
+
if (bytes.length >= 4 && bytes[2] === 0 && bytes[3] === 0) return null;
|
|
145
|
+
return bytes.length % 2 === 0 ? { text: bytes.subarray(2).toString("utf16le"), encoding: "utf16le" } : null;
|
|
146
|
+
}
|
|
147
|
+
if (bytes.includes(0)) return null;
|
|
148
|
+
try { return { text: strictUtf8.decode(bytes), encoding: "utf8" }; } catch { return null; }
|
|
149
|
+
}
|
|
150
|
+
const encode = (text: string, encoding: Encoding): Buffer =>
|
|
151
|
+
encoding === "utf16le" ? Buffer.concat([UTF16LE_BOM, Buffer.from(text, "utf16le")]) : Buffer.from(text);
|
|
152
|
+
|
|
153
|
+
const eolOf = (text: string) => (text.includes("\r\n") ? "\r\n" : "\n");
|
|
154
|
+
const withBlock = (text: string, block: string, span: BlockSpan | null): string => {
|
|
155
|
+
const eol = eolOf(text);
|
|
156
|
+
const b = block.replace(/\n/g, eol) + eol;
|
|
157
|
+
if (span) return text.slice(0, span.start) + b + text.slice(span.end);
|
|
158
|
+
if (text === "") return b;
|
|
159
|
+
let head = text;
|
|
160
|
+
if (!/\n$/.test(head)) head += eol;
|
|
161
|
+
if (!/(\r?\n){2}$/.test(head)) head += eol;
|
|
162
|
+
return head + b;
|
|
163
|
+
};
|
|
164
|
+
function blockIn(text: string): string | null {
|
|
165
|
+
const span = blockSpan(text);
|
|
166
|
+
return span && span !== "malformed" ? text.slice(span.start, span.end).replace(/\r\n/g, "\n").replace(/\n$/, "") : null;
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
function status(ctx: GatewayClientContext, target?: GatewayTarget): GatewayClientStatus {
|
|
170
|
+
const hasRecord = inspectStashPresence(ctx, ID);
|
|
171
|
+
const available = candidates(ctx);
|
|
172
|
+
const files = targets(ctx, available);
|
|
173
|
+
let withBlocks = 0;
|
|
174
|
+
let current = 0;
|
|
175
|
+
let unreadable = false;
|
|
176
|
+
const rows: GatewayClientStatus["files"] = [];
|
|
177
|
+
for (const { path, kind } of files) {
|
|
178
|
+
const file = inspectClientFile(ctx, path, allowedProfilePaths(available, kind));
|
|
179
|
+
const decoded = file ? decode(file.bytes) : null;
|
|
180
|
+
unreadable ||= file === undefined || (file !== null && decoded === null);
|
|
181
|
+
const block = decoded ? blockIn(decoded.text) : null;
|
|
182
|
+
if (block !== null) { withBlocks++; if (!target || block === agyBlock(kind, target)) current++; }
|
|
183
|
+
rows.push({ path, role: kind === "posix" ? "shell profile" : "PowerShell profile", exists: file !== null });
|
|
184
|
+
}
|
|
185
|
+
const state = withBlocks > 0 && current === files.length ? "connected" : withBlocks > 0 || hasRecord || unreadable ? "drifted" : "disconnected";
|
|
186
|
+
const overrides: GatewayClientStatus["overrides"] = [];
|
|
187
|
+
const admin = adminGatewayOverride(ctx);
|
|
188
|
+
if (admin) overrides.push(admin);
|
|
189
|
+
const env = envGatewayOverride(ctx, target?.url);
|
|
190
|
+
if (env) overrides.push(env);
|
|
191
|
+
const notes = [gatewayNote("new-terminal"), gatewayNote("agy-version")];
|
|
192
|
+
if (ctx.platform === "win32") notes.push(gatewayNote("windows-unverified"));
|
|
193
|
+
if (ctx.env.AGY_LLM_GATEWAY_URL?.trim()) notes.push(gatewayNote("agy-env-exported"));
|
|
194
|
+
return { id: ID, label: "agy CLI", state, files: rows, overrides, notes };
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
function connect(ctx: GatewayClientContext, target: GatewayTarget): GatewayClientResult {
|
|
198
|
+
const old = checkedStash(ctx);
|
|
199
|
+
const entries = new Map(old?.files.map(entry => [entry.path, entry]));
|
|
200
|
+
const available = candidates(ctx);
|
|
201
|
+
const profiles = targets(ctx, available).sort((a, b) => Number(entries.has(b.path)) - Number(entries.has(a.path)));
|
|
202
|
+
const seen = new Set<string>();
|
|
203
|
+
const selected = new Set(profiles.map(profile => profile.path));
|
|
204
|
+
const trackedOnly = [...entries.values()].filter(entry => !selected.has(entry.path));
|
|
205
|
+
const checked: (Profile & { file: ClientFile | null; allowedPaths: string[]; text: string; encoding: Encoding; span: BlockSpan | null })[] = [];
|
|
206
|
+
for (const profile of [...profiles, ...trackedOnly]) {
|
|
207
|
+
const { path, kind } = profile;
|
|
208
|
+
const allowedPaths = allowedProfilePaths(available, kind);
|
|
209
|
+
const file = readClientFile(ctx, path, allowedPaths);
|
|
210
|
+
const prev = entries.get(path);
|
|
211
|
+
assertSameTarget(prev, file?.target);
|
|
212
|
+
if (file && seen.has(file.target)) continue;
|
|
213
|
+
if (file) seen.add(file.target);
|
|
214
|
+
const decoded = file ? decode(file.bytes) : { text: "", encoding: "utf8" as const };
|
|
215
|
+
if (!decoded) return clientRefusal(`${path} is not UTF-8 or BOM-prefixed UTF-16LE text.`, "unsupported-file");
|
|
216
|
+
const span = blockSpan(decoded.text);
|
|
217
|
+
if (span === "malformed" || (!span && prev && file && !matchesRestoredProfile(prev, file))) {
|
|
218
|
+
return prev ? profileRestoreRefusal(ctx, path)
|
|
219
|
+
: clientRefusal("An agy profile has incomplete or ambiguous block markers.", "unsupported-file");
|
|
220
|
+
}
|
|
221
|
+
if (selected.has(path)) checked.push({ path, kind, file, allowedPaths, ...decoded, span });
|
|
222
|
+
}
|
|
223
|
+
const changedFiles: string[] = [];
|
|
224
|
+
const staged = checked.map(({ path, kind, file, allowedPaths, text, encoding, span }) => {
|
|
225
|
+
const prev = entries.get(path);
|
|
226
|
+
const out = encode(withBlock(text, agyBlock(kind, target), span), encoding);
|
|
227
|
+
assertClientSize(out);
|
|
228
|
+
const keep = prev !== undefined && file !== null && span !== null;
|
|
229
|
+
const drifted = keep && (prev.pathWiseOnly === true || !recordedHash(prev, file.hash));
|
|
230
|
+
const entry: Entry = {
|
|
231
|
+
path, kind, originalBytes: keep ? prev.originalBytes : file?.bytes.toString("base64") ?? null,
|
|
232
|
+
createdDirs: prev?.createdDirs ?? [], writtenSha256: file?.hash ?? "",
|
|
233
|
+
pendingSha256: sha256(out),
|
|
234
|
+
...(drifted ? { pathWiseOnly: true } : {}),
|
|
235
|
+
};
|
|
236
|
+
return { entry, file, out, allowedPaths };
|
|
237
|
+
});
|
|
238
|
+
try {
|
|
239
|
+
for (const { entry, file, allowedPaths } of staged) {
|
|
240
|
+
entry.resolvedPath = checkedClientDestination(ctx, entry.path, file, allowedPaths);
|
|
241
|
+
assertSameTarget(entries.get(entry.path), entry.resolvedPath);
|
|
242
|
+
entry.createdDirs = [...entry.createdDirs, ...mkdirTracked(dirname(entry.path))];
|
|
243
|
+
entries.set(entry.path, entry);
|
|
244
|
+
}
|
|
245
|
+
writeStash(ctx, ID, { version: 1, files: [...entries.values()] } satisfies Stash);
|
|
246
|
+
for (const { entry, file, out, allowedPaths } of staged) {
|
|
247
|
+
if (file?.hash === entry.pendingSha256) continue;
|
|
248
|
+
writeClientFile(ctx, entry.path, file, out, allowedPaths);
|
|
249
|
+
changedFiles.push(entry.path);
|
|
250
|
+
}
|
|
251
|
+
} catch (error) {
|
|
252
|
+
return clientRefusal(`Could not update the shell profiles: ${(error as Error).message}`, "io-error", changedFiles);
|
|
253
|
+
}
|
|
254
|
+
// The journal already recognises both the previous and written bytes. Promotion is optional.
|
|
255
|
+
for (const { entry } of staged) {
|
|
256
|
+
entry.writtenSha256 = entry.pendingSha256!;
|
|
257
|
+
delete entry.pendingSha256;
|
|
258
|
+
}
|
|
259
|
+
try { writeStash(ctx, ID, { version: 1, files: [...entries.values()] } satisfies Stash); }
|
|
260
|
+
catch { /* pending stays recognisable */ }
|
|
261
|
+
return { ok: true, changed: changedFiles.length > 0, changedFiles, message: "The agy command now starts on the OpenCodex gateway. Open a new terminal to use it.", notes: status(ctx, target).notes };
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
function disconnect(ctx: GatewayClientContext): GatewayClientResult {
|
|
265
|
+
const stash = checkedStash(ctx);
|
|
266
|
+
const available = candidates(ctx);
|
|
267
|
+
const entries = new Map(stash?.files.map(entry => [entry.path, entry]));
|
|
268
|
+
// Prefer journaled entries so an untracked alias cannot turn an exact restore into a block removal.
|
|
269
|
+
const profiles = [...entries.values(), ...targets(ctx, available).filter(({ path }) => !entries.has(path))];
|
|
270
|
+
const seen = new Set<string>();
|
|
271
|
+
const changes: { path: string; apply: () => void }[] = [];
|
|
272
|
+
let journalRestore = false;
|
|
273
|
+
const createdDirs: string[] = [];
|
|
274
|
+
let pathWise = false;
|
|
275
|
+
for (const { path, kind } of profiles) {
|
|
276
|
+
const entry = entries.get(path);
|
|
277
|
+
const allowedPaths = allowedProfilePaths(available, kind);
|
|
278
|
+
const file = entry ? readClientFile(ctx, path, allowedPaths) : inspectClientFile(ctx, path, allowedPaths);
|
|
279
|
+
assertSameTarget(entry, file?.target);
|
|
280
|
+
if (!file) {
|
|
281
|
+
if (entry) createdDirs.push(...entry.createdDirs);
|
|
282
|
+
continue;
|
|
283
|
+
}
|
|
284
|
+
if (seen.has(file.target)) continue;
|
|
285
|
+
seen.add(file.target);
|
|
286
|
+
if (entry && !entry.pathWiseOnly && recordedHash(entry, file.hash)) {
|
|
287
|
+
if (entry.originalBytes === null) {
|
|
288
|
+
changes.push({ path, apply: () => removeCreatedClientFile(ctx, path, file, allowedPaths) });
|
|
289
|
+
createdDirs.push(...entry.createdDirs);
|
|
290
|
+
} else {
|
|
291
|
+
const bytes = Buffer.from(entry.originalBytes, "base64");
|
|
292
|
+
assertClientSize(bytes);
|
|
293
|
+
if (!bytes.equals(file.bytes)) changes.push({ path, apply: () => writeClientFile(ctx, path, file, bytes, allowedPaths) });
|
|
294
|
+
}
|
|
295
|
+
continue;
|
|
296
|
+
}
|
|
297
|
+
const decoded = decode(file.bytes);
|
|
298
|
+
if (!decoded && entry) return clientRefusal(`${path} uses an unsupported encoding. The restore record was kept.`, "unsupported-file");
|
|
299
|
+
if (!decoded) continue;
|
|
300
|
+
const { text, encoding } = decoded;
|
|
301
|
+
const span = blockSpan(text);
|
|
302
|
+
if (!span || span === "malformed") {
|
|
303
|
+
if (entry && (span === "malformed" || !matchesRestoredProfile(entry, file))) return profileRestoreRefusal(ctx, path);
|
|
304
|
+
continue;
|
|
305
|
+
}
|
|
306
|
+
const bytes = encode(text.slice(0, span.start) + text.slice(span.end), encoding);
|
|
307
|
+
if (entry) {
|
|
308
|
+
entry.restoredSha256 = sha256(bytes);
|
|
309
|
+
journalRestore = true;
|
|
310
|
+
}
|
|
311
|
+
changes.push({ path, apply: () => writeClientFile(ctx, path, file, bytes, allowedPaths) });
|
|
312
|
+
pathWise = true;
|
|
313
|
+
}
|
|
314
|
+
|
|
315
|
+
const changedFiles: string[] = [];
|
|
316
|
+
try {
|
|
317
|
+
// If a later write fails, a retry can verify profiles already restored path-wise.
|
|
318
|
+
if (journalRestore) writeStash(ctx, ID, { version: 1, files: [...entries.values()] } satisfies Stash);
|
|
319
|
+
for (const { path, apply } of changes) {
|
|
320
|
+
apply();
|
|
321
|
+
changedFiles.push(path);
|
|
322
|
+
}
|
|
323
|
+
rmdirsIfEmpty(ctx, createdDirs);
|
|
324
|
+
if (stash) dropStash(ctx, ID);
|
|
325
|
+
} catch (error) {
|
|
326
|
+
return clientRefusal(`Could not restore the shell profiles: ${(error as Error).message}`, "io-error", changedFiles);
|
|
327
|
+
}
|
|
328
|
+
if (!changedFiles.length) return { ok: true, changed: false, changedFiles, restore: "none", message: "No shell profile changes were needed.", notes: [] };
|
|
329
|
+
return {
|
|
330
|
+
ok: true, changed: true, changedFiles, restore: pathWise ? "path-wise" : "exact",
|
|
331
|
+
message: pathWise ? "Removed the OpenCodex agy block; the rest of each edited profile was kept as it is." : "Shell profiles restored byte for byte.",
|
|
332
|
+
notes: [gatewayNote("new-terminal")],
|
|
333
|
+
};
|
|
334
|
+
}
|
|
335
|
+
|
|
336
|
+
export const AGY_CONNECTOR: GatewayClientConnector = {
|
|
337
|
+
id: ID, label: "agy CLI", status,
|
|
338
|
+
connect: (ctx, target) => mutateClient(ctx, () => connect(ctx, target)),
|
|
339
|
+
disconnect: ctx => mutateClient(ctx, () => disconnect(ctx)),
|
|
340
|
+
};
|
|
@@ -0,0 +1,224 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Antigravity desktop app (2.15+): ~/.antigravity/settings.json "gateway" block.
|
|
3
|
+
* Field facts and the stash-and-restore idea follow Magpie (MIT, (c) yetone), internal/agent/antigravity.go.
|
|
4
|
+
*/
|
|
5
|
+
import { join } from "node:path";
|
|
6
|
+
import {
|
|
7
|
+
GATEWAY_PLACEHOLDER_KEY, adminGatewayOverride, dropStash, envGatewayOverride, mkdirTracked, normalizeUrl,
|
|
8
|
+
assertClientSize, checkedClientDestination, clientRefusal, inspectClientFile, inspectStashPresence, isRestoreFile, mutateClient,
|
|
9
|
+
readClientFile, readStash, removeCreatedClientFile, rmdirsIfEmpty, sha256, writeClientFile, writeStash,
|
|
10
|
+
} from "./io";
|
|
11
|
+
import { GATEWAY_NOTE_TEXT, gatewayNote, type GatewayClientConnector, type GatewayClientContext, type GatewayClientResult, type GatewayClientStatus, type GatewayNoteCode, type GatewayTarget } from "./types";
|
|
12
|
+
|
|
13
|
+
type Json = Record<string, unknown>;
|
|
14
|
+
interface Prior { present: boolean; value?: unknown }
|
|
15
|
+
interface Written { written: { gateway: unknown; defaultModelId: string | null }; writtenSha256: string }
|
|
16
|
+
/**
|
|
17
|
+
* `written`/`writtenSha256` is the last state known to be on disk; `pending` is a write that may or may not
|
|
18
|
+
* have landed, journaled before it starts so an interrupted or failed write still leaves both recognisable.
|
|
19
|
+
* `pathWiseOnly`: the user edited the file while connected, so disconnect never restores the old bytes.
|
|
20
|
+
*/
|
|
21
|
+
interface Stash extends Written {
|
|
22
|
+
version: 1;
|
|
23
|
+
path: string;
|
|
24
|
+
resolvedPath?: string;
|
|
25
|
+
originalBytes: string | null;
|
|
26
|
+
createdDirs: string[];
|
|
27
|
+
prior: { gateway: Prior; defaultModelId: Prior; list: Prior; modelsPresent: boolean };
|
|
28
|
+
pending?: Written;
|
|
29
|
+
pathWiseOnly?: true;
|
|
30
|
+
}
|
|
31
|
+
const statesOf = (stash: Stash): Written[] => [stash, ...(stash.pending ? [stash.pending] : [])];
|
|
32
|
+
|
|
33
|
+
const ID = "antigravity";
|
|
34
|
+
const BOM = String.fromCharCode(0xfeff);
|
|
35
|
+
const settingsPath = (ctx: GatewayClientContext) => join(ctx.home, ".antigravity", "settings.json");
|
|
36
|
+
const isObj = (v: unknown): v is Json => !!v && typeof v === "object" && !Array.isArray(v);
|
|
37
|
+
const same = (a: unknown, b: unknown) => Bun.deepEquals(a, b, true);
|
|
38
|
+
const prior = (o: Json | undefined, k: string): Prior => o && k in o ? { present: true, value: o[k] } : { present: false };
|
|
39
|
+
|
|
40
|
+
interface Parsed { doc: Json; indent: string | number | undefined; eol: string; trailing: boolean; bom: boolean }
|
|
41
|
+
/** A note code instead of a parse when the file cannot be round-tripped. */
|
|
42
|
+
function parseSettings(bytes: Buffer | null): Parsed | GatewayNoteCode {
|
|
43
|
+
if (!bytes) return { doc: {}, indent: 2, eol: "\n", trailing: true, bom: false };
|
|
44
|
+
let text = bytes.toString("utf8");
|
|
45
|
+
const bom = text.startsWith(BOM);
|
|
46
|
+
if (bom) text = text.slice(1);
|
|
47
|
+
const eol = text.includes("\r\n") ? "\r\n" : "\n";
|
|
48
|
+
let doc: unknown = {};
|
|
49
|
+
if (text.trim() !== "") {
|
|
50
|
+
try { doc = JSON.parse(text); } catch {
|
|
51
|
+
return "settings-not-json";
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
if (!isObj(doc)) return "settings-not-object";
|
|
55
|
+
const m = /\n([ \t]+)\S/.exec(text);
|
|
56
|
+
const indent = m ? m[1] : text.trim().includes("\n") || text.trim().length <= 2 ? 2 : undefined;
|
|
57
|
+
return { doc, indent, eol, trailing: text === "" || /\n\s*$/.test(text), bom };
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
function serialize(p: Parsed): Buffer {
|
|
61
|
+
let text = JSON.stringify(p.doc, null, p.indent);
|
|
62
|
+
if (p.eol === "\r\n") text = text.replace(/\n/g, "\r\n");
|
|
63
|
+
return Buffer.from((p.bom ? BOM : "") + text + (p.trailing ? p.eol : ""));
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
function ours(gw: unknown, target?: GatewayTarget): "match" | "other-url" | "no" {
|
|
67
|
+
if (!isObj(gw) || gw.enabled !== true) return "no";
|
|
68
|
+
if (target && normalizeUrl(gw.url) === normalizeUrl(target.url)) return "match";
|
|
69
|
+
if (!target) return gw.apiKey === GATEWAY_PLACEHOLDER_KEY ? "match" : "no";
|
|
70
|
+
return gw.apiKey === GATEWAY_PLACEHOLDER_KEY ? "other-url" : "no";
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
function status(ctx: GatewayClientContext, target?: GatewayTarget): GatewayClientStatus {
|
|
74
|
+
const path = settingsPath(ctx);
|
|
75
|
+
const file = inspectClientFile(ctx, path);
|
|
76
|
+
const parsed = parseSettings(file?.bytes ?? null);
|
|
77
|
+
const gw = typeof parsed === "string" ? undefined : parsed.doc.gateway;
|
|
78
|
+
const hasRecord = inspectStashPresence(ctx, ID);
|
|
79
|
+
const match = ours(gw, target) === "match";
|
|
80
|
+
const state = match ? "connected" : hasRecord || file === undefined ? "drifted" : "disconnected";
|
|
81
|
+
const overrides: GatewayClientStatus["overrides"] = [];
|
|
82
|
+
const admin = adminGatewayOverride(ctx);
|
|
83
|
+
if (admin) overrides.push(admin);
|
|
84
|
+
const env = envGatewayOverride(ctx, target?.url);
|
|
85
|
+
if (env) overrides.push(env);
|
|
86
|
+
const notes = (["restart-app", "no-google-sign-in", "agy-follows-app"] as GatewayNoteCode[]).map(gatewayNote);
|
|
87
|
+
if (typeof parsed === "string") notes.push(gatewayNote(parsed));
|
|
88
|
+
if (match && !hasRecord) notes.push(gatewayNote("no-restore-record"));
|
|
89
|
+
const models = typeof parsed === "string" || !isObj(parsed.doc.models) ? undefined : parsed.doc.models;
|
|
90
|
+
const defaultModel = typeof models?.defaultModelId === "string" ? models.defaultModelId : undefined;
|
|
91
|
+
return { id: ID, label: "Antigravity", state, files: [{ path, role: "user settings", exists: file !== null }], overrides, notes, ...(defaultModel ? { defaultModel } : {}) };
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
function checkedStash(ctx: GatewayClientContext, path: string): Stash | null {
|
|
95
|
+
const stash = readStash<Stash>(ctx, ID);
|
|
96
|
+
if (stash && (stash.path !== path || !isRestoreFile(ctx.home, path, stash))) {
|
|
97
|
+
throw new Error("Antigravity restore record does not name the expected settings file");
|
|
98
|
+
}
|
|
99
|
+
return stash;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
function assertSameTarget(stash: Stash | null, target: string | undefined): void {
|
|
103
|
+
if (target && stash?.resolvedPath && stash.resolvedPath !== target) {
|
|
104
|
+
throw new Error("Antigravity settings now resolve to a different file");
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
function connect(ctx: GatewayClientContext, target: GatewayTarget): GatewayClientResult {
|
|
109
|
+
const path = settingsPath(ctx);
|
|
110
|
+
const file = readClientFile(ctx, path);
|
|
111
|
+
const bytes = file?.bytes ?? null;
|
|
112
|
+
const parsed = parseSettings(bytes);
|
|
113
|
+
if (typeof parsed === "string") return clientRefusal(GATEWAY_NOTE_TEXT[parsed], "unsupported-file");
|
|
114
|
+
const { doc } = parsed;
|
|
115
|
+
let stash = checkedStash(ctx, path);
|
|
116
|
+
assertSameTarget(stash, file?.target);
|
|
117
|
+
const keep = stash !== null && ours(doc.gateway, undefined) === "match";
|
|
118
|
+
const onDisk = keep && file ? statesOf(stash!).find(st => st.writtenSha256 === file.hash) : undefined;
|
|
119
|
+
const models = isObj(doc.models) ? doc.models : undefined;
|
|
120
|
+
const dir = join(ctx.home, ".antigravity");
|
|
121
|
+
const resolvedPath = checkedClientDestination(ctx, path, file);
|
|
122
|
+
assertSameTarget(stash, resolvedPath);
|
|
123
|
+
const newDirs = mkdirTracked(dir);
|
|
124
|
+
if (!keep) {
|
|
125
|
+
stash = {
|
|
126
|
+
version: 1, path, resolvedPath, originalBytes: bytes ? bytes.toString("base64") : null, createdDirs: [...(stash?.createdDirs ?? []), ...newDirs],
|
|
127
|
+
prior: { gateway: prior(doc, "gateway"), defaultModelId: prior(models, "defaultModelId"), list: prior(models, "list"), modelsPresent: models !== undefined },
|
|
128
|
+
// Until the new bytes land, the file on disk is the original; exact restoration of it is a no-op.
|
|
129
|
+
written: { gateway: null, defaultModelId: null }, writtenSha256: file?.hash ?? "",
|
|
130
|
+
};
|
|
131
|
+
} else {
|
|
132
|
+
// A file that matches neither the applied nor the pending write was edited by the user.
|
|
133
|
+
const base = onDisk ?? stash!;
|
|
134
|
+
const pending = onDisk ? undefined : stash!.pending?.written;
|
|
135
|
+
const written = {
|
|
136
|
+
gateway: pending && same(doc.gateway, pending.gateway) ? pending.gateway : base.written.gateway,
|
|
137
|
+
defaultModelId: pending && models?.defaultModelId === pending.defaultModelId
|
|
138
|
+
? pending.defaultModelId : base.written.defaultModelId,
|
|
139
|
+
};
|
|
140
|
+
stash = { ...stash!, resolvedPath, written, writtenSha256: base.writtenSha256, ...(stash!.pathWiseOnly || !onDisk ? { pathWiseOnly: true as const } : {}) };
|
|
141
|
+
delete stash.pending;
|
|
142
|
+
}
|
|
143
|
+
const gateway = { enabled: true, url: target.url, apiKey: target.apiKey, wireProtocol: "openai" };
|
|
144
|
+
doc.gateway = gateway;
|
|
145
|
+
if (target.defaultModel || models?.list !== undefined) {
|
|
146
|
+
const m: Json = models ?? {};
|
|
147
|
+
if (target.defaultModel) m.defaultModelId = target.defaultModel;
|
|
148
|
+
delete m.list;
|
|
149
|
+
doc.models = m;
|
|
150
|
+
}
|
|
151
|
+
const out = serialize(parsed);
|
|
152
|
+
const outSha = sha256(out);
|
|
153
|
+
const next = stash as Stash;
|
|
154
|
+
const applied: Written = { written: { gateway, defaultModelId: target.defaultModel ?? (keep ? next.written.defaultModelId : null) }, writtenSha256: outSha };
|
|
155
|
+
assertClientSize(out);
|
|
156
|
+
writeStash(ctx, ID, { ...next, pending: applied });
|
|
157
|
+
writeClientFile(ctx, path, file, out);
|
|
158
|
+
// The settings are applied; if this promotion fails, the journaled pending state still describes them.
|
|
159
|
+
try { writeStash(ctx, ID, { ...next, ...applied }); } catch { /* pending stays recognisable */ }
|
|
160
|
+
const unchanged = file?.hash === outSha;
|
|
161
|
+
return { ok: true, changed: !unchanged, changedFiles: unchanged ? [] : [path], message: "Antigravity now uses the OpenCodex gateway. Restart Antigravity to apply it.", notes: status(ctx, target).notes };
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
function disconnect(ctx: GatewayClientContext): GatewayClientResult {
|
|
165
|
+
const path = settingsPath(ctx);
|
|
166
|
+
const stash = checkedStash(ctx, path);
|
|
167
|
+
if (!stash) return { ok: true, changed: false, changedFiles: [], restore: "none", message: "Not connected by OpenCodex; nothing was changed.", notes: [] };
|
|
168
|
+
const file = readClientFile(ctx, path);
|
|
169
|
+
assertSameTarget(stash, file?.target);
|
|
170
|
+
const done = (restore: "exact" | "path-wise" | "none", message: string, files: string[]): GatewayClientResult => {
|
|
171
|
+
try { dropStash(ctx, ID); }
|
|
172
|
+
catch (error) { return clientRefusal(`Could not remove the Antigravity restore record: ${(error as Error).message}`, "io-error", files); }
|
|
173
|
+
return { ok: true, changed: files.length > 0, changedFiles: files, restore, message, notes: [gatewayNote("restart-app")] };
|
|
174
|
+
};
|
|
175
|
+
const states = statesOf(stash);
|
|
176
|
+
if (file && !stash.pathWiseOnly && states.some(st => st.writtenSha256 === file.hash)) {
|
|
177
|
+
if (stash.originalBytes === null) { removeCreatedClientFile(ctx, path, file); rmdirsIfEmpty(ctx, stash.createdDirs); }
|
|
178
|
+
else writeClientFile(ctx, path, file, Buffer.from(stash.originalBytes, "base64"));
|
|
179
|
+
return done("exact", "Antigravity settings restored byte for byte.", [path]);
|
|
180
|
+
}
|
|
181
|
+
if (!file) return done("none", "The settings file is already gone; the restore record was cleared.", []);
|
|
182
|
+
const parsed = parseSettings(file.bytes);
|
|
183
|
+
if (typeof parsed === "string") return clientRefusal(`${GATEWAY_NOTE_TEXT[parsed]} The restore record was kept.`, "unsupported-file");
|
|
184
|
+
const { doc } = parsed;
|
|
185
|
+
const models = isObj(doc.models) ? doc.models : undefined;
|
|
186
|
+
const saved = stash.prior;
|
|
187
|
+
const writtenModels = states.map(st => st.written.defaultModelId).filter((id): id is string => id !== null);
|
|
188
|
+
const gatewayMatches = states.some(st => st.written.gateway !== null && same(doc.gateway, st.written.gateway));
|
|
189
|
+
const defaultMatches = writtenModels.some(id => models?.defaultModelId === id);
|
|
190
|
+
const listWasRemoved = saved.list.present && (models !== undefined || doc.models === undefined) && models?.list === undefined;
|
|
191
|
+
|
|
192
|
+
// A prior value may already be in place if a previous restore could not remove the record.
|
|
193
|
+
const conflicts: string[] = [];
|
|
194
|
+
if (!gatewayMatches && !same(doc.gateway, saved.gateway.value)) conflicts.push("gateway");
|
|
195
|
+
if (writtenModels.length > 0 && !defaultMatches && !same(models?.defaultModelId, saved.defaultModelId.value)) {
|
|
196
|
+
conflicts.push("models.defaultModelId");
|
|
197
|
+
}
|
|
198
|
+
if (saved.list.present && !listWasRemoved && !same(models?.list, saved.list.value)) conflicts.push("models.list");
|
|
199
|
+
if (conflicts.length) {
|
|
200
|
+
return clientRefusal(`Antigravity settings changed at ${conflicts.join(", ")}. The restore record was kept.`, "unsupported-file");
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
if (gatewayMatches) {
|
|
204
|
+
if (saved.gateway.present) doc.gateway = saved.gateway.value; else delete doc.gateway;
|
|
205
|
+
}
|
|
206
|
+
if (models && defaultMatches) {
|
|
207
|
+
if (saved.defaultModelId.present) models.defaultModelId = saved.defaultModelId.value; else delete models.defaultModelId;
|
|
208
|
+
}
|
|
209
|
+
if (listWasRemoved) {
|
|
210
|
+
const m: Json = models ?? {};
|
|
211
|
+
m.list = saved.list.value;
|
|
212
|
+
doc.models = m;
|
|
213
|
+
}
|
|
214
|
+
const finalModels = isObj(doc.models) ? doc.models : undefined;
|
|
215
|
+
if (finalModels && Object.keys(finalModels).length === 0 && !stash.prior.modelsPresent) delete doc.models;
|
|
216
|
+
writeClientFile(ctx, path, file, serialize(parsed));
|
|
217
|
+
return done("path-wise", `The file changed after OpenCodex wrote it, so only the gateway, models.defaultModelId and models.list entries were restored; your other edits were kept.`, [path]);
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
export const ANTIGRAVITY_CONNECTOR: GatewayClientConnector = {
|
|
221
|
+
id: ID, label: "Antigravity", status,
|
|
222
|
+
connect: (ctx, target) => mutateClient(ctx, () => connect(ctx, target)),
|
|
223
|
+
disconnect: ctx => mutateClient(ctx, () => disconnect(ctx)),
|
|
224
|
+
};
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import { homedir } from "node:os";
|
|
2
|
+
import type { OcxConfig } from "../../types";
|
|
3
|
+
import { assertClientLifecycleHeld, withClientLifecycleSync, type ClientLifecycleHeld } from "../../client/lifecycle-lock";
|
|
4
|
+
import { getConfigDir } from "../../config/paths";
|
|
5
|
+
import { localInferenceDestination } from "../../lib/local-destinations";
|
|
6
|
+
import { AGY_CONNECTOR } from "./agy";
|
|
7
|
+
import { ANTIGRAVITY_CONNECTOR } from "./antigravity";
|
|
8
|
+
import { GATEWAY_PLACEHOLDER_KEY, clientRefusal, hasStash, removeEmptyStashDirectory } from "./io";
|
|
9
|
+
import type { GatewayClientConnector, GatewayClientContext, GatewayClientId, GatewayClientResult, GatewayClientStatus, GatewayTarget } from "./types";
|
|
10
|
+
|
|
11
|
+
export type * from "./types";
|
|
12
|
+
export { GATEWAY_PLACEHOLDER_KEY } from "./io";
|
|
13
|
+
|
|
14
|
+
export const GATEWAY_CLIENTS: Readonly<Record<GatewayClientId, GatewayClientConnector>> = {
|
|
15
|
+
antigravity: ANTIGRAVITY_CONNECTOR,
|
|
16
|
+
agy: AGY_CONNECTOR,
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
export const GATEWAY_CLIENT_IDS = Object.keys(GATEWAY_CLIENTS) as GatewayClientId[];
|
|
20
|
+
export const isGatewayClientId = (value: unknown): value is GatewayClientId =>
|
|
21
|
+
typeof value === "string" && Object.hasOwn(GATEWAY_CLIENTS, value);
|
|
22
|
+
|
|
23
|
+
export function productionGatewayClientContext(): GatewayClientContext {
|
|
24
|
+
return { home: homedir(), platform: process.platform, env: process.env, stateDir: getConfigDir() };
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
export type GatewayTargetResolution = { ok: true; target: GatewayTarget } | { ok: false; code: "requires-admission-token" | "invalid-model"; message: string };
|
|
28
|
+
|
|
29
|
+
/** The URL a local client dials plus a non-secret placeholder key; refuses binds that demand a real credential. */
|
|
30
|
+
export function resolveGatewayTarget(config: Pick<OcxConfig, "hostname" | "unauthenticatedLoopbackListener">, port: number, model?: string): GatewayTargetResolution {
|
|
31
|
+
const destination = localInferenceDestination(config, port);
|
|
32
|
+
if (destination.requiresAdmissionToken) {
|
|
33
|
+
return { ok: false, code: "requires-admission-token", message: `${destination.origin} requires an opencodex data-plane credential, and OpenCodex will not write a real secret into client files. Enable \`unauthenticatedLoopbackListener\` or bind the proxy to loopback.` };
|
|
34
|
+
}
|
|
35
|
+
const defaultModel = model?.trim();
|
|
36
|
+
const hasControlChar = defaultModel !== undefined && [...defaultModel].some((ch) => ch.charCodeAt(0) < 0x20 || ch.charCodeAt(0) === 0x7f);
|
|
37
|
+
if (defaultModel !== undefined && (defaultModel.length === 0 || defaultModel.length > 200 || hasControlChar)) {
|
|
38
|
+
return { ok: false, code: "invalid-model", message: "The model selector must be a non-empty single-line string of at most 200 characters." };
|
|
39
|
+
}
|
|
40
|
+
return { ok: true, target: { url: destination.origin, apiKey: GATEWAY_PLACEHOLDER_KEY, ...(defaultModel ? { defaultModel } : {}) } };
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
export function gatewayClientsStatus(ctx: GatewayClientContext, target?: GatewayTarget): GatewayClientStatus[] {
|
|
44
|
+
return GATEWAY_CLIENT_IDS.map(id => GATEWAY_CLIENTS[id].status(ctx, target));
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
export type GatewayActionOutcome =
|
|
48
|
+
| (GatewayClientResult & { id: GatewayClientId; action: "connect" | "disconnect"; status: GatewayClientStatus })
|
|
49
|
+
| { ok: false; id: GatewayClientId; action: "connect"; code: "requires-admission-token" | "invalid-model"; message: string };
|
|
50
|
+
|
|
51
|
+
function withGatewayLifecycle(ctx: GatewayClientContext, work: () => GatewayClientResult): GatewayClientResult {
|
|
52
|
+
try { return withClientLifecycleSync(work, { lockPath: ctx.lifecycleLockPath }); }
|
|
53
|
+
catch (error) { return clientRefusal((error as Error).message); }
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/** Uninstall keeps the lifecycle lease through both restoration and config removal. */
|
|
57
|
+
export function disconnectRecordedGatewayClients(ctx: GatewayClientContext, held: ClientLifecycleHeld): void {
|
|
58
|
+
assertClientLifecycleHeld(held);
|
|
59
|
+
for (const id of GATEWAY_CLIENT_IDS) {
|
|
60
|
+
if (!hasStash(ctx, id)) continue;
|
|
61
|
+
const result = GATEWAY_CLIENTS[id].disconnect(ctx);
|
|
62
|
+
if (!result.ok) throw new Error(`Gateway client cleanup refused for ${id}: ${result.message}`);
|
|
63
|
+
}
|
|
64
|
+
// Also finish cleanup if a prior version or interrupted restore left an empty directory.
|
|
65
|
+
removeEmptyStashDirectory(ctx);
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
export function connectGatewayClient(id: GatewayClientId, ctx: GatewayClientContext, config: Pick<OcxConfig, "hostname" | "unauthenticatedLoopbackListener">, port: number, model?: string): GatewayActionOutcome {
|
|
69
|
+
const resolved = resolveGatewayTarget(config, port, model);
|
|
70
|
+
if (!resolved.ok) return { ok: false, id, action: "connect", code: resolved.code, message: resolved.message };
|
|
71
|
+
const result = withGatewayLifecycle(ctx, () => GATEWAY_CLIENTS[id].connect(ctx, resolved.target));
|
|
72
|
+
return { ...result, id, action: "connect", status: GATEWAY_CLIENTS[id].status(ctx, resolved.target) };
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
export function disconnectGatewayClient(id: GatewayClientId, ctx: GatewayClientContext, target?: GatewayTarget): GatewayActionOutcome {
|
|
76
|
+
const result = withGatewayLifecycle(ctx, () => GATEWAY_CLIENTS[id].disconnect(ctx));
|
|
77
|
+
return { ...result, id, action: "disconnect", status: GATEWAY_CLIENTS[id].status(ctx, target) };
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
/** The JSON both the management route and `ocx connect agy` return for an action. */
|
|
81
|
+
export function gatewayActionBody(outcome: GatewayActionOutcome): Record<string, unknown> {
|
|
82
|
+
if (!outcome.ok) {
|
|
83
|
+
const files = "changedFiles" in outcome ? outcome.changedFiles : [];
|
|
84
|
+
const profilePath = "profilePath" in outcome ? outcome.profilePath : undefined;
|
|
85
|
+
return { ok: false, code: outcome.code, message: outcome.message, ...(profilePath ? { profilePath } : {}), ...(files.length ? { changedFiles: files } : {}) };
|
|
86
|
+
}
|
|
87
|
+
const { ok, id, action, changed, changedFiles, restore, message, notes, status } = outcome;
|
|
88
|
+
return { ok, id, action, changed, changedFiles, ...(restore ? { restore } : {}), message, notes, status };
|
|
89
|
+
}
|