@andyqiu/codeforge 0.3.10 → 0.3.11

package/dist/index.js

@@ -9007,7 +9007,7 @@ var handler5 = autoLearningServer;
 
 // plugins/channels.ts
 init_opencode_plugin_helpers();
-import { promises as fs2 } from "node:fs";
+import { promises as fs2, statSync as statSync2 } from "node:fs";
 import * as path4 from "node:path";
 
 // lib/channels.ts
@@ -9285,6 +9285,13 @@ function transformSlackToWebhook(ch, ev) {
       text: { type: "plain_text", text: titleText.slice(0, 150), emoji: true }
     }
   ];
+  const sevLabel = ch.show_severity_label !== false ? severityToLabel(ev.severity) : "";
+  if (sevLabel) {
+    blocks.push({
+      type: "section",
+      text: { type: "mrkdwn", text: sevLabel }
+    });
+  }
   if (message.rendered.trim()) {
     blocks.push({
       type: "section",
@@ -9297,6 +9304,56 @@ function transformSlackToWebhook(ch, ev) {
       elements: [{ type: "mrkdwn", text: mentionText }]
     });
   }
+  const showFields = ch.show_fields ?? [...DEFAULT_SHOW_FIELDS];
+  const labels = { ...DEFAULT_FIELD_LABELS, ...ch.field_labels ?? {} };
+  const fieldLines = pickFieldLines(ev.data, showFields, labels);
+  if (fieldLines.length > 0) {
+    blocks.push({ type: "divider" });
+    blocks.push({
+      type: "section",
+      text: { type: "mrkdwn", text: fieldLines.join(`
+`) }
+    });
+  }
+  if (ev.severity !== undefined && ev.severity >= 20) {
+    const errMsg = ev.data?.["error"];
+    const stack = ev.data?.["stack"];
+    if (typeof errMsg === "string" && errMsg) {
+      let errContent = `**❌ Error**: ${errMsg.slice(0, 500)}`;
+      if (typeof stack === "string" && stack) {
+        const stackHead = stack.split(`
+`).slice(0, 5).join(`
+`);
+        errContent += "\n```\n" + stackHead.slice(0, 1000) + "\n```";
+      }
+      blocks.push({ type: "divider" });
+      blocks.push({
+        type: "section",
+        text: { type: "mrkdwn", text: errContent }
+      });
+    }
+  }
+  const sessionUrl = ev.data?.["session_url"];
+  const logsUrl = ev.data?.["logs_url"];
+  const slackActions = [];
+  if (isValidCtaUrl(sessionUrl)) {
+    slackActions.push({
+      type: "button",
+      text: { type: "plain_text", text: "查看会话", emoji: true },
+      url: sessionUrl,
+      style: "primary"
+    });
+  }
+  if (isValidCtaUrl(logsUrl)) {
+    slackActions.push({
+      type: "button",
+      text: { type: "plain_text", text: "查看日志", emoji: true },
+      url: logsUrl
+    });
+  }
+  if (slackActions.length > 0) {
+    blocks.push({ type: "actions", elements: slackActions });
+  }
   const footerParts = [`event=\`${ev.event}\``];
   if (ev.session_id)
     footerParts.push(`session=\`${ev.session_id.slice(0, 8)}\``);
@@ -9387,6 +9444,13 @@ function transformLarkToWebhook(ch, ev) {
   }).join(" ");
   const headerTemplate = severityToLarkHeader(ev.severity);
   const elements = [];
+  const sevLabel = ch.show_severity_label !== false ? severityToLabel(ev.severity) : "";
+  if (sevLabel) {
+    elements.push({
+      tag: "div",
+      text: { tag: "lark_md", content: sevLabel }
+    });
+  }
   if (messageText || mentionMarkdown) {
     const fullMsg = [messageText, mentionMarkdown].filter(Boolean).join(`
 
@@ -9396,6 +9460,57 @@ function transformLarkToWebhook(ch, ev) {
       text: { tag: "lark_md", content: fullMsg.slice(0, 3000) }
     });
   }
+  const showFields = ch.show_fields ?? [...DEFAULT_SHOW_FIELDS];
+  const labels = { ...DEFAULT_FIELD_LABELS, ...ch.field_labels ?? {} };
+  const fieldLines = pickFieldLines(ev.data, showFields, labels);
+  if (fieldLines.length > 0) {
+    elements.push({ tag: "hr" });
+    elements.push({
+      tag: "div",
+      text: { tag: "lark_md", content: fieldLines.join(`
+`) }
+    });
+  }
+  if (ev.severity !== undefined && ev.severity >= 20) {
+    const errMsg = ev.data?.["error"];
+    const stack = ev.data?.["stack"];
+    if (typeof errMsg === "string" && errMsg) {
+      let errContent = `**❌ Error**: ${errMsg.slice(0, 500)}`;
+      if (typeof stack === "string" && stack) {
+        const stackHead = stack.split(`
+`).slice(0, 5).join(`
+`);
+        errContent += "\n```\n" + stackHead.slice(0, 1000) + "\n```";
+      }
+      elements.push({ tag: "hr" });
+      elements.push({
+        tag: "div",
+        text: { tag: "lark_md", content: errContent }
+      });
+    }
+  }
+  const sessionUrl = ev.data?.["session_url"];
+  const logsUrl = ev.data?.["logs_url"];
+  const larkActions = [];
+  if (isValidCtaUrl(sessionUrl)) {
+    larkActions.push({
+      tag: "button",
+      text: { tag: "plain_text", content: "查看会话" },
+      type: "primary",
+      url: sessionUrl
+    });
+  }
+  if (isValidCtaUrl(logsUrl)) {
+    larkActions.push({
+      tag: "button",
+      text: { tag: "plain_text", content: "查看日志" },
+      type: "default",
+      url: logsUrl
+    });
+  }
+  if (larkActions.length > 0) {
+    elements.push({ tag: "action", actions: larkActions });
+  }
   const footer = [
     `**event**: \`${ev.event}\``,
     ev.session_id ? `**session**: \`${ev.session_id.slice(0, 8)}\`` : null,
@@ -9431,6 +9546,60 @@ function severityToLarkHeader(sev) {
     return "blue";
   return "grey";
 }
+function severityToLabel(sev) {
+  if (sev === undefined)
+    return "";
+  if (sev >= 40)
+    return "\uD83D\uDEA8 CRITICAL";
+  if (sev >= 30)
+    return "\uD83D\uDD34 ERROR";
+  if (sev >= 20)
+    return "\uD83D\uDFE0 WARN";
+  if (sev >= 10)
+    return "\uD83D\uDD35 INFO";
+  return "";
+}
+var DEFAULT_SHOW_FIELDS = [
+  "agent",
+  "model",
+  "duration_ms",
+  "cost",
+  "files_changed",
+  "status"
+];
+var DEFAULT_FIELD_LABELS = {
+  agent: "Agent",
+  model: "Model",
+  duration_ms: "耗时",
+  cost: "费用",
+  files_changed: "改动文件数",
+  status: "状态",
+  error: "错误"
+};
+function pickFieldLines(data, showFields, labels) {
+  if (!data)
+    return [];
+  const out = [];
+  for (const key of showFields) {
+    const v = data[key];
+    if (v === undefined || v === null || v === "")
+      continue;
+    const label = labels[key] ?? key;
+    let valueStr;
+    if (key === "duration_ms" && typeof v === "number") {
+      valueStr = v >= 60000 ? `${(v / 60000).toFixed(1)}m` : `${(v / 1000).toFixed(1)}s`;
+    } else if (key === "cost" && typeof v === "number") {
+      valueStr = `$${v.toFixed(4)}`;
+    } else {
+      valueStr = String(v);
+    }
+    out.push(`**${label}**: ${valueStr}`);
+  }
+  return out;
+}
+function isValidCtaUrl(url) {
+  return typeof url === "string" && url.startsWith("https://");
+}
 function computeLarkSign(secret, timestampSec) {
   const stringToSign = `${timestampSec}
 ${secret}`;
@@ -9524,11 +9693,88 @@ function makeChannelEvent(event, data = {}) {
 }
 
 // plugins/channels.ts
+init_global_config();
 var PLUGIN_NAME6 = "channels";
 logLifecycle(PLUGIN_NAME6, "import", {});
 var fallbackLog = makePluginLogger(PLUGIN_NAME6);
 var _channelsCache = null;
-function loadChannelsFromEnv() {
+var _activatedDirectory;
+var KNOWN_TYPES = new Set([
+  "webhook",
+  "file",
+  "exec",
+  "kh",
+  "mcp",
+  "slack",
+  "lark"
+]);
+var REQUIRED_FIELDS = {
+  webhook: ["url"],
+  file: ["path"],
+  exec: [],
+  kh: [],
+  mcp: ["server", "tool"],
+  slack: ["webhook_url"],
+  lark: ["webhook_url"]
+};
+function safePeek(o) {
+  const out = {};
+  for (const k of ["type", "name"]) {
+    if (k in o)
+      out[k] = o[k];
+  }
+  return out;
+}
+function isChannel(x, log4) {
+  if (!x || typeof x !== "object")
+    return false;
+  const o = x;
+  const t = o["type"];
+  const n = o["name"];
+  if (typeof n !== "string" || n.length === 0) {
+    log4?.warn(`[channels] 配置被忽略：缺少 name 字段`, { sample: safePeek(o) });
+    return false;
+  }
+  if (typeof t !== "string" || !KNOWN_TYPES.has(t)) {
+    log4?.warn(`[channels] 配置 '${n}' 被忽略：未知 type='${String(t)}'，合法值=${[...KNOWN_TYPES].join(",")}`);
+    return false;
+  }
+  const required = REQUIRED_FIELDS[t] ?? [];
+  for (const f of required) {
+    const v = o[f];
+    if (typeof v !== "string" || v.length === 0) {
+      log4?.warn(`[channels] 配置 '${n}' (type=${t}) 被忽略：缺少必填字段 '${f}'`);
+      return false;
+    }
+  }
+  if (t === "exec") {
+    const hasArgv = Array.isArray(o["argv"]) && o["argv"].length > 0;
+    const hasCmd = typeof o["command"] === "string" && o["command"].length > 0;
+    if (!hasArgv && !hasCmd) {
+      log4?.warn(`[channels] 配置 '${n}' (type=exec) 被忽略：argv 与 command 均为空`);
+      return false;
+    }
+  }
+  return true;
+}
+function resolveGlobalConfigPath() {
+  return path4.join(globalConfigDir(), "channels.json");
+}
+function resolveProjectConfigPaths(root) {
+  const r = root ?? _activatedDirectory ?? process.cwd();
+  return {
+    recommended: path4.join(projectConfigDir(r), "channels.json"),
+    legacy: path4.join(projectConfigDir(r), "config", "channels.json")
+  };
+}
+var _warnedKeys2 = new Set;
+function warnOnce3(key, msg, log4) {
+  if (_warnedKeys2.has(key))
+    return;
+  _warnedKeys2.add(key);
+  log4.warn(msg);
+}
+function loadChannelsFromEnv(log4 = fallbackLog) {
   const raw = process.env.CODEFORGE_CHANNELS_JSON;
   if (!raw)
     return [];
@@ -9536,22 +9782,103 @@ function loadChannelsFromEnv() {
     const parsed = JSON.parse(raw);
     if (!Array.isArray(parsed))
       return [];
-    return parsed.filter((c) => isChannel(c));
+    return parsed.filter((c) => isChannel(c, log4));
   } catch {
+    log4.warn(`[channels] CODEFORGE_CHANNELS_JSON JSON 解析失败，忽略整段 env 配置`);
     return [];
   }
 }
-function isChannel(x) {
-  if (!x || typeof x !== "object")
-    return false;
-  const t = x.type;
-  const n = x.name;
-  return typeof n === "string" && (t === "webhook" || t === "file" || t === "exec" || t === "kh" || t === "mcp");
+function loadChannelsFromGlobal(log4 = fallbackLog) {
+  const filePath = resolveGlobalConfigPath();
+  const raw = loadJsonIfExists(filePath);
+  if (!raw)
+    return [];
+  try {
+    const st = statSync2(filePath);
+    const perm = st.mode & 511;
+    if ((perm & 63) !== 0) {
+      warnOnce3(`global-perm:${filePath}`, `[channels] 全局 channels.json 权限 0${perm.toString(8)} 含 group/other 可读位，` + `含 webhook 时建议 chmod 600 ${filePath}`, log4);
+    }
+  } catch {}
+  const arr = Array.isArray(raw) ? raw : raw.channels;
+  if (!Array.isArray(arr))
+    return [];
+  return arr.filter((c) => isChannel(c, log4));
+}
+function loadChannelsFromFile(root, log4 = fallbackLog) {
+  const { recommended, legacy } = resolveProjectConfigPaths(root);
+  let raw = loadJsonIfExists(recommended);
+  if (raw === null) {
+    const legacyRaw = loadJsonIfExists(legacy);
+    if (legacyRaw !== null) {
+      log4.warn(`[channels] 检测到 0.3.10 兼容路径 ${legacy}，建议迁移到 0.3.11 推荐路径 ${recommended}` + `（与 KH 配置惯例统一）。两条路径同时存在时只读推荐路径。`);
+      raw = legacyRaw;
+    }
+  }
+  if (!raw)
+    return [];
+  const arr = Array.isArray(raw) ? raw : raw.channels;
+  if (!Array.isArray(arr))
+    return [];
+  return arr.filter((c) => isChannel(c, log4));
+}
+function parseRawEnvLength(raw) {
+  if (raw === undefined || raw === "")
+    return "not-set";
+  try {
+    const p = JSON.parse(raw);
+    return Array.isArray(p) ? p.length : "invalid";
+  } catch {
+    return "invalid";
+  }
 }
-function ensureChannels() {
+function mergeByName(layers, log4) {
+  const map = new Map;
+  for (const { layer, items } of layers) {
+    for (const c of items) {
+      const prev = map.get(c.name);
+      if (prev) {
+        const typeNote = prev.channel.type !== c.type ? `（type: ${prev.channel.type} → ${c.type}）` : "";
+        log4.warn(`[channels] channel '${c.name}' (${layer} 层) 覆盖 ${prev.layer} 层同名配置${typeNote}`);
+      }
+      map.set(c.name, { layer, channel: c });
+    }
+  }
+  return [...map.values()].map((e) => e.channel);
+}
+function ensureChannels(log4 = fallbackLog) {
   if (_channelsCache)
     return _channelsCache;
-  _channelsCache = loadChannelsFromEnv();
+  const rawEnv = process.env.CODEFORGE_CHANNELS_JSON;
+  const rawLen = parseRawEnvLength(rawEnv);
+  if (rawLen === 0) {
+    log4.warn(`[channels] CODEFORGE_CHANNELS_JSON 显式为空数组，跳过 global + project 两层（全部通知已禁用）`);
+    _channelsCache = [];
+    return _channelsCache;
+  }
+  const fromGlobal = loadChannelsFromGlobal(log4);
+  const fromFile = loadChannelsFromFile(undefined, log4);
+  const fromEnv = rawLen === "not-set" ? [] : loadChannelsFromEnv(log4);
+  if (rawLen === "not-set") {
+    _channelsCache = mergeByName([
+      { layer: "global", items: fromGlobal },
+      { layer: "project", items: fromFile }
+    ], log4);
+    return _channelsCache;
+  }
+  if (fromEnv.length === 0) {
+    log4.warn(`[channels] CODEFORGE_CHANNELS_JSON 含 ${rawLen === "invalid" ? "非数组" : rawLen} 项但全部被过滤，` + `退回 global + project 两层（global ${fromGlobal.length} 项 + project ${fromFile.length} 项）`);
+    _channelsCache = mergeByName([
+      { layer: "global", items: fromGlobal },
+      { layer: "project", items: fromFile }
+    ], log4);
+    return _channelsCache;
+  }
+  _channelsCache = mergeByName([
+    { layer: "global", items: fromGlobal },
+    { layer: "project", items: fromFile },
+    { layer: "env", items: fromEnv }
+  ], log4);
   return _channelsCache;
 }
 var _limiter = null;
@@ -9698,6 +10025,7 @@ var TRIGGER_EVENT_TYPES3 = new Set([
   "subtasks.completed"
 ]);
 var channelsServer = async (ctx) => {
+  _activatedDirectory = ctx.directory;
   logLifecycle(PLUGIN_NAME6, "activate", {
     directory: ctx.directory,
     triggerEventTypes: [...TRIGGER_EVENT_TYPES3],
@@ -12211,6 +12539,11 @@ import { z as z26 } from "zod";
 // lib/model-config.ts
 import { promises as fs7 } from "node:fs";
 import * as path10 from "node:path";
+
+// lib/model-tier.ts
+var TIER_ORDER = ["quick", "balanced", "deep", "ultra"];
+
+// lib/model-config.ts
 var CONFIG_FILE = "codeforge.json";
 var DEFAULT_RUNTIME_FALLBACK = {
   enabled: true,
@@ -12315,11 +12648,29 @@ function validateConfig(input) {
       return { ok: false, warnings, error: r.error };
     runtime = r.cfg;
   }
+  let tiers;
+  if (obj.tiers !== undefined) {
+    const r = normalizeTiers(obj.tiers);
+    if (!r.ok)
+      return { ok: false, warnings, error: r.error };
+    tiers = r.cfg;
+  }
   for (const [name, agent] of Object.entries(agents)) {
     if (agent.category && !categories?.[agent.category]) {
       warnings.push(`agent[${name}].category="${agent.category}" 未在 categories 定义，将忽略 category 链`);
     }
   }
+  for (const [name, agent] of Object.entries(agents)) {
+    if (!agent.tier)
+      continue;
+    const mappedCat = tiers?.category_map?.[agent.tier];
+    const hasOverride = agent.tier_overrides?.[agent.tier] !== undefined;
+    if (!mappedCat && !hasOverride) {
+      warnings.push(`agent[${name}].tier="${agent.tier}" 既无 models.tiers.category_map["${agent.tier}"] 映射，` + `也无 tier_overrides["${agent.tier}"]；该 agent 将不参与 tier 体系（adapter 返 null）。`);
+    } else if (mappedCat && !categories?.[mappedCat] && !hasOverride) {
+      warnings.push(`agent[${name}].tier="${agent.tier}" 通过 category_map 映射到 "${mappedCat}"，` + `但 categories.${mappedCat} 不存在；该 agent 将不参与 tier 体系。`);
+    }
+  }
   return {
     ok: true,
     warnings,
@@ -12328,7 +12679,8 @@ function validateConfig(input) {
       _doc: typeof obj._doc === "string" ? obj._doc : undefined,
       agents,
       categories,
-      runtime_fallback: runtime
+      runtime_fallback: runtime,
+      tiers
     }
   };
 }
@@ -12349,6 +12701,23 @@ function normalizeAgent(name, raw) {
   const thinking = o.thinking !== undefined ? normalizeThinking(`agent[${name}]`, o.thinking) : undefined;
   if (thinking && !thinking.ok)
     return { ok: false, error: thinking.error };
+  let tier;
+  if (o.tier !== undefined) {
+    if (typeof o.tier !== "string" || !isValidTierLevel(o.tier)) {
+      return {
+        ok: false,
+        error: `agent[${name}].tier="${String(o.tier)}" 不是合法 TierLevel (期望 ${TIER_ORDER.join("/")})`
+      };
+    }
+    tier = o.tier;
+  }
+  let tierOverrides;
+  if (o.tier_overrides !== undefined) {
+    const r = normalizeTierOverrides(name, o.tier_overrides);
+    if (!r.ok)
+      return { ok: false, error: r.error };
+    tierOverrides = r.value;
+  }
   return {
     ok: true,
     binding: {
@@ -12357,6 +12726,8 @@ function normalizeAgent(name, raw) {
       category: typeof o.category === "string" ? o.category : undefined,
       thinking: thinking?.value,
       fallback_models: fallbacks.value,
+      tier,
+      tier_overrides: tierOverrides,
       _doc: typeof o._doc === "string" ? o._doc : undefined
     }
   };
@@ -12453,6 +12824,99 @@ function normalizeRuntime(raw) {
     cfg._doc = o._doc;
   return { ok: true, cfg };
 }
+function isValidTierLevel(x) {
+  return typeof x === "string" && TIER_ORDER.includes(x);
+}
+function normalizeTierOverrides(agentName, raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
+    return {
+      ok: false,
+      error: `agent[${agentName}].tier_overrides 必须是 object（不是 array / null / 其他类型）`
+    };
+  }
+  const o = raw;
+  const result = {};
+  for (const [key, value] of Object.entries(o)) {
+    if (!isValidTierLevel(key)) {
+      return {
+        ok: false,
+        error: `agent[${agentName}].tier_overrides.${key}: 非法 TierLevel key (期望 ${TIER_ORDER.join("/")})`
+      };
+    }
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+      return {
+        ok: false,
+        error: `agent[${agentName}].tier_overrides.${key}: 必须是 object`
+      };
+    }
+    const ov = value;
+    const partial = {};
+    if (ov.level !== undefined) {
+      if (ov.level !== key) {
+        return {
+          ok: false,
+          error: `agent[${agentName}].tier_overrides.${key}.level="${String(ov.level)}" 与 key "${key}" 错配`
+        };
+      }
+      partial.level = key;
+    }
+    if (ov.model !== undefined) {
+      if (typeof ov.model !== "string" || !PROVIDER_MODEL_RE.test(ov.model)) {
+        return {
+          ok: false,
+          error: `agent[${agentName}].tier_overrides.${key}.model="${String(ov.model)}" 格式非法 (期望 <provider>/<id>)`
+        };
+      }
+      partial.model = ov.model;
+    }
+    if (ov.thinking !== undefined) {
+      const t = normalizeThinking(`agent[${agentName}].tier_overrides.${key}`, ov.thinking);
+      if (!t.ok)
+        return { ok: false, error: t.error };
+      partial.thinking = t.value;
+    }
+    if (ov.fallback_models !== undefined) {
+      const f = normalizeFallbackList(`agent[${agentName}].tier_overrides.${key}.fallback_models`, ov.fallback_models);
+      if (!f.ok)
+        return { ok: false, error: f.error };
+      partial.fallback_models = f.value;
+    }
+    result[key] = partial;
+  }
+  return { ok: true, value: result };
+}
+function normalizeTiers(raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
+    return { ok: false, error: "models.tiers 必须是 object（不是 array / null）" };
+  }
+  const o = raw;
+  const cfg = {};
+  if (o.category_map !== undefined) {
+    if (!o.category_map || typeof o.category_map !== "object" || Array.isArray(o.category_map)) {
+      return { ok: false, error: "models.tiers.category_map 必须是 object" };
+    }
+    const map = {};
+    for (const [key, value] of Object.entries(o.category_map)) {
+      if (!isValidTierLevel(key)) {
+        return {
+          ok: false,
+          error: `models.tiers.category_map.${key}: 非法 TierLevel key (期望 ${TIER_ORDER.join("/")})`
+        };
+      }
+      if (typeof value !== "string" || value.length === 0) {
+        return {
+          ok: false,
+          error: `models.tiers.category_map.${key}: 必须是非空字符串（category 名）`
+        };
+      }
+      map[key] = value;
+    }
+    cfg.category_map = map;
+  }
+  if (typeof o._doc === "string")
+    cfg._doc = o._doc;
+  return { ok: true, cfg };
+}
 function resolveAgentModel(config, agent) {
   const a = config.agents[agent];
   if (!a)
@@ -15002,25 +15466,17 @@ function extractEndedSessionID(event) {
   }
   return null;
 }
-function extractSubtaskPart(event) {
-  if (!event || typeof event !== "object")
-    return null;
-  const e = event;
-  if (e.type !== "message.part.updated")
-    return null;
-  const part = e.properties?.part;
-  if (!part || typeof part !== "object")
-    return null;
-  const p = part;
-  if (p.type !== "subtask")
+function extractTaskArgs(args) {
+  if (!args || typeof args !== "object")
     return null;
-  if (typeof p.sessionID !== "string" || p.sessionID === "")
+  const a = args;
+  const rawDesc = typeof a["description"] === "string" ? a["description"] : null;
+  const rawPrompt = typeof a["prompt"] === "string" ? a["prompt"] : null;
+  const description26 = rawDesc ?? (rawPrompt ? rawPrompt.slice(0, 60) : null);
+  const subagentType = typeof a["subagent_type"] === "string" && a["subagent_type"] || typeof a["agent"] === "string" && a["agent"] || typeof a["agentType"] === "string" && a["agentType"] || typeof a["agent_type"] === "string" && a["agent_type"] || null;
+  if (!description26 && !subagentType)
     return null;
-  if (typeof p.agent !== "string" || p.agent === "")
-    return null;
-  if (typeof p.description !== "string" || p.description === "")
-    return null;
-  return { parentID: p.sessionID, agent: p.agent, description: p.description };
+  return { description: description26, subagentType };
 }
 function enqueuePendingTask(parentID, entry, now = Date.now()) {
   const ts = entry.ts ?? now;
@@ -15249,21 +15705,6 @@ var subtaskHeartbeatServer = async (ctx) => {
   return {
     event: async ({ event }) => {
       await safeAsync(PLUGIN_NAME13, "event", async () => {
-        const subtask = extractSubtaskPart(event);
-        if (subtask) {
-          enqueuePendingTask(subtask.parentID, {
-            agent: subtask.agent,
-            description: subtask.description
-          });
-          safeWriteLog(PLUGIN_NAME13, {
-            hook: "event",
-            type: "message.part.updated.subtask",
-            parent: subtask.parentID,
-            agent: subtask.agent,
-            description_len: subtask.description.length
-          });
-          return;
-        }
         const created = extractCreatedChild(event);
         if (created) {
           const pending = dequeuePendingTask(created.parentID);
@@ -15279,7 +15720,8 @@ var subtaskHeartbeatServer = async (ctx) => {
             child: created.childID,
             parent: created.parentID,
             pending_task_matched: pending !== null,
-            agent: record.agent
+            agent: record.agent,
+            description_len: record.description?.length ?? 0
           });
           const startToast = buildStartToast(record);
           const sent = await showToast3(client, { ...startToast, duration: START_TOAST_DURATION_MS }, log7);
@@ -15310,13 +15752,38 @@ var subtaskHeartbeatServer = async (ctx) => {
         }
       });
     },
-    "tool.execute.before": async (input) => {
-      if (inflight3.size === 0)
+    "tool.execute.before": async (input, output) => {
+      const isTaskTool = input?.tool === "task";
+      if (inflight3.size === 0 && !isTaskTool)
         return;
       await safeAsync(PLUGIN_NAME13, "tool.execute.before", async () => {
         if (!input || typeof input.sessionID !== "string" || typeof input.tool !== "string")
           return;
-        recordToolBeat(input.sessionID, input.tool);
+        if (isTaskTool) {
+          const args = output?.args ?? null;
+          safeWriteLog(PLUGIN_NAME13, {
+            hook: "tool.execute.before.task",
+            sessionID: input.sessionID,
+            args_keys: args && typeof args === "object" ? Object.keys(args) : null,
+            args_raw: args
+          });
+          const extracted = extractTaskArgs(args);
+          if (extracted) {
+            enqueuePendingTask(input.sessionID, {
+              agent: extracted.subagentType,
+              description: extracted.description
+            });
+            safeWriteLog(PLUGIN_NAME13, {
+              hook: "tool.execute.before.task.enqueued",
+              parent: input.sessionID,
+              agent: extracted.subagentType,
+              description_len: extracted.description?.length ?? 0
+            });
+          }
+        }
+        if (inflight3.has(input.sessionID)) {
+          recordToolBeat(input.sessionID, input.tool);
+        }
       });
     }
   };
@@ -17473,7 +17940,7 @@ var handler20 = toolPolicyServer;
 init_opencode_plugin_helpers();
 import { existsSync as existsSync5 } from "node:fs";
 import { homedir as homedir7 } from "node:os";
-import { join as join15 } from "node:path";
+import { join as join16 } from "node:path";
 
 // lib/update-checker-impl.ts
 import { createHash as createHash6 } from "node:crypto";
@@ -17485,12 +17952,12 @@ import {
   readFileSync as readFileSync4,
   readdirSync,
   renameSync,
-  statSync as statSync2,
+  statSync as statSync3,
   unlinkSync,
   writeFileSync as writeFileSync2
 } from "node:fs";
 import { homedir as homedir6, tmpdir } from "node:os";
-import { dirname as dirname7, join as join14 } from "node:path";
+import { dirname as dirname7, join as join15 } from "node:path";
 import { fileURLToPath } from "node:url";
 import * as https from "node:https";
 import * as zlib from "node:zlib";
@@ -17498,7 +17965,7 @@ import * as zlib from "node:zlib";
 // lib/version-injected.ts
 function getInjectedVersion() {
   try {
-    const v = "0.3.10";
+    const v = "0.3.11";
     if (typeof v === "string" && /^\d+\.\d+\.\d+/.test(v)) {
       return v;
     }
@@ -17588,17 +18055,17 @@ function readLocalVersion() {
   try {
     const here = fileURLToPath(import.meta.url);
     const root = dirname7(dirname7(here));
-    const pkg = JSON.parse(readFileSync4(join14(root, "package.json"), "utf8"));
+    const pkg = JSON.parse(readFileSync4(join15(root, "package.json"), "utf8"));
     return typeof pkg.version === "string" ? pkg.version : "0.0.0";
   } catch {
     return "0.0.0";
   }
 }
 function defaultCacheDir() {
-  return process.env["CODEFORGE_CACHE_DIR"] ?? join14(homedir6(), ".cache", "codeforge");
+  return process.env["CODEFORGE_CACHE_DIR"] ?? join15(homedir6(), ".cache", "codeforge");
 }
 function defaultCacheFile() {
-  return join14(defaultCacheDir(), "update-check.json");
+  return join15(defaultCacheDir(), "update-check.json");
 }
 function readCache(file) {
   try {
@@ -17754,14 +18221,14 @@ function defaultHttpFetcher(url, timeoutMs) {
   });
 }
 async function downloadAndExtractBundle(opts) {
-  const tmpRoot = opts.tmpDir ?? mkdtempSync(join14(tmpdir(), "codeforge-update-"));
+  const tmpRoot = opts.tmpDir ?? mkdtempSync(join15(tmpdir(), "codeforge-update-"));
   mkdirSync3(tmpRoot, { recursive: true });
   const fetcher = opts.tarballFetcher ?? defaultBinaryFetcher;
   const tarballBuf = await fetcher(opts.tarballUrl);
   verifyIntegrity(tarballBuf, opts.expectedIntegrity);
   const tarBuf = zlib.gunzipSync(tarballBuf);
   extractTarToDir(tarBuf, tmpRoot);
-  const bundlePath = join14(tmpRoot, "package", "dist", "index.js");
+  const bundlePath = join15(tmpRoot, "package", "dist", "index.js");
   if (!existsSync4(bundlePath)) {
     throw new Error(`bundle_not_found: ${bundlePath}`);
   }
@@ -17801,11 +18268,11 @@ function extractTarToDir(tarBuf, destRoot) {
     offset += 512;
     if (typeFlag === "0" || typeFlag === "" || typeFlag === "\x00") {
       const fileBuf = tarBuf.subarray(offset, offset + size);
-      const dest = join14(destRoot, fullName);
+      const dest = join15(destRoot, fullName);
       mkdirSync3(dirname7(dest), { recursive: true });
       writeFileSync2(dest, fileBuf);
     } else if (typeFlag === "5") {
-      mkdirSync3(join14(destRoot, fullName), { recursive: true });
+      mkdirSync3(join15(destRoot, fullName), { recursive: true });
     }
     offset += Math.ceil(size / 512) * 512;
   }
@@ -17914,10 +18381,10 @@ function cleanupOldBackups(target, keep) {
     const base = target.substring(dir.length + 1);
     const prefix = `${base}.bak.`;
     const all = readdirSync(dir).filter((f) => f.startsWith(prefix)).map((f) => {
-      const full = join14(dir, f);
+      const full = join15(dir, f);
       let mtimeMs = 0;
       try {
-        mtimeMs = statSync2(full).mtimeMs;
+        mtimeMs = statSync3(full).mtimeMs;
       } catch {}
       return { full, mtimeMs };
     }).sort((a, b) => b.mtimeMs - a.mtimeMs);
@@ -17936,7 +18403,7 @@ function loadCompatibility(opts) {
       const root = opts?.cwd ?? inferPluginRoot();
       if (!root)
         return null;
-      file = join14(root, "compatibility.json");
+      file = join15(root, "compatibility.json");
     }
     if (!existsSync4(file))
       return null;
@@ -18156,14 +18623,14 @@ function detectOpencodeVersion() {
 }
 function getOpencodeBundlePath() {
   const candidates = [];
-  candidates.push(join15(homedir7(), ".config", "opencode", "codeforge", "index.js"));
+  candidates.push(join16(homedir7(), ".config", "opencode", "codeforge", "index.js"));
   if (process.platform === "win32") {
     const appData = process.env["APPDATA"];
     if (appData)
-      candidates.push(join15(appData, "opencode", "codeforge", "index.js"));
+      candidates.push(join16(appData, "opencode", "codeforge", "index.js"));
     const localAppData = process.env["LOCALAPPDATA"];
     if (localAppData)
-      candidates.push(join15(localAppData, "opencode", "codeforge", "index.js"));
+      candidates.push(join16(localAppData, "opencode", "codeforge", "index.js"));
   }
   for (const c of candidates) {
     if (existsSync5(c))