@songsid/agend 2.3.0-beta.24 → 2.3.0-beta.25

package/dist/ui/panel-settings.js

@@ -28,7 +28,7 @@ import {
   ACCESS_MODES, AGENT_MODES, DEFAULT_SCHEMA, HANG_TIMEOUT_DEFAULT_MINUTES, LOG_LEVELS, TOOL_PROGRESS, TOOL_SETS, VISIBILITY_MODES, batchImpact,
   changedFields, channelId, channelsOf, chLabel, connectionState, effectiveSummary, fleetModel, fromYaml, fullModelRequests, groupAgents,
   hasOwn, impactOf, localeOptions, defaultsImpact, requestImpact, nonNegative, positive, replyGuardSupported, shortName, STATUS_ORDER, toYaml,
-  visibilityDefault, worstImpact,
+  toolSetDefault, visibilityDefault, worstImpact,
 } from "./settings-model.js";
 import {
   AgentDialog, BackendSelect, BotDialog, ChipList, ClassicDialog, Drawer, Feedback, Impact, Label, ModelSelect, NewBotDialog, Override,
@@ -676,7 +676,7 @@ function General({ ctx }) {
   const original = useMemo(() => ({ c: structuredClone(c) }), []);
   const [f, setF] = useState(() => ({
     backend: d.backend || "claude-code", model: d.model || "", locale: d.locale || "", auto: String(d.auto_pause_after ?? 0),
-    agent_mode: d.agent_mode || "mcp", tool_set: d.tool_set || "full", tool_progress: d.tool_progress ?? "off",
+    agent_mode: d.agent_mode || "mcp", tool_set: TOOL_SETS.includes(d.tool_set) ? d.tool_set : "", tool_progress: d.tool_progress ?? "off",
     visibility: visibilityDefault(d), reply: d.reply_completion_guard ?? true, log_level: d.log_level || "info",
     hangOn: hang.enabled !== false, hang: String(hang.timeout_minutes ?? HANG_TIMEOUT_DEFAULT_MINUTES),
     concurrency: String(startup.concurrency ?? 10), stagger: String(startup.stagger_delay_ms ?? 500),
@@ -699,13 +699,13 @@ function General({ ctx }) {
     if (!ready) return;
     const defaultsPatch = changedFields({
       backend: f.backend, model: f.model || undefined, locale: f.locale || null, auto_pause_after: num(f.auto),
-      agent_mode: f.agent_mode, tool_set: f.tool_set, tool_progress: f.tool_progress, cross_instance_visibility: f.visibility,
+      agent_mode: f.agent_mode, tool_set: f.tool_set || null, tool_progress: f.tool_progress, cross_instance_visibility: f.visibility,
       reply_completion_guard: f.reply, log_level: f.log_level,
       hang_detector: { enabled: f.hangOn, timeout_minutes: num(f.hang) },
       startup: { concurrency: num(f.concurrency), stagger_delay_ms: num(f.stagger) },
     }, {
       backend: d.backend || "claude-code", model: d.model || undefined, locale: d.locale || null, auto_pause_after: d.auto_pause_after ?? 0,
-      agent_mode: d.agent_mode || "mcp", tool_set: d.tool_set || "full", tool_progress: d.tool_progress ?? "off",
+      agent_mode: d.agent_mode || "mcp", tool_set: TOOL_SETS.includes(d.tool_set) ? d.tool_set : null, tool_progress: d.tool_progress ?? "off",
       cross_instance_visibility: visibilityDefault(d), reply_completion_guard: d.reply_completion_guard ?? true, log_level: d.log_level || "info",
       hang_detector: { enabled: hang.enabled !== false, timeout_minutes: hang.timeout_minutes ?? HANG_TIMEOUT_DEFAULT_MINUTES },
       startup: { concurrency: startup.concurrency ?? 10, stagger_delay_ms: startup.stagger_delay_ms ?? 500 },
@@ -771,7 +771,8 @@ function General({ ctx }) {
     </section>
     <${Drawer} title=${tn("advancedSection")}>
       <section class="card"><h3>${tn("runtimeResources")}</h3><div class="grid2">
-        <div class="field">${L(tn("toolSet"), "defaults.tool_set", "g-ts")}<${Select} id="g-ts" value=${f.tool_set} onChange=${set("tool_set")} options=${TOOL_SETS} /></div>
+        <div class="field">${L(tn("toolSet"), "defaults.tool_set", "g-ts")}<${Select} id="g-ts" value=${f.tool_set} onChange=${set("tool_set")}
+          options=${[{ value: "", label: tn("toolSetUnset", toolSetDefault({}, {}), toolSetDefault({}, { general_topic: true })) }, ...TOOL_SETS]} /></div>
         <div class="field">${L(tn("logLevel"), "defaults.log_level", "g-ll")}<${Select} id="g-ll" value=${f.log_level} onChange=${set("log_level")} options=${LOG_LEVELS} /></div>
         <div class="field">${L(tn("agentMode"), "defaults.agent_mode", "g-am")}<${Select} id="g-am" value=${f.agent_mode} onChange=${set("agent_mode")} options=${AGENT_MODES} /></div>
       </div></section>

package/dist/ui/settings-dialogs.js

@@ -20,7 +20,7 @@ import {
   ACCESS_MODES, AGENT_MODES, CH_TYPES, HANG_TIMEOUT_DEFAULT_MINUTES, LOG_LEVELS, TOOL_PROGRESS, TOOL_SETS,
   VISIBILITY_MODES, accessConfirmations, agentForm, agentPatch, backendOptions, changedFields, channelId, channelsOf,
   chLabel, hasOwn, impactOf, newConnectionImpact, nonNegative, nonNegativeInteger, positive, replyGuardSupported, sameValue, visibilityDefault,
-  classicWebEchoEffective, worstImpact,
+  classicWebEchoEffective, toolSetDefault, worstImpact,
 } from "./settings-model.js";
 /** #2342: a field by id, for recordEdit before a pick or a reset writes it. */
 const byId = (id) => (typeof document !== "undefined" ? document.getElementById(id) : null);
@@ -230,7 +230,7 @@ function EmojiPicker({ cat, keyName, platform, channel, onPick, onClose }) {
 export function AgentDialog({ name, inst, ctx, onClose }) {
   const { fleet, schema } = ctx;
   const defaults = fleet.defaults || {};
-  const [f, setF] = useState(() => agentForm(inst, defaults));
+  const [f, setF] = useState(() => agentForm(inst, defaults, name));
   const [emojis, setEmojis] = useState({ value: inst.status_emojis || null, baseline: inst.status_emojis || null });
   // #1302: the baseline is what the picker shows before anyone touches it.
   const visibilityBaseline = useMemo(() => (hasOwn(inst, "cross_instance_visibility") ? (VISIBILITY_MODES.includes(inst.cross_instance_visibility) ? inst.cross_instance_visibility : VISIBILITY_MODES[0]) : null), []);
@@ -278,14 +278,14 @@ export function AgentDialog({ name, inst, ctx, onClose }) {
             <input id="ag-hang" type="number" min="0.1" step="0.5" class=${errors.hang ? "invalid" : ""} disabled=${f.inherit.hang}
               value=${shown("hang", f.hang, String((defaults.hang_detector && defaults.hang_detector.timeout_minutes) ?? HANG_TIMEOUT_DEFAULT_MINUTES))} onInput=${(e) => set("hang")(e.target.value)} /></${Override}>
           <${Feedback} error=${errors.hang} /></div>
-        ${[["agent_mode", "agentMode", AGENT_MODES, defaults.agent_mode || "mcp"], ["tool_set", "toolSet", TOOL_SETS, defaults.tool_set || "full"],
+        ${[["agent_mode", "agentMode", AGENT_MODES, defaults.agent_mode || "mcp"], ["tool_set", "toolSet", TOOL_SETS, toolSetDefault(defaults, inst, name)],
           ["tool_progress", "toolProgress", TOOL_PROGRESS, defaults.tool_progress ?? "off"],
           ["cross_instance_visibility", "crossInstanceVisibility", VISIBILITY_MODES, visibilityDefault(defaults)],
           ["log_level", "logLevel", LOG_LEVELS, defaults.log_level || "info"]].map(([k, label, opts, dflt]) => html`<div key=${k} class="field">
           ${L(tn(label), `instance.${k}`, `ag-${k}`)}
           <${Override} inherit=${f.inherit[k]} onInherit=${setInherit(k)}>
             <${Select} id=${`ag-${k}`} value=${shown(k, f[k], dflt)} disabled=${f.inherit[k]} onChange=${set(k)}
-              options=${opts.includes(f[k]) || k === "cross_instance_visibility" ? opts : [f[k], ...opts]} /></${Override}>
+              options=${opts.includes(shown(k, f[k], dflt)) || k === "cross_instance_visibility" ? opts : [shown(k, f[k], dflt), ...opts]} /></${Override}>
           ${k === "cross_instance_visibility" ? html`<p class="note">${tn("crossInstanceVisibilityHint")}</p>` : null}</div>`)}
         <div class="field">${L(tn("replyCompletionGuard"), "instance.reply_completion_guard")}
           <${Override} inherit=${f.inherit.reply_completion_guard} onInherit=${setInherit("reply_completion_guard")}>

package/dist/ui/settings-model.js

@@ -9,7 +9,22 @@ export const CH_TYPES = ["discord", "telegram"];
 export const LOCALES = [["en", "English"], ["zh-TW", "繁體中文 (zh-TW)"]];
 export const VISIBILITY_MODES = ["full", "summary", "hidden"];
 export const LOG_LEVELS = ["trace", "debug", "info", "warn", "error"];
-export const TOOL_SETS = ["full", "standard", "minimal"];
+/**
+ * The tool profiles a person may choose (src/tool-permissions.ts; the validator's list). `general` is not one: AgEnD
+ * gives it to a General that sets none.
+ */
+export const TOOL_SETS = ["worker", "coordinator", "standard", "minimal", "full"];
+/**
+ * The profile an agent runs under while it sets none (resolveToolSet, on the config as loaded: the defaults merged
+ * under the agent's own): the fleet default's, else `general` for a General — its own `general_topic`, else the
+ * default's (#2407 review: `defaults.general_topic: true` makes every agent without its own a General), or the instance
+ * named general — else `worker`; never `full`, which the page used to show.
+ */
+export function toolSetDefault(defaults, inst, name = "") {
+  if (TOOL_SETS.includes(defaults && defaults.tool_set)) return defaults.tool_set;
+  const general = hasOwn(inst, "general_topic") ? inst.general_topic === true : !!defaults && defaults.general_topic === true;
+  return general || name === "general" ? "general" : "worker";
+}
 export const TOOL_PROGRESS = ["off", "standard", "verbose"];
 export const AGENT_MODES = ["mcp", "cli"];
 export const ACCESS_MODES = ["locked", "open", "pairing"];
@@ -166,7 +181,7 @@ export function agentPatch(form, inst, defaults, visibilityBaseline, statusEmoji
 }
 
 /** The agent form's starting values (an override shows the inherited value while "inherit" is on). */
-export function agentForm(inst, defaults) {
+export function agentForm(inst, defaults, name = "") {
   const hang = inst.hang_detector || {};
   const inherit = (key) => !hasOwn(inst, key);
   return {
@@ -177,7 +192,9 @@ export function agentForm(inst, defaults) {
     auto_pause_after: String(inst.auto_pause_after ?? defaults.auto_pause_after ?? 0),
     hang: String(hang.timeout_minutes ?? (defaults.hang_detector && defaults.hang_detector.timeout_minutes) ?? HANG_TIMEOUT_DEFAULT_MINUTES),
     agent_mode: inst.agent_mode || defaults.agent_mode || "mcp",
-    tool_set: inst.tool_set || defaults.tool_set || "full",
+    // What the picker offers when the agent sets its own: a profile a person may choose (a General's inherited
+    // `general` is shown while inheriting, but not offered to write back).
+    tool_set: TOOL_SETS.includes(inst.tool_set) ? inst.tool_set : TOOL_SETS.includes(toolSetDefault(defaults, inst, name)) ? toolSetDefault(defaults, inst, name) : "worker",
     tool_progress: inst.tool_progress ?? defaults.tool_progress ?? "off",
     // #1302: a value the fleet does not know (a typo) is read as unset — the picker shows "full", as the old page did,
     // and the baseline is that same "full", so an unrelated edit never writes the typo back (the server refuses it).

package/dist/ui/settings-strings.js

@@ -86,6 +86,7 @@ register("settings", {
     hangTimeout: "Stuck timeout",
     agentMode: "Agent mode",
     toolSet: "Tool set",
+    toolSetUnset: "Not set ({0}; a General: {1})",
     toolProgress: "Tool progress",
     crossInstanceVisibility: "Bot-to-bot messages in topics",
     crossInstanceVisibilityHint: "full: the whole message · summary: one line · hidden: nothing. Messages are always delivered; the Mirror Topic still shows them.",
@@ -677,6 +678,7 @@ register("settings", {
     hangTimeout: "卡住逾時",
     agentMode: "Agent 模式",
     toolSet: "工具集",
+    toolSetUnset: "未設定（{0}；General 為 {1}）",
     toolProgress: "工具進度",
     crossInstanceVisibility: "Agent 之間的訊息在主題中",
     crossInstanceVisibilityHint: "full：完整訊息 · summary：一行摘要 · hidden：不顯示。訊息一律照常送達，Mirror Topic 也照常顯示。",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@songsid/agend",
-  "version": "2.3.0-beta.24",
+  "version": "2.3.0-beta.25",
   "description": "Multi-agent fleet daemon — run coding CLIs (Claude, Muse, Codex, OpenCode) from Discord or Telegram",
   "type": "module",
   "bin": {