evolcore 0.0.43-test.6 → 0.0.43-test.8

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 (249) hide show
  1. package/CHANGELOG.md +95 -0
  2. package/bin/ecmsg.js +188 -58
  3. package/dist/agent-template/jobs.js +62 -0
  4. package/dist/agent-template/runtime.js +214 -0
  5. package/dist/agent-template/service.js +465 -0
  6. package/dist/agent-template/tool-runner.js +45 -0
  7. package/dist/agent-template/types.js +5 -0
  8. package/dist/agents/baseagent-availability.js +1 -1
  9. package/dist/agents/claude-runner.js +1 -1
  10. package/dist/agents/codex/app-server-client.js +22 -0
  11. package/dist/agents/codex-runner.js +69 -2
  12. package/dist/aun/aid/agentmd.js +56 -1
  13. package/dist/aun/aid/client.js +3 -1
  14. package/dist/aun/menu/client.js +3 -2
  15. package/dist/aun/msg/p2p.js +6 -1
  16. package/dist/channels/aun.js +277 -49
  17. package/dist/cli/agent-command.js +5 -0
  18. package/dist/cli/agent-create.js +7 -3
  19. package/dist/cli/agent-template.js +124 -0
  20. package/dist/cli/aun-commands.js +2 -2
  21. package/dist/cli/ctl-command.js +2 -1
  22. package/dist/cli/daemon-commands.js +11 -66
  23. package/dist/cli/daemon-lifecycle-client.js +61 -0
  24. package/dist/cli/ecmsg-gateway.js +35 -2
  25. package/dist/cli/events-command.js +109 -0
  26. package/dist/cli/index.js +60 -14
  27. package/dist/cli/invoke-command.js +182 -0
  28. package/dist/cli/managed-command-guard.js +6 -1
  29. package/dist/cli/net-check.js +1 -1
  30. package/dist/cli/restart-monitor.js +160 -83
  31. package/dist/cli/services-command.js +137 -0
  32. package/dist/cli/team-workspace-command.js +134 -0
  33. package/dist/cli/thread-command.js +103 -13
  34. package/dist/cli/watch-msg.js +1 -1
  35. package/dist/config/boot-log.js +8 -8
  36. package/dist/config/config-field-policy.js +2 -2
  37. package/dist/config/config-manager.js +0 -7
  38. package/dist/config/invoke-ipc-service.js +118 -0
  39. package/dist/config/schema-migration.js +45 -15
  40. package/dist/config-store.js +2 -1
  41. package/dist/core/agent-ipc-registration.js +25 -4
  42. package/dist/core/agent-reload-coordinator.js +6 -4
  43. package/dist/core/agent-runtime.js +106 -10
  44. package/dist/core/auth/delegation-authorization.js +66 -0
  45. package/dist/core/auth/operation-authorizer.js +2 -0
  46. package/dist/core/auth/operation-catalog.js +29 -0
  47. package/dist/core/baseagent-loader.js +60 -130
  48. package/dist/core/channel-loader.js +10 -1
  49. package/dist/core/channel-runtime.js +20 -12
  50. package/dist/core/command/agent-control.js +12 -2
  51. package/dist/core/command/agent-storage-menu.js +1 -1
  52. package/dist/core/command/agent-template-menu.js +147 -0
  53. package/dist/core/command/chatmode-config.js +2 -36
  54. package/dist/core/command/command-handler.js +80 -17
  55. package/dist/core/command/data-root-resolver.js +32 -23
  56. package/dist/core/command/eventcenter-menu.js +468 -0
  57. package/dist/core/command/menu-catalog.js +15 -0
  58. package/dist/core/command/menu-handler.js +216 -90
  59. package/dist/core/command/menu-protocol.js +71 -13
  60. package/dist/core/command/menu-query-batch.js +194 -0
  61. package/dist/core/command/slash-gate.js +1 -1
  62. package/dist/core/command/slash-handler.js +34 -42
  63. package/dist/core/command/team-workspace-bootstrap.js +350 -0
  64. package/dist/core/command/{pa-workspace-calendar.js → team-workspace-calendar.js} +7 -7
  65. package/dist/core/command/team-workspace-initializer.js +2 -0
  66. package/dist/core/command/{pa-workspace-items.js → team-workspace-items.js} +83 -68
  67. package/dist/core/command/team-workspace-job-store.js +88 -0
  68. package/dist/core/command/team-workspace-management-service.js +2 -0
  69. package/dist/core/command/team-workspace-management-store.js +96 -0
  70. package/dist/core/command/team-workspace-management.js +265 -0
  71. package/dist/core/command/team-workspace-members-menu.js +88 -0
  72. package/dist/core/command/team-workspace-store.js +612 -0
  73. package/dist/core/command/team-workspace-team.js +193 -0
  74. package/dist/core/daemon-control.js +22 -5
  75. package/dist/core/daemon-lifecycle.js +323 -191
  76. package/dist/core/handoff/runtime.js +45 -13
  77. package/dist/core/invoke/executors/index.js +13 -0
  78. package/dist/core/invoke/executors/media.js +283 -0
  79. package/dist/core/invoke/executors/text.js +198 -0
  80. package/dist/core/invoke/invoke-service.js +157 -0
  81. package/dist/core/invoke/style-router.js +48 -0
  82. package/dist/core/invoke/types.js +19 -0
  83. package/dist/core/ipc-registration.js +50 -7
  84. package/dist/core/legacy-rename.js +41 -0
  85. package/dist/core/memory/consolidation.js +7 -5
  86. package/dist/core/message/aun-ipc-sender.js +252 -17
  87. package/dist/core/message/im-renderer.js +116 -85
  88. package/dist/core/message/message-bridge.js +4 -0
  89. package/dist/core/message/message-queue.js +66 -15
  90. package/dist/core/message/message-utils.js +10 -2
  91. package/dist/core/message/peer-mode.js +7 -34
  92. package/dist/core/message/pending-hints.js +29 -5
  93. package/dist/core/message/response-engine.js +194 -61
  94. package/dist/core/message/send-options.js +7 -4
  95. package/dist/core/message/send-routing.js +50 -5
  96. package/dist/core/ownership/owner-resolver.js +7 -0
  97. package/dist/core/pack-auth.js +94 -0
  98. package/dist/core/pack-install.js +194 -0
  99. package/dist/core/permission/ec-command-parser.js +51 -17
  100. package/dist/core/permission/protected-paths.js +12 -2
  101. package/dist/core/permission/shell-environment.js +9 -0
  102. package/dist/core/rate-window.js +48 -0
  103. package/dist/core/relation/peer-identity.js +28 -0
  104. package/dist/core/session/session-file-health.js +243 -0
  105. package/dist/core/session/session-fs-store.js +67 -28
  106. package/dist/core/session/session-idle-monitor.js +59 -19
  107. package/dist/core/session/session-manager.js +13 -4
  108. package/dist/core/task/task-recovery-service.js +13 -2
  109. package/dist/core/thread/command-parser.js +9 -2
  110. package/dist/core/thread/thread-operation.js +21 -2
  111. package/dist/core/thread/thread-route.js +13 -2
  112. package/dist/core/thread/thread-service.js +52 -3
  113. package/dist/directory/owner-directory-admission.js +40 -53
  114. package/dist/directory/owner-directory-cache.js +89 -113
  115. package/dist/directory/owner-directory-query-operation.js +8 -10
  116. package/dist/eck/kit-renderer.js +7 -5
  117. package/dist/eck/message-renderer.js +2 -0
  118. package/dist/ecweb/basic-settings-service.js +1 -1
  119. package/dist/ecweb/message-context-service.js +0 -4
  120. package/dist/ecweb/runtime/lifecycle.js +6 -2
  121. package/dist/ecweb/runtime/supervisor.js +19 -4
  122. package/dist/event-center/admission-materializer.js +124 -0
  123. package/dist/event-center/bus-gate.js +154 -0
  124. package/dist/event-center/bus-host.js +307 -0
  125. package/dist/event-center/bus-resolver.js +120 -0
  126. package/dist/event-center/center-config.js +127 -0
  127. package/dist/event-center/daemon.js +44 -0
  128. package/dist/event-center/directory-source.js +55 -0
  129. package/dist/event-center/dispatcher.js +157 -0
  130. package/dist/event-center/event-log.js +110 -0
  131. package/dist/event-center/index-generator.js +73 -0
  132. package/dist/event-center/ipc-operation.js +423 -0
  133. package/dist/event-center/ledger.js +52 -0
  134. package/dist/event-center/pack-loader.js +207 -0
  135. package/dist/event-center/pack-manager.js +85 -0
  136. package/dist/event-center/registry.js +463 -0
  137. package/dist/event-center/runtime.js +837 -0
  138. package/dist/event-center/script-runner.js +356 -0
  139. package/dist/event-center/types.js +51 -0
  140. package/dist/event-center/validation.js +435 -0
  141. package/dist/index.js +424 -135
  142. package/dist/ipc.js +106 -12
  143. package/dist/paths.js +20 -0
  144. package/dist/product.js +14 -0
  145. package/dist/proxy/manager.js +5 -1
  146. package/dist/proxy/service-supervisor.js +13 -4
  147. package/dist/response-system/engines/v1/index.js +0 -1
  148. package/dist/response-system/engines/v1/proactive-flow.js +4 -2
  149. package/dist/response-system/modes/single-session/index.js +1 -1
  150. package/dist/services/dispatcher.js +100 -0
  151. package/dist/services/idempotency.js +90 -0
  152. package/dist/services/identity.js +52 -0
  153. package/dist/services/index-generator.js +70 -0
  154. package/dist/services/index.js +449 -0
  155. package/dist/services/ipc-operation.js +550 -0
  156. package/dist/services/ledger.js +52 -0
  157. package/dist/services/message-log.js +112 -0
  158. package/dist/services/pack-manager.js +215 -0
  159. package/dist/services/reply.js +55 -0
  160. package/dist/services/router.js +98 -0
  161. package/dist/services/script-runner.js +422 -0
  162. package/dist/services/service-payload.js +70 -0
  163. package/dist/services/types.js +18 -0
  164. package/dist/services/validation.js +297 -0
  165. package/dist/trigger/application-service.js +18 -0
  166. package/dist/trigger/event-source.js +1 -1
  167. package/dist/trigger/ipc-service.js +3 -1
  168. package/dist/trigger/scheduler.js +38 -0
  169. package/dist/trigger/script-sandbox.js +170 -24
  170. package/dist/utils/cross-platform.js +24 -10
  171. package/dist/utils/evolcore-version.js +69 -27
  172. package/dist/utils/instance-registry.js +19 -13
  173. package/dist/utils/npm-ops.js +2 -1
  174. package/dist/utils/package-version-info.js +6 -3
  175. package/dist/utils/process-introspect.js +45 -9
  176. package/dist/utils/startup-trace.js +74 -37
  177. package/dist/utils/windows-shell-trust.js +80 -6
  178. package/kits/docs/INDEX.md +2 -2
  179. package/kits/docs/aun/ABILITY_CALLING.md +9 -15
  180. package/kits/docs/context-assembly.md +1 -1
  181. package/kits/docs/evolcore/INDEX.md +3 -1
  182. package/kits/docs/evolcore/ability.md +4 -0
  183. package/kits/docs/evolcore/agent.md +22 -1
  184. package/kits/docs/evolcore/aid.md +1 -1
  185. package/kits/docs/evolcore/event-center.md +227 -0
  186. package/kits/docs/evolcore/file-navigation.md +10 -264
  187. package/kits/docs/evolcore/fs.md +5 -3
  188. package/kits/docs/evolcore/group.md +1 -1
  189. package/kits/docs/evolcore/memory-architecture.md +2 -0
  190. package/kits/docs/evolcore/menu-protocol.md +28 -1
  191. package/kits/docs/evolcore/msg.md +21 -9
  192. package/kits/docs/evolcore/provider.md +3 -1
  193. package/kits/docs/evolcore/response.md +5 -5
  194. package/kits/docs/evolcore/services.md +294 -0
  195. package/kits/docs/evolcore/task.md +2 -0
  196. package/kits/docs/evolcore/team-workspace.md +41 -0
  197. package/kits/docs/evolcore/thread-chain.md +15 -3
  198. package/kits/eck_manifest.json +26 -0
  199. package/kits/rules/02-navigation.md +10 -1
  200. package/kits/rules/06-channel.md +1 -0
  201. package/kits/schemas/_meta.json +17 -6
  202. package/kits/schemas/agent-config.schema.19.json +5 -7
  203. package/kits/schemas/agent-config.schema.20.json +936 -0
  204. package/kits/schemas/relation-config.schema.12.json +2 -3
  205. package/kits/schemas/role-config.schema.2.json +4 -4
  206. package/kits/skills/.switches.json +1 -5
  207. package/kits/skills/ability/SKILL.md +56 -0
  208. package/kits/skills/ability/references/calling.md +56 -0
  209. package/kits/skills/{ec-ability → ability}/references/contract-checklist.md +1 -1
  210. package/kits/skills/{ec-ability → ability}/references/development.md +9 -33
  211. package/kits/skills/{ec-ability → ability}/references/management.md +2 -2
  212. package/kits/skills/{ec-ability → ability}/references/recovery.md +1 -1
  213. package/kits/skills/{ec-ability → ability}/references/runtime-protocol.md +2 -0
  214. package/kits/skills/ec-agent-create/SKILL.md +0 -1
  215. package/kits/skills/ec-group/SKILL.md +5 -8
  216. package/kits/skills/ec-group-collaboration/SKILL.md +7 -7
  217. package/kits/skills/ec-service-proxy/SKILL.md +34 -5
  218. package/kits/skills/ec-trigger/SKILL.md +4 -4
  219. package/kits/skills/personal-assistant/SKILL.md +6 -6
  220. package/kits/skills/personal-assistant/references/02-bootstrap.md +4 -4
  221. package/kits/skills/personal-assistant/scripts/clean.mjs +4 -4
  222. package/kits/skills/personal-assistant/scripts/init.mjs +2 -2
  223. package/kits/skills/personal-assistant/scripts/pa.mjs +4 -4
  224. package/kits/skills/thread-ops/SKILL.md +10 -10
  225. package/kits/templates/message-fragments/item.md +1 -1
  226. package/kits/templates/system-fragments/channel.md +3 -3
  227. package/kits/templates/system-fragments/commands.md +5 -3
  228. package/kits/templates/system-fragments/reply.md +1 -5
  229. package/kits/templates/system-fragments/thread.md +13 -10
  230. package/package.json +5 -6
  231. package/scripts/agent-template/index.mjs +40 -0
  232. package/scripts/agent-template/inspect.mjs +240 -0
  233. package/scripts/agent-template/overlay.mjs +71 -0
  234. package/scripts/agent-template/pack.mjs +169 -0
  235. package/scripts/agent-template/shared/common.mjs +235 -0
  236. package/scripts/agent-template/shared/evolcore.mjs +75 -0
  237. package/scripts/agent-template/shared/plan.mjs +129 -0
  238. package/scripts/agent-template/shared/team-schema.json +70 -0
  239. package/scripts/agent-template/shared/template-contract.mjs +154 -0
  240. package/scripts/agent-template/shared/template-package.mjs +265 -0
  241. package/scripts/agent-template/shared/template-runtime.mjs +80 -0
  242. package/scripts/agent-template/shared/template.mjs +142 -0
  243. package/dist/cli/pa-workspace-command.js +0 -225
  244. package/dist/core/command/pa-workspace-store.js +0 -468
  245. package/dist/core/relation/pa-team.js +0 -132
  246. package/kits/docs/evolcore/pa-workspace.md +0 -51
  247. package/kits/skills/aid-ability/SKILL.md +0 -244
  248. package/kits/skills/ec-ability/SKILL.md +0 -67
  249. package/kits/skills/ec-ability/references/workflows.md +0 -15
@@ -2,59 +2,33 @@ import { loadSchema } from '../../config/schema-registry.js';
2
2
  import { resolveEffective } from '../../config/config-manager.js';
3
3
  import { resolveRuntimeStringField } from '../role/runtime-policy.js';
4
4
  import { isManagementRole } from '../../config/builtin-roles.js';
5
- import { resolveAgentLifecycle } from '../../config/lifecycle.js';
6
- export const CHAT_MODES = ['interactive', 'proactive', 'paactive'];
5
+ export const CHAT_MODES = ['interactive', 'proactive'];
7
6
  export function isChatMode(value) {
8
7
  return CHAT_MODES.includes(value);
9
8
  }
10
- /** PA output is supported only in active AUN human Owner conversations. */
11
- export function supportsPaactive(params) {
12
- const channelType = params.channelType ?? params.peerKey?.split('#')[0];
13
- return channelType === 'aun'
14
- && params.chatType === 'private'
15
- && normalizePeerType(params.peerType) === 'human'
16
- && params.role === 'owner'
17
- && (params.lifecycle === undefined || params.lifecycle === 'active')
18
- && (params.sessionType === undefined || params.sessionType === 'main');
19
- }
20
- /** Keep unsupported inherited PA settings from becoming output-as-reply mode. */
9
+ /** Apply scene constraints to the configured chat mode. */
21
10
  export function chatModeForScene(value, params) {
22
11
  if (params.chatType === 'group' || normalizePeerType(params.peerType) === 'group')
23
12
  return 'proactive';
24
- if (value === 'paactive' && supportsPaactive(params))
25
- return value;
26
13
  if (value === 'interactive' || value === 'proactive')
27
14
  return value;
28
- if (value === 'paactive') {
29
- const kind = normalizePeerType(params.peerType);
30
- if (kind === 'system' || kind === 'service')
31
- return 'interactive';
32
- if (kind === 'agent'
33
- || isPrivateChatmodeRoleLocked(chatmodeFieldForPeer(params.chatType, params.peerType), params.role))
34
- return 'proactive';
35
- }
36
- const fallback = chatmodeFactoryDefaults()[chatmodeFieldForPeer(params.chatType, params.peerType)];
37
- return fallback === 'paactive' ? 'interactive' : fallback;
15
+ return chatmodeFactoryDefaults()[chatmodeFieldForPeer(params.chatType, params.peerType)];
38
16
  }
39
17
  /** Resolve the effective chat mode from the ConfigManager layering context. */
40
18
  export function resolveChatMode(params) {
41
19
  let configured;
42
- let lifecycle = params.lifecycle;
43
20
  try {
44
21
  const effective = resolveEffective({
45
22
  self: params.self,
46
23
  peerKey: params.peerKey,
47
24
  }, { cache: true });
48
25
  configured = effective.chatmode;
49
- if (lifecycle === undefined)
50
- lifecycle = resolveAgentLifecycle(effective);
51
26
  }
52
27
  catch {
53
28
  configured = undefined;
54
29
  }
55
30
  const kind = normalizePeerType(params.peerType);
56
- // Group conversations always use proactive delivery; interactive and
57
- // paactive are private-chat presentation modes.
31
+ // Group conversations always use proactive delivery.
58
32
  if (params.chatType === 'group' || kind === 'group')
59
33
  return 'proactive';
60
34
  // 运行时硬约束(非配置项):system/service 始终 interactive;agent 始终 proactive
@@ -63,8 +37,7 @@ export function resolveChatMode(params) {
63
37
  if (kind === 'agent')
64
38
  return 'proactive';
65
39
  const field = chatmodeFieldForPeer(params.chatType, params.peerType);
66
- // 人类私聊的基础角色门槛:owner/admin 才解析分层配置;
67
- // paactive 另由 supportsPaactive 限定为 owner,其余角色直接 proactive。
40
+ // 人类私聊的基础角色门槛:owner/admin 才解析分层配置,其余角色直接 proactive。
68
41
  if (isPrivateChatmodeRoleLocked(field, params.role))
69
42
  return 'proactive';
70
43
  const decision = resolveRuntimeStringField({
@@ -74,11 +47,11 @@ export function resolveChatMode(params) {
74
47
  configuredValue: configured?.[field],
75
48
  });
76
49
  const effectiveValue = decision.effectiveValue;
77
- return chatModeForScene(effectiveValue, { ...params, lifecycle });
50
+ return chatModeForScene(effectiveValue, params);
78
51
  }
79
52
  /**
80
53
  * 人类私聊(chatmode.private)是否被角色锁定为 proactive。
81
- * interactive 需要 owner/admin;paactive 在此基础上另由 supportsPaactive 限定为 owner。
54
+ * interactive 需要 owner/admin。
82
55
  */
83
56
  export function isPrivateChatmodeRoleLocked(field, role) {
84
57
  return field === 'private' && !isManagementRole(role);
@@ -7,6 +7,10 @@ import crypto from 'crypto';
7
7
  import { chatDirPath, appendJsonl, readAllJsonlLines, readAllJsonlLinesAsync, scanAgentChatDirsAsync } from '../session/session-fs-store.js';
8
8
  import { logger } from '../../utils/logger.js';
9
9
  const PENDING_HINTS_FILE = 'pending-hints.jsonl';
10
+ // A new hint may introduce a chat absent from startup's directory inventory.
11
+ // This process-local fence only controls inventory reuse; events are always read live.
12
+ let directoryVersion = 0;
13
+ export function pendingHintDirectoryVersion() { return directoryVersion; }
10
14
  export const OBSERVER_HINT_FAILURE_MESSAGES = {
11
15
  SESSION_NOT_FOUND: '目标 Agent session 不存在',
12
16
  INTERRUPT_FAILED: 'Agent 当前任务中断失败',
@@ -121,12 +125,30 @@ function deleteFile(fp) {
121
125
  function claimKey(claim) {
122
126
  return targetKey(claim.sessionsDir, claim.channelType, claim.channelId, claim.selfAID, claim.chatType, claim.threadId, claim.channelKey);
123
127
  }
124
- export async function pendingInterruptHints(sessionsDir, selfAID, channelKey) {
128
+ export async function pendingInterruptHints(sessionsDir, selfAID, channelKey, snapshot) {
125
129
  const pending = [];
126
- for (const chat of await scanAgentChatDirsAsync(sessionsDir, selfAID, channelKey)) {
127
- if (chat.selfAID !== selfAID || chat.channelType !== 'aun' || !chat.channelKey)
128
- continue;
129
- const events = await readAllJsonlLinesAsync(path.join(chat.dirPath, PENDING_HINTS_FILE));
130
+ const reusable = snapshot && snapshot.version === directoryVersion
131
+ && snapshot.selfAID === selfAID && path.resolve(snapshot.sessionsDir) === path.resolve(sessionsDir);
132
+ const chats = (reusable ? snapshot.chats : await scanAgentChatDirsAsync(sessionsDir, selfAID, channelKey))
133
+ .filter(chat => chat.selfAID === selfAID && chat.channelType === 'aun' && chat.channelKey
134
+ && (!channelKey || chat.channelKey === channelKey));
135
+ const results = new Array(chats.length);
136
+ let next = 0;
137
+ const reads = await Promise.allSettled(Array.from({ length: Math.min(8, chats.length) }, async () => {
138
+ while (next < chats.length) {
139
+ const index = next++;
140
+ results[index] = await readAllJsonlLinesAsync(path.join(chats[index].dirPath, PENDING_HINTS_FILE));
141
+ }
142
+ }));
143
+ for (const result of reads)
144
+ if (result.status === 'rejected')
145
+ throw result.reason;
146
+ // An add during asynchronous reads invalidates negative directory evidence.
147
+ // Retry from the live inventory; reconnects and failed scans always use it too.
148
+ if (reusable && snapshot.version !== directoryVersion)
149
+ return pendingInterruptHints(sessionsDir, selfAID, channelKey);
150
+ for (const [index, chat] of chats.entries()) {
151
+ const events = results[index];
130
152
  const keys = new Set(events.filter(event => event.action === 'add')
131
153
  .map(event => `${eventChatType(event)}\u0000${normThread(event.threadId)}`));
132
154
  for (const key of keys) {
@@ -179,6 +201,7 @@ export function appendHintAddDetailed(sessionsDir, channelType, channelId, selfA
179
201
  }
180
202
  if (idExistsElsewhere(fp, hint.id))
181
203
  return { ok: false, id: hint.id, code: 'CONFLICT' };
204
+ directoryVersion++;
182
205
  fs.mkdirSync(path.dirname(fp), { recursive: true });
183
206
  appendJsonl(fp, {
184
207
  action: 'add',
@@ -200,6 +223,7 @@ export function appendHintAddDetailed(sessionsDir, channelType, channelId, selfA
200
223
  export function appendHintAdd(sessionsDir, channelType, channelId, selfAID, hint) {
201
224
  try {
202
225
  const fp = hintsPath(sessionsDir, channelType, channelId, selfAID);
226
+ directoryVersion++;
203
227
  fs.mkdirSync(path.dirname(fp), { recursive: true });
204
228
  appendJsonl(fp, {
205
229
  action: 'add', id: hint.id, text: hint.text,