@timurproko/a1 0.2.6-dev.717 → 0.2.6-dev.734

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

@@ -1,6 +1,6 @@
 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, isThumbRow, layoutList, moveSelection, rowKey, scrollForSelection, scrollForTrackPage, scrollbarGeometry, scrollbarPresentation, ScrollbarRails, scrollbarWheelRows, selectableIndexes, } from "../../ui/components/index.js";
-import { SETTINGS_APP_ID, SETTINGS_ROUTE } from "./settings-route.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 { SETTINGS_APP_ID } from "./settings-route.js";
 export { SETTINGS_APP_ID, SETTINGS_ROUTE } from "./settings-route.js";
 const SCOPE = SETTINGS_APP_ID;
 const SETTINGS_TOP_RULE_ROWS = 1;
@@ -265,8 +265,10 @@ export class SettingsApp {
                 const row = rows[selected];
                 if (row?.kind === "element" && row.value.structured)
                     this.#openStructured(row.value);
-                else
+                else if (row?.kind === "element" && typeof this.#shownValue(row.value) === "number")
                     this.#cycle(rows, selected, 1);
+                else
+                    this.#openMenu(rows, selected, true);
                 return { consumed: true };
             }
             case "move-up":
@@ -334,34 +336,36 @@ export class SettingsApp {
                 return { consumed: true, render: false };
             if (overRow === null) {
                 // Invariant: a press anywhere else dismisses the menu rather than acting through it.
-                this.#menu = null;
+                this.#closeMenu(menu);
                 return { consumed: true };
             }
             const value = menu.choices[overRow];
-            this.#menu = null;
+            this.#closeMenu(menu);
             if (value !== undefined)
                 this.#apply(menu.entry, value);
             return { consumed: true };
         }
-        if (this.#structured !== null) {
-            // Invariant: the structured surface is keyboard-only. It owns every pointer report so
-            // neither its selection nor the Settings list behind it can react.
-            return { consumed: true, render: false };
-        }
         if (event.kind === "wheel-up" || event.kind === "wheel-down") {
             // Invariant: the whole list pane owns wheel scrolling, including blank space beside
-            // short labels. It must not depend on finding an item under the pointer.
+            // short labels. A fixed structured dialog keeps that content interaction available.
             const screenRow = event.row - 1;
             const wheelBottom = this.#filter === null
                 ? this.#bodyTopForFrame + this.#bodyHeightForFrame
                 : this.#panelTopForFrame + SETTINGS_SEARCH_INPUT_ROWS + SETTINGS_STATUS_ROWS;
-            if (screenRow < 0 || screenRow >= wheelBottom)
+            if (screenRow >= 0 && screenRow < wheelBottom) {
+                const distance = scrollbarWheelRows(this.#scrollbarSpeed());
+                if (this.#filter !== null)
+                    this.#scrollBeforeFilter = null;
+                this.#scroll = Math.max(0, this.#scroll + (event.kind === "wheel-down" ? distance : -distance));
+                return { consumed: true };
+            }
+            if (this.#structured === null)
                 return { consumed: false };
-            const distance = scrollbarWheelRows(this.#scrollbarSpeed());
-            if (this.#filter !== null)
-                this.#scrollBeforeFilter = null;
-            this.#scroll = Math.max(0, this.#scroll + (event.kind === "wheel-down" ? distance : -distance));
-            return { consumed: true };
+        }
+        if (this.#structured !== null) {
+            // Invariant: the structured surface is keyboard-only. Non-content-wheel pointer reports
+            // cannot change its selection or act on the Settings list behind it.
+            return { consumed: true, render: false };
         }
         const rail = this.#railPointer(event);
         if (rail.owned)
@@ -440,7 +444,7 @@ export class SettingsApp {
             clearTimeout(this.#activityTimer);
         this.#activityTimer = undefined;
     }
-    #openMenu(rows, selected) {
+    #openMenu(rows, selected, selectCurrent = false) {
         const row = rows[selected];
         if (row === undefined || row.kind !== "element")
             return;
@@ -459,9 +463,30 @@ export class SettingsApp {
             return;
         }
         const current = shown === null ? 0 : Math.max(0, entry.choices.indexOf(shown));
-        // Invariant: the opening press targeted the setting value, not an option. Keep the
-        // effective value as the keyboard origin without painting it as pointer-picked.
-        this.#menu = { entry, current, anchorKey: `${entry.backend}:${entry.id}`, choices: entry.choices, index: -1 };
+        const anchorKey = `${entry.backend}:${entry.id}`;
+        // Compatibility: pointer opening already brightens the source value. Enter borrows that
+        // same value-region state for the life of its menu rather than inventing a keyboard color.
+        if (selectCurrent) {
+            this.#hoverKey = anchorKey;
+            this.#hoverRegion = "value";
+        }
+        // Invariant: pointer opening stays inactive because it targeted the setting value, while
+        // Enter explicitly starts keyboard choice navigation at the value already in effect.
+        this.#menu = {
+            entry,
+            current,
+            anchorKey,
+            choices: entry.choices,
+            keyboardOpened: selectCurrent,
+            index: selectCurrent ? current : -1,
+        };
+    }
+    #closeMenu(menu) {
+        this.#menu = null;
+        if (!menu.keyboardOpened || this.#hoverKey !== menu.anchorKey)
+            return;
+        this.#hoverKey = null;
+        this.#hoverRegion = "label";
     }
     // Rationale: a structured setting opens as its own flag list rather than a value menu.
     #openStructured(entry) {
@@ -623,9 +648,7 @@ export class SettingsApp {
             const failure = changeFailure(outcome);
             if (failure === null) {
                 this.#recordUndo({ kind: "structured", sequence, entry: open.entry, previous, forward });
-                this.#notice = outcome.status === "deferred" && outcome.application !== null
-                    ? `${labelOf(open.entry)} is stored and applies ${applicationLabel(outcome.application)}`
-                    : null;
+                this.#notice = null;
                 return;
             }
             // Concurrency: only roll back the dialog if no later press has moved the record on.
@@ -640,12 +663,12 @@ export class SettingsApp {
             return { consumed: false };
         const key = KEYS[data] ?? data;
         if (SETTINGS_SHORTCUTS.resolve(key, SCOPE) === "undo") {
-            this.#menu = null;
+            this.#closeMenu(menu);
             this.#undo();
             return { consumed: true };
         }
         if (key === "escape") {
-            this.#menu = null;
+            this.#closeMenu(menu);
             return { consumed: true };
         }
         if (key === "up" || key === "down") {
@@ -656,7 +679,7 @@ export class SettingsApp {
         }
         else if (key === "enter") {
             const value = menu.choices[menu.index];
-            this.#menu = null;
+            this.#closeMenu(menu);
             if (value !== undefined)
                 this.#apply(menu.entry, value);
         }
@@ -766,9 +789,7 @@ export class SettingsApp {
             // Concurrency: a later press may have moved on; only the last request clears itself.
             if (this.#pending.get(key) === value)
                 this.#pending.delete(key);
-            this.#notice = outcome.status === "deferred" && outcome.application !== null
-                ? `${labelOf(entry)} is stored and applies ${applicationLabel(outcome.application)}`
-                : null;
+            this.#notice = null;
         });
     }
     #shownValue(entry) {
@@ -825,9 +846,7 @@ export class SettingsApp {
             this.#notice = `Could not restore ${labelOf(record.entry)}: ${failure}`;
         }
         else {
-            this.#notice = outcome.status === "deferred" && outcome.application !== null
-                ? `${labelOf(record.entry)} is restored and applies ${applicationLabel(outcome.application)}`
-                : null;
+            this.#notice = null;
         }
         this.#undoActive = false;
         this.#drainUndo();
@@ -925,7 +944,7 @@ export class SettingsApp {
             ? CONFIGURE
             : shown === null
                 ? describeRaw(entry.rawValue)
-                : this.#pending.has(key) ? displayValue(shown) : effectiveDisplay(entry, shown);
+                : displayValue(shown);
         const range = rangeOf(entry);
         return {
             key,
@@ -943,6 +962,9 @@ export class SettingsApp {
         }
         const state = {
             choices: menu.choices.map(choice => displayValue(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)),
             index: menu.index,
         };
@@ -1085,9 +1107,6 @@ function changeFailure(outcome) {
 function labelOf(entry) {
     return entry.label ?? humanizeLabel(entry.id);
 }
-function isStepper(entry, shown = entry.value) {
-    return typeof shown === "number" && entry.editable;
-}
 /** Where a setting's number may go: what the engine states, or what it offers. */
 function rangeOf(entry) {
     return { minimum: entry.minimum, maximum: entry.maximum, values: numericValues(entry.choices) };
@@ -1098,23 +1117,6 @@ function displayValue(value) {
         return value ? "yes" : "no";
     return String(value);
 }
-function effectiveDisplay(entry, stored) {
-    const effective = entry.effectiveValue;
-    if (effective === stored)
-        return displayValue(stored);
-    const shownEffective = typeof effective === "string" || typeof effective === "number" || typeof effective === "boolean"
-        ? displayValue(effective)
-        : describeRaw(effective);
-    return `${displayValue(stored)} (effective ${shownEffective}; ${applicationLabel(entry.application)})`;
-}
-function applicationLabel(application) {
-    switch (application) {
-        case "live": return "live";
-        case "next-session": return "in the next session";
-        case "next-start": return "on the next start";
-        case "current-exit": return "when the current session exits";
-    }
-}
 function describeRaw(value) {
     if (value === null || value === undefined)
         return "unset";

package/dist/features/prompt-suggestions/diagnostics.js

@@ -1,5 +1,5 @@
 import { writeFile } from "node:fs/promises";
-import { SUGGESTION_DECISION_REASONS, SUGGESTION_DIAGNOSTIC_EVENTS, } from "../../contracts/owned-ui/index.js";
+import { SUGGESTION_ATTEMPT_TRIGGERS, SUGGESTION_DECISION_REASONS, SUGGESTION_DIAGNOSTIC_EVENTS, } from "../../contracts/owned-ui/index.js";
 /** Bounded metadata snapshots; one in-flight write and one replaceable latest snapshot. */
 export class SuggestionDiagnosticCapture {
     #records = [];
@@ -63,9 +63,12 @@ function sanitize(record) {
     const reasoning = ["ordinary", "off", "minimal", "low", "medium", "high", "xhigh", "max", "unavailable"].includes(record.reasoning)
         ? record.reasoning : "unavailable";
     const reason = record.reason !== undefined && SUGGESTION_DECISION_REASONS.includes(record.reason) ? record.reason : undefined;
+    const trigger = record.trigger !== undefined && SUGGESTION_ATTEMPT_TRIGGERS.includes(record.trigger) ? record.trigger : undefined;
+    const attempt = record.attempt === undefined ? undefined : boundedNumber(record.attempt);
     // Security: explicit projection prevents arbitrary extra fields, including raw error payloads, from escaping.
     return {
         event: record.event, ...(reason === undefined ? {} : { reason }),
+        ...(attempt === undefined ? {} : { attempt }), ...(trigger === undefined ? {} : { trigger }),
         session: boundedNumber(record.session), run: boundedNumber(record.run), response: boundedNumber(record.response),
         request: boundedNumber(record.request), provider: identifier(record.provider), model: identifier(record.model),
         reasoning, elapsedMs: boundedNumber(record.elapsedMs),

package/dist/foundation/lifecycle/index.d.ts

@@ -7,7 +7,7 @@ export { resolveCohortEndpoint, resolveProductPaths } from "./paths.js";
 export type { CohortEndpointPaths, ProductPaths } from "./paths.js";
 export { parseSessionSelection, sessionSelectionArguments } from "./session-selection.js";
 export type { SessionSelection } from "./session-selection.js";
-export { clearSessionRepositoryContext, readSessionRepositoryContext, setSessionRepositoryContext } from "./session-repository-context.js";
-export type { SessionRepositoryContext, SessionRepositoryContextOptions, SessionRepositoryIdentity } from "./session-repository-context.js";
+export { activateSessionRepositoryContext, clearSessionRepositoryContext, listSessionRepositoryWorktrees, readSessionRepositoryContext, registerSessionRepositoryRuntime, releaseSessionRepositoryRuntime, setSessionRepositoryContext, } from "./session-repository-context.js";
+export type { SessionRepositoryContext, SessionRepositoryContextOptions, SessionRepositoryIdentity, SessionWorktreeInventoryEntry, SessionWorktreeStatus, } from "./session-repository-context.js";
 export { createSupervisorStartupAttempt, publishSupervisorStartupResult, readSupervisorStartupResult, supervisorStartupFailure, supervisorStartupReady, supervisorStartupResultPath, } from "./supervisor-startup.js";
 export type { SupervisorStartupAttemptIdentity, SupervisorStartupResult } from "./supervisor-startup.js";

package/dist/foundation/lifecycle/index.js

@@ -2,5 +2,5 @@ export { assertLaunchInstance, assertLaunchInstanceOutcome, assertLaunchInstance
 export { assertDimensions, assertLaunchProfileId, assertNativeProcessIdentity, assertTransparentTerminalLaunchProfile } from "./model.js";
 export { resolveCohortEndpoint, resolveProductPaths } from "./paths.js";
 export { parseSessionSelection, sessionSelectionArguments } from "./session-selection.js";
-export { clearSessionRepositoryContext, readSessionRepositoryContext, setSessionRepositoryContext } from "./session-repository-context.js";
+export { activateSessionRepositoryContext, clearSessionRepositoryContext, listSessionRepositoryWorktrees, readSessionRepositoryContext, registerSessionRepositoryRuntime, releaseSessionRepositoryRuntime, setSessionRepositoryContext, } from "./session-repository-context.js";
 export { createSupervisorStartupAttempt, publishSupervisorStartupResult, readSupervisorStartupResult, supervisorStartupFailure, supervisorStartupReady, supervisorStartupResultPath, } from "./supervisor-startup.js";

package/dist/foundation/lifecycle/session-repository-context.d.ts

@@ -1,3 +1,4 @@
+import type { NativeProcessIdentity } from "./model.js";
 export interface SessionRepositoryIdentity {
     readonly sessionId: string;
     readonly sessionFile: string;
@@ -6,13 +7,29 @@ export interface SessionRepositoryContext {
     readonly cwd: string;
     readonly branch: string;
 }
+export type SessionWorktreeStatus = "current" | "busy" | "available" | "unverifiable";
+export interface SessionWorktreeInventoryEntry extends SessionRepositoryContext {
+    readonly status: SessionWorktreeStatus;
+}
 export interface SessionRepositoryContextOptions {
     readonly dataDir?: string;
     readonly signal?: AbortSignal;
+    readonly runtimeId?: string;
+    readonly runtimeIdentity?: NativeProcessIdentity;
+    readonly inspectProcess?: (pid: number) => Promise<NativeProcessIdentity | null>;
+    readonly lockTimeoutMs?: number;
 }
-/** Persist one explicit same-repository worktree association for a stable Pi session. */
+/** Publish the exact live runtime that may acquire a delivery worktree. */
+export declare function registerSessionRepositoryRuntime(identity: SessionRepositoryIdentity, runtimeId: string, runtimeIdentity: NativeProcessIdentity, options?: SessionRepositoryContextOptions): Promise<void>;
+/** Revalidate a durable association and acquire its live claim for this runtime. */
+export declare function activateSessionRepositoryContext(identity: SessionRepositoryIdentity, runtimeId: string, runtimeIdentity: NativeProcessIdentity, options?: SessionRepositoryContextOptions): Promise<SessionRepositoryContext | null>;
+/** Release only this exact runtime generation's cooperative editing claims. */
+export declare function releaseSessionRepositoryRuntime(runtimeId: string, runtimeIdentity: NativeProcessIdentity, options?: SessionRepositoryContextOptions): Promise<void>;
+/** Persist one explicit same-repository worktree association after atomically claiming it. */
 export declare function setSessionRepositoryContext(identity: SessionRepositoryIdentity, worktreePath: string, options?: SessionRepositoryContextOptions): Promise<SessionRepositoryContext>;
-/** Remove only the association belonging to the supplied stable session. */
+/** Remove only the association and live claim belonging to the supplied stable session/runtime. */
 export declare function clearSessionRepositoryContext(identity: SessionRepositoryIdentity, options?: SessionRepositoryContextOptions): Promise<void>;
 /** Read and revalidate a persisted association; malformed or stale state fails closed to absence. */
 export declare function readSessionRepositoryContext(identity: SessionRepositoryIdentity, options?: SessionRepositoryContextOptions): Promise<SessionRepositoryContext | null>;
+/** List same-repository worktrees without acquiring, releasing, or repairing a claim. */
+export declare function listSessionRepositoryWorktrees(identity: SessionRepositoryIdentity, options?: SessionRepositoryContextOptions): Promise<readonly SessionWorktreeInventoryEntry[]>;