clinkx 1.1.2 → 1.2.0

package/scripts/provider-doctor-core.mjs

@@ -31,6 +31,7 @@ async function loadModules(withProbe) {
     redactSecrets: env.redactSecrets,
     redactCredentials: (text) => redaction.redactWithOptions(text, {}),
     preflightEnabled: () => process.env["CLINKX_WORKFLOWS_CONTEXT_PREFLIGHT_ENABLED"]?.trim().toLowerCase() !== "false",
+    getClinkxHome: workflowsConfig.getClinkxHome,
     getChildConfigPath: workflowsConfig.getChildConfigPath,
     getDefaultCurator: workflowsConfig.getWorkflowsContextDefaultCurator,
     getContextDefault: workflowsConfig.getWorkflowsContextDefault,
@@ -242,13 +243,28 @@ function configFiles(path) {
   }
 }
 
-function standardConfigFiles() {
+function jsonFilesInDirectory(dir) {
+  if (!existsSync(dir)) return [];
+  try {
+    return readdirSync(dir).filter((file) => file.endsWith(".json")).sort().map((file) => join(dir, file));
+  } catch {
+    return [];
+  }
+}
+
+// Mirrors discoverConfigPaths() in src/registry.ts; a CLINKX_HOME error has already failed AdapterRegistry.load() with its own message.
+function standardConfigFiles(getClinkxHome) {
   const envPath = process.env["CLINKX_CONFIG_PATH"];
   if (envPath != null && envPath !== "") return configFiles(envPath);
   const xdgHome = process.env["XDG_CONFIG_HOME"] ?? join(homedir(), ".config");
-  return [join(xdgHome, "clinkx", "adapters"), join(PACKAGE_ROOT, "conf", "adapters")]
-    .filter((dir) => existsSync(dir))
-    .flatMap(configFiles);
+  let homeTier = [];
+  try {
+    homeTier = [join(getClinkxHome(), "adapters")];
+  } catch {
+    homeTier = [];
+  }
+  return [...homeTier, join(xdgHome, "clinkx", "adapters"), join(PACKAGE_ROOT, "conf", "adapters")]
+    .flatMap(jsonFilesInDirectory);
 }
 
 function jsonErrorLocation(message, raw) {
@@ -297,7 +313,7 @@ export async function runDoctor(probes, signal) {
   try {
     standard = m.AdapterRegistry.load();
   } catch (error) {
-    fail(null, `adapter registry failed to load: ${describeLoadError(error, standardConfigFiles())}`);
+    fail(null, `adapter registry failed to load: ${describeLoadError(error, standardConfigFiles(m.getClinkxHome))}`);
   }
 
   const childPath = m.getChildConfigPath();