@passioncode-ai/passioncode 0.2.16 → 0.2.18

package/payload/plugins/fabric-agent-adapter/skills/building-fabric-services/scripts/fabric-service.mjs

@@ -17,7 +17,7 @@ export const EXTENSION_KEY = 'https://fabric.passioncode.ai/agent-contract/exten
 // The embedded dashboard declaration (fabric-dashboard/0.1, DEC-0036 ED-9), under the well-known
 // document's `extensions`. The kit is assets/dashboard-kit; its version is the one in kit.json.
 export const DASHBOARD_EXTENSION_KEY = 'https://fabric.passioncode.ai/agent-contract/extensions/dashboard/0.1';
-export const DASHBOARD_KIT = 'fabric-dashboard-kit@1.1.0';
+export const DASHBOARD_KIT = 'fabric-dashboard-kit@1.1.1';
 export const REFERENCE_THEMES = ['graphite', 'fabric', 'paper', 'forest', 'ocean', 'ember', 'contrast'];
 export const EXIT_ALREADY_RUNNING = 75;
 // Lifecycle rules: references/lifecycle.md (the rule for this kit's users; it implements the public
@@ -862,13 +862,13 @@ export function buildWellKnown({ id, instance, name, version, build, startedAt,
 
 /** Each contract protocol's published revisions, oldest first (the contract's `PROTOCOL_REVISIONS`); a test holds it equal to the contract's. */
 export const PROTOCOL_REVISIONS = new Map(Object.entries({
-  'access-log': ['1'], approval: ['1'], 'activity-summary': ['1'], 'enroll-token': ['1'], entitlement: ['1'], 'entitlement-key-set': ['1'], 'estate-record': ['1'], 'execution-packet': ['1'],
+  'access-log': ['1'], approval: ['1'], 'activity-summary': ['1'], 'coding-agents': ['1'], 'enroll-token': ['1'], entitlement: ['1'], 'entitlement-key-set': ['1'], 'estate-record': ['1'], 'execution-packet': ['1'],
   'fabric-activity': ['0.1'], 'fabric-dashboard': ['0.1'], 'fabric-delegation': ['0.1'], 'fabric-device': ['0.1'],
   'fabric-interop': ['0.1', '0.2'], 'fabric-local-channel': ['0.1'], 'fabric-local-runner': ['0.1'], 'fabric-operator-channel': ['0.1'],
   'fabric-package': ['1'], 'fabric-project-comms': ['0.1'], 'fabric-proposal': ['1'], 'fabric-provider': ['0.1'], 'fabric-relay': ['0.1'],
   'fabric-secret-envelope': ['1'], 'fabric-service': ['0.1'], 'fabric-settings-backup': ['1'], heartbeat: ['1'], 'learning-note': ['1'],
   memory: ['0.1'], 'pairing-message': ['1'], pipeline: ['0.1'], 'revocation-delta': ['1'], 'session-handoff': ['1'],
-  'share-registration': ['1'], 'share-registration-receipt': ['1'], 'window-lease': ['1'],
+  'share-registration': ['1'], 'share-registration-receipt': ['1'], 'support-quality-daily': ['1'], 'window-lease': ['1'],
 }));
 export const MAX_PROTOCOLS = 64;
 const REVISION = /^([a-z][a-z0-9.-]{0,63})\/([0-9]{1,4}(?:\.[0-9]{1,4}){0,2})$/;
@@ -1023,7 +1023,9 @@ const COUNTS = ['inputTokens', 'outputTokens', 'cacheReadTokens', 'cacheWriteTok
  * One model call. `projectId` (a URI, kept in its normal form, DEC-0076) and `taskRunId` (the service's own run id) attribute
  * it to the project the service ran it for (DEC-0065); they never name a caller, session or person.
  */
-export function makeUsageReceipt(provider, model, { inputTokens, outputTokens, cacheReadTokens = 0, cacheWriteTokens = 0, costUsd = null, costBasis, at, route, projectId, taskRunId } = {}) {
+// tokensMeasured: false marks a call whose token counts are a lower bound or unknown (DEC-0091): the report counts it
+// in unmeasuredCalls and its token totals are a lower bound.
+export function makeUsageReceipt(provider, model, { inputTokens, outputTokens, cacheReadTokens = 0, cacheWriteTokens = 0, costUsd = null, costBasis, at, route, projectId, taskRunId, tokensMeasured = true } = {}) {
   if (!PROVIDER.test(provider ?? '')) throw new ServiceError('provider must be a lowercase name such as anthropic or openrouter.');
   model = String(model ?? '').trim();
   if (!model || model.length > 128) throw new ServiceError('model must be 1 to 128 characters.');
@@ -1033,10 +1035,11 @@ export function makeUsageReceipt(provider, model, { inputTokens, outputTokens, c
   const basis = costBasis ?? (costUsd === null ? 'unknown' : 'provider');
   if (!COST_BASES.includes(basis) || (costUsd === null) !== (basis === 'unknown')) throw new ServiceError('costBasis is provider or price-list with a cost, unknown without one.');
   if (route !== undefined && !USAGE_ROUTES.includes(route)) throw new ServiceError('route is subscription, key or platform-metered (DEC-0046, DEC-0061).');
+  if (tokensMeasured !== true && tokensMeasured !== false) throw new ServiceError('tokensMeasured is true or false.');
   if (taskRunId !== undefined && projectId === undefined) throw new ServiceError('a task run belongs to a project: give projectId with taskRunId.');
   if (projectId !== undefined && !(typeof projectId === 'string' && /^[A-Za-z][A-Za-z0-9+.-]*:\S+$/.test(projectId))) throw new ServiceError('projectId is the URI of the project the service ran the call for.');
   if (taskRunId !== undefined && !(typeof taskRunId === 'string' && /^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/.test(taskRunId))) throw new ServiceError("taskRunId is the service's own run id: ^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$.");
-  return { at: at ?? nowIso(), provider, model, ...counts, costUsd, costBasis: basis, ...(route === undefined ? {} : { route }),
+  return { at: at ?? nowIso(), provider, model, ...counts, costUsd, costBasis: basis, ...(tokensMeasured ? {} : { tokensMeasured: false }), ...(route === undefined ? {} : { route }),
     ...(projectId === undefined ? {} : { projectId: normalIdentifier(projectId) }), ...(taskRunId === undefined ? {} : { taskRunId }) };
 }
 
@@ -1104,6 +1107,8 @@ function pricedRow(row, at) {
   const calls = usageCount(row.calls), unpriced = usageCount(row.unpricedCalls);
   const flag = (p, message) => [{ code: 'FAC-SEM-025', instancePath: p, message }];
   if (unpriced > calls) return flag(`${at}/unpricedCalls`, 'more unpriced calls than calls');
+  // DEC-0091: calls whose token count is unknown are some of the calls, never more.
+  if (usageCount(row.unmeasuredCalls) > calls) return flag(`${at}/unmeasuredCalls`, 'more calls with unknown tokens than calls');
   if (calls > 0 && unpriced === calls && row.costUsd !== null) return flag(`${at}/costUsd`, 'every call is unpriced, so the cost is unknown (null), not a number');
   if (unpriced < calls && row.costUsd === null) return flag(`${at}/costUsd`, 'priced calls carry a cost; null is only for a row with no priced call');
   return [];
@@ -1114,6 +1119,25 @@ function pricedRow(row, at) {
  * date exists, not after `generatedAt`'s UTC date, at most 30 days before it) and the project attribution (each project
  * once by its normal form, each task run once; calls, priced calls and known costs bounded). Never throws.
  */
+/** The contract's `toNumber` (src/findings.ts): `Number()` without its throw on an object such as {"toString": 1}. */
+function toNumber(value) {
+  try {
+    return Number(value);
+  } catch {
+    return Number.NaN;
+  }
+}
+
+/** The contract's `show`: `String()`, or the value's JSON where `String()` would throw. */
+function show(value) {
+  if (typeof value === 'string') return value;
+  try {
+    return String(value);
+  } catch {
+    return JSON.stringify(value) ?? typeof value;
+  }
+}
+
 export function usageFindings(report) {
   const value = typeof report === 'object' && report !== null && !Array.isArray(report) ? report : {};
   const findings = [];
@@ -1122,23 +1146,24 @@ export function usageFindings(report) {
   let previous = '';
   days.forEach((day, i) => {
     const at = `/days/${i}`;
-    const date = String(day.date ?? '');
+    const date = show(day.date ?? '');
     if (date <= previous) flag(`${at}/date`, `days must run forward without a repeat (${date} after ${previous})`);
     previous = date;
     findings.push(...pricedRow(day, at));
     const models = usageList(day.byModel);
     models.forEach((m, j) => findings.push(...pricedRow(m, `${at}/byModel/${j}`)));
     if (!models.length) {
-      const spent = ['calls', 'inputTokens', 'outputTokens', 'cacheReadTokens', 'cacheWriteTokens'].some((f) => Number(day[f] ?? 0) > 0) || Number(day.costUsd ?? 0) > 0;
+      const spent = ['calls', 'inputTokens', 'outputTokens', 'cacheReadTokens', 'cacheWriteTokens'].some((f) => toNumber(day[f] ?? 0) > 0) || toNumber(day.costUsd ?? 0) > 0;
       if (spent) flag(`${at}/byModel`, 'a day with calls, tokens or cost names the models they belong to');
       return;
     }
-    for (const field of ['calls', 'unpricedCalls', 'inputTokens', 'outputTokens', 'cacheReadTokens', 'cacheWriteTokens']) {
-      const sum = models.reduce((n, m) => n + Number(m[field] ?? 0), 0);
-      if (Number(day[field] ?? 0) !== sum) flag(`${at}/${field}`, `the day's ${field} is not the sum of its models (${String(day[field] ?? 0)} ≠ ${sum})`);
+    for (const field of ['calls', 'unpricedCalls', 'unmeasuredCalls', 'inputTokens', 'outputTokens', 'cacheReadTokens', 'cacheWriteTokens']) {
+      const sum = models.reduce((n, m) => n + toNumber(m[field] ?? 0), 0);
+      if (toNumber(day[field] ?? 0) !== sum) flag(`${at}/${field}`, `the day's ${field} is not the sum of its models (${show(day[field] ?? 0)} ≠ ${sum})`);
     }
     const known = models.map((m) => (typeof m.costUsd === 'number' ? m.costUsd : null)).filter((x) => x !== null).reduce((n, x) => n + x, 0);
-    if (typeof day.costUsd === 'number' && Math.abs(day.costUsd - known) > 0.000001 + 1e-9 * Math.max(Math.abs(day.costUsd), Math.abs(known))) flag(`${at}/costUsd`, "the day's cost is not the sum of its models' known costs");
+    // The contract's !close(day, known): Infinity or NaN is never close, so it is a finding.
+    if (typeof day.costUsd === 'number' && !(Math.abs(day.costUsd - known) <= 0.000001 + 1e-9 * Math.max(Math.abs(day.costUsd), Math.abs(known)))) flag(`${at}/costUsd`, "the day's cost is not the sum of its models' known costs");
   });
   if (days.length) {
     const generated = strictTime(value.generatedAt);
@@ -1162,8 +1187,8 @@ export function usageFindings(report) {
       const at = `/byProject/${p}`;
       const normal = normalIdentifier(project.projectId);
       if (normal !== undefined) {
-        if (seen.has(normal)) flag(`${at}/projectId`, `each project is one row: ${String(project.projectId)} names the project ${seen.get(normal)} already names`);
-        else seen.set(normal, String(project.projectId));
+        if (seen.has(normal)) flag(`${at}/projectId`, `each project is one row: ${show(project.projectId)} names the project ${seen.get(normal)} already names`);
+        else seen.set(normal, show(project.projectId));
       }
       projectCalls += usageCount(project.calls);
       projectCost += usageCost(project.costUsd);
@@ -1272,6 +1297,7 @@ export function usageReport(receipts, { id, instance = 'default', now = Date.now
     row.calls += 1;
     for (const c of COUNTS) row[c] += Number(r[c] ?? 0);
     if (r.costUsd === null || r.costUsd === undefined) row.unpricedCalls += 1; else row.cost += r.costUsd;
+    if (r.tokensMeasured === false) row.unmeasuredCalls = (row.unmeasuredCalls ?? 0) + 1; // absent is 0 (DEC-0091)
     row.bases.add(r.costBasis ?? 'unknown');
   }
   const outDays = [...days.keys()].sort().map((date) => {
@@ -1281,6 +1307,7 @@ export function usageReport(receipts, { id, instance = 'default', now = Date.now
     const day = emptyRow({ date });
     for (const m of models) {
       for (const c of ['calls', 'unpricedCalls', ...COUNTS]) day[c] += m[c];
+      if (m.unmeasuredCalls) day.unmeasuredCalls = (day.unmeasuredCalls ?? 0) + m.unmeasuredCalls;
       day.cost += m.costUsd ?? 0;
     }
     return { ...closeRow(day), byModel: models };

package/payload/plugins/fabric-agent-adapter/skills/building-fabric-services/scripts/fabric_board.py

@@ -483,7 +483,7 @@ class BoardSession:
             return self.post(self.grant.origin, body, self.grant.bearer(), session=self.mcp_session, timeout=self.timeout,
                              method=method, protocol_version=self.protocol_version if self.mcp_session else None)
         except _hub.HubError as exc:
-            raise BoardError("unreachable", "Fabric's hub did not answer; a write may have been stored — send it again with "
+            raise BoardError("unreachable", "Fabric's hub did not answer; a write may have been stored, so send it again with "
                              "the same idempotency key.", True) from exc
 
     def open(self) -> None:

package/payload/plugins/fabric-agent-adapter/skills/building-fabric-services/scripts/fabric_delegation.py

@@ -334,11 +334,22 @@ def _authentic(token: Any, jwks: Dict[str, Any], typ: str) -> Dict[str, Any]:
     return {"compact": compact, "kid": kid, "x": found["x"]}
 
 
+_ORG_CONTEXT = re.compile(r"org:[A-Za-z0-9][A-Za-z0-9_-]{0,127}\Z")
+
+
+def is_partner_actor(node: Any) -> bool:
+    """DEC-0090: a partner actor is exactly {partner: org:<id>}, never with a sub, a session or an act."""
+    return isinstance(node, dict) and len(node) == 1 and isinstance(node.get("partner"), str) and _ORG_CONTEXT.match(node["partner"]) is not None
+
+
 def chain_depth(act: Any) -> float:
-    """Depth of an actor chain; infinity for a chain that is not one (a missing or non-string sub at any level)."""
+    """Depth of an actor chain; infinity for a chain that is not one (a missing or non-string sub at any level). A
+    partner actor ends the chain and counts, never begins it (DEC-0090)."""
     depth = 0
     node = act
     while node is not _MISSING:
+        if depth > 0 and is_partner_actor(node):
+            return depth + 1
         if not isinstance(node, dict) or not _is_string(node.get("sub")):
             return math.inf
         depth += 1
@@ -352,7 +363,7 @@ def _chain_of(act: Dict[str, Any]) -> List[str]:
     chain = []
     node: Any = act
     while isinstance(node, dict):
-        chain.append(node["sub"])
+        chain.append(node["partner"] if "partner" in node else node["sub"])  # the contract's chainOf, partner first
         node = node.get("act")
     return chain
 
@@ -379,6 +390,8 @@ def _actor_chain_depth(act: Any) -> Optional[int]:
     depth = 0
     node = act
     while node is not _MISSING:
+        if depth > 0 and is_partner_actor(node):  # DEC-0090: innermost only, it ends the chain
+            return depth + 1
         if not isinstance(node, dict) or not _full(AGENT_ID, node.get("sub")):
             return None
         if "session" in node and not _full(OPAQUE_ID, node["session"]):

package/payload/plugins/fabric-agent-adapter/skills/building-fabric-services/scripts/fabric_estate.py

@@ -734,9 +734,18 @@ def placement_trust(record: Dict[str, Any], machine_id: str, agent_ref: str, con
                       if _same(_get(p, "agentRef"), agent_ref) and _same(_context_of(p), context)), None)
     if placement is None:
         return None
+    if not _scope_admits(record, _get(placement, "publisherKid"), context):  # DEC-0090: a partner's key, in its contexts only
+        return {"publisher": []}
     return {"publisher": [k for k in _list(_get(record, "publisherKeys")) if _same(_get(k, "kid"), _get(placement, "publisherKid"))]}
 
 
+def _scope_admits(record: Any, kid: Any, context: Any) -> bool:
+    """DEC-0090: a key no `publisherScopes[]` entry names is trusted in any context; a partner's key, only in a context
+    one of its scopes lists."""
+    scopes = [s for s in _list(_get(record, "publisherScopes")) if _same(_get(s, "kid"), kid)]
+    return not scopes or any(isinstance(_get(s, "contexts"), list) and _contains(s["contexts"], context) for s in scopes)
+
+
 #: v4 §7, Freshness: an estate revision's window is at most 30 days (DEC-0055 item 2).
 _MAX_WINDOW_MS = MAX_VALIDITY_SECONDS * 1000
 
@@ -953,6 +962,25 @@ def _placements(value: Dict[str, Any], flag) -> None:
                 flag("%s/publisherKid" % at, "publisher key %s is not in publisherKeys, so the machine pins no key to verify the package under" % _show(_get(placement, "publisherKid")))
 
 
+def _partner_scopes(value: Dict[str, Any], flag) -> None:
+    """FAC-SEM-122 on one record (DEC-0090): a partner's publisher key is scoped once, to a key the record pins, and a
+    placement under it is in one of the organization contexts its scope names, never ``personal`` or another."""
+    pinned = [_get(k, "kid") for k in _list(_get(value, "publisherKeys"))]
+    scoped: List[Any] = []
+    for scope, index in _indexed(_get(value, "publisherScopes")):
+        if _contains(scoped, _get(scope, "kid")):
+            flag("/publisherScopes/%d/kid" % index, "publisher key %s is scoped twice" % _show(_get(scope, "kid")))
+        scoped.append(_get(scope, "kid"))
+        if not _contains(pinned, _get(scope, "kid")):
+            flag("/publisherScopes/%d/kid" % index, "publisher key %s is not in publisherKeys, so the scope limits no key" % _show(_get(scope, "kid")))
+    for machine, m in _indexed(_get(value, "machines")):
+        for placement, p in _indexed(_get(machine, "packages")):
+            if not _scope_admits(value, _get(placement, "publisherKid"), _context_of(placement)):
+                flag("/machines/%d/packages/%d/publisherKid" % (m, p),
+                     "publisher key %s is a partner's, trusted only in the contexts its scope names, not in %s"
+                     % (_show(_get(placement, "publisherKid")), _show(_context_of(placement))))
+
+
 def _secret_references(value: Dict[str, Any], flag) -> None:
     machine_ids = [_get(m, "id") for m in _list(_get(value, "machines"))]
     for machine, m in _indexed(_get(value, "machines")):
@@ -1110,6 +1138,7 @@ def _record_findings(value: Dict[str, Any]) -> List[Dict[str, str]]:
     _revision_whole(value, _finding(findings, "FAC-SEM-072"))
     _keys(value, _finding(findings, "FAC-SEM-073"))
     _placements(value, _finding(findings, "FAC-SEM-074"))
+    _partner_scopes(value, _finding(findings, "FAC-SEM-122"))
     _secret_references(value, _finding(findings, "FAC-SEM-075"))
     _grants_and_revocations(value, _finding(findings, "FAC-SEM-076"))
     for grant, index in _indexed(_get(value, "shareGrants")):  # FAC-SEM-110 (DEC-0082)
@@ -1156,6 +1185,9 @@ def _installation(value: Dict[str, Any]) -> List[Dict[str, str]]:
         if _same(_get(secret, "agentRef"), _get(pkg, "agentRef")) and _same(_context_of(secret), context) and not _contains(declared, _get(secret, "slot")):
             flag075("/record/machines/%d/secrets/%d/slot" % (machine_index, index),
                     "the package declares no slot %s: a secret goes only where a placed package declares it" % _show(_get(secret, "slot")))
+    if placement is not None and not _scope_admits(record, _get(placement, "publisherKid"), context):
+        _finding(findings, "FAC-SEM-122")("/record/machines/%d/packages/%d/publisherKid" % (machine_index, placement_index),
+                                          "publisher key %s is a partner's, not trusted in %s" % (_show(_get(placement, "publisherKid")), _show(context)))
     if placement is not None:
         flag111 = _finding(findings, "FAC-SEM-111")
         for suffix, message in _placement_grant_problems(record, placement):

package/payload/plugins/fabric-agent-adapter/skills/building-fabric-services/scripts/fabric_package.py

@@ -648,7 +648,7 @@ def read_folder(folder: Any) -> Dict[str, bytes]:
                 continue
             files[rel] = full.read_bytes()
     if refused:
-        raise PackageError("Not packed: remove these or pack a clean copy — " + "; ".join(sorted(refused)))
+        raise PackageError("Not packed: remove these or pack a clean copy: " + "; ".join(sorted(refused)))
     return files
 
 

package/payload/plugins/fabric-agent-adapter/skills/building-fabric-services/scripts/fabric_service.py

@@ -18,6 +18,7 @@ import hashlib
 import hmac
 import http.server
 import json
+import math
 import ntpath
 import os
 from pathlib import Path, PurePath
@@ -46,7 +47,7 @@ EXTENSION_KEY = "https://fabric.passioncode.ai/agent-contract/extensions/service
 # The embedded dashboard declaration (fabric-dashboard/0.1, DEC-0036 ED-9), under the well-known
 # document's `extensions`. The kit is assets/dashboard-kit; its version is the one in kit.json.
 DASHBOARD_EXTENSION_KEY = "https://fabric.passioncode.ai/agent-contract/extensions/dashboard/0.1"
-DASHBOARD_KIT = "fabric-dashboard-kit@1.1.0"
+DASHBOARD_KIT = "fabric-dashboard-kit@1.1.1"
 REFERENCE_THEMES = ("graphite", "fabric", "paper", "forest", "ocean", "ember", "contrast")
 EXIT_ALREADY_RUNNING = 75
 # Lifecycle rules: references/lifecycle.md, the rule for this kit's users, which implements the public
@@ -1356,7 +1357,7 @@ def build_well_known(*, service_id: str, instance: str, name: str, version: str,
 #: Each contract protocol's published revisions, oldest first (the contract's `PROTOCOL_REVISIONS`, DEC-0067); a test
 #: holds it equal to the contract's register at the pin.
 PROTOCOL_REVISIONS: Dict[str, Tuple[str, ...]] = {
-    "access-log": ("1",), "approval": ("1",), "activity-summary": ("1",), "enroll-token": ("1",), "entitlement": ("1",),
+    "access-log": ("1",), "approval": ("1",), "activity-summary": ("1",), "coding-agents": ("1",), "enroll-token": ("1",), "entitlement": ("1",),
     "entitlement-key-set": ("1",), "estate-record": ("1",), "execution-packet": ("1",),
     "fabric-activity": ("0.1",), "fabric-dashboard": ("0.1",), "fabric-delegation": ("0.1",), "fabric-device": ("0.1",),
     "fabric-interop": ("0.1", "0.2"), "fabric-local-channel": ("0.1",), "fabric-local-runner": ("0.1",),
@@ -1364,7 +1365,7 @@ PROTOCOL_REVISIONS: Dict[str, Tuple[str, ...]] = {
     "fabric-provider": ("0.1",), "fabric-relay": ("0.1",), "fabric-secret-envelope": ("1",), "fabric-service": ("0.1",),
     "fabric-settings-backup": ("1",), "heartbeat": ("1",), "learning-note": ("1",), "memory": ("0.1",), "pairing-message": ("1",), "pipeline": ("0.1",),
     "revocation-delta": ("1",), "session-handoff": ("1",), "share-registration": ("1",),
-    "share-registration-receipt": ("1",), "window-lease": ("1",),
+    "share-registration-receipt": ("1",), "support-quality-daily": ("1",), "window-lease": ("1",),
 }
 MAX_PROTOCOLS = 64
 _REVISION = re.compile(r"([a-z][a-z0-9.-]{0,63})/([0-9]{1,4}(?:\.[0-9]{1,4}){0,2})", re.ASCII)
@@ -1622,9 +1623,13 @@ def make_usage_receipt(provider: str, model: str, *, input_tokens: int, output_t
                        cache_read_tokens: int = 0, cache_write_tokens: int = 0,
                        cost_usd: Optional[float] = None, cost_basis: Optional[str] = None,
                        at: Optional[str] = None, route: Optional[str] = None,
-                       project_id: Optional[str] = None, task_run_id: Optional[str] = None) -> Dict[str, Any]:
+                       project_id: Optional[str] = None, task_run_id: Optional[str] = None,
+                       tokens_measured: bool = True) -> Dict[str, Any]:
     """One model call, from the provider's own usage numbers. No prompt, output or caller.
 
+    `tokens_measured=False` marks a call whose token counts are a lower bound or unknown (the provider returned none,
+    the stream was cut): the report counts it in `unmeasuredCalls` and its token totals are a lower bound (DEC-0091).
+
     `project_id` (a URI, kept in its normal form, DEC-0076) and `task_run_id` (the service's own run id) attribute the
     call to the project the service ran it for (DEC-0065); they never name a caller, session or person.
 
@@ -1650,6 +1655,10 @@ def make_usage_receipt(provider: str, model: str, *, input_tokens: int, output_t
         raise ServiceError("route is subscription, key or platform-metered (DEC-0046, DEC-0061).")
     receipt = {"at": at or now_iso(), "provider": provider, "model": model, **counts,
                "costUsd": None if cost_usd is None else float(cost_usd), "costBasis": basis}
+    if tokens_measured is not True:
+        if tokens_measured is not False:
+            raise ServiceError("tokens_measured is True or False.")
+        receipt["tokensMeasured"] = False
     if route is not None:
         receipt["route"] = route  # the operator's own login in its vendor's runner, an issued key, or the platform's metered models
     if task_run_id is not None and project_id is None:
@@ -1703,6 +1712,8 @@ def _by_project(receipts: List[Dict[str, Any]], first: str, last: str) -> List[D
 
 def _add_totals(row: Dict[str, Any], receipt: Dict[str, Any]) -> None:
     row["calls"] += 1
+    if receipt.get("tokensMeasured") is False:
+        row["unmeasuredCalls"] = row.get("unmeasuredCalls", 0) + 1  # written only when above 0: absent is 0 (DEC-0091)
     for name in ("inputTokens", "outputTokens", "cacheReadTokens", "cacheWriteTokens"):
         row[name] += int(receipt.get(name) or 0)
     if receipt.get("costUsd") is None:
@@ -1724,11 +1735,21 @@ _DAY_MS = 86_400_000
 
 
 def _usage_count(value: Any) -> int:
-    return value if isinstance(value, int) and not isinstance(value, bool) and 0 <= value <= 2 ** 53 - 1 else 0
+    """The contract's `count`: Number.isSafeInteger and not negative, so 5.0 (which JavaScript reads as 5) counts."""
+    import fabric_estate  # noqa: E402
+    return int(value) if not isinstance(value, bool) and fabric_estate._safe_integer(value) and value >= 0 else 0
+
+
+def _usage_money(value: Any) -> Optional[float]:
+    """A JSON number as JavaScript holds it (an integer beyond a double is Infinity), or None for anything else."""
+    import fabric_estate  # noqa: E402
+    return fabric_estate._double(value) if isinstance(value, (int, float)) and not isinstance(value, bool) else None
 
 
 def _usage_cost(value: Any) -> float:
-    return float(value) if isinstance(value, (int, float)) and not isinstance(value, bool) and value == value and value >= 0 and value != float("inf") else 0.0
+    """The contract's `cost`: a known, finite, non-negative cost, or 0."""
+    money = _usage_money(value)
+    return money if money is not None and math.isfinite(money) and money >= 0 else 0.0
 
 
 def _exceeds(a: float, b: float) -> bool:
@@ -1760,6 +1781,8 @@ def _priced_row(row: Dict[str, Any], at: str) -> List[Dict[str, str]]:
     flag = lambda path, message: [{"code": "FAC-SEM-025", "instancePath": path, "message": message}]  # noqa: E731
     if unpriced > calls:
         return flag(at + "/unpricedCalls", "more unpriced calls than calls")
+    if _usage_count(row.get("unmeasuredCalls")) > calls:  # DEC-0091: unknown token counts are some of the calls
+        return flag(at + "/unmeasuredCalls", "more calls with unknown tokens than calls")
     if calls > 0 and unpriced == calls and row.get("costUsd", _MISSING_COST) is not None:
         return flag(at + "/costUsd", "every call is unpriced, so the cost is unknown (null), not a number")
     if unpriced < calls and row.get("costUsd", _MISSING_COST) is None:
@@ -1785,8 +1808,7 @@ def usage_findings(report: Any) -> List[Dict[str, str]]:
     previous = ""
     for i, day in enumerate(days):
         at = "/days/%d" % i
-        date = day.get("date")
-        date = "" if date is None else (date if isinstance(date, str) else json.dumps(date))
+        date = fabric_estate._show("" if day.get("date") is None else day["date"])  # the contract's show(day.date ?? "")
         if date <= previous:
             flag(at + "/date", "days must run forward without a repeat (%s after %s)" % (date, previous))
         previous = date
@@ -1794,19 +1816,29 @@ def usage_findings(report: Any) -> List[Dict[str, str]]:
         models = _usage_list(day.get("byModel"))
         for j, m in enumerate(models):
             findings.extend(_priced_row(m, "%s/byModel/%d" % (at, j)))
+        # The contract reads every count as `toNumber(x ?? 0)` and writes it with `show`: a string count is read as a
+        # number, and what is no number (an object, "abc") is NaN, which equals no sum, so it is a finding.
+        number = lambda row, f: fabric_estate._js_to_number(row.get(f))  # noqa: E731 - None and absent read as 0
         if not models:
-            spent = any((day.get(f) or 0) > 0 for f in ("calls", "inputTokens", "outputTokens", "cacheReadTokens", "cacheWriteTokens")
-                        if isinstance(day.get(f) or 0, (int, float))) or (isinstance(day.get("costUsd"), (int, float)) and day["costUsd"] > 0)
+            spent = any(number(day, f) > 0 for f in ("calls", "inputTokens", "outputTokens", "cacheReadTokens", "cacheWriteTokens")) \
+                or number(day, "costUsd") > 0
             if spent:
                 flag(at + "/byModel", "a day with calls, tokens or cost names the models they belong to")
             continue
-        for field in ("calls", "unpricedCalls", "inputTokens", "outputTokens", "cacheReadTokens", "cacheWriteTokens"):
-            total = sum(m.get(field) or 0 for m in models if isinstance(m.get(field) or 0, (int, float)))
-            if (day.get(field) or 0) != total:
-                flag("%s/%s" % (at, field), "the day's %s is not the sum of its models (%s ≠ %s)" % (field, day.get(field) or 0, total))
-        known = sum(m["costUsd"] for m in models if isinstance(m.get("costUsd"), (int, float)) and not isinstance(m.get("costUsd"), bool))
-        day_cost = day.get("costUsd")
-        if isinstance(day_cost, (int, float)) and not isinstance(day_cost, bool) and abs(day_cost - known) > 0.000001 + 1e-9 * max(abs(day_cost), abs(known)):
+        for field in ("calls", "unpricedCalls", "unmeasuredCalls", "inputTokens", "outputTokens", "cacheReadTokens", "cacheWriteTokens"):
+            total = 0.0
+            for m in models:
+                total += number(m, field)  # in order, in doubles, as JavaScript adds
+            if number(day, field) != total:
+                shown = fabric_estate._show(0 if day.get(field) is None else day[field])
+                flag("%s/%s" % (at, field), "the day's %s is not the sum of its models (%s ≠ %s)" % (field, shown, fabric_estate._js_string(total)))
+        known = 0.0
+        for m in models:
+            money = _usage_money(m.get("costUsd"))
+            known += money if money is not None else 0.0
+        day_cost = _usage_money(day.get("costUsd"))
+        # The contract's !close(day, known): Infinity or NaN is never close, so it is a finding.
+        if day_cost is not None and not abs(day_cost - known) <= 0.000001 + 1e-9 * max(abs(day_cost), abs(known)):
             flag(at + "/costUsd", "the day's cost is not the sum of its models' known costs")
     # The window.
     if days:
@@ -1853,7 +1885,7 @@ def usage_findings(report: Any) -> List[Dict[str, str]]:
                 run_priced += max(0, _usage_count(run.get("calls")) - _usage_count(run.get("unpricedCalls")))
                 findings.extend(_priced_row(run, "%s/taskRuns/%d" % (at, r)))
             project_priced = max(0, _usage_count(project.get("calls")) - _usage_count(project.get("unpricedCalls")))
-            known_cost = isinstance(project.get("costUsd"), (int, float)) and not isinstance(project.get("costUsd"), bool) and _usage_cost(project.get("costUsd")) == project.get("costUsd")
+            known_cost = _usage_cost(project.get("costUsd")) == _usage_money(project.get("costUsd"))  # as JavaScript holds it
             if run_calls > _usage_count(project.get("calls")):
                 flag(at + "/taskRuns", "a project's task runs hold more calls than the project (%d > %d)" % (run_calls, _usage_count(project.get("calls"))))
             elif run_priced > project_priced:
@@ -2001,6 +2033,8 @@ def usage_report(receipts: Iterable[Dict[str, Any]], *, service_id: str, instanc
         for m in models:
             for name in ("calls", "unpricedCalls", "inputTokens", "outputTokens", "cacheReadTokens", "cacheWriteTokens"):
                 day[name] += m[name]
+            if m.get("unmeasuredCalls"):
+                day["unmeasuredCalls"] = day.get("unmeasuredCalls", 0) + m["unmeasuredCalls"]
             day["_cost"] += m["costUsd"] or 0.0
         day = _close_totals(day)
         day["byModel"] = models

package/payload/plugins/fabric-agent-adapter/skills/building-fabric-services/scripts/sample_service.py

@@ -258,7 +258,7 @@ def make_handler(svc: Service):
             if url.path == "/":
                 if not self._session_ok():
                     return self._send(401, "Open this dashboard from Fabric Dashboards.", content_type="text/plain")
-                rows = "".join("<li>%s — %s</li>" % (html.escape(e["at"]), html.escape(e["text"]))
+                rows = "".join("<li>%s: %s</li>" % (html.escape(e["at"]), html.escape(e["text"]))
                                for e in reversed(svc.log.fetch(None, 20)))
                 return self._send(200, PAGE.format(name=html.escape(svc.name), agent=html.escape("%s.%s" % (svc.id, svc.instance)), status="ready", rows=rows),
                                   content_type="text/html; charset=utf-8")