@timurproko/a1 0.2.7-dev.788 → 0.2.7-dev.792

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

@@ -53,7 +53,6 @@ export interface OwnedUiShellEngineOptions {
             readonly sessionFile: string | null;
             readonly kind: "prompt" | "steer" | "follow-up";
             readonly text: string;
-            readonly images?: readonly unknown[];
         }): Promise<{
             readonly id: string;
         }>;

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

@@ -96,9 +96,8 @@ export class OwnedUiSessionShellRoot {
             ...(handlers.promptImageLimit === undefined ? {} : { imageLimit: handlers.promptImageLimit }) });
         this.#submittedPromptComposer = this.#customViewport
             ? {
-                layout: submittedPromptLayout,
-                compose: (rows, width, source, style) => composeSubmittedPromptRows(rows, width, source, { ...style, prefix: text => promptArrow(text, piTheme()) })
-                    .map(row => nativeHyperlinkStyle(row, nativeTranscriptLinkColor)),
+                layout: (width, source) => submittedPromptLayout(width, source, this.#viewportController.config.timeFormat ?? "8:00 PM"),
+                compose: (rows, width, source, style) => composeSubmittedPromptRows(rows, width, source, { ...style, prefix: text => promptArrow(text, piTheme()) }, this.#viewportController.config.timeFormat ?? "8:00 PM").map(row => nativeHyperlinkStyle(row, nativeTranscriptLinkColor)),
             }
             : undefined;
         this.#cwd = cwd;
@@ -430,6 +429,23 @@ export class OwnedUiSessionShellRoot {
         const selectableDocumentRowCount = document.rows.length;
         const dockStartRow = height - dockRows.length + 1;
         const editorOffset = dock.editorOffset;
+        // Rationale: rendered chip tags are lossy presentation (truncated labels), so a frame drag over
+        // a draft holding chips stays visual-only; editor-owned word/line selection still copies the
+        // expanded chip text through its semantic route.
+        const draft = this.usesDefaultInputSurface() ? this.editor.getText() : "";
+        const promptCopyRows = draft.length > 0
+            && !draft.split("\n").some(line => this.#promptChips.atomicRanges(line).length > 0)
+            ? Math.max(0, dock.inputRows - 2)
+            : 0;
+        const copyableDockRows = [
+            ...Array.from({ length: promptCopyRows }, (_value, index) => ({
+                row: editorOffset + index + 1,
+                prompt: index === 0 ? "first" : "continuation",
+            })),
+            ...Array.from({ length: dock.footerRows }, (_value, index) => ({
+                row: dockRows.length - dock.footerRows + index,
+            })),
+        ];
         this.#viewportController.setInputSurfaceFrame(this.usesDefaultInputSurface() ? undefined : {
             component: this.#inputSurface,
             columnStart: 1,
@@ -458,7 +474,7 @@ export class OwnedUiSessionShellRoot {
             && snapshot.inputSurface === inputSurface
             && snapshot.viewportRevision === viewportRevision
             && snapshot.selectionRevision === selectionRevision
-            ? this.#viewportController.composeDockOnly(dockRows, width, height, dock.footerRows)
+            ? this.#viewportController.composeDockOnly(dockRows, width, height, copyableDockRows)
             : null;
         if (frame === null) {
             frame = this.#viewportController.compose({
@@ -474,7 +490,7 @@ export class OwnedUiSessionShellRoot {
                 ...(document.liveTailStartRow === undefined ? {} : { liveTailStartRow: document.liveTailStartRow }),
                 bottomAlignedTailRowCount: steeringRows.length + statusRows.length,
                 dockRows,
-                explicitCopyDockRows: dock.footerRows,
+                copyableDockRows,
                 promptAnchors: document.promptAnchors,
                 width,
                 height,
@@ -541,8 +557,11 @@ export class OwnedUiSessionShellRoot {
         return this.#viewportController.hasSelection || this.editor.hasSelection();
     }
     setViewportConfig(config) {
-        if (this.#viewportController.setConfig(config))
+        if (this.#viewportController.setConfig(config)) {
+            this.#renderedRows.clear();
             this.#documentLayouts.clear();
+            this.#visibleViewportSnapshot = undefined;
+        }
     }
     setFullscreenCopyOnSelect(enabled) {
         this.#viewportController.setCopyOnSelect(enabled);
@@ -751,11 +770,13 @@ export class OwnedUiSessionShellRoot {
             }
             rows.push(...blockRows);
             if (promptLike && blockRows[0] !== undefined) {
+                const source = pinnedPromptSource(block, blockRows[0], blockWidth, this.#viewportController.config.timeFormat);
                 promptAnchors.push({
                     id: block.id,
                     firstRow,
                     lastRow: Math.max(firstRow, rows.length - 1),
-                    sourceRow: pinnedPromptSourceRow(block, blockRows[0], blockWidth),
+                    sourceRow: source.row,
+                    copySuffixWidth: source.copySuffixWidth,
                     prominentSourceRow: blockRows[0],
                 });
             }
@@ -1322,20 +1343,25 @@ function withoutTerminalBackground(text) {
     return text.replace(TERMINAL_BACKGROUND, "");
 }
 /** Preserve the stable metadata-grey foreground for every pinned timestamp state. */
-function pinnedPromptSourceRow(block, sourceRow, width) {
+function pinnedPromptSource(block, sourceRow, width, timeFormat) {
+    const unchanged = { row: sourceRow, copySuffixWidth: 0 };
     if (typeof block.payload !== "object" || block.payload === null)
-        return sourceRow;
+        return unchanged;
     const value = block.payload.timestamp;
     if (typeof value !== "number" || !Number.isFinite(value))
-        return sourceRow;
-    const timestamp = formatSubmittedPromptTime(value);
-    if (timestamp === null || submittedPromptLayout(width, value).timestamp === null)
-        return sourceRow;
+        return unchanged;
+    const format = timeFormat ?? "8:00 PM";
+    const timestamp = formatSubmittedPromptTime(value, format);
+    if (timestamp === null || submittedPromptLayout(width, value, format).timestamp === null)
+        return unchanged;
     const rowWidth = displayWidth(sourceRow);
     const timestampWidth = displayWidth(timestamp);
     if (rowWidth < timestampWidth)
-        return sourceRow;
-    return overlaySpan(sourceRow, rowWidth - timestampWidth, rowWidth, paintPiSubmittedPromptTimestamp(timestamp));
+        return unchanged;
+    return {
+        row: overlaySpan(sourceRow, rowWidth - timestampWidth, rowWidth, paintPiSubmittedPromptTimestamp(timestamp)),
+        copySuffixWidth: timestampWidth,
+    };
 }
 /**
  * The pinned-profile screen: a followed transcript scroll above the dock. The runtime mounts one such layout,

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

@@ -270,7 +270,7 @@ export class OwnedUiSessionPresenter {
             // Invariant: the presenter owns its root (theme subscription and helper clients) and disposes it once the
             // terminal no longer renders it.
             constructed.push(() => this.root.dispose());
-            this.#restoreResidentInput();
+            this.#restoreResidentInput(options.history?.imageSidecar);
             const initialPiSettings = this.backend.settings.snapshot();
             this.#programStatus = new ProgramStatusReporter(status => this.#terminal.setProgramStatus(status), () => this.view().status.footer?.sessionName ?? undefined);
             this.#reloadPresentation = reloadPresentation;
@@ -802,7 +802,6 @@ export class OwnedUiSessionPresenter {
                 sessionFile: this.#currentSessionFile(),
                 kind: type,
                 text: input,
-                ...(prepared.images.length === 0 ? {} : { images: prepared.images }),
             });
         }
         catch {
@@ -1213,11 +1212,13 @@ export class OwnedUiSessionPresenter {
             this.#resolveStoppedLifecycle();
         }
     }
-    #restoreResidentInput() {
+    #restoreResidentInput(imageSidecar) {
         const recovered = this.#residentTabOptions?.recovered;
         if (recovered === undefined)
             return;
-        const prompts = recovered.prompts.map(prompt => prompt.text).filter(Boolean);
+        const prompts = recovered.prompts
+            .map(prompt => this.root.rehydrateHistoryText(prompt.text, id => imageSidecar?.readAttachment(id) ?? null))
+            .filter(Boolean);
         if (prompts.length > 0) {
             this.root.editor.setText(prompts[0]);
             if (recovered.draft)

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

@@ -1,7 +1,7 @@
 import type { PiTuiPointerSurface } from "../../integrations/pi/tui-runtime/contracts.js";
 import type { OwnedUiViewportSettings } from "../../contracts/owned-ui/index.js";
 import { type TranscriptViewportFrame, type TranscriptViewportFrameInput } from "../../ui/components/transcript-viewport.js";
-import type { SelectionCopySnapshot } from "../../ui/components/selection-copy.js";
+import { type SelectionCopySnapshot } from "../../ui/components/selection-copy.js";
 import type { PiShellEditorPort } from "../../integrations/pi/components/shell-shared-facade.js";
 import type { PasteEvent } from "./paste-protocol.js";
 export interface SessionViewportControllerOptions {
@@ -64,7 +64,7 @@ export declare class SessionViewportController {
     setOverlaySurfaces(surfaces: readonly PiTuiPointerSurface[] | null): void;
     get inputGeometryReady(): boolean;
     compose(input: Omit<TranscriptViewportFrameInput, "pointerPosition">): TranscriptViewportFrame;
-    composeDockOnly(dockRows: readonly string[], width: number, height: number, explicitCopyDockRows?: number): TranscriptViewportFrame | null;
+    composeDockOnly(dockRows: readonly string[], width: number, height: number, copyableDockRows?: TranscriptViewportFrameInput["copyableDockRows"]): TranscriptViewportFrame | null;
     /** Returns true when document wrapping may have changed. */
     setConfig(config: OwnedUiViewportSettings): boolean;
     resumeFollowing(): void;

package/dist/app/session-shell/session-viewport-controller.js

@@ -3,6 +3,7 @@ import { TranscriptViewport } from "../../ui/components/transcript-viewport.js";
 import { readVisibleHyperlinks } from "../../ui/components/visible-hyperlinks.js";
 import { routeMouseInput } from "../../ui/components/mouse.js";
 import { scrollForTrackPage, scrollForThumbRow, scrollbarSelectionRows, scrollbarWheelRows } from "../../ui/components/scrollbar.js";
+import { literalSelectionCopySnapshot } from "../../ui/components/selection-copy.js";
 function withinTailControl(region, column, row) {
     return row >= region.rowStart && row <= region.rowEnd && column >= region.columnStart && column <= region.columnEnd;
 }
@@ -22,6 +23,7 @@ export class SessionViewportController {
     #pasteDiagnosticRequest = 0;
     #viewport = new TranscriptViewport();
     #config = {
+        timeFormat: "8:00 PM",
         scrollbarAppearance: "auto",
         scrollbarStyle: "thin",
         scrollbarSpeed: "normal",
@@ -165,16 +167,18 @@ export class SessionViewportController {
         }
         return frame;
     }
-    composeDockOnly(dockRows, width, height, explicitCopyDockRows = 0) {
-        return this.#viewport.composeDockOnly(dockRows, width, height, explicitCopyDockRows);
+    composeDockOnly(dockRows, width, height, copyableDockRows = []) {
+        return this.#viewport.composeDockOnly(dockRows, width, height, copyableDockRows);
     }
     /** Returns true when document wrapping may have changed. */
     setConfig(config) {
-        const appearanceChanged = config.scrollbarAppearance !== this.#config.scrollbarAppearance;
-        this.#config = config;
-        this.#viewport.setConfig(config);
+        const normalized = { ...config, timeFormat: config.timeFormat ?? "8:00 PM" };
+        const layoutChanged = normalized.scrollbarAppearance !== this.#config.scrollbarAppearance
+            || normalized.timeFormat !== this.#config.timeFormat;
+        this.#config = normalized;
+        this.#viewport.setConfig(normalized);
         this.#requestRender();
-        return appearanceChanged;
+        return layoutChanged;
     }
     resumeFollowing() {
         if (!this.#enabled)
@@ -302,12 +306,10 @@ export class SessionViewportController {
             });
         }
         if (data === "\u0003") {
-            if (editorActive && this.#editor.hasSelection()) {
-                if (this.#viewport.clearSelection())
-                    this.#requestRender();
-            }
-            else if (this.#viewport.hasSelection) {
-                const copySelection = this.#viewport.captureSelectedText("explicit");
+            // Invariant: the newest complete-frame gesture owns explicit copy even if an
+            // older editor word/line selection remains painted beneath it.
+            if (this.#viewport.hasSelection) {
+                const copySelection = this.#viewport.captureSelectedText();
                 this.#viewport.clearSelection();
                 this.#stopSelectionAutoScroll();
                 this.#requestRender();
@@ -315,6 +317,10 @@ export class SessionViewportController {
                     ? { data: "", consumed: true }
                     : { data: "", consumed: true, copySelection };
             }
+            if (editorActive && this.#editor.hasSelection()) {
+                if (this.#viewport.clearSelection())
+                    this.#requestRender();
+            }
         }
         const previousPrompt = SHIFT_UP_INPUTS.has(data) || this.#editor.matchesTerminalKey(data, "alt+home");
         if (editorActive && allowWheel && (previousPrompt || SHIFT_DOWN_INPUTS.has(data))) {
@@ -541,6 +547,12 @@ export class SessionViewportController {
                         const editorRow = pendingEditorClick.row - this.#editorPointerFrame.rowStart + 1;
                         this.#editor.handlePointer({ kind: "press", button: 0, column: pendingEditorClick.column, row: editorRow });
                         this.#editor.handlePointer({ kind: "release", button: 0, column: pendingEditorClick.column, row: editorRow });
+                        if (this.#copyOnSelect) {
+                            const selected = this.#editor.selectedText?.();
+                            if (selected !== undefined) {
+                                completedCopy = literalSelectionCopySnapshot(selected, this.#viewport.selectionRevision) ?? undefined;
+                            }
+                        }
                     }
                     forceRepaint = true;
                     repaint = true;

package/dist/composition/owned-ui.d.ts

@@ -88,3 +88,4 @@ export declare function composeOwnedUi(options?: OwnedUiCompositionOptions): Pro
 export declare function bindResidentTabBridge(tabBridge: TabBridgeClient, backend: Pick<ComposedSessionBackend, "identity" | "session" | "workflows" | "generateResidentTabName">, recovery?: Pick<ResidentTabRecovery, "settled"> | null, options?: {
     readonly autoName?: boolean;
 }): Promise<() => void>;
+export declare function correlateResidentTabSubmission(recovery: Pick<ResidentTabRecovery, "correlated" | "settled">, backend: Pick<ComposedSessionBackend, "identity" | "session">, submissionId: string, entryId: string): Promise<void>;

package/dist/composition/owned-ui.js

@@ -12,6 +12,8 @@ import { createPiSessionPresenters } from "../integrations/pi/session-presenters
 import { ClipboardDiagnosticCapture } from "../app/session-shell/clipboard-diagnostics.js";
 import { createOwnedUiClipboardServices } from "../app/session-shell/clipboard-services.js";
 import { createPiKeybindingsHost } from "../integrations/pi/components/shell-shared-facade.js";
+import { projectResidentTabShortcuts } from "../features/resident-tab/shortcut-projection.js";
+import { readShortcutBindingsFile } from "../features/resident-tab/shortcut-bindings-file.js";
 import { OwnedUiSessionPresenter, OwnedUiTerminalHost, sessionTerminalHostOptions, } from "../app/session-shell/session-shell.js";
 import { OwnedSettingsManager } from "../ui/settings/manager.js";
 import { createPiTerminalBridge } from "../integrations/pi/tui-runtime/presentation-adapter.js";
@@ -254,7 +256,18 @@ export async function composeOwnedUi(options = {}) {
         ? new ClipboardDiagnosticCapture(clipboardDestination) : null;
     // Invariant: process-wide services are created once here and borrowed by every session shell. The
     // keybinding registry is applied before any presenter is built, so none of them reads Pi's defaults.
-    const keybindings = createPiKeybindingsHost({ profile: ownedSurfaces ? "a1" : "pi", agentDir: backend.identity.agentDir });
+    const keybindingsHost = createPiKeybindingsHost({ profile: ownedSurfaces ? "a1" : "pi", agentDir: backend.identity.agentDir });
+    // Invariant: the resident host dispatches and labels the tab shortcuts this child projects
+    // from its effective declarations, so a customization reload republishes the projection.
+    const publishTabShortcuts = () => tabBridge?.shortcuts(projectResidentTabShortcuts({
+        configured: readShortcutBindingsFile(backend.identity.agentDir),
+        reserved: keybindingsHost.manager.getEffectiveConfig(),
+    }).assignments);
+    const keybindings = tabBridge === null ? keybindingsHost : {
+        ...keybindingsHost,
+        reload: () => { keybindingsHost.reload(); publishTabShortcuts(); },
+    };
+    publishTabShortcuts();
     const clipboardServices = ownedSurfaces ? createOwnedUiClipboardServices() : null;
     let createdTerminalHost;
     let terminalHost;
@@ -284,7 +297,7 @@ export async function composeOwnedUi(options = {}) {
                         stallNoticeSeconds: 300,
                         admit: input => tabRecovery.admit({ ...input, incarnation: options.tab.incarnation }),
                         dispatched: () => tabRecovery.dispatched(),
-                        correlated: (submissionId, entryId) => tabRecovery.correlated(submissionId, entryId),
+                        correlated: (submissionId, entryId) => correlateResidentTabSubmission(tabRecovery, backend, submissionId, entryId),
                         checkpoint: text => tabRecovery.checkpoint(text),
                         gracefulStop: sessionFile => tabRecovery.gracefulStop(sessionFile),
                         ...(recoveredTabInput === undefined ? {} : { recovered: recoveredTabInput }),
@@ -463,6 +476,9 @@ export async function bindResidentTabBridge(tabBridge, backend, recovery = null,
         if (command.type === "rename") {
             void backend.workflows.executeWorkflow({ command: "name", argument: command.name }).catch(() => { });
         }
+        else if (command.type === "route") {
+            void backend.workflows.executeWorkflow({ command: command.route, argument: "" }).catch(() => { });
+        }
         else if (command.type === "stop") {
             void backend.session.dispose().catch(() => { });
         }
@@ -502,6 +518,14 @@ export async function bindResidentTabBridge(tabBridge, backend, recovery = null,
         unsubscribeEvents();
     };
 }
+export async function correlateResidentTabSubmission(recovery, backend, submissionId, entryId) {
+    await recovery.correlated(submissionId, entryId);
+    // Concurrency: a normal prompt command can resolve after the ready transition already fired.
+    // Re-read lifecycle only after correlation is active; a concurrent ready observer and this path
+    // safely race because recovery consumes the active entry once and retirement is idempotent.
+    if (backend.session.view().lifecycle !== "busy")
+        await recovery.settled(currentBackendSessionFile(backend));
+}
 function currentBackendSessionFile(backend) {
     const direct = backend.identity.currentSessionFile?.();
     if (direct !== undefined && direct !== null)
@@ -523,6 +547,7 @@ function quitOutroSettingsSnapshot(settings) {
 }
 function viewportSettingsSnapshot(settings) {
     return {
+        timeFormat: settings.value("timeFormat"),
         scrollbarAppearance: settings.value("scrollbarAppearance"),
         scrollbarStyle: settings.value("scrollbarStyle"),
         scrollbarSpeed: settings.value("scrollbarSpeed"),

package/dist/contracts/owned-ui/index.d.ts

@@ -3,7 +3,7 @@ export type UiAccentColor = "purple" | "blue" | "cyan" | "green" | "orange" | "p
 export { OWNED_UI_EXTENSION_CONTRACT_VERSION, OWNED_UI_EXTENSION_RENDER_CALLBACKS, OWNED_UI_EXTENSION_UI_CALLBACKS, OWNED_UI_EXTENSION_UI_PROPERTIES, assertOwnedUiExtensionUiPort, } from "./extension-ui.js";
 export type { OwnedUiExtensionAutocompleteItem, OwnedUiExtensionAutocompleteProvider, OwnedUiExtensionAutocompleteProviderFactory, OwnedUiExtensionAutocompleteSuggestions, OwnedUiExtensionComponent, OwnedUiExtensionComponentFactory, OwnedUiExtensionComponentFactoryContext, OwnedUiExtensionCustomFactory, OwnedUiExtensionCustomOptions, OwnedUiExtensionDialogOptions, OwnedUiExtensionEditorComponent, OwnedUiExtensionEditorFactory, OwnedUiExtensionEditorThemePort, OwnedUiExtensionEntryRenderInput, OwnedUiExtensionFooterDataPort, OwnedUiExtensionFooterFactory, OwnedUiExtensionInputListener, OwnedUiExtensionKeybindingsPort, OwnedUiExtensionMessageRenderInput, OwnedUiExtensionNotificationSeverity, OwnedUiExtensionOverlayAnchor, OwnedUiExtensionOverlayHandle, OwnedUiExtensionOverlayMargin, OwnedUiExtensionOverlayOptions, OwnedUiExtensionRenderCallback, OwnedUiExtensionRendererPort, OwnedUiExtensionRuntimePort, OwnedUiExtensionSelectListThemePort, OwnedUiExtensionSizeValue, OwnedUiExtensionTerminalPort, OwnedUiExtensionThemeBackground, OwnedUiExtensionThemeColor, OwnedUiExtensionThemeInfo, OwnedUiExtensionThemePort, OwnedUiExtensionToolRenderContext, OwnedUiExtensionUiCallback, OwnedUiExtensionUiPort, OwnedUiExtensionUiProperty, OwnedUiExtensionWidgetOptions, OwnedUiExtensionWidgetPlacement, OwnedUiExtensionWorkingIndicatorOptions, } from "./extension-ui.js";
 export { OWNED_UI_CONTRACT_VERSION } from "./model.js";
-export type { OwnedUiBackgroundSettingsPort, OwnedUiBackgroundStyle, OwnedUiBlockStatus, OwnedUiCommand, OwnedUiCommandOutcome, OwnedUiCorrelationId, OwnedUiCustomization, OwnedUiDiagnostics, OwnedUiDialog, OwnedUiEditorState, OwnedUiEntityId, OwnedUiEvent, OwnedUiFooterView, OwnedUiImageAttachment, OwnedUiLifecycle, OwnedUiModelInfo, OwnedUiOverlay, OwnedUiPromptSuggestionGeneratorPort, OwnedUiPromptSuggestionIdentity, OwnedUiPromptSuggestionReasoning, OwnedUiPromptSuggestionRequest, OwnedUiPromptSuggestionResult, OwnedUiPromptSuggestionState, OwnedUiQuitOutroSettings, OwnedUiQuitOutroSettingsPort, OwnedUiSessionId, OwnedUiSessionViewModel, OwnedUiSeverity, OwnedUiSlotId, OwnedUiSnapshot, OwnedUiStatusView, OwnedUiTerminalSurface, OwnedUiThinkingLevel, OwnedUiToolRendering, OwnedUiToolResultPart, OwnedUiToolState, OwnedUiTranscriptBlock, OwnedUiTranscriptBlockKind, OwnedUiTranscriptImageReference, OwnedUiUsageView, OwnedUiViewportSettings, OwnedUiViewportSettingsPort, } from "./model.js";
+export type { OwnedUiBackgroundSettingsPort, OwnedUiBackgroundStyle, OwnedUiBlockStatus, OwnedUiCommand, OwnedUiCommandOutcome, OwnedUiCorrelationId, OwnedUiCustomization, OwnedUiDiagnostics, OwnedUiDialog, OwnedUiEditorState, OwnedUiEntityId, OwnedUiEvent, OwnedUiFooterView, OwnedUiImageAttachment, OwnedUiLifecycle, OwnedUiModelInfo, OwnedUiOverlay, OwnedUiPromptSuggestionGeneratorPort, OwnedUiPromptSuggestionIdentity, OwnedUiPromptSuggestionReasoning, OwnedUiPromptSuggestionRequest, OwnedUiPromptSuggestionResult, OwnedUiPromptSuggestionState, OwnedUiQuitOutroSettings, OwnedUiQuitOutroSettingsPort, OwnedUiSessionId, OwnedUiSessionViewModel, OwnedUiSeverity, OwnedUiSlotId, OwnedUiSnapshot, OwnedUiStatusView, OwnedUiTerminalSurface, OwnedUiThinkingLevel, OwnedUiTimeFormat, OwnedUiToolRendering, OwnedUiToolResultPart, OwnedUiToolState, OwnedUiTranscriptBlock, OwnedUiTranscriptBlockKind, OwnedUiTranscriptImageReference, OwnedUiUsageView, OwnedUiViewportSettings, OwnedUiViewportSettingsPort, } from "./model.js";
 export type { OwnedUiExtensionPort, OwnedUiSessionBackend, OwnedUiSessionCatalogPort, OwnedUiSessionFactory, OwnedUiSessionIdentityPort, OwnedUiSessionPort, OwnedUiSessionRequest, OwnedUiSessionSettingsPort, OwnedUiWorkflowPort, } from "./session-backend.js";
 export type { OwnedUiDialogHost, OwnedUiInputSurface, OwnedUiPresenterHost, OwnedUiSessionPresenter, OwnedUiSessionPresenters, OwnedUiShortcutDescription, OwnedUiTerminalHost, OwnedUiTranscriptRendererPort, } from "./session-presenters.js";
 export { OWNED_UI_HIDDEN_COMMAND_NAMES, OWNED_UI_MODELS_COMMAND_NAME, OWNED_UI_WORKFLOW_COMMAND_NAMES, } from "./session-workflows.js";

package/dist/contracts/owned-ui/model.d.ts

@@ -53,7 +53,10 @@ export interface OwnedUiPromptSuggestionGeneratorPort {
     generate(request: OwnedUiPromptSuggestionRequest): Promise<OwnedUiPromptSuggestionResult>;
 }
 export type OwnedUiThinkingLevel = "off" | "minimal" | "low" | "medium" | "high" | "xhigh";
+export type OwnedUiTimeFormat = "20:00" | "8:00 PM";
 export interface OwnedUiViewportSettings {
+    /** Omitted by older SDK callers; bare A1 composition always supplies the owned default. */
+    readonly timeFormat?: OwnedUiTimeFormat;
     readonly scrollbarAppearance: "auto" | "always" | "hidden";
     readonly scrollbarStyle: "thin" | "thick";
     /** normal is baseline; fast is 2x normal; high is normal plus fast. */

package/dist/features/owned-ui/settings-app.js

@@ -1,5 +1,5 @@
 import { DIALOG_BACK_SHORTCUT_HINT, DIALOG_CLOSE_SHORTCUT_HINT } from "../../contracts/presentation/index.js";
-import { GLOBAL_SCOPE, LineInput, PLAIN_THEME, ShortcutRegistry, assertNoShortcutConflicts, blockJumpTarget, numericValues, RAIL_COLUMNS, renderDialogPanel, renderSteppedDialogPanel, renderEmptyState, renderGroupHeader, renderInputRow, renderListRow, renderNote, renderShortcutHintsWithClose, menuRowAt, regionAt, renderValueMenu, withScrollbarRail, stepperEnds, steppedValue, truncateToWidth, valueColumnFor, valueMenuFrame, blockRowSpan, displayWidth, handleLineInputKey, humanizeLabel, humanizeTitle, indexOfKey, layoutList, moveSelection, rowKey, scrollForSelection, scrollForTrackPage, scrollbarGeometry, scrollbarPresentation, ScrollbarRails, scrollbarWheelRows, selectableIndexes, } from "../../ui/components/index.js";
+import { GLOBAL_SCOPE, LineInput, PLAIN_THEME, ShortcutRegistry, assertNoShortcutConflicts, blockJumpTarget, numericValues, RAIL_COLUMNS, renderDialogPanel, renderSteppedDialogPanel, renderEmptyState, renderGroupHeader, renderInputRow, renderListRow, renderNote, renderShortcutHintsWithClose, menuRowAt, regionAt, renderValueMenu, withScrollbarRail, stepperEnds, steppedValue, truncateToWidth, valueColumnFor, valueMenuFrame, blockRowSpan, displayWidth, formatLocalTime, handleLineInputKey, humanizeLabel, humanizeTitle, indexOfKey, layoutList, moveSelection, rowKey, scrollForSelection, scrollForTrackPage, scrollbarGeometry, scrollbarPresentation, ScrollbarRails, scrollbarWheelRows, selectableIndexes, } from "../../ui/components/index.js";
 import { SETTINGS_APP_ID } from "./settings-route.js";
 export { SETTINGS_APP_ID, SETTINGS_ROUTE } from "./settings-route.js";
 const SCOPE = SETTINGS_APP_ID;
@@ -921,7 +921,7 @@ export class SettingsApp {
             ? CONFIGURE
             : shown === null
                 ? describeRaw(entry.rawValue)
-                : displayValue(shown);
+                : displaySettingValue(entry, shown);
         const range = rangeOf(entry);
         return {
             key,
@@ -938,11 +938,11 @@ export class SettingsApp {
             return lines;
         }
         const state = {
-            choices: menu.choices.map(choice => displayValue(choice)),
+            choices: menu.choices.map(choice => displaySettingValue(menu.entry, choice)),
             ...(menu.entry.id === "accentColor" ? {
                 previews: menu.choices.map(choice => theme.accentPreview?.(String(choice), "■") ?? ""),
             } : {}),
-            current: this.#shownValue(menu.entry) === null ? null : displayValue(this.#shownValue(menu.entry)),
+            current: this.#shownValue(menu.entry) === null ? null : displaySettingValue(menu.entry, this.#shownValue(menu.entry)),
             index: menu.index,
         };
         const frame = valueMenuFrame(state, {
@@ -1084,8 +1084,11 @@ function labelOf(entry) {
 function rangeOf(entry) {
     return { minimum: entry.minimum, maximum: entry.maximum, values: numericValues(entry.choices) };
 }
-/** Booleans read as yes and no; everything else prints as itself. */
-function displayValue(value) {
+/** Booleans read as yes and no; time-format choices preview the current local time. */
+function displaySettingValue(entry, value) {
+    if (entry.backend === "a1" && entry.id === "timeFormat" && (value === "20:00" || value === "8:00 PM")) {
+        return formatLocalTime(new Date(), value) ?? value;
+    }
     if (typeof value === "boolean")
         return value ? "yes" : "no";
     return String(value);

package/dist/features/resident-tab/index.d.ts

@@ -1,3 +1,5 @@
 export { AUTO_NAME_MAX_LENGTH, AUTO_NAME_TIMEOUT_MS, AUTO_NAME_TOKEN_BUDGETS, fallbackAutoName, generateAutoName, normalizeAutoName, type AutoNameCompletion, } from "./auto-name.js";
-export { RESIDENT_TAB_SHORTCUTS, residentTabShortcutRegistry, type ResidentTabAction, type ResidentTabShortcut, } from "./shortcuts.js";
+export { RESIDENT_TAB_SHORTCUTS, type ResidentTabAction, type ResidentTabShortcut, } from "./shortcut-declarations.js";
+export { projectResidentTabShortcuts, RESIDENT_TAB_GLOBAL_SHORTCUTS, type ResidentTabGlobalAction, type ResidentTabShortcutConflict, type ResidentTabShortcutProjection, type ShortcutBindings, } from "./shortcut-projection.js";
+export { readShortcutBindingsFile } from "./shortcut-bindings-file.js";
 export { deriveResidentTabStatus, type ResidentTabDerivedStatus, type ResidentTabFacts, } from "./status-deriver.js";

package/dist/features/resident-tab/index.js

@@ -1,3 +1,7 @@
 export { AUTO_NAME_MAX_LENGTH, AUTO_NAME_TIMEOUT_MS, AUTO_NAME_TOKEN_BUDGETS, fallbackAutoName, generateAutoName, normalizeAutoName, } from "./auto-name.js";
-export { RESIDENT_TAB_SHORTCUTS, residentTabShortcutRegistry, } from "./shortcuts.js";
+// Performance: the registry builder lives in `shortcuts.ts`, outside this barrel, so startup
+// presentation can read the declarations without loading the component registry.
+export { RESIDENT_TAB_SHORTCUTS, } from "./shortcut-declarations.js";
+export { projectResidentTabShortcuts, RESIDENT_TAB_GLOBAL_SHORTCUTS, } from "./shortcut-projection.js";
+export { readShortcutBindingsFile } from "./shortcut-bindings-file.js";
 export { deriveResidentTabStatus, } from "./status-deriver.js";

package/dist/features/resident-tab/shortcut-bindings-file.d.ts

@@ -0,0 +1,8 @@
+import type { ShortcutBindings } from "./shortcut-projection.js";
+/** Largest `keybindings.json` the projection reads; a larger file counts as absent. */
+export declare const MAX_SHORTCUT_BINDINGS_BYTES: number;
+/**
+ * Reads the user's `keybindings.json` as shortcut bindings, keeping `null` entries so an
+ * explicit unbind survives, and treating any unreadable or malformed file as empty.
+ */
+export declare function readShortcutBindingsFile(agentDir: string): ShortcutBindings;

package/dist/features/resident-tab/shortcut-bindings-file.js

@@ -0,0 +1,40 @@
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+/** Largest `keybindings.json` the projection reads; a larger file counts as absent. */
+export const MAX_SHORTCUT_BINDINGS_BYTES = 256 * 1024;
+/**
+ * Reads the user's `keybindings.json` as shortcut bindings, keeping `null` entries so an
+ * explicit unbind survives, and treating any unreadable or malformed file as empty.
+ */
+export function readShortcutBindingsFile(agentDir) {
+    let text;
+    try {
+        text = readFileSync(join(agentDir, "keybindings.json"), "utf8");
+    }
+    catch {
+        return {};
+    }
+    if (text.length > MAX_SHORTCUT_BINDINGS_BYTES)
+        return {};
+    let parsed;
+    try {
+        parsed = JSON.parse(text.replace(/^/u, ""));
+    }
+    catch {
+        return {};
+    }
+    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed))
+        return {};
+    const bindings = {};
+    for (const [action, value] of Object.entries(parsed)) {
+        if (action === "$schema")
+            continue;
+        if (value === null || typeof value === "string") {
+            bindings[action] = value;
+            continue;
+        }
+        if (Array.isArray(value))
+            bindings[action] = value.filter((key) => typeof key === "string");
+    }
+    return bindings;
+}

package/dist/features/resident-tab/{shortcuts.d.ts → shortcut-declarations.d.ts}

@@ -1,4 +1,3 @@
-import { ShortcutRegistry } from "../../ui/components/index.js";
 export type ResidentTabAction = "tabs.new" | "tabs.close" | "tabs.rename" | "tabs.retry" | "tabs.fresh" | "tabs.next" | "tabs.previous" | "tabs.moveRight" | "tabs.moveLeft" | `tabs.jump${1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10}`;
 export interface ResidentTabShortcut {
     readonly id: ResidentTabAction;
@@ -6,5 +5,9 @@ export interface ResidentTabShortcut {
     readonly scope: "global" | "failed-banner";
     readonly description: string;
 }
+/**
+ * The tab shortcut declarations, in the order that decides which action keeps a duplicated key.
+ * This module stays dependency-free so startup presentation and the resident projection can
+ * read it without loading the component registry.
+ */
 export declare const RESIDENT_TAB_SHORTCUTS: readonly ResidentTabShortcut[];
-export declare function residentTabShortcutRegistry(assignments?: Readonly<Partial<Record<ResidentTabAction, string | null>>>): ShortcutRegistry<ResidentTabAction>;

package/dist/features/resident-tab/{shortcuts.js → shortcut-declarations.js}

@@ -1,10 +1,14 @@
-import { GLOBAL_SCOPE, ShortcutRegistry } from "../../ui/components/index.js";
 const jumps = Array.from({ length: 10 }, (_, index) => ({
     id: `tabs.jump${index + 1}`,
     defaultKey: `alt+${(index + 1) % 10}`,
     scope: "global",
     description: `View A1 tab ${index + 1}`,
 }));
+/**
+ * The tab shortcut declarations, in the order that decides which action keeps a duplicated key.
+ * This module stays dependency-free so startup presentation and the resident projection can
+ * read it without loading the component registry.
+ */
 export const RESIDENT_TAB_SHORTCUTS = Object.freeze([
     { id: "tabs.new", defaultKey: "alt+a", scope: "global", description: "New A1 tab" },
     { id: "tabs.close", defaultKey: "alt+w", scope: "global", description: "Close A1 tab" },
@@ -17,19 +21,3 @@ export const RESIDENT_TAB_SHORTCUTS = Object.freeze([
     { id: "tabs.retry", defaultKey: "r", scope: "failed-banner", description: "Retry failed A1 tab" },
     { id: "tabs.fresh", defaultKey: "f", scope: "failed-banner", description: "Start failed A1 tab fresh" },
 ]);
-export function residentTabShortcutRegistry(assignments = {}) {
-    const registry = new ShortcutRegistry();
-    for (const shortcut of RESIDENT_TAB_SHORTCUTS) {
-        const key = assignments[shortcut.id] === undefined ? shortcut.defaultKey : assignments[shortcut.id];
-        if (!key)
-            continue;
-        const declaration = {
-            key,
-            scope: shortcut.scope === "global" ? GLOBAL_SCOPE : shortcut.scope,
-            section: "Tabs",
-            description: shortcut.description,
-        };
-        registry.declare(declaration, shortcut.id);
-    }
-    return registry;
-}

package/dist/features/resident-tab/shortcut-projection.d.ts

@@ -0,0 +1,29 @@
+import { type ResidentTabAction } from "./shortcut-declarations.js";
+/** Key assignments as `keybindings.json` and the keybinding manager express them. */
+export type ShortcutBindings = Readonly<Record<string, string | readonly string[] | null | undefined>>;
+export type ResidentTabGlobalAction = Exclude<ResidentTabAction, "tabs.retry" | "tabs.fresh">;
+export interface ResidentTabShortcutConflict {
+    readonly id: ResidentTabGlobalAction;
+    readonly key: string;
+    /** `reserved` keys belong to an A1 action; `duplicate` keys were claimed by an earlier tab action. */
+    readonly reason: "reserved" | "duplicate";
+}
+/** The effective tab shortcuts the resident shell dispatches and every presentation shows. */
+export interface ResidentTabShortcutProjection {
+    readonly assignments: Readonly<Record<ResidentTabGlobalAction, string | null>>;
+    readonly conflicts: readonly ResidentTabShortcutConflict[];
+}
+export interface ResidentTabShortcutInput {
+    /** The user's `keybindings.json`, including any `tabs.*` entries; `null` unbinds an action. */
+    readonly configured?: ShortcutBindings | undefined;
+    /** The effective A1 declarations (defaults plus customization) whose keys tab actions may not take. */
+    readonly reserved?: ShortcutBindings | undefined;
+}
+/** The declarations the projection covers, in the order that decides duplicate claims. */
+export declare const RESIDENT_TAB_GLOBAL_SHORTCUTS: import("./shortcut-declarations.js").ResidentTabShortcut[];
+/**
+ * Projects the effective A1 declarations and the user's customization into one tab shortcut
+ * assignment per action. A key an A1 action holds after customization never becomes a tab
+ * shortcut; between tab actions the earlier declaration keeps a duplicated key.
+ */
+export declare function projectResidentTabShortcuts(input?: ResidentTabShortcutInput): ResidentTabShortcutProjection;

package/dist/features/resident-tab/shortcut-projection.js

@@ -0,0 +1,64 @@
+import { RESIDENT_TAB_SHORTCUTS } from "./shortcut-declarations.js";
+/** The declarations the projection covers, in the order that decides duplicate claims. */
+export const RESIDENT_TAB_GLOBAL_SHORTCUTS = RESIDENT_TAB_SHORTCUTS.filter(shortcut => shortcut.scope === "global");
+function normalizeKey(key) {
+    return key.trim().toLowerCase();
+}
+function keysOf(value) {
+    if (value === null || value === undefined)
+        return value;
+    if (typeof value === "string")
+        return [value];
+    return value.filter((key) => typeof key === "string");
+}
+/**
+ * Projects the effective A1 declarations and the user's customization into one tab shortcut
+ * assignment per action. A key an A1 action holds after customization never becomes a tab
+ * shortcut; between tab actions the earlier declaration keeps a duplicated key.
+ */
+export function projectResidentTabShortcuts(input = {}) {
+    const configured = input.configured ?? {};
+    const claimedByOwnedActions = new Map();
+    for (const [action, value] of Object.entries(input.reserved ?? {})) {
+        if (action.startsWith("tabs."))
+            continue;
+        claimedByOwnedActions.set(action, keysOf(value) ?? []);
+    }
+    for (const [action, value] of Object.entries(configured)) {
+        if (action.startsWith("tabs.") || action === "$schema")
+            continue;
+        claimedByOwnedActions.set(action, keysOf(value) ?? []);
+    }
+    const reserved = new Set();
+    for (const keys of claimedByOwnedActions.values())
+        for (const key of keys)
+            reserved.add(normalizeKey(key));
+    const claimed = new Set();
+    const conflicts = [];
+    const assignments = {};
+    for (const shortcut of RESIDENT_TAB_GLOBAL_SHORTCUTS) {
+        const id = shortcut.id;
+        const custom = configured[id];
+        const candidates = custom === undefined
+            ? (shortcut.defaultKey === null ? [] : [shortcut.defaultKey])
+            : (keysOf(custom) ?? []);
+        let assigned = null;
+        for (const candidate of candidates.map(normalizeKey)) {
+            if (candidate.length === 0)
+                continue;
+            if (reserved.has(candidate)) {
+                conflicts.push({ id, key: candidate, reason: "reserved" });
+                continue;
+            }
+            if (claimed.has(candidate)) {
+                conflicts.push({ id, key: candidate, reason: "duplicate" });
+                continue;
+            }
+            assigned = candidate;
+            claimed.add(candidate);
+            break;
+        }
+        assignments[id] = assigned;
+    }
+    return { assignments, conflicts };
+}

package/dist/foundation/release/bootstrap.js

@@ -66,6 +66,7 @@ async function runBootstrapAttempt(options, retriesRemaining) {
                     "attach", "--endpoint", resident.endpoint, "--cwd", process.cwd(), "--clear-exit-ms", String(CLEAR_EXIT_INTERVAL_MS),
                     "--tabs-max", String((await residentLaunchSettings).tabsMax),
                     "--profile", environment[PRODUCT_IDENTITY.environment.profileHome] ?? paths.configDir,
+                    "--settings-file", resolve(agentProfileDir, "settings.json"),
                     "--data-dir", paths.dataDir, "--runtime-dir", paths.runtimeDir,
                     "--release-root", release.releaseRoot, "--node-executable", process.execPath,
                 ]),