Files
2026-07-13 13:39:12 +08:00

822 lines
32 KiB
TypeScript

import {
BaseExecutor,
mergeUpstreamExtraHeaders,
type ExecuteInput,
type ExecutorLog,
type ProviderCredentials,
} from "./base.ts";
import { PROVIDERS } from "../config/constants.ts";
import { v4 as uuidv4 } from "uuid";
import { refreshKiroToken } from "../services/tokenRefresh.ts";
import {
splitInlineThinking,
flushPendingThinking,
type KiroThinkingState,
} from "./kiroThinking.ts";
import { ByteQueue, TEXT_ENCODER, parseEventFrame } from "./kiro/eventstream.ts";
type JsonRecord = Record<string, unknown>;
type UsageSummary = {
prompt_tokens: number;
completion_tokens: number;
total_tokens: number;
cache_read_input_tokens?: number;
cache_creation_input_tokens?: number;
};
type KiroStreamState = {
endDetected: boolean;
finishEmitted: boolean;
startEmitted: boolean;
stopSeen: boolean;
hasToolCalls: boolean;
toolCallIndex: number;
seenToolIds: Map<string, number>;
toolArgsEmitted: Map<string, string>;
toolArgsBuffered: Map<string, { toolIndex: number; canonical: string }>;
totalContentLength?: number;
contextUsagePercentage?: number;
hasContextUsage?: boolean;
hasMeteringEvent?: boolean;
usage?: UsageSummary;
hasReasoningContent?: boolean;
reasoningChunkCount?: number;
// Inline-thinking splitter state (populated only when thinkingExpected=true).
thinking?: KiroThinkingState;
};
/**
* Flush buffered tool arguments at finish boundaries.
*
* Kiro/CodeWhisperer streams toolUseEvent.input as PARTIAL OBJECTS that grow over time
* (e.g. {command:"cat /home"} then {command:"cat /home/wxsys"}). Re-stringifying each one
* and emitting it as an OpenAI argument delta produces overlapping prefixes that
* concatenate into unparseable garbage downstream ("Unterminated string").
*
* Fix: defer object-form payloads into state.toolArgsBuffered keyed by toolCallId, keep
* only the latest canonical, and emit ONCE here as the complete arguments string (the
* final object is the source of truth — intermediate states are noise). String-form
* payloads are already concatenable deltas and are emitted incrementally.
*/
export function flushBufferedToolArgs(
state: Pick<KiroStreamState, "toolArgsBuffered" | "toolArgsEmitted">,
controller: { enqueue: (chunk: Uint8Array) => void },
ctx: { responseId: string; created: number; model: string }
): void {
if (!state.toolArgsBuffered || state.toolArgsBuffered.size === 0) return;
const { responseId, created, model } = ctx;
for (const [toolCallId, info] of state.toolArgsBuffered) {
const alreadyEmitted = state.toolArgsEmitted.get(toolCallId) || "";
if (info.canonical && info.canonical !== alreadyEmitted) {
const argsChunk: JsonRecord = {
id: responseId,
object: "chat.completion.chunk",
created,
model,
choices: [
{
index: 0,
delta: {
tool_calls: [
{
index: info.toolIndex,
function: { arguments: info.canonical },
},
],
},
finish_reason: null,
},
],
};
controller.enqueue(TEXT_ENCODER.encode(`data: ${JSON.stringify(argsChunk)}\n\n`));
state.toolArgsEmitted.set(toolCallId, info.canonical);
}
}
state.toolArgsBuffered.clear();
}
function buildKiroFinishChunk(
state: KiroStreamState,
responseId: string,
created: number,
model: string,
includeUsage: boolean
): JsonRecord {
const finishChunk: JsonRecord = {
id: responseId,
object: "chat.completion.chunk",
created,
model,
choices: [
{
index: 0,
delta: {},
finish_reason: state.hasToolCalls ? "tool_calls" : "stop",
},
],
};
if (includeUsage && state.usage) {
finishChunk.usage = state.usage;
}
return finishChunk;
}
function ensureKiroUsage(state: KiroStreamState) {
if (state.usage) return;
const estimatedOutputTokens =
state.totalContentLength && state.totalContentLength > 0
? Math.max(1, Math.floor(state.totalContentLength / 4))
: 0;
const estimatedInputTokens =
state.contextUsagePercentage && state.contextUsagePercentage > 0
? Math.floor((state.contextUsagePercentage * 200000) / 100)
: 0;
if (estimatedInputTokens <= 0 && estimatedOutputTokens <= 0) return;
state.usage = {
prompt_tokens: estimatedInputTokens,
completion_tokens: estimatedOutputTokens,
total_tokens: estimatedInputTokens + estimatedOutputTokens,
};
}
/**
* Resolve the AWS region for a Kiro/CodeWhisperer connection. Enterprise AWS IAM Identity
* Center accounts are region-bound: the access token, the Q Developer profile ARN and the
* runtime endpoint must all match the region the IdC instance lives in (e.g. eu-central-1).
* A request signed for one region is rejected by another ("bearer token is invalid"), and a
* regional profileArn sent to us-east-1 fails with "Improperly formed request". Falls back to
* the region embedded in the profileArn, then us-east-1 (the AWS Builder ID default).
*/
export function resolveKiroRegion(
credentials: { providerSpecificData?: unknown } | null | undefined
): string {
const psd = (credentials?.providerSpecificData || {}) as Record<string, unknown>;
const region = typeof psd.region === "string" ? psd.region.trim().toLowerCase() : "";
if (region) return region;
const arn = typeof psd.profileArn === "string" ? psd.profileArn.toLowerCase() : "";
const match = arn.match(/^arn:aws:codewhisperer:([a-z0-9-]+):/);
return match ? match[1] : "us-east-1";
}
/**
* CodeWhisperer/Amazon Q runtime host for a region. us-east-1 keeps the legacy
* codewhisperer.us-east-1 host (AWS Builder ID); other regions use the regional Amazon Q
* endpoint q.{region}.amazonaws.com — codewhisperer.{region}.amazonaws.com does not resolve
* for non-us-east-1 regions.
*/
export function kiroRuntimeHost(region: string): string {
return region === "us-east-1"
? "https://codewhisperer.us-east-1.amazonaws.com"
: `https://q.${region}.amazonaws.com`;
}
/**
* KiroExecutor - Executor for Kiro AI (AWS CodeWhisperer)
* Uses AWS CodeWhisperer streaming API with AWS EventStream binary format
*/
export class KiroExecutor extends BaseExecutor {
constructor(providerId = "kiro") {
super(providerId, PROVIDERS[providerId] || PROVIDERS.kiro);
}
buildHeaders(credentials: ProviderCredentials, stream = true) {
void stream;
const headers = {
...this.config.headers,
"Amz-Sdk-Request": "attempt=1; max=3",
"Amz-Sdk-Invocation-Id": uuidv4(),
"x-amzn-bedrock-cache-control": "enable",
"anthropic-beta": "prompt-caching-2024-07-31",
};
if (credentials.accessToken) {
headers["Authorization"] = `Bearer ${credentials.accessToken}`;
}
return headers;
}
transformRequest(model: string, body: unknown, stream: boolean, credentials: unknown): unknown {
void stream;
void credentials;
const b = body as Record<string, unknown>;
// Kiro API is strict and rejects any unknown top-level fields (like 'tools', 'stream', 'model', etc.)
// We only preserve the fields specifically built by the openai-to-kiro translator.
const kiroPayload: Record<string, unknown> = {};
if (b.conversationState !== undefined) kiroPayload.conversationState = b.conversationState;
if (b.profileArn !== undefined) kiroPayload.profileArn = b.profileArn;
if (b.inferenceConfig !== undefined) kiroPayload.inferenceConfig = b.inferenceConfig;
// Thinking control: `additionalModelRequestFields` ({output_config.effort,
// thinking:{type:"adaptive"}, max_tokens}) is a recognized top-level field on
// GenerateAssistantResponse — it steers adaptive reasoning. Built by the
// openai-to-kiro translator only when the request asked for thinking.
if (b.additionalModelRequestFields !== undefined)
kiroPayload.additionalModelRequestFields = b.additionalModelRequestFields;
// Fallback: if somehow conversationState isn't there, return the rest without model
// (for backward compatibility if something else bypasses the translator)
if (!kiroPayload.conversationState) {
const { model: _model, ...rest } = b;
return rest;
}
return kiroPayload;
}
/**
* Custom execute for Kiro - handles AWS EventStream binary response
*/
async execute({
model,
body,
stream,
credentials,
signal,
log,
upstreamExtraHeaders,
}: ExecuteInput) {
// Route to the region-specific CodeWhisperer/Amazon Q endpoint. Enterprise IAM Identity
// Center accounts (e.g. eu-central-1) are rejected by the default us-east-1 host; only the
// regional endpoint accepts the region-bound token + profileArn.
const region = resolveKiroRegion(credentials);
const url = `${kiroRuntimeHost(region)}/generateAssistantResponse`;
const headers = this.buildHeaders(credentials, stream);
mergeUpstreamExtraHeaders(headers, upstreamExtraHeaders);
const transformedBody = await this.transformRequest(model, body, stream, credentials);
const response = await fetch(url, {
method: "POST",
headers,
body: JSON.stringify(transformedBody),
signal,
});
if (!response.ok) {
return { response, url, headers, transformedBody };
}
// For Kiro, we need to transform the binary EventStream to SSE.
// Create a TransformStream to convert binary to SSE text.
//
// When the user enabled thinking, Claude on Kiro streams its reasoning
// **inline** as `<thinking>…</thinking>` blocks inside
// `assistantResponseEvent.content` rather than as separate
// `reasoningContentEvent` frames. We pass a hint so the transform stream
// can split that inline reasoning into the OpenAI `delta.reasoning_content`
// channel.
const tb = transformedBody as Record<string, unknown>;
const userContent =
((
(
(tb?.conversationState as Record<string, unknown>)?.currentMessage as Record<
string,
unknown
>
)?.userInputMessage as Record<string, unknown>
)?.content as string) || "";
const thinkingExpected = userContent.includes("<thinking_mode>enabled</thinking_mode>");
const transformedResponse = this.transformEventStreamToSSE(response, model, {
thinkingExpected,
});
return { response: transformedResponse, url, headers, transformedBody };
}
/**
* Transform AWS EventStream binary response to SSE text stream.
* Using TransformStream instead of ReadableStream.pull() to avoid Workers timeout.
*
* @param response Upstream raw fetch response (binary EventStream).
* @param model Logical model id (kept in OpenAI chunks for clients).
* @param opts
* @param opts.thinkingExpected When true, scan inbound
* `assistantResponseEvent.content` for inline `<thinking>…</thinking>`
* blocks and split them into the OpenAI `delta.reasoning_content` channel.
* Required for Claude on Kiro when `<thinking_mode>enabled</thinking_mode>`
* is in the system prompt, because Kiro streams reasoning inline rather
* than as separate `reasoningContentEvent` frames.
*/
transformEventStreamToSSE(
response: Response,
model: string,
opts: { thinkingExpected?: boolean } = {}
) {
const thinkingExpected = !!opts.thinkingExpected;
const buffer = new ByteQueue();
let chunkIndex = 0;
const responseId = `chatcmpl-${Date.now()}`;
const created = Math.floor(Date.now() / 1000);
const state: KiroStreamState = {
endDetected: false,
finishEmitted: false,
startEmitted: false,
stopSeen: false,
hasToolCalls: false,
toolCallIndex: 0,
seenToolIds: new Map(),
toolArgsEmitted: new Map(),
toolArgsBuffered: new Map(),
hasReasoningContent: false,
reasoningChunkCount: 0,
thinking: thinkingExpected ? { thinkingMode: false, pendingTag: "" } : undefined,
};
const transformStream = new TransformStream(
{
async transform(chunk, controller) {
buffer.push(chunk);
// Parse events from buffer
let iterations = 0;
const maxIterations = 1000;
while (buffer.length >= 16 && iterations < maxIterations) {
iterations++;
const totalLength = buffer.peekUint32BE(0);
if (!totalLength || totalLength < 16 || totalLength > buffer.length) break;
const eventData = buffer.read(totalLength);
if (!eventData) break;
const event = parseEventFrame(eventData);
if (!event) continue;
// Emit a role-only start chunk on the FIRST successfully-parsed AWS
// EventStream frame. CodeWhisperer sends framing/metadata events before
// the first content token, and on large/agentic contexts the gap before
// that first `assistantResponseEvent` can be many seconds. The backend
// stream-readiness gate (ensureStreamReadiness) holds the ENTIRE response
// from the client until it observes a useful SSE frame, so without an
// early frame the client sees a frozen connection for that whole window
// (up to STREAM_READINESS_TIMEOUT_MS — 180s as configured by VibeProxy),
// then a burst — the "minutes instead of seconds, not streaming" symptom.
// A role-only `chat.completion.chunk` is a non-ping structured payload, so
// it satisfies hasStreamReadinessSignal and hands the stream off
// immediately. Mirrors the early lifecycle frame other executors already
// emit (Claude message_start / OpenAI response.created). The downstream
// idle timeout still guards genuine post-start stalls.
if (!state.startEmitted) {
state.startEmitted = true;
const startChunk: JsonRecord = {
id: responseId,
object: "chat.completion.chunk",
created,
model,
choices: [
{
index: 0,
delta: { role: "assistant" },
finish_reason: null,
},
],
};
chunkIndex++;
controller.enqueue(TEXT_ENCODER.encode(`data: ${JSON.stringify(startChunk)}\n\n`));
}
const eventType = event.headers[":event-type"] || "";
// Track total content length for token estimation
if (!state.totalContentLength) state.totalContentLength = 0;
if (!state.contextUsagePercentage) state.contextUsagePercentage = 0;
// Native reasoning frames. Verified against the live CodeWhisperer
// stream (2026-07): with adaptive thinking enabled (via
// additionalModelRequestFields), Kiro streams reasoning as a dedicated
// `reasoningContentEvent` frame carrying `{ text, signature }` — NOT
// inline `<thinking>` tags and NOT `assistantResponseEvent`. Some
// models/variants instead use a `reasoningText` object or a flat
// `{ text }` (cf. javargasm/pi-kiro `src/event-parser.ts`). OmniRoute
// had no handler for this event, so the reasoning was silently dropped;
// route it to the OpenAI `reasoning_content` channel.
{
const rp = event.payload as Record<string, unknown> | undefined;
const rt = rp?.reasoningText;
if (eventType === "reasoningContentEvent" || rt !== undefined) {
let nativeReasoning = "";
if (rt && typeof rt === "object") {
const rto = rt as { text?: unknown; Text?: unknown };
nativeReasoning =
typeof rto.text === "string"
? rto.text
: typeof rto.Text === "string"
? rto.Text
: "";
} else if (typeof rt === "string") {
nativeReasoning = rt;
} else if (typeof rp?.text === "string") {
nativeReasoning = rp.text as string;
}
if (nativeReasoning) {
state.hasReasoningContent = true;
const reasoningDelta: JsonRecord =
(state.reasoningChunkCount ?? 0) === 0 && chunkIndex === 0
? { role: "assistant", reasoning_content: nativeReasoning }
: { reasoning_content: nativeReasoning };
const chunk: JsonRecord = {
id: responseId,
object: "chat.completion.chunk",
created,
model,
choices: [{ index: 0, delta: reasoningDelta, finish_reason: null }],
};
chunkIndex++;
state.reasoningChunkCount = (state.reasoningChunkCount ?? 0) + 1;
controller.enqueue(TEXT_ENCODER.encode(`data: ${JSON.stringify(chunk)}\n\n`));
}
// Consume the reasoning frame (incl. signature-only) so it never
// falls through to the content handlers below.
continue;
}
}
// Handle assistantResponseEvent
if (eventType === "assistantResponseEvent") {
const content =
typeof event.payload?.content === "string" ? event.payload.content : "";
if (!content) {
continue;
}
state.totalContentLength += content.length;
if (thinkingExpected && state.thinking) {
// Claude on Kiro emits reasoning inline as `<thinking>…</thinking>`
// when `<thinking_mode>enabled</thinking_mode>` is in the system prompt.
// Split it into the OpenAI `reasoning_content` channel so downstream
// consumers see the same shape they would get from a native reasoning model.
const thinkingState = state.thinking;
splitInlineThinking(
thinkingState,
content,
(text) => {
if (!text) return;
const chunk: JsonRecord = {
id: responseId,
object: "chat.completion.chunk",
created,
model,
choices: [
{
index: 0,
delta:
chunkIndex === 0
? { role: "assistant", content: text }
: { content: text },
finish_reason: null,
},
],
};
chunkIndex++;
controller.enqueue(TEXT_ENCODER.encode(`data: ${JSON.stringify(chunk)}\n\n`));
},
(reasoning) => {
if (!reasoning) return;
state.hasReasoningContent = true;
const reasoningDelta: JsonRecord =
(state.reasoningChunkCount ?? 0) === 0 && chunkIndex === 0
? { role: "assistant", reasoning_content: reasoning }
: { reasoning_content: reasoning };
const chunk: JsonRecord = {
id: responseId,
object: "chat.completion.chunk",
created,
model,
choices: [
{
index: 0,
delta: reasoningDelta,
finish_reason: null,
},
],
};
chunkIndex++;
state.reasoningChunkCount = (state.reasoningChunkCount ?? 0) + 1;
controller.enqueue(TEXT_ENCODER.encode(`data: ${JSON.stringify(chunk)}\n\n`));
}
);
} else {
const chunk: JsonRecord = {
id: responseId,
object: "chat.completion.chunk",
created,
model,
choices: [
{
index: 0,
delta: chunkIndex === 0 ? { role: "assistant", content } : { content },
finish_reason: null,
},
],
};
chunkIndex++;
controller.enqueue(TEXT_ENCODER.encode(`data: ${JSON.stringify(chunk)}\n\n`));
}
}
// Handle codeEvent
if (eventType === "codeEvent" && event.payload?.content) {
const chunk: JsonRecord = {
id: responseId,
object: "chat.completion.chunk",
created,
model,
choices: [
{
index: 0,
delta: { content: event.payload.content },
finish_reason: null,
},
],
};
chunkIndex++;
controller.enqueue(TEXT_ENCODER.encode(`data: ${JSON.stringify(chunk)}\n\n`));
}
// Handle toolUseEvent
if (eventType === "toolUseEvent" && event.payload) {
state.hasToolCalls = true;
const toolUse = event.payload;
const toolUses = Array.isArray(toolUse) ? toolUse : [toolUse];
for (const singleToolUse of toolUses) {
const toolCallId = singleToolUse.toolUseId || `call_${Date.now()}`;
const toolName = singleToolUse.name || "";
const toolInput = singleToolUse.input;
let toolIndex;
const isNewTool = !state.seenToolIds.has(toolCallId);
if (isNewTool) {
toolIndex = state.toolCallIndex++;
state.seenToolIds.set(toolCallId, toolIndex);
const startChunk = {
id: responseId,
object: "chat.completion.chunk",
created,
model,
choices: [
{
index: 0,
delta: {
...(chunkIndex === 0 ? { role: "assistant" } : {}),
tool_calls: [
{
index: toolIndex,
id: toolCallId,
type: "function",
function: {
name: toolName,
arguments: "",
},
},
],
},
finish_reason: null,
},
],
};
chunkIndex++;
controller.enqueue(
TEXT_ENCODER.encode(`data: ${JSON.stringify(startChunk)}\n\n`)
);
} else {
toolIndex = state.seenToolIds.get(toolCallId);
}
if (toolInput !== undefined) {
if (typeof toolInput === "string") {
// String-form payloads are already concatenable incremental deltas —
// emit immediately and track what we've sent.
state.toolArgsEmitted.set(
toolCallId,
(state.toolArgsEmitted.get(toolCallId) || "") + toolInput
);
const argsChunk = {
id: responseId,
object: "chat.completion.chunk",
created,
model,
choices: [
{
index: 0,
delta: {
tool_calls: [
{
index: toolIndex,
function: {
arguments: toolInput,
},
},
],
},
finish_reason: null,
},
],
};
chunkIndex++;
controller.enqueue(
TEXT_ENCODER.encode(`data: ${JSON.stringify(argsChunk)}\n\n`)
);
} else if (typeof toolInput === "object" && toolInput !== null) {
// Object-form payloads are PARTIAL OBJECTS that grow over time. Buffer
// the latest canonical and flush once at a finish boundary, otherwise the
// overlapping JSON prefixes concatenate into unparseable garbage.
state.toolArgsBuffered.set(toolCallId, {
toolIndex,
canonical: JSON.stringify(toolInput),
});
}
}
}
}
// Handle messageStopEvent
if (eventType === "messageStopEvent") {
flushBufferedToolArgs(state, controller, { responseId, created, model });
state.stopSeen = true;
}
// Handle contextUsageEvent to extract contextUsagePercentage
if (eventType === "contextUsageEvent") {
const contextUsage =
typeof event.payload?.contextUsagePercentage === "number"
? event.payload.contextUsagePercentage
: 0;
if (contextUsage <= 0) {
continue;
}
state.contextUsagePercentage = contextUsage;
// Mark that we received context usage event
state.hasContextUsage = true;
}
// Handle meteringEvent - mark that we received it
if (eventType === "meteringEvent") {
state.hasMeteringEvent = true;
}
// Handle metricsEvent for token usage
if (eventType === "metricsEvent") {
// Extract usage data from metricsEvent payload
const metrics = event.payload?.metricsEvent || event.payload;
if (metrics && typeof metrics === "object") {
const inputTokens =
typeof (metrics as JsonRecord).inputTokens === "number"
? ((metrics as JsonRecord).inputTokens as number)
: 0;
const outputTokens =
typeof (metrics as JsonRecord).outputTokens === "number"
? ((metrics as JsonRecord).outputTokens as number)
: 0;
const cacheReadTokens =
typeof (metrics as JsonRecord).cacheReadTokens === "number"
? ((metrics as JsonRecord).cacheReadTokens as number)
: 0;
const cacheCreationTokens =
typeof (metrics as JsonRecord).cacheCreationTokens === "number"
? ((metrics as JsonRecord).cacheCreationTokens as number)
: 0;
if (inputTokens > 0 || outputTokens > 0) {
state.usage = {
prompt_tokens: inputTokens,
completion_tokens: outputTokens,
total_tokens: inputTokens + outputTokens,
...(cacheReadTokens > 0 && { cache_read_input_tokens: cacheReadTokens }),
...(cacheCreationTokens > 0 && {
cache_creation_input_tokens: cacheCreationTokens,
}),
};
}
}
}
}
if (iterations >= maxIterations) {
console.warn("[Kiro] Max iterations reached in event parsing");
}
},
flush(controller) {
// Flush any buffered tool arguments (partial-object payloads) before finishing —
// idempotent against toolArgsEmitted if messageStopEvent already flushed them.
flushBufferedToolArgs(state, controller, { responseId, created, model });
// Drain any pending inline-thinking tag fragment so we don't drop
// trailing characters when the stream ends mid-tag (e.g. `<thi`).
if (thinkingExpected && state.thinking) {
const thinkingState = state.thinking;
flushPendingThinking(
thinkingState,
(text) => {
if (!text) return;
const chunk: JsonRecord = {
id: responseId,
object: "chat.completion.chunk",
created,
model,
choices: [{ index: 0, delta: { content: text }, finish_reason: null }],
};
chunkIndex++;
controller.enqueue(TEXT_ENCODER.encode(`data: ${JSON.stringify(chunk)}\n\n`));
},
(reasoning) => {
if (!reasoning) return;
const chunk: JsonRecord = {
id: responseId,
object: "chat.completion.chunk",
created,
model,
choices: [
{ index: 0, delta: { reasoning_content: reasoning }, finish_reason: null },
],
};
chunkIndex++;
controller.enqueue(TEXT_ENCODER.encode(`data: ${JSON.stringify(chunk)}\n\n`));
}
);
}
// Emit finish chunk if not already sent
if (!state.finishEmitted) {
state.finishEmitted = true;
ensureKiroUsage(state);
const finishChunk = buildKiroFinishChunk(state, responseId, created, model, true);
controller.enqueue(TEXT_ENCODER.encode(`data: ${JSON.stringify(finishChunk)}\n\n`));
}
// Send final done message
controller.enqueue(TEXT_ENCODER.encode("data: [DONE]\n\n"));
},
},
{ highWaterMark: 16384 },
{ highWaterMark: 16384 }
);
// Pipe response body through transform stream
const transformedStream = response.body.pipeThrough(transformStream);
return new Response(transformedStream, {
status: response.status,
statusText: response.statusText,
headers: {
"Content-Type": "text/event-stream",
"Cache-Control": "no-cache",
Connection: "keep-alive",
},
});
}
async refreshCredentials(credentials: ProviderCredentials, log?: ExecutorLog | null) {
if (!credentials.refreshToken) return null;
try {
// Use centralized refreshKiroToken function (handles both AWS SSO OIDC and Social Auth)
const result = await refreshKiroToken(
credentials.refreshToken,
credentials.providerSpecificData,
log
);
if (!result || result.error) return result;
// If client was re-registered (expired/invalid clientId/clientSecret after DB import,
// TTL expiry, or browser conflict), update providerSpecificData with new credentials (#2524).
if (result._newClientId) {
const updatedPsd = {
...(credentials.providerSpecificData || {}),
clientId: result._newClientId,
clientSecret: result._newClientSecret,
clientSecretExpiresAt: result._newClientSecretExpiresAt,
};
return {
accessToken: result.accessToken,
refreshToken: result.refreshToken,
expiresIn: result.expiresIn,
providerSpecificData: updatedPsd,
};
}
return result;
} catch (error) {
const err = error instanceof Error ? error : new Error(String(error));
log?.error?.("TOKEN", `Kiro refresh error: ${err.message}`);
return null;
}
}
}
export default KiroExecutor;