@h-rig/pi-rig 0.0.6-alpha.66 → 0.0.6-alpha.68

package/dist/src/client.js

@@ -119,6 +119,8 @@ function requireServerUrl(context) {
   }
   return context.serverUrl;
 }
+var BRIDGE_REQUEST_TIMEOUT_MS = 30000;
+var PROTOCOL_CHECK_TIMEOUT_MS = 1e4;
 
 class RigBridgeClient {
   context;
@@ -127,22 +129,26 @@ class RigBridgeClient {
     this.context = input.context;
     this.fetchImpl = input.fetchImpl ?? fetch;
   }
-  async request(pathname, init) {
+  async request(pathname, init, timeoutMs = BRIDGE_REQUEST_TIMEOUT_MS) {
     const headers = new Headers(init?.headers);
     if (this.context.authToken && !headers.has("authorization")) {
       headers.set("authorization", `Bearer ${this.context.authToken}`);
     }
-    const response = await this.fetchImpl(joinUrl(requireServerUrl(this.context), pathname), { ...init, headers });
+    if (this.context.projectRoot && !headers.has("x-rig-project-root")) {
+      headers.set("x-rig-project-root", this.context.projectRoot);
+    }
+    const signal = init?.signal ?? (timeoutMs > 0 ? AbortSignal.timeout(timeoutMs) : undefined);
+    const response = await this.fetchImpl(joinUrl(requireServerUrl(this.context), pathname), { ...init, headers, signal });
     return readJsonResponse(response);
   }
-  async status() {
-    const payload = await this.request("/api/server/status");
+  async status(timeoutMs) {
+    const payload = await this.request("/api/server/status", undefined, timeoutMs);
     return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : {};
   }
   async checkProtocolCompatibility() {
     let payload;
     try {
-      payload = await this.status();
+      payload = await this.status(PROTOCOL_CHECK_TIMEOUT_MS);
     } catch (error) {
       return {
         status: "indeterminate",
@@ -424,5 +430,7 @@ export {
   buildRigWebSocketUrl,
   RigBridgeSocket,
   RigBridgeClient,
-  RIG_PROTOCOL_VERSION
+  RIG_PROTOCOL_VERSION,
+  PROTOCOL_CHECK_TIMEOUT_MS,
+  BRIDGE_REQUEST_TIMEOUT_MS
 };

package/dist/src/index.js

@@ -119,6 +119,8 @@ function requireServerUrl(context) {
   }
   return context.serverUrl;
 }
+var BRIDGE_REQUEST_TIMEOUT_MS = 30000;
+var PROTOCOL_CHECK_TIMEOUT_MS = 1e4;
 
 class RigBridgeClient {
   context;
@@ -127,22 +129,26 @@ class RigBridgeClient {
     this.context = input.context;
     this.fetchImpl = input.fetchImpl ?? fetch;
   }
-  async request(pathname, init) {
+  async request(pathname, init, timeoutMs = BRIDGE_REQUEST_TIMEOUT_MS) {
     const headers = new Headers(init?.headers);
     if (this.context.authToken && !headers.has("authorization")) {
       headers.set("authorization", `Bearer ${this.context.authToken}`);
     }
-    const response = await this.fetchImpl(joinUrl(requireServerUrl(this.context), pathname), { ...init, headers });
+    if (this.context.projectRoot && !headers.has("x-rig-project-root")) {
+      headers.set("x-rig-project-root", this.context.projectRoot);
+    }
+    const signal = init?.signal ?? (timeoutMs > 0 ? AbortSignal.timeout(timeoutMs) : undefined);
+    const response = await this.fetchImpl(joinUrl(requireServerUrl(this.context), pathname), { ...init, headers, signal });
     return readJsonResponse(response);
   }
-  async status() {
-    const payload = await this.request("/api/server/status");
+  async status(timeoutMs) {
+    const payload = await this.request("/api/server/status", undefined, timeoutMs);
     return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : {};
   }
   async checkProtocolCompatibility() {
     let payload;
     try {
-      payload = await this.status();
+      payload = await this.status(PROTOCOL_CHECK_TIMEOUT_MS);
     } catch (error) {
       return {
         status: "indeterminate",
@@ -608,7 +614,11 @@ function createBridgeGate(state) {
   return async (ctx) => {
     if (!state.active || !state.serverUrl)
       return { allowed: true, message: null, status: "indeterminate" };
-    pending ??= state.client.checkProtocolCompatibility();
+    pending ??= state.client.checkProtocolCompatibility().then((check2) => {
+      if (check2.status === "indeterminate")
+        pending = null;
+      return check2;
+    });
     const check = await pending;
     if (check.status !== "mismatch")
       return { allowed: true, message: null, status: check.status };
@@ -880,8 +890,18 @@ function createPiRigExtension(pi, options = {}) {
     client: state.client,
     notify: (message, level) => notify(globalThis, message, level)
   });
+  const tryRegister = (label, register) => {
+    try {
+      register();
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      if (/conflict|already|duplicate/i.test(message))
+        return;
+      throw error;
+    }
+  };
   for (const [name, command] of Object.entries(commands)) {
-    pi.registerCommand?.(name, {
+    tryRegister(`command:${name}`, () => pi.registerCommand?.(name, {
       description: command.description,
       handler: async (args, ctx) => {
         const gateResult = await gate(ctx);
@@ -896,11 +916,11 @@ function createPiRigExtension(pi, options = {}) {
         });
         await nextCommands.rig.handler(args, ctx);
       }
-    });
+    }));
   }
   if (state.active && state.runId) {
     for (const tool of createRigTools({ context: state, client: state.client })) {
-      pi.registerTool?.({
+      tryRegister(`tool:${String(tool.name ?? "rig-tool")}`, () => pi.registerTool?.({
         ...tool,
         execute: async (toolCallId, params) => {
           const gateResult = await gate(globalThis);
@@ -909,7 +929,7 @@ function createPiRigExtension(pi, options = {}) {
           }
           return tool.execute(toolCallId, params);
         }
-      });
+      }));
     }
     startSteeringBridge(pi, state, globalThis, gate, deliveredSteeringIds);
   }
@@ -917,9 +937,20 @@ function createPiRigExtension(pi, options = {}) {
   pi.on?.("session_start", async (_event, ctx) => {
     if (!state.active || !state.runId)
       return;
+    setStatus(ctx, "rig", `Rig ${state.runId} \xB7 connecting\u2026`);
+    if (state.operatorSession) {
+      setFooter(ctx, `Rig ${state.runId} \xB7 connecting to ${state.serverUrl ?? "Rig server"}\u2026`);
+      setWidget(ctx, "rig-run", [`Rig ${state.runId} \xB7 connecting\u2026`]);
+    }
     const gateResult = await gate(ctx);
-    if (!gateResult.allowed)
+    if (!gateResult.allowed) {
+      if (state.operatorSession) {
+        const message = gateResult.message ?? "Rig bridge disabled (protocol mismatch).";
+        setFooter(ctx, `Rig ${state.runId} \xB7 bridge disabled (protocol mismatch)`);
+        setWidget(ctx, "rig-run", [message]);
+      }
       return;
+    }
     setStatus(ctx, "rig", `Rig ${state.runId}`);
     const live = gateResult.status === "compatible" ? startOperatorBridge(state, ctx) : undefined;
     startOperatorRunWidget(state, ctx, live);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/pi-rig",
-  "version": "0.0.6-alpha.66",
+  "version": "0.0.6-alpha.68",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -33,7 +33,7 @@
     ]
   },
   "dependencies": {
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.66"
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.68"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": ">=0.79.0",