ec-web 0.0.6 → 0.0.7

package/dist/fs-utils.js

@@ -14,72 +14,104 @@ export function encodeSegment(s) {
 export function decodeDirSegment(seg) {
     return seg.replace(/%([0-9A-Fa-f]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)));
 }
+function encodeChannelSessionComponent(value) {
+    const encoded = encodeURIComponent(value).replace(/\*/g, '%2A');
+    return encoded.endsWith('.') ? `${encoded.slice(0, -1)}%2E` : encoded;
+}
+function formatChannelSessionKeyParts(channelType, channelName, channelId) {
+    if (!channelType || !channelName || !channelId)
+        throw new Error('channel session key components must not be empty');
+    const key = [channelType, channelName, channelId].map(encodeChannelSessionComponent).join('#');
+    if (Buffer.byteLength(key, 'utf8') > 255)
+        throw new Error('channel session key exceeds the 255-byte filesystem limit');
+    return key;
+}
+export function formatChannelSessionKey(channelType, channelId, channelKey) {
+    const parts = channelKey?.split('#');
+    const channelName = parts?.length === 3 && parts[0] === channelType && parts[2]?.trim()
+        ? parts[2].trim()
+        : 'main';
+    return formatChannelSessionKeyParts(channelType, channelName, channelId);
+}
+export function tryParseChannelSessionKey(key) {
+    const parts = key.split('#');
+    if (parts.length !== 3 || parts.some(part => !part))
+        return undefined;
+    try {
+        const parsed = {
+            channelType: decodeURIComponent(parts[0]),
+            channelName: decodeURIComponent(parts[1]),
+            channelId: decodeURIComponent(parts[2]),
+        };
+        if (!parsed.channelType || !parsed.channelName || !parsed.channelId)
+            return undefined;
+        return formatChannelSessionKeyParts(parsed.channelType, parsed.channelName, parsed.channelId) === key
+            ? parsed
+            : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 /** 与 evolcore cross-platform.ts encodePath 一致（CC transcript 目录名） */
 export function encodePath(p) {
     const isWindows = process.platform === 'win32';
     const norm = isWindows ? p.replace(/\\/g, '/') : p;
     return encodeURIComponent(norm).replace(/%2F/gi, '-').replace(/%3A/gi, '-').replace(/^-/, '');
 }
+function hasSessionPayload(dirPath) {
+    try {
+        return fs.readdirSync(dirPath, { withFileTypes: true }).some(entry => (entry.isFile() && (entry.name === 'active.json'
+            || entry.name === 'messages.jsonl'
+            || (entry.name.startsWith('meta_') && entry.name.endsWith('.jsonl')))) || (entry.isDirectory() && entry.name === '_threads'));
+    }
+    catch {
+        return false;
+    }
+}
 export function scanChatDirs(sessionsDir) {
     const results = [];
-    let channelTypes;
+    let agents;
     try {
-        channelTypes = fs.readdirSync(sessionsDir, { withFileTypes: true });
+        agents = fs.readdirSync(sessionsDir, { withFileTypes: true });
     }
     catch {
         return results;
     }
-    for (const ct of channelTypes) {
-        if (!ct.isDirectory())
+    for (const agent of agents) {
+        if (!agent.isDirectory())
             continue;
-        const channelType = ct.name;
-        const ctDir = path.join(sessionsDir, channelType);
-        let level2;
+        const selfAID = decodeDirSegment(agent.name);
+        const agentSessions = path.join(sessionsDir, agent.name, 'sessions');
+        let sessions;
         try {
-            level2 = fs.readdirSync(ctDir, { withFileTypes: true });
+            sessions = fs.readdirSync(agentSessions, { withFileTypes: true });
         }
         catch {
             continue;
         }
-        if (channelType === 'aun') {
-            for (const selfEnc of level2) {
-                if (!selfEnc.isDirectory())
-                    continue;
-                const selfAID = decodeDirSegment(selfEnc.name);
-                const selfDir = path.join(ctDir, selfEnc.name);
-                let peers;
-                try {
-                    peers = fs.readdirSync(selfDir, { withFileTypes: true });
-                }
-                catch {
-                    continue;
-                }
-                for (const peerEnc of peers) {
-                    if (!peerEnc.isDirectory() || peerEnc.name.startsWith('_'))
-                        continue;
-                    results.push({
-                        dirPath: path.join(selfDir, peerEnc.name),
-                        channelType,
-                        channelId: decodeDirSegment(peerEnc.name),
-                        selfAID,
-                    });
-                }
-            }
-        }
-        else {
-            for (const chanEnc of level2) {
-                if (!chanEnc.isDirectory())
-                    continue;
-                results.push({
-                    dirPath: path.join(ctDir, chanEnc.name),
-                    channelType,
-                    channelId: decodeDirSegment(chanEnc.name),
-                    selfAID: '',
-                });
-            }
+        for (const session of sessions) {
+            if (!session.isDirectory())
+                continue;
+            const parsed = tryParseChannelSessionKey(session.name);
+            if (!parsed)
+                continue;
+            const dirPath = path.join(agentSessions, session.name);
+            if (!hasSessionPayload(dirPath))
+                continue;
+            results.push({
+                dirPath,
+                channelType: parsed.channelType,
+                channelKey: parsed.channelType === 'daemon'
+                    ? 'daemon'
+                    : `${parsed.channelType}#${selfAID}#${parsed.channelName}`,
+                channelId: parsed.channelId,
+                channelSessionKey: session.name,
+                selfAID,
+            });
         }
     }
-    return results;
+    return results.sort((left, right) => left.dirPath < right.dirPath ? -1 : left.dirPath > right.dirPath ? 1 : 0);
 }
 export function readJsonFile(filePath) {
     try {
@@ -123,34 +155,26 @@ export function isTransientProtocolMessage(entry) {
     return transient(entry.payloadType) || transient(entry.msgType);
 }
 export function getSessionsAunDir() {
-    return path.join(resolvePaths().sessionsDir, 'aun');
+    return resolvePaths().sessionsDir;
 }
 export function listLocalAids(aunDir) {
-    try {
-        return fs.readdirSync(aunDir, { withFileTypes: true })
-            .filter(e => e.isDirectory())
-            .map(e => decodeDirSegment(e.name));
-    }
-    catch {
-        return [];
-    }
+    return [...new Set(scanChatDirs(aunDir)
+            .filter(chat => chat.channelType === 'aun')
+            .map(chat => chat.selfAID))].sort();
 }
 export function listPeers(aunDir, localAid) {
-    const aidDir = path.join(aunDir, encodeSegment(localAid));
-    try {
-        return fs.readdirSync(aidDir, { withFileTypes: true })
-            .filter(e => e.isDirectory() && !e.name.startsWith('_'))
-            .map(e => decodeDirSegment(e.name));
-    }
-    catch {
-        return [];
-    }
+    return [...new Set(scanChatDirs(aunDir)
+            .filter(chat => chat.channelType === 'aun' && chat.selfAID === localAid)
+            .map(chat => chat.channelId))].sort();
+}
+function aunChatDir(aunDir, localAid, peerId) {
+    return path.join(aunDir, encodeSegment(localAid), 'sessions', formatChannelSessionKey('aun', peerId, `aun#${localAid}#main`));
 }
 export function readMessages(aunDir, localAid, peerId) {
-    return readAllJsonlLines(path.join(aunDir, encodeSegment(localAid), encodeSegment(peerId), 'messages.jsonl')).filter(m => !isTransientProtocolMessage(m));
+    return readAllJsonlLines(path.join(aunChatDir(aunDir, localAid, peerId), 'messages.jsonl')).filter(m => !isTransientProtocolMessage(m));
 }
 function readPeerName(aunDir, localAid, peerId) {
-    return readJsonFile(path.join(aunDir, encodeSegment(localAid), encodeSegment(peerId), 'active.json'))?.metadata?.peerName ?? null;
+    return readJsonFile(path.join(aunChatDir(aunDir, localAid, peerId), 'active.json'))?.metadata?.peerName ?? null;
 }
 export function loadAidInfo(aunDir, aid) {
     const peers = listPeers(aunDir, aid);

package/dist/paths.js

@@ -42,7 +42,7 @@ export function resolvePaths() {
     const root = resolveRoot();
     return {
         root,
-        sessionsDir: path.join(root, 'data', 'sessions'),
+        sessionsDir: path.join(root, 'agents'),
         instanceDir: path.join(root, 'data', 'instance'),
         dataDir: path.join(root, 'data'),
         logs: path.join(root, 'logs'),

package/dist/sources/msg.js

@@ -1,5 +1,5 @@
 /**
- * 消息数据源：扫描 data/sessions 下所有渠道的 messages.jsonl。
+ * 消息数据源：扫描 agents/<aid>/sessions 下所有渠道的 messages.jsonl。
  *
  * 左列按 agent 聚合；中列列出该 agent 下所有渠道的私聊/群聊会话。
  * 兼容旧参数名 aid/peer：前端的 aid 实际上传 scope id。
@@ -9,7 +9,7 @@ import path from 'path';
 import { ipcQuery } from '../ipc-client.js';
 import { resolvePaths } from '../paths.js';
 import { resolveParentDistModule, toFileUrl } from './parent-package.js';
-import { isTransientProtocolMessage, readAllJsonlLines, readJsonFile, } from '../fs-utils.js';
+import { decodeDirSegment, isTransientProtocolMessage, readAllJsonlLines, readJsonFile, scanChatDirs, tryParseChannelSessionKey, } from '../fs-utils.js';
 let contextModulesPromise = null;
 const sessionAdapterPromises = new Map();
 let peerDisplayResolverPromise = null;
@@ -201,26 +201,10 @@ function getSessionAdapter(baseagent) {
 function safeId(value) {
     return Buffer.from(value, 'utf8').toString('base64url');
 }
-function findMessageFiles(root) {
-    const out = [];
-    const visit = (dir) => {
-        let entries;
-        try {
-            entries = fs.readdirSync(dir, { withFileTypes: true });
-        }
-        catch {
-            return;
-        }
-        for (const entry of entries) {
-            const full = path.join(dir, entry.name);
-            if (entry.isDirectory())
-                visit(full);
-            else if (entry.isFile() && entry.name === 'messages.jsonl')
-                out.push(full);
-        }
-    };
-    visit(root);
-    return out;
+export function findMessageFiles(root) {
+    return scanChatDirs(root)
+        .map(chat => path.join(chat.dirPath, 'messages.jsonl'))
+        .filter(file => fs.existsSync(file));
 }
 function fileSignature(file) {
     try {
@@ -488,9 +472,6 @@ export async function getAgentSelfNames() {
     agentDisplayNamesCache = { expiresAt: Date.now() + 5000, names };
     return names;
 }
-function decodeDirSegment(seg) {
-    return seg.replace(/%([0-9A-Fa-f]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)));
-}
 function parseChannelKey(value) {
     if (typeof value !== 'string')
         return null;
@@ -515,10 +496,38 @@ function parseLegacySessionKey(value, channelType) {
         return null;
     return { type: parts[0], selfAID: parts[1], name: parts[2] || 'main' };
 }
-function pathIdentity(sessionsDir, dirPath) {
+export function pathIdentity(sessionsDir, dirPath) {
     const relParts = path.relative(sessionsDir, dirPath).split(path.sep).filter(Boolean);
     if (!relParts.length)
         return {};
+    // Current layout: agents/<aid>/sessions/<channelSessionKey>/
+    if (relParts.length === 3 && relParts[1] === 'sessions') {
+        const selfAID = decodeDirSegment(relParts[0]);
+        const parsed = tryParseChannelSessionKey(relParts[2]);
+        if (parsed) {
+            return {
+                channelType: parsed.channelType,
+                channel: parsed.channelType === 'daemon'
+                    ? 'daemon'
+                    : `${parsed.channelType}#${selfAID}#${parsed.channelName}`,
+                channelId: parsed.channelId,
+                selfAID,
+            };
+        }
+    }
+    // Immediately preceding Agent layout, retained for inspecting backups.
+    if (relParts.length >= 4 && relParts[1] === 'sessions') {
+        const selfAID = decodeDirSegment(relParts[0]);
+        const channelKey = decodeDirSegment(relParts[2]);
+        const parsed = parseChannelKey(channelKey);
+        return {
+            channelType: parsed?.type || channelKey,
+            channel: channelKey,
+            channelId: decodeDirSegment(relParts[3]),
+            selfAID: parsed?.selfAID || selfAID,
+        };
+    }
+    // Pre-migration path fallback for viewing a backup directory only.
     const firstKey = parseChannelKey(decodeDirSegment(relParts[0]));
     if (firstKey) {
         return {

package/dist/sources/stats.js

@@ -447,7 +447,7 @@ function getPeerInfo(peerKey) {
         if (target.startsWith('group.')) {
             // 群聊：读取群信息
             const { sessionsDir } = resolvePaths();
-            const groupDir = path.join(sessionsDir, 'aun', encodeSegment(agentAid), encodeSegment(target));
+            const groupDir = path.join(sessionsDir, encodeSegment(agentAid), 'sessions', encodeSegment(`aun#${agentAid}#main`), encodeSegment(target));
             const activeJsonPath = path.join(groupDir, 'active.json');
             if (fs.existsSync(activeJsonPath)) {
                 const activeData = JSON.parse(fs.readFileSync(activeJsonPath, 'utf-8'));

package/dist/static/app.js

@@ -5213,6 +5213,18 @@ const TRIGGER_CONCURRENCY_OPTIONS = [
   ['replace', () => t('triggers.concurrency.replace')],
   ['allow', () => t('triggers.concurrency.allow')],
 ];
+
+function triggerCanonicalThread(thread) {
+  return thread === 'per_run' || thread === 'by_run' ? 'by_run' : 'by_trigger';
+}
+
+function triggerConcurrencyOptions(executionType, thread) {
+  if (executionType === 'script') return TRIGGER_CONCURRENCY_OPTIONS;
+  if (executionType === 'trigger_session' && triggerCanonicalThread(thread) === 'by_run') {
+    return TRIGGER_CONCURRENCY_OPTIONS;
+  }
+  return TRIGGER_CONCURRENCY_OPTIONS.filter(([value]) => value !== 'allow');
+}
 const TRIGGER_MISSED_POLICY_OPTIONS = [
   ['skip', () => t('triggers.missed.skip')],
   ['run_once', () => t('triggers.missed.run_once')],
@@ -5758,6 +5770,7 @@ function triggerOriginalEditState(t) {
     name: String(definition?.name ?? t?.name ?? t?.label ?? ''),
     enabled: triggerIsEnabled(t),
     executionType,
+    triggerThread: String(execution.thread ?? ''),
     scriptPath: String(execution.script?.path ?? ''),
     scriptRuntime: String(execution.script?.runtime ?? 'node'),
     scriptTimeoutMs: Number(execution.script?.timeoutMs ?? 30_000),
@@ -6554,6 +6567,7 @@ function syncTriggerEditFields(ctx) {
   const valueField = root.querySelector('#trig-edit-schedule-value-field');
   const eventFields = root.querySelectorAll('.trig-event-field');
   const executionType = root.querySelector('#trig-edit-type')?.value || ctx.original.executionType;
+  const concurrencySelect = root.querySelector('#trig-edit-concurrency');
   const deliverySwitch = root.querySelector('#trig-edit-delivery-enabled');
   const deliverySwitchField = root.querySelector('.trig-delivery-switch');
   if (executionType === 'target_session') {
@@ -6633,6 +6647,15 @@ function syncTriggerEditFields(ctx) {
   if (scriptFeedback) scriptFeedback.hidden = executionType !== 'script' || !deliveryEnabled;
   if (threadField) threadField.hidden = !showTarget || targetSession !== 'thread';
   if (threadInput) threadInput.disabled = ctx.saving || !showTarget || targetSession !== 'thread';
+  if (concurrencySelect) {
+    const options = triggerConcurrencyOptions(executionType, ctx.original.triggerThread);
+    const current = options.some(([value]) => value === concurrencySelect.value)
+      ? concurrencySelect.value
+      : 'forbid';
+    concurrencySelect.innerHTML = triggerOptionHtml(options, current, null);
+    concurrencySelect.value = current;
+    concurrencySelect.disabled = Boolean(ctx.saving);
+  }
 }
 
 function readTriggerEditValues(root) {
@@ -6779,7 +6802,7 @@ function triggerDefinitionFromEdit(original, values, eventFilter, feedbackStrate
     execution.prompt = values.prompt;
     delete execution.script;
     if (values.executionType === 'trigger_session') {
-      if (previousExecutionType !== 'trigger_session' || !['per_run', 'by_trigger'].includes(execution.thread)) {
+      if (previousExecutionType !== 'trigger_session' || !['per_run', 'by_run', 'by_trigger'].includes(execution.thread)) {
         execution.thread = 'by_trigger';
       }
     } else {
@@ -7024,7 +7047,7 @@ function openTriggerEditDrawer(id, agent) {
           `<div class="ag-edit-grid trig-edit-grid trig-limit-grid">` +
             `<label class="ag-edit-field"><span>${t('triggers.field.maxRuns')}</span><input id="trig-edit-max-runs" type="number" min="1" step="1" value="${esc(original.maxRuns)}" placeholder="${t('common.noLimit')}"></label>` +
             `<label class="ag-edit-field"><span>${t('triggers.field.maxDuration')}</span><input id="trig-edit-max-duration" type="text" autocomplete="off" spellcheck="false" value="${esc(original.maxDuration)}" placeholder="${t('triggers.placeholder.maxDuration')}"></label>` +
-            `<label class="ag-edit-field"><span>${t('triggers.field.concurrency')}</span><select id="trig-edit-concurrency">${triggerOptionHtml(TRIGGER_CONCURRENCY_OPTIONS, original.concurrency, null)}</select></label>` +
+            `<label class="ag-edit-field"><span>${t('triggers.field.concurrency')}</span><select id="trig-edit-concurrency">${triggerOptionHtml(triggerConcurrencyOptions(original.executionType, original.triggerThread), original.concurrency, null)}</select></label>` +
             `<label class="ag-edit-field"><span>${t('triggers.field.retryAttempts')}</span><input id="trig-edit-retry-attempts" type="number" min="0" max="20" step="1" value="${esc(original.retryAttempts)}"></label>` +
             `<label class="ag-edit-field"><span>${t('triggers.field.retryBackoff')}</span><input id="trig-edit-retry-backoff" type="text" autocomplete="off" spellcheck="false" value="${esc(original.retryBackoff)}" placeholder="${t('triggers.placeholder.retryBackoff')}"></label>` +
             `<label class="ag-edit-field"><span>${t('triggers.field.missedPolicy')}</span><select id="trig-edit-missed-policy">${triggerOptionHtml(TRIGGER_MISSED_POLICY_OPTIONS, original.missedPolicy, null)}</select></label>` +

package/dist/static/index.html

@@ -48,7 +48,7 @@
 
       </nav>
       <span style="flex:1"></span>
-      2026-07-31 00:38
+      2026-08-03 19:27
       <span id="conn-status" class="conn-status" data-i18n="status.connecting">连接中…</span>
       <button id="lang-btn" class="theme-btn" data-i18n-title="language.buttonTitle" title="切换语言">🌐</button>
       <button id="theme-btn" class="theme-btn" data-i18n-title="theme.buttonTitle" title="主题">🌗</button>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ec-web",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Web console and monitoring dashboard for EvolCore",
   "type": "module",
   "bin": {