@przeprogramowani/10x-cli 1.19.1 → 1.20.0

package/README.md

@@ -68,7 +68,7 @@ Once installed, just tell your agent to **set up 10x-cli** and it will pick up t
 
 | Flag | Description |
 |------|-------------|
-| `--tool <tool>` | AI coding tool: `claude-code`, `cursor`, `copilot`, `codex`, `windsurf`, `gemini`, `generic` |
+| `--tool <tool>` | AI coding tool: `claude-code`, `cursor`, `copilot`, `codex`, `devin-desktop`, `gemini`, `generic` |
 | `--print` | Output artifact content to stdout instead of writing files |
 | `--type <type>` | Filter by artifact type: `skills`, `prompts`, `rules`, `configs` |
 | `--name <name>` | Filter by artifact name (requires `--type`) |
@@ -197,7 +197,7 @@ scoring live in the template and the instance.
 | Flag | Description |
 |------|-------------|
 | `--template-version <tag>` | Template tag to install (default: latest) |
-| `--tool <id>` | Agent tool for skill placement (`claude-code`, `cursor`, `copilot`, `codex`, `windsurf`, `gemini`, `generic`) |
+| `--tool <id>` | Agent tool for skill placement (`claude-code`, `cursor`, `copilot`, `codex`, `devin-desktop`, `gemini`, `generic`) |
 | `--yes` | Run non-interactively, accepting defaults |
 
 ```bash
@@ -239,11 +239,14 @@ On first run, the CLI prompts you to choose your AI coding tool. Artifacts are w
 | Cursor | `.cursor/` | `.cursor/rules/10x-course.mdc` |
 | GitHub Copilot | `.github/` | `.github/copilot-instructions.md` |
 | Codex CLI | `.agents/` | `AGENTS.md` |
-| Windsurf | `.windsurf/` | `.windsurfrules` |
+| Devin Desktop | `.devin/` | `AGENTS.md` |
 | Gemini CLI | `.gemini/` | `GEMINI.md` |
 | Generic | `.ai/` | `AGENTS.md` |
 
 Override anytime with `--tool <name>`. Your choice is saved in `~/.config/10x-cli/config.json`.
+The former `windsurf` ID remains accepted as an alias and is upgraded to
+`devin-desktop`; existing `.windsurf/` artifacts can be migrated by the normal
+tool-switch prompt.
 
 ## Development
 

package/dist/index.mjs

@@ -3183,7 +3183,7 @@ var cac = (name = "") => new CAC(name);
 // package.json
 var package_default = {
   name: "@przeprogramowani/10x-cli",
-  version: "1.19.1",
+  version: "1.20.0",
   description: "Open-source CLI for 10xDevs course content",
   repository: {
     type: "git",
@@ -4296,15 +4296,16 @@ var PROFILES = {
     sentinelBegin: SENTINEL_BEGIN,
     sentinelEnd: SENTINEL_END
   },
-  windsurf: {
-    toolId: "windsurf",
-    displayName: "Windsurf",
-    skillPath: (n) => `.windsurf/skills/${n}/SKILL.md`,
-    skillDir: (n) => `.windsurf/skills/${n}`,
-    promptPath: (n) => `.windsurf/prompts/${n}.md`,
-    configPath: (n) => `.windsurf/config-templates/${n}`,
-    rulesFile: ".windsurfrules",
-    manifestDir: ".windsurf",
+  "devin-desktop": {
+    toolId: "devin-desktop",
+    contentToolId: "windsurf",
+    displayName: "Devin Desktop",
+    skillPath: (n) => `.devin/skills/${n}/SKILL.md`,
+    skillDir: (n) => `.devin/skills/${n}`,
+    promptPath: (n) => `.devin/prompts/${n}.md`,
+    configPath: (n) => `.devin/config-templates/${n}`,
+    rulesFile: "AGENTS.md",
+    manifestDir: ".devin",
     sentinelBegin: SENTINEL_BEGIN,
     sentinelEnd: SENTINEL_END
   },
@@ -4333,6 +4334,32 @@ var PROFILES = {
     sentinelEnd: SENTINEL_END
   }
 };
+var TOOL_ALIASES = {
+  windsurf: "devin-desktop"
+};
+var LEGACY_PROFILES = {
+  windsurf: {
+    toolId: "windsurf",
+    displayName: "Windsurf",
+    skillPath: (n) => `.windsurf/skills/${n}/SKILL.md`,
+    skillDir: (n) => `.windsurf/skills/${n}`,
+    promptPath: (n) => `.windsurf/prompts/${n}.md`,
+    configPath: (n) => `.windsurf/config-templates/${n}`,
+    rulesFile: ".windsurfrules",
+    manifestDir: ".windsurf",
+    sentinelBegin: SENTINEL_BEGIN,
+    sentinelEnd: SENTINEL_END
+  }
+};
+function canonicalToolId(toolId) {
+  return TOOL_ALIASES[toolId] ?? toolId;
+}
+function getToolProfile(toolId) {
+  return PROFILES[canonicalToolId(toolId)];
+}
+function contentToolId(profile) {
+  return profile.contentToolId ?? profile.toolId;
+}
 var DEFAULT_TOOL = "claude-code";
 
 // src/lib/tool-detect.ts
@@ -4391,16 +4418,34 @@ function detectTools(projectRoot) {
   } else if (hit("AGENTS.md") && !hit(".ai")) {
     signals.push({ profileId: "codex", confidence: "medium", reason: "AGENTS.md" });
   }
-  if (hit(".windsurf/" + MANIFEST_FILENAME)) {
+  if (hit(".devin/" + MANIFEST_FILENAME)) {
+    signals.push({
+      profileId: "devin-desktop",
+      confidence: "strong",
+      reason: ".devin/.10x-cli-manifest.json"
+    });
+  } else if (hit(".devin/rules")) {
+    signals.push({ profileId: "devin-desktop", confidence: "strong", reason: ".devin/rules/" });
+  } else if (hit(".devin")) {
+    signals.push({ profileId: "devin-desktop", confidence: "medium", reason: ".devin/ directory" });
+  } else if (hit(".windsurf/" + MANIFEST_FILENAME)) {
     signals.push({
-      profileId: "windsurf",
+      profileId: "devin-desktop",
       confidence: "strong",
-      reason: ".windsurf/.10x-cli-manifest.json"
+      reason: ".windsurf/.10x-cli-manifest.json (legacy)"
     });
   } else if (hit(".windsurfrules")) {
-    signals.push({ profileId: "windsurf", confidence: "strong", reason: ".windsurfrules" });
+    signals.push({
+      profileId: "devin-desktop",
+      confidence: "strong",
+      reason: ".windsurfrules (legacy)"
+    });
   } else if (hit(".windsurf")) {
-    signals.push({ profileId: "windsurf", confidence: "medium", reason: ".windsurf/ directory" });
+    signals.push({
+      profileId: "devin-desktop",
+      confidence: "medium",
+      reason: ".windsurf/ directory (legacy)"
+    });
   }
   if (hit(".gemini/" + MANIFEST_FILENAME)) {
     signals.push({
@@ -4427,7 +4472,15 @@ function detectTools(projectRoot) {
   return rankSignals(signals);
 }
 var CONFIDENCE_ORDER = { strong: 3, medium: 2, weak: 1 };
-var PROFILE_ORDER = ["claude-code", "cursor", "copilot", "codex", "windsurf", "gemini", "generic"];
+var PROFILE_ORDER = [
+  "claude-code",
+  "cursor",
+  "copilot",
+  "codex",
+  "devin-desktop",
+  "gemini",
+  "generic"
+];
 function rankSignals(signals) {
   return [...signals].sort((a2, b2) => {
     const c2 = CONFIDENCE_ORDER[b2.confidence] - CONFIDENCE_ORDER[a2.confidence];
@@ -4541,7 +4594,7 @@ async function runBenchKitInit(ctx, dirArg, options, deps = defaultDeps) {
       ...res.runnerDeps === "failed" ? ["Runner dependencies did not install — run 'npm ci --prefix .bench-kit/runner' yourself."] : res.runnerDeps === "installed" ? ["Runner dependencies installed (.bench-kit/runner/node_modules)."] : [],
       res.committed === true ? "Initialized a fresh git repository with an initial commit." : "Initialized a fresh git repository (initial commit skipped — commit the files yourself).",
       ...(res.warnings ?? []).map((warning) => `Warning: ${warning}`),
-      "Next: wire up secrets, then run 'bench validate' before the first run."
+      `Next: go to ${targetDir}, launch you preferred agent and apply skill *bench-wiring*`
     ];
     output(ctx, humanLines.join(`
 `), {
@@ -4648,10 +4701,11 @@ function describeSync(counts) {
 }
 async function resolveInstanceTool(ctx, options, deps, existingInstance) {
   if (options.tool !== undefined) {
-    if (!PROFILES[options.tool]) {
+    const canonicalId = canonicalToolId(options.tool);
+    if (!getToolProfile(options.tool)) {
       outputError(ctx, "unknown_tool", `'${options.tool}' is not a supported agent tool.`, ExitCodes.USAGE, `Supported: ${Object.keys(PROFILES).join(", ")}.`);
     }
-    return { id: options.tool, explicit: true };
+    return { id: canonicalId, explicit: true };
   }
   const signals = deps.detectToolSignals(process.cwd());
   const top = signals[0];
@@ -4666,7 +4720,7 @@ async function resolveInstanceTool(ctx, options, deps, existingInstance) {
   return { id: choice !== null && PROFILES[choice] ? choice : initial, explicit: choice !== null };
 }
 function skillRootFor(toolId) {
-  const profile = PROFILES[toolId] ?? PROFILES[DEFAULT_TOOL];
+  const profile = getToolProfile(toolId) ?? PROFILES[DEFAULT_TOOL];
   return `${profile.manifestDir}/skills`;
 }
 function allToolProfiles() {
@@ -5304,7 +5358,7 @@ async function checkCliVersion() {
 function checkToolDirectory() {
   const cwd = process.cwd();
   const toolId = readToolConfig()?.tool ?? DEFAULT_TOOL;
-  const profile = PROFILES[toolId] ?? PROFILES[DEFAULT_TOOL];
+  const profile = getToolProfile(toolId) ?? PROFILES[DEFAULT_TOOL];
   const dirName = profile.manifestDir;
   const toolDir = join5(cwd, dirName);
   if (!existsSync5(toolDir)) {
@@ -6009,7 +6063,7 @@ function removeEmptyParentDirs(filePath, skillDirAbs) {
 }
 function findOrphanedManifests(projectRoot, currentProfile) {
   const out = [];
-  for (const profile of Object.values(PROFILES)) {
+  for (const profile of [...Object.values(PROFILES), ...Object.values(LEGACY_PROFILES)]) {
     if (profile.toolId === currentProfile.toolId)
       continue;
     const manifestPath = join6(projectRoot, profile.manifestDir, MANIFEST_FILENAME);
@@ -6282,13 +6336,14 @@ async function resolveToolProfile(flagOverride, projectRoot = process.cwd()) {
 }
 async function resolveProfileOnly(flagOverride, projectRoot) {
   if (flagOverride) {
-    const profile = PROFILES[flagOverride];
+    const canonicalId = canonicalToolId(flagOverride);
+    const profile = getToolProfile(flagOverride);
     if (!profile) {
       throw new Error(`Unknown tool '${flagOverride}'. Supported: ${Object.keys(PROFILES).join(", ")}`);
     }
     const existing = readToolConfig();
-    if (existing?.tool !== flagOverride) {
-      saveToolConfig({ ...existing ?? {}, tool: flagOverride });
+    if (existing?.tool !== canonicalId) {
+      saveToolConfig({ ...existing ?? {}, tool: canonicalId });
       if (process.stdout.isTTY) {
         process.stderr.write(`Default tool set to ${profile.displayName}.
 `);
@@ -6297,8 +6352,15 @@ async function resolveProfileOnly(flagOverride, projectRoot) {
     return profile;
   }
   const config = readToolConfig();
-  if (config?.tool && PROFILES[config.tool]) {
-    return PROFILES[config.tool];
+  if (config?.tool) {
+    const profile = getToolProfile(config.tool);
+    if (profile) {
+      const canonicalId = canonicalToolId(config.tool);
+      if (canonicalId !== config.tool) {
+        saveToolConfig({ ...config, tool: canonicalId });
+      }
+      return profile;
+    }
   }
   if (process.stdout.isTTY) {
     const signals = detectTools(projectRoot);
@@ -6413,7 +6475,7 @@ function resolveCourseRulesFlag(argv) {
 }
 var DEFAULT_COURSE2 = "10xdevs3";
 function registerGetCommand(cli) {
-  cli.command("get <ref>", "Fetch and apply a lesson pack").option("--dry-run", "Show what would be written without touching the filesystem").option("--course <course>", "Override the course slug (default: 10xdevs3)").option("--tool <tool>", "AI coding tool (claude-code, cursor, copilot, codex, windsurf, gemini, generic)").option("--print", "Print artifact content to stdout instead of writing to files").option("--type <type>", "Artifact type filter: skills, prompts, rules, configs").option("--name <name>", "Artifact name filter (requires --type)").option("--lang <lang>", "Content language: en (default) or pl").option("--no-course-rules", "Skip applying the course rules block to your rules file (CLAUDE.md/AGENTS.md)").action(async (ref, options) => {
+  cli.command("get <ref>", "Fetch and apply a lesson pack").option("--dry-run", "Show what would be written without touching the filesystem").option("--course <course>", "Override the course slug (default: 10xdevs3)").option("--tool <tool>", "AI coding tool (claude-code, cursor, copilot, codex, devin-desktop, gemini, generic)").option("--print", "Print artifact content to stdout instead of writing to files").option("--type <type>", "Artifact type filter: skills, prompts, rules, configs").option("--name <name>", "Artifact name filter (requires --type)").option("--lang <lang>", "Content language: en (default) or pl").option("--no-course-rules", "Skip applying the course rules block to your rules file (CLAUDE.md/AGENTS.md)").action(async (ref, options) => {
     const ctx = resolveContext(options);
     await runGet(ctx, ref, options);
   });
@@ -6456,7 +6518,7 @@ async function runGet(ctx, ref, options) {
   verbose(ctx, `fetching lesson ${course}/${parsed.lessonId}`);
   const result = await fetchLesson(course, parsed.lessonId, auth.access_token, {
     lang,
-    tool: profile.toolId
+    tool: contentToolId(profile)
   });
   if (!result.ok) {
     handleLessonError(ctx, result.status, result.code, result.error, result.payload);
@@ -6528,7 +6590,7 @@ async function runPrintMode(ctx, lessonId, course, profile, token, lang, options
   }
   if (options.name) {
     verbose(ctx, `fetching artifact ${course}/${lessonId}/${options.type}/${options.name}`);
-    const result = await fetchArtifact(course, lessonId, options.type, options.name, profile.toolId, token, { lang });
+    const result = await fetchArtifact(course, lessonId, options.type, options.name, contentToolId(profile), token, { lang });
     if (!result.ok) {
       handleLessonError(ctx, result.status, result.code, result.error, result.payload);
     }
@@ -6546,7 +6608,7 @@ async function runPrintMode(ctx, lessonId, course, profile, token, lang, options
     }
   } else {
     verbose(ctx, `fetching lesson ${course}/${lessonId} (filtering by ${options.type})`);
-    const result = await fetchLesson(course, lessonId, token, { lang, tool: profile.toolId });
+    const result = await fetchLesson(course, lessonId, token, { lang, tool: contentToolId(profile) });
     if (!result.ok) {
       handleLessonError(ctx, result.status, result.code, result.error, result.payload);
     }
@@ -6848,7 +6910,7 @@ import { join as join9 } from "node:path";
 var DEFAULT_COURSE4 = "10xdevs3";
 var SUPPORTED_LANGS = ["en", "pl"];
 function registerSyncCommand(cli) {
-  cli.command("sync", "Bulk-download and update lessons, reporting what changed upstream").option("--all", "Sync every unlocked lesson (default: only lessons you've already downloaded)").option("--dry-run", "Show what would change without writing").option("--force", "Ignore the cheap-skip digest and overwrite local edits with upstream").option("--module <module>", "Limit to one module (e.g. 'm2' or '2')").option("--course <course>", "Override the course slug (default: 10xdevs3)").option("--tool <tool>", "AI coding tool (claude-code, cursor, copilot, codex, windsurf, gemini, generic)").option("--lang <lang>", "Content language: en (default) or pl").option("--no-course-rules", "Skip applying the course rules block to your rules file (CLAUDE.md/AGENTS.md)").action(async (options) => {
+  cli.command("sync", "Bulk-download and update lessons, reporting what changed upstream").option("--all", "Sync every unlocked lesson (default: only lessons you've already downloaded)").option("--dry-run", "Show what would change without writing").option("--force", "Ignore the cheap-skip digest and overwrite local edits with upstream").option("--module <module>", "Limit to one module (e.g. 'm2' or '2')").option("--course <course>", "Override the course slug (default: 10xdevs3)").option("--tool <tool>", "AI coding tool (claude-code, cursor, copilot, codex, devin-desktop, gemini, generic)").option("--lang <lang>", "Content language: en (default) or pl").option("--no-course-rules", "Skip applying the course rules block to your rules file (CLAUDE.md/AGENTS.md)").action(async (options) => {
     const ctx = resolveContext(options);
     await runSync(ctx, options);
   });
@@ -6949,7 +7011,7 @@ async function syncLesson(ctx, lesson, opts) {
   verbose(ctx, `${lesson.lessonId}: fetching`);
   const result = await fetchLesson(opts.course, lesson.lessonId, opts.token, {
     lang: opts.lang,
-    tool: opts.profile.toolId,
+    tool: contentToolId(opts.profile),
     signal: opts.signal
   });
   if (!result.ok) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@przeprogramowani/10x-cli",
-  "version": "1.19.1",
+  "version": "1.20.0",
   "description": "Open-source CLI for 10xDevs course content",
   "repository": {
     "type": "git",

package/skills/10x-cli-guide/SKILL.md

@@ -81,6 +81,7 @@ The primary daily command. Fetches a lesson bundle from the API and writes skill
 | Cursor | `.cursor/skills/<name>/SKILL.md` | `.cursor/prompts/<name>.md` | `.cursor/rules/10x-course.mdc` | `.cursor/config-templates/<name>` |
 | GitHub Copilot | `.github/skills/<name>/SKILL.md` | `.github/prompts/<name>.md` | `.github/copilot-instructions.md` | `.github/config-templates/<name>` |
 | Codex CLI | `.agents/skills/<name>/SKILL.md` | `.agents/prompts/<name>.md` | `AGENTS.md` | `.agents/config-templates/<name>` |
+| Devin Desktop | `.devin/skills/<name>/SKILL.md` | `.devin/prompts/<name>.md` | `AGENTS.md` | `.devin/config-templates/<name>` |
 | Generic | `.ai/skills/<name>/SKILL.md` | `.ai/prompts/<name>.md` | `AGENTS.md` | `.ai/config-templates/<name>` |
 
 **Re-applying a lesson** overwrites skills and prompts if content changed, updates the rules sentinel block, but never overwrites config templates (they may contain user edits).