npm - @open-mercato/core - Versions diffs - 0.6.6-develop.6257.1.6d0af84d26 → 0.6.6-develop.6290.1.4bb5a8ba3f - Mend

@open-mercato/core 0.6.6-develop.6257.1.6d0af84d26 → 0.6.6-develop.6290.1.4bb5a8ba3f

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (220) hide show

package/dist/modules/portal/frontend/[orgSlug]/portal/dashboard/hiddenWidgetsStorage.js ADDED Viewed

@@ -0,0 +1,35 @@
+import {
+  readVersionedPreference,
+  writeVersionedPreference,
+  clearVersionedPreference
+} from "@open-mercato/shared/lib/browser/versionedPreference";
+const LEGACY_HIDDEN_WIDGETS_KEY = "om:portal:dashboard:hidden";
+const HIDDEN_WIDGETS_KEY_PREFIX = "om:portal:dashboard:hidden:v1:";
+const HIDDEN_WIDGETS_VERSION = 1;
+function buildHiddenWidgetsKey(orgSlug, userId) {
+  return `${HIDDEN_WIDGETS_KEY_PREFIX}${orgSlug}:${userId}`;
+}
+function isStringArray(value) {
+  return Array.isArray(value) && value.every((id) => typeof id === "string");
+}
+function loadHiddenWidgets(orgSlug, userId) {
+  const hidden = readVersionedPreference(
+    buildHiddenWidgetsKey(orgSlug, userId),
+    HIDDEN_WIDGETS_VERSION,
+    isStringArray,
+    []
+  );
+  return new Set(hidden);
+}
+function saveHiddenWidgets(orgSlug, userId, hidden) {
+  writeVersionedPreference(buildHiddenWidgetsKey(orgSlug, userId), HIDDEN_WIDGETS_VERSION, Array.from(hidden));
+}
+function clearLegacyHiddenWidgetsKey() {
+  clearVersionedPreference(LEGACY_HIDDEN_WIDGETS_KEY);
+}
+export {
+  clearLegacyHiddenWidgetsKey,
+  loadHiddenWidgets,
+  saveHiddenWidgets
+};
+//# sourceMappingURL=hiddenWidgetsStorage.js.map

package/dist/modules/portal/frontend/[orgSlug]/portal/dashboard/hiddenWidgetsStorage.js.map ADDED Viewed

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../src/modules/portal/frontend/%5BorgSlug%5D/portal/dashboard/hiddenWidgetsStorage.ts"],
+  "sourcesContent": ["import {\n  readVersionedPreference,\n  writeVersionedPreference,\n  clearVersionedPreference,\n} from '@open-mercato/shared/lib/browser/versionedPreference'\n\nconst LEGACY_HIDDEN_WIDGETS_KEY = 'om:portal:dashboard:hidden'\nconst HIDDEN_WIDGETS_KEY_PREFIX = 'om:portal:dashboard:hidden:v1:'\nconst HIDDEN_WIDGETS_VERSION = 1\n\nfunction buildHiddenWidgetsKey(orgSlug: string, userId: string): string {\n  return `${HIDDEN_WIDGETS_KEY_PREFIX}${orgSlug}:${userId}`\n}\n\nfunction isStringArray(value: unknown): value is string[] {\n  return Array.isArray(value) && value.every((id) => typeof id === 'string')\n}\n\nexport function loadHiddenWidgets(orgSlug: string, userId: string): Set<string> {\n  const hidden = readVersionedPreference<string[]>(\n    buildHiddenWidgetsKey(orgSlug, userId),\n    HIDDEN_WIDGETS_VERSION,\n    isStringArray,\n    [],\n  )\n  return new Set(hidden)\n}\n\nexport function saveHiddenWidgets(orgSlug: string, userId: string, hidden: Set<string>): void {\n  writeVersionedPreference(buildHiddenWidgetsKey(orgSlug, userId), HIDDEN_WIDGETS_VERSION, Array.from(hidden))\n}\n\n/** Drops the pre-scoping global key so stale preferences stop leaking across org/user contexts. */\nexport function clearLegacyHiddenWidgetsKey(): void {\n  clearVersionedPreference(LEGACY_HIDDEN_WIDGETS_KEY)\n}\n"],
+  "mappings": "AAAA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,MAAM,4BAA4B;AAClC,MAAM,4BAA4B;AAClC,MAAM,yBAAyB;AAE/B,SAAS,sBAAsB,SAAiB,QAAwB;AACtE,SAAO,GAAG,yBAAyB,GAAG,OAAO,IAAI,MAAM;AACzD;AAEA,SAAS,cAAc,OAAmC;AACxD,SAAO,MAAM,QAAQ,KAAK,KAAK,MAAM,MAAM,CAAC,OAAO,OAAO,OAAO,QAAQ;AAC3E;AAEO,SAAS,kBAAkB,SAAiB,QAA6B;AAC9E,QAAM,SAAS;AAAA,IACb,sBAAsB,SAAS,MAAM;AAAA,IACrC;AAAA,IACA;AAAA,IACA,CAAC;AAAA,EACH;AACA,SAAO,IAAI,IAAI,MAAM;AACvB;AAEO,SAAS,kBAAkB,SAAiB,QAAgB,QAA2B;AAC5F,2BAAyB,sBAAsB,SAAS,MAAM,GAAG,wBAAwB,MAAM,KAAK,MAAM,CAAC;AAC7G;AAGO,SAAS,8BAAoC;AAClD,2BAAyB,yBAAyB;AACpD;",
+  "names": []
+}

package/dist/modules/portal/frontend/[orgSlug]/portal/dashboard/page.js CHANGED Viewed

@@ -12,22 +12,11 @@ import { PortalEmptyState } from "@open-mercato/ui/portal/components/PortalEmpty
 import { usePortalDashboardWidgets } from "@open-mercato/ui/portal/hooks/usePortalDashboardWidgets";
 import { InjectionSpot } from "@open-mercato/ui/backend/injection/InjectionSpot";
 import { PortalInjectionSpots } from "@open-mercato/ui/backend/injection/spotIds";
-const HIDDEN_WIDGETS_KEY = "om:portal:dashboard:hidden";
-function loadHiddenWidgets() {
-  try {
-    const raw = localStorage.getItem(HIDDEN_WIDGETS_KEY);
-    if (!raw) return /* @__PURE__ */ new Set();
-    return new Set(JSON.parse(raw));
-  } catch {
-    return /* @__PURE__ */ new Set();
-  }
-}
-function saveHiddenWidgets(hidden) {
-  try {
-    localStorage.setItem(HIDDEN_WIDGETS_KEY, JSON.stringify(Array.from(hidden)));
-  } catch {
-  }
-}
+import {
+  loadHiddenWidgets,
+  saveHiddenWidgets,
+  clearLegacyHiddenWidgetsKey
+} from "./hiddenWidgetsStorage.js";
 function WidgetIcon({ className }) {
   return /* @__PURE__ */ jsxs("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round", strokeLinejoin: "round", className, children: [
     /* @__PURE__ */ jsx("rect", { width: "7", height: "9", x: "3", y: "3", rx: "1" }),
@@ -42,14 +31,24 @@ function PortalDashboardPage({ params }) {
   const { auth } = usePortalContext();
   const { user, loading } = auth;
   const [editing, setEditing] = useState(false);
-  const [hiddenWidgets, setHiddenWidgets] = useState(() => loadHiddenWidgets());
+  const [hiddenWidgetsScopeKey, setHiddenWidgetsScopeKey] = useState(null);
+  const [hiddenWidgets, setHiddenWidgets] = useState(() => /* @__PURE__ */ new Set());
   const { widgets: dashboardWidgets, isLoading: widgetsLoading } = usePortalDashboardWidgets("portal:dashboard:sections");
+  const activeHiddenWidgetsScopeKey = user ? `${params.orgSlug}:${user.id}` : null;
+  if (activeHiddenWidgetsScopeKey !== hiddenWidgetsScopeKey) {
+    setHiddenWidgetsScopeKey(activeHiddenWidgetsScopeKey);
+    setHiddenWidgets(user ? loadHiddenWidgets(params.orgSlug, user.id) : /* @__PURE__ */ new Set());
+  }
   useEffect(() => {
     if (!loading && !user) {
       router.replace(`/${params.orgSlug}/portal/login`);
     }
   }, [loading, user, router, params.orgSlug]);
+  useEffect(() => {
+    clearLegacyHiddenWidgetsKey();
+  }, []);
   const toggleWidget = useCallback((widgetId) => {
+    if (!user) return;
     setHiddenWidgets((prev) => {
       const next = new Set(prev);
       if (next.has(widgetId)) {
@@ -57,10 +56,10 @@ function PortalDashboardPage({ params }) {
       } else {
         next.add(widgetId);
       }
-      saveHiddenWidgets(next);
+      saveHiddenWidgets(params.orgSlug, user.id, next);
       return next;
     });
-  }, []);
+  }, [params.orgSlug, user?.id]);
   const visibleWidgets = useMemo(
     () => dashboardWidgets.filter((w) => !hiddenWidgets.has(w.metadata.id)),
     [dashboardWidgets, hiddenWidgets]

package/dist/modules/portal/frontend/[orgSlug]/portal/dashboard/page.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/modules/portal/frontend/%5BorgSlug%5D/portal/dashboard/page.tsx"],
-  "sourcesContent": ["\"use client\"\nimport React, { useEffect, useMemo, useState, useCallback } from 'react'\nimport { useRouter } from 'next/navigation'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport { Spinner } from '@open-mercato/ui/primitives/spinner'\nimport { usePortalContext } from '@open-mercato/ui/portal/PortalContext'\nimport { PortalPageHeader } from '@open-mercato/ui/portal/components/PortalPageHeader'\nimport { PortalCard, PortalCardHeader } from '@open-mercato/ui/portal/components/PortalCard'\nimport { PortalEmptyState } from '@open-mercato/ui/portal/components/PortalEmptyState'\nimport { usePortalDashboardWidgets } from '@open-mercato/ui/portal/hooks/usePortalDashboardWidgets'\nimport { InjectionSpot } from '@open-mercato/ui/backend/injection/InjectionSpot'\nimport { PortalInjectionSpots } from '@open-mercato/ui/backend/injection/spotIds'\n\ntype Props = { params: { orgSlug: string } }\n\nconst HIDDEN_WIDGETS_KEY = 'om:portal:dashboard:hidden'\n\nfunction loadHiddenWidgets(): Set<string> {\n  try {\n    const raw = localStorage.getItem(HIDDEN_WIDGETS_KEY)\n    if (!raw) return new Set()\n    return new Set(JSON.parse(raw))\n  } catch {\n    return new Set()\n  }\n}\n\nfunction saveHiddenWidgets(hidden: Set<string>) {\n  try {\n    localStorage.setItem(HIDDEN_WIDGETS_KEY, JSON.stringify(Array.from(hidden)))\n  } catch {\n    // best effort\n  }\n}\n\nfunction WidgetIcon({ className }: { className?: string }) {\n  return (\n    <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" strokeWidth=\"1.5\" strokeLinecap=\"round\" strokeLinejoin=\"round\" className={className}>\n      <rect width=\"7\" height=\"9\" x=\"3\" y=\"3\" rx=\"1\" /><rect width=\"7\" height=\"5\" x=\"14\" y=\"3\" rx=\"1\" /><rect width=\"7\" height=\"5\" x=\"14\" y=\"12\" rx=\"1\" /><rect width=\"7\" height=\"9\" x=\"3\" y=\"16\" rx=\"1\" />\n    </svg>\n  )\n}\n\nexport default function PortalDashboardPage({ params }: Props) {\n  const t = useT()\n  const router = useRouter()\n  const { auth } = usePortalContext()\n  const { user, loading } = auth\n\n  const [editing, setEditing] = useState(false)\n  const [hiddenWidgets, setHiddenWidgets] = useState<Set<string>>(() => loadHiddenWidgets())\n\n  const { widgets: dashboardWidgets, isLoading: widgetsLoading } = usePortalDashboardWidgets('portal:dashboard:sections' as any)\n\n  useEffect(() => {\n    if (!loading && !user) {\n      router.replace(`/${params.orgSlug}/portal/login`)\n    }\n  }, [loading, user, router, params.orgSlug])\n\n  const toggleWidget = useCallback((widgetId: string) => {\n    setHiddenWidgets((prev) => {\n      const next = new Set(prev)\n      if (next.has(widgetId)) {\n        next.delete(widgetId)\n      } else {\n        next.add(widgetId)\n      }\n      saveHiddenWidgets(next)\n      return next\n    })\n  }, [])\n\n  const visibleWidgets = useMemo(\n    () => dashboardWidgets.filter((w) => !hiddenWidgets.has(w.metadata.id)),\n    [dashboardWidgets, hiddenWidgets],\n  )\n\n  const injectionContext = useMemo(\n    () => ({ orgSlug: params.orgSlug, user, roles: auth.roles, resolvedFeatures: auth.resolvedFeatures }),\n    [params.orgSlug, user, auth.roles, auth.resolvedFeatures],\n  )\n\n  if (loading) {\n    return <div className=\"flex items-center justify-center py-20\"><Spinner /></div>\n  }\n\n  if (!user) return null\n\n  return (\n    <div className=\"flex flex-col gap-8\">\n      <PortalPageHeader\n        label={t('portal.dashboard.title', 'Dashboard')}\n        title={t('portal.dashboard.welcome', { name: user.displayName })}\n        action={\n          dashboardWidgets.length > 0 ? (\n            <Button\n              type=\"button\"\n              variant={editing ? 'default' : 'outline'}\n              size=\"sm\"\n              className=\"rounded-lg text-sm\"\n              onClick={() => setEditing((prev) => !prev)}\n            >\n              {editing ? t('portal.dashboard.done', 'Done') : t('portal.dashboard.customize', 'Customize')}\n            </Button>\n          ) : null\n        }\n      />\n\n      <InjectionSpot spotId={PortalInjectionSpots.pageBefore('dashboard')} context={injectionContext} />\n\n      {editing && dashboardWidgets.length > 0 ? (\n        <PortalCard>\n          <PortalCardHeader\n            label={t('portal.dashboard.customize', 'Customize')}\n            title={t('portal.dashboard.widgets', 'Dashboard Widgets')}\n          />\n          <div className=\"flex flex-wrap gap-2\">\n            {dashboardWidgets.map((widget) => {\n              const isHidden = hiddenWidgets.has(widget.metadata.id)\n              return (\n                <Button key={widget.metadata.id} type=\"button\" variant={isHidden ? 'outline' : 'default'} size=\"sm\" className=\"rounded-lg text-sm\" onClick={() => toggleWidget(widget.metadata.id)}>\n                  {widget.metadata.title || widget.metadata.id}\n                </Button>\n              )\n            })}\n          </div>\n        </PortalCard>\n      ) : null}\n\n      {visibleWidgets.length > 0 ? (\n        <div className=\"grid gap-5 md:grid-cols-2 xl:grid-cols-3\">\n          {visibleWidgets.map((widget) => {\n            const WidgetComponent = widget.Widget\n            if (!WidgetComponent) return null\n            return (\n              <PortalCard key={widget.metadata.id}>\n                <PortalCardHeader title={widget.metadata.title || widget.metadata.id} />\n                <WidgetComponent context={{ orgSlug: params.orgSlug, user, roles: auth.roles, resolvedFeatures: auth.resolvedFeatures }} />\n              </PortalCard>\n            )\n          })}\n        </div>\n      ) : null}\n\n      {dashboardWidgets.length === 0 && !widgetsLoading ? (\n        <PortalEmptyState\n          icon={<WidgetIcon className=\"size-5\" />}\n          title={t('portal.dashboard.emptyWidgets', 'No dashboard widgets yet')}\n          description=\"Modules can inject widgets into this dashboard via the portal:dashboard:sections injection spot.\"\n        />\n      ) : null}\n\n      <InjectionSpot spotId={PortalInjectionSpots.pageAfter('dashboard')} context={injectionContext} />\n    </div>\n  )\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["\"use client\"\nimport React, { useEffect, useMemo, useState, useCallback } from 'react'\nimport { useRouter } from 'next/navigation'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport { Spinner } from '@open-mercato/ui/primitives/spinner'\nimport { usePortalContext } from '@open-mercato/ui/portal/PortalContext'\nimport { PortalPageHeader } from '@open-mercato/ui/portal/components/PortalPageHeader'\nimport { PortalCard, PortalCardHeader } from '@open-mercato/ui/portal/components/PortalCard'\nimport { PortalEmptyState } from '@open-mercato/ui/portal/components/PortalEmptyState'\nimport { usePortalDashboardWidgets } from '@open-mercato/ui/portal/hooks/usePortalDashboardWidgets'\nimport { InjectionSpot } from '@open-mercato/ui/backend/injection/InjectionSpot'\nimport { PortalInjectionSpots } from '@open-mercato/ui/backend/injection/spotIds'\nimport {\n  loadHiddenWidgets,\n  saveHiddenWidgets,\n  clearLegacyHiddenWidgetsKey,\n} from './hiddenWidgetsStorage'\n\ntype Props = { params: { orgSlug: string } }\n\nfunction WidgetIcon({ className }: { className?: string }) {\n  return (\n    <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" strokeWidth=\"1.5\" strokeLinecap=\"round\" strokeLinejoin=\"round\" className={className}>\n      <rect width=\"7\" height=\"9\" x=\"3\" y=\"3\" rx=\"1\" /><rect width=\"7\" height=\"5\" x=\"14\" y=\"3\" rx=\"1\" /><rect width=\"7\" height=\"5\" x=\"14\" y=\"12\" rx=\"1\" /><rect width=\"7\" height=\"9\" x=\"3\" y=\"16\" rx=\"1\" />\n    </svg>\n  )\n}\n\nexport default function PortalDashboardPage({ params }: Props) {\n  const t = useT()\n  const router = useRouter()\n  const { auth } = usePortalContext()\n  const { user, loading } = auth\n\n  const [editing, setEditing] = useState(false)\n  const [hiddenWidgetsScopeKey, setHiddenWidgetsScopeKey] = useState<string | null>(null)\n  const [hiddenWidgets, setHiddenWidgets] = useState<Set<string>>(() => new Set())\n\n  const { widgets: dashboardWidgets, isLoading: widgetsLoading } = usePortalDashboardWidgets('portal:dashboard:sections' as any)\n\n  // Recompute synchronously during render (not in an effect) so a freshly\n  // resolved `user` never paints a frame with the previous scope's hidden set.\n  const activeHiddenWidgetsScopeKey = user ? `${params.orgSlug}:${user.id}` : null\n  if (activeHiddenWidgetsScopeKey !== hiddenWidgetsScopeKey) {\n    setHiddenWidgetsScopeKey(activeHiddenWidgetsScopeKey)\n    setHiddenWidgets(user ? loadHiddenWidgets(params.orgSlug, user.id) : new Set())\n  }\n\n  useEffect(() => {\n    if (!loading && !user) {\n      router.replace(`/${params.orgSlug}/portal/login`)\n    }\n  }, [loading, user, router, params.orgSlug])\n\n  useEffect(() => {\n    clearLegacyHiddenWidgetsKey()\n  }, [])\n\n  const toggleWidget = useCallback((widgetId: string) => {\n    if (!user) return\n    setHiddenWidgets((prev) => {\n      const next = new Set(prev)\n      if (next.has(widgetId)) {\n        next.delete(widgetId)\n      } else {\n        next.add(widgetId)\n      }\n      saveHiddenWidgets(params.orgSlug, user.id, next)\n      return next\n    })\n  }, [params.orgSlug, user?.id])\n\n  const visibleWidgets = useMemo(\n    () => dashboardWidgets.filter((w) => !hiddenWidgets.has(w.metadata.id)),\n    [dashboardWidgets, hiddenWidgets],\n  )\n\n  const injectionContext = useMemo(\n    () => ({ orgSlug: params.orgSlug, user, roles: auth.roles, resolvedFeatures: auth.resolvedFeatures }),\n    [params.orgSlug, user, auth.roles, auth.resolvedFeatures],\n  )\n\n  if (loading) {\n    return <div className=\"flex items-center justify-center py-20\"><Spinner /></div>\n  }\n\n  if (!user) return null\n\n  return (\n    <div className=\"flex flex-col gap-8\">\n      <PortalPageHeader\n        label={t('portal.dashboard.title', 'Dashboard')}\n        title={t('portal.dashboard.welcome', { name: user.displayName })}\n        action={\n          dashboardWidgets.length > 0 ? (\n            <Button\n              type=\"button\"\n              variant={editing ? 'default' : 'outline'}\n              size=\"sm\"\n              className=\"rounded-lg text-sm\"\n              onClick={() => setEditing((prev) => !prev)}\n            >\n              {editing ? t('portal.dashboard.done', 'Done') : t('portal.dashboard.customize', 'Customize')}\n            </Button>\n          ) : null\n        }\n      />\n\n      <InjectionSpot spotId={PortalInjectionSpots.pageBefore('dashboard')} context={injectionContext} />\n\n      {editing && dashboardWidgets.length > 0 ? (\n        <PortalCard>\n          <PortalCardHeader\n            label={t('portal.dashboard.customize', 'Customize')}\n            title={t('portal.dashboard.widgets', 'Dashboard Widgets')}\n          />\n          <div className=\"flex flex-wrap gap-2\">\n            {dashboardWidgets.map((widget) => {\n              const isHidden = hiddenWidgets.has(widget.metadata.id)\n              return (\n                <Button key={widget.metadata.id} type=\"button\" variant={isHidden ? 'outline' : 'default'} size=\"sm\" className=\"rounded-lg text-sm\" onClick={() => toggleWidget(widget.metadata.id)}>\n                  {widget.metadata.title || widget.metadata.id}\n                </Button>\n              )\n            })}\n          </div>\n        </PortalCard>\n      ) : null}\n\n      {visibleWidgets.length > 0 ? (\n        <div className=\"grid gap-5 md:grid-cols-2 xl:grid-cols-3\">\n          {visibleWidgets.map((widget) => {\n            const WidgetComponent = widget.Widget\n            if (!WidgetComponent) return null\n            return (\n              <PortalCard key={widget.metadata.id}>\n                <PortalCardHeader title={widget.metadata.title || widget.metadata.id} />\n                <WidgetComponent context={{ orgSlug: params.orgSlug, user, roles: auth.roles, resolvedFeatures: auth.resolvedFeatures }} />\n              </PortalCard>\n            )\n          })}\n        </div>\n      ) : null}\n\n      {dashboardWidgets.length === 0 && !widgetsLoading ? (\n        <PortalEmptyState\n          icon={<WidgetIcon className=\"size-5\" />}\n          title={t('portal.dashboard.emptyWidgets', 'No dashboard widgets yet')}\n          description=\"Modules can inject widgets into this dashboard via the portal:dashboard:sections injection spot.\"\n        />\n      ) : null}\n\n      <InjectionSpot spotId={PortalInjectionSpots.pageAfter('dashboard')} context={injectionContext} />\n    </div>\n  )\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/progress/api/active/route.js CHANGED Viewed

@@ -13,7 +13,7 @@ async function GET(req) {
   const container = await createRequestContainer();
   const progressService = container.resolve("progressService");
   const ctx = { tenantId: auth.tenantId, organizationId: auth.orgId };
-  await progressService.markStaleJobsFailed(auth.tenantId);
+  await progressService.markStaleJobsFailed(auth.tenantId, void 0, auth.orgId);
   const [jobs, recentlyCompleted] = await Promise.all([
     progressService.getActiveJobs(ctx),
     progressService.getRecentlyCompletedJobs(ctx)

package/dist/modules/progress/api/active/route.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/modules/progress/api/active/route.ts"],
-  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport type { ProgressJob } from '../../data/entities'\n\nconst routeMetadata = {\n  GET: { requireAuth: true },\n}\n\nexport const metadata = routeMetadata\n\nexport async function GET(req: Request) {\n  const auth = await getAuthFromRequest(req)\n  if (!auth || !auth.tenantId) {\n    return NextResponse.json({ active: [], recentlyCompleted: [] }, { status: 401 })\n  }\n\n  const container = await createRequestContainer()\n  const progressService = container.resolve('progressService') as import('../../lib/progressService').ProgressService\n\n  const ctx = { tenantId: auth.tenantId, organizationId: auth.orgId }\n\n  await progressService.markStaleJobsFailed(auth.tenantId)\n\n  const [jobs, recentlyCompleted] = await Promise.all([\n    progressService.getActiveJobs(ctx),\n    progressService.getRecentlyCompletedJobs(ctx),\n  ])\n\n  return NextResponse.json({\n    active: jobs.map(formatJob),\n    recentlyCompleted: recentlyCompleted.map(formatJob),\n  })\n}\n\nfunction formatJob(job: ProgressJob) {\n  return {\n    id: job.id,\n    jobType: job.jobType,\n    name: job.name,\n    description: job.description,\n    status: job.status,\n    progressPercent: job.progressPercent,\n    processedCount: job.processedCount,\n    totalCount: job.totalCount,\n    etaSeconds: job.etaSeconds,\n    cancellable: job.cancellable,\n    meta: job.meta ?? null,\n    startedAt: job.startedAt?.toISOString() ?? null,\n    finishedAt: job.finishedAt?.toISOString() ?? null,\n    errorMessage: job.errorMessage,\n  }\n}\n\nexport const openApi = {\n  GET: {\n    summary: 'Get active progress jobs',\n    description: 'Returns currently running jobs and recently completed jobs for the progress top bar.',\n    tags: ['Progress'],\n    responses: {\n      200: { description: 'Active and recently completed jobs' },\n    },\n  },\n}\n"],
-  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,0BAA0B;AACnC,SAAS,8BAA8B;AAGvC,MAAM,gBAAgB;AAAA,EACpB,KAAK,EAAE,aAAa,KAAK;AAC3B;AAEO,MAAM,WAAW;AAExB,eAAsB,IAAI,KAAc;AACtC,QAAM,OAAO,MAAM,mBAAmB,GAAG;AACzC,MAAI,CAAC,QAAQ,CAAC,KAAK,UAAU;AAC3B,WAAO,aAAa,KAAK,EAAE,QAAQ,CAAC,GAAG,mBAAmB,CAAC,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACjF;AAEA,QAAM,YAAY,MAAM,uBAAuB;AAC/C,QAAM,kBAAkB,UAAU,QAAQ,iBAAiB;AAE3D,QAAM,MAAM,EAAE,UAAU,KAAK,UAAU,gBAAgB,KAAK,MAAM;AAElE,QAAM,gBAAgB,oBAAoB,KAAK,QAAQ;AAEvD,QAAM,CAAC,MAAM,iBAAiB,IAAI,MAAM,QAAQ,IAAI;AAAA,IAClD,gBAAgB,cAAc,GAAG;AAAA,IACjC,gBAAgB,yBAAyB,GAAG;AAAA,EAC9C,CAAC;AAED,SAAO,aAAa,KAAK;AAAA,IACvB,QAAQ,KAAK,IAAI,SAAS;AAAA,IAC1B,mBAAmB,kBAAkB,IAAI,SAAS;AAAA,EACpD,CAAC;AACH;AAEA,SAAS,UAAU,KAAkB;AACnC,SAAO;AAAA,IACL,IAAI,IAAI;AAAA,IACR,SAAS,IAAI;AAAA,IACb,MAAM,IAAI;AAAA,IACV,aAAa,IAAI;AAAA,IACjB,QAAQ,IAAI;AAAA,IACZ,iBAAiB,IAAI;AAAA,IACrB,gBAAgB,IAAI;AAAA,IACpB,YAAY,IAAI;AAAA,IAChB,YAAY,IAAI;AAAA,IAChB,aAAa,IAAI;AAAA,IACjB,MAAM,IAAI,QAAQ;AAAA,IAClB,WAAW,IAAI,WAAW,YAAY,KAAK;AAAA,IAC3C,YAAY,IAAI,YAAY,YAAY,KAAK;AAAA,IAC7C,cAAc,IAAI;AAAA,EACpB;AACF;AAEO,MAAM,UAAU;AAAA,EACrB,KAAK;AAAA,IACH,SAAS;AAAA,IACT,aAAa;AAAA,IACb,MAAM,CAAC,UAAU;AAAA,IACjB,WAAW;AAAA,MACT,KAAK,EAAE,aAAa,qCAAqC;AAAA,IAC3D;AAAA,EACF;AACF;",
+  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport type { ProgressJob } from '../../data/entities'\n\nconst routeMetadata = {\n  GET: { requireAuth: true },\n}\n\nexport const metadata = routeMetadata\n\nexport async function GET(req: Request) {\n  const auth = await getAuthFromRequest(req)\n  if (!auth || !auth.tenantId) {\n    return NextResponse.json({ active: [], recentlyCompleted: [] }, { status: 401 })\n  }\n\n  const container = await createRequestContainer()\n  const progressService = container.resolve('progressService') as import('../../lib/progressService').ProgressService\n\n  const ctx = { tenantId: auth.tenantId, organizationId: auth.orgId }\n\n  await progressService.markStaleJobsFailed(auth.tenantId, undefined, auth.orgId)\n\n  const [jobs, recentlyCompleted] = await Promise.all([\n    progressService.getActiveJobs(ctx),\n    progressService.getRecentlyCompletedJobs(ctx),\n  ])\n\n  return NextResponse.json({\n    active: jobs.map(formatJob),\n    recentlyCompleted: recentlyCompleted.map(formatJob),\n  })\n}\n\nfunction formatJob(job: ProgressJob) {\n  return {\n    id: job.id,\n    jobType: job.jobType,\n    name: job.name,\n    description: job.description,\n    status: job.status,\n    progressPercent: job.progressPercent,\n    processedCount: job.processedCount,\n    totalCount: job.totalCount,\n    etaSeconds: job.etaSeconds,\n    cancellable: job.cancellable,\n    meta: job.meta ?? null,\n    startedAt: job.startedAt?.toISOString() ?? null,\n    finishedAt: job.finishedAt?.toISOString() ?? null,\n    errorMessage: job.errorMessage,\n  }\n}\n\nexport const openApi = {\n  GET: {\n    summary: 'Get active progress jobs',\n    description: 'Returns currently running jobs and recently completed jobs for the progress top bar.',\n    tags: ['Progress'],\n    responses: {\n      200: { description: 'Active and recently completed jobs' },\n    },\n  },\n}\n"],
+  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,0BAA0B;AACnC,SAAS,8BAA8B;AAGvC,MAAM,gBAAgB;AAAA,EACpB,KAAK,EAAE,aAAa,KAAK;AAC3B;AAEO,MAAM,WAAW;AAExB,eAAsB,IAAI,KAAc;AACtC,QAAM,OAAO,MAAM,mBAAmB,GAAG;AACzC,MAAI,CAAC,QAAQ,CAAC,KAAK,UAAU;AAC3B,WAAO,aAAa,KAAK,EAAE,QAAQ,CAAC,GAAG,mBAAmB,CAAC,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACjF;AAEA,QAAM,YAAY,MAAM,uBAAuB;AAC/C,QAAM,kBAAkB,UAAU,QAAQ,iBAAiB;AAE3D,QAAM,MAAM,EAAE,UAAU,KAAK,UAAU,gBAAgB,KAAK,MAAM;AAElE,QAAM,gBAAgB,oBAAoB,KAAK,UAAU,QAAW,KAAK,KAAK;AAE9E,QAAM,CAAC,MAAM,iBAAiB,IAAI,MAAM,QAAQ,IAAI;AAAA,IAClD,gBAAgB,cAAc,GAAG;AAAA,IACjC,gBAAgB,yBAAyB,GAAG;AAAA,EAC9C,CAAC;AAED,SAAO,aAAa,KAAK;AAAA,IACvB,QAAQ,KAAK,IAAI,SAAS;AAAA,IAC1B,mBAAmB,kBAAkB,IAAI,SAAS;AAAA,EACpD,CAAC;AACH;AAEA,SAAS,UAAU,KAAkB;AACnC,SAAO;AAAA,IACL,IAAI,IAAI;AAAA,IACR,SAAS,IAAI;AAAA,IACb,MAAM,IAAI;AAAA,IACV,aAAa,IAAI;AAAA,IACjB,QAAQ,IAAI;AAAA,IACZ,iBAAiB,IAAI;AAAA,IACrB,gBAAgB,IAAI;AAAA,IACpB,YAAY,IAAI;AAAA,IAChB,YAAY,IAAI;AAAA,IAChB,aAAa,IAAI;AAAA,IACjB,MAAM,IAAI,QAAQ;AAAA,IAClB,WAAW,IAAI,WAAW,YAAY,KAAK;AAAA,IAC3C,YAAY,IAAI,YAAY,YAAY,KAAK;AAAA,IAC7C,cAAc,IAAI;AAAA,EACpB;AACF;AAEO,MAAM,UAAU;AAAA,EACrB,KAAK;AAAA,IACH,SAAS;AAAA,IACT,aAAa;AAAA,IACb,MAAM,CAAC,UAAU;AAAA,IACjB,WAAW;AAAA,MACT,KAAK,EAAE,aAAa,qCAAqC;AAAA,IAC3D;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/modules/progress/lib/progressService.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/progress/lib/progressService.ts"],
-  "sourcesContent": ["import type { ProgressJob } from '../data/entities'\nimport type { CreateProgressJobInput, UpdateProgressInput, CompleteJobInput, FailJobInput } from '../data/validators'\n\nexport interface ProgressServiceContext {\n  tenantId: string\n  organizationId?: string | null\n  userId?: string | null\n}\n\nexport interface ProgressService {\n  createJob(input: CreateProgressJobInput, ctx: ProgressServiceContext): Promise<ProgressJob>\n  startJob(jobId: string, ctx: ProgressServiceContext): Promise<ProgressJob>\n  updateProgress(jobId: string, input: UpdateProgressInput, ctx: ProgressServiceContext): Promise<ProgressJob>\n  incrementProgress(jobId: string, delta: number, ctx: ProgressServiceContext): Promise<ProgressJob>\n  completeJob(jobId: string, input: CompleteJobInput | undefined, ctx: ProgressServiceContext): Promise<ProgressJob>\n  failJob(jobId: string, input: FailJobInput, ctx: ProgressServiceContext): Promise<ProgressJob>\n  cancelJob(jobId: string, ctx: ProgressServiceContext): Promise<ProgressJob>\n  markCancelled(jobId: string, ctx: ProgressServiceContext): Promise<ProgressJob>\n  isCancellationRequested(jobId: string, tenantId: string): Promise<boolean>\n  getActiveJobs(ctx: ProgressServiceContext): Promise<ProgressJob[]>\n  getRecentlyCompletedJobs(ctx: ProgressServiceContext, sinceSeconds?: number): Promise<ProgressJob[]>\n  getJob(jobId: string, ctx: ProgressServiceContext): Promise<ProgressJob | null>\n  markStaleJobsFailed(tenantId: string, timeoutSeconds?: number): Promise<number>\n}\n\nexport const HEARTBEAT_INTERVAL_MS = 5000\nexport const STALE_JOB_TIMEOUT_SECONDS = 60\n\nexport function calculateEta(\n  processedCount: number,\n  totalCount: number,\n  startedAt: Date,\n): number | null {\n  if (processedCount === 0 || totalCount === 0) return null\n\n  const elapsedMs = Date.now() - startedAt.getTime()\n  const rate = processedCount / elapsedMs\n  const remaining = totalCount - processedCount\n\n  if (rate <= 0) return null\n\n  return Math.ceil(remaining / rate / 1000)\n}\n\nexport function calculateProgressPercent(processedCount: number, totalCount: number | null): number {\n  if (!totalCount || totalCount <= 0) return 0\n  return Math.min(100, Math.round((processedCount / totalCount) * 100))\n}\n"],
+  "sourcesContent": ["import type { ProgressJob } from '../data/entities'\nimport type { CreateProgressJobInput, UpdateProgressInput, CompleteJobInput, FailJobInput } from '../data/validators'\n\nexport interface ProgressServiceContext {\n  tenantId: string\n  organizationId?: string | null\n  userId?: string | null\n}\n\nexport interface ProgressService {\n  createJob(input: CreateProgressJobInput, ctx: ProgressServiceContext): Promise<ProgressJob>\n  startJob(jobId: string, ctx: ProgressServiceContext): Promise<ProgressJob>\n  updateProgress(jobId: string, input: UpdateProgressInput, ctx: ProgressServiceContext): Promise<ProgressJob>\n  incrementProgress(jobId: string, delta: number, ctx: ProgressServiceContext): Promise<ProgressJob>\n  completeJob(jobId: string, input: CompleteJobInput | undefined, ctx: ProgressServiceContext): Promise<ProgressJob>\n  failJob(jobId: string, input: FailJobInput, ctx: ProgressServiceContext): Promise<ProgressJob>\n  cancelJob(jobId: string, ctx: ProgressServiceContext): Promise<ProgressJob>\n  markCancelled(jobId: string, ctx: ProgressServiceContext): Promise<ProgressJob>\n  isCancellationRequested(jobId: string, tenantId: string, organizationId?: string | null): Promise<boolean>\n  getActiveJobs(ctx: ProgressServiceContext): Promise<ProgressJob[]>\n  getRecentlyCompletedJobs(ctx: ProgressServiceContext, sinceSeconds?: number): Promise<ProgressJob[]>\n  getJob(jobId: string, ctx: ProgressServiceContext): Promise<ProgressJob | null>\n  markStaleJobsFailed(tenantId: string, timeoutSeconds?: number, organizationId?: string | null): Promise<number>\n}\n\nexport const HEARTBEAT_INTERVAL_MS = 5000\nexport const STALE_JOB_TIMEOUT_SECONDS = 60\n\nexport function calculateEta(\n  processedCount: number,\n  totalCount: number,\n  startedAt: Date,\n): number | null {\n  if (processedCount === 0 || totalCount === 0) return null\n\n  const elapsedMs = Date.now() - startedAt.getTime()\n  const rate = processedCount / elapsedMs\n  const remaining = totalCount - processedCount\n\n  if (rate <= 0) return null\n\n  return Math.ceil(remaining / rate / 1000)\n}\n\nexport function calculateProgressPercent(processedCount: number, totalCount: number | null): number {\n  if (!totalCount || totalCount <= 0) return 0\n  return Math.min(100, Math.round((processedCount / totalCount) * 100))\n}\n"],
   "mappings": "AAyBO,MAAM,wBAAwB;AAC9B,MAAM,4BAA4B;AAElC,SAAS,aACd,gBACA,YACA,WACe;AACf,MAAI,mBAAmB,KAAK,eAAe,EAAG,QAAO;AAErD,QAAM,YAAY,KAAK,IAAI,IAAI,UAAU,QAAQ;AACjD,QAAM,OAAO,iBAAiB;AAC9B,QAAM,YAAY,aAAa;AAE/B,MAAI,QAAQ,EAAG,QAAO;AAEtB,SAAO,KAAK,KAAK,YAAY,OAAO,GAAI;AAC1C;AAEO,SAAS,yBAAyB,gBAAwB,YAAmC;AAClG,MAAI,CAAC,cAAc,cAAc,EAAG,QAAO;AAC3C,SAAO,KAAK,IAAI,KAAK,KAAK,MAAO,iBAAiB,aAAc,GAAG,CAAC;AACtE;",
   "names": []
 }

package/dist/modules/progress/lib/progressServiceImpl.js CHANGED Viewed

@@ -46,7 +46,11 @@ function createProgressService(em, eventBus) {
       return job;
     },
     async startJob(jobId, ctx) {
-      const job = await em.findOneOrFail(ProgressJob, { id: jobId, tenantId: ctx.tenantId });
+      const job = await em.findOneOrFail(ProgressJob, {
+        id: jobId,
+        tenantId: ctx.tenantId,
+        ...ctx.organizationId ? { organizationId: ctx.organizationId } : {}
+      });
       if (job.status === "cancelled") {
         return job;
       }
@@ -99,7 +103,11 @@ function createProgressService(em, eventBus) {
       return job;
     },
     async incrementProgress(jobId, delta, ctx) {
-      const job = await em.findOneOrFail(ProgressJob, { id: jobId, tenantId: ctx.tenantId });
+      const job = await em.findOneOrFail(ProgressJob, {
+        id: jobId,
+        tenantId: ctx.tenantId,
+        ...ctx.organizationId ? { organizationId: ctx.organizationId } : {}
+      });
       if (job.status === "completed" || job.status === "failed" || job.status === "cancelled") {
         return job;
       }
@@ -120,7 +128,11 @@ function createProgressService(em, eventBus) {
       return job;
     },
     async completeJob(jobId, input, ctx) {
-      const job = await em.findOne(ProgressJob, { id: jobId, tenantId: ctx.tenantId });
+      const job = await em.findOne(ProgressJob, {
+        id: jobId,
+        tenantId: ctx.tenantId,
+        ...ctx.organizationId ? { organizationId: ctx.organizationId } : {}
+      });
       if (!job) throw new Error(`Job ${jobId} not found`);
       if (job.status === "cancelled") {
         return job;
@@ -142,7 +154,11 @@ function createProgressService(em, eventBus) {
       return job;
     },
     async failJob(jobId, input, ctx) {
-      const job = await em.findOne(ProgressJob, { id: jobId, tenantId: ctx.tenantId });
+      const job = await em.findOne(ProgressJob, {
+        id: jobId,
+        tenantId: ctx.tenantId,
+        ...ctx.organizationId ? { organizationId: ctx.organizationId } : {}
+      });
       if (!job) throw new Error(`Job ${jobId} not found`);
       if (job.status === "cancelled") {
         return job;
@@ -183,7 +199,11 @@ function createProgressService(em, eventBus) {
       return job;
     },
     async markCancelled(jobId, ctx) {
-      const job = await em.findOne(ProgressJob, { id: jobId, tenantId: ctx.tenantId });
+      const job = await em.findOne(ProgressJob, {
+        id: jobId,
+        tenantId: ctx.tenantId,
+        ...ctx.organizationId ? { organizationId: ctx.organizationId } : {}
+      });
       if (!job) throw new Error(`Job ${jobId} not found`);
       if (job.status === "cancelled") {
         return job;
@@ -201,8 +221,12 @@ function createProgressService(em, eventBus) {
       });
       return job;
     },
-    async isCancellationRequested(jobId, tenantId) {
-      const job = await findOneWithDecryption(em, ProgressJob, { id: jobId, tenantId });
+    async isCancellationRequested(jobId, tenantId, organizationId) {
+      const job = await findOneWithDecryption(em, ProgressJob, {
+        id: jobId,
+        tenantId,
+        ...organizationId ? { organizationId } : {}
+      });
       return job?.cancelRequestedAt != null;
     },
     async getActiveJobs(ctx) {
@@ -236,10 +260,11 @@ function createProgressService(em, eventBus) {
         ...ctx.organizationId ? { organizationId: ctx.organizationId } : {}
       });
     },
-    async markStaleJobsFailed(tenantId, timeoutSeconds = STALE_JOB_TIMEOUT_SECONDS) {
+    async markStaleJobsFailed(tenantId, timeoutSeconds = STALE_JOB_TIMEOUT_SECONDS, organizationId) {
       const cutoff = new Date(Date.now() - timeoutSeconds * 1e3);
       const staleJobs = await em.find(ProgressJob, {
         tenantId,
+        ...organizationId ? { organizationId } : {},
         status: "running",
         $or: [
           { heartbeatAt: { $lt: cutoff } },

package/dist/modules/progress/lib/progressServiceImpl.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/progress/lib/progressServiceImpl.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { ProgressJob } from '../data/entities'\nimport type { ProgressService } from './progressService'\nimport { calculateEta, calculateProgressPercent, STALE_JOB_TIMEOUT_SECONDS } from './progressService'\nimport { PROGRESS_EVENTS } from './events'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\n\nfunction buildJobPayload(job: ProgressJob): Record<string, unknown> {\n  return {\n    jobId: job.id,\n    jobType: job.jobType,\n    name: job.name,\n    description: job.description ?? null,\n    status: job.status,\n    progressPercent: job.progressPercent,\n    processedCount: job.processedCount,\n    totalCount: job.totalCount ?? null,\n    etaSeconds: job.etaSeconds ?? null,\n    cancellable: job.cancellable,\n    meta: job.meta ?? null,\n    startedAt: job.startedAt?.toISOString() ?? null,\n    finishedAt: job.finishedAt?.toISOString() ?? null,\n  }\n}\n\nexport function createProgressService(em: EntityManager, eventBus: { emit: (event: string, payload: Record<string, unknown>) => Promise<void> }): ProgressService {\n  return {\n    async createJob(input, ctx) {\n      const job = em.create(ProgressJob, {\n        jobType: input.jobType,\n        name: input.name,\n        description: input.description,\n        totalCount: input.totalCount,\n        cancellable: input.cancellable ?? false,\n        meta: input.meta,\n        parentJobId: input.parentJobId,\n        partitionIndex: input.partitionIndex,\n        partitionCount: input.partitionCount,\n        startedByUserId: ctx.userId,\n        tenantId: ctx.tenantId,\n        organizationId: ctx.organizationId,\n        status: 'pending',\n      })\n\n      await em.persist(job).flush()\n\n      await eventBus.emit(PROGRESS_EVENTS.JOB_CREATED, {\n        ...buildJobPayload(job),\n        tenantId: ctx.tenantId,\n        organizationId: ctx.organizationId,\n      })\n\n      return job\n    },\n\n    async startJob(jobId, ctx) {\n      const job = await em.findOneOrFail(ProgressJob, { id: jobId, tenantId: ctx.tenantId })\n      if (job.status === 'cancelled') {\n        return job\n      }\n\n      job.status = 'running'\n      job.startedAt = new Date()\n      job.heartbeatAt = new Date()\n\n      await em.flush()\n\n      await eventBus.emit(PROGRESS_EVENTS.JOB_STARTED, {\n        ...buildJobPayload(job),\n        tenantId: ctx.tenantId,\n        organizationId: job.organizationId ?? null,\n      })\n\n      return job\n    },\n\n    async updateProgress(jobId, input, ctx) {\n      const job = await em.findOneOrFail(ProgressJob, {\n        id: jobId,\n        tenantId: ctx.tenantId,\n        ...(ctx.organizationId ? { organizationId: ctx.organizationId } : {}),\n      })\n      if (job.status === 'completed' || job.status === 'failed' || job.status === 'cancelled') {\n        return job\n      }\n\n      if (input.processedCount !== undefined) {\n        job.processedCount = input.processedCount\n      }\n      if (input.totalCount !== undefined) {\n        job.totalCount = input.totalCount\n      }\n      if (input.meta !== undefined) {\n        job.meta = { ...job.meta, ...input.meta }\n      }\n\n      if (input.progressPercent !== undefined) {\n        job.progressPercent = input.progressPercent\n      } else if (job.totalCount) {\n        job.progressPercent = calculateProgressPercent(job.processedCount, job.totalCount)\n      }\n\n      if (input.etaSeconds !== undefined) {\n        job.etaSeconds = input.etaSeconds\n      } else if (job.startedAt && job.totalCount) {\n        job.etaSeconds = calculateEta(job.processedCount, job.totalCount, job.startedAt)\n      }\n\n      job.heartbeatAt = new Date()\n\n      await em.flush()\n\n      await eventBus.emit(PROGRESS_EVENTS.JOB_UPDATED, {\n        ...buildJobPayload(job),\n        tenantId: ctx.tenantId,\n        organizationId: job.organizationId ?? null,\n      })\n\n      return job\n    },\n\n    async incrementProgress(jobId, delta, ctx) {\n      const job = await em.findOneOrFail(ProgressJob, { id: jobId, tenantId: ctx.tenantId })\n      if (job.status === 'completed' || job.status === 'failed' || job.status === 'cancelled') {\n        return job\n      }\n\n      job.processedCount += delta\n      job.heartbeatAt = new Date()\n\n      if (job.totalCount) {\n        job.progressPercent = calculateProgressPercent(job.processedCount, job.totalCount)\n        if (job.startedAt) {\n          job.etaSeconds = calculateEta(job.processedCount, job.totalCount, job.startedAt)\n        }\n      }\n\n      await em.flush()\n\n      await eventBus.emit(PROGRESS_EVENTS.JOB_UPDATED, {\n        ...buildJobPayload(job),\n        tenantId: ctx.tenantId,\n        organizationId: job.organizationId ?? null,\n      })\n\n      return job\n    },\n\n    async completeJob(jobId, input, ctx) {\n      const job = await em.findOne(ProgressJob, { id: jobId, tenantId: ctx.tenantId })\n      if (!job) throw new Error(`Job ${jobId} not found`)\n      if (job.status === 'cancelled') {\n        return job\n      }\n\n      job.status = 'completed'\n      job.finishedAt = new Date()\n      job.progressPercent = 100\n      job.etaSeconds = 0\n      if (input?.resultSummary) {\n        job.resultSummary = input.resultSummary\n      }\n\n      await em.flush()\n\n      await eventBus.emit(PROGRESS_EVENTS.JOB_COMPLETED, {\n        ...buildJobPayload(job),\n        resultSummary: job.resultSummary,\n        tenantId: ctx.tenantId,\n        organizationId: job.organizationId ?? null,\n      })\n\n      return job\n    },\n\n    async failJob(jobId, input, ctx) {\n      const job = await em.findOne(ProgressJob, { id: jobId, tenantId: ctx.tenantId })\n      if (!job) throw new Error(`Job ${jobId} not found`)\n      if (job.status === 'cancelled') {\n        return job\n      }\n\n      job.status = 'failed'\n      job.finishedAt = new Date()\n      job.errorMessage = input.errorMessage\n      job.errorStack = input.errorStack\n\n      await em.flush()\n\n      await eventBus.emit(PROGRESS_EVENTS.JOB_FAILED, {\n        ...buildJobPayload(job),\n        errorMessage: job.errorMessage,\n        tenantId: ctx.tenantId,\n        organizationId: job.organizationId ?? null,\n      })\n\n      return job\n    },\n\n    async cancelJob(jobId, ctx) {\n      const job = await em.findOneOrFail(ProgressJob, {\n        id: jobId,\n        tenantId: ctx.tenantId,\n        ...(ctx.organizationId ? { organizationId: ctx.organizationId } : {}),\n        cancellable: true,\n        status: { $in: ['pending', 'running'] },\n      })\n\n      job.cancelRequestedAt = new Date()\n      job.cancelledByUserId = ctx.userId\n\n      if (job.status === 'pending') {\n        job.status = 'cancelled'\n        job.finishedAt = new Date()\n      }\n\n      await em.flush()\n\n      await eventBus.emit(PROGRESS_EVENTS.JOB_CANCELLED, {\n        ...buildJobPayload(job),\n        tenantId: ctx.tenantId,\n        organizationId: job.organizationId ?? null,\n      })\n\n      return job\n    },\n\n    async markCancelled(jobId, ctx) {\n      const job = await em.findOne(ProgressJob, { id: jobId, tenantId: ctx.tenantId })\n      if (!job) throw new Error(`Job ${jobId} not found`)\n      if (job.status === 'cancelled') {\n        return job\n      }\n\n      job.cancelRequestedAt = job.cancelRequestedAt ?? new Date()\n      job.cancelledByUserId = ctx.userId\n      job.status = 'cancelled'\n      job.finishedAt = job.finishedAt ?? new Date()\n      job.etaSeconds = 0\n\n      await em.flush()\n\n      await eventBus.emit(PROGRESS_EVENTS.JOB_CANCELLED, {\n        ...buildJobPayload(job),\n        tenantId: ctx.tenantId,\n        organizationId: job.organizationId ?? null,\n      })\n\n      return job\n    },\n\n    async isCancellationRequested(jobId, tenantId) {\n      const job = await findOneWithDecryption(em, ProgressJob, { id: jobId, tenantId })\n      return job?.cancelRequestedAt != null\n    },\n\n    async getActiveJobs(ctx) {\n      return em.find(ProgressJob, {\n        tenantId: ctx.tenantId,\n        ...(ctx.organizationId ? { organizationId: ctx.organizationId } : {}),\n        status: { $in: ['pending', 'running'] },\n        parentJobId: null,\n      }, {\n        orderBy: { createdAt: 'DESC' },\n        limit: 50,\n      })\n    },\n\n    async getRecentlyCompletedJobs(ctx, sinceSeconds = 30) {\n      const cutoff = new Date(Date.now() - sinceSeconds * 1000)\n      return em.find(ProgressJob, {\n        tenantId: ctx.tenantId,\n        ...(ctx.organizationId ? { organizationId: ctx.organizationId } : {}),\n        status: { $in: ['completed', 'failed'] },\n        finishedAt: { $gte: cutoff },\n        parentJobId: null,\n      }, {\n        orderBy: { finishedAt: 'DESC' },\n        limit: 10,\n      })\n    },\n\n    async getJob(jobId, ctx) {\n      return em.findOne(ProgressJob, {\n        id: jobId,\n        tenantId: ctx.tenantId,\n        ...(ctx.organizationId ? { organizationId: ctx.organizationId } : {}),\n      })\n    },\n\n    async markStaleJobsFailed(tenantId: string, timeoutSeconds = STALE_JOB_TIMEOUT_SECONDS) {\n      const cutoff = new Date(Date.now() - timeoutSeconds * 1000)\n\n      const staleJobs = await em.find(ProgressJob, {\n        tenantId,\n        status: 'running',\n        $or: [\n          { heartbeatAt: { $lt: cutoff } },\n          {\n            heartbeatAt: null,\n            startedAt: { $lt: cutoff },\n          },\n        ],\n      })\n\n      for (const job of staleJobs) {\n        job.status = 'failed'\n        job.finishedAt = new Date()\n        job.errorMessage = `Job stale: no heartbeat for ${timeoutSeconds} seconds`\n\n        await eventBus.emit(PROGRESS_EVENTS.JOB_FAILED, {\n          ...buildJobPayload(job),\n          errorMessage: job.errorMessage,\n          tenantId: job.tenantId,\n          stale: true,\n          organizationId: job.organizationId ?? null,\n        })\n      }\n\n      await em.flush()\n      return staleJobs.length\n    },\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { ProgressJob } from '../data/entities'\nimport type { ProgressService } from './progressService'\nimport { calculateEta, calculateProgressPercent, STALE_JOB_TIMEOUT_SECONDS } from './progressService'\nimport { PROGRESS_EVENTS } from './events'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\n\nfunction buildJobPayload(job: ProgressJob): Record<string, unknown> {\n  return {\n    jobId: job.id,\n    jobType: job.jobType,\n    name: job.name,\n    description: job.description ?? null,\n    status: job.status,\n    progressPercent: job.progressPercent,\n    processedCount: job.processedCount,\n    totalCount: job.totalCount ?? null,\n    etaSeconds: job.etaSeconds ?? null,\n    cancellable: job.cancellable,\n    meta: job.meta ?? null,\n    startedAt: job.startedAt?.toISOString() ?? null,\n    finishedAt: job.finishedAt?.toISOString() ?? null,\n  }\n}\n\nexport function createProgressService(em: EntityManager, eventBus: { emit: (event: string, payload: Record<string, unknown>) => Promise<void> }): ProgressService {\n  return {\n    async createJob(input, ctx) {\n      const job = em.create(ProgressJob, {\n        jobType: input.jobType,\n        name: input.name,\n        description: input.description,\n        totalCount: input.totalCount,\n        cancellable: input.cancellable ?? false,\n        meta: input.meta,\n        parentJobId: input.parentJobId,\n        partitionIndex: input.partitionIndex,\n        partitionCount: input.partitionCount,\n        startedByUserId: ctx.userId,\n        tenantId: ctx.tenantId,\n        organizationId: ctx.organizationId,\n        status: 'pending',\n      })\n\n      await em.persist(job).flush()\n\n      await eventBus.emit(PROGRESS_EVENTS.JOB_CREATED, {\n        ...buildJobPayload(job),\n        tenantId: ctx.tenantId,\n        organizationId: ctx.organizationId,\n      })\n\n      return job\n    },\n\n    async startJob(jobId, ctx) {\n      const job = await em.findOneOrFail(ProgressJob, {\n        id: jobId,\n        tenantId: ctx.tenantId,\n        ...(ctx.organizationId ? { organizationId: ctx.organizationId } : {}),\n      })\n      if (job.status === 'cancelled') {\n        return job\n      }\n\n      job.status = 'running'\n      job.startedAt = new Date()\n      job.heartbeatAt = new Date()\n\n      await em.flush()\n\n      await eventBus.emit(PROGRESS_EVENTS.JOB_STARTED, {\n        ...buildJobPayload(job),\n        tenantId: ctx.tenantId,\n        organizationId: job.organizationId ?? null,\n      })\n\n      return job\n    },\n\n    async updateProgress(jobId, input, ctx) {\n      const job = await em.findOneOrFail(ProgressJob, {\n        id: jobId,\n        tenantId: ctx.tenantId,\n        ...(ctx.organizationId ? { organizationId: ctx.organizationId } : {}),\n      })\n      if (job.status === 'completed' || job.status === 'failed' || job.status === 'cancelled') {\n        return job\n      }\n\n      if (input.processedCount !== undefined) {\n        job.processedCount = input.processedCount\n      }\n      if (input.totalCount !== undefined) {\n        job.totalCount = input.totalCount\n      }\n      if (input.meta !== undefined) {\n        job.meta = { ...job.meta, ...input.meta }\n      }\n\n      if (input.progressPercent !== undefined) {\n        job.progressPercent = input.progressPercent\n      } else if (job.totalCount) {\n        job.progressPercent = calculateProgressPercent(job.processedCount, job.totalCount)\n      }\n\n      if (input.etaSeconds !== undefined) {\n        job.etaSeconds = input.etaSeconds\n      } else if (job.startedAt && job.totalCount) {\n        job.etaSeconds = calculateEta(job.processedCount, job.totalCount, job.startedAt)\n      }\n\n      job.heartbeatAt = new Date()\n\n      await em.flush()\n\n      await eventBus.emit(PROGRESS_EVENTS.JOB_UPDATED, {\n        ...buildJobPayload(job),\n        tenantId: ctx.tenantId,\n        organizationId: job.organizationId ?? null,\n      })\n\n      return job\n    },\n\n    async incrementProgress(jobId, delta, ctx) {\n      const job = await em.findOneOrFail(ProgressJob, {\n        id: jobId,\n        tenantId: ctx.tenantId,\n        ...(ctx.organizationId ? { organizationId: ctx.organizationId } : {}),\n      })\n      if (job.status === 'completed' || job.status === 'failed' || job.status === 'cancelled') {\n        return job\n      }\n\n      job.processedCount += delta\n      job.heartbeatAt = new Date()\n\n      if (job.totalCount) {\n        job.progressPercent = calculateProgressPercent(job.processedCount, job.totalCount)\n        if (job.startedAt) {\n          job.etaSeconds = calculateEta(job.processedCount, job.totalCount, job.startedAt)\n        }\n      }\n\n      await em.flush()\n\n      await eventBus.emit(PROGRESS_EVENTS.JOB_UPDATED, {\n        ...buildJobPayload(job),\n        tenantId: ctx.tenantId,\n        organizationId: job.organizationId ?? null,\n      })\n\n      return job\n    },\n\n    async completeJob(jobId, input, ctx) {\n      const job = await em.findOne(ProgressJob, {\n        id: jobId,\n        tenantId: ctx.tenantId,\n        ...(ctx.organizationId ? { organizationId: ctx.organizationId } : {}),\n      })\n      if (!job) throw new Error(`Job ${jobId} not found`)\n      if (job.status === 'cancelled') {\n        return job\n      }\n\n      job.status = 'completed'\n      job.finishedAt = new Date()\n      job.progressPercent = 100\n      job.etaSeconds = 0\n      if (input?.resultSummary) {\n        job.resultSummary = input.resultSummary\n      }\n\n      await em.flush()\n\n      await eventBus.emit(PROGRESS_EVENTS.JOB_COMPLETED, {\n        ...buildJobPayload(job),\n        resultSummary: job.resultSummary,\n        tenantId: ctx.tenantId,\n        organizationId: job.organizationId ?? null,\n      })\n\n      return job\n    },\n\n    async failJob(jobId, input, ctx) {\n      const job = await em.findOne(ProgressJob, {\n        id: jobId,\n        tenantId: ctx.tenantId,\n        ...(ctx.organizationId ? { organizationId: ctx.organizationId } : {}),\n      })\n      if (!job) throw new Error(`Job ${jobId} not found`)\n      if (job.status === 'cancelled') {\n        return job\n      }\n\n      job.status = 'failed'\n      job.finishedAt = new Date()\n      job.errorMessage = input.errorMessage\n      job.errorStack = input.errorStack\n\n      await em.flush()\n\n      await eventBus.emit(PROGRESS_EVENTS.JOB_FAILED, {\n        ...buildJobPayload(job),\n        errorMessage: job.errorMessage,\n        tenantId: ctx.tenantId,\n        organizationId: job.organizationId ?? null,\n      })\n\n      return job\n    },\n\n    async cancelJob(jobId, ctx) {\n      const job = await em.findOneOrFail(ProgressJob, {\n        id: jobId,\n        tenantId: ctx.tenantId,\n        ...(ctx.organizationId ? { organizationId: ctx.organizationId } : {}),\n        cancellable: true,\n        status: { $in: ['pending', 'running'] },\n      })\n\n      job.cancelRequestedAt = new Date()\n      job.cancelledByUserId = ctx.userId\n\n      if (job.status === 'pending') {\n        job.status = 'cancelled'\n        job.finishedAt = new Date()\n      }\n\n      await em.flush()\n\n      await eventBus.emit(PROGRESS_EVENTS.JOB_CANCELLED, {\n        ...buildJobPayload(job),\n        tenantId: ctx.tenantId,\n        organizationId: job.organizationId ?? null,\n      })\n\n      return job\n    },\n\n    async markCancelled(jobId, ctx) {\n      const job = await em.findOne(ProgressJob, {\n        id: jobId,\n        tenantId: ctx.tenantId,\n        ...(ctx.organizationId ? { organizationId: ctx.organizationId } : {}),\n      })\n      if (!job) throw new Error(`Job ${jobId} not found`)\n      if (job.status === 'cancelled') {\n        return job\n      }\n\n      job.cancelRequestedAt = job.cancelRequestedAt ?? new Date()\n      job.cancelledByUserId = ctx.userId\n      job.status = 'cancelled'\n      job.finishedAt = job.finishedAt ?? new Date()\n      job.etaSeconds = 0\n\n      await em.flush()\n\n      await eventBus.emit(PROGRESS_EVENTS.JOB_CANCELLED, {\n        ...buildJobPayload(job),\n        tenantId: ctx.tenantId,\n        organizationId: job.organizationId ?? null,\n      })\n\n      return job\n    },\n\n    async isCancellationRequested(jobId, tenantId, organizationId) {\n      const job = await findOneWithDecryption(em, ProgressJob, {\n        id: jobId,\n        tenantId,\n        ...(organizationId ? { organizationId } : {}),\n      })\n      return job?.cancelRequestedAt != null\n    },\n\n    async getActiveJobs(ctx) {\n      return em.find(ProgressJob, {\n        tenantId: ctx.tenantId,\n        ...(ctx.organizationId ? { organizationId: ctx.organizationId } : {}),\n        status: { $in: ['pending', 'running'] },\n        parentJobId: null,\n      }, {\n        orderBy: { createdAt: 'DESC' },\n        limit: 50,\n      })\n    },\n\n    async getRecentlyCompletedJobs(ctx, sinceSeconds = 30) {\n      const cutoff = new Date(Date.now() - sinceSeconds * 1000)\n      return em.find(ProgressJob, {\n        tenantId: ctx.tenantId,\n        ...(ctx.organizationId ? { organizationId: ctx.organizationId } : {}),\n        status: { $in: ['completed', 'failed'] },\n        finishedAt: { $gte: cutoff },\n        parentJobId: null,\n      }, {\n        orderBy: { finishedAt: 'DESC' },\n        limit: 10,\n      })\n    },\n\n    async getJob(jobId, ctx) {\n      return em.findOne(ProgressJob, {\n        id: jobId,\n        tenantId: ctx.tenantId,\n        ...(ctx.organizationId ? { organizationId: ctx.organizationId } : {}),\n      })\n    },\n\n    async markStaleJobsFailed(tenantId: string, timeoutSeconds = STALE_JOB_TIMEOUT_SECONDS, organizationId?: string | null) {\n      const cutoff = new Date(Date.now() - timeoutSeconds * 1000)\n\n      const staleJobs = await em.find(ProgressJob, {\n        tenantId,\n        ...(organizationId ? { organizationId } : {}),\n        status: 'running',\n        $or: [\n          { heartbeatAt: { $lt: cutoff } },\n          {\n            heartbeatAt: null,\n            startedAt: { $lt: cutoff },\n          },\n        ],\n      })\n\n      for (const job of staleJobs) {\n        job.status = 'failed'\n        job.finishedAt = new Date()\n        job.errorMessage = `Job stale: no heartbeat for ${timeoutSeconds} seconds`\n\n        await eventBus.emit(PROGRESS_EVENTS.JOB_FAILED, {\n          ...buildJobPayload(job),\n          errorMessage: job.errorMessage,\n          tenantId: job.tenantId,\n          stale: true,\n          organizationId: job.organizationId ?? null,\n        })\n      }\n\n      await em.flush()\n      return staleJobs.length\n    },\n  }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/query_index/api/status.js CHANGED Viewed

@@ -3,7 +3,8 @@ import { createRequestContainer } from "@open-mercato/shared/lib/di/container";
 import { getAuthFromRequest } from "@open-mercato/shared/lib/auth/server";
 import { getEntityIds } from "@open-mercato/shared/lib/encryption/entityIds";
 import { sql } from "kysely";
-import { readCoverageSnapshot, refreshCoverageSnapshot } from "../lib/coverage.js";
+import { readCoverageSnapshots, refreshCoverageSnapshot } from "../lib/coverage.js";
+import { mapWithConcurrency } from "@open-mercato/shared/lib/query/bounded-decrypt";
 import { queryIndexTag, queryIndexErrorSchema, queryIndexStatusResponseSchema } from "./openapi.js";
 import { flattenSystemEntityIds } from "@open-mercato/shared/lib/entities/system-entities";
 import { resolveOrganizationScopeForRequest } from "@open-mercato/core/modules/directory/utils/organizationScope";
@@ -102,6 +103,7 @@ async function GET(req) {
   }
   const HEARTBEAT_STALE_MS = 6e4;
   const COVERAGE_STALE_MS = 6e4;
+  const COVERAGE_REFRESH_CONCURRENCY = 8;
   async function fetchJobSummary(entityType, tenantIdParam, organizationIdParam) {
     try {
       let jobQuery = db.selectFrom("entity_index_jobs").selectAll().where("entity_type", "=", entityType).where(sql`tenant_id is not distinct from ${tenantIdParam ?? null}`);
@@ -212,31 +214,23 @@ async function GET(req) {
     const parsed = Number(value);
     return Number.isFinite(parsed) ? parsed : null;
   };
-  const coverageSnapshots = [];
+  const coverageScope = {
+    tenantId: tenantId ?? null,
+    organizationId,
+    withDeleted: false
+  };
   const entitiesNeedingRefresh = /* @__PURE__ */ new Set();
-  for (const entityId of entityIds) {
-    const scope2 = {
-      entityType: entityId,
-      tenantId: tenantId ?? null,
-      organizationId,
-      withDeleted: false
-    };
-    const ensureSnapshot = async () => {
-      let snapshot = await readCoverageSnapshot(db, scope2);
-      const refreshedAt = snapshot?.refreshed_at instanceof Date ? snapshot.refreshed_at : snapshot?.refreshed_at ? new Date(snapshot.refreshed_at) : null;
-      const stale = !snapshot || !refreshedAt || Date.now() - refreshedAt.getTime() > COVERAGE_STALE_MS;
-      if (forceRefresh || stale) {
-        await refreshCoverageSnapshot(em, scope2).catch(() => void 0);
-        snapshot = await readCoverageSnapshot(db, scope2);
-      }
-      const finalRefreshed = snapshot?.refreshed_at instanceof Date ? snapshot.refreshed_at : snapshot?.refreshed_at ? new Date(snapshot.refreshed_at) : null;
-      if (!snapshot || !finalRefreshed || Date.now() - finalRefreshed.getTime() > COVERAGE_STALE_MS) {
-        entitiesNeedingRefresh.add(entityId);
-      }
-      return snapshot;
-    };
-    coverageSnapshots.push(await ensureSnapshot());
+  const snapshotByEntity = await readCoverageSnapshots(db, { entityTypes: entityIds, ...coverageScope });
+  if (forceRefresh && entityIds.length > 0) {
+    await mapWithConcurrency(
+      entityIds,
+      COVERAGE_REFRESH_CONCURRENCY,
+      (entityId) => refreshCoverageSnapshot(em, { entityType: entityId, ...coverageScope }).catch(() => void 0)
+    );
+    const refreshed = await readCoverageSnapshots(db, { entityTypes: entityIds, ...coverageScope });
+    for (const [entityId, snapshot] of refreshed) snapshotByEntity.set(entityId, snapshot);
   }
+  const coverageSnapshots = entityIds.map((entityId) => snapshotByEntity.get(entityId) ?? null);
   const jobs = await Promise.all(entityIds.map((eid) => fetchJobSummary(eid, tenantId, organizationId)));
   const items = [];
   for (let idx = 0; idx < entityIds.length; idx += 1) {
@@ -362,6 +356,7 @@ async function GET(req) {
   });
   const response = NextResponse.json({ items, errors, logs });
   const partial = items.find((item) => {
+    if (item.baseCount == null && item.indexCount == null) return false;
     if (item.baseCount == null || item.indexCount == null) return true;
     return item.baseCount !== item.indexCount;
   });