@wu529778790/open-im 0.2.8 → 0.2.9

package/README.md

@@ -81,6 +81,7 @@ open-im run
 | `open-im init` | 初始化配置（首次使用或重新配置） |
 | `open-im start` | 后台启动服务 |
 | `open-im stop` | 停止服务 |
+| `open-im restart` | 重启服务 |
 
 ### Telegram 机器人命令
 

package/dist/cli.js

@@ -129,24 +129,8 @@ async function stopService() {
         await removePidFile();
     }
 }
-const args = process.argv.slice(2);
-if (args[0] === 'init') {
-    // 手动触发配置
-    console.log('\n━━━ open-im 配置向导 ━━━\n');
-    const saved = await runInteractiveSetup();
-    if (!saved) {
-        console.log('配置未完成。');
-        process.exit(1);
-    }
-    console.log('\n✅ 配置完成！现在可以运行以下命令启动服务:\n  open-im start\n');
-}
-else if (args[0] === 'stop') {
-    stopService().catch((err) => {
-        console.error('停止服务时出错:', err);
-        process.exit(1);
-    });
-}
-else if (args[0] === 'start') {
+// 启动服务（后台）
+async function startService() {
     // 首先检查是否需要配置
     if (needsSetup()) {
         console.log('\n━━━ open-im 首次配置 ━━━\n');
@@ -186,6 +170,36 @@ else if (args[0] === 'start') {
     child.unref();
     console.log(`服务已在后台启动 (PID: ${child.pid})`);
 }
+const args = process.argv.slice(2);
+if (args[0] === 'init') {
+    // 手动触发配置
+    console.log('\n━━━ open-im 配置向导 ━━━\n');
+    const saved = await runInteractiveSetup();
+    if (!saved) {
+        console.log('配置未完成。');
+        process.exit(1);
+    }
+    console.log('\n✅ 配置完成！现在可以运行以下命令启动服务:\n  open-im start\n');
+}
+else if (args[0] === 'stop') {
+    stopService().catch((err) => {
+        console.error('停止服务时出错:', err);
+        process.exit(1);
+    });
+}
+else if (args[0] === 'restart') {
+    console.log('正在重启服务...\n');
+    await stopService().catch((err) => {
+        console.error('停止服务时出错:', err);
+    });
+    // 等待进程完全退出
+    await new Promise(resolve => setTimeout(resolve, 1000));
+    console.log('\n正在重新启动服务...\n');
+    await startService();
+}
+else if (args[0] === 'start') {
+    await startService();
+}
 else if (args[0] === 'run' || args.length === 0) {
     // 前台运行（默认命令）
     console.log('\n🚀 正在前台启动 open-im 服务...\n');

package/dist/commands/handler.d.ts

@@ -1,8 +1,8 @@
 import type { Config } from '../config.js';
 import type { SessionManager } from '../session/session-manager.js';
 import type { RequestQueue } from '../queue/request-queue.js';
-import type { ThreadContext, CostRecord } from '../shared/types.js';
-export type { ThreadContext, CostRecord };
+import type { ThreadContext } from '../shared/types.js';
+export type { ThreadContext };
 export interface MessageSender {
     sendTextReply(chatId: string, text: string, threadCtx?: ThreadContext): Promise<void>;
 }
@@ -11,7 +11,6 @@ export interface CommandHandlerDeps {
     sessionManager: SessionManager;
     requestQueue: RequestQueue;
     sender: MessageSender;
-    userCosts: Map<string, CostRecord>;
     getRunningTasksSize: () => number;
 }
 export type ClaudeRequestHandler = (userId: string, chatId: string, prompt: string, workDir: string, convId?: string, threadCtx?: ThreadContext, replyToMessageId?: string) => Promise<void>;

package/dist/commands/handler.js

@@ -69,7 +69,6 @@ export class CommandHandler {
         const workDir = this.deps.sessionManager.getWorkDir(userId);
         const convId = this.deps.sessionManager.getConvId(userId);
         const sessionId = this.deps.sessionManager.getSessionIdForConv(userId, convId);
-        const record = this.deps.userCosts.get(userId);
         const lines = [
             '📊 状态:',
             '',
@@ -77,7 +76,6 @@ export class CommandHandler {
             `版本: ${version}`,
             `工作目录: ${workDir}`,
             `会话: ${sessionId ?? '无'}`,
-            `费用: $${record?.totalCost.toFixed(4) ?? '0.0000'}`,
         ];
         await this.deps.sender.sendTextReply(chatId, lines.join('\n'));
         return true;

package/dist/shared/ai-task.d.ts

@@ -4,11 +4,9 @@
 import type { Config } from '../config.js';
 import type { SessionManager } from '../session/session-manager.js';
 import type { ToolAdapter } from '../adapters/tool-adapter.interface.js';
-import type { CostRecord } from './types.js';
 export interface TaskDeps {
     config: Config;
     sessionManager: SessionManager;
-    userCosts: Map<string, CostRecord>;
 }
 export interface TaskContext {
     userId: string;

package/dist/shared/ai-task.js

@@ -1,19 +1,13 @@
 /**
  * 共享 AI 任务执行层 - 支持多 ToolAdapter
  */
-import { formatToolStats, formatToolCallNotification, trackCost, getContextWarning, } from './utils.js';
+import { formatToolStats, formatToolCallNotification, getContextWarning, } from './utils.js';
 import { createLogger } from '../logger.js';
 const log = createLogger('AITask');
 function buildCompletionNote(result, sessionManager, ctx) {
     const toolInfo = formatToolStats(result.toolStats, result.numTurns);
     const parts = [];
-    if (result.cost > 0) {
-        parts.push(`耗时 ${(result.durationMs / 1000).toFixed(1)}s`);
-        parts.push(`费用 $${result.cost.toFixed(4)}`);
-    }
-    else {
-        parts.push('完成');
-    }
+    parts.push(`耗时 ${(result.durationMs / 1000).toFixed(1)}s`);
     if (toolInfo)
         parts.push(toolInfo);
     if (result.model)
@@ -27,7 +21,7 @@ function buildCompletionNote(result, sessionManager, ctx) {
     return parts.join(' | ');
 }
 export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
-    const { config, sessionManager, userCosts } = deps;
+    const { config, sessionManager } = deps;
     return new Promise((resolve) => {
         let lastUpdateTime = 0;
         let pendingUpdate = null;
@@ -125,8 +119,6 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
                     pendingUpdate = null;
                 }
                 const note = buildCompletionNote(result, sessionManager, ctx);
-                log.info(`Task completed for user ${ctx.userId}: cost=$${result.cost.toFixed(4)}`);
-                trackCost(userCosts, ctx.userId, result.cost, result.durationMs);
                 const finalContent = result.accumulated || result.result || '(无输出)';
                 try {
                     await platformAdapter.sendComplete(finalContent, note, thinkingText || undefined);

package/dist/shared/types.d.ts

@@ -2,8 +2,3 @@ export interface ThreadContext {
     rootMessageId: string;
     threadId: string;
 }
-export interface CostRecord {
-    totalCost: number;
-    totalDurationMs: number;
-    requestCount: number;
-}

package/dist/shared/utils.d.ts

@@ -1,7 +1,5 @@
-import type { CostRecord } from './types.js';
 export declare function truncateText(text: string, maxLen: number): string;
 export declare function splitLongContent(text: string, maxLen: number): string[];
 export declare function formatToolStats(toolStats: Record<string, number>, numTurns: number): string;
 export declare function formatToolCallNotification(toolName: string, toolInput?: Record<string, unknown>): string;
-export declare function trackCost(userCosts: Map<string, CostRecord>, userId: string, cost: number, durationMs: number): void;
 export declare function getContextWarning(totalTurns: number): string | null;

package/dist/shared/utils.js

@@ -56,13 +56,6 @@ export function formatToolCallNotification(toolName, toolInput) {
         detail = ` → ${toolInput.file_path}`;
     return `${emoji} ${toolName}${detail}`;
 }
-export function trackCost(userCosts, userId, cost, durationMs) {
-    const r = userCosts.get(userId) ?? { totalCost: 0, totalDurationMs: 0, requestCount: 0 };
-    r.totalCost += cost;
-    r.totalDurationMs += durationMs;
-    r.requestCount += 1;
-    userCosts.set(userId, r);
-}
 export function getContextWarning(totalTurns) {
     if (totalTurns >= 12)
         return '⚠️ 上下文较长，建议 /new 开始新会话';

package/dist/telegram/event-handler.js

@@ -27,7 +27,6 @@ async function downloadTelegramPhoto(bot, fileId) {
 export function setupTelegramHandlers(bot, config, sessionManager) {
     const accessControl = new AccessControl(config.allowedUserIds);
     const requestQueue = new RequestQueue();
-    const userCosts = new Map();
     const runningTasks = new Map();
     const stopTaskCleanup = startTaskCleanup(runningTasks);
     const dedup = new MessageDedup();
@@ -36,7 +35,6 @@ export function setupTelegramHandlers(bot, config, sessionManager) {
         sessionManager,
         requestQueue,
         sender: { sendTextReply },
-        userCosts,
         getRunningTasksSize: () => runningTasks.size,
     });
     registerPermissionSender('telegram', {});
@@ -59,7 +57,7 @@ export function setupTelegramHandlers(bot, config, sessionManager) {
         }
         const stopTyping = startTypingLoop(chatId);
         const taskKey = `${userId}:${msgId}`;
-        await runAITask({ config, sessionManager, userCosts }, { userId, chatId, workDir, sessionId, convId, platform: 'telegram', taskKey }, prompt, toolAdapter, {
+        await runAITask({ config, sessionManager }, { userId, chatId, workDir, sessionId, convId, platform: 'telegram', taskKey }, prompt, toolAdapter, {
             throttleMs: THROTTLE_MS,
             streamUpdate: (content, toolNote) => {
                 const note = toolNote ? '输出中...\n' + toolNote : '输出中...';

package/dist/telegram/message-sender.js

@@ -45,8 +45,9 @@ export async function sendThinkingMessage(chatId, replyToMessageId, toolId = 'cl
             message_id: Number(replyToMessageId),
         };
     }
-    const msg = await bot.telegram.sendMessage(Number(chatId), formatMessage('正在思考...', 'thinking', '请稍候', toolId), { ...extra, parse_mode: 'Markdown' });
-    await bot.telegram.editMessageText(Number(chatId), msg.message_id, undefined, formatMessage('正在思考...', 'thinking', '请稍候', toolId), { reply_markup: buildStopKeyboard(msg.message_id), parse_mode: 'Markdown' });
+    // 初始消息使用纯文本，避免 Markdown 解析问题
+    const msg = await bot.telegram.sendMessage(Number(chatId), formatMessage('正在思考...', 'thinking', '请稍候', toolId), extra);
+    await bot.telegram.editMessageText(Number(chatId), msg.message_id, undefined, formatMessage('正在思考...', 'thinking', '请稍候', toolId), { reply_markup: buildStopKeyboard(msg.message_id) });
     return String(msg.message_id);
 }
 export async function updateMessage(chatId, messageId, content, status, note, toolId = 'claude') {
@@ -55,8 +56,11 @@ export async function updateMessage(chatId, messageId, content, status, note, to
     if (status === 'thinking' || status === 'streaming') {
         opts.reply_markup = buildStopKeyboard(Number(messageId));
     }
+    // 流式输出时使用纯文本，避免 Markdown 解析导致内容减少
+    // 只在完成时应用 Markdown 格式
+    const shouldParseMarkdown = status === 'done' || status === 'error';
     try {
-        await bot.telegram.editMessageText(Number(chatId), Number(messageId), undefined, formatMessage(content, status, note, toolId), { ...opts, parse_mode: 'Markdown' });
+        await bot.telegram.editMessageText(Number(chatId), Number(messageId), undefined, formatMessage(content, status, note, toolId), { ...opts, parse_mode: shouldParseMarkdown ? 'Markdown' : undefined });
     }
     catch (err) {
         if (err && typeof err === 'object' && 'message' in err && String(err.message).includes('not modified')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "Multi-platform IM bridge for AI CLI tools (Claude, Codex, Cursor)",
   "type": "module",
   "main": "dist/index.js",