@vibedeckx/linux-x64 0.3.31 → 0.3.32

package/dist/bin.js

@@ -207864,6 +207864,176 @@ function getAllProviders() {
   return Array.from(providers.values());
 }
 
+// src/utils/cross-remote-token.ts
+import { createHmac as createHmac2, randomBytes as randomBytes2, timingSafeEqual as timingSafeEqual2 } from "crypto";
+var CROSS_REMOTE_SECRET_SETTING = "cross_remote_token_secret";
+var CROSS_REMOTE_TOKEN_TTL_MS = 7 * 864e5;
+var sign2 = (secret, body) => createHmac2("sha256", secret).update(body).digest("base64url");
+function signRemoteMcpHandle(secret, payload, nowMs, ttlMs = CROSS_REMOTE_TOKEN_TTL_MS) {
+  const wire = {
+    u: payload.userId,
+    s: payload.sessionId,
+    r: payload.remoteId,
+    h: payload.workerHandle,
+    n: payload.serverLabel,
+    exp: nowMs + ttlMs
+  };
+  const body = Buffer.from(JSON.stringify(wire)).toString("base64url");
+  return `mcp.${body}.${sign2(secret, `mcp:${body}`)}`;
+}
+function verifyRemoteMcpHandle(secret, handle, nowMs) {
+  const parts = handle.split(".");
+  if (parts.length !== 3) return null;
+  const [prefix, body, providedSig] = parts;
+  if (prefix !== "mcp" || !body || !providedSig) return null;
+  const expectedSig = sign2(secret, `mcp:${body}`);
+  const provided = Buffer.from(providedSig);
+  const expected = Buffer.from(expectedSig);
+  if (provided.length !== expected.length || !timingSafeEqual2(provided, expected)) return null;
+  let wire;
+  try {
+    wire = JSON.parse(Buffer.from(body, "base64url").toString());
+  } catch {
+    return null;
+  }
+  if (![wire.u, wire.s, wire.r, wire.h, wire.n].every((v2) => typeof v2 === "string" && v2.length > 0)) return null;
+  if (typeof wire.exp !== "number" || nowMs >= wire.exp) return null;
+  return { userId: wire.u, sessionId: wire.s, remoteId: wire.r, workerHandle: wire.h, serverLabel: wire.n };
+}
+function signCrossRemoteToken(secret, payload, nowMs, ttlMs = CROSS_REMOTE_TOKEN_TTL_MS) {
+  const wire = {
+    u: payload.userId,
+    s: payload.sessionId,
+    src: payload.sourceRemoteServerId,
+    exp: nowMs + ttlMs
+  };
+  const body = Buffer.from(JSON.stringify(wire)).toString("base64url");
+  return `${body}.${sign2(secret, body)}`;
+}
+function verifyCrossRemoteTokenDetailed(secret, token, nowMs) {
+  const invalid = { status: "invalid" };
+  const parts = token.split(".");
+  if (parts.length !== 2) return invalid;
+  const [body, providedSig] = parts;
+  if (!body || !providedSig) return invalid;
+  const expectedSig = sign2(secret, body);
+  const provided = Buffer.from(providedSig);
+  const expected = Buffer.from(expectedSig);
+  if (provided.length !== expected.length) return invalid;
+  if (!timingSafeEqual2(provided, expected)) return invalid;
+  let wire;
+  try {
+    wire = JSON.parse(Buffer.from(body, "base64url").toString());
+  } catch {
+    return invalid;
+  }
+  if (typeof wire.u !== "string" || typeof wire.s !== "string" || typeof wire.exp !== "number") return invalid;
+  if (wire.src !== null && typeof wire.src !== "string") return invalid;
+  if (!wire.u || !wire.s) return invalid;
+  const payload = { userId: wire.u, sessionId: wire.s, sourceRemoteServerId: wire.src };
+  if (nowMs >= wire.exp) return { status: "expired", payload, exp: wire.exp };
+  return { status: "ok", payload };
+}
+async function getCrossRemoteSecret(storage2) {
+  return storage2.settings.getOrCreate(
+    CROSS_REMOTE_SECRET_SETTING,
+    () => randomBytes2(32).toString("hex")
+  );
+}
+
+// src/cross-remote-access.ts
+var CROSS_REMOTE_MCP_PATH = "/api/cross-remote-mcp";
+var TOOL_TIERS = {
+  remote_read_file: "read",
+  remote_list_dir: "read",
+  remote_stat_path: "read",
+  remote_process_list: "read",
+  remote_bash: "exec",
+  remote_mcp_open: "exec",
+  remote_mcp_list_tools: "exec",
+  remote_mcp_call: "exec",
+  remote_mcp_ping: "exec",
+  remote_mcp_close: "exec"
+};
+var MAX_IN_FLIGHT_PER_SESSION = 4;
+var REMOTE_MCP_CAPABILITIES = [
+  "http:POST /api/path/cross-remote/mcp/open",
+  "http:POST /api/path/cross-remote/mcp/list-tools",
+  "http:POST /api/path/cross-remote/mcp/call",
+  "http:POST /api/path/cross-remote/mcp/ping",
+  "http:POST /api/path/cross-remote/mcp/close"
+];
+var supportsRemoteMcpBroker = (server) => REMOTE_MCP_CAPABILITIES.every((capability) => server.worker_capabilities?.includes(capability));
+var tierSatisfies = (granted, required2) => granted === "exec" || granted === "read" && required2 === "read";
+var isOnline = (deps, server) => deps.reverseConnectManager.isConnected(server.id);
+function isSessionUsable(deps, sessionId) {
+  if (sessionId.startsWith("remote-")) return deps.remoteSessionMap.has(sessionId);
+  return deps.agentSessionManager.getSessionProcessAlive(sessionId);
+}
+async function resolveTarget(deps, payload, targetRemoteId, requiredTier) {
+  if (payload.sourceRemoteServerId && payload.sourceRemoteServerId === targetRemoteId) {
+    return { ok: false, reason: "not_accessible" };
+  }
+  const server = await deps.storage.remoteServers.getById(targetRemoteId, payload.userId);
+  if (!server) return { ok: false, reason: "not_accessible" };
+  if (!tierSatisfies(server.cross_remote_access, requiredTier)) {
+    return { ok: false, reason: "not_accessible" };
+  }
+  if (!isOnline(deps, server)) return { ok: false, reason: "offline" };
+  return { ok: true, server };
+}
+async function listAccessibleRemotes(deps, payload) {
+  const servers = await deps.storage.remoteServers.getAll(payload.userId);
+  return servers.filter((s3) => s3.cross_remote_access !== "off").filter((s3) => s3.id !== payload.sourceRemoteServerId).map((s3) => ({
+    id: s3.id,
+    name: s3.name,
+    access: s3.cross_remote_access,
+    online: isOnline(deps, s3),
+    mcp_broker_supported: supportsRemoteMcpBroker(s3)
+  }));
+}
+var SessionConcurrencyGuard = class {
+  constructor(maxInFlight = MAX_IN_FLIGHT_PER_SESSION) {
+    this.maxInFlight = maxInFlight;
+  }
+  maxInFlight;
+  inFlight = /* @__PURE__ */ new Map();
+  acquire(sessionId) {
+    const current = this.inFlight.get(sessionId) ?? 0;
+    if (current >= this.maxInFlight) return false;
+    this.inFlight.set(sessionId, current + 1);
+    return true;
+  }
+  release(sessionId) {
+    const current = this.inFlight.get(sessionId) ?? 0;
+    if (current <= 1) this.inFlight.delete(sessionId);
+    else this.inFlight.set(sessionId, current - 1);
+  }
+};
+
+// src/cross-remote-mcp-config.ts
+function crossRemoteMcpEnabled() {
+  return !!process.env.VIBEDECKX_PUBLIC_URL?.trim();
+}
+async function mintCrossRemoteMcpConfig(deps, args) {
+  const baseUrl = process.env.VIBEDECKX_PUBLIC_URL?.trim();
+  if (!baseUrl) return void 0;
+  const { userId } = args;
+  if (!userId) return void 0;
+  const servers = await deps.storage.remoteServers.getAll(userId);
+  const hasTarget = servers.some(
+    (s3) => s3.cross_remote_access !== "off" && s3.id !== args.sourceRemoteServerId
+  );
+  if (!hasTarget) return void 0;
+  const secret = await getCrossRemoteSecret(deps.storage);
+  const token = signCrossRemoteToken(
+    secret,
+    { userId, sessionId: args.sessionId, sourceRemoteServerId: args.sourceRemoteServerId },
+    Date.now()
+  );
+  return { url: `${baseUrl.replace(/\/+$/, "")}${CROSS_REMOTE_MCP_PATH}`, token };
+}
+
 // src/conversation-patch.ts
 var ConversationPatch = {
   /**
@@ -230232,6 +230402,7 @@ var AgentSessionManager = class {
       skipDb,
       permissionMode,
       crossRemoteMcp: opts.crossRemoteMcp,
+      userId: opts.userId && opts.userId !== "local" ? opts.userId : void 0,
       agentType,
       model,
       completion: new TurnCompletionLedger(this.parkTimeoutMs),
@@ -230286,6 +230457,18 @@ var AgentSessionManager = class {
     await this.restartSession(session.id, projectPath);
     return session.id;
   }
+  /**
+   * Replace the session's cross-remote MCP config for its NEXT spawn. Worker
+   * side of the hub's per-message token refresh: a live process keeps the
+   * token it was spawned with (baked into --mcp-config), but the next wake
+   * picks this one up instead of the possibly-expired original.
+   */
+  updateCrossRemoteMcp(sessionId, config2) {
+    const session = this.sessions.get(sessionId);
+    if (!session) return false;
+    session.crossRemoteMcp = config2;
+    return true;
+  }
   /**
    * Kill an agent process and its entire process tree.
    * Uses negative PID to signal the process group (requires detached: true at spawn).
@@ -230332,6 +230515,16 @@ var AgentSessionManager = class {
       console.error(`[AgentSession] Failed to mint session tools MCP config for ${session.id}:`, err);
       return void 0;
     });
+    if (session.userId && crossRemoteMcpEnabled()) {
+      try {
+        session.crossRemoteMcp = await mintCrossRemoteMcpConfig(
+          { storage: this.storage },
+          { userId: session.userId, sessionId: session.id, sourceRemoteServerId: null }
+        );
+      } catch (err) {
+        console.error(`[AgentSession] Cross-remote token re-mint failed for ${session.id}, keeping cached config:`, err);
+      }
+    }
     const config2 = provider.buildSpawnConfig(
       cwd,
       session.permissionMode,
@@ -231102,6 +231295,7 @@ var AgentSessionManager = class {
   async sendUserMessage(sessionId, content, projectPath, userId = "local", opts) {
     const session = this.sessions.get(sessionId);
     if (!session) return false;
+    if (userId && userId !== "local" && !session.userId) session.userId = userId;
     const disposition = this.resolveOutgoingDisposition(sessionId, opts);
     if (session.dormant) {
       if (!projectPath) {
@@ -232223,6 +232417,7 @@ var AgentSessionManager = class {
       turnOpenSince: null,
       turnDisposition: null,
       crossRemoteMcp: opts.crossRemoteMcp,
+      userId: opts.userId && opts.userId !== "local" ? opts.userId : void 0,
       branchedFromSessionId: sourceSessionId,
       branchedFromEntryIndex
     };
@@ -232309,7 +232504,7 @@ import { randomUUID as randomUUID3 } from "crypto";
 
 // src/trace-context.ts
 import { AsyncLocalStorage } from "node:async_hooks";
-import { randomBytes as randomBytes2 } from "node:crypto";
+import { randomBytes as randomBytes3 } from "node:crypto";
 var VERSION8 = "00";
 var INVALID_VERSION = "ff";
 var ZERO_TRACE_ID = "0".repeat(32);
@@ -232334,10 +232529,10 @@ function formatTraceparent(ctx) {
   return `${VERSION8}-${ctx.traceId}-${ctx.spanId}-${ctx.sampled ? "01" : "00"}`;
 }
 function newTraceId() {
-  return randomBytes2(16).toString("hex");
+  return randomBytes3(16).toString("hex");
 }
 function newSpanId() {
-  return randomBytes2(8).toString("hex");
+  return randomBytes3(8).toString("hex");
 }
 function newTraceContext(incoming) {
   const parsed = parseTraceparent(incoming);
@@ -232503,6 +232698,13 @@ function mapRemoteRun(run2, remoteServerId, projectId) {
     reviewer_session_id: run2.reviewer_session_id ? `${prefix}${run2.reviewer_session_id}` : null
   };
 }
+var UUID_PATTERN = "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}";
+var REMOTE_RUN_ID_RE = new RegExp(`^remote-(${UUID_PATTERN})-(${UUID_PATTERN})-(${UUID_PATTERN})$`);
+function parseRemoteRunId(runId) {
+  const match2 = REMOTE_RUN_ID_RE.exec(runId);
+  if (!match2) return null;
+  return { remoteServerId: match2[1], projectId: match2[2], bareRunId: match2[3] };
+}
 function mapRemoteReviewerCandidate(candidate, remoteServerId, projectId) {
   if (!candidate?.sessionId) return candidate;
   return {
@@ -232521,171 +232723,6 @@ function runUpdatedFrameForSubscribers(evt) {
   return JSON.stringify({ workflowRunUpdated: evt.run });
 }
 
-// src/utils/cross-remote-token.ts
-import { createHmac as createHmac2, randomBytes as randomBytes3, timingSafeEqual as timingSafeEqual2 } from "crypto";
-var CROSS_REMOTE_SECRET_SETTING = "cross_remote_token_secret";
-var CROSS_REMOTE_TOKEN_TTL_MS = 864e5;
-var sign2 = (secret, body) => createHmac2("sha256", secret).update(body).digest("base64url");
-function signRemoteMcpHandle(secret, payload, nowMs, ttlMs = CROSS_REMOTE_TOKEN_TTL_MS) {
-  const wire = {
-    u: payload.userId,
-    s: payload.sessionId,
-    r: payload.remoteId,
-    h: payload.workerHandle,
-    n: payload.serverLabel,
-    exp: nowMs + ttlMs
-  };
-  const body = Buffer.from(JSON.stringify(wire)).toString("base64url");
-  return `mcp.${body}.${sign2(secret, `mcp:${body}`)}`;
-}
-function verifyRemoteMcpHandle(secret, handle, nowMs) {
-  const parts = handle.split(".");
-  if (parts.length !== 3) return null;
-  const [prefix, body, providedSig] = parts;
-  if (prefix !== "mcp" || !body || !providedSig) return null;
-  const expectedSig = sign2(secret, `mcp:${body}`);
-  const provided = Buffer.from(providedSig);
-  const expected = Buffer.from(expectedSig);
-  if (provided.length !== expected.length || !timingSafeEqual2(provided, expected)) return null;
-  let wire;
-  try {
-    wire = JSON.parse(Buffer.from(body, "base64url").toString());
-  } catch {
-    return null;
-  }
-  if (![wire.u, wire.s, wire.r, wire.h, wire.n].every((v2) => typeof v2 === "string" && v2.length > 0)) return null;
-  if (typeof wire.exp !== "number" || nowMs >= wire.exp) return null;
-  return { userId: wire.u, sessionId: wire.s, remoteId: wire.r, workerHandle: wire.h, serverLabel: wire.n };
-}
-function signCrossRemoteToken(secret, payload, nowMs, ttlMs = CROSS_REMOTE_TOKEN_TTL_MS) {
-  const wire = {
-    u: payload.userId,
-    s: payload.sessionId,
-    src: payload.sourceRemoteServerId,
-    exp: nowMs + ttlMs
-  };
-  const body = Buffer.from(JSON.stringify(wire)).toString("base64url");
-  return `${body}.${sign2(secret, body)}`;
-}
-function verifyCrossRemoteToken(secret, token, nowMs) {
-  const parts = token.split(".");
-  if (parts.length !== 2) return null;
-  const [body, providedSig] = parts;
-  if (!body || !providedSig) return null;
-  const expectedSig = sign2(secret, body);
-  const provided = Buffer.from(providedSig);
-  const expected = Buffer.from(expectedSig);
-  if (provided.length !== expected.length) return null;
-  if (!timingSafeEqual2(provided, expected)) return null;
-  let wire;
-  try {
-    wire = JSON.parse(Buffer.from(body, "base64url").toString());
-  } catch {
-    return null;
-  }
-  if (typeof wire.u !== "string" || typeof wire.s !== "string" || typeof wire.exp !== "number") return null;
-  if (wire.src !== null && typeof wire.src !== "string") return null;
-  if (!wire.u || !wire.s) return null;
-  if (nowMs >= wire.exp) return null;
-  return { userId: wire.u, sessionId: wire.s, sourceRemoteServerId: wire.src };
-}
-async function getCrossRemoteSecret(storage2) {
-  return storage2.settings.getOrCreate(
-    CROSS_REMOTE_SECRET_SETTING,
-    () => randomBytes3(32).toString("hex")
-  );
-}
-
-// src/cross-remote-access.ts
-var CROSS_REMOTE_MCP_PATH = "/api/cross-remote-mcp";
-var TOOL_TIERS = {
-  remote_read_file: "read",
-  remote_list_dir: "read",
-  remote_stat_path: "read",
-  remote_process_list: "read",
-  remote_bash: "exec",
-  remote_mcp_open: "exec",
-  remote_mcp_list_tools: "exec",
-  remote_mcp_call: "exec",
-  remote_mcp_ping: "exec",
-  remote_mcp_close: "exec"
-};
-var MAX_IN_FLIGHT_PER_SESSION = 4;
-var REMOTE_MCP_CAPABILITIES = [
-  "http:POST /api/path/cross-remote/mcp/open",
-  "http:POST /api/path/cross-remote/mcp/list-tools",
-  "http:POST /api/path/cross-remote/mcp/call",
-  "http:POST /api/path/cross-remote/mcp/ping",
-  "http:POST /api/path/cross-remote/mcp/close"
-];
-var supportsRemoteMcpBroker = (server) => REMOTE_MCP_CAPABILITIES.every((capability) => server.worker_capabilities?.includes(capability));
-var tierSatisfies = (granted, required2) => granted === "exec" || granted === "read" && required2 === "read";
-var isOnline = (deps, server) => deps.reverseConnectManager.isConnected(server.id);
-function isSessionUsable(deps, sessionId) {
-  if (sessionId.startsWith("remote-")) return deps.remoteSessionMap.has(sessionId);
-  return deps.agentSessionManager.getSessionProcessAlive(sessionId);
-}
-async function resolveTarget(deps, payload, targetRemoteId, requiredTier) {
-  if (payload.sourceRemoteServerId && payload.sourceRemoteServerId === targetRemoteId) {
-    return { ok: false, reason: "not_accessible" };
-  }
-  const server = await deps.storage.remoteServers.getById(targetRemoteId, payload.userId);
-  if (!server) return { ok: false, reason: "not_accessible" };
-  if (!tierSatisfies(server.cross_remote_access, requiredTier)) {
-    return { ok: false, reason: "not_accessible" };
-  }
-  if (!isOnline(deps, server)) return { ok: false, reason: "offline" };
-  return { ok: true, server };
-}
-async function listAccessibleRemotes(deps, payload) {
-  const servers = await deps.storage.remoteServers.getAll(payload.userId);
-  return servers.filter((s3) => s3.cross_remote_access !== "off").filter((s3) => s3.id !== payload.sourceRemoteServerId).map((s3) => ({
-    id: s3.id,
-    name: s3.name,
-    access: s3.cross_remote_access,
-    online: isOnline(deps, s3),
-    mcp_broker_supported: supportsRemoteMcpBroker(s3)
-  }));
-}
-var SessionConcurrencyGuard = class {
-  constructor(maxInFlight = MAX_IN_FLIGHT_PER_SESSION) {
-    this.maxInFlight = maxInFlight;
-  }
-  maxInFlight;
-  inFlight = /* @__PURE__ */ new Map();
-  acquire(sessionId) {
-    const current = this.inFlight.get(sessionId) ?? 0;
-    if (current >= this.maxInFlight) return false;
-    this.inFlight.set(sessionId, current + 1);
-    return true;
-  }
-  release(sessionId) {
-    const current = this.inFlight.get(sessionId) ?? 0;
-    if (current <= 1) this.inFlight.delete(sessionId);
-    else this.inFlight.set(sessionId, current - 1);
-  }
-};
-
-// src/cross-remote-mcp-config.ts
-async function mintCrossRemoteMcpConfig(deps, args) {
-  const baseUrl = process.env.VIBEDECKX_PUBLIC_URL?.trim();
-  if (!baseUrl) return void 0;
-  const { userId } = args;
-  if (!userId) return void 0;
-  const servers = await deps.storage.remoteServers.getAll(userId);
-  const hasTarget = servers.some(
-    (s3) => s3.cross_remote_access !== "off" && s3.id !== args.sourceRemoteServerId
-  );
-  if (!hasTarget) return void 0;
-  const secret = await getCrossRemoteSecret(deps.storage);
-  const token = signCrossRemoteToken(
-    secret,
-    { userId, sessionId: args.sessionId, sourceRemoteServerId: args.sourceRemoteServerId },
-    Date.now()
-  );
-  return { url: `${baseUrl.replace(/\/+$/, "")}${CROSS_REMOTE_MCP_PATH}`, token };
-}
-
 // src/routes/notification-outbox-routes.ts
 var import_fastify_plugin = __toESM(require_plugin2(), 1);
 var MAX_SESSIONS_PER_REQUEST = 100;
@@ -239718,6 +239755,7 @@ function selfReportSection(report) {
 var VERDICT_INSTRUCTIONS = [
   "\nThe bar for blocking: a real defect that is worth fixing \u2014 wrong behavior, a case a user or caller will actually hit, a security or data-loss risk, or a missing test for logic that matters. Report those plainly; do not soften a real problem because the fix is inconvenient.",
   "Not blocking: over-engineering \u2014 speculative hardening, defenses against inputs this code cannot receive, abstractions or configurability for cases nobody has asked for, or a rewrite in your preferred style. When the fix would add more complexity than the problem it prevents is worth, it is a non-blocking note at most.",
+  "Both halves matter equally: solve real problems, and do not over-engineer.",
   "\nEnd your final message with:",
   "1. Verdict \u2014 exactly one of: ship / needs-changes / cannot-verify. Use cannot-verify when you could not gather enough evidence to judge, rather than guessing.",
   "2. Blocking findings \u2014 what must change before shipping, each specific and actionable (say explicitly when there are none).",
@@ -242008,7 +242046,11 @@ var TITLE_BY_KIND = {
   review_ready: "Review feedback is ready",
   session_result_ready: "Session result is ready",
   session_failed: "Session failed",
-  workflow_failed: "Workflow needs attention"
+  workflow_failed: "Workflow needs attention",
+  // "Stop, then send" — NOT "restart": restartSession wipes the conversation
+  // history, while stop → dormant → next message respawns with a fresh token
+  // and keeps everything.
+  cross_remote_token_expired: "Cross-remote access expired \u2014 stop the session, then send a message to renew"
 };
 var PLACEHOLDER_TITLES = /* @__PURE__ */ new Set(["New Session", "Generating title\u2026", "Generating title..."]);
 var LOCAL_CURSOR_KEY = "notification_local_cursor";
@@ -247845,7 +247887,7 @@ var routes11 = async (fastify2) => {
     const result = await fastify2.agentSessionManager.branchSession(
       sourceSessionId,
       opts.agentType,
-      { sessionId: opts.sessionId, crossRemoteMcp: opts.crossRemoteMcp, upToEntryIndex: opts.upToEntryIndex }
+      { sessionId: opts.sessionId, crossRemoteMcp: opts.crossRemoteMcp, upToEntryIndex: opts.upToEntryIndex, userId }
     );
     if (!result.ok) {
       if (result.reason === "invalid-cutoff") {
@@ -248556,7 +248598,7 @@ var routes11 = async (fastify2) => {
         agentType || "claude-code",
         false,
         force === true,
-        { sessionId: preSessionId, crossRemoteMcp, model }
+        { sessionId: preSessionId, crossRemoteMcp, model, userId: userId ?? void 0 }
       );
       const session = fastify2.agentSessionManager.getSession(sessionId);
       return reply.code(200).send({
@@ -248840,12 +248882,27 @@ var routes11 = async (fastify2) => {
           errorCode: "notification_baseline_failed"
         });
       }
+      const freshCrossRemoteMcp = typeof authResult === "string" ? await mintCrossRemoteMcpConfig(
+        { storage: fastify2.storage },
+        {
+          userId: authResult,
+          sessionId: req.params.sessionId,
+          sourceRemoteServerId: remoteInfo.remoteServerId
+        }
+      ).catch((err) => {
+        console.error(`[API] cross-remote token refresh mint failed for ${req.params.sessionId}:`, err);
+        return void 0;
+      }) : void 0;
       const activityAt = Date.now();
       const result = await proxyAuto(
         remoteInfo.remoteServerId,
         "POST",
         `/api/agent-sessions/${remoteInfo.remoteSessionId}/message`,
-        { content, ...idempotencyKey ? { idempotencyKey } : {} }
+        {
+          content,
+          ...idempotencyKey ? { idempotencyKey } : {},
+          ...freshCrossRemoteMcp ? { crossRemoteMcp: freshCrossRemoteMcp } : {}
+        }
       );
       if (!result.ok) {
         const status = proxyStatus(result);
@@ -248904,6 +248961,13 @@ var routes11 = async (fastify2) => {
     if (!storedSession || !storedProjection || !await fastify2.storage.projects.getById(storedProjection.projectId, authResult)) {
       return reply.code(404).send({ error: "Session not found or not running" });
     }
+    const incomingCrossRemoteMcp = req.body.crossRemoteMcp;
+    if (incomingCrossRemoteMcp && typeof incomingCrossRemoteMcp.url === "string" && typeof incomingCrossRemoteMcp.token === "string") {
+      fastify2.agentSessionManager.updateCrossRemoteMcp(req.params.sessionId, {
+        url: incomingCrossRemoteMcp.url,
+        token: incomingCrossRemoteMcp.token
+      });
+    }
     const session = fastify2.agentSessionManager.getSession(req.params.sessionId);
     let projectPathForWake;
     if (session?.dormant) {
@@ -250886,10 +250950,14 @@ async function routes20(fastify2) {
     result.status === 0 ? { error: `Remote proxy failed: ${result.errorCode || "unknown"}` } : result.data
   );
   const resolveRemoteRun = async (runId, userId) => {
-    const info = remoteRunMap.get(runId);
+    const tracked = remoteRunMap.get(runId);
+    const info = tracked ?? parseRemoteRunId(runId);
     if (!info) return null;
     const project = await fastify2.storage.projects.getById(info.projectId, userId);
     if (!project) return null;
+    if (!tracked && !await fastify2.storage.projectRemotes.getByProjectAndServer(info.projectId, info.remoteServerId)) {
+      return null;
+    }
     return info;
   };
   const distillIntentBrief = async (userId, sourceSessionId) => {
@@ -259630,14 +259698,68 @@ var routes30 = async (fastify2) => {
     if (!cachedSecret) cachedSecret = getCrossRemoteSecret(fastify2.storage);
     return cachedSecret;
   };
+  const expiredNotifyAt = /* @__PURE__ */ new Map();
+  const EXPIRED_NOTIFY_MIN_INTERVAL_MS = 6e4;
+  const notifyTokenExpired = async (payload, exp) => {
+    const last = expiredNotifyAt.get(payload.sessionId);
+    const now3 = Date.now();
+    if (last !== void 0 && now3 - last < EXPIRED_NOTIFY_MIN_INTERVAL_MS) return;
+    expiredNotifyAt.set(payload.sessionId, now3);
+    let projectId;
+    let branch = null;
+    const runtime2 = fastify2.agentSessionManager.getSession(payload.sessionId);
+    if (runtime2) {
+      projectId = runtime2.projectId;
+      branch = runtime2.branch;
+    } else if (payload.sessionId.startsWith("remote-")) {
+      const mapping = await fastify2.storage.remoteSessionMappings.getByLocal(payload.sessionId);
+      if (mapping) {
+        projectId = mapping.project_id;
+        branch = mapping.branch ?? null;
+      }
+    } else {
+      const row = await fastify2.storage.agentSessions.getById(payload.sessionId);
+      if (row) {
+        projectId = row.project_id;
+        branch = row.branch || null;
+      }
+    }
+    if (!projectId) return;
+    const project = await fastify2.storage.projects.getById(projectId);
+    const session = await fastify2.storage.agentSessions.getById(payload.sessionId);
+    const notification = {
+      // Deterministic per token instance: retries and multiple expired calls
+      // from the same process collapse onto one inbox row.
+      id: `cross-remote-expired:${payload.sessionId}:${exp}`,
+      user_id: payload.userId,
+      kind: "cross_remote_token_expired",
+      project_id: projectId,
+      branch,
+      session_id: payload.sessionId,
+      workflow_run_id: null,
+      title: notificationTitle("cross_remote_token_expired"),
+      body: notificationBody({ sessionTitle: session?.title, branch, projectName: project?.name }),
+      created_at: now3,
+      read_at: null
+    };
+    if (await fastify2.storage.notifications.insert(notification)) {
+      fastify2.eventBus.emit({ type: "notification:created", projectId, notification });
+    }
+  };
   const authenticate = async (request) => {
     const header = request.headers.authorization;
     if (!header?.startsWith("Bearer ")) return null;
     const secret = await getSecret();
-    const payload = verifyCrossRemoteToken(secret, header.slice("Bearer ".length), Date.now());
-    if (!payload) return null;
-    if (!isSessionUsable(fastify2, payload.sessionId)) return null;
-    return payload;
+    const verified = verifyCrossRemoteTokenDetailed(secret, header.slice("Bearer ".length), Date.now());
+    if (verified.status === "expired") {
+      void notifyTokenExpired(verified.payload, verified.exp).catch(
+        (err) => console.error("[CrossRemoteMCP] expired-token notification failed:", err)
+      );
+      return null;
+    }
+    if (verified.status !== "ok") return null;
+    if (!isSessionUsable(fastify2, verified.payload.sessionId)) return null;
+    return verified.payload;
   };
   const audit = async (payload, targetRemoteId, toolName, summary, status, exitCode, startedAt) => {
     try {

package/package.json

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