codex-multi-auth 0.1.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/LICENSE +1 -0
- package/README.md +162 -0
- package/assets/opencode-logo-ornate-dark.svg +18 -0
- package/assets/readme-hero.svg +31 -0
- package/config/README.md +87 -0
- package/config/minimal-opencode.json +13 -0
- package/config/opencode-legacy.json +571 -0
- package/config/opencode-modern.json +239 -0
- package/dist/index.d.ts +45 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +3160 -0
- package/dist/index.js.map +1 -0
- package/dist/lib/accounts/rate-limits.d.ts +22 -0
- package/dist/lib/accounts/rate-limits.d.ts.map +1 -0
- package/dist/lib/accounts/rate-limits.js +63 -0
- package/dist/lib/accounts/rate-limits.js.map +1 -0
- package/dist/lib/accounts.d.ts +95 -0
- package/dist/lib/accounts.d.ts.map +1 -0
- package/dist/lib/accounts.js +668 -0
- package/dist/lib/accounts.js.map +1 -0
- package/dist/lib/audit.d.ts +45 -0
- package/dist/lib/audit.d.ts.map +1 -0
- package/dist/lib/audit.js +131 -0
- package/dist/lib/audit.js.map +1 -0
- package/dist/lib/auth/auth.d.ts +56 -0
- package/dist/lib/auth/auth.d.ts.map +1 -0
- package/dist/lib/auth/auth.js +214 -0
- package/dist/lib/auth/auth.js.map +1 -0
- package/dist/lib/auth/browser.d.ts +34 -0
- package/dist/lib/auth/browser.d.ts.map +1 -0
- package/dist/lib/auth/browser.js +185 -0
- package/dist/lib/auth/browser.js.map +1 -0
- package/dist/lib/auth/server.d.ts +24 -0
- package/dist/lib/auth/server.d.ts.map +1 -0
- package/dist/lib/auth/server.js +116 -0
- package/dist/lib/auth/server.js.map +1 -0
- package/dist/lib/auth/token-utils.d.ts +59 -0
- package/dist/lib/auth/token-utils.d.ts.map +1 -0
- package/dist/lib/auth/token-utils.js +331 -0
- package/dist/lib/auth/token-utils.js.map +1 -0
- package/dist/lib/auth-rate-limit.d.ts +20 -0
- package/dist/lib/auth-rate-limit.d.ts.map +1 -0
- package/dist/lib/auth-rate-limit.js +91 -0
- package/dist/lib/auth-rate-limit.js.map +1 -0
- package/dist/lib/auto-update-checker.d.ts +10 -0
- package/dist/lib/auto-update-checker.d.ts.map +1 -0
- package/dist/lib/auto-update-checker.js +216 -0
- package/dist/lib/auto-update-checker.js.map +1 -0
- package/dist/lib/capability-policy.d.ts +18 -0
- package/dist/lib/capability-policy.d.ts.map +1 -0
- package/dist/lib/capability-policy.js +150 -0
- package/dist/lib/capability-policy.js.map +1 -0
- package/dist/lib/circuit-breaker.d.ts +34 -0
- package/dist/lib/circuit-breaker.d.ts.map +1 -0
- package/dist/lib/circuit-breaker.js +124 -0
- package/dist/lib/circuit-breaker.js.map +1 -0
- package/dist/lib/cli.d.ts +64 -0
- package/dist/lib/cli.d.ts.map +1 -0
- package/dist/lib/cli.js +274 -0
- package/dist/lib/cli.js.map +1 -0
- package/dist/lib/codex-cli/observability.d.ts +22 -0
- package/dist/lib/codex-cli/observability.d.ts.map +1 -0
- package/dist/lib/codex-cli/observability.js +36 -0
- package/dist/lib/codex-cli/observability.js.map +1 -0
- package/dist/lib/codex-cli/state.d.ts +86 -0
- package/dist/lib/codex-cli/state.d.ts.map +1 -0
- package/dist/lib/codex-cli/state.js +470 -0
- package/dist/lib/codex-cli/state.js.map +1 -0
- package/dist/lib/codex-cli/sync.d.ts +27 -0
- package/dist/lib/codex-cli/sync.d.ts.map +1 -0
- package/dist/lib/codex-cli/sync.js +325 -0
- package/dist/lib/codex-cli/sync.js.map +1 -0
- package/dist/lib/codex-cli/writer.d.ts +12 -0
- package/dist/lib/codex-cli/writer.d.ts.map +1 -0
- package/dist/lib/codex-cli/writer.js +388 -0
- package/dist/lib/codex-cli/writer.js.map +1 -0
- package/dist/lib/codex-manager.d.ts +2 -0
- package/dist/lib/codex-manager.d.ts.map +1 -0
- package/dist/lib/codex-manager.js +4841 -0
- package/dist/lib/codex-manager.js.map +1 -0
- package/dist/lib/config.d.ts +269 -0
- package/dist/lib/config.d.ts.map +1 -0
- package/dist/lib/config.js +789 -0
- package/dist/lib/config.js.map +1 -0
- package/dist/lib/constants.d.ts +78 -0
- package/dist/lib/constants.d.ts.map +1 -0
- package/dist/lib/constants.js +78 -0
- package/dist/lib/constants.js.map +1 -0
- package/dist/lib/context-overflow.d.ts +27 -0
- package/dist/lib/context-overflow.d.ts.map +1 -0
- package/dist/lib/context-overflow.js +124 -0
- package/dist/lib/context-overflow.js.map +1 -0
- package/dist/lib/dashboard-settings.d.ts +90 -0
- package/dist/lib/dashboard-settings.d.ts.map +1 -0
- package/dist/lib/dashboard-settings.js +327 -0
- package/dist/lib/dashboard-settings.js.map +1 -0
- package/dist/lib/entitlement-cache.d.ts +41 -0
- package/dist/lib/entitlement-cache.d.ts.map +1 -0
- package/dist/lib/entitlement-cache.js +137 -0
- package/dist/lib/entitlement-cache.js.map +1 -0
- package/dist/lib/errors.d.ts +113 -0
- package/dist/lib/errors.d.ts.map +1 -0
- package/dist/lib/errors.js +103 -0
- package/dist/lib/errors.js.map +1 -0
- package/dist/lib/forecast.d.ts +42 -0
- package/dist/lib/forecast.d.ts.map +1 -0
- package/dist/lib/forecast.js +256 -0
- package/dist/lib/forecast.js.map +1 -0
- package/dist/lib/health.d.ts +33 -0
- package/dist/lib/health.d.ts.map +1 -0
- package/dist/lib/health.js +70 -0
- package/dist/lib/health.js.map +1 -0
- package/dist/lib/index.d.ts +32 -0
- package/dist/lib/index.d.ts.map +1 -0
- package/dist/lib/index.js +32 -0
- package/dist/lib/index.js.map +1 -0
- package/dist/lib/live-account-sync.d.ts +39 -0
- package/dist/lib/live-account-sync.d.ts.map +1 -0
- package/dist/lib/live-account-sync.js +196 -0
- package/dist/lib/live-account-sync.js.map +1 -0
- package/dist/lib/logger.d.ts +40 -0
- package/dist/lib/logger.d.ts.map +1 -0
- package/dist/lib/logger.js +364 -0
- package/dist/lib/logger.js.map +1 -0
- package/dist/lib/oauth-success.html +338 -0
- package/dist/lib/parallel-probe.d.ts +28 -0
- package/dist/lib/parallel-probe.d.ts.map +1 -0
- package/dist/lib/parallel-probe.js +97 -0
- package/dist/lib/parallel-probe.js.map +1 -0
- package/dist/lib/preemptive-quota-scheduler.d.ts +53 -0
- package/dist/lib/preemptive-quota-scheduler.d.ts.map +1 -0
- package/dist/lib/preemptive-quota-scheduler.js +220 -0
- package/dist/lib/preemptive-quota-scheduler.js.map +1 -0
- package/dist/lib/proactive-refresh.d.ts +66 -0
- package/dist/lib/proactive-refresh.d.ts.map +1 -0
- package/dist/lib/proactive-refresh.js +143 -0
- package/dist/lib/proactive-refresh.js.map +1 -0
- package/dist/lib/prompts/codex-opencode-bridge.d.ts +19 -0
- package/dist/lib/prompts/codex-opencode-bridge.d.ts.map +1 -0
- package/dist/lib/prompts/codex-opencode-bridge.js +169 -0
- package/dist/lib/prompts/codex-opencode-bridge.js.map +1 -0
- package/dist/lib/prompts/codex.d.ts +41 -0
- package/dist/lib/prompts/codex.d.ts.map +1 -0
- package/dist/lib/prompts/codex.js +383 -0
- package/dist/lib/prompts/codex.js.map +1 -0
- package/dist/lib/prompts/opencode-codex.d.ts +25 -0
- package/dist/lib/prompts/opencode-codex.d.ts.map +1 -0
- package/dist/lib/prompts/opencode-codex.js +270 -0
- package/dist/lib/prompts/opencode-codex.js.map +1 -0
- package/dist/lib/quota-cache.d.ts +68 -0
- package/dist/lib/quota-cache.d.ts.map +1 -0
- package/dist/lib/quota-cache.js +224 -0
- package/dist/lib/quota-cache.js.map +1 -0
- package/dist/lib/quota-probe.d.ts +49 -0
- package/dist/lib/quota-probe.d.ts.map +1 -0
- package/dist/lib/quota-probe.js +368 -0
- package/dist/lib/quota-probe.js.map +1 -0
- package/dist/lib/recovery/constants.d.ts +12 -0
- package/dist/lib/recovery/constants.d.ts.map +1 -0
- package/dist/lib/recovery/constants.js +31 -0
- package/dist/lib/recovery/constants.js.map +1 -0
- package/dist/lib/recovery/index.d.ts +12 -0
- package/dist/lib/recovery/index.d.ts.map +1 -0
- package/dist/lib/recovery/index.js +12 -0
- package/dist/lib/recovery/index.js.map +1 -0
- package/dist/lib/recovery/storage.d.ts +24 -0
- package/dist/lib/recovery/storage.d.ts.map +1 -0
- package/dist/lib/recovery/storage.js +362 -0
- package/dist/lib/recovery/storage.js.map +1 -0
- package/dist/lib/recovery/types.d.ts +116 -0
- package/dist/lib/recovery/types.d.ts.map +1 -0
- package/dist/lib/recovery/types.js +7 -0
- package/dist/lib/recovery/types.js.map +1 -0
- package/dist/lib/recovery.d.ts +31 -0
- package/dist/lib/recovery.d.ts.map +1 -0
- package/dist/lib/recovery.js +313 -0
- package/dist/lib/recovery.js.map +1 -0
- package/dist/lib/refresh-guardian.d.ts +31 -0
- package/dist/lib/refresh-guardian.d.ts.map +1 -0
- package/dist/lib/refresh-guardian.js +151 -0
- package/dist/lib/refresh-guardian.js.map +1 -0
- package/dist/lib/refresh-lease.d.ts +37 -0
- package/dist/lib/refresh-lease.d.ts.map +1 -0
- package/dist/lib/refresh-lease.js +335 -0
- package/dist/lib/refresh-lease.js.map +1 -0
- package/dist/lib/refresh-queue.d.ts +117 -0
- package/dist/lib/refresh-queue.d.ts.map +1 -0
- package/dist/lib/refresh-queue.js +297 -0
- package/dist/lib/refresh-queue.js.map +1 -0
- package/dist/lib/request/failure-policy.d.ts +42 -0
- package/dist/lib/request/failure-policy.d.ts.map +1 -0
- package/dist/lib/request/failure-policy.js +133 -0
- package/dist/lib/request/failure-policy.js.map +1 -0
- package/dist/lib/request/fetch-helpers.d.ts +152 -0
- package/dist/lib/request/fetch-helpers.d.ts.map +1 -0
- package/dist/lib/request/fetch-helpers.js +704 -0
- package/dist/lib/request/fetch-helpers.js.map +1 -0
- package/dist/lib/request/helpers/input-utils.d.ts +7 -0
- package/dist/lib/request/helpers/input-utils.d.ts.map +1 -0
- package/dist/lib/request/helpers/input-utils.js +214 -0
- package/dist/lib/request/helpers/input-utils.js.map +1 -0
- package/dist/lib/request/helpers/model-map.d.ts +28 -0
- package/dist/lib/request/helpers/model-map.d.ts.map +1 -0
- package/dist/lib/request/helpers/model-map.js +133 -0
- package/dist/lib/request/helpers/model-map.js.map +1 -0
- package/dist/lib/request/helpers/tool-utils.d.ts +29 -0
- package/dist/lib/request/helpers/tool-utils.d.ts.map +1 -0
- package/dist/lib/request/helpers/tool-utils.js +117 -0
- package/dist/lib/request/helpers/tool-utils.js.map +1 -0
- package/dist/lib/request/rate-limit-backoff.d.ts +17 -0
- package/dist/lib/request/rate-limit-backoff.d.ts.map +1 -0
- package/dist/lib/request/rate-limit-backoff.js +83 -0
- package/dist/lib/request/rate-limit-backoff.js.map +1 -0
- package/dist/lib/request/request-transformer.d.ts +107 -0
- package/dist/lib/request/request-transformer.d.ts.map +1 -0
- package/dist/lib/request/request-transformer.js +814 -0
- package/dist/lib/request/request-transformer.js.map +1 -0
- package/dist/lib/request/response-handler.d.ts +23 -0
- package/dist/lib/request/response-handler.d.ts.map +1 -0
- package/dist/lib/request/response-handler.js +155 -0
- package/dist/lib/request/response-handler.js.map +1 -0
- package/dist/lib/request/stream-failover.d.ts +21 -0
- package/dist/lib/request/stream-failover.d.ts.map +1 -0
- package/dist/lib/request/stream-failover.js +204 -0
- package/dist/lib/request/stream-failover.js.map +1 -0
- package/dist/lib/rotation.d.ts +146 -0
- package/dist/lib/rotation.d.ts.map +1 -0
- package/dist/lib/rotation.js +321 -0
- package/dist/lib/rotation.js.map +1 -0
- package/dist/lib/runtime-paths.d.ts +58 -0
- package/dist/lib/runtime-paths.d.ts.map +1 -0
- package/dist/lib/runtime-paths.js +164 -0
- package/dist/lib/runtime-paths.js.map +1 -0
- package/dist/lib/schemas.d.ts +435 -0
- package/dist/lib/schemas.d.ts.map +1 -0
- package/dist/lib/schemas.js +268 -0
- package/dist/lib/schemas.js.map +1 -0
- package/dist/lib/session-affinity.d.ts +23 -0
- package/dist/lib/session-affinity.d.ts.map +1 -0
- package/dist/lib/session-affinity.js +127 -0
- package/dist/lib/session-affinity.js.map +1 -0
- package/dist/lib/shutdown.d.ts +7 -0
- package/dist/lib/shutdown.d.ts.map +1 -0
- package/dist/lib/shutdown.js +43 -0
- package/dist/lib/shutdown.js.map +1 -0
- package/dist/lib/storage/migrations.d.ts +59 -0
- package/dist/lib/storage/migrations.d.ts.map +1 -0
- package/dist/lib/storage/migrations.js +41 -0
- package/dist/lib/storage/migrations.js.map +1 -0
- package/dist/lib/storage/paths.d.ts +51 -0
- package/dist/lib/storage/paths.d.ts.map +1 -0
- package/dist/lib/storage/paths.js +152 -0
- package/dist/lib/storage/paths.js.map +1 -0
- package/dist/lib/storage.d.ts +106 -0
- package/dist/lib/storage.d.ts.map +1 -0
- package/dist/lib/storage.js +896 -0
- package/dist/lib/storage.js.map +1 -0
- package/dist/lib/table-formatter.d.ts +32 -0
- package/dist/lib/table-formatter.d.ts.map +1 -0
- package/dist/lib/table-formatter.js +44 -0
- package/dist/lib/table-formatter.js.map +1 -0
- package/dist/lib/tools/hashline-tools.d.ts +51 -0
- package/dist/lib/tools/hashline-tools.d.ts.map +1 -0
- package/dist/lib/tools/hashline-tools.js +456 -0
- package/dist/lib/tools/hashline-tools.js.map +1 -0
- package/dist/lib/types.d.ts +130 -0
- package/dist/lib/types.d.ts.map +1 -0
- package/dist/lib/types.js +2 -0
- package/dist/lib/types.js.map +1 -0
- package/dist/lib/ui/ansi.d.ts +40 -0
- package/dist/lib/ui/ansi.d.ts.map +1 -0
- package/dist/lib/ui/ansi.js +68 -0
- package/dist/lib/ui/ansi.js.map +1 -0
- package/dist/lib/ui/auth-menu.d.ts +76 -0
- package/dist/lib/ui/auth-menu.d.ts.map +1 -0
- package/dist/lib/ui/auth-menu.js +590 -0
- package/dist/lib/ui/auth-menu.js.map +1 -0
- package/dist/lib/ui/confirm.d.ts +11 -0
- package/dist/lib/ui/confirm.d.ts.map +1 -0
- package/dist/lib/ui/confirm.js +29 -0
- package/dist/lib/ui/confirm.js.map +1 -0
- package/dist/lib/ui/copy.d.ts +123 -0
- package/dist/lib/ui/copy.d.ts.map +1 -0
- package/dist/lib/ui/copy.js +127 -0
- package/dist/lib/ui/copy.js.map +1 -0
- package/dist/lib/ui/format.d.ts +62 -0
- package/dist/lib/ui/format.d.ts.map +1 -0
- package/dist/lib/ui/format.js +205 -0
- package/dist/lib/ui/format.js.map +1 -0
- package/dist/lib/ui/runtime.d.ts +43 -0
- package/dist/lib/ui/runtime.d.ts.map +1 -0
- package/dist/lib/ui/runtime.js +69 -0
- package/dist/lib/ui/runtime.js.map +1 -0
- package/dist/lib/ui/select.d.ts +60 -0
- package/dist/lib/ui/select.d.ts.map +1 -0
- package/dist/lib/ui/select.js +467 -0
- package/dist/lib/ui/select.js.map +1 -0
- package/dist/lib/ui/theme.d.ts +56 -0
- package/dist/lib/ui/theme.d.ts.map +1 -0
- package/dist/lib/ui/theme.js +186 -0
- package/dist/lib/ui/theme.js.map +1 -0
- package/dist/lib/unified-settings.d.ts +71 -0
- package/dist/lib/unified-settings.d.ts.map +1 -0
- package/dist/lib/unified-settings.js +299 -0
- package/dist/lib/unified-settings.js.map +1 -0
- package/dist/lib/utils.d.ts +29 -0
- package/dist/lib/utils.d.ts.map +1 -0
- package/dist/lib/utils.js +54 -0
- package/dist/lib/utils.js.map +1 -0
- package/package.json +115 -0
- package/scripts/audit-dev-allowlist.js +128 -0
- package/scripts/bench-format/hashline-v2.mjs +642 -0
- package/scripts/bench-format/models.mjs +105 -0
- package/scripts/bench-format/opencode.mjs +205 -0
- package/scripts/bench-format/render.mjs +496 -0
- package/scripts/bench-format/stats.mjs +54 -0
- package/scripts/bench-format/tasks.mjs +151 -0
- package/scripts/benchmark-edit-formats.mjs +1161 -0
- package/scripts/benchmark-render-dashboard.mjs +49 -0
- package/scripts/codex-multi-auth.js +6 -0
- package/scripts/codex-routing.js +34 -0
- package/scripts/codex.js +122 -0
- package/scripts/copy-oauth-success.js +37 -0
- package/scripts/install-opencode-codex-auth.js +193 -0
- package/scripts/test-all-models.sh +7 -0
- package/scripts/test-model-matrix.js +424 -0
- package/scripts/validate-model-map.sh +7 -0
|
@@ -0,0 +1,313 @@
|
|
|
1
|
+
import { createLogger } from "./logger.js";
|
|
2
|
+
import { readParts, findMessagesWithThinkingBlocks, findMessagesWithOrphanThinking, findMessageByIndexNeedingThinking, prependThinkingPart, stripThinkingParts, } from "./recovery/storage.js";
|
|
3
|
+
const RECOVERY_RESUME_TEXT = "[session recovered - continuing previous task]";
|
|
4
|
+
function getErrorMessage(error) {
|
|
5
|
+
if (!error)
|
|
6
|
+
return "";
|
|
7
|
+
if (typeof error === "string")
|
|
8
|
+
return error.toLowerCase();
|
|
9
|
+
const errorObj = error;
|
|
10
|
+
const paths = [
|
|
11
|
+
errorObj.data,
|
|
12
|
+
errorObj.error,
|
|
13
|
+
errorObj,
|
|
14
|
+
errorObj.data?.error,
|
|
15
|
+
];
|
|
16
|
+
for (const obj of paths) {
|
|
17
|
+
if (obj && typeof obj === "object") {
|
|
18
|
+
const msg = obj.message;
|
|
19
|
+
if (typeof msg === "string" && msg.length > 0) {
|
|
20
|
+
return msg.toLowerCase();
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
try {
|
|
25
|
+
return JSON.stringify(error).toLowerCase();
|
|
26
|
+
}
|
|
27
|
+
catch {
|
|
28
|
+
return "";
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
function extractMessageIndex(error) {
|
|
32
|
+
const message = getErrorMessage(error);
|
|
33
|
+
const match = message.match(/messages\.(\d+)/);
|
|
34
|
+
if (!match || !match[1])
|
|
35
|
+
return null;
|
|
36
|
+
return parseInt(match[1], 10);
|
|
37
|
+
}
|
|
38
|
+
export function detectErrorType(error) {
|
|
39
|
+
const message = getErrorMessage(error);
|
|
40
|
+
if (message.includes("tool_use") && message.includes("tool_result")) {
|
|
41
|
+
return "tool_result_missing";
|
|
42
|
+
}
|
|
43
|
+
if (message.includes("thinking") &&
|
|
44
|
+
(message.includes("first block") ||
|
|
45
|
+
message.includes("must start with") ||
|
|
46
|
+
message.includes("preceeding") ||
|
|
47
|
+
(message.includes("expected") && message.includes("found")))) {
|
|
48
|
+
return "thinking_block_order";
|
|
49
|
+
}
|
|
50
|
+
if (message.includes("thinking is disabled") && message.includes("cannot contain")) {
|
|
51
|
+
return "thinking_disabled_violation";
|
|
52
|
+
}
|
|
53
|
+
return null;
|
|
54
|
+
}
|
|
55
|
+
export function isRecoverableError(error) {
|
|
56
|
+
return detectErrorType(error) !== null;
|
|
57
|
+
}
|
|
58
|
+
function extractToolUseIds(parts) {
|
|
59
|
+
return parts
|
|
60
|
+
.filter((p) => p.type === "tool_use" && !!p.id)
|
|
61
|
+
.map((p) => p.id);
|
|
62
|
+
}
|
|
63
|
+
async function sendToolResultsForRecovery(client, sessionID, toolResultParts) {
|
|
64
|
+
const bodyWithParts = {
|
|
65
|
+
parts: toolResultParts,
|
|
66
|
+
};
|
|
67
|
+
await client.session.prompt({
|
|
68
|
+
path: { id: sessionID },
|
|
69
|
+
body: bodyWithParts,
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
async function recoverToolResultMissing(client, sessionID, failedMsg) {
|
|
73
|
+
let parts = failedMsg.parts || [];
|
|
74
|
+
if (parts.length === 0 && failedMsg.info?.id) {
|
|
75
|
+
const storedParts = readParts(failedMsg.info.id);
|
|
76
|
+
parts = storedParts.map((p) => ({
|
|
77
|
+
type: p.type === "tool" ? "tool_use" : p.type,
|
|
78
|
+
id: "callID" in p ? p.callID : p.id,
|
|
79
|
+
name: "tool" in p ? p.tool : undefined,
|
|
80
|
+
input: "state" in p ? p.state?.input : undefined,
|
|
81
|
+
}));
|
|
82
|
+
}
|
|
83
|
+
const toolUseIds = extractToolUseIds(parts);
|
|
84
|
+
if (toolUseIds.length === 0) {
|
|
85
|
+
return false;
|
|
86
|
+
}
|
|
87
|
+
const toolResultParts = toolUseIds.map((id) => ({
|
|
88
|
+
type: "tool_result",
|
|
89
|
+
tool_use_id: id,
|
|
90
|
+
content: "Operation cancelled by user (ESC pressed)",
|
|
91
|
+
}));
|
|
92
|
+
try {
|
|
93
|
+
await sendToolResultsForRecovery(client, sessionID, toolResultParts);
|
|
94
|
+
return true;
|
|
95
|
+
}
|
|
96
|
+
catch {
|
|
97
|
+
return false;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
function recoverThinkingBlockOrder(sessionID, _failedMsg, error) {
|
|
101
|
+
const targetIndex = extractMessageIndex(error);
|
|
102
|
+
if (targetIndex !== null) {
|
|
103
|
+
const targetMessageID = findMessageByIndexNeedingThinking(sessionID, targetIndex);
|
|
104
|
+
if (targetMessageID) {
|
|
105
|
+
return prependThinkingPart(sessionID, targetMessageID);
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
const orphanMessages = findMessagesWithOrphanThinking(sessionID);
|
|
109
|
+
if (orphanMessages.length === 0) {
|
|
110
|
+
return false;
|
|
111
|
+
}
|
|
112
|
+
let anySuccess = false;
|
|
113
|
+
for (const messageID of orphanMessages) {
|
|
114
|
+
if (prependThinkingPart(sessionID, messageID)) {
|
|
115
|
+
anySuccess = true;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
return anySuccess;
|
|
119
|
+
}
|
|
120
|
+
function recoverThinkingDisabledViolation(sessionID, _failedMsg) {
|
|
121
|
+
const messagesWithThinking = findMessagesWithThinkingBlocks(sessionID);
|
|
122
|
+
if (messagesWithThinking.length === 0) {
|
|
123
|
+
return false;
|
|
124
|
+
}
|
|
125
|
+
let anySuccess = false;
|
|
126
|
+
for (const messageID of messagesWithThinking) {
|
|
127
|
+
if (stripThinkingParts(messageID)) {
|
|
128
|
+
anySuccess = true;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
return anySuccess;
|
|
132
|
+
}
|
|
133
|
+
function findLastUserMessage(messages) {
|
|
134
|
+
for (let i = messages.length - 1; i >= 0; i--) {
|
|
135
|
+
if (messages[i]?.info?.role === "user") {
|
|
136
|
+
return messages[i];
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
return undefined;
|
|
140
|
+
}
|
|
141
|
+
function extractResumeConfig(userMessage, sessionID) {
|
|
142
|
+
return {
|
|
143
|
+
sessionID,
|
|
144
|
+
agent: userMessage?.info?.agent,
|
|
145
|
+
model: userMessage?.info?.model,
|
|
146
|
+
};
|
|
147
|
+
}
|
|
148
|
+
async function resumeSession(client, config, directory) {
|
|
149
|
+
try {
|
|
150
|
+
await client.session.prompt({
|
|
151
|
+
path: { id: config.sessionID },
|
|
152
|
+
body: {
|
|
153
|
+
parts: [{ type: "text", text: RECOVERY_RESUME_TEXT }],
|
|
154
|
+
agent: config.agent,
|
|
155
|
+
model: config.model,
|
|
156
|
+
},
|
|
157
|
+
query: { directory },
|
|
158
|
+
});
|
|
159
|
+
return true;
|
|
160
|
+
}
|
|
161
|
+
catch {
|
|
162
|
+
return false;
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
const TOAST_TITLES = {
|
|
166
|
+
tool_result_missing: "Tool Crash Recovery",
|
|
167
|
+
thinking_block_order: "Thinking Block Recovery",
|
|
168
|
+
thinking_disabled_violation: "Thinking Strip Recovery",
|
|
169
|
+
};
|
|
170
|
+
const TOAST_MESSAGES = {
|
|
171
|
+
tool_result_missing: "Injecting cancelled tool results...",
|
|
172
|
+
thinking_block_order: "Fixing message structure...",
|
|
173
|
+
thinking_disabled_violation: "Stripping thinking blocks...",
|
|
174
|
+
};
|
|
175
|
+
export function getRecoveryToastContent(errorType) {
|
|
176
|
+
if (!errorType) {
|
|
177
|
+
return {
|
|
178
|
+
title: "Session Recovery",
|
|
179
|
+
message: "Attempting to recover session...",
|
|
180
|
+
};
|
|
181
|
+
}
|
|
182
|
+
return {
|
|
183
|
+
title: TOAST_TITLES[errorType] || "Session Recovery",
|
|
184
|
+
message: TOAST_MESSAGES[errorType] || "Attempting to recover session...",
|
|
185
|
+
};
|
|
186
|
+
}
|
|
187
|
+
export function getRecoverySuccessToast() {
|
|
188
|
+
return {
|
|
189
|
+
title: "Session Recovered",
|
|
190
|
+
message: "Continuing where you left off...",
|
|
191
|
+
};
|
|
192
|
+
}
|
|
193
|
+
export function getRecoveryFailureToast() {
|
|
194
|
+
return {
|
|
195
|
+
title: "Recovery Failed",
|
|
196
|
+
message: "Please retry or start a new session.",
|
|
197
|
+
};
|
|
198
|
+
}
|
|
199
|
+
export function createSessionRecoveryHook(ctx, config) {
|
|
200
|
+
if (!config.sessionRecovery) {
|
|
201
|
+
return null;
|
|
202
|
+
}
|
|
203
|
+
const { client, directory } = ctx;
|
|
204
|
+
const processingErrors = new Set();
|
|
205
|
+
let onAbortCallback = null;
|
|
206
|
+
let onRecoveryCompleteCallback = null;
|
|
207
|
+
const setOnAbortCallback = (callback) => {
|
|
208
|
+
onAbortCallback = callback;
|
|
209
|
+
};
|
|
210
|
+
const setOnRecoveryCompleteCallback = (callback) => {
|
|
211
|
+
onRecoveryCompleteCallback = callback;
|
|
212
|
+
};
|
|
213
|
+
const handleSessionRecovery = async (info) => {
|
|
214
|
+
if (!info || info.role !== "assistant" || !info.error)
|
|
215
|
+
return false;
|
|
216
|
+
const errorType = detectErrorType(info.error);
|
|
217
|
+
if (!errorType)
|
|
218
|
+
return false;
|
|
219
|
+
const sessionID = info.sessionID;
|
|
220
|
+
if (!sessionID)
|
|
221
|
+
return false;
|
|
222
|
+
let assistantMsgID = info.id;
|
|
223
|
+
const log = createLogger("session-recovery");
|
|
224
|
+
log.debug("Recovery attempt started", {
|
|
225
|
+
errorType,
|
|
226
|
+
sessionID,
|
|
227
|
+
providedMsgID: assistantMsgID ?? "none",
|
|
228
|
+
});
|
|
229
|
+
if (onAbortCallback) {
|
|
230
|
+
onAbortCallback(sessionID);
|
|
231
|
+
}
|
|
232
|
+
await client.session.abort({ path: { id: sessionID } }).catch(() => { });
|
|
233
|
+
const messagesResp = await client.session.messages({
|
|
234
|
+
path: { id: sessionID },
|
|
235
|
+
query: { directory },
|
|
236
|
+
});
|
|
237
|
+
const msgs = messagesResp.data;
|
|
238
|
+
if (!assistantMsgID && msgs && msgs.length > 0) {
|
|
239
|
+
for (let i = msgs.length - 1; i >= 0; i--) {
|
|
240
|
+
const m = msgs[i];
|
|
241
|
+
if (m && m.info?.role === "assistant" && m.info?.id) {
|
|
242
|
+
assistantMsgID = m.info.id;
|
|
243
|
+
log.debug("Found assistant message ID from session messages", {
|
|
244
|
+
msgID: assistantMsgID,
|
|
245
|
+
msgIndex: i,
|
|
246
|
+
});
|
|
247
|
+
break;
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
if (!assistantMsgID) {
|
|
252
|
+
log.debug("No assistant message ID found, cannot recover");
|
|
253
|
+
return false;
|
|
254
|
+
}
|
|
255
|
+
if (processingErrors.has(assistantMsgID))
|
|
256
|
+
return false;
|
|
257
|
+
processingErrors.add(assistantMsgID);
|
|
258
|
+
try {
|
|
259
|
+
const failedMsg = msgs?.find((m) => m.info?.id === assistantMsgID);
|
|
260
|
+
if (!failedMsg) {
|
|
261
|
+
return false;
|
|
262
|
+
}
|
|
263
|
+
const toastContent = getRecoveryToastContent(errorType);
|
|
264
|
+
await client.tui
|
|
265
|
+
.showToast({
|
|
266
|
+
body: {
|
|
267
|
+
title: toastContent.title,
|
|
268
|
+
message: toastContent.message,
|
|
269
|
+
variant: "warning",
|
|
270
|
+
},
|
|
271
|
+
})
|
|
272
|
+
.catch(() => { });
|
|
273
|
+
let success = false;
|
|
274
|
+
if (errorType === "tool_result_missing") {
|
|
275
|
+
success = await recoverToolResultMissing(client, sessionID, failedMsg);
|
|
276
|
+
}
|
|
277
|
+
else if (errorType === "thinking_block_order") {
|
|
278
|
+
success = recoverThinkingBlockOrder(sessionID, failedMsg, info.error);
|
|
279
|
+
if (success && config.autoResume) {
|
|
280
|
+
const lastUser = findLastUserMessage(msgs ?? []);
|
|
281
|
+
const resumeConfig = extractResumeConfig(lastUser, sessionID);
|
|
282
|
+
await resumeSession(client, resumeConfig, directory);
|
|
283
|
+
}
|
|
284
|
+
}
|
|
285
|
+
else if (errorType === "thinking_disabled_violation") {
|
|
286
|
+
success = recoverThinkingDisabledViolation(sessionID, failedMsg);
|
|
287
|
+
if (success && config.autoResume) {
|
|
288
|
+
const lastUser = findLastUserMessage(msgs ?? []);
|
|
289
|
+
const resumeConfig = extractResumeConfig(lastUser, sessionID);
|
|
290
|
+
await resumeSession(client, resumeConfig, directory);
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
return success;
|
|
294
|
+
}
|
|
295
|
+
catch (err) {
|
|
296
|
+
log.error("Recovery failed", { error: String(err) });
|
|
297
|
+
return false;
|
|
298
|
+
}
|
|
299
|
+
finally {
|
|
300
|
+
processingErrors.delete(assistantMsgID);
|
|
301
|
+
if (sessionID && onRecoveryCompleteCallback) {
|
|
302
|
+
onRecoveryCompleteCallback(sessionID);
|
|
303
|
+
}
|
|
304
|
+
}
|
|
305
|
+
};
|
|
306
|
+
return {
|
|
307
|
+
handleSessionRecovery,
|
|
308
|
+
isRecoverableError,
|
|
309
|
+
setOnAbortCallback,
|
|
310
|
+
setOnRecoveryCompleteCallback,
|
|
311
|
+
};
|
|
312
|
+
}
|
|
313
|
+
//# sourceMappingURL=recovery.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"recovery.js","sourceRoot":"","sources":["../../lib/recovery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EACL,SAAS,EACT,8BAA8B,EAC9B,8BAA8B,EAC9B,iCAAiC,EACjC,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAe/B,MAAM,oBAAoB,GAAG,gDAAgD,CAAC;AAE9E,SAAS,eAAe,CAAC,KAAc;IACrC,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IACtB,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC;IAE1D,MAAM,QAAQ,GAAG,KAAgC,CAAC;IAClD,MAAM,KAAK,GAAG;QACZ,QAAQ,CAAC,IAAI;QACb,QAAQ,CAAC,KAAK;QACd,QAAQ;QACP,QAAQ,CAAC,IAAgC,EAAE,KAAK;KAClD,CAAC;IAEF,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YACnC,MAAM,GAAG,GAAI,GAA+B,CAAC,OAAO,CAAC;YACrD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9C,OAAO,GAAG,CAAC,WAAW,EAAE,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IAC7C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAc;IACzC,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC/C,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACrC,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAc;IAC5C,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAEvC,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QACpE,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IAED,IACE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;QAC5B,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;YAC9B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC;YACnC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC9B,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAC9D,CAAC;QACD,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACnF,OAAO,6BAA6B,CAAC;IACvC,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,OAAO,eAAe,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC;AACzC,CAAC;AASD,SAAS,iBAAiB,CAAC,KAAoB;IAC7C,OAAO,KAAK;SACT,MAAM,CAAC,CAAC,CAAC,EAAkC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9E,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAY,CAAC,CAAC;AAChC,CAAC;AAED,KAAK,UAAU,0BAA0B,CACvC,MAAoB,EACpB,SAAiB,EACjB,eAAiC;IAEjC,MAAM,aAAa,GAAG;QACpB,KAAK,EAAE,eAAe;KACoC,CAAC;IAE7D,MAAM,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QAC1B,IAAI,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE;QACvB,IAAI,EAAE,aAA0C;KACjD,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,wBAAwB,CACrC,MAAoB,EACpB,SAAiB,EACjB,SAAsB;IAEtB,IAAI,KAAK,GAAG,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC;IAClC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC;QAC7C,MAAM,WAAW,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjD,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9B,IAAI,EAAE,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;YAC7C,EAAE,EAAE,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAE,CAAyB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;YAC5D,IAAI,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,CAAE,CAAuB,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;YAC7D,KAAK,EAAE,OAAO,IAAI,CAAC,CAAC,CAAC,CAAE,CAAqD,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS;SACtG,CAAC,CAAC,CAAC;IACN,CAAC;IAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAE5C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,eAAe,GAAqB,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAChE,IAAI,EAAE,aAAsB;QAC5B,WAAW,EAAE,EAAE;QACf,OAAO,EAAE,2CAA2C;KACrD,CAAC,CAAC,CAAC;IAEJ,IAAI,CAAC;QACH,MAAM,0BAA0B,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;QAErE,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,yBAAyB,CAChC,SAAiB,EACjB,UAAuB,EACvB,KAAc;IAEd,MAAM,WAAW,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC/C,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;QACzB,MAAM,eAAe,GAAG,iCAAiC,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAClF,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,mBAAmB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IAED,MAAM,cAAc,GAAG,8BAA8B,CAAC,SAAS,CAAC,CAAC;IAEjE,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,KAAK,MAAM,SAAS,IAAI,cAAc,EAAE,CAAC;QACvC,IAAI,mBAAmB,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;YAC9C,UAAU,GAAG,IAAI,CAAC;QACpB,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,gCAAgC,CACvC,SAAiB,EACjB,UAAuB;IAEvB,MAAM,oBAAoB,GAAG,8BAA8B,CAAC,SAAS,CAAC,CAAC;IAEvE,IAAI,oBAAoB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,KAAK,MAAM,SAAS,IAAI,oBAAoB,EAAE,CAAC;QAC7C,IAAI,kBAAkB,CAAC,SAAS,CAAC,EAAE,CAAC;YAClC,UAAU,GAAG,IAAI,CAAC;QACpB,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,mBAAmB,CAAC,QAAuB;IAClD,KAAK,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,KAAK,MAAM,EAAE,CAAC;YACvC,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;QACrB,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,mBAAmB,CAAC,WAAoC,EAAE,SAAiB;IAClF,OAAO;QACL,SAAS;QACT,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK;QAC/B,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK;KAChC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,MAAoB,EACpB,MAAoB,EACpB,SAAiB;IAEjB,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;YAC1B,IAAI,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,SAAS,EAAE;YAC9B,IAAI,EAAE;gBACJ,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC;gBACrD,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,KAAK,EAAE,MAAM,CAAC,KAAK;aACpB;YACD,KAAK,EAAE,EAAE,SAAS,EAAE;SACrB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,YAAY,GAA2B;IAC3C,mBAAmB,EAAE,qBAAqB;IAC1C,oBAAoB,EAAE,yBAAyB;IAC/C,2BAA2B,EAAE,yBAAyB;CACvD,CAAC;AAEF,MAAM,cAAc,GAA2B;IAC7C,mBAAmB,EAAE,qCAAqC;IAC1D,oBAAoB,EAAE,6BAA6B;IACnD,2BAA2B,EAAE,8BAA8B;CAC5D,CAAC;AAEF,MAAM,UAAU,uBAAuB,CAAC,SAA4B;IAIlE,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO;YACL,KAAK,EAAE,kBAAkB;YACzB,OAAO,EAAE,kCAAkC;SAC5C,CAAC;IACJ,CAAC;IACD,OAAO;QACL,KAAK,EAAE,YAAY,CAAC,SAAS,CAAC,IAAI,kBAAkB;QACpD,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,IAAI,kCAAkC;KACzE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB;IAIrC,OAAO;QACL,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EAAE,kCAAkC;KAC5C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB;IAIrC,OAAO;QACL,KAAK,EAAE,iBAAiB;QACxB,OAAO,EAAE,sCAAsC;KAChD,CAAC;AACJ,CAAC;AAcD,MAAM,UAAU,yBAAyB,CACvC,GAA2B,EAC3B,MAAoB;IAEpB,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC;IAClC,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC3C,IAAI,eAAe,GAAyC,IAAI,CAAC;IACjE,IAAI,0BAA0B,GAAyC,IAAI,CAAC;IAE5E,MAAM,kBAAkB,GAAG,CAAC,QAAqC,EAAQ,EAAE;QACzE,eAAe,GAAG,QAAQ,CAAC;IAC7B,CAAC,CAAC;IAEF,MAAM,6BAA6B,GAAG,CAAC,QAAqC,EAAQ,EAAE;QACpF,0BAA0B,GAAG,QAAQ,CAAC;IACxC,CAAC,CAAC;IAEF,MAAM,qBAAqB,GAAG,KAAK,EAAE,IAAiB,EAAoB,EAAE;QAC1E,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,IAAI,CAAC,KAAK;YAAE,OAAO,KAAK,CAAC;QAEpE,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9C,IAAI,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QAE7B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACjC,IAAI,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QAE7B,IAAI,cAAc,GAAG,IAAI,CAAC,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,YAAY,CAAC,kBAAkB,CAAC,CAAC;QAE7C,GAAG,CAAC,KAAK,CAAC,0BAA0B,EAAE;YACpC,SAAS;YACT,SAAS;YACT,aAAa,EAAE,cAAc,IAAI,MAAM;SACxC,CAAC,CAAC;QAEH,IAAI,eAAe,EAAE,CAAC;YACpB,eAAe,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC;QAED,MAAM,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAExE,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;YACjD,IAAI,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE;YACvB,KAAK,EAAE,EAAE,SAAS,EAAE;SACrB,CAAC,CAAC;QACH,MAAM,IAAI,GAAI,YAAyC,CAAC,IAAI,CAAC;QAE7D,IAAI,CAAC,cAAc,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/C,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC1C,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,WAAW,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC;oBACpD,cAAc,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC3B,GAAG,CAAC,KAAK,CAAC,kDAAkD,EAAE;wBAC5D,KAAK,EAAE,cAAc;wBACrB,QAAQ,EAAE,CAAC;qBACZ,CAAC,CAAC;oBACH,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,GAAG,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;YAC3D,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC;YAAE,OAAO,KAAK,CAAC;QACvD,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAErC,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,KAAK,cAAc,CAAC,CAAC;YACnE,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,YAAY,GAAG,uBAAuB,CAAC,SAAS,CAAC,CAAC;YACxD,MAAM,MAAM,CAAC,GAAG;iBACb,SAAS,CAAC;gBACT,IAAI,EAAE;oBACJ,KAAK,EAAE,YAAY,CAAC,KAAK;oBACzB,OAAO,EAAE,YAAY,CAAC,OAAO;oBAC7B,OAAO,EAAE,SAAS;iBACnB;aACF,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YAEnB,IAAI,OAAO,GAAG,KAAK,CAAC;YAEpB,IAAI,SAAS,KAAK,qBAAqB,EAAE,CAAC;gBACxC,OAAO,GAAG,MAAM,wBAAwB,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YACzE,CAAC;iBAAM,IAAI,SAAS,KAAK,sBAAsB,EAAE,CAAC;gBAChD,OAAO,GAAG,yBAAyB,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;gBACtE,IAAI,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;oBACjC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;oBACjD,MAAM,YAAY,GAAG,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;oBAC9D,MAAM,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;gBACvD,CAAC;YACH,CAAC;iBAAM,IAAI,SAAS,KAAK,6BAA6B,EAAE,CAAC;gBACvD,OAAO,GAAG,gCAAgC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;gBACjE,IAAI,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;oBACjC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;oBACjD,MAAM,YAAY,GAAG,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;oBAC9D,MAAM,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;gBACvD,CAAC;YACH,CAAC;YAED,OAAO,OAAO,CAAC;QACjB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACrD,OAAO,KAAK,CAAC;QACf,CAAC;gBAAS,CAAC;YACT,gBAAgB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YAExC,IAAI,SAAS,IAAI,0BAA0B,EAAE,CAAC;gBAC5C,0BAA0B,CAAC,SAAS,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF,OAAO;QACL,qBAAqB;QACrB,kBAAkB;QAClB,kBAAkB;QAClB,6BAA6B;KAC9B,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import type { AccountManager } from "./accounts.js";
|
|
2
|
+
export interface RefreshGuardianOptions {
|
|
3
|
+
intervalMs?: number;
|
|
4
|
+
bufferMs?: number;
|
|
5
|
+
}
|
|
6
|
+
export interface RefreshGuardianStats {
|
|
7
|
+
runs: number;
|
|
8
|
+
refreshed: number;
|
|
9
|
+
failed: number;
|
|
10
|
+
notNeeded: number;
|
|
11
|
+
noRefreshToken: number;
|
|
12
|
+
rateLimited: number;
|
|
13
|
+
networkFailed: number;
|
|
14
|
+
authFailed: number;
|
|
15
|
+
lastRunAt: number | null;
|
|
16
|
+
}
|
|
17
|
+
export declare class RefreshGuardian {
|
|
18
|
+
private readonly getAccountManager;
|
|
19
|
+
private readonly intervalMs;
|
|
20
|
+
private readonly bufferMs;
|
|
21
|
+
private timer;
|
|
22
|
+
private running;
|
|
23
|
+
private stats;
|
|
24
|
+
constructor(getAccountManager: () => AccountManager | null, options?: RefreshGuardianOptions);
|
|
25
|
+
start(): void;
|
|
26
|
+
stop(): void;
|
|
27
|
+
getStats(): RefreshGuardianStats;
|
|
28
|
+
private classifyFailureReason;
|
|
29
|
+
tick(): Promise<void>;
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=refresh-guardian.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"refresh-guardian.d.ts","sourceRoot":"","sources":["../../lib/refresh-guardian.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAMpD,MAAM,WAAW,sBAAsB;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAID,qBAAa,eAAe;IAC3B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA8B;IAChE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,KAAK,CAA+C;IAC5D,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,KAAK,CAUX;gBAGD,iBAAiB,EAAE,MAAM,cAAc,GAAG,IAAI,EAC9C,OAAO,GAAE,sBAA2B;IAOrC,KAAK,IAAI,IAAI;IAcb,IAAI,IAAI,IAAI;IAMZ,QAAQ,IAAI,oBAAoB;IAIhC,OAAO,CAAC,qBAAqB;IAmBvB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CA8E3B"}
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
import { createLogger } from "./logger.js";
|
|
2
|
+
import { applyRefreshResult, refreshExpiringAccounts } from "./proactive-refresh.js";
|
|
3
|
+
const log = createLogger("refresh-guardian");
|
|
4
|
+
const DEFAULT_INTERVAL_MS = 60_000;
|
|
5
|
+
export class RefreshGuardian {
|
|
6
|
+
getAccountManager;
|
|
7
|
+
intervalMs;
|
|
8
|
+
bufferMs;
|
|
9
|
+
timer = null;
|
|
10
|
+
running = false;
|
|
11
|
+
stats = {
|
|
12
|
+
runs: 0,
|
|
13
|
+
refreshed: 0,
|
|
14
|
+
failed: 0,
|
|
15
|
+
notNeeded: 0,
|
|
16
|
+
noRefreshToken: 0,
|
|
17
|
+
rateLimited: 0,
|
|
18
|
+
networkFailed: 0,
|
|
19
|
+
authFailed: 0,
|
|
20
|
+
lastRunAt: null,
|
|
21
|
+
};
|
|
22
|
+
constructor(getAccountManager, options = {}) {
|
|
23
|
+
this.getAccountManager = getAccountManager;
|
|
24
|
+
this.intervalMs = Math.max(5_000, Math.floor(options.intervalMs ?? DEFAULT_INTERVAL_MS));
|
|
25
|
+
this.bufferMs = Math.max(30_000, Math.floor(options.bufferMs ?? 5 * 60_000));
|
|
26
|
+
}
|
|
27
|
+
start() {
|
|
28
|
+
if (this.timer)
|
|
29
|
+
return;
|
|
30
|
+
this.timer = setInterval(() => {
|
|
31
|
+
void this.tick();
|
|
32
|
+
}, this.intervalMs);
|
|
33
|
+
if (typeof this.timer === "object" && "unref" in this.timer && typeof this.timer.unref === "function") {
|
|
34
|
+
this.timer.unref();
|
|
35
|
+
}
|
|
36
|
+
log.debug("Refresh guardian started", {
|
|
37
|
+
intervalMs: this.intervalMs,
|
|
38
|
+
bufferMs: this.bufferMs,
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
stop() {
|
|
42
|
+
if (!this.timer)
|
|
43
|
+
return;
|
|
44
|
+
clearInterval(this.timer);
|
|
45
|
+
this.timer = null;
|
|
46
|
+
}
|
|
47
|
+
getStats() {
|
|
48
|
+
return { ...this.stats };
|
|
49
|
+
}
|
|
50
|
+
classifyFailureReason(tokenResult) {
|
|
51
|
+
if (!tokenResult || tokenResult.type !== "failed") {
|
|
52
|
+
return "network-error";
|
|
53
|
+
}
|
|
54
|
+
const statusCode = tokenResult.statusCode;
|
|
55
|
+
if (statusCode === 429)
|
|
56
|
+
return "rate-limit";
|
|
57
|
+
if (tokenResult.reason === "network_error")
|
|
58
|
+
return "network-error";
|
|
59
|
+
if (tokenResult.reason === "missing_refresh")
|
|
60
|
+
return "auth-failure";
|
|
61
|
+
if (tokenResult.reason === "invalid_response")
|
|
62
|
+
return "auth-failure";
|
|
63
|
+
if (tokenResult.reason === "http_error" &&
|
|
64
|
+
(statusCode === 400 || statusCode === 401 || statusCode === 403)) {
|
|
65
|
+
return "auth-failure";
|
|
66
|
+
}
|
|
67
|
+
return "network-error";
|
|
68
|
+
}
|
|
69
|
+
async tick() {
|
|
70
|
+
if (this.running)
|
|
71
|
+
return;
|
|
72
|
+
const manager = this.getAccountManager();
|
|
73
|
+
if (!manager)
|
|
74
|
+
return;
|
|
75
|
+
this.running = true;
|
|
76
|
+
try {
|
|
77
|
+
const snapshot = manager.getAccountsSnapshot().filter((account) => account.enabled !== false);
|
|
78
|
+
if (snapshot.length === 0) {
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
const refreshResults = await refreshExpiringAccounts(snapshot, this.bufferMs);
|
|
82
|
+
if (refreshResults.size === 0) {
|
|
83
|
+
this.stats.runs += 1;
|
|
84
|
+
this.stats.lastRunAt = Date.now();
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
const snapshotByIndex = new Map();
|
|
88
|
+
for (const candidate of snapshot) {
|
|
89
|
+
snapshotByIndex.set(candidate.index, candidate);
|
|
90
|
+
}
|
|
91
|
+
for (const [accountIndex, result] of refreshResults.entries()) {
|
|
92
|
+
const sourceAccount = snapshotByIndex.get(accountIndex);
|
|
93
|
+
if (!sourceAccount)
|
|
94
|
+
continue;
|
|
95
|
+
const liveAccounts = manager.getAccountsSnapshot();
|
|
96
|
+
const resolvedIndex = liveAccounts.findIndex((candidate) => candidate.refreshToken === sourceAccount.refreshToken);
|
|
97
|
+
const account = resolvedIndex >= 0 ? manager.getAccountByIndex(resolvedIndex) : null;
|
|
98
|
+
if (!account)
|
|
99
|
+
continue;
|
|
100
|
+
switch (result.reason) {
|
|
101
|
+
case "success":
|
|
102
|
+
if (result.tokenResult?.type === "success") {
|
|
103
|
+
applyRefreshResult(account, result.tokenResult);
|
|
104
|
+
manager.clearAuthFailures(account);
|
|
105
|
+
this.stats.refreshed += 1;
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
manager.markAccountCoolingDown(account, this.bufferMs, "network-error");
|
|
109
|
+
this.stats.failed += 1;
|
|
110
|
+
this.stats.networkFailed += 1;
|
|
111
|
+
}
|
|
112
|
+
break;
|
|
113
|
+
case "failed": {
|
|
114
|
+
const cooldownReason = this.classifyFailureReason(result.tokenResult);
|
|
115
|
+
manager.markAccountCoolingDown(account, this.bufferMs, cooldownReason);
|
|
116
|
+
this.stats.failed += 1;
|
|
117
|
+
if (cooldownReason === "rate-limit")
|
|
118
|
+
this.stats.rateLimited += 1;
|
|
119
|
+
else if (cooldownReason === "auth-failure")
|
|
120
|
+
this.stats.authFailed += 1;
|
|
121
|
+
else
|
|
122
|
+
this.stats.networkFailed += 1;
|
|
123
|
+
break;
|
|
124
|
+
}
|
|
125
|
+
case "not_needed":
|
|
126
|
+
this.stats.notNeeded += 1;
|
|
127
|
+
break;
|
|
128
|
+
case "no_refresh_token":
|
|
129
|
+
manager.markAccountCoolingDown(account, this.bufferMs, "auth-failure");
|
|
130
|
+
manager.setAccountEnabled(account.index, false);
|
|
131
|
+
this.stats.noRefreshToken += 1;
|
|
132
|
+
this.stats.failed += 1;
|
|
133
|
+
this.stats.authFailed += 1;
|
|
134
|
+
break;
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
manager.saveToDiskDebounced();
|
|
138
|
+
this.stats.runs += 1;
|
|
139
|
+
this.stats.lastRunAt = Date.now();
|
|
140
|
+
}
|
|
141
|
+
catch (error) {
|
|
142
|
+
log.warn("Refresh guardian tick failed", {
|
|
143
|
+
error: error instanceof Error ? error.message : String(error),
|
|
144
|
+
});
|
|
145
|
+
}
|
|
146
|
+
finally {
|
|
147
|
+
this.running = false;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
//# sourceMappingURL=refresh-guardian.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"refresh-guardian.js","sourceRoot":"","sources":["../../lib/refresh-guardian.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { promises as fs } from "node:fs";
|
|
2
|
+
import type { TokenResult } from "./types.js";
|
|
3
|
+
type LeaseFsOps = Pick<typeof fs, "mkdir" | "open" | "writeFile" | "rename" | "unlink" | "readFile" | "stat" | "readdir">;
|
|
4
|
+
export interface RefreshLeaseCoordinatorOptions {
|
|
5
|
+
enabled?: boolean;
|
|
6
|
+
leaseDir?: string;
|
|
7
|
+
leaseTtlMs?: number;
|
|
8
|
+
waitTimeoutMs?: number;
|
|
9
|
+
pollIntervalMs?: number;
|
|
10
|
+
resultTtlMs?: number;
|
|
11
|
+
fsOps?: LeaseFsOps;
|
|
12
|
+
}
|
|
13
|
+
export interface RefreshLeaseHandle {
|
|
14
|
+
role: "owner" | "follower" | "bypass";
|
|
15
|
+
result?: TokenResult;
|
|
16
|
+
release: (result?: TokenResult) => Promise<void>;
|
|
17
|
+
}
|
|
18
|
+
export declare class RefreshLeaseCoordinator {
|
|
19
|
+
private readonly enabled;
|
|
20
|
+
private readonly leaseDir;
|
|
21
|
+
private readonly leaseTtlMs;
|
|
22
|
+
private readonly waitTimeoutMs;
|
|
23
|
+
private readonly pollIntervalMs;
|
|
24
|
+
private readonly resultTtlMs;
|
|
25
|
+
private readonly fsOps;
|
|
26
|
+
constructor(options?: RefreshLeaseCoordinatorOptions);
|
|
27
|
+
static fromEnvironment(): RefreshLeaseCoordinator;
|
|
28
|
+
acquire(refreshToken: string): Promise<RefreshLeaseHandle>;
|
|
29
|
+
private createBypassHandle;
|
|
30
|
+
private createOwnerHandle;
|
|
31
|
+
private writeResult;
|
|
32
|
+
private readFreshResult;
|
|
33
|
+
private assessLockStaleness;
|
|
34
|
+
private pruneExpiredArtifacts;
|
|
35
|
+
}
|
|
36
|
+
export {};
|
|
37
|
+
//# sourceMappingURL=refresh-lease.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"refresh-lease.d.ts","sourceRoot":"","sources":["../../lib/refresh-lease.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AAKrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAuB9C,KAAK,UAAU,GAAG,IAAI,CACrB,OAAO,EAAE,EACT,OAAO,GAAG,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,MAAM,GAAG,SAAS,CACtF,CAAC;AAEF,MAAM,WAAW,8BAA8B;IAC9C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,UAAU,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IAClC,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,QAAQ,CAAC;IACtC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACjD;AAiHD,qBAAa,uBAAuB;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;gBAEvB,OAAO,GAAE,8BAAmC;IAUxD,MAAM,CAAC,eAAe,IAAI,uBAAuB;IAgB3C,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA6EhE,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,iBAAiB;YAsBX,WAAW;YAmBX,eAAe;YAiBf,mBAAmB;YAuCnB,qBAAqB;CAsBnC"}
|