@amaster.ai/runtime-cli 1.1.27 → 1.1.28

package/dist/index.cjs

@@ -33,18 +33,27 @@ var config_exports = {};
 __export(config_exports, {
   addApp: () => addApp,
   clearAuthSession: () => clearAuthSession,
+  ensureRegistry: () => ensureRegistry,
   getAccessToken: () => getAccessToken,
   getAppConfig: () => getAppConfig,
   getAuthSession: () => getAuthSession,
   getBaseURL: () => getBaseURL,
   getConfig: () => getConfig,
   getCurrentApp: () => getCurrentApp,
+  getCurrentRegistry: () => getCurrentRegistry,
+  getRegistryConfig: () => getRegistryConfig,
+  inferRegistryBaseURLFromAppBaseURL: () => inferRegistryBaseURLFromAppBaseURL,
   isAuthenticated: () => isAuthenticated,
   listApps: () => listApps,
+  listRegistries: () => listRegistries,
+  normalizeRegistryBaseURL: () => normalizeRegistryBaseURL,
   removeApp: () => removeApp,
+  resolveAppBaseURL: () => resolveAppBaseURL,
+  resolveRegistry: () => resolveRegistry,
   saveAuthSession: () => saveAuthSession,
   saveConfig: () => saveConfig,
   setCurrentApp: () => setCurrentApp,
+  setCurrentRegistry: () => setCurrentRegistry,
   shouldRefreshToken: () => shouldRefreshToken
 });
 function getConfig() {
@@ -107,6 +116,137 @@ function listApps() {
   const config = getConfig();
   return Object.keys(config.apps);
 }
+function listRegistries() {
+  const config = getConfig();
+  const currentRegistry = config.currentRegistry || DEFAULT_REGISTRY_NAME;
+  const registryMap = /* @__PURE__ */ new Map();
+  for (const [name, baseURL] of Object.entries(BUILTIN_REGISTRY_DEFINITIONS)) {
+    registryMap.set(name, {
+      name,
+      baseURL,
+      builtin: true
+    });
+  }
+  for (const [name, registry] of Object.entries(config.registries || {})) {
+    registryMap.set(name, {
+      name,
+      baseURL: registry.baseURL,
+      builtin: false
+    });
+  }
+  const registries = Array.from(registryMap.values()).sort((left, right) => left.name.localeCompare(right.name));
+  const currentResolved = resolveRegistry(currentRegistry);
+  return registries.map((registry) => ({
+    ...registry,
+    name: registry.name === currentResolved.name ? registry.name : registry.name
+  }));
+}
+function getCurrentRegistry() {
+  const config = getConfig();
+  return config.currentRegistry || DEFAULT_REGISTRY_NAME;
+}
+function setCurrentRegistry(registryRef) {
+  const resolved = ensureRegistry(registryRef);
+  const config = getConfig();
+  config.currentRegistry = resolved.name;
+  saveConfig(config);
+  return resolved;
+}
+function getRegistryConfig(name) {
+  const config = getConfig();
+  return config.registries?.[name] || null;
+}
+function ensureRegistry(registryRef) {
+  const normalizedRef = registryRef.trim();
+  if (!normalizedRef) {
+    throw new Error("Registry cannot be empty");
+  }
+  const builtinBaseURL = BUILTIN_REGISTRY_DEFINITIONS[normalizedRef];
+  if (builtinBaseURL) {
+    return {
+      name: normalizedRef,
+      baseURL: builtinBaseURL,
+      builtin: true
+    };
+  }
+  const config = getConfig();
+  const existing = config.registries?.[normalizedRef];
+  if (existing) {
+    return {
+      name: normalizedRef,
+      baseURL: existing.baseURL,
+      builtin: false
+    };
+  }
+  const normalizedBaseURL = normalizeRegistryBaseURL(normalizedRef);
+  for (const [name, baseURL] of Object.entries(BUILTIN_REGISTRY_DEFINITIONS)) {
+    if (normalizeRegistryBaseURL(baseURL) === normalizedBaseURL) {
+      return {
+        name,
+        baseURL,
+        builtin: true
+      };
+    }
+  }
+  const inferredName = inferRegistryName(normalizedBaseURL);
+  const current = config.registries?.[inferredName];
+  const nextRegistry = {
+    baseURL: normalizedBaseURL,
+    createdAt: current?.createdAt || (/* @__PURE__ */ new Date()).toISOString()
+  };
+  config.registries = {
+    ...config.registries || {},
+    [inferredName]: nextRegistry
+  };
+  saveConfig(config);
+  return {
+    name: inferredName,
+    baseURL: normalizedBaseURL,
+    builtin: false
+  };
+}
+function resolveRegistry(registryRef) {
+  return ensureRegistry(registryRef || getCurrentRegistry());
+}
+function normalizeRegistryBaseURL(value) {
+  const trimmed = value.trim();
+  if (!trimmed) {
+    throw new Error("Registry cannot be empty");
+  }
+  const withProtocol = /^https?:\/\//i.test(trimmed) ? trimmed : `https://${trimmed}`;
+  const parsed = new URL(withProtocol);
+  if (parsed.username || parsed.password || parsed.search || parsed.hash) {
+    throw new Error(`Unsupported registry URL: ${value}`);
+  }
+  if (parsed.pathname && parsed.pathname !== "/") {
+    throw new Error(`Registry URL must not include a path: ${value}`);
+  }
+  parsed.pathname = "";
+  return parsed.toString().replace(/\/$/, "");
+}
+function resolveAppBaseURL(appCode, registryRef) {
+  const resolved = resolveRegistry(registryRef);
+  const registryUrl = new URL(resolved.baseURL);
+  if (isLocalLikeHost(registryUrl.hostname)) {
+    throw new Error(`Cannot infer app URL from registry ${resolved.baseURL}; please pass --url explicitly`);
+  }
+  return `${registryUrl.protocol}//${appCode}.${registryUrl.host}`;
+}
+function inferRegistryBaseURLFromAppBaseURL(appBaseURL, appCode) {
+  const parsed = new URL(appBaseURL);
+  const hostnameParts = parsed.hostname.split(".");
+  if (hostnameParts.length <= 2 || isLocalLikeHost(parsed.hostname)) {
+    parsed.pathname = "";
+    return parsed.toString().replace(/\/$/, "");
+  }
+  if (appCode && parsed.hostname.startsWith(`${appCode}.`)) {
+    parsed.hostname = parsed.hostname.slice(appCode.length + 1);
+  } else {
+    parsed.hostname = hostnameParts.slice(1).join(".");
+  }
+  parsed.pathname = "";
+  return parsed.toString().replace(/\/$/, "");
+}
 function getBaseURL(appCode) {
   const code = appCode || getCurrentApp();
   if (!code) return null;
@@ -161,11 +301,29 @@ function shouldRefreshToken(appCode) {
   const fiveMinutes = 5 * 60 * 1e3;
   return expiresAt.getTime() - now.getTime() < fiveMinutes;
 }
-var AMASTER_CONFIG_DIR, CONFIG_FILE;
+function inferRegistryName(baseURL) {
+  const parsed = new URL(baseURL);
+  return parsed.hostname.replace(/\./g, "-");
+}
+function isLocalLikeHost(hostname) {
+  if (hostname === "localhost") {
+    return true;
+  }
+  if (/^\d{1,3}(\.\d{1,3}){3}$/.test(hostname)) {
+    return true;
+  }
+  return false;
+}
+var AMASTER_CONFIG_DIR, CONFIG_FILE, DEFAULT_REGISTRY_NAME, BUILTIN_REGISTRY_DEFINITIONS;
 var init_config = __esm({
   "src/config.ts"() {
     AMASTER_CONFIG_DIR = path.join(os.homedir(), ".amaster");
     CONFIG_FILE = path.join(AMASTER_CONFIG_DIR, "config.json");
+    DEFAULT_REGISTRY_NAME = "helige";
+    BUILTIN_REGISTRY_DEFINITIONS = {
+      helige: "https://helige.cn",
+      "helige-int": "https://helige-int.cn"
+    };
   }
 });
 
@@ -2801,6 +2959,8 @@ async function initOpenClaw(options) {
     }
     addApp(options.appCode, {
       baseURL: options.baseURL,
+      registry: options.registry,
+      registryBaseURL: options.registryBaseURL,
       ossEndpoint,
       initializedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
@@ -2814,6 +2974,8 @@ async function initOpenClaw(options) {
           {
             appCode: options.appCode,
             baseURL: options.baseURL,
+            registry: options.registry || null,
+            registryBaseURL: options.registryBaseURL || null,
             ossEndpoint,
             openClawDetected: false,
             installedSkills: 0,
@@ -2829,6 +2991,9 @@ async function initOpenClaw(options) {
       console.log(chalk4__default.default.blue("\n\u{1F4CB} Configuration:\n"));
       console.log(`  App Code: ${chalk4__default.default.green(options.appCode)}`);
       console.log(`  Base URL: ${chalk4__default.default.gray(options.baseURL)}`);
+      if (options.registryBaseURL) {
+        console.log(`  Registry: ${chalk4__default.default.gray(`${options.registry || "custom"} -> ${options.registryBaseURL}`)}`);
+      }
       console.log();
     }
     spinner.start("Downloading skills...");
@@ -2882,12 +3047,16 @@ async function initOpenClaw(options) {
       const config = getAppConfig(app);
       return {
         appCode: app,
-        baseURL: config?.baseURL || null
+        baseURL: config?.baseURL || null,
+        registry: config?.registry || null,
+        registryBaseURL: config?.registryBaseURL || null
       };
     });
     const summary = {
       appCode: options.appCode,
       baseURL: options.baseURL,
+      registry: options.registry || null,
+      registryBaseURL: options.registryBaseURL || null,
       ossEndpoint,
       openClawDetected: true,
       installedSkills,
@@ -3068,6 +3237,24 @@ function createAmasterClient(appCode) {
   }
   return client$1;
 }
+function resolveInitBaseURL(options) {
+  if (options.url) {
+    const resolvedRegistry2 = resolveRegistry(
+      options.registry || inferRegistryBaseURLFromAppBaseURL(options.url, options.appCode)
+    );
+    return {
+      baseURL: options.url,
+      registryName: resolvedRegistry2.name,
+      registryBaseURL: resolvedRegistry2.baseURL
+    };
+  }
+  const resolvedRegistry = resolveRegistry(options.registry);
+  return {
+    baseURL: resolveAppBaseURL(options.appCode, resolvedRegistry.name),
+    registryName: resolvedRegistry.name,
+    registryBaseURL: resolvedRegistry.baseURL
+  };
+}
 var program = new commander.Command();
 program.name("amaster").description("CLI for Amaster SDK - Multi-app support for OpenClaw").version(resolveCliVersion());
 program.command("apps").description("List all configured apps").addOption(createFormatOption()).action((options) => {
@@ -3078,6 +3265,8 @@ program.command("apps").description("List all configured apps").addOption(create
     return {
       appCode,
       baseURL: config?.baseURL || null,
+      registry: config?.registry || null,
+      registryBaseURL: config?.registryBaseURL || null,
       authenticated: isAuthenticated(appCode),
       current: appCode === current
     };
@@ -3094,6 +3283,9 @@ program.command("apps").description("List all configured apps").addOption(create
           const prefix = app.current ? chalk4__default.default.green("\u2192 ") : "  ";
           console.log(`${prefix}${chalk4__default.default.bold(app.appCode)}${app.current ? chalk4__default.default.green(" (current)") : ""}`);
           console.log(`     ${chalk4__default.default.gray(app.baseURL || "No URL")}`);
+          if (app.registryBaseURL) {
+            console.log(`     ${chalk4__default.default.gray(`registry: ${app.registry} -> ${app.registryBaseURL}`)}`);
+          }
           console.log(
             `     ${app.authenticated ? chalk4__default.default.green("\u25CF Authenticated") : chalk4__default.default.yellow("\u25CB Not authenticated")}`
           );
@@ -3104,6 +3296,45 @@ program.command("apps").description("List all configured apps").addOption(create
     }
   });
 });
+var registryCmd = program.command("registry").description("Manage addon and app registries");
+registryCmd.command("list").alias("ls").description("List available registries").addOption(createFormatOption()).action((options) => {
+  const currentRegistry = getCurrentRegistry();
+  const registries = listRegistries().map((registry) => ({
+    ...registry,
+    current: registry.name === currentRegistry
+  }));
+  renderOutput(registries, {
+    format: options.format,
+    pretty: () => {
+      console.log(chalk4__default.default.blue("\n\u{1F310} Registries\n"));
+      for (const registry of registries) {
+        const prefix = registry.current ? chalk4__default.default.green("\u2192 ") : "  ";
+        const builtin = registry.builtin ? chalk4__default.default.gray("builtin") : chalk4__default.default.gray("custom");
+        console.log(`${prefix}${chalk4__default.default.bold(registry.name)}${registry.current ? chalk4__default.default.green(" (current)") : ""}`);
+        console.log(`     ${chalk4__default.default.gray(registry.baseURL)}  ${builtin}`);
+      }
+      console.log();
+    }
+  });
+});
+registryCmd.command("use <registry>").description("Set the default registry by name or URL").addOption(createFormatOption()).action((registry, options) => {
+  const resolved = setCurrentRegistry(registry);
+  renderOutput(
+    {
+      name: resolved.name,
+      baseURL: resolved.baseURL,
+      builtin: resolved.builtin,
+      current: true
+    },
+    {
+      format: options.format,
+      pretty: () => {
+        console.log(chalk4__default.default.green(`\u2705 Now using registry: ${resolved.name}`));
+        console.log(chalk4__default.default.gray(resolved.baseURL));
+      }
+    }
+  );
+});
 program.command("use <app-code>").description("Set the default app for subsequent commands").addOption(createFormatOption()).action((appCode, options) => {
   if (setCurrentApp(appCode)) {
     renderOutput(
@@ -3123,10 +3354,17 @@ program.command("use <app-code>").description("Set the default app for subsequen
     process.exit(1);
   }
 });
-program.command("init").description("Initialize an app for OpenClaw integration").requiredOption("--app-code <code>", "Application code (e.g., fhv94bto1)").requiredOption("--url <url>", "Base URL (e.g., https://fhv94bto1.helige.cn)").option("--api-key <key>", "API Key for OSS access").option("--oss-endpoint <endpoint>", "OSS endpoint").option("--force", "Reinitialize an existing app").addOption(createFormatOption()).action(async (options) => {
+program.command("init").description("Initialize an app for OpenClaw integration").requiredOption("--app-code <code>", "Application code (e.g., fhv94bto1)").option("--url <url>", "Base URL (e.g., https://fhv94bto1.helige.cn)").option("--registry <registry>", "Registry name or URL (default: current registry)").option("--api-key <key>", "API Key for OSS access").option("--oss-endpoint <endpoint>", "OSS endpoint").option("--force", "Reinitialize an existing app").addOption(createFormatOption()).action(async (options) => {
+  const resolvedInit = resolveInitBaseURL({
+    appCode: options.appCode,
+    url: options.url,
+    registry: options.registry
+  });
   await initOpenClaw({
     appCode: options.appCode,
-    baseURL: options.url,
+    baseURL: resolvedInit.baseURL,
+    registry: resolvedInit.registryName,
+    registryBaseURL: resolvedInit.registryBaseURL,
     apiKey: options.apiKey,
     ossEndpoint: options.ossEndpoint,
     force: options.force,
@@ -3683,19 +3921,29 @@ if (isDirectCliExecution()) {
 exports.addApp = addApp;
 exports.clearAuthSession = clearAuthSession;
 exports.createAmasterClient = createAmasterClient;
+exports.ensureRegistry = ensureRegistry;
 exports.getAccessToken = getAccessToken;
 exports.getAppConfig = getAppConfig;
 exports.getAuthSession = getAuthSession;
 exports.getBaseURL = getBaseURL;
 exports.getConfig = getConfig;
 exports.getCurrentApp = getCurrentApp;
+exports.getCurrentRegistry = getCurrentRegistry;
+exports.getRegistryConfig = getRegistryConfig;
+exports.inferRegistryBaseURLFromAppBaseURL = inferRegistryBaseURLFromAppBaseURL;
 exports.isAuthenticated = isAuthenticated;
 exports.listApps = listApps;
+exports.listRegistries = listRegistries;
+exports.normalizeRegistryBaseURL = normalizeRegistryBaseURL;
 exports.removeApp = removeApp;
+exports.resolveAppBaseURL = resolveAppBaseURL;
 exports.resolveAppCode = resolveAppCode;
+exports.resolveInitBaseURL = resolveInitBaseURL;
+exports.resolveRegistry = resolveRegistry;
 exports.saveAuthSession = saveAuthSession;
 exports.saveConfig = saveConfig;
 exports.setCurrentApp = setCurrentApp;
+exports.setCurrentRegistry = setCurrentRegistry;
 exports.shouldRefreshToken = shouldRefreshToken;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map