fix(tlon): unify settings reconciliation semantics

steipete · steipete · commit 535263572e85 · 2026-03-22T23:59:04.000-07:00
diff --git a/extensions/tlon/src/monitor/index.ts b/extensions/tlon/src/monitor/index.ts
@@ -35,6 +35,7 @@ import {
   isBotMentioned,
   stripBotMention,
   isDmAllowed,
+  isGroupInviteAllowed,
   isSummarizationRequest,
   resolveAuthorizedMessageText,
   type ParsedCite,
@@ -1084,69 +1085,22 @@ export async function monitorTlonProvider(opts: MonitorTlonOpts = {}): Promise<v
         // during transitions. The authorization check handles access control.
       }
 
-      // Update DM allowlist
-      if (newSettings.dmAllowlist !== undefined) {
-        effectiveDmAllowlist = newSettings.dmAllowlist;
-        runtime.log?.(`[tlon] Settings: dmAllowlist updated to ${effectiveDmAllowlist.join(", ")}`);
-      }
-
-      // Update model signature setting
-      if (newSettings.showModelSig !== undefined) {
-        effectiveShowModelSig = newSettings.showModelSig;
-        runtime.log?.(`[tlon] Settings: showModelSig = ${effectiveShowModelSig}`);
-      }
-
-      // Update auto-accept DM invites setting
-      if (newSettings.autoAcceptDmInvites !== undefined) {
-        effectiveAutoAcceptDmInvites = newSettings.autoAcceptDmInvites;
-        runtime.log?.(`[tlon] Settings: autoAcceptDmInvites = ${effectiveAutoAcceptDmInvites}`);
-      }
-
-      // Update auto-accept group invites setting
-      if (newSettings.autoAcceptGroupInvites !== undefined) {
-        effectiveAutoAcceptGroupInvites = newSettings.autoAcceptGroupInvites;
-        runtime.log?.(
-          `[tlon] Settings: autoAcceptGroupInvites = ${effectiveAutoAcceptGroupInvites}`,
-        );
-      }
-
-      // Update group invite allowlist
-      if (newSettings.groupInviteAllowlist !== undefined) {
-        effectiveGroupInviteAllowlist = newSettings.groupInviteAllowlist;
-        runtime.log?.(
-          `[tlon] Settings: groupInviteAllowlist updated to ${effectiveGroupInviteAllowlist.join(", ")}`,
-        );
-      }
-
-      if (newSettings.defaultAuthorizedShips !== undefined) {
-        runtime.log?.(
-          `[tlon] Settings: defaultAuthorizedShips updated to ${(newSettings.defaultAuthorizedShips || []).join(", ")}`,
-        );
-      }
-
-      // Update auto-discover channels
-      if (newSettings.autoDiscoverChannels !== undefined) {
-        effectiveAutoDiscoverChannels = newSettings.autoDiscoverChannels;
-        runtime.log?.(`[tlon] Settings: autoDiscoverChannels = ${effectiveAutoDiscoverChannels}`);
-      }
-
-      // Update owner ship
-      if (newSettings.ownerShip !== undefined) {
-        effectiveOwnerShip = newSettings.ownerShip
-          ? normalizeShip(newSettings.ownerShip)
-          : account.ownerShip
-            ? normalizeShip(account.ownerShip)
-            : null;
-        runtime.log?.(`[tlon] Settings: ownerShip = ${effectiveOwnerShip}`);
-      }
-
-      // Update pending approvals
-      if (newSettings.pendingApprovals !== undefined) {
-        pendingApprovals = newSettings.pendingApprovals;
-        runtime.log?.(
-          `[tlon] Settings: pendingApprovals updated (${pendingApprovals.length} items)`,
-        );
-      }
+      // Recompute effective settings from the latest snapshot so deletions
+      // cleanly fall back to file config and empty arrays remain authoritative.
+      ({
+        effectiveDmAllowlist,
+        effectiveShowModelSig,
+        effectiveAutoAcceptDmInvites,
+        effectiveAutoAcceptGroupInvites,
+        effectiveGroupInviteAllowlist,
+        effectiveAutoDiscoverChannels,
+        effectiveOwnerShip,
+        pendingApprovals,
+      } = applyTlonSettingsOverrides({
+        account,
+        currentSettings: newSettings,
+        log: (message) => runtime.log?.(message),
+      }));
     });
 
     try {
@@ -1300,8 +1254,6 @@ export async function monitorTlonProvider(opts: MonitorTlonOpts = {}): Promise<v
           }
 
           const inviterShip = validInvite.from;
-          const normalizedInviter = normalizeShip(inviterShip);
-
           // Owner invites are always accepted
           if (isOwner(inviterShip)) {
             try {
@@ -1337,12 +1289,7 @@ export async function monitorTlonProvider(opts: MonitorTlonOpts = {}): Promise<v
           }
 
           // Check if inviter is on allowlist
-          const isAllowed =
-            effectiveGroupInviteAllowlist.length > 0
-              ? effectiveGroupInviteAllowlist
-                  .map((s) => normalizeShip(s))
-                  .some((s) => s === normalizedInviter)
-              : false; // Fail-safe: empty allowlist means deny
+          const isAllowed = isGroupInviteAllowed(inviterShip, effectiveGroupInviteAllowlist);
 
           if (!isAllowed) {
             // If owner is configured, queue approval
diff --git a/extensions/tlon/src/monitor/settings-helpers.test.ts b/extensions/tlon/src/monitor/settings-helpers.test.ts
@@ -0,0 +1,71 @@
+import { describe, expect, it } from "vitest";
+import type { TlonResolvedAccount } from "../types.js";
+import { applyTlonSettingsOverrides } from "./settings-helpers.js";
+
+const baseAccount: TlonResolvedAccount = {
+  accountId: "default",
+  name: "Tlon",
+  enabled: true,
+  configured: true,
+  ship: "~sampel-palnet",
+  url: "https://example.com",
+  code: "lidlut-tabwed-pillex-ridrup",
+  allowPrivateNetwork: false,
+  groupChannels: ["chat/~host/general"],
+  dmAllowlist: ["~zod"],
+  groupInviteAllowlist: ["~bus"],
+  autoDiscoverChannels: true,
+  showModelSignature: false,
+  autoAcceptDmInvites: true,
+  autoAcceptGroupInvites: true,
+  defaultAuthorizedShips: ["~nec"],
+  ownerShip: "~marzod",
+};
+
+describe("applyTlonSettingsOverrides", () => {
+  it("treats explicit empty settings allowlists as authoritative deny-all", () => {
+    const result = applyTlonSettingsOverrides({
+      account: baseAccount,
+      currentSettings: {
+        dmAllowlist: [],
+        groupInviteAllowlist: [],
+      },
+    });
+
+    expect(result.effectiveDmAllowlist).toEqual([]);
+    expect(result.effectiveGroupInviteAllowlist).toEqual([]);
+  });
+
+  it("falls back to file config when settings fields are removed", () => {
+    const result = applyTlonSettingsOverrides({
+      account: baseAccount,
+      currentSettings: {},
+    });
+
+    expect(result.effectiveDmAllowlist).toEqual(baseAccount.dmAllowlist);
+    expect(result.effectiveGroupInviteAllowlist).toEqual(baseAccount.groupInviteAllowlist);
+    expect(result.effectiveAutoDiscoverChannels).toBe(baseAccount.autoDiscoverChannels);
+    expect(result.effectiveOwnerShip).toBe(baseAccount.ownerShip);
+  });
+
+  it("keeps other explicit settings overrides authoritative", () => {
+    const result = applyTlonSettingsOverrides({
+      account: baseAccount,
+      currentSettings: {
+        autoDiscoverChannels: false,
+        autoAcceptDmInvites: false,
+        autoAcceptGroupInvites: false,
+        showModelSig: true,
+        ownerShip: "~nec",
+        pendingApprovals: [],
+      },
+    });
+
+    expect(result.effectiveAutoDiscoverChannels).toBe(false);
+    expect(result.effectiveAutoAcceptDmInvites).toBe(false);
+    expect(result.effectiveAutoAcceptGroupInvites).toBe(false);
+    expect(result.effectiveShowModelSig).toBe(true);
+    expect(result.effectiveOwnerShip).toBe("~nec");
+    expect(result.pendingApprovals).toEqual([]);
+  });
+});
