flower-trellis 0.1.0

package/src/lib/trellis-runner.js

@@ -0,0 +1,190 @@
+import fs from "node:fs";
+import path from "node:path";
+import { createRequire } from "node:module";
+import { spawn } from "node:child_process";
+import { createInterface } from "node:readline";
+import figlet from "figlet";
+import * as pty from "node-pty";
+
+/**
+ * 定位捆绑的 @mindfoldhq/trellis 可执行 bin 的绝对路径。
+ * 解析依赖的 package.json(必随包发布)再读其 bin 字段,而非 main。
+ */
+export function resolveTrellisBin() {
+  const require = createRequire(import.meta.url);
+  const pkgJsonPath = require.resolve("@mindfoldhq/trellis/package.json");
+  const pkgRoot = path.dirname(pkgJsonPath);
+  const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));
+  const binRel = typeof pkg.bin === "string" ? pkg.bin : pkg.bin.trellis;
+  return path.resolve(pkgRoot, binRel);
+}
+
+/** 去除 ANSI 颜色码,便于按文本匹配。 */
+function stripAnsi(s) {
+  // eslint-disable-next-line no-control-regex
+  return s.replace(/\x1b\[[0-9;]*m/g, "");
+}
+
+/** Trellis 启动横幅(figlet Rebel "Trellis")的实体行集合,用于过滤掉重复 banner。 */
+function trellisBannerLines() {
+  try {
+    return new Set(
+      figlet
+        .textSync("Trellis", { font: "Rebel" })
+        .split("\n")
+        .map((l) => l.replace(/\s+$/, ""))
+        .filter((l) => l.trim()),
+    );
+  } catch {
+    return new Set();
+  }
+}
+
+/**
+ * 判断 trellis 输出的一行属于「头部」的哪类:
+ *  - "skip":banner 实体行 / 空行 / 副标题 / Developer / Mode → 过滤掉
+ *  - "keep":proxy 行 → 保留输出,但仍处于头部(继续过滤后续 Mode/Developer)
+ *  - "content":其它 → 头部结束,正文开始
+ */
+function classifyHeaderLine(line, bannerSet) {
+  const plain = stripAnsi(line);
+  const t = plain.trim();
+  const key = plain.replace(/\s+$/, "");
+  if (!t) return "skip";
+  if (bannerSet.has(key)) return "skip";
+  if (t.startsWith("All-in-one AI framework")) return "skip";
+  if (t.startsWith("👤 Developer:")) return "skip";
+  if (t.startsWith("Mode:")) return "skip";
+  if (t.startsWith("Using proxy:")) return "keep";
+  return "content";
+}
+
+/**
+ * 用当前 node 执行 trellis bin(普通 spawn),透传子命令与参数。
+ *
+ * 用于:兜底透传其它命令(inherit);或非交互场景下捕获 stdout 过滤 banner(pipe)。
+ *
+ * @param {string[]} args
+ * @param {string} cwd
+ * @param {object} [opts] { stripBanner }
+ * @returns {Promise<number>} 退出码(信号终止返回 128)
+ */
+export function runTrellis(args, cwd, opts = {}) {
+  const bin = resolveTrellisBin();
+  const strip = opts.stripBanner;
+  return new Promise((resolve, reject) => {
+    const child = spawn(process.execPath, [bin, ...args], {
+      cwd,
+      stdio: strip ? ["inherit", "pipe", "inherit"] : "inherit",
+      env: strip ? { ...process.env, FORCE_COLOR: "1" } : process.env,
+    });
+    if (strip && child.stdout) {
+      const banner = trellisBannerLines();
+      const rl = createInterface({ input: child.stdout });
+      rl.on("line", (line) => {
+        const kind = classifyHeaderLine(line, banner);
+        // 普通(非 pty)场景一直按行过滤即可:trellis 此时是 -y 非交互,无 inquirer
+        if (kind === "skip") return;
+        process.stdout.write(line + "\n");
+      });
+    }
+    child.on("error", reject);
+    child.on("exit", (code, signal) => {
+      if (signal) resolve(128);
+      else resolve(code ?? 0);
+    });
+  });
+}
+
+/**
+ * 在伪终端(node-pty)里运行 trellis,**保留其全部交互**(模板 / monorepo / 冲突菜单),
+ * 同时过滤掉它开头重复打印的启动 banner / 副标题 / Developer / Mode。
+ *
+ * 过滤只作用于「头部阶段」:逐行识别 banner 类行并丢弃(proxy 保留),
+ * 一旦遇到正文行或 inquirer 渲染(隐藏光标序列 ESC[?25l)立即停止过滤、转为完全透传,
+ * 以免破坏交互菜单的光标控制。
+ *
+ * @param {string[]} args
+ * @param {string} cwd
+ * @param {object} [opts] { stripBanner }
+ * @returns {Promise<number>} 退出码(信号终止返回 128)
+ */
+export function runTrellisPty(args, cwd, opts = {}) {
+  const bin = resolveTrellisBin();
+  return new Promise((resolve, reject) => {
+    let child;
+    try {
+      child = pty.spawn(process.execPath, [bin, ...args], {
+        name: "xterm-256color",
+        cols: process.stdout.columns || 80,
+        rows: process.stdout.rows || 30,
+        cwd,
+        env: { ...process.env, FORCE_COLOR: "1" },
+      });
+    } catch (e) {
+      reject(e);
+      return;
+    }
+
+    const bannerSet = trellisBannerLines();
+    let filtering = !!opts.stripBanner;
+    let buf = "";
+
+    child.onData((data) => {
+      if (!filtering) {
+        process.stdout.write(data);
+        return;
+      }
+      // inquirer 开始渲染(隐藏光标)→ 立即停止过滤,整体透传,保住交互菜单
+      if (data.includes("\x1b[?25l")) {
+        filtering = false;
+        process.stdout.write(buf + data);
+        buf = "";
+        return;
+      }
+      buf += data;
+      const parts = buf.split(/\r?\n/);
+      buf = parts.pop(); // 末尾不完整行留待下次
+      for (const line of parts) {
+        const kind = classifyHeaderLine(line, bannerSet);
+        if (kind === "skip") continue;
+        if (kind === "keep") {
+          process.stdout.write(line + "\r\n");
+          continue;
+        }
+        filtering = false; // 正文开始
+        process.stdout.write(line + "\r\n");
+      }
+      if (!filtering && buf) {
+        process.stdout.write(buf);
+        buf = "";
+      }
+    });
+
+    // 把真终端的输入转发进 pty(让用户能操作 trellis 的交互菜单)
+    const stdin = process.stdin;
+    const wasRaw = !!stdin.isRaw;
+    if (stdin.isTTY) stdin.setRawMode(true);
+    stdin.resume();
+    const onStdin = (d) => child.write(d.toString("utf8"));
+    stdin.on("data", onStdin);
+
+    const onResize = () => {
+      try {
+        child.resize(process.stdout.columns || 80, process.stdout.rows || 30);
+      } catch {
+        // 忽略 resize 失败
+      }
+    };
+    process.stdout.on("resize", onResize);
+
+    child.onExit(({ exitCode, signal }) => {
+      stdin.off("data", onStdin);
+      if (stdin.isTTY) stdin.setRawMode(wasRaw);
+      stdin.pause();
+      process.stdout.off("resize", onResize);
+      if (signal) resolve(128);
+      else resolve(exitCode ?? 0);
+    });
+  });
+}

package/src/lib/variant.js

@@ -0,0 +1,40 @@
+import fs from "node:fs";
+import path from "node:path";
+
+/**
+ * 根据目标项目的 `.trellis/.version` 选择强化包变体。
+ *
+ * 规则(逐字符移植 skill-garden install.sh 263-274):
+ *   - 主版本 >= 1 或 次版本 >= 6 → "0.6"
+ *   - 次版本 >= 5                → "0.5"
+ *   - 其它(文件缺失 / 解析失败 / 更低)→ "old"
+ *
+ * 次版本会先剥掉 `-beta.x` 之类后缀(只取开头连续数字),
+ * 因此 `0.6.0-beta.1` 也归入 0.6。
+ *
+ * @param {string} target 目标项目根目录
+ * @returns {{ variant: string, version: string }}
+ */
+export function selectVariant(target) {
+  const versionFile = path.join(target, ".trellis", ".version");
+  let version = "";
+  let variant = "old";
+
+  try {
+    version = fs.readFileSync(versionFile, "utf8").replace(/\s/g, "");
+  } catch {
+    return { variant, version }; // 文件不存在 → old
+  }
+
+  const parts = version.split(".");
+  const major = parseInt(parts[0], 10);
+  const minorMatch = (parts[1] || "").match(/^(\d+)/);
+  const minor = minorMatch ? parseInt(minorMatch[1], 10) : NaN;
+
+  if (Number.isInteger(major) && Number.isInteger(minor)) {
+    if (major >= 1 || minor >= 6) variant = "0.6";
+    else if (minor >= 5) variant = "0.5";
+  }
+
+  return { variant, version };
+}

package/src/lib/versions.js

@@ -0,0 +1,30 @@
+import fs from "node:fs";
+import path from "node:path";
+import { createRequire } from "node:module";
+import { PKG_ROOT } from "./paths.js";
+
+/**
+ * 读取 flower-trellis 自身版本(来自包根 package.json)。
+ * @returns {string}
+ */
+export function flowerVersion() {
+  const p = path.join(PKG_ROOT, "package.json");
+  return JSON.parse(fs.readFileSync(p, "utf8")).version;
+}
+
+/**
+ * 读取捆绑的 @mindfoldhq/trellis 版本。
+ *
+ * 与定位 bin 同源:解析依赖的 package.json(必随包发布)。依赖缺失时返回占位串,
+ * 不抛错 —— `-v` 在任何环境下都应能打印。
+ * @returns {string}
+ */
+export function trellisVersion() {
+  try {
+    const require = createRequire(import.meta.url);
+    const p = require.resolve("@mindfoldhq/trellis/package.json");
+    return JSON.parse(fs.readFileSync(p, "utf8")).version;
+  } catch {
+    return "(未安装)";
+  }
+}

package/src/lib/workflow-inject.js

@@ -0,0 +1,193 @@
+import fs from "node:fs";
+import path from "node:path";
+import {
+  LEGACY_NO_TASK_BLOCK,
+  LEGACY_PLANNING_BLOCK,
+  LEGACY_PUSH_PROGRESS_BLOCK,
+  LEGACY_IN_PROGRESS_BLOCK,
+  LEGACY_PUSH_SNAPSHOT_BLOCK,
+} from "./legacy-blocks.js";
+
+/**
+ * workflow.md 强化块注入。
+ *
+ * 纯 JS 移植 skill-garden install.sh 362-557 的内嵌 Python:
+ *   1. 首次注入前备份 .bak(已存在则保留);
+ *   2. 先清掉所有旧的 skill-garden 段(3 个 SECTION + 12 个 sentinel),保证可重复升级;
+ *   3. 把 hub(0.6)/ route(0.5)块注入到 `## Phase Index` 之后(找不到则顶部 fallback);
+ *   4. 替换 4 个 workflow-state 块的内容(0.6 读 overrides 文件,0.5 用 legacy 常量);
+ *   5. 处理后内容与原文件相同则不写盘(幂等)。
+ *
+ * Python re.DOTALL|re.MULTILINE → JS 用 `[\s\S]` 代替 `.`(免 s flag)+ `m` flag;
+ * SECTION/SENTINEL 全局替换用 `g`,state 替换只替首个(对应 Python count=1)故不加 `g`。
+ */
+
+/** 等价 Python re.escape(用于把字面量安全嵌入正则)。 */
+function escapeRe(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+// 3 个 SECTION 段(heading + BEGIN/END 注释包裹的整块)
+const SECTION_PATTERNS = [
+  "^#{2,4} HIGHEST PRIORITY: skill-garden overrides[^\\n]*\\n+" +
+    "^<!-- BEGIN skill-garden overrides[^\\n]*-->\\n[\\s\\S]*?" +
+    "^<!-- END skill-garden overrides[^\\n]*-->\\n*",
+  "^#{2,4} (?:skill-garden Override: trellis-route routing|HIGHEST PRIORITY: skill-garden trellis-route routing gate)[^\\n]*\\n+" +
+    "^<!-- BEGIN skill-garden enhancement[^\\n]*-->\\n[\\s\\S]*?" +
+    "^<!-- END skill-garden enhancement[^\\n]*-->\\n*",
+  "^#{2,4} HIGHEST PRIORITY: skill-garden finish-work bookkeeping guard[^\\n]*\\n+" +
+    "^<!-- BEGIN skill-garden finish-work override[^\\n]*-->\\n[\\s\\S]*?" +
+    "^<!-- END skill-garden finish-work override[^\\n]*-->\\n*",
+];
+const SECTION_RES = SECTION_PATTERNS.map((p) => new RegExp(p, "gm"));
+
+// 12 个 sentinel 名(每个对应一对 BEGIN/END 注释块)
+const SENTINEL_NAMES = [
+  "skill-garden overrides",
+  "skill-garden enhancement",
+  "skill-garden finish-work override",
+  "skill-garden workflow-state no-task-gate",
+  "skill-garden workflow-state planning-handoff",
+  "skill-garden workflow-state trellis-route",
+  "skill-garden workflow-state push-progress-recovery",
+  "skill-garden workflow-state in-progress-push-snapshot",
+  "skill-garden workflow-state no_task",
+  "skill-garden workflow-state planning",
+  "skill-garden workflow-state in_progress",
+  "skill-garden workflow-state in_progress_inline",
+];
+const SENTINEL_RES = SENTINEL_NAMES.map(
+  (name) =>
+    new RegExp(
+      "^<!-- BEGIN " +
+        escapeRe(name) +
+        "[^\\n]*-->\\n[\\s\\S]*?^<!-- END " +
+        escapeRe(name) +
+        "[^\\n]*-->\\n*",
+      "gm",
+    ),
+);
+
+const PHASE_INDEX_RE = /^(## Phase Index[^\n]*\n)/m;
+
+/** 构造某 workflow-state 块的匹配正则(只替首个,不加 g)。 */
+function stateRe(state) {
+  return new RegExp(
+    "^(\\[workflow-state:" +
+      escapeRe(state) +
+      "\\]\\n)([\\s\\S]*?)(^\\[/workflow-state:" +
+      escapeRe(state) +
+      "\\])",
+    "m",
+  );
+}
+
+/** 删除所有旧的 skill-garden 段(SECTION + sentinel)。 */
+function stripBlocks(value) {
+  for (const re of SECTION_RES) value = value.replace(re, "");
+  for (const re of SENTINEL_RES) value = value.replace(re, "");
+  return value;
+}
+
+/** 把 block 注入到 `## Phase Index` 锚点之后;找不到锚点则注入顶部。 */
+function injectAfterPhaseIndex(value, block) {
+  const b = block.replace(/\s+$/, ""); // rstrip
+  const m = PHASE_INDEX_RE.exec(value);
+  if (m) {
+    const end = m.index + m[0].length;
+    const after = value.slice(end).replace(/^\n+/, ""); // lstrip("\n")
+    return {
+      value: value.slice(0, end) + "\n" + b + "\n\n" + after,
+      action: "插入到 ## Phase Index 顶部",
+    };
+  }
+  return {
+    value: b + "\n\n" + value,
+    action: "注入顶部 (fallback: 未找到 Phase Index 锚点)",
+  };
+}
+
+/** 替换某 workflow-state 块:open + 新 block + 原 body(去首换行/尾空白) + close。 */
+function replaceState(value, re, block) {
+  let replaced = false;
+  const out = value.replace(re, (_full, open, body, close) => {
+    replaced = true;
+    const t = body.replace(/^\n+/, "").replace(/\s+$/, "");
+    const bodyPart = t ? t + "\n" : "";
+    return open + block + bodyPart + close;
+  });
+  return [out, replaced];
+}
+
+/** 读取 0.6 的 workflow-state override 文件,语义同 Python:strip() + "\n\n"。 */
+function readStateBlock(stateDir, filename) {
+  const p = path.join(stateDir, filename);
+  return fs.readFileSync(p, "utf8").trim() + "\n\n";
+}
+
+/**
+ * 对目标项目的 .trellis/workflow.md 执行强化注入。
+ *
+ * @param {string} target 目标项目根
+ * @param {string} variantDir 该变体在 enhancements/ 下的目录
+ * @param {string} variant "old" | "0.5" | "0.6"
+ * @returns {{skipped?:boolean, reason?:string, changed?:boolean, action?:string, backupNote?:string}}
+ */
+export function injectWorkflow(target, variantDir, variant) {
+  const dst = path.join(target, ".trellis", "workflow.md");
+  if (!fs.existsSync(dst)) {
+    return { skipped: true, reason: "目标无 .trellis/workflow.md" };
+  }
+
+  const hubSrc = path.join(variantDir, "overrides", "workflow.md");
+  const routeSrc = path.join(variantDir, "overrides", "trellis-route.md");
+  const stateDir = path.join(variantDir, "overrides", "workflow-states");
+  const isV06 = variant === "0.6" && fs.existsSync(hubSrc);
+
+  let source;
+  if (isV06) source = hubSrc;
+  else if (fs.existsSync(routeSrc)) source = routeSrc;
+  else return { skipped: true, reason: `变体 ${variant} 无 overrides` }; // old
+
+  const text = fs.readFileSync(dst, "utf8");
+
+  // 备份(首次创建,后续保留 → .bak 永远是首次注入前的原文)
+  const bak = dst + ".bak";
+  let backupNote;
+  if (!fs.existsSync(bak)) {
+    fs.copyFileSync(dst, bak);
+    backupNote = "(已创建 workflow.md.bak)";
+  } else {
+    backupNote = "(保留已有 workflow.md.bak)";
+  }
+
+  const clean = stripBlocks(text);
+  const block = fs.readFileSync(source, "utf8").replace(/\s+$/, "");
+  const { value: phaseNew, action } = injectAfterPhaseIndex(clean, block);
+
+  const stateSpecs = isV06
+    ? [
+        ["no_task", readStateBlock(stateDir, "no_task.md")],
+        ["planning", readStateBlock(stateDir, "planning.md")],
+        ["in_progress", readStateBlock(stateDir, "in_progress.md")],
+        ["in_progress-inline", readStateBlock(stateDir, "in_progress-inline.md")],
+      ]
+    : [
+        ["no_task", LEGACY_NO_TASK_BLOCK + LEGACY_PUSH_PROGRESS_BLOCK],
+        ["planning", LEGACY_PLANNING_BLOCK],
+        ["in_progress", LEGACY_IN_PROGRESS_BLOCK + LEGACY_PUSH_SNAPSHOT_BLOCK],
+        ["in_progress-inline", LEGACY_PUSH_SNAPSHOT_BLOCK],
+      ];
+
+  let newText = phaseNew;
+  for (const [state, blk] of stateSpecs) {
+    [newText] = replaceState(newText, stateRe(state), blk);
+  }
+  newText = newText.replace(/\s+$/, "") + "\n";
+
+  if (newText === text) {
+    return { changed: false, backupNote };
+  }
+  fs.writeFileSync(dst, newText);
+  return { changed: true, action, backupNote };
+}