npm - cli-jaw - Versions diffs - 2.17.38 → 2.17.39 - Mend

cli-jaw 2.17.38 → 2.17.39

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (831) hide show

package/dist/src/core/runtime-settings.js CHANGED Viewed

@@ -14,6 +14,41 @@ import { join } from 'node:path';
 import { homedir } from 'node:os';
 import { log } from './logger.js';
 import { MAX_DISPATCH_APPROVAL_TTL_SECONDS } from './dispatch-approval.js';
+import { isRuntimeTransport, isSwitchableNativeCli } from '../agent/runtime/selection.js';
+/** Explicit display/next-run preferences must not revoke already admitted runs.
+ * Unknown, empty or execution-changing mixtures retain the existing invalidation.
+ */
+export function settingsPatchPreservesActiveRun(input) {
+    if (!input || typeof input !== 'object' || Array.isArray(input))
+        return false;
+    const keys = Object.keys(input);
+    if (!keys.length || keys.some(key => key !== 'presentation' && key !== 'perCli'))
+        return false;
+    const sanitized = sanitizeSettingsInput(input, 'api');
+    if (sanitized.invalidPaths.length || sanitized.serverOwnedPaths.length || sanitized.rejectedPaths.length)
+        return false;
+    const patch = sanitized.value;
+    if (Object.keys(patch).length !== keys.length || Object.keys(patch).some(key => !keys.includes(key)))
+        return false;
+    if (keys.includes('presentation')) {
+        const display = patch['presentation'];
+        if (!display || typeof display !== 'object' || Array.isArray(display)
+            || Object.keys(display).length !== 1 || !Object.hasOwn(display, 'mode'))
+            return false;
+    }
+    if (keys.includes('perCli')) {
+        const perCli = patch['perCli'];
+        if (!perCli || typeof perCli !== 'object' || Array.isArray(perCli) || !Object.keys(perCli).length)
+            return false;
+        for (const [cli, value] of Object.entries(perCli)) {
+            if (!isSwitchableNativeCli(cli) || !value || typeof value !== 'object' || Array.isArray(value)
+                || Object.keys(value).length !== 1 || !Object.hasOwn(value, 'transport')
+                || !isRuntimeTransport(value['transport']))
+                return false;
+        }
+    }
+    return true;
+}
 export class RuntimeDefaultMigrationTerminalError extends Error {
     constructor() {
         super('runtime_default_migration_terminal');
@@ -299,6 +334,10 @@ async function applyRuntimeSettingsPatchSerialised(rawPatch = {}, opts = {}) {
             throw new Error('invalid_settings_field');
         }
         const patch = sanitized.value;
+        const presentationOnly = Object.keys(patch).length === 1 && Object.hasOwn(patch, 'presentation');
+        // Preserve the older empty/sibling presentation subtree behavior separately
+        // from the strict admission-ownership exception for explicit preferences.
+        const preserveRuntimeState = presentationOnly || settingsPatchPreservesActiveRun(rawPatch);
         validateDispatchApprovalPatch(patch);
         if (!opts.allowWikiLifecycle && wikiRouteManagedPatchPaths(patch).length > 0) {
             throw new Error('wiki_configuration_requires_wiki_route');
@@ -324,7 +363,8 @@ async function applyRuntimeSettingsPatchSerialised(rawPatch = {}, opts = {}) {
                 compactLimit: codexCfg.contextCompactLimit || 900000,
             });
         }
-        opts.resetFallbackState?.();
+        if (!preserveRuntimeState)
+            opts.resetFallbackState?.();
         // CLI-changed branch delegates main-session clearing to cliSwitchRefresh
         // (which writes a cleared row inside its DB transaction). On refresh failure
         // we revert settings; the original session row is preserved because nothing
@@ -356,10 +396,11 @@ async function applyRuntimeSettingsPatchSerialised(rawPatch = {}, opts = {}) {
                 throw e;
             }
         }
-        else {
+        else if (!preserveRuntimeState) {
             syncMainSessionToSettings(prevCli);
         }
-        syncJwcConfigDefault(settings);
+        if (!preserveRuntimeState)
+            syncJwcConfigDefault(settings);
         if (settings["workingDir"] !== prevWorkingDir) {
             try {
                 initMcpConfig(settings["workingDir"]);

package/dist/src/core/runtime-settings.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"runtime-settings.js","sourceRoot":"","sources":["../../../src/core/runtime-settings.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"runtime-settings.js","sourceRoot":"","sources":["../../../src/core/runtime-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,cAAc,EAAE,SAAS,EACzB,2BAA2B,EAAE,aAAa,GAC7C,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EACH,QAAQ,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,eAAe,EAAE,oBAAoB,EACxF,4BAA4B,EAC5B,kCAAkC,EACe,iCAAiC,EAClF,0BAA0B,GAC7B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAC9F,OAAO,EAAE,4BAA4B,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,iCAAiC,EAAE,MAAM,wBAAwB,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAE1F;;GAEG;AACH,MAAM,UAAU,+BAA+B,CAAC,KAA8B;IAC1E,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9E,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,cAAc,IAAI,GAAG,KAAK,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IAC/F,MAAM,SAAS,GAAG,qBAAqB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACtD,IAAI,SAAS,CAAC,YAAY,CAAC,MAAM,IAAI,SAAS,CAAC,gBAAgB,CAAC,MAAM,IAAI,SAAS,CAAC,aAAa,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IACvH,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC;IAC9B,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACnH,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC;QACtC,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;eAC9D,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;IAC9F,CAAC;IACD,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAChH,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAChD,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;mBACvF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC;mBACrE,CAAC,kBAAkB,CAAE,KAAiC,CAAC,WAAW,CAAC,CAAC;gBAAE,OAAO,KAAK,CAAC;QAC9F,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAID,MAAM,OAAO,oCAAqC,SAAQ,KAAK;IAC3D;QACI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAC5C,IAAI,CAAC,IAAI,GAAG,sCAAsC,CAAC;IACvD,CAAC;CACJ;AAED,MAAM,UAAU,8BAA8B,CAC1C,eAAwC,EACxC,MAAqC;IAErC,MAAM,OAAO,GAAG,eAAe,CAAC,yBAAyB,CAAC,CAAC;IAC3D,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACpE,MAAM,IAAI,oCAAoC,EAAE,CAAC;IACrD,CAAC;IACD,MAAM,SAAS,GAAG,OAAkC,CAAC;IACrD,IAAI,SAAS,CAAC,EAAE,KAAK,4BAA4B,IAAI,SAAS,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACjF,MAAM,IAAI,oCAAoC,EAAE,CAAC;IACrD,CAAC;IACD,MAAM,uBAAuB,GAA4B;QACrD,GAAG,SAAS;QACZ,KAAK,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM;KACnD,CAAC;IACF,OAAO;QACH,GAAG,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,uBAAuB;KAC1B,CAAC;AACN,CAAC;AAED,IAAI,2BAA2B,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;AAEpD,MAAM,CAAC,KAAK,UAAU,+BAA+B,CAAI,IAAsB;IAC3E,IAAI,OAAoB,CAAC;IACzB,MAAM,IAAI,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,GAAG,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,2BAA2B,CAAC;IAC7C,2BAA2B,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACxD,MAAM,QAAQ,CAAC;IACf,IAAI,CAAC;QACD,OAAO,MAAM,IAAI,EAAE,CAAC;IACxB,CAAC;YAAS,CAAC;QACP,OAAO,EAAE,CAAC;IACd,CAAC;AACL,CAAC;AAID,MAAM,OAAO,yCAA0C,SAAQ,KAAK;IAChE;QACI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,GAAG,2CAA2C,CAAC;IAC5D,CAAC;CACJ;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,mCAAmC,CAC/C,eAAwC,EACxC,MAA0C;IAE1C,MAAM,OAAO,GAAG,eAAe,CAAC,8BAA8B,CAAC,CAAC;IAChE,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACpE,MAAM,IAAI,yCAAyC,EAAE,CAAC;IAC1D,CAAC;IACD,MAAM,SAAS,GAAG,OAAuC,CAAC;IAC1D,IAAI,SAAS,CAAC,EAAE,KAAK,kCAAkC,IAAI,SAAS,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACvF,MAAM,IAAI,yCAAyC,EAAE,CAAC;IAC1D,CAAC;IACD,MAAM,4BAA4B,GAAiC;QAC/D,GAAG,SAAS;QACZ,KAAK,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM;KACnD,CAAC;IACF,IAAI,MAAM,KAAK,QAAQ;QAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC;IAEjE,MAAM,KAAK,GAAG,eAAe,CAAC,cAAc,CAAC,CAAC;IAC9C,MAAM,UAAU,GAAG,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC5E,CAAC,CAAE,KAAiC,CAAC,eAAe,CAAC;QACrD,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,mBAAmB,GAAG,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,IAAK,UAAqB,GAAG,CAAC,CAAC;IACvF,OAAO;QACH,6EAA6E;QAC7E,2CAA2C;QAC3C,YAAY,EAAE;YACV,OAAO,EAAE,IAAI;YACb,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,CAAC;SACvD;QACD,4BAA4B;KAC/B,CAAC;AACN,CAAC;AAED,IAAI,gCAAgC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;AAEzD,MAAM,CAAC,KAAK,UAAU,oCAAoC,CAAI,IAAsB;IAChF,IAAI,OAAoB,CAAC;IACzB,MAAM,IAAI,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,GAAG,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,gCAAgC,CAAC;IAClD,gCAAgC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,QAAQ,CAAC;IACf,IAAI,CAAC;QACD,OAAO,MAAM,IAAI,EAAE,CAAC;IACxB,CAAC;YAAS,CAAC;QACP,OAAO,EAAE,CAAC;IACd,CAAC;AACL,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,eAAoC;IACrE,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;QACnC,IAAI,GAAG,KAAK,KAAK;YAAE,OAAO;QAC1B,MAAM,EAAE,GAAG,eAAe,CAAC,iBAAiB,CAAC,EAAE,CAAC,KAAK,CAAuC,CAAC;QAC7F,MAAM,EAAE,GAAG,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAuC,CAAC;QACpF,MAAM,QAAQ,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,WAAW,CAAC;QACrE,mFAAmF;QACnF,kFAAkF;QAClF,gFAAgF;QAChF,8EAA8E;QAC9E,2EAA2E;QAC3E,+DAA+D;QAC/D,MAAM,KAAK,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,2BAA2B,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3F,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,MAAM,SAAS,GAAG,QAAQ,KAAK,WAAW,CAAC,CAAC,CAAC,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;QAC7F,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC1F,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAChD,IAAI,OAAe,CAAC;QACpB,IAAI,CAAC;YACD,OAAO,GAAG,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;QAAC,MAAM,CAAC;YACL,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACzC,OAAO,GAAG,EAAE,CAAC;QACjB,CAAC;QACD,MAAM,WAAW,GAAG,cAAc,SAAS,EAAE,CAAC;QAC9C,IAAI,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YAClC,OAAO,GAAG,OAAO,CAAC,OAAO,CACrB,kCAAkC,EAClC,gBAAgB,WAAW,EAAE,CAChC,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,OAAO,GAAG,gBAAgB,WAAW,KAAK,OAAO,EAAE,CAAC;QACxD,CAAC;QACD,aAAa,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QAClB,OAAO,CAAC,KAAK,CAAC,kBAAkB,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;IAC5D,CAAC;AACL,CAAC;AAiBD,SAAS,QAAQ,CAAC,KAAc;IAC5B,OAAO,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAgC,CAAC,CAAC,CAAC,EAAE,CAAC;AACtF,CAAC;AAED,SAAS,WAAW,CAAC,MAA+B,EAAE,GAAW;IAC7D,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AAClD,CAAC;AAED,SAAS,6BAA6B,CAAC,KAA8B;IACjE,IAAI,CAAC,CAAC,kBAAkB,IAAI,KAAK,CAAC;QAAE,OAAO;IAC3C,MAAM,KAAK,GAAG,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACxC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC9G,MAAM,QAAQ,GAAG,KAAgC,CAAC;IAClD,IAAI,YAAY,IAAI,QAAQ,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;WACnE,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC;WAClC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,GAAG,iCAAiC,CAAC,EAAE,CAAC;QACzE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACrD,CAAC;IACD,IAAI,CAAC,CAAC,WAAW,IAAI,QAAQ,CAAC;QAAE,OAAO;IACvC,MAAM,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;IACxC,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACpI,MAAM,KAAK,GAAG,SAAoC,CAAC;IACnD,IAAI,OAAO,IAAI,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IACpL,IAAI,UAAU,IAAI,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClM,IAAI,SAAS,IAAI,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;AAChM,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAW,EAAE,eAAwC;IAC9E,MAAM,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACrE,MAAM,MAAM,GAAG,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnD,OAAO,WAAW,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC;WACpD,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC;WAC3C,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,mBAAmB,CAAC,eAAwC;IACjE,MAAM,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACrE,MAAM,MAAM,GAAG,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnD,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7C,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACpC,MAAM,gBAAgB,GAAG,WAAW,CAAC,EAAE,EAAE,UAAU,CAAC,IAAI,WAAW,CAAC,EAAE,EAAE,UAAU,CAAC,IAAI,SAAS,CAAC;IACjG,OAAO,kBAAkB,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;AAC9F,CAAC;AAED,SAAS,0BAA0B,CAAC,OAAyC,EAAE,QAAiC;IAC5G,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1C,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,SAAS,CAAC;YAClB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;YACzB,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC;YAClC,cAAc,EAAE,KAAK,CAAC,gBAAgB,CAAC;SAC1C,CAAC,CAAC;IACP,CAAC;IACD,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QACtB,kEAAkE;QAClE,oEAAoE;QACpE,6DAA6D;QAC7D,OAAO,IAAI,CAAC,SAAS,CAAC;YAClB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;YACzB,QAAQ,EAAE,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC;YACxC,QAAQ,EAAE,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC;YACxC,MAAM,EAAE,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC;YACpC,UAAU,EAAE,KAAK,CAAC,YAAY,CAAC;SAClC,CAAC,CAAC;IACP,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC;QAClB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;QACzB,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC;QAClC,OAAO,EAAE,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC;QACtC,UAAU,EAAE,KAAK,CAAC,YAAY,CAAC;KAClC,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,iCAAiC,CAC5C,IAA6B,EAC7B,IAA6B;IAE7B,MAAM,KAAK,GAAoB,EAAE,CAAC;IAClC,IAAI,0BAA0B,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,0BAA0B,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC;QAChG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,4BAA4B,EAAE,EAAE,EAAE;YAC9E,4BAA4B,EAAE,CAAC;QACnC,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IACD,IAAI,0BAA0B,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,0BAA0B,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC;QAC9F,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,gCAAgC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,2BAA2B,EAAE,EAAE,EAAE;YACzF,2BAA2B,EAAE,CAAC;QAClC,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IACD,IAAI,0BAA0B,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,0BAA0B,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;QAC1F,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,yBAAyB,EAAE,EAAE,EAAE;YACrF,yBAAyB,EAAE,CAAC;QAChC,CAAC,CAAC,CAAC,CAAC;QACJ,qEAAqE;QACrE,mEAAmE;QACnE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,uBAAuB,EAAE,EAAE,EAAE;YAC3E,uBAAuB,EAAE,CAAC;QAC9B,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IACD,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,gBAAgB,CACrB,QAAgC,EAChC,OAAe,EACf,KAAqB;IAErB,IAAI,CAAC;QACD,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,aAAsB,EAAE,CAAC;QAC9B,yEAAyE;QACzE,uEAAuE;QACvE,OAAO,CAAC,KAAK,CAAC,sBAAsB,OAAO,yBAAyB,EAAG,aAAuB,CAAC,OAAO,CAAC,CAAC;IAC5G,CAAC;AACL,CAAC;AAED,6EAA6E;AAC7E,0EAA0E;AAC1E,6EAA6E;AAC7E,6EAA6E;AAC7E,+EAA+E;AAC/E,gDAAgD;AAChD,IAAI,mBAAmB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;AAE5C,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC3C,WAAgC,EAAE,EAClC,OAAoC,EAAE;IAEtC,IAAI,OAAoB,CAAC;IACzB,MAAM,IAAI,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,GAAG,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,mBAAmB,CAAC;IACrC,mBAAmB,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,QAAQ,CAAC;IACf,IAAI,CAAC;QACD,OAAO,MAAM,mCAAmC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACrE,CAAC;YAAS,CAAC;QACP,OAAO,EAAE,CAAC;IACd,CAAC;AACL,CAAC;AAED,KAAK,UAAU,mCAAmC,CAC9C,WAAgC,EAAE,EAClC,OAAoC,EAAE;IAEtC,MAAM,sBAAsB,GAAG,4BAA4B,EAAE,CAAC;IAC9D,MAAM,aAAa,GAAG,qBAAqB,EAAE,CAAC;IAC9C,MAAM,YAAY,GAAG,aAAa,CAAC,KAAK,CAAC;IACzC,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IACpC,MAAM,cAAc,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;IAClD,MAAM,eAAe,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;IAC1D,IAAI,kBAAkB,GAAG,KAAK,CAAC;IAC/B,IAAI,eAAe,GAAG,KAAK,CAAC;IAE5B,IAAI,CAAC;QACD,MAAM,SAAS,GAAG,qBAAqB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACzD,IAAI,SAAS,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,SAAS,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC9C,CAAC;QACD,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC;QAC9B,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QACjG,4EAA4E;QAC5E,0EAA0E;QAC1E,MAAM,oBAAoB,GAAG,gBAAgB,IAAI,+BAA+B,CAAC,QAAQ,CAAC,CAAC;QAC3F,6BAA6B,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,kBAAkB,IAAI,0BAA0B,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3E,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC9D,CAAC;QACD,IAAI,iCAAiC,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtD,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;QAC/D,CAAC;QACD,MAAM,MAAM,GAAG,kBAAkB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QACvD,IAAI,aAAa,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,CAAC,aAAa,CAAC,GAAG,oBAAoB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,QAAQ,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,SAAS,CAAC,gBAAgB,KAAK,SAAS;YACtD,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC;QAC1B,gBAAgB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAC5E,kBAAkB,GAAG,IAAI,CAAC;QAE1B,IAAI,KAAK,CAAC,QAAQ,CAAC,EAAE,KAAK,IAAI,eAAe,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,CAAC;YACrE,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;YACjD,sBAAsB,CAAC;gBACnB,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,aAAa;gBACjC,aAAa,EAAE,QAAQ,CAAC,iBAAiB,IAAI,OAAO;gBACpD,YAAY,EAAE,QAAQ,CAAC,mBAAmB,IAAI,MAAM;aACvD,CAAC,CAAC;QACP,CAAC;QAED,IAAI,CAAC,oBAAoB;YAAE,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;QAEvD,yEAAyE;QACzE,6EAA6E;QAC7E,4EAA4E;QAC5E,iEAAiE;QACjE,MAAM,UAAU,GAAG,CAAC,CAAC,CAAC,OAAO,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACjF,MAAM,eAAe,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,kBAAkB,GAAG,OAAO,KAAK,MAAM;eACtC,QAAQ,CAAC,KAAK,CAAC,KAAK,MAAM;eAC1B,eAAe,KAAK,eAAe,CAAC;QAC3C,IAAI,UAAU,IAAI,kBAAkB,EAAE,CAAC;YACnC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,OAAO,GAAG,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACrD,IAAI,CAAC;gBACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB;uBACvC,CAAC,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,gBAAgB,CAAC;gBACvD,MAAM,gBAAgB,CAAC;oBACnB,aAAa,EAAE,cAAc,IAAI,EAAE;oBACnC,aAAa,EAAE,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE;oBAC3C,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC,QAAQ,eAAe,EAAE,CAAC,CAAC,CAAC,OAAO;oBACjE,KAAK;oBACL,OAAO;oBACP,UAAU,EAAE,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS;iBAC7D,CAAC,CAAC;YACP,CAAC;YAAC,OAAO,CAAU,EAAE,CAAC;gBAClB,OAAO,CAAC,KAAK,CAAC,6DAA6D,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;gBACnG,gBAAgB,CAAC,aAAa,EAAE,oBAAoB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;gBAC1E,eAAe,GAAG,IAAI,CAAC;gBACvB,MAAM,CAAC,CAAC;YACZ,CAAC;QACL,CAAC;aAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC/B,yBAAyB,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC;QAED,IAAI,CAAC,oBAAoB;YAAE,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAE1D,IAAI,QAAQ,CAAC,YAAY,CAAC,KAAK,cAAc,EAAE,CAAC;YAC5C,IAAI,CAAC;gBACD,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;gBACtC,2BAA2B,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC5H,SAAS,CAAC,cAAc,EAAE,CAAC,CAAC;gBAC5B,WAAW,EAAE,CAAC;gBACd,GAAG,CAAC,IAAI,CAAC,8CAA8C,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YACrF,CAAC;YAAC,OAAO,CAAU,EAAE,CAAC;gBAClB,OAAO,CAAC,KAAK,CAAC,kBAAkB,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;YAC5D,CAAC;QACL,CAAC;QAED,MAAM,iCAAiC,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAEhE,wEAAwE;QACxE,IAAI,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,gBAAgB,IAAI,uBAAuB,CAAC,CAAC,YAAY,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC5F,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YAClB,8EAA8E;YAC9E,OAAO,CAAC,KAAK,CAAC,kDAAkD,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;YACxF,gBAAgB,CAAC,aAAa,EAAE,mBAAmB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YACzE,eAAe,GAAG,IAAI,CAAC;YACvB,IAAI,CAAC;gBACD,MAAM,0BAA0B,EAAE,CAAC;YACvC,CAAC;YAAC,OAAO,SAAkB,EAAE,CAAC;gBAC1B,OAAO,CAAC,KAAK,CAAC,kDAAkD,EAAG,SAAmB,CAAC,OAAO,CAAC,CAAC;YACpG,CAAC;YACD,MAAM,CAAC,CAAC;QACZ,CAAC;QAED,SAAS,CAAC,iBAAiB,EAAE;YACzB,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;YAC/B,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC;YACpB,KAAK,EAAE,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC;YACrD,WAAW,EAAE,QAAQ,CAAC,aAAa,CAAC,IAAI,IAAI;YAC5C,MAAM,EAAE,OAAO;SAClB,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IACpB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,kBAAkB,IAAI,CAAC,eAAe,EAAE,CAAC;YACzC,gBAAgB,CAAC,aAAa,EAAE,wBAAwB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAClF,CAAC;QACD,MAAM,KAAK,CAAC;IAChB,CAAC;YAAS,CAAC;QACP,sBAAsB,EAAE,CAAC;IAC7B,CAAC;AACL,CAAC"}

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

@@ -1,13 +1,14 @@
 // ─── Session/settings lifecycle ops (web surface) ────
 // 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.
+// Execution changes invalidate ownership; explicit display/next-run preferences
+// preserve the already admitted run and its captured persistence namespace.
 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 { applyRuntimeSettingsPatch, settingsPatchPreservesActiveRun } from './runtime-settings.js';
 import { settings } from './config.js';
 import { currentSessionScope } from './session-context.js';
+import { isSwitchableNativeCli, runtimeSessionBucket } from '../agent/runtime/selection.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,
@@ -47,7 +48,26 @@ export async function clearSessionState() {
         // 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) {
+        if (isSwitchableNativeCli(cli)) {
+            // These runtimes have no lane/model suffix: scope is opaque, so
+            // local:a must not delete local:a:b in either transport namespace.
+            for (const transport of ['print', 'native']) {
+                const runtimeBase = runtimeSessionBucket(base, transport);
+                if (isInstanceWide)
+                    clearSessionBucketsByPrefix.run(runtimeBase, `${runtimeBase}:`);
+                else {
+                    clearSessionBucket.run(`${runtimeBase}:${scope}`);
+                    if (scope === 'default')
+                        clearSessionBucket.run(runtimeBase);
+                }
+            }
+            // Preserve the existing global-reset exception: all Codex App
+            // lanes retire even when another CLI is selected. Scoped resets
+            // must never inherit this instance-wide sweep.
+            if (isInstanceWide)
+                clearSessionBucketsByPrefix.run(base, 'codex-app:');
+        }
+        else if (isInstanceWide) {
             clearSessionBucketsByPrefix.run(base, 'codex-app:');
         }
         else {
@@ -105,10 +125,20 @@ export async function clearResumableSessionForScope() {
         const base = resolveSessionBucket(cli, model, aiEProviderForBucket(cli, model, settings));
         // Same prefix pair `clearSessionState` uses: codex-app folds lane mode and
         // effort into its key, so an exact name built with those blank matches nothing.
-        const scoped = `${base}:${scope}`;
-        clearSessionBucketsByPrefix.run(scoped, `${scoped}:`);
-        if (scope === 'default')
-            clearSessionBucket.run(base);
+        if (isSwitchableNativeCli(cli)) {
+            for (const transport of ['print', 'native']) {
+                const runtimeBase = runtimeSessionBucket(base, transport);
+                clearSessionBucket.run(`${runtimeBase}:${scope}`);
+                if (scope === 'default')
+                    clearSessionBucket.run(runtimeBase);
+            }
+        }
+        else {
+            const scoped = `${base}:${scope}`;
+            clearSessionBucketsByPrefix.run(scoped, `${scoped}:`);
+            if (scope === 'default')
+                clearSessionBucket.run(base);
+        }
         try {
             const { invalidateCodexAppLanesForScope } = await import('../agent/codex-host-pool.js');
             invalidateCodexAppLanesForScope(scope);
@@ -122,7 +152,8 @@ export async function clearResumableSessionForScope() {
     }
 }
 export async function applySettingsPatch(rawPatch = {}) {
-    bumpSessionOwnershipGeneration();
+    if (!settingsPatchPreservesActiveRun(rawPatch))
+        bumpSessionOwnershipGeneration();
     return applyRuntimeSettingsPatch(rawPatch, {
         resetFallbackState: () => resetFallbackState(null),
     });

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

	@@ -1 +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,kCAAkC,EAAE,8BAA8B,EAAE,MAAM,iCAAiC,CAAC;AACrH,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;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;~~AAE3D~~,8DAA8D;AAC9D,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACnC,qFAAqF;IACrF,sFAAsF;IACtF,sFAAsF;IACtF,yCAAyC;IACzC,MAAM,YAAY,GAAG,mBAAmB,EAAE,CAAC;IAC3C,MAAM,QAAQ,GAAG,YAAY,EAAE,KAAK,CAAC;IACrC,MAAM,aAAa,GAAG,YAAY,EAAE,aAAa,CAAC;IAClD,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;YAC9B,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9C,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,2BAA2B,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;QACpF,MAAM,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;QACxF,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC;QACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACtC,iFAAiF;QACjF,kFAAkF;QAClF,0EAA0E;QAC1E,kFAAkF;QAClF,MAAM,cAAc,GAAG,QAAQ,KAAK,SAAS,CAAC;QAC9C,MAAM,KAAK,GAAG,QAAQ,IAAI,SAAS,CAAC;QACpC,+EAA+E;QAC/E,oEAAoE;QACpE,MAAM,IAAI,GAAG,oBAAoB,CAAC,GAAG,EAAE,KAAK,EAAE,oBAAoB,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1F,IAAI,cAAc,EAAE,CAAC;~~YACjB~~,2BAA2B,CAAC,GAAG,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACxD,CAAC;aAAM,CAAC;YACJ,wEAAwE;YACxE,0EAA0E;YAC1E,4EAA4E;YAC5E,2EAA2E;YAC3E,6DAA6D;YAC7D,MAAM,MAAM,GAAG,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;YAClC,2BAA2B,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,CAAC;YACtD,4EAA4E;YAC5E,uDAAuD;YACvD,IAAI,KAAK,KAAK,SAAS;gBAAE,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1D,CAAC;QACD,+EAA+E;QAC/E,kFAAkF;QAClF,wBAAwB;QACxB,IAAI,CAAC;YACD,MAAM,EAAE,+BAA+B,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YACxF,+BAA+B,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACnE,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,OAAO,CAAC,IAAI,CAAC,uCAAuC,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;QAChF,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,IAAI,CAAC,0CAA0C,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;IACnF,CAAC;IACD,kCAAkC,EAAE,CAAC;IACrC,qBAAqB,EAAE,CAAC;AAC5B,CAAC;AAED,kDAAkD;AAClD,MAAM,UAAU,gBAAgB;IAC5B,kCAAkC,EAAE,CAAC;IACrC,6BAA6B,EAAE,CAAC;AACpC,CAAC;AAED;;;;;;;;;iEASiE;AACjE,MAAM,CAAC,KAAK,UAAU,6BAA6B;IAC/C,IAAI,CAAC;QACD,MAAM,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;QACpF,MAAM,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;QACxF,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC;QACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACtC,MAAM,KAAK,GAAG,mBAAmB,EAAE,EAAE,KAAK,IAAI,SAAS,CAAC;QACxD,MAAM,IAAI,GAAG,oBAAoB,CAAC,GAAG,EAAE,KAAK,EAAE,oBAAoB,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1F,2EAA2E;QAC3E,gFAAgF;QAChF,MAAM,MAAM,GAAG,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;~~QAClC~~,2BAA2B,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,CAAC;~~QACtD~~,IAAI,KAAK,KAAK,SAAS;~~YAAE~~,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;~~QACtD~~,IAAI,CAAC;YACD,MAAM,EAAE,+BAA+B,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YACxF,+BAA+B,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,OAAO,CAAC,IAAI,CAAC,qCAAqC,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;QAC9E,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,IAAI,CAAC,wCAAwC,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;IACjF,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,WAAoC,EAAE;IAC3E,8BAA8B,EAAE,CAAC;~~IACjC~~,OAAO,yBAAyB,CAAC,QAAQ,EAAE;QACvC,kBAAkB,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC;KACrD,CAAC,CAAC;AACP,CAAC"}
1	+ {"version":3,"file":"session-ops.js","sourceRoot":"","sources":["../../../src/core/session-ops.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,gEAAgE;AAChE,gFAAgF;AAChF,4EAA4E;AAE5E,OAAO,EAAE,kCAAkC,EAAE,8BAA8B,EAAE,MAAM,iCAAiC,CAAC;AACrH,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AACnG,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAE5F,8DAA8D;AAC9D,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACnC,qFAAqF;IACrF,sFAAsF;IACtF,sFAAsF;IACtF,yCAAyC;IACzC,MAAM,YAAY,GAAG,mBAAmB,EAAE,CAAC;IAC3C,MAAM,QAAQ,GAAG,YAAY,EAAE,KAAK,CAAC;IACrC,MAAM,aAAa,GAAG,YAAY,EAAE,aAAa,CAAC;IAClD,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;YAC9B,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9C,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,2BAA2B,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;QACpF,MAAM,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;QACxF,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC;QACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACtC,iFAAiF;QACjF,kFAAkF;QAClF,0EAA0E;QAC1E,kFAAkF;QAClF,MAAM,cAAc,GAAG,QAAQ,KAAK,SAAS,CAAC;QAC9C,MAAM,KAAK,GAAG,QAAQ,IAAI,SAAS,CAAC;QACpC,+EAA+E;QAC/E,oEAAoE;QACpE,MAAM,IAAI,GAAG,oBAAoB,CAAC,GAAG,EAAE,KAAK,EAAE,oBAAoB,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1F,IAAI,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7B,gEAAgE;YAChE,mEAAmE;YACnE,KAAK,MAAM,SAAS,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAU,EAAE,CAAC;gBACnD,MAAM,WAAW,GAAG,oBAAoB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;gBAC1D,IAAI,cAAc;oBAAE,2BAA2B,CAAC,GAAG,CAAC,WAAW,EAAE,GAAG,WAAW,GAAG,CAAC,CAAC;qBAC/E,CAAC;oBACF,kBAAkB,CAAC,GAAG,CAAC,GAAG,WAAW,IAAI,KAAK,EAAE,CAAC,CAAC;oBAClD,IAAI,KAAK,KAAK,SAAS;wBAAE,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBACjE,CAAC;YACL,CAAC;YACD,8DAA8D;YAC9D,gEAAgE;YAChE,+CAA+C;YAC/C,IAAI,cAAc;gBAAE,2BAA2B,CAAC,GAAG,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC5E,CAAC;aAAM,IAAI,cAAc,EAAE,CAAC;YACxB,2BAA2B,CAAC,GAAG,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACxD,CAAC;aAAM,CAAC;YACJ,wEAAwE;YACxE,0EAA0E;YAC1E,4EAA4E;YAC5E,2EAA2E;YAC3E,6DAA6D;YAC7D,MAAM,MAAM,GAAG,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;YAClC,2BAA2B,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,CAAC;YACtD,4EAA4E;YAC5E,uDAAuD;YACvD,IAAI,KAAK,KAAK,SAAS;gBAAE,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1D,CAAC;QACD,+EAA+E;QAC/E,kFAAkF;QAClF,wBAAwB;QACxB,IAAI,CAAC;YACD,MAAM,EAAE,+BAA+B,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YACxF,+BAA+B,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACnE,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,OAAO,CAAC,IAAI,CAAC,uCAAuC,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;QAChF,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,IAAI,CAAC,0CAA0C,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;IACnF,CAAC;IACD,kCAAkC,EAAE,CAAC;IACrC,qBAAqB,EAAE,CAAC;AAC5B,CAAC;AAED,kDAAkD;AAClD,MAAM,UAAU,gBAAgB;IAC5B,kCAAkC,EAAE,CAAC;IACrC,6BAA6B,EAAE,CAAC;AACpC,CAAC;AAED;;;;;;;;;iEASiE;AACjE,MAAM,CAAC,KAAK,UAAU,6BAA6B;IAC/C,IAAI,CAAC;QACD,MAAM,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;QACpF,MAAM,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;QACxF,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC;QACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACtC,MAAM,KAAK,GAAG,mBAAmB,EAAE,EAAE,KAAK,IAAI,SAAS,CAAC;QACxD,MAAM,IAAI,GAAG,oBAAoB,CAAC,GAAG,EAAE,KAAK,EAAE,oBAAoB,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1F,2EAA2E;QAC3E,gFAAgF;QAChF,IAAI,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7B,KAAK,MAAM,SAAS,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAU,EAAE,CAAC;gBACnD,MAAM,WAAW,GAAG,oBAAoB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;gBAC1D,kBAAkB,CAAC,GAAG,CAAC,GAAG,WAAW,IAAI,KAAK,EAAE,CAAC,CAAC;gBAClD,IAAI,KAAK,KAAK,SAAS;oBAAE,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACjE,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,MAAM,MAAM,GAAG,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;YAClC,2BAA2B,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,CAAC;YACtD,IAAI,KAAK,KAAK,SAAS;gBAAE,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1D,CAAC;QACD,IAAI,CAAC;YACD,MAAM,EAAE,+BAA+B,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YACxF,+BAA+B,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,OAAO,CAAC,IAAI,CAAC,qCAAqC,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;QAC9E,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,IAAI,CAAC,wCAAwC,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;IACjF,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,WAAoC,EAAE;IAC3E,IAAI,CAAC,+BAA+B,CAAC,QAAQ,CAAC;QAAE,8BAA8B,EAAE,CAAC;IACjF,OAAO,yBAAyB,CAAC,QAAQ,EAAE;QACvC,kBAAkB,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC;KACrD,CAAC,CAAC;AACP,CAAC"}

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

@@ -2,6 +2,8 @@
 // Phase 9.4 — server.js의 applySettingsPatch에서 추출한 deep merge 로직
 import { mergeAckSettings } from '../messaging/ack-reaction.js';
 import { mergeSlackAutoJoin } from '../slack/auto-join.js';
+import { isRuntimeTransport, isSwitchableNativeCli } from '../agent/runtime/selection.js';
+import { isPresentationMode } from '../shared/presentation.js';
 function isPlainRecord(value) {
     return !!value && typeof value === 'object' && !Array.isArray(value);
 }
@@ -17,6 +19,34 @@ export function sanitizeSettingsInput(input, source) {
     const invalidPaths = [];
     const rejectedPaths = [];
     let persistenceShape = 'absent';
+    if (Object.hasOwn(input, 'presentation')) {
+        if (!isPlainRecord(input['presentation'])) {
+            delete value['presentation'];
+            invalidPaths.push('presentation');
+        }
+        else {
+            const presentation = { ...input['presentation'] };
+            if (Object.hasOwn(presentation, 'mode') && !isPresentationMode(presentation['mode'])) {
+                delete presentation['mode'];
+                invalidPaths.push('presentation.mode');
+            }
+            value['presentation'] = presentation;
+        }
+    }
+    if (isPlainRecord(input['perCli'])) {
+        const perCli = Object.fromEntries(Object.entries(input['perCli']).map(([cli, entry]) => {
+            if (!isPlainRecord(entry))
+                return [cli, entry];
+            const provider = { ...entry };
+            if (isSwitchableNativeCli(cli) && Object.hasOwn(provider, 'transport')
+                && !isRuntimeTransport(provider['transport'])) {
+                delete provider['transport'];
+                invalidPaths.push(`perCli.${cli}.transport`);
+            }
+            return [cli, provider];
+        }));
+        value['perCli'] = perCli;
+    }
     const runtimeInput = isPlainRecord(input["runtime"]) ? input["runtime"] : null;
     const codexAppInput = runtimeInput && isPlainRecord(runtimeInput["codexApp"])
         ? runtimeInput["codexApp"]
@@ -113,7 +143,7 @@ export function mergeSettingsPatch(current, patch) {
         };
         delete remaining["dispatchApproval"].operators;
     }
-    for (const key of ['heartbeat', 'telegram', 'telegramHub', 'discord', 'slack', 'dispatchApproval', 'memory', 'stt', 'jawCeo', 'pi', 'tui', 'messaging', 'network', 'wiki']) {
+    for (const key of ['heartbeat', 'telegram', 'telegramHub', 'discord', 'slack', 'dispatchApproval', 'memory', 'stt', 'jawCeo', 'pi', 'tui', 'messaging', 'network', 'wiki', 'presentation']) {
         if (remaining[key] && typeof remaining[key] === 'object') {
             result[key] = { ...result[key], ...remaining[key] };
             delete remaining[key];

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

	@@ -1 +1 @@
1	- {"version":3,"file":"settings-merge.js","sourceRoot":"","sources":["../../../src/core/settings-merge.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,gEAAgE;AAEhE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;~~AAa3D~~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~~QACzK~~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"}
1	+ {"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 CHANGED Viewed

@@ -11,6 +11,8 @@ import { SETTINGS_PATH, settings, replaceSettings, migrateSettings, normalizePro
 import { mergeSettingsPatch, sanitizeSettingsInput } from './settings-merge.js';
 import { broadcast } from './bus.js';
 import { classifyAllowlistChange, recordAllowlistNarrowing } from '../slack/allowlist-audit.js';
+import { SWITCHABLE_NATIVE_CLIS, resolveRuntimeTransport } from '../agent/runtime/selection.js';
+import { bumpSessionOwnershipGeneration } from '../agent/session-persistence.js';
 export const SETTINGS_WATCH_DEBOUNCE_MS = 300;
 const SERVER_OWNED_SETTINGS_KEYS = [
     'settingsSchemaVersion',
@@ -108,7 +110,12 @@ export function reloadSettingsFromDisk(options = {}) {
     const allowlistChange = classifyAllowlistChange(externalPatch["slack"]?.["channelIds"], settings["slack"]?.channelIds);
     const merged = mergeSettingsPatch(settings, externalPatch);
     merged["projectDirs"] = normalizeProjectDirs(merged["projectDirs"]);
-    replaceSettings(migrateSettings(merged), sanitized.persistenceShape);
+    const candidate = migrateSettings(merged);
+    const transportChanged = SWITCHABLE_NATIVE_CLIS.some(cli => resolveRuntimeTransport(settings['perCli']?.[cli]?.transport)
+        !== resolveRuntimeTransport(candidate['perCli']?.[cli]?.transport));
+    replaceSettings(candidate, sanitized.persistenceShape);
+    if (transportChanged)
+        bumpSessionOwnershipGeneration();
     recordAllowlistNarrowing(allowlistChange, 'settings.json');
     broadcast('settings_change', {
         changedKeys: Object.keys(externalPatch),

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

	@@ -1 +1 @@
1	- {"version":3,"file":"settings-watch.js","sourceRoot":"","sources":["../../../src/core/settings-watch.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,sEAAsE;AACtE,uEAAuE;AACvE,sEAAsE;AACtE,yEAAyE;AACzE,wEAAwE;AACxE,gCAAgC;AAEhC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EACH,aAAa,EAAE,QAAQ,EAAE,eAAe,EAAE,eAAe,EACzD,oBAAoB,EAAE,uBAAuB,EAC7C,iCAAiC,EAAE,kCAAkC,EACrE,0BAA0B,EAAE,+BAA+B,GAC9D,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;~~AAEhG~~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~~eAAe~~,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC;~~IACrE~~,wBAAwB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IAC3D,SAAS,CAAC,iBAAiB,EAAE;QACzB,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;QACvC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC;QACpB,KAAK,EAAE,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC;QACrD,WAAW,EAAE,QAAQ,CAAC,aAAa,CAAC,IAAI,IAAI;QAC5C,MAAM,EAAE,UAAU;KACrB,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,4DAA4D;AAC5D,MAAM,UAAU,kBAAkB,CAAC,UAAgC,EAAE;IACjE,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,0BAA0B,CAAC;IACpE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACjF,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;IACpF,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAC1C,IAAI,KAAK,GAAyC,IAAI,CAAC;IAEvD,IAAI,OAA8B,CAAC;IACnC,IAAI,CAAC;QACD,wEAAwE;QACxE,iEAAiE;QACjE,OAAO,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;YAC1C,IAAI,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,IAAI;gBAAE,OAAO;YAClD,IAAI,KAAK;gBAAE,YAAY,CAAC,KAAK,CAAC,CAAC;YAC/B,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBACpB,KAAK,GAAG,IAAI,CAAC;gBACb,IAAI,CAAC;oBACD,sBAAsB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;gBACzC,CAAC;gBAAC,OAAO,CAAU,EAAE,CAAC;oBAClB,OAAO,CAAC,IAAI,CAAC,iCAAiC,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;gBAC1E,CAAC;YACL,CAAC,EAAE,UAAU,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACP,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QAClB,OAAO,CAAC,IAAI,CAAC,qCAAqC,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;QAC1E,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,GAAG,EAAE;QACR,IAAI,KAAK;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;QAC/B,KAAK,GAAG,IAAI,CAAC;QACb,IAAI,CAAC;YACD,OAAO,CAAC,KAAK,EAAE,CAAC;QACpB,CAAC;QAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,CAAC;IACpC,CAAC,CAAC;AACN,CAAC"}
1	+ {"version":3,"file":"settings-watch.js","sourceRoot":"","sources":["../../../src/core/settings-watch.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,sEAAsE;AACtE,uEAAuE;AACvE,sEAAsE;AACtE,yEAAyE;AACzE,wEAAwE;AACxE,gCAAgC;AAEhC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EACH,aAAa,EAAE,QAAQ,EAAE,eAAe,EAAE,eAAe,EACzD,oBAAoB,EAAE,uBAAuB,EAC7C,iCAAiC,EAAE,kCAAkC,EACrE,0BAA0B,EAAE,+BAA+B,GAC9D,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAChG,OAAO,EAAE,8BAA8B,EAAE,MAAM,iCAAiC,CAAC;AAEjF,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAAG,CAAC;AAC9C,MAAM,0BAA0B,GAAG;IAC/B,uBAAuB;IACvB,yBAAyB;IACzB,8BAA8B;IAC9B,2BAA2B;CACrB,CAAC;AAgBX,SAAS,mBAAmB,CAAC,GAAY,EAAE,eAAwC;IAC/E,MAAM,GAAG,GAAG,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC5D,MAAM,eAAe,GAAG,eAAe,CAAC,iBAAiB,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IACzC,MAAM,WAAW,GAAG,eAAe,IAAI,OAAO,eAAe,KAAK,QAAQ;QACtE,CAAC,CAAE,eAAuE,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC;QAC1F,CAAC,CAAC,IAAI,CAAC;IACX,MAAM,WAAW,GAAG,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ;QACpD,CAAC,CAAE,MAA8D,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC;QACjF,CAAC,CAAC,IAAI,CAAC;IACX,OAAO,OAAO,WAAW,KAAK,QAAQ,IAAI,WAAW;QACjD,CAAC,CAAC,WAAW;QACb,CAAC,CAAC,OAAO,WAAW,KAAK,QAAQ,IAAI,WAAW;YAChD,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,SAAS,CAAC;AACpB,CAAC;AAED;;4EAE4E;AAC5E,MAAM,UAAU,sBAAsB,CAAC,UAAyB,EAAE;IAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACjF,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACD,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;IAClC,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QAClB,OAAO,CAAC,IAAI,CAAC,+BAA+B,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;QACpE,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,uBAAuB,EAAE,CAAC;IAC3G,IAAI,GAAG,KAAK,YAAY;QAAE,OAAO,KAAK,CAAC,CAAC,kBAAkB;IAC1D,IAAI,MAA+B,CAAC;IACpC,IAAI,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAC;QACzC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9D,OAAO,CAAC,IAAI,CAAC,8EAA8E,CAAC,CAAC;YAC7F,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,GAAG,KAAgC,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,CAAC,IAAI,CAAC,+EAA+E,CAAC,CAAC;QAC9F,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,MAAM,SAAS,GAAG,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzD,IAAI,SAAS,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrC,OAAO,CAAC,IAAI,CAAC,0DAA0D,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjH,CAAC;IACD,IAAI,SAAS,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpC,OAAO,CAAC,IAAI,CAAC,qDAAqD,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3G,CAAC;IACD,MAAM,aAAa,GAAG,EAAE,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;IAC7C,MAAM,gBAAgB,GAAG,0BAA0B,CAAC,aAAa,CAAC,CAAC;IACnE,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,EAAE,GAAI,aAAa,CAAC,MAAM,CAA6B,EAAE,CAAC;QACvE,KAAK,MAAM,GAAG,IAAI,+BAA+B;YAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;QACpE,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC;YAAE,aAAa,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;;YAC1D,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;QAClC,OAAO,CAAC,IAAI,CAAC,gEAAgE,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChH,CAAC;IACD,MAAM,4BAA4B,GAAG,iCAAiC,CAAC,aAAa,CAAC,CAAC;IACtF,IAAI,4BAA4B,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,EAAE,GAAI,aAAa,CAAC,OAAO,CAA6B,EAAE,CAAC;QACzE,KAAK,MAAM,GAAG,IAAI,kCAAkC,EAAE;YAAE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1E,aAAa,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;QAC/B,OAAO,CAAC,IAAI,CAAC,iEAAiE,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7H,CAAC;IACD,MAAM,WAAW,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,aAAa,CAAC,CAAC;IACrF,KAAK,MAAM,GAAG,IAAI,WAAW;QAAE,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC;IACzD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,wDAAwD,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACnG,CAAC;IACD,oEAAoE;IACpE,kEAAkE;IAClE,0EAA0E;IAC1E,EAAE;IACF,0EAA0E;IAC1E,2EAA2E;IAC3E,6EAA6E;IAC7E,6EAA6E;IAC7E,wDAAwD;IACxD,MAAM,eAAe,GAAG,uBAAuB,CAC1C,aAAa,CAAC,OAAO,CAAyC,EAAE,CAAC,YAAY,CAAC,EAC/E,QAAQ,CAAC,OAAO,CAAC,EAAE,UAAU,CAChC,CAAC;IACF,MAAM,MAAM,GAAG,kBAAkB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IAC3D,MAAM,CAAC,aAAa,CAAC,GAAG,oBAAoB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;IACpE,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CACvD,uBAAuB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;YACzD,uBAAuB,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;IACxE,eAAe,CAAC,SAAS,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC;IACvD,IAAI,gBAAgB;QAAE,8BAA8B,EAAE,CAAC;IACvD,wBAAwB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IAC3D,SAAS,CAAC,iBAAiB,EAAE;QACzB,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;QACvC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC;QACpB,KAAK,EAAE,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC;QACrD,WAAW,EAAE,QAAQ,CAAC,aAAa,CAAC,IAAI,IAAI;QAC5C,MAAM,EAAE,UAAU;KACrB,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,4DAA4D;AAC5D,MAAM,UAAU,kBAAkB,CAAC,UAAgC,EAAE;IACjE,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,0BAA0B,CAAC;IACpE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACjF,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;IACpF,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAC1C,IAAI,KAAK,GAAyC,IAAI,CAAC;IAEvD,IAAI,OAA8B,CAAC;IACnC,IAAI,CAAC;QACD,wEAAwE;QACxE,iEAAiE;QACjE,OAAO,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;YAC1C,IAAI,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,IAAI;gBAAE,OAAO;YAClD,IAAI,KAAK;gBAAE,YAAY,CAAC,KAAK,CAAC,CAAC;YAC/B,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBACpB,KAAK,GAAG,IAAI,CAAC;gBACb,IAAI,CAAC;oBACD,sBAAsB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;gBACzC,CAAC;gBAAC,OAAO,CAAU,EAAE,CAAC;oBAClB,OAAO,CAAC,IAAI,CAAC,iCAAiC,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;gBAC1E,CAAC;YACL,CAAC,EAAE,UAAU,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACP,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QAClB,OAAO,CAAC,IAAI,CAAC,qCAAqC,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;QAC1E,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,GAAG,EAAE;QACR,IAAI,KAAK;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;QAC/B,KAAK,GAAG,IAAI,CAAC;QACb,IAAI,CAAC;YACD,OAAO,CAAC,KAAK,EAAE,CAAC;QACpB,CAAC;QAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,CAAC;IACpC,CAAC,CAAC;AACN,CAAC"}

package/dist/src/discord/bot.js CHANGED Viewed

@@ -4,7 +4,7 @@ import { Client, Events, GatewayIntentBits, Partials } from 'discord.js';
 import { settings } from '../core/config.js';
 import { stripUndefined } from '../core/strip-undefined.js';
 import { submitMessage } from '../orchestrator/gateway.js';
-import { orchestrateAndCollect } from '../orchestrator/collect.js';
+import { orchestrateAndCollectData } from '../orchestrator/collect.js';
 import { isResetIntent } from '../orchestrator/pipeline.js';
 import { addBroadcastListener, removeBroadcastListener } from '../core/bus.js';
 import { saveUpload, buildMediaPromptMany } from '../agent/spawn.js';
@@ -96,6 +96,12 @@ function markChannelActive(channelId) {
  */
 const pendingQueueRequestIds = new Set();
 let targetReplyForwarderInstalled = false;
+// Identity-local option: survives the existing router without adding an HTTP field.
+const nativeBodyRequests = new WeakSet();
+function requiresNativeBodyDelivery(data) {
+    return (data['runtimeFinality'] === 'present' || data['runtimeFinality'] === 'absent')
+        && (data['runtimeStatus'] === 'done' || data['runtimeStatus'] === 'error' || data['runtimeStatus'] === 'stopped');
+}
 function installDiscordTargetReplyForwarder() {
     if (targetReplyForwarderInstalled)
         return;
@@ -113,7 +119,14 @@ function installDiscordTargetReplyForwarder() {
             return;
         if (data["requestId"] && pendingQueueRequestIds.has(String(data["requestId"])))
             return;
-        void sendChannelOutput({ channel: 'discord', type: 'text', text: String(data["text"]), target })
+        const text = String(data['text']);
+        const request = { channel: 'discord', type: 'text', text, target };
+        if (requiresNativeBodyDelivery(data)) {
+            if (!text.trim())
+                return;
+            nativeBodyRequests.add(request);
+        }
+        void sendChannelOutput(request)
             .then(async (result) => {
             if (!result.ok) {
                 log.error('[discord:target-reply]', logErrorText(result.error || 'send failed'));
@@ -392,7 +405,9 @@ async function dcOrchestrate(msg, prompt, displayMsg) {
         };
         const deliverQueued = async (data) => {
             {
-                const body = String(data["text"] ?? '');
+                const requireBodyDelivery = requiresNativeBodyDelivery(data);
+                const rawBody = String(data["text"] ?? '');
+                const body = requireBodyDelivery && !rawBody.trim() ? '' : rawBody;
                 if (!body) {
                     // Empty completion: nothing to send, but the notice must not
                     // linger until the timeout rewrite.
@@ -428,7 +443,8 @@ async function dcOrchestrate(msg, prompt, displayMsg) {
                         // agent already posted itself must not be posted again.
                         const sendResult = wasSelfDelivered({ target, text: body, since: queuedAnchor.value() })
                             ? { ok: true, error: undefined }
-                            : await sendDiscordTextRest(restToken, msg.channelId, body, { signal: outbound.signal });
+                            : await sendDiscordTextRest(restToken, msg.channelId, body, { signal: outbound.signal,
+                                ...(requireBodyDelivery ? { requireBodyDelivery: true } : {}) });
                         if (!sendResult.ok) {
                             delivered = false;
                             log.error('[discord:queue-send]', logErrorText(sendResult.error || 'send failed'));
@@ -527,12 +543,13 @@ async function dcOrchestrate(msg, prompt, displayMsg) {
     const turnStartedAt = nextDeliverySeq();
     void ack?.to('running');
     try {
-        const text = String(await orchestrateAndCollect(prompt, stripUndefined({
+        const collected = await orchestrateAndCollectData(prompt, stripUndefined({
             origin: 'discord', target, chatId, requestId: result.requestId, _skipInsert: true,
             scope: result.sessionContext?.scope,
             chatSessionId: result.sessionContext?.chatSessionId,
             remoteKey: result.sessionContext?.remoteKey,
-        })));
+        }));
+        const text = collected.text;
         const channel = asSendable(msg.channel);
         if (!channel)
             throw new Error('Discord channel is not text-based');
@@ -552,7 +569,8 @@ async function dcOrchestrate(msg, prompt, displayMsg) {
                 if (!restToken)
                     throw new Error('Discord client token unavailable');
                 if (!selfDelivered) {
-                    const sendResult = await sendDiscordTextRest(restToken, msg.channelId, text, { signal: outbound.signal });
+                    const sendResult = await sendDiscordTextRest(restToken, msg.channelId, text, { signal: outbound.signal,
+                        ...(requiresNativeBodyDelivery(collected.data) ? { requireBodyDelivery: true } : {}) });
                     if (!sendResult.ok)
                         throw new Error(sendResult.error || 'discord send failed');
                 }
@@ -922,7 +940,8 @@ export async function discordSendHandler(req) {
                     return { ok: false, error: 'Discord client token unavailable' };
                 const outbound = discordOutboundRegistry.start();
                 try {
-                    const sendResult = await sendDiscordTextRest(restToken, String(channelId), text, { signal: outbound.signal });
+                    const sendResult = await sendDiscordTextRest(restToken, String(channelId), text, { signal: outbound.signal,
+                        ...(nativeBodyRequests.has(req) ? { requireBodyDelivery: true } : {}) });
                     if (!sendResult.ok)
                         return { ok: false, error: sendResult.error || 'send failed' };
                 }
@@ -957,7 +976,7 @@ export async function discordSendHandler(req) {
         const text = req.text?.trim();
         if (!text)
             return { ok: false, error: 'text required' };
-        const result = await sendDiscordTextRest(sendClient.token, String(channelId), text);
+        const result = await sendDiscordTextRest(sendClient.token, String(channelId), text, nativeBodyRequests.has(req) ? { requireBodyDelivery: true } : undefined);
         if (!result.ok)
             return result;
         return { ok: true, channel_id: channelId, type: 'text' };