@lark-apaas/miaoda-cli 0.1.10 → 0.1.12-alpha.0

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

@@ -121,7 +121,7 @@ function registerAppInit(parent) {
         .command('init')
         .description('初始化应用代码：抓 template 渲染、同步 upgrade/templates、装 .agent/steering/ skills、写 .spark/meta.json。.spark/meta.json 已存在则直接退出')
         .option('--template <stack>', `技术栈短名（${index_1.SUPPORTED_STACKS.join(' / ')}）`)
-        .option('--conf <json>', 'init 配置 JSON。支持 {"version": "<template 版本>"} / {"steeringVersion": "<steering 版本>"}，均默认 latest')
+        .option('--conf <json>', 'init 配置 JSON。支持 {"version": "<template 版本>"}，默认 latest')
         .option('--skip-install', '跳过依赖安装', false)
         .addOption((0, shared_1.appIdOption)())
         .addHelpText('after', `
@@ -161,7 +161,6 @@ JSON 输出
   $ miaoda app init --template vite-react
   $ miaoda app init --template nestjs-react-fullstack --app-id app_xxx
   $ miaoda app init --template vite-react --conf '{"version": "0.1.0"}'
-  $ miaoda app init --template vite-react --conf '{"steeringVersion": "0.1.0"}'
   $ miaoda app init --template vite-react --skip-install
   $ MIAODA_DEP_CACHE_DIR=/tmp/dep-cache miaoda app init --template vite-react
 `);
@@ -193,11 +192,7 @@ function parseInitConf(raw) {
     if (version !== undefined && typeof version !== 'string') {
         throw new error_1.AppError('ARGS_INVALID', '--conf.version 必须是字符串');
     }
-    const steeringVersion = parsed.steeringVersion;
-    if (steeringVersion !== undefined && typeof steeringVersion !== 'string') {
-        throw new error_1.AppError('ARGS_INVALID', '--conf.steeringVersion 必须是字符串');
-    }
-    return { version, steeringVersion };
+    return { version };
 }
 function isPlainObject(v) {
     return typeof v === 'object' && v !== null && !Array.isArray(v);

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

@@ -22,8 +22,8 @@ function registerSkillsSync(parent) {
     const cmd = parent
         .command('sync')
         .description('同步 coding-steering（latest 或指定版本）到 user app')
-        .argument('[version]', 'coding-steering 包版本或 dist-tag，缺省 latest')
         .option('--dir <path>', '项目目录，默认当前目录', '.')
+        .option('--version <ver>', 'coding-steering 包版本或 dist-tag，缺省 latest')
         .option('--local', '走本地 dev / agent 输出形态：拷到 .agents/skills 平铺 + 创建 .claude/skills 软链。' +
         '不传时退回老形态：拷到 .agent/skills/steering/<stack>/skills/（跟沙箱端 update-skills.sh 对齐）', false)
         .addHelpText('after', `
@@ -46,15 +46,15 @@ JSON 输出
             "claudeSkillsLink": "created|updated|noop|conflict"  // 仅 --local 时}}
 
 示例
-  $ miaoda skills sync
-  $ miaoda skills sync --local           # 本地 dev / agent 用
-  $ miaoda skills sync 0.2.0
+  $ miaoda skills sync                              # 拉 @latest
+  $ miaoda skills sync --local                      # 本地 dev / agent 用
+  $ miaoda skills sync --version 0.2.0              # 显式指定版本
   $ miaoda skills sync --dir ./my-app
 `);
-    cmd.action((0, shared_1.withHelp)(cmd, async (version, rawOpts) => {
+    cmd.action((0, shared_1.withHelp)(cmd, async (rawOpts) => {
         await (0, index_1.handleSkillsSync)({
             dir: rawOpts.dir,
-            version,
+            version: rawOpts.version,
             local: rawOpts.local,
         });
     }));

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

@@ -76,7 +76,6 @@ async function handleAppInit(opts) {
         steeringResult = (0, coding_steering_1.syncCodingSteering)({
             stack,
             targetDir,
-            version: opts.conf?.steeringVersion,
             logPrefix: 'init',
             outputLayout,
         });
@@ -98,7 +97,6 @@ async function handleAppInit(opts) {
         version: tplResult.version,
         archType: tplResult.archType,
         app_id: opts.appId,
-        steeringVersion: steeringResult.version,
     });
     const syncedSummary = syncRunResult.stackFound
         ? syncRunResult.rulesApplied.length > 0

package/dist/cli/handlers/skills/sync.js

@@ -10,10 +10,13 @@ const spark_meta_1 = require("../../../utils/spark-meta");
 const error_1 = require("../../../utils/error");
 const output_1 = require("../../../utils/output");
 /**
- * miaoda skills sync [version] [--dir <path>]
+ * miaoda skills sync [--dir <path>] [--version <ver>]
  *
- * 从 .spark/meta.json 读 stack（+ 默认 steeringVersion），把 coding-steering 包内对应 stack
- * 的 skills + tech.md 同步到 <dir>/.agent/steering/。需要先跑过 `miaoda app init`。
+ * 从 .spark/meta.json 读 stack，把 coding-steering 包内对应 stack 的 skills + tech.md
+ * 同步到 <dir>/.agent/steering/。需要先跑过 `miaoda app init`。
+ *
+ * 版本来源：CLI `--version` flag 或默认 `latest`。**不读 meta.json**——steering 版本
+ * 不在 meta 里钉，每次 sync 都跟随 `--version` 显式传或退回 @latest。
  */
 async function handleSkillsSync(opts) {
     await Promise.resolve();
@@ -22,23 +25,17 @@ async function handleSkillsSync(opts) {
     if (meta.stack === undefined || meta.stack === '') {
         throw new error_1.AppError('SKILLS_META_INCOMPLETE', '.spark/meta.json missing stack — run `miaoda app init` first');
     }
-    const version = opts.version ?? meta.steeringVersion;
-    const versionSource = opts.version
-        ? 'cli-arg'
-        : meta.steeringVersion
-            ? 'meta.json'
-            : 'default-latest';
     const result = (0, coding_steering_1.syncCodingSteering)({
         stack: meta.stack,
         targetDir,
-        version,
+        version: opts.version,
         outputLayout: opts.local === true ? 'flat' : 'nested',
     });
     (0, output_1.emit)({
         data: {
             stack: meta.stack,
             version: result.version,
-            versionSource,
+            versionSource: opts.version !== undefined ? 'cli-arg' : 'default-latest',
             syncedSkills: result.syncedSkills,
             techSynced: result.techSynced,
             ...(result.claudeSkillsLink !== undefined

package/dist/utils/githooks.js

@@ -8,6 +8,21 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_child_process_1 = require("node:child_process");
 const logger_1 = require("../utils/logger");
+const GIT_LEAKED_ENV_KEYS = new Set([
+    'GIT_DIR',
+    'GIT_WORK_TREE',
+    'GIT_INDEX_FILE',
+    'GIT_COMMON_DIR',
+    'GIT_PREFIX',
+    'GIT_OBJECT_DIRECTORY',
+    'GIT_ALTERNATE_OBJECT_DIRECTORIES',
+    'GIT_CONFIG',
+    'GIT_CONFIG_PARAMETERS',
+    'GIT_CONFIG_COUNT',
+]);
+function envWithoutGitLeaks() {
+    return Object.fromEntries(Object.entries(process.env).filter(([key]) => !GIT_LEAKED_ENV_KEYS.has(key)));
+}
 /**
  * 把 `.githooks/` 注册为本仓库的 git hooks 目录，让 pre-commit 等 hook 立即生效。
  *
@@ -33,8 +48,10 @@ function activateGitHooks(targetDir) {
     if ((currentMode & 0o111) !== 0o111) {
         node_fs_1.default.chmodSync(hookFile, 0o755);
     }
+    const env = envWithoutGitLeaks();
     const probe = (0, node_child_process_1.spawnSync)('git', ['config', '--get', 'core.hooksPath'], {
         cwd: targetDir,
+        env,
         stdio: ['ignore', 'pipe', 'ignore'],
     });
     const currentHooksPath = probe.stdout.toString().trim();
@@ -43,6 +60,7 @@ function activateGitHooks(targetDir) {
     }
     const res = (0, node_child_process_1.spawnSync)('git', ['config', 'core.hooksPath', '.githooks'], {
         cwd: targetDir,
+        env,
         stdio: ['ignore', 'ignore', 'pipe'],
     });
     if (res.status !== 0) {

package/package.json

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

package/upgrade/templates/design-stack/templates/scripts/dev-local.js

@@ -47,10 +47,10 @@ if (hasLarkCli) {
   warn('lark-cli 未安装，跳过 env pull；请确保 .env.local 已就绪');
 }
 
-// skills sync —— --local 切 flat layout;临时钉 @alpha,等 0.1.7 发到 latest 后切回。
+// skills sync —— --local 切 flat layout;不传 --version,handler 默认 coding-steering@latest。
 console.log('[dev-local] (2/4) miaoda skills sync...');
 try {
-  execSync('npx -y @lark-apaas/miaoda-cli@alpha skills sync --local', { stdio: 'inherit' });
+  execSync('npx -y @lark-apaas/miaoda-cli@latest skills sync --local', { stdio: 'inherit' });
 } catch {
   console.log('  (skills sync 失败，继续启动)');
 }

package/upgrade/templates/design-stack/templates/scripts/dev.sh

@@ -13,14 +13,12 @@ if [ -n "${SANDBOX_ID:-}" ]; then
 fi
 
 if [ ! -f "$SCRIPT_DIR/dev-local.js" ]; then
-  echo "[dev] scripts/dev-local.js 缺失；先跑 \`npx -y @lark-apaas/miaoda-cli@alpha app sync\` 同步平台脚本" >&2
+  echo "[dev] scripts/dev-local.js 缺失；先跑 \`npx -y @lark-apaas/miaoda-cli@latest app sync\` 同步平台脚本" >&2
   exit 1
 fi
 
 # 本地启动前先跑一次 miaoda app sync：同步 platform-controlled 内容 + 升 @lark-apaas/* 到
 # latest + 迁移老 npm scripts。沙箱不走这里（SANDBOX_ID 分支已经 exec return）。
-# 临时钉 @alpha：latest dist-tag 还停在老版（0.1.6，无 app sync 子命令）；等 0.1.7 发到
-# latest 后切回 @latest。
-npx -y @lark-apaas/miaoda-cli@alpha app sync || echo "[dev] miaoda app sync 失败，按现状继续" >&2
+npx -y @lark-apaas/miaoda-cli@latest app sync || echo "[dev] miaoda app sync 失败，按现状继续" >&2
 
 exec node "$SCRIPT_DIR/dev-local.js" "$@"

package/upgrade/templates/nestjs-react-fullstack/templates/scripts/dev-local.js

@@ -56,11 +56,11 @@ if (hasLarkCli) {
 }
 
 // 2. skills sync —— --local 切到 flat layout (.agents/skills + .claude/skills 软链),
-// 跟沙箱 nested layout 区分。临时钉 @alpha:latest dist-tag 还停在老版 (0.1.6,无 skills /
-// app sync 子命令);等 0.1.7 发到 latest 后切回 @latest。
+// 跟沙箱 nested layout 区分。不传 --version,handler 默认拉 coding-steering@latest,
+// 保证每次本地 npm run dev 都把 skills 升到最新。
 console.log('[dev-local] (2/4) miaoda skills sync...');
 try {
-  execSync('npx -y @lark-apaas/miaoda-cli@alpha skills sync --local', { stdio: 'inherit' });
+  execSync('npx -y @lark-apaas/miaoda-cli@latest skills sync --local', { stdio: 'inherit' });
 } catch {
   console.log('  (skills sync 失败，继续启动)');
 }

package/upgrade/templates/nestjs-react-fullstack/templates/scripts/dev.sh

@@ -13,14 +13,12 @@ if [ -n "${SANDBOX_ID:-}" ]; then
 fi
 
 if [ ! -f "$SCRIPT_DIR/dev-local.js" ]; then
-  echo "[dev] scripts/dev-local.js 缺失；先跑 \`npx -y @lark-apaas/miaoda-cli@alpha app sync\` 同步平台脚本" >&2
+  echo "[dev] scripts/dev-local.js 缺失；先跑 \`npx -y @lark-apaas/miaoda-cli@latest app sync\` 同步平台脚本" >&2
   exit 1
 fi
 
 # 本地启动前先跑一次 miaoda app sync：同步 platform-controlled 内容 + 升 @lark-apaas/* 到
 # latest + 迁移老 npm scripts。沙箱不走这里（SANDBOX_ID 分支已经 exec return）。
-# 临时钉 @alpha：latest dist-tag 还停在老版（0.1.6，无 app sync 子命令）；等 0.1.7 发到
-# latest 后切回 @latest。
-npx -y @lark-apaas/miaoda-cli@alpha app sync || echo "[dev] miaoda app sync 失败，按现状继续" >&2
+npx -y @lark-apaas/miaoda-cli@latest app sync || echo "[dev] miaoda app sync 失败，按现状继续" >&2
 
 exec node "$SCRIPT_DIR/dev-local.js" "$@"