nexarch 0.13.2 → 0.13.3

package/dist/commands/init-agent.js

@@ -613,8 +613,9 @@ function injectInitProjectReportingContract(path) {
         "**One exception: a possible duplicate.** If init-project returns `status: \"review_required\"`",
         "or prints `STOP — POSSIBLE DUPLICATE`, an application already in the workspace looks like",
         "one it would register, and it wrote nothing. Tell the human which one you think matches and",
-        "why, wait for their answer, then re-run init-project with the command for their choice",
-        "(`decision.commands` in the output). Only then continue with enrichment.",
+        "why, wait for their answer, then run the command for their choice yourself",
+        "(`decision.commands` in the output) and continue. If it is the same system, enrich the",
+        "existing application — nothing needs merging.",
         "",
         "Stop early only when a step genuinely cannot run — missing cloud credentials, a root",
         "module that has not been initialised, or an environment you should not touch without",

package/dist/commands/init-project.js

@@ -1315,7 +1315,8 @@ export function enrichmentStatusFor(params) {
 }
 export const REVIEW_REQUIRED_NOTE = "STOP. Nothing was written. Existing applications in this workspace resemble what this scan would register"
     + " (see similarApplications). Tell the human, say which one you think is the same system and why, and wait for"
-    + " their answer. Then re-run init-project with the command in `decision.commands` that matches their choice.";
+    + " their answer. Then run the command in `decision.commands` for their choice yourself and carry on. If it is the"
+    + " same system, enrich the existing application: nothing needs merging.";
 /**
  * The possible-duplicate warning for the text directive, first thing in it.
  *
@@ -1338,6 +1339,7 @@ export function possibleDuplicateDirective(matches, isMonorepo) {
             ? "  same system      npx nexarch@latest init-project --dir . --map-deployable <deployable>=<entityRef>"
             : "  same application npx nexarch@latest init-project --dir . --application-ref <entityRef>",
         "  all different    npx nexarch@latest init-project --dir . --create-application",
+        "Run the command for their answer yourself. If it is the same system, enrich the existing application — nothing needs merging.",
     ];
 }
 /**
@@ -1684,6 +1686,11 @@ export async function initProject(args) {
     let stopForReview = null;
     // Names of applications already in the workspace, by ref, for mapped deployables.
     const existingApplicationNames = new Map();
+    // Refs of those that are still proposals: a mapped deployable's leftover
+    // duplicate from an earlier scan is folded away only if nobody reviewed it.
+    const proposedApplicationRefs = new Set();
+    // What happened to each leftover duplicate, for the output.
+    const foldedDuplicates = [];
     if (projectConstruct && isMonorepo && (applicationRefOverride || forceCreateApplication) && !asJson) {
         console.log("\nNote: monorepo detected — no root application is created (ADR 8a); --application-ref/--create-application apply only to single-package repositories.");
     }
@@ -1780,8 +1787,11 @@ export async function initProject(args) {
         const listed = parseToolText(appsRaw).entities ?? [];
         for (const entity of listed) {
             const ref = entity.entityRef ?? entity.externalKey;
-            if (ref)
-                existingApplicationNames.set(ref, entity.name);
+            if (!ref)
+                continue;
+            existingApplicationNames.set(ref, entity.name);
+            if (String(entity.attributes?.workflow_state ?? "").toLowerCase() === "proposed")
+                proposedApplicationRefs.add(ref);
         }
         // A mapped deployable writes no stub of its own, so a mapping to an
         // application that is not there would leave its relationships pointing at
@@ -2172,6 +2182,42 @@ export async function initProject(args) {
             // ability to resolve via tier 2; the scan itself already succeeded.
         }
     }
+    // "There should be nothing to merge" (Paul, 16 September). When the human has
+    // confirmed a deployable is an existing application, an earlier scan may
+    // already have registered that deployable as a proposal of its own -- the
+    // 0.13.1 behaviour, or any run before the duplicate check stopped the scan.
+    // Fold it into the existing application here, so the agent carries on
+    // enriching the real one and nobody has to press Merge. Only unreviewed
+    // proposals: the gateway refuses anything a human has activated.
+    for (const sp of subPackages) {
+        if (sp.mappedBy !== "flag" || !sp.mappedFrom || !proposedApplicationRefs.has(sp.mappedFrom))
+            continue;
+        try {
+            const raw = await callMcpTool("nexarch_merge_proposed_application", {
+                proposedApplicationRef: sp.mappedFrom,
+                intoApplicationRef: sp.externalKey,
+                reason: `The human confirmed the ${sp.relativePath} deployable is ${existingApplicationNames.get(sp.externalKey) ?? sp.externalKey}.`,
+                companyId: creds.companyId,
+            }, { companyId: creds.companyId });
+            const result = parseToolText(raw);
+            foldedDuplicates.push({
+                proposedApplicationRef: sp.mappedFrom,
+                intoApplicationRef: sp.externalKey,
+                folded: true,
+                detail: `folded in; ${result.relationshipsRepointed ?? 0} relationship(s) moved to ${sp.externalKey}`,
+            });
+        }
+        catch (error) {
+            // An older gateway without the tool, or a credential without the scope.
+            // Say so plainly: the duplicate is still there and the human should know.
+            foldedDuplicates.push({
+                proposedApplicationRef: sp.mappedFrom,
+                intoApplicationRef: sp.externalKey,
+                folded: false,
+                detail: error instanceof Error ? error.message : String(error),
+            });
+        }
+    }
     // Remember an explicit --map-deployable, so the next scan does not ask again.
     // A merge registers the same alias; this is the same decision made up front.
     for (const sp of subPackages) {
@@ -2249,8 +2295,7 @@ export async function initProject(args) {
         if (similarApplications.length > 0 && isMonorepo) {
             // --application-ref does not apply to a monorepo (the CLI says so above),
             // so the single-repo remedy would hand the agent a command that does
-            // nothing. The resolution here is a merge, which a human does on the
-            // application page.
+            // nothing. The resolution is --map-deployable, which the agent runs.
             pendingSteps.push({
                 step: stepNum++,
                 action: "review_similar_applications",
@@ -2258,8 +2303,9 @@ export async function initProject(args) {
                     + ` workspace resemble${similarApplications.length === 1 ? "s" : ""} this repository: ${matchList}.`
                     + " One of the deployables just registered may be the same system — for example a web app registered"
                     + " earlier from its public website. Tell the human which deployable you think matches and why, before"
-                    + " enriching anything. The new deployables are PROPOSED, so nothing is broken yet; if one is a"
-                    + " duplicate, the human merges the two with \"Merge with…\" on the application's page.",
+                    + " enriching anything. If the human confirms one is the same system, re-run with"
+                    + " --map-deployable <deployable>=<entityRef> yourself and enrich the existing application: the scan"
+                    + " folds this proposal into it, so there is nothing for anyone to merge.",
                 notes: [
                     "Do not report the registration as complete without mentioning these.",
                     "The match is on the repository, not a specific deployable: say which one you believe it is, and why.",
@@ -2532,7 +2578,8 @@ export async function initProject(args) {
                     // "Confirm type, then update" is right for a new skeleton and wrong
                     // here: this is an application a human already registered and named.
                     lines.push(`    MAPPED   : this deployable is the existing application ${sp.externalKey}${sp.mappedBy === "alias" ? " (from an earlier merge)" : ""}.`);
-                    lines.push("               Add what the code shows; do not rename it or replace its description.");
+                    lines.push("               It is this deployable's application: enrich it — name, description, type and");
+                    lines.push("               functions — from the code, as you would a new one.");
                 }
                 lines.push(`    inferred : ${sp.entityType} / ${sp.subtype}  (confidence ${conf.toFixed(2)})`);
                 const unresolvedDeps = sp.depSpecs.map((d) => d.name).filter((d) => !resolvedByInput.has(d));
@@ -2666,6 +2713,7 @@ export async function initProject(args) {
         resolved: resolvedItems.length,
         unresolved: unresolvedItems.length,
         similarApplications,
+        ...(foldedDuplicates.length > 0 ? { foldedDuplicates } : {}),
         entityErrors: entitiesResult.errors ?? [],
         relationshipErrors: relsResult?.errors ?? [],
         enrichmentRequired,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nexarch",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "description": "Your architecture workspace for AI delivery.",
   "keywords": [
     "nexarch",