@mrclrchtr/supi-prompt-suggestions 6.2.0 → 6.4.0

package/node_modules/@mrclrchtr/supi-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "6.2.0",
+  "version": "6.4.0",
   "description": "Shared settings, configuration, reporting, and session infrastructure",
   "license": "MIT",
   "repository": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-prompt-suggestions",
-  "version": "6.2.0",
+  "version": "6.4.0",
   "description": "Optional model-powered ghost-text prompt suggestions",
   "license": "MIT",
   "repository": {
@@ -48,7 +48,7 @@
     "video": "https://raw.githubusercontent.com/mrclrchtr/supi/main/packages/supi-prompt-suggestions/assets/demo.mp4"
   },
   "dependencies": {
-    "@mrclrchtr/supi-core": "6.2.0"
+    "@mrclrchtr/supi-core": "6.4.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-core"

package/src/editor/editor.ts

@@ -43,7 +43,11 @@ export class GhostTextEditor extends CustomEditor {
     options: GhostTextEditorOptions,
   ) {
     const { callbacks, ...editorOptions } = options;
-    super(tui, theme, keybindings, editorOptions);
+    const customEditorOptions = {
+      ...editorOptions,
+      embedWorkingStatus: true,
+    };
+    super(tui, theme, keybindings, customEditorOptions);
     this.callbacks = callbacks;
   }
 

package/src/extension.ts

@@ -20,7 +20,7 @@ export default function (pi: ExtensionAPI): void {
   const session = new SessionLifecycle(generator);
 
   pi.on("session_start", (_event, ctx) => session.onStart(ctx));
-  pi.on("agent_end", (event, ctx) => session.onAgentEnd(event, ctx));
+  pi.on("agent_settled", (_event, ctx) => session.onAgentSettled(ctx));
   pi.on("agent_start", () => session.onAgentStart());
   pi.on("session_shutdown", () => session.onShutdown());
 }

package/src/session.ts

@@ -7,7 +7,7 @@
  * @module
  */
 
-import type { AgentEndEvent, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { StatusSpinner } from "@mrclrchtr/supi-core/api";
 import { type GhostTextCallbacks, GhostTextEditor } from "./editor/editor.ts";
 import type { GenerationStatus, SuggestionGenerator } from "./generation/generator.ts";
@@ -26,6 +26,11 @@ interface SessionMessageEntry {
   };
 }
 
+type SessionBranchEntry = {
+  type: string;
+  message?: SessionMessageEntry["message"];
+};
+
 // ── SessionLifecycle ───────────────────────────────────────────────────────
 
 /**
@@ -55,11 +60,11 @@ export class SessionLifecycle {
     this.installEditor(ctx);
   }
 
-  /** Extract the last assistant message and fire suggestion generation. */
-  onAgentEnd(event: AgentEndEvent, ctx: ExtensionContext): void {
+  /** Extract the last settled assistant message and fire suggestion generation. */
+  onAgentSettled(ctx: ExtensionContext): void {
     if (ctx.mode !== "tui") return;
 
-    const lastAssistant = extractLastAssistantText(event);
+    const lastAssistant = extractLastAssistantText(ctx.sessionManager.getBranch());
     if (!lastAssistant) {
       this.statusSpinner?.stop();
       this.generationInFlight = false;
@@ -181,10 +186,12 @@ export class SessionLifecycle {
 
 // ── Free helpers ───────────────────────────────────────────────────────────
 
-function extractLastAssistantText(event: AgentEndEvent): string | null {
-  const messages = event.messages;
-  for (let i = messages.length - 1; i >= 0; i--) {
-    const msg = messages[i];
+function extractLastAssistantText(entries: readonly SessionBranchEntry[]): string | null {
+  for (let i = entries.length - 1; i >= 0; i--) {
+    const entry = entries[i];
+    if (entry?.type !== "message") continue;
+
+    const msg = entry.message;
     if (msg?.role === "assistant") {
       if (msg.stopReason !== "stop") return null;
       const textContent = extractTextContent(msg.content).trim();