Sync merged PR bases and add optimistic worktree launch messaging

src/main/remote/RemoteAccessServer.test.ts

@@ -2787,6 +2787,7 @@ describe("RemoteAccessServer", () => {
         config: { model: "gpt-5" },
         prompt: "",
         presentationMode: "terminal",
+        userMessageItemId: "user-optimistic",
       }),
     });
 
@@ -2809,6 +2810,7 @@ describe("RemoteAccessServer", () => {
         prompt: "",
         initialSize: { cols: 120, rows: 30 },
         presentationMode: "terminal",
+        userMessageItemId: "user-optimistic",
         ...mcpSnapshot,
       }),
     );
@@ -2818,6 +2820,7 @@ describe("RemoteAccessServer", () => {
         threadId: "thread-remote",
         projectId: "project-1",
         launchRuntime: false,
+        userMessageItemId: "user-optimistic",
       }),
     ]);
   });

src/main/remote/server/threadCommands.ts

@@ -263,6 +263,7 @@ async function startRemoteThread(
       ...(command.segments ? { segments: command.segments } : {}),
       initialSize: DEFAULT_TERMINAL_SIZE,
       ...(command.presentationMode ? { presentationMode: command.presentationMode } : {}),
+      ...(command.userMessageItemId ? { userMessageItemId: command.userMessageItemId } : {}),
       ...mcpSnapshot,
     });
   } catch (error) {

src/main/ssh/SshConnectionManager.test.ts

@@ -4,6 +4,7 @@ import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "nod
 import { tmpdir } from "node:os";
 import { basename, join } from "node:path";
 import { afterEach, describe, expect, it, vi } from "vitest";
+import { PORACODE_REMOTE_PROTOCOL_VERSION } from "@/shared/remote";
 import { sshConnectionConfigSchema, type SshConnectionConfig } from "@/shared/ssh";
 import * as sshBootstrap from "@/shared/sshBootstrap";
 import { waitForRemoteEndpoint } from "@/shared/sshBootstrap";
@@ -88,7 +89,7 @@ function createRuntimeFixture(): {
 
 function helperDescriptor(appVersion: string) {
   return {
-    protocolVersion: 1,
+    protocolVersion: PORACODE_REMOTE_PROTOCOL_VERSION,
     hostMode: "helper",
     desktopId: "remote-test",
     label: "Remote test",
@@ -367,7 +368,7 @@ describe("SSH tunnel lifecycle", () => {
 describe("SSH helper readiness", () => {
   function descriptor(hostMode: "desktop" | "helper") {
     return {
-      protocolVersion: 1,
+      protocolVersion: PORACODE_REMOTE_PROTOCOL_VERSION,
       hostMode,
       desktopId: "remote-test",
       label: "Remote test",

src/mobile/mobileSsh.test.ts

@@ -1,6 +1,7 @@
 // @vitest-environment jsdom
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { SshBridgePlugin } from "@poracode/ssh-bridge";
+import { PORACODE_REMOTE_PROTOCOL_VERSION } from "@/shared/remote";
 import type { SshConnectionConfig } from "@/shared/ssh";
 
 const bridge = vi.hoisted(() => ({
@@ -44,7 +45,7 @@ function response(input: { json?: unknown; bytes?: Uint8Array; ok?: boolean; sta
 function helperEnvironmentResponse() {
   return response({
     json: {
-      protocolVersion: 1,
+      protocolVersion: PORACODE_REMOTE_PROTOCOL_VERSION,
       hostMode: "helper",
       desktopId: "remote-test",
       label: "Remote test",

src/renderer/actions/threadActions.test.ts

@@ -78,6 +78,7 @@ describe("threadActions", () => {
       pendingActiveThreadId: null,
       pendingComposerFocusThreadId: null,
       pendingThreadLaunches: {},
+      provisioningWorktreeThreadIds: {},
       runtimeItemIdsByThread: {},
       runtimeItemsByIdByThread: {},
       runtimeCompletedTurnsByThread: {},
@@ -607,6 +608,23 @@ describe("threadActions", () => {
     expect(useAppStore.getState().threads).toEqual([thread]);
   });
 
+  it("deletes a provisional remote thread locally before the host row exists", () => {
+    const thread = makeThread({
+      remoteServerId: "remote-server",
+      remoteId: "remote-thread-pending",
+    });
+    useAppStore.setState({
+      threads: [thread],
+      provisioningWorktreeThreadIds: { [thread.id]: true },
+    });
+
+    deleteThread(thread.id);
+
+    expect(useAppStore.getState().threads).toEqual([]);
+    expect(sendThreadCommand).not.toHaveBeenCalled();
+    expect(bridge.closeThread).not.toHaveBeenCalled();
+  });
+
   it("deletes a shared-worktree thread without prompting to remove the worktree", () => {
     const worktreePath = "/repo/.worktrees/feature";
     const firstThread = makeThread({

src/renderer/actions/threadActions.ts

@@ -607,6 +607,10 @@ export function acknowledgeThread(threadId: string): void {
 function deleteThreadOnly(threadId: string): void {
   const store = useAppStore.getState();
   const thread = store.threads.find((candidate) => candidate.id === threadId);
+  if (store.provisioningWorktreeThreadIds[threadId] === true) {
+    store.deleteThread(threadId);
+    return;
+  }
   if (
     thread &&
     dispatchRemoteThreadMutation(