@timurproko/a1 0.1.7 → 0.1.8-dev.0b6d8cc

package/dist/src/foundation/pi-engine-adapter/adapter.js

@@ -11,6 +11,12 @@ import { createPiRuntimeIntegration } from "./runtime-integration.js";
 import { PiSessionCommandIntegration } from "./session-integration.js";
 import { PiSettingsIntegration } from "./settings-integration.js";
 const execFileAsync = promisify(execFile);
+/**
+ * Engine events delivered before the queue hands the event loop a turn. Small enough
+ * that a streaming burst never holds input, large enough that an ordinary turn is one
+ * batch.
+ */
+const EVENT_DELIVERY_BATCH = 16;
 const DEFAULT_SURFACE = {
     columns: 100,
     rows: 32,
@@ -53,6 +59,8 @@ export class PiEngineAdapter {
     #activeCommandIds = [];
     #completedCommands = new Map();
     #transcript = [];
+    #transcriptIndex = new Map();
+    #transcriptSnapshot;
     #messageBlockIds = new WeakMap();
     #messageFallbackIds = new Map();
     #toolBlockIds = new Map();
@@ -61,6 +69,8 @@ export class PiEngineAdapter {
     #eventQueue = [];
     #eventQueueProcessing;
     #droppedEventCount = 0;
+    #agentRunActive = false;
+    #statusKind = null;
     #sessionCommands;
     #gitBranch = null;
     #extensionUi;
@@ -143,7 +153,7 @@ export class PiEngineAdapter {
         if (this.#disposed || updates.length === 0)
             return;
         const packages = updates.map(name => `- ${name}`).join("\n");
-        this.#addDiagnostic("info", "package-updates", `Package updates are available. Run pi update --extensions\nPackages:\n${packages}`, true);
+        this.#addDiagnostic("info", "package-updates", `Package updates are available. Run ${PRODUCT_IDENTITY.commandName} pi update --extensions\nPackages:\n${packages}`, true);
         this.#emitView();
     }
     onEvent(listener) {
@@ -278,6 +288,7 @@ export class PiEngineAdapter {
                     id: `extension-${resources.length}`,
                     sourcePath: extension.path,
                     resolvedPath: extension.resolvedPath,
+                    sourceInfo: extensionSourceSummary(extension.sourceInfo),
                     loaded: true,
                     hidden: extension.hidden === true,
                     diagnostic: null,
@@ -373,9 +384,10 @@ export class PiEngineAdapter {
         }
         const extensionCommands = this.#session?.extensionRunner?.getRegisteredCommands?.();
         if (Array.isArray(extensionCommands)) {
-            for (const command of extensionCommands.filter(isRecord)) {
-                const name = stringProperty(command, "name");
-                if (!name || usedNames.has(name))
+            const registered = extensionCommands.filter(isRecord);
+            for (const command of registered) {
+                const name = stringProperty(command, "invocationName") ?? stringProperty(command, "name");
+                if (!name || usedNames.has(name) || isPiPrefixedCompatibilityAlias(command, registered))
                     continue;
                 commands.push({ name, description: stringProperty(command, "description") ?? "Extension command", source: "extension" });
                 usedNames.add(name);
@@ -724,7 +736,7 @@ export class PiEngineAdapter {
             sessionId: this.#sessionId,
             revision: this.#viewRevision,
             lifecycle: this.#lifecycle,
-            transcript: this.#transcript.map(block => ({ ...block })),
+            transcript: this.#transcriptSnapshot ??= Object.freeze([...this.#transcript]),
             editor: { ...this.#editor, queuedSubmissions: [...this.#editor.queuedSubmissions] },
             status: {
                 ...this.#status,
@@ -1350,6 +1362,8 @@ export class PiEngineAdapter {
             submitEnabled: true,
         };
         this.#status = { ...this.#status, workingMessage: null, badges: [] };
+        this.#statusKind = null;
+        this.#agentRunActive = false;
         this.#activeModel = readModel(session.model);
         this.#reconcileActiveModelAvailability();
         this.#thinkingLevel = readThinkingLevel(session.thinkingLevel);
@@ -1402,15 +1416,61 @@ export class PiEngineAdapter {
             this.#emitView();
         }
     }
+    /**
+     * Replaces the transcript and the index that finds a block by its identifier. Every
+     * lookup goes through the index, so streaming a chunk costs the same in a long session
+     * as in a new one.
+     */
+    #setTranscript(blocks) {
+        this.#transcript = blocks;
+        this.#transcriptIndex.clear();
+        for (const [index, block] of blocks.entries())
+            this.#transcriptIndex.set(block.id, index);
+        this.#transcriptSnapshot = undefined;
+    }
+    #transcriptBlock(id) {
+        const index = this.#transcriptIndex.get(id);
+        return index === undefined ? undefined : this.#transcript[index];
+    }
+    /** Shows the state named by `kind`, which becomes the state a later end can clear. */
+    #enterWorkState(kind, message) {
+        const wasBusy = this.#lifecycle === "busy";
+        this.#statusKind = kind;
+        this.#lifecycle = "busy";
+        this.#status = { ...this.#status, workingMessage: message };
+        if (!wasBusy)
+            this.#emitEvent({ type: "session-lifecycle", lifecycle: "busy", reason: null });
+        this.#emitEvent({ type: "status", status: this.#status });
+    }
+    /**
+     * Ends one named state. A state the shell is not in is left alone, so a finished
+     * compaction or retry cannot clear the working state it never replaced. While the run
+     * continues, ending either of those returns to working rather than to idle.
+     */
+    #endWorkState(kind) {
+        if (this.#statusKind !== kind)
+            return;
+        if (this.#agentRunActive) {
+            this.#enterWorkState("working", "Working...");
+            return;
+        }
+        this.#leaveWorkStates();
+    }
+    /** Leaves every work state and reports the session idle. */
+    #leaveWorkStates() {
+        this.#statusKind = null;
+        this.#lifecycle = "ready";
+        this.#status = { ...this.#status, workingMessage: null };
+        this.#emitEvent({ type: "session-lifecycle", lifecycle: "ready", reason: null });
+        this.#emitEvent({ type: "status", status: this.#status });
+    }
     #handlePiEvent(event) {
         if (!isRecord(event) || typeof event.type !== "string")
             return;
         switch (event.type) {
             case "agent_start":
-                this.#lifecycle = "busy";
-                this.#status = { ...this.#status, workingMessage: "Working..." };
-                this.#emitEvent({ type: "session-lifecycle", lifecycle: "busy", reason: null });
-                this.#emitEvent({ type: "status", status: this.#status });
+                this.#agentRunActive = true;
+                this.#enterWorkState("working", "Working...");
                 return;
             case "message_start":
                 this.#upsertMessageBlock(event.message, "live");
@@ -1452,11 +1512,18 @@ export class PiEngineAdapter {
                 if (finalMessages.length > 0)
                     this.#rebuildTranscript(finalMessages, "finalized");
                 else
-                    this.#transcript = this.#transcript.map(block => block.status === "live" ? { ...block, status: "finalized" } : block);
-                this.#lifecycle = "ready";
-                this.#status = { ...this.#status, workingMessage: null };
-                this.#emitEvent({ type: "session-lifecycle", lifecycle: "ready", reason: null });
-                this.#emitEvent({ type: "status", status: this.#status });
+                    this.#setTranscript(this.#transcript.map(block => block.status === "live" ? { ...block, status: "finalized" } : block));
+                // Ending a turn leaves the working state, as the recorded pinned baseline does, but
+                // it leaves only that state: a compaction or retry being shown outlives the turn
+                // that ended under it. Settlement ends the run, and with it every state — the
+                // engine ends a turn for each continuation it makes and settles once.
+                if (event.type === "agent_settled") {
+                    this.#agentRunActive = false;
+                    this.#leaveWorkStates();
+                }
+                else if (this.#statusKind === null || this.#statusKind === "working") {
+                    this.#leaveWorkStates();
+                }
                 this.#emitView();
                 return;
             }
@@ -1472,20 +1539,16 @@ export class PiEngineAdapter {
                 return;
             }
             case "auto_retry_start":
-                this.#lifecycle = "busy";
-                this.#status = { ...this.#status, workingMessage: "Retrying…" };
-                this.#emitEvent({ type: "status", status: this.#status });
+                this.#enterWorkState("retry", "Retrying…");
                 return;
             case "auto_retry_end":
-            case "compaction_end":
-                this.#lifecycle = "ready";
-                this.#status = { ...this.#status, workingMessage: null };
-                this.#emitEvent({ type: "status", status: this.#status });
+                this.#endWorkState("retry");
                 return;
             case "compaction_start":
-                this.#lifecycle = "busy";
-                this.#status = { ...this.#status, workingMessage: "Compacting…" };
-                this.#emitEvent({ type: "status", status: this.#status });
+                this.#enterWorkState("compaction", "Compacting…");
+                return;
+            case "compaction_end":
+                this.#endWorkState("compaction");
                 return;
             case "thinking_level_changed":
                 this.#thinkingLevel = readThinkingLevel(event.level);
@@ -1575,7 +1638,7 @@ export class PiEngineAdapter {
                 }
             }
         }
-        this.#transcript = blocks;
+        this.#setTranscript(blocks);
     }
     #upsertMessageBlock(message, status) {
         const blocks = this.#messageBlocks(message, status, this.#transcript.length);
@@ -1660,7 +1723,7 @@ export class PiEngineAdapter {
                 : this.#toolBlockIds.get(toolCallId) ?? `tool-${toolCallId}`;
             if (toolCallId !== undefined)
                 this.#toolBlockIds.set(toolCallId, blockId);
-            const existing = this.#transcript.find(block => block.id === blockId);
+            const existing = this.#transcriptBlock(blockId);
             const existingPayload = isRecord(existing?.payload) ? existing.payload : undefined;
             return [{
                     id: blockId,
@@ -1751,11 +1814,14 @@ export class PiEngineAdapter {
         });
     }
     #upsertTranscriptBlock(block) {
-        const index = this.#transcript.findIndex(existing => existing.id === block.id);
-        if (index >= 0)
+        const index = this.#transcriptIndex.get(block.id);
+        if (index !== undefined)
             this.#transcript[index] = block;
-        else
+        else {
+            this.#transcriptIndex.set(block.id, this.#transcript.length);
             this.#transcript.push(block);
+        }
+        this.#transcriptSnapshot = undefined;
         this.#emitEvent({ type: "transcript-block", block });
     }
     #messageBlockId(message, fallbackIndex, status, occurrence) {
@@ -1773,7 +1839,7 @@ export class PiEngineAdapter {
             }
         }
         else {
-            id = [...cached].reverse().find(candidate => this.#transcript.some(block => block.id === candidate && block.status === "live"));
+            id = [...cached].reverse().find(candidate => this.#transcriptBlock(candidate)?.status === "live");
             if (id === undefined && status === "finalized")
                 id = cached.at(-1);
             if (id === undefined) {
@@ -1786,7 +1852,7 @@ export class PiEngineAdapter {
         return id;
     }
     #nextBlockRevision(id) {
-        const existing = this.#transcript.find(block => block.id === id);
+        const existing = this.#transcriptBlock(id);
         if (existing)
             return existing.revision + 1;
         this.#nextBlockSequence += 1;
@@ -1847,6 +1913,7 @@ export class PiEngineAdapter {
     }
     async #processEventQueue() {
         try {
+            let deliveredSinceYield = 0;
             while (this.#eventQueue.length > 0) {
                 const event = this.#eventQueue.shift();
                 if (!event)
@@ -1859,6 +1926,14 @@ export class PiEngineAdapter {
                         this.#recordDiagnostic("warning", "event-listener", error instanceof Error ? error.message : String(error), true);
                     }
                 }
+                deliveredSinceYield += 1;
+                // A microtask chain runs to exhaustion before the loop turns, so a streaming
+                // burst would hold typed input, pointer reports, and timed indicators until it
+                // drained. Yielding on a macrotask hands those their turn between batches.
+                if (deliveredSinceYield >= EVENT_DELIVERY_BATCH && this.#eventQueue.length > 0) {
+                    deliveredSinceYield = 0;
+                    await new Promise(resolve => { setImmediate(resolve); });
+                }
             }
         }
         finally {
@@ -2245,11 +2320,26 @@ function extensionResourceDiagnostic(index, sourcePath, diagnostic) {
         id: `extension-diagnostic-${index}`,
         sourcePath,
         resolvedPath: null,
+        sourceInfo: null,
         loaded: false,
         hidden: false,
         diagnostic,
     };
 }
+function extensionSourceSummary(value) {
+    if (!isRecord(value))
+        return null;
+    const source = stringProperty(value, "source");
+    const scope = value.scope;
+    const origin = value.origin;
+    const baseDir = value.baseDir;
+    if (!source
+        || (scope !== "user" && scope !== "project" && scope !== "temporary")
+        || (origin !== "package" && origin !== "top-level")
+        || (baseDir !== undefined && typeof baseDir !== "string"))
+        return null;
+    return { source, scope, origin, baseDir: baseDir ?? null };
+}
 function collectionResult(value, key) {
     if (!isRecord(value))
         return { values: [], diagnostics: [] };
@@ -2274,6 +2364,26 @@ function stringProperty(value, key) {
     const item = value[key];
     return typeof item === "string" && item.length > 0 ? item : undefined;
 }
+/**
+ * Some ecosystem extensions retain a `pi-<name>` slash-command alias beside
+ * their unprefixed command. A1 presents the product-neutral command once while
+ * leaving Pi's runner free to accept the compatibility alias when typed.
+ */
+function isPiPrefixedCompatibilityAlias(command, commands) {
+    const name = stringProperty(command, "name");
+    if (!name?.startsWith("pi-") || name.length === 3)
+        return false;
+    const canonicalName = name.slice(3);
+    const description = stringProperty(command, "description");
+    const sourcePath = extensionCommandSourcePath(command);
+    return commands.some(candidate => candidate !== command
+        && stringProperty(candidate, "name") === canonicalName
+        && stringProperty(candidate, "description") === description
+        && extensionCommandSourcePath(candidate) === sourcePath);
+}
+function extensionCommandSourcePath(command) {
+    return isRecord(command) ? stringProperty(command.sourceInfo, "path") : undefined;
+}
 function compactResourceLabel(path) {
     const segments = path.replaceAll("\\", "/").split("/").filter(Boolean);
     return segments.at(-1) ?? path;