Compare commits

...

4 Commits

11 changed files with 842 additions and 448 deletions
+75 -7
View File
@@ -13,8 +13,8 @@
"@uiw/react-codemirror": "^4.25.3",
"axios": "^1.13.2",
"chart.js": "^4.5.1",
"gsap": "^3.14.2",
"i18next": "^25.7.1",
"motion": "^12.34.3",
"react": "^19.2.1",
"react-chartjs-2": "^5.3.1",
"react-dom": "^19.2.1",
@@ -3113,6 +3113,33 @@
"node": ">= 6"
}
},
"node_modules/framer-motion": {
"version": "12.34.3",
"resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.34.3.tgz",
"integrity": "sha512-v81ecyZKYO/DfpTwHivqkxSUBzvceOpoI+wLfgCgoUIKxlFKEXdg0oR9imxwXumT4SFy8vRk9xzJ5l3/Du/55Q==",
"license": "MIT",
"dependencies": {
"motion-dom": "^12.34.3",
"motion-utils": "^12.29.2",
"tslib": "^2.4.0"
},
"peerDependencies": {
"@emotion/is-prop-valid": "*",
"react": "^18.0.0 || ^19.0.0",
"react-dom": "^18.0.0 || ^19.0.0"
},
"peerDependenciesMeta": {
"@emotion/is-prop-valid": {
"optional": true
},
"react": {
"optional": true
},
"react-dom": {
"optional": true
}
}
},
"node_modules/fsevents": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
@@ -3210,12 +3237,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/gsap": {
"version": "3.14.2",
"resolved": "https://registry.npmjs.org/gsap/-/gsap-3.14.2.tgz",
"integrity": "sha512-P8/mMxVLU7o4+55+1TCnQrPmgjPKnwkzkXOK1asnR9Jg2lna4tEY5qBJjMmAaOBDDZWtlRjBXjLa0w53G/uBLA==",
"license": "Standard 'no charge' license: https://gsap.com/standard-license."
},
"node_modules/has-flag": {
"version": "4.0.0",
"dev": true,
@@ -3524,6 +3545,47 @@
"node": "*"
}
},
"node_modules/motion": {
"version": "12.34.3",
"resolved": "https://registry.npmjs.org/motion/-/motion-12.34.3.tgz",
"integrity": "sha512-xZIkBGO7v/Uvm+EyaqYd+9IpXu0sZqLywVlGdCFrrMiaO9JI4Kx51mO9KlHSWwll+gZUVY5OJsWgYI5FywJ/tw==",
"license": "MIT",
"dependencies": {
"framer-motion": "^12.34.3",
"tslib": "^2.4.0"
},
"peerDependencies": {
"@emotion/is-prop-valid": "*",
"react": "^18.0.0 || ^19.0.0",
"react-dom": "^18.0.0 || ^19.0.0"
},
"peerDependenciesMeta": {
"@emotion/is-prop-valid": {
"optional": true
},
"react": {
"optional": true
},
"react-dom": {
"optional": true
}
}
},
"node_modules/motion-dom": {
"version": "12.34.3",
"resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.34.3.tgz",
"integrity": "sha512-sYgFe+pR9aIM7o4fhs2aXtOI+oqlUd33N9Yoxcgo1Fv7M20sRkHtCmzE/VRNIcq7uNJ+qio+Xubt1FXH3pQ+eQ==",
"license": "MIT",
"dependencies": {
"motion-utils": "^12.29.2"
}
},
"node_modules/motion-utils": {
"version": "12.29.2",
"resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.29.2.tgz",
"integrity": "sha512-G3kc34H2cX2gI63RqU+cZq+zWRRPSsNIOjpdl9TN4AQwC4sgwYPl/Q/Obf/d53nOm569T0fYK+tcoSV50BWx8A==",
"license": "MIT"
},
"node_modules/ms": {
"version": "2.1.3",
"dev": true,
@@ -4025,6 +4087,12 @@
"node": ">=8.0"
}
},
"node_modules/tslib": {
"version": "2.8.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
"license": "0BSD"
},
"node_modules/type-check": {
"version": "0.4.0",
"dev": true,
+1 -1
View File
@@ -17,8 +17,8 @@
"@uiw/react-codemirror": "^4.25.3",
"axios": "^1.13.2",
"chart.js": "^4.5.1",
"gsap": "^3.14.2",
"i18next": "^25.7.1",
"motion": "^12.34.3",
"react": "^19.2.1",
"react-chartjs-2": "^5.3.1",
"react-dom": "^19.2.1",
+139 -121
View File
@@ -1,12 +1,7 @@
import {
ReactNode,
useCallback,
useLayoutEffect,
useRef,
useState,
} from 'react';
import { ReactNode, useCallback, useLayoutEffect, useRef, useState } from 'react';
import { useLocation, type Location } from 'react-router-dom';
import gsap from 'gsap';
import { animate } from 'motion/mini';
import type { AnimationPlaybackControlsWithThen } from 'motion-dom';
import { PageTransitionLayerContext, type LayerStatus } from './PageTransitionLayer';
import './PageTransition.scss';
@@ -25,6 +20,20 @@ const IOS_EXIT_TO_X_PERCENT_FORWARD = -30;
const IOS_EXIT_TO_X_PERCENT_BACKWARD = 100;
const IOS_ENTER_FROM_X_PERCENT_BACKWARD = -30;
const IOS_EXIT_DIM_OPACITY = 0.72;
const IOS_SHADOW_VALUE = '-14px 0 24px rgba(0, 0, 0, 0.16)';
const easePower2Out = (progress: number) => 1 - (1 - progress) ** 3;
const easeCircOut = (progress: number) => Math.sqrt(1 - (progress - 1) ** 2);
const buildVerticalTransform = (y: number) => `translate3d(0px, ${y}px, 0px)`;
const buildIosTransform = (xPercent: number, y: number) => `translate3d(${xPercent}%, ${y}px, 0px)`;
const clearLayerStyles = (element: HTMLElement | null) => {
if (!element) return;
element.style.removeProperty('transform');
element.style.removeProperty('opacity');
element.style.removeProperty('box-shadow');
};
type Layer = {
key: string;
@@ -150,16 +159,14 @@ export function PageTransition({
const targetIndex = prev.findIndex((layer) => layer.key === location.key);
if (targetIndex !== -1) {
const targetStack: Layer[] = prev
.slice(0, targetIndex + 1)
.map((layer, idx): Layer => {
const isTarget = idx === targetIndex;
return {
...layer,
location: isTarget ? location : layer.location,
status: isTarget ? 'current' : 'stacked',
};
});
const targetStack: Layer[] = prev.slice(0, targetIndex + 1).map((layer, idx): Layer => {
const isTarget = idx === targetIndex;
return {
...layer,
location: isTarget ? location : layer.location,
status: isTarget ? 'current' : 'stacked',
};
});
if (shouldSkipExitLayer) {
nextLayersRef.current = targetStack;
@@ -194,7 +201,7 @@ export function PageTransition({
layers,
]);
// Run GSAP animation when animating starts
// Run Motion animation when animating starts
useLayoutEffect(() => {
if (!isAnimating) return;
@@ -204,10 +211,8 @@ export function PageTransition({
const exitingLayerEl = exitingLayerRef.current;
const transitionVariant = transitionVariantRef.current;
gsap.set(currentLayerEl, { clearProps: 'transform,opacity,boxShadow' });
if (exitingLayerEl) {
gsap.set(exitingLayerEl, { clearProps: 'transform,opacity,boxShadow' });
}
clearLayerStyles(currentLayerEl);
clearLayerStyles(exitingLayerEl);
const scrollContainer = resolveScrollContainer();
const exitScrollOffset = exitScrollOffsetRef.current;
@@ -221,22 +226,21 @@ export function PageTransition({
const enterFromY = isForward ? VERTICAL_TRAVEL_DISTANCE : -VERTICAL_TRAVEL_DISTANCE;
const exitToY = isForward ? -VERTICAL_TRAVEL_DISTANCE : VERTICAL_TRAVEL_DISTANCE;
const exitBaseY = enterScrollOffset - exitScrollOffset;
const activeAnimations: AnimationPlaybackControlsWithThen[] = [];
let cancelled = false;
let completed = false;
const completeTransition = () => {
if (completed) return;
completed = true;
const tl = gsap.timeline({
onComplete: () => {
const nextLayers = nextLayersRef.current;
nextLayersRef.current = null;
setLayers((prev) => nextLayers ?? prev.filter((layer) => layer.status !== 'exiting'));
setIsAnimating(false);
const nextLayers = nextLayersRef.current;
nextLayersRef.current = null;
setLayers((prev) => nextLayers ?? prev.filter((layer) => layer.status !== 'exiting'));
setIsAnimating(false);
if (currentLayerEl) {
gsap.set(currentLayerEl, { clearProps: 'transform,opacity,boxShadow' });
}
if (exitingLayerEl) {
gsap.set(exitingLayerEl, { clearProps: 'transform,opacity,boxShadow' });
}
},
});
clearLayerStyles(currentLayerEl);
clearLayerStyles(exitingLayerEl);
};
if (transitionVariant === 'ios') {
const exitToXPercent = isForward
@@ -247,90 +251,104 @@ export function PageTransition({
: IOS_ENTER_FROM_X_PERCENT_BACKWARD;
if (exitingLayerEl) {
gsap.set(exitingLayerEl, {
y: exitBaseY,
xPercent: 0,
opacity: 1,
});
exitingLayerEl.style.transform = buildIosTransform(0, exitBaseY);
exitingLayerEl.style.opacity = '1';
}
gsap.set(currentLayerEl, {
xPercent: enterFromXPercent,
opacity: 1,
});
const shadowValue = '-14px 0 24px rgba(0, 0, 0, 0.16)';
currentLayerEl.style.transform = buildIosTransform(enterFromXPercent, 0);
currentLayerEl.style.opacity = '1';
const topLayerEl = isForward ? currentLayerEl : exitingLayerEl;
if (topLayerEl) {
gsap.set(topLayerEl, { boxShadow: shadowValue });
topLayerEl.style.boxShadow = IOS_SHADOW_VALUE;
}
if (exitingLayerEl) {
tl.to(
exitingLayerEl,
{
xPercent: exitToXPercent,
opacity: isForward ? IOS_EXIT_DIM_OPACITY : 1,
duration: IOS_TRANSITION_DURATION,
ease: 'power2.out',
force3D: true,
},
0
activeAnimations.push(
animate(
exitingLayerEl,
{
transform: [
buildIosTransform(0, exitBaseY),
buildIosTransform(exitToXPercent, exitBaseY),
],
opacity: [1, isForward ? IOS_EXIT_DIM_OPACITY : 1],
},
{
duration: IOS_TRANSITION_DURATION,
ease: easePower2Out,
}
)
);
}
tl.to(
currentLayerEl,
{
xPercent: 0,
opacity: 1,
duration: IOS_TRANSITION_DURATION,
ease: 'power2.out',
force3D: true,
},
0
activeAnimations.push(
animate(
currentLayerEl,
{
transform: [buildIosTransform(enterFromXPercent, 0), buildIosTransform(0, 0)],
opacity: [1, 1],
},
{
duration: IOS_TRANSITION_DURATION,
ease: easePower2Out,
}
)
);
} else {
// Exit animation: fade out with slight movement (runs simultaneously)
if (exitingLayerEl) {
gsap.set(exitingLayerEl, { y: exitBaseY });
tl.to(
exitingLayerEl,
{
y: exitBaseY + exitToY,
opacity: 0,
duration: VERTICAL_TRANSITION_DURATION,
ease: 'circ.out',
force3D: true,
},
0
exitingLayerEl.style.transform = buildVerticalTransform(exitBaseY);
activeAnimations.push(
animate(
exitingLayerEl,
{
transform: [
buildVerticalTransform(exitBaseY),
buildVerticalTransform(exitBaseY + exitToY),
],
opacity: [1, 0],
},
{
duration: VERTICAL_TRANSITION_DURATION,
ease: easeCircOut,
}
)
);
}
// Enter animation: fade in with slight movement (runs simultaneously)
tl.fromTo(
currentLayerEl,
{ y: enterFromY, opacity: 0 },
{
y: 0,
opacity: 1,
duration: VERTICAL_TRANSITION_DURATION,
ease: 'circ.out',
force3D: true,
onComplete: () => {
if (currentLayerEl) {
gsap.set(currentLayerEl, { clearProps: 'transform,opacity' });
}
currentLayerEl.style.transform = buildVerticalTransform(enterFromY);
currentLayerEl.style.opacity = '0';
activeAnimations.push(
animate(
currentLayerEl,
{
transform: [buildVerticalTransform(enterFromY), buildVerticalTransform(0)],
opacity: [0, 1],
},
},
0
{
duration: VERTICAL_TRANSITION_DURATION,
ease: easeCircOut,
}
)
);
}
if (!activeAnimations.length) {
completeTransition();
} else {
void Promise.all(
activeAnimations.map((animation) => animation.finished.catch(() => undefined))
).then(() => {
if (cancelled) return;
completeTransition();
});
}
return () => {
tl.kill();
gsap.killTweensOf([currentLayerEl, exitingLayerEl]);
cancelled = true;
activeAnimations.forEach((animation) => animation.stop());
};
}, [isAnimating, resolveScrollContainer]);
@@ -348,30 +366,30 @@ export function PageTransition({
return layers.map((layer, index) => {
const shouldKeepStacked = layer.status === 'stacked' && index === keepStackedIndex;
return (
<div
key={layer.key}
className={[
'page-transition__layer',
layer.status === 'exiting' ? 'page-transition__layer--exit' : '',
layer.status === 'stacked' ? 'page-transition__layer--stacked' : '',
shouldKeepStacked ? 'page-transition__layer--stacked-keep' : '',
]
.filter(Boolean)
.join(' ')}
aria-hidden={layer.status !== 'current'}
inert={layer.status !== 'current'}
ref={
layer.status === 'exiting'
? exitingLayerRef
: layer.status === 'current'
? currentLayerRef
: undefined
}
>
<PageTransitionLayerContext.Provider value={{ status: layer.status }}>
{render(layer.location)}
</PageTransitionLayerContext.Provider>
</div>
<div
key={layer.key}
className={[
'page-transition__layer',
layer.status === 'exiting' ? 'page-transition__layer--exit' : '',
layer.status === 'stacked' ? 'page-transition__layer--stacked' : '',
shouldKeepStacked ? 'page-transition__layer--stacked-keep' : '',
]
.filter(Boolean)
.join(' ')}
aria-hidden={layer.status !== 'current'}
inert={layer.status !== 'current'}
ref={
layer.status === 'exiting'
? exitingLayerRef
: layer.status === 'current'
? currentLayerRef
: undefined
}
>
<PageTransitionLayerContext.Provider value={{ status: layer.status }}>
{render(layer.location)}
</PageTransitionLayerContext.Provider>
</div>
);
});
})()}
+225 -102
View File
@@ -1,9 +1,20 @@
@use '../../styles/variables' as *;
@use '../../styles/mixins' as *;
$diff-mono: 'Consolas', 'Monaco', 'Menlo', 'SF Mono', monospace;
$diff-font-size: 12px;
$diff-line-height: 20px;
$diff-gutter-width: 50px;
$diff-prefix-width: 20px;
// GitHub-inspired diff colors (theme-adaptive via color-mix)
$diff-add-color: #3fb950;
$diff-del-color: #f85149;
$diff-hunk-color: #388bfd;
.diffModal {
:global(.modal-body) {
padding: $spacing-md $spacing-lg;
padding: 0;
max-height: none;
overflow: hidden;
}
@@ -25,152 +36,264 @@
font-size: 14px;
display: grid;
place-items: center;
margin: $spacing-md;
}
.diffList {
// ── File container ──────────────────────────────────────
.diffContainer {
flex: 1;
min-height: 0;
display: flex;
flex-direction: column;
gap: $spacing-sm;
overflow: auto;
padding-right: 2px;
}
.diffCard {
border: 1px solid var(--border-color);
border-radius: $radius-md;
background: var(--bg-secondary);
overflow: hidden;
}
.diffCardHeader {
padding: 8px 10px;
border-bottom: 1px dashed var(--border-color);
font-size: 12px;
font-weight: 600;
color: var(--text-secondary);
background: color-mix(in srgb, var(--bg-primary) 92%, transparent);
}
// ── File header ─────────────────────────────────────────
.diffColumns {
display: grid;
grid-template-columns: 1fr 1fr;
gap: $spacing-sm;
padding: $spacing-sm;
}
.diffColumn {
min-width: 0;
border: 1px solid var(--border-color);
border-radius: $radius-sm;
overflow: hidden;
background: var(--bg-primary);
}
.diffColumnHeader {
.fileHeader {
display: flex;
align-items: baseline;
justify-content: space-between;
gap: $spacing-sm;
padding: 8px 10px;
border-bottom: 1px solid var(--border-color);
font-size: 12px;
font-weight: 600;
color: var(--text-secondary);
background: var(--bg-secondary);
}
.lineMeta {
display: inline-flex;
align-items: center;
gap: 8px;
gap: $spacing-sm;
padding: 10px $spacing-md;
background: var(--bg-secondary);
border-bottom: 1px solid var(--border-color);
flex-shrink: 0;
}
.lineRange {
font-size: 11px;
color: var(--text-secondary);
font-family: 'Consolas', 'Monaco', 'Menlo', monospace;
}
.contextRange {
font-size: 11px;
.fileIcon {
flex-shrink: 0;
color: var(--text-tertiary);
font-family: 'Consolas', 'Monaco', 'Menlo', monospace;
}
.codeList {
.fileName {
font-size: 13px;
font-weight: 600;
font-family: $diff-mono;
color: var(--text-primary);
}
.fileStats {
margin-left: auto;
display: flex;
align-items: center;
gap: $spacing-sm;
font-size: 12px;
font-weight: 700;
font-family: $diff-mono;
}
.statAdditions {
color: $diff-add-color;
}
.statDeletions {
color: $diff-del-color;
}
.statBar {
display: inline-flex;
gap: 2px;
margin-left: 2px;
}
.statBlock {
width: 8px;
height: 8px;
border-radius: 2px;
}
.statBlockAdd {
background: $diff-add-color;
}
.statBlockDel {
background: $diff-del-color;
}
// ── Diff body (scrollable) ──────────────────────────────
.diffBody {
flex: 1;
min-height: 0;
overflow: auto;
max-height: 280px;
font-family: 'Consolas', 'Monaco', 'Menlo', monospace;
font-family: $diff-mono;
font-size: $diff-font-size;
line-height: $diff-line-height;
}
.codeLine {
display: grid;
grid-template-columns: 52px minmax(0, 1fr);
align-items: start;
border-top: 1px solid color-mix(in srgb, var(--border-color) 55%, transparent);
// ── Hunk ────────────────────────────────────────────────
.hunk + .hunk {
border-top: 1px solid var(--border-color);
}
.codeLine:first-child {
border-top: none;
.hunkHeader {
display: flex;
align-items: center;
background: color-mix(in srgb, $diff-hunk-color 8%, var(--bg-primary));
border-bottom: 1px solid color-mix(in srgb, $diff-hunk-color 12%, var(--border-color));
color: color-mix(in srgb, $diff-hunk-color 75%, var(--text-secondary));
min-height: $diff-line-height;
}
.codeLineChanged {
background: color-mix(in srgb, var(--primary-color) 8%, transparent);
.hunkGutter {
width: $diff-gutter-width;
flex-shrink: 0;
display: flex;
align-items: center;
justify-content: center;
align-self: stretch;
border-right: 1px solid color-mix(in srgb, $diff-hunk-color 12%, var(--border-color));
}
.codeLineNumber {
padding: 7px 10px 7px 8px;
.hunkExpandIcon {
color: color-mix(in srgb, $diff-hunk-color 70%, var(--text-tertiary));
opacity: 0.7;
}
.hunkText {
padding: 4px $spacing-sm 4px ($diff-prefix-width + $spacing-sm);
font-size: $diff-font-size;
white-space: nowrap;
}
// ── Diff line ───────────────────────────────────────────
.diffLine {
display: flex;
min-height: $diff-line-height;
}
// ── Line number gutters ─────────────────────────────────
.lineNum {
width: $diff-gutter-width;
flex-shrink: 0;
padding: 0 8px;
text-align: right;
font-size: 11px;
color: var(--text-tertiary);
border-right: 1px solid color-mix(in srgb, var(--border-color) 55%, transparent);
background: color-mix(in srgb, var(--bg-secondary) 90%, transparent);
font-variant-numeric: tabular-nums;
user-select: none;
font-variant-numeric: tabular-nums;
border-right: 1px solid color-mix(in srgb, var(--border-color) 60%, transparent);
box-sizing: border-box;
}
.codeLineText {
padding: 7px 10px;
font-size: 12px;
line-height: 1.45;
color: var(--text-primary);
.lineNumEmpty {
color: transparent;
}
// ── Prefix column (+/-/space) ───────────────────────────
.linePrefix {
width: $diff-prefix-width;
flex-shrink: 0;
text-align: center;
user-select: none;
font-weight: 700;
}
// ── Code text ───────────────────────────────────────────
.lineText {
flex: 1;
min-width: 0;
padding-right: 12px;
white-space: pre-wrap;
word-break: break-word;
display: block;
box-sizing: border-box;
}
// ── Context lines ───────────────────────────────────────
.context {
background: var(--bg-primary);
.linePrefix {
color: var(--text-tertiary);
}
.lineText {
color: var(--text-primary);
}
}
// ── Deletion lines ──────────────────────────────────────
.deletion {
background: color-mix(in srgb, $diff-del-color 8%, var(--bg-primary));
.lineNum {
background: color-mix(in srgb, $diff-del-color 12%, var(--bg-primary));
border-right-color: color-mix(in srgb, $diff-del-color 18%, var(--border-color));
color: color-mix(in srgb, $diff-del-color 60%, var(--text-tertiary));
}
.linePrefix {
color: $diff-del-color;
}
.lineText {
color: var(--text-primary);
}
}
// ── Addition lines ──────────────────────────────────────
.addition {
background: color-mix(in srgb, $diff-add-color 8%, var(--bg-primary));
.lineNum {
background: color-mix(in srgb, $diff-add-color 12%, var(--bg-primary));
border-right-color: color-mix(in srgb, $diff-add-color 18%, var(--border-color));
color: color-mix(in srgb, $diff-add-color 60%, var(--text-tertiary));
}
.linePrefix {
color: $diff-add-color;
}
.lineText {
color: var(--text-primary);
}
}
// ── Mobile responsive ───────────────────────────────────
@include mobile {
.content {
height: 65vh;
min-height: 360px;
}
.diffColumns {
grid-template-columns: 1fr;
}
.lineMeta {
flex-direction: column;
align-items: flex-end;
gap: 1px;
}
.codeLine {
grid-template-columns: 44px minmax(0, 1fr);
}
.codeLineNumber {
padding: 6px 6px 6px 4px;
.lineNum {
width: 36px;
padding: 0 4px;
font-size: 10px;
}
.codeLineText {
padding: 6px 8px;
.linePrefix {
width: 16px;
font-size: 11px;
}
.hunkGutter {
width: 36px;
}
.hunkText {
padding-left: 20px;
}
.diffBody {
font-size: 11px;
line-height: 18px;
}
.fileName {
font-size: 12px;
}
.fileStats {
font-size: 11px;
line-height: 1.4;
}
}
+236 -123
View File
@@ -15,66 +15,189 @@ type DiffModalProps = {
loading?: boolean;
};
type DiffChunkCard = {
id: string;
current: DiffSide;
modified: DiffSide;
};
type UnifiedLineType = 'context' | 'addition' | 'deletion';
type LineRange = {
start: number;
end: number;
};
type DiffSideLine = {
lineNumber: number;
type UnifiedLine = {
type: UnifiedLineType;
oldNum: number | null;
newNum: number | null;
text: string;
changed: boolean;
};
type DiffSide = {
changedRangeLabel: string;
contextRangeLabel: string;
lines: DiffSideLine[];
type Hunk = {
oldStart: number;
oldCount: number;
newStart: number;
newCount: number;
lines: UnifiedLine[];
};
const DIFF_CONTEXT_LINES = 2;
type DiffResult = {
hunks: Hunk[];
additions: number;
deletions: number;
};
const DIFF_CONTEXT_LINES = 3;
const clampPos = (doc: Text, pos: number) => Math.max(0, Math.min(pos, doc.length));
const getLineRangeLabel = (range: LineRange): string => {
return range.start === range.end ? String(range.start) : `${range.start}-${range.end}`;
};
function computeUnifiedDiff(original: string, modified: string): DiffResult {
const oldDoc = Text.of(original.split('\n'));
const newDoc = Text.of(modified.split('\n'));
const chunks = Chunk.build(oldDoc, newDoc);
const getChangedLineRange = (doc: Text, from: number, to: number): LineRange => {
const start = clampPos(doc, from);
const end = clampPos(doc, to);
if (start === end) {
const linePos = Math.min(start, doc.length);
const anchorLine = doc.lineAt(linePos).number;
return { start: anchorLine, end: anchorLine };
}
const startLine = doc.lineAt(start).number;
const endLine = doc.lineAt(Math.max(start, end - 1)).number;
return { start: startLine, end: endLine };
};
let totalAdditions = 0;
let totalDeletions = 0;
const expandContextRange = (doc: Text, range: LineRange): LineRange => ({
start: Math.max(1, range.start - DIFF_CONTEXT_LINES),
end: Math.min(doc.lines, range.end + DIFF_CONTEXT_LINES)
});
const hunks: Hunk[] = chunks.map((chunk) => {
const lines: UnifiedLine[] = [];
const buildSideLines = (doc: Text, contextRange: LineRange, changedRange: LineRange): DiffSideLine[] => {
const lines: DiffSideLine[] = [];
for (let lineNumber = contextRange.start; lineNumber <= contextRange.end; lineNumber += 1) {
lines.push({
lineNumber,
text: doc.line(lineNumber).text,
changed: lineNumber >= changedRange.start && lineNumber <= changedRange.end
});
}
return lines;
};
const hasDel = chunk.fromA < chunk.toA;
const hasAdd = chunk.fromB < chunk.toB;
// Collect deleted lines from old doc
const delLines: { num: number; text: string }[] = [];
if (hasDel) {
const startLine = oldDoc.lineAt(chunk.fromA).number;
const endLine = oldDoc.lineAt(chunk.toA - 1).number;
for (let i = startLine; i <= endLine; i++) {
delLines.push({ num: i, text: oldDoc.line(i).text });
}
}
// Collect added lines from new doc
const addLines: { num: number; text: string }[] = [];
if (hasAdd) {
const startLine = newDoc.lineAt(chunk.fromB).number;
const endLine = newDoc.lineAt(chunk.toB - 1).number;
for (let i = startLine; i <= endLine; i++) {
addLines.push({ num: i, text: newDoc.line(i).text });
}
}
totalDeletions += delLines.length;
totalAdditions += addLines.length;
// Compute context boundaries
let ctxBeforeEndOld: number;
let ctxAfterStartOld: number;
let ctxBeforeEndNew: number;
let ctxAfterStartNew: number;
if (hasDel) {
ctxBeforeEndOld = delLines[0].num - 1;
ctxAfterStartOld = delLines[delLines.length - 1].num + 1;
} else {
const anchorPos = clampPos(oldDoc, chunk.fromA);
const lineInfo = oldDoc.lineAt(anchorPos);
if (chunk.fromA === lineInfo.from) {
ctxBeforeEndOld = lineInfo.number - 1;
ctxAfterStartOld = lineInfo.number;
} else {
ctxBeforeEndOld = lineInfo.number;
ctxAfterStartOld = lineInfo.number + 1;
}
}
if (hasAdd) {
ctxBeforeEndNew = addLines[0].num - 1;
ctxAfterStartNew = addLines[addLines.length - 1].num + 1;
} else {
const anchorPos = clampPos(newDoc, chunk.fromB);
const lineInfo = newDoc.lineAt(anchorPos);
if (chunk.fromB === lineInfo.from) {
ctxBeforeEndNew = lineInfo.number - 1;
ctxAfterStartNew = lineInfo.number;
} else {
ctxBeforeEndNew = lineInfo.number;
ctxAfterStartNew = lineInfo.number + 1;
}
}
// Context before
const ctxBeforeCount = Math.min(
DIFF_CONTEXT_LINES,
Math.max(0, ctxBeforeEndOld),
Math.max(0, ctxBeforeEndNew)
);
for (let i = ctxBeforeCount; i > 0; i--) {
const oldNum = ctxBeforeEndOld - i + 1;
const newNum = ctxBeforeEndNew - i + 1;
if (oldNum >= 1 && newNum >= 1 && oldNum <= oldDoc.lines) {
lines.push({
type: 'context',
oldNum,
newNum,
text: oldDoc.line(oldNum).text
});
}
}
// Deletions
for (const del of delLines) {
lines.push({ type: 'deletion', oldNum: del.num, newNum: null, text: del.text });
}
// Additions
for (const add of addLines) {
lines.push({ type: 'addition', oldNum: null, newNum: add.num, text: add.text });
}
// Context after
const ctxAfterCountOld = Math.max(
0,
Math.min(DIFF_CONTEXT_LINES, oldDoc.lines - ctxAfterStartOld + 1)
);
const ctxAfterCountNew = Math.max(
0,
Math.min(DIFF_CONTEXT_LINES, newDoc.lines - ctxAfterStartNew + 1)
);
const ctxAfterCount = Math.min(ctxAfterCountOld, ctxAfterCountNew);
for (let i = 0; i < ctxAfterCount; i++) {
const oldNum = ctxAfterStartOld + i;
const newNum = ctxAfterStartNew + i;
if (oldNum >= 1 && oldNum <= oldDoc.lines && newNum >= 1 && newNum <= newDoc.lines) {
lines.push({
type: 'context',
oldNum,
newNum,
text: oldDoc.line(oldNum).text
});
}
}
// Compute hunk header values
const firstOld = lines.find((l) => l.oldNum !== null)?.oldNum ?? 1;
const firstNew = lines.find((l) => l.newNum !== null)?.newNum ?? 1;
const oldCount = lines.filter((l) => l.type !== 'addition').length;
const newCount = lines.filter((l) => l.type !== 'deletion').length;
return { oldStart: firstOld, oldCount, newStart: firstNew, newCount, lines };
});
return { hunks, additions: totalAdditions, deletions: totalDeletions };
}
const STAT_BLOCKS = 5;
function StatBar({ additions, deletions }: { additions: number; deletions: number }) {
const total = additions + deletions;
if (total === 0) return null;
const addBlocks = Math.round((additions / total) * STAT_BLOCKS);
return (
<span className={styles.statBar}>
{Array.from({ length: STAT_BLOCKS }, (_, i) => (
<span
key={i}
className={`${styles.statBlock} ${i < addBlocks ? styles.statBlockAdd : styles.statBlockDel}`}
/>
))}
</span>
);
}
export function DiffModal({
open,
@@ -86,32 +209,10 @@ export function DiffModal({
}: DiffModalProps) {
const { t } = useTranslation();
const diffCards = useMemo<DiffChunkCard[]>(() => {
const currentDoc = Text.of(original.split('\n'));
const modifiedDoc = Text.of(modified.split('\n'));
const chunks = Chunk.build(currentDoc, modifiedDoc);
return chunks.map((chunk, index) => {
const currentChangedRange = getChangedLineRange(currentDoc, chunk.fromA, chunk.toA);
const modifiedChangedRange = getChangedLineRange(modifiedDoc, chunk.fromB, chunk.toB);
const currentContextRange = expandContextRange(currentDoc, currentChangedRange);
const modifiedContextRange = expandContextRange(modifiedDoc, modifiedChangedRange);
return {
id: `${index}-${chunk.fromA}-${chunk.toA}-${chunk.fromB}-${chunk.toB}`,
current: {
changedRangeLabel: getLineRangeLabel(currentChangedRange),
contextRangeLabel: getLineRangeLabel(currentContextRange),
lines: buildSideLines(currentDoc, currentContextRange, currentChangedRange)
},
modified: {
changedRangeLabel: getLineRangeLabel(modifiedChangedRange),
contextRangeLabel: getLineRangeLabel(modifiedContextRange),
lines: buildSideLines(modifiedDoc, modifiedContextRange, modifiedChangedRange)
}
};
});
}, [modified, original]);
const diff = useMemo<DiffResult>(
() => computeUnifiedDiff(original, modified),
[original, modified]
);
return (
<Modal
@@ -133,61 +234,73 @@ export function DiffModal({
}
>
<div className={styles.content}>
{diffCards.length === 0 ? (
{diff.hunks.length === 0 ? (
<div className={styles.emptyState}>{t('config_management.diff.no_changes')}</div>
) : (
<div className={styles.diffList}>
{diffCards.map((card, index) => (
<article key={card.id} className={styles.diffCard}>
<div className={styles.diffCardHeader}>#{index + 1}</div>
<div className={styles.diffColumns}>
<section className={styles.diffColumn}>
<header className={styles.diffColumnHeader}>
<span>{t('config_management.diff.current')}</span>
<span className={styles.lineMeta}>
<span className={styles.lineRange}>L{card.current.changedRangeLabel}</span>
<span className={styles.contextRange}>
±{DIFF_CONTEXT_LINES}: L{card.current.contextRangeLabel}
</span>
<div className={styles.diffContainer}>
<div className={styles.fileHeader}>
<svg className={styles.fileIcon} viewBox="0 0 16 16" width="16" height="16">
<path
fillRule="evenodd"
d="M3.75 1.5a.25.25 0 00-.25.25v11.5c0 .138.112.25.25.25h8.5a.25.25 0 00.25-.25V6H9.75A1.75 1.75 0 018 4.25V1.5H3.75zm5.75.56v2.19c0 .138.112.25.25.25h2.19L9.5 2.06zM2 1.75C2 .784 2.784 0 3.75 0h5.086c.464 0 .909.184 1.237.513l3.414 3.414c.329.328.513.773.513 1.237v8.086A1.75 1.75 0 0112.25 15h-8.5A1.75 1.75 0 012 13.25V1.75z"
fill="currentColor"
/>
</svg>
<span className={styles.fileName}>config.yaml</span>
<span className={styles.fileStats}>
<span className={styles.statAdditions}>+{diff.additions}</span>
<span className={styles.statDeletions}>-{diff.deletions}</span>
<StatBar additions={diff.additions} deletions={diff.deletions} />
</span>
</div>
<div className={styles.diffBody}>
{diff.hunks.map((hunk, hunkIdx) => (
<div key={hunkIdx} className={styles.hunk}>
<div className={styles.hunkHeader}>
<span className={styles.hunkGutter}>
<svg
className={styles.hunkExpandIcon}
viewBox="0 0 16 16"
width="12"
height="12"
>
<path
d="M8.177 1.677l2.896 2.896a.25.25 0 01-.177.427H8.75v1.25a.75.75 0 01-1.5 0V5H5.104a.25.25 0 01-.177-.427l2.896-2.896a.25.25 0 01.354 0zM7.25 11.75a.75.75 0 011.5 0V13h2.146a.25.25 0 01.177.427l-2.896 2.896a.25.25 0 01-.354 0l-2.896-2.896A.25.25 0 015.104 13H7.25v-1.25z"
fill="currentColor"
/>
</svg>
</span>
<span className={styles.hunkGutter} />
<span className={styles.hunkText}>
@@ -{hunk.oldStart},{hunk.oldCount} +{hunk.newStart},{hunk.newCount} @@
</span>
</div>
{hunk.lines.map((line, lineIdx) => (
<div
key={`${hunkIdx}-${lineIdx}`}
className={`${styles.diffLine} ${styles[line.type]}`}
>
<span
className={`${styles.lineNum} ${line.oldNum === null ? styles.lineNumEmpty : ''}`}
>
{line.oldNum ?? ''}
</span>
</header>
<div className={styles.codeList}>
{card.current.lines.map((line) => (
<div
key={`${card.id}-a-${line.lineNumber}`}
className={`${styles.codeLine} ${line.changed ? styles.codeLineChanged : ''}`}
>
<span className={styles.codeLineNumber}>{line.lineNumber}</span>
<code className={styles.codeLineText}>{line.text || ' '}</code>
</div>
))}
</div>
</section>
<section className={styles.diffColumn}>
<header className={styles.diffColumnHeader}>
<span>{t('config_management.diff.modified')}</span>
<span className={styles.lineMeta}>
<span className={styles.lineRange}>L{card.modified.changedRangeLabel}</span>
<span className={styles.contextRange}>
±{DIFF_CONTEXT_LINES}: L{card.modified.contextRangeLabel}
</span>
<span
className={`${styles.lineNum} ${line.newNum === null ? styles.lineNumEmpty : ''}`}
>
{line.newNum ?? ''}
</span>
</header>
<div className={styles.codeList}>
{card.modified.lines.map((line) => (
<div
key={`${card.id}-b-${line.lineNumber}`}
className={`${styles.codeLine} ${line.changed ? styles.codeLineChanged : ''}`}
>
<span className={styles.codeLineNumber}>{line.lineNumber}</span>
<code className={styles.codeLineText}>{line.text || ' '}</code>
</div>
))}
<span className={styles.linePrefix}>
{line.type === 'deletion' ? '-' : line.type === 'addition' ? '+' : ' '}
</span>
<code className={styles.lineText}>{line.text || ' '}</code>
</div>
</section>
))}
</div>
</article>
))}
))}
</div>
</div>
)}
</div>
+5 -1
View File
@@ -78,7 +78,11 @@ function setStringInDoc(doc: YamlDocument, path: YamlPath, value: unknown): void
doc.setIn(path, safe);
return;
}
if (docHas(doc, path)) doc.deleteIn(path);
// Preserve existing empty-string keys to avoid dropping template blocks/comments.
// Only keep the key when it already exists in the YAML.
if (docHas(doc, path)) {
doc.setIn(path, '');
}
}
function setIntFromStringInDoc(doc: YamlDocument, path: YamlPath, value: unknown): void {
+75 -29
View File
@@ -1,8 +1,17 @@
import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, type ChangeEvent } from 'react';
import {
useCallback,
useEffect,
useLayoutEffect,
useMemo,
useRef,
useState,
type ChangeEvent,
} from 'react';
import { createPortal } from 'react-dom';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
import gsap from 'gsap';
import { animate } from 'motion/mini';
import type { AnimationPlaybackControlsWithThen } from 'motion-dom';
import { useInterval } from '@/hooks/useInterval';
import { useHeaderRefresh } from '@/hooks/useHeaderRefresh';
import { usePageTransitionLayer } from '@/components/common/PageTransitionLayer';
@@ -21,7 +30,7 @@ import {
isRuntimeOnlyAuthFile,
normalizeProviderKey,
type QuotaProviderType,
type ResolvedTheme
type ResolvedTheme,
} from '@/features/authFiles/constants';
import { AuthFileCard } from '@/features/authFiles/components/AuthFileCard';
import { AuthFileDetailModal } from '@/features/authFiles/components/AuthFileDetailModal';
@@ -40,6 +49,11 @@ import { useAuthStore, useNotificationStore, useThemeStore } from '@/stores';
import type { AuthFileItem } from '@/types';
import styles from './AuthFilesPage.module.scss';
const easePower3Out = (progress: number) => 1 - (1 - progress) ** 4;
const easePower2In = (progress: number) => progress ** 3;
const BATCH_BAR_BASE_TRANSFORM = 'translateX(-50%)';
const BATCH_BAR_HIDDEN_TRANSFORM = 'translateX(-50%) translateY(56px)';
export function AuthFilesPage() {
const { t } = useTranslation();
const showNotification = useNotificationStore((state) => state.showNotification);
@@ -59,6 +73,7 @@ export function AuthFilesPage() {
const [viewMode, setViewMode] = useState<'diagram' | 'list'>('list');
const [batchActionBarVisible, setBatchActionBarVisible] = useState(false);
const floatingBatchActionsRef = useRef<HTMLDivElement>(null);
const batchActionAnimationRef = useRef<AnimationPlaybackControlsWithThen | null>(null);
const previousSelectionCountRef = useRef(0);
const selectionCountRef = useRef(0);
@@ -85,7 +100,7 @@ export function AuthFilesPage() {
selectAllVisible,
deselectAll,
batchSetStatus,
batchDelete
batchDelete,
} = useAuthFilesData({ refreshKeyStats });
const statusBarCache = useAuthFilesStatusBarCache(files, usageDetails);
@@ -104,7 +119,7 @@ export function AuthFilesPage() {
handleDeleteLink,
handleToggleFork,
handleRenameAlias,
handleDeleteAlias
handleDeleteAlias,
} = useAuthFilesOauth({ viewMode, files });
const {
@@ -115,7 +130,7 @@ export function AuthFilesPage() {
modelsFileType,
modelsError,
showModels,
closeModelsModal
closeModelsModal,
} = useAuthFilesModels();
const {
@@ -125,11 +140,11 @@ export function AuthFilesPage() {
openPrefixProxyEditor,
closePrefixProxyEditor,
handlePrefixProxyChange,
handlePrefixProxySave
handlePrefixProxySave,
} = useAuthFilesPrefixProxyEditor({
disableControls: connectionStatus !== 'connected',
loadFiles,
loadKeyStats: refreshKeyStats
loadKeyStats: refreshKeyStats,
});
const disableControls = connectionStatus !== 'connected';
@@ -292,7 +307,7 @@ export function AuthFilesPage() {
}
const nextSearch = params.toString();
navigate(`/auth-files/oauth-excluded${nextSearch ? `?${nextSearch}` : ''}`, {
state: { fromAuthFiles: true }
state: { fromAuthFiles: true },
});
},
[filter, navigate]
@@ -307,7 +322,7 @@ export function AuthFilesPage() {
}
const nextSearch = params.toString();
navigate(`/auth-files/oauth-model-alias${nextSearch ? `?${nextSearch}` : ''}`, {
state: { fromAuthFiles: true }
state: { fromAuthFiles: true },
});
},
[filter, navigate]
@@ -354,31 +369,55 @@ export function AuthFilesPage() {
const actionsEl = floatingBatchActionsRef.current;
if (!actionsEl) return;
gsap.killTweensOf(actionsEl);
batchActionAnimationRef.current?.stop();
batchActionAnimationRef.current = null;
if (currentCount > 0 && previousCount === 0) {
gsap.fromTo(
batchActionAnimationRef.current = animate(
actionsEl,
{ y: 56, autoAlpha: 0 },
{ y: 0, autoAlpha: 1, duration: 0.28, ease: 'power3.out' }
{
transform: [BATCH_BAR_HIDDEN_TRANSFORM, BATCH_BAR_BASE_TRANSFORM],
opacity: [0, 1],
},
{
duration: 0.28,
ease: easePower3Out,
onComplete: () => {
actionsEl.style.transform = BATCH_BAR_BASE_TRANSFORM;
actionsEl.style.opacity = '1';
},
}
);
} else if (currentCount === 0 && previousCount > 0) {
gsap.to(actionsEl, {
y: 56,
autoAlpha: 0,
duration: 0.22,
ease: 'power2.in',
onComplete: () => {
if (selectionCountRef.current === 0) {
setBatchActionBarVisible(false);
}
batchActionAnimationRef.current = animate(
actionsEl,
{
transform: [BATCH_BAR_BASE_TRANSFORM, BATCH_BAR_HIDDEN_TRANSFORM],
opacity: [1, 0],
},
{
duration: 0.22,
ease: easePower2In,
onComplete: () => {
if (selectionCountRef.current === 0) {
setBatchActionBarVisible(false);
}
},
}
});
);
}
previousSelectionCountRef.current = currentCount;
}, [batchActionBarVisible, selectionCount]);
useEffect(
() => () => {
batchActionAnimationRef.current?.stop();
batchActionAnimationRef.current = null;
},
[]
);
const renderFilterTags = () => (
<div className={styles.filterTags}>
{existingTypes.map((type) => {
@@ -395,7 +434,7 @@ export function AuthFilesPage() {
style={{
backgroundColor: isActive ? color.text : color.bg,
color: isActive ? activeTextColor : color.text,
borderColor: color.text
borderColor: color.text,
}}
onClick={() => {
setFilter(type);
@@ -442,7 +481,9 @@ export function AuthFilesPage() {
<Button
variant="danger"
size="sm"
onClick={() => handleDeleteAll({ filter, onResetFilterToAll: () => setFilter('all') })}
onClick={() =>
handleDeleteAll({ filter, onResetFilterToAll: () => setFilter('all') })
}
disabled={disableControls || loading || deletingAll}
loading={deletingAll}
>
@@ -502,9 +543,14 @@ export function AuthFilesPage() {
{loading ? (
<div className={styles.hint}>{t('common.loading')}</div>
) : pageItems.length === 0 ? (
<EmptyState title={t('auth_files.search_empty_title')} description={t('auth_files.search_empty_desc')} />
<EmptyState
title={t('auth_files.search_empty_title')}
description={t('auth_files.search_empty_desc')}
/>
) : (
<div className={`${styles.fileGrid} ${quotaFilterType ? styles.fileGridQuotaManaged : ''}`}>
<div
className={`${styles.fileGrid} ${quotaFilterType ? styles.fileGridQuotaManaged : ''}`}
>
{pageItems.map((file) => (
<AuthFileCard
key={file.name}
@@ -543,7 +589,7 @@ export function AuthFilesPage() {
{t('auth_files.pagination_info', {
current: currentPage,
total: totalPages,
count: filtered.length
count: filtered.length,
})}
</div>
<Button
+24 -9
View File
@@ -5,7 +5,7 @@ import CodeMirror, { ReactCodeMirrorRef } from '@uiw/react-codemirror';
import { yaml } from '@codemirror/lang-yaml';
import { search, searchKeymap, highlightSelectionMatches } from '@codemirror/search';
import { keymap } from '@codemirror/view';
import { parse as parseYaml } from 'yaml';
import { parse as parseYaml, parseDocument } from 'yaml';
import { Card } from '@/components/ui/Card';
import { Button } from '@/components/ui/Button';
import { Input } from '@/components/ui/Input';
@@ -123,10 +123,22 @@ export function ConfigPage() {
const handleSave = async () => {
setSaving(true);
try {
const nextMergedYaml = applyVisualChangesToYaml(content);
// In source mode, save exactly what the user edited. In visual mode, materialize visual changes into YAML.
const nextMergedYaml = activeTab === 'source' ? content : applyVisualChangesToYaml(content);
const latestServerYaml = await configFileApi.fetchConfigYaml();
if (latestServerYaml === nextMergedYaml) {
// In visual mode, applyVisualChangesToYaml re-serializes YAML via parseDocument → toString,
// which may reformat comments/whitespace. Normalize the server YAML through the same pipeline
// so the diff only shows actual value changes, not cosmetic reformatting.
let diffOriginal = latestServerYaml;
if (activeTab !== 'source') {
try {
const doc = parseDocument(latestServerYaml);
diffOriginal = doc.toString({ indent: 2, lineWidth: 120, minContentWidth: 0 });
} catch { /* keep raw on parse failure */ }
}
if (diffOriginal === nextMergedYaml) {
setDirty(false);
setContent(latestServerYaml);
setServerYaml(latestServerYaml);
@@ -136,7 +148,7 @@ export function ConfigPage() {
return;
}
setServerYaml(latestServerYaml);
setServerYaml(diffOriginal);
setMergedYaml(nextMergedYaml);
setDiffModalOpen(true);
} catch (err: unknown) {
@@ -156,10 +168,13 @@ export function ConfigPage() {
if (tab === activeTab) return;
if (tab === 'source') {
const nextContent = applyVisualChangesToYaml(content);
if (nextContent !== content) {
setContent(nextContent);
setDirty(true);
// Only rewrite YAML when there are pending visual changes; otherwise preserve raw YAML + comments.
if (visualDirty) {
const nextContent = applyVisualChangesToYaml(content);
if (nextContent !== content) {
setContent(nextContent);
setDirty(true);
}
}
} else {
loadVisualValuesFromYaml(content);
@@ -167,7 +182,7 @@ export function ConfigPage() {
setActiveTab(tab);
localStorage.setItem('config-management:tab', tab);
}, [activeTab, applyVisualChangesToYaml, content, loadVisualValuesFromYaml]);
}, [activeTab, applyVisualChangesToYaml, content, loadVisualValuesFromYaml, visualDirty]);
// Search functionality
const performSearch = useCallback((query: string, direction: 'next' | 'prev' = 'next') => {
+24 -37
View File
@@ -184,9 +184,9 @@ export function buildAntigravityQuotaGroups(
models: AntigravityModelsPayload
): AntigravityQuotaGroup[] {
const groups: AntigravityQuotaGroup[] = [];
let geminiProResetTime: string | undefined;
const [claudeDef, geminiProDef, flashDef, flashLiteDef, cuDef, geminiFlashDef, imageDef] =
ANTIGRAVITY_QUOTA_GROUPS;
const definitions = new Map(
ANTIGRAVITY_QUOTA_GROUPS.map((definition) => [definition.id, definition] as const)
);
const buildGroup = (
def: AntigravityQuotaGroupDefinition,
@@ -227,41 +227,28 @@ export function buildAntigravityQuotaGroups(
};
};
const claudeGroup = buildGroup(claudeDef);
if (claudeGroup) {
groups.push(claudeGroup);
}
const appendGroup = (
id: string,
overrideResetTime?: string
): AntigravityQuotaGroup | null => {
const definition = definitions.get(id);
if (!definition) return null;
const group = buildGroup(definition, overrideResetTime);
if (group) {
groups.push(group);
}
return group;
};
const geminiProGroup = buildGroup(geminiProDef);
if (geminiProGroup) {
geminiProResetTime = geminiProGroup.resetTime;
groups.push(geminiProGroup);
}
const flashGroup = buildGroup(flashDef);
if (flashGroup) {
groups.push(flashGroup);
}
const flashLiteGroup = buildGroup(flashLiteDef);
if (flashLiteGroup) {
groups.push(flashLiteGroup);
}
const cuGroup = buildGroup(cuDef);
if (cuGroup) {
groups.push(cuGroup);
}
const geminiFlashGroup = buildGroup(geminiFlashDef);
if (geminiFlashGroup) {
groups.push(geminiFlashGroup);
}
const imageGroup = buildGroup(imageDef, geminiProResetTime);
if (imageGroup) {
groups.push(imageGroup);
}
appendGroup('claude-gpt');
const gemini31ProGroup = appendGroup('gemini-3-1-pro-series');
const geminiProGroup = appendGroup('gemini-3-pro');
const geminiProResetTime = gemini31ProGroup?.resetTime ?? geminiProGroup?.resetTime;
appendGroup('gemini-2-5-flash');
appendGroup('gemini-2-5-flash-lite');
appendGroup('gemini-2-5-cu');
appendGroup('gemini-3-flash');
appendGroup('gemini-image', geminiProResetTime);
return groups;
}
+8 -8
View File
@@ -73,18 +73,18 @@ export const ANTIGRAVITY_QUOTA_GROUPS: AntigravityQuotaGroupDefinition[] = [
{
id: 'claude-gpt',
label: 'Claude/GPT',
identifiers: [
'claude-sonnet-4-5-thinking',
'claude-opus-4-5-thinking',
'claude-sonnet-4-5',
'gpt-oss-120b-medium',
],
identifiers: ['claude-sonnet-4-6', 'claude-opus-4-6-thinking', 'gpt-oss-120b-medium'],
},
{
id: 'gemini-3-pro',
label: 'Gemini 3 Pro',
identifiers: ['gemini-3-pro-high', 'gemini-3-pro-low'],
},
{
id: 'gemini-3-1-pro-series',
label: 'Gemini 3.1 Pro Series',
identifiers: ['gemini-3.1-pro-high', 'gemini-3.1-pro-low'],
},
{
id: 'gemini-2-5-flash',
label: 'Gemini 2.5 Flash',
@@ -107,8 +107,8 @@ export const ANTIGRAVITY_QUOTA_GROUPS: AntigravityQuotaGroupDefinition[] = [
},
{
id: 'gemini-image',
label: 'gemini-3-pro-image',
identifiers: ['gemini-3-pro-image'],
label: 'gemini-3.1-flash-image',
identifiers: ['gemini-3.1-flash-image'],
labelFromModel: true,
},
];
+30 -10
View File
@@ -104,20 +104,40 @@ export function parseIdTokenPayload(value: unknown): Record<string, unknown> | n
}
export function parseAntigravityPayload(payload: unknown): Record<string, unknown> | null {
if (payload === undefined || payload === null) return null;
if (typeof payload === 'string') {
const trimmed = payload.trim();
if (!trimmed) return null;
try {
return JSON.parse(trimmed) as Record<string, unknown>;
} catch {
const toRecord = (value: unknown): Record<string, unknown> | null => {
if (value === undefined || value === null) return null;
if (typeof value === 'string') {
const trimmed = value.trim();
if (!trimmed) return null;
try {
const parsed = JSON.parse(trimmed);
if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
return parsed as Record<string, unknown>;
}
} catch {
return null;
}
return null;
}
if (typeof value === 'object' && !Array.isArray(value)) {
return value as Record<string, unknown>;
}
return null;
};
const parsed = toRecord(payload);
if (!parsed) return null;
if ('models' in parsed) {
return parsed;
}
if (typeof payload === 'object') {
return payload as Record<string, unknown>;
const nested = toRecord(parsed.body);
if (nested) {
return nested;
}
return null;
return parsed;
}
export function parseClaudeUsagePayload(payload: unknown): ClaudeUsagePayload | null {