tycono 0.1.93-beta.1 → 0.1.93-beta.2

package/package.json

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

package/src/api/src/engine/runners/claude-cli.ts

@@ -6,6 +6,7 @@ import { assembleContext } from '../context-assembler.js';
 import { getSubordinates } from '../org-tree.js';
 import { readConfig, resolveCodeRoot } from '../../services/company-config.js';
 import { getTokenLedger } from '../../services/token-ledger.js';
+import { getSession } from '../../services/session-store.js';
 import type { ExecutionRunner, RunnerConfig, RunnerCallbacks, RunnerHandle, RunnerResult } from './types.js';
 
 /* ─── Dispatch Bridge Script (Python3) ────── */
@@ -65,13 +66,17 @@ def get_status(job_id):
 def start_job(role_id, task):
     parent_session = os.environ.get('DISPATCH_PARENT_SESSION', os.environ.get('DISPATCH_PARENT_JOB', ''))
     source_role = os.environ.get('DISPATCH_SOURCE_ROLE', 'ceo')
-    body = json.dumps({
+    wave_id = os.environ.get('DISPATCH_WAVE_ID', '')
+    payload = {
         'type': 'assign',
         'roleId': role_id,
         'task': task,
         'sourceRole': source_role,
         'parentSessionId': parent_session if parent_session else None,
-        }).encode()
+    }
+    if wave_id:
+        payload['waveId'] = wave_id
+    body = json.dumps(payload).encode()
     req = urllib.request.Request(f'{api}/api/jobs', body, {'Content-Type': 'application/json'})
     resp = json.loads(urllib.request.urlopen(req, timeout=10).read())
     return resp['jobId']
@@ -347,6 +352,11 @@ export class ClaudeCliRunner implements ExecutionRunner {
     cleanEnv.DISPATCH_SUBORDINATES = subordinates.join(', ');
     cleanEnv.DISPATCH_PARENT_SESSION = config.sessionId;
     cleanEnv.DISPATCH_PARENT_JOB = config.sessionId; // deprecated, kept for backward compat
+    // BUG-W02 fix: propagate waveId to child dispatches via env
+    if (config.sessionId) {
+      const parentSes = getSession(config.sessionId);
+      if (parentSes?.waveId) cleanEnv.DISPATCH_WAVE_ID = parentSes.waveId;
+    }
     // dispatch 명령어 경로를 PATH에 추가하지 않고 절대 경로로 사용
     cleanEnv.DISPATCH_CMD = dispatchScript;
     cleanEnv.CONSULT_CMD = consultScript;

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

@@ -60,10 +60,14 @@ export function handleExecRequest(req: IncomingMessage, res: ServerResponse): vo
           waveGroups.get(ses.waveId)!.push(ses.id);
         }
       }
+      // BUG-W03 fix: register ALL wave sessions (including completed) for tree display
       for (const [wid, sids] of waveGroups) {
         for (const sid of sids) {
+          // getActiveExecution falls back to stream recovery for completed sessions
           const exec = executionManager.getActiveExecution(sid);
-          if (exec) waveMultiplexer.registerSession(wid, exec);
+          if (exec) {
+            waveMultiplexer.registerSession(wid, exec);
+          }
         }
       }
     }
@@ -272,6 +276,7 @@ function handleStartJob(body: Record<string, unknown>, res: ServerResponse): voi
   const session = createSession(roleId, {
     mode: readOnly ? 'talk' : 'do',
     source: parentSessionId ? 'dispatch' : sessionSource,
+    ...(parentSessionId && { parentSessionId }),
     ...(waveId && { waveId }),
   });
   const sessionId = session.id;
@@ -320,9 +325,18 @@ function handleStartJob(body: Record<string, unknown>, res: ServerResponse): voi
 
 function handleSaveWave(body: Record<string, unknown>, res: ServerResponse): void {
   const directive = body.directive as string;
-  const sessionIds = (body.sessionIds ?? body.jobIds) as string[];
+  let sessionIds = (body.sessionIds ?? body.jobIds) as string[] | undefined;
   const waveId = body.waveId as string | undefined;
 
+  // BUG-W01 fix: auto-collect sessionIds from session-store when waveId is present
+  if (waveId && (!sessionIds || sessionIds.length === 0)) {
+    const allSessions = listSessions();
+    sessionIds = allSessions
+      .filter(s => s.waveId === waveId)
+      .map(s => s.id);
+    console.log(`[WaveSave] Auto-collected ${sessionIds.length} sessionIds for wave ${waveId}`);
+  }
+
   if (!directive || !sessionIds || sessionIds.length === 0) {
     jsonResponse(res, 400, { error: 'directive and sessionIds are required' });
     return;
@@ -426,6 +440,7 @@ function handleWaveStream(waveId: string, url: string, res: ServerResponse, req:
     const allSessions = listSessions();
     const waveSessions = allSessions.filter(s => s.waveId === waveId);
     for (const ses of waveSessions) {
+      // getActiveExecution recovers from stream files for completed sessions too
       const exec = executionManager.getActiveExecution(ses.id);
       if (exec) {
         waveMultiplexer.registerSession(waveId, exec);
@@ -715,7 +730,51 @@ function handleWave(body: Record<string, unknown>, req: IncomingMessage, res: Se
 function handleStatus(res: ServerResponse): void {
   const statuses: Record<string, string> = {};
 
-  const activeExecs = executionManager.listExecutions({ active: true });
+  let activeExecs = executionManager.listExecutions({ active: true });
+
+  // Recovery: if in-memory map is empty (e.g. after server restart),
+  // rebuild active executions from persisted session-store + activity-streams
+  if (activeExecs.length === 0) {
+    const allSessions = listSessions();
+    const activeSessions = allSessions.filter(s =>
+      s.status === 'active' &&
+      (s.source === 'wave' || s.source === 'dispatch' || s.source === 'chat')
+    );
+
+    const recovered: typeof activeExecs = [];
+    for (const ses of activeSessions) {
+      // Check activity-stream for actual running state
+      if (!ActivityStream.exists(ses.id)) continue;
+      const events = ActivityStream.readFrom(ses.id, 0);
+      if (events.length === 0) continue;
+
+      const startEvent = events.find(e => e.type === 'msg:start');
+      if (!startEvent) continue;
+
+      const doneEvent = events.find(e => e.type === 'msg:done');
+      const errorEvent = events.find(e => e.type === 'msg:error');
+
+      // Only include sessions that haven't finished yet
+      if (doneEvent || errorEvent) continue;
+
+      const task = (startEvent.data?.task as string) ?? ses.title ?? '';
+      recovered.push({
+        id: `recovered-${ses.id}`,
+        type: (startEvent.data?.type as string ?? 'assign') as 'assign' | 'wave' | 'consult',
+        roleId: ses.roleId,
+        task,
+        status: 'running',
+        childSessionIds: [],
+        createdAt: ses.createdAt,
+      });
+    }
+
+    if (recovered.length > 0) {
+      activeExecs = recovered;
+      console.log(`[ExecStatus] Recovered ${recovered.length} active executions from session-store`);
+    }
+  }
+
   for (const exec of activeExecs) {
     // ExecStatus 'running' → RoleStatus 'working' (not MessageStatus 'streaming')
     statuses[exec.roleId] = exec.status === 'running' ? 'working'

package/src/api/src/routes/git.ts

@@ -141,10 +141,12 @@ gitRouter.delete('/worktree/{*path}', (req: Request, res: Response, next: NextFu
     }
 
     try {
-      git(`worktree remove ${JSON.stringify(worktreePath)}`, COMPANY_ROOT);
+      const repoRoot = resolveRepoRoot('code');
+      git(`worktree remove ${JSON.stringify(worktreePath)}`, repoRoot);
     } catch {
       // Try force remove if normal remove fails
-      git(`worktree remove --force ${JSON.stringify(worktreePath)}`, COMPANY_ROOT);
+      const repoRoot = resolveRepoRoot('code');
+      git(`worktree remove --force ${JSON.stringify(worktreePath)}`, repoRoot);
     }
 
     res.json({ success: true, removed: worktreePath });
@@ -174,7 +176,8 @@ gitRouter.delete('/branch/{*name}', (req: Request, res: Response, next: NextFunc
 
     // Delete local branch
     try {
-      git(`branch -d ${JSON.stringify(branchName)}`, COMPANY_ROOT);
+      const repoRoot = resolveRepoRoot('code');
+      git(`branch -d ${JSON.stringify(branchName)}`, repoRoot);
     } catch (err) {
       const msg = err instanceof Error ? err.message : 'Unknown error';
       // If branch is not fully merged, report but continue to try remote
@@ -187,7 +190,8 @@ gitRouter.delete('/branch/{*name}', (req: Request, res: Response, next: NextFunc
 
     // Delete remote branch
     try {
-      git(`push origin --delete ${JSON.stringify(branchName)}`, COMPANY_ROOT);
+      const repoRoot = resolveRepoRoot('code');
+      git(`push origin --delete ${JSON.stringify(branchName)}`, repoRoot);
     } catch (err) {
       const msg = err instanceof Error ? err.message : 'Unknown error';
       if (!msg.includes('remote ref does not exist')) {

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

@@ -287,9 +287,15 @@ class ExecutionManager {
             }
           }
 
+          // BUG-W02 fix: propagate waveId from parent session to child
+          const parentSession = getSession(execution.sessionId);
+          const parentWaveId = parentSession?.waveId;
+
           const childSession = createSession(subRoleId, {
             mode: 'do',
             source: 'dispatch',
+            parentSessionId: execution.sessionId,
+            ...(parentWaveId && { waveId: parentWaveId }),
           });
           const dispatchMsg: Message = {
             id: `msg-${Date.now()}-dispatch-${subRoleId}`,
@@ -761,7 +767,7 @@ class ExecutionManager {
         const status: ExecStatus = awaitingEvent && !doneEvent ? 'awaiting_input'
           : doneEvent ? 'done'
           : errorEvent ? 'error'
-          : 'done';
+          : 'running';  // No done/error event = still running
 
         const candidate = {
           streamId,
@@ -816,7 +822,7 @@ class ExecutionManager {
     const status: ExecStatus = awaitingEvent && !doneEvent ? 'awaiting_input'
       : doneEvent ? 'done'
       : errorEvent ? 'error'
-      : 'done';
+      : 'running';  // No done/error event = still running
 
     const stream = ActivityStream.getOrCreate(sessionId, startEvent.roleId);
     const execution: Execution = {

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

@@ -1,5 +1,6 @@
 import { ActivityStream, type ActivityEvent, type ActivitySubscriber } from './activity-stream.js';
 import type { Execution } from './execution-manager.js';
+import { getSession } from './session-store.js';
 import type { Response } from 'express';
 
 /* ─── Types ──────────────────────────────── */
@@ -181,7 +182,19 @@ class WaveMultiplexer {
   }
 
   onExecutionCreated(execution: Execution): void {
-    const waveId = this.findWaveIdForSession(execution.sessionId) ?? this.findWaveIdForSession(execution.parentSessionId ?? '');
+    // Check multiplexer's in-memory map first
+    let waveId = this.findWaveIdForSession(execution.sessionId) ?? this.findWaveIdForSession(execution.parentSessionId ?? '');
+
+    // BUG-W02 fix: also check session-store for waveId (propagated from parent)
+    if (!waveId) {
+      const session = getSession(execution.sessionId);
+      if (session?.waveId) waveId = session.waveId;
+    }
+    if (!waveId && execution.parentSessionId) {
+      const parentSession = getSession(execution.parentSessionId);
+      if (parentSession?.waveId) waveId = parentSession.waveId;
+    }
+
     if (!waveId) return;
 
     this.registerSession(waveId, execution);