@crouton-kit/crouter 0.3.70 → 0.3.79

package/dist/clients/attach/auth-pickers.d.ts

@@ -1,17 +1,5 @@
 import type { TUI } from '@earendil-works/pi-tui';
 import type { Picker, PickerControls } from './pickers.js';
-/** A compact auth summary for a provider — used by non-picker surfaces (e.g.
- *  the `crtr sys setup` login tab) to show which providers are already
- *  configured without mounting the full selector. */
-export interface ProviderAuthSummary {
-    id: string;
-    name: string;
-    configured: boolean;
-}
-/** Summarize which providers have a stored credential in `agentDir`'s auth.json.
- *  Mirrors the OAuth selector's provider list; `configured` is true when the
- *  provider has an explicit stored credential (OAuth token or API key). */
-export declare function summarizeProviderAuth(agentDir: string): ProviderAuthSummary[];
 /** `/login` — show the provider selector, then run pi's native login flow in
  *  the viewer. On success, notifies the broker to reload auth via reload_auth.
  *  Returns a Picker (OAuthSelectorComponent as the overlay). */

package/dist/clients/attach/auth-pickers.js

@@ -10,6 +10,8 @@
 import { join } from 'node:path';
 import { execFile } from 'node:child_process';
 import { AuthStorage, ModelRegistry, OAuthSelectorComponent, LoginDialogComponent, } from '@earendil-works/pi-coding-agent';
+import { loginAnthropic, loginOpenAICodex } from '@earendil-works/pi-ai/oauth';
+import { ANTHROPIC_PROVIDER_ID, commitManagedLogin, isManagedProvider, readSubscriptionPool, removeManagedProvider, } from '../../core/subscription-state.js';
 /** Build an AuthStorage + ModelRegistry from the broker's agentDir (or pi's
  *  default). Both point at the SAME auth.json the broker uses — the viewer and
  *  broker share the filesystem (tmux-local invariant). */
@@ -47,17 +49,6 @@ function buildProviderList(authStorage, registry) {
     }
     return providers;
 }
-/** Summarize which providers have a stored credential in `agentDir`'s auth.json.
- *  Mirrors the OAuth selector's provider list; `configured` is true when the
- *  provider has an explicit stored credential (OAuth token or API key). */
-export function summarizeProviderAuth(agentDir) {
-    const { authStorage, registry } = buildLocalAuth(agentDir);
-    return buildProviderList(authStorage, registry).map((p) => ({
-        id: p.id,
-        name: p.name,
-        configured: authStorage.get(p.id) !== undefined,
-    }));
-}
 /** Open the browser with a URL (best-effort; platform-specific). */
 function openBrowser(url) {
     const cmd = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'start' : 'xdg-open';
@@ -112,6 +103,52 @@ export function buildLoginPicker(tui, agentDir, onAuthReloaded, notify, controls
         // inline under the editor (same slot as the model picker), not as a centered
         // overlay. `replace` focuses the dialog; `close()` (via finish) unmounts it.
         replace(dialog, dialog);
+        if (isManagedProvider(providerId)) {
+            // Managed provider (anthropic / openai-codex): drive pi's OAuth flow ourselves so we hold
+            // the credential, then persist it through the coordinated writer (commitManagedLogin ->
+            // commitDefaultIdentity for the default slot) rather than authStorage.login(). That keeps
+            // auth.json + the rotation pool identity in lockstep and runs the account-uniqueness gate
+            // the raw path skipped. /login here manages only the DEFAULT slot (label === providerId).
+            const runLogin = providerId === ANTHROPIC_PROVIDER_ID ? loginAnthropic : loginOpenAICodex;
+            // Snapshot the default slot's rate-limit timestamp BEFORE OAuth begins: a strictly newer
+            // concurrent 429 recorded during the login must survive a same-account re-login.
+            const defaultLastRateLimitedAt = readSubscriptionPool(providerId).find((entry) => entry.label === providerId)?.lastRateLimitedAt ?? 0;
+            runLogin({
+                onAuth: (info) => {
+                    dialog.showAuth(info.url, info.instructions);
+                    openBrowser(info.url);
+                },
+                onPrompt: (prompt) => dialog.showPrompt(prompt.message, prompt.placeholder),
+                onProgress: (message) => {
+                    dialog.showProgress(message);
+                },
+                onManualCodeInput: () => dialog.showManualInput('Paste the code or URL:'),
+            })
+                .then((credential) => {
+                if (settled)
+                    return;
+                const accountId = typeof credential.accountId === 'string' && credential.accountId.trim()
+                    ? credential.accountId.trim()
+                    : undefined;
+                commitManagedLogin(providerId, providerId, {
+                    refresh: credential.refresh,
+                    access: credential.access,
+                    expires: credential.expires,
+                    accountId,
+                    defaultLastRateLimitedAt,
+                });
+                notify(`Logged in to ${provider.name}`);
+                onAuthReloaded();
+                finish();
+            })
+                .catch((err) => {
+                if (err?.name !== 'AbortError') {
+                    notify(`Login error: ${String(err?.message ?? err)}`);
+                }
+                finish();
+            });
+            return;
+        }
         if (provider.authType === 'oauth') {
             const isKnownOAuth = authStorage.getOAuthProviders().some((p) => p.id === providerId);
             if (!isKnownOAuth) {
@@ -195,10 +232,22 @@ export function buildLogoutPicker(agentDir, onAuthReloaded, notify, close) {
     const getAuthStatus = (id) => authStorage.getAuthStatus(id);
     const onSelect = (providerId) => {
         const provider = providers.find((p) => p.id === providerId);
-        authStorage.logout(providerId);
-        close();
-        notify(`Logged out of ${provider?.name ?? providerId}`);
-        onAuthReloaded();
+        try {
+            // Managed providers tear down the WHOLE provider (every rotation account + the auth.json
+            // default record) through the coordinated service, never a raw authStorage.logout() that
+            // would strip only auth.json and orphan the pool.
+            if (isManagedProvider(providerId))
+                removeManagedProvider(providerId);
+            else
+                authStorage.logout(providerId);
+            close();
+            notify(`Logged out of ${provider?.name ?? providerId}`);
+            onAuthReloaded();
+        }
+        catch (error) {
+            close();
+            notify(`Logout error: ${error instanceof Error ? error.message : String(error)}`);
+        }
     };
     const component = new OAuthSelectorComponent('logout', authStorage, providers, onSelect, () => close(), getAuthStatus);
     return { component, focus: component };

package/dist/clients/attach/canvas-panels.js

@@ -1,8 +1,7 @@
 // canvas-panels.ts — the subscribed-node panel for `crtr surface attach` (Unit Q).
 //
-// Native implementation of canvas-nav.ts's BASE chrome (renderBase), reading
-// through the CanvasSource seam so the viewer chrome and graph overlay share the
-// same canvas read authority. Produces the two line stacks the viewer paints
+// Reads through the CanvasSource seam so the viewer chrome and graph overlay
+// share the same canvas read authority. Produces the two line stacks the viewer paints
 // into Containers around the editor:
 //   managers  → ABOVE the editor: this node's manager (its first subscriber).
 //   reports   → BELOW the editor: this node's live reports (active|idle

package/dist/clients/attach/chat-view.d.ts

@@ -28,9 +28,10 @@ export declare class ChatView {
     private readonly tui;
     /** The chat scroll area handed in by the attach command. */
     private readonly container;
-    /** Activity/status area, pinned as the LAST child of `container` (mirrors pi's
-     *  statusContainer sitting directly below chatContainer). Holds the working
-     *  spinner / compaction+retry loaders. */
+    /** Settled history is cached independently from the live status area so picker
+     *  navigation does not re-render a long conversation on every key repeat. */
+    private readonly historyContainer;
+    /** Activity/status area below history. Holds working/compaction/retry loaders. */
     private readonly statusContainer;
     private readonly cwd;
     private readonly showImages;
@@ -54,8 +55,6 @@ export declare class ChatView {
     private bashComponent;
     /** The single active activity loader (working/compaction/retry), if any. */
     private activityLoader;
-    /** While true, `append` skips re-pinning the status container (bulk rebuild). */
-    private bulkMode;
     /** Text of the most recent assistant message, kept current from the welcome
      *  snapshot AND the live event stream so `/copy` (getLastAssistantText) works
      *  whether the message arrived before or after attach. */
@@ -91,15 +90,15 @@ export declare class ChatView {
     private addMessageToChat;
     /** Tool component with native viewer renderers for crouter-owned tool output. */
     private makeToolComponent;
-    /** Append a child while keeping the activity/status area pinned to the bottom. */
+    /** Append conversation content above the independent live status area. */
     private append;
     /** Approximate render width for inline mermaid diagrams. Only affects
      *  termrender's trailing padding (stripped in the transform), so the terminal
      *  column count is close enough without threading the live pane width here. */
     private renderWidth;
-    /** Number of chat children excluding the pinned status container. */
+    /** Number of rendered conversation components. */
     private chatChildCount;
-    /** Clear all chat content and re-pin an empty status container. */
+    /** Clear all chat content. */
     private resetChat;
     private makeLoader;
     /** Swap the single active activity indicator (working/compaction/retry). */

package/dist/clients/attach/chat-view.js

@@ -27,6 +27,7 @@ import { CRTR_OUTPUT_CUSTOM_TYPE, CrtrOutputMessageComponent, createCrtrBashTool
 import { CRTR_CYCLE_DIVIDER_CUSTOM_TYPE } from '../../core/runtime/session-cycles.js';
 import { SITUATIONAL_CONTEXT_CUSTOM_TYPE } from '../../core/runtime/situational-context.js';
 import { transformMessageMermaid } from './mermaid-render.js';
+import { createCrtrEditToolDefinition } from './edit-diff-render.js';
 /** customType stamped on the injected `<crtr-context>` bearings block (mirrors
  *  CONTEXT_INTRO_CUSTOM_TYPE in canvas-context-intro.ts — kept as a local literal
  *  so the viewer never imports the in-process extension). */
@@ -51,13 +52,56 @@ function isExpandable(obj) {
         typeof obj.setExpanded === 'function');
 }
 const defaultErrorStyle = (s) => `\x1b[31m${s}\x1b[39m`;
+/** Keep settled conversation history out of picker/editor render hot paths. The
+ *  root TUI still compares the cached lines, but it no longer re-renders every
+ *  markdown/tool component for each repeated navigation key. */
+class RenderCacheContainer extends Container {
+    cachedWidth;
+    cachedLines;
+    volatile = false;
+    markDirty() {
+        this.cachedLines = undefined;
+    }
+    setVolatile(value) {
+        this.volatile = value;
+        if (value)
+            this.markDirty();
+    }
+    addChild(component) {
+        super.addChild(component);
+        this.markDirty();
+    }
+    removeChild(component) {
+        super.removeChild(component);
+        this.markDirty();
+    }
+    clear() {
+        super.clear();
+        this.markDirty();
+    }
+    invalidate() {
+        super.invalidate();
+        this.markDirty();
+    }
+    render(width) {
+        if (!this.volatile && this.cachedLines !== undefined && this.cachedWidth === width)
+            return this.cachedLines;
+        const lines = super.render(width);
+        if (!this.volatile) {
+            this.cachedWidth = width;
+            this.cachedLines = lines;
+        }
+        return lines;
+    }
+}
 export class ChatView {
     tui;
     /** The chat scroll area handed in by the attach command. */
     container;
-    /** Activity/status area, pinned as the LAST child of `container` (mirrors pi's
-     *  statusContainer sitting directly below chatContainer). Holds the working
-     *  spinner / compaction+retry loaders. */
+    /** Settled history is cached independently from the live status area so picker
+     *  navigation does not re-render a long conversation on every key repeat. */
+    historyContainer = new RenderCacheContainer();
+    /** Activity/status area below history. Holds working/compaction/retry loaders. */
     statusContainer = new Container();
     cwd;
     showImages;
@@ -81,8 +125,6 @@ export class ChatView {
     bashComponent;
     /** The single active activity loader (working/compaction/retry), if any. */
     activityLoader;
-    /** While true, `append` skips re-pinning the status container (bulk rebuild). */
-    bulkMode = false;
     /** Text of the most recent assistant message, kept current from the welcome
      *  snapshot AND the live event stream so `/copy` (getLastAssistantText) works
      *  whether the message arrived before or after attach. */
@@ -100,6 +142,7 @@ export class ChatView {
         this.spinnerStyle = opts.palette?.active ?? defaultSpinnerStyle;
         this.dimStyle = opts.palette?.muted ?? defaultDimStyle;
         this.errorStyle = opts.palette?.error ?? defaultErrorStyle;
+        this.container.addChild(this.historyContainer);
         this.container.addChild(this.statusContainer);
     }
     // -------------------------------------------------------------------------
@@ -115,69 +158,58 @@ export class ChatView {
         const renderedPendingTools = new Map();
         const messages = snapshot.messages;
         const lastIndex = messages.length - 1;
-        // Rebuild in bulk: detach the pinned status area, append children directly,
-        // re-pin ONCE at the end. Keeps the rebuild O(N) instead of O(N²) re-pins for
-        // a long transcript (see `append`).
-        this.container.removeChild(this.statusContainer);
-        this.bulkMode = true;
-        try {
-            for (let i = 0; i < messages.length; i++) {
-                const message = messages[i];
-                if (message.role === 'assistant') {
-                    // Keep the `/copy` source current from the catch-up transcript too, not
-                    // only the live stream (you usually attach AFTER the last reply landed).
-                    const text = this.userMessageText(message);
-                    if (text.trim())
-                        this.lastAssistantText = text;
-                    // If the snapshot caught an IN-FLIGHT assistant turn (state.isStreaming
-                    // and this is the trailing, non-terminal assistant message), bind it as
-                    // the live streaming component so the relayed message_update/message_end
-                    // frames that follow `welcome` land on it. Otherwise the in-flight
-                    // message would freeze at its snapshot value until the next turn — the
-                    // common case, since you typically attach to a node that is working.
-                    const isStreamingTail = i === lastIndex &&
-                        snapshot.state.isStreaming &&
-                        message.stopReason !== 'aborted' &&
-                        message.stopReason !== 'error';
-                    if (isStreamingTail) {
-                        this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinking, getMarkdownTheme(), this.hiddenThinkingLabel);
-                        this.append(this.streamingComponent);
-                        this.streamingComponent.updateContent(message);
+        for (let i = 0; i < messages.length; i++) {
+            const message = messages[i];
+            if (message.role === 'assistant') {
+                // Keep the `/copy` source current from the catch-up transcript too, not
+                // only the live stream (you usually attach AFTER the last reply landed).
+                const text = this.userMessageText(message);
+                if (text.trim())
+                    this.lastAssistantText = text;
+                // If the snapshot caught an IN-FLIGHT assistant turn (state.isStreaming
+                // and this is the trailing, non-terminal assistant message), bind it as
+                // the live streaming component so the relayed message_update/message_end
+                // frames that follow `welcome` land on it. Otherwise the in-flight
+                // message would freeze at its snapshot value until the next turn — the
+                // common case, since you typically attach to a node that is working.
+                const isStreamingTail = i === lastIndex &&
+                    snapshot.state.isStreaming &&
+                    message.stopReason !== 'aborted' &&
+                    message.stopReason !== 'error';
+                if (isStreamingTail) {
+                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinking, getMarkdownTheme(), this.hiddenThinkingLabel);
+                    this.append(this.streamingComponent);
+                    this.streamingComponent.updateContent(message);
+                }
+                else {
+                    this.addMessageToChat(message);
+                }
+                for (const content of this.assistantToolCalls(message)) {
+                    const component = this.makeToolComponent(content.name, content.id, content.arguments);
+                    this.append(component);
+                    // (isStreamingTail is never aborted/error, so its tools fall through to
+                    //  renderedPendingTools → pendingTools, where live tool events find them.)
+                    if (message.stopReason === 'aborted' || message.stopReason === 'error') {
+                        const errorMessage = message.stopReason === 'aborted'
+                            ? 'Operation aborted'
+                            : (message.errorMessage ?? 'Error');
+                        component.updateResult({ content: [{ type: 'text', text: errorMessage }], isError: true });
                     }
                     else {
-                        this.addMessageToChat(message);
-                    }
-                    for (const content of this.assistantToolCalls(message)) {
-                        const component = this.makeToolComponent(content.name, content.id, content.arguments);
-                        this.append(component);
-                        // (isStreamingTail is never aborted/error, so its tools fall through to
-                        //  renderedPendingTools → pendingTools, where live tool events find them.)
-                        if (message.stopReason === 'aborted' || message.stopReason === 'error') {
-                            const errorMessage = message.stopReason === 'aborted'
-                                ? 'Operation aborted'
-                                : (message.errorMessage ?? 'Error');
-                            component.updateResult({ content: [{ type: 'text', text: errorMessage }], isError: true });
-                        }
-                        else {
-                            renderedPendingTools.set(content.id, component);
-                        }
-                    }
-                }
-                else if (message.role === 'toolResult') {
-                    const component = renderedPendingTools.get(message.toolCallId);
-                    if (component) {
-                        component.updateResult(message);
-                        renderedPendingTools.delete(message.toolCallId);
+                        renderedPendingTools.set(content.id, component);
                     }
                 }
-                else {
-                    this.addMessageToChat(message);
+            }
+            else if (message.role === 'toolResult') {
+                const component = renderedPendingTools.get(message.toolCallId);
+                if (component) {
+                    component.updateResult(message);
+                    renderedPendingTools.delete(message.toolCallId);
                 }
             }
-        }
-        finally {
-            this.bulkMode = false;
-            this.container.addChild(this.statusContainer);
+            else {
+                this.addMessageToChat(message);
+            }
         }
         for (const [id, component] of renderedPendingTools) {
             this.pendingTools.set(id, component);
@@ -185,6 +217,7 @@ export class ChatView {
         // If we attached mid-turn, the `agent_start` that spins up the working loader
         // already fired before we connected — restore it from the snapshot's streaming
         // state so an actively-working node shows the spinner right away.
+        this.historyContainer.setVolatile(snapshot.state.isStreaming);
         if (snapshot.state.isStreaming)
             this.setActivity(this.makeLoader('Working...'));
         this.tui.requestRender();
@@ -205,10 +238,11 @@ export class ChatView {
      *  the caller can surface a notice. */
     toggleToolsExpanded() {
         this.toolOutputExpanded = !this.toolOutputExpanded;
-        for (const child of this.container.children) {
+        for (const child of this.historyContainer.children) {
             if (isExpandable(child))
                 child.setExpanded(this.toolOutputExpanded);
         }
+        this.historyContainer.markDirty();
         this.tui.requestRender();
         return this.toolOutputExpanded;
     }
@@ -217,10 +251,11 @@ export class ChatView {
      *  the container, so the loop covers it too). Returns the new HIDDEN state. */
     toggleThinking() {
         this.hideThinking = !this.hideThinking;
-        for (const child of this.container.children) {
+        for (const child of this.historyContainer.children) {
             if (child instanceof AssistantMessageComponent)
                 child.setHideThinkingBlock(this.hideThinking);
         }
+        this.historyContainer.markDirty();
         this.tui.requestRender();
         return this.hideThinking;
     }
@@ -232,16 +267,18 @@ export class ChatView {
         switch (event.type) {
             case 'agent_start': {
                 this.pendingTools.clear();
+                this.historyContainer.setVolatile(true);
                 this.setActivity(this.makeLoader('Working...'));
                 break;
             }
             case 'agent_end': {
                 // Drop a dangling streaming component (e.g. aborted before message_end).
                 if (this.streamingComponent) {
-                    this.container.removeChild(this.streamingComponent);
+                    this.historyContainer.removeChild(this.streamingComponent);
                     this.streamingComponent = undefined;
                 }
                 this.pendingTools.clear();
+                this.historyContainer.setVolatile(false);
                 this.setActivity(undefined);
                 break;
             }
@@ -393,6 +430,7 @@ export class ChatView {
             default:
                 break;
         }
+        this.historyContainer.markDirty();
         this.tui.requestRender();
     }
     // -------------------------------------------------------------------------
@@ -404,16 +442,20 @@ export class ChatView {
     bashStart(command, excludeFromContext) {
         const component = new BashExecutionComponent(command, this.tui, excludeFromContext);
         this.bashComponent = component;
+        this.historyContainer.setVolatile(true);
         this.append(component);
         this.tui.requestRender();
     }
     bashOutput(chunk) {
         this.bashComponent?.appendOutput(chunk);
+        this.historyContainer.markDirty();
         this.tui.requestRender();
     }
     bashEnd(result) {
         this.bashComponent?.setComplete(result.exitCode, result.cancelled, result.truncated ? { truncated: true } : undefined, result.fullOutputPath);
         this.bashComponent = undefined;
+        this.historyContainer.setVolatile(false);
+        this.historyContainer.markDirty();
         this.tui.requestRender();
     }
     // -------------------------------------------------------------------------
@@ -524,20 +566,18 @@ export class ChatView {
     // -------------------------------------------------------------------------
     /** Tool component with native viewer renderers for crouter-owned tool output. */
     makeToolComponent(name, id, args) {
-        const toolDefinition = name === 'bash' ? createCrtrBashToolDefinition(args) : undefined;
+        const toolDefinition = name === 'bash'
+            ? createCrtrBashToolDefinition(args)
+            : name === 'edit'
+                ? createCrtrEditToolDefinition(this.cwd)
+                : undefined;
         const component = new ToolExecutionComponent(name, id, args, { showImages: this.showImages, imageWidthCells: this.imageWidthCells }, toolDefinition, this.tui, this.cwd);
         component.setExpanded(this.toolOutputExpanded);
         return component;
     }
-    /** Append a child while keeping the activity/status area pinned to the bottom. */
+    /** Append conversation content above the independent live status area. */
     append(child) {
-        if (this.bulkMode) {
-            this.container.addChild(child);
-            return;
-        }
-        this.container.removeChild(this.statusContainer);
-        this.container.addChild(child);
-        this.container.addChild(this.statusContainer);
+        this.historyContainer.addChild(child);
     }
     /** Approximate render width for inline mermaid diagrams. Only affects
      *  termrender's trailing padding (stripped in the transform), so the terminal
@@ -545,18 +585,18 @@ export class ChatView {
     renderWidth() {
         return Math.max(40, process.stdout.columns ?? 80);
     }
-    /** Number of chat children excluding the pinned status container. */
+    /** Number of rendered conversation components. */
     chatChildCount() {
-        return this.container.children.filter((c) => c !== this.statusContainer).length;
+        return this.historyContainer.children.length;
     }
-    /** Clear all chat content and re-pin an empty status container. */
+    /** Clear all chat content. */
     resetChat() {
         this.setActivity(undefined);
         this.streamingComponent = undefined;
         this.pendingTools.clear();
         this.lastAssistantText = undefined;
-        this.container.clear();
-        this.container.addChild(this.statusContainer);
+        this.historyContainer.setVolatile(false);
+        this.historyContainer.clear();
     }
     makeLoader(message) {
         return new Loader(this.tui, this.spinnerStyle, this.dimStyle, message);

package/dist/clients/attach/edit-diff-render.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Attach-viewer tool definition for `edit`: pi's builtin definition drives
+ * all state (preview computation, header, success/error bg), then the diff
+ * body is re-skinned Claude-Code-style after every render pass.
+ */
+export declare function createCrtrEditToolDefinition(cwd: string): unknown;