cli-jaw 2.17.44 → 2.17.45

package/dist/src/agent/spawn.js

@@ -18,7 +18,6 @@ import { publish as ssePublish } from '../core/event-bus.js';
 // exists precisely to guarantee the caller hears something.
 import { settleOnce } from '../orchestrator/request-registry.js';
 import { settings, UPLOADS_DIR, detectCli, getProjectDirs } 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, migrateQueuedMessagesV1ToV2, getSessionBucket, clearSessionBucket, setSessionBucketSnapshot, getMaxMessageId, getSteerSalvageAfter, } from '../core/db.js';
 import { buildTaskSnapshot } from '../memory/runtime.js';
@@ -66,8 +65,7 @@ import { clearNativeStartFailure, nativeStartFailure, recordNativeStartFailure }
 import { asCliEventRecord, discriminate, fieldString } from '../types/cli-events.js';
 import { isRemoteTarget } from '../messaging/types.js';
 import { buildRemoteBindingKey } from '../messaging/session-key.js';
-import { isJawRuntimeEvent, handleJawRuntimeEvent } from './claude-e-runtime.js';
-import { isRetiredCliSelection, RETIRED_RUNTIME_DIAGNOSTIC } from '../types/cli-engine.js';
+import { isRetiredCliSelection, retiredRuntimeDiagnostic } from '../types/cli-engine.js';
 import { runBeforeSpawnChecks } from '../core/policy-hooks.js';
 import { appendTraceEvent, createTraceId, finalizeTraceRun, stampTraceTool, startTraceRun, updateTraceToolRow } from '../trace/store.js';
 import { AGY_COMPLETE_KILL_REASON, appendAgyFullText, classifyAgyTranscriptMode, describeAgyFinalSource, extractAgyConversationId, finalizeAgyFallbackText, AGY_PLANNER_ONLY_NOTICE, isAgyIntermediatePlannerText, formatAgyWatchdogContext, resolveAgyEmptyCloseError, formatAgyTimeoutMessage, getAgyQuietCompletionDelayMs, isAgyStaleSessionOutput, normalizeAgyCloseText, shouldFreezeAgyLiveDisplay, stripAgyPromptEchoPrefix, stripAgyResumeReplayPrefix, stripAgyResumeReplayPrefixes, } from './agy-runtime.js';
@@ -75,7 +73,7 @@ import { detectAgyCapabilities } from './agy-capabilities.js';
 import { buildAgyBootstrapEnvelope, resolveAgyPromptOrder, } from './agy-bootstrap.js';
 import { startAgyTranscriptWatcher } from './agy-transcript-watcher.js';
 import { appendAssistantRawText, appendAssistantTextSegment, emitAgentTool, normalizeAssistantDisplayText, pushTrace, streamJsonMarksProgress } from './events/helpers.js';
-import { captureKiroSessionIdAfterExit, finalizeKiroFullText, flushKiroStdoutContext, isKiroPlainTextCli, isKiroStaleSessionOutput, parseAiESessionIdFromStderr, processKiroStdoutChunk, spawnWithKiroSnapshot, } from './kiro-runtime.js';
+import { captureKiroSessionIdAfterExit, finalizeKiroFullText, flushKiroStdoutContext, isKiroPlainTextCli, isKiroStaleSessionOutput, processKiroStdoutChunk, spawnWithKiroSnapshot, } from './kiro-runtime.js';
 import { resolveCursorModelVariant } from './cursor-runtime.js';
 import { normalizePiSettings, spawnPiRpc } from './pi-runtime.js';
 import * as piExecutionControls from './pi-runtime.js';
@@ -175,25 +173,6 @@ export function releaseMainRun(scopeKey, child, ownerGeneration) {
     activeMainProcesses.delete(scopeKey);
     return true;
 }
-export function buildAiERuntimeStatusMeta(cli, provider, model) {
-    if (cli !== 'ai-e')
-        return {};
-    const mode = 'pty';
-    return {
-        selector: 'ai-e',
-        provider,
-        effectiveProvider: provider,
-        model,
-        mode,
-        runtime: {
-            cli,
-            selector: 'ai-e',
-            provider,
-            model,
-            mode,
-        },
-    };
-}
 import { hasChildExited, killProcessTree, killProcessTreeIfAlive, ownProcess } from './spawn/process-kill.js';
 import { releaseChildOutputAfterExit } from './spawn/exit-drain.js';
 import { clampPendingLine } from './spawn/line-buffer.js';
@@ -369,8 +348,6 @@ const killReasons = new Map();
  *  case where the exit handler has not finished writing (#523). */
 const DEFAULT_STEER_WAIT_MS = 10_000;
 const DEFAULT_KILL_ESCALATION_MS = 2_000;
-const CLAUDE_E_STEER_WAIT_MS = 30_000;
-const CLAUDE_E_STEER_KILL_ESCALATION_MS = 8_000;
 const DEFAULT_CODEX_APP_TURN_IDLE_MS = 300_000;
 const DEFAULT_CODEX_APP_TURN_ABS_MS = 2 * 60 * 60_000;
 const DEFAULT_CODEX_APP_ACQUIRE_WAIT_MS = 60_000;
@@ -383,18 +360,11 @@ function getActiveMainCli(scopeKey) {
     const cli = activeMainProcesses.get(scopeKey)?.meta.cli;
     return typeof cli === 'string' ? cli : null;
 }
-function isActiveAiEPtyRuntime(scopeKey) {
-    const cli = getActiveMainCli(scopeKey);
-    return cli === 'claude-e' || cli === 'ai-e';
-}
-function getKillPolicy(scopeKey, reason) {
-    if (reason === 'steer' && isActiveAiEPtyRuntime(scopeKey)) {
-        return { signal: 'SIGINT', escalationMs: CLAUDE_E_STEER_KILL_ESCALATION_MS };
-    }
+function getKillPolicy(_scopeKey, _reason) {
     return { signal: 'SIGTERM', escalationMs: DEFAULT_KILL_ESCALATION_MS };
 }
-export function getSteerWaitMsForActiveAgent(scopeKey = 'default') {
-    return isActiveAiEPtyRuntime(scopeKey) ? CLAUDE_E_STEER_WAIT_MS : DEFAULT_STEER_WAIT_MS;
+export function getSteerWaitMsForActiveAgent(_scopeKey = 'default') {
+    return DEFAULT_STEER_WAIT_MS;
 }
 /** Get kill reason for a process (by PID), consuming it */
 function consumeKillReason(pid) {
@@ -652,8 +622,9 @@ export async function steerAgent(scopeKey, newPrompt, source, meta) {
     const chatSessionId = meta?.chatSessionId || run?.meta.chatSessionId || getActiveChatSession();
     // This is admission for NEW input, not the already admitted run's selection.
     // A watched settings change must not inject into or stop that run's lease.
-    if (isRetiredCliSelection(resolveMainCli(meta?.cli, settings, getSession()))) {
-        settleOnce(meta?.requestId, 'failed', { error: RETIRED_RUNTIME_DIAGNOSTIC,
+    const steerCli = resolveMainCli(meta?.cli, settings, getSession());
+    if (isRetiredCliSelection(steerCli)) {
+        settleOnce(meta?.requestId, 'failed', { error: retiredRuntimeDiagnostic(steerCli),
             scope: scopeKey, sessionId: chatSessionId });
         return 'retired';
     }
@@ -941,8 +912,8 @@ function getRecentAssistantContentsForAgyResume(workingDir, chatSessionId) {
         .filter((msg) => msg.role === 'assistant' && typeof msg.content === 'string' && msg.content.trim().length > 0)
         .map((msg) => String(msg.content || '').trim());
 }
-import { buildArgs, buildResumeArgs, formatAgyPrintTimeout, resolveAiEProvider, resolveScopedSessionBucket, resolveSessionBucket } from './args.js';
-export { buildArgs, buildResumeArgs, resolveAiEProvider, resolveSessionBucket };
+import { buildArgs, buildResumeArgs, formatAgyPrintTimeout, resolveScopedSessionBucket, resolveSessionBucket } from './args.js';
+export { buildArgs, buildResumeArgs, resolveSessionBucket };
 const warnedAgyCapabilityFallbacks = new Set();
 // ─── Upload wrapper ──────────────────────────────────
 export const saveUpload = (buffer, originalName, options) => _saveUpload(UPLOADS_DIR, Buffer.isBuffer(buffer) ? buffer : Buffer.from(buffer), originalName, options);
@@ -1046,10 +1017,11 @@ export function spawnAgent(prompt, opts = {}) {
     if (mainRun)
         mainRun.meta.cli = cli;
     if (isRetiredCliSelection(cli)) {
-        const message = `${RETIRED_RUNTIME_DIAGNOSTIC}: Select an available runtime before sending another request.`;
+        const diagnostic = retiredRuntimeDiagnostic(cli);
+        const message = `${diagnostic}: Select an available runtime before sending another request.`;
         const released = mainManaged && activeMainProcesses.get(scopeKey) === mainRun
             && releaseMainRun(scopeKey, null, ownerGeneration);
-        settleOnce(opts.requestId, 'failed', { error: RETIRED_RUNTIME_DIAGNOSTIC, text: message,
+        settleOnce(opts.requestId, 'failed', { error: diagnostic, text: message,
             scope: scopeKey, sessionId: chatSessionId });
         broadcast('agent_done', {
             text: message, error: true, origin, cli, scope: scopeKey, sessionId: chatSessionId,
@@ -1072,7 +1044,10 @@ export function spawnAgent(prompt, opts = {}) {
     // saved-session reads, bootstrap consumption, or worker isolation.
     const runtimeTransport = isSwitchableNativeCli(cli)
         ? resolveRuntimeTransport(settings['perCli']?.[cli]?.transport) : 'print';
-    const permissions = opts.permissions || settings['permissions'] || session.permissions || 'auto';
+    const selectedPermissions = opts.permissions || settings['permissions'] || session.permissions || 'auto';
+    const permissions = Array.isArray(selectedPermissions) ? [...selectedPermissions] : selectedPermissions;
+    const capturedPermissions = typeof permissions === 'string'
+        || (Array.isArray(permissions) && permissions.every(value => typeof value === 'string')) ? permissions : undefined;
     const unavailableNative = runtimeTransport === 'native'
         && (!isNativeAdapterImplemented(cli) || (isEmployee && !isNativeWorkerImplemented(cli)));
     const restrictiveNative = runtimeTransport === 'native' && (cli === 'cursor' || cli === 'grok') && permissions !== 'auto';
@@ -1116,6 +1091,7 @@ export function spawnAgent(prompt, opts = {}) {
         setCurrentMainMeta(scopeKey, stripUndefined({
             origin,
             cli,
+            permissions: capturedPermissions,
             target: opts.target,
             chatId: opts.chatId,
             requestId: opts.requestId,
@@ -1133,7 +1109,7 @@ export function spawnAgent(prompt, opts = {}) {
         const st = queueCtrl.fallbackStateForScope(scopeKey).get(cli);
         if (st?.fallbackCli && st.retriesLeft <= 0) {
             const fbAvail = detectCli(st.fallbackCli)?.available;
-            if (fbAvail) {
+            if (fbAvail && !isRetiredCliSelection(st.fallbackCli)) {
                 console.log(`[jaw:fallback] ${cli} retries exhausted → direct ${st.fallbackCli}`);
                 broadcast('agent_fallback', { from: cli, to: st.fallbackCli, reason: 'retries exhausted', ...empTag }, isEmployee ? 'internal' : 'public');
                 return spawnAgent(prompt, {
@@ -1149,16 +1125,8 @@ export function spawnAgent(prompt, opts = {}) {
     const ao = settings["activeOverrides"]?.[cli] || {};
     const requestedModel = opts.model || ao.model || cfg.model || 'default';
     const effort = opts.effort ?? ao.effort ?? cfg.effort ?? '';
-    const effectiveProvider = cli === 'ai-e'
-        ? resolveAiEProvider(typeof cfg.provider === 'string'
-            ? cfg.provider
-            : typeof ao.provider === 'string'
-                ? ao.provider
-                : undefined, requestedModel)
-        : cli;
-    const model = cli === 'ai-e' && effectiveProvider === 'claude'
-        ? migrateLegacyClaudeValue(requestedModel)
-        : requestedModel;
+    const effectiveProvider = cli;
+    const model = requestedModel;
     const runtimeModel = cli === 'cursor' && runtimeTransport !== 'native' ? resolveCursorModelVariant(model, effort)
         : cli === 'grok' && runtimeTransport === 'native' && model === 'default' ? 'grok-build' : model;
     const codexMultiplexMain = cli === 'codex-app' && mainManaged && !opts.agentId
@@ -1166,6 +1134,7 @@ export function spawnAgent(prompt, opts = {}) {
     if (mainManaged) {
         setCurrentMainMeta(scopeKey, stripUndefined({
             origin,
+            permissions: capturedPermissions,
             target: opts.target,
             chatId: opts.chatId,
             requestId: opts.requestId,
@@ -1194,7 +1163,7 @@ export function spawnAgent(prompt, opts = {}) {
     // than either. The default scope keeps the bare bucket name, so a session that existed
     // before this change continues the conversation it was already in.
     const currentBucket = runtimeSessionBucket(resolveScopedSessionBucket(cli, runtimeModel, effectiveProvider, scopeKey, effort, 'fallback', codexMultiplexMain), runtimeTransport);
-    const envDefaultsCli = cli === 'ai-e' ? effectiveProvider : cli;
+    const envDefaultsCli = cli;
     const cliEnv = applyCliEnvDefaults(envDefaultsCli, opts.env);
     const spawnEnv = makeCleanEnv(cliEnv);
     const bucketRow = currentBucket ? getSessionBucket.get(currentBucket) : null;
@@ -1218,13 +1187,12 @@ export function spawnAgent(prompt, opts = {}) {
     // AGY native resume can replay prior stdout and continue stale mid-turn planner
     // state. cli-jaw defaults to DB history; guarded native resume is explicit opt-in.
     const providerSupportsResume = cli !== 'agy'
-        ? !(cli === 'ai-e' && effectiveProvider !== 'claude' && effectiveProvider !== 'kiro' && effectiveProvider !== 'codex' && effectiveProvider !== 'grok')
+        ? true
         : agyResumeDecision.ok;
     const canResumeBucketSession = !bucketSessionId || shouldResumeBucketSession(cli, runtimeModel, bucketModel, resumeKey, bucketResumeKey, bucketUpdatedAt, Date.now(), effectiveProvider);
     const isResume = empSid
         ? true
         : (providerSupportsResume && !opts._skipResume && !forceNew && !!bucketSessionId && canResumeBucketSession);
-    const runtimeStatusMeta = buildAiERuntimeStatusMeta(cli, effectiveProvider, runtimeModel);
     // ─── Bootstrap compact 1-shot injection (Phase 52: bucket-aware) ───
     // Vendor-agnostic: compact handler reset session_id and stored bootstrap in DB.
     // Inject only on fresh main spawns (not employee/fallback/internal/resume).
@@ -1337,9 +1305,6 @@ export function spawnAgent(prompt, opts = {}) {
     const agyResumeReplayPrefixes = cli === 'agy' && isResume
         ? getRecentAssistantContentsForAgyResume(settings["workingDir"], chatSessionId)
         : [];
-    const claudeBin = (cli === 'claude-e' || (cli === 'ai-e' && effectiveProvider === 'claude'))
-        ? detectCli('claude').path
-        : null;
     const agyLogFile = cli === 'agy'
         ? join(os.tmpdir(), `jaw-agy-${agentId || 'main'}-${Date.now()}-${crypto.randomUUID()}.log`)
         : null;
@@ -1365,8 +1330,6 @@ export function spawnAgent(prompt, opts = {}) {
         sysPrompt,
         includeDirectories,
         workingDir: settings["workingDir"],
-        aiEProvider: effectiveProvider,
-        ...(claudeBin ? { claudeBin } : {}),
         ...(agyLogFile ? { agyLogFile } : {}),
         ...(agyPrintTimeout ? { agyPrintTimeout } : {}),
         ...(agyCapabilities ? { agyCapabilities } : {}),
@@ -1496,8 +1459,6 @@ export function spawnAgent(prompt, opts = {}) {
     }
     else {
         console.log(`[jaw:${agentLabel}] Spawning: ${cli} ${args.join(' ').slice(0, 120)}...`);
-        if (cli === 'claude-e')
-            console.log(`[jaw:${agentLabel}:args] ${JSON.stringify(args)}`);
     }
     // ─── Native Claude: provider adaptation uses the shared host/lifecycle. ───
     if (runtimeTransport === 'native' && cli === 'claude') {
@@ -3408,7 +3369,7 @@ export function spawnAgent(prompt, opts = {}) {
     else
         registerActiveProcess(agentLabel, child);
     if (!opts.internal)
-        broadcast('agent_status', { running: true, agentId: agentLabel, cli, ...runtimeStatusMeta, ...empTag });
+        broadcast('agent_status', { running: true, agentId: agentLabel, cli, ...empTag });
     if (mainManaged && !opts.internal)
         beginLiveRun(liveScope, cli);
     // The turn settles on 'close', which waits for every stdio stream to close.
@@ -3471,9 +3432,6 @@ export function spawnAgent(prompt, opts = {}) {
     if (cli === 'claude') {
         child.stdin.write(withSteerContext(isResume ? prompt : withHistoryPrompt(prompt, historyBlock), opts.steerContext));
     }
-    else if (cli === 'claude-e' || (cli === 'ai-e' && effectiveProvider === 'claude')) {
-        child.stdin.write(withSteerContext(isResume ? prompt : withHistoryPrompt(prompt, historyBlock), opts.steerContext));
-    }
     else if (cli === 'codex' && !isResume) {
         const codexStdin = historyBlock
             ? `${historyBlock}\n\n[User Message]\n${prompt}`
@@ -3487,7 +3445,7 @@ export function spawnAgent(prompt, opts = {}) {
     }
     child.stdin.end();
     if (!opts.internal)
-        broadcast('agent_status', { status: 'running', cli, agentId: agentLabel, ...runtimeStatusMeta, ...empTag }, traceAudience);
+        broadcast('agent_status', { status: 'running', cli, agentId: agentLabel, ...empTag }, traceAudience);
     const traceRunId = startTraceRun({ cli, model: runtimeModel, workingDir: settings["workingDir"] || null, agentLabel, audience: traceAudience, sessionId: chatSessionId, scopeKey });
     if (mainManaged && !opts.internal)
         setLiveRunTraceId(liveScope, traceRunId);
@@ -3652,26 +3610,7 @@ export function spawnAgent(prompt, opts = {}) {
         if (streamJsonMarksProgress(cli, ctx.effectiveProvider)) {
             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;
-            handleJawRuntimeEvent(rtEvt, agentLabel);
-            // Extract sessionId from session_started or interrupted
-            const evtName = rtEvt['event'];
-            if ((evtName === 'session_started' || evtName === 'interrupted') && typeof rtEvt['sessionId'] === 'string') {
-                ctx.sessionId = rtEvt['sessionId'];
-            }
-            if (evtName === 'error' && typeof rtEvt['message'] === 'string') {
-                const message = `[jaw:${cli}:error] ${rtEvt['message']}`;
-                if (ctx.stderrBuf.length < 4000)
-                    ctx.stderrBuf = ctx.stderrBuf ? `${ctx.stderrBuf}\n${message}` : message;
-                pushTrace(ctx, message);
-            }
-            return;
-        }
-        const dispatchCli = cli === 'ai-e'
-            ? (ctx.effectiveProvider === 'claude' ? 'claude-e' : (ctx.effectiveProvider || 'ai-e'))
-            : cli;
+        const dispatchCli = cli;
         const event = discriminate(dispatchCli, raw);
         if (!event) {
             const type = fieldString(asCliEventRecord(raw).type, '<no-type>');
@@ -3969,14 +3908,6 @@ export function spawnAgent(prompt, opts = {}) {
             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)}...`);
-            }
-        }
         let agyCloseTimedOut = false;
         let agyTimeoutMessage = '';
         if (cli === 'agy') {