@przeprogramowani/10x-cli 1.26.0 → 1.26.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.mjs +4 -2
- package/package.json +1 -1
package/dist/index.mjs
CHANGED
|
@@ -3183,7 +3183,7 @@ var cac = (name = "") => new CAC(name);
|
|
|
3183
3183
|
// package.json
|
|
3184
3184
|
var package_default = {
|
|
3185
3185
|
name: "@przeprogramowani/10x-cli",
|
|
3186
|
-
version: "1.26.
|
|
3186
|
+
version: "1.26.1",
|
|
3187
3187
|
description: "Open-source CLI for 10xDevs course content",
|
|
3188
3188
|
repository: {
|
|
3189
3189
|
type: "git",
|
|
@@ -9190,6 +9190,7 @@ function renderReport(ctx, profile, input) {
|
|
|
9190
9190
|
const buckets = countBuckets(outcomes);
|
|
9191
9191
|
const lessonsErrored = outcomes.filter((o) => o.status === "errored").length;
|
|
9192
9192
|
const lessonsConflicts = outcomes.filter((o) => o.status === "conflicts").length;
|
|
9193
|
+
const lessonsWithConflicts = outcomes.filter((o) => o.resources.some((r2) => r2.bucket === "skipped-conflict")).length;
|
|
9193
9194
|
if (ctx.json) {
|
|
9194
9195
|
output(ctx, "", {
|
|
9195
9196
|
course: input.course,
|
|
@@ -9206,6 +9207,7 @@ function renderReport(ctx, profile, input) {
|
|
|
9206
9207
|
updated: outcomes.filter((o) => o.status === "updated").length,
|
|
9207
9208
|
unchanged: outcomes.filter((o) => o.status === "unchanged").length,
|
|
9208
9209
|
conflicts: lessonsConflicts,
|
|
9210
|
+
lessonsWithConflicts,
|
|
9209
9211
|
errored: lessonsErrored,
|
|
9210
9212
|
excluded: exclusions.length,
|
|
9211
9213
|
resources: {
|
|
@@ -9256,7 +9258,7 @@ function renderReport(ctx, profile, input) {
|
|
|
9256
9258
|
}
|
|
9257
9259
|
lines.push("");
|
|
9258
9260
|
lines.push(`Totals: ${buckets["upstream-updated"]} updated, ${buckets.created} new, ` + `${buckets.unchanged} unchanged, ${buckets["skipped-conflict"]} skipped (conflicts), ` + `${buckets.removed} removed, ${buckets["preserved-local"]} preserved locally.`);
|
|
9259
|
-
if (
|
|
9261
|
+
if (lessonsWithConflicts > 0 && !input.force) {
|
|
9260
9262
|
lines.push("To replace edited skills and prompts: 10x sync --force. Resolve rule conflicts with 10x get <lesson> --type rules.");
|
|
9261
9263
|
}
|
|
9262
9264
|
output(ctx, lines.join(`
|