agent-board-runner 0.1.16 → 0.1.18

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;
 }
@@ -2077,7 +2103,22 @@ function parseGitDiffNameStatus(output) {
     const columns = line.split("	");
     const status = columns[0].slice(0, 1);
     const path = columns[columns.length - 1];
-    return { path, status };
+    return { path, status, additions: null, deletions: null, binary: false };
+  });
+}
+function parseGitDiffNumstat(output) {
+  return output.split("\n").filter((line) => line.length > 0).map((line) => {
+    const [added, deleted, path] = line.split("	");
+    const binary = added === "-" && deleted === "-";
+    return { path, additions: binary ? null : Number(added), deletions: binary ? null : Number(deleted), binary };
+  });
+}
+function mergeNumstat(files, numstat) {
+  const byPath = new Map(numstat.map((entry) => [entry.path, entry]));
+  return files.map((file) => {
+    const stat = byPath.get(file.path);
+    if (!stat) return file;
+    return { ...file, additions: stat.additions, deletions: stat.deletions, binary: stat.binary };
   });
 }
 async function getRepoDiffForTarget(label, cwd) {
@@ -2111,14 +2152,84 @@ async function getRepoDiffForTarget(label, cwd) {
     files = parseGitDiffNameStatus(stdout);
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    return { label, files: [], diff: "", error: message };
+    return { label, files: [], diff: "", branch, error: message };
+  }
+  if (files.length === 0) return { label, files, diff: "", branch };
+  try {
+    const { stdout: numstatOut } = await execFileAsync2("git", ["diff", "--numstat", remoteRef, "HEAD"], { ...DIFF_EXEC_OPTIONS, cwd });
+    files = mergeNumstat(files, parseGitDiffNumstat(numstatOut));
+  } catch {
   }
-  if (files.length === 0) return { label, files, diff: "" };
   try {
     const { stdout } = await execFileAsync2("git", ["diff", remoteRef, "HEAD"], { ...DIFF_EXEC_OPTIONS, cwd });
-    return { label, files, diff: stdout };
+    return { label, files, diff: stdout, branch };
   } catch {
-    return { label, files, diff: "" };
+    return { label, files, diff: "", branch };
+  }
+}
+async function resolveDiffTargetCwd(entry, projectId, label) {
+  if (!label) return entry.repoRoot;
+  if (!statuslineSupabase) throw new HttpError(400, "Reposit\xF3rio filho n\xE3o dispon\xEDvel.");
+  const children = await getProjectRepos(statuslineSupabase, projectId);
+  const child2 = children.find((candidate) => candidate.subpath === label);
+  if (!child2) throw new HttpError(400, "Reposit\xF3rio filho desconhecido.");
+  return join9(entry.repoRoot, child2.subpath);
+}
+async function readFileAtRevision(cwd, ref, relPath) {
+  try {
+    const { stdout } = await execFileAsync2("git", ["show", `${ref}:${relPath}`], {
+      cwd,
+      maxBuffer: DIFF_EXEC_OPTIONS.maxBuffer,
+      encoding: "buffer"
+    });
+    return stdout;
+  } catch {
+    return null;
+  }
+}
+function toFileRevisionJson(buffer, imageContentType) {
+  if (buffer === null) return { exists: false, content: null, binary: false };
+  if (looksBinary(buffer)) {
+    return {
+      exists: true,
+      content: null,
+      binary: true,
+      ...imageContentType ? { imageBase64: buffer.toString("base64"), imageContentType } : {}
+    };
+  }
+  return { exists: true, content: buffer.toString("utf8"), binary: false };
+}
+async function handleDiffFileRequest(entry, res, projectId, relPath, label) {
+  if (!relPath) {
+    sendJson(res, 400, { error: "Par\xE2metro path \xE9 obrigat\xF3rio." });
+    return;
+  }
+  try {
+    const cwd = await resolveDiffTargetCwd(entry, projectId, label);
+    resolveWithinRepo(cwd, relPath);
+    const { stdout: branchOut } = await execFileAsync2("git", ["branch", "--show-current"], { cwd });
+    const branch = branchOut.trim();
+    if (!branch) {
+      sendJson(res, 400, { error: "HEAD destacado: sem branch local para comparar com a origin." });
+      return;
+    }
+    const [originalBuffer, modifiedBuffer] = await Promise.all([
+      readFileAtRevision(cwd, `origin/${branch}`, relPath),
+      readFileAtRevision(cwd, "HEAD", relPath)
+    ]);
+    const ext = relPath.split(".").pop()?.toLowerCase() ?? "";
+    const imageContentType = MIME_TYPES_BY_EXT[ext];
+    sendJson(res, 200, {
+      original: toFileRevisionJson(originalBuffer, imageContentType),
+      modified: toFileRevisionJson(modifiedBuffer, imageContentType)
+    });
+  } catch (err) {
+    if (err instanceof HttpError) {
+      sendJson(res, err.status, { error: err.message });
+      return;
+    }
+    logger.runner.error("FILES", "Unexpected error handling a diff-file request:", err);
+    sendJson(res, 500, { error: "Erro interno do runner." });
   }
 }
 async function handleDiffRequest(entry, res, projectId) {
@@ -2303,6 +2414,12 @@ function handleRequest(req, res) {
     void handleDiffRequest(entry, res, projectId);
     return;
   }
+  if (pathname === "/diff-file") {
+    const projectId = typeof query.projectId === "string" ? query.projectId : "";
+    const label = typeof query.label === "string" ? query.label : null;
+    void handleDiffFileRequest(entry, res, projectId, relPath, label);
+    return;
+  }
   try {
     if (pathname === "/tree") {
       sendJson(res, 200, { entries: listDirectory(entry.repoRoot, relPath) });
@@ -2551,13 +2668,49 @@ function toSessionName(title) {
 // src/agentSession.ts
 var TUI_IDLE_MS = 1500;
 var TUI_READY_TIMEOUT_MS = 6e4;
-var SUBMIT_DELAY_MS = 150;
+var PASTE_SETTLE_MS = 200;
+var PASTE_SETTLE_TIMEOUT_MS = 5e3;
 var PASTE_START = "\x1B[200~";
 var PASTE_END = "\x1B[201~";
 var SHIFT_TAB = "\x1B[Z";
 var SHIFT_TAB_PRESSES_TO_PLAN_MODE = 4;
 var SHIFT_TAB_DELAY_MS = 400;
 var PLAN_MODE_INDICATOR = /plan mode on/i;
+function writePasteAndSubmit(pty, cardId, message, context) {
+  pty.write(`${PASTE_START}${message}${PASTE_END}`);
+  let settleTimer;
+  let ceilingTimer;
+  let dataSubscription;
+  let exitSubscription;
+  let submitted = false;
+  const submit = () => {
+    if (submitted) return;
+    submitted = true;
+    clearTimeout(settleTimer);
+    clearTimeout(ceilingTimer);
+    dataSubscription?.dispose();
+    exitSubscription?.dispose();
+    try {
+      pty.write("\r");
+    } catch (err) {
+      logger.card.error(cardId, `Failed to submit ${context} to the agent:`, err);
+    }
+  };
+  const cancel = () => {
+    submitted = true;
+    clearTimeout(settleTimer);
+    clearTimeout(ceilingTimer);
+    dataSubscription?.dispose();
+    exitSubscription?.dispose();
+  };
+  dataSubscription = pty.onData(() => {
+    clearTimeout(settleTimer);
+    settleTimer = setTimeout(submit, PASTE_SETTLE_MS);
+  });
+  settleTimer = setTimeout(submit, PASTE_SETTLE_MS);
+  ceilingTimer = setTimeout(submit, PASTE_SETTLE_TIMEOUT_MS);
+  exitSubscription = pty.onExit(cancel);
+}
 function spawnAgentPty(repoPath, cardId, cardTitle, instructions, sessionId, ticket, planFirst) {
   ensureDirTrusted(repoPath);
   ensureMcpServersTrusted(repoPath);
@@ -2601,14 +2754,7 @@ function sendMessageWhenIdle(pty, cardId, message, planFirst) {
     if (!stopWaiting()) return;
     if (planFirst) await enterPlanMode(pty, cardId);
     try {
-      pty.write(`${PASTE_START}${message}${PASTE_END}`);
-      setTimeout(() => {
-        try {
-          pty.write("\r");
-        } catch (err) {
-          logger.card.error(cardId, "Failed to submit the card instructions to the agent:", err);
-        }
-      }, SUBMIT_DELAY_MS);
+      writePasteAndSubmit(pty, cardId, message, "the card instructions");
     } catch (err) {
       logger.card.error(cardId, "Failed to send the card instructions to the agent:", err);
     }
@@ -2644,14 +2790,7 @@ async function enterPlanMode(pty, cardId) {
 }
 function sendMessageToIdleSession(pty, cardId, message) {
   try {
-    pty.write(`${PASTE_START}${message}${PASTE_END}`);
-    setTimeout(() => {
-      try {
-        pty.write("\r");
-      } catch (err) {
-        logger.card.error(cardId, "Failed to submit a message to the idle session:", err);
-      }
-    }, SUBMIT_DELAY_MS);
+    writePasteAndSubmit(pty, cardId, message, "a message");
   } catch (err) {
     logger.card.error(cardId, "Failed to send a message to the idle session:", err);
   }
@@ -3413,6 +3552,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);
@@ -4206,6 +4363,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) {
@@ -4311,6 +4470,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;
 }
@@ -1797,7 +1823,22 @@ function parseGitDiffNameStatus(output) {
     const columns = line.split("	");
     const status = columns[0].slice(0, 1);
     const path = columns[columns.length - 1];
-    return { path, status };
+    return { path, status, additions: null, deletions: null, binary: false };
+  });
+}
+function parseGitDiffNumstat(output) {
+  return output.split("\n").filter((line) => line.length > 0).map((line) => {
+    const [added, deleted, path] = line.split("	");
+    const binary = added === "-" && deleted === "-";
+    return { path, additions: binary ? null : Number(added), deletions: binary ? null : Number(deleted), binary };
+  });
+}
+function mergeNumstat(files, numstat) {
+  const byPath = new Map(numstat.map((entry) => [entry.path, entry]));
+  return files.map((file) => {
+    const stat = byPath.get(file.path);
+    if (!stat) return file;
+    return { ...file, additions: stat.additions, deletions: stat.deletions, binary: stat.binary };
   });
 }
 async function getRepoDiffForTarget(label, cwd) {
@@ -1831,14 +1872,84 @@ async function getRepoDiffForTarget(label, cwd) {
     files = parseGitDiffNameStatus(stdout);
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    return { label, files: [], diff: "", error: message };
+    return { label, files: [], diff: "", branch, error: message };
+  }
+  if (files.length === 0) return { label, files, diff: "", branch };
+  try {
+    const { stdout: numstatOut } = await execFileAsync2("git", ["diff", "--numstat", remoteRef, "HEAD"], { ...DIFF_EXEC_OPTIONS, cwd });
+    files = mergeNumstat(files, parseGitDiffNumstat(numstatOut));
+  } catch {
   }
-  if (files.length === 0) return { label, files, diff: "" };
   try {
     const { stdout } = await execFileAsync2("git", ["diff", remoteRef, "HEAD"], { ...DIFF_EXEC_OPTIONS, cwd });
-    return { label, files, diff: stdout };
+    return { label, files, diff: stdout, branch };
   } catch {
-    return { label, files, diff: "" };
+    return { label, files, diff: "", branch };
+  }
+}
+async function resolveDiffTargetCwd(entry, projectId, label) {
+  if (!label) return entry.repoRoot;
+  if (!statuslineSupabase) throw new HttpError(400, "Reposit\xF3rio filho n\xE3o dispon\xEDvel.");
+  const children = await getProjectRepos(statuslineSupabase, projectId);
+  const child2 = children.find((candidate) => candidate.subpath === label);
+  if (!child2) throw new HttpError(400, "Reposit\xF3rio filho desconhecido.");
+  return join7(entry.repoRoot, child2.subpath);
+}
+async function readFileAtRevision(cwd, ref, relPath) {
+  try {
+    const { stdout } = await execFileAsync2("git", ["show", `${ref}:${relPath}`], {
+      cwd,
+      maxBuffer: DIFF_EXEC_OPTIONS.maxBuffer,
+      encoding: "buffer"
+    });
+    return stdout;
+  } catch {
+    return null;
+  }
+}
+function toFileRevisionJson(buffer, imageContentType) {
+  if (buffer === null) return { exists: false, content: null, binary: false };
+  if (looksBinary(buffer)) {
+    return {
+      exists: true,
+      content: null,
+      binary: true,
+      ...imageContentType ? { imageBase64: buffer.toString("base64"), imageContentType } : {}
+    };
+  }
+  return { exists: true, content: buffer.toString("utf8"), binary: false };
+}
+async function handleDiffFileRequest(entry, res, projectId, relPath, label) {
+  if (!relPath) {
+    sendJson(res, 400, { error: "Par\xE2metro path \xE9 obrigat\xF3rio." });
+    return;
+  }
+  try {
+    const cwd = await resolveDiffTargetCwd(entry, projectId, label);
+    resolveWithinRepo(cwd, relPath);
+    const { stdout: branchOut } = await execFileAsync2("git", ["branch", "--show-current"], { cwd });
+    const branch = branchOut.trim();
+    if (!branch) {
+      sendJson(res, 400, { error: "HEAD destacado: sem branch local para comparar com a origin." });
+      return;
+    }
+    const [originalBuffer, modifiedBuffer] = await Promise.all([
+      readFileAtRevision(cwd, `origin/${branch}`, relPath),
+      readFileAtRevision(cwd, "HEAD", relPath)
+    ]);
+    const ext = relPath.split(".").pop()?.toLowerCase() ?? "";
+    const imageContentType = MIME_TYPES_BY_EXT[ext];
+    sendJson(res, 200, {
+      original: toFileRevisionJson(originalBuffer, imageContentType),
+      modified: toFileRevisionJson(modifiedBuffer, imageContentType)
+    });
+  } catch (err) {
+    if (err instanceof HttpError) {
+      sendJson(res, err.status, { error: err.message });
+      return;
+    }
+    logger.runner.error("FILES", "Unexpected error handling a diff-file request:", err);
+    sendJson(res, 500, { error: "Erro interno do runner." });
   }
 }
 async function handleDiffRequest(entry, res, projectId) {
@@ -2023,6 +2134,12 @@ function handleRequest(req, res) {
     void handleDiffRequest(entry, res, projectId);
     return;
   }
+  if (pathname === "/diff-file") {
+    const projectId = typeof query.projectId === "string" ? query.projectId : "";
+    const label = typeof query.label === "string" ? query.label : null;
+    void handleDiffFileRequest(entry, res, projectId, relPath, label);
+    return;
+  }
   try {
     if (pathname === "/tree") {
       sendJson(res, 200, { entries: listDirectory(entry.repoRoot, relPath) });
@@ -2439,13 +2556,49 @@ function toSessionName(title) {
 // src/agentSession.ts
 var TUI_IDLE_MS = 1500;
 var TUI_READY_TIMEOUT_MS = 6e4;
-var SUBMIT_DELAY_MS = 150;
+var PASTE_SETTLE_MS = 200;
+var PASTE_SETTLE_TIMEOUT_MS = 5e3;
 var PASTE_START = "\x1B[200~";
 var PASTE_END = "\x1B[201~";
 var SHIFT_TAB = "\x1B[Z";
 var SHIFT_TAB_PRESSES_TO_PLAN_MODE = 4;
 var SHIFT_TAB_DELAY_MS = 400;
 var PLAN_MODE_INDICATOR = /plan mode on/i;
+function writePasteAndSubmit(pty, cardId, message, context) {
+  pty.write(`${PASTE_START}${message}${PASTE_END}`);
+  let settleTimer;
+  let ceilingTimer;
+  let dataSubscription;
+  let exitSubscription;
+  let submitted = false;
+  const submit = () => {
+    if (submitted) return;
+    submitted = true;
+    clearTimeout(settleTimer);
+    clearTimeout(ceilingTimer);
+    dataSubscription?.dispose();
+    exitSubscription?.dispose();
+    try {
+      pty.write("\r");
+    } catch (err) {
+      logger.card.error(cardId, `Failed to submit ${context} to the agent:`, err);
+    }
+  };
+  const cancel = () => {
+    submitted = true;
+    clearTimeout(settleTimer);
+    clearTimeout(ceilingTimer);
+    dataSubscription?.dispose();
+    exitSubscription?.dispose();
+  };
+  dataSubscription = pty.onData(() => {
+    clearTimeout(settleTimer);
+    settleTimer = setTimeout(submit, PASTE_SETTLE_MS);
+  });
+  settleTimer = setTimeout(submit, PASTE_SETTLE_MS);
+  ceilingTimer = setTimeout(submit, PASTE_SETTLE_TIMEOUT_MS);
+  exitSubscription = pty.onExit(cancel);
+}
 function spawnAgentPty(repoPath, cardId, cardTitle, instructions, sessionId, ticket, planFirst) {
   ensureDirTrusted(repoPath);
   ensureMcpServersTrusted(repoPath);
@@ -2489,14 +2642,7 @@ function sendMessageWhenIdle(pty, cardId, message, planFirst) {
     if (!stopWaiting()) return;
     if (planFirst) await enterPlanMode(pty, cardId);
     try {
-      pty.write(`${PASTE_START}${message}${PASTE_END}`);
-      setTimeout(() => {
-        try {
-          pty.write("\r");
-        } catch (err) {
-          logger.card.error(cardId, "Failed to submit the card instructions to the agent:", err);
-        }
-      }, SUBMIT_DELAY_MS);
+      writePasteAndSubmit(pty, cardId, message, "the card instructions");
     } catch (err) {
       logger.card.error(cardId, "Failed to send the card instructions to the agent:", err);
     }
@@ -2532,14 +2678,7 @@ async function enterPlanMode(pty, cardId) {
 }
 function sendMessageToIdleSession(pty, cardId, message) {
   try {
-    pty.write(`${PASTE_START}${message}${PASTE_END}`);
-    setTimeout(() => {
-      try {
-        pty.write("\r");
-      } catch (err) {
-        logger.card.error(cardId, "Failed to submit a message to the idle session:", err);
-      }
-    }, SUBMIT_DELAY_MS);
+    writePasteAndSubmit(pty, cardId, message, "a message");
   } catch (err) {
     logger.card.error(cardId, "Failed to send a message to the idle session:", err);
   }
@@ -3301,6 +3440,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);
@@ -4094,6 +4251,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) {
@@ -4199,6 +4358,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.16",
+  "version": "0.1.18",
   "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": {