@hasna/machines 0.0.22 → 0.0.24

package/dist/index.js

@@ -11112,29 +11112,78 @@ function getPackageVersion() {
 var MACHINES_CONSUMER_CONTRACT_VERSION = 1;
 var MACHINES_PACKAGE_NAME = "@hasna/machines";
 var MACHINES_CONSUMER_ENTRYPOINT = "@hasna/machines/consumer";
+var MACHINES_CONSUMER_SCHEMA_URI = "https://schemas.hasna.xyz/machines/consumer/v1/machines-consumer.schema.json";
+var MACHINES_CONSUMER_SCHEMA_ARTIFACT = "schemas/machines-consumer.schema.json";
+var DEFAULT_MACHINE_RESOLVER_TTL_MS = 24 * 60 * 60 * 1000;
 var MACHINES_CONSUMER_CAPABILITIES = {
   topology: true,
   compatibility: true,
   route_resolution: true,
   cli_json_fallback: true,
   workspace_path_mapping: true,
-  workspace_diagnostics: true
+  workspace_diagnostics: true,
+  schema_artifacts: true,
+  cacheability_metadata: true,
+  resolver_snapshots: true,
+  field_capability_descriptors: true
+};
+var MACHINES_CONSUMER_FIELD_CAPABILITIES = {
+  topology: {
+    machine_identity: true,
+    route_hints: true,
+    tailscale_status: true,
+    manifest_metadata: true
+  },
+  route: {
+    cacheability: true,
+    confidence: true,
+    resolver_evidence: true
+  },
+  workspace: {
+    cacheability: true,
+    path_mapping: true,
+    diagnostics: true,
+    repair_hints: true,
+    trust_auth: true
+  },
+  compatibility: {
+    commands: true,
+    packages: true,
+    workspaces: true
+  },
+  resolver_snapshot: {
+    cacheability: true,
+    redacted_provenance: true
+  }
 };
 var MACHINES_CONSUMER_CONTRACT = {
   schema_version: MACHINES_CONSUMER_CONTRACT_VERSION,
   package_name: MACHINES_PACKAGE_NAME,
   entrypoint: MACHINES_CONSUMER_ENTRYPOINT,
+  schema_uri: MACHINES_CONSUMER_SCHEMA_URI,
+  schema_artifact: MACHINES_CONSUMER_SCHEMA_ARTIFACT,
   capabilities: MACHINES_CONSUMER_CAPABILITIES,
-  envelopes: ["topology", "route", "workspace", "compatibility"],
+  field_capabilities: MACHINES_CONSUMER_FIELD_CAPABILITIES,
+  cacheability: {
+    default_ttl_ms: DEFAULT_MACHINE_RESOLVER_TTL_MS,
+    stale_requires_refresh: true
+  },
+  envelopes: ["topology", "route", "workspace", "compatibility", "resolver_snapshot"],
   stable_exports: [
     "MACHINES_CONSUMER_CONTRACT",
     "MACHINES_CONSUMER_CONTRACT_VERSION",
     "MACHINES_CONSUMER_CAPABILITIES",
+    "MACHINES_CONSUMER_FIELD_CAPABILITIES",
+    "MACHINES_CONSUMER_SCHEMA_BUNDLE",
+    "MACHINES_CONSUMER_SCHEMA_URI",
     "MACHINES_PACKAGE_NAME",
     "discoverMachineTopology",
     "getLocalMachineTopology",
     "resolveMachineRoute",
     "resolveMachineWorkspace",
+    "createMachineResolverSnapshot",
+    "getMachinesConsumerSchemaBundle",
+    "validateMachinesConsumerEnvelope",
     "checkMachineCompatibility",
     "resolveMachineCommand",
     "runMachineCommand",
@@ -11412,11 +11461,100 @@ function routeConfidence(input) {
     return "low";
   return "none";
 }
+function addMilliseconds(date, milliseconds) {
+  return new Date(date.getTime() + milliseconds).toISOString();
+}
+function routeAuthority(input) {
+  if (!input.machine)
+    return "unresolved";
+  if (input.matchedBy === "fallback")
+    return "fallback";
+  if (input.selectedHint?.kind === "local")
+    return "live_topology";
+  if (input.selectedHint?.kind === "tailscale" || input.machine.tailscale.online !== null)
+    return "live_topology";
+  if (input.machine.manifest_declared)
+    return "manifest";
+  return "open-machines";
+}
+function workspaceAuthority(paths) {
+  const sources = [paths.workspace_root.source, paths.project_root.source, paths.open_files_root.source];
+  if (sources.some((source) => source === "argument"))
+    return "argument";
+  if (sources.some((source) => source === "manifest_metadata"))
+    return "manifest_metadata";
+  if (sources.some((source) => source === "manifest"))
+    return "manifest";
+  if (sources.some((source) => source === "inferred"))
+    return "inferred";
+  if (sources.every((source) => source === "unresolved"))
+    return "unresolved";
+  return "open-machines";
+}
+function cacheability(input) {
+  const ttlMs = input.ttlMs === undefined ? DEFAULT_MACHINE_RESOLVER_TTL_MS : input.ttlMs;
+  const expiresAt = typeof ttlMs === "number" && ttlMs > 0 ? addMilliseconds(input.observedAt, ttlMs) : null;
+  const stale = expiresAt ? input.now.getTime() > new Date(expiresAt).getTime() : false;
+  const confidenceCacheable = input.confidence !== "none" && input.confidence !== "low";
+  const cacheable = input.ok && confidenceCacheable && !stale && input.authority !== "unresolved";
+  const reasons = [...input.reasons];
+  if (!input.ok)
+    reasons.push("resolver_not_ok");
+  if (!confidenceCacheable)
+    reasons.push(`low_confidence:${input.confidence}`);
+  if (stale)
+    reasons.push("stale");
+  if (input.authority === "unresolved")
+    reasons.push("unresolved_authority");
+  return {
+    observed_at: input.observedAt.toISOString(),
+    verified_at: input.ok ? input.now.toISOString() : null,
+    expires_at: expiresAt,
+    ttl_ms: typeof ttlMs === "number" && ttlMs > 0 ? ttlMs : null,
+    source_authority: input.authority,
+    confidence: input.confidence,
+    cacheable,
+    stale,
+    reasons: [...new Set(reasons)].sort()
+  };
+}
+function worstConfidence(values) {
+  const rank = {
+    exact: 0,
+    high: 1,
+    medium: 2,
+    low: 3,
+    none: 4
+  };
+  return [...values].sort((left, right) => rank[right] - rank[left])[0] ?? "none";
+}
+function mergeAuthorities(values) {
+  const filtered = values.filter((value) => value !== "unknown");
+  if (filtered.length === 0)
+    return "unknown";
+  const first = filtered[0];
+  return filtered.every((value) => value === first) ? first : "mixed";
+}
+function mergeCacheability(input) {
+  const confidence = worstConfidence(input.cacheabilities.map((entry) => entry.confidence));
+  const reasons = input.cacheabilities.flatMap((entry) => entry.reasons);
+  const ok = input.cacheabilities.every((entry) => entry.cacheable);
+  return cacheability({
+    ok,
+    observedAt: input.observedAt,
+    now: input.now,
+    ttlMs: input.ttlMs,
+    authority: mergeAuthorities(input.authorities),
+    confidence,
+    reasons
+  });
+}
 function resolveMachineRoute(machineId, options = {}) {
+  const now = options.now ?? new Date;
   const topology = options.topology ?? discoverMachineTopology(options);
   const warnings = [...topology.warnings];
   const { machine, matchedBy } = findRouteMachine(topology, machineId);
-  const generatedAt = (options.now ?? new Date).toISOString();
+  const generatedAt = now.toISOString();
   if (!machine) {
     warnings.push(`machine_not_found:${machineId}`);
     return {
@@ -11440,16 +11578,27 @@ function resolveMachineRoute(machineId, options = {}) {
         tailscale_online: null,
         selected_hint: null
       },
+      cacheability: cacheability({
+        ok: false,
+        observedAt: now,
+        now,
+        ttlMs: options.resolverTtlMs,
+        authority: "unresolved",
+        confidence: "none",
+        reasons: [`machine_not_found:${machineId}`]
+      }),
       warnings
     };
   }
   const selectedHint = selectRouteHint(machine.route_hints);
   const route = selectedHint?.kind ?? machine.ssh.route ?? "unknown";
   const local = route === "local" || machine.machine_id === topology.local_machine_id;
+  const confidence = routeConfidence({ machine, hint: selectedHint, matchedBy });
+  const ok = Boolean(selectedHint?.target);
   return {
     schema_version: MACHINES_CONSUMER_CONTRACT_VERSION,
     package: topology.package,
-    ok: Boolean(selectedHint?.target),
+    ok,
     machine_id: machine.machine_id,
     requested_machine_id: machineId,
     generated_at: generatedAt,
@@ -11457,7 +11606,7 @@ function resolveMachineRoute(machineId, options = {}) {
     source: route,
     target: selectedHint?.target ?? null,
     command_target: selectedHint?.target ?? null,
-    confidence: routeConfidence({ machine, hint: selectedHint, matchedBy }),
+    confidence,
     local,
     evidence: {
       topology: true,
@@ -11467,6 +11616,15 @@ function resolveMachineRoute(machineId, options = {}) {
       tailscale_online: machine.tailscale.online,
       selected_hint: selectedHint
     },
+    cacheability: cacheability({
+      ok,
+      observedAt: now,
+      now,
+      ttlMs: options.resolverTtlMs,
+      authority: routeAuthority({ machine, selectedHint, matchedBy }),
+      confidence,
+      reasons: selectedHint ? [] : ["route_target_unresolved"]
+    }),
     warnings
   };
 }
@@ -11763,10 +11921,11 @@ function metadataKeysForDiagnostics(metadata) {
   return Object.keys(metadata).filter((key) => !/(secret|token|key|password|credential)/i.test(key)).sort();
 }
 function resolveMachineWorkspace(options) {
+  const now = options.now ?? new Date;
   const topology = options.topology ?? discoverMachineTopology(options);
   const warnings = [...topology.warnings];
   const { machine, matchedBy } = findRouteMachine(topology, options.machineId);
-  const generatedAt = (options.now ?? new Date).toISOString();
+  const generatedAt = now.toISOString();
   const repoName = options.repoName ?? options.projectId;
   const openFilesRepoName = options.openFilesRepoName ?? "open-files";
   if (!machine) {
@@ -11793,6 +11952,15 @@ function resolveMachineWorkspace(options) {
         manifest_declared: null,
         metadata_keys: []
       },
+      cacheability: cacheability({
+        ok: false,
+        observedAt: now,
+        now,
+        ttlMs: options.resolverTtlMs,
+        authority: "unresolved",
+        confidence: "none",
+        reasons: [`machine_not_found:${options.machineId}`]
+      }),
       warnings
     };
     const diagnostics2 = workspaceDiagnostics({
@@ -11824,10 +11992,16 @@ function resolveMachineWorkspace(options) {
     warnings.push(`open_files_root_inferred:${options.projectId}`);
   if (!projectRootPath)
     warnings.push(`project_root_unresolved:${options.projectId}`);
+  const workspacePaths = {
+    workspace_root: { path: workspaceRootPath, source: workspaceRootSource },
+    project_root: { path: projectRootPath, source: projectRootSource },
+    open_files_root: { path: openFilesRootPath, source: openFilesRootSource }
+  };
+  const workspaceOk = Boolean(projectRootPath);
   const resolution = {
     schema_version: MACHINES_CONSUMER_CONTRACT_VERSION,
     package: topology.package,
-    ok: Boolean(projectRootPath),
+    ok: workspaceOk,
     requested_machine_id: options.machineId,
     machine_id: machine.machine_id,
     generated_at: generatedAt,
@@ -11842,11 +12016,7 @@ function resolveMachineWorkspace(options) {
       trust_status: trustStatus(machine),
       auth_status: authStatus(machine)
     },
-    paths: {
-      workspace_root: { path: workspaceRootPath, source: workspaceRootSource },
-      project_root: { path: projectRootPath, source: projectRootSource },
-      open_files_root: { path: openFilesRootPath, source: openFilesRootSource }
-    },
+    paths: workspacePaths,
     diagnostics: [],
     repair_hints: [],
     evidence: {
@@ -11855,6 +12025,15 @@ function resolveMachineWorkspace(options) {
       manifest_declared: machine.manifest_declared,
       metadata_keys: metadataKeysForDiagnostics(metadata)
     },
+    cacheability: cacheability({
+      ok: workspaceOk,
+      observedAt: now,
+      now,
+      ttlMs: options.resolverTtlMs,
+      authority: workspaceAuthority(workspacePaths),
+      confidence: workspaceOk ? "medium" : "none",
+      reasons: projectRootPath ? [] : [`project_root_unresolved:${options.projectId}`]
+    }),
     warnings
   };
   const diagnostics = workspaceDiagnostics({
@@ -11869,6 +12048,73 @@ function resolveMachineWorkspace(options) {
     repair_hints: diagnostics.repairHints
   };
 }
+function createMachineResolverSnapshot(options) {
+  const now = options.now ?? new Date;
+  const routeObservedAt = new Date(options.route.generated_at);
+  const workspaceObservedAt = options.workspace ? new Date(options.workspace.generated_at) : null;
+  const observedAt = new Date(Math.max(Number.isNaN(routeObservedAt.getTime()) ? 0 : routeObservedAt.getTime(), workspaceObservedAt && !Number.isNaN(workspaceObservedAt.getTime()) ? workspaceObservedAt.getTime() : 0));
+  const cacheabilities = [options.route.cacheability, options.workspace?.cacheability].filter((entry) => Boolean(entry));
+  const authorities = cacheabilities.map((entry) => entry.source_authority);
+  const warnings = [...new Set([
+    ...options.route.warnings,
+    ...options.workspace?.warnings ?? [],
+    ...cacheabilities.flatMap((entry) => entry.reasons)
+  ])].sort();
+  return {
+    schema_version: MACHINES_CONSUMER_CONTRACT_VERSION,
+    package: options.route.package,
+    generated_at: now.toISOString(),
+    requested_machine_id: options.route.requested_machine_id,
+    machine_id: options.route.machine_id ?? options.workspace?.machine_id ?? null,
+    route: {
+      ok: options.route.ok,
+      source: options.route.source,
+      route: options.route.route,
+      target: options.route.target,
+      command_target: options.route.command_target,
+      confidence: options.route.confidence,
+      local: options.route.local,
+      cacheability: options.route.cacheability
+    },
+    workspace: options.workspace ? {
+      ok: options.workspace.ok,
+      project: options.workspace.project,
+      machine: options.workspace.machine,
+      paths: options.workspace.paths,
+      diagnostics: options.workspace.diagnostics,
+      repair_hints: options.workspace.repair_hints,
+      cacheability: options.workspace.cacheability
+    } : null,
+    cacheability: mergeCacheability({
+      observedAt: observedAt.getTime() > 0 ? observedAt : now,
+      now,
+      ttlMs: options.resolverTtlMs,
+      authorities,
+      cacheabilities
+    }),
+    warnings,
+    provenance: {
+      route: {
+        schema_version: options.route.schema_version,
+        generated_at: options.route.generated_at,
+        evidence: {
+          matched_by: options.route.evidence.matched_by,
+          manifest_declared: options.route.evidence.manifest_declared,
+          heartbeat_status: options.route.evidence.heartbeat_status,
+          tailscale_online: options.route.evidence.tailscale_online,
+          selected_hint_kind: options.route.evidence.selected_hint?.kind ?? null
+        }
+      },
+      workspace: options.workspace ? {
+        schema_version: options.workspace.schema_version,
+        generated_at: options.workspace.generated_at,
+        metadata_keys: options.workspace.evidence.metadata_keys,
+        matched_by: options.workspace.evidence.matched_by,
+        manifest_declared: options.workspace.evidence.manifest_declared
+      } : null
+    }
+  };
+}
 function getLocalMachineTopology(options = {}) {
   const topology = discoverMachineTopology(options);
   return topology.machines.find((machine) => machine.machine_id === topology.local_machine_id) ?? {
@@ -23125,6 +23371,7 @@ export {
   diffApps,
   detectCurrentMachineManifest,
   createMcpServer,
+  createMachineResolverSnapshot,
   countRuns,
   closeDb,
   checkMachineCompatibility,
@@ -23150,6 +23397,9 @@ export {
   MACHINES_STORAGE_FALLBACK_ENV,
   MACHINES_STORAGE_ENV,
   MACHINES_PACKAGE_NAME,
+  MACHINES_CONSUMER_SCHEMA_URI,
+  MACHINES_CONSUMER_SCHEMA_ARTIFACT,
+  MACHINES_CONSUMER_FIELD_CAPABILITIES,
   MACHINES_CONSUMER_ENTRYPOINT,
   MACHINES_CONSUMER_CONTRACT_VERSION,
   MACHINES_CONSUMER_CONTRACT,
@@ -23158,6 +23408,7 @@ export {
   MACHINES_BACKUP_PREFIX_ENV,
   MACHINES_BACKUP_BUCKET_FALLBACK_ENV,
   MACHINES_BACKUP_BUCKET_ENV,
+  DEFAULT_MACHINE_RESOLVER_TTL_MS,
   DEFAULT_BACKUP_PREFIX,
   CROSSREFS_KEY
 };

package/dist/mcp/index.js

@@ -4370,13 +4370,18 @@ import { arch as arch2, hostname as hostname3, platform as platform2, userInfo a
 import { spawnSync } from "child_process";
 var MACHINES_CONSUMER_CONTRACT_VERSION = 1;
 var MACHINES_PACKAGE_NAME = "@hasna/machines";
+var DEFAULT_MACHINE_RESOLVER_TTL_MS = 24 * 60 * 60 * 1000;
 var MACHINES_CONSUMER_CAPABILITIES = {
   topology: true,
   compatibility: true,
   route_resolution: true,
   cli_json_fallback: true,
   workspace_path_mapping: true,
-  workspace_diagnostics: true
+  workspace_diagnostics: true,
+  schema_artifacts: true,
+  cacheability_metadata: true,
+  resolver_snapshots: true,
+  field_capability_descriptors: true
 };
 function getMachinesConsumerCapabilities() {
   return { ...MACHINES_CONSUMER_CAPABILITIES };
@@ -4647,11 +4652,69 @@ function routeConfidence(input) {
     return "low";
   return "none";
 }
+function addMilliseconds(date, milliseconds) {
+  return new Date(date.getTime() + milliseconds).toISOString();
+}
+function routeAuthority(input) {
+  if (!input.machine)
+    return "unresolved";
+  if (input.matchedBy === "fallback")
+    return "fallback";
+  if (input.selectedHint?.kind === "local")
+    return "live_topology";
+  if (input.selectedHint?.kind === "tailscale" || input.machine.tailscale.online !== null)
+    return "live_topology";
+  if (input.machine.manifest_declared)
+    return "manifest";
+  return "open-machines";
+}
+function workspaceAuthority(paths) {
+  const sources = [paths.workspace_root.source, paths.project_root.source, paths.open_files_root.source];
+  if (sources.some((source) => source === "argument"))
+    return "argument";
+  if (sources.some((source) => source === "manifest_metadata"))
+    return "manifest_metadata";
+  if (sources.some((source) => source === "manifest"))
+    return "manifest";
+  if (sources.some((source) => source === "inferred"))
+    return "inferred";
+  if (sources.every((source) => source === "unresolved"))
+    return "unresolved";
+  return "open-machines";
+}
+function cacheability(input) {
+  const ttlMs = input.ttlMs === undefined ? DEFAULT_MACHINE_RESOLVER_TTL_MS : input.ttlMs;
+  const expiresAt = typeof ttlMs === "number" && ttlMs > 0 ? addMilliseconds(input.observedAt, ttlMs) : null;
+  const stale = expiresAt ? input.now.getTime() > new Date(expiresAt).getTime() : false;
+  const confidenceCacheable = input.confidence !== "none" && input.confidence !== "low";
+  const cacheable = input.ok && confidenceCacheable && !stale && input.authority !== "unresolved";
+  const reasons = [...input.reasons];
+  if (!input.ok)
+    reasons.push("resolver_not_ok");
+  if (!confidenceCacheable)
+    reasons.push(`low_confidence:${input.confidence}`);
+  if (stale)
+    reasons.push("stale");
+  if (input.authority === "unresolved")
+    reasons.push("unresolved_authority");
+  return {
+    observed_at: input.observedAt.toISOString(),
+    verified_at: input.ok ? input.now.toISOString() : null,
+    expires_at: expiresAt,
+    ttl_ms: typeof ttlMs === "number" && ttlMs > 0 ? ttlMs : null,
+    source_authority: input.authority,
+    confidence: input.confidence,
+    cacheable,
+    stale,
+    reasons: [...new Set(reasons)].sort()
+  };
+}
 function resolveMachineRoute(machineId, options = {}) {
+  const now = options.now ?? new Date;
   const topology = options.topology ?? discoverMachineTopology(options);
   const warnings = [...topology.warnings];
   const { machine, matchedBy } = findRouteMachine(topology, machineId);
-  const generatedAt = (options.now ?? new Date).toISOString();
+  const generatedAt = now.toISOString();
   if (!machine) {
     warnings.push(`machine_not_found:${machineId}`);
     return {
@@ -4675,16 +4738,27 @@ function resolveMachineRoute(machineId, options = {}) {
         tailscale_online: null,
         selected_hint: null
       },
+      cacheability: cacheability({
+        ok: false,
+        observedAt: now,
+        now,
+        ttlMs: options.resolverTtlMs,
+        authority: "unresolved",
+        confidence: "none",
+        reasons: [`machine_not_found:${machineId}`]
+      }),
       warnings
     };
   }
   const selectedHint = selectRouteHint(machine.route_hints);
   const route = selectedHint?.kind ?? machine.ssh.route ?? "unknown";
   const local = route === "local" || machine.machine_id === topology.local_machine_id;
+  const confidence = routeConfidence({ machine, hint: selectedHint, matchedBy });
+  const ok = Boolean(selectedHint?.target);
   return {
     schema_version: MACHINES_CONSUMER_CONTRACT_VERSION,
     package: topology.package,
-    ok: Boolean(selectedHint?.target),
+    ok,
     machine_id: machine.machine_id,
     requested_machine_id: machineId,
     generated_at: generatedAt,
@@ -4692,7 +4766,7 @@ function resolveMachineRoute(machineId, options = {}) {
     source: route,
     target: selectedHint?.target ?? null,
     command_target: selectedHint?.target ?? null,
-    confidence: routeConfidence({ machine, hint: selectedHint, matchedBy }),
+    confidence,
     local,
     evidence: {
       topology: true,
@@ -4702,6 +4776,15 @@ function resolveMachineRoute(machineId, options = {}) {
       tailscale_online: machine.tailscale.online,
       selected_hint: selectedHint
     },
+    cacheability: cacheability({
+      ok,
+      observedAt: now,
+      now,
+      ttlMs: options.resolverTtlMs,
+      authority: routeAuthority({ machine, selectedHint, matchedBy }),
+      confidence,
+      reasons: selectedHint ? [] : ["route_target_unresolved"]
+    }),
     warnings
   };
 }
@@ -4998,10 +5081,11 @@ function metadataKeysForDiagnostics(metadata) {
   return Object.keys(metadata).filter((key) => !/(secret|token|key|password|credential)/i.test(key)).sort();
 }
 function resolveMachineWorkspace(options) {
+  const now = options.now ?? new Date;
   const topology = options.topology ?? discoverMachineTopology(options);
   const warnings = [...topology.warnings];
   const { machine, matchedBy } = findRouteMachine(topology, options.machineId);
-  const generatedAt = (options.now ?? new Date).toISOString();
+  const generatedAt = now.toISOString();
   const repoName = options.repoName ?? options.projectId;
   const openFilesRepoName = options.openFilesRepoName ?? "open-files";
   if (!machine) {
@@ -5028,6 +5112,15 @@ function resolveMachineWorkspace(options) {
         manifest_declared: null,
         metadata_keys: []
       },
+      cacheability: cacheability({
+        ok: false,
+        observedAt: now,
+        now,
+        ttlMs: options.resolverTtlMs,
+        authority: "unresolved",
+        confidence: "none",
+        reasons: [`machine_not_found:${options.machineId}`]
+      }),
       warnings
     };
     const diagnostics2 = workspaceDiagnostics({
@@ -5059,10 +5152,16 @@ function resolveMachineWorkspace(options) {
     warnings.push(`open_files_root_inferred:${options.projectId}`);
   if (!projectRootPath)
     warnings.push(`project_root_unresolved:${options.projectId}`);
+  const workspacePaths = {
+    workspace_root: { path: workspaceRootPath, source: workspaceRootSource },
+    project_root: { path: projectRootPath, source: projectRootSource },
+    open_files_root: { path: openFilesRootPath, source: openFilesRootSource }
+  };
+  const workspaceOk = Boolean(projectRootPath);
   const resolution = {
     schema_version: MACHINES_CONSUMER_CONTRACT_VERSION,
     package: topology.package,
-    ok: Boolean(projectRootPath),
+    ok: workspaceOk,
     requested_machine_id: options.machineId,
     machine_id: machine.machine_id,
     generated_at: generatedAt,
@@ -5077,11 +5176,7 @@ function resolveMachineWorkspace(options) {
       trust_status: trustStatus(machine),
       auth_status: authStatus(machine)
     },
-    paths: {
-      workspace_root: { path: workspaceRootPath, source: workspaceRootSource },
-      project_root: { path: projectRootPath, source: projectRootSource },
-      open_files_root: { path: openFilesRootPath, source: openFilesRootSource }
-    },
+    paths: workspacePaths,
     diagnostics: [],
     repair_hints: [],
     evidence: {
@@ -5090,6 +5185,15 @@ function resolveMachineWorkspace(options) {
       manifest_declared: machine.manifest_declared,
       metadata_keys: metadataKeysForDiagnostics(metadata)
     },
+    cacheability: cacheability({
+      ok: workspaceOk,
+      observedAt: now,
+      now,
+      ttlMs: options.resolverTtlMs,
+      authority: workspaceAuthority(workspacePaths),
+      confidence: workspaceOk ? "medium" : "none",
+      reasons: projectRootPath ? [] : [`project_root_unresolved:${options.projectId}`]
+    }),
     warnings
   };
   const diagnostics = workspaceDiagnostics({