@chrysb/alphaclaw 0.9.27 → 0.9.28

package/lib/public/js/components/doctor/findings-list.js

@@ -202,6 +202,9 @@ export const DoctorFindingsList = ({
                             <${Badge} tone=${getDoctorCategoryTone(card.category)}>
                               ${formatDoctorCategory(card.category)}
                             </${Badge}>
+                            ${card.status === "working"
+                              ? html`<${Badge} tone="info">Working</${Badge}>`
+                              : null}
                             ${
                               showRunMeta
                                 ? html`
@@ -314,8 +317,13 @@ export const DoctorFindingsList = ({
                       <${ActionButton}
                         onClick=${() => onAskAgentFix(card)}
                         loading=${busyCardId === card.id}
+                        disabled=${card.status !== "open"}
                         tone="primary"
-                        idleLabel="Ask agent to fix"
+                        idleLabel=${card.status === "working"
+                          ? "Agent working..."
+                          : card.status === "open"
+                            ? "Ask agent to fix"
+                            : "Reopen to send"}
                         loadingLabel="Sending..."
                       />
                       ${
@@ -335,6 +343,15 @@ export const DoctorFindingsList = ({
                               />
                             `
                       }
+                      ${card.status === "working"
+                        ? html`
+                            <${ActionButton}
+                              onClick=${() => onUpdateStatus(card, "open")}
+                              tone="secondary"
+                              idleLabel="Reopen"
+                            />
+                          `
+                        : null}
                       ${
                         card.status !== "dismissed"
                           ? html`

package/lib/public/js/components/doctor/fix-card-modal.js

@@ -1,6 +1,6 @@
 import { h } from "preact";
 import htm from "htm";
-import { sendDoctorCardFix, updateDoctorCardStatus } from "../../lib/api.js";
+import { sendDoctorCardFix } from "../../lib/api.js";
 import { showToast } from "../toast.js";
 import { AgentSendModal } from "../agent-send-modal.js";
 
@@ -12,29 +12,20 @@ export const DoctorFixCardModal = ({
   onClose = () => {},
   onComplete = () => {},
 }) => {
-  const handleSend = async ({ selectedSession, message }) => {
+  const handleSend = async ({ selectedSession, selectedSessionKey, message }) => {
     if (!card?.id) return false;
     try {
       await sendDoctorCardFix({
         cardId: card.id,
-        sessionId: selectedSession?.sessionId || "",
+        sessionKey: selectedSessionKey,
         replyChannel: selectedSession?.replyChannel || "",
         replyTo: selectedSession?.replyTo || "",
         prompt: message,
       });
-      try {
-        await updateDoctorCardStatus({ cardId: card.id, status: "fixed" });
-        showToast(
-          "Doctor fix request sent and finding marked fixed",
-          "success",
-        );
-      } catch (statusError) {
-        showToast(
-          statusError.message ||
-            "Doctor fix request sent, but could not mark the finding fixed",
-          "warning",
-        );
-      }
+      showToast(
+        "Doctor fix queued. The agent will mark it fixed after applying and verifying the change.",
+        "success",
+      );
       await onComplete();
       return true;
     } catch (error) {
@@ -51,7 +42,7 @@ export const DoctorFixCardModal = ({
       initialMessage=${String(card?.fixPrompt || "")}
       resetKey=${String(card?.id || "")}
       submitLabel="Send fix request"
-      loadingLabel="Sending..."
+      loadingLabel="Queuing..."
       onClose=${onClose}
       onSubmit=${handleSend}
     />

package/lib/public/js/components/doctor/helpers.js

@@ -12,6 +12,7 @@ export const getDoctorStatusTone = (status = "") => {
     .trim()
     .toLowerCase();
   if (normalized === "fixed") return "success";
+  if (normalized === "working") return "info";
   if (normalized === "dismissed") return "neutral";
   return "warning";
 };
@@ -60,6 +61,10 @@ export const groupDoctorCardsByStatus = (cards = []) =>
         groups.fixed.push(card);
         return groups;
       }
+      if (status === "working") {
+        groups.working.push(card);
+        return groups;
+      }
       if (status === "dismissed") {
         groups.dismissed.push(card);
         return groups;
@@ -67,7 +72,7 @@ export const groupDoctorCardsByStatus = (cards = []) =>
       groups.open.push(card);
       return groups;
     },
-    { open: [], dismissed: [], fixed: [] },
+    { open: [], working: [], dismissed: [], fixed: [] },
   );
 
 export const shouldShowDoctorWarning = (
@@ -185,6 +190,7 @@ export const buildDoctorRunMarkers = (run = null) => {
 
 export const buildDoctorStatusFilterOptions = () => [
   { value: "open", label: "Open" },
+  { value: "working", label: "Working" },
   { value: "dismissed", label: "Dismissed" },
   { value: "fixed", label: "Fixed" },
 ];

package/lib/public/js/components/doctor/index.js

@@ -78,7 +78,7 @@ export const DoctorTab = ({ isActive = false, onOpenFile = () => {} }) => {
         status: "running",
         summary: "",
         priorityCounts: { P0: 0, P1: 0, P2: 0 },
-        statusCounts: { open: 0, dismissed: 0, fixed: 0 },
+        statusCounts: { open: 0, working: 0, dismissed: 0, fixed: 0 },
       }
     : null;
   const displayRuns = pendingRun ? [pendingRun, ...runs] : runs;

package/lib/public/js/lib/api.js

@@ -300,7 +300,7 @@ export const updateDoctorCardStatus = async ({ cardId, status }) => {
 
 export const sendDoctorCardFix = async ({
   cardId,
-  sessionId = "",
+  sessionKey = "",
   replyChannel = "",
   replyTo = "",
   prompt = "",
@@ -311,7 +311,7 @@ export const sendDoctorCardFix = async ({
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
-        sessionId: String(sessionId || ""),
+        sessionKey: String(sessionKey || ""),
         replyChannel: String(replyChannel || ""),
         replyTo: String(replyTo || ""),
         prompt: String(prompt || ""),

package/lib/server/db/doctor/index.js

@@ -42,6 +42,7 @@ const buildPriorityCounts = (cards = []) => ({
 
 const buildStatusCounts = (cards = []) => ({
   open: cards.filter((card) => card.status === kDoctorCardStatus.open).length,
+  working: cards.filter((card) => card.status === kDoctorCardStatus.working).length,
   dismissed: cards.filter((card) => card.status === kDoctorCardStatus.dismissed).length,
   fixed: cards.filter((card) => card.status === kDoctorCardStatus.fixed).length,
 });
@@ -138,9 +139,10 @@ const listDoctorCards = ({ runId } = {}) => {
       ${hasRunFilter ? "WHERE c.run_id = $run_id" : ""}
       ORDER BY
         CASE c.status
-          WHEN 'open' THEN 0
-          WHEN 'dismissed' THEN 1
-          ELSE 2
+          WHEN 'working' THEN 0
+          WHEN 'open' THEN 1
+          WHEN 'dismissed' THEN 2
+          ELSE 3
         END ASC,
         CASE c.priority
           WHEN 'P0' THEN 0
@@ -177,14 +179,15 @@ const toRunModel = (row) => {
   };
 };
 
-const initDoctorDb = ({ rootDir }) => {
+const initDoctorDb = ({ rootDir, markInterruptedRuns = true }) => {
   closeDoctorDb();
   const dbDir = path.join(rootDir, "db");
   fs.mkdirSync(dbDir, { recursive: true });
   const dbPath = path.join(dbDir, "doctor.db");
   db = new DatabaseSync(dbPath);
+  db.exec("PRAGMA busy_timeout = 5000;");
   createSchema(db);
-  markIncompleteRunsFailed();
+  if (markInterruptedRuns) markIncompleteRunsFailed();
   return { path: dbPath };
 };
 
@@ -507,12 +510,95 @@ const updateDoctorCardStatus = ({ id, status }) => {
       UPDATE doctor_cards
       SET
         status = $status,
+        fix_run_id = NULL,
+        fix_token_hash = NULL,
+        fix_started_at = NULL,
+        fix_completed_at = CASE WHEN $status = $fixed_status
+          THEN strftime('%Y-%m-%dT%H:%M:%fZ','now')
+          ELSE NULL
+        END,
         updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now')
       WHERE id = $id
     `)
     .run({
       $id: Number(id || 0),
       $status: nextStatus,
+      $fixed_status: kDoctorCardStatus.fixed,
+    });
+  return Number(result.changes || 0) > 0 ? getDoctorCard(id) : null;
+};
+
+const startDoctorCardFix = ({ id, runId, tokenHash }) => {
+  const database = ensureDb();
+  const result = database
+    .prepare(`
+      UPDATE doctor_cards
+      SET
+        status = $status,
+        fix_run_id = $run_id,
+        fix_token_hash = $token_hash,
+        fix_started_at = strftime('%Y-%m-%dT%H:%M:%fZ','now'),
+        fix_completed_at = NULL,
+        updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now')
+      WHERE id = $id
+        AND status = $open_status
+    `)
+    .run({
+      $id: Number(id || 0),
+      $status: kDoctorCardStatus.working,
+      $open_status: kDoctorCardStatus.open,
+      $run_id: String(runId || ""),
+      $token_hash: String(tokenHash || ""),
+    });
+  return Number(result.changes || 0) > 0 ? getDoctorCard(id) : null;
+};
+
+const cancelDoctorCardFix = ({ id, runId }) => {
+  const database = ensureDb();
+  const result = database
+    .prepare(`
+      UPDATE doctor_cards
+      SET
+        status = $status,
+        fix_run_id = NULL,
+        fix_token_hash = NULL,
+        fix_started_at = NULL,
+        fix_completed_at = NULL,
+        updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now')
+      WHERE id = $id
+        AND status = $working_status
+        AND fix_run_id = $run_id
+    `)
+    .run({
+      $id: Number(id || 0),
+      $status: kDoctorCardStatus.open,
+      $working_status: kDoctorCardStatus.working,
+      $run_id: String(runId || ""),
+    });
+  return Number(result.changes || 0) > 0 ? getDoctorCard(id) : null;
+};
+
+const completeDoctorCardFix = ({ id, runId, tokenHash }) => {
+  const database = ensureDb();
+  const result = database
+    .prepare(`
+      UPDATE doctor_cards
+      SET
+        status = $status,
+        fix_token_hash = NULL,
+        fix_completed_at = strftime('%Y-%m-%dT%H:%M:%fZ','now'),
+        updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now')
+      WHERE id = $id
+        AND status = $working_status
+        AND fix_run_id = $run_id
+        AND fix_token_hash = $token_hash
+    `)
+    .run({
+      $id: Number(id || 0),
+      $status: kDoctorCardStatus.fixed,
+      $working_status: kDoctorCardStatus.working,
+      $run_id: String(runId || ""),
+      $token_hash: String(tokenHash || ""),
     });
   return Number(result.changes || 0) > 0 ? getDoctorCard(id) : null;
 };
@@ -535,4 +621,7 @@ module.exports = {
   getDoctorCardsByRunId: getCardsByRunId,
   getDoctorCard,
   updateDoctorCardStatus,
+  startDoctorCardFix,
+  cancelDoctorCardFix,
+  completeDoctorCardFix,
 };

package/lib/server/db/doctor/schema.js

@@ -58,6 +58,10 @@ const createSchema = (database) => {
   ensureColumn(database, "doctor_runs", "workspace_fingerprint", "TEXT");
   ensureColumn(database, "doctor_runs", "workspace_manifest_json", "TEXT");
   ensureColumn(database, "doctor_runs", "reused_from_run_id", "INTEGER");
+  ensureColumn(database, "doctor_cards", "fix_run_id", "TEXT");
+  ensureColumn(database, "doctor_cards", "fix_token_hash", "TEXT");
+  ensureColumn(database, "doctor_cards", "fix_started_at", "TEXT");
+  ensureColumn(database, "doctor_cards", "fix_completed_at", "TEXT");
   database.exec(`
     CREATE INDEX IF NOT EXISTS idx_doctor_cards_run_id
     ON doctor_cards(run_id, created_at DESC);

package/lib/server/doctor/constants.js

@@ -6,6 +6,7 @@ const kDoctorRunStatus = {
 };
 const kDoctorCardStatus = {
   open: "open",
+  working: "working",
   dismissed: "dismissed",
   fixed: "fixed",
 };

package/lib/server/doctor/fix-completion.js

@@ -0,0 +1,6 @@
+const crypto = require("crypto");
+
+const hashDoctorFixToken = (token) =>
+  crypto.createHash("sha256").update(String(token || "")).digest("hex");
+
+module.exports = { hashDoctorFixToken };

package/lib/server/doctor/service.js

@@ -1,3 +1,4 @@
+const crypto = require("crypto");
 const fs = require("fs");
 const path = require("path");
 const {
@@ -5,9 +6,11 @@ const {
   buildBootstrapTruncationCards,
 } = require("./bootstrap-context");
 const { buildDoctorPrompt } = require("./prompt");
+const { hashDoctorFixToken } = require("./fix-completion");
 const { normalizeDoctorResult } = require("./normalize");
 const { calculateWorkspaceDelta, computeWorkspaceSnapshot } = require("./workspace-fingerprint");
 const {
+  kDoctorCardStatus,
   kDoctorEngine,
   kDoctorMeaningfulChangeScoreThreshold,
   kDoctorPromptVersion,
@@ -17,6 +20,35 @@ const {
 } = require("./constants");
 
 const kMaxSnippetLines = 20;
+const kDoctorFixDispatchTimeoutMs = 30000;
+
+const buildDoctorFixCompletionInstructions = ({
+  cardId,
+  runId,
+  token,
+  alphaclawRootDir,
+}) => {
+  const completionCommand = [
+    "alphaclaw",
+    "--root-dir",
+    shellEscapeArg(alphaclawRootDir),
+    "doctor finding complete",
+    "--id",
+    shellEscapeArg(String(Number(cardId || 0))),
+    "--run",
+    shellEscapeArg(runId),
+    "--token",
+    shellEscapeArg(token),
+  ].join(" ");
+  return [
+    "AlphaClaw completion callback:",
+    "After you have successfully applied and verified the requested fix, run this command exactly:",
+    "```sh",
+    completionCommand,
+    "```",
+    "Do not call the completion callback if the fix was not applied or verification failed. Explain the problem to the user instead.",
+  ].join("\n");
+};
 
 const shellEscapeArg = (value) => {
   const safeValue = String(value || "");
@@ -91,8 +123,11 @@ const createDoctorService = ({
   getDoctorCardsByRunId,
   getDoctorCard,
   updateDoctorCardStatus,
+  startDoctorCardFix,
+  cancelDoctorCardFix,
   workspaceRoot,
   managedRoot,
+  alphaclawRootDir = process.env.ALPHACLAW_ROOT_DIR || "~/.alphaclaw",
   protectedPaths = [],
   lockedPaths = [],
 }) => {
@@ -133,7 +168,13 @@ const createDoctorService = ({
   };
 
   const cloneRunCards = ({ sourceRunId, targetRunId }) => {
-    const sourceCards = getDoctorCardsByRunId(sourceRunId);
+    const sourceCards = getDoctorCardsByRunId(sourceRunId).map((card) => ({
+      ...card,
+      status:
+        card.status === kDoctorCardStatus.working
+          ? kDoctorCardStatus.open
+          : card.status,
+    }));
     insertDoctorCards({
       runId: targetRunId,
       cards: sourceCards,
@@ -385,7 +426,7 @@ const createDoctorService = ({
 
   const requestCardFix = async ({
     cardId,
-    sessionId = "",
+    sessionKey = "",
     replyChannel = "",
     replyTo = "",
     prompt = "",
@@ -394,28 +435,65 @@ const createDoctorService = ({
     if (!card) throw new Error("Doctor card not found");
     const resolvedPrompt = String(prompt || card.fixPrompt || "").trim();
     if (!resolvedPrompt) throw new Error("Doctor card does not include a fix prompt");
-    let command = `agent --agent main --message ${shellEscapeArg(resolvedPrompt)}`;
-    const trimmedSessionId = String(sessionId || "").trim();
+    const trimmedSessionKey = String(sessionKey || "").trim();
+    if (!trimmedSessionKey) throw new Error("Doctor fix request requires a session key");
     const trimmedReplyChannel = String(replyChannel || "").trim();
     const trimmedReplyTo = String(replyTo || "").trim();
-    if (trimmedReplyChannel && trimmedReplyTo) {
-      command +=
-        ` --deliver --reply-channel ${shellEscapeArg(trimmedReplyChannel)}` +
-        ` --reply-to ${shellEscapeArg(trimmedReplyTo)}`;
-    } else if (trimmedSessionId) {
-      command += ` --session-id ${shellEscapeArg(trimmedSessionId)}`;
+    const runId = `doctor-fix-${Number(card.id || cardId)}-${crypto.randomUUID()}`;
+    const callbackToken = crypto.randomBytes(32).toString("hex");
+    const workingCard = startDoctorCardFix({
+      id: card.id,
+      runId,
+      tokenHash: hashDoctorFixToken(callbackToken),
+    });
+    if (!workingCard) {
+      const currentCard = getDoctorCard(card.id);
+      if (currentCard?.status === kDoctorCardStatus.working) {
+        throw new Error("Doctor fix already in progress");
+      }
+      throw new Error("Doctor finding must be open before requesting a fix");
     }
-    const result = await clawCmd(command, {
-      quiet: true,
-      timeoutMs: kDoctorRunTimeoutMs,
+    const completionInstructions = buildDoctorFixCompletionInstructions({
+      cardId: card.id,
+      runId,
+      token: callbackToken,
+      alphaclawRootDir,
     });
+    const gatewayParams = {
+      idempotencyKey: runId,
+      message: `${resolvedPrompt}\n\n${completionInstructions}`,
+      sessionKey: trimmedSessionKey,
+    };
+    if (trimmedReplyChannel && trimmedReplyTo) {
+      gatewayParams.deliver = true;
+      gatewayParams.replyChannel = trimmedReplyChannel;
+      gatewayParams.replyTo = trimmedReplyTo;
+    }
+    let result = null;
+    try {
+      result = await clawCmd(
+        `gateway call agent --json --timeout ${kDoctorFixDispatchTimeoutMs} --params ${shellEscapeArg(
+          JSON.stringify(gatewayParams),
+        )}`,
+        {
+          quiet: true,
+          timeoutMs: kDoctorFixDispatchTimeoutMs,
+        },
+      );
+    } catch (error) {
+      cancelDoctorCardFix({ id: card.id, runId });
+      throw error;
+    }
     if (!result?.ok) {
+      cancelDoctorCardFix({ id: card.id, runId });
       throw new Error(result?.stderr || "Could not send Doctor fix request");
     }
     return {
       ok: true,
+      queued: true,
+      runId,
       stdout: result.stdout || "",
-      card,
+      card: workingCard,
     };
   };
 
@@ -443,6 +521,7 @@ const createDoctorService = ({
 };
 
 module.exports = {
+  buildDoctorFixCompletionInstructions,
   buildDoctorIdempotencyKey,
   buildDoctorSessionKey,
   buildDoctorSessionId,

package/lib/server/routes/doctor.js

@@ -106,13 +106,16 @@ const registerDoctorRoutes = ({ app, requireAuth, doctorService }) => {
     try {
       const result = await doctorService.requestCardFix({
         cardId: req.params.id,
-        sessionId: req.body?.sessionId,
+        sessionKey: req.body?.sessionKey,
         replyChannel: req.body?.replyChannel,
         replyTo: req.body?.replyTo,
         prompt: req.body?.prompt,
       });
-      return res.json(result);
+      return res.status(result?.queued ? 202 : 200).json(result);
     } catch (error) {
+      if (/already in progress|must be open/i.test(error.message || "")) {
+        return res.status(409).json({ ok: false, error: error.message });
+      }
       if (/not found/i.test(error.message || "")) {
         return res.status(404).json({ ok: false, error: error.message });
       }

package/lib/server.js

@@ -64,6 +64,8 @@ const {
   getDoctorCardsByRunId,
   getDoctorCard,
   updateDoctorCardStatus,
+  startDoctorCardFix,
+  cancelDoctorCardFix,
 } = require("./server/db/doctor");
 const {
   initAuthDb,
@@ -306,8 +308,11 @@ const doctorService = createDoctorService({
   getDoctorCardsByRunId,
   getDoctorCard,
   updateDoctorCardStatus,
+  startDoctorCardFix,
+  cancelDoctorCardFix,
   workspaceRoot: constants.WORKSPACE_DIR,
   managedRoot: constants.OPENCLAW_DIR,
+  alphaclawRootDir: constants.kRootDir,
   protectedPaths: Array.from(constants.kProtectedBrowsePaths || []),
   lockedPaths: Array.from(constants.kLockedBrowsePaths || []),
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrysb/alphaclaw",
-  "version": "0.9.27",
+  "version": "0.9.28",
   "publishConfig": {
     "access": "public"
   },