airgen-cli 0.23.0 → 0.23.1

package/dist/commands/baselines.js

@@ -117,14 +117,16 @@ export function registerBaselineCommands(program, client) {
     });
     cmd
         .command("restore")
-        .description("Restore requirements from a baseline (PATCHes live requirements with snapshot values)")
+        .description("Restore requirements from a baseline (PATCHes live requirements with snapshot values). Joins on immutable internal id, so survives reqs reassign.")
         .argument("<tenant>", "Tenant slug")
         .argument("<project>", "Project slug")
         .argument("<baseline-ref>", "Baseline ref")
-        .option("--ref <pattern>", "Restore only requirements whose ref includes this substring")
+        .option("--ref <pattern>", "Restore only requirements whose original ref includes this substring")
         .option("--fields <list>", "Comma-separated fields to restore (default: rationale,text,pattern,verification,complianceStatus,complianceRationale,tags)", "rationale,text,pattern,verification,complianceStatus,complianceRationale,tags")
         .option("--dry-run", "Print what would be restored without making changes")
         .option("--yes", "Skip confirmation prompt")
+        .option("--match-by-text", "Fall back to text-content matching for requirements not found by id (e.g. recreated entities)")
+        .option("--strict", "Exit non-zero if any requirement fails to restore")
         .action(async (tenant, project, baselineRef, opts) => {
         const snap = await client.get(`/baselines/${tenant}/${project}/${encodeURIComponent(baselineRef)}`);
         let reqs = snap.requirementVersions ?? [];
@@ -145,10 +147,34 @@ export function registerBaselineCommands(program, client) {
         console.error(`Created:     ${snap.baseline.createdAt ?? ""}`);
         console.error(`Requirements to restore: ${reqs.length}`);
         console.error(`Fields:      ${fields.join(", ")}`);
+        console.error(`Join key:    immutable id (survives reqs reassign)${opts.matchByText ? " + text-match fallback" : ""}`);
         console.error("");
+        // Optionally fetch current requirements for text-match fallback
+        let textIndex = null;
+        if (opts.matchByText) {
+            console.error("Fetching current project requirements for text-match fallback...");
+            const allCurrent = [];
+            let page = 1;
+            const limit = 200;
+            while (true) {
+                const pageData = await client.get(`/requirements/${tenant}/${project}`, { page: String(page), limit: String(limit) });
+                const items = pageData.data ?? [];
+                allCurrent.push(...items);
+                if (page >= (pageData.meta?.totalPages ?? 1))
+                    break;
+                page++;
+            }
+            textIndex = new Map();
+            for (const c of allCurrent) {
+                if (c.text && c.ref) {
+                    textIndex.set(c.text.trim(), c.ref);
+                }
+            }
+            console.error(`Indexed ${textIndex.size} current requirements by text.\n`);
+        }
         if (opts.dryRun) {
             for (const r of reqs) {
-                const ref = refFromRequirementId(r.requirementId);
+                const origRef = refFromRequirementId(r.requirementId);
                 const summary = fields.map(f => {
                     const v = r[f];
                     if (v == null)
@@ -156,7 +182,7 @@ export function registerBaselineCommands(program, client) {
                     const s = typeof v === "string" ? v : JSON.stringify(v);
                     return `${f}=${s.length > 40 ? s.slice(0, 40) + "…" : s}`;
                 }).join(" | ");
-                console.log(`[dry-run] ${ref}: ${summary}`);
+                console.log(`[dry-run] ${origRef}: ${summary}`);
             }
             console.error(`\n[dry-run] Would restore ${reqs.length} requirements. Re-run without --dry-run to apply.`);
             return;
@@ -168,25 +194,64 @@ export function registerBaselineCommands(program, client) {
         }
         let ok = 0;
         let failed = 0;
+        let skipped = 0;
+        let textMatched = 0;
+        const failures = [];
         for (const r of reqs) {
-            const ref = refFromRequirementId(r.requirementId);
+            const origRef = refFromRequirementId(r.requirementId);
             const body = {};
             for (const f of fields) {
                 const v = r[f];
                 if (v !== undefined)
                     body[f] = v;
             }
+            // Skip requirements where the baseline has no values for any of the requested fields.
+            // (e.g. restoring --fields tags on a requirement that had no tags at baseline time)
+            if (Object.keys(body).length === 0) {
+                skipped++;
+                continue;
+            }
+            // Primary: PATCH by immutable composite id (the baseline's requirementId).
+            // Backend resolver matches r.id, which is set on creation and never mutates.
             try {
-                await client.patch(`/requirements/${tenant}/${project}/${encodeURIComponent(ref)}`, body);
+                await client.patch(`/requirements/${tenant}/${project}/${encodeURIComponent(r.requirementId)}`, body);
                 ok++;
                 if (ok % 25 === 0)
                     console.error(`  restored ${ok}/${reqs.length}…`);
+                continue;
             }
             catch (err) {
+                // Fall through to text-match fallback if enabled
+                const errMsg = err instanceof Error ? err.message : String(err);
+                if (textIndex && r.text) {
+                    const liveRef = textIndex.get(r.text.trim());
+                    if (liveRef) {
+                        try {
+                            await client.patch(`/requirements/${tenant}/${project}/${encodeURIComponent(liveRef)}`, body);
+                            ok++;
+                            textMatched++;
+                            console.error(`  text-matched ${origRef} -> ${liveRef}`);
+                            continue;
+                        }
+                        catch (err2) {
+                            failed++;
+                            failures.push({ ref: origRef, reason: `text-match to ${liveRef}: ${err2 instanceof Error ? err2.message : String(err2)}` });
+                            continue;
+                        }
+                    }
+                }
                 failed++;
-                console.error(`  FAILED ${ref}: ${err instanceof Error ? err.message : String(err)}`);
+                failures.push({ ref: origRef, reason: errMsg });
+                console.error(`  FAILED ${origRef}: ${errMsg}`);
             }
         }
-        console.error(`\nDone. Restored ${ok}, failed ${failed}.`);
+        console.error(`\nDone. Restored ${ok}${textMatched > 0 ? ` (${textMatched} via text-match)` : ""}, skipped ${skipped} (no baseline values for requested fields), failed ${failed}.`);
+        if (failed > 0 && !opts.matchByText) {
+            console.error(`\nHint: re-run with --match-by-text to attempt content-based recovery for the ${failed} failures.`);
+        }
+        if (failed > 0 && opts.strict) {
+            console.error("\n--strict: exiting non-zero due to failures.");
+            process.exit(2);
+        }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "airgen-cli",
-  "version": "0.23.0",
+  "version": "0.23.1",
   "description": "AIRGen CLI — requirements engineering from the command line",
   "type": "module",
   "main": "dist/index.js",