openclawmp 1.0.2 → 1.0.4

package/README.md

@@ -21,6 +21,9 @@ openclawmp oauth <your-token>
 # 搜索市场资产
 openclawmp search 天气
 
+# 搜索用户
+openclawmp users 张三
+
 # 根据 assetId 查看资产详情
 openclawmp info 6c476a36955a4270a3fa303beeeed5ee
 
@@ -40,6 +43,7 @@ openclawmp publish ./my-asset --yes
 ## 功能概览
 
 - `search`：搜索市场资产，按类型、作者、安装量、标签和简介格式化输出。
+- `users`：搜索用户，默认展示前 10 条，并显示总结果数与下一页游标。
 - `oauth`：将 token 写入本地凭证文件。
 - `info`：根据 `assetId` 查看资产详情与版本信息。
 - `install`：根据 `assetId` 和可选 `semver` 下载归档并安装到本地 OpenClaw 目录。
@@ -143,6 +147,8 @@ openclawmp install skill/7c19dc4c3244418096f1dcb59c93f795
 openclawmp install skill/7c19dc4c3244418096f1dcb59c93f795@1.0.3
 ```
 
+默认安装根会优先跟随当前 OpenClaw/StepClaw state dir（`OPENCLAW_STATE_DIR`、`STEPCLAW_STATE_DIR` 或 `~/.stepclaw/stepclaw-install-state.json`），未检测到 StepClaw 时回退到 `~/.openclaw`。也可通过 `--target-dir <path>` 显式指定安装根。
+
 卸载示例：
 
 ```bash
@@ -154,6 +160,7 @@ openclawmp uninstall skill/demo-skill
 
 ```bash
 openclawmp search 天气 --page-size 10
+openclawmp users openclawmp.cc
 ```
 
 ## 命令结构
@@ -163,12 +170,13 @@ openclawmp search 天气 --page-size 10
 - `publish`
 - `oauth`
 - `search`
+- `users`
 - `info`
 - `install`
 - `uninstall`
 - `list`
 
-其中当前可用的是 `publish`、`oauth`、`search`、`info`、`install`、`uninstall`、`list`。
+其中当前可用的是 `publish`、`oauth`、`search`、`users`、`info`、`install`、`uninstall`、`list`。
 
 ## 发布命令参数
 

package/bin/openclawmp.js

@@ -24,6 +24,9 @@ const COMMAND_LOADERS = {
   search: function loadSearch() {
     return require("../lib/commands/search");
   },
+  users: function loadUsers() {
+    return require("../lib/commands/users");
+  },
   info: function loadInfo() {
     return require("../lib/commands/info");
   },

package/lib/api.js

@@ -10,6 +10,7 @@ const {
 } = require("./utils");
 
 const CATALOG_SERVICE = "step.seafood.catalog.CatalogService";
+const IDENTITY_SERVICE = "step.seafood.identity.IdentityService";
 
 class ApiError extends Error {
   constructor(message, details) {
@@ -136,10 +137,10 @@ function createCatalogClient(options) {
   const defaultRequestId = normalizeRequestId(options.requestId) || generateRequestId();
   const verbose = Boolean(options.verbose);
 
-  async function unary(methodName, body, extra) {
+  async function unaryForService(serviceName, methodName, body, extra) {
     const requestId = normalizeRequestId((extra && extra.requestId) || defaultRequestId);
     const operationName = humanizeApiMethodName(methodName) || methodName || "接口调用";
-    const requestUrl = String(buildServiceUrl(options.baseUrl, CATALOG_SERVICE, methodName));
+    const requestUrl = String(buildServiceUrl(options.baseUrl, serviceName, methodName));
     const requestBody = JSON.stringify(body || {}, jsonReplacer);
     const headers = {
       "Connect-Protocol-Version": "1",
@@ -233,10 +234,17 @@ function createCatalogClient(options) {
     };
   }
 
+  async function unary(methodName, body, extra) {
+    return unaryForService(CATALOG_SERVICE, methodName, body, extra);
+  }
+
   return {
     searchAssets: function searchAssets(body, extra) {
       return unary("SearchAssets", body, extra);
     },
+    searchUsers: function searchUsers(body, extra) {
+      return unaryForService(IDENTITY_SERVICE, "SearchUsers", body, extra);
+    },
     listUserAssets: function listUserAssets(body, extra) {
       return unary("ListUserAssets", body, extra);
     },

package/lib/commands/help.js

@@ -19,6 +19,9 @@ const COMMAND_LOADERS = {
   search: function loadSearch() {
     return require("./search");
   },
+  users: function loadUsers() {
+    return require("./users");
+  },
   info: function loadInfo() {
     return require("./info");
   },

package/lib/commands/install.js

@@ -33,11 +33,12 @@ function printHelp() {
   console.log("  install 需要本地 token，默认读取 ~/.openclaw/hub-credentials.json");
   console.log("  可通过 --token-file <path> 指定其他凭证文件");
   console.log("  默认安装目录:");
-  console.log("    skill -> ~/.openclaw/skills");
-  console.log("    plugin -> ~/.openclaw/extensions");
-  console.log("    channel -> ~/.openclaw/extensions");
-  console.log("    trigger -> ~/.openclaw/triggers");
-  console.log("    experience -> ~/.openclaw/experiences");
+  console.log("    优先跟随当前 OpenClaw/StepClaw state dir（OPENCLAW_STATE_DIR、STEPCLAW_STATE_DIR 或 ~/.stepclaw）");
+  console.log("    未检测到 StepClaw 时回退到 ~/.openclaw");
+  console.log("    skill -> <state-dir>/skills 或 ~/.openclaw/skills");
+  console.log("    plugin/channel -> <state-dir>/extensions 或 ~/.openclaw/extensions");
+  console.log("    trigger -> <state-dir>/triggers 或 ~/.openclaw/triggers");
+  console.log("    experience -> <state-dir>/experiences 或 ~/.openclaw/experiences");
   console.log("");
   console.log("示例:");
   console.log("  " + buildInstallCommand("skill", "7c19dc4c3244418096f1dcb59c93f795"));

package/lib/commands/users.js

@@ -0,0 +1,247 @@
+"use strict";
+
+const { parseOptions } = require("../cli-parser");
+const { createCatalogClient } = require("../api");
+const { CLI_NAME } = require("../cli-text");
+const { resolveApiBaseUrl, resolveConnectBaseUrl } = require("../config");
+const { generateRequestId } = require("../utils");
+
+const DEFAULT_PAGE_SIZE = 10;
+const DEFAULT_SORT_BY = "SEARCH_USERS_SORT_BY_BEST_MATCH";
+
+function printHelp() {
+  console.log(CLI_NAME + " users");
+  console.log("");
+  console.log("用法:");
+  console.log("  " + CLI_NAME + " users <keyword> [options]");
+  console.log("");
+  console.log("参数:");
+  console.log("  --page-size <number>       每页条数，默认 10");
+  console.log("  --page-token <token>       分页游标");
+  console.log("  --request-id <id>          手动指定 X-Request-ID");
+  console.log("  --verbose                  输出更多上下文");
+  console.log("  -h, --help                 查看帮助");
+  console.log("");
+  console.log("示例:");
+  console.log("  " + CLI_NAME + " users openclawmp.cc");
+  console.log("  " + CLI_NAME + " users 窦窦 --page-size 20");
+}
+
+function pickFirstText(values) {
+  return values.find(function findValue(value) {
+    return typeof value === "string" && value.trim();
+  }) || "";
+}
+
+function pickFirstScalar(values) {
+  return values.find(function findValue(value) {
+    if (typeof value === "string") {
+      return value.trim();
+    }
+    return typeof value === "number" && Number.isFinite(value);
+  });
+}
+
+function normalizePageSize(value) {
+  if (value === undefined) {
+    return DEFAULT_PAGE_SIZE;
+  }
+
+  if (!Number.isInteger(value) || value <= 0) {
+    throw new Error("--page-size 需要是大于 0 的整数");
+  }
+
+  return value;
+}
+
+function formatCount(value) {
+  const numeric = Number(value);
+  if (Number.isFinite(numeric)) {
+    return numeric.toLocaleString("zh-CN");
+  }
+  return String(value || "0");
+}
+
+function resolveItems(data) {
+  if (Array.isArray(data.items)) {
+    return data.items;
+  }
+  if (Array.isArray(data.users)) {
+    return data.users;
+  }
+  return [];
+}
+
+function resolveTotalSize(data, items) {
+  const total = pickFirstScalar([
+    data.totalSize,
+    data.total_size,
+    data.totalCount,
+    data.total_count,
+    data.total,
+    data.count
+  ]);
+  if (total !== undefined) {
+    return String(total);
+  }
+  return String(items.length);
+}
+
+function resolveNextPageToken(data) {
+  return pickFirstText([data.nextPageToken, data.next_page_token]);
+}
+
+function resolveUser(item) {
+  if (!item || typeof item !== "object") {
+    return {};
+  }
+  if (item.user && typeof item.user === "object") {
+    return item.user;
+  }
+  if (item.profile && typeof item.profile === "object") {
+    return item.profile;
+  }
+  return item;
+}
+
+function resolveDisplayName(user) {
+  return pickFirstText([
+    user.displayName,
+    user.name,
+    user.nickname,
+    user.userId
+  ]) || "(未命名用户)";
+}
+
+function formatDescription(user) {
+  const raw = pickFirstText([
+    user.introduction,
+    user.description,
+    user.bio,
+    user.summary
+  ]);
+  const singleLine = raw.replace(/\s+/g, " ").trim();
+  if (!singleLine) {
+    return "(无描述)";
+  }
+  if (singleLine.length <= 120) {
+    return singleLine;
+  }
+  return singleLine.slice(0, 117) + "...";
+}
+
+function buildHomepageUrl(user, siteBaseUrl) {
+  const explicitUrl = pickFirstText([
+    user.homepageUrl,
+    user.homePageUrl,
+    user.profileUrl,
+    user.publicProfileUrl,
+    user.url,
+    user.link
+  ]);
+  if (explicitUrl) {
+    return String(new URL(explicitUrl, String(siteBaseUrl).replace(/\/+$/u, "") + "/"));
+  }
+
+  const userId = pickFirstText([user.userId, user.uid, user.id]);
+  if (!userId) {
+    return "(无主页链接)";
+  }
+
+  return String(siteBaseUrl).replace(/\/+$/u, "") + "/user/" + encodeURIComponent(userId);
+}
+
+function printUserSearchResult(item, index, siteBaseUrl) {
+  const user = resolveUser(item);
+
+  console.log(index + ". " + resolveDisplayName(user));
+  console.log("   描述: " + formatDescription(user));
+  console.log("   主页: " + buildHomepageUrl(user, siteBaseUrl));
+}
+
+async function run(context) {
+  const parsed = parseOptions(context.argv, {
+    "page-size": { type: "number" },
+    "page-token": { type: "string" },
+    "request-id": { type: "string" },
+    verbose: { type: "boolean" }
+  });
+
+  const query = parsed.positionals.join(" ").trim();
+  if (!query) {
+    throw new Error("users 命令缺少关键词");
+  }
+
+  const pageSize = normalizePageSize(parsed.options["page-size"]);
+  const requestId = parsed.options["request-id"] || generateRequestId();
+  const apiBaseUrl = resolveApiBaseUrl();
+  const client = createCatalogClient({
+    baseUrl: resolveConnectBaseUrl(),
+    cliVersion: context.cliVersion,
+    requestId,
+    verbose: Boolean(parsed.options.verbose)
+  });
+
+  const response = await client.searchUsers({
+    query,
+    sortBy: DEFAULT_SORT_BY,
+    pageSize,
+    pageToken: parsed.options["page-token"] || ""
+  });
+
+  const items = resolveItems(response.data);
+  const totalSize = resolveTotalSize(response.data, items);
+  const nextPageToken = resolveNextPageToken(response.data);
+
+  if (parsed.options.verbose) {
+    console.log("request-id: " + response.requestId);
+  }
+
+  if (items.length === 0) {
+    if (Number(totalSize) > 0) {
+      console.log("当前页没有可展示的用户结果。");
+    } else {
+      console.log("没有找到与 \"" + query + "\" 相关的用户。");
+    }
+    console.log("总结果数: " + formatCount(totalSize));
+
+    return {
+      items: [],
+      nextPageToken,
+      totalSize
+    };
+  }
+
+  console.log("用户搜索结果：共 " + formatCount(totalSize) + " 项，本页 " + items.length + " 项");
+  console.log("");
+
+  items.forEach(function eachItem(item, index) {
+    printUserSearchResult(item, index + 1, apiBaseUrl);
+    if (index < items.length - 1) {
+      console.log("");
+    }
+  });
+
+  if (nextPageToken) {
+    let nextPageCommand = "  " + CLI_NAME + " users " + JSON.stringify(query);
+    if (pageSize !== DEFAULT_PAGE_SIZE) {
+      nextPageCommand += " --page-size " + pageSize;
+    }
+    nextPageCommand += " --page-token " + nextPageToken;
+
+    console.log("");
+    console.log("下一页:");
+    console.log(nextPageCommand);
+  }
+
+  return {
+    items,
+    nextPageToken,
+    totalSize
+  };
+}
+
+module.exports = {
+  printHelp,
+  run
+};

package/lib/config.js

@@ -17,6 +17,12 @@ const INSTALL_ROOT_BY_TYPE = {
     experience: ["experiences"],
     template: ["templates"],
 };
+const OPENCLAWMP_INSTALL_ROOT_ENV = "OPENCLAWMP_INSTALL_ROOT";
+const OPENCLAW_STATE_DIR_ENV = "OPENCLAW_STATE_DIR";
+const STEPCLAW_STATE_DIR_ENV = "STEPCLAW_STATE_DIR";
+const STEPCLAW_STATE_DIR_NAME = ".stepclaw";
+const STEPCLAW_INSTALL_STATE_FILE = "stepclaw-install-state.json";
+const STEPCLAW_RUNTIME_STATE_FILE = "stepclaw-state.json";
 
 function parseEnvFile(content) {
     const result = {};
@@ -68,6 +74,26 @@ function firstDefined(values) {
     });
 }
 
+function trimString(value) {
+    return typeof value === "string" ? value.trim() : "";
+}
+
+function expandHomePath(value) {
+    const trimmed = trimString(value);
+    if (trimmed === "~") {
+        return os.homedir();
+    }
+    if (trimmed.startsWith("~/") || trimmed.startsWith("~\\")) {
+        return path.join(os.homedir(), trimmed.slice(2));
+    }
+    return trimmed;
+}
+
+function resolvePathValue(value) {
+    const expanded = expandHomePath(value);
+    return expanded ? path.resolve(expanded) : "";
+}
+
 function normalizeBaseUrl(value) {
     return String(value)
         .trim()
@@ -100,6 +126,51 @@ function getOpenClawHome() {
     return path.join(os.homedir(), ".openclaw");
 }
 
+function getDefaultStepClawStateDir() {
+    return path.join(os.homedir(), STEPCLAW_STATE_DIR_NAME);
+}
+
+function readJsonFileIfExists(filePath) {
+    try {
+        return JSON.parse(fs.readFileSync(filePath, "utf8"));
+    } catch (error) {
+        return null;
+    }
+}
+
+function looksLikeStepClawStateDir(stateDir) {
+    return (
+        fs.existsSync(path.join(stateDir, "openclaw.json")) ||
+        fs.existsSync(path.join(stateDir, STEPCLAW_INSTALL_STATE_FILE)) ||
+        fs.existsSync(path.join(stateDir, "runtime", STEPCLAW_RUNTIME_STATE_FILE))
+    );
+}
+
+function resolveStepClawStateDir() {
+    const envStateDir = firstDefined([
+        process.env[OPENCLAW_STATE_DIR_ENV],
+        process.env[STEPCLAW_STATE_DIR_ENV],
+    ]);
+    if (envStateDir) {
+        return resolvePathValue(envStateDir);
+    }
+
+    const defaultStateDir = getDefaultStepClawStateDir();
+    const presence = readJsonFileIfExists(
+        path.join(defaultStateDir, STEPCLAW_INSTALL_STATE_FILE)
+    );
+    const redirectedStateDir = trimString(presence && presence.stateDir);
+    if (redirectedStateDir) {
+        return resolvePathValue(redirectedStateDir);
+    }
+
+    if (looksLikeStepClawStateDir(defaultStateDir)) {
+        return defaultStateDir;
+    }
+
+    return "";
+}
+
 function defaultCredentialsPath() {
     return path.join(getOpenClawHome(), "hub-credentials.json");
 }
@@ -109,7 +180,14 @@ function getLockfilePath() {
 }
 
 function getManagedAssetsRoot() {
-    return getOpenClawHome();
+    const explicitInstallRoot = firstDefined([
+        process.env[OPENCLAWMP_INSTALL_ROOT_ENV],
+    ]);
+    if (explicitInstallRoot) {
+        return resolvePathValue(explicitInstallRoot);
+    }
+
+    return resolveStepClawStateDir() || getOpenClawHome();
 }
 
 function getInstallRoot(assetType) {
@@ -126,6 +204,8 @@ module.exports = {
     resolveApiBaseUrl,
     resolveConnectBaseUrl,
     getOpenClawHome,
+    getDefaultStepClawStateDir,
+    resolveStepClawStateDir,
     defaultCredentialsPath,
     getLockfilePath,
     getManagedAssetsRoot,

package/lib/help.js

@@ -28,6 +28,11 @@ const COMMAND_SECTIONS = [
     description: "搜索市场资产",
     usage: CLI_NAME + " search <query> [options]"
   },
+  {
+    name: "users",
+    description: "搜索用户",
+    usage: CLI_NAME + " users <keyword> [options]"
+  },
   {
     name: "info",
     description: "查看某个资产的详细信息",
@@ -76,6 +81,7 @@ function printGlobalHelp() {
   console.log("  " + CLI_NAME + " oauth <your-token>");
   console.log("  " + CLI_NAME + " publish ./my-asset --yes");
   console.log("  " + CLI_NAME + " search 天气");
+  console.log("  " + CLI_NAME + " users openclawmp.cc");
   console.log("  " + CLI_NAME + " info 6c476a36955a4270a3fa303beeeed5ee");
   console.log("  " + buildInstallCommand("skill", "7c19dc4c3244418096f1dcb59c93f795"));
   console.log("  " + buildInstallCommand("skill", "7c19dc4c3244418096f1dcb59c93f795", "1.0.3"));

package/lib/utils.js

@@ -197,6 +197,8 @@ function humanizeApiMethodName(methodName) {
       return "取消上传任务";
     case "SearchAssets":
       return "搜索资产";
+    case "SearchUsers":
+      return "搜索用户";
     case "ListUserAssets":
       return "查询用户资产";
     case "GetAsset":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclawmp",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "OpenClaw Marketplace CLI client",
   "bin": {
     "openclawmp": "bin/openclawmp.js"
@@ -15,7 +15,8 @@
   },
   "scripts": {
     "start": "node bin/openclawmp.js",
-    "publish:dry-run": "node bin/openclawmp.js publish . --dry-run"
+    "publish:dry-run": "node bin/openclawmp.js publish . --dry-run",
+    "pack:local": "npm pack"
   },
   "directories": {
     "lib": "lib",