@pontia/pi-client-plugin 0.2.0 → 0.2.2

package/src/runtime-binding.ts

@@ -1,9 +1,12 @@
 import type { EnvLike } from "./context.js";
-import { resolvePontiaConnection } from "./discovery.js";
-import { asRecord, optionalString, parseJsonResponse } from "./internal-api.js";
+import { CONTROL_VERSION, type PiConnection } from "./control-socket.js";
+import { asRecord, optionalString } from "./values.js";
 import type { SessionContext } from "./session.js";
 
-export type PiSessionDetails = Pick<SessionContext, "clientSessionKey" | "clientSessionFile" | "clientSessionDir" | "clientCwd">;
+export type PiSessionDetails = Pick<
+  SessionContext,
+  "clientSessionKey" | "clientSessionFile" | "clientSessionDir" | "clientCwd"
+>;
 
 function callSessionManagerString(sessionManager: unknown, method: string): string | undefined {
   if (!sessionManager || typeof sessionManager !== "object") return undefined;
@@ -17,7 +20,8 @@ function callSessionManagerString(sessionManager: unknown, method: string): stri
 }
 
 export function piSessionDetailsFromHookContext(ctx: unknown): PiSessionDetails {
-  const sessionManager = ctx && typeof ctx === "object" ? (ctx as Record<string, unknown>).sessionManager : undefined;
+  const sessionManager =
+    ctx && typeof ctx === "object" ? (ctx as Record<string, unknown>).sessionManager : undefined;
   return {
     clientSessionKey: callSessionManagerString(sessionManager, "getSessionId"),
     clientSessionFile: callSessionManagerString(sessionManager, "getSessionFile"),
@@ -26,13 +30,6 @@ export function piSessionDetailsFromHookContext(ctx: unknown): PiSessionDetails
   };
 }
 
-function agentBindingSessionContextUrl(discoveredBindingUpsertUrl?: string): string | undefined {
-  return discoveredBindingUpsertUrl?.replace(
-    /\/runtime-bindings\/upsert\/?$/,
-    "/agent-bindings/session-context",
-  );
-}
-
 function tmuxBindingFromEnv(env: EnvLike): { socket_path: string; pane_id: string } | undefined {
   const tmux = optionalString(env.TMUX);
   const paneId = optionalString(env.TMUX_PANE);
@@ -42,51 +39,40 @@ function tmuxBindingFromEnv(env: EnvLike): { socket_path: string; pane_id: strin
 }
 
 export async function bindSession(
-  pontiaHome: string,
+  connection: PiConnection,
   env: EnvLike,
-  fetchImpl: typeof fetch,
   sessionDetails: PiSessionDetails,
   options: { startKind?: "fork"; parentSessionId?: string; runtimeInstanceId?: string } = {},
 ): Promise<SessionContext | undefined> {
   if (!sessionDetails.clientSessionKey) return undefined;
-  const discovered = await resolvePontiaConnection({ pontiaHome, fetch: fetchImpl });
-  const url = discovered?.bindingUpsertUrl;
-  if (!url) return undefined;
-
   const tmux = tmuxBindingFromEnv(env);
-  const response = await fetchImpl(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({
+  const body = await connection.request("runtime.register", {
+    version: CONTROL_VERSION,
+    binding: {
       client_type: "pi",
       client_session_key: sessionDetails.clientSessionKey,
       client_session_file: sessionDetails.clientSessionFile,
       client_session_dir: sessionDetails.clientSessionDir,
       client_cwd: sessionDetails.clientCwd,
       launch_cwd: sessionDetails.clientCwd,
-      start_command: "pi",
       ...(options.startKind ? { start_kind: options.startKind } : {}),
       ...(options.parentSessionId ? { parent_session_id: options.parentSessionId } : {}),
       ...(options.runtimeInstanceId ? { runtime_instance_id: options.runtimeInstanceId } : {}),
       ...(tmux ? { tmux } : {}),
-    }),
+    },
   });
-  const body = await parseJsonResponse(response);
-  if (!response.ok) throw new Error(`runtime binding upsert failed: ${response.status} ${response.statusText}`);
 
   const record = asRecord(body);
   const session = asRecord(record?.session);
   const runtime = asRecord(record?.runtime);
   const sessionId = optionalString(session?.session_id);
   const resolvedRuntimeInstanceId = optionalString(runtime?.runtime_instance_id);
-  const internalEventUrl = optionalString(runtime?.internal_event_url) ?? discovered?.internalEventUrl;
   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 (!internalEventUrl) throw new Error("runtime binding upsert response missing runtime.internal_event_url");
+  if (!resolvedRuntimeInstanceId)
+    throw new Error("runtime binding upsert response missing runtime.runtime_instance_id");
   return {
     sessionId,
     clientType: "pi",
-    internalEventUrl,
     runtimeInstanceId: resolvedRuntimeInstanceId,
     ...sessionDetails,
   };
@@ -97,29 +83,20 @@ export interface ExistingPiSessionContext extends SessionContext {
 }
 
 export async function loadExistingSessionContext(
-  pontiaHome: string,
-  fetchImpl: typeof fetch,
+  connection: PiConnection,
   sessionDetails: PiSessionDetails,
 ): Promise<ExistingPiSessionContext | undefined> {
   if (!sessionDetails.clientSessionKey) return undefined;
-  const discovered = await resolvePontiaConnection({ pontiaHome, fetch: fetchImpl });
-  const baseUrl = agentBindingSessionContextUrl(discovered?.bindingUpsertUrl);
-  if (!baseUrl) return undefined;
-  const url = new URL(baseUrl);
-  url.searchParams.set("client_type", "pi");
-  url.searchParams.set("client_session_key", sessionDetails.clientSessionKey);
-  const response = await fetchImpl(url.toString());
-  if (response.status === 404) return undefined;
-  const body = await parseJsonResponse(response);
-  if (!response.ok) throw new Error(`agent binding session context lookup failed: ${response.status} ${response.statusText}`);
-
-  const record = asRecord(asRecord(asRecord(body)?.data)?.session_context);
+  const body = await connection.request("session.context", {
+    client_session_key: sessionDetails.clientSessionKey,
+  });
+  const record = asRecord(asRecord(body)?.session_context);
+  if (!record) return undefined;
   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);
-  const internalEventUrl = optionalString(record?.internal_event_url) ?? discovered?.internalEventUrl;
-  if (!sessionId || !sessionState || clientType !== "pi" || !runtimeInstanceId || !internalEventUrl) {
+  if (!sessionId || !sessionState || clientType !== "pi" || !runtimeInstanceId) {
     throw new Error("agent binding session context lookup returned an invalid context");
   }
   return {
@@ -127,7 +104,6 @@ export async function loadExistingSessionContext(
     sessionState,
     clientType: "pi",
     runtimeInstanceId,
-    internalEventUrl,
     ...sessionDetails,
   };
 }

package/src/session.ts

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

package/src/values.ts

@@ -0,0 +1,9 @@
+export function optionalString(value: unknown): string | undefined {
+  return typeof value === "string" && value.trim().length > 0 ? value : undefined;
+}
+
+export function asRecord(value: unknown): Record<string, unknown> | undefined {
+  return value && typeof value === "object" && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : undefined;
+}

package/src/workspace.ts

@@ -1,7 +1,7 @@
 import { realpath } from "node:fs/promises";
 import { resolve } from "node:path";
-import { resolvePontiaConnection } from "./discovery.js";
-import { asRecord, fetchJson, responseDataRecord } from "./internal-api.js";
+import type { PiConnection } from "./control-socket.js";
+import { asRecord } from "./values.js";
 
 async function canonicalPath(path: string): Promise<string> {
   try {
@@ -11,20 +11,15 @@ async function canonicalPath(path: string): Promise<string> {
   }
 }
 
-export async function resolveWorkspaceApi(pontiaHome: string, fetchImpl: typeof fetch): Promise<{ externalApiUrl: string; externalApiToken: string } | undefined> {
-  const discovered = await resolvePontiaConnection({ pontiaHome, fetch: fetchImpl });
-  if (!discovered?.externalApiToken) return undefined;
-  return { externalApiUrl: discovered.externalApiUrl, externalApiToken: discovered.externalApiToken };
-}
-
-export async function isActiveRegisteredWorkspace(pontiaHome: string, fetchImpl: typeof fetch, clientCwd: string | undefined): Promise<boolean | undefined> {
+export async function isActiveRegisteredWorkspace(
+  connection: Pick<PiConnection, "request">,
+  clientCwd: string | undefined,
+): Promise<boolean> {
   if (!clientCwd) return false;
-  const api = await resolveWorkspaceApi(pontiaHome, fetchImpl);
-  if (!api) return undefined;
 
   const workspacePath = await canonicalPath(clientCwd);
-  const body = await fetchJson(fetchImpl, `${api.externalApiUrl}/workspaces`, api.externalApiToken);
-  const workspaces = responseDataRecord(body)?.workspaces;
+  const body = await connection.request("workspaces.list", {});
+  const workspaces = asRecord(body)?.workspaces;
   if (!Array.isArray(workspaces)) return false;
 
   return workspaces.some((workspace) => {

package/src/internal-api.ts

@@ -1,29 +0,0 @@
-export function optionalString(value: unknown): string | undefined {
-  return typeof value === "string" && value.trim().length > 0 ? value : undefined;
-}
-
-export function asRecord(value: unknown): Record<string, unknown> | undefined {
-  return value && typeof value === "object" && !Array.isArray(value) ? (value as Record<string, unknown>) : undefined;
-}
-
-export async function parseJsonResponse(response: Response): Promise<unknown> {
-  const text = await response.text().catch(() => "");
-  if (!text) return null;
-  try {
-    return JSON.parse(text);
-  } catch {
-    return text;
-  }
-}
-
-export function responseDataRecord(body: unknown): Record<string, unknown> | undefined {
-  const record = asRecord(body);
-  return asRecord(record?.data);
-}
-
-export async function fetchJson(fetchImpl: typeof fetch, url: string, token: string): Promise<unknown> {
-  const response = await fetchImpl(url, { headers: { Authorization: `Bearer ${token}` } });
-  const body = await parseJsonResponse(response);
-  if (!response.ok) throw new Error(`${response.status} ${response.statusText}`);
-  return body;
-}