dlinkclaw-openclaw 2026.10.19 → 2026.10.20

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dlinkclaw-openclaw",
-    "version": "2026.10.19",
+    "version": "2026.10.20",
     "description": "DLinkClaw OpenClaw channel plugin — 朵联 OpenClaw 接入通道",
     "keywords": [
         "DLinkClaw",

package/dist/src/client/dl-client.d.ts

@@ -28,6 +28,8 @@ export interface MqttConfig {
     clientTopics: Array<string>;
     openUserTopics: Array<string>;
     openUserNotifyTopics: Array<string>;
+    /** 2026-10-21：团队创建人 empId（owner-only 能力校验） */
+    ownerEmpId?: string;
 }
 export declare class DLClient extends EventEmitter {
     private ctx;
@@ -66,6 +68,8 @@ export declare class DLClient extends EventEmitter {
      * 而本方法的目的只是刷新 openUserTopics——它是 publishEventToDLClient（L348）实时读取的，
      * 与 MQTT 订阅目标（clientTopics）、Gateway WS 通道都无关 → 只刷新配置即可，不断连、不重连。
      */
+    /** 2026-10-21：团队创建人（终端等 owner-only 能力使用） */
+    getOwnerEmpId(): string | undefined;
     refreshConfigAndReconnect(): Promise<void>;
     exeCmd(cmdMessage: CmdMessage): Promise<CmdResponse | undefined>;
     publishEventToDLClient(payload: any, event: EventType, sqos?: '0' | '1' | '2', to?: string): Promise<void>;

package/dist/src/client/dl-client.js

@@ -276,6 +276,10 @@ export class DLClient extends EventEmitter {
      * 而本方法的目的只是刷新 openUserTopics——它是 publishEventToDLClient（L348）实时读取的，
      * 与 MQTT 订阅目标（clientTopics）、Gateway WS 通道都无关 → 只刷新配置即可，不断连、不重连。
      */
+    /** 2026-10-21：团队创建人（终端等 owner-only 能力使用） */
+    getOwnerEmpId() {
+        return this.mqttConfig?.ownerEmpId;
+    }
     async refreshConfigAndReconnect() {
         try {
             await this.fetchConfig();

package/dist/src/services/index.js

@@ -18,7 +18,10 @@ export class CmdHandler {
     isInitialized = false;
     constructor(config, dlClient, logger) {
         this.dlClient = dlClient;
-        this.services = new ClawServices(config, logger);
+        // 2026-10-21：终端输出经 MQTT 事件回推客户端（协议级能力，品牌无关）
+        this.services = new ClawServices(config, logger, (sessionId, data) => {
+            void this.dlClient.publishEventToDLClient({ sessionId, data }, 'onTerminal');
+        });
     }
     log(msg, type) {
         this.services.log(msg, type);
@@ -216,6 +219,16 @@ export class CmdHandler {
         else {
             this.log(`🔄CMD 指令:${rawMessage.cmd}, params=${JSON.stringify(rawMessage)}`, 'info');
         }
+        // 2026-10-21：终端能力仅限团队创建人（owner）。
+        // from 是客户端自己的 chat topic：usr_/<empId>/chat，与 ownerEmpId 比对即可。
+        if (typeof rawMessage.cmd === 'string' && rawMessage.cmd.startsWith('terminal.')) {
+            const owner = this.dlClient.getOwnerEmpId();
+            const expected = owner ? `usr_/${owner}/chat` : '';
+            if (!owner || rawMessage.from !== expected) {
+                this.log(`terminal denied: from=${rawMessage.from}, owner=${owner}`, 'warn');
+                return { success: false, error: 'terminal: forbidden (owner only)', timestamp: Date.now() };
+            }
+        }
         try {
             // 调用服务层处理
             return await this.services.handleCmdMessage(rawMessage);

package/dist/src/services/services.d.ts

@@ -5,6 +5,7 @@
 import EventEmitter from 'events';
 import { ClawServiceOptions, CmdMessage, CmdResponse } from './types.js';
 import { PluginLogger } from 'openclaw/plugin-sdk/core';
+import { TerminalDataSink } from './terminal.js';
 /**
  * Claw-Services 主类
  * 处理 CMD 消息并调用相应的 OpenClaw API
@@ -14,7 +15,8 @@ export declare class ClawServices extends EventEmitter {
     private readonly options;
     private isInitialized;
     private readonly logger;
-    constructor(options: ClawServiceOptions, logger: PluginLogger);
+    private readonly terminalManager;
+    constructor(options: ClawServiceOptions, logger: PluginLogger, terminalSink?: TerminalDataSink);
     log(msg: string, type: 'info' | 'warn' | 'error' | 'debug'): void;
     /**
      * 初始化服务

package/dist/src/services/services.js

@@ -17,6 +17,7 @@ import { getSessionEntry, patchSessionEntry, resolveStorePath, listSessionEntrie
 import { setGatewayClient, approvePairingRequest } from './gateway-rpc.js';
 import { DEFAULT_ACCOUNT_ID } from 'openclaw/plugin-sdk/core';
 import { markRunStopped } from '../runtime.js';
+import { TerminalManager } from './terminal.js';
 /**
  * Claw-Services 主类
  * 处理 CMD 消息并调用相应的 OpenClaw API
@@ -26,10 +27,13 @@ export class ClawServices extends EventEmitter {
     options;
     isInitialized = false;
     logger;
-    constructor(options, logger) {
+    // 2026-10-21：终端会话管理（PTY / 管道）
+    terminalManager;
+    constructor(options, logger, terminalSink) {
         super();
         this.options = options;
         this.logger = logger;
+        this.terminalManager = new TerminalManager(terminalSink ?? (() => { }), (msg, type) => this.log(msg, type ?? 'info'));
     }
     log(msg, type) {
         switch (type) {
@@ -266,6 +270,19 @@ export class ClawServices extends EventEmitter {
                     // 新增 cmd 通道 chat.abort ， 以上两个/stop, /queue interrupt都不能立即终止执行中的会话
                     result = await this.handlChatAbout(cmdMessage.params);
                     break;
+                // 2026-10-21：终端能力（owner-only，见 CmdHandler 校验）
+                case 'terminal.open':
+                    result = await this.terminalManager.open(cmdMessage.params);
+                    break;
+                case 'terminal.input':
+                    result = this.terminalManager.write(cmdMessage.params?.sessionId, cmdMessage.params?.data ?? '');
+                    break;
+                case 'terminal.resize':
+                    result = this.terminalManager.resize(cmdMessage.params?.sessionId, cmdMessage.params?.cols, cmdMessage.params?.rows);
+                    break;
+                case 'terminal.close':
+                    result = this.terminalManager.close(cmdMessage.params?.sessionId);
+                    break;
                 case 'pairing.approve':
                     // 2026-09-06 适配 openclaw 2026.9.1：审批改按 requestId（宿主 RPC），客户端由 onPairingRequest 事件获取；
                     // code 保留解析用于旧客户端兼容提示（9.1 起宿主 list 不再暴露 code，无法按 code 审批）
@@ -330,10 +347,19 @@ export class ClawServices extends EventEmitter {
      * @param userId
      */
     async handleUpdateSessionModel(params) {
-        const { sessionKey, provider, model } = params;
-        if (!provider || provider.length === 0 || !sessionKey || sessionKey.length === 0) {
+        const { sessionKey, provider, model, thinkingLevel } = params;
+        if (!sessionKey || sessionKey.length === 0) {
+            return null;
+        }
+        // 2026-10-21：支持「只改推理强度」的 patch；provider/model 与 thinkingLevel 至少给一个
+        if ((!provider || provider.length === 0 || !model || model.length === 0) && !thinkingLevel) {
             return null;
         }
+        // 推理强度合法值校验（off/minimal/low/medium/high），非法值直接忽略
+        const THINK_LEVELS = ['off', 'minimal', 'low', 'medium', 'high'];
+        const thinkOverride = thinkingLevel && THINK_LEVELS.includes(thinkingLevel)
+            ? thinkingLevel
+            : undefined;
         const agentId = sessionKey.split(':')[1];
         const { cfg, channelId } = this.options;
         const storePath = resolveStorePath(cfg.session?.store, { agentId });
@@ -346,19 +372,25 @@ export class ClawServices extends EventEmitter {
             storePath,
             sessionKey: realKey,
             update: (entry) => {
-                applyModelOverrideToSessionEntry({
-                    entry,
-                    selection: {
-                        provider: provider,
-                        model: model,
-                    },
-                    selectionSource: 'user',
-                    markLiveSwitchPending: true, // 让当前 run 立即生效
-                });
+                if (provider && model) {
+                    applyModelOverrideToSessionEntry({
+                        entry,
+                        selection: {
+                            provider: provider,
+                            model: model,
+                        },
+                        selectionSource: 'user',
+                        markLiveSwitchPending: true, // 让当前 run 立即生效
+                    });
+                }
+                // 2026-10-21：会话级推理强度写入（与模型覆盖同层持久化）
+                if (thinkOverride) {
+                    entry.thinkingLevel = thinkOverride;
+                }
                 return { ...entry };
             },
         });
-        return { provider, model };
+        return { provider, model, thinkingLevel: thinkOverride };
     }
     /**
      * 2026-08-28 解析 direct 会话的真实 sessionKey（兼容 chatId 后缀）
@@ -417,13 +449,16 @@ export class ClawServices extends EventEmitter {
         if (!entry)
             return null;
         // 只返回用户主动设置的覆盖，不返回 auto fallback
+        const result = {};
         if (entry.modelOverrideSource === 'user' && entry.modelOverride) {
-            return {
-                provider: entry.providerOverride ?? '',
-                model: entry.modelOverride,
-            };
+            result.provider = entry.providerOverride ?? '';
+            result.model = entry.modelOverride;
+        }
+        // 2026-10-21：会话级推理强度回显
+        if (entry.thinkingLevel) {
+            result.thinkingLevel = entry.thinkingLevel;
         }
-        return null;
+        return Object.keys(result).length > 0 ? result : null;
     }
     //#region ==================== Agent 管理处理器 ====================
     async handleAgentList() {

package/dist/src/services/terminal.d.ts

@@ -0,0 +1,39 @@
+export type TerminalDataSink = (sessionId: string, data: string) => void;
+export type TerminalLogger = (msg: string, type?: 'info' | 'warn' | 'error' | 'debug') => void;
+export declare class TerminalManager {
+    private readonly sink;
+    private readonly log;
+    private readonly sessions;
+    private ptyModule;
+    constructor(sink: TerminalDataSink, log: TerminalLogger);
+    private defaultCwd;
+    private append;
+    private touch;
+    open(params: {
+        sessionId?: string;
+        cwd?: string;
+        cols?: number;
+        rows?: number;
+    }): Promise<{
+        sessionId: string;
+        mode: string;
+        reused: boolean;
+        replay: string;
+    } | {
+        sessionId: string;
+        mode: string;
+        reused?: undefined;
+        replay?: undefined;
+    }>;
+    write(sessionId: string, data: string): {
+        sessionId: string;
+    };
+    resize(sessionId: string, cols: number, rows: number): {
+        sessionId: string;
+    };
+    close(sessionId: string, alreadyExited?: boolean): {
+        sessionId: string;
+        closed: boolean;
+    };
+    disposeAll(): void;
+}

package/dist/src/services/terminal.js

@@ -0,0 +1,217 @@
+/**
+ * 2026-10-21：终端能力（协议级，非 OpenClaw 专属）。
+ * 通过 PTY（可用时）或 child_process 运行登录 shell，输出经 sink 回推客户端。
+ * 其他品牌插件（如 dsh）实现同一套 terminal.* 契约即可。
+ */
+import { spawn } from 'child_process';
+import os from 'os';
+import path from 'path';
+const FLUSH_MS = 16;
+const IDLE_MS = 30 * 60 * 1000;
+/** 重新 attach 时回放的最大输出量 */
+const HISTORY_LIMIT = 64 * 1024;
+/** 优先用 PTY（交互式 shell），不可用时退回管道模式 */
+async function loadPty() {
+    for (const name of ['node-pty', '@lydell/node-pty']) {
+        try {
+            const mod = await import(name);
+            if (mod) {
+                return mod.default ?? mod;
+            }
+        }
+        catch {
+            // 继续尝试下一个
+        }
+    }
+    return null;
+}
+export class TerminalManager {
+    sink;
+    log;
+    sessions = new Map();
+    ptyModule;
+    constructor(sink, log) {
+        this.sink = sink;
+        this.log = log;
+    }
+    defaultCwd() {
+        return path.join(os.homedir(), '.openclaw', 'workspace');
+    }
+    append(session, chunk) {
+        if (session.closed || !chunk) {
+            return;
+        }
+        session.buffer += chunk;
+        if (session.history.length < HISTORY_LIMIT) {
+            session.history += chunk;
+            if (session.history.length > HISTORY_LIMIT) {
+                session.history = session.history.slice(-HISTORY_LIMIT);
+            }
+        }
+        if (session.flushTimer) {
+            return;
+        }
+        // 16ms 合并，避免高频输出打爆 MQTT
+        session.flushTimer = setTimeout(() => {
+            session.flushTimer = null;
+            const data = session.buffer;
+            session.buffer = '';
+            if (data) {
+                try {
+                    this.sink(session.id, data);
+                }
+                catch (e) {
+                    this.log(`terminal sink failed: ${String(e)}`, 'warn');
+                }
+            }
+        }, FLUSH_MS);
+    }
+    touch(session) {
+        if (session.idleTimer) {
+            clearTimeout(session.idleTimer);
+        }
+        session.idleTimer = setTimeout(() => {
+            this.log(`terminal session idle timeout: ${session.id}`, 'info');
+            this.close(session.id);
+        }, IDLE_MS);
+    }
+    async open(params) {
+        const sessionId = params.sessionId;
+        if (!sessionId) {
+            throw new Error('terminal.open: sessionId required');
+        }
+        const existing = this.sessions.get(sessionId);
+        if (existing) {
+            // 2026-10-21：客户端切 Tab 后重新 attach，回放最近输出，保持会话连续
+            this.touch(existing);
+            return {
+                sessionId,
+                mode: existing.isPty ? 'pty' : 'pipe',
+                reused: true,
+                replay: existing.history,
+            };
+        }
+        if (this.ptyModule === undefined) {
+            this.ptyModule = await loadPty();
+            if (!this.ptyModule) {
+                this.log('node-pty unavailable, fallback to pipe mode (no TTY)', 'warn');
+            }
+        }
+        const cwd = params.cwd && params.cwd.length > 0 ? params.cwd : this.defaultCwd();
+        const cols = params.cols && params.cols > 0 ? params.cols : 120;
+        const rows = params.rows && params.rows > 0 ? params.rows : 30;
+        const env = { ...process.env, TERM: 'xterm-256color', LANG: process.env.LANG ?? 'C.UTF-8' };
+        let proc;
+        let isPty = false;
+        if (this.ptyModule?.spawn) {
+            proc = this.ptyModule.spawn('bash', ['-il'], {
+                name: 'xterm-256color',
+                cols,
+                rows,
+                cwd,
+                env,
+            });
+            isPty = true;
+        }
+        else {
+            proc = spawn('bash', ['-il'], { cwd, env, stdio: 'pipe' });
+            isPty = false;
+        }
+        const session = {
+            id: sessionId,
+            proc,
+            isPty,
+            buffer: '',
+            history: '',
+            flushTimer: null,
+            idleTimer: null,
+            closed: false,
+        };
+        this.sessions.set(sessionId, session);
+        this.touch(session);
+        const onData = (data) => {
+            this.touch(session);
+            this.append(session, typeof data === 'string' ? data : data.toString('utf8'));
+        };
+        if (isPty) {
+            proc.onData(onData);
+            proc.onExit((e) => {
+                this.log(`terminal exited: ${sessionId}, code=${e?.exitCode}`, 'info');
+                this.close(sessionId, true);
+            });
+        }
+        else {
+            proc.stdout?.on('data', onData);
+            proc.stderr?.on('data', onData);
+            proc.on('exit', (code) => {
+                this.log(`terminal exited: ${sessionId}, code=${code}`, 'info');
+                this.close(sessionId, true);
+            });
+            proc.on('error', (err) => {
+                this.log(`terminal error: ${sessionId}, ${err.message}`, 'error');
+                this.append(session, `\r\n[terminal error] ${err.message}\r\n`);
+            });
+        }
+        this.log(`terminal opened: ${sessionId}, mode=${isPty ? 'pty' : 'pipe'}, cwd=${cwd}`, 'info');
+        return { sessionId, mode: isPty ? 'pty' : 'pipe' };
+    }
+    write(sessionId, data) {
+        const session = this.sessions.get(sessionId);
+        if (!session || session.closed) {
+            throw new Error('terminal session not found');
+        }
+        this.touch(session);
+        if (session.isPty) {
+            session.proc.write(data);
+        }
+        else {
+            session.proc.stdin?.write(data);
+        }
+        return { sessionId };
+    }
+    resize(sessionId, cols, rows) {
+        const session = this.sessions.get(sessionId);
+        if (!session || session.closed) {
+            throw new Error('terminal session not found');
+        }
+        if (session.isPty && session.proc.resize) {
+            session.proc.resize(cols, rows);
+        }
+        return { sessionId };
+    }
+    close(sessionId, alreadyExited = false) {
+        const session = this.sessions.get(sessionId);
+        if (!session) {
+            return { sessionId, closed: false };
+        }
+        session.closed = true;
+        if (session.flushTimer) {
+            clearTimeout(session.flushTimer);
+            session.flushTimer = null;
+        }
+        if (session.idleTimer) {
+            clearTimeout(session.idleTimer);
+            session.idleTimer = null;
+        }
+        if (!alreadyExited) {
+            try {
+                if (session.isPty) {
+                    session.proc.kill();
+                }
+                else {
+                    session.proc.kill('SIGHUP');
+                }
+            }
+            catch {
+                // 忽略
+            }
+        }
+        this.sessions.delete(sessionId);
+        return { sessionId, closed: true };
+    }
+    disposeAll() {
+        for (const id of Array.from(this.sessions.keys())) {
+            this.close(id);
+        }
+    }
+}

package/dist/src/services/types.d.ts

@@ -306,7 +306,7 @@ export interface CmdResult {
     timestamp: string | number;
     timezone: string;
 }
-export type CmdType = 'agent.ask' | 'agent.list' | 'agent.create' | 'agent.update' | 'agent.delete' | 'agent.get' | 'agent.stop' | 'chat.abort' | 'task.list' | 'task.create' | 'task.update' | 'task.delete' | 'task.run' | 'status.health' | 'status.system' | 'status.usage' | 'models.list' | 'sessions.list' | 'sessions.get' | 'sessions.describe' | 'sessions.resolve' | 'sessions.create' | 'sessions.archive' | 'sessions.restore' | 'sessions.delete' | 'sessions.reset' | 'sessions.patch' | 'sessions.currentModel' | 'chat.history' | 'chat.trajectory' | 'skills.status' | 'skills.search' | 'skills.detail' | 'skills.install' | 'skills.update' | 'skills.securityVerdicts' | 'cancelMessage' | 'usage.cost' | 'sessions.usage' | 'sessions.usage.logs' | 'pairing.approve' | 'artifacts.list' | 'artifacts.get' | 'artifacts.download' | 'agents.files.list' | 'agents.files.get' | 'extCapabilities.status' | 'extCapabilities.check' | 'extCapabilities.install';
+export type CmdType = 'agent.ask' | 'agent.list' | 'agent.create' | 'agent.update' | 'agent.delete' | 'agent.get' | 'agent.stop' | 'chat.abort' | 'task.list' | 'task.create' | 'task.update' | 'task.delete' | 'task.run' | 'status.health' | 'status.system' | 'status.usage' | 'models.list' | 'sessions.list' | 'sessions.get' | 'sessions.describe' | 'sessions.resolve' | 'sessions.create' | 'sessions.archive' | 'sessions.restore' | 'sessions.delete' | 'sessions.reset' | 'sessions.patch' | 'sessions.currentModel' | 'terminal.open' | 'terminal.input' | 'terminal.resize' | 'terminal.close' | 'chat.history' | 'chat.trajectory' | 'skills.status' | 'skills.search' | 'skills.detail' | 'skills.install' | 'skills.update' | 'skills.securityVerdicts' | 'cancelMessage' | 'usage.cost' | 'sessions.usage' | 'sessions.usage.logs' | 'pairing.approve' | 'artifacts.list' | 'artifacts.get' | 'artifacts.download' | 'agents.files.list' | 'agents.files.get' | 'extCapabilities.status' | 'extCapabilities.check' | 'extCapabilities.install';
 export type ReadlineType = Extract<CmdType, 'chat.trajectory'>;
 export interface ClawMessage {
     type: 'res' | 'event';
@@ -316,11 +316,13 @@ export interface ClawMessage {
     payload: any;
     error?: any;
 }
-export type EventType = 'onTick' | 'onHealth' | 'onHandshaked' | 'onConnectState' | 'onError' | 'onAgentReply' | 'onAgentChat' | 'onChatTrajectory' | 'onCron' | 'onShutdown' | 'onSessionsChanged' | 'onSkillInstalled' | 'onSkillInstalling' | 'onSkillError' | 'onPairingRequest' | 'onPairingResult';
+export type EventType = 'onTick' | 'onHealth' | 'onHandshaked' | 'onConnectState' | 'onError' | 'onAgentReply' | 'onAgentChat' | 'onChatTrajectory' | 'onCron' | 'onShutdown' | 'onSessionsChanged' | 'onSkillInstalled' | 'onSkillInstalling' | 'onSkillError' | 'onPairingRequest' | 'onPairingResult' | 'onTerminal';
 export type CmdParamsPatchSessionEntry = {
     sessionKey: string;
     provider?: string;
-    model: string;
+    model?: string;
+    /** 2026-10-21：会话级推理强度（off/minimal/low/medium/high），与模型选择同通道 */
+    thinkingLevel?: string;
 };
 export interface SkillInfo {
     name: string;
@@ -390,3 +392,21 @@ export interface AgentFilesGetParams {
     agentId: string;
     name: string;
 }
+export type TerminalOpenParams = {
+    sessionId: string;
+    cwd?: string;
+    cols?: number;
+    rows?: number;
+};
+export type TerminalInputParams = {
+    sessionId: string;
+    data: string;
+};
+export type TerminalResizeParams = {
+    sessionId: string;
+    cols: number;
+    rows: number;
+};
+export type TerminalCloseParams = {
+    sessionId: string;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dlinkclaw-openclaw",
-  "version": "2026.10.19",
+  "version": "2026.10.20",
   "description": "DLinkClaw OpenClaw channel plugin — 朵联 OpenClaw 接入通道",
   "keywords": [
     "DLinkClaw",