@bitkyc08/opencodex 2.94.0 → 2.96.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/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/App-bwugJRKn.js +58 -0
- package/gui/dist/assets/{Tray-CZatQdoF.js → Tray-BOPQyDbH.js} +1 -1
- package/gui/dist/assets/index-ebuVUtB7.js +94 -0
- package/gui/dist/assets/quota-summary-6HsrHQAy.js +1 -0
- package/gui/dist/index.html +1 -1
- package/package.json +1 -1
- package/src/adapters/anthropic.ts +10 -3
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/kiro/adapter.ts +4 -1
- package/src/adapters/kiro/stream.ts +1 -0
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/ollama-native.ts +10 -6
- package/src/adapters/openai-chat/messages.ts +20 -7
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-responses/canonical-forward.ts +50 -13
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +45 -11
- 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 +17 -26
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +1 -1
- package/src/adapters/qoder/image-input.ts +5 -2
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +7 -7
- package/src/adapters/zed.ts +1 -6
- package/src/advisor/consult.ts +22 -10
- package/src/advisor/runtime.ts +10 -4
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +9 -4
- package/src/bridge/sse.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +5 -0
- 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-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/intercept/proxy-auth.ts +16 -16
- package/src/cli/account-main.ts +3 -2
- package/src/cli/agent.ts +44 -15
- package/src/cli/capabilities-agents-routing.ts +9 -0
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/codex-launcher.ts +20 -8
- package/src/cli/codex-shim-autorestore.ts +19 -1
- package/src/cli/dispatch.ts +6 -6
- package/src/cli/doctor.ts +5 -5
- package/src/cli/ensure-desired-integrations.ts +4 -3
- package/src/cli/index.ts +8 -10
- package/src/cli/init.ts +2 -2
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/message-command.ts +2 -1
- package/src/cli/message-mcp-command.ts +29 -0
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +5 -0
- package/src/cli/registry.ts +2 -1
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +6 -6
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/v2.ts +69 -19
- package/src/client/machine-api.ts +2 -2
- package/src/clients/config-export.ts +14 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-store.ts +1 -0
- 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/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context-provider.ts +15 -0
- package/src/codex/auth-context.ts +14 -23
- package/src/codex/catalog/bundled.ts +10 -3
- package/src/codex/catalog/metadata.ts +4 -5
- package/src/codex/catalog/native-omission.ts +28 -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 +2 -1
- package/src/codex/catalog/retained-sync.ts +15 -5
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/cli-install-provenance.ts +46 -45
- package/src/codex/cli-update-artifacts.ts +8 -6
- package/src/codex/cli-update-job-store-windows.ts +99 -27
- package/src/codex/cli-update-job-worker.ts +3 -11
- package/src/codex/cli-update-recovery.ts +54 -8
- package/src/codex/cli-update-selection-gate.ts +74 -4
- package/src/codex/cli-windows-plan-provenance.ts +37 -19
- 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 +11 -1
- package/src/codex/exec-boundary.ts +26 -5
- package/src/codex/forward-transport-headers.ts +33 -33
- package/src/codex/history-provider.ts +11 -10
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/installation-id.ts +72 -0
- package/src/codex/main-account.ts +6 -6
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +49 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +43 -3
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-wrapper-write.ts +7 -6
- package/src/codex/shim.ts +25 -2
- package/src/codex/transition-state.ts +5 -4
- package/src/combos/failover.ts +43 -4
- package/src/config/atomic-write.ts +38 -7
- package/src/config/diagnostics.ts +3 -0
- package/src/config/initialize.ts +6 -6
- package/src/config/load-degrade.ts +2 -0
- package/src/config/process-state.ts +23 -5
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +29 -1
- package/src/config/schema/leaf-validators.ts +7 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/generated/compatibility-version.json +380 -244
- package/src/grok/sync.ts +10 -1
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/redact-folding.ts +9 -0
- 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/windows-secret-acl.ts +49 -31
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/local-credentials/generation.ts +6 -2
- package/src/local-credentials/inventory.ts +132 -8
- package/src/messaging/mcp-queue-rpc.ts +102 -0
- package/src/messaging/mcp-queue-server.ts +42 -0
- package/src/messaging/mcp-queue-tools.ts +39 -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/anthropic-identity.ts +2 -6
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/google-antigravity.ts +23 -10
- package/src/oauth/index.ts +7 -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 +9 -7
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/anthropic-subscription.ts +25 -0
- 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-usage.ts +15 -67
- package/src/providers/derive.ts +6 -0
- 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/quota/anthropic-decision-windows.ts +5 -19
- package/src/providers/quota/anthropic-usage-windows.ts +55 -0
- package/src/providers/quota/report-cache.ts +17 -4
- 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 +5 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/remote-control/workspace-codex-runtime.ts +2 -2
- package/src/remote-control/workspace-executor.ts +14 -13
- 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/parser-tools.ts +1 -0
- package/src/responses/schema.ts +5 -2
- 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 +29 -0
- package/src/server/audio-dictation.ts +3 -0
- package/src/server/audio-live.ts +8 -2
- package/src/server/audio-upstream.ts +2 -0
- package/src/server/auth-cors.ts +5 -2
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +33 -7
- package/src/server/claude-messages.ts +93 -2
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/context-history.ts +9 -6
- package/src/server/images.ts +14 -5
- package/src/server/index/live-sideband.ts +16 -2
- package/src/server/index/serve-options.ts +13 -2
- package/src/server/index/websocket-handler.ts +4 -1
- package/src/server/live.ts +30 -5
- package/src/server/management/agent-settings-routes.ts +34 -9
- package/src/server/management/codex-agent-role-routes.ts +1 -0
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +15 -4
- package/src/server/management/context.ts +3 -0
- package/src/server/management/native-integration-routes.ts +22 -0
- package/src/server/management/oauth-account-routes.ts +20 -4
- 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 +2 -0
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-shared.ts +57 -17
- package/src/server/persistent-gui-session.ts +4 -4
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +5 -0
- package/src/server/responses/advisor-plan-slot.ts +4 -0
- package/src/server/responses/advisor-slot.ts +73 -46
- package/src/server/responses/codex-auth-error.ts +9 -1
- package/src/server/responses/combo-required-tool-contract.ts +39 -0
- package/src/server/responses/compact.ts +41 -20
- package/src/server/responses/core-codex-account.ts +17 -6
- package/src/server/responses/core-combo-failure.ts +2 -0
- package/src/server/responses/core-combo.ts +70 -5
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-normalize.ts +7 -1
- package/src/server/responses/core-options.ts +9 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/jev-model-invoke.ts +4 -2
- package/src/server/responses/passthrough-build-error.ts +36 -0
- package/src/server/responses/passthrough-dispatch.ts +10 -24
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +4 -5
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +4 -1
- package/src/server/responses/request-transport.ts +2 -3
- package/src/server/responses/run-turn-execution.ts +4 -0
- package/src/server/responses/sidecar-execution.ts +21 -5
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/search.ts +13 -4
- package/src/server/workflow-refusal.ts +2 -1
- package/src/server/ws-bridge.ts +5 -2
- package/src/service/state-lock.ts +12 -11
- package/src/service-manager-probe.ts +53 -8
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +25 -0
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +7 -0
- package/src/types.ts +1 -0
- package/src/update/job.ts +20 -0
- package/src/update/worker-launch.ts +71 -1
- package/src/usage/log.ts +25 -4
- package/src/vision/describe.ts +4 -7
- 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/executor.ts +4 -7
- package/src/web-search/loop.ts +104 -9
- package/src/web-search/parse.ts +10 -2
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/App-DmvwlhQq.js +0 -58
- package/gui/dist/assets/index-3EPO_KbX.js +0 -94
- package/gui/dist/assets/quota-summary-BHvWg9mi.js +0 -1
|
@@ -3,7 +3,7 @@ import { buildExecArgv, buildTunnelArgv, remoteOcxArgv } from "../link/ssh-argv"
|
|
|
3
3
|
import { MessageBudget } from "./budget";
|
|
4
4
|
import { exactRecord, RemoteCapacity, remoteError, validPort, type RemotePeer } from "./remote-contract";
|
|
5
5
|
import { withRemoteLock, writeRemoteFile } from "./remote-files";
|
|
6
|
-
import {
|
|
6
|
+
import { reserveRemotePort, remotePortIsLoopback, type RemotePortAllocator, type RemotePortReservation } from "./remote-ports";
|
|
7
7
|
import { runRemoteHelper, spawnRemoteHelper, type RemoteHelper } from "./remote-process";
|
|
8
8
|
import type { RemoteMessageStore } from "./remote-store";
|
|
9
9
|
|
|
@@ -14,6 +14,8 @@ export interface RemoteTunnelPair {
|
|
|
14
14
|
export interface RemoteTunnelDeps {
|
|
15
15
|
run?: typeof runRemoteHelper;
|
|
16
16
|
spawn?: typeof spawnRemoteHelper;
|
|
17
|
+
allocatePort?: RemotePortAllocator;
|
|
18
|
+
inspect?: typeof remotePortIsLoopback;
|
|
17
19
|
}
|
|
18
20
|
/** Own one -L/-R pair with shared SSH policy and one setup deadline; never adopt/kill existing tunnels. */
|
|
19
21
|
export async function startRemoteTunnels(store: RemoteMessageStore, peer: RemotePeer, budget: MessageBudget,
|
|
@@ -21,35 +23,92 @@ export async function startRemoteTunnels(store: RemoteMessageStore, peer: Remote
|
|
|
21
23
|
if (!peer.ssh || !peer.hostKey) throw remoteError("return_route_only", "This peer has no initiating SSH enrollment; wait for its return route.");
|
|
22
24
|
const knownHosts = join(store.directory, `${peer.machine.id}.known_hosts`);
|
|
23
25
|
withRemoteLock(store.directory, () => writeRemoteFile(knownHosts, peer.hostKey!));
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
return startRemoteForwardPair({ ssh: peer.ssh, knownHosts, peerPort: peer.port, ownerPort: store.requireEnabled().port },
|
|
27
|
+
budget, capacity, ownerSignal, deps);
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
interface RemoteForwardOptions { ssh: string; knownHosts: string; peerPort: number; ownerPort: number }
|
|
31
|
+
const FORWARD_SETUP_ATTEMPTS = 3;
|
|
32
|
+
|
|
33
|
+
/** Transport-only setup: no messages or authenticated-ready state are published here. */
|
|
34
|
+
export async function startRemoteForwardPair(options: RemoteForwardOptions, budget: MessageBudget,
|
|
35
|
+
capacity: RemoteCapacity, ownerSignal: AbortSignal, deps: RemoteTunnelDeps = {}): Promise<RemoteTunnelPair> {
|
|
36
|
+
const localPorts = new Set<number>(), returnPorts = new Set<number>();
|
|
37
|
+
for (let attempt = 0; attempt < FORWARD_SETUP_ATTEMPTS; attempt++) {
|
|
38
|
+
budget.throwIfEnded();
|
|
39
|
+
if (ownerSignal.aborted) throw remoteError("cancelled", "Messaging tunnel setup was cancelled.");
|
|
40
|
+
const result = exactRecord(JSON.parse(await (deps.run ?? runRemoteHelper)(buildExecArgv({ alias: options.ssh,
|
|
41
|
+
knownHostsFile: options.knownHosts, argv: remoteOcxArgv(["message", "_port"]) }), budget, capacity)), ["port"]);
|
|
42
|
+
budget.throwIfEnded();
|
|
43
|
+
if (!validPort(result.port)) throw remoteError("remote_incompatible", "Remote node did not offer an unprivileged return port.");
|
|
44
|
+
if (returnPorts.has(result.port)) continue;
|
|
45
|
+
returnPorts.add(result.port);
|
|
46
|
+
const reservation = reserveRemotePort(deps.allocatePort, localPorts);
|
|
47
|
+
localPorts.add(reservation.port);
|
|
48
|
+
try { return await startAttempt(options, reservation, result.port, budget, capacity, ownerSignal, deps); }
|
|
49
|
+
catch (error) { if ((error as { code?: string })?.code !== "forward_port_lost") throw error; }
|
|
50
|
+
}
|
|
51
|
+
throw remoteError("forward_port_lost", "Messaging SSH forward ports were lost during bounded setup.");
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
async function startAttempt(options: RemoteForwardOptions, reservation: RemotePortReservation, returnPort: number,
|
|
55
|
+
budget: MessageBudget, capacity: RemoteCapacity, ownerSignal: AbortSignal, deps: RemoteTunnelDeps): Promise<RemoteTunnelPair> {
|
|
56
|
+
const localPort = reservation.port, helpers: RemoteHelper[] = [], exits: Promise<void>[] = [];
|
|
57
|
+
let lostPort = false;
|
|
58
|
+
let awaitingReceipts = false;
|
|
59
|
+
const setupFailure = (fallback: unknown) => {
|
|
60
|
+
const failures = helpers.flatMap(helper => helper.setupFailure ? [helper.setupFailure] : []);
|
|
61
|
+
return failures.find(error => (error as { code?: string }).code !== "forward_port_lost") ?? failures[0] ?? fallback;
|
|
62
|
+
};
|
|
63
|
+
let cancelReadiness!: (reason: unknown) => void;
|
|
64
|
+
const cancelled = new Promise<never>((_, reject) => { cancelReadiness = reject; });
|
|
65
|
+
void cancelled.catch(() => {});
|
|
28
66
|
let alive = true, closing: Promise<void> | undefined;
|
|
29
67
|
const close = (): Promise<void> => closing ??= (async () => {
|
|
30
68
|
alive = false; ownerSignal.removeEventListener("abort", abort);
|
|
31
69
|
const results = await Promise.allSettled(helpers.map(helper => helper.close()));
|
|
70
|
+
await Promise.allSettled(helpers.map(helper => helper.output));
|
|
71
|
+
reservation.release();
|
|
32
72
|
const failure = results.find(result => result.status === "rejected");
|
|
33
73
|
if (failure?.status === "rejected") throw failure.reason;
|
|
34
74
|
})();
|
|
35
|
-
const abort = () => {
|
|
75
|
+
const abort = () => {
|
|
76
|
+
cancelReadiness(remoteError("cancelled", "Messaging tunnel setup was cancelled."));
|
|
77
|
+
void close().catch(() => {});
|
|
78
|
+
};
|
|
36
79
|
ownerSignal.addEventListener("abort", abort, { once: true });
|
|
37
|
-
const cancelSetup = () => { void close().catch(() => {}); };
|
|
80
|
+
const cancelSetup = () => { cancelReadiness(budget.signal.reason); void close().catch(() => {}); };
|
|
38
81
|
budget.signal.addEventListener("abort", cancelSetup, { once: true });
|
|
39
82
|
try {
|
|
40
|
-
budget.throwIfEnded(); if (ownerSignal.aborted) throw
|
|
41
|
-
for (const [direction, bindPort, targetPort] of [["L", localPort,
|
|
83
|
+
budget.throwIfEnded(); if (ownerSignal.aborted) throw remoteError("cancelled", "Messaging tunnel setup was cancelled.");
|
|
84
|
+
for (const [direction, bindPort, targetPort] of [["L", localPort, options.peerPort], ["R", returnPort, options.ownerPort]] as const) {
|
|
42
85
|
budget.throwIfEnded();
|
|
43
|
-
const
|
|
44
|
-
|
|
86
|
+
const argv = buildTunnelArgv({ alias: options.ssh, knownHostsFile: options.knownHosts, direction, bindPort, targetPort });
|
|
87
|
+
if (direction === "L") reservation.handoff();
|
|
88
|
+
const helper = (deps.spawn ?? spawnRemoteHelper)(argv, capacity, ownerSignal);
|
|
45
89
|
helpers.push(helper);
|
|
46
|
-
|
|
90
|
+
const exit = helper.exited.then(async code => {
|
|
91
|
+
await close();
|
|
92
|
+
await helper.output.catch(() => {});
|
|
93
|
+
if (code !== 0 && helper.forwardFailed) lostPort = true;
|
|
94
|
+
});
|
|
95
|
+
exits.push(exit); void exit.catch(() => {});
|
|
47
96
|
}
|
|
97
|
+
// A competing loopback listener can exist before SSH even starts. Its socket is not a bind receipt.
|
|
98
|
+
awaitingReceipts = true;
|
|
99
|
+
await Promise.race([Promise.all(helpers.map(helper => helper.forwardReady)), cancelled]);
|
|
100
|
+
awaitingReceipts = false;
|
|
101
|
+
const checkAlive = async () => {
|
|
102
|
+
if (alive) return;
|
|
103
|
+
await Promise.all(exits);
|
|
104
|
+
throw setupFailure(remoteError(lostPort ? "forward_port_lost" : "ssh_failed", "Messaging SSH forward setup failed."));
|
|
105
|
+
};
|
|
48
106
|
let ready = false;
|
|
49
107
|
while (!ready) {
|
|
50
108
|
budget.throwIfEnded();
|
|
51
|
-
|
|
52
|
-
ready = await remotePortIsLoopback(localPort, budget, capacity);
|
|
109
|
+
await checkAlive();
|
|
110
|
+
ready = await (deps.inspect ?? remotePortIsLoopback)(localPort, budget, capacity);
|
|
111
|
+
await checkAlive();
|
|
53
112
|
if (!ready) await new Promise<void>((resolve, reject) => {
|
|
54
113
|
const timer = setTimeout(() => { budget.signal.removeEventListener("abort", cancel); resolve(); }, budget.remainingMs(100));
|
|
55
114
|
const cancel = () => { clearTimeout(timer); budget.signal.removeEventListener("abort", cancel); reject(budget.signal.reason); };
|
|
@@ -57,9 +116,15 @@ export async function startRemoteTunnels(store: RemoteMessageStore, peer: Remote
|
|
|
57
116
|
if (budget.signal.aborted) cancel();
|
|
58
117
|
});
|
|
59
118
|
}
|
|
119
|
+
budget.throwIfEnded(); if (ownerSignal.aborted) throw remoteError("cancelled", "Messaging tunnel setup was cancelled.");
|
|
60
120
|
const exited = Promise.race(helpers.map(helper => helper.exited));
|
|
61
121
|
void exited.then(() => close()).catch(() => {});
|
|
62
122
|
return { localPort, returnPort, get alive() { return alive; }, exited, close };
|
|
63
|
-
} catch (error) {
|
|
123
|
+
} catch (error) {
|
|
124
|
+
await close(); budget.throwIfEnded();
|
|
125
|
+
if (ownerSignal.aborted) throw remoteError("cancelled", "Messaging tunnel setup was cancelled.");
|
|
126
|
+
// Sibling shutdown can reject first; classify only after every helper's diagnostics and cleanup settle.
|
|
127
|
+
throw awaitingReceipts ? setupFailure(error) : error;
|
|
128
|
+
}
|
|
64
129
|
finally { budget.signal.removeEventListener("abort", cancelSetup); }
|
|
65
130
|
}
|
|
@@ -4,7 +4,7 @@ import { createHash } from "node:crypto";
|
|
|
4
4
|
import { readBoundedResponseBody } from "../lib/bounded-body";
|
|
5
5
|
import { CLAUDE_CLI_USER_AGENT } from "../providers/claude-cli-identity";
|
|
6
6
|
import type { OAuthCredentials } from "./types";
|
|
7
|
-
import {
|
|
7
|
+
import { normalizeAnthropicPlan } from "../providers/anthropic-subscription";
|
|
8
8
|
|
|
9
9
|
const PROFILE_URL = "https://api.anthropic.com/api/oauth/profile";
|
|
10
10
|
const PROFILE_TIMEOUT_MS = 10_000;
|
|
@@ -55,11 +55,7 @@ export const resolveAnthropicAccountIdentity: AnthropicIdentityResolver = async
|
|
|
55
55
|
const organization = "organization" in data ? data.organization : undefined;
|
|
56
56
|
const org = organization && typeof organization === "object"
|
|
57
57
|
? organization as Record<string, unknown> : undefined;
|
|
58
|
-
const
|
|
59
|
-
const label = normalizeOAuthPlan(value);
|
|
60
|
-
return label ? normalizeOAuthPlan(label.startsWith(prefix) ? label.slice(prefix.length) : label) : undefined;
|
|
61
|
-
};
|
|
62
|
-
const plan = strip(org?.rate_limit_tier, "default_claude_") ?? strip(org?.organization_type, "claude_");
|
|
58
|
+
const plan = normalizeAnthropicPlan(org?.rate_limit_tier) ?? normalizeAnthropicPlan(org?.organization_type);
|
|
63
59
|
return { ...identity, ...(plan ? { plan } : {}) };
|
|
64
60
|
} catch {
|
|
65
61
|
// Unavailable identity is an explicit unresolved result, never an ownership guess.
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
/** Content-free discovery observations. Never enumerate upstream keys or serialize its objects. */
|
|
2
|
+
function projectValueType(value: unknown): string {
|
|
3
|
+
if (value === undefined) return "absent";
|
|
4
|
+
if (typeof value === "string") return "string";
|
|
5
|
+
if (value && typeof value === "object" && !Array.isArray(value)) {
|
|
6
|
+
return typeof (value as { id?: unknown }).id === "string" ? "object-with-id" : "object-without-id";
|
|
7
|
+
}
|
|
8
|
+
return "other";
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
function projectTypes(data: unknown): Record<string, string> {
|
|
12
|
+
const object = data && typeof data === "object" && !Array.isArray(data)
|
|
13
|
+
? data as Record<string, unknown> : undefined;
|
|
14
|
+
return {
|
|
15
|
+
cloudaicompanionProject: projectValueType(object?.cloudaicompanionProject),
|
|
16
|
+
projectId: projectValueType(object?.projectId),
|
|
17
|
+
project: projectValueType(object?.project),
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
/** Published only when the existing parser did not discover a project; never used for admission.
|
|
22
|
+
* `undefined` means JSON was unparseable or, for HTTP refusals, deliberately not inspected.
|
|
23
|
+
*/
|
|
24
|
+
export function summarizeAntigravityDiscovery(
|
|
25
|
+
stage: "loadCodeAssist" | "onboardUser",
|
|
26
|
+
status: number,
|
|
27
|
+
data: unknown,
|
|
28
|
+
): string {
|
|
29
|
+
const root = data === undefined ? "unparseable" : Array.isArray(data) ? "array"
|
|
30
|
+
: data && typeof data === "object" ? "object" : "other";
|
|
31
|
+
const object = root === "object" ? data as Record<string, unknown> : undefined;
|
|
32
|
+
const done = object?.done === undefined ? "absent" : object.done === true ? "true"
|
|
33
|
+
: object.done === false ? "false" : "other";
|
|
34
|
+
const error = object && Object.hasOwn(object, "error") ? "present" : "absent";
|
|
35
|
+
const outcome = status < 200 || status >= 300 ? "http-refusal"
|
|
36
|
+
: root === "unparseable" ? "unparseable" : root !== "object" ? "invalid-root"
|
|
37
|
+
: stage === "loadCodeAssist" ? "no-project"
|
|
38
|
+
: done !== "true" ? "pending" : error === "present" ? "done-with-error" : "done-without-project";
|
|
39
|
+
return JSON.stringify({
|
|
40
|
+
stage, status, root, outcome, done, error,
|
|
41
|
+
projects: projectTypes(object),
|
|
42
|
+
response: projectTypes(object?.response),
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
const DISCOVERY_FAILURE_MESSAGE = "Antigravity login could not discover a Cloud Code Assist project for this account. Ensure the account has Antigravity/Cloud Code Assist access and try again.";
|
|
47
|
+
|
|
48
|
+
/** Only sanitizer outputs can enter this error's public message; raw responses are never retained. */
|
|
49
|
+
export class AntigravityProjectDiscoveryError extends Error {
|
|
50
|
+
#summaries: string[] = [];
|
|
51
|
+
|
|
52
|
+
constructor() {
|
|
53
|
+
super(DISCOVERY_FAILURE_MESSAGE);
|
|
54
|
+
this.name = "AntigravityProjectDiscoveryError";
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
observe(stage: "loadCodeAssist" | "onboardUser", status: number, data: unknown): void {
|
|
58
|
+
this.#summaries[stage === "loadCodeAssist" ? 0 : 1] = summarizeAntigravityDiscovery(stage, status, data);
|
|
59
|
+
this.message = this.publicMessage;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
get publicMessage(): string {
|
|
63
|
+
return `${DISCOVERY_FAILURE_MESSAGE} Discovery: ${this.#summaries.join("; ")}`;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
@@ -14,6 +14,7 @@ import { generatePKCE } from "./pkce";
|
|
|
14
14
|
import { normalizeOAuthPlan } from "./plan";
|
|
15
15
|
import type { OAuthController, OAuthCredentials } from "./types";
|
|
16
16
|
import { antigravityUserAgent, ANTIGRAVITY_IDE_VERSION } from "../adapters/client-fingerprint";
|
|
17
|
+
import { AntigravityProjectDiscoveryError } from "./antigravity-discovery-diagnostics";
|
|
17
18
|
|
|
18
19
|
const CLIENT_ID = process.env.GOOGLE_ANTIGRAVITY_CLIENT_ID
|
|
19
20
|
|| "1071006060591-tmhssin2h21lcre235vtolojh4g403ep.apps.googleusercontent.com";
|
|
@@ -101,15 +102,19 @@ function extractProjectId(data: Record<string, unknown> | undefined): string | u
|
|
|
101
102
|
return undefined;
|
|
102
103
|
}
|
|
103
104
|
|
|
104
|
-
async function loadCodeAssistProject(accessToken: string, signal?: AbortSignal): Promise<{ projectId?: string; plan: string | null; defaultTierId?: string } | undefined> {
|
|
105
|
+
async function loadCodeAssistProject(accessToken: string, signal?: AbortSignal, diagnostics?: AntigravityProjectDiscoveryError): Promise<{ projectId?: string; plan: string | null; defaultTierId?: string } | undefined> {
|
|
105
106
|
const response = await fetch(`${PROD_API}/${API_VERSION}:loadCodeAssist`, {
|
|
106
107
|
method: "POST",
|
|
107
108
|
headers: { Authorization: `Bearer ${accessToken}`, Accept: "*/*", "Content-Type": "application/json", "User-Agent": antigravityUserAgent() },
|
|
108
109
|
body: JSON.stringify({ metadata: { ideType: "ANTIGRAVITY" } }),
|
|
109
110
|
signal: requestSignal(signal),
|
|
110
111
|
});
|
|
111
|
-
if (!response.ok)
|
|
112
|
+
if (!response.ok) {
|
|
113
|
+
diagnostics?.observe("loadCodeAssist", response.status, undefined);
|
|
114
|
+
return undefined;
|
|
115
|
+
}
|
|
112
116
|
const data: unknown = await response.json().catch(() => undefined);
|
|
117
|
+
diagnostics?.observe("loadCodeAssist", response.status, data);
|
|
113
118
|
if (!data || typeof data !== "object" || Array.isArray(data)) return undefined;
|
|
114
119
|
const payload = data as Record<string, unknown>;
|
|
115
120
|
const tier = (value: unknown) => value && typeof value === "object" && "id" in value
|
|
@@ -133,7 +138,7 @@ async function loadCodeAssistProject(accessToken: string, signal?: AbortSignal):
|
|
|
133
138
|
};
|
|
134
139
|
}
|
|
135
140
|
|
|
136
|
-
async function onboardProject(accessToken: string, signal?: AbortSignal, tierId = "free-tier"): Promise<string | undefined> {
|
|
141
|
+
async function onboardProject(accessToken: string, signal?: AbortSignal, tierId = "free-tier", diagnostics?: AntigravityProjectDiscoveryError): Promise<string | undefined> {
|
|
137
142
|
for (let attempt = 0; attempt < ONBOARD_ATTEMPTS; attempt++) {
|
|
138
143
|
if (signal?.aborted) throw signal.reason ?? new Error("Antigravity onboarding aborted");
|
|
139
144
|
const response = await fetch(`${DAILY_API}/${API_VERSION}:onboardUser`, {
|
|
@@ -148,6 +153,7 @@ async function onboardProject(accessToken: string, signal?: AbortSignal, tierId
|
|
|
148
153
|
signal: requestSignal(signal),
|
|
149
154
|
});
|
|
150
155
|
if (!response.ok) {
|
|
156
|
+
diagnostics?.observe("onboardUser", response.status, undefined);
|
|
151
157
|
// Transient (429/5xx): keep polling within the attempt budget. Hard 4xx: give up now.
|
|
152
158
|
if (response.status === 429 || response.status >= 500) {
|
|
153
159
|
await new Promise(resolve => setTimeout(resolve, ONBOARD_POLL_MS));
|
|
@@ -155,7 +161,13 @@ async function onboardProject(accessToken: string, signal?: AbortSignal, tierId
|
|
|
155
161
|
}
|
|
156
162
|
return undefined;
|
|
157
163
|
}
|
|
158
|
-
|
|
164
|
+
let unparseable = false;
|
|
165
|
+
const data = (await response.json().catch(() => { unparseable = true; return {}; })) as Record<string, unknown>;
|
|
166
|
+
// Keep only the last poll, and only sanitized text. Parsing/admission below is unchanged.
|
|
167
|
+
diagnostics?.observe("onboardUser", response.status, unparseable ? undefined : data);
|
|
168
|
+
// A JSON `null` used to end polling with a TypeError on `data.done`; end it explicitly instead,
|
|
169
|
+
// keeping the one-poll budget, so the caller still raises the recorded discovery error.
|
|
170
|
+
if (data === null) return undefined;
|
|
159
171
|
if (data.done === true) {
|
|
160
172
|
return extractProjectId(data.response as Record<string, unknown> | undefined);
|
|
161
173
|
}
|
|
@@ -169,13 +181,13 @@ export async function discoverAntigravityProject(accessToken: string, signal?: A
|
|
|
169
181
|
return (await discoverAntigravityAccount(accessToken, signal)).projectId;
|
|
170
182
|
}
|
|
171
183
|
|
|
172
|
-
async function discoverAntigravityAccount(accessToken: string, signal?: AbortSignal): Promise<{ projectId?: string; plan?: string | null }> {
|
|
173
|
-
const account = await loadCodeAssistProject(accessToken, signal);
|
|
184
|
+
async function discoverAntigravityAccount(accessToken: string, signal?: AbortSignal, diagnostics?: AntigravityProjectDiscoveryError): Promise<{ projectId?: string; plan?: string | null }> {
|
|
185
|
+
const account = await loadCodeAssistProject(accessToken, signal, diagnostics);
|
|
174
186
|
// Once loadCodeAssist answered, an onboarding failure must not discard its tier observation;
|
|
175
187
|
// a missing project still fails login, and cancellation still propagates.
|
|
176
188
|
const projectId = account?.projectId ?? await (account
|
|
177
|
-
? onboardProject(accessToken, signal, account.defaultTierId).catch(error => { if (signal?.aborted) throw error; return undefined; })
|
|
178
|
-
: onboardProject(accessToken, signal));
|
|
189
|
+
? onboardProject(accessToken, signal, account.defaultTierId, diagnostics).catch(error => { if (signal?.aborted) throw error; return undefined; })
|
|
190
|
+
: onboardProject(accessToken, signal, undefined, diagnostics));
|
|
179
191
|
// An unanswered loadCodeAssist observed nothing; only a parsed body may clear a stored label.
|
|
180
192
|
return { projectId, ...(account ? { plan: account.plan } : {}) };
|
|
181
193
|
}
|
|
@@ -248,11 +260,12 @@ class AntigravityOAuthFlow extends OAuthCallbackFlow {
|
|
|
248
260
|
}, this.ctrl.signal);
|
|
249
261
|
const creds = credentialsFromPayload(payload);
|
|
250
262
|
this.ctrl.onProgress?.("Discovering Cloud Code Assist project");
|
|
251
|
-
const
|
|
263
|
+
const diagnostics = new AntigravityProjectDiscoveryError();
|
|
264
|
+
const { projectId, plan } = await discoverAntigravityAccount(creds.access, this.ctrl.signal, diagnostics);
|
|
252
265
|
if (!projectId) {
|
|
253
266
|
// Fail the login rather than persisting a credential that every request would reject for a
|
|
254
267
|
// missing CCA project — otherwise status shows "logged in" while all calls fail closed.
|
|
255
|
-
throw
|
|
268
|
+
throw diagnostics;
|
|
256
269
|
}
|
|
257
270
|
return { ...creds, projectId, plan };
|
|
258
271
|
}
|
package/src/oauth/index.ts
CHANGED
|
@@ -43,6 +43,7 @@ import { loginKimi, refreshKimiToken } from "./kimi";
|
|
|
43
43
|
import { loginNous, NousTokenError, refreshNousToken, clearNousRefreshIntent, RefreshIntentIOError } from "./nous";
|
|
44
44
|
import { ChatGptTokenRequestError, ChatGptTokenError, loginChatGPT, refreshChatGPTToken, type ChatGPTLoginFlow } from "./chatgpt";
|
|
45
45
|
import { loginAntigravity, refreshAntigravityToken } from "./google-antigravity";
|
|
46
|
+
import { AntigravityProjectDiscoveryError } from "./antigravity-discovery-diagnostics";
|
|
46
47
|
import { loginCursor, refreshCursorToken } from "./cursor";
|
|
47
48
|
import { loginZed, refreshZedToken } from "./zed";
|
|
48
49
|
import { assertDevinCliAdoptionOwnership, loginDevin, refreshDevinToken } from "./devin";
|
|
@@ -96,6 +97,7 @@ import { codexAccountNamespaceProviderCollisionError } from "../codex/account-na
|
|
|
96
97
|
|
|
97
98
|
import { REFRESH_SKEW_MS } from "./refresh-policy";
|
|
98
99
|
import { newerClaudeCredentialForInstance, captureAnthropicCredentialOwnerForInstance } from "./anthropic-continuity";
|
|
100
|
+
import { anthropicSubscriptionLabel } from "../providers/anthropic-subscription";
|
|
99
101
|
import { normalizeOAuthPlan, mergeOAuthPlan } from "./plan";
|
|
100
102
|
import { mergeAnthropicIdentity, type AnthropicIdentityResolver } from "./anthropic-identity";
|
|
101
103
|
import { AnthropicCrossInstanceDuplicateError, AnthropicLocalCliImportError, assertAnthropicCredentialSource } from "./store-anthropic-instance";
|
|
@@ -512,6 +514,7 @@ class OAuthLoginSupersededError extends Error {
|
|
|
512
514
|
|
|
513
515
|
/** Project arbitrary OAuth failures onto the small, stable public error vocabulary. */
|
|
514
516
|
export function publicOAuthAuthenticationErrorMessage(error: unknown): string {
|
|
517
|
+
if (error instanceof AntigravityProjectDiscoveryError) return error.publicMessage;
|
|
515
518
|
if (error instanceof MuseLoginError) return museLoginErrorMessage(error.kind, error.status);
|
|
516
519
|
if (error instanceof OAuthMutationBusyError) {
|
|
517
520
|
return error.message === "OAuth mutation queue wait timed out"
|
|
@@ -1817,6 +1820,8 @@ export interface OAuthAccountSummary {
|
|
|
1817
1820
|
* Missing or invalid labels remain null; quota percentages never establish a subscription.
|
|
1818
1821
|
*/
|
|
1819
1822
|
plan: string | null;
|
|
1823
|
+
/** Anthropic display-only subscription name; absent when no tier was observed. */
|
|
1824
|
+
planLabel?: string;
|
|
1820
1825
|
}
|
|
1821
1826
|
|
|
1822
1827
|
/**
|
|
@@ -1844,6 +1849,8 @@ export function getLoginStatus(provider: string, maskEmails = true, flowId?: str
|
|
|
1844
1849
|
expiresAt: a.credential.expires,
|
|
1845
1850
|
// Explicitly null rather than omitted when upstream tier metadata is unknown.
|
|
1846
1851
|
plan: normalizeOAuthPlan(a.credential.plan) ?? null,
|
|
1852
|
+
...((provider === "anthropic" || provider === "anthropic2") && anthropicSubscriptionLabel(a.credential.plan)
|
|
1853
|
+
? { planLabel: anthropicSubscriptionLabel(a.credential.plan) } : {}),
|
|
1847
1854
|
}));
|
|
1848
1855
|
|
|
1849
1856
|
// A stored credential counts as "logged in" when it exists and is not marked for
|
|
@@ -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
|
}
|