scheduler 触发被过滤问题

Author: linyuan.yang

packages/channel.base/src/SessionService.ts

@@ -1,6 +1,6 @@
 import fs from "fs";
 import path from "path";
-import { ChatToolCall, ToolApproval, MessageDispatcher, type MessageContent, type TokenUsage } from "scorpio.ai";
+import { ChatToolCall, ToolApproval, MessageDispatcher, type MessageContent } from "scorpio.ai";
 import { type AskResponse, type AskToolParams } from "./AskTool";
 
 export enum SessionStatus {
@@ -81,8 +81,6 @@ export abstract class SessionService extends MessageDispatcher {
     private controller: AbortController;
     get signal(): AbortSignal { return this.controller.signal; }
     settings: SessionSettings = {};
-    /** 本 session 累计 token 用量 */
-    usage: TokenUsage = { input_tokens: 0, output_tokens: 0, total_tokens: 0 };
     private settingsPath?: string;
     private pending: PendingEntry | null = null;
 
@@ -105,14 +103,6 @@ export abstract class SessionService extends MessageDispatcher {
         }
     }
 
-    // ── Usage ──
-
-    recordUsage(usage: TokenUsage): void {
-        this.usage.input_tokens += usage.input_tokens;
-        this.usage.output_tokens += usage.output_tokens;
-        this.usage.total_tokens += usage.total_tokens;
-    }
-
     // ── Status ──
 
     private _syncStatus(): void {

…kages/sbot/src/Core/dispatchToSession.ts packages/sbot/src/Core/triggerSession.tspackages/sbot/src/Core/dispatchToSession.ts renamed to packages/sbot/src/Core/triggerSession.ts packages/sbot/src/Core/dispatchToSession.ts renamed to packages/sbot/src/Core/triggerSession.ts

@@ -6,26 +6,25 @@ import { channelDataService } from "../Session/ChannelDataService";
 import { channelManager } from "../Channel/ChannelManager";
 import { sessionManager } from "../Session/SessionManager";
 
-const logger = LoggerService.getLogger("dispatchToSession.ts");
+const logger = LoggerService.getLogger("triggerSession.ts");
 
-export interface DispatchToSessionOptions {
+export interface TriggerSessionOptions {
     targetId: number | string | null;
     message: string;
     aiProcess: boolean;
-    silent?: boolean;
     toolWhitelist?: string[] | ((channel: ChannelConfig) => string[] | undefined);
     awaitCompletion?: boolean;
     tag: string;
 }
 
-export interface DispatchResult {
+export interface TriggerSessionResult {
     ok: boolean;
     channelType?: string;
     sessionId?: string;
 }
 
-export async function dispatchToSession(opts: DispatchToSessionOptions): Promise<DispatchResult> {
-    const { targetId, message, aiProcess, silent, toolWhitelist, awaitCompletion, tag } = opts;
+export async function triggerSession(opts: TriggerSessionOptions): Promise<TriggerSessionResult> {
+    const { targetId, message, aiProcess, toolWhitelist, awaitCompletion, tag } = opts;
 
     if (targetId == null) {
         logger.warn(`${tag} target session id missing`);
@@ -56,7 +55,7 @@ export async function dispatchToSession(opts: DispatchToSessionOptions): Promise
     }
 
     const resolvedWhitelist = typeof toolWhitelist === "function" ? toolWhitelist(channelConfig) : toolWhitelist;
-    const args = { channelType, channelId, dbSessionId, sessionId, silent, toolWhitelist: resolvedWhitelist };
+    const args = { channelType, channelId, dbSessionId, sessionId, headless: true, toolWhitelist: resolvedWhitelist };
     if (awaitCompletion) {
         await new Promise<void>((resolve, reject) => {
             sessionManager.onReceiveChannelMessage(message, {

packages/sbot/src/Heartbeat/executeHeartbeat.ts

@@ -1,7 +1,7 @@
 import { database, HeartbeatRow } from "../Core/Database";
 import { loadPrompt } from "../Core/PromptLoader";
 import { LoggerService } from "../Core/LoggerService";
-import { dispatchToSession } from "../Core/dispatchToSession";
+import { triggerSession } from "../Core/triggerSession";
 
 const logger = LoggerService.getLogger("executeHeartbeat.ts");
 
@@ -36,11 +36,10 @@ export async function executeHeartbeat(ctx: HeartbeatExecutionContext): Promise<
 
     const prompt = loadPrompt(hbConfig.promptFile);
 
-    const result = await dispatchToSession({
+    const result = await triggerSession({
         targetId: hbConfig.target,
         message: prompt,
         aiProcess: true,
-        silent: true,
         toolWhitelist: ch => ch.heartbeatTools,
         awaitCompletion: true,
         tag,

packages/sbot/src/Processing/createProcessAIHandler.ts

@@ -1,5 +1,5 @@
 import { ProcessAIHandler } from "channel.base";
-import { MessageRole, ToolApproval } from "scorpio.ai";
+import { MessageRole, ToolApproval, type TokenUsage, type ChatMessage } from "scorpio.ai";
 import { channelDataService } from "../Session/ChannelDataService";
 import { config, AgentMode } from "../Core/Config";
 import { buildExecuteTool } from "./buildExecuteTool";
@@ -43,7 +43,7 @@ export function createProcessAIHandler(): ProcessAIHandler {
         sessionHandler.askTimeoutMs = askTimeout > 0 ? askTimeout * 1000 : 0;
         if (askTimeoutMessage) sessionHandler.askTimeoutMessage = askTimeoutMessage;
 
-        const silent: boolean = args?.silent ?? false;
+        const headless: boolean = args?.headless ?? false;
         const extraAgentTools = args?.agentTools;
         let baseTools = sessionHandler.buildAgentTools(args);
         const whitelist: string[] | undefined = args?.toolWhitelist ?? channel.tools;
@@ -53,7 +53,7 @@ export function createProcessAIHandler(): ProcessAIHandler {
         }
         const agentTools = extraAgentTools?.length ? [...baseTools, ...extraAgentTools] : baseTools;
 
-        const executeTool = silent
+        const executeTool = headless
             ? async () => ToolApproval.Allow
             : buildExecuteTool(sessionHandler.session, agentId, autoApproveAllTools, (tc) => sessionHandler.executeApproval(tc));
 
@@ -75,24 +75,23 @@ export function createProcessAIHandler(): ProcessAIHandler {
         }
 
         const profileId = profile.id;
-        const onUsage = async (usage: any) => {
-            if (!silent) sessionHandler.session.recordUsage(usage);
+        const onUsage = async (usage: TokenUsage) => {
             await updateUsageStats(usage, dbSessionId, profileId, usageContext);
         };
 
-        const onMessage = silent
-            ? async (msg: any) => { args?.onMessage?.(msg); }
+        const onMessage = headless
+            ? async (msg: ChatMessage) => { args?.onMessage?.(msg); }
             : streamVerbose
-                ? (msg: any) => sessionHandler.onChatMessage(msg, args)
-                : (msg: any) => {
+                ? (msg: ChatMessage) => sessionHandler.onChatMessage(msg, args)
+                : (msg: ChatMessage) => {
                     if (msg.role === MessageRole.AI && !msg.tool_calls?.length) {
                         return sessionHandler.onChatMessage(msg, args);
                     }
                     return Promise.resolve();
                 };
 
         const onStreamMessage = streamVerbose
-            ? (msg: any) => sessionHandler.onStreamMessage(msg, args)
+            ? (msg: ChatMessage) => sessionHandler.onStreamMessage(msg, args)
             : undefined;
 
         const callbacks = { onMessage, onStreamMessage, executeTool, onUsage };

packages/sbot/src/Scheduler/SchedulerService.ts

@@ -3,7 +3,7 @@ import { database, SchedulerRow, ChannelSessionRow } from "../Core/Database";
 import { channelDataService } from "../Session/ChannelDataService";
 import { LoggerService } from "../Core/LoggerService";
 import { TimerExecutor } from "../Core/TimerExecutor";
-import { dispatchToSession } from "../Core/dispatchToSession";
+import { triggerSession } from "../Core/triggerSession";
 
 const logger = LoggerService.getLogger("SchedulerService.ts");
 
@@ -56,7 +56,7 @@ async function executeScheduler(schedulerId: number): Promise<void> {
             logger.error(`Scheduler task ${tag} aborted: profile id=${scheduler.profileId} has no usable session`);
             return;
         }
-        const result = await dispatchToSession({
+        const result = await triggerSession({
             targetId: session.id,
             message: scheduler.message,
             aiProcess: scheduler.aiProcess,

packages/sbot/src/Session/SessionManager.ts

@@ -18,7 +18,7 @@ export interface ChannelRouteArgs extends ChannelMessageArgs {
     channelId: string;
     dbSessionId: number;
     mentionBot?: boolean;
-    silent?: boolean;
+    headless?: boolean;
     agentTools?: StructuredToolInterface[];
     toolWhitelist?: string[];
     onMessage?: (msg: ChatMessage) => void;
@@ -50,7 +50,7 @@ class SbotSession extends SessionService {
     }
 
     protected async onProcessStart(query: MessageContent, args: ChannelRouteArgs, messageType: MessageType): Promise<string | void> {
-        if (!args.silent) {
+        if (!args.headless) {
             await this.getChannel(args).onProcessStart(query, this.argsWithQueue(args), messageType);
         }
         const channelName = config.getChannel(args.channelId)?.name;
@@ -79,7 +79,7 @@ class SbotSession extends SessionService {
     }
 
     protected async onProcessEnd(query: MessageContent, args: ChannelRouteArgs, messageType: MessageType, error?: any): Promise<void> {
-        if (!args.silent) {
+        if (!args.headless) {
             await this.getChannel(args).onProcessEnd(query, this.argsWithQueue(args), messageType, error);
         }
         if (args.onComplete) {
@@ -194,8 +194,8 @@ export class SbotSessionManager extends SessionManager {
 
         const threadId = await this.resolveThreadId(args.dbSessionId);
 
-        // 静默模式和命令消息跳过意图过滤和消息合并，直接透传
-        if (args.silent || (typeof query === 'string' && query.trimStart().startsWith('/'))) {
+        // headless（程序化触发）和命令消息跳过意图过滤和消息合并，直接透传
+        if (args.headless || (typeof query === 'string' && query.trimStart().startsWith('/'))) {
             const session = this.getOrCreate(threadId);
             await session.onReceiveMessage(query, args);
             return;