@modelprofile.com/authswitch 2.1.3 → 2.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.claudecodeharness.d.ts +3 -1
- package/dist_ts/classes.claudecodeharness.js +5 -3
- package/dist_ts/classes.credentialstore.d.ts +8 -1
- package/dist_ts/classes.credentialstore.js +24 -8
- package/dist_ts/classes.fileharness.d.ts +14 -0
- package/dist_ts/classes.fileharness.js +36 -3
- package/dist_ts/classes.opencodeharness.d.ts +2 -0
- package/dist_ts/classes.opencodeharness.js +4 -2
- package/dist_ts/helpers.d.ts +9 -0
- package/dist_ts/helpers.js +12 -1
- package/package.json +2 -3
- package/readme.md +10 -3
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.claudecodeharness.ts +4 -2
- package/ts/classes.credentialstore.ts +19 -7
- package/ts/classes.fileharness.ts +32 -2
- package/ts/classes.opencodeharness.ts +3 -1
- package/ts/helpers.ts +12 -0
- package/.smartconfig.json +0 -34
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@modelprofile.com/authswitch',
|
|
6
|
-
version: '2.
|
|
6
|
+
version: '2.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=
|
|
@@ -16,7 +16,7 @@ export interface IClaudeCodeHarnessOptions {
|
|
|
16
16
|
export declare class ClaudeCodeHarness extends FileHarness {
|
|
17
17
|
readonly id = "claude";
|
|
18
18
|
readonly label = "Claude Code";
|
|
19
|
-
readonly loginHint = "Log in using claude auth login,
|
|
19
|
+
readonly loginHint = "Log in using claude auth login, then authswitch claude stash --keep; Claude Code may stay running.";
|
|
20
20
|
protected readonly store: CredentialStore;
|
|
21
21
|
private readonly file;
|
|
22
22
|
private readonly configFile;
|
|
@@ -27,6 +27,8 @@ export declare class ClaudeCodeHarness extends FileHarness {
|
|
|
27
27
|
private readonly settingsFiles;
|
|
28
28
|
constructor(options?: IClaudeCodeHarnessOptions);
|
|
29
29
|
protected beforeMutation(): void;
|
|
30
|
+
/** One record holds the credential and its matching metadata, so both files must be proven stable. */
|
|
31
|
+
protected nativeSources(): (string | null)[];
|
|
30
32
|
protected inspect(credential: Record<string, unknown>, slotId: string): IFileAccount;
|
|
31
33
|
protected snapshot(): IFileHarnessSnapshot;
|
|
32
34
|
protected apply(_slotId: string, previous: IFileAccount | undefined, target: IFileAccount | undefined): void;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import { FileHarness } from './classes.fileharness.js';
|
|
3
|
-
import { CredentialStore, credentialRecord, credentialText, readCredentialDocument, requireHarnessStopped } from './classes.credentialstore.js';
|
|
3
|
+
import { CredentialStore, credentialRecord, credentialText, readCredentialDocument, readCredentialRaw, requireHarnessStopped } from './classes.credentialstore.js';
|
|
4
4
|
import { ClaudeAccountStatus } from './classes.claudestatus.js';
|
|
5
5
|
import { writeSecretFileAtomically } from './helpers.js';
|
|
6
6
|
const accountCaches = ['additionalModelOptionsCache', 'additionalModelOptionsAnsweredAt', 'additionalModelCostsCache', 'modelAccessCache', 'orgModelDefaultCache', 'lastSeenOrgDefaultUpdatedAt', 'clientDataCache', 'clientDataCacheSlots', 'autoCompactWindowsCache', 'cachedUsageUtilization'];
|
|
@@ -8,7 +8,7 @@ const accountCaches = ['additionalModelOptionsCache', 'additionalModelOptionsAns
|
|
|
8
8
|
export class ClaudeCodeHarness extends FileHarness {
|
|
9
9
|
id = 'claude';
|
|
10
10
|
label = 'Claude Code';
|
|
11
|
-
loginHint = 'Log in using claude auth login,
|
|
11
|
+
loginHint = 'Log in using claude auth login, then authswitch claude stash --keep; Claude Code may stay running.';
|
|
12
12
|
store;
|
|
13
13
|
file;
|
|
14
14
|
configFile;
|
|
@@ -32,6 +32,8 @@ export class ClaudeCodeHarness extends FileHarness {
|
|
|
32
32
|
plugins.path.join(process.cwd(), '.claude/settings.json'), plugins.path.join(process.cwd(), '.claude/settings.local.json')];
|
|
33
33
|
}
|
|
34
34
|
beforeMutation() { this.checkStopped(); }
|
|
35
|
+
/** One record holds the credential and its matching metadata, so both files must be proven stable. */
|
|
36
|
+
nativeSources() { return [readCredentialRaw(this.file), readCredentialRaw(this.configFile)]; }
|
|
35
37
|
inspect(credential, slotId) {
|
|
36
38
|
if (slotId !== 'anthropic')
|
|
37
39
|
throw new Error('Unsupported Claude Code credential slot.');
|
|
@@ -120,4 +122,4 @@ export class ClaudeCodeHarness extends FileHarness {
|
|
|
120
122
|
return this.status.read(credentialRecord(account.credential.claudeAiOauth), credentialRecord(account.credential.oauthAccount));
|
|
121
123
|
}
|
|
122
124
|
}
|
|
123
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
125
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.claudecodeharness.js","sourceRoot":"","sources":["../ts/classes.claudecodeharness.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
export declare const credentialRecord: (value: unknown) => Record<string, unknown>;
|
|
2
2
|
export declare const credentialText: (value: unknown) => string | undefined;
|
|
3
3
|
export declare const credentialHash: (value: string) => string;
|
|
4
|
+
/** A bounded raw read. Callers that only compare bytes must not have to parse a file another process owns. */
|
|
5
|
+
export declare const readCredentialRaw: (file: string) => string | null;
|
|
4
6
|
/** A bounded file read; malformed secrets never become parser diagnostics in the CLI. */
|
|
5
7
|
export declare const readCredentialDocument: (file: string) => {
|
|
6
8
|
raw: string | null;
|
|
@@ -28,5 +30,10 @@ export declare class CredentialStore {
|
|
|
28
30
|
remove(id: string): void;
|
|
29
31
|
locked<T>(action: () => T): T;
|
|
30
32
|
}
|
|
31
|
-
/**
|
|
33
|
+
/**
|
|
34
|
+
* Native harnesses hold their login in memory and rewrite it on their own refresh schedule, so a
|
|
35
|
+
* credential written underneath a running one is destroyed by the next refresh. Operations that
|
|
36
|
+
* replace a native login therefore require it stopped. Reading for a save that keeps the login in
|
|
37
|
+
* place writes nothing native and is guarded by content stability instead (see FileHarness).
|
|
38
|
+
*/
|
|
32
39
|
export declare const requireHarnessStopped: (binary: "opencode" | "claude") => void;
|
|
@@ -7,8 +7,8 @@ export const credentialRecord = (value) => {
|
|
|
7
7
|
};
|
|
8
8
|
export const credentialText = (value) => typeof value === 'string' && value.length > 0 ? value : undefined;
|
|
9
9
|
export const credentialHash = (value) => plugins.crypto.createHash('sha256').update(value).digest('hex');
|
|
10
|
-
/** A bounded
|
|
11
|
-
export const
|
|
10
|
+
/** A bounded raw read. Callers that only compare bytes must not have to parse a file another process owns. */
|
|
11
|
+
export const readCredentialRaw = (file) => {
|
|
12
12
|
let fd;
|
|
13
13
|
try {
|
|
14
14
|
fd = plugins.fs.openSync(file, plugins.fs.constants.O_RDONLY | plugins.fs.constants.O_NONBLOCK);
|
|
@@ -25,12 +25,11 @@ export const readCredentialDocument = (file) => {
|
|
|
25
25
|
}
|
|
26
26
|
if (size === buffer.length)
|
|
27
27
|
throw new Error();
|
|
28
|
-
|
|
29
|
-
return { raw, data: credentialRecord(JSON.parse(raw)) };
|
|
28
|
+
return buffer.subarray(0, size).toString('utf8');
|
|
30
29
|
}
|
|
31
30
|
catch (error) {
|
|
32
31
|
if (error.code === 'ENOENT')
|
|
33
|
-
return
|
|
32
|
+
return null;
|
|
34
33
|
throw new Error('Credential file is unreadable, malformed, or too large; no changes were made.');
|
|
35
34
|
}
|
|
36
35
|
finally {
|
|
@@ -38,6 +37,18 @@ export const readCredentialDocument = (file) => {
|
|
|
38
37
|
plugins.fs.closeSync(fd);
|
|
39
38
|
}
|
|
40
39
|
};
|
|
40
|
+
/** A bounded file read; malformed secrets never become parser diagnostics in the CLI. */
|
|
41
|
+
export const readCredentialDocument = (file) => {
|
|
42
|
+
const raw = readCredentialRaw(file);
|
|
43
|
+
if (raw === null)
|
|
44
|
+
return { raw: null, data: {} };
|
|
45
|
+
try {
|
|
46
|
+
return { raw, data: credentialRecord(JSON.parse(raw)) };
|
|
47
|
+
}
|
|
48
|
+
catch {
|
|
49
|
+
throw new Error('Credential file is unreadable, malformed, or too large; no changes were made.');
|
|
50
|
+
}
|
|
51
|
+
};
|
|
41
52
|
/** A single atomic, owner-only record keeps the saved credential and its identity together. */
|
|
42
53
|
export class CredentialStore {
|
|
43
54
|
dir;
|
|
@@ -95,7 +106,12 @@ export class CredentialStore {
|
|
|
95
106
|
}
|
|
96
107
|
}
|
|
97
108
|
}
|
|
98
|
-
/**
|
|
109
|
+
/**
|
|
110
|
+
* Native harnesses hold their login in memory and rewrite it on their own refresh schedule, so a
|
|
111
|
+
* credential written underneath a running one is destroyed by the next refresh. Operations that
|
|
112
|
+
* replace a native login therefore require it stopped. Reading for a save that keeps the login in
|
|
113
|
+
* place writes nothing native and is guarded by content stability instead (see FileHarness).
|
|
114
|
+
*/
|
|
99
115
|
export const requireHarnessStopped = (binary) => {
|
|
100
116
|
let names;
|
|
101
117
|
try {
|
|
@@ -110,6 +126,6 @@ export const requireHarnessStopped = (binary) => {
|
|
|
110
126
|
throw new Error(`Could not verify that ${binary} is stopped. No login was changed.`);
|
|
111
127
|
}
|
|
112
128
|
if (names.some(name => name === binary || name === `${binary}.exe`))
|
|
113
|
-
throw new Error(`Exit running ${binary} processes before
|
|
129
|
+
throw new Error(`Exit running ${binary} processes before replacing or clearing its login, then start ${binary} again. Saving with --keep does not need this.`);
|
|
114
130
|
};
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
131
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.credentialstore.js","sourceRoot":"","sources":["../ts/classes.credentialstore.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,9 +19,23 @@ export declare abstract class FileHarness implements IAuthHarness {
|
|
|
19
19
|
protected abstract readonly store: CredentialStore;
|
|
20
20
|
protected abstract snapshot(): IFileHarnessSnapshot;
|
|
21
21
|
protected abstract apply(slotId: string, previous: IFileAccount | undefined, target: IFileAccount | undefined): void;
|
|
22
|
+
/** Guards the operations that write a native credential file. Reads must not depend on it. */
|
|
22
23
|
protected abstract beforeMutation(): void;
|
|
24
|
+
/** Raw bytes of the native files a snapshot's credentials are taken from, in a fixed order. */
|
|
25
|
+
protected abstract nativeSources(): (string | null)[];
|
|
23
26
|
protected abstract inspect(credential: Record<string, unknown>, slotId: string): IFileAccount;
|
|
24
27
|
abstract readAccountStatus(id: string): Promise<IHarnessAccountStatus>;
|
|
28
|
+
/**
|
|
29
|
+
* A snapshot proven not to have been taken across a native write.
|
|
30
|
+
*
|
|
31
|
+
* Saving a login without replacing it writes no native file, so it must not require the harness
|
|
32
|
+
* to be stopped. A running harness does rotate its tokens on its own schedule, and its fallback
|
|
33
|
+
* writer truncates the file in place, so reading the same sources before and after the snapshot
|
|
34
|
+
* and requiring identical bytes is what keeps a torn or half-rotated credential out of the stash.
|
|
35
|
+
* Both the retry count and the pause between attempts are bounded; an unstable file is reported,
|
|
36
|
+
* never guessed at.
|
|
37
|
+
*/
|
|
38
|
+
private stableSnapshot;
|
|
25
39
|
private saved;
|
|
26
40
|
readState(): IHarnessState;
|
|
27
41
|
protected readCredential(id: string): IFileAccount;
|
|
@@ -1,8 +1,39 @@
|
|
|
1
1
|
import { CredentialStore } from './classes.credentialstore.js';
|
|
2
|
+
import { pauseSynchronously } from './helpers.js';
|
|
2
3
|
import { plainText } from './formatting.js';
|
|
3
4
|
/** Shared verified preservation for harnesses with independently replaceable credential slots. */
|
|
4
5
|
export class FileHarness {
|
|
5
6
|
diagnosticsLabel = 'Check credential storage and account availability';
|
|
7
|
+
/**
|
|
8
|
+
* A snapshot proven not to have been taken across a native write.
|
|
9
|
+
*
|
|
10
|
+
* Saving a login without replacing it writes no native file, so it must not require the harness
|
|
11
|
+
* to be stopped. A running harness does rotate its tokens on its own schedule, and its fallback
|
|
12
|
+
* writer truncates the file in place, so reading the same sources before and after the snapshot
|
|
13
|
+
* and requiring identical bytes is what keeps a torn or half-rotated credential out of the stash.
|
|
14
|
+
* Both the retry count and the pause between attempts are bounded; an unstable file is reported,
|
|
15
|
+
* never guessed at.
|
|
16
|
+
*/
|
|
17
|
+
stableSnapshot() {
|
|
18
|
+
let failure;
|
|
19
|
+
for (let attempt = 0; attempt < 5; attempt++) {
|
|
20
|
+
if (attempt)
|
|
21
|
+
pauseSynchronously(20);
|
|
22
|
+
try {
|
|
23
|
+
const before = JSON.stringify(this.nativeSources());
|
|
24
|
+
const snapshot = this.snapshot();
|
|
25
|
+
if (JSON.stringify(this.nativeSources()) === before)
|
|
26
|
+
return snapshot;
|
|
27
|
+
failure = undefined;
|
|
28
|
+
}
|
|
29
|
+
catch (error) {
|
|
30
|
+
failure = error;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
if (failure)
|
|
34
|
+
throw failure;
|
|
35
|
+
throw new Error(`${this.label} kept rewriting its credential files while they were being read; nothing was saved. Try again in a moment.`);
|
|
36
|
+
}
|
|
6
37
|
saved(entry) {
|
|
7
38
|
const account = this.inspect(entry.credential, entry.slotId);
|
|
8
39
|
if (account.identity !== entry.identity)
|
|
@@ -72,8 +103,10 @@ export class FileHarness {
|
|
|
72
103
|
}
|
|
73
104
|
saveCurrent(options) {
|
|
74
105
|
return this.outcome(() => {
|
|
75
|
-
|
|
76
|
-
|
|
106
|
+
// Keeping the login in place only reads the native files, so a running harness is no reason to refuse.
|
|
107
|
+
if (!options.keepActive)
|
|
108
|
+
this.beforeMutation();
|
|
109
|
+
const snapshot = this.stableSnapshot();
|
|
77
110
|
if (snapshot.unavailable)
|
|
78
111
|
throw new Error(snapshot.unavailable);
|
|
79
112
|
const matches = snapshot.accounts.filter(account => !options.accountId || this.store.id(account.slotId, account.identity) === options.accountId || account.slotId === options.accountId || account.label === options.accountId);
|
|
@@ -116,4 +149,4 @@ export class FileHarness {
|
|
|
116
149
|
}
|
|
117
150
|
}
|
|
118
151
|
}
|
|
119
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.fileharness.js","sourceRoot":"","sources":["../ts/classes.fileharness.ts"],"names":[],"mappings":"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"}
|
|
152
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.fileharness.js","sourceRoot":"","sources":["../ts/classes.fileharness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAA0B,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAa5C,kGAAkG;AAClG,MAAM,OAAgB,WAAW;IAIf,gBAAgB,GAAG,mDAAmD,CAAC;IAWvF;;;;;;;;;OASG;IACK,cAAc;QACpB,IAAI,OAAgB,CAAC;QACrB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC;YAC7C,IAAI,OAAO;gBAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC;YACpC,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;gBACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACjC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,KAAK,MAAM;oBAAE,OAAO,QAAQ,CAAC;gBACrE,OAAO,GAAG,SAAS,CAAC;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAAC,OAAO,GAAG,KAAK,CAAC;YAAC,CAAC;QACtC,CAAC;QACD,IAAI,OAAO;YAAE,MAAM,OAAO,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,4GAA4G,CAAC,CAAC;IAC7I,CAAC;IAEO,KAAK,CAAC,KAAwB;QACpC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7D,IAAI,OAAO,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAClH,OAAO,OAAO,CAAC;IACjB,CAAC;IACM,SAAS;QACd,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAChC,MAAM,QAAQ,GAA8B,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YAC5D,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAClB,OAAO,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,aAAa,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QACtK,CAAC,CAAC,CAAC;QACH,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACvC,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;YACzD,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YAC7D,IAAI,QAAQ,EAAE,CAAC;gBAAC,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC;gBAAC,QAAQ,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;YAAC,CAAC;;gBACrE,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,aAAa,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QACtK,CAAC;QACD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,IAAI,KAAK,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,CAAC;gBAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1I,CAAC;QACD,OAAO,EAAE,QAAQ,EAAE,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC;IACnE,CAAC;IACS,cAAc,CAAC,EAAU;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;QAChH,OAAO,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACnD,CAAC;IACD,uFAAuF;IAChF,gBAAgB,CAAC,MAAc,EAAE,UAAmC;QACzE,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IACxG,CAAC;IACD,8FAA8F;IACvF,kBAAkB,CAAC,MAAc,EAAE,UAAmC;QAC3E,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YACvB,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjC,IAAI,QAAQ,CAAC,WAAW;gBAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAChE,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;YAC9E,IAAI,QAAQ;gBAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACxC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;YACrC,OAAO,aAAa,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC;QACxE,CAAC,CAAC,CAAC;IACL,CAAC;IACM,cAAc,CAAC,SAAiB;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,SAAS,IAAI,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,SAAS,CAAC,WAAW,EAAE;eACvH,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,KAAK,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC;QACrF,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QACnI,OAAO,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;IACrJ,CAAC;IACO,OAAO,CAAC,MAAoB;QAClC,IAAI,CAAC;YAAC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;QAAC,CAAC;QAC9E,OAAO,KAAK,EAAE,CAAC;YAAC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,8BAA8B,CAAC,EAAE,CAAC;QAAC,CAAC;IAC9H,CAAC;IACM,WAAW,CAAC,OAAoD;QACrE,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YACvB,uGAAuG;YACvG,IAAI,CAAC,OAAO,CAAC,UAAU;gBAAE,IAAI,CAAC,cAAc,EAAE,CAAC;YAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YACvC,IAAI,QAAQ,CAAC,WAAW;gBAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAChE,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,KAAK,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,MAAM,KAAK,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;YAChO,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,oEAAoE,CAAC,CAAC,CAAC,mCAAmC,CAAC,CAAC;YACvK,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC1B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,UAAU;gBAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;YACtE,OAAO,SAAS,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,KAAK,mBAAmB,EAAE,CAAC;QACxK,CAAC,CAAC,CAAC;IACL,CAAC;IACM,aAAa,CAAC,EAAU;QAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YACvB,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjC,IAAI,QAAQ,CAAC,WAAW;gBAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAChE,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC;YACrF,uEAAuE;YACvE,IAAI,QAAQ;gBAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACxC,IAAI,QAAQ,EAAE,QAAQ,KAAK,MAAM,CAAC,QAAQ;gBAAE,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,qDAAqD,CAAC;YACnI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC5C,OAAO,aAAa,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,KAAK,aAAa,CAAC;QAC9G,CAAC,CAAC,CAAC;IACL,CAAC;IACM,aAAa,CAAC,EAAU;QAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,2BAA2B,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3L,CAAC;IACM,QAAQ;QACb,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAC/B,OAAO,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,qBAAqB,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACjS,CAAC;QAAC,MAAM,CAAC;YAAC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,gGAAgG,CAAC,EAAE,CAAC;QAAC,CAAC;IACjJ,CAAC;CACF"}
|
|
@@ -23,6 +23,8 @@ export declare class OpenCodeHarness extends FileHarness {
|
|
|
23
23
|
private readonly fetcher?;
|
|
24
24
|
constructor(options?: IOpenCodeHarnessOptions);
|
|
25
25
|
protected beforeMutation(): void;
|
|
26
|
+
/** Every provider entry lives in one file, so its bytes are the whole stability proof. */
|
|
27
|
+
protected nativeSources(): (string | null)[];
|
|
26
28
|
/** Public identity only, for reconciling a host's OpenAI association after native refresh/restart. */
|
|
27
29
|
activeOpenAiAccountId(): string | undefined;
|
|
28
30
|
beginLogin(options?: IHarnessLoginOptions): Promise<import("./interfaces.harness.js").IHarnessLoginHandle>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import { FileHarness } from './classes.fileharness.js';
|
|
3
|
-
import { CredentialStore, credentialHash, credentialRecord, credentialText, readCredentialDocument, requireHarnessStopped } from './classes.credentialstore.js';
|
|
3
|
+
import { CredentialStore, credentialHash, credentialRecord, credentialText, readCredentialDocument, readCredentialRaw, requireHarnessStopped } from './classes.credentialstore.js';
|
|
4
4
|
import { CodexAccountStatus } from './classes.codexstatus.js';
|
|
5
5
|
import { writeSecretFileAtomically } from './helpers.js';
|
|
6
6
|
import { beginSavedOpenAiLogin, openCodeCredentialFromLogin } from './classes.login.js';
|
|
@@ -27,6 +27,8 @@ export class OpenCodeHarness extends FileHarness {
|
|
|
27
27
|
this.checkStopped = options.checkStopped ?? (() => requireHarnessStopped('opencode'));
|
|
28
28
|
}
|
|
29
29
|
beforeMutation() { this.checkStopped(); }
|
|
30
|
+
/** Every provider entry lives in one file, so its bytes are the whole stability proof. */
|
|
31
|
+
nativeSources() { return [readCredentialRaw(this.file)]; }
|
|
30
32
|
/** Public identity only, for reconciling a host's OpenAI association after native refresh/restart. */
|
|
31
33
|
activeOpenAiAccountId() {
|
|
32
34
|
const account = this.snapshot().accounts.find(item => item.slotId === 'openai');
|
|
@@ -122,4 +124,4 @@ export class OpenCodeHarness extends FileHarness {
|
|
|
122
124
|
], problems: [] };
|
|
123
125
|
}
|
|
124
126
|
}
|
|
125
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
127
|
+
//# 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/helpers.d.ts
CHANGED
|
@@ -17,6 +17,15 @@ import type { IRemoteControlEnrollment, TEnrollmentState } from './interfaces.js
|
|
|
17
17
|
* content or the new one, never a partial write.
|
|
18
18
|
*/
|
|
19
19
|
export declare const writeSecretFileAtomically: (destinationPathArg: string, contentArg: string) => void;
|
|
20
|
+
/**
|
|
21
|
+
* Blocks the calling thread for `millisecondsArg`.
|
|
22
|
+
*
|
|
23
|
+
* Credential reads are synchronous all the way down, so a retry that re-reads
|
|
24
|
+
* immediately can land inside the very same in-flight write it is retrying past.
|
|
25
|
+
* `Atomics.wait` on a private buffer is the only synchronous pause Node offers,
|
|
26
|
+
* and the callers bound both the count and the duration.
|
|
27
|
+
*/
|
|
28
|
+
export declare const pauseSynchronously: (millisecondsArg: number) => void;
|
|
20
29
|
/**
|
|
21
30
|
* Trims third-party process output down to something safe to put in an error
|
|
22
31
|
* message: one line, length-capped, and never empty.
|
package/dist_ts/helpers.js
CHANGED
|
@@ -48,6 +48,17 @@ export const writeSecretFileAtomically = (destinationPathArg, contentArg) => {
|
|
|
48
48
|
}
|
|
49
49
|
plugins.fs.chmodSync(destinationPathArg, 0o600);
|
|
50
50
|
};
|
|
51
|
+
/**
|
|
52
|
+
* Blocks the calling thread for `millisecondsArg`.
|
|
53
|
+
*
|
|
54
|
+
* Credential reads are synchronous all the way down, so a retry that re-reads
|
|
55
|
+
* immediately can land inside the very same in-flight write it is retrying past.
|
|
56
|
+
* `Atomics.wait` on a private buffer is the only synchronous pause Node offers,
|
|
57
|
+
* and the callers bound both the count and the duration.
|
|
58
|
+
*/
|
|
59
|
+
export const pauseSynchronously = (millisecondsArg) => {
|
|
60
|
+
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, millisecondsArg);
|
|
61
|
+
};
|
|
51
62
|
/**
|
|
52
63
|
* Trims third-party process output down to something safe to put in an error
|
|
53
64
|
* message: one line, length-capped, and never empty.
|
|
@@ -89,4 +100,4 @@ export const describeCodexFailure = (binaryArg, stdoutArg, stderrArg, spawnError
|
|
|
89
100
|
}
|
|
90
101
|
return summariseProcessOutput(stdoutArg, stderrArg, spawnErrorArg);
|
|
91
102
|
};
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
103
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFjLENBQUM7QUFHeEM7Ozs7Ozs7Ozs7Ozs7Ozs7R0FnQkc7QUFDSCxNQUFNLENBQUMsTUFBTSx5QkFBeUIsR0FBRyxDQUN2QyxrQkFBMEIsRUFDMUIsVUFBa0IsRUFDWixFQUFFO0lBQ1IsTUFBTSxRQUFRLEdBQUcsR0FBRyxrQkFBa0IsaUJBQWlCLENBQUM7SUFDeEQsd0VBQXdFO0lBQ3hFLDBFQUEwRTtJQUMxRSxzREFBc0Q7SUFDdEQsSUFBSSxPQUFPLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDO1FBQ3BDLE9BQU8sQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQy9DLENBQUM7SUFFRCxJQUFJLE1BQU0sR0FBa0IsSUFBSSxDQUFDO0lBQ2pDLElBQUksQ0FBQztRQUNILE1BQU0sR0FBRyxPQUFPLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ3BELE9BQU8sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxLQUFLLENBQUMsQ0FBQztRQUNyQyxPQUFPLENBQUMsRUFBRSxDQUFDLGFBQWEsQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFDbkUsT0FBTyxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDN0IsT0FBTyxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDN0IsTUFBTSxHQUFHLElBQUksQ0FBQztRQUNkLE9BQU8sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO0lBQ3RELENBQUM7SUFBQyxPQUFPLFFBQVEsRUFBRSxDQUFDO1FBQ2xCLElBQUksTUFBTSxLQUFLLElBQUksRUFBRSxDQUFDO1lBQ3BCLElBQUksQ0FBQztnQkFDSCxPQUFPLENBQUMsRUFBRSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUMvQixDQUFDO1lBQUMsTUFBTSxDQUFDO2dCQUNQLDRDQUE0QztZQUM5QyxDQUFDO1FBQ0gsQ0FBQztRQUNELE9BQU8sQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQzdDLE1BQU0sUUFBUSxDQUFDO0lBQ2pCLENBQUM7SUFDRCxPQUFPLENBQUMsRUFBRSxDQUFDLFNBQVMsQ0FBQyxrQkFBa0IsRUFBRSxLQUFLLENBQUMsQ0FBQztBQUNsRCxDQUFDLENBQUM7QUFFRjs7Ozs7OztHQU9HO0FBQ0gsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQUcsQ0FBQyxlQUF1QixFQUFRLEVBQUU7SUFDbEUsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLFVBQVUsQ0FBQyxJQUFJLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxlQUFlLENBQUMsQ0FBQztBQUNoRixDQUFDLENBQUM7QUFFRjs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyxDQUNwQyxTQUFpQixFQUNqQixTQUFpQixFQUNqQixhQUE0QixFQUNwQixFQUFFO0lBQ1YsTUFBTSxTQUFTLEdBQUcsQ0FBQyxhQUFhLElBQUksU0FBUyxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsQ0FBQyxJQUFJLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUNoRixJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7UUFDZixPQUFPLFdBQVcsQ0FBQztJQUNyQixDQUFDO0lBQ0QsTUFBTSxTQUFTLEdBQUcsU0FBUyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO0lBQzNGLE1BQU0sU0FBUyxHQUFHLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUNuQyxPQUFPLFNBQVMsQ0FBQyxNQUFNLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztBQUM5RSxDQUFDLENBQUM7QUFFRjs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsQ0FBQyxhQUF1QyxFQUFvQixFQUFFO0lBQzNGLElBQUksYUFBYSxDQUFDLG9CQUFvQixLQUFLLElBQUksRUFBRSxDQUFDO1FBQ2hELE9BQU8sVUFBVSxDQUFDO0lBQ3BCLENBQUM7SUFDRCxPQUFPLGFBQWEsQ0FBQyxvQkFBb0IsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDO0FBQzFFLENBQUMsQ0FBQztBQUVGLDZEQUE2RDtBQUM3RCxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsQ0FBQyxjQUEwQyxFQUFVLEVBQUUsQ0FDaEYsY0FBYyxDQUFDLE1BQU0sQ0FBQyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsZUFBZSxDQUFDLGFBQWEsQ0FBQyxLQUFLLFFBQVEsQ0FBQyxDQUFDLE1BQU0sQ0FBQztBQUUvRjs7Ozs7O0dBTUc7QUFDSCxNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBRyxDQUNsQyxTQUFpQixFQUNqQixTQUFpQixFQUNqQixTQUFpQixFQUNqQixhQUE0QixFQUNwQixFQUFFO0lBQ1YsSUFBSSxhQUFhLElBQUksWUFBWSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsRUFBRSxDQUFDO1FBQ3RELE9BQU8sNklBQTZJLENBQUM7SUFDdkosQ0FBQztJQUNELElBQUksYUFBYSxJQUFJLFNBQVMsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEVBQUUsQ0FBQztRQUNuRCxPQUFPLGtCQUFrQixTQUFTLCtFQUErRSxDQUFDO0lBQ3BILENBQUM7SUFDRCxPQUFPLHNCQUFzQixDQUFDLFNBQVMsRUFBRSxTQUFTLEVBQUUsYUFBYSxDQUFDLENBQUM7QUFDckUsQ0FBQyxDQUFDIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@modelprofile.com/authswitch",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.2.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Manage Codex, OpenCode and Claude Code accounts with guided switching and live usage status",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"@git.zone/tsbuild": "^4.4.3",
|
|
27
27
|
"@git.zone/tsrun": "^2.0.6",
|
|
28
28
|
"@git.zone/tstest": "^6.0.0",
|
|
29
|
-
"@types/node": "
|
|
29
|
+
"@types/node": "26.5.0"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
32
|
"@modelprofile.com/flexharness-models": "^7.0.1",
|
|
@@ -37,7 +37,6 @@
|
|
|
37
37
|
"ts/**/*",
|
|
38
38
|
"dist_ts/**/*",
|
|
39
39
|
"cli.js",
|
|
40
|
-
".smartconfig.json",
|
|
41
40
|
"readme.md"
|
|
42
41
|
],
|
|
43
42
|
"browserslist": [
|
package/readme.md
CHANGED
|
@@ -69,7 +69,7 @@ authswitch opencode stash openai --keep
|
|
|
69
69
|
authswitch opencode use alice@example.com
|
|
70
70
|
authswitch opencode login openai # device login; save the new account without switching
|
|
71
71
|
authswitch codex login # save a new Codex account without disturbing the current login
|
|
72
|
-
authswitch claude stash --keep # save a Claude Code subscriber login
|
|
72
|
+
authswitch claude stash --keep # save a Claude Code subscriber login, while it keeps running
|
|
73
73
|
authswitch claude list --json
|
|
74
74
|
authswitch claude use alice@example.com
|
|
75
75
|
```
|
|
@@ -82,8 +82,15 @@ authswitch coordination, the CLI delegates credential changes to AGL. AGL owns
|
|
|
82
82
|
stopping and restarting its OpenCode runtime. Idle changes need no additional
|
|
83
83
|
restart confirmation; active work requires consent to wait for it to finish.
|
|
84
84
|
Unmanaged native processes must still be exited manually: a terminal session
|
|
85
|
-
cannot safely be reconstructed from its PID.
|
|
86
|
-
|
|
85
|
+
cannot safely be reconstructed from its PID. `stash --keep` is the exception --
|
|
86
|
+
it only reads the native credential files and writes to authswitch's own store,
|
|
87
|
+
so it works while OpenCode or Claude Code is running, and it is refused only if
|
|
88
|
+
those files keep changing while they are read. The operations that replace a
|
|
89
|
+
native login -- `stash` without `--keep`, `use`, and backend activation --
|
|
90
|
+
still require the harness stopped, because a running one holds the outgoing
|
|
91
|
+
token in memory and would write it back over the incoming login at its next
|
|
92
|
+
refresh. Status lookups remain read-only and work while harnesses are running.
|
|
93
|
+
`preuse` remains a Codex capability.
|
|
87
94
|
|
|
88
95
|
`authswitch codex login` and `authswitch opencode login openai` use the shared
|
|
89
96
|
OpenAI device login flow. They display a verification link and code, then save
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import { FileHarness, type IFileAccount, type IFileHarnessSnapshot } from './classes.fileharness.js';
|
|
3
|
-
import { CredentialStore, credentialRecord, credentialText, readCredentialDocument, requireHarnessStopped } from './classes.credentialstore.js';
|
|
3
|
+
import { CredentialStore, credentialRecord, credentialText, readCredentialDocument, readCredentialRaw, requireHarnessStopped } from './classes.credentialstore.js';
|
|
4
4
|
import { ClaudeAccountStatus } from './classes.claudestatus.js';
|
|
5
5
|
import { writeSecretFileAtomically } from './helpers.js';
|
|
6
6
|
import type { IHarnessAccountStatus } from './interfaces.harness.js';
|
|
@@ -23,7 +23,7 @@ const accountCaches = ['additionalModelOptionsCache', 'additionalModelOptionsAns
|
|
|
23
23
|
export class ClaudeCodeHarness extends FileHarness {
|
|
24
24
|
public readonly id = 'claude';
|
|
25
25
|
public readonly label = 'Claude Code';
|
|
26
|
-
public readonly loginHint = 'Log in using claude auth login,
|
|
26
|
+
public readonly loginHint = 'Log in using claude auth login, then authswitch claude stash --keep; Claude Code may stay running.';
|
|
27
27
|
protected readonly store: CredentialStore;
|
|
28
28
|
private readonly file: string;
|
|
29
29
|
private readonly configFile: string;
|
|
@@ -48,6 +48,8 @@ export class ClaudeCodeHarness extends FileHarness {
|
|
|
48
48
|
plugins.path.join(process.cwd(), '.claude/settings.json'), plugins.path.join(process.cwd(), '.claude/settings.local.json')];
|
|
49
49
|
}
|
|
50
50
|
protected beforeMutation(): void { this.checkStopped(); }
|
|
51
|
+
/** One record holds the credential and its matching metadata, so both files must be proven stable. */
|
|
52
|
+
protected nativeSources(): (string | null)[] { return [readCredentialRaw(this.file), readCredentialRaw(this.configFile)]; }
|
|
51
53
|
protected inspect(credential: Record<string, unknown>, slotId: string): IFileAccount {
|
|
52
54
|
if (slotId !== 'anthropic') throw new Error('Unsupported Claude Code credential slot.');
|
|
53
55
|
const oauth = credentialRecord(credential.claudeAiOauth);
|
|
@@ -8,8 +8,8 @@ export const credentialRecord = (value: unknown): Record<string, unknown> => {
|
|
|
8
8
|
export const credentialText = (value: unknown): string | undefined => typeof value === 'string' && value.length > 0 ? value : undefined;
|
|
9
9
|
export const credentialHash = (value: string): string => plugins.crypto.createHash('sha256').update(value).digest('hex');
|
|
10
10
|
|
|
11
|
-
/** A bounded
|
|
12
|
-
export const
|
|
11
|
+
/** A bounded raw read. Callers that only compare bytes must not have to parse a file another process owns. */
|
|
12
|
+
export const readCredentialRaw = (file: string): string | null => {
|
|
13
13
|
let fd: number | undefined;
|
|
14
14
|
try {
|
|
15
15
|
fd = plugins.fs.openSync(file, plugins.fs.constants.O_RDONLY | plugins.fs.constants.O_NONBLOCK);
|
|
@@ -23,14 +23,21 @@ export const readCredentialDocument = (file: string): { raw: string | null; data
|
|
|
23
23
|
size += count;
|
|
24
24
|
}
|
|
25
25
|
if (size === buffer.length) throw new Error();
|
|
26
|
-
|
|
27
|
-
return { raw, data: credentialRecord(JSON.parse(raw)) };
|
|
26
|
+
return buffer.subarray(0, size).toString('utf8');
|
|
28
27
|
} catch (error) {
|
|
29
|
-
if ((error as NodeJS.ErrnoException).code === 'ENOENT') return
|
|
28
|
+
if ((error as NodeJS.ErrnoException).code === 'ENOENT') return null;
|
|
30
29
|
throw new Error('Credential file is unreadable, malformed, or too large; no changes were made.');
|
|
31
30
|
} finally { if (fd !== undefined) plugins.fs.closeSync(fd); }
|
|
32
31
|
};
|
|
33
32
|
|
|
33
|
+
/** A bounded file read; malformed secrets never become parser diagnostics in the CLI. */
|
|
34
|
+
export const readCredentialDocument = (file: string): { raw: string | null; data: Record<string, unknown> } => {
|
|
35
|
+
const raw = readCredentialRaw(file);
|
|
36
|
+
if (raw === null) return { raw: null, data: {} };
|
|
37
|
+
try { return { raw, data: credentialRecord(JSON.parse(raw)) }; }
|
|
38
|
+
catch { throw new Error('Credential file is unreadable, malformed, or too large; no changes were made.'); }
|
|
39
|
+
};
|
|
40
|
+
|
|
34
41
|
export interface IStoredCredential {
|
|
35
42
|
schemaVersion: 1;
|
|
36
43
|
id: string;
|
|
@@ -87,7 +94,12 @@ export class CredentialStore {
|
|
|
87
94
|
}
|
|
88
95
|
}
|
|
89
96
|
|
|
90
|
-
/**
|
|
97
|
+
/**
|
|
98
|
+
* Native harnesses hold their login in memory and rewrite it on their own refresh schedule, so a
|
|
99
|
+
* credential written underneath a running one is destroyed by the next refresh. Operations that
|
|
100
|
+
* replace a native login therefore require it stopped. Reading for a save that keeps the login in
|
|
101
|
+
* place writes nothing native and is guarded by content stability instead (see FileHarness).
|
|
102
|
+
*/
|
|
91
103
|
export const requireHarnessStopped = (binary: 'opencode' | 'claude'): void => {
|
|
92
104
|
let names: string[];
|
|
93
105
|
try {
|
|
@@ -97,5 +109,5 @@ export const requireHarnessStopped = (binary: 'opencode' | 'claude'): void => {
|
|
|
97
109
|
names = plugins.childProcess.execFileSync('ps', ['-u', String(process.getuid!()), '-o', 'comm='], { encoding: 'utf8', timeout: 5000 }).split('\n').map(line => plugins.path.basename(line.trim()));
|
|
98
110
|
}
|
|
99
111
|
} catch { throw new Error(`Could not verify that ${binary} is stopped. No login was changed.`); }
|
|
100
|
-
if (names.some(name => name === binary || name === `${binary}.exe`)) throw new Error(`Exit running ${binary} processes before
|
|
112
|
+
if (names.some(name => name === binary || name === `${binary}.exe`)) throw new Error(`Exit running ${binary} processes before replacing or clearing its login, then start ${binary} again. Saving with --keep does not need this.`);
|
|
101
113
|
};
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { IAuthHarness, IHarnessAccountStatus, IHarnessOutcome, IHarnessState } from './interfaces.harness.js';
|
|
2
2
|
import { CredentialStore, type IStoredCredential } from './classes.credentialstore.js';
|
|
3
|
+
import { pauseSynchronously } from './helpers.js';
|
|
3
4
|
import { plainText } from './formatting.js';
|
|
4
5
|
|
|
5
6
|
export interface IFileAccount {
|
|
@@ -22,10 +23,38 @@ export abstract class FileHarness implements IAuthHarness {
|
|
|
22
23
|
protected abstract readonly store: CredentialStore;
|
|
23
24
|
protected abstract snapshot(): IFileHarnessSnapshot;
|
|
24
25
|
protected abstract apply(slotId: string, previous: IFileAccount | undefined, target: IFileAccount | undefined): void;
|
|
26
|
+
/** Guards the operations that write a native credential file. Reads must not depend on it. */
|
|
25
27
|
protected abstract beforeMutation(): void;
|
|
28
|
+
/** Raw bytes of the native files a snapshot's credentials are taken from, in a fixed order. */
|
|
29
|
+
protected abstract nativeSources(): (string | null)[];
|
|
26
30
|
protected abstract inspect(credential: Record<string, unknown>, slotId: string): IFileAccount;
|
|
27
31
|
public abstract readAccountStatus(id: string): Promise<IHarnessAccountStatus>;
|
|
28
32
|
|
|
33
|
+
/**
|
|
34
|
+
* A snapshot proven not to have been taken across a native write.
|
|
35
|
+
*
|
|
36
|
+
* Saving a login without replacing it writes no native file, so it must not require the harness
|
|
37
|
+
* to be stopped. A running harness does rotate its tokens on its own schedule, and its fallback
|
|
38
|
+
* writer truncates the file in place, so reading the same sources before and after the snapshot
|
|
39
|
+
* and requiring identical bytes is what keeps a torn or half-rotated credential out of the stash.
|
|
40
|
+
* Both the retry count and the pause between attempts are bounded; an unstable file is reported,
|
|
41
|
+
* never guessed at.
|
|
42
|
+
*/
|
|
43
|
+
private stableSnapshot(): IFileHarnessSnapshot {
|
|
44
|
+
let failure: unknown;
|
|
45
|
+
for (let attempt = 0; attempt < 5; attempt++) {
|
|
46
|
+
if (attempt) pauseSynchronously(20);
|
|
47
|
+
try {
|
|
48
|
+
const before = JSON.stringify(this.nativeSources());
|
|
49
|
+
const snapshot = this.snapshot();
|
|
50
|
+
if (JSON.stringify(this.nativeSources()) === before) return snapshot;
|
|
51
|
+
failure = undefined;
|
|
52
|
+
} catch (error) { failure = error; }
|
|
53
|
+
}
|
|
54
|
+
if (failure) throw failure;
|
|
55
|
+
throw new Error(`${this.label} kept rewriting its credential files while they were being read; nothing was saved. Try again in a moment.`);
|
|
56
|
+
}
|
|
57
|
+
|
|
29
58
|
private saved(entry: IStoredCredential): IFileAccount {
|
|
30
59
|
const account = this.inspect(entry.credential, entry.slotId);
|
|
31
60
|
if (account.identity !== entry.identity) throw new Error('Saved credential does not match its account identity.');
|
|
@@ -83,8 +112,9 @@ export abstract class FileHarness implements IAuthHarness {
|
|
|
83
112
|
}
|
|
84
113
|
public saveCurrent(options: { keepActive: boolean; accountId?: string }): IHarnessOutcome {
|
|
85
114
|
return this.outcome(() => {
|
|
86
|
-
|
|
87
|
-
|
|
115
|
+
// Keeping the login in place only reads the native files, so a running harness is no reason to refuse.
|
|
116
|
+
if (!options.keepActive) this.beforeMutation();
|
|
117
|
+
const snapshot = this.stableSnapshot();
|
|
88
118
|
if (snapshot.unavailable) throw new Error(snapshot.unavailable);
|
|
89
119
|
const matches = snapshot.accounts.filter(account => !options.accountId || this.store.id(account.slotId, account.identity) === options.accountId || account.slotId === options.accountId || account.label === options.accountId);
|
|
90
120
|
if (matches.length !== 1) throw new Error(matches.length ? 'Several logins are active. Select the account or provider to save.' : 'No matching active login to save.');
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import { FileHarness, type IFileAccount, type IFileHarnessSnapshot } from './classes.fileharness.js';
|
|
3
|
-
import { CredentialStore, credentialHash, credentialRecord, credentialText, readCredentialDocument, requireHarnessStopped } from './classes.credentialstore.js';
|
|
3
|
+
import { CredentialStore, credentialHash, credentialRecord, credentialText, readCredentialDocument, readCredentialRaw, requireHarnessStopped } from './classes.credentialstore.js';
|
|
4
4
|
import { CodexAccountStatus } from './classes.codexstatus.js';
|
|
5
5
|
import { writeSecretFileAtomically } from './helpers.js';
|
|
6
6
|
import type { IHarnessAccountStatus, IHarnessLoginOptions, IHarnessLoginProvider } from './interfaces.harness.js';
|
|
@@ -39,6 +39,8 @@ export class OpenCodeHarness extends FileHarness {
|
|
|
39
39
|
this.checkStopped = options.checkStopped ?? (() => requireHarnessStopped('opencode'));
|
|
40
40
|
}
|
|
41
41
|
protected beforeMutation(): void { this.checkStopped(); }
|
|
42
|
+
/** Every provider entry lives in one file, so its bytes are the whole stability proof. */
|
|
43
|
+
protected nativeSources(): (string | null)[] { return [readCredentialRaw(this.file)]; }
|
|
42
44
|
/** Public identity only, for reconciling a host's OpenAI association after native refresh/restart. */
|
|
43
45
|
public activeOpenAiAccountId(): string | undefined {
|
|
44
46
|
const account = this.snapshot().accounts.find(item => item.slotId === 'openai');
|
package/ts/helpers.ts
CHANGED
|
@@ -53,6 +53,18 @@ export const writeSecretFileAtomically = (
|
|
|
53
53
|
plugins.fs.chmodSync(destinationPathArg, 0o600);
|
|
54
54
|
};
|
|
55
55
|
|
|
56
|
+
/**
|
|
57
|
+
* Blocks the calling thread for `millisecondsArg`.
|
|
58
|
+
*
|
|
59
|
+
* Credential reads are synchronous all the way down, so a retry that re-reads
|
|
60
|
+
* immediately can land inside the very same in-flight write it is retrying past.
|
|
61
|
+
* `Atomics.wait` on a private buffer is the only synchronous pause Node offers,
|
|
62
|
+
* and the callers bound both the count and the duration.
|
|
63
|
+
*/
|
|
64
|
+
export const pauseSynchronously = (millisecondsArg: number): void => {
|
|
65
|
+
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, millisecondsArg);
|
|
66
|
+
};
|
|
67
|
+
|
|
56
68
|
/**
|
|
57
69
|
* Trims third-party process output down to something safe to put in an error
|
|
58
70
|
* message: one line, length-capped, and never empty.
|
package/.smartconfig.json
DELETED
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"@git.zone/cli": {
|
|
3
|
-
"schemaVersion": 2,
|
|
4
|
-
"projectType": "npm",
|
|
5
|
-
"module": {
|
|
6
|
-
"githost": "code.foss.global",
|
|
7
|
-
"gitscope": "modelprofile.com",
|
|
8
|
-
"gitrepo": "authswitch",
|
|
9
|
-
"description": "Manage Codex, OpenCode and Claude Code accounts with guided switching and live usage status",
|
|
10
|
-
"npmPackagename": "@modelprofile.com/authswitch",
|
|
11
|
-
"license": "MIT",
|
|
12
|
-
"projectDomain": "modelprofile.com"
|
|
13
|
-
},
|
|
14
|
-
"release": {
|
|
15
|
-
"targets": {
|
|
16
|
-
"git": {
|
|
17
|
-
"enabled": true,
|
|
18
|
-
"remote": "origin",
|
|
19
|
-
"pushBranch": true,
|
|
20
|
-
"pushTags": true
|
|
21
|
-
},
|
|
22
|
-
"npm": {
|
|
23
|
-
"enabled": true,
|
|
24
|
-
"registries": [
|
|
25
|
-
"https://verdaccio.lossless.digital",
|
|
26
|
-
"https://registry.npmjs.org"
|
|
27
|
-
],
|
|
28
|
-
"accessLevel": "public",
|
|
29
|
-
"alreadyPublished": "success"
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
}
|