@modelprofile.com/authswitch 5.2.0 → 6.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.js +3 -3
- package/dist_ts/accounts.js +3 -2
- package/dist_ts/classes.claudecodeharness.d.ts +13 -4
- package/dist_ts/classes.claudecodeharness.js +36 -11
- package/dist_ts/classes.claudestatus.d.ts +25 -5
- package/dist_ts/classes.claudestatus.js +25 -20
- package/dist_ts/classes.claudetokenrefresh.d.ts +38 -3
- package/dist_ts/classes.claudetokenrefresh.js +80 -21
- package/dist_ts/classes.cli.js +3 -3
- package/dist_ts/classes.credentialstore.d.ts +3 -1
- package/dist_ts/classes.credentialstore.js +2 -2
- package/dist_ts/classes.fileharness.d.ts +16 -5
- package/dist_ts/classes.fileharness.js +31 -9
- package/dist_ts/classes.opencodeanthropicrefresh.d.ts +29 -0
- package/dist_ts/classes.opencodeanthropicrefresh.js +59 -0
- package/dist_ts/classes.opencodeharness.d.ts +40 -0
- package/dist_ts/classes.opencodeharness.js +100 -3
- package/dist_ts/claudehttp.d.ts +14 -0
- package/dist_ts/claudehttp.js +21 -1
- package/dist_ts/interfaces.harness.d.ts +7 -3
- package/package.json +1 -1
- package/readme.md +89 -23
- package/ts/00_commitinfo_data.ts +3 -3
- package/ts/accounts.ts +2 -1
- package/ts/classes.claudecodeharness.ts +37 -12
- package/ts/classes.claudestatus.ts +39 -19
- package/ts/classes.claudetokenrefresh.ts +96 -20
- package/ts/classes.cli.ts +3 -3
- package/ts/classes.credentialstore.ts +2 -2
- package/ts/classes.fileharness.ts +28 -8
- package/ts/classes.opencodeanthropicrefresh.ts +64 -0
- package/ts/classes.opencodeharness.ts +97 -2
- package/ts/claudehttp.ts +22 -0
- package/ts/interfaces.harness.ts +7 -3
|
@@ -2,10 +2,18 @@ import * as plugins from './plugins.js';
|
|
|
2
2
|
import { FileHarness } from './classes.fileharness.js';
|
|
3
3
|
import { CredentialStore, credentialHash, credentialRecord, credentialText, readCredentialDocument, readCredentialRaw } from './classes.credentialstore.js';
|
|
4
4
|
import { HarnessProcesses } from './classes.harnessprocesses.js';
|
|
5
|
+
import { ClaudeAccountStatus } from './classes.claudestatus.js';
|
|
6
|
+
import { CLAUDE_REFRESH_MARGIN_MS } from './classes.claudetokenrefresh.js';
|
|
7
|
+
import { ClaudeLoginRejectedError, ClaudeRateLimitError } from './claudehttp.js';
|
|
5
8
|
import { CodexAccountStatus } from './classes.codexstatus.js';
|
|
9
|
+
import { OpenCodeAnthropicRefresh } from './classes.opencodeanthropicrefresh.js';
|
|
6
10
|
import { writeSecretFileAtomically } from './helpers.js';
|
|
7
11
|
import { beginSavedOpenAiLogin, openCodeCredentialFromLogin } from './classes.login.js';
|
|
8
12
|
import { plainText } from './formatting.js';
|
|
13
|
+
/** Anthropic refused the grant OpenCode's entry holds; no retry and no other account changes that answer. */
|
|
14
|
+
const ANTHROPIC_LOGIN_REJECTED = 'Login expired or was rejected. Log in again with opencode auth login.';
|
|
15
|
+
/** A saved copy is not the login OpenCode uses, so renewing it would rotate a token OpenCode's own entry still holds. */
|
|
16
|
+
const SAVED_ANTHROPIC_EXPIRED = 'This saved Anthropic login\'s access token has expired. authswitch renews the Anthropic login OpenCode has active; activate this one to have it renewed, or log in again with opencode auth login.';
|
|
9
17
|
/** OpenCode owns one login per provider. Replacing a slot never replaces the whole provider set. */
|
|
10
18
|
export class OpenCodeHarness extends FileHarness {
|
|
11
19
|
id = 'opencode';
|
|
@@ -15,20 +23,30 @@ export class OpenCodeHarness extends FileHarness {
|
|
|
15
23
|
liveSwap = false;
|
|
16
24
|
/** Only its OpenAI login reports usage, and a supervisor (AGL) restarts it around a switch, so a watch leaves it alone. */
|
|
17
25
|
autoSwitch = false;
|
|
26
|
+
/** OpenCode re-reads its credential file on every request; only a request already in flight still holds the previous login. */
|
|
27
|
+
runningRetention() {
|
|
28
|
+
return 'They re-read the credential file on every request, but a request already in flight still holds the previous login, and its token refresh can ';
|
|
29
|
+
}
|
|
18
30
|
loginProviders = [{ providerId: 'openai', label: 'OpenAI', flows: ['device'] }];
|
|
19
31
|
store;
|
|
20
32
|
file;
|
|
21
33
|
env;
|
|
22
34
|
status;
|
|
35
|
+
claudeStatus;
|
|
36
|
+
anthropicRefresh;
|
|
23
37
|
processes;
|
|
24
38
|
fetcher;
|
|
39
|
+
now;
|
|
25
40
|
constructor(options = {}) {
|
|
26
41
|
super();
|
|
27
42
|
this.env = options.env ?? process.env;
|
|
28
43
|
this.file = plugins.path.join(options.dataHome ?? (this.env.XDG_DATA_HOME || plugins.path.join(plugins.os.homedir(), '.local', 'share')), 'opencode', 'auth.json');
|
|
29
44
|
this.store = new CredentialStore(this.id, options.stashRoot);
|
|
30
45
|
this.status = new CodexAccountStatus(options.fetch);
|
|
46
|
+
this.claudeStatus = new ClaudeAccountStatus(options.fetch, options.now);
|
|
47
|
+
this.anthropicRefresh = new OpenCodeAnthropicRefresh(options.fetch, options.now);
|
|
31
48
|
this.fetcher = options.fetch;
|
|
49
|
+
this.now = options.now ?? Date.now;
|
|
32
50
|
this.processes = options.processes ?? new HarnessProcesses('opencode');
|
|
33
51
|
}
|
|
34
52
|
/** Every provider entry lives in one file, so its bytes are the whole stability proof. */
|
|
@@ -113,14 +131,93 @@ export class OpenCodeHarness extends FileHarness {
|
|
|
113
131
|
if (readCredentialDocument(this.file).raw !== raw)
|
|
114
132
|
throw new Error('Active login verification failed. The outgoing login remains saved.');
|
|
115
133
|
}
|
|
116
|
-
|
|
117
|
-
|
|
134
|
+
/** The login OpenCode has in a provider slot, read from its file; undefined where the file holds none it can read. */
|
|
135
|
+
activeSlot(slotIdArg) {
|
|
136
|
+
return this.snapshot().accounts.find(account => account.slotId === slotIdArg);
|
|
137
|
+
}
|
|
138
|
+
/** Whether this login's access token is inside Claude Code's five-minute margin, the margin Claude's own logins use. */
|
|
139
|
+
renewalDue(credentialArg) {
|
|
140
|
+
const expires = credentialArg.expires;
|
|
141
|
+
return typeof expires === 'number' && Number.isFinite(expires) && this.now() + CLAUDE_REFRESH_MARGIN_MS >= expires;
|
|
142
|
+
}
|
|
143
|
+
/**
|
|
144
|
+
* Renews OpenCode's active Anthropic login and writes the rotated pair back into OpenCode's own credential file.
|
|
145
|
+
*
|
|
146
|
+
* Nothing is stranded by that write. OpenCode's auth service reads `auth.json` on every `Auth.all()`, `Auth.get()`
|
|
147
|
+
* is that read (1.18.15 @99100961, 1.18.31 @103733929), and its Anthropic provider -- `opencode-anthropic-auth`
|
|
148
|
+
* 0.0.13, since the binary carries no Anthropic OAuth code -- calls the `getAuth()` it was initialised with
|
|
149
|
+
* (@98017331) inside the `fetch` wrapper of every single request. A running OpenCode therefore holds no refresh
|
|
150
|
+
* token in memory and picks up this rotation on its next request, exactly as it picks up its own.
|
|
151
|
+
*
|
|
152
|
+
* The renewal is the only authswitch operation on the store while it runs, and the rotated pair replaces the
|
|
153
|
+
* entry only while OpenCode still holds the refresh token that was sent: a login OpenCode renewed meanwhile is
|
|
154
|
+
* returned as it now stands. The write itself is `apply`'s verified compare-and-swap, which preserves every other
|
|
155
|
+
* provider and replaces the file atomically -- OpenCode writes the same file in place. The slot's switch record
|
|
156
|
+
* follows that write, because an `anthropic` login's identity is its refresh token and this rotation is
|
|
157
|
+
* authswitch's own: without that, the next read would report this write as a different account.
|
|
158
|
+
*/
|
|
159
|
+
renewAnthropic(accountArg, signalArg) {
|
|
160
|
+
return this.store.locked(async () => {
|
|
161
|
+
const current = this.activeSlot(accountArg.slotId) ?? accountArg;
|
|
162
|
+
if (!this.renewalDue(current.credential))
|
|
163
|
+
return current;
|
|
164
|
+
const refreshToken = credentialText(current.credential.refresh);
|
|
165
|
+
if (refreshToken === undefined)
|
|
166
|
+
throw new Error('This Anthropic login holds no refresh token; log in again with opencode auth login.');
|
|
167
|
+
signalArg?.throwIfAborted();
|
|
168
|
+
const tokens = await this.anthropicRefresh.refresh(refreshToken);
|
|
169
|
+
const latest = this.activeSlot(accountArg.slotId);
|
|
170
|
+
if (!latest || credentialText(latest.credential.refresh) !== refreshToken)
|
|
171
|
+
return latest ?? current;
|
|
172
|
+
const renewed = this.inspect({ ...latest.credential, access: tokens.access, refresh: tokens.refresh, expires: tokens.expires }, latest.slotId);
|
|
173
|
+
this.apply(latest.slotId, latest, renewed);
|
|
174
|
+
this.recordRenewal(latest.slotId);
|
|
175
|
+
return renewed;
|
|
176
|
+
}, { signal: signalArg });
|
|
177
|
+
}
|
|
178
|
+
/**
|
|
179
|
+
* The subscription and usage of an OpenCode `anthropic` OAuth login.
|
|
180
|
+
*
|
|
181
|
+
* That entry holds the same Claude subscriber grant Claude Code stores, so Claude's own account endpoints answer
|
|
182
|
+
* for it and the account reports real windows instead of no quota API at all. OpenCode keeps no scopes and no
|
|
183
|
+
* account identity with it, so the service decides both. A due access token is renewed first, with OpenCode's own
|
|
184
|
+
* request; a refusal is reported and nothing is written, so the entry OpenCode owns is left exactly as it was.
|
|
185
|
+
*
|
|
186
|
+
* A saved copy is never renewed: OpenCode's entry holds the same refresh token, and rotating it here would leave
|
|
187
|
+
* the login OpenCode actually uses holding a token the service has replaced.
|
|
188
|
+
*/
|
|
189
|
+
async anthropicStatus(accountArg, isActiveArg, optionsArg) {
|
|
190
|
+
let account = accountArg;
|
|
191
|
+
if (this.renewalDue(account.credential)) {
|
|
192
|
+
if (!isActiveArg)
|
|
193
|
+
return this.claudeStatus.unavailable({}, SAVED_ANTHROPIC_EXPIRED);
|
|
194
|
+
try {
|
|
195
|
+
account = await this.renewAnthropic(account, optionsArg.signal);
|
|
196
|
+
}
|
|
197
|
+
catch (error) {
|
|
198
|
+
if (optionsArg.signal?.aborted)
|
|
199
|
+
throw error;
|
|
200
|
+
const problem = error instanceof ClaudeLoginRejectedError ? ANTHROPIC_LOGIN_REJECTED
|
|
201
|
+
: error instanceof Error ? error.message : 'the login could not be renewed.';
|
|
202
|
+
return this.claudeStatus.unavailable({}, `Login refresh: ${problem}`, error instanceof ClaudeRateLimitError ? { retryAt: error.retryAt } : undefined);
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
const accessToken = credentialText(account.credential.access);
|
|
206
|
+
if (accessToken === undefined)
|
|
207
|
+
return this.claudeStatus.unavailable({}, 'This Anthropic login holds no usable access token; log in again with opencode auth login.');
|
|
208
|
+
return this.claudeStatus.read({ accessToken, scopes: [] }, optionsArg);
|
|
209
|
+
}
|
|
210
|
+
async readAccountStatus(id, optionsArg = {}) {
|
|
211
|
+
const active = this.activeCredential(id);
|
|
212
|
+
const account = active ?? this.savedCredential(id);
|
|
118
213
|
if (account.slotId === 'openai' && account.credential.type === 'oauth') {
|
|
119
214
|
const info = this.openAiInfo(account.credential);
|
|
120
215
|
if (!info.accountId)
|
|
121
216
|
return { facts: [], problems: ['The OpenAI login has no account ID for a status lookup.'] };
|
|
122
217
|
return this.status.readCredential(credentialText(account.credential.access), info.accountId, info.plan, optionsArg);
|
|
123
218
|
}
|
|
219
|
+
if (account.slotId === 'anthropic' && account.credential.type === 'oauth')
|
|
220
|
+
return this.anthropicStatus(account, active !== undefined, optionsArg);
|
|
124
221
|
return { facts: [
|
|
125
222
|
{ section: 'Authentication', label: 'Provider', value: account.slotId },
|
|
126
223
|
{ section: 'Authentication', label: 'Login type', value: String(account.credential.type) },
|
|
@@ -128,4 +225,4 @@ export class OpenCodeHarness extends FileHarness {
|
|
|
128
225
|
], problems: [] };
|
|
129
226
|
}
|
|
130
227
|
}
|
|
131
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.opencodeharness.js","sourceRoot":"","sources":["../ts/classes.opencodeharness.ts"],"names":[],"mappings":"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"}
|
|
228
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.opencodeharness.js","sourceRoot":"","sources":["../ts/classes.opencodeharness.ts"],"names":[],"mappings":"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"}
|
package/dist_ts/claudehttp.d.ts
CHANGED
|
@@ -7,6 +7,20 @@ export declare const CLAUDE_LOGIN_REJECTED = "Login expired or was rejected. Log
|
|
|
7
7
|
export declare class ClaudeLoginRejectedError extends ClaudeRequestError {
|
|
8
8
|
constructor();
|
|
9
9
|
}
|
|
10
|
+
/**
|
|
11
|
+
* Where Claude Code 2.1.273 sends an account the service put on hold (`T5e`, bundle offset @190070402). A hold is
|
|
12
|
+
* not a dead login: the service refuses the grant while it lasts and accepts it again once it is lifted.
|
|
13
|
+
*/
|
|
14
|
+
export declare const CLAUDE_ACCOUNT_ON_HOLD_URL = "https://claude.ai/restricted";
|
|
15
|
+
/** The service put this account on hold. The login itself is intact, so it is never remembered as refused. */
|
|
16
|
+
export declare class ClaudeAccountOnHoldError extends ClaudeRequestError {
|
|
17
|
+
constructor();
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* The OAuth error code a response names, read as Claude Code 2.1.273 reads it (`xc`, @191165290): the `error` field
|
|
21
|
+
* as a string, or the `type` of the object some Anthropic endpoints send it as.
|
|
22
|
+
*/
|
|
23
|
+
export declare const oauthErrorCode: (bodyArg: Record<string, unknown> | null) => string | undefined;
|
|
10
24
|
/** The service refused a request for too many requests. That says nothing about the account's usage or login. */
|
|
11
25
|
export declare class ClaudeRateLimitError extends ClaudeRequestError {
|
|
12
26
|
readonly retryAt: string | null;
|
package/dist_ts/claudehttp.js
CHANGED
|
@@ -10,6 +10,26 @@ export const CLAUDE_LOGIN_REJECTED = 'Login expired or was rejected. Log in agai
|
|
|
10
10
|
export class ClaudeLoginRejectedError extends ClaudeRequestError {
|
|
11
11
|
constructor() { super(CLAUDE_LOGIN_REJECTED); }
|
|
12
12
|
}
|
|
13
|
+
/**
|
|
14
|
+
* Where Claude Code 2.1.273 sends an account the service put on hold (`T5e`, bundle offset @190070402). A hold is
|
|
15
|
+
* not a dead login: the service refuses the grant while it lasts and accepts it again once it is lifted.
|
|
16
|
+
*/
|
|
17
|
+
export const CLAUDE_ACCOUNT_ON_HOLD_URL = 'https://claude.ai/restricted';
|
|
18
|
+
/** The service put this account on hold. The login itself is intact, so it is never remembered as refused. */
|
|
19
|
+
export class ClaudeAccountOnHoldError extends ClaudeRequestError {
|
|
20
|
+
constructor() { super(`This Claude account is on hold and cannot sign in. View details or appeal: ${CLAUDE_ACCOUNT_ON_HOLD_URL}`); }
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* The OAuth error code a response names, read as Claude Code 2.1.273 reads it (`xc`, @191165290): the `error` field
|
|
24
|
+
* as a string, or the `type` of the object some Anthropic endpoints send it as.
|
|
25
|
+
*/
|
|
26
|
+
export const oauthErrorCode = (bodyArg) => {
|
|
27
|
+
const error = bodyArg?.error;
|
|
28
|
+
if (typeof error === 'string')
|
|
29
|
+
return error;
|
|
30
|
+
const type = typeof error === 'object' && error !== null ? error.type : undefined;
|
|
31
|
+
return typeof type === 'string' ? type : undefined;
|
|
32
|
+
};
|
|
13
33
|
/** The service refused a request for too many requests. That says nothing about the account's usage or login. */
|
|
14
34
|
export class ClaudeRateLimitError extends ClaudeRequestError {
|
|
15
35
|
retryAt;
|
|
@@ -80,4 +100,4 @@ export const claudeRequest = async (fetcherArg, requestArg) => {
|
|
|
80
100
|
throw new ClaudeRequestError(`The ${requestArg.subject} service could not be reached.`);
|
|
81
101
|
}
|
|
82
102
|
};
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
103
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhdWRlaHR0cC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2NsYXVkZWh0dHAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ2hFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUU3QyxtSEFBbUg7QUFDbkgsTUFBTSxPQUFPLGtCQUFtQixTQUFRLEtBQUs7Q0FBRztBQUVoRCxzSEFBc0g7QUFDdEgsTUFBTSxDQUFDLE1BQU0scUJBQXFCLEdBQUcsMkVBQTJFLENBQUM7QUFFakgsNENBQTRDO0FBQzVDLE1BQU0sT0FBTyx3QkFBeUIsU0FBUSxrQkFBa0I7SUFDOUQsZ0JBQWdCLEtBQUssQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztDQUNoRDtBQUVEOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxNQUFNLDBCQUEwQixHQUFHLDhCQUE4QixDQUFDO0FBRXpFLDhHQUE4RztBQUM5RyxNQUFNLE9BQU8sd0JBQXlCLFNBQVEsa0JBQWtCO0lBQzlELGdCQUFnQixLQUFLLENBQUMsOEVBQThFLDBCQUEwQixFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7Q0FDckk7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxjQUFjLEdBQUcsQ0FBQyxPQUF1QyxFQUFzQixFQUFFO0lBQzVGLE1BQU0sS0FBSyxHQUFHLE9BQU8sRUFBRSxLQUFLLENBQUM7SUFDN0IsSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRO1FBQUUsT0FBTyxLQUFLLENBQUM7SUFDNUMsTUFBTSxJQUFJLEdBQUcsT0FBTyxLQUFLLEtBQUssUUFBUSxJQUFJLEtBQUssS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFFLEtBQWlDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFD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
|
|
@@ -236,9 +236,13 @@ export interface IAuthHarness {
|
|
|
236
236
|
*/
|
|
237
237
|
readonly autoSwitch?: boolean;
|
|
238
238
|
/**
|
|
239
|
-
* The account's live status. It must never activate, switch or clear a login.
|
|
240
|
-
*
|
|
241
|
-
*
|
|
239
|
+
* The account's live status. It must never activate, switch or clear a login.
|
|
240
|
+
*
|
|
241
|
+
* It may renew the tokens of the credential it reads when the provider leaves it no other way to answer, under
|
|
242
|
+
* its store's lock and with a compare-and-swap on the refresh token it sent. A saved copy is always its own to
|
|
243
|
+
* renew -- the Claude Code adapter renews one, because Claude Code's active login is Claude Code's. The active
|
|
244
|
+
* login may only be renewed where the owning harness re-reads its credential file on every request, so that the
|
|
245
|
+
* rotation strands nothing: OpenCode's Anthropic provider does, and authswitch renews that entry.
|
|
242
246
|
*/
|
|
243
247
|
readAccountStatus(accountIdArg: string, optionsArg?: IHarnessStatusOptions): Promise<IHarnessAccountStatus>;
|
|
244
248
|
readonly loginProviders?: IHarnessLoginProvider[];
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -109,8 +109,11 @@ never blocked by a waiting switch; after that the operation fails with nothing
|
|
|
109
109
|
changed. A lock left behind by a Claude Code that died goes stale after its own
|
|
110
110
|
threshold and is taken over, as Claude Code itself would.
|
|
111
111
|
|
|
112
|
-
**
|
|
113
|
-
|
|
112
|
+
**A running OpenCode can still overwrite a switch.** Not by holding the previous login:
|
|
113
|
+
its auth service caches nothing and re-reads `auth.json` on every lookup. The window is a
|
|
114
|
+
request already in flight, which read the previous login before the switch and can write
|
|
115
|
+
that login's own rotation back afterwards -- and OpenCode replaces the whole provider map
|
|
116
|
+
in place rather than atomically. So before `use` and
|
|
114
117
|
before `stash` without `--keep`, authswitch lists OpenCode's own running instances --
|
|
115
118
|
pid, start time and command line -- and offers to stop them:
|
|
116
119
|
|
|
@@ -214,8 +217,20 @@ every other provider, and `stash openai` without `--keep` clears only OpenAI.
|
|
|
214
217
|
When several logins are active, the guide asks which to save; scripts must name
|
|
215
218
|
the provider or account. In the TUI, select an active row before pressing `a` or `c`.
|
|
216
219
|
ChatGPT OAuth accounts display their email and use the same direct status APIs as
|
|
217
|
-
Codex.
|
|
218
|
-
|
|
220
|
+
Codex. An `anthropic` OAuth login holds the same Claude subscriber grant Claude Code
|
|
221
|
+
stores, so it reports Claude's own plan, organization and usage windows through the
|
|
222
|
+
account endpoints described under **Claude Code**; OpenCode keeps no scopes and no
|
|
223
|
+
account identity with that entry, so both are left to the service. An access token inside
|
|
224
|
+
Claude Code's five-minute margin is renewed first, with the request OpenCode's own
|
|
225
|
+
Anthropic provider sends (`opencode-anthropic-auth`: `console.anthropic.com`, Claude
|
|
226
|
+
Code's public client, no scope), and the rotated pair is written back into `auth.json`
|
|
227
|
+
atomically, preserving every other provider. Nothing is stranded by that write: OpenCode's
|
|
228
|
+
auth service re-reads `auth.json` on every lookup and its Anthropic provider asks for the
|
|
229
|
+
credential again inside every request, so a running instance picks up the rotation exactly
|
|
230
|
+
as it picks up its own. A refusal is reported and nothing is written, and a saved copy is
|
|
231
|
+
never renewed, because OpenCode's own entry holds the same refresh token.
|
|
232
|
+
API keys and opaque provider tokens have no reliable email, so their
|
|
233
|
+
labels contain the provider and a SHA-256 fingerprint. Their quota/billing information is
|
|
219
234
|
explicitly unavailable. `OPENCODE_AUTH_CONTENT` overrides the file and blocks file
|
|
220
235
|
management. Provider configuration and environment credentials remain managed by OpenCode.
|
|
221
236
|
|
|
@@ -254,19 +269,27 @@ authswitch does not infer them from account creation or token expiry dates. The
|
|
|
254
269
|
Claude Code adapter declares that, so `limits` explains it once for the provider
|
|
255
270
|
instead of per account.
|
|
256
271
|
|
|
257
|
-
Nothing but Claude Code refreshes a Claude login, so a saved one stops being readable
|
|
258
|
-
|
|
272
|
+
Nothing but Claude Code refreshes a Claude login, so a saved one stops being readable a
|
|
273
|
+
few hours after it was saved. Reading a **saved, inactive** account's status therefore
|
|
259
274
|
refreshes it first, exactly as Claude Code would: when its access token expires within
|
|
260
275
|
five minutes, authswitch exchanges the stored refresh token at Claude's token endpoint,
|
|
261
276
|
keeps every other field of the login, and writes the result only while the saved record
|
|
262
|
-
still holds the refresh token it sent. The
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
login
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
277
|
+
still holds the refresh token it sent. The request is the one Claude Code sends, down to
|
|
278
|
+
the scopes: a login of Claude Code's own OAuth client is renewed with Claude Code's
|
|
279
|
+
current scope set plus the project scopes the login carries -- not with the set the
|
|
280
|
+
login happens to be stored under, which can be an older or wider one the service no
|
|
281
|
+
longer accepts -- and a set the service refuses as `invalid_scope` is sent once more
|
|
282
|
+
with the stored scopes. A login that names its own OAuth client keeps its stored scopes,
|
|
283
|
+
because only that client's grant knows them. A login that is neither one of Claude
|
|
284
|
+
Code's subscriber logins nor stored with a plan is not sent at all. The refresh holds
|
|
285
|
+
the account store's lock, so a switch started at the same time waits for it and then
|
|
286
|
+
activates the refreshed login. The **active** login is never refreshed -- Claude Code
|
|
287
|
+
owns it, and two parties refreshing one login can invalidate the grant. A refusal is
|
|
288
|
+
reported, never worked around -- a rejected grant says so and says what fixes it
|
|
289
|
+
(below), and a service failure, an unreachable service or an unsupported response leave
|
|
290
|
+
the saved login untouched. Requests carry `User-Agent: authswitch/<version>`, and HTTP
|
|
291
|
+
429 is reported as rate limiting with the service's retry time -- never as an exhausted
|
|
292
|
+
or expired account.
|
|
270
293
|
|
|
271
294
|
Claude Code also rotates the refresh token of the login it **is** running on, so reading the
|
|
272
295
|
accounts (`list`, `limits`, `active`, `current`, `watch`, the dashboard) mirrors that login
|
|
@@ -279,14 +302,57 @@ saved implicitly; `stash` is what saves a login. An installation whose native lo
|
|
|
279
302
|
authswitch cannot read mirrors nothing, and a read waits at most a second for a lock a
|
|
280
303
|
switch or Claude Code holds before leaving the saved copy to the next read.
|
|
281
304
|
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
that
|
|
289
|
-
new
|
|
305
|
+
An account the service has put **on hold** is not a dead login: the hold refuses the grant
|
|
306
|
+
while it lasts and the same login works again once it is lifted, so such an account keeps
|
|
307
|
+
its stored plan, says that it is on hold and where to appeal, and is asked again on the
|
|
308
|
+
next read.
|
|
309
|
+
|
|
310
|
+
A grant the sign-in service refused is remembered in the saved record itself, as a hash
|
|
311
|
+
of the request that was refused -- the refresh token, the client and the scopes, never
|
|
312
|
+
the token itself -- so a new authswitch run, a restarted watch or a second dashboard
|
|
313
|
+
does not replay a dead login. Because the hash covers the request and not only the
|
|
314
|
+
token, a release that changes how authswitch asks gives every such login one honest
|
|
315
|
+
attempt under the new derivation, while a refusal of the request authswitch still sends
|
|
316
|
+
stays remembered. Saving that login again clears it, as does any refresh that replaces
|
|
317
|
+
the saved credential. Such a login reports `Login expired or was rejected. Log in again
|
|
318
|
+
with Claude Code and save it. Claude Code rotates a login's refresh token as it uses it,
|
|
319
|
+
and the service can refuse the older one a saved copy still holds once that login has
|
|
320
|
+
been replaced outside authswitch; authswitch claude stash --keep saves the new one.`
|
|
321
|
+
|
|
322
|
+
Each `n/a` in a Claude row has a reason in the footnote under the table, and each
|
|
323
|
+
reason names what to do:
|
|
324
|
+
|
|
325
|
+
- `Login refresh: Login expired or was rejected.` -- the sign-in service refused the
|
|
326
|
+
saved refresh token itself. Log in again in Claude Code for that account and run
|
|
327
|
+
`authswitch claude stash --keep`; nothing else fixes it.
|
|
328
|
+
- `Login refresh: This Claude account is on hold and cannot sign in.` -- the account,
|
|
329
|
+
not the login. Appeal at the address in the message; the saved login is kept and is
|
|
330
|
+
asked again on the next read.
|
|
331
|
+
- `Login refresh: This saved login has no refresh token, and no subscriber scope or
|
|
332
|
+
plan to refresh with.` -- the saved record is missing what a refresh is made of.
|
|
333
|
+
Save the login again.
|
|
334
|
+
- `Login refresh: this saved login's access token has expired and cannot be renewed
|
|
335
|
+
for this installation.` -- authswitch cannot read Claude Code's own files here (the
|
|
336
|
+
macOS Keychain, or an incomplete native login), so it cannot prove this login is not
|
|
337
|
+
the active one, and never refreshes a login that might be.
|
|
338
|
+
- `Login refresh: The Claude sign-in service returned HTTP ...`, `... could not be
|
|
339
|
+
reached.`, `... timed out.`, `... is rate limiting requests (HTTP 429)` -- the
|
|
340
|
+
service, not the login. The saved login is untouched; read again later.
|
|
341
|
+
- `Profile: ...` or `Usage: ...` -- the account endpoints, asked with a token the
|
|
342
|
+
refresh had just accepted. `Profile: Login expired or was rejected.` means the access
|
|
343
|
+
token itself was refused; the other wordings are the service, as above.
|
|
344
|
+
- `Claude returned a different account or organization` -- the answer was about another
|
|
345
|
+
account and was discarded whole, rather than shown under this account's name.
|
|
346
|
+
- `Claude profile response is unsupported` or `Claude usage response is unsupported` --
|
|
347
|
+
the service answered in a shape authswitch does not read. Nothing is guessed from a
|
|
348
|
+
response it does not understand.
|
|
349
|
+
|
|
350
|
+
An OpenCode `anthropic` row reads the same endpoints and so shows the same reasons. Its
|
|
351
|
+
renewal adds `Login refresh: Login expired or was rejected. Log in again with opencode
|
|
352
|
+
auth login.`, which is Anthropic refusing the refresh token OpenCode's entry holds -- no
|
|
353
|
+
retry changes that, and the refusal is never remembered, because OpenCode owns that entry.
|
|
354
|
+
`This saved Anthropic login's access token has expired.` is a stashed copy, which is left
|
|
355
|
+
alone so that the login OpenCode uses keeps a refresh token the service still accepts.
|
|
290
356
|
|
|
291
357
|
OpenCode and Claude saved records are separate owner-only files under
|
|
292
358
|
`~/.authswitch/opencode` and `~/.authswitch/claude`. Emails are accepted as account
|
|
@@ -982,7 +1048,7 @@ Account identity comes from the `id_token` inside the credential — the email c
|
|
|
982
1048
|
|
|
983
1049
|
**Other Codex clients keep running.** Stopping the managed app-server does not stop an editor extension that spawned its own. Close it, or expect it to keep using the credential it already loaded.
|
|
984
1050
|
|
|
985
|
-
**A running OpenCode can undo a switch.**
|
|
1051
|
+
**A running OpenCode can undo a switch.** Its auth service keeps no login in memory -- every lookup re-reads `auth.json` -- but a request already in flight, which read the previous login before the switch, can write that login's own rotation back afterwards, over a provider map OpenCode replaces in place. Authswitch lists those instances, offers to stop them, warns when any keep running, and detects the overwrite afterwards — but it cannot prevent it while they run. Restart them after a switch. A running Claude Code picks the switch up instead; its guarantee rests on the behaviour and lock protocol verified against Claude Code 2.1.273, and `authswitch claude active` still reports a login that changed outside authswitch.
|
|
986
1052
|
|
|
987
1053
|
**The Codex stash is keyed by email.** Two Codex workspaces with the same email
|
|
988
1054
|
cannot both be saved under that key. Their account IDs are distinguished during
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* autocreated commitinfo by @push.rocks/commitinfo
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
|
-
name:
|
|
6
|
-
version:
|
|
7
|
-
description:
|
|
5
|
+
name: '@modelprofile.com/authswitch',
|
|
6
|
+
version: '6.1.0',
|
|
7
|
+
description: 'Manage Codex, OpenCode and Claude Code accounts with guided switching and live usage status'
|
|
8
8
|
}
|
package/ts/accounts.ts
CHANGED
|
@@ -239,7 +239,8 @@ const STATUS_LOOKUP_CONCURRENCY = 4;
|
|
|
239
239
|
* Bounded status lookups: at most four accounts at a time, started in order, each handed the caller's signal.
|
|
240
240
|
* A lookup that fails reports undefined; once the signal aborts, no further lookup starts. A callback that throws
|
|
241
241
|
* rejects the call, and no other lookup starts after it. No lookup activates, switches or clears a login, though an
|
|
242
|
-
* adapter may renew the tokens of the
|
|
242
|
+
* adapter may renew the tokens of the credential it reads, saved or active, on that method's terms
|
|
243
|
+
* (`IAuthHarness.readAccountStatus`).
|
|
243
244
|
*/
|
|
244
245
|
const lookupStatuses = async (
|
|
245
246
|
harnessArg: IAuthHarness,
|
|
@@ -2,9 +2,9 @@ import * as plugins from './plugins.js';
|
|
|
2
2
|
import { FileHarness, type IFileAccount, type IFileHarnessSnapshot } from './classes.fileharness.js';
|
|
3
3
|
import { CredentialStore, credentialHash, credentialRecord, credentialText, readCredentialDocument, readCredentialRaw, type IStoredCredential } from './classes.credentialstore.js';
|
|
4
4
|
import { HarnessProcesses } from './classes.harnessprocesses.js';
|
|
5
|
-
import { ClaudeAccountStatus } from './classes.claudestatus.js';
|
|
5
|
+
import { ClaudeAccountStatus, type IClaudeLogin } from './classes.claudestatus.js';
|
|
6
6
|
import { ClaudeCodeLocks } from './classes.claudecodelocks.js';
|
|
7
|
-
import { ClaudeTokenRefresh, type IClaudeTokens } from './classes.claudetokenrefresh.js';
|
|
7
|
+
import { claudeGrant, ClaudeTokenRefresh, grantScope, type IClaudeTokens } from './classes.claudetokenrefresh.js';
|
|
8
8
|
import { CLAUDE_LOGIN_REJECTED, ClaudeLoginRejectedError, ClaudeRateLimitError } from './claudehttp.js';
|
|
9
9
|
import { writeSecretFileAtomically } from './helpers.js';
|
|
10
10
|
import type { IHarnessAccountStatus, IHarnessProcessControl, IHarnessState, IHarnessStatusOptions } from './interfaces.harness.js';
|
|
@@ -160,8 +160,33 @@ export class ClaudeCodeHarness extends FileHarness {
|
|
|
160
160
|
throw new Error('Claude Code switch failed while updating account metadata and was rolled back. The outgoing login remains saved; check authswitch claude doctor.');
|
|
161
161
|
}
|
|
162
162
|
}
|
|
163
|
-
/**
|
|
164
|
-
|
|
163
|
+
/**
|
|
164
|
+
* The hash that identifies a refused sign-in, so it is remembered without keeping anything of the login.
|
|
165
|
+
*
|
|
166
|
+
* A refusal is about one request: the refresh token it carried, and the client and scopes authswitch derived for
|
|
167
|
+
* it. Binding all three means a login keeps its refusal for as long as authswitch would send the same request
|
|
168
|
+
* again, and that a release which changes the derivation -- adopting a scope set Claude Code changed, say -- gives
|
|
169
|
+
* every such login one honest attempt under the new one instead of repeating a verdict its request no longer earns.
|
|
170
|
+
*/
|
|
171
|
+
private grantKey(oauthArg: Record<string, unknown>): string {
|
|
172
|
+
const grant = claudeGrant(oauthArg);
|
|
173
|
+
return credentialHash(JSON.stringify([credentialText(oauthArg.refreshToken) ?? '', grant?.clientId ?? '', grant === null ? '' : grantScope(grant.scopes)]));
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
/** The login a status lookup asks with: its token, and what this store knows about it. */
|
|
177
|
+
private login(accountArg: IFileAccount): IClaudeLogin {
|
|
178
|
+
const oauth = credentialRecord(accountArg.credential.claudeAiOauth);
|
|
179
|
+
const account = credentialRecord(accountArg.credential.oauthAccount);
|
|
180
|
+
const accountUuid = credentialText(account.accountUuid);
|
|
181
|
+
const organizationUuid = credentialText(account.organizationUuid);
|
|
182
|
+
const plan = credentialText(oauth.subscriptionType);
|
|
183
|
+
return {
|
|
184
|
+
accessToken: credentialText(oauth.accessToken) ?? '',
|
|
185
|
+
scopes: Array.isArray(oauth.scopes) ? oauth.scopes.filter((scope): scope is string => typeof scope === 'string') : [],
|
|
186
|
+
...(accountUuid !== undefined && organizationUuid !== undefined ? { identity: { accountUuid, organizationUuid } } : {}),
|
|
187
|
+
...(plan === undefined ? {} : { plan }),
|
|
188
|
+
};
|
|
189
|
+
}
|
|
165
190
|
|
|
166
191
|
/**
|
|
167
192
|
* The harness's accounts, with the saved copy of the active login brought up to date first.
|
|
@@ -226,28 +251,28 @@ export class ClaudeCodeHarness extends FileHarness {
|
|
|
226
251
|
* is due is refreshed first; when that fails, the status says why and keeps the stored plan, and the saved login is
|
|
227
252
|
* left exactly as it was.
|
|
228
253
|
*
|
|
229
|
-
* A refresh is only ever sent for a login the native files prove is not the active one (`nativeView`), and a
|
|
230
|
-
* the service already
|
|
254
|
+
* A refresh is only ever sent for a login the native files prove is not the active one (`nativeView`), and a request
|
|
255
|
+
* the service already refused is not sent again while the saved record would produce the same one (`grantKey`).
|
|
231
256
|
*/
|
|
232
257
|
public async readAccountStatus(id: string, optionsArg: IHarnessStatusOptions = {}): Promise<IHarnessAccountStatus> {
|
|
233
|
-
const read = (accountArg: IFileAccount) =>
|
|
234
|
-
this.status.read(credentialRecord(accountArg.credential.claudeAiOauth), credentialRecord(accountArg.credential.oauthAccount), optionsArg);
|
|
258
|
+
const read = (accountArg: IFileAccount) => this.status.read(this.login(accountArg), optionsArg);
|
|
235
259
|
const view = this.nativeView(id);
|
|
236
260
|
if (view.active) return read(view.active);
|
|
237
261
|
const saved = this.savedCredential(id);
|
|
262
|
+
const login = this.login(saved);
|
|
238
263
|
const oauth = credentialRecord(saved.credential.claudeAiOauth);
|
|
239
264
|
if (!this.tokens.due(oauth)) return read(saved);
|
|
240
265
|
if (view.unavailable !== null) {
|
|
241
|
-
return this.status.unavailable(
|
|
266
|
+
return this.status.unavailable(login, `Login refresh: this saved login's access token has expired and cannot be renewed for this installation. ${view.unavailable}`);
|
|
242
267
|
}
|
|
243
|
-
if (this.store.read(id).rejectedGrant === this.grantKey(oauth)) return this.status.unavailable(
|
|
268
|
+
if (this.store.read(id).rejectedGrant === this.grantKey(oauth)) return this.status.unavailable(login, `Login refresh: ${SAVED_LOGIN_REJECTED}`);
|
|
244
269
|
let refreshed: IFileAccount;
|
|
245
270
|
try { refreshed = await this.refreshSaved(id, optionsArg.signal); }
|
|
246
271
|
catch (error) {
|
|
247
272
|
if (optionsArg.signal?.aborted) throw error;
|
|
248
273
|
const problem = error instanceof ClaudeLoginRejectedError ? SAVED_LOGIN_REJECTED
|
|
249
274
|
: error instanceof Error ? error.message : 'the saved login could not be refreshed.';
|
|
250
|
-
return this.status.unavailable(
|
|
275
|
+
return this.status.unavailable(login, `Login refresh: ${problem}`,
|
|
251
276
|
error instanceof ClaudeRateLimitError ? { retryAt: error.retryAt } : undefined);
|
|
252
277
|
}
|
|
253
278
|
return read(refreshed);
|
|
@@ -260,7 +285,7 @@ export class ClaudeCodeHarness extends FileHarness {
|
|
|
260
285
|
* became active meanwhile belongs to Claude Code and is returned as it is, one in an installation that can no
|
|
261
286
|
* longer be read is returned unrefreshed, and one another refresh already renewed is not refreshed twice. The new
|
|
262
287
|
* tokens replace the saved ones only while the record still holds the refresh token that was sent, the
|
|
263
|
-
* compare-and-swap Claude Code 2.1.273 applies to its own store (`$fn`, @
|
|
288
|
+
* compare-and-swap Claude Code 2.1.273 applies to its own store (`$fn`, @191212749).
|
|
264
289
|
*/
|
|
265
290
|
private refreshSaved(id: string, signal?: AbortSignal): Promise<IFileAccount> {
|
|
266
291
|
return this.store.locked(async () => {
|