@harness-control/protocol 0.4.10 → 0.4.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (64) hide show
  1. package/LICENSE +202 -202
  2. package/README.md +26 -26
  3. package/dist/accounts.d.ts +0 -0
  4. package/dist/accounts.js +0 -0
  5. package/dist/bin/conformance.d.ts +0 -0
  6. package/dist/bin/conformance.js +0 -0
  7. package/dist/bin/generate-json-schema.d.ts +0 -0
  8. package/dist/bin/generate-json-schema.js +0 -0
  9. package/dist/conformance.d.ts +0 -0
  10. package/dist/conformance.js +0 -0
  11. package/dist/conversation.d.ts +0 -0
  12. package/dist/conversation.js +0 -0
  13. package/dist/index.d.ts +30 -30
  14. package/dist/index.js +0 -0
  15. package/dist/json-schema.d.ts +0 -0
  16. package/dist/json-schema.js +0 -0
  17. package/dist/mcp-review.d.ts +0 -0
  18. package/dist/mcp-review.js +0 -0
  19. package/dist/native-review.d.ts +0 -0
  20. package/dist/native-review.js +0 -0
  21. package/dist/pairing.d.ts +0 -0
  22. package/dist/pairing.js +0 -0
  23. package/dist/session-reducer.d.ts +0 -0
  24. package/dist/session-reducer.js +0 -0
  25. package/fixtures/conformance/invalid/accounts-negative-quota.json +35 -35
  26. package/fixtures/conformance/invalid/accounts-secret.json +36 -36
  27. package/fixtures/conformance/invalid/arbitrary-event-family.json +13 -13
  28. package/fixtures/conformance/invalid/local-action-lease-binding-mismatch.json +49 -49
  29. package/fixtures/conformance/invalid/local-action-missing-turn-id.json +20 -20
  30. package/fixtures/conformance/invalid/local-action-patch-missing-base-hash.json +51 -51
  31. package/fixtures/conformance/invalid/local-action-shell-missing-approval.json +56 -56
  32. package/fixtures/conformance/invalid/mcp-stdio-attachment.json +27 -27
  33. package/fixtures/conformance/invalid/session-snapshot-unsafe-omission.json +26 -26
  34. package/fixtures/conformance/invalid/terminal-turn-missing-final-output.json +16 -16
  35. package/fixtures/conformance/invalid/unknown-payload-field.json +14 -14
  36. package/fixtures/conformance/invalid/unknown-top-level-field.json +14 -14
  37. package/fixtures/conformance/valid/accounts-read.json +11 -11
  38. package/fixtures/conformance/valid/accounts-snapshot.json +35 -35
  39. package/fixtures/conformance/valid/accounts-unavailable.json +21 -21
  40. package/fixtures/conformance/valid/command-ack.json +11 -11
  41. package/fixtures/conformance/valid/extension-event.json +18 -18
  42. package/fixtures/conformance/valid/host-hello.json +22 -22
  43. package/fixtures/conformance/valid/host-replay-unavailable.json +15 -15
  44. package/fixtures/conformance/valid/local-action-dev-server-start.json +68 -68
  45. package/fixtures/conformance/valid/local-action-dev-server-stop.json +52 -52
  46. package/fixtures/conformance/valid/local-action-error.json +38 -38
  47. package/fixtures/conformance/valid/local-action-filesystem-list.json +52 -52
  48. package/fixtures/conformance/valid/local-action-filesystem-patch.json +53 -53
  49. package/fixtures/conformance/valid/local-action-filesystem-read.json +51 -51
  50. package/fixtures/conformance/valid/local-action-filesystem-write.json +53 -53
  51. package/fixtures/conformance/valid/local-action-git-diff.json +53 -53
  52. package/fixtures/conformance/valid/local-action-git-status.json +51 -51
  53. package/fixtures/conformance/valid/local-action-response.json +49 -49
  54. package/fixtures/conformance/valid/local-action-shell-exec.json +63 -63
  55. package/fixtures/conformance/valid/provider-event.json +18 -18
  56. package/fixtures/conformance/valid/session-snapshot-request.json +9 -9
  57. package/fixtures/conformance/valid/session-snapshot.json +28 -28
  58. package/fixtures/conformance/valid/session-start-with-leases.json +85 -85
  59. package/fixtures/conformance/valid/session-start-with-runner-stdio-profile.json +27 -27
  60. package/fixtures/conformance/valid/turn-completed.json +30 -30
  61. package/fixtures/mcp-review.json +20 -20
  62. package/package.json +68 -68
  63. package/schemas/hcp-message.schema.json +0 -0
  64. package/schemas/mcp-review.json +0 -0
@@ -1,51 +1,51 @@
1
- {
2
- "id": "message-local-action-patch-missing-base-hash",
3
- "type": "local.action.request",
4
- "version": "hcp.v0",
5
- "sent_at": "2026-01-01T00:00:00.000Z",
6
- "payload": {
7
- "request_id": "local-action-patch-bad",
8
- "action": "local.filesystem.patch",
9
- "issued_at": "2026-01-01T00:00:01.000Z",
10
- "attribution": {
11
- "session_id": "session-1",
12
- "turn_id": "turn-1",
13
- "workspace_id": "workspace-1",
14
- "provider_instance_id": "provider-1"
15
- },
16
- "lease": {
17
- "lease_id": "local-lease-patch",
18
- "capability_id": "filesystem",
19
- "scope": "workspace_write",
20
- "hcp_session_id": "session-1",
21
- "execution_host_id": "host-1",
22
- "provider_instance_id": "provider-1",
23
- "workspace_id": "workspace-1"
24
- },
25
- "sandbox": {
26
- "mode": "workspace_write",
27
- "workspace_root": "/tmp/workspace",
28
- "cwd": "/tmp/workspace",
29
- "requires_workspace_containment": true
30
- },
31
- "approval": {
32
- "status": "not_required"
33
- },
34
- "output_limits": {},
35
- "cancellation": {
36
- "cancellable": false
37
- },
38
- "audit": {
39
- "started_event_type": "local_capability.action.started",
40
- "completed_event_type": "local_capability.action.completed",
41
- "failed_event_type": "local_capability.action.failed"
42
- },
43
- "input": {
44
- "path": "README.md",
45
- "patch": {
46
- "format": "unified_diff",
47
- "content": "--- a/README.md\n+++ b/README.md\n@@\n-old\n+new\n"
48
- }
49
- }
50
- }
51
- }
1
+ {
2
+ "id": "message-local-action-patch-missing-base-hash",
3
+ "type": "local.action.request",
4
+ "version": "hcp.v0",
5
+ "sent_at": "2026-01-01T00:00:00.000Z",
6
+ "payload": {
7
+ "request_id": "local-action-patch-bad",
8
+ "action": "local.filesystem.patch",
9
+ "issued_at": "2026-01-01T00:00:01.000Z",
10
+ "attribution": {
11
+ "session_id": "session-1",
12
+ "turn_id": "turn-1",
13
+ "workspace_id": "workspace-1",
14
+ "provider_instance_id": "provider-1"
15
+ },
16
+ "lease": {
17
+ "lease_id": "local-lease-patch",
18
+ "capability_id": "filesystem",
19
+ "scope": "workspace_write",
20
+ "hcp_session_id": "session-1",
21
+ "execution_host_id": "host-1",
22
+ "provider_instance_id": "provider-1",
23
+ "workspace_id": "workspace-1"
24
+ },
25
+ "sandbox": {
26
+ "mode": "workspace_write",
27
+ "workspace_root": "/tmp/workspace",
28
+ "cwd": "/tmp/workspace",
29
+ "requires_workspace_containment": true
30
+ },
31
+ "approval": {
32
+ "status": "not_required"
33
+ },
34
+ "output_limits": {},
35
+ "cancellation": {
36
+ "cancellable": false
37
+ },
38
+ "audit": {
39
+ "started_event_type": "local_capability.action.started",
40
+ "completed_event_type": "local_capability.action.completed",
41
+ "failed_event_type": "local_capability.action.failed"
42
+ },
43
+ "input": {
44
+ "path": "README.md",
45
+ "patch": {
46
+ "format": "unified_diff",
47
+ "content": "--- a/README.md\n+++ b/README.md\n@@\n-old\n+new\n"
48
+ }
49
+ }
50
+ }
51
+ }
@@ -1,56 +1,56 @@
1
- {
2
- "id": "message-local-action-shell-missing-approval",
3
- "type": "local.action.request",
4
- "version": "hcp.v0",
5
- "sent_at": "2026-01-01T00:00:00.000Z",
6
- "payload": {
7
- "request_id": "local-action-shell-bad",
8
- "action": "local.shell.exec",
9
- "issued_at": "2026-01-01T00:00:01.000Z",
10
- "attribution": {
11
- "session_id": "session-1",
12
- "turn_id": "turn-1",
13
- "workspace_id": "workspace-1",
14
- "provider_instance_id": "provider-1"
15
- },
16
- "lease": {
17
- "lease_id": "local-lease-shell",
18
- "capability_id": "shell",
19
- "scope": "workspace",
20
- "hcp_session_id": "session-1",
21
- "execution_host_id": "host-1",
22
- "provider_instance_id": "provider-1",
23
- "workspace_id": "workspace-1"
24
- },
25
- "sandbox": {
26
- "mode": "workspace_write",
27
- "workspace_root": "/tmp/workspace",
28
- "cwd": "/tmp/workspace",
29
- "requires_workspace_containment": true
30
- },
31
- "approval": {
32
- "status": "not_required"
33
- },
34
- "output_limits": {
35
- "stdout_bytes": 65536,
36
- "stderr_bytes": 65536
37
- },
38
- "cancellation": {
39
- "cancellable": true,
40
- "timeout_ms": 60000
41
- },
42
- "audit": {
43
- "started_event_type": "local_capability.action.started",
44
- "completed_event_type": "local_capability.action.completed",
45
- "failed_event_type": "local_capability.action.failed"
46
- },
47
- "input": {
48
- "executable": "npm",
49
- "argv": [
50
- "test"
51
- ],
52
- "cwd": "/tmp/workspace",
53
- "use_shell": false
54
- }
55
- }
56
- }
1
+ {
2
+ "id": "message-local-action-shell-missing-approval",
3
+ "type": "local.action.request",
4
+ "version": "hcp.v0",
5
+ "sent_at": "2026-01-01T00:00:00.000Z",
6
+ "payload": {
7
+ "request_id": "local-action-shell-bad",
8
+ "action": "local.shell.exec",
9
+ "issued_at": "2026-01-01T00:00:01.000Z",
10
+ "attribution": {
11
+ "session_id": "session-1",
12
+ "turn_id": "turn-1",
13
+ "workspace_id": "workspace-1",
14
+ "provider_instance_id": "provider-1"
15
+ },
16
+ "lease": {
17
+ "lease_id": "local-lease-shell",
18
+ "capability_id": "shell",
19
+ "scope": "workspace",
20
+ "hcp_session_id": "session-1",
21
+ "execution_host_id": "host-1",
22
+ "provider_instance_id": "provider-1",
23
+ "workspace_id": "workspace-1"
24
+ },
25
+ "sandbox": {
26
+ "mode": "workspace_write",
27
+ "workspace_root": "/tmp/workspace",
28
+ "cwd": "/tmp/workspace",
29
+ "requires_workspace_containment": true
30
+ },
31
+ "approval": {
32
+ "status": "not_required"
33
+ },
34
+ "output_limits": {
35
+ "stdout_bytes": 65536,
36
+ "stderr_bytes": 65536
37
+ },
38
+ "cancellation": {
39
+ "cancellable": true,
40
+ "timeout_ms": 60000
41
+ },
42
+ "audit": {
43
+ "started_event_type": "local_capability.action.started",
44
+ "completed_event_type": "local_capability.action.completed",
45
+ "failed_event_type": "local_capability.action.failed"
46
+ },
47
+ "input": {
48
+ "executable": "npm",
49
+ "argv": [
50
+ "test"
51
+ ],
52
+ "cwd": "/tmp/workspace",
53
+ "use_shell": false
54
+ }
55
+ }
56
+ }
@@ -1,27 +1,27 @@
1
- {
2
- "id": "message-mcp-stdio-attachment",
3
- "type": "harness.session.start",
4
- "version": "hcp.v0",
5
- "sent_at": "2026-01-01T00:00:00.000Z",
6
- "payload": {
7
- "session_id": "session-1",
8
- "workspace_id": "workspace-1",
9
- "provider_instance_id": "provider-1",
10
- "driver_kind": "codex",
11
- "cwd": "/tmp/workspace",
12
- "sandbox_mode": "workspace_write",
13
- "approval_policy": "ask",
14
- "continue_session": false,
15
- "model_selection": {
16
- "model": "gpt-5.3-codex"
17
- },
18
- "mcp_servers": [
19
- {
20
- "name": "bad",
21
- "transport": "stdio",
22
- "command": "node",
23
- "args": ["server.js"]
24
- }
25
- ]
26
- }
27
- }
1
+ {
2
+ "id": "message-mcp-stdio-attachment",
3
+ "type": "harness.session.start",
4
+ "version": "hcp.v0",
5
+ "sent_at": "2026-01-01T00:00:00.000Z",
6
+ "payload": {
7
+ "session_id": "session-1",
8
+ "workspace_id": "workspace-1",
9
+ "provider_instance_id": "provider-1",
10
+ "driver_kind": "codex",
11
+ "cwd": "/tmp/workspace",
12
+ "sandbox_mode": "workspace_write",
13
+ "approval_policy": "ask",
14
+ "continue_session": false,
15
+ "model_selection": {
16
+ "model": "gpt-5.3-codex"
17
+ },
18
+ "mcp_servers": [
19
+ {
20
+ "name": "bad",
21
+ "transport": "stdio",
22
+ "command": "node",
23
+ "args": ["server.js"]
24
+ }
25
+ ]
26
+ }
27
+ }
@@ -1,26 +1,26 @@
1
- {
2
- "id": "message-session-snapshot-partial",
3
- "type": "harness.session.snapshot",
4
- "version": "hcp.v0",
5
- "sent_at": "2026-01-01T00:00:01.000Z",
6
- "payload": {
7
- "command_id": "message-session-snapshot-request",
8
- "session_id": "session-1",
9
- "generated_at": "2026-01-01T00:00:01.000Z",
10
- "completeness": "partial",
11
- "omission_semantics": "replace",
12
- "reason": "retention_gap",
13
- "from_sequence": 2,
14
- "through_sequence": 2,
15
- "events": [
16
- {
17
- "session_id": "session-1",
18
- "sequence": 2,
19
- "event_type": "session.state.changed",
20
- "created_at": "2026-01-01T00:00:00.500Z",
21
- "data": { "state": "running" }
22
- }
23
- ],
24
- "tombstones": []
25
- }
26
- }
1
+ {
2
+ "id": "message-session-snapshot-partial",
3
+ "type": "harness.session.snapshot",
4
+ "version": "hcp.v0",
5
+ "sent_at": "2026-01-01T00:00:01.000Z",
6
+ "payload": {
7
+ "command_id": "message-session-snapshot-request",
8
+ "session_id": "session-1",
9
+ "generated_at": "2026-01-01T00:00:01.000Z",
10
+ "completeness": "partial",
11
+ "omission_semantics": "replace",
12
+ "reason": "retention_gap",
13
+ "from_sequence": 2,
14
+ "through_sequence": 2,
15
+ "events": [
16
+ {
17
+ "session_id": "session-1",
18
+ "sequence": 2,
19
+ "event_type": "session.state.changed",
20
+ "created_at": "2026-01-01T00:00:00.500Z",
21
+ "data": { "state": "running" }
22
+ }
23
+ ],
24
+ "tombstones": []
25
+ }
26
+ }
@@ -1,16 +1,16 @@
1
- {
2
- "id": "message-terminal-turn-missing-final-output",
3
- "type": "harness.event",
4
- "version": "hcp.v0",
5
- "sent_at": "2026-01-01T00:00:00.000Z",
6
- "payload": {
7
- "session_id": "session-1",
8
- "turn_id": "turn-1",
9
- "sequence": 1,
10
- "event_type": "turn.completed",
11
- "created_at": "2026-01-01T00:00:01.000Z",
12
- "data": {
13
- "status": "accepted"
14
- }
15
- }
16
- }
1
+ {
2
+ "id": "message-terminal-turn-missing-final-output",
3
+ "type": "harness.event",
4
+ "version": "hcp.v0",
5
+ "sent_at": "2026-01-01T00:00:00.000Z",
6
+ "payload": {
7
+ "session_id": "session-1",
8
+ "turn_id": "turn-1",
9
+ "sequence": 1,
10
+ "event_type": "turn.completed",
11
+ "created_at": "2026-01-01T00:00:01.000Z",
12
+ "data": {
13
+ "status": "accepted"
14
+ }
15
+ }
16
+ }
@@ -1,14 +1,14 @@
1
- {
2
- "id": "message-unknown-payload-field",
3
- "type": "host.hello",
4
- "version": "hcp.v0",
5
- "sent_at": "2026-01-01T00:00:00.000Z",
6
- "payload": {
7
- "runner_id": "runner-local",
8
- "host_id": "host-local",
9
- "runner_version": "0.0.0",
10
- "supported_protocol_versions": ["hcp.v0"],
11
- "capabilities": [],
12
- "unexpected": true
13
- }
14
- }
1
+ {
2
+ "id": "message-unknown-payload-field",
3
+ "type": "host.hello",
4
+ "version": "hcp.v0",
5
+ "sent_at": "2026-01-01T00:00:00.000Z",
6
+ "payload": {
7
+ "runner_id": "runner-local",
8
+ "host_id": "host-local",
9
+ "runner_version": "0.0.0",
10
+ "supported_protocol_versions": ["hcp.v0"],
11
+ "capabilities": [],
12
+ "unexpected": true
13
+ }
14
+ }
@@ -1,14 +1,14 @@
1
- {
2
- "id": "message-unknown-top-level-field",
3
- "type": "host.hello",
4
- "version": "hcp.v0",
5
- "sent_at": "2026-01-01T00:00:00.000Z",
6
- "payload": {
7
- "runner_id": "runner-local",
8
- "host_id": "host-local",
9
- "runner_version": "0.0.0",
10
- "supported_protocol_versions": ["hcp.v0"],
11
- "capabilities": []
12
- },
13
- "unexpected": true
14
- }
1
+ {
2
+ "id": "message-unknown-top-level-field",
3
+ "type": "host.hello",
4
+ "version": "hcp.v0",
5
+ "sent_at": "2026-01-01T00:00:00.000Z",
6
+ "payload": {
7
+ "runner_id": "runner-local",
8
+ "host_id": "host-local",
9
+ "runner_version": "0.0.0",
10
+ "supported_protocol_versions": ["hcp.v0"],
11
+ "capabilities": []
12
+ },
13
+ "unexpected": true
14
+ }
@@ -1,11 +1,11 @@
1
- {
2
- "id": "account-fixture",
3
- "version": "hcp.v0",
4
- "sent_at": "2026-09-12T00:00:00Z",
5
- "type": "host.accounts.read",
6
- "payload": {
7
- "provider_instance_ids": [
8
- "codex"
9
- ]
10
- }
11
- }
1
+ {
2
+ "id": "account-fixture",
3
+ "version": "hcp.v0",
4
+ "sent_at": "2026-09-12T00:00:00Z",
5
+ "type": "host.accounts.read",
6
+ "payload": {
7
+ "provider_instance_ids": [
8
+ "codex"
9
+ ]
10
+ }
11
+ }
@@ -1,35 +1,35 @@
1
- {
2
- "id": "account-fixture",
3
- "version": "hcp.v0",
4
- "sent_at": "2026-09-12T00:00:00Z",
5
- "type": "host.accounts.snapshot",
6
- "payload": {
7
- "request_id": "read-1",
8
- "host_id": "host-1",
9
- "providers": [
10
- {
11
- "provider_instance_id": "codex",
12
- "observation": {
13
- "status": "available",
14
- "observed_at": "2026-09-12T00:00:00Z",
15
- "account": {
16
- "key": "account-1",
17
- "provider": "codex",
18
- "scope_source": "operator",
19
- "label": "Work"
20
- },
21
- "source": "codex_app_server",
22
- "limits": [
23
- {
24
- "id": "weekly",
25
- "label": "Weekly",
26
- "kind": "quota",
27
- "used_percent": 95,
28
- "resets_at": "2026-09-19T00:00:00Z"
29
- }
30
- ]
31
- }
32
- }
33
- ]
34
- }
35
- }
1
+ {
2
+ "id": "account-fixture",
3
+ "version": "hcp.v0",
4
+ "sent_at": "2026-09-12T00:00:00Z",
5
+ "type": "host.accounts.snapshot",
6
+ "payload": {
7
+ "request_id": "read-1",
8
+ "host_id": "host-1",
9
+ "providers": [
10
+ {
11
+ "provider_instance_id": "codex",
12
+ "observation": {
13
+ "status": "available",
14
+ "observed_at": "2026-09-12T00:00:00Z",
15
+ "account": {
16
+ "key": "account-1",
17
+ "provider": "codex",
18
+ "scope_source": "operator",
19
+ "label": "Work"
20
+ },
21
+ "source": "codex_app_server",
22
+ "limits": [
23
+ {
24
+ "id": "weekly",
25
+ "label": "Weekly",
26
+ "kind": "quota",
27
+ "used_percent": 95,
28
+ "resets_at": "2026-09-19T00:00:00Z"
29
+ }
30
+ ]
31
+ }
32
+ }
33
+ ]
34
+ }
35
+ }
@@ -1,21 +1,21 @@
1
- {
2
- "id": "account-fixture",
3
- "version": "hcp.v0",
4
- "sent_at": "2026-09-12T00:00:00Z",
5
- "type": "host.accounts.snapshot",
6
- "payload": {
7
- "request_id": "read-1",
8
- "host_id": "host-1",
9
- "providers": [
10
- {
11
- "provider_instance_id": "claude",
12
- "observation": {
13
- "status": "unavailable",
14
- "observed_at": "2026-09-12T00:00:00Z",
15
- "reason": "unsupported",
16
- "message": "Opt-in required."
17
- }
18
- }
19
- ]
20
- }
21
- }
1
+ {
2
+ "id": "account-fixture",
3
+ "version": "hcp.v0",
4
+ "sent_at": "2026-09-12T00:00:00Z",
5
+ "type": "host.accounts.snapshot",
6
+ "payload": {
7
+ "request_id": "read-1",
8
+ "host_id": "host-1",
9
+ "providers": [
10
+ {
11
+ "provider_instance_id": "claude",
12
+ "observation": {
13
+ "status": "unavailable",
14
+ "observed_at": "2026-09-12T00:00:00Z",
15
+ "reason": "unsupported",
16
+ "message": "Opt-in required."
17
+ }
18
+ }
19
+ ]
20
+ }
21
+ }
@@ -1,11 +1,11 @@
1
- {
2
- "id": "message-command-ack",
3
- "type": "hcp.command.ack",
4
- "version": "hcp.v0",
5
- "sent_at": "2026-01-01T00:00:00.000Z",
6
- "payload": {
7
- "command_id": "command-1",
8
- "accepted_at": "2026-01-01T00:00:01.000Z",
9
- "duplicate": false
10
- }
11
- }
1
+ {
2
+ "id": "message-command-ack",
3
+ "type": "hcp.command.ack",
4
+ "version": "hcp.v0",
5
+ "sent_at": "2026-01-01T00:00:00.000Z",
6
+ "payload": {
7
+ "command_id": "command-1",
8
+ "accepted_at": "2026-01-01T00:00:01.000Z",
9
+ "duplicate": false
10
+ }
11
+ }
@@ -1,18 +1,18 @@
1
- {
2
- "id": "message-extension-event",
3
- "type": "harness.event",
4
- "version": "hcp.v0",
5
- "sent_at": "2026-01-01T00:00:00.000Z",
6
- "payload": {
7
- "session_id": "session-1",
8
- "sequence": 3,
9
- "event_type": "extension.timeline.marker",
10
- "created_at": "2026-01-01T00:00:03.000Z",
11
- "data": {
12
- "summary": "Timeline marker",
13
- "fields": {
14
- "marker_id": "marker-1"
15
- }
16
- }
17
- }
18
- }
1
+ {
2
+ "id": "message-extension-event",
3
+ "type": "harness.event",
4
+ "version": "hcp.v0",
5
+ "sent_at": "2026-01-01T00:00:00.000Z",
6
+ "payload": {
7
+ "session_id": "session-1",
8
+ "sequence": 3,
9
+ "event_type": "extension.timeline.marker",
10
+ "created_at": "2026-01-01T00:00:03.000Z",
11
+ "data": {
12
+ "summary": "Timeline marker",
13
+ "fields": {
14
+ "marker_id": "marker-1"
15
+ }
16
+ }
17
+ }
18
+ }