@timurproko/a1 0.2.7-dev.1255 → 0.2.7-dev.1265

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

@@ -5,7 +5,8 @@ import type { PiProjectTrustPreflightPrompt } from "./project-trust-preflight.js
 import type { PiSessionForkPrompt, PiSessionSelection } from "./session-selection.js";
 import type { OwnedUiDiagnostics } from "../../../contracts/owned-ui/index.js";
 import type { PiSessionResumeMetadata, PiWorkflowHost } from "./workflows.js";
-import { type PiPullRequestIdentity, type PiPullRequestProbe } from "./repository-pr.js";
+import type { PiPullRequestProbe } from "./repository-pr.js";
+import { RepositoryMetadataPoller, type PiRepositoryContextReader } from "./repository-metadata.js";
 export interface PiEngineRuntimeFactoryInput {
     readonly cwd: string;
     readonly agentDir: string;
@@ -20,12 +21,7 @@ export interface PiEngineRuntimeFactoryInput {
 }
 export type PiEngineRuntimeFactory = (input: PiEngineRuntimeFactoryInput) => Promise<AgentSessionRuntime>;
 export type PiEnginePackageUpdateProbe = (settingsManager: AgentSessionServices["settingsManager"]) => Promise<readonly string[]>;
-interface PiRepositoryContextSelection {
-    readonly cwd: string;
-    readonly branch: string;
-}
-export type PiRepositoryContextReader = (sessionId: string, sessionFile: string, signal: AbortSignal) => Promise<PiRepositoryContextSelection | null>;
-type PiGitBranchReader = (cwd: string, signal: AbortSignal) => Promise<string | null>;
+export type { PiRepositoryContextReader } from "./repository-metadata.js";
 interface PiEngineRuntimeOptions {
     readonly cwd: string;
     readonly agentDir: string;
@@ -43,7 +39,7 @@ interface PiEngineRuntimeOptions {
     readonly pullRequestRefreshMs?: number;
     readonly repositoryContextPollMs?: number;
     readonly repositoryContextReader?: PiRepositoryContextReader;
-    readonly gitBranchReader?: PiGitBranchReader;
+    readonly gitBranchReader?: (cwd: string, signal: AbortSignal) => Promise<string | null>;
     readonly host: PiWorkflowHost;
 }
 export interface PiEngineRuntimePorts {
@@ -74,9 +70,8 @@ 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;
+    /** The branch and pull request polled for the bound session. */
+    get repository(): RepositoryMetadataPoller;
     get sessionCommands(): PiSessionCommandIntegration | undefined;
     get started(): boolean;
     /** Create the runtime and bind its first session; startup failures propagate. */
@@ -106,4 +101,3 @@ export declare class PiEngineRuntime {
      */
     announceChangelog(): Promise<void>;
 }
-export {};

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

@@ -1,17 +1,10 @@
-import { execFile } from "node:child_process";
 import { existsSync } from "node:fs";
-import { promisify } from "node:util";
 import { PRODUCT_IDENTITY } from "../../../product-identity.js";
 import { observeCompactionProgress } from "./compaction-progress.js";
 import { createPiRuntimeIntegration } from "./runtime-integration.js";
 import { PiSessionCommandIntegration } from "./session-integration.js";
 import { DefaultPackageManager, VERSION } from "../startup-public.js";
-import { readPullRequest, } 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;
+import { RepositoryMetadataPoller } from "./repository-metadata.js";
 /**
  * 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
@@ -26,11 +19,6 @@ export class PiEngineRuntime {
     #ports;
     #runtimeFactory;
     #checkPackageUpdates;
-    #pullRequestProbe;
-    #pullRequestRefreshMs;
-    #repositoryContextPollMs;
-    #repositoryContextReader;
-    #gitBranchReader;
     #cwd;
     #runtime;
     #session;
@@ -39,31 +27,27 @@ export class PiEngineRuntime {
     #sessionBindingGeneration = 0;
     #sessionCommands;
     #compactionProgress = null;
-    #repositoryCwd;
-    #gitBranch = null;
-    #pullRequest = null;
-    #repositoryRefreshTimer;
-    #repositoryRefreshAbort;
-    #repositoryRefreshTask;
-    #repositoryRefreshPending = false;
-    #lastPullRequestProbeAt = null;
-    #repositoryRefreshEnabled = false;
+    #repository;
     #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
                 ? async () => []
                 : settingsManager => checkDefaultPiPackageUpdates(this.#cwd, options.agentDir, settingsManager));
-        this.#pullRequestProbe = options.pullRequestProbe ?? readPullRequest;
-        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;
+        this.#repository = new RepositoryMetadataPoller(options, {
+            bindingGeneration: () => this.#sessionBindingGeneration,
+            sessionIdentity: () => {
+                const manager = this.#session?.sessionManager;
+                return { sessionId: manager?.getSessionId?.(), sessionFile: manager?.getSessionFile?.() };
+            },
+            fallbackCwd: () => this.#cwd,
+            disposed: () => this.#disposed || this.#ports.disposed(),
+            changed: () => this.#ports.emitView(),
+        });
     }
     get runtime() {
         return this.#runtime;
@@ -82,14 +66,9 @@ export class PiEngineRuntime {
     get cwd() {
         return this.#runtime?.cwd ?? this.#cwd;
     }
-    get repositoryCwd() {
-        return this.#repositoryCwd;
-    }
-    get gitBranch() {
-        return this.#gitBranch;
-    }
-    get pullRequest() {
-        return this.#pullRequest;
+    /** The branch and pull request polled for the bound session. */
+    get repository() {
+        return this.#repository;
     }
     get sessionCommands() {
         return this.#sessionCommands;
@@ -112,7 +91,7 @@ export class PiEngineRuntime {
         });
         this.#runtime = runtime;
         this.#cwd = runtime.cwd ?? this.#cwd;
-        this.#repositoryCwd = this.#cwd;
+        this.#repository.reset();
         this.#ports.started(runtime);
         runtime.setRebindSession(async (session) => {
             if (this.#ports.rebindBlocked())
@@ -127,8 +106,7 @@ export class PiEngineRuntime {
             this.#ports.diagnostic(diagnostic.type === "error" ? "error" : diagnostic.type === "warning" ? "warning" : "info", code, diagnostic.message, diagnostic.type !== "error");
         }
         this.bindSession(runtime.session);
-        this.#repositoryRefreshEnabled = true;
-        this.#startRepositoryRefresh();
+        this.#repository.start();
         return runtime;
     }
     /**
@@ -186,10 +164,9 @@ 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.#repository.reset();
         this.#ports.sessionReplaced(session);
-        if (this.#repositoryRefreshEnabled)
-            this.#startRepositoryRefresh();
+        this.#repository.refresh();
     }
     /** Stop forwarding the current session's events and open a new generation; overload recovery resumes or abandons it. */
     suspend() {
@@ -235,127 +212,14 @@ export class PiEngineRuntime {
     /** Unsubscribe, stop observing compaction, and dispose the runtime; the session reference is kept for final reads. */
     async dispose() {
         this.#disposed = true;
-        this.#repositoryRefreshEnabled = false;
-        if (this.#repositoryRefreshTimer !== undefined)
-            clearTimeout(this.#repositoryRefreshTimer);
-        this.#repositoryRefreshTimer = undefined;
-        this.#repositoryRefreshPending = false;
-        this.#repositoryRefreshAbort?.abort();
-        const repositoryRefreshTask = this.#repositoryRefreshTask;
+        const repository = this.#repository.dispose();
         this.#unsubscribe?.();
         this.#unsubscribe = undefined;
         this.#compactionProgress?.dispose();
         this.#compactionProgress = null;
-        await repositoryRefreshTask;
+        await repository;
         await this.#runtime?.dispose();
     }
-    #startRepositoryRefresh() {
-        if (!this.#repositoryRefreshEnabled || this.#disposed || this.#ports.disposed())
-            return;
-        if (this.#repositoryRefreshTask !== undefined) {
-            this.#repositoryRefreshPending = true;
-            return;
-        }
-        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);
-    }
-    #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();
-        const generation = this.#sessionBindingGeneration;
-        this.#repositoryRefreshAbort = controller;
-        let associatedContext = null;
-        const manager = this.#session?.sessionManager;
-        const sessionId = manager?.getSessionId?.();
-        const sessionFile = manager?.getSessionFile?.();
-        try {
-            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 {
-            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.#repositoryRefreshAbort === controller)
-                this.#repositoryRefreshAbort = undefined;
-        }
-        if (controller.signal.aborted || generation !== this.#sessionBindingGeneration || this.#disposed || this.#ports.disposed())
-            return;
-        this.#repositoryRefreshTimer = setTimeout(() => {
-            this.#repositoryRefreshTimer = undefined;
-            this.#startRepositoryRefresh();
-        }, this.#repositoryContextPollMs);
-        this.#repositoryRefreshTimer.unref?.();
-    }
     #attachCompactionProgress(session) {
         this.#compactionProgress?.dispose();
         this.#compactionProgress = observeCompactionProgress(session, percent => {
@@ -419,24 +283,3 @@ async function checkDefaultPiPackageUpdates(cwd, agentDir, settingsManager) {
     const updates = await packageManager.checkForAvailableUpdates();
     return updates.map(update => update.displayName);
 }
-function samePullRequest(left, right) {
-    return left?.number === right?.number && left?.url === right?.url;
-}
-async function readGitBranch(cwd, signal) {
-    if (!existsSync(cwd))
-        return null;
-    try {
-        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",
-        });
-        return stdout.trim() || null;
-    }
-    catch {
-        return null;
-    }
-}

package/dist/integrations/pi/engine/view-state.d.ts

@@ -1,5 +1,13 @@
-import { EngineDiagnostics } from "./diagnostics-state.js";
-import type { OwnedUiDiagnostics, OwnedUiEditorState, OwnedUiModelInfo, OwnedUiSessionViewModel, OwnedUiStatusView, OwnedUiTerminalSurface, OwnedUiThinkingLevel, OwnedUiUsageView } from "../../../contracts/owned-ui/index.js";
+import type { PiEngineRuntime } from "./session-runtime.js";
+import type { OwnedUiDiagnostics, OwnedUiEditorState, OwnedUiModelInfo, OwnedUiSessionViewModel, OwnedUiStatusView, OwnedUiTerminalSurface, OwnedUiThinkingLevel, OwnedUiTranscriptBlock, OwnedUiUsageView } from "../../../contracts/owned-ui/index.js";
+/** Bounded structured notices; acknowledgements never inspect terminal cells or touch Agent work. */
+declare class EngineDiagnostics {
+    #private;
+    get values(): readonly OwnedUiDiagnostics[];
+    get messages(): readonly string[];
+    record(severity: OwnedUiDiagnostics["severity"], code: string, message: string, recoverable: boolean): OwnedUiDiagnostics;
+    clearCodes(codes: readonly string[]): boolean;
+}
 /**
  * The engine adapter's own view-model state: lifecycle, editor, status, terminal surface, active
  * model, thinking level, the usage cache, diagnostics, and the view revision. Every change that
@@ -41,3 +49,14 @@ export declare class EngineViewState {
     /** Delivery overload ended the run: ready when it can resume, stopped once disposed, otherwise failed. */
     settleOverload(canResume: boolean, disposed: boolean): void;
 }
+/** What the session view is projected from: the adapter's view state, the bound engine, the transcript and the running commands. */
+export interface PiSessionViewSource {
+    readonly sessionId: string;
+    readonly state: EngineViewState;
+    readonly engine: PiEngineRuntime;
+    readonly transcript: readonly OwnedUiTranscriptBlock[];
+    readonly activeCommandIds: readonly string[];
+}
+/** The owned UI session view model, copied so a published view never aliases adapter state. */
+export declare function projectSessionView({ sessionId, state, engine, transcript, activeCommandIds }: PiSessionViewSource): OwnedUiSessionViewModel;
+export {};

package/dist/integrations/pi/engine/view-state.js

@@ -1,4 +1,38 @@
-import { EngineDiagnostics } from "./diagnostics-state.js";
+import { finiteNumber, isRecord, readModel, readThinkingLevel } from "./message-values.js";
+/** Bounded structured notices; acknowledgements never inspect terminal cells or touch Agent work. */
+class EngineDiagnostics {
+    #values = [];
+    #messages = [];
+    #sequence = 0;
+    get values() { return this.#values; }
+    get messages() { return this.#messages; }
+    record(severity, code, message, recoverable) {
+        const diagnostic = { sequence: this.#sequence++, code, severity, message, recoverable };
+        this.#values.push(diagnostic);
+        if (this.#values.length > 100)
+            this.#values.shift();
+        this.#messages = [...this.#messages, message].slice(-8);
+        return diagnostic;
+    }
+    clearCodes(codes) {
+        const selected = new Set(codes);
+        return this.#remove(diagnostic => selected.has(diagnostic.code));
+    }
+    #remove(predicate) {
+        const removed = new Set();
+        for (let index = this.#values.length - 1; index >= 0; index--) {
+            const diagnostic = this.#values[index];
+            if (predicate(diagnostic)) {
+                removed.add(diagnostic.message);
+                this.#values.splice(index, 1);
+            }
+        }
+        if (removed.size === 0)
+            return false;
+        this.#messages = this.#messages.filter(message => !removed.has(message) || this.#values.some(diagnostic => diagnostic.message === message));
+        return true;
+    }
+}
 const DEFAULT_SURFACE = {
     columns: 100,
     rows: 32,
@@ -112,3 +146,97 @@ export class EngineViewState {
         this.#revision += 1;
     }
 }
+/** Token, cost, cache, and context usage summed from the session's entries for the status footer. */
+function readUsageView(session, runtime, activeModel) {
+    let input = 0;
+    let output = 0;
+    let cacheRead = 0;
+    let cacheWrite = 0;
+    let cost = 0;
+    let latestCacheHitRate = null;
+    let latestPrompt = null;
+    const entries = session?.sessionManager?.getEntries?.()
+        ?? (session?.messages ?? []).map(message => ({ type: "message", message }));
+    for (const entry of entries) {
+        if (!isRecord(entry))
+            continue;
+        const message = entry.type === "message" && isRecord(entry.message) ? entry.message : undefined;
+        const usage = message !== undefined && isRecord(message.usage)
+            ? message.usage
+            : (entry.type === "usage" || entry.type === "branch_summary" || entry.type === "compaction") && isRecord(entry.usage) ? entry.usage : undefined;
+        if (usage === undefined)
+            continue;
+        input += finiteNumber(usage.input);
+        output += finiteNumber(usage.output);
+        cacheRead += finiteNumber(usage.cacheRead);
+        cacheWrite += finiteNumber(usage.cacheWrite);
+        cost += isRecord(usage.cost) ? finiteNumber(usage.cost.total) : 0;
+        if (message?.role === "assistant") {
+            latestPrompt = {
+                input: finiteNumber(usage.input),
+                cacheRead: finiteNumber(usage.cacheRead),
+                cacheWrite: finiteNumber(usage.cacheWrite),
+            };
+            const promptTokens = latestPrompt.input + latestPrompt.cacheRead + latestPrompt.cacheWrite;
+            latestCacheHitRate = promptTokens > 0 ? (latestPrompt.cacheRead / promptTokens) * 100 : null;
+        }
+    }
+    const context = session?.getContextUsage?.();
+    const providerId = activeModel?.providerId;
+    const usingSubscription = providerId === "kimi-coding"
+        || (providerId !== undefined && runtime?.services.modelRuntime.isUsingSubscription?.(providerId) === true);
+    return {
+        input,
+        output,
+        cacheRead,
+        cacheWrite,
+        cost,
+        latestCacheHitRate,
+        latestPrompt,
+        contextAvailable: context !== undefined,
+        contextTokens: context?.tokens ?? null,
+        contextWindow: context?.contextWindow ?? 0,
+        contextPercent: context?.percent ?? null,
+        usingSubscription,
+        autoCompactEnabled: runtime?.services.settingsManager?.getCompactionEnabled?.() ?? true,
+    };
+}
+/** The owned UI session view model, copied so a published view never aliases adapter state. */
+export function projectSessionView({ sessionId, state, engine, transcript, activeCommandIds }) {
+    const routed = engine.session?.routedModel;
+    const routedModel = routed === undefined ? null : readModel(routed.model);
+    return {
+        contractVersion: 1,
+        sessionId,
+        revision: state.revision,
+        lifecycle: state.lifecycle,
+        transcript,
+        editor: { ...state.editor, queuedSubmissions: [...state.editor.queuedSubmissions] },
+        status: {
+            ...state.status,
+            diagnostics: [...state.status.diagnostics],
+            badges: [...state.status.badges],
+            usage: state.usage(() => readUsageView(engine.session, engine.runtime, state.activeModel)),
+            footer: {
+                branch: engine.repository.branch,
+                repositoryPath: engine.repository.cwd,
+                pullRequest: engine.repository.pullRequest,
+                sessionName: engine.session?.sessionManager?.getSessionName() ?? null,
+                availableProviderCount: new Set(engine.runtime?.services.modelRuntime.getAvailableSnapshot?.().map(model => model.provider).filter(provider => provider !== undefined) ?? []).size,
+                extensionStatuses: [],
+            },
+        },
+        terminal: { ...state.terminal },
+        activeModel: state.activeModel === null ? null : { ...state.activeModel },
+        routedModel: routedModel === null ? null : {
+            model: routedModel,
+            ...(routed?.thinkingLevel === undefined ? {} : { thinkingLevel: readThinkingLevel(routed.thinkingLevel) }),
+        },
+        thinkingLevel: state.thinkingLevel,
+        activeCommandIds: [...activeCommandIds],
+        dialog: null,
+        overlay: null,
+        customizations: [],
+        diagnostics: state.diagnostics.map(diagnostic => ({ ...diagnostic })),
+    };
+}

package/dist/integrations/pi/engine/workflow-runner.d.ts

@@ -52,7 +52,6 @@ export declare class PiWorkflowRunner {
     bindClipboardWriter(writer: (text: string) => Promise<boolean>): () => void;
     /** Workflow and tree copying share the active owner's write fence and delivery acknowledgment. */
     copyWorkflowText(text: string): Promise<boolean>;
-    abortBashWorkflow(): void;
     executeBashWorkflow(command: string, excludeFromContext: boolean): Promise<PiBashWorkflowResult>;
     reloadBlockedResult(): PiWorkflowResult | null;
     executeWorkflow(request: PiWorkflowRequest): Promise<PiWorkflowResult>;