@przeprogramowani/10x-cli 1.23.0 → 1.23.1

package/README.md

@@ -7,6 +7,10 @@ prompts, and configs directly into your workspace.
 
 - **Node 20+** — this is the only runtime dependency.
 
+Corporate firewall / proxy allowlist (for security and sysadmin teams):
+Polish [docs/wymagania-sieciowe.md](docs/wymagania-sieciowe.md),
+English [docs/network-requirements.md](docs/network-requirements.md).
+
 ## Install
 
 ```bash
@@ -181,7 +185,7 @@ remain visible. Full lesson downloads and other commands remain available below.
 | `--name <name>` | Filter by artifact name (requires `--type`) |
 | `--dry-run` | Show what would be written without touching the filesystem |
 | `--course <slug>` | Select an entitled course ID or slug; default is the project edition or API recommendation |
-| `--no-course-rules` | Skip the course rules block in your rules file (`CLAUDE.md`/`AGENTS.md`); removes an unchanged block whose ownership and baseline are known. Use `--course-rules` to re-enable. |
+| `--no-course-rules` | Skip the course rules block in your rules file (`CLAUDE.md`/`AGENTS.md`); removes an unchanged block whose ownership and baseline are known. Broken or duplicate markers are left untouched so skills and prompts can still apply. Use `--course-rules` to re-enable. |
 
 #### Examples
 
@@ -204,6 +208,7 @@ remain visible. Full lesson downloads and other commands remain available below.
 
 # Skip the course rules block (use only your rules). Persisted across runs;
 # an unchanged block with a known baseline is removed. Re-enable later with --course-rules.
+# Also the recovery path when CLAUDE.md markers are broken (orphan/duplicate).
 10x get m1l1 --no-course-rules
 10x get m1l2 --course-rules
 

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.23.0",
+  version: "1.23.1",
   description: "Open-source CLI for 10xDevs course content",
   repository: {
     type: "git",
@@ -5655,6 +5655,62 @@ var defaultDeps = {
 import { existsSync as existsSync5, accessSync, constants } from "node:fs";
 import { join as join6 } from "node:path";
 
+// src/lib/sentinel-migration.ts
+var OLD_BEGIN = "<!-- BEGIN @przeprogramowani/10x-toolkit -->";
+var OLD_END = "<!-- END @przeprogramowani/10x-toolkit -->";
+class RulesMarkerRepairError extends Error {
+  constructor(detail) {
+    super(`Rules markers need repair: ${detail}`);
+    this.name = "RulesMarkerRepairError";
+  }
+}
+function inspectRulesBlock(content, begin, end) {
+  const starts = content.split(begin).length - 1;
+  const ends = content.split(end).length - 1;
+  if (!starts && !ends)
+    return null;
+  const start = content.indexOf(begin);
+  const stop = content.indexOf(end);
+  if (starts !== 1 || ends !== 1 || stop < start) {
+    throw new RulesMarkerRepairError("orphan, duplicate, or out-of-order sentinel. Preserve the file and resolve its markers before continuing.");
+  }
+  const finish = stop + end.length;
+  return { start, finish, text: content.slice(start, finish), body: content.slice(start + begin.length, stop).trim() };
+}
+function removeRulesBlockWithMarkers(existing, begin, end) {
+  const block = inspectRulesBlock(existing, begin, end);
+  if (!block)
+    return { content: existing, removed: false };
+  return { content: existing.slice(0, block.start) + existing.slice(block.finish), removed: true };
+}
+function applyRulesBlockWithMarkers(existing, body, begin, end) {
+  for (const marker of [OLD_BEGIN, OLD_END, begin, end]) {
+    if (body.includes(marker))
+      throw new Error(`rules body contains a sentinel marker (${JSON.stringify(marker)})`);
+  }
+  const current = inspectRulesBlock(existing, begin, end);
+  const legacy = begin === OLD_BEGIN ? null : inspectRulesBlock(existing, OLD_BEGIN, OLD_END);
+  const fresh = `${begin}
+
+${body.trim()}
+
+${end}`;
+  const blocks = [current, legacy].filter((entry) => entry !== null).sort((a2, b2) => a2.start - b2.start);
+  if (blocks.length > 1 && blocks[0].finish > blocks[1].start)
+    throw new RulesMarkerRepairError("nested sentinel blocks.");
+  if (!blocks.length)
+    return { content: `${existing}${existing && !existing.endsWith(`
+`) ? `
+` : ""}${fresh}
+`, warnings: [] };
+  let content = existing;
+  for (let i = blocks.length - 1;i >= 0; i--) {
+    const block = blocks[i];
+    content = content.slice(0, block.start) + (i === 0 ? fresh : "") + content.slice(block.finish);
+  }
+  return { content, warnings: [] };
+}
+
 // src/lib/course-selection.ts
 class CourseSelectionError extends Error {
   code;
@@ -5696,6 +5752,9 @@ function reportCourseError(ctx, error) {
   if (error instanceof CourseBindingError || error instanceof CourseSelectionError) {
     outputError(ctx, error.code, error.message, error.code === "course_access_denied" ? ExitCodes.FORBIDDEN : error.code === "course_mismatch" ? ExitCodes.USAGE : ExitCodes.ERROR);
   }
+  if (error instanceof RulesMarkerRepairError) {
+    outputError(ctx, "rules_markers_need_repair", error.message, ExitCodes.ERROR, "Keep the file and leave exactly one BEGIN/END pair, in that order. Text before or after the block is allowed. To skip the course rules block and still apply the lesson, run '10x get <lesson> --no-course-rules'.");
+  }
   throw error;
 }
 async function resolveCourseSelection(ctx, options, dependencies = {}) {
@@ -6171,58 +6230,6 @@ function pruneEmptyParents(root, file, boundary) {
 // src/lib/managed-rules.ts
 import { existsSync as existsSync7, readFileSync as readFileSync6 } from "node:fs";
 import { join as join7 } from "node:path";
-
-// src/lib/sentinel-migration.ts
-var OLD_BEGIN = "<!-- BEGIN @przeprogramowani/10x-toolkit -->";
-var OLD_END = "<!-- END @przeprogramowani/10x-toolkit -->";
-function inspectRulesBlock(content, begin, end) {
-  const starts = content.split(begin).length - 1;
-  const ends = content.split(end).length - 1;
-  if (!starts && !ends)
-    return null;
-  const start = content.indexOf(begin);
-  const stop = content.indexOf(end);
-  if (starts !== 1 || ends !== 1 || stop < start) {
-    throw new Error("Rules markers need repair: orphan, duplicate, or out-of-order sentinel. Preserve the file and resolve its markers before continuing.");
-  }
-  const finish = stop + end.length;
-  return { start, finish, text: content.slice(start, finish), body: content.slice(start + begin.length, stop).trim() };
-}
-function removeRulesBlockWithMarkers(existing, begin, end) {
-  const block = inspectRulesBlock(existing, begin, end);
-  if (!block)
-    return { content: existing, removed: false };
-  return { content: existing.slice(0, block.start) + existing.slice(block.finish), removed: true };
-}
-function applyRulesBlockWithMarkers(existing, body, begin, end) {
-  for (const marker of [OLD_BEGIN, OLD_END, begin, end]) {
-    if (body.includes(marker))
-      throw new Error(`rules body contains a sentinel marker (${JSON.stringify(marker)})`);
-  }
-  const current = inspectRulesBlock(existing, begin, end);
-  const legacy = begin === OLD_BEGIN ? null : inspectRulesBlock(existing, OLD_BEGIN, OLD_END);
-  const fresh = `${begin}
-
-${body.trim()}
-
-${end}`;
-  const blocks = [current, legacy].filter((entry) => entry !== null).sort((a2, b2) => a2.start - b2.start);
-  if (blocks.length > 1 && blocks[0].finish > blocks[1].start)
-    throw new Error("Rules markers need repair: nested sentinel blocks.");
-  if (!blocks.length)
-    return { content: `${existing}${existing && !existing.endsWith(`
-`) ? `
-` : ""}${fresh}
-`, warnings: [] };
-  let content = existing;
-  for (let i = blocks.length - 1;i >= 0; i--) {
-    const block = blocks[i];
-    content = content.slice(0, block.start) + (i === 0 ? fresh : "") + content.slice(block.finish);
-  }
-  return { content, warnings: [] };
-}
-
-// src/lib/managed-rules.ts
 function otherRulesOwners(root, profile) {
   const owners = [];
   for (const candidate of [...Object.values(PROFILES), ...Object.values(LEGACY_PROFILES)]) {
@@ -6236,14 +6243,32 @@ function otherRulesOwners(root, profile) {
   }
   return owners;
 }
+function inspectExisting(content, begin, end) {
+  try {
+    return { malformed: false, block: inspectRulesBlock(content, begin, end) };
+  } catch {
+    return { malformed: true, block: null };
+  }
+}
 function planManagedRules(root, profile, body, enabled, baseline) {
   const path = join7(root, profile.rulesFile);
   assertProjectFilePath(root, path);
   const existing = existsSync7(path) ? readFileSync6(path, "utf8") : "";
-  const block = inspectRulesBlock(existing, profile.sentinelBegin, profile.sentinelEnd);
-  const legacy = inspectRulesBlock(existing, OLD_BEGIN, OLD_END);
-  if (block && legacy && Math.max(block.start, legacy.start) < Math.min(block.finish, legacy.finish))
-    throw new Error("Rules markers need repair: nested sentinel blocks.");
+  const current = inspectExisting(existing, profile.sentinelBegin, profile.sentinelEnd);
+  const legacyScan = inspectExisting(existing, OLD_BEGIN, OLD_END);
+  const block = current.block;
+  const legacy = legacyScan.block;
+  const nested = !!block && !!legacy && Math.max(block.start, legacy.start) < Math.min(block.finish, legacy.finish);
+  const malformed = current.malformed || legacyScan.malformed || nested;
+  if (malformed) {
+    if (!enabled)
+      return { action: "conflict_skipped", content: existing, isConflict: true, reason: "malformed_markers", next: baseline };
+    if (body === undefined)
+      return { action: "unchanged", content: existing, isConflict: false, next: baseline };
+    if (nested)
+      throw new RulesMarkerRepairError("nested sentinel blocks.");
+    inspectRulesBlock(existing, current.malformed ? profile.sentinelBegin : OLD_BEGIN, current.malformed ? profile.sentinelEnd : OLD_END);
+  }
   if (body === undefined && enabled)
     return { action: "unchanged", content: existing, isConflict: false, next: baseline };
   const validBaseline = baseline?.path === profile.rulesFile && baseline.begin === profile.sentinelBegin && baseline.end === profile.sentinelEnd ? baseline : undefined;

package/package.json

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