@eddyskywalker/dsh-chatgpt-subscription 0.12.2 → 0.12.4

package/lib/index.js

@@ -21610,8 +21610,10 @@ function assertStreamComplete$3(state) {
 * - `INVALID_CREDENTIAL` — a rejected access token fails identically on every
 *   attempt;
 * - `PROVIDER_ERROR` — a 400, a 401 that is really a plan-entitlement refusal,
-*   or a 403 quota limit. Retrying a quota that resets in hours only burns
-*   requests and delays the message the user needs to see;
+*   or a 403 quota limit. Retrying a quota that resets in hours against the
+*   SAME account only burns requests and delays the message the user needs to
+*   see, so none of it is retried; a 403 limit still rotates to another account
+*   when the pool holds one, which is a routing decision rather than a retry;
 * - `ABORTED` — the caller already cancelled.
 *
 * The DSH normal defaults would apply anyway; stating the values here pins them
@@ -21695,17 +21697,20 @@ function classifyKimiFailure(status, bodyText) {
 	if (isHttpContextOverflow(status, bodyText)) return {
 		code: CONTEXT_OVERFLOW_CODE,
 		retryable: false,
+		accountScoped: false,
 		message: `${PROVIDER_NAME$3} context window exceeded: ${detail}`
 	};
 	if (status === 402) return {
 		code: "SERVER",
 		retryable: true,
+		accountScoped: false,
 		message: `${PROVIDER_NAME$3} could not verify the subscription tier (402). Retrying; if it persists, confirm the membership is active.${detail ? ` ${detail}` : ""}`
 	};
 	if (status === 401 || status === 403) {
 		if (matchesAny$1(detail, ENTITLEMENT_PATTERNS)) return {
 			code: "PROVIDER_ERROR",
 			retryable: false,
+			accountScoped: false,
 			message: `${PROVIDER_NAME$3} refused this request for the current plan: ${detail || "the requested model or context is not included"}. Switch to a model the plan includes, lower the context-window override, or upgrade the subscription.`
 		};
 		if (status === 403) {
@@ -21713,12 +21718,14 @@ function classifyKimiFailure(status, bodyText) {
 			return {
 				code: "PROVIDER_ERROR",
 				retryable: false,
+				accountScoped: true,
 				message: `${PROVIDER_NAME$3} blocked the request on an account limit (403): ${detail || (limitReached ? "the account limit was reached" : "the account refused the request")}. The quota refreshes on its own schedule — check the Kimi Code card in Settings for the reset time.`
 			};
 		}
 		return {
 			code: "INVALID_CREDENTIAL",
 			retryable: false,
+			accountScoped: false,
 			message: `${PROVIDER_NAME$3} rejected the stored credential (401). Sign in again from Settings > Kimi Code.${detail ? ` ${detail}` : ""}`
 		};
 	}
@@ -21726,32 +21733,81 @@ function classifyKimiFailure(status, bodyText) {
 		if (matchesAny$1(detail, QUOTA_EXHAUSTED_PATTERNS$1)) return {
 			code: "PROVIDER_ERROR",
 			retryable: false,
+			accountScoped: true,
 			message: `${PROVIDER_NAME$3} reports the account quota is exhausted: ${detail || "no remaining quota"}. Top up or wait for the window to reset.`
 		};
 		return {
 			code: "RATE_LIMIT",
 			retryable: true,
+			accountScoped: false,
 			message: `${PROVIDER_NAME$3} is rate limited or overloaded (429): ${detail || "too many requests"}. Retrying with backoff.`
 		};
 	}
 	if (status >= 500) return {
 		code: "SERVER",
 		retryable: true,
+		accountScoped: false,
 		message: `${PROVIDER_NAME$3} upstream server error (${status}): ${detail || "the model provider is temporarily unavailable"}. Retrying with backoff.`
 	};
 	if (status === 400) return {
 		code: "PROVIDER_ERROR",
 		retryable: false,
+		accountScoped: false,
 		message: `${PROVIDER_NAME$3} rejected the request (400): ${detail || "the request was not accepted"}`
 	};
 	return {
 		code: "PROVIDER_ERROR",
 		retryable: false,
+		accountScoped: false,
 		message: `${PROVIDER_NAME$3} API error (${status}): ${detail || "No response"}`
 	};
 }
+/** Numeric reset the service may ship as a field rather than in prose. */
+const RESET_FIELD_PATTERN = /"?reset[A-Za-z_]*"?\s*[:=]\s*"?(\d{9,16})"?/i;
+/** ISO instant quoted in prose, trusted only when it names its own zone. */
+const RESET_INSTANT_PATTERN = /\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}(?::\d{2})?(?:\.\d+)?(?:Z|[+-]\d{2}:?\d{2})/;
+/** The window a billing-cycle refusal names; nothing shorter describes it. */
+const BILLING_CYCLE_PATTERN = /usage limit for this billing cycle/i;
+/**
+* How long one account stays out of rotation after it reports a spent limit.
+*
+* The reset instant is read from the body whenever the service states one — as a
+* numeric field, or as an instant carrying its own zone — and the length of the
+* window the service names is used otherwise. The zone is required for that
+* instant because an unqualified one is ambiguous, and a cooldown computed from
+* the wrong zone is either hours too long or already over; where the body is
+* ambiguous the window length is the honest answer.
+*
+* Both ends of the range are load-bearing. A reset instant barely in the future
+* would otherwise read as no cooldown at all and put the account straight back
+* into rotation to be refused again; and a reset instant already in the past
+* (a stale cache, a clock skew) falls back to the window length above rather
+* than to no cooldown at all.
+*/
+function accountLimitCooldownMs(bodyText, now = Date.now()) {
+	const field = bodyText.match(RESET_FIELD_PATTERN);
+	const instant = bodyText.match(RESET_INSTANT_PATTERN);
+	const resetsAt = field !== null ? parseTimestamp(Number(field[1])) : instant !== null ? Date.parse(instant[0].replace(" ", "T")) : null;
+	if (resetsAt !== null && Number.isFinite(resetsAt) && resetsAt > now) return Math.min(Math.max(resetsAt - now, POOL_COOLDOWN_MS$2), MAX_ACCOUNT_LIMIT_COOLDOWN_MS);
+	return BILLING_CYCLE_PATTERN.test(bodyText) ? BILLING_CYCLE_COOLDOWN_MS : ACCOUNT_LIMIT_COOLDOWN_MS;
+}
 /** Cooldown one rate-limited account takes when the provider states no delay. */
 const POOL_COOLDOWN_MS$2 = 15 * 6e4;
+/**
+* Fallback cooldown for an account whose usage window is spent.
+*
+* The service states the reset time only sometimes, so the fallback is the
+* window's own length. The 15 minutes a 429 gets would put the account back
+* into rotation four times inside the very window that just refused it.
+*/
+const ACCOUNT_LIMIT_COOLDOWN_MS = 300 * 6e4;
+/**
+* A billing cycle is not a window: a 5-hour cooldown would spend a request every
+* five hours to learn an answer that changes at most once a month.
+*/
+const BILLING_CYCLE_COOLDOWN_MS = 720 * 60 * 6e4;
+/** Ceiling, so a malformed reset time cannot park an account for years. */
+const MAX_ACCOUNT_LIMIT_COOLDOWN_MS = BILLING_CYCLE_COOLDOWN_MS;
 var KimiCodeAdapter = class extends LlmAdapter {
 	store;
 	modelSettings;
@@ -21936,11 +21992,15 @@ var KimiCodeAdapter = class extends LlmAdapter {
 			if (pool !== null && accountId !== void 0) {
 				const planScoped = response.status === 429 && matchesAny$1(detail, ENTITLEMENT_PATTERNS);
 				if (response.status === 429 && !planScoped) {
-					await pool.markCooldown(accountId, after ?? POOL_COOLDOWN_MS$2, `${PROVIDER_NAME$3} 429`).catch(() => void 0);
+					const cooldownMs = failure.accountScoped ? accountLimitCooldownMs(detail) : after ?? POOL_COOLDOWN_MS$2;
+					await pool.markCooldown(accountId, cooldownMs, `${PROVIDER_NAME$3} 429`).catch(() => void 0);
 					if (await pool.hasAnotherAvailableAccount(tried)) continue;
 				} else if (failure.code === "INVALID_CREDENTIAL") {
 					await pool.markAuthFailed(accountId, failure.message).catch(() => void 0);
 					if (await pool.hasAnotherAvailableAccount(tried)) continue;
+				} else if (failure.accountScoped) {
+					await pool.markCooldown(accountId, accountLimitCooldownMs(detail), `${PROVIDER_NAME$3} 403`).catch(() => void 0);
+					if (await pool.hasAnotherAvailableAccount(tried)) continue;
 				}
 			}
 			throw new LlmError(failure.message, failure.code, {
@@ -43268,6 +43328,16 @@ function installRelayProbe(ctx, options) {
 * The guard rewrites nothing and appends nothing to the aborted attempt. Its
 * only model-visible input is the single resume message it queues afterwards,
 * on a fresh turn.
+*
+* Agent identity is read from the request, never remembered globally. The loop
+* stamps every request it builds with its `sessionId`, and `ctx.agents.get`
+* turns that back into the one Agent that owns the stream. Remembering "the
+* newest agent this process saw" instead was wrong twice over: a host runs one
+* Agent per session plus one per subagent, so the newest is usually a different
+* conversation, and `agent/created` fires once per Agent, so an Agent that
+* already existed when the guard installed was never reported at all. Both
+* cases cut the runaway and then resumed nothing, which reads to the user as a
+* conversation that simply stops mid-answer.
 */
 const DEFAULT_GUARD_OPTIONS = {
 	windowChars: 4096,
@@ -43372,6 +43442,43 @@ function appendWindow(current, addition, limit) {
 	const combined = current + addition;
 	return combined.length > limit ? combined.slice(-limit) : combined;
 }
+/** An Agent's session identity as the plain string a request carries. */
+function agentId(raw) {
+	const id = raw?.id;
+	return typeof id === "string" ? id : void 0;
+}
+/**
+* The host's Agent registry, read defensively.
+*
+* A Cordis service that was never injected reads as undefined and a host
+* without the service at all must not fail this plugin's load, so both the
+* property read and the later lookup are guarded.
+*/
+function agentRegistry(ctx) {
+	try {
+		const registry = ctx.agents;
+		return typeof registry?.get === "function" ? registry : void 0;
+	} catch {
+		return;
+	}
+}
+/**
+* Whether one request is a conversation call the guard may stop and resume.
+*
+* The loop marks its own requests, but that marker is reached through a named
+* export this plugin cannot assume on every generation it supports, so the
+* guard reads the request's own `purpose` field instead: compaction and
+* session-title calls are one-shot, own no turn to resume, and a truncated one
+* is a hard error rather than a runaway. A generation that predates the field
+* leaves it undefined, which is the pre-existing behaviour.
+*/
+function conversationCall(request) {
+	return request.purpose === void 0;
+}
+/** Error text for one warn line, without importing a generation-bound helper. */
+function describeError(error) {
+	return error instanceof Error ? `${error.name}: ${error.message}` : String(error);
+}
 /**
 * Install the reasoning-collapse guard on a Context.
 *
@@ -43380,14 +43487,15 @@ function appendWindow(current, addition, limit) {
 * load.
 *
 * Resuming needs the live Agent for `cancel` and `steer`, and no supported
-* generation hands the agent to `llm/stream`. `agent/created` reports it on
-* every one of them, so the guard tracks the newest agent and keys the per-turn
-* break budget on the request's own abort signal — which exists for a whole
-* turn — rather than on the agent object.
+* generation hands the agent to `llm/stream`. The request does, though: every
+* request the loop builds carries its `sessionId`, so the guard resolves the
+* owning Agent per request through `ctx.agents.get`, falling back to the map
+* `agent/created` fills. The per-turn break budget stays keyed on the
+* request's own abort signal, which exists for a whole turn.
 *
 * @param ctx - plugin context.
 * @param options - see {@link GuardOptions}; validated fail-loud.
-* @returns a disposer removing both listeners, or undefined when the host
+* @returns a disposer removing every listener, or undefined when the host
 * exposes no event bus.
 */
 function installReasoningCollapseGuard(ctx, options = {}) {
@@ -43395,11 +43503,38 @@ function installReasoningCollapseGuard(ctx, options = {}) {
 	if (typeof ctx.on !== "function") return void 0;
 	const watched = new Set(resolved.includeModels);
 	const breakers = /* @__PURE__ */ new WeakMap();
-	let currentAgent;
-	const releaseAgent = ctx.on("agent/created", (payload) => {
-		currentAgent = payload.agent;
+	const known = /* @__PURE__ */ new Map();
+	const releaseCreated = ctx.on("agent/created", (payload) => {
+		remember(payload.agent);
+	});
+	const releaseDisposed = ctx.on("agent/disposed", (payload) => {
+		const id = agentId(payload.agent);
+		if (id !== void 0) known.delete(id);
 	});
 	const releaseStream = ctx.on("llm/stream", guardStream, { global: true });
+	function remember(raw) {
+		const agent = raw;
+		if (agent === void 0 || agent === null) return;
+		const id = agentId(agent);
+		if (id !== void 0) known.set(id, agent);
+	}
+	/**
+	* The Agent that owns one guarded request, or undefined when this host
+	* cannot name it.
+	*
+	* The registry is authoritative and is read first: it answers for an Agent
+	* created before this guard was installed, which is exactly the Agent an
+	* `agent/created` listener can never report. Falling back to the newest
+	* Agent this process saw would cancel and resume a different conversation.
+	*/
+	function resolveAgent(sessionId) {
+		if (sessionId === void 0) return void 0;
+		try {
+			const registered = agentRegistry(ctx)?.get(sessionId);
+			if (registered !== void 0 && registered !== null) return registered;
+		} catch {}
+		return known.get(sessionId);
+	}
 	function breakerFor(key) {
 		let state = breakers.get(key);
 		if (state === void 0) {
@@ -43419,27 +43554,36 @@ function installReasoningCollapseGuard(ctx, options = {}) {
 	* steering submitted while a turn is still unwinding; by the time the
 	* microtask runs the abort has settled, so the wake lands on a fresh turn that
 	* inherits the kept inbox.
+	*
+	* With no Agent to address, the runaway is still cut — that half is the whole
+	* point — and the log says so, because a break that cannot resume is
+	* indistinguishable from a broken turn to the user.
 	*/
-	function breakOff(state, score) {
+	function breakOff(state, score, agent, sessionId) {
 		state.breaksThisTurn++;
 		state.lastBreakAt = resolved.now();
-		ctx.logger?.warn(`reasoning-collapse-guard: stopped degenerate reasoning (score ${score.toFixed(3)}, break ${state.breaksThisTurn}/${resolved.maxBreaksPerTurn})`);
-		const agent = currentAgent;
-		agent?.cancel?.({
+		ctx.logger?.warn(`reasoning-collapse-guard: stopped degenerate reasoning (score ${score.toFixed(3)}, break ${state.breaksThisTurn}/${resolved.maxBreaksPerTurn}, session ${sessionId ?? "unidentified"}${agent === void 0 ? ", no agent to resume" : ""})`);
+		if (agent === void 0) return;
+		agent.cancel?.({
 			kind: "hook",
 			reason: "reasoning-collapse-guard"
 		}, { keepInbox: true });
-		if (agent === void 0 || state.resuming) return;
+		if (agent.steer === void 0 || state.resuming) return;
 		state.resuming = true;
 		const text = state.breaksThisTurn >= 2 ? RESUME_HINT_STRICT : RESUME_HINT;
 		queueMicrotask(() => {
 			state.resuming = false;
-			agent.steer?.(createResumeMessage(text));
+			try {
+				agent.steer?.(createResumeMessage(text));
+			} catch (error) {
+				ctx.logger?.warn(`reasoning-collapse-guard: could not queue the resume: ${describeError(error)}`);
+			}
 		});
 	}
 	function guardStream(request, next) {
 		const state = breakerFor(request.signal ?? STATIC_KEY);
-		if (state.exhausted || !watchedModel(request.model)) return next();
+		if (state.exhausted || !watchedModel(request.model) || !conversationCall(request)) return next();
+		const agent = resolveAgent(request.sessionId);
 		async function* guarded() {
 			let window = "";
 			for await (const chunk of next()) {
@@ -43450,7 +43594,7 @@ function installReasoningCollapseGuard(ctx, options = {}) {
 						const score = collapseScore(window, resolved.ngramSize);
 						if (score >= resolved.threshold) if (state.breaksThisTurn >= resolved.maxBreaksPerTurn) state.exhausted = true;
 						else {
-							breakOff(state, score);
+							breakOff(state, score, agent, request.sessionId);
 							return;
 						}
 					}
@@ -43462,7 +43606,9 @@ function installReasoningCollapseGuard(ctx, options = {}) {
 	}
 	return () => {
 		releaseListener(releaseStream);
-		releaseListener(releaseAgent);
+		releaseListener(releaseCreated);
+		releaseListener(releaseDisposed);
+		known.clear();
 	};
 }
 /** Shared key for the rare request that carries no abort signal. */

package/lib/types/host/kimi-code/adapter.d.ts

@@ -28,8 +28,10 @@ import { KimiCodeAccountPool } from './account-pool.ts';
  * - `INVALID_CREDENTIAL` — a rejected access token fails identically on every
  *   attempt;
  * - `PROVIDER_ERROR` — a 400, a 401 that is really a plan-entitlement refusal,
- *   or a 403 quota limit. Retrying a quota that resets in hours only burns
- *   requests and delays the message the user needs to see;
+ *   or a 403 quota limit. Retrying a quota that resets in hours against the
+ *   SAME account only burns requests and delays the message the user needs to
+ *   see, so none of it is retried; a 403 limit still rotates to another account
+ *   when the pool holds one, which is a routing decision rather than a retry;
  * - `ABORTED` — the caller already cancelled.
  *
  * The DSH normal defaults would apply anyway; stating the values here pins them
@@ -63,6 +65,22 @@ export interface KimiFailureClassification {
     message: string;
     /** True only when the failure is worth retrying. */
     retryable: boolean;
+    /**
+     * True when the refusal belongs to THIS account alone, so another pooled
+     * account may still serve the same request.
+     *
+     * A spent usage window is the case that matters, and this service reports it
+     * as a 403 — neither a bad credential nor retryable back-pressure, so nothing
+     * in the code or the message says "rotate". Asking the same account again
+     * cannot help; taking it out of rotation until its window resets lets the next
+     * account answer, and each account in the pool carries its own quota.
+     *
+     * False for every verdict that belongs to the request or to the plan: an
+     * entitlement refusal, a malformed body, ordinary overload. Rotating on one of
+     * those would spend every account in the pool to learn the same answer from
+     * each of them.
+     */
+    accountScoped: boolean;
 }
 /** Short, single-line excerpt of one error body, safe to show a user. */
 export declare function summarizeFailureBody(raw: string): string;
@@ -73,6 +91,23 @@ export declare function summarizeFailureBody(raw: string): string;
  * @param bodyText - raw response body, used to separate overloaded statuses.
  */
 export declare function classifyKimiFailure(status: number, bodyText: string): KimiFailureClassification;
+/**
+ * How long one account stays out of rotation after it reports a spent limit.
+ *
+ * The reset instant is read from the body whenever the service states one — as a
+ * numeric field, or as an instant carrying its own zone — and the length of the
+ * window the service names is used otherwise. The zone is required for that
+ * instant because an unqualified one is ambiguous, and a cooldown computed from
+ * the wrong zone is either hours too long or already over; where the body is
+ * ambiguous the window length is the honest answer.
+ *
+ * Both ends of the range are load-bearing. A reset instant barely in the future
+ * would otherwise read as no cooldown at all and put the account straight back
+ * into rotation to be refused again; and a reset instant already in the past
+ * (a stale cache, a clock skew) falls back to the window length above rather
+ * than to no cooldown at all.
+ */
+export declare function accountLimitCooldownMs(bodyText: string, now?: number): number;
 export interface KimiCodeAdapterOptions {
     fetchFn?: typeof fetch;
     attachments?: AttachmentImageReader;

package/lib/types/host/kimi-code/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../src/host/kimi-code/adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../src/host/kimi-code/adapter.ts"],"names":[],"mappings":"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"}

package/lib/types/host/reasoning-collapse-guard/index.d.ts

@@ -29,11 +29,32 @@
  * The guard rewrites nothing and appends nothing to the aborted attempt. Its
  * only model-visible input is the single resume message it queues afterwards,
  * on a fresh turn.
+ *
+ * Agent identity is read from the request, never remembered globally. The loop
+ * stamps every request it builds with its `sessionId`, and `ctx.agents.get`
+ * turns that back into the one Agent that owns the stream. Remembering "the
+ * newest agent this process saw" instead was wrong twice over: a host runs one
+ * Agent per session plus one per subagent, so the newest is usually a different
+ * conversation, and `agent/created` fires once per Agent, so an Agent that
+ * already existed when the guard installed was never reported at all. Both
+ * cases cut the runaway and then resumed nothing, which reads to the user as a
+ * conversation that simply stops mid-answer.
+ */
+/**
+ * The subset of `llm/stream` options this guard reads.
+ *
+ * `sessionId` is what binds a stream to the Agent that owns it, and
+ * `purpose` tells a conversation call from an auxiliary one (compaction,
+ * session title) that owns no turn to resume. Both are plain request fields:
+ * the guard adds no generation-bound named import to learn them.
  */
-/** The subset of `llm/stream` options this guard reads. */
 export interface GuardStreamOptions {
     readonly model?: string | undefined;
     readonly signal?: AbortSignal | undefined;
+    /** Stamped by the agent loop on every request it builds. */
+    readonly sessionId?: string | undefined;
+    /** Absent on an ordinary conversation request; set on an auxiliary call. */
+    readonly purpose?: string | undefined;
 }
 /** A chunk as it crosses the stream boundary; only the reasoning delta is read. */
 export interface GuardChunk {
@@ -42,6 +63,8 @@ export interface GuardChunk {
 }
 /** Live Agent methods the guard calls. Optional so an older shape stays loadable. */
 export interface GuardAgentLike {
+    /** The Agent's session identity — the same value the loop stamps on requests. */
+    readonly id?: unknown;
     cancel?(cause: {
         kind: 'hook';
         reason: string;
@@ -52,12 +75,12 @@ export interface GuardAgentLike {
 }
 /** The `llm/stream` waterfall listener the guard registers. */
 export type GuardStreamListener = (options: GuardStreamOptions, next: () => AsyncIterable<GuardChunk>) => AsyncIterable<GuardChunk>;
-/** The `agent/created` listener the guard registers. */
-export type GuardAgentCreatedListener = (payload: {
+/** The `agent/created` / `agent/disposed` listener the guard registers. */
+export type GuardAgentEventListener = (payload: {
     agent: unknown;
 }) => void;
 /** Either listener {@link ReasoningCollapseContext.on} accepts. */
-export type GuardListener = GuardStreamListener | GuardAgentCreatedListener;
+export type GuardListener = GuardStreamListener | GuardAgentEventListener;
 /** Listener options accepted by the harness event bus. */
 export interface GuardListenerOptions {
     /** Receive the event regardless of context filter checks. */
@@ -68,10 +91,18 @@ export interface GuardListenerOptions {
  * every supported harness generation without importing generation-bound types.
  */
 export interface ReasoningCollapseContext {
-    on?: (event: 'llm/stream' | 'agent/created', listener: GuardListener, options?: GuardListenerOptions) => unknown;
+    on?: (event: 'llm/stream' | 'agent/created' | 'agent/disposed', listener: GuardListener, options?: GuardListenerOptions) => unknown;
     logger?: {
         warn(message: string): void;
     } | undefined;
+    /**
+     * The harness Agent registry, read once so a guard installed after an Agent
+     * was created can still resolve it. A host without the service degrades to
+     * the `agent/created` map rather than failing this plugin's load.
+     */
+    readonly agents?: {
+        get(id: unknown): unknown;
+    } | undefined;
 }
 /** Configuration for {@link installReasoningCollapseGuard}. */
 export interface GuardOptions {
@@ -131,14 +162,15 @@ export declare const RESUME_HINT_STRICT: string;
  * load.
  *
  * Resuming needs the live Agent for `cancel` and `steer`, and no supported
- * generation hands the agent to `llm/stream`. `agent/created` reports it on
- * every one of them, so the guard tracks the newest agent and keys the per-turn
- * break budget on the request's own abort signal — which exists for a whole
- * turn — rather than on the agent object.
+ * generation hands the agent to `llm/stream`. The request does, though: every
+ * request the loop builds carries its `sessionId`, so the guard resolves the
+ * owning Agent per request through `ctx.agents.get`, falling back to the map
+ * `agent/created` fills. The per-turn break budget stays keyed on the
+ * request's own abort signal, which exists for a whole turn.
  *
  * @param ctx - plugin context.
  * @param options - see {@link GuardOptions}; validated fail-loud.
- * @returns a disposer removing both listeners, or undefined when the host
+ * @returns a disposer removing every listener, or undefined when the host
  * exposes no event bus.
  */
 export declare function installReasoningCollapseGuard(ctx: ReasoningCollapseContext, options?: GuardOptions): (() => void) | undefined;

package/lib/types/host/reasoning-collapse-guard/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/host/reasoning-collapse-guard/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/host/reasoning-collapse-guard/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eddyskywalker/dsh-chatgpt-subscription",
-  "version": "0.12.2",
+  "version": "0.12.4",
   "description": "DSH provider plugin for Codex access through a ChatGPT subscription.",
   "author": {
     "name": "eddyskywalker",