@karmaniverous/jeeves-meta 0.20.0-0 → 0.20.0-1

package/dist/cli/jeeves-meta/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { sleepAsync, computeInsiderKey, fetchWithTimeout, DEFAULT_PORTS, createConfigQueryHandler, createStatusHandler, getBindAddress, getServiceUrl, jeevesComponentDescriptorSchema, createConfigApplyHandler, createServiceCli } from '@karmaniverous/jeeves';
+import { sleepAsync, computeInsiderKey, fetchWithTimeout, DEFAULT_PORTS, createConfigQueryHandler, createStatusHandler, getBindAddress, rejectWindowsDrivePath, init, WORKSPACE_CONFIG_DEFAULTS, resolveConfigValue, loadWorkspaceConfig, getServiceUrl, jeevesComponentDescriptorSchema, createConfigApplyHandler, createServiceCli } from '@karmaniverous/jeeves';
 import { normalizePath, metaConfigSchema, META_ERROR_STATUS, updateBodySchema, META_COMPONENT, META_CATALOG, META_OPENAPI_DOCUMENT } from '@karmaniverous/jeeves-meta-core';
 import fs, { unlinkSync, writeFileSync, existsSync, readFileSync, statSync, mkdirSync, readdirSync, watchFile } from 'node:fs';
 import path, { join, dirname, relative, posix, sep, resolve } from 'node:path';
@@ -32742,11 +32742,61 @@ function createMetaClient(options) {
     return Object.fromEntries(methods);
 }
 
+/**
+ * Workspace and config root for the custom CLI commands, so they can ask
+ * jeeves where meta runs (`getServiceUrl('meta')`, which reads the core
+ * config under the config root).
+ *
+ * Each root follows jeeves' shared precedence: the flag, then
+ * `JEEVES_WORKSPACE` / `JEEVES_CONFIG_ROOT`, then `core.*` in the
+ * workspace's `jeeves.config.json`, then the defaults (`.`, `./config`).
+ * jeeves does not export its own resolver, so this composes the exported
+ * `loadWorkspaceConfig()` and `resolveConfigValue()` as jeeves-runner does;
+ * karmaniverous/jeeves#169 moves this into jeeves.
+ *
+ * @module cliRoots
+ */
+/**
+ * Resolve the workspace and config root by flag, env,
+ * `jeeves.config.json`, then default.
+ *
+ * @param opts - The parsed flags.
+ * @param env - Environment to read (default `process.env`).
+ * @returns Both roots, as given (not yet made absolute).
+ */
+function resolveRoots(opts, env = process.env) {
+    const defaults = WORKSPACE_CONFIG_DEFAULTS.core;
+    const workspaceSeed = resolveConfigValue(opts.workspace, env['JEEVES_WORKSPACE'], undefined, defaults.workspace).value;
+    const file = loadWorkspaceConfig(workspaceSeed);
+    return {
+        workspace: resolveConfigValue(opts.workspace, env['JEEVES_WORKSPACE'], file?.core?.workspace, defaults.workspace).value,
+        configRoot: resolveConfigValue(opts.configRoot, env['JEEVES_CONFIG_ROOT'], file?.core?.configRoot, defaults.configRoot).value,
+    };
+}
+/**
+ * Resolve both roots and initialise jeeves with them.
+ *
+ * @param opts - The parsed flags.
+ * @param env - Environment to read (default `process.env`).
+ */
+function initRoots(opts, env = process.env) {
+    const roots = resolveRoots(opts, env);
+    // Check the raw values: on Linux, resolve('j:/x') hides the drive letter.
+    rejectWindowsDrivePath('configRoot', roots.configRoot);
+    rejectWindowsDrivePath('workspacePath', roots.workspace);
+    init({
+        workspacePath: resolve(roots.workspace),
+        configRoot: resolve(roots.configRoot),
+    });
+}
+
 /**
  * Custom CLI commands for the jeeves-meta service, built on the SDK
  * (`@karmaniverous/jeeves-meta-sdk`, Decision 187). Each command calls one
  * catalog entry and prints the response as JSON; a failure prints one
- * error line to stderr and sets exit code 1.
+ * error line to stderr and sets exit code 1. The service URL comes from
+ * jeeves (`getServiceUrl('meta')`) after the workspace and config root are
+ * resolved (`cliRoots`); `--port` overrides its port.
  *
  * Registered via `descriptor.customCliCommands` and added to the
  * standard service CLI produced by `createServiceCli`.
@@ -32754,15 +32804,17 @@ function createMetaClient(options) {
  * @module customCliCommands
  */
 /**
- * The service's base URL on the given port.
+ * The service's base URL: jeeves' URL for meta, with `--port` when it is
+ * not the default.
  *
- * @param port - Port string from `--port`.
+ * @param opts - The command's options.
  * @returns The base URL.
  */
-function serviceBaseUrl(port) {
+function serviceBaseUrl(opts) {
+    initRoots(opts);
     const url = new URL(getServiceUrl('meta'));
-    if (port !== DEFAULT_PORT_STR)
-        url.port = port;
+    if (opts.port !== DEFAULT_PORT_STR)
+        url.port = opts.port;
     return url.origin;
 }
 /**
@@ -32781,12 +32833,12 @@ function errorLine(error) {
  * Run one command: call the service, print the result as JSON, or print
  * the error line and set exit code 1.
  *
- * @param port - Port string from `--port`.
+ * @param opts - The command's options.
  * @param call - The SDK call.
  */
-async function runCommand(port, call) {
+async function runCommand(opts, call) {
     try {
-        const data = await call(createMetaClient({ baseUrl: serviceBaseUrl(port) }));
+        const data = await call(createMetaClient({ baseUrl: serviceBaseUrl(opts) }));
         console.log(JSON.stringify(data, null, 2));
     }
     catch (error) {
@@ -32794,27 +32846,38 @@ async function runCommand(port, call) {
         process.exitCode = 1;
     }
 }
+/**
+ * Add the options every service command takes: `--port`, and the roots
+ * jeeves resolves the service URL from (no defaults, so the environment and
+ * `jeeves.config.json` apply when a flag is absent).
+ *
+ * @param cmd - The command.
+ * @returns It.
+ */
+function withServiceOptions(cmd) {
+    return cmd
+        .option('-p, --port <port>', 'Service port', DEFAULT_PORT_STR)
+        .option('-w, --workspace <path>', 'Workspace root path')
+        .option('--config-root <path>', 'Platform config root path');
+}
 /**
  * Register all custom meta commands on the parent program.
  *
  * @param program - The service CLI.
  */
 function registerCustomCliCommands(program) {
-    const command = (spec, description) => program
-        .command(spec)
-        .description(description)
-        .option('-p, --port <port>', 'Service port', DEFAULT_PORT_STR);
-    command('list', 'List all discovered meta entities').action((opts) => runCommand(opts.port, (meta) => meta.listMetas()));
-    command('detail <path>', 'Show full detail for a single meta entity').action((path, opts) => runCommand(opts.port, (meta) => meta.metaDetail({ path })));
+    const command = (spec, description) => withServiceOptions(program.command(spec).description(description));
+    command('list', 'List all discovered meta entities').action((opts) => runCommand(opts, (meta) => meta.listMetas()));
+    command('detail <path>', 'Show full detail for a single meta entity').action((path, opts) => runCommand(opts, (meta) => meta.metaDetail({ path })));
     command('preview', 'Dry-run: preview inputs for next synthesis cycle')
         .option('--path <path>', 'Specific meta path to preview')
-        .action((opts) => runCommand(opts.port, (meta) => meta.preview(opts.path ? { path: opts.path } : {})));
+        .action((opts) => runCommand(opts, (meta) => meta.preview(opts.path ? { path: opts.path } : {})));
     command('synthesize', 'Trigger synthesis (enqueues work)')
         .option('--path <path>', 'Specific meta path to synthesize')
-        .action((opts) => runCommand(opts.port, (meta) => meta.synthesize(opts.path ? { path: opts.path } : {})));
-    command('seed <path>', 'Create .meta/ directory + meta.json for a path').action((path, opts) => runCommand(opts.port, (meta) => meta.seed({ path })));
-    command('unlock <path>', 'Remove .lock file from a meta entity').action((path, opts) => runCommand(opts.port, (meta) => meta.unlock({ path })));
-    command('abort', 'Abort the current synthesis in progress').action((opts) => runCommand(opts.port, (meta) => meta.abort()));
+        .action((opts) => runCommand(opts, (meta) => meta.synthesize(opts.path ? { path: opts.path } : {})));
+    command('seed <path>', 'Create .meta/ directory + meta.json for a path').action((path, opts) => runCommand(opts, (meta) => meta.seed({ path })));
+    command('unlock <path>', 'Remove .lock file from a meta entity').action((path, opts) => runCommand(opts, (meta) => meta.unlock({ path })));
+    command('abort', 'Abort the current synthesis in progress').action((opts) => runCommand(opts, (meta) => meta.abort()));
     command('prune', 'Prune old archive snapshots beyond maxArchive').action(() => {
         // The service has no prune route yet (jeeves-meta#69); 0.19.0 called a
         // missing route and failed with HTTP 404.
@@ -32824,16 +32887,9 @@ function registerCustomCliCommands(program) {
     const queue = program
         .command('queue')
         .description('Queue management commands');
-    queue
-        .command('list')
-        .description('Show current queue state')
-        .option('-p, --port <port>', 'Service port', DEFAULT_PORT_STR)
-        .action((opts) => runCommand(opts.port, (meta) => meta.queue()));
-    queue
-        .command('clear')
-        .description('Remove all pending items from the queue')
-        .option('-p, --port <port>', 'Service port', DEFAULT_PORT_STR)
-        .action((opts) => runCommand(opts.port, (meta) => meta.queueClear()));
+    const queueCommand = (name, description) => withServiceOptions(queue.command(name).description(description));
+    queueCommand('list', 'Show current queue state').action((opts) => runCommand(opts, (meta) => meta.queue()));
+    queueCommand('clear', 'Remove all pending items from the queue').action((opts) => runCommand(opts, (meta) => meta.queueClear()));
 }
 
 /**

package/package.json

@@ -112,5 +112,5 @@
     "wire:record": "vitest run --config vitest.wire-record.config.ts"
   },
   "type": "module",
-  "version": "0.20.0-0"
+  "version": "0.20.0-1"
 }