cli-jaw 2.2.3 → 2.2.4-preview.20260703203439

package/dist/src/agent/spawn/resume.js.map

@@ -1 +1 @@
-{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../../../src/agent/spawn/resume.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../../../src/agent/spawn/resume.ts"],"names":[],"mappings":"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"}

package/dist/src/agent/spawn-env.js

@@ -22,24 +22,6 @@ const OPENCODE_ALLOW_PERMISSIONS = [
     'webfetch',
     'websearch',
 ];
-const GEMINI_TRUST_WORKSPACE_ENV = 'GEMINI_CLI_TRUST_WORKSPACE';
-const GEMINI_SYSTEM_SETTINGS_ENV = 'GEMINI_CLI_SYSTEM_SETTINGS_PATH';
-const GEMINI_SYSTEM_SETTINGS = {
-    general: {
-        maxAttempts: 3,
-        retryFetchErrors: true,
-    },
-};
-let _geminiSystemSettingsPath = null;
-function getGeminiSystemSettingsPath() {
-    if (_geminiSystemSettingsPath && fs.existsSync(_geminiSystemSettingsPath)) {
-        return _geminiSystemSettingsPath;
-    }
-    const tmpPath = join(os.tmpdir(), 'jaw-gemini-system-settings.json');
-    fs.writeFileSync(tmpPath, JSON.stringify(GEMINI_SYSTEM_SETTINGS, null, 2) + '\n');
-    _geminiSystemSettingsPath = tmpPath;
-    return tmpPath;
-}
 function prependPathDir(extraEnv, inheritedEnv, dir) {
     const currentPath = extraEnv["PATH"] ?? inheritedEnv["PATH"] ?? '';
     const parts = currentPath.split(':').filter(Boolean).filter(part => part !== dir);
@@ -52,16 +34,6 @@ export function getOpencodePreferredBinDir() {
     return join(os.homedir(), '.bun', 'bin');
 }
 export function applyCliEnvDefaults(cli, extraEnv = {}, inheritedEnv = process.env) {
-    if (cli === 'gemini') {
-        const merged = { ...extraEnv };
-        if (!merged[GEMINI_TRUST_WORKSPACE_ENV] && !inheritedEnv[GEMINI_TRUST_WORKSPACE_ENV]) {
-            merged[GEMINI_TRUST_WORKSPACE_ENV] = 'true';
-        }
-        if (!merged[GEMINI_SYSTEM_SETTINGS_ENV]) {
-            merged[GEMINI_SYSTEM_SETTINGS_ENV] = getGeminiSystemSettingsPath();
-        }
-        return merged;
-    }
     if (cli === 'agy' || cli === 'kiro-code' || cli === 'grok') {
         return {
             ...extraEnv,

package/dist/src/agent/spawn-env.js.map

@@ -1 +1 @@
-{"version":3,"file":"spawn-env.js","sourceRoot":"","sources":["../../../src/agent/spawn-env.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spawn-env.js","sourceRoot":"","sources":["../../../src/agent/spawn-env.ts"],"names":[],"mappings":"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"}

package/dist/src/agent/spawn.js

@@ -31,17 +31,18 @@ import { stripInterviewTracker } from '../orchestrator/sanitize.js';
 import { beginLiveRun, appendLiveRunText, setLiveRunTraceId, clearLiveRun, replaceLiveRunTools, appendLiveRunTool, getLiveRun } from './live-run-state.js';
 import { setSpawnRef as setMemorySpawnRef, } from './memory-flush-controller.js';
 import { applyCliEnvDefaults, buildSessionResumeKey, ensureOpencodeAlwaysAllowPermissions } from './spawn-env.js';
+import { buildPromptForArgs, withHistoryPrompt } from './prompt-context.js';
 import { attachWatchdog, DEFAULT_WATCHDOG_ABSOLUTE_HARD_CAP_MS } from './watchdog.js';
 import { buildOpencodeRuntimeSnapshot, buildOpencodeSpawnAudit, pushOpencodeRawEvent, resolveOpencodeBinary, } from './opencode-diagnostics.js';
 import { asCliEventRecord, discriminate, fieldString } from '../types/cli-events.js';
 import { isJawRuntimeEvent, handleJawRuntimeEvent } from './claude-e-runtime.js';
 import { jawRuntime } from './jwc-runtime.js';
 import { appendTraceEvent, stampTraceTool, startTraceRun } from '../trace/store.js';
-import { AGY_COMPLETE_KILL_REASON, extractAgyConversationId, resolveAgyEmptyCloseError, formatAgyTimeoutMessage, getAgyQuietCompletionDelayMs, isAgyStaleSessionOutput, normalizeAgyCloseText, stripAgyPromptEchoPrefix, stripAgyResumeReplayPrefix, stripAgyResumeReplayPrefixes, } from './agy-runtime.js';
+import { AGY_COMPLETE_KILL_REASON, appendAgyFullText, classifyAgyTranscriptMode, describeAgyFinalSource, extractAgyConversationId, finalizeAgyFallbackText, formatAgyWatchdogContext, resolveAgyEmptyCloseError, formatAgyTimeoutMessage, getAgyQuietCompletionDelayMs, isAgyStaleSessionOutput, normalizeAgyCloseText, shouldFreezeAgyLiveDisplay, stripAgyPromptEchoPrefix, stripAgyResumeReplayPrefix, stripAgyResumeReplayPrefixes, } from './agy-runtime.js';
 import { detectAgyCapabilities } from './agy-capabilities.js';
-import { buildAgyBootstrapEnvelope } from './agy-bootstrap.js';
+import { buildAgyBootstrapEnvelope, resolveAgyPromptOrder, } from './agy-bootstrap.js';
 import { startAgyTranscriptWatcher } from './agy-transcript-watcher.js';
-import { appendAssistantTextSegment, normalizeAssistantDisplayText, pushTrace } from './events/helpers.js';
+import { appendAssistantTextSegment, emitAgentTool, normalizeAssistantDisplayText, pushTrace } 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';
@@ -155,7 +156,7 @@ function emitKiroStreamEvents(events, ctx, agentLabel, cli, empTag, traceAudienc
         if (ctx.liveScope)
             replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
         appendParentLiveRunTool(ctx, tool);
-        broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag }, traceAudience);
+        emitAgentTool(ctx, agentLabel, tool, empTag);
     }
 }
 export function killAgentById(agentId) {
@@ -430,7 +431,6 @@ export async function steerAgent(newPrompt, source) {
 function makeCleanEnv(extraEnv = {}) {
     const env = { ...process.env };
     delete env["CLAUDE_CODE_SSE_PORT"];
-    delete env["GEMINI_SYSTEM_MD"];
     // Phase 8: strip boss-only dispatch token from employee spawns so employees
     // cannot authenticate against /api/orchestrate/dispatch even via localhost.
     // Detect employee spawn by the explicit JAW_EMPLOYEE_MODE flag; main spawns
@@ -518,17 +518,6 @@ function isStaleWorklogHistoryArtifact(text) {
         '正在从上一个 worklog 继续。',
     ].some(marker => value.includes(marker));
 }
-const HISTORY_BOUNDARY_INSTRUCTION = [
-    '[History Boundary]',
-    'Recent Context is read-only background. The Current Message below is the only task to execute now.',
-    'Do not continue prior plans, audits, commands, questions, or goals unless the Current Message explicitly asks to resume or continue them.',
-].join('\n');
-function withHistoryPrompt(prompt, historyBlock) {
-    const body = String(prompt || '');
-    if (!historyBlock)
-        return body;
-    return `${historyBlock}\n\n${HISTORY_BOUNDARY_INSTRUCTION}\n\n---\n[Current Message]\n${body}`;
-}
 function getLatestAssistantContentForAgyResume(workingDir) {
     const rows = getRecentMessages.all(workingDir || null, getActiveChatSession(), 12);
     const row = rows.find((msg) => msg.role === 'assistant' && typeof msg.content === 'string' && msg.content.trim().length > 0);
@@ -550,11 +539,9 @@ export { buildMediaPrompt, buildMediaPromptMany };
 import { AcpClient } from '../cli/acp-client.js';
 import { CodexAppClient } from './codex-app-client.js';
 import { extractFromCodexAppEvent } from './codex-app-events.js';
-import { shouldEmitHeartbeat, shouldResumeBucketSession, GEMINI_RESUME_TTL_MS } from './spawn/resume.js';
-export { shouldEmitHeartbeat, shouldResumeBucketSession, GEMINI_RESUME_TTL_MS };
+import { shouldEmitHeartbeat, shouldResumeBucketSession } from './spawn/resume.js';
+export { shouldEmitHeartbeat, shouldResumeBucketSession };
 import { createQueueController, FALLBACK_MAX_RETRIES } from './spawn/queue.js';
-const GEMINI_HISTORY_MAX_SESSIONS = 4;
-const GEMINI_HISTORY_MAX_CHARS = 8000;
 function cleanupEmployeeTmpDir(cwd, workingDir, label) {
     if (cwd !== workingDir) {
         try {
@@ -788,10 +775,7 @@ export function spawnAgent(prompt, opts = {}) {
         catch (e) {
             console.warn('[jaw:resume] stale bucket clear failed:', e.message);
         }
-        if (cli === 'gemini') {
-            console.log(`[jaw:resume] ${cli} stale bucket rejected for model ${bucketModel ?? 'none'} → ${model}; starting fresh session`);
-        }
-        else if (cli === 'opencode' && resumeKey !== (bucketResumeKey ?? null)) {
+        if (cli === 'opencode' && resumeKey !== (bucketResumeKey ?? null)) {
             console.log(`[jaw:resume] ${cli} resume key changed ${bucketResumeKey ?? 'none'} → ${resumeKey}; starting fresh session`);
         }
         else {
@@ -849,15 +833,17 @@ export function spawnAgent(prompt, opts = {}) {
     const resumeSessionId = empSid || (isResume ? bucketSessionId : null);
     const needsHistory = !opts._skipHistory && (!isResume || cli === 'pi');
     const historyBlock = needsHistory
-        ? buildHistoryBlock(prompt, settings["workingDir"], cli === 'gemini' ? GEMINI_HISTORY_MAX_SESSIONS : 10, cli === 'gemini' ? GEMINI_HISTORY_MAX_CHARS : 8000)
+        ? buildHistoryBlock(prompt, settings["workingDir"], 10, 8000)
         : '';
     let agyBootstrap = null;
-    let promptForArgs = (cli === 'cursor' || cli === 'kiro-code' || cli === 'gemini' || cli === 'grok' || cli === 'opencode' || (cli === 'ai-e' && effectiveProvider !== 'claude'))
-        ? withHistoryPrompt(prompt, historyBlock)
-        : prompt;
-    if ((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}`;
-    }
+    let promptForArgs = buildPromptForArgs({
+        cli,
+        effectiveProvider,
+        prompt,
+        historyBlock,
+        sysPrompt,
+        isResume,
+    });
     const agyResumeReplayPrefix = cli === 'agy' && isResume
         ? getLatestAssistantContentForAgyResume(settings["workingDir"])
         : null;
@@ -949,6 +935,7 @@ export function spawnAgent(prompt, opts = {}) {
             historyBlock,
             workingDir: spawnCwd,
             sessionId: resumeSessionId,
+            order: resolveAgyPromptOrder(cfg.promptOrder),
             ...(sysPrompt ? { operationalContext: sysPrompt } : {}),
         });
         promptForArgs = agyBootstrap.prompt;
@@ -983,11 +970,6 @@ export function spawnAgent(prompt, opts = {}) {
         if (cli === 'claude-e')
             console.log(`[jaw:${agentLabel}:args] ${JSON.stringify(args)}`);
     }
-    if (cli === 'gemini' && sysPrompt) {
-        const tmpSysFile = join(os.tmpdir(), `jaw-gemini-sys-${agentLabel}.md`);
-        fs.writeFileSync(tmpSysFile, sysPrompt);
-        spawnEnv["GEMINI_SYSTEM_MD"] = tmpSysFile;
-    }
     // ─── Copilot ACP branch ──────────────────────
     if (cli === 'copilot') {
         // Write model + reasoning_effort to ~/.copilot/config.json (CLI flags unsupported)
@@ -1066,6 +1048,7 @@ export function spawnAgent(prompt, opts = {}) {
             hasClaudeStreamEvents: false, sessionId: null, cost: null,
             turns: null, duration: null, tokens: null, stderrBuf: '',
             thinkingBuf: '',
+            runStartedAt: Date.now(),
             liveScope: effectiveLiveScope,
             parentLiveScope: parentLiveScopeForChild,
             traceRunId,
@@ -1086,7 +1069,7 @@ export function spawnAgent(prompt, opts = {}) {
                 if (ctx.liveScope)
                     replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
                 appendParentLiveRunTool(ctx, tool);
-                broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag }, traceAudience);
+                emitAgentTool(ctx, agentLabel, tool, empTag);
             }
             ctx.thinkingBuf = '';
         }
@@ -1120,7 +1103,7 @@ export function spawnAgent(prompt, opts = {}) {
                     if (ctx.liveScope)
                         replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
                     appendParentLiveRunTool(ctx, parsedTool);
-                    broadcast('agent_tool', { agentId: agentLabel, ...parsedTool, ...empTag }, traceAudience);
+                    emitAgentTool(ctx, agentLabel, parsedTool, empTag);
                     // Reset heartbeat gate on actually visible broadcast (not 💭)
                     lastVisibleBroadcastTs = Date.now();
                     heartbeatSent = false;
@@ -1149,7 +1132,7 @@ export function spawnAgent(prompt, opts = {}) {
                 if (ctx.liveScope)
                     replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
                 appendParentLiveRunTool(ctx, parsed.tool);
-                broadcast('agent_tool', { agentId: agentLabel, ...parsed.tool, ...empTag }, traceAudience);
+                emitAgentTool(ctx, agentLabel, parsed.tool, empTag);
             }
         });
         // [P2-3.15] session/request_permission → audit record in toolLog
@@ -1164,7 +1147,7 @@ export function spawnAgent(prompt, opts = {}) {
                 if (ctx.liveScope)
                     replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
                 appendParentLiveRunTool(ctx, parsed.tool);
-                broadcast('agent_tool', { agentId: agentLabel, ...parsed.tool, ...empTag }, traceAudience);
+                emitAgentTool(ctx, agentLabel, parsed.tool, empTag);
             }
         });
         // stderr_activity → stderrBuf accumulation + conditional heartbeat
@@ -1180,12 +1163,10 @@ export function spawnAgent(prompt, opts = {}) {
                 heartbeatSent = true;
                 const elapsed = Math.round((Date.now() - lastVisibleBroadcastTs) / 1000);
                 console.log(`  ⏳ agent active (no visible event for ${elapsed}s)`);
-                broadcast('agent_tool', {
-                    agentId: agentLabel,
+                emitAgentTool(ctx, agentLabel, {
                     icon: '⏳',
                     label: 'working... (no visible progress)',
-                    ...empTag,
-                }, traceAudience);
+                }, empTag);
             }
         });
         // Run ACP flow
@@ -1322,6 +1303,7 @@ export function spawnAgent(prompt, opts = {}) {
             toolLog: [],
             seenToolKeys: new Set(),
             hasClaudeStreamEvents: false,
+            runStartedAt: Date.now(),
             sessionId: null,
             cost: null,
             turns: null,
@@ -1352,7 +1334,7 @@ export function spawnAgent(prompt, opts = {}) {
                 if (ctx.liveScope)
                     replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
                 appendParentLiveRunTool(ctx, tool);
-                broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag }, traceAudience);
+                emitAgentTool(ctx, agentLabel, tool, empTag);
             }
             ctx.thinkingBuf = '';
         }
@@ -1397,7 +1379,7 @@ export function spawnAgent(prompt, opts = {}) {
                     if (ctx.liveScope)
                         replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
                     appendParentLiveRunTool(ctx, tool);
-                    broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag }, traceAudience);
+                    emitAgentTool(ctx, agentLabel, tool, empTag);
                     return;
                 }
                 if (event.kind === 'session') {
@@ -1543,6 +1525,7 @@ export function spawnAgent(prompt, opts = {}) {
             hasClaudeStreamEvents: false, sessionId: null, cost: null,
             turns: null, duration: null, tokens: null, stderrBuf: '',
             thinkingBuf: '',
+            runStartedAt: Date.now(),
             liveScope: effectiveLiveScope,
             parentLiveScope: parentLiveScopeForChild,
             traceRunId,
@@ -1562,7 +1545,7 @@ export function spawnAgent(prompt, opts = {}) {
                 if (ctx.liveScope)
                     replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
                 appendParentLiveRunTool(ctx, tool);
-                broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag }, traceAudience);
+                emitAgentTool(ctx, agentLabel, tool, empTag);
             }
             ctx.thinkingBuf = '';
         }
@@ -1594,7 +1577,7 @@ export function spawnAgent(prompt, opts = {}) {
                     if (ctx.liveScope)
                         replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
                     appendParentLiveRunTool(ctx, parsedTool);
-                    broadcast('agent_tool', { agentId: agentLabel, ...parsedTool, ...empTag }, traceAudience);
+                    emitAgentTool(ctx, agentLabel, parsedTool, empTag);
                     lastVisibleBroadcastTs = Date.now();
                     heartbeatSent = false;
                 }
@@ -1630,12 +1613,10 @@ export function spawnAgent(prompt, opts = {}) {
                 heartbeatSent = true;
                 const elapsed = Math.round((Date.now() - lastVisibleBroadcastTs) / 1000);
                 console.log(`  ⏳ agent active (no visible event for ${elapsed}s)`);
-                broadcast('agent_tool', {
-                    agentId: agentLabel,
+                emitAgentTool(ctx, agentLabel, {
                     icon: '⏳',
                     label: 'working... (no visible progress)',
-                    ...empTag,
-                }, traceAudience);
+                }, empTag);
             }
         });
         let turnCompleted = false;
@@ -1760,7 +1741,7 @@ export function spawnAgent(prompt, opts = {}) {
         });
         return { child, promise: resultPromise };
     }
-    // ─── Standard CLI branch (claude/codex/gemini/opencode) ──────
+    // ─── Standard CLI branch (claude/codex/opencode) ──────
     // DIFF-B: Windows needs shell:true only when falling back to .cmd shims.
     const spawnCommand = cli === 'opencode' && process.platform !== 'win32'
         ? (resolvedOpencodeBinary || detected.path || cli)
@@ -1863,6 +1844,7 @@ export function spawnAgent(prompt, opts = {}) {
         toolLog: [],
         seenToolKeys: new Set(),
         hasClaudeStreamEvents: false,
+        runStartedAt: Date.now(),
         sessionId: (kiroPlainText && isResume && resumeSessionId) ? resumeSessionId : null,
         cost: null,
         turns: null,
@@ -1877,13 +1859,15 @@ export function spawnAgent(prompt, opts = {}) {
         parentLiveScope: parentLiveScopeForChild,
         traceRunId,
         traceAudience,
-        geminiResultSeen: false,
         ...(opencodeSpawnAudit ? { opencodeSpawnAudit: opencodeSpawnAudit } : {}),
         ...(agyResumeOffset > 0 ? { agyResumeOffset, agyBytesReceived: 0 } : {}),
         ...(cli === 'agy' ? {
+            agyTranscriptMode: 'not-started',
+            agyLastActivitySource: 'none',
             ...(agyBootstrap ? {
                 agyBootstrapSentinel: agyBootstrap.sentinel,
                 agyBootstrapHash: agyBootstrap.hash,
+                metadata: { agyPromptSpill: agyBootstrap.spill },
             } : {}),
             agyBootstrapAccepted: false,
             agyBootstrapAcceptanceMode: agyBootstrap ? 'pending' : 'not-applicable',
@@ -1891,7 +1875,6 @@ export function spawnAgent(prompt, opts = {}) {
         ...(kiroPlainText || cli === 'agy' || cli === 'pi' ? { liveOutputText: '' } : {}),
         ...(kiroPlainText ? { kiroLastVisibleAt: Date.now(), kiroHeartbeatSent: false } : {}),
     };
-    let geminiWatchdog = null;
     let agyClosing = false;
     const scheduleAgyQuietCompletion = () => {
         if (cli !== 'agy')
@@ -1942,6 +1925,12 @@ export function spawnAgent(prompt, opts = {}) {
     const stallWatchdog = attachWatchdog(child, agentLabel, (reason) => {
         console.log(`[jaw:watchdog] killing ${agentLabel} — ${reason}`);
         ctx.stallReason = reason;
+        if (cli === 'agy') {
+            ctx.agyTranscriptMode = classifyAgyTranscriptMode(ctx);
+            const agyWatchdogContext = formatAgyWatchdogContext(ctx);
+            ctx.stderrBuf = ctx.stderrBuf ? `${ctx.stderrBuf}\n${agyWatchdogContext}` : agyWatchdogContext;
+            pushTrace(ctx, agyWatchdogContext);
+        }
         if (child.pid) {
             killProcessTree(child.pid, 'SIGTERM');
             setTimeout(() => {
@@ -1964,12 +1953,12 @@ export function spawnAgent(prompt, opts = {}) {
             cli,
             empTag,
             traceAudience,
-            onEmit: (emitCtx, tool, label, _cliName, tag, audience) => {
+            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);
+                emitAgentTool(emitCtx, label, tool, tag);
                 scheduleAgyQuietCompletion();
             },
             onActivity: () => {
@@ -2001,6 +1990,9 @@ export function spawnAgent(prompt, opts = {}) {
             eventType: fieldString(asCliEventRecord(raw).type, '<no-type>'),
             raw,
         });
+        if (cli === 'grok' || (cli === 'ai-e' && ctx.effectiveProvider === 'grok')) {
+            ctx.stallWatchdog?.markProgress();
+        }
         // claude-e / ai-e Claude: intercept jaw_runtime events BEFORE discriminator
         if ((cli === 'claude-e' || cli === 'ai-e') && isJawRuntimeEvent(raw)) {
             const rtEvt = raw;
@@ -2036,16 +2028,6 @@ export function spawnAgent(prompt, opts = {}) {
         if (!ctx.sessionId)
             ctx.sessionId = extractSessionId(dispatchCli, event);
         extractFromEvent(dispatchCli, event, ctx, agentLabel, empTag);
-        // Gemini watchdog: AFTER extractFromEvent sets geminiResultSeen
-        if (dispatchCli === 'gemini' && ctx.geminiResultSeen && !geminiWatchdog) {
-            geminiWatchdog = setTimeout(() => {
-                console.warn(`[jaw:gemini-watchdog] ${agentLabel} — result seen but close not received after 10s, killing`);
-                try {
-                    child.kill('SIGTERM');
-                }
-                catch { /* already dead */ }
-            }, 10000);
-        }
         // Sub-agent wait: keep stall timer alive
         if (ctx.hasActiveSubAgent) {
             opts.lifecycle?.onActivity?.('heartbeat');
@@ -2072,15 +2054,14 @@ export function spawnAgent(prompt, opts = {}) {
         opts.lifecycle?.onActivity?.('stdout');
         lastOpencodeIoAt = Date.now();
         if (cli === 'agy') {
+            ctx.agyLastActivitySource = 'stdout';
             const rawText = agyUtf8.write(chunk);
             if (!rawText)
                 return;
+            ctx.stallWatchdog?.markProgress();
             // 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)
-                ctx.fullText += text.slice(0, 102_400 - ctx.fullText.length);
+            appendAgyFullText(ctx, text);
             if (!ctx.sessionId)
                 ctx.sessionId = extractAgyConversationId(ctx.fullText);
             if (ctx.agyResumeOffset && ctx.agyResumeOffset > 0) {
@@ -2100,6 +2081,12 @@ export function spawnAgent(prompt, opts = {}) {
                 scheduleAgyQuietCompletion();
                 return;
             }
+            if (shouldFreezeAgyLiveDisplay(ctx)) {
+                // Display frozen past AGY_LIVE_DISPLAY_MAX_CHARS; the close path
+                // promotes the full text into the live candidate (finalizeAgyFallbackText).
+                scheduleAgyQuietCompletion();
+                return;
+            }
             const visibleFullText = isResume
                 ? stripAgyResumeReplayPrefixes(ctx.fullText, agyResumeReplayPrefixes).text
                 : ctx.fullText;
@@ -2126,6 +2113,7 @@ export function spawnAgent(prompt, opts = {}) {
             const text = kiroUtf8.write(chunk);
             if (!text)
                 return;
+            ctx.stallWatchdog?.markProgress();
             appendTraceEvent({ runId: ctx.traceRunId, source: 'cli_raw', eventType: 'plain_text', raw: text });
             const events = processKiroStdoutChunk(ctx, text);
             if (events.length) {
@@ -2147,6 +2135,10 @@ export function spawnAgent(prompt, opts = {}) {
         clearAgyQuietCompletionTimer();
         lastOpencodeIoAt = Date.now();
         const text = chunk.toString().trim();
+        if (cli === 'agy')
+            ctx.agyLastActivitySource = 'stderr';
+        if ((kiroPlainText || cli === 'agy') && text)
+            ctx.stallWatchdog?.markProgress();
         appendTraceEvent({ runId: ctx.traceRunId, source: 'stderr', eventType: 'stderr', raw: text });
         console.error(`[jaw:stderr:${agentLabel}] ${text}`);
         if (ctx.stderrBuf.length < 4000)
@@ -2157,10 +2149,6 @@ export function spawnAgent(prompt, opts = {}) {
         clearOpencodeIdleTimer();
         clearAgyQuietCompletionTimer();
         stallWatchdog.stop();
-        if (geminiWatchdog) {
-            clearTimeout(geminiWatchdog);
-            geminiWatchdog = null;
-        }
         if (stdSettled)
             return; // error handler already resolved
         // [I1] Flush residual NDJSON buffer — last event may lack trailing newline
@@ -2174,7 +2162,7 @@ export function spawnAgent(prompt, opts = {}) {
         if (agyUtf8) {
             const remaining = agyUtf8.end();
             if (remaining)
-                ctx.fullText += remaining;
+                appendAgyFullText(ctx, remaining);
         }
         if (kiroUtf8) {
             const remaining = kiroUtf8.end();
@@ -2215,6 +2203,9 @@ export function spawnAgent(prompt, opts = {}) {
         }
         agyClosing = true;
         agyTranscriptWatcher?.stop();
+        if (cli === 'agy') {
+            ctx.agyTranscriptMode = classifyAgyTranscriptMode(ctx);
+        }
         if (cli === 'agy' && isResume && isAgyStaleSessionOutput(ctx.fullText)) {
             console.log(`[jaw:agy] stale session detected (Warning: conversation not found) — clearing bucket`);
             try {
@@ -2321,6 +2312,20 @@ export function spawnAgent(prompt, opts = {}) {
         const agyTranscriptErrorMessage = cli === 'agy' && !agyTimedOut
             ? resolveAgyEmptyCloseError(ctx)
             : null;
+        if (cli === 'agy' && !agyTimedOut && !agyTranscriptErrorMessage) {
+            // Mirror the per-chunk display derivation ORDER (replay → echo → tracker →
+            // normalize). The close-path strips above run echo-before-replay and can
+            // leave a prompt echo in resumed output; every strip is a prefix-stripper
+            // that no-ops when the prefix is already gone, so re-running them in
+            // per-chunk order is idempotent and safe.
+            const promotedBase = isResume
+                ? stripAgyResumeReplayPrefixes(ctx.fullText, agyResumeReplayPrefixes).text
+                : ctx.fullText;
+            const promotedEcho = stripAgyPromptEchoPrefix(promotedBase, promptForArgs).text;
+            finalizeAgyFallbackText(ctx, normalizeAssistantDisplayText(stripInterviewTracker(promotedEcho)));
+        }
+        if (cli === 'agy')
+            pushTrace(ctx, describeAgyFinalSource(ctx));
         const effectiveExitCode = agyCompletedByQuietOutput && !agyTranscriptErrorMessage
             ? 0
             : agyTranscriptErrorMessage