charness 3.0.0 → 3.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/README.md +188 -16
- package/dist/adapters/claudeCliAdapter.d.ts +15 -0
- package/dist/adapters/claudeCliAdapter.d.ts.map +1 -1
- package/dist/adapters/claudeCliAdapter.js +36 -1
- package/dist/adapters/claudeCliAdapter.js.map +1 -1
- package/dist/adapters/claudeConfigDir.d.ts +40 -0
- package/dist/adapters/claudeConfigDir.d.ts.map +1 -0
- package/dist/adapters/claudeConfigDir.js +3 -0
- package/dist/adapters/claudeConfigDir.js.map +1 -0
- package/dist/adapters/claudeJsonStreamAdapter.d.ts +32 -0
- package/dist/adapters/claudeJsonStreamAdapter.d.ts.map +1 -1
- package/dist/adapters/claudeJsonStreamAdapter.js +89 -8
- package/dist/adapters/claudeJsonStreamAdapter.js.map +1 -1
- package/dist/adapters/claudePlatformFlags.d.ts +4 -4
- package/dist/adapters/claudePlatformFlags.js +4 -4
- package/dist/adapters/createAdapter.d.ts +8 -0
- package/dist/adapters/createAdapter.d.ts.map +1 -1
- package/dist/adapters/createAdapter.js +37 -0
- package/dist/adapters/createAdapter.js.map +1 -1
- package/dist/adapters/openCodeAdapter.d.ts +23 -0
- package/dist/adapters/openCodeAdapter.d.ts.map +1 -1
- package/dist/adapters/openCodeAdapter.js +84 -1
- package/dist/adapters/openCodeAdapter.js.map +1 -1
- package/dist/agentLogin/agentLogin.d.ts +15 -2
- package/dist/agentLogin/agentLogin.d.ts.map +1 -1
- package/dist/agentLogin/agentLogin.js +53 -16
- package/dist/agentLogin/agentLogin.js.map +1 -1
- package/dist/apiErrorRetry.d.ts +8 -3
- package/dist/apiErrorRetry.d.ts.map +1 -1
- package/dist/apiErrorRetry.js +36 -5
- package/dist/apiErrorRetry.js.map +1 -1
- package/dist/apiRetryKick.d.ts +9 -0
- package/dist/apiRetryKick.d.ts.map +1 -1
- package/dist/apiRetryKick.js +16 -0
- package/dist/apiRetryKick.js.map +1 -1
- package/dist/bot.d.ts.map +1 -1
- package/dist/bot.js +639 -24
- package/dist/bot.js.map +1 -1
- package/dist/cli/claudeProfiles.d.ts +42 -0
- package/dist/cli/claudeProfiles.d.ts.map +1 -0
- package/dist/cli/claudeProfiles.js +106 -0
- package/dist/cli/claudeProfiles.js.map +1 -0
- package/dist/cli.js +10 -0
- package/dist/cli.js.map +1 -1
- package/dist/connectors/jira/adf.d.ts +2 -0
- package/dist/connectors/jira/adf.d.ts.map +1 -1
- package/dist/connectors/jira/adf.js +5 -0
- package/dist/connectors/jira/adf.js.map +1 -1
- package/dist/connectors/jira/answerSink.d.ts +7 -0
- package/dist/connectors/jira/answerSink.d.ts.map +1 -1
- package/dist/connectors/jira/answerSink.js +24 -10
- package/dist/connectors/jira/answerSink.js.map +1 -1
- package/dist/connectors/jira/attachmentTool.d.ts +7 -0
- package/dist/connectors/jira/attachmentTool.d.ts.map +1 -1
- package/dist/connectors/jira/attachmentTool.js +16 -0
- package/dist/connectors/jira/attachmentTool.js.map +1 -1
- package/dist/connectors/jira/client.d.ts +32 -0
- package/dist/connectors/jira/client.d.ts.map +1 -1
- package/dist/connectors/jira/client.js +43 -5
- package/dist/connectors/jira/client.js.map +1 -1
- package/dist/connectors/jira/config.d.ts +3 -16
- package/dist/connectors/jira/config.d.ts.map +1 -1
- package/dist/connectors/jira/config.js +5 -32
- package/dist/connectors/jira/config.js.map +1 -1
- package/dist/connectors/jira/connector.d.ts +3 -0
- package/dist/connectors/jira/connector.d.ts.map +1 -1
- package/dist/connectors/jira/connector.js +70 -15
- package/dist/connectors/jira/connector.js.map +1 -1
- package/dist/connectors/jira/contextLedger.d.ts +1 -0
- package/dist/connectors/jira/contextLedger.d.ts.map +1 -1
- package/dist/connectors/jira/contextLedger.js +2 -0
- package/dist/connectors/jira/contextLedger.js.map +1 -1
- package/dist/connectors/jira/inbound.d.ts +15 -6
- package/dist/connectors/jira/inbound.d.ts.map +1 -1
- package/dist/connectors/jira/inbound.js +37 -22
- package/dist/connectors/jira/inbound.js.map +1 -1
- package/dist/connectors/jira/issueBlocks.d.ts +26 -3
- package/dist/connectors/jira/issueBlocks.d.ts.map +1 -1
- package/dist/connectors/jira/issueBlocks.js +104 -29
- package/dist/connectors/jira/issueBlocks.js.map +1 -1
- package/dist/connectors/jira/issueContext.d.ts +11 -5
- package/dist/connectors/jira/issueContext.d.ts.map +1 -1
- package/dist/connectors/jira/issueContext.js +23 -6
- package/dist/connectors/jira/issueContext.js.map +1 -1
- package/dist/connectors/jira/issueDelta.d.ts +3 -0
- package/dist/connectors/jira/issueDelta.d.ts.map +1 -1
- package/dist/connectors/jira/issueDelta.js +15 -6
- package/dist/connectors/jira/issueDelta.js.map +1 -1
- package/dist/connectors/jira/mediaPlaceholders.d.ts +2 -0
- package/dist/connectors/jira/mediaPlaceholders.d.ts.map +1 -1
- package/dist/connectors/jira/mediaPlaceholders.js +16 -3
- package/dist/connectors/jira/mediaPlaceholders.js.map +1 -1
- package/dist/connectors/jira/prompt.d.ts +2 -0
- package/dist/connectors/jira/prompt.d.ts.map +1 -1
- package/dist/connectors/jira/prompt.js +4 -1
- package/dist/connectors/jira/prompt.js.map +1 -1
- package/dist/connectors/jira/sessionKeyCodec.d.ts +2 -0
- package/dist/connectors/jira/sessionKeyCodec.d.ts.map +1 -1
- package/dist/connectors/jira/sessionKeyCodec.js +5 -0
- package/dist/connectors/jira/sessionKeyCodec.js.map +1 -1
- package/dist/connectors/jira/trigger.d.ts +4 -0
- package/dist/connectors/jira/trigger.d.ts.map +1 -1
- package/dist/connectors/jira/trigger.js +9 -1
- package/dist/connectors/jira/trigger.js.map +1 -1
- package/dist/connectors/jira/triggerLog.d.ts +4 -2
- package/dist/connectors/jira/triggerLog.d.ts.map +1 -1
- package/dist/connectors/jira/triggerLog.js +1 -1
- package/dist/connectors/jira/triggerLog.js.map +1 -1
- package/dist/connectors/jira/trustedGroup.d.ts +54 -0
- package/dist/connectors/jira/trustedGroup.d.ts.map +1 -0
- package/dist/connectors/jira/trustedGroup.js +98 -0
- package/dist/connectors/jira/trustedGroup.js.map +1 -0
- package/dist/connectors/telegram/commands/autoContinueLimits.d.ts +3 -0
- package/dist/connectors/telegram/commands/autoContinueLimits.d.ts.map +1 -1
- package/dist/connectors/telegram/commands/autoContinueLimits.js +15 -45
- package/dist/connectors/telegram/commands/autoContinueLimits.js.map +1 -1
- package/dist/connectors/telegram/commands/claudeAccounts.d.ts +58 -0
- package/dist/connectors/telegram/commands/claudeAccounts.d.ts.map +1 -0
- package/dist/connectors/telegram/commands/claudeAccounts.js +591 -0
- package/dist/connectors/telegram/commands/claudeAccounts.js.map +1 -0
- package/dist/connectors/telegram/commands/fallbackChain.d.ts +49 -0
- package/dist/connectors/telegram/commands/fallbackChain.d.ts.map +1 -0
- package/dist/connectors/telegram/commands/fallbackChain.js +624 -0
- package/dist/connectors/telegram/commands/fallbackChain.js.map +1 -0
- package/dist/connectors/telegram/commands/modelProviders.d.ts +23 -1
- package/dist/connectors/telegram/commands/modelProviders.d.ts.map +1 -1
- package/dist/connectors/telegram/commands/modelProviders.js +131 -6
- package/dist/connectors/telegram/commands/modelProviders.js.map +1 -1
- package/dist/i18n/de.d.ts.map +1 -1
- package/dist/i18n/de.js +137 -9
- package/dist/i18n/de.js.map +1 -1
- package/dist/i18n/en.d.ts.map +1 -1
- package/dist/i18n/en.js +137 -9
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/es.d.ts.map +1 -1
- package/dist/i18n/es.js +137 -9
- package/dist/i18n/es.js.map +1 -1
- package/dist/i18n/fr.d.ts.map +1 -1
- package/dist/i18n/fr.js +137 -9
- package/dist/i18n/fr.js.map +1 -1
- package/dist/i18n/hi.d.ts.map +1 -1
- package/dist/i18n/hi.js +137 -9
- package/dist/i18n/hi.js.map +1 -1
- package/dist/i18n/ja.d.ts.map +1 -1
- package/dist/i18n/ja.js +137 -9
- package/dist/i18n/ja.js.map +1 -1
- package/dist/i18n/ka.d.ts.map +1 -1
- package/dist/i18n/ka.js +137 -9
- package/dist/i18n/ka.js.map +1 -1
- package/dist/i18n/pt.d.ts.map +1 -1
- package/dist/i18n/pt.js +137 -9
- package/dist/i18n/pt.js.map +1 -1
- package/dist/i18n/ru.d.ts.map +1 -1
- package/dist/i18n/ru.js +137 -9
- package/dist/i18n/ru.js.map +1 -1
- package/dist/i18n/uk.d.ts.map +1 -1
- package/dist/i18n/uk.js +137 -9
- package/dist/i18n/uk.js.map +1 -1
- package/dist/i18n/uz.d.ts.map +1 -1
- package/dist/i18n/uz.js +137 -9
- package/dist/i18n/uz.js.map +1 -1
- package/dist/i18n/zh.d.ts.map +1 -1
- package/dist/i18n/zh.js +137 -9
- package/dist/i18n/zh.js.map +1 -1
- package/dist/scheduler/mcpSurface.d.ts +8 -0
- package/dist/scheduler/mcpSurface.d.ts.map +1 -1
- package/dist/scheduler/mcpSurface.js +42 -2
- package/dist/scheduler/mcpSurface.js.map +1 -1
- package/dist/state.d.ts +172 -1
- package/dist/state.d.ts.map +1 -1
- package/dist/state.js +298 -0
- package/dist/state.js.map +1 -1
- package/dist/types.d.ts +7 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/autoContinueOnLimit.d.ts +7 -0
- package/dist/utils/autoContinueOnLimit.d.ts.map +1 -1
- package/dist/utils/autoContinueOnLimit.js +10 -0
- package/dist/utils/autoContinueOnLimit.js.map +1 -1
- package/dist/utils/claudeAccountPickerPlan.d.ts +85 -0
- package/dist/utils/claudeAccountPickerPlan.d.ts.map +1 -0
- package/dist/utils/claudeAccountPickerPlan.js +123 -0
- package/dist/utils/claudeAccountPickerPlan.js.map +1 -0
- package/dist/utils/claudeLimitSwitch.d.ts +40 -0
- package/dist/utils/claudeLimitSwitch.d.ts.map +1 -0
- package/dist/utils/claudeLimitSwitch.js +54 -0
- package/dist/utils/claudeLimitSwitch.js.map +1 -0
- package/dist/utils/claudeProfileUsageLines.d.ts +15 -0
- package/dist/utils/claudeProfileUsageLines.d.ts.map +1 -0
- package/dist/utils/claudeProfileUsageLines.js +42 -0
- package/dist/utils/claudeProfileUsageLines.js.map +1 -0
- package/dist/utils/claudeProfiles.d.ts +117 -0
- package/dist/utils/claudeProfiles.d.ts.map +1 -0
- package/dist/utils/claudeProfiles.js +285 -0
- package/dist/utils/claudeProfiles.js.map +1 -0
- package/dist/utils/claudeStreamJson.d.ts +13 -1
- package/dist/utils/claudeStreamJson.d.ts.map +1 -1
- package/dist/utils/claudeStreamJson.js +13 -0
- package/dist/utils/claudeStreamJson.js.map +1 -1
- package/dist/utils/claudeUsage.d.ts +209 -0
- package/dist/utils/claudeUsage.d.ts.map +1 -0
- package/dist/utils/claudeUsage.js +413 -0
- package/dist/utils/claudeUsage.js.map +1 -0
- package/dist/utils/claudeUsageRefresher.d.ts +44 -0
- package/dist/utils/claudeUsageRefresher.d.ts.map +1 -0
- package/dist/utils/claudeUsageRefresher.js +95 -0
- package/dist/utils/claudeUsageRefresher.js.map +1 -0
- package/dist/utils/fallbackBridge.d.ts +32 -0
- package/dist/utils/fallbackBridge.d.ts.map +1 -0
- package/dist/utils/fallbackBridge.js +62 -0
- package/dist/utils/fallbackBridge.js.map +1 -0
- package/dist/utils/fallbackChain.d.ts +299 -0
- package/dist/utils/fallbackChain.d.ts.map +1 -0
- package/dist/utils/fallbackChain.js +542 -0
- package/dist/utils/fallbackChain.js.map +1 -0
- package/dist/utils/jsonStreamHost.d.ts +14 -3
- package/dist/utils/jsonStreamHost.d.ts.map +1 -1
- package/dist/utils/jsonStreamHost.js +26 -5
- package/dist/utils/jsonStreamHost.js.map +1 -1
- package/dist/utils/modelRecentPlan.d.ts +56 -0
- package/dist/utils/modelRecentPlan.d.ts.map +1 -0
- package/dist/utils/modelRecentPlan.js +107 -0
- package/dist/utils/modelRecentPlan.js.map +1 -0
- package/dist/utils/threadStatusReport.d.ts +25 -1
- package/dist/utils/threadStatusReport.d.ts.map +1 -1
- package/dist/utils/threadStatusReport.js +24 -1
- package/dist/utils/threadStatusReport.js.map +1 -1
- package/package.json +1 -1
|
@@ -47,6 +47,7 @@ const i18n_1 = require("../i18n");
|
|
|
47
47
|
const node_pty_1 = require("node-pty");
|
|
48
48
|
const resolveBinary_1 = require("../utils/resolveBinary");
|
|
49
49
|
const claudeAuthLogin_1 = require("../utils/claudeAuthLogin");
|
|
50
|
+
const claudeProfiles_1 = require("../utils/claudeProfiles");
|
|
50
51
|
const openCodeAuthLogin_1 = require("../utils/openCodeAuthLogin");
|
|
51
52
|
/**
|
|
52
53
|
* @description Every message that leaves a sign-in flow waiting for pasted input ends with the
|
|
@@ -90,7 +91,7 @@ async function readOpenCodeProviderAuthed(providerId) {
|
|
|
90
91
|
* thread, per sign-in kind) are state of the returned instance, not of the module.
|
|
91
92
|
*/
|
|
92
93
|
function createAgentLogin(ports) {
|
|
93
|
-
const { replyToThread, deleteThreadMessage, clearAuthNotice, execFileAsync } = ports;
|
|
94
|
+
const { replyToThread, deleteThreadMessage, clearAuthNotice, execFileAsync, onClaudeProfileAuthStatus } = ports;
|
|
94
95
|
/** Per-thread in-flight `claude auth login` flows, keyed by `keyToString(key)`. */
|
|
95
96
|
const pendingAuthLogins = new Map();
|
|
96
97
|
/**
|
|
@@ -118,38 +119,54 @@ function createAgentLogin(ports) {
|
|
|
118
119
|
/* already exited */
|
|
119
120
|
}
|
|
120
121
|
}
|
|
121
|
-
/**
|
|
122
|
-
|
|
122
|
+
/**
|
|
123
|
+
* @description The environment a `claude auth …` process runs with: the bot's own minus `ANTHROPIC_API_KEY`
|
|
124
|
+
* (the subscription login, never the metered console path), plus the profile's `CLAUDE_CONFIG_DIR` when one
|
|
125
|
+
* is signed in — the login must land in THAT directory, and the status probe must read the same one.
|
|
126
|
+
*/
|
|
127
|
+
function buildClaudeAuthEnv(configDir) {
|
|
128
|
+
const env = { ...process.env };
|
|
129
|
+
delete env.ANTHROPIC_API_KEY;
|
|
130
|
+
if (configDir !== null)
|
|
131
|
+
env[claudeProfiles_1.claudeConfigDirVariableName] = configDir;
|
|
132
|
+
return env;
|
|
133
|
+
}
|
|
134
|
+
/** Read `claude auth status --json` under `configDir`, or `null` if the probe fails or prints something else. */
|
|
135
|
+
async function readAuthLoginStatus(configDir) {
|
|
123
136
|
try {
|
|
124
|
-
const { stdout } = await execFileAsync((0, resolveBinary_1.resolveClaudeBinary)(), ['auth', 'status', '--json'], { timeout: authStatusProbeTimeoutMs });
|
|
125
|
-
return (0,
|
|
137
|
+
const { stdout } = await execFileAsync((0, resolveBinary_1.resolveClaudeBinary)(), ['auth', 'status', '--json'], { timeout: authStatusProbeTimeoutMs, env: buildClaudeAuthEnv(configDir) });
|
|
138
|
+
return (0, claudeProfiles_1.parseClaudeAuthStatus)(stdout);
|
|
126
139
|
}
|
|
127
|
-
catch {
|
|
128
|
-
|
|
140
|
+
catch (e) {
|
|
141
|
+
// A logged-out directory makes the CLI exit non-zero WITH its JSON on stdout (probed on 2.1.296):
|
|
142
|
+
// that is the answer, not a failed probe.
|
|
143
|
+
return (0, claudeProfiles_1.parseClaudeAuthStatus)((0, claudeProfiles_1.readProcessErrorStdout)(e));
|
|
129
144
|
}
|
|
130
145
|
}
|
|
131
146
|
/**
|
|
132
147
|
* @description Start the out-of-band `/login` flow for a json-stream thread: spawn
|
|
133
148
|
* `claude auth login --claudeai` in a pty, relay the sign-in URL when it appears,
|
|
134
149
|
* and arm the pending-code state (the thread's next plain text is written into the
|
|
135
|
-
* pty as the code). Re-running `/login` while a flow is pending restarts it.
|
|
150
|
+
* pty as the code). Re-running `/login` while a flow is pending restarts it. With a
|
|
151
|
+
* `profile` the CLI signs THAT account profile in (`CLAUDE_CONFIG_DIR` set on the
|
|
152
|
+
* pty), the link message tells the operator to open it as the other account, and
|
|
153
|
+
* the confirmation names the account; the default login is unchanged.
|
|
136
154
|
*/
|
|
137
|
-
async function startClaudeAuthLogin(key) {
|
|
155
|
+
async function startClaudeAuthLogin(key, profile = null) {
|
|
138
156
|
const k = (0, sessionKey_1.keyToString)(key);
|
|
139
157
|
cancelClaudeAuthLogin(key); // clean restart on a repeated /login
|
|
140
158
|
let child;
|
|
141
159
|
try {
|
|
142
160
|
// Force subscription login (never metered): `--claudeai` picks the Claude
|
|
143
161
|
// subscription and dropping ANTHROPIC_API_KEY keeps the metered console path
|
|
144
|
-
// out of the way. cwd is irrelevant — login writes to
|
|
145
|
-
|
|
146
|
-
delete env.ANTHROPIC_API_KEY;
|
|
162
|
+
// out of the way. cwd is irrelevant — login writes to the config directory
|
|
163
|
+
// (`~/.claude`, or the profile's own).
|
|
147
164
|
child = (0, node_pty_1.spawn)((0, resolveBinary_1.resolveClaudeBinary)(), ['auth', 'login', '--claudeai'], {
|
|
148
165
|
name: 'xterm-256color',
|
|
149
166
|
cols: authLoginPtyCols,
|
|
150
167
|
rows: authLoginPtyRows,
|
|
151
168
|
cwd: process.cwd(),
|
|
152
|
-
env,
|
|
169
|
+
env: buildClaudeAuthEnv(profile?.configDir ?? null),
|
|
153
170
|
});
|
|
154
171
|
}
|
|
155
172
|
catch (e) {
|
|
@@ -159,6 +176,7 @@ function createAgentLogin(ports) {
|
|
|
159
176
|
}
|
|
160
177
|
const pending = {
|
|
161
178
|
pty: child,
|
|
179
|
+
profile,
|
|
162
180
|
output: '',
|
|
163
181
|
urlRelayed: false,
|
|
164
182
|
timeoutTimer: setTimeout(() => {
|
|
@@ -178,7 +196,10 @@ function createAgentLogin(ports) {
|
|
|
178
196
|
if (url) {
|
|
179
197
|
current.urlRelayed = true;
|
|
180
198
|
clearTimeout(current.timeoutTimer);
|
|
181
|
-
|
|
199
|
+
const linkText = current.profile
|
|
200
|
+
? (0, i18n_1.t)('account.login_url', { name: current.profile.name, url })
|
|
201
|
+
: (0, i18n_1.t)('agent.login_url', { url });
|
|
202
|
+
void replyToThread(key, appendEscToCancelHint(linkText));
|
|
182
203
|
}
|
|
183
204
|
}
|
|
184
205
|
});
|
|
@@ -232,8 +253,24 @@ function createAgentLogin(ports) {
|
|
|
232
253
|
return; // cancelled/replaced → no report
|
|
233
254
|
clearTimeout(pending.timeoutTimer);
|
|
234
255
|
pendingAuthLogins.delete(k);
|
|
235
|
-
const
|
|
236
|
-
|
|
256
|
+
const status = await readAuthLoginStatus(pending.profile?.configDir ?? null);
|
|
257
|
+
const isSucceeded = (0, claudeAuthLogin_1.checkIsAuthLoginSucceeded)({ exitCode, loggedIn: status?.loggedIn ?? null });
|
|
258
|
+
if (pending.profile) {
|
|
259
|
+
// The bot records the account (email, plan) whatever the outcome — a failed sign-in reads as logged out.
|
|
260
|
+
await onClaudeProfileAuthStatus?.(key, pending.profile, status);
|
|
261
|
+
// The `default` profile IS the `~/.claude` login: a success retires the pinned logged-out notice, as `/login` does.
|
|
262
|
+
if (isSucceeded && pending.profile.configDir === null)
|
|
263
|
+
clearAuthNotice(key);
|
|
264
|
+
await replyToThread(key, isSucceeded
|
|
265
|
+
? (0, i18n_1.t)('account.login_success', {
|
|
266
|
+
name: pending.profile.name,
|
|
267
|
+
email: status?.email ?? '?',
|
|
268
|
+
plan: status?.subscriptionType ?? '?',
|
|
269
|
+
})
|
|
270
|
+
: (0, i18n_1.t)('account.login_failed', { name: pending.profile.name }));
|
|
271
|
+
return;
|
|
272
|
+
}
|
|
273
|
+
if (isSucceeded) {
|
|
237
274
|
clearAuthNotice(key); // recovery → retire any pinned logged-out notice
|
|
238
275
|
await replyToThread(key, (0, i18n_1.t)('agent.login_success'));
|
|
239
276
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentLogin.js","sourceRoot":"","sources":["../../src/agentLogin/agentLogin.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agentLogin.js","sourceRoot":"","sources":["../../src/agentLogin/agentLogin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyKA,4CAgdC;AAznBD;;;GAGG;AACH,2BAAqC;AACrC,uCAAyB;AACzB,6DAAuD;AAEvD,8CAA4C;AAC5C,sDAAwD;AACxD,kCAA4B;AAC5B,uCAAwD;AACxD,0DAAoF;AACpF,8DAIkC;AAClC,4DAA4I;AAC5I,kEAcoC;AAEpC;;;;GAIG;AACH,SAAS,qBAAqB,CAAC,IAAY;IACzC,OAAO,GAAG,IAAI,KAAK,IAAA,QAAC,EAAC,gBAAgB,CAAC,EAAE,CAAC;AAC3C,CAAC;AA6BD;;;;GAIG;AACH,MAAM,qBAAqB,GAAG,OAAO,CAAC;AACtC,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAC7B,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAC5B,MAAM,wBAAwB,GAAG,KAAK,CAAC;AAuCvC;;;;;;GAMG;AACH,KAAK,UAAU,0BAA0B,CAAC,UAAkB;IAC1D,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAA,2CAAuB,EAAC;YACvC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;YACxC,IAAI,EAAE,EAAE,CAAC,OAAO,EAAE;SACnB,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjD,OAAO,IAAA,uCAAmB,EAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACnE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AA6BD;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,KAAsB;IACrD,MAAM,EAAE,aAAa,EAAE,mBAAmB,EAAE,eAAe,EAAE,aAAa,EAAE,yBAAyB,EAAE,GAAG,KAAK,CAAC;IAEhH,mFAAmF;IACnF,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAA4B,CAAC;IAE9D;;;;;;OAMG;IACH,SAAS,4BAA4B,CAAC,GAAe;QACnD,OAAO,iBAAiB,CAAC,GAAG,CAAC,IAAA,wBAAW,EAAC,GAAG,CAAC,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;IACtE,CAAC;IAED,8EAA8E;IAC9E,SAAS,qBAAqB,CAAC,GAAe;QAC5C,MAAM,CAAC,GAAG,IAAA,wBAAW,EAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC5B,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACnC,IAAI,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACrB,CAAC;QAAC,MAAM,CAAC;YACP,oBAAoB;QACtB,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,SAAS,kBAAkB,CAAC,SAAwB;QAClD,MAAM,GAAG,GAAuC,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QACnE,OAAO,GAAG,CAAC,iBAAiB,CAAC;QAC7B,IAAI,SAAS,KAAK,IAAI;YAAE,GAAG,CAAC,4CAA2B,CAAC,GAAG,SAAS,CAAC;QACrE,OAAO,GAAG,CAAC;IACb,CAAC;IAED,iHAAiH;IACjH,KAAK,UAAU,mBAAmB,CAAC,SAAwB;QACzD,IAAI,CAAC;YACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CACpC,IAAA,mCAAmB,GAAE,EACrB,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAC5B,EAAE,OAAO,EAAE,wBAAwB,EAAE,GAAG,EAAE,kBAAkB,CAAC,SAAS,CAAC,EAAE,CAC1E,CAAC;YACF,OAAO,IAAA,sCAAqB,EAAC,MAAM,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,kGAAkG;YAClG,0CAA0C;YAC1C,OAAO,IAAA,sCAAqB,EAAC,IAAA,uCAAsB,EAAC,CAAC,CAAC,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,UAAU,oBAAoB,CAAC,GAAe,EAAE,UAAqC,IAAI;QAC5F,MAAM,CAAC,GAAG,IAAA,wBAAW,EAAC,GAAG,CAAC,CAAC;QAC3B,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC,qCAAqC;QAEjE,IAAI,KAAW,CAAC;QAChB,IAAI,CAAC;YACH,0EAA0E;YAC1E,6EAA6E;YAC7E,2EAA2E;YAC3E,uCAAuC;YACvC,KAAK,GAAG,IAAA,gBAAQ,EAAC,IAAA,mCAAmB,GAAE,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE;gBACvE,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE,gBAAgB;gBACtB,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;gBAClB,GAAG,EAAE,kBAAkB,CAAC,OAAO,EAAE,SAAS,IAAI,IAAI,CAAC;aACpD,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC;YAClD,MAAM,aAAa,CAAC,GAAG,EAAE,IAAA,QAAC,EAAC,oBAAoB,CAAC,CAAC,CAAC;YAClD,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAqB;YAChC,GAAG,EAAE,KAAK;YACV,OAAO;YACP,MAAM,EAAE,EAAE;YACV,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,UAAU,CAAC,GAAG,EAAE;gBAC5B,KAAK,qBAAqB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACzC,CAAC,EAAE,qBAAqB,CAAC;SAC1B,CAAC;QACF,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAElC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YACrB,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACzC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,KAAK,KAAK;gBAAE,OAAO,CAAC,qBAAqB;YACpE,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC;YACxB,8EAA8E;YAC9E,kEAAkE;YAClE,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,IAAA,kDAAgC,EAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC5E,MAAM,GAAG,GAAG,IAAA,yCAAuB,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBACpD,IAAI,GAAG,EAAE,CAAC;oBACR,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;oBAC1B,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;oBACnC,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO;wBAC9B,CAAC,CAAC,IAAA,QAAC,EAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC;wBAC7D,CAAC,CAAC,IAAA,QAAC,EAAC,iBAAiB,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;oBAClC,KAAK,aAAa,CAAC,GAAG,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC3D,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;YAC5B,KAAK,eAAe,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,UAAU,yBAAyB,CACtC,GAAe,EACf,IAAY,EACZ,SAAiB;QAEjB,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAC,IAAA,wBAAW,EAAC,GAAG,CAAC,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC;QAC3B,IAAI,CAAC,IAAA,6CAAyB,EAAC,IAAI,CAAC,EAAE,CAAC;YACrC,MAAM,aAAa,CAAC,GAAG,EAAE,qBAAqB,CAAC,IAAA,QAAC,EAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;YACzE,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACtC,MAAM,mBAAmB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAC1C,MAAM,aAAa,CAAC,GAAG,EAAE,IAAA,QAAC,EAAC,0BAA0B,CAAC,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iFAAiF;IACjF,KAAK,UAAU,qBAAqB,CAAC,GAAe,EAAE,KAAW;QAC/D,MAAM,CAAC,GAAG,IAAA,wBAAW,EAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,KAAK,KAAK,IAAI,OAAO,CAAC,UAAU;YAAE,OAAO;QACpE,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,aAAa,CAAC,GAAG,EAAE,IAAA,QAAC,EAAC,oBAAoB,CAAC,CAAC,CAAC;IACpD,CAAC;IAED;;;;;;OAMG;IACH,KAAK,UAAU,eAAe,CAC5B,GAAe,EACf,KAAW,EACX,QAAgB;QAEhB,MAAM,CAAC,GAAG,IAAA,wBAAW,EAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,KAAK,KAAK;YAAE,OAAO,CAAC,iCAAiC;QAChF,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACnC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC5B,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,IAAI,IAAI,CAAC,CAAC;QAC7E,MAAM,WAAW,GAAG,IAAA,2CAAyB,EAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,IAAI,IAAI,EAAE,CAAC,CAAC;QAChG,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,yGAAyG;YACzG,MAAM,yBAAyB,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAChE,oHAAoH;YACpH,IAAI,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,KAAK,IAAI;gBAAE,eAAe,CAAC,GAAG,CAAC,CAAC;YAC5E,MAAM,aAAa,CACjB,GAAG,EACH,WAAW;gBACT,CAAC,CAAC,IAAA,QAAC,EAAC,uBAAuB,EAAE;oBACzB,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;oBAC1B,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,GAAG;oBAC3B,IAAI,EAAE,MAAM,EAAE,gBAAgB,IAAI,GAAG;iBACtC,CAAC;gBACJ,CAAC,CAAC,IAAA,QAAC,EAAC,sBAAsB,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAC9D,CAAC;YACF,OAAO;QACT,CAAC;QACD,IAAI,WAAW,EAAE,CAAC;YAChB,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,iDAAiD;YACvE,MAAM,aAAa,CAAC,GAAG,EAAE,IAAA,QAAC,EAAC,qBAAqB,CAAC,CAAC,CAAC;QACrD,CAAC;aAAM,CAAC;YACN,MAAM,aAAa,CAAC,GAAG,EAAE,IAAA,QAAC,EAAC,oBAAoB,CAAC,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAED,2FAA2F;IAC3F,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAgC,CAAC;IAErE;;;;OAIG;IACH,SAAS,iCAAiC,CAAC,GAAe;QACxD,OAAO,oBAAoB,CAAC,GAAG,CAAC,IAAA,wBAAW,EAAC,GAAG,CAAC,CAAC,EAAE,aAAa,KAAK,IAAI,CAAC;IAC5E,CAAC;IAED,oFAAoF;IACpF,SAAS,wBAAwB,CAAC,GAAe;QAC/C,MAAM,CAAC,GAAG,IAAA,wBAAW,EAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,OAAO,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC/B,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACnC,IAAI,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACrB,CAAC;QAAC,MAAM,CAAC;YACP,oBAAoB;QACtB,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,UAAU,uBAAuB,CACpC,GAAe,EACf,UAAkB,EAClB,WAAmB;QAEnB,MAAM,CAAC,GAAG,IAAA,wBAAW,EAAC,GAAG,CAAC,CAAC;QAC3B,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC,4BAA4B;QAE3D,IAAI,KAAW,CAAC;QAChB,IAAI,CAAC;YACH,6EAA6E;YAC7E,4EAA4E;YAC5E,yCAAyC;YACzC,MAAM,GAAG,GAAuC,IAAA,oCAAmB,GAAE,CAAC;YACtE,OAAO,GAAG,CAAC,cAAc,CAAC;YAC1B,OAAO,GAAG,CAAC,iBAAiB,CAAC;YAC7B,KAAK,GAAG,IAAA,gBAAQ,EAAC,IAAA,qCAAqB,GAAE,EAAE,IAAA,8CAA0B,EAAC,UAAU,EAAE,WAAW,CAAC,EAAE;gBAC7F,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE,gBAAgB;gBACtB,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;gBAClB,GAAG;aACJ,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAC;YACnE,MAAM,aAAa,CAAC,GAAG,EAAE,IAAA,QAAC,EAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;YAC9E,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAyB;YACpC,GAAG,EAAE,KAAK;YACV,UAAU;YACV,WAAW;YACX,MAAM,EAAE,EAAE;YACV,WAAW,EAAE,KAAK;YAClB,aAAa,EAAE,KAAK;YACpB,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;YAClB,YAAY,EAAE,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,YAAY,EAAE,UAAU,CAAC,GAAG,EAAE;gBAC5B,KAAK,yBAAyB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAC7C,CAAC,EAAE,qBAAqB,CAAC;SAC1B,CAAC;QACF,oBAAoB,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAErC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YACrB,MAAM,OAAO,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC5C,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,KAAK,KAAK;gBAAE,OAAO,CAAC,qBAAqB;YACpE,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC;YACxB,IAAI,OAAO,CAAC,WAAW;gBAAE,OAAO;YAChC,4EAA4E;YAC5E,gEAAgE;YAChE,IAAI,CAAC,IAAA,yCAAqB,EAAC,OAAO,CAAC,MAAM,CAAC;gBAAE,OAAO;YACnD,MAAM,GAAG,GAAG,IAAA,yCAAqB,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAClD,IAAI,CAAC,GAAG;gBAAE,OAAO;YACjB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;YAC3B,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YACnC,MAAM,UAAU,GAAG,IAAA,2CAAuB,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC3D,MAAM,OAAO,GAAG,IAAA,mDAA+B,EAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;YAC/E,0EAA0E;YAC1E,6EAA6E;YAC7E,6EAA6E;YAC7E,0EAA0E;YAC1E,sCAAsC;YACtC,MAAM,UAAU,GAAG,CAAC,UAAU,IAAI,CAAC,OAAO,IAAI,IAAA,4CAAwB,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACvF,IAAI,UAAU,EAAE,CAAC;gBACf,KAAK,aAAa,CAAC,GAAG,EAAE,IAAA,QAAC,EAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;YACtG,CAAC;iBAAM,CAAC;gBACN,KAAK,aAAa,CAAC,GAAG,EAAE,IAAA,QAAC,EAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;YACtF,CAAC;YACD,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;gBAC7B,KAAK,aAAa,CAAC,GAAG,EAAE,qBAAqB,CAAC,IAAA,QAAC,EAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAC3E,CAAC;iBAAM,IAAI,UAAU,EAAE,CAAC;gBACtB,MAAM,OAAO,GAAG,IAAA,8CAA0B,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAC3D,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;gBAC1B,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;gBAC5C,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;gBAC5C,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC;gBACnC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;gBAC7B,KAAK,aAAa,CAAC,GAAG,EAAE,qBAAqB,CAAC,IAAA,QAAC,EAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;YAC9E,CAAC;iBAAM,CAAC;gBACN,KAAK,aAAa,CAAC,GAAG,EAAE,IAAA,QAAC,EAAC,uBAAuB,CAAC,CAAC,CAAC;YACtD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;YAC5B,KAAK,mBAAmB,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;;;;;;;;;;;OAiBG;IACH,KAAK,UAAU,wBAAwB,CACrC,GAAe,EACf,IAAY,EACZ,SAAiB;QAEjB,MAAM,OAAO,GAAG,oBAAoB,CAAC,GAAG,CAAC,IAAA,wBAAW,EAAC,GAAG,CAAC,CAAC,CAAC;QAC3D,IAAI,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC;QAC3B,MAAM,KAAK,GAAG,IAAA,8CAA0B,EAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,wEAAwE;YACxE,MAAM,aAAa,CAAC,GAAG,EAAE,qBAAqB,CAAC,IAAA,QAAC,EAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC;YAClF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,4EAA4E;YAC5E,yEAAyE;YACzE,MAAM,aAAa,GAAG,IAAA,8CAA0B,EAAC;gBAC/C,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,YAAY;gBAC7E,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,YAAY;gBAC7E,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,KAAK,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,UAAU;aAC9E,CAAC,CAAC;YACH,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,aAAa,CAAC,GAAG,EAAE,qBAAqB,CAAC,IAAA,QAAC,EAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC;gBAClF,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,mBAAmB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YAC1C,MAAM,aAAa,CAAC,GAAG,EAAE,IAAA,QAAC,EAAC,0BAA0B,CAAC,CAAC,CAAC;YACxD,IAAI,CAAC;gBACH,4EAA4E;gBAC5E,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,aAAa,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAChF,uEAAuE;gBACvE,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YACnC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,aAAa,IAAA,wBAAW,EAAC,GAAG,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAC;gBAClF,2EAA2E;gBAC3E,iEAAiE;gBACjE,MAAM,aAAa,CAAC,GAAG,EAAE,IAAA,QAAC,EAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YACxF,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,mDAAmD;QACnD,MAAM,mBAAmB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAC1C,MAAM,aAAa,CAAC,GAAG,EAAE,IAAA,QAAC,EAAC,0BAA0B,CAAC,CAAC,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iFAAiF;IACjF,KAAK,UAAU,yBAAyB,CAAC,GAAe,EAAE,KAAW;QACnE,MAAM,CAAC,GAAG,IAAA,wBAAW,EAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,OAAO,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,KAAK,KAAK,IAAI,OAAO,CAAC,WAAW;YAAE,OAAO;QACrE,wBAAwB,CAAC,GAAG,CAAC,CAAC;QAC9B,MAAM,aAAa,CAAC,GAAG,EAAE,IAAA,QAAC,EAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IACxF,CAAC;IAED;;;;;OAKG;IACH,KAAK,UAAU,mBAAmB,CAChC,GAAe,EACf,KAAW,EACX,QAAgB;QAEhB,MAAM,CAAC,GAAG,IAAA,wBAAW,EAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,OAAO,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,KAAK,KAAK;YAAE,OAAO,CAAC,iCAAiC;QAChF,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACnC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAM,0BAA0B,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACpE,IAAI,IAAA,iDAA6B,EAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YACxD,MAAM,OAAO,GAAG,IAAA,0BAAU,EAAC,UAAU,CAAC,CAAC;YACvC,MAAM,sBAAsB,GAAG,OAAO,CAAC,kBAAkB;gBACvD,CAAC,CAAC,MAAM,OAAO,CAAC,kBAAkB,EAAE;gBACpC,CAAC,CAAC,KAAK,CAAC;YACV,IAAI,sBAAsB,EAAE,CAAC;gBAC3B,MAAM,aAAa,CAAC,GAAG,EAAE,IAAA,QAAC,EAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YACzF,CAAC;iBAAM,CAAC;gBACN,MAAM,aAAa,CAAC,GAAG,EAAE,IAAA,QAAC,EAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YACxF,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,aAAa,CAAC,GAAG,EAAE,IAAA,QAAC,EAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QACxF,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,SAAS,kBAAkB,CAAC,GAAe;QACzC,MAAM,CAAC,GAAG,IAAA,wBAAW,EAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC3E,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAC3B,wBAAwB,CAAC,GAAG,CAAC,CAAC;QAC9B,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,OAAO;QACL,kBAAkB;QAClB,4BAA4B;QAC5B,qBAAqB;QACrB,oBAAoB;QACpB,yBAAyB;QACzB,iCAAiC;QACjC,wBAAwB;QACxB,uBAAuB;QACvB,wBAAwB;KACzB,CAAC;AACJ,CAAC"}
|
package/dist/apiErrorRetry.d.ts
CHANGED
|
@@ -84,11 +84,16 @@ export declare function checkIsUsageLimitText(text: string): boolean;
|
|
|
84
84
|
* 1. auth / logged out (login, bad credentials) → `{ kind: 'auth' }`. Must win:
|
|
85
85
|
* a wait never fixes these (they need a re-login or server restart), so they
|
|
86
86
|
* are SURFACED (a pinned notice), never auto-retried. Used to return `null`.
|
|
87
|
-
* 2.
|
|
88
|
-
*
|
|
87
|
+
* 2. an exhausted-quota provider CODE ({@link exhaustedQuotaCodesRe}) or the observed
|
|
88
|
+
* subscription wording ({@link subscriptionLimitMessageRe}) → `usageLimit`.
|
|
89
|
+
* Ahead of transient because these ride a 429 (OpenAI `insufficient_quota`,
|
|
90
|
+
* Google `RESOURCE_EXHAUSTED`), which the next branch would read as a hiccup.
|
|
91
|
+
* 3. transient (rate-limited, overloaded, 429/503/529, or a bare "rate limit" without an explicit
|
|
92
|
+
* usage-window wording) → `{ kind: 'transient' }`.
|
|
93
|
+
* Tested BEFORE the usage wordings on purpose: the live transient string literally reads
|
|
89
94
|
* "...(not your usage limit)...", so a naive usage check would false-match it.
|
|
90
95
|
* Because transient returns here, the usage branch never sees that substring.
|
|
91
|
-
*
|
|
96
|
+
* 4. usage / session / window limit → `{ kind: 'usageLimit', resetAt? }`, decided
|
|
92
97
|
* by {@link checkIsUsageLimitText} (explicit wordings + a generic fallback).
|
|
93
98
|
* Anything else (normal prose, unrelated text) → `null`.
|
|
94
99
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiErrorRetry.d.ts","sourceRoot":"","sources":["../src/apiErrorRetry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAQlD;;;GAGG;AACH,eAAO,MAAM,uBAAuB,sBAAuB,CAAC;AAC5D,oFAAoF;AACpF,eAAO,MAAM,oBAAoB,GAAiC,CAAC;AAEnE;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,QAAmB,CAAC;AACpD,8EAA8E;AAC9E,eAAO,MAAM,qBAAqB,IAAI,CAAC;AACvC;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,QAAkB,CAAC;AACtD;;;GAGG;AACH,eAAO,MAAM,aAAa,QAAS,CAAC;AA2BpC;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,QAAyE,CAAC;
|
|
1
|
+
{"version":3,"file":"apiErrorRetry.d.ts","sourceRoot":"","sources":["../src/apiErrorRetry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAQlD;;;GAGG;AACH,eAAO,MAAM,uBAAuB,sBAAuB,CAAC;AAC5D,oFAAoF;AACpF,eAAO,MAAM,oBAAoB,GAAiC,CAAC;AAEnE;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,QAAmB,CAAC;AACpD,8EAA8E;AAC9E,eAAO,MAAM,qBAAqB,IAAI,CAAC;AACvC;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,QAAkB,CAAC;AACtD;;;GAGG;AACH,eAAO,MAAM,aAAa,QAAS,CAAC;AA2BpC;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,QAAyE,CAAC;AA2CzG;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,QAGxB,CAAC;AAEZ,0EAA0E;AAC1E,eAAO,MAAM,mBAAmB,QAA0C,CAAC;AAwB3E;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAI3D;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,kBAAkB,GAAG,IAAI,CAiB1F;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAsB1E;AA8DD,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACjC,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAC;IAChB,8EAA8E;IAC9E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,8DAA8D;IAC9D,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,MAAM,SAAS,GAAG;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,IAAI,CAAA;CAAE,CAAC;AAE/D;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,aAAa,GAAG,SAAS,CAe3D;AAOD;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC,2DAA2D;IAC3D,OAAO,EAAE,MAAM,CAAC;IAChB,qFAAqF;IACrF,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,+DAA+D;IAC/D,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,WAAW,GACnB;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,GACrB;IAAE,MAAM,EAAE,QAAQ,CAAA;CAAE,GACpB;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACnE;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3C,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACjC,8EAA8E;IAC9E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wBAAwB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,qEAAqE;IACrE,IAAI,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACjC;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,qBAAqB,GAAG,WAAW,CAW1E"}
|
package/dist/apiErrorRetry.js
CHANGED
|
@@ -95,12 +95,32 @@ exports.authErrorPhrasesRe = /please run \/login|not logged in|invalid authentic
|
|
|
95
95
|
* "context limit exceeded" is not.
|
|
96
96
|
*/
|
|
97
97
|
const usageWindowPhrases = [
|
|
98
|
-
String.raw `(?:session|usage|weekly|daily|monthly|hourly|\d+-hours?)\
|
|
98
|
+
String.raw `(?:session|usage|weekly|daily|monthly|hourly|\d+-hours?)[\s_]+limit`,
|
|
99
99
|
String.raw `(?:hit|reached|exceeded)\s+your\s+(?:[\w-]+\s+){0,3}limit`,
|
|
100
100
|
String.raw `credit balance (?:is )?too low`,
|
|
101
101
|
String.raw `out of (?:credits|usage)`,
|
|
102
102
|
String.raw `quota`,
|
|
103
|
+
String.raw `resource[\s_]+(?:has been )?exhausted`,
|
|
104
|
+
String.raw `billing\s+(?:hard\s+)?limit`,
|
|
103
105
|
];
|
|
106
|
+
/**
|
|
107
|
+
* The provider error CODES that mean an exhausted quota or subscription window — what the OpenCode backend
|
|
108
|
+
* relays verbatim from OpenAI (`insufficient_quota`, `usage_limit_reached`), Google (`RESOURCE_EXHAUSTED`) and
|
|
109
|
+
* the OpenAI Codex subscription (`You've hit your usage limit`). These arrive with HTTP 429, the status the
|
|
110
|
+
* transient branch reads as "rate limited", so they are tested BEFORE it: a quota that is used up for the
|
|
111
|
+
* month is not cleared by a 5-minute retry, and the fallback chain must see a usage limit to switch provider.
|
|
112
|
+
*/
|
|
113
|
+
const exhaustedQuotaCodesRe = /insufficient_quota|exceeded your current quota|usage_limit_reached|resource_exhausted|hit your usage limit/i;
|
|
114
|
+
/**
|
|
115
|
+
* Observed subscription-window wording ("This request would exceed your account's rate limit. Please try
|
|
116
|
+
* again later."); do not generalize it to every bare rate limit. Keyed on the distinctive head only, so a
|
|
117
|
+
* relay that truncates the tail or types a curly apostrophe still matches.
|
|
118
|
+
*/
|
|
119
|
+
const subscriptionLimitMessageRe = /would exceed your account['\u2019]?s rate limit/i;
|
|
120
|
+
/** Throttling markers that are transient whatever else the text says (the live "not your usage limit" trap). */
|
|
121
|
+
const transientMarkersRe = /rate.?limited|temporarily limiting requests|too many requests|overloaded|\b(429|503|529)\b/i;
|
|
122
|
+
/** A bare "rate limit" (no "-ed"): transient only when no explicit usage-window wording rides along. */
|
|
123
|
+
const bareRateLimitRe = /rate.?limit/i;
|
|
104
124
|
/**
|
|
105
125
|
* @description Alternation SOURCE (no anchors, no flags) of the explicit
|
|
106
126
|
* usage/session-limit wordings — {@link usageWindowPhrases} plus a bare
|
|
@@ -164,11 +184,16 @@ function checkIsUsageLimitText(text) {
|
|
|
164
184
|
* 1. auth / logged out (login, bad credentials) → `{ kind: 'auth' }`. Must win:
|
|
165
185
|
* a wait never fixes these (they need a re-login or server restart), so they
|
|
166
186
|
* are SURFACED (a pinned notice), never auto-retried. Used to return `null`.
|
|
167
|
-
* 2.
|
|
168
|
-
*
|
|
187
|
+
* 2. an exhausted-quota provider CODE ({@link exhaustedQuotaCodesRe}) or the observed
|
|
188
|
+
* subscription wording ({@link subscriptionLimitMessageRe}) → `usageLimit`.
|
|
189
|
+
* Ahead of transient because these ride a 429 (OpenAI `insufficient_quota`,
|
|
190
|
+
* Google `RESOURCE_EXHAUSTED`), which the next branch would read as a hiccup.
|
|
191
|
+
* 3. transient (rate-limited, overloaded, 429/503/529, or a bare "rate limit" without an explicit
|
|
192
|
+
* usage-window wording) → `{ kind: 'transient' }`.
|
|
193
|
+
* Tested BEFORE the usage wordings on purpose: the live transient string literally reads
|
|
169
194
|
* "...(not your usage limit)...", so a naive usage check would false-match it.
|
|
170
195
|
* Because transient returns here, the usage branch never sees that substring.
|
|
171
|
-
*
|
|
196
|
+
* 4. usage / session / window limit → `{ kind: 'usageLimit', resetAt? }`, decided
|
|
172
197
|
* by {@link checkIsUsageLimitText} (explicit wordings + a generic fallback).
|
|
173
198
|
* Anything else (normal prose, unrelated text) → `null`.
|
|
174
199
|
*
|
|
@@ -179,7 +204,13 @@ function classifyAgentApiError(text, now) {
|
|
|
179
204
|
if (exports.authErrorPhrasesRe.test(text)) {
|
|
180
205
|
return { kind: 'auth' };
|
|
181
206
|
}
|
|
182
|
-
if (
|
|
207
|
+
if (exhaustedQuotaCodesRe.test(text) || subscriptionLimitMessageRe.test(text)) {
|
|
208
|
+
return { kind: 'usageLimit', resetAt: parseResetAt(text, now) };
|
|
209
|
+
}
|
|
210
|
+
// The observed subscription wording is handled above, including a 429 wrapper.
|
|
211
|
+
// Ordinary rate-limit errors must not fall into the generic limit + retry-hint branch,
|
|
212
|
+
// but "rate limit reached: you've hit your weekly limit" still names a usage window.
|
|
213
|
+
if (transientMarkersRe.test(text) || (bareRateLimitRe.test(text) && !usageWindowPhrasesRe.test(text))) {
|
|
183
214
|
return { kind: 'transient' };
|
|
184
215
|
}
|
|
185
216
|
if (checkIsUsageLimitText(text)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiErrorRetry.js","sourceRoot":"","sources":["../src/apiErrorRetry.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;
|
|
1
|
+
{"version":3,"file":"apiErrorRetry.js","sourceRoot":"","sources":["../src/apiErrorRetry.ts"],"names":[],"mappings":"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"}
|
package/dist/apiRetryKick.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import type { UsageLimitWait } from './requests/limitWaitAnswer';
|
|
|
3
3
|
import type { BufferedPromptSettled } from './startupPromptBuffer';
|
|
4
4
|
import type { PromptDelivery } from './utils/promptDelivery';
|
|
5
5
|
import type { AgentApiErrorClass, ApiRetryState } from './types';
|
|
6
|
+
import { type FallbackChainEntry } from './utils/fallbackChain';
|
|
6
7
|
/**
|
|
7
8
|
* The retry kick and the boot restore of the API-error auto-retry (plan S4–S6),
|
|
8
9
|
* lifted out of `bot.ts` behind injected ports so the whole lifecycle — arm, fire,
|
|
@@ -40,6 +41,8 @@ export interface ApiRetryTimerEntry {
|
|
|
40
41
|
/** How a usage-limit wait ends, for the limit answer of a request opened during it.
|
|
41
42
|
* Absent for a record re-armed at boot (`state.json` keeps only the instant). */
|
|
42
43
|
limitWait?: UsageLimitWait;
|
|
44
|
+
/** The chain rung a usage-limit wait ends on (the earliest-resetting one): the kick moves the topic there first. */
|
|
45
|
+
resumeOn?: FallbackChainEntry;
|
|
43
46
|
}
|
|
44
47
|
/** What the kick needs to know of {@link ensureAgentSession}'s answer. */
|
|
45
48
|
export type ApiRetryEnsureOutcome = {
|
|
@@ -83,6 +86,12 @@ export interface ApiRetryKickDeps {
|
|
|
83
86
|
isCountersReset: boolean;
|
|
84
87
|
isRequestPrompt: boolean;
|
|
85
88
|
}) => Promise<void>;
|
|
89
|
+
/**
|
|
90
|
+
* Move the topic onto `rung` and continue its work there (`switchTopicToFallbackEntry`: it delivers its own
|
|
91
|
+
* continue prompt and ends the retry). `true` when it did — the kick is then done; `false` (already on that
|
|
92
|
+
* account, the switch deferred or failed) leaves the plain resume on the topic's current rung.
|
|
93
|
+
*/
|
|
94
|
+
resumeOnRung?: (key: SessionKey, rung: FallbackChainEntry) => Promise<boolean>;
|
|
86
95
|
/** Drop the retry's saved twin (`state.json`). */
|
|
87
96
|
clearSavedRetry: (key: SessionKey) => void;
|
|
88
97
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiRetryKick.d.ts","sourceRoot":"","sources":["../src/apiRetryKick.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAG3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"apiRetryKick.d.ts","sourceRoot":"","sources":["../src/apiRetryKick.ts"],"names":[],"mappings":"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"}
|
package/dist/apiRetryKick.js
CHANGED
|
@@ -6,6 +6,7 @@ exports.restoreApiRetryTimers = restoreApiRetryTimers;
|
|
|
6
6
|
const sessionKey_1 = require("./sessionKey");
|
|
7
7
|
const sessionKeyCodec_1 = require("./connectors/telegram/sessionKeyCodec");
|
|
8
8
|
const engine_1 = require("./scheduler/engine");
|
|
9
|
+
const fallbackChain_1 = require("./utils/fallbackChain");
|
|
9
10
|
/**
|
|
10
11
|
* The retry kick and the boot restore of the API-error auto-retry (plan S4–S6),
|
|
11
12
|
* lifted out of `bot.ts` behind injected ports so the whole lifecycle — arm, fire,
|
|
@@ -65,6 +66,15 @@ async function runApiRetryKick(deps, key) {
|
|
|
65
66
|
};
|
|
66
67
|
let isNudgeBuffered = false;
|
|
67
68
|
try {
|
|
69
|
+
// A wait aimed at another rung (the one whose limit reset first): the topic moves there before anything else.
|
|
70
|
+
// The switch posts its own plain notice and continue prompt; the pinned «resuming» notice still follows, so a
|
|
71
|
+
// muted topic hears that the work resumed after the wait, as on the plain path.
|
|
72
|
+
if (entry.resumeOn && entry.kind === 'usageLimit' && deps.resumeOnRung && (0, sessionKeyCodec_1.checkIsTelegramKey)(key)) {
|
|
73
|
+
if (await deps.resumeOnRung(key, entry.resumeOn)) {
|
|
74
|
+
deps.postTopicNotice(key, { kind: 'resuming', retryKind: entry.kind });
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
68
78
|
// R26: the conversation the limit interrupted is the one resumed — the ensure brings a sleeping
|
|
69
79
|
// session back by its id, for a topic as for a tracker issue (a fresh session would not know the work).
|
|
70
80
|
const ensured = await deps.ensureSession(key);
|
|
@@ -150,9 +160,15 @@ function restoreApiRetryTimers(deps, records) {
|
|
|
150
160
|
kind: record.kind,
|
|
151
161
|
firedAt: null,
|
|
152
162
|
fireAt: record.fireAt,
|
|
163
|
+
...(record.resumeOn ? readResumeOn(record.resumeOn) : {}),
|
|
153
164
|
});
|
|
154
165
|
restored += 1;
|
|
155
166
|
}
|
|
156
167
|
return restored;
|
|
157
168
|
}
|
|
169
|
+
/** The persisted rung of a record, validated like a chain entry; a malformed one is dropped (the plain resume applies). */
|
|
170
|
+
function readResumeOn(raw) {
|
|
171
|
+
const [entry] = (0, fallbackChain_1.normaliseFallbackChain)([raw]);
|
|
172
|
+
return entry ? { resumeOn: entry } : {};
|
|
173
|
+
}
|
|
158
174
|
//# sourceMappingURL=apiRetryKick.js.map
|
package/dist/apiRetryKick.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiRetryKick.js","sourceRoot":"","sources":["../src/apiRetryKick.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"apiRetryKick.js","sourceRoot":"","sources":["../src/apiRetryKick.ts"],"names":[],"mappings":"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"}
|
package/dist/bot.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAsC,MAAM,UAAU,CAAC;AAEhF,OAAO,KAAK,EAAU,OAAO,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"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"}
|