fix: stale flag-name strings + WebSocket reconnect ceiling

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: hugocasa

backend/src/__tests__/linear-service.test.ts

@@ -492,5 +492,11 @@ describe("buildLinearSummaryMarkdown", () => {
     expect(md).toContain("PR: https://github.com/org/repo/pull/12");
     expect(md).toContain("webmux-state:feat/foo");
     expect(md).toContain("0.31.0");
+    // Guards against the rename regression that shipped --resume-from-linear
+    // (and earlier --from-linear) instructions to users after the flag was
+    // consolidated into --linear.
+    expect(md).toContain("webmux oneshot --linear");
+    expect(md).not.toContain("--resume-from-linear");
+    expect(md).not.toContain("--from-linear");
   });
 });

backend/src/services/linear-service.ts

@@ -550,7 +550,7 @@ export async function fetchAssignedIssues(options?: { skipCache?: boolean }): Pr
   return result;
 }
 
-// ── Issue + attachments query (for resume-from-linear / post-to-linear) ─────
+// ── Issue + attachments query (for --linear / `webmux linear post`) ─────────
 
 const ISSUE_WITH_ATTACHMENTS_QUERY = `
   query IssueWithAttachments($id: String!) {
@@ -821,7 +821,7 @@ export function buildLinearSummaryMarkdown(input: LinearSummaryInput): string {
   lines.push(`- Transcript: see attachment \`${input.attachmentTitle}\``);
   if (input.webmuxVersion) lines.push(`- webmux: ${input.webmuxVersion}`);
   lines.push("");
-  lines.push("_Resume on another machine with_ `webmux oneshot --resume-from-linear <issue-id>`.");
+  lines.push("_Resume on another machine with_ `webmux oneshot --linear <issue-id>`.");
   return lines.join("\n");
 }
 

bin/src/oneshot.ts

@@ -346,21 +346,31 @@ function handleConversationEvent(
   }
 }
 
+// Cap reconnects so a permanently-down server can't leave the CLI hanging
+// silently. We reset the counter on every successful `open` — only consecutive
+// failed attempts (no `open` in between) count toward the limit.
+const MAX_CONSECUTIVE_RECONNECTS = 10;
+
 function streamConversation(
   branch: string,
   port: number,
   state: ConversationPrintState,
   stderr: (line: string) => void,
+  onFatal: (reason: string) => void,
 ): { close: () => void } {
   let closed = false;
   let socket: WebSocket | null = null;
   let reconnectTimer: ReturnType<typeof setTimeout> | null = null;
+  let consecutiveFailures = 0;
 
   const connect = (): void => {
     if (closed) return;
     const url = `ws://localhost:${port}${apiPaths.streamAgentsWorktreeConversation.replace(":name", encodeURIComponent(branch))}`;
     const ws = new WebSocket(url);
     socket = ws;
+    ws.addEventListener("open", () => {
+      consecutiveFailures = 0;
+    });
     ws.addEventListener("message", (event) => {
       if (typeof event.data !== "string") return;
       try {
@@ -373,6 +383,12 @@ function streamConversation(
     ws.addEventListener("close", () => {
       socket = null;
       if (closed) return;
+      consecutiveFailures += 1;
+      if (consecutiveFailures >= MAX_CONSECUTIVE_RECONNECTS) {
+        closed = true;
+        onFatal(`webmux server unreachable after ${consecutiveFailures} reconnect attempts`);
+        return;
+      }
       reconnectTimer = setTimeout(connect, 2000);
     });
     ws.addEventListener("error", () => {
@@ -619,7 +635,7 @@ export async function runOneshot(parsed: ParsedOneshotCommand, port: number): Pr
     // to stay consistent with `webmux add --from-linear`. The server still
     // accepts a `fromLinear.issueId` payload — it just doesn't need to re-fetch
     // because we pass the resolved branch + conversationContext explicitly.
-    if (postToLinearTarget?.kind === "team" && !fromLinearIssueId) {
+    if (postToLinearTarget?.kind === "team") {
       const title = deriveOneshotIssueTitle(parsed.prompt);
       if (!title) {
         stderr(`[${timestamp()}] [error] --linear ${postToLinearTarget.teamKey} requires --prompt to derive an issue title`);
@@ -731,25 +747,30 @@ export async function runOneshot(parsed: ParsedOneshotCommand, port: number): Pr
     // Conversation history may not yet be available for non-codex agents — fall through to streaming.
   }
 
-  const stream = streamConversation(branch, port, conversationState, stderr);
-  const historyPoller = pollConversationHistory(branch, port, conversationState);
-
   let resolveExit!: (code: number) => void;
   const exitPromise = new Promise<number>((resolve) => {
     resolveExit = resolve;
   });
   let exiting = false;
+  let stream: { close: () => void } | null = null;
+  let historyPoller: { stop: () => void } | null = null;
   let poller: { stop: () => void } | null = null;
   const finalize = (code: number): void => {
     if (exiting) return;
     exiting = true;
-    stream.close();
-    historyPoller.stop();
+    stream?.close();
+    historyPoller?.stop();
     poller?.stop();
     flushStreamingLine(conversationState);
     resolveExit(code);
   };
 
+  stream = streamConversation(branch, port, conversationState, stderr, (reason) => {
+    stderr(`[${timestamp()}] [fatal] ${reason}`);
+    finalize(1);
+  });
+  historyPoller = pollConversationHistory(branch, port, conversationState);
+
   const pollState: PollState = {
     seenPrUrls: new Set(),
     seenMergedUrls: new Set(),

frontend/src/lib/LinearPostDialog.svelte

@@ -62,7 +62,7 @@
       />
       {#if teamKeyTrimmed && teamKeyLooksLikeIssue}
         <p class="mt-1 text-[11px] text-danger">
-          Looks like an issue id. Use the "From Linear issue" field on the create-worktree dialog to start from an existing issue.
+          Looks like an issue id. Start the worktree from the Linear panel (bottom-left) to seed it with that issue, then run `webmux linear post` again from the worktree to post the conversation back to it.
         </p>
       {:else if teamKeyTrimmed && !teamKeyValid}
         <p class="mt-1 text-[11px] text-danger">Expected a team key like ENG (uppercase letters only).</p>