charness 3.3.0 → 3.3.2
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/SETUP.md +1 -1
- package/dist/adapters/claudeJsonStreamAdapter.d.ts +2 -0
- package/dist/adapters/claudeJsonStreamAdapter.d.ts.map +1 -1
- package/dist/adapters/claudeJsonStreamAdapter.js +15 -2
- package/dist/adapters/claudeJsonStreamAdapter.js.map +1 -1
- package/dist/adapters/openCodeAdapter.d.ts +2 -1
- package/dist/adapters/openCodeAdapter.d.ts.map +1 -1
- package/dist/adapters/openCodeAdapter.js +11 -4
- package/dist/adapters/openCodeAdapter.js.map +1 -1
- package/dist/apiErrorRetry.d.ts +10 -4
- package/dist/apiErrorRetry.d.ts.map +1 -1
- package/dist/apiErrorRetry.js +14 -7
- package/dist/apiErrorRetry.js.map +1 -1
- package/dist/apiRetryKick.d.ts +6 -0
- package/dist/apiRetryKick.d.ts.map +1 -1
- package/dist/apiRetryKick.js +2 -1
- package/dist/apiRetryKick.js.map +1 -1
- package/dist/bot.d.ts.map +1 -1
- package/dist/bot.js +26 -14
- package/dist/bot.js.map +1 -1
- package/dist/i18n/de.js +1 -1
- package/dist/i18n/de.js.map +1 -1
- package/dist/i18n/en.js +1 -1
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/es.js +1 -1
- package/dist/i18n/es.js.map +1 -1
- package/dist/i18n/fr.js +1 -1
- package/dist/i18n/fr.js.map +1 -1
- package/dist/i18n/hi.js +1 -1
- package/dist/i18n/hi.js.map +1 -1
- package/dist/i18n/ja.js +1 -1
- package/dist/i18n/ja.js.map +1 -1
- package/dist/i18n/ka.js +1 -1
- package/dist/i18n/ka.js.map +1 -1
- package/dist/i18n/pt.js +1 -1
- package/dist/i18n/pt.js.map +1 -1
- package/dist/i18n/ru.js +1 -1
- package/dist/i18n/ru.js.map +1 -1
- package/dist/i18n/uk.js +1 -1
- package/dist/i18n/uk.js.map +1 -1
- package/dist/i18n/uz.js +1 -1
- package/dist/i18n/uz.js.map +1 -1
- package/dist/i18n/zh.js +1 -1
- package/dist/i18n/zh.js.map +1 -1
- package/dist/installManager.d.ts +28 -0
- package/dist/installManager.d.ts.map +1 -1
- package/dist/installManager.js +85 -11
- package/dist/installManager.js.map +1 -1
- package/dist/utils/promptDelivery.d.ts +10 -4
- package/dist/utils/promptDelivery.d.ts.map +1 -1
- package/dist/utils/promptDelivery.js +6 -3
- package/dist/utils/promptDelivery.js.map +1 -1
- package/package.json +4 -4
package/dist/apiErrorRetry.d.ts
CHANGED
|
@@ -216,9 +216,11 @@ export declare function getRetryPlan(args: RetryPlanArgs): RetryPlan;
|
|
|
216
216
|
* into {@link decideRetryAction}. The bot owns the live `Map`; this snapshot is
|
|
217
217
|
* the only state the pure decision needs.
|
|
218
218
|
*/
|
|
219
|
+
/** Attempts armed per class inside one retry episode: the classes can alternate within it. */
|
|
220
|
+
export type RetryAttemptsByKind = Partial<Record<AgentApiErrorClass['kind'], number>>;
|
|
219
221
|
export interface RetryEntrySnapshot {
|
|
220
|
-
/**
|
|
221
|
-
|
|
222
|
+
/** The attempts already armed per class in the thread's current episode. */
|
|
223
|
+
attemptsByKind: RetryAttemptsByKind;
|
|
222
224
|
/** Epoch ms when the last armed retry actually fired, or `null` if still pending. */
|
|
223
225
|
firedAt: number | null;
|
|
224
226
|
/** True while a retry timer is armed and has not fired yet. */
|
|
@@ -245,6 +247,7 @@ export type RetryAction = {
|
|
|
245
247
|
attempt: number;
|
|
246
248
|
delayMs: number;
|
|
247
249
|
fireAt: number;
|
|
250
|
+
attemptsByKind: RetryAttemptsByKind;
|
|
248
251
|
} | {
|
|
249
252
|
action: 'giveUp';
|
|
250
253
|
attempts: number;
|
|
@@ -269,8 +272,11 @@ export interface DecideRetryActionArgs {
|
|
|
269
272
|
* 1. `prev.pending` → `ignore` (a retry is already armed — dedup the episode;
|
|
270
273
|
* this is what stops Claude's repeated scrape frames AND any duplicate
|
|
271
274
|
* `session.error` from re-arming).
|
|
272
|
-
* 2. same episode (a `prev` that fired within {@link retryRecurrenceGraceMs}) →
|
|
273
|
-
*
|
|
275
|
+
* 2. same episode (a `prev` that fired within {@link retryRecurrenceGraceMs}) → escalate THIS class from its own
|
|
276
|
+
* count in the episode (`prev.attemptsByKind`); a class new to the episode starts at 1, and so does a fresh
|
|
277
|
+
* episode. A model-turn refusal on the "continue" of a short throttle retry still gets its one retry, and two
|
|
278
|
+
* classes that alternate cannot reset each other: each still reaches its own cap. The `arm` action carries the
|
|
279
|
+
* episode's updated counts for the caller to keep.
|
|
274
280
|
* 3. ask {@link getRetryPlan}: `giveUp` → `giveUp` with `attempts` already made
|
|
275
281
|
* (= attempt − 1); else `arm` at `now + delayMs`.
|
|
276
282
|
*/
|
|
@@ -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;AAUlD;;;GAGG;AACH,eAAO,MAAM,uBAAuB,sBAAuB,CAAC;AAC5D,oFAAoF;AACpF,eAAO,MAAM,oBAAoB,GAAiC,CAAC;AACnE;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,QAA2C,CAAC;AAE9E,sIAAsI;AACtI,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAE7E;AAED;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,OAAQ,CAAC;AAClD,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAE7C;;;;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;AAyDpC;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,QAAyE,CAAC;AA4EzG;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,QAGxB,CAAC;AAEZ,0EAA0E;AAC1E,eAAO,MAAM,mBAAmB,QAA0C,CAAC;AAkB3E;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAElE;AAsBD;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAI3D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,kBAAkB,GAAG,IAAI,CAsC1F;
|
|
1
|
+
{"version":3,"file":"apiErrorRetry.d.ts","sourceRoot":"","sources":["../src/apiErrorRetry.ts"],"names":[],"mappings":"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"}
|
package/dist/apiErrorRetry.js
CHANGED
|
@@ -353,8 +353,11 @@ function classifyAgentApiError(text, now) {
|
|
|
353
353
|
}
|
|
354
354
|
return null;
|
|
355
355
|
}
|
|
356
|
-
/**
|
|
357
|
-
|
|
356
|
+
/**
|
|
357
|
+
* A retry verb before a relative reset, a few words apart at most and in the same sentence: "Please retry in 40s",
|
|
358
|
+
* "try again after 30s", "retry your request in 30s", "try again later, in 30s".
|
|
359
|
+
*/
|
|
360
|
+
const retryVerbBeforeResetRe = /\b(?:retry|try again)\b[^.]{0,30}$/i;
|
|
358
361
|
/**
|
|
359
362
|
* @description Whether the reset {@link parseResetAt} reads in `text` is a retry hint — a relative one stated by a retry
|
|
360
363
|
* verb — rather than a reset ("Your quota will reset after 4m30s", "resets in 2 minutes"). A machine-form reset is read
|
|
@@ -639,8 +642,11 @@ function clampDelay(delayMs) {
|
|
|
639
642
|
* 1. `prev.pending` → `ignore` (a retry is already armed — dedup the episode;
|
|
640
643
|
* this is what stops Claude's repeated scrape frames AND any duplicate
|
|
641
644
|
* `session.error` from re-arming).
|
|
642
|
-
* 2. same episode (a `prev` that fired within {@link retryRecurrenceGraceMs}) →
|
|
643
|
-
*
|
|
645
|
+
* 2. same episode (a `prev` that fired within {@link retryRecurrenceGraceMs}) → escalate THIS class from its own
|
|
646
|
+
* count in the episode (`prev.attemptsByKind`); a class new to the episode starts at 1, and so does a fresh
|
|
647
|
+
* episode. A model-turn refusal on the "continue" of a short throttle retry still gets its one retry, and two
|
|
648
|
+
* classes that alternate cannot reset each other: each still reaches its own cap. The `arm` action carries the
|
|
649
|
+
* episode's updated counts for the caller to keep.
|
|
644
650
|
* 3. ask {@link getRetryPlan}: `giveUp` → `giveUp` with `attempts` already made
|
|
645
651
|
* (= attempt − 1); else `arm` at `now + delayMs`.
|
|
646
652
|
*/
|
|
@@ -650,11 +656,12 @@ function decideRetryAction(args) {
|
|
|
650
656
|
return { action: 'surface' };
|
|
651
657
|
if (prev?.pending)
|
|
652
658
|
return { action: 'ignore' };
|
|
653
|
-
const
|
|
654
|
-
const
|
|
659
|
+
const isSameEpisode = !!prev && prev.firedAt != null && now - prev.firedAt <= exports.retryRecurrenceGraceMs;
|
|
660
|
+
const episodeAttempts = isSameEpisode ? prev.attemptsByKind : {};
|
|
661
|
+
const attempt = (episodeAttempts[kind] ?? 0) + 1;
|
|
655
662
|
const plan = getRetryPlan({ kind, attempt, resetAt, now });
|
|
656
663
|
if ('giveUp' in plan)
|
|
657
664
|
return { action: 'giveUp', attempts: attempt - 1 };
|
|
658
|
-
return { action: 'arm', attempt, delayMs: plan.delayMs, fireAt: now + plan.delayMs };
|
|
665
|
+
return { action: 'arm', attempt, delayMs: plan.delayMs, fireAt: now + plan.delayMs, attemptsByKind: { ...episodeAttempts, [kind]: attempt } };
|
|
659
666
|
}
|
|
660
667
|
//# sourceMappingURL=apiErrorRetry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiErrorRetry.js","sourceRoot":"","sources":["../src/apiErrorRetry.ts"],"names":[],"mappings":"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"}
|
|
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 { RetryAttemptsByKind } from './apiErrorRetry';
|
|
6
7
|
import { type FallbackChainEntry } from './utils/fallbackChain';
|
|
7
8
|
/**
|
|
8
9
|
* The retry kick and the boot restore of the API-error auto-retry (plan S4–S6),
|
|
@@ -30,6 +31,11 @@ export interface ApiRetryTimerEntry {
|
|
|
30
31
|
timer: NodeJS.Timeout | null;
|
|
31
32
|
/** 1-based attempt the current/last timer was armed for. */
|
|
32
33
|
attempt: number;
|
|
34
|
+
/**
|
|
35
|
+
* The attempts armed per class in this episode (`decideRetryAction`): the classes can alternate inside one, and each
|
|
36
|
+
* keeps its own count to its own cap. Not persisted: a retry restored at boot knows only its own class's count.
|
|
37
|
+
*/
|
|
38
|
+
attemptsByKind: RetryAttemptsByKind;
|
|
33
39
|
/** Error class that armed it. */
|
|
34
40
|
kind: AgentApiErrorClass['kind'];
|
|
35
41
|
/** Epoch ms when the timer fired, or `null` while still pending. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiRetryKick.d.ts","sourceRoot":"","sources":["../src/apiRetryKick.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"apiRetryKick.d.ts","sourceRoot":"","sources":["../src/apiRetryKick.ts"],"names":[],"mappings":"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"}
|
package/dist/apiRetryKick.js
CHANGED
|
@@ -163,6 +163,7 @@ function restoreApiRetryTimers(deps, records) {
|
|
|
163
163
|
deps.entries.set(keyStr, {
|
|
164
164
|
timer,
|
|
165
165
|
attempt: record.attempt,
|
|
166
|
+
attemptsByKind: { [record.kind]: record.attempt },
|
|
166
167
|
kind: record.kind,
|
|
167
168
|
firedAt: null,
|
|
168
169
|
fireAt: record.fireAt,
|
|
@@ -200,7 +201,7 @@ function restoreFiredLimitProbes(deps, records, graceMs) {
|
|
|
200
201
|
}
|
|
201
202
|
if (deps.entries.has(keyStr))
|
|
202
203
|
continue;
|
|
203
|
-
deps.entries.set(keyStr, { timer: null, attempt: 1, kind: 'transient', firedAt, fireAt: firedAt, isLimitProbe: true });
|
|
204
|
+
deps.entries.set(keyStr, { timer: null, attempt: 1, attemptsByKind: { transient: 1 }, kind: 'transient', firedAt, fireAt: firedAt, isLimitProbe: true });
|
|
204
205
|
restored += 1;
|
|
205
206
|
}
|
|
206
207
|
return restored;
|
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;AAoC5E,OAAO,KAAK,EAAE,YAAY,EAAmJ,aAAa,EAAuD,MAAM,SAAS,CAAC;AACjQ,OAAO,KAAK,EAAc,UAAU,EAAE,MAAM,cAAc,CAAC;AAW3D,OAAO,mCAAmC,CAAC;AAiG3C,OAAO,KAAK,EAAE,cAAc,EAAgB,MAAM,oBAAoB,CAAC;AA+BvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAgMjF,OAAO,KAAK,EAAW,cAAc,EAAE,MAAM,wCAAwC,CAAC;AA6TtF;;;;GAIG;AACH,QAAA,MAAM,eAAe,kEAGnB,CAAC;
|
|
1
|
+
{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"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"}
|
package/dist/bot.js
CHANGED
|
@@ -1135,7 +1135,7 @@ function handleApiError(key, cls, options = {}) {
|
|
|
1135
1135
|
}
|
|
1136
1136
|
const entry = apiRetryTimers.get(k);
|
|
1137
1137
|
const prev = entry
|
|
1138
|
-
? {
|
|
1138
|
+
? { attemptsByKind: entry.attemptsByKind, firedAt: entry.firedAt, pending: entry.timer !== null }
|
|
1139
1139
|
: null;
|
|
1140
1140
|
const now = Date.now();
|
|
1141
1141
|
const action = (0, apiErrorRetry_1.decideRetryAction)({
|
|
@@ -1200,7 +1200,7 @@ function handleApiError(key, cls, options = {}) {
|
|
|
1200
1200
|
attempt: action.attempt,
|
|
1201
1201
|
}));
|
|
1202
1202
|
}
|
|
1203
|
-
armApiRetryTimer(key, { kind: cls.kind, attempt: action.attempt, fireAt: action.fireAt, delayMs: action.delayMs, limitWait });
|
|
1203
|
+
armApiRetryTimer(key, { kind: cls.kind, attempt: action.attempt, fireAt: action.fireAt, delayMs: action.delayMs, attemptsByKind: action.attemptsByKind, limitWait });
|
|
1204
1204
|
}
|
|
1205
1205
|
/**
|
|
1206
1206
|
* @description Arm a thread's retry once its notice is posted: keep a pending question last, persist the record
|
|
@@ -1225,6 +1225,7 @@ function armApiRetryTimer(key, arming) {
|
|
|
1225
1225
|
apiRetryTimers.set((0, sessionKey_1.keyToString)(key), {
|
|
1226
1226
|
timer,
|
|
1227
1227
|
attempt: arming.attempt,
|
|
1228
|
+
attemptsByKind: arming.attemptsByKind ?? { [arming.kind]: arming.attempt },
|
|
1228
1229
|
kind: arming.kind,
|
|
1229
1230
|
firedAt: null,
|
|
1230
1231
|
fireAt: arming.fireAt,
|
|
@@ -4009,12 +4010,13 @@ async function ensureAgentSessionNow(key, options) {
|
|
|
4009
4010
|
if (failureAction === 'fail') {
|
|
4010
4011
|
return { ok: false, reason: 'resume-failed', message: (0, i18n_1.t)('agent.resume_failed_fresh') };
|
|
4011
4012
|
}
|
|
4012
|
-
// The previous conversation is lost to this topic: say so in one line, then start fresh.
|
|
4013
|
+
// The previous conversation is lost to this topic: say so in one line, then start fresh. A fresh start that
|
|
4014
|
+
// fails too says only why: "a fresh session was started" would be false.
|
|
4013
4015
|
const startMessage = await startAgentSession(key, options.args);
|
|
4016
|
+
if (!(0, createAdapter_1.getThreadAdapter)(key).checkIsActive(key))
|
|
4017
|
+
return { ok: false, reason: 'start-failed', message: startMessage };
|
|
4014
4018
|
const message = [(0, i18n_1.t)('agent.resume_failed_fresh'), startMessage].filter(Boolean).join('\n');
|
|
4015
|
-
return
|
|
4016
|
-
? { ok: true, message, isFresh: true }
|
|
4017
|
-
: { ok: false, reason: 'start-failed', message };
|
|
4019
|
+
return { ok: true, message, isFresh: true };
|
|
4018
4020
|
}
|
|
4019
4021
|
case 'start': {
|
|
4020
4022
|
await switchThreadAdapter(key, plan.adapterName);
|
|
@@ -4111,6 +4113,7 @@ async function suspendThreadSession(key) {
|
|
|
4111
4113
|
if (!adapter.checkIsActive(key) || adapter.checkIsWorking?.(key))
|
|
4112
4114
|
return;
|
|
4113
4115
|
startupPromptBuffer.markStarting(kStr);
|
|
4116
|
+
console.log(`[compact-on-idle] ${kStr} stopping the idle process; a prompt that comes meanwhile is held`);
|
|
4114
4117
|
try {
|
|
4115
4118
|
await adapter.suspendSession(key);
|
|
4116
4119
|
console.log(`[compact-on-idle] ${kStr} process stopped; the session sleeps and resumes on the next message`);
|
|
@@ -4150,12 +4153,16 @@ function handleAgentTurnEnded(key) {
|
|
|
4150
4153
|
* out through `sendNotice` (the topic by default).
|
|
4151
4154
|
*/
|
|
4152
4155
|
async function resumeSleepingSessionForPrompt(key, sendNotice = (text) => replyToThread(key, text)) {
|
|
4156
|
+
return (await wakeSleepingSessionForPrompt(key, sendNotice)).isAwake;
|
|
4157
|
+
}
|
|
4158
|
+
/** @description {@link resumeSleepingSessionForPrompt}, also saying whether it posted a notice (a start that failed says why). */
|
|
4159
|
+
async function wakeSleepingSessionForPrompt(key, sendNotice = (text) => replyToThread(key, text)) {
|
|
4153
4160
|
if (checkIsGeneral(key) || !state.getBinding(key) || getResumableSessionId(key) === null)
|
|
4154
|
-
return false;
|
|
4161
|
+
return { isAwake: false, isNoticePosted: false };
|
|
4155
4162
|
const ensured = await ensureAgentSession(key);
|
|
4156
4163
|
if (ensured.message)
|
|
4157
4164
|
await sendNotice(ensured.message);
|
|
4158
|
-
return ensured.ok && (0, createAdapter_1.getThreadAdapter)(key).checkIsActive(key);
|
|
4165
|
+
return { isAwake: ensured.ok && (0, createAdapter_1.getThreadAdapter)(key).checkIsActive(key), isNoticePosted: Boolean(ensured.message) };
|
|
4159
4166
|
}
|
|
4160
4167
|
/**
|
|
4161
4168
|
* @description Replay prompts buffered during the startup window to the now-active
|
|
@@ -8302,7 +8309,10 @@ bot.action(/^reask_(\d+)$/, async (ctx) => {
|
|
|
8302
8309
|
await withThreadLocale(key, () => deliverPromptOrBuffer(key, label, true));
|
|
8303
8310
|
return;
|
|
8304
8311
|
}
|
|
8305
|
-
await withThreadLocale(key, () => deliverActivePrompt(key, adapter, label, null));
|
|
8312
|
+
const outcome = await withThreadLocale(key, () => deliverActivePrompt(key, adapter, label, null));
|
|
8313
|
+
// The label reached no session (the topic was told why): the question is still open, so are its buttons.
|
|
8314
|
+
if (outcome === 'noSession' && labels && !reAskedQuestionOptions.has((0, sessionKey_1.keyToString)(key)))
|
|
8315
|
+
reAskedQuestionOptions.set((0, sessionKey_1.keyToString)(key), labels);
|
|
8306
8316
|
});
|
|
8307
8317
|
registerReminderCallbacks();
|
|
8308
8318
|
bot.action(/^ccmode_(.+)$/, async (ctx) => {
|
|
@@ -8503,13 +8513,13 @@ async function deliverActivePrompt(key, adapter, text, intake, sentAtMs, replyCo
|
|
|
8503
8513
|
// the quote — the reply context is deliberately dropped here. Not a request
|
|
8504
8514
|
// either: the turn it unblocks continues under the open one.
|
|
8505
8515
|
await applyQuestionAnswer(key, route.labels);
|
|
8506
|
-
return;
|
|
8516
|
+
return null;
|
|
8507
8517
|
}
|
|
8508
8518
|
// Free-form text cancels the question and is a fresh prompt — a request (S7).
|
|
8509
8519
|
const opening = await openTopicRequest(key, text, intake);
|
|
8510
8520
|
await cancelPendingQuestionAndForward(key, adapter, text, sentAtMs, replyContext, opening.header);
|
|
8511
8521
|
trackTopicRequestTurn(key, opening);
|
|
8512
|
-
return;
|
|
8522
|
+
return null;
|
|
8513
8523
|
}
|
|
8514
8524
|
// A bare `/clear` forwarded to the agent wipes its context (Claude TUI), so
|
|
8515
8525
|
// the next prompt must re-carry the thread-context preamble. Reset the marker
|
|
@@ -8543,17 +8553,19 @@ async function deliverActivePrompt(key, adapter, text, intake, sentAtMs, replyCo
|
|
|
8543
8553
|
buffer: async () => {
|
|
8544
8554
|
await deliverPromptOrBuffer(key, `${opening.header}${getPromptWithThreadReplyQuote(key, text, replyContext)}`, true);
|
|
8545
8555
|
},
|
|
8546
|
-
wake: () =>
|
|
8556
|
+
wake: () => wakeSleepingSessionForPrompt(key),
|
|
8547
8557
|
forward: () => forwardPromptToAgent(key, (0, createAdapter_1.getThreadAdapter)(key), text, sentAtMs, { replyContext, requestHeader: opening.header }),
|
|
8548
|
-
reportNoSession: async () => {
|
|
8558
|
+
reportNoSession: async (isAlreadyTold) => {
|
|
8549
8559
|
// The prompt reaches no agent: the request it opened would only wait for a turn that never comes.
|
|
8550
8560
|
if (opening.requestId !== null)
|
|
8551
8561
|
await topicRequestLedger?.closeRequest(opening.requestId, 'cancelled');
|
|
8552
|
-
|
|
8562
|
+
if (!isAlreadyTold)
|
|
8563
|
+
await replyToThread(key, (0, i18n_1.t)('agent.no_session'));
|
|
8553
8564
|
},
|
|
8554
8565
|
});
|
|
8555
8566
|
if (outcome !== 'noSession')
|
|
8556
8567
|
trackTopicRequestTurn(key, opening);
|
|
8568
|
+
return outcome;
|
|
8557
8569
|
}
|
|
8558
8570
|
/**
|
|
8559
8571
|
* @description Cancel a pending OpenCode question because the user sent free-form
|