@pontia/pi-client-plugin 0.2.1 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pontia/pi-client-plugin",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Pi extension that connects coding-agent sessions to Pontia.",
   "keywords": [
     "pi-package",
@@ -36,14 +36,14 @@
     "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": ">=0.86.1 <1",
+    "@earendil-works/pi-coding-agent": "^1.0.0",
     "@types/node": "^22.15.3",
     "oxfmt": "^0.70.0",
     "typescript": "^5.8.3",
     "vitest": "^3.1.2"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": ">=0.86.1 <1"
+    "@earendil-works/pi-coding-agent": "*"
   },
   "pi": {
     "extensions": [

package/src/context.ts

@@ -3,7 +3,7 @@ import { join } from "node:path";
 export interface TurnContext {
   sessionId: string;
   turnId?: string;
-  runtimeInstanceId: string;
+  runtimeId: string;
   input?: string;
   inboxMessageId?: string;
   clientType: "pi";

package/src/control-socket.ts

@@ -1,7 +1,7 @@
 import { createConnection, type Socket } from "node:net";
 import { isAbsolute, join } from "node:path";
 
-export const CONTROL_VERSION = 6;
+export const CONTROL_VERSION = 7;
 export const MAX_CONTROL_FRAME_BYTES = 64 * 1024;
 // Match the former HTTP event body limit, including the RPC envelope.
 export const MAX_RPC_FRAME_BYTES = 2 * 1024 * 1024 + 1024;
@@ -9,7 +9,7 @@ const REQUEST_TIMEOUT_MS = 5_000;
 
 export interface ControlIdentity {
   sessionId: string;
-  runtimeInstanceId: string;
+  runtimeId: string;
   clientSessionKey?: string;
 }
 export interface ControlInput {
@@ -392,12 +392,12 @@ export async function connectPi(
         const result = (await peer.request("runtime.attach", {
           version: CONTROL_VERSION,
           session_id: identity!.sessionId,
-          runtime_instance_id: identity!.runtimeInstanceId,
+          runtime_id: identity!.runtimeId,
           client_session_key: identity!.clientSessionKey,
         })) as Record<string, unknown>;
         if (
           result?.session_id !== identity!.sessionId ||
-          result?.runtime_instance_id !== identity!.runtimeInstanceId
+          result?.runtime_id !== identity!.runtimeId
         ) {
           throw new RpcError(-32009, "Pi reconnect identity mismatch");
         }
@@ -425,15 +425,12 @@ export async function connectPi(
       if (method === "turn.startFailure") {
         if (!identity?.clientSessionKey || stopped)
           throw new Error("Pi reporting identity is unavailable");
-        const peer = await open(true);
-        try {
-          return await peer.request(method, {
-            ...params,
-            client_session_key: identity.clientSessionKey,
-          });
-        } finally {
-          peer.close();
-        }
+        await ready();
+        if (!current || stopped) throw new Error("Pi connection is unavailable");
+        return current.request(method, {
+          ...params,
+          client_session_key: identity.clientSessionKey,
+        });
       }
       await ready();
       if (!current || stopped) return Promise.reject(new Error("Pi connection is unavailable"));

package/src/events.ts

@@ -329,7 +329,7 @@ export function buildTurnStartedEvent(
   topologyContext?: PiTopologyContext,
 ): InternalEvent {
   const data: Record<string, unknown> = {
-    runtime_instance_id: context.runtimeInstanceId,
+    runtime_id: context.runtimeId,
     input_summary:
       context.input === undefined
         ? undefined
@@ -378,7 +378,7 @@ export function buildTurnInterruptedEvent(
 
 export function buildSessionReadyEvent(context: SessionContext): InternalEvent {
   const payload: Record<string, unknown> = {
-    runtime_instance_id: context.runtimeInstanceId,
+    runtime_id: context.runtimeId,
   };
   if (context.clientSessionKey) payload.client_session_key = context.clientSessionKey;
   if (context.clientSessionFile) payload.client_session_file = context.clientSessionFile;
@@ -398,7 +398,7 @@ export function buildSessionExitedEvent(context: SessionContext, reason: string)
     type: "session.exited",
     data: {
       reason,
-      runtime_instance_id: context.runtimeInstanceId,
+      runtime_id: context.runtimeId,
     },
   };
 }

package/src/index.ts

@@ -53,7 +53,7 @@ import { isActiveRegisteredWorkspace } from "./workspace.js";
 
 interface ReporterLike {
   report(
-    context: { runtimeInstanceId: string },
+    context: { runtimeId: string },
     event: InternalEvent,
   ): Promise<EventReportResult | boolean>;
 }
@@ -205,7 +205,7 @@ export function createPontiaPiExtension(
     const result = await makeReporter(currentHookLogFile()).report(context, {
       session_id: context.sessionId,
       type: "session.model_updated",
-      data: { model: modelId(model), runtime_instance_id: context.runtimeInstanceId },
+      data: { model: modelId(model), runtime_id: context.runtimeId },
     });
     if (!reportAccepted(result)) throw new Error("Pi model observation was not accepted");
   }
@@ -361,7 +361,7 @@ export function createPontiaPiExtension(
     if (!runtimeIdentity) return undefined;
     return {
       sessionId: runtimeIdentity.sessionId,
-      runtimeInstanceId: runtimeIdentity.runtimeInstanceId,
+      runtimeId: runtimeIdentity.runtimeId,
       clientType: "pi",
     };
   }
@@ -399,7 +399,7 @@ export function createPontiaPiExtension(
         const body = await connection.request("branch.resolve", {
           inbox_message_id: inboxMessageId,
           session_id: commandContext.sessionId,
-          runtime_instance_id: commandContext.runtimeInstanceId,
+          runtime_id: commandContext.runtimeId,
           client_type: "pi",
         });
         const replay = asRecord(asRecord(body)?.branch_replay);
@@ -408,7 +408,7 @@ export function createPontiaPiExtension(
         if (
           optionalString(replay?.inbox_message_id) !== inboxMessageId ||
           optionalString(replay?.session_id) !== commandContext.sessionId ||
-          optionalString(replay?.runtime_instance_id) !== commandContext.runtimeInstanceId ||
+          optionalString(replay?.runtime_id) !== commandContext.runtimeId ||
           optionalString(replay?.client_type) !== "pi" ||
           !replacementInput ||
           !targetEntryId
@@ -452,7 +452,7 @@ export function createPontiaPiExtension(
         const current = await currentManagedSessionContext();
         if (
           current?.sessionId !== commandContext.sessionId ||
-          current?.runtimeInstanceId !== commandContext.runtimeInstanceId
+          current?.runtimeId !== commandContext.runtimeId
         ) {
           throw new Error("branch replay Runtime is no longer current");
         }
@@ -504,22 +504,16 @@ export function createPontiaPiExtension(
   }
 
   pi.on("before_agent_start", async (event) => {
-    const eventRecord = event as unknown as Record<string, unknown>;
-    pendingPrompt = optionalString(eventRecord.prompt);
-    if (reportingDisabled || !(await confirmManagedPane())) {
-      return {
-        systemPrompt: typeof eventRecord.systemPrompt === "string" ? eventRecord.systemPrompt : "",
-      };
-    }
-    const currentSystemPrompt =
-      typeof eventRecord.systemPrompt === "string" ? eventRecord.systemPrompt : "";
+    pendingPrompt = event.prompt;
+    if (reportingDisabled || !(await confirmManagedPane())) return;
     try {
       const profilePrompt = await loadProfileSystemPrompt(
         rpcConnection,
         boundSessionContext?.sessionId,
       );
-      if (!profilePrompt) return { systemPrompt: currentSystemPrompt };
-      return { systemPrompt: `${currentSystemPrompt}\n\n${profilePrompt}` };
+      if (profilePrompt) {
+        event.systemPromptOptions.sections.pontia_execution_profile = profilePrompt;
+      }
     } catch (error) {
       await logDiagnostic(currentHookLogFile(), {
         level: "warn",
@@ -527,7 +521,6 @@ export function createPontiaPiExtension(
         message: "failed to append pontia execution profile system prompt",
         details: error instanceof Error ? error.message : String(error),
       });
-      return { systemPrompt: currentSystemPrompt };
     }
   });
 
@@ -540,7 +533,13 @@ export function createPontiaPiExtension(
     if (reportingDisabled) return;
     const reason = (event as unknown as Record<string, unknown> | undefined)?.reason;
     if (readyReported && reason !== "fork" && reason !== "resume" && reason !== "new") return;
-    if (reason !== "startup" && reason !== "new" && reason !== "resume" && reason !== "fork")
+    if (
+      reason !== "startup" &&
+      reason !== "reload" &&
+      reason !== "new" &&
+      reason !== "resume" &&
+      reason !== "fork"
+    )
       return;
     await closeControlSocket();
     const parentSessionId = boundSessionContext?.sessionId;
@@ -595,7 +594,20 @@ export function createPontiaPiExtension(
           await registrationConnection(),
           sessionDetails,
         );
+        if (reason === "reload" && !existingSession) {
+          reportingDisabled = true;
+          deferredManualSessionDetails = undefined;
+          await closeControlSocket();
+          await logDiagnostic(logFile, {
+            level: "error",
+            code: "reload_session_context_missing",
+            message: "pi reload could not recover the existing pontia runtime binding",
+            details: { client_session_key: sessionDetails.clientSessionKey },
+          });
+          return;
+        }
         if (
+          reason !== "reload" &&
           existingSession &&
           ["idle", "busy", "interrupted"].includes(existingSession.sessionState)
         ) {
@@ -624,14 +636,27 @@ export function createPontiaPiExtension(
         }
 
         context = await bindSession(await registrationConnection(), env, sessionDetails, {
-          runtimeInstanceId:
-            existingSession?.sessionState === "starting"
-              ? existingSession.runtimeInstanceId
+          runtimeId:
+            reason === "reload" || existingSession?.sessionState === "starting"
+              ? existingSession?.runtimeId
               : undefined,
         });
-        if (reason === "resume" || reason === "new") readyReported = false;
+        if (
+          reason === "reload" &&
+          (context?.sessionId !== existingSession!.sessionId ||
+            context.runtimeId !== existingSession!.runtimeId)
+        ) {
+          reportingDisabled = true;
+          deferredManualSessionDetails = undefined;
+          throw new Error("pi reload runtime binding changed identity");
+        }
+        if (reason === "reload" || reason === "resume" || reason === "new") readyReported = false;
       }
       if (!context || !(await confirmManagedPane(true))) {
+        if (reason === "reload") {
+          reportingDisabled = true;
+          deferredManualSessionDetails = undefined;
+        }
         await closeControlSocket();
         return;
       }
@@ -745,7 +770,7 @@ export function createPontiaPiExtension(
       }
       const turnContext: TurnContext = {
         sessionId: boundSessionContext.sessionId,
-        runtimeInstanceId: boundSessionContext.runtimeInstanceId,
+        runtimeId: boundSessionContext.runtimeId,
         clientType: "pi",
         ...(submission ?? { input: pendingPrompt }),
       };
@@ -815,12 +840,12 @@ export function createPontiaPiExtension(
     if (isTranscriptBoundaryMessageUpdate(event)) await scheduleMessageRefresh("update");
   });
 
-  pi.on("tool_execution_start", async () => {
-    await scheduleMessageRefresh("update");
+  pi.on("tool_execution_start", async (event) => {
+    if (!event.parentToolCallId) await scheduleMessageRefresh("update");
   });
 
-  pi.on("tool_execution_end", async () => {
-    await scheduleMessageRefresh("update");
+  pi.on("tool_execution_end", async (event) => {
+    if (!event.parentToolCallId) await scheduleMessageRefresh("update");
   });
 
   pi.on("message_end", async (event, ctx) => {

package/src/live-output.ts

@@ -236,7 +236,7 @@ export class LiveOutputPublisher implements LiveOutputPublisherLike {
     return {
       session_id: this.context.sessionId,
       turn_id: this.context.turnId,
-      runtime_instance_id: this.context.runtimeInstanceId,
+      runtime_id: this.context.runtimeId,
       stream_id: this.streamId,
     };
   }

package/src/managed-runtime.ts

@@ -6,7 +6,7 @@ const execFileAsync = promisify(execFile);
 
 export interface ManagedRuntimeIdentity {
   sessionId: string;
-  runtimeInstanceId: string;
+  runtimeId: string;
 }
 
 export function hasTmuxPaneEnvironment(env: EnvLike = process.env): boolean {
@@ -43,12 +43,12 @@ export async function loadPontiaManagedRuntimeIdentity(
   const socketPath = env.TMUX!.trim().split(",", 1)[0]!.trim();
   const paneId = env.TMUX_PANE!.trim();
 
-  const [sessionId, runtimeInstanceId] = await Promise.all([
+  const [sessionId, runtimeId] = await Promise.all([
     paneOption(socketPath, paneId, "@pontia_session_id"),
-    paneOption(socketPath, paneId, "@pontia_runtime_instance_id"),
+    paneOption(socketPath, paneId, "@pontia_runtime_id"),
   ]);
-  if (!sessionId || !runtimeInstanceId) return undefined;
-  return { sessionId, runtimeInstanceId };
+  if (!sessionId || !runtimeId) return undefined;
+  return { sessionId, runtimeId };
 }
 
 export async function isPontiaManagedTmuxPane(env: EnvLike = process.env): Promise<boolean> {

package/src/reporter.ts

@@ -22,13 +22,10 @@ export class EventReporter {
     this.logFile = options.logFile;
   }
 
-  async report(
-    context: { runtimeInstanceId: string },
-    event: InternalEvent,
-  ): Promise<EventReportResult> {
+  async report(context: { runtimeId: string }, event: InternalEvent): Promise<EventReportResult> {
     try {
       const body = await this.connection.request("event.report", {
-        runtime_instance_id: context.runtimeInstanceId,
+        runtime_id: context.runtimeId,
         event,
       });
       const record =
@@ -69,7 +66,7 @@ export class EventReporter {
     event: InternalEvent,
     reason: "event_rejected" | "transport_failed" | "missing_turn_id",
   ): Promise<void> {
-    if (event.type !== "turn.started" || typeof event.data.runtime_instance_id !== "string") return;
+    if (event.type !== "turn.started" || typeof event.data.runtime_id !== "string") return;
     // A lost turn.started response is ambiguous: retrying it could create a
     // second Turn. Only this fenced, idempotent failure notification is retried.
     for (let attempt = 0; attempt < 3; attempt++) {
@@ -77,7 +74,7 @@ export class EventReporter {
       try {
         const result = (await this.connection.request("turn.startFailure", {
           session_id: event.session_id,
-          runtime_instance_id: event.data.runtime_instance_id,
+          runtime_id: event.data.runtime_id,
           reason,
         })) as { accepted?: unknown } | null;
         if (result?.accepted === true) return;

package/src/runtime-binding.ts

@@ -42,7 +42,7 @@ export async function bindSession(
   connection: PiConnection,
   env: EnvLike,
   sessionDetails: PiSessionDetails,
-  options: { startKind?: "fork"; parentSessionId?: string; runtimeInstanceId?: string } = {},
+  options: { startKind?: "fork"; parentSessionId?: string; runtimeId?: string } = {},
 ): Promise<SessionContext | undefined> {
   if (!sessionDetails.clientSessionKey) return undefined;
   const tmux = tmuxBindingFromEnv(env);
@@ -57,7 +57,7 @@ export async function bindSession(
       launch_cwd: sessionDetails.clientCwd,
       ...(options.startKind ? { start_kind: options.startKind } : {}),
       ...(options.parentSessionId ? { parent_session_id: options.parentSessionId } : {}),
-      ...(options.runtimeInstanceId ? { runtime_instance_id: options.runtimeInstanceId } : {}),
+      ...(options.runtimeId ? { runtime_id: options.runtimeId } : {}),
       ...(tmux ? { tmux } : {}),
     },
   });
@@ -66,14 +66,14 @@ export async function bindSession(
   const session = asRecord(record?.session);
   const runtime = asRecord(record?.runtime);
   const sessionId = optionalString(session?.session_id);
-  const resolvedRuntimeInstanceId = optionalString(runtime?.runtime_instance_id);
+  const resolvedRuntimeId = optionalString(runtime?.runtime_id);
   if (!sessionId) throw new Error("runtime binding upsert response missing session.session_id");
-  if (!resolvedRuntimeInstanceId)
-    throw new Error("runtime binding upsert response missing runtime.runtime_instance_id");
+  if (!resolvedRuntimeId)
+    throw new Error("runtime binding upsert response missing runtime.runtime_id");
   return {
     sessionId,
     clientType: "pi",
-    runtimeInstanceId: resolvedRuntimeInstanceId,
+    runtimeId: resolvedRuntimeId,
     ...sessionDetails,
   };
 }
@@ -95,15 +95,15 @@ export async function loadExistingSessionContext(
   const sessionId = optionalString(record?.session_id);
   const sessionState = optionalString(record?.session_state);
   const clientType = optionalString(record?.client_type);
-  const runtimeInstanceId = optionalString(record?.runtime_instance_id);
-  if (!sessionId || !sessionState || clientType !== "pi" || !runtimeInstanceId) {
+  const runtimeId = optionalString(record?.runtime_id);
+  if (!sessionId || !sessionState || clientType !== "pi" || !runtimeId) {
     throw new Error("agent binding session context lookup returned an invalid context");
   }
   return {
     sessionId,
     sessionState,
     clientType: "pi",
-    runtimeInstanceId,
+    runtimeId,
     ...sessionDetails,
   };
 }

package/src/session.ts

@@ -1,7 +1,7 @@
 export interface SessionContext {
   sessionId: string;
   clientType: "pi";
-  runtimeInstanceId: string;
+  runtimeId: string;
   clientSessionKey?: string;
   clientSessionFile?: string;
   clientSessionDir?: string;