koishi-plugin-docker-control 0.0.2 → 0.0.4

package/lib/commands/control.d.ts

@@ -6,4 +6,4 @@ import { Context } from 'koishi';
 /**
  * 注册控制指令
  */
-export declare function registerControlCommands(ctx: Context, getService: () => any): void;
+export declare function registerControlCommands(ctx: Context, getService: () => any, config?: any): void;

package/lib/commands/control.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerControlCommands = registerControlCommands;
 const logger_1 = require("../utils/logger");
+const render_1 = require("../utils/render");
 /**
  * 格式化容器搜索结果
  */
@@ -27,7 +28,8 @@ function formatSearchResults(results, operation) {
 /**
  * 注册控制指令
  */
-function registerControlCommands(ctx, getService) {
+function registerControlCommands(ctx, getService, config) {
+    const useImageOutput = config?.imageOutput === true;
     /**
      * 启动容器
      */
@@ -47,6 +49,10 @@ function registerControlCommands(ctx, getService) {
                 logger_1.commandLogger.debug('批量启动容器');
                 // 批量操作
                 const results = await service.operateContainers(selector, container, 'start');
+                if (useImageOutput && ctx.puppeteer) {
+                    const html = (0, render_1.generateResultHtml)(results, '批量启动结果');
+                    return await (0, render_1.renderToImage)(ctx, html);
+                }
                 return formatSearchResults(results, '启动');
             }
             // 单个容器
@@ -55,11 +61,21 @@ function registerControlCommands(ctx, getService) {
             logger_1.commandLogger.debug(`找到容器: ${found.Names[0]} 在节点 ${node.name}`);
             await node.startContainer(found.Id);
             logger_1.commandLogger.debug(`容器已启动: ${found.Id}`);
+            if (useImageOutput && ctx.puppeteer) {
+                const results = [{ node, container: found, success: true }];
+                const html = (0, render_1.generateResultHtml)(results, '启动成功');
+                return await (0, render_1.renderToImage)(ctx, html);
+            }
             const name = found.Names[0]?.replace('/', '') || found.Id.slice(0, 8);
             return `✅ ${node.name}: ${name} 已启动`;
         }
         catch (e) {
             logger_1.commandLogger.error(`启动容器失败: ${e.message}`);
+            if (useImageOutput && ctx.puppeteer) {
+                // 尝试构造一个失败的结果用于渲染，虽然这里可能没有 node/container 信息
+                // 如果找不到容器，e 可能是 "找不到容器"
+                return `❌ 启动失败: ${e.message}`;
+            }
             return `❌ 启动失败: ${e.message}`;
         }
     });
@@ -82,6 +98,10 @@ function registerControlCommands(ctx, getService) {
                 logger_1.commandLogger.debug('批量停止容器');
                 // 批量操作
                 const results = await service.operateContainers(selector, container, 'stop');
+                if (useImageOutput && ctx.puppeteer) {
+                    const html = (0, render_1.generateResultHtml)(results, '批量停止结果');
+                    return await (0, render_1.renderToImage)(ctx, html);
+                }
                 return formatSearchResults(results, '停止');
             }
             logger_1.commandLogger.debug(`查找容器: ${container} 在 ${selector}`);
@@ -89,6 +109,11 @@ function registerControlCommands(ctx, getService) {
             logger_1.commandLogger.debug(`找到容器: ${found.Names[0]} 在节点 ${node.name}`);
             await node.stopContainer(found.Id);
             logger_1.commandLogger.debug(`容器已停止: ${found.Id}`);
+            if (useImageOutput && ctx.puppeteer) {
+                const results = [{ node, container: found, success: true }];
+                const html = (0, render_1.generateResultHtml)(results, '停止成功');
+                return await (0, render_1.renderToImage)(ctx, html);
+            }
             const name = found.Names[0]?.replace('/', '') || found.Id.slice(0, 8);
             return `✅ ${node.name}: ${name} 已停止`;
         }
@@ -116,6 +141,10 @@ function registerControlCommands(ctx, getService) {
                 logger_1.commandLogger.debug('批量重启容器');
                 // 批量操作
                 const results = await service.operateContainers(selector, container, 'restart');
+                if (useImageOutput && ctx.puppeteer) {
+                    const html = (0, render_1.generateResultHtml)(results, '批量重启结果');
+                    return await (0, render_1.renderToImage)(ctx, html);
+                }
                 return formatSearchResults(results, '重启');
             }
             logger_1.commandLogger.debug(`查找容器: ${container} 在 ${selector}`);
@@ -123,6 +152,11 @@ function registerControlCommands(ctx, getService) {
             logger_1.commandLogger.debug(`找到容器: ${found.Names[0]} 在节点 ${node.name}`);
             await node.restartContainer(found.Id);
             logger_1.commandLogger.debug(`容器已重启: ${found.Id}`);
+            if (useImageOutput && ctx.puppeteer) {
+                const results = [{ node, container: found, success: true }];
+                const html = (0, render_1.generateResultHtml)(results, '重启成功');
+                return await (0, render_1.renderToImage)(ctx, html);
+            }
             const name = found.Names[0]?.replace('/', '') || found.Id.slice(0, 8);
             return `✅ ${node.name}: ${name} 已重启`;
         }
@@ -145,6 +179,10 @@ function registerControlCommands(ctx, getService) {
         try {
             const { node, container: found } = await service.findContainer(selector, container);
             const info = await node.getContainer(found.Id);
+            if (useImageOutput && ctx.puppeteer) {
+                const html = (0, render_1.generateInspectHtml)(node.name, info);
+                return await (0, render_1.renderToImage)(ctx, html);
+            }
             const lines = [
                 `名称: ${info.Name.replace('/', '')}`,
                 `ID: ${info.Id.slice(0, 12)}`,
@@ -181,12 +219,13 @@ function registerControlCommands(ctx, getService) {
         logger_1.commandLogger.info(`[${selector}] 执行命令: "${cmd}"`);
         try {
             const { node, container: found } = await service.findContainer(selector, container);
-            const result = await node.execContainer(found.Id, [
-                '/bin/sh',
-                '-c',
-                cmd,
-            ]);
+            const result = await node.execContainer(found.Id, cmd);
             const name = found.Names[0]?.replace('/', '') || found.Id.slice(0, 8);
+            // 图片渲染模式
+            if (useImageOutput && ctx.puppeteer) {
+                const html = (0, render_1.generateExecHtml)(node.name, name, cmd, result.output, result.exitCode);
+                return await (0, render_1.renderToImage)(ctx, html);
+            }
             if (result.output.trim()) {
                 return `=== ${node.name}: ${name} ===\n${result.output}`;
             }

package/lib/commands/index.js

@@ -4,21 +4,23 @@ exports.registerCommands = registerCommands;
 const list_1 = require("./list");
 const control_1 = require("./control");
 const logs_1 = require("./logs");
+const render_1 = require("../utils/render");
 /**
  * 注册所有指令
  */
 function registerCommands(ctx, getService, config) {
     // 注册各模块指令
     (0, list_1.registerListCommand)(ctx, getService, config);
-    (0, control_1.registerControlCommands)(ctx, getService);
+    (0, control_1.registerControlCommands)(ctx, getService, config);
     (0, logs_1.registerLogsCommand)(ctx, getService, config);
     // 注册辅助指令
-    registerHelperCommands(ctx, getService);
+    registerHelperCommands(ctx, getService, config);
 }
 /**
  * 注册辅助指令
  */
-function registerHelperCommands(ctx, getService) {
+function registerHelperCommands(ctx, getService, config) {
+    const useImageOutput = config?.imageOutput === true;
     /**
      * 查看节点列表
      */
@@ -31,6 +33,11 @@ function registerHelperCommands(ctx, getService) {
         if (nodes.length === 0) {
             return '未配置任何节点';
         }
+        const online = nodes.filter((n) => n.status === 'connected').length;
+        if (useImageOutput && ctx.puppeteer) {
+            const html = (0, render_1.generateNodesHtml)(nodes);
+            return await (0, render_1.renderToImage)(ctx, html);
+        }
         const lines = ['=== Docker 节点 ==='];
         for (const node of nodes) {
             const statusIcon = node.status === 'connected'
@@ -41,7 +48,6 @@ function registerHelperCommands(ctx, getService) {
             const tags = node.tags.length > 0 ? ` [@${node.tags.join(' @')}]` : '';
             lines.push(`${statusIcon} ${node.name} (${node.id})${tags} - ${node.status}`);
         }
-        const online = nodes.filter((n) => n.status === 'connected').length;
         lines.push(`\n总计: ${nodes.length} 个节点，${online} 个在线`);
         return lines.join('\n');
     });
@@ -62,12 +68,36 @@ function registerHelperCommands(ctx, getService) {
         }
         const node = nodes[0];
         try {
-            const version = await node.getVersion();
+            const [version, systemInfo, containerCount, imageCount] = await Promise.all([
+                node.getVersion(),
+                node.getSystemInfo(),
+                node.getContainerCount(),
+                node.getImageCount(),
+            ]);
+            // 将容器和镜像数量添加到节点对象
+            const nodeData = {
+                ...node,
+                containerCount: containerCount.total,
+                imageCount: imageCount,
+            };
+            if (useImageOutput && ctx.puppeteer) {
+                const html = (0, render_1.generateNodeDetailHtml)(nodeData, version, systemInfo);
+                return await (0, render_1.renderToImage)(ctx, html);
+            }
+            const memoryUsed = systemInfo?.MemTotal && systemInfo?.MemAvailable !== undefined
+                ? `${Math.round((1 - systemInfo.MemAvailable / systemInfo.MemTotal) * 100)}%`
+                : '-';
+            const nodeName = node.config?.name || node.name || node.Name || 'Unknown';
+            const nodeId = node.id || node.ID || node.Id || node.config?.id || '-';
             const lines = [
-                `=== ${node.name} ===`,
-                `ID: ${node.id}`,
-                `状态: ${node.status}`,
-                `标签: ${node.tags.join(', ') || '无'}`,
+                `=== ${nodeName} ===`,
+                `ID: ${nodeId}`,
+                `状态: ${node.status || node.Status || 'unknown'}`,
+                `标签: ${node.tags?.join(', ') || node.config?.tags?.join(', ') || '无'}`,
+                `CPU: ${systemInfo?.NCPU || '-'} 核心`,
+                `内存: ${memoryUsed} (可用: ${systemInfo?.MemAvailable ? Math.round(systemInfo.MemAvailable / 1024 / 1024) + ' MB' : '-'})`,
+                `容器: ${containerCount.running}/${containerCount.total} 运行中`,
+                `镜像: ${imageCount} 个`,
                 `Docker 版本: ${version.Version}`,
                 `API 版本: ${version.ApiVersion}`,
                 `操作系统: ${version.Os} (${version.Arch})`,
@@ -136,7 +166,7 @@ function registerHelperCommands(ctx, getService) {
             if (c.State !== 'running') {
                 return `容器 ${container} 未运行`;
             }
-            const result = await node.execContainer(c.Id, cmd.split(' '));
+            const result = await node.execContainer(c.Id, cmd);
             return [
                 `=== 执行结果 ===`,
                 `退出码: ${result.exitCode}`,
@@ -148,47 +178,6 @@ function registerHelperCommands(ctx, getService) {
             return `执行失败: ${e.message}`;
         }
     });
-    /**
-     * 交互式执行 (返回结果，不支持实时交互)
-     */
-    ctx
-        .command('docker.shell <container> <cmd>', '在容器中执行命令(交互式)')
-        .alias('dockershell', '容器shell')
-        .option('node', '-n <node> 指定节点', { fallback: '' })
-        .option('timeout', '-t <seconds> 超时时间', { fallback: 30 })
-        .action(async ({ options }, container, cmd) => {
-        const service = getService();
-        if (!service) {
-            return 'Docker 服务未初始化';
-        }
-        const nodeSelector = options.node || 'all';
-        try {
-            const nodes = service.getNodesBySelector(nodeSelector);
-            if (nodes.length === 0) {
-                return `未找到节点: ${nodeSelector}`;
-            }
-            const results = await service.findContainerGlobal(container);
-            if (results.length === 0) {
-                return `未找到容器: ${container}`;
-            }
-            const { node, container: c } = results[0];
-            if (c.State !== 'running') {
-                return `容器 ${container} 未运行`;
-            }
-            const result = await node.execContainer(c.Id, cmd.split(' '));
-            return [
-                `=== ${node.name}/${c.Names[0]?.replace('/', '') || c.Id.slice(0, 8)} ===`,
-                `> ${cmd}`,
-                ``,
-                result.output || '(无输出)',
-                ``,
-                `[退出码: ${result.exitCode}]`,
-            ].join('\n');
-        }
-        catch (e) {
-            return `执行失败: ${e.message}`;
-        }
-    });
     /**
      * 查看帮助
      */
@@ -200,15 +189,14 @@ function registerHelperCommands(ctx, getService) {
             '  docker.nodes               - 查看节点列表',
             '  docker.node <节点>         - 查看节点详情',
             '',
-            '【容器操作】',
-            '  docker.ls [节点]           - 列出容器',
-            '  docker.start <容器>        - 启动容器',
-            '  docker.stop <容器>         - 停止容器',
-            '  docker.restart <容器>      - 重启容器',
-            '  docker.logs <容器> [-t 行数] - 查看日志',
-            '  docker.find <容器>         - 搜索容器',
-            '  docker.exec <容器> <命令>  - 执行命令',
-            '  docker.shell <容器> <命令> - 交互式执行',
+            '【容器操作】(参数顺序: 节点 容器)',
+            '  docker.ls <节点>           - 列出容器',
+            '  docker.start <节点> <容器> - 启动容器',
+            '  docker.stop <节点> <容器>  - 停止容器',
+            '  docker.restart <节点> <容器> - 重启容器',
+            '  docker.logs <节点> <容器> [-n 行数] - 查看日志',
+            '  docker.inspect <节点> <容器> - 查看容器详情',
+            '  docker.exec <节点> <容器> <命令> - 在容器内执行命令',
             '',
             '【节点选择器】',
             '  all        - 所有节点',

package/lib/commands/list.js

@@ -1,12 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerListCommand = registerListCommand;
-/**
- * 列出容器指令
- * docker.ls - 支持集群视图和图片渲染
- */
-const koishi_1 = require("koishi");
 const logger_1 = require("../utils/logger");
+const render_1 = require("../utils/render");
 function registerListCommand(ctx, getService, config) {
     // 检查是否启用了图片输出
     const useImageOutput = config?.imageOutput === true;
@@ -34,6 +30,10 @@ function registerListCommand(ctx, getService, config) {
             if (!ctx.puppeteer) {
                 return '错误: 未安装 koishi-plugin-puppeteer 插件，无法使用图片渲染';
             }
+            // 如果未指定节点，提示用户
+            if (!selector) {
+                return '请指定节点名称、ID 或标签，或使用 "all" 列出全部容器\n例如: docker.ls @web -f image 或 docker.ls all -f image';
+            }
             try {
                 // 获取容器数据
                 logger_1.commandLogger.debug('获取容器数据...');
@@ -42,18 +42,9 @@ function registerListCommand(ctx, getService, config) {
                 if (results.length === 0) {
                     return '未发现任何容器';
                 }
-                // 生成 HTML
-                const html = generateHtml(results);
-                // 渲染图片 (puppeteer.render 返回的是 h.image() 元素的字符串)
-                logger_1.commandLogger.debug('渲染图片中...');
-                const imageElement = await ctx.puppeteer.render(html, async (page, next) => {
-                    await page.setViewport({ width: 600, height: 800 });
-                    const body = await page.$('body');
-                    const clip = await body.boundingBox();
-                    const buffer = await page.screenshot({ clip });
-                    return koishi_1.h.image(buffer, 'image/png').toString();
-                });
-                return imageElement;
+                // 生成并渲染
+                const html = (0, render_1.generateListHtml)(results, `容器列表 (${selector})`);
+                return await (0, render_1.renderToImage)(ctx, html);
             }
             catch (e) {
                 logger_1.commandLogger.error(`图片渲染失败: ${e.message}`);
@@ -62,9 +53,13 @@ function registerListCommand(ctx, getService, config) {
         }
         // 文字模式
         try {
+            // 如果未指定节点，提示用户
+            if (!selector) {
+                return '请指定节点名称、ID 或标签，或使用 "all" 列出全部容器\n例如: docker.ls @web 或 docker.ls all';
+            }
             const results = await getContainerResults(service, selector, all);
             if (results.length === 0) {
-                return selector ? '所有指定节点均未连接' : '未发现任何容器';
+                return '所有指定节点均未连接';
             }
             const lines = [];
             for (const { node, containers } of results) {
@@ -130,140 +125,3 @@ function formatContainerLine(container, format) {
     // simple 模式：双行显示
     return `${emoji} ${name}\n    └ ${shortId} | ${image}`;
 }
-/**
- * 生成 HTML 模板
- */
-function generateHtml(results) {
-    const styles = `
-    * { margin: 0; padding: 0; box-sizing: border-box; }
-    body {
-      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
-      background: linear-gradient(135deg, #1a1a2e 0%, #16213e 100%);
-      min-height: 100vh;
-      padding: 20px;
-      color: #fff;
-    }
-    .container {
-      max-width: 700px;
-      margin: 0 auto;
-    }
-    .node-section {
-      background: rgba(255, 255, 255, 0.1);
-      border-radius: 12px;
-      margin-bottom: 20px;
-      overflow: hidden;
-    }
-    .node-header {
-      background: rgba(79, 172, 254, 0.3);
-      padding: 12px 16px;
-      font-size: 16px;
-      font-weight: 600;
-      border-bottom: 1px solid rgba(255, 255, 255, 0.1);
-    }
-    .table-header {
-      display: grid;
-      grid-template-columns: 40px 1fr 100px 1fr;
-      gap: 10px;
-      padding: 10px 16px;
-      background: rgba(0, 0, 0, 0.2);
-      font-size: 12px;
-      color: rgba(255, 255, 255, 0.6);
-      text-transform: uppercase;
-      letter-spacing: 0.5px;
-    }
-    .row {
-      display: grid;
-      grid-template-columns: 40px 1fr 100px 1fr;
-      gap: 10px;
-      padding: 10px 16px;
-      border-bottom: 1px solid rgba(255, 255, 255, 0.05);
-      align-items: center;
-      transition: background 0.2s;
-    }
-    .row:hover {
-      background: rgba(255, 255, 255, 0.05);
-    }
-    .row:last-child {
-      border-bottom: none;
-    }
-    .status {
-      font-size: 18px;
-      text-align: center;
-    }
-    .name {
-      font-weight: 500;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-    .id {
-      font-family: 'SF Mono', Monaco, monospace;
-      font-size: 12px;
-      color: rgba(255, 255, 255, 0.7);
-    }
-    .image {
-      font-size: 12px;
-      color: rgba(255, 255, 255, 0.7);
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-    .running { color: #4ade80; }
-    .stopped { color: #f87171; }
-    .other { color: #94a3b8; }
-    .stats {
-      display: flex;
-      justify-content: center;
-      gap: 20px;
-      padding: 16px;
-      color: rgba(255, 255, 255, 0.6);
-      font-size: 13px;
-    }
-  `;
-    let html = `<!DOCTYPE html><html><head><meta charset="UTF-8"><style>${styles}</style></head><body>`;
-    html += `<div class="container">`;
-    let totalRunning = 0;
-    let totalStopped = 0;
-    for (const { node, containers } of results) {
-        const running = containers.filter(c => c.State === 'running').length;
-        const stopped = containers.length - running;
-        totalRunning += running;
-        totalStopped += stopped;
-        html += `<div class="node-section">`;
-        html += `<div class="node-header">${node.name}</div>`;
-        // 表头
-        html += `<div class="table-header">
-      <span></span>
-      <span>容器</span>
-      <span>ID</span>
-      <span>镜像</span>
-    </div>`;
-        // 容器列表
-        for (const c of containers) {
-            const status = c.State;
-            const emoji = status === 'running' ? '🟢' : (status === 'stopped' ? '🔴' : '⚪');
-            const name = c.Names[0]?.replace('/', '') || 'Unknown';
-            const shortId = c.Id.slice(0, 8);
-            let image = c.Image;
-            const parts = image.split('/');
-            if (parts.length > 1) {
-                image = parts[parts.length - 1];
-            }
-            html += `<div class="row">
-        <span class="status">${emoji}</span>
-        <span class="name" title="${name}">${name}</span>
-        <span class="id">${shortId}</span>
-        <span class="image" title="${image}">${image}</span>
-      </div>`;
-        }
-        // 统计
-        html += `<div class="stats">运行中: ${running} | 已停止: ${stopped}</div>`;
-        html += `</div>`;
-    }
-    // 总体统计
-    html += `<div class="node-section">`;
-    html += `<div class="stats"><strong>总计:</strong> ${totalRunning} 运行中, ${totalStopped} 已停止</div>`;
-    html += `</div>`;
-    html += `</div></body></html>`;
-    return html;
-}

package/lib/commands/logs.d.ts

@@ -1,6 +1,6 @@
 /**
  * 日志指令
- * docker.logs <container> [node]
+ * docker.logs <node> <container>
  */
 import { Context } from 'koishi';
 import type { DockerControlConfig } from '../types';

package/lib/commands/logs.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerLogsCommand = registerLogsCommand;
 const logger_1 = require("../utils/logger");
+const render_1 = require("../utils/render");
 /**
  * 获取容器名称
  */
@@ -12,74 +13,63 @@ function getContainerName(c) {
  * 注册日志指令
  */
 function registerLogsCommand(ctx, getService, config) {
+    const useImageOutput = config?.imageOutput === true;
     ctx
-        .command('docker.logs <container> [node]', '查看容器日志')
+        .command('docker.logs <node> <container>', '查看容器日志')
         .alias('docker日志', '容器日志', 'docker查看日志', '容器查看日志', 'dockerlogs')
         .option('lines', '-n <lines:number> 显示最后 N 行')
         .option('timestamp', '-t 显示时间戳')
-        .action(async ({ options }, container, node) => {
-        logger_1.commandLogger.debug(`docker.logs 被调用: container=${container}, node=${node}, lines=${options.lines}, timestamp=${options.timestamp}`);
+        .option('all', '-a 显示全部（不截断）')
+        .action(async ({ options }, node, container) => {
+        logger_1.commandLogger.debug(`docker.logs 被调用: node=${node}, container=${container}, lines=${options.lines}, timestamp=${options.timestamp}`);
         const service = getService();
         if (!service) {
             logger_1.commandLogger.debug('服务未初始化');
             return 'Docker 服务未初始化';
         }
         // 参数校验
-        if (!container) {
-            return '请指定容器名或ID\n用法示例:\n  docker.logs my-app\n  docker.logs my-app node-1 -n 50';
+        if (!node || !container) {
+            return '请指定节点和容器\n用法示例:\n  docker.logs @web my-app -n 50\n  docker.logs all my-app';
         }
         // 确定日志行数 (优先级: 命令行参数 > 全局配置 > 默认值)
         const tail = options.lines || config?.defaultLogLines || 100;
         const showTimestamp = options.timestamp || false;
-        logger_1.commandLogger.debug(`日志参数: tail=${tail}, showTimestamp=${showTimestamp}`);
+        const showAll = options.all || false;
+        logger_1.commandLogger.debug(`日志参数: tail=${tail}, showTimestamp=${showTimestamp}, showAll=${showAll}`);
         try {
-            let targetNode = null;
-            let containerInfo = null;
-            // 查找容器逻辑
-            if (node) {
-                // 指定节点查找
-                const nodes = service.getNodesBySelector(node);
-                if (nodes.length === 0) {
-                    logger_1.commandLogger.debug(`找不到节点: ${node}`);
-                    return `❌ 找不到节点: ${node}`;
-                }
-                targetNode = nodes[0];
-                logger_1.commandLogger.debug(`在节点 ${targetNode.name} 中查找容器...`);
-                const result = await service.findContainer(targetNode.id, container);
-                containerInfo = result.container;
-            }
-            else {
-                // 全局模糊查找
-                logger_1.commandLogger.debug(`全局搜索容器: ${container}`);
-                const results = await service.findContainerGlobal(container);
-                if (results.length === 0) {
-                    logger_1.commandLogger.debug(`找不到容器: ${container}`);
-                    return `❌ 找不到容器: ${container}`;
-                }
-                // 优先返回 Running 的，如果没有则返回第一个
-                const running = results.find(r => r.container.State === 'running');
-                const target = running || results[0];
-                targetNode = target.node;
-                containerInfo = target.container;
+            // 查找节点
+            const nodes = service.getNodesBySelector(node);
+            if (nodes.length === 0) {
+                logger_1.commandLogger.debug(`找不到节点: ${node}`);
+                return `找不到节点: ${node}`;
             }
+            // 在节点上查找容器
+            const { node: targetNode, container: containerInfo } = await service.findContainer(nodes[0].id, container);
             if (!targetNode || !containerInfo) {
-                return '❌ 未能获取容器信息';
+                return '未能获取容器信息';
             }
             // 获取日志
-            const logs = await targetNode.getContainerLogs(containerInfo.Id, tail);
+            const logs = await targetNode.getContainerLogs(containerInfo.Id, showAll ? 10000 : tail);
             if (!logs || !logs.trim()) {
                 return `${targetNode.name}: ${getContainerName(containerInfo)} - 无日志`;
             }
             // 格式化输出
             const lines = logs.split('\n').filter(l => l.length > 0);
-            const displayLines = lines.length > tail ? lines.slice(-tail) : lines;
+            const displayLines = !showAll && lines.length > tail ? lines.slice(-tail) : lines;
             // 移除 ANSI 颜色代码
             const cleanLogs = displayLines.map(line => line.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '')).join('\n');
-            return `=== ${targetNode.name}: ${getContainerName(containerInfo)} (最后 ${displayLines.length} 行) ===\n${cleanLogs}`;
+            // 图片渲染模式
+            if (useImageOutput && ctx.puppeteer && !showAll) {
+                const html = (0, render_1.generateLogsHtml)(targetNode.name, getContainerName(containerInfo), cleanLogs, displayLines.length);
+                // 根据行数动态计算高度：header 80px + header 80px + 每行 25px + padding
+                const estimatedHeight = 200 + displayLines.length * 25;
+                return await (0, render_1.renderToImage)(ctx, html, { height: Math.max(estimatedHeight, 800) });
+            }
+            return `=== ${targetNode.name}: ${getContainerName(containerInfo)} (${showAll ? '全部' : `最后 ${displayLines.length} 行`}) ===\n${cleanLogs}`;
         }
         catch (e) {
             logger_1.commandLogger.error(e);
-            return `❌ 获取日志失败: ${e.message}`;
+            return `获取日志失败: ${e.message}`;
         }
     });
 }

package/lib/index.js

@@ -19,7 +19,7 @@ exports.inject = {
 exports.Config = koishi_1.Schema.object({
     requestTimeout: koishi_1.Schema.number().default(30000).description('请求超时 (毫秒)'),
     debug: koishi_1.Schema.boolean().default(false).description('调试模式'),
-    imageOutput: koishi_1.Schema.boolean().default(false).description('使用图片格式输出容器列表'),
+    imageOutput: koishi_1.Schema.boolean().default(false).description('使用图片格式输出容器列表和操作结果'),
     defaultLogLines: koishi_1.Schema.number().default(100).description('默认日志显示的行数'),
     // 监控策略
     monitor: koishi_1.Schema.object({

package/lib/service/connector.d.ts

@@ -9,6 +9,13 @@ export declare class DockerConnector {
      */
     exec(command: string): Promise<string>;
     private execInternal;
+    /**
+     * 执行命令并返回输出和退出码
+     */
+    execWithExitCode(command: string): Promise<{
+        output: string;
+        exitCode: number;
+    }>;
     /**
      * 执行 docker ps 获取容器列表
      */
@@ -32,7 +39,10 @@ export declare class DockerConnector {
     /**
      * 执行容器内命令
      */
-    execContainer(containerId: string, cmd: string): Promise<string>;
+    execContainer(containerId: string, cmd: string): Promise<{
+        output: string;
+        exitCode: number;
+    }>;
     /**
      * 监听 Docker 事件流
      * @param callback 每行事件数据的回调