rubrkit 0.1.1 → 0.3.0

package/src/cli.js

@@ -1,93 +1,97 @@
-import { parseArgs } from './args.js';
-import { resolveConfig } from './config.js';
-import { RubrkitCliError } from './errors.js';
-import { runPull } from './pull.js';
-import { runTestingCommand } from './testingCli.js';
-
-const HELP_TEXT = `Rubrkit CLI
-
-Usage:
-  rubrkit pull [all|<artifact-bundle-or-artifact-selector>] [options]
-  rubrkit validate <path|glob> [options]
-  rubrkit test <path|glob|artifact-bundle-or-artifact-selector> [options]
-  rubrkit audit <artifact-bundle-or-selector> [options]
-  rubrkit eval <artifact-bundle-or-selector> [options]
-  rubrkit report <job-or-run-id> [options]
-
-Options:
-  --destination <path>       Destination root. Defaults to the current directory.
-  --agent <auto|codex|claude|generic>
-  --artifact-bundle <id-or-name>
-  --artifact <id-or-path>
-  --rubric <rubric-id-or-path>
-  --format <text|json|junit>
-  --output <path>
-  --fail-under <score>
-  --fail-on <critical|high|medium|low>
-  --ci
-  --local
-  --remote
-  --no-ai
-  --watch
-  --changed
-  --all
-  --yes                     Non-interactive confirmation for unambiguous pulls.
-  --dry-run                 Print the planned writes without changing files.
-  --force                   Overwrite protected local changes.
-  --prune                   Remove manifest-tracked files no longer selected.
-  --update-only             Update only files already tracked in .rubrkit/manifest.json.
-  --config <path>           Optional Rubrkit config JSON. API keys are not allowed in config.
-  --api-url <url>           Defaults to RUBRKIT_API_URL or https://rubrkit.com/api/v1.
-  --api-key <key>           Defaults to RUBRKIT_API_KEY.
-`;
-
-/**
- * @param {{
- *   argv?: string[],
- *   env?: Record<string, string | undefined>,
- *   cwd?: string,
- *   stdin?: NodeJS.ReadableStream,
- *   stdout?: NodeJS.WritableStream,
- *   stderr?: NodeJS.WritableStream,
- *   fetchImpl?: typeof fetch,
- * }} [params]
- */
-export async function main({
-    argv = process.argv.slice(2),
-    env = process.env,
-    cwd = process.cwd(),
-    stdin = process.stdin,
-    stdout = process.stdout,
-    stderr = process.stderr,
-    fetchImpl = globalThis.fetch,
-} = {}) {
-    try {
-        const parsed = parseArgs(argv);
-
-        if (parsed.command === 'help') {
-            stdout.write(HELP_TEXT);
-            return 0;
-        }
-
-        if (parsed.command === 'version') {
-            stdout.write('rubrkit 0.0.0-local\n');
-            return 0;
-        }
-
-        const config = await resolveConfig({ parsed, env, cwd });
-        if (parsed.command === 'pull') {
-            await runPull({ config, stdin, stdout, stderr, fetchImpl });
-            return 0;
-        }
-
-        return runTestingCommand({ config, stdout, stderr, fetchImpl });
-    } catch (error) {
-        if (error instanceof RubrkitCliError) {
-            stderr.write(`rubrkit: ${error.message}\n`);
-            return error.exitCode;
-        }
-
-        stderr.write(`rubrkit: ${error instanceof Error ? error.message : String(error)}\n`);
-        return 1;
-    }
-}
+import { parseArgs } from './args.js';
+import { resolveConfig } from './config.js';
+import { RubrkitCliError } from './errors.js';
+import { runPull } from './pull.js';
+import { runTestingCommand } from './testingCli.js';
+
+const HELP_TEXT = `Rubrkit CLI
+
+Usage:
+  rubrkit pull [all|<artifact-bundle-or-artifact-selector>] [options]
+  rubrkit pull --label <name> [--label <name> ...] [options]
+  rubrkit validate <path|glob> [options]
+  rubrkit test <path|glob|artifact-bundle-or-artifact-selector> [options]
+  rubrkit audit <artifact-bundle-or-selector> [options]
+  rubrkit eval <artifact-bundle-or-selector> [options]
+  rubrkit report <job-or-run-id> [options]
+
+Options:
+  --destination <path>       Destination root. Defaults to the current directory.
+  --agent <auto|codex|claude|generic>
+  --artifact-bundle <id-or-name>
+  --artifact <id-or-path>
+  --label <name>             Pull every artifact in bundles carrying this label.
+                             Repeatable and comma-separated; matches ANY (OR).
+  --rubric <rubric-id-or-path>
+  --format <text|json|junit>
+  --output <path>
+  --fail-under <score>
+  --fail-on <critical|high|medium|low>
+  --ci
+  --local
+  --remote
+  --no-ai
+  --no-cache                 Bypass the audit result cache and force a fresh run.
+  --watch
+  --changed
+  --all
+  --yes                     Non-interactive confirmation for unambiguous pulls.
+  --dry-run                 Print the planned writes without changing files.
+  --force                   Overwrite protected local changes.
+  --prune                   Remove manifest-tracked files no longer selected.
+  --update-only             Update only files already tracked in .rubrkit/manifest.json.
+  --config <path>           Optional Rubrkit config JSON. API keys are not allowed in config.
+  --api-url <url>           Defaults to RUBRKIT_API_URL or https://rubrkit.com/api/v1.
+  --api-key <key>           Defaults to RUBRKIT_API_KEY.
+`;
+
+/**
+ * @param {{
+ *   argv?: string[],
+ *   env?: Record<string, string | undefined>,
+ *   cwd?: string,
+ *   stdin?: NodeJS.ReadableStream,
+ *   stdout?: NodeJS.WritableStream,
+ *   stderr?: NodeJS.WritableStream,
+ *   fetchImpl?: typeof fetch,
+ * }} [params]
+ */
+export async function main({
+    argv = process.argv.slice(2),
+    env = process.env,
+    cwd = process.cwd(),
+    stdin = process.stdin,
+    stdout = process.stdout,
+    stderr = process.stderr,
+    fetchImpl = globalThis.fetch,
+} = {}) {
+    try {
+        const parsed = parseArgs(argv);
+
+        if (parsed.command === 'help') {
+            stdout.write(HELP_TEXT);
+            return 0;
+        }
+
+        if (parsed.command === 'version') {
+            stdout.write('rubrkit 0.0.0-local\n');
+            return 0;
+        }
+
+        const config = await resolveConfig({ parsed, env, cwd });
+        if (parsed.command === 'pull') {
+            await runPull({ config, stdin, stdout, stderr, fetchImpl });
+            return 0;
+        }
+
+        return runTestingCommand({ config, stdout, stderr, fetchImpl });
+    } catch (error) {
+        if (error instanceof RubrkitCliError) {
+            stderr.write(`rubrkit: ${error.message}\n`);
+            return error.exitCode;
+        }
+
+        stderr.write(`rubrkit: ${error instanceof Error ? error.message : String(error)}\n`);
+        return 1;
+    }
+}

package/src/config.js

@@ -1,169 +1,186 @@
-import fs from 'node:fs/promises';
-import path from 'node:path';
-
-import { usageError } from './errors.js';
-
-export const DEFAULT_API_URL = 'https://rubrkit.com/api/v1';
-
-const CONFIG_FIELDS = new Set([
-    'apiUrl',
-    'destination',
-    'agent',
-    'artifactBundle',
-    'artifact',
-    'rubric',
-    'format',
-    'output',
-    'failUnder',
-    'failOn',
-    'all',
-    'yes',
-    'dryRun',
-    'force',
-    'prune',
-    'updateOnly',
-    'ci',
-    'local',
-    'remote',
-    'noAi',
-    'watch',
-    'changed',
-]);
-
-/**
- * @param {{
- *   parsed: ReturnType<import('./args.js').parseArgs>,
- *   env?: Record<string, string | undefined>,
- *   cwd?: string,
- *   fsImpl?: Pick<typeof fs, 'readFile' | 'stat'>,
- * }} params
- */
-export async function resolveConfig({ parsed, env = process.env, cwd = process.cwd(), fsImpl = fs }) {
-    const config = await loadConfig({ configPath: stringOption(parsed.options.config), cwd, fsImpl });
-    const options = parsed.options;
-
-    return {
-        command: parsed.command,
-        selector: parsed.selector,
-        apiKey: stringOption(options['api-key']) ?? env.RUBRKIT_API_KEY ?? null,
-        apiUrl: normalizeApiUrl(stringOption(options['api-url']) ?? env.RUBRKIT_API_URL ?? stringOption(config.apiUrl) ?? DEFAULT_API_URL),
-        destination: stringOption(options.destination) ?? stringOption(config.destination) ?? cwd,
-        agent: stringOption(options.agent) ?? stringOption(config.agent) ?? 'auto',
-        artifactBundle: stringOption(options['artifact-bundle']) ?? stringOption(config.artifactBundle) ?? null,
-        artifact: stringOption(options.artifact) ?? stringOption(config.artifact) ?? null,
-        rubric: stringOption(options.rubric) ?? stringOption(config.rubric) ?? null,
-        format: stringOption(options.format) ?? stringOption(config.format) ?? 'text',
-        output: stringOption(options.output) ?? stringOption(config.output) ?? null,
-        failUnder: numberOption(options['fail-under']) ?? numberOption(config.failUnder),
-        failOn: stringOption(options['fail-on']) ?? stringOption(config.failOn) ?? null,
-        all: booleanOption(options.all) || booleanOption(config.all),
-        yes: booleanOption(options.yes) || booleanOption(config.yes),
-        dryRun: booleanOption(options['dry-run']) || booleanOption(config.dryRun),
-        force: booleanOption(options.force) || booleanOption(config.force),
-        prune: booleanOption(options.prune) || booleanOption(config.prune),
-        updateOnly: booleanOption(options['update-only']) || booleanOption(config.updateOnly),
-        ci: booleanOption(options.ci) || booleanOption(config.ci),
-        local: booleanOption(options.local) || booleanOption(config.local),
-        remote: booleanOption(options.remote) || booleanOption(config.remote),
-        noAi: booleanOption(options['no-ai']) || booleanOption(config.noAi),
-        watch: booleanOption(options.watch) || booleanOption(config.watch),
-        changed: booleanOption(options.changed) || booleanOption(config.changed),
-        configPath: stringOption(options.config) ?? null,
-    };
-}
-
-/**
- * @param {{ configPath?: string | null, cwd: string, fsImpl: Pick<typeof fs, 'readFile' | 'stat'> }} params
- */
-async function loadConfig({ configPath, cwd, fsImpl }) {
-    const candidate = configPath ? path.resolve(cwd, configPath) : path.join(cwd, '.rubrkit', 'config.json');
-
-    try {
-        if (!configPath) {
-            await fsImpl.stat(candidate);
-        }
-    } catch (error) {
-        if (error && typeof error === 'object' && 'code' in error && error.code === 'ENOENT') {
-            return {};
-        }
-
-        throw error;
-    }
-
-    let parsed;
-
-    try {
-        parsed = JSON.parse(await fsImpl.readFile(candidate, 'utf8'));
-    } catch (error) {
-        throw usageError(`Could not read Rubrkit config at ${candidate}: ${error instanceof Error ? error.message : 'invalid JSON'}`);
-    }
-
-    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
-        throw usageError('Rubrkit config must be a JSON object.');
-    }
-
-    if ('apiKey' in parsed || 'api-key' in parsed || 'RUBRKIT_API_KEY' in parsed) {
-        throw usageError('Do not store API keys in Rubrkit config files. Use RUBRKIT_API_KEY or --api-key instead.');
-    }
-
-    for (const field of Object.keys(parsed)) {
-        if (!CONFIG_FIELDS.has(field)) {
-            throw usageError(`Unknown Rubrkit config field "${field}".`);
-        }
-    }
-
-    return parsed;
-}
-
-/**
- * @param {unknown} value
- */
-function stringOption(value) {
-    return typeof value === 'string' && value.trim() ? value.trim() : null;
-}
-
-/**
- * @param {unknown} value
- */
-function booleanOption(value) {
-    return value === true;
-}
-
-/**
- * @param {unknown} value
- */
-function numberOption(value) {
-    if (value === undefined || value === null || value === false) {
-        return null;
-    }
-
-    const parsed = Number(value);
-    return Number.isFinite(parsed) ? parsed : null;
-}
-
-/**
- * @param {string} value
- */
-export function normalizeApiUrl(value) {
-    let parsed;
-
-    try {
-        parsed = new URL(value);
-    } catch {
-        throw usageError(`Invalid Rubrkit API URL "${value}".`);
-    }
-
-    if (!['http:', 'https:'].includes(parsed.protocol)) {
-        throw usageError('Rubrkit API URL must use http or https.');
-    }
-
-    if (parsed.pathname === '/' || parsed.pathname === '') {
-        parsed.pathname = '/api/v1';
-    }
-
-    parsed.pathname = parsed.pathname.replace(/\/+$/, '');
-    parsed.search = '';
-    parsed.hash = '';
-
-    return parsed.toString().replace(/\/$/, '');
-}
+import fs from 'node:fs/promises';
+import path from 'node:path';
+
+import { usageError } from './errors.js';
+
+export const DEFAULT_API_URL = 'https://rubrkit.com/api/v1';
+
+const CONFIG_FIELDS = new Set([
+    'apiUrl',
+    'destination',
+    'agent',
+    'artifactBundle',
+    'auditRunId',
+    'artifact',
+    'label',
+    'rubric',
+    'format',
+    'output',
+    'failUnder',
+    'failOn',
+    'all',
+    'yes',
+    'dryRun',
+    'force',
+    'prune',
+    'updateOnly',
+    'ci',
+    'local',
+    'remote',
+    'noAi',
+    'noCache',
+    'watch',
+    'changed',
+]);
+
+/**
+ * @param {{
+ *   parsed: ReturnType<import('./args.js').parseArgs>,
+ *   env?: Record<string, string | undefined>,
+ *   cwd?: string,
+ *   fsImpl?: Pick<typeof fs, 'readFile' | 'stat'>,
+ * }} params
+ */
+export async function resolveConfig({ parsed, env = process.env, cwd = process.cwd(), fsImpl = fs }) {
+    const config = await loadConfig({ configPath: stringOption(parsed.options.config), cwd, fsImpl });
+    const options = parsed.options;
+
+    return {
+        command: parsed.command,
+        selector: parsed.selector,
+        apiKey: stringOption(options['api-key']) ?? env.RUBRKIT_API_KEY ?? null,
+        apiUrl: normalizeApiUrl(stringOption(options['api-url']) ?? env.RUBRKIT_API_URL ?? stringOption(config.apiUrl) ?? DEFAULT_API_URL),
+        destination: stringOption(options.destination) ?? stringOption(config.destination) ?? cwd,
+        agent: stringOption(options.agent) ?? stringOption(config.agent) ?? 'auto',
+        artifactBundle: stringOption(options['artifact-bundle']) ?? stringOption(config.artifactBundle) ?? null,
+        auditRunId: stringOption(options['audit-run-id']) ?? stringOption(config.auditRunId) ?? null,
+        artifact: stringOption(options.artifact) ?? stringOption(config.artifact) ?? null,
+        label: stringArrayOption(options.label).length ? stringArrayOption(options.label) : stringArrayOption(config.label),
+        rubric: stringOption(options.rubric) ?? stringOption(config.rubric) ?? null,
+        format: stringOption(options.format) ?? stringOption(config.format) ?? 'text',
+        output: stringOption(options.output) ?? stringOption(config.output) ?? null,
+        failUnder: numberOption(options['fail-under']) ?? numberOption(config.failUnder),
+        failOn: stringOption(options['fail-on']) ?? stringOption(config.failOn) ?? null,
+        all: booleanOption(options.all) || booleanOption(config.all),
+        yes: booleanOption(options.yes) || booleanOption(config.yes),
+        dryRun: booleanOption(options['dry-run']) || booleanOption(config.dryRun),
+        force: booleanOption(options.force) || booleanOption(config.force),
+        prune: booleanOption(options.prune) || booleanOption(config.prune),
+        updateOnly: booleanOption(options['update-only']) || booleanOption(config.updateOnly),
+        ci: booleanOption(options.ci) || booleanOption(config.ci),
+        local: booleanOption(options.local) || booleanOption(config.local),
+        remote: booleanOption(options.remote) || booleanOption(config.remote),
+        noAi: booleanOption(options['no-ai']) || booleanOption(config.noAi),
+        noCache: booleanOption(options['no-cache']) || booleanOption(config.noCache),
+        watch: booleanOption(options.watch) || booleanOption(config.watch),
+        changed: booleanOption(options.changed) || booleanOption(config.changed),
+        configPath: stringOption(options.config) ?? null,
+    };
+}
+
+/**
+ * @param {{ configPath?: string | null, cwd: string, fsImpl: Pick<typeof fs, 'readFile' | 'stat'> }} params
+ */
+async function loadConfig({ configPath, cwd, fsImpl }) {
+    const candidate = configPath ? path.resolve(cwd, configPath) : path.join(cwd, '.rubrkit', 'config.json');
+
+    try {
+        if (!configPath) {
+            await fsImpl.stat(candidate);
+        }
+    } catch (error) {
+        if (error && typeof error === 'object' && 'code' in error && error.code === 'ENOENT') {
+            return {};
+        }
+
+        throw error;
+    }
+
+    let parsed;
+
+    try {
+        parsed = JSON.parse(await fsImpl.readFile(candidate, 'utf8'));
+    } catch (error) {
+        throw usageError(`Could not read Rubrkit config at ${candidate}: ${error instanceof Error ? error.message : 'invalid JSON'}`);
+    }
+
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+        throw usageError('Rubrkit config must be a JSON object.');
+    }
+
+    if ('apiKey' in parsed || 'api-key' in parsed || 'RUBRKIT_API_KEY' in parsed) {
+        throw usageError('Do not store API keys in Rubrkit config files. Use RUBRKIT_API_KEY or --api-key instead.');
+    }
+
+    for (const field of Object.keys(parsed)) {
+        if (!CONFIG_FIELDS.has(field)) {
+            throw usageError(`Unknown Rubrkit config field "${field}".`);
+        }
+    }
+
+    return parsed;
+}
+
+/**
+ * @param {unknown} value
+ */
+function stringOption(value) {
+    return typeof value === 'string' && value.trim() ? value.trim() : null;
+}
+
+/**
+ * @param {unknown} value
+ */
+function stringArrayOption(value) {
+    if (!Array.isArray(value)) {
+        return [];
+    }
+
+    return [...new Set(value.filter((entry) => typeof entry === 'string' && entry.trim()).map((entry) => entry.trim()))];
+}
+
+/**
+ * @param {unknown} value
+ */
+function booleanOption(value) {
+    return value === true;
+}
+
+/**
+ * @param {unknown} value
+ */
+function numberOption(value) {
+    if (value === undefined || value === null || value === false) {
+        return null;
+    }
+
+    const parsed = Number(value);
+    return Number.isFinite(parsed) ? parsed : null;
+}
+
+/**
+ * @param {string} value
+ */
+export function normalizeApiUrl(value) {
+    let parsed;
+
+    try {
+        parsed = new URL(value);
+    } catch {
+        throw usageError(`Invalid Rubrkit API URL "${value}".`);
+    }
+
+    if (!['http:', 'https:'].includes(parsed.protocol)) {
+        throw usageError('Rubrkit API URL must use http or https.');
+    }
+
+    if (parsed.pathname === '/' || parsed.pathname === '') {
+        parsed.pathname = '/api/v1';
+    }
+
+    parsed.pathname = parsed.pathname.replace(/\/+$/, '');
+    parsed.search = '';
+    parsed.hash = '';
+
+    return parsed.toString().replace(/\/$/, '');
+}