@open-mercato/search 0.6.6-develop.6429.1.2fba7258d1 → 0.6.6-develop.6450.1.b493fb430c

package/dist/modules/search/api/embeddings/reindex/cancel/route.js

@@ -6,6 +6,15 @@ import { cancelReindexProgress } from "../../../../lib/reindex-progress.js";
 import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
 import { recordIndexerLog } from "@open-mercato/shared/lib/indexers/status-log";
 import { embeddingsReindexCancelOpenApi } from "../../../openapi.js";
+async function disposeContainer(container) {
+  try {
+    const disposable = container;
+    if (typeof disposable.dispose === "function") {
+      await disposable.dispose();
+    }
+  } catch {
+  }
+}
 const metadata = {
   POST: { requireAuth: true, requireFeatures: ["search.embeddings.manage"] }
 };
@@ -26,11 +35,21 @@ async function POST(req) {
   }
   let jobsRemoved = 0;
   if (queue) {
+    if (typeof queue.removeQueuedJobsByScope !== "function") {
+      await disposeContainer(container);
+      return NextResponse.json({
+        error: t("search.api.errors.scopedQueueCancelUnavailable", "Scoped queue cancellation is not available.")
+      }, { status: 503 });
+    }
     try {
-      const countsBefore = await queue.getJobCounts();
-      jobsRemoved = countsBefore.waiting + countsBefore.active;
-      await queue.clear();
+      const scope = typeof auth.orgId === "string" ? { tenantId: auth.tenantId, organizationId: auth.orgId, jobTypes: ["batch-index"] } : { tenantId: auth.tenantId, jobTypes: ["batch-index"] };
+      const result = await queue.removeQueuedJobsByScope(scope);
+      jobsRemoved = result.removed;
     } catch {
+      await disposeContainer(container);
+      return NextResponse.json({
+        error: t("search.api.errors.scopedQueueCancelFailed", "Failed to cancel queued reindex jobs.")
+      }, { status: 503 });
     }
   }
   await clearReindexLock(db, auth.tenantId, "vector", auth.orgId ?? null);
@@ -57,13 +76,7 @@ async function POST(req) {
     );
   } catch {
   }
-  try {
-    const disposable = container;
-    if (typeof disposable.dispose === "function") {
-      await disposable.dispose();
-    }
-  } catch {
-  }
+  await disposeContainer(container);
   return NextResponse.json({
     ok: true,
     jobsRemoved

package/dist/modules/search/api/embeddings/reindex/cancel/route.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/modules/search/api/embeddings/reindex/cancel/route.ts"],
-  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport type { Queue } from '@open-mercato/queue'\n\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport type { Kysely } from 'kysely'\nimport type { ProgressService } from '@open-mercato/core/modules/progress/lib/progressService'\nimport { clearReindexLock } from '../../../../lib/reindex-lock'\nimport { cancelReindexProgress } from '../../../../lib/reindex-progress'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { recordIndexerLog } from '@open-mercato/shared/lib/indexers/status-log'\nimport { embeddingsReindexCancelOpenApi } from '../../../openapi'\n\nexport const metadata = {\n  POST: { requireAuth: true, requireFeatures: ['search.embeddings.manage'] },\n}\n\nexport async function POST(req: Request) {\n  const { t } = await resolveTranslations()\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId) {\n    return NextResponse.json({ error: t('api.errors.unauthorized', 'Unauthorized') }, { status: 401 })\n  }\n\n  const container = await createRequestContainer()\n  const em = container.resolve('em') as EntityManager\n  const progressService = container.resolve('progressService') as ProgressService\n  const db = (em as unknown as { getKysely: () => Kysely<any> }).getKysely()\n\n  let queue: Queue | undefined\n  try {\n    queue = container.resolve<Queue>('vectorIndexQueue')\n  } catch {\n    // Queue not available - just clear the lock\n  }\n\n  let jobsRemoved = 0\n  if (queue) {\n    try {\n      const countsBefore = await queue.getJobCounts()\n      jobsRemoved = countsBefore.waiting + countsBefore.active\n      await queue.clear()\n    } catch {\n      // Queue clear failed - continue to clear lock\n    }\n  }\n\n  await clearReindexLock(db, auth.tenantId, 'vector', auth.orgId ?? null)\n  await cancelReindexProgress({\n    em,\n    progressService,\n    type: 'vector',\n    tenantId: auth.tenantId,\n    organizationId: auth.orgId ?? null,\n    userId: auth.sub ?? null,\n  })\n\n  // Log the cancellation\n  try {\n    const em = container.resolve('em')\n    await recordIndexerLog(\n      { em },\n      {\n        source: 'vector',\n        handler: 'api:search.embeddings.reindex.cancel',\n        message: `Cancelled vector reindex operation (${jobsRemoved} jobs removed)`,\n        tenantId: auth.tenantId,\n        organizationId: auth.orgId ?? null,\n        details: { jobsRemoved },\n      },\n    )\n  } catch {\n    // Logging failure should not fail the cancel operation\n  }\n\n  try {\n    const disposable = container as unknown as { dispose?: () => Promise<void> }\n    if (typeof disposable.dispose === 'function') {\n      await disposable.dispose()\n    }\n  } catch {\n    // Ignore disposal errors\n  }\n\n  return NextResponse.json({\n    ok: true,\n    jobsRemoved,\n  })\n}\n\nexport const openApi = embeddingsReindexCancelOpenApi\n"],
-  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,8BAA8B;AACvC,SAAS,0BAA0B;AAMnC,SAAS,wBAAwB;AACjC,SAAS,6BAA6B;AACtC,SAAS,2BAA2B;AACpC,SAAS,wBAAwB;AACjC,SAAS,sCAAsC;AAExC,MAAM,WAAW;AAAA,EACtB,MAAM,EAAE,aAAa,MAAM,iBAAiB,CAAC,0BAA0B,EAAE;AAC3E;AAEA,eAAsB,KAAK,KAAc;AACvC,QAAM,EAAE,EAAE,IAAI,MAAM,oBAAoB;AACxC,QAAM,OAAO,MAAM,mBAAmB,GAAG;AACzC,MAAI,CAAC,MAAM,UAAU;AACnB,WAAO,aAAa,KAAK,EAAE,OAAO,EAAE,2BAA2B,cAAc,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACnG;AAEA,QAAM,YAAY,MAAM,uBAAuB;AAC/C,QAAM,KAAK,UAAU,QAAQ,IAAI;AACjC,QAAM,kBAAkB,UAAU,QAAQ,iBAAiB;AAC3D,QAAM,KAAM,GAAmD,UAAU;AAEzE,MAAI;AACJ,MAAI;AACF,YAAQ,UAAU,QAAe,kBAAkB;AAAA,EACrD,QAAQ;AAAA,EAER;AAEA,MAAI,cAAc;AAClB,MAAI,OAAO;AACT,QAAI;AACF,YAAM,eAAe,MAAM,MAAM,aAAa;AAC9C,oBAAc,aAAa,UAAU,aAAa;AAClD,YAAM,MAAM,MAAM;AAAA,IACpB,QAAQ;AAAA,IAER;AAAA,EACF;AAEA,QAAM,iBAAiB,IAAI,KAAK,UAAU,UAAU,KAAK,SAAS,IAAI;AACtE,QAAM,sBAAsB;AAAA,IAC1B;AAAA,IACA;AAAA,IACA,MAAM;AAAA,IACN,UAAU,KAAK;AAAA,IACf,gBAAgB,KAAK,SAAS;AAAA,IAC9B,QAAQ,KAAK,OAAO;AAAA,EACtB,CAAC;AAGD,MAAI;AACF,UAAMA,MAAK,UAAU,QAAQ,IAAI;AACjC,UAAM;AAAA,MACJ,EAAE,IAAAA,IAAG;AAAA,MACL;AAAA,QACE,QAAQ;AAAA,QACR,SAAS;AAAA,QACT,SAAS,uCAAuC,WAAW;AAAA,QAC3D,UAAU,KAAK;AAAA,QACf,gBAAgB,KAAK,SAAS;AAAA,QAC9B,SAAS,EAAE,YAAY;AAAA,MACzB;AAAA,IACF;AAAA,EACF,QAAQ;AAAA,EAER;AAEA,MAAI;AACF,UAAM,aAAa;AACnB,QAAI,OAAO,WAAW,YAAY,YAAY;AAC5C,YAAM,WAAW,QAAQ;AAAA,IAC3B;AAAA,EACF,QAAQ;AAAA,EAER;AAEA,SAAO,aAAa,KAAK;AAAA,IACvB,IAAI;AAAA,IACJ;AAAA,EACF,CAAC;AACH;AAEO,MAAM,UAAU;",
+  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport type { Queue } from '@open-mercato/queue'\n\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport type { Kysely } from 'kysely'\nimport type { ProgressService } from '@open-mercato/core/modules/progress/lib/progressService'\nimport { clearReindexLock } from '../../../../lib/reindex-lock'\nimport { cancelReindexProgress } from '../../../../lib/reindex-progress'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { recordIndexerLog } from '@open-mercato/shared/lib/indexers/status-log'\nimport { embeddingsReindexCancelOpenApi } from '../../../openapi'\n\nasync function disposeContainer(container: unknown): Promise<void> {\n  try {\n    const disposable = container as { dispose?: () => Promise<void> }\n    if (typeof disposable.dispose === 'function') {\n      await disposable.dispose()\n    }\n  } catch {\n    // Ignore disposal errors\n  }\n}\n\nexport const metadata = {\n  POST: { requireAuth: true, requireFeatures: ['search.embeddings.manage'] },\n}\n\nexport async function POST(req: Request) {\n  const { t } = await resolveTranslations()\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId) {\n    return NextResponse.json({ error: t('api.errors.unauthorized', 'Unauthorized') }, { status: 401 })\n  }\n\n  const container = await createRequestContainer()\n  const em = container.resolve('em') as EntityManager\n  const progressService = container.resolve('progressService') as ProgressService\n  const db = (em as unknown as { getKysely: () => Kysely<any> }).getKysely()\n\n  let queue: Queue | undefined\n  try {\n    queue = container.resolve<Queue>('vectorIndexQueue')\n  } catch {\n    // Queue not available - just clear the lock\n  }\n\n  let jobsRemoved = 0\n  if (queue) {\n    if (typeof queue.removeQueuedJobsByScope !== 'function') {\n      await disposeContainer(container)\n      return NextResponse.json({\n        error: t('search.api.errors.scopedQueueCancelUnavailable', 'Scoped queue cancellation is not available.'),\n      }, { status: 503 })\n    }\n\n    try {\n      const scope = typeof auth.orgId === 'string'\n        ? { tenantId: auth.tenantId, organizationId: auth.orgId, jobTypes: ['batch-index'] }\n        : { tenantId: auth.tenantId, jobTypes: ['batch-index'] }\n      const result = await queue.removeQueuedJobsByScope(scope)\n      jobsRemoved = result.removed\n    } catch {\n      await disposeContainer(container)\n      return NextResponse.json({\n        error: t('search.api.errors.scopedQueueCancelFailed', 'Failed to cancel queued reindex jobs.'),\n      }, { status: 503 })\n    }\n  }\n\n  await clearReindexLock(db, auth.tenantId, 'vector', auth.orgId ?? null)\n  await cancelReindexProgress({\n    em,\n    progressService,\n    type: 'vector',\n    tenantId: auth.tenantId,\n    organizationId: auth.orgId ?? null,\n    userId: auth.sub ?? null,\n  })\n\n  // Log the cancellation\n  try {\n    const em = container.resolve('em')\n    await recordIndexerLog(\n      { em },\n      {\n        source: 'vector',\n        handler: 'api:search.embeddings.reindex.cancel',\n        message: `Cancelled vector reindex operation (${jobsRemoved} jobs removed)`,\n        tenantId: auth.tenantId,\n        organizationId: auth.orgId ?? null,\n        details: { jobsRemoved },\n      },\n    )\n  } catch {\n    // Logging failure should not fail the cancel operation\n  }\n\n  await disposeContainer(container)\n\n  return NextResponse.json({\n    ok: true,\n    jobsRemoved,\n  })\n}\n\nexport const openApi = embeddingsReindexCancelOpenApi\n"],
+  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,8BAA8B;AACvC,SAAS,0BAA0B;AAMnC,SAAS,wBAAwB;AACjC,SAAS,6BAA6B;AACtC,SAAS,2BAA2B;AACpC,SAAS,wBAAwB;AACjC,SAAS,sCAAsC;AAE/C,eAAe,iBAAiB,WAAmC;AACjE,MAAI;AACF,UAAM,aAAa;AACnB,QAAI,OAAO,WAAW,YAAY,YAAY;AAC5C,YAAM,WAAW,QAAQ;AAAA,IAC3B;AAAA,EACF,QAAQ;AAAA,EAER;AACF;AAEO,MAAM,WAAW;AAAA,EACtB,MAAM,EAAE,aAAa,MAAM,iBAAiB,CAAC,0BAA0B,EAAE;AAC3E;AAEA,eAAsB,KAAK,KAAc;AACvC,QAAM,EAAE,EAAE,IAAI,MAAM,oBAAoB;AACxC,QAAM,OAAO,MAAM,mBAAmB,GAAG;AACzC,MAAI,CAAC,MAAM,UAAU;AACnB,WAAO,aAAa,KAAK,EAAE,OAAO,EAAE,2BAA2B,cAAc,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACnG;AAEA,QAAM,YAAY,MAAM,uBAAuB;AAC/C,QAAM,KAAK,UAAU,QAAQ,IAAI;AACjC,QAAM,kBAAkB,UAAU,QAAQ,iBAAiB;AAC3D,QAAM,KAAM,GAAmD,UAAU;AAEzE,MAAI;AACJ,MAAI;AACF,YAAQ,UAAU,QAAe,kBAAkB;AAAA,EACrD,QAAQ;AAAA,EAER;AAEA,MAAI,cAAc;AAClB,MAAI,OAAO;AACT,QAAI,OAAO,MAAM,4BAA4B,YAAY;AACvD,YAAM,iBAAiB,SAAS;AAChC,aAAO,aAAa,KAAK;AAAA,QACvB,OAAO,EAAE,kDAAkD,6CAA6C;AAAA,MAC1G,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,IACpB;AAEA,QAAI;AACF,YAAM,QAAQ,OAAO,KAAK,UAAU,WAChC,EAAE,UAAU,KAAK,UAAU,gBAAgB,KAAK,OAAO,UAAU,CAAC,aAAa,EAAE,IACjF,EAAE,UAAU,KAAK,UAAU,UAAU,CAAC,aAAa,EAAE;AACzD,YAAM,SAAS,MAAM,MAAM,wBAAwB,KAAK;AACxD,oBAAc,OAAO;AAAA,IACvB,QAAQ;AACN,YAAM,iBAAiB,SAAS;AAChC,aAAO,aAAa,KAAK;AAAA,QACvB,OAAO,EAAE,6CAA6C,uCAAuC;AAAA,MAC/F,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,IACpB;AAAA,EACF;AAEA,QAAM,iBAAiB,IAAI,KAAK,UAAU,UAAU,KAAK,SAAS,IAAI;AACtE,QAAM,sBAAsB;AAAA,IAC1B;AAAA,IACA;AAAA,IACA,MAAM;AAAA,IACN,UAAU,KAAK;AAAA,IACf,gBAAgB,KAAK,SAAS;AAAA,IAC9B,QAAQ,KAAK,OAAO;AAAA,EACtB,CAAC;AAGD,MAAI;AACF,UAAMA,MAAK,UAAU,QAAQ,IAAI;AACjC,UAAM;AAAA,MACJ,EAAE,IAAAA,IAAG;AAAA,MACL;AAAA,QACE,QAAQ;AAAA,QACR,SAAS;AAAA,QACT,SAAS,uCAAuC,WAAW;AAAA,QAC3D,UAAU,KAAK;AAAA,QACf,gBAAgB,KAAK,SAAS;AAAA,QAC9B,SAAS,EAAE,YAAY;AAAA,MACzB;AAAA,IACF;AAAA,EACF,QAAQ;AAAA,EAER;AAEA,QAAM,iBAAiB,SAAS;AAEhC,SAAO,aAAa,KAAK;AAAA,IACvB,IAAI;AAAA,IACJ;AAAA,EACF,CAAC;AACH;AAEO,MAAM,UAAU;",
   "names": ["em"]
 }

package/dist/modules/search/api/reindex/cancel/route.js

@@ -6,6 +6,15 @@ import { cancelReindexProgress } from "../../../lib/reindex-progress.js";
 import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
 import { recordIndexerLog } from "@open-mercato/shared/lib/indexers/status-log";
 import { reindexCancelOpenApi } from "../../openapi.js";
+async function disposeContainer(container) {
+  try {
+    const disposable = container;
+    if (typeof disposable.dispose === "function") {
+      await disposable.dispose();
+    }
+  } catch {
+  }
+}
 const metadata = {
   POST: { requireAuth: true, requireFeatures: ["search.reindex"] }
 };
@@ -26,11 +35,21 @@ async function POST(req) {
   }
   let jobsRemoved = 0;
   if (queue) {
+    if (typeof queue.removeQueuedJobsByScope !== "function") {
+      await disposeContainer(container);
+      return NextResponse.json({
+        error: t("search.api.errors.scopedQueueCancelUnavailable", "Scoped queue cancellation is not available.")
+      }, { status: 503 });
+    }
     try {
-      const countsBefore = await queue.getJobCounts();
-      jobsRemoved = countsBefore.waiting + countsBefore.active;
-      await queue.clear();
+      const scope = typeof auth.orgId === "string" ? { tenantId: auth.tenantId, organizationId: auth.orgId, jobTypes: ["batch-index"] } : { tenantId: auth.tenantId, jobTypes: ["batch-index"] };
+      const result = await queue.removeQueuedJobsByScope(scope);
+      jobsRemoved = result.removed;
     } catch {
+      await disposeContainer(container);
+      return NextResponse.json({
+        error: t("search.api.errors.scopedQueueCancelFailed", "Failed to cancel queued reindex jobs.")
+      }, { status: 503 });
     }
   }
   await clearReindexLock(db, auth.tenantId, "fulltext", auth.orgId ?? null);
@@ -57,13 +76,7 @@ async function POST(req) {
     );
   } catch {
   }
-  try {
-    const disposable = container;
-    if (typeof disposable.dispose === "function") {
-      await disposable.dispose();
-    }
-  } catch {
-  }
+  await disposeContainer(container);
   return NextResponse.json({
     ok: true,
     jobsRemoved

package/dist/modules/search/api/reindex/cancel/route.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/modules/search/api/reindex/cancel/route.ts"],
-  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport type { Queue } from '@open-mercato/queue'\n\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport type { Kysely } from 'kysely'\nimport type { ProgressService } from '@open-mercato/core/modules/progress/lib/progressService'\nimport { clearReindexLock } from '../../../lib/reindex-lock'\nimport { cancelReindexProgress } from '../../../lib/reindex-progress'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { recordIndexerLog } from '@open-mercato/shared/lib/indexers/status-log'\nimport { reindexCancelOpenApi } from '../../openapi'\n\nexport const metadata = {\n  POST: { requireAuth: true, requireFeatures: ['search.reindex'] },\n}\n\nexport async function POST(req: Request) {\n  const { t } = await resolveTranslations()\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId) {\n    return NextResponse.json({ error: t('api.errors.unauthorized', 'Unauthorized') }, { status: 401 })\n  }\n\n  const container = await createRequestContainer()\n  const em = container.resolve('em') as EntityManager\n  const progressService = container.resolve('progressService') as ProgressService\n  const db = (em as unknown as { getKysely: () => Kysely<any> }).getKysely()\n\n  let queue: Queue | undefined\n  try {\n    queue = container.resolve<Queue>('fulltextIndexQueue')\n  } catch {\n    // Queue not available - just clear the lock\n  }\n\n  let jobsRemoved = 0\n  if (queue) {\n    try {\n      const countsBefore = await queue.getJobCounts()\n      jobsRemoved = countsBefore.waiting + countsBefore.active\n      await queue.clear()\n    } catch {\n      // Queue clear failed - continue to clear lock\n    }\n  }\n\n  await clearReindexLock(db, auth.tenantId, 'fulltext', auth.orgId ?? null)\n  await cancelReindexProgress({\n    em,\n    progressService,\n    type: 'fulltext',\n    tenantId: auth.tenantId,\n    organizationId: auth.orgId ?? null,\n    userId: auth.sub ?? null,\n  })\n\n  // Log the cancellation\n  try {\n    const em = container.resolve('em')\n    await recordIndexerLog(\n      { em },\n      {\n        source: 'fulltext',\n        handler: 'api:search.reindex.cancel',\n        message: `Cancelled fulltext reindex operation (${jobsRemoved} jobs removed)`,\n        tenantId: auth.tenantId,\n        organizationId: auth.orgId ?? null,\n        details: { jobsRemoved },\n      },\n    )\n  } catch {\n    // Logging failure should not fail the cancel operation\n  }\n\n  try {\n    const disposable = container as unknown as { dispose?: () => Promise<void> }\n    if (typeof disposable.dispose === 'function') {\n      await disposable.dispose()\n    }\n  } catch {\n    // Ignore disposal errors\n  }\n\n  return NextResponse.json({\n    ok: true,\n    jobsRemoved,\n  })\n}\n\nexport const openApi = reindexCancelOpenApi\n"],
-  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,8BAA8B;AACvC,SAAS,0BAA0B;AAMnC,SAAS,wBAAwB;AACjC,SAAS,6BAA6B;AACtC,SAAS,2BAA2B;AACpC,SAAS,wBAAwB;AACjC,SAAS,4BAA4B;AAE9B,MAAM,WAAW;AAAA,EACtB,MAAM,EAAE,aAAa,MAAM,iBAAiB,CAAC,gBAAgB,EAAE;AACjE;AAEA,eAAsB,KAAK,KAAc;AACvC,QAAM,EAAE,EAAE,IAAI,MAAM,oBAAoB;AACxC,QAAM,OAAO,MAAM,mBAAmB,GAAG;AACzC,MAAI,CAAC,MAAM,UAAU;AACnB,WAAO,aAAa,KAAK,EAAE,OAAO,EAAE,2BAA2B,cAAc,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACnG;AAEA,QAAM,YAAY,MAAM,uBAAuB;AAC/C,QAAM,KAAK,UAAU,QAAQ,IAAI;AACjC,QAAM,kBAAkB,UAAU,QAAQ,iBAAiB;AAC3D,QAAM,KAAM,GAAmD,UAAU;AAEzE,MAAI;AACJ,MAAI;AACF,YAAQ,UAAU,QAAe,oBAAoB;AAAA,EACvD,QAAQ;AAAA,EAER;AAEA,MAAI,cAAc;AAClB,MAAI,OAAO;AACT,QAAI;AACF,YAAM,eAAe,MAAM,MAAM,aAAa;AAC9C,oBAAc,aAAa,UAAU,aAAa;AAClD,YAAM,MAAM,MAAM;AAAA,IACpB,QAAQ;AAAA,IAER;AAAA,EACF;AAEA,QAAM,iBAAiB,IAAI,KAAK,UAAU,YAAY,KAAK,SAAS,IAAI;AACxE,QAAM,sBAAsB;AAAA,IAC1B;AAAA,IACA;AAAA,IACA,MAAM;AAAA,IACN,UAAU,KAAK;AAAA,IACf,gBAAgB,KAAK,SAAS;AAAA,IAC9B,QAAQ,KAAK,OAAO;AAAA,EACtB,CAAC;AAGD,MAAI;AACF,UAAMA,MAAK,UAAU,QAAQ,IAAI;AACjC,UAAM;AAAA,MACJ,EAAE,IAAAA,IAAG;AAAA,MACL;AAAA,QACE,QAAQ;AAAA,QACR,SAAS;AAAA,QACT,SAAS,yCAAyC,WAAW;AAAA,QAC7D,UAAU,KAAK;AAAA,QACf,gBAAgB,KAAK,SAAS;AAAA,QAC9B,SAAS,EAAE,YAAY;AAAA,MACzB;AAAA,IACF;AAAA,EACF,QAAQ;AAAA,EAER;AAEA,MAAI;AACF,UAAM,aAAa;AACnB,QAAI,OAAO,WAAW,YAAY,YAAY;AAC5C,YAAM,WAAW,QAAQ;AAAA,IAC3B;AAAA,EACF,QAAQ;AAAA,EAER;AAEA,SAAO,aAAa,KAAK;AAAA,IACvB,IAAI;AAAA,IACJ;AAAA,EACF,CAAC;AACH;AAEO,MAAM,UAAU;",
+  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport type { Queue } from '@open-mercato/queue'\n\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport type { Kysely } from 'kysely'\nimport type { ProgressService } from '@open-mercato/core/modules/progress/lib/progressService'\nimport { clearReindexLock } from '../../../lib/reindex-lock'\nimport { cancelReindexProgress } from '../../../lib/reindex-progress'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { recordIndexerLog } from '@open-mercato/shared/lib/indexers/status-log'\nimport { reindexCancelOpenApi } from '../../openapi'\n\nasync function disposeContainer(container: unknown): Promise<void> {\n  try {\n    const disposable = container as { dispose?: () => Promise<void> }\n    if (typeof disposable.dispose === 'function') {\n      await disposable.dispose()\n    }\n  } catch {\n    // Ignore disposal errors\n  }\n}\n\nexport const metadata = {\n  POST: { requireAuth: true, requireFeatures: ['search.reindex'] },\n}\n\nexport async function POST(req: Request) {\n  const { t } = await resolveTranslations()\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId) {\n    return NextResponse.json({ error: t('api.errors.unauthorized', 'Unauthorized') }, { status: 401 })\n  }\n\n  const container = await createRequestContainer()\n  const em = container.resolve('em') as EntityManager\n  const progressService = container.resolve('progressService') as ProgressService\n  const db = (em as unknown as { getKysely: () => Kysely<any> }).getKysely()\n\n  let queue: Queue | undefined\n  try {\n    queue = container.resolve<Queue>('fulltextIndexQueue')\n  } catch {\n    // Queue not available - just clear the lock\n  }\n\n  let jobsRemoved = 0\n  if (queue) {\n    if (typeof queue.removeQueuedJobsByScope !== 'function') {\n      await disposeContainer(container)\n      return NextResponse.json({\n        error: t('search.api.errors.scopedQueueCancelUnavailable', 'Scoped queue cancellation is not available.'),\n      }, { status: 503 })\n    }\n\n    try {\n      const scope = typeof auth.orgId === 'string'\n        ? { tenantId: auth.tenantId, organizationId: auth.orgId, jobTypes: ['batch-index'] }\n        : { tenantId: auth.tenantId, jobTypes: ['batch-index'] }\n      const result = await queue.removeQueuedJobsByScope(scope)\n      jobsRemoved = result.removed\n    } catch {\n      await disposeContainer(container)\n      return NextResponse.json({\n        error: t('search.api.errors.scopedQueueCancelFailed', 'Failed to cancel queued reindex jobs.'),\n      }, { status: 503 })\n    }\n  }\n\n  await clearReindexLock(db, auth.tenantId, 'fulltext', auth.orgId ?? null)\n  await cancelReindexProgress({\n    em,\n    progressService,\n    type: 'fulltext',\n    tenantId: auth.tenantId,\n    organizationId: auth.orgId ?? null,\n    userId: auth.sub ?? null,\n  })\n\n  // Log the cancellation\n  try {\n    const em = container.resolve('em')\n    await recordIndexerLog(\n      { em },\n      {\n        source: 'fulltext',\n        handler: 'api:search.reindex.cancel',\n        message: `Cancelled fulltext reindex operation (${jobsRemoved} jobs removed)`,\n        tenantId: auth.tenantId,\n        organizationId: auth.orgId ?? null,\n        details: { jobsRemoved },\n      },\n    )\n  } catch {\n    // Logging failure should not fail the cancel operation\n  }\n\n  await disposeContainer(container)\n\n  return NextResponse.json({\n    ok: true,\n    jobsRemoved,\n  })\n}\n\nexport const openApi = reindexCancelOpenApi\n"],
+  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,8BAA8B;AACvC,SAAS,0BAA0B;AAMnC,SAAS,wBAAwB;AACjC,SAAS,6BAA6B;AACtC,SAAS,2BAA2B;AACpC,SAAS,wBAAwB;AACjC,SAAS,4BAA4B;AAErC,eAAe,iBAAiB,WAAmC;AACjE,MAAI;AACF,UAAM,aAAa;AACnB,QAAI,OAAO,WAAW,YAAY,YAAY;AAC5C,YAAM,WAAW,QAAQ;AAAA,IAC3B;AAAA,EACF,QAAQ;AAAA,EAER;AACF;AAEO,MAAM,WAAW;AAAA,EACtB,MAAM,EAAE,aAAa,MAAM,iBAAiB,CAAC,gBAAgB,EAAE;AACjE;AAEA,eAAsB,KAAK,KAAc;AACvC,QAAM,EAAE,EAAE,IAAI,MAAM,oBAAoB;AACxC,QAAM,OAAO,MAAM,mBAAmB,GAAG;AACzC,MAAI,CAAC,MAAM,UAAU;AACnB,WAAO,aAAa,KAAK,EAAE,OAAO,EAAE,2BAA2B,cAAc,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACnG;AAEA,QAAM,YAAY,MAAM,uBAAuB;AAC/C,QAAM,KAAK,UAAU,QAAQ,IAAI;AACjC,QAAM,kBAAkB,UAAU,QAAQ,iBAAiB;AAC3D,QAAM,KAAM,GAAmD,UAAU;AAEzE,MAAI;AACJ,MAAI;AACF,YAAQ,UAAU,QAAe,oBAAoB;AAAA,EACvD,QAAQ;AAAA,EAER;AAEA,MAAI,cAAc;AAClB,MAAI,OAAO;AACT,QAAI,OAAO,MAAM,4BAA4B,YAAY;AACvD,YAAM,iBAAiB,SAAS;AAChC,aAAO,aAAa,KAAK;AAAA,QACvB,OAAO,EAAE,kDAAkD,6CAA6C;AAAA,MAC1G,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,IACpB;AAEA,QAAI;AACF,YAAM,QAAQ,OAAO,KAAK,UAAU,WAChC,EAAE,UAAU,KAAK,UAAU,gBAAgB,KAAK,OAAO,UAAU,CAAC,aAAa,EAAE,IACjF,EAAE,UAAU,KAAK,UAAU,UAAU,CAAC,aAAa,EAAE;AACzD,YAAM,SAAS,MAAM,MAAM,wBAAwB,KAAK;AACxD,oBAAc,OAAO;AAAA,IACvB,QAAQ;AACN,YAAM,iBAAiB,SAAS;AAChC,aAAO,aAAa,KAAK;AAAA,QACvB,OAAO,EAAE,6CAA6C,uCAAuC;AAAA,MAC/F,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,IACpB;AAAA,EACF;AAEA,QAAM,iBAAiB,IAAI,KAAK,UAAU,YAAY,KAAK,SAAS,IAAI;AACxE,QAAM,sBAAsB;AAAA,IAC1B;AAAA,IACA;AAAA,IACA,MAAM;AAAA,IACN,UAAU,KAAK;AAAA,IACf,gBAAgB,KAAK,SAAS;AAAA,IAC9B,QAAQ,KAAK,OAAO;AAAA,EACtB,CAAC;AAGD,MAAI;AACF,UAAMA,MAAK,UAAU,QAAQ,IAAI;AACjC,UAAM;AAAA,MACJ,EAAE,IAAAA,IAAG;AAAA,MACL;AAAA,QACE,QAAQ;AAAA,QACR,SAAS;AAAA,QACT,SAAS,yCAAyC,WAAW;AAAA,QAC7D,UAAU,KAAK;AAAA,QACf,gBAAgB,KAAK,SAAS;AAAA,QAC9B,SAAS,EAAE,YAAY;AAAA,MACzB;AAAA,IACF;AAAA,EACF,QAAQ;AAAA,EAER;AAEA,QAAM,iBAAiB,SAAS;AAEhC,SAAO,aAAa,KAAK;AAAA,IACvB,IAAI;AAAA,IACJ;AAAA,EACF,CAAC;AACH;AAEO,MAAM,UAAU;",
   "names": ["em"]
 }

package/dist/modules/search/i18n/de.json

@@ -17,6 +17,8 @@
   "search.api.errors.recreateFailed": "Fehler beim Neuerstellen der Vektortabelle mit neuer Dimension.",
   "search.api.errors.reindexFailed": "Neuindizierung fehlgeschlagen.",
   "search.api.errors.reindexInProgress": "Eine Neuindizierung wird bereits durchgeführt.",
+  "search.api.errors.scopedQueueCancelFailed": "Die eingereihten Reindexierungsaufträge konnten nicht abgebrochen werden.",
+  "search.api.errors.scopedQueueCancelUnavailable": "Die bereichsbezogene Warteschlangenstornierung ist nicht verfügbar.",
   "search.api.errors.searchFailed": "Suchvorgang fehlgeschlagen.",
   "search.api.errors.serviceUnavailable": "Suchdienst ist nicht verfügbar.",
   "search.api.errors.strategyUnavailable": "Angeforderte Suchstrategie ist nicht verfügbar.",

package/dist/modules/search/i18n/en.json

@@ -17,6 +17,8 @@
   "search.api.errors.recreateFailed": "Failed to recreate vector table with new dimension.",
   "search.api.errors.reindexFailed": "Reindex operation failed.",
   "search.api.errors.reindexInProgress": "A reindex is already in progress.",
+  "search.api.errors.scopedQueueCancelFailed": "Failed to cancel queued reindex jobs.",
+  "search.api.errors.scopedQueueCancelUnavailable": "Scoped queue cancellation is not available.",
   "search.api.errors.searchFailed": "Search operation failed.",
   "search.api.errors.serviceUnavailable": "Search service is unavailable.",
   "search.api.errors.strategyUnavailable": "Requested search strategy is unavailable.",

package/dist/modules/search/i18n/es.json

@@ -17,6 +17,8 @@
   "search.api.errors.recreateFailed": "No se pudo recrear la tabla vectorial con la nueva dimensión.",
   "search.api.errors.reindexFailed": "La operación de reindexación falló.",
   "search.api.errors.reindexInProgress": "Ya hay una reindexación en progreso.",
+  "search.api.errors.scopedQueueCancelFailed": "No se pudieron cancelar los trabajos de reindexación en cola.",
+  "search.api.errors.scopedQueueCancelUnavailable": "La cancelación de cola con alcance no está disponible.",
   "search.api.errors.searchFailed": "La operación de búsqueda falló.",
   "search.api.errors.serviceUnavailable": "El servicio de búsqueda no está disponible.",
   "search.api.errors.strategyUnavailable": "La estrategia de búsqueda solicitada no está disponible.",

package/dist/modules/search/i18n/pl.json

@@ -17,6 +17,8 @@
   "search.api.errors.recreateFailed": "Nie udało się odtworzyć tabeli wektorowej z nowym wymiarem.",
   "search.api.errors.reindexFailed": "Operacja reindeksacji nie powiodła się.",
   "search.api.errors.reindexInProgress": "Reindeksacja jest już w toku.",
+  "search.api.errors.scopedQueueCancelFailed": "Nie udało się anulować zakolejkowanych zadań reindeksacji.",
+  "search.api.errors.scopedQueueCancelUnavailable": "Zakresowe anulowanie kolejki jest niedostępne.",
   "search.api.errors.searchFailed": "Operacja wyszukiwania nie powiodła się.",
   "search.api.errors.serviceUnavailable": "Usługa wyszukiwania jest niedostępna.",
   "search.api.errors.strategyUnavailable": "Żądana strategia wyszukiwania jest niedostępna.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/search",
-  "version": "0.6.6-develop.6429.1.2fba7258d1",
+  "version": "0.6.6-develop.6450.1.b493fb430c",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -127,9 +127,9 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/core": "0.6.6-develop.6429.1.2fba7258d1",
-    "@open-mercato/queue": "0.6.6-develop.6429.1.2fba7258d1",
-    "@open-mercato/shared": "0.6.6-develop.6429.1.2fba7258d1"
+    "@open-mercato/core": "0.6.6-develop.6450.1.b493fb430c",
+    "@open-mercato/queue": "0.6.6-develop.6450.1.b493fb430c",
+    "@open-mercato/shared": "0.6.6-develop.6450.1.b493fb430c"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",

package/src/modules/search/api/__tests__/embeddings-reindex.routes.test.ts

@@ -35,13 +35,16 @@ jest.mock('../../lib/reindex-lock', () => ({
 const mockEnsureReindexProgressJob = jest.fn().mockResolvedValue('progress-1')
 const mockCompleteReindexProgress = jest.fn().mockResolvedValue(undefined)
 const mockFailReindexProgress = jest.fn().mockResolvedValue(undefined)
+const mockCancelReindexProgress = jest.fn().mockResolvedValue(undefined)
 jest.mock('../../lib/reindex-progress', () => ({
   ensureReindexProgressJob: (...args: unknown[]) => mockEnsureReindexProgressJob(...args),
   completeReindexProgress: (...args: unknown[]) => mockCompleteReindexProgress(...args),
   failReindexProgress: (...args: unknown[]) => mockFailReindexProgress(...args),
+  cancelReindexProgress: (...args: unknown[]) => mockCancelReindexProgress(...args),
 }))
 
 import { POST as vectorReindexPost } from '../embeddings/reindex/route'
+import { POST as vectorReindexCancelPost } from '../embeddings/reindex/cancel/route'
 
 describe('POST /api/search/embeddings/reindex', () => {
   beforeEach(() => {
@@ -127,4 +130,108 @@ describe('POST /api/search/embeddings/reindex', () => {
     expect(mockClearReindexLock).toHaveBeenCalledWith(mockDb, 'tenant-123', 'vector', 'org-456')
     expect(mockContainer.dispose).toHaveBeenCalled()
   })
+
+  test('cancel removes only current tenant and organization vector queue jobs', async () => {
+    mockGetAuthFromRequest.mockResolvedValue({
+      tenantId: 'tenant-123',
+      orgId: 'org-456',
+      sub: 'user-789',
+    })
+
+    const mockDb = { db: true }
+    const mockEm = { getKysely: jest.fn(() => mockDb) }
+    const mockProgressService = { progress: true }
+    const mockQueue = {
+      getJobCounts: jest.fn().mockResolvedValue({ waiting: 3, active: 1, completed: 0, failed: 0 }),
+      clear: jest.fn().mockResolvedValue({ removed: 4 }),
+      removeQueuedJobsByScope: jest.fn().mockResolvedValue({ removed: 2 }),
+    }
+    const mockContainer = {
+      resolve: jest.fn((name: string) => {
+        if (name === 'em') return mockEm
+        if (name === 'progressService') return mockProgressService
+        if (name === 'vectorIndexQueue') return mockQueue
+        throw new Error(`Unknown service: ${name}`)
+      }),
+      dispose: jest.fn().mockResolvedValue(undefined),
+    }
+    mockCreateRequestContainer.mockResolvedValue(mockContainer)
+
+    const res = await vectorReindexCancelPost(new Request(
+      'http://localhost/api/search/embeddings/reindex/cancel',
+      { method: 'POST' },
+    ))
+    const body = await res.json()
+
+    expect(res.status).toBe(200)
+    expect(body).toEqual({ ok: true, jobsRemoved: 2 })
+    expect(mockQueue.removeQueuedJobsByScope).toHaveBeenCalledWith({
+      tenantId: 'tenant-123',
+      organizationId: 'org-456',
+      jobTypes: ['batch-index'],
+    })
+    expect(mockQueue.clear).not.toHaveBeenCalled()
+    expect(mockClearReindexLock).toHaveBeenCalledWith(mockDb, 'tenant-123', 'vector', 'org-456')
+    expect(mockCancelReindexProgress).toHaveBeenCalledWith(expect.objectContaining({
+      em: mockEm,
+      progressService: mockProgressService,
+      type: 'vector',
+      tenantId: 'tenant-123',
+      organizationId: 'org-456',
+      userId: 'user-789',
+    }))
+    expect(mockRecordIndexerLog).toHaveBeenCalledWith(
+      { em: mockEm },
+      expect.objectContaining({
+        source: 'vector',
+        details: { jobsRemoved: 2 },
+        tenantId: 'tenant-123',
+        organizationId: 'org-456',
+      }),
+    )
+    expect(mockContainer.dispose).toHaveBeenCalled()
+  })
+
+  test('cancel fails closed when scoped vector queue removal fails', async () => {
+    mockGetAuthFromRequest.mockResolvedValue({
+      tenantId: 'tenant-123',
+      orgId: 'org-456',
+      sub: 'user-789',
+    })
+
+    const mockDb = { db: true }
+    const mockEm = { getKysely: jest.fn(() => mockDb) }
+    const mockQueue = {
+      clear: jest.fn().mockResolvedValue({ removed: 4 }),
+      removeQueuedJobsByScope: jest.fn().mockRejectedValue(new Error('redis unavailable')),
+    }
+    const mockContainer = {
+      resolve: jest.fn((name: string) => {
+        if (name === 'em') return mockEm
+        if (name === 'progressService') return { progress: true }
+        if (name === 'vectorIndexQueue') return mockQueue
+        throw new Error(`Unknown service: ${name}`)
+      }),
+      dispose: jest.fn().mockResolvedValue(undefined),
+    }
+    mockCreateRequestContainer.mockResolvedValue(mockContainer)
+
+    const res = await vectorReindexCancelPost(new Request(
+      'http://localhost/api/search/embeddings/reindex/cancel',
+      { method: 'POST' },
+    ))
+    const body = await res.json()
+
+    expect(res.status).toBe(503)
+    expect(body.error).toBe('Failed to cancel queued reindex jobs.')
+    expect(mockQueue.removeQueuedJobsByScope).toHaveBeenCalledWith({
+      tenantId: 'tenant-123',
+      organizationId: 'org-456',
+      jobTypes: ['batch-index'],
+    })
+    expect(mockQueue.clear).not.toHaveBeenCalled()
+    expect(mockClearReindexLock).not.toHaveBeenCalled()
+    expect(mockCancelReindexProgress).not.toHaveBeenCalled()
+    expect(mockContainer.dispose).toHaveBeenCalled()
+  })
 })

package/src/modules/search/api/__tests__/reindex.routes.test.ts

@@ -35,13 +35,16 @@ jest.mock('../../lib/reindex-lock', () => ({
 const mockEnsureReindexProgressJob = jest.fn().mockResolvedValue('progress-1')
 const mockCompleteReindexProgress = jest.fn().mockResolvedValue(undefined)
 const mockFailReindexProgress = jest.fn().mockResolvedValue(undefined)
+const mockCancelReindexProgress = jest.fn().mockResolvedValue(undefined)
 jest.mock('../../lib/reindex-progress', () => ({
   ensureReindexProgressJob: (...args: unknown[]) => mockEnsureReindexProgressJob(...args),
   completeReindexProgress: (...args: unknown[]) => mockCompleteReindexProgress(...args),
   failReindexProgress: (...args: unknown[]) => mockFailReindexProgress(...args),
+  cancelReindexProgress: (...args: unknown[]) => mockCancelReindexProgress(...args),
 }))
 
 import { POST as fulltextReindexPost } from '../reindex/route'
+import { POST as fulltextReindexCancelPost } from '../reindex/cancel/route'
 
 function mockAuth() {
   mockGetAuthFromRequest.mockResolvedValue({
@@ -162,4 +165,88 @@ describe('POST /api/search/reindex', () => {
     expect(mockClearReindexLock).toHaveBeenCalledWith(mockDb, 'tenant-123', 'fulltext', 'org-456')
     expect(mockContainer.dispose).toHaveBeenCalled()
   })
+
+  test('cancel removes only current tenant and organization fulltext queue jobs', async () => {
+    const mockDb = { db: true }
+    const mockEm = { getKysely: jest.fn(() => mockDb) }
+    const mockQueue = {
+      getJobCounts: jest.fn().mockResolvedValue({ waiting: 3, active: 1, completed: 0, failed: 0 }),
+      clear: jest.fn().mockResolvedValue({ removed: 4 }),
+      removeQueuedJobsByScope: jest.fn().mockResolvedValue({ removed: 2 }),
+    }
+    const mockProgressService = { progress: true }
+    const mockContainer = {
+      resolve: jest.fn((name: string) => {
+        if (name === 'em') return mockEm
+        if (name === 'progressService') return mockProgressService
+        if (name === 'fulltextIndexQueue') return mockQueue
+        throw new Error(`Unknown service: ${name}`)
+      }),
+      dispose: jest.fn().mockResolvedValue(undefined),
+    }
+    mockCreateRequestContainer.mockResolvedValue(mockContainer)
+
+    const res = await fulltextReindexCancelPost(new Request('http://localhost/api/search/reindex/cancel', {
+      method: 'POST',
+    }))
+    const body = await res.json()
+
+    expect(res.status).toBe(200)
+    expect(body).toEqual({ ok: true, jobsRemoved: 2 })
+    expect(mockQueue.removeQueuedJobsByScope).toHaveBeenCalledWith({
+      tenantId: 'tenant-123',
+      organizationId: 'org-456',
+      jobTypes: ['batch-index'],
+    })
+    expect(mockQueue.clear).not.toHaveBeenCalled()
+    expect(mockClearReindexLock).toHaveBeenCalledWith(mockDb, 'tenant-123', 'fulltext', 'org-456')
+    expect(mockCancelReindexProgress).toHaveBeenCalledWith(expect.objectContaining({
+      em: mockEm,
+      progressService: mockProgressService,
+      type: 'fulltext',
+      tenantId: 'tenant-123',
+      organizationId: 'org-456',
+      userId: 'user-789',
+    }))
+    expect(mockRecordIndexerLog).toHaveBeenCalledWith(
+      { em: mockEm },
+      expect.objectContaining({
+        source: 'fulltext',
+        details: { jobsRemoved: 2 },
+        tenantId: 'tenant-123',
+        organizationId: 'org-456',
+      }),
+    )
+    expect(mockContainer.dispose).toHaveBeenCalled()
+  })
+
+  test('cancel fails closed when scoped fulltext queue removal is unavailable', async () => {
+    const mockDb = { db: true }
+    const mockEm = { getKysely: jest.fn(() => mockDb) }
+    const mockQueue = {
+      clear: jest.fn().mockResolvedValue({ removed: 4 }),
+    }
+    const mockContainer = {
+      resolve: jest.fn((name: string) => {
+        if (name === 'em') return mockEm
+        if (name === 'progressService') return { progress: true }
+        if (name === 'fulltextIndexQueue') return mockQueue
+        throw new Error(`Unknown service: ${name}`)
+      }),
+      dispose: jest.fn().mockResolvedValue(undefined),
+    }
+    mockCreateRequestContainer.mockResolvedValue(mockContainer)
+
+    const res = await fulltextReindexCancelPost(new Request('http://localhost/api/search/reindex/cancel', {
+      method: 'POST',
+    }))
+    const body = await res.json()
+
+    expect(res.status).toBe(503)
+    expect(body.error).toBe('Scoped queue cancellation is not available.')
+    expect(mockQueue.clear).not.toHaveBeenCalled()
+    expect(mockClearReindexLock).not.toHaveBeenCalled()
+    expect(mockCancelReindexProgress).not.toHaveBeenCalled()
+    expect(mockContainer.dispose).toHaveBeenCalled()
+  })
 })

package/src/modules/search/api/embeddings/reindex/cancel/route.ts

@@ -12,6 +12,17 @@ import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { recordIndexerLog } from '@open-mercato/shared/lib/indexers/status-log'
 import { embeddingsReindexCancelOpenApi } from '../../../openapi'
 
+async function disposeContainer(container: unknown): Promise<void> {
+  try {
+    const disposable = container as { dispose?: () => Promise<void> }
+    if (typeof disposable.dispose === 'function') {
+      await disposable.dispose()
+    }
+  } catch {
+    // Ignore disposal errors
+  }
+}
+
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['search.embeddings.manage'] },
 }
@@ -37,12 +48,24 @@ export async function POST(req: Request) {
 
   let jobsRemoved = 0
   if (queue) {
+    if (typeof queue.removeQueuedJobsByScope !== 'function') {
+      await disposeContainer(container)
+      return NextResponse.json({
+        error: t('search.api.errors.scopedQueueCancelUnavailable', 'Scoped queue cancellation is not available.'),
+      }, { status: 503 })
+    }
+
     try {
-      const countsBefore = await queue.getJobCounts()
-      jobsRemoved = countsBefore.waiting + countsBefore.active
-      await queue.clear()
+      const scope = typeof auth.orgId === 'string'
+        ? { tenantId: auth.tenantId, organizationId: auth.orgId, jobTypes: ['batch-index'] }
+        : { tenantId: auth.tenantId, jobTypes: ['batch-index'] }
+      const result = await queue.removeQueuedJobsByScope(scope)
+      jobsRemoved = result.removed
     } catch {
-      // Queue clear failed - continue to clear lock
+      await disposeContainer(container)
+      return NextResponse.json({
+        error: t('search.api.errors.scopedQueueCancelFailed', 'Failed to cancel queued reindex jobs.'),
+      }, { status: 503 })
     }
   }
 
@@ -74,14 +97,7 @@ export async function POST(req: Request) {
     // Logging failure should not fail the cancel operation
   }
 
-  try {
-    const disposable = container as unknown as { dispose?: () => Promise<void> }
-    if (typeof disposable.dispose === 'function') {
-      await disposable.dispose()
-    }
-  } catch {
-    // Ignore disposal errors
-  }
+  await disposeContainer(container)
 
   return NextResponse.json({
     ok: true,

package/src/modules/search/api/reindex/cancel/route.ts

@@ -12,6 +12,17 @@ import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { recordIndexerLog } from '@open-mercato/shared/lib/indexers/status-log'
 import { reindexCancelOpenApi } from '../../openapi'
 
+async function disposeContainer(container: unknown): Promise<void> {
+  try {
+    const disposable = container as { dispose?: () => Promise<void> }
+    if (typeof disposable.dispose === 'function') {
+      await disposable.dispose()
+    }
+  } catch {
+    // Ignore disposal errors
+  }
+}
+
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['search.reindex'] },
 }
@@ -37,12 +48,24 @@ export async function POST(req: Request) {
 
   let jobsRemoved = 0
   if (queue) {
+    if (typeof queue.removeQueuedJobsByScope !== 'function') {
+      await disposeContainer(container)
+      return NextResponse.json({
+        error: t('search.api.errors.scopedQueueCancelUnavailable', 'Scoped queue cancellation is not available.'),
+      }, { status: 503 })
+    }
+
     try {
-      const countsBefore = await queue.getJobCounts()
-      jobsRemoved = countsBefore.waiting + countsBefore.active
-      await queue.clear()
+      const scope = typeof auth.orgId === 'string'
+        ? { tenantId: auth.tenantId, organizationId: auth.orgId, jobTypes: ['batch-index'] }
+        : { tenantId: auth.tenantId, jobTypes: ['batch-index'] }
+      const result = await queue.removeQueuedJobsByScope(scope)
+      jobsRemoved = result.removed
     } catch {
-      // Queue clear failed - continue to clear lock
+      await disposeContainer(container)
+      return NextResponse.json({
+        error: t('search.api.errors.scopedQueueCancelFailed', 'Failed to cancel queued reindex jobs.'),
+      }, { status: 503 })
     }
   }
 
@@ -74,14 +97,7 @@ export async function POST(req: Request) {
     // Logging failure should not fail the cancel operation
   }
 
-  try {
-    const disposable = container as unknown as { dispose?: () => Promise<void> }
-    if (typeof disposable.dispose === 'function') {
-      await disposable.dispose()
-    }
-  } catch {
-    // Ignore disposal errors
-  }
+  await disposeContainer(container)
 
   return NextResponse.json({
     ok: true,

package/src/modules/search/i18n/de.json

@@ -17,6 +17,8 @@
   "search.api.errors.recreateFailed": "Fehler beim Neuerstellen der Vektortabelle mit neuer Dimension.",
   "search.api.errors.reindexFailed": "Neuindizierung fehlgeschlagen.",
   "search.api.errors.reindexInProgress": "Eine Neuindizierung wird bereits durchgeführt.",
+  "search.api.errors.scopedQueueCancelFailed": "Die eingereihten Reindexierungsaufträge konnten nicht abgebrochen werden.",
+  "search.api.errors.scopedQueueCancelUnavailable": "Die bereichsbezogene Warteschlangenstornierung ist nicht verfügbar.",
   "search.api.errors.searchFailed": "Suchvorgang fehlgeschlagen.",
   "search.api.errors.serviceUnavailable": "Suchdienst ist nicht verfügbar.",
   "search.api.errors.strategyUnavailable": "Angeforderte Suchstrategie ist nicht verfügbar.",

package/src/modules/search/i18n/en.json

@@ -17,6 +17,8 @@
   "search.api.errors.recreateFailed": "Failed to recreate vector table with new dimension.",
   "search.api.errors.reindexFailed": "Reindex operation failed.",
   "search.api.errors.reindexInProgress": "A reindex is already in progress.",
+  "search.api.errors.scopedQueueCancelFailed": "Failed to cancel queued reindex jobs.",
+  "search.api.errors.scopedQueueCancelUnavailable": "Scoped queue cancellation is not available.",
   "search.api.errors.searchFailed": "Search operation failed.",
   "search.api.errors.serviceUnavailable": "Search service is unavailable.",
   "search.api.errors.strategyUnavailable": "Requested search strategy is unavailable.",

package/src/modules/search/i18n/es.json

@@ -17,6 +17,8 @@
   "search.api.errors.recreateFailed": "No se pudo recrear la tabla vectorial con la nueva dimensión.",
   "search.api.errors.reindexFailed": "La operación de reindexación falló.",
   "search.api.errors.reindexInProgress": "Ya hay una reindexación en progreso.",
+  "search.api.errors.scopedQueueCancelFailed": "No se pudieron cancelar los trabajos de reindexación en cola.",
+  "search.api.errors.scopedQueueCancelUnavailable": "La cancelación de cola con alcance no está disponible.",
   "search.api.errors.searchFailed": "La operación de búsqueda falló.",
   "search.api.errors.serviceUnavailable": "El servicio de búsqueda no está disponible.",
   "search.api.errors.strategyUnavailable": "La estrategia de búsqueda solicitada no está disponible.",

package/src/modules/search/i18n/pl.json

@@ -17,6 +17,8 @@
   "search.api.errors.recreateFailed": "Nie udało się odtworzyć tabeli wektorowej z nowym wymiarem.",
   "search.api.errors.reindexFailed": "Operacja reindeksacji nie powiodła się.",
   "search.api.errors.reindexInProgress": "Reindeksacja jest już w toku.",
+  "search.api.errors.scopedQueueCancelFailed": "Nie udało się anulować zakolejkowanych zadań reindeksacji.",
+  "search.api.errors.scopedQueueCancelUnavailable": "Zakresowe anulowanie kolejki jest niedostępne.",
   "search.api.errors.searchFailed": "Operacja wyszukiwania nie powiodła się.",
   "search.api.errors.serviceUnavailable": "Usługa wyszukiwania jest niedostępna.",
   "search.api.errors.strategyUnavailable": "Żądana strategia wyszukiwania jest niedostępna.",