ghc-proxy 0.9.2 → 0.9.3

package/dist/main.mjs

@@ -6780,7 +6780,31 @@ const RECOVERY_EVENT_OPTIONAL_FIELDS = [
 	"nextRetryAt",
 	"decision"
 ];
+function isRoutineRecoveryEvent(fields) {
+	return fields.event === "cooldown" || fields.event === "grant" && fields.queueWaitMs === 0 || fields.event === "retry" && fields.status !== void 0 && fields.decision === "retry";
+}
+function formatRecoveryEventLine(fields) {
+	const kind = fields.status === 429 ? "rate limit" : fields.status === 529 ? "overload" : "recovery";
+	const includeQueueState = fields.event === "admission" || fields.event === "grant";
+	return [
+		`Upstream ${kind}`,
+		fields.decision ?? fields.event,
+		fields.status !== void 0 ? `status=${fields.status}` : void 0,
+		fields.effectiveModel ? `model=${JSON.stringify(fields.effectiveModel).slice(1, -1)}` : void 0,
+		fields.scope ? `scope=${fields.scope}` : void 0,
+		fields.retryCount !== void 0 ? `retry=${fields.retryCount}` : void 0,
+		fields.connectionClass ? `connection=${fields.connectionClass}` : void 0,
+		fields.delayMs !== void 0 ? `wait=${formatDurationMs(fields.delayMs)}` : void 0,
+		fields.delaySource ? `source=${fields.delaySource}` : void 0,
+		fields.queueWaitMs !== void 0 && fields.queueWaitMs > 0 ? `queueWait=${formatDurationMs(fields.queueWaitMs)}` : void 0,
+		includeQueueState && fields.activeSlots !== void 0 && fields.maxSlots !== void 0 ? `slots=${fields.activeSlots}/${fields.maxSlots}` : void 0,
+		includeQueueState && fields.pendingDepth !== void 0 && fields.maxPendingDepth !== void 0 ? `queue=${fields.pendingDepth}/${fields.maxPendingDepth}` : void 0,
+		fields.remainingBudgetMs !== void 0 ? `budget=${formatDurationMs(fields.remainingBudgetMs)}` : void 0,
+		`rid=${fields.requestId.slice(0, 8)}`
+	].filter((value) => value !== void 0).join(" ");
+}
 function logRecoveryEvent(input, logger = consola) {
+	if (logger === consola && isRoutineRecoveryEvent(input)) return;
 	const callerRequestId = sanitizeCallerRequestId(input.callerRequestId);
 	const fields = {
 		requestId: input.requestId,
@@ -6788,6 +6812,10 @@ function logRecoveryEvent(input, logger = consola) {
 		event: input.event
 	};
 	for (const key of RECOVERY_EVENT_OPTIONAL_FIELDS) if (input[key] !== void 0) Object.assign(fields, { [key]: input[key] });
+	if (logger === consola) {
+		consola.info(formatRecoveryEventLine(fields));
+		return;
+	}
 	logger.info("Upstream recovery", fields);
 }
 function setRequestModelMapping(request, info) {
@@ -7091,8 +7119,9 @@ var UpstreamRequestQueue = class {
 				discardResponse(response);
 				lease.release();
 				recovery.retryCount++;
+				const statusLabel = status === 429 ? "rate limited (429)" : status === 529 ? "overloaded (529)" : String(status);
 				this.logger.warn([
-					`Upstream ${status};`,
+					`Upstream ${statusLabel};`,
 					`retrying ${formatRequestContext(context)}`,
 					`in ${formatDurationMs(retryDelay.delayMs)}`,
 					`(attempt ${recovery.retryCount}/${recovery.retryLimit})`
@@ -7398,7 +7427,7 @@ var UpstreamRequestQueue = class {
 			maxPendingDepth: this.options.maxQueueDepth
 		};
 		if (!this.logger.info) return;
-		logRecoveryEvent({
+		const eventFields = {
 			requestId: recovery.requestId,
 			callerRequestId: recovery.callerRequestId,
 			event,
@@ -7409,7 +7438,9 @@ var UpstreamRequestQueue = class {
 				remainingBudgetMs: this.remainingBudget(recovery)
 			} : {},
 			...fields
-		}, { info: this.logger.info.bind(this.logger) });
+		};
+		if (this.logger === consola) logRecoveryEvent(eventFields);
+		else logRecoveryEvent(eventFields, { info: this.logger.info.bind(this.logger) });
 	}
 	emitTerminal(event, context, fields) {
 		if (this.terminalRecoveries.has(context.recovery)) return;
@@ -8237,7 +8268,7 @@ const checkUsage = defineCommand({
 });
 //#endregion
 //#region src/util/version.ts
-const VERSION = "0.9.2";
+const VERSION = "0.9.3";
 //#endregion
 //#region src/debug.ts
 function getRuntimeInfo() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ghc-proxy",
   "type": "module",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "GitHub Copilot to OpenAI/Anthropic API proxy - Use Copilot with Claude Code, Cursor, and more",
   "author": "wxxb789 <wxxb789@outlook.com>",
   "homepage": "https://github.com/wxxb789/ghc-proxy",