@tritard/waterbrother 0.16.96 → 0.16.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tritard/waterbrother",
-  "version": "0.16.96",
+  "version": "0.16.98",
   "description": "Waterbrother: bring-your-own-model coding CLI with local tools, sessions, operator modes, and approval controls",
   "type": "module",
   "bin": {

package/src/gateway.js

@@ -9,7 +9,7 @@ import { DEFAULT_PENDING_PAIRING_TTL_MINUTES, loadGatewayBridge, loadGatewayStat
 import { getGatewayStatus, getChannelSpec } from "./channels.js";
 import { getConfigPath, loadConfigLayers, saveConfig } from "./config.js";
 import { canonicalizeLoosePath } from "./path-utils.js";
-import { acceptSharedInvite, addSharedRoomNote, addSharedTask, approveSharedInvite, assignSharedTask, claimSharedOperator, claimSharedTask, commentSharedTask, createSharedInvite, enableSharedProject, getSharedTaskHistory, listSharedEvents, listSharedInvites, listSharedTasks, loadSharedProject, moveSharedTask, rejectSharedInvite, releaseSharedOperator, setSharedRoom, setSharedRoomMode, setSharedRuntimeProfile, removeSharedMember, upsertSharedAgent, upsertSharedMember } from "./shared-project.js";
+import { acceptSharedInvite, addSharedRoomNote, addSharedTask, addVerificationResult, approveSharedInvite, assignSharedTask, claimSharedOperator, claimSharedTask, commentSharedTask, createSharedInvite, enableSharedProject, getLatestVerificationResult, getSharedTaskHistory, listSharedEvents, listSharedInvites, listSharedTasks, loadSharedProject, moveSharedTask, rejectSharedInvite, releaseSharedOperator, removeSharedMember, setSharedRoom, setSharedRoomMode, setSharedRuntimeProfile, setSharedVerificationMode, upsertSharedAgent, upsertSharedMember } from "./shared-project.js";
 import { buildSelfAwarenessManifest, formatAboutWaterbrother, formatSelfState, resolveLocalConceptQuestion } from "./self-awareness.js";
 
 const execFileAsync = promisify(execFile);
@@ -296,6 +296,7 @@ function buildTelegramRoomOnboardingMarkup({ project = null, actorName = "", exe
   const participants = listProjectParticipants(project);
   const agents = listProjectAgents(project);
   const reviewer = chooseReviewerAgent(project);
+  const verifier = chooseVerifierAgent(project);
   const blockingReview = getLatestBlockingReviewPolicy(project);
   return [
     "<b>Roundtable room</b>",
@@ -305,6 +306,7 @@ function buildTelegramRoomOnboardingMarkup({ project = null, actorName = "", exe
     `agents: <code>${escapeTelegramHtml(String(agents.length || 0))}</code>`,
     executor?.provider && executor?.model ? `active runtime: <code>${escapeTelegramHtml(`${executor.provider}/${executor.model}`)}</code>` : "",
     reviewer ? `reviewer: <code>${escapeTelegramHtml(reviewer.ownerName || reviewer.label || reviewer.ownerId || reviewer.id || "unknown")}</code>` : "",
+    verifier ? `verifier: <code>${escapeTelegramHtml(verifier.ownerName || verifier.label || verifier.ownerId || verifier.id || "unknown")}</code>` : "",
     `blocking review: <code>${escapeTelegramHtml(blockingReview ? "yes" : "no")}</code>`,
     "",
     "<b>What you can do here</b>",
@@ -312,6 +314,7 @@ function buildTelegramRoomOnboardingMarkup({ project = null, actorName = "", exe
     "• ask <code>who is in the room?</code>",
     "• say <code>add Austin as editor</code>",
     "• ask <code>which terminals are live?</code>",
+    "• say <code>run verification</code>",
     "• in execute mode, address Waterbrother directly to build or change code",
     "",
     "Use <code>/help</code> for the full command list."
@@ -336,7 +339,9 @@ function buildTelegramRoomGuidanceMarkup({ project = null, member = null, execut
     "• <code>what project is this chat bound to?</code>",
     "• <code>who is in the room?</code>",
     "• <code>who are the bots?</code>",
-    role === "owner" ? "• <code>add Austin as editor</code>" : "• <code>what mode are we in?</code>"
+    role === "owner" ? "• <code>add Austin as editor</code>" : "• <code>what mode are we in?</code>",
+    "• <code>who is the verifier?</code>",
+    "• <code>run verification</code>"
   ].filter(Boolean).join("\n");
 }
 
@@ -353,6 +358,8 @@ function buildTelegramAgentAnnouncementMarkup(event = {}) {
     ? "This terminal is the selected executor and can take room work when it is live."
     : role === "reviewer"
       ? "This terminal is the room reviewer and can be asked for a second opinion or blocking review."
+      : role === "verifier"
+        ? "This terminal is the verifier and can run tests, checks, and build verification for the room."
       : "This terminal is on standby until the room assigns it a more active role.";
   return [
     `<b>${escapeTelegramHtml(title)}</b>`,
@@ -363,7 +370,7 @@ function buildTelegramAgentAnnouncementMarkup(event = {}) {
     runtime ? `runtime: <code>${escapeTelegramHtml(runtime)}</code>` : "",
     meta.runtimeProfile ? `runtime profile: <code>${escapeTelegramHtml(String(meta.runtimeProfile || ""))}</code>` : "",
     roleGuidance,
-    "Examples: <code>which terminals are live?</code>, <code>make this terminal the reviewer</code>, <code>make this terminal the executor</code>"
+    "Examples: <code>which terminals are live?</code>, <code>make this terminal the reviewer</code>, <code>make this terminal the verifier</code>, <code>make this terminal the executor</code>"
   ].filter(Boolean).join("\n");
 }
 
@@ -526,6 +533,11 @@ function chooseReviewerAgent(project) {
   return agents.find((agent) => String(agent?.role || "").trim() === "reviewer") || null;
 }
 
+function chooseVerifierAgent(project) {
+  const agents = listProjectAgents(project);
+  return agents.find((agent) => String(agent?.role || "").trim() === "verifier") || null;
+}
+
 function summarizeExecutorReviewerArbitration(project, fallbackExecutor = {}) {
   const executorAgent = chooseExecutorAgent(project, fallbackExecutor);
   const reviewerAgent = chooseReviewerAgent(project);
@@ -541,6 +553,29 @@ function summarizeExecutorReviewerArbitration(project, fallbackExecutor = {}) {
   };
 }
 
+function formatVerificationResultMarkup(result = {}, verifier = null) {
+  const lines = [
+    "<b>Verification result</b>",
+    `outcome: <code>${escapeTelegramHtml(String(result.outcome || "failed"))}</code>`
+  ];
+  if (verifier) {
+    lines.splice(1, 0, `verifier: <code>${escapeTelegramHtml(verifier.ownerName || verifier.label || verifier.ownerId || verifier.id || "unknown")}</code>`);
+  }
+  if (Array.isArray(result.commands) && result.commands.length) {
+    lines.push("commands:");
+    for (const command of result.commands) {
+      lines.push(`• <code>${escapeTelegramHtml(command)}</code>`);
+    }
+  }
+  if (result.summary) {
+    lines.push("", "<b>Summary</b>", escapeTelegramHtml(result.summary));
+  }
+  if (Array.isArray(result.logs) && result.logs.length) {
+    lines.push("", "<b>Top errors</b>", ...result.logs.slice(0, 6).map((line) => `• ${escapeTelegramHtml(line)}`));
+  }
+  return lines.filter(Boolean).join("\n");
+}
+
 function parseReviewerOutcome(text = "") {
   const value = String(text || "").trim();
   const lower = value.toLowerCase();
@@ -783,15 +818,15 @@ function parseTelegramAgentIntent(text = "") {
     }
   }
 
-  const roleMatch = lowered.match(/\b(executor|reviewer|standby)\b/);
+  const roleMatch = lowered.match(/\b(executor|reviewer|verifier|standby)\b/);
   const role = roleMatch?.[1] || "";
   if (!role) return null;
 
   const patterns = [
-    /^(?:have|make|set)\s+(.+?)['’]s\s+(?:bot|terminal)\s+(?:be|as|to)?\s*(?:the\s+)?(executor|reviewer|standby)\s*$/i,
-    /^(?:have|make|set)\s+(.+?)\s+(?:bot|terminal)\s+(?:be|as|to)?\s*(?:the\s+)?(executor|reviewer|standby)\s*$/i,
-    /^(.+?)['’]s\s+(?:bot|terminal)\s+should\s+(?:be\s+)?(?:the\s+)?(executor|reviewer|standby)\s*$/i,
-    /^(.+?)\s+(?:bot|terminal)\s+should\s+(?:be\s+)?(?:the\s+)?(executor|reviewer|standby)\s*$/i
+    /^(?:have|make|set)\s+(.+?)['’]s\s+(?:bot|terminal)\s+(?:be|as|to)?\s*(?:the\s+)?(executor|reviewer|verifier|standby)\s*$/i,
+    /^(?:have|make|set)\s+(.+?)\s+(?:bot|terminal)\s+(?:be|as|to)?\s*(?:the\s+)?(executor|reviewer|verifier|standby)\s*$/i,
+    /^(.+?)['’]s\s+(?:bot|terminal)\s+should\s+(?:be\s+)?(?:the\s+)?(executor|reviewer|verifier|standby)\s*$/i,
+    /^(.+?)\s+(?:bot|terminal)\s+should\s+(?:be\s+)?(?:the\s+)?(executor|reviewer|verifier|standby)\s*$/i
   ];
   for (const pattern of patterns) {
     const match = value.match(pattern);
@@ -834,9 +869,28 @@ function parseTelegramStateIntent(text = "") {
   if (/\bwhat can i do here\b/.test(lower) || /\bhow do i use this room\b/.test(lower) || /\bhow do i use this chat\b/.test(lower) || /\bwhat do i do here\b/.test(lower)) {
     return { action: "room-guidance" };
   }
-  if (/\bwho are the bots\b/.test(lower) || /\bwho are the agents\b/.test(lower) || /\bwhat bots are here\b/.test(lower) || /\bwhat agents are here\b/.test(lower)) {
+  if (/\bwho is the verifier\b/.test(lower) || /\bwhat is the verifier\b/.test(lower) || /\bwho should verify this\b/.test(lower)) {
+    return { action: "verifier-status" };
+  }
+  if (/\bwho are the (?:bots|boys)\b/.test(lower) || /\bwho are the agents\b/.test(lower) || /\bwhat (?:bots|boys) are here\b/.test(lower) || /\bwhat agents are here\b/.test(lower)) {
     return { action: "agent-list" };
   }
+  if (/^(?:run|start|do)\s+verification\b/.test(lower) || /^(?:verify)\b/.test(lower) || /\bshow latest verification result\b/.test(lower) || /\bdid verification pass\b/.test(lower)) {
+    return { action: /\bshow latest verification result\b/.test(lower) || /\bdid verification pass\b/.test(lower) ? "verification-status" : "run-verification" };
+  }
+  if (/\bverification mode\b/.test(lower)) {
+    const modeMatch = lower.match(/\b(off|manual|auto|blocking)\b/);
+    return modeMatch?.[1] ? { action: "verification-mode-set", mode: modeMatch[1] } : { action: "verification-mode-status" };
+  }
+  if (/\balways verify after execution\b/.test(lower)) {
+    return { action: "verification-mode-set", mode: "auto" };
+  }
+  if (/\bturn off verification\b/.test(lower)) {
+    return { action: "verification-mode-set", mode: "off" };
+  }
+  if (/\bverification should be blocking\b/.test(lower)) {
+    return { action: "verification-mode-set", mode: "blocking" };
+  }
   if (/\bwhich terminals are live\b/.test(lower) || /\bwhich bots are live\b/.test(lower) || /\bwho is live\b/.test(lower) || /\bwhat terminals are live\b/.test(lower)) {
     return { action: "live-hosts" };
   }
@@ -980,11 +1034,14 @@ function formatTelegramRoomMarkup(project, options = {}) {
   const liveHosts = Array.isArray(options.liveHosts) ? options.liveHosts : [];
   const selectedExecutor = chooseExecutorAgent(project, executor);
   const selectedReviewer = chooseReviewerAgent(project);
+  const selectedVerifier = chooseVerifierAgent(project);
   const blockingReview = getLatestBlockingReviewPolicy(project);
   const latestReviewResult = getLatestReviewResult(project);
   const latestReviewMeta = latestReviewResult?.meta && typeof latestReviewResult.meta === "object" ? latestReviewResult.meta : {};
+  const latestVerificationResult = getLatestVerificationResult(project);
   const selectedExecutorLiveHost = selectedExecutor ? findLiveHostForAgent(liveHosts, selectedExecutor) : null;
   const selectedReviewerLiveHost = selectedReviewer ? findLiveHostForAgent(liveHosts, selectedReviewer) : null;
+  const selectedVerifierLiveHost = selectedVerifier ? findLiveHostForAgent(liveHosts, selectedVerifier) : null;
   const executorBits = [
     `surface: <code>${escapeTelegramHtml(executor.surface || "telegram")}</code>`,
     `provider: <code>${escapeTelegramHtml(executor.provider || "unknown")}</code>`,
@@ -1012,8 +1069,12 @@ function formatTelegramRoomMarkup(project, options = {}) {
     `executor live: <code>${escapeTelegramHtml(selectedExecutorLiveHost ? "yes" : "no")}</code>`,
     `reviewer: <code>${escapeTelegramHtml(selectedReviewer ? (selectedReviewer.ownerName || selectedReviewer.label || selectedReviewer.ownerId || selectedReviewer.id || "none") : "none")}</code>`,
     `reviewer live: <code>${escapeTelegramHtml(selectedReviewerLiveHost ? "yes" : "no")}</code>`,
+    `verifier: <code>${escapeTelegramHtml(selectedVerifier ? (selectedVerifier.ownerName || selectedVerifier.label || selectedVerifier.ownerId || selectedVerifier.id || "none") : "none")}</code>`,
+    `verifier live: <code>${escapeTelegramHtml(selectedVerifierLiveHost ? "yes" : "no")}</code>`,
     `blocking review: <code>${escapeTelegramHtml(blockingReview ? "yes" : "no")}</code>`,
     `latest reviewer outcome: <code>${escapeTelegramHtml(String(latestReviewMeta.outcome || "").trim() || "none")}</code>`,
+    `verification mode: <code>${escapeTelegramHtml(String(project.verificationMode || "manual"))}</code>`,
+    `latest verification outcome: <code>${escapeTelegramHtml(String(latestVerificationResult?.outcome || "").trim() || "none")}</code>`,
     "<b>Executor</b>",
     ...executorBits,
     "<b>Runtime Split</b>",
@@ -1946,7 +2007,31 @@ class TelegramGateway {
       throw new Error("Only a shared-project owner can change terminal roles.");
     }
     const actor = this.describeTelegramUser(message?.from || {});
-    const targetAgent = resolveProjectAgent(project, intent.target);
+    const normalizedTarget = String(intent.target || "").trim().toLowerCase();
+    let targetAgent = resolveProjectAgent(project, intent.target);
+    if (!targetAgent && /^(?:this|my)(?:\s+(?:bot|terminal))?$/.test(normalizedTarget)) {
+      const host = await this.getLiveBridgeHost();
+      if (host) {
+        targetAgent = listProjectAgents(project).find((agent) => (
+          String(agent?.sessionId || "").trim() && String(agent.sessionId || "").trim() === String(host.sessionId || "").trim()
+        ) || (
+          String(agent?.ownerId || "").trim() && String(agent.ownerId || "").trim() === String(host.ownerId || "").trim()
+        )) || {
+          id: `agent:telegram-bridge:${String(host.sessionId || host.pid || "current").trim()}`,
+          ownerId: String(host.ownerId || actor.userId || "").trim(),
+          ownerName: String(host.ownerName || actor.displayName || "").trim(),
+          label: String(host.label || `${actor.displayName || actor.userId || "current"} terminal`).trim(),
+          surface: String(host.surface || "live-tui").trim(),
+          role: "standby",
+          provider: String(host.provider || "").trim(),
+          model: String(host.model || "").trim(),
+          runtimeProfile: String(host.runtimeProfile || "").trim(),
+          sessionId: String(host.sessionId || "").trim(),
+          cwd: String(session.cwd || this.cwd).trim(),
+          chatId: String(message?.chat?.id || "").trim()
+        };
+      }
+    }
     if (!targetAgent) {
       throw new Error(`No terminal found for ${intent.target}. Ask them to connect their Waterbrother bot/terminal first.`);
     }
@@ -1958,17 +2043,21 @@ class TelegramGateway {
       actorName: actor.displayName || actorId
     });
     const runtimeLabel = targetAgent.provider && targetAgent.model ? `${targetAgent.provider}/${targetAgent.model}` : "unknown";
-    const actionTitle = intent.action === "agent-review"
+    const actionTitle = intent.action === "agent-review" || intent.role === "reviewer"
       ? "Roundtable reviewer assigned"
-      : intent.action === "agent-execute"
+      : intent.action === "agent-execute" || intent.role === "executor"
         ? "Roundtable executor assigned"
-        : "Roundtable terminal updated";
-    const note = intent.action === "agent-review"
+        : intent.role === "verifier"
+          ? "Roundtable verifier assigned"
+          : "Roundtable terminal updated";
+    const note = intent.action === "agent-review" || intent.role === "reviewer"
       ? "This sets the room reviewer role. It does not automatically run a review pass yet."
-      : intent.action === "agent-execute"
+      : intent.action === "agent-execute" || intent.role === "executor"
         ? "This sets the room executor role. Claim/mode rules still control actual execution."
-        : "";
-    const followUp = intent.action === "agent-review"
+        : intent.role === "verifier"
+          ? "This sets the room verifier role. Use run verification when you want Waterbrother to run tests or build checks."
+          : "";
+    const followUp = intent.action === "agent-review" || intent.role === "reviewer"
       ? `Should ${targetAgent.ownerName || targetAgent.label || "that terminal"} review be advisory or blocking?`
       : "";
     return {
@@ -2245,6 +2334,7 @@ class TelegramGateway {
       runtimeProfile: host?.runtimeProfile || project?.runtimeProfile || this.channel.defaultRuntimeProfile || this.gateway.defaultRuntimeProfile || "",
       hostSessionId: host?.sessionId || ""
     };
+    const verifier = chooseVerifierAgent(project);
 
     if (intent.action === "bot-status") {
       const lines = [
@@ -2272,6 +2362,68 @@ class TelegramGateway {
       ].join("\n");
     }
 
+    if (intent.action === "verifier-status") {
+      if (!project?.enabled) {
+        return "This project is not shared.";
+      }
+      if (!verifier) {
+        return [
+          "<b>Verifier</b>",
+          "No verifier is assigned yet.",
+          "Try: <code>make this terminal the verifier</code>"
+        ].join("\n");
+      }
+      return [
+        "<b>Verifier</b>",
+        `verifier: <code>${escapeTelegramHtml(verifier.ownerName || verifier.label || verifier.ownerId || verifier.id || "unknown")}</code>`,
+        `role: <code>${escapeTelegramHtml(verifier.role || "verifier")}</code>`,
+        `runtime: <code>${escapeTelegramHtml(verifier.provider && verifier.model ? `${verifier.provider}/${verifier.model}` : "unknown")}</code>`,
+        `verification mode: <code>${escapeTelegramHtml(String(project.verificationMode || "manual"))}</code>`
+      ].join("\n");
+    }
+
+    if (intent.action === "verification-mode-status") {
+      if (!project?.enabled) {
+        return "This project is not shared.";
+      }
+      return [
+        "<b>Verification mode</b>",
+        `mode: <code>${escapeTelegramHtml(String(project.verificationMode || "manual"))}</code>`
+      ].join("\n");
+    }
+
+    if (intent.action === "verification-mode-set") {
+      if (!project?.enabled) {
+        return "This project is not shared.";
+      }
+      const next = await setSharedVerificationMode(cwd, intent.mode, { actorId, actorName });
+      return [
+        "<b>Verification mode</b>",
+        `mode: <code>${escapeTelegramHtml(String(next.verificationMode || intent.mode || "manual"))}</code>`
+      ].join("\n");
+    }
+
+    if (intent.action === "verification-status") {
+      if (!project?.enabled) {
+        return "This project is not shared.";
+      }
+      const result = getLatestVerificationResult(project);
+      if (!result) {
+        return "<b>Verification result</b>\nNo verification result is on record yet.";
+      }
+      return formatVerificationResultMarkup(result, verifier);
+    }
+
+    if (intent.action === "run-verification") {
+      if (!project?.enabled) {
+        return "This project is not shared.";
+      }
+      const result = await this.runLocalVerification(cwd, verifier);
+      const nextProject = await addVerificationResult(cwd, result, { actorId, actorName });
+      const latest = getLatestVerificationResult(nextProject) || result;
+      return formatVerificationResultMarkup(latest, verifier);
+    }
+
     if (intent.action === "accept-reviewer-concerns") {
       if (!project?.enabled) {
         return "This project is not shared.";
@@ -3146,6 +3298,75 @@ class TelegramGateway {
     return JSON.parse(stdout);
   }
 
+  async planVerificationCommands(cwd) {
+    const packageJsonPath = path.join(cwd, "package.json");
+    let scripts = {};
+    try {
+      const raw = await fs.readFile(packageJsonPath, "utf8");
+      const parsed = JSON.parse(raw);
+      scripts = parsed?.scripts && typeof parsed.scripts === "object" ? parsed.scripts : {};
+    } catch {}
+    const commands = [];
+    if (scripts.check) commands.push(["npm", ["run", "check"], "npm run check"]);
+    if (scripts.test) commands.push(["npm", ["test"], "npm test"]);
+    if (scripts.build) commands.push(["npm", ["run", "build"], "npm run build"]);
+    if (!commands.length) {
+      throw new Error("No verification commands are available here. Expected package.json scripts like check, test, or build.");
+    }
+    return commands;
+  }
+
+  async runLocalVerification(cwd, verifier = null) {
+    const planned = await this.planVerificationCommands(cwd);
+    const commands = [];
+    const startedAt = new Date().toISOString();
+    const logs = [];
+    let passedCount = 0;
+    for (const [bin, args, label] of planned) {
+      commands.push(label);
+      try {
+        await execFileAsync(bin, args, {
+          cwd,
+          env: { ...process.env },
+          maxBuffer: 8 * 1024 * 1024,
+          timeout: 10 * 60 * 1000
+        });
+        passedCount += 1;
+      } catch (error) {
+        const combined = `${String(error?.stderr || "")}\n${String(error?.stdout || "")}`.trim();
+        const extracted = combined
+          .split("\n")
+          .map((line) => String(line || "").trim())
+          .filter(Boolean)
+          .slice(0, 6);
+        logs.push(...extracted);
+        const outcome = error?.killed || error?.signal === "SIGTERM" ? "timeout" : (passedCount > 0 ? "partial" : "failed");
+        return {
+          id: "",
+          workItemId: "",
+          verifierAgentId: String(verifier?.id || "").trim(),
+          outcome,
+          summary: `${label} failed${passedCount > 0 ? ` after ${passedCount} passing check${passedCount === 1 ? "" : "s"}` : ""}.`,
+          commands,
+          startedAt,
+          completedAt: new Date().toISOString(),
+          logs
+        };
+      }
+    }
+    return {
+      id: "",
+      workItemId: "",
+      verifierAgentId: String(verifier?.id || "").trim(),
+      outcome: "passed",
+      summary: `${commands.length} verification command${commands.length === 1 ? "" : "s"} passed.`,
+      commands,
+      startedAt,
+      completedAt: new Date().toISOString(),
+      logs: []
+    };
+  }
+
   async startTypingLoop(chatId) {
     let stopped = false;
     const tick = async () => {

package/src/shared-project.js

@@ -8,7 +8,9 @@ const ROUNDTABLE_FILE = "ROUNDTABLE.md";
 const TASK_STATES = ["open", "active", "blocked", "done"];
 const RECENT_EVENT_LIMIT = 24;
 const PARTICIPANT_ROLES = ["owner", "editor", "observer"];
-const AGENT_ROLES = ["executor", "reviewer", "standby", "coordinator"];
+const AGENT_ROLES = ["executor", "reviewer", "verifier", "standby", "coordinator"];
+const VERIFICATION_MODES = ["off", "manual", "auto", "blocking"];
+const VERIFICATION_RESULT_LIMIT = 50;
 
 function makeId(prefix = "id") {
   return `${prefix}_${crypto.randomBytes(3).toString("hex")}`;
@@ -54,11 +56,13 @@ function normalizeParticipant(participant = {}) {
 }
 
 function normalizeAgent(agent = {}) {
+  const rawLabel = String(agent.label || agent.name || "").trim();
+  const cleanLabel = rawLabel.replace(/\bundefined\b/ig, "").replace(/\s+/g, " ").trim();
   return {
     id: String(agent.id || "").trim(),
     ownerId: String(agent.ownerId || "").trim(),
     ownerName: String(agent.ownerName || "").trim(),
-    label: String(agent.label || agent.name || "").trim(),
+    label: cleanLabel,
     surface: String(agent.surface || "").trim(),
     role: AGENT_ROLES.includes(String(agent.role || "").trim()) ? String(agent.role).trim() : "standby",
     provider: String(agent.provider || "").trim(),
@@ -71,6 +75,73 @@ function normalizeAgent(agent = {}) {
   };
 }
 
+function normalizeVerificationResult(result = {}) {
+  const commands = Array.isArray(result.commands)
+    ? result.commands.map((item) => String(item || "").trim()).filter(Boolean)
+    : [];
+  const logs = Array.isArray(result.logs)
+    ? result.logs.map((item) => String(item || "").trim()).filter(Boolean)
+    : [];
+  const artifacts = Array.isArray(result.artifacts)
+    ? result.artifacts
+        .map((artifact) => ({
+          label: String(artifact?.label || "").trim(),
+          path: String(artifact?.path || "").trim(),
+          url: String(artifact?.url || "").trim()
+        }))
+        .filter((artifact) => artifact.label || artifact.path || artifact.url)
+    : [];
+  const outcome = String(result.outcome || "").trim().toLowerCase();
+  return {
+    id: String(result.id || makeId("vr")).trim(),
+    workItemId: String(result.workItemId || "").trim(),
+    verifierAgentId: String(result.verifierAgentId || "").trim(),
+    outcome: ["passed", "failed", "partial", "timeout"].includes(outcome) ? outcome : "failed",
+    summary: String(result.summary || "").trim(),
+    commands,
+    startedAt: String(result.startedAt || new Date().toISOString()).trim(),
+    completedAt: String(result.completedAt || result.startedAt || new Date().toISOString()).trim(),
+    logs,
+    artifacts
+  };
+}
+
+function isBrokenAgent(agent = {}) {
+  const ownerId = String(agent.ownerId || "").trim();
+  const ownerName = String(agent.ownerName || "").trim();
+  const label = String(agent.label || "").trim();
+  return !ownerId && !ownerName && !label;
+}
+
+function dedupeAgents(agents = []) {
+  const bySemanticKey = new Map();
+  for (const agent of agents) {
+    const normalized = normalizeAgent(agent);
+    if (!normalized.id || isBrokenAgent(normalized)) continue;
+    const semanticKey = [
+      String(normalized.ownerId || "").trim(),
+      String(normalized.ownerName || "").trim().toLowerCase(),
+      String(normalized.label || "").trim().toLowerCase(),
+      String(normalized.surface || "").trim().toLowerCase(),
+      String(normalized.role || "").trim().toLowerCase(),
+      String(normalized.provider || "").trim().toLowerCase(),
+      String(normalized.model || "").trim().toLowerCase(),
+      String(normalized.chatId || "").trim()
+    ].join("|");
+    const prior = bySemanticKey.get(semanticKey);
+    if (!prior) {
+      bySemanticKey.set(semanticKey, normalized);
+      continue;
+    }
+    const priorUpdated = Date.parse(String(prior.updatedAt || "").trim()) || 0;
+    const nextUpdated = Date.parse(String(normalized.updatedAt || "").trim()) || 0;
+    if (nextUpdated >= priorUpdated) {
+      bySemanticKey.set(semanticKey, normalized);
+    }
+  }
+  return [...bySemanticKey.values()];
+}
+
 function areAgentsEquivalent(left = {}, right = {}) {
   return [
     "ownerId",
@@ -119,12 +190,8 @@ function buildProjectParticipants(project = {}) {
 }
 
 function buildProjectAgents(project = {}) {
-  const existing = new Map(
-    (Array.isArray(project.agents) ? project.agents : [])
-      .map((agent) => normalizeAgent(agent))
-      .filter((agent) => agent.id)
-      .map((agent) => [agent.id, agent])
-  );
+  const existingAgents = dedupeAgents(Array.isArray(project.agents) ? project.agents : []);
+  const existing = new Map(existingAgents.map((agent) => [agent.id, agent]));
   const next = [];
   const activeOperatorId = String(project.activeOperator?.id || "").trim();
   if (activeOperatorId) {
@@ -145,7 +212,7 @@ function buildProjectAgents(project = {}) {
     if (next.some((item) => item.id === agent.id)) continue;
     next.push(normalizeAgent(agent));
   }
-  return next;
+  return dedupeAgents(next);
 }
 
 function memberRoleWeight(role = "") {
@@ -183,6 +250,12 @@ function normalizeSharedProject(project = {}, cwd = process.cwd()) {
     : null;
   const participants = buildProjectParticipants({ ...project, members });
   const agents = buildProjectAgents({ ...project, members, activeOperator });
+  const verificationResults = Array.isArray(project.verificationResults)
+    ? project.verificationResults
+        .map((item) => normalizeVerificationResult(item))
+        .filter((item) => item.id)
+        .slice(-VERIFICATION_RESULT_LIMIT)
+    : [];
 
   return {
     version: 1,
@@ -199,10 +272,15 @@ function normalizeSharedProject(project = {}, cwd = process.cwd()) {
     roomMode: ["chat", "plan", "execute"].includes(String(project.roomMode || "").trim())
       ? String(project.roomMode).trim()
       : "chat",
+    verificationMode: VERIFICATION_MODES.includes(String(project.verificationMode || "").trim())
+      ? String(project.verificationMode).trim()
+      : "manual",
     runtimeProfile: String(project.runtimeProfile || "").trim(),
     members,
     participants,
     agents,
+    verificationResults,
+    latestVerificationResultId: String(project.latestVerificationResultId || "").trim(),
     tasks,
     pendingInvites,
     recentEvents,
@@ -433,7 +511,12 @@ async function recordSharedProjectEvent(cwd, project, text, { type = "note", act
 export async function loadSharedProject(cwd) {
   try {
     const raw = await fs.readFile(sharedFilePath(cwd), "utf8");
-    return normalizeSharedProject(JSON.parse(raw), cwd);
+    const parsed = JSON.parse(raw);
+    const normalized = normalizeSharedProject(parsed, cwd);
+    if (JSON.stringify(parsed) !== JSON.stringify(normalized)) {
+      await writeJsonAtomically(sharedFilePath(cwd), normalized);
+    }
+    return normalized;
   } catch (error) {
     if (error?.code === "ENOENT") return null;
     throw error;
@@ -537,6 +620,25 @@ export async function setSharedRuntimeProfile(cwd, runtimeProfile = "", options
   })).project;
 }
 
+export async function setSharedVerificationMode(cwd, verificationMode = "manual", options = {}) {
+  const existing = await loadSharedProject(cwd);
+  requireOwner(existing, options.actorId);
+  const normalized = String(verificationMode || "").trim().toLowerCase();
+  if (!VERIFICATION_MODES.includes(normalized)) {
+    throw new Error(`Invalid verification mode. Expected one of ${VERIFICATION_MODES.join(", ")}.`);
+  }
+  const next = await saveSharedProject(cwd, {
+    ...existing,
+    verificationMode: normalized
+  });
+  return (await recordSharedProjectEvent(cwd, next, `verification mode set to ${normalized}`, {
+    type: "verification-mode",
+    actorId: String(options.actorId || "").trim(),
+    actorName: String(options.actorName || "").trim(),
+    meta: { verificationMode: normalized }
+  })).project;
+}
+
 export function getSharedMember(project, memberId = "") {
   const normalizedId = String(memberId || "").trim();
   if (!normalizedId || !project?.members?.length) return null;
@@ -663,6 +765,46 @@ export async function upsertSharedAgent(cwd, agent = {}, options = {}) {
   })).project;
 }
 
+export function getLatestVerificationResult(project) {
+  const latestId = String(project?.latestVerificationResultId || "").trim();
+  const results = Array.isArray(project?.verificationResults) ? project.verificationResults : [];
+  if (latestId) {
+    const exact = results.find((result) => String(result?.id || "").trim() === latestId);
+    if (exact) return exact;
+  }
+  return [...results].sort((a, b) => String(b.completedAt || "").localeCompare(String(a.completedAt || "")))[0] || null;
+}
+
+export async function addVerificationResult(cwd, result = {}, options = {}) {
+  const existing = await loadSharedProject(cwd);
+  requireSharedProject(existing);
+  if (options.actorId) {
+    requireMember(existing, options.actorId);
+  }
+  const verificationResult = normalizeVerificationResult(result);
+  const verificationResults = [...(existing.verificationResults || []), verificationResult].slice(-VERIFICATION_RESULT_LIMIT);
+  const next = await saveSharedProject(cwd, {
+    ...existing,
+    verificationResults,
+    latestVerificationResultId: verificationResult.id
+  });
+  return (await recordSharedProjectEvent(
+    cwd,
+    next,
+    `verification ${verificationResult.outcome} [${verificationResult.id}] ${verificationResult.summary || "result recorded"}`.trim(),
+    {
+      type: "verification-result",
+      actorId: String(options.actorId || "").trim(),
+      actorName: String(options.actorName || "").trim(),
+      meta: {
+        verificationResultId: verificationResult.id,
+        verifierAgentId: verificationResult.verifierAgentId,
+        outcome: verificationResult.outcome
+      }
+    }
+  )).project;
+}
+
 export async function addSharedRoomNote(cwd, text = "", options = {}) {
   const existing = await loadSharedProject(cwd);
   requireSharedProject(existing);
@@ -1084,12 +1226,15 @@ export function formatSharedProjectStatus(project) {
     room: project.room,
     mode: project.mode,
     roomMode: project.roomMode,
+    verificationMode: project.verificationMode,
     runtimeProfile: project.runtimeProfile,
     approvalPolicy: project.approvalPolicy,
     activeOperator: project.activeOperator,
     members: project.members,
     participants: project.participants,
     agents: project.agents,
+    verificationResults: project.verificationResults,
+    latestVerificationResultId: project.latestVerificationResultId,
     pendingInvites: project.pendingInvites,
     tasks: project.tasks,
     recentEvents: project.recentEvents