@vibedeckx/linux-x64 0.2.6 → 0.2.7

package/dist/bin.js

@@ -186146,7 +186146,11 @@ var asRun = (row) => row;
 var createWorkflowRunRepos = (kdb) => ({
   workflowRuns: {
     create: async (opts) => {
-      await kdb.insertInto("workflow_runs").values({ ...opts, status: "waiting_reviewer" }).execute();
+      await kdb.insertInto("workflow_runs").values({
+        ...opts,
+        reviewer_session_id: opts.reviewer_session_id ?? null,
+        status: "waiting_reviewer"
+      }).execute();
       const row = await kdb.selectFrom("workflow_runs").selectAll().where("id", "=", opts.id).executeTakeFirstOrThrow();
       return asRun(row);
     },
@@ -186169,6 +186173,10 @@ var createWorkflowRunRepos = (kdb) => ({
       ])).executeTakeFirst();
       return row ? asRun(row) : void 0;
     },
+    getLatestCompletedBySource: async (sourceSessionId) => {
+      const row = await kdb.selectFrom("workflow_runs").selectAll().where("source_session_id", "=", sourceSessionId).where("status", "=", "completed").where("reviewer_session_id", "is not", null).orderBy("created_at", "desc").orderBy(sql`rowid`, "desc").executeTakeFirst();
+      return row ? asRun(row) : void 0;
+    },
     update: async (id, patch) => {
       if (Object.keys(patch).length > 0) {
         await kdb.updateTable("workflow_runs").set({ ...patch, updated_at: sql`datetime('now')` }).where("id", "=", id).execute();
@@ -226027,6 +226035,13 @@ function mapRemoteRun(run2, remoteServerId, projectId) {
     reviewer_session_id: run2.reviewer_session_id ? `${prefix}${run2.reviewer_session_id}` : null
   };
 }
+function mapRemoteReviewerCandidate(candidate, remoteServerId, projectId) {
+  if (!candidate?.sessionId) return candidate;
+  return {
+    ...candidate,
+    sessionId: `remote-${remoteServerId}-${projectId}-${candidate.sessionId}`
+  };
+}
 function runUpdatedEventFromRemoteFrame(parsed, sessionId, remoteInfo) {
   if (!("workflowRunUpdated" in parsed)) return null;
   const bare = parsed.workflowRunUpdated;
@@ -228713,9 +228728,10 @@ function extractLatestTurnEndIndex(entries) {
   }
   return null;
 }
-function extractLastAssistantBefore(entries, beforeIndex) {
+function extractLastAssistantInTurn(entries, beforeIndex) {
   for (let i = beforeIndex - 1; i >= 0; i--) {
     const e = entries[i];
+    if (e?.type === "user") return null;
     if (e?.type === "assistant" && typeof e.content === "string" && e.content.trim()) return e.content;
   }
   return null;
@@ -228746,6 +228762,27 @@ ${opts.reviewFocus}` : null,
     "\nEnd your final message with a clear, actionable list of feedback items \u2014 or state explicitly that the work looks good."
   ].filter((l) => l !== null).join("\n");
 }
+function reviewTargetPromptLine(target) {
+  return target.baseHead ? `- The work was captured at commit ${target.baseHead}${target.diffStat ? ` with uncommitted changes (${target.diffStat})` : " with no uncommitted changes"}.` : null;
+}
+function buildRereviewerPrompt(opts) {
+  return [
+    "The source agent has addressed feedback from your previous review.",
+    "Review the latest workspace state again.",
+    opts.taskContext ? `
+## Latest source turn
+${opts.taskContext}` : null,
+    opts.reviewFocus ? `
+## Review focus
+${opts.reviewFocus}` : null,
+    "\n## How to review",
+    "- Verify whether your previous feedback was addressed correctly.",
+    "- Check for regressions and remaining correctness or test gaps.",
+    "- Do NOT modify files \u2014 remain in read-only review mode.",
+    reviewTargetPromptLine(opts.target),
+    "- End with actionable feedback, or explicitly state that it looks good."
+  ].filter((line) => line !== null).join("\n");
+}
 function buildFeedbackMessage(feedback) {
   return [
     "[Review Feedback]",
@@ -228754,6 +228791,7 @@ function buildFeedbackMessage(feedback) {
     feedback
   ].join("\n");
 }
+var REVIEWER_AGENT_TYPES = /* @__PURE__ */ new Set(["claude-code", "codex"]);
 var WorkflowEngine = class {
   constructor(storage, agentOps) {
     this.storage = storage;
@@ -228803,6 +228841,15 @@ var WorkflowEngine = class {
       if (p2.runId === run2.id) this.participants.delete(sid);
     }
   }
+  releaseReservations(runId) {
+    for (const [sid, participant] of this.participants) {
+      if (participant.runId === runId) this.participants.delete(sid);
+    }
+  }
+  async failRun(run2, error48) {
+    const failed = await this.storage.workflowRuns.update(run2.id, { status: "failed", error: error48 });
+    if (failed) this.untrackRun(failed);
+  }
   /** Sync check used by ChatSessionManager before waking the commander model. */
   shouldSuppressAgentEvent(sessionId) {
     return this.participants.get(sessionId)?.role === "reviewer";
@@ -228810,14 +228857,62 @@ var WorkflowEngine = class {
   isSessionInActiveRun(sessionId) {
     return this.participants.has(sessionId);
   }
+  async getReviewerCandidate(sourceSessionId) {
+    const previous = await this.storage.workflowRuns.getLatestCompletedBySource(sourceSessionId);
+    if (!previous?.reviewer_session_id) return null;
+    const unavailable = (reason) => ({
+      available: false,
+      sessionId: null,
+      title: null,
+      agentType: null,
+      reason
+    });
+    const source = await this.storage.agentSessions.getById(sourceSessionId);
+    const reviewer = await this.storage.agentSessions.getById(previous.reviewer_session_id);
+    if (!reviewer) return unavailable("deleted");
+    if (!source || reviewer.project_id !== source.project_id || reviewer.project_id !== previous.project_id) {
+      return unavailable("project-mismatch");
+    }
+    if ((reviewer.branch || null) !== (source.branch || null) || (reviewer.branch || null) !== previous.branch) {
+      return unavailable("branch-mismatch");
+    }
+    if (!REVIEWER_AGENT_TYPES.has(reviewer.agent_type)) {
+      return unavailable("unsupported-agent");
+    }
+    if (reviewer.status === "running") return unavailable("running");
+    if (reviewer.status !== "stopped") return unavailable("unavailable");
+    if (this.participants.has(reviewer.id) || await this.storage.workflowRuns.getActiveBySession(reviewer.id)) {
+      return unavailable("busy");
+    }
+    return {
+      available: true,
+      sessionId: reviewer.id,
+      title: reviewer.title ?? null,
+      agentType: reviewer.agent_type,
+      reason: null
+    };
+  }
   async startAdhocReview(opts) {
-    if (this.participants.has(opts.sourceSessionId)) {
-      throw new WorkflowError("session-busy", "\u8BE5 session \u5DF2\u5728\u4E00\u4E2A\u8FDB\u884C\u4E2D\u7684 review \u91CC");
+    if (opts.reviewerSessionId === opts.sourceSessionId) {
+      throw new WorkflowError("reviewer-unavailable", "reviewer session \u4E0D\u80FD\u4E0E source session \u76F8\u540C");
+    }
+    const runId = randomUUID5();
+    const participantIds = [opts.sourceSessionId, opts.reviewerSessionId].filter((id) => Boolean(id));
+    for (const sessionId of participantIds) {
+      if (this.participants.has(sessionId)) {
+        throw new WorkflowError("session-busy", "\u8BE5 session \u5DF2\u5728\u4E00\u4E2A\u8FDB\u884C\u4E2D\u7684 review \u91CC");
+      }
+    }
+    this.participants.set(opts.sourceSessionId, { runId, role: "source" });
+    if (opts.reviewerSessionId) {
+      this.participants.set(opts.reviewerSessionId, { runId, role: "reviewer" });
     }
-    this.participants.set(opts.sourceSessionId, { runId: "pending", role: "source" });
     try {
-      const busy = await this.storage.workflowRuns.getActiveBySession(opts.sourceSessionId);
-      if (busy) throw new WorkflowError("session-busy", "\u8BE5 session \u5DF2\u5728\u4E00\u4E2A\u8FDB\u884C\u4E2D\u7684 review \u91CC");
+      for (const sessionId of participantIds) {
+        if (await this.storage.workflowRuns.getActiveBySession(sessionId)) {
+          throw new WorkflowError("session-busy", "\u8BE5 session \u5DF2\u5728\u4E00\u4E2A\u8FDB\u884C\u4E2D\u7684 review \u91CC");
+        }
+      }
       const sourceSession = await this.storage.agentSessions.getById(opts.sourceSessionId);
       if (sourceSession?.status === "running") {
         throw new WorkflowError("source-running", "source session \u6B63\u5728\u8FD0\u884C\uFF0C\u8BF7\u7B49\u5F85\u5F53\u524D turn \u5B8C\u6210\u540E\u518D\u53D1\u8D77 review");
@@ -228829,16 +228924,61 @@ var WorkflowEngine = class {
       }
       const worktreePath = resolveWorktreePath(opts.project.path, opts.branch);
       const target = captureReviewTarget(worktreePath);
+      let reviewerSession = null;
+      if (opts.reviewerSessionId) {
+        reviewerSession = await this.storage.agentSessions.getById(opts.reviewerSessionId);
+        if (!reviewerSession) {
+          throw new WorkflowError("reviewer-unavailable", "\u4E0A\u6B21 reviewer session \u5DF2\u4E0D\u5B58\u5728");
+        }
+        if (reviewerSession.project_id !== opts.project.id) {
+          throw new WorkflowError("reviewer-unavailable", "reviewer session \u4E0D\u5C5E\u4E8E\u5F53\u524D\u9879\u76EE");
+        }
+        if ((reviewerSession.branch || null) !== opts.branch) {
+          throw new WorkflowError("reviewer-unavailable", "reviewer session \u4E0D\u5C5E\u4E8E\u5F53\u524D branch");
+        }
+        if (!REVIEWER_AGENT_TYPES.has(reviewerSession.agent_type)) {
+          throw new WorkflowError("reviewer-unavailable", "reviewer agent \u7C7B\u578B\u4E0D\u53EF\u7528");
+        }
+        if (reviewerSession.status !== "stopped") {
+          throw new WorkflowError("reviewer-unavailable", "reviewer session \u6B63\u5728\u8FD0\u884C\u6216\u4E0D\u53EF\u7528");
+        }
+      }
       const run2 = await this.storage.workflowRuns.create({
-        id: randomUUID5(),
+        id: runId,
         project_id: opts.project.id,
         branch: opts.branch,
         source_session_id: opts.sourceSessionId,
         source_turn_end_index: turnEndIndex,
         review_focus: opts.reviewFocus ?? null,
-        review_target: JSON.stringify(target)
+        review_target: JSON.stringify(target),
+        reviewer_session_id: opts.reviewerSessionId ?? null
       });
       this.trackParticipants(run2);
+      if (opts.reviewerSessionId && reviewerSession) {
+        if (reviewerSession.permission_mode !== "plan") {
+          let switched = false;
+          try {
+            switched = await this.agentOps.switchMode(opts.reviewerSessionId, opts.project.path, "plan");
+          } catch {
+          }
+          if (!switched) {
+            await this.failRun(run2, "\u65E0\u6CD5\u5C06 reviewer \u6062\u590D\u4E3A\u53EA\u8BFB plan \u6A21\u5F0F");
+            throw new WorkflowError("reviewer-unavailable", "\u65E0\u6CD5\u5C06 reviewer \u6062\u590D\u4E3A\u53EA\u8BFB plan \u6A21\u5F0F");
+          }
+        }
+        const prompt = buildRereviewerPrompt({
+          taskContext: extractTaskContextBefore(entries, turnEndIndex),
+          reviewFocus: opts.reviewFocus ?? null,
+          target
+        });
+        const sent = await this.agentOps.sendUserMessage(opts.reviewerSessionId, prompt, opts.project.path).catch(() => false);
+        if (!sent) {
+          await this.failRun(run2, "\u5411\u4E0A\u6B21 reviewer \u6295\u9012\u590D\u5BA1\u4EFB\u52A1\u5931\u8D25");
+          throw new WorkflowError("send-failed", "\u5411\u4E0A\u6B21 reviewer \u6295\u9012\u590D\u5BA1\u4EFB\u52A1\u5931\u8D25");
+        }
+        this.emitRunUpdated(run2);
+        return run2;
+      }
       try {
         const reviewerId = await this.agentOps.createNewSession(
           opts.project.id,
@@ -228882,9 +229022,7 @@ var WorkflowEngine = class {
         throw new WorkflowError("spawn-failed", "\u521B\u5EFA reviewer session \u5931\u8D25");
       }
     } catch (err) {
-      if (this.participants.get(opts.sourceSessionId)?.runId === "pending") {
-        this.participants.delete(opts.sourceSessionId);
-      }
+      this.releaseReservations(runId);
       throw err;
     }
   }
@@ -228895,7 +229033,7 @@ var WorkflowEngine = class {
     if (!run2 || run2.status !== "waiting_reviewer") return;
     const entries = this.agentOps.getRawMessages(event.sessionId);
     const boundary = event.turnEndEntryIndex ?? extractLatestTurnEndIndex(entries) ?? entries.length;
-    const feedback = extractLastAssistantBefore(entries, boundary) ?? "(reviewer \u6CA1\u6709\u8F93\u51FA\u53EF\u7528\u7684\u53CD\u9988\u6587\u672C)";
+    const feedback = extractLastAssistantInTurn(entries, boundary) ?? "(reviewer \u6CA1\u6709\u8F93\u51FA\u53EF\u7528\u7684\u53CD\u9988\u6587\u672C)";
     let driftNote = null;
     try {
       const target = run2.review_target ? JSON.parse(run2.review_target) : null;
@@ -234932,6 +235070,9 @@ var routes11 = async (fastify2) => {
         );
         return reply.code(proxyStatus(result)).send(result.data);
       }
+      if (fastify2.workflowEngine.isSessionInActiveRun(req.params.sessionId)) {
+        return reply.code(409).send({ error: "Session is participating in an active review" });
+      }
       const session = fastify2.agentSessionManager.getSession(req.params.sessionId);
       if (!session) {
         return reply.code(404).send({ error: "Session not found" });
@@ -234971,6 +235112,9 @@ var routes11 = async (fastify2) => {
         );
         return reply.code(proxyStatus(result)).send(result.data);
       }
+      if (fastify2.workflowEngine.isSessionInActiveRun(req.params.sessionId)) {
+        return reply.code(409).send({ error: "Session is participating in an active review" });
+      }
       const session = fastify2.agentSessionManager.getSession(req.params.sessionId);
       if (!session) {
         return reply.code(404).send({ error: "Session not found" });
@@ -235909,7 +236053,6 @@ var command_routes_default = (0, import_fastify_plugin18.default)(routes17, { na
 
 // src/routes/workflow-run-routes.ts
 var import_fastify_plugin19 = __toESM(require_plugin2(), 1);
-var REVIEWER_AGENT_TYPES = /* @__PURE__ */ new Set(["claude-code", "codex"]);
 function parseReviewerAgentType(raw) {
   if (raw === void 0) return void 0;
   return typeof raw === "string" && REVIEWER_AGENT_TYPES.has(raw) ? raw : null;
@@ -235921,6 +236064,8 @@ function errStatus(err) {
       return 409;
     case "source-running":
       return 409;
+    case "reviewer-unavailable":
+      return 409;
     case "bad-state":
       return 409;
     case "no-completed-turn":
@@ -235960,6 +236105,14 @@ async function routes18(fastify2) {
     if (!projectId || !sourceSessionId) return reply.code(400).send({ error: "projectId and sourceSessionId are required" });
     const reviewerAgentType = parseReviewerAgentType(req.body?.reviewerAgentType);
     if (reviewerAgentType === null) return reply.code(400).send({ error: "reviewerAgentType must be one of: claude-code, codex" });
+    const reviewerSessionIdRaw = req.body?.reviewerSessionId;
+    if (reviewerSessionIdRaw !== void 0 && (typeof reviewerSessionIdRaw !== "string" || reviewerSessionIdRaw.trim() === "")) {
+      return reply.code(400).send({ error: "reviewerSessionId must be a non-empty string" });
+    }
+    if (reviewerSessionIdRaw !== void 0 && reviewerAgentType !== void 0) {
+      return reply.code(400).send({ error: "reviewerSessionId and reviewerAgentType are mutually exclusive" });
+    }
+    const reviewerSessionId = reviewerSessionIdRaw?.trim();
     if (sourceSessionId.startsWith("remote-")) {
       const remoteInfo = fastify2.remoteSessionMap.get(sourceSessionId);
       if (!remoteInfo) return reply.code(404).send({ error: "Session not found" });
@@ -235967,11 +236120,20 @@ async function routes18(fastify2) {
       if (derivedProjectId !== projectId) return reply.code(404).send({ error: "Session not found" });
       const remoteProject = await fastify2.storage.projects.getById(projectId, userId);
       if (!remoteProject) return reply.code(404).send({ error: "Project not found" });
+      let bareReviewerSessionId;
+      if (reviewerSessionId) {
+        const reviewerInfo = fastify2.remoteSessionMap.get(reviewerSessionId);
+        if (!reviewerInfo || reviewerInfo.remoteServerId !== remoteInfo.remoteServerId || projectIdFromRemoteSessionId(reviewerSessionId, reviewerInfo) !== projectId) {
+          return reply.code(404).send({ error: "Reviewer session not found" });
+        }
+        bareReviewerSessionId = reviewerInfo.remoteSessionId;
+      }
       const result = await proxyAuto(remoteInfo, "POST", "/api/path/workflow-runs", {
         sourceSessionId: remoteInfo.remoteSessionId,
         reviewFocus,
         sourceTurnEndIndex,
-        reviewerAgentType
+        reviewerAgentType,
+        reviewerSessionId: bareReviewerSessionId
       });
       if (!result.ok) return sendProxyFailure(reply, result);
       const bareRun = result.data.run;
@@ -236044,7 +236206,8 @@ async function routes18(fastify2) {
         sourceSessionId,
         reviewFocus,
         sourceTurnEndIndex,
-        reviewerAgentType
+        reviewerAgentType,
+        reviewerSessionId
       });
       return reply.code(201).send({ run: run2 });
     } catch (err) {
@@ -236053,6 +236216,55 @@ async function routes18(fastify2) {
       throw err;
     }
   });
+  fastify2.get("/api/workflow-runs/reviewer-candidate", async (req, reply) => {
+    const userId = requireAuth(req, reply);
+    if (userId === null) return;
+    const { projectId, sourceSessionId } = req.query;
+    if (!projectId || !sourceSessionId) {
+      return reply.code(400).send({ error: "projectId and sourceSessionId are required" });
+    }
+    const project = await fastify2.storage.projects.getById(projectId, userId);
+    if (!project) return reply.code(404).send({ error: "Project not found" });
+    if (sourceSessionId.startsWith("remote-")) {
+      const remoteInfo = fastify2.remoteSessionMap.get(sourceSessionId);
+      if (!remoteInfo || projectIdFromRemoteSessionId(sourceSessionId, remoteInfo) !== projectId) {
+        return reply.code(404).send({ error: "Session not found" });
+      }
+      const params = new URLSearchParams({ sourceSessionId: remoteInfo.remoteSessionId });
+      const result = await proxyAuto(
+        remoteInfo,
+        "GET",
+        `/api/path/workflow-runs/reviewer-candidate?${params}`
+      );
+      if (!result.ok) return sendProxyFailure(reply, result);
+      const bareCandidate = result.data.candidate;
+      const candidate2 = mapRemoteReviewerCandidate(bareCandidate, remoteInfo.remoteServerId, projectId);
+      if (bareCandidate?.sessionId && candidate2?.sessionId) {
+        const reviewerInfo = {
+          remoteServerId: remoteInfo.remoteServerId,
+          remoteUrl: remoteInfo.remoteUrl,
+          remoteApiKey: remoteInfo.remoteApiKey,
+          remoteSessionId: bareCandidate.sessionId,
+          branch: remoteInfo.branch
+        };
+        fastify2.remoteSessionMap.set(candidate2.sessionId, reviewerInfo);
+        await fastify2.storage.remoteSessionMappings.upsert(
+          candidate2.sessionId,
+          projectId,
+          remoteInfo.remoteServerId,
+          bareCandidate.sessionId,
+          remoteInfo.branch
+        );
+      }
+      return reply.send({ candidate: candidate2 });
+    }
+    const sourceSession = await fastify2.storage.agentSessions.getById(sourceSessionId);
+    if (!sourceSession || sourceSession.project_id !== projectId) {
+      return reply.code(404).send({ error: "Session not found" });
+    }
+    const candidate = await fastify2.workflowEngine.getReviewerCandidate(sourceSessionId);
+    return reply.send({ candidate });
+  });
   fastify2.get(
     "/api/workflow-runs",
     async (req, reply) => {
@@ -236175,6 +236387,14 @@ async function routes18(fastify2) {
     if (!sourceSessionId) return reply.code(400).send({ error: "sourceSessionId is required" });
     const reviewerAgentType = parseReviewerAgentType(req.body?.reviewerAgentType);
     if (reviewerAgentType === null) return reply.code(400).send({ error: "reviewerAgentType must be one of: claude-code, codex" });
+    const reviewerSessionIdRaw = req.body?.reviewerSessionId;
+    if (reviewerSessionIdRaw !== void 0 && (typeof reviewerSessionIdRaw !== "string" || reviewerSessionIdRaw.trim() === "")) {
+      return reply.code(400).send({ error: "reviewerSessionId must be a non-empty string" });
+    }
+    if (reviewerSessionIdRaw !== void 0 && reviewerAgentType !== void 0) {
+      return reply.code(400).send({ error: "reviewerSessionId and reviewerAgentType are mutually exclusive" });
+    }
+    const reviewerSessionId = reviewerSessionIdRaw?.trim();
     const sourceSession = await fastify2.storage.agentSessions.getById(sourceSessionId);
     if (!sourceSession) return reply.code(404).send({ error: "Session not found" });
     const project = await fastify2.storage.projects.getById(sourceSession.project_id);
@@ -236187,7 +236407,8 @@ async function routes18(fastify2) {
         sourceSessionId,
         reviewFocus,
         sourceTurnEndIndex,
-        reviewerAgentType
+        reviewerAgentType,
+        reviewerSessionId
       });
       return reply.code(201).send({ run: run2 });
     } catch (err) {
@@ -236196,6 +236417,16 @@ async function routes18(fastify2) {
       throw err;
     }
   });
+  fastify2.get("/api/path/workflow-runs/reviewer-candidate", async (req, reply) => {
+    const userId = requireAuth(req, reply);
+    if (userId === null) return;
+    const { sourceSessionId } = req.query;
+    if (!sourceSessionId) return reply.code(400).send({ error: "sourceSessionId is required" });
+    const sourceSession = await fastify2.storage.agentSessions.getById(sourceSessionId);
+    if (!sourceSession) return reply.code(404).send({ error: "Session not found" });
+    const candidate = await fastify2.workflowEngine.getReviewerCandidate(sourceSessionId);
+    return reply.send({ candidate });
+  });
   fastify2.get("/api/path/workflow-runs", async (req, reply) => {
     const userId = requireAuth(req, reply);
     if (userId === null) return;

package/package.json

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