openmausbot 0.1.86 → 0.1.88

package/dist-server/server/local-computer.js

@@ -70,19 +70,21 @@ function sameDriverFileIdentity(expected, actual) {
 }
 function decodeLegacyDescriptor(value, platform) {
     const supportedPlatform = legacyPlatform(platform);
-    if (!supportedPlatform || !value || value.mode === "unavailable" || typeof value.mcpCommand !== "string") {
+    if (!supportedPlatform || !value ||
+        !(value.mode === "embedded" || (supportedPlatform === "darwin" && value.mode === "standalone")) ||
+        (Object.hasOwn(value, "status") && value.status !== "ready") ||
+        typeof value.socketPath !== "string" || !value.socketPath ||
+        typeof value.mcpCommand !== "string" || !value.mcpCommand.trim()) {
         return null;
     }
-    if (value.mcpArgs !== undefined && !Array.isArray(value.mcpArgs))
+    if (!Array.isArray(value.mcpArgs) || value.mcpArgs[0] !== "mcp")
         return null;
-    if (value.mcpEnv !== undefined &&
-        (!value.mcpEnv || typeof value.mcpEnv !== "object" || Array.isArray(value.mcpEnv))) {
+    if (!value.mcpEnv || typeof value.mcpEnv !== "object" || Array.isArray(value.mcpEnv))
         return null;
-    }
-    const args = value.mcpArgs ?? ["mcp"];
+    const args = value.mcpArgs;
     if (!args.every((arg) => typeof arg === "string"))
         return null;
-    const env = value.mcpEnv ?? {};
+    const env = value.mcpEnv;
     if (!Object.values(env).every((entry) => typeof entry === "string"))
         return null;
     return {
@@ -288,31 +290,78 @@ function validateLegacyDescriptorRuntime(descriptorFile, platform, { uid = proce
         return false;
     }
 }
+/** An older fallback cannot override a present but unavailable, malformed, or
+ * unreadable descriptor at a more specific location. */
+function firstPresentCuaDescriptor(candidates) {
+    for (const file of new Set(candidates)) {
+        try {
+            lstatSync(file);
+            return file;
+        }
+        catch (error) {
+            if (error.code !== "ENOENT")
+                return file;
+        }
+    }
+    return null;
+}
 export function readCuaConnection({ platform = process.platform, userData = process.env.OMB_USER_DATA, home = homedir(), validateLinuxRuntime = validateLinuxDescriptorRuntime, validateLegacyRuntime = validateLegacyDescriptorRuntime, } = {}) {
     const candidates = userData ? [join(userData, "cua-connection.json")] : [];
-    if (platform === "darwin") {
-        // Legacy/dev fallback. Packaged Electron passes its exact userData path.
+    if (platform === "darwin" && !userData) {
+        // Legacy/dev fallback only when Electron did not provide its exact path.
         for (const directory of ["OpenMausBot", "openmausbot", "OpenGrokBot", "opengrokbot"]) {
             candidates.push(join(home, "Library", "Application Support", directory, "cua-connection.json"));
         }
     }
-    for (const file of new Set(candidates)) {
-        try {
+    const file = firstPresentCuaDescriptor(candidates);
+    if (!file)
+        return null;
+    try {
+        const raw = JSON.parse(readFileSync(file, "utf8"));
+        if (platform === "linux") {
+            const decoded = decodeLinuxDescriptor(raw);
+            if (decoded && validateLinuxRuntime(file, raw))
+                return decoded;
+        }
+        else {
+            const decoded = decodeLegacyDescriptor(raw, platform);
+            if (decoded && validateLegacyRuntime(file, platform))
+                return decoded;
+        }
+    }
+    catch {
+        // Missing, invalid, tampered, or stale descriptors are unavailable.
+    }
+    return null;
+}
+/** An unavailable descriptor is diagnostic only. It never becomes a connection
+ * and only a private, well-formed macOS/Windows descriptor may supply text. */
+export function readCuaUnavailableReason({ platform = process.platform, userData = process.env.OMB_USER_DATA, home = homedir(), } = {}) {
+    if (!legacyPlatform(platform))
+        return null;
+    const candidates = userData ? [join(userData, "cua-connection.json")] : [];
+    if (platform === "darwin" && !userData) {
+        for (const directory of ["OpenMausBot", "openmausbot", "OpenGrokBot", "opengrokbot"]) {
+            candidates.push(join(home, "Library", "Application Support", directory, "cua-connection.json"));
+        }
+    }
+    const file = firstPresentCuaDescriptor(candidates);
+    if (!file)
+        return null;
+    try {
+        if (validateLegacyDescriptorRuntime(file, platform)) {
             const raw = JSON.parse(readFileSync(file, "utf8"));
-            if (platform === "linux") {
-                const decoded = decodeLinuxDescriptor(raw);
-                if (decoded && validateLinuxRuntime(file, raw))
-                    return decoded;
-            }
-            else {
-                const decoded = decodeLegacyDescriptor(raw, platform);
-                if (decoded && validateLegacyRuntime(file, platform))
-                    return decoded;
+            if (raw && typeof raw === "object" && !Array.isArray(raw) &&
+                Object.keys(raw).length === 2 &&
+                raw.mode === "unavailable") {
+                const reason = raw.reason;
+                if (typeof reason === "string" && reason.trim() && reason.length <= 2_000)
+                    return reason.trim();
             }
         }
-        catch {
-            // Missing, invalid, tampered, or stale descriptors are unavailable.
-        }
+    }
+    catch {
+        // No usable diagnostic; the caller still refuses computer control.
     }
     return null;
 }

package/dist-server/server/managed-desktop.js

@@ -20,7 +20,7 @@ const identitySchema = z.object({ portalOrigin: z.string().max(2048), organizati
 const PROVIDER_IDS = ["anthropic", "openai", "openrouter"];
 const signature = (value) => createHash("sha256").update(JSON.stringify(value)).digest("hex");
 const expiredMessage = "Company access has ended. Reconnect your organization or explicitly choose a personal model; personal billing will not be used automatically.";
-export const LICENSE_EXPIRED_MESSAGE = "Your organisation's OpenMaus Admin licence has expired. Contact your admin.";
+export const LICENSE_EXPIRED_MESSAGE = "Your organization's OpenMaus Admin license has expired. Contact your admin.";
 /** Validate only messages received over Electron's private utility-parent port.
  * Never expose this input to renderer HTTP or merge it into saved AppConfig.
  */

package/dist-server/server/mcp-bridge.js

@@ -36,14 +36,14 @@ import { createToolListNormalizer } from "./mcp-tool-schema.js";
 // stdin/stdout/stderr resets the window.
 export const BRIDGE_INACTIVITY_MS = 45_000;
 const PROBE_TIMEOUT_MS = 10_000;
-/** Run the liveness command; alive means "exited 0 within the timeout". The
- * probe is its own short-lived process, so it cannot inherit the wedged
- * connection it is diagnosing. */
-export function runLivenessProbe(probe, timeoutMs = PROBE_TIMEOUT_MS) {
+/** Run the liveness command; alive means "exited 0 within the timeout". A
+ * separate bounded command checks the transport without waiting for an
+ * answer on the possibly wedged MCP stream. */
+export function runLivenessProbe(probe, timeoutMs = PROBE_TIMEOUT_MS, env) {
     return new Promise((resolve) => {
         const child = spawn(probe.command, probe.args, {
             shell: false,
-            env: { ...process.env, PATH: augmentedPath() },
+            env: env ?? { ...process.env, PATH: augmentedPath() },
             stdio: ["ignore", "ignore", "ignore"],
         });
         const timer = setTimeout(() => {
@@ -265,7 +265,7 @@ export function runMcpBridge(options) {
         const liveness = options.liveness;
         watchdog = createInactivityWatchdog({
             inactivityMs: BRIDGE_INACTIVITY_MS,
-            probe: () => runLivenessProbe(liveness),
+            probe: () => runLivenessProbe(liveness, PROBE_TIMEOUT_MS, options.env),
             onDead: () => {
                 process.stderr.write(`${options.label} transport went silent and stopped answering liveness probes; ending the bridge\n`);
                 process.exitCode = 1;

package/dist-server/server/message-db.js

@@ -15,9 +15,13 @@ import { join } from "node:path";
 import { DatabaseSync } from "node:sqlite";
 import { DATA_DIR } from "./config.js";
 import { peerProvenanceAuthor } from "./peer-provenance.js";
+import { MessageSearchWorker } from "./message-search-worker.js";
+import { searchMessagesInDatabase } from "./message-search-query.js";
 const DB_FILE = () => join(DATA_DIR, "messages.db");
 let handle = null;
 let handlePath = null;
+let searchWorker = null;
+let closingSearch = Promise.resolve();
 function open() {
     mkdirSync(DATA_DIR, { recursive: true, mode: 0o700 });
     const file = DB_FILE();
@@ -444,49 +448,16 @@ export function threadsReferencing(fragment) {
     return rows.map((row) => row.thread_id);
 }
 /** Case-insensitive substring search over text messages, newest first.
- * A LIKE scan, deliberately: local transcripts are megabytes at most, a
- * scan is milliseconds, and it needs no FTS extension to exist. */
+ * Keep literal substring semantics; HTTP callers run the scan off-thread. */
 export function searchMessages(query, limit = 40, threadId) {
-    const needle = query.trim().toLowerCase();
-    if (!needle)
-        return [];
-    // escape LIKE wildcards so a literal % or _ in the query stays literal
-    const pattern = `%${needle.replace(/([\\%_])/g, "\\$1")}%`;
-    // text messages by their text; activity chips by the tool name — "which
-    // bot ran that migration" is a tool-name question. The chip's name lives
-    // in the row's json; a JSON1 extract keeps this one query.
-    const scope = threadId ? "thread_id = ? AND " : "";
-    const statement = db().prepare("SELECT thread_id, id, at, role, kind, text, json_extract(json, '$.tool.name') AS tool_name, json_extract(json, '$.from.name') AS from_name FROM messages " +
-        `WHERE ${scope}((kind = 'text' AND text IS NOT NULL AND lower(text) LIKE ? ESCAPE '\\') ` +
-        "   OR (kind = 'activity' AND tool_name IS NOT NULL AND lower(tool_name) LIKE ? ESCAPE '\\')) " +
-        "ORDER BY at DESC LIMIT ?");
-    const rows = (threadId
-        ? statement.all(threadId, pattern, pattern, limit)
-        : statement.all(pattern, pattern, limit));
-    return rows.map((row) => {
-        const haystack = row.kind === "activity" ? (row.tool_name ?? "") : (row.text ?? "");
-        const hitAt = Math.max(0, haystack.toLowerCase().indexOf(needle));
-        const start = Math.max(0, hitAt - 60);
-        const end = Math.min(haystack.length, hitAt + needle.length + 90);
-        const head = start > 0 ? "…" : "";
-        const body = haystack.slice(start, end).replace(/\s+/g, " ").trim();
-        const snippet = head + body + (end < haystack.length ? "…" : "");
-        // whitespace folding can shift the offset; find the match again inside
-        const folded = needle.replace(/\s+/g, " ");
-        const matchStart = snippet.toLowerCase().indexOf(folded);
-        return {
-            threadId: row.thread_id,
-            messageId: row.id,
-            at: row.at,
-            role: row.role,
-            kind: row.kind,
-            snippet,
-            matchStart: matchStart < 0 ? head.length : matchStart,
-            // A defensive fallback must not mark arbitrary snippet text as the hit.
-            matchLength: matchStart < 0 ? 0 : folded.length,
-            ...(row.from_name ? { from: row.from_name } : {}),
-        };
-    });
+    return searchMessagesInDatabase(db(), query, limit, threadId);
+}
+export function searchMessagesAsync(query, limit = 40, threadId) {
+    if (!query.trim())
+        return Promise.resolve([]);
+    db(); // The owner initializes/migrates the schema before any read-only scan.
+    searchWorker ??= new MessageSearchWorker(DB_FILE());
+    return searchWorker.search(query, limit, threadId);
 }
 /** Who wrote a user-role line that reads as the user's. The structural
  * field wins; rows stored before it existed still open with the note. */
@@ -675,8 +646,17 @@ export function recallMemory(query, botId, limit = 12) {
         .all(match, botId, limit);
     return rows.map((row) => ({ file: row.path, at: row.mtime_ms, snippet: row.snippet.replace(/\s+/g, " ").trim() }));
 }
+/** Await before maintenance replaces the database or shutdown releases its lease. */
+export async function closeMessageSearch() {
+    const worker = searchWorker;
+    searchWorker = null;
+    if (worker)
+        closingSearch = Promise.all([closingSearch, worker.close()]).then(() => { });
+    await closingSearch;
+}
 /** Test/shutdown hook — closes the handle so a wiped DATA_DIR starts clean. */
 export function closeMessageDb() {
+    void closeMessageSearch();
     try {
         handle?.close();
     }

package/dist-server/server/message-file.js

@@ -313,7 +313,7 @@ function containedBy(root, candidate) {
     const suffix = relative(root, candidate);
     return suffix === "" || (suffix !== ".." && !suffix.startsWith(`..${sep}`) && !isAbsolute(suffix));
 }
-function mimeFor(path) {
+export function mimeFor(path) {
     switch (extname(path).toLowerCase()) {
         case ".md": return "text/markdown; charset=utf-8";
         case ".txt": return "text/plain; charset=utf-8";
@@ -331,6 +331,14 @@ function mimeFor(path) {
         case ".m4v": return "video/x-m4v";
         case ".webm": return "video/webm";
         case ".mov": return "video/quicktime";
+        case ".mp3": return "audio/mpeg";
+        case ".m4a": return "audio/mp4";
+        case ".aac": return "audio/aac";
+        case ".wav": return "audio/wav";
+        case ".ogg":
+        case ".oga": return "audio/ogg";
+        case ".opus": return "audio/opus";
+        case ".flac": return "audio/flac";
         case ".doc": return "application/msword";
         case ".docx": return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
         case ".xls": return "application/vnd.ms-excel";

package/dist-server/server/message-search-query.js

@@ -0,0 +1,43 @@
+/** Shared query and snippet logic; the worker never calls the write-side open(). */
+export function searchMessagesInDatabase(database, query, limit = 40, threadId) {
+    const needle = query.trim().toLowerCase();
+    if (!needle)
+        return [];
+    // escape LIKE wildcards so a literal % or _ in the query stays literal
+    const pattern = `%${needle.replace(/([\\%_])/g, "\\$1")}%`;
+    // text messages by their text; activity chips by the tool name — "which
+    // bot ran that migration" is a tool-name question. The chip's name lives
+    // in the row's json; a JSON1 extract keeps this one query.
+    const scope = threadId ? "thread_id = ? AND " : "";
+    const statement = database.prepare("SELECT thread_id, id, at, role, kind, text, json_extract(json, '$.tool.name') AS tool_name, json_extract(json, '$.from.name') AS from_name FROM messages " +
+        `WHERE ${scope}((kind = 'text' AND text IS NOT NULL AND lower(text) LIKE ? ESCAPE '\\') ` +
+        "   OR (kind = 'activity' AND tool_name IS NOT NULL AND lower(tool_name) LIKE ? ESCAPE '\\')) " +
+        "ORDER BY at DESC LIMIT ?");
+    const rows = (threadId
+        ? statement.all(threadId, pattern, pattern, limit)
+        : statement.all(pattern, pattern, limit));
+    return rows.map((row) => {
+        const haystack = row.kind === "activity" ? (row.tool_name ?? "") : (row.text ?? "");
+        const hitAt = Math.max(0, haystack.toLowerCase().indexOf(needle));
+        const start = Math.max(0, hitAt - 60);
+        const end = Math.min(haystack.length, hitAt + needle.length + 90);
+        const head = start > 0 ? "…" : "";
+        const body = haystack.slice(start, end).replace(/\s+/g, " ").trim();
+        const snippet = head + body + (end < haystack.length ? "…" : "");
+        // whitespace folding can shift the offset; find the match again inside
+        const folded = needle.replace(/\s+/g, " ");
+        const matchStart = snippet.toLowerCase().indexOf(folded);
+        return {
+            threadId: row.thread_id,
+            messageId: row.id,
+            at: row.at,
+            role: row.role,
+            kind: row.kind,
+            snippet,
+            matchStart: matchStart < 0 ? head.length : matchStart,
+            // A defensive fallback must not mark arbitrary snippet text as the hit.
+            matchLength: matchStart < 0 ? 0 : folded.length,
+            ...(row.from_name ? { from: row.from_name } : {}),
+        };
+    });
+}

package/dist-server/server/message-search-worker.js

@@ -0,0 +1,80 @@
+import { existsSync } from "node:fs";
+import { Worker } from "node:worker_threads";
+export class SearchUnavailable extends Error {
+    status = 503;
+}
+/** One read-only worker, not a worker per keystroke. Bound outstanding scans
+ * so a burst of searches cannot build an unbounded queue behind the database. */
+export class MessageSearchWorker {
+    worker;
+    stopping = Promise.resolve();
+    sequence = 0;
+    pending = new Map();
+    file;
+    timeoutMs;
+    constructor(file, timeoutMs = 30_000) {
+        this.file = file;
+        this.timeoutMs = timeoutMs;
+    }
+    search(query, limit, threadId) {
+        if (this.pending.size >= 8)
+            return Promise.reject(new SearchUnavailable("Search is busy. Try again shortly."));
+        if (!this.worker) {
+            const source = new URL("./message-search.worker.ts", import.meta.url);
+            const worker = new Worker(existsSync(source) ? source : new URL("./message-search.worker.js", import.meta.url), {
+                workerData: { file: this.file },
+                // Do not inherit test loaders or inspector ports into the worker.
+                execArgv: [],
+            });
+            this.worker = worker;
+            worker.on("message", (reply) => {
+                if (this.worker !== worker)
+                    return;
+                const request = this.pending.get(reply.id);
+                if (!request)
+                    return;
+                clearTimeout(request.timer);
+                this.pending.delete(reply.id);
+                if (reply.failed)
+                    request.reject(new SearchUnavailable("Search could not finish. Try again shortly."));
+                else
+                    request.resolve(reply.hits ?? []);
+                if (!this.pending.size)
+                    worker.unref();
+            });
+            worker.on("error", () => {
+                if (this.worker === worker)
+                    void this.close();
+            });
+            worker.on("exit", () => {
+                if (this.worker === worker)
+                    void this.close();
+            });
+        }
+        const worker = this.worker;
+        worker.ref();
+        const id = ++this.sequence;
+        return new Promise((resolve, reject) => {
+            const timer = setTimeout(() => { void this.close(); }, this.timeoutMs);
+            this.pending.set(id, { resolve, reject, timer });
+            try {
+                worker.postMessage({ id, query, limit, threadId });
+            }
+            catch {
+                void this.close();
+            }
+        });
+    }
+    async close() {
+        const worker = this.worker;
+        this.worker = undefined;
+        for (const request of this.pending.values()) {
+            clearTimeout(request.timer);
+            request.reject(new SearchUnavailable("Search was interrupted. Try again shortly."));
+        }
+        this.pending.clear();
+        if (worker)
+            this.stopping = Promise.all([this.stopping, worker.terminate()]).then(() => { });
+        await this.stopping;
+    }
+}

package/dist-server/server/message-search.worker.js

@@ -0,0 +1,21 @@
+import { DatabaseSync } from "node:sqlite";
+import { parentPort, workerData } from "node:worker_threads";
+import { searchMessagesInDatabase } from "./message-search-query.js";
+// Each request reads the latest committed WAL state. Closing after the scan
+// avoids keeping an old database inode open across a workspace restore.
+parentPort.on("message", (request) => {
+    let db;
+    try {
+        db = new DatabaseSync(workerData.file, { readOnly: true });
+        const hits = searchMessagesInDatabase(db, request.query, request.limit, request.threadId);
+        parentPort.postMessage({ id: request.id, hits });
+    }
+    catch {
+        // Database errors can contain private paths or query text. The server
+        // returns a generic retryable error, never a synchronous fallback scan.
+        parentPort.postMessage({ id: request.id, failed: true });
+    }
+    finally {
+        db?.close();
+    }
+});