@automagik/omni 2.260303.2 → 2.260303.3

package/dist/index.js

@@ -27673,7 +27673,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260303.2",
+  version: "2.260303.3",
   description: "LLM-optimized CLI for Omni v2",
   type: "module",
   bin: {

package/dist/server/index.js

@@ -168736,6 +168736,8 @@ var init_src5 = __esm(() => {
 });
 
 // ../api/src/pgserve.ts
+import { execFileSync } from "child_process";
+import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join12 } from "path";
 function resolvePgserveConfig() {
@@ -168769,6 +168771,51 @@ async function tryStartOnPort(startFn, port, config2) {
     throw error;
   }
 }
+async function killOrphanedPostgres(dataDir) {
+  const pidFile = join12(dataDir, "postmaster.pid");
+  if (!existsSync3(pidFile))
+    return;
+  let pid;
+  try {
+    pid = Number.parseInt(readFileSync3(pidFile, "utf-8").trim().split(`
+`)[0] ?? "", 10);
+    if (Number.isNaN(pid) || pid <= 0)
+      return;
+    process.kill(pid, 0);
+  } catch {
+    return;
+  }
+  try {
+    const cmd = execFileSync("ps", ["-o", "command=", "-p", String(pid)], { encoding: "utf-8" }).trim();
+    if (!/\bpostgres\b/i.test(cmd)) {
+      log52.warn("PID from postmaster.pid is not a postgres process, skipping kill", {
+        pid,
+        dataDir,
+        cmd: cmd.slice(0, 80)
+      });
+      return;
+    }
+  } catch {
+    return;
+  }
+  log52.info("Killing orphaned postgres from previous run", { pid, dataDir });
+  try {
+    process.kill(pid, "SIGTERM");
+  } catch {
+    return;
+  }
+  for (let i = 0;i < 50; i++) {
+    await new Promise((r) => setTimeout(r, 100));
+    try {
+      process.kill(pid, 0);
+    } catch {
+      return;
+    }
+  }
+  try {
+    process.kill(pid, "SIGKILL");
+  } catch {}
+}
 async function startEmbeddedPgserve(config2) {
   if (!config2.enabled) {
     const url = process.env.DATABASE_URL ?? getDefaultDatabaseUrl();
@@ -168780,6 +168827,9 @@ async function startEmbeddedPgserve(config2) {
     mode: config2.dataDir ? "persistent" : "memory",
     dataDir: config2.dataDir ?? "(in-memory)"
   });
+  if (config2.dataDir) {
+    await killOrphanedPostgres(config2.dataDir);
+  }
   const { startMultiTenantServer: startMultiTenantServer2 } = await Promise.resolve().then(() => (init_src5(), exports_src2));
   for (let offset = 0;offset <= MAX_PORT_RETRIES; offset++) {
     const port = config2.port + offset;
@@ -168822,7 +168872,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@omni/api",
-    version: "2.260303.2",
+    version: "2.260303.3",
     type: "module",
     exports: {
       ".": {
@@ -181775,7 +181825,7 @@ Messages:
 var init_prompts = () => {};
 
 // ../media-processing/src/processors/image.ts
-import { readFileSync as readFileSync3 } from "fs";
+import { readFileSync as readFileSync4 } from "fs";
 var MAX_RETRIES4 = 3, ImageProcessor;
 var init_image = __esm(() => {
   init_dist2();
@@ -181822,7 +181872,7 @@ var init_image = __esm(() => {
       const prompt = options?.caption ? `${basePrompt}
 
 Additional context (caption): ${options.caption}` : basePrompt;
-      const imageData = readFileSync3(filePath);
+      const imageData = readFileSync4(filePath);
       let result = await this.describeWithGemini(imageData, mimeType, prompt);
       if (!result.success && this.config.openaiApiKey) {
         this.log.info("Gemini description failed, trying OpenAI fallback...");
@@ -181968,7 +182018,7 @@ Additional context (caption): ${options.caption}` : basePrompt;
 });
 
 // ../media-processing/src/processors/video.ts
-import { readFileSync as readFileSync4, statSync as statSync2 } from "fs";
+import { readFileSync as readFileSync5, statSync as statSync2 } from "fs";
 var MAX_RETRIES5 = 3, MAX_VIDEO_SIZE_MB = 20, VideoProcessor;
 var init_video = __esm(() => {
   init_dist2();
@@ -182011,7 +182061,7 @@ var init_video = __esm(() => {
       const prompt = options?.caption ? `${basePrompt}
 
 Additional context: ${options.caption}` : basePrompt;
-      const videoData = readFileSync4(filePath);
+      const videoData = readFileSync5(filePath);
       const result = await this.describeWithGemini(videoData, mimeType, prompt);
       result.processingTimeMs = Math.round(performance.now() - startTime2);
       if (result.success) {
@@ -251877,7 +251927,7 @@ var require_excel = __commonJS((exports, module) => {
 });
 
 // ../media-processing/src/processors/document.ts
-import { readFileSync as readFileSync5 } from "fs";
+import { readFileSync as readFileSync6 } from "fs";
 var MIN_TEXT_LENGTH = 50, JSON_SUMMARIZE_THRESHOLD, JSON_MAX_ARRAY_EXAMPLES = 3, DocumentProcessor;
 var init_document = __esm(() => {
   init_dist2();
@@ -251943,7 +251993,7 @@ var init_document = __esm(() => {
     async processPdf(filePath, ocrPrompt) {
       try {
         const pdfParse = (await Promise.resolve().then(() => __toESM(require_pdf_parse2(), 1))).default;
-        const dataBuffer = readFileSync5(filePath);
+        const dataBuffer = readFileSync6(filePath);
         const data = await pdfParse(dataBuffer);
         const text3 = data.text?.trim() ?? "";
         if (text3.length < MIN_TEXT_LENGTH) {
@@ -252044,7 +252094,7 @@ ${csv}`);
     }
     async processCsv(filePath) {
       try {
-        const content = readFileSync5(filePath, "utf-8");
+        const content = readFileSync6(filePath, "utf-8");
         return {
           success: true,
           content,
@@ -252062,7 +252112,7 @@ ${csv}`);
     }
     async processText(filePath, isMarkdown) {
       try {
-        const content = readFileSync5(filePath, "utf-8");
+        const content = readFileSync6(filePath, "utf-8");
         return {
           success: true,
           content,
@@ -252080,7 +252130,7 @@ ${csv}`);
     }
     async processJson(filePath) {
       try {
-        const content = readFileSync5(filePath, "utf-8");
+        const content = readFileSync6(filePath, "utf-8");
         const data = JSON.parse(content);
         if (content.length < JSON_SUMMARIZE_THRESHOLD) {
           return {
@@ -252198,7 +252248,7 @@ ${csv}`);
         return this.createFailedResult("Gemini not configured for OCR fallback (missing API key)", "local", "pdf-parse");
       }
       try {
-        const pdfData = readFileSync5(filePath);
+        const pdfData = readFileSync6(filePath);
         const result = await model.generateContent([
           {
             inlineData: {
@@ -252379,7 +252429,7 @@ var init_src6 = __esm(() => {
 });
 
 // ../api/src/services/media-storage.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync as readFileSync6, statSync as statSync3, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync7, statSync as statSync3, writeFileSync as writeFileSync3 } from "fs";
 import { dirname as dirname5, extname as extname2, join as join14, relative } from "path";
 function getExtensionFromMime2(mimeType) {
   const mimeToExt = {
@@ -252428,7 +252478,7 @@ class MediaStorageService {
   constructor(db2, basePath) {
     this.db = db2;
     this.basePath = basePath ?? process.env.MEDIA_STORAGE_PATH ?? DEFAULT_MEDIA_PATH;
-    if (!existsSync3(this.basePath)) {
+    if (!existsSync4(this.basePath)) {
       mkdirSync3(this.basePath, { recursive: true });
       log59.info("Created media storage directory", { path: this.basePath });
     }
@@ -252442,7 +252492,7 @@ class MediaStorageService {
   async storeFromBase64(instanceId, messageId, base64Data, mimeType, timestamp3) {
     const localPath = this.buildPath(instanceId, messageId, mimeType, timestamp3);
     const dir = dirname5(localPath);
-    if (!existsSync3(dir)) {
+    if (!existsSync4(dir)) {
       mkdirSync3(dir, { recursive: true });
     }
     const buffer3 = Buffer.from(base64Data, "base64");
@@ -252457,7 +252507,7 @@ class MediaStorageService {
   async storeFromBuffer(instanceId, messageId, buffer3, mimeType, timestamp3) {
     const localPath = this.buildPath(instanceId, messageId, mimeType, timestamp3);
     const dir = dirname5(localPath);
-    if (!existsSync3(dir)) {
+    if (!existsSync4(dir)) {
       mkdirSync3(dir, { recursive: true });
     }
     writeFileSync3(localPath, buffer3);
@@ -252482,11 +252532,11 @@ class MediaStorageService {
   }
   readMedia(relativePath) {
     const fullPath = join14(this.basePath, relativePath);
-    if (!existsSync3(fullPath)) {
+    if (!existsSync4(fullPath)) {
       return null;
     }
     try {
-      const buffer3 = readFileSync6(fullPath);
+      const buffer3 = readFileSync7(fullPath);
       const stat4 = statSync3(fullPath);
       return {
         buffer: buffer3,
@@ -256866,7 +256916,7 @@ var init_timeout = __esm(() => {
 });
 
 // ../api/src/middleware/version-headers.ts
-import { existsSync as existsSync4, readFileSync as readFileSync7 } from "fs";
+import { existsSync as existsSync5, readFileSync as readFileSync8 } from "fs";
 import { join as join17 } from "path";
 function loadRepoPackageVersion() {
   try {
@@ -256874,9 +256924,9 @@ function loadRepoPackageVersion() {
       join17(import.meta.dir, "..", "..", "..", "..", "package.json"),
       join17(process.cwd(), "package.json")
     ]) {
-      if (!existsSync4(candidate))
+      if (!existsSync5(candidate))
         continue;
-      const parsed = JSON.parse(readFileSync7(candidate, "utf-8"));
+      const parsed = JSON.parse(readFileSync8(candidate, "utf-8"));
       if (parsed.version)
         return parsed.version;
     }
@@ -256895,10 +256945,10 @@ function loadServerVersionInfo() {
       join17(import.meta.dir, "..", "..", "..", "..", "version.json"),
       join17(process.cwd(), "version.json")
     ]) {
-      if (!existsSync4(candidate)) {
+      if (!existsSync5(candidate)) {
         continue;
       }
-      const parsed = JSON.parse(readFileSync7(candidate, "utf-8"));
+      const parsed = JSON.parse(readFileSync8(candidate, "utf-8"));
       return {
         version: parsed.version ?? resolveFallbackVersion(),
         commit: parsed.commit ?? FALLBACK_COMMIT
@@ -260641,6 +260691,7 @@ var init_instances2 = __esm(() => {
     profilePicUrl: exports_external.string().nullable().openapi({ description: "Profile picture URL" }),
     ownerIdentifier: exports_external.string().nullable().openapi({ description: "Owner identifier" }),
     agentId: exports_external.string().uuid().nullable().optional().openapi({ description: "Agent UUID (agents table)" }),
+    agentProviderId: exports_external.string().uuid().nullable().optional().openapi({ description: "Provider ID (agent provider)" }),
     agentTimeout: exports_external.number().openapi({ description: "Agent timeout in seconds" }),
     agentStreamMode: exports_external.boolean().openapi({ description: "Whether streaming is enabled" }),
     createdAt: exports_external.string().datetime().openapi({ description: "Creation timestamp" }),
@@ -267451,7 +267502,7 @@ var init_media = __esm(() => {
 });
 
 // ../api/src/routes/v2/messages.ts
-import { existsSync as existsSync5 } from "fs";
+import { existsSync as existsSync6 } from "fs";
 import { join as join18 } from "path";
 function isUUID(value) {
   return UUID_REGEX.test(value);
@@ -267793,7 +267844,7 @@ var init_messages5 = __esm(() => {
     let cached = false;
     if (mediaLocalPath) {
       const fullPath = join18(mediaStorage2.getBasePath(), mediaLocalPath);
-      if (existsSync5(fullPath)) {
+      if (existsSync6(fullPath)) {
         cached = true;
       } else {
         mediaDownloadLog.warn("mediaLocalPath set but file missing, re-downloading", {
@@ -269607,7 +269658,7 @@ var init_v2 = __esm(() => {
 });
 
 // ../api/src/app.ts
-import { existsSync as existsSync6 } from "fs";
+import { existsSync as existsSync7 } from "fs";
 import path3 from "path";
 function getAllowedOrigins() {
   const envOrigins = process.env.OMNI_CORS_ORIGINS;
@@ -269717,8 +269768,8 @@ function createApp(db2, eventBus = null, channelRegistry2 = null) {
   app.route("/api/v2", protectedApp);
   const cwdUiPath = path3.resolve(process.cwd(), "apps/ui/dist");
   const packagesUiPath = process.env.OMNI_PACKAGES_DIR ? path3.resolve(process.env.OMNI_PACKAGES_DIR, "..", "apps/ui/dist") : null;
-  const uiDistPath = existsSync6(cwdUiPath) ? cwdUiPath : packagesUiPath && existsSync6(packagesUiPath) ? packagesUiPath : cwdUiPath;
-  const serveUI = existsSync6(uiDistPath);
+  const uiDistPath = existsSync7(cwdUiPath) ? cwdUiPath : packagesUiPath && existsSync7(packagesUiPath) ? packagesUiPath : cwdUiPath;
+  const serveUI = existsSync7(uiDistPath);
   if (serveUI) {
     httpLog.info("Serving UI from apps/ui/dist");
     app.use("/assets/*", serveStatic2({
@@ -270000,13 +270051,13 @@ var init_context3 = __esm(() => {
 });
 
 // ../api/src/plugins/loader.ts
-import { existsSync as existsSync7 } from "fs";
+import { existsSync as existsSync8 } from "fs";
 import { dirname as dirname6, join as join19 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function findMonorepoRoot(startDir) {
   let current = startDir;
   while (current !== dirname6(current)) {
-    if (existsSync7(join19(current, "turbo.json"))) {
+    if (existsSync8(join19(current, "turbo.json"))) {
       return current;
     }
     current = dirname6(current);
@@ -391589,6 +391640,28 @@ async function createStorageAuthState(storage, instanceId) {
       return deserialize(value);
     return JSON.parse(JSON.stringify(value), bufferReviver);
   }
+  function isBlockedPhoneSenderKey(type, id, value, botPhone) {
+    if (type !== "sender-key" || !botPhone || value == null)
+      return false;
+    const parts = id.split("::");
+    return parts.length >= 2 && parts[1] === botPhone;
+  }
+  function processSignalKeyEntry(type, id, value, botPhone) {
+    const key = `${keyPrefix}:${type}:${id}`;
+    if (isBlockedPhoneSenderKey(type, id, value, botPhone)) {
+      const parts = id.split("::");
+      log46.warn("Blocked phone-JID sender key (LID-first enforced)", {
+        instanceId,
+        group: parts[0]?.slice(-20),
+        participant: parts[1]?.replace(/\d(?=\d{4})/g, "*")
+      });
+      setCachedValue(key, DELETED);
+      backgroundPersist(type, id, key, null);
+      return;
+    }
+    setCachedValue(key, value !== null && value !== undefined ? value : DELETED);
+    backgroundPersist(type, id, key, value);
+  }
   function backgroundPersist(type, id, key, value) {
     const previousPersist = persistQueues.get(key) ?? Promise.resolve();
     const nextPersist = previousPersist.catch(() => {}).then(async () => {
@@ -391635,13 +391708,12 @@ async function createStorageAuthState(storage, instanceId) {
           return data;
         },
         set: async (data) => {
+          const botPhone = creds.me?.id?.split(":")[0]?.split("@")[0];
           for (const [type, entries] of Object.entries(data)) {
             if (!entries)
               continue;
             for (const [id, value] of Object.entries(entries)) {
-              const key = `${keyPrefix}:${type}:${id}`;
-              setCachedValue(key, value !== null && value !== undefined ? value : DELETED);
-              backgroundPersist(type, id, key, value);
+              processSignalKeyEntry(type, id, value, botPhone);
             }
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/omni",
-  "version": "2.260303.2",
+  "version": "2.260303.3",
   "description": "LLM-optimized CLI for Omni v2",
   "type": "module",
   "bin": {