@marifold/core 0.64.0 → 0.65.0

package/dist/search/OllamaSearchBackend.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OllamaSearchBackend = void 0;
+const proxy_1 = require("../util/proxy");
+const OLLAMA_WEB_SEARCH_URL = 'https://ollama.com/api/web_search';
+const DEFAULT_API_KEY_ENV = 'OLLAMA_API_KEY';
+const DEFAULT_MAX_RESULTS = 5;
+const MAX_RESULTS = 10;
+/** Caller-executed Ollama Cloud search. This is deliberately a Marifold
+ * fallback backend rather than a local-model capability: queries leave the
+ * machine for ollama.com and require an account API key. */
+class OllamaSearchBackend {
+    apiKey;
+    apiKeyEnv;
+    proxy;
+    maxResults;
+    constructor(options = {}) {
+        this.apiKeyEnv = options.apiKeyEnv || DEFAULT_API_KEY_ENV;
+        this.apiKey = options.apiKey ?? process.env[this.apiKeyEnv];
+        this.proxy = options.proxy || process.env.HTTPS_PROXY || process.env.https_proxy || undefined;
+        this.maxResults = options.maxResults ?? DEFAULT_MAX_RESULTS;
+    }
+    async search(query, maxResults = this.maxResults) {
+        if (!this.apiKey) {
+            throw new Error(`Ollama web search requires an API key in ${this.apiKeyEnv} or web_search.api_key.`);
+        }
+        const limit = Math.min(MAX_RESULTS, Math.max(1, maxResults));
+        const init = {
+            method: 'POST',
+            headers: {
+                authorization: `Bearer ${this.apiKey}`,
+                'content-type': 'application/json',
+            },
+            body: JSON.stringify({ query, max_results: limit }),
+        };
+        const dispatcher = (0, proxy_1.proxyDispatcher)(this.proxy);
+        if (dispatcher) {
+            init.dispatcher = dispatcher;
+        }
+        const response = await fetch(OLLAMA_WEB_SEARCH_URL, init);
+        if (!response.ok) {
+            const detail = await safeText(response);
+            throw new Error(`Ollama web search failed: HTTP ${response.status}${detail ? ` — ${detail}` : ''}`);
+        }
+        const payload = await response.json();
+        return (payload.results ?? [])
+            .slice(0, limit)
+            .map(result => ({
+            title: (result.title ?? '').trim(),
+            url: result.url ?? '',
+            snippet: (result.content ?? '').trim(),
+        }));
+    }
+}
+exports.OllamaSearchBackend = OllamaSearchBackend;
+async function safeText(response) {
+    try {
+        return (await response.text()).slice(0, 200);
+    }
+    catch {
+        return '';
+    }
+}
+//# sourceMappingURL=OllamaSearchBackend.js.map

package/dist/search/OllamaSearchBackend.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OllamaSearchBackend.js","sourceRoot":"","sources":["../../src/search/OllamaSearchBackend.ts"],"names":[],"mappings":"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"}

package/dist/search/createSearchBackend.d.ts

@@ -6,11 +6,12 @@ import { SearchBackend } from './SearchBackend';
  * Priority is a config-time selection of ONE backend (not a runtime retry
  * cascade):
  *   - `firecrawl` → FirecrawlBackend (BYOK; AI-ready scraped results)
+ *   - `ollama`    → OllamaSearchBackend (BYOK; Ollama Cloud search)
  *   - else        → DuckDuckGoBackend (keyless best-effort floor)
  *
- * Future tier-1 "native" model search (provider server-side web_search) resolves
- * in priest, not here — marifold would simply skip registering its own
- * web_search tool for such a profile. See docs/roadmap.
+ * Provider-hosted model search resolves separately through the provider/model
+ * capability matrix; Marifold skips registering this caller-executed tool
+ * while that native path is active.
  */
 export declare function createSearchBackend(config: MarifoldWebSearchConfig): SearchBackend;
 //# sourceMappingURL=createSearchBackend.d.ts.map

package/dist/search/createSearchBackend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createSearchBackend.d.ts","sourceRoot":"","sources":["../../src/search/createSearchBackend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAGjE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,uBAAuB,GAAG,aAAa,CAWlF"}
+{"version":3,"file":"createSearchBackend.d.ts","sourceRoot":"","sources":["../../src/search/createSearchBackend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAIjE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,uBAAuB,GAAG,aAAa,CAmBlF"}

package/dist/search/createSearchBackend.js

@@ -3,17 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSearchBackend = createSearchBackend;
 const DuckDuckGoBackend_1 = require("./DuckDuckGoBackend");
 const FirecrawlBackend_1 = require("./FirecrawlBackend");
+const OllamaSearchBackend_1 = require("./OllamaSearchBackend");
 /**
  * Select the active web-search backend from the resolved [web_search] config.
  *
  * Priority is a config-time selection of ONE backend (not a runtime retry
  * cascade):
  *   - `firecrawl` → FirecrawlBackend (BYOK; AI-ready scraped results)
+ *   - `ollama`    → OllamaSearchBackend (BYOK; Ollama Cloud search)
  *   - else        → DuckDuckGoBackend (keyless best-effort floor)
  *
- * Future tier-1 "native" model search (provider server-side web_search) resolves
- * in priest, not here — marifold would simply skip registering its own
- * web_search tool for such a profile. See docs/roadmap.
+ * Provider-hosted model search resolves separately through the provider/model
+ * capability matrix; Marifold skips registering this caller-executed tool
+ * while that native path is active.
  */
 function createSearchBackend(config) {
     if (config.provider === 'firecrawl') {
@@ -25,6 +27,14 @@ function createSearchBackend(config) {
             maxResults: config.maxResults,
         });
     }
+    if (config.provider === 'ollama') {
+        return new OllamaSearchBackend_1.OllamaSearchBackend({
+            apiKey: config.apiKey,
+            apiKeyEnv: config.apiKeyEnv,
+            proxy: config.proxy,
+            maxResults: config.maxResults,
+        });
+    }
     return new DuckDuckGoBackend_1.DuckDuckGoBackend({ proxy: config.proxy });
 }
 //# sourceMappingURL=createSearchBackend.js.map

package/dist/search/createSearchBackend.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSearchBackend.js","sourceRoot":"","sources":["../../src/search/createSearchBackend.ts"],"names":[],"mappings":";;;AACA,2DAAwD;AACxD,yDAAsD;AAGtD;;;;;;;;;;;GAWG;AACH,6BAAoC,MAA+B;IACjE,IAAI,MAAM,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;QACpC,OAAO,IAAI,mCAAgB,CAAC;YAC1B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,UAAU,EAAE,MAAM,CAAC,UAAU;SAC9B,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAI,qCAAiB,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;AACxD,CAAC"}
+{"version":3,"file":"createSearchBackend.js","sourceRoot":"","sources":["../../src/search/createSearchBackend.ts"],"names":[],"mappings":";;;AACA,2DAAwD;AACxD,yDAAsD;AACtD,+DAA4D;AAG5D;;;;;;;;;;;;GAYG;AACH,6BAAoC,MAA+B;IACjE,IAAI,MAAM,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;QACpC,OAAO,IAAI,mCAAgB,CAAC;YAC1B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,UAAU,EAAE,MAAM,CAAC,UAAU;SAC9B,CAAC,CAAC;IACL,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,IAAI,yCAAmB,CAAC;YAC7B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,UAAU,EAAE,MAAM,CAAC,UAAU;SAC9B,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAI,qCAAiB,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;AACxD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marifold/core",
-  "version": "0.64.0",
+  "version": "0.65.0",
   "description": "Core runtime for Marifold",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,7 +8,7 @@
     "dist"
   ],
   "dependencies": {
-    "@priest-ai/core": "^3.0.1",
+    "@priest-ai/core": "^3.1.0",
     "better-sqlite3": "^13.0.1",
     "croner": "^10.0.1",
     "duck-duck-scrape": "^2.2.7",