@xmanrui/dsh-im 0.7.2 → 0.9.0

package/src/channels/shared/harness-client.mjs

@@ -40,6 +40,37 @@ function workspaceFromList(workspacePath, workspaceList) {
   return workspace;
 }
 
+function toEpochMs(value) {
+  if (typeof value === 'number' && Number.isFinite(value)) {
+    return value < 1e12 ? value * 1000 : value;
+  }
+  if (typeof value === 'string' && value) {
+    const parsed = Date.parse(value);
+    if (!Number.isNaN(parsed)) return parsed;
+  }
+  return null;
+}
+
+function sessionTimeMs(summary) {
+  if (!summary || typeof summary !== 'object') return null;
+  const candidates = [
+    summary?.header?.lastActivityAt,
+    summary?.header?.updatedAt,
+    summary?.header?.createdAt,
+    summary?.projections?.values?.lastActivityAt,
+    summary?.projections?.values?.updatedAt,
+    summary?.projections?.values?.createdAt,
+    summary?.lastActivityAt,
+    summary?.updatedAt,
+    summary?.createdAt,
+  ];
+  for (const value of candidates) {
+    const ms = toEpochMs(value);
+    if (ms !== null) return ms;
+  }
+  return null;
+}
+
 function workspaceSessions(workspace, archivedSessionIds, sessionList) {
   if (!Array.isArray(sessionList?.items)) {
     throw new Error('Harness returned an invalid response for session.list');
@@ -54,7 +85,7 @@ function workspaceSessions(workspace, archivedSessionIds, sessionList) {
     sessions: workspace.sessionIds.map((sessionId) => {
       const summary = summaries.get(sessionId);
       const title = summary?.projections?.values?.title;
-      return {
+      const session = {
         sessionId,
         title: typeof title === 'string' ? title : null,
         archived: archived.has(sessionId),
@@ -62,6 +93,9 @@ function workspaceSessions(workspace, archivedSessionIds, sessionList) {
         origin: summary?.origin === 'subagent' ? 'subagent' : null,
         summaryAvailable: summary !== undefined,
       };
+      const time = sessionTimeMs(summary);
+      if (time !== null) session.time = time;
+      return session;
     }),
   };
 }
@@ -284,6 +318,7 @@ export class HarnessClient {
   #interactionReconnectDelayMs;
   #rpcIdPrefix;
   #logPrefix;
+  #commandExecutor;
   #managedProcess = null;
   #interactionRegistry;
   #interactionOwnerships;
@@ -300,6 +335,7 @@ export class HarnessClient {
     interactionReconnectDelayMs = 500,
     rpcIdPrefix = 'im',
     logPrefix = 'dsh-im',
+    commandExecutor,
   }) {
     if (typeof createWebSocket !== 'function') {
       throw new TypeError('createWebSocket must be a function');
@@ -313,6 +349,9 @@ export class HarnessClient {
     if (typeof logPrefix !== 'string' || !logPrefix.trim()) {
       throw new TypeError('logPrefix must be a non-empty string');
     }
+    if (commandExecutor !== undefined && typeof commandExecutor !== 'function') {
+      throw new TypeError('commandExecutor must be a function');
+    }
     this.#baseUrl = new URL(baseUrl);
     this.#workspace = workspace;
     this.#agentPreset = agentPreset;
@@ -323,6 +362,7 @@ export class HarnessClient {
     this.#interactionReconnectDelayMs = interactionReconnectDelayMs;
     this.#rpcIdPrefix = rpcIdPrefix.trim();
     this.#logPrefix = logPrefix.trim();
+    this.#commandExecutor = commandExecutor;
     this.#interactionRegistry = interactionRegistry(this.#baseUrl.origin);
     this.#interactionOwnerships = this.#interactionRegistry.ownerships;
     this.#interactionClaims = this.#interactionRegistry.claims;
@@ -425,6 +465,24 @@ export class HarnessClient {
     return created.sessionId;
   }
 
+  async executeCommand(sessionId, line, options = {}) {
+    if (typeof sessionId !== 'string' || !sessionId) throw new TypeError('sessionId is required');
+    if (typeof line !== 'string' || !line) throw new TypeError('command line is required');
+    if (!this.#commandExecutor) {
+      const error = new Error('Harness command execution is unavailable');
+      error.code = 'commands-unavailable';
+      throw error;
+    }
+    try {
+      return await this.#commandExecutor(sessionId, line, options);
+    } catch (error) {
+      if (error?.failure && typeof error.failure === 'object') {
+        throw new HarnessRpcError('commands.execute', error.failure);
+      }
+      throw error;
+    }
+  }
+
   async sessionExists(sessionId, options = {}) {
     try {
       await this.rpc('session.history', { sessionId, maxMessages: 1 }, 30_000, options);

package/src/channels/shared/text-harness-bridge.mjs

@@ -1,4 +1,5 @@
 import { runWorkspaceCommand } from './workspace-command.mjs';
+import { runCompactCommand } from './compact-command.mjs';
 import { askInWorkspaceSession } from './workspace-session.mjs';
 import { HarnessApprovalQueue } from './harness-approval.mjs';
 import {
@@ -218,10 +219,11 @@ export class TextHarnessBridge {
           '',
           '直接发送文字即可继续当前会话。',
           '/new  开启一个全新会话',
+          '/compact  压缩当前会话的较早上下文',
           '/workspace 工作区绝对路径  切换工作区',
           '/workspacelist  列出工作区绝对路径',
           '/sessionlist [工作区序号或绝对路径]  列出会话 ID 和标题',
-          '/session Session ID  将当前聊天绑定到指定会话',
+          '/session Session ID 或当前工作区序号  将当前聊天绑定到指定会话',
           '/status  检查连接状态',
           '/help  显示本帮助',
         ].join('\n'));
@@ -244,6 +246,17 @@ export class TextHarnessBridge {
         await this.#bot.sendText(target, '已开启新会话。请发送你的问题。');
         return;
       }
+      const compactCommand = await runCompactCommand(
+        text,
+        this.#harness,
+        this.#state,
+        conversationKey,
+        { signal: this.#signal },
+      );
+      if (compactCommand) {
+        await this.#bot.sendText(target, compactCommand.message);
+        return;
+      }
 
       await this.#bot.sendTyping?.(target).catch((error) => {
         this.#logger.warn?.(`[dsh-im:${this.#descriptor.key}] typing indicator failed:`, error);

package/src/channels/shared/workspace-command.mjs

@@ -13,7 +13,7 @@ const MAX_COMMAND_MESSAGE_LENGTH = 1_800;
 const MAX_SESSION_ID_LENGTH = 256;
 const UNSAFE_DISPLAY_TEXT = /[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]/u;
 const UNSAFE_DISPLAY_TEXT_GLOBAL = /[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]+/gu;
-const SESSION_BIND_USAGE = '用法：/session Session ID';
+const SESSION_BIND_USAGE = '用法：/session Session ID 或当前工作区序号（/session N）';
 const SESSION_LIST_USAGE = [
   '用法：',
   '/sessionlist  列出当前工作区会话',
@@ -175,14 +175,35 @@ async function resolveSessionListWorkspace(selector, harness) {
   return selected;
 }
 
-function sessionListMessage(workspace, sessions) {
+function formatSessionRelativeTime(value) {
+  const ms = typeof value === 'number' && Number.isFinite(value) ? value : null;
+  if (ms === null) return '';
+  const date = new Date(ms);
+  if (Number.isNaN(date.getTime())) return '';
+  const pad = (n) => String(n).padStart(2, '0');
+  const hm = `${pad(date.getHours())}:${pad(date.getMinutes())}`;
+  const startOfDay = (d) => new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime();
+  const now = new Date();
+  const dayDiff = Math.round((startOfDay(now) - startOfDay(date)) / 86_400_000);
+  if (dayDiff === 0) return `今天 ${hm}`;
+  if (dayDiff === 1) return `昨天 ${hm}`;
+  if (dayDiff === 2) return `前天 ${hm}`;
+  if (date.getFullYear() === now.getFullYear()) {
+    return `${date.getMonth() + 1}月${date.getDate()}日 ${hm}`;
+  }
+  return `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日`;
+}
+
+function sessionListMessage(workspace, sessions, { currentWorkspace = false } = {}) {
   const rows = sessions.map((session) => {
     const sessionId = safeDisplayText(session?.sessionId);
     if (!sessionId) throw new TypeError('Harness returned an invalid session id');
     const title = session?.summaryAvailable === false
       ? '标题暂不可用'
       : safeDisplayText(session?.title) || '暂无标题';
-    return `${title}${session?.archived === true ? '（已归档）' : ''}\n   ID: ${sessionId}`;
+    const timeText = formatSessionRelativeTime(session?.time);
+    const annotation = `${timeText ? ` · ${timeText}` : ''}${session?.archived === true ? '（已归档）' : ''}`;
+    return `${title}${annotation}\n   ID: ${sessionId}`;
   });
   if (rows.length === 0) return `工作区：${workspace}\n该工作区暂无会话。`;
   return [
@@ -191,10 +212,19 @@ function sessionListMessage(workspace, sessions) {
     '',
     ...rows.map((row, index) => `${index + 1}. ${row}`),
     '',
-    '绑定用法：/session Session ID',
+    currentWorkspace
+      ? '绑定用法：/session Session ID 或当前工作区序号（/session N）'
+      : '绑定用法：/session Session ID\n提示：/session N 只按机器人当前工作区的序号绑定。',
   ].join('\n');
 }
 
+async function currentSessionListWorkspace(harness) {
+  if (typeof harness?.currentWorkspace !== 'function') return null;
+  const [current] = await existingWorkspacePaths([harness.currentWorkspace()]);
+  harness.assertWorkspaceScope?.();
+  return current ?? null;
+}
+
 async function runSessionListCommand(match, harness) {
   if (typeof harness?.listWorkspaceSessions !== 'function') {
     return commandResult('当前机器人暂不支持列出工作区会话。');
@@ -209,7 +239,10 @@ async function runSessionListCommand(match, harness) {
     }
     harness.assertWorkspaceScope?.();
     const workspace = normalizedWorkspacePath(listed.workspace) ?? resolved.workspace;
-    const message = sessionListMessage(workspace, listed.sessions);
+    const currentWorkspace = await currentSessionListWorkspace(harness);
+    const message = sessionListMessage(workspace, listed.sessions, {
+      currentWorkspace: workspace === currentWorkspace,
+    });
     return commandResult(message, splitWorkspaceCommandMessage(message));
   } catch (error) {
     if (error?.code === 'workspace-bot-not-found') {
@@ -247,7 +280,38 @@ function sessionBindErrorMessage(error) {
 
 async function runSessionBindCommand(command, harness, conversationKey) {
   const match = SESSION_BIND_COMMAND.exec(command);
-  const sessionId = match?.[1];
+  let sessionId = match?.[1];
+  if (typeof sessionId === 'string' && /^\d+$/u.test(sessionId)) {
+    // 序号模式：把 /session N 解析成当前工作区会话列表中的第 N 个会话
+    if (typeof harness?.listWorkspaceSessions !== 'function'
+      || typeof harness?.currentWorkspace !== 'function') {
+      return commandResult('当前机器人暂不支持按序号绑定，请使用 /session Session ID。');
+    }
+    try {
+      const selected = await selectedWorkspacePath(harness.currentWorkspace());
+      if (selected.error) return commandResult(selected.error);
+      const listed = await harness.listWorkspaceSessions(selected.workspace);
+      if (!listed || !Array.isArray(listed.sessions)) {
+        throw new TypeError('Harness returned an invalid workspace session list');
+      }
+      harness.assertWorkspaceScope?.();
+      const position = Number(sessionId);
+      if (!Number.isSafeInteger(position) || position < 1
+        || position > listed.sessions.length) {
+        return commandResult('会话序号不存在，请先执行 /sessionlist 查看序号。');
+      }
+      const selectedSessionId = listed.sessions[position - 1]?.sessionId;
+      if (!validSessionId(selectedSessionId)) {
+        throw new TypeError('Harness returned an invalid session id');
+      }
+      sessionId = selectedSessionId;
+    } catch (error) {
+      if (error?.code === 'workspace-bot-not-found') {
+        return commandResult(sessionBindErrorMessage(error));
+      }
+      return commandResult('暂时无法获取会话列表，请稍后重试。');
+    }
+  }
   if (!validSessionId(sessionId)) return commandResult(SESSION_BIND_USAGE);
   if (typeof harness?.bindWorkspaceSession !== 'function') {
     return commandResult('当前机器人暂不支持绑定已有会话。');

package/src/channels/wecom/wecom-bridge.mjs

@@ -5,6 +5,7 @@ import {
   validHarnessQuestion,
 } from '../shared/harness-question.mjs';
 import { HarnessApprovalQueue } from '../shared/harness-approval.mjs';
+import { runCompactCommand } from '../shared/compact-command.mjs';
 import { runWorkspaceCommand } from '../shared/workspace-command.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
 
@@ -13,10 +14,11 @@ const HELP_TEXT = [
   '',
   '直接发送文字即可继续当前会话。',
   '/new  开启一个全新会话',
+  '/compact  压缩当前会话的较早上下文',
   '/workspace 工作区绝对路径  切换工作区',
   '/workspacelist  列出工作区绝对路径',
   '/sessionlist [工作区序号或绝对路径]  列出会话 ID 和标题',
-  '/session Session ID  将当前聊天绑定到指定会话',
+  '/session Session ID 或当前工作区序号  将当前聊天绑定到指定会话',
   '/status  检查连接状态',
   '/help  显示本帮助',
 ].join('\n');
@@ -321,6 +323,18 @@ export class WecomHarnessBridge {
         await this.#state.markSeen(messageId);
         return;
       }
+      const compactCommand = await runCompactCommand(
+        text,
+        this.#harness,
+        this.#state,
+        key,
+        { signal: this.#signal },
+      );
+      if (compactCommand) {
+        await this.#sendImmediate(frame, chatId, compactCommand.message);
+        await this.#state.markSeen(messageId);
+        return;
+      }
 
       streamId = this.#generateReqId('stream');
       try {

package/src/channels/weixin/weixin-api.mjs

@@ -92,7 +92,7 @@ function authenticatedHeaders(token) {
 function baseInfo() {
   return {
     channel_version: WEIXIN_PROTOCOL_VERSION,
-    bot_agent: 'DeepSeekHarness/0.7.2',
+    bot_agent: 'DeepSeekHarness/0.9.0',
   };
 }
 

package/src/channels/weixin/weixin-bridge.mjs

@@ -9,6 +9,7 @@ import {
   validHarnessQuestion,
 } from '../shared/harness-question.mjs';
 import { HarnessApprovalQueue } from '../shared/harness-approval.mjs';
+import { runCompactCommand } from '../shared/compact-command.mjs';
 import { runWorkspaceCommand } from '../shared/workspace-command.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
 
@@ -19,10 +20,11 @@ const HELP_TEXT = [
   '',
   '直接发送文字或带文字识别结果的语音即可继续当前会话。',
   '/new  开启一个全新会话',
+  '/compact  压缩当前会话的较早上下文',
   '/workspace 工作区绝对路径  切换工作区',
   '/workspacelist  列出工作区绝对路径',
   '/sessionlist [工作区序号或绝对路径]  列出会话 ID 和标题',
-  '/session Session ID  将当前聊天绑定到指定会话',
+  '/session Session ID 或当前工作区序号  将当前聊天绑定到指定会话',
   '/status  检查连接状态',
   '/help  显示本帮助',
 ].join('\n');
@@ -248,6 +250,18 @@ export class WeixinHarnessBridge {
         await this.#state.markSeen(messageId);
         return;
       }
+      const compactCommand = await runCompactCommand(
+        text,
+        this.#harness,
+        this.#state,
+        key,
+        { signal: this.#signal },
+      );
+      if (compactCommand) {
+        await this.#send(sender, compactCommand.message, contextToken, runId);
+        await this.#state.markSeen(messageId);
+        return;
+      }
 
       let answer;
       try {