abelworkflow 0.6.5 → 0.7.0

package/.gitignore

@@ -12,5 +12,5 @@ skills/dev-browser/tmp/
 .claude/
 .codex/
 *pycache*/
-.codex
 openspec/
+package-lock.json

package/README.md

@@ -112,7 +112,7 @@ npx abelworkflow --help
 |---|---|---|
 | `grok-search` | `~/.agents/skills/grok-search/.env` | `GROK_API_URL` `GROK_API_KEY` `GROK_MODEL` |
 | `context7-auto-research` | `~/.agents/skills/context7-auto-research/.env` | `CONTEXT7_API_KEY` |
-| `prompt-enhancer` | `~/.agents/skills/prompt-enhancer/.env` | `ANTHROPIC_API_KEY` / `OPENAI_API_KEY` `PE_MODEL` |
+| `prompt-enhancer` | `~/.agents/skills/prompt-enhancer/.env` | `PE_API_URL` `PE_API_KEY` `PE_MODEL` |
 
 ### 方法二：源码克隆安装
 

package/lib/cli/logic.mjs

@@ -1,23 +1,91 @@
+import * as p from "@clack/prompts";
+
 const interactiveMenuDescriptors = [
-  { value: "full-init", label: "完整初始化：同步工作流 + 可选安装/配置 Claude Code、Codex、技能环境" },
-  { value: "install", label: "仅同步/更新工作流到 ~/.agents 并重新链接 Claude/Codex" },
-  { value: "grok-search", label: "配置 grok-search 环境变量" },
-  { value: "context7", label: "配置 context7-auto-research 环境变量" },
-  { value: "prompt-enhancer", label: "配置 prompt-enhancer 环境变量" },
-  { value: "claude-install", label: "安装或更新 Claude Code CLI" },
-  { value: "claude-api", label: "配置 Claude Code 第三方 API" },
-  { value: "codex-install", label: "安装或更新 Codex CLI" },
-  { value: "codex-api", label: "配置 Codex 第三方 API" },
-  { value: "exit", label: "退出" }
+  { value: "full-init", label: "完整初始化", hint: "同步 + 安装 + 配置", group: "main" },
+  { value: "install", label: "仅同步工作流", group: "main" },
+  { value: "grok-search", label: "配置 grok-search", hint: "技能", group: "skill" },
+  { value: "context7", label: "配置 context7-auto-research", hint: "技能", group: "skill" },
+  { value: "prompt-enhancer", label: "配置 prompt-enhancer", hint: "技能", group: "skill" },
+  { value: "claude-install", label: "安装/更新 Claude Code", hint: "CLI", group: "cli" },
+  { value: "claude-api", label: "配置 Claude API", hint: "CLI", group: "cli" },
+  { value: "codex-install", label: "安装/更新 Codex", hint: "CLI", group: "cli" },
+  { value: "codex-api", label: "配置 Codex API", hint: "CLI", group: "cli" },
+  { value: "exit", label: "退出", group: "exit" }
 ];
 
 const interactiveMenuDefaultValue = "full-init";
 
+class CancelledError extends Error {
+  constructor(message = "用户取消") {
+    super(message);
+    this.name = "CancelledError";
+  }
+}
+
+function required(message = "此项不能为空") {
+  return (value) => {
+    if (value === undefined || value === null || (typeof value === "string" && value.trim() === "")) {
+      return message;
+    }
+  };
+}
+
+function requiredUnlessExisting(existingValue, message = "此项不能为空") {
+  return (value) => {
+    if ((value === undefined || value === null || (typeof value === "string" && value.trim() === "")) && !existingValue) {
+      return message;
+    }
+  };
+}
+
+/**
+ * 回退逻辑：用户输入非空则用新值，否则用旧值。
+ * 输入 "-" 表示清除已有值（返回 undefined）。
+ * existingValue 可能来自 dotenv / JSON 读取，会传入空字符串；
+ * 空字符串将被净化为 undefined，避免写入无意义的空配置。
+ * 注意：本函数仅适用于字符串类型的配置值，不适用于可能为 0/false 的数字或布尔值。
+ */
+function resolvePasswordValue(userInput, existingValue) {
+  if (typeof userInput === "string") {
+    const trimmed = userInput.trim();
+    if (trimmed === "") {
+      if (typeof existingValue === "string" && existingValue.trim() === "") {
+        return undefined;
+      }
+      return existingValue || undefined;
+    }
+    return trimmed === "-" ? undefined : trimmed;
+  }
+  if (typeof existingValue === "string" && existingValue.trim() === "") {
+    return undefined;
+  }
+  return existingValue || undefined;
+}
+
+function assertNotCancelled(value) {
+  if (p.isCancel(value)) {
+    throw new CancelledError();
+  }
+}
+
+async function confirmOrCancel({ message, initialValue = false }) {
+  const value = await p.confirm({ message, initialValue, active: "是", inactive: "否" });
+  assertNotCancelled(value);
+  return value;
+}
+
+async function selectOrCancel(options) {
+  const value = await p.select(options);
+  assertNotCancelled(value);
+  return value;
+}
+
 function parseArgs(argv, { defaultAgentsDir, resolvePath }) {
   const options = {
     agentsDir: defaultAgentsDir,
     force: false,
     relinkOnly: false,
+    nonInteractive: false,
     command: "menu"
   };
   const positional = [];
@@ -42,6 +110,10 @@ function parseArgs(argv, { defaultAgentsDir, resolvePath }) {
       i += 1;
       continue;
     }
+    if (arg === "--non-interactive") {
+      options.nonInteractive = true;
+      continue;
+    }
     if (arg === "--help" || arg === "-h" || arg === "help") {
       helpRequested = true;
       options.command = "help";
@@ -75,40 +147,22 @@ function parseArgs(argv, { defaultAgentsDir, resolvePath }) {
     throw new Error("`--force`、`--link-only`、`--agents-dir` 仅能与 `install` 命令一起使用");
   }
 
-  return options;
-}
-
-function assertInteractiveMenuSupported({ command, inputIsTTY, outputIsTTY }) {
-  if (command === "menu" && (!inputIsTTY || !outputIsTTY)) {
-    throw new Error("交互式菜单需要 TTY 终端；非交互场景请显式使用 `npx abelworkflow install`");
+  if (!options.nonInteractive && process.env.CI) {
+    options.nonInteractive = true;
   }
-}
 
-function resolvePromptValue(answer, { defaultValue, allowEmpty = false } = {}) {
-  const value = String(answer).trim();
-  if (!value && defaultValue !== undefined) {
-    return { ok: true, value: defaultValue };
-  }
-  if (!value && !allowEmpty) {
-    return { ok: false, error: "此项不能为空。" };
-  }
-  return { ok: true, value };
+  return options;
 }
 
-function resolveSelectValue(answer, choices) {
-  const index = Number(answer) - 1;
-  if (Number.isInteger(index) && index >= 0 && index < choices.length) {
-    return { ok: true, value: choices[index].value };
+function assertInteractiveMenuSupported({ command, inputIsTTY, outputIsTTY, nonInteractive }) {
+  // 防御性检查（死代码守护）：main() 已在调用前将非交互 menu 降级为 install，
+  // 此处仅防止外部直接调用 assertInteractiveMenuSupported 时漏掉判断。
+  if (command === "menu" && nonInteractive) {
+    throw new Error("非交互模式已启用；请显式使用 `npx abelworkflow install` 进行安装");
   }
-  const direct = choices.find((choice) => choice.value === answer);
-  if (direct) {
-    return { ok: true, value: direct.value };
+  if (command === "menu" && (!inputIsTTY || !outputIsTTY)) {
+    throw new Error("交互式菜单需要 TTY 终端；非交互场景请显式使用 `npx abelworkflow install`");
   }
-  return { ok: false, error: "无效选择，请重新输入。" };
-}
-
-function shouldUseVisibleSecretFallback({ inputIsTTY, platform }) {
-  return !inputIsTTY || platform === "win32";
 }
 
 function getRunCommandSpawnOptions(platform = process.env.ABELWORKFLOW_TEST_PLATFORM || process.platform) {
@@ -120,11 +174,15 @@ function getRunCommandSpawnOptions(platform = process.env.ABELWORKFLOW_TEST_PLAT
 
 export {
   assertInteractiveMenuSupported,
+  assertNotCancelled,
+  CancelledError,
+  confirmOrCancel,
   getRunCommandSpawnOptions,
   interactiveMenuDefaultValue,
   interactiveMenuDescriptors,
   parseArgs,
-  resolvePromptValue,
-  resolveSelectValue,
-  shouldUseVisibleSecretFallback
+  required,
+  requiredUnlessExisting,
+  resolvePasswordValue,
+  selectOrCancel
 };