@gitruck/cli 0.1.0 → 0.1.1

package/README.md

@@ -30,26 +30,21 @@
 需要 Node.js ≥ 20.6（`node -v` 查看）。
 
 ```bash
-# 1) 安装（全局命令 gtrk）
-npm i -g @gitruck/cli
-#   或免安装直接用：npx @gitruck/cli <命令>
+# 1) 一条命令装全：命令行 gtrk + /gtrk-oralcut skill + 配置（填 API Key、自动扫剪映目录）
+npm i -g @gitruck/cli && gtrk install
+#   或免全局安装直接用：npx @gitruck/cli install
 
-# 2) 一次性配置（填 API Key，自动扫剪映草稿目录）
-gtrk init
-
-# 3) 剪一条（剪完自动打开产物目录）
+# 2) 剪一条（剪完自动打开产物目录）
 gtrk oralcut "D:/素材/某选题-原始口播.mp4" --script "D:/素材/某选题-文字稿.txt"
 ```
 
-> 本地开发：`cd gtrk-cli && bun install && bun run src/index.ts <命令>`。
+> 只想配置、不装 skill：用 `gtrk init`。本地开发：`cd gtrk-cli && bun install && bun run src/index.ts <命令>`。
 
 产物目录形如 `<毛片名>-video-project-<YYMMDD-HHMMSS>/`，内含 `gtrk/`、`jianying/`、`xml/` 三端工程。
 
 ## 给 AI Agent 用
 
-```bash
-gtrk skills install      # 把 /gtrk-oralcut 装进 ~/.claude/skills
-```
+`gtrk install` 已经把 `/gtrk-oralcut` skill 装进 `~/.claude/skills`（单独装用 `gtrk skills install`）。
 
 然后在 Claude Code 里直接说「**帮我把这条口播剪一版**」或打 `/gtrk-oralcut`，agent 会问清毛片 / 文稿 / 节奏，调 `gtrk oralcut --json` 跑通闭环、验证产物、把三端打开方式回给你。完整可移植 playbook 见 [`AGENT.md`](./AGENT.md)。
 
@@ -106,9 +101,10 @@ gtrk init --api-key <KEY> --jianying-draft-dir auto -y
 
 ### 其它
 
-- `gtrk init [--api-key … --api-base … --jianying-draft-dir … -y]` — 配置（交互 / 非交互）。
+- `gtrk install [--api-key … -y --skills-dir …]` — 一条命令装全（skill + 配置 + 体检），对标飞书 `lark-cli install`。
+- `gtrk init [--api-key … --api-base … --jianying-draft-dir … -y]` — 仅配置（交互 / 非交互）。
 - `gtrk doctor` — 体检。
-- `gtrk skills install [--dir <skills 目录>]` — 安装 agent skill。
+- `gtrk skills install [--dir <skills 目录>]` — 单独安装 agent skill。
 
 ---
 

package/dist/index.js

@@ -1888,22 +1888,101 @@ var {
   Help
 } = import__.default;
 
+// src/index.ts
+import { readFileSync as readFileSync2 } from "node:fs";
+import { join as join8 } from "node:path";
+
+// src/lib/paths.ts
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { existsSync } from "node:fs";
+function packageRoot() {
+  let dir = dirname(fileURLToPath(import.meta.url));
+  for (let i = 0;i < 8; i++) {
+    if (existsSync(join(dir, "package.json")))
+      return dir;
+    const parent = dirname(dir);
+    if (parent === dir)
+      break;
+    dir = parent;
+  }
+  return dir;
+}
+
+// src/commands/skills.ts
+import { homedir } from "node:os";
+import { join as join2 } from "node:path";
+import { existsSync as existsSync2, mkdirSync, copyFileSync } from "node:fs";
+
+// src/lib/log.ts
+var c = {
+  dim: (s) => `\x1B[2m${s}\x1B[0m`,
+  cyan: (s) => `\x1B[36m${s}\x1B[0m`,
+  green: (s) => `\x1B[32m${s}\x1B[0m`,
+  yellow: (s) => `\x1B[33m${s}\x1B[0m`,
+  red: (s) => `\x1B[31m${s}\x1B[0m`
+};
+var humanOut = process.stdout;
+function routeLogsToStderr() {
+  humanOut = process.stderr;
+}
+var line = (s) => humanOut.write(`${s}
+`);
+var log = {
+  step: (msg) => line(c.cyan(msg)),
+  info: (msg) => line(c.dim(`   ${msg}`)),
+  ok: (msg) => line(c.green(`✅ ${msg}`)),
+  warn: (msg) => line(c.yellow(`⚠️  ${msg}`)),
+  err: (msg) => process.stderr.write(`${c.red(`❌ ${msg}`)}
+`),
+  tick: (msg) => humanOut.write(`\r   ${msg}\x1B[K`),
+  tickEnd: () => humanOut.write(`
+`)
+};
+
+// src/commands/skills.ts
+var SKILL_NAME = "gtrk-oralcut";
+var SRC = join2(packageRoot(), "skills", SKILL_NAME, "SKILL.md");
+function installSkill(opts = {}) {
+  if (!existsSync2(SRC)) {
+    log.warn(`找不到打包的 skill 源：${SRC}（跳过 skill 安装，不影响命令行）`);
+    return false;
+  }
+  const dest = join2(opts.dir ?? join2(homedir(), ".claude", "skills"), SKILL_NAME);
+  try {
+    mkdirSync(dest, { recursive: true });
+    copyFileSync(SRC, join2(dest, "SKILL.md"));
+    log.ok(`已安装 /${SKILL_NAME} → ${join2(dest, "SKILL.md")}`);
+    log.info("在 Claude Code 里打 /gtrk-oralcut，或直接说「帮我剪个口播」即可触发（可能需重载会话）。");
+    return true;
+  } catch (e) {
+    log.warn(`skill 安装失败（不影响命令行使用）：${e instanceof Error ? e.message : String(e)}`);
+    return false;
+  }
+}
+function registerSkills(program2) {
+  const skills = program2.command("skills").description("管理 agent skill（安装到 Claude Code）");
+  skills.command("install").description(`把 /${SKILL_NAME} 安装到 ~/.claude/skills（对标飞书 skills add）`).option("--dir <dir>", "自定义 skills 目录（缺省 ~/.claude/skills）").action((opts) => {
+    installSkill({ dir: opts.dir });
+  });
+}
+
 // src/commands/init.ts
-import { join as join4, resolve as resolve2 } from "node:path";
-import { existsSync as existsSync5 } from "node:fs";
+import { join as join5, resolve as resolve2 } from "node:path";
+import { existsSync as existsSync6 } from "node:fs";
 
 // src/lib/user-config.ts
-import { homedir } from "node:os";
-import { join } from "node:path";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { homedir as homedir2 } from "node:os";
+import { join as join3 } from "node:path";
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync, writeFileSync } from "node:fs";
 var DEFAULT_API_BASE = "https://api.ai-mcn.tv:10000";
-var DIR = join(homedir(), ".gtrk-cli");
-var FILE = join(DIR, "config.json");
+var DIR = join3(homedir2(), ".gtrk-cli");
+var FILE = join3(DIR, "config.json");
 function configPath() {
   return FILE;
 }
 function readUserConfig() {
-  if (!existsSync(FILE))
+  if (!existsSync3(FILE))
     return {};
   try {
     return JSON.parse(readFileSync(FILE, "utf8"));
@@ -1912,29 +1991,29 @@ function readUserConfig() {
   }
 }
 function writeUserConfig(patch) {
-  mkdirSync(DIR, { recursive: true });
+  mkdirSync2(DIR, { recursive: true });
   const merged = { ...readUserConfig(), ...patch };
   writeFileSync(FILE, JSON.stringify(merged, null, 2));
 }
 
 // src/lib/jianying.ts
-import { join as join2, resolve } from "node:path";
-import { existsSync as existsSync2 } from "node:fs";
+import { join as join4, resolve } from "node:path";
+import { existsSync as existsSync4 } from "node:fs";
 function probeJianyingDraftDir() {
   const local = process.env.LOCALAPPDATA;
   if (!local)
     return;
   const candidates = [
-    join2(local, "JianyingPro", "User Data", "Projects", "com.lveditor.draft"),
-    join2(local, "CapCut", "User Data", "Projects", "com.lveditor.draft")
+    join4(local, "JianyingPro", "User Data", "Projects", "com.lveditor.draft"),
+    join4(local, "CapCut", "User Data", "Projects", "com.lveditor.draft")
   ];
-  return candidates.find((p) => existsSync2(p));
+  return candidates.find((p) => existsSync4(p));
 }
 function resolveJianyingDraftDir(opt) {
   if (opt && opt !== "auto")
     return resolve(opt);
   const saved = readUserConfig().jianyingDraftDir;
-  if (saved && existsSync2(saved))
+  if (saved && existsSync4(saved))
     return saved;
   return probeJianyingDraftDir();
 }
@@ -1957,27 +2036,10 @@ function launch(cmd) {
   } catch {}
 }
 
-// src/lib/paths.ts
-import { dirname, join as join3 } from "node:path";
-import { fileURLToPath } from "node:url";
-import { existsSync as existsSync3 } from "node:fs";
-function packageRoot() {
-  let dir = dirname(fileURLToPath(import.meta.url));
-  for (let i = 0;i < 8; i++) {
-    if (existsSync3(join3(dir, "package.json")))
-      return dir;
-    const parent = dirname(dir);
-    if (parent === dir)
-      break;
-    dir = parent;
-  }
-  return dir;
-}
-
 // src/lib/prompt.ts
 import { stdin, stdout } from "node:process";
 import { spawnSync } from "node:child_process";
-var c = {
+var c2 = {
   dim: (s) => `\x1B[2m${s}\x1B[0m`,
   cyan: (s) => `\x1B[36m${s}\x1B[0m`
 };
@@ -2002,8 +2064,8 @@ function readClipboard() {
 }
 function ask(message, opts = {}) {
   return new Promise((resolve2) => {
-    const hint = opts.defaultValue ? c.dim(` (${opts.defaultValue})`) : "";
-    stdout.write(`${c.cyan("?")} ${message}${hint} `);
+    const hint = opts.defaultValue ? c2.dim(` (${opts.defaultValue})`) : "";
+    stdout.write(`${c2.cyan("?")} ${message}${hint} `);
     let value = "";
     const echo = (s) => stdout.write(opts.mask ? "•".repeat([...s].length) : s);
     const wasRaw = stdin.isRaw ?? false;
@@ -2060,14 +2122,14 @@ function promptSecret(message) {
   return ask(message, { mask: true });
 }
 async function promptConfirm(message, defaultYes = true) {
-  const a = (await ask(`${message} ${c.dim(defaultYes ? "[Y/n]" : "[y/N]")}`)).trim().toLowerCase();
+  const a = (await ask(`${message} ${c2.dim(defaultYes ? "[Y/n]" : "[y/N]")}`)).trim().toLowerCase();
   if (!a)
     return defaultYes;
   return a === "y" || a === "yes";
 }
 
 // src/commands/doctor.ts
-import { existsSync as existsSync4 } from "node:fs";
+import { existsSync as existsSync5 } from "node:fs";
 function registerDoctor(program2) {
   program2.command("doctor").description("体检：配置 / 云端连通 / 剪映目录 / 运行时是否就绪").action(async () => {
     await runDoctor();
@@ -2116,7 +2178,7 @@ async function runDoctor() {
   }
   rows.push({ name: "云端连通 + 鉴权", status: apiStatus, detail: apiDetail });
   const draftDir = resolveJianyingDraftDir(undefined);
-  const draftOk = !!draftDir && existsSync4(draftDir);
+  const draftOk = !!draftDir && existsSync5(draftDir);
   rows.push({
     name: "剪映草稿目录",
     status: draftOk ? "ok" : "warn",
@@ -2124,8 +2186,8 @@ async function runDoctor() {
   });
   rows.push({
     name: "配置文件",
-    status: existsSync4(configPath()) ? "ok" : "warn",
-    detail: existsSync4(configPath()) ? configPath() : `未生成 —— 跑 gtrk init（${configPath()}）`
+    status: existsSync5(configPath()) ? "ok" : "warn",
+    detail: existsSync5(configPath()) ? configPath() : `未生成 —— 跑 gtrk init（${configPath()}）`
   });
   console.log(`
 gtrk 体检：
@@ -2143,34 +2205,8 @@ gtrk 体检：
   return !failed;
 }
 
-// src/lib/log.ts
-var c2 = {
-  dim: (s) => `\x1B[2m${s}\x1B[0m`,
-  cyan: (s) => `\x1B[36m${s}\x1B[0m`,
-  green: (s) => `\x1B[32m${s}\x1B[0m`,
-  yellow: (s) => `\x1B[33m${s}\x1B[0m`,
-  red: (s) => `\x1B[31m${s}\x1B[0m`
-};
-var humanOut = process.stdout;
-function routeLogsToStderr() {
-  humanOut = process.stderr;
-}
-var line = (s) => humanOut.write(`${s}
-`);
-var log = {
-  step: (msg) => line(c2.cyan(msg)),
-  info: (msg) => line(c2.dim(`   ${msg}`)),
-  ok: (msg) => line(c2.green(`✅ ${msg}`)),
-  warn: (msg) => line(c2.yellow(`⚠️  ${msg}`)),
-  err: (msg) => process.stderr.write(`${c2.red(`❌ ${msg}`)}
-`),
-  tick: (msg) => humanOut.write(`\r   ${msg}\x1B[K`),
-  tickEnd: () => humanOut.write(`
-`)
-};
-
 // src/commands/init.ts
-var GUIDE_IMAGE = join4(packageRoot(), "assets", "jianying-draft-path.png");
+var GUIDE_IMAGE = join5(packageRoot(), "assets", "jianying-draft-path.png");
 function registerInit(program2) {
   program2.command("init").description("一次性配置：API Key + 剪映草稿目录（之后所有命令免重复配置）").option("--api-key <key>", "非交互：直接指定 API Key").option("--api-base <url>", "非交互：指定 API 根地址（缺省用默认生产地址）").option("--jianying-draft-dir <dir>", "非交互：剪映草稿目录（传 auto 则自动探测）").option("-y, --yes", "非交互：用传入值 + 自动探测，不弹任何提示").action(runInit);
 }
@@ -2205,7 +2241,7 @@ async function runInit(opts) {
     openFile(GUIDE_IMAGE);
     const manual = (await promptText("剪映草稿根目录（…\\com.lveditor.draft），留空跳过：")).trim();
     if (manual) {
-      if (existsSync5(manual))
+      if (existsSync6(manual))
         jianyingDraftDir = resolve2(manual);
       else
         log.warn(`目录不存在，已跳过：${manual}`);
@@ -2254,10 +2290,20 @@ async function runInitNonInteractive(opts) {
   await runDoctor();
 }
 
+// src/commands/install.ts
+function registerInstall(program2) {
+  program2.command("install").description("一条命令装全：安装 /gtrk-oralcut skill + 配置（对标飞书 lark-cli install）").option("--api-key <key>", "非交互：直接指定 API Key").option("--api-base <url>", "非交互：指定 API 根地址").option("--jianying-draft-dir <dir>", "非交互：剪映草稿目录（传 auto 则自动探测）").option("--skills-dir <dir>", "自定义 skills 目录（缺省 ~/.claude/skills）").option("-y, --yes", "非交互：用传入值 + 自动探测，不弹任何提示").action(async (opts) => {
+    log.step("① 安装 agent skill…");
+    installSkill({ dir: opts.skillsDir });
+    log.step("② 配置 + 体检…");
+    await runInit(opts);
+  });
+}
+
 // src/commands/oralcut.ts
-import { resolve as resolve3, join as join6, dirname as dirname2, basename as basename2, extname } from "node:path";
+import { resolve as resolve3, join as join7, dirname as dirname2, basename as basename2, extname } from "node:path";
 import { mkdir as mkdir2, cp, readFile as readFile2 } from "node:fs/promises";
-import { existsSync as existsSync7 } from "node:fs";
+import { existsSync as existsSync8 } from "node:fs";
 
 // src/lib/config.ts
 function loadConfig() {
@@ -2357,18 +2403,18 @@ async function download(url, dest) {
 }
 
 // src/lib/upload-cache.ts
-import { homedir as homedir2 } from "node:os";
-import { join as join5 } from "node:path";
+import { homedir as homedir3 } from "node:os";
+import { join as join6 } from "node:path";
 import { stat, mkdir, readFile, writeFile as writeFile2 } from "node:fs/promises";
-import { existsSync as existsSync6 } from "node:fs";
-var CACHE_DIR = join5(homedir2(), ".gtrk-cli");
-var CACHE_FILE = join5(CACHE_DIR, "upload-cache.json");
+import { existsSync as existsSync7 } from "node:fs";
+var CACHE_DIR = join6(homedir3(), ".gtrk-cli");
+var CACHE_FILE = join6(CACHE_DIR, "upload-cache.json");
 async function fingerprint(path) {
   const s = await stat(path);
   return `${s.size}:${Math.round(s.mtimeMs)}`;
 }
 async function load() {
-  if (!existsSync6(CACHE_FILE))
+  if (!existsSync7(CACHE_FILE))
     return {};
   try {
     return JSON.parse(await readFile(CACHE_FILE, "utf8"));
@@ -2439,17 +2485,17 @@ async function runOralCut(input, opts) {
     routeLogsToStderr();
   const cfg = loadConfig();
   const inputAbs = resolve3(input);
-  if (!existsSync7(inputAbs))
+  if (!existsSync8(inputAbs))
     throw new Error(`毛片不存在：${inputAbs}`);
   const projName = basename2(inputAbs, extname(inputAbs));
   const formats = opts.formats.split(",").map((s) => s.trim()).filter(Boolean);
   const wantJianying = formats.some((f) => f === "jianying" || f === "capcut");
-  const outDir = resolve3(opts.out ?? join6(dirname2(inputAbs), `${projName}-video-project-${timestamp()}`));
+  const outDir = resolve3(opts.out ?? join7(dirname2(inputAbs), `${projName}-video-project-${timestamp()}`));
   await mkdir2(outDir, { recursive: true });
   let scriptPath = opts.script ? resolve3(opts.script) : undefined;
   if (!scriptPath) {
-    const sibling = join6(dirname2(inputAbs), `${projName}.txt`);
-    if (existsSync7(sibling)) {
+    const sibling = join7(dirname2(inputAbs), `${projName}.txt`);
+    if (existsSync8(sibling)) {
       scriptPath = sibling;
       log.info(`自动识别到同名文稿：${sibling}（按有稿剪辑；不想用就改名或显式 --script）`);
     }
@@ -2508,9 +2554,9 @@ async function runOralCut(input, opts) {
   const byFormat = {};
   for (const f of files) {
     const base = baseFormat(f.format);
-    const fmtDir = join6(outDir, base);
+    const fmtDir = join7(outDir, base);
     await mkdir2(fmtDir, { recursive: true });
-    const dest = join6(fmtDir, f.filename);
+    const dest = join7(fmtDir, f.filename);
     await download(f.download_url, dest);
     (byFormat[base] ??= []).push(dest);
     log.info(`${FORMAT_META[base]?.label ?? f.format} ← ${f.filename}`);
@@ -2520,16 +2566,16 @@ async function runOralCut(input, opts) {
   }
   let jianyingDraftPath;
   if (byFormat.jianying && draftDir) {
-    jianyingDraftPath = join6(draftDir, basename2(outDir));
+    jianyingDraftPath = join7(draftDir, basename2(outDir));
     await mkdir2(jianyingDraftPath, { recursive: true });
-    await cp(join6(outDir, "jianying"), jianyingDraftPath, { recursive: true });
+    await cp(join7(outDir, "jianying"), jianyingDraftPath, { recursive: true });
     log.info(`剪映草稿已落到：${jianyingDraftPath}`);
   }
   if (!opts.json) {
     log.step("⑤ 三方打开（产物已就位，按需自取）：");
     for (const base of Object.keys(byFormat)) {
       const meta = FORMAT_META[base];
-      const target = base === "jianying" ? jianyingDraftPath ?? join6(outDir, "jianying") : byFormat[base][0];
+      const target = base === "jianying" ? jianyingDraftPath ?? join7(outDir, "jianying") : byFormat[base][0];
       console.log(`   • ${meta?.label ?? base}：${meta?.openHint(target) ?? target}`);
     }
   }
@@ -2552,32 +2598,14 @@ async function runOralCut(input, opts) {
   }
 }
 
-// src/commands/skills.ts
-import { homedir as homedir3 } from "node:os";
-import { join as join7 } from "node:path";
-import { existsSync as existsSync8, mkdirSync as mkdirSync2, copyFileSync } from "node:fs";
-var SKILL_NAME = "gtrk-oralcut";
-var SRC = join7(packageRoot(), "skills", SKILL_NAME, "SKILL.md");
-function registerSkills(program2) {
-  const skills = program2.command("skills").description("管理 agent skill（安装到 Claude Code）");
-  skills.command("install").description(`把 /${SKILL_NAME} 安装到 ~/.claude/skills（对标飞书 skills add）`).option("--dir <dir>", "自定义 skills 目录（缺省 ~/.claude/skills）").action((opts) => {
-    if (!existsSync8(SRC))
-      throw new Error(`找不到打包的 skill 源：${SRC}`);
-    const base = opts.dir ?? join7(homedir3(), ".claude", "skills");
-    const dest = join7(base, SKILL_NAME);
-    mkdirSync2(dest, { recursive: true });
-    copyFileSync(SRC, join7(dest, "SKILL.md"));
-    console.log(`✅ 已安装 /${SKILL_NAME} → ${join7(dest, "SKILL.md")}`);
-    console.log("   在 Claude Code 里打 /gtrk-oralcut，或直接说「帮我剪个口播」即可触发（可能需重载会话）。");
-  });
-}
-
 // src/index.ts
 try {
   process.loadEnvFile?.();
 } catch {}
+var { version } = JSON.parse(readFileSync2(join8(packageRoot(), "package.json"), "utf8"));
 var program2 = new Command;
-program2.name("gtrk").description("同合云成片流水线 CLI —— agent 驱动云端任务、产物拉回本地、三方工程文件（客户端/剪映/PR）互通").version("0.1.0");
+program2.name("gtrk").description("同合云成片流水线 CLI —— agent 驱动云端任务、产物拉回本地、三方工程文件（客户端/剪映/PR）互通").version(version);
+registerInstall(program2);
 registerInit(program2);
 registerOralCut(program2);
 registerDoctor(program2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitruck/cli",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "同合云成片流水线 CLI —— agent 驱动云端任务、产物拉回本地、三方工程文件（客户端/剪映/PR）互通。",
   "license": "MIT",
   "author": "Gitruck (同合云)",