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
55 changes: 48 additions & 7 deletions apps/server/src/provider/Drivers/ClaudeDriver.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ClaudeSettings, ProviderDriverKind } from "@t3tools/contracts";
import * as Cache from "effect/Cache";
import type * as Cause from "effect/Cause";
import * as DateTime from "effect/DateTime";
import * as Duration from "effect/Duration";
import * as SecureRandom from "effect/crypto/SecureRandom";
import * as Effect from "effect/Effect";
Expand Down Expand Up @@ -74,6 +75,40 @@ const withoutUsage = (capabilities: ClaudeCapabilitiesProbe): ClaudeCapabilities
return result;
};

/**
* While `/api/oauth/usage` is rate-limited, Claude Code answers `get_usage` from its saved reading
* without saying so. Usage matching that reading is dated by its fetch, never later than the probe.
*/
const withSavedUsageAge = (
capabilities: ClaudeCapabilitiesProbe,
saved: Effect.Success<ReturnType<typeof ClaudeResetCredits.readClaudeSavedUsage>>,
): ClaudeCapabilitiesProbe => {
const windows = Object.entries(capabilities.usage?.rate_limits ?? {}).flatMap(([id, window]) =>
window && "utilization" in window ? [{ id, utilization: window.utilization }] : [],
);
const probedAt = capabilities.usageCheckedAt;
const matchesSaved =
saved !== undefined &&
probedAt !== undefined &&
saved.fetchedAtMs < DateTime.toEpochMillis(DateTime.makeUnsafe(probedAt)) &&
windows.length > 0 &&
windows.every(({ id, utilization }) => {
const savedWindow = saved.utilization[id];
return (
typeof savedWindow === "object" &&
savedWindow !== null &&
"utilization" in savedWindow &&
savedWindow.utilization === utilization
);
});
return matchesSaved
? {
...capabilities,
usageCheckedAt: DateTime.formatIso(DateTime.makeUnsafe(saved.fetchedAtMs)),
}
: capabilities;
};

export type ClaudeDriverEnv =
| ClaudeAdapterV2DriverEnv
| ProviderHost.ProviderHost
Expand Down Expand Up @@ -214,13 +249,19 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv, Path.
const capabilitiesProbeCache = yield* Cache.makeWith(
() =>
probeClaudeCapabilities(effectiveConfig, processEnv, stateDir).pipe(
Effect.flatMap((capabilities) =>
ClaudeResetCredits.readClaudeOrganizationId(accountConfigPath).pipe(
Effect.map((workspaceId) => ({
_tag: "fresh" as const,
capabilities:
workspaceId === undefined ? capabilities : { ...capabilities, workspaceId },
})),
Effect.flatMap((probed) =>
Effect.all([
ClaudeResetCredits.readClaudeOrganizationId(accountConfigPath),
ClaudeResetCredits.readClaudeSavedUsage(accountConfigPath),
]).pipe(
Effect.map(([workspaceId, savedUsage]) => {
const capabilities = withSavedUsageAge(probed, savedUsage);
return {
_tag: "fresh" as const,
capabilities:
workspaceId === undefined ? capabilities : { ...capabilities, workspaceId },
};
}),
),
),
Effect.tap(({ capabilities }) =>
Expand Down
69 changes: 69 additions & 0 deletions apps/server/src/provider/ProviderInstanceRegistry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,75 @@ describe("ProviderInstanceRegistry — multi-instance codex slice", () => {
}).pipe(Effect.provide(layerTest)),
);

it.effect("dates Claude usage served from the CLI's saved reading by when it was fetched", () =>
Effect.gen(function* () {
if (yield* HostProcess.isWindows) return;

const fixtures = yield* makeTildeProviderFixtures();
const fs = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
// While /api/oauth/usage is rate-limited, Claude Code answers get_usage from this reading.
const savedFiveHour = { utilization: 12, resets_at: "2026-07-18T14:39:00Z" };
yield* fs.writeFileString(
path.join(fixtures.claudeHomePath, ".claude.json"),
JSON.stringify({
cachedUsageUtilization: {
fetchedAtMs: 20 * 60_000,
utilization: { five_hour: savedFiveHour },
},
}),
);
let fiveHour = savedFiveHour;
const query = vi.spyOn(ClaudeSdk, "query").mockImplementation(
() =>
({
initializationResult: () =>
Promise.resolve({
commands: [{ name: "usage", description: "", argumentHint: "" }],
account: {
email: "test@example.com",
subscriptionType: "pro",
tokenSource: "oauth",
},
}),
usage_EXPERIMENTAL_MAY_CHANGE_DO_NOT_RELY_ON_THIS_API_YET: async () => ({
rate_limits_available: true,
rate_limits: { five_hour: fiveHour },
}),
}) as ReturnType<typeof ClaudeSdk.query>,
);
yield* Effect.addFinalizer(() => Effect.sync(() => query.mockRestore()));
yield* TestClock.adjust("1 hour");

const claudeId = ProviderInstanceId.make("claude_saved_usage");
const { registry } = yield* makeProviderInstanceRegistry<ClaudeDriverEnv>({
drivers: [ClaudeDriver],
configMap: {
[claudeId]: {
driver: ProviderDriverKind.make("claudeAgent"),
enabled: true,
config: makeClaudeConfig({
enabled: true,
binaryPath: fixtures.claudeBinaryPath,
homePath: fixtures.claudeHomePath,
}),
},
},
});
const claude = yield* registry.getInstance(claudeId);

const saved = yield* claude!.snapshot.refresh;
expect(saved.usageLimits?.windows[0]?.usedPercent).toBe(12);
expect(saved.usageLimits?.checkedAt).toBe("1970-01-01T00:20:00.000Z");

fiveHour = { ...savedFiveHour, utilization: 30 };
yield* claude!.invalidateCaches ?? Effect.void;
const fetched = yield* claude!.snapshot.refresh;
expect(fetched.usageLimits?.windows[0]?.usedPercent).toBe(30);
expect(fetched.usageLimits?.checkedAt).toBe("1970-01-01T01:00:00.000Z");
}).pipe(Effect.provide(layerTest)),
);

it.effect("scopes Claude's one-probe fallback to the logged-in organization", () =>
Effect.gen(function* () {
if (yield* HostProcess.isWindows) return;
Expand Down
16 changes: 16 additions & 0 deletions apps/server/src/provider/claudeResetCredits.ts
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,22 @@ export const readClaudeOauthAccount = (accountConfigPath: string) =>
Effect.orElseSucceed(() => undefined),
);

const SavedUsage = Schema.Struct({
cachedUsageUtilization: Schema.optional(
Schema.Struct({
fetchedAtMs: Schema.Number,
utilization: Schema.Record(Schema.String, Schema.Unknown),
}),
),
});

/** Claude Code's last `/api/oauth/usage` reading, which `get_usage` serves while that endpoint is rate-limited. */
export const readClaudeSavedUsage = (accountConfigPath: string) =>
readJson(SavedUsage, accountConfigPath).pipe(
Effect.map((config) => config.cachedUsageUtilization),
Effect.orElseSucceed(() => undefined),
);

export const readClaudeOrganizationId = (accountConfigPath: string) =>
readClaudeOauthAccount(accountConfigPath).pipe(
Effect.map((account) => account?.organizationUuid?.trim() || undefined),
Expand Down
Loading