@cortexkit/common-auth 0.29.1 → 0.30.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/claustrum/consumer.d.ts +10 -0
- package/dist/claustrum/consumer.js +25 -0
- package/dist/claustrum/hub.d.ts +3 -1
- package/dist/claustrum/hub.js +55 -5
- package/dist/claustrum/roster.js +1 -1
- package/dist/fs/refresh-file-lock.d.ts +2 -1
- package/dist/fs/refresh-file-lock.js +3 -1
- package/dist/fs/with-lock.js +1 -1
- package/dist/opencode2/index.d.ts +1 -1
- package/dist/opencode2/install.d.ts +4 -3
- package/dist/opencode2/install.js +144 -17
- package/dist/opencode2/types.d.ts +52 -1
- package/package.json +1 -1
|
@@ -50,6 +50,12 @@ export interface ClaustrumConsumerOptions<Q = QuotaObservation> {
|
|
|
50
50
|
* routine token refresh, which never moves the view.
|
|
51
51
|
*/
|
|
52
52
|
onRoster?: (roster: VaultRosterFile) => void;
|
|
53
|
+
/**
|
|
54
|
+
* Called once when a coalesced discovery starts, with its completion promise.
|
|
55
|
+
* Covers explicit refresh, poll, watch and send-triggered discovery, even when
|
|
56
|
+
* the view does not change. Observe rejection when attaching async work.
|
|
57
|
+
*/
|
|
58
|
+
onDiscovery?: (promise: Promise<VaultRosterFile | undefined>) => void;
|
|
53
59
|
onError?: (error: unknown) => void;
|
|
54
60
|
/**
|
|
55
61
|
* How often `start()` ticks. A tick lists the vault when no vault watch is
|
|
@@ -104,6 +110,8 @@ export interface HubMemberPort {
|
|
|
104
110
|
keptReceiptState(): KeptReceiptState;
|
|
105
111
|
/** Apply the union of every member's roster in memory to kept receipts. */
|
|
106
112
|
retainUnion(): void;
|
|
113
|
+
/** Share a committed preference change with live members using this roster file. */
|
|
114
|
+
publishRoster(roster: VaultRosterFile): void;
|
|
107
115
|
forget(credentialId: string): void;
|
|
108
116
|
/** The member closed: the hub stops committing and pushing to it. */
|
|
109
117
|
detach(): void;
|
|
@@ -113,6 +121,8 @@ export interface HubRefreshOutcome {
|
|
|
113
121
|
}
|
|
114
122
|
/** What the hub may do to one member's memory. Package-internal. */
|
|
115
123
|
export interface HubMemberHooks {
|
|
124
|
+
/** Observe a hub discovery without relying on member refresh overrides. */
|
|
125
|
+
discovery(promise: Promise<HubRefreshOutcome | undefined>): void;
|
|
116
126
|
/**
|
|
117
127
|
* Set the roster in memory as a consumer's own refresh does (pending quota
|
|
118
128
|
* readings included) and notify `onRoster` when its view changed.
|
|
@@ -314,8 +314,17 @@ export class ClaustrumConsumer {
|
|
|
314
314
|
this.#refreshing = undefined;
|
|
315
315
|
});
|
|
316
316
|
this.#track(this.#refreshing);
|
|
317
|
+
this.#notifyDiscovery(this.#refreshing);
|
|
317
318
|
return this.#refreshing;
|
|
318
319
|
}
|
|
320
|
+
#notifyDiscovery(promise) {
|
|
321
|
+
try {
|
|
322
|
+
this.#options.onDiscovery?.(promise);
|
|
323
|
+
}
|
|
324
|
+
catch (error) {
|
|
325
|
+
this.#options.onError?.(error);
|
|
326
|
+
}
|
|
327
|
+
}
|
|
319
328
|
/**
|
|
320
329
|
* Poll in the background and open the vault and insula watches. Until the
|
|
321
330
|
* vault watch is accepted, and whenever it is unavailable, every tick lists
|
|
@@ -571,6 +580,13 @@ export class ClaustrumConsumer {
|
|
|
571
580
|
/** The hub's handle on this member's memory. */
|
|
572
581
|
#hubHooks() {
|
|
573
582
|
return {
|
|
583
|
+
discovery: (promise) => {
|
|
584
|
+
const hub = this.#hub;
|
|
585
|
+
if (!hub || !this.#options.onDiscovery || this.#shutdown.signal.aborted)
|
|
586
|
+
return;
|
|
587
|
+
const discovery = this.#track(promise.then((outcome) => this.#hubOutcome(hub, outcome)));
|
|
588
|
+
this.#notifyDiscovery(discovery);
|
|
589
|
+
},
|
|
574
590
|
install: (roster) => {
|
|
575
591
|
if (this.#shutdown.signal.aborted)
|
|
576
592
|
return;
|
|
@@ -607,6 +623,9 @@ export class ClaustrumConsumer {
|
|
|
607
623
|
*/
|
|
608
624
|
async #hubRefresh(hub) {
|
|
609
625
|
const outcome = await hub.refresh();
|
|
626
|
+
return this.#hubOutcome(hub, outcome);
|
|
627
|
+
}
|
|
628
|
+
#hubOutcome(hub, outcome) {
|
|
610
629
|
this.#assertOpen();
|
|
611
630
|
if (!outcome)
|
|
612
631
|
return undefined;
|
|
@@ -788,6 +807,8 @@ export class ClaustrumConsumer {
|
|
|
788
807
|
this.#assertOpen();
|
|
789
808
|
await declineVaultRoute(this.#options.rosterPath, routeId);
|
|
790
809
|
this.#roster = pendingVaultQuota(this.#options.rosterPath, await readVaultRoster(this.#options.rosterPath));
|
|
810
|
+
if (this.#roster)
|
|
811
|
+
this.#hub?.publishRoster(this.#roster);
|
|
791
812
|
// A hub member shares kept receipts with every other member, so they are
|
|
792
813
|
// retained against all members' rosters, never against this one alone.
|
|
793
814
|
if (this.#hub)
|
|
@@ -799,6 +820,8 @@ export class ClaustrumConsumer {
|
|
|
799
820
|
this.#assertOpen();
|
|
800
821
|
await acceptVaultRoute(this.#options.rosterPath, routeId);
|
|
801
822
|
this.#roster = pendingVaultQuota(this.#options.rosterPath, await readVaultRoster(this.#options.rosterPath));
|
|
823
|
+
if (this.#roster)
|
|
824
|
+
this.#hub?.publishRoster(this.#roster);
|
|
802
825
|
}
|
|
803
826
|
/**
|
|
804
827
|
* Set the order vault accounts are tried in (`reorderVaultRoster`), then
|
|
@@ -809,6 +832,8 @@ export class ClaustrumConsumer {
|
|
|
809
832
|
this.#assertOpen();
|
|
810
833
|
const result = await reorderVaultRoster(this.#options.rosterPath, routeIds);
|
|
811
834
|
this.#roster = pendingVaultQuota(this.#options.rosterPath, await readVaultRoster(this.#options.rosterPath));
|
|
835
|
+
if (this.#roster)
|
|
836
|
+
this.#hub?.publishRoster(this.#roster);
|
|
812
837
|
return result;
|
|
813
838
|
}
|
|
814
839
|
/**
|
package/dist/claustrum/hub.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { QuotaObservation } from '../quota/index.js';
|
|
2
|
-
import { type ClaustrumConsumer } from './consumer.js';
|
|
2
|
+
import { type ClaustrumConsumer, type ClaustrumConsumerOptions } from './consumer.js';
|
|
3
3
|
import { type ClassifyingClaustrumFamily, type ClaustrumScopedClient, ClaustrumScopedCustody, type IdentityParser, type KeptReceiptState, type VaultGrantReach } from './custody.js';
|
|
4
4
|
import { type ClaustrumLogger } from './errors.js';
|
|
5
5
|
import { type AccountMapper, type VaultRosterFile } from './roster.js';
|
|
@@ -100,6 +100,8 @@ export interface ClaustrumHubMemberOptions<_Q = QuotaObservation> {
|
|
|
100
100
|
reservedRouteIds?: () => Iterable<string>;
|
|
101
101
|
/** As `ClaustrumConsumerOptions.onRoster`: once per change of view. */
|
|
102
102
|
onRoster?: (roster: VaultRosterFile) => void;
|
|
103
|
+
/** Observe every hub discovery's member result, including background work. */
|
|
104
|
+
onDiscovery?: ClaustrumConsumerOptions<_Q>['onDiscovery'];
|
|
103
105
|
/** This member's own failures, such as a roster commit that failed. */
|
|
104
106
|
onError?: (error: unknown) => void;
|
|
105
107
|
logger?: ClaustrumLogger;
|
package/dist/claustrum/hub.js
CHANGED
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
// never replaces a view another process committed after this hub listed.
|
|
13
13
|
import { createHash } from 'node:crypto';
|
|
14
14
|
import { readdir, stat } from 'node:fs/promises';
|
|
15
|
-
import { dirname, join } from 'node:path';
|
|
15
|
+
import { dirname, join, resolve } from 'node:path';
|
|
16
16
|
import { createLogger } from '../logger/index.js';
|
|
17
17
|
import { combineAbortSignals } from '../util/any-signal.js';
|
|
18
18
|
import { ClaustrumUnreachableError } from './availability.js';
|
|
@@ -23,6 +23,8 @@ import { ClaustrumConsumerError } from './errors.js';
|
|
|
23
23
|
import { DEFAULT_ROUTE_PREFIX, decodedVaultRoster, forgetPendingVaultDiscovery, isVaultRosterLockRefusal, readVaultRoster, refreshVaultRoster, vaultRosterSeed, } from './roster.js';
|
|
24
24
|
import { drainShutdown, shutdownWarning } from './shutdown.js';
|
|
25
25
|
import { SAFETY_POLL_MS } from './watch.js';
|
|
26
|
+
/** Published rosters are shared only in memory; file locks still order commits. */
|
|
27
|
+
const sharedRosters = new Map();
|
|
26
28
|
/** Lowercase ASCII, safe as a file name on every OS. */
|
|
27
29
|
const FILE_ID = /^[a-z0-9][a-z0-9._-]{0,63}$/;
|
|
28
30
|
/** Device names Windows reserves in every directory, with any extension. */
|
|
@@ -250,9 +252,11 @@ export class ClaustrumDiscoveryHub {
|
|
|
250
252
|
watchMode: () => this.watchState(),
|
|
251
253
|
keptReceiptState: () => this.keptReceiptState(),
|
|
252
254
|
retainUnion: () => this.#retainUnion(),
|
|
255
|
+
publishRoster: (roster) => this.#publishRoster(entry, roster),
|
|
253
256
|
forget: (credentialId) => this.#current?.custody?.forget(credentialId),
|
|
254
257
|
detach: () => {
|
|
255
258
|
entry.closed = true;
|
|
259
|
+
entry.releaseRoster?.();
|
|
256
260
|
},
|
|
257
261
|
};
|
|
258
262
|
const consumerOptions = {
|
|
@@ -265,14 +269,58 @@ export class ClaustrumDiscoveryHub {
|
|
|
265
269
|
}),
|
|
266
270
|
...(this.#options.mapAccount && { mapAccount: this.#options.mapAccount }),
|
|
267
271
|
...(options.onRoster && { onRoster: options.onRoster }),
|
|
272
|
+
...(options.onDiscovery && { onDiscovery: options.onDiscovery }),
|
|
268
273
|
...(options.onError && { onError: options.onError }),
|
|
269
274
|
logger: options.logger ?? this.#logger,
|
|
270
275
|
...(this.#options.now && { now: this.#options.now }),
|
|
271
276
|
};
|
|
272
277
|
const { consumer, hooks } = createHubMember(port, consumerOptions);
|
|
273
278
|
entry.hooks = hooks;
|
|
279
|
+
const path = resolve(entry.path);
|
|
280
|
+
const subscribers = sharedRosters.get(path) ?? new Set();
|
|
281
|
+
const install = (roster) => {
|
|
282
|
+
// A peer cannot reactivate an off or closed member, or install routes
|
|
283
|
+
// that collide with this plugin instance's local pool.
|
|
284
|
+
if (entry.closed ||
|
|
285
|
+
this.#active !== true ||
|
|
286
|
+
!this.#current ||
|
|
287
|
+
!this.#live(this.#current) ||
|
|
288
|
+
!hooks.roster() ||
|
|
289
|
+
this.#collides(hooks, roster))
|
|
290
|
+
return;
|
|
291
|
+
entry.seen = JSON.stringify(decodedVaultRoster(roster));
|
|
292
|
+
hooks.install(roster);
|
|
293
|
+
if (roster.view !== this.#committed?.view)
|
|
294
|
+
entry.pending ??= { failures: 0, wait: 0 };
|
|
295
|
+
this.#retainUnion();
|
|
296
|
+
};
|
|
297
|
+
subscribers.add(install);
|
|
298
|
+
entry.receiveRoster = install;
|
|
299
|
+
sharedRosters.set(path, subscribers);
|
|
300
|
+
let subscribed = true;
|
|
301
|
+
entry.releaseRoster = () => {
|
|
302
|
+
if (!subscribed)
|
|
303
|
+
return;
|
|
304
|
+
subscribed = false;
|
|
305
|
+
subscribers.delete(install);
|
|
306
|
+
if (!subscribers.size)
|
|
307
|
+
sharedRosters.delete(path);
|
|
308
|
+
};
|
|
274
309
|
return consumer;
|
|
275
310
|
}
|
|
311
|
+
#publishRoster(entry, roster) {
|
|
312
|
+
const generation = this.#current;
|
|
313
|
+
if (entry.closed || !generation || !this.#live(generation))
|
|
314
|
+
return;
|
|
315
|
+
entry.seen = JSON.stringify(decodedVaultRoster(roster));
|
|
316
|
+
entry.hooks?.install(roster);
|
|
317
|
+
for (const install of sharedRosters.get(resolve(entry.path)) ?? []) {
|
|
318
|
+
if (!this.#live(generation))
|
|
319
|
+
return;
|
|
320
|
+
if (install !== entry.receiveRoster)
|
|
321
|
+
install(roster);
|
|
322
|
+
}
|
|
323
|
+
}
|
|
276
324
|
// --- leases ---
|
|
277
325
|
#startGeneration() {
|
|
278
326
|
const generation = {
|
|
@@ -582,6 +630,8 @@ export class ClaustrumDiscoveryHub {
|
|
|
582
630
|
}));
|
|
583
631
|
run.promise = promise;
|
|
584
632
|
this.#run = run;
|
|
633
|
+
for (const entry of this.#open())
|
|
634
|
+
entry.hooks?.discovery(promise);
|
|
585
635
|
return promise;
|
|
586
636
|
}
|
|
587
637
|
/**
|
|
@@ -681,9 +731,7 @@ export class ClaustrumDiscoveryHub {
|
|
|
681
731
|
continue;
|
|
682
732
|
}
|
|
683
733
|
// The push: memory holds the committed roster before refresh resolves.
|
|
684
|
-
entry
|
|
685
|
-
if (!entry.closed)
|
|
686
|
-
hooks.install(roster);
|
|
734
|
+
this.#publishRoster(entry, roster);
|
|
687
735
|
}
|
|
688
736
|
if (!this.#live(generation))
|
|
689
737
|
return undefined;
|
|
@@ -850,7 +898,7 @@ export class ClaustrumDiscoveryHub {
|
|
|
850
898
|
}
|
|
851
899
|
const before = enabledRows(memory);
|
|
852
900
|
entry.seen = content;
|
|
853
|
-
|
|
901
|
+
this.#publishRoster(entry, file);
|
|
854
902
|
if (enabledRows(hooks.roster()) !== before)
|
|
855
903
|
this.#retainUnion();
|
|
856
904
|
}
|
|
@@ -1013,6 +1061,8 @@ export class ClaustrumDiscoveryHub {
|
|
|
1013
1061
|
if (this.#shutdown.signal.aborted)
|
|
1014
1062
|
return;
|
|
1015
1063
|
this.#shutdown.abort(closed('Claustrum discovery hub is closed'));
|
|
1064
|
+
for (const entry of this.#members.values())
|
|
1065
|
+
entry.releaseRoster?.();
|
|
1016
1066
|
if (this.#timer)
|
|
1017
1067
|
(this.#options.clearTimeoutImpl ?? clearTimeout)(this.#timer);
|
|
1018
1068
|
this.#timer = undefined;
|
package/dist/claustrum/roster.js
CHANGED
|
@@ -21,7 +21,8 @@ export interface LockLoss {
|
|
|
21
21
|
export interface RefreshFileLock {
|
|
22
22
|
readonly ownerId: string;
|
|
23
23
|
assertOwned(): Promise<void>;
|
|
24
|
-
release
|
|
24
|
+
/** Abort stops release retries; the unrenewed lease is left to expire by TTL. */
|
|
25
|
+
release(signal?: AbortSignal): Promise<void>;
|
|
25
26
|
/** Resolves once on detected loss; remains pending after an owner's release. */
|
|
26
27
|
whenLost(): Promise<LockLoss>;
|
|
27
28
|
hasLost(): boolean;
|
|
@@ -836,7 +836,7 @@ export async function acquireRefreshFileLockWithClock(options) {
|
|
|
836
836
|
: {}),
|
|
837
837
|
});
|
|
838
838
|
},
|
|
839
|
-
release: async () => {
|
|
839
|
+
release: async (signal) => {
|
|
840
840
|
if (windowsPrivateFiles && releaseConfirmed)
|
|
841
841
|
return;
|
|
842
842
|
released = true;
|
|
@@ -882,6 +882,8 @@ export async function acquireRefreshFileLockWithClock(options) {
|
|
|
882
882
|
releaseConfirmed = removalConfirmed;
|
|
883
883
|
return;
|
|
884
884
|
}
|
|
885
|
+
if (signal?.aborted)
|
|
886
|
+
return;
|
|
885
887
|
await recoverStaleEvictionMarker();
|
|
886
888
|
}
|
|
887
889
|
catch (error) {
|
package/dist/fs/with-lock.js
CHANGED
|
@@ -5,4 +5,4 @@ export type { FormAnswer, LoginContext, PoolAuthorization, PoolLoginMethod, Regi
|
|
|
5
5
|
export { isPlaceholderCredential, PLACEHOLDER_LIFETIME_MS, PLACEHOLDER_METADATA_KEY, PLACEHOLDER_PREFIX, placeholderCredential, placeholderSecret, registerOpenCode2AuthMethods, VAULT_ACTIVATION_INSTRUCTIONS, } from './integration.js';
|
|
6
6
|
export type { ServerSentEvent } from './sse.js';
|
|
7
7
|
export { watchServerSentEvents } from './sse.js';
|
|
8
|
-
export type { AccountHeadersResult, AccountRequest, Attempt, AttemptEndReason, AttemptOutcome, ChooseAccountInput, ChooseAccountResult, EventVerdict, HeaderEdits, HostError, InstallOpenCode2AuthOptions, LimitSignal, OpenCode2AuthAdapter, OpenCode2AuthEventName, OpenCode2AuthEvents, OpenCode2AuthInstallation, OpenCode2AuthLogger, OpenCode2HookContext, RequestKind, RequestScope, ResponseAccount, RetryHold, RetryReason, SelectingHook, Transport, } from './types.js';
|
|
8
|
+
export type { AccountHeadersResult, AccountRequest, Attempt, AttemptEndReason, AttemptOutcome, ChooseAccountInput, ChooseAccountResult, EventVerdict, HeaderEdits, HostError, InstallOpenCode2AuthOptions, LimitSignal, OpenCode2AuthAdapter, OpenCode2AuthEventName, OpenCode2AuthEvents, OpenCode2AuthInstallation, OpenCode2AuthLogger, OpenCode2HookContext, RequestKind, RequestScope, ResponseAccount, RetryHold, RetryReason, SameAccountRetryInput, SameAccountRetryResult, SelectingHook, Transport, } from './types.js';
|
|
@@ -51,8 +51,9 @@ export declare function applyHeaderEdits(target: Record<string, string>, edits:
|
|
|
51
51
|
* compares the host-prepared secret exactly, then selects a fresh attempt only
|
|
52
52
|
* for an owned send. Request-object attribution therefore needs no attempt
|
|
53
53
|
* header. Frames are owned by the latest handshake of their session and kind;
|
|
54
|
-
* retry runs only when the session's latest transport was owned
|
|
55
|
-
* has
|
|
56
|
-
*
|
|
54
|
+
* retry runs only when the session's latest transport was owned. The host's
|
|
55
|
+
* retry hook has no request identity, so a session that has mixed owned and
|
|
56
|
+
* foreign transports leaves failover and holds to the host. Identity-preserving
|
|
57
|
+
* retries through `retrySameAccount` do not select an account and remain allowed.
|
|
57
58
|
*/
|
|
58
59
|
export declare function installOpenCode2Auth<Q, A = unknown>(ctx: OpenCode2HookContext, adapter: OpenCode2AuthAdapter<Q, A, ChooseAccountResult>, options?: InstallOpenCode2AuthOptions): Promise<OpenCode2AuthInstallation<Q, A>>;
|
|
@@ -122,9 +122,10 @@ function applyHeaderEditsTo(target, edits) {
|
|
|
122
122
|
* compares the host-prepared secret exactly, then selects a fresh attempt only
|
|
123
123
|
* for an owned send. Request-object attribution therefore needs no attempt
|
|
124
124
|
* header. Frames are owned by the latest handshake of their session and kind;
|
|
125
|
-
* retry runs only when the session's latest transport was owned
|
|
126
|
-
* has
|
|
127
|
-
*
|
|
125
|
+
* retry runs only when the session's latest transport was owned. The host's
|
|
126
|
+
* retry hook has no request identity, so a session that has mixed owned and
|
|
127
|
+
* foreign transports leaves failover and holds to the host. Identity-preserving
|
|
128
|
+
* retries through `retrySameAccount` do not select an account and remain allowed.
|
|
128
129
|
*/
|
|
129
130
|
export async function installOpenCode2Auth(ctx, adapter, options = {}) {
|
|
130
131
|
const { providerID } = adapter;
|
|
@@ -230,13 +231,31 @@ export async function installOpenCode2Auth(ctx, adapter, options = {}) {
|
|
|
230
231
|
});
|
|
231
232
|
}
|
|
232
233
|
};
|
|
234
|
+
const releaseSameAccount = async (next) => {
|
|
235
|
+
try {
|
|
236
|
+
await adapter.dropSameAccountRetry?.({
|
|
237
|
+
...next.input,
|
|
238
|
+
accountId: next.accountId,
|
|
239
|
+
});
|
|
240
|
+
}
|
|
241
|
+
catch (error) {
|
|
242
|
+
warn('opencode2 auth dropSameAccountRetry threw; the request is unaffected', {
|
|
243
|
+
sessionID: next.input.sessionID,
|
|
244
|
+
error: describe(error),
|
|
245
|
+
});
|
|
246
|
+
}
|
|
247
|
+
};
|
|
248
|
+
const releaseRetry = async (pending) => {
|
|
249
|
+
if (pending.next)
|
|
250
|
+
await releaseChoice(pending.next);
|
|
251
|
+
if (pending.sameAccount)
|
|
252
|
+
await releaseSameAccount(pending.sameAccount);
|
|
253
|
+
};
|
|
233
254
|
const discardPending = (key) => {
|
|
234
255
|
const pending = pendingRetries.get(key);
|
|
235
256
|
pendingRetries.delete(key);
|
|
236
|
-
if (pending
|
|
237
|
-
|
|
238
|
-
void inChoiceOrder(pending.sessionID, () => releaseChoice(next));
|
|
239
|
-
}
|
|
257
|
+
if (pending)
|
|
258
|
+
void inChoiceOrder(pending.sessionID, () => releaseRetry(pending));
|
|
240
259
|
};
|
|
241
260
|
const emit = async (event, payload) => {
|
|
242
261
|
const set = listeners.get(event);
|
|
@@ -380,13 +399,17 @@ export async function installOpenCode2Auth(ctx, adapter, options = {}) {
|
|
|
380
399
|
};
|
|
381
400
|
const select = async (scope, hook, assertActive, transport) => {
|
|
382
401
|
const key = keyOf(scope.sessionID, scope.kind);
|
|
383
|
-
const { input, accountId } = await afterChoiceWork(scope.sessionID, async () => {
|
|
402
|
+
const { input, accountId, sameAccountRetry } = await afterChoiceWork(scope.sessionID, async () => {
|
|
384
403
|
assertActive();
|
|
385
404
|
const retried = pendingRetries.get(key);
|
|
386
405
|
pendingRetries.delete(key);
|
|
387
406
|
const previousAccountId = retried?.accountId ?? newestOf(key)?.accountId;
|
|
388
407
|
supersede(key);
|
|
389
408
|
const next = retried?.next;
|
|
409
|
+
const sameAccount = retried?.sameAccount;
|
|
410
|
+
const sameRoute = sameAccount !== undefined &&
|
|
411
|
+
sameAccount.input.modelID === scope.modelID &&
|
|
412
|
+
sameAccount.input.agent === scope.agent;
|
|
390
413
|
const matches = next !== undefined &&
|
|
391
414
|
next.input.modelID === scope.modelID &&
|
|
392
415
|
next.input.agent === scope.agent;
|
|
@@ -400,11 +423,17 @@ export async function installOpenCode2Auth(ctx, adapter, options = {}) {
|
|
|
400
423
|
await inChoiceOrder(scope.sessionID, () => releaseChoice(next));
|
|
401
424
|
assertActive();
|
|
402
425
|
}
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
426
|
+
if (sameAccount && !sameRoute) {
|
|
427
|
+
await inChoiceOrder(scope.sessionID, () => releaseSameAccount(sameAccount));
|
|
428
|
+
assertActive();
|
|
429
|
+
}
|
|
430
|
+
const choice = sameRoute
|
|
431
|
+
? sameAccount.accountId
|
|
432
|
+
: matches
|
|
433
|
+
? next.accountId
|
|
434
|
+
: await adapter.chooseAccount(input);
|
|
406
435
|
const accountId = typeof choice === 'string' ? choice : undefined;
|
|
407
|
-
return { input, accountId };
|
|
436
|
+
return { input, accountId, sameAccountRetry: sameRoute };
|
|
408
437
|
});
|
|
409
438
|
assertActive();
|
|
410
439
|
let headers = {};
|
|
@@ -438,6 +467,7 @@ export async function installOpenCode2Auth(ctx, adapter, options = {}) {
|
|
|
438
467
|
},
|
|
439
468
|
...(transport === undefined ? {} : { transport }),
|
|
440
469
|
outputStarted: false,
|
|
470
|
+
sameAccountRetry,
|
|
441
471
|
};
|
|
442
472
|
remember(rec);
|
|
443
473
|
if (rec.attempt) {
|
|
@@ -815,7 +845,7 @@ export async function installOpenCode2Auth(ctx, adapter, options = {}) {
|
|
|
815
845
|
hostDecision,
|
|
816
846
|
decision: hostDecision,
|
|
817
847
|
});
|
|
818
|
-
if (mixed(draft.sessionID)) {
|
|
848
|
+
if (mixed(draft.sessionID) && !adapter.retrySameAccount) {
|
|
819
849
|
await hostDecides();
|
|
820
850
|
return;
|
|
821
851
|
}
|
|
@@ -837,6 +867,104 @@ export async function installOpenCode2Auth(ctx, adapter, options = {}) {
|
|
|
837
867
|
const rec = picked;
|
|
838
868
|
await withSelection(rec.scope, async (assertActive) => {
|
|
839
869
|
const checkRetryActive = assertActive;
|
|
870
|
+
const retrySameAccount = adapter.retrySameAccount?.bind(adapter);
|
|
871
|
+
const handle = rec.attempt;
|
|
872
|
+
if (retrySameAccount &&
|
|
873
|
+
handle &&
|
|
874
|
+
!rec.outputStarted &&
|
|
875
|
+
!rec.sameAccountRetry) {
|
|
876
|
+
if (rec.ended)
|
|
877
|
+
await rec.ended;
|
|
878
|
+
if (rec.limit)
|
|
879
|
+
await rec.limit.delivered;
|
|
880
|
+
const retried = await inChoiceOrder(rec.scope.sessionID, async () => {
|
|
881
|
+
checkRetryActive();
|
|
882
|
+
const accountId = handle.accountId;
|
|
883
|
+
const active = () => attempts.has(rec.id) &&
|
|
884
|
+
rec.accountId === accountId &&
|
|
885
|
+
pickForRetry(draft.sessionID) === rec &&
|
|
886
|
+
!rec.outputStarted &&
|
|
887
|
+
(!ownership ||
|
|
888
|
+
latestTransportOwned.get(draft.sessionID) === true);
|
|
889
|
+
if (!active() || rec.sameAccountRetry)
|
|
890
|
+
return false;
|
|
891
|
+
rec.sameAccountRetry = true;
|
|
892
|
+
const input = {
|
|
893
|
+
...rec.scope,
|
|
894
|
+
accountId,
|
|
895
|
+
error: draft.error,
|
|
896
|
+
attempt: draft.attempt,
|
|
897
|
+
...(rec.limit ? { limit: rec.limit.signal } : {}),
|
|
898
|
+
};
|
|
899
|
+
let result;
|
|
900
|
+
try {
|
|
901
|
+
result = await retrySameAccount(input);
|
|
902
|
+
}
|
|
903
|
+
catch (error) {
|
|
904
|
+
warn('opencode2 auth retrySameAccount threw; recovery declined', {
|
|
905
|
+
sessionID: draft.sessionID,
|
|
906
|
+
error: describe(error),
|
|
907
|
+
});
|
|
908
|
+
}
|
|
909
|
+
if (!result) {
|
|
910
|
+
checkRetryActive();
|
|
911
|
+
return false;
|
|
912
|
+
}
|
|
913
|
+
const sameAccount = { accountId: result.accountId, input };
|
|
914
|
+
try {
|
|
915
|
+
checkRetryActive();
|
|
916
|
+
}
|
|
917
|
+
catch (error) {
|
|
918
|
+
await releaseSameAccount(sameAccount);
|
|
919
|
+
throw error;
|
|
920
|
+
}
|
|
921
|
+
if (!active() || result.accountId !== accountId) {
|
|
922
|
+
await releaseSameAccount(sameAccount);
|
|
923
|
+
return false;
|
|
924
|
+
}
|
|
925
|
+
const old = pendingRetries.get(rec.key);
|
|
926
|
+
pendingRetries.delete(rec.key);
|
|
927
|
+
if (old)
|
|
928
|
+
await releaseRetry(old);
|
|
929
|
+
try {
|
|
930
|
+
checkRetryActive();
|
|
931
|
+
}
|
|
932
|
+
catch (error) {
|
|
933
|
+
await releaseSameAccount(sameAccount);
|
|
934
|
+
throw error;
|
|
935
|
+
}
|
|
936
|
+
if (!active()) {
|
|
937
|
+
await releaseSameAccount(sameAccount);
|
|
938
|
+
return false;
|
|
939
|
+
}
|
|
940
|
+
// Pin only this retry's route: choosing afresh could turn a token
|
|
941
|
+
// refresh or path recovery into an account switch in a mixed session.
|
|
942
|
+
pendingRetries.set(rec.key, {
|
|
943
|
+
attemptId: rec.id,
|
|
944
|
+
sessionID: rec.scope.sessionID,
|
|
945
|
+
order: ++retryOrder,
|
|
946
|
+
accountId,
|
|
947
|
+
sameAccount,
|
|
948
|
+
});
|
|
949
|
+
rec.judged = true;
|
|
950
|
+
draft.decision = { retry: true, delay: 0 };
|
|
951
|
+
return true;
|
|
952
|
+
});
|
|
953
|
+
checkRetryActive();
|
|
954
|
+
if (retried) {
|
|
955
|
+
await emit('retry', {
|
|
956
|
+
sessionID: draft.sessionID,
|
|
957
|
+
accountId: rec.accountId,
|
|
958
|
+
kind: rec.scope.kind,
|
|
959
|
+
attempt: draft.attempt,
|
|
960
|
+
reason: 'same-account',
|
|
961
|
+
hostDecision,
|
|
962
|
+
decision: draft.decision,
|
|
963
|
+
handle: rec.attempt,
|
|
964
|
+
});
|
|
965
|
+
return;
|
|
966
|
+
}
|
|
967
|
+
}
|
|
840
968
|
// Recheck after entering selection before attributing an identity-less error.
|
|
841
969
|
if (mixed(draft.sessionID)) {
|
|
842
970
|
await hostDecides();
|
|
@@ -866,8 +994,8 @@ export async function installOpenCode2Auth(ctx, adapter, options = {}) {
|
|
|
866
994
|
};
|
|
867
995
|
const old = pendingRetries.get(rec.key);
|
|
868
996
|
pendingRetries.delete(rec.key);
|
|
869
|
-
if (old
|
|
870
|
-
await
|
|
997
|
+
if (old)
|
|
998
|
+
await releaseRetry(old);
|
|
871
999
|
checkRetryActive();
|
|
872
1000
|
if (mixed(draft.sessionID))
|
|
873
1001
|
return {
|
|
@@ -1064,8 +1192,7 @@ export async function installOpenCode2Auth(ctx, adapter, options = {}) {
|
|
|
1064
1192
|
if (pending.sessionID === sessionID &&
|
|
1065
1193
|
pending.order < idleOrder) {
|
|
1066
1194
|
pendingRetries.delete(key);
|
|
1067
|
-
|
|
1068
|
-
await releaseChoice(pending.next);
|
|
1195
|
+
await releaseRetry(pending);
|
|
1069
1196
|
}
|
|
1070
1197
|
}
|
|
1071
1198
|
});
|
|
@@ -173,6 +173,22 @@ export interface HostError {
|
|
|
173
173
|
readonly message: string;
|
|
174
174
|
readonly status?: number;
|
|
175
175
|
}
|
|
176
|
+
/** The known route and host error for an identity-preserving retry. */
|
|
177
|
+
export interface SameAccountRetryInput extends AccountRequest {
|
|
178
|
+
readonly error: HostError;
|
|
179
|
+
/** The host's retry attempt count. */
|
|
180
|
+
readonly attempt: number;
|
|
181
|
+
/**
|
|
182
|
+
* The signal already recorded by a response/frame trigger, if any. Its reason
|
|
183
|
+
* can key prepared credentials, so recovery need not refresh them twice.
|
|
184
|
+
* limitFromError is not called before this callback in a mixed session.
|
|
185
|
+
*/
|
|
186
|
+
readonly limit?: LimitSignal;
|
|
187
|
+
}
|
|
188
|
+
/** Request an immediate retry; a different account ID is ignored. */
|
|
189
|
+
export interface SameAccountRetryResult {
|
|
190
|
+
readonly accountId: string;
|
|
191
|
+
}
|
|
176
192
|
/**
|
|
177
193
|
* Everything provider-specific the installer needs. `Q` is the plugin's own
|
|
178
194
|
* quota reading type; the installer only carries it to the `quota` event.
|
|
@@ -345,6 +361,39 @@ export interface OpenCode2AuthAdapter<Q = unknown, A = unknown, Choice extends C
|
|
|
345
361
|
* the retry hook judged.
|
|
346
362
|
*/
|
|
347
363
|
limitFromError?(error: HostError, attempt: Attempt<A>): LimitSignal | undefined;
|
|
364
|
+
/**
|
|
365
|
+
* Optional recovery on the same route before account failover is considered.
|
|
366
|
+
* May only use a newer record version of the same credentialId and accountIdentity,
|
|
367
|
+
* a different local access token for the same subject, or another path to the
|
|
368
|
+
* same provider with the same credential. The adapter must
|
|
369
|
+
* preserve those identities; opaque credential material is not inspected here.
|
|
370
|
+
* Return {accountId: input.accountId} to retry immediately, or undefined to decline.
|
|
371
|
+
* A different accountId is ignored. Never move a routing pin or select another
|
|
372
|
+
* account here: use chooseAccount for failover and holds.
|
|
373
|
+
*
|
|
374
|
+
* Runs only for an attributable attempt before output, and, when gated, only
|
|
375
|
+
* while the latest transport is owned. Unlike failover and holds, it also runs
|
|
376
|
+
* in mixed-ownership sessions. The next matching owned request skips selection
|
|
377
|
+
* and calls accountHeaders again for this account, so newer credentials or a
|
|
378
|
+
* changed transport path can take effect without changing accounts. Runs at
|
|
379
|
+
* most once per attempt, never on the attempt sent by this recovery, so retries
|
|
380
|
+
* cannot chain. Use input.limit to consume state prepared by a response/frame
|
|
381
|
+
* trigger; without one, the callback may handle input.error itself. Do not
|
|
382
|
+
* refresh again when the trigger has already prepared the new credential.
|
|
383
|
+
* No choice was committed through chooseAccount; unused recovery state is
|
|
384
|
+
* released through dropSameAccountRetry instead of dropChoice.
|
|
385
|
+
* Errors are logged and treated as declining the retry.
|
|
386
|
+
*/
|
|
387
|
+
retrySameAccount?(input: SameAccountRetryInput): Promise<SameAccountRetryResult | undefined> | SameAccountRetryResult | undefined;
|
|
388
|
+
/**
|
|
389
|
+
* Releases a returned same-account recovery that will not be sent: a rejected
|
|
390
|
+
* account ID, selection revocation, changed model/agent, cancellation (session
|
|
391
|
+
* idle), forgetting/deletion, disposal or eviction. Receives the original
|
|
392
|
+
* callback input and returned accountId, once, never for a consumed recovery.
|
|
393
|
+
* Awaited before later selection for the session; errors are logged and swallowed.
|
|
394
|
+
* A callback that declines or throws must clean up its own uncommitted state.
|
|
395
|
+
*/
|
|
396
|
+
dropSameAccountRetry?(input: SameAccountRetryInput & SameAccountRetryResult): Promise<void> | void;
|
|
348
397
|
/**
|
|
349
398
|
* Called once per attempt when it ends: an HTTP response body finished,
|
|
350
399
|
* errored or was cancelled; an HTTP response with an error status or no
|
|
@@ -400,11 +449,13 @@ export interface InstallOpenCode2AuthOptions {
|
|
|
400
449
|
* (its wait, or its refusal to retry) stands and the next attempt may go
|
|
401
450
|
* to the refused account again;
|
|
402
451
|
* - `hold`: an explicit adapter wait on the refused account, before output;
|
|
452
|
+
* - `same-account`: the adapter requested immediate recovery on the same route,
|
|
453
|
+
* without account selection, before output;
|
|
403
454
|
* - `host-decides`: no limit was recognised, or the failing call cannot be
|
|
404
455
|
* attributed safely (ambiguous attempts or mixed ownership in a gated
|
|
405
456
|
* session), so the host's decision stands.
|
|
406
457
|
*/
|
|
407
|
-
export type RetryReason = 'reroute' | 'hold' | 'output-started' | 'no-account' | 'host-decides-last-account' | 'host-decides';
|
|
458
|
+
export type RetryReason = 'reroute' | 'hold' | 'same-account' | 'output-started' | 'no-account' | 'host-decides-last-account' | 'host-decides';
|
|
408
459
|
/**
|
|
409
460
|
* The hook that picked an account. Normally `model.request`; a transport hook
|
|
410
461
|
* picks only when the host skipped `model.request` for that request, which a
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cortexkit/common-auth",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.30.0",
|
|
4
4
|
"description": "Shared code for the CortexKit auth plugins: account pool, quota and routing, commands and auth menu, OpenCode 2 hooks, Claustrum custody, and plumbing (loopback RPC, file locks, logger, sidebar state, TUI preferences and build).",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|