evolcore 0.0.40 → 0.0.41-test.1
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.
- package/CHANGELOG.md +94 -1
- package/bin/codex-managed-hook.mjs +11 -0
- package/bin/ec-safe-output.js +11 -1
- package/dist/agents/baseagent-availability.js +1 -1
- package/dist/agents/baseagent.js +20 -43
- package/dist/agents/claude-runner.js +197 -197
- package/dist/agents/codex-runner.js +535 -259
- package/dist/agents/ecagent-runner.js +31 -12
- package/dist/agents/gemini-runner.js +27 -7
- package/dist/agents/runner-types.js +11 -3
- package/dist/aun/ability-device-routing.js +26 -0
- package/dist/aun/aid/client.js +1 -1
- package/dist/aun/group/fs-download.js +39 -0
- package/dist/aun/group/identity.js +36 -13
- package/dist/aun/group/operations.js +5 -0
- package/dist/aun/msg/managed-operation.js +72 -11
- package/dist/aun/msg/p2p.js +32 -7
- package/dist/aun/service-proxy.js +36 -12
- package/dist/aun/storage/download.js +30 -0
- package/dist/aun/storage/index.js +14 -6
- package/dist/channels/aun.js +367 -24
- package/dist/channels/daemon.js +39 -5
- package/dist/cli/agent-command.js +2 -0
- package/dist/cli/agent-create.js +98 -19
- package/dist/cli/agent.js +10 -3
- package/dist/cli/aun-commands.js +85 -41
- package/dist/cli/daemon-commands.js +678 -688
- package/dist/cli/fs-command.js +64 -2
- package/dist/cli/index.js +48 -4
- package/dist/cli/managed-command-guard.js +4 -0
- package/dist/cli/model.js +40 -40
- package/dist/cli/proxy-command.js +92 -0
- package/dist/cli/restart-monitor.js +17 -0
- package/dist/cli/role.js +85 -0
- package/dist/cli/session-command.js +128 -13
- package/dist/cli/stats.js +60 -4
- package/dist/cli/trigger-command.js +2 -2
- package/dist/config/access-policy.js +8 -1
- package/dist/config/boot-log.js +38 -1
- package/dist/config/config-field-policy.js +5 -32
- package/dist/config/config-manager.js +46 -39
- package/dist/config/config-operation-service.js +8 -11
- package/dist/config/contact-book-store.js +47 -21
- package/dist/config/contact-book.js +18 -12
- package/dist/config/contact-operation-service.js +3 -4
- package/dist/config/contact-request-service.js +11 -0
- package/dist/config/daemon-services.js +11 -0
- package/dist/config/gateway-config.js +89 -595
- package/dist/config/peer-role-resolver.js +15 -11
- package/dist/config/providers-config.js +12 -7
- package/dist/config/providers-import.js +3 -21
- package/dist/config/resolved-config-op.js +3 -0
- package/dist/config/role-command-service.js +166 -0
- package/dist/config/role-request-service.js +193 -0
- package/dist/config/schema-migration.js +686 -25
- package/dist/config-store.js +79 -3
- package/dist/contracts/ecweb-instance.js +41 -0
- package/dist/contracts/ecweb-service-protocol.js +3 -1
- package/dist/core/agent-application-service.js +11 -1
- package/dist/core/agent-ipc-registration.js +4 -0
- package/dist/core/agent-runtime.js +1 -1
- package/dist/core/auth/agent-delegation.js +82 -6
- package/dist/core/auth/auth-gateway.js +1 -1
- package/dist/core/auth/authorization-audit.js +37 -9
- package/dist/core/auth/delegation-authorization.js +3 -1
- package/dist/core/auth/operation-authorizer.js +15 -0
- package/dist/core/auth/operation-catalog.js +39 -6
- package/dist/core/command/agent-control.js +94 -19
- package/dist/core/command/agent-storage-menu.js +5 -3
- package/dist/core/command/cli-intent-parser.js +2 -1
- package/dist/core/command/command-handler.js +105 -145
- package/dist/core/command/connect-menu.js +31 -2
- package/dist/core/command/data-root-resolver.js +5 -4
- package/dist/core/command/memory-slash.js +16 -8
- package/dist/core/command/menu-catalog.js +6 -6
- package/dist/core/command/menu-handler.js +87 -163
- package/dist/core/command/menu-protocol.js +9 -2
- package/dist/core/command/role-menu.js +148 -30
- package/dist/core/command/slash-gate.js +13 -10
- package/dist/core/command/slash-handler.js +157 -352
- package/dist/core/daemon-control.js +8 -14
- package/dist/core/event-catalog.js +15 -0
- package/dist/core/evolagent-registry.js +4 -4
- package/dist/core/evolagent.js +2 -2
- package/dist/core/inference/text-inference.js +31 -40
- package/dist/core/ipc-registration.js +24 -3
- package/dist/core/memory/consolidation-context.js +51 -5
- package/dist/core/memory/consolidation-ops-records.js +1 -1
- package/dist/core/memory/consolidation-trigger.js +190 -190
- package/dist/core/memory/consolidation.js +316 -29
- package/dist/core/memory/forget-log.js +96 -0
- package/dist/core/memory/index-manager.js +27 -5
- package/dist/core/memory/memory-admin.js +45 -5
- package/dist/core/memory/memory-writer.js +163 -18
- package/dist/core/memory/relation-idle-monitor.js +119 -58
- package/dist/core/memory/relation-sweep.js +44 -39
- package/dist/core/message/aun-ipc-sender.js +34 -7
- package/dist/core/message/aun-request-registry.js +97 -3
- package/dist/core/message/im-renderer.js +11 -4
- package/dist/core/message/message-admission.js +97 -8
- package/dist/core/message/message-bridge.js +71 -24
- package/dist/core/message/message-log.js +55 -0
- package/dist/core/message/message-queue.js +5 -5
- package/dist/core/message/response-engine.js +387 -144
- package/dist/core/model/catalog-service.js +4 -2
- package/dist/core/model/config-scope.js +24 -64
- package/dist/core/model/field-scope.js +1 -1
- package/dist/core/model/model-catalog.js +37 -47
- package/dist/core/model/model-diagnostics.js +4 -3
- package/dist/core/model/model-fallback.js +10 -7
- package/dist/core/model/model-permission.js +3 -2
- package/dist/core/ownership/owner-resolver.js +25 -23
- package/dist/core/permission/ec-command-parser.js +138 -5
- package/dist/core/permission/sandbox-runtime.js +18 -1
- package/dist/core/permission/tool-policy.js +42 -10
- package/dist/core/relation/peer-identity.js +64 -1
- package/dist/core/role/runtime-policy.js +72 -13
- package/dist/core/session/session-capsule.js +197 -0
- package/dist/core/session/session-idle-monitor.js +1 -1
- package/dist/core/session/session-manager.js +168 -14
- package/dist/core/session/session-mapper.js +2 -0
- package/dist/core/session/session-renew.js +3 -3
- package/dist/core/skill/index-generator.js +15 -5
- package/dist/core/system-session/memory.js +6 -1
- package/dist/core/thread/thread-service.js +19 -6
- package/dist/directory/owner-directory-admission.js +95 -0
- package/dist/directory/owner-directory-authorization.js +309 -0
- package/dist/directory/owner-directory-cache.js +635 -0
- package/dist/eck/kit-renderer.js +2 -2
- package/dist/ecweb/basic-settings-service.js +33 -40
- package/dist/ecweb/message-context-service.js +110 -0
- package/dist/index.js +79 -17
- package/dist/ipc.js +189 -17
- package/dist/paths.js +4 -0
- package/dist/proxy/command.js +122 -0
- package/dist/proxy/ipc-service.js +68 -0
- package/dist/proxy/manager.js +485 -0
- package/dist/proxy/service-supervisor.js +603 -0
- package/dist/response-system/engines/v1/proactive-flow.js +16 -6
- package/dist/stats/budget.js +1 -1
- package/dist/stats/db.js +15 -0
- package/dist/stats/index.js +2 -2
- package/dist/stats/price-resolver.js +304 -5
- package/dist/stats/query.js +82 -3
- package/dist/stats/writer.js +38 -5
- package/dist/trigger/feedback.js +18 -7
- package/dist/trigger/manager.js +20 -3
- package/dist/trigger/parser.js +6 -3
- package/dist/trigger/patch.js +1 -1
- package/dist/trigger/system-definitions.js +43 -7
- package/dist/trigger/validation.js +13 -5
- package/dist/utils/cross-platform.js +14 -0
- package/dist/utils/ecweb-supervisor.js +258 -83
- package/dist/utils/error-utils.js +16 -2
- package/dist/utils/logger.js +24 -5
- package/dist/utils/npm-ops.js +2 -1
- package/dist/utils/package-version-info.js +5 -3
- package/dist/utils/upgrade-jobs.js +45 -5
- package/kits/docs/INDEX.md +1 -1
- package/kits/docs/aun/ABILITY_CALLING.md +20 -2
- package/kits/docs/channels/aun.md +9 -0
- package/kits/docs/evolcore/INDEX.md +2 -1
- package/kits/docs/evolcore/agent-create.md +3 -2
- package/kits/docs/evolcore/agent.md +1 -1
- package/kits/docs/evolcore/config.md +18 -7
- package/kits/docs/evolcore/contact.md +3 -0
- package/kits/docs/evolcore/event.md +1 -0
- package/kits/docs/evolcore/fs.md +16 -0
- package/kits/docs/evolcore/memory-architecture.md +2 -2
- package/kits/docs/evolcore/memory-consolidation.md +32 -8
- package/kits/docs/evolcore/memory.md +1 -1
- package/kits/docs/evolcore/menu-protocol.md +36 -0
- package/kits/docs/evolcore/model.md +23 -20
- package/kits/docs/evolcore/msg.md +21 -8
- package/kits/docs/evolcore/session.md +14 -0
- package/kits/migrations/migrate-contact-book-v2.mjs +30 -11
- package/kits/schemas/_meta.json +37 -4
- package/kits/schemas/agent-config.schema.13.json +23 -3
- package/kits/schemas/agent-config.schema.16.json +891 -0
- package/kits/schemas/daemon.schema.9.json +366 -0
- package/kits/schemas/defaults.schema.5.json +406 -127
- package/kits/schemas/relation-config.schema.11.json +260 -0
- package/kits/schemas/role-config.schema.1.json +7 -7
- package/kits/skills/.switches.json +3 -7
- package/kits/skills/aid-ability/SKILL.md +35 -6
- package/kits/skills/ec-service-proxy/SKILL.md +118 -0
- package/kits/skills/ec-trigger/SKILL.md +13 -5
- package/kits/skills/personal-assistant/SKILL.md +176 -0
- package/kits/skills/personal-assistant/references/01-workspace-spec.md +333 -0
- package/kits/skills/personal-assistant/references/02-bootstrap.md +205 -0
- package/kits/skills/personal-assistant/references/03-data-flow-and-gaps.md +177 -0
- package/kits/skills/personal-assistant/references/04-frontend-contract.md +439 -0
- package/kits/skills/personal-assistant/references/05-directory-reference.md +292 -0
- package/kits/skills/personal-assistant/references/06-render-config.md +350 -0
- package/kits/skills/personal-assistant/schema/workspace.schema.json +85 -0
- package/kits/skills/personal-assistant/schema/workspace.v1.json +66 -0
- package/kits/skills/personal-assistant/scripts/archive.mjs +154 -0
- package/kits/skills/personal-assistant/scripts/check.mjs +114 -0
- package/kits/skills/personal-assistant/scripts/index-rebuild.mjs +252 -0
- package/kits/skills/personal-assistant/scripts/ingest.mjs +344 -0
- package/kits/skills/personal-assistant/scripts/init.mjs +270 -0
- package/kits/skills/personal-assistant/scripts/lib/apply.mjs +92 -0
- package/kits/skills/personal-assistant/scripts/lib/schema.mjs +96 -0
- package/kits/skills/personal-assistant/scripts/lib/time.mjs +28 -0
- package/kits/skills/personal-assistant/scripts/migrate.mjs +172 -0
- package/kits/skills/personal-assistant/scripts/search.mjs +172 -0
- package/kits/skills/personal-assistant/scripts/verify.mjs +196 -0
- package/kits/skills/personal-assistant/templates/INDEX.md.tpl +24 -0
- package/kits/skills/personal-assistant/templates/README.md.tpl +108 -0
- package/kits/skills/personal-assistant/triggers/ingest-daily.json +23 -0
- package/kits/skills/personal-assistant/triggers/memory-consolidate.json +23 -0
- package/kits/skills/personal-assistant/triggers/report-daily.json +23 -0
- package/kits/skills/personal-assistant/triggers/report-weekly.json +23 -0
- package/kits/templates/memory-consolidation/forget.md +19 -6
- package/kits/templates/memory-consolidation/notes.md +1 -1
- package/kits/templates/memory-consolidation/profile.md +2 -2
- package/kits/templates/memory-consolidation/promote.md +20 -3
- package/kits/templates/roles/member.json +8 -1
- package/kits/templates/session-capsule/recovery.md +5 -0
- package/kits/templates/session-capsule/renew.md +5 -0
- package/kits/templates/system-fragments/baseagent.md +2 -2
- package/kits/templates/system-fragments/bootstrap.md +6 -6
- package/kits/templates/system-fragments/channel.md +1 -1
- package/kits/templates/system-fragments/memory.md +4 -4
- package/package.json +7 -3
- package/dist/stats/billing.js +0 -215
package/dist/cli/aun-commands.js
CHANGED
|
@@ -2,7 +2,7 @@ import fs from 'fs';
|
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import crypto from 'crypto';
|
|
4
4
|
import { agentMdPath, resolvePaths, resolveRoot } from '../paths.js';
|
|
5
|
-
import {
|
|
5
|
+
import { normalizeGroupAid, sameGroupAid } from '../aun/group/index.js';
|
|
6
6
|
import { getArgValue, isHelpFlag, wantsHelp } from './help.js';
|
|
7
7
|
import { daemonUnavailableMessage, queryDaemon } from './help.js';
|
|
8
8
|
import { isValidAid as validSendAid } from '../aun/aid/validation.js';
|
|
@@ -15,6 +15,7 @@ import { ManagedGroupOperationError } from '../aun/msg/managed-operation.js';
|
|
|
15
15
|
import { parseDuration } from '../trigger/parser.js';
|
|
16
16
|
import { isTopicThreadId, safeFormatMainTopicId } from '../core/thread/topic-id.js';
|
|
17
17
|
import { parseJsonObjectArgument } from '../core/permission/ec-command-parser.js';
|
|
18
|
+
import { resolveAunSendDevice } from '../aun/ability-device-routing.js';
|
|
18
19
|
// ==================== AID ====================
|
|
19
20
|
function resolveAunPath(args) {
|
|
20
21
|
const idx = args.indexOf('--aun-path');
|
|
@@ -1119,6 +1120,7 @@ export async function cmdStorage(args) {
|
|
|
1119
1120
|
Commands:
|
|
1120
1121
|
upload <aid> <local-file> <remote-path> [--public] 上传文件(默认私有)
|
|
1121
1122
|
download <aid> <url> [local-path] 下载文件
|
|
1123
|
+
get-by-share <aid> <share-id> [local-path] 通过分享短码下载文件
|
|
1122
1124
|
ls <aid> [prefix] 列文件
|
|
1123
1125
|
rm <aid> <remote-path> 删文件
|
|
1124
1126
|
quota <aid> 查配额
|
|
@@ -1135,6 +1137,7 @@ Options:
|
|
|
1135
1137
|
ec storage upload myaid.agentid.pub ./pic.png images/pic.png --public
|
|
1136
1138
|
ec storage download myaid.agentid.pub myaid.agentid.pub/notes/doc.txt ./doc.txt
|
|
1137
1139
|
ec storage download myaid.agentid.pub bob.agentid.pub/public/file.pdf ./file.pdf
|
|
1140
|
+
ec storage get-by-share myaid.agentid.pub <share-id> ./output.json
|
|
1138
1141
|
ec storage ls myaid.agentid.pub notes/
|
|
1139
1142
|
ec storage rm myaid.agentid.pub notes/doc.txt
|
|
1140
1143
|
ec storage quota myaid.agentid.pub`);
|
|
@@ -1151,7 +1154,7 @@ Options:
|
|
|
1151
1154
|
process.exit(1);
|
|
1152
1155
|
}
|
|
1153
1156
|
if (process.env.EVOLCORE_SESSION_ID) {
|
|
1154
|
-
const operation = { ls: 'storage.list', quota: 'storage.quota', upload: 'storage.upload', download: 'storage.download', rm: 'storage.delete' }[sub];
|
|
1157
|
+
const operation = { ls: 'storage.list', quota: 'storage.quota', upload: 'storage.upload', download: 'storage.download', rm: 'storage.delete', 'get-by-share': 'storage.get_by_share' }[sub];
|
|
1155
1158
|
if (!operation)
|
|
1156
1159
|
failManagedGroup(formatJson, 'NOT_ALLOWED', `unsupported managed storage command: ${sub}`);
|
|
1157
1160
|
const delegationToken = readDelegationCredential();
|
|
@@ -1209,11 +1212,13 @@ Options:
|
|
|
1209
1212
|
console.log(JSON.stringify(authorization));
|
|
1210
1213
|
else if (sub === 'download')
|
|
1211
1214
|
console.log(`✓ 已下载: ${authorization.localPath} (${authorization.size} bytes)`);
|
|
1215
|
+
else if (sub === 'get-by-share')
|
|
1216
|
+
console.log(`✓ 已下载: ${authorization.localPath} (${authorization.size} bytes)`);
|
|
1212
1217
|
else
|
|
1213
1218
|
console.log(`✓ 已删除: ${authorization.objectKey}`);
|
|
1214
1219
|
return;
|
|
1215
1220
|
}
|
|
1216
|
-
const { storageUpload, storageDownload, storageLs, storageRm, storageQuota } = await import('../aun/storage/index.js');
|
|
1221
|
+
const { storageUpload, storageDownload, storageGetByShare, storageLs, storageRm, storageQuota } = await import('../aun/storage/index.js');
|
|
1217
1222
|
if (sub === 'upload') {
|
|
1218
1223
|
const localFile = args[2];
|
|
1219
1224
|
const remotePath = args[3];
|
|
@@ -1251,6 +1256,31 @@ Options:
|
|
|
1251
1256
|
}
|
|
1252
1257
|
return;
|
|
1253
1258
|
}
|
|
1259
|
+
if (sub === 'get-by-share') {
|
|
1260
|
+
const shareId = args[2];
|
|
1261
|
+
const localPath = args[3];
|
|
1262
|
+
if (!shareId) {
|
|
1263
|
+
console.error('用法: ec storage get-by-share <aid> <share-id> [local-path]');
|
|
1264
|
+
process.exit(1);
|
|
1265
|
+
}
|
|
1266
|
+
const result = await storageGetByShare(aid, shareId, localPath, { aunPath });
|
|
1267
|
+
if (!result.ok) {
|
|
1268
|
+
if (formatJson) {
|
|
1269
|
+
console.log(JSON.stringify({ ok: false, error: result.error }));
|
|
1270
|
+
}
|
|
1271
|
+
else {
|
|
1272
|
+
console.error(`❌ 下载失败: ${result.error}`);
|
|
1273
|
+
}
|
|
1274
|
+
process.exit(1);
|
|
1275
|
+
}
|
|
1276
|
+
if (formatJson) {
|
|
1277
|
+
console.log(JSON.stringify({ ok: true, localPath: result.localPath, size: result.size, objectKey: result.objectKey ?? null, sha256: result.sha256 ?? null }));
|
|
1278
|
+
}
|
|
1279
|
+
else {
|
|
1280
|
+
console.log(`✓ 已下载: ${result.localPath} (${result.size} bytes)`);
|
|
1281
|
+
}
|
|
1282
|
+
return;
|
|
1283
|
+
}
|
|
1254
1284
|
if (sub === 'download') {
|
|
1255
1285
|
const url = args[2];
|
|
1256
1286
|
const localPath = args[3];
|
|
@@ -1382,7 +1412,7 @@ export function buildThreadCheckTrigger(input) {
|
|
|
1382
1412
|
chatType: input.feedbackChatType ?? 'private',
|
|
1383
1413
|
},
|
|
1384
1414
|
},
|
|
1385
|
-
reliability: { concurrency: 'forbid', missedPolicy: 'run_once', retry: { maxAttempts:
|
|
1415
|
+
reliability: { concurrency: 'forbid', missedPolicy: 'run_once', retry: { maxAttempts: 1, backoffMs: 30_000 } },
|
|
1386
1416
|
};
|
|
1387
1417
|
}
|
|
1388
1418
|
/**
|
|
@@ -1589,6 +1619,7 @@ Commands:
|
|
|
1589
1619
|
send <from> <to> --file <path> [--as <type>] 发送文件(image|video|voice|file)
|
|
1590
1620
|
send <from> <to> --link <url> [--title T] 发送链接卡片
|
|
1591
1621
|
send <from> <to> --payload <json> 发送自定义 payload
|
|
1622
|
+
send <from> <to> --payload-file <path> 从 UTF-8 文件读取自定义 payload
|
|
1592
1623
|
request get <self-aid> <request-id> 查询已登记请求状态
|
|
1593
1624
|
pull <from> [--after-seq N] [--limit N] --app <name> 拉取收件箱(必须使用独立 slot)
|
|
1594
1625
|
ack <from> <seq> [--app <name>] 确认已读
|
|
@@ -1607,7 +1638,9 @@ Options:
|
|
|
1607
1638
|
--aun-path <path> 指定 AUN keystore 根
|
|
1608
1639
|
--format json 输出 JSON 格式
|
|
1609
1640
|
--payload '<json>' 发送任意 JSON payload,不添加聊天字段
|
|
1641
|
+
--payload-file <path> 从 UTF-8 文件读取 JSON payload(与 --payload 互斥)
|
|
1610
1642
|
--return none|required 是否等待关联响应(required 建立请求记录)
|
|
1643
|
+
--device-id <id> 定向到能力目录中的一台设备(device/status 查询不指定;其他业务能力必填,不写入 payload)
|
|
1611
1644
|
--timeout <duration> required 的等待期限和 AUN volatile TTL,如 30s、60s、2m(默认 60s,最大 3600s)
|
|
1612
1645
|
--encrypt 强制端到端加密(未指定时使用 daemon 默认值)
|
|
1613
1646
|
--no-encrypt 强制明文发送(优先于 --encrypt)
|
|
@@ -1711,8 +1744,16 @@ Options:
|
|
|
1711
1744
|
console.log(JSON.stringify(result));
|
|
1712
1745
|
else if (!result.ok)
|
|
1713
1746
|
console.error(`request query failed: ${result.error}`);
|
|
1714
|
-
else
|
|
1715
|
-
|
|
1747
|
+
else {
|
|
1748
|
+
const request = result.request ?? {};
|
|
1749
|
+
const ignored = request.lastIgnoredResponse;
|
|
1750
|
+
const reason = (request.state !== 'completed' && request.state !== 'failed' ? ignored?.reason : undefined)
|
|
1751
|
+
?? (request.state === 'pending' && request.ackMessageId ? 'provider_ack_without_final_result' : undefined)
|
|
1752
|
+
?? (request.state === 'pending' ? 'no_final_response_before_deadline' : undefined);
|
|
1753
|
+
console.log(`request_id=${requestId} state=${request.state ?? 'unknown'} message_id=${request.outboundMessageId ?? '-'}`
|
|
1754
|
+
+ ` target_device_id=${request.targetDeviceId ?? '-'} response_device_id=${request.responseDeviceId ?? '-'}`
|
|
1755
|
+
+ ` ack=${request.ackMessageId ? 'received' : 'none'}${reason ? ` reason=${reason}` : ''}`);
|
|
1756
|
+
}
|
|
1716
1757
|
if (!result.ok)
|
|
1717
1758
|
process.exit(1);
|
|
1718
1759
|
return;
|
|
@@ -1985,11 +2026,12 @@ Options:
|
|
|
1985
2026
|
const textFromFileVal = getArgValue(args, '--text-from-file');
|
|
1986
2027
|
const linkVal = getArgValue(args, '--link');
|
|
1987
2028
|
const payloadVal = getArgValue(args, '--payload');
|
|
2029
|
+
const payloadFileVal = getArgValue(args, '--payload-file');
|
|
1988
2030
|
let body;
|
|
1989
2031
|
// 检查互斥参数
|
|
1990
|
-
const exclusiveModes = [fileVal, textFromFileVal, linkVal, payloadVal].filter(Boolean);
|
|
2032
|
+
const exclusiveModes = [fileVal, textFromFileVal, linkVal, payloadVal, payloadFileVal].filter(Boolean);
|
|
1991
2033
|
if (exclusiveModes.length > 1) {
|
|
1992
|
-
console.error('❌ --file, --text-from-file, --link, --payload 互斥,只能指定一个');
|
|
2034
|
+
console.error('❌ --file, --text-from-file, --link, --payload, --payload-file 互斥,只能指定一个');
|
|
1993
2035
|
process.exit(1);
|
|
1994
2036
|
}
|
|
1995
2037
|
if (fileVal) {
|
|
@@ -2042,10 +2084,21 @@ Options:
|
|
|
2042
2084
|
}
|
|
2043
2085
|
body = { mode: 'payload', payload: parsed };
|
|
2044
2086
|
}
|
|
2087
|
+
else if (payloadFileVal) {
|
|
2088
|
+
let parsed;
|
|
2089
|
+
try {
|
|
2090
|
+
parsed = parseJsonObjectArgument(fs.readFileSync(payloadFileVal, 'utf-8'), '--payload-file');
|
|
2091
|
+
}
|
|
2092
|
+
catch (e) {
|
|
2093
|
+
console.error(`--payload-file parse failed: ${e.message}`);
|
|
2094
|
+
process.exit(1);
|
|
2095
|
+
}
|
|
2096
|
+
body = { mode: 'payload', payload: parsed };
|
|
2097
|
+
}
|
|
2045
2098
|
else {
|
|
2046
2099
|
const text = collectPositional(args, 3).join(' ');
|
|
2047
2100
|
if (!text) {
|
|
2048
|
-
console.error('❌ 缺少消息内容(文本或 --file/--text-from-file/--link/--payload)');
|
|
2101
|
+
console.error('❌ 缺少消息内容(文本或 --file/--text-from-file/--link/--payload/--payload-file)');
|
|
2049
2102
|
process.exit(1);
|
|
2050
2103
|
}
|
|
2051
2104
|
body = { mode: 'text', text };
|
|
@@ -2137,7 +2190,7 @@ Options:
|
|
|
2137
2190
|
};
|
|
2138
2191
|
// `--thread` 的原文只用于解析;发出的必须是规范 id(历史写法 `<peer>/<id>`
|
|
2139
2192
|
// 若原样上线,对端会把它当成一个不存在的话题 id)。
|
|
2140
|
-
const result = await msgSend({ from, to, body, encrypt, thread: thread ? threadTopicId : undefined,
|
|
2193
|
+
const result = await msgSend({ from, to, body, encrypt, deviceId: getArgValue(args, '--device-id'), thread: thread ? threadTopicId : undefined, timeoutMs, handoffContext: getArgValue(args, '--handoff-context'), onUploadProgress, ...commonOpts });
|
|
2141
2194
|
if (!result.ok) {
|
|
2142
2195
|
if (formatJson) {
|
|
2143
2196
|
console.log(JSON.stringify(result));
|
|
@@ -2473,25 +2526,9 @@ g- 是名称的一部分,会完整保留;默认命名格式为 g-10000 至 g
|
|
|
2473
2526
|
console.error('❌ 缺少 <from-aid> 参数');
|
|
2474
2527
|
process.exit(1);
|
|
2475
2528
|
}
|
|
2476
|
-
//
|
|
2477
|
-
//
|
|
2478
|
-
// 正确写法。因此先用明确的群 ID 形态判定,把"参数写反了"当场指出来。
|
|
2479
|
-
// 例外:invites 是多值标志/邀请列表,第 1 个位置参数不是 from;create/list 的
|
|
2480
|
-
// 形态不同,也在下面各自的用法里处理,这里只拦截"以群 ID 打头"这一种错位。
|
|
2529
|
+
// A sender's AID spelling cannot establish its type. Delegation or the local
|
|
2530
|
+
// authenticated client validates the sender after this syntax check.
|
|
2481
2531
|
const { isValidAid } = await import('../aun/aid/index.js');
|
|
2482
|
-
if (isExplicitGroupId(from)) {
|
|
2483
|
-
const second = args[2];
|
|
2484
|
-
console.error(`❌ 第 1 个位置参数 <from-aid> 无效:收到了群 ID: ${from}`);
|
|
2485
|
-
if (second && isValidAid(second) && !isExplicitGroupId(second)) {
|
|
2486
|
-
console.error(`检测到参数顺序写反了:第 2 个参数 ${second} 才是发送方 AID。`);
|
|
2487
|
-
console.error(`请改成: ec group ${sub} ${second} ${from}` + (sub === 'send' ? ' <正文>' : ''));
|
|
2488
|
-
}
|
|
2489
|
-
else {
|
|
2490
|
-
console.error('当前命令缺少发送方 AID,后续参数发生了错位。');
|
|
2491
|
-
}
|
|
2492
|
-
printGroupArgsHint(sub);
|
|
2493
|
-
process.exit(1);
|
|
2494
|
-
}
|
|
2495
2532
|
if (!isValidAid(from)) {
|
|
2496
2533
|
console.error(`❌ 第 1 个位置参数 <from-aid> 无效: ${from}`);
|
|
2497
2534
|
printGroupArgsHint(sub);
|
|
@@ -2726,8 +2763,9 @@ g- 是名称的一部分,会完整保留;默认命名格式为 g-10000 至 g
|
|
|
2726
2763
|
const getSendArgValue = (flag) => getArgValue(optionArgs, flag);
|
|
2727
2764
|
const fileVal = getSendArgValue('--file');
|
|
2728
2765
|
const payloadVal = getSendArgValue('--payload');
|
|
2766
|
+
const payloadFileVal = getSendArgValue('--payload-file');
|
|
2729
2767
|
const bodyPositionals = collectPositional(args, 3);
|
|
2730
|
-
const bodyFlags = ['--file', '--payload', '--as', '--content-type', '--text', '--transcript', '--thread', '--check-every', '--trigger-prompt'];
|
|
2768
|
+
const bodyFlags = ['--file', '--payload', '--payload-file', '--as', '--content-type', '--text', '--transcript', '--thread', '--check-every', '--trigger-prompt'];
|
|
2731
2769
|
for (let index = 3; index < args.length; index++) {
|
|
2732
2770
|
const flag = args[index];
|
|
2733
2771
|
if (flag === '--')
|
|
@@ -2742,11 +2780,14 @@ g- 是名称的一部分,会完整保留;默认命名格式为 g-10000 至 g
|
|
|
2742
2780
|
if (optionArgs.includes('--encrypt') && optionArgs.includes('--no-encrypt')) {
|
|
2743
2781
|
failManagedGroup(formatJson, 'INVALID_ARGUMENT', '--encrypt 与 --no-encrypt 不能同时使用');
|
|
2744
2782
|
}
|
|
2745
|
-
if (fileVal
|
|
2746
|
-
failManagedGroup(formatJson, 'INVALID_ARGUMENT', '--file and --payload are mutually exclusive');
|
|
2783
|
+
if ([fileVal, payloadVal, payloadFileVal].filter(Boolean).length > 1) {
|
|
2784
|
+
failManagedGroup(formatJson, 'INVALID_ARGUMENT', '--file, --payload and --payload-file are mutually exclusive');
|
|
2785
|
+
}
|
|
2786
|
+
if (payloadFileVal) {
|
|
2787
|
+
failManagedGroup(formatJson, 'INVALID_ARGUMENT', '--payload-file is supported for private msg sends only');
|
|
2747
2788
|
}
|
|
2748
|
-
if ((fileVal || payloadVal) && bodyPositionals.length > 0) {
|
|
2749
|
-
failManagedGroup(formatJson, 'INVALID_ARGUMENT', '文本正文不能与 --file 或 --payload 同时使用');
|
|
2789
|
+
if ((fileVal || payloadVal || payloadFileVal) && bodyPositionals.length > 0) {
|
|
2790
|
+
failManagedGroup(formatJson, 'INVALID_ARGUMENT', '文本正文不能与 --file、--payload 或 --payload-file 同时使用');
|
|
2750
2791
|
}
|
|
2751
2792
|
let body;
|
|
2752
2793
|
if (fileVal) {
|
|
@@ -2789,7 +2830,7 @@ g- 是名称的一部分,会完整保留;默认命名格式为 g-10000 至 g
|
|
|
2789
2830
|
}
|
|
2790
2831
|
const text = collectPositional(args, 3).join(' ');
|
|
2791
2832
|
if (!text) {
|
|
2792
|
-
console.error('❌ 缺少消息内容(文本或 --file/--payload)');
|
|
2833
|
+
console.error('❌ 缺少消息内容(文本或 --file/--payload/--payload-file)');
|
|
2793
2834
|
process.exit(1);
|
|
2794
2835
|
}
|
|
2795
2836
|
body = { mode: 'text', text };
|
|
@@ -3437,7 +3478,7 @@ export function resolveManagedSendArgv(argv) {
|
|
|
3437
3478
|
const booleans = new Set();
|
|
3438
3479
|
const text = [];
|
|
3439
3480
|
const mentions = [];
|
|
3440
|
-
const valueFlags = new Set(['--format', '--file', '--payload', '--text-from-file', '--link', '--title', '--description', '--as', '--content-type', '--text', '--transcript', '--thread', '--check-every', '--trigger-prompt', '--return', '--timeout', '--handoff-context', '--mention', '--self']);
|
|
3481
|
+
const valueFlags = new Set(['--format', '--file', '--payload', '--payload-file', '--text-from-file', '--link', '--title', '--description', '--as', '--content-type', '--text', '--transcript', '--thread', '--check-every', '--trigger-prompt', '--return', '--timeout', '--handoff-context', '--mention', '--self', '--device-id']);
|
|
3441
3482
|
const booleanFlags = new Set(['--encrypt', '--no-encrypt', '--mention-all']);
|
|
3442
3483
|
for (let index = 4; index < argv.length; index++) {
|
|
3443
3484
|
const flag = argv[index];
|
|
@@ -3514,13 +3555,14 @@ export function resolveManagedSendArgv(argv) {
|
|
|
3514
3555
|
}
|
|
3515
3556
|
if (scope === 'msg' && (mentions.length || booleans.has('--mention-all')))
|
|
3516
3557
|
throw new Error('Mentions require a group send');
|
|
3517
|
-
if (scope === 'group' && (values.has('--link') || values.has('--text-from-file')))
|
|
3558
|
+
if (scope === 'group' && (values.has('--link') || values.has('--text-from-file') || values.has('--payload-file')))
|
|
3518
3559
|
throw new Error('Unsupported group send body');
|
|
3519
|
-
const modes = ['--file', '--payload', '--text-from-file', '--link'].filter(flag => values.has(flag));
|
|
3560
|
+
const modes = ['--file', '--payload', '--payload-file', '--text-from-file', '--link'].filter(flag => values.has(flag));
|
|
3520
3561
|
if (modes.length > 1 || (modes.length && text.length))
|
|
3521
3562
|
throw new Error('Message body modes are mutually exclusive');
|
|
3522
3563
|
let payload;
|
|
3523
3564
|
let file;
|
|
3565
|
+
const payloadFile = values.get('--payload-file');
|
|
3524
3566
|
if (values.has('--file')) {
|
|
3525
3567
|
const as = values.get('--as');
|
|
3526
3568
|
if (as && !['image', 'video', 'voice', 'file'].includes(as))
|
|
@@ -3537,7 +3579,7 @@ export function resolveManagedSendArgv(argv) {
|
|
|
3537
3579
|
payload = { type: 'link', url: values.get('--link'), ...(values.get('--title') ? { title: values.get('--title') } : {}),
|
|
3538
3580
|
...(values.get('--description') ? { description: values.get('--description') } : {}) };
|
|
3539
3581
|
}
|
|
3540
|
-
else if (!values.has('--text-from-file')) {
|
|
3582
|
+
else if (!values.has('--text-from-file') && !payloadFile) {
|
|
3541
3583
|
if (!text.join(' '))
|
|
3542
3584
|
throw new Error('Message content is required');
|
|
3543
3585
|
payload = { type: 'text', text: text.join(' ') };
|
|
@@ -3546,7 +3588,9 @@ export function resolveManagedSendArgv(argv) {
|
|
|
3546
3588
|
throw new Error('Attachment options require --file');
|
|
3547
3589
|
if (booleans.has('--mention-all'))
|
|
3548
3590
|
mentions.push({ scope: 'all' });
|
|
3549
|
-
|
|
3591
|
+
const deviceId = resolveAunSendDevice(values.get('--device-id'), scope, payload);
|
|
3592
|
+
return { aid, to, scope, payload, rawPayload: values.has('--payload') || values.has('--payload-file'), file, textFile: values.get('--text-from-file'), payloadFile,
|
|
3593
|
+
deviceId,
|
|
3550
3594
|
encrypt: booleans.has('--no-encrypt') ? false : booleans.has('--encrypt') ? true : undefined,
|
|
3551
3595
|
thread, checkEvery, checkEveryMs: checkEveryMs ?? undefined, triggerPromptExtra, returnPolicy: returnPolicy, timeoutMs, handoffContext,
|
|
3552
3596
|
mentions: mentions.length ? mentions : undefined };
|
|
@@ -3566,12 +3610,12 @@ export function resolveManagedSendArgv(argv) {
|
|
|
3566
3610
|
*/
|
|
3567
3611
|
const VALUE_FLAGS = new Set([
|
|
3568
3612
|
'--format', '--app', '--after-seq', '--limit', '--file', '--link',
|
|
3569
|
-
'--payload', '--title', '--description', '--text', '--transcript',
|
|
3613
|
+
'--payload', '--payload-file', '--title', '--description', '--text', '--transcript',
|
|
3570
3614
|
'--as', '--content-type', '--mention', '--visibility', '--join-mode',
|
|
3571
3615
|
'--group-id', '--name', '--message', '--answer', '--page', '--size',
|
|
3572
3616
|
'--member-type',
|
|
3573
3617
|
'--aun-path', '--thread', '--handoff-context', '--self',
|
|
3574
|
-
'--return', '--timeout',
|
|
3618
|
+
'--return', '--timeout', '--device-id',
|
|
3575
3619
|
// 跨话题发送的复查参数:漏登记会让 collectPositional 把它们当正文(正文污染)
|
|
3576
3620
|
'--check-every', '--trigger-prompt',
|
|
3577
3621
|
]);
|