@songsid/agend 2.3.2-beta.1 → 2.3.2-beta.11

package/dist/remote-card-prompt.js

@@ -0,0 +1,86 @@
+import { t } from "./locale.js";
+/** Buttons per card at most: Discord's 25 less room for Skip / Back. Beyond it the card is answered in words or the pane. */
+export const REMOTE_CARD_MAX_OPTIONS = 20;
+/** A button label's length at most (Discord's limit is 80; long ones are clipped with an ellipsis). */
+const LABEL_MAX = 60;
+/** A typed answer's length at most. */
+export const REMOTE_CARD_TEXT_MAX = 4_000;
+const clip = (text, max = LABEL_MAX) => (text.length > max ? `${text.slice(0, max - 1)}…` : text);
+/** The message and buttons for `card`, asked by `instance`. */
+export function remoteCardPrompt(instance, card) {
+    if (card.kind === "input") {
+        return {
+            message: [t("card.input_intro", card.server, instance), ...card.rows.map(row => `  ${row}`), t("card.input_hint")].join("\n"),
+            choices: [
+                ...(card.actions.includes("Decline") ? [{ action: "decline", label: t("card.decline") }] : []),
+                { action: "cancel", label: t("card.cancel") },
+            ],
+            webInput: null,
+        };
+    }
+    if (card.page === "suboptions") {
+        const titles = card.options.map(option => option.title);
+        return {
+            message: [t("card.sub_intro", instance), card.question, ...card.options.map(o => `${o.checked ? "☑" : "☐"} ${o.title}`)].join("\n"),
+            choices: [
+                { action: "sub-all", label: clip(t("card.sub_all", titles.join(", "))) },
+                ...(card.options.length <= REMOTE_CARD_MAX_OPTIONS && card.options.length > 1
+                    ? card.options.map(o => ({ action: `sub-${o.n}`, label: clip(t("card.sub_only", o.title)) })) : []),
+                { action: "back", label: t("card.back") },
+            ],
+            webInput: null,
+        };
+    }
+    const listed = card.options.map(o => {
+        const title = `${o.n}. ${o.title}${o.recommended ? ` ${t("card.recommended")}` : ""}`;
+        return o.description ? `${title} — ${o.description}` : title;
+    });
+    const buttons = card.options.length <= REMOTE_CARD_MAX_OPTIONS
+        ? card.options.map(o => ({ action: `opt-${o.n}`, label: clip(`${o.n}. ${o.title}${o.recommended ? " ★" : ""}`) })) : [];
+    return {
+        message: [t("card.question_intro", instance), card.question, ...listed, card.freeText ? t("card.question_hint_text") : t("card.question_hint")].join("\n"),
+        choices: [...buttons, { action: "skip", label: t("card.skip") }],
+        webInput: card.freeText ? { action: "text", label: t("card.answer_in_words") } : null,
+    };
+}
+/** The action a button id stands for (null: not one of ours). `text` takes the typed answer. */
+export function remoteCardAction(action, text) {
+    const option = /^opt-(\d{1,2})$/.exec(action);
+    if (option)
+        return { kind: "option", n: Number(option[1]) };
+    const sub = /^sub-(\d{1,2}|all)$/.exec(action);
+    if (sub)
+        return { kind: "suboptions", only: sub[1] === "all" ? null : Number(sub[1]) };
+    switch (action) {
+        case "back":
+        case "skip":
+        case "decline":
+        case "cancel": return { kind: action };
+        case "text": return typeof text === "string" && text.trim() ? { kind: "text", text: text.slice(0, REMOTE_CARD_TEXT_MAX) } : null;
+        default: return null;
+    }
+}
+/** What the person chose, in words, for the outcome line (never the typed answer itself: it is in their own message). */
+export function remoteCardChoiceLabel(card, action) {
+    switch (action.kind) {
+        case "option": return clip(card.options?.find(o => o.n === action.n)?.title ?? `#${action.n}`);
+        case "suboptions": return action.only === null ? t("card.sub_all_short") : clip(t("card.sub_only", card.options?.find(o => o.n === action.only)?.title ?? `#${action.only}`));
+        case "text": return t("card.in_words");
+        case "skip": return t("card.skip");
+        case "back": return t("card.back");
+        case "decline": return t("card.decline");
+        case "cancel": return t("card.cancel");
+    }
+}
+/** The line the card's message collapses to once a person's answer was keyed in (or was not). */
+export function remoteCardOutcomeText(instance, who, choice, outcome) {
+    switch (outcome.outcome) {
+        case "answered": return t("card.answered", who, choice);
+        case "suboptions": return t("card.opened_sub", who, choice);
+        case "back": return t("card.went_back", who);
+        case "stale": return t("card.stale", instance);
+        case "refused": return t("card.refused", instance);
+        case "stopped": return t("card.stopped", instance);
+    }
+}
+//# sourceMappingURL=remote-card-prompt.js.map

package/dist/remote-card-prompt.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"remote-card-prompt.js","sourceRoot":"","sources":["../src/remote-card-prompt.ts"],"names":[],"mappings":"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"}

package/dist/reply-triggers.d.ts

@@ -0,0 +1,2 @@
+/** Opt-in ClassicBot collab addressing; fleet-topic bot admission is independent. */
+export declare const DEFAULT_REPLY_TRIGGERS = false;

package/dist/reply-triggers.js

@@ -0,0 +1,3 @@
+/** Opt-in ClassicBot collab addressing; fleet-topic bot admission is independent. */
+export const DEFAULT_REPLY_TRIGGERS = false;
+//# sourceMappingURL=reply-triggers.js.map

package/dist/reply-triggers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reply-triggers.js","sourceRoot":"","sources":["../src/reply-triggers.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,CAAC"}

package/dist/settings-api.d.ts

@@ -42,6 +42,8 @@ export interface SettingsApiContext extends AppShellContext {
     };
     /** #1920 phase 3: Settings → Web sign-ins → Guests. */
     guestOverview?(): unknown;
+    /** #2667: the ClassicBot rooms' instance names — a guest grant may name one, so a save's validation knows them. */
+    classicRoomNames?(): string[];
     revokeGuestWebSessions?(owner: {
         adapterId: string;
         userId: string;

package/dist/settings-api.js

@@ -1,3 +1,6 @@
+import { officeInputPatch } from "./dashboard-permissions.js";
+import { setNoticeMode } from "./notice-delivery.js";
+import { DEFAULT_REPLY_TRIGGERS } from "./reply-triggers.js";
 import { PUBLIC_TUNNEL_SECRET_ID, PUBLIC_TUNNEL_TOKEN_HINT } from "./public-tunnel-config.js";
 import { withSpawnHoldReply } from "./spawn-hold-reply.js";
 import { normalizeSettingsInstancePatch, removesInstanceOverride } from "./settings-instance-patch.js";
@@ -183,6 +186,8 @@ export function handleSettingsRequest(req, res, url, ctx) {
     const path = url.pathname;
     if (!isSettingsPath(path))
         return false;
+    // #2667: validated with the ClassicBot rooms there are now — a guest grant naming one is not an unknown name.
+    const validateFleet = (config) => validateFleetConfig(config, { rooms: ctx.classicRoomNames?.() ?? [] });
     const method = req.method ?? "GET";
     // ── The page: the app shell, which mounts the Settings panel (#1408 step 3) ──
     if (isSettingsPage(path)) {
@@ -200,6 +205,7 @@ export function handleSettingsRequest(req, res, url, ctx) {
     if (method === "GET" && path === "/api/settings/schema") {
         json(res, 200, {
             ...buildSettingsImpactSchema(),
+            reply_triggers_default: DEFAULT_REPLY_TRIGGERS,
             // Non-null means a restart cannot clear the fleet row, so the page shows
             // the mismatch instead of offering a button that can never succeed.
             fleet_signature_mismatch: ctx.fleetSignatureMismatchKeys?.() ?? null,
@@ -899,12 +905,18 @@ export function handleSettingsRequest(req, res, url, ctx) {
             // (a shorter sign-in time), and the audit must still name who did it. A confirmation's replay is no one's: null.
             const auditBy = parsed.guests?.grants !== undefined && !isSettingsReplay(req) ? guestSettingsCaller(req, url, ctx) : null;
             const changes = [];
-            const web = { ...cfg.web };
+            let web = { ...cfg.web };
             let webTerminal = cfg.web_terminal;
             if (parsed.canvasWorker !== undefined) {
                 web.experimental = { ...web.experimental, canvas_worker: parsed.canvasWorker };
                 changes.push({ path: ["web", "experimental", "canvas_worker"], value: parsed.canvasWorker });
             }
+            if (parsed.notifyLogin !== undefined) {
+                const holder = { defaults: cfg.defaults, web };
+                setNoticeMode(holder, "login", parsed.notifyLogin);
+                web = holder.web;
+                changes.push({ path: ["web", "notify_login"], value: web.notify_login }, { path: ["web", "notice_delivery", "login"], remove: true });
+            }
             if (parsed.echo !== undefined) {
                 web.echo_to_channel = parsed.echo;
                 changes.push({ path: ["web", "echo_to_channel"], value: parsed.echo });
@@ -981,8 +993,8 @@ export function handleSettingsRequest(req, res, url, ctx) {
             }
             if (!changes.length)
                 return json(res, 200, { ok: true });
-            const before = validateFleetConfig(cfg);
-            const after = validateFleetConfig({ ...cfg, web, web_terminal: webTerminal });
+            const before = validateFleet(cfg);
+            const after = validateFleet({ ...cfg, web, web_terminal: webTerminal });
             if (rejectIfWorse(res, before, after))
                 return;
             const previous = { web: cfg.web, hadWeb: "web" in cfg, terminal: cfg.web_terminal, hadTerminal: "web_terminal" in cfg };
@@ -1096,8 +1108,8 @@ export function handleSettingsRequest(req, res, url, ctx) {
             const changes = parsed.map(c => c.value === null
                 ? { path: ["web", "appearance", c.group, c.key], value: undefined, remove: true }
                 : { path: ["web", "appearance", c.group, c.key], value: c.value });
-            const before = validateFleetConfig(cfg);
-            const after = validateFleetConfig({ ...cfg, web });
+            const before = validateFleet(cfg);
+            const after = validateFleet({ ...cfg, web });
             if (rejectIfWorse(res, before, after))
                 return;
             const previous = { web: cfg.web, hadWeb: "web" in cfg };
@@ -1137,7 +1149,7 @@ export function handleSettingsRequest(req, res, url, ctx) {
             const restored = restoreRedactedSecrets(body, cfg.defaults);
             if ("path" in restored)
                 return json(res, 400, { error: `redacted value has no stored credential: defaults.${restored.path}` });
-            const merged = { ...cfg.defaults, ...restored.value };
+            const merged = { ...cfg.defaults, ...officeInputPatch(restored.value) };
             // #1310: locale:null means "clear the key" (user chose Auto). Mirrors
             // how the instance save handles model ("" → delete) and nullable overrides.
             if (body.locale === null || body.locale === "")
@@ -1145,11 +1157,16 @@ export function handleSettingsRequest(req, res, url, ctx) {
             // General → Defaults' "not set" for the tool profile: the key goes (worker for an agent, general for a General).
             if (body.tool_set === null || body.tool_set === "")
                 delete merged.tool_set;
-            const before = validateFleetConfig(cfg);
-            const after = validateFleetConfig({ ...cfg, defaults: merged });
+            const before = validateFleet(cfg);
+            const after = validateFleet({ ...cfg, defaults: merged });
             if (rejectIfWorse(res, before, after))
                 return;
-            settingsWrite(req, () => { cfg.defaults = merged; ctx.saveFleetConfig(); });
+            settingsWrite(req, () => {
+                cfg.defaults = merged;
+                if (typeof body.tips === "boolean" || body.tips === "dm")
+                    setNoticeMode(cfg, "tips", body.tips);
+                ctx.saveFleetConfig();
+            });
             json(res, 200, { ok: true, warnings: saveWarnings(before, after) });
         }).catch(() => json(res, 400, { error: "bad request" }));
         return true;
@@ -1239,8 +1256,8 @@ export function handleSettingsRequest(req, res, url, ctx) {
             }
             const next = { ...cfg, channels: normalizedBody };
             delete next.channel; // channels[] supersedes the legacy single channel
-            const before = validateFleetConfig(cfg);
-            const after = validateFleetConfig(next);
+            const before = validateFleet(cfg);
+            const after = validateFleet(next);
             if (rejectIfWorse(res, before, after))
                 return;
             const previous = { channels: cfg.channels, channel: cfg.channel, hadChannel: "channel" in cfg };
@@ -1291,6 +1308,8 @@ export function handleSettingsRequest(req, res, url, ctx) {
                 delete merged.tool_progress;
             if (body.reply_completion_guard === null)
                 delete merged.reply_completion_guard;
+            if (body.reply_triggers === null)
+                delete merged.reply_triggers;
             const before = validateClassicBotConfig(classic);
             const after = validateClassicBotConfig({ ...classic, defaults: merged });
             if (rejectIfWorse(res, before, after))
@@ -1340,6 +1359,7 @@ export function handleSettingsRequest(req, res, url, ctx) {
                 "model",
                 "auto_pause_after",
                 "collab",
+                "reply_triggers",
                 "context_lines",
                 "tool_progress",
                 "reply_completion_guard",
@@ -1357,6 +1377,9 @@ export function handleSettingsRequest(req, res, url, ctx) {
                 && (typeof body.auto_pause_after !== "number" || !Number.isFinite(body.auto_pause_after) || body.auto_pause_after < 0)) {
                 return json(res, 400, { error: "auto_pause_after must be a non-negative finite number" });
             }
+            if (body.reply_triggers !== undefined && body.reply_triggers !== null && typeof body.reply_triggers !== "boolean") {
+                return json(res, 400, { error: "reply_triggers must be a boolean" });
+            }
             if (body.collab !== undefined && typeof body.collab !== "boolean")
                 return json(res, 400, { error: "collab must be a boolean" });
             if (body.context_lines !== undefined && (!Number.isInteger(body.context_lines) || body.context_lines < 0)) {
@@ -1396,6 +1419,8 @@ export function handleSettingsRequest(req, res, url, ctx) {
                 delete merged.tool_progress;
             if (body.reply_completion_guard === null)
                 delete merged.reply_completion_guard;
+            if (body.reply_triggers === null)
+                delete merged.reply_triggers;
             channels[key] = merged;
             const before = validateClassicBotConfig(previous);
             const after = validateClassicBotConfig(classic);
@@ -1615,7 +1640,7 @@ export function handleSettingsRequest(req, res, url, ctx) {
             json(res, 400, { error: `redacted value has no stored credential: instances.${name}.${restored.path}` });
             return;
         }
-        const patch = restored.value;
+        const patch = officeInputPatch(restored.value);
         let mergedInst;
         try {
             mergedInst = normalizeSettingsInstancePatch(base, patch);
@@ -1624,8 +1649,8 @@ export function handleSettingsRequest(req, res, url, ctx) {
             json(res, 400, { error: "unsupported_instance_null" });
             return;
         }
-        const before = validateFleetConfig(cfg);
-        const after = validateFleetConfig({ ...cfg, instances: { ...cfg.instances, [name]: mergedInst } });
+        const before = validateFleet(cfg);
+        const after = validateFleet({ ...cfg, instances: { ...cfg.instances, [name]: mergedInst } });
         if (rejectIfWorse(res, before, after))
             return;
         settingsWrite(req, () => {
@@ -1685,7 +1710,7 @@ export function handleSettingsRequest(req, res, url, ctx) {
                 // Settings → Agents → Delete, confirmed: the same removal as delete_instance — the agent stops, nothing of it is
                 // left behind (schedules, team places), and its fleet.yaml entry goes.
                 const execution = settingsRequestExecution(req), authorization = authorizeExplicitInstanceRemoval("dashboard-confirmed");
-                (execution ? ctx.removeInstance(name, authorization, execution) : ctx.removeInstance(name, authorization)).then(() => json(res, 200, { ok: true, deleted: name, warnings: validateFleetConfig(cfg).warnings }), (err) => json(res, 500, { error: err.message }));
+                (execution ? ctx.removeInstance(name, authorization, execution) : ctx.removeInstance(name, authorization)).then(() => json(res, 200, { ok: true, deleted: name, warnings: validateFleet(cfg).warnings }), (err) => json(res, 500, { error: err.message }));
                 return true;
             }
             // DELETE never blocks on validation; surface any resulting warnings.
@@ -1694,7 +1719,7 @@ export function handleSettingsRequest(req, res, url, ctx) {
                 clearPausedMarker(join(ctx.dataDir, "instances", name));
                 ctx.saveFleetConfig();
             });
-            json(res, 200, { ok: true, warnings: validateFleetConfig(cfg).warnings });
+            json(res, 200, { ok: true, warnings: validateFleet(cfg).warnings });
             return true;
         }
         if (method === "POST" || method === "PATCH") {