@byokit/openclaw 0.12.0 → 0.14.0

package/dist/signin.js

@@ -57,12 +57,14 @@ export function signIn(ctx, member, o, on) {
     };
     let server;
     let sessionId = '';
+    let native;
+    let nativeId;
     let starting;
     let releasing;
     let settleStart;
     const startingSettled = new Promise((resolve) => { settleStart = resolve; });
     let over = false;
-    let activating = false;
+    let committed = false; // the commit point of the native and key drives: set just before setup.activate
     let recovering = false;
     let offDisconnect;
     let agentId;
@@ -127,6 +129,7 @@ export function signIn(ctx, member, o, on) {
         stopApproval();
         offDisconnect?.();
         o.signal?.removeEventListener('abort', cancel);
+        ctx.stopSignal?.removeEventListener('abort', cancel);
         owner.abort();
         returned = undefined;
         pasteIn = undefined;
@@ -142,8 +145,16 @@ export function signIn(ctx, member, o, on) {
             // session only as `openclaw.setup.auth.start` settles, so a cancel sent sooner is answered `wizard not found`
             // and leaves the person locked out of signing in. Waiting for that settlement is what frees the admission.
             await startingSettled;
-            if (sessionId)
-                await Promise.resolve().then(() => ctx.request('wizard.cancel', { sessionId }, { timeoutMs: CANCEL_MS })).catch(() => { });
+            if (nativeId)
+                await native?.cancel(nativeId).catch(() => { });
+            if (!sessionId)
+                return;
+            const answer = await Promise.resolve().then(() => ctx.request('wizard.cancel', { sessionId }, { timeoutMs: CANCEL_MS })).catch(() => undefined);
+            // The pin answers `cancelled` at once but frees the admission only once the cancelled runner and its setup-target
+            // lock settle, and answers wizard.status on that session only after that: done waits for it (CANCEL_MS at most).
+            // Not covered: a `running` answer (its commit under way) and a session the engine purged at the cancel.
+            if (answer?.status === 'cancelled')
+                await Promise.resolve().then(() => ctx.request('wizard.status', { sessionId }, { timeoutMs: CANCEL_MS })).catch(() => { });
         })();
         return releasing;
     };
@@ -162,12 +173,17 @@ export function signIn(ctx, member, o, on) {
         if (signal.aborted)
             return;
         owner.abort();
-        void (async () => { await release(); if (!activating)
+        void (async () => { await release(); if (!committed)
             await finish(cancelled()); })();
     };
     o.signal?.addEventListener('abort', cancel, { once: true });
     if (o.signal?.aborted)
         cancel();
+    // An engine shutdown before the commit point is this drive's decline too: without it a key paste would sit out
+    // its 15-minute paste wait after the engine is gone.
+    ctx.stopSignal?.addEventListener('abort', cancel, { once: true });
+    if (ctx.stopSignal?.aborted)
+        cancel();
     /** Hold 127.0.0.1:<callbackPort> for the sign-in's life; a taken port is why the sign-in cannot start. */
     const holdCallback = () => {
         let took = false;
@@ -219,9 +235,53 @@ export function signIn(ctx, member, o, on) {
             settleStart();
             let apiKey;
             if (o.authChoice === 'anthropic-cli') {
-                const detected = await ctx.request('openclaw.setup.detect', { agentId }, { timeoutMs: STATUS_MS });
-                if (!detected.candidates?.some((candidate) => candidate.kind === 'claude-cli' && candidate.credentials === true))
-                    return { state: 'failed', via, why: 'failed', error: 'Sign in with Claude Code on this machine in the kit’s isolated HOME, then try again. The login stays in Claude Code.' };
+                const detected = async () => {
+                    const value = await ctx.request('openclaw.setup.detect', { agentId }, { timeoutMs: STATUS_MS, signal });
+                    return value.candidates?.some(candidate => candidate.kind === 'claude-cli' && candidate.credentials === true);
+                };
+                native = ctx.nativeClaudeLogin?.();
+                if (!await detected()) {
+                    if (!native)
+                        return { state: 'failed', via, why: 'failed', error: 'Claude Code sign-in is not available on this engine.' };
+                    let started = await native.start('claude', { signal });
+                    let ready = false;
+                    if (!started.ok && started.error === 'already') {
+                        ready = Boolean(await detected());
+                        if (!ready && ctx.resetNativeClaudeLogin) {
+                            if (signal.aborted || native.signal.aborted)
+                                return cancelled();
+                            await ctx.resetNativeClaudeLogin();
+                            started = await native.start('claude', { signal });
+                        }
+                    }
+                    if (!ready) {
+                        if (!started.ok)
+                            return { state: 'failed', via, why: started.error === 'busy' ? 'busy' : started.error === 'cancelled' ? 'declined' : 'failed', error: started.words };
+                        nativeId = started.signIn.id;
+                        if (signal.aborted) {
+                            await native.cancel(nativeId);
+                            return cancelled();
+                        }
+                        let pasteFailed = false;
+                        pasteIn = text => { void native.paste(nativeId, text).catch((error) => { if (error.remoteCliProblem === 'unknown')
+                            return; pasteFailed = true; void native.cancel(nativeId).catch(() => { }); }); };
+                        say({ url: started.signIn.verificationUri, prompt: 'Paste the code from the sign-in page' });
+                        if (returned !== undefined) {
+                            pasteIn(returned);
+                            returned = undefined;
+                        }
+                        const result = await native.wait(nativeId);
+                        pasteIn = undefined;
+                        if (signal.aborted)
+                            return cancelled();
+                        if (pasteFailed)
+                            return { state: 'failed', via, why: 'failed', error: 'The sign-in code could not be sent. Try again.' };
+                        if (!result.ok)
+                            return { state: 'failed', via, why: result.error === 'expired' ? 'expired' : result.error === 'cancelled' ? 'declined' : 'failed', error: result.words };
+                        if (!await detected())
+                            return { state: 'failed', via, why: 'failed', error: 'Claude Code is still signed out on this engine. Try again.' };
+                    }
+                }
             }
             else {
                 say({ prompt: keyRoute?.billing === 'api' ? 'API key (billed per use)' : 'Plan key' });
@@ -239,21 +299,19 @@ export function signIn(ctx, member, o, on) {
                     return { state: 'failed', via, why: signal.aborted ? 'declined' : 'expired' };
                 secret = apiKey.trim() || undefined;
             }
-            if (signal.aborted)
-                return { state: 'failed', via, why: 'declined' };
-            // Done waits for the gateway restart an `auth` change causes (activation.ts); a run started before it runs on the
-            // old config. A restart that runs late or is cancelled ends failed, and the account is cleaned up by the caller.
-            activating = true;
-            const result = await activate(ctx, {
-                agentId, kind: apiKey === undefined ? 'claude-cli' : 'api-key',
-                ...(apiKey === undefined ? {} : { authChoice: o.authChoice, apiKey }),
-            }, { timeoutMs: PULL_MS, signal }).finally(() => { activating = false; });
+            // The commit point: a phone cancel or host shutdown that landed before it activates nothing. Done waits for the gateway restart an `auth` change causes (activation.ts).
+            // For Claude only host shutdown cuts that wait; a late restart has persisted the route and says saved. A key's cancel still declines its wait; a late key keeps the shared words.
+            if (signal.aborted || native?.signal.aborted)
+                return cancelled();
+            committed = true;
+            const result = await activate(ctx, { agentId, kind: apiKey === undefined ? 'claude-cli' : 'api-key', ...(apiKey === undefined ? {} : { authChoice: o.authChoice, apiKey }), }, { timeoutMs: PULL_MS, signal: apiKey === undefined ? native?.signal : signal });
+            if (apiKey !== undefined && signal.aborted)
+                return cancelled();
             if (result.late)
-                return signal.aborted ? cancelled() : { state: 'failed', via, why: 'failed', error: LATE_RESTART };
+                return { state: 'failed', via, why: 'failed', error: apiKey === undefined ? words('signin.savedNotRestarted') : LATE_RESTART };
             if (!result.ok)
-                return { state: 'failed', via, why: 'failed',
-                    error: apiKey === undefined ? clean(result.error ?? 'Claude Code activation failed') : keyFailed(result.status) };
-            return signal.aborted ? cancelled() : { state: 'done', via };
+                return { state: 'failed', via, why: 'failed', error: apiKey === undefined ? clean(result.error ?? 'Claude Code activation failed') : keyFailed(result.status) };
+            return { state: 'done', via };
         }
         // The client chooses the wizard id; cancellation waits for the engine to register it.
         sessionId = `byokit-${randomUUID()}`;
@@ -441,11 +499,11 @@ export function signIn(ctx, member, o, on) {
         try {
             const driven = await Promise.race([drive(), disconnected]);
             view = driven ?? await recover();
-            if (signal.aborted)
+            if (!committed && (signal.aborted || native?.signal.aborted))
                 view = codeExpired ? expired() : cancelled();
         }
         catch (error) {
-            if (signal.aborted)
+            if (!committed && (signal.aborted || native?.signal.aborted))
                 view = codeExpired ? expired() : cancelled();
             else if (sawDeviceCode && /expired_token|code.*expired|device.*(?:expired|timed out)/i.test(cut(error)))
                 view = expired();

package/dist/testing/fake-gateway.d.ts

@@ -38,6 +38,13 @@ export type FakeGateway = {
         provider: string;
         type: string;
     } & Record<string, unknown>): void;
+    /** A late engine refresh racing a removal (O14 S8): writes one profile of `provider` onto `agentId` whole, as the
+     * pin would under its store lock. With `order: false` it lands with no order entry; `expires` (default: valid)
+     * may name an expired credential. */
+    refresh(agentId: string, provider: string, o?: {
+        order?: boolean;
+        expires?: number;
+    }): void;
 } & {
     transport: GatewayTransport;
 };

package/dist/testing/fake-gateway.js

@@ -385,6 +385,25 @@ export function fakeGateway(script, o) {
             models.delete(id);
             return { ok: true, agentId: id, removedBindings: 0 };
         },
+        // model: null clears the agent's primary (config.patch cannot delete a key); a string sets it.
+        'agents.update': (p) => {
+            const id = String(p.agentId ?? '');
+            if (!id)
+                throw new Error('agents.update requires agentId');
+            if ('model' in p) {
+                const entries = configBox.config.agents?.entries;
+                if (p.model === null) {
+                    models.delete(id);
+                    if (entries?.[id] && 'model' in entries[id])
+                        delete entries[id].model;
+                }
+                else if (typeof p.model === 'string')
+                    setPrimaryOfId(id, p.model);
+                else
+                    throw new Error('agents.update model must be a string or null');
+            }
+            return { ok: true, agentId: id };
+        },
         'agents.files.get': (p) => fileAnswer(String(p.agentId), String(p.name)),
         'agents.files.set': (p) => {
             filesOf(String(p.agentId)).files.set(String(p.name), String(p.content));
@@ -447,9 +466,11 @@ export function fakeGateway(script, o) {
         'byokit.keys': (p) => {
             const id = `byokit-key-${p.member}`;
             if (p.action === 'prepare' || p.action === 'clear') {
+                // As the shipped plugin: a clear of a lane that was never created has nothing to drop and reports absent.
+                const lane = keys.has(id) || agents.has(id);
                 keys.delete(id);
                 ensureAgent(id).providers = [];
-                return { ok: true };
+                return lane ? { ok: true } : { ok: false, absent: true };
             }
             const key = keys.get(id);
             if (!key)
@@ -858,6 +879,19 @@ export function fakeGateway(script, o) {
             storeOf(agentId)[profileId] = profile;
             setPrimaryOfId(agentId, `${profile.provider}/default@${profileId}`);
         },
+        refresh: (agentId, provider, o) => {
+            const agent = ensureAgent(agentId);
+            if (!agent.providers.includes(provider))
+                agent.providers.push(provider);
+            const profileId = `${provider}:default`;
+            storeOf(agentId)[profileId] = { provider, type: 'oauth', status: 'ok', access: 'fake-access',
+                refresh: 'fake-refresh', expires: o?.expires ?? Date.now() + 30 * 86_400_000,
+                accountId: `fake-refresh-${agentId}` };
+            if (o?.order !== false)
+                orderOf(agentId)[provider] = [profileId];
+            else if (orderOf(agentId)[provider])
+                delete orderOf(agentId)[provider];
+        },
         transport: factory({ port: 0, token: 'test', identityPath: '', bridgeSock: '' }),
     };
 }

package/dist/thinking.d.ts

@@ -0,0 +1,16 @@
+import type { ThinkingAsked, ThinkingReport, ThinkingUsed } from './types.ts';
+export type CatalogModel = {
+    id?: string;
+    thinkingLevelMap?: Record<string, string | null | undefined>;
+    compat?: {
+        supportedReasoningEfforts?: readonly string[] | null;
+    };
+};
+/** Supported thinking level ids from one catalog model row, or undefined when the catalog names none. */
+export declare function levelsOf(model: CatalogModel | undefined): ThinkingUsed[] | undefined;
+/** Nearest supported level for `asked`. Empty/absent catalog levels leave `asked` unchanged. */
+export declare function clampThinking(asked: ThinkingAsked, supported: readonly ThinkingUsed[] | undefined): ThinkingReport;
+/** The catalog row for `provider`/`modelId` in a `config.get` models.providers map. */
+export declare function catalogModelOf(providers: Record<string, {
+    models?: CatalogModel[];
+}> | undefined, provider: string, modelId: string): CatalogModel | undefined;

package/dist/thinking.js

@@ -0,0 +1,62 @@
+const ORDER = ['off', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max'];
+/** Supported thinking level ids from one catalog model row, or undefined when the catalog names none. */
+export function levelsOf(model) {
+    if (!model)
+        return undefined;
+    const efforts = model.compat?.supportedReasoningEfforts;
+    if (Array.isArray(efforts) && efforts.length > 0) {
+        const out = [];
+        const seen = new Set();
+        for (const raw of ['off', ...efforts]) {
+            const id = raw === 'none' ? 'off' : raw;
+            if (!ORDER.includes(id) || seen.has(id))
+                continue;
+            seen.add(id);
+            out.push(id);
+        }
+        return out.length ? out : undefined;
+    }
+    const map = model.thinkingLevelMap;
+    if (!map)
+        return undefined;
+    const out = ORDER.filter((level) => {
+        const mapped = map[level];
+        if (mapped === null)
+            return false;
+        if (level === 'xhigh' || level === 'max')
+            return mapped !== undefined;
+        return true;
+    });
+    return out.length ? out : undefined;
+}
+/** Nearest supported level for `asked`. Empty/absent catalog levels leave `asked` unchanged. */
+export function clampThinking(asked, supported) {
+    if (!supported?.length)
+        return { asked, used: asked };
+    if (supported.includes(asked))
+        return { asked, used: asked };
+    const candidates = asked === 'off' ? supported : supported.filter((level) => level !== 'off');
+    const pool = candidates.length ? candidates : supported;
+    const at = ORDER.indexOf(asked);
+    if (at >= 0) {
+        for (let i = at; i < ORDER.length; i++) {
+            const level = ORDER[i];
+            if (pool.includes(level))
+                return { asked, used: level };
+        }
+        for (let i = at - 1; i >= 0; i--) {
+            const level = ORDER[i];
+            if (pool.includes(level))
+                return { asked, used: level };
+        }
+    }
+    return { asked, used: pool[0] };
+}
+/** The catalog row for `provider`/`modelId` in a `config.get` models.providers map. */
+export function catalogModelOf(providers, provider, modelId) {
+    const rows = providers?.[provider]?.models;
+    if (!rows)
+        return undefined;
+    const needle = modelId.includes('/') ? modelId.slice(modelId.indexOf('/') + 1) : modelId;
+    return rows.find((row) => row.id === needle || row.id === modelId || row.id === `${provider}/${needle}`);
+}

package/dist/types.d.ts

@@ -102,6 +102,13 @@ export type PlanWindow = {
         resetAt?: number;
     }[];
 };
+/** Thinking levels a run may ask for (`RunSpec.thinking`) and the level the kit actually sent. */
+export type ThinkingAsked = 'off' | 'low' | 'medium' | 'high';
+export type ThinkingUsed = ThinkingAsked | 'minimal' | 'xhigh' | 'max';
+export type ThinkingReport = {
+    asked: ThinkingAsked;
+    used: ThinkingUsed;
+};
 export type RunEnd<T = unknown> = {
     ok: true;
     text: string;
@@ -110,6 +117,7 @@ export type RunEnd<T = unknown> = {
     planWindow?: PlanWindow;
     account?: AccountId;
     model?: string;
+    thinking?: ThinkingReport;
 } | {
     ok: false;
     aborted: true;

package/dist/words.json

@@ -21,6 +21,7 @@
     "signin.returned": "Thanks. Finishing the sign-in — you can go back to the app now.",
     "signin.busy": "Another sign-in is already in progress. Finish or cancel it, then try again.",
     "signin.cancelled": "Sign-in cancelled. You can start again whenever you are ready.",
+    "signin.savedNotRestarted": "Your Claude sign-in was saved, but the engine did not restart in time. Try again.",
     "signin.expired": "The sign-in took too long. Start it again.",
     "signin.title": "Sign in to {site}",
     "signin.takeover": "Take over to sign in",
@@ -81,6 +82,7 @@
     "auto.refillsNoTime": "All {provider} accounts are out of room. {name} refills first.",
     "auto.terms": "Auto may use either of a provider's accounts.",
     "auto.none": "No signed-in {provider} account.",
+    "auto.noneBound": "No account in this conversation is signed in.",
     "room.unknown": "Room left unknown",
     "room.session": "{left} left this session",
     "room.week": "{left} left this week",
@@ -110,10 +112,12 @@
     "account.another": "another account",
     "account.signOutFirst": "To add a different {provider} account, sign out of {provider} in your browser first.",
     "account.legacyMember": "This person needs a new profile before adding more accounts.",
+    "account.indexDamaged": "The account list for {member} couldn't be opened, so those accounts are paused. Add the account again to fix this.",
     "move.unsupported": "This conversation has not started yet, so there is nothing to move.",
     "move.busy": "Wait for this conversation to finish before moving it.",
     "move.notReady": "Sign in to {name} first.",
     "move.closeFailed": "This conversation now continues on {name}, but its earlier copy could not be removed.",
     "move.taken": "{name} already holds a conversation under this name, so nothing was moved.",
-    "run.moved": "This conversation just moved to another account. Send it again to continue there."
+    "run.moved": "This conversation just moved to another account. Send it again to continue there.",
+    "run.thinkingClamped": "Thinking set to {used} because this model does not support {asked}."
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byokit/openclaw",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "description": "The OpenClaw runtime kit: the pinned engine's full operator surface with plain-words helpers for members, sign-in, runs and approvals.",
   "license": "Apache-2.0",
   "type": "module",
@@ -60,6 +60,7 @@
     "prepack": "tsc -b && node ../../scripts/fix-words-dts.cjs"
   },
   "dependencies": {
+    "@byokit/accounts": "0.23.0",
     "@byokit/pair": "0.10.0",
     "@byokit/relay": "0.6.1",
     "@byokit/discover": "0.8.1",

package/plugin/keys.js

@@ -19,8 +19,9 @@ export function registerKeys(api) {
       if (diagnostics) diagnostics.stage = 'config';
       const config = JSON.parse(await readFile(process.env.OPENCLAW_CONFIG_PATH, 'utf8'));
       const keyId = `byokit-key-${member}`;
-      if (!config.agents?.entries?.[member] || !config.agents?.entries?.[keyId]) {
-        reply({ ok: false });
+      // A clear for a lane that was never created (or whose entries are gone) has nothing left to drop and reports absent.
+      if (!config.agents?.entries?.[keyId] || (params.action !== 'clear' && !config.agents?.entries?.[member])) {
+        reply(params.action === 'clear' ? { ok: false, absent: true } : { ok: false });
         return;
       }
       const keyDir = resolveAgentDir(config, keyId);