@piewf/cli 5.11.0 → 5.11.2

package/dist/src/doctor.js

@@ -174,7 +174,7 @@ function scanExtensionRoleFiles(registrations) {
             if (!roleFiles.length)
                 empty.push(registration);
             for (const entry of roleFiles)
-                files.push({ name: basename(entry.name, ".md"), path: join(registration.path, entry.name), directory: registration.path, extension: registration.extension });
+                files.push({ name: basename(entry.name, ".md"), path: join(registration.path, entry.name), directory: registration.path, extension: registration.extension, ...(registration.builtin === true ? { builtin: true } : {}) });
         }
         catch (error) {
             errors.push({ registration, error });
@@ -404,18 +404,36 @@ export async function doctor(options = {}) {
     for (const file of extensionScan.files)
         extensionFilesByName.set(file.name, [...(extensionFilesByName.get(file.name) ?? []), file]);
     const duplicateExtensionNames = new Set();
-    for (const [name, matches] of extensionFilesByName)
-        if (matches.length > 1) {
+    const extensionPaths = new Map();
+    const starterOverrides = new Map();
+    const starterOverriddenBy = new Map();
+    for (const [name, matches] of extensionFilesByName) {
+        const regularMatches = matches.filter(({ builtin }) => builtin !== true);
+        const starterMatches = matches.filter(({ builtin }) => builtin === true);
+        if (regularMatches.length > 1) {
             duplicateExtensionNames.add(name);
-            diagnostics.push(diagnostic("error", "ROLE_DUPLICATE", `Duplicate extension role "${name}": ${matches.map(({ path, directory, extension }) => `${extensionLabel(extension)} role directory "${directory}" (${path})`).join("; ")}`, matches[0]?.path, "Keep one extension role with this name; global and project roles may override packaged defaults."));
+            diagnostics.push(diagnostic("error", "ROLE_DUPLICATE", `Duplicate extension role "${name}": ${regularMatches.map(({ path, directory, extension }) => `${extensionLabel(extension)} role directory "${directory}" (${path})`).join("; ")}`, regularMatches[0]?.path, "Keep one extension role with this name; global and project roles may override packaged defaults."));
+            continue;
         }
-    const extensionPaths = new Map();
+        const extension = regularMatches[0] ?? starterMatches[0];
+        if (extension)
+            extensionPaths.set(name, extension.path);
+        const regular = regularMatches[0];
+        const starter = starterMatches[0];
+        if (regular && starter) {
+            starterOverrides.set(regular.path, starter.path);
+            starterOverriddenBy.set(starter.path, regular.path);
+        }
+    }
     for (const file of extensionScan.files) {
-        roles.push({ name: file.name, path: file.path, scope: "extension", active: true, extension: file.extension });
+        const starterPath = starterOverrides.get(file.path);
+        const overriddenBy = starterOverriddenBy.get(file.path);
+        roles.push({ name: file.name, path: file.path, scope: "extension", active: overriddenBy === undefined, extension: file.extension, ...(starterPath ? { overrides: starterPath } : {}), ...(overriddenBy ? { overriddenBy } : {}) });
         const definition = inspectRole(file.path, activeTools, knownModels, availableModels, diagnostics, aliases, dynamicAliases, settingsPath, { directory: file.directory, extension: file.extension });
         if (duplicateExtensionNames.has(file.name))
             continue;
-        extensionPaths.set(file.name, file.path);
+        if (extensionPaths.get(file.name) !== file.path)
+            continue;
         if (definition)
             definitions.set(file.name, definition);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@piewf/cli",
-  "version": "5.11.0",
+  "version": "5.11.2",
   "description": "CLI for pi-extensible-workflows",
   "homepage": "https://vekexasia.github.io/pi-extensible-workflows/",
   "repository": {
@@ -46,7 +46,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "pi-extensible-workflows": "5.11.0"
+    "pi-extensible-workflows": "5.11.2"
   },
   "publishConfig": {
     "access": "public"