@bitkyc08/opencodex 2.93.0 → 2.95.0
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 +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -8,10 +8,11 @@ import { appendKiroAccountFromDeviceLogin, isStorableKiroClientPart, rollbackCre
|
|
|
8
8
|
import type { OAuthCredentials } from "./types";
|
|
9
9
|
import type { ManagementPrincipal } from "../server/management-auth";
|
|
10
10
|
import type { OcxConfig } from "../types";
|
|
11
|
+
import { listKiroIamProfiles, parseKiroIamOptions, resolveKiroIamCredential, type KiroIamOptions, type KiroIamProfile } from "./kiro-iam-identity-center";
|
|
11
12
|
|
|
12
|
-
export type KiroDeviceMethod = "builder-id" | "google" | "github";
|
|
13
|
+
export type KiroDeviceMethod = "builder-id" | "google" | "github" | "iam-identity-center";
|
|
13
14
|
export type KiroDevicePrincipal = ManagementPrincipal;
|
|
14
|
-
type State = "pending" | "done" | "failed" | "expired" | "cancelled";
|
|
15
|
+
type State = "pending" | "select-profile" | "done" | "failed" | "expired" | "cancelled";
|
|
15
16
|
export interface KiroDeviceView {
|
|
16
17
|
flowId: string;
|
|
17
18
|
method: KiroDeviceMethod;
|
|
@@ -21,6 +22,7 @@ export interface KiroDeviceView {
|
|
|
21
22
|
verificationUriComplete?: string;
|
|
22
23
|
expiresAt?: number;
|
|
23
24
|
warning?: "duplicate_profile_arn" | "manual_review_required";
|
|
25
|
+
profiles?: KiroIamProfile[];
|
|
24
26
|
}
|
|
25
27
|
interface Flow {
|
|
26
28
|
view: KiroDeviceView;
|
|
@@ -36,8 +38,11 @@ interface Flow {
|
|
|
36
38
|
commitAccepted?: boolean;
|
|
37
39
|
terminalAt?: number;
|
|
38
40
|
retentionTimer?: ReturnType<typeof setTimeout>;
|
|
41
|
+
expiryTimer?: ReturnType<typeof setTimeout>;
|
|
42
|
+
iam?: KiroIamOptions;
|
|
43
|
+
credential?: OAuthCredentials;
|
|
39
44
|
}
|
|
40
|
-
export type KiroDevicePost = (url: string, body: Record<string, unknown>) => Promise<Response>;
|
|
45
|
+
export type KiroDevicePost = (url: string, body: Record<string, unknown>, headers?: Record<string, string>) => Promise<Response>;
|
|
41
46
|
const SOCIAL = "https://prod.us-east-1.auth.desktop.kiro.dev";
|
|
42
47
|
const OIDC = "https://oidc.us-east-1.amazonaws.com";
|
|
43
48
|
const MAX_KIRO_DEVICE_FLOWS = 4;
|
|
@@ -50,7 +55,7 @@ const USER_CODE = /^[A-Za-z0-9-]{4,32}$/;
|
|
|
50
55
|
const CONTROL = /[\u0000-\u001f\u007f-\u009f\u200b-\u200f\u202a-\u202e\u2060-\u2069\ufeff]/;
|
|
51
56
|
const flows = new Map<string, Flow>();
|
|
52
57
|
|
|
53
|
-
async function defaultPost(url: string, body: Record<string, unknown>): Promise<Response> {
|
|
58
|
+
async function defaultPost(url: string, body: Record<string, unknown>, headers?: Record<string, string>): Promise<Response> {
|
|
54
59
|
const configured = loadConfig().providers.kiro;
|
|
55
60
|
return providerOutboundPost("kiro", {
|
|
56
61
|
baseUrl: new URL(url).origin,
|
|
@@ -58,7 +63,7 @@ async function defaultPost(url: string, body: Record<string, unknown>): Promise<
|
|
|
58
63
|
...(configured?.noProxy ? { noProxy: configured.noProxy } : {}),
|
|
59
64
|
...(configured?.allowPrivateNetwork ? { allowPrivateNetwork: true } : {}),
|
|
60
65
|
}, url, {
|
|
61
|
-
headers: { "content-type": "application/json" }, body: JSON.stringify(body), signal: AbortSignal.timeout(20_000),
|
|
66
|
+
headers: { "content-type": "application/json", ...headers }, body: JSON.stringify(body), signal: AbortSignal.timeout(20_000),
|
|
62
67
|
});
|
|
63
68
|
}
|
|
64
69
|
|
|
@@ -77,7 +82,7 @@ export function setKiroDevicePublishForTests(publish?: () => void | Promise<void
|
|
|
77
82
|
publishConfig = publish ?? defaultPublishConfig;
|
|
78
83
|
}
|
|
79
84
|
export function clearKiroDeviceFlowsForTests(): void {
|
|
80
|
-
for (const flow of flows.values()) clearTimeout(flow.retentionTimer);
|
|
85
|
+
for (const flow of flows.values()) { clearTimeout(flow.retentionTimer); clearTimeout(flow.expiryTimer); }
|
|
81
86
|
flows.clear(); transport = defaultPost; setKiroDeviceClockForTests(); setKiroDevicePublishForTests();
|
|
82
87
|
}
|
|
83
88
|
export function kiroDeviceFlowCountForTests(): number { return flows.size; }
|
|
@@ -85,8 +90,8 @@ export function kiroDeviceFlowCountForTests(): number { return flows.size; }
|
|
|
85
90
|
function object(value: unknown): Record<string, unknown> {
|
|
86
91
|
return value && typeof value === "object" && !Array.isArray(value) ? value as Record<string, unknown> : {};
|
|
87
92
|
}
|
|
88
|
-
async function reply(url: string, body: Record<string, unknown>): Promise<{ status: number; data: Record<string, unknown>; errorType: string }> {
|
|
89
|
-
const response = await transport(url, body);
|
|
93
|
+
async function reply(url: string, body: Record<string, unknown>, headers?: Record<string, string>): Promise<{ status: number; data: Record<string, unknown>; errorType: string }> {
|
|
94
|
+
const response = await transport(url, body, headers);
|
|
90
95
|
// Unknown upstream bodies are bounded and never echoed into a response or error.
|
|
91
96
|
const { bytes, oversized } = await readBoundedResponseBytes(response, {
|
|
92
97
|
maxBytes: BOUNDED_BODY_MAX_BYTES, signal: AbortSignal.timeout(20_000),
|
|
@@ -98,13 +103,18 @@ async function reply(url: string, body: Record<string, unknown>): Promise<{ stat
|
|
|
98
103
|
return { status: response.status, data, errorType: response.headers.get("x-amzn-errortype")?.split(":")[0] ?? "" };
|
|
99
104
|
}
|
|
100
105
|
function positive(value: unknown): value is number { return typeof value === "number" && Number.isFinite(value) && value > 0; }
|
|
101
|
-
function publicView(flow: Flow): KiroDeviceView {
|
|
106
|
+
function publicView(flow: Flow): KiroDeviceView {
|
|
107
|
+
return { ...flow.view, ...(flow.view.profiles ? { profiles: flow.view.profiles.map(profile => ({ ...profile })) } : {}) };
|
|
108
|
+
}
|
|
109
|
+
function live(flow: Flow): boolean { return flow.view.state === "pending" || flow.view.state === "select-profile"; }
|
|
102
110
|
function forgetFlow(id: string): void {
|
|
103
111
|
const flow = flows.get(id);
|
|
104
112
|
if (flow?.retentionTimer) clearTimeout(flow.retentionTimer);
|
|
113
|
+
if (flow?.expiryTimer) clearTimeout(flow.expiryTimer);
|
|
105
114
|
flows.delete(id);
|
|
106
115
|
}
|
|
107
116
|
function terminal(flow: Flow, state: State, warning?: KiroDeviceView["warning"]): KiroDeviceView {
|
|
117
|
+
clearTimeout(flow.expiryTimer);
|
|
108
118
|
flow.view.state = state;
|
|
109
119
|
if (flow.terminalAt === undefined) {
|
|
110
120
|
flow.terminalAt = clock();
|
|
@@ -118,16 +128,19 @@ function terminal(flow: Flow, state: State, warning?: KiroDeviceView["warning"])
|
|
|
118
128
|
delete flow.clientId;
|
|
119
129
|
delete flow.clientSecret;
|
|
120
130
|
delete flow.configBaseline;
|
|
131
|
+
delete flow.credential;
|
|
132
|
+
delete flow.iam;
|
|
133
|
+
delete flow.view.profiles;
|
|
121
134
|
return publicView(flow);
|
|
122
135
|
}
|
|
123
136
|
function pruneFlows(): void {
|
|
124
137
|
const now = clock();
|
|
125
138
|
for (const [id, flow] of flows) {
|
|
126
|
-
if (flow
|
|
139
|
+
if (live(flow) && now >= flow.deadline && !flow.commitAccepted) terminal(flow, "expired");
|
|
127
140
|
if (flow.terminalAt !== undefined && now - flow.terminalAt >= TERMINAL_RETENTION_MS) forgetFlow(id);
|
|
128
141
|
}
|
|
129
142
|
while (flows.size >= MAX_KIRO_DEVICE_ENTRIES) {
|
|
130
|
-
const oldest = [...flows].find(([, flow]) => flow
|
|
143
|
+
const oldest = [...flows].find(([, flow]) => !live(flow));
|
|
131
144
|
if (!oldest) break;
|
|
132
145
|
forgetFlow(oldest[0]);
|
|
133
146
|
}
|
|
@@ -135,7 +148,7 @@ function pruneFlows(): void {
|
|
|
135
148
|
function owned(flowId: string, principal: KiroDevicePrincipal): Flow | undefined {
|
|
136
149
|
const flow = flows.get(flowId);
|
|
137
150
|
if (!flow || flow.ownerPrincipal !== principal) return undefined;
|
|
138
|
-
if (clock() >= flow.deadline) {
|
|
151
|
+
if (clock() >= flow.deadline && !flow.commitAccepted) {
|
|
139
152
|
terminal(flow, "expired");
|
|
140
153
|
forgetFlow(flowId);
|
|
141
154
|
return undefined;
|
|
@@ -171,12 +184,21 @@ function viewFromAuthorization(flow: Flow, data: Record<string, unknown>, scale:
|
|
|
171
184
|
...(data.verificationUriComplete ? { verificationUriComplete: data.verificationUriComplete } : {}),
|
|
172
185
|
expiresAt: flow.deadline,
|
|
173
186
|
};
|
|
187
|
+
// An approved IAM grant may wait for a profile choice. Erase that staged credential at
|
|
188
|
+
// expiry even if its browser disappears and no further management request prunes flows.
|
|
189
|
+
flow.expiryTimer = setTimeout(() => {
|
|
190
|
+
if (flows.get(flow.view.flowId) === flow && live(flow) && !flow.commitAccepted) terminal(flow, "expired");
|
|
191
|
+
}, Math.max(0, flow.deadline - clock()));
|
|
192
|
+
flow.expiryTimer.unref();
|
|
174
193
|
}
|
|
175
194
|
|
|
176
|
-
export async function startKiroDeviceLogin(method: KiroDeviceMethod, principal: KiroDevicePrincipal, configBaseline?: OcxConfig
|
|
195
|
+
export async function startKiroDeviceLogin(method: KiroDeviceMethod, principal: KiroDevicePrincipal, configBaseline?: OcxConfig,
|
|
196
|
+
iamInput?: unknown): Promise<KiroDeviceView> {
|
|
197
|
+
const iam = method === "iam-identity-center" ? parseKiroIamOptions(iamInput) : null;
|
|
198
|
+
if (method === "iam-identity-center" && !iam) throw new Error("Invalid Kiro IAM settings");
|
|
177
199
|
// Reserve before the first await, so concurrent starts cannot evade the cap.
|
|
178
200
|
pruneFlows();
|
|
179
|
-
if ([...flows.values()].filter(
|
|
201
|
+
if ([...flows.values()].filter(live).length >= MAX_KIRO_DEVICE_FLOWS) {
|
|
180
202
|
throw new Error("Too many Kiro device logins in progress");
|
|
181
203
|
}
|
|
182
204
|
if (flows.size >= MAX_KIRO_DEVICE_ENTRIES) throw new Error("Too many Kiro device logins in progress");
|
|
@@ -185,12 +207,14 @@ export async function startKiroDeviceLogin(method: KiroDeviceMethod, principal:
|
|
|
185
207
|
view: { flowId, method, state: "pending" }, ownerPrincipal: principal,
|
|
186
208
|
nextPollAt: 0, intervalMs: 5_000, deadline: clock() + MAX_LIFETIME_MS,
|
|
187
209
|
...(configBaseline ? { configBaseline: structuredClone(configBaseline) } : {}),
|
|
210
|
+
...(iam ? { iam } : {}),
|
|
188
211
|
};
|
|
189
212
|
flows.set(flowId, flow);
|
|
190
213
|
let started = false;
|
|
191
214
|
try {
|
|
192
|
-
if (method === "builder-id") {
|
|
193
|
-
const
|
|
215
|
+
if (method === "builder-id" || iam) {
|
|
216
|
+
const oidc = iam ? `https://oidc.${iam.region}.amazonaws.com` : OIDC;
|
|
217
|
+
const registration = await reply(`${oidc}/client/register`, {
|
|
194
218
|
clientName: "kiro-cli", clientType: "public",
|
|
195
219
|
scopes: ["codewhisperer:completions", "codewhisperer:analysis", "codewhisperer:conversations"],
|
|
196
220
|
});
|
|
@@ -198,8 +222,8 @@ export async function startKiroDeviceLogin(method: KiroDeviceMethod, principal:
|
|
|
198
222
|
|| !isStorableKiroClientPart(registration.data.clientSecret)) throw new Error("Kiro registration failed");
|
|
199
223
|
flow.clientId = registration.data.clientId;
|
|
200
224
|
flow.clientSecret = registration.data.clientSecret;
|
|
201
|
-
const authorization = await reply(`${
|
|
202
|
-
clientId: flow.clientId, clientSecret: flow.clientSecret, startUrl: "https://view.awsapps.com/start",
|
|
225
|
+
const authorization = await reply(`${oidc}/device_authorization`, {
|
|
226
|
+
clientId: flow.clientId, clientSecret: flow.clientSecret, startUrl: iam?.startUrl ?? "https://view.awsapps.com/start",
|
|
203
227
|
});
|
|
204
228
|
if (authorization.status < 200 || authorization.status >= 300) throw new Error("Kiro device authorization failed");
|
|
205
229
|
viewFromAuthorization(flow, authorization.data, 1000);
|
|
@@ -227,9 +251,10 @@ async function poll(flow: Flow, principal: KiroDevicePrincipal): Promise<KiroDev
|
|
|
227
251
|
const now = clock();
|
|
228
252
|
flow.nextPollAt = now + flow.intervalMs;
|
|
229
253
|
try {
|
|
230
|
-
const builder = flow.view.method === "builder-id";
|
|
254
|
+
const builder = flow.view.method === "builder-id" || flow.view.method === "iam-identity-center";
|
|
255
|
+
const region = flow.iam?.region ?? "us-east-1";
|
|
231
256
|
const result = builder
|
|
232
|
-
? await reply(
|
|
257
|
+
? await reply(`https://oidc.${region}.amazonaws.com/token`, {
|
|
233
258
|
clientId: flow.clientId, clientSecret: flow.clientSecret, deviceCode: flow.deviceCode,
|
|
234
259
|
grantType: "urn:ietf:params:oauth:grant-type:device_code",
|
|
235
260
|
})
|
|
@@ -261,15 +286,29 @@ async function poll(flow: Flow, principal: KiroDevicePrincipal): Promise<KiroDev
|
|
|
261
286
|
expires: clock() + (positive(data.expiresIn) ? data.expiresIn * 1000 : 3600_000),
|
|
262
287
|
source: "oauth",
|
|
263
288
|
kiro: builder
|
|
264
|
-
? { clientId: flow.clientId, clientSecret: flow.clientSecret, ssoRegion:
|
|
289
|
+
? { clientId: flow.clientId, clientSecret: flow.clientSecret, ssoRegion: region, apiRegion: region }
|
|
265
290
|
: { profileArn: data.profileArn as string, ssoRegion: "us-east-1", apiRegion: "us-east-1" },
|
|
266
291
|
};
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
292
|
+
if (flow.iam) {
|
|
293
|
+
const profiles = await listKiroIamProfiles(reply, credential.access);
|
|
294
|
+
if (!owned(flow.view.flowId, principal) || !live(flow)) return publicView(flow);
|
|
295
|
+
flow.credential = credential;
|
|
296
|
+
flow.view = { flowId: flow.view.flowId, method: flow.view.method, state: "select-profile", expiresAt: flow.deadline, profiles };
|
|
297
|
+
if (profiles.length === 1) return await commitIamProfile(flow, principal, profiles[0]!);
|
|
298
|
+
return publicView(flow);
|
|
299
|
+
}
|
|
300
|
+
return await commitCredential(flow, principal, credential);
|
|
301
|
+
} catch {
|
|
302
|
+
return live(flow) ? terminal(flow, "failed") : publicView(flow);
|
|
303
|
+
}
|
|
304
|
+
}
|
|
305
|
+
|
|
306
|
+
async function commitCredential(flow: Flow, principal: KiroDevicePrincipal, credential: OAuthCredentials): Promise<KiroDeviceView> {
|
|
307
|
+
try {
|
|
308
|
+
const added = await appendKiroAccountFromDeviceLogin(credential, { assertBeforePersist: () => {
|
|
309
|
+
if (!owned(flow.view.flowId, principal) || !live(flow)) throw new Error("Kiro device flow cancelled");
|
|
270
310
|
flow.commitAccepted = true;
|
|
271
|
-
};
|
|
272
|
-
const added = await appendKiroAccountFromDeviceLogin(credential, { assertBeforePersist });
|
|
311
|
+
} });
|
|
273
312
|
try {
|
|
274
313
|
await publishConfig();
|
|
275
314
|
} catch {
|
|
@@ -282,14 +321,32 @@ async function poll(flow: Flow, principal: KiroDevicePrincipal): Promise<KiroDev
|
|
|
282
321
|
}
|
|
283
322
|
return terminal(flow, "done", added.warning);
|
|
284
323
|
} catch {
|
|
285
|
-
return
|
|
324
|
+
return live(flow) ? terminal(flow, "failed") : publicView(flow);
|
|
286
325
|
}
|
|
287
326
|
}
|
|
288
327
|
|
|
328
|
+
async function commitIamProfile(flow: Flow, principal: KiroDevicePrincipal, profile: KiroIamProfile): Promise<KiroDeviceView> {
|
|
329
|
+
try {
|
|
330
|
+
if (!flow.credential) throw new Error("Kiro IAM grant unavailable");
|
|
331
|
+
const credential = await resolveKiroIamCredential(reply, flow.credential, profile);
|
|
332
|
+
if (!owned(flow.view.flowId, principal) || !live(flow)) return publicView(flow);
|
|
333
|
+
return await commitCredential(flow, principal, credential);
|
|
334
|
+
} catch { return live(flow) ? terminal(flow, "failed") : publicView(flow); }
|
|
335
|
+
}
|
|
336
|
+
|
|
337
|
+
export async function selectKiroDeviceProfile(flowId: string, principal: KiroDevicePrincipal, arn: string): Promise<KiroDeviceView | null> {
|
|
338
|
+
const flow = owned(flowId, principal);
|
|
339
|
+
const profile = flow?.view.profiles?.find(profile => profile.arn === arn);
|
|
340
|
+
if (!flow || flow.view.method !== "iam-identity-center" || flow.view.state !== "select-profile" || !profile) return null;
|
|
341
|
+
if (!flow.polling) flow.polling = commitIamProfile(flow, principal, profile).finally(() => { flow.polling = undefined; });
|
|
342
|
+
return flow.polling;
|
|
343
|
+
}
|
|
344
|
+
|
|
289
345
|
export async function statusKiroDeviceLogin(flowId: string, principal: KiroDevicePrincipal): Promise<KiroDeviceView | null> {
|
|
290
346
|
pruneFlows();
|
|
291
347
|
const flow = owned(flowId, principal);
|
|
292
348
|
if (!flow) return null;
|
|
349
|
+
if (flow.view.state === "select-profile") return publicView(flow);
|
|
293
350
|
if (flow.view.state !== "pending") {
|
|
294
351
|
forgetFlow(flowId);
|
|
295
352
|
return publicView(flow);
|
|
@@ -297,15 +354,15 @@ export async function statusKiroDeviceLogin(flowId: string, principal: KiroDevic
|
|
|
297
354
|
if (clock() < flow.nextPollAt) return publicView(flow);
|
|
298
355
|
if (!flow.polling) flow.polling = poll(flow, principal).finally(() => { flow.polling = undefined; });
|
|
299
356
|
const result = await flow.polling;
|
|
300
|
-
if (
|
|
357
|
+
if (!live(flow)) forgetFlow(flowId);
|
|
301
358
|
return result;
|
|
302
359
|
}
|
|
303
360
|
|
|
304
361
|
export function cancelKiroDeviceLogin(flowId: string, principal: KiroDevicePrincipal): KiroDeviceView | null {
|
|
305
362
|
const flow = owned(flowId, principal);
|
|
306
363
|
if (!flow) return null;
|
|
307
|
-
if (flow.commitAccepted && flow
|
|
308
|
-
if (flow
|
|
364
|
+
if (flow.commitAccepted && live(flow)) return { ...flow.view, state: "done" };
|
|
365
|
+
if (live(flow)) {
|
|
309
366
|
terminal(flow, "cancelled");
|
|
310
367
|
forgetFlow(flowId);
|
|
311
368
|
}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import type { OAuthCredentials } from "./types";
|
|
2
|
+
|
|
3
|
+
export interface KiroIamOptions { startUrl: string; region: string }
|
|
4
|
+
export interface KiroIamProfile { arn: string; name: string; region: string }
|
|
5
|
+
export type KiroIamReply = (url: string, body: Record<string, unknown>, headers?: Record<string, string>) =>
|
|
6
|
+
Promise<{ status: number; data: Record<string, unknown>; errorType: string }>;
|
|
7
|
+
const REGION = /^(?:af|ap|ca|eu|il|me|mx|sa|us)-(?:central|east|north|northeast|northwest|south|southeast|southwest|west)-[1-9][0-9]?$/;
|
|
8
|
+
const CONTROL = /[\u0000-\u0020\u007f-\u009f\u200b-\u200f\u202a-\u202e\u2060-\u2069\ufeff]/;
|
|
9
|
+
const PROFILE = /^arn:aws:codewhisperer:([a-z0-9-]+):\d{12}:profile\/[A-Za-z0-9-]+$/;
|
|
10
|
+
// The AWS CLI profile client enumerates these two service regions independently of SSO.
|
|
11
|
+
const PROFILE_REGIONS = ["us-east-1", "eu-central-1"] as const;
|
|
12
|
+
class KiroIamRequestError extends Error {
|
|
13
|
+
constructor(readonly status: number) { super("Kiro IAM discovery failed"); }
|
|
14
|
+
}
|
|
15
|
+
const record = (value: unknown): Record<string, unknown> =>
|
|
16
|
+
value && typeof value === "object" && !Array.isArray(value) ? value as Record<string, unknown> : {};
|
|
17
|
+
|
|
18
|
+
/** Portal URLs are arguments to AWS OIDC, never destinations fetched by the hub. */
|
|
19
|
+
export function parseKiroIamOptions(value: unknown): KiroIamOptions | null {
|
|
20
|
+
const { startUrl, region } = record(value);
|
|
21
|
+
if (typeof startUrl !== "string" || startUrl.length > 2048 || CONTROL.test(startUrl)
|
|
22
|
+
|| typeof region !== "string" || !REGION.test(region)) return null;
|
|
23
|
+
try {
|
|
24
|
+
const url = new URL(startUrl);
|
|
25
|
+
const authority = /^https:\/\/([^/?#]+)/.exec(startUrl)?.[1];
|
|
26
|
+
if (!authority || authority.includes(":") || authority.includes("@") || url.protocol !== "https:"
|
|
27
|
+
|| !/^[a-z0-9][a-z0-9-]{0,62}\.awsapps\.com$/.test(url.hostname)
|
|
28
|
+
|| !/^\/start\/?$/.test(url.pathname) || url.search || (url.hash && url.hash !== "#/")) return null;
|
|
29
|
+
return { startUrl: `https://${url.hostname}/start`, region };
|
|
30
|
+
} catch { return null; }
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
function managementUrl(region: string): string {
|
|
34
|
+
if (!REGION.test(region)) throw new Error("Invalid Kiro IAM region");
|
|
35
|
+
if (!PROFILE_REGIONS.some(candidate => candidate === region)) throw new Error("Unsupported Kiro profile region");
|
|
36
|
+
return `https://q.${region}.amazonaws.com/`;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
async function call(reply: KiroIamReply, access: string, region: string, operation: string,
|
|
40
|
+
body: Record<string, unknown>): Promise<Record<string, unknown>> {
|
|
41
|
+
const url = new URL(managementUrl(region));
|
|
42
|
+
// GetUsageLimits models its arguments in both the query and JSON body (the CLI contract).
|
|
43
|
+
if (operation === "GetUsageLimits") for (const [key, value] of Object.entries(body)) url.searchParams.set(key, String(value));
|
|
44
|
+
const result = await reply(url.href, body, {
|
|
45
|
+
authorization: `Bearer ${access}`, "content-type": "application/x-amz-json-1.0",
|
|
46
|
+
"x-amz-target": `AmazonCodeWhispererService.${operation}`, "x-amzn-codewhisperer-optout": "true",
|
|
47
|
+
});
|
|
48
|
+
if (result.status !== 200 || result.errorType || Object.hasOwn(result.data, "error")) throw new KiroIamRequestError(result.status);
|
|
49
|
+
return result.data;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
/** Bounded pagination; a partial or ambiguous profile list is never offered as complete. */
|
|
53
|
+
async function listProfilesInRegion(reply: KiroIamReply, access: string, region: string): Promise<KiroIamProfile[]> {
|
|
54
|
+
const profiles = new Map<string, KiroIamProfile>();
|
|
55
|
+
const tokens = new Set<string>();
|
|
56
|
+
let nextToken: string | undefined;
|
|
57
|
+
for (let page = 0; page < 8; page++) {
|
|
58
|
+
const data = await call(reply, access, region, "ListAvailableProfiles", { maxResults: 50, ...(nextToken ? { nextToken } : {}) });
|
|
59
|
+
if (!Array.isArray(data.profiles)) throw new Error("Kiro IAM profiles unavailable");
|
|
60
|
+
for (const item of data.profiles) {
|
|
61
|
+
const profile = record(item);
|
|
62
|
+
const arn = typeof profile.arn === "string" ? profile.arn : "";
|
|
63
|
+
const match = PROFILE.exec(arn);
|
|
64
|
+
const name = typeof profile.profileName === "string" ? profile.profileName.trim() : "";
|
|
65
|
+
if (!match || arn.length > 256 || !REGION.test(match[1]!) || !name || name.length > 256
|
|
66
|
+
|| /[\u0000-\u001f\u007f-\u009f\u202a-\u202e\u2066-\u2069]/.test(name)) throw new Error("Invalid Kiro IAM profile");
|
|
67
|
+
profiles.set(arn, { arn, name, region: match[1]! });
|
|
68
|
+
if (profiles.size > 64) throw new Error("Too many Kiro IAM profiles");
|
|
69
|
+
}
|
|
70
|
+
if (data.nextToken === undefined || data.nextToken === null || data.nextToken === "") {
|
|
71
|
+
return [...profiles.values()];
|
|
72
|
+
}
|
|
73
|
+
if (typeof data.nextToken !== "string" || data.nextToken.length > 4096 || tokens.has(data.nextToken)) break;
|
|
74
|
+
nextToken = data.nextToken;
|
|
75
|
+
tokens.add(nextToken);
|
|
76
|
+
}
|
|
77
|
+
throw new Error("Incomplete Kiro IAM profile list");
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
export async function listKiroIamProfiles(reply: KiroIamReply, access: string): Promise<KiroIamProfile[]> {
|
|
81
|
+
const regional = await Promise.all(PROFILE_REGIONS.map(async region => {
|
|
82
|
+
try { return await listProfilesInRegion(reply, access, region); }
|
|
83
|
+
catch (error) {
|
|
84
|
+
// Organizations may grant access in only one service region. Other failures must not
|
|
85
|
+
// silently present a partial list as if discovery had completed.
|
|
86
|
+
if (error instanceof KiroIamRequestError && (error.status === 401 || error.status === 403)) return [];
|
|
87
|
+
throw error;
|
|
88
|
+
}
|
|
89
|
+
}));
|
|
90
|
+
const profiles = new Map(regional.flat().map(profile => [profile.arn, profile]));
|
|
91
|
+
if (!profiles.size || profiles.size > 64) throw new Error("Kiro IAM profiles unavailable");
|
|
92
|
+
return [...profiles.values()];
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
/** Only AWS's response to this grant can name the user; a shared organization ARN cannot. */
|
|
96
|
+
export async function resolveKiroIamCredential(reply: KiroIamReply, credential: OAuthCredentials,
|
|
97
|
+
profile: KiroIamProfile): Promise<OAuthCredentials> {
|
|
98
|
+
const data = await call(reply, credential.access, profile.region, "GetUsageLimits", {
|
|
99
|
+
origin: "CLI", isEmailRequired: true, profileArn: profile.arn,
|
|
100
|
+
});
|
|
101
|
+
const email = record(data.userInfo).email;
|
|
102
|
+
if (typeof email !== "string" || !email.trim() || email.length > 320 || CONTROL.test(email.trim())) {
|
|
103
|
+
throw new Error("Kiro IAM user identity unavailable");
|
|
104
|
+
}
|
|
105
|
+
return { ...credential, email: email.trim().toLowerCase(), accountId: profile.arn,
|
|
106
|
+
kiro: { ...credential.kiro, profileArn: profile.arn, apiRegion: profile.region } };
|
|
107
|
+
}
|
package/src/oauth/store.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { publishCredentialSync } from "../local-credentials/generation";
|
|
1
2
|
/**
|
|
2
3
|
* OAuth token store at ~/.opencodex/auth.json, keyed by provider name.
|
|
3
4
|
*
|
|
@@ -34,6 +35,7 @@ import { getConfigDir, atomicWriteFile, backupInvalidConfig, hardenConfigDir, ha
|
|
|
34
35
|
import { atomicWriteFileNoFollowUnclaimed } from "../config/atomic-write";
|
|
35
36
|
import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
|
|
36
37
|
import { recordOwnedConfigPath } from "../lib/config-ownership";
|
|
38
|
+
import { statTimeMs } from "../lib/file-identity";
|
|
37
39
|
import { MAX_PENDING_OAUTH_MUTATIONS } from "../lib/translator-budget";
|
|
38
40
|
import { publishAccountSelection, publishOAuthAccountPauseChange, publishOAuthAccountRoutingPolicyChange } from "../lib/account-selection-events";
|
|
39
41
|
import {
|
|
@@ -423,23 +425,23 @@ function persist(store: AuthStore): void {
|
|
|
423
425
|
try { chmodSync(dir, 0o700); } catch { /* best-effort on existing dir */ }
|
|
424
426
|
}
|
|
425
427
|
hardenConfigDir();
|
|
426
|
-
atomicWriteFile(getAuthStorePath(), JSON.stringify(store, null, 2) + "\n");
|
|
428
|
+
publishCredentialSync(() => atomicWriteFile(getAuthStorePath(), JSON.stringify(store, null, 2) + "\n"));
|
|
427
429
|
notifyAuthStoreLoaded(store);
|
|
428
430
|
}
|
|
429
431
|
|
|
430
432
|
export class OAuthFileLockError extends Error { readonly code = "OAUTH_FILE_LOCK_UNAVAILABLE"; constructor(message: string, options?: { cause?: unknown }) { super(message, options); this.name = "OAuthFileLockError"; } }
|
|
431
|
-
interface LockSnapshot { bytes: string; dev:
|
|
433
|
+
interface LockSnapshot { bytes: string; dev: bigint; ino: bigint; mtimeMs: number; mtimeNs: bigint; size: bigint }
|
|
432
434
|
export interface OAuthFileLockOptions { path: string; waitTimeoutMs?: number; staleAfterMs?: number; pollMinMs?: number; pollMaxMs?: number; sleep?: (ms: number) => Promise<void>; now?: () => number; random?: () => number; beforeStaleUnlink?: () => void; beforeReleaseUnlink?: () => void; beforeFailedCreateUnlink?: () => void; writeMetadata?: (fd: number, bytes: string) => void }
|
|
433
435
|
export interface OAuthFileLockGuard { readonly ownerId: string; release(): void }
|
|
434
436
|
function errorCode(error: unknown): string | undefined { return error && typeof error === "object" && "code" in error ? String((error as { code?: unknown }).code) : undefined; }
|
|
435
|
-
function snapshot(path: string): LockSnapshot { const bytes = readFileSync(path, "utf8"); const s = statSync(path); return { bytes, dev:s.dev, ino:s.ino, mtimeMs:s.
|
|
436
|
-
function sameSnapshot(a: LockSnapshot,b: LockSnapshot): boolean { return a.bytes===b.bytes&&a.dev===b.dev&&a.ino===b.ino&&a.
|
|
437
|
-
function sameFd(a: LockSnapshot,b:
|
|
437
|
+
function snapshot(path: string): LockSnapshot { const bytes = readFileSync(path, "utf8"); const s = statSync(path, { bigint: true }); return { bytes, dev:s.dev, ino:s.ino, mtimeMs:statTimeMs(s.mtimeNs), mtimeNs:s.mtimeNs, size:s.size }; }
|
|
438
|
+
function sameSnapshot(a: LockSnapshot,b: LockSnapshot): boolean { return a.bytes===b.bytes&&a.dev===b.dev&&a.ino===b.ino&&a.mtimeNs===b.mtimeNs&&a.size===b.size; }
|
|
439
|
+
function sameFd(a: LockSnapshot,b: import("node:fs").BigIntStats): boolean { return a.dev===b.dev&&a.ino===b.ino&&a.mtimeNs===b.mtimeNs&&a.size===b.size; }
|
|
438
440
|
export function createOAuthFileLock(options: OAuthFileLockOptions): { acquire(): Promise<OAuthFileLockGuard> } {
|
|
439
441
|
const wait=options.waitTimeoutMs??5000, stale=options.staleAfterMs??120000, min=options.pollMinMs??25,max=options.pollMaxMs??100,sleep=options.sleep??(ms=>Bun.sleep(ms)),now=options.now??Date.now,random=options.random??Math.random,write=options.writeMetadata??((fd,b)=>writeFileSync(fd,b,"utf8"));
|
|
440
442
|
if(wait<0||stale<=0||min<0||max<min) throw new OAuthFileLockError("Invalid OAuth file-lock timing options");
|
|
441
|
-
return { async acquire() { hardenConfigDir(); recordOwnedConfigPath(getConfigDir(),options.path); if(!existsSync(getConfigDir())) mkdirSync(getConfigDir(),{recursive:true,mode:0o700}); const ownerId=randomUUID(),started=now(); for(;;){ let fd:number|undefined; try { fd=openSync(options.path,"wx",0o600); const bytes=`${JSON.stringify({version:1,ownerId,pid:process.pid,createdAt:now()})}\n`; write(fd,bytes); const fs=fstatSync(fd); closeSync(fd); fd=undefined; const owned=snapshot(options.path); if(owned.bytes!==bytes||!sameFd(owned,fs)) throw new OAuthFileLockError("OAuth lock changed during creation"); let released=false; return {ownerId,release(){if(released)return;released=true;try{const a=snapshot(options.path);if(!sameSnapshot(owned,a))return;options.beforeReleaseUnlink?.();const b=snapshot(options.path);if(sameSnapshot(owned,b))unlinkSync(options.path);}catch(e){if(errorCode(e)!=="ENOENT")console.warn(`[oauth] lock release failed: ${e instanceof Error?e.message:String(e)}`);}}}; } catch(e) { if(fd!==undefined){let fs;try{fs=fstatSync(fd);}catch{}try{closeSync(fd);}catch{}if(fs)try{const a=snapshot(options.path);if(sameFd(a,fs)){options.beforeFailedCreateUnlink?.();const b=snapshot(options.path);if(sameSnapshot(a,b)&&sameFd(b,fs))unlinkSync(options.path);}}catch{}} if(errorCode(e)!=="EEXIST")throw e instanceof OAuthFileLockError?e:new OAuthFileLockError("Could not create OAuth file lock",{cause:e}); }
|
|
442
|
-
try{const a=snapshot(options.path);let created=a.mtimeMs;try{const p=JSON.parse(a.bytes);if(typeof p.createdAt==="number")created=Math.max(created,p.createdAt);}catch{}if(now()-created>stale){options.beforeStaleUnlink?.();const b=snapshot(options.path);if(sameSnapshot(a,b))unlinkSync(options.path);continue;}}catch(e){if(errorCode(e)==="ENOENT")continue;throw new OAuthFileLockError("Could not inspect OAuth file lock",{cause:e});} const elapsed=now()-started;if(elapsed>=wait)throw new OAuthFileLockError(`Timed out after ${wait}ms waiting for OAuth file lock`);await sleep(Math.min(wait-elapsed,min+Math.floor(random()*(max-min+1)))); } } };
|
|
443
|
+
return { async acquire() { hardenConfigDir(); recordOwnedConfigPath(getConfigDir(),options.path); if(!existsSync(getConfigDir())) mkdirSync(getConfigDir(),{recursive:true,mode:0o700}); const ownerId=randomUUID(),started=now(); for(;;){ let fd:number|undefined; try { fd=openSync(options.path,"wx",0o600); const bytes=`${JSON.stringify({version:1,ownerId,pid:process.pid,createdAt:now()})}\n`; write(fd,bytes); const fs=fstatSync(fd,{bigint:true}); closeSync(fd); fd=undefined; const owned=snapshot(options.path); if(owned.bytes!==bytes||!sameFd(owned,fs)) throw new OAuthFileLockError("OAuth lock changed during creation"); let released=false; return {ownerId,release(){if(released)return;released=true;try{const a=snapshot(options.path);if(!sameSnapshot(owned,a))return;options.beforeReleaseUnlink?.();const b=snapshot(options.path);if(sameSnapshot(owned,b))unlinkSync(options.path);}catch(e){if(errorCode(e)!=="ENOENT")console.warn(`[oauth] lock release failed: ${e instanceof Error?e.message:String(e)}`);}}}; } catch(e) { if(fd!==undefined){let fs;try{fs=fstatSync(fd,{bigint:true});}catch{/* best effort: no identity, no cleanup */}try{closeSync(fd);}catch{/* best effort */}if(fs)try{const a=snapshot(options.path);if(sameFd(a,fs)){options.beforeFailedCreateUnlink?.();const b=snapshot(options.path);if(sameSnapshot(a,b)&&sameFd(b,fs))unlinkSync(options.path);}}catch{/* best-effort cleanup of our own failed create */}} if(errorCode(e)!=="EEXIST")throw e instanceof OAuthFileLockError?e:new OAuthFileLockError("Could not create OAuth file lock",{cause:e}); }
|
|
444
|
+
try{const a=snapshot(options.path);let created=a.mtimeMs;try{const p=JSON.parse(a.bytes);if(typeof p.createdAt==="number")created=Math.max(created,p.createdAt);}catch{/* unparsable metadata: fall back to mtime */}if(now()-created>stale){options.beforeStaleUnlink?.();const b=snapshot(options.path);if(sameSnapshot(a,b))unlinkSync(options.path);continue;}}catch(e){if(errorCode(e)==="ENOENT")continue;throw new OAuthFileLockError("Could not inspect OAuth file lock",{cause:e});} const elapsed=now()-started;if(elapsed>=wait)throw new OAuthFileLockError(`Timed out after ${wait}ms waiting for OAuth file lock`);await sleep(Math.min(wait-elapsed,min+Math.floor(random()*(max-min+1)))); } } };
|
|
443
445
|
}
|
|
444
446
|
/** Wait long enough for slow IdP refreshes (e.g. Cursor 15s × 3 attempts) before timing out. */
|
|
445
447
|
export const OAUTH_REFRESH_LOCK_WAIT_MS = 60_000;
|
|
@@ -466,7 +468,7 @@ function backupLegacyOnce(): void {
|
|
|
466
468
|
// alone, and the copy is exclusive, so credentials are never written through a link.
|
|
467
469
|
if (!existsSync(path) || directoryEntryExists(backup)) return;
|
|
468
470
|
try {
|
|
469
|
-
copyFileSync(path, backup, fsConstants.COPYFILE_EXCL);
|
|
471
|
+
publishCredentialSync(() => copyFileSync(path, backup, fsConstants.COPYFILE_EXCL));
|
|
470
472
|
try { chmodSync(backup, 0o600); } catch { /* best-effort */ }
|
|
471
473
|
try {
|
|
472
474
|
// Register only the copy we just created. An unowned home still needs downgrade recovery.
|
|
@@ -497,8 +499,10 @@ function scrubLegacyBackup(providers: readonly string[]): void {
|
|
|
497
499
|
try {
|
|
498
500
|
const remaining = readLegacyBackupEntries(backup);
|
|
499
501
|
for (const provider of providers) delete remaining[provider];
|
|
500
|
-
|
|
501
|
-
|
|
502
|
+
publishCredentialSync(() => {
|
|
503
|
+
if (Object.keys(remaining).length > 0) atomicWriteFileNoFollowUnclaimed(backup, `${JSON.stringify(remaining, null, 2)}\n`);
|
|
504
|
+
else unlinkSync(backup);
|
|
505
|
+
});
|
|
502
506
|
} catch (error) {
|
|
503
507
|
if (errorCode(error) !== "ENOENT") {
|
|
504
508
|
console.warn(`[oauth] could not remove deleted credentials from the legacy credential backup: ${error instanceof Error ? error.message : String(error)}`);
|
|
@@ -698,6 +702,31 @@ function normalizeAccountSet(raw: unknown): { set: ProviderAccountSet | null; wa
|
|
|
698
702
|
return { set: { activeAccountId: id, accounts: [{ id, credential: cred }] }, wasLegacy: true };
|
|
699
703
|
}
|
|
700
704
|
|
|
705
|
+
export function countLocalOAuthCredentialSlots(raw: Record<string, unknown> | null): number {
|
|
706
|
+
if (raw === null) return 0;
|
|
707
|
+
let count = 0;
|
|
708
|
+
for (const value of Object.values(raw)) {
|
|
709
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error("Invalid OAuth provider row");
|
|
710
|
+
const row = value as Record<string, unknown>;
|
|
711
|
+
if (Object.hasOwn(row, "accounts")) {
|
|
712
|
+
if (!Array.isArray(row.accounts) || typeof row.activeAccountId !== "string") throw new Error("Invalid OAuth account set");
|
|
713
|
+
const ids = new Set<string>();
|
|
714
|
+
for (const entry of row.accounts) {
|
|
715
|
+
if (!entry || typeof entry !== "object" || Array.isArray(entry)) throw new Error("Invalid OAuth account");
|
|
716
|
+
const account = entry as Record<string, unknown>;
|
|
717
|
+
if (typeof account.id !== "string" || !account.id || ids.has(account.id)
|
|
718
|
+
|| !normalizeCredential(account.credential)) throw new Error("Invalid OAuth credential slot");
|
|
719
|
+
ids.add(account.id);
|
|
720
|
+
count += 1;
|
|
721
|
+
}
|
|
722
|
+
} else {
|
|
723
|
+
if (!normalizeCredential(row)) throw new Error("Invalid legacy OAuth credential");
|
|
724
|
+
count += 1;
|
|
725
|
+
}
|
|
726
|
+
}
|
|
727
|
+
return count;
|
|
728
|
+
}
|
|
729
|
+
|
|
701
730
|
function normalizeAuthStore(raw: unknown): { store: AuthStore; hadLegacy: boolean } {
|
|
702
731
|
if (!raw || typeof raw !== "object" || Array.isArray(raw)) return { store: {}, hadLegacy: false };
|
|
703
732
|
const normalized: AuthStore = {};
|
|
@@ -1086,7 +1115,8 @@ export async function appendKiroAccountFromDeviceLogin(
|
|
|
1086
1115
|
return await mutateStore(store => {
|
|
1087
1116
|
const set = store.kiro;
|
|
1088
1117
|
const id = distinctAccountId(safe, set?.accounts ?? []);
|
|
1089
|
-
const warning = safe.kiro?.profileArn && set?.accounts.some(a => a.credential.kiro?.profileArn === safe.kiro?.profileArn
|
|
1118
|
+
const warning = safe.kiro?.profileArn && set?.accounts.some(a => a.credential.kiro?.profileArn === safe.kiro?.profileArn
|
|
1119
|
+
&& (!safe.email || !a.credential.email || a.credential.email.toLowerCase() === safe.email.toLowerCase()))
|
|
1090
1120
|
? "duplicate_profile_arn" as const : undefined;
|
|
1091
1121
|
const account: ProviderAccount = { id, credential: safe, addedAt: Date.now(), loginId: randomUUID(), loginOrigin: "kiro-device" };
|
|
1092
1122
|
if (set) set.accounts.push(account);
|
|
@@ -143,6 +143,8 @@ export interface ClientEncodeHooks {
|
|
|
143
143
|
export interface AdapterEventEncodeOptions {
|
|
144
144
|
translatorBudget: TranslatorBudget;
|
|
145
145
|
hideThinkingSummary?: boolean;
|
|
146
|
+
/** Chat client delivery only, independent of upstream thinking/summary configuration. */
|
|
147
|
+
chatRawReasoningVisible?: boolean;
|
|
146
148
|
/** Provider policy: suppress raw content-channel reasoning, keep provider-authored summaries. */
|
|
147
149
|
hideRawReasoning?: boolean;
|
|
148
150
|
toolNsMap?: ReadonlyMap<string, { namespace: string; name: string; freeform?: true }>;
|
|
@@ -179,9 +181,7 @@ export function encodeAdapterEventStream(
|
|
|
179
181
|
const heartbeatMs = options.heartbeatMs ?? 2_000;
|
|
180
182
|
const setTimer = options.timers?.setInterval ?? ((handler: () => void, ms: number) => setInterval(handler, ms));
|
|
181
183
|
const clearTimer = options.timers?.clearInterval ?? ((id: unknown) => clearInterval(id as ReturnType<typeof setInterval>));
|
|
182
|
-
|
|
183
|
-
(resolveStallTimeoutSec(options.stallTimeoutSec, { localUpstream: options.localUpstream }) * 1000) / heartbeatMs,
|
|
184
|
-
);
|
|
184
|
+
let localUpstream = options.localUpstream;
|
|
185
185
|
const textEncoder = new TextEncoder();
|
|
186
186
|
|
|
187
187
|
let controller!: ReadableStreamDefaultController<Uint8Array>;
|
|
@@ -640,7 +640,7 @@ export function encodeAdapterEventStream(
|
|
|
640
640
|
break;
|
|
641
641
|
}
|
|
642
642
|
case "reasoning_raw_delta": {
|
|
643
|
-
if (options.hideThinkingSummary || options.hideRawReasoning) {
|
|
643
|
+
if (!(options.chatRawReasoningVisible ?? !options.hideThinkingSummary) || options.hideRawReasoning) {
|
|
644
644
|
hiddenRawBytes += Buffer.byteLength(event.text);
|
|
645
645
|
break;
|
|
646
646
|
}
|
|
@@ -682,6 +682,7 @@ export function encodeAdapterEventStream(
|
|
|
682
682
|
break;
|
|
683
683
|
}
|
|
684
684
|
case "tool_call_end": {
|
|
685
|
+
if (event.incomplete) { failCurrentToolCall(); break; }
|
|
685
686
|
// Streamed fragments cannot be repaired: unusable arguments fail the turn.
|
|
686
687
|
if (currentToolCall && currentToolCall.kind === "function" && !toolCallArgumentsUsable(currentToolCall.args)) {
|
|
687
688
|
failCurrentToolCall();
|
|
@@ -867,6 +868,8 @@ export function encodeAdapterEventStream(
|
|
|
867
868
|
gated = true;
|
|
868
869
|
beat = setTimer(() => {
|
|
869
870
|
if (closed || gated) return;
|
|
871
|
+
if (localUpstream !== options.localUpstream) { localUpstream = options.localUpstream; stallTicks = 0; }
|
|
872
|
+
const maxStallTicks = Math.ceil((resolveStallTimeoutSec(options.stallTimeoutSec, { localUpstream }) * 1000) / heartbeatMs);
|
|
870
873
|
if (upstreamActivity) {
|
|
871
874
|
upstreamActivity = false;
|
|
872
875
|
stallTicks = 0;
|
|
@@ -410,7 +410,7 @@ export function encodeAnthropicMessageSse(
|
|
|
410
410
|
return encodeAdapterEventStream(
|
|
411
411
|
events,
|
|
412
412
|
sink => createAnthropicMessageWriter(sink, options.model, options.inputTokenFloor),
|
|
413
|
-
{ ...options, keepaliveMs: MESSAGES_KEEPALIVE_MS },
|
|
413
|
+
{ ...options, get localUpstream() { return options.localUpstream; }, keepaliveMs: MESSAGES_KEEPALIVE_MS },
|
|
414
414
|
);
|
|
415
415
|
}
|
|
416
416
|
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
import { existsSync, readFileSync } from "node:fs";
|
|
14
14
|
import { join } from "node:path";
|
|
15
15
|
import { atomicWriteFile, getConfigDir } from "../config";
|
|
16
|
+
import { withConfigDirHardeningSettled } from "../config/paths";
|
|
16
17
|
import type { ProviderQuota } from "./quota-types";
|
|
17
18
|
import type { KiroPersistedQuota, KiroPersistedVerdict } from "./kiro-account-state-disk";
|
|
18
19
|
import { ACCOUNT_QUOTA_TTL_MS } from "./quota-wire";
|
|
@@ -41,6 +42,11 @@ type DiskFile = {
|
|
|
41
42
|
|
|
42
43
|
let persistTimer: ReturnType<typeof setTimeout> | null = null;
|
|
43
44
|
let persistStartedAt: number | null = null;
|
|
45
|
+
/** Bumped by cancellation so a fired callback still waiting for ACL admission writes nothing. */
|
|
46
|
+
let persistGeneration = 0;
|
|
47
|
+
let persistWrite: Promise<void> = Promise.resolve();
|
|
48
|
+
/** Test seam: wait for a fired persistence callback's admitted write (as settleQuotaPersistenceForTests). */
|
|
49
|
+
export function settleAccountQuotaPersistForTests(): Promise<void> { return persistWrite; }
|
|
44
50
|
|
|
45
51
|
/** Read the snapshot. Returns an empty map for a missing, corrupt or stale file. */
|
|
46
52
|
export function readPersistedAccountQuotas(now = Date.now()): Map<string, ProviderQuota> {
|
|
@@ -102,7 +108,14 @@ export function schedulePersistAccountQuotas(
|
|
|
102
108
|
persistTimer = setTimeout(() => {
|
|
103
109
|
persistTimer = null;
|
|
104
110
|
persistStartedAt = null;
|
|
105
|
-
|
|
111
|
+
// Writes under the config root wait out an overlapping optional config-root ACL flight,
|
|
112
|
+
// whose inheritance can drop the fresh file's explicit grant (#7815). Rows are read inside
|
|
113
|
+
// the admitted callback so a late admission still writes the newest snapshot; a timeout
|
|
114
|
+
// skips this best-effort write.
|
|
115
|
+
const dir = getConfigDir();
|
|
116
|
+
const generation = persistGeneration;
|
|
117
|
+
persistWrite = withConfigDirHardeningSettled(dir, () => {
|
|
118
|
+
if (generation !== persistGeneration) return;
|
|
106
119
|
const out: Record<string, ProviderQuota> = {};
|
|
107
120
|
for (const [key, quota] of rows()) out[key] = quota;
|
|
108
121
|
const kiroVerdicts: Record<string, KiroPersistedVerdict> = {};
|
|
@@ -110,10 +123,10 @@ export function schedulePersistAccountQuotas(
|
|
|
110
123
|
if (key.startsWith("kiro\0") && /^[a-f0-9]{64}$/.test(verdict.identity)) kiroVerdicts[key] = verdict;
|
|
111
124
|
}
|
|
112
125
|
const body: DiskFile = { version: 1, rows: out, kiroVerdicts };
|
|
113
|
-
atomicWriteFile(join(
|
|
114
|
-
}
|
|
126
|
+
atomicWriteFile(join(dir, FILENAME), `${JSON.stringify(body)}\n`);
|
|
127
|
+
}).catch(() => {
|
|
115
128
|
// Best-effort persistence only.
|
|
116
|
-
}
|
|
129
|
+
});
|
|
117
130
|
}, delay);
|
|
118
131
|
}
|
|
119
132
|
|
|
@@ -122,4 +135,5 @@ export function cancelPendingAccountQuotaPersist(): void {
|
|
|
122
135
|
if (persistTimer) clearTimeout(persistTimer);
|
|
123
136
|
persistTimer = null;
|
|
124
137
|
persistStartedAt = null;
|
|
138
|
+
persistGeneration += 1;
|
|
125
139
|
}
|