tycono 0.1.89-beta.0 → 0.1.89

package/src/api/src/services/job-manager.ts

@@ -4,7 +4,7 @@ import { buildOrgTree } from '../engine/org-tree.js';
 import { validateDispatch, validateConsult } from '../engine/authority-validator.js';
 import { createRunner } from '../engine/runners/index.js';
 import type { ExecutionRunner } from '../engine/runners/types.js';
-import { setActivity, updateActivity, completeActivity } from './activity-tracker.js';
+import { setActivity, updateActivity, completeActivity, markAwaitingInput } from './activity-tracker.js';
 import type { RunnerResult } from '../engine/runners/types.js';
 import { estimateCost } from './pricing.js';
 import { readConfig, getConversationLimits, resolveCodeRoot } from './company-config.js';
@@ -13,10 +13,10 @@ import { earnCoinsInternal } from '../routes/coins.js';
 import { getSession, createSession, addMessage, updateMessage as updateSessionMessage, appendMessageEvent, type Message, type ImageAttachment } from './session-store.js';
 import { portRegistry, type PortAllocation } from './port-registry.js';
 
-/* ─── Types ──────────────────────────────── */
+/* ─── Types (re-export from shared contract) ─── */
 
-export type JobType = 'assign' | 'wave' | 'session-message' | 'consult';
-export type JobStatus = 'running' | 'done' | 'error' | 'awaiting_input';
+export { type JobType, type JobStatus, type JobInfo, isJobActive, canTransition, jobStatusToRoleStatus } from '../../../shared/types';
+import { type JobType, type JobStatus, type JobInfo, isJobActive, canTransition } from '../../../shared/types';
 
 export interface Job {
   id: string;
@@ -41,22 +41,11 @@ export interface Job {
   sessionId?: string;
   /** PSM-003: Allocated ports for this job's dev servers */
   ports?: PortAllocation;
+  /** Trace ID — top-level jobId, inherited by all children for full chain tracking */
+  traceId?: string;
 }
 
-export interface JobInfo {
-  id: string;
-  type: JobType;
-  roleId: string;
-  task: string;
-  status: JobStatus;
-  parentJobId?: string;
-  childJobIds: string[];
-  createdAt: string;
-  /** Which role should respond when status is awaiting_input */
-  targetRole?: string;
-  /** Final output text (available when status is done) */
-  output?: string;
-}
+/* JobInfo — imported from shared/types.ts */
 
 export interface StartJobParams {
   type: JobType;
@@ -162,7 +151,14 @@ class JobManager {
       }
     }
 
-    const stream = new ActivityStream(jobId, params.roleId, params.parentJobId);
+    // Resolve traceId: top-level jobs use their own ID, children inherit from parent
+    let traceId = jobId;
+    if (params.parentJobId) {
+      const parentJob = this.jobs.get(params.parentJobId);
+      traceId = parentJob?.traceId ?? params.parentJobId;
+    }
+
+    const stream = new ActivityStream(jobId, params.roleId, params.parentJobId, traceId);
 
     const job: Job = {
       id: jobId,
@@ -177,6 +173,7 @@ class JobManager {
       createdAt: new Date().toISOString(),
       targetRoles: params.targetRoles,
       sessionId: params.sessionId,
+      traceId,
     };
 
     this.jobs.set(jobId, job);
@@ -207,9 +204,11 @@ class JobManager {
     // Emit job:start
     job.stream.emit('job:start', params.roleId, {
       jobId: job.id,
+      traceId: job.traceId,
       type: params.type,
       task: params.task,
       sourceRole: params.sourceRole ?? 'ceo',
+      ...(params.parentJobId && { parentJobId: params.parentJobId }),
       ...(params.sessionId && { sessionId: params.sessionId }),
     });
 
@@ -241,7 +240,7 @@ class JobManager {
     let hardLimitReached = false;
 
     // Build team status snapshot: which roles are currently busy
-    const teamStatus: Record<string, { status: string; task?: string }> = {};
+    const teamStatus: import('../../../shared/types').TeamStatus = {};
     for (const [, j] of this.jobs) {
       if (j.status === 'running' && j.id !== job.id) {
         teamStatus[j.roleId] = { status: 'working', task: j.task };
@@ -412,6 +411,13 @@ class JobManager {
             handle.abort();
           }
         },
+        onPromptAssembled: (systemPrompt, userTask) => {
+          job.stream.emit('trace:prompt', params.roleId, {
+            systemPrompt,
+            userTask,
+            systemPromptLength: systemPrompt.length,
+          });
+        },
         onError: (error) => {
           job.stream.emit('stderr', params.roleId, { message: error });
         },
@@ -439,6 +445,14 @@ class JobManager {
           model ?? '',
         );
 
+        // Trace: capture full response before truncation
+        job.stream.emit('trace:response', params.roleId, {
+          fullOutput: result.output,
+          outputLength: result.output.length,
+          turns: result.turns,
+          tokens: result.totalTokens,
+        });
+
         const doneData = {
           output: result.output.slice(-1000),
           turns: result.turns,
@@ -454,6 +468,7 @@ class JobManager {
         if (hardLimitReached) {
           job.status = 'awaiting_input';
           job.targetRole = targetRole;
+          markAwaitingInput(params.roleId);
           const question = `[Turn limit] ${harnessTurnCount}턴 도달 (hardLimit: ${limits.hardLimit}). 계속 진행할까요?`;
           job.stream.emit('job:awaiting_input', params.roleId, {
             ...doneData,
@@ -468,6 +483,7 @@ class JobManager {
         else if (!params.isContinuation && hasQuestion(result.output)) {
           job.status = 'awaiting_input';
           job.targetRole = targetRole;
+          markAwaitingInput(params.roleId);
           job.stream.emit('job:awaiting_input', params.roleId, {
             ...doneData,
             question: result.output.trim().split('\n').slice(-5).join('\n'),
@@ -532,6 +548,7 @@ class JobManager {
           const targetRole = resolveTargetRole(params.sourceRole, params.parentJobId, this.jobs);
           job.status = 'awaiting_input';
           job.targetRole = targetRole;
+          markAwaitingInput(params.roleId);
           const question = `[Turn limit] ${harnessTurnCount}턴 도달 (hardLimit: ${limits.hardLimit}). 계속 진행할까요?`;
           job.stream.emit('job:awaiting_input', params.roleId, {
             question,
@@ -696,11 +713,12 @@ class JobManager {
     };
   }
 
-  /** List jobs with optional filter */
-  listJobs(filter?: { status?: JobStatus; roleId?: string }): JobInfo[] {
+  /** List jobs with optional filter. Use active:true to get running + awaiting_input. */
+  listJobs(filter?: { status?: JobStatus; roleId?: string; active?: boolean }): JobInfo[] {
     const result: JobInfo[] = [];
 
     for (const job of this.jobs.values()) {
+      if (filter?.active && !isJobActive(job.status)) continue;
       if (filter?.status && job.status !== filter.status) continue;
       if (filter?.roleId && job.roleId !== filter.roleId) continue;
       result.push({
@@ -722,7 +740,7 @@ class JobManager {
   /** Abort a running or awaiting_input job */
   abortJob(id: string): boolean {
     const job = this.jobs.get(id);
-    if (!job || (job.status !== 'running' && job.status !== 'awaiting_input')) return false;
+    if (!job || !isJobActive(job.status)) return false;
 
     if (job.status === 'running') job.abort();
     job.status = 'error';
@@ -775,10 +793,10 @@ class JobManager {
     return newJob;
   }
 
-  /** Get the active (running) job for a given role */
+  /** Get the active (running or awaiting_input) job for a given role */
   getActiveJobForRole(roleId: string): Job | undefined {
     for (const job of this.jobs.values()) {
-      if (job.roleId === roleId && job.status === 'running') {
+      if (job.roleId === roleId && isJobActive(job.status)) {
         return job;
       }
     }
@@ -792,7 +810,7 @@ class JobManager {
     for (const job of this.jobs.values()) {
       if (job.sessionId === sessionId) {
         // Prefer running or awaiting_input jobs
-        if (job.status === 'running' || job.status === 'awaiting_input') {
+        if (isJobActive(job.status)) {
           if (!active || job.createdAt > active.createdAt) {
             active = job;
           }

package/src/api/src/services/scaffold.ts

@@ -8,7 +8,7 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { execSync } from 'node:child_process';
 import { writeConfig } from './company-config.js';
-import { mergePreferences } from './preferences.js';
+import { mergePreferences, type CharacterAppearance } from './preferences.js';
 import type { CompanyConfig } from './company-config.js';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -415,7 +415,7 @@ export function scaffold(config: ScaffoldConfig): string[] {
   // Set default appearances for team roles
   if (config.team !== 'custom') {
     const roles = loadTeam(config.team);
-    const appearances: Record<string, unknown> = {};
+    const appearances: Record<string, CharacterAppearance> = {};
     for (const role of roles) {
       const def = DEFAULT_ROLE_APPEARANCES[role.id];
       if (def) appearances[role.id] = def;

package/src/api/src/services/session-store.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { COMPANY_ROOT } from './file-reader.js';
-import type { ActivityEvent } from './activity-stream.js';
+import { type ActivityEvent, type SessionSource, type SessionStatus, type MessageStatus, isMessageTerminal } from '../../../shared/types';
 
 /* ─── Types ─────────────────────────────── */
 
@@ -23,7 +23,7 @@ export interface Message {
   from: 'ceo' | 'role';
   content: string;
   type: 'conversation' | 'directive' | 'system';
-  status?: 'streaming' | 'done' | 'error' | 'awaiting_input';
+  status?: MessageStatus;
   timestamp: string;
   attachments?: ImageAttachment[];
 
@@ -43,16 +43,13 @@ export interface Message {
   knowledgeDebt?: Array<{ type: string; file?: string; message: string }>;
 }
 
-/** How this session was created */
-export type SessionSource = 'chat' | 'wave' | 'dispatch';
-
 export interface Session {
   id: string;
   roleId: string;
   title: string;
   mode: 'talk' | 'do';
   messages: Message[];
-  status: 'active' | 'closed';
+  status: SessionStatus;
   createdAt: string;
   updatedAt: string;
 
@@ -213,7 +210,7 @@ export function updateMessage(sessionId: string, messageId: string, updates: Mes
   if (updates.knowledgeDebt !== undefined) msg.knowledgeDebt = updates.knowledgeDebt;
   session.updatedAt = new Date().toISOString();
 
-  if (updates.status === 'done' || updates.status === 'error') {
+  if (updates.status && isMessageTerminal(updates.status)) {
     writeImmediate(session);
   } else {
     debouncedWrite(session);

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

@@ -1,5 +1,6 @@
 import { ActivityStream, type ActivityEvent, type ActivitySubscriber } from './activity-stream.js';
 import type { Job } from './job-manager.js';
+import { isJobActive } from '../../../shared/types';
 import type { Response } from 'express';
 
 /* ─── Types ──────────────────────────────── */
@@ -125,9 +126,11 @@ class WaveMultiplexer {
       }
 
       // Phase 2: Subscribe to live events for running jobs
+      // sendNotification=true ensures wave:role-attached is sent for each active job,
+      // so the client knows which roles are running. History replay is deduped by sentEvents.
       for (const [, job] of jobs) {
-        if (job.status === 'running' || job.status === 'awaiting_input') {
-          this.subscribeJobToClient(client, job, false);
+        if (isJobActive(job.status)) {
+          this.subscribeJobToClient(client, job, true);
         }
       }
     }

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

@@ -7,6 +7,7 @@ import path from 'node:path';
 import { COMPANY_ROOT } from './file-reader.js';
 import { ActivityStream, type ActivityEvent } from './activity-stream.js';
 import { jobManager } from './job-manager.js';
+import { type WaveRoleStatus, eventTypeToJobStatus } from '../../../shared/types';
 
 /* ─── Find wave file ──────────────────────── */
 
@@ -148,9 +149,7 @@ export function updateFollowUpInWave(waveId: string, jobId: string, roleId: stri
 
     const newEvents = ActivityStream.readAll(jobId);
     const doneEvent = newEvents.find(e => e.type === 'job:done' || e.type === 'job:error' || e.type === 'job:awaiting_input');
-    const status = doneEvent?.type === 'job:done' ? 'done'
-      : doneEvent?.type === 'job:error' ? 'error'
-      : doneEvent?.type === 'job:awaiting_input' ? 'awaiting_input' : 'running';
+    const status: WaveRoleStatus = doneEvent ? eventTypeToJobStatus(doneEvent.type) as WaveRoleStatus : 'running' as any;
 
     // Collect child jobs
     const childJobs: Array<{ roleId: string; roleName: string; jobId: string; status: string; events: ReturnType<typeof ActivityStream.readAll> }> = [];
@@ -159,8 +158,8 @@ export function updateFollowUpInWave(waveId: string, jobId: string, roleId: stri
         const childJobId = e.data.childJobId as string;
         const targetRoleId = (e.data.targetRoleId as string) ?? 'unknown';
         const childEvents = ActivityStream.readAll(childJobId);
-        const childDone = childEvents.find(ce => ce.type === 'job:done' || ce.type === 'job:error');
-        const childStatus = childDone?.type === 'job:done' ? 'done' : childDone?.type === 'job:error' ? 'error' : 'unknown';
+        const childDone = childEvents.find(ce => ce.type === 'job:done' || ce.type === 'job:error' || ce.type === 'job:awaiting_input');
+        const childStatus: WaveRoleStatus = childDone ? eventTypeToJobStatus(childDone.type) as WaveRoleStatus : 'unknown';
         childJobs.push({ roleId: targetRoleId, roleName: targetRoleId, jobId: childJobId, status: childStatus, events: childEvents });
       }
     }