fix: pass remote session ID to opencode attach for correct session selection

Store the session ID created on the remote server as remoteSessionID
(separate from launchSessionID which tracks the caller's session) and
pass it via --session flag when mc_attach opens the TUI.

Author: nigel-dev

src/lib/schemas.ts

@@ -19,6 +19,7 @@ export const JobSchema = z.object({
   launchSessionID: z.string().optional(),
   port: z.number().optional(),
   serverUrl: z.string().optional(),
+  remoteSessionID: z.string().optional(),
 });
 
 export const JobStateSchema = z.object({

src/tools/attach.ts

@@ -22,7 +22,8 @@ export const mc_attach: ToolDefinition = tool({
       if (isInsideTmux()) {
         // Create new tmux window with opencode attach command
         const windowName = `mc-${job.name}`;
-        const attachCommand = `opencode attach ${job.serverUrl} --dir ${job.worktreePath}`;
+        const sessionFlag = job.remoteSessionID ? ` --session ${job.remoteSessionID}` : '';
+        const attachCommand = `opencode attach ${job.serverUrl} --dir ${job.worktreePath}${sessionFlag}`;
         const currentSession = getCurrentSession();
 
         if (!currentSession) {

src/tools/launch.ts

@@ -209,6 +209,7 @@ export const mc_launch: ToolDefinition = tool({
     const useServeMode = config.useServeMode === true;
     let allocatedPort: number | undefined;
     let serverUrl: string | undefined;
+    let remoteSessionId: string | undefined;
 
     if (useServeMode) {
       // === SERVE MODE ===
@@ -302,7 +303,7 @@ export const mc_launch: ToolDefinition = tool({
           autoCommit: config.autoCommit,
         });
         const modelInfo = getCurrentModelInfo(context?.sessionID);
-        await createSessionAndPrompt(client, fullPrompt, undefined, modelInfo);
+        remoteSessionId = await createSessionAndPrompt(client, fullPrompt, undefined, modelInfo);
       } catch (error) {
         await releasePort(allocatedPort).catch(() => {});
         try {
@@ -434,6 +435,7 @@ export const mc_launch: ToolDefinition = tool({
       launchSessionID: context?.sessionID,
       port: allocatedPort,
       serverUrl,
+      remoteSessionID: remoteSessionId,
     };
 
     await addJob(job);