@mnmal-ai/substrate-nl 1.0.0-alpha.1 → 1.0.0-alpha.10

package/dist/ask/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/ask/run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAS,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,KAAK,KAAK,EAAqC,MAAM,mBAAmB,CAAC;AAElF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAa,MAAM,aAAa,CAAC;AAElE,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAClB;AA+ED,wBAAuB,MAAM,CAC3B,GAAG,EAAE,UAAU,EACf,IAAI,EAAE,gBAAgB,EACtB,IAAI,EAAE,OAAO,GACZ,cAAc,CAAC,OAAO,CAAC,CA8GzB"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/ask/run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAS,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,KAAK,KAAK,EAAqC,MAAM,mBAAmB,CAAC;AAElF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAa,MAAM,aAAa,CAAC;AAElE,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAClB;AAkID,wBAAuB,MAAM,CAC3B,GAAG,EAAE,UAAU,EACf,IAAI,EAAE,gBAAgB,EACtB,IAAI,EAAE,OAAO,GACZ,cAAc,CAAC,OAAO,CAAC,CAqHzB"}

package/dist/{bootstrap-BpKUloR3.js → bootstrap-BDi2fdbS.js}

@@ -1,4 +1,4 @@
-import { defineBootstrap, error400, jsonResponse, parseJsonBody } from "@mnmal-ai/substrate/sdk";
+import { defineBootstrap, error400, jsonResponse, parseJsonBody, trimTrailingSlashes } from "@mnmal-ai/substrate/sdk";
 import { z } from "zod";
 import { createHash } from "node:crypto";
 
@@ -800,7 +800,10 @@ function buildJudgePrompt(question, result, pack, rulings = {}, rejected = []) {
 				]
 			}
 		})] : [],
-		branch("recall"),
+		branch("recall", { type: {
+			type: "string",
+			enum: allTypes
+		} }),
 		branch("clarify"),
 		branch("refuse"),
 		branch("escalate")
@@ -824,7 +827,7 @@ function buildJudgePrompt(question, result, pack, rulings = {}, rejected = []) {
 			"  of a name or id, contains = a word inside a title or subject. Never bind a word that only",
 			"  describes the question (e.g. \"status\", \"called\").",
 			"- recall: the question asks what is known ABOUT a topic (free-text subject words, not field values);",
-			"  semantic search over the text answers it.",
+			"  semantic search over the text answers it. Name the type whose rows hold that knowledge.",
 			"- clarify: RARE. Only when the question has two specific readings and nothing in it chooses one.",
 			"  Missing detail is not ambiguity: if a type or a topic fits, choose type or recall.",
 			"- refuse: the question is not about this store at all, or asks to change data.",
@@ -942,6 +945,7 @@ async function parseWithJudge(question, pack, ctx, judge, opts = {}) {
 			case "recall": return {
 				status: "recall",
 				query: question,
+				type: checked.type,
 				trail
 			};
 			case "clarify":
@@ -1007,22 +1011,59 @@ async function rows(c, source, http, deps, handoff) {
 	const frame = executable(c, deps.pack);
 	const key = Object.keys(frame)[0];
 	const env = await deps.engine.query(frame, http);
-	const present = env.data !== void 0 && key in env.data;
+	const data = env.data !== void 0 && key in env.data ? env.data?.[key] : void 0;
+	const errors = [...env.errors ?? []];
+	let count;
+	if (c.answer === "count" && Array.isArray(data)) {
+		const counted = await countRest(frame, key, data.length, env, http, deps);
+		if (typeof counted === "number") count = counted;
+		else errors.push(counted);
+	}
 	return {
 		kind: "rows",
 		frame,
 		answer: c.answer,
-		data: present ? env.data?.[key] : void 0,
-		...env.errors !== void 0 && env.errors.length > 0 ? { errors: env.errors } : {},
+		data,
+		...count !== void 0 ? { count } : {},
+		...errors.length > 0 ? { errors } : {},
 		source,
 		...handoff !== void 0 ? { handoff } : {}
 	};
 }
-async function recall(query, ns, http, deps) {
+const MAX_COUNT_PAGES = 1e3;
+/** The population a count candidate matches: `seen` rows from page one, then id-only pages after its cursor. */
+async function countRest(frame, key, seen, first, http, deps) {
+	const params = frame[key]?.params ?? {};
+	let count = seen;
+	let page = first._pagination?.[key];
+	for (let pages = 1; page?.hasMore === true; pages++) {
+		if (pages >= MAX_COUNT_PAGES || page.nextCursor === void 0 || isAborted(http)) return {
+			code: "count_incomplete",
+			message: `counted ${count} rows and stopped before the end; the true count is higher`
+		};
+		const env = await deps.engine.query({ [key]: {
+			params: {
+				...params,
+				cursor: page.nextCursor
+			},
+			fields: { id: true }
+		} }, http);
+		const rows = env.data?.[key];
+		if (!Array.isArray(rows)) return {
+			code: "count_incomplete",
+			message: `counted ${count} rows, then a page failed: ${JSON.stringify(env.errors ?? [])}`
+		};
+		count += rows.length;
+		page = env._pagination?.[key];
+	}
+	return count;
+}
+async function recall(query, ns, type, http, deps) {
 	const frame = { "recall/Hit": {
 		params: {
 			to: query,
 			namespace: ns,
+			type,
 			k: RECALL_K
 		},
 		fields: {
@@ -1142,7 +1183,7 @@ async function* runAsk(req, http, deps) {
 					outcome = await rows(judged.candidate, "judge", http, deps);
 					break;
 				case "recall":
-					outcome = await recall(judged.query, deps.pack.namespace, http, deps);
+					outcome = await recall(judged.query, deps.pack.namespace, ctx.forceType ?? judged.type, http, deps);
 					break;
 				case "refuse":
 					outcome = {
@@ -1178,7 +1219,7 @@ var OllamaJudge = class {
 	constructor(config) {
 		this.#config = {
 			...config,
-			baseUrl: config.baseUrl.replace(/\/+$/, "")
+			baseUrl: trimTrailingSlashes(config.baseUrl)
 		};
 	}
 	async decide(prompt, signal) {
@@ -1372,7 +1413,7 @@ function packField(name, def, operators) {
 			name,
 			kind: "scalar",
 			valueType: def.type,
-			indexed: def.indexed === true,
+			indexed: def.indexed !== false,
 			operators: [...operators[`scalar.${def.type}`] ?? []],
 			phrases,
 			...def.enum !== void 0 ? { enum: [...def.enum] } : {},
@@ -1492,7 +1533,7 @@ async function profileNamespace(input) {
 	return { types };
 }
 function profiled(def) {
-	if (def.kind === "scalar") return def.type === "string" && def.indexed === true;
+	if (def.kind === "scalar") return def.type === "string" && def.indexed !== false;
 	return def.kind === "list" && def.indexed === true && def.of.kind === "scalar" && def.of.type === "string";
 }
 

package/dist/bootstrap.js

@@ -1,3 +1,3 @@
-import { n as bootstrap, t as NlBootstrapConfigSchema } from "./bootstrap-BpKUloR3.js";
+import { n as bootstrap, t as NlBootstrapConfigSchema } from "./bootstrap-BDi2fdbS.js";
 
 export { NlBootstrapConfigSchema, bootstrap, bootstrap as default };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { a as askHandler, c as profileNamespace, d as mergeRulings, f as readRulings, g as parseQuestion, h as parseWithJudge, i as createNlPlugin, l as buildNamespacePack, m as runAsk, n as bootstrap, o as packHandler, p as OllamaJudge, r as CONTRACT_VERSION, s as PackService, t as NlBootstrapConfigSchema, u as NamespaceRulingsSchema } from "./bootstrap-BpKUloR3.js";
+import { a as askHandler, c as profileNamespace, d as mergeRulings, f as readRulings, g as parseQuestion, h as parseWithJudge, i as createNlPlugin, l as buildNamespacePack, m as runAsk, n as bootstrap, o as packHandler, p as OllamaJudge, r as CONTRACT_VERSION, s as PackService, t as NlBootstrapConfigSchema, u as NamespaceRulingsSchema } from "./bootstrap-BDi2fdbS.js";
 import { complete } from "./complete.js";
 
 export { CONTRACT_VERSION, NamespaceRulingsSchema, NlBootstrapConfigSchema, OllamaJudge, PackService, askHandler, bootstrap, buildNamespacePack, complete, createNlPlugin, mergeRulings, packHandler, parseQuestion, parseWithJudge, profileNamespace, readRulings, runAsk };

package/dist/judge/judge.d.ts

@@ -30,6 +30,7 @@ export type JudgedResult = {
 } | {
     status: 'recall';
     query: string;
+    type: string;
     trail: JudgeStep[];
 } | {
     status: 'clarify' | 'refuse';

package/dist/judge/judge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"judge.d.ts","sourceRoot":"","sources":["../../src/judge/judge.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEzF,OAAO,KAAK,EAAE,gBAAgB,EAAc,MAAM,oBAAoB,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EACL,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,WAAW,EAEjB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,WAAW,GAAG,aAAa,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG,aAAa,CAAC;AAExC,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,kFAAkF;IAClF,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,6EAA6E;AAC7E,MAAM,WAAW,KAAK;IACpB,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACrE;AAED,MAAM,MAAM,SAAS,GAAG,WAAW,CAAC;AAEpC,MAAM,MAAM,YAAY,GACpB;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,SAAS,EAAE,CAAA;CAAE,GAChE;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,EAAE,CAAA;CAAE,GACvD;IAAE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,EAAE,CAAA;CAAE,GACpE;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,SAAS,EAAE,CAAA;CAAE,CAAC;AAarE,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,WAAW,EACnB,IAAI,EAAE,aAAa,EACnB,OAAO,GAAE,gBAAqB,EAC9B,QAAQ,GAAE,MAAM,EAAO,GACtB,WAAW,CAqFb;AAED,wDAAwD;AACxD,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,MAAM,CAkBrF;AAkBD,MAAM,WAAW,YAAY;IAC3B,gDAAgD;IAChD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5E,uCAAuC;IACvC,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAmCD;;;GAGG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,aAAa,EACnB,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,KAAK,EACZ,IAAI,GAAE,YAAiB,GACtB,OAAO,CAAC,YAAY,CAAC,CA+DvB"}
+{"version":3,"file":"judge.d.ts","sourceRoot":"","sources":["../../src/judge/judge.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEzF,OAAO,KAAK,EAAE,gBAAgB,EAAc,MAAM,oBAAoB,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EACL,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,WAAW,EAEjB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,WAAW,GAAG,aAAa,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG,aAAa,CAAC;AAExC,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,kFAAkF;IAClF,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,6EAA6E;AAC7E,MAAM,WAAW,KAAK;IACpB,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACrE;AAED,MAAM,MAAM,SAAS,GAAG,WAAW,CAAC;AAEpC,MAAM,MAAM,YAAY,GACpB;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,SAAS,EAAE,CAAA;CAAE,GAChE;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,EAAE,CAAA;CAAE,GACrE;IAAE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,EAAE,CAAA;CAAE,GACpE;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,SAAS,EAAE,CAAA;CAAE,CAAC;AAarE,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,WAAW,EACnB,IAAI,EAAE,aAAa,EACnB,OAAO,GAAE,gBAAqB,EAC9B,QAAQ,GAAE,MAAM,EAAO,GACtB,WAAW,CAsFb;AAED,wDAAwD;AACxD,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,MAAM,CAkBrF;AAkBD,MAAM,WAAW,YAAY;IAC3B,gDAAgD;IAChD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5E,uCAAuC;IACvC,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAmCD;;;GAGG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,aAAa,EACnB,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,KAAK,EACZ,IAAI,GAAE,YAAiB,GACtB,OAAO,CAAC,YAAY,CAAC,CA+DvB"}

package/dist/judge/ollama.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../src/judge/ollama.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAErD,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,iDAAiD;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;GAMG;AACH,qBAAa,WAAY,YAAW,KAAK;;IAGvC,YAAY,MAAM,EAAE,iBAAiB,EAEpC;IAEK,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAqBxE;CACF"}
+{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../src/judge/ollama.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAErD,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,iDAAiD;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;GAMG;AACH,qBAAa,WAAY,YAAW,KAAK;;IAGvC,YAAY,MAAM,EAAE,iBAAiB,EAEpC;IAEK,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAqBxE;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mnmal-ai/substrate-nl",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.10",
   "description": "Natural-language questions for Substrate — a deterministic parser with an optional constrained judge, served at POST /substrate/v1/nl and GET /substrate/v1/nl/pack/:ns, plus browser-safe completion.",
   "license": "Apache-2.0",
   "repository": {
@@ -36,9 +36,9 @@
     "zod": "^4.6.5"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.5.15",
-    "@mnmal-ai/substrate": "1.0.0-alpha.1",
-    "@mnmal-ai/substrate-config": "1.0.0-alpha.1",
+    "@biomejs/biome": "2.6.2",
+    "@mnmal-ai/substrate": "1.0.0-alpha.10",
+    "@mnmal-ai/substrate-config": "1.0.0-alpha.10",
     "@types/node": "^26.6.4",
     "tsdown": "^0.23.0",
     "typescript": "^7.0.2",
@@ -48,7 +48,7 @@
     "@mnmal-ai/substrate": ">=1.0.0-alpha.0 <2.0.0"
   },
   "engines": {
-    "node": ">=26.2.0"
+    "node": ">=26.12.1"
   },
   "substrate": {
     "tier": "kernel",