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

package/dist/integrations/pi/components/upstream/components/thinking-selector.js

@@ -4,14 +4,15 @@
  * Modifications: Preserve the searchable thinking-level selector, current/default semantics,
  * selection, save, cancellation, and focus while accepting the active bare-A1 cycle-key label from the
  * shell, styling the title with the established bold semantic accent treatment, placing its muted hint
- * directly below it, deduplicating levels, and rendering aligned muted descriptions after an adjacent
- * success-colored active marker. All list and border colors use the owned theme and its explicit color
- * mode. The comparison profile retains the public pinned component.
- * Deviations: owned-level-cycle-shortcut, owned-thinking-selector-heading.
+ * directly below it, deduplicating levels, and rendering aligned muted descriptions after adjacent
+ * active and bracketed default markers. All list and border colors use the owned theme and its
+ * explicit color mode, and the footer uses the shared bare-A1 modal shortcut row. The comparison
+ * profile retains the public pinned component.
+ * Deviations: owned-modal-shortcut-hints, owned-level-cycle-shortcut, owned-thinking-selector-heading.
  */
 import { Container, fuzzyFilter, getKeybindings, Input, SelectList, Spacer, Text, } from "@earendil-works/pi-tui";
 import { DynamicBorder } from "../../../startup-public.js";
-import { piTheme } from "../theme/theme.js";
+import { piTheme, renderPiModalShortcutHints } from "../../theme.js";
 const THINKING_SELECT_LIST_LAYOUT = {
     minPrimaryColumnWidth: 12,
     maxPrimaryColumnWidth: 32,
@@ -35,6 +36,7 @@ export class OwnedThinkingSelectorComponent extends Container {
     onCancel;
     onSelectAsDefault;
     currentLevel;
+    defaultThinkingLevel;
     _focused = false;
     get focused() {
         return this._focused;
@@ -49,10 +51,11 @@ export class OwnedThinkingSelectorComponent extends Container {
         this.onCancel = onCancel;
         this.onSelectAsDefault = onSelectAsDefault;
         this.currentLevel = currentLevel;
+        this.defaultThinkingLevel = defaultThinkingLevel;
         this.allItems = [...new Set(availableLevels)].map((level) => ({
             value: level,
             label: level,
-            description: level === defaultThinkingLevel ? `${LEVEL_DESCRIPTIONS[level]} · default` : LEVEL_DESCRIPTIONS[level],
+            description: LEVEL_DESCRIPTIONS[level],
         }));
         this.addChild(new DynamicBorder((text) => piTheme().fg("border", text)));
         this.addChild(new Spacer(1));
@@ -67,7 +70,11 @@ export class OwnedThinkingSelectorComponent extends Container {
         this.selectListChildIndex = this.children.length;
         this.addChild(this.selectList);
         this.addChild(new Spacer(1));
-        this.addChild(new Text(piTheme().fg("dim", `  ${this.keyDisplayText("tui.select.confirm")} to select · ${this.keyDisplayText("app.thinking.save")} to set as default · ${this.keyDisplayText("tui.select.cancel")} to cancel`), 0, 0));
+        this.addChild(new Text(renderPiModalShortcutHints([
+            { key: this.keyDisplayText("tui.select.confirm"), action: "to select" },
+            { key: this.keyDisplayText("app.thinking.save"), action: "to set as default" },
+            { key: this.keyDisplayText("tui.select.cancel"), action: "to cancel" },
+        ], 2), 0, 0));
         this.addChild(new DynamicBorder((text) => piTheme().fg("border", text)));
     }
     keyDisplayText(keybinding) {
@@ -79,17 +86,20 @@ export class OwnedThinkingSelectorComponent extends Container {
             .join("/");
     }
     buildSelectList(items, preselect) {
+        const markerWidth = (item) => (item.value === this.currentLevel ? 2 : 0) + (item.value === this.defaultThinkingLevel ? 10 : 0);
         const primaryWidth = this.allItems.reduce((widest, item) => {
             const level = item.label ?? item.value;
-            return Math.max(widest, level.length + (item.value === this.currentLevel ? 2 : 0));
+            return Math.max(widest, level.length + markerWidth(item));
         }, 0);
         const themedItems = items.map((item) => {
             const level = item.label ?? item.value;
-            const current = item.value === this.currentLevel;
-            const currentMarker = current ? ` ${piTheme().fg("success", "✓")}` : "";
-            const separator = " ".repeat(Math.max(1, primaryWidth - level.length - (current ? 2 : 0) + 1));
+            const currentMarker = item.value === this.currentLevel ? ` ${piTheme().fg("success", "✓")}` : "";
+            const defaultMarker = item.value === this.defaultThinkingLevel
+                ? ` ${piTheme().fg("muted", "[default]")}`
+                : "";
+            const separator = " ".repeat(Math.max(1, primaryWidth - level.length - markerWidth(item) + 1));
             const description = item.description ? piTheme().fg("muted", item.description) : "";
-            return { value: item.value, label: `${level}${currentMarker}${separator}${description}` };
+            return { value: item.value, label: `${level}${currentMarker}${defaultMarker}${separator}${description}` };
         });
         // Invariant: the bare selector uses the owned theme's explicit color mode, not upstream's host detection.
         const list = new SelectList(themedItems, Math.max(1, themedItems.length), {

package/dist/integrations/pi/components/upstream/components/tree-selector.d.ts

@@ -3,8 +3,9 @@
  * packages/coding-agent/src/modes/interactive/components/tree-selector.ts.
  * Modifications: Source-synchronized tree selector port: preserve filtering, folding, labels, copying,
  * tree navigation, key hints, focus, and viewport behavior while remapping public types/components
- * plus owned keybindings/theme helpers required to avoid the pinned package nested pi-tui singleton.
- * Deviations: none.
+ * plus owned keybindings/theme helpers required to avoid the pinned package nested pi-tui singleton;
+ * bare A1 uses the shared semantic modal shortcut row.
+ * Deviations: owned-modal-shortcut-hints.
  */
 import { type Component, Container, type Focusable } from "@earendil-works/pi-tui";
 import { type SessionTreeNode } from "@earendil-works/pi-coding-agent";

package/dist/integrations/pi/components/upstream/components/tree-selector.js

@@ -3,13 +3,14 @@
  * packages/coding-agent/src/modes/interactive/components/tree-selector.ts.
  * Modifications: Source-synchronized tree selector port: preserve filtering, folding, labels, copying,
  * tree navigation, key hints, focus, and viewport behavior while remapping public types/components
- * plus owned keybindings/theme helpers required to avoid the pinned package nested pi-tui singleton.
- * Deviations: none.
+ * plus owned keybindings/theme helpers required to avoid the pinned package nested pi-tui singleton;
+ * bare A1 uses the shared semantic modal shortcut row.
+ * Deviations: owned-modal-shortcut-hints.
  */
 import { Container, Input, Spacer, sliceByColumn, Text, truncateToWidth, visibleWidth, wrapTextWithAnsi, } from "@earendil-works/pi-tui";
 import { DynamicBorder } from "../../../startup-public.js";
 import { KeybindingsManager } from "../adjacent/core/keybindings.js";
-import { piTheme } from "../theme/theme.js";
+import { piTheme, renderPiModalShortcutHints } from "../../theme.js";
 const theme = new Proxy({}, {
     get(_target, property) {
         const active = piTheme();
@@ -24,8 +25,8 @@ function formatKeyText(key) {
         .map((value) => value.split("+").map((part) => process.platform === "darwin" && part.toLowerCase() === "alt" ? "option" : part).join("+"))
         .join("/");
 }
-function keyHint(keybinding, description) {
-    return theme.fg("dim", formatKeyText(treeKeybindings.getKeys(keybinding).join("/"))) + theme.fg("muted", ` ${description}`);
+function shortcutHint(keybinding, action) {
+    return { key: formatKeyText(treeKeybindings.getKeys(keybinding).join("/")), action };
 }
 const TREE_GUTTER_WIDTH = 2;
 const MIN_VISIBLE_ANCHOR_CONTENT_WIDTH = 4;
@@ -1075,14 +1076,12 @@ class TreeHelp {
     invalidate() { }
     render(width) {
         const items = TREE_HELP_ITEMS.map(({ keys, label, labelFirst }) => {
-            const text = formatHelpKeys(keys);
-            if (!text)
-                return label;
-            return labelFirst ? `${label} ${text}` : `${text} ${label}`;
+            const key = formatHelpKeys(keys);
+            return renderPiModalShortcutHints([key ? { key, action: label, ...(labelFirst === undefined ? {} : { actionFirst: labelFirst }) } : { action: label }]);
         });
         const availableWidth = Math.max(1, width);
         const indent = "  ";
-        const separator = " · ";
+        const separator = "  ";
         const lines = [];
         let currentLine = "";
         for (const item of items) {
@@ -1101,7 +1100,7 @@ class TreeHelp {
         if (currentLine) {
             lines.push(...wrapTextWithAnsi(currentLine.trimEnd(), availableWidth));
         }
-        return lines.map((line) => theme.fg("muted", line));
+        return lines;
     }
 }
 const TREE_HELP_ITEMS = [
@@ -1184,7 +1183,10 @@ class LabelInput {
         const availableWidth = width - indent.length;
         lines.push(truncateToWidth(`${indent}${theme.fg("muted", "Label (empty to remove):")}`, width));
         lines.push(...this.input.render(availableWidth).map((line) => truncateToWidth(`${indent}${line}`, width)));
-        lines.push(truncateToWidth(`${indent}${keyHint("tui.select.confirm", "save")}  ${keyHint("tui.select.cancel", "cancel")}`, width));
+        lines.push(truncateToWidth(renderPiModalShortcutHints([
+            shortcutHint("tui.select.confirm", "save"),
+            shortcutHint("tui.select.cancel", "cancel"),
+        ], indent.length), width));
         return lines;
     }
     handleInput(keyData) {

package/dist/integrations/pi/components/upstream/components/trust-selector.js

@@ -2,12 +2,13 @@
  * Provenance: @earendil-works/pi-coding-agent 0.87.0 (MIT), commit 16787ad5b2dc748047f314ca1bfe7708f30f54f3,
  * packages/coding-agent/src/modes/interactive/components/trust-selector.ts.
  * Modifications: Mechanical source-synchronized trust selector port with injected public
- * ProjectTrustStore-derived options and remapped owned theme imports.
- * Deviations: none.
+ * ProjectTrustStore-derived options, remapped owned theme imports, and the shared bare-A1 modal
+ * shortcut row.
+ * Deviations: owned-modal-shortcut-hints.
  */
-import { DynamicBorder, keyHint, rawKeyHint } from "../../../startup-public.js";
+import { DynamicBorder } from "../../../startup-public.js";
 import { Container, getKeybindings, Spacer, Text } from "@earendil-works/pi-tui";
-import { piTheme } from "../theme/theme.js";
+import { piTheme, renderPiModalShortcutHints } from "../../theme.js";
 function formatDecision(trustPath, decision) {
     if (decision === null)
         return "none";
@@ -39,7 +40,12 @@ export class TrustSelectorComponent extends Container {
         this.listContainer = new Container();
         this.addChild(this.listContainer);
         this.addChild(new Spacer(1));
-        this.addChild(new Text(`${rawKeyHint("↑↓", "navigate")}  ${keyHint("tui.select.confirm", "save")}  ${keyHint("tui.select.cancel", "cancel")}`, 1, 0));
+        const keybindings = getKeybindings();
+        this.addChild(new Text(renderPiModalShortcutHints([
+            { key: "↑↓", action: "navigate" },
+            { key: keybindings.getKeys("tui.select.confirm").join("/"), action: "save" },
+            { key: keybindings.getKeys("tui.select.cancel").join("/"), action: "cancel" },
+        ]), 1, 0));
         this.addChild(new Spacer(1));
         this.addChild(new DynamicBorder());
         this.updateList(options.savedDecision);

package/dist/integrations/pi/engine/adapter.d.ts

@@ -9,7 +9,7 @@ import type { AgentSettingOwner } from "../../../contracts/agent-engine/index.js
 import { type AdapterCommandResult } from "./command-dispatch.js";
 import { type OwnedPiVisualExtensionSupport } from "./extension-ui-binding.js";
 import { type OwnedPiExtensionResourceSummary, type OwnedPiResourceSummary } from "./resource-catalog.js";
-import { type PiEnginePackageUpdateProbe, type PiEngineRuntimeFactory } from "./session-runtime.js";
+import { type PiEnginePackageUpdateProbe, type PiEngineRuntimeFactory, type PiRepositoryContextReader } from "./session-runtime.js";
 import { PiWorkflowContexts } from "./workflow-contexts.js";
 export type { OwnedPiExtensionResourceSummary, OwnedPiExtensionSourceSummary, OwnedPiResourceSummary } from "./resource-catalog.js";
 export type { PiEngineRuntimeFactory, PiEngineRuntimeFactoryInput } from "./session-runtime.js";
@@ -41,6 +41,7 @@ export interface PiEngineAdapterOptions {
      * mode. Returns display names of packages with updates available.
      */
     readonly checkPackageUpdates?: PiEnginePackageUpdateProbe;
+    readonly repositoryContextReader?: PiRepositoryContextReader;
 }
 /** Owns the pinned Pi session lifecycle and translates its events into the neutral agent-engine contract. */
 export declare class PiEngineAdapter implements OwnedUiPromptSuggestionGeneratorPort {

package/dist/integrations/pi/engine/adapter.js

@@ -133,6 +133,7 @@ export class PiEngineAdapter {
             projectTrustPrompt: options.projectTrustPrompt,
             createRuntime: options.createRuntime,
             checkPackageUpdates: options.checkPackageUpdates,
+            ...(options.repositoryContextReader === undefined ? {} : { repositoryContextReader: options.repositoryContextReader }),
             host: this.#workflowHost,
         }, {
             disposed: () => this.#disposed,
@@ -428,6 +429,7 @@ export class PiEngineAdapter {
                 usage: this.#usageCache ??= readUsageView(this.#engine.session, this.#engine.runtime, this.#activeModel),
                 footer: {
                     branch: this.#engine.gitBranch,
+                    repositoryPath: this.#engine.repositoryCwd,
                     pullRequest: this.#engine.pullRequest,
                     sessionName: this.#engine.session?.sessionManager?.getSessionName() ?? null,
                     availableProviderCount: new Set(this.#engine.runtime?.services.modelRuntime.getAvailableSnapshot?.().map(model => model.provider).filter(provider => provider !== undefined) ?? []).size,

package/dist/integrations/pi/engine/message-values.js

@@ -29,6 +29,7 @@ export function sameBlockContent(left, right) {
         && left.status === right.status
         && left.title === right.title
         && left.text === right.text
+        && sameValue(left.userPresentation, right.userPresentation)
         && sameValue(left.toolState, right.toolState)
         && sameValue(left.toolRendering, right.toolRendering)
         && sameValue(left.payload, right.payload)

package/dist/integrations/pi/engine/session-runtime.d.ts

@@ -16,6 +16,12 @@ export interface PiEngineRuntimeFactoryInput {
 }
 export type PiEngineRuntimeFactory = (input: PiEngineRuntimeFactoryInput) => Promise<AgentSessionRuntime>;
 export type PiEnginePackageUpdateProbe = (settingsManager: AgentSessionServices["settingsManager"]) => Promise<readonly string[]>;
+export interface PiRepositoryContextSelection {
+    readonly cwd: string;
+    readonly branch: string;
+}
+export type PiRepositoryContextReader = (sessionId: string, sessionFile: string, signal: AbortSignal) => Promise<PiRepositoryContextSelection | null>;
+export type PiGitBranchReader = (cwd: string, signal: AbortSignal) => Promise<string | null>;
 export interface PiEngineRuntimeOptions {
     readonly cwd: string;
     readonly agentDir: string;
@@ -28,12 +34,14 @@ export interface PiEngineRuntimeOptions {
     readonly checkPackageUpdates: PiEnginePackageUpdateProbe | undefined;
     readonly pullRequestProbe?: PiPullRequestProbe;
     readonly pullRequestRefreshMs?: number;
-    readonly gitBranchReader?: (cwd: string) => Promise<string | null>;
+    readonly repositoryContextPollMs?: number;
+    readonly repositoryContextReader?: PiRepositoryContextReader;
+    readonly gitBranchReader?: PiGitBranchReader;
     readonly host: PiWorkflowHost;
 }
 export interface PiEngineRuntimePorts {
     disposed(): boolean;
-    /** The runtime exists and its cwd and git branch are known; nothing is bound yet. */
+    /** The runtime exists and its startup cwd is known; repository metadata resolves after binding. */
     started(runtime: AgentSessionRuntime): void;
     /** True while a runtime-initiated rebind must be ignored: delivery overload, stopped admission, or disposal. */
     rebindBlocked(): boolean;
@@ -65,6 +73,7 @@ export declare class PiEngineRuntime {
     /** Actual session replacements, excluding delivery-only invalidation of callbacks. */
     get bindingGeneration(): number;
     get cwd(): string;
+    get repositoryCwd(): string;
     get gitBranch(): string | null;
     get pullRequest(): PiPullRequestIdentity | null;
     get sessionCommands(): PiSessionCommandIntegration | undefined;

package/dist/integrations/pi/engine/session-runtime.js

@@ -9,6 +9,9 @@ import { DefaultPackageManager, VERSION } from "../startup-public.js";
 import { readOpenPullRequest, } from "./repository-pr.js";
 const execFileAsync = promisify(execFile);
 const PULL_REQUEST_REFRESH_MS = 60_000;
+const REPOSITORY_CONTEXT_POLL_MS = 5_000;
+const GIT_BRANCH_TIMEOUT_MS = 5_000;
+const GIT_BRANCH_MAX_BUFFER_BYTES = 4 * 1024;
 /**
  * The pinned Pi runtime and the session bound to it: creation through the runtime factory, the
  * session generation that stamps and invalidates events, the subscription that forwards session
@@ -22,6 +25,8 @@ export class PiEngineRuntime {
     #checkPackageUpdates;
     #pullRequestProbe;
     #pullRequestRefreshMs;
+    #repositoryContextPollMs;
+    #repositoryContextReader;
     #gitBranchReader;
     #cwd;
     #runtime;
@@ -31,15 +36,21 @@ export class PiEngineRuntime {
     #sessionBindingGeneration = 0;
     #sessionCommands;
     #compactionProgress = null;
+    #repositoryCwd;
     #gitBranch = null;
     #pullRequest = null;
-    #pullRequestTimer;
-    #pullRequestAbort;
+    #repositoryRefreshTimer;
+    #repositoryRefreshAbort;
+    #repositoryRefreshTask;
+    #repositoryRefreshPending = false;
+    #lastPullRequestProbeAt = null;
+    #repositoryRefreshEnabled = false;
     #disposed = false;
     constructor(options, ports) {
         this.#options = options;
         this.#ports = ports;
         this.#cwd = options.cwd;
+        this.#repositoryCwd = options.cwd;
         this.#runtimeFactory = options.createRuntime ?? createDefaultPiRuntime;
         this.#checkPackageUpdates = options.checkPackageUpdates
             ?? (options.createRuntime
@@ -47,6 +58,8 @@ export class PiEngineRuntime {
                 : settingsManager => checkDefaultPiPackageUpdates(this.#cwd, options.agentDir, settingsManager));
         this.#pullRequestProbe = options.pullRequestProbe ?? readOpenPullRequest;
         this.#pullRequestRefreshMs = options.pullRequestRefreshMs ?? PULL_REQUEST_REFRESH_MS;
+        this.#repositoryContextPollMs = options.repositoryContextPollMs ?? REPOSITORY_CONTEXT_POLL_MS;
+        this.#repositoryContextReader = options.repositoryContextReader ?? (async () => null);
         this.#gitBranchReader = options.gitBranchReader ?? readGitBranch;
     }
     get runtime() {
@@ -66,6 +79,9 @@ export class PiEngineRuntime {
     get cwd() {
         return this.#runtime?.cwd ?? this.#cwd;
     }
+    get repositoryCwd() {
+        return this.#repositoryCwd;
+    }
     get gitBranch() {
         return this.#gitBranch;
     }
@@ -91,7 +107,7 @@ export class PiEngineRuntime {
         });
         this.#runtime = runtime;
         this.#cwd = runtime.cwd ?? this.#cwd;
-        this.#gitBranch = await this.#gitBranchReader(this.#cwd);
+        this.#repositoryCwd = this.#cwd;
         this.#ports.started(runtime);
         runtime.setRebindSession(async (session) => {
             if (this.#ports.rebindBlocked())
@@ -104,7 +120,8 @@ export class PiEngineRuntime {
         }
         this.bindSession(runtime.session);
         await this.#announceChangelog(runtime.services.settingsManager);
-        this.#startPullRequestRefresh();
+        this.#repositoryRefreshEnabled = true;
+        this.#startRepositoryRefresh();
         return runtime;
     }
     /** Probe extension packages for updates after startup and report them as an informational diagnostic. */
@@ -161,7 +178,10 @@ export class PiEngineRuntime {
         // Invariant: the subscription is live before the adapter rebuilds its state so the extension
         // rebind that finishes the rebuild cannot emit an event nobody is listening to.
         this.#subscribe();
+        this.#resetRepositoryRefresh();
         this.#ports.sessionReplaced(session);
+        if (this.#repositoryRefreshEnabled)
+            this.#startRepositoryRefresh();
     }
     /** Stop forwarding the current session's events and open a new generation; overload recovery resumes or abandons it. */
     suspend() {
@@ -201,50 +221,126 @@ export class PiEngineRuntime {
     /** Unsubscribe, stop observing compaction, and dispose the runtime; the session reference is kept for final reads. */
     async dispose() {
         this.#disposed = true;
-        if (this.#pullRequestTimer !== undefined)
-            clearTimeout(this.#pullRequestTimer);
-        this.#pullRequestTimer = undefined;
-        this.#pullRequestAbort?.abort();
-        this.#pullRequestAbort = undefined;
+        this.#repositoryRefreshEnabled = false;
+        if (this.#repositoryRefreshTimer !== undefined)
+            clearTimeout(this.#repositoryRefreshTimer);
+        this.#repositoryRefreshTimer = undefined;
+        this.#repositoryRefreshPending = false;
+        this.#repositoryRefreshAbort?.abort();
+        const repositoryRefreshTask = this.#repositoryRefreshTask;
         this.#unsubscribe?.();
         this.#unsubscribe = undefined;
         this.#compactionProgress?.dispose();
         this.#compactionProgress = null;
+        await repositoryRefreshTask;
         await this.#runtime?.dispose();
     }
-    #startPullRequestRefresh() {
-        if (this.#gitBranch === null || this.#disposed || this.#ports.disposed())
+    #startRepositoryRefresh() {
+        if (!this.#repositoryRefreshEnabled || this.#disposed || this.#ports.disposed())
+            return;
+        if (this.#repositoryRefreshTask !== undefined) {
+            this.#repositoryRefreshPending = true;
             return;
-        void this.#refreshPullRequest();
+        }
+        const task = this.#refreshRepositoryMetadata();
+        this.#repositoryRefreshTask = task;
+        const settled = () => {
+            if (this.#repositoryRefreshTask === task)
+                this.#repositoryRefreshTask = undefined;
+            if (!this.#repositoryRefreshPending)
+                return;
+            this.#repositoryRefreshPending = false;
+            this.#startRepositoryRefresh();
+        };
+        void task.then(settled, settled);
     }
-    async #refreshPullRequest() {
-        const branch = this.#gitBranch;
-        if (branch === null || this.#pullRequestAbort !== undefined || this.#disposed || this.#ports.disposed())
+    #resetRepositoryRefresh() {
+        if (this.#repositoryRefreshTimer !== undefined)
+            clearTimeout(this.#repositoryRefreshTimer);
+        this.#repositoryRefreshTimer = undefined;
+        this.#repositoryRefreshAbort?.abort();
+        this.#repositoryCwd = this.#cwd;
+        this.#gitBranch = null;
+        this.#pullRequest = null;
+        this.#lastPullRequestProbeAt = null;
+    }
+    async #refreshRepositoryMetadata() {
+        if (this.#repositoryRefreshAbort !== undefined || this.#disposed || this.#ports.disposed())
             return;
         const controller = new AbortController();
-        this.#pullRequestAbort = controller;
-        let next = null;
+        const generation = this.#sessionBindingGeneration;
+        this.#repositoryRefreshAbort = controller;
+        let associatedContext = null;
+        const manager = this.#session?.sessionManager;
+        const sessionId = manager?.getSessionId?.();
+        const sessionFile = manager?.getSessionFile?.();
         try {
-            next = await this.#pullRequestProbe(this.#cwd, branch, controller.signal);
+            if (typeof sessionId === "string" && sessionId.length > 0 && typeof sessionFile === "string" && sessionFile.length > 0) {
+                try {
+                    associatedContext = await this.#repositoryContextReader(sessionId, sessionFile, controller.signal);
+                }
+                catch {
+                    associatedContext = null;
+                }
+            }
+            const nextCwd = associatedContext?.cwd ?? this.#cwd;
+            let nextBranch = associatedContext?.branch ?? null;
+            if (associatedContext === null) {
+                try {
+                    nextBranch = await this.#gitBranchReader(nextCwd, controller.signal);
+                }
+                catch {
+                    nextBranch = null;
+                }
+            }
+            const metadataChanged = nextCwd !== this.#repositoryCwd || nextBranch !== this.#gitBranch;
+            const remoteDue = metadataChanged || this.#lastPullRequestProbeAt === null
+                || Date.now() - this.#lastPullRequestProbeAt >= this.#pullRequestRefreshMs;
+            if (remoteDue) {
+                let nextPullRequest = null;
+                try {
+                    nextPullRequest = nextBranch === null
+                        ? null
+                        : await this.#pullRequestProbe(nextCwd, nextBranch, controller.signal);
+                }
+                catch {
+                    nextPullRequest = null;
+                }
+                if (controller.signal.aborted || generation !== this.#sessionBindingGeneration || this.#disposed || this.#ports.disposed())
+                    return;
+                const changed = nextCwd !== this.#repositoryCwd
+                    || nextBranch !== this.#gitBranch
+                    || !samePullRequest(this.#pullRequest, nextPullRequest);
+                this.#repositoryCwd = nextCwd;
+                this.#gitBranch = nextBranch;
+                this.#pullRequest = nextPullRequest;
+                this.#lastPullRequestProbeAt = Date.now();
+                if (changed)
+                    this.#ports.emitView();
+            }
         }
         catch {
-            next = null;
+            if (!controller.signal.aborted && generation === this.#sessionBindingGeneration && !this.#disposed && !this.#ports.disposed()) {
+                const changed = this.#repositoryCwd !== this.#cwd || this.#gitBranch !== null || this.#pullRequest !== null;
+                this.#repositoryCwd = this.#cwd;
+                this.#gitBranch = null;
+                this.#pullRequest = null;
+                this.#lastPullRequestProbeAt = Date.now();
+                if (changed)
+                    this.#ports.emitView();
+            }
         }
         finally {
-            if (this.#pullRequestAbort === controller)
-                this.#pullRequestAbort = undefined;
+            if (this.#repositoryRefreshAbort === controller)
+                this.#repositoryRefreshAbort = undefined;
         }
-        if (controller.signal.aborted || this.#disposed || this.#ports.disposed())
+        if (controller.signal.aborted || generation !== this.#sessionBindingGeneration || this.#disposed || this.#ports.disposed())
             return;
-        if (!samePullRequest(this.#pullRequest, next)) {
-            this.#pullRequest = next;
-            this.#ports.emitView();
-        }
-        this.#pullRequestTimer = setTimeout(() => {
-            this.#pullRequestTimer = undefined;
-            void this.#refreshPullRequest();
-        }, this.#pullRequestRefreshMs);
-        this.#pullRequestTimer.unref?.();
+        this.#repositoryRefreshTimer = setTimeout(() => {
+            this.#repositoryRefreshTimer = undefined;
+            this.#startRepositoryRefresh();
+        }, this.#repositoryContextPollMs);
+        this.#repositoryRefreshTimer.unref?.();
     }
     #subscribe() {
         const session = this.#session;
@@ -296,9 +392,16 @@ async function checkDefaultPiPackageUpdates(cwd, agentDir, settingsManager) {
 function samePullRequest(left, right) {
     return left?.number === right?.number && left?.url === right?.url;
 }
-async function readGitBranch(cwd) {
+async function readGitBranch(cwd, signal) {
     try {
-        const { stdout } = await execFileAsync("git", ["branch", "--show-current"], { cwd, windowsHide: true });
+        const { stdout } = await execFileAsync("git", ["branch", "--show-current"], {
+            cwd,
+            windowsHide: true,
+            timeout: GIT_BRANCH_TIMEOUT_MS,
+            maxBuffer: GIT_BRANCH_MAX_BUFFER_BYTES,
+            signal,
+            encoding: "utf8",
+        });
         const branch = stdout.trim();
         return branch.length > 0 ? branch : null;
     }

package/dist/integrations/pi/engine/transcript-projection.js

@@ -2,6 +2,39 @@ import { toolRenderingInput } from "./tool-rendering.js";
 import { TranscriptImageAssets } from "./transcript-image-assets.js";
 import { acceptsTranscriptUpdate, transcriptToolState } from "../../../contracts/owned-ui/index.js";
 import { assistantContent, contentImageCount, isRecord, jsonSummary, messageFallbackKey, retainCompletedArguments, sameBlockContent, sanitizeJson, stringValue, textFromContent } from "./message-values.js";
+const IMAGE_DIMENSION_NOTE = /^\[Image: original \d+x\d+, displayed at \d+x\d+\. Multiply coordinates by \d+(?:\.\d+)? to map to original image\.\]$/u;
+const IMAGE_CONVERSION_NOTE = /^\[Image converted from image\/[a-z0-9.+-]+ to image\/[a-z0-9.+-]+\.\]$/iu;
+const IMAGE_OMISSION_NOTE = /^\[Image omitted: could not be (?:converted to a supported inline image format|resized below the inline image size limit)\.\]$/u;
+function isImageProcessingHint(line) {
+    return IMAGE_DIMENSION_NOTE.test(line) || IMAGE_CONVERSION_NOTE.test(line) || IMAGE_OMISSION_NOTE.test(line);
+}
+function userPresentation(content) {
+    const imageCount = contentImageCount(content);
+    if (imageCount === 0)
+        return undefined;
+    const lines = textFromContent(content).split("\n");
+    const retainedHints = [];
+    let dimensionCount = 0;
+    let hintStart = lines.length;
+    while (hintStart > 0) {
+        const line = lines[hintStart - 1];
+        if (!isImageProcessingHint(line))
+            break;
+        if (IMAGE_DIMENSION_NOTE.test(line))
+            dimensionCount++;
+        else
+            retainedHints.unshift(line);
+        hintStart--;
+    }
+    if (dimensionCount === 0 || dimensionCount > imageCount)
+        return undefined;
+    lines.splice(hintStart);
+    if (lines.at(-1) === "")
+        lines.pop();
+    if (retainedHints.length > 0)
+        lines.push("", ...retainedHints);
+    return { visibleText: lines.join("\n") };
+}
 /**
  * The transcript as the owned UI sees it: Pi's session messages and tool events projected into
  * ordered, revisioned blocks. The projection owns block identity (message and tool ids that stay
@@ -122,6 +155,7 @@ export class PiTranscriptProjection {
             return [];
         const baseId = this.#messageBlockId(message, fallbackIndex, status, occurrence);
         if (message.role === "user") {
+            const presentation = userPresentation(message.content);
             return [{
                     id: baseId,
                     kind: "user",
@@ -129,6 +163,7 @@ export class PiTranscriptProjection {
                     revision: this.nextRevision(baseId),
                     title: "User",
                     text: textFromContent(message.content),
+                    ...(presentation === undefined ? {} : { userPresentation: presentation }),
                     imageReferences: this.imageReferences(message.content, "user"),
                     payload: {
                         role: "user",

package/dist/integrations/pi/startup-public.manifest.json

@@ -16,6 +16,8 @@
     "dist/integrations/pi/components/upstream/adjacent/core/keybindings.js",
     "dist/integrations/pi/components/upstream/components/earendil-announcement.js",
     "dist/integrations/pi/components/upstream/components/extension-editor.js",
+    "dist/integrations/pi/components/upstream/components/extension-input.js",
+    "dist/integrations/pi/components/upstream/components/extension-selector.js",
     "dist/integrations/pi/components/upstream/components/scoped-models-selector.js",
     "dist/integrations/pi/components/upstream/components/session-selector.js",
     "dist/integrations/pi/components/upstream/components/status-indicator.js",

package/dist/native/darwin-arm64/manifest.json

@@ -5,7 +5,7 @@
   "platform": "darwin",
   "architecture": "arm64",
   "capability": "supported",
-  "builtAt": "2026-09-22T17:55:39.177Z",
+  "builtAt": "2026-09-22T23:31:15.773Z",
   "artifact": {
     "filename": "process-guardian",
     "sha256": "9db1726bbe3fc2e8292f2ead1e7e9d0fd4d7d0dc9217b372582bf354b0f565dc",

package/dist/native/linux-x64/manifest.json

@@ -5,7 +5,7 @@
   "platform": "linux",
   "architecture": "x64",
   "capability": "supported",
-  "builtAt": "2026-09-22T17:55:47.994Z",
+  "builtAt": "2026-09-22T23:30:53.377Z",
   "artifact": {
     "filename": "process-guardian",
     "sha256": "d8cda6b0c7cb36c0cc41e90802aceebf6c02eaebbc08a83d7d963d2e918dbd7a",

package/dist/native/win32-x64/manifest.json

@@ -5,10 +5,10 @@
   "platform": "win32",
   "architecture": "x64",
   "capability": "supported",
-  "builtAt": "2026-09-22T17:56:18.215Z",
+  "builtAt": "2026-09-22T23:31:43.770Z",
   "artifact": {
     "filename": "process-guardian.exe",
-    "sha256": "50626418cdc7a539611dca682b0adc3a806f7aa93930007c96244f2a9aac156e",
+    "sha256": "57ed4829927f81b1cb638ffafa7a5b3832537284aa343c0eb0ef70592ed671d3",
     "size": 177664
   },
   "provenance": {