cli-jaw 2.1.1 → 2.1.3

package/dist/src/agent/spawn.js

@@ -10,6 +10,7 @@ import { settings, UPLOADS_DIR, detectCli } from '../core/config.js';
 import { migrateLegacyClaudeValue } from '../cli/claude-models.js';
 import { stripUndefined } from '../core/strip-undefined.js';
 import { clearEmployeeSession, getSession, insertMessage, getRecentMessages, listQueuedMessages, insertQueuedMessage, deleteQueuedMessage, getSessionBucket, clearSessionBucket, } from '../core/db.js';
+import { getActiveChatSession } from '../core/chat-sessions.js';
 import { getSystemPrompt, regenerateB } from '../prompt/builder.js';
 import { extractSessionId, extractFromEvent, extractFromAcpUpdate, extractOutputChunk, logEventSummary, flushClaudeBuffers, flushOpenCodeBuffers } from './events.js';
 import { detectSmokeResponse } from './smoke-detector.js';
@@ -19,6 +20,7 @@ import { getSessionOwnershipGeneration, persistMainSession, } from './session-pe
 import { isCompactMarkerRow } from '../core/compact.js';
 import { isRuntimeSettingsMutationInFlight, waitForRuntimeSettingsIdle } from '../core/runtime-settings-gate.js';
 import { hasBlockingWorkers, hasPendingWorkerReplays, getActiveWorkers, clearAllWorkers } from '../orchestrator/worker-registry.js';
+import { sanitizeWorkerProgressTools } from '../orchestrator/worker-progress.js';
 import { handleAgentExit, setSpawnAgent, setMainMetaHandler } from './lifecycle-handler.js';
 import { buildServicePath } from '../core/runtime-path.js';
 import { resolveOrcScope } from '../orchestrator/scope.js';
@@ -31,6 +33,10 @@ import { asCliEventRecord, discriminate, fieldString } from '../types/cli-events
 import { isJawRuntimeEvent, handleJawRuntimeEvent } from './claude-e-runtime.js';
 import { appendTraceEvent, stampTraceTool, startTraceRun } from '../trace/store.js';
 import { extractAgyConversationId, formatAgyTimeoutMessage, isAgyStaleSessionOutput, isAgyTimeoutOutput } from './agy-runtime.js';
+import { startAgyTranscriptWatcher } from './agy-transcript-watcher.js';
+import { appendAssistantTextSegment } from './events/helpers.js';
+import { listKiroConversationIdsForCwd } from './kiro-auth.js';
+import { captureKiroSessionIdAfterExit, finalizeKiroFullText, flushKiroStdoutContext, isKiroPlainTextCli, isKiroStaleSessionOutput, parseAiESessionIdFromStderr, processKiroStdoutChunk, } from './kiro-runtime.js';
 import { resolveCursorModelVariant } from './cursor-runtime.js';
 // ─── State ───────────────────────────────────────────
 export let activeProcess = null;
@@ -62,6 +68,59 @@ export function buildAiERuntimeStatusMeta(cli, provider, model) {
     };
 }
 import { killProcessTree } from './spawn/process-kill.js';
+function appendParentLiveRunTool(ctx, tool) {
+    if (!ctx.parentLiveScope)
+        return;
+    const [safeTool] = sanitizeWorkerProgressTools([{ ...tool, isEmployee: true }]);
+    if (!safeTool)
+        return;
+    appendLiveRunTool(ctx.parentLiveScope, { ...safeTool, isEmployee: true });
+}
+function emitKiroStreamEvents(events, ctx, agentLabel, cli, empTag, traceAudience) {
+    for (const event of events) {
+        ctx.kiroLastVisibleAt = Date.now();
+        ctx.kiroHeartbeatSent = false;
+        ctx.stallWatchdog?.markProgress();
+        if (event.kind === 'assistant_delta') {
+            const segment = event.text;
+            if (!segment)
+                continue;
+            if (ctx.liveOutputText !== undefined) {
+                ctx.liveOutputText += segment;
+            }
+            ctx.outputTextStarted = true;
+            if (ctx.liveScope)
+                appendLiveRunText(ctx.liveScope, segment);
+            broadcast('agent_output', {
+                agentId: agentLabel,
+                cli,
+                text: segment,
+                ...empTag,
+            }, traceAudience);
+            continue;
+        }
+        const tool = {
+            icon: event.icon,
+            label: event.label,
+            detail: event.detail || '',
+            stepRef: event.stepRef,
+            status: event.status,
+            toolType: 'tool',
+        };
+        stampTraceTool(tool, ctx, 'tool');
+        const existingIdx = ctx.toolLog.findIndex((entry) => entry.stepRef === event.stepRef);
+        if (existingIdx >= 0) {
+            ctx.toolLog[existingIdx] = { ...ctx.toolLog[existingIdx], ...tool };
+        }
+        else {
+            ctx.toolLog.push(tool);
+        }
+        if (ctx.liveScope)
+            replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
+        appendParentLiveRunTool(ctx, tool);
+        broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag }, traceAudience);
+    }
+}
 export function killAgentById(agentId) {
     const proc = activeProcesses.get(agentId);
     if (!proc)
@@ -99,6 +158,7 @@ const queueCtrl = createQueueController({
     hasBlockingWorkers,
     hasPendingWorkerReplays,
     insertMessage,
+    getActiveChatSession,
     insertQueuedMessage,
     deleteQueuedMessage,
     listQueuedMessages: listQueuedMessages,
@@ -116,6 +176,9 @@ export function setSteerInProgress(v) {
     if (was && !v)
         queueMicrotask(() => processQueue());
 }
+export function isSteerInProgress() {
+    return steerInProgress;
+}
 export function isAgentBusy() {
     return !!activeProcess || queueCtrl.isRetryPending() || mainSpawnStarting || steerInProgress;
 }
@@ -129,9 +192,6 @@ const CLAUDE_E_STEER_KILL_ESCALATION_MS = 8_000;
 function getActiveMainCli() {
     return typeof currentMainMeta?.cli === 'string' ? currentMainMeta.cli : null;
 }
-function getActiveEffectiveProvider() {
-    return typeof currentMainMeta?.effectiveProvider === 'string' ? currentMainMeta.effectiveProvider : null;
-}
 function isActiveAiEPtyRuntime() {
     const cli = getActiveMainCli();
     return cli === 'claude-e' || cli === 'ai-e';
@@ -189,25 +249,40 @@ export function killActiveAgent(reason = 'user') {
     if (activeProcess.pid)
         killReasons.set(activeProcess.pid, reason);
     try {
-        activeProcess.kill(policy.signal);
+        if (activeProcess.pid) {
+            killProcessTree(activeProcess.pid, policy.signal);
+        }
+        else {
+            activeProcess.kill(policy.signal);
+        }
     }
     catch (e) {
         console.warn(`[agent:kill] ${policy.signal} failed`, { pid: activeProcess?.pid, error: e.message });
     }
     const proc = activeProcess;
+    // Immediately sever stdio to stop late output from reaching broadcast handlers
+    proc.stdout?.removeAllListeners('data');
+    proc.stderr?.removeAllListeners('data');
     setTimeout(() => {
         try {
-            if (proc && !proc.killed)
-                proc.kill('SIGKILL');
+            if (proc && !proc.killed) {
+                if (proc.pid)
+                    killProcessTree(proc.pid, 'SIGKILL');
+                else
+                    proc.kill('SIGKILL');
+            }
         }
         catch (e) {
             console.warn('[agent:kill] SIGKILL failed', { pid: proc?.pid, error: e.message });
         }
+        proc.stdin?.destroy();
+        proc.stdout?.destroy();
+        proc.stderr?.destroy();
     }, policy.escalationMs);
-    // Fix C1: 사용자 stop 시 isAgentBusy()가 즉시 false가 되도록 참조를 동기 해제.
+    // Fix C1: 사용자 stop/steer 시 isAgentBusy()가 즉시 false가 되도록 참조를 동기 해제.
     // 실제 child 종료는 위 setTimeout SIGKILL이 백그라운드에서 마무리.
     // exit handler의 setActiveProcess(null) / activeProcesses.delete 는 idempotent.
-    if (reason === 'api' || reason === 'user') {
+    if (reason === 'api' || reason === 'user' || reason === 'steer') {
         activeProcess = null;
     }
     return true;
@@ -285,7 +360,7 @@ export async function steerAgent(newPrompt, source) {
     const wasRunning = killActiveAgent('steer');
     if (wasRunning)
         await waitForProcessEnd(steerWaitMs);
-    insertMessage.run('user', newPrompt, source, '', settings["workingDir"] || null);
+    insertMessage.run('user', newPrompt, source, '', settings["workingDir"] || null, getActiveChatSession());
     broadcast('new_message', { role: 'user', content: newPrompt, source });
     broadcast('steer_started', { prompt: newPrompt, origin: source || 'web' });
     const { orchestrate, orchestrateContinue, orchestrateReset, isContinueIntent, isResetIntent } = await import('../orchestrator/pipeline.js');
@@ -332,7 +407,7 @@ function formatCliUnavailableMessage(cli, detected) {
     return `CLI '${cli}' not found in PATH. Run \`jaw doctor --json\`.`;
 }
 function buildHistoryBlock(currentPrompt, workingDir, maxSessions = 10, maxTotalChars = 8000) {
-    const recent = getRecentMessages.all(workingDir || null, Math.max(1, maxSessions * 2));
+    const recent = getRecentMessages.all(workingDir || null, getActiveChatSession(), Math.max(1, maxSessions * 2));
     if (!recent.length)
         return '';
     const promptText = String(currentPrompt || '').trim();
@@ -361,12 +436,12 @@ function buildHistoryBlock(currentPrompt, workingDir, maxSessions = 10, maxTotal
             break;
         }
         let entry;
-        if (content && !isStaleWorklogHistoryArtifact(content)) {
-            entry = `[${role || 'user'}] ${content}`;
-        }
-        else if (role === 'assistant' && row.trace && !isStaleWorklogHistoryArtifact(String(row.trace))) {
+        if (role === 'assistant' && row.trace && !isStaleWorklogHistoryArtifact(String(row.trace))) {
             entry = `[assistant trace] ${String(row.trace).slice(0, 2000)}`;
         }
+        else if (content && !isStaleWorklogHistoryArtifact(content)) {
+            entry = `[${role || 'user'}] ${content}`;
+        }
         else {
             entry = '';
         }
@@ -557,8 +632,8 @@ export function spawnAgent(prompt, opts = {}) {
     const bucketResumeKey = typeof bucketRow?.resume_key === 'string' ? bucketRow.resume_key : null;
     const bucketUpdatedAt = bucketRow?.updated_at ?? null;
     const resumeKey = buildSessionResumeKey(cli, spawnEnv);
-    const providerSupportsResume = !(cli === 'ai-e' && effectiveProvider !== 'claude');
-    const canResumeBucketSession = !bucketSessionId || shouldResumeBucketSession(cli, runtimeModel, bucketModel, resumeKey, bucketResumeKey, bucketUpdatedAt);
+    const providerSupportsResume = !(cli === 'ai-e' && effectiveProvider !== 'claude' && effectiveProvider !== 'kiro' && effectiveProvider !== 'codex' && effectiveProvider !== 'grok');
+    const canResumeBucketSession = !bucketSessionId || shouldResumeBucketSession(cli, runtimeModel, bucketModel, resumeKey, bucketResumeKey, bucketUpdatedAt, Date.now(), effectiveProvider);
     const isResume = empSid
         ? true
         : (providerSupportsResume && !opts._skipResume && !forceNew && !!bucketSessionId && canResumeBucketSession);
@@ -608,10 +683,10 @@ export function spawnAgent(prompt, opts = {}) {
     const historyBlock = !isResume && !opts._skipHistory
         ? buildHistoryBlock(prompt, settings["workingDir"], cli === 'gemini' ? GEMINI_HISTORY_MAX_SESSIONS : 10, cli === 'gemini' ? GEMINI_HISTORY_MAX_CHARS : 8000)
         : '';
-    let promptForArgs = (cli === 'agy' || cli === 'cursor' || cli === 'gemini' || cli === 'grok' || cli === 'opencode' || (cli === 'ai-e' && effectiveProvider !== 'claude'))
+    let promptForArgs = (cli === 'agy' || cli === 'cursor' || cli === 'kiro-code' || cli === 'gemini' || cli === 'grok' || cli === 'opencode' || (cli === 'ai-e' && effectiveProvider !== 'claude'))
         ? withHistoryPrompt(prompt, historyBlock)
         : prompt;
-    if (cli === 'agy' && sysPrompt) {
+    if ((cli === 'agy' || cli === 'kiro-code' || (cli === 'ai-e' && effectiveProvider === 'kiro')) && sysPrompt) {
         promptForArgs = `[Operational Context — cli-jaw Integration]\nThe following operational guidelines apply to this session. Follow these task rules and use the tools/commands described:\n\n${sysPrompt}\n\n---\n\n${promptForArgs}`;
     }
     const claudeBin = (cli === 'claude-e' || (cli === 'ai-e' && effectiveProvider === 'claude'))
@@ -782,7 +857,7 @@ export function spawnAgent(prompt, opts = {}) {
                 processQueue();
         });
         if (mainManaged && !opts.internal && !opts._skipInsert) {
-            insertMessage.run('user', prompt, cli, model, settings["workingDir"] || null);
+            insertMessage.run('user', prompt, cli, model, settings["workingDir"] || null, getActiveChatSession());
         }
         if (!opts.internal)
             broadcast('agent_status', { status: 'running', cli, agentId: agentLabel, ...empTag }, traceAudience);
@@ -811,8 +886,7 @@ export function spawnAgent(prompt, opts = {}) {
                 ctx.toolLog.push(tool);
                 if (ctx.liveScope)
                     replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
-                if (ctx.parentLiveScope)
-                    appendLiveRunTool(ctx.parentLiveScope, { ...tool, isEmployee: true });
+                appendParentLiveRunTool(ctx, tool);
                 broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag }, traceAudience);
             }
             ctx.thinkingBuf = '';
@@ -846,8 +920,7 @@ export function spawnAgent(prompt, opts = {}) {
                     ctx.toolLog.push(parsedTool);
                     if (ctx.liveScope)
                         replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
-                    if (ctx.parentLiveScope)
-                        appendLiveRunTool(ctx.parentLiveScope, { ...parsedTool, isEmployee: true });
+                    appendParentLiveRunTool(ctx, parsedTool);
                     broadcast('agent_tool', { agentId: agentLabel, ...parsedTool, ...empTag }, traceAudience);
                     // Reset heartbeat gate on actually visible broadcast (not 💭)
                     lastVisibleBroadcastTs = Date.now();
@@ -856,10 +929,19 @@ export function spawnAgent(prompt, opts = {}) {
             }
             if (parsed.text) {
                 flushThinking();
-                ctx.fullText += parsed.text;
-                if (ctx.liveScope)
-                    appendLiveRunText(ctx.liveScope, parsed.text);
-                // text-only updates are local accumulation, not visible to user — no gate reset
+                const segment = appendAssistantTextSegment(ctx, parsed.text);
+                if (segment) {
+                    if (ctx.liveScope)
+                        appendLiveRunText(ctx.liveScope, segment);
+                    broadcast('agent_output', {
+                        agentId: agentLabel,
+                        cli,
+                        text: segment,
+                        ...empTag,
+                    }, traceAudience);
+                    lastVisibleBroadcastTs = Date.now();
+                    heartbeatSent = false;
+                }
             }
             opts.lifecycle?.onActivity?.('acp');
         });
@@ -874,8 +956,7 @@ export function spawnAgent(prompt, opts = {}) {
                 ctx.toolLog.push(parsed.tool);
                 if (ctx.liveScope)
                     replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
-                if (ctx.parentLiveScope)
-                    appendLiveRunTool(ctx.parentLiveScope, { ...parsed.tool, isEmployee: true });
+                appendParentLiveRunTool(ctx, parsed.tool);
                 broadcast('agent_tool', { agentId: agentLabel, ...parsed.tool, ...empTag }, traceAudience);
             }
         });
@@ -890,8 +971,7 @@ export function spawnAgent(prompt, opts = {}) {
                 ctx.toolLog.push(parsed.tool);
                 if (ctx.liveScope)
                     replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
-                if (ctx.parentLiveScope)
-                    appendLiveRunTool(ctx.parentLiveScope, { ...parsed.tool, isEmployee: true });
+                appendParentLiveRunTool(ctx, parsed.tool);
                 broadcast('agent_tool', { agentId: agentLabel, ...parsed.tool, ...empTag }, traceAudience);
             }
         });
@@ -1075,7 +1155,7 @@ export function spawnAgent(prompt, opts = {}) {
                 processQueue();
         });
         if (mainManaged && !opts.internal && !opts._skipInsert) {
-            insertMessage.run('user', prompt, cli, model, settings["workingDir"] || null);
+            insertMessage.run('user', prompt, cli, model, settings["workingDir"] || null, getActiveChatSession());
         }
         if (!opts.internal)
             broadcast('agent_status', { status: 'running', cli, agentId: agentLabel, ...empTag }, traceAudience);
@@ -1103,8 +1183,7 @@ export function spawnAgent(prompt, opts = {}) {
                 ctx.toolLog.push(tool);
                 if (ctx.liveScope)
                     replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
-                if (ctx.parentLiveScope)
-                    appendLiveRunTool(ctx.parentLiveScope, { ...tool, isEmployee: true });
+                appendParentLiveRunTool(ctx, tool);
                 broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag }, traceAudience);
             }
             ctx.thinkingBuf = '';
@@ -1136,8 +1215,7 @@ export function spawnAgent(prompt, opts = {}) {
                     ctx.toolLog.push(parsedTool);
                     if (ctx.liveScope)
                         replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
-                    if (ctx.parentLiveScope)
-                        appendLiveRunTool(ctx.parentLiveScope, { ...parsedTool, isEmployee: true });
+                    appendParentLiveRunTool(ctx, parsedTool);
                     broadcast('agent_tool', { agentId: agentLabel, ...parsedTool, ...empTag }, traceAudience);
                     lastVisibleBroadcastTs = Date.now();
                     heartbeatSent = false;
@@ -1145,9 +1223,19 @@ export function spawnAgent(prompt, opts = {}) {
             }
             if (parsed.text) {
                 flushCodexAppThinking();
-                ctx.fullText += parsed.text;
-                if (ctx.liveScope)
-                    appendLiveRunText(ctx.liveScope, parsed.text);
+                const segment = appendAssistantTextSegment(ctx, parsed.text);
+                if (segment) {
+                    if (ctx.liveScope)
+                        appendLiveRunText(ctx.liveScope, segment);
+                    broadcast('agent_output', {
+                        agentId: agentLabel,
+                        cli,
+                        text: segment,
+                        ...empTag,
+                    }, traceAudience);
+                    lastVisibleBroadcastTs = Date.now();
+                    heartbeatSent = false;
+                }
             }
             if (parsed.sessionId && !ctx.sessionId) {
                 ctx.sessionId = parsed.sessionId;
@@ -1365,7 +1453,7 @@ export function spawnAgent(prompt, opts = {}) {
             processQueue();
     });
     if (mainManaged && !opts.internal && !opts._skipInsert) {
-        insertMessage.run('user', prompt, cli, runtimeModel, settings["workingDir"] || null);
+        insertMessage.run('user', prompt, cli, runtimeModel, settings["workingDir"] || null, getActiveChatSession());
     }
     if (cli === 'claude') {
         child.stdin.write(withHistoryPrompt(prompt, historyBlock));
@@ -1383,6 +1471,11 @@ export function spawnAgent(prompt, opts = {}) {
     if (!opts.internal)
         broadcast('agent_status', { status: 'running', cli, agentId: agentLabel, ...runtimeStatusMeta, ...empTag }, traceAudience);
     const traceRunId = startTraceRun({ cli, model: runtimeModel, workingDir: settings["workingDir"] || null, agentLabel, audience: traceAudience });
+    const kiroPlainText = isKiroPlainTextCli(cli, effectiveProvider);
+    const kiroSpawnStartedAt = kiroPlainText ? Date.now() - 1000 : 0;
+    const kiroConversationIdsBefore = (kiroPlainText && !isResume && !empSid)
+        ? listKiroConversationIdsForCwd(spawnCwd)
+        : null;
     const agyResumeOffset = cli === 'agy' && isResume
         ? (empSid ? (opts.employeeOutputLen ?? 0) : (bucketRow?.output_len ?? 0))
         : 0;
@@ -1392,7 +1485,7 @@ export function spawnAgent(prompt, opts = {}) {
         toolLog: [],
         seenToolKeys: new Set(),
         hasClaudeStreamEvents: false,
-        sessionId: null,
+        sessionId: (kiroPlainText && isResume && resumeSessionId) ? resumeSessionId : null,
         cost: null,
         turns: null,
         duration: null,
@@ -1409,6 +1502,8 @@ export function spawnAgent(prompt, opts = {}) {
         geminiResultSeen: false,
         ...(opencodeSpawnAudit ? { opencodeSpawnAudit: opencodeSpawnAudit } : {}),
         ...(agyResumeOffset > 0 ? { agyResumeOffset, agyBytesReceived: 0 } : {}),
+        ...(kiroPlainText || cli === 'agy' ? { liveOutputText: '' } : {}),
+        ...(kiroPlainText ? { kiroLastVisibleAt: Date.now(), kiroHeartbeatSent: false } : {}),
     };
     let geminiWatchdog = null;
     // ─── Subprocess stall watchdog (Phase 1: #178 OAuth2 stall recovery) ───
@@ -1439,6 +1534,25 @@ export function spawnAgent(prompt, opts = {}) {
         }
     }, watchdogConfig);
     ctx.stallWatchdog = stallWatchdog;
+    let agyTranscriptWatcher = null;
+    if (cli === 'agy') {
+        agyTranscriptWatcher = startAgyTranscriptWatcher({
+            cwd: spawnCwd,
+            getSessionId: () => ctx.sessionId,
+            ctx,
+            agentLabel,
+            cli,
+            empTag,
+            traceAudience,
+            onEmit: (emitCtx, tool, label, _cliName, tag, audience) => {
+                stampTraceTool(tool, emitCtx, tool.toolType || 'tool');
+                if (emitCtx.liveScope)
+                    replaceLiveRunTools(emitCtx.liveScope, emitCtx.toolLog);
+                appendParentLiveRunTool(emitCtx, tool);
+                broadcast('agent_tool', { agentId: label, ...tool, ...tag }, audience);
+            },
+        });
+    }
     let buffer = '';
     const recordOpencodeEvent = (line, event) => {
         if (cli !== 'opencode')
@@ -1534,13 +1648,16 @@ export function spawnAgent(prompt, opts = {}) {
         }, 30_000);
     }
     const agyUtf8 = cli === 'agy' ? new StringDecoder('utf8') : null;
+    const kiroUtf8 = kiroPlainText ? new StringDecoder('utf8') : null;
     child.stdout.on('data', (chunk) => {
         opts.lifecycle?.onActivity?.('stdout');
         lastOpencodeIoAt = Date.now();
         if (cli === 'agy') {
-            const text = agyUtf8.write(chunk);
-            if (!text)
+            const rawText = agyUtf8.write(chunk);
+            if (!rawText)
                 return;
+            // Defensive ANSI strip (belt-and-suspenders with NO_COLOR=1)
+            const text = rawText.replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, '');
             if (ctx.fullText.length < 102_400)
                 ctx.fullText += text;
             else if (ctx.fullText.length < 102_500)
@@ -1557,6 +1674,9 @@ export function spawnAgent(prompt, opts = {}) {
                 ctx.agyResumeOffset = 0;
                 if (!newText)
                     return;
+                if (ctx.liveOutputText !== undefined)
+                    ctx.liveOutputText += newText;
+                ctx.outputTextStarted = true;
                 if (ctx.liveScope)
                     appendLiveRunText(ctx.liveScope, newText);
                 broadcast('agent_output', {
@@ -1567,6 +1687,9 @@ export function spawnAgent(prompt, opts = {}) {
                 }, traceAudience);
                 return;
             }
+            if (ctx.liveOutputText !== undefined)
+                ctx.liveOutputText += text;
+            ctx.outputTextStarted = true;
             if (ctx.liveScope)
                 appendLiveRunText(ctx.liveScope, text);
             broadcast('agent_output', {
@@ -1577,6 +1700,17 @@ export function spawnAgent(prompt, opts = {}) {
             }, traceAudience);
             return;
         }
+        if (kiroPlainText) {
+            const text = kiroUtf8.write(chunk);
+            if (!text)
+                return;
+            appendTraceEvent({ runId: ctx.traceRunId, source: 'cli_raw', eventType: 'plain_text', raw: text });
+            const events = processKiroStdoutChunk(ctx, text);
+            if (events.length) {
+                emitKiroStreamEvents(events, ctx, agentLabel, cli, empTag, traceAudience);
+            }
+            return;
+        }
         buffer += chunk.toString();
         const lines = buffer.split('\n');
         buffer = lines.pop() ?? '';
@@ -1595,6 +1729,7 @@ export function spawnAgent(prompt, opts = {}) {
         ctx.stderrBuf += text + '\n';
     });
     child.on('close', (code) => {
+        agyTranscriptWatcher?.stop();
         clearOpencodeIdleTimer();
         stallWatchdog.stop();
         if (geminiWatchdog) {
@@ -1616,6 +1751,13 @@ export function spawnAgent(prompt, opts = {}) {
             if (remaining)
                 ctx.fullText += remaining;
         }
+        if (kiroUtf8) {
+            const remaining = kiroUtf8.end();
+            if (remaining) {
+                emitKiroStreamEvents(processKiroStdoutChunk(ctx, remaining), ctx, agentLabel, cli, empTag, traceAudience);
+            }
+            emitKiroStreamEvents(flushKiroStdoutContext(ctx), ctx, agentLabel, cli, empTag, traceAudience);
+        }
         const agyTotalOutputLen = cli === 'agy' ? ctx.fullText.length : 0;
         if (cli === 'agy' && agyResumeOffset > 0) {
             ctx.fullText = ctx.fullText.slice(Math.min(agyResumeOffset, ctx.fullText.length));
@@ -1656,6 +1798,52 @@ export function spawnAgent(prompt, opts = {}) {
             }
             ctx.sessionId = null;
         }
+        if (kiroPlainText) {
+            const captured = captureKiroSessionIdAfterExit({
+                cwd: spawnCwd,
+                spawnStartedAt: kiroSpawnStartedAt,
+                beforeIds: kiroConversationIdsBefore,
+                stdout: ctx.fullText,
+                stderr: ctx.stderrBuf,
+                resumeSessionId,
+                isResume,
+            });
+            ctx.sessionId = captured.id;
+            if (captured.source) {
+                console.log(`[jaw:kiro] session capture source=${captured.source} id=${captured.id?.slice(0, 12) ?? 'none'}...`);
+            }
+            if (!ctx.sessionId) {
+                console.warn(`[jaw:kiro] session id capture failed cwd=${spawnCwd}`);
+            }
+            if (isResume && isKiroStaleSessionOutput(ctx.fullText)) {
+                console.log('[jaw:kiro] stale session detected in output — clearing bucket');
+                try {
+                    const bucket = resolveSessionBucket(cli, runtimeModel, effectiveProvider);
+                    clearSessionBucket.run(bucket);
+                }
+                catch (e) {
+                    console.warn('[jaw:kiro] stale bucket clear failed:', e.message);
+                }
+                ctx.sessionId = null;
+            }
+            const parsed = finalizeKiroFullText(ctx.fullText, ctx.kiroLineBuffer);
+            const best = [ctx.liveOutputText, ctx.kiroDisplayedText, parsed]
+                .map((value) => String(value || '').trim())
+                .filter(Boolean)
+                .sort((a, b) => b.length - a.length)[0];
+            if (best)
+                ctx.fullText = best;
+            else if (parsed)
+                ctx.fullText = parsed;
+        }
+        // ai-e codex/grok: capture session ID from stderr footer
+        if (cli === 'ai-e' && !kiroPlainText && effectiveProvider !== 'claude' && !ctx.sessionId) {
+            const fromStderr = parseAiESessionIdFromStderr(ctx.stderrBuf);
+            if (fromStderr) {
+                ctx.sessionId = fromStderr;
+                console.log(`[jaw:ai-e:${effectiveProvider}] session capture id=${fromStderr.slice(0, 16)}...`);
+            }
+        }
         const agyTimedOut = cli === 'agy' && isAgyTimeoutOutput(ctx.fullText);
         const effectiveExitCode = agyTimedOut ? 124 : code;
         if (agyTimedOut) {