@moda-ai/cli 1.10.1 → 1.10.2

package/dist/skills.js

@@ -27,6 +27,7 @@ import { CliInputError } from './errors.js';
 const SKILLS_REQUEST_TIMEOUT_MS = 15_000;
 const VALID_STATUSES = new Set(['approved', 'proposed', 'all']);
 const SKILLS_MANIFEST_PATH = join('.moda', 'skills.yml');
+const SKILL_PROPOSALS_MANIFEST_PATH = join('.moda', 'skill-proposals.yml');
 /**
  * Fetch a tenant's generated skills from the ingest worker. Uses the persisted
  * API key + ingest URL (`~/.moda/config.json`), mirroring snapshot auth.
@@ -342,11 +343,96 @@ function getGitCommit(cwd) {
         return undefined;
     }
 }
+async function fetchSkillProposals(flags, profileOptions = {}) {
+    const params = new URLSearchParams();
+    if (flags['generation-run-id'])
+        params.set('generationRunId', flags['generation-run-id']);
+    const status = flags.status ?? 'ready_for_pr';
+    if (status !== 'all')
+        params.set('status', status);
+    if (flags['tenant-id'])
+        params.set('tenantId', flags['tenant-id']);
+    const suffix = params.toString() ? `?${params.toString()}` : '';
+    const response = (await callControlAPI(`/skills/proposals${suffix}`, { method: 'GET' }, profileOptions));
+    return Array.isArray(response.proposals) ? response.proposals : [];
+}
+async function applySkillProposal(proposalId, flags, profileOptions = {}, options = {}) {
+    const cwd = options.cwd ?? process.cwd();
+    const params = new URLSearchParams();
+    if (flags['tenant-id'])
+        params.set('tenantId', flags['tenant-id']);
+    const suffix = params.toString() ? `?${params.toString()}` : '';
+    const proposal = (await callControlAPI(`/skills/proposals/${encodeURIComponent(proposalId)}${suffix}`, { method: 'GET' }, profileOptions));
+    if (!proposal.skillMd?.trim()) {
+        throw new CliInputError(`Proposal ${proposalId} does not include SKILL.md content`);
+    }
+    const safeId = safeSkillId(proposal.skillId);
+    const relativePath = `.claude/skills/${safeId}/SKILL.md`;
+    const writeStatus = writeIfChanged(join(cwd, relativePath), proposal.skillMd);
+    if (writeStatus === 'failed') {
+        throw new Error(`Failed to write ${relativePath}`);
+    }
+    writeSkillProposalManifest(cwd, proposal, relativePath);
+    let acknowledged = true;
+    let ackError;
+    try {
+        await callControlAPI(`/skills/proposals/${encodeURIComponent(proposalId)}/mark-applied${suffix}`, {
+            method: 'POST',
+            body: JSON.stringify({ appliedBy: 'moda-cli' }),
+        }, profileOptions);
+    }
+    catch (err) {
+        acknowledged = false;
+        ackError = err instanceof Error ? err.message : String(err);
+    }
+    return {
+        proposalId,
+        skillId: proposal.skillId,
+        path: relativePath,
+        status: writeStatus,
+        acknowledged,
+        ackError,
+    };
+}
+function safeSkillId(skillId) {
+    const safeId = basename(skillId || '');
+    if (!safeId || !/^[A-Za-z0-9_-]+$/.test(safeId)) {
+        throw new CliInputError(`Invalid skill_id in proposal: ${JSON.stringify(skillId).slice(0, 80)}`);
+    }
+    return safeId;
+}
+function writeSkillProposalManifest(cwd, proposal, relativePath) {
+    const manifestPath = join(cwd, SKILL_PROPOSALS_MANIFEST_PATH);
+    mkdirSync(dirname(manifestPath), { recursive: true });
+    const existing = existsSync(manifestPath) ? readFileSync(manifestPath, 'utf8') : 'applied_proposals:\n';
+    const entry = [
+        `  - proposal_id: "${escapeYamlString(proposal.proposalId)}"`,
+        `    skill_id: "${escapeYamlString(proposal.skillId)}"`,
+        `    skill_family_id: "${escapeYamlString(proposal.skillFamilyId)}"`,
+        `    skill_version: ${Number(proposal.skillVersion || 0)}`,
+        `    generation_run_id: "${escapeYamlString(proposal.generationRunId)}"`,
+        `    clustering_run_id: "${escapeYamlString(proposal.clusteringRunId)}"`,
+        `    topic_id: "${escapeYamlString(proposal.topicId)}"`,
+        `    replay_set_id: "${escapeYamlString(proposal.replaySetId)}"`,
+        `    delta_pass_rate: ${Number(proposal.deltaPassRate || 0)}`,
+        `    path: "${escapeYamlString(relativePath)}"`,
+        `    applied_at: "${new Date().toISOString()}"`,
+    ].join('\n');
+    const prefix = existing.endsWith('\n') ? existing : `${existing}\n`;
+    writeFileSync(manifestPath, `${prefix}${entry}\n`);
+}
+function escapeYamlString(value) {
+    return String(value ?? '').replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+}
+function formatProposalRate(value) {
+    return `${(Number(value || 0) * 100).toFixed(1)}%`;
+}
 /**
  * `moda skills <subcommand>` dispatcher.
  */
 export async function runSkillsCommand(args) {
     const sub = args.positional;
+    const positionals = args.positionals ?? (sub ? [sub] : []);
     if (sub === 'gen') {
         const result = await generateSkills(args.flags);
         if (args.flags.json === 'true') {
@@ -371,13 +457,63 @@ export async function runSkillsCommand(args) {
         }
         return Number(result.sessions_failed ?? 0) > 0 ? 1 : 0;
     }
+    if (sub === 'proposals' && positionals[1] === 'list') {
+        const proposals = await fetchSkillProposals(args.flags, { profile: args.flags.profile });
+        if (args.flags.json === 'true') {
+            console.log(JSON.stringify({ proposals }));
+        }
+        else if (proposals.length === 0) {
+            console.log('No skill proposals found.');
+        }
+        else {
+            for (const proposal of proposals) {
+                console.log([
+                    proposal.proposalId,
+                    proposal.proposalStatus,
+                    `${proposal.skillId}@v${proposal.skillVersion}`,
+                    `delta=${formatProposalRate(proposal.deltaPassRate)}`,
+                    `baseline=${formatProposalRate(proposal.baselinePassRate)}`,
+                    `candidate=${formatProposalRate(proposal.candidatePassRate)}`,
+                    proposal.name,
+                ].filter(Boolean).join('\t'));
+            }
+        }
+        return 0;
+    }
+    if (sub === 'proposal' && positionals[1] === 'apply') {
+        const proposalId = positionals[2] || args.flags['proposal-id'];
+        if (!proposalId) {
+            throw new CliInputError('A proposal id is required', 'Usage: moda skills proposal apply <proposal-id>');
+        }
+        const result = await applySkillProposal(proposalId, args.flags, { profile: args.flags.profile });
+        if (args.flags.json === 'true') {
+            console.log(JSON.stringify(result));
+        }
+        else {
+            console.log([
+                `${result.status} ${result.path}`,
+                result.acknowledged ? 'acknowledged: true' : 'acknowledged: false',
+            ].join('\n'));
+        }
+        if (!result.acknowledged) {
+            // The local SKILL.md was written, but the server still lists this
+            // proposal as ready_for_pr. Warn (to stderr so JSON stdout stays clean)
+            // and exit non-zero so the failed acknowledgement isn't silently treated
+            // as success — re-running `apply` re-attempts the acknowledgement.
+            console.error(`Warning: wrote ${result.path} but failed to acknowledge proposal ${proposalId} on the server` +
+                (result.ackError ? ` (${result.ackError})` : '') +
+                '. The proposal is still listed as ready — re-run `moda skills proposal apply` to acknowledge it.');
+            return 1;
+        }
+        return 0;
+    }
     if (sub === 'sync') {
         const result = await runSkillSync(args.flags, { profile: args.flags.profile });
         console.log(JSON.stringify({ synced: result.synced, dryRun: result.dryRun }));
         return 0;
     }
     if (sub !== 'pull') {
-        throw new CliInputError(sub ? `Unknown skills subcommand '${sub}'` : 'A skills subcommand is required', 'Usage: moda skills gen [--source=all|sdk|coding-agent] [--max-sessions=N] [--start-at=ISO] [--end-at=ISO] [--replay] [--reprocess-segments] [--force-reprocess] [--wait] | moda skills pull [--status=approved|proposed|all] | moda skills sync [--dry-run]');
+        throw new CliInputError(sub ? `Unknown skills subcommand '${sub}'` : 'A skills subcommand is required', 'Usage: moda skills gen [--source=all|sdk|coding-agent] [--max-sessions=N] [--start-at=ISO] [--end-at=ISO] [--replay] [--replay-set-id=ID] [--reprocess-segments] [--force-reprocess] [--wait] | moda skills proposals list [--status=ready_for_pr] | moda skills proposal apply <proposal-id> | moda skills pull [--status=approved|proposed|all] | moda skills sync [--dry-run]');
     }
     const status = (args.flags.status ?? 'approved').toLowerCase();
     if (!VALID_STATUSES.has(status)) {
@@ -418,6 +554,7 @@ async function generateSkills(flags) {
         start_at: flags['start-at'] || undefined,
         end_at: flags['end-at'] || undefined,
         clustering_run_id: flags['clustering-run-id'] || undefined,
+        replay_set_id: flags['replay-set-id'] || flags['eval-set-id'] || undefined,
         run_clustering: flags['no-clustering'] !== 'true',
         source: normalizeSkillSource(flags.source),
         clustering_timeout_seconds: parsePositiveInt(flags['clustering-timeout-seconds'], 0),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moda-ai/cli",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "description": "CLI for Moda - AI agent analytics and observability",
   "type": "module",
   "bin": {