@markus-global/cli 0.4.22 → 0.4.24

package/dist/markus.mjs

@@ -4061,8 +4061,9 @@ var init_models = __esm({
         id: "deepseek",
         label: "DeepSeek",
         envKey: "DEEPSEEK_API_KEY",
-        defaultModel: "deepseek-chat",
-        models: ["deepseek-chat", "deepseek-coder", "deepseek-chat-v3"]
+        baseUrl: "https://api.deepseek.com",
+        defaultModel: "deepseek-v4-flash",
+        models: ["deepseek-v4-flash", "deepseek-v4-pro", "deepseek-chat", "deepseek-reasoner"]
       }
     ];
   }
@@ -8324,8 +8325,16 @@ var init_tool_selector = __esm({
             result.push({ name: tool.name, description: tool.description, inputSchema: tool.inputSchema });
           }
         }
+        const seen = new Set(result.map((t) => t.name));
         result.push(this.buildDiscoverTool(opts.allTools, selected, opts.skillCatalog));
-        result.push({
+        seen.add("discover_tools");
+        const pushUnique = (tool) => {
+          if (!seen.has(tool.name)) {
+            seen.add(tool.name);
+            result.push(tool);
+          }
+        };
+        pushUnique({
           name: "notify_user",
           description: "Send a message to the user. The message appears in the agent chat and as a notification. Write a comprehensive body \u2014 the user sees the full content and may reply. Use for status updates, reports, alerts, and findings.",
           inputSchema: {
@@ -8339,7 +8348,7 @@ var init_tool_selector = __esm({
             required: ["title", "body"]
           }
         });
-        result.push({
+        pushUnique({
           name: "request_user_approval",
           description: "Request a decision or approval from the user. The tool BLOCKS until the user responds. Use when you need human approval, a choice between options, or any user decision/input. Default options: Approve / Reject (reject requires a reason). You can provide custom options and optionally allow freeform text input.",
           inputSchema: {
@@ -8367,7 +8376,7 @@ var init_tool_selector = __esm({
             required: ["title", "description"]
           }
         });
-        result.push({
+        pushUnique({
           name: "recall_activity",
           description: 'Query your own execution history. Use "list" to see recent activities, or "get" with an activity_id to see detailed tool call logs for a specific activity.',
           inputSchema: {
@@ -8668,7 +8677,7 @@ function createShellTool(security, workspacePath, agentMeta, policy, onCommandAp
         }
       }
       const finalCommand = injectGitCommitMeta(command, agentMeta);
-      return new Promise((resolve21) => {
+      return new Promise((resolve20) => {
         const child = spawn("sh", ["-c", finalCommand], {
           cwd: effectiveCwd ?? void 0,
           stdio: ["ignore", "pipe", "pipe"],
@@ -8723,7 +8732,7 @@ function createShellTool(security, workspacePath, agentMeta, policy, onCommandAp
             flushOutput();
           }
           if (killed) {
-            resolve21(JSON.stringify({
+            resolve20(JSON.stringify({
               status: "error",
               error: `Command timed out after ${timeoutMs}ms`,
               exitCode: code,
@@ -8731,7 +8740,7 @@ function createShellTool(security, workspacePath, agentMeta, policy, onCommandAp
               stderr: stderr.slice(0, 4e3)
             }));
           } else if (code !== 0) {
-            resolve21(JSON.stringify({
+            resolve20(JSON.stringify({
               status: "error",
               error: stderr.trim() || `Process exited with code ${code}`,
               exitCode: code,
@@ -8739,7 +8748,7 @@ function createShellTool(security, workspacePath, agentMeta, policy, onCommandAp
               stderr: stderr.slice(0, 4e3)
             }));
           } else {
-            resolve21(JSON.stringify({
+            resolve20(JSON.stringify({
               status: "success",
               stdout: stdout.trim() || void 0,
               stderr: stderr.trim() || void 0
@@ -8752,7 +8761,7 @@ function createShellTool(security, workspacePath, agentMeta, policy, onCommandAp
             clearTimeout(flushTimer);
             flushOutput();
           }
-          resolve21(JSON.stringify({
+          resolve20(JSON.stringify({
             status: "error",
             error: err.message,
             stdout: stdout.slice(0, 4e3),
@@ -14852,8 +14861,8 @@ var init_custom_element_registry = __esm({
         } : (element) => element.localName === localName;
         registry.set(localName, { Class, check: check2 });
         if (waiting.has(localName)) {
-          for (const resolve21 of waiting.get(localName))
-            resolve21(Class);
+          for (const resolve20 of waiting.get(localName))
+            resolve20(Class);
           waiting.delete(localName);
         }
         ownerDocument.querySelectorAll(
@@ -14893,13 +14902,13 @@ var init_custom_element_registry = __esm({
        */
       whenDefined(localName) {
         const { registry, waiting } = this;
-        return new Promise((resolve21) => {
+        return new Promise((resolve20) => {
           if (registry.has(localName))
-            resolve21(registry.get(localName).Class);
+            resolve20(registry.get(localName).Class);
           else {
             if (!waiting.has(localName))
               waiting.set(localName, []);
-            waiting.get(localName).push(resolve21);
+            waiting.get(localName).push(resolve20);
           }
         });
       }
@@ -41155,13 +41164,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,
@@ -41189,7 +41226,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",
@@ -41209,23 +41246,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 = [];
@@ -41264,21 +41306,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;
@@ -41306,10 +41334,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.",
@@ -41333,7 +41363,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) {
@@ -41348,13 +41378,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/"
+    ];
   }
 });
 
@@ -41766,7 +41810,7 @@ var init_search = __esm({
 
 // ../core/dist/tools/patch.js
 import { readFileSync as readFileSync9, writeFileSync as writeFileSync7, mkdirSync as mkdirSync8, existsSync as existsSync13, unlinkSync } from "node:fs";
-import { dirname as dirname4, resolve as resolve7 } from "node:path";
+import { dirname as dirname4 } from "node:path";
 function createPatchTool(security, workspacePath, policy) {
   const guard = security ?? defaultSecurityGuard;
   return {
@@ -41817,7 +41861,7 @@ function createPatchTool(security, workspacePath, policy) {
       if (!patches || !Array.isArray(patches) || patches.length === 0) {
         return JSON.stringify({ status: "error", error: "patches array is required and must not be empty" });
       }
-      const basePath = workspacePath ?? process.cwd();
+      const resolvedPaths = [];
       const results = [];
       for (const patch of patches) {
         const { resolved: filePath, access } = resolveAndCheckAccess(patch.file, workspacePath, policy);
@@ -41858,6 +41902,7 @@ function createPatchTool(security, workspacePath, policy) {
         if (patch.action === "create" && !patch.content && patch.content !== "") {
           return JSON.stringify({ status: "error", error: `create action requires content for ${patch.file}` });
         }
+        resolvedPaths.push(filePath);
       }
       if (dryRun) {
         return JSON.stringify({
@@ -41866,8 +41911,9 @@ function createPatchTool(security, workspacePath, policy) {
           patchCount: patches.length
         });
       }
-      for (const patch of patches) {
-        const filePath = resolve7(basePath, patch.file);
+      for (let i = 0; i < patches.length; i++) {
+        const patch = patches[i];
+        const filePath = resolvedPaths[i];
         switch (patch.action) {
           case "edit": {
             let content = readFileSync9(filePath, "utf-8");
@@ -41923,7 +41969,7 @@ var init_patch = __esm({
 
 // ../core/dist/tools/process-manager.js
 import { spawn as spawn2 } from "node:child_process";
-import { resolve as resolve8 } from "node:path";
+import { resolve as resolve7 } from "node:path";
 function onBackgroundCompletion(cb) {
   completionListeners.push(cb);
   return () => {
@@ -41985,8 +42031,8 @@ function createBackgroundExecTool(workspacePath) {
       const cwd = args["cwd"];
       const timeoutSec = args["timeout_seconds"] ?? 300;
       const basePath = workspacePath ?? process.cwd();
-      const effectiveCwd = cwd ? resolve8(basePath, cwd) : basePath;
-      if (workspacePath && !effectiveCwd.startsWith(resolve8(workspacePath))) {
+      const effectiveCwd = cwd ? resolve7(basePath, cwd) : basePath;
+      if (workspacePath && !effectiveCwd.startsWith(resolve7(workspacePath))) {
         return JSON.stringify({ status: "denied", error: "Working directory must be within workspace" });
       }
       const id = `bg_${++sessionCounter}_${Date.now()}`;
@@ -42250,7 +42296,7 @@ async function llmCallWithRetry(fn, label) {
         error: String(err).slice(0, SUBAGENT_ERROR_PREVIEW_CHARS),
         delay
       });
-      await new Promise((resolve21) => setTimeout(resolve21, delay));
+      await new Promise((resolve20) => setTimeout(resolve20, delay));
     }
   }
   throw lastErr;
@@ -42323,7 +42369,7 @@ async function runSubagentLoop(ctx, task, opts) {
       metadata: { iteration: iterations, finishReason: response.finishReason }
     });
     if (response.finishReason === "max_tokens" && !response.toolCalls?.length) {
-      messages.push({ role: "assistant", content: response.content });
+      messages.push({ role: "assistant", content: response.content, reasoningContent: response.reasoningContent });
       logEntries.push({ ts: (/* @__PURE__ */ new Date()).toISOString(), role: "assistant", content: response.content });
       messages.push({
         role: "user",
@@ -42333,7 +42379,8 @@ async function runSubagentLoop(ctx, task, opts) {
       messages.push({
         role: "assistant",
         content: response.content,
-        toolCalls: response.toolCalls
+        toolCalls: response.toolCalls,
+        reasoningContent: response.reasoningContent
       });
       logEntries.push({
         ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -42838,9 +42885,9 @@ ${typeLabel}${item.payload.content}`;
        */
       wakeIdleLoop() {
         if (this.idleResolve) {
-          const resolve21 = this.idleResolve;
+          const resolve20 = this.idleResolve;
           this.idleResolve = void 0;
-          resolve21();
+          resolve20();
         }
       }
       /**
@@ -42865,8 +42912,8 @@ ${typeLabel}${item.payload.content}`;
         const item = this.dequeue();
         if (item)
           return item;
-        await new Promise((resolve21) => {
-          this.idleResolve = resolve21;
+        await new Promise((resolve20) => {
+          this.idleResolve = resolve20;
         });
         const afterWake = this.dequeue();
         if (!afterWake) {
@@ -42917,6 +42964,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.
        */
@@ -43158,7 +43217,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)
@@ -43195,6 +43254,8 @@ var init_attention = __esm({
       triageToolHandlers;
       triageChatFn;
       lastTriageResult;
+      /** Tracks whether the last yield-point decision was 'cancel' vs 'preempt'. */
+      lastYieldDecision;
       unsubscribeNewItem;
       decisions = [];
       watchdogTimer;
@@ -43391,6 +43452,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;
@@ -43398,7 +43460,7 @@ var init_attention = __esm({
         try {
           const processing = this.delegate?.processMailboxItem(item);
           const backstopMs = this.waitingForHumanApproval ? APPROVAL_WAIT_TIMEOUT_MS : MAILBOX_PROCESSING_TIMEOUT_MS;
-          const backstop = new Promise((resolve21) => setTimeout(() => resolve21(void 0), backstopMs));
+          const backstop = new Promise((resolve20) => setTimeout(() => resolve20(void 0), backstopMs));
           const result = await Promise.race([
             processing?.then((r) => ({ done: true, reply: r })),
             backstop.then(() => ({ done: false, reply: void 0 }))
@@ -43425,6 +43487,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;
@@ -43483,8 +43566,8 @@ var init_attention = __esm({
        * The promise is single-use; call again to get a fresh one.
        */
       waitForPreemptionSignal() {
-        return new Promise((resolve21) => {
-          this.criticalInterruptResolve = resolve21;
+        return new Promise((resolve20) => {
+          this.criticalInterruptResolve = resolve20;
         });
       }
       /**
@@ -43500,7 +43583,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() {
@@ -43533,8 +43617,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 };
       }
       /**
@@ -43617,7 +43706,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) {
@@ -43632,17 +43721,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,
@@ -43650,7 +43751,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");
       }
@@ -43706,7 +43814,7 @@ var init_attention = __esm({
                 raw = response.content;
                 break;
               }
-              messages.push({ role: "assistant", content: response.content, toolCalls: response.toolCalls });
+              messages.push({ role: "assistant", content: response.content, toolCalls: response.toolCalls, reasoningContent: response.reasoningContent });
               for (const tc of response.toolCalls) {
                 const handler4 = this.triageToolHandlers.get(tc.name);
                 let result;
@@ -44206,7 +44314,7 @@ var init_task_queue = __esm({
        */
       async waitForAll() {
         while (this.runningTasks.size > 0 || this.queue.length > 0) {
-          await new Promise((resolve21) => setTimeout(resolve21, 100));
+          await new Promise((resolve20) => setTimeout(resolve20, 100));
         }
       }
     };
@@ -44333,12 +44441,12 @@ var init_task_executor = __esm({
        * 等待任务完成
        */
       async waitForTaskCompletion(taskId2) {
-        return new Promise((resolve21) => {
+        return new Promise((resolve20) => {
           const checkInterval = setInterval(() => {
             const task = this.taskQueue.getTaskStatus(taskId2);
             if (task && task.status !== TaskStatus.PENDING && task.status !== TaskStatus.RUNNING) {
               clearInterval(checkInterval);
-              resolve21(task);
+              resolve20(task);
             }
           }, 100);
         });
@@ -44842,24 +44950,24 @@ function extensionForMime(mime) {
 async function checkMarkitdown() {
   if (markitdownAvailable !== null)
     return markitdownAvailable;
-  return new Promise((resolve21) => {
+  return new Promise((resolve20) => {
     execFile2("markitdown", ["--help"], { timeout: 5e3 }, (err) => {
       markitdownAvailable = !err;
       if (!markitdownAvailable) {
         log16.info('markitdown CLI not found; file-to-text conversion will be limited. Install with: pip install "markitdown[all]"');
       }
-      resolve21(markitdownAvailable);
+      resolve20(markitdownAvailable);
     });
   });
 }
 async function convertWithMarkitdown(filePath) {
-  return new Promise((resolve21, reject) => {
+  return new Promise((resolve20, reject) => {
     execFile2("markitdown", [filePath], { timeout: 3e4, maxBuffer: 10 * 1024 * 1024 }, (err, stdout, stderr) => {
       if (err) {
         reject(new Error(`markitdown failed: ${stderr || err.message}`));
         return;
       }
-      resolve21(stdout);
+      resolve20(stdout);
     });
   });
 }
@@ -45272,6 +45380,7 @@ ${notification.stdoutTail}`);
         log17.info(`Agent started: ${this.config.name}`);
       }
       async stop() {
+        this.cancelActiveStream();
         this.attentionController.stop();
         this.heartbeat.stop();
         this._bgCompletionUnsub?.();
@@ -45317,14 +45426,14 @@ ${notification.stdoutTail}`);
             toolEventCollector: options?.toolEventCollector
           }
         };
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve20, reject) => {
           this.mailbox.enqueue(sourceType, payload, {
             priority: options?.priority,
             metadata: {
               senderId,
               senderName: senderInfo?.name,
               senderRole: senderInfo?.role,
-              responsePromise: { resolve: resolve21, reject }
+              responsePromise: { resolve: resolve20, reject }
             }
           });
         });
@@ -45346,14 +45455,14 @@ ${notification.stdoutTail}`);
             cancelToken
           }
         };
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve20, reject) => {
           this.mailbox.enqueue("human_chat", payload, {
             priority: 0,
             metadata: {
               senderId,
               senderName: senderInfo?.name,
               senderRole: senderInfo?.role,
-              responsePromise: { resolve: resolve21, reject }
+              responsePromise: { resolve: resolve20, reject }
             }
           });
         });
@@ -45381,12 +45490,12 @@ ${notification.stdoutTail}`);
             executionRound
           }
         };
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve20, reject) => {
           this.mailbox.enqueue("task_status_update", payload, {
             priority: 1,
             metadata: {
               taskId: taskId2,
-              responsePromise: { resolve: resolve21, reject }
+              responsePromise: { resolve: resolve20, reject }
             }
           });
         });
@@ -45404,13 +45513,13 @@ ${notification.stdoutTail}`);
             onLog
           }
         };
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve20, reject) => {
           this.mailbox.enqueue("session_reply", payload, {
             metadata: {
               senderId,
               senderName: senderInfo?.name,
               senderRole: senderInfo?.role,
-              responsePromise: { resolve: resolve21, reject }
+              responsePromise: { resolve: resolve20, reject }
             }
           });
         });
@@ -45473,7 +45582,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) })) : [];
@@ -45569,7 +45678,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;
               }
@@ -45803,6 +45912,7 @@ ${notification.stdoutTail}`);
         if (this.state.status === "offline")
           return;
         this.pauseReason = reason;
+        this.cancelActiveStream();
         this.heartbeat.stop();
         this.attentionController.stop();
         if (this.memoryConsolidationTimer) {
@@ -46633,10 +46743,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";
@@ -46644,14 +46755,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);
@@ -46792,7 +46903,7 @@ ${block}
               break;
             }
             if (response.finishReason === "max_tokens" && !response.toolCalls?.length) {
-              this.memory.appendMessage(sessionId, { role: "assistant", content: response.content });
+              this.memory.appendMessage(sessionId, { role: "assistant", content: response.content, reasoningContent: response.reasoningContent });
               const contMsg = {
                 role: "user",
                 content: "[Continue from where you left off. Do not repeat what you already said.]"
@@ -46802,7 +46913,8 @@ ${block}
               this.memory.appendMessage(sessionId, {
                 role: "assistant",
                 content: response.content,
-                toolCalls: response.toolCalls
+                toolCalls: response.toolCalls,
+                reasoningContent: response.reasoningContent
               });
               const currentActId = this.state.currentActivity?.id;
               const toolResults = await Promise.all(response.toolCalls.map(async (tc) => {
@@ -46894,13 +47006,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}
@@ -46943,10 +47056,10 @@ ${chatYield.item.payload.content}`;
           const outputCheck = await this.guardrails.checkOutput(displayReply, { agentId: this.id });
           if (!outputCheck.passed) {
             const filtered = `[Response filtered: ${outputCheck.reason}]`;
-            this.memory.appendMessage(sessionId, { role: "assistant", content: filtered });
+            this.memory.appendMessage(sessionId, { role: "assistant", content: filtered, reasoningContent: response.reasoningContent });
             return filtered;
           }
-          this.memory.appendMessage(sessionId, { role: "assistant", content: displayReply });
+          this.memory.appendMessage(sessionId, { role: "assistant", content: displayReply, reasoningContent: response.reasoningContent });
           if (!isLightweight && displayReply.length > 50 && senderId) {
             this.memory.writeDailyLog(this.id, `[Chat with ${senderInfo?.name ?? senderId}] Q: ${userMessage.slice(0, 150)}... A: ${displayReply.slice(0, 300)}`);
           }
@@ -47081,6 +47194,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);
@@ -47118,7 +47232,8 @@ ${chatYield.item.payload.content}`;
             if (response.finishReason === "max_tokens" && !response.toolCalls?.length) {
               this.memory.appendMessage(this.currentSessionId, {
                 role: "assistant",
-                content: response.content
+                content: response.content,
+                reasoningContent: response.reasoningContent
               });
               this.memory.appendMessage(this.currentSessionId, {
                 role: "user",
@@ -47128,7 +47243,8 @@ ${chatYield.item.payload.content}`;
               this.memory.appendMessage(this.currentSessionId, {
                 role: "assistant",
                 content: response.content,
-                toolCalls: response.toolCalls
+                toolCalls: response.toolCalls,
+                reasoningContent: response.reasoningContent
               });
               const subagentProgressCb = (event) => {
                 onEvent({
@@ -47231,6 +47347,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);
@@ -47249,10 +47366,10 @@ ${chatYield.item.payload.content}`;
           const outputCheck = await this.guardrails.checkOutput(displayReply, { agentId: this.id });
           if (!outputCheck.passed) {
             const filtered = `[Response filtered: ${outputCheck.reason}]`;
-            this.memory.appendMessage(this.currentSessionId, { role: "assistant", content: filtered });
+            this.memory.appendMessage(this.currentSessionId, { role: "assistant", content: filtered, reasoningContent: response.reasoningContent });
             return filtered;
           }
-          this.memory.appendMessage(this.currentSessionId, { role: "assistant", content: displayReply });
+          this.memory.appendMessage(this.currentSessionId, { role: "assistant", content: displayReply, reasoningContent: response.reasoningContent });
           if (streamChatActivityId && thinkingBuffer.trim()) {
             this.emitActivityLog(streamChatActivityId, "text", thinkingBuffer, { isThinking: true });
           }
@@ -47535,7 +47652,7 @@ ${chatYield.item.payload.content}`;
             }
             flushText();
             if (response.finishReason === "max_tokens" && !response.toolCalls?.length) {
-              this.memory.appendMessage(sessionId, { role: "assistant", content: response.content });
+              this.memory.appendMessage(sessionId, { role: "assistant", content: response.content, reasoningContent: response.reasoningContent });
               this.memory.appendMessage(sessionId, {
                 role: "user",
                 content: "[Continue from where you left off. Do not repeat what you already said.]"
@@ -47544,7 +47661,8 @@ ${chatYield.item.payload.content}`;
               this.memory.appendMessage(sessionId, {
                 role: "assistant",
                 content: response.content,
-                toolCalls: response.toolCalls
+                toolCalls: response.toolCalls,
+                reasoningContent: response.reasoningContent
               });
               let interruptedDuringTools = false;
               for (const tc of response.toolCalls) {
@@ -47637,14 +47755,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)
               });
@@ -47729,7 +47849,7 @@ ${yieldResult.item.payload.content}`
           if (!didSubmitReview && !cancelToken?.cancelled) {
             log17.warn("Task execution ending without task_submit_review \u2014 injecting final reminder", { taskId: taskId2, agentId: this.id });
             flushText();
-            this.memory.appendMessage(sessionId, { role: "assistant", content: response.content });
+            this.memory.appendMessage(sessionId, { role: "assistant", content: response.content, reasoningContent: response.reasoningContent });
             this.memory.appendMessage(sessionId, {
               role: "user",
               content: [
@@ -47774,7 +47894,8 @@ ${yieldResult.item.payload.content}`
               this.memory.appendMessage(sessionId, {
                 role: "assistant",
                 content: response.content,
-                toolCalls: response.toolCalls
+                toolCalls: response.toolCalls,
+                reasoningContent: response.reasoningContent
               });
               for (const tc of response.toolCalls) {
                 if (cancelToken?.cancelled)
@@ -47806,12 +47927,12 @@ ${yieldResult.item.payload.content}`
             } else {
               flushText();
               const finalReply = stripCompletionMarker(sanitizeLLMReply(response.content));
-              this.memory.appendMessage(sessionId, { role: "assistant", content: finalReply });
+              this.memory.appendMessage(sessionId, { role: "assistant", content: finalReply, reasoningContent: response.reasoningContent });
             }
           } else {
             flushText();
             const finalReply = stripCompletionMarker(sanitizeLLMReply(response.content));
-            this.memory.appendMessage(sessionId, { role: "assistant", content: finalReply });
+            this.memory.appendMessage(sessionId, { role: "assistant", content: finalReply, reasoningContent: response.reasoningContent });
           }
           emit("status", "execution_finished", {});
           this.metricsCollector.recordTaskCompletion(taskId2, "completed", Date.now() - taskStartMs);
@@ -47950,7 +48071,7 @@ ${yieldResult.item.payload.content}`
               break;
             flushText();
             if (response.finishReason === "max_tokens" && !response.toolCalls?.length) {
-              this.memory.appendMessage(sessionId, { role: "assistant", content: response.content });
+              this.memory.appendMessage(sessionId, { role: "assistant", content: response.content, reasoningContent: response.reasoningContent });
               this.memory.appendMessage(sessionId, {
                 role: "user",
                 content: "[Continue from where you left off. Do not repeat what you already said.]"
@@ -47959,7 +48080,8 @@ ${yieldResult.item.payload.content}`
               this.memory.appendMessage(sessionId, {
                 role: "assistant",
                 content: response.content,
-                toolCalls: response.toolCalls
+                toolCalls: response.toolCalls,
+                reasoningContent: response.reasoningContent
               });
               for (const tc of response.toolCalls) {
                 if (this.attentionController.hasInterruptPending()) {
@@ -48013,7 +48135,7 @@ ${yieldResult.item.payload.content}`
           flushText();
           const rawReply = sanitizeLLMReply(response.content);
           const displayReply = stripCompletionMarker(rawReply);
-          this.memory.appendMessage(sessionId, { role: "assistant", content: displayReply });
+          this.memory.appendMessage(sessionId, { role: "assistant", content: displayReply, reasoningContent: response.reasoningContent });
           return rawReply;
         } catch (error) {
           if (textBuffer.trim()) {
@@ -48533,7 +48655,7 @@ ${escalationReason}`;
               error: String(error).slice(0, 200),
               delay
             });
-            await new Promise((resolve21) => setTimeout(resolve21, delay));
+            await new Promise((resolve20) => setTimeout(resolve20, delay));
           }
         }
         throw lastError;
@@ -48809,7 +48931,7 @@ ${todayLog.slice(0, HEARTBEAT_DAILY_LOG_CHARS)}
                 agentId: this.id,
                 error: String(error).slice(0, 200)
               });
-              await new Promise((resolve21) => setTimeout(resolve21, delay));
+              await new Promise((resolve20) => setTimeout(resolve20, delay));
             }
           }
         }
@@ -49103,7 +49225,7 @@ ${promo.content}` : promo.content;
 
 // ../core/dist/role-loader.js
 import { readFileSync as readFileSync11, existsSync as existsSync16, readdirSync as readdirSync3 } from "node:fs";
-import { join as join11, resolve as resolve9 } from "node:path";
+import { join as join11, resolve as resolve8 } from "node:path";
 var RoleLoader;
 var init_role_loader = __esm({
   "../core/dist/role-loader.js"() {
@@ -49112,7 +49234,7 @@ var init_role_loader = __esm({
     RoleLoader = class {
       templateDirs;
       constructor(templateDirs) {
-        this.templateDirs = templateDirs ?? [resolve9(process.cwd(), "templates", "roles")];
+        this.templateDirs = templateDirs ?? [resolve8(process.cwd(), "templates", "roles")];
       }
       getTemplateDirs() {
         return this.templateDirs;
@@ -49452,7 +49574,7 @@ var init_mcp_client = __esm({
         }
       }
       sendRequest(proc, method, params) {
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve20, reject) => {
           const id = ++this.requestId;
           const message = JSON.stringify({ jsonrpc: "2.0", id, method, params }) + "\n";
           const timeoutMs = method === "tools/call" ? 12e4 : 3e4;
@@ -49460,7 +49582,7 @@ var init_mcp_client = __esm({
             this.pendingRequests.delete(id);
             reject(new Error(`MCP request timeout for ${method} (id=${id}, ${timeoutMs}ms)`));
           }, timeoutMs);
-          this.pendingRequests.set(id, { resolve: resolve21, reject, method, timer, proc });
+          this.pendingRequests.set(id, { resolve: resolve20, reject, method, timer, proc });
           proc.stdin?.write(message);
         });
       }
@@ -50359,6 +50481,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.`
+        });
+      }
     }] : []
   ];
 }
@@ -52220,11 +52403,11 @@ function createSettingsTools(ctx) {
           },
           base_url: {
             type: "string",
-            description: 'Optional base URL for the API (e.g. "https://api.deepseek.com/v1")'
+            description: 'Optional base URL for the API (e.g. "https://api.deepseek.com")'
           },
           model: {
             type: "string",
-            description: 'Default model ID (e.g. "deepseek-chat")'
+            description: 'Default model ID (e.g. "deepseek-v4-flash")'
           }
         },
         required: ["name", "model"]
@@ -52349,7 +52532,7 @@ function createSettingsTools(ctx) {
           },
           id: {
             type: "string",
-            description: 'Model ID (e.g. "deepseek-chat-v3")'
+            description: 'Model ID (e.g. "deepseek-v4-flash")'
           },
           name: {
             type: "string",
@@ -52875,7 +53058,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?.() ?? [];
@@ -53271,6 +53454,17 @@ You are ${request.name}.`,
             }
           }
         }
+        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,
@@ -53436,7 +53630,8 @@ You are ${request.name}.`,
           ...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))
@@ -54009,7 +54204,8 @@ You are ${row.name}.`,
           ...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))
@@ -55299,7 +55495,7 @@ var init_openai = __esm({
             };
           }
           if (m.toolCalls?.length) {
-            return {
+            const msg = {
               role: "assistant",
               content: getTextContent(m.content) || null,
               tool_calls: m.toolCalls.map((tc) => ({
@@ -55308,6 +55504,17 @@ var init_openai = __esm({
                 function: { name: tc.name, arguments: JSON.stringify(tc.arguments) }
               }))
             };
+            if (m.reasoningContent)
+              msg.reasoning_content = m.reasoningContent;
+            return msg;
+          }
+          if (m.role === "assistant" && m.reasoningContent) {
+            const msg = {
+              role: "assistant",
+              content: typeof m.content === "string" ? m.content : getTextContent(m.content),
+              reasoning_content: m.reasoningContent
+            };
+            return msg;
           }
           if (Array.isArray(m.content)) {
             return {
@@ -55319,14 +55526,22 @@ var init_openai = __esm({
         });
       }
       convertTools(tools) {
-        return tools.map((t) => ({
-          type: "function",
-          function: {
-            name: t.name,
-            description: t.description,
-            parameters: t.inputSchema
-          }
-        }));
+        const seen = /* @__PURE__ */ new Set();
+        const unique = [];
+        for (const t of tools) {
+          if (seen.has(t.name))
+            continue;
+          seen.add(t.name);
+          unique.push({
+            type: "function",
+            function: {
+              name: t.name,
+              description: t.description,
+              parameters: t.inputSchema
+            }
+          });
+        }
+        return unique;
       }
       async chatStream(request, onEvent, signal) {
         const messages = this.convertMessages(request.messages);
@@ -55373,6 +55588,7 @@ var init_openai = __esm({
           throw new Error(`OpenAI API error ${res.status}: ${errText}`);
         }
         let content = "";
+        let reasoningContent = "";
         const toolCalls = /* @__PURE__ */ new Map();
         let finishReason = "end_turn";
         let promptTokens = 0;
@@ -55398,9 +55614,10 @@ var init_openai = __esm({
             try {
               const chunk = JSON.parse(trimmed.slice(6));
               const choice = chunk.choices?.[0];
-              const reasoningContent = choice?.delta?.reasoning_details ?? choice?.delta?.thinking;
-              if (reasoningContent) {
-                onEvent({ type: "thinking_delta", thinking: reasoningContent });
+              const deltaReasoning = choice?.delta?.reasoning_content ?? choice?.delta?.reasoning_details ?? choice?.delta?.thinking;
+              if (deltaReasoning) {
+                reasoningContent += deltaReasoning;
+                onEvent({ type: "thinking_delta", thinking: deltaReasoning });
               }
               if (choice?.delta?.content) {
                 content += choice.delta.content;
@@ -55451,12 +55668,15 @@ var init_openai = __esm({
         });
         const usage = { inputTokens: promptTokens, outputTokens: completionTokens };
         onEvent({ type: "message_end", usage, finishReason });
-        return {
+        const streamResult = {
           content,
           toolCalls: resultToolCalls.length ? resultToolCalls : void 0,
           usage,
           finishReason
         };
+        if (reasoningContent)
+          streamResult.reasoningContent = reasoningContent;
+        return streamResult;
       }
       convertResponse(data) {
         const choice = data.choices[0];
@@ -55473,7 +55693,7 @@ var init_openai = __esm({
           tool_calls: "tool_use",
           length: "max_tokens"
         };
-        return {
+        const result = {
           content: typeof msg.content === "string" ? msg.content : "",
           toolCalls: toolCalls?.length ? toolCalls : void 0,
           usage: {
@@ -55482,6 +55702,9 @@ var init_openai = __esm({
           },
           finishReason: finishMap[choice.finish_reason] ?? "end_turn"
         };
+        if (msg.reasoning_content)
+          result.reasoningContent = msg.reasoning_content;
+        return result;
       }
     };
   }
@@ -55946,7 +56169,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;
@@ -55977,7 +56200,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).
@@ -55986,7 +56209,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);
@@ -55998,7 +56221,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);
@@ -56215,7 +56438,7 @@ var init_oauth_manager = __esm({
         const state = randomBytes2(16).toString("hex");
         const port = config.callbackPort ?? 1455;
         const redirectUri = `http://localhost:${port}/auth/callback`;
-        const promise = new Promise((resolve21, reject) => {
+        const promise = new Promise((resolve20, reject) => {
           const pending = {
             provider,
             state,
@@ -56224,7 +56447,7 @@ var init_oauth_manager = __esm({
             redirectUri,
             resolve: (tokens) => {
               const profile = this.profileStore.createOAuthProfile(provider, tokens, `${provider} (${tokens.accountId ?? "OAuth"})`);
-              resolve21(profile);
+              resolve20(profile);
             },
             reject
           };
@@ -56580,7 +56803,7 @@ var init_router = __esm({
        */
       static isNonRetryableError(error) {
         const msg = error instanceof Error ? error.message : String(error);
-        return /\b(402|403|401)\b/.test(msg) || /insufficient balance/i.test(msg) || /not available in your region/i.test(msg) || /invalid.*api.*key/i.test(msg) || /authentication/i.test(msg);
+        return /\b(401|402|403)\b/.test(msg) || /insufficient balance/i.test(msg) || /not available in your region/i.test(msg) || /invalid.*api.*key/i.test(msg) || /authentication/i.test(msg) || /\b400\b.*invalid_request_error/i.test(msg) || /reasoning_content.*must be passed back/i.test(msg);
       }
       /** Detect rate-limit (429) errors which should use a shorter circuit breaker cooldown. */
       static isRateLimitError(error) {
@@ -56793,14 +57016,25 @@ var init_router = __esm({
         return "simple";
       }
       selectProvider(request, explicit) {
-        if (explicit)
+        if (explicit && this.isAvailable(explicit))
           return explicit;
+        if (explicit && this.disabledProviders.has(explicit)) {
+          log36.warn(`Explicit provider ${explicit} is disabled \u2014 falling through to auto-select`);
+        }
         if (!this.autoSelect || this.providerTiers.length === 0) {
           if (this.isAvailable(this.defaultProvider) && this.providers.has(this.defaultProvider)) {
             return this.defaultProvider;
           }
           const healthy2 = [...this.providers.keys()].find((n) => this.isAvailable(n));
-          return healthy2 ?? this.defaultProvider;
+          if (healthy2)
+            return healthy2;
+          const enabledAny2 = [...this.providers.keys()].find((n) => !this.disabledProviders.has(n));
+          if (enabledAny2) {
+            log36.warn(`All providers degraded \u2014 using enabled provider ${enabledAny2} as last resort`);
+            return enabledAny2;
+          }
+          log36.warn("All providers disabled or degraded \u2014 using default as last resort");
+          return this.defaultProvider;
         }
         const complexity = _LLMRouter.assessComplexity(request);
         const match = this.providerTiers.find((t) => t.complexity.includes(complexity) && this.providers.has(t.name) && this.isAvailable(t.name));
@@ -56813,7 +57047,12 @@ var init_router = __esm({
           log36.warn(`All tiered providers degraded for complexity=${complexity}, falling back to: ${healthy}`);
           return healthy;
         }
-        log36.warn("All providers degraded \u2014 using default as last resort");
+        const enabledAny = [...this.providers.keys()].find((n) => !this.disabledProviders.has(n));
+        if (enabledAny) {
+          log36.warn(`All providers degraded \u2014 using enabled provider ${enabledAny} as last resort`);
+          return enabledAny;
+        }
+        log36.warn("All providers disabled or degraded \u2014 using default as last resort");
         return this.defaultProvider;
       }
       getFallbacks(primary) {
@@ -57102,7 +57341,7 @@ var init_router = __esm({
         for (const [name, p] of this.providers.entries()) {
           providers[name] = { model: p.model, configured: true };
         }
-        for (const name of ["anthropic", "openai", "openai-codex", "google", "ollama", "minimax", "siliconflow", "openrouter", "zai"]) {
+        for (const name of ["anthropic", "openai", "openai-codex", "google", "ollama", "minimax", "siliconflow", "openrouter", "zai", "deepseek"]) {
           if (!providers[name]) {
             providers[name] = { model: "", configured: false };
           }
@@ -57134,7 +57373,7 @@ var init_router = __esm({
             oauthAccountId: oauthProfile?.oauth?.accountId
           };
         }
-        for (const name of ["anthropic", "openai", "openai-codex", "google", "ollama", "minimax", "siliconflow", "openrouter", "zai"]) {
+        for (const name of ["anthropic", "openai", "openai-codex", "google", "ollama", "minimax", "siliconflow", "openrouter", "zai", "deepseek"]) {
           if (!providers[name]) {
             const oauthProfile = this._profileStore?.getDefaultProfile(name);
             const builtinModels = BUILTIN_MODEL_CATALOG.filter((m) => m.provider === name);
@@ -57189,6 +57428,13 @@ var init_router = __esm({
           this.disabledProviders.delete(providerName);
         } else {
           this.disabledProviders.add(providerName);
+          if (this.defaultProvider === providerName) {
+            const replacement = [...this.providers.keys()].find((n) => !this.disabledProviders.has(n));
+            if (replacement) {
+              log36.info(`Default provider ${providerName} disabled \u2014 switching default to ${replacement}`);
+              this.defaultProvider = replacement;
+            }
+          }
         }
         log36.info(`Provider ${providerName} ${enabled ? "enabled" : "disabled"}`);
       }
@@ -57301,7 +57547,8 @@ var init_router = __esm({
       siliconflow: "SiliconFlow",
       minimax: "MiniMax",
       openrouter: "OpenRouter",
-      zai: "ZAI"
+      zai: "ZAI",
+      deepseek: "DeepSeek"
     };
     BUILTIN_MODEL_CATALOG = [
       // Anthropic — https://docs.anthropic.com/claude/reference/input-and-output-sizes
@@ -57325,7 +57572,12 @@ var init_router = __esm({
       { id: "xiaomi/mimo-v2-pro", name: "MiMo-V2-Pro", provider: "openrouter", contextWindow: 1048576, maxOutputTokens: 131072, cost: { input: 1, output: 3, cacheRead: 0.2 }, reasoning: true, inputTypes: ["text"] },
       { id: "anthropic/claude-opus-4-6", name: "Claude Opus 4.6 (via OpenRouter)", provider: "openrouter", contextWindow: 1e6, maxOutputTokens: 128e3, cost: { input: 5, output: 25, cacheRead: 0.5, cacheWrite: 6.25 }, reasoning: true, inputTypes: ["text", "image"] },
       { id: "openai/gpt-5.4", name: "GPT-5.4 (via OpenRouter)", provider: "openrouter", contextWindow: 11e5, maxOutputTokens: 128e3, cost: { input: 2.5, output: 15, cacheRead: 0.25 }, reasoning: true, inputTypes: ["text", "image"] },
-      { id: "google/gemini-3-1-pro", name: "Gemini 3.1 Pro (via OpenRouter)", provider: "openrouter", contextWindow: 1e6, maxOutputTokens: 65536, cost: { input: 2, output: 12 }, reasoning: true, inputTypes: ["text", "image"] }
+      { id: "google/gemini-3-1-pro", name: "Gemini 3.1 Pro (via OpenRouter)", provider: "openrouter", contextWindow: 1e6, maxOutputTokens: 65536, cost: { input: 2, output: 12 }, reasoning: true, inputTypes: ["text", "image"] },
+      // DeepSeek — https://api-docs.deepseek.com/
+      { id: "deepseek-v4-flash", name: "DeepSeek-V4-Flash", provider: "deepseek", contextWindow: 1e6, maxOutputTokens: 384e3, cost: { input: 0.14, output: 0.28, cacheRead: 0.028 }, reasoning: true, inputTypes: ["text"] },
+      { id: "deepseek-v4-pro", name: "DeepSeek-V4-Pro", provider: "deepseek", contextWindow: 1e6, maxOutputTokens: 384e3, cost: { input: 1.67, output: 3.33, cacheRead: 0.14 }, reasoning: true, inputTypes: ["text"] },
+      { id: "deepseek-chat", name: "DeepSeek-Chat (legacy)", provider: "deepseek", contextWindow: 65536, maxOutputTokens: 8192, cost: { input: 0.14, output: 0.28, cacheRead: 0.028 }, reasoning: false, inputTypes: ["text"] },
+      { id: "deepseek-reasoner", name: "DeepSeek-Reasoner (legacy)", provider: "deepseek", contextWindow: 65536, maxOutputTokens: 8192, cost: { input: 0.55, output: 2.19, cacheRead: 0.14 }, reasoning: true, inputTypes: ["text"] }
     ];
   }
 });
@@ -58186,7 +58438,7 @@ var init_registry = __esm({
 
 // ../core/dist/skills/loader.js
 import { readFileSync as readFileSync15, readdirSync as readdirSync5, existsSync as existsSync20 } from "node:fs";
-import { join as join16, resolve as resolve10 } from "node:path";
+import { join as join16, resolve as resolve9 } from "node:path";
 function resolveMcpServerPaths(servers, skillDir) {
   if (!servers)
     return void 0;
@@ -59152,7 +59404,7 @@ var init_composition = __esm({
 
 // ../core/dist/workflow/team-template.js
 import { readdirSync as readdirSync7, readFileSync as readFileSync17, existsSync as existsSync22 } from "node:fs";
-import { join as join18, resolve as resolve11, dirname as dirname5 } from "node:path";
+import { join as join18, resolve as resolve10, dirname as dirname5 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 function loadTeamTemplateFromDir(dirPath) {
   const fsHelper = { existsSync: existsSync22, readFileSync: (p, _enc) => readFileSync17(p, "utf-8"), join: join18 };
@@ -59193,16 +59445,16 @@ function createDefaultTeamTemplates() {
     const thisFile = fileURLToPath3(import.meta.url);
     const thisDir = dirname5(thisFile);
     const candidates = [
-      resolve11(thisDir, "..", "templates", "teams"),
+      resolve10(thisDir, "..", "templates", "teams"),
       // npm global: dist/ → ../templates/teams
-      resolve11(thisDir, "..", "..", "..", "..", "templates", "teams"),
+      resolve10(thisDir, "..", "..", "..", "..", "templates", "teams"),
       // monorepo: packages/core/dist/workflow/ → root
-      resolve11(process.cwd(), "templates", "teams")
+      resolve10(process.cwd(), "templates", "teams")
       // cwd fallback
     ];
     templatesDir = candidates.find((d) => existsSync22(d)) ?? candidates[candidates.length - 1];
   } catch {
-    templatesDir = resolve11(process.cwd(), "templates", "teams");
+    templatesDir = resolve10(process.cwd(), "templates", "teams");
   }
   if (!existsSync22(templatesDir)) {
     log47.warn(`Team templates directory not found: ${templatesDir}`);
@@ -59348,7 +59600,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;
@@ -59482,15 +59734,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) {
@@ -60226,8 +60478,8 @@ 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 { join as join20, resolve as resolve12 } from "node:path";
+import { mkdirSync as mkdirSync16, writeFileSync as writeFileSync14, readFileSync as readFileSync18, existsSync as existsSync24, cpSync } from "node:fs";
+import { join as join20, resolve as resolve11 } from "node:path";
 import { homedir as homedir11 } from "node:os";
 function formatLocalTimestamp(d = /* @__PURE__ */ new Date()) {
   const pad = (n) => String(n).padStart(2, "0");
@@ -60579,7 +60831,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:",
@@ -60628,6 +60880,10 @@ var init_task_service = __esm({
         const lower = errorContent.toLowerCase();
         return lower.includes("econnreset") || lower.includes("econnrefused") || lower.includes("etimedout") || lower.includes("fetch failed") || lower.includes("aborterror") || lower.includes("aborted") || lower.includes("socket hang up") || lower.includes("network");
       }
+      static isNonRetryableError(errorContent) {
+        const lower = errorContent.toLowerCase();
+        return lower.includes("invalid_request_error") && /\b400\b/.test(errorContent) || lower.includes("reasoning_content") || lower.includes("invalid api key") || lower.includes("insufficient balance") || /\b(401|402|403)\b/.test(errorContent) && !lower.includes("rate");
+      }
       shouldRetryTask(taskId2, errorContent, retryAttempt, cancelled) {
         if (cancelled)
           return { shouldRetry: false, reason: "cancelled" };
@@ -60638,6 +60894,9 @@ var init_task_service = __esm({
         if (retryAttempt >= _TaskService.MAX_IN_PROGRESS_RETRIES) {
           return { shouldRetry: false, reason: `exceeded max retries (${_TaskService.MAX_IN_PROGRESS_RETRIES})` };
         }
+        if (_TaskService.isNonRetryableError(errorContent)) {
+          return { shouldRetry: false, reason: "non-retryable error (auth/billing/request)" };
+        }
         const normalizedError = errorContent.replace(/\d{4}-\d{2}-\d{2}T[\d:.]+Z?/g, "").trim().slice(0, 200);
         const tracker = this.taskRetryErrors.get(taskId2);
         if (tracker && tracker.lastError === normalizedError) {
@@ -61607,7 +61866,7 @@ ${c.content}`;
         });
         if (this.hitlService && request.createdBy && request.createdBy !== "default") {
           this.hitlService.notify({
-            targetUserId: "default",
+            targetUserId: "all",
             type: "task_created",
             title: `Task created: ${task.title}`,
             body: `Agent created task "${task.title}"`,
@@ -61874,7 +62133,7 @@ Action: ${guidance}` : ""
           const notifType = to === "completed" ? "task_completed" : to === "review" ? "task_review" : "task_failed";
           const priority = to === "failed" ? "high" : "normal";
           this.hitlService.notify({
-            targetUserId: "default",
+            targetUserId: "all",
             type: notifType,
             title: to === "review" ? `Task ready for review: ${task.title}` : to === "completed" ? `Task completed: ${task.title}` : `Task failed: ${task.title}`,
             body: `Task "${task.title}" status changed to ${to}`,
@@ -62645,10 +62904,11 @@ 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) {
+          let src;
           if (d.type === "file" && d.reference) {
-            const src = resolve12(d.reference);
+            src = resolve11(d.reference);
             if (existsSync24(src)) {
               try {
                 const destName = src.split("/").pop() ?? "deliverable";
@@ -62658,9 +62918,10 @@ 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);
+          if (d.type === "file" && d.summary && src && !existsSync24(src)) {
+            const baseName = d.reference.split("/").pop() ?? "deliverable";
+            const safeName = baseName.replace(/[^a-zA-Z0-9_\u4e00-\u9fff.-]/g, "_").slice(0, 80);
+            writeFileSync14(join20(taskSharedDir, `${safeName}.md`), d.summary);
           }
         }
         log51.info("Deliverables published to shared workspace", { taskId: task.id, dir: taskSharedDir });
@@ -63486,7 +63747,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, cpSync as cpSync2 } 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({
@@ -63592,7 +63853,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 {
@@ -63654,7 +63915,7 @@ var init_builder_service = __esm({
                 }
               }
             }
-            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" });
@@ -64369,23 +64630,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;
@@ -64458,8 +64702,8 @@ 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 { join as join22, resolve as resolve12 } from "node:path";
+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) {
@@ -64593,7 +64837,7 @@ async function installSkill(request, skillRegistry) {
   let installed = false;
   let installMethod = "metadata-only";
   if (source === "builtin") {
-    const builtinDir = resolve13(process.cwd(), "templates", "skills", safeName);
+    const builtinDir = resolve12(process.cwd(), "templates", "skills", safeName);
     if (existsSync26(builtinDir)) {
       mkdirSync18(targetDir, { recursive: true });
       for (const file of readdirSync9(builtinDir)) {
@@ -64610,7 +64854,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 });
@@ -64636,7 +64880,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";
       }
@@ -64650,7 +64894,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";
         }
@@ -64666,7 +64910,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 });
@@ -64698,13 +64942,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 {
     }
@@ -64737,8 +64981,8 @@ 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 { join as join23, resolve as resolve13, dirname as dirname6 } from "node:path";
+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) {
@@ -64828,7 +65072,7 @@ var init_api_server = __esm({
     init_skill_service();
     log57 = createLogger("api-server");
     PBKDF2_ITERATIONS = 1e4;
-    APIServer = class {
+    APIServer = class _APIServer {
       orgService;
       taskService;
       port;
@@ -64853,7 +65097,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;
@@ -64868,15 +65112,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",
@@ -64889,41 +65136,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");
@@ -64933,13 +65220,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
+            };
           }
         });
       }
@@ -65005,10 +65306,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);
           }
@@ -65239,48 +65540,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,
@@ -65288,8 +65708,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",
@@ -65299,10 +65721,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) {
@@ -65322,6 +65763,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) {
@@ -65577,7 +66068,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);
@@ -65654,6 +66145,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) {
@@ -65664,7 +66156,8 @@ var init_api_server = __esm({
               senderType: "human",
               senderName,
               text,
-              mentions
+              mentions,
+              replyToId
             });
           }
           const humanOnly = body["humanOnly"] === true;
@@ -65682,21 +66175,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;
@@ -65710,7 +66232,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);
@@ -65753,7 +66275,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
             });
@@ -65780,7 +66302,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,
@@ -65980,7 +66502,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",
@@ -65988,21 +66510,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") {
@@ -66012,31 +66529,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);
@@ -66271,7 +66886,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;
         }
@@ -67116,7 +67731,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}` });
@@ -68155,7 +68770,7 @@ EXPLANATION_END`;
           return;
         }
         if (path === "/api/skills/builtin" && req.method === "GET") {
-          const builtinDir = resolve14(process.cwd(), "templates", "skills");
+          const builtinDir = resolve13(process.cwd(), "templates", "skills");
           const found = discoverSkillsInDir(builtinDir);
           const installedSkills = new Map((this.skillRegistry?.list() ?? []).map((s) => [s.name, s]));
           const skills = found.map(({ manifest, path: p }) => {
@@ -68455,7 +69070,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)) {
@@ -68463,18 +69078,18 @@ 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) {
@@ -68486,15 +69101,15 @@ EXPLANATION_END`;
                 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;
@@ -68503,7 +69118,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");
                 }
               }
             }
@@ -68541,7 +69156,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);
@@ -68550,7 +69165,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 {
                 }
               }
@@ -69224,10 +69839,10 @@ EXPLANATION_END`;
         if (path === "/api/templates/teams" && req.method === "GET") {
           try {
             const { readdirSync: readdirSync13, readFileSync: readFileSync27 } = await import("node:fs");
-            const { resolve: resolve21 } = await import("node:path");
-            const teamsDir = resolve21(process.cwd(), "templates", "teams");
+            const { resolve: resolve20 } = await import("node:path");
+            const teamsDir = resolve20(process.cwd(), "templates", "teams");
             const files = readdirSync13(teamsDir).filter((f) => f.endsWith(".json"));
-            const teams = files.map((f) => JSON.parse(readFileSync27(resolve21(teamsDir, f), "utf-8")));
+            const teams = files.map((f) => JSON.parse(readFileSync27(resolve20(teamsDir, f), "utf-8")));
             this.json(res, 200, { templates: teams });
           } catch {
             this.json(res, 200, { templates: [] });
@@ -69351,7 +69966,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);
             }
@@ -69778,7 +70393,9 @@ EXPLANATION_END`;
             return;
           }
           try {
+            const prevDefault = this.llmRouter.getSettings().defaultProvider;
             this.llmRouter.setProviderEnabled(providerName, enabled);
+            const newDefault = this.llmRouter.getSettings().defaultProvider;
             try {
               const { loadConfig: loadCfg } = await Promise.resolve().then(() => (init_dist(), dist_exports));
               const currentConfig = loadCfg(this.markusConfigPath);
@@ -69788,7 +70405,11 @@ EXPLANATION_END`;
               } else {
                 providers[providerName] = { enabled };
               }
-              saveConfig({ llm: { providers } }, this.markusConfigPath);
+              const configUpdates = { llm: { providers } };
+              if (prevDefault !== newDefault) {
+                configUpdates.llm.defaultProvider = newDefault;
+              }
+              saveConfig(configUpdates, this.markusConfigPath);
             } catch (e) {
               log57.warn("Failed to persist provider enabled state", { error: String(e) });
             }
@@ -69798,6 +70419,70 @@ EXPLANATION_END`;
           }
           return;
         }
+        if (path.match(/^\/api\/settings\/llm\/providers\/[^/]+\/test$/) && req.method === "POST") {
+          const auth = await this.requireAuth(req, res);
+          if (!auth)
+            return;
+          if (!this.llmRouter) {
+            this.json(res, 503, { error: "LLM router not available" });
+            return;
+          }
+          const providerName = path.split("/")[5];
+          const provider = this.llmRouter.getProvider(providerName);
+          if (!provider) {
+            this.json(res, 404, { ok: false, error: `Provider "${providerName}" not found or not configured` });
+            return;
+          }
+          try {
+            const startMs = Date.now();
+            const response = await this.llmRouter.chat({
+              messages: [{ role: "user", content: "Reply with exactly one word: hello" }],
+              maxTokens: 32,
+              temperature: 0
+            }, providerName);
+            const durationMs = Date.now() - startMs;
+            const reply = (response.content ?? "").trim();
+            if (!reply) {
+              this.json(res, 200, {
+                ok: false,
+                error: "Model returned empty response \u2014 API key or model may be misconfigured",
+                model: provider.model,
+                durationMs
+              });
+            } else {
+              this.json(res, 200, {
+                ok: true,
+                durationMs,
+                model: provider.model,
+                reply: reply.slice(0, 100),
+                usage: response.usage
+              });
+            }
+          } catch (err) {
+            const raw = String(err);
+            const statusMatch = raw.match(/(?:API error|status)\s+(\d{3})/i);
+            const errorCode = statusMatch ? Number(statusMatch[1]) : void 0;
+            let errorMsg = raw.replace(/^Error:\s*/, "");
+            const jsonStart = errorMsg.indexOf("{");
+            if (jsonStart >= 0) {
+              try {
+                const jsonStr = errorMsg.slice(jsonStart);
+                const parsed = JSON.parse(jsonStr);
+                if (parsed.error?.message) {
+                  errorMsg = `[${parsed.error.type ?? parsed.error.code ?? errorCode ?? "error"}] ${parsed.error.message}`;
+                }
+              } catch {
+              }
+            }
+            this.json(res, 200, {
+              ok: false,
+              error: errorMsg.slice(0, 500),
+              errorCode,
+              model: provider.model
+            });
+          }
+          return;
+        }
         if (path === "/api/settings/env-models" && req.method === "GET") {
           const auth = await this.requireAuth(req, res);
           if (!auth)
@@ -69809,7 +70494,8 @@ EXPLANATION_END`;
             { provider: "siliconflow", displayName: "SiliconFlow", keyEnv: "SILICONFLOW_API_KEY", modelEnv: "SILICONFLOW_MODEL", baseUrlEnv: "SILICONFLOW_BASE_URL", defaultModel: "Qwen/Qwen3.5-35B-A3B", defaultBaseUrl: "https://api.siliconflow.cn/v1" },
             { provider: "minimax", displayName: "MiniMax", keyEnv: "MINIMAX_API_KEY", modelEnv: "MINIMAX_MODEL", baseUrlEnv: "MINIMAX_BASE_URL", defaultModel: "MiniMax-M2.7", defaultBaseUrl: "https://api.minimax.io/v1" },
             { provider: "openrouter", displayName: "OpenRouter", keyEnv: "OPENROUTER_API_KEY", modelEnv: "OPENROUTER_MODEL", baseUrlEnv: "OPENROUTER_BASE_URL", defaultModel: "xiaomi/mimo-v2-pro", defaultBaseUrl: "https://openrouter.ai/api/v1" },
-            { provider: "zai", displayName: "ZAI", keyEnv: "ZAI_API_KEY", modelEnv: "ZAI_MODEL", baseUrlEnv: "ZAI_BASE_URL", defaultModel: "glm-5.1", defaultBaseUrl: "https://api.z.ai/api/paas/v4" }
+            { provider: "zai", displayName: "ZAI", keyEnv: "ZAI_API_KEY", modelEnv: "ZAI_MODEL", baseUrlEnv: "ZAI_BASE_URL", defaultModel: "glm-5.1", defaultBaseUrl: "https://api.z.ai/api/paas/v4" },
+            { provider: "deepseek", displayName: "DeepSeek", keyEnv: "DEEPSEEK_API_KEY", modelEnv: "DEEPSEEK_MODEL", baseUrlEnv: "DEEPSEEK_BASE_URL", defaultModel: "deepseek-v4-flash", defaultBaseUrl: "https://api.deepseek.com" }
           ];
           const detected = [];
           for (const def of ENV_MODEL_MAP) {
@@ -69862,7 +70548,9 @@ EXPLANATION_END`;
                 google: "GOOGLE_API_KEY",
                 siliconflow: "SILICONFLOW_API_KEY",
                 minimax: "MINIMAX_API_KEY",
-                openrouter: "OPENROUTER_API_KEY"
+                openrouter: "OPENROUTER_API_KEY",
+                zai: "ZAI_API_KEY",
+                deepseek: "DEEPSEEK_API_KEY"
               };
               const apiKey = process.env[envKeyMap[pu.provider] ?? ""];
               if (!apiKey)
@@ -70481,14 +71169,14 @@ EXPLANATION_END`;
             return;
           }
           try {
-            const { resolve: resolve21, extname } = await import("node:path");
+            const { resolve: resolve20, extname } = await import("node:path");
             const { existsSync: existsSync36, statSync: statSync6 } = await import("node:fs");
             const results = {};
             const mdExts = [".md", ".markdown"];
             const imageExts = [".png", ".jpg", ".jpeg", ".gif", ".webp", ".svg"];
             for (const p of paths.slice(0, 50)) {
               try {
-                const resolved = resolve21(p);
+                const resolved = resolve20(p);
                 if (!existsSync36(resolved)) {
                   results[p] = { exists: false, isFile: false, type: "unknown" };
                   continue;
@@ -70521,9 +71209,9 @@ EXPLANATION_END`;
             return;
           }
           try {
-            const { resolve: resolve21, extname } = await import("node:path");
+            const { resolve: resolve20, extname } = await import("node:path");
             const { readFileSync: readFileSync27, existsSync: existsSync36, statSync: statSync6 } = await import("node:fs");
-            const resolved = resolve21(filePath);
+            const resolved = resolve20(filePath);
             if (!existsSync36(resolved)) {
               this.json(res, 404, { error: "File not found" });
               return;
@@ -70571,10 +71259,10 @@ EXPLANATION_END`;
             return;
           }
           try {
-            const { resolve: resolve21, dirname: dirname11 } = await import("node:path");
+            const { resolve: resolve20, dirname: dirname11 } = await import("node:path");
             const { existsSync: existsSync36, statSync: statSync6 } = await import("node:fs");
             const { exec: exec2 } = await import("node:child_process");
-            const resolved = resolve21(filePath);
+            const resolved = resolve20(filePath);
             if (!existsSync36(resolved)) {
               this.json(res, 404, { error: "Path not found" });
               return;
@@ -71304,14 +71992,14 @@ EXPLANATION_END`;
         res.end(JSON.stringify(data));
       }
       readBody(req) {
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve20, reject) => {
           const chunks = [];
           req.on("data", (chunk) => chunks.push(chunk));
           req.on("end", () => {
             try {
-              resolve21(JSON.parse(Buffer.concat(chunks).toString()));
+              resolve20(JSON.parse(Buffer.concat(chunks).toString()));
             } catch {
-              resolve21({});
+              resolve20({});
             }
           });
           req.on("error", reject);
@@ -71621,7 +72309,7 @@ var init_hitl_service = __esm({
         this.persistApproval(approval);
         log58.info(`Approval requested: ${id} by ${opts.agentName}`);
         this.notify({
-          targetUserId: opts.targetUserId ?? "default",
+          targetUserId: opts.targetUserId ?? "all",
           type: "approval_request",
           title: `Approval needed: ${opts.title}`,
           body: opts.description,
@@ -71634,13 +72322,13 @@ var init_hitl_service = __esm({
       }
       async requestApprovalAndWait(opts) {
         const approval = this.requestApproval(opts);
-        return new Promise((resolve21) => {
-          this.pendingResolvers.set(approval.id, resolve21);
+        return new Promise((resolve20) => {
+          this.pendingResolvers.set(approval.id, resolve20);
           if (opts.expiresInMs) {
             setTimeout(() => {
               if (this.pendingResolvers.has(approval.id)) {
                 this.pendingResolvers.delete(approval.id);
-                resolve21({ approved: false, comment: "Approval timed out" });
+                resolve20({ approved: false, comment: "Approval timed out" });
               }
             }, opts.expiresInMs);
           }
@@ -71670,10 +72358,10 @@ var init_hitl_service = __esm({
           } catch {
           }
         }
-        const resolve21 = this.pendingResolvers.get(id);
-        if (resolve21) {
+        const resolve20 = this.pendingResolvers.get(id);
+        if (resolve20) {
           this.pendingResolvers.delete(id);
-          resolve21({ approved, comment, selectedOption });
+          resolve20({ approved, comment, selectedOption });
         }
         return approval;
       }
@@ -72389,7 +73077,7 @@ var init_requirement_service = __esm({
             title: `Requirement approval: ${req.title}`,
             description: `Agent "${req.createdBy}" proposed requirement "${req.title}" (priority: ${req.priority}).`,
             details: { requirementId: req.id, priority: req.priority },
-            targetUserId: "default"
+            targetUserId: "all"
           }).then((result) => {
             const current = this.requirements.get(req.id);
             if (!current || current.status !== "pending")
@@ -72522,7 +73210,7 @@ var init_requirement_service = __esm({
             title: `Requirement approval (resubmitted): ${req.title}`,
             description: `Agent "${req.createdBy}" resubmitted requirement "${req.title}" (priority: ${req.priority}).`,
             details: { requirementId: req.id, priority: req.priority },
-            targetUserId: "default"
+            targetUserId: "all"
           }).then((result) => {
             const current = this.requirements.get(req.id);
             if (!current || current.status !== "pending")
@@ -72643,11 +73331,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;
@@ -72655,14 +73345,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;
@@ -72806,14 +73510,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", {
@@ -72826,7 +73529,7 @@ var init_requirement_service = __esm({
           const title = decision === "approved" ? `Requirement approved: ${req.title}` : `Requirement rejected: ${req.title}`;
           const body = decision === "approved" ? `Requirement "${req.title}" has been approved and is now in progress.` : `Requirement "${req.title}" has been rejected.${reason ? ` Reason: ${reason}` : ""}`;
           this.hitlService.notify({
-            targetUserId: "default",
+            targetUserId: "all",
             type: "requirement_decision",
             title,
             body,
@@ -73031,7 +73734,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 {
@@ -73087,12 +73790,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`);
@@ -74130,7 +74833,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();
@@ -74187,7 +74891,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";
@@ -74325,6 +75029,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);
@@ -74685,6 +75390,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 {
@@ -75553,7 +76278,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,
@@ -75564,17 +76289,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"],
@@ -75586,11 +76314,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;
@@ -76610,8 +77353,8 @@ CREATE INDEX IF NOT EXISTS idx_approvals_status ON approvals(status, requested_a
        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(n.id, n.userId, n.type, n.title, n.body, n.priority, n.read ? 1 : 0, n.actionType, n.actionTarget, n.metadata ? JSON.stringify(n.metadata) : null, n.createdAt);
       }
       list(userId, opts) {
-        const conditions = ["(user_id = ? OR user_id = ?)"];
-        const params = [userId, "all"];
+        const conditions = ["(user_id = ? OR user_id = ? OR user_id = ?)"];
+        const params = [userId, "all", "default"];
         if (opts?.unreadOnly) {
           conditions.push("read = 0");
         }
@@ -76626,8 +77369,8 @@ CREATE INDEX IF NOT EXISTS idx_approvals_status ON approvals(status, requested_a
         return this.db.prepare(sql).all(...params).map((r) => this.mapRow(r));
       }
       count(userId, unreadOnly = false) {
-        const conditions = ["(user_id = ? OR user_id = ?)"];
-        const params = [userId, "all"];
+        const conditions = ["(user_id = ? OR user_id = ? OR user_id = ?)"];
+        const params = [userId, "all", "default"];
         if (unreadOnly)
           conditions.push("read = 0");
         const row = this.db.prepare(`SELECT COUNT(*) as cnt FROM user_notifications WHERE ${conditions.join(" AND ")}`).get(...params);
@@ -76638,7 +77381,7 @@ CREATE INDEX IF NOT EXISTS idx_approvals_status ON approvals(status, requested_a
         return info4.changes > 0;
       }
       markAllRead(userId) {
-        const info4 = this.db.prepare("UPDATE user_notifications SET read = 1 WHERE (user_id = ? OR user_id = ?) AND read = 0").run(userId, "all");
+        const info4 = this.db.prepare("UPDATE user_notifications SET read = 1 WHERE (user_id = ? OR user_id = ? OR user_id = ?) AND read = 0").run(userId, "all", "default");
         return Number(info4.changes);
       }
       mapRow(r) {
@@ -76708,6 +77451,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"])
+        };
+      }
+    };
   }
 });
 
@@ -76724,6 +77557,7 @@ __export(dist_exports3, {
   SqliteDeliverableRepo: () => SqliteDeliverableRepo,
   SqliteExecutionStreamRepo: () => SqliteExecutionStreamRepo,
   SqliteExternalAgentRepo: () => SqliteExternalAgentRepo,
+  SqliteGroupChatRepo: () => SqliteGroupChatRepo,
   SqliteMailboxRepo: () => SqliteMailboxRepo,
   SqliteMarketplaceRatingRepo: () => SqliteMarketplaceRatingRepo,
   SqliteMarketplaceSkillRepo: () => SqliteMarketplaceSkillRepo,
@@ -76793,7 +77627,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;
@@ -77884,8 +78719,8 @@ 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 cpSync3 } from "node:fs";
+import { resolve as resolve14, join as join28, dirname as dirname8 } from "node:path";
+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";
@@ -77894,9 +78729,9 @@ function expandHome(p) {
 }
 function loadConnectors() {
   const connectors = /* @__PURE__ */ new Map();
-  const builtinDir = resolve15(__dirname3, "..", "connectors");
+  const builtinDir = resolve14(__dirname3, "..", "connectors");
   loadFromDir(builtinDir, connectors);
-  const devDir = resolve15(process.cwd(), "packages", "cli", "connectors");
+  const devDir = resolve14(process.cwd(), "packages", "cli", "connectors");
   if (devDir !== builtinDir) loadFromDir(devDir, connectors);
   const userDir = join28(homedir18(), ".markus", "connectors");
   loadFromDir(userDir, connectors);
@@ -77986,7 +78821,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;
@@ -78000,8 +78835,8 @@ function installSkillTemplate(connector) {
   const templateName = connector.integration.skillTemplateName;
   const candidates = [
     join28(homedir18(), ".markus", "templates", templateName),
-    resolve15(process.cwd(), "templates", templateName),
-    resolve15(__dirname3, "..", "templates", templateName)
+    resolve14(process.cwd(), "templates", templateName),
+    resolve14(__dirname3, "..", "templates", templateName)
   ];
   let sourceDir;
   for (const c of candidates) {
@@ -78065,11 +78900,11 @@ __export(init_exports, {
   quickInit: () => quickInit,
   registerInitCommand: () => registerInitCommand
 });
-import { resolve as resolve16 } from "node:path";
+import { resolve as resolve15 } from "node:path";
 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) => {
+  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/deepseek/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) => {
     await quickInit({
       force: opts.force,
       nonInteractive: opts.nonInteractive,
@@ -78082,7 +78917,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;
@@ -78126,7 +78961,8 @@ async function quickInit(options) {
     siliconflow: "Qwen/Qwen3.5-35B-A3B",
     ollama: "llama3",
     openrouter: "xiaomi/mimo-v2-pro",
-    zai: "glm-5.1"
+    zai: "glm-5.1",
+    deepseek: "deepseek-v4-flash"
   };
   const ENV_KEY_MAP = [
     { provider: "anthropic", label: "Anthropic", envKey: "ANTHROPIC_API_KEY" },
@@ -78135,7 +78971,8 @@ async function quickInit(options) {
     { provider: "siliconflow", label: "SiliconFlow", envKey: "SILICONFLOW_API_KEY", baseUrl: "https://api.siliconflow.cn/v1" },
     { provider: "minimax", label: "MiniMax", envKey: "MINIMAX_API_KEY", baseUrl: "https://api.minimax.io/v1" },
     { provider: "openrouter", label: "OpenRouter", envKey: "OPENROUTER_API_KEY", baseUrl: "https://openrouter.ai/api/v1" },
-    { provider: "zai", label: "ZAI", envKey: "ZAI_API_KEY", baseUrl: "https://api.z.ai/api/paas/v4" }
+    { provider: "zai", label: "ZAI", envKey: "ZAI_API_KEY", baseUrl: "https://api.z.ai/api/paas/v4" },
+    { provider: "deepseek", label: "DeepSeek", envKey: "DEEPSEEK_API_KEY", baseUrl: "https://api.deepseek.com" }
   ];
   console.log("  [1/3] LLM Provider Configuration\n");
   const envProviders = [];
@@ -78294,7 +79131,8 @@ async function quickInit(options) {
         const baseUrlMap = {
           minimax: "https://api.minimax.io/v1",
           siliconflow: "https://api.siliconflow.cn/v1",
-          zai: "https://api.z.ai/api/paas/v4"
+          zai: "https://api.z.ai/api/paas/v4",
+          deepseek: "https://api.deepseek.com"
         };
         providers[provider] = {
           ...apiKey ? { apiKey } : {},
@@ -78307,7 +79145,7 @@ async function quickInit(options) {
         console.log("  Warning: No API key provided. Configure manually in ~/.markus/markus.json");
       }
     } else {
-      const provider = await ask("  LLM provider (anthropic/openai/google/minimax/siliconflow/zai/ollama)", "anthropic");
+      const provider = await ask("  LLM provider (anthropic/openai/google/minimax/siliconflow/zai/deepseek/ollama)", "anthropic");
       defaultProvider = provider;
       let apiKey = "";
       if (provider !== "ollama") {
@@ -78317,7 +79155,8 @@ async function quickInit(options) {
         const baseUrlMap = {
           minimax: "https://api.minimax.io/v1",
           siliconflow: "https://api.siliconflow.cn/v1",
-          zai: "https://api.z.ai/api/paas/v4"
+          zai: "https://api.z.ai/api/paas/v4",
+          deepseek: "https://api.deepseek.com"
         };
         providers[provider] = {
           ...apiKey ? { apiKey } : {},
@@ -78353,7 +79192,7 @@ async function quickInit(options) {
   const userTemplatesDir = pathJoin(homedir19(), ".markus", "templates");
   const builtinTemplatesDir = resolveTemplatesDir("roles");
   if (builtinTemplatesDir && existsSync32(builtinTemplatesDir) && !existsSync32(userTemplatesDir)) {
-    const builtinRoot = resolve16(builtinTemplatesDir, "..");
+    const builtinRoot = resolve15(builtinTemplatesDir, "..");
     mkdirSync26(userTemplatesDir, { recursive: true });
     cpSync4(builtinRoot, userTemplatesDir, { recursive: true });
     console.log(`  Copied templates to ${userTemplatesDir}`);
@@ -78361,7 +79200,7 @@ async function quickInit(options) {
   const devRoleDir = pathJoin(userTemplatesDir || pathJoin(process.cwd(), "templates"), "roles", "developer");
   if (!existsSync32(devRoleDir)) {
     mkdirSync26(devRoleDir, { recursive: true });
-    writeFileSync20(
+    writeFileSync21(
       pathJoin(devRoleDir, "ROLE.md"),
       [
         "---",
@@ -78421,7 +79260,7 @@ var start_exports = {};
 __export(start_exports, {
   registerStartCommand: () => registerStartCommand
 });
-import { resolve as resolve17, join as join29, dirname as dirname9 } from "node:path";
+import { resolve as resolve16, join as join29, dirname as dirname9 } from "node:path";
 import { existsSync as existsSync33 } from "node:fs";
 import { homedir as homedir20 } from "node:os";
 function registerStartCommand(program2) {
@@ -78516,6 +79355,19 @@ async function createServices(config) {
       defaultProvider = "zai";
     }
   }
+  const deepseekKey = config.llm.providers["deepseek"]?.apiKey ?? process.env["DEEPSEEK_API_KEY"];
+  if (deepseekKey) {
+    providerConfigs["deepseek"] = {
+      provider: "deepseek",
+      model: config.llm.providers["deepseek"]?.model ?? process.env["DEEPSEEK_MODEL"] ?? "deepseek-v4-flash",
+      apiKey: deepseekKey,
+      baseUrl: config.llm.providers["deepseek"]?.baseUrl ?? process.env["DEEPSEEK_BASE_URL"] ?? "https://api.deepseek.com",
+      timeoutMs: llmTimeoutMs
+    };
+    if (config.llm.defaultProvider === "deepseek") {
+      defaultProvider = "deepseek";
+    }
+  }
   if (!providerConfigs[defaultProvider]) {
     const available = Object.keys(providerConfigs);
     if (available.length > 0) {
@@ -78659,7 +79511,7 @@ async function startServer(config, values) {
   startupLog("INFO", "\u6B63\u5728\u542F\u52A8\u670D\u52A1...");
   const currentPath = process.env["PATH"] ?? "";
   const extraPaths = [];
-  const selfBinDir = dirname9(resolve17(process.argv[1] ?? ""));
+  const selfBinDir = dirname9(resolve16(process.argv[1] ?? ""));
   if (selfBinDir && !currentPath.includes(selfBinDir)) extraPaths.push(selfBinDir);
   const cwdBin = join29(process.cwd(), "node_modules", ".bin");
   if (existsSync33(cwdBin) && !currentPath.includes(cwdBin)) extraPaths.push(cwdBin);
@@ -78801,7 +79653,7 @@ async function startServer(config, values) {
   });
   agentManager.setUserNotifier((opts) => {
     hitlService.notify({
-      targetUserId: "default",
+      targetUserId: "all",
       type: opts.type,
       title: opts.title,
       body: opts.body,
@@ -78868,7 +79720,7 @@ ${body}`;
         });
         const hasTask = !!taskId2;
         hitlService.notify({
-          targetUserId: "default",
+          targetUserId: "all",
           type: "agent_report",
           title,
           body,
@@ -78902,7 +79754,7 @@ ${reason}`;
           isMainSession: true
         });
         hitlService.notify({
-          targetUserId: "default",
+          targetUserId: "all",
           type: "system",
           title: "Agent needs help",
           body: reason,
@@ -79269,6 +80121,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,
@@ -79281,7 +80146,7 @@ ${reason}`;
             temperature: TRIAGE_TEMPERATURE,
             maxTokens: TRIAGE_MAX_TOKENS
           }, triageProvider);
-          return { content: response.content, toolCalls: response.toolCalls };
+          return { content: response.content, toolCalls: response.toolCalls, reasoningContent: response.reasoningContent };
         });
         const triageToolMap = /* @__PURE__ */ new Map();
         const agentTools = agent.getTools();
@@ -79996,9 +80861,9 @@ var init_model = __esm({
         id: "deepseek",
         label: "DeepSeek",
         envKey: "DEEPSEEK_API_KEY",
-        baseUrl: "https://api.deepseek.com/v1",
-        defaultModel: "deepseek-chat",
-        models: ["deepseek-chat", "deepseek-coder", "deepseek-chat-v3"]
+        baseUrl: "https://api.deepseek.com",
+        defaultModel: "deepseek-v4-flash",
+        models: ["deepseek-v4-flash", "deepseek-v4-pro", "deepseek-chat", "deepseek-reasoner"]
       }
     ];
     C = {
@@ -80295,6 +81160,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",
@@ -80387,7 +81258,7 @@ var init_doctor = __esm({
       { id: "siliconflow", label: "SiliconFlow", envKey: "SILICONFLOW_API_KEY", baseUrl: "https://api.siliconflow.cn/v1", defaultModel: "Qwen/Qwen3.5-35B-A3B" },
       { id: "openrouter", label: "OpenRouter", envKey: "OPENROUTER_API_KEY", baseUrl: "https://openrouter.ai/api/v1", defaultModel: "xiaomi/mimo-v2-pro:free" },
       { id: "zai", label: "ZAI", envKey: "ZAI_API_KEY", baseUrl: "https://api.z.ai/api/paas/v4", defaultModel: "glm-5.1" },
-      { id: "deepseek", label: "DeepSeek", envKey: "DEEPSEEK_API_KEY", baseUrl: "https://api.deepseek.com/v1", defaultModel: "deepseek-chat" }
+      { id: "deepseek", label: "DeepSeek", envKey: "DEEPSEEK_API_KEY", baseUrl: "https://api.deepseek.com", defaultModel: "deepseek-v4-flash" }
     ];
   }
 });
@@ -80775,7 +81646,7 @@ var init_auth = __esm({
       { id: "siliconflow", label: "SiliconFlow", envKey: "SILICONFLOW_API_KEY", baseUrl: "https://api.siliconflow.cn/v1", defaultModel: "Qwen/Qwen3.5-35B-A3B" },
       { id: "openrouter", label: "OpenRouter", envKey: "OPENROUTER_API_KEY", baseUrl: "https://openrouter.ai/api/v1", defaultModel: "xiaomi/mimo-v2-pro:free" },
       { id: "zai", label: "ZAI", envKey: "ZAI_API_KEY", baseUrl: "https://api.z.ai/api/paas/v4", defaultModel: "glm-5.1" },
-      { id: "deepseek", label: "DeepSeek", envKey: "DEEPSEEK_API_KEY", defaultModel: "deepseek-chat" }
+      { id: "deepseek", label: "DeepSeek", envKey: "DEEPSEEK_API_KEY", baseUrl: "https://api.deepseek.com", defaultModel: "deepseek-v4-flash" }
     ];
     PLACEHOLDER_PATTERNS3 = ["***", "your-", "dummy", "fake", "test-key", "replace-me"];
   }
@@ -82976,8 +83847,8 @@ var skill_exports = {};
 __export(skill_exports, {
   registerSkillCommands: () => registerSkillCommands
 });
-import { writeFileSync as writeFileSync19, mkdirSync as mkdirSync25 } from "node:fs";
-import { resolve as resolve18 } from "node:path";
+import { writeFileSync as writeFileSync20, mkdirSync as mkdirSync25 } from "node:fs";
+import { resolve as resolve17 } from "node:path";
 function registerSkillCommands(program2) {
   const root = program2.command("skill").description("Skills registry and local scaffold");
   root.command("list").action(async (_opts, cmd) => {
@@ -83065,7 +83936,7 @@ function registerSkillCommands(program2) {
     const g = cmd.optsWithGlobals();
     const out = { json: !!g.json };
     if (!opts.dir && !opts.name) fail("Specify --dir or --name");
-    const dir = resolve18(process.cwd(), opts.dir ?? opts.name);
+    const dir = resolve17(process.cwd(), opts.dir ?? opts.name);
     mkdirSync25(dir, { recursive: true });
     const skillName = opts.name ?? (opts.dir ? opts.dir.replace(/.*[/\\]/, "") : "my-skill");
     const skillJson = {
@@ -83084,8 +83955,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(resolve17(dir, "skill.json"), JSON.stringify(skillJson, null, 2) + "\n");
+    writeFileSync20(resolve17(dir, "SKILL.md"), skillMd);
     if (out.json) {
       console.log(JSON.stringify({ dir, files: ["skill.json", "SKILL.md"] }, null, 2));
     } else {
@@ -83109,12 +83980,12 @@ __export(system_exports, {
 });
 import { execSync as execSync6 } from "node:child_process";
 import { existsSync as existsSync34, readFileSync as readFileSync25 } from "node:fs";
-import { resolve as resolve19, dirname as dirname10 } from "node:path";
+import { resolve as resolve18, dirname as dirname10 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 function findMarkusRoot() {
   let dir = dirname10(fileURLToPath5(import.meta.url));
   for (let i = 0; i < 10; i++) {
-    if (existsSync34(resolve19(dir, "package.json")) && existsSync34(resolve19(dir, "packages"))) return dir;
+    if (existsSync34(resolve18(dir, "package.json")) && existsSync34(resolve18(dir, "packages"))) return dir;
     dir = dirname10(dir);
   }
   return null;
@@ -83255,13 +84126,13 @@ function registerSystemCommands(program2) {
     if (markusRoot) {
       if (!info4.currentVersion) {
         try {
-          const pkg = JSON.parse(readFileSync25(resolve19(markusRoot, "package.json"), "utf-8"));
+          const pkg = JSON.parse(readFileSync25(resolve18(markusRoot, "package.json"), "utf-8"));
           info4.currentVersion = pkg.version;
         } catch {
         }
       }
       try {
-        const isGit = existsSync34(resolve19(markusRoot, ".git"));
+        const isGit = existsSync34(resolve18(markusRoot, ".git"));
         if (isGit) {
           info4.gitBranch = execSync6("git rev-parse --abbrev-ref HEAD", { cwd: markusRoot, encoding: "utf-8" }).trim();
           info4.gitCommit = execSync6("git rev-parse --short HEAD", { cwd: markusRoot, encoding: "utf-8" }).trim();
@@ -83300,7 +84171,7 @@ function registerSystemCommands(program2) {
       fail("Cannot locate Markus installation directory");
       return;
     }
-    if (!existsSync34(resolve19(markusRoot, ".git"))) {
+    if (!existsSync34(resolve18(markusRoot, ".git"))) {
       fail("Markus installation is not a git repository. Update manually.");
       return;
     }
@@ -83865,7 +84736,7 @@ var init_settings2 = __esm({
 });
 
 // src/index.ts
-import { resolve as resolve20 } from "node:path";
+import { resolve as resolve19 } from "node:path";
 import { readFileSync as readFileSync26, existsSync as existsSync35 } from "node:fs";
 import process2 from "node:process";
 
@@ -83889,7 +84760,7 @@ var {
 // src/index.ts
 init_dist();
 init_output();
-var envPath = resolve20(process2.cwd(), ".env");
+var envPath = resolve19(process2.cwd(), ".env");
 if (existsSync35(envPath)) {
   for (const line of readFileSync26(envPath, "utf-8").split("\n")) {
     const trimmed = line.trim();