evolclaw 3.1.3 → 3.1.5

package/dist/cli/watch-web/static/style.css

@@ -0,0 +1,247 @@
+:root {
+  --bg: #0d1117;
+  --bg2: #161b22;
+  --bg3: #21262d;
+  --border: #30363d;
+  --fg: #e6edf3;
+  --dim: #8b949e;
+  --accent: #58a6ff;
+  --green: #3fb950;
+  --red: #f85149;
+  --orange: #db8e3c;
+  --blue: #58a6ff;
+  --magenta: #bc8cff;
+}
+
+* { box-sizing: border-box; margin: 0; padding: 0; }
+
+body {
+  font-family: -apple-system, "Segoe UI", "PingFang SC", "Microsoft YaHei", monospace;
+  background: var(--bg);
+  color: var(--fg);
+  font-size: 13px;
+  height: 100vh;
+  overflow: hidden;
+}
+
+/* ── 配对页 ── */
+.pair-page {
+  display: flex; align-items: center; justify-content: center;
+  height: 100vh;
+}
+.pair-box {
+  background: var(--bg2);
+  border: 1px solid var(--border);
+  border-radius: 12px;
+  padding: 40px 48px;
+  text-align: center;
+  min-width: 320px;
+}
+.pair-box h1 { font-size: 22px; margin-bottom: 8px; }
+.pair-hint { color: var(--dim); margin-bottom: 24px; }
+.pair-box input {
+  width: 100%;
+  font-size: 28px;
+  letter-spacing: 12px;
+  text-align: center;
+  padding: 12px;
+  background: var(--bg);
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  color: var(--fg);
+  margin-bottom: 16px;
+}
+.pair-box input:focus { outline: none; border-color: var(--accent); }
+.pair-box button {
+  width: 100%;
+  padding: 12px;
+  font-size: 15px;
+  background: var(--accent);
+  color: #fff;
+  border: none;
+  border-radius: 8px;
+  cursor: pointer;
+}
+.pair-box button:hover { opacity: 0.9; }
+.pair-error { color: var(--red); margin-top: 12px; min-height: 18px; }
+
+/* ── 主面板布局 ── */
+.app { display: flex; flex-direction: column; height: 100vh; }
+.topbar {
+  display: flex; align-items: center; gap: 24px;
+  padding: 0 16px; height: 44px;
+  background: var(--bg2);
+  border-bottom: 1px solid var(--border);
+  flex-shrink: 0;
+}
+.brand { font-weight: 600; }
+.tabs { display: flex; gap: 4px; }
+.tab {
+  background: none; border: none; color: var(--dim);
+  padding: 6px 14px; cursor: pointer; border-radius: 6px;
+  font-size: 13px; font-family: inherit;
+}
+.tab:hover { color: var(--fg); background: var(--bg3); }
+.tab.active { color: var(--accent); background: var(--bg3); }
+.conn-status { margin-left: auto; color: var(--dim); font-size: 12px; }
+.conn-status.ok { color: var(--green); }
+.conn-status.err { color: var(--red); }
+
+.content { flex: 1; overflow: hidden; position: relative; }
+.view { display: none; height: 100%; overflow: auto; }
+.view.active { display: block; }
+
+/* ── AID 表格 ── */
+table { width: 100%; border-collapse: collapse; font-size: 12px; }
+th, td { text-align: left; padding: 7px 12px; border-bottom: 1px solid var(--border); white-space: nowrap; }
+th { color: var(--dim); font-weight: 500; position: sticky; top: 0; background: var(--bg2); }
+tr:hover td { background: var(--bg2); }
+.dot { display: inline-block; width: 8px; height: 8px; border-radius: 50%; margin-right: 6px; }
+.dot.on { background: var(--green); }
+.dot.off { background: var(--red); }
+.dot.idle { background: var(--orange); }
+.preview { color: var(--dim); max-width: 360px; overflow: hidden; text-overflow: ellipsis; }
+.banner { padding: 10px 16px; background: #3d2a1a; color: var(--orange); border-bottom: 1px solid var(--border); }
+.empty { padding: 40px; text-align: center; color: var(--dim); }
+
+/* ── Messages 三栏 ── */
+.msg-layout, .sess-layout { display: flex; height: 100%; }
+.msg-col { overflow-y: auto; height: 100%; }
+.msg-aids { width: 220px; border-right: 1px solid var(--border); flex-shrink: 0; }
+.msg-peers { width: 240px; border-right: 1px solid var(--border); flex-shrink: 0; }
+.msg-stream { flex: 1; padding: 12px; }
+.list-item {
+  padding: 8px 12px; cursor: pointer; border-bottom: 1px solid var(--border);
+}
+.list-item:hover { background: var(--bg2); }
+.list-item.sel { background: var(--bg3); border-left: 2px solid var(--accent); }
+.list-item .name { font-weight: 500; }
+.list-item .sub { color: var(--dim); font-size: 11px; margin-top: 2px; }
+.col-title { padding: 8px 12px; color: var(--dim); font-size: 11px; text-transform: uppercase; position: sticky; top: 0; background: var(--bg); border-bottom: 1px solid var(--border); }
+
+.bubble { margin-bottom: 12px; max-width: 80%; }
+.bubble.in { margin-right: auto; }
+.bubble.out { margin-left: auto; }
+.bubble .meta { font-size: 11px; color: var(--dim); margin-bottom: 3px; }
+.bubble .body {
+  padding: 8px 10px; border-radius: 8px; white-space: pre-wrap; word-break: break-word;
+  background: var(--bg2); border: 1px solid var(--border);
+}
+.bubble.in .body { border-left: 2px solid var(--green); }
+.bubble.out .body { border-left: 2px solid var(--blue); }
+.tag { display: inline-block; padding: 0 5px; border-radius: 3px; font-size: 10px; margin-left: 4px; background: var(--bg3); color: var(--magenta); }
+
+/* ── Sessions ── */
+.sess-list { width: 360px; border-right: 1px solid var(--border); flex-shrink: 0; display: flex; flex-direction: column; overflow: hidden; }
+.sess-filter { padding: 10px; border-bottom: 1px solid var(--border); display: flex; flex-direction: column; gap: 8px; flex-shrink: 0; }
+.sess-filter select, .sess-filter input {
+  width: 100%; padding: 6px 8px; background: var(--bg); color: var(--fg);
+  border: 1px solid var(--border); border-radius: 6px; font-size: 12px; font-family: inherit;
+}
+.sess-filter select:focus, .sess-filter input:focus { outline: none; border-color: var(--accent); }
+.sess-count { font-size: 11px; color: var(--dim); }
+.sess-items { flex: 1; overflow-y: auto; }
+
+.sess-items .list-item .name { font-weight: 500; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+.sess-items .list-item .sub { display: flex; align-items: center; gap: 6px; flex-wrap: wrap; }
+.bind-badge { display: inline-flex; align-items: center; gap: 3px; padding: 0 5px; border-radius: 3px; background: var(--bg3); color: var(--accent); font-size: 10px; }
+.bind-badge .dot { width: 6px; height: 6px; margin: 0; }
+.msg-count { color: var(--dim); }
+
+.sess-detail { flex: 1; padding: 0; overflow-y: auto; }
+
+/* 会话头 */
+.sess-header { position: sticky; top: 0; background: var(--bg2); border-bottom: 1px solid var(--border); padding: 12px 20px; z-index: 1; }
+.sh-title { font-size: 15px; font-weight: 600; margin-bottom: 8px; }
+.sh-stats { display: flex; flex-wrap: wrap; gap: 12px; font-size: 12px; color: var(--dim); }
+.sh-stat { display: inline-flex; align-items: center; gap: 4px; }
+.sh-stat .dot { width: 7px; height: 7px; margin: 0 2px; }
+.sh-path { font-size: 11px; color: var(--dim); margin-top: 6px; font-family: ui-monospace, Consolas, monospace; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+
+/* 顶部 4 类分类条 */
+.sh-cats { display: flex; flex-wrap: wrap; gap: 8px; margin-top: 8px; }
+.cat-chip { display: inline-flex; align-items: center; gap: 5px; padding: 2px 8px; border-radius: 10px; font-size: 11px; background: var(--bg3); }
+.cat-swatch { width: 8px; height: 8px; border-radius: 50%; display: inline-block; }
+.cat-chip.cat-user_input   .cat-swatch { background: var(--green); }
+.cat-chip.cat-model_output .cat-swatch { background: var(--blue); }
+.cat-chip.cat-tool_call    .cat-swatch { background: var(--magenta); }
+.cat-chip.cat-tool_result  .cat-swatch { background: var(--orange); }
+.cat-chip.cat-msg_send     .cat-swatch { background: var(--cyan, #22d3a8); }
+
+/* 视图切换工具条 */
+.sess-toolbar { display: flex; align-items: center; gap: 12px; padding: 8px 20px; border-bottom: 1px solid var(--border); position: sticky; top: 0; background: var(--bg); z-index: 1; }
+.view-toggle { padding: 4px 12px; border-radius: 14px; border: 1px solid var(--border); background: var(--bg3); color: var(--fg); cursor: pointer; font-size: 12px; font-family: inherit; }
+.view-toggle.active { background: var(--accent); border-color: var(--accent); color: #fff; }
+.toolbar-hint { font-size: 11px; color: var(--dim); }
+.turn-list { padding-top: 8px; }
+
+/* 对话视图：仿微信气泡 */
+.chat-row { display: flex; flex-direction: column; margin: 10px 20px; max-width: 72%; }
+.chat-row.in { align-items: flex-start; margin-right: auto; }
+.chat-row.out { align-items: flex-end; margin-left: auto; }
+.chat-bubble { padding: 9px 13px; border-radius: 12px; white-space: pre-wrap; word-break: break-word; line-height: 1.5; font-size: 13px; }
+.chat-row.in .chat-bubble { background: var(--bg3); border-bottom-left-radius: 3px; }
+.chat-row.out .chat-bubble { background: #2a6b3f; color: #eafff0; border-bottom-right-radius: 3px; }
+.chat-time { font-size: 10px; color: var(--dim); margin-top: 3px; }
+
+/* 处理过程折叠组 */
+.proc-group { margin: 8px 20px; }
+.proc-group > summary { cursor: pointer; color: var(--dim); font-size: 11px; padding: 4px 0; text-align: center; list-style: none; }
+.proc-group > summary::-webkit-details-marker { display: none; }
+.proc-group > summary:hover { color: var(--fg); }
+.proc-body { border-left: 2px dashed var(--border); margin-left: 8px; padding-left: 4px; }
+.proc-body .turn { margin: 8px 12px; }
+
+/* 轮次：按 4 类着色（左色条 + 角色标签色）*/
+.turn { margin: 0 20px 18px; border-left: 3px solid var(--border); padding-left: 12px; }
+.turn:first-of-type { margin-top: 16px; }
+.turn.cat-user_input   { border-left-color: var(--green); }
+.turn.cat-model_output { border-left-color: var(--blue); }
+.turn.cat-tool_call    { border-left-color: var(--magenta); }
+.turn.cat-tool_result  { border-left-color: var(--orange); }
+.turn.cat-system       { border-left-color: var(--dim); }
+
+.turn-head { display: flex; align-items: baseline; gap: 10px; margin-bottom: 6px; }
+.turn-role { font-weight: 600; font-size: 12px; }
+.turn.cat-user_input   .turn-role { color: var(--green); }
+.turn.cat-model_output .turn-role { color: var(--blue); }
+.turn.cat-tool_call    .turn-role { color: var(--magenta); }
+.turn.cat-tool_result  .turn-role { color: var(--orange); }
+.turn.cat-system       .turn-role { color: var(--dim); }
+.turn-time { font-size: 11px; color: var(--dim); }
+.turn-usage { font-size: 11px; color: var(--dim); margin-left: auto; }
+.turn-blocks { display: flex; flex-direction: column; gap: 8px; }
+
+/* 普通文本块 */
+.blk-text { white-space: pre-wrap; word-break: break-word; line-height: 1.55; }
+
+/* 思考块（折叠） */
+.blk-thinking { font-size: 12px; }
+.blk-thinking summary { cursor: pointer; color: var(--magenta); opacity: 0.8; }
+.blk-thinking-body { white-space: pre-wrap; word-break: break-word; color: var(--dim); margin-top: 6px; padding-left: 12px; border-left: 2px solid var(--border); font-style: italic; }
+
+/* 工具调用块 */
+.blk-tool { background: var(--bg2); border: 1px solid var(--border); border-radius: 8px; padding: 8px 10px; }
+.tool-head { font-size: 12px; margin-bottom: 4px; }
+.tool-name { font-weight: 600; color: var(--accent); font-family: ui-monospace, "SF Mono", Consolas, monospace; }
+.tool-param { display: flex; gap: 8px; margin-top: 3px; font-size: 12px; align-items: baseline; }
+.tool-param .pk { color: var(--dim); flex-shrink: 0; min-width: 64px; }
+.tool-param .pv {
+  font-family: ui-monospace, "SF Mono", Consolas, monospace; color: var(--fg);
+  background: var(--bg); padding: 1px 6px; border-radius: 4px; word-break: break-all;
+  white-space: pre-wrap; display: block; flex: 1;
+}
+
+/* 工具结果块（折叠，默认收起） */
+.blk-result { font-size: 12px; }
+.blk-result summary { cursor: pointer; color: var(--dim); }
+.blk-result.err summary { color: var(--red); }
+.result-body {
+  margin-top: 6px; padding: 8px 10px; background: var(--bg); border: 1px solid var(--border);
+  border-radius: 6px; white-space: pre-wrap; word-break: break-word; max-height: 280px; overflow-y: auto;
+  font-family: ui-monospace, "SF Mono", Consolas, monospace; font-size: 11.5px; line-height: 1.5;
+}
+.blk-result.err .result-body { border-color: var(--red); }
+
+
+

package/dist/core/channel-loader.js

@@ -128,18 +128,21 @@ export class ChannelLoader {
 }
 const SEP = '#';
 export function formatChannelKey(k) {
-    return `${k.type}${SEP}${encodeURIComponent(k.selfPeerId)}${SEP}${k.name}`;
+    if (k.selfAID.includes(SEP)) {
+        throw new Error(`Invalid selfAID (contains '#'): ${k.selfAID}`);
+    }
+    return `${k.type}${SEP}${k.selfAID}${SEP}${k.name}`;
 }
 export function parseChannelKey(key) {
     const parts = key.split(SEP);
     if (parts.length !== 3) {
         throw new Error(`Invalid channel key (expected 3 segments separated by '#'): ${key}`);
     }
-    const [type, encodedSelfPeerId, name] = parts;
-    if (!type || !encodedSelfPeerId || !name) {
+    const [type, selfAID, name] = parts;
+    if (!type || !selfAID || !name) {
         throw new Error(`Invalid channel key (empty segment): ${key}`);
     }
-    return { type, selfPeerId: decodeURIComponent(encodedSelfPeerId), name };
+    return { type, selfAID, name };
 }
 export function tryParseChannelKey(key) {
     try {

package/dist/core/command-handler.js

@@ -1,7 +1,6 @@
 import { DEFAULT_PERMISSION_MODE } from '../types.js';
 import { hasModelSwitcher, hasPermissionController } from '../agents/claude-runner.js';
 import { getCodexEfforts } from '../agents/codex-runner.js';
-import { resolveAnthropicConfig, resolveOpenaiConfig } from '../agents/resolve.js';
 import { renderCommandCardAsText } from './interaction-router.js';
 import { buildEnvelope, sendInteractionPayload } from './message/message-processor.js';
 import { resolvePaths, getPackageRoot } from '../paths.js';
@@ -27,33 +26,13 @@ function getAvailableEfforts(agent, model) {
 function formatModelUsage(_agent, _model) {
     return '用法: /model <模型>';
 }
-function getModelListSource(owning, agent) {
-    const codexConfig = owning?.config?.baseagents?.codex;
-    const claudeConfig = owning?.config?.baseagents?.claude;
-    if (agent.name === 'codex') {
-        let resolved = {};
-        try {
-            resolved = resolveOpenaiConfig({ agents: { codex: codexConfig } }, codexConfig);
-        }
-        catch { }
-        return {
-            apiBaseUrl: resolved.baseUrl,
-            apiKey: resolved.apiKey,
-            fallbackModels: agent.listModels?.() || [],
-            owner: 'openai',
-        };
-    }
-    let resolved = {};
-    try {
-        resolved = resolveAnthropicConfig({ agents: { claude: claudeConfig } }, claudeConfig);
-    }
-    catch { }
-    return {
-        apiBaseUrl: resolved.baseUrl,
-        apiKey: resolved.apiKey,
-        fallbackModels: ['claude-opus-4-7', 'claude-opus-4-6', 'claude-sonnet-4-6'],
-        owner: 'anthropic',
-    };
+/**
+ * 模型展示标签：短别名 + 实际完整 ID（如 "opus (claude-opus-4-8)"）。
+ * 仅用于展示；命令值/持久化仍使用短别名。完整 ID 不可用或与短名相同时只显示短名。
+ */
+function modelDisplayLabel(agent, model) {
+    const full = agent.resolveModelId?.(model);
+    return full && full !== model ? `${model} (${full})` : model;
 }
 /**
  * 写入用户级 ~/.claude/settings.json（与 Claude CLI 行为一致）
@@ -410,8 +389,9 @@ export class CommandHandler {
             return { session };
         }
         const ct = chatType === 'group' ? 'group' : chatType === 'private' ? 'private' : undefined;
+        const channelType = this.resolveChannelType(channel);
         const session = await this.sessionManager.getActiveSession(channel, channelId)
-            ?? await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel), undefined, undefined, undefined, undefined, ct);
+            ?? await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel), undefined, undefined, undefined, undefined, ct, undefined, undefined, channelType);
         // 如果 session 已存在但 chatType 跟传入的不一致，更新
         if (ct && session.chatType !== ct) {
             await this.sessionManager.updateSession(session.id, { chatType: ct });
@@ -635,7 +615,7 @@ export class CommandHandler {
                 const models = await agent.listModels() ?? [];
                 const currentModel = agent.getModel();
                 if (models.length > 0)
-                    return models.map((m) => ({ value: m, label: m, selected: m === currentModel }));
+                    return models.map((m) => ({ value: m, label: modelDisplayLabel(agent, m), selected: m === currentModel }));
             }
             return null;
         }
@@ -1043,7 +1023,7 @@ export class CommandHandler {
                     env: { ...process.env, EVOLCLAW_HOME: resolvePaths().root }
                 }).unref();
                 this.eventBus.publish({ type: 'system:restart', channel, channelId });
-                setTimeout(() => { process.kill(process.pid, 'SIGTERM'); }, 500);
+                setTimeout(() => { process.kill(process.pid, 'SIGTERM'); }, 1000);
                 return { data: { action: 'restart', success: true } };
             }
             if (action === 'check') {
@@ -1160,12 +1140,12 @@ export class CommandHandler {
         }
         // 空闲检查：某些命令需要等待当前会话空闲
         // 原则：仅对"写/破坏性"形态拦截，纯读/用法提示的无参形态始终放行
-        // - 始终需要 idle（无参即写）：/new /clear /compact /repair /fork
+        // - 始终需要 idle（无参即写）：/clear /compact /repair /fork /new
         // - 仅带参时需要 idle（无参是列表/用法）：/session /baseagent /rewind
         // - /chatmode：在 handler 内部自行做写操作的 idle 检查
         // - /dispatch：在 handler 内部自行做写操作的 idle 检查
         // - /safe：已禁用 no-op，不再要求 idle
-        const idleAlways = ['/new', '/clear', '/compact', '/repair', '/fork'];
+        const idleAlways = ['/clear', '/compact', '/repair', '/fork', '/new'];
         const idleWhenArg = ['/session', '/baseagent', '/rewind'];
         const needsIdle = idleAlways.some(cmd => normalizedContent === cmd || normalizedContent.startsWith(cmd + ' ')) ||
             idleWhenArg.some(cmd => normalizedContent.startsWith(cmd + ' '));
@@ -1175,13 +1155,19 @@ export class CommandHandler {
                 const threadSession = await this.sessionManager.getThreadSession(channel, channelId, threadId);
                 if (threadSession) {
                     const threadAgent = this.getAgent(channel, threadSession.agentId);
-                    if (threadAgent.hasActiveStream(threadSession.id)) {
+                    const isBusy = threadAgent.hasActiveStream(threadSession.id) ||
+                        this.messageQueue?.isProcessing(threadSession.id);
+                    if (isBusy) {
                         return { kind: 'command.error', text: '⚠️ 当前正在处理消息，请稍后再试\n使用 /stop 中断当前任务后重试' };
                     }
                 }
             }
-            else if (activeSession && agent.hasActiveStream(activeSession.id)) {
-                return { kind: 'command.error', text: '⚠️ 当前正在处理消息，请稍后再试\n使用 /stop 中断当前任务后重试' };
+            else if (activeSession) {
+                const isBusy = agent.hasActiveStream(activeSession.id) ||
+                    this.messageQueue?.isProcessing(activeSession.id);
+                if (isBusy) {
+                    return { kind: 'command.error', text: '⚠️ 当前正在处理消息，请稍后再试\n使用 /stop 中断当前任务后重试' };
+                }
             }
         }
         // 检查是否以 / 开头（可能是命令）
@@ -1626,37 +1612,12 @@ export class CommandHandler {
             const currentModel = hasModelSwitcher(setmodelAgent) ? setmodelAgent.getModel() : setmodelAgent.name;
             const efforts = getAvailableEfforts(setmodelAgent, currentModel);
             const currentEffort = setmodelAgent.getEffort?.() || 'auto';
-            const modelListSource = getModelListSource(this.getOwningAgent(channel), setmodelAgent);
-            let modelListData = null;
-            if (modelListSource.apiBaseUrl) {
-                try {
-                    const modelsUrl = modelListSource.apiBaseUrl.replace(/\/+$/, '') + '/v1/models';
-                    const controller = new AbortController();
-                    const timeout = setTimeout(() => controller.abort(), 5000);
-                    const resp = await fetch(modelsUrl, {
-                        signal: controller.signal,
-                        headers: { 'Authorization': `Bearer ${modelListSource.apiKey || ''}` },
-                    });
-                    clearTimeout(timeout);
-                    if (resp.ok) {
-                        modelListData = await resp.json();
-                    }
-                }
-                catch { }
-            }
-            // 兜底模型列表
-            if (!modelListData || !modelListData.data || modelListData.data.length === 0) {
-                const now = Math.floor(Date.now() / 1000);
-                modelListData = {
-                    object: 'list',
-                    data: modelListSource.fallbackModels.map(id => ({
-                        id,
-                        object: 'model',
-                        created: now,
-                        owned_by: modelListSource.owner,
-                    })),
-                };
-            }
+            const now = Math.floor(Date.now() / 1000);
+            const modelIds = hasModelSwitcher(setmodelAgent) ? setmodelAgent.listModels() : [];
+            const modelListData = {
+                object: 'list',
+                data: modelIds.map(id => ({ id, object: 'model', created: now, owned_by: setmodelAgent.name === 'codex' ? 'openai' : 'anthropic' })),
+            };
             return { kind: 'command.result', text: JSON.stringify({
                     current_model: currentModel,
                     current_effort: currentEffort,
@@ -1689,12 +1650,15 @@ export class CommandHandler {
                         kind: {
                             kind: 'command-card',
                             title: '🤖 切换模型',
-                            buttons: models.map((m) => ({
-                                label: m === currentModel ? `✓ ${m}` : m,
-                                command: `/model ${m}`,
-                                style: (m === currentModel ? 'primary' : 'default'),
-                                disabled: m === currentModel,
-                            })),
+                            buttons: models.map((m) => {
+                                const display = modelDisplayLabel(modelAgent, m);
+                                return {
+                                    label: m === currentModel ? `✓ ${display}` : display,
+                                    command: `/model ${m}`,
+                                    style: (m === currentModel ? 'primary' : 'default'),
+                                    disabled: m === currentModel,
+                                };
+                            }),
                         },
                     };
                     const replyCtx = this.getReplyContext(modelSession);
@@ -1704,14 +1668,14 @@ export class CommandHandler {
                     return { kind: 'command.result', text: cardResult };
                 }
                 // 降级：文本
-                const modelList = models.map((m) => `  ${m === currentModel ? '✓' : ' '} ${m}`).join('\n');
+                const modelList = models.map((m) => `  ${m === currentModel ? '✓' : ' '} ${modelDisplayLabel(modelAgent, m)}`).join('\n');
                 const effortHint = efforts.length > 0
                     ? `\n推理强度: ${currentEffort === 'auto' ? 'auto (SDK默认)' : currentEffort}  (使用 /effort 调整)`
                     : '';
                 if (isAdmin) {
-                    return { kind: 'command.result', text: `当前模型: ${currentModel}${effortHint}\n\n可用模型：\n${modelList}\n\n用法: /model <模型>` };
+                    return { kind: 'command.result', text: `当前模型: ${modelDisplayLabel(modelAgent, currentModel)}${effortHint}\n\n可用模型：\n${modelList}\n\n用法: /model <模型>` };
                 }
-                return { kind: 'command.result', text: `当前模型: ${currentModel}${effortHint}` };
+                return { kind: 'command.result', text: `当前模型: ${modelDisplayLabel(modelAgent, currentModel)}${effortHint}` };
             }
             // 带参（切换/调整）需 admin+；无参查询已在上方返回
             if (!isAdmin)
@@ -1731,20 +1695,29 @@ export class CommandHandler {
                 else if (allEfforts.includes(arg)) {
                     return { kind: 'command.error', text: `⚠️ 请使用 /effort ${arg} 调整推理强度` };
                 }
-                else if (models.includes(arg)) {
-                    newModel = arg;
-                }
                 else {
-                    const modelList = models.map((m) => `  ${m === currentModel ? '✓' : ' '} ${m}`).join('\n');
-                    const effortHint = efforts.length > 0 ? `\n\n推理强度请使用 /effort 命令` : '';
-                    return { kind: 'command.error', text: `❌ 无效参数: ${arg}\n\n可用模型：\n${modelList}${effortHint}` };
+                    const resolvedArg = hasModelSwitcher(modelAgent) ? (modelAgent.resolveModelId?.(arg) ?? arg) : arg;
+                    if (models.includes(resolvedArg)) {
+                        newModel = resolvedArg;
+                    }
+                    else if (models.includes(arg)) {
+                        newModel = arg;
+                    }
+                    else {
+                        const modelList = models.map((m) => `  ${m === currentModel ? '✓' : ' '} ${modelDisplayLabel(modelAgent, m)}`).join('\n');
+                        const effortHint = efforts.length > 0 ? `\n\n推理强度请使用 /effort 命令` : '';
+                        return { kind: 'command.error', text: `❌ 无效参数: ${arg}\n\n可用模型：\n${modelList}${effortHint}` };
+                    }
                 }
             }
             else {
                 // 双参数：model effort
-                const [modelArg, effortArg] = parts;
+                const [modelArgRaw, effortArg] = parts;
+                const modelArg = hasModelSwitcher(modelAgent)
+                    ? (models.includes(modelArgRaw) ? modelArgRaw : (modelAgent.resolveModelId?.(modelArgRaw) ?? modelArgRaw))
+                    : modelArgRaw;
                 if (!models.includes(modelArg)) {
-                    return { kind: 'command.error', text: `❌ 无效的模型ID: ${modelArg}` };
+                    return { kind: 'command.error', text: `❌ 无效的模型ID: ${modelArgRaw}` };
                 }
                 const targetEfforts = getAvailableEfforts(modelAgent, modelArg);
                 if (targetEfforts.length === 0) {
@@ -2015,12 +1988,12 @@ export class CommandHandler {
                 const threadSession = await this.sessionManager.getThreadSession(channel, channelId, threadId);
                 if (threadSession) {
                     const threadAgent = this.getAgent(channel, threadSession.agentId);
-                    if (threadAgent.hasActiveStream(threadSession.id)) {
+                    if (threadAgent.hasActiveStream(threadSession.id) || this.messageQueue?.isProcessing(threadSession.id)) {
                         return { kind: 'command.error', text: '⚠️ 当前正在处理消息，请稍后再试\n使用 /stop 中断当前任务后重试' };
                     }
                 }
             }
-            else if (agent.hasActiveStream(chatmodeSession.id)) {
+            else if (agent.hasActiveStream(chatmodeSession.id) || this.messageQueue?.isProcessing(chatmodeSession.id)) {
                 return { kind: 'command.error', text: '⚠️ 当前正在处理消息，请稍后再试\n使用 /stop 中断当前任务后重试' };
             }
             await this.sessionManager.updateSession(chatmodeSession.id, { sessionMode: arg });
@@ -2185,16 +2158,14 @@ export class CommandHandler {
         // 尝试获取活跃会话（话题时直接查找话题 session）
         let session;
         if (threadId) {
-            session = await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel), threadId);
+            session = await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel), threadId, undefined, undefined, undefined, chatType, undefined, undefined, this.resolveChannelType(channel));
         }
         else {
             session = await this.sessionManager.getActiveSession(channel, channelId);
         }
-        // 对于需要会话的命令，如果没有会话则使用默认项目创建临时会话
-        if (!session && (normalizedContent.startsWith('/new') ||
-            normalizedContent === '/pwd' ||
-            normalizedContent === '/status')) {
-            session = await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel));
+        // 如果没有会话，自动创建（所有后续命令都需要 session）
+        if (!session) {
+            session = await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel), undefined, undefined, undefined, undefined, chatType, undefined, undefined, this.resolveChannelType(channel));
         }
         // /status 命令：显示会话状态
         if (normalizedContent === '/status') {
@@ -2418,6 +2389,27 @@ export class CommandHandler {
                     env: { ...process.env, EVOLCLAW_HOME: resolvePaths().root }
                 }).unref();
                 this.eventBus.publish({ type: 'system:restart', channel, channelId });
+                // 先发送重启反馈消息，等待发送完成后再 kill 进程
+                // 避免消息还没发出去进程就退出了
+                const adapter = this.adapters.get(channel);
+                if (adapter) {
+                    try {
+                        const envelope = buildEnvelope({
+                            taskId: `restart-${Date.now()}`,
+                            channel,
+                            channelId,
+                            agentName: 'system',
+                            chatmode: 'interactive',
+                            replyContext,
+                        });
+                        await adapter.send(envelope, { kind: 'command.result', text: '🔄 服务正在重启，请稍候...（约 5 秒后恢复）' });
+                        // 等待消息发送完成后再延迟 kill
+                        await new Promise(resolve => setTimeout(resolve, 500));
+                    }
+                    catch (err) {
+                        logger.error('[System] Failed to send restart notification:', err);
+                    }
+                }
                 // 发 SIGTERM 而非直接 process.exit(0)，让 index.ts 的 shutdown() 先
                 // 正常关闭所有 channel（包括 Feishu WebSocket close frame），
                 // 避免 Feishu 服务端因连接异常断开而重推未 ack 的消息给新进程。
@@ -2448,7 +2440,8 @@ export class CommandHandler {
                 }
             }
             await executeRestart();
-            return { kind: 'command.result', text: '🔄 服务正在重启，请稍候...（约 5 秒后恢复）' };
+            // executeRestart 内部已经发送了反馈消息，这里返回 null 避免重复发送
+            return null;
         }
         // /upgrade 命令：检查版本更新，提示用户手动重启
         if (normalizedContent === '/upgrade') {
@@ -3167,6 +3160,7 @@ export class CommandHandler {
                 nextFireAt,
                 targetChannel: parsed.targetChannel ?? channel,
                 targetChannelId: parsed.targetChannelId ?? channelId,
+                targetChannelType: this.resolveChannelType(parsed.targetChannel ?? channel),
                 targetThreadId: parsed.targetThreadId,
                 targetSessionStrategy: parsed.targetSessionStrategy,
                 agentId: parsed.agentId,

package/dist/core/evolagent-registry.js

@@ -51,7 +51,7 @@ export function detectDuplicates(agents) {
 export class EvolAgentRegistry {
     _agentsDir;
     agents = new Map();
-    /** channel key (`<type>#<selfPeerId>#<name>`) → agent aid */
+    /** channel key (`<type>#<selfAID>#<name>`) → agent aid */
     channelIndex = new Map();
     /** 启动期被 ConfigStore 跳过的目录（命名非法 / 缺 config.json / 校验失败等） */
     skipped = [];

package/dist/core/evolagent.js

@@ -62,11 +62,11 @@ export class EvolAgent {
     }
     // ── Channels ──────────────────────────────────────────────────────────
     /**
-     * effective channel key：`<type>#<urlEncode(selfPeerId)>#<name>`。
-     * AUN channel 的 selfPeerId 是 agent.aid，name 固定为 'main'。
+     * effective channel key：`<type>#<selfAID>#<name>`。
+     * AUN channel 的 selfAID 是 agent.aid，name 固定为 'main'。
      */
     effectiveChannelName(type, rawName) {
-        return formatChannelKey({ type, selfPeerId: this.aid, name: rawName });
+        return formatChannelKey({ type, selfAID: this.aid, name: rawName });
     }
     channelInstanceNames() {
         // AUN channel 隐式存在（从 agent.aid 派生），不需要在 channels[] 里声明
@@ -97,7 +97,7 @@ export class EvolAgent {
      */
     isAunChannelKey(channelKey) {
         const parsed = tryParseChannelKey(channelKey);
-        return parsed?.type === 'aun' && parsed.selfPeerId === this.aid;
+        return parsed?.type === 'aun' && parsed.selfAID === this.aid;
     }
     getOwner(channelKey) {
         if (this.isAunChannelKey(channelKey)) {