@ncukondo/search-hub 0.22.0 → 0.23.1

package/dist/cli/index.js

@@ -4,11 +4,12 @@ import { Command, Option } from "commander";
 import { VERSION } from "../version.js";
 import { init } from "./commands/init.js";
 import { EXIT_CODES } from "./exit-codes.js";
-import { loadConfig, saveConfig } from "../config/loader.js";
+import { loadConfig, loadTomlFile, saveConfig } from "../config/loader.js";
 import "../config/schema.js";
 import { getDefaultConfig } from "../config/defaults.js";
-import { getDefaultConfigPath } from "../config/paths.js";
-import { viewConfig, viewConfigKey, setConfigKey } from "./commands/config.js";
+import { isInsideProject, getDefaultConfigPath, getLocalConfigPath } from "../config/paths.js";
+import { formatEnvVars, viewConfigAllOrigins, viewConfigFiltered, viewConfig, formatShowOrigin, getNestedValue, viewConfigKey, resolveWriteScope, checkSecretKeyWarning, setConfigKey, parseValue, setNestedValue } from "./commands/config.js";
+import { ENV_VAR_MAP } from "../config/env.js";
 import { detectSchemaLink, validateQueryCommand, formatValidateResult, formatVocabValidationOutput, hasVocabErrors } from "./commands/query/validate.js";
 import { MeSHLookupClient } from "../query/mesh-lookup.js";
 import { RateLimiter } from "../providers/base/rate-limiter.js";
@@ -82,16 +83,23 @@ Quick Start:
   $ search-hub search my-search --count-only     # Check hit counts
   $ search-hub search my-search                  # Execute search
   $ search-hub results <session>                 # Review titles`);
-  program.command("init").description("Initialize configuration directory").option("-f, --force", "overwrite existing configuration", false).addHelpText("after", `
+  program.command("init").description("Initialize search-hub project (local) or global config").option("-f, --force", "overwrite existing configuration", false).option("-g, --global", "initialize global config instead of local project", false).addHelpText("after", `
 Examples:
-  $ search-hub init                 # Initialize with default settings
+  $ search-hub init                 # Create .search-hub/ in current directory
+  $ search-hub init --global        # Create global config (~/.config/search-hub/)
   $ search-hub init --force         # Overwrite existing configuration`).action(async (options) => {
     const globalOpts = program.opts();
     try {
-      const result = await init({ force: options.force });
+      const result = await init({ force: options.force, global: options.global });
       if (!globalOpts.quiet) {
         if (result.success) {
           console.log(result.message);
+          if (result.hints) {
+            console.log("");
+            for (const hint of result.hints) {
+              console.log(`  ${hint}`);
+            }
+          }
         } else {
           console.error(result.message);
         }
@@ -107,13 +115,91 @@ Examples:
       process.exitCode = EXIT_CODES.GENERAL_ERROR;
     }
   });
-  program.command("config").description("View and edit configuration").argument("[key]", "configuration key to view or set").argument("[value]", "value to set for the key").addHelpText("after", `
+  program.command("config").description("View and edit configuration").argument("[key]", "configuration key to view or set").argument("[value]", "value to set for the key").option("--global", "Use global config scope").option("--local", "Use local project config scope").option("--show-origin", "Show where each config value comes from").option("--list", "List all config values (default when no key given)").option("--env-vars", "Show environment variable mappings").option("--force", "Force write even for secret keys in local scope").addHelpText("after", `
 Examples:
-  $ search-hub config                              # Show all config
-  $ search-hub config providers.pubmed             # Show PubMed config
-  $ search-hub config providers.pubmed.api_key KEY # Set API key`).action(async (key, value) => {
+  $ search-hub config                                     # Show all config
+  $ search-hub config providers.pubmed                    # Show PubMed config
+  $ search-hub config --global providers.pubmed.api_key KEY # Set API key globally
+  $ search-hub config --local output.color false          # Set in project config
+  $ search-hub config --show-origin providers.pubmed.api_key # Show value origin
+  $ search-hub config --list --global                     # Show only global values
+  $ search-hub config --env-vars                          # Show env var mappings`).action(async (key, value, cmdOpts) => {
     const globalOpts = program.opts();
     try {
+      if (cmdOpts.envVars) {
+        if (!globalOpts.quiet) {
+          console.log(formatEnvVars());
+        }
+        process.exitCode = EXIT_CODES.SUCCESS;
+        return;
+      }
+      const inProject = await isInsideProject();
+      if (cmdOpts.list || !key && !value) {
+        if (cmdOpts.global && cmdOpts.local) {
+          if (!globalOpts.quiet) {
+            console.error("Error: --global and --local are mutually exclusive");
+          }
+          process.exitCode = EXIT_CODES.CONFIG_ERROR;
+          return;
+        }
+        if (cmdOpts.showOrigin && !cmdOpts.global && !cmdOpts.local) {
+          let config22;
+          try {
+            config22 = await loadConfig(
+              globalOpts.config ? { explicitConfigPath: globalOpts.config } : {}
+            );
+          } catch {
+            config22 = getDefaultConfig();
+          }
+          const globalPath = expandPath(getDefaultConfigPath());
+          const globalCfg = await loadTomlFile(globalPath);
+          const localPath = inProject ? getLocalConfigPath() : "";
+          const localCfg = inProject ? await loadTomlFile(localPath) : {};
+          if (!globalOpts.quiet) {
+            console.log(viewConfigAllOrigins(
+              config22,
+              ENV_VAR_MAP,
+              localCfg,
+              localPath,
+              globalCfg,
+              globalPath
+            ));
+          }
+        } else if (cmdOpts.global) {
+          const globalConfig = await loadTomlFile(expandPath(getDefaultConfigPath()));
+          if (!globalOpts.quiet) {
+            const output = viewConfigFiltered(globalConfig);
+            console.log(output || "(no global config values set)");
+          }
+        } else if (cmdOpts.local) {
+          if (!inProject) {
+            if (!globalOpts.quiet) {
+              console.error('Error: --local requires a project directory (.search-hub/). Run "search-hub init" first.');
+            }
+            process.exitCode = EXIT_CODES.CONFIG_ERROR;
+            return;
+          }
+          const localConfig = await loadTomlFile(getLocalConfigPath());
+          if (!globalOpts.quiet) {
+            const output = viewConfigFiltered(localConfig);
+            console.log(output || "(no local config values set)");
+          }
+        } else {
+          let config22;
+          try {
+            config22 = await loadConfig(
+              globalOpts.config ? { explicitConfigPath: globalOpts.config } : {}
+            );
+          } catch {
+            config22 = getDefaultConfig();
+          }
+          if (!globalOpts.quiet) {
+            console.log(viewConfig(config22));
+          }
+        }
+        process.exitCode = EXIT_CODES.SUCCESS;
+        return;
+      }
       let config2;
       try {
         config2 = await loadConfig(
@@ -122,29 +208,103 @@ Examples:
       } catch {
         config2 = getDefaultConfig();
       }
-      if (!key) {
-        if (!globalOpts.quiet) {
-          console.log(viewConfig(config2));
+      if (key && !value) {
+        if (cmdOpts.showOrigin) {
+          const envEntry = Object.entries(ENV_VAR_MAP).find(([, path]) => path === key);
+          if (envEntry && process.env[envEntry[0]] !== void 0) {
+            if (!globalOpts.quiet) {
+              console.log(formatShowOrigin(key, process.env[envEntry[0]], "env", envEntry[0]));
+            }
+            process.exitCode = EXIT_CODES.SUCCESS;
+            return;
+          }
+          if (inProject) {
+            const localConfig = await loadTomlFile(getLocalConfigPath());
+            const localVal = getNestedValue(localConfig, key);
+            if (localVal !== void 0) {
+              if (!globalOpts.quiet) {
+                console.log(formatShowOrigin(key, String(localVal), "local", getLocalConfigPath()));
+              }
+              process.exitCode = EXIT_CODES.SUCCESS;
+              return;
+            }
+          }
+          const globalConfigPath = expandPath(getDefaultConfigPath());
+          const globalConfig = await loadTomlFile(globalConfigPath);
+          const globalVal = getNestedValue(globalConfig, key);
+          if (globalVal !== void 0) {
+            if (!globalOpts.quiet) {
+              console.log(formatShowOrigin(key, String(globalVal), "global", globalConfigPath));
+            }
+            process.exitCode = EXIT_CODES.SUCCESS;
+            return;
+          }
+          const mergedVal = getNestedValue(config2, key);
+          if (mergedVal !== void 0) {
+            if (!globalOpts.quiet) {
+              console.log(formatShowOrigin(key, String(mergedVal), "default", ""));
+            }
+          } else {
+            if (!globalOpts.quiet) {
+              console.error(`Error: Key "${key}" not found in configuration`);
+            }
+            process.exitCode = EXIT_CODES.CONFIG_ERROR;
+            return;
+          }
+        } else {
+          const result = viewConfigKey(config2, key);
+          if (result.success) {
+            if (!globalOpts.quiet) {
+              console.log(result.value);
+            }
+          } else {
+            if (!globalOpts.quiet) {
+              console.error(`Error: ${result.error}`);
+            }
+            process.exitCode = EXIT_CODES.CONFIG_ERROR;
+            return;
+          }
         }
-      } else if (!value) {
-        const result = viewConfigKey(config2, key);
-        if (result.success) {
+      } else if (key && value) {
+        const scopeResult = resolveWriteScope({
+          global: !!cmdOpts.global,
+          local: !!cmdOpts.local,
+          insideProject: inProject
+        });
+        if (scopeResult.scope === "error") {
           if (!globalOpts.quiet) {
-            console.log(result.value);
+            console.error(`Error: ${scopeResult.error}`);
           }
-        } else {
+          process.exitCode = EXIT_CODES.CONFIG_ERROR;
+          return;
+        }
+        const warning = checkSecretKeyWarning(key, scopeResult.scope);
+        if (warning && !cmdOpts.force) {
           if (!globalOpts.quiet) {
-            console.error(`Error: ${result.error}`);
+            console.error(`Error: ${warning} Use --force to override.`);
           }
           process.exitCode = EXIT_CODES.CONFIG_ERROR;
           return;
         }
-      } else {
         const result = setConfigKey(config2, key, value);
         if (result.success) {
-          const configPath = globalOpts.config ? expandPath(globalOpts.config) : getDefaultConfigPath();
+          let configPath;
+          if (globalOpts.config) {
+            configPath = expandPath(globalOpts.config);
+          } else if (scopeResult.scope === "local") {
+            configPath = expandPath(getLocalConfigPath());
+          } else {
+            configPath = expandPath(getDefaultConfigPath());
+          }
           try {
-            await saveConfig(config2, { path: configPath });
+            const existing = await loadTomlFile(configPath);
+            const existingValue = getNestedValue(
+              config2,
+              key
+            );
+            const parsedValue = parseValue(value, existingValue);
+            setNestedValue(existing, key, parsedValue);
+            await saveConfig(existing, { path: configPath });
             if (!globalOpts.quiet) {
               console.log(`Set ${key} = ${result.value}`);
               console.log(`Saved to ${configPath}`);
@@ -334,7 +494,7 @@ Examples:
   });
   queryCommand.command("init").description("Generate a template query YAML file").argument("<title>", "query title (used for name field and filename)").option("-o, --output <path>", "write to specific file path").option("--stdout", "output to stdout instead of file").option("--force", "overwrite existing file", false).addHelpText("after", `
 Examples:
-  $ search-hub query init "WBA pain mechanisms"              # → queries/wba-pain-mechanisms.yaml
+  $ search-hub query init "WBA pain mechanisms"              # → .search-hub/queries/wba-pain-mechanisms.yaml
   $ search-hub query init "WBA pain" -o ./custom-path.yaml   # Custom output path
   $ search-hub query init "WBA pain" --stdout                # Print to stdout`).action(async (title, options) => {
     const globalOpts = program.opts();