@xcanwin/manyoyo 2.2.1 → 3.0.0

package/bin/manyoyo.js

@@ -47,7 +47,19 @@ const NC = '\x1b[0m'; // No Color
 // Docker command (will be set by ensure_docker)
 let DOCKER_CMD = 'docker';
 
-function show_help() {
+// ==============================================================================
+// Utility Functions
+// ==============================================================================
+
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+// ==============================================================================
+// UI Functions
+// ==============================================================================
+
+function showHelp() {
     console.log(`${BLUE}Usage:${NC}`);
     console.log(`  ${MANYOYO_NAME} [OPTIONS]`);
     console.log(`  ${MANYOYO_NAME} [--hp HOST_PATH] [-n CONTAINER_NAME] [--cp CONTAINER_PATH] [--ef ENV_FILE] [--sp COMMAND] [-s COMMAND] [-- COMMAND]`);
@@ -84,41 +96,80 @@ function show_help() {
     console.log(`  ${MANYOYO_NAME} -n test -x claude -c                恢复之前会话`);
 }
 
-function ensure_docker() {
-    try {
-        execSync('docker --version', { stdio: 'pipe' });
-        DOCKER_CMD = 'docker';
-        return true;
-    } catch (e) {
-        try {
-            execSync('podman --version', { stdio: 'pipe' });
-            DOCKER_CMD = 'podman';
-            return true;
-        } catch (e2) {
-            console.error("docker/podman not found");
-            process.exit(1);
-        }
-    }
+function showVersion() {
+    console.log(`manyoyo by xcanwin, ${BIN_VERSION}`);
 }
 
-function install_manyoyo(name) {
-    const MANYOYO_FILE = fs.realpathSync(__filename);
-    switch (name) {
-        case 'docker-cli-plugin':
-            execSync(`mkdir -p "$HOME/.docker/cli-plugins/"`, { stdio: 'inherit' });
-            execSync(`ln -f -s "${MANYOYO_FILE}" "$HOME/.docker/cli-plugins/docker-manyoyo"`, { stdio: 'inherit' });
-            break;
-        default:
-            console.log("");
+function getHelloTip(containerName, defaultCommand) {
+    console.log(`${BLUE}----------------------------------------${NC}`);
+    console.log(`📦 首次命令        : ${defaultCommand}`);
+    console.log(`⚫ 恢复首次命令会话: ${CYAN}${MANYOYO_NAME} -n ${containerName} -- -c${NC}`);
+    console.log(`⚫ 执行首次命令    : ${GREEN}${MANYOYO_NAME} -n ${containerName}${NC}`);
+    console.log(`⚫ 执行指定命令    : ${GREEN}${MANYOYO_NAME} -n ${containerName} -x /bin/bash${NC}`);
+    console.log(`⚫ 执行指定命令    : ${GREEN}docker exec -it ${containerName} /bin/bash${NC}`);
+    console.log(`⚫ 删除容器        : ${MANYOYO_NAME} -n ${containerName} --rm`);
+    console.log("");
+}
+
+async function askQuestion(prompt) {
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+    });
+
+    return new Promise((resolve) => {
+        rl.question(prompt, (answer) => {
+            rl.close();
+            resolve(answer);
+        });
+    });
+}
+
+// ==============================================================================
+// Configuration Functions
+// ==============================================================================
+
+function addEnv(env) {
+    CONTAINER_ENVS.push("--env", env);
+}
+
+function addEnvFile(envFile) {
+    ENV_FILE = envFile;
+    if (ENV_FILE && fs.existsSync(ENV_FILE)) {
+        const content = fs.readFileSync(ENV_FILE, 'utf-8');
+        const lines = content.split('\n');
+
+        for (let line of lines) {
+            // Match pattern: (export )?(KEY)=(VALUE)
+            const match = line.match(/^(?:export\s+)?([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.*)$/);
+            if (match) {
+                let key = match[1];
+                let value = match[2].trim();
+
+                // Filter malicious characters
+                if (/[\$\(\)\`\|\&\*\{\}]/.test(value)) continue;
+                if (/^\(/.test(value)) continue;
+
+                // Remove quotes
+                if (/^"(.*)"$/.test(value)) {
+                    value = value.slice(1, -1);
+                } else if (/^'(.*)'$/.test(value)) {
+                    value = value.slice(1, -1);
+                }
+
+                if (key) {
+                    CONTAINER_ENVS.push("--env", `${key}=${value}`);
+                }
+            }
+        }
     }
-    process.exit(0);
 }
 
-function show_version() {
-    console.log(`manyoyo by xcanwin, ${BIN_VERSION}`);
+function addVolume(volume) {
+    CONTAINER_VOLUMES.push("--volume", volume);
 }
 
-function set_yolo(cli) {
+function setYolo(cli) {
     switch (cli) {
         case 'claude':
         case 'cc':
@@ -144,7 +195,7 @@ function set_yolo(cli) {
     }
 }
 
-function set_cont_mode(mode) {
+function setContMode(mode) {
     switch (mode) {
         case 'common':
             CONT_MODE = "";
@@ -167,105 +218,96 @@ function set_cont_mode(mode) {
     }
 }
 
-function get_cont_list() {
+// ==============================================================================
+// Docker Helper Functions
+// ==============================================================================
+
+function dockerExec(cmd, options = {}) {
     try {
-        const result = execSync(`${DOCKER_CMD} ps -a --size --filter "ancestor=manyoyo" --filter "ancestor=$(${DOCKER_CMD} images -a --format '{{.Repository}}:{{.Tag}}' | grep manyoyo)" --format "table {{.Names}}\\t{{.Status}}\\t{{.Size}}\\t{{.ID}}\\t{{.Image}}\\t{{.Ports}}\\t{{.Networks}}\\t{{.Mounts}}"`,
-            { encoding: 'utf-8' });
-        console.log(result);
+        return execSync(cmd, { encoding: 'utf-8', ...options });
     } catch (e) {
-        console.log(e.stdout || '');
+        if (options.ignoreError) {
+            return e.stdout || '';
+        }
+        throw e;
     }
 }
 
-function add_volume(volume) {
-    CONTAINER_VOLUMES.push("--volume", volume);
+function containerExists(name) {
+    const containers = dockerExec(`${DOCKER_CMD} ps -a --format '{{.Names}}'`);
+    return containers.split('\n').some(n => n.trim() === name);
 }
 
-function add_env(env) {
-    CONTAINER_ENVS.push("--env", env);
+function getContainerStatus(name) {
+    return dockerExec(`${DOCKER_CMD} inspect -f '{{.State.Status}}' "${name}"`).trim();
 }
 
-function add_env_file(envFile) {
-    ENV_FILE = envFile;
-    if (ENV_FILE && fs.existsSync(ENV_FILE)) {
-        const content = fs.readFileSync(ENV_FILE, 'utf-8');
-        const lines = content.split('\n');
-
-        for (let line of lines) {
-            // Match pattern: (export )?(KEY)=(VALUE)
-            const match = line.match(/^(?:export\s+)?([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.*)$/);
-            if (match) {
-                let key = match[1];
-                let value = match[2].trim();
-
-                // Filter malicious characters
-                if (/[\$\(\)\`\|\&\*\{\}]/.test(value)) continue;
-                if (/^\(/.test(value)) continue;
+function removeContainer(name) {
+    console.log(`${YELLOW}🗑️ 正在删除容器: ${name}...${NC}`);
+    dockerExec(`${DOCKER_CMD} rm -f "${name}"`, { stdio: 'pipe' });
+    console.log(`${GREEN}✅ 已彻底删除。${NC}`);
+}
 
-                // Remove quotes
-                if (/^"(.*)"$/.test(value)) {
-                    value = value.slice(1, -1);
-                } else if (/^'(.*)'$/.test(value)) {
-                    value = value.slice(1, -1);
-                }
+// ==============================================================================
+// Docker Operations
+// ==============================================================================
 
-                if (key) {
-                    CONTAINER_ENVS.push("--env", `${key}=${value}`);
-                }
-            }
+function ensureDocker() {
+    const commands = ['docker', 'podman'];
+    for (const cmd of commands) {
+        try {
+            execSync(`${cmd} --version`, { stdio: 'pipe' });
+            DOCKER_CMD = cmd;
+            return true;
+        } catch (e) {
+            // Try next command
         }
     }
+    console.error("docker/podman not found");
+    process.exit(1);
 }
 
-function get_hello_tip(containerName, defaultCommand) {
-    console.log(`${BLUE}----------------------------------------${NC}`);
-    console.log(`📦 首次命令        : ${defaultCommand}`);
-    console.log(`⚫ 恢复首次命令会话: ${CYAN}${MANYOYO_NAME} -n ${containerName} -- -c${NC}`);
-    console.log(`⚫ 执行首次命令    : ${GREEN}${MANYOYO_NAME} -n ${containerName}${NC}`);
-    console.log(`⚫ 执行指定命令    : ${GREEN}${MANYOYO_NAME} -n ${containerName} -x /bin/bash${NC}`);
-    console.log(`⚫ 执行指定命令    : ${GREEN}docker exec -it ${containerName} /bin/bash${NC}`);
-    console.log(`⚫ 删除容器        : ${MANYOYO_NAME} -n ${containerName} --rm`);
-    console.log("");
+function installManyoyo(name) {
+    const MANYOYO_FILE = fs.realpathSync(__filename);
+    switch (name) {
+        case 'docker-cli-plugin':
+            const pluginDir = path.join(process.env.HOME, '.docker/cli-plugins');
+            fs.mkdirSync(pluginDir, { recursive: true });
+            const targetPath = path.join(pluginDir, 'docker-manyoyo');
+            if (fs.existsSync(targetPath)) {
+                fs.unlinkSync(targetPath);
+            }
+            fs.symlinkSync(MANYOYO_FILE, targetPath);
+            break;
+        default:
+            console.log("");
+    }
+    process.exit(0);
 }
 
-function docker_exec(cmd, options = {}) {
+function getContList() {
     try {
-        return execSync(cmd, { encoding: 'utf-8', ...options });
+        const result = execSync(`${DOCKER_CMD} ps -a --size --filter "ancestor=manyoyo" --filter "ancestor=$(${DOCKER_CMD} images -a --format '{{.Repository}}:{{.Tag}}' | grep manyoyo)" --format "table {{.Names}}\\t{{.Status}}\\t{{.Size}}\\t{{.ID}}\\t{{.Image}}\\t{{.Ports}}\\t{{.Networks}}\\t{{.Mounts}}"`,
+            { encoding: 'utf-8' });
+        console.log(result);
     } catch (e) {
-        if (options.ignoreError) {
-            return e.stdout || '';
-        }
-        throw e;
+        console.log(e.stdout || '');
     }
 }
 
-function sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-
-async function askQuestion(prompt) {
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout
-    });
-
-    return new Promise((resolve) => {
-        rl.question(prompt, (answer) => {
-            rl.close();
-            resolve(answer);
-        });
-    });
-}
+// ==============================================================================
+// Main Function Helpers
+// ==============================================================================
 
-async function main() {
+function validateAndInitialize() {
     // Check if no arguments provided
     if (process.argv.length <= 2) {
-        show_help();
+        showHelp();
         process.exit(1);
     }
 
     // Ensure docker/podman is available
-    ensure_docker();
+    ensureDocker();
 
     // Docker CLI plugin metadata
     if (process.argv[2] === 'docker-cli-plugin-metadata') {
@@ -278,13 +320,15 @@ async function main() {
         console.log(JSON.stringify(metadata, null, 2));
         process.exit(0);
     }
+}
 
+function parseArguments(argv) {
     // Parse arguments
-    let args = process.argv.slice(2);
+    let args = argv.slice(2);
 
     // Docker CLI plugin mode - remove first arg if running as plugin
     const dockerPluginPath = path.join(process.env.HOME || '', '.docker/cli-plugins/docker-manyoyo');
-    if (process.argv[1] === dockerPluginPath && args[0] === 'manyoyo') {
+    if (argv[1] === dockerPluginPath && args[0] === 'manyoyo') {
         args.shift();
     }
 
@@ -297,7 +341,7 @@ async function main() {
             case '-l':
             case '--ls':
             case '--list':
-                get_cont_list();
+                getContList();
                 process.exit(0);
 
             case '--hp':
@@ -333,19 +377,19 @@ async function main() {
 
             case '-e':
             case '--env':
-                add_env(args[i + 1]);
+                addEnv(args[i + 1]);
                 i += 2;
                 break;
 
             case '--ef':
             case '--env-file':
-                add_env_file(args[i + 1]);
+                addEnvFile(args[i + 1]);
                 i += 2;
                 break;
 
             case '-v':
             case '--volume':
-                add_volume(args[i + 1]);
+                addVolume(args[i + 1]);
                 i += 2;
                 break;
 
@@ -384,46 +428,44 @@ async function main() {
 
             case '-y':
             case '--yolo':
-                set_yolo(args[i + 1]);
+                setYolo(args[i + 1]);
                 i += 2;
                 break;
 
             case '-m':
             case '--cm':
             case '--cont-mode':
-                set_cont_mode(args[i + 1]);
+                setContMode(args[i + 1]);
                 i += 2;
                 break;
 
             case '--install':
-                install_manyoyo(args[i + 1]);
+                installManyoyo(args[i + 1]);
                 process.exit(0);
 
             case '-V':
             case '--version':
-                show_version();
+                showVersion();
                 process.exit(0);
 
             case '-h':
             case '--help':
-                show_help();
+                showHelp();
                 process.exit(0);
 
             default:
                 console.log(`${RED}⚠️ 未知参数: ${arg}${NC}`);
-                show_help();
+                showHelp();
                 process.exit(1);
         }
     }
+}
 
-    // Handle remove logic
+function handleRemoveContainer() {
     if (SHOULD_REMOVE) {
         try {
-            const containers = docker_exec(`${DOCKER_CMD} ps -a --format '{{.Names}}'`);
-            if (containers.split('\n').some(name => name.trim() === CONTAINER_NAME)) {
-                console.log(`${YELLOW}🗑️ 正在删除容器: ${CONTAINER_NAME}...${NC}`);
-                docker_exec(`${DOCKER_CMD} rm -f "${CONTAINER_NAME}"`, { stdio: 'pipe' });
-                console.log(`${GREEN}✅ 已彻底删除。${NC}`);
+            if (containerExists(CONTAINER_NAME)) {
+                removeContainer(CONTAINER_NAME);
             } else {
                 console.log(`${RED}⚠️ 错误: 未找到名为 ${CONTAINER_NAME} 的容器。${NC}`);
             }
@@ -432,136 +474,179 @@ async function main() {
         }
         process.exit(0);
     }
+}
 
-    // Safety check
+function validateHostPath() {
     const realHostPath = fs.realpathSync(HOST_PATH);
     const homeDir = process.env.HOME || '/home';
     if (realHostPath === '/' || realHostPath === '/home' || realHostPath === homeDir) {
         console.log(`${RED}⚠️ 错误: 不允许挂载根目录或home目录。${NC}`);
         process.exit(1);
     }
+}
 
-    const FULL_IMAGE = `${IMAGE_NAME}:${IMAGE_VERSION}`;
-    let DEFAULT_COMMAND = "";
+async function waitForContainerReady(containerName) {
+    const MAX_RETRIES = 50;
+    let count = 0;
+    while (true) {
+        try {
+            const status = getContainerStatus(containerName);
 
-    // Check if container exists
-    try {
-        const containers = docker_exec(`${DOCKER_CMD} ps -a --format '{{.Names}}'`);
-        const containerExists = containers.split('\n').some(name => name.trim() === CONTAINER_NAME);
-
-        if (!containerExists) {
-            // Create new container
-            console.log(`${CYAN}📦 manyoyo by xcanwin 正在创建新容器: ${YELLOW}${CONTAINER_NAME}${NC}\n`);
-            EXEC_COMMAND = `${EXEC_COMMAND_PREFIX}${EXEC_COMMAND}${EXEC_COMMAND_SUFFIX}`;
-            DEFAULT_COMMAND = EXEC_COMMAND;
-
-            // Build docker run command
-            const envArgs = CONTAINER_ENVS.join(' ');
-            const volumeArgs = CONTAINER_VOLUMES.join(' ');
-            const contModeArg = CONT_MODE ? CONT_MODE : '';
-
-            const dockerRunCmd = `${DOCKER_CMD} run -d --name "${CONTAINER_NAME}" --entrypoint "" ${contModeArg} ${envArgs} ${volumeArgs} --volume "${HOST_PATH}:${CONTAINER_PATH}" --workdir "${CONTAINER_PATH}" --label "manyoyo.default_cmd=${EXEC_COMMAND}" "${FULL_IMAGE}" tail -f /dev/null`;
-
-            docker_exec(dockerRunCmd, { stdio: 'pipe' });
-
-            // Wait for container to be ready
-            const MAX_RETRIES = 50;
-            let count = 0;
-            while (true) {
-                try {
-                    const status = docker_exec(`${DOCKER_CMD} inspect -f '{{.State.Status}}' "${CONTAINER_NAME}"`).trim();
-
-                    if (status === 'running') {
-                        break;
-                    }
-
-                    if (status === 'exited') {
-                        console.log(`${RED}⚠️ 错误: 容器启动后立即退出。${NC}`);
-                        docker_exec(`${DOCKER_CMD} logs "${CONTAINER_NAME}"`, { stdio: 'inherit' });
-                        process.exit(1);
-                    }
-
-                    await sleep(100);
-                    count++;
-
-                    if (count >= MAX_RETRIES) {
-                        console.log(`${RED}⚠️ 错误: 容器启动超时（当前状态: ${status}）。${NC}`);
-                        docker_exec(`${DOCKER_CMD} logs "${CONTAINER_NAME}"`, { stdio: 'inherit' });
-                        process.exit(1);
-                    }
-                } catch (e) {
-                    await sleep(100);
-                    count++;
-                    if (count >= MAX_RETRIES) {
-                        console.log(`${RED}⚠️ 错误: 容器启动超时。${NC}`);
-                        process.exit(1);
-                    }
-                }
+            if (status === 'running') {
+                break;
             }
-        } else {
-            // Container exists
-            console.log(`${CYAN}🔄 manyoyo by xcanwin 正在连接到现有容器: ${YELLOW}${CONTAINER_NAME}${NC}`);
-
-            // Start container if stopped
-            const status = docker_exec(`${DOCKER_CMD} inspect -f '{{.State.Status}}' "${CONTAINER_NAME}"`).trim();
-            if (status !== 'running') {
-                docker_exec(`${DOCKER_CMD} start "${CONTAINER_NAME}"`, { stdio: 'pipe' });
+
+            if (status === 'exited') {
+                console.log(`${RED}⚠️ 错误: 容器启动后立即退出。${NC}`);
+                dockerExec(`${DOCKER_CMD} logs "${containerName}"`, { stdio: 'inherit' });
+                process.exit(1);
             }
 
-            // Get default command from label
-            DEFAULT_COMMAND = docker_exec(`${DOCKER_CMD} inspect -f '{{index .Config.Labels "manyoyo.default_cmd"}}' "${CONTAINER_NAME}"`).trim();
+            await sleep(100);
+            count++;
 
-            if (!EXEC_COMMAND) {
-                EXEC_COMMAND = `${EXEC_COMMAND_PREFIX}${DEFAULT_COMMAND}${EXEC_COMMAND_SUFFIX}`;
-            } else {
-                EXEC_COMMAND = `${EXEC_COMMAND_PREFIX}${EXEC_COMMAND}${EXEC_COMMAND_SUFFIX}`;
+            if (count >= MAX_RETRIES) {
+                console.log(`${RED}⚠️ 错误: 容器启动超时（当前状态: ${status}）。${NC}`);
+                dockerExec(`${DOCKER_CMD} logs "${containerName}"`, { stdio: 'inherit' });
+                process.exit(1);
+            }
+        } catch (e) {
+            await sleep(100);
+            count++;
+            if (count >= MAX_RETRIES) {
+                console.log(`${RED}⚠️ 错误: 容器启动超时。${NC}`);
+                process.exit(1);
             }
         }
+    }
+}
 
-        get_hello_tip(CONTAINER_NAME, DEFAULT_COMMAND);
-        console.log(`${BLUE}----------------------------------------${NC}`);
-        console.log(`💻 执行命令: ${YELLOW}${EXEC_COMMAND || '交互式 Shell'}${NC}`);
+async function createNewContainer() {
+    console.log(`${CYAN}📦 manyoyo by xcanwin 正在创建新容器: ${YELLOW}${CONTAINER_NAME}${NC}\n`);
 
-        // Execute command in container
-        if (EXEC_COMMAND) {
-            spawnSync(`${DOCKER_CMD}`, ['exec', '-it', CONTAINER_NAME, '/bin/bash', '-c', EXEC_COMMAND], { stdio: 'inherit' });
-        } else {
-            spawnSync(`${DOCKER_CMD}`, ['exec', '-it', CONTAINER_NAME, '/bin/bash'], { stdio: 'inherit' });
-        }
+    EXEC_COMMAND = `${EXEC_COMMAND_PREFIX}${EXEC_COMMAND}${EXEC_COMMAND_SUFFIX}`;
+    const defaultCommand = EXEC_COMMAND;
 
-        // Post-exit prompt
-        console.log("");
-        get_hello_tip(CONTAINER_NAME, DEFAULT_COMMAND);
-
-        const reply = await askQuestion(`❔ 会话已结束。是否保留此后台容器 ${CONTAINER_NAME}? [ y=默认保留, n=删除, 1=首次命令进入, s=执行命令, i=交互式SHELL ]: `);
-        console.log("");
-
-        const firstChar = reply.trim().toLowerCase()[0];
-
-        if (firstChar === 'n') {
-            console.log(`${YELLOW}🗑️ 正在删除容器...${NC}`);
-            docker_exec(`${DOCKER_CMD} rm -f "${CONTAINER_NAME}"`, { stdio: 'pipe' });
-            console.log(`${GREEN}✅ 已彻底删除。${NC}`);
-        } else if (firstChar === '1') {
-            console.log(`${GREEN}✅ 离开当前连接，用首次命令进入。${NC}`);
-            // Reconstruct the command and execute recursively
-            const newArgs = ['-n', CONTAINER_NAME];
-            process.argv = [process.argv[0], process.argv[1], ...newArgs];
-            await main();
-        } else if (firstChar === 's') {
-            const command = await askQuestion('❔ 输入要执行的命令: ');
-            console.log(`${GREEN}✅ 离开当前连接，执行命令。${NC}`);
-            const newArgs = ['-n', CONTAINER_NAME, '-x', command];
-            process.argv = [process.argv[0], process.argv[1], ...newArgs];
-            await main();
-        } else if (firstChar === 'i') {
-            console.log(`${GREEN}✅ 离开当前连接，进入容器交互式SHELL。${NC}`);
-            const newArgs = ['-n', CONTAINER_NAME, '-x', '/bin/bash'];
-            process.argv = [process.argv[0], process.argv[1], ...newArgs];
-            await main();
-        } else {
-            console.log(`${GREEN}✅ 已退出连接。容器 ${CONTAINER_NAME} 仍在后台运行。${NC}`);
-        }
+    // Build docker run command
+    const fullImage = `${IMAGE_NAME}:${IMAGE_VERSION}`;
+    const envArgs = CONTAINER_ENVS.join(' ');
+    const volumeArgs = CONTAINER_VOLUMES.join(' ');
+    const contModeArg = CONT_MODE || '';
+
+    const dockerRunCmd = `${DOCKER_CMD} run -d --name "${CONTAINER_NAME}" --entrypoint "" ${contModeArg} ${envArgs} ${volumeArgs} --volume "${HOST_PATH}:${CONTAINER_PATH}" --workdir "${CONTAINER_PATH}" --label "manyoyo.default_cmd=${EXEC_COMMAND}" "${fullImage}" tail -f /dev/null`;
+
+    dockerExec(dockerRunCmd, { stdio: 'pipe' });
+
+    // Wait for container to be ready
+    await waitForContainerReady(CONTAINER_NAME);
+
+    return defaultCommand;
+}
+
+async function connectExistingContainer() {
+    console.log(`${CYAN}🔄 manyoyo by xcanwin 正在连接到现有容器: ${YELLOW}${CONTAINER_NAME}${NC}`);
+
+    // Start container if stopped
+    const status = getContainerStatus(CONTAINER_NAME);
+    if (status !== 'running') {
+        dockerExec(`${DOCKER_CMD} start "${CONTAINER_NAME}"`, { stdio: 'pipe' });
+    }
+
+    // Get default command from label
+    const defaultCommand = dockerExec(`${DOCKER_CMD} inspect -f '{{index .Config.Labels "manyoyo.default_cmd"}}' "${CONTAINER_NAME}"`).trim();
+
+    if (!EXEC_COMMAND) {
+        EXEC_COMMAND = `${EXEC_COMMAND_PREFIX}${defaultCommand}${EXEC_COMMAND_SUFFIX}`;
+    } else {
+        EXEC_COMMAND = `${EXEC_COMMAND_PREFIX}${EXEC_COMMAND}${EXEC_COMMAND_SUFFIX}`;
+    }
+
+    return defaultCommand;
+}
+
+async function setupContainer() {
+    if (!containerExists(CONTAINER_NAME)) {
+        return await createNewContainer();
+    } else {
+        return await connectExistingContainer();
+    }
+}
+
+function executeInContainer(defaultCommand) {
+    getHelloTip(CONTAINER_NAME, defaultCommand);
+    console.log(`${BLUE}----------------------------------------${NC}`);
+    console.log(`💻 执行命令: ${YELLOW}${EXEC_COMMAND || '交互式 Shell'}${NC}`);
+
+    // Execute command in container
+    if (EXEC_COMMAND) {
+        spawnSync(`${DOCKER_CMD}`, ['exec', '-it', CONTAINER_NAME, '/bin/bash', '-c', EXEC_COMMAND], { stdio: 'inherit' });
+    } else {
+        spawnSync(`${DOCKER_CMD}`, ['exec', '-it', CONTAINER_NAME, '/bin/bash'], { stdio: 'inherit' });
+    }
+}
+
+async function handlePostExit(defaultCommand) {
+    console.log("");
+    getHelloTip(CONTAINER_NAME, defaultCommand);
+
+    const reply = await askQuestion(`❔ 会话已结束。是否保留此后台容器 ${CONTAINER_NAME}? [ y=默认保留, n=删除, 1=首次命令进入, s=执行命令, i=交互式SHELL ]: `);
+    console.log("");
+
+    const firstChar = reply.trim().toLowerCase()[0];
+
+    if (firstChar === 'n') {
+        removeContainer(CONTAINER_NAME);
+    } else if (firstChar === '1') {
+        console.log(`${GREEN}✅ 离开当前连接，用首次命令进入。${NC}`);
+        // Reset command variables to use default command
+        EXEC_COMMAND = "";
+        EXEC_COMMAND_PREFIX = "";
+        EXEC_COMMAND_SUFFIX = "";
+        const newArgs = ['-n', CONTAINER_NAME];
+        process.argv = [process.argv[0], process.argv[1], ...newArgs];
+        await main();
+    } else if (firstChar === 's') {
+        const command = await askQuestion('❔ 输入要执行的命令: ');
+        console.log(`${GREEN}✅ 离开当前连接，执行命令。${NC}`);
+        const newArgs = ['-n', CONTAINER_NAME, '-x', command];
+        process.argv = [process.argv[0], process.argv[1], ...newArgs];
+        await main();
+    } else if (firstChar === 'i') {
+        console.log(`${GREEN}✅ 离开当前连接，进入容器交互式SHELL。${NC}`);
+        const newArgs = ['-n', CONTAINER_NAME, '-x', '/bin/bash'];
+        process.argv = [process.argv[0], process.argv[1], ...newArgs];
+        await main();
+    } else {
+        console.log(`${GREEN}✅ 已退出连接。容器 ${CONTAINER_NAME} 仍在后台运行。${NC}`);
+    }
+}
+
+// ==============================================================================
+// Main Function
+// ==============================================================================
+
+async function main() {
+    try {
+        // 1. Validate and initialize
+        validateAndInitialize();
+
+        // 2. Parse command-line arguments
+        parseArguments(process.argv);
+
+        // 3. Handle remove container operation
+        handleRemoveContainer();
+
+        // 4. Validate host path safety
+        validateHostPath();
+
+        // 5. Setup container (create or connect)
+        const defaultCommand = await setupContainer();
+
+        // 6. Execute command in container
+        executeInContainer(defaultCommand);
+
+        // 7. Handle post-exit interactions
+        await handlePostExit(defaultCommand);
 
     } catch (e) {
         console.error(`${RED}Error: ${e.message}${NC}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xcanwin/manyoyo",
-  "version": "2.2.1",
+  "version": "3.0.0",
   "description": "AI Agent CLI Security Sandbox",
   "keywords": [
     "ai", "agent", "sandbox", "docker", "cli", "container", "development"