kitstore-cli 1.0.92 → 1.0.95

package/dist/api/client.js

@@ -4,19 +4,15 @@ exports.createApi = createApi;
 const generated_1 = require("./generated");
 const config_1 = require("../config");
 async function createApi(options) {
-    // If server is explicitly provided in options, use it (highest priority)
-    // Otherwise, get config and use its server (which should have default-config loaded)
-    // Only fall back to localhost if all else fails
+    // Server/basePath resolution (highest → lowest priority):
+    // 1) Explicit options.server (e.g. from CLI flag or caller)
+    // 2) server from getConfig() (which already applies env → user config → default-config → localhost)
+    //
+    // IMPORTANT:
+    // - We call getConfig() exactly once here.
+    // - We never override a provided options.server with another value.
     const cfg = await (0, config_1.getConfig)();
-    let basePath;
-    if (options?.server) {
-        // Explicit server option takes highest priority
-        basePath = options.server;
-    }
-    else {
-        // Use server from config (will use default-config if available)
-        basePath = cfg.server || 'http://localhost:3000';
-    }
+    const basePath = options?.server ?? cfg.server;
     // Get token from options or config
     const token = options?.token || cfg.token;
     const configuration = new generated_1.Configuration({

package/dist/config.js

@@ -46,28 +46,32 @@ const CONFIG_DIR = process.env.KITSTORE_CONFIG_DIR || path.join(os.homedir(), '.
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
 async function loadBundledDefaultConfig() {
     try {
-        // Try multiple path resolution strategies to work in both development and npm-installed contexts
-        // Strategy 1: Use __dirname relative path (works in development/local builds and npm-installed packages)
-        // When running from source or local tarball, __dirname points to dist/ directory
-        // When running from npm-installed package, __dirname also points to dist/ directory
-        // default-config.json is at package root, so go up one level from dist/
-        const defaultConfigPath = path.join(__dirname, '..', 'default-config.json');
-        if (await fs.pathExists(defaultConfigPath)) {
-            const defaultConfig = await fs.readJson(defaultConfigPath);
-            // Validate that defaultConfig has a server property
-            if (defaultConfig && typeof defaultConfig === 'object' && defaultConfig.server) {
-                return defaultConfig;
+        // Try multiple path resolution strategies to work in both development and npm-installed contexts,
+        // in a deterministic order that favors the actual npm package layout used by npx / CI.
+        //
+        // Strategy 1: Use require.resolve for package.json (most reliable for npm-installed / npx contexts)
+        // - When running from npm cache or node_modules, this finds the real package root.
+        // - default-config.json lives at that package root.
+        try {
+            const packageJsonPath = require.resolve('kitstore-cli/package.json');
+            const packageDir = path.dirname(packageJsonPath);
+            const defaultConfigPath = path.join(packageDir, 'default-config.json');
+            if (await fs.pathExists(defaultConfigPath)) {
+                const defaultConfig = await fs.readJson(defaultConfigPath);
+                if (defaultConfig && typeof defaultConfig === 'object' && defaultConfig.server) {
+                    return defaultConfig;
+                }
             }
         }
-        // Strategy 2: Use require.resolve to find the current module, then resolve config relative to it
-        // This works when the package is installed via npm and we can resolve our own module
+        catch (err) {
+            // Strategy 1 failed, try Strategy 2
+        }
+        // Strategy 2: Use __dirname relative path (works in development/local builds and many npm-installed layouts)
+        // - When running from source or local tarball, __dirname points to dist/ directory.
+        // - When running from npm-installed package, __dirname also typically points to dist/ directory.
+        // - default-config.json is at package root, so go up one level from dist/.
         try {
-            // Resolve the current module (config.js) to get its location
-            const currentModulePath = require.resolve('./config');
-            const currentModuleDir = path.dirname(currentModulePath);
-            // Go up to package root (from dist/ to package root)
-            const packageRoot = path.dirname(currentModuleDir);
-            const defaultConfigPath = path.join(packageRoot, 'default-config.json');
+            const defaultConfigPath = path.join(__dirname, '..', 'default-config.json');
             if (await fs.pathExists(defaultConfigPath)) {
                 const defaultConfig = await fs.readJson(defaultConfigPath);
                 if (defaultConfig && typeof defaultConfig === 'object' && defaultConfig.server) {
@@ -78,27 +82,32 @@ async function loadBundledDefaultConfig() {
         catch (err) {
             // Strategy 2 failed, try Strategy 3
         }
-        // Strategy 3: Try to find default-config.json in process.cwd()/node_modules/kitstore-cli/
-        // This works when running from a project that has kitstore-cli installed locally
+        // Strategy 3: Use require.resolve to find the compiled config module, then resolve config relative to it
+        // - This works when the package is installed via npm and we can resolve our own module entrypoint.
         try {
-            const nodeModulesPath = path.join(process.cwd(), 'node_modules', 'kitstore-cli', 'default-config.json');
-            if (await fs.pathExists(nodeModulesPath)) {
-                const defaultConfig = await fs.readJson(nodeModulesPath);
+            // Resolve the current module (config.js) to get its location
+            // Use the full path from the package to be more reliable
+            const currentModulePath = require.resolve('kitstore-cli/dist/config');
+            const currentModuleDir = path.dirname(currentModulePath);
+            // Go up to package root (from dist/ to package root)
+            const packageRoot = path.dirname(currentModuleDir);
+            const defaultConfigPath = path.join(packageRoot, 'default-config.json');
+            if (await fs.pathExists(defaultConfigPath)) {
+                const defaultConfig = await fs.readJson(defaultConfigPath);
                 if (defaultConfig && typeof defaultConfig === 'object' && defaultConfig.server) {
                     return defaultConfig;
                 }
             }
         }
         catch (err) {
-            // Strategy 3 failed, continue
+            // Strategy 3 failed, try Strategy 4
         }
-        // Strategy 4: Try require.resolve for package.json (works when package is in node_modules)
+        // Strategy 4: Try to find default-config.json in process.cwd()/node_modules/kitstore-cli/
+        // This works when running from a project that has kitstore-cli installed locally
         try {
-            const packageJsonPath = require.resolve('kitstore-cli/package.json');
-            const packageDir = path.dirname(packageJsonPath);
-            const defaultConfigPath = path.join(packageDir, 'default-config.json');
-            if (await fs.pathExists(defaultConfigPath)) {
-                const defaultConfig = await fs.readJson(defaultConfigPath);
+            const nodeModulesPath = path.join(process.cwd(), 'node_modules', 'kitstore-cli', 'default-config.json');
+            if (await fs.pathExists(nodeModulesPath)) {
+                const defaultConfig = await fs.readJson(nodeModulesPath);
                 if (defaultConfig && typeof defaultConfig === 'object' && defaultConfig.server) {
                     return defaultConfig;
                 }
@@ -118,9 +127,14 @@ async function getConfig() {
         await fs.ensureDir(CONFIG_DIR);
         if (await fs.pathExists(CONFIG_FILE)) {
             const content = await fs.readJson(CONFIG_FILE);
-            // Environment variable takes precedence over config file, bundled default, then localhost
+            // Server precedence (highest → lowest):
+            // 1) AGENTKIT_BACKEND_URL environment variable
+            // 2) server value explicitly stored in user config.json (content.server, including empty string if deliberately set)
+            // 3) bundled default-config.json server (from published package)
+            // 4) localhost fallback (only when no other source is available)
             const defaultConfig = await loadBundledDefaultConfig();
-            // If content.server exists (even if falsy like empty string), use it; otherwise use fallback
+            // If content.server is defined (even if empty string), prefer it over bundled default-config.
+            // This allows advanced users to deliberately clear or override the default-config server in their own config.
             const server = process.env.AGENTKIT_BACKEND_URL ||
                 (content.server !== undefined ? content.server : (defaultConfig?.server || 'http://localhost:3000'));
             return { ...content, server };
@@ -129,7 +143,7 @@ async function getConfig() {
     catch (err) {
         // Ignore errors
     }
-    // No local config file - try bundled default config
+    // No local config file - try bundled default config first, then fall back
     const defaultConfig = await loadBundledDefaultConfig();
     const server = process.env.AGENTKIT_BACKEND_URL || defaultConfig?.server || 'http://localhost:3000';
     return { server };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitstore-cli",
-  "version": "1.0.92",
+  "version": "1.0.95",
   "description": "CLI tool for Cursor Kit",
   "main": "dist/index.js",
   "bin": {