cli-jaw 2.2.15 → 2.2.17

package/dist/src/core/session-ops.js

@@ -2,13 +2,21 @@
 // Extracted from server.ts in Phase 2 (devlog 260609, 20 §3.1).
 // Grouped here because all three bump the session ownership generation
 // before mutating session or runtime-settings state.
-import { bumpSessionOwnershipGeneration } from '../agent/session-persistence.js';
+import { bumpGenerationForSessionLocalReset, bumpSessionOwnershipGeneration } from '../agent/session-persistence.js';
 import { resetFallbackState } from '../agent/spawn.js';
 import { clearMainSessionState, resetSessionPreservingHistory } from './main-session.js';
 import { applyRuntimeSettingsPatch } from './runtime-settings.js';
 import { settings } from './config.js';
+import { currentSessionScope } from './session-context.js';
 /** Full reset: compact first, then delete message history. */
 export async function clearSessionState() {
+    // The reset belongs to whichever session asked for it. Without passing the scope on,
+    // the compact below falls back to the global ownership bump and the narrowing done at
+    // the end of this function never matters — a reset in one tab still discards the turn
+    // another tab has in flight (073 §2.2a).
+    const sessionScope = currentSessionScope();
+    const scopeKey = sessionScope?.scope;
+    const chatSessionId = sessionScope?.chatSessionId;
     try {
         const { autoCompactRefresh } = await import('./compact.js');
         await autoCompactRefresh({
@@ -16,6 +24,8 @@ export async function clearSessionState() {
             instructions: '',
             cli: settings["cli"] || 'claude',
             model: settings["model"] || '',
+            ...(scopeKey ? { scopeKey } : {}),
+            ...(chatSessionId ? { chatSessionId } : {}),
         });
     }
     catch { } // best-effort: compact failure must not block session reset
@@ -24,27 +34,61 @@ export async function clearSessionState() {
         // an explicit reset must invalidate resumable native sessions (guarded AGY
         // resume reads session_buckets, not the main session row), even when
         // autoCompactRefresh() threw before reaching its own bucket clear.
-        const { clearSessionBucket } = await import('./db.js');
-        const { resolveSessionBucket } = await import('../agent/args.js');
-        const bucket = resolveSessionBucket(settings["cli"] || 'claude', settings["model"] || '');
-        if (bucket)
-            clearSessionBucket.run(bucket);
+        const { clearSessionBucket, clearSessionBucketsByPrefix } = await import('./db.js');
+        const { aiEProviderForBucket, resolveSessionBucket } = await import('../agent/args.js');
+        const cli = settings["cli"] || 'claude';
+        const model = settings["model"] || '';
+        // A reset with a session behind it belongs to that session even when the session
+        // is the default one. Treating `default` as "no session" would let a reset of the
+        // default chat clear the Slack and local scopes' lanes, which is the same
+        // cross-session damage 073 exists to stop. Only an absent scope is instance-wide.
+        const isInstanceWide = scopeKey === undefined;
+        const scope = scopeKey ?? 'default';
+        // ai-e keys its bucket by provider; without it the name is re-derived from the
+        // model and a reset can clear a bucket the conversation never used.
+        const base = resolveSessionBucket(cli, model, aiEProviderForBucket(cli, model, settings));
+        if (isInstanceWide) {
+            clearSessionBucketsByPrefix.run(base, 'codex-app:');
+        }
+        else {
+            // Since 073 §2.1 every scope owns its bucket. The prefix form is needed
+            // because codex-app folds lane mode and effort into its key and this path
+            // knows neither, so an exact key built with those blank would match no row.
+            // The scope has to be a whole segment of the pattern: `codex-app:local:a%`
+            // would also delete `local:abc`, a different session's rows.
+            const scoped = `${base}:${scope}`;
+            clearSessionBucketsByPrefix.run(scoped, `${scoped}:`);
+            // The default scope also owns the bare legacy name, which is what a session
+            // created before 073 has been resuming from all along.
+            if (scope === 'default')
+                clearSessionBucket.run(base);
+        }
+        // The stored rows are half of it: an idle lane holds its thread in memory and,
+        // with nothing left to contradict it, the next turn resumes the conversation this
+        // reset just discarded.
+        try {
+            const { invalidateCodexAppLanesForScope } = await import('../agent/codex-host-pool.js');
+            invalidateCodexAppLanesForScope(isInstanceWide ? null : scope);
+        }
+        catch (e) {
+            console.warn('[jaw:reset] lane invalidation failed:', e.message);
+        }
     }
     catch (e) {
         console.warn('[jaw:reset] session bucket clear failed:', e.message);
     }
-    bumpSessionOwnershipGeneration();
+    bumpGenerationForSessionLocalReset();
     clearMainSessionState();
 }
 /** Soft reset: new session, history preserved. */
 export function resetSessionOnly() {
-    bumpSessionOwnershipGeneration();
+    bumpGenerationForSessionLocalReset();
     resetSessionPreservingHistory();
 }
 export async function applySettingsPatch(rawPatch = {}) {
     bumpSessionOwnershipGeneration();
     return applyRuntimeSettingsPatch(rawPatch, {
-        resetFallbackState,
+        resetFallbackState: () => resetFallbackState(null),
     });
 }
 //# sourceMappingURL=session-ops.js.map

package/dist/src/core/session-ops.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-ops.js","sourceRoot":"","sources":["../../../src/core/session-ops.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,gEAAgE;AAChE,uEAAuE;AACvE,qDAAqD;AAErD,OAAO,EAAE,8BAA8B,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,8DAA8D;AAC9D,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACnC,IAAI,CAAC;QACD,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;QAC5D,MAAM,kBAAkB,CAAC;YACrB,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,IAAI,IAAI;YACvC,YAAY,EAAE,EAAE;YAChB,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ;YAChC,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE;SACjC,CAAC,CAAC;IACP,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC,CAAC,4DAA4D;IACvE,IAAI,CAAC;QACD,0EAA0E;QAC1E,2EAA2E;QAC3E,qEAAqE;QACrE,mEAAmE;QACnE,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;QACvD,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAClE,MAAM,MAAM,GAAG,oBAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1F,IAAI,MAAM;YAAE,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,IAAI,CAAC,0CAA0C,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;IACnF,CAAC;IACD,8BAA8B,EAAE,CAAC;IACjC,qBAAqB,EAAE,CAAC;AAC5B,CAAC;AAED,kDAAkD;AAClD,MAAM,UAAU,gBAAgB;IAC5B,8BAA8B,EAAE,CAAC;IACjC,6BAA6B,EAAE,CAAC;AACpC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,WAAoC,EAAE;IAC3E,8BAA8B,EAAE,CAAC;IACjC,OAAO,yBAAyB,CAAC,QAAQ,EAAE;QACvC,kBAAkB;KACrB,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"session-ops.js","sourceRoot":"","sources":["../../../src/core/session-ops.ts"],"names":[],"mappings":"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"}

package/dist/src/core/settings-merge.js

@@ -1,5 +1,78 @@
 // ─── Settings Merge Logic ────────────────────────────
 // Phase 9.4 — server.js의 applySettingsPatch에서 추출한 deep merge 로직
+function isPlainRecord(value) {
+    return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+/**
+ * Apply the shared nested settings policy at every untrusted ingress.
+ * Boot/watch consume full documents, so an absent or invalid gate becomes the
+ * execution default false while persistence shape remains absent. API input is
+ * a patch, so a missing gate must not overwrite the current runtime value.
+ */
+export function sanitizeSettingsInput(input, source) {
+    const value = { ...input };
+    const serverOwnedPaths = [];
+    const invalidPaths = [];
+    const rejectedPaths = [];
+    let persistenceShape = 'absent';
+    const runtimeInput = isPlainRecord(input["runtime"]) ? input["runtime"] : null;
+    const codexAppInput = runtimeInput && isPlainRecord(runtimeInput["codexApp"])
+        ? runtimeInput["codexApp"]
+        : null;
+    const runtime = runtimeInput ? { ...runtimeInput } : {};
+    const codexApp = codexAppInput ? { ...codexAppInput } : {};
+    if (codexAppInput && Object.prototype.hasOwnProperty.call(codexAppInput, 'laneMode')) {
+        const path = 'runtime.codexApp.laneMode';
+        delete codexApp["laneMode"];
+        rejectedPaths.push(path);
+        if (source === 'api')
+            serverOwnedPaths.push(path);
+    }
+    if (codexAppInput && Object.prototype.hasOwnProperty.call(codexAppInput, 'multiplex')) {
+        if (typeof codexAppInput["multiplex"] === 'boolean') {
+            persistenceShape = 'present';
+        }
+        else {
+            delete codexApp["multiplex"];
+            invalidPaths.push('runtime.codexApp.multiplex');
+        }
+    }
+    if (source !== 'api' && persistenceShape === 'absent') {
+        codexApp["multiplex"] = false;
+    }
+    if (runtimeInput || source !== 'api') {
+        runtime["codexApp"] = codexApp;
+        value["runtime"] = runtime;
+    }
+    // `multiSession` has to be a plain object or not be here at all. A non-object survives
+    // the merge as-is and then meets `if (!s["multiSession"])` in migrateSettings, which
+    // reads falsy as absent and fills the block with the current defaults — so a single
+    // `{"multiSession": null}` would switch sessions on for a user who never accepted the
+    // migration. Both ingresses that can carry one, the API patch and the settings-file
+    // watcher, pass through here, which is why the guard lives in this function rather
+    // than at either call site (110 §4b-3).
+    if (Object.prototype.hasOwnProperty.call(input, 'multiSession') && !isPlainRecord(input["multiSession"])) {
+        delete value["multiSession"];
+        invalidPaths.push('multiSession');
+    }
+    else if (isPlainRecord(input["multiSession"])) {
+        const block = { ...input["multiSession"] };
+        // Same reasoning one level down: a non-object `channels` reaches the per-channel
+        // reads as something that is not indexable.
+        if (Object.prototype.hasOwnProperty.call(block, 'channels') && !isPlainRecord(block["channels"])) {
+            delete block["channels"];
+            invalidPaths.push('multiSession.channels');
+        }
+        value["multiSession"] = block;
+    }
+    return {
+        value,
+        persistenceShape,
+        serverOwnedPaths,
+        invalidPaths,
+        rejectedPaths,
+    };
+}
 /**
  * settings 객체에 patch를 deep merge
  * perCli와 activeOverrides는 CLI별로 개별 merge (기존 effort/model 보존)
@@ -8,7 +81,7 @@
  * @returns {object} 새 settings (current를 직접 변경하지 않음)
  */
 export function mergeSettingsPatch(current, patch) {
-    const result = { ...current };
+    const result = structuredClone(current);
     const remaining = { ...patch };
     // Deep merge perCli at per-CLI level
     if (remaining["perCli"] && typeof remaining["perCli"] === 'object') {
@@ -26,8 +99,10 @@ export function mergeSettingsPatch(current, patch) {
         }
         delete remaining["activeOverrides"];
     }
-    // Deep merge nested objects (heartbeat, telegram, telegramHub, memory, stt, jawCeo, pi, tui, network)
-    for (const key of ['heartbeat', 'telegram', 'telegramHub', 'discord', 'slack', 'memory', 'stt', 'jawCeo', 'pi', 'tui', 'messaging', 'network']) {
+    // Deep merge nested objects. A key missing from this list is REPLACED wholesale by a
+    // partial patch, so `{wiki:{promptDigest:true}}` would silently drop the root and the
+    // enabled flag along with it.
+    for (const key of ['heartbeat', 'telegram', 'telegramHub', 'discord', 'slack', 'memory', 'stt', 'jawCeo', 'pi', 'tui', 'messaging', 'network', 'wiki']) {
         if (remaining[key] && typeof remaining[key] === 'object') {
             result[key] = { ...result[key], ...remaining[key] };
             delete remaining[key];
@@ -39,6 +114,33 @@ export function mergeSettingsPatch(current, patch) {
         result["network"].remoteAccess = { ...result["network"].remoteAccess, ...remaining["network"].remoteAccess };
         delete remaining["network"].remoteAccess;
     }
+    // runtime.codexApp is a two-level merge boundary: a multiplex-only patch
+    // must preserve both other runtime blocks and codexApp-owned siblings.
+    if (isPlainRecord(remaining["runtime"])) {
+        const runtimePatch = remaining["runtime"];
+        result["runtime"] = { ...(result["runtime"] || {}), ...runtimePatch };
+        if (isPlainRecord(runtimePatch["codexApp"])) {
+            result["runtime"].codexApp = {
+                ...(current["runtime"]?.codexApp || {}),
+                ...runtimePatch["codexApp"],
+            };
+        }
+        delete remaining["runtime"];
+    }
+    // multiSession.channels is the same shape of boundary. An enabled-only patch must
+    // keep midRunPolicy and the channel gates, and a single-channel patch must keep the
+    // other two channels — which is exactly what a per-channel session gate will send.
+    if (isPlainRecord(remaining["multiSession"])) {
+        const sessionPatch = remaining["multiSession"];
+        result["multiSession"] = { ...(result["multiSession"] || {}), ...sessionPatch };
+        if (isPlainRecord(sessionPatch["channels"])) {
+            result["multiSession"].channels = {
+                ...(current["multiSession"]?.channels || {}),
+                ...sessionPatch["channels"],
+            };
+        }
+        delete remaining["multiSession"];
+    }
     // Top-level scalar fields
     Object.assign(result, remaining);
     return result;

package/dist/src/core/settings-merge.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings-merge.js","sourceRoot":"","sources":["../../../src/core/settings-merge.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,gEAAgE;AAEhE;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAA4B,EAAE,KAA0B;IACvF,MAAM,MAAM,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;IAC9B,MAAM,SAAS,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;IAE/B,qCAAqC;IACrC,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,OAAO,SAAS,CAAC,QAAQ,CAAC,KAAK,QAAQ,EAAE,CAAC;QACjE,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC1C,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAoC,EAAE,CAAC;YAC9F,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC;QACjE,CAAC;QACD,OAAO,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAED,8CAA8C;IAC9C,IAAI,SAAS,CAAC,iBAAiB,CAAC,IAAI,OAAO,SAAS,CAAC,iBAAiB,CAAC,KAAK,QAAQ,EAAE,CAAC;QACnF,MAAM,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;QAC5D,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAoC,EAAE,CAAC;YACvG,MAAM,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC;QACnF,CAAC;QACD,OAAO,SAAS,CAAC,iBAAiB,CAAC,CAAC;IACxC,CAAC;IAED,sGAAsG;IACtG,KAAK,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,CAAC;QAC7I,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,OAAO,SAAS,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC;YACvD,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YACpD,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC;IACL,CAAC;IAED,yCAAyC;IACzC,IAAI,SAAS,CAAC,SAAS,CAAC,EAAE,YAAY,IAAI,OAAO,SAAS,CAAC,SAAS,CAAC,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC9F,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC5C,MAAM,CAAC,SAAS,CAAC,CAAC,YAAY,GAAG,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,YAAY,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,YAAY,EAAE,CAAC;QAC7G,OAAO,SAAS,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC;IAC7C,CAAC;IAED,0BAA0B;IAC1B,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAEjC,OAAO,MAAM,CAAC;AAClB,CAAC"}
+{"version":3,"file":"settings-merge.js","sourceRoot":"","sources":["../../../src/core/settings-merge.ts"],"names":[],"mappings":"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"}

package/dist/src/core/settings-watch.js

@@ -8,9 +8,14 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { SETTINGS_PATH, settings, replaceSettings, migrateSettings, normalizeProjectDirs, getLastSavedSettingsRaw, } from './config.js';
-import { mergeSettingsPatch } from './settings-merge.js';
+import { mergeSettingsPatch, sanitizeSettingsInput } from './settings-merge.js';
 import { broadcast } from './bus.js';
 export const SETTINGS_WATCH_DEBOUNCE_MS = 300;
+const SERVER_OWNED_SETTINGS_KEYS = [
+    'settingsSchemaVersion',
+    'runtimeDefaultMigration',
+    'multiSessionDefaultMigration',
+];
 function selectedModelForCli(cli, currentSettings) {
     const key = typeof cli === 'string' && cli ? cli : 'claude';
     const activeOverrides = currentSettings["activeOverrides"];
@@ -45,19 +50,38 @@ export function reloadSettingsFromDisk(options = {}) {
         return false; // self-write echo
     let parsed;
     try {
-        parsed = JSON.parse(raw);
+        const value = JSON.parse(raw);
+        if (!value || typeof value !== 'object' || Array.isArray(value)) {
+            console.warn('[settings-watch] settings.json is not an object — keeping in-memory settings');
+            return false;
+        }
+        parsed = value;
     }
     catch {
         console.warn('[settings-watch] settings.json is not valid JSON — keeping in-memory settings');
         return false;
     }
+    const sanitized = sanitizeSettingsInput(parsed, 'watch');
+    if (sanitized.rejectedPaths.length > 0) {
+        console.warn(`[settings-watch] ignored server-owned settings fields: ${sanitized.rejectedPaths.join(', ')}`);
+    }
+    if (sanitized.invalidPaths.length > 0) {
+        console.warn(`[settings-watch] ignored invalid settings fields: ${sanitized.invalidPaths.join(', ')}`);
+    }
+    const externalPatch = { ...sanitized.value };
+    const ignoredKeys = SERVER_OWNED_SETTINGS_KEYS.filter((key) => key in externalPatch);
+    for (const key of ignoredKeys)
+        delete externalPatch[key];
+    if (ignoredKeys.length > 0) {
+        console.warn(`[settings-watch] ignored server-owned settings keys: ${ignoredKeys.join(', ')}`);
+    }
     // Same normalize/migrate path as boot-time load; merge onto current
     // in-memory settings so runtime-only keys survive a partial file.
-    const merged = mergeSettingsPatch(settings, parsed);
+    const merged = mergeSettingsPatch(settings, externalPatch);
     merged["projectDirs"] = normalizeProjectDirs(merged["projectDirs"]);
-    replaceSettings(migrateSettings(merged));
+    replaceSettings(migrateSettings(merged), sanitized.persistenceShape);
     broadcast('settings_change', {
-        changedKeys: Object.keys(parsed),
+        changedKeys: Object.keys(externalPatch),
         cli: settings["cli"],
         model: selectedModelForCli(settings["cli"], settings),
         projectDirs: settings["projectDirs"] ?? null,

package/dist/src/core/settings-watch.js.map

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

package/dist/src/core/widget-watcher.js

@@ -2,6 +2,8 @@ import fs from 'node:fs';
 import { join, parse } from 'node:path';
 import { broadcast } from './bus.js';
 import { WIDGETS_DIR } from './config.js';
+import { scopeForChatSession } from '../orchestrator/scope.js';
+import { getChatSessionRemoteKey } from './chat-sessions.js';
 const DEBOUNCE_MS = 300;
 function warn(message, error) {
     console.warn(`[widget-watcher] ${message}:`, error.message);
@@ -47,8 +49,19 @@ export function startWidgetWatcher() {
         clearTimer(key);
         timers.set(key, setTimeout(() => {
             timers.delete(key);
-            if (!stopped)
-                broadcast('widget_updated', { chatId, widgetId }, 'public');
+            // The watcher fires from a filesystem timer, outside any session's async
+            // context, so broadcast() cannot stamp the scope for us. A widget belongs to
+            // the session whose directory holds it (that is the same id removeWidgetDir
+            // takes), and without this a scoped tab would never see its own widget update.
+            if (!stopped) {
+                const remoteKey = getChatSessionRemoteKey(chatId) ?? undefined;
+                broadcast('widget_updated', {
+                    chatId,
+                    widgetId,
+                    scope: scopeForChatSession(chatId, remoteKey),
+                    sessionId: chatId,
+                }, 'public');
+            }
         }, DEBOUNCE_MS));
     };
     const attachChatWatcher = (chatId) => {

package/dist/src/core/widget-watcher.js.map

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

package/dist/src/discord/bot.js

@@ -140,9 +140,12 @@ async function dcOrchestrate(msg, prompt, displayMsg) {
             ?.catch((e) => log.info('[discord:typing] ❌ refresh', logErrorText(e)));
     }, 8000);
     try {
-        const text = String(await orchestrateAndCollect(prompt, {
+        const text = String(await orchestrateAndCollect(prompt, stripUndefined({
             origin: 'discord', target, chatId, requestId: result.requestId, _skipInsert: true,
-        }));
+            scope: result.sessionContext?.scope,
+            chatSessionId: result.sessionContext?.chatSessionId,
+            remoteKey: result.sessionContext?.remoteKey,
+        })));
         const chunks = chunkDiscordMessage(text);
         const channel = asSendable(msg.channel);
         if (!channel)

package/dist/src/discord/bot.js.map

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

package/dist/src/discord/commands.js

@@ -8,7 +8,7 @@ import { makeCommandCtx } from '../cli/command-context.js';
 import { normalizeLocale } from '../core/i18n.js';
 import { resetFallbackState } from '../agent/spawn.js';
 import { applyRuntimeSettingsPatch } from '../core/runtime-settings.js';
-import { bumpSessionOwnershipGeneration } from '../agent/session-persistence.js';
+import { bumpGenerationForSessionLocalReset, bumpSessionOwnershipGeneration } from '../agent/session-persistence.js';
 import { clearMainSessionState, resetSessionPreservingHistory } from '../core/main-session.js';
 import { getVisibleCommands } from '../command-contract/policy.js';
 import { asSendable } from './channel-types.js';
@@ -45,15 +45,15 @@ function makeDiscordCommandCtx() {
         applySettings: async (patch) => {
             bumpSessionOwnershipGeneration();
             return applyRuntimeSettingsPatch(patch, {
-                resetFallbackState,
+                resetFallbackState: () => resetFallbackState(null),
             });
         },
         clearSession: () => {
-            bumpSessionOwnershipGeneration();
+            bumpGenerationForSessionLocalReset();
             clearMainSessionState();
         },
         resetSession: () => {
-            bumpSessionOwnershipGeneration();
+            bumpGenerationForSessionLocalReset();
             resetSessionPreservingHistory();
         },
         resetEmployees: () => seedDefaultEmployees({ reset: true, notify: true }),

package/dist/src/discord/commands.js.map

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

package/dist/src/goal/heartbeat.js

@@ -33,7 +33,7 @@ export function buildGoalContinuation() {
     // so blocking here would strand the goal. Only block on pending replays OUTSIDE
     // orchestration, where a lingering replay means a genuinely undelivered result
     // awaiting drain. `workers_busy` (a genuinely running worker) still blocks above.
-    if (!pabcdActive && hasPendingWorkerReplays()) {
+    if (!pabcdActive && hasPendingWorkerReplays('default')) {
         return { shouldContinue: false, reason: 'pending_replay' };
     }
     const checkpoint = goal.lastCheckpoint;

package/dist/src/goal/heartbeat.js.map

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

package/dist/src/goal/runtime.js

@@ -15,7 +15,7 @@ export function buildRuntimeSnapshot(overrides) {
     const goal = getActiveGoal();
     const orcState = getState();
     const workers = getActiveWorkers();
-    const pendingReplays = hasPendingWorkerReplays();
+    const pendingReplays = hasPendingWorkerReplays('default');
     return {
         goal,
         orcState,

package/dist/src/goal/runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../src/goal/runtime.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,iCAAiC;AAEjC,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC/F,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAiB3C,MAAM,cAAc,GAAkB;IAClC,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,EAAE;IACd,aAAa,EAAE,CAAC;IAChB,SAAS,EAAE,CAAC;IACZ,WAAW,EAAE,CAAC;IACd,cAAc,EAAE,CAAC;CACpB,CAAC;AAEF,MAAM,UAAU,oBAAoB,CAAC,SAMpC;IACG,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,QAAQ,EAAE,CAAC;IAC5B,MAAM,OAAO,GAAG,gBAAgB,EAAE,CAAC;IACnC,MAAM,cAAc,GAAG,uBAAuB,EAAE,CAAC;IAEjD,OAAO;QACH,IAAI;QACJ,QAAQ;QACR,SAAS,EAAE,SAAS,EAAE,SAAS,IAAI,KAAK;QACxC,aAAa,EAAE,OAAO,CAAC,MAAM;QAC7B,oBAAoB,EAAE,cAAc;QACpC,aAAa,EAAE,SAAS,EAAE,aAAa,IAAI,KAAK;QAChD,oBAAoB,EAAE,SAAS,EAAE,oBAAoB,IAAI,CAAC;QAC1D,aAAa,EAAE,SAAS,EAAE,aAAa;QACvC,MAAM,EAAE,SAAS,EAAE,MAAM,IAAI,cAAc;KAC9C,CAAC;AACN,CAAC"}
+{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../src/goal/runtime.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,iCAAiC;AAEjC,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC/F,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAiB3C,MAAM,cAAc,GAAkB;IAClC,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,EAAE;IACd,aAAa,EAAE,CAAC;IAChB,SAAS,EAAE,CAAC;IACZ,WAAW,EAAE,CAAC;IACd,cAAc,EAAE,CAAC;CACpB,CAAC;AAEF,MAAM,UAAU,oBAAoB,CAAC,SAMpC;IACG,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,QAAQ,EAAE,CAAC;IAC5B,MAAM,OAAO,GAAG,gBAAgB,EAAE,CAAC;IACnC,MAAM,cAAc,GAAG,uBAAuB,CAAC,SAAS,CAAC,CAAC;IAE1D,OAAO;QACH,IAAI;QACJ,QAAQ;QACR,SAAS,EAAE,SAAS,EAAE,SAAS,IAAI,KAAK;QACxC,aAAa,EAAE,OAAO,CAAC,MAAM;QAC7B,oBAAoB,EAAE,cAAc;QACpC,aAAa,EAAE,SAAS,EAAE,aAAa,IAAI,KAAK;QAChD,oBAAoB,EAAE,SAAS,EAAE,oBAAoB,IAAI,CAAC;QAC1D,aAAa,EAAE,SAAS,EAAE,aAAa;QACvC,MAAM,EAAE,SAAS,EAAE,MAAM,IAAI,cAAc;KAC9C,CAAC;AACN,CAAC"}