@vibedeckx/linux-x64 0.3.1 → 0.3.2

package/dist/bin.js

@@ -186618,20 +186618,6 @@ var createAgentSessionRepos = (kdb, h) => ({
       const row = await kdb.selectFrom("agent_sessions").select(kdb.fn.countAll().as("count")).where("project_id", "=", projectId).where("status", "=", "running").executeTakeFirstOrThrow();
       return Number(row.count);
     },
-    countAttentionByProject: async (projectId) => {
-      const row = await kdb.selectFrom("agent_sessions").select(kdb.fn.countAll().as("count")).where("project_id", "=", projectId).where((eb) => eb.or([
-        eb("status", "=", "error"),
-        eb.and([
-          eb("status", "=", "stopped"),
-          eb("last_user_message_at", "is not", null),
-          eb.or([
-            eb("last_completed_at", "is", null),
-            eb("last_completed_at", "<", eb.ref("last_user_message_at"))
-          ])
-        ])
-      ])).executeTakeFirstOrThrow();
-      return Number(row.count);
-    },
     getByBranch: async (projectId, branch) => {
       const row = await kdb.selectFrom("agent_sessions").selectAll().where("project_id", "=", projectId).where("branch", "=", branch).orderBy("updated_at", "desc").limit(1).executeTakeFirst();
       return row ? mapAgentSession(row) : void 0;
@@ -187159,14 +187145,9 @@ var createSearchCacheRepos = (kdb, _h) => ({
     },
     countRemoteSessionActivityByProject: async (projectId) => {
       const row = await remoteSessionScope(kdb, projectId).select([
-        sql`coalesce(sum(case when c.status = 'running' then 1 else 0 end), 0)`.as("running"),
-        sql`coalesce(sum(case
-            when c.status = 'error' then 1
-            when c.status = 'stopped' and c.last_user_message_at is not null
-              and (c.last_completed_at is null or c.last_completed_at < c.last_user_message_at) then 1
-            else 0 end), 0)`.as("failed")
+        sql`coalesce(sum(case when c.status = 'running' then 1 else 0 end), 0)`.as("running")
       ]).executeTakeFirstOrThrow();
-      return { running: Number(row.running), failed: Number(row.failed) };
+      return { running: Number(row.running) };
     },
     updateRemoteSessionActivity: async (entry) => {
       return kdb.transaction().execute(async (trx) => {
@@ -234438,7 +234419,8 @@ var ProjectChatManager = class {
     this.startupReconciliationDeadlineMs = Math.max(10, options.startupReconciliationDeadlineMs ?? 1e3);
     this.reconciliationOperationTimeoutMs = Math.max(10, options.reconciliationOperationTimeoutMs ?? 250);
     this.recoveryPageSize = Math.max(1, Math.min(100, options.recoveryPageSize ?? 25));
-    this.maxConcurrentTurns = Math.max(1, options.maxConcurrentTurns ?? 4);
+    this.maxConcurrentTurns = Math.max(1, options.maxConcurrentTurns ?? 50);
+    this.maxConcurrentTurnsPerUser = Math.max(1, options.maxConcurrentTurnsPerUser ?? 4);
     this.reconciliationDelayMs = Math.min(100, this.reconciliationIntervalMs);
     this.toolDependencies = options.toolDependencies;
     this.unsubscribeEvents = options.eventBus?.subscribe((event) => {
@@ -234478,6 +234460,7 @@ var ProjectChatManager = class {
   reconciliationOperationTimeoutMs;
   recoveryPageSize;
   maxConcurrentTurns;
+  maxConcurrentTurnsPerUser;
   toolDependencies;
   unsubscribeEvents;
   startupReconciliation;
@@ -234488,6 +234471,7 @@ var ProjectChatManager = class {
   pendingPumps = [];
   pendingPumpIds = /* @__PURE__ */ new Set();
   activeTurnCount = 0;
+  activeTurnsByUser = /* @__PURE__ */ new Map();
   reconciliationTimer = null;
   reconciliationDelayMs = 100;
   shuttingDown = false;
@@ -235361,6 +235345,7 @@ var ProjectChatManager = class {
         pendingApprovals: /* @__PURE__ */ new Map(),
         writeTail: Promise.resolve(),
         evictionTimer: null,
+        queuedAt: null,
         contextRefreshGeneration: 0,
         contextRefreshFlight: null,
         contextRefreshBroadcast: false
@@ -235482,22 +235467,51 @@ var ProjectChatManager = class {
   pump(live) {
     if (live.activeWork || this.shuttingDown || this.closingThreads.has(live.thread.id)) return;
     if (live.queue.length === 0) return;
-    if (this.activeTurnCount >= this.maxConcurrentTurns) {
-      if (!this.pendingPumpIds.has(live.thread.id)) {
-        this.pendingPumpIds.add(live.thread.id);
-        this.pendingPumps.push(live);
-      }
+    if (!this.canStartTurn(live)) {
+      this.enqueuePump(live);
       return;
     }
     this.startPump(live);
   }
+  /**
+   * Park a thread that has work but no slot. Queueing is invisible to the
+   * caller and only shows up as latency, so every entry into this state is
+   * logged once with the cap that caused it.
+   */
+  enqueuePump(live) {
+    if (!this.pendingPumpIds.has(live.thread.id)) {
+      this.pendingPumpIds.add(live.thread.id);
+      this.pendingPumps.push(live);
+    }
+    if (live.queuedAt === null) {
+      live.queuedAt = Date.now();
+      const reason = this.activeTurnCount >= this.maxConcurrentTurns ? "global" : "per-user";
+      console.warn(`[ProjectChat] turn queued (thread=${live.thread.id} user=${live.thread.user_id} reason=${reason} active=${this.activeTurnCount}/${this.maxConcurrentTurns} userActive=${this.activeTurnsByUser.get(live.thread.user_id) ?? 0}/${this.maxConcurrentTurnsPerUser} waiting=${this.pendingPumps.length})`);
+    }
+    if (live.status !== "queued") {
+      live.status = "queued";
+      this.broadcastStatus(live);
+    }
+  }
+  /** A turn may start only when both the global and the per-user cap allow it. */
+  canStartTurn(live) {
+    if (this.activeTurnCount >= this.maxConcurrentTurns) return false;
+    const active = this.activeTurnsByUser.get(live.thread.user_id) ?? 0;
+    return active < this.maxConcurrentTurnsPerUser;
+  }
   startPump(live) {
     if (live.activeWork || this.shuttingDown || this.closingThreads.has(live.thread.id)) return;
     const queued = live.queue.shift();
     if (!queued) return;
     this.pendingPumpIds.delete(live.thread.id);
-    const slot = { released: false };
+    const userId = live.thread.user_id;
+    if (live.queuedAt !== null) {
+      console.warn(`[ProjectChat] queued turn started after ${Date.now() - live.queuedAt}ms (thread=${live.thread.id} user=${userId})`);
+      live.queuedAt = null;
+    }
+    const slot = { released: false, userId };
     this.activeTurnCount++;
+    this.activeTurnsByUser.set(userId, (this.activeTurnsByUser.get(userId) ?? 0) + 1);
     live.activeSlot = slot;
     this.cancelEviction(live);
     let work;
@@ -235510,10 +235524,7 @@ var ProjectChatManager = class {
         live.abortController = null;
         if (live.queue.length > 0 && !this.shuttingDown && !this.closingThreads.has(live.thread.id)) {
           if (this.pendingPumps.length > 0) {
-            if (!this.pendingPumpIds.has(live.thread.id)) {
-              this.pendingPumpIds.add(live.thread.id);
-              this.pendingPumps.push(live);
-            }
+            this.enqueuePump(live);
           } else {
             this.pump(live);
           }
@@ -235531,14 +235542,23 @@ var ProjectChatManager = class {
     if (slot.released) return;
     slot.released = true;
     this.activeTurnCount = Math.max(0, this.activeTurnCount - 1);
+    const remaining = (this.activeTurnsByUser.get(slot.userId) ?? 0) - 1;
+    if (remaining > 0) this.activeTurnsByUser.set(slot.userId, remaining);
+    else this.activeTurnsByUser.delete(slot.userId);
     this.drainPendingPumps();
   }
   drainPendingPumps() {
+    for (let index = this.pendingPumps.length - 1; index >= 0; index -= 1) {
+      const live = this.pendingPumps[index];
+      if (!live.activeWork && live.queue.length > 0 && !this.closingThreads.has(live.thread.id) && this.liveThreads.get(live.thread.id) === live) continue;
+      this.pendingPumps.splice(index, 1);
+      this.pendingPumpIds.delete(live.thread.id);
+    }
     while (!this.shuttingDown && this.activeTurnCount < this.maxConcurrentTurns) {
-      const live = this.pendingPumps.shift();
-      if (!live) return;
+      const index = this.pendingPumps.findIndex((live2) => this.canStartTurn(live2));
+      if (index < 0) return;
+      const [live] = this.pendingPumps.splice(index, 1);
       this.pendingPumpIds.delete(live.thread.id);
-      if (live.activeWork || live.queue.length === 0 || this.closingThreads.has(live.thread.id) || this.liveThreads.get(live.thread.id) !== live) continue;
       this.startPump(live);
     }
   }
@@ -238823,23 +238843,34 @@ var routes3 = async (fastify2) => {
     const host = request.headers["x-forwarded-host"] || request.headers.host || "localhost";
     return `npx vibedeckx@latest connect --connect-to ${proto}://${host} --token ${token}`;
   };
-  for (const mode of ["generate", "rotate"]) {
-    fastify2.post(
-      `/api/remote-servers/:id/${mode}-token`,
-      async (request, reply) => {
-        const userId = requireUserFacingUserId(request, reply);
-        if (userId === null) return;
-        const { id } = request.params;
-        const server = await fastify2.storage.remoteServers.getById(id, userId);
-        if (!server)
-          return reply.code(404).send({ error: "Server not found" });
-        const token = mode === "generate" ? await fastify2.storage.remoteServers.generateToken(id, userId) : await fastify2.storage.remoteServers.rotateToken(id, userId);
-        if (!token)
-          return reply.code(500).send({ error: `Failed to ${mode} token` });
-        return reply.send({ token, connectCommand: connectCommandFor(request, token) });
-      }
-    );
-  }
+  const sendConnectToken = async (request, reply, op, failure) => {
+    const userId = requireUserFacingUserId(request, reply);
+    if (userId === null) return;
+    const { id } = request.params;
+    const server = await fastify2.storage.remoteServers.getById(id, userId);
+    if (!server) return reply.code(404).send({ error: "Server not found" });
+    const token = await op(id, userId);
+    if (!token) return reply.code(500).send({ error: failure });
+    return reply.send({ token, connectCommand: connectCommandFor(request, token) });
+  };
+  fastify2.post(
+    "/api/remote-servers/:id/connect-token",
+    (request, reply) => sendConnectToken(
+      request,
+      reply,
+      (id, userId) => fastify2.storage.remoteServers.generateToken(id, userId),
+      "Failed to read token"
+    )
+  );
+  fastify2.post(
+    "/api/remote-servers/:id/connect-token/rotate",
+    (request, reply) => sendConnectToken(
+      request,
+      reply,
+      (id, userId) => fastify2.storage.remoteServers.rotateToken(id, userId),
+      "Failed to rotate token"
+    )
+  );
   fastify2.post(
     "/api/remote-servers/:id/browse",
     async (request, reply) => {
@@ -238891,8 +238922,8 @@ var routes3 = async (fastify2) => {
       }
     }
   );
-  fastify2.post(
-    "/api/remote-servers/:id/revoke-token",
+  fastify2.delete(
+    "/api/remote-servers/:id/connect-token",
     async (request, reply) => {
       const userId = requireUserFacingUserId(request, reply);
       if (userId === null) return;
@@ -242059,6 +242090,14 @@ var routes11 = async (fastify2) => {
         console.error(`[API] remote activity write-through failed for ${req.params.sessionId}:`, error48);
         return false;
       });
+      ensureRemoteAgentStream(req.params.sessionId, {
+        remoteSessionMap: fastify2.remoteSessionMap,
+        remotePatchCache: fastify2.remotePatchCache,
+        reverseConnectManager: fastify2.reverseConnectManager,
+        eventBus: fastify2.eventBus,
+        agentSessionManager: fastify2.agentSessionManager,
+        storage: fastify2.storage
+      });
       if (activityReady === true) {
         fastify2.agentSessionManager.emitBranchActivityIfChanged(
           projectId,
@@ -243464,7 +243503,7 @@ var project_chat_routes_default = (0, import_fastify_plugin16.default)(routes15,
 var import_fastify_plugin17 = __toESM(require_plugin2(), 1);
 
 // src/project-activity.ts
-var RECENT_THREAD_LIMIT = 3;
+var RECENT_THREAD_LIMIT = 5;
 var RECENT_SESSION_LIMIT = 8;
 var RECENT_RUN_LIMIT = 5;
 var PRIORITY_TASK_LIMIT = 5;
@@ -243518,8 +243557,6 @@ async function getProjectActivity(storage, projectId, userId) {
     attentionRuns,
     runningSessions,
     runningRuns,
-    failedSessions,
-    failedRuns,
     remoteCounts,
     nextScheduleAt
   ] = await Promise.all([
@@ -243533,8 +243570,6 @@ async function getProjectActivity(storage, projectId, userId) {
     storage.scheduledTaskRuns.getAttentionByProject(projectId, ATTENTION_LIMIT),
     storage.agentSessions.countRunningByProject(projectId),
     storage.scheduledTaskRuns.countByProjectStatuses(projectId, ["starting", "running"]),
-    storage.agentSessions.countAttentionByProject(projectId),
-    storage.scheduledTaskRuns.countByProjectStatuses(projectId, ["failed", "timeout"]),
     storage.searchCache.countRemoteSessionActivityByProject(projectId),
     storage.scheduledTasks.getEarliestNextRunAt(projectId)
   ]);
@@ -243577,7 +243612,6 @@ async function getProjectActivity(storage, projectId, userId) {
     attention,
     summary: {
       running: runningSessions + runningRuns + remoteCounts.running,
-      failed: failedSessions + failedRuns + remoteCounts.failed,
       nextScheduleAt
     }
   };
@@ -245347,6 +245381,9 @@ async function authenticateWs(authEnabled, query, socket) {
   if (!userId) return reject("Invalid authentication token");
   return { userId, kind: "user" };
 }
+function processOwnerScope(principal) {
+  return principal.kind === "user" ? principal.userId : null;
+}
 async function localProcessProjectId(fastify2, processId) {
   const live = fastify2.processManager.getProcessProjectId(processId);
   if (live) return live;
@@ -245462,7 +245499,7 @@ var routes23 = async (fastify2) => {
           console.log(`[WebSocket] Auth rejected for process ${processId}`);
           return;
         }
-        const ownerUserId = principal.kind === "api_key" ? null : principal.userId ?? "local";
+        const ownerUserId = processOwnerScope(principal);
         if (ownerUserId !== null && !await userOwnsProcess(fastify2, processId, ownerUserId)) {
           console.log(`[WebSocket] Ownership denied for process ${processId} (user=${ownerUserId})`);
           try {
@@ -245531,7 +245568,7 @@ var routes23 = async (fastify2) => {
         const handleInputMap = /* @__PURE__ */ new Map();
         const subscribeProcess = async (processId) => {
           if (subs.has(processId)) return;
-          const ownerUserId = principal.kind === "api_key" ? null : principal.userId ?? "local";
+          const ownerUserId = processOwnerScope(principal);
           if (ownerUserId !== null && !await userOwnsProcess(fastify2, processId, ownerUserId)) {
             console.log(`[ExecutorMux] Ownership denied for process ${processId} (user=${ownerUserId})`);
             try {
@@ -245836,8 +245873,46 @@ var websocket_routes_default = (0, import_fastify_plugin24.default)(routes23, {
 // src/routes/reverse-connect-routes.ts
 var import_fastify_plugin25 = __toESM(require_plugin2(), 1);
 import { randomBytes as randomBytes2, createHash as createHash7, verify as cryptoVerify } from "crypto";
+
+// src/utils/rate-limited-warn.ts
+function createRateLimitedWarn(windowMs, maxKeys) {
+  const seen = /* @__PURE__ */ new Map();
+  return function warnRateLimited(key, message) {
+    const now3 = Date.now();
+    const entry = seen.get(key);
+    if (entry && now3 - entry.last < windowMs) {
+      entry.suppressed++;
+      return;
+    }
+    if (!entry && seen.size >= maxKeys) {
+      let oldestKey = null;
+      let oldestAt = Infinity;
+      for (const [k2, v2] of seen) {
+        if (now3 - v2.last > windowMs) {
+          seen.delete(k2);
+          continue;
+        }
+        if (v2.last < oldestAt) {
+          oldestAt = v2.last;
+          oldestKey = k2;
+        }
+      }
+      if (seen.size >= maxKeys && oldestKey !== null) seen.delete(oldestKey);
+    }
+    const suppressed = entry?.suppressed ?? 0;
+    seen.set(key, { last: now3, suppressed: 0 });
+    console.warn(
+      message + (suppressed > 0 ? ` (+${suppressed} more in the last ${Math.round(windowMs / 1e3)}s)` : "")
+    );
+  };
+}
+
+// src/routes/reverse-connect-routes.ts
 var MACHINE_HANDSHAKE_TIMEOUT_MS = 5e3;
+var REJECT_LOG_WINDOW_MS = 3e4;
+var REJECT_LOG_MAX_KEYS = 500;
 var routes24 = async (fastify2) => {
+  const logRejectedUpgrade = createRateLimitedWarn(REJECT_LOG_WINDOW_MS, REJECT_LOG_MAX_KEYS);
   fastify2.get("/api/reverse-connect/identity", async (req, reply) => {
     const token = req.headers["x-vibedeckx-connect-token"];
     if (typeof token !== "string" || token.length === 0) {
@@ -245856,12 +245931,17 @@ var routes24 = async (fastify2) => {
       async (socket, req) => {
         const token = req.query.token;
         if (!token) {
+          logRejectedUpgrade(`no-token:${req.ip}`, `[ReverseConnect] Rejected upgrade from ${req.ip}: no connect token`);
           socket.send(JSON.stringify({ error: "Token required" }));
           socket.close(4001, "Token required");
           return;
         }
         const server = await fastify2.storage.remoteServers.getByToken(token);
         if (!server) {
+          logRejectedUpgrade(
+            `bad-token:${req.ip}`,
+            `[ReverseConnect] Rejected upgrade from ${req.ip}: connect token not recognized \u2014 the worker needs a current token`
+          );
           socket.send(JSON.stringify({ error: "Invalid token" }));
           socket.close(4001, "Invalid token");
           return;
@@ -245899,6 +245979,7 @@ var routes24 = async (fastify2) => {
             const publicKey = frame.publicKey;
             const signature = frame.signature;
             if (!publicKey || !signature) {
+              logRejectedUpgrade(`malformed-auth:${serverId}`, `[ReverseConnect] Malformed machine auth from ${serverId}`);
               socket.close(4003, "Malformed machine auth");
               return;
             }
@@ -245909,6 +245990,7 @@ var routes24 = async (fastify2) => {
               valid = false;
             }
             if (!valid) {
+              logRejectedUpgrade(`bad-signature:${serverId}`, `[ReverseConnect] Bad machine signature from ${serverId}`);
               socket.close(4003, "Bad machine signature");
               return;
             }
@@ -246013,6 +246095,23 @@ var event_routes_default = (0, import_fastify_plugin26.default)(routes25, { name
 // src/routes/terminal-routes.ts
 var import_fastify_plugin27 = __toESM(require_plugin2(), 1);
 import path13 from "path";
+
+// src/utils/path-project.ts
+async function ensurePathProjectId(fastify2, projectPath) {
+  const pseudoProjectId = `path:${projectPath}`;
+  if (await fastify2.storage.projects.getById(pseudoProjectId)) return pseudoProjectId;
+  const existingByPath = await fastify2.storage.projects.getByPath(projectPath);
+  if (existingByPath) return existingByPath.id;
+  const name25 = projectPath.split("/").filter(Boolean).pop() || projectPath;
+  try {
+    await fastify2.storage.projects.create({ id: pseudoProjectId, name: name25, path: projectPath });
+  } catch (err) {
+    if (!(err instanceof Error && err.message.includes("UNIQUE constraint failed"))) throw err;
+  }
+  return pseudoProjectId;
+}
+
+// src/routes/terminal-routes.ts
 async function getRemoteConfig5(fastify2, project, remoteServerId) {
   const remotes = await fastify2.storage.projectRemotes.getByProject(project.id);
   const target = remoteServerId ? remotes.find((r) => r.remote_server_id === remoteServerId) : remotes[0];
@@ -246030,7 +246129,8 @@ var routes26 = async (fastify2) => {
     }
     const resolvedPath = resolveWorktreePath(projectPath, branch ?? null);
     try {
-      const terminal = fastify2.processManager.startTerminal("remote", resolvedPath);
+      const projectId = await ensurePathProjectId(fastify2, projectPath);
+      const terminal = fastify2.processManager.startTerminal(projectId, resolvedPath, branch ?? null);
       return reply.code(201).send({ terminal: { id: terminal.id, name: terminal.name, cwd: resolvedPath } });
     } catch (error48) {
       console.error(`[terminal-routes] Failed to start terminal in ${resolvedPath}:`, error48);
@@ -249435,6 +249535,8 @@ var MACHINE_KEY_SETTING = "reverse_machine_private_key";
 var RECONNECT_BASE_DELAY_MS = 1e3;
 var RECONNECT_MAX_DELAY_MS = 3e4;
 var NO_PING_TIMEOUT_MS = 6e4;
+var AUTH_REJECT_CODES = /* @__PURE__ */ new Set([4001, 4003]);
+var HEALTHY_CONNECTION_MS = 5e3;
 function isTextualContentType(contentType) {
   const t = contentType.toLowerCase();
   if (t === "") return true;
@@ -249448,6 +249550,7 @@ var ReverseConnectClient = class {
   localPort;
   localChannels = /* @__PURE__ */ new Map();
   reconnectAttempt = 0;
+  openedAt = null;
   reconnectTimer = null;
   noPingTimer = null;
   shuttingDown = false;
@@ -249468,8 +249571,8 @@ var ReverseConnectClient = class {
       maxPayload: 11 * 1024 * 1024
     });
     this.ws.on("open", () => {
-      console.log("[ReverseClient] Connected to server");
-      this.reconnectAttempt = 0;
+      console.log("[ReverseClient] Socket open, awaiting server handshake");
+      this.openedAt = Date.now();
       this.resetNoPingTimer();
       const frame = { type: "status", ready: true };
       this.ws.send(JSON.stringify(frame));
@@ -249484,7 +249587,19 @@ var ReverseConnectClient = class {
     });
     this.ws.on("close", (code, reason) => {
       const safeReason = redactSecretForms(reason?.toString() || "", this.token);
-      console.log(`[ReverseClient] Disconnected (code=${code}, reason=${safeReason})`);
+      const rejected = AUTH_REJECT_CODES.has(code);
+      const uptime = this.openedAt === null ? 0 : Date.now() - this.openedAt;
+      if (rejected) {
+        console.error(
+          `[ReverseClient] Server rejected this connection (code=${code}, reason=${safeReason}). ` + (code === 4001 ? "The connect token is no longer valid \u2014 open Settings \u2192 Remote Servers, read the current token, and re-run `vibedeckx connect` with it." : "This machine's identity was refused \u2014 the remote record may belong to another machine or another account.") + " Retrying with backoff, but it will not recover on its own."
+        );
+      } else {
+        console.log(`[ReverseClient] Disconnected (code=${code}, reason=${safeReason})`);
+      }
+      if (!rejected && this.openedAt !== null && uptime >= HEALTHY_CONNECTION_MS) {
+        this.reconnectAttempt = 0;
+      }
+      this.openedAt = null;
       this.clearNoPingTimer();
       this.closeAllLocalChannels();
       this.ws = null;

package/package.json

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