Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions apps/mobile/src/features/usage/UsageLimitsPooled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { EnvironmentId } from "@t3tools/contracts";
import { providerClients } from "@t3tools/client-runtime/provider-clients";
import { normalizeProviderAccentColor } from "@t3tools/client-runtime/state/provider-instance-display";
import {
bankedResetCreditCount,
collectLimitAccounts,
collectLimitPools,
displayLimitWindows,
Expand Down Expand Up @@ -247,7 +248,7 @@ function PoolWindowCard({
);
const { account, window } = member;
const timeLeft = paceRemainingPercent(window, now);
const credits = account.limits.resetCredits?.availableCount ?? 0;
const credits = bankedResetCreditCount(account.limits.resetCredits);
const resetsIn = resetLabels(window, now, m)?.compact;
return (
<Pressable
Expand Down Expand Up @@ -351,7 +352,7 @@ function PoolWindowCard({
{pool.columns.map(({ account, window }, index) => {
if (!window) return null;
const segmentColor = normalizeProviderAccentColor(account.accentColor) ?? color;
const credits = account.limits.resetCredits?.availableCount ?? 0;
const credits = bankedResetCreditCount(account.limits.resetCredits);
const reset = resetLabels(window, now, m);
const resetsIn = reset?.full;
return (
Expand Down
18 changes: 13 additions & 5 deletions apps/mobile/src/features/usage/UsageLimitsSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
type ServerProviderUsageWindow,
} from "@t3tools/contracts";
import {
bankedResetCreditCount,
type ResetCreditChoice,
paceOf,
paceRemainingPercent,
Expand Down Expand Up @@ -236,8 +237,7 @@ export function AccountLimits(props: {
);
}

const OUTCOME_TEXT: Record<ProviderConsumeResetCreditOutcome, string> = {
reset: msg("Reset applied. Your windows have cleared."),
const OUTCOME_TEXT: Record<Exclude<ProviderConsumeResetCreditOutcome, "reset">, string> = {
nothingToReset: msg("Nothing to reset right now."),
noCredit: msg("No reset credit left."),
alreadyRedeemed: msg("That credit was already redeemed."),
Expand All @@ -259,7 +259,7 @@ export function ResetCredits(props: {
const [status, setStatus] = useState<string | null>(null);
const gt = useGT();
const m = useMessages();
if (dense && credits.availableCount === 0 && status === null) return null;
if (dense && bankedResetCreditCount(credits) === 0 && status === null) return null;

const redeem = async (choice: ResetCreditChoice) => {
if (!readEnvironmentScope(environmentId, AuthProvidersManageScope)) return;
Expand All @@ -268,7 +268,13 @@ export function ResetCredits(props: {
const result = await consume({ environmentId, input: choice.input });
setBusy(false);
if (result._tag === "Success") {
setStatus(result.value.warning ?? resolveNow(OUTCOME_TEXT[result.value.outcome]));
setStatus(
result.value.warning ??
(result.value.outcome === "reset"
? choice.appliedText
: resolveNow(OUTCOME_TEXT[result.value.outcome])),
);

return;
}
setStatus(
Expand All @@ -291,7 +297,9 @@ export function ResetCredits(props: {
{resetCreditChoices(credits, input, now, false, m).map((choice) => (
<View key={choice.key} className="flex-row flex-wrap items-center gap-x-3 gap-y-1">
<Text className="text-xs tabular-nums text-foreground-tertiary">{choice.summary}</Text>
{choice.availableCount > 0 ? (
{choice.unavailableReason ? (
<Text className="text-xs text-foreground-tertiary">{choice.unavailableReason}</Text>
) : choice.availableCount > 0 ? (
<Pressable
accessibilityRole="button"
accessibilityState={{ disabled: busy || !canManageProviders }}
Expand Down
13 changes: 12 additions & 1 deletion apps/mobile/src/i18n/translations/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -5206,5 +5206,16 @@
"ad208e3e32c85029": "Alle ausblenden",
"3328503592789bed": "Zen",
"856812e7e1fc445e": "Tool-Aufrufe im Chat",
"8d545d54c0a9e950": "Die Befehle, Bearbeitungen und Suchen ausblenden, die Agenten ausführen. „Erfolgreiche ausblenden“ behält Fehler. „Zen“ zeigt nur endgültige Antworten. Genehmigungen, Fragen und Fehler werden immer angezeigt."
"8d545d54c0a9e950": "Die Befehle, Bearbeitungen und Suchen ausblenden, die Agenten ausführen. „Erfolgreiche ausblenden“ behält Fehler. „Zen“ zeigt nur endgültige Antworten. Genehmigungen, Fragen und Fehler werden immer angezeigt.",
"fb638c0603fa50c6": "{label} angewendet.",
"2bf11407b8fa9af6": "Versuche es in einer Minute erneut",
"1c0024f6fa9aaabf": "Bei erreichtem 5-Stunden-Limit nicht nutzbar",
"2de09bcfd5ae8d51": "Bei erreichtem Wochenlimit nicht nutzbar",
"6da3a2f994bd5ab9": "Bei erreichtem wöchentlichem Opus-Limit nicht nutzbar",
"deeb1cbaefcfd9ef": "Bei erreichtem wöchentlichem Sonnet-Limit nicht nutzbar",
"e1ed5d3257be05b3": "Bei einem erreichten Limit, das nicht aufgefüllt wird, nicht nutzbar",
"fca7999fdb155f5f": "Füllt das erreichte Limit nicht auf",
"068a3432eaa18fdd": "Nutzbar, sobald du ein Limit erreichst, das damit aufgefüllt wird",
"b1b7a876e0d101db": "Derzeit nicht nutzbar",
"6b27e45149b69d70": "Diese Woche keine Fable-Nutzung zum Zurückgeben"
}
13 changes: 12 additions & 1 deletion apps/mobile/src/i18n/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -5207,5 +5207,16 @@
"ad208e3e32c85029": "Hide all",
"3328503592789bed": "Zen",
"856812e7e1fc445e": "Tool calls in chat",
"8d545d54c0a9e950": "Hide the commands, edits, and searches agents run. Hide successful keeps failures. Zen shows only final answers. Approvals, questions, and errors always show."
"8d545d54c0a9e950": "Hide the commands, edits, and searches agents run. Hide successful keeps failures. Zen shows only final answers. Approvals, questions, and errors always show.",
"fb638c0603fa50c6": "{label} applied.",
"2bf11407b8fa9af6": "Try again in a minute",
"1c0024f6fa9aaabf": "Can't be used while you're at your 5-hour limit",
"2de09bcfd5ae8d51": "Can't be used while you're at your weekly limit",
"6da3a2f994bd5ab9": "Can't be used while you're at your weekly Opus limit",
"deeb1cbaefcfd9ef": "Can't be used while you're at your weekly Sonnet limit",
"e1ed5d3257be05b3": "Can't be used while you're at a limit it doesn't refill",
"fca7999fdb155f5f": "Doesn't refill the limit you've reached",
"068a3432eaa18fdd": "Usable once you reach a limit it refills",
"b1b7a876e0d101db": "Can't be used right now",
"6b27e45149b69d70": "No Fable usage this week to give back"
}
13 changes: 12 additions & 1 deletion apps/mobile/src/i18n/translations/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -5200,5 +5200,16 @@
"ad208e3e32c85029": "Ocultar todo",
"3328503592789bed": "Zen",
"856812e7e1fc445e": "Llamadas a herramientas en el chat",
"8d545d54c0a9e950": "Oculta los comandos, ediciones y búsquedas que ejecutan los agentes. Ocultar las correctas mantiene los fallos. Zen solo muestra las respuestas finales. Las aprobaciones, preguntas y errores siempre se muestran."
"8d545d54c0a9e950": "Oculta los comandos, ediciones y búsquedas que ejecutan los agentes. Ocultar las correctas mantiene los fallos. Zen solo muestra las respuestas finales. Las aprobaciones, preguntas y errores siempre se muestran.",
"fb638c0603fa50c6": "Se aplicó {label}.",
"2bf11407b8fa9af6": "Inténtalo de nuevo en un minuto",
"1c0024f6fa9aaabf": "No se puede usar cuando alcanzas el límite de 5 horas",
"2de09bcfd5ae8d51": "No se puede usar cuando alcanzas el límite semanal",
"6da3a2f994bd5ab9": "No se puede usar cuando alcanzas el límite semanal de Opus",
"deeb1cbaefcfd9ef": "No se puede usar cuando alcanzas el límite semanal de Sonnet",
"e1ed5d3257be05b3": "No se puede usar cuando alcanzas un límite que no restablece",
"fca7999fdb155f5f": "No restablece el límite que has alcanzado",
"068a3432eaa18fdd": "Se puede usar al alcanzar un límite que restablece",
"b1b7a876e0d101db": "No se puede usar ahora",
"6b27e45149b69d70": "No hay uso de Fable esta semana que devolver"
}
13 changes: 12 additions & 1 deletion apps/mobile/src/i18n/translations/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -5200,5 +5200,16 @@
"ad208e3e32c85029": "Tout masquer",
"3328503592789bed": "Zen",
"856812e7e1fc445e": "Appels d’outils dans la discussion",
"8d545d54c0a9e950": "Masque les commandes, modifications et recherches lancées par les agents. Masquer les réussis garde les échecs. Zen n’affiche que les réponses finales. Les approbations, questions et erreurs s’affichent toujours."
"8d545d54c0a9e950": "Masque les commandes, modifications et recherches lancées par les agents. Masquer les réussis garde les échecs. Zen n’affiche que les réponses finales. Les approbations, questions et erreurs s’affichent toujours.",
"fb638c0603fa50c6": "{label} appliqué.",
"2bf11407b8fa9af6": "Réessaie dans une minute",
"1c0024f6fa9aaabf": "Impossible à utiliser lorsque ta limite de 5 heures est atteinte",
"2de09bcfd5ae8d51": "Impossible à utiliser lorsque ta limite hebdomadaire est atteinte",
"6da3a2f994bd5ab9": "Impossible à utiliser lorsque ta limite hebdomadaire Opus est atteinte",
"deeb1cbaefcfd9ef": "Impossible à utiliser lorsque ta limite hebdomadaire Sonnet est atteinte",
"e1ed5d3257be05b3": "Impossible à utiliser lorsqu’une limite qu’il ne recharge pas est atteinte",
"fca7999fdb155f5f": "Ne recharge pas la limite que tu as atteinte",
"068a3432eaa18fdd": "Utilisable dès que tu atteins une limite qu’il recharge",
"b1b7a876e0d101db": "Impossible à utiliser pour le moment",
"6b27e45149b69d70": "Aucune utilisation de Fable à restituer cette semaine"
}
13 changes: 12 additions & 1 deletion apps/mobile/src/i18n/translations/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -5182,5 +5182,16 @@
"ad208e3e32c85029": "すべて非表示",
"3328503592789bed": "Zen",
"856812e7e1fc445e": "チャット内のツール呼び出し",
"8d545d54c0a9e950": "エージェントが実行するコマンド、編集、検索を非表示にします。「成功したものを非表示」では失敗は表示されます。Zen では最終的な回答だけを表示します。承認、質問、エラーは常に表示されます。"
"8d545d54c0a9e950": "エージェントが実行するコマンド、編集、検索を非表示にします。「成功したものを非表示」では失敗は表示されます。Zen では最終的な回答だけを表示します。承認、質問、エラーは常に表示されます。",
"fb638c0603fa50c6": "{label}を適用しました。",
"2bf11407b8fa9af6": "1分後にもう一度お試しください",
"1c0024f6fa9aaabf": "5時間の上限に達している間は使用できません",
"2de09bcfd5ae8d51": "週間上限に達している間は使用できません",
"6da3a2f994bd5ab9": "Opusの週間上限に達している間は使用できません",
"deeb1cbaefcfd9ef": "Sonnetの週間上限に達している間は使用できません",
"e1ed5d3257be05b3": "回復対象外の上限に達している間は使用できません",
"fca7999fdb155f5f": "到達した上限は回復しません",
"068a3432eaa18fdd": "回復対象の上限に達すると使用できます",
"b1b7a876e0d101db": "現在は使用できません",
"6b27e45149b69d70": "今週は返還できるFableの使用量がありません"
}
13 changes: 12 additions & 1 deletion apps/mobile/src/i18n/translations/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -5186,5 +5186,16 @@
"ad208e3e32c85029": "모두 숨기기",
"3328503592789bed": "Zen",
"856812e7e1fc445e": "채팅의 도구 호출",
"8d545d54c0a9e950": "에이전트가 실행하는 명령, 편집, 검색을 숨깁니다. 성공한 항목 숨기기는 실패를 남겨 둡니다. Zen은 최종 답변만 표시합니다. 승인, 질문, 오류는 항상 표시됩니다."
"8d545d54c0a9e950": "에이전트가 실행하는 명령, 편집, 검색을 숨깁니다. 성공한 항목 숨기기는 실패를 남겨 둡니다. Zen은 최종 답변만 표시합니다. 승인, 질문, 오류는 항상 표시됩니다.",
"fb638c0603fa50c6": "{label} 적용됨.",
"2bf11407b8fa9af6": "1분 후에 다시 시도하세요",
"1c0024f6fa9aaabf": "5시간 한도에 도달한 동안에는 사용할 수 없습니다",
"2de09bcfd5ae8d51": "주간 한도에 도달한 동안에는 사용할 수 없습니다",
"6da3a2f994bd5ab9": "Opus 주간 한도에 도달한 동안에는 사용할 수 없습니다",
"deeb1cbaefcfd9ef": "Sonnet 주간 한도에 도달한 동안에는 사용할 수 없습니다",
"e1ed5d3257be05b3": "복구하지 않는 한도에 도달한 동안에는 사용할 수 없습니다",
"fca7999fdb155f5f": "도달한 한도는 복구하지 않습니다",
"068a3432eaa18fdd": "복구 대상 한도에 도달하면 사용할 수 있습니다",
"b1b7a876e0d101db": "지금은 사용할 수 없습니다",
"6b27e45149b69d70": "이번 주에 반환할 Fable 사용량이 없습니다"
}
13 changes: 12 additions & 1 deletion apps/mobile/src/i18n/translations/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -5200,5 +5200,16 @@
"ad208e3e32c85029": "Ocultar todas",
"3328503592789bed": "Zen",
"856812e7e1fc445e": "Chamadas de ferramentas no chat",
"8d545d54c0a9e950": "Oculta os comandos, edições e pesquisas que os agentes executam. \"Ocultar bem-sucedidas\" mantém as falhas. Zen mostra só as respostas finais. Aprovações, perguntas e erros sempre aparecem."
"8d545d54c0a9e950": "Oculta os comandos, edições e pesquisas que os agentes executam. \"Ocultar bem-sucedidas\" mantém as falhas. Zen mostra só as respostas finais. Aprovações, perguntas e erros sempre aparecem.",
"fb638c0603fa50c6": "{label} aplicado.",
"2bf11407b8fa9af6": "Tente novamente em um minuto",
"1c0024f6fa9aaabf": "Não pode ser usado enquanto você estiver no limite de 5 horas",
"2de09bcfd5ae8d51": "Não pode ser usado enquanto você estiver no limite semanal",
"6da3a2f994bd5ab9": "Não pode ser usado enquanto você estiver no limite semanal do Opus",
"deeb1cbaefcfd9ef": "Não pode ser usado enquanto você estiver no limite semanal do Sonnet",
"e1ed5d3257be05b3": "Não pode ser usado enquanto você estiver em um limite que ele não restaura",
"fca7999fdb155f5f": "Não restaura o limite que você atingiu",
"068a3432eaa18fdd": "Pode ser usado quando você atingir um limite que ele restaura",
"b1b7a876e0d101db": "Não pode ser usado agora",
"6b27e45149b69d70": "Nenhum uso do Fable nesta semana para devolver"
}
13 changes: 12 additions & 1 deletion apps/mobile/src/i18n/translations/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -5280,5 +5280,16 @@
"ad208e3e32c85029": "Скрывать все",
"3328503592789bed": "Дзен",
"856812e7e1fc445e": "Вызовы инструментов в чате",
"8d545d54c0a9e950": "Скрывать команды, правки и поиски, которые выполняют агенты. «Скрывать успешные» оставляет ошибки. «Дзен» показывает только итоговые ответы. Запросы подтверждения, вопросы и ошибки показываются всегда."
"8d545d54c0a9e950": "Скрывать команды, правки и поиски, которые выполняют агенты. «Скрывать успешные» оставляет ошибки. «Дзен» показывает только итоговые ответы. Запросы подтверждения, вопросы и ошибки показываются всегда.",
"fb638c0603fa50c6": "{label} применён.",
"2bf11407b8fa9af6": "Повторите попытку через минуту",
"1c0024f6fa9aaabf": "Нельзя использовать при достижении 5-часового лимита",
"2de09bcfd5ae8d51": "Нельзя использовать при достижении недельного лимита",
"6da3a2f994bd5ab9": "Нельзя использовать при достижении недельного лимита Opus",
"deeb1cbaefcfd9ef": "Нельзя использовать при достижении недельного лимита Sonnet",
"e1ed5d3257be05b3": "Нельзя использовать при достижении лимита, который он не восстанавливает",
"fca7999fdb155f5f": "Не восстанавливает достигнутый лимит",
"068a3432eaa18fdd": "Доступен после достижения лимита, который он восстанавливает",
"b1b7a876e0d101db": "Сейчас использовать нельзя",
"6b27e45149b69d70": "На этой неделе нет использования Fable для возврата"
}
13 changes: 12 additions & 1 deletion apps/mobile/src/i18n/translations/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -5206,5 +5206,16 @@
"ad208e3e32c85029": "Dölj alla",
"3328503592789bed": "Zen",
"856812e7e1fc445e": "Verktygsanrop i chatten",
"8d545d54c0a9e950": "Dölj kommandon, redigeringar och sökningar som agenter kör. Dölj lyckade behåller misslyckanden. Zen visar bara slutliga svar. Godkännanden, frågor och fel visas alltid."
"8d545d54c0a9e950": "Dölj kommandon, redigeringar och sökningar som agenter kör. Dölj lyckade behåller misslyckanden. Zen visar bara slutliga svar. Godkännanden, frågor och fel visas alltid.",
"fb638c0603fa50c6": "{label} har tillämpats.",
"2bf11407b8fa9af6": "Försök igen om en minut",
"1c0024f6fa9aaabf": "Kan inte användas när du har nått din 5-timmarsgräns",
"2de09bcfd5ae8d51": "Kan inte användas när du har nått din veckogräns",
"6da3a2f994bd5ab9": "Kan inte användas när du har nått din veckogräns för Opus",
"deeb1cbaefcfd9ef": "Kan inte användas när du har nått din veckogräns för Sonnet",
"e1ed5d3257be05b3": "Kan inte användas när du har nått en gräns som den inte återställer",
"fca7999fdb155f5f": "Återställer inte gränsen du har nått",
"068a3432eaa18fdd": "Kan användas när du når en gräns som den återställer",
"b1b7a876e0d101db": "Kan inte användas just nu",
"6b27e45149b69d70": "Ingen Fable-användning denna vecka att återföra"
}
13 changes: 12 additions & 1 deletion apps/mobile/src/i18n/translations/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -5191,5 +5191,16 @@
"ad208e3e32c85029": "全部隐藏",
"3328503592789bed": "专注模式",
"856812e7e1fc445e": "聊天中的工具调用",
"8d545d54c0a9e950": "隐藏智能体执行的命令、编辑和搜索。“隐藏成功的调用”仍保留失败项;“专注模式”仅显示最终回答。审批、提问和错误始终显示。"
"8d545d54c0a9e950": "隐藏智能体执行的命令、编辑和搜索。“隐藏成功的调用”仍保留失败项;“专注模式”仅显示最终回答。审批、提问和错误始终显示。",
"fb638c0603fa50c6": "已应用{label}。",
"2bf11407b8fa9af6": "请在一分钟后重试",
"1c0024f6fa9aaabf": "达到5小时用量上限时无法使用",
"2de09bcfd5ae8d51": "达到每周用量上限时无法使用",
"6da3a2f994bd5ab9": "达到Opus每周用量上限时无法使用",
"deeb1cbaefcfd9ef": "达到Sonnet每周用量上限时无法使用",
"e1ed5d3257be05b3": "达到无法由此恢复的用量上限时无法使用",
"fca7999fdb155f5f": "无法恢复你已达到的用量上限",
"068a3432eaa18fdd": "达到可由此恢复的用量上限后即可使用",
"b1b7a876e0d101db": "目前无法使用",
"6b27e45149b69d70": "本周没有可返还的Fable用量"
}
15 changes: 7 additions & 8 deletions apps/server/src/provider/Drivers/ClaudeDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -348,14 +348,13 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv, Path.
)(
function* (creditId) {
const current = yield* snapshot.getSnapshot;
const credits = current.usageLimits?.resetCredits;
const grantId =
creditId === undefined
? credits?.nextCreditId
: credits?.options?.some((option) => option.creditId === creditId)
? creditId
: undefined;
if (!grantId || !current.version) return "noCredit" as const;
const target = ClaudeResetCredits.claudeRedeemTarget(
current.usageLimits?.resetCredits,
creditId,
);
if ("outcome" in target) return target.outcome;
if (!current.version) return "noCredit" as const;
const { grantId } = target;
const version = current.version;
return yield* resetCreditCoordinator.redeem(
configDir,
Expand Down
Loading
Loading