agent-hitch 0.2.6 → 0.2.8

package/docs/schemas/remote-work-offer.schema.json

@@ -0,0 +1,58 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://agent-hitch.local/schemas/remote-work-offer.schema.json",
+  "title": "Hitch remote work offer V1",
+  "type": "object",
+  "additionalProperties": false,
+  "required": ["schema_version", "offer_id", "nonce", "generation", "worker_id", "lease", "work", "state", "issued_at", "expires_at"],
+  "properties": {
+    "schema_version": { "const": "1" },
+    "offer_id": { "type": "string", "pattern": "^offer_[a-f0-9]{32}$" },
+    "nonce": { "type": "string", "pattern": "^[a-f0-9]{64}$" },
+    "generation": { "type": "integer", "minimum": 1 },
+    "worker_id": { "type": "string", "pattern": "^worker_[a-z0-9][a-z0-9_-]{0,62}$" },
+    "lease": { "$ref": "execution-lease.schema.json" },
+    "work": { "$ref": "eval-execution-plan.schema.json#/properties/work_items/items" },
+    "inputs": {
+      "type": "array", "minItems": 1, "maxItems": 4,
+      "items": { "$ref": "#/$defs/inputRef" }
+    },
+    "state": { "enum": ["offered", "accepted", "rejected", "cancel-requested", "completed", "release-requested", "released", "expired"] },
+    "issued_at": { "type": "string", "format": "date-time" },
+    "expires_at": { "type": "string", "format": "date-time" },
+    "accepted_at": { "type": "string", "format": "date-time" },
+    "completed_at": { "type": "string", "format": "date-time" },
+    "released_at": { "type": "string", "format": "date-time" },
+    "rejection_code": { "type": "string", "minLength": 1 },
+    "accept_receipt_digest": { "$ref": "#/$defs/sha256" },
+    "terminal_receipt_digest": { "$ref": "#/$defs/sha256" },
+    "release_receipt_digest": { "$ref": "#/$defs/sha256" },
+    "terminal": {
+      "type": "object", "additionalProperties": false, "required": ["status", "artifacts", "sent_at"],
+      "properties": {
+        "status": { "enum": ["succeeded", "failed", "cancelled"] },
+        "artifacts": { "type": "array", "items": { "$ref": "#/$defs/artifactRef" } },
+        "sent_at": { "type": "string", "format": "date-time" }
+      }
+    }
+  },
+  "$defs": {
+    "sha256": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" },
+    "artifactRef": {
+      "type": "object", "additionalProperties": false, "required": ["kind", "digest", "size"],
+      "properties": {
+        "kind": { "enum": ["result-bundle", "diagnostic"] }, "digest": { "$ref": "#/$defs/sha256" },
+        "size": { "type": "integer", "minimum": 0, "maximum": 536870912 }
+      }
+    },
+    "inputRef": {
+      "type": "object", "additionalProperties": false, "required": ["kind", "format", "digest", "size"],
+      "properties": {
+        "kind": { "enum": ["work-spec", "harness-artifact", "controller-runtime", "task-input"] },
+        "format": { "enum": ["json", "hitch-tree-v1"] },
+        "digest": { "$ref": "#/$defs/sha256" },
+        "size": { "type": "integer", "minimum": 1, "maximum": 268435456 }
+      }
+    }
+  }
+}

package/docs/schemas/remote-work-receipt.schema.json

@@ -0,0 +1,50 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://agent-hitch.local/schemas/remote-work-receipt.schema.json",
+  "title": "Hitch remote work receipt V1",
+  "oneOf": [
+    {
+      "type": "object", "additionalProperties": false,
+      "required": ["schema_version", "offer_id", "nonce", "generation", "accepted", "sent_at"],
+      "properties": {
+        "schema_version": { "const": "1" }, "offer_id": { "$ref": "#/$defs/offerId" }, "nonce": { "$ref": "#/$defs/nonce" },
+        "generation": { "type": "integer", "minimum": 1 }, "accepted": { "type": "boolean" },
+        "rejection_code": { "type": "string", "minLength": 1 }, "sent_at": { "type": "string", "format": "date-time" }
+      }
+    },
+    {
+      "type": "object", "additionalProperties": false,
+      "required": ["schema_version", "offer_id", "nonce", "generation", "lease_id", "epoch", "status", "artifacts", "sent_at"],
+      "properties": {
+        "schema_version": { "const": "1" }, "offer_id": { "$ref": "#/$defs/offerId" }, "nonce": { "$ref": "#/$defs/nonce" },
+        "generation": { "type": "integer", "minimum": 1 }, "lease_id": { "$ref": "#/$defs/leaseId" }, "epoch": { "type": "integer", "minimum": 1 },
+        "status": { "enum": ["succeeded", "failed", "cancelled"] },
+        "artifacts": {
+          "type": "array", "items": {
+            "type": "object", "additionalProperties": false, "required": ["kind", "digest", "size"],
+            "properties": {
+              "kind": { "enum": ["result-bundle", "diagnostic"] }, "digest": { "$ref": "#/$defs/sha256" },
+              "size": { "type": "integer", "minimum": 0, "maximum": 536870912 }
+            }
+          }
+        },
+        "sent_at": { "type": "string", "format": "date-time" }
+      }
+    },
+    {
+      "type": "object", "additionalProperties": false,
+      "required": ["schema_version", "offer_id", "nonce", "generation", "lease_id", "epoch", "sent_at"],
+      "properties": {
+        "schema_version": { "const": "1" }, "offer_id": { "$ref": "#/$defs/offerId" }, "nonce": { "$ref": "#/$defs/nonce" },
+        "generation": { "type": "integer", "minimum": 1 }, "lease_id": { "$ref": "#/$defs/leaseId" },
+        "epoch": { "type": "integer", "minimum": 1 }, "sent_at": { "type": "string", "format": "date-time" }
+      }
+    }
+  ],
+  "$defs": {
+    "offerId": { "type": "string", "pattern": "^offer_[a-f0-9]{32}$" },
+    "leaseId": { "type": "string", "pattern": "^lease_[a-f0-9]{32}$" },
+    "nonce": { "type": "string", "pattern": "^[a-f0-9]{64}$" },
+    "sha256": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" }
+  }
+}

package/docs/schemas/remote-worker-artifact.schema.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://agent-hitch.local/schemas/remote-worker-artifact.schema.json",
+  "title": "Hitch remote worker staged artifact V1",
+  "type": "object",
+  "additionalProperties": false,
+  "required": ["schema_version", "worker_id", "lease_id", "epoch", "digest", "size", "completed_at"],
+  "properties": {
+    "schema_version": { "const": "1" },
+    "worker_id": { "type": "string", "pattern": "^worker_[a-z0-9][a-z0-9_-]{0,62}$" },
+    "lease_id": { "type": "string", "pattern": "^lease_[a-f0-9]{32}$" },
+    "epoch": { "type": "integer", "minimum": 1 },
+    "digest": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" },
+    "size": { "type": "integer", "minimum": 0, "maximum": 536870912 },
+    "completed_at": { "type": "string", "format": "date-time" }
+  }
+}

package/docs/schemas/remote-worker-event.schema.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://agent-hitch.local/schemas/remote-worker-event.schema.json",
+  "title": "Hitch remote worker event V1",
+  "type": "object",
+  "additionalProperties": false,
+  "required": ["schema_version", "generation", "lease_id", "epoch", "sequence", "type", "sent_at"],
+  "properties": {
+    "schema_version": { "const": "1" },
+    "generation": { "type": "integer", "minimum": 1 },
+    "lease_id": { "type": "string", "pattern": "^lease_[a-f0-9]{32}$" },
+    "epoch": { "type": "integer", "minimum": 1 },
+    "sequence": { "type": "integer", "minimum": 1 },
+    "type": { "type": "string", "minLength": 1, "maxLength": 256 },
+    "payload": { "type": "object" },
+    "sent_at": { "type": "string", "format": "date-time" }
+  }
+}

package/docs/schemas/remote-worker-heartbeat.schema.json

@@ -0,0 +1,37 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://agent-hitch.local/schemas/remote-worker-heartbeat.schema.json",
+  "title": "Hitch remote worker heartbeat V1",
+  "type": "object",
+  "additionalProperties": false,
+  "required": ["schema_version", "generation", "health", "allocated", "active_leases", "sent_at"],
+  "properties": {
+    "schema_version": { "const": "1" },
+    "generation": { "type": "integer", "minimum": 1 },
+    "health": { "enum": ["healthy", "degraded", "unavailable"] },
+    "allocated": { "$ref": "#/$defs/resources" },
+    "active_leases": {
+      "type": "array",
+      "items": {
+        "type": "object", "additionalProperties": false, "required": ["lease_id", "epoch"],
+        "properties": {
+          "lease_id": { "type": "string", "pattern": "^lease_[a-f0-9]{32}$" },
+          "epoch": { "type": "integer", "minimum": 1 }
+        }
+      }
+    },
+    "sent_at": { "type": "string", "format": "date-time" }
+  },
+  "$defs": {
+    "resources": {
+      "type": "object", "additionalProperties": false,
+      "required": ["cpu_millis", "memory_bytes", "container_slots", "build_slots"],
+      "properties": {
+        "cpu_millis": { "type": "integer", "minimum": 0 }, "memory_bytes": { "type": "integer", "minimum": 0 },
+        "container_slots": { "type": "integer", "minimum": 0 }, "build_slots": { "type": "integer", "minimum": 0 },
+        "gpu_count": { "type": "integer", "minimum": 0 },
+        "ephemeral_disk_bytes": { "type": "integer", "minimum": 0 }
+      }
+    }
+  }
+}

package/docs/schemas/remote-worker-registration.schema.json

@@ -0,0 +1,52 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://agent-hitch.local/schemas/remote-worker-registration.schema.json",
+  "title": "Hitch remote worker registration V1",
+  "type": "object",
+  "additionalProperties": false,
+  "required": ["schema_version", "worker_id", "provider", "collision_domain_id", "platforms", "backends", "features", "task_membership", "capacity"],
+  "properties": {
+    "schema_version": { "const": "1" },
+    "worker_id": { "$ref": "#/$defs/workerId" },
+    "provider": { "type": "string", "minLength": 1, "maxLength": 256 },
+    "collision_domain_id": { "type": "string", "minLength": 1, "maxLength": 256 },
+    "platforms": { "type": "array", "minItems": 1, "uniqueItems": true, "items": { "type": "string", "minLength": 1 } },
+    "backends": {
+      "type": "array", "minItems": 1,
+      "items": {
+        "type": "object", "additionalProperties": false, "required": ["id", "version"],
+        "properties": { "id": { "type": "string", "minLength": 1 }, "version": { "type": "string", "minLength": 1 } }
+      }
+    },
+    "features": {
+      "type": "object", "additionalProperties": false,
+      "required": ["docker", "buildkit", "model_proxy", "isolated_same_task_attempts"],
+      "properties": {
+        "docker": { "type": "boolean" }, "buildkit": { "type": "boolean" },
+        "model_proxy": { "type": "boolean" }, "isolated_same_task_attempts": { "type": "boolean" }
+      }
+    },
+    "task_membership": { "type": "array", "minItems": 1, "uniqueItems": true, "items": { "enum": ["known", "opaque"] } },
+    "capacity": {
+      "type": "object", "additionalProperties": false,
+      "required": ["total", "reserved_for_system", "allocatable"],
+      "properties": {
+        "total": { "$ref": "#/$defs/resources" }, "reserved_for_system": { "$ref": "#/$defs/resources" },
+        "allocatable": { "$ref": "#/$defs/resources" }
+      }
+    }
+  },
+  "$defs": {
+    "workerId": { "type": "string", "pattern": "^worker_[a-z0-9][a-z0-9_-]{0,62}$" },
+    "resources": {
+      "type": "object", "additionalProperties": false,
+      "required": ["cpu_millis", "memory_bytes", "container_slots", "build_slots"],
+      "properties": {
+        "cpu_millis": { "type": "integer", "minimum": 0 }, "memory_bytes": { "type": "integer", "minimum": 0 },
+        "container_slots": { "type": "integer", "minimum": 0 }, "build_slots": { "type": "integer", "minimum": 0 },
+        "gpu_count": { "type": "integer", "minimum": 0 },
+        "ephemeral_disk_bytes": { "type": "integer", "minimum": 0 }
+      }
+    }
+  }
+}

package/docs/schemas/result-bundle-index.schema.json

@@ -0,0 +1,133 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://agent-hitch.local/schemas/result-bundle-index.schema.json",
+  "title": "Hitch sealed result bundle index V1",
+  "type": "object",
+  "additionalProperties": false,
+  "required": ["schema_version", "run_id", "sealed", "context_identity", "files", "provenance", "bundle_digest", "created_at"],
+  "properties": {
+    "schema_version": { "const": "1" },
+    "run_id": { "type": "string", "pattern": "^run_[a-f0-9]{32}$" },
+    "sealed": { "const": true },
+    "context_identity": { "$ref": "#/$defs/sha256" },
+    "files": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "additionalProperties": false,
+        "required": ["role", "path", "size", "sha256"],
+        "properties": {
+          "role": {
+            "enum": [
+              "request", "resolution", "manifest", "result", "runtime-ref", "environment-manifest",
+              "execution-evidence", "control-events", "process-log", "workspace-evidence", "trajectory",
+              "provider-evidence", "verifier-evidence", "interaction-capture", "eval-publication", "diagnostic"
+            ]
+          },
+          "path": { "$ref": "#/$defs/relativePath" },
+          "size": { "type": "integer", "minimum": 0 },
+          "sha256": { "$ref": "#/$defs/sha256" }
+        }
+      }
+    },
+    "environment": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["images", "provider"],
+      "properties": {
+        "images": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": ["image_id", "image_digest", "reference"],
+            "properties": {
+              "image_id": { "$ref": "#/$defs/sha256" },
+              "image_digest": { "$ref": "#/$defs/sha256" },
+              "reference": { "type": "string", "minLength": 1 }
+            }
+          }
+        },
+        "provider": { "type": "string", "minLength": 1 },
+        "worker_id": { "type": "string", "minLength": 1 },
+        "lease_id": { "type": "string", "pattern": "^lease_[a-f0-9]{32}$" }
+      }
+    },
+    "resources": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["requested"],
+      "properties": {
+        "requested": { "$ref": "#/$defs/resources" },
+        "observed": {
+          "type": "object",
+          "additionalProperties": { "type": "integer", "minimum": 0 }
+        }
+      }
+    },
+    "interaction_ref": { "$ref": "#/$defs/relativePath" },
+    "capture": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["mode", "required", "completeness", "interaction_count", "redaction"],
+      "properties": {
+        "mode": { "enum": ["off", "native", "proxy", "hybrid"] },
+        "required": { "type": "boolean" },
+        "completeness": { "enum": ["complete", "partial", "none"] },
+        "interaction_count": { "type": "integer", "minimum": 0 },
+        "redaction": {
+          "type": "object",
+          "additionalProperties": false,
+          "required": ["policy", "status", "rules"],
+          "properties": {
+            "policy": { "type": "string", "minLength": 1, "maxLength": 256 },
+            "status": { "enum": ["applied", "not-needed", "failed"] },
+            "rules": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "additionalProperties": false,
+                "required": ["rule_id", "count"],
+                "properties": {
+                  "rule_id": { "type": "string", "minLength": 1 },
+                  "count": { "type": "integer", "minimum": 1 }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "provenance": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "harness_revision": { "anyOf": [{ "$ref": "#/$defs/sha256" }, { "type": "null" }] },
+        "artifact_id": { "$ref": "#/$defs/sha256" },
+        "controller_runtime_id": { "$ref": "#/$defs/sha256" },
+        "benchmark_id": { "type": "string" },
+        "benchmark_revision": { "type": "string" },
+        "verifier_identity": { "$ref": "#/$defs/sha256" }
+      }
+    },
+    "bundle_digest": { "$ref": "#/$defs/sha256" },
+    "created_at": { "type": "string", "format": "date-time" }
+  },
+  "$defs": {
+    "sha256": { "type": "string", "pattern": "^sha256:[0-9a-f]{64}$" },
+    "resources": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["cpu_millis", "memory_bytes", "container_slots", "build_slots"],
+      "properties": {
+        "cpu_millis": { "type": "integer", "minimum": 0 },
+        "memory_bytes": { "type": "integer", "minimum": 0 },
+        "container_slots": { "type": "integer", "minimum": 0 },
+        "build_slots": { "type": "integer", "minimum": 0 },
+        "gpu_count": { "type": "integer", "minimum": 0 },
+        "ephemeral_disk_bytes": { "type": "integer", "minimum": 0 }
+      }
+    },
+    "relativePath": { "type": "string", "pattern": "^(?!/)(?!.*(?:^|/)\\.\\.(?:/|$))(?!.*\\\\).+$" }
+  }
+}

package/docs/schemas/run-context.schema.json

@@ -34,6 +34,21 @@
         "task_digest": { "type": "string", "pattern": "^sha256:[0-9a-f]{64}$" },
         "verifier_identity": { "type": "string", "pattern": "^sha256:[0-9a-f]{64}$" }
       }
+    },
+    {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["kind", "benchmark_id", "benchmark_revision", "task_id", "task_digest", "verifier_identity", "run_group_id", "phase_index"],
+      "properties": {
+        "kind": { "const": "benchmark_phase" },
+        "benchmark_id": { "type": "string", "minLength": 1 },
+        "benchmark_revision": { "type": "string", "minLength": 1, "not": { "pattern": "^[Ll][Aa][Tt][Ee][Ss][Tt]$" } },
+        "task_id": { "type": "string", "minLength": 1 },
+        "task_digest": { "type": "string", "pattern": "^sha256:[0-9a-f]{64}$" },
+        "verifier_identity": { "type": "string", "pattern": "^sha256:[0-9a-f]{64}$" },
+        "run_group_id": { "type": "string", "pattern": "^run_group_[a-f0-9]{32}$" },
+        "phase_index": { "type": "integer", "minimum": 1, "maximum": 9007199254740991 }
+      }
     }
   ]
 }

package/docs/schemas/run-environment-images.schema.json

@@ -0,0 +1,39 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://agent-hitch.local/schemas/run-environment-images.schema.json",
+  "title": "Hitch sealed run environment image evidence V1",
+  "type": "object",
+  "additionalProperties": false,
+  "required": ["schema_version", "task_id", "uses", "manifests"],
+  "properties": {
+    "schema_version": { "const": "1" },
+    "task_id": { "type": "string", "minLength": 1 },
+    "uses": {
+      "type": "array",
+      "minItems": 1,
+      "items": {
+        "type": "object",
+        "additionalProperties": false,
+        "required": ["task_ids", "image_id", "requested_reference", "reference", "manifest_digest", "platform", "resolution", "cache_hit"],
+        "properties": {
+          "task_ids": { "type": "array", "minItems": 1, "uniqueItems": true, "items": { "type": "string", "minLength": 1 } },
+          "image_id": { "$ref": "#/$defs/sha256" },
+          "requested_reference": { "type": "string", "minLength": 1 },
+          "reference": { "type": "string", "minLength": 1 },
+          "manifest_digest": { "$ref": "#/$defs/sha256" },
+          "platform": { "type": "string", "minLength": 1 },
+          "resolution": { "enum": ["registry", "prebuilt", "backend-build"] },
+          "cache_hit": { "type": "boolean" }
+        }
+      }
+    },
+    "manifests": {
+      "type": "array",
+      "minItems": 1,
+      "items": { "$ref": "environment-image-manifest.schema.json" }
+    }
+  },
+  "$defs": {
+    "sha256": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" }
+  }
+}

package/docs/schemas/run-manifest.schema.json

@@ -5,6 +5,10 @@
   "type": "object",
   "additionalProperties": true,
   "required": ["schema_version", "run_id", "context", "status", "harness", "model", "protocol", "request_ref", "resolution_ref", "created_at"],
+  "allOf": [{
+    "if": { "properties": { "context": { "properties": { "kind": { "const": "benchmark_phase" } }, "required": ["kind"] } }, "required": ["context"] },
+    "then": { "required": ["parent"], "not": { "required": ["observation"] } }
+  }],
   "properties": {
     "schema_version": { "const": "1" },
     "run_id": { "type": "string", "pattern": "^run_[a-f0-9]{32}$" },

package/docs/schemas/run-request.schema.json

@@ -5,6 +5,10 @@
   "type": "object",
   "additionalProperties": false,
   "required": ["prompt"],
+  "allOf": [{
+    "if": { "properties": { "context": { "properties": { "kind": { "const": "benchmark_phase" } }, "required": ["kind"] } }, "required": ["context"] },
+    "then": { "required": ["parent"], "properties": { "defer_benchmark_observation": { "const": false } } }
+  }],
   "oneOf": [
     {
       "required": ["harness_ref"],

package/docs/schemas/training-data-candidate.schema.json

@@ -0,0 +1,46 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://agent-hitch.local/schemas/training-data-candidate.schema.json",
+  "title": "Hitch training-data candidate V1",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "schema_version", "candidate_id", "source_bundle_digest", "run_id", "eligibility", "reasons",
+    "context_ref", "trajectory_ref", "verifier_ref", "metadata", "provenance_digest"
+  ],
+  "properties": {
+    "schema_version": { "const": "1" },
+    "candidate_id": { "$ref": "#/$defs/sha256" },
+    "source_bundle_digest": { "$ref": "#/$defs/sha256" },
+    "run_id": { "type": "string", "pattern": "^run_[a-f0-9]{32}$" },
+    "eligibility": { "enum": ["eligible", "ineligible", "review-required"] },
+    "reasons": {
+      "type": "array",
+      "uniqueItems": true,
+      "items": { "type": "string", "pattern": "^[a-z0-9-]+$" }
+    },
+    "context_ref": { "type": "string", "minLength": 1, "maxLength": 4096 },
+    "trajectory_ref": { "type": "string", "minLength": 1, "maxLength": 4096 },
+    "verifier_ref": { "type": "string", "minLength": 1, "maxLength": 4096 },
+    "metadata": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "benchmark_id", "benchmark_revision", "harness_revision", "model_identity_resolved",
+        "capture_completeness", "redaction_policy"
+      ],
+      "properties": {
+        "benchmark_id": { "type": "string", "minLength": 1 },
+        "benchmark_revision": { "type": "string", "minLength": 1 },
+        "harness_revision": { "$ref": "#/$defs/sha256" },
+        "model_identity_resolved": { "type": "boolean" },
+        "capture_completeness": { "enum": ["complete", "partial", "none"] },
+        "redaction_policy": { "type": "string", "minLength": 1, "maxLength": 256 }
+      }
+    },
+    "provenance_digest": { "$ref": "#/$defs/sha256" }
+  },
+  "$defs": {
+    "sha256": { "type": "string", "pattern": "^sha256:[0-9a-f]{64}$" }
+  }
+}