diff --git a/skillhub-cli/package.json b/skillhub-cli/package.json
index c60f4c33..ea18ca60 100644
--- a/skillhub-cli/package.json
+++ b/skillhub-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "motovis-skillhub",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "type": "module",
   "description": "SkillHub CLI - 企业级 Agent Skill 管理工具，支持命名空间",
   "bin": {
diff --git a/skillhub-cli/src/cli.ts b/skillhub-cli/src/cli.ts
index 82a4bb53..be353c43 100644
--- a/skillhub-cli/src/cli.ts
+++ b/skillhub-cli/src/cli.ts
@@ -49,6 +49,14 @@ function buildTopLevelHelp(version: string): string {
   sections.push(dim("CLI for SkillHub — publish, search, and manage agent skills"));
   sections.push("");
 
+  sections.push(formatSection("Configuration", [
+    { cmd: "config list", desc: "Show current registry configuration" },
+    { cmd: "config set <key> <value>", desc: "Set configuration (e.g., registry URL)" },
+    { cmd: "config get <key>", desc: "Get configuration value" },
+    { cmd: "config show-env-instructions", desc: "Show environment variable setup guide" },
+  ]));
+  sections.push("");
+
   sections.push(formatSection("Auth", [
     { cmd: "login", desc: "Authenticate with SkillHub registry" },
     { cmd: "logout", desc: "Remove stored authentication token" },
@@ -102,14 +110,6 @@ function buildTopLevelHelp(version: string): string {
   ]));
   sections.push("");
 
-  sections.push(formatSection("Configuration", [
-    { cmd: "config list", desc: "Show current registry configuration" },
-    { cmd: "config set <key> <value>", desc: "Set configuration (e.g., registry URL)" },
-    { cmd: "config get <key>", desc: "Get configuration value" },
-    { cmd: "config show-env-instructions", desc: "Show environment variable setup guide" },
-  ]));
-  sections.push("");
-
   sections.push(bold("Examples"));
   sections.push(dim("  skillhub install vision2group/fork-workflow       Install a skill from registry"));
   sections.push(dim("  skillhub install find-skills --from https://...   Install from GitHub or local path"));
diff --git a/skillhub-cli/src/commands/config.ts b/skillhub-cli/src/commands/config.ts
index e518a707..4a6eff63 100644
--- a/skillhub-cli/src/commands/config.ts
+++ b/skillhub-cli/src/commands/config.ts
@@ -19,7 +19,7 @@ export function registerConfig(program: Command) {
 
   configCmd
     .command("list")
-    .description("List current configuration")
+    .description("List all configuration sources and their values")
     .action(() => {
       const env = process.env.SKILLHUB_REGISTRY;
       let fileConfig: { registry?: string } = {};
@@ -54,54 +54,77 @@ export function registerConfig(program: Command) {
     });
 
   configCmd
-    .command("set <key> <value>")
-    .description("Set a configuration value (stored in ~/.skillhub/config.json)")
-    .action((key: string, value: string) => {
-      if (key === "registry") {
-        if (!existsSync(CONFIG_DIR)) {
-          mkdirSync(CONFIG_DIR, { recursive: true });
-        }
-
-        let config: Record<string, string> = {};
-        if (existsSync(CONFIG_FILE)) {
-          try {
-            config = JSON.parse(readFileSync(CONFIG_FILE, "utf-8"));
-          } catch {
-            // Invalid config file, start fresh
-          }
-        }
-
-        config.registry = value;
-        writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
-        success(`Registry set to: ${value}`);
-        info(`Config file: ${CONFIG_FILE}`);
-        info(`\n💡 You can also use environment variable for current session:`);
-        info(`   ` + cyan(`export SKILLHUB_REGISTRY="${value}"`));
-        info(`\n💡 Or use --registry flag for one-time override:`);
-        info(`   ` + cyan(`skillhub --registry ${value} <command>`));
-      } else {
-        error(`Unknown config key: ${key}. Supported keys: registry`);
-        process.exitCode = 1;
+    .command("set <value>")
+    .description("Set registry URL in ~/.skillhub/config.json")
+    .action((value: string) => {
+      if (!existsSync(CONFIG_DIR)) {
+        mkdirSync(CONFIG_DIR, { recursive: true });
       }
+
+      let config: Record<string, string> = {};
+      if (existsSync(CONFIG_FILE)) {
+        try {
+          config = JSON.parse(readFileSync(CONFIG_FILE, "utf-8"));
+        } catch {
+          // Invalid config file, start fresh
+        }
+      }
+
+      config.registry = value;
+      writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
+      success(`Registry set to: ${value}`);
+      info(`Config file: ${CONFIG_FILE}`);
     });
 
   configCmd
-    .command("get <key>")
-    .description("Get a configuration value")
-    .action((key: string) => {
-      if (key === "registry") {
-        const value = process.env.SKILLHUB_REGISTRY ||
-          (existsSync(CONFIG_FILE) ? (() => {
+    .command("get")
+    .description("Get registry configuration value")
+    .option("--source <source>", "Source: env, file, or resolved (default)")
+    .action((opts: { source?: string }) => {
+      const source = opts.source || "resolved";
+      const envValue = process.env.SKILLHUB_REGISTRY;
+      const fileValue = existsSync(CONFIG_FILE)
+        ? (() => {
             try {
               return JSON.parse(readFileSync(CONFIG_FILE, "utf-8")).registry;
             } catch {
               return null;
             }
-          })() : null) ||
-          "http://localhost:8080";
+          })()
+        : null;
+
+      if (source === "env") {
+        if (envValue) {
+          success(envValue);
+          dim("Source: environment variable");
+        } else {
+          dim("Environment variable SKILLHUB_REGISTRY is not set");
+          process.exitCode = 1;
+        }
+      } else if (source === "file") {
+        if (fileValue) {
+          success(fileValue);
+          dim("Source: config file");
+        } else {
+          dim("Config file does not have registry set");
+          process.exitCode = 1;
+        }
+      } else if (source === "resolved") {
+        const defaultValue = "http://localhost:8080";
+        const value = envValue || fileValue || defaultValue;
+        const actualSource = envValue
+          ? "environment variable"
+          : fileValue
+            ? "config file"
+            : "default";
+
         success(value);
+        dim(`Source: ${actualSource}`);
+        if (!envValue) {
+          dim(`To override with env var: export SKILLHUB_REGISTRY="${value}"`);
+        }
       } else {
-        error(`Unknown config key: ${key}. Supported keys: registry`);
+        error(`Unknown source: ${source}. Supported sources: env, file, resolved`);
         process.exitCode = 1;
       }
     });