cli-jaw 2.2.15 → 2.2.17

package/dist/src/agent/jwc-runtime.js

@@ -45,7 +45,7 @@ function jwcAgentDir() {
         return override.trim();
     return join(homedir(), '.jwc', 'agent');
 }
-class JawRuntime {
+export class JawRuntime {
     #slot = null;
     #inFlight = null;
     /** Live-run scope of the turn in flight; the event subscription reads this so
@@ -64,7 +64,7 @@ class JawRuntime {
             await this.#slot.session.abort();
         }
     }
-    /** True while a turn is streaming or settling — feeds isAgentBusy(). */
+    /** True while a turn is streaming or settling — feeds scoped busy admission. */
     get busy() {
         return !!this.#inFlight || (this.#slot?.session.isStreaming ?? false);
     }
@@ -143,7 +143,7 @@ class JawRuntime {
         const slot = await this.#ensureSlot(cwd);
         // Track in-flight so busy() is true even on the idle followUp path (the
         // session may auto-continue from assistant-ended state). Without this,
-        // isAgentBusy() under-reports between dispatch and stream start.
+        // scoped busy admission under-reports between dispatch and stream start.
         const run = (async () => {
             await slot.session.prompt(text, { streamingBehavior: 'followUp' });
             return { text: '', code: 0 };
@@ -176,5 +176,13 @@ class JawRuntime {
         await this.#disposeSlot();
     }
 }
-export const jawRuntime = new JawRuntime();
+export const jawRuntimesByScope = new Map();
+export function runtimeForScope(scope) {
+    let runtime = jawRuntimesByScope.get(scope);
+    if (!runtime) {
+        runtime = new JawRuntime();
+        jawRuntimesByScope.set(scope, runtime);
+    }
+    return runtime;
+}
 //# sourceMappingURL=jwc-runtime.js.map

package/dist/src/agent/jwc-runtime.js.map

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

package/dist/src/agent/kiro-auth.js

@@ -171,10 +171,16 @@ function pickNewestKiroConversationId(cwd, conversationIds, updatedAfterMs, data
         catch { /* ignore */ }
     }
 }
-/**
- * After a **fresh** `--no-interactive` spawn, resolve the conversation id kiro-cli
- * created for this cwd. Prefer set-diff over "latest row" to avoid cross-dispatch races.
- */
+export function resolveKiroSpawnIdentity(cwd, beforeIds, updatedAfterMs = 0, dataPath = resolveKiroDataPath()) {
+    const afterIds = listKiroConversationIdsForCwd(cwd, dataPath);
+    const novel = [...afterIds].filter((id) => !beforeIds.has(id));
+    if (novel.length === 1 && novel[0])
+        return { kind: 'exact', id: novel[0] };
+    if (novel.length > 1)
+        return { kind: 'ambiguous', candidates: novel };
+    const stored = extractKiroSessionIdFromV2Store(cwd, updatedAfterMs, dataPath);
+    return stored ? { kind: 'exact', id: stored } : { kind: 'none' };
+}
 export function resolveKiroSessionIdAfterSpawn(cwd, beforeIds, updatedAfterMs = 0, dataPath = resolveKiroDataPath()) {
     const afterIds = listKiroConversationIdsForCwd(cwd, dataPath);
     const novel = [...afterIds].filter((id) => !beforeIds.has(id));

package/dist/src/agent/kiro-auth.js.map

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

package/dist/src/agent/kiro-runtime.js

@@ -1,6 +1,6 @@
 import os from 'node:os';
-import { extractKiroSessionIdFromV2Store, listKiroConversationIdsForCwd, resolveKiroDataPath, resolveKiroSessionIdAfterSpawn, } from './kiro-auth.js';
-export { listKiroConversationIdsForCwd, resolveKiroSessionIdAfterSpawn };
+import { extractKiroSessionIdFromV2Store, listKiroConversationIdsForCwd, resolveKiroDataPath, resolveKiroSessionIdAfterSpawn, resolveKiroSpawnIdentity, } from './kiro-auth.js';
+export { listKiroConversationIdsForCwd, resolveKiroSessionIdAfterSpawn, resolveKiroSpawnIdentity };
 const KIRO_SESSION_ID_STDOUT_RE = /Session\s+ID:\s*([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/i;
 const ANSI_RE = /\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g;
 const KIRO_RESPONSE_LINE_RE = /^>\s*(.*)\s*$/;
@@ -96,17 +96,27 @@ export function captureKiroSessionIdAfterExit(args) {
     const fromStderr = parseAiESessionIdFromStderr(args.stderr);
     if (fromStderr)
         return { id: fromStderr, source: 'stderr' };
+    // What this process told us beats what we inferred from a store other processes are
+    // writing to, so stdout moves ahead of the shared-store paths for the same reason
+    // stderr is already first.
+    const fromStdout = parseKiroSessionIdFromStdout(args.stdout);
+    if (fromStdout)
+        return { id: fromStdout, source: 'stdout' };
     if (args.beforeIds) {
-        const fromDiff = resolveKiroSessionIdAfterSpawn(args.cwd, args.beforeIds, args.spawnStartedAt);
-        if (fromDiff)
-            return { id: fromDiff, source: 'diff' };
+        const resolved = resolveKiroSpawnIdentity(args.cwd, args.beforeIds, args.spawnStartedAt);
+        if (resolved.kind === 'exact')
+            return { id: resolved.id, source: 'diff' };
+        // Ambiguity is terminal. Falling through would reach the store lookup below,
+        // which picks the most recently touched row — the same wrong id, one step later.
+        if (resolved.kind === 'ambiguous') {
+            console.warn(`[jaw:kiro] ${resolved.candidates.length} new conversations appeared for this directory; `
+                + 'refusing to guess which one belongs to this run');
+            return { id: null, source: null };
+        }
     }
     const fromStore = extractKiroSessionIdFromStore(args.cwd, args.spawnStartedAt);
     if (fromStore)
         return { id: fromStore, source: 'store' };
-    const fromStdout = parseKiroSessionIdFromStdout(args.stdout);
-    if (fromStdout)
-        return { id: fromStdout, source: 'stdout' };
     return { id: null, source: null };
 }
 export function parseAiESessionIdFromStderr(text) {
@@ -121,6 +131,33 @@ export function parseAiESessionIdFromStderr(text) {
 export function isKiroPlainTextCli(cli, effectiveProvider) {
     return cli === 'kiro-code' || (cli === 'ai-e' && effectiveProvider === 'kiro');
 }
+/**
+ * Snapshot the conversation store, then start the child — in that order, always.
+ *
+ * Kiro tells us nothing about which conversation a fresh run created, so the id is
+ * recovered by diffing this store against a snapshot. The snapshot used to be taken a
+ * few statements after the spawn, which opens a window: a concurrent run writes its row
+ * inside it, that row is missing from this run's "before" set, and at exit it is the one
+ * novel id. This run then saves the other run's conversation, and nothing downstream can
+ * tell the difference (073 §2.4, 110 ON-24).
+ *
+ * Keeping both halves here makes the ordering a property of the code rather than a rule
+ * someone has to remember at the call site.
+ */
+export function spawnWithKiroSnapshot(args) {
+    // Timestamp first, then snapshot, then spawn. The store fallback accepts rows updated
+    // after this mark, so it is a lower bound on "since this run began". Reading it after
+    // the snapshot would move it forward by however long the snapshot took, and any row a
+    // neighbouring run touched inside that gap would start qualifying.
+    const takeSnapshot = args.kiroPlainText && args.isFreshMainRun;
+    const kiroSpawnStartedAt = args.kiroPlainText ? Date.now() - 1000 : 0;
+    const kiroConversationIdsBefore = takeSnapshot
+        ? (args.dataPath
+            ? listKiroConversationIdsForCwd(args.cwd, args.dataPath)
+            : listKiroConversationIdsForCwd(args.cwd))
+        : null;
+    return { child: args.spawn(), kiroConversationIdsBefore, kiroSpawnStartedAt };
+}
 function nextKiroToolRef(ctx) {
     ctx.kiroToolSeq = (ctx.kiroToolSeq ?? 0) + 1;
     return `kiro:tool:${ctx.kiroToolSeq}`;

package/dist/src/agent/kiro-runtime.js.map

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

package/dist/src/agent/lifecycle-handler.js

@@ -1,6 +1,5 @@
 // ─── Agent Lifecycle Handler (post-exit logic) ──────
 // Extracted from spawn.ts to unify ACP + CLI exit handling.
-import fs from 'fs';
 import { broadcast } from '../core/bus.js';
 import { settings, detectCli } from '../core/config.js';
 import { clearEmployeeSession, insertMessage, insertMessageWithTraceRun, updateSession, clearSessionBucket, markAnchorConsumed, updateSessionBucketLastRun } from '../core/db.js';
@@ -150,10 +149,17 @@ function runTag(ctx) {
  * fallback recovery, output save, error classification, 429 retry, fallback.
  */
 export async function handleAgentExit(params) {
-    const { ctx, code, cli, model, agentLabel, mainManaged, origin, prompt, opts, cfg, ownerGeneration, forceNew, empSid, isResume, wasKilled, wasSteer, smokeResult, effortDefault, costLine, resolve, activeProcesses, setActiveProcess, retryState, fallbackState, fallbackMaxRetries, processQueue, } = params;
+    const { ctx, code, cli, model, agentLabel, mainManaged, origin, prompt, opts, cfg, ownerGeneration, persistenceOwner, forceNew, empSid, isResume, wasKilled, wasSteer, smokeResult, effortDefault, costLine, resolve, activeProcesses, scopeKey, chatSessionId, codexAppBucket, childProcess, releaseMainRun, retryState, fallbackState, fallbackMaxRetries, processQueue, } = params;
     const effectiveProvider = params.effectiveProvider;
     const runtimeCli = lifecycleRuntimeCli(cli, effectiveProvider);
     const effortVal = cfg.effort || effortDefault;
+    // Every runtime now has a bucket of its own keyed by scope (073 §2.1), so the guard
+    // 072 put here is gone: instead of refusing to touch shared state, each session
+    // touches only its own. The bucket comes from the run rather than being recomputed,
+    // because recomputing loses the scope.
+    const runBucket = params.scopedBucket
+        ?? params.codexAppBucket
+        ?? resolveSessionBucket(cli, model, effectiveProvider);
     const isEmployee = !mainManaged;
     const empTag = isEmployee ? { isEmployee: true } : {};
     const liveScope = ctx.liveScope || 'default';
@@ -174,17 +180,20 @@ export async function handleAgentExit(params) {
         const smokeSessionId = ctx.sessionId;
         if (smokeSessionId) {
             persistMainSession({
-                ownerGeneration, forceNew, employeeSessionId: empSid,
+                persistenceOwner, scopeKey, forceNew, employeeSessionId: empSid,
                 sessionId: smokeSessionId, isFallback: opts._isFallback === true,
                 code, cli, model, provider: effectiveProvider, resumeKey: params.resumeKey, effort: effortVal,
                 skipSessionPersist: opts._skipSessionPersist === true,
                 outputLen: params.outputLen,
+                ...(params.codexAppBucket ? { codexAppBucket: params.codexAppBucket } : {}),
+                scopedBucket: runBucket,
             });
             console.log(`[jaw:smoke] persisted session ${smokeSessionId.slice(0, 12)}... for continuation`);
         }
         activeProcesses.delete(agentLabel);
-        setActiveProcess(null);
-        broadcast('agent_status', { running: false, agentId: agentLabel, ...empTag });
+        if (releaseMainRun(scopeKey, childProcess, ownerGeneration)) {
+            broadcast('agent_status', { running: false, agentId: agentLabel, scope: scopeKey, ...empTag });
+        }
         finalizeTraceRun(ctx.traceRunId, 'done');
         const contPrompt = buildContinuationPrompt(prompt, ctx.fullText);
         const { promise: contPromise } = _spawnAgent(contPrompt, {
@@ -201,7 +210,7 @@ export async function handleAgentExit(params) {
                 sessionId: ctx.sessionId, cost: ctx.cost,
                 tools: ctx.toolLog, smoke: smokeResult,
             });
-            processQueue();
+            processQueue(scopeKey);
         });
         return;
     }
@@ -212,18 +221,19 @@ export async function handleAgentExit(params) {
     if (mainManaged) {
         if (!wasSteer) {
             activeProcesses.delete(agentLabel);
-            setActiveProcess(null);
-            _setCurrentMainMeta?.(null);
-            broadcast('agent_status', { running: false, agentId: agentLabel, ...empTag });
+            if (releaseMainRun(scopeKey, childProcess, ownerGeneration)) {
+                _setCurrentMainMeta?.(scopeKey, null);
+                broadcast('agent_status', { running: false, agentId: agentLabel, scope: scopeKey, ...empTag });
+            }
         }
     }
     else {
         activeProcesses.delete(agentLabel);
     }
-    // ─── Post-flush reindex (3-C) ───
-    if (agentLabel === 'memory-flush' && code === 0) {
-        postFlushReindex();
-    }
+    // Post-flush reindex moved into memory-flush-controller's completion path
+    // (032). Firing it here raced the append: this runs before the extractor
+    // promise resolves, so it reindexed a file that did not yet contain the
+    // entry — and a generation that had already expired could still trigger it.
     // ─── CLI-native compact → auto session refresh (awaited to avoid race with processQueue) ───
     if (ctx.cliNativeCompactDetected && mainManaged && !opts.internal) {
         console.log('[jaw:compact] CLI-native compaction detected — auto-refreshing session');
@@ -234,6 +244,9 @@ export async function handleAgentExit(params) {
                 instructions: prompt || '',
                 cli,
                 model,
+                scopeKey,
+                chatSessionId,
+                ...(codexAppBucket === undefined ? {} : { sessionBucket: codexAppBucket }),
             });
         }
         catch (e) {
@@ -243,11 +256,13 @@ export async function handleAgentExit(params) {
     // ─── Session persistence ───
     const persistedSessionId = ctx.sessionId;
     if (persistedSessionId && persistMainSession({
-        ownerGeneration, forceNew, employeeSessionId: empSid,
+        persistenceOwner, scopeKey, forceNew, employeeSessionId: empSid,
         sessionId: persistedSessionId, isFallback: opts._isFallback === true,
         code, wasKilled, cli, model, provider: effectiveProvider, resumeKey: params.resumeKey, effort: effortVal,
         skipSessionPersist: opts._skipSessionPersist === true,
         outputLen: params.outputLen,
+        ...(params.codexAppBucket ? { codexAppBucket: params.codexAppBucket } : {}),
+        scopedBucket: runBucket,
     })) {
         console.log(`[jaw:session] saved ${cli} session=${persistedSessionId.slice(0, 12)}...${wasKilled ? ' (post-kill)' : ''}`);
     }
@@ -255,7 +270,7 @@ export async function handleAgentExit(params) {
         const checkpointSeen = ctx.metadata?.['agyCheckpointSeen'] === true;
         const plannerOnly = ctx.metadata?.['agyPlannerOnly'] === true;
         const clean = code === 0 && !wasKilled && !ctx.stallReason && !plannerOnly && !checkpointSeen;
-        updateSessionBucketLastRun.run(clean ? 1 : 0, settings['workingDir'] || '', JSON.stringify({ checkpointSeen, plannerOnly, exitCode: code, at: Date.now() }), resolveSessionBucket(cli, model, effectiveProvider));
+        updateSessionBucketLastRun.run(clean ? 1 : 0, settings['workingDir'] || '', JSON.stringify({ checkpointSeen, plannerOnly, exitCode: code, at: Date.now() }), runBucket);
     }
     // ─── Phase 54-A: Proactive compact by turn count ───
     // CLIs without a reliable native compact/resume path get a conservative
@@ -272,6 +287,9 @@ export async function handleAgentExit(params) {
                     instructions: prompt || '',
                     cli,
                     model,
+                    scopeKey,
+                    chatSessionId,
+                    ...(codexAppBucket === undefined ? {} : { sessionBucket: codexAppBucket }),
                 });
             }
             catch (e) {
@@ -294,7 +312,7 @@ export async function handleAgentExit(params) {
         if (shouldClearHighTurnSessionBucket(runtimeCli, turns)) {
             console.log(`[jaw:compact] ${cli} exited after ${turns} turns — clearing session bucket for fresh start`);
             try {
-                const bucket = resolveSessionBucket(cli, model, effectiveProvider);
+                const bucket = runBucket;
                 clearSessionBucket.run(bucket);
             }
             catch (e) {
@@ -333,7 +351,7 @@ export async function handleAgentExit(params) {
         && (code === 0 || code === null)
         && ctx.toolLog.length === 0
         && shouldInvalidateResumeSession(runtimeCli, code, ctx.stderrBuf, kiroDiagnosticText)) {
-        const bucket = resolveSessionBucket(cli, model, effectiveProvider);
+        const bucket = runBucket;
         if (bucket) {
             try {
                 clearSessionBucket.run(bucket);
@@ -343,9 +361,13 @@ export async function handleAgentExit(params) {
         console.log('[jaw:kiro] stale resume detected on success exit — retrying fresh with history');
         try {
             const { peekPendingBootstrapPrompt } = await import('../core/main-session.js');
-            if (!peekPendingBootstrapPrompt()) {
+            if (!peekPendingBootstrapPrompt(scopeKey)) {
                 const { autoCompactRefresh } = await import('../core/compact.js');
-                await autoCompactRefresh({ workDir: settings["workingDir"] || null, instructions: '', cli, model });
+                await autoCompactRefresh({
+                    workDir: settings["workingDir"] || null, instructions: '', cli, model, scopeKey,
+                    chatSessionId,
+                    ...(codexAppBucket === undefined ? {} : { sessionBucket: codexAppBucket }),
+                });
             }
         }
         catch { }
@@ -371,7 +393,7 @@ export async function handleAgentExit(params) {
             }, isEmployee ? 'internal' : 'public');
             resolve({ text: '', code: 1 });
             if (mainManaged && !opts.internal)
-                processQueue();
+                processQueue(scopeKey);
         });
         return;
     }
@@ -433,7 +455,7 @@ export async function handleAgentExit(params) {
                 pushUnionTool(t);
             const sanitizedToolLog = sanitizeToolLogForDurableStorage(unionToolLog);
             const toolLogJson = serializeSanitizedToolLog(sanitizedToolLog);
-            const info = insertMessageWithTraceRun.run('assistant', finalContent, cli, model, traceText || null, toolLogJson, settings["workingDir"] || null, ctx.traceRunId || null, getActiveChatSession());
+            const info = insertMessageWithTraceRun.run('assistant', finalContent, cli, model, traceText || null, toolLogJson, settings["workingDir"] || null, ctx.traceRunId || null, chatSessionId);
             const messageId = Number(info.lastInsertRowid || 0);
             if (ctx.traceRunId && Number.isInteger(messageId) && messageId > 0)
                 linkTraceRunToMessage(ctx.traceRunId, messageId);
@@ -461,13 +483,13 @@ export async function handleAgentExit(params) {
         // channel's generic "no response" message.
         const { message: errMsg } = classifyExitError(runtimeCli, code, ctx.stderrBuf, ctx.stallReason, `${ctx.fullText}\n${ctx.traceLog.join('\n')}`);
         if (mainManaged && !opts.internal) {
-            insertMessage.run('assistant', errMsg, cli, model, settings["workingDir"] || null, getActiveChatSession());
+            insertMessage.run('assistant', errMsg, cli, model, settings["workingDir"] || null, chatSessionId);
         }
         broadcast('agent_done', { ...runTag(ctx), text: `❌ ${errMsg}`, error: true, origin, ...empTag }, isEmployee ? 'internal' : 'public');
         finalizeTraceRun(ctx.traceRunId, 'error', errMsg);
         resolve({ text: '', code: code ?? 1, diagnostic: errMsg });
         if (mainManaged && !opts.internal)
-            processQueue();
+            processQueue(scopeKey);
         return;
     }
     else if (mainManaged && code !== 0 && !wasKilled) {
@@ -484,9 +506,19 @@ export async function handleAgentExit(params) {
                 clearEmployeeSession.run(opts.agentId);
                 console.log(`[jaw:session] invalidated stale employee resume — ${cli} agent=${opts.agentId}`);
             }
+            else if ((scopeKey || 'default') !== 'default') {
+                // The singleton session row belongs to the default scope (074 §2.3 G2).
+                // A remote session's dead resume must still drop its own bucket, or the
+                // next turn resumes a thread that no longer exists, but it does not get
+                // to rewrite the CLI and model every other session reads.
+                const bucket = runBucket;
+                if (bucket)
+                    clearSessionBucket.run(bucket);
+                console.log(`[jaw:session] invalidated stale resume — ${cli}/${bucket} bucket cleared (scope ${scopeKey})`);
+            }
             else {
                 updateSession.run(cli, null, model, settings["permissions"], settings["workingDir"], effortVal);
-                const bucket = resolveSessionBucket(cli, model, effectiveProvider);
+                const bucket = runBucket;
                 if (bucket)
                     clearSessionBucket.run(bucket);
                 console.log(`[jaw:session] invalidated stale resume — ${cli}/${bucket} session cleared`);
@@ -515,7 +547,7 @@ export async function handleAgentExit(params) {
                 broadcast('agent_done', { ...runTag(ctx), text: `❌ ${errMsg} (fresh-session retry failed)`, error: true, origin, ...empTag, ...(wasSteer ? { steered: true } : {}) }, isEmployee ? 'internal' : 'public');
                 resolve({ text: '', code: 1 });
                 if (mainManaged && !opts.internal)
-                    processQueue();
+                    processQueue(scopeKey);
             });
             return;
         }
@@ -526,17 +558,21 @@ export async function handleAgentExit(params) {
                 if (!canNativeResume) {
                     try {
                         const { autoCompactRefresh } = await import('../core/compact.js');
-                        await autoCompactRefresh({ workDir: settings["workingDir"] || null, instructions: '', cli, model });
+                        await autoCompactRefresh({
+                            workDir: settings["workingDir"] || null, instructions: '', cli, model, scopeKey,
+                            chatSessionId,
+                            ...(codexAppBucket === undefined ? {} : { sessionBucket: codexAppBucket }),
+                        });
                     }
                     catch { }
                 }
-                insertMessage.run('assistant', `⏱️ ${errMsg}`, cli, model, settings["workingDir"] || null, getActiveChatSession());
+                insertMessage.run('assistant', `⏱️ ${errMsg}`, cli, model, settings["workingDir"] || null, chatSessionId);
             }
             broadcast('agent_done', { ...runTag(ctx), text: `❌ ${errMsg}`, error: true, origin, ...empTag, ...(wasSteer ? { steered: true } : {}) }, isEmployee ? 'internal' : 'public');
             finalizeTraceRun(ctx.traceRunId, 'error', errMsg);
             resolve({ text: '', code: 1 });
             if (mainManaged && !opts.internal)
-                processQueue();
+                processQueue(scopeKey);
             return;
         }
         // ─── 429 delay retry (exponential backoff, up to MAIN_MAX_RETRIES) ───
@@ -567,7 +603,7 @@ export async function handleAgentExit(params) {
                     broadcast('agent_done', { ...runTag(ctx), text: `❌ ${errMsg} (재시도 실패, attempt ${mainAttempt + 1})`, error: true, origin, ...empTag }, isEmployee ? 'internal' : 'public');
                     resolve({ text: '', code: 1 });
                     if (mainManaged && !opts.internal)
-                        processQueue();
+                        processQueue(scopeKey);
                 });
             }, delayMs));
             return;
@@ -600,9 +636,13 @@ export async function handleAgentExit(params) {
                 finalizeTraceRun(ctx.traceRunId, 'error', errMsg);
                 try {
                     const { peekPendingBootstrapPrompt } = await import('../core/main-session.js');
-                    if (!peekPendingBootstrapPrompt()) {
+                    if (!peekPendingBootstrapPrompt(scopeKey)) {
                         const { autoCompactRefresh } = await import('../core/compact.js');
-                        await autoCompactRefresh({ workDir: settings["workingDir"] || null, instructions: '', cli, model });
+                        await autoCompactRefresh({
+                            workDir: settings["workingDir"] || null, instructions: '', cli, model, scopeKey,
+                            chatSessionId,
+                            ...(codexAppBucket === undefined ? {} : { sessionBucket: codexAppBucket }),
+                        });
                     }
                 }
                 catch { }
@@ -616,7 +656,7 @@ export async function handleAgentExit(params) {
                     }, isEmployee ? 'internal' : 'public');
                     resolve({ text: '', code: 1 });
                     if (mainManaged && !opts.internal)
-                        processQueue();
+                        processQueue(scopeKey);
                 });
                 return;
             }
@@ -703,7 +743,7 @@ export async function handleAgentExit(params) {
         && !wasSteer
         && (code === 0 || code === null)
         && isKiroResumeDegradedOutput(kiroOutputText, ctx.toolLog.length, isResume)) {
-        const bucket = resolveSessionBucket(cli, model, effectiveProvider);
+        const bucket = runBucket;
         if (bucket) {
             try {
                 clearSessionBucket.run(bucket);
@@ -734,7 +774,7 @@ export async function handleAgentExit(params) {
             }, isEmployee ? 'internal' : 'public');
             resolve({ text: '', code: 1 });
             if (mainManaged && !opts.internal)
-                processQueue();
+                processQueue(scopeKey);
         });
         return;
     }
@@ -925,23 +965,6 @@ export async function handleAgentExit(params) {
         }
     }
     if (mainManaged && !wasSteer)
-        processQueue();
-}
-// ─── Post-flush reindex (3-C) ────────────────────────
-async function postFlushReindex() {
-    try {
-        await new Promise(r => setTimeout(r, 200));
-        const { reindexIntegratedMemoryFile } = await import('../memory/indexing.js');
-        const { getMemoryFlushFilePath } = await import('../memory/runtime.js');
-        const today = new Date().toISOString().slice(0, 10);
-        const flushedFile = getMemoryFlushFilePath(today);
-        if (fs.existsSync(flushedFile)) {
-            reindexIntegratedMemoryFile(flushedFile);
-            console.log('[memory:flush] post-flush reindex done');
-        }
-    }
-    catch (err) {
-        console.warn('[memory:flush] post-flush reindex failed:', err.message);
-    }
+        processQueue(scopeKey);
 }
 //# sourceMappingURL=lifecycle-handler.js.map