@vibedeckx/linux-x64 0.2.1 → 0.2.2

package/dist/bin.js

@@ -223716,6 +223716,17 @@ var AgentSessionManager = class {
   setEventBus(eventBus) {
     this.eventBus = eventBus;
   }
+  /**
+   * Broadcast a freshly-generated title on the global event bus so the sidebar
+   * (`useResidentSessions`) updates regardless of which workspace is currently
+   * focused. The per-session WS `titleUpdated` broadcast only reaches the one
+   * mounted AgentConversation, which is lost when the user navigates to another
+   * workspace before the ~1-2s title generation completes. Used by both the
+   * local title path and the remote proxy path.
+   */
+  emitSessionTitle(projectId, branch, sessionId, title) {
+    this.eventBus?.emit({ type: "session:title", projectId, branch, sessionId, title });
+  }
   /**
    * Single emit path for `branch:activity` events. Derives the current
    * activity from local DB state (the source of truth — see
@@ -225146,7 +225157,7 @@ ${details}`;
    * Returns the new session id, or null when the source is unknown or has
    * no persisted history to copy.
    */
-  async branchSession(sourceSessionId, agentTypeOverride) {
+  async branchSession(sourceSessionId, agentTypeOverride, opts = {}) {
     const source = this.sessions.get(sourceSessionId);
     const sourceRow = await this.storage.agentSessions.getById(sourceSessionId);
     if (!source && !sourceRow) return null;
@@ -225158,7 +225169,7 @@ ${details}`;
     const branch = source?.branch ?? (sourceRow.branch || null);
     const permissionMode = source?.permissionMode ?? (sourceRow?.permission_mode === "plan" ? "plan" : "edit");
     const agentType = agentTypeOverride ?? source?.agentType ?? (sourceRow?.agent_type || "claude-code");
-    const newId = randomUUID();
+    const newId = opts.sessionId ?? randomUUID();
     await this.storage.agentSessions.create({
       id: newId,
       project_id: projectId,
@@ -225204,7 +225215,8 @@ ${details}`;
       eventChain: Promise.resolve(),
       bgSpawnHintsThisTurn: 0,
       taskStartedThisTurn: 0,
-      lastActiveAt: Date.now()
+      lastActiveAt: Date.now(),
+      crossRemoteMcp: opts.crossRemoteMcp
     };
     this.sessions.set(newId, branched);
     await this.emitDerivedBranchActivity(projectId, branch);
@@ -225249,6 +225261,7 @@ ${details}`;
       if (!dbRow || dbRow.title !== null && dbRow.title !== void 0) return;
       await this.storage.agentSessions.updateTitle(session.id, finalTitle);
       this.broadcastRaw(session.id, { titleUpdated: { title: finalTitle } });
+      this.emitSessionTitle(session.projectId, session.branch, session.id, finalTitle);
     } catch (error48) {
       console.error(`[AgentSession] Failed to persist generated title for ${session.id}:`, error48);
     }
@@ -225868,6 +225881,12 @@ async function generateAndPushRemoteSessionTitle(deps, localSessionId, userText,
     localSessionId,
     JSON.stringify({ titleUpdated: { title: finalTitle } })
   );
+  deps.agentSessionManager.emitSessionTitle(
+    projectIdFromRemoteSessionId(localSessionId, remoteInfo),
+    remoteInfo.branch ?? null,
+    localSessionId,
+    finalTitle
+  );
 }
 
 // src/chat-session-manager.ts
@@ -231843,6 +231862,15 @@ function isAncestor(repoPath, ancestor, descendant) {
     return false;
   }
 }
+function branchContentContainedInTarget(repoPath, branch, target) {
+  try {
+    const mergedTree = git(repoPath, ["merge-tree", "--write-tree", target, branch]).split("\n", 1)[0].trim();
+    const targetTree = revParse(repoPath, `${target}^{tree}`);
+    return targetTree !== null && mergedTree === targetTree;
+  } catch {
+    return false;
+  }
+}
 function computeBranchMergeStatus(repoPath, branch, target) {
   const branchTip = revParse(repoPath, `refs/heads/${branch}`);
   const targetTip = revParse(repoPath, `refs/heads/${target}`);
@@ -231868,6 +231896,10 @@ function computeBranchMergeStatus(repoPath, branch, target) {
     else if (unmergedCount === 0) status = "merged";
     else if (unmergedCount < lines.length) status = "partial";
     else status = "unmerged";
+    if (unmergedCount > 0 && branchContentContainedInTarget(repoPath, branch, target)) {
+      status = "merged";
+      unmergedCount = 0;
+    }
   }
   statusCache.set(cacheKey, { branchTip, targetTip, status, unmergedCount });
   return { status, unmergedCount };
@@ -233112,6 +233144,41 @@ var routes11 = async (fastify2) => {
     if (!project) return null;
     return remoteInfo;
   }
+  async function performLocalBranch(sourceSessionId, userId, opts) {
+    const sourceRow = await fastify2.storage.agentSessions.getById(sourceSessionId);
+    if (!sourceRow || !await fastify2.storage.projects.getById(sourceRow.project_id, userId)) {
+      return { ok: false, code: 404, error: "Session not found" };
+    }
+    const newSessionId = await fastify2.agentSessionManager.branchSession(
+      sourceSessionId,
+      opts.agentType,
+      { sessionId: opts.sessionId, crossRemoteMcp: opts.crossRemoteMcp }
+    );
+    if (!newSessionId) {
+      return { ok: false, code: 404, error: "Session not found or has no history to branch" };
+    }
+    const session = fastify2.agentSessionManager.getSession(newSessionId);
+    const messages = fastify2.agentSessionManager.getMessages(newSessionId);
+    const dbRow = await fastify2.storage.agentSessions.getById(newSessionId);
+    return {
+      ok: true,
+      payload: {
+        session: {
+          id: newSessionId,
+          projectId: session?.projectId,
+          branch: session?.branch ?? null,
+          status: session?.status || "stopped",
+          permissionMode: session?.permissionMode || "edit",
+          agentType: session?.agentType || "claude-code",
+          title: dbRow?.title ?? null
+        },
+        messages
+      }
+    };
+  }
+  function broadcastRenamedTitle(sessionId, projectId, branch, title) {
+    fastify2.agentSessionManager.emitSessionTitle(projectId, branch, sessionId, title);
+  }
   fastify2.get("/api/agent-providers", async (_req, reply) => {
     const providers2 = getAllProviders().map((provider) => ({
       type: provider.getAgentType(),
@@ -233840,81 +233907,100 @@ var routes11 = async (fastify2) => {
     "/api/agent-sessions/:sessionId/branch",
     async (req, reply) => {
       const { agentType } = req.body || {};
+      const userId = requireAuth(req, reply);
+      if (userId === null) return;
       if (req.params.sessionId.startsWith("remote-")) {
-        const userId = requireAuth(req, reply);
-        if (userId === null) return;
         const remoteInfo = await getAuthorizedRemoteSessionInfo(req.params.sessionId, userId);
         if (!remoteInfo) {
           return reply.code(404).send({ error: "Remote session not found" });
         }
+        const projectId = projectIdFromRemoteSessionId(req.params.sessionId, remoteInfo);
+        const newRemoteSessionId = randomUUID14();
+        const localSessionId = `remote-${remoteInfo.remoteServerId}-${projectId}-${newRemoteSessionId}`;
+        const crossRemoteMcp2 = await mintCrossRemoteMcpConfig(
+          { storage: fastify2.storage },
+          { userId, sessionId: localSessionId, sourceRemoteServerId: remoteInfo.remoteServerId }
+        );
         const result = await proxyAuto(
           remoteInfo.remoteServerId,
           remoteInfo.remoteUrl,
           remoteInfo.remoteApiKey,
           "POST",
-          `/api/agent-sessions/${remoteInfo.remoteSessionId}/branch`,
-          { agentType }
+          `/api/path/agent-sessions/${remoteInfo.remoteSessionId}/branch`,
+          { agentType, sessionId: newRemoteSessionId, crossRemoteMcp: crossRemoteMcp2 }
         );
         if (!result.ok) {
           return reply.code(proxyStatus(result)).send(result.data);
         }
         const remoteData = result.data;
-        const projectId = projectIdFromRemoteSessionId(req.params.sessionId, remoteInfo);
-        const localSessionId = `remote-${remoteInfo.remoteServerId}-${projectId}-${remoteData.session.id}`;
+        if (remoteData.session.id !== newRemoteSessionId) {
+          return reply.code(409).send({ error: "Remote returned an unexpected session id; upgrade the remote" });
+        }
         fastify2.remoteSessionMap.set(localSessionId, {
           remoteServerId: remoteInfo.remoteServerId,
           remoteUrl: remoteInfo.remoteUrl,
           remoteApiKey: remoteInfo.remoteApiKey,
-          remoteSessionId: remoteData.session.id,
+          remoteSessionId: newRemoteSessionId,
           branch: remoteInfo.branch ?? null
         });
-        await fastify2.storage.remoteSessionMappings.upsert(
-          localSessionId,
-          projectId,
-          remoteInfo.remoteServerId,
-          remoteData.session.id,
-          remoteInfo.branch ?? null
-        );
-        await fastify2.storage.remoteSessionMappings.markTitleResolved(localSessionId);
-        fastify2.agentSessionManager.markTitleResolved(localSessionId);
-        if (remoteData.messages && remoteData.messages.length > 0) {
-          const cacheEntry = fastify2.remotePatchCache.getOrCreate(localSessionId);
-          if (cacheEntry.messages.length === 0) {
-            for (let i = 0; i < remoteData.messages.length; i++) {
-              const patch = ConversationPatch.addEntry(i, remoteData.messages[i]);
-              fastify2.remotePatchCache.appendMessage(localSessionId, JSON.stringify({ JsonPatch: patch }), true);
+        try {
+          await fastify2.storage.remoteSessionMappings.upsert(
+            localSessionId,
+            projectId,
+            remoteInfo.remoteServerId,
+            newRemoteSessionId,
+            remoteInfo.branch ?? null
+          );
+          await fastify2.storage.remoteSessionMappings.markTitleResolved(localSessionId);
+          fastify2.agentSessionManager.markTitleResolved(localSessionId);
+          if (remoteData.messages && remoteData.messages.length > 0) {
+            const cacheEntry = fastify2.remotePatchCache.getOrCreate(localSessionId);
+            if (cacheEntry.messages.length === 0) {
+              for (let i = 0; i < remoteData.messages.length; i++) {
+                const patch = ConversationPatch.addEntry(i, remoteData.messages[i]);
+                fastify2.remotePatchCache.appendMessage(localSessionId, JSON.stringify({ JsonPatch: patch }), true);
+              }
             }
           }
+        } catch (err) {
+          fastify2.remoteSessionMap.delete(localSessionId);
+          throw err;
         }
         return reply.code(200).send({
           session: { ...remoteData.session, id: localSessionId, projectId },
           messages: remoteData.messages
         });
       }
-      const newSessionId = await fastify2.agentSessionManager.branchSession(
-        req.params.sessionId,
-        agentType
+      const preSessionId = randomUUID14();
+      const crossRemoteMcp = await mintCrossRemoteMcpConfig(
+        { storage: fastify2.storage },
+        { userId, sessionId: preSessionId, sourceRemoteServerId: null }
       );
-      if (!newSessionId) {
-        return reply.code(404).send({ error: "Session not found or has no history to branch" });
-      }
-      const session = fastify2.agentSessionManager.getSession(newSessionId);
-      const messages = fastify2.agentSessionManager.getMessages(newSessionId);
-      const dbRow = await fastify2.storage.agentSessions.getById(newSessionId);
-      return reply.code(200).send({
-        session: {
-          id: newSessionId,
-          projectId: session?.projectId,
-          branch: session?.branch ?? null,
-          status: session?.status || "stopped",
-          permissionMode: session?.permissionMode || "edit",
-          agentType: session?.agentType || "claude-code",
-          title: dbRow?.title ?? null
-        },
-        messages
+      const branched = await performLocalBranch(req.params.sessionId, userId, {
+        agentType,
+        sessionId: preSessionId,
+        crossRemoteMcp
       });
+      if (!branched.ok) {
+        return reply.code(branched.code).send({ error: branched.error });
+      }
+      return reply.code(200).send(branched.payload);
     }
   );
+  fastify2.post("/api/path/agent-sessions/:sessionId/branch", async (req, reply) => {
+    const { agentType, sessionId, crossRemoteMcp } = req.body || {};
+    const userId = requireAuth(req, reply);
+    if (userId === null) return;
+    const branched = await performLocalBranch(req.params.sessionId, userId, {
+      agentType,
+      sessionId,
+      crossRemoteMcp
+    });
+    if (!branched.ok) {
+      return reply.code(branched.code).send({ error: branched.error });
+    }
+    return reply.code(200).send(branched.payload);
+  });
   fastify2.post(
     "/api/agent-sessions/:sessionId/switch-mode",
     async (req, reply) => {
@@ -234073,6 +234159,7 @@ var routes11 = async (fastify2) => {
     if (title !== null && (typeof title !== "string" || title.length > 200)) {
       return reply.code(400).send({ error: "title must be null or a string up to 200 chars" });
     }
+    const normalizedTitle = title && title.trim().length > 0 ? title.trim() : null;
     if (req.params.sessionId.startsWith("remote-")) {
       const userId = requireAuth(req, reply);
       if (userId === null) return;
@@ -234084,14 +234171,28 @@ var routes11 = async (fastify2) => {
         remoteInfo.remoteApiKey,
         "PATCH",
         `/api/agent-sessions/${remoteInfo.remoteSessionId}/title`,
-        { title }
+        { title: normalizedTitle }
       );
+      if (result.ok) {
+        broadcastRenamedTitle(
+          req.params.sessionId,
+          projectIdFromRemoteSessionId(req.params.sessionId, remoteInfo),
+          remoteInfo.branch ?? null,
+          normalizedTitle
+        );
+      }
       return reply.code(proxyStatus(result)).send(result.data);
     }
     const session = await fastify2.storage.agentSessions.getById(req.params.sessionId);
     if (!session) return reply.code(404).send({ error: "Session not found" });
-    await fastify2.storage.agentSessions.updateTitle(req.params.sessionId, title);
-    return reply.code(200).send({ success: true, title });
+    await fastify2.storage.agentSessions.updateTitle(req.params.sessionId, normalizedTitle);
+    broadcastRenamedTitle(
+      req.params.sessionId,
+      session.project_id,
+      session.branch,
+      normalizedTitle
+    );
+    return reply.code(200).send({ success: true, title: normalizedTitle });
   });
   fastify2.patch("/api/agent-sessions/:sessionId/favorite", async (req, reply) => {
     const { favorited } = req.body;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibedeckx/linux-x64",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Vibedeckx platform binaries for Linux x64",
   "os": [
     "linux"