neotoma 0.22.2 → 0.23.0

package/dist/docs/subsystems/schema_registry.md

@@ -62,6 +62,7 @@ interface FieldDefinition {
   required?: boolean;
   validator?: string; // Validator function name
   preserveCase?: boolean; // Preserve case for this field during canonicalization
+  preserveWhitespace?: boolean; // Preserve exact whitespace, including line endings
   description?: string; // Field description
   converters?: ConverterDefinition[]; // Field type converters
 }
@@ -632,3 +633,13 @@ Load `docs/subsystems/schema_registry.md` when:
 - [ ] Reducer uses schema-projection filtering (only schema-defined fields appear in snapshots)
 - [ ] Tests verify schema versioning, migration, and field removal
 - [ ] Documentation updated for new schema versions
+
+## Audio transcription contract
+
+The built-in `transcription` 2.0.0 declaration retains historical field names and optionality, corrects `file_size_bytes` to a number, and declares capture and transcription provenance. `audio_content_sha256` identifies the input bytes; it is not the transcription entity identity. A recording can have multiple derivations. Source storage remains authoritative for bytes and content hash; observation `source_id` links derived fields to that source. Do not add an ingestion-success field to the transcription.
+
+New ingestion clients must verify `audio_content_sha256`, `original_source_file`, `capture_method`, `transcription_engine`, `consent_basis`, `transcription_text`, and `file_size_bytes` after storage, plus the requested source linkage. `consent_basis: "unknown"` records absent attestation and grants no capture authorization. Historical records may omit these fields.
+
+String fields can declare `preserveCase: true` and `preserveWhitespace: true` to retain exact transcript text and source names. Without `preserveWhitespace`, existing normalization remains unchanged. This metadata governs new observations only; activating a schema never rewrites historical observations. Lost historical text cannot be recovered from a normalized snapshot alone.
+
+The declaration is available from `ENTITY_SCHEMAS.transcription` in `src/services/schema_definitions.ts`. Existing installations must inspect the effective global and user-specific registrations before registering a new version through the existing registry API. Preserve custom fields, reducers and identity declarations when merging an instance's schema. Code deployment alone does not establish that an active custom schema is compatible. Production registration, activation and any historical recovery are separate reviewed operations; this change performs none.

package/dist/docs/testing/automated_test_catalog.md

@@ -61,18 +61,18 @@ flowchart TD
 - Do not hand-edit suite inventory entries in this file. Update the generator or the repository tree, then regenerate.
 
 ## Repo-wide summary
-- Total automated test files: **605**
-- Backend and repo Vitest files: **570**
+- Total automated test files: **612**
+- Backend and repo Vitest files: **577**
 - Frontend Vitest files: **9**
 - Playwright spec files: **26**
 
 ### Suite counts
 | Suite | Files |
 |---|---:|
-| Vitest unit tests | 166 |
+| Vitest unit tests | 169 |
 | Vitest service tests | 44 |
 | Source-adjacent tests | 66 |
-| Vitest integration tests | 172 |
+| Vitest integration tests | 176 |
 | Vitest CLI tests | 78 |
 | Vitest contract tests | 19 |
 | Vitest security tests | 9 |
@@ -109,7 +109,7 @@ flowchart TD
 **Runner:** `vitest`
 **Command:** `npm test -- tests/unit`
 **Requirements:** Basic `.env` if required by the module under test.
-**Files (166):**
+**Files (169):**
 - `tests/unit/aauth_admission.test.ts`
 - `tests/unit/aauth_attestation_apple_se.test.ts`
 - `tests/unit/aauth_attestation_revocation.test.ts`
@@ -151,6 +151,7 @@ flowchart TD
 - `tests/unit/compliance_scorecard.test.ts`
 - `tests/unit/config_data_dir_resolution.test.ts`
 - `tests/unit/config_db_backend.test.ts`
+- `tests/unit/config_refuses_user_env_under_test.test.ts`
 - `tests/unit/config_sqlite_path.test.ts`
 - `tests/unit/config_trusted_callbacks.test.ts`
 - `tests/unit/content_field_store_warning.test.ts`
@@ -204,6 +205,7 @@ flowchart TD
 - `tests/unit/mcp_dev_shim.test.ts`
 - `tests/unit/mcp_initialize_skills.test.ts`
 - `tests/unit/mcp_initialize_version.test.ts`
+- `tests/unit/mcp_instance_skill_hints.test.ts`
 - `tests/unit/mcp_instruction_doc.test.ts`
 - `tests/unit/mcp_instructions_fallback_invariants.test.ts`
 - `tests/unit/mcp_instructions_skill_auto_loading.test.ts`
@@ -218,6 +220,7 @@ flowchart TD
 - `tests/unit/neotoma_entity_id.test.ts`
 - `tests/unit/null_cleared_field_warning.test.ts`
 - `tests/unit/observation_reducer_converters.test.ts`
+- `tests/unit/observation_reducer_highest_priority_tiebreak.test.ts`
 - `tests/unit/observation_reducer_merge_array_correction.test.ts`
 - `tests/unit/observation_reducer_merge_array_stringified.test.ts`
 - `tests/unit/observation_reducer_observation_source.test.ts`
@@ -406,7 +409,7 @@ flowchart TD
 **Runner:** `vitest`
 **Command:** `npm run test:integration` or `npx vitest run tests/integration`
 **Requirements:** Database configured; remote-dependent subsets additionally need `RUN_REMOTE_TESTS=1`.
-**Files (172):**
+**Files (176):**
 - `tests/integration/aauth_attribution_stamping.test.ts`
 - `tests/integration/aauth_mcp_capability_parity.test.ts`
 - `tests/integration/aauth_mcp_initialize_admission.test.ts`
@@ -437,6 +440,7 @@ flowchart TD
 - `tests/integration/conversation_turn_index.test.ts`
 - `tests/integration/correct_http_mcp_parity.test.ts`
 - `tests/integration/correct_unknown_field_append.test.ts`
+- `tests/integration/correction_scalar_tiebreak_surfaces.test.ts`
 - `tests/integration/cross_instance_issues.test.ts`
 - `tests/integration/csp_local_http.test.ts`
 - `tests/integration/cursor_hook_stop_backfill.test.ts`
@@ -474,6 +478,7 @@ flowchart TD
 - `tests/integration/instance_policy_db_enforcement.test.ts`
 - `tests/integration/instance_policy_entity_id_surface_parity.test.ts`
 - `tests/integration/instance_policy_set_entity_id_surface_parity.test.ts`
+- `tests/integration/instance_skills_initialize_effect.test.ts`
 - `tests/integration/interpretation_fragment_ordering.test.ts`
 - `tests/integration/interpretation_no_schema_fallback.test.ts`
 - `tests/integration/interpretation_store.test.ts`
@@ -506,6 +511,7 @@ flowchart TD
 - `tests/integration/mcp_schema_actions.test.ts`
 - `tests/integration/mcp_schema_variations.test.ts`
 - `tests/integration/mcp_session_404_reconnect.test.ts`
+- `tests/integration/mcp_session_recover_in_place.test.ts`
 - `tests/integration/mcp_stdio_attribution.test.ts`
 - `tests/integration/mcp_store_attribution_policy.test.ts`
 - `tests/integration/mcp_store_canonical_name_unknown_fields.test.ts`
@@ -570,6 +576,7 @@ flowchart TD
 - `tests/integration/subscription_list.test.ts`
 - `tests/integration/subscription_unsubscribe.test.ts`
 - `tests/integration/sync_webhook_inbound.test.ts`
+- `tests/integration/transcription_contract.test.ts`
 - `tests/integration/transport_parity_store_snapshot_auth.test.ts`
 - `tests/integration/tunnel_auth.test.ts`
 - `tests/integration/tunnel_discovery.test.ts`

package/dist/mcp_http_session.d.ts

@@ -0,0 +1,51 @@
+/**
+ * MCP Streamable HTTP session mint + recover-in-place helpers (neotoma#2100).
+ *
+ * Transport sessions live only in process memory. After a restart an
+ * authenticated POST that still carries a stale `mcp-session-id` should mint a
+ * fresh transport, complete a server-side initialize handshake, and serve the
+ * original JSON-RPC call — returning a new session id rather than a terminal
+ * 404.
+ */
+import type { Request } from "express";
+import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { NeotomaServer } from "./server.js";
+/** Shared copy for remaining unknown-session 404s (GET/DELETE, handshake fail). */
+export declare const MCP_UNKNOWN_SESSION_MESSAGE = "Not Found: MCP session is unknown or expired on this API instance. The server may have restarted or the client is holding a stale session id. Re-initialize by sending a new InitializeRequest without a session id.";
+export type McpHttpSessionMaps = {
+    transports: Map<string, StreamableHTTPServerTransport>;
+    servers: Map<string, NeotomaServer>;
+};
+export type MintedMcpHttpSession = {
+    transport: StreamableHTTPServerTransport;
+    serverInstance: NeotomaServer;
+};
+export type AppOriginResolution = {
+    origin?: string;
+    source?: "configured" | "request";
+};
+/**
+ * Mint a new in-memory Streamable HTTP transport + NeotomaServer, register it
+ * in the session maps on initialize, and connect via `runHTTP`. Shared by the
+ * client-driven initialize path and recover-in-place.
+ */
+export declare function mintMcpHttpSession(req: Request, maps: McpHttpSessionMaps, resolveAppOrigin: (req: Request) => AppOriginResolution): Promise<MintedMcpHttpSession>;
+/**
+ * Complete the MCP lifecycle handshake on a freshly minted transport so a
+ * subsequent tools/call (or other non-init method) is accepted.
+ *
+ * Returns false when initialize does not succeed cleanly — caller should fall
+ * through to the shared unknown-session 404 rather than 500.
+ */
+export declare function completeSyntheticMcpHandshake(transport: StreamableHTTPServerTransport): Promise<boolean>;
+/** Rewrite the inbound session header so the SDK accepts the recovered call. */
+export declare function adoptRecoveredSessionId(req: Request, newSessionId: string): void;
+export declare function unknownSessionJsonRpcBody(rpcId: string | number | null): {
+    jsonrpc: "2.0";
+    error: {
+        code: number;
+        message: string;
+    };
+    id: string | number | null;
+};
+//# sourceMappingURL=mcp_http_session.d.ts.map

package/dist/mcp_http_session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp_http_session.d.ts","sourceRoot":"","sources":["../src/mcp_http_session.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAKH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAEnG,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,mFAAmF;AACnF,eAAO,MAAM,2BAA2B,yNACgL,CAAC;AAEzN,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC;IACvD,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,6BAA6B,CAAC;IACzC,cAAc,EAAE,aAAa,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACnC,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,kBAAkB,EACxB,gBAAgB,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,mBAAmB,GACtD,OAAO,CAAC,oBAAoB,CAAC,CA+B/B;AA6ED;;;;;;GAMG;AACH,wBAAsB,6BAA6B,CACjD,SAAS,EAAE,6BAA6B,GACvC,OAAO,CAAC,OAAO,CAAC,CAmClB;AAED,gFAAgF;AAChF,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAkBhF;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG;IACxE,OAAO,EAAE,KAAK,CAAC;IACf,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;CAC5B,CASA"}

package/dist/mcp_http_session.js

@@ -0,0 +1,173 @@
+/**
+ * MCP Streamable HTTP session mint + recover-in-place helpers (neotoma#2100).
+ *
+ * Transport sessions live only in process memory. After a restart an
+ * authenticated POST that still carries a stale `mcp-session-id` should mint a
+ * fresh transport, complete a server-side initialize handshake, and serve the
+ * original JSON-RPC call — returning a new session id rather than a terminal
+ * 404.
+ */
+import { randomUUID } from "node:crypto";
+import { IncomingMessage, ServerResponse } from "node:http";
+import { Socket } from "node:net";
+import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { NeotomaServer } from "./server.js";
+import { logger } from "./utils/logger.js";
+/** Shared copy for remaining unknown-session 404s (GET/DELETE, handshake fail). */
+export const MCP_UNKNOWN_SESSION_MESSAGE = "Not Found: MCP session is unknown or expired on this API instance. The server may have restarted or the client is holding a stale session id. Re-initialize by sending a new InitializeRequest without a session id.";
+/**
+ * Mint a new in-memory Streamable HTTP transport + NeotomaServer, register it
+ * in the session maps on initialize, and connect via `runHTTP`. Shared by the
+ * client-driven initialize path and recover-in-place.
+ */
+export async function mintMcpHttpSession(req, maps, resolveAppOrigin) {
+    const serverInstance = new NeotomaServer();
+    const connectionIdFromReq = (req.headers["x-connection-id"] || req.headers["X-Connection-Id"]);
+    if (connectionIdFromReq) {
+        serverInstance.setSessionConnectionId(connectionIdFromReq);
+    }
+    const appOrigin = resolveAppOrigin(req);
+    serverInstance.setSessionAppOrigin(appOrigin.origin ?? null, appOrigin.source ?? null);
+    // Callback closes over `transport` and runs after construction completes.
+    const transport = new StreamableHTTPServerTransport({
+        sessionIdGenerator: () => randomUUID(),
+        onsessioninitialized: (sid) => {
+            maps.transports.set(sid, transport);
+            maps.servers.set(sid, serverInstance);
+            logger.info(`[MCP HTTP] Session initialized: ${sid}, server instance stored`);
+        },
+    });
+    transport.onclose = () => {
+        if (transport?.sessionId) {
+            maps.transports.delete(transport.sessionId);
+            maps.servers.delete(transport.sessionId);
+            logger.error(`[MCP HTTP] Session closed: ${transport.sessionId}`);
+        }
+    };
+    await serverInstance.runHTTP(transport);
+    return { transport, serverInstance };
+}
+/**
+ * Drive `transport.handleRequest` against a sink ServerResponse so recover can
+ * complete initialize + notifications/initialized without a second HTTP hop.
+ */
+async function handleTransportOnSink(transport, body, extraHeaders = {}) {
+    return new Promise((resolve, reject) => {
+        const socket = new Socket();
+        const req = new IncomingMessage(socket);
+        req.method = "POST";
+        req.url = "/mcp";
+        const headerPairs = {
+            host: "127.0.0.1",
+            "content-type": "application/json",
+            accept: "application/json, text/event-stream",
+            ...Object.fromEntries(Object.entries(extraHeaders).map(([key, value]) => [key.toLowerCase(), value])),
+        };
+        req.headers = headerPairs;
+        // hono's getRequestListener builds the Web Request from rawHeaders; without
+        // these the Accept check fails with 406 and recover never initializes.
+        req.rawHeaders = Object.entries(headerPairs).flatMap(([key, value]) => {
+            const name = key
+                .split("-")
+                .map((part) => (part ? part[0].toUpperCase() + part.slice(1) : part))
+                .join("-");
+            return [name, value];
+        });
+        const chunks = [];
+        const res = new ServerResponse(req);
+        let settled = false;
+        const finish = () => {
+            if (settled)
+                return;
+            settled = true;
+            resolve({
+                statusCode: res.statusCode || 0,
+                bodyText: Buffer.concat(chunks).toString("utf8"),
+            });
+        };
+        res.on("finish", finish);
+        const origWrite = res.write.bind(res);
+        const origEnd = res.end.bind(res);
+        res.write = ((chunk, encoding, cb) => {
+            if (chunk && typeof chunk !== "function") {
+                chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+            }
+            return origWrite(chunk, encoding, cb);
+        });
+        res.end = ((chunk, encoding, cb) => {
+            if (chunk && typeof chunk !== "function") {
+                chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+            }
+            const out = origEnd(chunk, encoding, cb);
+            setImmediate(finish);
+            return out;
+        });
+        transport
+            .handleRequest(req, res, body)
+            .then(() => setTimeout(finish, 50))
+            .catch(reject);
+    });
+}
+/**
+ * Complete the MCP lifecycle handshake on a freshly minted transport so a
+ * subsequent tools/call (or other non-init method) is accepted.
+ *
+ * Returns false when initialize does not succeed cleanly — caller should fall
+ * through to the shared unknown-session 404 rather than 500.
+ */
+export async function completeSyntheticMcpHandshake(transport) {
+    const initBody = {
+        jsonrpc: "2.0",
+        id: "neotoma-session-recovery-init",
+        method: "initialize",
+        params: {
+            protocolVersion: "2025-11-25",
+            capabilities: {},
+            clientInfo: { name: "neotoma-session-recovery", version: "0.0.0" },
+        },
+    };
+    const initResult = await handleTransportOnSink(transport, initBody);
+    if (initResult.statusCode < 200 || initResult.statusCode >= 300 || !transport.sessionId) {
+        logger.warn(`[MCP HTTP] Recover handshake initialize failed status=${initResult.statusCode} body=${initResult.bodyText.slice(0, 200)}`);
+        return false;
+    }
+    const sessionId = transport.sessionId;
+    const notifyResult = await handleTransportOnSink(transport, { jsonrpc: "2.0", method: "notifications/initialized", params: {} }, { "mcp-session-id": sessionId });
+    // 202 Accepted is the SDK success for notifications; tolerate 2xx broadly.
+    if (notifyResult.statusCode < 200 || notifyResult.statusCode >= 300) {
+        logger.warn(`[MCP HTTP] Recover handshake notifications/initialized failed status=${notifyResult.statusCode}`);
+        return false;
+    }
+    return true;
+}
+/** Rewrite the inbound session header so the SDK accepts the recovered call. */
+export function adoptRecoveredSessionId(req, newSessionId) {
+    req.headers["mcp-session-id"] = newSessionId;
+    // Express parses into `headers`, but @hono/node-server builds the Web Request
+    // from `rawHeaders` when present — leave those stale and validateSession rejects.
+    const incoming = req;
+    if (Array.isArray(incoming.rawHeaders)) {
+        const raw = incoming.rawHeaders;
+        let replaced = false;
+        for (let i = 0; i < raw.length - 1; i += 2) {
+            if (String(raw[i]).toLowerCase() === "mcp-session-id") {
+                raw[i + 1] = newSessionId;
+                replaced = true;
+            }
+        }
+        if (!replaced) {
+            raw.push("mcp-session-id", newSessionId);
+        }
+    }
+}
+export function unknownSessionJsonRpcBody(rpcId) {
+    return {
+        jsonrpc: "2.0",
+        error: {
+            code: -32001,
+            message: MCP_UNKNOWN_SESSION_MESSAGE,
+        },
+        id: rpcId,
+    };
+}
+//# sourceMappingURL=mcp_http_session.js.map

package/dist/mcp_http_session.js.map

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

package/dist/reducers/observation_reducer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"observation_reducer.d.ts","sourceRoot":"","sources":["../../src/reducers/observation_reducer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAKL,KAAK,0BAA0B,EAEhC,MAAM,gCAAgC,CAAC;AAKxC,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,eAAe,EAAE,MAAM,CAAC;IACxB;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,0BAA0B,GAAG,IAAI,CAAC;IACvD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AA4BD,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;CACjB;AAID,qBAAa,kBAAkB;IAC7B;;;;OAIG;IACG,eAAe,CACnB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,WAAW,EAAE,GAC1B,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IA0HjC;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAaxB;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IA8E1B;;OAEG;IACH,OAAO,CAAC,aAAa;IAmBrB;;OAEG;IACH,OAAO,CAAC,eAAe;IA6BvB;;OAEG;IACH,OAAO,CAAC,YAAY;IAmCpB;;;;;;;OAOG;IACH,OAAO,CAAC,UAAU;IA0ElB;;;;OAIG;YACW,2BAA2B;CA8E1C;AAED,eAAO,MAAM,kBAAkB,oBAA2B,CAAC"}
+{"version":3,"file":"observation_reducer.d.ts","sourceRoot":"","sources":["../../src/reducers/observation_reducer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAKL,KAAK,0BAA0B,EAEhC,MAAM,gCAAgC,CAAC;AAKxC,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,eAAe,EAAE,MAAM,CAAC;IACxB;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,0BAA0B,GAAG,IAAI,CAAC;IACvD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AA8CD,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;CACjB;AAID,qBAAa,kBAAkB;IAC7B;;;;OAIG;IACG,eAAe,CACnB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,WAAW,EAAE,GAC1B,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IA0HjC;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAaxB;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IA8E1B;;OAEG;IACH,OAAO,CAAC,aAAa;IAmBrB;;OAEG;IACH,OAAO,CAAC,eAAe;IA8BvB;;OAEG;IACH,OAAO,CAAC,YAAY;IAmCpB;;;;;;;OAOG;IACH,OAAO,CAAC,UAAU;IA0ElB;;;;OAIG;YACW,2BAA2B;CA8E1C;AAED,eAAO,MAAM,kBAAkB,oBAA2B,CAAC"}

package/dist/reducers/observation_reducer.js

@@ -29,6 +29,23 @@ function rankForObservationSource(obs, rank) {
     const r = rank.get(value);
     return r === undefined ? Number.MAX_SAFE_INTEGER : r;
 }
+function timestampMs(value) {
+    if (!value)
+        return Number.NEGATIVE_INFINITY;
+    const ms = new Date(value).getTime();
+    return Number.isFinite(ms) ? ms : Number.NEGATIVE_INFINITY;
+}
+function compareObservationRecencyThenId(a, b) {
+    const observedA = timestampMs(a.observed_at);
+    const observedB = timestampMs(b.observed_at);
+    if (observedA !== observedB)
+        return observedB > observedA ? 1 : -1;
+    const createdA = timestampMs(a.created_at);
+    const createdB = timestampMs(b.created_at);
+    if (createdA !== createdB)
+        return createdB > createdA ? 1 : -1;
+    return a.id.localeCompare(b.id);
+}
 export class ObservationReducer {
     /**
      * Compute snapshot from observations
@@ -233,12 +250,13 @@ export class ObservationReducer {
             const rankB = rankForObservationSource(b, observationSourceRank);
             if (rankA !== rankB)
                 return rankA - rankB;
-            // Tie breaker
-            if (tieBreaker === "observed_at") {
-                return new Date(b.observed_at).getTime() - new Date(a.observed_at).getTime();
-            }
-            // source_priority is already the primary sort, so just use id
-            return a.id.localeCompare(b.id);
+            // Same numeric priority and source-kind tier: fall through to recency.
+            // `tie_breaker: "source_priority"` is retained for compatibility with
+            // existing schemas where source_priority is the declared trust axis; once
+            // the primary priority comparison ties, repeated ordinary corrections at
+            // that same tier still express replacement intent, so the newer write
+            // must win before the final stable id fallback.
+            return compareObservationRecencyThenId(a, b);
         });
         return {
             value: sorted[0].fields[field],

package/dist/reducers/observation_reducer.js.map

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

package/dist/server.d.ts

@@ -49,8 +49,13 @@ export declare class NeotomaServer {
      * separate discovery round-trip.
      *
      * Returns an empty array when the `skills/` directory is absent (e.g. in
-     * development checkouts that have not yet staged skill assets, or in test
-     * environments with stripped package layouts).
+     * development checkouts that have not yet staged skill assets, in test
+     * environments with stripped package layouts, or on a hosted instance whose
+     * skills live in the graph rather than on disk).
+     *
+     * This is only one of two skill sources. Graph-stored `skill` entities are
+     * read separately by `getInstanceSkills()` and unioned with this list in
+     * {@link buildAuthenticatedInitializeResponse} (issue #2046).
      */
     private getAvailableSkills;
     /**

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AA8EnG,OAAO,EAGL,KAAK,iBAAiB,EACvB,MAAM,4BAA4B,CAAC;AAgBpC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAQlF,OAAO,EAGL,KAAK,mBAAmB,EACxB,KAAK,aAAa,EAClB,KAAK,8BAA8B,EACpC,MAAM,4BAA4B,CAAC;AAoEpC,eAAO,MAAM,qCAAqC,QAItC,CAAC;AAEb;;;;GAIG;AACH,eAAO,MAAM,8CAA8C,QAI/C,CAAC;AAYb,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,sBAAsB,CAAC,CAAa;IAC5C,OAAO,CAAC,mBAAmB,CAAuB;IAClD,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,WAAW,CAA6D;IAChF,qGAAqG;IACrG,OAAO,CAAC,mBAAmB,CAAuB;IAClD,kFAAkF;IAClF,OAAO,CAAC,YAAY,CAAoC;IACxD,kFAAkF;IAClF,OAAO,CAAC,iBAAiB,CAAoD;IAC7E,mFAAmF;IACnF,OAAO,CAAC,gBAAgB,CAAuB;IAC/C,OAAO,CAAC,sBAAsB,CAA4C;IAC1E,yGAAyG;IACzG,OAAO,CAAC,gBAAgB,CAAkC;IAC1D,0GAA0G;IAC1G,OAAO,CAAC,aAAa,CAAyD;IAC9E,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAAkB;IACtD,OAAO,CAAC,MAAM,CAAC,6BAA6B,CAAO;IACnD,OAAO,CAAC,MAAM,CAAC,gCAAgC,CAAO;IACtD,OAAO,CAAC,MAAM,CAAC,gCAAgC,CAAsB;IACrE,OAAO,CAAC,sBAAsB,CAAS;IACvC,OAAO,CAAC,wBAAwB,CAAK;IACrC,OAAO,CAAC,yBAAyB,CAAuB;;IAoBxD,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,6BAA6B;IAkBrC,OAAO,CAAC,8BAA8B;IAwBtC,OAAO,CAAC,uBAAuB;IAc/B;;;;;;;;;;;;;;;;OAgBG;IACH,OAAO,CAAC,kBAAkB;IAuB1B;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IA+L9B;;;OAGG;IACH,OAAO,CAAC,0BAA0B;IA2ClC;;;OAGG;IACH,sBAAsB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;IAIlD;;;;OAIG;IACH,mBAAmB,CACjB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,MAAM,GAAE,iBAAiB,CAAC,QAAQ,CAAC,GAAG,IAAW,GAChD,IAAI;IAKP;;;;;OAKG;IACH,uBAAuB,CAAC,GAAG,EAAE,mBAAmB,GAAG,IAAI,GAAG,IAAI;IAI9D;;;;;;;;;;;OAWG;IACH,mBAAmB,CAAC,IAAI,EAAE,qBAAqB,GAAG,IAAI,GAAG,IAAI;IAK7D;;;;;OAKG;IACH,gBAAgB,IAAI,aAAa,GAAG,IAAI;IAmBxC;;;;;;;;OAQG;IACH,6BAA6B,IAAI,8BAA8B,GAAG,IAAI;YAaxD,oCAAoC;IA2HlD,OAAO,CAAC,yBAAyB;IAMjC,OAAO,CAAC,2BAA2B;YAerB,6BAA6B;YAqB7B,sBAAsB;YA4BtB,yBAAyB;YAUzB,0BAA0B;IAiBxC,OAAO,CAAC,uBAAuB;IAW/B;;;;;OAKG;IACH,OAAO,CAAC,sBAAsB;IAgB9B;;;OAGG;YACW,oBAAoB;IAwBlC;;;;OAIG;YACW,kBAAkB;IAmBhC;;;OAGG;YACW,oBAAoB;YA4IpB,iBAAiB;YAcjB,cAAc;YAuGd,iBAAiB;YA2BjB,iBAAiB;YAgFjB,kBAAkB;YA6BlB,sBAAsB;YA2BtB,+BAA+B;YA4B/B,2BAA2B;YA6B3B,2BAA2B;YAqB3B,qBAAqB;YAsDrB,oBAAoB;YAwCpB,gBAAgB;YA4BhB,eAAe;YAuCf,iBAAiB;YAkBjB,uBAAuB;YAWvB,2BAA2B;YAkB3B,mBAAmB;YAoEnB,aAAa;YA8Bb,gBAAgB;YAkBhB,eAAe;YAQf,mBAAmB;YAcnB,cAAc;YAkBd,yBAAyB;IA4BvC;;;;;OAKG;YACW,oBAAoB;IAUlC,OAAO,CAAC,iBAAiB;IAkPZ,iBAAiB,CAC5B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;QAAE,OAAO,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC;YAmBhD,WAAW;IA0IzB;;OAEG;IACH,OAAO,CAAC,qBAAqB;YA+Rf,eAAe;IAkG7B,OAAO,CAAC,iBAAiB;YAgBX,qBAAqB;YAkDrB,SAAS;IAmCvB,OAAO,CAAC,uBAAuB;IAkF/B,OAAO,CAAC,0BAA0B;YA2JpB,sBAAsB;YA8JtB,gBAAgB;YAuChB,uBAAuB;YAqFvB,kBAAkB;YAkGlB,mBAAmB;YA4CnB,iBAAiB;IA4K/B;;;;;;;OAOG;YACW,0BAA0B;YA+B1B,uBAAuB;YAyCvB,gBAAgB;YA4HhB,kBAAkB;YAsGlB,0BAA0B;YAwB1B,uBAAuB;YAgBvB,uBAAuB;YAyHvB,yBAAyB;YA4MzB,mBAAmB;YAkCnB,eAAe;IAmD7B;;;;;;OAMG;IACH;;;;;;;;;;;;OAYG;YACW,sBAAsB;YA4BtB,kBAAkB;IAkDhC;;OAEG;YACW,uBAAuB;IAiCrC;;OAEG;YACW,wBAAwB;IA2BtC;;OAEG;YACW,wBAAwB;IAiCtC;;OAEG;YACW,uBAAuB;IAoHrC;;OAEG;YACW,cAAc;YAwCd,mBAAmB;YAqCnB,oBAAoB;YA4FpB,KAAK;IAuTnB,OAAO,CAAC,kBAAkB;YAQZ,6BAA6B;YA4E7B,sBAAsB;YAyCtB,kCAAkC;YAoElC,uBAAuB;YAinDvB,OAAO;YAkLP,yBAAyB;YAkEzB,aAAa;YA+Cb,WAAW;IAwDzB;;;;OAIG;YACW,uBAAuB;IAmDrC,qGAAqG;YACvF,YAAY;IAyB1B,gHAAgH;YAClG,kBAAkB;IA8DhC,mHAAmH;YACrG,aAAa;IAyB3B,+HAA+H;YACjH,mBAAmB;IA4BjC;;OAEG;IACH,OAAO,CAAC,gBAAgB;IA4MxB;;OAEG;YACW,yBAAyB;IA2FvC;;OAEG;YACW,sBAAsB;IAuFpC;;OAEG;YACW,sBAAsB;IA0CpC;;OAEG;YACW,wBAAwB;IAsCtC;;OAEG;YACW,yBAAyB;IA0CvC;;OAEG;YACW,kBAAkB;IA0EhC;;OAEG;YACW,mBAAmB;IAuHjC;;OAEG;YACW,YAAY;IAsC1B;;OAEG;YACW,sBAAsB;IA2EpC;;OAEG;YACW,+BAA+B;IA0H7C;;OAEG;YACW,4BAA4B;IA2H1C;;OAEG;YACW,iBAAiB;IA+B/B,OAAO,CAAC,iBAAiB;IAwBnB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1B;;;OAGG;IACG,OAAO,CAAC,SAAS,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtE;;OAEG;YACW,oBAAoB;CAYnC"}