elanous 0.2.12 → 0.2.14

package/src/seat-dispatch/ceo-commands.ts

@@ -52,7 +52,7 @@ export interface CeoTaskExtra {
   attachments?: Array<{ name: string; path: string }>;
   /** Paths supplied by callers that do not have attachment names. */
   attachmentPaths?: readonly string[];
-  via?: 'telegram' | 'discord' | 'pwa';
+  via?: 'telegram' | 'discord' | 'pwa' | 'tui';
   /** Request ref written into the message body; with `deps.hasMessage` it makes delivery idempotent per request. */
   ref?: string;
 }
@@ -90,7 +90,7 @@ async function postToChannel(seat: string, task: string, deps: CeoCommandDeps, e
   if (!target) return deps.replyTarget ? 'decisions.replyGhPr 형식이 owner/repo#N 이 아님' : 'decisions.replyGhPr 미설정';
   try {
     const attachmentCount = (extra.attachments?.length ?? 0) + (extra.attachmentPaths?.length ?? 0);
-    const code = await deps.runGh(['pr', 'comment', target[2]!, '--repo', target[1]!, '--body-file', '-'], `${ceoTaskLine(seat, task, deps.now?.() ?? new Date())}${attachmentCount ? ` · 첨부 ${attachmentCount}` : ''}${extra.via === 'pwa' ? ' (PWA)' : ''}`);
+    const code = await deps.runGh(['pr', 'comment', target[2]!, '--repo', target[1]!, '--body-file', '-'], `${ceoTaskLine(seat, task, deps.now?.() ?? new Date())}${attachmentCount ? ` · 첨부 ${attachmentCount}` : ''}${extra.via === 'pwa' ? ' (PWA)' : extra.via === 'tui' ? ' (TUI)' : ''}`);
     return code === 0 ? null : `gh 종료 코드 ${code}`;
   } catch (error) {
     return error instanceof Error ? error.message.slice(0, 80) : 'gh 실행 실패';

package/src/seat-dispatch/seat-ask.ts

@@ -1,31 +1,70 @@
-import { randomUUID } from 'node:crypto';
+import { createHash, randomUUID } from 'node:crypto';
+import { join } from 'node:path';
 import { debug } from '../debug/log.js';
 import { openMsgStore, type MsgStore } from '../msg/msg-store.js';
 import { dispatchCeoTask, type CeoCommandDeps } from './ceo-commands.js';
+import type { SeatId } from './seat-questions.js';
 
 export type AskOrigin =
   | { channel: 'telegram'; chatId: number | string; messageId: number; threadId?: number; botId?: string }
   | { channel: 'discord'; channelId: string; messageId: string; threadId?: string }
-  | { channel: 'pwa'; clientId: string };
+  | { channel: 'pwa'; clientId: string }
+  | { channel: 'tui'; clientId: string };
 
-export const DEFAULT_ASK_TIMEOUT_MS = 30 * 60 * 1000;
-export const parseSeatAsk = (text: string): string | null => /^\s*CTO\s*에게\s*물어봐\s*[:：]\s*(\S[\s\S]*)$/i.exec(text)?.[1]?.trim() ?? null;
+export const DEFAULT_ASK_TIMEOUT_MS = 2 * 60 * 60 * 1000;
+export const parseSeatAsk = (text: string): string | null => /^\s*CTO\s*에게\s*물어봐(?:\s*[:：]\s*|\s+)(\S[\s\S]*)$/i.exec(text)?.[1]?.trim() ?? null;
 
-interface AskRow { id: string; seat: string; origin: string; deadline: number; timeout_minutes: number }
+interface AskRow { id: string; seat: string; origin: string; deadline: number; timeout_minutes: number; answer: string | null; answered_at: number | null }
 
 function createTable(store: MsgStore): void {
   store.db.exec(`CREATE TABLE IF NOT EXISTS seat_asks (
     id TEXT PRIMARY KEY, seat TEXT NOT NULL, origin TEXT NOT NULL,
-    deadline INTEGER NOT NULL, timeout_minutes INTEGER NOT NULL DEFAULT 30, status TEXT NOT NULL DEFAULT 'pending'
+    deadline INTEGER NOT NULL, timeout_minutes INTEGER NOT NULL DEFAULT 120, status TEXT NOT NULL DEFAULT 'pending',
+    answer TEXT, answered_at INTEGER
   ); CREATE TABLE IF NOT EXISTS seat_ask_outbox (
     id TEXT PRIMARY KEY, origin TEXT NOT NULL, text TEXT NOT NULL, status TEXT NOT NULL DEFAULT 'pending',
     claim_until INTEGER NOT NULL DEFAULT 0, claim_token TEXT
   )`);
+  const askColumns = store.db.query('PRAGMA table_info(seat_asks)').all() as Array<{ name: string }>;
+  if (!askColumns.some(({ name }) => name === 'answer')) store.db.exec('ALTER TABLE seat_asks ADD COLUMN answer TEXT');
+  if (!askColumns.some(({ name }) => name === 'answered_at')) store.db.exec('ALTER TABLE seat_asks ADD COLUMN answered_at INTEGER');
   const columns = store.db.query('PRAGMA table_info(seat_ask_outbox)').all() as Array<{ name: string }>;
   if (!columns.some(({ name }) => name === 'claim_until')) store.db.exec('ALTER TABLE seat_ask_outbox ADD COLUMN claim_until INTEGER NOT NULL DEFAULT 0');
   if (!columns.some(({ name }) => name === 'claim_token')) store.db.exec('ALTER TABLE seat_ask_outbox ADD COLUMN claim_token TEXT');
 }
 
+export interface SeatAskShadow {
+  from: SeatId;
+  to: SeatId;
+  itemId: string;
+  version: string;
+  question: string;
+}
+
+/** Keep an internal seat-to-seat question in the existing ask ledger, without dispatching or queuing an outbox message. */
+export function recordSeatAskShadow(root: string, ask: SeatAskShadow, now: number): boolean {
+  if (ask.from === ask.to || !ask.itemId || !ask.question.trim() || !Number.isFinite(now)) throw new Error('invalid shadow seat ask');
+  const id = `seat-loop:${createHash('sha256').update(JSON.stringify([ask.from, ask.to, ask.version, ask.itemId])).digest('hex')}`;
+  const store = openMsgStore(join(root, 'msg', 'messages.db'));
+  try {
+    createTable(store);
+    const origin = JSON.stringify({ channel: 'seat-loop', from: ask.from, itemId: ask.itemId, version: ask.version, question: ask.question.trim() });
+    return store.db.query("INSERT OR IGNORE INTO seat_asks (id, seat, origin, deadline, timeout_minutes, status) VALUES (?, ?, ?, ?, ?, 'shadow')")
+      .run(id, ask.to, origin, now + DEFAULT_ASK_TIMEOUT_MS, Math.ceil(DEFAULT_ASK_TIMEOUT_MS / 60000)).changes === 1;
+  } finally { store.close(); }
+}
+
+/** A TUI restart must keep the same return address as its prior questions. The instance's
+ * message database owns this identity, so test and production instances cannot share it. */
+export function getTuiSeatAskClientId(open: () => MsgStore = openMsgStore): string {
+  const store = open();
+  try {
+    store.db.exec('CREATE TABLE IF NOT EXISTS seat_ask_clients (channel TEXT PRIMARY KEY, client_id TEXT NOT NULL)');
+    store.db.query('INSERT OR IGNORE INTO seat_ask_clients (channel, client_id) VALUES (?, ?)').run('tui', randomUUID());
+    return (store.db.query('SELECT client_id FROM seat_ask_clients WHERE channel = ?').get('tui') as { client_id: string }).client_id;
+  } finally { store.close(); }
+}
+
 export interface SeatAskDeps {
   open?: () => MsgStore;
   now?: () => number;
@@ -52,7 +91,7 @@ export async function askSeat(text: string, origin: AskOrigin, command: CeoComma
       .run(id, 'TC', JSON.stringify(origin), (deps.now ?? Date.now)() + timeout, minutes, 'pending');
   } finally { store.close(); }
   try {
-    const result = await (deps.dispatch ?? dispatchCeoTask)('TC', `질문: ${body}\n답장 요청: ${id}\n회신: elanous msg post --from TC --to CEO --kind seat-ask-reply --body '${id}: <답>'`, command,
+    const result = await (deps.dispatch ?? dispatchCeoTask)('TC', `질문: ${body}\n답장 요청: ${id}\n회신: elanous seat answer ${id} "<답>"`, command,
       { via: origin.channel, ref: `ask:${id}` });
     debug.log('seat.ask', 'sent', { seat: 'TC', id, via: origin.channel, channel: result.channel });
     return `CTO에게 물었습니다. 답을 기다립니다 (최대 ${minutes}분). 요청: ${id}${result.channel === 'failed' ? ` · 조율 채널 전송 실패: ${result.channelError}` : ''}`;
@@ -64,22 +103,40 @@ export async function askSeat(text: string, origin: AskOrigin, command: CeoComma
   }
 }
 
-/** Read the seat mailbox without advancing its cursor (other CEO messages remain untouched). */
+/** Record a seat reply in its original request row; delivery stays with the originating surface's worker. */
+export function answerSeatAsk(id: string, text: string, deps: Pick<SeatAskDeps, 'open' | 'now'> = {}): void {
+  const answer = text.trim();
+  if (!answer) throw new Error('seat answer must not be empty');
+  const store = (deps.open ?? openMsgStore)();
+  try {
+    createTable(store);
+    const now = (deps.now ?? Date.now)();
+    const updated = store.db.query(`UPDATE seat_asks SET answer = ?, answered_at = ?
+      WHERE id = ? AND seat = 'TC' AND status = 'pending' AND answer IS NULL AND deadline > ?`)
+      .run(answer, now, id, now);
+    if (updated.changes !== 1) throw new Error(`seat ask not pending or deadline passed: ${id}`);
+    debug.log('seat.ask', 'reply-recorded', { seat: 'TC', id });
+  } finally { store.close(); }
+}
+
+/** Deliver recorded seat answers or expiration notices via the original surface. */
 export async function deliverSeatAnswers(deps: SeatAskDeps): Promise<void> {
   const store = (deps.open ?? openMsgStore)();
   try {
     createTable(store);
-    const pending = store.db.query("SELECT id, seat, origin, deadline, timeout_minutes FROM seat_asks WHERE status = 'pending'").all() as AskRow[];
+    const pending = store.db.query("SELECT id, seat, origin, deadline, timeout_minutes, answer, answered_at FROM seat_asks WHERE status = 'pending'").all() as AskRow[];
     const decide = store.db.transaction((id: string, now: number): 'answered' | 'expired' | null => {
-      const ask = store.db.query("SELECT id, seat, origin, deadline, timeout_minutes FROM seat_asks WHERE id = ? AND status = 'pending'").get(id) as AskRow | null;
+      const ask = store.db.query("SELECT id, seat, origin, deadline, timeout_minutes, answer, answered_at FROM seat_asks WHERE id = ? AND status = 'pending'").get(id) as AskRow | null;
       if (!ask) return null;
-      const reply = store.db.query("SELECT id, body, created_at FROM msg_messages WHERE recipient = 'CEO' AND kind = 'seat-ask-reply' AND substr(body, 1, ?) = ? AND sender = ? ORDER BY id LIMIT 1")
-        .get(id.length + 2, `${id}: `, ask.seat) as { id: number; body: string; created_at: string } | null;
-      const answer = reply && Date.parse(reply.created_at) < ask.deadline ? reply.body.slice(id.length + 2).trim() : '';
+      // Retain compatibility with replies already posted to the existing seat mailbox.
+      const reply = ask.answer === null ? store.db.query("SELECT id, body, created_at FROM msg_messages WHERE recipient = 'CEO' AND kind = 'seat-ask-reply' AND substr(body, 1, ?) = ? AND sender = ? ORDER BY id LIMIT 1")
+        .get(id.length + 2, `${id}: `, ask.seat) as { id: number; body: string; created_at: string } | null : null;
+      const answer = ask.answer !== null && ask.answered_at !== null && ask.answered_at < ask.deadline ? ask.answer
+        : reply && Date.parse(reply.created_at) < ask.deadline ? reply.body.slice(id.length + 2).trim() : '';
       const status = answer ? 'answered' : now >= ask.deadline ? 'expired' : null;
       if (!status) return null;
       const text = status === 'answered' ? `CTO 답변 (${id}): ${answer}`
-        : `CTO 미답 (${id}): ${ask.timeout_minutes}분 안에 답이 오지 않았습니다.`;
+        : `CTO 미답 (${id}): 아직 답 없음 (${ask.timeout_minutes}분 경과).`;
       const updated = store.db.query("UPDATE seat_asks SET status = ? WHERE id = ? AND status = 'pending'").run(status, id);
       if (updated.changes !== 1) return null;
       store.db.query('INSERT INTO seat_ask_outbox (id, origin, text) VALUES (?, ?, ?)').run(id, ask.origin, text);
@@ -88,7 +145,7 @@ export async function deliverSeatAnswers(deps: SeatAskDeps): Promise<void> {
     for (const ask of pending) {
       const origin = JSON.parse(ask.origin) as AskOrigin;
       if (deps.channel && origin.channel !== deps.channel) continue;
-      if (origin.channel === 'pwa' && deps.clientId !== origin.clientId) continue;
+      if ((origin.channel === 'pwa' || origin.channel === 'tui') && deps.clientId !== origin.clientId) continue;
       if (origin.channel === 'telegram' && origin.botId && origin.botId !== deps.botId) continue;
       const status = decide(ask.id, (deps.now ?? Date.now)());
       if (status) debug.log('seat.ask', status, { seat: ask.seat, id: ask.id, via: origin.channel });
@@ -102,6 +159,7 @@ export async function deliverSeatAnswers(deps: SeatAskDeps): Promise<void> {
         if (deps.clientId === origin.clientId) await deps.send(origin, item.text);
         continue; // A browser poll is not a receipt; only its explicit acknowledgement consumes the answer.
       }
+      if (origin.channel === 'tui' && deps.clientId !== origin.clientId) continue;
       const token = randomUUID();
       const now = Date.now();
       // SQLite's conditional write is the claim across concurrent bot loops and processes.

package/src/seat-dispatch/seat-questions.ts

@@ -73,6 +73,64 @@ export function seatQuestions(root: string, seat: SeatId): Message[] {
   } finally { store.close(); }
 }
 
+export type CrossCheckJudgment = { agree: boolean; note: string; resolves: boolean };
+
+export function askCrossCheck(root: string, from: SeatId, to: SeatId, draft: string, key: string): Message {
+  if (from === to || !draft.trim() || !key.trim()) throw new Error('cross-check requires another seat, a draft and a key');
+  return deliverOnce(root, key, { from, to, body: draft.trim(), kind: 'seat-xcheck' });
+}
+
+export function seatCrossChecks(root: string, seat: SeatId): Message[] {
+  const store = storeAt(root);
+  try {
+    const found: Message[] = [];
+    let cursor = 0;
+    while (true) {
+      const batch = store.listByRecipient(seat, cursor, 1000);
+      found.push(...batch.filter((message) => message.kind === 'seat-xcheck' && isSeatId(message.from) && message.from !== seat));
+      if (batch.length < 1000) return found;
+      cursor = batch[batch.length - 1]!.id;
+    }
+  } finally { store.close(); }
+}
+
+export function answerCrossCheck(root: string, question: Message, judgment: CrossCheckJudgment): Message {
+  if (question.kind !== 'seat-xcheck' || !isSeatId(question.to) || !isSeatId(question.from)
+    || typeof judgment.agree !== 'boolean' || typeof judgment.resolves !== 'boolean'
+    || typeof judgment.note !== 'string' || !judgment.note.trim()) throw new Error('invalid cross-check answer');
+  return deliverOnce(root, `xcheck-answer:${question.id}`, {
+    from: question.to, to: question.from,
+    body: JSON.stringify({ questionId: question.id, agree: judgment.agree, note: judgment.note.trim(), resolves: judgment.resolves }),
+    kind: 'seat-xcheck-answer',
+  });
+}
+
+export function crossCheckAnswer(root: string, question: Message): CrossCheckJudgment | null {
+  if (question.kind !== 'seat-xcheck' || !isSeatId(question.to) || !isSeatId(question.from)) return null;
+  const store = storeAt(root);
+  try {
+    let cursor = 0;
+    while (true) {
+      const batch = store.listByRecipient(question.from, cursor, 1000);
+      for (const message of batch) {
+        if (message.kind !== 'seat-xcheck-answer' || message.from !== question.to) continue;
+        try {
+          const value: unknown = JSON.parse(message.body);
+          if (value && typeof value === 'object' && !Array.isArray(value)) {
+            const answer = value as Record<string, unknown>;
+            if (answer.questionId === question.id && typeof answer.agree === 'boolean'
+              && typeof answer.resolves === 'boolean' && typeof answer.note === 'string' && answer.note.trim()) {
+              return { agree: answer.agree, note: answer.note, resolves: answer.resolves };
+            }
+          }
+        } catch { /* Ignore unrelated malformed messages. */ }
+      }
+      if (batch.length < 1000) return null;
+      cursor = batch[batch.length - 1]!.id;
+    }
+  } finally { store.close(); }
+}
+
 export function answerSeat(root: string, question: Message, answer: string): Message {
   if (question.kind !== 'seat-question' || !isSeatId(question.to) || !isSeatId(question.from) || !answer.trim()) {
     throw new Error('invalid seat answer');