@markus-global/cli 0.4.21 → 0.4.23

package/dist/markus.mjs

@@ -3566,7 +3566,7 @@ function buildManifest(type, raw) {
   if (type === "agent") {
     const agentRaw = raw.agent ?? raw;
     base.agent = {
-      roleName: agentRaw.roleName ?? raw.roleName ?? "developer",
+      roleName: agentRaw.roleName || raw.roleName || void 0,
       agentRole: agentRaw.agentRole ?? raw.agentRole ?? "worker",
       llmProvider: agentRaw.llmProvider || raw.llmProvider || void 0,
       llmModel: agentRaw.llmModel || raw.llmModel || void 0,
@@ -3585,7 +3585,7 @@ function buildManifest(type, raw) {
       members: rawMembers.map((m) => ({
         name: m.name ?? "Agent",
         role: m.role ?? "worker",
-        roleName: m.roleName ?? "developer",
+        roleName: m.roleName || void 0,
         count: m.count ?? 1,
         skills: toArr(m.skills).length > 0 ? toArr(m.skills) : void 0
       }))
@@ -3652,8 +3652,8 @@ function validateManifest(m) {
     errors.push("version must be semver (e.g. 1.0.0)");
   if (o.type === "agent" && o.agent) {
     const a = o.agent;
-    if (!a.roleName || typeof a.roleName !== "string")
-      errors.push("agent.roleName is required");
+    if (a.roleName !== void 0 && typeof a.roleName !== "string")
+      errors.push("agent.roleName must be a string if provided");
   }
   if (o.type === "team" && o.team) {
     const t = o.team;
@@ -3662,10 +3662,12 @@ function validateManifest(m) {
   }
   return errors;
 }
-function kebab(s) {
+function kebab(s, fallback) {
   const result = s.toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "").replace(/^-+|-+$/g, "");
   if (result)
     return result;
+  if (fallback)
+    return fallback;
   let hash = 0;
   for (let i = 0; i < s.length; i++)
     hash = (hash << 5) - hash + s.charCodeAt(i) | 0;
@@ -4409,6 +4411,7 @@ __export(dist_exports, {
   getTextContent: () => getTextContent,
   isPlaceholder: () => isPlaceholder,
   isValidTaskTransition: () => isValidTaskTransition,
+  kebab: () => kebab,
   loadConfig: () => loadConfig,
   manifestFilename: () => manifestFilename,
   msgId: () => msgId,
@@ -41152,13 +41155,41 @@ var init_web_fetch = __esm({
 });
 
 // ../core/dist/tools/web-search.js
+async function resolveProxyDispatcher() {
+  if (_dispatcher !== false)
+    return _dispatcher || void 0;
+  const proxyUrl = process.env["HTTPS_PROXY"] || process.env["HTTP_PROXY"] || process.env["https_proxy"] || process.env["http_proxy"];
+  if (!proxyUrl) {
+    _dispatcher = void 0;
+    return void 0;
+  }
+  try {
+    const load = new Function("id", "return import(id)");
+    const { ProxyAgent } = await load("undici");
+    _dispatcher = new ProxyAgent(proxyUrl);
+  } catch {
+    _dispatcher = void 0;
+  }
+  return _dispatcher || void 0;
+}
+async function proxyFetch(url, init) {
+  const dispatcher = await resolveProxyDispatcher();
+  const signal = init?.signal ?? AbortSignal.timeout(SEARCH_TIMEOUT_MS);
+  const opts = { ...init, signal };
+  if (dispatcher)
+    opts["dispatcher"] = dispatcher;
+  return fetch(url, opts);
+}
+function hasProxy() {
+  return !!(process.env["HTTPS_PROXY"] || process.env["HTTP_PROXY"] || process.env["https_proxy"] || process.env["http_proxy"]);
+}
 async function searchSerper(query2, maxResults) {
   const apiKey = process.env["SERPER_API_KEY"];
   if (!apiKey)
     throw new Error("SERPER_API_KEY not configured");
   let res;
   try {
-    res = await fetch("https://google.serper.dev/search", {
+    res = await proxyFetch("https://google.serper.dev/search", {
       method: "POST",
       headers: {
         "X-API-KEY": apiKey,
@@ -41186,7 +41217,7 @@ async function searchBrave(query2, maxResults) {
   const params = new URLSearchParams({ q: query2, count: String(maxResults) });
   let res;
   try {
-    res = await fetch(`https://api.search.brave.com/res/v1/web/search?${params}`, {
+    res = await proxyFetch(`https://api.search.brave.com/res/v1/web/search?${params}`, {
       headers: {
         "Accept": "application/json",
         "Accept-Encoding": "gzip",
@@ -41206,23 +41237,28 @@ async function searchBrave(query2, maxResults) {
     date: r.page_age
   }));
 }
-async function searchDuckDuckGoLite(query2, maxResults) {
+async function searchDuckDuckGo(query2, maxResults) {
   const encoded = encodeURIComponent(query2);
-  let res;
-  try {
-    res = await fetch(`https://lite.duckduckgo.com/lite/?q=${encoded}`, {
-      headers: {
-        "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+  let lastError;
+  for (const base of DDG_ENDPOINTS) {
+    try {
+      const res = await proxyFetch(`${base}?q=${encoded}`, {
+        headers: { "User-Agent": DDG_UA }
+      });
+      if (!res.ok) {
+        lastError = new Error(`HTTP ${res.status} ${res.statusText}`);
+        continue;
       }
-    });
-  } catch (err) {
-    throw new Error(`Network error: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  if (!res.ok) {
-    return searchDuckDuckGoHtml(query2, maxResults);
+      const html = await res.text();
+      const results = base.includes("lite") ? parseDDGLite(html, maxResults) : parseDDGHtml(html, maxResults);
+      if (results.length > 0)
+        return results;
+      lastError = new Error(`Parsed 0 results from ${base}`);
+    } catch (err) {
+      lastError = err instanceof Error ? err : new Error(String(err));
+    }
   }
-  const html = await res.text();
-  return parseDDGLite(html, maxResults);
+  throw new Error(`Network error: ${lastError?.message ?? "all DuckDuckGo endpoints failed"}`);
 }
 function parseDDGLite(html, max) {
   const results = [];
@@ -41261,21 +41297,7 @@ function parseDDGLite(html, max) {
   }
   return results;
 }
-async function searchDuckDuckGoHtml(query2, maxResults) {
-  const encoded = encodeURIComponent(query2);
-  let res;
-  try {
-    res = await fetch(`https://html.duckduckgo.com/html/?q=${encoded}`, {
-      headers: {
-        "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
-      }
-    });
-  } catch (err) {
-    throw new Error(`Network error: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  if (!res.ok)
-    throw new Error(`HTTP ${res.status} ${res.statusText}`);
-  const html = await res.text();
+function parseDDGHtml(html, maxResults) {
   const results = [];
   const linkRegex = /<a[^>]+class="result__a"[^>]*href="([^"]*)"[^>]*>([\s\S]*?)<\/a>/g;
   const snippetRegex = /<a[^>]+class="result__snippet"[^>]*>([\s\S]*?)<\/a>/g;
@@ -41303,10 +41325,12 @@ async function searchDuckDuckGoHtml(query2, maxResults) {
 function stripHtml(html) {
   return html.replace(/<[^>]*>/g, "").replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&#x27;/g, "'").replace(/&#39;/g, "'").replace(/&nbsp;/g, " ").replace(/\s+/g, " ").trim();
 }
-var WebSearchTool;
+var SEARCH_TIMEOUT_MS, _dispatcher, WebSearchTool, DDG_UA, DDG_ENDPOINTS;
 var init_web_search = __esm({
   "../core/dist/tools/web-search.js"() {
     "use strict";
+    SEARCH_TIMEOUT_MS = 15e3;
+    _dispatcher = false;
     WebSearchTool = {
       name: "web_search",
       description: "Search the web for real-time information. Returns search result titles, snippets, and URLs. Use this when you need up-to-date information that might not be in your training data.",
@@ -41330,7 +41354,7 @@ var init_web_search = __esm({
         const backends = [
           { name: "Serper", fn: searchSerper },
           { name: "Brave", fn: searchBrave },
-          { name: "DuckDuckGo", fn: searchDuckDuckGoLite }
+          { name: "DuckDuckGo", fn: searchDuckDuckGo }
         ];
         const errors = [];
         for (const { name, fn } of backends) {
@@ -41345,13 +41369,27 @@ var init_web_search = __esm({
             errors.push({ backend: name, error: message });
           }
         }
+        const hasNetworkErr = errors.some((e) => e.error.includes("Network error") || e.error.includes("timed out"));
+        const hints = [];
+        if (hasNetworkErr && !hasProxy()) {
+          hints.push("All network requests failed and no HTTP proxy is configured. If you are behind a firewall or in a restricted network, set HTTPS_PROXY (e.g. export HTTPS_PROXY=http://127.0.0.1:7890).");
+        }
+        if (hasNetworkErr && hasProxy()) {
+          hints.push(`HTTP proxy is configured (${process.env["HTTPS_PROXY"] || process.env["HTTP_PROXY"] || process.env["https_proxy"] || process.env["http_proxy"]}), but network requests still failed. Verify the proxy is reachable and allows outbound HTTPS.`);
+        }
         return JSON.stringify({
           status: "error",
           error: "All search backends failed.",
-          details: errors
+          details: errors,
+          ...hints.length > 0 ? { hints } : {}
         });
       }
     };
+    DDG_UA = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36";
+    DDG_ENDPOINTS = [
+      "https://lite.duckduckgo.com/lite/",
+      "https://html.duckduckgo.com/html/"
+    ];
   }
 });
 
@@ -42914,6 +42952,18 @@ ${typeLabel}${item.payload.content}`;
         this.persistence?.updateStatus(item.id, "deferred", { deferredUntil: until });
         return item;
       }
+      /**
+       * Defer an item that has already been dequeued (not in the queue).
+       * Used when processing is interrupted (preempted) and the item should
+       * be resumed later.  Only updates persistence — does NOT re-insert
+       * into the in-memory queue (resurfaceDue handles that on the next idle cycle).
+       */
+      deferDequeued(item, until) {
+        item.status = "deferred";
+        item.deferredUntil = until;
+        item.startedAt = void 0;
+        this.persistence?.updateStatus(item.id, "deferred", { deferredUntil: until });
+      }
       /**
        * Mark an item as merged into another item.
        */
@@ -43155,7 +43205,7 @@ function detectAbnormalCompletion(reply, item) {
   const registry = MAILBOX_TYPE_REGISTRY[item.sourceType];
   if (!registry?.invokesLLM)
     return void 0;
-  if (reply === "[preempted]")
+  if (reply === "[preempted]" || reply === "[cancelled]")
     return void 0;
   const isUserFacing = item.sourceType === "human_chat" || item.sourceType === "a2a_message";
   if (isUserFacing)
@@ -43192,6 +43242,8 @@ var init_attention = __esm({
       triageToolHandlers;
       triageChatFn;
       lastTriageResult;
+      /** Tracks whether the last yield-point decision was 'cancel' vs 'preempt'. */
+      lastYieldDecision;
       unsubscribeNewItem;
       decisions = [];
       watchdogTimer;
@@ -43388,6 +43440,7 @@ var init_attention = __esm({
         this.interruptSignal = false;
         this.pendingInterruptItem = void 0;
         this.criticalInterruptResolve = void 0;
+        this.lastYieldDecision = void 0;
         this.processingStartedAt = Date.now();
         this.delegate?.onFocusChanged(item);
         let reply = void 0;
@@ -43422,6 +43475,27 @@ var init_attention = __esm({
         this.processingStartedAt = void 0;
         if (timedOut) {
           this.mailbox.requeue(item);
+        } else if (reply === "[cancelled]" || this.lastYieldDecision === "cancel") {
+          log14.info("Item cancelled \u2014 dropping permanently", {
+            agentId: this.agentId,
+            itemId: item.id,
+            type: item.sourceType
+          });
+          this.mailbox.complete(item.id);
+        } else if (reply === "[preempted]" || this.lastYieldDecision === "preempt") {
+          log14.info("Item preempted (paused) \u2014 deferring for later resumption", {
+            agentId: this.agentId,
+            itemId: item.id,
+            type: item.sourceType
+          });
+          this.mailbox.deferDequeued(item);
+        } else if (!this.running) {
+          log14.info("Agent stopped during processing \u2014 requeueing item", {
+            agentId: this.agentId,
+            itemId: item.id,
+            type: item.sourceType
+          });
+          this.mailbox.requeue(item);
         } else {
           const abnormalReason = detectAbnormalCompletion(reply, item);
           const retries = item.retryCount ?? 0;
@@ -43497,7 +43571,8 @@ var init_attention = __esm({
        *
        * Returns the decision type so the caller knows what to do:
        * - 'continue' → keep working on current task
-       * - 'preempt' → caller should save state and return; controller handles the switch
+       * - 'preempt' → caller should save state and return '[preempted]'; item is deferred for later resumption
+       * - 'cancel' → caller should abort and return '[cancelled]'; item is permanently dropped
        * - 'merge' → item was absorbed into current work (caller may inject into session)
        */
       async checkYieldPoint() {
@@ -43530,8 +43605,13 @@ var init_attention = __esm({
           return { decision: "defer", item: newItem, reasoning };
         }
         if (decisionType === "preempt") {
+          this.lastYieldDecision = "preempt";
           return { decision: "preempt", item: newItem, reasoning };
         }
+        if (decisionType === "cancel") {
+          this.lastYieldDecision = "cancel";
+          return { decision: "cancel", item: newItem, reasoning };
+        }
         return { decision: "continue", reasoning };
       }
       /**
@@ -43614,7 +43694,7 @@ var init_attention = __esm({
         try {
           const prompt = this.buildJudgePrompt(currentItem, newItem);
           const llmDecision = await this.llmJudge(prompt);
-          const validDecisions = ["continue", "preempt", "merge", "defer"];
+          const validDecisions = ["continue", "preempt", "cancel", "merge", "defer"];
           if (validDecisions.includes(llmDecision))
             return llmDecision;
         } catch (err) {
@@ -43629,17 +43709,29 @@ var init_attention = __esm({
         const recentDecs = this.decisions.slice(-5).map((d) => `- ${d.decisionType}: ${d.reasoning}`).join("\n");
         const queuedItems = this.mailbox.getQueuedItems();
         const queueSection = queuedItems.length > 0 ? queuedItems.map((i) => `  - [${i.sourceType}] p${i.priority}: "${i.payload.summary}"`).join("\n") : "  (empty)";
+        const currentContent = currentItem.payload.content?.slice(0, 500) ?? "";
+        const newContent = newItem.payload.content?.slice(0, 800) ?? "";
         return [
-          "You are deciding how to handle a new incoming item in your mailbox.",
-          "CRITICAL RULE: Human messages (human_chat) and human comments ALWAYS take priority over all other work.",
+          "You are deciding whether to INTERRUPT your current work to handle a new incoming message.",
+          "",
+          "RULES (in priority order):",
+          "1. Human messages (human_chat) ALWAYS preempt non-human work \u2014 users are top priority.",
+          '2. If the new message explicitly CANCELS or REVOKES the current work (e.g. "cancel that task",',
+          `   "don't publish this anymore", "delete the draft"), choose cancel \u2014 current work is permanently abandoned.`,
+          '3. If the new message asks to PAUSE or DELAY current work (e.g. "hold off for now",',
+          '   "wait before deploying", "pause that"), choose preempt \u2014 current work is saved and can be resumed later.',
+          "4. If the new message is about the SAME task/topic as current work and adds info, consider merge.",
+          "5. If the new message is lower priority and unrelated, continue current work.",
           "",
           `CURRENT FOCUS: [${currentItem.sourceType}] priority=${currentItem.priority}`,
-          `  "${currentItem.payload.summary}"`,
+          `  Summary: "${currentItem.payload.summary}"`,
           `  Task: ${currentItem.payload.taskId ?? "none"}`,
+          currentContent ? `  Content preview: ${currentContent}` : "",
           "",
           `NEW ITEM: [${newItem.sourceType}] priority=${newItem.priority}`,
-          `  "${newItem.payload.summary}"`,
+          `  Summary: "${newItem.payload.summary}"`,
           `  Task: ${newItem.payload.taskId ?? "none"}`,
+          newContent ? `  Content: ${newContent}` : "",
           "",
           `FULL QUEUE (${this.mailbox.depth} items):`,
           queueSection,
@@ -43647,7 +43739,14 @@ var init_attention = __esm({
           "RECENT DECISIONS:",
           recentDecs || "(none)",
           "",
-          "Choose exactly one: continue | preempt | merge | defer",
+          "DECISIONS:",
+          "- preempt: PAUSE current work (session saved for later resumption) and handle the new item",
+          "- cancel: PERMANENTLY STOP current work (session dropped, will NOT be resumed) and handle the new item",
+          "- merge: Inject new item into current session as additional context (no interruption)",
+          "- defer: Put the new item aside for later (no interruption)",
+          "- continue: Ignore the new item for now, keep working",
+          "",
+          "Choose exactly one: continue | preempt | cancel | merge | defer",
           "Reply with ONLY the decision word, nothing else."
         ].join("\n");
       }
@@ -45193,6 +45292,7 @@ ${notification.stdoutTail}`);
           });
         });
         const roleFilePath = join10(this.dataDir, "role", "ROLE.md");
+        const heartbeatFilePath = join10(this.dataDir, "role", "HEARTBEAT.md");
         this.toolHooks.register({
           name: "role-auto-reload",
           after: async (ctx) => {
@@ -45202,6 +45302,10 @@ ${notification.stdoutTail}`);
                 log17.info("Agent modified its own ROLE.md \u2014 reloading role definition");
                 this.reloadRole();
               }
+              if (targetPath === heartbeatFilePath || targetPath.endsWith("/role/HEARTBEAT.md")) {
+                log17.info("Agent modified its own HEARTBEAT.md \u2014 reloading heartbeat checklist");
+                this.reloadHeartbeat();
+              }
             }
           }
         });
@@ -45264,6 +45368,7 @@ ${notification.stdoutTail}`);
         log17.info(`Agent started: ${this.config.name}`);
       }
       async stop() {
+        this.cancelActiveStream();
         this.attentionController.stop();
         this.heartbeat.stop();
         this._bgCompletionUnsub?.();
@@ -45465,7 +45570,7 @@ ${notification.stdoutTail}`);
             }
           },
           evaluateInterrupt: async (currentItem, newItem) => {
-            return this.attentionController.heuristicDecision(currentItem, newItem);
+            return this.attentionController.evaluateWithLLMFallback(currentItem, newItem);
           },
           getTriageContext: async () => {
             const messages = this.currentSessionId ? this.memory.getRecentMessages(this.currentSessionId, TRIAGE_CONTEXT_MESSAGES_MAX * 2).filter((m) => m.role === "user" || m.role === "assistant").slice(-TRIAGE_CONTEXT_MESSAGES_MAX).map((m) => ({ role: m.role, content: typeof m.content === "string" ? m.content.slice(0, TRIAGE_CONTEXT_MSG_CHARS) : String(m.content).slice(0, TRIAGE_CONTEXT_MSG_CHARS) })) : [];
@@ -45561,7 +45666,7 @@ ${notification.stdoutTail}`);
             case "requirement_update": {
               if (extra.actionRequired) {
                 const reqId = item.payload.requirementId ?? "unknown";
-                const reply = await this.handleMessage(item.payload.content + markerSuffix, item.metadata?.senderId, senderInfo, buildHandleOpts({ sessionId: `comment_${reqId}_${ts}`, scenario: "comment_response" }));
+                const reply = await this.handleMessage(item.payload.content + markerSuffix, item.metadata?.senderId, senderInfo, buildHandleOpts({ sessionId: `requirement_${reqId}_${ts}`, scenario: "requirement_action" }));
                 resolveResponse(reply);
                 return reply;
               }
@@ -45710,6 +45815,25 @@ ${notification.stdoutTail}`);
           log17.warn(`Failed to reload role for agent ${this.config.name}`, { error: String(err) });
         }
       }
+      /**
+       * Reload the agent's heartbeat checklist from its HEARTBEAT.md file on disk.
+       * Called when the agent modifies its own HEARTBEAT.md via file_edit/file_write.
+       */
+      reloadHeartbeat() {
+        const heartbeatFile = join10(this.dataDir, "role", "HEARTBEAT.md");
+        if (!existsSync15(heartbeatFile))
+          return;
+        try {
+          const content = readFileSync10(heartbeatFile, "utf-8");
+          this.role = {
+            ...this.role,
+            heartbeatChecklist: content
+          };
+          log17.info(`Heartbeat checklist reloaded from disk for agent ${this.config.name}`);
+        } catch (err) {
+          log17.warn(`Failed to reload heartbeat for agent ${this.config.name}`, { error: String(err) });
+        }
+      }
       /**
        * Start a fresh conversation session, discarding the current in-memory session context.
        * Called when the user explicitly starts a "New Chat".
@@ -45776,6 +45900,7 @@ ${notification.stdoutTail}`);
         if (this.state.status === "offline")
           return;
         this.pauseReason = reason;
+        this.cancelActiveStream();
         this.heartbeat.stop();
         this.attentionController.stop();
         if (this.memoryConsolidationTimer) {
@@ -46606,10 +46731,11 @@ ${report}`);
         if (!this.state.currentActivity) {
           let actType = "chat";
           let actLabel;
+          const peerName = senderInfo?.name || senderId || void 0;
           switch (scenario) {
             case "a2a":
               actType = "a2a";
-              actLabel = `Chat from ${senderInfo?.name ?? senderId}`;
+              actLabel = peerName ? `Chat from ${peerName}` : "Agent Message";
               break;
             case "heartbeat":
               actType = "internal";
@@ -46617,14 +46743,14 @@ ${report}`);
               break;
             case "comment_response":
               actType = "chat";
-              actLabel = `Comment reply to ${senderInfo?.name ?? senderId ?? "user"}`;
+              actLabel = peerName ? `Comment reply to ${peerName}` : "Comment Reply";
               break;
             case "review":
               actType = "internal";
-              actLabel = `Reviewing task from ${senderInfo?.name ?? senderId ?? "worker"}`;
+              actLabel = peerName ? `Reviewing task from ${peerName}` : "Task Review";
               break;
             default:
-              actLabel = `Chat with ${senderInfo?.name ?? senderId ?? "user"}`;
+              actLabel = peerName ? `Chat with ${peerName}` : "Human Chat";
               break;
           }
           chatActivityId = this.startActivity(actType, actLabel);
@@ -46867,13 +46993,14 @@ ${block}
               }
             }
             const chatYield = await this.checkAttentionYieldPoint();
-            if (chatYield.decision === "preempt" && isPreemptable) {
-              log17.info("handleMessage preempted by higher-priority item", {
+            if ((chatYield.decision === "preempt" || chatYield.decision === "cancel") && isPreemptable) {
+              const marker = chatYield.decision === "cancel" ? "[cancelled]" : "[preempted]";
+              log17.info(`handleMessage ${chatYield.decision} by higher-priority item`, {
                 agentId: this.id,
                 scenario,
                 preemptedBy: chatYield.item?.sourceType
               });
-              return "[preempted]";
+              return marker;
             }
             if (chatYield.decision === "merge" && chatYield.item) {
               const mergeMsg = `[LIVE UPDATE] ${chatYield.item.payload.summary}
@@ -47054,6 +47181,7 @@ ${chatYield.item.payload.content}`;
           this.checkDailyTokenBudget();
           const llmStart = Date.now();
           let response = await this.withNetworkRetry(() => this.llmRouter.chatStream({ messages, tools: llmTools.length > 0 ? llmTools : void 0, metadata: this.getLLMMetadata(this.currentSessionId), compaction: useCompaction }, wrappedOnEvent, this.getEffectiveProvider(), abortController.signal), "Stream LLM call");
+          streamMarkerDelta.flush();
           const tokensThisCall = response.usage.inputTokens + response.usage.outputTokens;
           this.updateTokensUsed(tokensThisCall);
           this.calibrateTokenCounter(response.usage.inputTokens);
@@ -47204,6 +47332,7 @@ ${chatYield.item.payload.content}`;
             }
             const llmStart2 = Date.now();
             response = await this.withNetworkRetry(() => this.llmRouter.chatStream({ messages: updatedMessages, tools: llmTools.length > 0 ? llmTools : void 0, metadata: this.getLLMMetadata(this.currentSessionId), compaction: useCompaction }, wrappedOnEvent, this.getEffectiveProvider(), abortController.signal), "Stream LLM continuation");
+            streamMarkerDelta.flush();
             const tokens2 = response.usage.inputTokens + response.usage.outputTokens;
             this.updateTokensUsed(tokens2);
             this.calibrateTokenCounter(response.usage.inputTokens);
@@ -47610,14 +47739,16 @@ ${chatYield.item.payload.content}`;
             }
             this.flushPendingInjections(sessionId);
             const yieldResult = await this.checkAttentionYieldPoint();
-            if (yieldResult.decision === "preempt") {
-              emit("status", "preempted", {
+            if (yieldResult.decision === "preempt" || yieldResult.decision === "cancel") {
+              const statusLabel = yieldResult.decision === "cancel" ? "cancelled" : "preempted";
+              emit("status", statusLabel, {
                 reason: yieldResult.reasoning,
                 preemptedBy: yieldResult.item?.sourceType
               });
-              log17.info("Task preempted by higher-priority mailbox item", {
+              log17.info(`Task ${statusLabel} by higher-priority mailbox item`, {
                 taskId: taskId2,
                 agentId: this.id,
+                decision: yieldResult.decision,
                 preemptedBy: yieldResult.item?.sourceType,
                 reasoning: yieldResult.reasoning?.slice(0, 120)
               });
@@ -48627,6 +48758,10 @@ ${todayLog.slice(0, HEARTBEAT_DAILY_LOG_CHARS)}
           '- Check existing skills first: `discover_tools({ mode: "list_skills" })` and `builder_list`.',
           "- To update an existing skill: edit files in `~/.markus/builder-artifacts/skills/{name}/`, bump version, re-install with `builder_install`.",
           "",
+          "**Direct self-evolution** (simplest and most impactful):",
+          "- **Update ROLE.md** \u2014 When you discover a behavioral rule, working style, or guiding principle that should always apply, append it to your ROLE.md via `file_edit`. ROLE.md is loaded into every conversation, so changes take effect immediately. Read first, then append. No need to accumulate 3 insights \u2014 even a single validated lesson can warrant a role update if it is fundamental.",
+          "- **Update HEARTBEAT.md** \u2014 When you realize your patrol routine should include a new recurring check (or remove an obsolete one), modify your HEARTBEAT.md via `file_edit`. This is your personal checklist \u2014 customize it to match your actual responsibilities. Changes take effect at the next heartbeat.",
+          "",
           "**Decision guide \u2014 where does this insight go?**",
           "| Observation type | Action |",
           "|---|---|",
@@ -48634,7 +48769,8 @@ ${todayLog.slice(0, HEARTBEAT_DAILY_LOG_CHARS)}
           '| Tool tip or preference | `memory_save` with tags: `["insight", "tool:<name>"]` |',
           '| Multi-step repeatable workflow | `memory_update_longterm({ section: "procedures", mode: "patch" })` |',
           "| Practice worth sharing with the team | Create skill via **skill-building**, then install with `builder_install` |",
-          "| 3+ related insights \u2192 behavioral rule | Update ROLE.md (read first, append, log change) |",
+          "| Behavioral rule or guiding principle | Update ROLE.md (`file_read` \u2192 `file_edit` to append) |",
+          "| New recurring check for your patrol | Update HEARTBEAT.md (`file_read` \u2192 `file_edit`) |",
           "",
           "Quality bar: Only record insights that are **specific**, **actionable**, and **non-obvious**.",
           "Skip if nothing meaningful happened since last heartbeat."
@@ -48662,7 +48798,8 @@ ${todayLog.slice(0, HEARTBEAT_DAILY_LOG_CHARS)}
           "- Tasks with `executionRound > 1` required revision \u2014 your initial approach had issues.",
           "- A high revision rate (>30%) suggests your knowledge is not being applied effectively.",
           "- Check: does your MEMORY.md knowledge actually cover the failure patterns you see?",
-          "- If you keep making the same type of mistake, escalate: save as insight \u2192 add to MEMORY.md \u2192 update ROLE.md."
+          "- If you keep making the same type of mistake, escalate: save as insight \u2192 add to MEMORY.md \u2192 update ROLE.md or HEARTBEAT.md.",
+          "- Consider: would a ROLE.md rule or a HEARTBEAT.md check have prevented any recent failures?"
         ].join("\n");
         const prompt = [
           "[HEARTBEAT CHECK-IN]",
@@ -50326,6 +50463,67 @@ function createA2ATools(ctx) {
           return JSON.stringify({ status: "error", error: String(err) });
         }
       }
+    }] : [],
+    ...ctx.getChannelMessages ? [{
+      name: "recall_context",
+      description: [
+        "Recall historical context you may need to respond effectively.",
+        "Use this BEFORE responding when the provided context is insufficient.",
+        "",
+        "Supported scopes:",
+        '\u2022 "channel" \u2014 Read chat messages from a group chat or DM channel. Requires channel_key.',
+        "  Use when you joined a discussion late, were @mentioned, or need to understand prior conversation.",
+        "",
+        "For other context types, use these existing tools instead:",
+        "\u2022 task_get \u2014 Full task details including all comments (scope=task context)",
+        "\u2022 requirement_get \u2014 Full requirement details including all comments (scope=requirement context)",
+        "\u2022 recall_activity \u2014 Your own execution history, activity logs, and past work (scope=your activities)",
+        "\u2022 memory_search \u2014 Your saved memories and notes (scope=personal knowledge)"
+      ].join("\n"),
+      inputSchema: {
+        type: "object",
+        properties: {
+          scope: {
+            type: "string",
+            enum: ["channel"],
+            description: 'Type of context to recall. Currently: "channel" for chat/group messages.'
+          },
+          channel_key: {
+            type: "string",
+            description: 'Required when scope="channel". The channel key (e.g., "group:<teamId>" for team chats, "dm:<id1>_<id2>" for DMs).'
+          },
+          limit: { type: "number", description: "Number of items to fetch (default 30, max 50)." },
+          before: { type: "string", description: "ISO timestamp \u2014 fetch items older than this for pagination. Omit for most recent." }
+        },
+        required: ["scope"]
+      },
+      async execute(args) {
+        const scope = args["scope"];
+        if (scope === "channel") {
+          const channelKey = args["channel_key"];
+          if (!channelKey) {
+            return JSON.stringify({ status: "error", error: 'channel_key is required when scope="channel"' });
+          }
+          const limit = Math.min(args["limit"] ?? 30, 50);
+          const before2 = args["before"];
+          try {
+            const result = await ctx.getChannelMessages(channelKey, limit, before2);
+            const formatted = result.messages.map((m) => `[${m.createdAt}] ${m.senderType === "agent" ? `[agent] ${m.senderName}` : `[human] ${m.senderName}`}: ${m.text.slice(0, 500)}`);
+            return JSON.stringify({
+              messages: formatted,
+              count: result.messages.length,
+              hasMore: result.hasMore,
+              oldestTimestamp: result.messages[0]?.createdAt
+            });
+          } catch (err) {
+            return JSON.stringify({ status: "error", error: String(err) });
+          }
+        }
+        return JSON.stringify({
+          status: "error",
+          error: `Unknown scope: "${scope}". Use "channel" for chat messages, or use task_get / requirement_get / recall_activity for other context.`
+        });
+      }
     }] : []
   ];
 }
@@ -52842,7 +53040,7 @@ var init_dist3 = __esm({
 
 // ../core/dist/agent-manager.js
 import { join as join13 } from "node:path";
-import { mkdirSync as mkdirSync12, readFileSync as readFileSync13, existsSync as existsSync18, copyFileSync, rmSync, readdirSync as readdirSync4 } from "node:fs";
+import { mkdirSync as mkdirSync12, readFileSync as readFileSync13, existsSync as existsSync18, copyFileSync, rmSync, readdirSync as readdirSync4, writeFileSync as writeFileSync11 } from "node:fs";
 import { homedir as homedir6 } from "node:os";
 function resolveCurrentTaskId(agentObj, ts, agentId2) {
   const activeTasks = agentObj?.getActiveTasks?.() ?? [];
@@ -53209,24 +53407,50 @@ Priority: ${delegation.priority}`, envelope.from, { name: envelope.from, role: "
         if (!request.name?.trim())
           throw new Error("Agent name is required");
         const id = agentId();
-        const role = this.roleLoader.loadRole(request.roleName);
+        const roleName = request.roleName || "custom";
+        const isCustomRole = roleName === "custom";
+        const role = isCustomRole ? {
+          id: generateId("role"),
+          name: request.name,
+          description: "",
+          category: "custom",
+          systemPrompt: `# ${request.name}
+
+You are ${request.name}.`,
+          defaultSkills: [],
+          heartbeatChecklist: "",
+          defaultPolicies: [],
+          builtIn: false
+        } : this.roleLoader.loadRole(roleName);
         const agentDataDir = join13(this.dataDir, id);
         mkdirSync12(agentDataDir, { recursive: true });
         const agentRoleDir = join13(agentDataDir, "role");
         mkdirSync12(agentRoleDir, { recursive: true });
-        const templateDir = this.roleLoader.resolveTemplateDir(request.roleName);
-        if (templateDir) {
-          for (const file of ["ROLE.md", "HEARTBEAT.md", "POLICIES.md", "CONTEXT.md"]) {
-            const src = join13(templateDir, file);
-            if (existsSync18(src))
-              copyFileSync(src, join13(agentRoleDir, file));
+        if (!isCustomRole && !request.skipTemplateCopy) {
+          const templateDir = this.roleLoader.resolveTemplateDir(roleName);
+          if (templateDir) {
+            for (const file of ["ROLE.md", "HEARTBEAT.md", "POLICIES.md", "CONTEXT.md"]) {
+              const src = join13(templateDir, file);
+              if (existsSync18(src))
+                copyFileSync(src, join13(agentRoleDir, file));
+            }
           }
         }
+        const heartbeatPath = join13(agentRoleDir, "HEARTBEAT.md");
+        if (!existsSync18(heartbeatPath)) {
+          writeFileSync11(heartbeatPath, [
+            "# Heartbeat Checklist",
+            "",
+            "- [ ] Check mailbox for new messages and respond to urgent items",
+            "- [ ] Review assigned tasks \u2014 update progress, unblock if possible",
+            "- [ ] Check team announcements for new information",
+            "- [ ] Scan recent channel messages for anything requiring attention"
+          ].join("\n"), "utf-8");
+        }
         const config = {
           id,
           name: request.name,
-          // Store the template folder name so agents can be restored on restart
-          roleId: request.roleName,
+          roleId: roleName,
           orgId: request.orgId ?? "default",
           teamId: request.teamId,
           agentRole: request.agentRole ?? "worker",
@@ -53388,7 +53612,8 @@ Priority: ${delegation.priority}`, envelope.from, { name: envelope.from, role: "
           ...this.groupChatHandlers ? {
             sendGroupMessage: this.groupChatHandlers.sendGroupMessage,
             createGroupChat: (name, memberIds) => this.groupChatHandlers.createGroupChat(name, id, config.name, memberIds),
-            listGroupChats: this.groupChatHandlers.listGroupChats
+            listGroupChats: this.groupChatHandlers.listGroupChats,
+            getChannelMessages: this.groupChatHandlers.getChannelMessages
           } : {}
         };
         for (const tool of createA2ATools(a2aContext))
@@ -53742,6 +53967,20 @@ Known issues: ${knownIssues}` : ""}`
         let role;
         if (existsSync18(join13(agentRoleDir, "ROLE.md"))) {
           role = this.roleLoader.loadRole(agentRoleDir);
+        } else if (row.roleId === "custom") {
+          role = {
+            id: generateId("role"),
+            name: row.name,
+            description: "",
+            category: "custom",
+            systemPrompt: `# ${row.name}
+
+You are ${row.name}.`,
+            defaultSkills: [],
+            heartbeatChecklist: "",
+            defaultPolicies: [],
+            builtIn: false
+          };
         } else {
           role = (() => {
             try {
@@ -53947,7 +54186,8 @@ Known issues: ${knownIssues}` : ""}`
           ...this.groupChatHandlers ? {
             sendGroupMessage: this.groupChatHandlers.sendGroupMessage,
             createGroupChat: (name, memberIds) => this.groupChatHandlers.createGroupChat(name, id, config.name, memberIds),
-            listGroupChats: this.groupChatHandlers.listGroupChats
+            listGroupChats: this.groupChatHandlers.listGroupChats,
+            getChannelMessages: this.groupChatHandlers.getChannelMessages
           } : {}
         };
         for (const tool of createA2ATools(a2aCtx))
@@ -55884,7 +56124,7 @@ var init_ollama = __esm({
 });
 
 // ../core/dist/llm/auth-profiles.js
-import { readFileSync as readFileSync14, writeFileSync as writeFileSync11, mkdirSync as mkdirSync13, existsSync as existsSync19, unlinkSync as unlinkSync2 } from "node:fs";
+import { readFileSync as readFileSync14, writeFileSync as writeFileSync12, mkdirSync as mkdirSync13, existsSync as existsSync19, unlinkSync as unlinkSync2 } from "node:fs";
 import { join as join14 } from "node:path";
 import { homedir as homedir7 } from "node:os";
 var log34, AuthProfileStore;
@@ -55915,7 +56155,7 @@ var init_auth_profiles = __esm({
         }
       }
       write(data) {
-        writeFileSync11(this.filePath, JSON.stringify(data, null, 2) + "\n", { mode: 384 });
+        writeFileSync12(this.filePath, JSON.stringify(data, null, 2) + "\n", { mode: 384 });
       }
       /**
        * Acquire a simple filesystem lock for atomic profile updates (token refresh).
@@ -55924,7 +56164,7 @@ var init_auth_profiles = __esm({
       acquireLock() {
         const lockContent = `${process.pid}-${Date.now()}`;
         try {
-          writeFileSync11(this.lockPath, lockContent, { flag: "wx" });
+          writeFileSync12(this.lockPath, lockContent, { flag: "wx" });
           return () => {
             try {
               unlinkSync2(this.lockPath);
@@ -55936,7 +56176,7 @@ var init_auth_profiles = __esm({
             const existing = readFileSync14(this.lockPath, "utf-8");
             const ts = Number(existing.split("-").pop());
             if (Date.now() - ts > 3e4) {
-              writeFileSync11(this.lockPath, lockContent, { mode: 384 });
+              writeFileSync12(this.lockPath, lockContent, { mode: 384 });
               return () => {
                 try {
                   unlinkSync2(this.lockPath);
@@ -58049,7 +58289,7 @@ var init_registry = __esm({
       skills = /* @__PURE__ */ new Map();
       aliases = /* @__PURE__ */ new Map();
       static normalize(s) {
-        return s.toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "");
+        return kebab(s);
       }
       register(skill) {
         const name = skill.manifest.name;
@@ -59286,7 +59526,7 @@ var init_dist4 = __esm({
 });
 
 // ../org-manager/dist/org-service.js
-import { mkdirSync as mkdirSync15, writeFileSync as writeFileSync12, existsSync as existsSync23, rmSync as rmSync2 } from "node:fs";
+import { mkdirSync as mkdirSync15, writeFileSync as writeFileSync13, existsSync as existsSync23, rmSync as rmSync2 } from "node:fs";
 import { join as join19 } from "node:path";
 import { homedir as homedir10 } from "node:os";
 var log50, OrganizationService;
@@ -59420,15 +59660,15 @@ var init_org_service = __esm({
         mkdirSync15(dir, { recursive: true });
         const annPath = join19(dir, "ANNOUNCEMENT.md");
         if (announcements) {
-          writeFileSync12(annPath, announcements, "utf-8");
+          writeFileSync13(annPath, announcements, "utf-8");
         } else if (!existsSync23(annPath)) {
-          writeFileSync12(annPath, "", "utf-8");
+          writeFileSync13(annPath, "", "utf-8");
         }
         const normsPath = join19(dir, "NORMS.md");
         if (norms) {
-          writeFileSync12(normsPath, norms, "utf-8");
+          writeFileSync13(normsPath, norms, "utf-8");
         } else if (!existsSync23(normsPath)) {
-          writeFileSync12(normsPath, "", "utf-8");
+          writeFileSync13(normsPath, "", "utf-8");
         }
       }
       async createTeam(orgId2, name, description) {
@@ -59794,15 +60034,17 @@ var init_org_service = __esm({
           }
         }
         this.refreshIdentityContextsForOrg(request.orgId);
-        try {
-          await this.agentManager.startAgent(agent.id);
-          log50.info(`Agent onboarded: ${request.name} (auto-started)`, {
-            orgId: request.orgId,
-            agentId: agent.id,
-            agentRole: request.agentRole ?? "worker"
-          });
-        } catch (error) {
-          log50.warn(`Agent created but auto-start failed: ${request.name}`, { error: String(error) });
+        if (!request.skipAutoStart) {
+          try {
+            await this.agentManager.startAgent(agent.id);
+            log50.info(`Agent onboarded: ${request.name} (auto-started)`, {
+              orgId: request.orgId,
+              agentId: agent.id,
+              agentRole: request.agentRole ?? "worker"
+            });
+          } catch (error) {
+            log50.warn(`Agent created but auto-start failed: ${request.name}`, { error: String(error) });
+          }
         }
         return agent;
       }
@@ -60125,9 +60367,9 @@ var init_org_service = __esm({
         const roleNames = this.listAvailableRoles();
         if (roleNames.length > 0) {
           parts.push("");
-          parts.push("## Available Role Templates (live from system)");
+          parts.push("## Built-in Role Templates (for reference only)");
           parts.push("");
-          parts.push("The `roleName` field must be one of:");
+          parts.push("These templates are available for reading as **reference** when writing custom ROLE.md files. You do NOT need to set `roleName` \u2014 the agent's identity is fully defined by its ROLE.md.");
           parts.push("");
           for (const r of roleNames) {
             parts.push(`- \`${r}\``);
@@ -60135,9 +60377,9 @@ var init_org_service = __esm({
           const templateDirs = this.roleLoader.getTemplateDirs();
           if (templateDirs.length > 0) {
             parts.push("");
-            parts.push("**Tip**: You can read existing role templates for reference when writing custom ROLE.md files.");
+            parts.push("**Tip**: Read existing templates for inspiration when writing custom ROLE.md files.");
             parts.push(`Use \`file_read\` to inspect any template, e.g.: \`file_read("${templateDirs[0]}/developer/ROLE.md")\``);
-            parts.push("This is especially useful for understanding the level of detail and workflow guidance expected in a good ROLE.md.");
+            parts.push("This is useful for understanding the level of detail and workflow guidance expected in a good ROLE.md.");
           }
         }
         parts.push("");
@@ -60162,7 +60404,7 @@ var init_org_service = __esm({
 });
 
 // ../org-manager/dist/task-service.js
-import { mkdirSync as mkdirSync16, writeFileSync as writeFileSync13, readFileSync as readFileSync18, existsSync as existsSync24, cpSync } from "node:fs";
+import { mkdirSync as mkdirSync16, writeFileSync as writeFileSync14, readFileSync as readFileSync18, existsSync as existsSync24, cpSync } from "node:fs";
 import { join as join20, resolve as resolve12 } from "node:path";
 import { homedir as homedir11 } from "node:os";
 function formatLocalTimestamp(d = /* @__PURE__ */ new Date()) {
@@ -60515,7 +60757,7 @@ var init_task_service = __esm({
         mkdirSync16(join20(dir, "knowledge"), { recursive: true });
         const userMdPath = join20(dir, "USER.md");
         if (!existsSync24(userMdPath)) {
-          writeFileSync13(userMdPath, [
+          writeFileSync14(userMdPath, [
             "# About the Owner",
             "",
             "- Name:",
@@ -62581,7 +62823,7 @@ Action: ${guidance}` : ""
             testResults: d.testResults
           }))
         };
-        writeFileSync13(join20(taskSharedDir, "manifest.json"), JSON.stringify(manifest, null, 2));
+        writeFileSync14(join20(taskSharedDir, "manifest.json"), JSON.stringify(manifest, null, 2));
         for (const d of deliverables) {
           if (d.type === "file" && d.reference) {
             const src = resolve12(d.reference);
@@ -62596,7 +62838,7 @@ Action: ${guidance}` : ""
           }
           if (d.type === "file" && d.summary && !existsSync24(d.reference)) {
             const safeName = d.reference.replace(/[^a-zA-Z0-9._-]/g, "_").slice(0, 80);
-            writeFileSync13(join20(taskSharedDir, `${safeName}.md`), d.summary);
+            writeFileSync14(join20(taskSharedDir, `${safeName}.md`), d.summary);
           }
         }
         log51.info("Deliverables published to shared workspace", { taskId: task.id, dir: taskSharedDir });
@@ -62714,7 +62956,11 @@ Action: ${guidance}` : ""
           "",
           'Save each lesson using `memory_save` with tags `["lesson", ...]`.',
           'If it is a repeatable multi-step procedure, promote to SOP via `memory_update_longterm({ section: "sops", mode: "patch" })`.',
-          "If the best practice would benefit other agents on the team, create a shareable skill via **skill-building** and install it with `builder_install`."
+          "If the best practice would benefit other agents on the team, create a shareable skill via **skill-building** and install it with `builder_install`.",
+          "",
+          "**Direct self-evolution** \u2014 consider the simplest, most impactful options:",
+          "- If this lesson reveals a behavioral rule that should always guide your work, append it to your ROLE.md via `file_edit`.",
+          "- If you should be checking for this class of issue regularly, add a check to your HEARTBEAT.md via `file_edit`."
         ].join("\n") : [
           "[SELF-EVOLUTION \u2014 Post-Task Reflection (Success)]",
           "",
@@ -62731,6 +62977,11 @@ Action: ${guidance}` : ""
           'If you identify a meaningful insight, save it using `memory_save` with tags `["lesson", "best-practice", ...]`.',
           'If it is a multi-step workflow, promote to SOP via `memory_update_longterm({ section: "sops", mode: "patch" })`.',
           "If worth sharing with the team, create a skill via **skill-building** and install with `builder_install`.",
+          "",
+          "**Direct self-evolution** \u2014 consider the simplest, most impactful options:",
+          "- If this success reveals a guiding principle or working style worth keeping, append it to your ROLE.md via `file_edit`.",
+          "- If there is a periodic check that would help maintain this quality, add it to your HEARTBEAT.md via `file_edit`.",
+          "",
           "If nothing noteworthy stands out, it is fine to skip saving."
         ].join("\n");
         void agent.sendMessage(prompt, void 0, void 0, {
@@ -63413,7 +63664,7 @@ ${task.description}`;
 
 // ../org-manager/dist/builder-service.js
 import { join as join21 } from "node:path";
-import { readdirSync as readdirSync8, readFileSync as readFileSync19, existsSync as existsSync25, writeFileSync as writeFileSync14, mkdirSync as mkdirSync17, copyFileSync as copyFileSync2, statSync as statSync4 } from "node:fs";
+import { readdirSync as readdirSync8, readFileSync as readFileSync19, existsSync as existsSync25, writeFileSync as writeFileSync15, mkdirSync as mkdirSync17, copyFileSync as copyFileSync2, statSync as statSync4, cpSync as cpSync2 } from "node:fs";
 import { homedir as homedir12 } from "node:os";
 var log52, FS_HELPER, BuilderService;
 var init_builder_service = __esm({
@@ -63497,17 +63748,17 @@ var init_builder_service = __esm({
       async installAgent(artDir, manifest, mfName, artifactName) {
         const agentManager = this.orgService.getAgentManager();
         const agentName = manifest.displayName ?? manifest.name ?? artifactName;
-        const knownRoles = this.orgService.listAvailableRoles();
-        const requestedRole = manifest.agent?.roleName ?? "developer";
-        const roleName = knownRoles.includes(requestedRole) ? requestedRole : "developer";
+        const hasCustomRole = existsSync25(join21(artDir, "ROLE.md"));
         const skills = manifest.dependencies?.skills ?? [];
         const agentRole = manifest.agent?.agentRole ?? "worker";
         const agent = await this.orgService.hireAgent({
           name: agentName,
-          roleName,
+          roleName: manifest.agent?.roleName || (hasCustomRole ? "custom" : "developer"),
           orgId: "default",
           agentRole,
-          skills
+          skills,
+          skipAutoStart: true,
+          skipTemplateCopy: hasCustomRole
         });
         const agentRoleDir = join21(agentManager.getDataDir(), agent.id, "role");
         mkdirSync17(agentRoleDir, { recursive: true });
@@ -63519,7 +63770,7 @@ var init_builder_service = __esm({
             copyFileSync2(srcFile, join21(agentRoleDir, fname));
           }
         }
-        writeFileSync14(join21(agentRoleDir, ".role-origin.json"), JSON.stringify({ customRole: true, source: "builder-artifact", artifact: artifactName, artifactType: "agent" }));
+        writeFileSync15(join21(agentRoleDir, ".role-origin.json"), JSON.stringify({ customRole: true, source: "builder-artifact", artifact: artifactName, artifactType: "agent" }));
         agent.reloadRole();
         await agentManager.startAgent(agent.id);
         return {
@@ -63547,38 +63798,42 @@ var init_builder_service = __esm({
         const norms = existsSync25(normsPath) ? readFileSync19(normsPath, "utf-8") : "";
         this.orgService.ensureTeamDataDir(team.id, announcements, norms);
         const members = manifest.team?.members ?? [];
-        const knownRoles = this.orgService.listAvailableRoles();
         const createdAgents = [];
+        const usedMemberDirs = /* @__PURE__ */ new Set();
         for (const member of members) {
           const count = member.count ?? 1;
           const memberRole = member.role ?? "worker";
           const memberName = member.name ?? "Agent";
-          const roleName = knownRoles.includes(member.roleName) ? member.roleName : "developer";
           const memberSkills = member.skills ?? [];
-          const memberSlug = memberName.toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "");
-          const memberFilesDir = join21(artDir, "members", memberSlug);
+          const memberFilesDir = this.findMemberDir(artDir, memberName, usedMemberDirs);
+          const hasCustomRole = !!memberFilesDir && existsSync25(join21(memberFilesDir, "ROLE.md"));
+          if (memberFilesDir)
+            usedMemberDirs.add(memberFilesDir);
+          log52.info("installTeam: member lookup", { memberName, memberFilesDir, hasCustomRole });
           for (let i = 0; i < count; i++) {
             const displayName = count > 1 ? `${memberName} ${i + 1}` : memberName;
             const agent = await this.orgService.hireAgent({
               name: displayName,
-              roleName,
+              roleName: member.roleName || (hasCustomRole ? "custom" : "developer"),
               orgId: "default",
               teamId: team.id,
               agentRole: memberRole,
-              skills: memberSkills.length > 0 ? memberSkills : void 0
+              skills: memberSkills.length > 0 ? memberSkills : void 0,
+              skipAutoStart: true,
+              skipTemplateCopy: hasCustomRole
             });
             const agentRoleDir = join21(agentManager.getDataDir(), agent.id, "role");
             mkdirSync17(agentRoleDir, { recursive: true });
-            if (existsSync25(memberFilesDir)) {
+            if (memberFilesDir && existsSync25(memberFilesDir)) {
               for (const fname of readdirSync8(memberFilesDir)) {
                 const srcFile = join21(memberFilesDir, fname);
                 if (statSync4(srcFile).isFile()) {
                   copyFileSync2(srcFile, join21(agentRoleDir, fname));
                 }
               }
-              agent.reloadRole();
             }
-            writeFileSync14(join21(agentRoleDir, ".role-origin.json"), JSON.stringify({ customRole: true, source: "builder-artifact", artifact: artifactName, artifactType: "team" }));
+            writeFileSync15(join21(agentRoleDir, ".role-origin.json"), JSON.stringify({ customRole: true, source: "builder-artifact", artifact: artifactName, artifactType: "team" }));
+            agent.reloadRole();
             if (memberRole === "manager") {
               await this.orgService.updateTeam(team.id, { managerId: agent.id, managerType: "agent" });
             }
@@ -63591,13 +63846,56 @@ var init_builder_service = __esm({
           installed: { team: { id: team.id, name: teamName }, agents: createdAgents }
         };
       }
+      /**
+       * Find the member directory under artDir/members/ by trying multiple slug strategies.
+       * Returns the absolute path to the member directory, or null if not found.
+       */
+      findMemberDir(artDir, memberName, usedDirs) {
+        const membersBase = join21(artDir, "members");
+        if (!existsSync25(membersBase))
+          return null;
+        const slug = kebab(memberName, "agent");
+        const exact = join21(membersBase, slug);
+        if (existsSync25(exact) && !usedDirs.has(exact))
+          return exact;
+        try {
+          for (const entry of readdirSync8(membersBase, { withFileTypes: true })) {
+            if (!entry.isDirectory())
+              continue;
+            const candidateDir = join21(membersBase, entry.name);
+            if (usedDirs.has(candidateDir))
+              continue;
+            const rolePath = join21(candidateDir, "ROLE.md");
+            if (!existsSync25(rolePath))
+              continue;
+            try {
+              const content = readFileSync19(rolePath, "utf-8");
+              const title = content.match(/^#\s+(.+)$/m)?.[1]?.trim();
+              if (title && title.toLowerCase() === memberName.toLowerCase())
+                return candidateDir;
+            } catch {
+            }
+          }
+        } catch {
+        }
+        try {
+          const remaining = readdirSync8(membersBase, { withFileTypes: true }).filter((e) => e.isDirectory() && !usedDirs.has(join21(membersBase, e.name)));
+          if (remaining.length === 1)
+            return join21(membersBase, remaining[0].name);
+        } catch {
+        }
+        return null;
+      }
       async installSkill(artDir, manifest, artifactName) {
         const skillDir = join21(homedir12(), ".markus", "skills", artifactName);
         mkdirSync17(skillDir, { recursive: true });
         for (const fname of readdirSync8(artDir)) {
           const srcFile = join21(artDir, fname);
+          const destFile = join21(skillDir, fname);
           if (statSync4(srcFile).isFile()) {
-            copyFileSync2(srcFile, join21(skillDir, fname));
+            copyFileSync2(srcFile, destFile);
+          } else if (statSync4(srcFile).isDirectory()) {
+            cpSync2(srcFile, destFile, { recursive: true });
           }
         }
         if (this.skillRegistry) {
@@ -64249,23 +64547,6 @@ var init_sse_handler = __esm({
             this.sseBuffer.sendProgress(this.processedTokens, this.totalTokens, `\u5DE5\u5177\u6267\u884C\u5B8C\u6210: ${event.tool}`);
           }
         } else if (event.type === "message_end") {
-          const now2 = (/* @__PURE__ */ new Date()).toISOString();
-          let turnThinking;
-          if (this.thinkingBuf) {
-            this.sseBuffer.send({ type: "thinking_commit", thinking: this.thinkingBuf, createdAt: now2 });
-            turnThinking = this.thinkingBuf;
-            this.thinkingBuf = "";
-          }
-          if (this.textBuf) {
-            this.sseBuffer.send({ type: "text_commit", text: this.textBuf, createdAt: now2 });
-            const seg2 = { type: "text", content: this.textBuf, createdAt: now2 };
-            if (turnThinking)
-              seg2.thinking = turnThinking;
-            this.msgSegments.push(seg2);
-            this.textBuf = "";
-          } else if (turnThinking) {
-            this.msgSegments.push({ type: "text", content: "", thinking: turnThinking, createdAt: now2 });
-          }
           if (event.usage?.outputTokens) {
             this.totalTokens = Math.max(this.totalTokens, event.usage.outputTokens);
             this.processedTokens = event.usage.outputTokens;
@@ -64339,7 +64620,7 @@ var init_sse_handler = __esm({
 
 // ../org-manager/dist/skill-service.js
 import { join as join22, resolve as resolve13 } from "node:path";
-import { existsSync as existsSync26, writeFileSync as writeFileSync15, mkdirSync as mkdirSync18, readFileSync as readFileSync20, readdirSync as readdirSync9, copyFileSync as copyFileSync3 } from "node:fs";
+import { existsSync as existsSync26, writeFileSync as writeFileSync16, mkdirSync as mkdirSync18, readFileSync as readFileSync20, readdirSync as readdirSync9, copyFileSync as copyFileSync3 } from "node:fs";
 import { homedir as homedir13 } from "node:os";
 import { execSync as execSync2 } from "node:child_process";
 async function searchSkillHub(query2) {
@@ -64490,7 +64771,7 @@ async function installSkill(request, skillRegistry) {
       if (zipResp.ok) {
         const tmpZip = join22(skillsDir, `_tmp_${safeName}.zip`);
         const buffer = Buffer.from(await zipResp.arrayBuffer());
-        writeFileSync15(tmpZip, buffer);
+        writeFileSync16(tmpZip, buffer);
         mkdirSync18(targetDir, { recursive: true });
         try {
           execSync2(`unzip -o "${tmpZip}" -d "${targetDir}"`, { timeout: 3e4 });
@@ -64516,7 +64797,7 @@ async function installSkill(request, skillRegistry) {
       const mdResp = await fetch(skillMdUrl, { signal: AbortSignal.timeout(15e3) });
       if (mdResp.ok) {
         mkdirSync18(targetDir, { recursive: true });
-        writeFileSync15(join22(targetDir, "SKILL.md"), await mdResp.text(), "utf-8");
+        writeFileSync16(join22(targetDir, "SKILL.md"), await mdResp.text(), "utf-8");
         installed = true;
         installMethod = "github-skillmd";
       }
@@ -64530,7 +64811,7 @@ async function installSkill(request, skillRegistry) {
         const mdResp = await fetch(rootMd, { signal: AbortSignal.timeout(15e3) });
         if (mdResp.ok) {
           mkdirSync18(targetDir, { recursive: true });
-          writeFileSync15(join22(targetDir, "SKILL.md"), await mdResp.text(), "utf-8");
+          writeFileSync16(join22(targetDir, "SKILL.md"), await mdResp.text(), "utf-8");
           installed = true;
           installMethod = "github-root-skillmd";
         }
@@ -64546,7 +64827,7 @@ async function installSkill(request, skillRegistry) {
       if (zipResp.ok) {
         const tmpZip = join22(skillsDir, `_tmp_${safeName}.zip`);
         const buffer = Buffer.from(await zipResp.arrayBuffer());
-        writeFileSync15(tmpZip, buffer);
+        writeFileSync16(tmpZip, buffer);
         mkdirSync18(targetDir, { recursive: true });
         try {
           execSync2(`unzip -o "${tmpZip}" -d "${targetDir}"`, { timeout: 3e4 });
@@ -64578,13 +64859,13 @@ async function installSkill(request, skillRegistry) {
     };
     const manifest = buildManifest("skill", raw);
     manifest.source = skillSource;
-    writeFileSync15(skillMfPath, JSON.stringify(manifest, null, 2), "utf-8");
+    writeFileSync16(skillMfPath, JSON.stringify(manifest, null, 2), "utf-8");
   } else {
     try {
       const mf = JSON.parse(readFileSync20(skillMfPath, "utf-8"));
       if (!mf.source) {
         mf.source = skillSource;
-        writeFileSync15(skillMfPath, JSON.stringify(mf, null, 2), "utf-8");
+        writeFileSync16(skillMfPath, JSON.stringify(mf, null, 2), "utf-8");
       }
     } catch {
     }
@@ -64618,7 +64899,7 @@ var init_skill_service = __esm({
 // ../org-manager/dist/api-server.js
 import { createServer as createServer2 } from "node:http";
 import { join as join23, resolve as resolve14, dirname as dirname6 } from "node:path";
-import { readdirSync as readdirSync10, readFileSync as readFileSync21, existsSync as existsSync27, writeFileSync as writeFileSync16, mkdirSync as mkdirSync19, rmSync as rmSync3, statSync as statSync5 } from "node:fs";
+import { readdirSync as readdirSync10, readFileSync as readFileSync21, existsSync as existsSync27, writeFileSync as writeFileSync17, mkdirSync as mkdirSync19, rmSync as rmSync3, statSync as statSync5 } from "node:fs";
 import { homedir as homedir14 } from "node:os";
 import { execSync as execSync3 } from "node:child_process";
 async function signToken(payload, secret) {
@@ -64708,7 +64989,7 @@ var init_api_server = __esm({
     init_skill_service();
     log57 = createLogger("api-server");
     PBKDF2_ITERATIONS = 1e4;
-    APIServer = class {
+    APIServer = class _APIServer {
       orgService;
       taskService;
       port;
@@ -64733,7 +65014,7 @@ var init_api_server = __esm({
       builderService;
       workflowEngine;
       teamTemplateRegistry;
-      customGroupChats = [];
+      // Custom group chats are now persisted in SQLite via storage.groupChatRepo
       constructor(orgService, taskService, port = 8056) {
         this.orgService = orgService;
         this.taskService = taskService;
@@ -64748,15 +65029,18 @@ var init_api_server = __esm({
         am.setGroupChatHandlers({
           sendGroupMessage: async (channelKey, message, senderId, senderName) => {
             const cleanText = stripInternalBlocks(message);
+            const orgId2 = "default";
+            let persistedMsgId;
             if (this.storage) {
-              await this.storage.channelMessageRepo.append({
-                orgId: "default",
+              const saved = await this.storage.channelMessageRepo.append({
+                orgId: orgId2,
                 channel: channelKey,
                 senderId,
                 senderType: "agent",
                 senderName,
                 text: cleanText
               });
+              persistedMsgId = saved.id;
             }
             this.ws.broadcast({
               type: "chat:message",
@@ -64769,41 +65053,81 @@ var init_api_server = __esm({
               },
               timestamp: (/* @__PURE__ */ new Date()).toISOString()
             });
-            const chat = this.customGroupChats.find((c) => c.id === channelKey);
-            if (chat) {
-              for (const memberId of chat.memberIds) {
-                if (memberId === senderId)
-                  continue;
-                try {
-                  const memberAgent = am.getAgent(memberId);
-                  memberAgent.enqueueToMailbox("a2a_message", {
-                    summary: `Group chat message from ${senderName}`,
-                    content: `[Group chat: ${chat.name}] ${senderName}: ${cleanText}`,
-                    extra: { senderId, senderName, channelKey }
-                  });
-                } catch {
+            let allAgentIds = [];
+            if (channelKey.startsWith("group:custom:") && this.storage?.groupChatRepo) {
+              allAgentIds = this.storage.groupChatRepo.getAgentMemberIds(channelKey);
+            } else if (channelKey.startsWith("group:")) {
+              const teamId = channelKey.replace(/^group:/, "");
+              const team = this.orgService.getTeam(teamId);
+              allAgentIds = team?.memberAgentIds ?? [];
+            }
+            const peerAgentIds = allAgentIds.filter((id) => id !== senderId);
+            if (peerAgentIds.length > 0) {
+              const agentManager = this.orgService.getAgentManager();
+              const nameMap = this.buildAgentNameMap(allAgentIds, agentManager);
+              const mentionedNames = this.parseAgentMentions(cleanText, [...nameMap.keys()]);
+              const filteredMentions = mentionedNames.filter((n) => {
+                const id = nameMap.get(n);
+                return id && id !== senderId;
+              });
+              if (filteredMentions.length > 0) {
+                let channelContext = [];
+                if (this.storage) {
+                  try {
+                    const recent = await this.storage.channelMessageRepo.getMessages(channelKey, 20);
+                    channelContext = (recent.messages ?? []).map((m) => ({
+                      role: m.senderType === "agent" ? "assistant" : "user",
+                      content: m.senderType === "agent" ? stripInternalBlocks(m.text) : `[${m.senderName}]: ${m.text}`
+                    }));
+                  } catch {
+                  }
+                }
+                const roundId = `round_${Date.now()}`;
+                const respondedAgents = /* @__PURE__ */ new Set([senderId]);
+                void this.triggerAgentToAgentChain(filteredMentions, nameMap, senderName, senderId, cleanText, persistedMsgId, channelKey, orgId2, agentManager, allAgentIds.length, { roundId, depth: 1, respondedAgents, allAgentIds });
+              } else {
+                for (const peerId of peerAgentIds) {
+                  try {
+                    agentManager.getAgent(peerId).enqueueToMailbox("a2a_message", {
+                      summary: `Group chat message from ${senderName}`,
+                      content: `[Group chat message from ${senderName}]:
+${cleanText}`,
+                      extra: { senderId, senderName, channelKey }
+                    }, {
+                      metadata: { senderId, senderName, senderRole: "agent" }
+                    });
+                  } catch {
+                  }
                 }
               }
             }
             return "Message sent to group chat";
           },
           createGroupChat: async (name, creatorId, creatorName, memberIds) => {
-            const chatId = `group:custom:${Date.now().toString(36)}`;
-            this.customGroupChats.push({
-              id: chatId,
-              name,
-              orgId: "default",
-              creatorId,
-              creatorName,
-              memberIds,
-              createdAt: (/* @__PURE__ */ new Date()).toISOString()
-            });
-            this.ws.broadcast({
-              type: "chat:group_created",
-              payload: { chatId, name, creatorId, creatorName },
-              timestamp: (/* @__PURE__ */ new Date()).toISOString()
-            });
-            return { id: chatId, name };
+            if (this.storage?.groupChatRepo) {
+              const members = memberIds.map((id) => {
+                try {
+                  const agentInfo = this.orgService.getAgentManager().getAgent(id);
+                  return { id, type: "agent", name: agentInfo?.config?.name ?? id };
+                } catch {
+                  return { id, type: "agent", name: id };
+                }
+              });
+              const gc = this.storage.groupChatRepo.create({
+                orgId: "default",
+                name,
+                creatorId,
+                creatorName,
+                members
+              });
+              this.ws.broadcast({
+                type: "chat:group_created",
+                payload: { chatId: gc.channelKey, name, creatorId, creatorName },
+                timestamp: (/* @__PURE__ */ new Date()).toISOString()
+              });
+              return { id: gc.channelKey, name };
+            }
+            return { id: `group:custom:${Date.now().toString(36)}`, name };
           },
           listGroupChats: async () => {
             const teams = this.orgService.listTeamsWithMembers("default");
@@ -64813,13 +65137,27 @@ var init_api_server = __esm({
               type: "team",
               channelKey: `group:${t.id}`
             }));
-            const customChats = this.customGroupChats.map((c) => ({
-              id: c.id,
+            const customChats = this.storage?.groupChatRepo ? this.storage.groupChatRepo.list("default").map((c) => ({
+              id: c.channelKey,
               name: c.name,
               type: "custom",
-              channelKey: c.id
-            }));
+              channelKey: c.channelKey
+            })) : [];
             return [...teamChats, ...customChats];
+          },
+          getChannelMessages: async (channelKey, limit, before2) => {
+            if (!this.storage)
+              return { messages: [], hasMore: false };
+            const result = this.storage.channelMessageRepo.getMessages(channelKey, limit, before2);
+            return {
+              messages: result.messages.map((m) => ({
+                senderName: m.senderName,
+                senderType: m.senderType,
+                text: stripInternalBlocks(m.text),
+                createdAt: m.createdAt instanceof Date ? m.createdAt.toISOString() : String(m.createdAt)
+              })),
+              hasMore: result.hasMore
+            };
           }
         });
       }
@@ -64876,7 +65214,7 @@ var init_api_server = __esm({
               throw new Error(`Hub download failed: ${res.status}`);
             const data = await res.json();
             const name = data.name;
-            const slug = name.toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "");
+            const slug = kebab(name, "hub-pkg");
             const mode = data.itemType === "team" ? "team" : data.itemType === "skill" ? "skill" : "agent";
             const typeDir = mode === "agent" ? "agents" : mode === "team" ? "teams" : "skills";
             const artDir = join23(homedir14(), ".markus", "builder-artifacts", typeDir, slug);
@@ -64885,10 +65223,10 @@ var init_api_server = __esm({
               for (const [fname, content] of Object.entries(data.files)) {
                 const filePath = join23(artDir, fname);
                 mkdirSync19(dirname6(filePath), { recursive: true });
-                writeFileSync16(filePath, content, "utf-8");
+                writeFileSync17(filePath, content, "utf-8");
               }
             } else if (data.config) {
-              writeFileSync16(join23(artDir, manifestFilename(mode)), JSON.stringify(data.config, null, 2), "utf-8");
+              writeFileSync17(join23(artDir, manifestFilename(mode)), JSON.stringify(data.config, null, 2), "utf-8");
             }
             return self.builderService.installArtifact(mode, slug);
           }
@@ -65119,48 +65457,167 @@ var init_api_server = __esm({
           log57.warn("Failed to persist chat turn", { error: String(err) });
         }
       }
+      // ── Agent-to-agent reply storm prevention ───────────────────────────────────
+      static A2A_MAX_DEPTH = 3;
+      static A2A_COOLDOWN_MS = 3e4;
+      /** Per-channel cooldown tracker: channel → agentId → last reply timestamp */
+      a2aCooldowns = /* @__PURE__ */ new Map();
+      /** Extract @mentions from agent reply text. Returns agent names found.
+       *  Handles multi-word names (e.g. "Ryan 莱恩") by checking known names after each @ sign.
+       *  Also matches partial names: "@Sofia" matches "Sofia 索菲亚" if "Sofia" is a token in the name. */
+      parseAgentMentions(text, knownAgentNames) {
+        const mentioned = /* @__PURE__ */ new Set();
+        const sorted = [...knownAgentNames].sort((a, b) => b.length - a.length);
+        const tokenToName = /* @__PURE__ */ new Map();
+        for (const name of sorted) {
+          for (const token of name.split(/\s+/)) {
+            if (token.length >= 2) {
+              const key2 = token.toLowerCase();
+              if (!tokenToName.has(key2))
+                tokenToName.set(key2, name);
+            }
+          }
+        }
+        let idx = 0;
+        while (idx < text.length) {
+          const atPos = text.indexOf("@", idx);
+          if (atPos < 0)
+            break;
+          if (text[atPos + 1] === "[") {
+            const close = text.indexOf("]", atPos + 2);
+            if (close > atPos + 2) {
+              const bracketed = text.slice(atPos + 2, close);
+              const match = sorted.find((n) => n.toLowerCase() === bracketed.toLowerCase());
+              if (match)
+                mentioned.add(match);
+              idx = close + 1;
+              continue;
+            }
+          }
+          const after2 = text.slice(atPos + 1);
+          const afterLower = after2.toLowerCase();
+          const fullMatch = sorted.find((n) => afterLower.startsWith(n.toLowerCase()));
+          if (fullMatch) {
+            mentioned.add(fullMatch);
+            idx = atPos + 1 + fullMatch.length;
+            continue;
+          }
+          const tokenMatch = after2.match(/^(\S+)/);
+          if (tokenMatch) {
+            const token = tokenMatch[1].toLowerCase().replace(/[,，。！？!?;；:：、()（）[\]【】]+$/, "");
+            const resolved = tokenToName.get(token);
+            if (resolved) {
+              mentioned.add(resolved);
+              idx = atPos + 1 + tokenMatch[1].length;
+              continue;
+            }
+          }
+          idx = atPos + 1;
+        }
+        return [...mentioned];
+      }
+      /** Build name→id lookup for agents in a channel */
+      buildAgentNameMap(agentIds, agentManager) {
+        const map = /* @__PURE__ */ new Map();
+        for (const id of agentIds) {
+          try {
+            map.set(agentManager.getAgent(id).config.name, id);
+          } catch {
+          }
+        }
+        return map;
+      }
       /**
        * Process a single agent's reply in a group chat broadcast.
        * Each agent decides independently whether to respond.
        * Replies are persisted and broadcast via WebSocket.
+       * If the agent @mentions other agents, a chain reply is triggered (with storm prevention).
        */
-      async processGroupChatReply(agentId2, userMessage, senderId, senderInfo, channel, orgId2, channelContext, agentManager, teamSize) {
+      async processGroupChatReply(agentId2, userMessage, senderId, senderInfo, channel, orgId2, channelContext, agentManager, teamSize, opts, chainCtx) {
         try {
           const agent = agentManager.getAgent(agentId2);
           const agentName = agent.config.name;
-          const groupChatPrefix = [
-            `[GROUP CHAT \u2014 ${teamSize} team members receiving this independently]`,
-            "",
-            "You are ONE of several agents in a group chat. Rules:",
-            "1. **Check channel history first** \u2014 if another agent already answered the question or addressed the topic, do NOT repeat their answer. Add only if you have a *different* perspective or expertise.",
-            '2. **Only respond if your role/expertise is specifically relevant.** Generic offers like "Let me know if you need help" add no value.',
-            "3. **Be concise** \u2014 this is a multi-party conversation. Short, actionable responses only.",
-            "4. **Do NOT create tasks** unless the user explicitly asks you to and you are the manager/coordinator.",
-            "5. **Prefer [NO_RESPONSE]** \u2014 when in doubt, say nothing. It is better to stay silent than to add noise.",
-            "",
-            "If you have nothing uniquely valuable to contribute, respond with exactly: [NO_RESPONSE]",
-            "---",
+          const isA2A = !!chainCtx && chainCtx.depth > 0;
+          const hasReplyTarget = !!opts?.replyToAgentName;
+          const hasMentions = !!opts?.mentionedNames?.length;
+          const isTargeted = hasReplyTarget || hasMentions;
+          const targetNames = /* @__PURE__ */ new Set();
+          if (opts?.replyToAgentName)
+            targetNames.add(opts.replyToAgentName);
+          if (opts?.mentionedNames)
+            opts.mentionedNames.forEach((n) => targetNames.add(n));
+          const thisAgentIsTarget = targetNames.has(agentName);
+          const prefixLines = [
+            `[GROUP CHAT \u2014 ${teamSize} team members | You are: ${agentName}]`,
             ""
-          ].join("\n");
+          ];
+          if (isA2A) {
+            prefixLines.push(`[AGENT COLLABORATION] This message is from a fellow agent (${opts?.replyToAgentName ?? "teammate"}), not from the user.`);
+            prefixLines.push("You were @mentioned because your expertise is needed. Respond concisely to the specific request.");
+            prefixLines.push("You may @mention another agent if (and ONLY if) you genuinely need their specific expertise to answer.");
+            prefixLines.push("Do NOT @mention agents just to be polite or to pass the conversation along.");
+            prefixLines.push("");
+          }
+          if (isTargeted && !isA2A) {
+            if (hasReplyTarget) {
+              prefixLines.push(`[REPLY] The user is replying to ${opts.replyToAgentName}'s message: "${(opts.replyToText ?? "").slice(0, 200)}"`);
+            }
+            if (hasMentions) {
+              prefixLines.push(`[MENTIONED] The user @mentioned: ${opts.mentionedNames.join(", ")}`);
+            }
+            prefixLines.push("");
+            if (thisAgentIsTarget) {
+              prefixLines.push(">>> You are the target of this message. You SHOULD respond. <<<");
+            } else {
+              prefixLines.push(">>> STOP. This message is NOT for you. The user is talking to " + [...targetNames].join(", ") + ", not you.");
+              prefixLines.push("You MUST respond with exactly: [NO_RESPONSE]");
+              prefixLines.push('The ONLY exception: you are directly contradicted by a factual error. Offering opinions, agreement, "me too", or generic help does NOT count. <<<');
+            }
+          } else if (!isA2A) {
+            prefixLines.push("This is an open group message (no specific @mention or reply target).");
+          }
+          prefixLines.push("");
+          prefixLines.push("Rules for ALL group chat messages:");
+          prefixLines.push("1. Check channel history \u2014 if another agent already answered, do NOT repeat.");
+          prefixLines.push("2. Only respond if your specific role/expertise is directly relevant.");
+          prefixLines.push("3. Be concise \u2014 short, actionable responses only.");
+          if (agent.config.agentRole === "manager") {
+            prefixLines.push("4. When assigning work to agents, you MUST use `task_create` to formalize each assignment as a tracked task. Verbal delegation without a task is NOT allowed \u2014 oral promises are meaningless without task tracking. Every commitment must have a corresponding task.");
+          } else {
+            prefixLines.push("4. When you accept a work assignment, verify a task has been created for it (`task_list`). If the coordinator did not create one, remind them or create it yourself with the correct `assigned_agent_id`. Do NOT make promises without task tracking.");
+          }
+          prefixLines.push("5. DEFAULT IS SILENCE. When in doubt, respond with exactly: [NO_RESPONSE]");
+          prefixLines.push('6. If the provided context is insufficient, use `recall_context` (scope="channel") to fetch earlier messages before responding. For task/requirement details use `task_get`/`requirement_get`. Do NOT guess about prior discussion.');
+          if (isTargeted && !thisAgentIsTarget && !isA2A) {
+            prefixLines.push("7. REMINDER: This message is directed at " + [...targetNames].join(", ") + ". You are " + agentName + ". Respond ONLY with [NO_RESPONSE].");
+          }
+          prefixLines.push("---", "");
+          const groupChatPrefix = prefixLines.join("\n");
           const toolEvents = [];
           const reply = await agent.sendMessage(groupChatPrefix + userMessage, senderId, senderInfo, {
-            sourceType: "human_chat",
+            sourceType: isA2A ? "a2a_message" : "human_chat",
+            scenario: isA2A ? "a2a" : void 0,
             channelContext,
             toolEventCollector: toolEvents
           });
-          if (!reply || reply.trim() === "[NO_RESPONSE]" || !reply.trim()) {
+          if (!reply || !reply.trim() || reply.includes("[NO_RESPONSE]")) {
             return;
           }
-          const { thinking, clean: cleanReply } = extractThinkBlocks(reply);
-          if (!cleanReply.trim() || cleanReply.trim() === "[NO_RESPONSE]")
+          const { thinking, clean: rawClean } = extractThinkBlocks(reply);
+          const cleanReply = rawClean.replace(/\[NO_RESPONSE\]/gi, "").trim();
+          if (!cleanReply)
             return;
           const metadata = {};
           if (thinking.length > 0)
             metadata["thinking"] = thinking;
           if (toolEvents.length > 0)
             metadata["toolCalls"] = toolEvents;
+          if (isA2A && opts?.replyToAgentName) {
+            metadata["replyToAgent"] = opts.replyToAgentName;
+          }
+          let persistedMsgId;
           if (this.storage) {
-            await this.storage.channelMessageRepo.append({
+            const saved = await this.storage.channelMessageRepo.append({
               orgId: orgId2,
               channel,
               senderId: agentId2,
@@ -65168,8 +65625,10 @@ var init_api_server = __esm({
               senderName: agentName,
               text: cleanReply,
               mentions: [],
-              metadata: Object.keys(metadata).length > 0 ? metadata : void 0
+              metadata: Object.keys(metadata).length > 0 ? metadata : void 0,
+              replyToId: isA2A ? opts?.replyToMsgId : void 0
             });
+            persistedMsgId = saved.id;
           }
           this.ws.broadcast({
             type: "chat:message",
@@ -65179,10 +65638,29 @@ var init_api_server = __esm({
               senderType: "agent",
               senderName: agentName,
               text: cleanReply,
-              metadata: Object.keys(metadata).length > 0 ? metadata : void 0
+              metadata: Object.keys(metadata).length > 0 ? metadata : void 0,
+              ...isA2A ? {
+                replyToId: opts?.replyToMsgId,
+                replyToSender: opts?.replyToAgentName,
+                replyToText: (opts?.replyToText ?? "").slice(0, 120)
+              } : {}
             },
             timestamp: (/* @__PURE__ */ new Date()).toISOString()
           });
+          const allAgentIds = chainCtx?.allAgentIds ?? [];
+          if (allAgentIds.length > 0) {
+            const nameMap = this.buildAgentNameMap(allAgentIds, agentManager);
+            const mentionedNames = this.parseAgentMentions(cleanReply, [...nameMap.keys()]);
+            const filteredMentions = mentionedNames.filter((n) => n !== agentName);
+            log57.info("A2A mention scan", { agentName, mentionedNames, filteredMentions, depth: chainCtx?.depth ?? 0 });
+            if (filteredMentions.length > 0) {
+              const depth = (chainCtx?.depth ?? 0) + 1;
+              const roundId = chainCtx?.roundId ?? `round_${Date.now()}`;
+              const responded = chainCtx?.respondedAgents ?? /* @__PURE__ */ new Set();
+              responded.add(agentId2);
+              void this.triggerAgentToAgentChain(filteredMentions, nameMap, agentName, agentId2, cleanReply, persistedMsgId, channel, orgId2, agentManager, teamSize, { roundId, depth, respondedAgents: responded, allAgentIds });
+            }
+          }
         } catch (err) {
           log57.warn("Group chat agent reply failed", { agentId: agentId2, error: String(err) });
           if (this.storage) {
@@ -65202,6 +65680,56 @@ var init_api_server = __esm({
           }
         }
       }
+      /**
+       * Trigger agent-to-agent chain replies with 3-layer storm prevention:
+       * 1. Depth limit (max 3 hops)
+       * 2. Per-round dedup (each agent responds at most once per conversation round)
+       * 3. Cooldown window (same agent won't be triggered twice within 30s on same channel)
+       */
+      async triggerAgentToAgentChain(mentionedNames, nameMap, fromAgentName, fromAgentId, fromText, fromMsgId, channel, orgId2, agentManager, teamSize, chainCtx) {
+        if (chainCtx.depth > _APIServer.A2A_MAX_DEPTH) {
+          log57.info("A2A chain depth limit reached", { channel, depth: chainCtx.depth, roundId: chainCtx.roundId });
+          return;
+        }
+        const now2 = Date.now();
+        if (!this.a2aCooldowns.has(channel)) {
+          this.a2aCooldowns.set(channel, /* @__PURE__ */ new Map());
+        }
+        const channelCooldowns = this.a2aCooldowns.get(channel);
+        let channelContext = [];
+        if (this.storage) {
+          try {
+            const recent = await this.storage.channelMessageRepo.getMessages(channel, 20);
+            channelContext = (recent.messages ?? []).map((m) => ({
+              role: m.senderType === "agent" ? "assistant" : "user",
+              content: m.senderType === "agent" ? stripInternalBlocks(m.text) : `[${m.senderName}]: ${m.text}`
+            }));
+          } catch {
+          }
+        }
+        for (const targetName of mentionedNames) {
+          const targetId = nameMap.get(targetName);
+          if (!targetId)
+            continue;
+          if (chainCtx.respondedAgents.has(targetId)) {
+            log57.info("A2A skipping (already responded this round)", { targetName, roundId: chainCtx.roundId });
+            continue;
+          }
+          const lastReply = channelCooldowns.get(targetId) ?? 0;
+          if (now2 - lastReply < _APIServer.A2A_COOLDOWN_MS) {
+            log57.info("A2A skipping (cooldown)", { targetName, channel, cooldownRemaining: _APIServer.A2A_COOLDOWN_MS - (now2 - lastReply) });
+            continue;
+          }
+          channelCooldowns.set(targetId, now2);
+          const a2aMessage = `[From @${fromAgentName}]: ${fromText}`;
+          void this.processGroupChatReply(targetId, a2aMessage, fromAgentId, { name: fromAgentName, role: "agent" }, channel, orgId2, channelContext, agentManager, teamSize, {
+            mentionedNames: [targetName],
+            replyToAgentName: fromAgentName,
+            replyToText: fromText.slice(0, 200),
+            replyToMsgId: fromMsgId
+          }, chainCtx);
+        }
+      }
       /** Persist the user message first (before LLM), returns session id for subsequent assistant persistence.
        *  When sessionId is provided, appends to that session; when null/undefined, creates a new session. */
       async persistUserMessage(agentId2, userMessage, senderId, images, sessionId) {
@@ -65457,7 +65985,7 @@ var init_api_server = __esm({
           const avatarDir = join23(homedir14(), ".markus", "avatars");
           mkdirSync19(avatarDir, { recursive: true });
           const filename = `${targetType}_${targetId}.${ext}`;
-          writeFileSync16(join23(avatarDir, filename), buf);
+          writeFileSync17(join23(avatarDir, filename), buf);
           const avatarUrl = `/api/avatars/${filename}`;
           if (targetType === "user" && this.storage) {
             this.storage.userRepo.updateAvatarUrl(targetId, avatarUrl);
@@ -65534,6 +66062,7 @@ var init_api_server = __esm({
           const senderName = body["senderName"] ?? "You";
           const mentions = body["mentions"] ?? [];
           const targetAgentId = body["targetAgentId"];
+          const replyToId = body["replyToId"];
           const orgId2 = body["orgId"] ?? "default";
           let userMsg;
           if (this.storage) {
@@ -65544,7 +66073,8 @@ var init_api_server = __esm({
               senderType: "human",
               senderName,
               text,
-              mentions
+              mentions,
+              replyToId
             });
           }
           const humanOnly = body["humanOnly"] === true;
@@ -65562,21 +66092,50 @@ var init_api_server = __esm({
               return [];
             }
           };
-          if (!isHumanChannel && channel.startsWith("group:") && !targetAgentId) {
-            const teamId = channel.replace(/^group:/, "");
-            const team = this.orgService.getTeam(teamId);
-            const allAgentIds = team?.memberAgentIds ?? [];
+          let replyToAgentName;
+          let replyToText;
+          if (replyToId && this.storage) {
+            try {
+              const original = this.storage.channelMessageRepo.getMessageById(replyToId);
+              if (original) {
+                replyToAgentName = original.senderName;
+                replyToText = original.text.slice(0, 200);
+              }
+            } catch {
+            }
+          }
+          const enrichedUserMsg = userMsg ? {
+            ...userMsg,
+            ...replyToAgentName ? { replyToSender: replyToAgentName, replyToText } : {}
+          } : null;
+          if (!isHumanChannel && channel.startsWith("group:")) {
+            let allAgentIds;
+            if (channel.startsWith("group:custom:")) {
+              allAgentIds = this.storage?.groupChatRepo?.getAgentMemberIds(channel) ?? [];
+            } else {
+              const teamId = channel.replace(/^group:/, "");
+              const team = this.orgService.getTeam(teamId);
+              allAgentIds = team?.memberAgentIds ?? [];
+            }
             if (allAgentIds.length === 0) {
-              this.json(res, 200, { userMessage: userMsg ?? null, agentMessage: null });
+              this.json(res, 200, { userMessage: enrichedUserMsg, agentMessage: null });
               return;
             }
             const channelContext2 = await buildChannelContext();
             const senderInfo2 = this.orgService.resolveHumanIdentity(senderId);
             const agentManager = this.orgService.getAgentManager();
+            const broadcastOpts = {
+              mentionedNames: mentions.length > 0 ? mentions : void 0,
+              replyToAgentName,
+              replyToText
+            };
+            const roundId = `round_${Date.now()}`;
+            const respondedAgents = /* @__PURE__ */ new Set();
+            const chainCtx = { roundId, depth: 0, respondedAgents, allAgentIds };
             for (const agentId2 of allAgentIds) {
-              void this.processGroupChatReply(agentId2, text, senderId, senderInfo2, channel, orgId2, channelContext2, agentManager, allAgentIds.length);
+              void this.processGroupChatReply(agentId2, text, senderId, senderInfo2, channel, orgId2, channelContext2, agentManager, allAgentIds.length, broadcastOpts, chainCtx);
             }
-            this.json(res, 200, { userMessage: userMsg ?? null, agentMessage: null });
+            this.json(res, 200, { userMessage: enrichedUserMsg, agentMessage: null });
             return;
           }
           let routedAgentId = null;
@@ -65590,7 +66149,7 @@ var init_api_server = __esm({
             }
           }
           if (!routedAgentId) {
-            this.json(res, 200, { userMessage: userMsg ?? null, agentMessage: null });
+            this.json(res, 200, { userMessage: enrichedUserMsg, agentMessage: null });
             return;
           }
           const agent = this.orgService.getAgentManager().getAgent(routedAgentId);
@@ -65633,7 +66192,7 @@ var init_api_server = __esm({
             }
             const statusCode = raw.includes("402") ? 402 : raw.includes("401") ? 401 : raw.includes("429") ? 429 : 502;
             this.json(res, statusCode, {
-              userMessage: userMsg ?? null,
+              userMessage: enrichedUserMsg,
               agentMessage: errorMsg ?? null,
               error: detail2
             });
@@ -65660,7 +66219,7 @@ var init_api_server = __esm({
             void this.persistChatTurn(routedAgentId, text, reply, senderId);
           }
           this.json(res, 200, {
-            userMessage: userMsg ?? null,
+            userMessage: enrichedUserMsg,
             agentMessage: agentMsg ?? {
               id: `tmp_${Date.now()}`,
               channel,
@@ -65705,13 +66264,9 @@ var init_api_server = __esm({
             this.json(res, 400, { error: "name is required" });
             return;
           }
-          if (!roleName?.trim()) {
-            this.json(res, 400, { error: "roleName is required" });
-            return;
-          }
           const agent = await this.orgService.hireAgent({
             name: agentName,
-            roleName,
+            roleName: roleName?.trim() || void 0,
             orgId: body["orgId"] ?? "default",
             teamId: body["teamId"],
             skills: body["skills"],
@@ -65864,7 +66419,7 @@ var init_api_server = __esm({
         if (path === "/api/group-chats" && req.method === "GET") {
           const orgId2 = url.searchParams.get("orgId") ?? "default";
           const teams = this.orgService.listTeamsWithMembers(orgId2);
-          const groupChats = teams.map((t) => ({
+          const teamChats = teams.map((t) => ({
             id: `group:${t.id}`,
             name: t.name,
             type: "team",
@@ -65872,21 +66427,16 @@ var init_api_server = __esm({
             memberCount: t.members.length,
             channelKey: `group:${t.id}`
           }));
-          const customChats = this.customGroupChats.filter((c) => c.orgId === orgId2);
-          this.json(res, 200, {
-            chats: [
-              ...groupChats,
-              ...customChats.map((c) => ({
-                id: c.id,
-                name: c.name,
-                type: "custom",
-                creatorId: c.creatorId,
-                creatorName: c.creatorName,
-                memberCount: c.memberIds?.length ?? 0,
-                channelKey: c.id
-              }))
-            ]
-          });
+          const customChats = this.storage?.groupChatRepo ? this.storage.groupChatRepo.list(orgId2).map((c) => ({
+            id: c.id,
+            name: c.name,
+            type: "custom",
+            creatorId: c.creatorId,
+            creatorName: c.creatorName,
+            memberCount: c.memberCount,
+            channelKey: c.channelKey
+          })) : [];
+          this.json(res, 200, { chats: [...teamChats, ...customChats] });
           return;
         }
         if (path === "/api/group-chats" && req.method === "POST") {
@@ -65896,31 +66446,129 @@ var init_api_server = __esm({
           const creatorId = body["creatorId"];
           const creatorName = body["creatorName"];
           const memberIds = body["memberIds"];
+          const memberTypes = body["memberTypes"];
+          const memberNames = body["memberNames"];
           if (!name) {
             this.json(res, 400, { error: "name is required" });
             return;
           }
-          const chatId = `group:custom:${Date.now().toString(36)}`;
-          const chat = {
-            id: chatId,
-            name,
-            orgId: orgId2,
-            creatorId,
-            creatorName,
-            memberIds: memberIds ?? [],
-            createdAt: (/* @__PURE__ */ new Date()).toISOString()
-          };
-          this.customGroupChats.push(chat);
+          if (!this.storage?.groupChatRepo) {
+            this.json(res, 500, { error: "Storage not initialized" });
+            return;
+          }
+          const members = (memberIds ?? []).map((id) => {
+            const mType = memberTypes?.[id] ?? "agent";
+            let mName = memberNames?.[id] ?? id;
+            if (mType === "agent") {
+              try {
+                mName = this.orgService.getAgentManager().getAgent(id)?.config?.name ?? mName;
+              } catch {
+              }
+            }
+            return { id, type: mType, name: mName };
+          });
+          const gc = this.storage.groupChatRepo.create({ orgId: orgId2, name, creatorId, creatorName, members });
           this.ws?.broadcast({
             type: "chat:group_created",
-            payload: { chatId, name, creatorId, creatorName },
+            payload: { chatId: gc.channelKey, name, creatorId, creatorName },
             timestamp: (/* @__PURE__ */ new Date()).toISOString()
           });
           this.json(res, 201, {
-            chat: { id: chatId, name, type: "custom", creatorId, creatorName, channelKey: chatId }
+            chat: {
+              id: gc.id,
+              name: gc.name,
+              type: "custom",
+              creatorId: gc.creatorId,
+              creatorName: gc.creatorName,
+              channelKey: gc.channelKey,
+              memberCount: gc.members.length,
+              members: gc.members.map((m) => ({ id: m.memberId, name: m.memberName, type: m.memberType }))
+            }
+          });
+          return;
+        }
+        if (path.match(/^\/api\/group-chats\/[^/]+$/) && req.method === "GET") {
+          const gcId = path.split("/").pop();
+          if (!this.storage?.groupChatRepo) {
+            this.json(res, 500, { error: "Storage not initialized" });
+            return;
+          }
+          const gc = this.storage.groupChatRepo.getById(gcId);
+          if (!gc) {
+            this.json(res, 404, { error: "Group chat not found" });
+            return;
+          }
+          this.json(res, 200, {
+            chat: {
+              id: gc.id,
+              name: gc.name,
+              type: "custom",
+              channelKey: gc.channelKey,
+              creatorId: gc.creatorId,
+              creatorName: gc.creatorName,
+              members: gc.members.map((m) => ({ id: m.memberId, name: m.memberName, type: m.memberType }))
+            }
           });
           return;
         }
+        if (path.match(/^\/api\/group-chats\/[^/]+$/) && req.method === "PATCH") {
+          const gcId = path.split("/").pop();
+          if (!this.storage?.groupChatRepo) {
+            this.json(res, 500, { error: "Storage not initialized" });
+            return;
+          }
+          const body = await this.readBody(req);
+          const newName = body["name"];
+          if (newName)
+            this.storage.groupChatRepo.updateName(gcId, newName);
+          this.json(res, 200, { ok: true });
+          return;
+        }
+        if (path.match(/^\/api\/group-chats\/[^/]+$/) && req.method === "DELETE") {
+          const gcId = path.split("/").pop();
+          if (!this.storage?.groupChatRepo) {
+            this.json(res, 500, { error: "Storage not initialized" });
+            return;
+          }
+          this.storage.groupChatRepo.delete(gcId);
+          this.ws?.broadcast({ type: "chat:group_deleted", payload: { chatId: gcId }, timestamp: (/* @__PURE__ */ new Date()).toISOString() });
+          this.json(res, 200, { ok: true });
+          return;
+        }
+        if (path.match(/^\/api\/group-chats\/[^/]+\/members$/) && req.method === "POST") {
+          const gcId = path.split("/")[3];
+          if (!this.storage?.groupChatRepo) {
+            this.json(res, 500, { error: "Storage not initialized" });
+            return;
+          }
+          const body = await this.readBody(req);
+          const memberId = body["memberId"];
+          const memberType = body["memberType"] ?? "agent";
+          let memberName = body["memberName"] ?? memberId;
+          if (memberType === "agent") {
+            try {
+              memberName = this.orgService.getAgentManager().getAgent(memberId)?.config?.name ?? memberName;
+            } catch {
+            }
+          }
+          this.storage.groupChatRepo.addMember(gcId, memberId, memberType, memberName);
+          this.ws?.broadcast({ type: "chat:group_updated", payload: { chatId: gcId }, timestamp: (/* @__PURE__ */ new Date()).toISOString() });
+          this.json(res, 200, { ok: true });
+          return;
+        }
+        if (path.match(/^\/api\/group-chats\/[^/]+\/members\/[^/]+$/) && req.method === "DELETE") {
+          const parts = path.split("/");
+          const gcId = parts[3];
+          const memberId = parts[5];
+          if (!this.storage?.groupChatRepo) {
+            this.json(res, 500, { error: "Storage not initialized" });
+            return;
+          }
+          this.storage.groupChatRepo.removeMember(gcId, memberId);
+          this.ws?.broadcast({ type: "chat:group_updated", payload: { chatId: gcId }, timestamp: (/* @__PURE__ */ new Date()).toISOString() });
+          this.json(res, 200, { ok: true });
+          return;
+        }
         if (path === "/api/teams" && req.method === "GET") {
           const orgId2 = url.searchParams.get("orgId") ?? "default";
           const teams = this.orgService.listTeamsWithMembers(orgId2);
@@ -66155,7 +66803,7 @@ var init_api_server = __esm({
           const content = body["content"];
           const dir = this.orgService.getTeamDataDir(teamId);
           mkdirSync19(dir, { recursive: true });
-          writeFileSync16(join23(dir, filename), content ?? "", "utf-8");
+          writeFileSync17(join23(dir, filename), content ?? "", "utf-8");
           this.json(res, 200, { ok: true });
           return;
         }
@@ -66685,7 +67333,7 @@ var init_api_server = __esm({
                 const roleDir = this.resolveAgentRoleDir(agent);
                 if (!roleDir)
                   continue;
-                const slug = agent.config.name.toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "") || agentId2;
+                const slug = kebab(agent.config.name, agentId2);
                 for (const fname of roleFileNames) {
                   const fpath = join23(roleDir, fname);
                   if (existsSync27(fpath)) {
@@ -67000,7 +67648,7 @@ var init_api_server = __esm({
             }
             const body = await this.readBody(req);
             const content = body["content"] ?? "";
-            writeFileSync16(join23(roleDir, filename), content, "utf-8");
+            writeFileSync17(join23(roleDir, filename), content, "utf-8");
             this.json(res, 200, { ok: true });
           } catch {
             this.json(res, 404, { error: `Agent not found: ${agentId2}` });
@@ -68339,7 +68987,7 @@ EXPLANATION_END`;
             const mfName = manifestFilename(pkgType);
             const artDir = join23(homedir14(), ".markus", "builder-artifacts", typeDir, manifest.name);
             mkdirSync19(artDir, { recursive: true });
-            writeFileSync16(join23(artDir, mfName), JSON.stringify(manifest, null, 2), "utf-8");
+            writeFileSync17(join23(artDir, mfName), JSON.stringify(manifest, null, 2), "utf-8");
             const artFiles = artifact.files;
             if (artFiles) {
               for (const [fn, c] of Object.entries(artFiles)) {
@@ -68347,38 +68995,38 @@ EXPLANATION_END`;
                   continue;
                 const filePath = join23(artDir, fn);
                 mkdirSync19(dirname6(filePath), { recursive: true });
-                writeFileSync16(filePath, c, "utf-8");
+                writeFileSync17(filePath, c, "utf-8");
               }
             }
             if (mode === "team") {
               const fileSet = new Set(artFiles ? Object.keys(artFiles) : []);
               const announcement = artifact.announcement;
               if (announcement && !fileSet.has("ANNOUNCEMENT.md")) {
-                writeFileSync16(join23(artDir, "ANNOUNCEMENT.md"), announcement, "utf-8");
+                writeFileSync17(join23(artDir, "ANNOUNCEMENT.md"), announcement, "utf-8");
               }
               const norms = artifact.norms;
               if (norms && !fileSet.has("NORMS.md")) {
-                writeFileSync16(join23(artDir, "NORMS.md"), norms, "utf-8");
+                writeFileSync17(join23(artDir, "NORMS.md"), norms, "utf-8");
               }
               const rawMembers = Array.isArray(artifact.team?.members) ? artifact.team.members : Array.isArray(artifact.members) ? artifact.members : [];
               for (const m of rawMembers) {
                 const mName = m.name ?? "Agent";
-                const slug = mName.toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "") || "agent";
+                const slug = kebab(mName, "agent");
                 const memberDir = join23(artDir, "members", slug);
                 const roleContent = m.roleContent || m.role_md;
                 const policiesContent = m.policiesContent || m.policies_md;
                 const contextContent = m.contextContent || m.context_md;
                 if (roleContent && !fileSet.has(`members/${slug}/ROLE.md`)) {
                   mkdirSync19(memberDir, { recursive: true });
-                  writeFileSync16(join23(memberDir, "ROLE.md"), roleContent, "utf-8");
+                  writeFileSync17(join23(memberDir, "ROLE.md"), roleContent, "utf-8");
                 }
                 if (policiesContent && !fileSet.has(`members/${slug}/POLICIES.md`)) {
                   mkdirSync19(memberDir, { recursive: true });
-                  writeFileSync16(join23(memberDir, "POLICIES.md"), policiesContent, "utf-8");
+                  writeFileSync17(join23(memberDir, "POLICIES.md"), policiesContent, "utf-8");
                 }
                 if (contextContent && !fileSet.has(`members/${slug}/CONTEXT.md`)) {
                   mkdirSync19(memberDir, { recursive: true });
-                  writeFileSync16(join23(memberDir, "CONTEXT.md"), contextContent, "utf-8");
+                  writeFileSync17(join23(memberDir, "CONTEXT.md"), contextContent, "utf-8");
                 }
               }
               const memberFiles = artifact.memberFiles;
@@ -68387,7 +69035,7 @@ EXPLANATION_END`;
                   const memberDir = join23(artDir, "members", slug);
                   mkdirSync19(memberDir, { recursive: true });
                   for (const [fn, c] of Object.entries(files))
-                    writeFileSync16(join23(memberDir, fn), c, "utf-8");
+                    writeFileSync17(join23(memberDir, fn), c, "utf-8");
                 }
               }
             }
@@ -68425,7 +69073,7 @@ EXPLANATION_END`;
             for (const [fn, content] of Object.entries(files)) {
               const filePath = join23(artDir, fn);
               mkdirSync19(dirname6(filePath), { recursive: true });
-              writeFileSync16(filePath, content, "utf-8");
+              writeFileSync17(filePath, content, "utf-8");
             }
             if (source) {
               const mfName = manifestFilename(type);
@@ -68434,7 +69082,7 @@ EXPLANATION_END`;
                 try {
                   const mf = JSON.parse(readFileSync21(mfPath, "utf-8"));
                   mf.source = source;
-                  writeFileSync16(mfPath, JSON.stringify(mf, null, 2), "utf-8");
+                  writeFileSync17(mfPath, JSON.stringify(mf, null, 2), "utf-8");
                 } catch {
                 }
               }
@@ -69168,11 +69816,18 @@ EXPLANATION_END`;
               "Content-Type": "application/json",
               "Authorization": `Bearer ${hubToken}`
             };
-            const hubRes = await fetch(`${hubUrl}/api/items`, {
+            let hubRes = await fetch(`${hubUrl}/api/items`, {
               method: "POST",
               headers,
-              body: JSON.stringify(body["payload"])
+              body: JSON.stringify(body["payload"]),
+              redirect: "manual"
             });
+            if (hubRes.status >= 300 && hubRes.status < 400) {
+              const location = hubRes.headers.get("location");
+              if (location) {
+                hubRes = await fetch(location, { method: "POST", headers, body: JSON.stringify(body["payload"]), redirect: "manual" });
+              }
+            }
             const hubData = await hubRes.json();
             this.json(res, hubRes.status, hubData);
           } catch (err) {
@@ -69180,6 +69835,43 @@ EXPLANATION_END`;
           }
           return;
         }
+        if (path.startsWith("/api/hub/")) {
+          const hubPath = path.slice("/api/hub".length);
+          const reqUrl = new URL(req.url, `http://${req.headers.host}`);
+          const hubTargetUrl = `${this.hubUrl}/api${hubPath}${reqUrl.search}`;
+          const proxyHeaders = { "Content-Type": "application/json" };
+          const authHeader = req.headers["authorization"];
+          if (authHeader)
+            proxyHeaders["Authorization"] = authHeader;
+          try {
+            let body;
+            if (req.method === "POST" || req.method === "PUT" || req.method === "PATCH") {
+              body = JSON.stringify(await this.readBody(req));
+            }
+            let hubRes = await fetch(hubTargetUrl, {
+              method: req.method,
+              headers: proxyHeaders,
+              body,
+              redirect: "manual"
+            });
+            if (hubRes.status >= 300 && hubRes.status < 400) {
+              const location = hubRes.headers.get("location");
+              if (location) {
+                hubRes = await fetch(location, {
+                  method: req.method,
+                  headers: proxyHeaders,
+                  body,
+                  redirect: "manual"
+                });
+              }
+            }
+            const data = await hubRes.json();
+            this.json(res, hubRes.status, data);
+          } catch (err) {
+            this.json(res, 502, { error: `Hub request failed: ${String(err)}` });
+          }
+          return;
+        }
         if (path === "/api/settings/hub" && req.method === "GET") {
           this.json(res, 200, { hubUrl: this.hubUrl });
           return;
@@ -69191,7 +69883,7 @@ EXPLANATION_END`;
           try {
             if (token) {
               mkdirSync19(join23(homedir14(), ".markus"), { recursive: true });
-              writeFileSync16(tokenPath, token, "utf-8");
+              writeFileSync17(tokenPath, token, "utf-8");
             } else if (existsSync27(tokenPath)) {
               rmSync3(tokenPath);
             }
@@ -72483,11 +73175,13 @@ var init_requirement_service = __esm({
         req.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
       }
       /**
-       * Check if all tasks for a requirement are done. If so, mark it as completed.
+       * Check if all tasks for a requirement are done. Instead of auto-completing,
+       * notify the creator agent so they can review results and decide whether to
+       * complete the requirement or create additional tasks.
        */
       checkCompletion(requirementId2, taskStatuses) {
         const req = this.requirements.get(requirementId2);
-        if (!req || req.status === "completed")
+        if (!req || req.status === "completed" || req.status === "cancelled")
           return false;
         if (req.taskIds.length === 0)
           return false;
@@ -72495,14 +73189,28 @@ var init_requirement_service = __esm({
           const status = taskStatuses.get(tid);
           return status === "completed" || status === "cancelled" || status === "archived";
         });
-        if (allDone) {
-          req.status = "completed";
-          req.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-          if (this.requirementRepo) {
-            this.requirementRepo.updateStatus(requirementId2, "completed").catch((e) => log62.error("Failed to persist requirement completion", { id: requirementId2, error: String(e) }));
+        if (allDone && req.createdBy && this.agentManager) {
+          try {
+            const agent = this.agentManager.getAgent(req.createdBy);
+            if (agent) {
+              agent.enqueueToMailbox("requirement_update", {
+                summary: `All tasks for requirement "${req.title}" are done \u2014 review needed`,
+                content: [
+                  `[REQUIREMENT REVIEW NEEDED] All linked tasks for "${req.title}" (ID: ${requirementId2}) have reached terminal state.`,
+                  "",
+                  "Please review the results and decide:",
+                  `1. If the requirement is fully satisfied, complete it: requirement_update_status(requirement_id="${requirementId2}", status="completed")`,
+                  `2. If more work is needed, create additional tasks with task_create(requirement_id="${requirementId2}", ...)`
+                ].join("\n"),
+                requirementId: requirementId2,
+                extra: { actionRequired: true }
+              }, {
+                priority: 2,
+                metadata: { senderName: "System", senderRole: "manager" }
+              });
+            }
+          } catch {
           }
-          this.broadcast("requirement:completed", req);
-          log62.info("Requirement completed", { id: requirementId2 });
           return true;
         }
         return false;
@@ -72646,14 +73354,13 @@ var init_requirement_service = __esm({
             parts.push("2. Abandon this requirement if the feedback indicates it is not needed");
           }
           const agent = this.agentManager.getAgent(creatorId);
-          const isRejection = decision === "rejected";
           agent.enqueueToMailbox("requirement_update", {
             summary: `Requirement "${req.title}" ${decision}`,
             content: parts.join("\n"),
             requirementId: req.id,
-            extra: isRejection ? { actionRequired: true } : void 0
+            extra: { actionRequired: true }
           }, {
-            priority: isRejection ? 1 : 3,
+            priority: 1,
             metadata: { senderName: "System", senderRole: "manager" }
           });
           log62.info("Notified creator agent about requirement decision", {
@@ -72871,7 +73578,7 @@ var init_knowledge_service = __esm({
 });
 
 // ../org-manager/dist/file-knowledge-store.js
-import { readFileSync as readFileSync22, writeFileSync as writeFileSync17, existsSync as existsSync28, mkdirSync as mkdirSync20, readdirSync as readdirSync11, unlinkSync as unlinkSync3 } from "node:fs";
+import { readFileSync as readFileSync22, writeFileSync as writeFileSync18, existsSync as existsSync28, mkdirSync as mkdirSync20, readdirSync as readdirSync11, unlinkSync as unlinkSync3 } from "node:fs";
 import { join as join24 } from "node:path";
 function readdirSafe(dir) {
   try {
@@ -72927,12 +73634,12 @@ var init_file_knowledge_store = __esm({
       saveEntry(entry) {
         const dir = this.scopeDir(entry.scope, entry.scopeId);
         mkdirSync20(dir, { recursive: true });
-        writeFileSync17(join24(dir, `${entry.id}.json`), JSON.stringify(entry, null, 2));
+        writeFileSync18(join24(dir, `${entry.id}.json`), JSON.stringify(entry, null, 2));
       }
       saveIndex(scope, scopeId, entries2) {
         const dir = this.scopeDir(scope, scopeId);
         mkdirSync20(dir, { recursive: true });
-        writeFileSync17(join24(dir, "_index.json"), JSON.stringify(entries2, null, 2));
+        writeFileSync18(join24(dir, "_index.json"), JSON.stringify(entries2, null, 2));
       }
       removeEntryFile(entry) {
         const p = join24(this.scopeDir(entry.scope, entry.scopeId), `${entry.id}.json`);
@@ -73970,7 +74677,8 @@ function openSqlite(dbPath) {
     { table: "chat_sessions", column: "is_main", sql: "ALTER TABLE chat_sessions ADD COLUMN is_main INTEGER NOT NULL DEFAULT 0" },
     { table: "mailbox_items", column: "retry_count", sql: "ALTER TABLE mailbox_items ADD COLUMN retry_count INTEGER NOT NULL DEFAULT 0" },
     { table: "users", column: "avatar_url", sql: "ALTER TABLE users ADD COLUMN avatar_url TEXT" },
-    { table: "agents", column: "avatar_url", sql: "ALTER TABLE agents ADD COLUMN avatar_url TEXT" }
+    { table: "agents", column: "avatar_url", sql: "ALTER TABLE agents ADD COLUMN avatar_url TEXT" },
+    { table: "channel_messages", column: "reply_to_id", sql: "ALTER TABLE channel_messages ADD COLUMN reply_to_id TEXT" }
   ];
   for (const m of migrations) {
     const cols = _db.prepare(`PRAGMA table_info(${m.table})`).all();
@@ -74027,7 +74735,7 @@ function migrateToExecutionStreamLogs(db) {
     log71.info(`Migration: copied ${actLogCount} agent_activity_logs to execution_stream_logs`);
   }
 }
-var log71, SCHEMA_SQL, _db, SqliteOrgRepo, SqliteAgentRepo, SqliteTaskRepo, SqliteRequirementRepo, SqliteProjectRepo, SqliteTaskLogRepo, SqliteTaskCommentRepo, SqliteRequirementCommentRepo, SqliteMessageRepo, SqliteChatSessionRepo, SqliteChannelMessageRepo, SqliteUserRepo, SqliteTeamRepo, SqliteMarketplaceTemplateRepo, SqliteMarketplaceSkillRepo, SqliteMarketplaceRatingRepo, SqliteAgentKnowledgeRepo, SqliteExternalAgentRepo, SqliteDeliverableRepo, SqliteActivityRepo, SqliteExecutionStreamRepo, SqliteMailboxRepo, SqliteDecisionRepo, SqliteNotificationRepo, SqliteApprovalRepo;
+var log71, SCHEMA_SQL, _db, SqliteOrgRepo, SqliteAgentRepo, SqliteTaskRepo, SqliteRequirementRepo, SqliteProjectRepo, SqliteTaskLogRepo, SqliteTaskCommentRepo, SqliteRequirementCommentRepo, SqliteMessageRepo, SqliteChatSessionRepo, SqliteChannelMessageRepo, SqliteUserRepo, SqliteTeamRepo, SqliteMarketplaceTemplateRepo, SqliteMarketplaceSkillRepo, SqliteMarketplaceRatingRepo, SqliteAgentKnowledgeRepo, SqliteExternalAgentRepo, SqliteDeliverableRepo, SqliteActivityRepo, SqliteExecutionStreamRepo, SqliteMailboxRepo, SqliteDecisionRepo, SqliteNotificationRepo, SqliteApprovalRepo, SqliteGroupChatRepo;
 var init_sqlite_storage = __esm({
   "../storage/dist/sqlite-storage.js"() {
     "use strict";
@@ -74165,6 +74873,7 @@ CREATE TABLE IF NOT EXISTS channel_messages (
   text TEXT NOT NULL,
   mentions TEXT NOT NULL DEFAULT '[]',
   metadata TEXT DEFAULT '{}',
+  reply_to_id TEXT,
   created_at TEXT NOT NULL DEFAULT (datetime('now'))
 );
 CREATE INDEX IF NOT EXISTS idx_channel_messages_channel ON channel_messages(channel, created_at);
@@ -74525,6 +75234,26 @@ CREATE TABLE IF NOT EXISTS approvals (
   selected_option TEXT
 );
 CREATE INDEX IF NOT EXISTS idx_approvals_status ON approvals(status, requested_at DESC);
+
+CREATE TABLE IF NOT EXISTS group_chats (
+  id TEXT PRIMARY KEY,
+  org_id TEXT NOT NULL DEFAULT 'default',
+  name TEXT NOT NULL,
+  channel_key TEXT NOT NULL UNIQUE,
+  creator_id TEXT NOT NULL,
+  creator_name TEXT NOT NULL,
+  created_at TEXT NOT NULL DEFAULT (datetime('now'))
+);
+
+CREATE TABLE IF NOT EXISTS group_chat_members (
+  group_chat_id TEXT NOT NULL REFERENCES group_chats(id) ON DELETE CASCADE,
+  member_id TEXT NOT NULL,
+  member_type TEXT NOT NULL CHECK(member_type IN ('human', 'agent')),
+  member_name TEXT NOT NULL,
+  added_at TEXT NOT NULL DEFAULT (datetime('now')),
+  PRIMARY KEY (group_chat_id, member_id)
+);
+CREATE INDEX IF NOT EXISTS idx_group_chat_members_group ON group_chat_members(group_chat_id);
 `;
     _db = null;
     SqliteOrgRepo = class {
@@ -75393,7 +76122,7 @@ CREATE INDEX IF NOT EXISTS idx_approvals_status ON approvals(status, requested_a
       async append(data) {
         const id = generateId2("chm");
         const ts = now();
-        this.db.prepare("INSERT INTO channel_messages (id, org_id, channel, sender_id, sender_type, sender_name, text, mentions, metadata, created_at) VALUES (?,?,?,?,?,?,?,?,?,?)").run(id, data.orgId, data.channel, data.senderId, data.senderType, data.senderName, data.text, toJson(data.mentions ?? []), toJson(data.metadata ?? {}), ts);
+        this.db.prepare("INSERT INTO channel_messages (id, org_id, channel, sender_id, sender_type, sender_name, text, mentions, metadata, reply_to_id, created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?)").run(id, data.orgId, data.channel, data.senderId, data.senderType, data.senderName, data.text, toJson(data.mentions ?? []), toJson(data.metadata ?? {}), data.replyToId ?? null, ts);
         return {
           id,
           orgId: data.orgId,
@@ -75404,17 +76133,20 @@ CREATE INDEX IF NOT EXISTS idx_approvals_status ON approvals(status, requested_a
           text: data.text,
           mentions: data.mentions ?? [],
           metadata: data.metadata ?? null,
+          replyToId: data.replyToId,
           createdAt: new Date(ts)
         };
       }
       getMessages(channel, limit = 50, before2) {
-        let q = "SELECT * FROM channel_messages WHERE channel = ?";
+        let q = `SELECT m.*, r.sender_name AS reply_to_sender, SUBSTR(r.text, 1, 120) AS reply_to_text
+      FROM channel_messages m LEFT JOIN channel_messages r ON m.reply_to_id = r.id
+      WHERE m.channel = ?`;
         const vals = [channel];
         if (before2) {
-          q += " AND created_at < ?";
+          q += " AND m.created_at < ?";
           vals.push(before2);
         }
-        q += " ORDER BY created_at DESC LIMIT ?";
+        q += " ORDER BY m.created_at DESC LIMIT ?";
         vals.push(limit + 1);
         const rows = this.db.prepare(q).all(...vals).map((r) => ({
           id: r["id"],
@@ -75426,11 +76158,26 @@ CREATE INDEX IF NOT EXISTS idx_approvals_status ON approvals(status, requested_a
           text: r["text"],
           mentions: fromJson(r["mentions"]),
           metadata: fromJson(r["metadata"]),
+          replyToId: r["reply_to_id"] ?? void 0,
+          replyToSender: r["reply_to_sender"] ?? void 0,
+          replyToText: r["reply_to_text"] ?? void 0,
           createdAt: toDate(r["created_at"])
         }));
         const hasMore = rows.length > limit;
         return { messages: rows.slice(0, limit).reverse(), hasMore };
       }
+      getMessageById(id) {
+        const r = this.db.prepare("SELECT * FROM channel_messages WHERE id = ?").get(id);
+        if (!r)
+          return void 0;
+        return {
+          id: r["id"],
+          senderName: r["sender_name"],
+          senderType: r["sender_type"],
+          senderId: r["sender_id"],
+          text: r["text"]
+        };
+      }
     };
     SqliteUserRepo = class {
       db;
@@ -76548,6 +77295,96 @@ CREATE INDEX IF NOT EXISTS idx_approvals_status ON approvals(status, requested_a
         };
       }
     };
+    SqliteGroupChatRepo = class {
+      db;
+      constructor(db) {
+        this.db = db;
+      }
+      create(data) {
+        const id = generateId2("gc");
+        const channelKey = `group:custom:${id}`;
+        const ts = now();
+        this.db.prepare("INSERT INTO group_chats (id, org_id, name, channel_key, creator_id, creator_name, created_at) VALUES (?,?,?,?,?,?,?)").run(id, data.orgId, data.name, channelKey, data.creatorId, data.creatorName, ts);
+        const insertMember = this.db.prepare("INSERT OR IGNORE INTO group_chat_members (group_chat_id, member_id, member_type, member_name, added_at) VALUES (?,?,?,?,?)");
+        const members = [];
+        for (const m of data.members) {
+          insertMember.run(id, m.id, m.type, m.name, ts);
+          members.push({ groupChatId: id, memberId: m.id, memberType: m.type, memberName: m.name, addedAt: new Date(ts) });
+        }
+        return {
+          id,
+          orgId: data.orgId,
+          name: data.name,
+          channelKey,
+          creatorId: data.creatorId,
+          creatorName: data.creatorName,
+          createdAt: new Date(ts),
+          members
+        };
+      }
+      list(orgId2) {
+        const rows = this.db.prepare(`SELECT g.*, (SELECT COUNT(*) FROM group_chat_members WHERE group_chat_id = g.id) AS member_count
+       FROM group_chats g WHERE g.org_id = ? ORDER BY g.created_at DESC`).all(orgId2);
+        return rows.map((r) => ({
+          ...this.mapRow(r),
+          memberCount: r["member_count"]
+        }));
+      }
+      getById(id) {
+        const r = this.db.prepare("SELECT * FROM group_chats WHERE id = ?").get(id);
+        if (!r)
+          return void 0;
+        const members = this.getMembers(id);
+        return { ...this.mapRow(r), members };
+      }
+      getByChannelKey(channelKey) {
+        const r = this.db.prepare("SELECT * FROM group_chats WHERE channel_key = ?").get(channelKey);
+        if (!r)
+          return void 0;
+        const gc = this.mapRow(r);
+        return { ...gc, members: this.getMembers(gc.id) };
+      }
+      getMembers(groupChatId) {
+        const rows = this.db.prepare("SELECT * FROM group_chat_members WHERE group_chat_id = ?").all(groupChatId);
+        return rows.map((r) => ({
+          groupChatId: r["group_chat_id"],
+          memberId: r["member_id"],
+          memberType: r["member_type"],
+          memberName: r["member_name"],
+          addedAt: toDate(r["added_at"])
+        }));
+      }
+      getAgentMemberIds(channelKey) {
+        const gc = this.db.prepare("SELECT id FROM group_chats WHERE channel_key = ?").get(channelKey);
+        if (!gc)
+          return [];
+        const rows = this.db.prepare("SELECT member_id FROM group_chat_members WHERE group_chat_id = ? AND member_type = 'agent'").all(gc.id);
+        return rows.map((r) => r.member_id);
+      }
+      addMember(groupChatId, memberId, memberType, memberName) {
+        this.db.prepare("INSERT OR IGNORE INTO group_chat_members (group_chat_id, member_id, member_type, member_name, added_at) VALUES (?,?,?,?,?)").run(groupChatId, memberId, memberType, memberName, now());
+      }
+      removeMember(groupChatId, memberId) {
+        this.db.prepare("DELETE FROM group_chat_members WHERE group_chat_id = ? AND member_id = ?").run(groupChatId, memberId);
+      }
+      updateName(id, name) {
+        this.db.prepare("UPDATE group_chats SET name = ? WHERE id = ?").run(name, id);
+      }
+      delete(id) {
+        this.db.prepare("DELETE FROM group_chats WHERE id = ?").run(id);
+      }
+      mapRow(r) {
+        return {
+          id: r["id"],
+          orgId: r["org_id"],
+          name: r["name"],
+          channelKey: r["channel_key"],
+          creatorId: r["creator_id"],
+          creatorName: r["creator_name"],
+          createdAt: toDate(r["created_at"])
+        };
+      }
+    };
   }
 });
 
@@ -76564,6 +77401,7 @@ __export(dist_exports3, {
   SqliteDeliverableRepo: () => SqliteDeliverableRepo,
   SqliteExecutionStreamRepo: () => SqliteExecutionStreamRepo,
   SqliteExternalAgentRepo: () => SqliteExternalAgentRepo,
+  SqliteGroupChatRepo: () => SqliteGroupChatRepo,
   SqliteMailboxRepo: () => SqliteMailboxRepo,
   SqliteMarketplaceRatingRepo: () => SqliteMarketplaceRatingRepo,
   SqliteMarketplaceSkillRepo: () => SqliteMarketplaceSkillRepo,
@@ -76633,7 +77471,8 @@ async function initSqliteStorage(url) {
       mailboxRepo: new storage.SqliteMailboxRepo(db),
       decisionRepo: new storage.SqliteDecisionRepo(db),
       notificationRepo: new storage.SqliteNotificationRepo(db),
-      approvalRepo: new storage.SqliteApprovalRepo(db)
+      approvalRepo: new storage.SqliteApprovalRepo(db),
+      groupChatRepo: new storage.SqliteGroupChatRepo(db)
     };
     log72.info("SQLite storage initialized", { path: dbPath });
     return bridge;
@@ -77725,7 +78564,7 @@ var init_startupProgress = __esm({
 
 // src/connector-service.ts
 import { resolve as resolve15, join as join28, dirname as dirname8 } from "node:path";
-import { existsSync as existsSync31, readFileSync as readFileSync23, writeFileSync as writeFileSync18, mkdirSync as mkdirSync24, readdirSync as readdirSync12, cpSync as cpSync2 } from "node:fs";
+import { existsSync as existsSync31, readFileSync as readFileSync23, writeFileSync as writeFileSync19, mkdirSync as mkdirSync24, readdirSync as readdirSync12, cpSync as cpSync3 } from "node:fs";
 import { homedir as homedir18 } from "node:os";
 import { execSync as execSync4 } from "node:child_process";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
@@ -77826,7 +78665,7 @@ function writePlatformConfig(connector, markusUrl, token) {
   setNestedField(config, connector.integration.tokenField, token);
   try {
     const content = JSON.stringify(config, null, 2);
-    writeFileSync18(configPath, content, "utf-8");
+    writeFileSync19(configPath, content, "utf-8");
     return true;
   } catch {
     return false;
@@ -77856,7 +78695,7 @@ function installSkillTemplate(connector) {
     mkdirSync24(targetDir, { recursive: true });
   }
   try {
-    cpSync2(sourceDir, targetDir, { recursive: true });
+    cpSync3(sourceDir, targetDir, { recursive: true });
     return true;
   } catch {
     return false;
@@ -77906,7 +78745,7 @@ __export(init_exports, {
   registerInitCommand: () => registerInitCommand
 });
 import { resolve as resolve16 } from "node:path";
-import { readFileSync as readFileSync24, existsSync as existsSync32, cpSync as cpSync3 } from "node:fs";
+import { readFileSync as readFileSync24, existsSync as existsSync32, cpSync as cpSync4 } from "node:fs";
 import { homedir as homedir19 } from "node:os";
 function registerInitCommand(program2) {
   program2.command("init").description("Setup wizard: configure LLM provider, API keys, and server settings").option("--force", "Overwrite existing configuration").option("--non-interactive", "Run without prompts (use env vars or --import-from)").option("--provider <name>", "LLM provider (anthropic/openai/google/minimax/siliconflow/zai/ollama)").option("--api-key <key>", "LLM API key").option("--port <port>", "API server port", "8056").option("--import-from <platform>", "Import LLM config from an installed agent platform (e.g. openclaw, hermes)").option("--auto-connect", "Auto-connect detected agent platforms after init").action(async (opts) => {
@@ -77922,7 +78761,7 @@ function registerInitCommand(program2) {
   });
 }
 async function quickInit(options) {
-  const { writeFileSync: writeFileSync20, mkdirSync: mkdirSync26 } = await import("node:fs");
+  const { writeFileSync: writeFileSync21, mkdirSync: mkdirSync26 } = await import("node:fs");
   const { join: pathJoin } = await import("node:path");
   const readline4 = await import("node:readline");
   const nonInteractive = options?.nonInteractive ?? false;
@@ -78195,13 +79034,13 @@ async function quickInit(options) {
   if (builtinTemplatesDir && existsSync32(builtinTemplatesDir) && !existsSync32(userTemplatesDir)) {
     const builtinRoot = resolve16(builtinTemplatesDir, "..");
     mkdirSync26(userTemplatesDir, { recursive: true });
-    cpSync3(builtinRoot, userTemplatesDir, { recursive: true });
+    cpSync4(builtinRoot, userTemplatesDir, { recursive: true });
     console.log(`  Copied templates to ${userTemplatesDir}`);
   }
   const devRoleDir = pathJoin(userTemplatesDir || pathJoin(process.cwd(), "templates"), "roles", "developer");
   if (!existsSync32(devRoleDir)) {
     mkdirSync26(devRoleDir, { recursive: true });
-    writeFileSync20(
+    writeFileSync21(
       pathJoin(devRoleDir, "ROLE.md"),
       [
         "---",
@@ -79109,6 +79948,19 @@ ${reason}`;
           }, triageProvider);
           return response.content;
         });
+        agent.getAttentionController().setLLMJudge(async (prompt) => {
+          const response = await llmRouter.chat({
+            messages: [
+              { role: "system", content: 'You are an attention interrupt judge. Decide whether to interrupt current work for a new incoming message. Reply with ONLY one word: continue, preempt, cancel, merge, or defer. Use "preempt" to pause (resume later) and "cancel" to permanently stop current work.' },
+              { role: "user", content: prompt }
+            ],
+            temperature: 0.1,
+            maxTokens: 32
+          }, triageProvider);
+          const raw = response.content.trim().toLowerCase();
+          const valid = ["continue", "preempt", "cancel", "merge", "defer"];
+          return valid.includes(raw) ? raw : "continue";
+        });
         agent.getAttentionController().setTriageChatFn(async (messages, tools) => {
           const llmTools = tools?.map((t) => ({
             name: t.name,
@@ -80135,6 +80987,12 @@ ${C3.BOLD}${C3.CYAN}\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550
     checkWarn("Skills directory not found", `${skillsDir} \u2014 run: markus skill install <name>`);
   }
   section("Network");
+  const proxyUrl = process.env["HTTPS_PROXY"] || process.env["HTTP_PROXY"] || process.env["https_proxy"] || process.env["http_proxy"];
+  if (proxyUrl) {
+    checkOk("HTTP proxy configured", proxyUrl);
+  } else {
+    checkWarn("HTTP proxy", "not configured \u2014 if behind firewall, set HTTPS_PROXY env var");
+  }
   try {
     const res = await fetch("https://api.anthropic.com/.well-known/ready", {
       method: "HEAD",
@@ -82816,7 +83674,7 @@ var skill_exports = {};
 __export(skill_exports, {
   registerSkillCommands: () => registerSkillCommands
 });
-import { writeFileSync as writeFileSync19, mkdirSync as mkdirSync25 } from "node:fs";
+import { writeFileSync as writeFileSync20, mkdirSync as mkdirSync25 } from "node:fs";
 import { resolve as resolve18 } from "node:path";
 function registerSkillCommands(program2) {
   const root = program2.command("skill").description("Skills registry and local scaffold");
@@ -82924,8 +83782,8 @@ Describe what this skill does for agents.
 ## Tools / behavior
 
 `;
-    writeFileSync19(resolve18(dir, "skill.json"), JSON.stringify(skillJson, null, 2) + "\n");
-    writeFileSync19(resolve18(dir, "SKILL.md"), skillMd);
+    writeFileSync20(resolve18(dir, "skill.json"), JSON.stringify(skillJson, null, 2) + "\n");
+    writeFileSync20(resolve18(dir, "SKILL.md"), skillMd);
     if (out.json) {
       console.log(JSON.stringify({ dir, files: ["skill.json", "SKILL.md"] }, null, 2));
     } else {