@jun133/athlete 0.0.2 → 0.0.4

package/README.md

@@ -131,7 +131,7 @@ Athlete 想坚持的，不是“让模型显得更聪明”，而是让任务真
 | `athlete weixin serve` | 启动 Weixin 私聊服务 |
 | `athlete weixin logout` | 清理 Weixin 登录态 |
 
-文档读取能力依赖 `MINERU_API_TOKEN`。Telegram 需要 `ATHLETE_TELEGRAM_TOKEN` 和 `ATHLETE_TELEGRAM_ALLOWED_USER_IDS`。Weixin 需要先执行 `athlete weixin login`，再配置 `ATHLETE_WEIXIN_ALLOWED_USER_IDS`。
+文档读取能力依赖 `MINERU_API_TOKEN`。Telegram 需要 `ATHLETE_TELEGRAM_TOKEN` 和 `ATHLETE_TELEGRAM_ALLOWED_USER_IDS`。Weixin 需要先执行 `athlete weixin login`，再配置 `ATHLETE_WEIXIN_ALLOWED_USER_IDS`。Telegram 和 Weixin 私聊里都支持 `/stop`，用于停止当前任务但不关闭服务。
 
 ### NPM 发布
 

package/dist/cli.js

@@ -14707,6 +14707,9 @@ async function runAgentTurn(options) {
         emitAssistantFinalOutput(response, options);
         return completed.result;
       }
+      if (response.content && !response.streamedAssistantContent) {
+        options.callbacks?.onAssistantStage?.(response.content);
+      }
       session = await options.sessionStore.appendMessages(session, [
         createMessage("assistant", response.content, {
           reasoningContent: response.reasoningContent,
@@ -16673,6 +16676,13 @@ function createStreamRenderer(config, options) {
         beginAssistant();
         writeStdout(delta);
       },
+      onAssistantStage(text) {
+        if (isAborted()) {
+          return;
+        }
+        beginAssistant();
+        writeStdout(text);
+      },
       onAssistantText(text) {
         if (isAborted()) {
           return;
@@ -18891,6 +18901,7 @@ function normalizeCaption(value) {
 }
 
 // src/chat/visibleEvents.ts
+var TOOL_RESULT_PREVIEW_MAX_CHARS2 = 150;
 function createVisibleTurnCallbacks(options) {
   const assistantState = {
     bufferedDeltaText: "",
@@ -18900,6 +18911,22 @@ function createVisibleTurnCallbacks(options) {
     assistantState.bufferedDeltaText = "";
     assistantState.finalizedByTextEvent = false;
   };
+  const flushBufferedAssistantStage = () => {
+    if (assistantState.bufferedDeltaText.length === 0) {
+      return;
+    }
+    emitAssistantStage(options, assistantState.bufferedDeltaText);
+    resetAssistantStage();
+  };
+  const handleBufferedAssistantBeforeToolEvent = () => {
+    if (options.flushBufferedAssistantBeforeToolEvents) {
+      flushBufferedAssistantStage();
+      return;
+    }
+    if (options.dropBufferedAssistantBeforeToolEvents) {
+      resetAssistantStage();
+    }
+  };
   return {
     onModelWaitStart: () => {
       options.onActivity();
@@ -18920,6 +18947,14 @@ function createVisibleTurnCallbacks(options) {
       assistantState.bufferedDeltaText = "";
       assistantState.finalizedByTextEvent = true;
     },
+    onAssistantStage: (text) => {
+      options.onActivity();
+      if (!options.enableAssistantStageEvents) {
+        return;
+      }
+      emitAssistantStage(options, text);
+      resetAssistantStage();
+    },
     onAssistantDone: (text) => {
       options.onActivity();
       if (assistantState.bufferedDeltaText.length > 0) {
@@ -18943,11 +18978,14 @@ function createVisibleTurnCallbacks(options) {
     },
     onToolCall: (name) => {
       options.onActivity();
+      handleBufferedAssistantBeforeToolEvent();
       emitNormalizedVisibleText(options, "tool_call", name);
     },
     onToolResult: (name, output) => {
       options.onActivity();
+      handleBufferedAssistantBeforeToolEvent();
       if (name !== "todo_write") {
+        emitNormalizedVisibleText(options, "tool_result_preview", extractToolResultPreview(output));
         return;
       }
       const preview = extractTodoPreview(output);
@@ -18955,6 +18993,7 @@ function createVisibleTurnCallbacks(options) {
     },
     onToolError: () => {
       options.onActivity();
+      handleBufferedAssistantBeforeToolEvent();
     },
     onModelWaitStop: () => {
       return;
@@ -18972,6 +19011,11 @@ function extractTodoPreview(rawOutput) {
   }
   return null;
 }
+function extractToolResultPreview(rawOutput) {
+  const parsed = tryParseVisibleObject(rawOutput);
+  const preview = extractPrimaryPreview(parsed) ?? extractEntriesPreview(parsed) ?? extractMatchesPreview(parsed) ?? rawOutput;
+  return truncateVisibleText(preview, TOOL_RESULT_PREVIEW_MAX_CHARS2);
+}
 function emitAssistantText(options, rawText) {
   emitExactVisibleText(options, "assistant", rawText);
 }
@@ -19011,6 +19055,76 @@ function normalizeVisibleText(value) {
   }
   return value.trim() ? value : "";
 }
+function truncateVisibleText(value, maxChars) {
+  const normalized = normalizeVisibleText(
+    typeof value === "string" ? value.replace(/\s+/g, " ").trim() : value
+  );
+  if (!normalized) {
+    return null;
+  }
+  if (normalized.length <= maxChars) {
+    return normalized;
+  }
+  return `${normalized.slice(0, maxChars)}...`;
+}
+function tryParseVisibleObject(rawOutput) {
+  try {
+    const parsed = JSON.parse(rawOutput);
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+      return null;
+    }
+    return parsed;
+  } catch {
+    return null;
+  }
+}
+function extractPrimaryPreview(payload) {
+  if (!payload) {
+    return null;
+  }
+  for (const key of ["preview", "content", "output", "markdownPreview", "error", "reason", "hint"]) {
+    const value = payload[key];
+    if (typeof value === "string" && value.trim().length > 0) {
+      return value;
+    }
+  }
+  return null;
+}
+function extractEntriesPreview(payload) {
+  const entries = payload?.entries;
+  if (!Array.isArray(entries) || entries.length === 0) {
+    return null;
+  }
+  const fragments = entries.slice(0, 2).map((entry) => {
+    if (!entry || typeof entry !== "object" || Array.isArray(entry)) {
+      return null;
+    }
+    const record = entry;
+    const type = record.type === "directory" ? "dir" : "file";
+    const path59 = typeof record.path === "string" ? record.path : "";
+    return path59 ? `${type} ${path59}` : null;
+  }).filter((value) => Boolean(value));
+  return fragments.length > 0 ? fragments.join(" ") : null;
+}
+function extractMatchesPreview(payload) {
+  const matches = payload?.matches;
+  if (!Array.isArray(matches) || matches.length === 0) {
+    return null;
+  }
+  const first = matches[0];
+  if (!first || typeof first !== "object" || Array.isArray(first)) {
+    return null;
+  }
+  const record = first;
+  const path59 = typeof record.path === "string" ? record.path : "";
+  const text = typeof record.text === "string" ? record.text : "";
+  const line = typeof record.line === "number" ? record.line : void 0;
+  const prefix = path59 ? `${path59}${line ? `:${line}` : ""}` : "";
+  if (prefix && text) {
+    return `${prefix} ${text}`;
+  }
+  return prefix || text || null;
+}
 
 // src/chat/durableTurnDisplay.ts
 var DurableTurnDisplay = class {
@@ -19023,7 +19137,10 @@ var DurableTurnDisplay = class {
       onVisibleEvent: (event) => {
         this.enqueueVisibleText(event.text);
       },
-      shouldEmitEvent: options.shouldEmitEvent
+      shouldEmitEvent: options.shouldEmitEvent,
+      flushBufferedAssistantBeforeToolEvents: options.flushBufferedAssistantBeforeToolEvents,
+      dropBufferedAssistantBeforeToolEvents: options.dropBufferedAssistantBeforeToolEvents,
+      enableAssistantStageEvents: options.enableAssistantStageEvents
     });
   }
   callbacks;
@@ -19111,6 +19228,9 @@ var TelegramTurnDisplay = class extends DurableTurnDisplay {
       },
       sendTyping: async (target) => options.sendTyping(target.chatId),
       enqueueVisibleMessage: options.enqueueVisibleMessage,
+      shouldEmitEvent: (event) => event.kind !== "tool_call",
+      flushBufferedAssistantBeforeToolEvents: true,
+      enableAssistantStageEvents: true,
       typingIntervalMs: options.typingIntervalMs,
       scheduleTypingTick: options.scheduleTypingTick
     });
@@ -20200,6 +20320,10 @@ function wrapCallbacksWithSpinnerStop(callbacks, stopSpinner) {
       stopSpinner();
       callbacks.onAssistantDelta?.(delta);
     },
+    onAssistantStage(text) {
+      stopSpinner();
+      callbacks.onAssistantStage?.(text);
+    },
     onAssistantDone(fullText) {
       stopSpinner();
       callbacks.onAssistantDone?.(fullText);
@@ -21667,7 +21791,8 @@ var WeixinTurnDisplay = class extends DurableTurnDisplay {
       },
       sendTyping: async (target) => options.sendTyping(target.userId),
       enqueueVisibleMessage: options.enqueueVisibleMessage,
-      shouldEmitEvent: (event) => event.kind !== "tool_call",
+      shouldEmitEvent: (event) => event.kind === "assistant",
+      dropBufferedAssistantBeforeToolEvents: true,
       typingIntervalMs: options.typingIntervalMs,
       scheduleTypingTick: options.scheduleTypingTick
     });