@lark-apaas/miaoda-cli 0.1.18 → 0.1.19

package/dist/cli/commands/app/index.js

@@ -198,7 +198,7 @@ function registerAppInit(parent) {
 异步安装（--async-install）
   跳过同步 npm install，派发一个 detached 后台进程装依赖后立即返回。
   .spark/meta.json 在返回前写出（= 脚手架就绪），install 真实结果由 event marker 表达。
-  仅沙箱（SANDBOX_ID 非空）写 marker（presence 定成败，content 给排障）：
+  仅沙箱（MIAODA_DEP_CACHE_DIR 非空）写 marker（presence 定成败，content 给排障）：
     成功 → /tmp/event/WORKSPACE_READY
     失败 → /tmp/event/WORKSPACE_FAILED
   安装日志：/tmp/async_install_dep.std.log

package/dist/cli/handlers/app/init.js

@@ -11,6 +11,7 @@ const coding_steering_1 = require("../../../utils/coding-steering");
 const logger_1 = require("../../../utils/logger");
 const githooks_1 = require("../../../utils/githooks");
 const logs_dir_1 = require("../../../utils/logs-dir");
+const env_1 = require("../../../utils/env");
 const error_1 = require("../../../utils/error");
 const output_1 = require("../../../utils/output");
 /**
@@ -72,12 +73,12 @@ async function handleAppInit(opts) {
     (0, logs_dir_1.ensureLogsDir)(targetDir);
     // skills 同步软失败：拉不到 coding-steering 包不该阻断 writeSparkMeta /
     // activateGitHooks（之前会让 .spark/meta.json 没写，下次 init 半渲染状态又得重跑全套）。
-    // 按运行环境（SANDBOX_ID）分流 outputLayout，不绑 stack:
-    //   - 沙箱内（SANDBOX_ID 非空）→ nested (.agent/skills/steering/<stack>/skills/),
+    // 按运行环境（isSandboxEnv：MIAODA_DEP_CACHE_DIR 非空）分流 outputLayout，不绑 stack:
+    //   - 沙箱内 → nested (.agent/skills/steering/<stack>/skills/),
     //     跟沙箱端 update-skills.sh 链路对齐
-    //   - 本地（SANDBOX_ID 空）→ flat (.agents/skills + .claude/skills 软链),
+    //   - 本地 → flat (.agents/skills + .claude/skills 软链),
     //     Agent / Claude Code 用同一份;nrf 在本地是主战场,vite-react 等也一样适用
-    const outputLayout = process.env.SANDBOX_ID !== undefined && process.env.SANDBOX_ID !== '' ? 'nested' : 'flat';
+    const outputLayout = (0, env_1.isSandboxEnv)() ? 'nested' : 'flat';
     let steeringResult;
     let steeringError;
     try {

package/dist/cli/handlers/app/migrate.js

@@ -14,6 +14,7 @@ const migrate_rule_1 = require("../../../utils/migrate-rule");
 const spark_meta_1 = require("../../../utils/spark-meta");
 const error_1 = require("../../../utils/error");
 const output_1 = require("../../../utils/output");
+const env_1 = require("../../../utils/env");
 const logger_1 = require("../../../utils/logger");
 /**
  * miaoda app migrate --to <stack> [--from <stack>] [--dir <path>]
@@ -138,14 +139,12 @@ async function handleAppMigrate(opts) {
     // 跑的 node 进程仍按老逻辑工作(只起 vite,没起 nest),整体没切到 fullstack 模式。
     // 通过 pkill 杀掉 dev.js 主进程,依赖沙箱平台 supervisor 自动重新 exec dev.sh → dev.js,
     // 新进程用新 deps + 新 scripts,正常进入 fullstack 模式。
-    //   - 只在 SANDBOX_ID 非空时做(本地环境用户进程混杂,主动 pkill 风险大)
+    //   - 只在沙箱内做(isSandboxEnv;本地环境用户进程混杂,主动 pkill 风险大)
     //   - install 挂了不做 —— 新依赖不全, 杀旧 dev 后新 dev 起不来反而更糟,
     //     留着旧进程让用户先处理 installError
     //   - 软失败:pkill 无匹配进程退出 1,catch 吞掉
     let devRestarted = false;
-    if (installError === undefined &&
-        process.env.SANDBOX_ID !== undefined &&
-        process.env.SANDBOX_ID !== '') {
+    if (installError === undefined && (0, env_1.isSandboxEnv)()) {
         (0, logger_1.log)('migrate', '沙箱环境,重启 dev process(平台 supervisor 会自动拉起)...');
         try {
             (0, node_child_process_1.execFileSync)('pkill', ['-f', 'node.*scripts/dev\\.js'], { stdio: 'ignore' });
@@ -170,7 +169,7 @@ async function handleAppMigrate(opts) {
             followLatestPackages: followLatest,
             installError,
             devRestarted,
-            nextActions: process.env.SANDBOX_ID !== undefined && process.env.SANDBOX_ID !== ''
+            nextActions: (0, env_1.isSandboxEnv)()
                 ? [
                     'git status / git diff 评估改动并 commit',
                     'miaoda skills sync 同步到新 stack 的 agent skills',

package/dist/services/app/init/async-install.js

@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ASYNC_INSTALL_LOG = void 0;
-exports.isSandboxEnv = isSandboxEnv;
 exports.runAsyncInstallWorker = runAsyncInstallWorker;
 exports.dispatchAsyncInstall = dispatchAsyncInstall;
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
+const env_1 = require("../../../utils/env");
 const install_1 = require("./install");
 /** event marker 目录，写死；写前 mkdir -p。沙箱里 code server 轮询此目录。 */
 const EVENT_DIR = '/tmp/event';
@@ -19,10 +19,6 @@ const MARKER_READY = 'WORKSPACE_READY';
 const MARKER_FAILED = 'WORKSPACE_FAILED';
 /** 后台 worker stdout/stderr 落盘路径 */
 exports.ASYNC_INSTALL_LOG = '/tmp/async_install_dep.std.log';
-/** 沙箱判定：SANDBOX_ID 非空。与 init handler 的 outputLayout 分流口径一致。 */
-function isSandboxEnv() {
-    return process.env.SANDBOX_ID !== undefined && process.env.SANDBOX_ID !== '';
-}
 function nowIso() {
     return new Date().toISOString();
 }
@@ -44,7 +40,7 @@ function writeMarker(eventDir, name, content) {
  */
 function runAsyncInstallWorker(opts) {
     const eventDir = opts.eventDir ?? EVENT_DIR;
-    const sandbox = isSandboxEnv();
+    const sandbox = (0, env_1.isSandboxEnv)();
     if (sandbox)
         clearStaleMarkers(eventDir);
     const start = Date.now();
@@ -89,7 +85,7 @@ function runAsyncInstallWorker(opts) {
 function dispatchAsyncInstall(opts) {
     const eventDir = opts.eventDir ?? EVENT_DIR;
     const logPath = opts.logPath ?? exports.ASYNC_INSTALL_LOG;
-    const sandbox = isSandboxEnv();
+    const sandbox = (0, env_1.isSandboxEnv)();
     if (sandbox)
         clearStaleMarkers(eventDir);
     // targetDir 走 argv 传，不拼进代码串（免转义）；只把本模块路径 JSON 内联进去。

package/dist/services/app/init/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ASYNC_INSTALL_LOG = exports.isSandboxEnv = exports.runAsyncInstallWorker = exports.dispatchAsyncInstall = exports.resolveNpmInstallRegistry = exports.installDependencies = exports.writeSparkMeta = exports.readSparkMeta = exports.TEMPLATE_PACKAGE_BY_STACK = exports.SUPPORTED_STACKS = exports.renderTemplate = void 0;
+exports.ASYNC_INSTALL_LOG = exports.runAsyncInstallWorker = exports.dispatchAsyncInstall = exports.resolveNpmInstallRegistry = exports.installDependencies = exports.writeSparkMeta = exports.readSparkMeta = exports.TEMPLATE_PACKAGE_BY_STACK = exports.SUPPORTED_STACKS = exports.renderTemplate = void 0;
 var template_1 = require("./template");
 Object.defineProperty(exports, "renderTemplate", { enumerable: true, get: function () { return template_1.renderTemplate; } });
 Object.defineProperty(exports, "SUPPORTED_STACKS", { enumerable: true, get: function () { return template_1.SUPPORTED_STACKS; } });
@@ -14,5 +14,4 @@ Object.defineProperty(exports, "resolveNpmInstallRegistry", { enumerable: true,
 var async_install_1 = require("./async-install");
 Object.defineProperty(exports, "dispatchAsyncInstall", { enumerable: true, get: function () { return async_install_1.dispatchAsyncInstall; } });
 Object.defineProperty(exports, "runAsyncInstallWorker", { enumerable: true, get: function () { return async_install_1.runAsyncInstallWorker; } });
-Object.defineProperty(exports, "isSandboxEnv", { enumerable: true, get: function () { return async_install_1.isSandboxEnv; } });
 Object.defineProperty(exports, "ASYNC_INSTALL_LOG", { enumerable: true, get: function () { return async_install_1.ASYNC_INSTALL_LOG; } });

package/dist/utils/coding-steering.js

@@ -8,10 +8,11 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const npm_pack_1 = require("../utils/npm-pack");
 const logger_1 = require("../utils/logger");
+const env_1 = require("../utils/env");
 const STEERING_PACKAGE = '@lark-apaas/coding-steering';
 function inferMode() {
-    // process.env.SANDBOX_ID 非空 → 沙箱；其他（undefined / 空串）→ 本地
-    return process.env.SANDBOX_ID ? 'sandbox' : 'local';
+    // 沙箱（MIAODA_DEP_CACHE_DIR 非空）→ sandbox；本地 → local
+    return (0, env_1.isSandboxEnv)() ? 'sandbox' : 'local';
 }
 /**
  * 把 coding-steering 包内 <stack>/skills_common + 专有层（skills 或 skills_local）同步到
@@ -19,7 +20,7 @@ function inferMode() {
  *
  * 包内目录约定（每个 stack 三层）：
  *   <stack>/skills_common  → 沙箱 + 本地都下发的共有层
- *   <stack>/skills         → 沙箱专有（沙箱端 update-skills.sh / SANDBOX_ID 非空时拿）
+ *   <stack>/skills         → 沙箱专有（沙箱端 update-skills.sh / mode=sandbox 时拿）
  *   <stack>/skills_local   → 本地专有（本地 dev / agent 环境拿）
  *
  * 下发组合（mode）：
@@ -31,8 +32,8 @@ function inferMode() {
  *   'flat'：拷到 .agents/skills/（平铺），tech.md → .agents/tech.md，并创建 .claude/skills
  *           软链指向 ../.agents/skills 让 Claude Code 识别同一份
  *
- * 同名 skill 覆盖顺序：common < 专有（专有覆盖 common 同名）。mode 缺省按 SANDBOX_ID env
- * 推断（沙箱平台运行时注入应用所属沙箱 ID；空 / undefined 则视为本地）。
+ * 同名 skill 覆盖顺序：common < 专有（专有覆盖 common 同名）。mode 缺省按 isSandboxEnv()
+ * 推断（MIAODA_DEP_CACHE_DIR 非空 → sandbox；空 / undefined → local）。
  *
  * 纯本地 atom（pull npm package + 拷贝文件），不属于任何 cli 域；放在 utils 让
  * app init handler 与独立 skills sync handler 都能复用。

package/dist/utils/env.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSandboxEnv = isSandboxEnv;
+/**
+ * 运行环境判定：当前进程是否跑在妙搭沙箱里。
+ *
+ * 口径：`process.env.MIAODA_DEP_CACHE_DIR` 非空（既非 undefined 也非空串）即为沙箱。
+ * 沙箱平台运行时会给应用进程注入依赖缓存目录；本地 dev / agent 环境拿不到该变量。
+ *
+ * 历史上用 `SANDBOX_ID` 判断，但该变量在部分沙箱场景下并不会注入，判断不可靠，已换成
+ * `MIAODA_DEP_CACHE_DIR`。注意：下发给 user app 的 `scripts/dev.sh` 仍按 `SANDBOX_ID`
+ * 判断（独立 bash 链路，不复用本函数）。
+ *
+ * 这是 CLI 运行时沙箱判定的 SSOT —— init outputLayout 分流、migrate 重启 dev process、
+ * coding-steering 同步 mode 推断、async-install 写 marker 都走这里，别再各处内联读环境变量。
+ */
+function isSandboxEnv() {
+    return process.env.MIAODA_DEP_CACHE_DIR !== undefined && process.env.MIAODA_DEP_CACHE_DIR !== '';
+}

package/dist/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pollUntilDone = exports.msToSec = exports.msToNs = exports.parseToSec = exports.parseToNs = exports.parseToMs = exports.parseTimeToMs = exports.getInnerApi = exports.postInnerApi = exports.setRuntimeHttpClient = exports.setHttpClient = exports.resetHttpClient = exports.getRuntimeHttpClient = exports.getHttpClient = exports.log = exports.debug = exports.fmt = exports.isJsonMode = exports.emitPaged = exports.emitOk = exports.emitError = exports.emit = exports.getLogId = exports.generateLogId = exports.initConfigFromOpts = exports.resetConfig = exports.setConfig = exports.getConfig = exports.HttpError = exports.AppError = void 0;
+exports.pollUntilDone = exports.msToSec = exports.msToNs = exports.parseToSec = exports.parseToNs = exports.parseToMs = exports.parseTimeToMs = exports.isSandboxEnv = exports.getInnerApi = exports.postInnerApi = exports.setRuntimeHttpClient = exports.setHttpClient = exports.resetHttpClient = exports.getRuntimeHttpClient = exports.getHttpClient = exports.log = exports.debug = exports.fmt = exports.isJsonMode = exports.emitPaged = exports.emitOk = exports.emitError = exports.emit = exports.getLogId = exports.generateLogId = exports.initConfigFromOpts = exports.resetConfig = exports.setConfig = exports.getConfig = exports.HttpError = exports.AppError = void 0;
 var error_1 = require("./error");
 Object.defineProperty(exports, "AppError", { enumerable: true, get: function () { return error_1.AppError; } });
 Object.defineProperty(exports, "HttpError", { enumerable: true, get: function () { return error_1.HttpError; } });
@@ -30,6 +30,8 @@ Object.defineProperty(exports, "setHttpClient", { enumerable: true, get: functio
 Object.defineProperty(exports, "setRuntimeHttpClient", { enumerable: true, get: function () { return http_1.setRuntimeHttpClient; } });
 Object.defineProperty(exports, "postInnerApi", { enumerable: true, get: function () { return http_1.postInnerApi; } });
 Object.defineProperty(exports, "getInnerApi", { enumerable: true, get: function () { return http_1.getInnerApi; } });
+var env_1 = require("./env");
+Object.defineProperty(exports, "isSandboxEnv", { enumerable: true, get: function () { return env_1.isSandboxEnv; } });
 var time_1 = require("./time");
 Object.defineProperty(exports, "parseTimeToMs", { enumerable: true, get: function () { return time_1.parseTimeToMs; } });
 Object.defineProperty(exports, "parseToMs", { enumerable: true, get: function () { return time_1.parseToMs; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/miaoda-cli",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "Miaoda 平台命令行工具，面向 Agent 调用",
   "type": "commonjs",
   "bin": {