Skip to content
Closed
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
1 change: 1 addition & 0 deletions src/main/ipc/rate-limits.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ export function registerRateLimitHandlers(
)
ipcMain.handle('rateLimits:refreshMiniMax', () => rateLimits.refresh())
ipcMain.handle('rateLimits:refreshGrok', () => rateLimits.refreshGrok())
ipcMain.handle('rateLimits:refreshZhipu', () => rateLimits.refresh())

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 refreshZhipu triggers a full provider refresh rather than a Zhipu-specific one

rateLimits:refreshZhipu is wired to rateLimits.refresh(), which refreshes every provider (Claude, Codex, Gemini, MiniMax, Grok, etc.) in parallel. By contrast, rateLimits:refreshGrok calls the dedicated rateLimits.refreshGrok(). When a user clicks "Refresh usage" in the Zhipu settings panel, all other provider fetches are triggered as a side-effect. This is consistent with the MiniMax pattern so it won't break anything, but if a dedicated refreshZhipu() method is ever added to RateLimitService (as was done for Grok), the IPC handler here will need to be updated in tandem.

Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!

}
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ const {
registerClaudeAccountHandlersMock,
registerMiniMaxCredentialsHandlersMock,
registerGrokAccountHandlersMock,
registerZhipuCredentialsHandlersMock,
registerCursorAccountHandlersMock,
registerClipboardHandlersMock,
setTrustedClipboardRendererWebContentsIdMock,
Expand Down Expand Up @@ -106,6 +107,7 @@ const {
registerClaudeAccountHandlersMock: vi.fn(),
registerMiniMaxCredentialsHandlersMock: vi.fn(),
registerGrokAccountHandlersMock: vi.fn(),
registerZhipuCredentialsHandlersMock: vi.fn(),
registerCursorAccountHandlersMock: vi.fn(),
registerClipboardHandlersMock: vi.fn(),
setTrustedClipboardRendererWebContentsIdMock: vi.fn(),
Expand Down Expand Up @@ -346,6 +348,10 @@ vi.mock('../grok-accounts', () => ({
registerGrokAccountHandlers: registerGrokAccountHandlersMock
}))

vi.mock('../zhipu-credentials', () => ({
registerZhipuCredentialsHandlers: registerZhipuCredentialsHandlersMock
}))

vi.mock('../cursor-accounts', () => ({
registerCursorAccountHandlers: registerCursorAccountHandlersMock
}))
Expand Down Expand Up @@ -441,6 +447,7 @@ describe('registerCoreHandlers', () => {
registerAgentTrustHandlersMock.mockReset()
registerClaudeAccountHandlersMock.mockReset()
registerMiniMaxCredentialsHandlersMock.mockReset()
registerZhipuCredentialsHandlersMock.mockReset()
registerClipboardHandlersMock.mockReset()
setTrustedClipboardRendererWebContentsIdMock.mockReset()
registerUpdaterHandlersMock.mockReset()
Expand Down Expand Up @@ -534,6 +541,7 @@ describe('registerCoreHandlers', () => {
expect(registerClaudeAccountHandlersMock).toHaveBeenCalledWith(claudeAccounts)
expect(registerMiniMaxCredentialsHandlersMock).toHaveBeenCalledWith(rateLimits)
expect(registerGrokAccountHandlersMock).toHaveBeenCalled()
expect(registerZhipuCredentialsHandlersMock).toHaveBeenCalledWith(rateLimits)
expect(registerCursorAccountHandlersMock).toHaveBeenCalled()
expect(registerRateLimitHandlersMock).toHaveBeenCalledWith(rateLimits, codexAccounts)
expect(registerGitHubHandlersMock).toHaveBeenCalledWith(store, stats)
Expand Down
2 changes: 2 additions & 0 deletions src/main/ipc/register-core-handlers/register-core-handlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ import { registerAgentTrustHandlers } from '../agent-trust'
import { registerClaudeAccountHandlers } from '../claude-accounts'
import { registerMiniMaxCredentialsHandlers } from '../minimax-credentials'
import { registerGrokAccountHandlers } from '../grok-accounts'
import { registerZhipuCredentialsHandlers } from '../zhipu-credentials'
import { registerCursorAccountHandlers } from '../cursor-accounts'
import { registerUpdaterHandlers } from '../../window/attach-main-window-services'
import {
Expand Down Expand Up @@ -153,6 +154,7 @@ export function registerCoreHandlers(
registerClaudeAccountHandlers(claudeAccounts)
registerMiniMaxCredentialsHandlers(rateLimits)
registerGrokAccountHandlers()
registerZhipuCredentialsHandlers(rateLimits)
registerCursorAccountHandlers()
registerRateLimitHandlers(rateLimits, codexAccounts)
registerGitHubHandlers(store, stats)
Expand Down
80 changes: 80 additions & 0 deletions src/main/ipc/zhipu-credentials.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
import { ipcMain } from 'electron'
import {
clearZhipuCredentials,
hasZhipuCredentials,
readZhipuCredentials,
saveZhipuCredentials
} from '../zhipu/zhipu-credential-store'
import { readCcSwitchZhipuCredentials } from '../zhipu/cc-switch-import'
import type { RateLimitService } from '../rate-limits/service'
import { ZHIPU_DEFAULT_BASE_URL } from '../../shared/zhipu-usage'

export type ZhipuCredentialsStatus = {
configured: boolean
baseUrl: string | null
}

export type ZhipuCredentialsImportStatus = ZhipuCredentialsStatus & {
importedProviderName: string
}

function getZhipuCredentialsStatus(): ZhipuCredentialsStatus {
let baseUrl: string | null = null
try {
baseUrl = readZhipuCredentials()?.baseUrl ?? null
} catch {
baseUrl = null
}
return {
configured: hasZhipuCredentials(),
baseUrl
}
}

// Why: callers need the persisted status immediately; usage refresh can finish in the background.
function refreshAfterZhipuCredentialChange(
rateLimits: RateLimitService | null,
action: 'save' | 'clear' | 'import'
): void {
rateLimits?.invalidateZhipuCredentialState()
void rateLimits?.refresh().catch((error: unknown) => {
console.error(`[zhipu] failed to trigger rate-limit refresh after ${action}:`, error)
})
}

export function registerZhipuCredentialsHandlers(rateLimits: RateLimitService | null): void {
ipcMain.handle('zhipuCredentials:getStatus', () => getZhipuCredentialsStatus())
ipcMain.handle('zhipuCredentials:save', (_event, args: unknown) => {
if (
typeof args !== 'object' ||
args === null ||
typeof (args as { authToken?: unknown }).authToken !== 'string' ||
typeof (args as { baseUrl?: unknown }).baseUrl !== 'string'
) {
throw new Error('Zhipu credentials must include baseUrl and authToken strings')
}
saveZhipuCredentials({
baseUrl: (args as { baseUrl: string }).baseUrl || ZHIPU_DEFAULT_BASE_URL,
authToken: (args as { authToken: string }).authToken
})
refreshAfterZhipuCredentialChange(rateLimits, 'save')
return getZhipuCredentialsStatus()
})
ipcMain.handle('zhipuCredentials:clear', () => {
clearZhipuCredentials()
refreshAfterZhipuCredentialChange(rateLimits, 'clear')
return getZhipuCredentialsStatus()
})
ipcMain.handle('zhipuCredentials:importFromCcSwitch', () => {
const imported = readCcSwitchZhipuCredentials()
saveZhipuCredentials({
baseUrl: imported.baseUrl,
authToken: imported.authToken
})
refreshAfterZhipuCredentialChange(rateLimits, 'import')
return {
...getZhipuCredentialsStatus(),
importedProviderName: imported.providerName
}
})
}
6 changes: 6 additions & 0 deletions src/main/rate-limits/rate-limit-service-test-harness.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import { fetchCursorRateLimits } from './cursor-fetcher'
import { readCursorAuthSession } from './cursor-auth'
import { fetchOpenCodeGoUsage } from './opencode-go-usage-source-selection'
import { hasMiniMaxSessionCookie } from '../minimax/minimax-cookie-store'
import { fetchZhipuRateLimits } from './zhipu-fetcher'
import { hasZhipuCredentials, readZhipuCredentials } from '../zhipu/zhipu-credential-store'

export type Deferred<T> = {
promise: Promise<T>
Expand Down Expand Up @@ -91,6 +93,7 @@ export function mockFreshBackgroundProviderFetches(): void {
vi.mocked(fetchKimiRateLimits).mockImplementation(async () => okProvider('kimi', 0))
vi.mocked(fetchMiniMaxRateLimits).mockImplementation(async () => okProvider('minimax', 0))
vi.mocked(fetchGrokRateLimits).mockImplementation(async () => unavailableProvider('grok'))
vi.mocked(fetchZhipuRateLimits).mockImplementation(async () => unavailableProvider('zhipu'))
vi.mocked(fetchCursorRateLimits).mockImplementation(async () => unavailableProvider('cursor'))
}

Expand All @@ -109,8 +112,11 @@ export function resetRateLimitProviderMocks(): void {
error: null,
status: 'unavailable'
})
vi.mocked(fetchZhipuRateLimits).mockResolvedValue(unavailableProvider('zhipu'))
vi.mocked(fetchCursorRateLimits).mockResolvedValue(unavailableProvider('cursor'))
vi.mocked(hasMiniMaxSessionCookie).mockReturnValue(false)
vi.mocked(hasZhipuCredentials).mockReturnValue(false)
vi.mocked(readZhipuCredentials).mockReturnValue(null)
vi.mocked(readGrokAuthSession).mockReturnValue({ status: 'missing' })
vi.mocked(readCursorAuthSession).mockResolvedValue({ status: 'missing' })
}
Expand Down
26 changes: 20 additions & 6 deletions src/main/rate-limits/service-account-target-selection.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ vi.mock('./grok-fetcher', () => ({
fetchGrokRateLimits: vi.fn()
}))

vi.mock('./zhipu-fetcher', () => ({
fetchZhipuRateLimits: vi.fn()
}))

vi.mock('./cursor-fetcher', () => ({
fetchCursorRateLimits: vi.fn()
}))
Expand All @@ -56,6 +60,13 @@ vi.mock('../minimax/minimax-cookie-store', () => ({
hasMiniMaxSessionCookie: vi.fn(() => false)
}))

vi.mock('../zhipu/zhipu-credential-store', () => ({
hasZhipuCredentials: vi.fn(() => false),
readZhipuCredentials: vi.fn(() => null)
}))

const allowsBackgroundClaudePty = process.platform !== 'win32'

describe('RateLimitService', () => {
beforeEach(() => {
resetRateLimitProviderMocks()
Expand Down Expand Up @@ -380,8 +391,8 @@ describe('RateLimitService', () => {
wslLinuxConfigDir: '/home/jin/.claude',
stripAuthEnv: true
}),
allowPtyFallback: true,
allowUsagePanelSupplement: true,
allowPtyFallback: allowsBackgroundClaudePty,
allowUsagePanelSupplement: allowsBackgroundClaudePty,
signal: expect.any(AbortSignal)
})
)
Expand Down Expand Up @@ -409,7 +420,7 @@ describe('RateLimitService', () => {
expect.objectContaining({
authPreparation: expect.objectContaining({ provenance: 'system' }),
allowPtyFallback: false,
allowUsagePanelSupplement: true,
allowUsagePanelSupplement: allowsBackgroundClaudePty,
signal: expect.any(AbortSignal)
})
)
Expand All @@ -427,7 +438,7 @@ describe('RateLimitService', () => {
expect.objectContaining({
authPreparation: undefined,
allowPtyFallback: false,
allowUsagePanelSupplement: true,
allowUsagePanelSupplement: allowsBackgroundClaudePty,
signal: expect.any(AbortSignal)
})
)
Expand Down Expand Up @@ -455,7 +466,7 @@ describe('RateLimitService', () => {
expect.objectContaining({
authPreparation: expect.objectContaining({ provenance: 'wsl:Ubuntu:system' }),
allowPtyFallback: false,
allowUsagePanelSupplement: true,
allowUsagePanelSupplement: allowsBackgroundClaudePty,
signal: expect.any(AbortSignal)
})
)
Expand Down Expand Up @@ -571,7 +582,10 @@ describe('RateLimitService', () => {
})

expect(fetchClaudeRateLimits).toHaveBeenLastCalledWith(
expect.objectContaining({ allowPtyFallback: true, allowUsagePanelSupplement: true })
expect.objectContaining({
allowPtyFallback: allowsBackgroundClaudePty,
allowUsagePanelSupplement: allowsBackgroundClaudePty
})
)

expect(service.getState().inactiveClaudeAccounts).not.toEqual(
Expand Down
13 changes: 12 additions & 1 deletion src/main/rate-limits/service-inactive-account-previews.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ vi.mock('./grok-fetcher', () => ({
fetchGrokRateLimits: vi.fn()
}))

vi.mock('./zhipu-fetcher', () => ({
fetchZhipuRateLimits: vi.fn()
}))

vi.mock('./cursor-fetcher', () => ({
fetchCursorRateLimits: vi.fn()
}))
Expand All @@ -63,6 +67,13 @@ vi.mock('../minimax/minimax-cookie-store', () => ({
hasMiniMaxSessionCookie: vi.fn(() => false)
}))

vi.mock('../zhipu/zhipu-credential-store', () => ({
hasZhipuCredentials: vi.fn(() => false),
readZhipuCredentials: vi.fn(() => null)
}))

const allowsBackgroundClaudePty = process.platform !== 'win32'

describe('RateLimitService', () => {
beforeEach(() => {
resetRateLimitProviderMocks()
Expand Down Expand Up @@ -214,7 +225,7 @@ describe('RateLimitService', () => {
expect(fetchManagedAccountUsage).toHaveBeenCalledWith(
account,
expect.objectContaining({
allowUsagePanelSupplement: true,
allowUsagePanelSupplement: allowsBackgroundClaudePty,
signal: expect.any(AbortSignal)
})
)
Expand Down
9 changes: 9 additions & 0 deletions src/main/rate-limits/service-live-claude-usage.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ vi.mock('./grok-fetcher', () => ({
fetchGrokRateLimits: vi.fn()
}))

vi.mock('./zhipu-fetcher', () => ({
fetchZhipuRateLimits: vi.fn()
}))

vi.mock('./cursor-fetcher', () => ({
fetchCursorRateLimits: vi.fn()
}))
Expand All @@ -60,6 +64,11 @@ vi.mock('../minimax/minimax-cookie-store', () => ({
hasMiniMaxSessionCookie: vi.fn(() => false)
}))

vi.mock('../zhipu/zhipu-credential-store', () => ({
hasZhipuCredentials: vi.fn(() => false),
readZhipuCredentials: vi.fn(() => null)
}))

describe('RateLimitService', () => {
beforeEach(() => {
resetRateLimitProviderMocks()
Expand Down
9 changes: 9 additions & 0 deletions src/main/rate-limits/service-minimax-usage.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ vi.mock('./minimax/minimax-fetcher', () => ({
fetchMiniMaxRateLimits: vi.fn()
}))

vi.mock('./zhipu-fetcher', () => ({
fetchZhipuRateLimits: vi.fn()
}))

vi.mock('./grok-fetcher', () => ({
fetchGrokRateLimits: vi.fn()
}))
Expand All @@ -61,6 +65,11 @@ vi.mock('../minimax/minimax-api-key-store', () => ({
hasMiniMaxApiKey: vi.fn(() => false)
}))

vi.mock('../zhipu/zhipu-credential-store', () => ({
hasZhipuCredentials: vi.fn(() => false),
readZhipuCredentials: vi.fn(() => null)
}))

describe('RateLimitService', () => {
beforeEach(() => {
resetRateLimitProviderMocks()
Expand Down
13 changes: 12 additions & 1 deletion src/main/rate-limits/service-refresh-orchestration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ vi.mock('./grok-fetcher', () => ({
fetchGrokRateLimits: vi.fn()
}))

vi.mock('./zhipu-fetcher', () => ({
fetchZhipuRateLimits: vi.fn()
}))

vi.mock('./cursor-fetcher', () => ({
fetchCursorRateLimits: vi.fn()
}))
Expand All @@ -64,6 +68,13 @@ vi.mock('../minimax/minimax-cookie-store', () => ({
hasMiniMaxSessionCookie: vi.fn(() => false)
}))

vi.mock('../zhipu/zhipu-credential-store', () => ({
hasZhipuCredentials: vi.fn(() => false),
readZhipuCredentials: vi.fn(() => null)
}))

const allowsBackgroundClaudePty = process.platform !== 'win32'

function serviceInternals(service: RateLimitService): { fetchAll: () => Promise<void> } {
return service as unknown as { fetchAll: () => Promise<void> }
}
Expand Down Expand Up @@ -393,7 +404,7 @@ describe('RateLimitService', () => {
expect.objectContaining({
authPreparation: undefined,
allowPtyFallback: false,
allowUsagePanelSupplement: true,
allowUsagePanelSupplement: allowsBackgroundClaudePty,
signal: expect.any(AbortSignal)
})
)
Expand Down
9 changes: 9 additions & 0 deletions src/main/rate-limits/service-window-activation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ vi.mock('./grok-fetcher', () => ({
fetchGrokRateLimits: vi.fn()
}))

vi.mock('./zhipu-fetcher', () => ({
fetchZhipuRateLimits: vi.fn()
}))

vi.mock('./cursor-fetcher', () => ({
fetchCursorRateLimits: vi.fn()
}))
Expand All @@ -65,6 +69,11 @@ vi.mock('../minimax/minimax-cookie-store', () => ({
hasMiniMaxSessionCookie: vi.fn(() => false)
}))

vi.mock('../zhipu/zhipu-credential-store', () => ({
hasZhipuCredentials: vi.fn(() => false),
readZhipuCredentials: vi.fn(() => null)
}))

describe('RateLimitService', () => {
beforeEach(() => {
resetRateLimitProviderMocks()
Expand Down
Loading
Loading