dskcode 0.1.13 → 0.1.15

package/README.md

@@ -6,7 +6,7 @@
 [![Node.js](https://img.shields.io/badge/node-%3E%3D18-brightgreen)](https://nodejs.org)
 [![License](https://img.shields.io/badge/license-MIT-blue)](LICENSE)
 
-![dskcode](https://raw.githubusercontent.com/Awu12277/deepseek-agent-cli/refs/heads/main/public/dscoderun.gif)
+![dskcode](https://raw.githubusercontent.com/Awu12277/deepseek-agent-cli/refs/heads/main/public/dskcoderun.gif)
 ---
 
 ## 特性

package/dist/index.js

@@ -487,9 +487,210 @@ async function promptForApiKey() {
   });
 }
 
+// src/cli/skill-import.ts
+import { createInterface as createInterface2 } from "readline";
+import { existsSync as existsSync2, statSync, lstatSync } from "fs";
+import { mkdir as mkdir2, readdir, cp, access, realpath } from "fs/promises";
+import { join as join2 } from "path";
+import chalk3 from "chalk";
+function getClaudeSkillsDir() {
+  const home = process.env.HOME ?? process.env.USERPROFILE ?? "~";
+  return join2(home, ".claude", "skills");
+}
+function getDskcodeSkillsDir() {
+  const home = process.env.HOME ?? process.env.USERPROFILE ?? "~";
+  return join2(home, ".dskcode", "skills");
+}
+async function isSkillDir(dir) {
+  try {
+    await access(join2(dir, "SKILL.md"));
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function listClaudeSkills() {
+  const claudeDir = getClaudeSkillsDir();
+  if (!existsSync2(claudeDir)) return [];
+  let entries;
+  try {
+    entries = await readdir(claudeDir);
+  } catch {
+    return [];
+  }
+  const skills = [];
+  for (const name of entries) {
+    const full = join2(claudeDir, name);
+    const stat = statSync(full);
+    if (stat.isDirectory() && await isSkillDir(full)) {
+      skills.push(name);
+    }
+  }
+  return skills;
+}
+function askConfirm(question) {
+  const rl = createInterface2({
+    input: process.stdin,
+    output: process.stdout
+  });
+  return new Promise((resolve) => {
+    let resolved = false;
+    const cleanup = () => {
+      if (resolved) return;
+      resolved = true;
+      process.stdin.removeListener("keypress", onKeypress);
+      rl.close();
+    };
+    const onKeypress = (_, key) => {
+      if (key.ctrl && key.name === "c") {
+        cleanup();
+        resolve(false);
+      }
+    };
+    process.stdin.on("keypress", onKeypress);
+    rl.question(question, (answer) => {
+      cleanup();
+      const trimmed = answer.trim().toLowerCase();
+      resolve(trimmed === "y" || trimmed === "yes");
+    });
+  });
+}
+async function importClaudeSkills(skillNames) {
+  const claudeDir = getClaudeSkillsDir();
+  const dskcodeDir = getDskcodeSkillsDir();
+  await mkdir2(dskcodeDir, { recursive: true });
+  const imported = [];
+  const skipped = [];
+  for (const name of skillNames) {
+    const src = join2(claudeDir, name);
+    const dest = join2(dskcodeDir, name);
+    if (existsSync2(dest)) {
+      skipped.push(name);
+      continue;
+    }
+    const realSrc = lstatSync(src).isSymbolicLink() ? await realpath(src) : src;
+    await cp(realSrc, dest, { recursive: true, dereference: true });
+    imported.push(name);
+  }
+  return { imported, skipped };
+}
+async function countDskcodeSkills() {
+  const dskcodeDir = getDskcodeSkillsDir();
+  if (!existsSync2(dskcodeDir)) return 0;
+  let entries;
+  try {
+    entries = await readdir(dskcodeDir);
+  } catch {
+    return 0;
+  }
+  let count = 0;
+  for (const name of entries) {
+    const full = join2(dskcodeDir, name);
+    if (statSync(full).isDirectory() && await isSkillDir(full)) {
+      count++;
+    }
+  }
+  return count;
+}
+function getProjectSkillDir(cwd) {
+  return join2(cwd, ".dskcode", "skill");
+}
+async function hasProjectLocalSkills(cwd) {
+  const count = await countProjectLocalSkills(cwd);
+  return count > 0;
+}
+async function countProjectLocalSkills(cwd) {
+  const skillDir = getProjectSkillDir(cwd);
+  if (!existsSync2(skillDir)) return 0;
+  let entries;
+  try {
+    entries = await readdir(skillDir);
+  } catch {
+    return 0;
+  }
+  let count = 0;
+  for (const name of entries) {
+    const full = join2(skillDir, name);
+    const stat = statSync(full);
+    if (stat.isDirectory() && await isSkillDir(full)) {
+      count++;
+    }
+  }
+  return count;
+}
+async function hasDskcodeSkills() {
+  const dskcodeDir = getDskcodeSkillsDir();
+  if (!existsSync2(dskcodeDir)) return false;
+  let entries;
+  try {
+    entries = await readdir(dskcodeDir);
+  } catch {
+    return false;
+  }
+  for (const name of entries) {
+    const full = join2(dskcodeDir, name);
+    const stat = statSync(full);
+    if (stat.isDirectory() && await isSkillDir(full)) {
+      return true;
+    }
+  }
+  return false;
+}
+async function promptImportClaudeSkills(cwd) {
+  if (cwd) {
+    const hasLocal = await hasProjectLocalSkills(cwd);
+    if (hasLocal) {
+      console.log(chalk3.dim("  \u68C0\u6D4B\u5230\u9879\u76EE\u672C\u5730 .dskcode/skill\uFF0C\u8DF3\u8FC7\u5BFC\u5165 Claude Code skill\n"));
+      return;
+    }
+  }
+  const hasGlobal = await hasDskcodeSkills();
+  if (hasGlobal) {
+    return;
+  }
+  const skills = await listClaudeSkills();
+  if (skills.length === 0) return;
+  console.log(chalk3.cyan(`
+  \u2726 \u68C0\u6D4B\u5230\u4F60\u5728 Claude Code \u4E2D\u5B89\u88C5\u4E86 ${String(skills.length)} \u4E2A skill\uFF1A`));
+  const preview = skills.slice(0, 5).map((s) => chalk3.dim(`    \xB7 ${s}`)).join("\n");
+  console.log(preview);
+  if (skills.length > 5) {
+    console.log(chalk3.dim(`    \xB7 ...\u7B49 ${String(skills.length)} \u4E2A`));
+  }
+  console.log(chalk3.dim(`  \u6E90\u76EE\u5F55: ${getClaudeSkillsDir()}`));
+  console.log(chalk3.dim(`  \u76EE\u6807\u76EE\u5F55: ${getDskcodeSkillsDir()}
+`));
+  const confirmed = await askConfirm(
+    `  ${chalk3.cyan("\u{1F4E6}")} \u662F\u5426\u5C06\u8FD9\u4E9B skill \u5BFC\u5165\u5230 dskcode\uFF1F${chalk3.dim("[y/N] ")} `
+  );
+  if (!confirmed) {
+    console.log(chalk3.dim("  \u5DF2\u8DF3\u8FC7 skill \u5BFC\u5165\n"));
+    return;
+  }
+  try {
+    const { imported, skipped } = await importClaudeSkills(skills);
+    if (imported.length > 0) {
+      console.log(
+        chalk3.green(`  \u2714 \u5DF2\u5BFC\u5165 ${String(imported.length)} \u4E2A skill \u5230 ~/.dskcode/skills`)
+      );
+    }
+    if (skipped.length > 0) {
+      console.log(
+        chalk3.yellow(`  \u26A0 ${String(skipped.length)} \u4E2A skill \u5DF2\u5B58\u5728\uFF0C\u5DF2\u8DF3\u8FC7\uFF1A${skipped.join(", ")}`)
+      );
+    }
+    console.log("");
+  } catch (err) {
+    console.log(
+      chalk3.red(`  \u2716 \u5BFC\u5165 skill \u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`)
+    );
+    console.log(chalk3.dim("  \u4F60\u53EF\u4EE5\u7A0D\u540E\u624B\u52A8\u590D\u5236 ~/.claude/skills \u5230 ~/.dskcode/skills\n"));
+  }
+}
+
 // src/cli/index.tsx
 import { readFile as readFile3 } from "fs/promises";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 
 // src/ui/RenderScope.tsx
 import { render } from "ink";
@@ -567,8 +768,8 @@ function useDoubleCtrlC(onExit) {
 import { Box as Box4, Text as Text5 } from "ink";
 
 // src/provider/cost-tracker.ts
-import { mkdir as mkdir2, readFile as readFile2, writeFile as writeFile2 } from "fs/promises";
-import { join as join2 } from "path";
+import { mkdir as mkdir3, readFile as readFile2, writeFile as writeFile2 } from "fs/promises";
+import { join as join3 } from "path";
 var CostTracker = class {
   #costDir;
   #budgetLimit;
@@ -586,7 +787,7 @@ var CostTracker = class {
   #flushInProgress = false;
   constructor(options = {}) {
     const home = process.env.HOME ?? process.env.USERPROFILE ?? "~";
-    this.#costDir = options.costDir ?? join2(home, ".dskcode", "costs");
+    this.#costDir = options.costDir ?? join3(home, ".dskcode", "costs");
     this.#budgetLimit = options.budgetLimit ?? 0;
     this.#tokenBudgetLimit = options.tokenBudgetLimit ?? 0;
     this.#onBudgetExceeded = options.onBudgetExceeded;
@@ -800,7 +1001,7 @@ var CostTracker = class {
   }
   /** 从磁盘加载成本存储 */
   async #loadStore() {
-    const filePath = join2(this.#costDir, "history.json");
+    const filePath = join3(this.#costDir, "history.json");
     try {
       const raw = await readFile2(filePath, "utf-8");
       return JSON.parse(raw);
@@ -819,8 +1020,8 @@ var CostTracker = class {
     for (const date of datesToRemove) {
       delete store.daily[date];
     }
-    await mkdir2(this.#costDir, { recursive: true });
-    const filePath = join2(this.#costDir, "history.json");
+    await mkdir3(this.#costDir, { recursive: true });
+    const filePath = join3(this.#costDir, "history.json");
     await writeFile2(filePath, JSON.stringify(store, null, 2), "utf-8");
   }
 };
@@ -1435,7 +1636,7 @@ function pickRandom(arr) {
   return arr[Math.floor(Math.random() * arr.length)];
 }
 function ChatSession({
-  providerCount,
+  skillCount,
   toolCount,
   verbose,
   apiKey,
@@ -1822,8 +2023,8 @@ function ChatSession({
         /* @__PURE__ */ jsxs5(Text6, { color: "#00ff41", children: [
           "  \u2714 ",
           "\u5DF2\u52A0\u8F7D ",
-          providerCount,
-          " \u4E2A Provider"
+          skillCount,
+          " \u4E2A Skill"
         ] }),
         /* @__PURE__ */ jsxs5(Text6, { color: "#00ffff", children: [
           "  \u2139 ",
@@ -2822,7 +3023,7 @@ function initGames() {
 
 // src/cli/index.tsx
 import { render as render4 } from "ink";
-import chalk3 from "chalk";
+import chalk4 from "chalk";
 
 // src/stock/StockList.tsx
 import { Box as Box9, Text as Text10, useInput as useInput5 } from "ink";
@@ -3155,18 +3356,24 @@ function createCli() {
       const key = await promptForApiKey();
       if (!key) process.exit(1);
       const savedPath = await saveApiKey(key);
-      console.log(`  ${chalk3.green("\u2714")} API Key \u5DF2\u4FDD\u5B58\u5230 ${chalk3.dim(savedPath)}
+      console.log(`  ${chalk4.green("\u2714")} API Key \u5DF2\u4FDD\u5B58\u5230 ${chalk4.dim(savedPath)}
 `);
       const result = await loadAndValidate();
       ctx = { ...ctx, config: result.config };
     }
+    await promptImportClaudeSkills(process.cwd());
     const costTracker = new CostTracker({
       budgetLimit: ctx?.config.budgetLimit ?? 0,
       tokenBudgetLimit: ctx?.config.tokenBudgetLimit ?? 0
     });
     startChat(ctx, costTracker);
   });
-  function startChat(ctx, costTracker) {
+  async function startChat(ctx, costTracker) {
+    const [globalSkillCount, localSkillCount] = await Promise.all([
+      countDskcodeSkills(),
+      countProjectLocalSkills(process.cwd())
+    ]);
+    const skillCount = globalSkillCount + localSkillCount;
     const defaultProvider = ctx?.config.providers.find(
       (p) => p.name === (ctx?.config.defaultProvider ?? "deepseek")
     );
@@ -3175,7 +3382,7 @@ function createCli() {
       /* @__PURE__ */ jsx10(
         ChatSession,
         {
-          providerCount: ctx?.config.providers.length ?? 1,
+          skillCount,
           toolCount: ctx?.config.tools.length ?? 0,
           verbose: ctx?.verbose ?? false,
           apiKey: defaultProvider?.apiKey,
@@ -3276,7 +3483,7 @@ compdef _dskcode_completion dskcode`);
   program2.command("stock").description("\u67E5\u770B\u81EA\u9009\u80A1\u5B9E\u65F6\u884C\u60C5").argument("[codes...]", "\u80A1\u7968\u4EE3\u7801\uFF08\u7A7A\u683C\u5206\u9694\uFF09\uFF0C\u5982 513090 600519").action(async function(codes) {
     const ctx = this.dskcodeCtx;
     const home = process.env.HOME ?? process.env.USERPROFILE ?? "~";
-    const globalConfigPath = join3(home, ".dskcode", "settings.json");
+    const globalConfigPath = join4(home, ".dskcode", "settings.json");
     let globalConfigHasStock = false;
     try {
       const raw = await readFile3(globalConfigPath, "utf-8");
@@ -3292,8 +3499,8 @@ compdef _dskcode_completion dskcode`);
         { code: "sh601899" }
       ];
       const savedPath = await saveStockConfig(defaultSymbols);
-      console.log(`${chalk3.green("\u2714")} \u5DF2\u751F\u6210\u81EA\u9009\u80A1\u914D\u7F6E: ${chalk3.dim(savedPath)}`);
-      console.log(`${chalk3.dim("  \u63D0\u793A: \u53EF\u7F16\u8F91\u4E0A\u8FF0\u6587\u4EF6\u81EA\u5B9A\u4E49\u81EA\u9009\u80A1\u5217\u8868")}
+      console.log(`${chalk4.green("\u2714")} \u5DF2\u751F\u6210\u81EA\u9009\u80A1\u914D\u7F6E: ${chalk4.dim(savedPath)}`);
+      console.log(`${chalk4.dim("  \u63D0\u793A: \u53EF\u7F16\u8F91\u4E0A\u8FF0\u6587\u4EF6\u81EA\u5B9A\u4E49\u81EA\u9009\u80A1\u5217\u8868")}
 `);
     }
     const freshResult = await loadAndValidate();
@@ -3347,7 +3554,7 @@ compdef _dskcode_completion dskcode`);
       });
       if (selectedGame) {
         console.log(`
-  \u542F\u52A8\u6E38\u620F: ${chalk3.green(selectedGame.name)}
+  \u542F\u52A8\u6E38\u620F: ${chalk4.green(selectedGame.name)}
 `);
         await selectedGame.play();
       }