@rubytech/create-sitedesk-code 0.1.544 → 0.1.545

package/payload/server/server.js

@@ -29312,8 +29312,9 @@ var WaGateway = class {
     console.error(
       `[whatsapp-native] op=doc-context senderId=${senderId} accountId=${input.accountId} maxyAccountId=${input.effectiveAccountId}`
     );
+    const isRelay = input.source === "public-relay";
     let standingRules;
-    if (this.deps.fetchStandingRules) {
+    if (this.deps.fetchStandingRules && !isRelay) {
       const res = await this.deps.fetchStandingRules(input.effectiveAccountId);
       standingRules = res.block || void 0;
       const injected = res.block ? (res.block.match(/^- /gm) ?? []).length : 0;
@@ -29322,12 +29323,14 @@ var WaGateway = class {
         `[preference-inject] op=inject channel=wa accountId=${input.effectiveAccountId} injected=${injected} owner=${owner8} source=${res.source}`
       );
     }
+    const instructionKind = input.role === "public" || isRelay ? "account" : "platform";
     const agentDir = input.role === "public" ? input.publicAgentSlug : "admin";
-    const instruction = await this.deps.fetchTurnInstruction(input.effectiveAccountId, agentDir);
+    const instruction = instructionKind === "account" ? await this.deps.fetchTurnInstruction(input.effectiveAccountId, agentDir) : null;
+    const turnLabel = input.role === "public" ? "public" : isRelay ? "relay" : "direct";
     console.error(
-      `[whatsapp-native] op=instruction-source accountId=${input.effectiveAccountId} agentDir=${agentDir ?? "none"} source=${instruction.source} bytes=${instruction.bytes}`
+      `[whatsapp-native] op=instruction-source accountId=${input.effectiveAccountId} agentDir=${instruction ? agentDir ?? "none" : "-"} turn=${turnLabel} source=${instruction ? instruction.source : "platform"} bytes=${instruction ? instruction.bytes : 0}`
     );
-    if (instruction.source === "absent") {
+    if (instruction?.source === "absent") {
       console.error(
         `[whatsapp-native] op=inbound senderId=${senderId} accountId=${input.accountId} effectiveAccountId=${input.effectiveAccountId} bytes=${bytes} ${mediaField} source=${source} delivery=refused sessionId=${this.sessionIdFor(input, senderId)}`
       );
@@ -29345,7 +29348,8 @@ var WaGateway = class {
         media: input.media,
         source,
         standingRules,
-        turnInstruction: instruction.body,
+        instructionKind,
+        ...instruction ? { turnInstruction: instruction.body } : {},
         scheduleProvenance: input.scheduleProvenance,
         // Task 1897 — the quoted message rides the SSE frame to the channel
         // server, which renders it at the top of the reframed payload.
@@ -30400,27 +30404,12 @@ var WebchatGateway = class _WebchatGateway {
       );
     }
     const messageId = `wc-${++this.seq}`;
-    let turnInstruction;
-    if (input.role === "admin") {
-      const instruction = await this.deps.fetchTurnInstruction(input.accountId, "admin");
-      console.error(
-        `[webchat:inbound] op=instruction-source accountId=${input.accountId} channel=webchat source=${instruction.source} bytes=${instruction.bytes}`
-      );
-      if (instruction.source === "absent") {
-        console.error(
-          `[webchat:inbound] op=received key=${keyDisplay(input.key)} messageId=${messageId} role=${input.role} bytes=${bytes} delivery=refused`
-        );
-        return { spawn: null };
-      }
-      turnInstruction = instruction.body;
-    }
     this.hub.deliver(
       {
         key: input.key,
         text: input.text,
         messageId,
         standingRules,
-        ...turnInstruction !== void 0 ? { turnInstruction } : {},
         ...input.replyContext ? { replyContext: input.replyContext } : {}
       },
       Date.now()
@@ -31322,22 +31311,8 @@ var TelegramGateway = class {
         `[preference-inject] op=inject channel=tg accountId=${input.accountId} injected=${injected} owner=${owner8} source=${res.source}`
       );
     }
-    let turnInstruction;
-    if (input.role === "admin") {
-      const instruction = await this.deps.fetchTurnInstruction(input.accountId, "admin");
-      console.error(
-        `[telegram-native] op=instruction-source accountId=${input.accountId} channel=telegram source=${instruction.source} bytes=${instruction.bytes}`
-      );
-      if (instruction.source === "absent") {
-        console.error(
-          `[telegram-native] op=inbound key=${input.senderId} accountId=${input.accountId} botType=${input.role} bytes=${bytes} source=${source} delivery=refused sessionId=${this.sessionIdFor(input)}`
-        );
-        return;
-      }
-      turnInstruction = instruction.body;
-    }
     this.hub.deliver(
-      { key: input.senderId, text: input.text, messageId: `tg-${++this.seq}`, source, standingRules, turnInstruction, scheduleProvenance: input.scheduleProvenance },
+      { key: input.senderId, text: input.text, messageId: `tg-${++this.seq}`, source, standingRules, scheduleProvenance: input.scheduleProvenance },
       Date.now()
     );
     const resolvedSessionId = this.sessionIdFor(input);
@@ -32498,10 +32473,9 @@ var webchatGateway = new WebchatGateway({
     if (acct) notify("webchat-pointer", acct);
   },
   fetchStandingRules: fetchAccountStandingRules,
-  // Task 2331 — the account's own `## Instruction` body, read from that
-  // account's admin agent files. Same resolver and same async wrapping as the
-  // WhatsApp gateway above; the resolver is synchronous on disk.
-  fetchTurnInstruction: async (accountId, agentDir) => resolveTurnInstruction(accountId, agentDir),
+  // Task 2353 — no turn-instruction resolver on this door. See the dep comment
+  // in webchat-gateway.ts: the account file governs the relay turn, which only
+  // the WhatsApp door raises.
   gatewayUrl: webchatGatewayUrl(),
   serverPath: webchatServerPath(),
   ensureChannelSession: async ({ accountId, key, role, adminUserId, gatewayUrl, serverPath, sessionId, public: pub }) => {
@@ -32602,10 +32576,9 @@ webchatGateway.startPublicReaper();
 var telegramFileFollowers = /* @__PURE__ */ new Map();
 var telegramGateway = new TelegramGateway({
   fetchStandingRules: fetchAccountStandingRules,
-  // Task 2336 — the account's own `## Instruction` body, read from that
-  // account's admin agent files. Same resolver and same async wrapping as the
-  // WhatsApp and webchat gateways above; the resolver is synchronous on disk.
-  fetchTurnInstruction: async (accountId, agentDir) => resolveTurnInstruction(accountId, agentDir),
+  // Task 2353 — no turn-instruction resolver on this door. See the dep comment in
+  // telegram-gateway.ts: the account file governs the relay turn, which only the
+  // WhatsApp door raises.
   resolveSessionOverride: (accountId, senderId) => resolveChannelOverride(accountId, "telegram", senderId),
   gatewayUrl: telegramGatewayUrl(),
   serverPath: telegramServerPath(),