@clawos-dev/clawd 0.2.762 → 0.2.763

package/dist/cli.cjs

@@ -47897,6 +47897,115 @@ function extractLarkReplyText(events) {
   return order.map((k3) => (chunks.get(k3) ?? []).join("")).filter((t2) => t2.length > 0).join("\n").trim();
 }
 
+// src/session/lark-tool-send.ts
+var LARK_RESUME_MARKER = "\u300C\u7EE7\u7EED\u300D\u7531\u7CFB\u7EDF\u4EE3\u53D1";
+var isResumePrompt = (text) => text.includes(LARK_RESUME_MARKER);
+var SEND_COMMAND_RES = [
+  /\bim\s+\+messages-send\b/,
+  /\bim\s+messages\s+(?:create|reply)\b/,
+  /\bapi\s+POST\s+\/open-apis\/im\/v1\/messages(?:[\/\s'"`?#]|$)/
+];
+var DRY_RUN_RE = /--dry-run\b|\bdry_run\b/;
+var TARGET_CHAT_RES = [
+  /--chat-id[= ]+['"]?(oc_[A-Za-z0-9_-]+)/,
+  /--receive-id[= ]+['"]?(oc_[A-Za-z0-9_-]+)/,
+  /"receive_id"\s*:\s*"(oc_[A-Za-z0-9_-]+)"/,
+  /'receive_id'\s*:\s*'(oc_[A-Za-z0-9_-]+)'/
+];
+var FAILED_CODE_RE = /"code"\s*:\s*[1-9]/;
+var OK_CODE_RE = /"code"\s*:\s*0\b/;
+var MESSAGE_ID_RE = /"?(?:message_id|messageId)"?\s*[:=]\s*"?om_[A-Za-z0-9_-]+/;
+var textOf = (value) => {
+  if (typeof value === "string") return value;
+  if (value == null) return "";
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return "";
+  }
+};
+var commandOf = (input) => {
+  if (typeof input === "string") return input;
+  if (!input || typeof input !== "object") return "";
+  const parts = [];
+  const walk2 = (v3, depth) => {
+    if (depth > 4 || v3 == null) return;
+    if (typeof v3 === "string") parts.push(v3);
+    else if (Array.isArray(v3)) for (const item of v3) walk2(item, depth + 1);
+    else if (typeof v3 === "object") for (const item of Object.values(v3)) walk2(item, depth + 1);
+  };
+  walk2(input, 0);
+  return parts.join("\n");
+};
+var targetChatOf = (command) => {
+  for (const re2 of TARGET_CHAT_RES) {
+    const m3 = re2.exec(command);
+    if (m3) return m3[1];
+  }
+  return void 0;
+};
+var targetChatInOutput = (output) => {
+  const text = textOf(output);
+  const m3 = /"?chat_id"?\s*:\s*"?(oc_[A-Za-z0-9_-]+)/.exec(text);
+  return m3?.[1];
+};
+var isSendCommand = (command) => command.includes("lark-cli") && !DRY_RUN_RE.test(command) && SEND_COMMAND_RES.some((re2) => re2.test(command));
+var isSentResult = (output, error) => {
+  if (error != null) return false;
+  const text = textOf(output);
+  if (!text) return false;
+  if (FAILED_CODE_RE.test(text)) return false;
+  return OK_CODE_RE.test(text) || MESSAGE_ID_RE.test(text);
+};
+var realChatIdOf = (chatId) => chatId.split(":")[0] ?? chatId;
+function detectLarkToolSend(events, chatId) {
+  const expected = realChatIdOf(chatId);
+  if (!expected) return false;
+  let start = 0;
+  for (let i2 = events.length - 1; i2 >= 0; i2--) {
+    const ev = events[i2];
+    if (ev.kind !== "user_text") continue;
+    if (!isResumePrompt(ev.text)) {
+      start = i2 + 1;
+      break;
+    }
+  }
+  const calls = /* @__PURE__ */ new Map();
+  for (const ev of events.slice(start)) {
+    if (ev.kind === "tool_call") {
+      const command2 = commandOf(ev.input);
+      if (isSendCommand(command2)) calls.set(ev.toolUseId, command2);
+      continue;
+    }
+    if (ev.kind !== "tool_result") continue;
+    const command = calls.get(ev.toolUseId);
+    if (!command) continue;
+    if (!isSentResult(ev.output, ev.error)) continue;
+    if (targetChatOf(command) === expected) return true;
+    if (targetChatInOutput(ev.output) === expected) return true;
+  }
+  return false;
+}
+function createLarkSendWatch(chatId) {
+  const expected = realChatIdOf(chatId);
+  let fired = false;
+  const calls = /* @__PURE__ */ new Map();
+  return (event) => {
+    if (fired || !expected) return fired;
+    if (event.kind === "tool_call") {
+      const command2 = commandOf(event.input);
+      if (isSendCommand(command2)) calls.set(event.toolUseId, command2);
+      return fired;
+    }
+    if (event.kind !== "tool_result") return fired;
+    const command = calls.get(event.toolUseId);
+    if (!command) return fired;
+    if (!isSentResult(event.output, event.error)) return fired;
+    if (targetChatOf(command) === expected || targetChatInOutput(event.output) === expected) fired = true;
+    return fired;
+  };
+}
+
 // src/session/runner.ts
 var import_node_os9 = __toESM(require("os"), 1);
 var import_node_path15 = __toESM(require("path"), 1);
@@ -51703,29 +51812,49 @@ var SessionManager = class {
       r2.input({ kind: "command", command: { kind: "stop" } });
     };
     const settleDelayMs = args.settleDelayMs ?? (this.deps.mode === "tui" ? 500 : 0);
+    const sendWatch = createLarkSendWatch(args.chatId);
+    let sentDuringTurn = false;
+    const observeFrame = (frame) => {
+      if (sentDuringTurn || frame?.type !== "session:event" || !frame.event) return;
+      if (!sendWatch(frame.event)) return;
+      sentDuringTurn = true;
+    };
+    const repliedByToolOf = (events) => sentDuringTurn || detectLarkToolSend(events, args.chatId);
     const extractAndSettle = () => {
       try {
         const events = this.readHistoryEventsForScope(sessionId, scope);
         const replyText = extractLarkReplyText(events);
-        settle(replyText ? { ok: true, replyText } : { error: "empty reply" });
+        const repliedByTool = repliedByToolOf(events);
+        settle(replyText ? { ok: true, replyText, ...repliedByTool ? { repliedByTool: true } : {} } : repliedByTool ? { ok: true, replyText: "", repliedByTool: true } : { error: "empty reply" });
       } catch (err) {
         settle({ error: err.message });
       }
     };
-    unsubscribe = this.subscribe(
-      sessionId,
-      scope,
-      makeEndFrameHandler(sessionId, (info) => {
-        if (info.kind === "idle") {
-          if (settleDelayMs === 0) extractAndSettle();
-          else setTimeout(extractAndSettle, settleDelayMs);
-        } else if (info.kind === "stopped") {
-          settle({ error: "session stopped before reply" });
-        } else {
-          settle({ error: info.message || "session error" });
-        }
-      })
-    );
+    const sentByTool = () => {
+      if (sentDuringTurn) return true;
+      try {
+        return detectLarkToolSend(this.readHistoryEventsForScope(sessionId, scope), args.chatId);
+      } catch {
+        return false;
+      }
+    };
+    const settleError = (message) => {
+      settle(sentByTool() ? { ok: true, replyText: "", repliedByTool: true } : { error: message });
+    };
+    const onEndFrame = makeEndFrameHandler(sessionId, (info) => {
+      if (info.kind === "idle") {
+        if (settleDelayMs === 0) extractAndSettle();
+        else setTimeout(extractAndSettle, settleDelayMs);
+      } else if (info.kind === "stopped") {
+        settleError("session stopped before reply");
+      } else {
+        settleError(info.message || "session error");
+      }
+    });
+    unsubscribe = this.subscribe(sessionId, scope, (frame) => {
+      observeFrame(frame);
+      onEndFrame(frame);
+    });
     const runner = this.ensureRunnerForScope(file, scope);
     runner.input({
       kind: "command",
@@ -57371,7 +57500,7 @@ function ledgerOf(t2) {
 function stateOf(t2) {
   return t2.status.state.replace(/^TASK_STATE_/, "").toLowerCase();
 }
-var textOf = (m3) => (m3?.parts ?? []).map((p3) => typeof p3.text === "string" ? p3.text : "").filter(Boolean).join("\n");
+var textOf2 = (m3) => (m3?.parts ?? []).map((p3) => typeof p3.text === "string" ? p3.text : "").filter(Boolean).join("\n");
 function firstUserMessage(t2) {
   return t2.history?.find((m3) => m3.role === "ROLE_USER");
 }
@@ -57407,9 +57536,9 @@ function toTaskView(t2, workerSessionId) {
     executorThreadId: l2.executor.threadId,
     ...workerSessionId ? { workerSessionId } : {},
     ...sessionLabel ? { sessionLabel } : {},
-    taskText: textOf(firstUserMessage(t2)),
+    taskText: textOf2(firstUserMessage(t2)),
     brief: typeof brief === "string" && brief ? brief : null,
-    resultText: (resultArtifact ? textOf({ messageId: "", role: "ROLE_AGENT", parts: resultArtifact.parts }) : "") || textOf(lastAgent) || null,
+    resultText: (resultArtifact ? textOf2({ messageId: "", role: "ROLE_AGENT", parts: resultArtifact.parts }) : "") || textOf2(lastAgent) || null,
     filePaths: Array.isArray(filePaths) ? filePaths.filter((p3) => typeof p3 === "string") : [],
     line: t2.metadata[A2A_LINE_EXTENSION] ?? {},
     deliveredAt: l2.deliveredAt,
@@ -57441,7 +57570,7 @@ You may read this file with your Read tool to understand context. You do not hav
   const detail = `${head}
 
 Task:
-${textOf(msg)}${source}
+${textOf2(msg)}${source}
 
 When done, call \`a2aReport\` from the \`clawd-a2a\` MCP server (e.g. \`mcp__clawd-a2a__a2aReport\` in claude):
   - done: { state: "completed", text, brief, filePaths? }
@@ -67536,6 +67665,11 @@ ${formatLarkSpeakerReminder(speaker)}`
       deps.logger?.warn(`larkBot turn error (${last.chatId}): ${result.error}`);
     }
     const absorbed = envs.slice(0, -1).map((e) => e.eventId);
+    const repliedByTool = "ok" in result && result.repliedByTool === true;
+    if (repliedByTool) {
+      deps.logger?.info(`larkBot already replied by tool (${last.chatId}), suppressing auto reply`);
+    }
+    const replyBody = repliedByTool ? replyText || "[replied-by-tool]" : replyText;
     for (let attempt = 0; attempt <= replyDelays.length; attempt++) {
       if (attempt > 0) await sleep2(replyDelays[attempt - 1]);
       try {
@@ -67544,8 +67678,10 @@ ${formatLarkSpeakerReminder(speaker)}`
           // 回复走真身：chatId 自 spec 2026-09-10 起是虚拟三段式，只作会话 key 用
           chatId: last.realChatId ?? last.chatId,
           replyToMessageId: replyAnchorOf(last),
-          text: replyText,
+          text: replyBody,
           eventId: last.eventId,
+          // 工具已代发：中心只销账不发送（台账仍要关，否则重启认领会重跑同一事件）
+          ...repliedByTool ? { repliedByTool: true } : {},
           // 文档评论：云端据此走评论回复接口而非 IM（显式字段，不靠 chatId 前缀猜）
           ...last.type === "doc_comment" ? { docComment: { fileToken: last.fileToken, fileType: last.fileType ?? "docx" } } : {},
           ...absorbed.length > 0 ? { absorbedEventIds: absorbed } : {}
@@ -76541,7 +76677,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.762".length > 0 ? "0.2.762" : "dev";
+var version = "0.2.763".length > 0 ? "0.2.763" : "dev";
 
 // src/cli-probe/probe.ts
 var fs87 = __toESM(require("fs"), 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.762",
+  "version": "0.2.763",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",