mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-17 12:22:34 +03:00
* chore(ci): add .mergify.yml to main — Mergify only reads config from the default branch (#7168)
* fix(ci): add the auto-enqueue pull_request_rule to the Mergify config (queue_conditions alone are eligibility-only) (#7179)
* fix(ci): migrate Mergify auto-enqueue to merge_protections_settings.auto_merge_conditions (rules-based path is EOL 2026-07-16) (#7216)
* fix(ci): drop Mergify batch settings (batching is a paid-tier feature; free plan queue is serial) (#7220)
* fix(ci): merge queue tolerates the advisory dast-smoke failure (its GH-hosted build hang dequeued every attempt) (#7225)
* test(ci): make the #6634 selfref guard hermetic — main's copy hard-fails every PR (#7341)
main's copy of this test still does git I/O inside a unit test:
const baseSrc = git(['show', 'origin/main:' + FILE]);
Runners check out a shallow single ref, so origin/main does not resolve and the
test dies with 'fatal: invalid object name origin/main'. Every PR into main
fails Unit Tests (7/8) on it — today that is #7313, #7315, #7316, #7334, #7336
and #7337, six PRs red on a defect none of them introduced. #7313 has no other
red at all.
release/v3.8.49 already carries a fix (2e42b8efc, #7174: try/catch, fetch
origin/main on demand, t.skip() when unreachable), but it only reaches main at
release time — so main stays broken for the whole cycle. Cherry-picking it would
also import a new problem: PR Test Policy classifies t.skip() as a silenced
assertion, which we watched it correctly catch on #7300 today.
This is the hermetic version instead (ported from #7327, which does the same for
the release branch): read the file straight off disk, compare against an empty
base so baseTaut/baseExtTaut are 0 — the strictest possible comparison point —
and call evaluateMasking() directly. No git ref, no fetch, no skip, nothing the
runner's checkout depth can break.
The #6634 regression stays covered: the guard's logic lives in
SELF_TEST_FIXTURE_RE (check-test-masking.mjs:337), not in the test. Proven both
ways on main before committing — neutralise SELF_TEST_FIXTURE_RE to /$^/ and
the test FAILS; restore it and it passes 2/2, with check-test-masking.mjs left
byte-identical.
Co-authored-by: growab <nekron@icloud.com>
* chore(quality): tighten main's coverage baseline to the CI's real numbers (#7347)
main's ratchet had been failing --require-tighten on every PR: 11 metrics
improved but the baseline was never tightened. Same class as the #6634
selfref guard — an infra fix that lands only on the release branch leaves
main red for the whole cycle, and every PR into main pays for it.
Values are the merged-coverage numbers from a run on main itself (a local
run measures ~68% vs CI's ~80%; the baseline's own note warns about that
gap). Only the 11 coverage values change — gitleaks and semgrepFindings
keep main's own state.
No changelog fragment: #7326 carries it on release/v3.8.49, and a second
one here would double the entry at release time.
* fix(antigravity): remove hardcoded 120s SSE collect timeout
The SSE collection in collectStreamToResponse had a hardcoded 120 s
timeout. Reasoning-heavy models like gemini-3.1-pro-high on large
prompts (>30 KB) regularly exceed 120 s of generation time, causing
the executor to return a synthetic 504 before the model finishes.
Replace the hardcoded value with FETCH_TIMEOUT_MS (default 600 s,
overridable via FETCH_TIMEOUT_MS env var), which is the standard
upstream-request budget across all OmniRoute providers.
Signed-off-by: Minxi Hou <houminxi@gmail.com>
* fix(antigravity): streaming passthrough for non-streaming clients
When a client sends stream: false to the Antigravity executor
(Gemini models), OmniRoute buffered the entire SSE stream before
responding. Long-thinking models exceeded the 120s timeout.
Remove hardcoded SSE_COLLECT_TIMEOUT_MS. Extract shared
createCreditsExtractionTransform with 16KB buffer cap and abort
handling for client disconnect. Add parseSSEToGeminiResponse for
the non-streaming drain path. Fix hasGeminiTerminalFinishReason
to check top-level candidates (no response wrapper). Add signal
null guards for credits retry path. Return 499 on early abort
instead of piping cancelled body.
Also remove duplicate SKILLS_SANDBOX_RUNTIME from .env.example
and clarify .artifacts/ vs _artifacts/ in .gitignore.
Signed-off-by: Minxi Hou <houminxi@gmail.com>
* refactor(antigravity): extract streaming passthrough to module (file-size cap)
#7408 added the non-streaming SSE pass-through (createCreditsExtractionTransform
plus its two call sites: the credits-retry path and the main non-streaming
path) inline in antigravity.ts, growing it to 1806 lines. Combined with two
other authorized PRs touching the same file (#6979 +11, #7290 +30), the
projected total exceeds the frozen file-size gate (1813).
Extract the new streaming-passthrough logic verbatim into
open-sse/executors/antigravity/streamingPassthrough.ts
(createCreditsExtractionTransform + a new buildSsePassthroughResult that
deduplicates the two near-identical call sites), following the existing
sseCollect.ts submodule pattern -- pure, no host state, no fetch/auth.
antigravity.ts keeps a thin wrapper for createCreditsExtractionTransform
(same public signature the existing unit tests import) that injects
updateAntigravityRemainingCredits so the two modules don't import each
other.
No behavior change: same abort handling, same 499-on-early-disconnect,
same 16KB credits sliding-window cap. antigravity.ts: 1806 -> 1693 lines
(under the 1755 pre-PR baseline, with margin). New module: 176 lines
(cap 800).
Co-authored-by: diegosouzapw <8016841+diegosouzapw@users.noreply.github.com>
* refactor(antigravity): split incremental parser + move new tests to own file (file-size caps)
Two remaining frozen file-size violations from #7408, resolved by
extraction/move with zero behavior or assert changes:
- open-sse/handlers/sseParser.ts (979 > frozen 830): the PR appended
parseSSEToGeminiResponse (+153, the Gemini buffered-SSE ->
chat.completion parser). Moved verbatim to
open-sse/handlers/sseParser/geminiResponse.ts, following the handlers
submodule pattern (chatCore/, responseSanitizer/). sseParser.ts is now
byte-identical to its pre-PR content (825 lines; PR delta 0). Importers
(chatCore/nonStreamingSse.ts, tests) point at the new module.
- tests/unit/executor-antigravity.test.ts (1058 > testFrozen 942): the
PR's new streaming-passthrough tests moved verbatim (same tests, same
asserts) to tests/unit/antigravity-streaming-passthrough.test.ts:
the 3 createCreditsExtractionTransform tests plus the non-streaming
passthrough drain test ("auto-retries short 429 ... collects SSE for
non-stream clients"), which the PR rewired onto the new raw-SSE path.
The frozen file drops to 888 lines (below its pre-PR 941).
New files: geminiResponse.ts 156 lines, passthrough test 202 lines (caps
800). Also fixes the stale sseParser.ts path in collectStreamToResponse's
deprecation note.
Co-authored-by: diegosouzapw <8016841+diegosouzapw@users.noreply.github.com>
* refactor(antigravity): decompose execute + gemini parser below complexity gate
executeOnce() (complexity 127, 436 lines) and parseSSEToGeminiResponse()
(complexity 39, 117 lines) were both over the check-complexity.mjs gate
(complexity>15, max-lines-per-function>80). Decomposed each into small
named helpers, no behavior change:
- geminiResponse.ts: split into pure per-concern functions (markdown
shortcut, candidate-parts walk, finishReason, usageMetadata, final
response assembly).
- antigravity.ts: extracted the per-url-index attempt pipeline
(runAntigravityAttempt, handleAntigravityRateLimit,
tryResolveRetryFromErrorBody, shouldAutoRetryTransient) and moved the
request/result-building helpers (send, credits-retry, embed-retry,
non-streaming/streaming result builders) into a new
antigravity/executeAttempt.ts submodule, mirroring the existing
streamingPassthrough.ts/sseCollect.ts pattern. Also fixes the
antigravity.ts file-size cap (was pushed to 2084 lines > 1813 frozen
ceiling by the decomposition itself; now 1428).
check-complexity.mjs: 2054 violations (baseline 2058) — net improvement.
execute/executeOnce/parseSSEToGeminiResponse no longer appear with
ruleId complexity or max-lines-per-function.
Co-authored-by: diegosouzapw <8016841+diegosouzapw@users.noreply.github.com>
* Merge branch 'release/v3.8.49' into fix/antigravity-streaming-passthrough
Resolves conflict in open-sse/executors/antigravity.ts between this
branch's streaming-passthrough decomposition and #7290's fallback-chain
decomposition (already merged into release/v3.8.49) — both sides added
imports from the same new antigravity/ submodule files, kept both.
Co-authored-by: diegosouzapw <8016841+diegosouzapw@users.noreply.github.com>
* fix(antigravity): keep buffered JSON contract for non-streaming callers
#3786's Pro-family fallback-chain retry loop (execute()) calls executeOnce()
per candidate and inspects result.response directly, expecting a
synthesized chat.completion JSON body on success. The streaming-passthrough
migration made ALL non-streaming (stream: false) responses a raw SSE
pass-through instead, so a successful retry candidate's response.json()
threw ("data: {...}" is not valid JSON) — breaking the fallback chain
(tests/unit/agy-pro-fallback-chain-3786.test.ts, 3 of 13 red).
Route non-streaming (stream: false) responses back through
collectStreamToResponse (buffered collect-to-JSON), which already uses
FETCH_TIMEOUT_MS with no hardcoded 120s ceiling, so long-thinking models
are not penalized. Passthrough is reserved for actual streaming clients
(stream: true), which was the PR's real target scenario.
Extracted the branch into buildAntigravityAttemptResult() to keep
runAntigravityAttempt under the 80-line ratchet cap.
Co-authored-by: diegosouzapw <8016841+diegosouzapw@users.noreply.github.com>
---------
Signed-off-by: Minxi Hou <houminxi@gmail.com>
Co-authored-by: Diego Rodrigues de Sa e Souza <8016841+diegosouzapw@users.noreply.github.com>
Co-authored-by: growab <nekron@icloud.com>
Co-authored-by: HouMinXi <1000+HouMinXi@users.noreply.github.com>
Co-authored-by: HouMinXi <19586012+HouMinXi@users.noreply.github.com>
177 lines
6.4 KiB
TypeScript
177 lines
6.4 KiB
TypeScript
// Pure streaming pass-through helpers for the Antigravity executor (#7408):
|
|
// tap an upstream Gemini SSE Response through a credits-extraction
|
|
// TransformStream instead of buffering the whole body in the executor, so
|
|
// long-thinking models aren't killed by an artificial collection timeout.
|
|
// Extracted from antigravity.ts (no host state, no fetch/auth) -- the
|
|
// credit-balance cache itself stays in antigravity.ts; callers inject the
|
|
// update function below so the two modules don't import each other.
|
|
|
|
/** Shape of one entry in a Gemini `remainingCredits` SSE payload array. */
|
|
export type AntigravityCreditEntry = {
|
|
creditType?: string;
|
|
creditAmount?: string;
|
|
};
|
|
|
|
function asCreditRecord(value: unknown): Record<string, unknown> | null {
|
|
return value && typeof value === "object" && !Array.isArray(value)
|
|
? (value as Record<string, unknown>)
|
|
: null;
|
|
}
|
|
|
|
/**
|
|
* Create a pass-through TransformStream that extracts `remainingCredits`
|
|
* from SSE data without consuming the stream. The downstream client
|
|
* receives the unmodified bytes.
|
|
*
|
|
* @param accountId Provider account ID for credit-balance persistence.
|
|
* @param onCreditsUpdate Invoked with the parsed GOOGLE_ONE_AI balance.
|
|
* Injected by the caller (antigravity.ts's
|
|
* updateAntigravityRemainingCredits) to avoid this module
|
|
* importing back the executor's credit-balance cache.
|
|
* @param bufferSize Optional sliding-window buffer cap in bytes.
|
|
* Pass 0 or omit for unlimited (non-streaming callers
|
|
* where the full body is already buffered upstream).
|
|
* The streaming path uses 16384 (16 KB) to prevent OOM
|
|
* on long-lived SSE connections. Credit-balance data
|
|
* appears near the end of the SSE stream (after
|
|
* content), so the sliding window captures it even at
|
|
* 16 KB -- only truly massive responses (>16 KB of
|
|
* consecutive non-newline content) would lose credits.
|
|
*/
|
|
export function createCreditsExtractionTransform(
|
|
accountId: string,
|
|
onCreditsUpdate: (accountId: string, balance: number) => void,
|
|
bufferSize = 0
|
|
): TransformStream<Uint8Array, Uint8Array> {
|
|
let buffer = "";
|
|
const decoder = new TextDecoder();
|
|
|
|
return new TransformStream(
|
|
{
|
|
transform(chunk, controller) {
|
|
controller.enqueue(chunk);
|
|
try {
|
|
buffer += decoder.decode(chunk, { stream: true });
|
|
// Sliding-window cap: truncate after the last complete newline
|
|
// in the discard region so SSE lines are never split mid-payload.
|
|
if (bufferSize > 0 && buffer.length > bufferSize) {
|
|
const lastNewline = buffer.lastIndexOf("\n", buffer.length - bufferSize);
|
|
if (lastNewline !== -1) {
|
|
buffer = buffer.slice(lastNewline + 1);
|
|
} else {
|
|
// No newline in the discard region -- incomplete line, discard entirely.
|
|
buffer = "";
|
|
}
|
|
}
|
|
} catch {
|
|
/* decoding best-effort */
|
|
}
|
|
},
|
|
flush() {
|
|
try {
|
|
buffer += decoder.decode();
|
|
} catch {
|
|
/* decoding best-effort */
|
|
}
|
|
try {
|
|
const lines = buffer.split("\n");
|
|
for (const line of lines) {
|
|
const trimmed = line.trim();
|
|
if (!trimmed.startsWith("data:")) continue;
|
|
const payload = trimmed.slice(5).trim();
|
|
if (!payload || payload === "[DONE]") continue;
|
|
try {
|
|
const parsed = JSON.parse(payload);
|
|
if (Array.isArray(parsed?.remainingCredits)) {
|
|
const googleCredit = parsed.remainingCredits.find((c: unknown) => {
|
|
const credit = asCreditRecord(c);
|
|
return credit?.creditType === "GOOGLE_ONE_AI";
|
|
}) as AntigravityCreditEntry | undefined;
|
|
if (googleCredit) {
|
|
const balance = parseInt(String(googleCredit.creditAmount ?? ""), 10);
|
|
if (!isNaN(balance)) onCreditsUpdate(accountId, balance);
|
|
}
|
|
}
|
|
} catch {
|
|
/* skip malformed lines */
|
|
}
|
|
}
|
|
} catch {
|
|
/* credits extraction is best-effort */
|
|
}
|
|
buffer = "";
|
|
},
|
|
},
|
|
{ highWaterMark: 16384 },
|
|
{ highWaterMark: 16384 }
|
|
);
|
|
}
|
|
|
|
/** Result shape returned to callers of AntigravityExecutor.execute(). */
|
|
export type SsePassthroughResult = {
|
|
response: Response;
|
|
url: string;
|
|
headers: Record<string, string>;
|
|
transformedBody: unknown;
|
|
};
|
|
|
|
/** Cancel `body` when `signal` aborts, releasing the upstream connection. */
|
|
function cancelBodyOnAbort(body: ReadableStream<Uint8Array>, signal: AbortSignal): void {
|
|
signal.addEventListener(
|
|
"abort",
|
|
() => {
|
|
body.cancel().catch(() => {});
|
|
},
|
|
{ once: true }
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Build the non-streaming pass-through result: tap `body` through
|
|
* createCreditsExtractionTransform and wrap it in a same-status Response so
|
|
* chatCore's non-streaming path (readNonStreamingResponseBody +
|
|
* parseNonStreamingSSEPayload) can drain and parse the Gemini SSE without
|
|
* this executor buffering the whole stream itself.
|
|
*
|
|
* If the client already disconnected (`signal.aborted`), cancels the
|
|
* upstream body immediately and returns a bare 499 instead of piping a
|
|
* cancelled body through.
|
|
*/
|
|
export function buildSsePassthroughResult(
|
|
body: ReadableStream<Uint8Array>,
|
|
upstream: { status: number; statusText: string; headers: Headers },
|
|
accountId: string,
|
|
onCreditsUpdate: (accountId: string, balance: number) => void,
|
|
url: string,
|
|
outHeaders: Record<string, string>,
|
|
transformedBody: unknown,
|
|
signal: AbortSignal | null | undefined
|
|
): SsePassthroughResult {
|
|
// Client already disconnected — skip pipe
|
|
if (signal?.aborted) {
|
|
body.cancel().catch(() => {});
|
|
return {
|
|
response: new Response(null, { status: 499 }),
|
|
url,
|
|
headers: outHeaders,
|
|
transformedBody: null,
|
|
};
|
|
}
|
|
// Cancel upstream body on client disconnect
|
|
if (signal) cancelBodyOnAbort(body, signal);
|
|
|
|
const tapped = body.pipeThrough(
|
|
createCreditsExtractionTransform(accountId, onCreditsUpdate, 16 * 1024)
|
|
);
|
|
return {
|
|
response: new Response(tapped, {
|
|
status: upstream.status,
|
|
statusText: upstream.statusText,
|
|
headers: upstream.headers,
|
|
}),
|
|
url,
|
|
headers: outHeaders,
|
|
transformedBody,
|
|
};
|
|
}
|