@xcanwin/manyoyo 5.1.10 → 5.2.5

package/bin/manyoyo.js

@@ -56,8 +56,12 @@ let IMAGE_VERSION = IMAGE_VERSION_DEFAULT || `${IMAGE_VERSION_BASE}-common`;
 let EXEC_COMMAND = "";
 let EXEC_COMMAND_PREFIX = "";
 let EXEC_COMMAND_SUFFIX = "";
+let FIRST_EXEC_COMMAND = "";
+let FIRST_EXEC_COMMAND_PREFIX = "";
+let FIRST_EXEC_COMMAND_SUFFIX = "";
 let IMAGE_BUILD_ARGS = [];
 let CONTAINER_ENVS = [];
+let FIRST_CONTAINER_ENVS = [];
 let CONTAINER_VOLUMES = [];
 let CONTAINER_PORTS = [];
 const MANYOYO_NAME = detectCommandName();
@@ -236,6 +240,7 @@ function sanitizeSensitiveData(obj) {
  * @property {string} [imageVersion] - 镜像版本
  * @property {Object.<string, string|number|boolean>} [env] - 环境变量映射
  * @property {string[]} [envFile] - 环境文件数组
+ * @property {{shellPrefix?:string,shell?:string,shellSuffix?:string,env?:Object.<string,string|number|boolean>,envFile?:string[]}} [first] - 仅首次创建容器执行的一次性命令配置
  * @property {string[]} [volumes] - 挂载卷数组
  * @property {Object.<string, Object>} [plugins] - 可选插件配置映射（如 plugins.playwright）
  * @property {Object.<string, Object>} [runs] - 运行配置映射（-r <name>）
@@ -436,12 +441,27 @@ function normalizeCliEnvMap(envList) {
     return envMap;
 }
 
-function addEnv(env) {
+function normalizeFirstConfig(firstConfig, sourceLabel) {
+    if (firstConfig === undefined || firstConfig === null) {
+        return {};
+    }
+    if (typeof firstConfig !== 'object' || Array.isArray(firstConfig)) {
+        console.error(`${RED}⚠️  错误: ${sourceLabel} 的 first 必须是对象(map)，例如 {"shell":"init.sh"}${NC}`);
+        process.exit(1);
+    }
+    return firstConfig;
+}
+
+function addEnvTo(targetEnvs, env) {
     const parsed = parseEnvEntry(env);
-    CONTAINER_ENVS.push("--env", `${parsed.key}=${parsed.value}`);
+    targetEnvs.push("--env", `${parsed.key}=${parsed.value}`);
 }
 
-function addEnvFile(envFile) {
+function addEnv(env) {
+    addEnvTo(CONTAINER_ENVS, env);
+}
+
+function addEnvFileTo(targetEnvs, envFile) {
     const filePath = String(envFile || '').trim();
     if (!path.isAbsolute(filePath)) {
         console.error(`${RED}⚠️  错误: --env-file 仅支持绝对路径: ${envFile}${NC}`);
@@ -472,7 +492,7 @@ function addEnvFile(envFile) {
                 }
 
                 if (key) {
-                    CONTAINER_ENVS.push("--env", `${key}=${value}`);
+                    targetEnvs.push("--env", `${key}=${value}`);
                 }
             }
         }
@@ -482,6 +502,10 @@ function addEnvFile(envFile) {
     return {};
 }
 
+function addEnvFile(envFile) {
+    return addEnvFileTo(CONTAINER_ENVS, envFile);
+}
+
 function addVolume(volume) {
     CONTAINER_VOLUMES.push("--volume", volume);
 }
@@ -1128,6 +1152,8 @@ async function setupCommander() {
 
     // Load run config if specified
     const runConfig = options.run ? loadRunConfig(options.run, config) : {};
+    const globalFirstConfig = normalizeFirstConfig(config.first, '全局配置');
+    const runFirstConfig = normalizeFirstConfig(runConfig.first, '运行配置');
 
     // Merge configs: command line > run config > global config > defaults
     // Override mode (scalar values): use first defined value
@@ -1158,6 +1184,18 @@ async function setupCommander() {
     if (mergedShellSuffix) {
         EXEC_COMMAND_SUFFIX = normalizeCommandSuffix(mergedShellSuffix);
     }
+    const mergedFirstShellPrefix = pickConfigValue(runFirstConfig.shellPrefix, globalFirstConfig.shellPrefix);
+    if (mergedFirstShellPrefix) {
+        FIRST_EXEC_COMMAND_PREFIX = `${mergedFirstShellPrefix} `;
+    }
+    const mergedFirstShell = pickConfigValue(runFirstConfig.shell, globalFirstConfig.shell);
+    if (mergedFirstShell) {
+        FIRST_EXEC_COMMAND = mergedFirstShell;
+    }
+    const mergedFirstShellSuffix = pickConfigValue(runFirstConfig.shellSuffix, globalFirstConfig.shellSuffix);
+    if (mergedFirstShellSuffix) {
+        FIRST_EXEC_COMMAND_SUFFIX = normalizeCommandSuffix(mergedFirstShellSuffix);
+    }
 
     // Basic name validation to reduce injection risk
     validateName('containerName', CONTAINER_NAME, SAFE_CONTAINER_NAME_PATTERN);
@@ -1181,6 +1219,18 @@ async function setupCommander() {
     };
     Object.entries(envMap).forEach(([key, value]) => addEnv(`${key}=${value}`));
 
+    const firstEnvFileList = [
+        ...toArray(globalFirstConfig.envFile),
+        ...toArray(runFirstConfig.envFile)
+    ].filter(Boolean);
+    firstEnvFileList.forEach(ef => addEnvFileTo(FIRST_CONTAINER_ENVS, ef));
+
+    const firstEnvMap = {
+        ...normalizeJsonEnvMap(globalFirstConfig.env, '全局配置 first'),
+        ...normalizeJsonEnvMap(runFirstConfig.env, '运行配置 first')
+    };
+    Object.entries(firstEnvMap).forEach(([key, value]) => addEnvTo(FIRST_CONTAINER_ENVS, `${key}=${value}`));
+
     const volumeList = mergeArrayConfig(config.volumes, runConfig.volumes, options.volume);
     volumeList.forEach(v => addVolume(v));
 
@@ -1267,6 +1317,18 @@ async function setupCommander() {
                 prefix: EXEC_COMMAND_PREFIX,
                 shell: EXEC_COMMAND,
                 suffix: EXEC_COMMAND_SUFFIX
+            },
+            first: {
+                envFile: firstEnvFileList,
+                env: firstEnvMap,
+                shellPrefix: FIRST_EXEC_COMMAND_PREFIX.trim(),
+                shell: FIRST_EXEC_COMMAND || "",
+                shellSuffix: FIRST_EXEC_COMMAND_SUFFIX || "",
+                exec: {
+                    prefix: FIRST_EXEC_COMMAND_PREFIX,
+                    shell: FIRST_EXEC_COMMAND,
+                    suffix: FIRST_EXEC_COMMAND_SUFFIX
+                }
             }
         };
         // 敏感信息脱敏
@@ -1300,8 +1362,12 @@ function createRuntimeContext(modeState = {}) {
         execCommand: EXEC_COMMAND,
         execCommandPrefix: EXEC_COMMAND_PREFIX,
         execCommandSuffix: EXEC_COMMAND_SUFFIX,
+        firstExecCommand: FIRST_EXEC_COMMAND,
+        firstExecCommandPrefix: FIRST_EXEC_COMMAND_PREFIX,
+        firstExecCommandSuffix: FIRST_EXEC_COMMAND_SUFFIX,
         contModeArgs: CONT_MODE_ARGS,
         containerEnvs: CONTAINER_ENVS,
+        firstContainerEnvs: FIRST_CONTAINER_ENVS,
         containerVolumes: CONTAINER_VOLUMES,
         containerPorts: CONTAINER_PORTS,
         quiet: QUIET,
@@ -1379,6 +1445,42 @@ function joinExecCommand(prefix, command, suffix) {
     return `${prefix || ''}${command || ''}${suffix || ''}`;
 }
 
+function executeFirstCommand(runtime) {
+    if (!runtime.firstExecCommand || !String(runtime.firstExecCommand).trim()) {
+        return;
+    }
+
+    const firstCommand = joinExecCommand(
+        runtime.firstExecCommandPrefix,
+        runtime.firstExecCommand,
+        runtime.firstExecCommandSuffix
+    );
+
+    if (!(runtime.quiet.cmd || runtime.quiet.full)) {
+        console.log(`${BLUE}----------------------------------------${NC}`);
+        console.log(`⚙️  首次预执行命令: ${YELLOW}${firstCommand}${NC}`);
+    }
+
+    const firstExecArgs = [
+        'exec',
+        ...(runtime.firstContainerEnvs || []),
+        runtime.containerName,
+        '/bin/bash',
+        '-c',
+        firstCommand
+    ];
+    const firstExecResult = spawnSync(`${DOCKER_CMD}`, firstExecArgs, { stdio: 'inherit' });
+    if (firstExecResult.error) {
+        throw firstExecResult.error;
+    }
+    if (typeof firstExecResult.status === 'number' && firstExecResult.status !== 0) {
+        throw new Error(`首次预执行命令失败，退出码: ${firstExecResult.status}`);
+    }
+    if (firstExecResult.signal) {
+        throw new Error(`首次预执行命令被信号终止: ${firstExecResult.signal}`);
+    }
+}
+
 /**
  * 创建新容器
  * @returns {Promise<string>} 默认命令
@@ -1412,6 +1514,9 @@ async function createNewContainer(runtime) {
     // Wait for container to be ready
     await waitForContainerReady(runtime.containerName);
 
+    // Run one-time bootstrap command for newly created containers only.
+    executeFirstCommand(runtime);
+
     return defaultCommand;
 }
 

package/config.example.json

@@ -11,6 +11,15 @@
     "shellPrefix": "",
     "shell": "",
     "shellSuffix": "",
+    "agentPromptCommand": "",
+    // 仅首次创建容器时执行一次（创建后、常规 shell 前）
+    "first": {
+        "shellPrefix": "",
+        "shell": "",
+        "shellSuffix": "",
+        "env": {},
+        "envFile": []
+    },
     "yolo": "",
     "serverUser": "admin",
     "serverPass": "change-this-password",
@@ -58,6 +67,10 @@
             "containerName": "my-claude-{now}",
             "yolo": "c",
             "shell": "claude",
+            "agentPromptCommand": "claude -p {prompt}",
+            "first": {
+                "shell": "echo first-init"
+            },
             "env": {
                 "ANTHROPIC_MODEL": "claude-sonnet-4-5"
             },

package/lib/agent-resume.js

@@ -9,6 +9,13 @@ const AGENT_RESUME_ARG_MAP = {
     opencode: '-c'
 };
 
+const AGENT_PROMPT_TEMPLATE_MAP = {
+    claude: 'claude -p {prompt}',
+    gemini: 'gemini -p {prompt}',
+    codex: 'codex exec {prompt}',
+    opencode: 'opencode run {prompt}'
+};
+
 function stripLeadingAssignments(commandText) {
     let rest = String(commandText || '').trim();
     const assignmentPattern = /^(?:[A-Za-z_][A-Za-z0-9_]*=)(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|[^\s]+)(?:\s+|$)/;
@@ -67,6 +74,11 @@ function resolveAgentResumeArg(commandText) {
     return AGENT_RESUME_ARG_MAP[program] || '';
 }
 
+function resolveAgentPromptCommandTemplate(commandText) {
+    const program = resolveAgentProgram(commandText);
+    return AGENT_PROMPT_TEMPLATE_MAP[program] || '';
+}
+
 function buildAgentResumeCommand(commandText) {
     const baseCommand = String(commandText || '').trim();
     if (!baseCommand) {
@@ -80,6 +92,8 @@ function buildAgentResumeCommand(commandText) {
 }
 
 module.exports = {
+    resolveAgentProgram,
     resolveAgentResumeArg,
-    buildAgentResumeCommand
+    buildAgentResumeCommand,
+    resolveAgentPromptCommandTemplate
 };

package/lib/web/frontend/app.css

@@ -437,20 +437,24 @@ textarea:focus-visible {
     box-shadow: inset 3px 0 0 var(--accent), 0 0 0 2px rgba(196, 85, 31, 0.14);
 }
 
-.session-item.history-only {
-    color: #b3ab9f;
-}
-
-.session-item.history-only .session-name,
-.session-item.history-only .session-count,
-.session-item.history-only .session-time {
-    color: #b3ab9f;
+.session-item.status-history:not(.active),
+.session-item.status-stopped:not(.active),
+.session-item.status-unknown:not(.active) {
+    border-color: rgba(181, 146, 99, 0.22);
+    background: rgba(255, 252, 247, 0.72);
+    box-shadow: none;
 }
 
-.session-item.history-only .session-status {
-    background: #f7f3ed;
-    border-color: #e3dbd1;
-    color: #b3ab9f;
+.session-item.status-history:not(.active) .session-name,
+.session-item.status-history:not(.active) .session-meta,
+.session-item.status-history:not(.active) .session-time,
+.session-item.status-stopped:not(.active) .session-name,
+.session-item.status-stopped:not(.active) .session-meta,
+.session-item.status-stopped:not(.active) .session-time,
+.session-item.status-unknown:not(.active) .session-name,
+.session-item.status-unknown:not(.active) .session-meta,
+.session-item.status-unknown:not(.active) .session-time {
+    opacity: 0.25;
 }
 
 .session-name {
@@ -641,6 +645,7 @@ textarea:focus-visible {
 }
 
 body.command-mode #modeCommandBtn,
+body.agent-mode #modeAgentBtn,
 body.terminal-mode #modeTerminalBtn {
     color: #ffffff;
     background: var(--accent);
@@ -722,14 +727,26 @@ body.command-mode #messages {
     display: flex;
 }
 
+body.agent-mode #messages {
+    display: flex;
+}
+
 body.command-mode #terminalPanel {
     display: none;
 }
 
+body.agent-mode #terminalPanel {
+    display: none;
+}
+
 body.command-mode .composer {
     display: block;
 }
 
+body.agent-mode .composer {
+    display: block;
+}
+
 body.terminal-mode #messages {
     display: none;
 }
@@ -834,6 +851,23 @@ body.terminal-mode .composer {
     opacity: 0.78;
 }
 
+body.agent-mode .msg.origin-command .bubble,
+body.agent-mode .msg.origin-command .msg-meta,
+body.agent-mode .msg.origin-command .msg-exit {
+    opacity: 0.25;
+}
+
+body.command-mode .msg.origin-agent .bubble,
+body.command-mode .msg.origin-agent .msg-meta,
+body.command-mode .msg.origin-agent .msg-exit {
+    opacity: 0.25;
+}
+
+body.agent-mode .msg.origin-command .bubble,
+body.command-mode .msg.origin-agent .bubble {
+    box-shadow: none;
+}
+
 .bubble pre {
     margin: 0;
     white-space: pre-wrap;

package/lib/web/frontend/app.html

@@ -8,6 +8,7 @@
     />
     <title>MANYOYO Web</title>
     <link rel="stylesheet" href="/app/frontend/app.css" />
+    <link rel="stylesheet" href="/app/frontend/markdown.css" />
     <link rel="stylesheet" href="/app/vendor/xterm.css" />
 </head>
 <body>
@@ -65,7 +66,8 @@
             </header>
             <section class="mode-switch" id="modeSwitch">
                 <div class="mode-switch-left">
-                    <button type="button" id="modeCommandBtn" class="secondary is-active">命令模式</button>
+                    <button type="button" id="modeAgentBtn" class="secondary is-active">AGENT 模式</button>
+                    <button type="button" id="modeCommandBtn" class="secondary">命令模式</button>
                     <button type="button" id="modeTerminalBtn" class="secondary">交互终端</button>
                 </div>
                 <div class="mode-terminal-controls">
@@ -85,7 +87,7 @@
                     <button type="submit" id="sendBtn">发送</button>
                 </div>
                 <div class="composer-foot">
-                    <span>Enter 发送 · Shift/Alt + Enter 换行</span>
+                    <span id="composerHint">Enter 发送 · Shift/Alt + Enter 换行</span>
                     <span id="sendState" class="send-state">未选择会话</span>
                 </div>
             </form>
@@ -140,6 +142,7 @@
                         <label>shell<input id="createShell" placeholder="例如 claude / codex" /></label>
                         <label>shellSuffix<input id="createShellSuffix" placeholder="例如 --dangerously-skip-permissions" /></label>
                         <label>yolo<input id="createYolo" placeholder="例如 c / cx / gm / oc" /></label>
+                        <label>agentPromptCommand<input id="createAgentPromptCommand" placeholder="例如 codex exec --plain-text {prompt}" /></label>
                     </div>
                     <label class="text-block">env (KEY=VALUE，每行一项)
                         <textarea id="createEnv" placeholder="KEY=value"></textarea>
@@ -162,6 +165,8 @@
 
     <script src="/app/vendor/xterm.js"></script>
     <script src="/app/vendor/xterm-addon-fit.js"></script>
+    <script src="/app/vendor/marked.min.js"></script>
+    <script src="/app/frontend/markdown-renderer.js"></script>
     <script src="/app/frontend/app.js"></script>
 </body>
 </html>