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

package/dist/composition/owned-ui.js

@@ -12,7 +12,7 @@ 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 { OwnedUiSessionShell } from "../app/session-shell/session-shell.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";
 import { createOwnedRouteHost } from "./settings-route-host.js";
@@ -28,7 +28,8 @@ export async function composeOwnedUi(options = {}) {
     const sessionRuntimeId = ownedSurfaces ? process.env[PRODUCT_IDENTITY.environment.sessionRuntimeId] : undefined;
     const inspectSessionProcess = options.inspectProcess;
     let sessionRuntimeIdentity = null;
-    let activeSessionIdentity = null;
+    // Invariant: one entry per agent of this runtime; each agent holds its own claim, and the runtime's exit releases all.
+    const activeSessionIdentities = new Map();
     let sessionRuntimeRefreshTimer = null;
     let sessionRuntimeRefresh = Promise.resolve();
     let sessionRuntimeDisposed = false;
@@ -39,19 +40,41 @@ export async function composeOwnedUi(options = {}) {
         return await sessionRuntimeIdentity;
     };
     const queueSessionRuntimeRefresh = () => {
-        if (sessionRuntimeDisposed || activeSessionIdentity === null || sessionRuntimeId === undefined || inspectSessionProcess === undefined)
+        if (sessionRuntimeDisposed || activeSessionIdentities.size === 0 || sessionRuntimeId === undefined || inspectSessionProcess === undefined)
             return;
         sessionRuntimeRefresh = sessionRuntimeRefresh.then(async () => {
-            const identity = activeSessionIdentity;
-            if (sessionRuntimeDisposed || identity === null)
+            if (sessionRuntimeDisposed)
                 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 });
+            for (const [agentId, identity] of activeSessionIdentities) {
+                if (sessionRuntimeDisposed)
+                    return;
+                await registerSessionRepositoryRuntime(identity, sessionRuntimeId, owner, {
+                    inspectProcess: inspectSessionProcess,
+                    ...(agentId === undefined ? {} : { agentId }),
+                }).catch(() => undefined);
+            }
         }).catch(() => undefined);
     };
+    /** The repository context reader for one agent; undefined names the primary agent, the only one composed today. */
+    const repositoryContextReaderFor = (agentId) => async (sessionId, sessionFile, signal) => {
+        const owner = await runtimeIdentity();
+        if (owner === null || sessionRuntimeId === undefined || inspectSessionProcess === undefined)
+            return null;
+        const identity = { sessionId, sessionFile };
+        activeSessionIdentities.set(agentId, identity);
+        const { activateSessionRepositoryContext } = await import("../foundation/lifecycle/session-repository-context.js");
+        const context = await activateSessionRepositoryContext(identity, sessionRuntimeId, owner, {
+            signal,
+            inspectProcess: inspectSessionProcess,
+            ...(agentId === undefined ? {} : { agentId }),
+        });
+        armSessionRuntimeRefresh();
+        return context;
+    };
     const armSessionRuntimeRefresh = () => {
         if (sessionRuntimeRefreshTimer !== null)
             return;
@@ -87,18 +110,7 @@ export async function composeOwnedUi(options = {}) {
     try {
         backend = await host.create({
             cwd,
-            ...(ownedSurfaces ? {
-                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;
-                },
-            } : {}),
+            ...(ownedSurfaces ? { repositoryContextReader: repositoryContextReaderFor(undefined) } : {}),
             ...(options.sessionPath === undefined ? {} : { sessionPath: options.sessionPath }),
             ...(options.sessionSelection === undefined ? {} : { sessionSelection: options.sessionSelection }),
             ...(options.sessionForkPrompt === undefined ? {} : { sessionForkPrompt: options.sessionForkPrompt }),
@@ -140,7 +152,7 @@ export async function composeOwnedUi(options = {}) {
             return { rows: width => renderPiShellChangelogLines(markdown, width).map(row => nativeHyperlinkStyle(row)) };
         },
         hotkeys: async () => {
-            const presentation = shell.hotkeysPresentation();
+            const presentation = presenter.hotkeysPresentation();
             const { renderPiShellHotkeySections } = await import("../integrations/pi/components/shell-hotkey-sections.js");
             return { sections: width => renderPiShellHotkeySections(presentation, width) };
         },
@@ -194,10 +206,12 @@ export async function composeOwnedUi(options = {}) {
     // 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 clipboardServices = ownedSurfaces ? createOwnedUiClipboardServices() : null;
-    let shell;
+    let createdTerminalHost;
+    let terminalHost;
+    let presenter;
     let releaseNoteAcknowledgement = null;
     try {
-        shell = new OwnedUiSessionShell({
+        const presenterOptions = {
             presenters: createPiSessionPresenters(backend),
             engine: {
                 backend,
@@ -236,9 +250,15 @@ export async function composeOwnedUi(options = {}) {
                     ...promptHistory,
                     editor: await import("../integrations/pi/components/history-editor-loader.js").then(module => module.loadHistoryEditor()),
                 } }),
-        });
+        };
+        // Invariant: one terminal host owns the process terminal; the session presenter reaches it only through
+        // the host and paints once attached.
+        terminalHost = createdTerminalHost = new OwnedUiTerminalHost(sessionTerminalHostOptions(presenterOptions));
+        presenter = new OwnedUiSessionPresenter(terminalHost, presenterOptions);
+        terminalHost.attach(presenter);
     }
     catch (error) {
+        await createdTerminalHost?.dispose().catch(() => undefined);
         unsubscribeAccent();
         await releaseNoteClaim?.release();
         clipboardDiagnostics?.dispose();
@@ -273,14 +293,14 @@ export async function composeOwnedUi(options = {}) {
             if (exitNoticePath)
                 exitNotice = import("../app/session-shell/exit-notice.js")
                     .then(module => module.armExitNotice(backend, exitNoticePath), () => null);
-            shell.start();
+            presenter.start();
             void announceNewerRelease().catch(() => undefined);
         },
         flush: () => backend.session.flushEvents(),
-        waitUntilStopped: () => shell.waitUntilStopped(),
+        waitUntilStopped: () => presenter.waitUntilStopped(),
         dispose: async () => {
             try {
-                await shell.dispose();
+                await terminalHost.dispose();
                 // Invariant: cleared only once the terminal is restored; a failed dispose leaves it armed.
                 (await exitNotice)?.clear();
                 await releaseNoteAcknowledgement?.catch(() => undefined);

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

@@ -5,7 +5,7 @@ export type { OwnedUiExtensionAutocompleteItem, OwnedUiExtensionAutocompleteProv
 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 { OwnedUiExtensionPort, OwnedUiSessionBackend, OwnedUiSessionCatalogPort, OwnedUiSessionFactory, OwnedUiSessionIdentityPort, OwnedUiSessionPort, OwnedUiSessionRequest, OwnedUiSessionSettingsPort, OwnedUiWorkflowPort, } from "./session-backend.js";
-export type { OwnedUiDialogHost, OwnedUiInputSurface, OwnedUiSessionPresenters, OwnedUiShortcutDescription, OwnedUiTranscriptRendererPort, } from "./session-presenters.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";
 export type { OwnedUiAmbientAuthentication, OwnedUiAuthenticationProviderOption, OwnedUiAuthenticationProviderStatus, OwnedUiBashWorkflowResult, OwnedUiCacheWarmingPresentation, OwnedUiCommandResult, OwnedUiExtensionResourceSummary, OwnedUiExtensionSourceSummary, OwnedUiHiddenWorkflowCommandName, OwnedUiJsonValue, OwnedUiModelsCommandName, OwnedUiModelsContext, OwnedUiModelsRefreshResult, OwnedUiProjectTrustContext, OwnedUiProjectTrustUpdate, OwnedUiReleaseUpdate, OwnedUiResourceSummary, OwnedUiScopedModelDescriptor, OwnedUiScopedModelsContext, OwnedUiScopedModelsRefreshResult, OwnedUiSessionInfoPresentation, OwnedUiSessionProductMode, OwnedUiSessionResumeMetadata, OwnedUiSessionSettingKey, OwnedUiSessionSettingsSnapshot, OwnedUiSettingEffectHandler, OwnedUiSettingOwner, OwnedUiSettingOwnerHandlers, OwnedUiSettingsThinkingLevel, OwnedUiVisualExtensionSupport, OwnedUiWorkflowAutocompleteCommand, OwnedUiWorkflowCommandName, OwnedUiWorkflowInteractionHost, OwnedUiWorkflowInteractionRequest, OwnedUiWorkflowLoginNotification, OwnedUiWorkflowLoginStart, OwnedUiWorkflowMessage, OwnedUiWorkflowMessageKind, OwnedUiWorkflowOption, OwnedUiWorkflowOutcome, OwnedUiWorkflowPresentation, OwnedUiWorkflowRequest, OwnedUiWorkflowResult, OwnedUiWorkflowRoute, } from "./session-workflows.js";
 export { acceptsTranscriptUpdate, transcriptToolState } from "./transcript-lifecycle.js";

package/dist/contracts/owned-ui/session-presenters.d.ts

@@ -11,21 +11,48 @@ export interface OwnedUiInputSurface {
     setFocused?(focused: boolean): void;
     dispose?(): void;
 }
-/** The shell's side of a presenter: where the selector is shown and how its choices reach the session. */
-export interface OwnedUiDialogHost {
-    /** True once the shell is disposed; a presenter that awaited stops before showing anything. */
-    readonly disposed: boolean;
-    setInputSurface(surface: OwnedUiInputSurface | null): void;
-    requestRender(): void;
+/**
+ * The terminal as one session presenter sees it. A render request from a presenter that is not the host's
+ * active presenter paints nothing; the presenter keeps its state current and paints once it is attached.
+ */
+export interface OwnedUiPresenterHost {
+    requestRender(force?: boolean): void;
     viewport(): {
         readonly columns: number;
         readonly rows: number;
     };
+    /** Present only where the shell holds frames while an optional selector module loads. */
+    beginPresentationHold?(): () => void;
+}
+/** One engine session's presentation: its transcript, editor, controllers, and dialogs, and nothing terminal-wide. */
+export interface OwnedUiSessionPresenter {
+    render(width: number): readonly string[];
+    handleInput(data: string): void;
+    invalidate(): void;
+    setFocused(focused: boolean): void;
+    start(): void;
+    waitUntilStopped(): Promise<void>;
+    dispose(): Promise<void>;
+}
+/** Owns the process terminal and shows exactly one active presenter. */
+export interface OwnedUiTerminalHost<Presenter extends OwnedUiSessionPresenter = OwnedUiSessionPresenter> {
+    /** Makes the presenter active; its first frame is a full paint. */
+    attach(presenter: Presenter): void;
+    active(): Presenter | null;
+    /** No-op unless `from` is the active presenter. */
+    requestRender(from: Presenter, force?: boolean): void;
+    start(): void;
+    /** Ends the terminal: every presenter is released, the quit presentation plays, and the terminal is restored. */
+    dispose(): Promise<void>;
+}
+/** The shell's side of a presenter: where the selector is shown and how its choices reach the session. */
+export interface OwnedUiDialogHost extends OwnedUiPresenterHost {
+    /** True once the shell is disposed; a presenter that awaited stops before showing anything. */
+    readonly disposed: boolean;
+    setInputSurface(surface: OwnedUiInputSurface | null): void;
     appendWorkflowStatus(text: string): void;
     appendWorkflowResult(result: OwnedUiWorkflowResult): void;
     runWorkflow(request: OwnedUiWorkflowRequest): Promise<OwnedUiCommandResult>;
-    /** Present only where the shell holds frames while an optional selector module loads. */
-    beginPresentationHold?(): () => void;
     /** Present only where the surface can change TUI mode; false means overlays block the switch. */
     switchTuiMode?(mode: "regular" | "fullscreen"): boolean;
 }

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

@@ -8,7 +8,7 @@ export { configurationRootForProfile, resolveLaunchProfilePaths, resolvePromptHi
 export type { LaunchProfilePathOptions, LaunchProfilePaths } from "./profile-paths.js";
 export { prepareInteractiveLaunch } from "./prepare-launch.js";
 export type { PrepareInteractiveLaunchOptions, PreparedInteractiveLaunch } from "./prepare-launch.js";
-export { updateSessionRepositoryContext } from "./session-context.js";
+export { PRIMARY_SESSION_AGENT_ID, updateSessionRepositoryContext } 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/index.js

@@ -3,5 +3,5 @@ export { PI_PROFILE_RESOURCE_DIRECTORIES, initializeProductProfile } from "./ini
 export { interactiveLaunchIntent, parseSessionSelection } from "./intent.js";
 export { configurationRootForProfile, resolveLaunchProfilePaths, resolvePromptHistoryDataDir } from "./profile-paths.js";
 export { prepareInteractiveLaunch } from "./prepare-launch.js";
-export { updateSessionRepositoryContext } from "./session-context.js";
+export { PRIMARY_SESSION_AGENT_ID, updateSessionRepositoryContext } from "./session-context.js";
 export { runSelectedInteractiveRuntime, selectInteractiveRuntime } from "./runtime-selection.js";

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

@@ -1,4 +1,5 @@
 import { type NativeProcessIdentity, type SessionRepositoryIdentity, type SessionWorktreeInventoryEntry } from "../../foundation/lifecycle/index.js";
+export { PRIMARY_SESSION_AGENT_ID } from "../../foundation/lifecycle/index.js";
 export type SessionContextRequest = {
     readonly action: "link-worktree";
     readonly path: string;

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

@@ -1,4 +1,5 @@
 import { clearSessionRepositoryContext, listSessionRepositoryWorktrees, setSessionRepositoryContext, } from "../../foundation/lifecycle/index.js";
+export { PRIMARY_SESSION_AGENT_ID } 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") {

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 { activateSessionRepositoryContext, clearSessionRepositoryContext, listSessionRepositoryWorktrees, readSessionRepositoryContext, registerSessionRepositoryRuntime, releaseSessionRepositoryRuntime, setSessionRepositoryContext, } from "./session-repository-context.js";
+export { PRIMARY_SESSION_AGENT_ID, 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 { activateSessionRepositoryContext, clearSessionRepositoryContext, listSessionRepositoryWorktrees, readSessionRepositoryContext, registerSessionRepositoryRuntime, releaseSessionRepositoryRuntime, setSessionRepositoryContext, } from "./session-repository-context.js";
+export { PRIMARY_SESSION_AGENT_ID, 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,4 +1,6 @@
 import type { NativeProcessIdentity } from "./model.js";
+/** Records without an agent id were written by a single-agent release and belong to its one agent. */
+export declare const PRIMARY_SESSION_AGENT_ID = "primary";
 export interface SessionRepositoryIdentity {
     readonly sessionId: string;
     readonly sessionFile: string;
@@ -10,20 +12,24 @@ export interface SessionRepositoryContext {
 export type SessionWorktreeStatus = "current" | "busy" | "available" | "unverifiable";
 export interface SessionWorktreeInventoryEntry extends SessionRepositoryContext {
     readonly status: SessionWorktreeStatus;
+    /** Agent holding the claim within its runtime; null when the worktree is unclaimed or unverifiable. */
+    readonly agentId: string | null;
 }
 export interface SessionRepositoryContextOptions {
     readonly dataDir?: string;
     readonly signal?: AbortSignal;
     readonly runtimeId?: string;
+    /** Agent within the runtime that owns the claim; defaults to the primary agent. */
+    readonly agentId?: string;
     readonly runtimeIdentity?: NativeProcessIdentity;
     readonly inspectProcess?: (pid: number) => Promise<NativeProcessIdentity | null>;
     readonly lockTimeoutMs?: number;
 }
 /** 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. */
+/** Revalidate a durable association and acquire its live claim for this runtime's agent; sibling agents' claims stay. */
 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. */
+/** Release every agent's cooperative editing claims held by this exact runtime generation. */
 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>;