@qvac/harness 0.7.2 → 0.8.0

package/dist-lib/lib/tools/weather-lookup.js

@@ -4,12 +4,13 @@ import { lookupHost } from '../dns-lookup.js';
 import { errorMessage } from '../guards.js';
 import { isRedirectStatus } from './http-request/request.js';
 import { resolveOutboundUrl } from './url-guard.js';
+import { choose, geocode, GEOCODE_TIMEOUT_MS, GEOCODER_HOST } from './weather-lookup/geocode.js';
 import { checkQualifier, cityMatches, describePlace, qualifierOf } from './weather-lookup/place.js';
 import { placeOf, renderReport, WeatherJsonSchema } from './weather-lookup/report.js';
 const WEATHER_HOST = 'wttr.in';
 const LOOKUP_TIMEOUT_MS = 15_000;
 const MAX_BODY_BYTES = 400_000;
-export function createWeatherLookupTool({ fetch: fetchImpl, resolveHost = lookupHost } = {}) {
+export function createWeatherLookupTool({ fetch = noRedirectFetch, resolveHost = lookupHost, geocodeTimeoutMs = GEOCODE_TIMEOUT_MS } = {}) {
     return {
         name: 'weather_lookup',
         toolset: 'http-request',
@@ -17,7 +18,8 @@ export function createWeatherLookupTool({ fetch: fetchImpl, resolveHost = lookup
         autoApprove: true,
         description: 'Look up the current weather and a three-day forecast for a place, via wttr.in. ' +
             'Returns the place the service resolved on its first line, then the conditions now and ' +
-            'one line per day. Use it for any question about weather, temperature or forecast.',
+            'one line per day. Use it for any question about weather, temperature or forecast. ' +
+            'When a name matches several places it answers with a question listing them.',
         parameters: {
             type: 'object',
             properties: {
@@ -30,93 +32,122 @@ export function createWeatherLookupTool({ fetch: fetchImpl, resolveHost = lookup
             required: ['location']
         },
         effect: () => 'read',
-        resource: () => ({ kind: 'host', label: WEATHER_HOST }),
-        async execute(args, ctx) {
-            const raw = args.location;
-            if (typeof raw !== 'string' || raw.trim().length === 0) {
-                return { error: 'location must be a non-empty string' };
-            }
-            const location = raw.trim();
-            if (ctx?.signal?.aborted) {
-                return { error: 'weather_lookup cancelled' };
-            }
-            const url = new URL(`https://${WEATHER_HOST}/${encodeURIComponent(location)}?format=j1`);
-            const fetch = fetchImpl ?? noRedirectFetch;
-            const controller = new AbortController();
-            const timeout = setTimeout(() => controller.abort(undefined), LOOKUP_TIMEOUT_MS);
-            const onCallerAbort = () => controller.abort(undefined);
-            ctx?.signal?.addEventListener('abort', onCallerAbort);
-            try {
-                const check = await resolveOutboundUrl(url, resolveHost, ctx?.signal);
-                if (check.blocked) {
-                    return { error: check.blocked };
-                }
-                const response = await fetch(url, {
-                    method: 'GET',
-                    headers: { Accept: 'application/json' },
-                    signal: controller.signal,
-                    redirect: 'manual',
-                    validatedAddresses: check.addresses,
-                    maxBytes: MAX_BODY_BYTES
-                });
-                if (isRedirectStatus(response.status)) {
-                    return { error: `${WEATHER_HOST} redirected the lookup for "${location}"` };
-                }
-                const body = await response.text();
-                if (/location not found/i.test(body)) {
-                    return { content: notFound(location) };
-                }
-                if (response.status !== 200) {
-                    return { error: unavailable(`it answered HTTP ${response.status}`), code: 'transport' };
-                }
-                let json;
-                try {
-                    json = WeatherJsonSchema.parse(JSON.parse(body));
-                }
-                catch {
-                    return { error: unavailable('it did not return a forecast') };
-                }
-                const place = placeOf(json);
-                if (place === null) {
-                    return { content: notFound(location) };
-                }
-                const qualifier = qualifierOf(location);
-                const verdict = qualifier === null ? null : checkQualifier(qualifier, place);
-                const named = cityMatches(location, place);
-                if (verdict === 'contradiction' && !named) {
-                    return {
-                        content: `No such place: "${location}". ${WEATHER_HOST} resolved it to ` +
-                            `${describePlace(place)}, which is somewhere else.`
-                    };
-                }
-                const verified = qualifier === null ? named : verdict === 'match';
-                return { content: renderReport(json, place, { asked: location, verified }) };
-            }
-            catch (err) {
-                if (ctx?.signal?.aborted) {
-                    return { error: 'weather_lookup cancelled' };
-                }
-                if (controller.signal.aborted) {
-                    return {
-                        error: `weather_lookup timed out after ${LOOKUP_TIMEOUT_MS} ms`,
-                        code: 'timeout'
-                    };
-                }
-                return {
-                    error: unavailable(errorMessage(err)),
-                    code: 'transport'
-                };
-            }
-            finally {
-                clearTimeout(timeout);
-                ctx?.signal?.removeEventListener('abort', onCallerAbort);
-            }
-        }
+        resource: () => ({ kind: 'host', label: `${GEOCODER_HOST}, ${WEATHER_HOST}` }),
+        execute: (args, ctx) => execute(args.location, ctx?.signal, { fetch, resolveHost, timeoutMs: geocodeTimeoutMs })
     };
 }
+async function execute(raw, callerSignal, deps) {
+    if (typeof raw !== 'string' || raw.trim().length === 0) {
+        return { error: 'location must be a non-empty string' };
+    }
+    const location = raw.trim();
+    if (callerSignal?.aborted) {
+        return { error: 'weather_lookup cancelled' };
+    }
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(undefined), LOOKUP_TIMEOUT_MS);
+    const onCallerAbort = () => controller.abort(undefined);
+    callerSignal?.addEventListener('abort', onCallerAbort);
+    try {
+        return await lookup(location, { ...deps, signal: controller.signal });
+    }
+    catch (err) {
+        return failure(err, controller.signal, callerSignal);
+    }
+    finally {
+        clearTimeout(timeout);
+        callerSignal?.removeEventListener('abort', onCallerAbort);
+    }
+}
+async function lookup(location, request) {
+    const city = (location.split(',')[0] ?? '').trim();
+    const candidates = city.length === 0 ? [] : await geocode(city, request);
+    const choice = choose(city, qualifierOf(location), candidates);
+    if (choice === null) {
+        return byName(location, request);
+    }
+    if ('contenders' in choice) {
+        return reply(which(city, choice.contenders));
+    }
+    return byCoordinates(location, choice, request);
+}
+async function byCoordinates(location, { place, verified }, request) {
+    const fetched = await forecast(`${place.latitude},${place.longitude}`, location, request);
+    if (!('json' in fetched)) {
+        return fetched;
+    }
+    return { content: renderReport(fetched.json, place, { asked: location, verified }) };
+}
+async function byName(location, request) {
+    const fetched = await forecast(encodeURIComponent(location), location, request);
+    if (!('json' in fetched)) {
+        return fetched;
+    }
+    const place = placeOf(fetched.json);
+    if (place === null) {
+        return reply(notFound(location));
+    }
+    const qualifier = qualifierOf(location);
+    const verdict = qualifier === null ? null : checkQualifier(qualifier, place);
+    const named = cityMatches(location, place);
+    if (verdict === 'contradiction' && !named) {
+        return reply(`No such place: "${location}". ${WEATHER_HOST} resolved it to ` +
+            `${describePlace(place)}, which is somewhere else.`);
+    }
+    const verified = qualifier === null ? named : verdict === 'match';
+    return { content: renderReport(fetched.json, place, { asked: location, verified }) };
+}
+async function forecast(path, location, request) {
+    const url = new URL(`https://${WEATHER_HOST}/${path}?format=j1`);
+    const check = await resolveOutboundUrl(url, request.resolveHost, request.signal);
+    if (check.blocked) {
+        return { error: check.blocked };
+    }
+    const response = await request.fetch(url, {
+        method: 'GET',
+        headers: { Accept: 'application/json' },
+        signal: request.signal,
+        redirect: 'manual',
+        validatedAddresses: check.addresses,
+        maxBytes: MAX_BODY_BYTES
+    });
+    if (isRedirectStatus(response.status)) {
+        return { error: `${WEATHER_HOST} redirected the lookup for "${location}"` };
+    }
+    return readForecast(response.status, await response.text(), location);
+}
+function readForecast(status, body, location) {
+    if (/location not found/i.test(body)) {
+        return reply(notFound(location));
+    }
+    if (status !== 200) {
+        return { error: unavailable(`it answered HTTP ${status}`), code: 'transport' };
+    }
+    try {
+        return { json: WeatherJsonSchema.parse(JSON.parse(body)) };
+    }
+    catch {
+        return { error: unavailable('it did not return a forecast') };
+    }
+}
+function failure(err, signal, callerSignal) {
+    if (callerSignal?.aborted) {
+        return { error: 'weather_lookup cancelled' };
+    }
+    if (signal.aborted) {
+        return { error: `weather_lookup timed out after ${LOOKUP_TIMEOUT_MS} ms`, code: 'timeout' };
+    }
+    return { error: unavailable(errorMessage(err)), code: 'transport' };
+}
 function unavailable(reason) {
     return `The weather service could not be reached: ${reason}.`;
 }
+function reply(content) {
+    return { content, answer: true };
+}
 function notFound(location) {
     return `No such place: "${location}". ${WEATHER_HOST} does not know it.`;
 }
+function which(city, places) {
+    return `Which ${city}: ${places.map(describePlace).join('; ')}?`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qvac/harness",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "type": "module",
   "engines": {
     "bare": ">=1.34.0"
@@ -478,6 +478,22 @@
       "types": "./dist-lib/lib/tools/outbound-guard.d.ts",
       "default": "./dist-lib/lib/tools/outbound-guard.js"
     },
+    "./lib/tools/pdf.ts": {
+      "types": "./dist-lib/lib/tools/pdf.d.ts",
+      "default": "./dist-lib/lib/tools/pdf.js"
+    },
+    "./lib/tools/pdf/build.ts": {
+      "types": "./dist-lib/lib/tools/pdf/build.d.ts",
+      "default": "./dist-lib/lib/tools/pdf/build.js"
+    },
+    "./lib/tools/pdf/images.ts": {
+      "types": "./dist-lib/lib/tools/pdf/images.d.ts",
+      "default": "./dist-lib/lib/tools/pdf/images.js"
+    },
+    "./lib/tools/pdf/request.ts": {
+      "types": "./dist-lib/lib/tools/pdf/request.d.ts",
+      "default": "./dist-lib/lib/tools/pdf/request.js"
+    },
     "./lib/tools/private-ip.ts": {
       "types": "./dist-lib/lib/tools/private-ip.d.ts",
       "default": "./dist-lib/lib/tools/private-ip.js"
@@ -606,6 +622,10 @@
       "types": "./dist-lib/lib/tools/weather-lookup.d.ts",
       "default": "./dist-lib/lib/tools/weather-lookup.js"
     },
+    "./lib/tools/weather-lookup/geocode.ts": {
+      "types": "./dist-lib/lib/tools/weather-lookup/geocode.d.ts",
+      "default": "./dist-lib/lib/tools/weather-lookup/geocode.js"
+    },
     "./lib/tools/weather-lookup/place.ts": {
       "types": "./dist-lib/lib/tools/weather-lookup/place.d.ts",
       "default": "./dist-lib/lib/tools/weather-lookup/place.js"
@@ -712,6 +732,11 @@
       "types": "@qvac/sdk",
       "bare": "@qvac/inference",
       "default": "@qvac/sdk"
+    },
+    "#zlib": {
+      "types": "bare-zlib",
+      "bare": "bare-zlib",
+      "default": "zlib"
     }
   },
   "dependencies": {
@@ -719,6 +744,7 @@
     "@qvac/langdetect-text": "0.1.2",
     "@qvac/sdk": "0.20.0",
     "@qvac/skills": "0.1.9",
+    "@xmldom/xmldom": "^0.9.12",
     "asenion": "^0.1.0",
     "b4a": "^1.9.0",
     "bare-abort-controller": "^1.1.2",
@@ -739,6 +765,7 @@
     "bare-net": "^2.3.2",
     "bare-os": "^3.9.1",
     "bare-path": "^3.0.1",
+    "bare-pdfium": "^1.6.0",
     "bare-process": "4.4.1",
     "bare-sidecar": "0.5.7",
     "bare-storage": "^1.1.0",
@@ -750,6 +777,7 @@
     "bare-tty": "^5.1.2",
     "bare-url": "^2.4.5",
     "bare-worker": "^4.5.0",
+    "bare-zlib": "^1.4.1",
     "compact-encoding": "^3.4.0",
     "hrpc": "^4.3.0",
     "hyperschema": "^1.23.0",

package/worker/harness-sidecar.mjs

@@ -21,6 +21,7 @@ import { createGrepTool } from '../dist-lib/lib/tools/grep.js'
 import { createHttpRequestTool } from '../dist-lib/lib/tools/http-request.js'
 import { createMcpCallTool } from '../dist-lib/lib/tools/mcp-call.js'
 import { compileOperationTools } from '../dist-lib/lib/tools/operations/compile.js'
+import { createPdfTool } from '../dist-lib/lib/tools/pdf.js'
 import { createReadFilesTool } from '../dist-lib/lib/tools/read-files.js'
 import { createSkillTool } from '../dist-lib/lib/tools/skill.js'
 import { ensureBundledSkillsDir } from '../dist-lib/lib/tools/skills/bundled-dir.js'
@@ -132,7 +133,8 @@ export default async function start(ipc, ready) {
     createFileGlobTool({ deniedRoots }),
     createGrepTool({ deniedRoots }),
     createCreateDocumentsTool({ deniedRoots }),
-    createEditDocumentsTool({ deniedRoots })
+    createEditDocumentsTool({ deniedRoots }),
+    createPdfTool()
   ]
   if (skillCatalog) {
     tools.push(...compileOperationTools(skillCatalog, { httpRequestTool, mcpCallTool }))