ec-web 0.0.21 → 0.0.23

package/dist/sources/baseagent-detector.js

@@ -1,117 +1,44 @@
 /**
  * Base agent 环境检测 — 检测本机可用的 Claude、Codex、Gemini 和内置 EC Agent。
  *
- * 检测条件：
- * 命令行工具优先按 PATH 检测；同时保留会话目录检测，兼容 CLI 不在当前 shell
- * PATH 但已经在本机初始化过的情况。ecagent 随 EvolCore 一起提供，始终作为可选
- * 基座展示，实际凭据和网关配置由配置校验负责。
+ * 检测条件与 ec init 共用：Claude/Gemini 按可执行文件检测，Codex 要求满足
+ * 版本及 app-server 条件，ecagent 随 EvolCore 内置。不会仅因历史会话目录存在
+ * 就判定 CLI 可用。
  */
-import fs from 'fs';
-import path from 'path';
-import os from 'os';
-import { createRequire } from 'module';
-import { spawnSync } from 'child_process';
-const requireFromHere = createRequire(import.meta.url);
-let _cached = null;
-/**
- * 检测 node:sqlite 模块是否可用（Node 22.5+）
- */
-function checkSqliteAvailable() {
-    try {
-        requireFromHere('node:sqlite');
-        return true;
-    }
-    catch {
-        return false;
+import { resolveParentDistModule, toFileUrl } from './parent-package.js';
+let sharedDetectorPromise = null;
+async function sharedDetector() {
+    if (!sharedDetectorPromise) {
+        sharedDetectorPromise = import(toFileUrl(resolveParentDistModule('agents', 'baseagent-availability.js')));
     }
-}
-/**
- * 检测 Codex state_*.sqlite 文件是否存在
- */
-function checkCodexStateDb() {
-    const codexHome = path.join(os.homedir(), '.codex');
-    if (!fs.existsSync(codexHome))
-        return false;
-    try {
-        const files = fs.readdirSync(codexHome).filter(f => /^state_\d+\.sqlite$/.test(f));
-        return files.length > 0;
-    }
-    catch {
-        return false;
-    }
-}
-/**
- * 检测 Claude projects 目录是否存在
- */
-function checkClaudeProjects() {
-    const claudeProjects = path.join(os.homedir(), '.claude', 'projects');
-    return fs.existsSync(claudeProjects);
-}
-function commandExists(command) {
-    try {
-        const result = process.platform === 'win32'
-            ? spawnSync('where', [command], { stdio: 'ignore', windowsHide: true })
-            : spawnSync('sh', ['-lc', `command -v ${JSON.stringify(command)}`], { stdio: 'ignore' });
-        return result.status === 0;
-    }
-    catch {
-        return false;
-    }
-}
-function checkGeminiHome() {
-    return fs.existsSync(path.join(os.homedir(), '.gemini'));
-}
-function detectSources(id) {
-    if (id === 'ecagent')
-        return ['内置'];
-    const sources = [];
-    if (commandExists(id))
-        sources.push('PATH');
-    if (id === 'claude' && checkClaudeProjects())
-        sources.push('~/.claude/projects');
-    if (id === 'codex') {
-        if (checkCodexSessions())
-            sources.push('~/.codex/sessions');
-        if (checkCodexStateDb())
-            sources.push('~/.codex/state_*.sqlite');
-        if (checkSqliteAvailable())
-            sources.push('node:sqlite');
-    }
-    if (id === 'gemini' && checkGeminiHome())
-        sources.push('~/.gemini');
-    return sources;
-}
-/**
- * 检测 Codex sessions 目录是否存在
- */
-function checkCodexSessions() {
-    const codexSessions = path.join(os.homedir(), '.codex', 'sessions');
-    return fs.existsSync(codexSessions);
+    return sharedDetectorPromise;
 }
 /**
  * 检测所有 base agent 的可用性
- * 结果会缓存，避免重复检测
+ * 每次调用都会重新探测，确保基础设置中的“重新检测”反映当前环境。
  */
-export function detectBaseAgents() {
-    if (_cached)
-        return _cached;
-    const claude = detectSources('claude').length > 0;
-    const codex = detectSources('codex').length > 0;
-    const gemini = detectSources('gemini').length > 0;
-    const ecagent = true;
-    _cached = { claude, codex, gemini, ecagent };
-    return _cached;
+export async function detectBaseAgentsAsync() {
+    const mod = await sharedDetector();
+    const detected = new Set(mod.detectAvailableBaseagents());
+    return {
+        claude: detected.has('claude'),
+        codex: detected.has('codex'),
+        gemini: detected.has('gemini'),
+        ecagent: detected.has('ecagent'),
+    };
 }
 /** Return display-oriented detection details for the Basic Settings API. */
-export function detectBaseAgentDetails(defaults = {}) {
+export async function detectBaseAgentDetails(defaults = {}) {
+    const mod = await sharedDetector();
+    const probes = mod.detectBaseagentDetails();
     const configured = isRecord(defaults?.baseagents) ? defaults.baseagents : {};
-    return ['claude', 'codex', 'gemini', 'ecagent'].map(id => {
-        const detectionSource = detectSources(id);
+    return probes.map((probe) => {
+        const id = probe.id;
         return {
             id,
-            detected: id === 'ecagent' || detectionSource.length > 0,
+            detected: probe.detected,
             configured: Object.prototype.hasOwnProperty.call(configured, id),
-            detectionSource,
+            detectionSource: probe.detectionSource,
         };
     });
 }
@@ -121,6 +48,4 @@ function isRecord(value) {
 /**
  * 重置缓存（测试用）
  */
-export function resetDetectionCache() {
-    _cached = null;
-}
+export function resetDetectionCache() { }

package/dist/sources/basic-settings.js

@@ -176,6 +176,10 @@ function baseagentPath(fieldPath) {
         return null;
     return { baseagent: match[1], field: match[2] };
 }
+function baseagentBlockPath(fieldPath) {
+    const match = fieldPath.match(/^baseagents\.([a-z0-9_-]+)$/);
+    return match?.[1] || null;
+}
 export function isAllowedBasicSettingsPath(file, fieldPath) {
     try {
         pathSegments(fieldPath);
@@ -187,6 +191,9 @@ export function isAllowedBasicSettingsPath(file, fieldPath) {
         return DAEMON_EXACT_PATHS.has(fieldPath);
     if (DEFAULTS_EXACT_PATHS.has(fieldPath))
         return true;
+    const block = baseagentBlockPath(fieldPath);
+    if (block)
+        return BASEAGENT_SET.has(block);
     const parsed = baseagentPath(fieldPath);
     return !!parsed && BASEAGENT_SET.has(parsed.baseagent) && BASEAGENT_FIELDS[parsed.baseagent]?.has(parsed.field);
 }
@@ -450,6 +457,11 @@ function validateDefaultsValue(fieldPath, value) {
     const parsed = baseagentPath(fieldPath);
     if (parsed)
         return validateBaseagentValue(parsed.baseagent, parsed.field, fieldPath, value);
+    if (baseagentBlockPath(fieldPath)) {
+        if (!isRecord(value) || Object.keys(value).length > 0)
+            throw new Error(`${fieldPath} must be an empty object`);
+        return;
+    }
     if (fieldPath === 'active_baseagent') {
         if (!BASEAGENT_SET.has(String(value)))
             throw new Error(`${fieldPath} is invalid`);
@@ -510,8 +522,7 @@ export function validateBasicSettingsChange(file, change) {
     else
         validateDefaultsValue(change.path, change.value);
 }
-function validateBaseagentAvailability(config, changes) {
-    const details = detectBaseAgentDetails(config);
+function validateBaseagentAvailability(changes, details) {
     const detected = new Set(details.filter(item => item.detected).map(item => item.id));
     const configured = new Set(details.filter(item => item.configured).map(item => item.id));
     for (const change of changes) {
@@ -522,6 +533,10 @@ function validateBaseagentAvailability(config, changes) {
         if (parsed && !detected.has(parsed.baseagent) && !configured.has(parsed.baseagent)) {
             throw Object.assign(new Error(`Base Agent is not available on this machine: ${parsed.baseagent}`), { statusCode: 400 });
         }
+        const block = baseagentBlockPath(change.path);
+        if (block && change.op === 'set' && !detected.has(block) && !configured.has(block)) {
+            throw Object.assign(new Error(`Base Agent is not available on this machine: ${block}`), { statusCode: 400 });
+        }
     }
 }
 function setAtPath(root, segments, value) {
@@ -675,7 +690,7 @@ async function readSnapshot(options = {}) {
         },
         secrets,
         secretRefs,
-        baseagents: detectBaseAgentDetails(rawDefaults),
+        baseagents: await detectBaseAgentDetails(rawDefaults),
         logTypes: logTypeStats.types,
         logTypeCounts: logTypeStats.counts,
     };
@@ -779,6 +794,8 @@ export async function handleBasicSettingsApi(req, res, options = {}) {
             changes.forEach(change => validateBasicSettingsChange(file, change));
             const modules = await getConfigManager();
             const target = file === 'daemon' ? modules.ConfigTarget.Process : modules.ConfigTarget.Defaults;
+            const currentConfig = modules.read(target, undefined, { cache: false, expand: false }) ?? {};
+            const detection = file === 'defaults' ? await detectBaseAgentDetails(currentConfig) : [];
             const mutation = modules.mutateConfig(target, undefined, config => {
                 if (basicSettingsRevision(config) !== body.revision) {
                     throw Object.assign(new Error('Configuration changed after it was loaded. Reload and try again.'), {
@@ -786,7 +803,7 @@ export async function handleBasicSettingsApi(req, res, options = {}) {
                     });
                 }
                 if (file === 'defaults')
-                    validateBaseagentAvailability(config, changes);
+                    validateBaseagentAvailability(changes, detection);
                 applyBasicSettingsChanges(config, file, changes);
                 const errors = modules.validateConfig(target, config);
                 if (errors.length > 0) {

package/dist/sources/models.js

@@ -32,21 +32,27 @@ export function normalizeModelEntries(models) {
             owned_by: model.owned_by,
             created: model.created,
             family: inferModelFamily(id),
-            status: isAlias ? 'alias' : 'available',
+            status: isAlias ? 'alias' : model.verification || 'unverified',
+            verification: model.verification,
+            reasoningLevels: model.reasoningLevels,
+            aliasFor: model.aliasFor,
             isAlias
         });
     }
     return out;
 }
-export async function getModelCatalogSnapshot(baseagent = 'claude') {
+export async function getModelCatalogSnapshot(baseagent = 'claude', self, refresh = false) {
     const { getCatalog } = await getCatalogModule();
-    const catalog = await getCatalog(undefined, baseagent);
+    const catalog = await getCatalog(self, baseagent, refresh);
     const normalized = normalizeModelEntries(catalog.models || []);
     return {
         models: normalized,
         catalogModels: normalized,
         source: catalog.source || 'unknown',
-        lastUpdate: new Date().toISOString()
+        lastUpdate: catalog.fetchedAt,
+        revision: catalog.revision,
+        freshness: catalog.freshness,
+        diagnostics: catalog.diagnostics,
     };
 }
 function sendJson(res, status, payload) {
@@ -58,11 +64,12 @@ export async function handleModelsApi(req, res) {
         const url = new URL(req.url || '', 'http://localhost');
         if (req.method === 'GET' && url.pathname === '/api/models/catalog') {
             const baseagent = url.searchParams.get('baseagent') || 'claude';
-            if (!/^[a-z0-9_-]+$/i.test(baseagent)) {
+            if (!['claude', 'codex', 'ecagent', 'gemini'].includes(baseagent)) {
                 sendJson(res, 400, { success: false, error: 'Invalid baseagent' });
                 return;
             }
-            const data = await getModelCatalogSnapshot(baseagent);
+            const self = url.searchParams.get('aid') || url.searchParams.get('self') || undefined;
+            const data = await getModelCatalogSnapshot(baseagent, self, url.searchParams.get('refresh') === 'true');
             sendJson(res, 200, { success: true, data });
             return;
         }

package/dist/sources/monitor.js

@@ -14,6 +14,7 @@
 import fs from 'node:fs';
 import { resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc-client.js';
+import crypto from 'node:crypto';
 function processGroupKey(process) {
     return `${process.kind}\u0000${process.name}`;
 }
@@ -192,9 +193,9 @@ function sampleNetworkRate(ts) {
     previousNetworkSample = { ...totals, ts };
     return latestNetworkRate;
 }
-async function fetchSnapshot() {
+async function fetchSnapshot(leaseId) {
     const p = resolvePaths();
-    const resp = await ipcQuery(p.socket, { type: 'monitor-snapshot' }, 3000);
+    const resp = await ipcQuery(p.socket, { type: 'monitor-snapshot', ...(leaseId ? { leaseId } : {}) }, 3000);
     // resp === null → daemon 离线或 socket 不可达；resp.ok === false → 命令不受支持（旧 daemon）
     if (!resp?.ok) {
         return { daemonRunning: resp !== null, snapshot: null, history: { fine: [], mid: [], coarse: [] } };
@@ -237,8 +238,24 @@ async function fetchSnapshot() {
 }
 export const monitorSource = {
     kind: 'monitor',
-    async snapshot() {
-        return fetchSnapshot();
+    async activate(params) {
+        const leaseId = crypto.randomUUID();
+        const p = resolvePaths();
+        const response = await ipcQuery(p.socket, { type: 'monitor-subscribe', leaseId }, 3000);
+        if (!response?.ok)
+            throw new Error('daemon rejected monitor subscription');
+        params.__monitorLeaseId = leaseId;
+        let released = false;
+        return () => {
+            if (released)
+                return;
+            released = true;
+            delete params.__monitorLeaseId;
+            void ipcQuery(p.socket, { type: 'monitor-unsubscribe', leaseId }, 3000);
+        };
+    },
+    async snapshot(params) {
+        return fetchSnapshot(params?.__monitorLeaseId);
     },
     subscribe(_params, push) {
         let lastJson = '';
@@ -247,7 +264,7 @@ export const monitorSource = {
             if (stopped)
                 return;
             try {
-                const snap = await fetchSnapshot();
+                const snap = await fetchSnapshot(_params.__monitorLeaseId);
                 const json = JSON.stringify(snap);
                 if (json !== lastJson) {
                     lastJson = json;

package/dist/sources/relation-roles.js

@@ -1,8 +1,17 @@
 import fs from 'fs';
 import path from 'path';
 import { resolvePaths } from '../paths.js';
-import { getSessionsAunDir, listPeers, readJsonFile, readMessages, } from '../fs-utils.js';
+import { getSessionsAunDir, isTransientProtocolMessage, readJsonFile, readAllJsonlLines, scanChatDirs, } from '../fs-utils.js';
 import { resolveParentDistModule, toFileUrl } from './parent-package.js';
+import crypto from 'node:crypto';
+function ecwebAuditContext(auth, aid, operation) {
+    return {
+        ecwebRequestId: auth.ecwebRequestId ?? crypto.randomUUID(),
+        targetAgentAid: aid,
+        endpoint: auth.endpoint ?? 'ECWeb relation roles',
+        logicalToolName: operation,
+    };
+}
 async function getParentModules() {
     const configPath = resolveParentDistModule('config', 'config-manager.js');
     const rolesPath = resolveParentDistModule('config', 'roles.js');
@@ -116,6 +125,7 @@ async function authorizeRoleAssignmentRead(modules, aid, auth) {
         reason: decision.allow ? undefined : decision.reason,
         matchedRule: decision.matchedRule,
         argsSummary: { self: aid },
+        ...ecwebAuditContext(auth, aid, 'role.relation.read'),
     });
     if (decision.allow)
         return { allow: true, actorRole: actor.actorRole };
@@ -150,6 +160,7 @@ async function authorizeRoleAssignmentWrite(modules, aid, auth, operation, targe
             code: 'IMMUTABLE_STATIC_OWNER',
             reason,
             argsSummary: { ...args, targetRole },
+            ...ecwebAuditContext(auth, aid, operation),
         });
         return {
             allow: false,
@@ -194,6 +205,7 @@ async function authorizeRoleAssignmentWrite(modules, aid, auth, operation, targe
             reason: decision.reason,
             matchedRule: decision.matchedRule,
             argsSummary: { ...args, targetRole },
+            ...ecwebAuditContext(auth, aid, operation),
         });
         return {
             allow: false,
@@ -227,6 +239,7 @@ async function authorizeRoleAssignmentWrite(modules, aid, auth, operation, targe
             reason,
             matchedRule: decision.matchedRule,
             argsSummary: { ...args, targetRole },
+            ...ecwebAuditContext(auth, aid, operation),
         });
         return {
             allow: false,
@@ -251,6 +264,7 @@ async function authorizeRoleAssignmentWrite(modules, aid, auth, operation, targe
         decision: 'allow',
         matchedRule: decision.matchedRule,
         argsSummary: { ...args, targetRole },
+        ...ecwebAuditContext(auth, aid, operation),
     });
     return { allow: true, actorRole };
 }
@@ -323,12 +337,6 @@ function relationTargetFromId(raw) {
     }
     return { peerKey: formatPeerKey('aun', value), channelId: value };
 }
-function readActive(aunDir, aid, conversationId) {
-    return readJsonFile(path.join(aunDir, encodeSegmentForRoleSource(aid), encodeSegmentForRoleSource(conversationId), 'active.json'));
-}
-function encodeSegmentForRoleSource(s) {
-    return s.replace(/[<>:"/\\|?*\x00-\x1F%]/g, ch => '%' + ch.charCodeAt(0).toString(16).toUpperCase().padStart(2, '0'));
-}
 function frontmatterValue(frontmatter, key) {
     const re = new RegExp(`^${key}:\\s*(?:"([^"]*)"|'([^']*)'|([^\\r\\n#]*))\\s*(?:#.*)?$`, 'm');
     const match = frontmatter.match(re);
@@ -380,6 +388,20 @@ function createLocalAgentMdLookup() {
         return info;
     };
 }
+function readPeerVerificationStatus(selfAid, peerId) {
+    if (!selfAid || !peerId)
+        return 'unknown';
+    const peerKey = formatPeerKey('aun', peerId);
+    const identity = readJsonFile(path.join(resolvePaths().root, 'agents', selfAid, 'relations', peerKey, 'peer-identity.json'));
+    const raw = String(identity?.source ?? identity?.verifyStatus ?? identity?.verify_status ?? '').trim().toLowerCase();
+    if (raw === 'agentmd' || raw === 'verified')
+        return 'agentmd';
+    if (raw === 'agentmd-unverified' || raw === 'unverified')
+        return 'agentmd-unverified';
+    if (raw === 'invalid')
+        return 'invalid';
+    return 'unknown';
+}
 function latestMessageAt(messages) {
     let lastAt = 0;
     for (const message of messages) {
@@ -418,7 +440,7 @@ function firstMessagePeerType(messages, peerId) {
 function conversationSortName(seed) {
     return (seed.name || seed.peerAid || seed.groupId || seed.conversationId).toLowerCase();
 }
-function groupMembersFromMessages(selfAid, messages, localAgentMdLookup) {
+function groupMembersFromMessages(selfAid, messages, localAgentMdLookup, peerVerificationLookup) {
     const members = new Map();
     for (const message of messages) {
         const sender = message.from;
@@ -448,6 +470,7 @@ function groupMembersFromMessages(selfAid, messages, localAgentMdLookup) {
         const localInfo = localAgentMdLookup(member.peerId);
         member.peerName = localInfo?.name ?? member.peerName;
         member.peerType = localInfo?.peerType ?? member.peerType;
+        member.verifyStatus = peerVerificationLookup(selfAid, member.peerId);
     }
     return [...members.values()].sort((a, b) => {
         const lastDiff = (b.lastAt ?? 0) - (a.lastAt ?? 0);
@@ -456,7 +479,7 @@ function groupMembersFromMessages(selfAid, messages, localAgentMdLookup) {
         return (a.peerName || a.peerAid).localeCompare(b.peerName || b.peerAid);
     });
 }
-export function buildConversationSeeds(aid, peerInfos, localAgentMdLookup = () => undefined) {
+export function buildConversationSeeds(aid, peerInfos, localAgentMdLookup = () => undefined, peerVerificationLookup = readPeerVerificationStatus) {
     const seeds = [];
     for (const peer of peerInfos) {
         const messages = peer.messages || [];
@@ -478,7 +501,7 @@ export function buildConversationSeeds(aid, peerInfos, localAgentMdLookup = () =
                 lastAt,
                 inbound: counts.inbound,
                 outbound: counts.outbound,
-                members: groupMembersFromMessages(aid, messages, localAgentMdLookup),
+                members: groupMembersFromMessages(aid, messages, localAgentMdLookup, peerVerificationLookup),
             });
             continue;
         }
@@ -499,6 +522,7 @@ export function buildConversationSeeds(aid, peerInfos, localAgentMdLookup = () =
             peerKey: peerId,
             peerName,
             peerType,
+            verifyStatus: peerVerificationLookup(aid, peerId),
             lastAt,
             inbound: counts.inbound,
             outbound: counts.outbound,
@@ -515,13 +539,20 @@ export function buildConversationSeeds(aid, peerInfos, localAgentMdLookup = () =
 }
 function loadConversationSeeds(aid) {
     const aunDir = getSessionsAunDir();
+    const peerInfoById = new Map();
+    for (const chat of scanChatDirs(aunDir).filter(item => item.channelType === 'aun' && item.selfAID === aid)) {
+        const current = peerInfoById.get(chat.channelId) ?? { conversationId: chat.channelId, messages: [] };
+        const active = readJsonFile(path.join(chat.dirPath, 'active.json'));
+        if (active && (!current.active || Number(active.updatedAt || 0) >= Number(current.active.updatedAt || 0))) {
+            current.active = active;
+        }
+        current.messages.push(...readAllJsonlLines(path.join(chat.dirPath, 'messages.jsonl'))
+            .filter(message => !isTransientProtocolMessage(message)));
+        peerInfoById.set(chat.channelId, current);
+    }
     const localAgentMdLookup = createLocalAgentMdLookup();
-    const peerInfos = listPeers(aunDir, aid).map(conversationId => ({
-        conversationId,
-        active: readActive(aunDir, aid, conversationId),
-        messages: readMessages(aunDir, aid, conversationId),
-    }));
-    return buildConversationSeeds(aid, peerInfos, localAgentMdLookup);
+    const peerInfos = [...peerInfoById.values()];
+    return buildConversationSeeds(aid, peerInfos, localAgentMdLookup, readPeerVerificationStatus);
 }
 function readRelationConfig(config, aid, peerKey) {
     return config.read(config.ConfigTarget.Relation, { self: aid, peerKey }, { cache: true }) || {};
@@ -648,6 +679,11 @@ function listRelationRoleAssignments(config, aid) {
     return out;
 }
 async function buildSnapshot(auth = {}) {
+    auth = {
+        ...auth,
+        ecwebRequestId: auth.ecwebRequestId ?? crypto.randomUUID(),
+        endpoint: auth.endpoint ?? 'WS snapshot:roles',
+    };
     const modules = await getParentModules();
     const agents = await getAgentsFromIpc();
     const snapshotAgents = [];
@@ -678,7 +714,11 @@ export const relationRolesSource = {
     kind: 'roles',
     async snapshot(params = {}) {
         try {
-            return await buildSnapshot(params.__menuAuth ?? {});
+            return await buildSnapshot({
+                ...(params.__menuAuth ?? {}),
+                ecwebRequestId: params.__ecwebRequestId,
+                endpoint: params.__ecwebEndpoint,
+            });
         }
         catch (err) {
             return { agents: [], conversations: [], error: String(err) };
@@ -765,6 +805,11 @@ function deleteScopedAssignment(configMod, aid, body, fallbackTargetId) {
 export async function handleRelationRolesApi(req, res, auth = {}) {
     try {
         const urlPath = (req.url || '').split('?')[0];
+        auth = {
+            ...auth,
+            ecwebRequestId: auth.ecwebRequestId ?? crypto.randomUUID(),
+            endpoint: auth.endpoint ?? `${req.method ?? 'UNKNOWN'} ${urlPath}`,
+        };
         const modules = await getParentModules();
         if (req.method === 'GET' && urlPath.startsWith('/api/roles/agent/')) {
             const aid = decodeURIComponent(urlPath.split('/').filter(Boolean).pop() || '');
@@ -802,6 +847,11 @@ export async function handleRelationRolesApi(req, res, auth = {}) {
 export async function handlePeerRoleApi(req, res, auth = {}) {
     try {
         const urlPath = (req.url || '').split('?')[0];
+        auth = {
+            ...auth,
+            ecwebRequestId: auth.ecwebRequestId ?? crypto.randomUUID(),
+            endpoint: auth.endpoint ?? `${req.method ?? 'UNKNOWN'} ${urlPath}`,
+        };
         const target = assignmentFromPath(urlPath);
         if (!target)
             return sendJson(res, 400, { error: 'missing aid or target id' });