@timurproko/a1 0.1.8-dev.536 → 0.1.8-dev.546

package/bin/cli.js

@@ -54,6 +54,10 @@ process.exitCode = await dispatchCli(process.argv.slice(2), {
     const { createPiPackagesPort } = await import("../dist/integrations/pi/engine/package-integration.js");
     return await runPackageCommand(request, { createPort: createPiPackagesPort });
   },
+  sessionContext: async request => {
+    const { runSessionContextCommand } = await import("../dist/cli/session-context.js");
+    return await runSessionContextCommand(request);
+  },
 }, {
   stdout: message => process.stdout.write(message),
   stderr: message => process.stderr.write(message),

package/bin/update-recovery.js

@@ -5,7 +5,7 @@
 import { spawn } from "node:child_process";
 import { createHash, randomUUID } from "node:crypto";
 import { chmod, lstat, mkdir, open, readFile, realpath, rename, rm, writeFile } from "node:fs/promises";
-import { dirname, isAbsolute, relative, resolve, sep } from "node:path";
+import { basename, dirname, isAbsolute, relative, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const SCHEMA = "a1-update-recovery-v1";
@@ -200,9 +200,15 @@ async function readCapsule(path) {
   const packageRoot = await realpath(value.packageRoot).catch(() => resolve(value.packageRoot));
   const expectedPackage = resolve(globalRoot, ...value.packageName.split("/"));
   if (!samePath(packageRoot, expectedPackage) || !containedBy(globalRoot, packageRoot)) throw new Error("A1 update recovery package root escapes npm global root");
-  const expectedNpmArguments = ["install", "--global", "--loglevel=error", "--no-fund", "--no-audit", `${value.packageName}@${value.targetVersion}`];
-  if (JSON.stringify(value.npmArguments) !== JSON.stringify(expectedNpmArguments)) throw new Error("A1 update recovery npm arguments are invalid");
+  const prefix = npmPrefixForGlobalRoot(globalRoot);
+  const expectedNpmArguments = ["install", "--global", "--prefix", prefix, "--loglevel=error", "--no-fund", "--no-audit", `${value.packageName}@${value.targetVersion}`];
+  const legacyNpmArguments = ["install", "--global", "--loglevel=error", "--no-fund", "--no-audit", `${value.packageName}@${value.targetVersion}`];
+  if (![expectedNpmArguments, legacyNpmArguments].some(arguments_ => sameArguments(value.npmArguments, arguments_))) {
+    throw new Error("A1 update recovery npm arguments are invalid");
+  }
   const launcherRoot = resolve(value.launcherRoot);
+  const expectedLauncherRoot = process.platform === "win32" ? prefix : resolve(prefix, "bin");
+  if (!samePath(launcherRoot, expectedLauncherRoot)) throw new Error("A1 update recovery launcher root is invalid");
   const expectedLaunchers = process.platform === "win32"
     ? [resolve(launcherRoot, "a1"), resolve(launcherRoot, "a1.cmd"), resolve(launcherRoot, "a1.ps1")]
     : [resolve(launcherRoot, "a1")];
@@ -306,6 +312,22 @@ async function writeJson(path, value) {
   await rename(temporary, path);
 }
 
+/** @param {string} globalRoot */
+function npmPrefixForGlobalRoot(globalRoot) {
+  const root = resolve(globalRoot);
+  const nodeModules = process.platform === "win32" ? basename(root).toLowerCase() === "node_modules" : basename(root) === "node_modules";
+  if (!nodeModules) throw new Error("A1 update recovery npm global root layout is invalid");
+  if (process.platform === "win32") return dirname(root);
+  const libraryRoot = dirname(root);
+  if (basename(libraryRoot) !== "lib") throw new Error("A1 update recovery npm global root layout is invalid");
+  return dirname(libraryRoot);
+}
+
+/** @param {string[]} left @param {string[]} right */
+function sameArguments(left, right) {
+  return left.length === right.length && left.every((value, index) => value === right[index]);
+}
+
 /**
  * @param {string} left
  * @param {string} right

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

@@ -430,7 +430,7 @@ export class OwnedUiSessionShellRoot {
                 // fitting alignment, and live Working remain transient presentation chrome.
                 selectableDocumentRowCount,
                 ...(document.liveTailStartRow === undefined ? {} : { liveTailStartRow: document.liveTailStartRow }),
-                bottomAlignedTailRowCount: statusRows.length,
+                bottomAlignedTailRowCount: steeringRows.length + statusRows.length,
                 dockRows,
                 promptAnchors: document.promptAnchors,
                 width,
@@ -547,10 +547,14 @@ export class OwnedUiSessionShellRoot {
         };
     }
     #renderDockNotice(width) {
-        if (this.#dockNotice === undefined)
+        const notice = this.#dockNotice;
+        if (notice === undefined)
             return [];
-        // Compatibility: Pi pads its status text by one cell regardless of the output pad setting.
-        return ["", ...renderPiShellStatusText(this.#dockNotice, width, PINNED_PI_LAYOUT.outputPad)];
+        if (notice.kind === "status") {
+            // Compatibility: Pi pads its status text by one cell regardless of the output pad setting.
+            return ["", ...renderPiShellStatusText(notice.message, width, PINNED_PI_LAYOUT.outputPad)];
+        }
+        return renderPiShellCommandMessage({ kind: notice.kind, message: notice.message }, width, this.#outputPad);
     }
     #dismissDockNotice() {
         if (this.#dockNotice === undefined)
@@ -763,7 +767,7 @@ export class OwnedUiSessionShellRoot {
         // reader's eye already is, instead of a transcript row that opens an empty session at the
         // top-left or sinks into a long feed. The pinned route keeps Pi's chat placement.
         if (this.#customViewport) {
-            this.#dockNotice = message;
+            this.#dockNotice = { kind: "status", message };
             this.#invalidateChrome();
             return;
         }
@@ -788,6 +792,11 @@ export class OwnedUiSessionShellRoot {
             this.appendWorkflowStatus(message.message);
             return;
         }
+        if (this.#customViewport && (message.kind === "warning" || message.kind === "error")) {
+            this.#dockNotice = { kind: message.kind, message: message.message };
+            this.#invalidateChrome();
+            return;
+        }
         this.#lastWorkflowStatusId = undefined;
         const presentation = { kind: message.kind, message: message.message };
         this.#appendAnchoredWorkflowComponent(width => renderPiShellCommandMessage(presentation, width, this.#outputPad));
@@ -1148,6 +1157,7 @@ export class OwnedUiSessionShellRoot {
             status: {
                 ...view.status,
                 footer: {
+                    ...footer,
                     branch: footer?.branch ?? null,
                     sessionName: footer?.sessionName ?? null,
                     availableProviderCount: footer?.availableProviderCount ?? 1,

package/dist/cli/dispatch.d.ts

@@ -1,6 +1,7 @@
 import { type InteractiveLaunchIntent, type LaunchProfileId, type SessionSelection } from "../features/launch/index.js";
 import type { CliCapabilities } from "./capabilities.js";
 import type { PackageCommandRequest } from "./packages.js";
+import type { SessionContextRequest } from "./session-context.js";
 import { type PackageCliVerb, type PackageSyntaxDiagnostic } from "./package-messages.js";
 export type UpdateChannel = "stable" | "next";
 export interface CliHandlers {
@@ -8,6 +9,7 @@ export interface CliHandlers {
     readonly version: () => Promise<number>;
     readonly update: (channel: UpdateChannel, target?: string) => Promise<number>;
     readonly packages: (request: PackageCommandRequest) => Promise<number>;
+    readonly sessionContext: (request: SessionContextRequest) => Promise<number>;
 }
 export interface CliOutput {
     readonly stdout: (message: string) => void;
@@ -39,6 +41,9 @@ export type CliCommand = {
 } | {
     readonly kind: "packages";
     readonly request: PackageCommandRequest;
+} | {
+    readonly kind: "session-context";
+    readonly request: SessionContextRequest;
 } | {
     readonly kind: "error";
     readonly message: string;

package/dist/cli/dispatch.js

@@ -14,6 +14,8 @@ export function cliUsage(capabilities) {
         "update",
         "update --develop [preview-or-version]",
         "update --models",
+        "session link-worktree <path>",
+        "session unlink-worktree",
         "pi install <source>",
         "pi remove <source>",
         "pi uninstall <source>",
@@ -41,6 +43,10 @@ export function cliHelp(capabilities) {
         `  ${command} update --develop [preview-or-version]`,
         `  ${command} update --models`,
         "",
+        "Session context:",
+        `  ${command} session link-worktree <path>`,
+        `  ${command} session unlink-worktree`,
+        "",
         "Pi-compatible packages:",
         `  ${command} pi install <source>`,
         `  ${command} pi remove <source>`,
@@ -79,6 +85,8 @@ export async function dispatchCli(arguments_, handlers, output, capabilities) {
         return await handlers.version();
     if (command.kind === "packages")
         return await handlers.packages(command.request);
+    if (command.kind === "session-context")
+        return await handlers.sessionContext(command.request);
     return await handlers.update(command.channel, command.target);
 }
 export function parseCliCommand(arguments_, capabilities) {
@@ -105,12 +113,30 @@ export function parseCliCommand(arguments_, capabilities) {
     }
     if (command === "update")
         return parseUpdate(rest);
+    if (command === "session")
+        return parseSessionContext(rest);
     if (command?.startsWith("update:"))
         return { kind: "noop" };
     // Rationale: unsupported and reserved command spaces are deliberately quiet. Help is
     // explicit, and a typo must never start an interactive or maintenance path.
     return { kind: "noop" };
 }
+function parseSessionContext(rest) {
+    const [action, value, extra] = rest;
+    if (action === "link-worktree") {
+        if (value === undefined)
+            return { kind: "error", message: PRODUCT_TEXT.diagnostic("session link-worktree requires one path.") };
+        if (extra !== undefined)
+            return { kind: "error", message: PRODUCT_TEXT.diagnostic("session link-worktree accepts one path.") };
+        return { kind: "session-context", request: { action, path: value } };
+    }
+    if (action === "unlink-worktree") {
+        if (value !== undefined)
+            return { kind: "error", message: PRODUCT_TEXT.diagnostic("session unlink-worktree does not accept arguments.") };
+        return { kind: "session-context", request: { action } };
+    }
+    return { kind: "error", message: PRODUCT_TEXT.diagnostic("session accepts link-worktree <path> or unlink-worktree.") };
+}
 /**
  * Stable update is the empty form. `--develop` selects the moving development
  * head or one immutable numbered preview, while model refresh remains a separate

package/dist/cli/session-context.d.ts

@@ -0,0 +1,9 @@
+import { type SessionContextRequest } from "../features/launch/index.js";
+export type { SessionContextRequest } from "../features/launch/index.js";
+export interface SessionContextCommandOptions {
+    readonly environment?: NodeJS.ProcessEnv;
+    readonly stdout?: (message: string) => void;
+    readonly stderr?: (message: string) => void;
+}
+/** Apply repository presentation context only when invoked by an active Pi session shell tool. */
+export declare function runSessionContextCommand(request: SessionContextRequest, options?: SessionContextCommandOptions): Promise<number>;

package/dist/cli/session-context.js

@@ -0,0 +1,29 @@
+import { updateSessionRepositoryContext, } from "../features/launch/index.js";
+import { PRODUCT_TEXT } from "../product-identity.js";
+/** Apply repository presentation context only when invoked by an active Pi session shell tool. */
+export async function runSessionContextCommand(request, options = {}) {
+    const environment = options.environment ?? process.env;
+    const stdout = options.stdout ?? (message => process.stdout.write(message));
+    const stderr = options.stderr ?? (message => process.stderr.write(message));
+    const identity = readIdentity(environment);
+    if (identity === null) {
+        stderr(`${PRODUCT_TEXT.diagnostic("session context requires an active A1 shell-tool session.")}\n`);
+        return 2;
+    }
+    try {
+        const cwd = await updateSessionRepositoryContext(identity, request);
+        stdout(cwd === null ? "Session worktree context cleared.\n" : `Session worktree context linked: ${cwd}\n`);
+        return 0;
+    }
+    catch (error) {
+        stderr(`${PRODUCT_TEXT.diagnostic(`could not update session context: ${error instanceof Error ? error.message : String(error)}`)}\n`);
+        return 1;
+    }
+}
+function readIdentity(environment) {
+    const sessionId = environment.PI_SESSION_ID;
+    const sessionFile = environment.PI_SESSION_FILE;
+    if (!sessionId || !sessionFile)
+        return null;
+    return { sessionId, sessionFile };
+}

package/dist/composition/owned-ui.js

@@ -5,6 +5,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 { createPiEngineAdapter } from "../integrations/pi/engine/adapter.js";
 import { ClipboardDiagnosticCapture } from "../app/session-shell/clipboard-diagnostics.js";
@@ -19,18 +20,21 @@ export async function composeOwnedUiApplication(options = {}) {
 }
 export async function composeOwnedUi(options = {}) {
     const cwd = options.cwd ?? process.cwd();
+    const ownedSurfaces = options.ownedSurfaces !== "off";
     const adapter = options.createPiAdapter
         ? await options.createPiAdapter()
         : await createPiEngineAdapter({
             cwd,
             availableThemes: () => getAvailablePiThemes().map(theme => theme.name),
-            settingsProductMode: options.ownedSurfaces === "off" ? "comparison" : "bare",
+            settingsProductMode: ownedSurfaces ? "bare" : "comparison",
+            ...(ownedSurfaces ? {
+                repositoryContextReader: async (sessionId, sessionFile, signal) => await readSessionRepositoryContext({ sessionId, sessionFile }, { signal }),
+            } : {}),
             ...(options.sessionPath === undefined ? {} : { sessionPath: options.sessionPath }),
             ...(options.sessionSelection === undefined ? {} : { sessionSelection: options.sessionSelection }),
             ...(options.sessionForkPrompt === undefined ? {} : { sessionForkPrompt: options.sessionForkPrompt }),
             ...(options.projectTrustPrompt === undefined ? {} : { projectTrustPrompt: options.projectTrustPrompt }),
         });
-    const ownedSurfaces = options.ownedSurfaces !== "off";
     const settings = options.profileId === undefined
         ? null
         : new OwnedSettingsManager({

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

@@ -115,6 +115,7 @@ export interface OwnedUiUsageView {
 }
 export interface OwnedUiFooterView {
     readonly branch: string | null;
+    readonly repositoryPath?: string | null;
     readonly pullRequest?: {
         readonly number: number;
         readonly url: string;
@@ -183,6 +184,10 @@ export interface OwnedUiTranscriptBlock {
     readonly title: string | null;
     readonly text: string;
     readonly payload: unknown;
+    /** Bare-A1-only user presentation derived without mutating persisted/model message text. */
+    readonly userPresentation?: {
+        readonly visibleText: string;
+    };
     /** Tool-call message completion alone must not settle execution. */
     readonly toolState?: OwnedUiToolState;
     /** Authoritative renderer inputs, separate from diagnostic payloads. */

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

@@ -278,6 +278,11 @@ export function assertOwnedUiTranscriptBlock(block) {
     assertNonNegativeInteger(block.revision, "owned-UI transcript block revision");
     assertOptionalText(block.title, "owned-UI transcript block title", MAX_LABEL_LENGTH);
     assertPossiblyEmptyText(block.text, "owned-UI transcript block text", MAX_TEXT_BYTES);
+    if (block.userPresentation !== undefined) {
+        if (block.kind !== "user")
+            throw new TypeError("owned-UI user presentation requires a user block");
+        assertPossiblyEmptyText(block.userPresentation.visibleText, "owned-UI visible user text", MAX_TEXT_BYTES);
+    }
     assertJsonValue(block.toolRendering === undefined ? block.payload : {
         payload: block.payload, toolRendering: block.toolRendering,
     }, "owned-UI transcript block payload", MAX_PAYLOAD_BYTES);
@@ -396,6 +401,7 @@ export function assertOwnedUiStatusView(status) {
     }
     if (status.footer !== undefined) {
         assertOptionalText(status.footer.branch, "owned-UI footer branch", MAX_LABEL_LENGTH);
+        assertOptionalText(status.footer.repositoryPath ?? null, "owned-UI footer repository path", MAX_MESSAGE_LENGTH);
         if (status.footer.pullRequest !== undefined && status.footer.pullRequest !== null) {
             const pullRequest = status.footer.pullRequest;
             assertIntegerInRange(pullRequest.number, 1, Number.MAX_SAFE_INTEGER, "owned-UI footer pull request number");

package/dist/contracts/presentation/index.d.ts

@@ -1,4 +1,17 @@
 export type PresentationRuntimeState = "idle" | "running" | "stopping" | "stopped" | "failed";
+export interface SemanticShortcutHint {
+    readonly key?: string;
+    readonly action: string;
+    readonly actionFirst?: boolean;
+}
+export interface ShortcutHintRoles {
+    key(label: string): string;
+    action(name: string): string;
+}
+/** Applies the common display casing to each named key and letter in a shortcut label. */
+export declare function displayShortcutKeyLabel(label: string): string;
+/** Renders the canonical semantic shortcut row independently of either presentation framework. */
+export declare function renderSemanticShortcutHints(entries: readonly SemanticShortcutHint[], roles: ShortcutHintRoles, indent?: number): string;
 export interface PresentationComponentPort {
     render(width: number): readonly string[];
     invalidate(): void;

package/dist/contracts/presentation/index.js

@@ -1,3 +1,33 @@
+const SHORTCUT_KEY_NAMES = Object.freeze({
+    alt: "Alt", backspace: "Backspace", cmd: "Cmd", ctrl: "Ctrl", delete: "Delete", down: "Down", end: "End",
+    enter: "Enter", esc: "Esc", escape: "Escape", home: "Home", insert: "Insert", left: "Left", meta: "Meta",
+    option: "Option", pagedown: "PageDown", pageup: "PageUp", pgdn: "PgDn", pgup: "PgUp", return: "Return",
+    right: "Right", shift: "Shift", space: "Space", tab: "Tab", up: "Up",
+});
+/** Applies the common display casing to each named key and letter in a shortcut label. */
+export function displayShortcutKeyLabel(label) {
+    if (label === "/")
+        return label;
+    return label.split("/").map(chord => chord.split("+").map(part => {
+        const named = SHORTCUT_KEY_NAMES[part.toLowerCase()];
+        if (named !== undefined)
+            return named;
+        return /^\p{L}$/u.test(part) ? part.toUpperCase() : part;
+    }).join("+")).join("/");
+}
+/** Renders the canonical semantic shortcut row independently of either presentation framework. */
+export function renderSemanticShortcutHints(entries, roles, indent = 0) {
+    const rendered = entries.flatMap(entry => {
+        if (entry.key === "" || (entry.key !== undefined && entry.key.trim().length === 0))
+            return [];
+        if (entry.key === undefined)
+            return entry.action.length === 0 ? [] : [roles.action(entry.action)];
+        const key = roles.key(displayShortcutKeyLabel(entry.key));
+        const action = roles.action(entry.action);
+        return [entry.actionFirst ? `${action} ${key}` : `${key} ${action}`];
+    });
+    return `${" ".repeat(Math.max(0, indent))}${rendered.join("  ")}`;
+}
 export function assertPresentationComponent(component) {
     requiredFunctions(component, ["render", "invalidate"], "presentation component");
     const lines = component.render(80);

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

@@ -8,5 +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 type { SessionContextRequest } 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,4 +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 { runSelectedInteractiveRuntime, selectInteractiveRuntime } from "./runtime-selection.js";

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

@@ -0,0 +1,8 @@
+import { type SessionRepositoryIdentity } from "../../foundation/lifecycle/index.js";
+export type SessionContextRequest = {
+    readonly action: "link-worktree";
+    readonly path: string;
+} | {
+    readonly action: "unlink-worktree";
+};
+export declare function updateSessionRepositoryContext(identity: SessionRepositoryIdentity, request: SessionContextRequest): Promise<string | null>;

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

@@ -0,0 +1,8 @@
+import { clearSessionRepositoryContext, setSessionRepositoryContext, } from "../../foundation/lifecycle/index.js";
+export async function updateSessionRepositoryContext(identity, request) {
+    if (request.action === "unlink-worktree") {
+        await clearSessionRepositoryContext(identity);
+        return null;
+    }
+    return (await setSessionRepositoryContext(identity, request.path)).cwd;
+}

package/dist/features/owned-ui/project-trust-prompt.js

@@ -42,7 +42,7 @@ export function createConsoleProjectTrustPrompt(options = {}) {
                 optionRow("Trust", selected === 0),
                 optionRow("Do not trust", selected === 1),
                 "",
-                `${DIM}  ↑/↓ to navigate · Enter to select · Esc to cancel${RESET_FG}`,
+                `${DIM}  ↑/↓${MUTED} to navigate  ${DIM}Enter${MUTED} to select  ${DIM}Esc${MUTED} to cancel${RESET_FG}`,
             ];
             output.write(`${CLEAR_HOME}${lines.map(line => clipAnsiSafe(line, width)).join("\n")}`);
         };

package/dist/features/owned-ui/reference-screen-app.js

@@ -1,4 +1,4 @@
-import { GLOBAL_SCOPE, PLAIN_THEME, RAIL_COLUMNS, ShortcutRegistry, ScrollbarRails, assertNoShortcutConflicts, displayWidth, layoutList, padToWidth, renderGroupHeader, scrollForTrackPage, scrollbarGeometry, scrollbarPresentation, scrollbarWheelRows, truncateToWidth, withScrollbarRail, } from "../../ui/components/index.js";
+import { GLOBAL_SCOPE, PLAIN_THEME, RAIL_COLUMNS, ShortcutRegistry, ScrollbarRails, assertNoShortcutConflicts, displayWidth, layoutList, padToWidth, renderGroupHeader, renderShortcutHints, scrollForTrackPage, scrollbarGeometry, scrollbarPresentation, scrollbarWheelRows, truncateToWidth, withScrollbarRail, } from "../../ui/components/index.js";
 const SCOPE = "reference-screen";
 /** Rows above the document: the top rule. */
 const HEADER_ROWS = 1;
@@ -9,8 +9,7 @@ const SCROLL_LINGER_MS = 900;
 const SCROLL_LINGER_REPAINT_MS = 925;
 const LOADING_NOTICE = "Loading…";
 export const REFERENCE_SCREEN_SHORTCUTS = new ShortcutRegistry();
-// Compatibility: the footer reads as v2's `esc/ctrl+c close • ↑↓ scroll`, without ctrl+c, which is
-// the A1 interrupt chord here rather than a close key.
+// Compatibility: Ctrl+C remains the A1 interrupt chord here rather than a close key.
 REFERENCE_SCREEN_SHORTCUTS.declare({ key: "escape", scope: GLOBAL_SCOPE, description: "Close", section: "Screen", hint: { keys: "esc", does: "close" } }, "close");
 REFERENCE_SCREEN_SHORTCUTS.declare({ key: "up", scope: SCOPE, description: "Scroll up", section: "Navigate", hint: { keys: "↑↓", does: "scroll" } }, "up");
 REFERENCE_SCREEN_SHORTCUTS.declare({ key: "down", scope: SCOPE, description: "Scroll down", section: "Navigate", hint: { keys: "↑↓", does: "scroll" } }, "down");
@@ -18,8 +17,6 @@ REFERENCE_SCREEN_SHORTCUTS.declare({ key: "pageUp", scope: SCOPE, description: "
 REFERENCE_SCREEN_SHORTCUTS.declare({ key: "pageDown", scope: SCOPE, description: "Down a page", section: "Navigate" }, "page-down");
 REFERENCE_SCREEN_SHORTCUTS.declare({ key: "home", scope: SCOPE, description: "First row", section: "Navigate" }, "first");
 REFERENCE_SCREEN_SHORTCUTS.declare({ key: "end", scope: SCOPE, description: "Last row", section: "Navigate" }, "last");
-/** The separator v2's footer puts between its hints. */
-const HINT_SEPARATOR = " • ";
 assertNoShortcutConflicts(REFERENCE_SCREEN_SHORTCUTS.assemble());
 const KEYS = {
     "\u001b[A": "up",
@@ -136,11 +133,13 @@ export class ReferenceScreenApp {
             ? { rail: { key: this.id, column: rect.width, rowStart: HEADER_ROWS, trackHeight: geometry.trackHeight }, geometry, page: viewportLength }
             : null;
         const withRail = withScrollbarRail(body.slice(0, bodyHeight), geometry, contentWidth, theme, { presentation });
-        const hint = this.#interruptArmed ? "press ctrl+c again to exit a1" : REFERENCE_SCREEN_SHORTCUTS.hint(SCOPE, HINT_SEPARATOR);
+        const hint = this.#interruptArmed
+            ? theme.fg("dim", "press ctrl+c again to exit a1")
+            : renderShortcutHints(REFERENCE_SCREEN_SHORTCUTS.hintEntries(SCOPE), theme);
         // Compatibility: the v2 reference screen frames its document between two border-coloured rules.
         const rule = theme.fg("border", "─".repeat(rect.width));
-        // Compatibility: v2 sets its footer against the left edge, unlike the settings status line.
-        const frame = [rule, ...withRail, rule, padToWidth(theme.fg("dim", hint), rect.width)];
+        // Compatibility: the footer remains against the left edge, unlike the settings status line.
+        const frame = [rule, ...withRail, rule, padToWidth(hint, rect.width)];
         // Invariant: a rectangle too small for the chrome still gets exactly its rows, top first.
         return frame.slice(0, rect.height).concat(Array(Math.max(0, rect.height - frame.length)).fill(""));
     }

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

@@ -1,4 +1,4 @@
-import { GLOBAL_SCOPE, LineInput, PLAIN_THEME, ShortcutRegistry, assertNoShortcutConflicts, blockJumpTarget, dialogValueColumn, numericValues, RAIL_COLUMNS, renderDialogPanel, renderEmptyState, renderGroupHeader, renderInputRow, renderListRow, renderNote, statusText, dialogRowAt, 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 { GLOBAL_SCOPE, LineInput, PLAIN_THEME, ShortcutRegistry, assertNoShortcutConflicts, blockJumpTarget, dialogValueColumn, numericValues, RAIL_COLUMNS, renderDialogPanel, renderEmptyState, renderGroupHeader, renderInputRow, renderListRow, renderNote, renderShortcutHints, dialogRowAt, 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";
 export { SETTINGS_APP_ID, SETTINGS_ROUTE } from "./settings-route.js";
 const SCOPE = SETTINGS_APP_ID;
@@ -786,15 +786,19 @@ export class SettingsApp {
         });
         this.#dialogValueColumn = dialogValueColumn(rows);
         this.#panelTop = this.#panelTopForFrame;
-        return renderDialogPanel({ rows, index: open.index, hint: SETTINGS_SHORTCUTS.hint(DIALOG_SCOPE) }, width, theme);
+        return renderDialogPanel({ rows, index: open.index, hint: SETTINGS_SHORTCUTS.hintEntries(DIALOG_SCOPE) }, width, theme);
     }
     #footerLines(width, theme) {
         const open = this.#structured;
         if (open !== null)
             return this.#dialogLines(open, width, theme);
-        const hint = this.#interruptArmed ? "press ctrl+c again to exit a1" : SETTINGS_SHORTCUTS.hint(SCOPE);
-        const report = statusText({ hint, report: this.#notice });
-        const status = truncateToWidth(`${width > 0 ? " " : ""}${theme.fg("dim", report)}`, width);
+        const notice = this.#notice;
+        const plainStatus = notice !== null && notice.length > 0
+            ? notice
+            : this.#interruptArmed ? "press ctrl+c again to exit a1" : null;
+        const status = plainStatus === null
+            ? truncateToWidth(renderShortcutHints(SETTINGS_SHORTCUTS.hintEntries(SCOPE), theme, width > 0 ? 1 : 0), width)
+            : truncateToWidth(`${width > 0 ? " " : ""}${theme.fg("dim", plainStatus)}`, width);
         const input = this.#filter;
         if (input === null)
             return [status];

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

@@ -7,5 +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 { 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,4 +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 { createSupervisorStartupAttempt, publishSupervisorStartupResult, readSupervisorStartupResult, supervisorStartupFailure, supervisorStartupReady, supervisorStartupResultPath, } from "./supervisor-startup.js";

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

@@ -0,0 +1,18 @@
+export interface SessionRepositoryIdentity {
+    readonly sessionId: string;
+    readonly sessionFile: string;
+}
+export interface SessionRepositoryContext {
+    readonly cwd: string;
+    readonly branch: string;
+}
+export interface SessionRepositoryContextOptions {
+    readonly dataDir?: string;
+    readonly signal?: AbortSignal;
+}
+/** Persist one explicit same-repository worktree association for a stable Pi session. */
+export declare function setSessionRepositoryContext(identity: SessionRepositoryIdentity, worktreePath: string, options?: SessionRepositoryContextOptions): Promise<SessionRepositoryContext>;
+/** Remove only the association belonging to the supplied stable session. */
+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>;