@byokit/openclaw 0.5.0 → 0.6.1
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/CHANGELOG.md +39 -0
- package/README.md +174 -2
- package/dist/auth-store.js +1 -1
- package/dist/bridge.d.ts +10 -2
- package/dist/bridge.js +61 -14
- package/dist/browser/broker.d.ts +63 -0
- package/dist/browser/broker.js +990 -0
- package/dist/browser/host.d.ts +98 -0
- package/dist/browser/host.js +945 -0
- package/dist/browser/resume.d.ts +10 -0
- package/dist/browser/resume.js +23 -0
- package/dist/browser/store.d.ts +25 -0
- package/dist/browser/store.js +151 -0
- package/dist/browser/verify.d.ts +17 -0
- package/dist/browser/verify.js +38 -0
- package/dist/browser.d.ts +212 -0
- package/dist/browser.js +4 -0
- package/dist/config.d.ts +28 -0
- package/dist/config.js +130 -0
- package/dist/day-usage.d.ts +76 -0
- package/dist/day-usage.js +104 -0
- package/dist/device.d.ts +32 -2
- package/dist/device.js +224 -4
- package/dist/engine-patches.d.ts +36 -0
- package/dist/engine-patches.js +320 -0
- package/dist/engine-status.d.ts +13 -0
- package/dist/engine-status.js +31 -0
- package/dist/engine.d.ts +13 -1
- package/dist/engine.js +99 -52
- package/dist/index.d.ts +6 -1
- package/dist/index.js +2 -0
- package/dist/kit.d.ts +29 -3
- package/dist/kit.js +324 -13
- package/dist/link.d.ts +5 -2
- package/dist/link.js +333 -4
- package/dist/routes.d.ts +19 -8
- package/dist/routes.js +44 -11
- package/dist/routes.json +3775 -356
- package/dist/runs.js +8 -2
- package/dist/signin.d.ts +2 -1
- package/dist/signin.js +103 -7
- package/dist/testing/browser.d.ts +50 -0
- package/dist/testing/browser.js +166 -0
- package/dist/testing/index.d.ts +1 -0
- package/dist/testing/index.js +1 -0
- package/dist/testing/model-stub.d.ts +1 -0
- package/dist/testing/model-stub.js +3 -1
- package/dist/types.d.ts +50 -3
- package/dist/usage-boots.d.ts +8 -0
- package/dist/usage-boots.js +26 -0
- package/dist/usage.d.ts +51 -0
- package/dist/usage.js +61 -0
- package/dist/words.json +42 -0
- package/engine/OPENCLAW-LICENSE +24 -0
- package/engine/patches.json +59 -0
- package/engine/patches.schema.json +41 -0
- package/package.json +12 -4
- package/plugin/index.js +78 -5
- package/plugin/usage.js +125 -0
package/dist/runs.js
CHANGED
|
@@ -84,6 +84,10 @@ export function createRuns(ctx) {
|
|
|
84
84
|
// Member boundary first: a member never speaks in another member's session, refused before any request.
|
|
85
85
|
if (!spec.sessionKey.startsWith(`agent:${spec.member}:`))
|
|
86
86
|
throw new Error(`refused: "${spec.sessionKey}" is not a session of member "${spec.member}"`);
|
|
87
|
+
// Same validation as the pin's NonEmptyString; preserve the caller's bytes (including whitespace).
|
|
88
|
+
if (spec.idempotencyKey !== undefined && (typeof spec.idempotencyKey !== 'string' || !spec.idempotencyKey.length))
|
|
89
|
+
throw new Error('refused: idempotencyKey must be a non-empty string');
|
|
90
|
+
const idempotencyKey = spec.idempotencyKey ?? randomUUID();
|
|
87
91
|
const output = preparedOutput ?? (spec.schema === undefined ? undefined : outputSchema(spec.schema));
|
|
88
92
|
const system = [spec.system, output?.prompt].filter(Boolean).join('\n\n');
|
|
89
93
|
const picked = spec.model === undefined ? undefined : account(spec.model);
|
|
@@ -92,7 +96,7 @@ export function createRuns(ctx) {
|
|
|
92
96
|
throw new Error(`refused: "${tool}" is not one of this kit's tools`);
|
|
93
97
|
const agentId = keyAgent ?? (await ctx.ensure(spec.member)).agentId;
|
|
94
98
|
const sessionKey = keyAgent ? `agent:${keyAgent}:${spec.sessionKey.slice(`agent:${spec.member}:`.length)}` : spec.sessionKey;
|
|
95
|
-
const release = spec.register !== false ? ctx.bridge.register({ sessionKey, member: spec.member }, spec.tools) : undefined;
|
|
99
|
+
const release = spec.register !== false ? ctx.bridge.register({ sessionKey, member: spec.member }, spec.tools, idempotencyKey) : undefined;
|
|
96
100
|
let last;
|
|
97
101
|
let runId = ''; // gateway events for other runs carry a real runId and never match the empty one
|
|
98
102
|
let ended = false;
|
|
@@ -155,7 +159,7 @@ export function createRuns(ctx) {
|
|
|
155
159
|
agentId,
|
|
156
160
|
sessionKey,
|
|
157
161
|
message: spec.message,
|
|
158
|
-
idempotencyKey
|
|
162
|
+
idempotencyKey,
|
|
159
163
|
...(picked ?? {}),
|
|
160
164
|
...(system ? { extraSystemPrompt: system } : {}),
|
|
161
165
|
...(spec.images ? { attachments: spec.images.map((image) => ({ mimeType: image.mimeType, content: image.data })) } : {}),
|
|
@@ -166,6 +170,8 @@ export function createRuns(ctx) {
|
|
|
166
170
|
runId = started.runId;
|
|
167
171
|
const result = await ctx.request('agent.wait', { runId, timeoutMs: WAIT_MS }, { timeoutMs: WAIT_CLIENT_MS });
|
|
168
172
|
if (result.status === 'ok') {
|
|
173
|
+
// A cached `in_flight` replay has no final subscription. Keep the existing wait/stream fallback:
|
|
174
|
+
// re-sending `agent` to fetch its final could dispatch again if the bounded cache was evicted.
|
|
169
175
|
const done = await Promise.race([final.catch(() => undefined), delay(FINAL_GRACE_MS, undefined, { ref: false })]);
|
|
170
176
|
ended = true; // no later stream event may supersede the final callback
|
|
171
177
|
const frame = isRecord(done) && isRecord(done.result) ? done.result : {};
|
package/dist/signin.d.ts
CHANGED
|
@@ -5,10 +5,11 @@ export type SignInCtx = {
|
|
|
5
5
|
agentId: string;
|
|
6
6
|
}>;
|
|
7
7
|
callbackPort: number;
|
|
8
|
+
onDisconnect?(fn: () => void): () => void;
|
|
8
9
|
};
|
|
9
10
|
/**
|
|
10
11
|
* Drive the engine's provider-owned login. `on` sees every view the person watches; `done` resolves once, and
|
|
11
|
-
* `paste` hands a returned browser address to a waiting wizard text step. Every exit short of done cancels this
|
|
12
|
+
* `paste` hands a returned browser address or sign-in token to a waiting wizard text step. Every exit short of done cancels this
|
|
12
13
|
* session and its callback listener only.
|
|
13
14
|
*/
|
|
14
15
|
export declare function signIn(ctx: SignInCtx, member: Member, o: SignInOptions, on: (v: SignInView) => void): {
|
package/dist/signin.js
CHANGED
|
@@ -12,19 +12,21 @@ const START_MS = 60_000;
|
|
|
12
12
|
const PULL_MS = 120_000;
|
|
13
13
|
const STATUS_MS = 20_000;
|
|
14
14
|
const CANCEL_MS = 10_000;
|
|
15
|
+
const RECONFIRM_MS = 60_000;
|
|
15
16
|
const TURNS = 200;
|
|
16
17
|
const PASTE_MS = 15 * 60_000;
|
|
17
18
|
const cut = (value) => (value instanceof Error ? value.message : String(value)).slice(0, 200);
|
|
18
19
|
const pullOptions = (signal) => ({ timeoutMs: PULL_MS, signal });
|
|
19
20
|
/**
|
|
20
21
|
* Drive the engine's provider-owned login. `on` sees every view the person watches; `done` resolves once, and
|
|
21
|
-
* `paste` hands a returned browser address to a waiting wizard text step. Every exit short of done cancels this
|
|
22
|
+
* `paste` hands a returned browser address or sign-in token to a waiting wizard text step. Every exit short of done cancels this
|
|
22
23
|
* session and its callback listener only.
|
|
23
24
|
*/
|
|
24
25
|
export function signIn(ctx, member, o, on) {
|
|
25
26
|
const via = o.via ?? 'browser';
|
|
26
27
|
const owner = new AbortController();
|
|
27
28
|
const { signal } = owner;
|
|
29
|
+
const driveOwner = new AbortController();
|
|
28
30
|
const wantsCallback = via === 'browser' && o.authChoice === 'openai';
|
|
29
31
|
let server;
|
|
30
32
|
let sessionId = '';
|
|
@@ -33,6 +35,24 @@ export function signIn(ctx, member, o, on) {
|
|
|
33
35
|
let settleStart;
|
|
34
36
|
const startingSettled = new Promise((resolve) => { settleStart = resolve; });
|
|
35
37
|
let over = false;
|
|
38
|
+
let recovering = false;
|
|
39
|
+
let offDisconnect;
|
|
40
|
+
let agentId;
|
|
41
|
+
let before;
|
|
42
|
+
// Only ChatGPT's OAuth routes are qualified for auth-reload recovery. No API-key fallback.
|
|
43
|
+
const reconfirm = o.authChoice === 'openai' || o.authChoice === 'openai-device-code';
|
|
44
|
+
// Pin models-auth-status: profiles carry {profileId, type, status, expiry: {at, remainingMs, label}}.
|
|
45
|
+
// Older summaries are not credential proof; a refreshed pre-existing id cannot stand in for this login.
|
|
46
|
+
const profiles = (status, usable = true) => {
|
|
47
|
+
const auth = status;
|
|
48
|
+
if (auth?.unavailable || !Array.isArray(auth?.providers) || auth.providers.some((row) => !row || typeof row !== 'object' || typeof row.provider !== 'string' || !Array.isArray(row.profiles)
|
|
49
|
+
|| row.profiles.some((p) => !p || typeof p.profileId !== 'string' || typeof p.type !== 'string')))
|
|
50
|
+
return undefined;
|
|
51
|
+
return new Set(auth.providers.filter((row) => row.provider === 'openai').flatMap((row) => (row.profiles ?? []).filter((p) => p.type === 'oauth' && typeof p.profileId === 'string'
|
|
52
|
+
&& (!usable || ((p.status === 'ok' || p.status === 'expiring') && Number.isFinite(p.expiry?.at)
|
|
53
|
+
&& p.expiry.at > Date.now())))
|
|
54
|
+
.map((p) => p.profileId)));
|
|
55
|
+
};
|
|
36
56
|
let approval = false;
|
|
37
57
|
let sawDeviceCode = false;
|
|
38
58
|
let codeExpired = false;
|
|
@@ -48,8 +68,16 @@ export function signIn(ctx, member, o, on) {
|
|
|
48
68
|
let settle;
|
|
49
69
|
let pasteIn;
|
|
50
70
|
let returned;
|
|
71
|
+
// Once a secret step is seen, no later gateway prose, link or code is safe to display.
|
|
72
|
+
let sensitive = o.authChoice === 'setup-token' || o.authChoice === 'apiKey';
|
|
73
|
+
const secretFailure = () => o.authChoice === 'apiKey' ? 'API key activation failed' : 'Sign-in failed. Try again.';
|
|
51
74
|
const done = new Promise((resolve) => { settle = resolve; });
|
|
52
|
-
const say = (v) =>
|
|
75
|
+
const say = (v) => {
|
|
76
|
+
if (!over && !recovering && !signal.aborted)
|
|
77
|
+
on({ state: 'waiting', via, ...(sensitive
|
|
78
|
+
? { ...(v.prompt ? { prompt: v.prompt } : {}), ...(v.error ? { error: secretFailure() } : {}) }
|
|
79
|
+
: v) });
|
|
80
|
+
};
|
|
53
81
|
const closeCallback = async () => {
|
|
54
82
|
const held = server;
|
|
55
83
|
server = undefined;
|
|
@@ -61,11 +89,14 @@ export function signIn(ctx, member, o, on) {
|
|
|
61
89
|
return;
|
|
62
90
|
over = true;
|
|
63
91
|
stopApproval();
|
|
92
|
+
offDisconnect?.();
|
|
64
93
|
o.signal?.removeEventListener('abort', cancel);
|
|
65
94
|
owner.abort();
|
|
66
95
|
returned = undefined;
|
|
67
96
|
pasteIn = undefined;
|
|
68
97
|
await closeCallback();
|
|
98
|
+
if (sensitive && view.state === 'failed' && view.why === 'failed')
|
|
99
|
+
view = { ...view, error: secretFailure() };
|
|
69
100
|
on(view);
|
|
70
101
|
settle(view);
|
|
71
102
|
};
|
|
@@ -76,7 +107,7 @@ export function signIn(ctx, member, o, on) {
|
|
|
76
107
|
// and leaves the person locked out of signing in. Waiting for that settlement is what frees the admission.
|
|
77
108
|
await startingSettled;
|
|
78
109
|
if (sessionId)
|
|
79
|
-
await ctx.request('wizard.cancel', { sessionId }, { timeoutMs: CANCEL_MS }).catch(() => { });
|
|
110
|
+
await Promise.resolve().then(() => ctx.request('wizard.cancel', { sessionId }, { timeoutMs: CANCEL_MS })).catch(() => { });
|
|
80
111
|
})();
|
|
81
112
|
return releasing;
|
|
82
113
|
};
|
|
@@ -130,12 +161,18 @@ export function signIn(ctx, member, o, on) {
|
|
|
130
161
|
});
|
|
131
162
|
};
|
|
132
163
|
const drive = async () => {
|
|
164
|
+
const signal = AbortSignal.any([owner.signal, driveOwner.signal]);
|
|
133
165
|
if (wantsCallback) {
|
|
134
166
|
server = await holdCallback().catch(() => undefined);
|
|
135
167
|
if (!server)
|
|
136
168
|
return { state: 'failed', via, why: 'busy' };
|
|
137
169
|
}
|
|
138
|
-
|
|
170
|
+
({ agentId } = await ctx.ensure(member));
|
|
171
|
+
if (reconfirm && ctx.onDisconnect) {
|
|
172
|
+
before = profiles(await authStatus(ctx.request, agentId).catch(() => undefined), false);
|
|
173
|
+
if (signal.aborted)
|
|
174
|
+
return cancelled();
|
|
175
|
+
}
|
|
139
176
|
// Native login is completed by the person in unmodified Claude Code. The pin does not expose this
|
|
140
177
|
// choice via auth.start; activation verifies the CLI route and persists it only after a live test succeeds.
|
|
141
178
|
if (o.authChoice === 'anthropic-cli' || o.authChoice === 'apiKey') {
|
|
@@ -188,6 +225,10 @@ export function signIn(ctx, member, o, on) {
|
|
|
188
225
|
const pull = () => ctx.request('wizard.next', { sessionId }, options());
|
|
189
226
|
const answer = (step, value) => ctx.request('wizard.next', { sessionId, answer: { stepId: step.id, ...(value === undefined ? {} : { value }) } }, options());
|
|
190
227
|
const waitForPaste = () => new Promise((resolve) => {
|
|
228
|
+
if (signal.aborted) {
|
|
229
|
+
resolve(undefined);
|
|
230
|
+
return;
|
|
231
|
+
}
|
|
191
232
|
if (returned !== undefined) {
|
|
192
233
|
const text = returned;
|
|
193
234
|
returned = undefined;
|
|
@@ -225,7 +266,9 @@ export function signIn(ctx, member, o, on) {
|
|
|
225
266
|
}
|
|
226
267
|
const current = step;
|
|
227
268
|
step = undefined;
|
|
228
|
-
if (current.
|
|
269
|
+
if (current.type === 'text' && current.sensitive)
|
|
270
|
+
sensitive = true;
|
|
271
|
+
if (current.deviceCode && current.type !== 'text') {
|
|
229
272
|
stopApproval();
|
|
230
273
|
approval = true;
|
|
231
274
|
sawDeviceCode = true;
|
|
@@ -248,7 +291,9 @@ export function signIn(ctx, member, o, on) {
|
|
|
248
291
|
}
|
|
249
292
|
if (current.type !== 'progress')
|
|
250
293
|
stopApproval();
|
|
251
|
-
if (current.type === 'text'
|
|
294
|
+
if (current.type === 'text') {
|
|
295
|
+
if (current.sensitive)
|
|
296
|
+
say({ prompt: 'Sign-in token' });
|
|
252
297
|
const value = await waitForPaste();
|
|
253
298
|
if (value === undefined)
|
|
254
299
|
return signal.aborted ? cancelled() : expired();
|
|
@@ -292,10 +337,61 @@ export function signIn(ctx, member, o, on) {
|
|
|
292
337
|
return expired();
|
|
293
338
|
return error ? { state: 'failed', via, why: 'failed', error: cut(error) } : { state: 'done', via };
|
|
294
339
|
};
|
|
340
|
+
const disconnected = new Promise((resolve) => {
|
|
341
|
+
if (reconfirm)
|
|
342
|
+
offDisconnect = ctx.onDisconnect?.(() => {
|
|
343
|
+
recovering = true;
|
|
344
|
+
resolve(undefined); // win the race before the old request's abort/close rejection propagates
|
|
345
|
+
driveOwner.abort();
|
|
346
|
+
});
|
|
347
|
+
});
|
|
348
|
+
const recover = async () => {
|
|
349
|
+
const failed = { state: 'failed', via, why: 'failed', error: 'Sign-in could not be confirmed after the gateway restarted. Try again.' };
|
|
350
|
+
if (!agentId || !before)
|
|
351
|
+
return failed;
|
|
352
|
+
const recovery = new AbortController();
|
|
353
|
+
const recoverySignal = AbortSignal.any([signal, recovery.signal]);
|
|
354
|
+
let timer;
|
|
355
|
+
let abort;
|
|
356
|
+
const end = new Promise((resolve) => {
|
|
357
|
+
abort = () => resolve(codeExpired ? expired() : cancelled());
|
|
358
|
+
signal.addEventListener('abort', abort, { once: true });
|
|
359
|
+
timer = setTimeout(() => resolve(failed), RECONFIRM_MS);
|
|
360
|
+
if (signal.aborted)
|
|
361
|
+
abort();
|
|
362
|
+
});
|
|
363
|
+
const readback = async () => {
|
|
364
|
+
while (!recoverySignal.aborted && !over) {
|
|
365
|
+
const status = await Promise.resolve().then(() => ctx.request('models.authStatus', { agentId, refresh: true }, { timeoutMs: STATUS_MS, signal: recoverySignal })).catch(() => undefined);
|
|
366
|
+
const after = profiles(status);
|
|
367
|
+
if (!recoverySignal.aborted && after && [...after].some((p) => !before.has(p)))
|
|
368
|
+
return { state: 'done', via };
|
|
369
|
+
await new Promise((resolve) => {
|
|
370
|
+
const stop = () => { clearTimeout(wait); recoverySignal.removeEventListener('abort', stop); resolve(); };
|
|
371
|
+
const wait = setTimeout(stop, 1_000);
|
|
372
|
+
recoverySignal.addEventListener('abort', stop, { once: true });
|
|
373
|
+
if (recoverySignal.aborted)
|
|
374
|
+
stop();
|
|
375
|
+
});
|
|
376
|
+
}
|
|
377
|
+
return codeExpired ? expired() : cancelled();
|
|
378
|
+
};
|
|
379
|
+
try {
|
|
380
|
+
return await Promise.race([readback(), end]);
|
|
381
|
+
}
|
|
382
|
+
finally {
|
|
383
|
+
recovery.abort();
|
|
384
|
+
clearTimeout(timer);
|
|
385
|
+
signal.removeEventListener('abort', abort);
|
|
386
|
+
}
|
|
387
|
+
};
|
|
295
388
|
void (async () => {
|
|
296
389
|
let view;
|
|
297
390
|
try {
|
|
298
|
-
|
|
391
|
+
const driven = await Promise.race([drive(), disconnected]);
|
|
392
|
+
view = driven ?? await recover();
|
|
393
|
+
if (signal.aborted)
|
|
394
|
+
view = codeExpired ? expired() : cancelled();
|
|
299
395
|
}
|
|
300
396
|
catch (error) {
|
|
301
397
|
if (signal.aborted)
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import type { BrowserHost, BrowserOptions, LiveFrame, NeedSignIn } from '../browser.ts';
|
|
2
|
+
import { type BrowserHostController, type HostBroker } from '../browser/host.ts';
|
|
3
|
+
import { type SignInStore } from '../browser/store.ts';
|
|
4
|
+
import type { Probe } from '../browser/verify.ts';
|
|
5
|
+
export declare function memorySignInStore(): SignInStore;
|
|
6
|
+
export type BrowserFixture = {
|
|
7
|
+
/** Set the synthetic address bar; no network call. */
|
|
8
|
+
navigate(member: string, origin: string): void;
|
|
9
|
+
authenticated(member: string, value: boolean): void;
|
|
10
|
+
frame(member: string, frame?: LiveFrame): void;
|
|
11
|
+
dropStreams(member: string): void;
|
|
12
|
+
advance(ms: number): Promise<void>;
|
|
13
|
+
resumeOutcome(value: 'accepted' | 'refused' | 'unknown' | 'throw'): void;
|
|
14
|
+
closePrivate(member: string, fn: (() => Promise<void>) | undefined): void;
|
|
15
|
+
probe(member: string, fn: ((p: Probe) => Promise<'ok' | 'fail' | 'timeout'>) | undefined): void;
|
|
16
|
+
readonly dispatches: {
|
|
17
|
+
member: string;
|
|
18
|
+
sessionKey: string;
|
|
19
|
+
idempotencyKey: string;
|
|
20
|
+
message: string;
|
|
21
|
+
}[];
|
|
22
|
+
readonly parked: {
|
|
23
|
+
member: string;
|
|
24
|
+
sessionKey: string;
|
|
25
|
+
}[];
|
|
26
|
+
readonly calls: string[];
|
|
27
|
+
broker(member: string): HostBroker;
|
|
28
|
+
inputCount(member: string): number;
|
|
29
|
+
privateOpen(member: string): boolean;
|
|
30
|
+
fenced(member: string): boolean;
|
|
31
|
+
};
|
|
32
|
+
export type FakeBrowserHost = BrowserHostController & {
|
|
33
|
+
readonly fixture: BrowserFixture;
|
|
34
|
+
};
|
|
35
|
+
export type FakeBrowserHostOptions = {
|
|
36
|
+
members?: string[];
|
|
37
|
+
options?: Partial<BrowserOptions>;
|
|
38
|
+
store?: SignInStore;
|
|
39
|
+
authorize?: (grant: string, member: string, control: boolean) => boolean;
|
|
40
|
+
ping?: (member: string, kind: 'state' | 'signin') => void;
|
|
41
|
+
};
|
|
42
|
+
export declare function fakeBrowserHost(o?: FakeBrowserHostOptions): Promise<FakeBrowserHost>;
|
|
43
|
+
export declare const createBrowserHostFake: typeof fakeBrowserHost;
|
|
44
|
+
/** Reusable public-host contract, fixture controls kept outside BrowserHost. Runs against any host adapter. */
|
|
45
|
+
export declare function browserHostContract(f: {
|
|
46
|
+
host: BrowserHost;
|
|
47
|
+
raise(): Promise<NeedSignIn>;
|
|
48
|
+
signedIn(): void;
|
|
49
|
+
dispatches(): number;
|
|
50
|
+
}): Promise<void>;
|
|
@@ -0,0 +1,166 @@
|
|
|
1
|
+
import { fixtureBrowserHost, secureOrigin } from "../browser/host.js";
|
|
2
|
+
import { emptySignIns, validateSignIns } from "../browser/store.js";
|
|
3
|
+
function channel() {
|
|
4
|
+
let pending;
|
|
5
|
+
let value;
|
|
6
|
+
let ended = false;
|
|
7
|
+
return {
|
|
8
|
+
push(next) { if (ended)
|
|
9
|
+
return; if (pending) {
|
|
10
|
+
const resolve = pending;
|
|
11
|
+
pending = undefined;
|
|
12
|
+
resolve({ done: false, value: next });
|
|
13
|
+
}
|
|
14
|
+
else
|
|
15
|
+
value = next; },
|
|
16
|
+
close() { ended = true; value = undefined; pending?.({ done: true, value: undefined }); pending = undefined; },
|
|
17
|
+
iterable: { [Symbol.asyncIterator]() {
|
|
18
|
+
return {
|
|
19
|
+
next() {
|
|
20
|
+
if (value !== undefined) {
|
|
21
|
+
const next = value;
|
|
22
|
+
value = undefined;
|
|
23
|
+
return Promise.resolve({ done: false, value: next });
|
|
24
|
+
}
|
|
25
|
+
if (ended)
|
|
26
|
+
return Promise.resolve({ done: true, value: undefined });
|
|
27
|
+
return new Promise(resolve => { pending = resolve; });
|
|
28
|
+
},
|
|
29
|
+
return() { ended = true; pending?.({ done: true, value: undefined }); return Promise.resolve({ done: true, value: undefined }); },
|
|
30
|
+
};
|
|
31
|
+
} },
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
export function memorySignInStore() {
|
|
35
|
+
let data = emptySignIns();
|
|
36
|
+
return { read: () => structuredClone(data), write: next => { data = validateSignIns(next); } };
|
|
37
|
+
}
|
|
38
|
+
export async function fakeBrowserHost(o = {}) {
|
|
39
|
+
const members = o.members ?? ['ada'];
|
|
40
|
+
const states = new Map(members.map(member => [member, { origin: 'http://127.0.0.1:2820', privateOrigin: undefined,
|
|
41
|
+
fenced: false, signedIn: false, binding: undefined,
|
|
42
|
+
confirmed: new Set(), viewers: new Set(), inputs: 0,
|
|
43
|
+
closer: undefined, prober: undefined }]));
|
|
44
|
+
const get = (member) => { const s = states.get(member); if (!s)
|
|
45
|
+
throw new Error('unknown fixture member'); return s; };
|
|
46
|
+
const privateState = (member) => {
|
|
47
|
+
const s = get(member);
|
|
48
|
+
return s.privateOrigin ? { origin: s.privateOrigin, secure: secureOrigin(s.privateOrigin), offOrigin: !s.binding
|
|
49
|
+
|| !(s.privateOrigin === s.binding.origin || s.binding.knownIdps.includes(s.privateOrigin) || s.confirmed.has(s.privateOrigin)) } : undefined;
|
|
50
|
+
};
|
|
51
|
+
const calls = [];
|
|
52
|
+
const dispatches = [];
|
|
53
|
+
const parked = [];
|
|
54
|
+
let now = Date.now();
|
|
55
|
+
let outcome = 'accepted';
|
|
56
|
+
let seq = 0;
|
|
57
|
+
const frame = () => ({ seq: ++seq, at: now, w: 1, h: 1, jpeg: Uint8Array.of(255, 216, 255, 217) });
|
|
58
|
+
const brokers = new Map(members.map(member => {
|
|
59
|
+
const s = get(member);
|
|
60
|
+
return [member, {
|
|
61
|
+
endpoint: () => ({ cdpUrl: 'ws://127.0.0.1:2820/devtools/browser?token=synthetic' }),
|
|
62
|
+
async fence(on) { calls.push(`${member}:fence:${on}`); s.fenced = on; },
|
|
63
|
+
agentTab: () => 'agent',
|
|
64
|
+
async originOf(target) { return target === 'private' ? s.privateOrigin ?? s.origin : s.origin; },
|
|
65
|
+
async openPrivate(url) { calls.push(`${member}:open`); s.privateOrigin = new URL(url).origin; return 'private'; },
|
|
66
|
+
async closePrivate() { calls.push(`${member}:close`); await s.closer?.(); s.privateOrigin = undefined; },
|
|
67
|
+
async probe(url, verify) {
|
|
68
|
+
calls.push(`${member}:probe`);
|
|
69
|
+
const p = { url, status: s.signedIn ? 200 : 401, exists: async () => s.signedIn };
|
|
70
|
+
return s.prober ? s.prober(p) : await verify(p) ? 'ok' : 'fail';
|
|
71
|
+
},
|
|
72
|
+
attachViewer({ lease }) {
|
|
73
|
+
const frames = channel();
|
|
74
|
+
const liveStates = channel();
|
|
75
|
+
const v = { frames, states: liveStates, lease, close: () => { frames.close(); liveStates.close(); s.viewers.delete(v); } };
|
|
76
|
+
s.viewers.add(v);
|
|
77
|
+
frames.push(frame());
|
|
78
|
+
const state = privateState(member);
|
|
79
|
+
if (lease && state)
|
|
80
|
+
liveStates.push(state);
|
|
81
|
+
return { frames: frames.iterable, states: liveStates.iterable,
|
|
82
|
+
input(_i) {
|
|
83
|
+
// Do not retain, log, event or echo input values, even in this fixture.
|
|
84
|
+
const state = privateState(member);
|
|
85
|
+
if (lease && s.binding?.epoch === lease.epoch && s.binding.nonce === lease.nonce && state?.secure && !state.offOrigin)
|
|
86
|
+
s.inputs++;
|
|
87
|
+
}, close: v.close };
|
|
88
|
+
},
|
|
89
|
+
async navigateAgent(url) { calls.push(`${member}:navigate`); if (url !== 'reload')
|
|
90
|
+
s.origin = new URL(url).origin; },
|
|
91
|
+
async close() { s.viewers.forEach(v => v.close()); s.privateOrigin = undefined; },
|
|
92
|
+
bindLease(l) { calls.push(`${member}:bind:${l ? 'on' : 'off'}`); s.binding = l; s.confirmed.clear(); },
|
|
93
|
+
confirmOrigin(l, origin) {
|
|
94
|
+
if (s.binding?.epoch !== l.epoch || s.binding.nonce !== l.nonce || s.privateOrigin !== origin)
|
|
95
|
+
return false;
|
|
96
|
+
s.confirmed.add(origin);
|
|
97
|
+
const state = privateState(member);
|
|
98
|
+
if (state)
|
|
99
|
+
s.viewers.forEach(v => v.states.push(state));
|
|
100
|
+
return true;
|
|
101
|
+
},
|
|
102
|
+
privateState: () => privateState(member),
|
|
103
|
+
async clearSite(origins) { if (s.fenced)
|
|
104
|
+
throw new Error('fixture fenced'); calls.push(`${member}:clear:${origins.length}`); s.signedIn = false; },
|
|
105
|
+
}];
|
|
106
|
+
}));
|
|
107
|
+
const defaultVerifier = { origin: 'http://127.0.0.1:2820', url: 'http://127.0.0.1:2820/account', status: 200, selector: '#signed-in' };
|
|
108
|
+
const host = await fixtureBrowserHost({ brokers, store: o.store ?? memorySignInStore(),
|
|
109
|
+
options: { executablePath: '/synthetic/chromium', members, verifiers: [defaultVerifier], ...o.options },
|
|
110
|
+
authorize: o.authorize ?? ((grant, member, control) => members.includes(member) && (grant === 'control' || grant === 'other' || (!control && grant === 'view'))),
|
|
111
|
+
ping: o.ping,
|
|
112
|
+
park: async (member, sessionKey) => { parked.push({ member, sessionKey }); },
|
|
113
|
+
resume: async (input) => { dispatches.push(input); if (outcome === 'throw')
|
|
114
|
+
throw new Error('synthetic transport drop'); return outcome; },
|
|
115
|
+
siteOf: origin => new URL(origin).hostname,
|
|
116
|
+
now: () => now,
|
|
117
|
+
});
|
|
118
|
+
const fixture = {
|
|
119
|
+
navigate(member, origin) {
|
|
120
|
+
const s = get(member);
|
|
121
|
+
const exact = new URL(origin).origin;
|
|
122
|
+
if (s.privateOrigin)
|
|
123
|
+
s.privateOrigin = exact;
|
|
124
|
+
else
|
|
125
|
+
s.origin = exact;
|
|
126
|
+
const state = privateState(member);
|
|
127
|
+
if (state)
|
|
128
|
+
s.viewers.forEach(v => v.states.push(state));
|
|
129
|
+
},
|
|
130
|
+
authenticated(member, value) { get(member).signedIn = value; },
|
|
131
|
+
frame(member, value) { get(member).viewers.forEach(v => v.frames.push(value ?? frame())); },
|
|
132
|
+
dropStreams(member) { get(member).viewers.forEach(v => v.close()); },
|
|
133
|
+
async advance(ms) { now += ms; await host.sweep(); },
|
|
134
|
+
resumeOutcome(value) { outcome = value; },
|
|
135
|
+
closePrivate(member, fn) { get(member).closer = fn; },
|
|
136
|
+
probe(member, fn) { get(member).prober = fn; },
|
|
137
|
+
dispatches, parked, calls,
|
|
138
|
+
broker: member => { const broker = brokers.get(member); if (!broker)
|
|
139
|
+
throw new Error('unknown fixture member'); return broker; },
|
|
140
|
+
inputCount: member => get(member).inputs,
|
|
141
|
+
privateOpen: member => !!get(member).privateOrigin,
|
|
142
|
+
fenced: member => get(member).fenced,
|
|
143
|
+
};
|
|
144
|
+
return Object.assign(host, { fixture });
|
|
145
|
+
}
|
|
146
|
+
export const createBrowserHostFake = fakeBrowserHost;
|
|
147
|
+
/** Reusable public-host contract, fixture controls kept outside BrowserHost. Runs against any host adapter. */
|
|
148
|
+
export async function browserHostContract(f) {
|
|
149
|
+
const require = (value) => { if (!value)
|
|
150
|
+
throw new Error('browser host contract failed'); };
|
|
151
|
+
const r = await f.raise();
|
|
152
|
+
require(r.state === 'waiting');
|
|
153
|
+
require((await f.host.thumbnail({ kind: 'browser', member: r.member }, { grant: 'view' })).state === 'private');
|
|
154
|
+
const lease = await f.host.takeover(r.id, r.gen, { grant: 'control', confirmSite: r.site });
|
|
155
|
+
f.signedIn();
|
|
156
|
+
const settled = await f.host.done(lease);
|
|
157
|
+
require(settled.state === 'settled' && settled.settled?.state === 'verified' && !!settled.settled.resume?.key);
|
|
158
|
+
require(f.dispatches() === 1);
|
|
159
|
+
try {
|
|
160
|
+
await f.host.done(lease);
|
|
161
|
+
}
|
|
162
|
+
catch {
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
throw new Error('browser host contract failed');
|
|
166
|
+
}
|
package/dist/testing/index.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export { fakeGateway, type FakeScript } from './fake-gateway.ts';
|
|
2
|
+
export { fakeBrowserHost, createBrowserHostFake, browserHostContract, memorySignInStore, type FakeBrowserHost, type FakeBrowserHostOptions, type BrowserFixture } from './browser.ts';
|
|
2
3
|
export { openclawContract, type ContractFixture } from './contract.ts';
|
|
3
4
|
export { STUB_USAGE, startModelStub, useModelStub, releaseStub, stubHolding, toolCalls, type ModelStub, type ModelStubOptions, type StubCall } from './model-stub.ts';
|
package/dist/testing/index.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
// The kit's fakes, contract suite and scripted model (5.11). Built in O7.
|
|
2
2
|
export { fakeGateway } from "./fake-gateway.js";
|
|
3
|
+
export { fakeBrowserHost, createBrowserHostFake, browserHostContract, memorySignInStore } from "./browser.js";
|
|
3
4
|
export { openclawContract } from "./contract.js";
|
|
4
5
|
export { STUB_USAGE, startModelStub, useModelStub, releaseStub, stubHolding, toolCalls } from "./model-stub.js";
|
|
@@ -30,6 +30,7 @@ export declare const stubHolding: (key?: string) => boolean;
|
|
|
30
30
|
export type ModelStubOptions = {
|
|
31
31
|
idPattern?: RegExp;
|
|
32
32
|
routingMarker?: string;
|
|
33
|
+
onCall?: (call: StubCall) => void;
|
|
33
34
|
};
|
|
34
35
|
export declare function startModelStub(script?: string[], o?: ModelStubOptions): Promise<ModelStub>;
|
|
35
36
|
export declare function useModelStub(kit: OpenClawKit, stub: ModelStub): Promise<void>;
|
|
@@ -76,7 +76,9 @@ export function startModelStub(script = [], o = {}) {
|
|
|
76
76
|
res.writeHead(400).end();
|
|
77
77
|
return;
|
|
78
78
|
}
|
|
79
|
-
|
|
79
|
+
const call = { authorization: String(req.headers.authorization ?? ''), path: req.url ?? '', body };
|
|
80
|
+
calls.push(call);
|
|
81
|
+
o.onCall?.(call); // Fixture evidence is persisted before any response/hold awaits.
|
|
80
82
|
if (req.url === '/api/embed' || req.url === '/api/embeddings') {
|
|
81
83
|
res.writeHead(200, { 'content-type': 'application/json' });
|
|
82
84
|
return res.end(JSON.stringify({
|
package/dist/types.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { OutputSchema } from './output.ts';
|
|
2
|
+
import type { GatewayEventName, GatewayEventPayload } from './generated/events.ts';
|
|
2
3
|
export type { OutputSchema, SchemaOutput } from './output.ts';
|
|
3
4
|
export type Member = string;
|
|
4
5
|
export interface ToolSpec {
|
|
@@ -29,6 +30,9 @@ export interface ToolHost {
|
|
|
29
30
|
}
|
|
30
31
|
export interface RunSpec<S extends OutputSchema | undefined = OutputSchema | undefined> extends RunRef {
|
|
31
32
|
message: string;
|
|
33
|
+
/** Stable per-dispatch action key; omit for a fresh UUID. Gateway-wide across agents/sessions for `agent`.
|
|
34
|
+
* Reuse only for the same input/attempt. In-memory bounded cache, not exactly-once across engine restarts. */
|
|
35
|
+
idempotencyKey?: string;
|
|
32
36
|
schema?: S;
|
|
33
37
|
system?: string;
|
|
34
38
|
images?: {
|
|
@@ -121,8 +125,9 @@ export type Decision = {
|
|
|
121
125
|
};
|
|
122
126
|
export type KitState = {
|
|
123
127
|
phase: 'stopped' | 'installing' | 'starting' | 'repairing' | 'ready' | 'restarting' | 'failed' | 'needs-update' | 'locked';
|
|
124
|
-
why?: 'install' | 'handshake' | 'exited' | 'port' | 'version' | 'engine-already-running';
|
|
128
|
+
why?: 'install' | 'handshake' | 'exited' | 'port' | 'version' | 'engine-already-running' | 'engine-patch';
|
|
125
129
|
retryAt?: number;
|
|
130
|
+
patchSet?: string | null;
|
|
126
131
|
};
|
|
127
132
|
export type Hello = {
|
|
128
133
|
protocol: number;
|
|
@@ -136,13 +141,48 @@ export type Route = {
|
|
|
136
141
|
choice: string;
|
|
137
142
|
provider: string;
|
|
138
143
|
plugin: string;
|
|
139
|
-
billing: 'subscription' | 'api' | 'local';
|
|
144
|
+
billing: 'subscription' | 'api' | 'local' | 'free' | 'unknown';
|
|
140
145
|
auth?: 'cli' | 'api_key' | 'token';
|
|
141
146
|
terms?: 'allowed' | 'grey';
|
|
142
147
|
termsUrl?: string;
|
|
143
|
-
via: 'browser' | 'code';
|
|
148
|
+
via: 'browser' | 'code' | 'paste' | 'key' | 'setup_token' | 'cli' | 'plan_key' | 'cloud' | 'local' | 'endpoint';
|
|
144
149
|
prerequisite: string | null;
|
|
145
150
|
offer: boolean;
|
|
151
|
+
id?: string;
|
|
152
|
+
name?: string;
|
|
153
|
+
company?: string;
|
|
154
|
+
aliases?: string[];
|
|
155
|
+
offerPolicy?: 'default' | 'explicit';
|
|
156
|
+
legacy?: {
|
|
157
|
+
provider: string;
|
|
158
|
+
via: 'browser' | 'code';
|
|
159
|
+
};
|
|
160
|
+
billingFrom?: 'source' | 'host';
|
|
161
|
+
group?: 'models' | 'services';
|
|
162
|
+
platforms?: {
|
|
163
|
+
node: 'yes' | 'host' | 'no';
|
|
164
|
+
browser: 'yes' | 'host' | 'no';
|
|
165
|
+
rn: 'yes' | 'host' | 'no';
|
|
166
|
+
};
|
|
167
|
+
needs?: {
|
|
168
|
+
binary?: string;
|
|
169
|
+
plugin?: string;
|
|
170
|
+
client?: string;
|
|
171
|
+
};
|
|
172
|
+
install?: {
|
|
173
|
+
npmSpec?: string;
|
|
174
|
+
clawhubSpec?: string;
|
|
175
|
+
minHostVersion?: string;
|
|
176
|
+
};
|
|
177
|
+
upstream?: {
|
|
178
|
+
surface: 'openclaw';
|
|
179
|
+
id: string;
|
|
180
|
+
method?: string;
|
|
181
|
+
revision: string;
|
|
182
|
+
flow: 'present' | 'absent';
|
|
183
|
+
};
|
|
184
|
+
readiness?: 'ready' | 'needs_binary' | 'needs_plugin' | 'needs_host' | 'needs_client' | 'unsupported_platform' | 'no_upstream_flow';
|
|
185
|
+
why?: string;
|
|
146
186
|
reason: string;
|
|
147
187
|
source: string;
|
|
148
188
|
revision: string;
|
|
@@ -173,5 +213,12 @@ export type CallOptions = {
|
|
|
173
213
|
timeoutMs?: number | null;
|
|
174
214
|
signal?: AbortSignal;
|
|
175
215
|
};
|
|
216
|
+
/** Kit-owned invalidation only: no origin, URL, input value or lease secret. */
|
|
217
|
+
export type BrowserPing = {
|
|
218
|
+
member: Member;
|
|
219
|
+
kind: 'state' | 'signin';
|
|
220
|
+
};
|
|
221
|
+
export type KitEventName = GatewayEventName | 'byokit.browser';
|
|
222
|
+
export type KitEventPayload<E extends KitEventName> = E extends 'byokit.browser' ? BrowserPing : GatewayEventPayload<Extract<E, GatewayEventName>>;
|
|
176
223
|
export type { GatewayMethod, GatewayParams, GatewayResult } from './generated/methods.ts';
|
|
177
224
|
export type { GatewayEventName, GatewayEventPayload } from './generated/events.ts';
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
// Internal lifecycle records. Accounting UUIDs never participate in process ownership or liveness.
|
|
2
|
+
import { closeSync, fsyncSync, openSync, writeSync } from 'node:fs';
|
|
3
|
+
import { join } from 'node:path';
|
|
4
|
+
export function appendUsageBoot(dir, record) {
|
|
5
|
+
let fd;
|
|
6
|
+
try {
|
|
7
|
+
fd = openSync(join(dir, 'boots.jsonl'), 'a', 0o600);
|
|
8
|
+
const line = Buffer.from(JSON.stringify(record) + '\n');
|
|
9
|
+
if (writeSync(fd, line) !== line.length)
|
|
10
|
+
throw new Error();
|
|
11
|
+
fsyncSync(fd);
|
|
12
|
+
}
|
|
13
|
+
catch {
|
|
14
|
+
throw new Error('Usage boot record could not be made durable');
|
|
15
|
+
}
|
|
16
|
+
finally {
|
|
17
|
+
if (fd !== undefined) {
|
|
18
|
+
try {
|
|
19
|
+
closeSync(fd);
|
|
20
|
+
}
|
|
21
|
+
catch {
|
|
22
|
+
throw new Error('Usage boot record could not be made durable');
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
}
|