@modelprofile.com/authswitch 6.1.0 → 6.2.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 +1 -1
- package/dist_ts/classes.codexauth.d.ts +8 -5
- package/dist_ts/classes.codexauth.js +78 -69
- package/dist_ts/classes.codexharness.d.ts +25 -0
- package/dist_ts/classes.codexharness.js +59 -6
- package/dist_ts/classes.stashstore.d.ts +10 -0
- package/dist_ts/classes.stashstore.js +22 -1
- package/package.json +1 -1
- package/readme.md +28 -8
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.codexauth.ts +85 -75
- package/ts/classes.codexharness.ts +58 -6
- package/ts/classes.stashstore.ts +22 -0
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@modelprofile.com/authswitch',
|
|
6
|
-
version: '6.
|
|
6
|
+
version: '6.2.0',
|
|
7
7
|
description: 'Manage Codex, OpenCode and Claude Code accounts with guided switching and live usage status'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSw4QkFBOEI7SUFDcEMsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLDZGQUE2RjtDQUMzRyxDQUFBIn0=
|
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
import type { IActiveAuth, ICodexIdentity } from './interfaces.js';
|
|
2
2
|
import { CodexHome } from './classes.codexhome.js';
|
|
3
|
+
/**
|
|
4
|
+
* Extracts the account identity from the content of an auth.json.
|
|
5
|
+
* Returns null when the content holds no recognisable credential.
|
|
6
|
+
*
|
|
7
|
+
* It stands outside the class because the stash store keys and guards its entries by the same identity and has
|
|
8
|
+
* no Codex installation to read: the credential itself is all this derivation needs.
|
|
9
|
+
*/
|
|
10
|
+
export declare const codexIdentityFromRaw: (rawArg: string) => ICodexIdentity | null;
|
|
3
11
|
/**
|
|
4
12
|
* Reads, writes and clears the Codex file credential store, and derives the
|
|
5
13
|
* account identity used to key a stash.
|
|
@@ -15,11 +23,6 @@ export declare class CodexAuth {
|
|
|
15
23
|
* Returns null when the file holds no recognisable credential.
|
|
16
24
|
*/
|
|
17
25
|
identityFromRaw(rawArg: string): ICodexIdentity | null;
|
|
18
|
-
/**
|
|
19
|
-
* A short, non-reversible label for an API key so two different keys get two
|
|
20
|
-
* different stashes without the key itself ever being written down.
|
|
21
|
-
*/
|
|
22
|
-
private fingerprint;
|
|
23
26
|
/** Reads the active credential, if any. */
|
|
24
27
|
readActive(): IActiveAuth;
|
|
25
28
|
/**
|
|
@@ -53,6 +53,82 @@ const findFirstJwt = (valueArg, depthArg = 0) => {
|
|
|
53
53
|
}
|
|
54
54
|
return null;
|
|
55
55
|
};
|
|
56
|
+
/**
|
|
57
|
+
* A short, non-reversible label for an API key so two different keys get two
|
|
58
|
+
* different stashes without the key itself ever being written down.
|
|
59
|
+
*/
|
|
60
|
+
const fingerprint = (secretArg) => {
|
|
61
|
+
let hash = 0x811c9dc5;
|
|
62
|
+
for (let index = 0; index < secretArg.length; index++) {
|
|
63
|
+
hash ^= secretArg.charCodeAt(index);
|
|
64
|
+
hash = Math.imul(hash, 0x01000193) >>> 0;
|
|
65
|
+
}
|
|
66
|
+
return hash.toString(16).padStart(8, '0');
|
|
67
|
+
};
|
|
68
|
+
/**
|
|
69
|
+
* Extracts the account identity from the content of an auth.json.
|
|
70
|
+
* Returns null when the content holds no recognisable credential.
|
|
71
|
+
*
|
|
72
|
+
* It stands outside the class because the stash store keys and guards its entries by the same identity and has
|
|
73
|
+
* no Codex installation to read: the credential itself is all this derivation needs.
|
|
74
|
+
*/
|
|
75
|
+
export const codexIdentityFromRaw = (rawArg) => {
|
|
76
|
+
let parsed;
|
|
77
|
+
try {
|
|
78
|
+
parsed = JSON.parse(rawArg);
|
|
79
|
+
}
|
|
80
|
+
catch {
|
|
81
|
+
return null;
|
|
82
|
+
}
|
|
83
|
+
if (!parsed || typeof parsed !== 'object') {
|
|
84
|
+
return null;
|
|
85
|
+
}
|
|
86
|
+
const record = parsed;
|
|
87
|
+
const tokens = (record.tokens ?? null);
|
|
88
|
+
const idToken = (tokens ? asString(tokens.id_token) : null) ?? findFirstJwt(record);
|
|
89
|
+
if (idToken) {
|
|
90
|
+
const claims = decodeJwtPayload(idToken) ?? {};
|
|
91
|
+
const authClaim = (claims['https://api.openai.com/auth'] ?? {});
|
|
92
|
+
const profileClaim = (claims['https://api.openai.com/profile'] ?? {});
|
|
93
|
+
const email = asString(claims.email) ??
|
|
94
|
+
asString(profileClaim.email) ??
|
|
95
|
+
asString(authClaim.user_email);
|
|
96
|
+
const accountId = asString(authClaim.chatgpt_account_id) ??
|
|
97
|
+
(tokens ? asString(tokens.account_id) : null) ??
|
|
98
|
+
asString(record.account_id);
|
|
99
|
+
if (email) {
|
|
100
|
+
return {
|
|
101
|
+
kind: 'chatgpt',
|
|
102
|
+
email: email.toLowerCase(),
|
|
103
|
+
accountId,
|
|
104
|
+
planType: asString(authClaim.chatgpt_plan_type),
|
|
105
|
+
userId: asString(authClaim.user_id) ?? asString(claims.sub),
|
|
106
|
+
};
|
|
107
|
+
}
|
|
108
|
+
if (accountId) {
|
|
109
|
+
// An OAuth credential we cannot label by email is still worth stashing;
|
|
110
|
+
// key it by account id so it round-trips instead of being silently dropped.
|
|
111
|
+
return {
|
|
112
|
+
kind: 'chatgpt',
|
|
113
|
+
email: `account:${accountId}`,
|
|
114
|
+
accountId,
|
|
115
|
+
planType: asString(authClaim.chatgpt_plan_type),
|
|
116
|
+
userId: asString(authClaim.user_id) ?? asString(claims.sub),
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
const apiKey = asString(record.OPENAI_API_KEY) ?? asString(record.openai_api_key);
|
|
121
|
+
if (apiKey) {
|
|
122
|
+
return {
|
|
123
|
+
kind: 'apikey',
|
|
124
|
+
email: `apikey:${fingerprint(apiKey)}`,
|
|
125
|
+
accountId: null,
|
|
126
|
+
planType: null,
|
|
127
|
+
userId: null,
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
return null;
|
|
131
|
+
};
|
|
56
132
|
/**
|
|
57
133
|
* Reads, writes and clears the Codex file credential store, and derives the
|
|
58
134
|
* account identity used to key a stash.
|
|
@@ -70,74 +146,7 @@ export class CodexAuth {
|
|
|
70
146
|
* Returns null when the file holds no recognisable credential.
|
|
71
147
|
*/
|
|
72
148
|
identityFromRaw(rawArg) {
|
|
73
|
-
|
|
74
|
-
try {
|
|
75
|
-
parsed = JSON.parse(rawArg);
|
|
76
|
-
}
|
|
77
|
-
catch {
|
|
78
|
-
return null;
|
|
79
|
-
}
|
|
80
|
-
if (!parsed || typeof parsed !== 'object') {
|
|
81
|
-
return null;
|
|
82
|
-
}
|
|
83
|
-
const record = parsed;
|
|
84
|
-
const tokens = (record.tokens ?? null);
|
|
85
|
-
const idToken = (tokens ? asString(tokens.id_token) : null) ?? findFirstJwt(record);
|
|
86
|
-
if (idToken) {
|
|
87
|
-
const claims = decodeJwtPayload(idToken) ?? {};
|
|
88
|
-
const authClaim = (claims['https://api.openai.com/auth'] ?? {});
|
|
89
|
-
const profileClaim = (claims['https://api.openai.com/profile'] ?? {});
|
|
90
|
-
const email = asString(claims.email) ??
|
|
91
|
-
asString(profileClaim.email) ??
|
|
92
|
-
asString(authClaim.user_email);
|
|
93
|
-
const accountId = asString(authClaim.chatgpt_account_id) ??
|
|
94
|
-
(tokens ? asString(tokens.account_id) : null) ??
|
|
95
|
-
asString(record.account_id);
|
|
96
|
-
if (email) {
|
|
97
|
-
return {
|
|
98
|
-
kind: 'chatgpt',
|
|
99
|
-
email: email.toLowerCase(),
|
|
100
|
-
accountId,
|
|
101
|
-
planType: asString(authClaim.chatgpt_plan_type),
|
|
102
|
-
userId: asString(authClaim.user_id) ?? asString(claims.sub),
|
|
103
|
-
};
|
|
104
|
-
}
|
|
105
|
-
if (accountId) {
|
|
106
|
-
// An OAuth credential we cannot label by email is still worth stashing;
|
|
107
|
-
// key it by account id so it round-trips instead of being silently dropped.
|
|
108
|
-
return {
|
|
109
|
-
kind: 'chatgpt',
|
|
110
|
-
email: `account:${accountId}`,
|
|
111
|
-
accountId,
|
|
112
|
-
planType: asString(authClaim.chatgpt_plan_type),
|
|
113
|
-
userId: asString(authClaim.user_id) ?? asString(claims.sub),
|
|
114
|
-
};
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
const apiKey = asString(record.OPENAI_API_KEY) ?? asString(record.openai_api_key);
|
|
118
|
-
if (apiKey) {
|
|
119
|
-
const fingerprint = this.fingerprint(apiKey);
|
|
120
|
-
return {
|
|
121
|
-
kind: 'apikey',
|
|
122
|
-
email: `apikey:${fingerprint}`,
|
|
123
|
-
accountId: null,
|
|
124
|
-
planType: null,
|
|
125
|
-
userId: null,
|
|
126
|
-
};
|
|
127
|
-
}
|
|
128
|
-
return null;
|
|
129
|
-
}
|
|
130
|
-
/**
|
|
131
|
-
* A short, non-reversible label for an API key so two different keys get two
|
|
132
|
-
* different stashes without the key itself ever being written down.
|
|
133
|
-
*/
|
|
134
|
-
fingerprint(secretArg) {
|
|
135
|
-
let hash = 0x811c9dc5;
|
|
136
|
-
for (let index = 0; index < secretArg.length; index++) {
|
|
137
|
-
hash ^= secretArg.charCodeAt(index);
|
|
138
|
-
hash = Math.imul(hash, 0x01000193) >>> 0;
|
|
139
|
-
}
|
|
140
|
-
return hash.toString(16).padStart(8, '0');
|
|
149
|
+
return codexIdentityFromRaw(rawArg);
|
|
141
150
|
}
|
|
142
151
|
/** Reads the active credential, if any. */
|
|
143
152
|
readActive() {
|
|
@@ -181,4 +190,4 @@ export class CodexAuth {
|
|
|
181
190
|
}
|
|
182
191
|
}
|
|
183
192
|
}
|
|
184
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
193
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5jb2RleGF1dGguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jbGFzc2VzLmNvZGV4YXV0aC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUV4QyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDbkQsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRXpEOzs7OztHQUtHO0FBQ0gsTUFBTSxnQkFBZ0IsR0FBRyxDQUFDLFFBQWdCLEVBQWtDLEVBQUU7SUFDNUUsTUFBTSxRQUFRLEdBQUcsUUFBUSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNyQyxJQUFJLFFBQVEsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDeEIsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBQ0QsSUFBSSxDQUFDO1FBQ0gsTUFBTSxPQUFPLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEVBQUUsV0FBVyxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3ZFLE1BQU0sTUFBTSxHQUFZLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDNUMsSUFBSSxNQUFNLElBQUksT0FBTyxNQUFNLEtBQUssUUFBUSxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDO1lBQ25FLE9BQU8sTUFBaUMsQ0FBQztRQUMzQyxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBQUMsTUFBTSxDQUFDO1FBQ1AsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0FBQ0gsQ0FBQyxDQUFDO0FBRUYsTUFBTSxRQUFRLEdBQUcsQ0FBQyxRQUFpQixFQUFpQixFQUFFLENBQ3BELE9BQU8sUUFBUSxLQUFLLFFBQVEsSUFBSSxR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
|
|
@@ -19,7 +19,32 @@ export declare class CodexHarness implements IAuthHarness {
|
|
|
19
19
|
readonly autoSwitch = true;
|
|
20
20
|
constructor(switcher?: CodexSwitcher, accountStatus?: Pick<CodexAccountStatus, 'read'>, preuse?: Pick<CodexPreuse, 'run'>);
|
|
21
21
|
beginLogin(options?: IHarnessLoginOptions): Promise<import("./interfaces.harness.js").IHarnessLoginHandle>;
|
|
22
|
+
/**
|
|
23
|
+
* The harness's accounts, with the saved copy of the active login brought up to date first.
|
|
24
|
+
*
|
|
25
|
+
* A saved login is one whose stored credential is readable and belongs to the account its record names. The
|
|
26
|
+
* exact tokens are not part of that: Codex' app-server refreshes the login it runs on its own schedule, so
|
|
27
|
+
* comparing bytes reported every saved active login as unsaved from its first refresh on, and the guide then
|
|
28
|
+
* offered to save what was already saved.
|
|
29
|
+
*/
|
|
22
30
|
readState(): IHarnessState;
|
|
31
|
+
/** Whether a saved record is the record of this identity: same account, same email, same kind of login. */
|
|
32
|
+
private recordOf;
|
|
33
|
+
/**
|
|
34
|
+
* Writes the credential Codex is running on into that account's own saved record, and reports why it could
|
|
35
|
+
* not when the write failed.
|
|
36
|
+
*
|
|
37
|
+
* Codex rotates the tokens of the active login, and until now only a switch or a save wrote that rotation
|
|
38
|
+
* back -- `use()` re-saves the outgoing login, and re-selecting the active account updates its record before
|
|
39
|
+
* restoring the pairings. Every read now keeps the saved copy on the credential Codex last wrote, so the copy
|
|
40
|
+
* is one a switch can restore rather than one the service has moved past.
|
|
41
|
+
*
|
|
42
|
+
* The write goes only into the stash: Codex' own files are read, nothing is stopped or signalled, no daemon
|
|
43
|
+
* has to be down for it, and the record keeps its save time and its enrollments. A login with no saved record
|
|
44
|
+
* of its own is never saved implicitly -- `stash` is what saves a login -- and a record whose credential is
|
|
45
|
+
* missing or belongs to another account is left for `stash` to repair rather than quietly overwritten.
|
|
46
|
+
*/
|
|
47
|
+
private mirrorActiveLogin;
|
|
23
48
|
readAccountStatus(accountIdArg: string, optionsArg?: IHarnessStatusOptions): Promise<IHarnessAccountStatus>;
|
|
24
49
|
preuseAccount(accountIdArg: string, optionsArg: IHarnessPreuseOptions): Promise<IHarnessPreuseResult>;
|
|
25
50
|
private readAccountCredential;
|
|
@@ -5,6 +5,14 @@ import { PreuseError } from './preuse.js';
|
|
|
5
5
|
import { countPaired, enrollmentState } from './helpers.js';
|
|
6
6
|
import { beginSavedOpenAiLogin } from './classes.login.js';
|
|
7
7
|
import { plainText } from './formatting.js';
|
|
8
|
+
/**
|
|
9
|
+
* Why a write into the stash failed, as its system error code. The message of a filesystem error names the path
|
|
10
|
+
* it was writing, and that path leads to a credential.
|
|
11
|
+
*/
|
|
12
|
+
const writeFailureCause = (errorArg) => {
|
|
13
|
+
const code = errorArg?.code;
|
|
14
|
+
return typeof code === 'string' ? code : 'unknown cause';
|
|
15
|
+
};
|
|
8
16
|
/** Codex-specific credentials, remote-control handling and service status. */
|
|
9
17
|
export class CodexHarness {
|
|
10
18
|
switcher;
|
|
@@ -41,21 +49,28 @@ export class CodexHarness {
|
|
|
41
49
|
return { outcome: { lines: [`Saved ${plainText(identity.email)}. Select it to switch Codex.`], problems: [] }, account: { id: identity.email, label: identity.email } };
|
|
42
50
|
}, options);
|
|
43
51
|
}
|
|
52
|
+
/**
|
|
53
|
+
* The harness's accounts, with the saved copy of the active login brought up to date first.
|
|
54
|
+
*
|
|
55
|
+
* A saved login is one whose stored credential is readable and belongs to the account its record names. The
|
|
56
|
+
* exact tokens are not part of that: Codex' app-server refreshes the login it runs on its own schedule, so
|
|
57
|
+
* comparing bytes reported every saved active login as unsaved from its first refresh on, and the guide then
|
|
58
|
+
* offered to save what was already saved.
|
|
59
|
+
*/
|
|
44
60
|
readState() {
|
|
45
61
|
const active = this.switcher.readActive();
|
|
62
|
+
const mirrorFailure = this.mirrorActiveLogin(active);
|
|
46
63
|
const accounts = this.switcher.list().map((entryArg) => {
|
|
47
64
|
const raw = this.switcher.stashes.readAuth(entryArg.email);
|
|
48
|
-
const
|
|
49
|
-
const
|
|
50
|
-
const isActive = active.identity !== null && active.identity.email === entryArg.email && active.identity.accountId === entryArg.accountId && active.identity.kind === entryArg.kind;
|
|
51
|
-
const isStashed = valid && (!isActive || raw === active.raw);
|
|
65
|
+
const isStashed = this.recordOf(entryArg, raw === null ? null : this.switcher.auth.identityFromRaw(raw));
|
|
66
|
+
const isActive = this.recordOf(entryArg, active.identity);
|
|
52
67
|
return {
|
|
53
68
|
id: entryArg.email,
|
|
54
69
|
label: entryArg.email,
|
|
55
70
|
isActive,
|
|
56
71
|
isStashed,
|
|
57
72
|
savedAt: entryArg.stashedAt,
|
|
58
|
-
details: [this.formatRemoteControl(entryArg).trim(), ...(!
|
|
73
|
+
details: [this.formatRemoteControl(entryArg).trim(), ...(!isStashed ? ['saved credential missing or does not match its metadata'] : isActive && mirrorFailure !== null ? [mirrorFailure] : [])],
|
|
59
74
|
};
|
|
60
75
|
});
|
|
61
76
|
if (active.identity && !accounts.some((accountArg) => accountArg.isActive)) {
|
|
@@ -71,6 +86,44 @@ export class CodexHarness {
|
|
|
71
86
|
? 'A different Codex account with this email is already saved. The email-based Codex store cannot keep both; refusing to replace it.' : null,
|
|
72
87
|
};
|
|
73
88
|
}
|
|
89
|
+
/** Whether a saved record is the record of this identity: same account, same email, same kind of login. */
|
|
90
|
+
recordOf(entryArg, identityArg) {
|
|
91
|
+
return identityArg !== null && entryArg.email === identityArg.email && entryArg.accountId === identityArg.accountId && entryArg.kind === identityArg.kind;
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* Writes the credential Codex is running on into that account's own saved record, and reports why it could
|
|
95
|
+
* not when the write failed.
|
|
96
|
+
*
|
|
97
|
+
* Codex rotates the tokens of the active login, and until now only a switch or a save wrote that rotation
|
|
98
|
+
* back -- `use()` re-saves the outgoing login, and re-selecting the active account updates its record before
|
|
99
|
+
* restoring the pairings. Every read now keeps the saved copy on the credential Codex last wrote, so the copy
|
|
100
|
+
* is one a switch can restore rather than one the service has moved past.
|
|
101
|
+
*
|
|
102
|
+
* The write goes only into the stash: Codex' own files are read, nothing is stopped or signalled, no daemon
|
|
103
|
+
* has to be down for it, and the record keeps its save time and its enrollments. A login with no saved record
|
|
104
|
+
* of its own is never saved implicitly -- `stash` is what saves a login -- and a record whose credential is
|
|
105
|
+
* missing or belongs to another account is left for `stash` to repair rather than quietly overwritten.
|
|
106
|
+
*/
|
|
107
|
+
mirrorActiveLogin(activeArg) {
|
|
108
|
+
if (activeArg.source !== 'file' || activeArg.identity === null || activeArg.raw === null)
|
|
109
|
+
return null;
|
|
110
|
+
const email = activeArg.identity.email;
|
|
111
|
+
const saved = this.switcher.stashes.readAuth(email);
|
|
112
|
+
if (saved === null || saved === activeArg.raw)
|
|
113
|
+
return null;
|
|
114
|
+
const meta = this.switcher.stashes.readMeta(email);
|
|
115
|
+
if (meta === null || !this.recordOf(meta, activeArg.identity) || !this.recordOf(meta, this.switcher.auth.identityFromRaw(saved)))
|
|
116
|
+
return null;
|
|
117
|
+
try {
|
|
118
|
+
this.switcher.stashes.replaceAuth(email, activeArg.raw);
|
|
119
|
+
return null;
|
|
120
|
+
}
|
|
121
|
+
catch (errorArg) {
|
|
122
|
+
// A saved copy that could not be brought up to date is no reason to fail a read: the record still holds a
|
|
123
|
+
// credential of this account, and the next read tries again.
|
|
124
|
+
return `the current login could not be copied into its saved record (${writeFailureCause(errorArg)}); the record still holds the credential from the last save`;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
74
127
|
async readAccountStatus(accountIdArg, optionsArg) {
|
|
75
128
|
const credential = this.readAccountCredential(accountIdArg);
|
|
76
129
|
if (!credential)
|
|
@@ -200,4 +253,4 @@ export class CodexHarness {
|
|
|
200
253
|
return { lines, problems: [] };
|
|
201
254
|
}
|
|
202
255
|
}
|
|
203
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.codexharness.js","sourceRoot":"","sources":["../ts/classes.codexharness.ts"],"names":[],"mappings":"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"}
|
|
256
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.codexharness.js","sourceRoot":"","sources":["../ts/classes.codexharness.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,16 @@ export declare class StashStore {
|
|
|
30
30
|
* verify with `readBack()` before destroying the original.
|
|
31
31
|
*/
|
|
32
32
|
write(identityArg: ICodexIdentity, rawAuthArg: string, enrollmentsArg: IRemoteControlEnrollment[], codexHomeArg: string): IStashEntry;
|
|
33
|
+
/**
|
|
34
|
+
* Replaces the credential of an existing stash and leaves its metadata exactly as it is.
|
|
35
|
+
*
|
|
36
|
+
* Codex refreshes the login it is running on its own schedule, so a saved copy of that login holds older
|
|
37
|
+
* tokens until something writes the rotation back. Doing so is an update of one account's credential, not a
|
|
38
|
+
* new save: the record keeps its account, its enrollments and the moment it was saved, which `write()` would
|
|
39
|
+
* stamp anew. The credential must belong to the account the metadata names -- the same guard `write()`
|
|
40
|
+
* applies -- so a mirror can never move one account's login into another account's record.
|
|
41
|
+
*/
|
|
42
|
+
replaceAuth(emailArg: string, rawAuthArg: string): void;
|
|
33
43
|
/**
|
|
34
44
|
* Reads a stash back and confirms it matches what was meant to be written.
|
|
35
45
|
* Callers use this before clearing the active credential, so a stash is only
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import { writeSecretFileAtomically } from './helpers.js';
|
|
3
|
+
import { codexIdentityFromRaw } from './classes.codexauth.js';
|
|
3
4
|
const AUTH_FILE_NAME = 'auth.json';
|
|
4
5
|
const META_FILE_NAME = 'stash.json';
|
|
5
6
|
/**
|
|
@@ -80,6 +81,26 @@ export class StashStore {
|
|
|
80
81
|
writeSecretFileAtomically(plugins.path.join(dir, META_FILE_NAME), `${JSON.stringify(entry, null, 2)}\n`);
|
|
81
82
|
return entry;
|
|
82
83
|
}
|
|
84
|
+
/**
|
|
85
|
+
* Replaces the credential of an existing stash and leaves its metadata exactly as it is.
|
|
86
|
+
*
|
|
87
|
+
* Codex refreshes the login it is running on its own schedule, so a saved copy of that login holds older
|
|
88
|
+
* tokens until something writes the rotation back. Doing so is an update of one account's credential, not a
|
|
89
|
+
* new save: the record keeps its account, its enrollments and the moment it was saved, which `write()` would
|
|
90
|
+
* stamp anew. The credential must belong to the account the metadata names -- the same guard `write()`
|
|
91
|
+
* applies -- so a mirror can never move one account's login into another account's record.
|
|
92
|
+
*/
|
|
93
|
+
replaceAuth(emailArg, rawAuthArg) {
|
|
94
|
+
const meta = this.readMeta(emailArg);
|
|
95
|
+
if (!meta) {
|
|
96
|
+
throw new Error(`no stash for "${emailArg}" whose credential could be replaced`);
|
|
97
|
+
}
|
|
98
|
+
const identity = codexIdentityFromRaw(rawAuthArg);
|
|
99
|
+
if (!identity || identity.email !== meta.email || identity.accountId !== meta.accountId || identity.kind !== meta.kind) {
|
|
100
|
+
throw new Error('the credential does not belong to the account this stash holds; refusing to replace it');
|
|
101
|
+
}
|
|
102
|
+
writeSecretFileAtomically(plugins.path.join(this.entryDir(emailArg), AUTH_FILE_NAME), rawAuthArg);
|
|
103
|
+
}
|
|
83
104
|
/**
|
|
84
105
|
* Reads a stash back and confirms it matches what was meant to be written.
|
|
85
106
|
* Callers use this before clearing the active credential, so a stash is only
|
|
@@ -189,4 +210,4 @@ export class StashStore {
|
|
|
189
210
|
return true;
|
|
190
211
|
}
|
|
191
212
|
}
|
|
192
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
213
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.stashstore.js","sourceRoot":"","sources":["../ts/classes.stashstore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAOxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,cAAc,GAAG,WAAW,CAAC;AACnC,MAAM,cAAc,GAAG,YAAY,CAAC;AAEpC;;;;;;;;GAQG;AACH,MAAM,OAAO,UAAU;IACL,OAAO,CAAS;IAChB,OAAO,CAAe;IAEtC,YAAY,UAAwB,EAAE,UAAmB;QACvD,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC;QAC1B,MAAM,IAAI,GACR,UAAU;YACV,OAAO,CAAC,GAAG,CAAC,eAAe;YAC3B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,aAAa,CAAC,CAAC;QACzD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACrD,CAAC;IAED;;;OAGG;IACI,OAAO,CAAC,QAAgB;QAC7B,MAAM,IAAI,GAAG,QAAQ;aAClB,WAAW,EAAE;aACb,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC;aAChC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;QACjC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,oCAAoC,QAAQ,GAAG,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,QAAQ,CAAC,QAAgB;QAC9B,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjE,CAAC;IAEM,GAAG,CAAC,QAAgB;QACzB,OAAO,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC;IAC3F,CAAC;IAED;;;;;;;;;OASG;IACI,KAAK,CACV,WAA2B,EAC3B,UAAkB,EAClB,cAA0C,EAC1C,YAAoB;QAEpB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,KAAK,KAAK,WAAW,CAAC,KAAK,IAAI,QAAQ,CAAC,SAAS,KAAK,WAAW,CAAC,SAAS,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7I,MAAM,IAAI,KAAK,CAAC,uGAAuG,CAAC,CAAC;QAC3H,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC7C,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACrE,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5D,0EAA0E;QAC1E,0DAA0D;QAC1D,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC1C,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAEjC,MAAM,KAAK,GAAgB;YACzB,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnC,SAAS,EAAE,YAAY;YACvB,WAAW,EAAE,cAAc;SAC5B,CAAC;QAEF,yBAAyB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,EAAE,UAAU,CAAC,CAAC;QAC9E,yBAAyB,CACvB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,EACtC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CACtC,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;;;OAQG;IACI,WAAW,CAAC,QAAgB,EAAE,UAAkB;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,iBAAiB,QAAQ,sCAAsC,CAAC,CAAC;QACnF,CAAC;QACD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAClD,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,QAAQ,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;YACvH,MAAM,IAAI,KAAK,CAAC,wFAAwF,CAAC,CAAC;QAC5G,CAAC;QACD,yBAAyB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC,EAAE,UAAU,CAAC,CAAC;IACpG,CAAC;IAED;;;;OAIG;IACI,QAAQ,CAAC,QAAgB,EAAE,eAAuB;QACvD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrC,OAAO,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,eAAe,CAAC;IACnD,CAAC;IAEM,QAAQ,CAAC,QAAgB;QAC9B,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC,CAAC;QAC5E,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAgB,CAAC;QAC9E,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAEM,QAAQ,CAAC,QAAgB;QAC9B,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC,CAAC;QAC5E,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACnD,CAAC;IAED,gFAAgF;IACzE,IAAI;QACT,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACzC,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,OAAO,GAAkB,EAAE,CAAC;QAClC,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3D,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;YAC1E,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACrC,SAAS;YACX,CAAC;YACD,IAAI,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAgB,CAAC,CAAC;YACrF,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS;YACX,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IAClG,CAAC;IAED;;;;OAIG;IACI,UAAU;QACf,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACzC,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7D,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACrD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;gBAC5C,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,OAAO,GAAG,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC;YAC9E,MAAM,OAAO,GAAG,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC;YAC9E,OAAO,OAAO,IAAI,CAAC,OAAO,CAAC;QAC7B,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;OAOG;IACI,OAAO,CAAC,YAAoB;QACjC,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAExB,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC;QAC9E,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;QAChC,CAAC;QACD,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,CAAC;QAC/E,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;QACjC,CAAC;QACD,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAC5B,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,MAAM,CACpE,CAAC;QACF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QACzC,CAAC;QACD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,OAAO,EAAE,UAAU,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACvE,CAAC;QACD,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3F,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QACtC,CAAC;QACD,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IACpE,CAAC;IAEM,MAAM,CAAC,QAAgB;QAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -32,10 +32,11 @@ control, or remove a saved account. The guide shows the current account and retu
|
|
|
32
32
|
to the menu after each successful action; choose **Back** in a submenu or **Exit** to finish.
|
|
33
33
|
|
|
34
34
|
Before showing the actions, the guide checks whether the current credential has a
|
|
35
|
-
|
|
36
|
-
while keeping it active
|
|
37
|
-
|
|
38
|
-
automatically through the harness
|
|
35
|
+
readable saved copy of its own account. A login without one gets an offer to save it
|
|
36
|
+
while keeping it active; a login its harness merely refreshed is already saved. The
|
|
37
|
+
switch action checks again before offering targets; declining that save cancels the
|
|
38
|
+
switch. Scripts still preserve the outgoing login automatically through the harness
|
|
39
|
+
adapter.
|
|
39
40
|
|
|
40
41
|
When saving, choose whether to keep the account active or clear the active login so
|
|
41
42
|
you can run `codex login` for another account. Removing a saved account requires
|
|
@@ -302,6 +303,19 @@ saved implicitly; `stash` is what saves a login. An installation whose native lo
|
|
|
302
303
|
authswitch cannot read mirrors nothing, and a read waits at most a second for a lock a
|
|
303
304
|
switch or Claude Code holds before leaving the saved copy to the next read.
|
|
304
305
|
|
|
306
|
+
Codex is mirrored the same way, for the same reason: its app-server refreshes the login it
|
|
307
|
+
runs on its own schedule, so the saved copy of that login held older tokens between
|
|
308
|
+
switches -- and, because a saved login used to mean the *exact* credential in
|
|
309
|
+
`~/.codex/auth.json`, an account read as unsaved from its first refresh on and the guide
|
|
310
|
+
offered to save what was already saved. A saved Codex login is now one whose stored
|
|
311
|
+
credential belongs to the account its record names, and reading the accounts writes the
|
|
312
|
+
refreshed credential into that record. Only the saved copy is written: `~/.codex/auth.json`
|
|
313
|
+
is read, no app-server is stopped or signalled for it, and the record keeps its account,
|
|
314
|
+
its remote-control enrollments and its save time. A login with no saved record of its own,
|
|
315
|
+
a record whose credential is missing, and a record that belongs to another Codex account
|
|
316
|
+
with the same email are all left alone; `stash` is what saves or repairs those. A copy that
|
|
317
|
+
could not be written says so beside the account and is tried again on the next read.
|
|
318
|
+
|
|
305
319
|
An account the service has put **on hold** is not a dead login: the hold refuses the grant
|
|
306
320
|
while it lasts and the same login works again once it is lifted, so such an account keeps
|
|
307
321
|
its stored plan, says that it is on hold and where to appeal, and is asked again on the
|
|
@@ -820,9 +834,10 @@ unsaved current login adds how to keep it (`authswitch <harness> stash --keep sa
|
|
|
820
834
|
it`).
|
|
821
835
|
|
|
822
836
|
`authswitch <harness> current` prints the same sentence. The same account with a
|
|
823
|
-
rotated token is that account refreshing itself and is not reported; for Claude Code
|
|
824
|
-
rotation is copied into that account's saved record
|
|
825
|
-
check against the file's current contents
|
|
837
|
+
rotated token is that account refreshing itself and is not reported; for Claude Code and
|
|
838
|
+
Codex the rotation is copied into that account's saved record. Re-running the switch
|
|
839
|
+
re-arms the Claude Code and OpenCode check against the file's current contents; Codex has
|
|
840
|
+
no such check.
|
|
826
841
|
|
|
827
842
|
Both commands accept a harness qualifier (`authswitch claude limits`) and `--json`.
|
|
828
843
|
Neither changes which account is in use: they never activate, switch or clear a login and
|
|
@@ -895,7 +910,9 @@ another workspace's default entry cannot supply its billing information.
|
|
|
895
910
|
Each request uses that account's access token and account ID. For the active
|
|
896
911
|
account it reads the current credential, which may be newer than the stash.
|
|
897
912
|
Listing never switches accounts, starts or stops an app-server, refreshes tokens,
|
|
898
|
-
writes
|
|
913
|
+
writes `~/.codex/auth.json`, stores status results, or consumes an earned reset. The one
|
|
914
|
+
write it makes is the saved copy of the active login, brought onto the credential Codex is
|
|
915
|
+
running on as described above.
|
|
899
916
|
|
|
900
917
|
These backend contracts come from Codex's source and can change. Missing fields,
|
|
901
918
|
expired logins, denied requests, timeouts, and unsupported responses are shown
|
|
@@ -940,6 +957,9 @@ process.exitCode = await cli.run(process.argv.slice(2));
|
|
|
940
957
|
Each adapter owns discovery, identity matching, save verification, credential
|
|
941
958
|
storage, switching and process lifecycle, live status APIs, and diagnostics.
|
|
942
959
|
`readState()` and `readAccountStatus()` must never activate, switch or clear a login.
|
|
960
|
+
`readState()` may bring the saved copy of the active login onto the credential that login's
|
|
961
|
+
harness last wrote -- the Claude Code and Codex adapters do, because both harnesses rotate
|
|
962
|
+
the login they run -- and must write nothing else.
|
|
943
963
|
`readAccountStatus()` may renew the tokens of the saved copy it is reading, when the provider
|
|
944
964
|
gives it no other way to answer (the Claude Code adapter does, under the store's lock, for
|
|
945
965
|
saved and inactive logins only); it must never touch the active login's credential. `readAccountStatus(accountId,
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/classes.codexauth.ts
CHANGED
|
@@ -56,6 +56,90 @@ const findFirstJwt = (valueArg: unknown, depthArg = 0): string | null => {
|
|
|
56
56
|
return null;
|
|
57
57
|
};
|
|
58
58
|
|
|
59
|
+
/**
|
|
60
|
+
* A short, non-reversible label for an API key so two different keys get two
|
|
61
|
+
* different stashes without the key itself ever being written down.
|
|
62
|
+
*/
|
|
63
|
+
const fingerprint = (secretArg: string): string => {
|
|
64
|
+
let hash = 0x811c9dc5;
|
|
65
|
+
for (let index = 0; index < secretArg.length; index++) {
|
|
66
|
+
hash ^= secretArg.charCodeAt(index);
|
|
67
|
+
hash = Math.imul(hash, 0x01000193) >>> 0;
|
|
68
|
+
}
|
|
69
|
+
return hash.toString(16).padStart(8, '0');
|
|
70
|
+
};
|
|
71
|
+
|
|
72
|
+
/**
|
|
73
|
+
* Extracts the account identity from the content of an auth.json.
|
|
74
|
+
* Returns null when the content holds no recognisable credential.
|
|
75
|
+
*
|
|
76
|
+
* It stands outside the class because the stash store keys and guards its entries by the same identity and has
|
|
77
|
+
* no Codex installation to read: the credential itself is all this derivation needs.
|
|
78
|
+
*/
|
|
79
|
+
export const codexIdentityFromRaw = (rawArg: string): ICodexIdentity | null => {
|
|
80
|
+
let parsed: unknown;
|
|
81
|
+
try {
|
|
82
|
+
parsed = JSON.parse(rawArg);
|
|
83
|
+
} catch {
|
|
84
|
+
return null;
|
|
85
|
+
}
|
|
86
|
+
if (!parsed || typeof parsed !== 'object') {
|
|
87
|
+
return null;
|
|
88
|
+
}
|
|
89
|
+
const record = parsed as Record<string, unknown>;
|
|
90
|
+
|
|
91
|
+
const tokens = (record.tokens ?? null) as Record<string, unknown> | null;
|
|
92
|
+
const idToken =
|
|
93
|
+
(tokens ? asString(tokens.id_token) : null) ?? findFirstJwt(record);
|
|
94
|
+
|
|
95
|
+
if (idToken) {
|
|
96
|
+
const claims = decodeJwtPayload(idToken) ?? {};
|
|
97
|
+
const authClaim = (claims['https://api.openai.com/auth'] ?? {}) as Record<string, unknown>;
|
|
98
|
+
const profileClaim = (claims['https://api.openai.com/profile'] ?? {}) as Record<string, unknown>;
|
|
99
|
+
const email =
|
|
100
|
+
asString(claims.email) ??
|
|
101
|
+
asString(profileClaim.email) ??
|
|
102
|
+
asString(authClaim.user_email);
|
|
103
|
+
const accountId =
|
|
104
|
+
asString(authClaim.chatgpt_account_id) ??
|
|
105
|
+
(tokens ? asString(tokens.account_id) : null) ??
|
|
106
|
+
asString(record.account_id);
|
|
107
|
+
if (email) {
|
|
108
|
+
return {
|
|
109
|
+
kind: 'chatgpt',
|
|
110
|
+
email: email.toLowerCase(),
|
|
111
|
+
accountId,
|
|
112
|
+
planType: asString(authClaim.chatgpt_plan_type),
|
|
113
|
+
userId: asString(authClaim.user_id) ?? asString(claims.sub),
|
|
114
|
+
};
|
|
115
|
+
}
|
|
116
|
+
if (accountId) {
|
|
117
|
+
// An OAuth credential we cannot label by email is still worth stashing;
|
|
118
|
+
// key it by account id so it round-trips instead of being silently dropped.
|
|
119
|
+
return {
|
|
120
|
+
kind: 'chatgpt',
|
|
121
|
+
email: `account:${accountId}`,
|
|
122
|
+
accountId,
|
|
123
|
+
planType: asString(authClaim.chatgpt_plan_type),
|
|
124
|
+
userId: asString(authClaim.user_id) ?? asString(claims.sub),
|
|
125
|
+
};
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
const apiKey = asString(record.OPENAI_API_KEY) ?? asString(record.openai_api_key);
|
|
130
|
+
if (apiKey) {
|
|
131
|
+
return {
|
|
132
|
+
kind: 'apikey',
|
|
133
|
+
email: `apikey:${fingerprint(apiKey)}`,
|
|
134
|
+
accountId: null,
|
|
135
|
+
planType: null,
|
|
136
|
+
userId: null,
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
return null;
|
|
141
|
+
};
|
|
142
|
+
|
|
59
143
|
/**
|
|
60
144
|
* Reads, writes and clears the Codex file credential store, and derives the
|
|
61
145
|
* account identity used to key a stash.
|
|
@@ -75,81 +159,7 @@ export class CodexAuth {
|
|
|
75
159
|
* Returns null when the file holds no recognisable credential.
|
|
76
160
|
*/
|
|
77
161
|
public identityFromRaw(rawArg: string): ICodexIdentity | null {
|
|
78
|
-
|
|
79
|
-
try {
|
|
80
|
-
parsed = JSON.parse(rawArg);
|
|
81
|
-
} catch {
|
|
82
|
-
return null;
|
|
83
|
-
}
|
|
84
|
-
if (!parsed || typeof parsed !== 'object') {
|
|
85
|
-
return null;
|
|
86
|
-
}
|
|
87
|
-
const record = parsed as Record<string, unknown>;
|
|
88
|
-
|
|
89
|
-
const tokens = (record.tokens ?? null) as Record<string, unknown> | null;
|
|
90
|
-
const idToken =
|
|
91
|
-
(tokens ? asString(tokens.id_token) : null) ?? findFirstJwt(record);
|
|
92
|
-
|
|
93
|
-
if (idToken) {
|
|
94
|
-
const claims = decodeJwtPayload(idToken) ?? {};
|
|
95
|
-
const authClaim = (claims['https://api.openai.com/auth'] ?? {}) as Record<string, unknown>;
|
|
96
|
-
const profileClaim = (claims['https://api.openai.com/profile'] ?? {}) as Record<string, unknown>;
|
|
97
|
-
const email =
|
|
98
|
-
asString(claims.email) ??
|
|
99
|
-
asString(profileClaim.email) ??
|
|
100
|
-
asString(authClaim.user_email);
|
|
101
|
-
const accountId =
|
|
102
|
-
asString(authClaim.chatgpt_account_id) ??
|
|
103
|
-
(tokens ? asString(tokens.account_id) : null) ??
|
|
104
|
-
asString(record.account_id);
|
|
105
|
-
if (email) {
|
|
106
|
-
return {
|
|
107
|
-
kind: 'chatgpt',
|
|
108
|
-
email: email.toLowerCase(),
|
|
109
|
-
accountId,
|
|
110
|
-
planType: asString(authClaim.chatgpt_plan_type),
|
|
111
|
-
userId: asString(authClaim.user_id) ?? asString(claims.sub),
|
|
112
|
-
};
|
|
113
|
-
}
|
|
114
|
-
if (accountId) {
|
|
115
|
-
// An OAuth credential we cannot label by email is still worth stashing;
|
|
116
|
-
// key it by account id so it round-trips instead of being silently dropped.
|
|
117
|
-
return {
|
|
118
|
-
kind: 'chatgpt',
|
|
119
|
-
email: `account:${accountId}`,
|
|
120
|
-
accountId,
|
|
121
|
-
planType: asString(authClaim.chatgpt_plan_type),
|
|
122
|
-
userId: asString(authClaim.user_id) ?? asString(claims.sub),
|
|
123
|
-
};
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
const apiKey = asString(record.OPENAI_API_KEY) ?? asString(record.openai_api_key);
|
|
128
|
-
if (apiKey) {
|
|
129
|
-
const fingerprint = this.fingerprint(apiKey);
|
|
130
|
-
return {
|
|
131
|
-
kind: 'apikey',
|
|
132
|
-
email: `apikey:${fingerprint}`,
|
|
133
|
-
accountId: null,
|
|
134
|
-
planType: null,
|
|
135
|
-
userId: null,
|
|
136
|
-
};
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
return null;
|
|
140
|
-
}
|
|
141
|
-
|
|
142
|
-
/**
|
|
143
|
-
* A short, non-reversible label for an API key so two different keys get two
|
|
144
|
-
* different stashes without the key itself ever being written down.
|
|
145
|
-
*/
|
|
146
|
-
private fingerprint(secretArg: string): string {
|
|
147
|
-
let hash = 0x811c9dc5;
|
|
148
|
-
for (let index = 0; index < secretArg.length; index++) {
|
|
149
|
-
hash ^= secretArg.charCodeAt(index);
|
|
150
|
-
hash = Math.imul(hash, 0x01000193) >>> 0;
|
|
151
|
-
}
|
|
152
|
-
return hash.toString(16).padStart(8, '0');
|
|
162
|
+
return codexIdentityFromRaw(rawArg);
|
|
153
163
|
}
|
|
154
164
|
|
|
155
165
|
/** Reads the active credential, if any. */
|
|
@@ -3,12 +3,21 @@ import { CodexAccountStatus } from './classes.codexstatus.js';
|
|
|
3
3
|
import { CodexPreuse } from './classes.codexpreuse.js';
|
|
4
4
|
import { PreuseError } from './preuse.js';
|
|
5
5
|
import type { IAuthHarness, IHarnessAccount, IHarnessAccountStatus, IHarnessOutcome, IHarnessState, IHarnessPreuseOptions, IHarnessPreuseResult, IHarnessStatusOptions } from './interfaces.harness.js';
|
|
6
|
-
import type { IStashListing } from './interfaces.js';
|
|
6
|
+
import type { IActiveAuth, ICodexIdentity, IStashEntry, IStashListing } from './interfaces.js';
|
|
7
7
|
import { countPaired, enrollmentState } from './helpers.js';
|
|
8
8
|
import { beginSavedOpenAiLogin } from './classes.login.js';
|
|
9
9
|
import { plainText } from './formatting.js';
|
|
10
10
|
import type { IHarnessLoginOptions, IHarnessLoginProvider } from './interfaces.harness.js';
|
|
11
11
|
|
|
12
|
+
/**
|
|
13
|
+
* Why a write into the stash failed, as its system error code. The message of a filesystem error names the path
|
|
14
|
+
* it was writing, and that path leads to a credential.
|
|
15
|
+
*/
|
|
16
|
+
const writeFailureCause = (errorArg: unknown): string => {
|
|
17
|
+
const code = (errorArg as { code?: unknown } | null)?.code;
|
|
18
|
+
return typeof code === 'string' ? code : 'unknown cause';
|
|
19
|
+
};
|
|
20
|
+
|
|
12
21
|
/** Codex-specific credentials, remote-control handling and service status. */
|
|
13
22
|
export class CodexHarness implements IAuthHarness {
|
|
14
23
|
public readonly id = 'codex';
|
|
@@ -43,21 +52,28 @@ export class CodexHarness implements IAuthHarness {
|
|
|
43
52
|
}, options);
|
|
44
53
|
}
|
|
45
54
|
|
|
55
|
+
/**
|
|
56
|
+
* The harness's accounts, with the saved copy of the active login brought up to date first.
|
|
57
|
+
*
|
|
58
|
+
* A saved login is one whose stored credential is readable and belongs to the account its record names. The
|
|
59
|
+
* exact tokens are not part of that: Codex' app-server refreshes the login it runs on its own schedule, so
|
|
60
|
+
* comparing bytes reported every saved active login as unsaved from its first refresh on, and the guide then
|
|
61
|
+
* offered to save what was already saved.
|
|
62
|
+
*/
|
|
46
63
|
public readState(): IHarnessState {
|
|
47
64
|
const active = this.switcher.readActive();
|
|
65
|
+
const mirrorFailure = this.mirrorActiveLogin(active);
|
|
48
66
|
const accounts: IHarnessAccount[] = this.switcher.list().map((entryArg) => {
|
|
49
67
|
const raw = this.switcher.stashes.readAuth(entryArg.email);
|
|
50
|
-
const
|
|
51
|
-
const
|
|
52
|
-
const isActive = active.identity !== null && active.identity.email === entryArg.email && active.identity.accountId === entryArg.accountId && active.identity.kind === entryArg.kind;
|
|
53
|
-
const isStashed = valid && (!isActive || raw === active.raw);
|
|
68
|
+
const isStashed = this.recordOf(entryArg, raw === null ? null : this.switcher.auth.identityFromRaw(raw));
|
|
69
|
+
const isActive = this.recordOf(entryArg, active.identity);
|
|
54
70
|
return {
|
|
55
71
|
id: entryArg.email,
|
|
56
72
|
label: entryArg.email,
|
|
57
73
|
isActive,
|
|
58
74
|
isStashed,
|
|
59
75
|
savedAt: entryArg.stashedAt,
|
|
60
|
-
details: [this.formatRemoteControl(entryArg).trim(), ...(!
|
|
76
|
+
details: [this.formatRemoteControl(entryArg).trim(), ...(!isStashed ? ['saved credential missing or does not match its metadata'] : isActive && mirrorFailure !== null ? [mirrorFailure] : [])],
|
|
61
77
|
};
|
|
62
78
|
});
|
|
63
79
|
if (active.identity && !accounts.some((accountArg) => accountArg.isActive)) {
|
|
@@ -74,6 +90,42 @@ export class CodexHarness implements IAuthHarness {
|
|
|
74
90
|
};
|
|
75
91
|
}
|
|
76
92
|
|
|
93
|
+
/** Whether a saved record is the record of this identity: same account, same email, same kind of login. */
|
|
94
|
+
private recordOf(entryArg: IStashEntry, identityArg: ICodexIdentity | null): boolean {
|
|
95
|
+
return identityArg !== null && entryArg.email === identityArg.email && entryArg.accountId === identityArg.accountId && entryArg.kind === identityArg.kind;
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
/**
|
|
99
|
+
* Writes the credential Codex is running on into that account's own saved record, and reports why it could
|
|
100
|
+
* not when the write failed.
|
|
101
|
+
*
|
|
102
|
+
* Codex rotates the tokens of the active login, and until now only a switch or a save wrote that rotation
|
|
103
|
+
* back -- `use()` re-saves the outgoing login, and re-selecting the active account updates its record before
|
|
104
|
+
* restoring the pairings. Every read now keeps the saved copy on the credential Codex last wrote, so the copy
|
|
105
|
+
* is one a switch can restore rather than one the service has moved past.
|
|
106
|
+
*
|
|
107
|
+
* The write goes only into the stash: Codex' own files are read, nothing is stopped or signalled, no daemon
|
|
108
|
+
* has to be down for it, and the record keeps its save time and its enrollments. A login with no saved record
|
|
109
|
+
* of its own is never saved implicitly -- `stash` is what saves a login -- and a record whose credential is
|
|
110
|
+
* missing or belongs to another account is left for `stash` to repair rather than quietly overwritten.
|
|
111
|
+
*/
|
|
112
|
+
private mirrorActiveLogin(activeArg: IActiveAuth): string | null {
|
|
113
|
+
if (activeArg.source !== 'file' || activeArg.identity === null || activeArg.raw === null) return null;
|
|
114
|
+
const email = activeArg.identity.email;
|
|
115
|
+
const saved = this.switcher.stashes.readAuth(email);
|
|
116
|
+
if (saved === null || saved === activeArg.raw) return null;
|
|
117
|
+
const meta = this.switcher.stashes.readMeta(email);
|
|
118
|
+
if (meta === null || !this.recordOf(meta, activeArg.identity) || !this.recordOf(meta, this.switcher.auth.identityFromRaw(saved))) return null;
|
|
119
|
+
try {
|
|
120
|
+
this.switcher.stashes.replaceAuth(email, activeArg.raw);
|
|
121
|
+
return null;
|
|
122
|
+
} catch (errorArg) {
|
|
123
|
+
// A saved copy that could not be brought up to date is no reason to fail a read: the record still holds a
|
|
124
|
+
// credential of this account, and the next read tries again.
|
|
125
|
+
return `the current login could not be copied into its saved record (${writeFailureCause(errorArg)}); the record still holds the credential from the last save`;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
|
|
77
129
|
public async readAccountStatus(accountIdArg: string, optionsArg?: IHarnessStatusOptions): Promise<IHarnessAccountStatus> {
|
|
78
130
|
const credential = this.readAccountCredential(accountIdArg);
|
|
79
131
|
if (!credential) return { facts: [], problems: ['No matching credential is available for status lookup.'] };
|
package/ts/classes.stashstore.ts
CHANGED
|
@@ -6,6 +6,7 @@ import type {
|
|
|
6
6
|
THarnessName,
|
|
7
7
|
} from './interfaces.js';
|
|
8
8
|
import { writeSecretFileAtomically } from './helpers.js';
|
|
9
|
+
import { codexIdentityFromRaw } from './classes.codexauth.js';
|
|
9
10
|
|
|
10
11
|
const AUTH_FILE_NAME = 'auth.json';
|
|
11
12
|
const META_FILE_NAME = 'stash.json';
|
|
@@ -105,6 +106,27 @@ export class StashStore {
|
|
|
105
106
|
return entry;
|
|
106
107
|
}
|
|
107
108
|
|
|
109
|
+
/**
|
|
110
|
+
* Replaces the credential of an existing stash and leaves its metadata exactly as it is.
|
|
111
|
+
*
|
|
112
|
+
* Codex refreshes the login it is running on its own schedule, so a saved copy of that login holds older
|
|
113
|
+
* tokens until something writes the rotation back. Doing so is an update of one account's credential, not a
|
|
114
|
+
* new save: the record keeps its account, its enrollments and the moment it was saved, which `write()` would
|
|
115
|
+
* stamp anew. The credential must belong to the account the metadata names -- the same guard `write()`
|
|
116
|
+
* applies -- so a mirror can never move one account's login into another account's record.
|
|
117
|
+
*/
|
|
118
|
+
public replaceAuth(emailArg: string, rawAuthArg: string): void {
|
|
119
|
+
const meta = this.readMeta(emailArg);
|
|
120
|
+
if (!meta) {
|
|
121
|
+
throw new Error(`no stash for "${emailArg}" whose credential could be replaced`);
|
|
122
|
+
}
|
|
123
|
+
const identity = codexIdentityFromRaw(rawAuthArg);
|
|
124
|
+
if (!identity || identity.email !== meta.email || identity.accountId !== meta.accountId || identity.kind !== meta.kind) {
|
|
125
|
+
throw new Error('the credential does not belong to the account this stash holds; refusing to replace it');
|
|
126
|
+
}
|
|
127
|
+
writeSecretFileAtomically(plugins.path.join(this.entryDir(emailArg), AUTH_FILE_NAME), rawAuthArg);
|
|
128
|
+
}
|
|
129
|
+
|
|
108
130
|
/**
|
|
109
131
|
* Reads a stash back and confirms it matches what was meant to be written.
|
|
110
132
|
* Callers use this before clearing the active credential, so a stash is only
|