@byokit/openclaw 0.12.0 → 0.14.0

package/dist/keys.js

@@ -1,6 +1,7 @@
 import { join } from 'node:path';
 import { activate } from "./activation.js";
 import { keyAgentId, MEMBER_ID, KEY_PREFIX, untilListed } from "./members.js";
+import { providerOf } from "./pick.js";
 import { routes } from "./routes.js";
 import { modelsOf } from "./accounts.js";
 import { LIVE_CATALOGS } from "./constants.js";
@@ -73,62 +74,82 @@ export function createKeys(ctx) {
     return {
         models,
         exclusive,
-        async add(member, o) {
-            if (!check(member))
-                throw new Error('Choose your own member.');
-            if (!o.apiKey.trim())
-                return failure('invalid', 'empty');
-            const route = routes().find((r) => r.choice === o.authChoice && r.keyEntry && r.readiness === 'ready');
-            if (!route || (o.model !== undefined && !LIVE_CATALOGS.includes(route.provider)))
-                return failure('not_included', 'model');
-            return exclusive(member, async () => {
-                let sent = false;
-                // A key the engine may have taken but not sealed is cleared (prepare already emptied the agent); if the clear
-                // does not reach the engine, the key stays unsealed and unusable until the next key add or kit start, so runs
-                // fail closed.
-                const abandon = async (result) => {
-                    await control(member, 'clear').catch(() => undefined);
-                    return result;
-                };
-                try {
-                    await ctx.ensure(member);
-                    const agentId = keyAgentId(member);
-                    const list = await ctx.request('agents.list');
-                    if (!list.agents.some((a) => a.id === agentId))
-                        await ctx.request('agents.create', { name: agentId, workspace: join(ctx.root, 'key-workspaces', member) });
-                    // Creation answers before the runtime roster/owners publish, just as for ordinary members.
-                    await untilListed(ctx.request, agentId);
-                    if (!(await control(member, 'prepare', route.provider)).ok)
-                        return failure('retry', 'engine');
-                    // The public pin's typed API-key path, never a CLI-login import. Discard the engine's lines/errors.
-                    sent = true;
-                    const result = await activate(ctx, { kind: 'api-key', agentId, authChoice: o.authChoice, apiKey: o.apiKey }, { timeoutMs: 180_000 });
-                    if (!result.ok && !result.late)
-                        return abandon(probeResult(result.status));
-                    if (result.late)
-                        return abandon(failure('retry', 'busy'));
-                    if (o.model !== undefined && !(await models(member, o)).some((m) => m.id === o.model && m.available))
-                        return abandon(failure('not_included', 'model'));
-                    // Prepare before publishing the ready marker: failed preparation remains unusable even if clear fails.
+        add(member, o) {
+            const ac = new AbortController();
+            const cancel = () => { if (!ac.signal.aborted)
+                ac.abort(); };
+            const done = (async () => {
+                if (!check(member))
+                    throw new Error('Choose your own member.');
+                if (!o.apiKey.trim())
+                    return failure('invalid', 'empty');
+                const route = routes().find((r) => r.choice === o.authChoice && r.keyEntry && r.readiness === 'ready');
+                if (!route || (o.model !== undefined && !LIVE_CATALOGS.includes(route.provider)))
+                    return failure('not_included', 'model');
+                if (ac.signal.aborted)
+                    return failure('retry', 'busy');
+                return exclusive(member, async () => {
+                    let sent = false;
+                    // A key the engine may have taken but not sealed is cleared (prepare already emptied the agent); if the clear
+                    // does not reach the engine, the key stays unsealed and unusable until the next key add or kit start, so runs
+                    // fail closed.
+                    const abandon = async (result) => {
+                        await control(member, 'clear').catch(() => undefined);
+                        return result;
+                    };
+                    const cancelled = () => failure('retry', 'busy');
                     try {
-                        await ctx.prepareOwner(agentId);
+                        if (ac.signal.aborted)
+                            return cancelled();
+                        await ctx.ensure(member);
+                        const agentId = keyAgentId(member);
+                        const list = await ctx.request('agents.list');
+                        if (!list.agents.some((a) => a.id === agentId))
+                            await ctx.request('agents.create', { name: agentId, workspace: join(ctx.root, 'key-workspaces', member) });
+                        // Creation answers before the runtime roster/owners publish, just as for ordinary members.
+                        await untilListed(ctx.request, agentId);
+                        if (ac.signal.aborted)
+                            return cancelled();
+                        if (!(await control(member, 'prepare', route.provider)).ok)
+                            return failure('retry', 'engine');
+                        // The public pin's typed API-key path, never a CLI-login import. Discard the engine's lines/errors.
+                        sent = true;
+                        if (ac.signal.aborted)
+                            return abandon(cancelled());
+                        const result = await activate(ctx, { kind: 'api-key', agentId, authChoice: o.authChoice, apiKey: o.apiKey }, { timeoutMs: 180_000, signal: ac.signal });
+                        if (ac.signal.aborted)
+                            return abandon(cancelled());
+                        if (!result.ok && !result.late)
+                            return abandon(probeResult(result.status));
+                        if (result.late)
+                            return abandon(failure('retry', 'busy'));
+                        if (o.model !== undefined && !(await models(member, o)).some((m) => m.id === o.model && m.available))
+                            return abandon(failure('not_included', 'model'));
+                        // Prepare before publishing the ready marker: failed preparation remains unusable even if clear fails.
+                        try {
+                            await ctx.prepareOwner(agentId);
+                        }
+                        catch {
+                            return abandon(failure('retry', 'engine'));
+                        }
+                        if (ac.signal.aborted)
+                            return abandon(cancelled());
+                        if (o.model !== undefined && LIVE_CATALOGS.includes(route.provider) && !(await registered(route.provider, o.model)))
+                            return abandon(failure('retry', 'model'));
+                        if (!(await control(member, 'seal', undefined, o.model)).ok)
+                            return abandon(failure('retry', 'engine'));
+                        await ctx.indexLane(member, route);
+                        return { status: 'ok' };
                     }
-                    catch {
-                        return abandon(failure('retry', 'engine'));
+                    catch (error) {
+                        const reason = errorReason(error, sent);
+                        if (sent)
+                            return abandon(failure('retry', reason));
+                        return failure('retry', reason);
                     }
-                    if (o.model !== undefined && LIVE_CATALOGS.includes(route.provider) && !(await registered(route.provider, o.model)))
-                        return abandon(failure('retry', 'model'));
-                    if ((await control(member, 'seal', undefined, o.model)).ok)
-                        return { status: 'ok' };
-                    return abandon(failure('retry', 'engine'));
-                }
-                catch (error) {
-                    const reason = errorReason(error, sent);
-                    if (sent)
-                        return abandon(failure('retry', reason));
-                    return failure('retry', reason);
-                }
-            });
+                });
+            })();
+            return Object.assign(done, { cancel });
         },
         async ready(member, o = {}) {
             if (!check(member))
@@ -147,11 +168,37 @@ export function createKeys(ctx) {
                 }
             }
         },
-        // Kit start calls this once the gateway is ready: a failed add whose abandon clear never reached the engine
-        // leaves an unsealed key with no ready marker, so drop it. A single ready read per key agent, no retries; an add
-        // in flight for that member is waited for. Only an absent marker is cleared; a refused read or clear (the gateway
-        // left ready) makes the sweep incomplete. Resolves true once every key agent was read.
-        async sweep() {
+        // Remove this member's saved key: the key agent's store and its ready marker, so the lane reads signed out and
+        // stays signed out, plus its `<provider>.key` index entry, so the accounts list stops naming the removed key.
+        // `provider` scopes it to the key actually saved for that provider (the member agent's own
+        // sign-out never reaches this lane), so signing out of one provider never drops another's key. A lane that reads
+        // not ready has nothing saved to remove; a refused read or clear is a typed refusal, never raw engine text.
+        // Serialized with adds and key runs like every other key change.
+        async remove(member, o = {}) {
+            if (!check(member))
+                throw new Error('Choose your own member.');
+            await exclusive(member, async () => {
+                const refused = () => { throw new Error('The key could not be removed.'); };
+                if (o.provider !== undefined) {
+                    // An unreadable lane cannot name its provider, so removal never guesses and risks another provider's key.
+                    const ready = await control(member, 'ready').catch(() => undefined);
+                    if (!ready)
+                        refused();
+                    else if (ready.ok !== true || providerOf(ready.model ?? '') !== o.provider)
+                        return;
+                }
+                const cleared = await control(member, 'clear').catch(() => undefined);
+                if (cleared?.ok !== true && cleared?.absent !== true)
+                    refused();
+                await ctx.dropLane(member, o.provider);
+            });
+        },
+        // Kit connect calls this once the gateway is ready: a failed add whose abandon clear never reached the engine
+        // leaves an unsealed key with no ready marker, so drop it (`clear`, until a sweep completes). A single ready read
+        // per key agent, no retries; an add in flight for that member is waited for. Only an absent marker is cleared; a
+        // refused read or clear (the gateway left ready) makes the sweep incomplete. A sealed lane is backfilled on every
+        // call. Resolves true once every key agent was read.
+        async sweep(clear) {
             let agents;
             try {
                 agents = (await ctx.request('agents.list')).agents;
@@ -168,7 +215,11 @@ export function createKeys(ctx) {
                     continue;
                 await exclusive(member, async () => {
                     const ready = await control(member, 'ready').catch(() => undefined);
-                    if (ready?.ok === true)
+                    if (ready?.ok === true) {
+                        await ctx.backfillLane(member, ready.model);
+                        return;
+                    }
+                    if (!clear)
                         return;
                     if (ready?.absent !== true) {
                         complete = false;

package/dist/kit.d.ts

@@ -1,5 +1,5 @@
 import type { SealingAdapter } from '@byokit/secrets';
-import { type AddKeyResult } from './keys.ts';
+import { type AddKeyHandle } from './keys.ts';
 import { type RouteView } from './routes.ts';
 import type { BrowserHost, BrowserOptions } from './browser.ts';
 import type { Account, AccountId, AccountPick, Approval, CallOptions, Decision, Defaults, GatewayMethod, GatewayParams, GatewayResult, GatewayTransport, Hello, KitState, KitEventName, KitEventPayload, LearningCapture, LearningMode, Member, ModelInfo, MoveResult, Room, RunEnd, RunEvent, RunRef, RunSelection, RunSpec, OutputSchema, SchemaOutput, SignInOptions, SignInView, ToolHost, ToolSpec } from './types.ts';
@@ -148,6 +148,9 @@ export declare class OpenClawKit {
         }>;
     }>;
     renameAccount(member: Member, id: AccountId, name: string): Promise<Account>;
+    /** Remove one account: a member-agent account through `authLogout` with its profileIds, an account agent through
+     * `clear`, an empty `list`, `agents.delete` with `deleteFiles: false`, removal of its state dir, then the entry. */
+    removeAccount(member: Member, id: AccountId): Promise<void>;
     defaults(member: Member): Promise<Defaults>;
     setDefaults(member: Member, d: Defaults): Promise<void>;
     /** Save an explicitly supplied API key (billed per use) in this member's separate key agent. */
@@ -155,7 +158,16 @@ export declare class OpenClawKit {
         authChoice: string;
         apiKey: string;
         model?: string;
-    }): Promise<AddKeyResult>;
+    }): AddKeyHandle;
+    private indexKeyLane;
+    /** Remove this member's saved key (the `byokit-key-<member>` lane: its credential store and ready marker), so
+     * `signedIn` is false for it and a restart cannot revive it. `provider` removes only that provider's saved key;
+     * with no saved key the call resolves without doing anything. */
+    removeKey(member: Member, o?: {
+        provider?: string;
+    }): Promise<void>;
+    private dropKeyLane;
+    private backfillKeyLane;
     private prepareKeyOwner;
     private syncCatalogs;
     migrateRetainedLogin(member: Member, source: RetainedLogin): Promise<'staged' | 'nothing' | 'failed'>;

package/dist/kit.js

@@ -664,6 +664,9 @@ export class OpenClawKit {
         this.admission = createAuthStatus(this.engine.root, (method, params, options) => this.request()(method, params, options));
         this.keys = createKeys({ root: this.engine.root,
             prepareOwner: (agentId) => this.prepareKeyOwner(agentId),
+            indexLane: (member, route) => this.indexKeyLane(member, route),
+            dropLane: (member, provider) => this.dropKeyLane(member, provider),
+            backfillLane: (member, model) => this.backfillKeyLane(member, model),
             restarting: () => this.engineRestarting(),
             request: (method, params, options) => this.request()(method, params, options),
             ensure: (member) => this.ensureMember(member),
@@ -763,7 +766,7 @@ export class OpenClawKit {
             this.accountsCtl = createAccounts({ request: (method, params, o) => this.request()(method, params, o), root: this.engine.root,
                 ensure: (member) => this.ensureMember(member), locks: this.locks,
                 signIn: (agentId, o, on, fresh) => startSignIn({ ...this.signInCtx(), ensure: async () => ({ agentId }), fresh }, agentId, o, on),
-                routes: this.routeMap, log: this.o.log });
+                routes: this.routeMap, log: this.o.log, reseal: () => this.engine.authStore.reseal() });
             // The fail-closed tool bridge feeds the kit's single Approval surface (5.9, O5).
             await this.bridge.start();
             this.off.push(transport.onEvent((e) => this.approvalsCtl.handleEvent(e)));
@@ -771,10 +774,11 @@ export class OpenClawKit {
             this.setState({ phase: 'ready' });
             this.syncCatalogs();
             // A failed key add whose abandon clear never reached the engine leaves an unsealed key with no ready marker;
-            // runs stay closed, so drop it now that the gateway is ready. Ready keys keep their marker and survive.
-            if (!this.swept)
-                void this.keys.sweep().then((done) => { if (done)
-                    this.swept = true; }).catch(() => undefined);
+            // runs stay closed, so drop it now that the gateway is ready. Ready keys keep their marker and survive. Every
+            // connect backfills the key lanes' index entries; only the clear stops once a sweep completes.
+            const clear = !this.swept;
+            void this.keys.sweep(clear).then((done) => { if (clear && done)
+                this.swept = true; }).catch(() => undefined);
             if (this.o.browser)
                 await this.checkBrowserTools();
             // Replays the engine's native approval lists over the now-live transport (N9).
@@ -951,7 +955,10 @@ export class OpenClawKit {
             // Public readiness/sign-in reads stay live; their fresh result can prepare the next run's admission.
             authStatus: (agentId, refresh, native) => this.admission.read(agentId, refresh, native, false),
             ensure: (member) => this.ensureMember(member), callbackPort: this.o.callbackPort ?? 1455,
+            nativeClaudeLogin: () => this.engine.nativeClaudeLogin(),
+            resetNativeClaudeLogin: () => this.engine.resetNativeClaudeLogin(),
             onDisconnect: (fn) => { this.signInDisconnects.add(fn); return () => { this.signInDisconnects.delete(fn); }; },
+            stopSignal: this.engine.stopSignal,
             authConfig: () => this.authSnapshot(),
             restarted: (authBefore, signal) => this.restarted(authBefore, signal) };
     }
@@ -966,24 +973,40 @@ export class OpenClawKit {
         return this.providerStatus(member).then((names) => names ?? []);
     }
     /** A member sign-in to `provider`, or a ready key (5.8) whose saved model is that provider's. */
-    signedIn(member, provider) {
-        return this.providers(member).then(async (names) => names.includes(provider)
-            || providerOf((await this.keys.ready(member, { once: true }))?.model ?? '') === provider).catch(() => false);
+    async signedIn(member, provider) {
+        // The key probe stands alone: a member-agent admission failure after an engine restart must not hide a sealed key.
+        const keyReady = async () => {
+            try {
+                return providerOf((await this.keys.ready(member, { once: true }))?.model ?? '') === provider;
+            }
+            catch {
+                return false;
+            }
+        };
+        try {
+            if ((await this.providers(member)).includes(provider))
+                return true;
+        }
+        catch { /* key probe below */ }
+        return keyReady();
     }
     signIn(member, o, on) {
         return startSignIn(this.signInCtx(), member, o, on);
     }
-    signOut(member, provider) {
-        return engineSignOut(this.signInCtx(), member, provider);
+    async signOut(member, provider) {
+        await engineSignOut(this.signInCtx(), member, provider);
+        // The saved key lives on its own `byokit-key-<member>` agent, which the member-agent logout never reaches: without
+        // this, a key of that provider stays sealed and ready and the member reads signed in again after a restart.
+        await this.keys.remove(member, { provider });
     }
     // The member an agent id or session key belongs to, through the account index (5.15, O14m). Reads the index file, so it
     // needs no live gateway.
     memberOf(ref) {
         return memberOfAccount(this.engine.root, ref);
     }
-    // accounts (5.15, O14 steps S5, S6 and S9-S12): the per-member index with listing, adding, defaults, rename, models
-    // and room; `run({ account })` and `pick` choose among them, held to the account a session is bound to, and `move`
-    // carries a conversation to another account. Removing arrives in a later step.
+    // accounts (5.15, O14 steps S5, S6 and S8-S12): the per-member index with listing, adding, defaults, rename, models
+    // and room; `run({ account })` and `pick` choose among them, held to the account a session is bound to, `move`
+    // carries a conversation to another account, and `removeAccount` deletes one.
     accounts(member) {
         if (!this.accountsCtl)
             return Promise.reject(new Error('gateway not ready'));
@@ -1028,6 +1051,13 @@ export class OpenClawKit {
             return Promise.reject(new Error('gateway not ready'));
         return this.accountsCtl.rename(member, id, name);
     }
+    /** Remove one account: a member-agent account through `authLogout` with its profileIds, an account agent through
+     * `clear`, an empty `list`, `agents.delete` with `deleteFiles: false`, removal of its state dir, then the entry. */
+    removeAccount(member, id) {
+        if (!this.accountsCtl)
+            return Promise.reject(new Error('gateway not ready'));
+        return this.accountsCtl.remove(member, id);
+    }
     defaults(member) {
         if (!this.accountsCtl)
             return Promise.reject(new Error('gateway not ready'));
@@ -1042,6 +1072,32 @@ export class OpenClawKit {
     addKey(agentId, o) {
         return this.keys.add(agentId, o);
     }
+    // The lane's index entry follows its sealed key. A failed write is logged and never fails the add; the start sweep repairs it.
+    async indexKeyLane(member, route) {
+        if (!this.accountsCtl) {
+            this.o.log?.('addKey: the account index is not ready, so the key lane is indexed at the next connect');
+            return;
+        }
+        await this.accountsCtl.key(member, route).catch((error) => this.o.log?.(`addKey: the key lane is not indexed yet: ${error instanceof Error ? error.message : String(error)}`));
+    }
+    /** Remove this member's saved key (the `byokit-key-<member>` lane: its credential store and ready marker), so
+     * `signedIn` is false for it and a restart cannot revive it. `provider` removes only that provider's saved key;
+     * with no saved key the call resolves without doing anything. */
+    removeKey(member, o) {
+        return this.keys.remove(member, o);
+    }
+    // The lane's index entry follows its sealed key down. A failed drop is logged and never fails the removal.
+    async dropKeyLane(member, provider) {
+        if (!this.accountsCtl) {
+            this.o.log?.('removeKey: the account index is not ready, so the key lane entry stays until the next removal');
+            return;
+        }
+        await this.accountsCtl.unkey(member, provider).catch((error) => this.o.log?.(`removeKey: the key lane entry is not dropped yet: ${error instanceof Error ? error.message : String(error)}`));
+    }
+    async backfillKeyLane(member, model) {
+        const found = model === undefined ? [] : routeTable().filter((r) => r.keyEntry && r.readiness === 'ready' && r.provider === providerOf(model));
+        await this.accountsCtl?.backfill(member, found).catch((error) => this.o.log?.(`key lane ${member}: not indexed yet: ${error instanceof Error ? error.message : String(error)}`));
+    }
     async prepareKeyOwner(agentId) {
         this.syncCatalogs();
         await this.catalogs;
@@ -1137,6 +1193,7 @@ export class OpenClawKit {
             });
         return this.runs().run(spec, on, undefined, output);
     }
+    // An API-key run's session is on the key lane (Runs step 2).
     runKey(sessionKey, o) {
         if (o?.auth !== 'apiKey')
             return sessionKey;
@@ -1145,7 +1202,7 @@ export class OpenClawKit {
             throw new Error('Choose your own conversation.');
         return `agent:${keyAgentId(member)}:${tail}`;
     }
-    steer(sessionKey, text, o) {
+    async steer(sessionKey, text, o) {
         return this.runs().steer(this.runKey(sessionKey, o), text);
     }
     async abort(sessionKey, o) {

package/dist/link.js

@@ -322,12 +322,16 @@ export function openclawLink(kit, o) {
                 drives.get(key)?.cancel();
                 const view = { state: 'waiting', via: args.via };
                 latest.set(key, view);
-                const drive = kit.signIn(member, { authChoice: route.choice, via: args.via }, (next) => {
-                    latest.set(key, next);
-                });
+                // A superseded attempt (still activating past its commit point) never writes over the newer one's view.
+                let drive;
+                const current = () => drive !== undefined && drives.get(key) === drive;
+                drive = kit.signIn(member, { authChoice: route.choice, via: args.via }, (next) => { if (current())
+                    latest.set(key, next); });
                 drives.set(key, drive);
-                void drive.done.then((done) => { latest.set(key, done); if (drives.get(key) === drive)
-                    drives.delete(key); }, () => { if (drives.get(key) === drive)
+                void drive.done.then((done) => { if (current()) {
+                    latest.set(key, done);
+                    drives.delete(key);
+                } }, () => { if (current())
                     drives.delete(key); });
                 return latest.get(key);
             }
@@ -336,7 +340,9 @@ export function openclawLink(kit, o) {
                     throw new Error('oc.signin.view needs { provider }');
                 // `ready` is the member's account (signed in to this provider), not the engine: `phaseOf` reads it as done.
                 const key = `${member}:${args.provider}`;
-                const ready = kit.state.phase === 'ready' && await kit.signedIn(member, args.provider);
+                // Native Claude is ready only once this attempt's live activation settles.
+                const native = args.provider === 'claude-cli';
+                const ready = kit.state.phase === 'ready' && await kit.signedIn(member, args.provider) && (!native || (!drives.has(key) && latest.get(key)?.state !== 'failed'));
                 // A finished sign-in whose account is gone since (signed out anywhere, or dropped by the engine) is no
                 // sign-in to show: without this the view says done while `ready` says no, which phaseOf reads as opening.
                 if (!ready && !drives.has(key) && latest.get(key)?.state === 'done')

package/dist/pick.js

@@ -154,6 +154,10 @@ export function resolveSelection(accounts, defaults, sel, room, nowMs, models, b
     const rests = eligible.filter((c) => c.row.out === 'resting');
     if (rests.length)
         return restingPick(rests.reduce((a, b) => ((b.row.until ?? Infinity) < (a.row.until ?? Infinity) ? b : a)));
+    // An empty `bound` (a member-agent conversation holding no indexed account) names no provider: every account is
+    // signed in somewhere else, so the provider-specific sentence would mislead.
+    if (bound !== undefined && !bound.length)
+        return { ok: false, code: 'none', reason: words('auto.noneBound'), considered };
     return { ok: false, code: 'none', reason: words('auto.none', { provider: provider ?? '' }), considered };
     function finish(account, row, how, why) {
         const listed = models?.(account);

package/dist/runs.js

@@ -6,6 +6,7 @@ import { outputSchema } from "./output.js";
 import { words } from "./words.js";
 import { classify } from "./classify.js";
 import { providerOf } from "./pick.js";
+import { catalogModelOf, clampThinking, levelsOf } from "./thinking.js";
 // The gateway gives up on a silent run after an hour; we wait ten minutes longer for the reply frame itself.
 const WAIT_MS = 3_600_000;
 const WAIT_CLIENT_MS = 3_610_000;
@@ -109,7 +110,7 @@ export function createRuns(ctx) {
         const tail = spec.sessionKey.slice(spec.sessionKey.indexOf(':', 'agent:'.length) + 1);
         // Runs step 1 (5.15): every run first finds the account its session is bound to, the API-key lane included.
         const binding = ctx.accounts ? await ctx.accounts.bind(spec.member, spec.sessionKey) : undefined;
-        // Step 2 on the API-key lane: only an API-billed conversation continues on its key; any other binding is refused.
+        // Step 2 on the API-key lane: its own lane binding continues; any other binding is refused.
         if (keyAgent && ctx.accounts && binding) {
             const message = await ctx.accounts.keyRefusal(spec.member, binding);
             if (message !== undefined)
@@ -119,8 +120,8 @@ export function createRuns(ctx) {
         // session went to another account, so it ends before any event and the caller's retry lands there.
         const moved = async () => !!binding && (await ctx.accounts.bind(spec.member, spec.sessionKey))?.agentId !== binding.agentId;
         const movedEnd = { ok: false, kind: 'other', message: words('run.moved') };
-        // Step 3: with `account` and `needs` both absent, on a key no account agent holds (or an API-key run, whose
-        // binding is API-billed), exactly the run on the agent it always was (a bound key under its shared lock).
+        // Step 3: with `account` and `needs` both absent, on a key no account agent holds (or an API-key run, which binds only
+        // to its lane), exactly the run on the agent it always was (a bound key under its shared lock).
         if ((keyAgent || binding?.id === undefined) && spec.account === undefined && !spec.needs?.length) {
             if (keyAgent)
                 return start(spec, on, { agentId: keyAgent, sessionKey: `agent:${keyAgent}:${tail}`, idempotencyKey, system, picked, output });
@@ -197,6 +198,19 @@ export function createRuns(ctx) {
             return { ...end, until };
         }
     };
+    const thinkingOf = async (picked, asked) => {
+        if (asked === undefined)
+            return undefined;
+        if (!picked)
+            return { asked, used: asked };
+        try {
+            const snap = await ctx.request('config.get', {});
+            return clampThinking(asked, levelsOf(catalogModelOf(snap.config?.models?.providers, picked.provider, picked.model)));
+        }
+        catch {
+            return { asked, used: asked };
+        }
+    };
     const start = async (spec, on, t) => {
         const { agentId, sessionKey, idempotencyKey, system, picked, output, chosen } = t;
         const release = spec.register !== false ? ctx.bridge.register({ sessionKey, member: spec.member }, spec.tools, idempotencyKey) : undefined;
@@ -253,7 +267,9 @@ export function createRuns(ctx) {
                     return { ok: false, kind: 'signed-out', message: `${picked.provider} is not signed in for ${spec.member}` };
             }
             // One `agent` request: its interim `accepted` frame names the run, its final frame (after the run) carries the
-            // run's usage. The wait below still decides how the run ended.
+            // run's usage. The wait below still decides how the run ended. Thinking is clamped to the catalog before the
+            // request so an unsupported level (e.g. Muse's off/high/max) never fails the engine.
+            const thinking = await thinkingOf(picked, spec.thinking);
             let accepted;
             const ack = new Promise((resolve) => { accepted = resolve; });
             // The run id is taken as the accepted frame lands, so no event read after it is missed.
@@ -274,7 +290,7 @@ export function createRuns(ctx) {
                 ...(picked ?? {}),
                 ...(system ? { extraSystemPrompt: system } : {}),
                 ...(spec.images ? { attachments: spec.images.map((image) => ({ mimeType: image.mimeType, content: image.data })) } : {}),
-                ...(spec.thinking ? { thinking: spec.thinking } : {}),
+                ...(thinking !== undefined ? { thinking: thinking.used } : {}),
             }, { expectFinal: true, timeoutMs: WAIT_CLIENT_MS, onAccepted });
             final.catch(() => { }); // a late failure is the wait's to report
             const started = await Promise.race([ack, final]);
@@ -307,7 +323,8 @@ export function createRuns(ctx) {
                 const reported = typeof agentMeta.provider === 'string' && typeof agentMeta.model === 'string'
                     ? `${agentMeta.provider}/${agentMeta.model}`.toLowerCase() : '';
                 return { ok: true, text, ...(parsed ? { data: parsed.data } : {}), ...(usage ? { usage } : {}), ...(planWindow ? { planWindow } : {}),
-                    ...(chosen ? { account: chosen.account.id, model: chosen.model || reported } : {}) };
+                    ...(chosen ? { account: chosen.account.id, model: chosen.model || reported } : {}),
+                    ...(thinking ? { thinking } : {}) };
             }
             if (result.stopReason === 'aborted' || (abortedByEngine && result.status !== 'ok'))
                 return { ok: false, aborted: true };

package/dist/signin.d.ts

@@ -1,3 +1,4 @@
+import type { remoteCliHost } from '@byokit/accounts/cli';
 import { authStatus } from './auth-status.ts';
 import type { GatewayTransport, Member, SignInOptions, SignInView } from './types.ts';
 export type SignInCtx = {
@@ -7,9 +8,12 @@ export type SignInCtx = {
         agentId: string;
     }>;
     callbackPort: number;
+    nativeClaudeLogin?(): ReturnType<typeof remoteCliHost>;
+    resetNativeClaudeLogin?(): Promise<void>;
     onDisconnect?(fn: () => void): () => void;
     authConfig(): string;
     restarted(authBefore: string | undefined, signal?: AbortSignal): Promise<boolean>;
+    stopSignal?: AbortSignal;
     fresh?: boolean;
 };
 /**