@yancyyu/openhermit 1.6.42 → 1.6.43

package/src/main/services/direct-cli/__tests__/directCliMessageId.test.ts

@@ -0,0 +1,40 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildDirectReplyMessageId } from '../directCliMessageId';
+
+describe('buildDirectReplyMessageId', () => {
+  it('produces a direct- prefixed id tagged with the session key', () => {
+    const id = buildDirectReplyMessageId('team-3ond:member:爬虫');
+    expect(id.startsWith('direct-team-3ond:member:爬虫-')).toBe(true);
+  });
+
+  it('never equals a client optimistic user-message id', () => {
+    const userMessageId = 'optimistic-1781365581655-r5h82f';
+    const replyId = buildDirectReplyMessageId('team-3ond:member:爬虫');
+    // Regression guard for the team-3ond "回复的没了" bug, where the member-DM
+    // route reused the user message id as the reply id and the reply vanished.
+    expect(replyId).not.toBe(userMessageId);
+  });
+
+  it('produces distinct ids across calls (no same-ms collision)', () => {
+    const ids = new Set<string>();
+    for (let i = 0; i < 50; i += 1) {
+      ids.add(buildDirectReplyMessageId('team-x:lead'));
+    }
+    expect(ids.size).toBe(50);
+  });
+
+  it('never collides with an arbitrary user message id passed by the client', () => {
+    const arbitraryUserIds = [
+      'optimistic-1-abc',
+      'msg-123',
+      'user-abc-def',
+      '330ce38a-2787-4f37-8882-bfe671d5dd0a',
+    ];
+    for (const userId of arbitraryUserIds) {
+      const replyId = buildDirectReplyMessageId('team:member:x');
+      expect(replyId).not.toBe(userId);
+      expect(replyId.startsWith('direct-')).toBe(true);
+    }
+  });
+});

package/src/main/services/direct-cli/directCliMessageId.ts

@@ -0,0 +1,21 @@
+/**
+ * Message-id generation for direct-CLI agent replies.
+ *
+ * The agent reply persisted on the turn's `result` event MUST carry an id that
+ * differs from the originating user message's id. If the reply reuses the user
+ * message id, two records in the team inbox share one id and the renderer's
+ * id-keyed dedup drops the reply — it "vanishes" from the board even though it
+ * was produced and persisted. (This was the team-3ond "回复的没了" bug: the
+ * member-DM route passed the user message id straight through.)
+ *
+ * The `direct-` prefix guarantees the id can never collide with a client
+ * optimistic id (`optimistic-…`) or a server user-message id; the timestamp +
+ * counter keep rapid/concurrent replies distinct.
+ */
+
+let replyIdCounter = 0;
+
+export function buildDirectReplyMessageId(sessionKey: string): string {
+  replyIdCounter += 1;
+  return `direct-${sessionKey}-${Date.now().toString(36)}-${replyIdCounter.toString(36)}`;
+}

package/src/main/services/direct-cli/index.ts

@@ -0,0 +1,17 @@
+export {
+  buildClaudeStreamArgs,
+  DirectCliSessionManager,
+  formatClaudeStdinUserTurn,
+} from './DirectCliSessionManager';
+export type {
+  ClaudeStreamArgsOptions,
+  DirectCliEnvResolver,
+  DirectCliEvent,
+  DirectCliSendParams,
+  DirectCliSessionManagerOptions,
+  DirectCliSpawnFn,
+  DirectCliSpawnParams,
+} from './DirectCliSessionManager';
+export { DirectCliSessionStore, DEFAULT_DIRECT_CLI_SESSIONS_FILE } from './DirectCliSessionStore';
+export type { DirectCliSessionRepository } from './DirectCliSessionStore';
+export { buildDirectReplyMessageId } from './directCliMessageId';