@objectstack/cloud-connection 9.11.0 → 10.2.0

package/dist/index.cjs

@@ -561,14 +561,26 @@ var ConnectionCredentialStore = class {
 
 // src/marketplace-install-local-plugin.ts
 var ROUTE_BASE = "/api/v1/marketplace/install-local";
+function manifestIdOf(p) {
+  return p?.manifest?.id ?? p?.id ?? p?.manifest?.name ?? void 0;
+}
 var MarketplaceInstallLocalPlugin = class {
   constructor(config = {}) {
     this.name = "com.objectstack.runtime.marketplace-install-local";
     this.version = "1.0.0";
+    /**
+     * Manifest ids already present in the engine registry at `kernel:ready`,
+     * BEFORE this plugin rehydrates its own ledger. These are genuine
+     * user/config-defined apps (AppPlugin from objectstack.config.ts). Used by
+     * findConflict to tell real local code apart from an orphaned marketplace
+     * install whose ledger entry went missing.
+     */
+    this.bootUserCodeIds = /* @__PURE__ */ new Set();
     this.init = async (_ctx) => {
     };
     this.start = async (ctx) => {
       ctx.hook("kernel:ready", async () => {
+        this.captureBootUserCodeIds(ctx);
         try {
           const manifest = ctx.getService("manifest");
           manifest?.register?.(MARKETPLACE_INSTALLED_UI_BUNDLE);
@@ -866,17 +878,35 @@ var MarketplaceInstallLocalPlugin = class {
       if (this.ledger.has(manifestId)) {
         return "marketplace";
       }
+      if (this.bootUserCodeIds.has(manifestId)) {
+        return "user-code";
+      }
       try {
         const ql = ctx.getService("objectql");
         const packages = ql?.registry?.getAllPackages?.() ?? [];
-        const hit = packages.find(
-          (p) => (p?.manifest?.id ?? p?.id ?? p?.manifest?.name) === manifestId
-        );
-        if (hit) return "user-code";
+        if (packages.some((p) => manifestIdOf(p) === manifestId)) {
+          return "marketplace";
+        }
       } catch {
       }
       return "none";
     };
+    /**
+     * Record the manifest ids the engine registry already holds, called once at
+     * `kernel:ready` before rehydrate. Best-effort: a missing/empty registry
+     * just yields an empty snapshot (every later install is treated as fresh).
+     */
+    this.captureBootUserCodeIds = (ctx) => {
+      try {
+        const ql = ctx.getService("objectql");
+        const packages = ql?.registry?.getAllPackages?.() ?? [];
+        for (const p of packages) {
+          const id = manifestIdOf(p);
+          if (id) this.bootUserCodeIds.add(id);
+        }
+      } catch {
+      }
+    };
     /**
      * Pull a userId out of the request's better-auth session, if any.
      * Returns null when there is no signed-in user. v1 does not check
@@ -922,6 +952,20 @@ var MarketplaceInstallLocalPlugin = class {
           }
         }, 400);
       }
+      const inserted = summary.seeded.inserted ?? 0;
+      const updated = summary.seeded.updated ?? 0;
+      const errors = summary.seeded.errors ?? 0;
+      const wrote = inserted + updated > 0;
+      if (!wrote) {
+        return c.json({
+          success: false,
+          error: {
+            code: "reseed_no_rows",
+            message: errors > 0 ? `Reseed wrote no rows (${errors} error${errors === 1 ? "" : "s"}).${summary.seeded.errorSample ? ` First error: ${summary.seeded.errorSample}` : ""}` : "Reseed wrote no rows. The package declares no seedable records for this runtime.",
+            details: { inserted, updated, errors }
+          }
+        }, 422);
+      }
       try {
         entry.withSampleData = true;
         this.ledger.write(entry);
@@ -931,9 +975,9 @@ var MarketplaceInstallLocalPlugin = class {
         success: true,
         data: {
           manifestId,
-          inserted: summary.seeded.inserted ?? 0,
-          updated: summary.seeded.updated ?? 0,
-          errors: summary.seeded.errors ?? 0,
+          inserted,
+          updated,
+          errors,
           withSampleData: true
         }
       }, 200);
@@ -1146,7 +1190,12 @@ var MarketplaceInstallLocalPlugin = class {
                 mode: "inline",
                 inserted: result.summary.totalInserted,
                 updated: result.summary.totalUpdated,
-                errors: result.errors.length
+                errors: result.errors.length,
+                // Surface the first write/resolution failure so the
+                // caller can report WHY nothing landed (e.g. a locked
+                // DB, a missing table, a failed validation) instead of
+                // a bare "0 rows".
+                errorSample: result.errors[0]?.message
               };
               ctx.logger?.info?.(`[MarketplaceInstallLocal] inline seed for ${appId}${organizationId ? ` (org=${organizationId})` : ""}: inserted=${seedSummary.inserted} updated=${seedSummary.updated} errors=${seedSummary.errors}`);
             }