@timurproko/a1 0.2.5 → 0.2.6-dev.727

package/dist/composition/owned-ui.js

@@ -6,8 +6,7 @@ import { PromptImageSidecar } from "../features/prompt-history/image-sidecar.js"
 import { resolvePromptHistoryPath } from "../features/prompt-history/paths.js";
 import { resolvePromptHistoryDataDir } from "../features/launch/profile-paths.js";
 import { resolveProductPaths } from "../foundation/lifecycle/paths.js";
-import { readSessionRepositoryContext } from "../foundation/lifecycle/session-repository-context.js";
-import { applyConfiguredPiTheme, getAvailablePiThemes } from "../integrations/pi/components/upstream/theme/theme.js";
+import { applyConfiguredPiTheme, getAvailablePiThemes, setPiAccentColor, setPiPackageBorderProjectionEnabled } from "../integrations/pi/components/upstream/theme/theme.js";
 import { createPiEngineAdapter } from "../integrations/pi/engine/adapter.js";
 import { ClipboardDiagnosticCapture } from "../app/session-shell/clipboard-diagnostics.js";
 import { OwnedUiSessionShell } from "../app/session-shell/session-shell.js";
@@ -16,12 +15,46 @@ import { createPiTerminalBridge } from "../integrations/pi/tui-runtime/presentat
 import { createOwnedRouteHost } from "./settings-route-host.js";
 import { renderPiShellChangelogLines } from "../integrations/pi/components/shell-presenters-info.js";
 import { nativeHyperlinkStyle } from "../ui/components/spans.js";
+const SESSION_RUNTIME_REFRESH_MS = 30_000;
 export async function composeOwnedUiApplication(options = {}) {
     return (await composeOwnedUi(options)).application;
 }
 export async function composeOwnedUi(options = {}) {
     const cwd = options.cwd ?? process.cwd();
     const ownedSurfaces = options.ownedSurfaces !== "off";
+    const sessionRuntimeId = ownedSurfaces ? process.env[PRODUCT_IDENTITY.environment.sessionRuntimeId] : undefined;
+    const inspectSessionProcess = options.inspectProcess;
+    let sessionRuntimeIdentity = null;
+    let activeSessionIdentity = null;
+    let sessionRuntimeRefreshTimer = null;
+    let sessionRuntimeRefresh = Promise.resolve();
+    let sessionRuntimeDisposed = false;
+    const runtimeIdentity = async () => {
+        if (sessionRuntimeId === undefined || inspectSessionProcess === undefined)
+            return null;
+        sessionRuntimeIdentity ??= inspectSessionProcess(process.pid).catch(() => null);
+        return await sessionRuntimeIdentity;
+    };
+    const queueSessionRuntimeRefresh = () => {
+        if (sessionRuntimeDisposed || activeSessionIdentity === null || sessionRuntimeId === undefined || inspectSessionProcess === undefined)
+            return;
+        sessionRuntimeRefresh = sessionRuntimeRefresh.then(async () => {
+            const identity = activeSessionIdentity;
+            if (sessionRuntimeDisposed || identity === null)
+                return;
+            const owner = await runtimeIdentity();
+            if (owner === null)
+                return;
+            const { registerSessionRepositoryRuntime } = await import("../foundation/lifecycle/session-repository-context.js");
+            await registerSessionRepositoryRuntime(identity, sessionRuntimeId, owner, { inspectProcess: inspectSessionProcess });
+        }).catch(() => undefined);
+    };
+    const armSessionRuntimeRefresh = () => {
+        if (sessionRuntimeRefreshTimer !== null)
+            return;
+        sessionRuntimeRefreshTimer = setInterval(queueSessionRuntimeRefresh, SESSION_RUNTIME_REFRESH_MS);
+        sessionRuntimeRefreshTimer.unref();
+    };
     const adapter = options.createPiAdapter
         ? await options.createPiAdapter()
         : await createPiEngineAdapter({
@@ -30,7 +63,16 @@ export async function composeOwnedUi(options = {}) {
             settingsProductMode: ownedSurfaces ? "bare" : "comparison",
             announceStartupChangelog: !ownedSurfaces,
             ...(ownedSurfaces ? {
-                repositoryContextReader: async (sessionId, sessionFile, signal) => await readSessionRepositoryContext({ sessionId, sessionFile }, { signal }),
+                repositoryContextReader: async (sessionId, sessionFile, signal) => {
+                    const owner = await runtimeIdentity();
+                    if (owner === null || sessionRuntimeId === undefined || inspectSessionProcess === undefined)
+                        return null;
+                    activeSessionIdentity = { sessionId, sessionFile };
+                    const { activateSessionRepositoryContext } = await import("../foundation/lifecycle/session-repository-context.js");
+                    const context = await activateSessionRepositoryContext(activeSessionIdentity, sessionRuntimeId, owner, { signal, inspectProcess: inspectSessionProcess });
+                    armSessionRuntimeRefresh();
+                    return context;
+                },
             } : {}),
             ...(options.sessionPath === undefined ? {} : { sessionPath: options.sessionPath }),
             ...(options.sessionSelection === undefined ? {} : { sessionSelection: options.sessionSelection }),
@@ -67,10 +109,15 @@ export async function composeOwnedUi(options = {}) {
         : await import("../features/owned-ui/release-note-state.js").then(module => module.claimReleaseNote({
             configDir: productPaths.configDir, profileId: options.profileId, version: currentReleaseNote.version,
         }));
-    // Compatibility: bare A1 intentionally ships one visual target while its UI is being completed:
-    // dark, regardless of terminal detection or a previously stored Pi theme. The
-    // comparison profile keeps Pi's configured theme behavior and settings surface.
+    // Compatibility: bare A1 intentionally ships one base visual target while its UI is being completed:
+    // dark, regardless of terminal detection or a previously stored Pi theme. Its owned accent projects
+    // over that base; comparison keeps Pi's configured theme and unmodified semantic accent.
+    setPiPackageBorderProjectionEnabled(ownedSurfaces);
+    setPiAccentColor(settings !== null && ownedSurfaces ? settings.value("accentColor") : "purple");
     applyConfiguredPiTheme(ownedSurfaces ? "dark" : adapter.configuredTheme());
+    const unsubscribeAccent = settings === null || !ownedSurfaces
+        ? () => { }
+        : settings.onChange(current => setPiAccentColor(current.value("accentColor")));
     // Rationale: Routes open only after shell construction.
     const references = {
         changelog: async (input) => {
@@ -167,6 +214,7 @@ export async function composeOwnedUi(options = {}) {
         });
     }
     catch (error) {
+        unsubscribeAccent();
         await releaseNoteClaim?.release();
         clipboardDiagnostics?.dispose();
         suggestionDiagnostics?.dispose();
@@ -211,6 +259,18 @@ export async function composeOwnedUi(options = {}) {
                 await releaseNoteAcknowledgement?.catch(() => undefined);
             }
             finally {
+                unsubscribeAccent();
+                sessionRuntimeDisposed = true;
+                if (sessionRuntimeRefreshTimer !== null)
+                    clearInterval(sessionRuntimeRefreshTimer);
+                sessionRuntimeRefreshTimer = null;
+                await sessionRuntimeRefresh;
+                const owner = await runtimeIdentity();
+                if (sessionRuntimeId !== undefined && owner !== null) {
+                    await import("../foundation/lifecycle/session-repository-context.js")
+                        .then(module => module.releaseSessionRepositoryRuntime(sessionRuntimeId, owner))
+                        .catch(() => undefined);
+                }
                 await releaseNoteClaim?.release();
                 suggestionDiagnostics?.dispose();
                 clipboardDiagnostics?.dispose();

package/dist/composition/settings-route-host.js

@@ -1,6 +1,6 @@
-import { CHANGELOG_ROUTE, CHANGELOG_TITLE, HOTKEYS_ROUTE, HOTKEYS_TITLE, } from "../features/owned-ui/reference-routes.js";
+import { CHANGELOG_ROUTE, HOTKEYS_ROUTE, HOTKEYS_TITLE } from "../features/owned-ui/reference-routes.js";
 import { SETTINGS_APP_ID, SETTINGS_ROUTE } from "../features/owned-ui/settings-route.js";
-import { piTheme } from "../integrations/pi/components/upstream/theme/theme.js";
+import { piTheme, renderPiAccentPreview } from "../integrations/pi/components/upstream/theme/theme.js";
 import { faint } from "../ui/components/text.js";
 /** Declares settings and lazy document routes. */
 export function createOwnedRouteHost(settings, references) {
@@ -15,7 +15,7 @@ export function createOwnedRouteHost(settings, references) {
             }
             const changelog = route === CHANGELOG_ROUTE;
             const session = route === "session";
-            const title = session ? "Session Info" : changelog ? CHANGELOG_TITLE : HOTKEYS_TITLE;
+            const title = session ? "Session Info" : changelog ? input ? "What's New" : "Changelog" : HOTKEYS_TITLE;
             const document = session ? references.session() : changelog ? references.changelog(input) : references.hotkeys();
             return deferredSurface(route, title, () => loadReferenceSurface(settings, route, route, title, document));
         },
@@ -130,6 +130,7 @@ function pinnedTheme() {
         fg: (token, text) => piTheme().fg(token, text),
         bold: (text) => piTheme().bold(text),
         plain: (text) => text,
+        accentPreview: (color, text) => renderPiAccentPreview(color, text),
         disabled: (text) => faint(piTheme().fg("dim", text)),
         highlight: (text) => piTheme().bg("selectedBg", text),
         panel: (text) => `\u001b[48;2;55;55;55m${text}\u001b[49m`,

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

@@ -1,3 +1,5 @@
+/** Stable stored choices for bare A1's semantic UI accent. */
+export type UiAccentColor = "purple" | "blue" | "cyan" | "green" | "orange" | "pink";
 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";
@@ -7,8 +9,8 @@ export { DEFAULT_PROMPT_IMAGE_LIMIT, ImageAttachmentError, MAX_CLIPBOARD_TEXT_BY
 export { CONTEXTUAL_PROMPT_SUGGESTION_INSTRUCTION, normalizePromptSuggestionCandidate } from "./prompt-suggestions.js";
 export { canonicalPromptChipMatches, protectPromptChipWrapping, replaceCanonicalPromptChips } from "./prompt-chips.js";
 export type { PromptChipTextMatch, PromptChipWrapProtection } from "./prompt-chips.js";
-export { SUGGESTION_DECISION_REASONS, SUGGESTION_DIAGNOSTIC_EVENTS } from "./suggestion-diagnostics.js";
-export type { SuggestionDecision, SuggestionDecisionReason, SuggestionDiagnosticEvent, SuggestionDiagnosticObserver, SuggestionDiagnosticRecord, } from "./suggestion-diagnostics.js";
+export { SUGGESTION_ATTEMPT_TRIGGERS, SUGGESTION_DECISION_REASONS, SUGGESTION_DIAGNOSTIC_EVENTS } from "./suggestion-diagnostics.js";
+export type { SuggestionAttemptTrigger, SuggestionDecision, SuggestionDecisionReason, SuggestionDiagnosticEvent, SuggestionDiagnosticObserver, SuggestionDiagnosticRecord, } from "./suggestion-diagnostics.js";
 export { PROMPT_HISTORY_EDITOR_REPLACEMENT, PROMPT_HISTORY_MAX_ENTRY_BYTES, PROMPT_HISTORY_MAX_PENDING, PROMPT_HISTORY_MAX_TEXT_BYTES, assertPromptHistorySubmission, } from "./prompt-history.js";
 export type { PromptHistoryFailure, PromptHistoryImageSidecarAttachment, PromptHistoryImageSidecarPort, PromptHistoryImageSidecarRecord, PromptHistoryKind, PromptHistoryPort, PromptHistoryResult, PromptHistorySnapshot, PromptHistorySubmission, } from "./prompt-history.js";
 export { assertOwnedUiCommand, assertOwnedUiCustomization, assertOwnedUiDiagnostics, assertOwnedUiEditorState, assertOwnedUiEvent, assertOwnedUiPromptSuggestionIdentity, assertOwnedUiPromptSuggestionRequest, assertOwnedUiPromptSuggestionResult, assertOwnedUiPromptSuggestionState, assertOwnedUiSessionViewModel, assertOwnedUiSnapshot, assertOwnedUiStatusView, assertOwnedUiTerminalSurface, assertOwnedUiTranscriptBlock, } from "./validation.js";

package/dist/contracts/owned-ui/index.js

@@ -4,6 +4,6 @@ export { acceptsTranscriptUpdate, transcriptToolState } from "./transcript-lifec
 export { DEFAULT_PROMPT_IMAGE_LIMIT, ImageAttachmentError, MAX_CLIPBOARD_TEXT_BYTES, MAX_IMAGE_DATA_BYTES, MAX_PROMPT_IMAGES, assertImageEncodedSize, assertPromptImages, } from "./image-attachments.js";
 export { CONTEXTUAL_PROMPT_SUGGESTION_INSTRUCTION, normalizePromptSuggestionCandidate } from "./prompt-suggestions.js";
 export { canonicalPromptChipMatches, protectPromptChipWrapping, replaceCanonicalPromptChips } from "./prompt-chips.js";
-export { SUGGESTION_DECISION_REASONS, SUGGESTION_DIAGNOSTIC_EVENTS } from "./suggestion-diagnostics.js";
+export { SUGGESTION_ATTEMPT_TRIGGERS, SUGGESTION_DECISION_REASONS, SUGGESTION_DIAGNOSTIC_EVENTS } from "./suggestion-diagnostics.js";
 export { PROMPT_HISTORY_EDITOR_REPLACEMENT, PROMPT_HISTORY_MAX_ENTRY_BYTES, PROMPT_HISTORY_MAX_PENDING, PROMPT_HISTORY_MAX_TEXT_BYTES, assertPromptHistorySubmission, } from "./prompt-history.js";
 export { assertOwnedUiCommand, assertOwnedUiCustomization, assertOwnedUiDiagnostics, assertOwnedUiEditorState, assertOwnedUiEvent, assertOwnedUiPromptSuggestionIdentity, assertOwnedUiPromptSuggestionRequest, assertOwnedUiPromptSuggestionResult, assertOwnedUiPromptSuggestionState, assertOwnedUiSessionViewModel, assertOwnedUiSnapshot, assertOwnedUiStatusView, assertOwnedUiTerminalSurface, assertOwnedUiTranscriptBlock, } from "./validation.js";

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

@@ -336,6 +336,10 @@ export type OwnedUiEvent = {
     readonly model: OwnedUiModelInfo | null;
     readonly assistantMessageCount: number;
     readonly successful: boolean;
+    readonly stopReason: string | null;
+    readonly toolContinuation: boolean;
+    /** Pi 1.1 distinguishes user cancellation from an ordinary or failed settlement. */
+    readonly aborted: boolean;
 } | {
     readonly type: "editor-state";
     readonly sessionId: OwnedUiSessionId;

package/dist/contracts/owned-ui/suggestion-diagnostics.d.ts

@@ -2,12 +2,16 @@ import type { OwnedUiPromptSuggestionReasoning } from "./model.js";
 export declare const SUGGESTION_DECISION_REASONS: readonly ["disabled", "disposed", "early-conversation", "no-model", "failed-response", "incomplete-response", "tool-continuation", "replacement-input", "modal", "draft", "not-ready", "not-focused", "autocomplete", "prompt-mode", "presentation-unavailable", "ineligible", "stale-identity"];
 export type SuggestionDecisionReason = typeof SUGGESTION_DECISION_REASONS[number];
 export type SuggestionDecision = SuggestionDecisionReason | null;
-export declare const SUGGESTION_DIAGNOSTIC_EVENTS: readonly ["skipped", "started", "displayed", "empty", "rejected", "provider-failure", "unavailable", "timeout", "cancelled", "stale-result", "presentation-blocked", "late-result-discarded"];
+export declare const SUGGESTION_DIAGNOSTIC_EVENTS: readonly ["skipped", "started", "displayed", "empty", "rejected", "provider-failure", "unavailable", "timeout", "cancelled", "stale-result", "presentation-blocked", "presentation-deferred", "retry-exhausted", "late-result-discarded"];
 export type SuggestionDiagnosticEvent = typeof SUGGESTION_DIAGNOSTIC_EVENTS[number];
+export declare const SUGGESTION_ATTEMPT_TRIGGERS: readonly ["prefetch", "settlement", "retry"];
+export type SuggestionAttemptTrigger = typeof SUGGESTION_ATTEMPT_TRIGGERS[number];
 /** Metadata only: never carry a session path, prompt, candidate, or raw error. */
 export interface SuggestionDiagnosticRecord {
     readonly event: SuggestionDiagnosticEvent;
     readonly reason?: SuggestionDecisionReason;
+    readonly attempt?: number;
+    readonly trigger?: SuggestionAttemptTrigger;
     readonly session: number;
     readonly run: number;
     readonly response: number;

package/dist/contracts/owned-ui/suggestion-diagnostics.js

@@ -5,5 +5,7 @@ export const SUGGESTION_DECISION_REASONS = [
 ];
 export const SUGGESTION_DIAGNOSTIC_EVENTS = [
     "skipped", "started", "displayed", "empty", "rejected", "provider-failure", "unavailable",
-    "timeout", "cancelled", "stale-result", "presentation-blocked", "late-result-discarded",
+    "timeout", "cancelled", "stale-result", "presentation-blocked", "presentation-deferred",
+    "retry-exhausted", "late-result-discarded",
 ];
+export const SUGGESTION_ATTEMPT_TRIGGERS = ["prefetch", "settlement", "retry"];

package/dist/contracts/owned-ui/validation.js

@@ -133,6 +133,13 @@ export function assertOwnedUiEvent(event) {
                 assertOwnedUiModelInfo(event.model);
             if (typeof event.successful !== "boolean")
                 throw new TypeError("owned-UI settlement success state is invalid");
+            if (event.stopReason === undefined)
+                throw new TypeError("owned-UI settlement stop reason is missing");
+            assertOptionalText(event.stopReason, "owned-UI settlement stop reason", MAX_LABEL_LENGTH);
+            if (typeof event.toolContinuation !== "boolean")
+                throw new TypeError("owned-UI settlement tool-continuation state is invalid");
+            if (typeof event.aborted !== "boolean")
+                throw new TypeError("owned-UI settlement aborted state is invalid");
             return;
         case "editor-state":
             assertOwnedUiEditorState(event.editor);

package/dist/features/launch/index.d.ts

@@ -9,6 +9,6 @@ export type { LaunchProfilePathOptions, LaunchProfilePaths } from "./profile-pat
 export { prepareInteractiveLaunch } from "./prepare-launch.js";
 export type { PrepareInteractiveLaunchOptions, PreparedInteractiveLaunch } from "./prepare-launch.js";
 export { updateSessionRepositoryContext } from "./session-context.js";
-export type { SessionContextRequest } from "./session-context.js";
+export type { SessionContextOutcome, SessionContextRequest, SessionContextRuntime } from "./session-context.js";
 export { runSelectedInteractiveRuntime, selectInteractiveRuntime } from "./runtime-selection.js";
 export type { InteractiveRuntimeRunners, InteractiveRuntimeSelection, OwnedUiProfileId } from "./runtime-selection.js";

package/dist/features/launch/session-context.d.ts

@@ -1,8 +1,23 @@
-import { type SessionRepositoryIdentity } from "../../foundation/lifecycle/index.js";
+import { type NativeProcessIdentity, type SessionRepositoryIdentity, type SessionWorktreeInventoryEntry } from "../../foundation/lifecycle/index.js";
 export type SessionContextRequest = {
     readonly action: "link-worktree";
     readonly path: string;
 } | {
     readonly action: "unlink-worktree";
+} | {
+    readonly action: "worktrees";
+};
+export type SessionContextOutcome = {
+    readonly kind: "linked";
+    readonly cwd: string;
+} | {
+    readonly kind: "unlinked";
+} | {
+    readonly kind: "worktrees";
+    readonly entries: readonly SessionWorktreeInventoryEntry[];
 };
-export declare function updateSessionRepositoryContext(identity: SessionRepositoryIdentity, request: SessionContextRequest): Promise<string | null>;
+export interface SessionContextRuntime {
+    readonly runtimeId: string;
+    readonly inspectProcess: (pid: number) => Promise<NativeProcessIdentity | null>;
+}
+export declare function updateSessionRepositoryContext(identity: SessionRepositoryIdentity, request: SessionContextRequest, runtime: SessionContextRuntime): Promise<SessionContextOutcome>;

package/dist/features/launch/session-context.js

@@ -1,8 +1,12 @@
-import { clearSessionRepositoryContext, setSessionRepositoryContext, } from "../../foundation/lifecycle/index.js";
-export async function updateSessionRepositoryContext(identity, request) {
+import { clearSessionRepositoryContext, listSessionRepositoryWorktrees, setSessionRepositoryContext, } from "../../foundation/lifecycle/index.js";
+export async function updateSessionRepositoryContext(identity, request, runtime) {
+    const options = { runtimeId: runtime.runtimeId, inspectProcess: runtime.inspectProcess };
     if (request.action === "unlink-worktree") {
-        await clearSessionRepositoryContext(identity);
-        return null;
+        await clearSessionRepositoryContext(identity, options);
+        return { kind: "unlinked" };
     }
-    return (await setSessionRepositoryContext(identity, request.path)).cwd;
+    if (request.action === "worktrees") {
+        return { kind: "worktrees", entries: await listSessionRepositoryWorktrees(identity, options) };
+    }
+    return { kind: "linked", cwd: (await setSessionRepositoryContext(identity, request.path, options)).cwd };
 }

package/dist/features/owned-ui/reference-routes.d.ts

@@ -1,6 +1,6 @@
 export declare const CHANGELOG_APP_ID = "changelog";
 export declare const CHANGELOG_ROUTE = "changelog";
-export declare const CHANGELOG_TITLE = "What's New";
+export declare const CHANGELOG_TITLE = "Changelog";
 export declare const HOTKEYS_APP_ID = "hotkeys";
 export declare const HOTKEYS_ROUTE = "hotkeys";
 export declare const HOTKEYS_TITLE = "Keyboard Shortcuts";

package/dist/features/owned-ui/reference-routes.js

@@ -1,6 +1,6 @@
 export const CHANGELOG_APP_ID = "changelog";
 export const CHANGELOG_ROUTE = "changelog";
-export const CHANGELOG_TITLE = "What's New";
+export const CHANGELOG_TITLE = "Changelog";
 export const HOTKEYS_APP_ID = "hotkeys";
 export const HOTKEYS_ROUTE = "hotkeys";
 export const HOTKEYS_TITLE = "Keyboard Shortcuts";

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

@@ -343,25 +343,27 @@ export class SettingsApp {
                 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)
@@ -623,9 +625,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.
@@ -766,9 +766,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 +823,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 +921,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 +939,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,
         };
@@ -1098,23 +1097,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[]>;