@tcb-sandbox/cli 0.3.7 → 0.3.9

package/dist/serve.js

@@ -3,6 +3,7 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import { spawnSandboxed } from "./sandbox.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 function readJsonVersion(pkgPath) {
     try {
@@ -125,7 +126,7 @@ export function defaultWorkspaceRoot() {
     return path.join(os.homedir(), ".tcb-sandbox", "workspaces");
 }
 const MOTD_ASCII = "\n    ____ _                 _ ____\n   / ___| | ___  _   _  __| | __ )  __ _ ___  ___\n  | |   | |/ _ \\| | | |/ _` |  _ \\ / _` / __|/ _ \\\n  | |___| | (_) | |_| | (_| | |_) | (_| \\__ \\  __/\n   \\____|_|\\___/ \\__,_|\\__,_|____/ \\__,_|___/\\___|\n     Remote Workspace\n";
-export function printServeBanner(opts, trwMain) {
+export function printServeBanner(opts, trwMain, sandboxStatus) {
     const trwVer = trwPackageVersion(trwMain);
     const cliVer = cliPackageVersion();
     const displayHost = opts.host === "0.0.0.0" ? "127.0.0.1" : opts.host;
@@ -138,9 +139,13 @@ export function printServeBanner(opts, trwMain) {
     lines.push(MOTD_ASCII.replace(/^\n/, "").replace(/\n$/, ""));
     lines.push("");
     lines.push(`  ${S.dim("Listen   :")} ${base}`);
-    lines.push(`  ${S.dim("Session  :")} ${S.bold("X-Cloudbase-Session-Id")} ${S.dim("（示例 test-03271546 → 子目录 test-03271546）")}`);
+    lines.push(`  ${S.dim("Session  :")} ${S.bold("X-Cloudbase-Session-Id")} ${S.dim("（不传时默认 default；示例 test-03271546 → 子目录 test-03271546）")}`);
     lines.push(`  ${S.dim("Workspace:")} ${wsRoot}${path.sep}${S.dim("<session-id>")}`);
     lines.push(`  ${S.dim("Disk     :")} ${disk}`);
+    if (sandboxStatus) {
+        const sandboxColor = sandboxStatus.startsWith("active") ? S.green : S.yellow;
+        lines.push(`  ${S.dim("Sandbox  :")} ${sandboxColor(sandboxStatus)}`);
+    }
     lines.push(`  ${S.dim("Runtime  :")} Node ${nodeVer} · Bun ${bunVersion()} · Python ${pythonVersion()}`);
     lines.push(`  ${S.dim("Versions :")} TCB ${trwVer} · CLI ${cliVer}`);
     lines.push("");
@@ -154,44 +159,138 @@ export function printServeBanner(opts, trwMain) {
     lines.push(`    ${S.cyan("skills")}               AI 技能管理${S.dim("（add / list / find）")}`);
     lines.push(`    ${S.cyan("tmux")}                 多窗口${S.dim("（Ctrl-b c 新建 · Ctrl-b % 分屏）")}`);
     lines.push("");
-    lines.push(`  ${S.yellow("▸")} ${S.bold("须知")} ${S.dim("（本机 serve，非 SCF 容器）")}`);
-    lines.push(`    ${S.dim("·")} 默认无鉴权；默认仅监听回环，${S.bold("--host 0.0.0.0")} 会暴露到网络，请自行评估风险`);
-    lines.push(`    ${S.dim("·")} ${S.bold("Ctrl+C")} 停止本进程；无容器冻结 / TTL / 唤醒策略`);
-    lines.push(`    ${S.dim("·")} 若系统 Python 受 PEP 668 限制，用 ${S.bold("uv")} ${S.dim("(推荐)")} 或 ${S.bold("python3 -m venv")}`);
-    lines.push(`    ${S.dim("·")} 各 session 工作区在 ${S.bold(wsRoot + path.sep + "<session-id>")} 下；工具侧路径策略与 tcb-remote-workspace 一致`);
-    lines.push(`    ${S.dim("·")} 长时间任务优先 ${S.bold("tmux")} 或 ${S.bold("tcb-sandbox pty")}；子进程分离 ${S.bold("(cmd > log 2>&1 &)")} 仍可能随会话结束被清理`);
-    lines.push("");
     process.stdout.write(lines.join("\n"));
 }
-export function runServe(opts) {
-    const trwMain = resolveTcbEmbeddedMain();
-    fs.mkdirSync(opts.workspaceRoot, { recursive: true });
-    printServeBanner(opts, trwMain);
-    const child = spawn(process.execPath, [trwMain], {
-        stdio: "inherit",
-        env: {
-            ...process.env,
-            HOST: opts.host,
-            PORT: String(opts.port),
-            WORKSPACE_ROOT: opts.workspaceRoot,
-        },
-    });
-    const forward = (sig) => {
+async function waitForReady(host, port, timeoutMs) {
+    const base = `http://${host === "0.0.0.0" ? "127.0.0.1" : host}:${port}`;
+    const deadline = Date.now() + timeoutMs;
+    const interval = 300;
+    while (Date.now() < deadline) {
         try {
-            child.kill(sig);
+            const res = await fetch(`${base}/health`, { signal: AbortSignal.timeout(2000) });
+            if (res.ok)
+                return true;
         }
         catch {
         }
+        await new Promise((r) => setTimeout(r, interval));
+    }
+    return false;
+}
+async function isPortInUse(host, port) {
+    const net = await import("node:net");
+    return new Promise((resolve) => {
+        const server = net.createServer();
+        server.once("error", (err) => {
+            resolve(err.code === "EADDRINUSE");
+        });
+        server.once("listening", () => {
+            server.close(() => resolve(false));
+        });
+        server.listen(port, host);
+    });
+}
+const SHUTDOWN_TIMEOUT_MS = 10_000;
+const MAX_RESTART_COUNT = 3;
+const MIN_UPTIME_FOR_HEALTHY_MS = 5_000;
+function ensureMcporterConfig(workspaceRoot) {
+    const mcporterDir = path.join(os.homedir(), ".mcporter");
+    const configPath = path.join(mcporterDir, "mcporter.json");
+    if (fs.existsSync(configPath))
+        return;
+    fs.mkdirSync(mcporterDir, { recursive: true });
+    const envId = process.env.CLOUDBASE_ENV_ID ?? "";
+    const mcpBin = process.env.CLOUDBASE_MCP_BIN ?? "";
+    const servers = {};
+    if (envId && mcpBin) {
+        servers.cloudbase = {
+            command: "node",
+            args: [mcpBin],
+            env: {
+                CLOUDBASE_ENV_ID: envId,
+                TENCENTCLOUD_SECRETID: process.env.TENCENTCLOUD_SECRETID ?? "",
+                TENCENTCLOUD_SECRETKEY: process.env.TENCENTCLOUD_SECRETKEY ?? "",
+                TENCENTCLOUD_SESSIONTOKEN: process.env.TENCENTCLOUD_SESSIONTOKEN ?? "",
+                INTEGRATION_IDE: process.env.INTEGRATION_IDE ?? "codebuddy",
+                WORKSPACE_FOLDER_PATHS: process.env.WORKSPACE_FOLDER_PATHS ?? "",
+            },
+        };
+    }
+    fs.writeFileSync(configPath, JSON.stringify({ mcpServers: servers }, null, 2), "utf8");
+}
+function spawnTrw(trwMain, env, workspaceRoot) {
+    if (process.platform === "darwin") {
+        const result = spawnSandboxed(trwMain, env, workspaceRoot);
+        return { child: result.child, sandboxStatus: result.status };
+    }
+    const child = spawn(process.execPath, [trwMain], { stdio: "inherit", env });
+    return { child, sandboxStatus: `skipped (${process.platform})` };
+}
+export async function runServe(opts) {
+    const trwMain = resolveTcbEmbeddedMain();
+    fs.mkdirSync(opts.workspaceRoot, { recursive: true });
+    ensureMcporterConfig(opts.workspaceRoot);
+    if (await isPortInUse(opts.host, opts.port)) {
+        process.stderr.write(`[serve] Port ${opts.port} is already in use on ${opts.host}. Try --port ${opts.port + 1}\n`);
+        return Promise.reject(new Error(`Port ${opts.port} is already in use`));
+    }
+    const env = {
+        ...process.env,
+        HOST: opts.host,
+        PORT: String(opts.port),
+        WORKSPACE_ROOT: opts.workspaceRoot,
     };
-    process.on("SIGINT", () => forward("SIGINT"));
-    process.on("SIGTERM", () => forward("SIGTERM"));
+    let shutdownRequested = false;
+    let restartCount = 0;
+    let bannerPrinted = false;
     return new Promise((resolve, reject) => {
-        child.on("error", reject);
-        child.on("close", (code, signal) => {
-            if (signal)
-                resolve(code);
-            else
+        function startChild() {
+            const { child, sandboxStatus } = spawnTrw(trwMain, env, opts.workspaceRoot);
+            const startedAt = Date.now();
+            if (!bannerPrinted) {
+                waitForReady(opts.host, opts.port, 30_000).then((ready) => {
+                    bannerPrinted = true;
+                    printServeBanner(opts, trwMain, sandboxStatus);
+                    if (!ready) {
+                        process.stderr.write("[serve] WARNING: TRW did not become ready within 30s. Service may not be healthy.\n");
+                    }
+                });
+            }
+            const forward = (sig) => {
+                shutdownRequested = true;
+                try {
+                    child.kill(sig);
+                }
+                catch {
+                }
+                setTimeout(() => {
+                    process.stderr.write(`[serve] TRW did not exit within ${SHUTDOWN_TIMEOUT_MS / 1000}s after ${sig}, forcing exit.\n`);
+                    process.exit(1);
+                }, SHUTDOWN_TIMEOUT_MS).unref();
+            };
+            process.removeAllListeners("SIGINT");
+            process.removeAllListeners("SIGTERM");
+            process.on("SIGINT", () => forward("SIGINT"));
+            process.on("SIGTERM", () => forward("SIGTERM"));
+            child.on("error", reject);
+            child.on("close", (code, _signal) => {
+                if (shutdownRequested) {
+                    resolve(code);
+                    return;
+                }
+                const uptime = Date.now() - startedAt;
+                if (code !== 0 && restartCount < MAX_RESTART_COUNT && uptime >= MIN_UPTIME_FOR_HEALTHY_MS) {
+                    restartCount++;
+                    process.stderr.write(`[serve] TRW exited with code ${code} after ${Math.round(uptime / 1000)}s. Restarting (${restartCount}/${MAX_RESTART_COUNT})...\n`);
+                    startChild();
+                    return;
+                }
+                if (code !== 0 && restartCount >= MAX_RESTART_COUNT) {
+                    process.stderr.write(`[serve] TRW crashed ${MAX_RESTART_COUNT} times. Giving up.\n`);
+                }
                 resolve(code);
-        });
+            });
+        }
+        startChild();
     });
 }