@timurproko/a1 0.2.6-dev.727 → 0.2.6-dev.736

package/dist/app/session-shell/session-shell-root.js

@@ -5,11 +5,9 @@ import { composeSubmittedPromptRows, formatSubmittedPromptTime, submittedPromptL
 import { backgroundSgrSpan, heldNativeHyperlinkStyle, hyperlinkSgrSpan, nativeHyperlinkStyle, overlaySpan, } from "../../ui/components/spans.js";
 import { progressStatusFrame, progressStatusText } from "../../ui/components/progress-status.js";
 import { displayWidth, faint, stripAnsi } from "../../ui/components/text.js";
-import { PINNED_PI_HIDDEN_COMMAND_NAMES, PINNED_PI_WORKFLOW_COMMAND_NAMES } from "../../integrations/pi/engine/workflows.js";
-import { createPiExtensionUiBridge } from "../../integrations/pi/components/shell-extension-ui.js";
 import { createPiShellEditor } from "../../integrations/pi/components/shell-editor-autocomplete.js";
 import { createPiQueuedInputStatus, createPiShellFooter, createPiShellHeader, createPiShellLoadedResources, createPiShellStatus, } from "../../integrations/pi/components/shell-footer-status.js";
-import { createPiShellArmin, createPiShellAuthProviderSelector, createPiShellDialog, createPiShellEarendilAnnouncement, createPiShellExtensionSelector, createPiShellLoginDialog, createPiShellModelSelector, createPiShellScopedModelsSelector, createPiShellSelector, createPiShellSessionSelector, createPiShellSettingsSelector, createPiShellTreeSelector, createPiShellTrustSelector, createPiShellUserMessageSelector, } from "../../integrations/pi/components/shell-selectors-dialogs.js";
+import { createPiShellArmin, createPiShellEarendilAnnouncement, } from "../../integrations/pi/components/shell-selectors-dialogs.js";
 import { createPiShellChangelog, createPiShellCollapsedChangelog, createPiShellHotkeys, createPiShellSessionInfo, renderPiShellCommandMessage, renderPiShellPackageUpdateNotice, renderPiShellReleaseUpdateBanner, renderPiShellReleaseUpdateNotice, renderPiShellStatusText, } from "../../integrations/pi/components/shell-presenters-info.js";
 import { createPiShellTranscriptComponent, isPiPromptStyleCompaction, paintPiSubmittedPromptTimestamp, renderPiShellStartupDiagnostic, renderPiShellTranscriptBlock, } from "../../integrations/pi/components/shell-presenters-transcript.js";
 import { onPiThemeChange, PINNED_PI_LAYOUT, piTheme } from "../../integrations/pi/components/upstream/theme/theme.js";
@@ -88,6 +86,7 @@ export class OwnedUiSessionShellRoot {
     constructor(view, cwd, handlers, startup = {}, agentDir, extensionRenderers = {
         getMessageRenderer: () => undefined,
         getToolRenderers: () => undefined,
+        getShortcuts: () => [],
     }, sessionLayout = "pinned", imageAssets) {
         this.#view = view;
         this.#customViewport = sessionLayout === "custom-viewport";
@@ -124,6 +123,7 @@ export class OwnedUiSessionShellRoot {
         this.editor = createPiShellEditor({
             ...handlers,
             keybindingProfile: this.#customViewport ? "a1" : "pi",
+            ...(handlers.keybindings === undefined ? {} : { keybindings: handlers.keybindings }),
             paintEditorSelection: (line, from, to, atomic) => backgroundSgrSpan(line, from, to, atomic ? "\u001b[7m" : "\u001b[27m\u001b[48;2;38;79;120m", atomic ? "\u001b[27m" : "\u001b[49m", piShellVisibleWidth),
             transformPastedContent: content => {
                 try {
@@ -680,54 +680,16 @@ export class OwnedUiSessionShellRoot {
     #renderQueued(width) {
         return this.#view.editor.queuedSubmissions.length === 0 ? [] : this.#queued.render(width);
     }
-    layoutRoot() {
-        const document = layoutPort(width => this.#renderDocument(width), () => this.invalidate());
-        const queued = layoutPort(width => this.#view.editor.queuedSubmissions.length === 0 ? [] : this.#queued.render(width), () => this.#queued.invalidate());
-        const aboveWidgets = layoutPort(width => this.#renderWidgets("aboveEditor", width), () => this.#invalidateExtensions());
-        const status = layoutPort(width => this.#renderStatus(width), () => this.#status.invalidate());
-        const editor = layoutPort(width => this.#inputSurface.render(width), () => this.#inputSurface.invalidate(), data => this.#inputSurface.handleInput?.(data));
-        const belowWidgets = layoutPort(width => this.#renderWidgets("belowEditor", width), () => this.#invalidateExtensions());
-        const footer = layoutPort(width => this.#renderFooter(width), () => (this.#extensionFooter ?? this.#footer).invalidate());
+    /** The pinned-profile layout regions of this session; the terminal host arranges them with `pinnedLayoutRoot`. */
+    layoutParts() {
         return {
-            type: "stack",
-            direction: "vertical",
-            children: [
-                {
-                    basis: 0,
-                    grow: 1,
-                    shrink: 1,
-                    minSize: 1,
-                    node: {
-                        type: "scroll",
-                        id: "transcript",
-                        follow: "end",
-                        primary: true,
-                        overscroll: "chain",
-                        scrollbar: "auto",
-                        scrollbarTrackStyle: text => piTheme().fg("scrollbarTrack", text),
-                        scrollbarThumbStyle: text => piTheme().fg("scrollbarThumb", text),
-                        child: { type: "component", component: document },
-                    },
-                },
-                {
-                    basis: "auto",
-                    grow: 0,
-                    shrink: 1,
-                    minSize: 1,
-                    node: {
-                        type: "stack",
-                        direction: "vertical",
-                        children: [
-                            { shrink: 1, minSize: 0, node: { type: "component", component: queued } },
-                            { shrink: 1, minSize: 0, node: { type: "component", component: status } },
-                            { shrink: 1, minSize: 0, node: { type: "component", component: aboveWidgets } },
-                            { shrink: 1, minSize: 3, node: { type: "component", component: editor } },
-                            { shrink: 1, minSize: 0, node: { type: "component", component: belowWidgets } },
-                            { shrink: 1, minSize: 1, node: { type: "component", component: footer } },
-                        ],
-                    },
-                },
-            ],
+            document: layoutPort(width => this.#renderDocument(width), () => this.invalidate()),
+            queued: layoutPort(width => this.#view.editor.queuedSubmissions.length === 0 ? [] : this.#queued.render(width), () => this.#queued.invalidate()),
+            aboveWidgets: layoutPort(width => this.#renderWidgets("aboveEditor", width), () => this.#invalidateExtensions()),
+            status: layoutPort(width => this.#renderStatus(width), () => this.#status.invalidate()),
+            editor: layoutPort(width => this.#inputSurface.render(width), () => this.#inputSurface.invalidate(), data => this.#inputSurface.handleInput?.(data)),
+            belowWidgets: layoutPort(width => this.#renderWidgets("belowEditor", width), () => this.#invalidateExtensions()),
+            footer: layoutPort(width => this.#renderFooter(width), () => (this.#extensionFooter ?? this.#footer).invalidate()),
         };
     }
     #renderDocument(width) {
@@ -1071,7 +1033,7 @@ export class OwnedUiSessionShellRoot {
     hotkeysPresentation() {
         return {
             bindings: this.editor.keybindingConfig(),
-            getShortcuts: bindings => this.#extensionRenderers.getShortcuts?.(bindings) ?? [],
+            getShortcuts: bindings => this.#extensionRenderers.getShortcuts(bindings),
             profile: this.#customViewport ? "a1" : "pi",
         };
     }
@@ -1373,6 +1335,53 @@ function pinnedPromptSourceRow(block, sourceRow, width) {
         return sourceRow;
     return overlaySpan(sourceRow, rowWidth - timestampWidth, rowWidth, paintPiSubmittedPromptTimestamp(timestamp));
 }
+/**
+ * The pinned-profile screen: a followed transcript scroll above the dock. The runtime mounts one such layout,
+ * so its single `transcript` scroll view is shared by whichever session the parts currently resolve to.
+ */
+export function pinnedLayoutRoot(parts) {
+    return {
+        type: "stack",
+        direction: "vertical",
+        children: [
+            {
+                basis: 0,
+                grow: 1,
+                shrink: 1,
+                minSize: 1,
+                node: {
+                    type: "scroll",
+                    id: "transcript",
+                    follow: "end",
+                    primary: true,
+                    overscroll: "chain",
+                    scrollbar: "auto",
+                    scrollbarTrackStyle: text => piTheme().fg("scrollbarTrack", text),
+                    scrollbarThumbStyle: text => piTheme().fg("scrollbarThumb", text),
+                    child: { type: "component", component: parts.document },
+                },
+            },
+            {
+                basis: "auto",
+                grow: 0,
+                shrink: 1,
+                minSize: 1,
+                node: {
+                    type: "stack",
+                    direction: "vertical",
+                    children: [
+                        { shrink: 1, minSize: 0, node: { type: "component", component: parts.queued } },
+                        { shrink: 1, minSize: 0, node: { type: "component", component: parts.status } },
+                        { shrink: 1, minSize: 0, node: { type: "component", component: parts.aboveWidgets } },
+                        { shrink: 1, minSize: 3, node: { type: "component", component: parts.editor } },
+                        { shrink: 1, minSize: 0, node: { type: "component", component: parts.belowWidgets } },
+                        { shrink: 1, minSize: 1, node: { type: "component", component: parts.footer } },
+                    ],
+                },
+            },
+        ],
+    };
+}
 function layoutPort(render, invalidate, handleInput) {
     return {
         render,
@@ -1381,7 +1390,7 @@ function layoutPort(render, invalidate, handleInput) {
     };
 }
 export function shellResourceEntries(backend) {
-    const resources = backend.nonVisualResources().map(resource => ({
+    const resources = backend.extensions.nonVisualResources().map(resource => ({
         section: resource.kind === "skill"
             ? "Skills"
             : resource.kind === "prompt-template"
@@ -1397,7 +1406,7 @@ export function shellResourceEntries(backend) {
         sourcePath: resource.sourcePath,
         diagnostic: resource.diagnostic,
     }));
-    const extensions = backend.extensionResources().filter(extension => !extension.hidden);
+    const extensions = backend.extensions.extensionResources().filter(extension => !extension.hidden);
     const loadedExtensions = extensions.filter(extension => extension.diagnostic === null);
     const extensionLabels = compactExtensionLabels(loadedExtensions);
     for (const extension of extensions) {

package/dist/app/session-shell/session-shell.d.ts

@@ -1,39 +1,52 @@
-import type { OwnedUiSessionViewModel, OwnedUiThinkingLevel } from "../../contracts/owned-ui/index.js";
-import type { AdapterCommandResult } from "../../integrations/pi/engine/adapter.js";
-import type { PiWorkflowRequest } from "../../integrations/pi/engine/workflows.js";
+import type { OwnedUiCommandResult, OwnedUiSessionBackend, OwnedUiSessionViewModel, OwnedUiThinkingLevel, OwnedUiWorkflowRequest } from "../../contracts/owned-ui/index.js";
 import { type PiShellSkillSummary } from "../../integrations/pi/components/skills-command.js";
 import { type PiShellHotkeysPresentation } from "../../integrations/pi/components/shell-presenters-info.js";
 import type { PiShellSelectorOption } from "../../integrations/pi/components/shell-shared-facade.js";
-import { type PiTuiDamageDecision } from "../../integrations/pi/tui-runtime/damage-aware-terminal.js";
-import { PiTuiRuntimeAdapter } from "../../integrations/pi/tui-runtime/adapter.js";
-import type { PiTuiOverlayHandle } from "../../integrations/pi/tui-runtime/contracts.js";
-import { OwnedUiSessionShellRoot, type OwnedUiBackendPort, type OwnedUiSessionShellOptions } from "./session-shell-root.js";
-export { OwnedUiSessionShellRoot, type OwnedUiSessionShellOptions, type OwnedUiShellDiagnosticOptions, type OwnedUiShellEngineOptions, type OwnedUiShellHistoryOptions, type OwnedUiShellPresentationOptions, type OwnedUiShellPromptImagesOptions, type OwnedUiShellSkillsOptions, type OwnedUiShellSuggestionOptions, } from "./session-shell-root.js";
-/** Coordinates backend, owned presentation, and Pi TUI lifecycles for one interactive session. */
-export declare class OwnedUiSessionShell {
+import type { PiTuiDamageDecision } from "../../integrations/pi/tui-runtime/damage-aware-terminal.js";
+import type { PiTuiRuntimeAdapter } from "../../integrations/pi/tui-runtime/adapter.js";
+import type { PiTuiInputSurfaceKind } from "../../integrations/pi/tui-runtime/input-presentation-coordinator.js";
+import type { PiTuiComponentPort, PiTuiInputListenerResult, PiTuiOverlayHandle, PiTuiPointerSurface } from "../../integrations/pi/tui-runtime/contracts.js";
+import { OwnedUiTerminalHost, type OwnedUiHostedPresenter, type OwnedUiPresenterRelease } from "./shell-host.js";
+import { OwnedUiSessionShellRoot, type OwnedUiSessionShellOptions, type PinnedLayoutPart } from "./session-shell-root.js";
+export { OwnedUiSessionShellRoot, type OwnedUiSessionShellOptions, type OwnedUiShellDiagnosticOptions, type OwnedUiShellEngineOptions, type OwnedUiShellHistoryOptions, type OwnedUiShellPresentationOptions, type OwnedUiShellPromptImagesOptions, type OwnedUiShellSharedServices, type OwnedUiShellSkillsOptions, type OwnedUiShellSuggestionOptions, } from "./session-shell-root.js";
+export { OwnedUiTerminalHost, sessionTerminalHostOptions, type OwnedUiTerminalHostOptions } from "./shell-host.js";
+/**
+ * Presents one engine session: its transcript root, editor, controllers, submission, workflows, and dialogs.
+ * It reaches the terminal only through its terminal host's handle, and paints only while it is attached.
+ */
+export declare class OwnedUiSessionPresenter implements OwnedUiHostedPresenter {
     #private;
-    readonly backend: OwnedUiBackendPort;
+    readonly backend: OwnedUiSessionBackend;
     readonly root: OwnedUiSessionShellRoot;
-    readonly runtime: PiTuiRuntimeAdapter;
-    constructor(options: OwnedUiSessionShellOptions);
+    constructor(host: OwnedUiTerminalHost, options: OwnedUiSessionShellOptions);
     view(): OwnedUiSessionViewModel;
-    damagePresentationDecision(): PiTuiDamageDecision | null;
+    get terminalHost(): OwnedUiTerminalHost;
+    render(width: number): readonly string[];
+    handleInput(data: string): void;
+    invalidate(): void;
+    setFocused(focused: boolean): void;
+    inputCoordinationSurface(): PiTuiInputSurfaceKind;
+    setOverlaySurfaces(surfaces: readonly PiTuiPointerSurface[] | null): void;
+    noteImmediatePresentation(): void;
+    layoutPart(part: PinnedLayoutPart): PiTuiComponentPort;
+    activated(): void;
+    handleViewportInput(data: string): PiTuiInputListenerResult | undefined;
     start(): void;
     onView(listener: (view: OwnedUiSessionViewModel) => void): () => void;
     waitUntilStopped(): Promise<void>;
-    submit(text: string): Promise<AdapterCommandResult>;
-    clearOrExit(now?: number): Promise<AdapterCommandResult>;
-    interrupt(now?: number): Promise<AdapterCommandResult>;
-    abort(): Promise<AdapterCommandResult>;
-    retry(): Promise<AdapterCommandResult>;
-    compact(): Promise<AdapterCommandResult>;
-    newSession(): Promise<AdapterCommandResult>;
-    resumeSession(sessionPath: string): Promise<AdapterCommandResult>;
-    setModel(providerId: string, modelId: string): Promise<AdapterCommandResult>;
-    setThinkingLevel(thinkingLevel: OwnedUiThinkingLevel): Promise<AdapterCommandResult>;
-    cycleThinkingLevel(): Promise<AdapterCommandResult>;
-    cycleModel(direction: "forward" | "backward"): Promise<AdapterCommandResult>;
-    queueFollowUp(): Promise<AdapterCommandResult>;
+    submit(text: string): Promise<OwnedUiCommandResult>;
+    clearOrExit(now?: number): Promise<OwnedUiCommandResult>;
+    interrupt(now?: number): Promise<OwnedUiCommandResult>;
+    abort(): Promise<OwnedUiCommandResult>;
+    retry(): Promise<OwnedUiCommandResult>;
+    compact(): Promise<OwnedUiCommandResult>;
+    newSession(): Promise<OwnedUiCommandResult>;
+    resumeSession(sessionPath: string): Promise<OwnedUiCommandResult>;
+    setModel(providerId: string, modelId: string): Promise<OwnedUiCommandResult>;
+    setThinkingLevel(thinkingLevel: OwnedUiThinkingLevel): Promise<OwnedUiCommandResult>;
+    cycleThinkingLevel(): Promise<OwnedUiCommandResult>;
+    cycleModel(direction: "forward" | "backward"): Promise<OwnedUiCommandResult>;
+    queueFollowUp(): Promise<OwnedUiCommandResult>;
     restoreQueuedInput(): void;
     showSelector(title: string, options: readonly PiShellSelectorOption[], onSelect: (id: string) => void, onCancel?: () => void): PiTuiOverlayHandle;
     showThinkingSelector(): Promise<void>;
@@ -48,15 +61,28 @@ export declare class OwnedUiSessionShell {
     showLoginProviderSelector(authType?: "oauth" | "api_key", initialSearchInput?: string): void;
     showSessionSelector(): Promise<void>;
     showSettingsSelector(): void;
-    shutdown(): Promise<AdapterCommandResult>;
-    runWorkflow(request: PiWorkflowRequest): Promise<AdapterCommandResult>;
+    shutdown(): Promise<OwnedUiCommandResult>;
+    runWorkflow(request: OwnedUiWorkflowRequest): Promise<OwnedUiCommandResult>;
     showTrustSelector(): void;
     showScopedModelsSelector(): void;
     /** The bare-A1 unified Models dialog: switch on Enter, scope on Space, persist on Ctrl+S, all through the engine. */
     showModelsDialog(initialQuery?: string): void;
     dispose(): Promise<void>;
+    release(terminal: {
+        readonly mode: "regular" | "fullscreen";
+        readonly columns: number;
+    }): OwnedUiPresenterRelease;
     hotkeysPresentation(): PiShellHotkeysPresentation;
 }
+/**
+ * One session on a terminal of its own: a terminal host with this presenter attached. Disposing it ends the
+ * terminal, as quitting the single-session product does.
+ */
+export declare class OwnedUiSessionShell extends OwnedUiSessionPresenter {
+    constructor(options: OwnedUiSessionShellOptions);
+    get runtime(): PiTuiRuntimeAdapter;
+    damagePresentationDecision(): PiTuiDamageDecision | null;
+}
 export interface SessionResumeCommandMetadata {
     readonly sessionId: string;
     readonly sessionDir: string;