@h-rig/cli 0.0.6-alpha.31 → 0.0.6-alpha.33

package/dist/bin/rig.js

@@ -7273,12 +7273,12 @@ function parseExtensionUiRequest(value) {
 }
 function renderBridgeWidget(state) {
   const statusParts = [
-    state.wsConnected ? "live WS" : "WS pending",
+    state.wsConnected ? "live" : "connecting",
     state.status,
     state.model,
     state.cwd
   ].filter(Boolean);
-  const lines = [`Worker Pi daemon bridge \xB7 ${statusParts.join(" \xB7 ")}`];
+  const lines = [`Rig worker session \xB7 ${statusParts.join(" \xB7 ")}`];
   if (state.activity)
     lines.push(state.activity);
   if (state.commands.length > 0) {
@@ -7288,27 +7288,35 @@ function renderBridgeWidget(state) {
   if (state.transcript.length > 0) {
     lines.push(...state.transcript.slice(-MAX_TRANSCRIPT_LINES));
   } else {
-    lines.push("Waiting for worker Pi daemon transcript\u2026");
+    lines.push("Waiting for the worker session transcript\u2026 (/detach exits and leaves the worker running)");
   }
   if (state.pendingUi) {
     lines.push("");
-    lines.push(`Extension UI request \xB7 ${state.pendingUi.method}`);
+    lines.push(`Worker needs input \xB7 ${state.pendingUi.method}`);
     lines.push(state.pendingUi.prompt);
     state.pendingUi.options.forEach((option, index) => lines.push(`${index + 1}. ${option}`));
-    lines.push("Reply in the Pi editor. /cancel cancels this request.");
+    lines.push("Reply in the editor below. /cancel dismisses this request.");
   }
   return lines;
 }
+function reportBridgeError(ctx, state, message2) {
+  appendTranscript(state, "Error", message2);
+  state.status = message2;
+  try {
+    ctx.ui.notify(message2, "error");
+  } catch {}
+  updatePiUi(ctx, state);
+}
 function updatePiUi(ctx, state) {
-  ctx.ui.setTitle("Pi \xB7 Rig worker daemon");
-  ctx.ui.setStatus("rig-worker-pi", state.wsConnected ? "worker Pi WS live" : state.status);
+  ctx.ui.setTitle("Rig \xB7 worker session");
+  ctx.ui.setStatus("rig-worker-pi", state.wsConnected ? "worker session live" : state.status);
   syncNativeDisplayCwd(ctx, state);
   if (state.nativeStream && nativePiUi(ctx)) {
     ctx.ui.setWidget("rig-worker-pi-transcript", undefined);
     return;
   }
   ctx.ui.setWorkingVisible(false);
-  ctx.ui.setWidget("rig-worker-pi-transcript", [`Worker Pi daemon bridge \xB7 degraded widget transcript`, ...renderBridgeWidget(state)], { placement: "aboveEditor" });
+  ctx.ui.setWidget("rig-worker-pi-transcript", renderBridgeWidget(state), { placement: "aboveEditor" });
 }
 function applyStatus(state, payload) {
   const status = recordOf(payload.status) ?? payload;
@@ -7453,19 +7461,45 @@ function applyEnvelope(ctx, state, envelopeValue) {
   }
   syncNativeDisplayCwd(ctx, state);
 }
+function resolveAttachReadyTimeoutMs() {
+  const raw = Number.parseInt(process.env.RIG_PI_ATTACH_TIMEOUT_MS ?? "", 10);
+  return Number.isFinite(raw) && raw > 0 ? raw : 10 * 60000;
+}
+function formatElapsed(sinceMs) {
+  const totalSeconds = Math.floor((Date.now() - sinceMs) / 1000);
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return minutes > 0 ? `${minutes}m${String(seconds).padStart(2, "0")}s` : `${seconds}s`;
+}
 async function waitForWorkerReady(options, ctx, state) {
+  const startedAt = Date.now();
+  const deadline = startedAt + resolveAttachReadyTimeoutMs();
+  let consecutiveFailures = 0;
   while (true) {
-    const session = await getRunPiSessionViaServer(options.context, options.runId).catch((error) => ({
-      ready: false,
-      status: error instanceof Error ? error.message : String(error),
-      retryAfterMs: 1000
-    }));
+    let requestFailed = false;
+    const session = await getRunPiSessionViaServer(options.context, options.runId).catch((error) => {
+      requestFailed = true;
+      return {
+        ready: false,
+        status: error instanceof Error ? error.message : String(error),
+        retryAfterMs: 1000
+      };
+    });
     if (session.ready === false) {
+      consecutiveFailures = requestFailed ? consecutiveFailures + 1 : 0;
       const status = String(session.status ?? "starting");
-      state.status = `waiting for worker Pi daemon \xB7 ${status}`;
-      updatePiUi(ctx, state);
       if (TERMINAL_RUN_STATUSES.has(status.toLowerCase())) {
-        appendTranscript(state, "Error", `Run ended before worker Pi daemon became ready: ${status}`);
+        reportBridgeError(ctx, state, `Run ended before worker Pi daemon became ready: ${status}. Inspect with \`rig run show ${options.runId}\`; restart with \`rig task run --task <id>\`.`);
+        return false;
+      }
+      if (consecutiveFailures >= 5) {
+        state.status = `Rig server unreachable \xB7 retrying (${formatElapsed(startedAt)}) \xB7 /detach to exit`;
+      } else {
+        state.status = `waiting for worker Pi daemon \xB7 ${status} \xB7 ${formatElapsed(startedAt)} \xB7 /detach to exit`;
+      }
+      updatePiUi(ctx, state);
+      if (Date.now() >= deadline) {
+        reportBridgeError(ctx, state, `Worker Pi daemon did not become ready within ${formatElapsed(startedAt)} (last status: ${status}). ` + `Check \`rig run show ${options.runId}\` and \`rig doctor\`; the run may have been restarted by a server deploy. ` + "Set RIG_PI_ATTACH_TIMEOUT_MS to wait longer.");
         return false;
       }
       await Bun.sleep(typeof session.retryAfterMs === "number" ? session.retryAfterMs : 750);
@@ -7673,7 +7707,7 @@ function createRigWorkerPiBridgeExtension(options) {
       nativePiUiContextAvailable = Boolean(nativePiUi(ctx));
       state.nativeStream = nativePiUiContextAvailable;
       updatePiUi(ctx, state);
-      ctx.ui.notify(nativePiUiContextAvailable ? "Rig worker Pi native stream bridge loaded" : "Rig worker Pi bridge extension loaded (degraded widget fallback)", "info");
+      ctx.ui.notify(nativePiUiContextAvailable ? "Connected to the Rig worker session (native stream). /detach exits, /stop cancels the run." : "Connected to the Rig worker session (transcript view). /detach exits, /stop cancels the run.", "info");
       ctx.ui.onTerminalInput((data) => {
         if (data.includes("\x04")) {
           ctx.shutdown();
@@ -11661,9 +11695,11 @@ ${helpText()}`);
         const path = await import("path");
         const { fileURLToPath } = await import("url");
         const execPath = process.execPath || "";
+        const moduleDir = path.dirname(fileURLToPath(import.meta.url));
         const candidates = [
           execPath ? path.resolve(path.dirname(execPath), "..", "manifest.json") : "",
-          path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..", "package.json"),
+          path.resolve(moduleDir, "..", "package.json"),
+          path.resolve(moduleDir, "..", "..", "package.json"),
           path.resolve(process.cwd(), "packages/cli/package.json")
         ].filter(Boolean);
         for (const candidate of candidates) {

package/dist/src/commands/_operator-view.js

@@ -543,12 +543,12 @@ function parseExtensionUiRequest(value) {
 }
 function renderBridgeWidget(state) {
   const statusParts = [
-    state.wsConnected ? "live WS" : "WS pending",
+    state.wsConnected ? "live" : "connecting",
     state.status,
     state.model,
     state.cwd
   ].filter(Boolean);
-  const lines = [`Worker Pi daemon bridge \xB7 ${statusParts.join(" \xB7 ")}`];
+  const lines = [`Rig worker session \xB7 ${statusParts.join(" \xB7 ")}`];
   if (state.activity)
     lines.push(state.activity);
   if (state.commands.length > 0) {
@@ -558,27 +558,35 @@ function renderBridgeWidget(state) {
   if (state.transcript.length > 0) {
     lines.push(...state.transcript.slice(-MAX_TRANSCRIPT_LINES));
   } else {
-    lines.push("Waiting for worker Pi daemon transcript\u2026");
+    lines.push("Waiting for the worker session transcript\u2026 (/detach exits and leaves the worker running)");
   }
   if (state.pendingUi) {
     lines.push("");
-    lines.push(`Extension UI request \xB7 ${state.pendingUi.method}`);
+    lines.push(`Worker needs input \xB7 ${state.pendingUi.method}`);
     lines.push(state.pendingUi.prompt);
     state.pendingUi.options.forEach((option, index) => lines.push(`${index + 1}. ${option}`));
-    lines.push("Reply in the Pi editor. /cancel cancels this request.");
+    lines.push("Reply in the editor below. /cancel dismisses this request.");
   }
   return lines;
 }
+function reportBridgeError(ctx, state, message) {
+  appendTranscript(state, "Error", message);
+  state.status = message;
+  try {
+    ctx.ui.notify(message, "error");
+  } catch {}
+  updatePiUi(ctx, state);
+}
 function updatePiUi(ctx, state) {
-  ctx.ui.setTitle("Pi \xB7 Rig worker daemon");
-  ctx.ui.setStatus("rig-worker-pi", state.wsConnected ? "worker Pi WS live" : state.status);
+  ctx.ui.setTitle("Rig \xB7 worker session");
+  ctx.ui.setStatus("rig-worker-pi", state.wsConnected ? "worker session live" : state.status);
   syncNativeDisplayCwd(ctx, state);
   if (state.nativeStream && nativePiUi(ctx)) {
     ctx.ui.setWidget("rig-worker-pi-transcript", undefined);
     return;
   }
   ctx.ui.setWorkingVisible(false);
-  ctx.ui.setWidget("rig-worker-pi-transcript", [`Worker Pi daemon bridge \xB7 degraded widget transcript`, ...renderBridgeWidget(state)], { placement: "aboveEditor" });
+  ctx.ui.setWidget("rig-worker-pi-transcript", renderBridgeWidget(state), { placement: "aboveEditor" });
 }
 function applyStatus(state, payload) {
   const status = recordOf(payload.status) ?? payload;
@@ -723,19 +731,45 @@ function applyEnvelope(ctx, state, envelopeValue) {
   }
   syncNativeDisplayCwd(ctx, state);
 }
+function resolveAttachReadyTimeoutMs() {
+  const raw = Number.parseInt(process.env.RIG_PI_ATTACH_TIMEOUT_MS ?? "", 10);
+  return Number.isFinite(raw) && raw > 0 ? raw : 10 * 60000;
+}
+function formatElapsed(sinceMs) {
+  const totalSeconds = Math.floor((Date.now() - sinceMs) / 1000);
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return minutes > 0 ? `${minutes}m${String(seconds).padStart(2, "0")}s` : `${seconds}s`;
+}
 async function waitForWorkerReady(options, ctx, state) {
+  const startedAt = Date.now();
+  const deadline = startedAt + resolveAttachReadyTimeoutMs();
+  let consecutiveFailures = 0;
   while (true) {
-    const session = await getRunPiSessionViaServer(options.context, options.runId).catch((error) => ({
-      ready: false,
-      status: error instanceof Error ? error.message : String(error),
-      retryAfterMs: 1000
-    }));
+    let requestFailed = false;
+    const session = await getRunPiSessionViaServer(options.context, options.runId).catch((error) => {
+      requestFailed = true;
+      return {
+        ready: false,
+        status: error instanceof Error ? error.message : String(error),
+        retryAfterMs: 1000
+      };
+    });
     if (session.ready === false) {
+      consecutiveFailures = requestFailed ? consecutiveFailures + 1 : 0;
       const status = String(session.status ?? "starting");
-      state.status = `waiting for worker Pi daemon \xB7 ${status}`;
-      updatePiUi(ctx, state);
       if (TERMINAL_RUN_STATUSES.has(status.toLowerCase())) {
-        appendTranscript(state, "Error", `Run ended before worker Pi daemon became ready: ${status}`);
+        reportBridgeError(ctx, state, `Run ended before worker Pi daemon became ready: ${status}. Inspect with \`rig run show ${options.runId}\`; restart with \`rig task run --task <id>\`.`);
+        return false;
+      }
+      if (consecutiveFailures >= 5) {
+        state.status = `Rig server unreachable \xB7 retrying (${formatElapsed(startedAt)}) \xB7 /detach to exit`;
+      } else {
+        state.status = `waiting for worker Pi daemon \xB7 ${status} \xB7 ${formatElapsed(startedAt)} \xB7 /detach to exit`;
+      }
+      updatePiUi(ctx, state);
+      if (Date.now() >= deadline) {
+        reportBridgeError(ctx, state, `Worker Pi daemon did not become ready within ${formatElapsed(startedAt)} (last status: ${status}). ` + `Check \`rig run show ${options.runId}\` and \`rig doctor\`; the run may have been restarted by a server deploy. ` + "Set RIG_PI_ATTACH_TIMEOUT_MS to wait longer.");
         return false;
       }
       await Bun.sleep(typeof session.retryAfterMs === "number" ? session.retryAfterMs : 750);
@@ -943,7 +977,7 @@ function createRigWorkerPiBridgeExtension(options) {
       nativePiUiContextAvailable = Boolean(nativePiUi(ctx));
       state.nativeStream = nativePiUiContextAvailable;
       updatePiUi(ctx, state);
-      ctx.ui.notify(nativePiUiContextAvailable ? "Rig worker Pi native stream bridge loaded" : "Rig worker Pi bridge extension loaded (degraded widget fallback)", "info");
+      ctx.ui.notify(nativePiUiContextAvailable ? "Connected to the Rig worker session (native stream). /detach exits, /stop cancels the run." : "Connected to the Rig worker session (transcript view). /detach exits, /stop cancels the run.", "info");
       ctx.ui.onTerminalInput((data) => {
         if (data.includes("\x04")) {
           ctx.shutdown();

package/dist/src/commands/_pi-frontend.js

@@ -333,12 +333,12 @@ function parseExtensionUiRequest(value) {
 }
 function renderBridgeWidget(state) {
   const statusParts = [
-    state.wsConnected ? "live WS" : "WS pending",
+    state.wsConnected ? "live" : "connecting",
     state.status,
     state.model,
     state.cwd
   ].filter(Boolean);
-  const lines = [`Worker Pi daemon bridge \xB7 ${statusParts.join(" \xB7 ")}`];
+  const lines = [`Rig worker session \xB7 ${statusParts.join(" \xB7 ")}`];
   if (state.activity)
     lines.push(state.activity);
   if (state.commands.length > 0) {
@@ -348,27 +348,35 @@ function renderBridgeWidget(state) {
   if (state.transcript.length > 0) {
     lines.push(...state.transcript.slice(-MAX_TRANSCRIPT_LINES));
   } else {
-    lines.push("Waiting for worker Pi daemon transcript\u2026");
+    lines.push("Waiting for the worker session transcript\u2026 (/detach exits and leaves the worker running)");
   }
   if (state.pendingUi) {
     lines.push("");
-    lines.push(`Extension UI request \xB7 ${state.pendingUi.method}`);
+    lines.push(`Worker needs input \xB7 ${state.pendingUi.method}`);
     lines.push(state.pendingUi.prompt);
     state.pendingUi.options.forEach((option, index) => lines.push(`${index + 1}. ${option}`));
-    lines.push("Reply in the Pi editor. /cancel cancels this request.");
+    lines.push("Reply in the editor below. /cancel dismisses this request.");
   }
   return lines;
 }
+function reportBridgeError(ctx, state, message) {
+  appendTranscript(state, "Error", message);
+  state.status = message;
+  try {
+    ctx.ui.notify(message, "error");
+  } catch {}
+  updatePiUi(ctx, state);
+}
 function updatePiUi(ctx, state) {
-  ctx.ui.setTitle("Pi \xB7 Rig worker daemon");
-  ctx.ui.setStatus("rig-worker-pi", state.wsConnected ? "worker Pi WS live" : state.status);
+  ctx.ui.setTitle("Rig \xB7 worker session");
+  ctx.ui.setStatus("rig-worker-pi", state.wsConnected ? "worker session live" : state.status);
   syncNativeDisplayCwd(ctx, state);
   if (state.nativeStream && nativePiUi(ctx)) {
     ctx.ui.setWidget("rig-worker-pi-transcript", undefined);
     return;
   }
   ctx.ui.setWorkingVisible(false);
-  ctx.ui.setWidget("rig-worker-pi-transcript", [`Worker Pi daemon bridge \xB7 degraded widget transcript`, ...renderBridgeWidget(state)], { placement: "aboveEditor" });
+  ctx.ui.setWidget("rig-worker-pi-transcript", renderBridgeWidget(state), { placement: "aboveEditor" });
 }
 function applyStatus(state, payload) {
   const status = recordOf(payload.status) ?? payload;
@@ -513,19 +521,45 @@ function applyEnvelope(ctx, state, envelopeValue) {
   }
   syncNativeDisplayCwd(ctx, state);
 }
+function resolveAttachReadyTimeoutMs() {
+  const raw = Number.parseInt(process.env.RIG_PI_ATTACH_TIMEOUT_MS ?? "", 10);
+  return Number.isFinite(raw) && raw > 0 ? raw : 10 * 60000;
+}
+function formatElapsed(sinceMs) {
+  const totalSeconds = Math.floor((Date.now() - sinceMs) / 1000);
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return minutes > 0 ? `${minutes}m${String(seconds).padStart(2, "0")}s` : `${seconds}s`;
+}
 async function waitForWorkerReady(options, ctx, state) {
+  const startedAt = Date.now();
+  const deadline = startedAt + resolveAttachReadyTimeoutMs();
+  let consecutiveFailures = 0;
   while (true) {
-    const session = await getRunPiSessionViaServer(options.context, options.runId).catch((error) => ({
-      ready: false,
-      status: error instanceof Error ? error.message : String(error),
-      retryAfterMs: 1000
-    }));
+    let requestFailed = false;
+    const session = await getRunPiSessionViaServer(options.context, options.runId).catch((error) => {
+      requestFailed = true;
+      return {
+        ready: false,
+        status: error instanceof Error ? error.message : String(error),
+        retryAfterMs: 1000
+      };
+    });
     if (session.ready === false) {
+      consecutiveFailures = requestFailed ? consecutiveFailures + 1 : 0;
       const status = String(session.status ?? "starting");
-      state.status = `waiting for worker Pi daemon \xB7 ${status}`;
-      updatePiUi(ctx, state);
       if (TERMINAL_RUN_STATUSES.has(status.toLowerCase())) {
-        appendTranscript(state, "Error", `Run ended before worker Pi daemon became ready: ${status}`);
+        reportBridgeError(ctx, state, `Run ended before worker Pi daemon became ready: ${status}. Inspect with \`rig run show ${options.runId}\`; restart with \`rig task run --task <id>\`.`);
+        return false;
+      }
+      if (consecutiveFailures >= 5) {
+        state.status = `Rig server unreachable \xB7 retrying (${formatElapsed(startedAt)}) \xB7 /detach to exit`;
+      } else {
+        state.status = `waiting for worker Pi daemon \xB7 ${status} \xB7 ${formatElapsed(startedAt)} \xB7 /detach to exit`;
+      }
+      updatePiUi(ctx, state);
+      if (Date.now() >= deadline) {
+        reportBridgeError(ctx, state, `Worker Pi daemon did not become ready within ${formatElapsed(startedAt)} (last status: ${status}). ` + `Check \`rig run show ${options.runId}\` and \`rig doctor\`; the run may have been restarted by a server deploy. ` + "Set RIG_PI_ATTACH_TIMEOUT_MS to wait longer.");
         return false;
       }
       await Bun.sleep(typeof session.retryAfterMs === "number" ? session.retryAfterMs : 750);
@@ -733,7 +767,7 @@ function createRigWorkerPiBridgeExtension(options) {
       nativePiUiContextAvailable = Boolean(nativePiUi(ctx));
       state.nativeStream = nativePiUiContextAvailable;
       updatePiUi(ctx, state);
-      ctx.ui.notify(nativePiUiContextAvailable ? "Rig worker Pi native stream bridge loaded" : "Rig worker Pi bridge extension loaded (degraded widget fallback)", "info");
+      ctx.ui.notify(nativePiUiContextAvailable ? "Connected to the Rig worker session (native stream). /detach exits, /stop cancels the run." : "Connected to the Rig worker session (transcript view). /detach exits, /stop cancels the run.", "info");
       ctx.ui.onTerminalInput((data) => {
         if (data.includes("\x04")) {
           ctx.shutdown();

package/dist/src/commands/_pi-worker-bridge-extension.js

@@ -323,12 +323,12 @@ function parseExtensionUiRequest(value) {
 }
 function renderBridgeWidget(state) {
   const statusParts = [
-    state.wsConnected ? "live WS" : "WS pending",
+    state.wsConnected ? "live" : "connecting",
     state.status,
     state.model,
     state.cwd
   ].filter(Boolean);
-  const lines = [`Worker Pi daemon bridge \xB7 ${statusParts.join(" \xB7 ")}`];
+  const lines = [`Rig worker session \xB7 ${statusParts.join(" \xB7 ")}`];
   if (state.activity)
     lines.push(state.activity);
   if (state.commands.length > 0) {
@@ -338,27 +338,35 @@ function renderBridgeWidget(state) {
   if (state.transcript.length > 0) {
     lines.push(...state.transcript.slice(-MAX_TRANSCRIPT_LINES));
   } else {
-    lines.push("Waiting for worker Pi daemon transcript\u2026");
+    lines.push("Waiting for the worker session transcript\u2026 (/detach exits and leaves the worker running)");
   }
   if (state.pendingUi) {
     lines.push("");
-    lines.push(`Extension UI request \xB7 ${state.pendingUi.method}`);
+    lines.push(`Worker needs input \xB7 ${state.pendingUi.method}`);
     lines.push(state.pendingUi.prompt);
     state.pendingUi.options.forEach((option, index) => lines.push(`${index + 1}. ${option}`));
-    lines.push("Reply in the Pi editor. /cancel cancels this request.");
+    lines.push("Reply in the editor below. /cancel dismisses this request.");
   }
   return lines;
 }
+function reportBridgeError(ctx, state, message) {
+  appendTranscript(state, "Error", message);
+  state.status = message;
+  try {
+    ctx.ui.notify(message, "error");
+  } catch {}
+  updatePiUi(ctx, state);
+}
 function updatePiUi(ctx, state) {
-  ctx.ui.setTitle("Pi \xB7 Rig worker daemon");
-  ctx.ui.setStatus("rig-worker-pi", state.wsConnected ? "worker Pi WS live" : state.status);
+  ctx.ui.setTitle("Rig \xB7 worker session");
+  ctx.ui.setStatus("rig-worker-pi", state.wsConnected ? "worker session live" : state.status);
   syncNativeDisplayCwd(ctx, state);
   if (state.nativeStream && nativePiUi(ctx)) {
     ctx.ui.setWidget("rig-worker-pi-transcript", undefined);
     return;
   }
   ctx.ui.setWorkingVisible(false);
-  ctx.ui.setWidget("rig-worker-pi-transcript", [`Worker Pi daemon bridge \xB7 degraded widget transcript`, ...renderBridgeWidget(state)], { placement: "aboveEditor" });
+  ctx.ui.setWidget("rig-worker-pi-transcript", renderBridgeWidget(state), { placement: "aboveEditor" });
 }
 function applyStatus(state, payload) {
   const status = recordOf(payload.status) ?? payload;
@@ -503,19 +511,45 @@ function applyEnvelope(ctx, state, envelopeValue) {
   }
   syncNativeDisplayCwd(ctx, state);
 }
+function resolveAttachReadyTimeoutMs() {
+  const raw = Number.parseInt(process.env.RIG_PI_ATTACH_TIMEOUT_MS ?? "", 10);
+  return Number.isFinite(raw) && raw > 0 ? raw : 10 * 60000;
+}
+function formatElapsed(sinceMs) {
+  const totalSeconds = Math.floor((Date.now() - sinceMs) / 1000);
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return minutes > 0 ? `${minutes}m${String(seconds).padStart(2, "0")}s` : `${seconds}s`;
+}
 async function waitForWorkerReady(options, ctx, state) {
+  const startedAt = Date.now();
+  const deadline = startedAt + resolveAttachReadyTimeoutMs();
+  let consecutiveFailures = 0;
   while (true) {
-    const session = await getRunPiSessionViaServer(options.context, options.runId).catch((error) => ({
-      ready: false,
-      status: error instanceof Error ? error.message : String(error),
-      retryAfterMs: 1000
-    }));
+    let requestFailed = false;
+    const session = await getRunPiSessionViaServer(options.context, options.runId).catch((error) => {
+      requestFailed = true;
+      return {
+        ready: false,
+        status: error instanceof Error ? error.message : String(error),
+        retryAfterMs: 1000
+      };
+    });
     if (session.ready === false) {
+      consecutiveFailures = requestFailed ? consecutiveFailures + 1 : 0;
       const status = String(session.status ?? "starting");
-      state.status = `waiting for worker Pi daemon \xB7 ${status}`;
-      updatePiUi(ctx, state);
       if (TERMINAL_RUN_STATUSES.has(status.toLowerCase())) {
-        appendTranscript(state, "Error", `Run ended before worker Pi daemon became ready: ${status}`);
+        reportBridgeError(ctx, state, `Run ended before worker Pi daemon became ready: ${status}. Inspect with \`rig run show ${options.runId}\`; restart with \`rig task run --task <id>\`.`);
+        return false;
+      }
+      if (consecutiveFailures >= 5) {
+        state.status = `Rig server unreachable \xB7 retrying (${formatElapsed(startedAt)}) \xB7 /detach to exit`;
+      } else {
+        state.status = `waiting for worker Pi daemon \xB7 ${status} \xB7 ${formatElapsed(startedAt)} \xB7 /detach to exit`;
+      }
+      updatePiUi(ctx, state);
+      if (Date.now() >= deadline) {
+        reportBridgeError(ctx, state, `Worker Pi daemon did not become ready within ${formatElapsed(startedAt)} (last status: ${status}). ` + `Check \`rig run show ${options.runId}\` and \`rig doctor\`; the run may have been restarted by a server deploy. ` + "Set RIG_PI_ATTACH_TIMEOUT_MS to wait longer.");
         return false;
       }
       await Bun.sleep(typeof session.retryAfterMs === "number" ? session.retryAfterMs : 750);
@@ -723,7 +757,7 @@ function createRigWorkerPiBridgeExtension(options) {
       nativePiUiContextAvailable = Boolean(nativePiUi(ctx));
       state.nativeStream = nativePiUiContextAvailable;
       updatePiUi(ctx, state);
-      ctx.ui.notify(nativePiUiContextAvailable ? "Rig worker Pi native stream bridge loaded" : "Rig worker Pi bridge extension loaded (degraded widget fallback)", "info");
+      ctx.ui.notify(nativePiUiContextAvailable ? "Connected to the Rig worker session (native stream). /detach exits, /stop cancels the run." : "Connected to the Rig worker session (transcript view). /detach exits, /stop cancels the run.", "info");
       ctx.ui.onTerminalInput((data) => {
         if (data.includes("\x04")) {
           ctx.shutdown();

package/dist/src/commands/run.js

@@ -621,12 +621,12 @@ function parseExtensionUiRequest(value) {
 }
 function renderBridgeWidget(state) {
   const statusParts = [
-    state.wsConnected ? "live WS" : "WS pending",
+    state.wsConnected ? "live" : "connecting",
     state.status,
     state.model,
     state.cwd
   ].filter(Boolean);
-  const lines = [`Worker Pi daemon bridge \xB7 ${statusParts.join(" \xB7 ")}`];
+  const lines = [`Rig worker session \xB7 ${statusParts.join(" \xB7 ")}`];
   if (state.activity)
     lines.push(state.activity);
   if (state.commands.length > 0) {
@@ -636,27 +636,35 @@ function renderBridgeWidget(state) {
   if (state.transcript.length > 0) {
     lines.push(...state.transcript.slice(-MAX_TRANSCRIPT_LINES));
   } else {
-    lines.push("Waiting for worker Pi daemon transcript\u2026");
+    lines.push("Waiting for the worker session transcript\u2026 (/detach exits and leaves the worker running)");
   }
   if (state.pendingUi) {
     lines.push("");
-    lines.push(`Extension UI request \xB7 ${state.pendingUi.method}`);
+    lines.push(`Worker needs input \xB7 ${state.pendingUi.method}`);
     lines.push(state.pendingUi.prompt);
     state.pendingUi.options.forEach((option, index) => lines.push(`${index + 1}. ${option}`));
-    lines.push("Reply in the Pi editor. /cancel cancels this request.");
+    lines.push("Reply in the editor below. /cancel dismisses this request.");
   }
   return lines;
 }
+function reportBridgeError(ctx, state, message) {
+  appendTranscript(state, "Error", message);
+  state.status = message;
+  try {
+    ctx.ui.notify(message, "error");
+  } catch {}
+  updatePiUi(ctx, state);
+}
 function updatePiUi(ctx, state) {
-  ctx.ui.setTitle("Pi \xB7 Rig worker daemon");
-  ctx.ui.setStatus("rig-worker-pi", state.wsConnected ? "worker Pi WS live" : state.status);
+  ctx.ui.setTitle("Rig \xB7 worker session");
+  ctx.ui.setStatus("rig-worker-pi", state.wsConnected ? "worker session live" : state.status);
   syncNativeDisplayCwd(ctx, state);
   if (state.nativeStream && nativePiUi(ctx)) {
     ctx.ui.setWidget("rig-worker-pi-transcript", undefined);
     return;
   }
   ctx.ui.setWorkingVisible(false);
-  ctx.ui.setWidget("rig-worker-pi-transcript", [`Worker Pi daemon bridge \xB7 degraded widget transcript`, ...renderBridgeWidget(state)], { placement: "aboveEditor" });
+  ctx.ui.setWidget("rig-worker-pi-transcript", renderBridgeWidget(state), { placement: "aboveEditor" });
 }
 function applyStatus(state, payload) {
   const status = recordOf(payload.status) ?? payload;
@@ -801,19 +809,45 @@ function applyEnvelope(ctx, state, envelopeValue) {
   }
   syncNativeDisplayCwd(ctx, state);
 }
+function resolveAttachReadyTimeoutMs() {
+  const raw = Number.parseInt(process.env.RIG_PI_ATTACH_TIMEOUT_MS ?? "", 10);
+  return Number.isFinite(raw) && raw > 0 ? raw : 10 * 60000;
+}
+function formatElapsed(sinceMs) {
+  const totalSeconds = Math.floor((Date.now() - sinceMs) / 1000);
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return minutes > 0 ? `${minutes}m${String(seconds).padStart(2, "0")}s` : `${seconds}s`;
+}
 async function waitForWorkerReady(options, ctx, state) {
+  const startedAt = Date.now();
+  const deadline = startedAt + resolveAttachReadyTimeoutMs();
+  let consecutiveFailures = 0;
   while (true) {
-    const session = await getRunPiSessionViaServer(options.context, options.runId).catch((error) => ({
-      ready: false,
-      status: error instanceof Error ? error.message : String(error),
-      retryAfterMs: 1000
-    }));
+    let requestFailed = false;
+    const session = await getRunPiSessionViaServer(options.context, options.runId).catch((error) => {
+      requestFailed = true;
+      return {
+        ready: false,
+        status: error instanceof Error ? error.message : String(error),
+        retryAfterMs: 1000
+      };
+    });
     if (session.ready === false) {
+      consecutiveFailures = requestFailed ? consecutiveFailures + 1 : 0;
       const status = String(session.status ?? "starting");
-      state.status = `waiting for worker Pi daemon \xB7 ${status}`;
-      updatePiUi(ctx, state);
       if (TERMINAL_RUN_STATUSES.has(status.toLowerCase())) {
-        appendTranscript(state, "Error", `Run ended before worker Pi daemon became ready: ${status}`);
+        reportBridgeError(ctx, state, `Run ended before worker Pi daemon became ready: ${status}. Inspect with \`rig run show ${options.runId}\`; restart with \`rig task run --task <id>\`.`);
+        return false;
+      }
+      if (consecutiveFailures >= 5) {
+        state.status = `Rig server unreachable \xB7 retrying (${formatElapsed(startedAt)}) \xB7 /detach to exit`;
+      } else {
+        state.status = `waiting for worker Pi daemon \xB7 ${status} \xB7 ${formatElapsed(startedAt)} \xB7 /detach to exit`;
+      }
+      updatePiUi(ctx, state);
+      if (Date.now() >= deadline) {
+        reportBridgeError(ctx, state, `Worker Pi daemon did not become ready within ${formatElapsed(startedAt)} (last status: ${status}). ` + `Check \`rig run show ${options.runId}\` and \`rig doctor\`; the run may have been restarted by a server deploy. ` + "Set RIG_PI_ATTACH_TIMEOUT_MS to wait longer.");
         return false;
       }
       await Bun.sleep(typeof session.retryAfterMs === "number" ? session.retryAfterMs : 750);
@@ -1021,7 +1055,7 @@ function createRigWorkerPiBridgeExtension(options) {
       nativePiUiContextAvailable = Boolean(nativePiUi(ctx));
       state.nativeStream = nativePiUiContextAvailable;
       updatePiUi(ctx, state);
-      ctx.ui.notify(nativePiUiContextAvailable ? "Rig worker Pi native stream bridge loaded" : "Rig worker Pi bridge extension loaded (degraded widget fallback)", "info");
+      ctx.ui.notify(nativePiUiContextAvailable ? "Connected to the Rig worker session (native stream). /detach exits, /stop cancels the run." : "Connected to the Rig worker session (transcript view). /detach exits, /stop cancels the run.", "info");
       ctx.ui.onTerminalInput((data) => {
         if (data.includes("\x04")) {
           ctx.shutdown();

package/dist/src/commands/task.js

@@ -1024,12 +1024,12 @@ function parseExtensionUiRequest(value) {
 }
 function renderBridgeWidget(state) {
   const statusParts = [
-    state.wsConnected ? "live WS" : "WS pending",
+    state.wsConnected ? "live" : "connecting",
     state.status,
     state.model,
     state.cwd
   ].filter(Boolean);
-  const lines = [`Worker Pi daemon bridge \xB7 ${statusParts.join(" \xB7 ")}`];
+  const lines = [`Rig worker session \xB7 ${statusParts.join(" \xB7 ")}`];
   if (state.activity)
     lines.push(state.activity);
   if (state.commands.length > 0) {
@@ -1039,27 +1039,35 @@ function renderBridgeWidget(state) {
   if (state.transcript.length > 0) {
     lines.push(...state.transcript.slice(-MAX_TRANSCRIPT_LINES));
   } else {
-    lines.push("Waiting for worker Pi daemon transcript\u2026");
+    lines.push("Waiting for the worker session transcript\u2026 (/detach exits and leaves the worker running)");
   }
   if (state.pendingUi) {
     lines.push("");
-    lines.push(`Extension UI request \xB7 ${state.pendingUi.method}`);
+    lines.push(`Worker needs input \xB7 ${state.pendingUi.method}`);
     lines.push(state.pendingUi.prompt);
     state.pendingUi.options.forEach((option, index) => lines.push(`${index + 1}. ${option}`));
-    lines.push("Reply in the Pi editor. /cancel cancels this request.");
+    lines.push("Reply in the editor below. /cancel dismisses this request.");
   }
   return lines;
 }
+function reportBridgeError(ctx, state, message2) {
+  appendTranscript(state, "Error", message2);
+  state.status = message2;
+  try {
+    ctx.ui.notify(message2, "error");
+  } catch {}
+  updatePiUi(ctx, state);
+}
 function updatePiUi(ctx, state) {
-  ctx.ui.setTitle("Pi \xB7 Rig worker daemon");
-  ctx.ui.setStatus("rig-worker-pi", state.wsConnected ? "worker Pi WS live" : state.status);
+  ctx.ui.setTitle("Rig \xB7 worker session");
+  ctx.ui.setStatus("rig-worker-pi", state.wsConnected ? "worker session live" : state.status);
   syncNativeDisplayCwd(ctx, state);
   if (state.nativeStream && nativePiUi(ctx)) {
     ctx.ui.setWidget("rig-worker-pi-transcript", undefined);
     return;
   }
   ctx.ui.setWorkingVisible(false);
-  ctx.ui.setWidget("rig-worker-pi-transcript", [`Worker Pi daemon bridge \xB7 degraded widget transcript`, ...renderBridgeWidget(state)], { placement: "aboveEditor" });
+  ctx.ui.setWidget("rig-worker-pi-transcript", renderBridgeWidget(state), { placement: "aboveEditor" });
 }
 function applyStatus(state, payload) {
   const status = recordOf(payload.status) ?? payload;
@@ -1204,19 +1212,45 @@ function applyEnvelope(ctx, state, envelopeValue) {
   }
   syncNativeDisplayCwd(ctx, state);
 }
+function resolveAttachReadyTimeoutMs() {
+  const raw = Number.parseInt(process.env.RIG_PI_ATTACH_TIMEOUT_MS ?? "", 10);
+  return Number.isFinite(raw) && raw > 0 ? raw : 10 * 60000;
+}
+function formatElapsed(sinceMs) {
+  const totalSeconds = Math.floor((Date.now() - sinceMs) / 1000);
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return minutes > 0 ? `${minutes}m${String(seconds).padStart(2, "0")}s` : `${seconds}s`;
+}
 async function waitForWorkerReady(options, ctx, state) {
+  const startedAt = Date.now();
+  const deadline = startedAt + resolveAttachReadyTimeoutMs();
+  let consecutiveFailures = 0;
   while (true) {
-    const session = await getRunPiSessionViaServer(options.context, options.runId).catch((error) => ({
-      ready: false,
-      status: error instanceof Error ? error.message : String(error),
-      retryAfterMs: 1000
-    }));
+    let requestFailed = false;
+    const session = await getRunPiSessionViaServer(options.context, options.runId).catch((error) => {
+      requestFailed = true;
+      return {
+        ready: false,
+        status: error instanceof Error ? error.message : String(error),
+        retryAfterMs: 1000
+      };
+    });
     if (session.ready === false) {
+      consecutiveFailures = requestFailed ? consecutiveFailures + 1 : 0;
       const status = String(session.status ?? "starting");
-      state.status = `waiting for worker Pi daemon \xB7 ${status}`;
-      updatePiUi(ctx, state);
       if (TERMINAL_RUN_STATUSES.has(status.toLowerCase())) {
-        appendTranscript(state, "Error", `Run ended before worker Pi daemon became ready: ${status}`);
+        reportBridgeError(ctx, state, `Run ended before worker Pi daemon became ready: ${status}. Inspect with \`rig run show ${options.runId}\`; restart with \`rig task run --task <id>\`.`);
+        return false;
+      }
+      if (consecutiveFailures >= 5) {
+        state.status = `Rig server unreachable \xB7 retrying (${formatElapsed(startedAt)}) \xB7 /detach to exit`;
+      } else {
+        state.status = `waiting for worker Pi daemon \xB7 ${status} \xB7 ${formatElapsed(startedAt)} \xB7 /detach to exit`;
+      }
+      updatePiUi(ctx, state);
+      if (Date.now() >= deadline) {
+        reportBridgeError(ctx, state, `Worker Pi daemon did not become ready within ${formatElapsed(startedAt)} (last status: ${status}). ` + `Check \`rig run show ${options.runId}\` and \`rig doctor\`; the run may have been restarted by a server deploy. ` + "Set RIG_PI_ATTACH_TIMEOUT_MS to wait longer.");
         return false;
       }
       await Bun.sleep(typeof session.retryAfterMs === "number" ? session.retryAfterMs : 750);
@@ -1424,7 +1458,7 @@ function createRigWorkerPiBridgeExtension(options) {
       nativePiUiContextAvailable = Boolean(nativePiUi(ctx));
       state.nativeStream = nativePiUiContextAvailable;
       updatePiUi(ctx, state);
-      ctx.ui.notify(nativePiUiContextAvailable ? "Rig worker Pi native stream bridge loaded" : "Rig worker Pi bridge extension loaded (degraded widget fallback)", "info");
+      ctx.ui.notify(nativePiUiContextAvailable ? "Connected to the Rig worker session (native stream). /detach exits, /stop cancels the run." : "Connected to the Rig worker session (transcript view). /detach exits, /stop cancels the run.", "info");
       ctx.ui.onTerminalInput((data) => {
         if (data.includes("\x04")) {
           ctx.shutdown();

package/dist/src/commands.js

@@ -7079,12 +7079,12 @@ function parseExtensionUiRequest(value) {
 }
 function renderBridgeWidget(state) {
   const statusParts = [
-    state.wsConnected ? "live WS" : "WS pending",
+    state.wsConnected ? "live" : "connecting",
     state.status,
     state.model,
     state.cwd
   ].filter(Boolean);
-  const lines = [`Worker Pi daemon bridge \xB7 ${statusParts.join(" \xB7 ")}`];
+  const lines = [`Rig worker session \xB7 ${statusParts.join(" \xB7 ")}`];
   if (state.activity)
     lines.push(state.activity);
   if (state.commands.length > 0) {
@@ -7094,27 +7094,35 @@ function renderBridgeWidget(state) {
   if (state.transcript.length > 0) {
     lines.push(...state.transcript.slice(-MAX_TRANSCRIPT_LINES));
   } else {
-    lines.push("Waiting for worker Pi daemon transcript\u2026");
+    lines.push("Waiting for the worker session transcript\u2026 (/detach exits and leaves the worker running)");
   }
   if (state.pendingUi) {
     lines.push("");
-    lines.push(`Extension UI request \xB7 ${state.pendingUi.method}`);
+    lines.push(`Worker needs input \xB7 ${state.pendingUi.method}`);
     lines.push(state.pendingUi.prompt);
     state.pendingUi.options.forEach((option, index) => lines.push(`${index + 1}. ${option}`));
-    lines.push("Reply in the Pi editor. /cancel cancels this request.");
+    lines.push("Reply in the editor below. /cancel dismisses this request.");
   }
   return lines;
 }
+function reportBridgeError(ctx, state, message2) {
+  appendTranscript(state, "Error", message2);
+  state.status = message2;
+  try {
+    ctx.ui.notify(message2, "error");
+  } catch {}
+  updatePiUi(ctx, state);
+}
 function updatePiUi(ctx, state) {
-  ctx.ui.setTitle("Pi \xB7 Rig worker daemon");
-  ctx.ui.setStatus("rig-worker-pi", state.wsConnected ? "worker Pi WS live" : state.status);
+  ctx.ui.setTitle("Rig \xB7 worker session");
+  ctx.ui.setStatus("rig-worker-pi", state.wsConnected ? "worker session live" : state.status);
   syncNativeDisplayCwd(ctx, state);
   if (state.nativeStream && nativePiUi(ctx)) {
     ctx.ui.setWidget("rig-worker-pi-transcript", undefined);
     return;
   }
   ctx.ui.setWorkingVisible(false);
-  ctx.ui.setWidget("rig-worker-pi-transcript", [`Worker Pi daemon bridge \xB7 degraded widget transcript`, ...renderBridgeWidget(state)], { placement: "aboveEditor" });
+  ctx.ui.setWidget("rig-worker-pi-transcript", renderBridgeWidget(state), { placement: "aboveEditor" });
 }
 function applyStatus(state, payload) {
   const status = recordOf(payload.status) ?? payload;
@@ -7259,19 +7267,45 @@ function applyEnvelope(ctx, state, envelopeValue) {
   }
   syncNativeDisplayCwd(ctx, state);
 }
+function resolveAttachReadyTimeoutMs() {
+  const raw = Number.parseInt(process.env.RIG_PI_ATTACH_TIMEOUT_MS ?? "", 10);
+  return Number.isFinite(raw) && raw > 0 ? raw : 10 * 60000;
+}
+function formatElapsed(sinceMs) {
+  const totalSeconds = Math.floor((Date.now() - sinceMs) / 1000);
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return minutes > 0 ? `${minutes}m${String(seconds).padStart(2, "0")}s` : `${seconds}s`;
+}
 async function waitForWorkerReady(options, ctx, state) {
+  const startedAt = Date.now();
+  const deadline = startedAt + resolveAttachReadyTimeoutMs();
+  let consecutiveFailures = 0;
   while (true) {
-    const session = await getRunPiSessionViaServer(options.context, options.runId).catch((error) => ({
-      ready: false,
-      status: error instanceof Error ? error.message : String(error),
-      retryAfterMs: 1000
-    }));
+    let requestFailed = false;
+    const session = await getRunPiSessionViaServer(options.context, options.runId).catch((error) => {
+      requestFailed = true;
+      return {
+        ready: false,
+        status: error instanceof Error ? error.message : String(error),
+        retryAfterMs: 1000
+      };
+    });
     if (session.ready === false) {
+      consecutiveFailures = requestFailed ? consecutiveFailures + 1 : 0;
       const status = String(session.status ?? "starting");
-      state.status = `waiting for worker Pi daemon \xB7 ${status}`;
-      updatePiUi(ctx, state);
       if (TERMINAL_RUN_STATUSES.has(status.toLowerCase())) {
-        appendTranscript(state, "Error", `Run ended before worker Pi daemon became ready: ${status}`);
+        reportBridgeError(ctx, state, `Run ended before worker Pi daemon became ready: ${status}. Inspect with \`rig run show ${options.runId}\`; restart with \`rig task run --task <id>\`.`);
+        return false;
+      }
+      if (consecutiveFailures >= 5) {
+        state.status = `Rig server unreachable \xB7 retrying (${formatElapsed(startedAt)}) \xB7 /detach to exit`;
+      } else {
+        state.status = `waiting for worker Pi daemon \xB7 ${status} \xB7 ${formatElapsed(startedAt)} \xB7 /detach to exit`;
+      }
+      updatePiUi(ctx, state);
+      if (Date.now() >= deadline) {
+        reportBridgeError(ctx, state, `Worker Pi daemon did not become ready within ${formatElapsed(startedAt)} (last status: ${status}). ` + `Check \`rig run show ${options.runId}\` and \`rig doctor\`; the run may have been restarted by a server deploy. ` + "Set RIG_PI_ATTACH_TIMEOUT_MS to wait longer.");
         return false;
       }
       await Bun.sleep(typeof session.retryAfterMs === "number" ? session.retryAfterMs : 750);
@@ -7479,7 +7513,7 @@ function createRigWorkerPiBridgeExtension(options) {
       nativePiUiContextAvailable = Boolean(nativePiUi(ctx));
       state.nativeStream = nativePiUiContextAvailable;
       updatePiUi(ctx, state);
-      ctx.ui.notify(nativePiUiContextAvailable ? "Rig worker Pi native stream bridge loaded" : "Rig worker Pi bridge extension loaded (degraded widget fallback)", "info");
+      ctx.ui.notify(nativePiUiContextAvailable ? "Connected to the Rig worker session (native stream). /detach exits, /stop cancels the run." : "Connected to the Rig worker session (transcript view). /detach exits, /stop cancels the run.", "info");
       ctx.ui.onTerminalInput((data) => {
         if (data.includes("\x04")) {
           ctx.shutdown();
@@ -11467,9 +11501,11 @@ ${helpText()}`);
         const path = await import("path");
         const { fileURLToPath } = await import("url");
         const execPath = process.execPath || "";
+        const moduleDir = path.dirname(fileURLToPath(import.meta.url));
         const candidates = [
           execPath ? path.resolve(path.dirname(execPath), "..", "manifest.json") : "",
-          path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..", "package.json"),
+          path.resolve(moduleDir, "..", "package.json"),
+          path.resolve(moduleDir, "..", "..", "package.json"),
           path.resolve(process.cwd(), "packages/cli/package.json")
         ].filter(Boolean);
         for (const candidate of candidates) {

package/dist/src/index.js

@@ -7269,12 +7269,12 @@ function parseExtensionUiRequest(value) {
 }
 function renderBridgeWidget(state) {
   const statusParts = [
-    state.wsConnected ? "live WS" : "WS pending",
+    state.wsConnected ? "live" : "connecting",
     state.status,
     state.model,
     state.cwd
   ].filter(Boolean);
-  const lines = [`Worker Pi daemon bridge \xB7 ${statusParts.join(" \xB7 ")}`];
+  const lines = [`Rig worker session \xB7 ${statusParts.join(" \xB7 ")}`];
   if (state.activity)
     lines.push(state.activity);
   if (state.commands.length > 0) {
@@ -7284,27 +7284,35 @@ function renderBridgeWidget(state) {
   if (state.transcript.length > 0) {
     lines.push(...state.transcript.slice(-MAX_TRANSCRIPT_LINES));
   } else {
-    lines.push("Waiting for worker Pi daemon transcript\u2026");
+    lines.push("Waiting for the worker session transcript\u2026 (/detach exits and leaves the worker running)");
   }
   if (state.pendingUi) {
     lines.push("");
-    lines.push(`Extension UI request \xB7 ${state.pendingUi.method}`);
+    lines.push(`Worker needs input \xB7 ${state.pendingUi.method}`);
     lines.push(state.pendingUi.prompt);
     state.pendingUi.options.forEach((option, index) => lines.push(`${index + 1}. ${option}`));
-    lines.push("Reply in the Pi editor. /cancel cancels this request.");
+    lines.push("Reply in the editor below. /cancel dismisses this request.");
   }
   return lines;
 }
+function reportBridgeError(ctx, state, message2) {
+  appendTranscript(state, "Error", message2);
+  state.status = message2;
+  try {
+    ctx.ui.notify(message2, "error");
+  } catch {}
+  updatePiUi(ctx, state);
+}
 function updatePiUi(ctx, state) {
-  ctx.ui.setTitle("Pi \xB7 Rig worker daemon");
-  ctx.ui.setStatus("rig-worker-pi", state.wsConnected ? "worker Pi WS live" : state.status);
+  ctx.ui.setTitle("Rig \xB7 worker session");
+  ctx.ui.setStatus("rig-worker-pi", state.wsConnected ? "worker session live" : state.status);
   syncNativeDisplayCwd(ctx, state);
   if (state.nativeStream && nativePiUi(ctx)) {
     ctx.ui.setWidget("rig-worker-pi-transcript", undefined);
     return;
   }
   ctx.ui.setWorkingVisible(false);
-  ctx.ui.setWidget("rig-worker-pi-transcript", [`Worker Pi daemon bridge \xB7 degraded widget transcript`, ...renderBridgeWidget(state)], { placement: "aboveEditor" });
+  ctx.ui.setWidget("rig-worker-pi-transcript", renderBridgeWidget(state), { placement: "aboveEditor" });
 }
 function applyStatus(state, payload) {
   const status = recordOf(payload.status) ?? payload;
@@ -7449,19 +7457,45 @@ function applyEnvelope(ctx, state, envelopeValue) {
   }
   syncNativeDisplayCwd(ctx, state);
 }
+function resolveAttachReadyTimeoutMs() {
+  const raw = Number.parseInt(process.env.RIG_PI_ATTACH_TIMEOUT_MS ?? "", 10);
+  return Number.isFinite(raw) && raw > 0 ? raw : 10 * 60000;
+}
+function formatElapsed(sinceMs) {
+  const totalSeconds = Math.floor((Date.now() - sinceMs) / 1000);
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return minutes > 0 ? `${minutes}m${String(seconds).padStart(2, "0")}s` : `${seconds}s`;
+}
 async function waitForWorkerReady(options, ctx, state) {
+  const startedAt = Date.now();
+  const deadline = startedAt + resolveAttachReadyTimeoutMs();
+  let consecutiveFailures = 0;
   while (true) {
-    const session = await getRunPiSessionViaServer(options.context, options.runId).catch((error) => ({
-      ready: false,
-      status: error instanceof Error ? error.message : String(error),
-      retryAfterMs: 1000
-    }));
+    let requestFailed = false;
+    const session = await getRunPiSessionViaServer(options.context, options.runId).catch((error) => {
+      requestFailed = true;
+      return {
+        ready: false,
+        status: error instanceof Error ? error.message : String(error),
+        retryAfterMs: 1000
+      };
+    });
     if (session.ready === false) {
+      consecutiveFailures = requestFailed ? consecutiveFailures + 1 : 0;
       const status = String(session.status ?? "starting");
-      state.status = `waiting for worker Pi daemon \xB7 ${status}`;
-      updatePiUi(ctx, state);
       if (TERMINAL_RUN_STATUSES.has(status.toLowerCase())) {
-        appendTranscript(state, "Error", `Run ended before worker Pi daemon became ready: ${status}`);
+        reportBridgeError(ctx, state, `Run ended before worker Pi daemon became ready: ${status}. Inspect with \`rig run show ${options.runId}\`; restart with \`rig task run --task <id>\`.`);
+        return false;
+      }
+      if (consecutiveFailures >= 5) {
+        state.status = `Rig server unreachable \xB7 retrying (${formatElapsed(startedAt)}) \xB7 /detach to exit`;
+      } else {
+        state.status = `waiting for worker Pi daemon \xB7 ${status} \xB7 ${formatElapsed(startedAt)} \xB7 /detach to exit`;
+      }
+      updatePiUi(ctx, state);
+      if (Date.now() >= deadline) {
+        reportBridgeError(ctx, state, `Worker Pi daemon did not become ready within ${formatElapsed(startedAt)} (last status: ${status}). ` + `Check \`rig run show ${options.runId}\` and \`rig doctor\`; the run may have been restarted by a server deploy. ` + "Set RIG_PI_ATTACH_TIMEOUT_MS to wait longer.");
         return false;
       }
       await Bun.sleep(typeof session.retryAfterMs === "number" ? session.retryAfterMs : 750);
@@ -7669,7 +7703,7 @@ function createRigWorkerPiBridgeExtension(options) {
       nativePiUiContextAvailable = Boolean(nativePiUi(ctx));
       state.nativeStream = nativePiUiContextAvailable;
       updatePiUi(ctx, state);
-      ctx.ui.notify(nativePiUiContextAvailable ? "Rig worker Pi native stream bridge loaded" : "Rig worker Pi bridge extension loaded (degraded widget fallback)", "info");
+      ctx.ui.notify(nativePiUiContextAvailable ? "Connected to the Rig worker session (native stream). /detach exits, /stop cancels the run." : "Connected to the Rig worker session (transcript view). /detach exits, /stop cancels the run.", "info");
       ctx.ui.onTerminalInput((data) => {
         if (data.includes("\x04")) {
           ctx.shutdown();
@@ -11657,9 +11691,11 @@ ${helpText()}`);
         const path = await import("path");
         const { fileURLToPath } = await import("url");
         const execPath = process.execPath || "";
+        const moduleDir = path.dirname(fileURLToPath(import.meta.url));
         const candidates = [
           execPath ? path.resolve(path.dirname(execPath), "..", "manifest.json") : "",
-          path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..", "package.json"),
+          path.resolve(moduleDir, "..", "package.json"),
+          path.resolve(moduleDir, "..", "..", "package.json"),
           path.resolve(process.cwd(), "packages/cli/package.json")
         ].filter(Boolean);
         for (const candidate of candidates) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/cli",
-  "version": "0.0.6-alpha.31",
+  "version": "0.0.6-alpha.33",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -23,11 +23,11 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@earendil-works/pi-coding-agent": "npm:@h-rig/pi-coding-agent@0.0.6-alpha.31",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.31",
-    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.31",
-    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.31",
-    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.31",
+    "@earendil-works/pi-coding-agent": "npm:@h-rig/pi-coding-agent@0.0.6-alpha.33",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.33",
+    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.33",
+    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.33",
+    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.33",
     "picocolors": "^1.1.1"
   }
 }