@north-light/crouter 0.3.191 → 0.3.193

package/dist/clients/attach/overlays/auth.js

@@ -9,7 +9,7 @@
 // actual login flow UI) are pi's own exported components, used verbatim.
 import { join } from 'node:path';
 import { execFile } from 'node:child_process';
-import { ModelRuntime, OAuthSelectorComponent, LoginDialogComponent, } from '@earendil-works/pi-coding-agent';
+import { CredentialSynchronizationError, ModelRuntime, OAuthSelectorComponent, LoginDialogComponent, } from '@earendil-works/pi-coding-agent';
 import { deleteAuthCredential, setAuthCredential } from '../../../core/auth-file.js';
 import { PoolCredentialStore } from '../../../core/pool-credential-store.js';
 import { dialogAuthInteraction } from '../../../core/auth-interaction.js';
@@ -20,11 +20,26 @@ import { commitManagedLogin, isManagedProvider, readSubscriptionPool, removeMana
 async function buildLocalAuth(agentDir) {
     const authPath = join(agentDir, 'auth.json');
     const modelsPath = join(agentDir, 'models.json');
-    const runtime = await ModelRuntime.create({
-        credentials: new PoolCredentialStore(authPath),
-        modelsPath,
-    });
-    return { runtime, authPath };
+    const store = new PoolCredentialStore(authPath);
+    let mutationBoundary;
+    const credentials = {
+        read: (providerId) => store.read(providerId),
+        list: () => store.list(),
+        modify: (providerId, fn) => {
+            const enter = mutationBoundary;
+            mutationBoundary = undefined;
+            if (enter !== undefined && !enter())
+                return Promise.reject(new Error('Login cancelled'));
+            return store.modify(providerId, fn);
+        },
+        delete: (providerId) => store.delete(providerId),
+    };
+    const runtime = await ModelRuntime.create({ credentials, modelsPath });
+    return {
+        runtime,
+        authPath,
+        beforeNextCredentialMutation: (callback) => { mutationBoundary = callback; },
+    };
 }
 /** Assemble the AuthSelectorProvider list for the OAuth selector: every composed
  *  provider, OAuth ones first, each carrying its current auth status (which the
@@ -57,7 +72,7 @@ function openBrowser(url) {
  *  the controls the overlay host hands out. So this resolves the runtime first and
  *  returns the sync picker factory. */
 export async function buildLoginPicker(tui, agentDir, onAuthReloaded, notify) {
-    const { runtime, authPath } = await buildLocalAuth(agentDir);
+    const { runtime, authPath, beforeNextCredentialMutation } = await buildLocalAuth(agentDir);
     const providers = await buildProviderList(runtime);
     return ({ close, replace }) => {
         const onSelect = (providerId) => {
@@ -115,6 +130,15 @@ export async function buildLoginPicker(tui, agentDir, onAuthReloaded, notify) {
                 isActive: () => !settled && !dialog.signal.aborted,
             });
             const fail = (err) => {
+                // ModelRuntime persists the credential before synchronizing its provider
+                // state. A synchronization failure is therefore a successful login with
+                // a refresh warning, not a failed login.
+                if (err instanceof CredentialSynchronizationError) {
+                    notify(`Logged in to ${provider.name}; provider refresh failed: ${err.message}`);
+                    onAuthReloaded();
+                    finish();
+                    return;
+                }
                 // An Esc-cancel aborts the flow; the dialog's onComplete already notified +
                 // finished, so only report a genuine error here.
                 const error = err;
@@ -175,6 +199,7 @@ export async function buildLoginPicker(tui, agentDir, onAuthReloaded, notify) {
                 }
                 // Non-managed OAuth: `runtime.login` persists through crouter's own credential
                 // store, so auth.json lands exactly where the broker reads it.
+                beforeNextCredentialMutation(beginCommit);
                 runtime
                     .login(providerId, 'oauth', interaction)
                     .then(() => {
@@ -184,7 +209,8 @@ export async function buildLoginPicker(tui, agentDir, onAuthReloaded, notify) {
                     onAuthReloaded();
                     finish();
                 })
-                    .catch(fail);
+                    .catch(fail)
+                    .finally(() => beforeNextCredentialMutation(undefined));
             }
             else {
                 // API-key provider: prompt for the key and persist it locally.

package/dist/clients/attach/overlays/pickers.d.ts

@@ -42,14 +42,11 @@ export declare function buildTreePicker(tui: TUI, data: GetTreeData, send: Send,
  *  `get_tree.forkPoints`). Select → `fork`. The outer component has no
  *  `handleInput`; the inner `getMessageList()` does (focus target). */
 export declare function buildForkPicker(data: GetTreeData, send: Send, close: Close): Picker;
-/** `/settings` — the real settings menu (the wire `settings` IS a SettingsConfig
- *  superset). Only the contract-enumerated mutations are wired: thinking level →
- *  `set_thinking_level`, auto-compact → `set_auto_compaction`. Every other toggle
- *  has no command frame (out of scope), so its callback notifies rather than
- *  silently lying that the change took. The theme submenu is viewer-local (CTO).
- *  The outer component has no `handleInput`; `getSettingsList()` is the focus
- *  target. */
-export declare function buildSettingsPicker(data: GetSettingsData, send: Send, close: Close, notify: Notify): Picker;
+/** `/settings` exposes only the two settings attach can actually mutate over
+ *  view.sock. Upstream's selector has no item-omission API and always includes its
+ *  fullscreen controls, which are not real attach state because attach is fixed to
+ *  TuiMainScreen's normal buffer. */
+export declare function buildSettingsPicker(data: GetSettingsData, send: Send, close: Close): Picker;
 /** `/scoped-models` — READ-ONLY via a pi-tui SelectList. CONTRACT GAP: pi (through
  *  0.79.1) does not re-export `ScopedModelsSelectorComponent`, and the contract
  *  exposes no command frame for its enable/disable/persist mutations, so a

package/dist/clients/attach/overlays/pickers.js

@@ -26,8 +26,8 @@
 // The duck-typed runtime adapter relies on the component's current 4-method
 // ModelRuntime surface — a future pi adding a runtime call there would surface at
 // runtime (caught by live verification).
-import { SelectList, } from '@earendil-works/pi-tui';
-import { getSelectListTheme, ModelSelectorComponent, SessionSelectorComponent, SettingsSelectorComponent, TreeSelectorComponent, UserMessageSelectorComponent, SettingsManager, } from '@earendil-works/pi-coding-agent';
+import { Container, SelectList, SettingsList, } from '@earendil-works/pi-tui';
+import { DynamicBorder, getSelectListTheme, getSettingsListTheme, ModelSelectorComponent, SessionSelectorComponent, TreeSelectorComponent, UserMessageSelectorComponent, SettingsManager, } from '@earendil-works/pi-coding-agent';
 /** A minimal `ModelRuntime` for `ModelSelectorComponent`: the component calls
  *  only `getAvailableSnapshot()`, `getModel()`, `getError()`, and `refresh()`
  *  (verified against pi `model-selector.js`). We satisfy exactly those from the
@@ -102,47 +102,41 @@ export function buildForkPicker(data, send, close) {
     }, () => close());
     return { component, focus: component.getMessageList() };
 }
-/** `/settings` — the real settings menu (the wire `settings` IS a SettingsConfig
- *  superset). Only the contract-enumerated mutations are wired: thinking level →
- *  `set_thinking_level`, auto-compact → `set_auto_compaction`. Every other toggle
- *  has no command frame (out of scope), so its callback notifies rather than
- *  silently lying that the change took. The theme submenu is viewer-local (CTO).
- *  The outer component has no `handleInput`; `getSettingsList()` is the focus
- *  target. */
-export function buildSettingsPicker(data, send, close, notify) {
-    const out = () => notify('Only thinking level + auto-compaction are adjustable over view.sock');
-    const callbacks = {
-        onThinkingLevelChange: (level) => send({ type: 'set_thinking_level', level }),
-        onAutoCompactChange: (enabled) => send({ type: 'set_auto_compaction', enabled }),
-        onCancel: () => close(),
-        onShowImagesChange: out,
-        onImageWidthCellsChange: out,
-        onAutoResizeImagesChange: out,
-        onBlockImagesChange: out,
-        onEnableSkillCommandsChange: out,
-        onSteeringModeChange: out,
-        onFollowUpModeChange: out,
-        onTransportChange: out,
-        onHttpIdleTimeoutMsChange: out,
-        onThemeChange: out,
-        onHideThinkingBlockChange: out,
-        onCollapseChangelogChange: out,
-        onEnableInstallTelemetryChange: out,
-        onDoubleEscapeActionChange: out,
-        onTreeFilterModeChange: out,
-        onShowHardwareCursorChange: out,
-        onEditorPaddingXChange: out,
-        onAutocompleteMaxVisibleChange: out,
-        onQuietStartupChange: out,
-        onDefaultProjectTrustChange: out,
-        onClearOnShrinkChange: out,
-        onShowTerminalProgressChange: out,
-        onWarningsChange: out,
-        onShowCacheMissNoticesChange: out,
-        onOutputPadChange: out,
-    };
-    const component = new SettingsSelectorComponent(data.settings, callbacks);
-    return { component, focus: component.getSettingsList() };
+/** `/settings` exposes only the two settings attach can actually mutate over
+ *  view.sock. Upstream's selector has no item-omission API and always includes its
+ *  fullscreen controls, which are not real attach state because attach is fixed to
+ *  TuiMainScreen's normal buffer. */
+export function buildSettingsPicker(data, send, close) {
+    const items = [
+        {
+            id: 'autocompact',
+            label: 'Auto-compact',
+            description: 'Automatically compact context when it gets too large',
+            currentValue: data.settings.autoCompact ? 'true' : 'false',
+            values: ['true', 'false'],
+        },
+        {
+            id: 'thinking',
+            label: 'Thinking level',
+            description: 'Reasoning depth for thinking-capable models',
+            currentValue: data.settings.thinkingLevel,
+            values: data.settings.availableThinkingLevels,
+        },
+    ];
+    const list = new SettingsList(items, items.length, getSettingsListTheme(), (id, value) => {
+        if (id === 'autocompact')
+            send({ type: 'set_auto_compaction', enabled: value === 'true' });
+        if (id === 'thinking')
+            send({
+                type: 'set_thinking_level',
+                level: value,
+            });
+    }, close, { enableSearch: false });
+    const component = new Container();
+    component.addChild(new DynamicBorder());
+    component.addChild(list);
+    component.addChild(new DynamicBorder());
+    return { component, focus: list };
 }
 /** `/scoped-models` — READ-ONLY via a pi-tui SelectList. CONTRACT GAP: pi (through
  *  0.79.1) does not re-export `ScopedModelsSelectorComponent`, and the contract