oft-agt 0.5.8 → 0.5.10

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "oft-agt",
-  "version": "0.5.8",
+  "version": "0.5.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "oft-agt",
-      "version": "0.5.8",
+      "version": "0.5.10",
       "dependencies": {
         "discord.js": "^14.14.0",
         "ws": "^8.18.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oft-agt",
-  "version": "0.5.8",
+  "version": "0.5.10",
   "private": false,
   "type": "module",
   "engines": {

package/runtime/execute.mjs

@@ -84,15 +84,36 @@ async function executeAdmitted(command, interaction, client, options) {
   const optionValues = { ...(options.buttonSnapshot?.variables || resolveOptions(command.options, interaction)), ...contextVariables(interaction, client), ...(options.contextVariables || {}) };
 
   optionValues.command_name=command.name;
-  const usesCustomVariables = Boolean(JSON.stringify(command).includes('randomCondition') || referencedVariables(command).length || JSON.stringify(command).includes('"fn":"setVariable"') || JSON.stringify(command).includes('"fn":"deleteVariable"'));
-  const privateAck = usesCustomVariables || (() => {
-    function flatten(calls) { return calls.flatMap(call => call.fn !== 'condition' ? [call] : (() => { const args = interpolateOptions(call.args, optionValues); const index = selectConditionBranch(args.kind, args.rules, interaction, options.random); return flatten(index < 0 ? call.otherwise.calls : call.branches[index].calls); })()); }
-    const firstReply = flatten(command.calls).find(call => call.fn === 'sendMessage' && call.args.sendMode === 'reply' && call.args.replyMode === 'command');
-    return !firstReply || Boolean(firstReply.args.ephemeral);
-  })();
+  // Visibility belongs to the configured reply, not to its use of variables.
+  // Inspect possible first replies without reading variables, running actions
+  // or drawing random branches before execution. A private first reply on any
+  // path keeps mixed-visibility commands private until their branch is known.
+  function firstReplies(calls) {
+    const visibility = new Set();
+    for (const call of calls) {
+      if (call.fn === 'sendMessage' && (call.args.sendMode || 'reply') === 'reply' && (call.args.replyMode || 'command') === 'command') {
+        visibility.add(Boolean(call.args.ephemeral));
+        return { visibility, fallsThrough: false };
+      }
+      if (call.fn === 'condition') {
+        let branches = [...call.branches, call.otherwise];
+        if (call.args.kind !== 'randomCondition' && !referencedVariables(call.args).length) {
+          const args = interpolateOptions(call.args, optionValues);
+          const index = selectConditionBranch(args.kind, args.rules, interaction);
+          branches = [index < 0 ? call.otherwise : call.branches[index]];
+        }
+        const paths = branches.map(branch => firstReplies(branch.calls));
+        for (const path of paths) for (const value of path.visibility) visibility.add(value);
+        if (!paths.some(path => path.fallsThrough)) return { visibility, fallsThrough: false };
+      }
+    }
+    return { visibility, fallsThrough: true };
+  }
+  const { visibility } = firstReplies(command.calls);
+  const privateAck = !visibility.size || visibility.has(true);
   if (!interaction.eventTrigger) await interaction.deferReply(privateAck ? { flags: 64 } : {});
   if (options.signal.aborted) throw options.signal.reason;
-  const context = { interaction, client, messages: new Map(options.buttonSnapshot?.messages), channels: new Map(options.buttonSnapshot?.channels), hasCommandReply: false, signal: options.signal || AbortSignal.timeout(870000), variableStore: options.variableStore, variableReplyMode: usesCustomVariables };
+  const context = { interaction, client, messages: new Map(options.buttonSnapshot?.messages), channels: new Map(options.buttonSnapshot?.channels), hasCommandReply: false, signal: options.signal || AbortSignal.timeout(870000), variableStore: options.variableStore, ackEphemeral: privateAck };
   const definitions = options.variableDefinitions || [];
   const warn = code => options.onWarning?.(code);
   context.variableOptions = variableRuntimeOptions(context, optionValues, definitions, options.variableStore, warn);

package/runtime/functions.mjs

@@ -101,8 +101,18 @@ async function sendMessage(context, parameters) {
 
   if (!context.hasCommandReply) {
 
-    const message = context.variableReplyMode && !config.ephemeral ? await interaction.followUp({ ...payload, flags: 0 }) : await interaction.editReply(payload);
-    if (context.variableReplyMode && !config.ephemeral) context.removeDeferredReply = true;
+    // Discord treats the first follow-up after a defer as an edit of that
+    // acknowledgement, preserving its visibility. Complete it before sending
+    // a separate response whose visibility differs from the acknowledgement.
+    const differentVisibility = context.ackEphemeral !== undefined
+      ? context.ackEphemeral !== config.ephemeral
+      : context.variableReplyMode && !config.ephemeral;
+    let message;
+    if (differentVisibility) {
+      await interaction.editReply({ content: '\u200b', embeds: [], components: [] });
+      context.removeDeferredReply = true;
+      message = await interaction.followUp({ ...payload, flags: config.ephemeral ? 64 : 0 });
+    } else message = await interaction.editReply(payload);
 
     context.hasCommandReply = true;
 

package/version.mjs

@@ -1 +1 @@
-export const AGENT_VERSION = '0.5.8';
+export const AGENT_VERSION = '0.5.10';