@myclaw163/clawclaw-cli 0.6.61 → 0.6.63

package/src/commands/watch.ts

@@ -4,7 +4,9 @@ import { join } from 'path';
 import { AuthStore } from '../lib/auth.js';
 import { getProfileStateDir } from '../lib/init-command.js';
 import { setMeta } from '../lib/command-meta.js';
-import { EventStore, extractNewEvents } from '../pipeline/event-store.js';
+import { EventStore, extractNewEvents, isLocalControlEvent } from '../pipeline/event-store.js';
+import { compactEventForEvents, formatEventMessage, shortStateText } from '../pipeline/event-format.js';
+import { PlayerHistoryStore } from '../perception/player-history-store.js';
 import { DEFAULT_MATCH_TIMEOUT_MS } from '../lib/match-state.js';
 import { hubReminder, readCachedGamesPlayed } from '../lib/hub-reminder.js';
 import { sendOwnerControlRequest } from '../runtime/owner-control.js';
@@ -44,7 +46,7 @@ export interface MonitorEventConfig {
 
 export const MONITOR_EVENT_CONFIG: Record<string, MonitorEventConfig> = {
   kill: { priority: 50 },
-  killed: { priority: 50 },
+  killed: { priority: 99 },
   murder_witnessed: { priority: 50 },
   warrior_shrimp_self_destruct: { priority: 50 },
 
@@ -169,6 +171,10 @@ export function nextStepFor(reason: string): string {
   return routeTriggers([reason]).nextStep;
 }
 
+export function nextStepForTriggers(triggers: string[]): string {
+  return routeTriggers(triggers).nextStep;
+}
+
 export function sortEventsForMonitor(events: GameEvent[]): GameEvent[] {
   return events
     .map((event, index) => ({
@@ -180,6 +186,15 @@ export function sortEventsForMonitor(events: GameEvent[]): GameEvent[] {
     .map(({ event }) => event);
 }
 
+function readSeatMapForMonitor(sessionPath: string | null): Record<string, number> {
+  if (!sessionPath) return {};
+  try {
+    return PlayerHistoryStore.forSession(sessionPath).read()?.seats ?? {};
+  } catch {
+    return {};
+  }
+}
+
 function cleanObject<T extends Record<string, any>>(obj: T): T {
   for (const key of Object.keys(obj)) {
     if (obj[key] === undefined) delete obj[key];
@@ -187,77 +202,8 @@ function cleanObject<T extends Record<string, any>>(obj: T): T {
   return obj;
 }
 
-function taskKindForMonitor(task: any, event: GameEvent): string | undefined {
-  if (typeof task?.kind === 'string' && task.kind.length > 0) return task.kind;
-  if (typeof task?.task_kind === 'string' && task.task_kind.length > 0) return task.task_kind;
-  if (task?.is_fake_shrimp === true) return 'fake_shrimp';
-  if (event.faction === 'crab' && task?.is_fake_shrimp === false) return 'crab_sabotage';
-  return undefined;
-}
-
-function compactRoleAssignedForMonitor(event: GameEvent): GameEvent {
-  const tasks = Array.isArray(event.assigned_tasks)
-    ? event.assigned_tasks.map((task: any) => cleanObject({
-      name: task?.name,
-      room: task?.room,
-      kind: taskKindForMonitor(task, event),
-    }))
-    : undefined;
-  const taskKinds = Array.isArray(tasks)
-    ? Array.from(new Set(tasks.map((task: any) => task.kind).filter((kind: any) => typeof kind === 'string')))
-    : [];
-  const useTopLevelTaskKind = taskKinds.length === 1;
-  const compactTasks = Array.isArray(tasks)
-    ? tasks.map((task: any) => {
-      if (!useTopLevelTaskKind) return task;
-      const { kind: _kind, ...rest } = task;
-      return rest;
-    })
-    : undefined;
-  const hasFakeTask = taskKinds.includes('fake_shrimp') || event.fake_task_briefing;
-  return cleanObject({
-    type: event.type,
-    tick: event.tick,
-    room: event.room,
-    role: event.role,
-    role_display: event.role_display_name ?? event.role_display,
-    faction: event.faction,
-    win_condition: event.role_description,
-    task_kind: useTopLevelTaskKind ? taskKinds[0] : undefined,
-    task_note: hasFakeTask ? 'Fake shrimp tasks: disguise only; no lobster progress.' : undefined,
-    tasks: compactTasks,
-  });
-}
-
-export function compactEventForMonitor(event: GameEvent): GameEvent {
-  if (event.type === 'role_assigned') return compactRoleAssignedForMonitor(event);
-  if (event.type === 'corpse_spotted') {
-    const corpseName = event.corpse_name || 'someone';
-    const room = event.corpse_room || event.room;
-    const hint = room
-      ? `You found ${corpseName}'s body in ${room}.`
-      : `You found ${corpseName}'s body.`;
-    return { ...event, hint };
-  }
-  if (event.type === 'meeting_briefing') {
-    const { room: _room, ...rest } = event;
-    if (!event.meeting_caller_name && !Array.isArray(event.reported_corpses)) return rest;
-    const callerName = event.meeting_caller_name || event.caller || 'Someone';
-    const callerIsYou = event.meeting_caller_seat !== undefined
-      && event.your_seat !== undefined
-      && String(event.meeting_caller_seat) === String(event.your_seat);
-    const caller = callerIsYou ? 'You' : callerName;
-    const corpses = Array.isArray(event.reported_corpses)
-      ? event.reported_corpses.map((corpse: any) => corpse?.name).filter(Boolean)
-      : [];
-    const reported = corpses.length === 1
-      ? ` and reported ${corpses[0]}'s body`
-      : corpses.length > 1
-        ? ` and reported bodies: ${corpses.join(', ')}`
-      : '';
-    return { ...rest, hint: `${caller} started a meeting${reported}.` };
-  }
-  return event;
+export function compactEventForMonitor(event: GameEvent): Record<string, any> {
+  return compactEventForEvents(event);
 }
 
 export function summarizeFeed(feed: any): any | null {
@@ -455,7 +401,10 @@ export async function runStreaming(opts: RunStreamingOptions): Promise<void> {
       if (!line) continue;
       try {
         const evt = JSON.parse(line);
-        events.push(evt, ...(extractNewEvents(evt) as GameEvent[]));
+        if (!isLocalControlEvent(evt)) events.push(evt);
+        for (const nested of extractNewEvents(evt) as GameEvent[]) {
+          if (!isLocalControlEvent(nested)) events.push(nested);
+        }
       } catch {}
     }
     return events;
@@ -468,18 +417,12 @@ export async function runStreaming(opts: RunStreamingOptions): Promise<void> {
     if (e.type && skipSet.has(e.type as string)) return false;
     return classifyEvent(e, youName).notable;
   });
-  let caughtUpPayload: any = backlogNotable.length === 0
-    ? null
-    : {
-      count: backlogNotable.length,
-      notable_events: backlogNotable.slice(-20).map(compactEventForMonitor),
-      note: 'Events that occurred between game allocation and stream attach. Informational only — did NOT fire triggers.',
-    };
+  let caughtUpEvents: GameEvent[] = backlogNotable.slice(-20);
   for (const e of backlogEvents) seenKeys.add(eventKey(e));
 
   const buildOut = (
     triggers: string[],
-    nextStep: string,
+    _nextStep: string,
     events: GameEvent[] = [],
   ): any => {
     const rawSummary = opts.readSummary?.() ?? readFeedSummary(opts.feedPath);
@@ -498,13 +441,19 @@ export async function runStreaming(opts: RunStreamingOptions): Promise<void> {
       if (sumCaller && e.caller && sumCaller !== e.caller) return e;
       return { ...e, speech_order: so };
     };
-    const out: any = {
-      exit_reason: triggers,
-      next_step: nextStep,
-      events: sortEventsForMonitor(events).map(enrichMeetingBriefing).map(compactEventForMonitor),
+    const sourceEvents = events.length > 0
+      ? sortEventsForMonitor(events).map(enrichMeetingBriefing)
+      : triggers.map((type) => ({ type }));
+    const context = {
       summary,
+      seats: readSeatMapForMonitor(currentSessionPath),
+      maxTextLength: 90,
+    };
+    return {
+      events: sourceEvents.map((event) => event.type),
+      messages: sourceEvents.map((event) => formatEventMessage(event, context)),
+      state: shortStateText(summary),
     };
-    return out;
   };
 
   const fireTrigger = (
@@ -514,31 +463,24 @@ export async function runStreaming(opts: RunStreamingOptions): Promise<void> {
     if (triggers.length === 0) return;
     const { nextStep } = routeTriggers(triggers);
     const out = buildOut(triggers, nextStep, triggeredEvents.slice(-10));
-    if (caughtUpPayload) {
-      out.caught_up = caughtUpPayload;
-      caughtUpPayload = null;
-    }
     if (opts.hubReminder && triggers.includes('game_over')) {
       out.hub_reminder = opts.hubReminder;
-      out.next_step = `${out.next_step} ${opts.hubReminder}`;
     }
     emit(out);
   };
 
   // Always emit an attached first beat when there is a pre-attach backlog OR
   // the caller explicitly requests one.
-  if (caughtUpPayload || opts.emitGameStart) {
-    const hasBacklog = !!caughtUpPayload;
+  if (caughtUpEvents.length > 0 || opts.emitGameStart) {
+    const hasBacklog = caughtUpEvents.length > 0;
     const nextStep = opts.emitGameStart
       ? hasBacklog
         ? 'Game stream attached. Read summary and caught_up.notable_events for opening events; current strategy appears in summary.automation.strategy.'
         : 'Game stream attached. Read summary and wait for role_assigned; current strategy appears in summary.automation.strategy.'
       : 'Catch-up complete. Read summary, then continue play.';
-    const attachedOut = buildOut(['game_start'], nextStep);
-    if (caughtUpPayload) {
-      attachedOut.caught_up = caughtUpPayload;
-      caughtUpPayload = null;
-    }
+    const attachedEvents = hasBacklog ? caughtUpEvents : [{ type: 'game_start' }];
+    const attachedOut = buildOut(attachedEvents.map((event) => event.type), nextStep, attachedEvents);
+    caughtUpEvents = [];
     emit(attachedOut);
   }
 
@@ -634,15 +576,10 @@ export function snapshotOnce(opts: SnapshotOnceOptions): void {
     throw new Error('ccl game runtime is not running. Start it first with `ccl game start`.');
   }
   const summary = readFeedSummary(opts.feedPath);
-  const warning = summary?.phase === 'meeting'
-    ? 'WARNING: You are in a meeting. Do NOT poll with peek/sleep — Monitor delivers speech_your_turn automatically. Just wait for the next notification.'
-    : undefined;
   opts.stdout(JSON.stringify({
-    exit_reason: ['snapshot'],
-    next_step: warning ?? 'One-shot snapshot. No further events will follow from this invocation.',
-    events: [],
-    summary,
-    ...(warning ? { warning } : {}),
+    events: ['snapshot'],
+    messages: [formatEventMessage({ type: 'snapshot' })],
+    state: shortStateText(summary),
   }) + '\n');
 }
 
@@ -650,15 +587,17 @@ export function buildErrorLine(err: any, opts?: { notReadyNextStep?: string }):
   const msg = err?.message ?? String(err);
   const notReady = err?.name === 'WatchNotReadyError' || /not ready|feed\.json/i.test(msg);
   const reason = notReady ? 'not_ready' : 'error';
-  const nextStep = notReady
-    ? (opts?.notReadyNextStep ?? 'Game runtime not running. Run `ccl game start` to begin a new session.')
-    : msg;
+  const event = {
+    type: reason,
+    message: notReady
+      ? (opts?.notReadyNextStep ?? 'Game runtime not running. Run `ccl game start` to begin a new session.')
+      : msg,
+  };
   return JSON.stringify({
-    exit_reason: [reason],
-    next_step: nextStep,
+    events: [reason],
+    messages: [formatEventMessage(event)],
+    state: 'state unavailable',
     error: msg,
-    events: [],
-    summary: null,
   }) + '\n';
 }
 

package/src/pipeline/event-format.test.ts

@@ -0,0 +1,135 @@
+import { describe, expect, it } from 'vitest';
+import { compactEventFields, formatEventMessage } from './event-format.js';
+import { EVENT_HINT_FORMATTERS } from './event-hints.js';
+
+describe('event-format', () => {
+  it('formats killed as a short notice with seat and removes the long backend hint tail', () => {
+    const event = {
+      type: 'killed',
+      tick: 5330,
+      room: '情报室',
+      killer_name: '哈基米南北绿豆',
+      killer_seat: 8,
+      hint: 'YOU ARE DEAD: 哈基米南北绿豆 removed you from play. Your hands are off the board now — alert your user, then spectate or leave while your teammates weaponize what you learned.',
+    };
+
+    const notice = formatEventMessage(event);
+    const formatted = compactEventFields(event, {}, 1158);
+
+    expect(notice).toContain('t5330 killed');
+    expect(notice).toContain('8号哈基米南北绿豆');
+    expect(formatted).not.toHaveProperty('notice');
+    expect(formatted.hint).toBe('YOU ARE DEAD: 8号哈基米南北绿豆 removed you from play.');
+    expect(JSON.stringify(formatted)).not.toContain('Your hands are off the board');
+  });
+
+  it('keeps meeting_briefing details aligned with the compact monitor payload', () => {
+    const formatted = compactEventFields({
+      type: 'meeting_briefing',
+      tick: 979,
+      room: '会议室',
+      meeting_caller_name: '单钳渔夫',
+      meeting_caller_seat: 1,
+      reported_corpses: [{ name: '丹霞兄', seat: 3 }],
+      your_seat: 6,
+      all_seats: [{ name: '单钳渔夫', seat: 1 }],
+      speech_order: ['单钳渔夫', '洋流王子'],
+      crab_teammates: [{ name: '暗礁壳壳', seat: 5 }],
+      hint: 'backend hint should not leak',
+    }, {}, 941);
+
+    expect(formatted).toMatchObject({
+      line: 941,
+      type: 'meeting_briefing',
+      tick: 979,
+      meeting_caller_name: '单钳渔夫',
+      meeting_caller_seat: 1,
+      reported_corpses: [{ name: '丹霞兄', seat: 3 }],
+      your_seat: 6,
+      all_seats: [{ name: '单钳渔夫', seat: 1 }],
+      speech_order: ['单钳渔夫', '洋流王子'],
+      crab_teammates: [{ name: '暗礁壳壳', seat: 5 }],
+      hint: 'Meeting started — seat 1 单钳渔夫 called this meeting after reporting the body of seat 3 丹霞兄. Your Crab teammate(s): seat 5 暗礁壳壳. Shield them, redirect heat, split suspicion, and control the vote. Prepare fast — every sentence is accusation, defense, or misdirection under a timer.',
+    });
+    expect(formatted).not.toHaveProperty('room');
+    expect(JSON.stringify(formatted)).not.toContain('backend hint');
+  });
+
+  it('hides vote targets in event details', () => {
+    const formatted = compactEventFields({
+      type: 'vote_cast',
+      tick: 3409,
+      actor_name: '菜逼油条',
+      actor_seat: 8,
+      target: '单钳渔夫',
+      target_name: '单钳渔夫',
+      target_seat: 1,
+      hint: 'backend target leak',
+    });
+
+    expect(formatted).toMatchObject({
+      type: 'vote_cast',
+      tick: 3409,
+      actor_name: '菜逼油条',
+      actor_seat: 8,
+      hint: '8号菜逼油条 voted.',
+    });
+    expect(formatted).not.toHaveProperty('target');
+    expect(formatted).not.toHaveProperty('target_name');
+    expect(formatted).not.toHaveProperty('target_seat');
+    expect(JSON.stringify(formatted)).not.toContain('单钳渔夫');
+  });
+
+  it('keeps monitor message formatting separate from event detail fields', () => {
+    const notice = formatEventMessage({
+      type: 'vote_phase_start',
+      tick: 3408,
+      message: 'Speech phase ended. All alive players, please cast your vote',
+    });
+
+    expect(notice).toContain('t3408 vote_phase_start');
+    expect(notice).toContain('ccl do -v');
+  });
+
+  it('formats corpse_spotted monitor notices as my discovery with body owner', () => {
+    const notice = formatEventMessage({
+      type: 'corpse_spotted',
+      tick: 3410,
+      corpse_name: '丹霞兄',
+      corpse_seat: 3,
+      corpse_room: '情报室',
+    });
+
+    expect(notice).toBe('t3410 corpse_spotted 我发现了3号丹霞兄的尸体，在情报室。');
+  });
+
+  it('keeps local hint formatters for backend-hinted monitor events', () => {
+    const backendHintedMonitorEvents = [
+      'corpse_spotted',
+      'death_speech',
+      'emergency_resolved',
+      'emergency_started',
+      'exile',
+      'game_over',
+      'kill',
+      'killed',
+      'meeting_briefing',
+      'meeting_ended',
+      'murder_witnessed',
+      'no_exile',
+      'octopus_time_start',
+      'role_assigned',
+      'speech_skipped',
+      'task_completed',
+      'task_sabotaged',
+      'vote_cast',
+      'vote_phase_start',
+      'vote_speech_phase_ended',
+      'wandering_speech',
+    ];
+
+    for (const type of backendHintedMonitorEvents) {
+      expect(EVENT_HINT_FORMATTERS[type], type).toBeTypeOf('function');
+    }
+  });
+});