ec-web 0.0.26 → 0.0.27

package/dist/static/app.js

@@ -197,6 +197,8 @@ const translations = {
     'agents.th.lastActivity': '最后活动',
     'agents.th.operations': '操作',
     'agents.th.projectPath': '项目路径',
+    'agents.lifecycle.created': '待初始化',
+    'agents.lifecycle.bootstrapping': '初始化中',
 
     // Agent operations
     'agents.op.stopping': '停止中…',
@@ -322,6 +324,13 @@ const translations = {
     'sessions.empty.noMatch': '无匹配会话',
     'sessions.empty.noSessions': '该项目暂无会话',
     'sessions.empty.noContent': '该会话暂无内容',
+    'sessions.empty.noBaseagent': '尚未配置默认 Base Agent（agents/defaults.json 的 active_baseagent）',
+    'sessions.baseagentNone': '未配置 Base Agent',
+    'sessions.baseagentDefault': '默认',
+    'baseagents.claude': 'Claude',
+    'baseagents.codex': 'Codex',
+    'baseagents.gemini': 'Gemini',
+    'baseagents.ecagent': 'EC Agent',
     'sessions.loadOlder': '加载更早内容',
     'sessions.loadFullResult': '加载完整结果',
     'sessions.header.project': '项目',
@@ -1128,6 +1137,8 @@ const translations = {
     'agents.th.lastActivity': 'Last Activity',
     'agents.th.operations': 'Operations',
     'agents.th.projectPath': 'Project Path',
+    'agents.lifecycle.created': 'Created',
+    'agents.lifecycle.bootstrapping': 'Bootstrapping',
 
     // Agent operations
     'agents.op.stopping': 'Stopping…',
@@ -1253,6 +1264,13 @@ const translations = {
     'sessions.empty.noMatch': 'No matching sessions',
     'sessions.empty.noSessions': 'No sessions in this project',
     'sessions.empty.noContent': 'No content in this session',
+    'sessions.empty.noBaseagent': 'No default Base Agent configured (active_baseagent in agents/defaults.json)',
+    'sessions.baseagentNone': 'No Base Agent configured',
+    'sessions.baseagentDefault': 'default',
+    'baseagents.claude': 'Claude',
+    'baseagents.codex': 'Codex',
+    'baseagents.gemini': 'Gemini',
+    'baseagents.ecagent': 'EC Agent',
     'sessions.loadOlder': 'Load older content',
     'sessions.loadFullResult': 'Load full result',
     'sessions.header.project': 'Project',
@@ -2096,36 +2114,25 @@ function connect() {
   ws.onopen = () => {
     setConnStatus('● ' + t('status.connected'), 'ok');
     reconnectDelay = 1000;
-    // 获取可用的 baseagent
-    fetch(`${BASE}api/available-baseagents`)
-      .then(r => r.json())
-      .then(data => {
-        availableBaseagents = data;
-        // 如果当前没有选中 baseagent，默认选第一个可用的
-        if (!sessSel.baseagent) {
-          sessSel.baseagent = data.claude ? 'claude' : (data.codex ? 'codex' : null);
-        }
-        console.log('[ecweb] Available baseagents:', availableBaseagents, 'Selected:', sessSel.baseagent);
-        // 重新订阅当前视图（带上正确的参数）
-        if (currentView === 'session') {
-          subscribe('session', sessSel);
-        } else if (currentView === 'roleManagement') {
-          subscribeRoleManagementSubview();
-        } else if (currentView === 'system' && systemContentMode === 'monitor') {
-          subscribe('monitor', { range: monRange });
-        } else {
-          subscribe(currentView, pendingSub || {});
-        }
-      })
-      .catch(err => {
-        console.warn('[ecweb] Failed to fetch available-baseagents:', err);
-        // 失败时默认使用 claude
-        availableBaseagents = { claude: true, codex: false };
-        if (!sessSel.baseagent) sessSel.baseagent = 'claude';
-        if (currentView === 'roleManagement') subscribeRoleManagementSubview();
-        else if (currentView === 'system' && systemContentMode === 'monitor') subscribe('monitor', { range: monRange });
-        else subscribe(currentView, pendingSub || {});
-      });
+    // 获取 base agent 配置（defaults.json 的 active_baseagent + baseagents）
+    // 配置清单（defaults.json）与最近活跃 Agent 并行取，后者决定会话页默认后端。
+    Promise.all([
+      menuSend({ type: 'menu.query', name: 'baseagents' }).then(response => {
+        const result = mResp(response);
+        if (result.error) throw new Error(result.error.message || 'Baseagent query failed');
+        return result.data;
+      }).catch(err => {
+        console.warn('[ecweb] Failed to fetch baseagents:', err);
+        return null;
+      }),
+      loadActiveAgentBaseagent(),
+    ]).then(([data, activeBaseagent]) => {
+      applyBaseagentConfig(data);
+      // 没有显式选择时跟随最近活跃 Agent 的后端（其次才是 defaults 的默认后端）。
+      if (!sessSel.baseagent) sessSel.baseagent = activeBaseagent || defaultSessionBaseagent();
+      console.log('[ecweb] Base agents:', baseagentConfig, 'Active agent:', activeAgentAid, 'Selected:', sessSel.baseagent);
+      resubscribeCurrentView();
+    });
   };
 
   ws.onmessage = (ev) => {
@@ -2178,6 +2185,8 @@ function connect() {
       } else {
         state[msg.view] = msg.data;
       }
+      // agent 列表本身就带 baseagent + lastActivity，顺手更新"最近活跃 Agent"。
+      if (msg.view === 'agents') noteAgentActivity(msg.data?.agents);
       const messageMatchesCurrentView = msg.view === currentView
         || (currentView === 'system' && systemContentMode === 'monitor' && msg.view === 'monitor')
         || (currentView === 'roleManagement' && msg.view === roleManagementViewKind());
@@ -2284,7 +2293,38 @@ let sessSourceFilter = 'all'; // all / trigger / agent / cli / user / unknown
 let sessChatMode = false;   // false=完整视图，true=对话视图（折叠处理过程）
 let monRange = '2m';        // Monitor 时间窗口：2m / 10m / 1h
 let logSel = { source: null, level: 'all', module: 'all', search: '', limit: 500, follow: true };
-let availableBaseagents = { claude: false, codex: false }; // 可用的 baseagent
+// ECWeb 界面的 base agent 展示名统一走这里的 i18n 键，而不是父包别名表：
+// 别名表面向 CLI/日志（claude → "Claude Code"、ecagent → "ecagent"），
+// 面板里应保持简洁一致（Claude / Codex / Gemini / EC Agent）。
+function baseagentDisplayLabel(id) {
+  const key = `baseagents.${id}`;
+  const label = t(key);
+  return label === key ? (id || 'Baseagent') : label;
+}
+
+function applyBaseagentConfig(data) {
+  const list = Array.isArray(data?.baseagents) ? data.baseagents : [];
+  baseagentConfig = {
+    active: typeof data?.active === 'string' && data.active ? data.active : null,
+    baseagents: list
+      .filter(entry => entry && typeof entry.id === 'string' && entry.id)
+      .map(entry => ({
+        id: entry.id,
+        label: baseagentDisplayLabel(entry.id),
+        detected: entry.detected === true,
+        configured: entry.configured === true,
+        loaded: entry.loaded === true,
+        active: entry.active === true,
+      })),
+  };
+}
+
+function resubscribeCurrentView() {
+  if (currentView === 'session') subscribe('session', sessSel);
+  else if (currentView === 'roleManagement') subscribeRoleManagementSubview();
+  else if (currentView === 'system' && systemContentMode === 'monitor') subscribe('monitor', { range: monRange });
+  else subscribe(currentView, pendingSub || {});
+}
 let rolesCurrentAgent = null;
 let rolesSearchTerm = '';
 let rolesVerifyFilter = '';
@@ -2694,6 +2734,11 @@ function agentStateBadge(s, agStatus, connStatus) {
   return `<span class="state-badge connected">${t('status.connected')}</span>`;
 }
 
+function agentLifecycleBadge(lifecycle) {
+  if (lifecycle !== 'created' && lifecycle !== 'bootstrapping') return '';
+  return `<span class="lifecycle-badge ${lifecycle}">${t(`agents.lifecycle.${lifecycle}`)}</span>`;
+}
+
 // 发送方式图标标记
 const MSG_KIND_META = {
   send: { icon: '💬', label: () => t('messages.msgKind.reply') },
@@ -3100,7 +3145,7 @@ function renderAgents(data) {
           ? agentOpsBusyHtml(ag.aid, _agentOps.get(ag.aid))
           : agentDisabledOpsHtml(ag.aid);
         html += `<tr class="ag-main">` +
-          `<td><div class="ag-id"><span class="dot off"></span><span class="ag-id-text"><span class="ag-name">${esc(ag.displayName || shortAid(ag.aid))}</span><span class="ag-aid">${esc(ag.aid)}</span></span></div></td>` +
+          `<td><div class="ag-id"><span class="dot off"></span><span class="ag-id-text"><span class="ag-name">${esc(ag.displayName || shortAid(ag.aid))}${agentLifecycleBadge(ag.lifecycle)}</span><span class="ag-aid">${esc(ag.aid)}</span></span></div></td>` +
           `<td style="font-size:11px;font-family:monospace">${esc(ag.projectPath || '—')}</td>` +
           `<td class="agent-ops-cell">${ops}</td></tr>`;
       }
@@ -3146,7 +3191,7 @@ function renderAgents(data) {
     const model = ag.model || ag.baseagent || '—';
 
     const idCell = `<div class="ag-id"><span class="dot ${dotCls}" title="${esc(connStatus)}"></span>` +
-      `<span class="ag-id-text"><span class="ag-name">${esc(name)}</span>` +
+      `<span class="ag-id-text"><span class="ag-name">${esc(name)}${agentLifecycleBadge(ag.lifecycle)}</span>` +
       `<span class="ag-aid">${esc(ag.aid)}</span></span></div>`;
 
     html += `<tr class="ag-main">` +
@@ -3394,7 +3439,7 @@ function renderMsg(data) {
         : '';
       peersHtml += `<div class="list-item${sel}" data-peer="${esc(p.peerId)}">` +
         `<div class="name">${groupMark}${partitionMark}<span class="msg-peer-title" title="${esc(chatTitle)}">${esc(shortId(chatTitle))}</span>${channelTag}</div>` +
-        `<div class="sub">${p.partition === 'thread' ? `${esc(shortId(displayName))} · ` : ''}↓${p.inbound} ↑${p.outbound} · ${fmtAgo(p.lastAt)}</div></div>`;
+        `<div class="sub">${p.lable ? `${esc(p.lable)} · ` : ''}${p.partition === 'thread' ? `${esc(shortId(displayName))} · ` : ''}↓${p.inbound} ↑${p.outbound} · ${fmtAgo(p.lastAt)}</div></div>`;
     }
   }
   $('#msg-peers').innerHTML = peersHtml;
@@ -3494,6 +3539,108 @@ function filterSessionTranscripts(transcripts, showAll, sourceType = 'all') {
   });
 }
 
+// Base agent 清单来自 EvolCore 的 baseagents menu 查询；前端不维护候选数组。
+let baseagentConfig = { active: null, baseagents: [] };
+
+function baseagentConfigLoaded() {
+  return Array.isArray(baseagentConfig.baseagents) && baseagentConfig.baseagents.length > 0;
+}
+
+function configuredBaseagents() {
+  return baseagentConfig.baseagents || [];
+}
+
+function configuredActiveBaseagent() {
+  return baseagentConfig.active || null;
+}
+
+// ── 最近活跃 Agent 的后端 ──
+// 数据来自 agent 列表（menu.query name=agent，与 agents 页面同源）：每条带
+// baseagent + lastActivity。谁最近被驱动过，会话页就默认看谁的后端。
+let activeAgentBaseagent = null;      // 最近活跃 Agent 的 base agent
+let activeAgentAid = null;            // 对应的 Agent AID
+
+function pickActiveAgentBaseagent(agents) {
+  let best = null;
+  for (const ag of agents || []) {
+    const baseagent = String(ag?.baseagent || '').trim();
+    const lastActivity = Number(ag?.lastActivity) || 0;
+    if (!baseagent || lastActivity <= 0) continue;
+    if (!best || lastActivity > best.lastActivity) {
+      best = { baseagent, lastActivity, aid: ag.aid || null };
+    }
+  }
+  return best;
+}
+
+function noteAgentActivity(agents) {
+  const best = pickActiveAgentBaseagent(agents);
+  activeAgentBaseagent = best?.baseagent || null;
+  activeAgentAid = best?.aid || null;
+  return activeAgentBaseagent;
+}
+
+/** 拉取 agent 列表并算出最近活跃 Agent 的后端（失败则返回 null，不猜测）。 */
+async function loadActiveAgentBaseagent() {
+  try {
+    const r = mResp(await menuSend({
+      type: 'menu.query',
+      name: 'agent',
+      args: { options: 'all' },
+    }));
+    if (r.error) return null;
+    const agents = Array.isArray(r.data?.agents) ? r.data.agents : (Array.isArray(r.data) ? r.data : []);
+    return noteAgentActivity(agents);
+  } catch {
+    return null;
+  }
+}
+
+/** 会话页可选的 base agent：配置里有的、本机可用的，以及最近活跃 Agent 用到的。 */
+function sessionBaseagentCandidates() {
+  const list = [...configuredBaseagents()];
+  const seen = new Set(list.map(entry => entry.id));
+  for (const id of [activeAgentBaseagent]) {
+    if (!id || seen.has(id)) continue;
+    seen.add(id);
+    list.push({
+      id,
+      label: baseagentDisplayLabel(id),
+      detected: true,
+      configured: false,
+      active: false,
+    });
+  }
+  return list;
+}
+
+/**
+ * 会话页默认后端：跟随最近活跃的 Agent（含 trigger 等后台任务驱动的）；
+ * 没有任何活跃记录时才用 defaults 的默认后端。两者都没有就不猜（返回 null）。
+ */
+function defaultSessionBaseagent() {
+  if (activeAgentBaseagent) return activeAgentBaseagent;
+  return configuredActiveBaseagent();
+}
+
+// 会话视图列出「已配置或本机可用」的 base agent：清单来自 defaults.json 的
+// baseagents 与本机检测，不维护候选数组，也不注入任何默认后端。
+// 默认后端（defaults.active_baseagent）单独标注，避免它与"当前选中"混淆。
+function sessionBaseagentOptions(selected) {
+  let html = '';
+  for (const entry of sessionBaseagentCandidates()) {
+    if (!entry.configured && !entry.detected && !entry.loaded && !entry.active) continue;
+    const label = entry.active
+      ? `${entry.label} (${t('sessions.baseagentDefault')})`
+      : entry.label;
+    html += `<option value="${esc(entry.id)}"${selected === entry.id ? ' selected' : ''}>${esc(label)}</option>`;
+  }
+  if (!html) {
+    return `<option value="" selected disabled>${esc(t('sessions.baseagentNone'))}</option>`;
+  }
+  return html;
+}
+
 function renderSessionSourceBadge(sourceType) {
   const type = ['trigger', 'agent', 'cli', 'user'].includes(sourceType) ? sourceType : 'unknown';
   const label = t(`sessions.source.${type}`);
@@ -3522,13 +3669,7 @@ function renderSession(data) {
   ).join('');
 
   // baseagent 下拉选择器（只显示可用的）
-  let baseagentOpts = '';
-  if (availableBaseagents.claude) {
-    baseagentOpts += `<option value="claude"${sessSel.baseagent === 'claude' ? ' selected' : ''}>Claude</option>`;
-  }
-  if (availableBaseagents.codex) {
-    baseagentOpts += `<option value="codex"${sessSel.baseagent === 'codex' ? ' selected' : ''}>Codex</option>`;
-  }
+  const baseagentOpts = sessionBaseagentOptions(sessSel.baseagent);
   const sourceTypes = ['all', 'user', 'agent', 'trigger', 'cli', 'unknown'];
   const sourceOpts = sourceTypes.map(type => {
     const label = type === 'all' ? t('sessions.filter.sourceAll') : t(`sessions.source.${type}`);
@@ -3554,7 +3695,10 @@ function renderSession(data) {
     '<div class="sess-items">';
 
   if (!filtered.length) {
-    listHtml += '<div class="empty">' + (transcripts.length ? t('sessions.empty.noMatch') : t('sessions.empty.noSessions')) + '</div>';
+    const emptyText = data.noConfiguredBaseagent
+      ? t('sessions.empty.noBaseagent')
+      : (transcripts.length ? t('sessions.empty.noMatch') : t('sessions.empty.noSessions'));
+    listHtml += '<div class="empty">' + emptyText + '</div>';
   }
   for (const t of filtered) {
     const sel = t.id === sessSel.sessionId ? ' sel' : '';
@@ -3740,7 +3884,7 @@ const CAT_META = {
 
 function renderSessHeader(h, baseagent) {
   if (!h || !h.sessionId) return '';
-  const baseagentLabel = baseagent === 'codex' ? 'Codex' : baseagent === 'claude' ? 'Claude' : (baseagent || 'Baseagent');
+  const baseagentLabel = (configuredBaseagents().find(entry => entry.id === baseagent)?.label) || baseagent || 'Baseagent';
   const title = `${baseagentLabel} ${h.sessionId}`;
   const tok = (h.inputTokens || h.outputTokens)
     ? `<span class="sh-stat">🔢 in ${fmtNum(h.inputTokens)} / out ${fmtNum(h.outputTokens)}</span>` : '';
@@ -4190,7 +4334,18 @@ function agentOpNew() {
   openAgentCreateDrawer();
 }
 
-const AGENT_BASEAGENT_TYPES = ['claude', 'codex', 'gemini', 'ecagent'];
+// 可选 base agent 由 defaults.json 的 baseagents + 本机检测决定（见 applyBaseagentConfig），
+// 这里不再维护写死的候选数组。
+function agentBaseagentTypes() {
+  const ids = configuredBaseagents()
+    .filter(entry => entry.configured || entry.detected || entry.active)
+    .map(entry => entry.id);
+  return ids.length ? ids : [];
+}
+
+function agentBaseagentLabel(id) {
+  return configuredBaseagents().find(entry => entry.id === id)?.label || id;
+}
 const AGENT_AID_RE = /^[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?(?:\.[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?){2,}$/;
 let _agentEdit = null;
 let _agentCreate = null;
@@ -4206,7 +4361,7 @@ function agentSafeConfig(data) {
 
 function agentActiveBaseagent(data) {
   const safe = agentSafeConfig(data);
-  return String(safe.active_baseagent || data?.config?.active_baseagent || data?.config?.baseagent || 'claude');
+  return String(safe.active_baseagent || data?.config?.active_baseagent || data?.config?.baseagent || configuredActiveBaseagent() || '');
 }
 
 function agentBaseagentBlock(data, type) {
@@ -4232,6 +4387,7 @@ function agentOriginalEditState(aid, data) {
   return {
     name: String(data?.identity?.name || data?.displayName || shortAid(aid)),
     owners: owners.map(String),
+    fullaccess: safe.fullaccess?.enabled === true,
     projectPath,
     activeBaseagent: active,
     model: block.model == null ? '' : String(block.model),
@@ -4264,7 +4420,7 @@ function agentBaseagentOptionValues(items) {
   return values;
 }
 
-function agentBaseagentOptions(active, options = AGENT_BASEAGENT_TYPES) {
+function agentBaseagentOptions(active, options = agentBaseagentTypes()) {
   const seen = new Set();
   const list = [];
   const push = value => {
@@ -4276,9 +4432,10 @@ function agentBaseagentOptions(active, options = AGENT_BASEAGENT_TYPES) {
   (options || []).forEach(push);
   const activeWasProvided = seen.has(String(active || '').trim());
   if (active) push(active);
-  if (!list.length) AGENT_BASEAGENT_TYPES.forEach(push);
   return list.map(type => {
-    const label = !activeWasProvided && type === active ? `${type} (${t('common.currentSuffix')})` : type;
+    const label = !activeWasProvided && type === active
+      ? `${agentBaseagentLabel(type)} (${t('common.currentSuffix')})`
+      : agentBaseagentLabel(type);
     return `<option value="${esc(type)}"${type === active ? ' selected' : ''}>${esc(label)}</option>`;
   }).join('');
 }
@@ -4657,7 +4814,11 @@ function setAgentSelectError(select, current) {
 }
 
 function agentCreateDefaultBaseagent() {
-  return AGENT_BASEAGENT_TYPES.find(type => availableBaseagents && availableBaseagents[type] === true) || 'claude';
+  // 新 Agent 默认继承 defaults.json 的 active_baseagent；没有配置时留空，
+  // 由校验拦下，而不是悄悄替用户选一个后端。
+  return configuredActiveBaseagent()
+    || configuredBaseagents().find(entry => entry.detected)?.id
+    || '';
 }
 
 function readAgentCreateValues(root) {
@@ -4679,7 +4840,7 @@ function validateAgentCreateValues(values) {
   if (!values.name) return t('agents.edit.validation.nameRequired');
   if (!values.owner) return t('agents.edit.validation.ownerRequired');
   if (!AGENT_AID_RE.test(values.owner)) return t('agents.edit.validation.invalidOwner');
-  if (!AGENT_BASEAGENT_TYPES.includes(values.baseagent)) return tf('agents.edit.validation.invalidBaseagent', { baseagent: values.baseagent });
+  if (!agentBaseagentTypes().includes(values.baseagent)) return tf('agents.edit.validation.invalidBaseagent', { baseagent: values.baseagent });
   return '';
 }
 
@@ -4889,8 +5050,9 @@ function readAgentEditValues(root) {
   });
   return {
     owners: agentOwnersFromText(root.querySelector('#ag-edit-owners')?.value || ''),
+    fullaccess: root.querySelector('#ag-edit-fullaccess')?.checked,
     channelOwners,
-    activeBaseagent: root.querySelector('#ag-edit-active')?.value || 'claude',
+    activeBaseagent: root.querySelector('#ag-edit-active')?.value || configuredActiveBaseagent() || '',
     model: root.querySelector('#ag-edit-model')?.value.trim() || '',
     effort: root.querySelector('#ag-edit-effort')?.value.trim() || '',
   };
@@ -4952,6 +5114,9 @@ function collectAgentEditPatch(ctx) {
   const configPatch = {};
 
   if (!sameStringArray(values.owners, ctx.original.owners)) configPatch.owners = values.owners;
+  if (values.fullaccess !== undefined && values.fullaccess !== ctx.original.fullaccess) {
+    configPatch.fullaccess = { enabled: values.fullaccess };
+  }
   if (values.channelOwners.length > 0) configPatch.channelOwners = values.channelOwners;
   if (values.activeBaseagent !== ctx.original.activeBaseagent) {
     if (Array.isArray(ctx.availableBaseagents) && ctx.availableBaseagents.length && !ctx.availableBaseagents.includes(values.activeBaseagent)) {
@@ -4977,6 +5142,8 @@ function collectAgentEditPatch(ctx) {
 function setAgentEditSaving(ctx, saving) {
   ctx.saving = saving;
   ctx.backdrop.querySelectorAll('button, input, textarea, select').forEach(el => { el.disabled = saving; });
+  const fullaccess = ctx.backdrop.querySelector('#ag-edit-fullaccess');
+  if (fullaccess) fullaccess.disabled = saving || ctx.data?.fullaccessStatus?.canConfigure !== true;
   const save = ctx.backdrop.querySelector('#ag-edit-save');
   const saveReload = ctx.backdrop.querySelector('#ag-edit-save-reload');
   if (save) save.textContent = saving ? t('common.saving') : t('common.save');
@@ -5169,6 +5336,25 @@ function openAgentConfigDrawer(aid, data) {
   const active = original.activeBaseagent;
   const titleName = original.name || shortAid(aid);
   const jsonText = esc(JSON.stringify(safe, null, 2));
+  const fullaccessStatus = data?.fullaccessStatus || {};
+  const fullaccessHelp = currentLang === 'zh-CN'
+    ? '开启后，同时属于该 Agent Owner 和 daemon Owner 的直接私聊任务可访问宿主环境及 daemon 范围数据。'
+    : 'Enables host and daemon scope for direct private tasks whose sender is both an Agent Owner and a daemon Owner.';
+  const fullaccessHelpLabel = currentLang === 'zh-CN' ? 'Fullaccess 说明' : 'Fullaccess info';
+  const fullaccessState = enabled => currentLang === 'zh-CN'
+    ? (enabled ? '开启' : '关闭')
+    : (enabled ? 'Enabled' : 'Disabled');
+  const fullaccessSection = fullaccessStatus.hostEnabled ?
+    `<section class="ag-edit-section">` +
+      `<div class="ag-edit-fullaccess-row">` +
+        `<span class="ag-edit-field-label">Owner Fullaccess<span class="basic-settings-tip" tabindex="0" role="img" aria-label="${esc(fullaccessHelpLabel)}" data-tooltip="${esc(fullaccessHelp)}">?</span></span>` +
+        `<label class="sess-switch ag-edit-fullaccess-switch">` +
+          `<span id="ag-edit-fullaccess-state" aria-live="polite">${fullaccessState(original.fullaccess)}</span>` +
+          `<input type="checkbox" role="switch" aria-label="Owner Fullaccess" id="ag-edit-fullaccess" ${original.fullaccess ? 'checked' : ''} ${fullaccessStatus.canConfigure === true ? '' : 'disabled'}>` +
+          `<span class="sess-switch-track" aria-hidden="true"><span class="sess-switch-thumb"></span></span>` +
+        `</label>` +
+      `</div>` +
+    `</section>` : '';
 
   const html = `<div class="ag-edit-backdrop" id="ag-edit-backdrop">` +
     `<aside class="ag-edit-drawer" role="dialog" aria-modal="true" aria-labelledby="ag-edit-title">` +
@@ -5183,6 +5369,7 @@ function openAgentConfigDrawer(aid, data) {
         `<section class="ag-edit-section">` +
           `<label class="ag-edit-field"><span>Owners</span><textarea id="ag-edit-owners" rows="2" spellcheck="false">${esc(original.owners.join('\n'))}</textarea></label>` +
         `</section>` +
+        fullaccessSection +
         `<section class="ag-edit-section">` +
           `<h3>${t('agents.edit.section.runtime')}</h3>` +
           `<div class="ag-edit-grid">` +
@@ -5235,6 +5422,9 @@ function openAgentConfigDrawer(aid, data) {
   backdrop.querySelector('#ag-edit-cancel').addEventListener('click', closeAgentConfigDrawer);
   backdrop.querySelector('#ag-edit-save').addEventListener('click', () => saveAgentConfigDrawer(ctx, false));
   backdrop.querySelector('#ag-edit-save-reload').addEventListener('click', () => saveAgentConfigDrawer(ctx, true));
+  backdrop.querySelector('#ag-edit-fullaccess')?.addEventListener('change', (event) => {
+    backdrop.querySelector('#ag-edit-fullaccess-state').textContent = fullaccessState(event.currentTarget.checked);
+  });
   backdrop.querySelector('#ag-edit-active').addEventListener('change', () => syncAgentBaseagentFields(ctx));
   backdrop.querySelector('#ag-edit-model').addEventListener('change', () => {
     const baseagent = backdrop.querySelector('#ag-edit-active')?.value || ctx.original.activeBaseagent;
@@ -5297,11 +5487,17 @@ function agentHealthCard(ag) {
 }
 
 function systemBaseagentCards(baseagents) {
-  const list = Array.isArray(baseagents) ? baseagents : [];
+  const list = Array.isArray(baseagents) ? baseagents : (baseagentConfig.baseagents || []);
   return list.map(ba => {
-    const ver = ba.version ? `・${ba.version}` : '';
-    const title = `Baseagent・${ba.active ? '✓ ' : ''}${ba.name || 'unknown'}${ver}`;
-    const detail = [ba.model, ba.effort].filter(Boolean).map(esc).join(' · ') || t('system.baseagent.unspecified');
+    const id = ba.id || ba.name || 'unknown';
+    const ver = ba.version ? ` · ${ba.version}` : '';
+    const title = `Baseagent · ${ba.active ? '✓ ' : ''}${baseagentDisplayLabel(id)}${ver}`;
+    const states = [
+      ba.configured && (currentLang === 'zh-CN' ? '已配置' : 'configured'),
+      ba.detected && (currentLang === 'zh-CN' ? '已检测' : 'detected'),
+      ba.loaded && (currentLang === 'zh-CN' ? '已加载' : 'loaded'),
+    ].filter(Boolean);
+    const detail = [...[ba.model, ba.effort].filter(Boolean), ...states].map(esc).join(' · ') || t('system.baseagent.unspecified');
     return `<div class="cache-card"><div class="card-label">${esc(title)}</div><div class="card-val">${detail}</div></div>`;
   }).join('');
 }
@@ -5436,7 +5632,7 @@ function bindSystemEvents(el, data) {
 // 数据来自 daemon menu.query name=gateway（apiKey 已掩码）。
 // 写操作走 menuSend({name:'gateway', ...})：update/test/delete。
 
-const GATEWAY_TYPE_ICON = { claude: '🟣', codex: '🟢', gemini: '🔵' };
+const GATEWAY_TYPE_ICON = { claude: '🟣', codex: '🟢', gemini: '🔵', ecagent: '⚪' };
 
 // 标记每条网关的运行时测试结果：`${scope}#${type}` → { ok, latency, modelCount, error }
 const _gwTest = new Map();
@@ -6072,7 +6268,7 @@ function triggerComparableScheduleValue(type, value) {
 function triggerActiveBaseagentForAgent(agentAid) {
   const list = state.agents?.agents || [];
   const ag = list.find(x => x.aid === agentAid || x.value === agentAid);
-  return ag?.baseagent || ag?.activeBaseagent || ag?.active_baseagent || 'claude';
+  return ag?.baseagent || ag?.activeBaseagent || ag?.active_baseagent || configuredActiveBaseagent() || '';
 }
 
 function triggerScheduleLabel(type) {
@@ -6911,12 +7107,18 @@ function closeTriggerEditDrawer() {
   _triggerEdit = null;
 }
 
+function triggerUsesModelOptions(ctx) {
+  const executionType = ctx.backdrop.querySelector('#trig-edit-type')?.value || ctx.original.executionType;
+  return executionType !== 'script';
+}
+
 async function syncTriggerOptionFields(ctx, values) {
+  if (!triggerUsesModelOptions(ctx)) return;
   const modelSelect = ctx.backdrop.querySelector('#trig-edit-model');
   const effortSelect = ctx.backdrop.querySelector('#trig-edit-effort');
   const currentModel = values.model || '';
   const currentEffort = values.effort || '';
-  const baseagent = values.baseagent || ctx.original.baseagent || 'claude';
+  const baseagent = values.baseagent || ctx.original.baseagent || configuredActiveBaseagent() || '';
   const token = (ctx.optionLoadToken || 0) + 1;
   ctx.optionLoadToken = token;
 
@@ -6925,37 +7127,39 @@ async function syncTriggerOptionFields(ctx, values) {
 
   try {
     const models = await agentFetchOptions('model', ctx.original.agentAid, { baseagent, model: currentModel });
-    if (_triggerEdit !== ctx || ctx.optionLoadToken !== token) return;
+    if (_triggerEdit !== ctx || ctx.optionLoadToken !== token || !triggerUsesModelOptions(ctx)) return;
     modelSelect.innerHTML = agentSelectOptions(models, currentModel, t('common.inherited'));
   } catch (e) {
-    if (_triggerEdit === ctx && ctx.optionLoadToken === token) {
+    if (_triggerEdit === ctx && ctx.optionLoadToken === token && triggerUsesModelOptions(ctx)) {
       modelSelect.innerHTML = agentSelectOptions([], currentModel, t('common.inherited'));
       toast(e.message || String(e), true);
     }
   } finally {
-    if (_triggerEdit === ctx && ctx.optionLoadToken === token) modelSelect.disabled = Boolean(ctx.saving);
+    if (_triggerEdit === ctx && ctx.optionLoadToken === token && triggerUsesModelOptions(ctx)) modelSelect.disabled = Boolean(ctx.saving);
   }
 
+  if (!triggerUsesModelOptions(ctx)) return;
   const selectedModel = modelSelect?.value || currentModel;
   await syncTriggerEffortOptions(ctx, baseagent, selectedModel, currentEffort, token);
 }
 
 async function syncTriggerEffortOptions(ctx, baseagent, model, currentEffort, token) {
+  if (!triggerUsesModelOptions(ctx)) return;
   const effortSelect = ctx.backdrop.querySelector('#trig-edit-effort');
   if (!effortSelect) return;
   setAgentSelectLoading(effortSelect, currentEffort, currentEffort ? `${currentEffort} (${t('common.loadingSuffix')})` : t('common.loading'));
   try {
     let efforts = await agentFetchOptions('effort', ctx.original.agentAid, { baseagent, model, effort: currentEffort || 'auto' });
-    if (_triggerEdit !== ctx || ctx.optionLoadToken !== token) return;
+    if (_triggerEdit !== ctx || ctx.optionLoadToken !== token || !triggerUsesModelOptions(ctx)) return;
     effortSelect.innerHTML = agentSelectOptions(efforts, currentEffort, t('common.inherited'));
   } catch (e) {
-    if (_triggerEdit === ctx && ctx.optionLoadToken === token) {
+    if (_triggerEdit === ctx && ctx.optionLoadToken === token && triggerUsesModelOptions(ctx)) {
       const fallback = [];
       effortSelect.innerHTML = agentSelectOptions(fallback, currentEffort, t('common.inherited'));
       toast(e.message || String(e), true);
     }
   } finally {
-    if (_triggerEdit === ctx && ctx.optionLoadToken === token) effortSelect.disabled = Boolean(ctx.saving);
+    if (_triggerEdit === ctx && ctx.optionLoadToken === token && triggerUsesModelOptions(ctx)) effortSelect.disabled = Boolean(ctx.saving);
   }
 }
 
@@ -7498,12 +7702,23 @@ function openTriggerEditDrawer(id, agent) {
     triggerRefreshEventDatalists(ctx);
     triggerUpdateFilterJsonPreview(ctx);
   });
-  backdrop.querySelector('#trig-edit-type').addEventListener('change', () => syncTriggerEditFields(ctx));
+  backdrop.querySelector('#trig-edit-type').addEventListener('change', () => {
+    syncTriggerEditFields(ctx);
+    if (!triggerUsesModelOptions(ctx)) {
+      ctx.optionLoadToken = (ctx.optionLoadToken || 0) + 1;
+      return;
+    }
+    syncTriggerOptionFields(ctx, {
+      ...ctx.original,
+      model: backdrop.querySelector('#trig-edit-model')?.value || '',
+      effort: backdrop.querySelector('#trig-edit-effort')?.value || '',
+    });
+  });
   backdrop.querySelector('#trig-edit-delivery-enabled').addEventListener('change', () => syncTriggerEditFields(ctx));
   backdrop.querySelector('#trig-edit-model').addEventListener('change', () => {
     const token = (ctx.optionLoadToken || 0) + 1;
     ctx.optionLoadToken = token;
-    syncTriggerEffortOptions(ctx, ctx.original.baseagent || 'claude', backdrop.querySelector('#trig-edit-model')?.value || '', backdrop.querySelector('#trig-edit-effort')?.value || '', token);
+    syncTriggerEffortOptions(ctx, ctx.original.baseagent || configuredActiveBaseagent() || '', backdrop.querySelector('#trig-edit-model')?.value || '', backdrop.querySelector('#trig-edit-effort')?.value || '', token);
   });
   backdrop.querySelector('#trig-edit-session-strategy').addEventListener('change', () => {
     const strategy = backdrop.querySelector('#trig-edit-session-strategy')?.value;
@@ -7542,7 +7757,7 @@ function openTriggerEditDrawer(id, agent) {
   triggerEnsureEventCatalog(ctx).catch(e => {
     if (_triggerEdit === ctx) toast(e.message || String(e), true);
   });
-  syncTriggerOptionFields(ctx, original);
+  if (triggerUsesModelOptions(ctx)) syncTriggerOptionFields(ctx, original);
   setTimeout(() => backdrop.querySelector('#trig-edit-name')?.focus(), 0);
 }
 
@@ -10374,7 +10589,7 @@ function createRoleCard(roleName, roleDef) {
   const icon = ROLE_ICONS[roleName] || '📋';
   const nameKey = ROLE_NAMES[roleName] || roleName;
   const permMode = roleDef.permissions?.permissionMode?.default || '—';
-  const model = roleDef.permissions?.['baseagents.claude.model']?.default || '—';
+  const model = getRoleModelPermission(roleDef)?.default || '—';
   const commandStats = getCommandPermissionStats(roleDef.commandPermissions);
 
   // Management identities and built-in user roles are both protected from
@@ -10543,15 +10758,29 @@ function initRoleDefinitionsTab() {
   });
 }
 
-const CLAUDE_MODEL_PERMISSION_KEY = 'baseagents.claude.model';
-const CLAUDE_ALLOWED_MODELS_LEGACY_KEY = 'baseagents.claude.allowedModels';
-const DEFAULT_MODEL_PATTERN_OPTIONS = ['*', 'claude-opus-*', 'claude-sonnet-*', 'claude-haiku-*'];
+function roleModelPermissionKey() {
+  return state.roleDefinitions?.modelPermissionField || null;
+}
 
-function getClaudeModelPermission(roleDef) {
-  const perm = roleDef?.permissions?.[CLAUDE_MODEL_PERMISSION_KEY];
+function getRoleModelPermission(roleDef, field = roleModelPermissionKey()) {
+  const perm = roleDef?.permissions?.[field];
   return perm && typeof perm === 'object' ? perm : null;
 }
 
+function rolePermissionMeta(field) {
+  const descriptor = state.roleDefinitions?.permissionFields?.find(item => item.value === field);
+  if (!descriptor) return null;
+  return {
+    label: descriptor.label,
+    type: descriptor.valueType === 'enum' ? 'select' : 'text',
+    options: descriptor.options || [],
+  };
+}
+
+function isRoleModelPermissionField(field) {
+  return /^baseagents\.[a-z0-9_-]+\.(?:model|allowedModels)$/.test(field);
+}
+
 function normalizeAllowedModels(value) {
   if (!Array.isArray(value)) return [];
   const seen = new Set();
@@ -10585,17 +10814,21 @@ function modelAllowedByPatterns(model, allowedModels) {
 }
 
 function renderRoleModelPermissionSection(roleDef) {
-  const perm = getClaudeModelPermission(roleDef);
-  if (!perm) return '';
+  const field = roleModelPermissionKey();
+  if (!field) return '';
+  const existing = getRoleModelPermission(roleDef, field);
+  const perm = existing || {};
 
   const allowedModels = normalizeAllowedModels(perm.allowedModels);
   const selectionMode = inferModelSelectionMode(allowedModels);
-  const patternOptions = DEFAULT_MODEL_PATTERN_OPTIONS;
+  const patternOptions = state.roleDefinitions?.modelPatternOptions || ['*'];
 
   return `
-    <div class="form-group perm-group model-permissions-panel" data-model-permissions>
+    <div class="form-group perm-group model-permissions-panel" data-model-permissions data-model-key="${esc(field)}" data-model-baseagent="${esc(state.roleDefinitions.baseagent)}">
+      ${existing ? '' : `<label><input type="checkbox" data-model-enable> ${currentLang === 'zh-CN' ? '设置模型策略' : 'Set model policy'}</label>`}
+      <fieldset data-model-editor${existing ? '' : ' disabled hidden'} style="border:0;padding:0;margin:0;min-width:0">
       <div class="perm-header">
-        <label class="perm-label">${esc(t('roleDefs.model'))}</label>
+        <label class="perm-label">${esc(state.roleDefinitions.baseagent)} · ${esc(t('roleDefs.model'))}</label>
         <label class="perm-override">
           <input type="checkbox"
                  data-model-field="allowOverride"
@@ -10657,13 +10890,14 @@ function renderRoleModelPermissionSection(roleDef) {
       </div>
 
       <div class="model-preview" data-model-preview>Loading preview...</div>
+      </fieldset>
     </div>
   `;
 }
 
-async function fetchRoleModelPermissionData(roleName) {
+async function fetchRoleModelPermissionData(roleName, baseagent) {
   const token = localStorage.getItem(TOKEN_KEY);
-  const res = await authFetch(roleDefinitionsApi(`api/role-definitions/${encodeURIComponent(roleName)}/configurable-models`), {
+  const res = await authFetch(roleDefinitionsApi(`api/role-definitions/${encodeURIComponent(roleName)}/configurable-models?baseagent=${encodeURIComponent(baseagent)}`), {
     headers: { 'Authorization': `Bearer ${token}` }
   });
   if (!res.ok) throw new Error('Failed to load role model permissions');
@@ -10671,7 +10905,9 @@ async function fetchRoleModelPermissionData(roleName) {
   return json.data;
 }
 
-async function fetchModelCatalogData(baseagent = 'claude', aid = '') {
+async function fetchModelCatalogData(baseagent = null, aid = '') {
+  baseagent = baseagent || configuredActiveBaseagent();
+  if (!baseagent) throw new Error(t('sessions.baseagentNone'));
   const token = localStorage.getItem(TOKEN_KEY);
   const res = await authFetch(`api/models/catalog?baseagent=${encodeURIComponent(baseagent)}${aid ? `&aid=${encodeURIComponent(aid)}` : ''}`, {
     headers: { 'Authorization': `Bearer ${token}` }
@@ -10766,11 +11002,14 @@ function collectRoleModelPermission(container) {
     ? container
     : container.querySelector('[data-model-permissions]');
   if (!section) return null;
+  const enable = section.querySelector('[data-model-enable]');
+  if (enable && !enable.checked) return null;
 
   const defaultInput = section.querySelector('[data-model-field="default"]');
   const overrideInput = section.querySelector('[data-model-field="allowOverride"]');
 
   return {
+    field: section.dataset.modelKey,
     default: defaultInput?.value.trim() || '',
     allowOverride: !!overrideInput?.checked,
     allowedModels: getRoleAllowedModelsFromList(section)
@@ -10834,14 +11073,14 @@ async function initRoleModelPermissionEditor(container, roleName, roleDef) {
   const section = container.querySelector('[data-model-permissions]');
   if (!section) return;
 
-  const initialAllowed = normalizeAllowedModels(getClaudeModelPermission(roleDef)?.allowedModels);
+  const initialAllowed = normalizeAllowedModels(getRoleModelPermission(roleDef, section.dataset.modelKey)?.allowedModels);
   let catalogModels = [];
   section._initialAllowedModels = initialAllowed;
 
   try {
     const data = roleName && roleName !== '__new__'
-      ? await fetchRoleModelPermissionData(roleName)
-      : await fetchModelCatalogData('claude', roleDefinitionsCurrentAgent || state.roleDefinitions?.aid || '');
+      ? await fetchRoleModelPermissionData(roleName, section.dataset.modelBaseagent)
+      : await fetchModelCatalogData(section.dataset.modelBaseagent, roleDefinitionsCurrentAgent || state.roleDefinitions?.aid || '');
     catalogModels = data?.catalog?.models || data?.models || [];
   } catch (err) {
     console.warn('[roleDefinitions] Failed to load model catalog:', err);
@@ -10880,6 +11119,11 @@ async function initRoleModelPermissionEditor(container, roleName, roleDef) {
 
   section.addEventListener('change', (e) => {
     const target = e.target;
+    if (target?.matches?.('[data-model-enable]')) {
+      const editor = section.querySelector('[data-model-editor]');
+      editor.disabled = !target.checked;
+      editor.hidden = !target.checked;
+    }
     if (target?.classList?.contains('model-pattern-checkbox') || target?.classList?.contains('model-explicit-checkbox')) {
       const allowed = new Set(getRoleAllowedModelsFromList(section));
       if (target.checked) allowed.add(target.value);
@@ -10914,8 +11158,6 @@ async function showNewRoleModal() {
     description: '',
     permissions: {
       permissionMode: { default: 'request', allowOverride: false },
-      'baseagents.claude.model': { default: 'claude-sonnet-4', allowOverride: false, allowedModels: ['claude-sonnet-*', 'claude-haiku-*'] },
-      dispatch: { default: 'mention', allowOverride: false }
     },
     commandPermissions: {
       'category:read': { allow: true },
@@ -11051,9 +11293,9 @@ async function showNewRoleModal() {
   body.innerHTML += renderRoleModelPermissionSection(defaultDef);
 
   Object.keys(permissions).forEach(permKey => {
-    if (permKey === CLAUDE_MODEL_PERMISSION_KEY || permKey === CLAUDE_ALLOWED_MODELS_LEGACY_KEY) return;
+    if (isRoleModelPermissionField(permKey)) return;
     const perm = permissions[permKey];
-    const meta = permissionMeta[permKey] || { label: permKey, type: 'text' };
+    const meta = rolePermissionMeta(permKey) || permissionMeta[permKey] || { label: permKey, type: 'text' };
 
     body.innerHTML += `
       <div class="form-group perm-group">
@@ -11279,9 +11521,9 @@ async function showRoleEditModal(roleName, roleDef) {
   formHtml += renderRoleModelPermissionSection(roleDef);
 
   Object.keys(permissions).forEach(permKey => {
-    if (permKey === CLAUDE_MODEL_PERMISSION_KEY || permKey === CLAUDE_ALLOWED_MODELS_LEGACY_KEY) return;
+    if (isRoleModelPermissionField(permKey)) return;
     const perm = permissions[permKey];
-    const meta = permissionMeta[permKey] || { label: permKey, type: 'text' };
+    const meta = rolePermissionMeta(permKey) || permissionMeta[permKey] || { label: permKey, type: 'text' };
 
     formHtml += `
       <div class="form-group perm-group">
@@ -11525,8 +11767,6 @@ async function saveRoleDefinition() {
       description: '',
       permissions: {
         permissionMode: { default: 'request', allowOverride: false },
-        [CLAUDE_MODEL_PERMISSION_KEY]: { default: 'claude-sonnet-4', allowOverride: false, allowedModels: ['claude-sonnet-*', 'claude-haiku-*'] },
-        dispatch: { default: 'mention', allowOverride: false }
       },
       commandPermissions: {
         'category:read': { allow: true },
@@ -11546,7 +11786,7 @@ async function saveRoleDefinition() {
   const allowAccess = allowAccessSelect ? (allowAccessSelect.value === 'true') : true;
 
   // 收集所有权限配置
-  const permissions = {};
+  const permissions = { ...(currentDef.permissions || {}) };
 
   // 获取所有权限项的键
   const permKeys = new Set();
@@ -11604,13 +11844,13 @@ async function saveRoleDefinition() {
       alert(modelValidationError);
       return;
     }
-    permissions[CLAUDE_MODEL_PERMISSION_KEY] = {
-      ...(currentDef.permissions?.[CLAUDE_MODEL_PERMISSION_KEY] || {}),
+    permissions[modelPermission.field] = {
+      ...(currentDef.permissions?.[modelPermission.field] || {}),
       default: modelPermission.default,
       allowOverride: modelPermission.allowOverride,
       allowedModels: modelPermission.allowedModels
     };
-    delete permissions[CLAUDE_MODEL_PERMISSION_KEY].selectionMode;
+    delete permissions[modelPermission.field].selectionMode;
   }
 
   const commandPermissionsResult = collectCommandPermissions(body, currentDef.commandPermissions);