skillsmgr 0.3.0 → 0.3.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.js +17 -5
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -1311,12 +1311,13 @@ var DeploymentScanner = class {
|
|
|
1311
1311
|
};
|
|
1312
1312
|
}
|
|
1313
1313
|
scanCopiedSkill(skillPath, name) {
|
|
1314
|
-
const source = this.findSourceByName(name);
|
|
1314
|
+
const { source, conflict } = this.findSourceByName(name);
|
|
1315
1315
|
return {
|
|
1316
1316
|
name,
|
|
1317
1317
|
source: source || "unknown",
|
|
1318
1318
|
deployMode: "copy",
|
|
1319
|
-
path: skillPath
|
|
1319
|
+
path: skillPath,
|
|
1320
|
+
conflict
|
|
1320
1321
|
};
|
|
1321
1322
|
}
|
|
1322
1323
|
extractSourceFromPath(linkTarget) {
|
|
@@ -1337,9 +1338,12 @@ var DeploymentScanner = class {
|
|
|
1337
1338
|
findSourceByName(skillName) {
|
|
1338
1339
|
const matches = this.skillsService.findSkillsByName(skillName);
|
|
1339
1340
|
if (matches.length === 0) {
|
|
1340
|
-
return null;
|
|
1341
|
+
return { source: null, conflict: false };
|
|
1342
|
+
}
|
|
1343
|
+
if (matches.length > 1) {
|
|
1344
|
+
return { source: null, conflict: true };
|
|
1341
1345
|
}
|
|
1342
|
-
return matches[0].source;
|
|
1346
|
+
return { source: matches[0].source, conflict: false };
|
|
1343
1347
|
}
|
|
1344
1348
|
};
|
|
1345
1349
|
|
|
@@ -1395,7 +1399,11 @@ async function listDeployed() {
|
|
|
1395
1399
|
console.log(`${displayName} (${deployment.targetDir}/)${dirSuffix}:`);
|
|
1396
1400
|
for (const skill of deployment.skills) {
|
|
1397
1401
|
const modeStr = skill.deployMode === "link" ? "link" : "copy";
|
|
1398
|
-
|
|
1402
|
+
if (skill.conflict) {
|
|
1403
|
+
console.log(` \u26A0 ${skill.name.padEnd(16)} (${modeStr}) \u2190 conflict`);
|
|
1404
|
+
} else {
|
|
1405
|
+
console.log(` \u25C9 ${skill.name.padEnd(16)} (${modeStr}) \u2190 ${skill.source}`);
|
|
1406
|
+
}
|
|
1399
1407
|
}
|
|
1400
1408
|
console.log();
|
|
1401
1409
|
}
|
|
@@ -1645,6 +1653,10 @@ async function executeSync() {
|
|
|
1645
1653
|
const mode = deployment.mode || "all";
|
|
1646
1654
|
console.log(`${config.displayName} (${deployment.targetDir}/):`);
|
|
1647
1655
|
for (const skill of deployment.skills) {
|
|
1656
|
+
if (skill.conflict) {
|
|
1657
|
+
console.log(` \u26A0 ${skill.name}: conflict (skipped)`);
|
|
1658
|
+
continue;
|
|
1659
|
+
}
|
|
1648
1660
|
const deployedPath = skill.path;
|
|
1649
1661
|
let sourcePath = null;
|
|
1650
1662
|
if (skill.source !== "unknown") {
|