@opendatalabs/personal-server-ts-server 1.13.1 → 1.15.0

package/dist/storage/question-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"question-store.d.ts","sourceRoot":"","sources":["../../src/storage/question-store.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,mDAAmD,CAAC;AAgE3D,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,QAAQ,CAAC,QAAQ,GACpB,aAAa,CAsFf"}
+{"version":3,"file":"question-store.d.ts","sourceRoot":"","sources":["../../src/storage/question-store.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAML,KAAK,aAAa,EACnB,MAAM,mDAAmD,CAAC;AAkG3D,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,QAAQ,CAAC,QAAQ,GACpB,aAAa,CAwGf"}

package/dist/storage/question-store.js

@@ -11,16 +11,44 @@ CREATE TABLE IF NOT EXISTS derivative_questions (
   source_scopes TEXT NOT NULL,
   question TEXT NOT NULL,
   model TEXT,
+  answer_shape TEXT,
   recompute TEXT NOT NULL DEFAULT 'on-change',
   registered_by TEXT NOT NULL,
   status TEXT NOT NULL,
   error TEXT,
+  error_code TEXT,
   created_at TEXT NOT NULL,
   updated_at TEXT NOT NULL,
   last_computed_at TEXT,
   derived_version INTEGER,
   derived_collected_at TEXT
 )`;
+/**
+ * Databases created before the column existed migrate in place. ALTER is
+ * guarded by a pragma check because SQLite has no ADD COLUMN IF NOT EXISTS;
+ * existing rows read back as null (pre-classification failures).
+ */
+function ensureErrorCodeColumn(db) {
+    const columns = db
+        .prepare("PRAGMA table_info(derivative_questions)")
+        .all();
+    if (columns.some((column) => column.name === "error_code"))
+        return;
+    db.exec("ALTER TABLE derivative_questions ADD COLUMN error_code TEXT");
+}
+/**
+ * Same in-place migration for the declared answer shape (stored as its
+ * JSON): rows written before it existed read back as null, which is the
+ * free-text answer the question was registered with.
+ */
+function ensureAnswerShapeColumn(db) {
+    const columns = db
+        .prepare("PRAGMA table_info(derivative_questions)")
+        .all();
+    if (columns.some((column) => column.name === "answer_shape"))
+        return;
+    db.exec("ALTER TABLE derivative_questions ADD COLUMN answer_shape TEXT");
+}
 const CREATE_INDEX_SQL = "CREATE INDEX IF NOT EXISTS idx_derivative_questions_derived_scope ON derivative_questions (derived_scope)";
 // Databases created before the recompute policy existed migrate in place;
 // their registrations keep the old follow-every-change behavior.
@@ -32,10 +60,14 @@ function toRegistration(row) {
         sourceScopes: JSON.parse(row.source_scopes),
         question: row.question,
         model: row.model,
+        answerShape: row.answer_shape
+            ? JSON.parse(row.answer_shape)
+            : null,
         recompute: row.recompute,
         registeredBy: JSON.parse(row.registered_by),
         status: row.status,
         error: row.error,
+        errorCode: row.error_code ?? null,
         createdAt: row.created_at,
         updatedAt: row.updated_at,
         lastComputedAt: row.last_computed_at,
@@ -45,6 +77,8 @@ function toRegistration(row) {
 }
 export function createSqliteQuestionStore(db) {
     db.exec(CREATE_TABLE_SQL);
+    ensureErrorCodeColumn(db);
+    ensureAnswerShapeColumn(db);
     db.exec(CREATE_INDEX_SQL);
     const columns = db
         .prepare("PRAGMA table_info(derivative_questions)")
@@ -53,21 +87,26 @@ export function createSqliteQuestionStore(db) {
         db.exec(ADD_RECOMPUTE_COLUMN_SQL);
     }
     const listAll = db.prepare("SELECT * FROM derivative_questions ORDER BY created_at ASC, question_id ASC");
+    // The status route polls list({ derivedScope }) on every reader request;
+    // this is the query idx_derivative_questions_derived_scope exists for.
+    const listByDerivedScope = db.prepare("SELECT * FROM derivative_questions WHERE derived_scope = ? ORDER BY created_at ASC, question_id ASC");
     const getOne = db.prepare("SELECT * FROM derivative_questions WHERE question_id = ?");
     const insertOne = db.prepare(`
     INSERT INTO derivative_questions (
-      question_id, derived_scope, source_scopes, question, model, recompute,
-      registered_by, status, error, created_at, updated_at,
+      question_id, derived_scope, source_scopes, question, model, answer_shape,
+      recompute, registered_by, status, error, error_code, created_at, updated_at,
       last_computed_at, derived_version, derived_collected_at
     ) VALUES (
       @question_id, @derived_scope, @source_scopes, @question, @model,
-      @recompute, @registered_by, @status, @error, @created_at, @updated_at,
+      @answer_shape, @recompute, @registered_by, @status, @error, @error_code,
+      @created_at, @updated_at,
       @last_computed_at, @derived_version, @derived_collected_at
     )`);
     const updateOne = db.prepare(`
     UPDATE derivative_questions SET
       status = @status,
       error = @error,
+      error_code = @error_code,
       updated_at = @updated_at,
       last_computed_at = @last_computed_at,
       derived_version = @derived_version,
@@ -76,7 +115,10 @@ export function createSqliteQuestionStore(db) {
     const deleteOne = db.prepare("DELETE FROM derivative_questions WHERE question_id = ?");
     return {
         async list(filter) {
-            return listAll.all()
+            const rows = filter?.derivedScope !== undefined
+                ? listByDerivedScope.all(filter.derivedScope)
+                : listAll.all();
+            return rows
                 .map(toRegistration)
                 .filter((registration) => matchesQuestionFilter(registration, filter));
         },
@@ -91,10 +133,14 @@ export function createSqliteQuestionStore(db) {
                 source_scopes: JSON.stringify(registration.sourceScopes),
                 question: registration.question,
                 model: registration.model,
+                answer_shape: registration.answerShape
+                    ? JSON.stringify(registration.answerShape)
+                    : null,
                 recompute: registration.recompute,
                 registered_by: JSON.stringify(registration.registeredBy),
                 status: registration.status,
                 error: registration.error,
+                error_code: registration.errorCode,
                 created_at: registration.createdAt,
                 updated_at: registration.updatedAt,
                 last_computed_at: registration.lastComputedAt,
@@ -111,6 +157,7 @@ export function createSqliteQuestionStore(db) {
                 question_id: questionId,
                 status: merged.status,
                 error: merged.error,
+                error_code: merged.errorCode ?? null,
                 updated_at: merged.updatedAt,
                 last_computed_at: merged.lastComputedAt,
                 derived_version: merged.derivedVersion,

package/dist/storage/question-store.js.map

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

package/dist/ui/ps-lite-debug.js

@@ -61644,8 +61644,8 @@ var require_multipleOf = __commonJS({
         const { gen: gen2, data, schemaCode, it: it3 } = cxt;
         const prec = it3.opts.multipleOfPrecision;
         const res = gen2.let("res");
-        const invalid = prec ? (0, codegen_1._)`Math.abs(Math.round(${res}) - ${res}) > 1e-${prec}` : (0, codegen_1._)`${res} !== parseInt(${res})`;
-        cxt.fail$data((0, codegen_1._)`(${schemaCode} === 0 || (${res} = ${data}/${schemaCode}, ${invalid}))`);
+        const invalid2 = prec ? (0, codegen_1._)`Math.abs(Math.round(${res}) - ${res}) > 1e-${prec}` : (0, codegen_1._)`${res} !== parseInt(${res})`;
+        cxt.fail$data((0, codegen_1._)`(${schemaCode} === 0 || (${res} = ${data}/${schemaCode}, ${invalid2}))`);
       }
     };
     exports.default = def;
@@ -67542,8 +67542,8 @@ var require_multipleOf2 = __commonJS({
         const { gen: gen2, data, schemaCode, it: it3 } = cxt;
         const prec = it3.opts.multipleOfPrecision;
         const res = gen2.let("res");
-        const invalid = prec ? (0, codegen_1._)`Math.abs(Math.round(${res}) - ${res}) > 1e-${prec}` : (0, codegen_1._)`${res} !== parseInt(${res})`;
-        cxt.fail$data((0, codegen_1._)`(${schemaCode} === 0 || (${res} = ${data}/${schemaCode}, ${invalid}))`);
+        const invalid2 = prec ? (0, codegen_1._)`Math.abs(Math.round(${res}) - ${res}) > 1e-${prec}` : (0, codegen_1._)`${res} !== parseInt(${res})`;
+        cxt.fail$data((0, codegen_1._)`(${schemaCode} === 0 || (${res} = ${data}/${schemaCode}, ${invalid2}))`);
       }
     };
     exports.default = def;
@@ -114031,6 +114031,258 @@ async function loadOrCreatePsLiteServerIdentity(params) {
   return { persisted, account };
 }
 
+// ../core/dist/derivatives/answer-shape.js
+var MAX_ANSWER_SHAPE_FIELDS = 16;
+var MAX_ANSWER_FIELD_NAME_CHARS = 64;
+var MAX_ANSWER_STRING_CHARS = 4e3;
+var MAX_ANSWER_ENUM_VALUES = 32;
+var MAX_ANSWER_ENUM_VALUE_CHARS = 64;
+var FIELD_NAME = /^[A-Za-z][A-Za-z0-9_]*$/;
+var FIELD_TYPES = [
+  "string",
+  "number",
+  "integer",
+  "boolean",
+  "enum"
+];
+var KEYS_BY_TYPE = {
+  string: ["name", "type", "required", "maxLength"],
+  number: ["name", "type", "required", "min", "max"],
+  integer: ["name", "type", "required", "min", "max"],
+  boolean: ["name", "type", "required"],
+  enum: ["name", "type", "required", "values"]
+};
+function isRecord4(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function invalid(message, details) {
+  throw new DerivativeQuestionInvalidError(message, {
+    field: "answerShape",
+    ...details
+  });
+}
+function parseFieldName(value, index) {
+  if (typeof value !== "string" || value === "") {
+    invalid(`answerShape.fields[${index}].name must be a non-empty string`, {
+      index
+    });
+  }
+  if (value.length > MAX_ANSWER_FIELD_NAME_CHARS) {
+    invalid(`answerShape.fields[${index}].name is ${value.length} characters; the maximum is ${MAX_ANSWER_FIELD_NAME_CHARS}`, { index, max: MAX_ANSWER_FIELD_NAME_CHARS });
+  }
+  if (!FIELD_NAME.test(value)) {
+    invalid(`answerShape.fields[${index}].name must start with a letter and hold only letters, digits and underscores`, { index });
+  }
+  return value;
+}
+function parseBound(value, index, key, integer2) {
+  if (typeof value !== "number" || !Number.isFinite(value)) {
+    invalid(`answerShape.fields[${index}].${key} must be a finite number`, {
+      index,
+      key
+    });
+  }
+  if (integer2 && !Number.isSafeInteger(value)) {
+    invalid(`answerShape.fields[${index}].${key} must be a safe integer for an integer field`, { index, key });
+  }
+  return value;
+}
+function parseEnumValues(value, index) {
+  if (!Array.isArray(value) || value.length === 0) {
+    invalid(`answerShape.fields[${index}].values must be a non-empty array of strings`, { index });
+  }
+  if (value.length > MAX_ANSWER_ENUM_VALUES) {
+    invalid(`answerShape.fields[${index}].values lists ${value.length} values; the maximum is ${MAX_ANSWER_ENUM_VALUES}`, { index, max: MAX_ANSWER_ENUM_VALUES });
+  }
+  const values = [];
+  for (const entry of value) {
+    if (typeof entry !== "string" || entry === "") {
+      invalid(`answerShape.fields[${index}].values must hold non-empty strings`, { index });
+    }
+    if (entry.length > MAX_ANSWER_ENUM_VALUE_CHARS) {
+      invalid(`answerShape.fields[${index}].values holds a ${entry.length} character value; the maximum is ${MAX_ANSWER_ENUM_VALUE_CHARS}`, { index, max: MAX_ANSWER_ENUM_VALUE_CHARS });
+    }
+    if (/[\n\r\t]/.test(entry)) {
+      invalid(`answerShape.fields[${index}].values must not hold line breaks or tabs`, { index });
+    }
+    if (values.includes(entry)) {
+      invalid(`answerShape.fields[${index}].values lists the same value twice`, { index });
+    }
+    values.push(entry);
+  }
+  return values;
+}
+function parseField(value, index) {
+  if (!isRecord4(value)) {
+    invalid(`answerShape.fields[${index}] must be an object`, { index });
+  }
+  const name = parseFieldName(value.name, index);
+  if (typeof value.type !== "string" || !FIELD_TYPES.includes(value.type)) {
+    invalid(`answerShape.fields[${index}].type must be one of ${FIELD_TYPES.join(", ")}`, { index });
+  }
+  const type = value.type;
+  const allowed = KEYS_BY_TYPE[type];
+  for (const key of Object.keys(value)) {
+    if (!allowed.includes(key)) {
+      invalid(`answerShape.fields[${index}] does not accept "${key}" on a ${type} field`, { index, key: key.slice(0, MAX_ANSWER_FIELD_NAME_CHARS) });
+    }
+  }
+  let required2 = true;
+  if (value.required !== void 0 && value.required !== null) {
+    if (typeof value.required !== "boolean") {
+      invalid(`answerShape.fields[${index}].required must be a boolean`, {
+        index
+      });
+    }
+    required2 = value.required;
+  }
+  const field = { name, type, required: required2 };
+  if (type === "string") {
+    let maxLength = MAX_ANSWER_STRING_CHARS;
+    if (value.maxLength !== void 0 && value.maxLength !== null) {
+      if (typeof value.maxLength !== "number" || !Number.isSafeInteger(value.maxLength) || value.maxLength < 1 || value.maxLength > MAX_ANSWER_STRING_CHARS) {
+        invalid(`answerShape.fields[${index}].maxLength must be an integer between 1 and ${MAX_ANSWER_STRING_CHARS}`, { index, max: MAX_ANSWER_STRING_CHARS });
+      }
+      maxLength = value.maxLength;
+    }
+    field.maxLength = maxLength;
+  }
+  if (type === "number" || type === "integer") {
+    const integer2 = type === "integer";
+    if (value.min !== void 0 && value.min !== null) {
+      field.min = parseBound(value.min, index, "min", integer2);
+    }
+    if (value.max !== void 0 && value.max !== null) {
+      field.max = parseBound(value.max, index, "max", integer2);
+    }
+    if (field.min !== void 0 && field.max !== void 0 && field.min > field.max) {
+      invalid(`answerShape.fields[${index}].min is greater than its max`, {
+        index
+      });
+    }
+  }
+  if (type === "enum") {
+    field.values = parseEnumValues(value.values, index);
+  }
+  return field;
+}
+function parseAnswerShapeInput(value) {
+  if (value === void 0 || value === null)
+    return null;
+  if (!isRecord4(value)) {
+    invalid("answerShape must be an object with a fields array", {});
+  }
+  for (const key of Object.keys(value)) {
+    if (key !== "fields") {
+      invalid(`answerShape does not accept "${key}"`, {
+        key: key.slice(0, MAX_ANSWER_FIELD_NAME_CHARS)
+      });
+    }
+  }
+  if (!Array.isArray(value.fields) || value.fields.length === 0) {
+    invalid("answerShape.fields must be a non-empty array", {});
+  }
+  if (value.fields.length > MAX_ANSWER_SHAPE_FIELDS) {
+    invalid(`answerShape.fields lists ${value.fields.length} fields; the maximum is ${MAX_ANSWER_SHAPE_FIELDS}`, { max: MAX_ANSWER_SHAPE_FIELDS });
+  }
+  const fields = [];
+  const names = /* @__PURE__ */ new Set();
+  value.fields.forEach((entry, index) => {
+    const field = parseField(entry, index);
+    if (names.has(field.name)) {
+      invalid(`answerShape.fields names "${field.name}" twice`, { index });
+    }
+    names.add(field.name);
+    fields.push(field);
+  });
+  return { fields };
+}
+function compileAnswerShape(shape) {
+  const entries = {};
+  for (const field of shape.fields) {
+    let schema;
+    switch (field.type) {
+      case "string":
+        schema = external_exports.string().max(field.maxLength ?? MAX_ANSWER_STRING_CHARS);
+        break;
+      case "number":
+      case "integer": {
+        let numeric = field.type === "integer" ? external_exports.int() : external_exports.number();
+        if (field.min !== void 0)
+          numeric = numeric.min(field.min);
+        if (field.max !== void 0)
+          numeric = numeric.max(field.max);
+        schema = numeric;
+        break;
+      }
+      case "boolean":
+        schema = external_exports.boolean();
+        break;
+      case "enum":
+        schema = external_exports.enum(field.values ?? []);
+        break;
+    }
+    entries[field.name] = field.required ? schema : schema.nullish();
+  }
+  return external_exports.object(entries);
+}
+function validateAnswerShape(shape, compiled, candidate) {
+  const parsed = compiled.safeParse(candidate);
+  if (!parsed.success) {
+    return {
+      ok: false,
+      // zod's messages state the constraint ("expected int", "<=5") and
+      // never echo the received value, so they are safe to hand back to
+      // the model in the corrective turn.
+      issues: parsed.error.issues.map((issue2) => {
+        const path = issue2.path.join(".");
+        return path ? `${path}: ${issue2.message}` : issue2.message;
+      })
+    };
+  }
+  const value = {};
+  for (const field of shape.fields) {
+    const entry = parsed.data[field.name];
+    if (entry === void 0 || entry === null)
+      continue;
+    value[field.name] = entry;
+  }
+  return { ok: true, value };
+}
+function describeField(field) {
+  const requirement = field.required ? "required" : "optional";
+  switch (field.type) {
+    case "string":
+      return `"${field.name}": string, at most ${field.maxLength ?? MAX_ANSWER_STRING_CHARS} characters (${requirement})`;
+    case "number":
+    case "integer": {
+      const kind = field.type === "integer" ? "integer" : "number";
+      const range = field.min !== void 0 && field.max !== void 0 ? ` between ${field.min} and ${field.max}` : field.min !== void 0 ? ` of at least ${field.min}` : field.max !== void 0 ? ` of at most ${field.max}` : "";
+      return `"${field.name}": ${kind}${range} (${requirement})`;
+    }
+    case "boolean":
+      return `"${field.name}": true or false (${requirement})`;
+    case "enum":
+      return `"${field.name}": exactly one of ${(field.values ?? []).map((entry) => JSON.stringify(entry)).join(", ")} (${requirement})`;
+  }
+}
+function describeAnswerShape(shape) {
+  return shape.fields.map((field) => `  ${describeField(field)}`);
+}
+function renderShapedAnswer(shape, value) {
+  return shape.fields.filter((field) => value[field.name] !== void 0).map((field) => `${field.name}: ${String(value[field.name])}`).join("\n");
+}
+function cloneAnswerShape(shape) {
+  if (!shape)
+    return null;
+  return {
+    fields: shape.fields.map((field) => ({
+      ...field,
+      ...field.values ? { values: [...field.values] } : {}
+    }))
+  };
+}
+
 // ../core/dist/derivatives/types.js
 function questionRegistrationView(registration) {
   return {
@@ -114039,10 +114291,12 @@ function questionRegistrationView(registration) {
     sourceScopes: [...registration.sourceScopes],
     question: registration.question,
     model: registration.model,
+    answerShape: cloneAnswerShape(registration.answerShape),
     recompute: registration.recompute,
     registeredBy: registration.registeredBy,
     status: registration.status,
     error: registration.error,
+    errorCode: registration.errorCode,
     createdAt: registration.createdAt,
     updatedAt: registration.updatedAt,
     lastComputedAt: registration.lastComputedAt,
@@ -114055,6 +114309,9 @@ function questionRegistrationView(registration) {
 function clone2(registration) {
   return {
     ...registration,
+    // Registrations persisted before the field existed load as null.
+    errorCode: registration.errorCode ?? null,
+    answerShape: cloneAnswerShape(registration.answerShape ?? null),
     sourceScopes: [...registration.sourceScopes],
     registeredBy: { ...registration.registeredBy }
   };
@@ -114125,7 +114382,7 @@ var MAX_QUESTION_CHARS = 8e3;
 var MAX_MODEL_CHARS = 128;
 var MAX_ECHOED_SCOPE_CHARS = 128;
 var MODEL_ID = /^[A-Za-z0-9][A-Za-z0-9._:/-]*$/;
-function isRecord4(value) {
+function isRecord5(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function parseScope(value, field) {
@@ -114141,7 +114398,7 @@ function parseScope(value, field) {
   return parsed.scope;
 }
 function parseQuestionInput(body) {
-  if (!isRecord4(body)) {
+  if (!isRecord5(body)) {
     throw new DerivativeQuestionInvalidError("Body must be a JSON object");
   }
   const derivedScope = parseScope(body.derivedScope, "derivedScope");
@@ -114175,6 +114432,7 @@ function parseQuestionInput(body) {
     }
     model = body.model;
   }
+  const answerShape = parseAnswerShapeInput(body.answerShape);
   let recompute = "on-change";
   if (body.recompute !== void 0 && body.recompute !== null) {
     if (body.recompute !== "snapshot" && body.recompute !== "on-change") {
@@ -114188,6 +114446,7 @@ function parseQuestionInput(body) {
     sourceScopes,
     question: body.question,
     model,
+    answerShape,
     recompute
   };
 }
@@ -114237,10 +114496,12 @@ async function createQuestionRegistration(input) {
     sourceScopes: parsed.sourceScopes,
     question: parsed.question,
     model: parsed.model,
+    answerShape: parsed.answerShape,
     recompute: parsed.recompute,
     registeredBy: input.registeredBy,
     status: "pending",
     error: null,
+    errorCode: null,
     createdAt: at3,
     updatedAt: at3,
     lastComputedAt: null,
@@ -114273,11 +114534,11 @@ var TIMESTAMP_KEYS = [
   "published_at"
 ];
 var RESERVED_KEYS = /* @__PURE__ */ new Set(["$lineage", "$writtenBy", "$binary"]);
-function isRecord5(value) {
+function isRecord6(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function timestampOf(item) {
-  if (!isRecord5(item))
+  if (!isRecord6(item))
     return null;
   for (const key of TIMESTAMP_KEYS) {
     const value = item[key];
@@ -114318,7 +114579,7 @@ function trimSourceData(data, options = {}) {
     total = 0;
     if (Array.isArray(data))
       return trimArray(data, limit2);
-    if (isRecord5(data)) {
+    if (isRecord6(data)) {
       const stamped = "$lineage" in data;
       const out = {};
       for (const [key, value] of Object.entries(data)) {
@@ -114350,13 +114611,28 @@ function trimSourceData(data, options = {}) {
   }
   return { data: result, kept, total, truncated: false };
 }
-var SYSTEM_PROMPT = [
+var GROUNDING = [
   "You answer a question about a person using ONLY the user data provided in the message.",
-  "Do not use outside knowledge and do not guess; if the data does not support an answer, say so in the answer.",
+  "Do not use outside knowledge and do not guess; if the data does not support an answer, say so in the answer."
+];
+var SYSTEM_PROMPT = [
+  ...GROUNDING,
   "Respond with a single JSON object and nothing else, with exactly these fields:",
   '  "answer": string, the answer to the question, written for the person the data belongs to;',
   '  "evidence": string, a short summary of which parts of the data support the answer.'
 ].join("\n");
+function shapedSystemPrompt(shape) {
+  return [
+    ...GROUNDING,
+    "Respond with a single JSON object and nothing else, with exactly these fields:",
+    '  "answer": object, holding exactly the fields listed below and no others;',
+    '  "evidence": string, a short summary of which parts of the data support the answer.',
+    'The "answer" object holds:',
+    ...describeAnswerShape(shape),
+    "Use the declared type for every field: a number field is a JSON number, not a string.",
+    "Do not add fields, do not rename them and do not put prose outside them."
+  ].join("\n");
+}
 function buildQuestionMessages(input) {
   const sections = input.sources.map((source) => {
     const note = source.total > source.kept ? ` (newest ${source.kept} of ${source.total} items)` : "";
@@ -114374,14 +114650,34 @@ function buildQuestionMessages(input) {
     "## User data",
     ...sections,
     "",
-    "Answer the question as a JSON object with the fields answer and evidence."
+    input.answerShape ? "Answer the question as a JSON object with the fields answer and evidence, where answer holds exactly the declared fields." : "Answer the question as a JSON object with the fields answer and evidence."
   ].join("\n");
   return [
-    { role: "system", content: SYSTEM_PROMPT },
+    {
+      role: "system",
+      content: input.answerShape ? shapedSystemPrompt(input.answerShape) : SYSTEM_PROMPT
+    },
     { role: "user", content: user }
   ];
 }
-function parseAnswer(content) {
+function buildShapeRetryMessages(input) {
+  return [
+    ...input.messages,
+    { role: "assistant", content: input.reply },
+    {
+      role: "user",
+      content: [
+        "That reply did not match the required answer shape:",
+        ...input.issues.map((issue2) => `- ${issue2}`),
+        "",
+        'Answer again as a single JSON object with the fields answer and evidence, where "answer" holds:',
+        ...describeAnswerShape(input.answerShape),
+        "Return the JSON object and nothing else."
+      ].join("\n")
+    }
+  ];
+}
+function jsonFramings(content) {
   const candidates = [content.trim()];
   const fenced = /```(?:json)?\s*([\s\S]*?)```/i.exec(content);
   if (fenced?.[1])
@@ -114391,10 +114687,13 @@ function parseAnswer(content) {
   if (first !== -1 && last2 > first) {
     candidates.push(content.slice(first, last2 + 1));
   }
-  for (const candidate of candidates) {
+  return [...new Set(candidates)];
+}
+function parseAnswer(content) {
+  for (const candidate of jsonFramings(content)) {
     try {
       const parsed = JSON.parse(candidate);
-      if (isRecord5(parsed) && typeof parsed.answer === "string") {
+      if (isRecord6(parsed) && typeof parsed.answer === "string") {
         return {
           answer: parsed.answer,
           evidence: typeof parsed.evidence === "string" ? parsed.evidence : null
@@ -114405,6 +114704,25 @@ function parseAnswer(content) {
   }
   return { answer: content.trim(), evidence: null };
 }
+function parseShapedAnswer(content) {
+  const found = [];
+  for (const candidate of jsonFramings(content)) {
+    let parsed;
+    try {
+      parsed = JSON.parse(candidate);
+    } catch {
+      continue;
+    }
+    if (!isRecord6(parsed))
+      continue;
+    const evidence = typeof parsed.evidence === "string" ? parsed.evidence : null;
+    if (isRecord6(parsed.answer)) {
+      found.push({ answer: parsed.answer, evidence });
+    }
+    found.push({ answer: parsed, evidence });
+  }
+  return found;
+}
 
 // ../core/dist/derivatives/inference.js
 var DEFAULT_INFERENCE_BASE_URL = "https://inference.phala.com/v1";
@@ -114431,11 +114749,11 @@ var InferenceRequestError = class extends Error {
     this.retryable = options.retryable;
   }
 };
-function isRecord6(value) {
+function isRecord7(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function readUsage(value) {
-  if (!isRecord6(value))
+  if (!isRecord7(value))
     return void 0;
   const num2 = (v10) => typeof v10 === "number" ? v10 : void 0;
   const usage = {
@@ -114446,10 +114764,10 @@ function readUsage(value) {
   return usage;
 }
 function readContent(body) {
-  if (!isRecord6(body) || !Array.isArray(body.choices))
+  if (!isRecord7(body) || !Array.isArray(body.choices))
     return null;
   const first = body.choices[0];
-  if (!isRecord6(first) || !isRecord6(first.message))
+  if (!isRecord7(first) || !isRecord7(first.message))
     return null;
   const index = typeof first.index === "number" ? first.index : 0;
   const field = `choices.${index}.message.content`;
@@ -114458,7 +114776,7 @@ function readContent(body) {
   if (typeof content === "string")
     return { content, field, id: id2 };
   if (Array.isArray(content)) {
-    const text = content.map((part) => isRecord6(part) && typeof part.text === "string" ? part.text : "").join("");
+    const text = content.map((part) => isRecord7(part) && typeof part.text === "string" ? part.text : "").join("");
     return { content: text, field, id: id2 };
   }
   return null;
@@ -114466,7 +114784,7 @@ function readContent(body) {
 async function readErrorType(response) {
   try {
     const body = await response.json();
-    if (isRecord6(body) && isRecord6(body.error)) {
+    if (isRecord7(body) && isRecord7(body.error)) {
       return typeof body.error.type === "string" ? body.error.type : null;
     }
   } catch {
@@ -114574,7 +114892,7 @@ function createOpenAiCompatibleInferenceProvider(options = {}) {
       ok: true,
       result: {
         content,
-        usage: readUsage(isRecord6(parsed) ? parsed.usage : void 0),
+        usage: readUsage(isRecord7(parsed) ? parsed.usage : void 0),
         ...receiptId ? { receiptId } : {},
         ...aciIdentity ? { aciIdentity } : {}
       }
@@ -114619,11 +114937,25 @@ async function withRetries(deps, attempt, retryable) {
   }
 }
 var ComputeFailure = class extends Error {
-  constructor(message) {
+  code;
+  constructor(message, code) {
     super(message);
     this.name = "ComputeFailure";
+    this.code = code;
   }
 };
+function classifyComputeError(err2) {
+  if (err2 instanceof ComputeFailure)
+    return err2.code ?? "internal";
+  if (err2 instanceof InferenceRequestError) {
+    return isRetryableInferenceError(err2) ? "inference_unavailable" : "internal";
+  }
+  if (err2 instanceof ProtocolError) {
+    const grantShaped = err2.errorCode === "DERIVATIVE_SOURCE_NOT_GRANTED" || err2.errorCode === "SCOPE_MISMATCH" || err2.errorCode === "UNREGISTERED_BUILDER" || err2.errorCode.startsWith("GRANT_");
+    return grantShaped ? "grant_invalid" : "internal";
+  }
+  return "internal";
+}
 function shortError(err2) {
   if (err2 instanceof ComputeFailure)
     return err2.message;
@@ -114633,6 +114965,53 @@ function shortError(err2) {
     return `${err2.errorCode}: ${err2.message}`;
   return `compute failed (${err2 instanceof Error ? err2.name : "Error"})`;
 }
+async function produceAnswer(deps, registration, model, messages) {
+  const ask = (turns2) => withRetries(deps, () => deps.provider.chat({
+    model,
+    messages: turns2,
+    maxTokens: deps.maxTokens
+  }), isRetryableInferenceError);
+  const shape = registration.answerShape;
+  if (!shape) {
+    const reply = await ask(messages);
+    const parsed = parseAnswer(reply.content);
+    return {
+      reply,
+      answer: parsed.answer,
+      evidence: parsed.evidence,
+      answerData: null
+    };
+  }
+  const compiled = compileAnswerShape(shape);
+  let turns = messages;
+  for (let attempt = 0; ; attempt += 1) {
+    const reply = await ask(turns);
+    const candidates = parseShapedAnswer(reply.content);
+    let issues = ["the reply was not a JSON object"];
+    for (const [index, candidate] of candidates.entries()) {
+      const checked = validateAnswerShape(shape, compiled, candidate.answer);
+      if (checked.ok) {
+        return {
+          reply,
+          answer: renderShapedAnswer(shape, checked.value),
+          evidence: candidate.evidence,
+          answerData: checked.value
+        };
+      }
+      if (index === 0)
+        issues = checked.issues;
+    }
+    if (attempt >= 1)
+      break;
+    turns = buildShapeRetryMessages({
+      messages,
+      reply: reply.content,
+      issues,
+      answerShape: shape
+    });
+  }
+  throw new ComputeFailure(`answer did not match the declared shape (fields: ${shape.fields.map((field) => field.name).join(", ")})`, "internal");
+}
 function collectedAtStamp(now, isTaken) {
   const base = now();
   base.setUTCMilliseconds(0);
@@ -114708,10 +115087,10 @@ async function loadSource(deps, scope) {
   const entry = deps.storage.findEntry({ scope });
   const deletion = await resolveReadDeletion({ scopeDeletions: deps.scopeDeletions, serverOwner: deps.serverOwner }, scope, entry);
   if (deletion) {
-    throw new ComputeFailure(`source scope ${scope} is deleted`);
+    throw new ComputeFailure(`source scope ${scope} is deleted`, "source_missing");
   }
   if (!entry) {
-    throw new ComputeFailure(`source scope ${scope} has no local data`);
+    throw new ComputeFailure(`source scope ${scope} has no local data`, "source_missing");
   }
   let envelope;
   try {
@@ -114793,18 +115172,20 @@ async function computeQuestion(questionId, deps) {
     await assertNoLineageCycle(deps, registration, serverOwner, sourceLineage);
     const messages = buildQuestionMessages({
       question: registration.question,
-      sources
+      sources,
+      answerShape: registration.answerShape
     });
     const model = registration.model ?? deps.provider.defaultModel;
-    const reply = await withRetries(deps, () => deps.provider.chat({ model, messages, maxTokens: deps.maxTokens }), isRetryableInferenceError);
-    const parsed = parseAnswer(reply.content);
+    const produced = await produceAnswer(deps, registration, model, messages);
+    const reply = produced.reply;
     const computedAt = now().toISOString();
     const lineageIds = registration.sourceScopes.map((scope) => computeDataPointId(serverOwner, scope));
     const record2 = {
       questionId: registration.questionId,
       question: registration.question,
-      answer: parsed.answer,
-      evidence: parsed.evidence,
+      answer: produced.answer,
+      ...produced.answerData ? { answerData: produced.answerData } : {},
+      evidence: produced.evidence,
       model,
       computedAt,
       sources: sources.map((source) => ({
@@ -114847,6 +115228,7 @@ async function computeQuestion(questionId, deps) {
     const updated = await deps.store.update(questionId, {
       status: "ready",
       error: null,
+      errorCode: null,
       updatedAt: computedAt,
       lastComputedAt: computedAt,
       derivedVersion: entry?.version ?? null,
@@ -114884,28 +115266,49 @@ async function computeQuestion(questionId, deps) {
     };
   } catch (err2) {
     const error51 = shortError(err2);
+    const errorCode = classifyComputeError(err2);
     const at3 = now().toISOString();
     const updated = await deps.store.update(questionId, {
       status: "failed",
       error: error51,
+      errorCode,
       updatedAt: at3
     });
     deps.logger?.warn?.({ questionId, derivedScope: registration.derivedScope, error: error51 }, "Derivative question compute failed");
     return {
       status: "failed",
-      registration: updated ?? { ...registration, status: "failed", error: error51 },
+      registration: updated ?? {
+        ...registration,
+        status: "failed",
+        error: error51,
+        errorCode
+      },
       error: error51
     };
   }
 }
 
 // ../core/dist/derivatives/scheduler.js
+var DEFAULT_RETRY_DELAYS_MS2 = [6e4, 3e5, 18e5];
+function isRuntimeSkipOutcome(outcome) {
+  if (typeof outcome !== "object" || outcome === null)
+    return false;
+  const shaped = outcome;
+  return shaped.status === "skipped" && shaped.reason === "runtime-unavailable";
+}
+function isTransientFailureOutcome(outcome) {
+  if (typeof outcome !== "object" || outcome === null)
+    return false;
+  const shaped = outcome;
+  return shaped.status === "failed" && shaped.registration?.errorCode === "inference_unavailable";
+}
 var defaultTimers = {
   setTimeout: (callback, ms3) => setTimeout(callback, ms3),
   clearTimeout: (handle) => clearTimeout(handle)
 };
 function createRecomputeScheduler(options) {
   const debounceMs = options.debounceMs ?? 5e3;
+  const retryDelaysMs = options.retryDelaysMs ?? DEFAULT_RETRY_DELAYS_MS2;
   const timers = options.timers ?? defaultTimers;
   const now = options.now ?? (() => /* @__PURE__ */ new Date());
   const states = /* @__PURE__ */ new Map();
@@ -114924,7 +115327,15 @@ function createRecomputeScheduler(options) {
   function stateFor(questionId) {
     let state = states.get(questionId);
     if (!state) {
-      state = { timer: null, running: null, rerun: false };
+      state = {
+        timer: null,
+        running: null,
+        rerun: false,
+        retryAttempts: 0,
+        retryAtMs: null,
+        retryScheduled: false,
+        retryRunning: false
+      };
       states.set(questionId, state);
     }
     return state;
@@ -114937,17 +115348,42 @@ function createRecomputeScheduler(options) {
       state.rerun = true;
       return;
     }
-    state.running = track(Promise.resolve().then(() => options.compute(questionId)).then(() => void 0, (err2) => warn({
-      questionId,
-      error: err2 instanceof Error ? err2.name : String(err2)
-    }, "Derivative compute threw")).then(async () => {
+    state.running = track(Promise.resolve().then(() => options.compute(questionId)).then((outcome) => outcome, (err2) => {
+      warn({
+        questionId,
+        error: err2 instanceof Error ? err2.name : String(err2)
+      }, "Derivative compute threw");
+      return void 0;
+    }).then(async (outcome) => {
       state.running = null;
+      state.retryAtMs = null;
+      state.retryRunning = false;
+      const retryable = isTransientFailureOutcome(outcome) || // A runtime-unavailable skip DURING a chain consumes an attempt
+      // instead of ending the chain; on a fresh compute it keeps the
+      // pre-retry behavior (pending/stale, reswept by start()).
+      isRuntimeSkipOutcome(outcome) && state.retryAttempts > 0;
       if (state.rerun) {
         state.rerun = false;
+        state.retryAttempts = 0;
         await markStale(questionId);
         schedule(questionId, 0);
-      } else if (!states.get(questionId)?.timer) {
-        states.delete(questionId);
+      } else if (retryable && // A pending timer means a source change or explicit recompute
+      // arrived during the run and already scheduled a fresher run;
+      // replacing its 5s debounce with a 60s retry would delay the
+      // recompute of data this compute never saw.
+      state.timer === null && // After stop() nothing may be scheduled; without this a compute
+      // that settles late would record a retryAtMs no timer backs.
+      !stopped && state.retryAttempts < retryDelaysMs.length) {
+        const delayMs = retryDelaysMs[state.retryAttempts];
+        state.retryAttempts += 1;
+        state.retryAtMs = now().getTime() + delayMs;
+        schedule(questionId, delayMs);
+        state.retryScheduled = true;
+      } else {
+        state.retryAttempts = 0;
+        if (!states.get(questionId)?.timer) {
+          states.delete(questionId);
+        }
       }
     }));
   }
@@ -114959,6 +115395,9 @@ function createRecomputeScheduler(options) {
       timers.clearTimeout(state.timer);
     state.timer = timers.setTimeout(() => {
       state.timer = null;
+      state.retryAtMs = null;
+      state.retryRunning = state.retryScheduled;
+      state.retryScheduled = false;
       run(questionId);
     }, delayMs);
   }
@@ -114969,11 +115408,29 @@ function createRecomputeScheduler(options) {
     if (registration.status === "ready" || registration.status === "failed") {
       await options.store.update(questionId, {
         status: "stale",
+        // The reader contract says errorCode is null unless failed; a stale
+        // question is a recompute in progress, not a terminal failure.
+        errorCode: null,
         updatedAt: now().toISOString()
       });
     }
   }
+  function resetRetry(questionId) {
+    const state = states.get(questionId);
+    if (!state)
+      return;
+    state.retryAttempts = 0;
+    state.retryAtMs = null;
+    state.retryScheduled = false;
+  }
   return {
+    nextRetryAt(questionId) {
+      const retryAtMs = states.get(questionId)?.retryAtMs;
+      return retryAtMs == null ? null : new Date(retryAtMs).toISOString();
+    },
+    retryInFlight(questionId) {
+      return states.get(questionId)?.retryRunning ?? false;
+    },
     markSourceChanged(scope, opts) {
       if (stopped)
         return;
@@ -114988,6 +115445,7 @@ function createRecomputeScheduler(options) {
             continue;
           }
           await markStale(registration.questionId);
+          resetRetry(registration.questionId);
           schedule(registration.questionId, debounceMs);
         }
       })().catch((err2) => warn({ scope, error: err2 instanceof Error ? err2.name : String(err2) }, "Could not mark derivative questions stale")));
@@ -114998,7 +115456,10 @@ function createRecomputeScheduler(options) {
       void track(markStale(questionId).catch((err2) => warn({
         questionId,
         error: err2 instanceof Error ? err2.name : String(err2)
-      }, "Could not mark derivative question stale")).then(() => schedule(questionId, opts?.immediate ? 0 : debounceMs)));
+      }, "Could not mark derivative question stale")).then(() => {
+        resetRetry(questionId);
+        schedule(questionId, opts?.immediate ? 0 : debounceMs);
+      }));
     },
     async whenIdle() {
       const waitForTimers = !options.timers;
@@ -115018,6 +115479,9 @@ function createRecomputeScheduler(options) {
         if (state.timer !== null)
           timers.clearTimeout(state.timer);
         state.timer = null;
+        state.retryAttempts = 0;
+        state.retryAtMs = null;
+        state.retryScheduled = false;
       }
     },
     start() {
@@ -115038,6 +115502,7 @@ function createRecomputeScheduler(options) {
 
 // ../core/dist/derivatives/api.js
 var MAX_QUESTION_BODY_BYTES = 16 * 1024;
+var RETRY_IN_FLIGHT_POLL_SECONDS = 5;
 function jsonResponse3(body, init) {
   const headers = new Headers(init?.headers);
   headers.set("Content-Type", "application/json");
@@ -115090,12 +115555,63 @@ async function loadForCaller(deps, request2, store, questionId) {
   }
   return { registration, writer };
 }
+async function handleStatusRoute(request2, url2, deps, store, scheduler, now) {
+  if (request2.method !== "GET") {
+    return errorResponse2(405, "METHOD_NOT_ALLOWED", "Method not allowed");
+  }
+  const derivedScopeParam = url2.searchParams.get("derivedScope");
+  if (!derivedScopeParam) {
+    throw new DerivativeDerivedScopeRequiredError();
+  }
+  const scopeResult = parseDataScopeContract(derivedScopeParam);
+  if (!scopeResult.ok) {
+    return errorResponse2(scopeResult.status, scopeResult.body.error, scopeResult.body.message);
+  }
+  const derivedScope = scopeResult.scope;
+  const auth = await deps.auth.authorizeBuilderRead({
+    request: request2,
+    scope: derivedScope,
+    grantId: selectedGrantId(request2, url2)
+  }) ?? void 0;
+  const registrations = await store.list({ derivedScope });
+  if (registrations.length === 0) {
+    throw new DerivativeQuestionNotFoundError({ derivedScope });
+  }
+  const STATUS_PRECEDENCE = {
+    ready: 0,
+    stale: 1,
+    pending: 2,
+    failed: 3
+  };
+  const registration = registrations.reduce((best, candidate) => {
+    const byStatus = STATUS_PRECEDENCE[candidate.status] - STATUS_PRECEDENCE[best.status];
+    if (byStatus !== 0)
+      return byStatus < 0 ? candidate : best;
+    return candidate.updatedAt >= best.updatedAt ? candidate : best;
+  });
+  const nextRetryAt = scheduler.nextRetryAt?.(registration.questionId) ?? null;
+  const retryAfterSeconds = nextRetryAt !== null ? Math.max(1, Math.ceil((Date.parse(nextRetryAt) - now().getTime()) / 1e3)) : scheduler.retryInFlight?.(registration.questionId) ? RETRY_IN_FLIGHT_POLL_SECONDS : null;
+  const registrarView = auth === void 0 || auth.grantId === "owner" || auth.grantId === "policy-bypass" || registration.registeredBy.kind === "builder" && typeof auth.builder === "string" && sameBuilder(registration.registeredBy.builder, auth.builder);
+  const disclosedErrorCode = registration.errorCode === "grant_invalid" && !registrarView ? "internal" : registration.errorCode;
+  return jsonResponse3({
+    derivedScope: registration.derivedScope,
+    status: registration.status,
+    lastComputedAt: registration.lastComputedAt,
+    derivedVersion: registration.derivedVersion,
+    derivedCollectedAt: registration.derivedCollectedAt,
+    // Null unless failed, whatever an old store row holds: a stale question
+    // is a recompute in progress, not a terminal failure.
+    errorCode: registration.status === "failed" ? disclosedErrorCode : null,
+    retryAfterSeconds
+  });
+}
 async function handlePersonalServerDerivativesRequest(request2, deps, options = {}) {
   try {
     const url2 = new URL(request2.url);
     const pathname = stripBasePath2(url2.pathname, options.basePath);
     const parts = pathname.split("/").filter(Boolean);
-    if (parts[0] !== "questions" || parts.length > 3) {
+    const isStatusRoute = parts[0] === "status" && parts.length === 1;
+    if (!isStatusRoute && (parts[0] !== "questions" || parts.length > 3)) {
       return errorResponse2(404, "NOT_FOUND", "Not found");
     }
     const compute = deps.compute;
@@ -115103,6 +115619,9 @@ async function handlePersonalServerDerivativesRequest(request2, deps, options =
       throw new DerivativeComputeUnavailableError();
     const { store, scheduler } = compute;
     const now = deps.now ?? (() => /* @__PURE__ */ new Date());
+    if (isStatusRoute) {
+      return await handleStatusRoute(request2, url2, deps, store, scheduler, now);
+    }
     if (parts.length === 1) {
       if (request2.method === "GET") {
         const derivedScope = url2.searchParams.get("derivedScope") ?? void 0;
@@ -115427,7 +115946,7 @@ var E2eeAttestationError = class extends Error {
     this.name = "E2eeAttestationError";
   }
 };
-function isRecord7(value) {
+function isRecord8(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 async function sha256Hex2(bytes2) {
@@ -115445,7 +115964,7 @@ async function reportDataFor(keysetDigest, nonce) {
   return sha256Hex2(new TextEncoder().encode(statement));
 }
 function parseReport(body) {
-  if (!isRecord7(body) || typeof body.api_version !== "string" || typeof body.workload_keyset_digest !== "string" || !isRecord7(body.attestation) || typeof body.attestation.tee_type !== "string" || typeof body.attestation.report_data !== "string" || !isRecord7(body.attestation.workload_keyset)) {
+  if (!isRecord8(body) || typeof body.api_version !== "string" || typeof body.workload_keyset_digest !== "string" || !isRecord8(body.attestation) || typeof body.attestation.tee_type !== "string" || typeof body.attestation.report_data !== "string" || !isRecord8(body.attestation.workload_keyset)) {
     throw new E2eeAttestationError("malformed_report", "attestation report is missing required fields");
   }
   const keyset = body.attestation.workload_keyset;
@@ -115492,7 +116011,7 @@ async function verifyAciReportBinding(report, nonce, nowSeconds) {
 }
 function selectX25519Key(keyset, expectedKeyId) {
   for (const entry of keyset.e2ee_public_keys) {
-    if (!isRecord7(entry) || entry.algo !== E2EE_ALGO_X25519)
+    if (!isRecord8(entry) || entry.algo !== E2EE_ALGO_X25519)
       continue;
     if (typeof entry.public_key !== "string")
       continue;
@@ -133090,7 +133609,8 @@ async function createPsLiteQuestionStore(stateStore) {
   const saved = await stateStore.get(QUESTIONS_KEY);
   const initial = (saved?.version === 1 ? saved.questions : []).map((question) => ({
     ...question,
-    recompute: question.recompute ?? "on-change"
+    recompute: question.recompute ?? "on-change",
+    answerShape: question.answerShape ?? null
   }));
   return createInMemoryQuestionStore({
     initial,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendatalabs/personal-server-ts-server",
-  "version": "1.13.1",
+  "version": "1.15.0",
   "description": "Hono HTTP server for the Vana Personal Server — routes, middleware, composition root",
   "license": "MIT",
   "repository": {
@@ -44,8 +44,8 @@
   },
   "dependencies": {
     "@hono/node-server": "^1.19.13",
-    "@opendatalabs/personal-server-ts-core": "1.13.1",
-    "@opendatalabs/personal-server-ts-lite": "1.13.1",
+    "@opendatalabs/personal-server-ts-core": "1.15.0",
+    "@opendatalabs/personal-server-ts-lite": "1.15.0",
     "@opendatalabs/vana-sdk": "3.14.0",
     "better-sqlite3": "^12.11.1",
     "hono": "^4.12.27",