@open-mercato/core 0.6.8-develop.6998.1.d2bc46c56c → 0.6.8-develop.7000.1.0ae682bad1

package/dist/modules/customers/components/detail/assignableStaff.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/modules/customers/components/detail/assignableStaff.ts"],
-  "sourcesContent": ["import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'\nimport type { FilterOption } from '@open-mercato/shared/lib/query/advanced-filter'\n\nexport type AssignableStaffMember = {\n  teamMemberId: string\n  userId: string\n  displayName: string\n  email: string | null\n  teamName: string | null\n}\n\ntype AssignableStaffResponse = {\n  items?: Array<Record<string, unknown>>\n  total?: number\n  page?: number\n  pageSize?: number\n}\n\nexport type AssignableStaffMembersPage = {\n  items: AssignableStaffMember[]\n  /**\n   * How many rows the server served for this page, before the dedupe below.\n   * \"Load more\" guards must measure this rather than `items.length`: a deduped\n   * length shorter than the served page reads as a short page and terminates\n   * the sequence early, stranding the rest of the roster.\n   */\n  servedCount: number\n  total: number\n  page: number\n  pageSize: number\n}\n\n// The assignable-staff roster is owned by the optional, ejectable `staff` module.\n// When that module is disabled, its `/api/staff/team-members/assignable` endpoint is\n// absent and the request resolves to 404. Customers UI (deals / people / companies\n// owner filters, role-assignment dialogs) is core and always enabled, so it must not\n// break in that case \u2014 a missing staff module simply means there is no roster to\n// offer. Treat the 404 as an empty page and let any other failure propagate.\nfunction isAssignableEndpointMissing(error: unknown): boolean {\n  return (\n    typeof error === 'object' &&\n    error !== null &&\n    (error as { status?: unknown }).status === 404\n  )\n}\n\nexport async function fetchAssignableStaffMembersPage(\n  query: string,\n  options?: { page?: number; pageSize?: number; signal?: AbortSignal },\n): Promise<AssignableStaffMembersPage> {\n  const page = options?.page ?? 1\n  const pageSize = options?.pageSize ?? 24\n  const params = new URLSearchParams()\n  params.set('page', String(page))\n  params.set('pageSize', String(pageSize))\n  const normalizedQuery = query.trim()\n  if (normalizedQuery.length > 0) {\n    params.set('search', normalizedQuery)\n  }\n\n  let data: AssignableStaffResponse\n  try {\n    data = await readApiResultOrThrow<AssignableStaffResponse>(\n      `/api/staff/team-members/assignable?${params.toString()}`,\n      options?.signal ? { signal: options.signal } : undefined,\n    )\n  } catch (error) {\n    if (isAssignableEndpointMissing(error)) {\n      return { items: [], servedCount: 0, total: 0, page, pageSize }\n    }\n    throw error\n  }\n\n  const rawItems = Array.isArray(data?.items) ? data.items : []\n  const deduped = new Map<string, AssignableStaffMember>()\n\n  for (const item of rawItems) {\n    const userId =\n      typeof item?.userId === 'string'\n        ? item.userId\n        : typeof item?.user_id === 'string'\n          ? item.user_id\n          : null\n    if (!userId || deduped.has(userId)) continue\n\n    const user =\n      item?.user && typeof item.user === 'object'\n        ? (item.user as Record<string, unknown>)\n        : null\n    const team =\n      item?.team && typeof item.team === 'object'\n        ? (item.team as Record<string, unknown>)\n        : null\n\n    const displayName =\n      typeof item?.displayName === 'string' && item.displayName.trim().length > 0\n        ? item.displayName.trim()\n        : typeof item?.display_name === 'string' && item.display_name.trim().length > 0\n          ? item.display_name.trim()\n          : null\n    const email =\n      user && typeof user.email === 'string' && user.email.trim().length > 0\n        ? user.email.trim()\n        : typeof item?.email === 'string' && item.email.trim().length > 0\n          ? item.email.trim()\n          : null\n    const teamName =\n      typeof item?.teamName === 'string' && item.teamName.trim().length > 0\n        ? item.teamName.trim()\n        : typeof item?.team_name === 'string' && item.team_name.trim().length > 0\n          ? item.team_name.trim()\n          : team && typeof team.name === 'string' && team.name.trim().length > 0\n            ? team.name.trim()\n            : null\n    const teamMemberId =\n      typeof item?.teamMemberId === 'string'\n        ? item.teamMemberId\n        : typeof item?.team_member_id === 'string'\n          ? item.team_member_id\n          : typeof item?.id === 'string'\n            ? item.id\n            : userId\n\n    deduped.set(userId, {\n      teamMemberId,\n      userId,\n      displayName: displayName ?? email ?? userId,\n      email,\n      teamName,\n    })\n  }\n\n  return {\n    items: Array.from(deduped.values()),\n    servedCount: rawItems.length,\n    total:\n      typeof data?.total === 'number' && Number.isFinite(data.total)\n        ? data.total\n        : deduped.size,\n    page:\n      typeof data?.page === 'number' && Number.isFinite(data.page)\n        ? data.page\n        : page,\n    pageSize:\n      typeof data?.pageSize === 'number' && Number.isFinite(data.pageSize)\n        ? data.pageSize\n        : pageSize,\n  }\n}\n\nexport async function fetchAssignableStaffMembers(\n  query: string,\n  options?: { pageSize?: number; signal?: AbortSignal },\n): Promise<AssignableStaffMember[]> {\n  const result = await fetchAssignableStaffMembersPage(query, options)\n  return result.items\n}\n\nexport function mapAssignableStaffToFilterOptions(items: AssignableStaffMember[]): FilterOption[] {\n  return items.map((item) => ({\n    value: item.userId,\n    label: item.email && item.email !== item.displayName\n      ? `${item.displayName} (${item.email})`\n      : item.displayName,\n    tone: 'neutral',\n  }))\n}\n\nexport function ensureCurrentUserFilterOption(\n  options: FilterOption[],\n  currentUserId: string,\n  fallbackLabel: string,\n): FilterOption[] {\n  const trimmed = currentUserId.trim()\n  if (!trimmed || options.some((option) => option.value === trimmed)) return options\n  return [{ value: trimmed, label: fallbackLabel, tone: 'neutral' }, ...options]\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["/**\n * @deprecated Import from `@open-mercato/core/modules/customers/lib/assignableStaff` instead.\n * This path is a compatibility bridge kept for one minor version after 0.6.7; it will be\n * removed in 0.7.0. The implementation moved to `../../lib/assignableStaff` so non-component\n * callers (API routes, commands) can use it without importing from a `components/` path.\n */\nexport {\n  fetchAssignableStaffMembersPage,\n  fetchAssignableStaffMembers,\n  mapAssignableStaffToFilterOptions,\n  ensureCurrentUserFilterOption,\n  type AssignableStaffMember,\n  type AssignableStaffMembersPage,\n} from '../../lib/assignableStaff'\n"],
+  "mappings": "AAMA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OAGK;",
   "names": []
 }

package/dist/modules/customers/lib/assignableStaff.js

@@ -0,0 +1,76 @@
+import { readApiResultOrThrow } from "@open-mercato/ui/backend/utils/apiCall";
+function isAssignableEndpointMissing(error) {
+  return typeof error === "object" && error !== null && error.status === 404;
+}
+async function fetchAssignableStaffMembersPage(query, options) {
+  const page = options?.page ?? 1;
+  const pageSize = options?.pageSize ?? 24;
+  const params = new URLSearchParams();
+  params.set("page", String(page));
+  params.set("pageSize", String(pageSize));
+  const normalizedQuery = query.trim();
+  if (normalizedQuery.length > 0) {
+    params.set("search", normalizedQuery);
+  }
+  let data;
+  try {
+    data = await readApiResultOrThrow(
+      `/api/staff/team-members/assignable?${params.toString()}`,
+      options?.signal ? { signal: options.signal } : void 0
+    );
+  } catch (error) {
+    if (isAssignableEndpointMissing(error)) {
+      return { items: [], servedCount: 0, total: 0, page, pageSize };
+    }
+    throw error;
+  }
+  const rawItems = Array.isArray(data?.items) ? data.items : [];
+  const deduped = /* @__PURE__ */ new Map();
+  for (const item of rawItems) {
+    const userId = typeof item?.userId === "string" ? item.userId : typeof item?.user_id === "string" ? item.user_id : null;
+    if (!userId || deduped.has(userId)) continue;
+    const user = item?.user && typeof item.user === "object" ? item.user : null;
+    const team = item?.team && typeof item.team === "object" ? item.team : null;
+    const displayName = typeof item?.displayName === "string" && item.displayName.trim().length > 0 ? item.displayName.trim() : typeof item?.display_name === "string" && item.display_name.trim().length > 0 ? item.display_name.trim() : null;
+    const email = user && typeof user.email === "string" && user.email.trim().length > 0 ? user.email.trim() : typeof item?.email === "string" && item.email.trim().length > 0 ? item.email.trim() : null;
+    const teamName = typeof item?.teamName === "string" && item.teamName.trim().length > 0 ? item.teamName.trim() : typeof item?.team_name === "string" && item.team_name.trim().length > 0 ? item.team_name.trim() : team && typeof team.name === "string" && team.name.trim().length > 0 ? team.name.trim() : null;
+    const teamMemberId = typeof item?.teamMemberId === "string" ? item.teamMemberId : typeof item?.team_member_id === "string" ? item.team_member_id : typeof item?.id === "string" ? item.id : userId;
+    deduped.set(userId, {
+      teamMemberId,
+      userId,
+      displayName: displayName ?? email ?? userId,
+      email,
+      teamName
+    });
+  }
+  return {
+    items: Array.from(deduped.values()),
+    servedCount: rawItems.length,
+    total: typeof data?.total === "number" && Number.isFinite(data.total) ? data.total : deduped.size,
+    page: typeof data?.page === "number" && Number.isFinite(data.page) ? data.page : page,
+    pageSize: typeof data?.pageSize === "number" && Number.isFinite(data.pageSize) ? data.pageSize : pageSize
+  };
+}
+async function fetchAssignableStaffMembers(query, options) {
+  const result = await fetchAssignableStaffMembersPage(query, options);
+  return result.items;
+}
+function mapAssignableStaffToFilterOptions(items) {
+  return items.map((item) => ({
+    value: item.userId,
+    label: item.email && item.email !== item.displayName ? `${item.displayName} (${item.email})` : item.displayName,
+    tone: "neutral"
+  }));
+}
+function ensureCurrentUserFilterOption(options, currentUserId, fallbackLabel) {
+  const trimmed = currentUserId.trim();
+  if (!trimmed || options.some((option) => option.value === trimmed)) return options;
+  return [{ value: trimmed, label: fallbackLabel, tone: "neutral" }, ...options];
+}
+export {
+  ensureCurrentUserFilterOption,
+  fetchAssignableStaffMembers,
+  fetchAssignableStaffMembersPage,
+  mapAssignableStaffToFilterOptions
+};
+//# sourceMappingURL=assignableStaff.js.map

package/dist/modules/customers/lib/assignableStaff.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/customers/lib/assignableStaff.ts"],
+  "sourcesContent": ["import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'\nimport type { FilterOption } from '@open-mercato/shared/lib/query/advanced-filter'\n\nexport type AssignableStaffMember = {\n  teamMemberId: string\n  userId: string\n  displayName: string\n  email: string | null\n  teamName: string | null\n}\n\ntype AssignableStaffResponse = {\n  items?: Array<Record<string, unknown>>\n  total?: number\n  page?: number\n  pageSize?: number\n}\n\nexport type AssignableStaffMembersPage = {\n  items: AssignableStaffMember[]\n  /**\n   * How many rows the server served for this page, before the dedupe below.\n   * \"Load more\" guards must measure this rather than `items.length`: a deduped\n   * length shorter than the served page reads as a short page and terminates\n   * the sequence early, stranding the rest of the roster.\n   */\n  servedCount: number\n  total: number\n  page: number\n  pageSize: number\n}\n\n// The assignable-staff roster is owned by the optional, ejectable `staff` module.\n// When that module is disabled, its `/api/staff/team-members/assignable` endpoint is\n// absent and the request resolves to 404. Customers UI (deals / people / companies\n// owner filters, role-assignment dialogs) is core and always enabled, so it must not\n// break in that case \u2014 a missing staff module simply means there is no roster to\n// offer. Treat the 404 as an empty page and let any other failure propagate.\nfunction isAssignableEndpointMissing(error: unknown): boolean {\n  return (\n    typeof error === 'object' &&\n    error !== null &&\n    (error as { status?: unknown }).status === 404\n  )\n}\n\nexport async function fetchAssignableStaffMembersPage(\n  query: string,\n  options?: { page?: number; pageSize?: number; signal?: AbortSignal },\n): Promise<AssignableStaffMembersPage> {\n  const page = options?.page ?? 1\n  const pageSize = options?.pageSize ?? 24\n  const params = new URLSearchParams()\n  params.set('page', String(page))\n  params.set('pageSize', String(pageSize))\n  const normalizedQuery = query.trim()\n  if (normalizedQuery.length > 0) {\n    params.set('search', normalizedQuery)\n  }\n\n  let data: AssignableStaffResponse\n  try {\n    data = await readApiResultOrThrow<AssignableStaffResponse>(\n      `/api/staff/team-members/assignable?${params.toString()}`,\n      options?.signal ? { signal: options.signal } : undefined,\n    )\n  } catch (error) {\n    if (isAssignableEndpointMissing(error)) {\n      return { items: [], servedCount: 0, total: 0, page, pageSize }\n    }\n    throw error\n  }\n\n  const rawItems = Array.isArray(data?.items) ? data.items : []\n  const deduped = new Map<string, AssignableStaffMember>()\n\n  for (const item of rawItems) {\n    const userId =\n      typeof item?.userId === 'string'\n        ? item.userId\n        : typeof item?.user_id === 'string'\n          ? item.user_id\n          : null\n    if (!userId || deduped.has(userId)) continue\n\n    const user =\n      item?.user && typeof item.user === 'object'\n        ? (item.user as Record<string, unknown>)\n        : null\n    const team =\n      item?.team && typeof item.team === 'object'\n        ? (item.team as Record<string, unknown>)\n        : null\n\n    const displayName =\n      typeof item?.displayName === 'string' && item.displayName.trim().length > 0\n        ? item.displayName.trim()\n        : typeof item?.display_name === 'string' && item.display_name.trim().length > 0\n          ? item.display_name.trim()\n          : null\n    const email =\n      user && typeof user.email === 'string' && user.email.trim().length > 0\n        ? user.email.trim()\n        : typeof item?.email === 'string' && item.email.trim().length > 0\n          ? item.email.trim()\n          : null\n    const teamName =\n      typeof item?.teamName === 'string' && item.teamName.trim().length > 0\n        ? item.teamName.trim()\n        : typeof item?.team_name === 'string' && item.team_name.trim().length > 0\n          ? item.team_name.trim()\n          : team && typeof team.name === 'string' && team.name.trim().length > 0\n            ? team.name.trim()\n            : null\n    const teamMemberId =\n      typeof item?.teamMemberId === 'string'\n        ? item.teamMemberId\n        : typeof item?.team_member_id === 'string'\n          ? item.team_member_id\n          : typeof item?.id === 'string'\n            ? item.id\n            : userId\n\n    deduped.set(userId, {\n      teamMemberId,\n      userId,\n      displayName: displayName ?? email ?? userId,\n      email,\n      teamName,\n    })\n  }\n\n  return {\n    items: Array.from(deduped.values()),\n    servedCount: rawItems.length,\n    total:\n      typeof data?.total === 'number' && Number.isFinite(data.total)\n        ? data.total\n        : deduped.size,\n    page:\n      typeof data?.page === 'number' && Number.isFinite(data.page)\n        ? data.page\n        : page,\n    pageSize:\n      typeof data?.pageSize === 'number' && Number.isFinite(data.pageSize)\n        ? data.pageSize\n        : pageSize,\n  }\n}\n\nexport async function fetchAssignableStaffMembers(\n  query: string,\n  options?: { pageSize?: number; signal?: AbortSignal },\n): Promise<AssignableStaffMember[]> {\n  const result = await fetchAssignableStaffMembersPage(query, options)\n  return result.items\n}\n\nexport function mapAssignableStaffToFilterOptions(items: AssignableStaffMember[]): FilterOption[] {\n  return items.map((item) => ({\n    value: item.userId,\n    label: item.email && item.email !== item.displayName\n      ? `${item.displayName} (${item.email})`\n      : item.displayName,\n    tone: 'neutral',\n  }))\n}\n\nexport function ensureCurrentUserFilterOption(\n  options: FilterOption[],\n  currentUserId: string,\n  fallbackLabel: string,\n): FilterOption[] {\n  const trimmed = currentUserId.trim()\n  if (!trimmed || options.some((option) => option.value === trimmed)) return options\n  return [{ value: trimmed, label: fallbackLabel, tone: 'neutral' }, ...options]\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/modules/data_sync/lib/batch-stream.js

@@ -0,0 +1,56 @@
+import { createLogger } from "@open-mercato/shared/lib/logger";
+import {
+  withTelemetrySpan
+} from "@open-mercato/shared/lib/telemetry/runtime";
+const logger = createLogger("data_sync").child({ component: "batch-stream" });
+async function closeQuietly(iterator) {
+  if (!iterator.return) return;
+  try {
+    await iterator.return();
+  } catch (error) {
+    logger.warn("Data sync adapter stream did not close cleanly", { err: error });
+  }
+}
+async function forEachBatch(stream, options, handle) {
+  const iterator = stream[Symbol.asyncIterator]();
+  for (; ; ) {
+    let readThrew = false;
+    let outcome;
+    try {
+      outcome = await withTelemetrySpan(
+        options.spanName,
+        async (span) => {
+          let next;
+          try {
+            next = await iterator.next();
+          } catch (error) {
+            readThrew = true;
+            throw error;
+          }
+          if (next.done) {
+            span.updateName?.(options.drainSpanName);
+            return "exhausted";
+          }
+          return handle(next.value, span);
+        },
+        {
+          root: true,
+          attributes: options.attributes,
+          links: options.linkTo ? [options.linkTo] : void 0
+        }
+      );
+    } catch (error) {
+      if (!readThrew) await closeQuietly(iterator);
+      throw error;
+    }
+    if (outcome === "exhausted") return "completed";
+    if (outcome === "stop") {
+      await iterator.return?.();
+      return "stopped";
+    }
+  }
+}
+export {
+  forEachBatch
+};
+//# sourceMappingURL=batch-stream.js.map

package/dist/modules/data_sync/lib/batch-stream.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/data_sync/lib/batch-stream.ts"],
+  "sourcesContent": ["import { createLogger } from '@open-mercato/shared/lib/logger'\nimport {\n  withTelemetrySpan,\n  type TelemetrySpan,\n  type TelemetrySpanAttributes,\n  type TelemetryTraceCarrier,\n} from '@open-mercato/shared/lib/telemetry/runtime'\n\nconst logger = createLogger('data_sync').child({ component: 'batch-stream' })\n\n/** What the handler wants the stream to do next. */\nexport type BatchOutcome = 'continue' | 'stop'\n\n/** Why the stream ended: the adapter ran out of batches, or a handler stopped it. */\nexport type BatchStreamResult = 'completed' | 'stopped'\n\nexport type BatchStreamOptions = {\n  spanName: string\n  /**\n   * Name for the read that turns out to have drained the stream. That read is\n   * real adapter work \u2014 it can be a full remote page fetch that comes back\n   * empty \u2014 so it stays traced, but it is not a batch: leaving it under\n   * `spanName` would report one batch more than the run actually processed and\n   * feed an unlabelled, counter-less sample into every batch latency panel.\n   */\n  drainSpanName: string\n  /** Run-level attributes repeated on every batch span (run id, entity type, scope). */\n  attributes?: TelemetrySpanAttributes\n  /** The run's trace, so a rooted batch still points back at what triggered it. */\n  linkTo?: TelemetryTraceCarrier\n}\n\n/**\n * Close the stream while an error is already in flight. That error is the one\n * worth propagating, so a secondary cleanup failure is logged rather than\n * allowed to mask it \u2014 which is what `for await` does on a body throw.\n */\nasync function closeQuietly(iterator: AsyncIterator<unknown>): Promise<void> {\n  if (!iterator.return) return\n  try {\n    await iterator.return()\n  } catch (error) {\n    logger.warn('Data sync adapter stream did not close cleanly', { err: error })\n  }\n}\n\n/**\n * Drive `stream` one batch at a time, running the adapter's read AND `handle`'s\n * bookkeeping for that batch inside a single ROOT span linked back to the run.\n *\n * Rooting per batch is the whole point. A sync run can last days, so leaving its\n * spans nested under the request that triggered it puts the entire run behind\n * one sampling decision \u2014 below ratio 1.0 a run can emit nothing at all, and at\n * 1.0 it becomes a single unrenderable trace. A batch is the unit the slowness\n * analysis actually reasons about, so it gets its own trace and its own\n * decision.\n *\n * The iterator is driven explicitly instead of with `for await` so the span can\n * wrap `next()`, which is where an adapter generator does its real work \u2014 it\n * reads, transforms and upserts before it ever yields. A stream is only known to\n * be drained once that read returns `done`, so the last span per run starts\n * under `spanName` and is renamed to `drainSpanName`: a run over N batches emits\n * N spans named `spanName` and exactly one named `drainSpanName`.\n *\n * Closing follows the language's own `IteratorClose` rules exactly, so adapter\n * cleanup behaves as it did under `for await`:\n *\n * - **exhausted** \u2014 the iterator already completed itself; no `return()` call.\n * - **stopped early** \u2014 `return()` is called and a failure to close *is* the\n *   result, the same as breaking out of `for await`.\n * - **`handle` threw** \u2014 `return()` is called, but its failure is swallowed so\n *   the handler's error still wins.\n * - **`next()` threw** \u2014 the iterator is already closed; no `return()` call.\n */\nexport async function forEachBatch<TBatch>(\n  stream: AsyncIterable<TBatch>,\n  options: BatchStreamOptions,\n  handle: (batch: TBatch, span: TelemetrySpan) => Promise<BatchOutcome>,\n): Promise<BatchStreamResult> {\n  const iterator = stream[Symbol.asyncIterator]()\n  for (;;) {\n    let readThrew = false\n    let outcome: BatchOutcome | 'exhausted'\n    try {\n      outcome = await withTelemetrySpan(\n        options.spanName,\n        async (span): Promise<BatchOutcome | 'exhausted'> => {\n          let next: IteratorResult<TBatch>\n          try {\n            next = await iterator.next()\n          } catch (error) {\n            readThrew = true\n            throw error\n          }\n          if (next.done) {\n            span.updateName?.(options.drainSpanName)\n            return 'exhausted'\n          }\n          return handle(next.value, span)\n        },\n        {\n          root: true,\n          attributes: options.attributes,\n          links: options.linkTo ? [options.linkTo] : undefined,\n        },\n      )\n    } catch (error) {\n      if (!readThrew) await closeQuietly(iterator)\n      throw error\n    }\n    if (outcome === 'exhausted') return 'completed'\n    if (outcome === 'stop') {\n      await iterator.return?.()\n      return 'stopped'\n    }\n  }\n}\n"],
+  "mappings": "AAAA,SAAS,oBAAoB;AAC7B;AAAA,EACE;AAAA,OAIK;AAEP,MAAM,SAAS,aAAa,WAAW,EAAE,MAAM,EAAE,WAAW,eAAe,CAAC;AA6B5E,eAAe,aAAa,UAAiD;AAC3E,MAAI,CAAC,SAAS,OAAQ;AACtB,MAAI;AACF,UAAM,SAAS,OAAO;AAAA,EACxB,SAAS,OAAO;AACd,WAAO,KAAK,kDAAkD,EAAE,KAAK,MAAM,CAAC;AAAA,EAC9E;AACF;AA8BA,eAAsB,aACpB,QACA,SACA,QAC4B;AAC5B,QAAM,WAAW,OAAO,OAAO,aAAa,EAAE;AAC9C,aAAS;AACP,QAAI,YAAY;AAChB,QAAI;AACJ,QAAI;AACF,gBAAU,MAAM;AAAA,QACd,QAAQ;AAAA,QACR,OAAO,SAA8C;AACnD,cAAI;AACJ,cAAI;AACF,mBAAO,MAAM,SAAS,KAAK;AAAA,UAC7B,SAAS,OAAO;AACd,wBAAY;AACZ,kBAAM;AAAA,UACR;AACA,cAAI,KAAK,MAAM;AACb,iBAAK,aAAa,QAAQ,aAAa;AACvC,mBAAO;AAAA,UACT;AACA,iBAAO,OAAO,KAAK,OAAO,IAAI;AAAA,QAChC;AAAA,QACA;AAAA,UACE,MAAM;AAAA,UACN,YAAY,QAAQ;AAAA,UACpB,OAAO,QAAQ,SAAS,CAAC,QAAQ,MAAM,IAAI;AAAA,QAC7C;AAAA,MACF;AAAA,IACF,SAAS,OAAO;AACd,UAAI,CAAC,UAAW,OAAM,aAAa,QAAQ;AAC3C,YAAM;AAAA,IACR;AACA,QAAI,YAAY,YAAa,QAAO;AACpC,QAAI,YAAY,QAAQ;AACtB,YAAM,SAAS,SAAS;AACxB,aAAO;AAAA,IACT;AAAA,EACF;AACF;",
+  "names": []
+}

package/dist/modules/data_sync/lib/sync-engine.js

@@ -3,8 +3,23 @@ import { refreshCoverageSnapshot } from "../../query_index/lib/coverage.js";
 import { emitDataSyncEvent } from "../events.js";
 import { getDataSyncAdapter, resolveProviderKey } from "./adapter-registry.js";
 import { SyncRunOwnershipConflictError } from "./sync-run-service.js";
+import { forEachBatch } from "./batch-stream.js";
 import { createLogger } from "@open-mercato/shared/lib/logger";
+import {
+  captureTelemetryTrace
+} from "@open-mercato/shared/lib/telemetry/runtime";
 const logger = createLogger("data_sync").child({ component: "sync-engine" });
+function runSpanAttributes(run, providerKey, scope) {
+  return {
+    "data_sync.run_id": run.id,
+    "data_sync.integration_id": run.integrationId,
+    "data_sync.provider_key": providerKey,
+    "data_sync.entity_type": run.entityType,
+    "data_sync.direction": run.direction,
+    "om.tenant_id": scope.tenantId,
+    "om.organization_id": scope.organizationId
+  };
+}
 function applyImportCounters(batch) {
   let createdCount = 0;
   let updatedCount = 0;
@@ -409,60 +424,84 @@ function createSyncEngine(deps) {
       let processedCount = await seedProcessedCount(run.progressJobId, scope);
       let totalCount = null;
       let committedBatches = activeRun.batchesCompleted ?? 0;
+      const runTrace = captureTelemetryTrace();
+      const spanAttributes = runSpanAttributes(run, providerKey, scope);
       try {
-        for await (const batch of withHeartbeat(
-          adapter.streamImport({
-            entityType: run.entityType,
-            cursor: run.cursor ?? void 0,
-            batchSize,
-            credentials,
-            mapping,
-            scope: { organizationId: scope.organizationId, tenantId: scope.tenantId },
-            runId: run.id,
-            parameters: run.parameters ?? {}
-          }),
-          makeHeartbeatTick(run.progressJobId, scope),
-          HEARTBEAT_TICK_MS
-        )) {
-          if (run.progressJobId && await progressService.isCancellationRequested(run.progressJobId, scope.tenantId, scope.organizationId)) {
-            await finalizeRun(run.id, "cancelled", scope, void 0, operationalTelemetry);
-            return;
-          }
-          const delta = applyImportCounters(batch);
-          const processedBatchCount = batch.processedCount ?? batch.items.length;
-          processedCount += processedBatchCount;
-          totalCount = batch.totalEstimate ?? totalCount;
-          await syncRunService.commitBatchProgress(
-            run.id,
-            {
-              ...delta,
-              batchesCompleted: 1
-            },
-            batch.cursor,
-            scope,
-            { expectedBatchesCompleted: committedBatches, persistSharedCursor }
-          );
-          committedBatches += 1;
-          await updateProgress(run.progressJobId, processedCount, totalCount, scope);
-          await refreshCoverageSnapshots(batch.refreshCoverageEntityTypes, scope);
-          await logImportItemFailures(run.id, run.integrationId, batch.items, scope);
-          await writeOperationalLog({
-            integrationId: run.integrationId,
-            runId: run.id,
-            level: "info",
-            message: batch.message?.trim().length ? batch.message.trim() : `Processed import batch ${batch.batchIndex}`,
-            scope,
-            enabled: operationalTelemetry,
-            payload: {
-              operationalStatus: "running",
-              summary: `Processed ${processedCount}${totalCount ? ` of ${totalCount}` : ""} rows so far.`,
-              processedCount,
-              batchSize: batch.items.length,
-              processedBatchCount,
-              cursor: batch.cursor
+        const streamResult = await forEachBatch(
+          withHeartbeat(
+            adapter.streamImport({
+              entityType: run.entityType,
+              cursor: run.cursor ?? void 0,
+              batchSize,
+              credentials,
+              mapping,
+              scope: { organizationId: scope.organizationId, tenantId: scope.tenantId },
+              runId: run.id,
+              parameters: run.parameters ?? {}
+            }),
+            makeHeartbeatTick(run.progressJobId, scope),
+            HEARTBEAT_TICK_MS
+          ),
+          {
+            spanName: "data_sync.import.batch",
+            drainSpanName: "data_sync.import.drain",
+            attributes: spanAttributes,
+            linkTo: runTrace
+          },
+          async (batch, span) => {
+            span.setAttributes({
+              "data_sync.batch_index": batch.batchIndex,
+              "data_sync.batch_size": batch.items.length
+            });
+            if (run.progressJobId && await progressService.isCancellationRequested(run.progressJobId, scope.tenantId, scope.organizationId)) {
+              await finalizeRun(run.id, "cancelled", scope, void 0, operationalTelemetry);
+              return "stop";
             }
-          });
-        }
+            const delta = applyImportCounters(batch);
+            const processedBatchCount = batch.processedCount ?? batch.items.length;
+            processedCount += processedBatchCount;
+            totalCount = batch.totalEstimate ?? totalCount;
+            span.setAttributes({
+              "data_sync.processed_count": processedBatchCount,
+              "data_sync.created_count": delta.createdCount,
+              "data_sync.updated_count": delta.updatedCount,
+              "data_sync.skipped_count": delta.skippedCount,
+              "data_sync.failed_count": delta.failedCount
+            });
+            await syncRunService.commitBatchProgress(
+              run.id,
+              {
+                ...delta,
+                batchesCompleted: 1
+              },
+              batch.cursor,
+              scope,
+              { expectedBatchesCompleted: committedBatches, persistSharedCursor }
+            );
+            committedBatches += 1;
+            await updateProgress(run.progressJobId, processedCount, totalCount, scope);
+            await refreshCoverageSnapshots(batch.refreshCoverageEntityTypes, scope);
+            await logImportItemFailures(run.id, run.integrationId, batch.items, scope);
+            await writeOperationalLog({
+              integrationId: run.integrationId,
+              runId: run.id,
+              level: "info",
+              message: batch.message?.trim().length ? batch.message.trim() : `Processed import batch ${batch.batchIndex}`,
+              scope,
+              enabled: operationalTelemetry,
+              payload: {
+                operationalStatus: "running",
+                summary: `Processed ${processedCount}${totalCount ? ` of ${totalCount}` : ""} rows so far.`,
+                processedCount,
+                batchSize: batch.items.length,
+                processedBatchCount,
+                cursor: batch.cursor
+              }
+            });
+            return "continue";
+          }
+        );
+        if (streamResult === "stopped") return;
       } catch (error) {
         if (error instanceof SyncRunOwnershipConflictError) {
           logger.warn("Yielding import run to a concurrent worker that already advanced it", {
@@ -557,59 +596,82 @@ function createSyncEngine(deps) {
       const mapping = await resolveMapping(adapter, run.entityType, scope);
       let processedCount = await seedProcessedCount(run.progressJobId, scope);
       let committedBatches = activeRun.batchesCompleted ?? 0;
+      const runTrace = captureTelemetryTrace();
+      const spanAttributes = runSpanAttributes(run, providerKey, scope);
       try {
-        for await (const batch of withHeartbeat(
-          adapter.streamExport({
-            entityType: run.entityType,
-            cursor: run.cursor ?? void 0,
-            batchSize,
-            credentials,
-            mapping,
-            scope: { organizationId: scope.organizationId, tenantId: scope.tenantId },
-            runId: run.id,
-            parameters: run.parameters ?? {}
-          }),
-          makeHeartbeatTick(run.progressJobId, scope),
-          HEARTBEAT_TICK_MS
-        )) {
-          if (run.progressJobId && await progressService.isCancellationRequested(run.progressJobId, scope.tenantId, scope.organizationId)) {
-            await finalizeRun(run.id, "cancelled", scope, void 0, operationalTelemetry);
-            return;
-          }
-          const delta = applyExportCounters(batch);
-          processedCount += delta.processedCount;
-          await syncRunService.commitBatchProgress(
-            run.id,
-            {
-              createdCount: 0,
-              updatedCount: delta.updatedCount,
-              skippedCount: delta.skippedCount,
-              failedCount: delta.failedCount,
-              batchesCompleted: 1
-            },
-            batch.cursor,
-            scope,
-            { expectedBatchesCompleted: committedBatches, persistSharedCursor }
-          );
-          committedBatches += 1;
-          await updateProgress(run.progressJobId, processedCount, null, scope);
-          await logExportItemFailures(run.id, run.integrationId, batch.results, scope);
-          await writeOperationalLog({
-            integrationId: run.integrationId,
-            runId: run.id,
-            level: "info",
-            message: `Processed export batch ${batch.batchIndex}`,
-            scope,
-            enabled: operationalTelemetry,
-            payload: {
-              operationalStatus: "running",
-              summary: `Processed ${processedCount} export items so far.`,
-              processedCount,
-              batchSize: batch.results.length,
-              cursor: batch.cursor
+        const streamResult = await forEachBatch(
+          withHeartbeat(
+            adapter.streamExport({
+              entityType: run.entityType,
+              cursor: run.cursor ?? void 0,
+              batchSize,
+              credentials,
+              mapping,
+              scope: { organizationId: scope.organizationId, tenantId: scope.tenantId },
+              runId: run.id,
+              parameters: run.parameters ?? {}
+            }),
+            makeHeartbeatTick(run.progressJobId, scope),
+            HEARTBEAT_TICK_MS
+          ),
+          {
+            spanName: "data_sync.export.batch",
+            drainSpanName: "data_sync.export.drain",
+            attributes: spanAttributes,
+            linkTo: runTrace
+          },
+          async (batch, span) => {
+            span.setAttributes({
+              "data_sync.batch_index": batch.batchIndex,
+              "data_sync.batch_size": batch.results.length
+            });
+            if (run.progressJobId && await progressService.isCancellationRequested(run.progressJobId, scope.tenantId, scope.organizationId)) {
+              await finalizeRun(run.id, "cancelled", scope, void 0, operationalTelemetry);
+              return "stop";
             }
-          });
-        }
+            const delta = applyExportCounters(batch);
+            processedCount += delta.processedCount;
+            span.setAttributes({
+              "data_sync.processed_count": delta.processedCount,
+              "data_sync.updated_count": delta.updatedCount,
+              "data_sync.skipped_count": delta.skippedCount,
+              "data_sync.failed_count": delta.failedCount
+            });
+            await syncRunService.commitBatchProgress(
+              run.id,
+              {
+                createdCount: 0,
+                updatedCount: delta.updatedCount,
+                skippedCount: delta.skippedCount,
+                failedCount: delta.failedCount,
+                batchesCompleted: 1
+              },
+              batch.cursor,
+              scope,
+              { expectedBatchesCompleted: committedBatches, persistSharedCursor }
+            );
+            committedBatches += 1;
+            await updateProgress(run.progressJobId, processedCount, null, scope);
+            await logExportItemFailures(run.id, run.integrationId, batch.results, scope);
+            await writeOperationalLog({
+              integrationId: run.integrationId,
+              runId: run.id,
+              level: "info",
+              message: `Processed export batch ${batch.batchIndex}`,
+              scope,
+              enabled: operationalTelemetry,
+              payload: {
+                operationalStatus: "running",
+                summary: `Processed ${processedCount} export items so far.`,
+                processedCount,
+                batchSize: batch.results.length,
+                cursor: batch.cursor
+              }
+            });
+            return "continue";
+          }
+        );
+        if (streamResult === "stopped") return;
       } catch (error) {
         if (error instanceof SyncRunOwnershipConflictError) {
           logger.warn("Yielding export run to a concurrent worker that already advanced it", {