agent-board-runner 0.1.15 → 0.1.17

package/dist/cli.js

@@ -897,12 +897,37 @@ async function getRunningSessionForProject(supabase, projectId, runnerId) {
   const row = data;
   return { id: row.id, cardId: row.card_id, agentState: row.agent_state };
 }
+function compareQueueOrder(a, b) {
+  const orderA = a.cards.dev_queue_order;
+  const orderB = b.cards.dev_queue_order;
+  if (orderA !== null && orderB !== null) return orderA - orderB;
+  if (orderA !== null) return -1;
+  if (orderB !== null) return 1;
+  return new Date(a.created_at).getTime() - new Date(b.created_at).getTime();
+}
+function applyDevQueueOrder(queued) {
+  const byProject = /* @__PURE__ */ new Map();
+  for (const entry of queued) {
+    const list = byProject.get(entry.cards.project_id) ?? [];
+    list.push(entry);
+    byProject.set(entry.cards.project_id, list);
+  }
+  for (const entries of byProject.values()) entries.sort(compareQueueOrder);
+  const seenProjects = /* @__PURE__ */ new Set();
+  const result = [];
+  for (const entry of queued) {
+    if (seenProjects.has(entry.cards.project_id)) continue;
+    seenProjects.add(entry.cards.project_id);
+    result.push(...byProject.get(entry.cards.project_id));
+  }
+  return result;
+}
 async function listQueuedSessionsForRunner(supabase, runnerId) {
   const { data, error } = await supabase.from("sessions").select(
-    "id, card_id, claude_session_id, agent_state, created_at, cards!card_id!inner(project_id, title, instructions, file_references, plan_first, prerequisite_card_id, prototype_first, prototype_url, prototype_approved)"
+    "id, card_id, claude_session_id, agent_state, created_at, cards!card_id!inner(project_id, title, instructions, file_references, plan_first, prerequisite_card_id, prototype_first, prototype_url, prototype_approved, dev_queue_order)"
   ).eq("runner_id", runnerId).eq("status", "queued").order("created_at", { ascending: true });
   if (error) throw error;
-  return data;
+  return applyDevQueueOrder(data);
 }
 async function listPausedSessionsForRunner(supabase, runnerId) {
   const { data, error } = await supabase.from("sessions").select("card_id, cards!card_id!inner(project_id)").eq("runner_id", runnerId).eq("status", "paused");
@@ -1010,7 +1035,8 @@ async function updateCard(supabase, cardId, changes) {
     ...changes.customActionStatus !== void 0 ? { custom_action_status: changes.customActionStatus } : {},
     ...changes.customActionOutput !== void 0 ? { custom_action_output: changes.customActionOutput } : {},
     ...changes.requeueRequestedAt !== void 0 ? { requeue_requested_at: changes.requeueRequestedAt } : {},
-    ...changes.restartRequestedAt !== void 0 ? { restart_requested_at: changes.restartRequestedAt } : {}
+    ...changes.restartRequestedAt !== void 0 ? { restart_requested_at: changes.restartRequestedAt } : {},
+    ...changes.returnToBacklogRequestedAt !== void 0 ? { return_to_backlog_requested_at: changes.returnToBacklogRequestedAt } : {}
   }).eq("id", cardId);
   if (error) throw error;
 }
@@ -2840,6 +2866,7 @@ var OUTPUT_TAIL_CHARS = 2e4;
 var COMMAND_TIMEOUT_MS = 5 * 60 * 1e3;
 var MAX_BUFFER = 10 * 1024 * 1024;
 var SECRET_PLACEHOLDER_RE = /\{\{secret:([A-Z][A-Z0-9_]*)\}\}/g;
+var SECRET_ENV_PLACEHOLDER_RE = /^\{\{secret_env:([A-Z][A-Z0-9_]*)\}\}$/;
 function isRunProjectCommandPayload(value) {
   if (!value || typeof value !== "object") return false;
   const candidate = value;
@@ -2855,14 +2882,26 @@ async function runProjectCommand(supabase, config, payload) {
   if (!registered) throw new Error("This runner does not have that project registered.");
   const secretsEnv = await resolveProjectSecretsEnv(supabase, projectId, null);
   const referencedSecretNames = /* @__PURE__ */ new Set();
-  const resolvedArgv = argv.map(
-    (part) => part.replace(SECRET_PLACEHOLDER_RE, (_match, name) => {
-      const value = secretsEnv[name];
-      if (value === void 0) throw new Error(`Secret "${name}" referenced by this command is no longer configured for this project.`);
+  const resolvedArgv = [];
+  for (const part of argv) {
+    const envOnlyMatch = part.match(SECRET_ENV_PLACEHOLDER_RE);
+    if (envOnlyMatch) {
+      const name = envOnlyMatch[1];
+      if (secretsEnv[name] === void 0) throw new Error(`Secret "${name}" referenced by this command is no longer configured for this project.`);
       referencedSecretNames.add(name);
-      return value;
-    })
-  );
+      continue;
+    }
+    resolvedArgv.push(
+      part.replace(SECRET_PLACEHOLDER_RE, (_match, name) => {
+        const value = secretsEnv[name];
+        if (value === void 0) throw new Error(`Secret "${name}" referenced by this command is no longer configured for this project.`);
+        referencedSecretNames.add(name);
+        return value;
+      })
+    );
+  }
+  const secretEnv = { ...process.env };
+  for (const name of referencedSecretNames) secretEnv[name] = secretsEnv[name];
   function redact(text) {
     let redacted = text;
     for (const name of referencedSecretNames) {
@@ -2874,7 +2913,7 @@ async function runProjectCommand(supabase, config, payload) {
   try {
     const { stdout, stderr } = await execFileAsync4(resolvedArgv[0], resolvedArgv.slice(1), {
       cwd: registered.repoPath,
-      env: process.env,
+      env: secretEnv,
       timeout: COMMAND_TIMEOUT_MS,
       maxBuffer: MAX_BUFFER
     });
@@ -3400,6 +3439,24 @@ async function restartCardSession(supabase, config, card) {
   await updateCard(supabase, card.id, { restartRequestedAt: null });
   await enqueueCard(supabase, config, card);
 }
+async function returnCardToBacklog(supabase, config, card) {
+  const sessionId = activeSessionByCard.get(card.id) ?? (await getActiveSessionForCard(supabase, card.id))?.id;
+  if (sessionId) {
+    intentionallyStoppedSessionIds.add(sessionId);
+    stopPtySession(sessionId);
+    cancelUsageResume(sessionId);
+    activeSessionByCard.delete(card.id);
+    await updateSession(
+      supabase,
+      sessionId,
+      { status: "done", endedAt: (/* @__PURE__ */ new Date()).toISOString() },
+      { projectId: card.project_id, cardId: card.id, userId: config.ownerUserId }
+    );
+    logger.card.info(card.id, `Session ${sessionId} stopped by "voltar ao backlog".`);
+  }
+  await updateCard(supabase, card.id, { column: "backlog", returnToBacklogRequestedAt: null });
+  await dispatchRunnerQueue(supabase, config);
+}
 
 // src/columnActions.ts
 var execAsync = promisify5(exec);
@@ -4193,6 +4250,8 @@ async function startRunner() {
   const lastKnownColumn = /* @__PURE__ */ new Map();
   const lastKnownRequeueRequestedAt = /* @__PURE__ */ new Map();
   const lastKnownRestartRequestedAt = /* @__PURE__ */ new Map();
+  const lastKnownDevQueueOrder = /* @__PURE__ */ new Map();
+  const lastKnownReturnToBacklogRequestedAt = /* @__PURE__ */ new Map();
   await syncRegisteredProjects(supabase, config, registeredPaths).catch((err) => logger.runner.error("PROJECT_SYNC", "syncRegisteredProjects failed:", err));
   logger.runner.info("BOOT", `Agent Board runner "${config.runnerName}" starting (${registeredPaths.size} project(s) registered).`);
   for (const project of config.registeredProjects) {
@@ -4298,6 +4357,16 @@ async function startRunner() {
       if (card.restart_requested_at && card.restart_requested_at !== previousRestartRequestedAt) {
         void restartCardSession(supabase, config, card);
       }
+      const previousReturnToBacklogRequestedAt = lastKnownReturnToBacklogRequestedAt.get(card.id);
+      lastKnownReturnToBacklogRequestedAt.set(card.id, card.return_to_backlog_requested_at);
+      if (card.return_to_backlog_requested_at && card.return_to_backlog_requested_at !== previousReturnToBacklogRequestedAt) {
+        void returnCardToBacklog(supabase, config, card);
+      }
+      const previousDevQueueOrder = lastKnownDevQueueOrder.get(card.id);
+      lastKnownDevQueueOrder.set(card.id, card.dev_queue_order);
+      if (card.column_name === "desenvolvimento" && card.dev_queue_order !== previousDevQueueOrder) {
+        void dispatchRunnerQueue(supabase, config);
+      }
       if (previousColumn !== void 0 && previousColumn !== card.column_name) {
         void clearColumnActionStatus(supabase, card);
         void handleColumnEntered(supabase, config, card);

package/dist/index.js

@@ -617,12 +617,37 @@ async function getRunningSessionForProject(supabase, projectId, runnerId) {
   const row = data;
   return { id: row.id, cardId: row.card_id, agentState: row.agent_state };
 }
+function compareQueueOrder(a, b) {
+  const orderA = a.cards.dev_queue_order;
+  const orderB = b.cards.dev_queue_order;
+  if (orderA !== null && orderB !== null) return orderA - orderB;
+  if (orderA !== null) return -1;
+  if (orderB !== null) return 1;
+  return new Date(a.created_at).getTime() - new Date(b.created_at).getTime();
+}
+function applyDevQueueOrder(queued) {
+  const byProject = /* @__PURE__ */ new Map();
+  for (const entry of queued) {
+    const list = byProject.get(entry.cards.project_id) ?? [];
+    list.push(entry);
+    byProject.set(entry.cards.project_id, list);
+  }
+  for (const entries of byProject.values()) entries.sort(compareQueueOrder);
+  const seenProjects = /* @__PURE__ */ new Set();
+  const result = [];
+  for (const entry of queued) {
+    if (seenProjects.has(entry.cards.project_id)) continue;
+    seenProjects.add(entry.cards.project_id);
+    result.push(...byProject.get(entry.cards.project_id));
+  }
+  return result;
+}
 async function listQueuedSessionsForRunner(supabase, runnerId) {
   const { data, error } = await supabase.from("sessions").select(
-    "id, card_id, claude_session_id, agent_state, created_at, cards!card_id!inner(project_id, title, instructions, file_references, plan_first, prerequisite_card_id, prototype_first, prototype_url, prototype_approved)"
+    "id, card_id, claude_session_id, agent_state, created_at, cards!card_id!inner(project_id, title, instructions, file_references, plan_first, prerequisite_card_id, prototype_first, prototype_url, prototype_approved, dev_queue_order)"
   ).eq("runner_id", runnerId).eq("status", "queued").order("created_at", { ascending: true });
   if (error) throw error;
-  return data;
+  return applyDevQueueOrder(data);
 }
 async function listPausedSessionsForRunner(supabase, runnerId) {
   const { data, error } = await supabase.from("sessions").select("card_id, cards!card_id!inner(project_id)").eq("runner_id", runnerId).eq("status", "paused");
@@ -730,7 +755,8 @@ async function updateCard(supabase, cardId, changes) {
     ...changes.customActionStatus !== void 0 ? { custom_action_status: changes.customActionStatus } : {},
     ...changes.customActionOutput !== void 0 ? { custom_action_output: changes.customActionOutput } : {},
     ...changes.requeueRequestedAt !== void 0 ? { requeue_requested_at: changes.requeueRequestedAt } : {},
-    ...changes.restartRequestedAt !== void 0 ? { restart_requested_at: changes.restartRequestedAt } : {}
+    ...changes.restartRequestedAt !== void 0 ? { restart_requested_at: changes.restartRequestedAt } : {},
+    ...changes.returnToBacklogRequestedAt !== void 0 ? { return_to_backlog_requested_at: changes.returnToBacklogRequestedAt } : {}
   }).eq("id", cardId);
   if (error) throw error;
 }
@@ -2728,6 +2754,7 @@ var OUTPUT_TAIL_CHARS = 2e4;
 var COMMAND_TIMEOUT_MS = 5 * 60 * 1e3;
 var MAX_BUFFER = 10 * 1024 * 1024;
 var SECRET_PLACEHOLDER_RE = /\{\{secret:([A-Z][A-Z0-9_]*)\}\}/g;
+var SECRET_ENV_PLACEHOLDER_RE = /^\{\{secret_env:([A-Z][A-Z0-9_]*)\}\}$/;
 function isRunProjectCommandPayload(value) {
   if (!value || typeof value !== "object") return false;
   const candidate = value;
@@ -2743,14 +2770,26 @@ async function runProjectCommand(supabase, config, payload) {
   if (!registered) throw new Error("This runner does not have that project registered.");
   const secretsEnv = await resolveProjectSecretsEnv(supabase, projectId, null);
   const referencedSecretNames = /* @__PURE__ */ new Set();
-  const resolvedArgv = argv.map(
-    (part) => part.replace(SECRET_PLACEHOLDER_RE, (_match, name) => {
-      const value = secretsEnv[name];
-      if (value === void 0) throw new Error(`Secret "${name}" referenced by this command is no longer configured for this project.`);
+  const resolvedArgv = [];
+  for (const part of argv) {
+    const envOnlyMatch = part.match(SECRET_ENV_PLACEHOLDER_RE);
+    if (envOnlyMatch) {
+      const name = envOnlyMatch[1];
+      if (secretsEnv[name] === void 0) throw new Error(`Secret "${name}" referenced by this command is no longer configured for this project.`);
       referencedSecretNames.add(name);
-      return value;
-    })
-  );
+      continue;
+    }
+    resolvedArgv.push(
+      part.replace(SECRET_PLACEHOLDER_RE, (_match, name) => {
+        const value = secretsEnv[name];
+        if (value === void 0) throw new Error(`Secret "${name}" referenced by this command is no longer configured for this project.`);
+        referencedSecretNames.add(name);
+        return value;
+      })
+    );
+  }
+  const secretEnv = { ...process.env };
+  for (const name of referencedSecretNames) secretEnv[name] = secretsEnv[name];
   function redact(text) {
     let redacted = text;
     for (const name of referencedSecretNames) {
@@ -2762,7 +2801,7 @@ async function runProjectCommand(supabase, config, payload) {
   try {
     const { stdout, stderr } = await execFileAsync4(resolvedArgv[0], resolvedArgv.slice(1), {
       cwd: registered.repoPath,
-      env: process.env,
+      env: secretEnv,
       timeout: COMMAND_TIMEOUT_MS,
       maxBuffer: MAX_BUFFER
     });
@@ -3288,6 +3327,24 @@ async function restartCardSession(supabase, config, card) {
   await updateCard(supabase, card.id, { restartRequestedAt: null });
   await enqueueCard(supabase, config, card);
 }
+async function returnCardToBacklog(supabase, config, card) {
+  const sessionId = activeSessionByCard.get(card.id) ?? (await getActiveSessionForCard(supabase, card.id))?.id;
+  if (sessionId) {
+    intentionallyStoppedSessionIds.add(sessionId);
+    stopPtySession(sessionId);
+    cancelUsageResume(sessionId);
+    activeSessionByCard.delete(card.id);
+    await updateSession(
+      supabase,
+      sessionId,
+      { status: "done", endedAt: (/* @__PURE__ */ new Date()).toISOString() },
+      { projectId: card.project_id, cardId: card.id, userId: config.ownerUserId }
+    );
+    logger.card.info(card.id, `Session ${sessionId} stopped by "voltar ao backlog".`);
+  }
+  await updateCard(supabase, card.id, { column: "backlog", returnToBacklogRequestedAt: null });
+  await dispatchRunnerQueue(supabase, config);
+}
 
 // src/columnActions.ts
 var execAsync = promisify5(exec);
@@ -4081,6 +4138,8 @@ async function startRunner() {
   const lastKnownColumn = /* @__PURE__ */ new Map();
   const lastKnownRequeueRequestedAt = /* @__PURE__ */ new Map();
   const lastKnownRestartRequestedAt = /* @__PURE__ */ new Map();
+  const lastKnownDevQueueOrder = /* @__PURE__ */ new Map();
+  const lastKnownReturnToBacklogRequestedAt = /* @__PURE__ */ new Map();
   await syncRegisteredProjects(supabase, config, registeredPaths).catch((err) => logger.runner.error("PROJECT_SYNC", "syncRegisteredProjects failed:", err));
   logger.runner.info("BOOT", `Agent Board runner "${config.runnerName}" starting (${registeredPaths.size} project(s) registered).`);
   for (const project of config.registeredProjects) {
@@ -4186,6 +4245,16 @@ async function startRunner() {
       if (card.restart_requested_at && card.restart_requested_at !== previousRestartRequestedAt) {
         void restartCardSession(supabase, config, card);
       }
+      const previousReturnToBacklogRequestedAt = lastKnownReturnToBacklogRequestedAt.get(card.id);
+      lastKnownReturnToBacklogRequestedAt.set(card.id, card.return_to_backlog_requested_at);
+      if (card.return_to_backlog_requested_at && card.return_to_backlog_requested_at !== previousReturnToBacklogRequestedAt) {
+        void returnCardToBacklog(supabase, config, card);
+      }
+      const previousDevQueueOrder = lastKnownDevQueueOrder.get(card.id);
+      lastKnownDevQueueOrder.set(card.id, card.dev_queue_order);
+      if (card.column_name === "desenvolvimento" && card.dev_queue_order !== previousDevQueueOrder) {
+        void dispatchRunnerQueue(supabase, config);
+      }
       if (previousColumn !== void 0 && previousColumn !== card.column_name) {
         void clearColumnActionStatus(supabase, card);
         void handleColumnEntered(supabase, config, card);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-board-runner",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "Local runner for Agent Board — signs in with your own Supabase account (no shared secrets) and drives Claude Code against repos under your local repos root.",
   "type": "module",
   "bin": {