cli-jaw 2.17.46 → 2.17.47

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

@@ -105,123 +105,99 @@ export function sanitizeSettingsInput(input, source) {
         rejectedPaths,
     };
 }
+export const SETTINGS_MERGE_SPEC = {
+    perCli: { kind: 'perEntry' },
+    activeOverrides: { kind: 'perEntry' },
+    telegram: { kind: 'nested', children: ['ack'] },
+    discord: { kind: 'nested', children: ['ack'] },
+    slack: { kind: 'nested', children: ['ack', 'autoJoin'] },
+    dispatchApproval: { kind: 'nested', children: ['operators'] },
+    network: { kind: 'nested', children: ['remoteAccess'] },
+    runtime: { kind: 'nested', children: ['codexApp'] },
+    multiSession: { kind: 'nested', children: ['channels'] },
+    avatar: { kind: 'nested', children: ['agent', 'user'] },
+    messaging: { kind: 'nested', children: ['latestSeen', 'lastActive'] },
+    heartbeat: { kind: 'shallow' },
+    telegramHub: { kind: 'shallow' },
+    memory: { kind: 'shallow' },
+    stt: { kind: 'shallow' },
+    jawCeo: { kind: 'shallow' },
+    pi: { kind: 'shallow' },
+    tui: { kind: 'shallow' },
+    wiki: { kind: 'shallow' },
+    code: { kind: 'shallow' },
+    search: { kind: 'shallow' },
+    trace: { kind: 'shallow' },
+    presentation: { kind: 'shallow' },
+};
+/** Lay the incoming document over the base per SETTINGS_MERGE_SPEC, mutating neither. */
+export function mergeSettingsLayer(base, incoming) {
+    const result = { ...base };
+    for (const [key, value] of Object.entries(incoming)) {
+        const rule = SETTINGS_MERGE_SPEC[key];
+        // A scalar, an array or an explicit null replaces the block. Only an
+        // object can be merged into one, and only a named key is merged at all.
+        if (!rule || !isPlainRecord(value)) {
+            result[key] = value;
+            continue;
+        }
+        const current = isPlainRecord(base[key]) ? base[key] : {};
+        if (rule.kind === 'perEntry') {
+            const merged = { ...current };
+            for (const [entry, cfg] of Object.entries(value)) {
+                merged[entry] = isPlainRecord(cfg) && isPlainRecord(merged[entry])
+                    ? { ...merged[entry], ...cfg }
+                    : cfg;
+            }
+            result[key] = merged;
+            continue;
+        }
+        const merged = { ...current, ...value };
+        if (rule.kind === 'nested') {
+            for (const child of rule.children) {
+                if (!isPlainRecord(value[child]))
+                    continue;
+                const childBase = isPlainRecord(current[child]) ? current[child] : {};
+                merged[child] = { ...childBase, ...value[child] };
+            }
+        }
+        result[key] = merged;
+    }
+    return result;
+}
 /**
  * settings 객체에 patch를 deep merge
- * perCli와 activeOverrides는 CLI별로 개별 merge (기존 effort/model 보존)
  * @param {object} current - 현재 settings
  * @param {object} patch - 적용할 패치
  * @returns {object} 새 settings (current를 직접 변경하지 않음)
  */
 export function mergeSettingsPatch(current, patch) {
-    const result = structuredClone(current);
-    const remaining = { ...patch };
-    // Deep merge perCli at per-CLI level
-    if (remaining["perCli"] && typeof remaining["perCli"] === 'object') {
-        result["perCli"] = result["perCli"] || {};
-        for (const [cli, cfg] of Object.entries(remaining["perCli"])) {
-            result["perCli"][cli] = { ...result["perCli"][cli], ...cfg };
-        }
-        delete remaining["perCli"];
-    }
-    // Deep merge activeOverrides at per-CLI level
-    if (remaining["activeOverrides"] && typeof remaining["activeOverrides"] === 'object') {
-        result["activeOverrides"] = result["activeOverrides"] || {};
-        for (const [cli, cfg] of Object.entries(remaining["activeOverrides"])) {
-            result["activeOverrides"][cli] = { ...result["activeOverrides"][cli], ...cfg };
-        }
-        delete remaining["activeOverrides"];
-    }
-    // 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.
-    if (remaining["dispatchApproval"]?.operators && typeof remaining["dispatchApproval"].operators === 'object') {
-        result["dispatchApproval"] = result["dispatchApproval"] || {};
-        remaining["dispatchApproval"] = { ...remaining["dispatchApproval"] };
-        result["dispatchApproval"].operators = {
-            ...(result["dispatchApproval"].operators || {}),
-            ...remaining["dispatchApproval"].operators,
-        };
-        delete remaining["dispatchApproval"].operators;
-    }
-    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];
-        }
-    }
-    // The loop above merges channel objects one level deep, so a patch carrying
-    // only {ack:{enabled:true}} would drop scope, emoji and removeAfterReply.
-    // Reads `patch` rather than `remaining` because the loop already deleted the
-    // key. Shares mergeAckSettings with the boot merge in config.ts so the three
-    // ingresses (boot/api/watch) cannot diverge.
+    // The layer speaks in unknown so it adds no any-typed surface; the patch API
+    // has always handed callers an indexable settings object, so it keeps doing so.
+    const result = mergeSettingsLayer(structuredClone(current), patch);
+    // Normalization, not merging. ack.emoji is a third level the spec does not
+    // reach, and slack.autoJoin has to be REPAIRED rather than combined: its
+    // budget reaches a loop that joins real channels, so {autoJoin:null} and
+    // {autoJoin:'yes'} must not survive to disk, where the next boot would read
+    // them as absent and quietly restore default-on. Reads the original patch
+    // because the layer above has already consumed the key.
     for (const key of ['telegram', 'discord', 'slack']) {
         const patchChannel = patch[key];
-        if (!patchChannel || typeof patchChannel !== 'object')
+        if (!isPlainRecord(patchChannel))
             continue;
-        const patchAck = patchChannel["ack"];
-        const currentChannel = current[key];
-        if (patchAck && typeof patchAck === 'object' && !Array.isArray(patchAck)) {
+        const currentChannel = isPlainRecord(current[key]) ? current[key] : undefined;
+        const patchAck = patchChannel['ack'];
+        if (isPlainRecord(patchAck)) {
+            result[key] = { ...result[key], ack: mergeAckSettings(currentChannel?.['ack'], patchAck) };
+        }
+        // Any mention of autoJoin is repaired, including a malformed one.
+        if (key === 'slack' && 'autoJoin' in patchChannel) {
             result[key] = {
                 ...result[key],
-                ack: mergeAckSettings(currentChannel?.["ack"], patchAck),
-            };
-        }
-        // slack.autoJoin is the same nested-group case, and its budget reaches
-        // a loop that joins real channels — so this path normalizes as well as
-        // merges. A PUT carrying {autoJoin:{enabled:false}} must not erase
-        // maxJoinsPerRun, and {maxJoinsPerRun:-1} must not reach the runner.
-        if (key === 'slack') {
-            const slackPatch = patchChannel;
-            const patchAutoJoin = slackPatch["autoJoin"];
-            // Any mention of the key is repaired, including a malformed one.
-            // Testing for a well-formed object would let {autoJoin:null} and
-            // {autoJoin:'yes'} through the one-level spread above and survive
-            // to disk, where the next boot reads them as "absent" and quietly
-            // restores default-on. A patch that names the key gets a valid
-            // block or nothing.
-            if ('autoJoin' in slackPatch) {
-                result[key] = {
-                    ...result[key],
-                    autoJoin: mergeSlackAutoJoin(currentChannel?.["autoJoin"], patchAutoJoin),
-                };
-            }
-        }
-    }
-    // Deep merge nested network.remoteAccess
-    if (remaining["network"]?.remoteAccess && typeof remaining["network"].remoteAccess === 'object') {
-        result["network"] = result["network"] || {};
-        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"],
+                autoJoin: mergeSlackAutoJoin(currentChannel?.['autoJoin'], patchChannel['autoJoin']),
             };
         }
-        delete remaining["multiSession"];
     }
-    // Top-level scalar fields
-    Object.assign(result, remaining);
     return result;
 }
 //# sourceMappingURL=settings-merge.js.map

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

package/dist/src/discord/bot.js

@@ -23,9 +23,13 @@ import { handleDiscordSlashCommand, registerDiscordSlashCommands } from './comma
 import { createDiscordForwarder, relayDiscordImages } from './forwarder.js';
 import { nextDeliverySeq, pendingDeliveryAnchor, wasSelfDelivered } from '../messaging/turn-delivery.js';
 import { shouldSkipForwarding } from '../messaging/forwarder-origin.js';
+import { requiresNativeBodyDelivery } from '../messaging/native-body.js';
+import { createQueueNoticeRecorder } from '../messaging/queue-notice-record.js';
+import { admitTargetReply } from '../messaging/target-reply-guard.js';
 import { sendDiscordFile } from './discord-file.js';
 import { getDiscordSendClient, sendDiscordFileRest, sendDiscordTextRest } from './send-only-client.js';
 import { invalidateDiscordSendClient } from './send-only-client.js';
+import { deliverySent } from '../messaging/delivery-outcome.js';
 import { OutboundSendRegistry } from '../messaging/outbound-lifecycle.js';
 import { asSendable, asThreadLike, asTypingChannel } from './channel-types.js';
 import { log } from '../core/logger.js';
@@ -98,30 +102,26 @@ 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;
     targetReplyForwarderInstalled = true;
     addBroadcastListener((type, data) => {
-        if (type !== 'orchestrate_done' || data["origin"] !== 'discord' || !data["text"])
-            return;
         // Queued turns only: an ordinary reply is posted by the dispatch path
         // that is still awaiting it, and answering here too would double-post.
         // Errors included: after a restart nothing else will show them.
-        if (data["fromQueue"] !== true)
-            return;
-        const target = data["target"];
-        if (!target || target.channel !== 'discord' || !target.targetId)
-            return;
-        if (data["requestId"] && pendingQueueRequestIds.has(String(data["requestId"])))
+        const admitted = admitTargetReply(type, data, {
+            channel: 'discord',
+            event: 'orchestrate_done',
+            accept: ['fromQueue'],
+            requireText: true,
+            hasPendingWaiter: requestId => pendingQueueRequestIds.has(requestId),
+        });
+        if (!admitted)
             return;
-        const text = String(data['text']);
+        const { target, text } = admitted;
         const request = { channel: 'discord', type: 'text', text, target };
-        if (requiresNativeBodyDelivery(data)) {
+        if (admitted.requireBodyDelivery) {
             if (!text.trim())
                 return;
             nativeBodyRequests.add(request);
@@ -199,33 +199,11 @@ const discordOutboundRegistry = new OutboundSendRegistry();
 /** Covers a notice edit plus a remove-then-add reaction chain. */
 const DISCORD_NOTICE_DRAIN_MS = DISCORD_REACTION_TIMEOUT_MS * 2 + 3000;
 // ─── Durable notice records (#418) ──────────────────
-// The registry above is process-local; these wrap the store that outlives the
+// The registry above is process-local; this wraps the store that outlives the
 // process. Best-effort by contract: a durable write is a convenience for the NEXT
-// boot, so letting it throw would fail the turn the user is waiting on.
-function reserveDiscordNoticeRecord(requestId, target) {
-    try {
-        getQueueNoticeStore()?.reserve({ requestId, channel: 'discord', target });
-    }
-    catch (e) {
-        log.info('[discord:queue-notice] reserve failed', logErrorText(e));
-    }
-}
-function attachDiscordNoticeRecord(requestId, messageId) {
-    try {
-        getQueueNoticeStore()?.attachMessageId(requestId, messageId);
-    }
-    catch (e) {
-        log.info('[discord:queue-notice] attach failed', logErrorText(e));
-    }
-}
-function closeDiscordNoticeRecord(requestId) {
-    try {
-        getQueueNoticeStore()?.close(requestId);
-    }
-    catch (e) {
-        log.info('[discord:queue-notice] close failed', logErrorText(e));
-    }
-}
+// boot, so letting it throw would fail the turn the user is waiting on. The
+// contract is shared with the other two bots (#699).
+const discordNoticeRecord = createQueueNoticeRecorder('discord', '[discord:queue-notice]');
 /**
  * Close a queue notice as ANSWERED from the standing forwarder, which never
  * held the live handle. Mirrors the Slack fix: when the forwarder delivers a
@@ -263,7 +241,7 @@ async function closeDiscordNoticeAsAnsweredByRequestId(requestId) {
                     throw e;
             }
         }
-        closeDiscordNoticeRecord(requestId);
+        discordNoticeRecord.close(requestId);
     }
     catch (e) {
         log.info('[discord:queue-notice] answered-close failed', logErrorText(e));
@@ -372,7 +350,7 @@ async function dcOrchestrate(msg, prompt, displayMsg) {
                 // Closed in-process, so the durable record has nothing left to
                 // restore on the next boot.
                 if (requestId)
-                    closeDiscordNoticeRecord(requestId);
+                    discordNoticeRecord.close(requestId);
             }
             finally {
                 // Centralized here: every terminal path routes through a claim, so
@@ -416,7 +394,7 @@ async function dcOrchestrate(msg, prompt, displayMsg) {
                         ack?.settle('failure') ?? Promise.resolve(),
                     ]);
                     if (requestId)
-                        closeDiscordNoticeRecord(requestId);
+                        discordNoticeRecord.close(requestId);
                     return;
                 }
                 const channel = asSendable(msg.channel);
@@ -465,7 +443,7 @@ async function dcOrchestrate(msg, prompt, displayMsg) {
                     ack?.settle(delivered ? 'success' : 'failure') ?? Promise.resolve(),
                 ]);
                 if (requestId)
-                    closeDiscordNoticeRecord(requestId);
+                    discordNoticeRecord.close(requestId);
                 {
                     const relayScope = discordOutboundRegistry.start();
                     await relayDiscordImages(msg.client, target, body, {
@@ -492,7 +470,7 @@ async function dcOrchestrate(msg, prompt, displayMsg) {
         // Reserved BEFORE the post: a record with no id restores to nothing, while
         // a posted message with no record is unreachable forever (#418).
         if (requestId)
-            reserveDiscordNoticeRecord(requestId, target);
+            discordNoticeRecord.reserve(requestId, target);
         const posted = await msg.reply(t('tg.queued', { count: result.pending }, currentLocale())).catch((e) => {
             log.info('[discord:queue-notice] post failed', logErrorText(e));
             return undefined;
@@ -500,7 +478,7 @@ async function dcOrchestrate(msg, prompt, displayMsg) {
         if (posted) {
             notice.bind(createDiscordNoticeTransport(posted));
             if (requestId)
-                attachDiscordNoticeRecord(requestId, posted.id);
+                discordNoticeRecord.attach(requestId, posted.id);
         }
         else {
             // No handle will ever arrive, so a deferred close would wait for a
@@ -508,7 +486,7 @@ async function dcOrchestrate(msg, prompt, displayMsg) {
             notice.abandon();
             // The reservation describes a message that does not exist.
             if (requestId)
-                closeDiscordNoticeRecord(requestId);
+                discordNoticeRecord.close(requestId);
             // Then close the turn out properly: abandoning the notice alone would
             // leave the listener, the request-id claim, the timer and the running
             // reaction alive until the 5-minute timeout or shutdown.
@@ -939,16 +917,17 @@ export async function discordSendHandler(req) {
                 if (!restToken)
                     return { ok: false, error: 'Discord client token unavailable' };
                 const outbound = discordOutboundRegistry.start();
+                let restResult;
                 try {
-                    const sendResult = await sendDiscordTextRest(restToken, String(channelId), text, { signal: outbound.signal,
+                    restResult = 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' };
+                    if (!restResult.ok)
+                        return { ok: false, error: restResult.error || 'send failed' };
                 }
                 finally {
                     outbound.done();
                 }
-                return { ok: true, channel_id: channelId, type: 'text' };
+                return { ok: true, channel_id: channelId, type: 'text', ...deliverySent(restResult.platformMessageId) };
             }
             catch (e) {
                 return { ok: false, error: e.message };
@@ -966,7 +945,9 @@ export async function discordSendHandler(req) {
         const fileResult = await sendDiscordFile(discordClient, target, filePath, stripUndefined({ caption: req.caption }));
         if (!fileResult.ok)
             return fileResult;
-        return { ok: true, channel_id: channelId, type: req.type };
+        return { ok: true, channel_id: channelId, type: req.type,
+            ...(fileResult.confirmation ? { confirmation: fileResult.confirmation } : {}),
+            ...deliverySent(fileResult.platformMessageId ?? null) };
     }
     const sendClient = getDiscordSendClient();
     if (!sendClient.token) {
@@ -979,7 +960,7 @@ export async function discordSendHandler(req) {
         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' };
+        return { ok: true, channel_id: channelId, type: 'text', ...deliverySent(result.platformMessageId) };
     }
     const filePath = req.filePath;
     if (!filePath)
@@ -987,7 +968,9 @@ export async function discordSendHandler(req) {
     const fileResult = await sendDiscordFileRest(sendClient.token, String(channelId), filePath, req.caption);
     if (!fileResult.ok)
         return fileResult;
-    return { ok: true, channel_id: channelId, type: req.type };
+    return { ok: true, channel_id: channelId, type: req.type,
+        ...(fileResult.confirmation ? { confirmation: fileResult.confirmation } : {}),
+        ...deliverySent(fileResult.platformMessageId) };
 }
 // Transport registration moved to ./register.js (lazy loader) so importing
 // this module — and discord.js's ~48MB with it — happens on first use only.