@h-rig/pi-rig 0.0.6-alpha.82 → 0.0.6-alpha.84

package/dist/src/client.js

@@ -45,6 +45,13 @@ function resolveGlobalConnectionsPath(env) {
     return resolve(stateDir, "connections.json");
   return resolve(homedir(), ".rig", "connections.json");
 }
+function inferRemoteProjectRoot(repoConnection, authState) {
+  const repoSlug = cleanString(repoConnection?.project) ?? cleanString(authState?.selectedRepo);
+  const checkoutBaseDir = cleanString(authState?.checkoutBaseDir);
+  if (!repoSlug || !checkoutBaseDir || !repoSlug.includes("/"))
+    return null;
+  return resolve(checkoutBaseDir, repoSlug);
+}
 function discoverRigContext(env) {
   const cwd = cleanString(env.PWD);
   if (!cwd)
@@ -60,11 +67,11 @@ function discoverRigContext(env) {
     const server = readJson(resolve(projectRoot, ".rig", "state", "rig-server.json"));
     const host = cleanString(server?.host);
     const port = typeof server?.port === "number" ? server.port : null;
-    const authToken = cleanString(server?.authToken);
+    const authToken2 = cleanString(server?.authToken);
     return {
       projectRoot,
       ...host && port ? { serverUrl: `http://${host}:${port}` } : {},
-      ...authToken ? { authToken } : {}
+      ...authToken2 ? { authToken: authToken2 } : {}
     };
   }
   const global = readJson(resolveGlobalConnectionsPath(env));
@@ -72,15 +79,22 @@ function discoverRigContext(env) {
   const selectedConnection = connections[selected];
   const record = selectedConnection && typeof selectedConnection === "object" && !Array.isArray(selectedConnection) ? selectedConnection : null;
   const baseUrl = record?.kind === "remote" ? cleanString(record.baseUrl) : null;
-  return { projectRoot, ...baseUrl ? { serverUrl: baseUrl } : {} };
+  const authState = readJson(resolve(projectRoot, ".rig", "state", "github-auth.json"));
+  const authToken = cleanString(authState?.apiSessionToken) ?? cleanString(authState?.sessionToken);
+  const serverProjectRoot = cleanString(repoConnection?.serverProjectRoot) ?? inferRemoteProjectRoot(repoConnection, authState);
+  return {
+    projectRoot: serverProjectRoot ?? projectRoot,
+    ...baseUrl ? { serverUrl: baseUrl } : {},
+    ...authToken ? { authToken } : {}
+  };
 }
 function createRigContextFromEnv(env = process.env) {
   const runId = env.RIG_RUN_ID ?? env.RIG_SERVER_RUN_ID;
   const taskId = env.RIG_TASK_ID;
   const discovered = discoverRigContext(env);
-  const serverUrl = env.RIG_SERVER_URL ?? env.RIG_SERVER_BASE_URL ?? discovered.serverUrl;
-  const projectRoot = env.RIG_PROJECT_ROOT ?? env.PROJECT_RIG_ROOT ?? discovered.projectRoot;
-  const authToken = env.RIG_AUTH_TOKEN ?? env.RIG_SERVER_AUTH_TOKEN ?? discovered.authToken;
+  const serverUrl = cleanString(env.RIG_SERVER_URL) ?? cleanString(env.RIG_SERVER_BASE_URL) ?? discovered.serverUrl;
+  const projectRoot = cleanString(env.RIG_PROJECT_ROOT) ?? cleanString(env.PROJECT_RIG_ROOT) ?? discovered.projectRoot;
+  const authToken = cleanString(env.RIG_AUTH_TOKEN) ?? cleanString(env.RIG_SERVER_AUTH_TOKEN) ?? discovered.authToken;
   const steeringPollMs = cleanNonNegativeInteger(env.RIG_STEERING_POLL_MS);
   const operatorSession = env.RIG_PI_OPERATOR_SESSION === "1" || env.RIG_PI_OPERATOR_SESSION === "true";
   const active = Boolean(runId || taskId || serverUrl || projectRoot);
@@ -121,6 +135,16 @@ function requireServerUrl(context) {
 }
 var BRIDGE_REQUEST_TIMEOUT_MS = 30000;
 var PROTOCOL_CHECK_TIMEOUT_MS = 1e4;
+function mergeCookie(existing, name, value) {
+  const encoded = `${name}=${encodeURIComponent(value)}`;
+  if (!existing?.trim())
+    return encoded;
+  const parts = existing.split(";").map((part) => part.trim()).filter((part) => part && !part.startsWith(`${name}=`));
+  return [...parts, encoded].join("; ");
+}
+function queryAuthFallbackEnabled(env = process.env) {
+  return env.RIG_ENABLE_QUERY_AUTH_FALLBACK === "1" || env.RIG_QUERY_AUTH_FALLBACK === "1";
+}
 
 class RigBridgeClient {
   context;
@@ -131,14 +155,22 @@ class RigBridgeClient {
   }
   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}`);
+    if (this.context.authToken) {
+      const bearer = `Bearer ${this.context.authToken}`;
+      if (!headers.has("authorization"))
+        headers.set("authorization", bearer);
+      if (!headers.has("x-auth"))
+        headers.set("x-auth", bearer);
+      headers.set("cookie", mergeCookie(headers.get("cookie"), "rig_auth", this.context.authToken));
     }
     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 });
+    const requestUrl = new URL(joinUrl(requireServerUrl(this.context), pathname));
+    if (this.context.authToken && queryAuthFallbackEnabled())
+      requestUrl.searchParams.set("rt", this.context.authToken);
+    const response = await this.fetchImpl(requestUrl.toString(), { ...init, headers, signal });
     return readJsonResponse(response);
   }
   async status(timeoutMs) {

package/dist/src/commands.js

@@ -53,8 +53,17 @@ function createRigSlashCommands(input) {
           notify("Usage: /rig steer <message>", "error");
           return;
         }
-        await input.client.steer(message);
-        notify("Rig steering message queued.", "info");
+        const result = await input.client.steer(message);
+        const accepted = result.ok !== false && result.queued !== false;
+        if (!accepted) {
+          const reason = typeof result.error === "string" && result.error.trim() ? `: ${result.error.trim()}` : "";
+          notify(`Rig did not accept the steering message${reason}.`, "error");
+          return;
+        }
+        const entry = result.message && typeof result.message === "object" && !Array.isArray(result.message) ? result.message : null;
+        const runId = String(entry?.runId ?? second ?? input.context.runId ?? "run");
+        const preview = message.length > 80 ? `${message.slice(0, 79)}\u2026` : message;
+        notify(`Steering queued for ${runId} \u2192 "${preview}" \u2014 the worker applies it at its next checkpoint.`, "info");
         return;
       }
       if (first === "stop") {

package/dist/src/index.d.ts

@@ -46,13 +46,11 @@ export type PiRigBridgeGate = {
     readonly status: RigProtocolCheck["status"];
 };
 export type PiRigBridgeGateCheck = (ctx: unknown) => Promise<PiRigBridgeGate>;
-/** Live refresh control handed to the operator widget by the WS bridge:
- * while the socket is up, pushes (rig.event / snapshotInvalidated) drive the
- * widget instead of the 1s status poll. */
 export type OperatorLiveRefresh = {
     isConnected(): boolean;
     /** Returns true (and resets) when a push arrived since the last check. */
     consumePushTrigger(): boolean;
+    dispose(): void;
 };
 export default function createPiRigExtension(pi: MinimalPiApi, options?: {
     state?: PiRigExtensionState;

package/dist/src/index.js

@@ -47,6 +47,13 @@ function resolveGlobalConnectionsPath(env) {
     return resolve(stateDir, "connections.json");
   return resolve(homedir(), ".rig", "connections.json");
 }
+function inferRemoteProjectRoot(repoConnection, authState) {
+  const repoSlug = cleanString(repoConnection?.project) ?? cleanString(authState?.selectedRepo);
+  const checkoutBaseDir = cleanString(authState?.checkoutBaseDir);
+  if (!repoSlug || !checkoutBaseDir || !repoSlug.includes("/"))
+    return null;
+  return resolve(checkoutBaseDir, repoSlug);
+}
 function discoverRigContext(env) {
   const cwd = cleanString(env.PWD);
   if (!cwd)
@@ -62,11 +69,11 @@ function discoverRigContext(env) {
     const server = readJson(resolve(projectRoot, ".rig", "state", "rig-server.json"));
     const host = cleanString(server?.host);
     const port = typeof server?.port === "number" ? server.port : null;
-    const authToken = cleanString(server?.authToken);
+    const authToken2 = cleanString(server?.authToken);
     return {
       projectRoot,
       ...host && port ? { serverUrl: `http://${host}:${port}` } : {},
-      ...authToken ? { authToken } : {}
+      ...authToken2 ? { authToken: authToken2 } : {}
     };
   }
   const global = readJson(resolveGlobalConnectionsPath(env));
@@ -74,15 +81,22 @@ function discoverRigContext(env) {
   const selectedConnection = connections[selected];
   const record = selectedConnection && typeof selectedConnection === "object" && !Array.isArray(selectedConnection) ? selectedConnection : null;
   const baseUrl = record?.kind === "remote" ? cleanString(record.baseUrl) : null;
-  return { projectRoot, ...baseUrl ? { serverUrl: baseUrl } : {} };
+  const authState = readJson(resolve(projectRoot, ".rig", "state", "github-auth.json"));
+  const authToken = cleanString(authState?.apiSessionToken) ?? cleanString(authState?.sessionToken);
+  const serverProjectRoot = cleanString(repoConnection?.serverProjectRoot) ?? inferRemoteProjectRoot(repoConnection, authState);
+  return {
+    projectRoot: serverProjectRoot ?? projectRoot,
+    ...baseUrl ? { serverUrl: baseUrl } : {},
+    ...authToken ? { authToken } : {}
+  };
 }
 function createRigContextFromEnv(env = process.env) {
   const runId = env.RIG_RUN_ID ?? env.RIG_SERVER_RUN_ID;
   const taskId = env.RIG_TASK_ID;
   const discovered = discoverRigContext(env);
-  const serverUrl = env.RIG_SERVER_URL ?? env.RIG_SERVER_BASE_URL ?? discovered.serverUrl;
-  const projectRoot = env.RIG_PROJECT_ROOT ?? env.PROJECT_RIG_ROOT ?? discovered.projectRoot;
-  const authToken = env.RIG_AUTH_TOKEN ?? env.RIG_SERVER_AUTH_TOKEN ?? discovered.authToken;
+  const serverUrl = cleanString(env.RIG_SERVER_URL) ?? cleanString(env.RIG_SERVER_BASE_URL) ?? discovered.serverUrl;
+  const projectRoot = cleanString(env.RIG_PROJECT_ROOT) ?? cleanString(env.PROJECT_RIG_ROOT) ?? discovered.projectRoot;
+  const authToken = cleanString(env.RIG_AUTH_TOKEN) ?? cleanString(env.RIG_SERVER_AUTH_TOKEN) ?? discovered.authToken;
   const steeringPollMs = cleanNonNegativeInteger(env.RIG_STEERING_POLL_MS);
   const operatorSession = env.RIG_PI_OPERATOR_SESSION === "1" || env.RIG_PI_OPERATOR_SESSION === "true";
   const active = Boolean(runId || taskId || serverUrl || projectRoot);
@@ -123,6 +137,16 @@ function requireServerUrl(context) {
 }
 var BRIDGE_REQUEST_TIMEOUT_MS = 30000;
 var PROTOCOL_CHECK_TIMEOUT_MS = 1e4;
+function mergeCookie(existing, name, value) {
+  const encoded = `${name}=${encodeURIComponent(value)}`;
+  if (!existing?.trim())
+    return encoded;
+  const parts = existing.split(";").map((part) => part.trim()).filter((part) => part && !part.startsWith(`${name}=`));
+  return [...parts, encoded].join("; ");
+}
+function queryAuthFallbackEnabled(env = process.env) {
+  return env.RIG_ENABLE_QUERY_AUTH_FALLBACK === "1" || env.RIG_QUERY_AUTH_FALLBACK === "1";
+}
 
 class RigBridgeClient {
   context;
@@ -133,14 +157,22 @@ class RigBridgeClient {
   }
   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}`);
+    if (this.context.authToken) {
+      const bearer = `Bearer ${this.context.authToken}`;
+      if (!headers.has("authorization"))
+        headers.set("authorization", bearer);
+      if (!headers.has("x-auth"))
+        headers.set("x-auth", bearer);
+      headers.set("cookie", mergeCookie(headers.get("cookie"), "rig_auth", this.context.authToken));
     }
     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 });
+    const requestUrl = new URL(joinUrl(requireServerUrl(this.context), pathname));
+    if (this.context.authToken && queryAuthFallbackEnabled())
+      requestUrl.searchParams.set("rt", this.context.authToken);
+    const response = await this.fetchImpl(requestUrl.toString(), { ...init, headers, signal });
     return readJsonResponse(response);
   }
   async status(timeoutMs) {
@@ -667,8 +699,17 @@ function createRigSlashCommands(input) {
           notify("Usage: /rig steer <message>", "error");
           return;
         }
-        await input.client.steer(message);
-        notify("Rig steering message queued.", "info");
+        const result = await input.client.steer(message);
+        const accepted = result.ok !== false && result.queued !== false;
+        if (!accepted) {
+          const reason = typeof result.error === "string" && result.error.trim() ? `: ${result.error.trim()}` : "";
+          notify(`Rig did not accept the steering message${reason}.`, "error");
+          return;
+        }
+        const entry = result.message && typeof result.message === "object" && !Array.isArray(result.message) ? result.message : null;
+        const runId = String(entry?.runId ?? second ?? input.context.runId ?? "run");
+        const preview = message.length > 80 ? `${message.slice(0, 79)}\u2026` : message;
+        notify(`Steering queued for ${runId} \u2192 "${preview}" \u2014 the worker applies it at its next checkpoint.`, "info");
         return;
       }
       if (first === "stop") {
@@ -986,35 +1027,52 @@ function createPiRigExtensionState(input = {}) {
     ...input.webSocketFactory ? { webSocketFactory: input.webSocketFactory } : {}
   };
 }
+function isStalePiContextError(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  return /ctx is stale|stale after session replacement|session replacement or reload/i.test(message);
+}
+function safeUiCall(action) {
+  try {
+    action();
+  } catch (error) {
+    if (!isStalePiContextError(error)) {
+      return;
+    }
+  }
+}
+function uiOf(ctx) {
+  try {
+    const ui = ctx && typeof ctx === "object" ? ctx.ui : null;
+    return ui && typeof ui === "object" ? ui : null;
+  } catch {
+    return null;
+  }
+}
 function notify(ctx, message, level = "info") {
-  const ui = ctx && typeof ctx === "object" ? ctx.ui : null;
-  const notifyFn = ui && typeof ui === "object" ? ui.notify : null;
+  const ui = uiOf(ctx);
+  const notifyFn = ui?.notify;
   if (typeof notifyFn === "function") {
-    notifyFn.call(ui, message, level);
+    safeUiCall(() => notifyFn.call(ui, message, level));
   }
 }
 function canNotify(ctx) {
-  const ui = ctx && typeof ctx === "object" ? ctx.ui : null;
-  return Boolean(ui && typeof ui === "object" && typeof ui.notify === "function");
+  const ui = uiOf(ctx);
+  return Boolean(ui && typeof ui.notify === "function");
 }
 function setWidget(ctx, id, lines) {
-  const ui = ctx && typeof ctx === "object" ? ctx.ui : null;
-  const setWidgetFn = ui && typeof ui === "object" ? ui.setWidget : null;
+  const ui = uiOf(ctx);
+  const setWidgetFn = ui?.setWidget;
   if (typeof setWidgetFn === "function") {
-    setWidgetFn.call(ui, id, lines);
+    safeUiCall(() => setWidgetFn.call(ui, id, lines));
   }
 }
 function setStatus(ctx, id, text) {
-  const ui = ctx && typeof ctx === "object" ? ctx.ui : null;
-  const setStatusFn = ui && typeof ui === "object" ? ui.setStatus : null;
+  const ui = uiOf(ctx);
+  const setStatusFn = ui?.setStatus;
   if (typeof setStatusFn === "function") {
-    setStatusFn.call(ui, id, text);
+    safeUiCall(() => setStatusFn.call(ui, id, text));
   }
 }
-function uiOf(ctx) {
-  const ui = ctx && typeof ctx === "object" ? ctx.ui : null;
-  return ui && typeof ui === "object" ? ui : null;
-}
 function setTitle(ctx, title) {
   const ui = uiOf(ctx);
   const setTitleFn = ui?.setTitle;
@@ -1181,24 +1239,31 @@ function startOperatorRunStatusLine(state, ctx, live) {
     return;
   const shortId = state.runId.slice(0, 8);
   let inFlight = false;
+  let disposed = false;
   let lastRefreshAt = 0;
   const refresh = async () => {
-    if (inFlight)
+    if (disposed || inFlight)
       return;
     inFlight = true;
     lastRefreshAt = Date.now();
     try {
       const run = runPayload(await state.client.attach(state.runId));
+      if (disposed)
+        return;
       const status = String(run.status ?? "unknown");
       setStatus(ctx, "rig", `drone ${shortId} \xB7 ${status} \xB7 ${shortPath(runLocation(run))}`);
     } catch (error) {
-      setStatus(ctx, "rig", `drone ${shortId} \xB7 server unreachable: ${error instanceof Error ? error.message : String(error)}`);
+      if (!disposed) {
+        setStatus(ctx, "rig", `drone ${shortId} \xB7 server unreachable: ${error instanceof Error ? error.message : String(error)}`);
+      }
     } finally {
       inFlight = false;
     }
   };
   refresh();
   const timer = setInterval(() => {
+    if (disposed)
+      return;
     const triggered = live?.consumePushTrigger() ?? false;
     if ((live?.isConnected() ?? false) && !triggered && Date.now() - lastRefreshAt < OPERATOR_WIDGET_WS_FALLBACK_MS) {
       return;
@@ -1206,6 +1271,10 @@ function startOperatorRunStatusLine(state, ctx, live) {
     refresh();
   }, 5000);
   unrefTimer(timer);
+  return () => {
+    disposed = true;
+    clearInterval(timer);
+  };
 }
 function operatorInboxNotification(event) {
   const type = typeof event.type === "string" ? event.type : null;
@@ -1258,7 +1327,8 @@ function startOperatorBridge(state, ctx) {
       const triggered = pushTrigger;
       pushTrigger = false;
       return triggered;
-    }
+    },
+    dispose: () => socket.close()
   };
 }
 function workerStatusLine(status) {
@@ -1380,24 +1450,30 @@ function registerOperatorConsoleCommands(pi, state, tryRegister) {
 function startWorkerSessionMirror(pi, state, ctx) {
   if (!state.operatorSession || !state.active || !state.runId)
     return;
+  let disposed = false;
   let mirror = null;
   const pendingEvents = [];
   createLiveMirror({ pi }).then((created) => {
+    if (disposed)
+      return;
     mirror = created;
     const ui = uiOf(ctx);
     if (ui && typeof ui.setWidget === "function") {
-      ui.setWidget("rig-tui-capture", (tui) => created.captureTui(tui));
+      safeUiCall(() => ui.setWidget("rig-tui-capture", (tui) => created.captureTui(tui)));
     }
     for (const event of pendingEvents.splice(0))
       created.handleWorkerEvent(event);
   }).catch((error) => {
-    notify(ctx, `Live drone transcript unavailable: ${error instanceof Error ? error.message : String(error)}`, "error");
+    if (!disposed)
+      notify(ctx, `Live drone transcript unavailable: ${error instanceof Error ? error.message : String(error)}`, "error");
   });
   const socket = new RigWorkerEventsSocket({
     context: state,
     webSocketFactory: state.webSocketFactory,
     handlers: {
       onFrame: (frame) => {
+        if (disposed)
+          return;
         if (frame.type === "status.update") {
           const status = frame.status && typeof frame.status === "object" && !Array.isArray(frame.status) ? frame.status : null;
           if (status)
@@ -1419,14 +1495,21 @@ function startWorkerSessionMirror(pi, state, ctx) {
           pendingEvents.push(event);
       },
       onConnect: () => {
-        setStatus(ctx, "rig-worker", "drone link live");
+        if (!disposed)
+          setStatus(ctx, "rig-worker", "drone link live");
       },
       onDisconnect: () => {
-        setStatus(ctx, "rig-worker", "drone link down (reconnecting\u2026)");
+        if (!disposed)
+          setStatus(ctx, "rig-worker", "drone link down (reconnecting\u2026)");
       }
     }
   });
   socket.start();
+  return () => {
+    disposed = true;
+    pendingEvents.splice(0);
+    socket.close();
+  };
 }
 async function forwardWorkerUiRequest(state, ctx, event) {
   const request = event.request && typeof event.request === "object" && !Array.isArray(event.request) ? event.request : event;
@@ -1496,8 +1579,10 @@ function startWorkerCommandRegistration(pi, state, ctx) {
   const registeredNames = new Set;
   let attempts = 0;
   let inFlight = false;
+  let disposed = false;
+  let timer = null;
   const attempt = async () => {
-    if (inFlight)
+    if (disposed || inFlight)
       return false;
     inFlight = true;
     attempts += 1;
@@ -1508,64 +1593,84 @@ function startWorkerCommandRegistration(pi, state, ctx) {
     }
   };
   attempt().then((ready) => {
-    if (ready)
+    if (disposed || ready)
       return;
-    const timer = setInterval(() => {
-      if (attempts >= 60) {
-        clearInterval(timer);
+    timer = setInterval(() => {
+      if (disposed || attempts >= 60) {
+        if (timer)
+          clearInterval(timer);
+        timer = null;
         return;
       }
       attempt().then((nextReady) => {
-        if (nextReady)
+        if (nextReady && timer) {
           clearInterval(timer);
+          timer = null;
+        }
       });
     }, 2000);
     unrefTimer(timer);
   });
+  return () => {
+    disposed = true;
+    if (timer)
+      clearInterval(timer);
+    timer = null;
+  };
 }
 function startSteeringBridge(pi, state, ctx, gate, deliveredIds) {
   if (state.operatorSession || !state.active || !state.runId || typeof pi.sendUserMessage !== "function")
     return;
   const runId = state.runId;
+  let disposed = false;
   const socket = new RigBridgeSocket({
     context: state,
     webSocketFactory: state.webSocketFactory,
     handlers: {
       onSteeringMessage: (message) => {
+        if (disposed)
+          return;
         (async () => {
           try {
-            if (!await deliverSteeringMessage(pi, deliveredIds, message))
+            if (disposed || !await deliverSteeringMessage(pi, deliveredIds, message))
               return;
             const id = typeof message.id === "string" && message.id.trim() ? message.id : null;
             if (id)
               socket.ackSteering(runId, [id]);
             notify(ctx, "Delivered 1 Rig steering message.");
           } catch (error) {
-            notify(ctx, `Rig steering sync failed: ${error instanceof Error ? error.message : String(error)}`, "error");
+            if (!disposed)
+              notify(ctx, `Rig steering sync failed: ${error instanceof Error ? error.message : String(error)}`, "error");
           }
         })();
       },
       onConnect: () => {
+        if (disposed)
+          return;
         consumeQueuedSteering(pi, state, ctx, gate, deliveredIds);
       }
     }
   });
   (async () => {
     const gateResult = await gate(ctx);
-    if (!gateResult.allowed)
+    if (disposed || !gateResult.allowed)
       return;
     if (gateResult.status === "compatible") {
       socket.start();
     }
   })();
   const intervalMs = state.steeringPollMs ?? 1000;
-  if (intervalMs <= 0)
-    return;
+  if (intervalMs <= 0) {
+    return () => {
+      disposed = true;
+      socket.close();
+    };
+  }
   const WS_CONNECTED_SWEEP_MS = 1e4;
   let inFlight = false;
   let lastSweepAt = 0;
   const timer = setInterval(() => {
-    if (inFlight)
+    if (disposed || inFlight)
       return;
     if (socket.connected && Date.now() - lastSweepAt < WS_CONNECTED_SWEEP_MS)
       return;
@@ -1576,11 +1681,35 @@ function startSteeringBridge(pi, state, ctx, gate, deliveredIds) {
     });
   }, intervalMs);
   unrefTimer(timer);
+  return () => {
+    disposed = true;
+    clearInterval(timer);
+    socket.close();
+  };
 }
 function createPiRigExtension(pi, options = {}) {
   const state = options.state ?? createPiRigExtensionState();
   const gate = createBridgeGate(state);
   const deliveredSteeringIds = new Set;
+  const sessionDisposables = new Set;
+  const runtimeDisposables = new Set;
+  const addDisposable = (target, disposable) => {
+    if (disposable)
+      target.add(disposable);
+  };
+  const disposeSet = (target) => {
+    for (const dispose of target) {
+      try {
+        dispose();
+      } catch {}
+    }
+    target.clear();
+  };
+  const disposeSessionResources = () => disposeSet(sessionDisposables);
+  const disposeRuntimeResources = () => {
+    disposeSet(sessionDisposables);
+    disposeSet(runtimeDisposables);
+  };
   const commands = createRigSlashCommands({
     context: state,
     client: state.client,
@@ -1630,10 +1759,14 @@ function createPiRigExtension(pi, options = {}) {
         }
       }));
     }
-    startSteeringBridge(pi, state, globalThis, gate, deliveredSteeringIds);
+    addDisposable(runtimeDisposables, startSteeringBridge(pi, state, globalThis, gate, deliveredSteeringIds));
   }
   pi.on?.("input", async (event, ctx) => handleOperatorInput(event, state, ctx, gate));
+  pi.on?.("session_shutdown", () => {
+    disposeRuntimeResources();
+  });
   pi.on?.("session_start", async (_event, ctx) => {
+    disposeSessionResources();
     if (!state.active || !state.runId)
       return;
     const shortId = state.runId.slice(0, 8);
@@ -1649,11 +1782,12 @@ function createPiRigExtension(pi, options = {}) {
       return;
     }
     setStatus(ctx, "rig", `drone ${shortId} \xB7 connecting\u2026`);
-    const live = gateResult.status === "compatible" ? startOperatorBridge(state, ctx) : undefined;
-    startOperatorRunStatusLine(state, ctx, live);
-    if (state.operatorSession && gateResult.status === "compatible") {
-      startWorkerSessionMirror(pi, state, ctx);
-      startWorkerCommandRegistration(pi, state, ctx);
+    const live = gateResult.allowed ? startOperatorBridge(state, ctx) : undefined;
+    addDisposable(sessionDisposables, live?.dispose);
+    addDisposable(sessionDisposables, startOperatorRunStatusLine(state, ctx, live));
+    if (state.operatorSession && gateResult.allowed) {
+      addDisposable(sessionDisposables, startWorkerSessionMirror(pi, state, ctx));
+      addDisposable(sessionDisposables, startWorkerCommandRegistration(pi, state, ctx));
     }
     await consumeQueuedSteering(pi, state, ctx, gate, deliveredSteeringIds);
   });

package/package.json

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