@lark-apaas/fullstack-cli 1.1.48 → 1.1.49-alpha.0

package/dist/index.js

@@ -2370,8 +2370,9 @@ import fs7 from "fs";
 import { fileURLToPath as fileURLToPath3 } from "url";
 
 // src/config/sync.ts
-function buildDefaultRules(opts) {
-  const rules = [
+var syncConfig = {
+  // 派生规则
+  sync: [
     // 1. 派生 scripts 目录（总是覆盖；递归同步，包含 scripts/hooks/run-precommit.js）
     {
       from: "templates/scripts",
@@ -2434,13 +2435,23 @@ function buildDefaultRules(opts) {
       to: ".gitignore",
       pattern: "package-lock.json"
     },
-    // 5. 注册 postinstall 脚本，自动恢复 action plugins
+    // 5. 注册 postinstall 脚本，自动恢复 action plugins。
+    //    用 npx -y 形式而不是裸 `fullstack-cli`：用户项目的 deps 没有 fullstack-cli，
+    //    bare 形式在新机器（PATH 没全局 fullstack-cli）下 npm i 立即 ENOENT。
     {
       type: "add-script",
       name: "postinstall",
-      command: "fullstack-cli action-plugin init",
+      command: "npx -y @lark-apaas/fullstack-cli action-plugin init",
       overwrite: false
     },
+    // 5a. 迁移已有应用的老形式 postinstall（裸 fullstack-cli → npx -y）。
+    //     patch-script 只在脚本以指定前缀开头时改写，用户真正手改过的脚本保持原样。
+    {
+      type: "patch-script",
+      name: "postinstall",
+      to: "npx -y @lark-apaas/fullstack-cli action-plugin init",
+      ifStartsWith: "fullstack-cli action-plugin init"
+    },
     // 6. 替换 drizzle.config.ts（仅当文件存在时）
     {
       from: "templates/drizzle.config.ts",
@@ -2469,49 +2480,42 @@ function buildDefaultRules(opts) {
       name: "lint",
       to: "node ./scripts/lint.js",
       ifStartsWith: "concurrently "
+    },
+    // 10. 把老 `npm run upgrade && ./scripts/dev.sh` 形式迁移到 `./scripts/dev.sh`，
+    //     让本地 `npm run dev` 不再前置跑 fullstack-cli sync。新版 dev.sh 按 SANDBOX_ID 是否非空
+    //     判分支：沙箱直接 exec dev.js（脚本同步由平台 pod 启动时做过，dev 入口不再 upgrade）；
+    //     本地走 miaoda app upgrade 兜底 + dev-local.sh。
+    {
+      type: "patch-script",
+      name: "dev",
+      to: "./scripts/dev.sh",
+      ifStartsWith: "npm run upgrade && "
+    },
+    // 11. 把 `upgrade` 脚本里裸 `fullstack-cli sync` 改成 `npx -y @lark-apaas/fullstack-cli sync`。
+    //     跟 postinstall 同款根因：fullstack-cli 不是用户应用的 dep，新机器无全局命令会 ENOENT。
+    {
+      type: "patch-script",
+      name: "upgrade",
+      to: "npx -y @lark-apaas/fullstack-cli sync --disable-gen-openapi",
+      ifStartsWith: "fullstack-cli sync"
     }
-  ];
-  if (!opts.disableGenOpenapi) {
-    rules.push({
+  ],
+  // 文件权限设置
+  permissions: {
+    // 所有 .sh 文件设置为可执行
+    // '**/*.sh': 0o755,
+  }
+};
+function genSyncConfig(perms = {}) {
+  if (!perms.disableGenOpenapi) {
+    syncConfig.sync.push({
       from: "templates/helper/gen-openapi.ts",
       to: "scripts/gen-openapi.ts",
       type: "file",
       overwrite: true
     });
   }
-  return rules;
-}
-function defaultProfile(opts) {
-  return {
-    sync: buildDefaultRules(opts),
-    // 文件权限设置（所有 .sh 文件设置为可执行：'**/*.sh': 0o755）
-    permissions: {},
-    activateGitHooks: true
-  };
-}
-function emptyProfile() {
-  return {
-    sync: [],
-    permissions: {},
-    activateGitHooks: false
-  };
-}
-function viteReactProfile() {
-  return {
-    sync: [],
-    permissions: {},
-    activateGitHooks: true
-  };
-}
-var SYNC_PROFILES = {
-  "design-stack": defaultProfile,
-  "nestjs-react-fullstack": defaultProfile,
-  "vite-react": viteReactProfile,
-  html: emptyProfile
-};
-function genSyncConfig(stack, opts = {}) {
-  const factory = stack && SYNC_PROFILES[stack] || defaultProfile;
-  return factory(opts);
+  return syncConfig;
 }
 
 // src/utils/file-ops.ts
@@ -2636,10 +2640,9 @@ async function run2(options) {
     console.log("[fullstack-cli] Skip syncing (not a valid npm project)");
     process.exit(0);
   }
-  const stack = resolveStack(userProjectRoot);
   try {
-    console.log(`[fullstack-cli] Starting sync${stack ? ` (stack: ${stack})` : ""}...`);
-    const config = genSyncConfig(stack, {
+    console.log("[fullstack-cli] Starting sync...");
+    const config = genSyncConfig({
       disableGenOpenapi: options.disableGenOpenapi ?? false
     });
     if (!config || !config.sync) {
@@ -2652,13 +2655,11 @@ async function run2(options) {
     if (config.permissions) {
       setPermissions(config.permissions, userProjectRoot);
     }
-    if (config.activateGitHooks !== false) {
-      try {
-        activateGitHooks(userProjectRoot);
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.warn(`[fullstack-cli] \u26A0 Failed to activate git hooks: ${message}`);
-      }
+    try {
+      activateGitHooks(userProjectRoot);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      console.warn(`[fullstack-cli] \u26A0 Failed to activate git hooks: ${message}`);
     }
     console.log("[fullstack-cli] Sync completed successfully \u2705");
   } catch (error) {
@@ -2667,20 +2668,6 @@ async function run2(options) {
     process.exit(1);
   }
 }
-function resolveStack(userProjectRoot) {
-  const sparkMetaPath = path5.join(userProjectRoot, ".spark", "meta.json");
-  if (!fs7.existsSync(sparkMetaPath)) {
-    return void 0;
-  }
-  try {
-    const meta = JSON.parse(fs7.readFileSync(sparkMetaPath, "utf-8"));
-    return typeof meta.stack === "string" ? meta.stack : void 0;
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    console.warn(`[fullstack-cli] \u26A0 Failed to read .spark/meta.json, fallback to default sync: ${message}`);
-    return void 0;
-  }
-}
 async function syncRule(rule, pluginRoot, userProjectRoot) {
   if (rule.type === "delete-file" || rule.type === "delete-directory") {
     const destPath2 = path5.join(userProjectRoot, rule.to);
@@ -3170,9 +3157,9 @@ function getCliVersion() {
 
 // src/commands/upgrade/get-upgrade-files.ts
 function getUpgradeFilesToStage(disableGenOpenapi = true) {
-  const syncConfig = genSyncConfig(void 0, { disableGenOpenapi });
+  const syncConfig2 = genSyncConfig({ disableGenOpenapi });
   const filesToStage = /* @__PURE__ */ new Set();
-  syncConfig.sync.forEach((rule) => {
+  syncConfig2.sync.forEach((rule) => {
     if (rule.type === "file" || rule.type === "directory" || rule.type === "merge-json") {
       filesToStage.add(rule.to);
     } else if (rule.type === "remove-line" || rule.type === "add-line") {
@@ -4495,15 +4482,10 @@ import fs15 from "fs";
 import { createRequire as createRequire2 } from "module";
 import path13 from "path";
 var CAPABILITIES_DIR = "server/capabilities";
-var SHARED_CAPABILITIES_DIR = "shared/capabilities";
 function getProjectRoot2() {
   return process.cwd();
 }
 function getCapabilitiesDir() {
-  const sharedDir = path13.join(getProjectRoot2(), SHARED_CAPABILITIES_DIR);
-  if (fs15.existsSync(sharedDir)) {
-    return sharedDir;
-  }
   return path13.join(getProjectRoot2(), CAPABILITIES_DIR);
 }
 function getCapabilityPath(id) {
@@ -4678,7 +4660,7 @@ function logError(message) {
 async function list2(options) {
   try {
     if (!capabilitiesDirExists()) {
-      logError("capabilities directory not found (looked for shared/capabilities and server/capabilities)");
+      logError("server/capabilities directory not found");
       process.exit(1);
     }
     if (options.id) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.48",
+  "version": "1.1.49-alpha.0",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",
@@ -31,7 +31,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@lark-apaas/http-client": "^0.1.6",
+    "@lark-apaas/http-client": "0.1.7-alpha.8",
     "@lydell/node-pty": "1.1.0",
     "@vercel/nft": "^0.30.3",
     "commander": "^13.0.0",

package/templates/scripts/dev.sh

@@ -1,2 +1,29 @@
 #!/usr/bin/env bash
-exec node "$(dirname "$0")/dev.js" "$@"
+# `npm run dev` 入口；按 SANDBOX_ID 是否非空判断运行环境：
+#   - SANDBOX_ID 非空（沙箱平台注入应用所属沙箱 ID）→ 直接跑 dev.js
+#       （保活 / restart loop / 文件日志 —— 沙箱生产形态）。脚本同步由平台 pod 启动阶段做过，
+#       dev 入口不再额外 `npm run upgrade`。
+#   - 否则（本地）→ 走 miaoda app upgrade 兜底 + 跑 dev-local.sh：纯 stdout、崩了就崩、Agent 友好。
+# 显式想跑本地路径可用 `npm run dev:local`（绕过 SANDBOX_ID 判断）。
+set -euo pipefail
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+
+if [ -n "${SANDBOX_ID:-}" ]; then
+  exec node "$SCRIPT_DIR/dev.js" "$@"
+fi
+
+if [ ! -x "$SCRIPT_DIR/dev-local.sh" ]; then
+  echo "[dev] scripts/dev-local.sh 缺失或不可执行；先跑 \`miaoda app upgrade\` 同步平台脚本" >&2
+  exit 1
+fi
+
+# 本地启动前先跑一次 miaoda app upgrade：同步 platform-controlled 内容 + 升 @lark-apaas/* 到
+# 最新 alpha + 迁移老 npm scripts。沙箱不走这里（SANDBOX_ID 分支已经 exec return）。
+# miaoda 缺失时软失败（agent 环境可能没装），靠用户自己保证 .env.local / scripts 现状能跑。
+if command -v miaoda >/dev/null 2>&1; then
+  miaoda app upgrade || echo "[dev] miaoda app upgrade 失败，按现状继续" >&2
+else
+  echo "[dev] miaoda 未装，跳过 upgrade；建议 npm i -g @lark-apaas/miaoda-cli" >&2
+fi
+
+exec "$SCRIPT_DIR/dev-local.sh" "$@"