cli-jaw 2.17.72 → 2.17.73

package/dist/src/agent/spawn/backend-aside.js

@@ -0,0 +1,314 @@
+import { randomUUID } from 'node:crypto';
+import { readAsideCatalog, resolveAsideSelection, AsideCatalogError } from '../aside-catalog.js';
+import { startAsideRun } from '../aside-runtime.js';
+import { broadcast } from '../../core/bus.js';
+import { getSessionBucket, clearSessionBucket, insertMessage } from '../../core/db.js';
+import { consumePendingBootstrapPrompt } from '../../core/main-session.js';
+import { stripSkillMentionBlock } from '../../core/skill-mentions.js';
+import { startTraceRun } from '../../trace/store.js';
+import { resolveScopedSessionBucket } from '../args.js';
+import { buildAsideResumeKey } from '../spawn-env.js';
+import { buildPromptForArgs, PROMPT_HISTORY_MAX_CHARS, PROMPT_HISTORY_MAX_ROWS } from '../prompt-context.js';
+import { shouldResumeBucketSession } from './resume.js';
+import { beginLiveRun, setLiveRunTraceId, getLiveRun, clearLiveRun } from '../live-run-state.js';
+import { isCurrentSessionOwner } from '../session-persistence.js';
+import { handleAgentExit } from '../lifecycle-handler.js';
+import { handoffRuntimeOutcome } from '../runtime/outcome.js';
+import { createPrintActivity, finishPrintActivity } from '../runtime/print-activity.js';
+import { captureExitSettler, settleCapturedExit } from './exit-settle.js';
+import { isLifecycleSteerReason } from './kill-reason.js';
+import { FALLBACK_MAX_RETRIES } from './queue.js';
+import { settleOnce } from '../../orchestrator/request-registry.js';
+/** Admission is deliberately before bootstrap, isolation, generic argv or NDJSON. */
+export function asideAdmissionError(mainManaged, opts, policy, origin) {
+    if (!mainManaged || opts.agentId || opts.employeeSessionId || opts.internal || opts.forceNew)
+        return 'aside_main_only';
+    if (origin === 'heartbeat')
+        return 'aside_scheduled_unsupported';
+    if (opts._isFallback || opts._retryAttempt !== undefined || opts._isSmokeContinuation || opts._isGoalContinuation
+        || opts._isCapacityFallback || opts._employeeFreshSessionRetry)
+        return 'aside_automatic_retry_unsupported';
+    if (opts.images?.length)
+        return 'aside_images_unsupported';
+    if (policy !== 'auto' && policy !== 'safe')
+        return 'aside_policy_unsupported';
+    return null;
+}
+/** Dedicated CLI backend; the runtime, rather than a process exit event, selects finality. */
+export function runAsideBackend(locals, host) {
+    const { mainRun: run, scopeKey, chatSessionId, ownerGeneration, persistenceOwner, origin, runPin } = locals;
+    if (!run)
+        throw new Error('aside_main_owner_required');
+    // Every execution selector is copied before the catalog's first await.
+    const context = { ...locals.context };
+    const cwd = locals.spawnCwd || process.cwd();
+    const policy = locals.policy;
+    const opts = { ...locals.opts };
+    const env = { ...locals.spawnEnv };
+    const model = locals.model || 'default', effort = locals.effort || 'default';
+    const sysPrompt = locals.sysPrompt;
+    const originalPrompt = locals.prompt;
+    // Generation fences session mutations, not control of captured commands.
+    const controlsRun = () => host.activeMainProcesses.get(scopeKey) === run;
+    const owned = () => controlsRun()
+        && run.ownerGeneration === ownerGeneration && isCurrentSessionOwner(persistenceOwner, scopeKey);
+    let child = null;
+    let childClosed = true;
+    let handle;
+    let cancelled = false, reason = null, sealed = false;
+    let uncertain = false;
+    let exitArm;
+    const cancel = (cause) => {
+        if (sealed || cancelled)
+            return;
+        cancelled = true;
+        reason = cause;
+        exitArm = captureExitSettler(scopeKey);
+        // Runtime cancellation latches synchronously, including before its session receipt.
+        if (handle)
+            void handle.cancel().catch(() => { });
+    };
+    run.starting = true;
+    run.cancelTurn = cancel;
+    void (async () => {
+        let ctx;
+        const retireCapturedRun = () => {
+            if (!controlsRun() || !childClosed || (handle && !handle.commandsClosed()))
+                return false;
+            // Identity above prevents releasing a replacement, including process=null.
+            // The same captured run may have had its generation invalidated in place.
+            const released = host.releaseMainRun(scopeKey, child, run.ownerGeneration);
+            if (released && ctx?.traceRunId && getLiveRun(scopeKey).traceRunId === ctx.traceRunId)
+                clearLiveRun(scopeKey);
+            return released;
+        };
+        let bucket = '', resumeKey = null, selectedModel = model, selectedEffort = '';
+        let isResume = false;
+        let result;
+        try {
+            const catalog = await readAsideCatalog(context);
+            const selection = resolveAsideSelection(catalog, model, effort);
+            selectedModel = selection.model;
+            selectedEffort = selection.effort || '';
+            resumeKey = buildAsideResumeKey(selection, cwd, policy);
+            bucket = resolveScopedSessionBucket('aside', selectedModel, 'aside', scopeKey, selectedEffort, 'fallback', false);
+            const row = getSessionBucket.get(bucket);
+            isResume = !opts._skipResume && !!row?.session_id
+                && shouldResumeBucketSession('aside', selectedModel, row.model, resumeKey, row.resume_key);
+            if (!owned() || !isCurrentSessionOwner(persistenceOwner, scopeKey))
+                cancelled = true;
+            if (cancelled) {
+                result = { status: 'stopped', finalText: null, partialText: '', sessionId: null, reusable: false, exitCode: null, cleanup: 'confirmed' };
+            }
+            else {
+                run.meta.model = selectedModel;
+                run.meta.effectiveProvider = 'aside';
+                const bootstrap = isResume ? '' : consumePendingBootstrapPrompt(scopeKey);
+                const prompt = bootstrap ? `${bootstrap}\n\n---\n\n${originalPrompt}` : originalPrompt;
+                const history = !isResume && !opts._skipHistory
+                    ? host.buildHistoryBlock(originalPrompt, cwd, chatSessionId, PROMPT_HISTORY_MAX_ROWS, PROMPT_HISTORY_MAX_CHARS) : '';
+                const fullPrompt = buildPromptForArgs({ cli: 'aside', effectiveProvider: 'aside', prompt: `[Workspace Context]\nProject root: ${cwd}\n${opts.workspaceContext || ''}\n\n${prompt}`,
+                    historyBlock: history, sysPrompt, isResume });
+                if (!opts._skipInsert)
+                    insertMessage.run('user', stripSkillMentionBlock(originalPrompt), 'aside', selectedModel, cwd, chatSessionId);
+                // Journal failure cannot change execution or select an empty/error final.
+                let traceRunId = `tr_aside_${randomUUID()}`;
+                try {
+                    traceRunId = startTraceRun({ cli: 'aside', model: selectedModel, workingDir: cwd,
+                        agentLabel: 'main', audience: 'public', sessionId: chatSessionId, scopeKey });
+                }
+                catch {
+                    console.warn('[aside] trace admission unavailable');
+                }
+                try {
+                    beginLiveRun(scopeKey, 'aside');
+                    setLiveRunTraceId(scopeKey, traceRunId);
+                }
+                catch {
+                    console.warn('[aside] live projection unavailable');
+                }
+                const capturedCtx = { fullText: '', traceLog: [], toolLog: [], seenToolKeys: new Set(),
+                    hasClaudeStreamEvents: false, sessionId: null, stderrBuf: '',
+                    cost: null, turns: null, duration: null, tokens: null, runStartedAt: Date.now(),
+                    liveScope: scopeKey, traceRunId, traceAudience: 'public', origin,
+                    activityIdentity: { sessionId: chatSessionId, scope: scopeKey },
+                    ...(opts.requestId ? { requestId: opts.requestId } : {}) };
+                ctx = capturedCtx;
+                try {
+                    capturedCtx.printActivity = createPrintActivity({ runId: traceRunId, sessionId: chatSessionId,
+                        scope: scopeKey, turnId: traceRunId, audience: 'public' }, 'aside');
+                }
+                catch {
+                    console.warn('[aside] Activity projection unavailable');
+                }
+                try {
+                    broadcast('agent_status', { running: true, cli: 'aside', agentId: 'main', scope: scopeKey });
+                }
+                catch {
+                    console.warn('[aside] status observer failed');
+                }
+                handle = startAsideRun({ binary: locals.binary, cwd, env,
+                    selection, permission: policy === 'safe' ? 'guard' : 'full-access', prompt: fullPrompt,
+                    ...(isResume && row?.session_id ? { sessionId: row.session_id } : {}) }, {
+                    onChild(proc) {
+                        if (sealed)
+                            return;
+                        child = proc;
+                        childClosed = false;
+                        proc.once('close', () => { childClosed = true; host.consumeKillReason(proc.pid); });
+                        if (controlsRun()) {
+                            run.process = proc;
+                            run.starting = false;
+                        }
+                    },
+                    onSession(id) { if (!sealed)
+                        capturedCtx.sessionId = id; },
+                    onOutput(text) {
+                        if (sealed)
+                            return;
+                        // CLI output is bounded diagnostics, never an assistant final or tool proof.
+                        capturedCtx.stderrBuf = (capturedCtx.stderrBuf + text).slice(-4000);
+                        try {
+                            opts.lifecycle?.onActivity?.('aside');
+                        }
+                        catch { /* observer only */ }
+                    },
+                });
+                if (cancelled)
+                    void handle.cancel().catch(() => { });
+                result = await handle.result;
+            }
+        }
+        catch (error) {
+            // A rejected run promise has supplied no physical-close proof.
+            uncertain = handle !== undefined;
+            result = { status: cancelled ? 'stopped' : 'error', finalText: null, partialText: '',
+                sessionId: null, reusable: false, exitCode: null, cleanup: handle ? 'uncertain' : 'confirmed',
+                diagnostic: error instanceof AsideCatalogError ? error.message : 'Aside runtime preparation failed.' };
+        }
+        sealed = true;
+        uncertain = result.cleanup === 'uncertain';
+        if (uncertain && controlsRun()) {
+            run.starting = true;
+            const acknowledgementToken = randomUUID();
+            const recovery = 'aside_control_uncertain: reconcile the captured session in Aside, then POST /api/orchestrate/aside/reconcile with sessionId, acknowledgementToken and acknowledged:true. All captured local commands must close. Send fresh input afterward.';
+            result = { ...result, diagnostic: `${result.diagnostic || 'Aside cleanup is unresolved.'} Jaw chat ID: ${chatSessionId}. External Aside ID: ${result.sessionId || 'unavailable'} (account ${context.account}, local). Acknowledgement token: ${acknowledgementToken}. ${recovery}` };
+            // Repeated Stop closes captured commands without repeating external control.
+            run.cancelTurn = () => {
+                if (controlsRun() && handle)
+                    void handle.closeCommands().catch(() => { });
+            };
+            run.reconcileAside = token => {
+                if (token !== acknowledgementToken || !controlsRun() || !childClosed || (handle && !handle.commandsClosed()))
+                    return false;
+                host.queueCtrl.purgeQueueOnStop(scopeKey, 'aside-manual-reconciliation');
+                delete run.cancelTurn;
+                delete run.reconcileAside;
+                return retireCapturedRun();
+            };
+        }
+        try {
+            opts.lifecycle?.onExit?.(result.exitCode);
+        }
+        catch { /* observer only */ }
+        if (!owned()) {
+            // A captured terminal still settles its caller, but cannot mutate a newer
+            // session's MESSAGE history, flush counters, goal or persistence via lifecycle.
+            const outcome = cancelled ? { ...result, status: 'stopped', finalText: null } : result;
+            if (ctx) {
+                handoffRuntimeOutcome(ctx, outcome);
+                finishPrintActivity(ctx, { kind: 'turn-end', status: outcome.status, finalText: outcome.finalText });
+            }
+            settleOnce(opts.requestId, outcome.status === 'done' ? 'completed' : outcome.status === 'stopped' ? 'cancelled' : 'failed', {
+                text: outcome.finalText ?? '', scope: scopeKey, sessionId: chatSessionId,
+                runtimeStatus: outcome.status, runtimeFinality: outcome.finalText === null ? 'absent' : 'present'
+            });
+            locals.resolve({ text: outcome.finalText ?? '',
+                code: outcome.status === 'done' ? 0 : outcome.status === 'stopped' ? 130 : 1,
+                runtimeOutcome: outcome, ...(ctx?.traceRunId ? { traceRunId: ctx.traceRunId } : {}) });
+            if (run.cancelTurn === cancel)
+                delete run.cancelTurn;
+            if (!uncertain && retireCapturedRun() && !cancelled)
+                void host.processQueue(scopeKey);
+            settleCapturedExit(scopeKey, exitArm);
+            return;
+        }
+        if (!ctx) {
+            if (!uncertain)
+                retireCapturedRun();
+            const text = result.status === 'error' ? result.diagnostic || 'Aside unavailable.' : '';
+            settleOnce(opts.requestId, result.status === 'stopped' ? 'cancelled' : 'failed', {
+                text, scope: scopeKey, sessionId: chatSessionId
+            });
+            broadcast('agent_done', { ...runPin, cli: 'aside', text, error: result.status === 'error', runtimeStatus: result.status });
+            locals.resolve({ text, code: result.status === 'stopped' ? 130 : 78,
+                runtimeOutcome: result, executionInterrupted: result.status === 'stopped', executionFailed: result.status === 'error' });
+            if (run.cancelTurn === cancel && !uncertain)
+                delete run.cancelTurn;
+            if (!cancelled && !uncertain)
+                void host.processQueue(scopeKey);
+            settleCapturedExit(scopeKey, exitArm);
+            return;
+        }
+        // Failed/stopped sessions must not survive in their captured resumable bucket.
+        if ((cancelled || !result.reusable || uncertain) && owned() && isCurrentSessionOwner(persistenceOwner, scopeKey)) {
+            try {
+                clearSessionBucket.run(bucket);
+            }
+            catch {
+                console.warn('[aside] resumable bucket clear failed');
+            }
+        }
+        ctx.sessionId = !uncertain && !cancelled && result.reusable && result.status === 'done' ? result.sessionId : null;
+        ctx.metadata = { ...ctx.metadata, asideCleanup: result.cleanup };
+        if (result.diagnostic !== undefined)
+            ctx.runtimeDiagnostic = result.diagnostic;
+        handoffRuntimeOutcome(ctx, cancelled ? { status: 'stopped', finalText: null, partialText: result.partialText } : result);
+        const capturedRun = run;
+        try {
+            await handleAgentExit({ ctx, code: result.exitCode, cli: 'aside', model: selectedModel, effectiveProvider: 'aside',
+                resumeKey, workingDir: cwd, permissions: policy, agentLabel: 'main', mainManaged: true, origin, prompt: originalPrompt,
+                opts: { ...opts, _skipSessionPersist: opts._skipSessionPersist === true || !owned() || !result.reusable || cancelled || uncertain },
+                cfg: { effort: selectedEffort }, ownerGeneration, persistenceOwner, forceNew: false, empSid: null,
+                isResume, wasKilled: cancelled, wasSteer: isLifecycleSteerReason(reason), killReason: reason,
+                childExitCode: result.exitCode,
+                smokeResult: { isSmoke: false, confidence: 'low', matchedPattern: null, reason: '' },
+                effortDefault: '', costLine: '', resolve: locals.resolve, activeProcesses: host.activeProcesses,
+                scopeKey, chatSessionId, scopedBucket: bucket, runtimeTransport: 'print', childProcess: child,
+                releaseMainRun: (scope, proc, generation) => !uncertain && owned() && host.releaseMainRun(scope, proc, generation),
+                retryState: host.queueCtrl.retryStateForScope(scopeKey), fallbackState: host.queueCtrl.fallbackStateForScope(scopeKey),
+                fallbackMaxRetries: FALLBACK_MAX_RETRIES,
+                processQueue: scope => { if (!cancelled && !uncertain)
+                    void host.processQueue(scope); },
+                onRuntimeEnd: end => ctx?.printActivity?.finish(end) });
+        }
+        catch {
+            // Lifecycle/projection failures cannot replace the runtime's selected terminal.
+            const outcome = ctx.runtimeOutcome;
+            finishPrintActivity(ctx, { kind: 'turn-end', status: outcome.status, finalText: outcome.finalText });
+            if (!ctx.runtimeTerminalAttempted) {
+                ctx.runtimeTerminalAttempted = true;
+                try {
+                    broadcast('agent_done', { ...runPin, cli: 'aside', runtimeStatus: outcome.status,
+                        runtimeFinality: outcome.finalText === null ? 'absent' : 'present',
+                        text: outcome.finalText ?? '', error: outcome.status === 'error' });
+                }
+                catch { /* observer only */ }
+            }
+            locals.resolve({ text: outcome.finalText ?? '',
+                code: outcome.status === 'done' ? 0 : outcome.status === 'stopped' ? 130 : 1,
+                runtimeOutcome: outcome, ...(ctx.traceRunId ? { traceRunId: ctx.traceRunId } : {}) });
+        }
+        finally {
+            if (!uncertain) {
+                if (capturedRun.cancelTurn === cancel)
+                    delete capturedRun.cancelTurn;
+                if (retireCapturedRun() && !cancelled)
+                    void host.processQueue(scopeKey);
+            }
+            settleCapturedExit(scopeKey, exitArm);
+        }
+    })();
+    return { child: null, promise: locals.resultPromise };
+}
+//# sourceMappingURL=backend-aside.js.map

package/dist/src/agent/spawn/backend-aside.js.map

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

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

@@ -24,6 +24,9 @@ export function shouldResumeBucketSession(cli, requestedModel, bucketModel, requ
             return false;
         return normalizeModelForCli('kiro-code', requestedModel) === normalizeModelForCli('kiro-code', bucketModel);
     }
+    if (cli === 'aside')
+        return Boolean(requestedResumeKey) && requestedResumeKey === bucketResumeKey
+            && requestedModel === bucketModel;
     if (cli === 'opencode' && requestedResumeKey) {
         return requestedResumeKey === (bucketResumeKey ?? null);
     }

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":"AAAA,sFAAsF;AAEtF,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,wDAAwD;AACxD,kDAAkD;AAClD,iEAAiE;AACjE,yDAAyD;AACzD,MAAM,yBAAyB,GAAG,MAAM,CAAC;AAEzC,MAAM,UAAU,mBAAmB,CAC/B,aAAqB,EACrB,aAAsB,EACtB,SAAiB,yBAAyB,EAC1C,MAAc,IAAI,CAAC,GAAG,EAAE;IAExB,IAAI,aAAa;QAAE,OAAO,KAAK,CAAC;IAChC,OAAO,CAAC,GAAG,GAAG,aAAa,CAAC,GAAG,MAAM,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,yBAAyB,CACrC,GAAW,EACX,cAAsB,EACtB,WAAsC,EACtC,kBAAkC,EAClC,eAA+B,EAC/B,eAAwC,EACxC,QAAgB,IAAI,CAAC,GAAG,EAAE,EAC1B,kBAAkC;IAElC,IAAI,GAAG,KAAK,SAAS,IAAI,WAAW,EAAE,CAAC;QACnC,OAAO,oBAAoB,CAAC,GAAG,EAAE,cAAc,CAAC,KAAK,oBAAoB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAChG,CAAC;IACD,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;QACnB,IAAI,CAAC,WAAW;YAAE,OAAO,KAAK,CAAC;QAC/B,OAAO,oBAAoB,CAAC,GAAG,EAAE,cAAc,CAAC,KAAK,oBAAoB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAChG,CAAC;IACD,IAAI,GAAG,KAAK,WAAW,EAAE,CAAC;QACtB,IAAI,CAAC,WAAW;YAAE,OAAO,KAAK,CAAC;QAC/B,OAAO,oBAAoB,CAAC,WAAW,EAAE,cAAc,CAAC,KAAK,oBAAoB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IAChH,CAAC;IACD,IAAI,GAAG,KAAK,OAAO;QAAE,OAAO,OAAO,CAAC,kBAAkB,CAAC,IAAI,kBAAkB,KAAK,eAAe;eAC1F,cAAc,KAAK,WAAW,CAAC;IACtC,IAAI,GAAG,KAAK,UAAU,IAAI,kBAAkB,EAAE,CAAC;QAC3C,OAAO,kBAAkB,KAAK,CAAC,eAAe,IAAI,IAAI,CAAC,CAAC;IAC5D,CAAC;IACD,IAAI,GAAG,KAAK,KAAK,EAAE,CAAC;QAChB,IAAI,CAAC,WAAW;YAAE,OAAO,KAAK,CAAC;QAC/B,IAAI,eAAe,CAAC,eAAe,EAAE,iBAAiB,EAAE,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAC7E,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAGrD,MAAM,UAAU,sBAAsB,CAAC,KAAc;IACjD,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;AACnD,CAAC;AAWD,MAAM,UAAU,mBAAmB,CAAC,KAA4B;IAC5D,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IACvE,IAAI,CAAC,KAAK,CAAC,qBAAqB;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,4BAA4B,EAAE,CAAC;IAC7F,IAAI,CAAC,KAAK,CAAC,SAAS;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC;IAC9E,IAAI,eAAe,CAAC,KAAK,CAAC,eAAe,EAAE,iBAAiB,EAAE,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;IACtI,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,oBAAoB,CAAC,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,KAAK,oBAAoB,CAAC,KAAK,EAAE,KAAK,CAAC,WAAW,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC/K,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,CAAC,GAAG;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;IACtG,IAAI,KAAK,CAAC,YAAY,KAAK,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC;IACjF,IAAI,CAAC,KAAK,CAAC,WAAW;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC;IAC9E,IAAI,IAA6B,CAAC;IAClC,IAAI,CAAC;QAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAA4B,CAAC;IAAC,CAAC;IACxE,MAAM,CAAC;QAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC;IAAC,CAAC;IAChE,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,KAAK;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;IAChF,IAAI,IAAI,CAAC,gBAAgB,CAAC,KAAK,KAAK;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC;IACtF,IAAI,KAAK,CAAC,cAAc;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAC1E,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;AAClD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gCAAgC,CAAC,GAAW,EAAE,KAAa;IACvE,IAAI,KAAK,IAAI,EAAE;QAAE,OAAO,KAAK,CAAC;IAC9B,OAAO,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,MAAM,CAAC;AACnE,CAAC;AAED,yFAAyF;AACzF,MAAM,UAAU,yBAAyB,CAAC,GAAW;IACjD,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,KAAK,CAAC;AAC7C,CAAC;AAGD,SAAS,oBAAoB,CAAC,KAAyC;IACnE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACtD,OAAO,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;IACzD,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACxC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IACpF,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AACnD,CAAC;AAED,SAAS,eAAe,CAAC,KAAyC,EAAE,KAAa,EAAE,KAAa;IAC5F,MAAM,WAAW,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,WAAW,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACtC,OAAO,KAAK,GAAG,WAAW,GAAG,KAAK,CAAC;AACvC,CAAC"}

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

@@ -165,4 +165,9 @@ export function ensureOpencodeAlwaysAllowPermissions(configPath = join(os.homedi
         console.warn('[jaw:opencode] permission sync failed:', error.message);
     }
 }
+/** Full concrete identity; changing any selector starts a fresh Aside session. */
+export function buildAsideResumeKey(selection, cwd, policy) {
+    return JSON.stringify(['aside-v1', selection.account, selection.host, selection.provider,
+        selection.modelId, selection.effort, cwd, policy]);
+}
 //# sourceMappingURL=spawn-env.js.map

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

@@ -70,6 +70,7 @@ import { resolveCursorModelVariant } from './cursor-runtime.js';
 import * as piExecutionControls from './pi-runtime.js';
 import { runNativeAcpBackend } from './spawn/backend-native-acp.js';
 import { runCopilotBackend } from './spawn/backend-copilot.js';
+import { runAsideBackend, asideAdmissionError } from './spawn/backend-aside.js';
 import { runPiBackend } from './spawn/backend-pi.js';
 import { runCodexAppBackend } from './spawn/backend-codex-app.js';
 // ─── State ───────────────────────────────────────────
@@ -469,14 +470,14 @@ export function killActiveAgent(scopeKeyOrReason = 'user', scopedReason) {
         settleOnce(run?.meta?.requestId, 'cancelled', { reason });
         clearWorkerSlotsOnStop(scopeKey, reason);
     }
-    if (run?.cancelTurn && ['codex-app', 'pi', 'cursor', 'grok', 'claude'].includes(getActiveMainCli(scopeKey) || '')) {
+    if (run?.cancelTurn && ['codex-app', 'pi', 'cursor', 'grok', 'claude', 'aside'].includes(getActiveMainCli(scopeKey) || '')) {
         if (run.process?.pid)
             killReasons.set(run.process.pid, reason);
         console.log(`[jaw:kill] reason=${reason} scope=${scopeKey} cli=${getActiveMainCli(scopeKey)} action=lease.cancel`);
         if (isLifecycleExitSettleReason(reason))
             armExitSettle(scopeKey);
         run.cancelTurn(reason);
-        if (isImmediateScopeReleaseReason(reason))
+        if (getActiveMainCli(scopeKey) !== 'aside' && isImmediateScopeReleaseReason(reason))
             activeMainProcesses.delete(scopeKey);
         return true;
     }
@@ -616,11 +617,18 @@ export function waitForAllProcessesEnd(timeoutMs = 2000) {
         const deadline = setTimeout(() => { clearInterval(check); resolve(); }, timeoutMs);
     });
 }
+/** Human acknowledgement after external reconciliation; retained owner verifies local close. */
+export function reconcileAsideScope(scopeKey, chatSessionId, acknowledgementToken) {
+    const run = activeMainProcesses.get(scopeKey);
+    if (run?.meta.chatSessionId !== chatSessionId)
+        return false;
+    return run?.reconcileAside?.(acknowledgementToken) === true;
+}
 export function canSteerAgent(scopeKey) {
     const run = activeMainProcesses.get(scopeKey);
     // Route CLI steering through either the in-band hook or the native replacement hook.
     // Each owning hook decides whether the current turn can still accept the input.
-    return typeof run?.steerTurnInBand === 'function' || typeof run?.replaceTurn === 'function';
+    return run?.meta.cli === 'aside' || typeof run?.steerTurnInBand === 'function' || typeof run?.replaceTurn === 'function';
 }
 /** Native replacement owns a stricter mismatch contract than queue fallback:
  * malformed cross-conversation metadata must fail before it is persisted. */
@@ -638,6 +646,8 @@ export async function steerAgent(scopeKey, newPrompt, source, meta) {
             scope: scopeKey, sessionId: chatSessionId });
         return 'retired';
     }
+    if (run?.meta.cli === 'aside')
+        return 'fallback-queue';
     if (typeof run?.replaceTurn === 'function') {
         const capturedSessionOwner = getSessionOwnershipGeneration(scopeKey);
         const owner = run.meta;
@@ -1062,7 +1072,9 @@ export function spawnAgent(prompt, opts = {}) {
     // saved-session reads, bootstrap consumption, or worker isolation.
     const runtimeTransport = isSwitchableNativeCli(cli)
         ? resolveRuntimeTransport(settings['perCli']?.[cli]?.transport) : 'print';
-    const selectedPermissions = opts.permissions || settings['permissions'] || session.permissions || 'auto';
+    const selectedPermissions = cli === 'aside'
+        ? opts.permissions ?? settings['permissions'] ?? session.permissions ?? 'auto'
+        : 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;
@@ -1089,6 +1101,48 @@ export function spawnAgent(prompt, opts = {}) {
             void processQueue(scopeKey);
         return { child: null, promise: resultPromise };
     }
+    if (cli === 'aside') {
+        const admission = asideAdmissionError(mainManaged, opts, permissions, origin);
+        const cfg = { ...settings['perCli']?.aside };
+        const overrides = { ...settings['activeOverrides']?.aside };
+        const account = cfg.account, selectedHost = cfg.host;
+        const invalidContext = typeof account !== 'string' || !/^u(?:0|[1-9][0-9]{0,8})$/.test(account) || selectedHost !== 'local';
+        const diagnostic = admission || (invalidContext ? 'aside_explicit_local_account_required' : null);
+        if (diagnostic) {
+            if (activeMainProcesses.get(scopeKey) === mainRun)
+                releaseMainRun(scopeKey, null, ownerGeneration);
+            settleOnce(opts.requestId, 'failed', { error: diagnostic, scope: scopeKey, sessionId: chatSessionId });
+            broadcast('agent_done', { ...runPin, text: diagnostic, cli, error: true, ...empTag }, isEmployee ? 'internal' : 'public');
+            try {
+                opts.lifecycle?.onExit?.(78);
+            }
+            catch { /* observer only */ }
+            resolve({ text: diagnostic, code: 78 });
+            return { child: null, promise: resultPromise };
+        }
+        const cwd = settings['workingDir'] || process.cwd();
+        const detected = detectCli('aside');
+        const env = makeCleanEnv(applyCliEnvDefaults('aside', opts.env));
+        env[COMPUTER_USE_APPROVAL_ENV] = permissions === 'auto' ? 'auto' : 'safe';
+        const model = opts.model || overrides.model || cfg.model || 'default';
+        if (mainManaged) {
+            setCurrentMainMeta(scopeKey, stripUndefined({
+                origin, cli: 'aside', permissions: capturedPermissions, target: opts.target,
+                chatId: opts.chatId, requestId: opts.requestId, replyViaTarget: opts.replyViaTarget,
+                scopeId: scopeKey, chatSessionId,
+                ...(opts.remoteKey ? { remoteKey: opts.remoteKey } : {}),
+                model, effectiveProvider: 'aside',
+            }));
+        }
+        return runAsideBackend({ mainRun, scopeKey, chatSessionId, opts, origin, ownerGeneration,
+            persistenceOwner, runPin, prompt, resolve: value => resolve(value), resultPromise,
+            binary: detected.path || 'aside', context: { account, host: 'local' }, policy: permissions,
+            spawnCwd: cwd, spawnEnv: env, model,
+            effort: opts.effort || overrides.effort || cfg.effort || 'default',
+            sysPrompt: customSysPrompt !== undefined ? customSysPrompt : getSystemPrompt(stripUndefined({
+                currentPrompt: prompt, forDisk: false, memorySnapshot, activeCli: 'aside', freshSession: true
+            })) }, { activeMainProcesses, activeProcesses, buildHistoryBlock, releaseMainRun, queueCtrl, processQueue, consumeKillReason });
+    }
     // Ensure AGENTS.md on disk is fresh before CLI reads it
     // Skip for employee spawns — distribute.ts manages AGENTS.md isolation
     if (!opts.internal && !opts._isFallback && !opts.agentId)
@@ -1122,11 +1176,11 @@ export function spawnAgent(prompt, opts = {}) {
     // computation so we can use the authoritative per-bucket resume decision
     // instead of the legacy `isResumeGuess` heuristic. See comment near line 762.
     // ─── Fallback retry: skip to fallback if retries exhausted ───
-    if (runtimeTransport !== 'native' && !opts._isFallback && !opts.internal) {
+    if (cli !== 'aside' && runtimeTransport !== 'native' && !opts._isFallback && !opts.internal) {
         const st = queueCtrl.fallbackStateForScope(scopeKey).get(cli);
         if (st?.fallbackCli && st.retriesLeft <= 0) {
             const fbAvail = detectCli(st.fallbackCli)?.available;
-            if (fbAvail && !isRetiredCliSelection(st.fallbackCli)) {
+            if (fbAvail && st.fallbackCli !== 'aside' && !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, {