@karmaniverous/jeeves-server-openclaw 0.7.1 → 0.7.3

package/dist/cli.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import path, { join, dirname, resolve, basename } from 'node:path';
-import { fileURLToPath } from 'node:url';
 import fs, { existsSync, copyFileSync, writeFileSync, readFileSync, rmSync, mkdirSync, readdirSync, renameSync, unlinkSync } from 'node:fs';
+import path, { join, dirname, resolve, basename } from 'node:path';
 import { randomUUID } from 'node:crypto';
 import require$$0$4 from 'path';
 import require$$0$3 from 'fs';
@@ -14,8 +13,9 @@ import 'vm';
 import require$$0$5 from 'node:events';
 import require$$1 from 'node:child_process';
 import process$2 from 'node:process';
-import 'node:fs/promises';
 import { homedir } from 'node:os';
+import { fileURLToPath } from 'node:url';
+import 'node:fs/promises';
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -15403,14 +15403,14 @@ const SECTION_ORDER = [
  * Core library version, inlined at build time.
  *
  * @remarks
- * The `0.5.2` placeholder is replaced by
+ * The `0.5.4` placeholder is replaced by
  * `@rollup/plugin-replace` during the build with the actual version
  * from `package.json`. This ensures the correct version survives
  * when consumers bundle core into their own dist (where runtime
  * `import.meta.url`-based resolution would find the wrong package.json).
  */
 /** The core library version from package.json (inlined at build time). */
-const CORE_VERSION = '0.5.2';
+const CORE_VERSION = '0.5.4';
 
 /**
  * Workspace and config root initialization.
@@ -16229,6 +16229,148 @@ function seedSkill(workspacePath) {
     writeFileSync(skillPath, skillContent, 'utf-8');
 }
 
+/**
+ * Zod schema for the Jeeves component descriptor.
+ *
+ * @remarks
+ * The descriptor replaces the v0.4.0 `JeevesComponent` interface with a
+ * Zod-first approach. The TypeScript type is inferred via `z.infer<>`.
+ * Validates at parse time: prime interval, callable functions.
+ */
+/**
+ * Check whether a number is prime.
+ *
+ * @param n - Number to check.
+ * @returns `true` if n is prime.
+ */
+function isPrime(n) {
+    if (n < 2)
+        return false;
+    if (n === 2)
+        return true;
+    if (n % 2 === 0)
+        return false;
+    for (let i = 3; i * i <= n; i += 2) {
+        if (n % i === 0)
+            return false;
+    }
+    return true;
+}
+/**
+ * Zod schema for the Jeeves component descriptor.
+ *
+ * @remarks
+ * Single source of truth for what a component must provide.
+ * Factories consume this descriptor to produce CLI commands,
+ * plugin tools, and HTTP handlers.
+ */
+object({
+    /** Component name (e.g., 'watcher', 'runner', 'server', 'meta'). */
+    name: string().min(1, 'name must be a non-empty string'),
+    /** Component version (from package.json). */
+    version: string().min(1, 'version must be a non-empty string'),
+    /** npm package name for the service. */
+    servicePackage: string().min(1),
+    /** npm package name for the plugin. */
+    pluginPackage: string().min(1),
+    /** System service name. Defaults to `jeeves-${name}` when not provided. */
+    serviceName: string().min(1).optional(),
+    /** Default port for the service's HTTP API. */
+    defaultPort: number().int().positive(),
+    /** Zod schema for validating config files. */
+    configSchema: custom((val) => val !== null &&
+        typeof val === 'object' &&
+        typeof val.parse === 'function', { message: 'configSchema must be a Zod schema' }),
+    /** Config file name (e.g., 'jeeves-watcher.config.json'). */
+    configFileName: string().min(1),
+    /** Returns a default config object for `init`. */
+    initTemplate: _function({
+        input: [],
+        output: record(string(), unknown()),
+    }),
+    /**
+     * Service-side callback after config apply. Receives the merged,
+     * validated config (not the raw patch). Optional — if omitted,
+     * write-only (service picks up changes on restart).
+     */
+    onConfigApply: _function({
+        input: [record(string(), unknown())],
+        output: promise(_void()),
+    })
+        .optional(),
+    /**
+     * Custom merge function for config apply. Receives the existing config
+     * and the patch, returns the merged result. Optional — if omitted,
+     * the default deep-merge (object-recursive, array-replacing) is used.
+     *
+     * Use this to implement domain-specific merge strategies such as
+     * name-based array merging for inference rules.
+     */
+    customMerge: _function({
+        input: [
+            record(string(), unknown()),
+            record(string(), unknown()),
+        ],
+        output: record(string(), unknown()),
+    })
+        .optional(),
+    /**
+     * Returns command + args for launching the service process.
+     * Consumed by `service install`.
+     */
+    startCommand: _function({
+        input: [string()],
+        output: array(string()),
+    }),
+    /** In-process service entry point for the CLI `start` command. */
+    run: _function({
+        input: [string()],
+        output: promise(_void()),
+    }),
+    /** TOOLS.md section name (e.g., 'Watcher'). */
+    sectionId: string().min(1, 'sectionId must be a non-empty string'),
+    /** Refresh interval in seconds (must be a prime number). */
+    refreshIntervalSeconds: number().int().positive().refine(isPrime, {
+        message: 'refreshIntervalSeconds must be a prime number',
+    }),
+    /** Produce the component's TOOLS.md section content. */
+    generateToolsContent: _function({ input: [], output: string() }),
+    /** Component dependencies for HEARTBEAT alert suppression. */
+    dependencies: object({
+        /** Components that must be healthy for this component to function. */
+        hard: array(string()),
+        /** Components that improve behavior but are not strictly required. */
+        soft: array(string()),
+    })
+        .optional(),
+    /** Extension point: add custom CLI commands to the service CLI. */
+    customCliCommands: _function({ input: [custom()], output: _void() })
+        .optional(),
+    /** Extension point: return additional plugin tool descriptors. */
+    customPluginTools: _function({ input: [custom()], output: array(unknown()) })
+        .optional(),
+});
+
+/**
+ * Resolve the package root directory from a module's `import.meta.url`.
+ *
+ * @module
+ */
+/**
+ * Get the nearest package root directory relative to the calling module URL.
+ *
+ * @param importMetaUrl - The `import.meta.url` of the calling module.
+ * @returns The absolute package root path, or `undefined` on any error.
+ */
+function getPackageRoot(importMetaUrl) {
+    try {
+        return packageDirectorySync({ cwd: fileURLToPath(importMetaUrl) });
+    }
+    catch {
+        return undefined;
+    }
+}
+
 /**
  * OpenClaw configuration helpers for plugin CLI installers.
  *
@@ -16432,8 +16574,13 @@ function readJsonFile(filePath) {
  * @returns A Commander program ready for `.parse()`.
  */
 function createPluginCli(options) {
-    const { pluginId, distDir, pluginPackage, configRoot = 'j:/config', } = options;
+    const { pluginId, importMetaUrl, pluginPackage, configRoot = 'j:/config', } = options;
     const componentName = options.componentName ?? deriveComponentName(pluginId);
+    const pkgRoot = getPackageRoot(importMetaUrl);
+    if (!pkgRoot) {
+        throw new Error(`Unable to resolve package root for plugin CLI: ${pluginPackage}`);
+    }
+    const distDir = join(pkgRoot, 'dist');
     const program = new Command()
         .name(pluginPackage)
         .description(`Jeeves ${componentName} plugin installer`);
@@ -16448,16 +16595,16 @@ function createPluginCli(options) {
         const configPath = resolveConfigPath(openClawHome);
         // 1. Copy dist to extensions
         const extensionsDir = join(openClawHome, 'extensions', pluginId);
+        if (!existsSync(distDir)) {
+            throw new Error(`Plugin dist directory not found: ${distDir}. Ensure the plugin is built before installing.`);
+        }
         console.log(`Copying dist to ${extensionsDir}...`);
-        copyDistFiles(distDir, extensionsDir);
+        copyDistFiles(distDir, join(extensionsDir, 'dist'));
         // Copy package.json and openclaw.plugin.json from package root
-        const pkgRoot = packageDirectorySync({ cwd: distDir });
-        if (pkgRoot) {
-            for (const file of ['package.json', 'openclaw.plugin.json']) {
-                const src = join(pkgRoot, file);
-                if (existsSync(src)) {
-                    copyFileSync(src, join(extensionsDir, file));
-                }
+        for (const file of ['package.json', 'openclaw.plugin.json']) {
+            const src = join(pkgRoot, file);
+            if (existsSync(src)) {
+                copyFileSync(src, join(extensionsDir, file));
             }
         }
         console.log('  ✓ Dist files copied');
@@ -16627,128 +16774,6 @@ function createPluginCli(options) {
     return program;
 }
 
-/**
- * Zod schema for the Jeeves component descriptor.
- *
- * @remarks
- * The descriptor replaces the v0.4.0 `JeevesComponent` interface with a
- * Zod-first approach. The TypeScript type is inferred via `z.infer<>`.
- * Validates at parse time: prime interval, callable functions.
- */
-/**
- * Check whether a number is prime.
- *
- * @param n - Number to check.
- * @returns `true` if n is prime.
- */
-function isPrime(n) {
-    if (n < 2)
-        return false;
-    if (n === 2)
-        return true;
-    if (n % 2 === 0)
-        return false;
-    for (let i = 3; i * i <= n; i += 2) {
-        if (n % i === 0)
-            return false;
-    }
-    return true;
-}
-/**
- * Zod schema for the Jeeves component descriptor.
- *
- * @remarks
- * Single source of truth for what a component must provide.
- * Factories consume this descriptor to produce CLI commands,
- * plugin tools, and HTTP handlers.
- */
-object({
-    /** Component name (e.g., 'watcher', 'runner', 'server', 'meta'). */
-    name: string().min(1, 'name must be a non-empty string'),
-    /** Component version (from package.json). */
-    version: string().min(1, 'version must be a non-empty string'),
-    /** npm package name for the service. */
-    servicePackage: string().min(1),
-    /** npm package name for the plugin. */
-    pluginPackage: string().min(1),
-    /** System service name. Defaults to `jeeves-${name}` when not provided. */
-    serviceName: string().min(1).optional(),
-    /** Default port for the service's HTTP API. */
-    defaultPort: number().int().positive(),
-    /** Zod schema for validating config files. */
-    configSchema: custom((val) => val !== null &&
-        typeof val === 'object' &&
-        typeof val.parse === 'function', { message: 'configSchema must be a Zod schema' }),
-    /** Config file name (e.g., 'jeeves-watcher.config.json'). */
-    configFileName: string().min(1),
-    /** Returns a default config object for `init`. */
-    initTemplate: _function({
-        input: [],
-        output: record(string(), unknown()),
-    }),
-    /**
-     * Service-side callback after config apply. Receives the merged,
-     * validated config (not the raw patch). Optional — if omitted,
-     * write-only (service picks up changes on restart).
-     */
-    onConfigApply: _function({
-        input: [record(string(), unknown())],
-        output: promise(_void()),
-    })
-        .optional(),
-    /**
-     * Custom merge function for config apply. Receives the existing config
-     * and the patch, returns the merged result. Optional — if omitted,
-     * the default deep-merge (object-recursive, array-replacing) is used.
-     *
-     * Use this to implement domain-specific merge strategies such as
-     * name-based array merging for inference rules.
-     */
-    customMerge: _function({
-        input: [
-            record(string(), unknown()),
-            record(string(), unknown()),
-        ],
-        output: record(string(), unknown()),
-    })
-        .optional(),
-    /**
-     * Returns command + args for launching the service process.
-     * Consumed by `service install`.
-     */
-    startCommand: _function({
-        input: [string()],
-        output: array(string()),
-    }),
-    /** In-process service entry point for the CLI `start` command. */
-    run: _function({
-        input: [string()],
-        output: promise(_void()),
-    }),
-    /** TOOLS.md section name (e.g., 'Watcher'). */
-    sectionId: string().min(1, 'sectionId must be a non-empty string'),
-    /** Refresh interval in seconds (must be a prime number). */
-    refreshIntervalSeconds: number().int().positive().refine(isPrime, {
-        message: 'refreshIntervalSeconds must be a prime number',
-    }),
-    /** Produce the component's TOOLS.md section content. */
-    generateToolsContent: _function({ input: [], output: string() }),
-    /** Component dependencies for HEARTBEAT alert suppression. */
-    dependencies: object({
-        /** Components that must be healthy for this component to function. */
-        hard: array(string()),
-        /** Components that improve behavior but are not strictly required. */
-        soft: array(string()),
-    })
-        .optional(),
-    /** Extension point: add custom CLI commands to the service CLI. */
-    customCliCommands: _function({ input: [custom()], output: _void() })
-        .optional(),
-    /** Extension point: return additional plugin tool descriptors. */
-    customPluginTools: _function({ input: [custom()], output: array(unknown()) })
-        .optional(),
-});
-
 /**
  * Core configuration schema and resolution.
  *
@@ -16811,12 +16836,11 @@ const PLUGIN_ID = 'jeeves-server-openclaw';
  *
  * @packageDocumentation
  */
-const distDir = resolve(dirname(fileURLToPath(import.meta.url)));
 // Type assertion: core's bundled .d.ts doesn't fully resolve the Command
 // return type for eslint, but the runtime value is a Commander instance.
 const program = createPluginCli({
     pluginId: PLUGIN_ID,
-    distDir,
+    importMetaUrl: import.meta.url,
     pluginPackage: '@karmaniverous/jeeves-server-openclaw',
     componentName: 'server',
 });