@dypai-ai/mcp 1.7.4 → 1.7.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dypai-ai/mcp",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "description": "DYPAI MCP Server — AI agent toolkit for building and deploying full-stack apps",
   "type": "module",
   "main": "src/index.js",

package/src/tools/sync/planner.js

@@ -662,6 +662,39 @@ function localToComparable(entry, mapsCtx) {
   return remoteToComparable(row, mapsCtx)
 }
 
+export function flowSourceHashesMatch(entry, remoteRow) {
+  if (entry?.source !== "flow" || !entry.pushPayload || !remoteRow) return false
+  const localHash = entry.pushPayload.workflow_code?.metadata?.source_hash
+  const remoteHash = remoteRow.workflow_code?.metadata?.source_hash
+  return typeof localHash === "string"
+    && localHash.length > 0
+    && localHash === remoteHash
+}
+
+export function preserveMatchingRemoteFileRefs(rawLocalDoc, localComparable, remoteComparable) {
+  if (!rawLocalDoc || !localComparable || !remoteComparable) return localComparable
+  if (Array.isArray(rawLocalDoc)) {
+    if (!Array.isArray(localComparable) || !Array.isArray(remoteComparable)) return localComparable
+    rawLocalDoc.forEach((item, index) => {
+      preserveMatchingRemoteFileRefs(item, localComparable[index], remoteComparable[index])
+    })
+    return localComparable
+  }
+  if (typeof rawLocalDoc !== "object" || Array.isArray(localComparable) || Array.isArray(remoteComparable)) {
+    return localComparable
+  }
+
+  for (const [key, value] of Object.entries(rawLocalDoc)) {
+    if (key.endsWith("_file") && typeof value === "string" && remoteComparable[key] === value) {
+      delete localComparable[key.replace(/_file$/, "")]
+      localComparable[key] = value
+      continue
+    }
+    preserveMatchingRemoteFileRefs(value, localComparable[key], remoteComparable[key])
+  }
+  return localComparable
+}
+
 function deepEqual(a, b) {
   if (a === b) return true
   if (typeof a !== typeof b) return false
@@ -769,6 +802,7 @@ export function detectConflicts(stateSnapshot, remoteByName) {
 export function computePlan(local, remote, mapsCtx, { deleteOrphans = false, stateSnapshot = null, liveRemote = null } = {}) {
   const plan = { create: [], update: [], delete: [], unchanged: [] }
   const warnings = []
+  const compilerOnlyDrift = []
 
   const endpointNameCollisions = findEndpointNameCollisions(Object.keys(remote?.byName || {}))
   if (endpointNameCollisions.length) {
@@ -822,6 +856,19 @@ export function computePlan(local, remote, mapsCtx, { deleteOrphans = false, sta
     }
 
     const remoteCanonical = remoteToComparable(remoteRow, mapsCtx)
+    if (entry.doc) {
+      preserveMatchingRemoteFileRefs(entry.doc, localCanonical, remoteCanonical)
+    }
+    if (
+      flowSourceHashesMatch(entry, remoteRow)
+      && !deepEqual(localCanonical.workflow, remoteCanonical.workflow)
+    ) {
+      // Same authored source, different compiler artifact (for example after
+      // a compiler upgrade). Keep comparing roles/contracts/description, but
+      // do not stage a mass endpoint update solely to rewrite generated IR.
+      localCanonical.workflow = remoteCanonical.workflow
+      compilerOnlyDrift.push(name)
+    }
     if (deepEqual(localCanonical, remoteCanonical)) {
       plan.unchanged.push(name)
     } else {
@@ -830,6 +877,16 @@ export function computePlan(local, remote, mapsCtx, { deleteOrphans = false, sta
     }
   }
 
+  if (compilerOnlyDrift.length) {
+    warnings.push({
+      type: "compiler_artifact_drift_ignored",
+      count: compilerOnlyDrift.length,
+      examples: compilerOnlyDrift.slice(0, 25),
+      truncated: compilerOnlyDrift.length > 25,
+      hint: "Authored Flow source_hash matches live. Generated workflow differences from a compiler upgrade were not staged.",
+    })
+  }
+
   if (deleteOrphans) {
     for (const name of Object.keys(remote.byName)) {
       if (!local.byName[name]) plan.delete.push({ name })

package/src/tools/sync/pull.js

@@ -761,10 +761,15 @@ export const dypaiPullTool = {
         description: "If true, removes existing endpoints/, sql/, prompts/ before writing and allows persisted Flow source to overwrite differing local .flow.ts files.",
         default: false,
       },
+      live_authoritative: {
+        type: "boolean",
+        description: "Recovery mode. Export every live workflow as legacy YAML instead of trusting persisted Flow/Automation source. Use only when live is intentionally authoritative and source has drifted.",
+        default: false,
+      },
     },
   },
 
-  async execute({ project_id, out_dir = "./dypai", clean = false } = {}) {
+  async execute({ project_id, out_dir = "./dypai", clean = false, live_authoritative = false } = {}) {
     const { path: outDir, source: outDirSource } = resolveOutDir(out_dir)
     const suspiciousWarning = suspiciousPathWarning(outDir, outDirSource)
 
@@ -864,6 +869,7 @@ export const dypaiPullTool = {
 
     const filesWritten = []
     const errors = []
+    const sourceRecoveryWarnings = []
 
     const capabilityGroups = capabilityCatalogResult?.groups || []
     const capabilityDoc = {
@@ -939,7 +945,7 @@ export const dypaiPullTool = {
       row.workflow_source = parseMaybeJson(row.workflow_source)
       try {
         const workflowSource = row.workflow_source
-        if (isEditableTsSource(workflowSource)) {
+        if (isEditableTsSource(workflowSource) && !live_authoritative) {
           const groupName = row.group_id ? (mapsCtx.groupIdToName[row.group_id] || null) : null
           const sourceFile = normalizeEditableSourceFile(workflowSource, row.name)
           const relFlowPath = flowSourceRelPath(sourceFile)
@@ -985,18 +991,30 @@ export const dypaiPullTool = {
             continue
           }
 
-          const relPath = groupName
-            ? `endpoints/${groupName}/${row.name}.yaml.disabled`
-            : `endpoints/${row.name}.yaml.disabled`
-          await writeFileEnsured(join(outDir, relPath), renderMissingFlowStub(row, sourceFile, persistedFlowSources))
-          filesWritten.push(relPath)
-          errors.push({
+          // The editable TS source has been lost, but live still contains the
+          // complete executable workflow. Recover it as legacy YAML so a live
+          // repair pull remains complete and its state baseline stays honest.
+          // The warning makes the source loss visible without dropping the
+          // endpoint from disk or producing a false clean dry-run.
+          sourceRecoveryWarnings.push({
             endpoint: row.name,
-            error:
+            source_file: sourceFile,
+            recovered_as: "legacy_yaml",
+            warning:
               `Endpoint is source-authored but ${sourceFile} was not found in persisted project source. ` +
-              `Restore/sync the editable TypeScript source, then rerun dypai_pull.`,
+              "Recovered the live workflow as legacy YAML; restore editable TypeScript later if desired.",
           })
-          continue
+          row.workflow_source = null
+        }
+
+        if (isEditableTsSource(workflowSource) && live_authoritative) {
+          sourceRecoveryWarnings.push({
+            endpoint: row.name,
+            source_file: normalizeEditableSourceFile(workflowSource, row.name),
+            recovered_as: "legacy_yaml",
+            warning: "Live-authoritative recovery exported the executable workflow as legacy YAML. The previous editable TypeScript source remains available in the backup/history.",
+          })
+          row.workflow_source = null
         }
 
         const { doc, extractedFiles } = serializeEndpoint(row, mapsCtx)
@@ -1191,12 +1209,26 @@ export const dypaiPullTool = {
           : ["Read dypai/schema.sql before writing queries.", "Edit Flow in dypai/flows/, Automations in dypai/automations/, or legacy YAML in dypai/endpoints/, then dypai_diff → dypai_push."],
     }
 
+    const safetyWarnings = [
+      ...(endpointNameCollisions.length ? [{
+        type: "canonical_endpoint_name_collisions",
+        count: endpointNameCollisions.length,
+        examples: endpointNameCollisions.slice(0, 10),
+        hint: "Legacy underscore and canonical hyphen slugs coexist. Treat them as separate live APIs; audit traffic and migrate/delete deliberately.",
+      }] : []),
+      ...sourceRecoveryWarnings.map((item) => ({
+        type: "missing_editable_source_recovered",
+        ...item,
+      })),
+    ]
+
     return {
       success: errors.length === 0,
       endpoints: endpoints.length,
       files_written: filesWritten.length,
       files_kept_local: keptLocalEndpoints.length,
       kept_local_endpoints: keptLocalEndpoints.length ? keptLocalEndpoints : undefined,
+      source_recovery_warnings: sourceRecoveryWarnings.length ? sourceRecoveryWarnings : undefined,
       name_collisions: endpointNameCollisions.length,
       output_dir: outDir,
       out_dir_resolved_via: outDirSource,
@@ -1206,12 +1238,7 @@ export const dypaiPullTool = {
       overview,
       errors: errors.length ? errors : undefined,
       warning: suspiciousWarning || undefined,
-      safety_warnings: endpointNameCollisions.length ? [{
-        type: "canonical_endpoint_name_collisions",
-        count: endpointNameCollisions.length,
-        examples: endpointNameCollisions.slice(0, 10),
-        hint: "Legacy underscore and canonical hyphen slugs coexist. Treat them as separate live APIs; audit traffic and migrate/delete deliberately.",
-      }] : undefined,
+      safety_warnings: safetyWarnings.length ? safetyWarnings : undefined,
       hint: errors.length
         ? keptLocalEndpoints.length
           ? `${keptLocalEndpoints.length} local Flow file(s) differed and were kept. They were excluded from .dypai/state.json, so a later push will continue to block on remote drift. Review the files or rerun with clean:true only when remote is intentionally authoritative.`