@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
|
@@ -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
|
@@ -35,6 +35,7 @@ import { getConfigDir, atomicWriteFile, backupInvalidConfig, hardenConfigDir, ha
|
|
|
35
35
|
import { atomicWriteFileNoFollowUnclaimed } from "../config/atomic-write";
|
|
36
36
|
import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
|
|
37
37
|
import { recordOwnedConfigPath } from "../lib/config-ownership";
|
|
38
|
+
import { statTimeMs } from "../lib/file-identity";
|
|
38
39
|
import { MAX_PENDING_OAUTH_MUTATIONS } from "../lib/translator-budget";
|
|
39
40
|
import { publishAccountSelection, publishOAuthAccountPauseChange, publishOAuthAccountRoutingPolicyChange } from "../lib/account-selection-events";
|
|
40
41
|
import {
|
|
@@ -429,18 +430,18 @@ function persist(store: AuthStore): void {
|
|
|
429
430
|
}
|
|
430
431
|
|
|
431
432
|
export class OAuthFileLockError extends Error { readonly code = "OAUTH_FILE_LOCK_UNAVAILABLE"; constructor(message: string, options?: { cause?: unknown }) { super(message, options); this.name = "OAuthFileLockError"; } }
|
|
432
|
-
interface LockSnapshot { bytes: string; dev:
|
|
433
|
+
interface LockSnapshot { bytes: string; dev: bigint; ino: bigint; mtimeMs: number; mtimeNs: bigint; size: bigint }
|
|
433
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 }
|
|
434
435
|
export interface OAuthFileLockGuard { readonly ownerId: string; release(): void }
|
|
435
436
|
function errorCode(error: unknown): string | undefined { return error && typeof error === "object" && "code" in error ? String((error as { code?: unknown }).code) : undefined; }
|
|
436
|
-
function snapshot(path: string): LockSnapshot { const bytes = readFileSync(path, "utf8"); const s = statSync(path); return { bytes, dev:s.dev, ino:s.ino, mtimeMs:s.
|
|
437
|
-
function sameSnapshot(a: LockSnapshot,b: LockSnapshot): boolean { return a.bytes===b.bytes&&a.dev===b.dev&&a.ino===b.ino&&a.
|
|
438
|
-
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; }
|
|
439
440
|
export function createOAuthFileLock(options: OAuthFileLockOptions): { acquire(): Promise<OAuthFileLockGuard> } {
|
|
440
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"));
|
|
441
442
|
if(wait<0||stale<=0||min<0||max<min) throw new OAuthFileLockError("Invalid OAuth file-lock timing options");
|
|
442
|
-
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}); }
|
|
443
|
-
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)))); } } };
|
|
444
445
|
}
|
|
445
446
|
/** Wait long enough for slow IdP refreshes (e.g. Cursor 15s × 3 attempts) before timing out. */
|
|
446
447
|
export const OAUTH_REFRESH_LOCK_WAIT_MS = 60_000;
|
|
@@ -1114,7 +1115,8 @@ export async function appendKiroAccountFromDeviceLogin(
|
|
|
1114
1115
|
return await mutateStore(store => {
|
|
1115
1116
|
const set = store.kiro;
|
|
1116
1117
|
const id = distinctAccountId(safe, set?.accounts ?? []);
|
|
1117
|
-
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()))
|
|
1118
1120
|
? "duplicate_profile_arn" as const : undefined;
|
|
1119
1121
|
const account: ProviderAccount = { id, credential: safe, addedAt: Date.now(), loginId: randomUUID(), loginOrigin: "kiro-device" };
|
|
1120
1122
|
if (set) set.accounts.push(account);
|
|
@@ -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
|
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/** Display metadata only: subscription names never prove identity, entitlement or capacity. */
|
|
2
|
+
import { normalizeOAuthPlan } from "../oauth/plan";
|
|
3
|
+
|
|
4
|
+
const knownPlans = ["pro", "max_5x", "max_20x", "team", "enterprise", "ultra"] as const;
|
|
5
|
+
|
|
6
|
+
/** Canonicalize known aliases only; retain an unfamiliar validated tier verbatim. */
|
|
7
|
+
export function normalizeAnthropicPlan(value: unknown): string | undefined {
|
|
8
|
+
const raw = normalizeOAuthPlan(value === "Ultra" ? "ultra" : value);
|
|
9
|
+
if (!raw) return undefined;
|
|
10
|
+
const short = raw.replace(/^(?:default_)?claude_/, "");
|
|
11
|
+
return knownPlans.some(plan => plan === short) ? short : raw;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export function anthropicSubscriptionLabel(value: unknown): string | undefined {
|
|
15
|
+
const plan = normalizeAnthropicPlan(value);
|
|
16
|
+
switch (plan) {
|
|
17
|
+
case "pro": return "Pro";
|
|
18
|
+
case "max_5x": return "Max 5x";
|
|
19
|
+
case "ultra":
|
|
20
|
+
case "max_20x": return "Ultra";
|
|
21
|
+
case "team": return "Team";
|
|
22
|
+
case "enterprise": return "Enterprise";
|
|
23
|
+
default: return plan;
|
|
24
|
+
}
|
|
25
|
+
}
|