tycono 0.1.74-beta.4 → 0.1.75-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tycono",
-  "version": "0.1.74-beta.4",
+  "version": "0.1.75-beta.0",
   "description": "Build an AI company. Watch them work.",
   "type": "module",
   "bin": {

package/src/api/src/routes/execute.ts

@@ -17,6 +17,12 @@ import { jobManager, type Job } from '../services/job-manager.js';
 import { ActivityStream, type ActivityEvent, type ActivitySubscriber } from '../services/activity-stream.js';
 import { earnCoinsInternal } from './coins.js';
 import { appendFollowUpToWave } from '../services/wave-tracker.js';
+import { waveMultiplexer } from '../services/wave-multiplexer.js';
+
+/* ─── SSE-003: Auto-attach child dispatch jobs to wave multiplexer ── */
+jobManager.onJobCreated((job) => {
+  waveMultiplexer.onJobCreated(job);
+});
 
 /* ─── Runner — lazy, re-created when engine changes ── */
 
@@ -34,6 +40,13 @@ export function handleExecRequest(req: IncomingMessage, res: ServerResponse): vo
   const url = req.url ?? '';
   const method = req.method ?? '';
 
+  // ── /api/waves/:waveId/stream — SSE multiplexed wave stream ──
+  const waveStreamMatch = url.match(/^\/api\/waves\/([^/]+)\/stream/);
+  if (method === 'GET' && waveStreamMatch) {
+    handleWaveStream(waveStreamMatch[1], url, res, req);
+    return;
+  }
+
   // ── /api/waves/save ──
   if (method === 'POST' && url === '/api/waves/save') {
     readBody(req).then((body) => handleSaveWave(body, res));
@@ -186,6 +199,9 @@ function handleStartJob(body: Record<string, unknown>, res: ServerResponse): voi
       });
       jobIds.push(job.id);
 
+      // SSE-001: Register wave job with multiplexer
+      waveMultiplexer.registerJob(waveId, job);
+
       // Add a role message (will be updated as execution progresses)
       const roleMsg: Message = {
         id: `msg-${Date.now() + 1}-role-${cRole}`,
@@ -377,6 +393,28 @@ function handleSaveWave(body: Record<string, unknown>, res: ServerResponse): voi
   jsonResponse(res, 200, { ok: true, path: `operations/waves/${baseName}.json` });
 }
 
+/* ─── GET /api/waves/:waveId/stream — SSE multiplexed wave stream (SSE-002) ── */
+
+function handleWaveStream(waveId: string, url: string, res: ServerResponse, req: IncomingMessage): void {
+  const fromMatch = url.match(/[?&]from=(\d+)/);
+  const fromWaveSeq = fromMatch ? parseInt(fromMatch[1], 10) : 0;
+
+  // Check if wave has any registered jobs
+  const jobIds = waveMultiplexer.getWaveJobIds(waveId);
+  if (jobIds.length === 0) {
+    res.writeHead(404, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ error: `No jobs found for wave: ${waveId}` }));
+    return;
+  }
+
+  // attach() handles everything: replay history + subscribe to live events
+  const client = waveMultiplexer.attach(waveId, res as any, fromWaveSeq);
+
+  req.on('close', () => {
+    waveMultiplexer.detach(waveId, client);
+  });
+}
+
 /* ═══════════════════════════════════════════════
    Legacy /api/exec/* — kept for backward compat
    Now internally delegates to JobManager where possible

package/src/api/src/services/wave-multiplexer.ts

@@ -0,0 +1,268 @@
+import { ActivityStream, type ActivityEvent, type ActivitySubscriber } from './activity-stream.js';
+import type { Job } from './job-manager.js';
+import type { Response } from 'express';
+
+/* ─── Types ──────────────────────────────── */
+
+export interface WaveStreamEnvelope {
+  /** Wave-level sequence (across all roles) */
+  waveSeq: number;
+  /** Session this event belongs to */
+  sessionId: string;
+  /** Original ActivityEvent (unchanged) */
+  event: ActivityEvent;
+}
+
+interface AttachedJob {
+  jobId: string;
+  sessionId: string;
+  roleId: string;
+  unsubscribe: () => void;
+}
+
+interface WaveStreamClient {
+  res: Response;
+  waveSeq: number;
+  attachedJobs: Map<string, AttachedJob>; // jobId → attachment
+  /** Set of event keys already sent (to avoid duplicates) */
+  sentEvents: Set<string>;
+  heartbeat: ReturnType<typeof setInterval>;
+  closed: boolean;
+}
+
+/* ─── WaveMultiplexer ────────────────────── */
+
+class WaveMultiplexer {
+  /** waveId → set of connected SSE clients */
+  private clients = new Map<string, Set<WaveStreamClient>>();
+  /** waveId → Map<jobId, Job> for live jobs */
+  private waveJobs = new Map<string, Map<string, Job>>();
+
+  /**
+   * Register a job as belonging to a wave + auto-attach to existing clients.
+   */
+  registerJob(waveId: string, job: Job): void {
+    if (!this.waveJobs.has(waveId)) {
+      this.waveJobs.set(waveId, new Map());
+    }
+    this.waveJobs.get(waveId)!.set(job.id, job);
+
+    console.log(`[WaveMux] registerJob wave=${waveId} job=${job.id} role=${job.roleId}`);
+
+    // Auto-attach to all existing clients for this wave
+    const clients = this.clients.get(waveId);
+    if (clients) {
+      for (const client of clients) {
+        if (!client.closed) {
+          this.subscribeJobToClient(client, job, true);
+        }
+      }
+    }
+  }
+
+  /**
+   * Connect a new SSE client to a wave stream.
+   * Replays all historical events + subscribes to live events.
+   */
+  attach(waveId: string, res: Response, fromWaveSeq: number): WaveStreamClient {
+    // SSE headers
+    res.writeHead(200, {
+      'Content-Type': 'text/event-stream',
+      'Cache-Control': 'no-cache',
+      'Connection': 'keep-alive',
+      'X-Accel-Buffering': 'no',
+    });
+    res.flushHeaders();
+
+    const client: WaveStreamClient = {
+      res,
+      waveSeq: 0,
+      attachedJobs: new Map(),
+      sentEvents: new Set(),
+      heartbeat: setInterval(() => {
+        if (client.closed || res.destroyed || res.writableEnded) {
+          clearInterval(client.heartbeat);
+          return;
+        }
+        try { res.write(': heartbeat\n\n'); } catch { /* ignore */ }
+      }, 15_000),
+      closed: false,
+    };
+
+    if (!this.clients.has(waveId)) {
+      this.clients.set(waveId, new Set());
+    }
+    this.clients.get(waveId)!.add(client);
+
+    // Replay + subscribe for all known jobs
+    const jobs = this.waveJobs.get(waveId);
+    if (jobs) {
+      // Phase 1: Replay all historical events sorted by timestamp
+      const allEvents: { event: ActivityEvent; sessionId: string }[] = [];
+
+      for (const [, job] of jobs) {
+        const events = ActivityStream.readFrom(job.id, 0);
+        const sessionId = job.sessionId ?? '';
+        for (const event of events) {
+          allEvents.push({ event, sessionId });
+        }
+      }
+
+      allEvents.sort((a, b) => a.event.ts.localeCompare(b.event.ts));
+
+      for (const item of allEvents) {
+        const waveSeq = client.waveSeq++;
+        if (waveSeq < fromWaveSeq) continue;
+
+        const key = `${item.event.roleId}:${item.event.seq}`;
+        client.sentEvents.add(key);
+
+        sendSSE(client, 'wave:event', {
+          waveSeq,
+          sessionId: item.sessionId,
+          event: item.event,
+        } as WaveStreamEnvelope);
+      }
+
+      // Phase 2: Subscribe to live events for running jobs
+      for (const [, job] of jobs) {
+        if (job.status === 'running' || job.status === 'awaiting_input') {
+          this.subscribeJobToClient(client, job, false);
+        }
+      }
+    }
+
+    console.log(`[WaveMux] attach wave=${waveId} jobs=${jobs?.size ?? 0} from=${fromWaveSeq}`);
+    return client;
+  }
+
+  /**
+   * Subscribe to a job's live events on a client.
+   * @param sendNotification - if true, send wave:role-attached + replay history (for late-joining jobs)
+   */
+  private subscribeJobToClient(client: WaveStreamClient, job: Job, sendNotification: boolean): void {
+    if (client.attachedJobs.has(job.id)) return;
+
+    const sessionId = job.sessionId ?? '';
+    const roleId = job.roleId;
+
+    if (sendNotification) {
+      // Notify client about new role joining
+      sendSSE(client, 'wave:role-attached', {
+        sessionId,
+        roleId,
+        jobId: job.id,
+        parentJobId: job.parentJobId,
+      });
+
+      // Replay this job's history (for late-joining child jobs)
+      const events = ActivityStream.readFrom(job.id, 0);
+      for (const event of events) {
+        const key = `${event.roleId}:${event.seq}`;
+        if (client.sentEvents.has(key)) continue;
+        client.sentEvents.add(key);
+
+        const waveSeq = client.waveSeq++;
+        sendSSE(client, 'wave:event', {
+          waveSeq,
+          sessionId,
+          event,
+        } as WaveStreamEnvelope);
+      }
+    }
+
+    // Subscribe to live events
+    const subscriber: ActivitySubscriber = (event: ActivityEvent) => {
+      if (client.closed) return;
+
+      const key = `${event.roleId}:${event.seq}`;
+      if (client.sentEvents.has(key)) return; // skip duplicate
+      client.sentEvents.add(key);
+
+      const waveSeq = client.waveSeq++;
+      sendSSE(client, 'wave:event', {
+        waveSeq,
+        sessionId,
+        event,
+      } as WaveStreamEnvelope);
+
+      if (event.type === 'job:done' || event.type === 'job:error') {
+        sendSSE(client, 'wave:role-detached', {
+          sessionId,
+          roleId,
+          reason: event.type === 'job:done' ? 'done' : 'error',
+        });
+      }
+    };
+
+    job.stream.subscribe(subscriber);
+
+    client.attachedJobs.set(job.id, {
+      jobId: job.id,
+      sessionId,
+      roleId,
+      unsubscribe: () => job.stream.unsubscribe(subscriber),
+    });
+
+    console.log(`[WaveMux] subscribed job=${job.id} role=${roleId} notify=${sendNotification}`);
+  }
+
+  /**
+   * Called when any new job is created — check if it belongs to a wave.
+   */
+  onJobCreated(job: Job): void {
+    // Find wave by tracing parentJobId chain
+    const waveId = this.findWaveIdForJob(job.id) ?? this.findWaveIdForJob(job.parentJobId ?? '');
+    if (!waveId) return;
+
+    // Register + auto-attach to clients
+    this.registerJob(waveId, job);
+  }
+
+  /**
+   * Disconnect a client from a wave stream
+   */
+  detach(waveId: string, client: WaveStreamClient): void {
+    client.closed = true;
+    clearInterval(client.heartbeat);
+
+    for (const [, attached] of client.attachedJobs) {
+      attached.unsubscribe();
+    }
+    client.attachedJobs.clear();
+    client.sentEvents.clear();
+
+    const clientSet = this.clients.get(waveId);
+    if (clientSet) {
+      clientSet.delete(client);
+      if (clientSet.size === 0) {
+        this.clients.delete(waveId);
+      }
+    }
+  }
+
+  private findWaveIdForJob(jobId: string): string | undefined {
+    for (const [waveId, jobs] of this.waveJobs) {
+      if (jobs.has(jobId)) return waveId;
+    }
+    return undefined;
+  }
+
+  getWaveJobIds(waveId: string): string[] {
+    const jobs = this.waveJobs.get(waveId);
+    return jobs ? Array.from(jobs.keys()) : [];
+  }
+}
+
+/* ─── Helpers ────────────────────────────── */
+
+function sendSSE(client: WaveStreamClient, event: string, data: unknown): void {
+  if (client.closed || client.res.destroyed || client.res.writableEnded) return;
+  try {
+    client.res.write(`event: ${event}\ndata: ${JSON.stringify(data)}\n\n`);
+  } catch { /* ignore write errors */ }
+}
+
+/* ─── Export singleton ───────────────────── */
+
+export const waveMultiplexer = new WaveMultiplexer();