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
|
@@ -3,6 +3,13 @@ import fs from 'fs';
|
|
|
3
3
|
import path from 'path';
|
|
4
4
|
import { resolvePaths } from '../paths.js';
|
|
5
5
|
import { ConfigError } from './config-manager.js';
|
|
6
|
+
const MIGRATION_KIND = {
|
|
7
|
+
'auxiliary-model-v1': 'auxiliary-model',
|
|
8
|
+
'agent-only-model-v1': 'agent-only-model',
|
|
9
|
+
'agent-model-provider-v1': 'agent-only-model',
|
|
10
|
+
'provider-service-type-v1': 'provider-service-type',
|
|
11
|
+
'relation-config-v11-v1': 'agent-only-model',
|
|
12
|
+
};
|
|
6
13
|
const SUPPORTED_BASEAGENTS = new Set(['claude', 'codex', 'gemini', 'ecagent']);
|
|
7
14
|
const BASEAGENT_ALIASES = new Map([
|
|
8
15
|
['cc', 'claude'],
|
|
@@ -379,11 +386,11 @@ function assertDaemonStopped(home) {
|
|
|
379
386
|
}
|
|
380
387
|
}
|
|
381
388
|
}
|
|
382
|
-
function lockPath(home) {
|
|
383
|
-
return path.join(home, 'data',
|
|
389
|
+
function lockPath(home, id) {
|
|
390
|
+
return path.join(home, 'data', `${id}-migration.lock`);
|
|
384
391
|
}
|
|
385
|
-
function acquireLock(home) {
|
|
386
|
-
const dir = lockPath(home);
|
|
392
|
+
function acquireLock(home, id) {
|
|
393
|
+
const dir = lockPath(home, id);
|
|
387
394
|
const ownerFile = path.join(dir, 'owner.json');
|
|
388
395
|
fs.mkdirSync(path.dirname(dir), { recursive: true });
|
|
389
396
|
try {
|
|
@@ -401,7 +408,7 @@ function acquireLock(home) {
|
|
|
401
408
|
}
|
|
402
409
|
const pid = isRecord(owner) ? Number(owner.pid) : NaN;
|
|
403
410
|
if (Number.isInteger(pid) && pid > 0 && processIsAlive(pid)) {
|
|
404
|
-
throw new Error(`Another
|
|
411
|
+
throw new Error(`Another ${id} migration is already running (pid=${pid})`);
|
|
405
412
|
}
|
|
406
413
|
fs.rmSync(dir, { recursive: true, force: true });
|
|
407
414
|
fs.mkdirSync(dir);
|
|
@@ -412,24 +419,24 @@ function acquireLock(home) {
|
|
|
412
419
|
function atomicWrite(file, content) {
|
|
413
420
|
fs.mkdirSync(path.dirname(file), { recursive: true });
|
|
414
421
|
const mode = fs.existsSync(file) ? fs.statSync(file).mode & 0o777 : 0o600;
|
|
415
|
-
const temp = `${file}.
|
|
422
|
+
const temp = `${file}.schema-migration-${process.pid}-${crypto.randomBytes(6).toString('hex')}.tmp`;
|
|
416
423
|
fs.writeFileSync(temp, content, { mode });
|
|
417
424
|
fs.renameSync(temp, file);
|
|
418
425
|
}
|
|
419
|
-
function journalPath(home) {
|
|
420
|
-
return path.join(home, 'data',
|
|
426
|
+
function journalPath(home, id) {
|
|
427
|
+
return path.join(home, 'data', `${id}-migration.json`);
|
|
421
428
|
}
|
|
422
|
-
function writeJournal(plan, state) {
|
|
429
|
+
function writeJournal(plan, state, id) {
|
|
423
430
|
const journal = {
|
|
424
431
|
schemaVersion: 1,
|
|
425
432
|
state,
|
|
426
433
|
home: plan.home,
|
|
427
434
|
changes: plan.changes,
|
|
428
435
|
};
|
|
429
|
-
atomicWrite(journalPath(plan.home), jsonText(journal));
|
|
436
|
+
atomicWrite(journalPath(plan.home, id), jsonText(journal));
|
|
430
437
|
}
|
|
431
|
-
function readJournal(home) {
|
|
432
|
-
const file = journalPath(home);
|
|
438
|
+
function readJournal(home, id) {
|
|
439
|
+
const file = journalPath(home, id);
|
|
433
440
|
if (!fs.existsSync(file))
|
|
434
441
|
return undefined;
|
|
435
442
|
let raw;
|
|
@@ -458,7 +465,7 @@ function readJournal(home) {
|
|
|
458
465
|
}
|
|
459
466
|
changes.push({
|
|
460
467
|
file: item.file,
|
|
461
|
-
kind:
|
|
468
|
+
kind: MIGRATION_KIND[id],
|
|
462
469
|
before: item.before,
|
|
463
470
|
after: item.after,
|
|
464
471
|
});
|
|
@@ -470,8 +477,8 @@ function readJournal(home) {
|
|
|
470
477
|
changes,
|
|
471
478
|
};
|
|
472
479
|
}
|
|
473
|
-
function recoverJournal(home) {
|
|
474
|
-
const journal = readJournal(home);
|
|
480
|
+
function recoverJournal(home, id) {
|
|
481
|
+
const journal = readJournal(home, id);
|
|
475
482
|
if (!journal)
|
|
476
483
|
return;
|
|
477
484
|
if (journal.state === 'prepared') {
|
|
@@ -482,13 +489,13 @@ function recoverJournal(home) {
|
|
|
482
489
|
atomicWrite(item.file, item.before);
|
|
483
490
|
}
|
|
484
491
|
}
|
|
485
|
-
fs.rmSync(journalPath(home), { force: true });
|
|
492
|
+
fs.rmSync(journalPath(home, id), { force: true });
|
|
486
493
|
}
|
|
487
|
-
function applyMigration(plan) {
|
|
494
|
+
function applyMigration(plan, id) {
|
|
488
495
|
if (plan.changes.length === 0)
|
|
489
496
|
return null;
|
|
490
497
|
const stamp = new Date().toISOString().replace(/[:.]/g, '-');
|
|
491
|
-
const backup = path.join(plan.home, 'backups',
|
|
498
|
+
const backup = path.join(plan.home, 'backups', `${id}-migration`, stamp);
|
|
492
499
|
fs.mkdirSync(path.join(backup, 'files'), { recursive: true });
|
|
493
500
|
for (const item of plan.changes) {
|
|
494
501
|
if (item.before === null)
|
|
@@ -506,28 +513,29 @@ function applyMigration(plan) {
|
|
|
506
513
|
kind: item.kind,
|
|
507
514
|
})),
|
|
508
515
|
}));
|
|
509
|
-
writeJournal(plan, 'prepared');
|
|
516
|
+
writeJournal(plan, 'prepared', id);
|
|
510
517
|
try {
|
|
511
518
|
for (const item of plan.changes)
|
|
512
519
|
atomicWrite(item.file, item.after);
|
|
513
|
-
writeJournal(plan, 'committed');
|
|
514
|
-
fs.rmSync(journalPath(plan.home), { force: true });
|
|
520
|
+
writeJournal(plan, 'committed', id);
|
|
521
|
+
fs.rmSync(journalPath(plan.home, id), { force: true });
|
|
515
522
|
}
|
|
516
523
|
catch (error) {
|
|
517
|
-
recoverJournal(plan.home);
|
|
524
|
+
recoverJournal(plan.home, id);
|
|
518
525
|
throw error;
|
|
519
526
|
}
|
|
520
527
|
return backup;
|
|
521
528
|
}
|
|
522
529
|
/** Plan or apply the legacy response-mode bucket to baseagent schema migration. */
|
|
523
530
|
export function runAuxiliaryModelSchemaMigration(options = {}) {
|
|
531
|
+
const id = 'auxiliary-model-v1';
|
|
524
532
|
const home = path.resolve(options.home || resolvePaths().root);
|
|
525
|
-
const release = acquireLock(home);
|
|
533
|
+
const release = acquireLock(home, id);
|
|
526
534
|
try {
|
|
527
535
|
assertDaemonStopped(home);
|
|
528
|
-
recoverJournal(home);
|
|
536
|
+
recoverJournal(home, id);
|
|
529
537
|
const plan = planAuxiliaryModelMigration(home);
|
|
530
|
-
const backup = options.apply ? applyMigration(plan) : null;
|
|
538
|
+
const backup = options.apply ? applyMigration(plan, id) : null;
|
|
531
539
|
return {
|
|
532
540
|
ok: true,
|
|
533
541
|
mode: options.apply ? 'applied' : 'dry-run',
|
|
@@ -560,3 +568,656 @@ export async function ensureAuxiliaryModelMigrationOnStartup() {
|
|
|
560
568
|
throw new ConfigError('AUXILIARY_MODEL_MIGRATION_FAILED', `Automatic Session Renew auxiliary-model schema migration failed: ${detail}`, { cause: error });
|
|
561
569
|
}
|
|
562
570
|
}
|
|
571
|
+
// ── 模型参数只在 Agent 级:剥离关系层与 defaults 的模型字段 ────────────────────
|
|
572
|
+
/** 关系层不再承载的模型字段(与 config-manager 合并时的剥离规则一致)。 */
|
|
573
|
+
const RELATION_MODEL_FIELDS = ['baseagents', 'active_baseagent', 'model', 'models'];
|
|
574
|
+
/** 剥离后内容与新版本 schema 等价的直接前驱版本(relation v10 已撤销、从未发布)。 */
|
|
575
|
+
const RELATION_RESTAMP = { from: 9, to: 11 };
|
|
576
|
+
const DEFAULTS_RESTAMP = { from: 6, to: 5 };
|
|
577
|
+
function stripOwnFields(value, fields) {
|
|
578
|
+
const removed = [];
|
|
579
|
+
for (const field of fields) {
|
|
580
|
+
if (!hasOwn(value, field))
|
|
581
|
+
continue;
|
|
582
|
+
delete value[field];
|
|
583
|
+
removed.push(field);
|
|
584
|
+
}
|
|
585
|
+
return removed;
|
|
586
|
+
}
|
|
587
|
+
function stripRelationModelFields(input) {
|
|
588
|
+
const value = { ...input };
|
|
589
|
+
const removed = stripOwnFields(value, RELATION_MODEL_FIELDS);
|
|
590
|
+
if (removed.length > 0 && value.$schema_version === RELATION_RESTAMP.from)
|
|
591
|
+
value.$schema_version = RELATION_RESTAMP.to;
|
|
592
|
+
return { value, removed };
|
|
593
|
+
}
|
|
594
|
+
function stripDefaultsModelFields(input) {
|
|
595
|
+
const value = { ...input };
|
|
596
|
+
const removed = stripOwnFields(value, ['models']);
|
|
597
|
+
if (isRecord(value.baseagents)) {
|
|
598
|
+
const baseagents = {};
|
|
599
|
+
for (const [name, block] of Object.entries(value.baseagents)) {
|
|
600
|
+
if (!isRecord(block)) {
|
|
601
|
+
baseagents[name] = block;
|
|
602
|
+
continue;
|
|
603
|
+
}
|
|
604
|
+
const next = { ...block };
|
|
605
|
+
if (hasOwn(next, 'reasoning')) {
|
|
606
|
+
if (!hasOwn(next, 'effort'))
|
|
607
|
+
next.effort = next.reasoning;
|
|
608
|
+
delete next.reasoning;
|
|
609
|
+
removed.push(`baseagents.${name}.reasoning`);
|
|
610
|
+
}
|
|
611
|
+
baseagents[name] = next;
|
|
612
|
+
}
|
|
613
|
+
value.baseagents = baseagents;
|
|
614
|
+
}
|
|
615
|
+
// v6 never shipped as a public defaults schema; restore the unpublished
|
|
616
|
+
// restamp to the released v5 schema while preserving model defaults.
|
|
617
|
+
if (value.$schema_version === DEFAULTS_RESTAMP.from)
|
|
618
|
+
value.$schema_version = DEFAULTS_RESTAMP.to;
|
|
619
|
+
return { value, removed };
|
|
620
|
+
}
|
|
621
|
+
function planAgentOnlyModelMigration(home) {
|
|
622
|
+
const changes = [];
|
|
623
|
+
const details = [];
|
|
624
|
+
const summary = {
|
|
625
|
+
configsScanned: 0,
|
|
626
|
+
filesChanged: 0,
|
|
627
|
+
relationFilesChanged: 0,
|
|
628
|
+
defaultsFieldsRemoved: 0,
|
|
629
|
+
};
|
|
630
|
+
const agentsRoot = path.join(home, 'agents');
|
|
631
|
+
if (!fs.existsSync(agentsRoot))
|
|
632
|
+
return { home, changes, summary, details };
|
|
633
|
+
// 损坏的 JSON 不在此处理:保持原样,由各自的读取路径报告。
|
|
634
|
+
const plan = (file, strip) => {
|
|
635
|
+
summary.configsScanned += 1;
|
|
636
|
+
let parsed;
|
|
637
|
+
try {
|
|
638
|
+
parsed = readJson(file);
|
|
639
|
+
}
|
|
640
|
+
catch {
|
|
641
|
+
return [];
|
|
642
|
+
}
|
|
643
|
+
if (!isRecord(parsed.value))
|
|
644
|
+
return [];
|
|
645
|
+
const result = strip(parsed.value);
|
|
646
|
+
if (result.value.$schema_version === parsed.value.$schema_version && result.removed.length === 0)
|
|
647
|
+
return [];
|
|
648
|
+
changes.push({ file, kind: 'agent-only-model', before: parsed.text, after: jsonText(result.value) });
|
|
649
|
+
details.push({ file: path.relative(home, file), removed: result.removed });
|
|
650
|
+
summary.filesChanged += 1;
|
|
651
|
+
return result.removed;
|
|
652
|
+
};
|
|
653
|
+
const defaultsFile = path.join(agentsRoot, 'defaults.json');
|
|
654
|
+
if (fs.existsSync(defaultsFile))
|
|
655
|
+
summary.defaultsFieldsRemoved += plan(defaultsFile, stripDefaultsModelFields).length;
|
|
656
|
+
const agentEntries = fs.readdirSync(agentsRoot, { withFileTypes: true })
|
|
657
|
+
.sort((left, right) => left.name.localeCompare(right.name));
|
|
658
|
+
for (const entry of agentEntries) {
|
|
659
|
+
if (!entry.isDirectory() || !validAid(entry.name))
|
|
660
|
+
continue;
|
|
661
|
+
for (const relationFile of walkRelationConfigs(path.join(agentsRoot, entry.name, 'relations'))) {
|
|
662
|
+
if (plan(relationFile, stripRelationModelFields).length > 0)
|
|
663
|
+
summary.relationFilesChanged += 1;
|
|
664
|
+
}
|
|
665
|
+
}
|
|
666
|
+
return { home, changes, summary, details };
|
|
667
|
+
}
|
|
668
|
+
/** Plan or apply removal of relation-level and defaults model parameters. */
|
|
669
|
+
export function runAgentOnlyModelSchemaMigration(options = {}) {
|
|
670
|
+
const id = 'agent-only-model-v1';
|
|
671
|
+
const home = path.resolve(options.home || resolvePaths().root);
|
|
672
|
+
const release = acquireLock(home, id);
|
|
673
|
+
try {
|
|
674
|
+
assertDaemonStopped(home);
|
|
675
|
+
recoverJournal(home, id);
|
|
676
|
+
const plan = planAgentOnlyModelMigration(home);
|
|
677
|
+
const backup = options.apply ? applyMigration(plan, id) : null;
|
|
678
|
+
return {
|
|
679
|
+
ok: true,
|
|
680
|
+
mode: options.apply ? 'applied' : 'dry-run',
|
|
681
|
+
home,
|
|
682
|
+
changedFiles: plan.changes.length,
|
|
683
|
+
backup,
|
|
684
|
+
summary: plan.summary,
|
|
685
|
+
details: plan.details,
|
|
686
|
+
};
|
|
687
|
+
}
|
|
688
|
+
finally {
|
|
689
|
+
release();
|
|
690
|
+
}
|
|
691
|
+
}
|
|
692
|
+
/** Apply the agent-only model migration before daemon registration. */
|
|
693
|
+
export async function ensureAgentOnlyModelMigrationOnStartup() {
|
|
694
|
+
const home = resolvePaths().root;
|
|
695
|
+
try {
|
|
696
|
+
const result = runAgentOnlyModelSchemaMigration({ home, apply: true });
|
|
697
|
+
if (result.changedFiles === 0)
|
|
698
|
+
return null;
|
|
699
|
+
return {
|
|
700
|
+
mode: 'applied',
|
|
701
|
+
changedFiles: result.changedFiles,
|
|
702
|
+
backup: result.backup,
|
|
703
|
+
summary: result.summary,
|
|
704
|
+
details: result.details,
|
|
705
|
+
};
|
|
706
|
+
}
|
|
707
|
+
catch (error) {
|
|
708
|
+
const detail = error instanceof Error ? error.message : String(error);
|
|
709
|
+
throw new ConfigError('AGENT_ONLY_MODEL_MIGRATION_FAILED', `Automatic agent-only model schema migration failed: ${detail}`, { cause: error });
|
|
710
|
+
}
|
|
711
|
+
}
|
|
712
|
+
// ── 网关信息迁入 providers.json,模型默认保留在 defaults ───────────────────────
|
|
713
|
+
/** Agent/defaults baseagents.<ba> 中只允许由 providers.json 承载的连接字段。 */
|
|
714
|
+
const AGENT_BASEAGENT_REMOVED_FIELDS = [
|
|
715
|
+
'apiKey', 'baseUrl', 'headers', 'queryParams',
|
|
716
|
+
'auxiliaryModel', 'auxiliaryEffort', 'approvalsReviewer',
|
|
717
|
+
'mode', 'useVertex', 'project', 'location',
|
|
718
|
+
];
|
|
719
|
+
/**
|
|
720
|
+
* Agent 级 config.json 顶层已迁走或早已废除、代码无读取点的字段。
|
|
721
|
+
* response_modes(旧响应模式块)与 dispatch(旧广播开关)在现行实现里都没有消费者。
|
|
722
|
+
*/
|
|
723
|
+
const AGENT_TOP_REMOVED_FIELDS = ['model', 'models', 'decision_model', 'response_modes', 'dispatch'];
|
|
724
|
+
/** 模型与 Provider 迁移统一输出 v16,不再生成已合并的 v15 配置。 */
|
|
725
|
+
const AGENT_CONFIG_SCHEMA_TARGET = 16;
|
|
726
|
+
const DEFAULTS_SCHEMA_TARGET = 5;
|
|
727
|
+
/** 指认 provider 时各 baseagent 使用的服务类型。 */
|
|
728
|
+
const BASEAGENT_SERVICE_TYPES = {
|
|
729
|
+
claude: 'claude',
|
|
730
|
+
codex: 'codex',
|
|
731
|
+
gemini: 'gemini',
|
|
732
|
+
ecagent: 'text',
|
|
733
|
+
};
|
|
734
|
+
/**
|
|
735
|
+
* providers.json 中已存在同 baseUrl 且同凭证的服务时复用该条目,避免重复登记。
|
|
736
|
+
* 端点相同但凭证不同必须单独建条目:否则显式 apiKey 会在迁移中丢失。
|
|
737
|
+
*/
|
|
738
|
+
function findProviderForConnection(providers, connection) {
|
|
739
|
+
for (const [providerId, provider] of Object.entries(providers)) {
|
|
740
|
+
if (!isRecord(provider) || !isRecord(provider.common))
|
|
741
|
+
continue;
|
|
742
|
+
const baseUrl = typeof provider.common.baseUrl === 'string' ? provider.common.baseUrl.trim() : '';
|
|
743
|
+
if (baseUrl !== connection.baseUrl)
|
|
744
|
+
continue;
|
|
745
|
+
const existingKey = typeof provider.common.apiKey === 'string' ? provider.common.apiKey.trim() : '';
|
|
746
|
+
if (connection.apiKey && existingKey !== connection.apiKey)
|
|
747
|
+
continue;
|
|
748
|
+
const services = isRecord(provider.services) ? provider.services : {};
|
|
749
|
+
if (Object.keys(services).length === 0 || hasOwn(services, connection.serviceType))
|
|
750
|
+
return providerId;
|
|
751
|
+
}
|
|
752
|
+
return undefined;
|
|
753
|
+
}
|
|
754
|
+
function createProviderId(providers) {
|
|
755
|
+
let sequence = 1;
|
|
756
|
+
for (const providerId of Object.keys(providers)) {
|
|
757
|
+
const match = /^provider-(\d+)$/u.exec(providerId);
|
|
758
|
+
if (match)
|
|
759
|
+
sequence = Math.max(sequence, Number(match[1]) + 1);
|
|
760
|
+
}
|
|
761
|
+
while (hasOwn(providers, `provider-${sequence}`))
|
|
762
|
+
sequence += 1;
|
|
763
|
+
return `provider-${sequence}`;
|
|
764
|
+
}
|
|
765
|
+
/** 旧写法 $ENV:NAME 统一成 providers 认识的整体引用 ${NAME};明文原样保留。 */
|
|
766
|
+
function normalizeProviderSecret(value) {
|
|
767
|
+
if (typeof value !== 'string')
|
|
768
|
+
return undefined;
|
|
769
|
+
const trimmed = value.trim();
|
|
770
|
+
if (!trimmed)
|
|
771
|
+
return undefined;
|
|
772
|
+
const legacy = /^\$ENV:([A-Za-z_][A-Za-z0-9_]*)$/u.exec(trimmed);
|
|
773
|
+
return legacy ? '${' + legacy[1] + '}' : trimmed;
|
|
774
|
+
}
|
|
775
|
+
function connectionFromBlock(block, serviceType) {
|
|
776
|
+
const baseUrl = typeof block.baseUrl === 'string' ? block.baseUrl.trim() : '';
|
|
777
|
+
if (!baseUrl || baseUrl.includes('placeholder'))
|
|
778
|
+
return undefined;
|
|
779
|
+
try {
|
|
780
|
+
new URL(baseUrl);
|
|
781
|
+
}
|
|
782
|
+
catch {
|
|
783
|
+
return undefined;
|
|
784
|
+
}
|
|
785
|
+
const headers = isRecord(block.headers) ? block.headers : undefined;
|
|
786
|
+
const queryParams = isRecord(block.queryParams) ? block.queryParams : undefined;
|
|
787
|
+
const apiKey = normalizeProviderSecret(block.apiKey);
|
|
788
|
+
return {
|
|
789
|
+
baseUrl,
|
|
790
|
+
...(apiKey ? { apiKey } : {}),
|
|
791
|
+
...(headers && Object.keys(headers).length > 0 ? { headers } : {}),
|
|
792
|
+
...(queryParams && Object.keys(queryParams).length > 0 ? { queryParams } : {}),
|
|
793
|
+
serviceType,
|
|
794
|
+
};
|
|
795
|
+
}
|
|
796
|
+
/** decision_model 的 base_url 是完整请求地址:拆成 provider 的 origin+目录 与 service path。 */
|
|
797
|
+
function connectionFromDecisionModel(block) {
|
|
798
|
+
const rawUrl = typeof block.base_url === 'string' ? block.base_url.trim() : '';
|
|
799
|
+
if (!rawUrl)
|
|
800
|
+
return undefined;
|
|
801
|
+
let parsed;
|
|
802
|
+
try {
|
|
803
|
+
parsed = new URL(rawUrl);
|
|
804
|
+
}
|
|
805
|
+
catch {
|
|
806
|
+
return undefined;
|
|
807
|
+
}
|
|
808
|
+
const trimmedPath = parsed.pathname.replace(/\/+$/u, '');
|
|
809
|
+
const slash = trimmedPath.lastIndexOf('/');
|
|
810
|
+
const basePath = slash > 0 ? trimmedPath.slice(0, slash) : '';
|
|
811
|
+
const servicePath = slash > 0 ? trimmedPath.slice(slash + 1) : trimmedPath.replace(/^\//u, '');
|
|
812
|
+
const headers = isRecord(block.headers) ? block.headers : undefined;
|
|
813
|
+
const queryParams = isRecord(block.queryParams) ? block.queryParams : undefined;
|
|
814
|
+
const apiKey = normalizeProviderSecret(block.apikey ?? block.apiKey);
|
|
815
|
+
return {
|
|
816
|
+
connection: {
|
|
817
|
+
baseUrl: `${parsed.origin}${basePath}`,
|
|
818
|
+
...(apiKey ? { apiKey } : {}),
|
|
819
|
+
...(headers && Object.keys(headers).length > 0 ? { headers } : {}),
|
|
820
|
+
...(queryParams && Object.keys(queryParams).length > 0 ? { queryParams } : {}),
|
|
821
|
+
serviceType: 'decision',
|
|
822
|
+
},
|
|
823
|
+
path: servicePath,
|
|
824
|
+
};
|
|
825
|
+
}
|
|
826
|
+
function registerConnection(providers, connection, servicePath, summary) {
|
|
827
|
+
const existing = findProviderForConnection(providers, connection);
|
|
828
|
+
const providerId = existing ?? createProviderId(providers);
|
|
829
|
+
const current = existing && isRecord(providers[existing]) ? providers[existing] : undefined;
|
|
830
|
+
const common = current && isRecord(current.common) ? { ...current.common } : {};
|
|
831
|
+
const services = current && isRecord(current.services) ? { ...current.services } : {};
|
|
832
|
+
const nextCommon = {
|
|
833
|
+
...common,
|
|
834
|
+
baseUrl: connection.baseUrl,
|
|
835
|
+
...(connection.apiKey && !common.apiKey ? { apiKey: connection.apiKey } : {}),
|
|
836
|
+
...(connection.headers ? { headers: connection.headers } : {}),
|
|
837
|
+
...(connection.queryParams ? { queryParams: connection.queryParams } : {}),
|
|
838
|
+
};
|
|
839
|
+
const nextServices = {
|
|
840
|
+
...services,
|
|
841
|
+
[connection.serviceType]: {
|
|
842
|
+
...(isRecord(services[connection.serviceType]) ? services[connection.serviceType] : {}),
|
|
843
|
+
...(servicePath ? { path: servicePath } : {}),
|
|
844
|
+
...(connection.serviceType === 'decision' ? { style: 'systemone' } : {}),
|
|
845
|
+
},
|
|
846
|
+
};
|
|
847
|
+
const nextProvider = { ...(current ?? {}), common: nextCommon, services: nextServices };
|
|
848
|
+
if (!hasOwn(nextProvider, 'name'))
|
|
849
|
+
nextProvider.name = providerId;
|
|
850
|
+
providers[providerId] = nextProvider;
|
|
851
|
+
if (existing)
|
|
852
|
+
summary.providersUpdated += 1;
|
|
853
|
+
else
|
|
854
|
+
summary.providersCreated += 1;
|
|
855
|
+
return providerId;
|
|
856
|
+
}
|
|
857
|
+
function planAgentModelProviderMigration(home) {
|
|
858
|
+
const changes = [];
|
|
859
|
+
const details = [];
|
|
860
|
+
const summary = {
|
|
861
|
+
configsScanned: 0,
|
|
862
|
+
filesChanged: 0,
|
|
863
|
+
providersCreated: 0,
|
|
864
|
+
providersUpdated: 0,
|
|
865
|
+
gatewayFieldsRemoved: 0,
|
|
866
|
+
decisionModelsMigrated: 0,
|
|
867
|
+
};
|
|
868
|
+
const agentsRoot = path.join(home, 'agents');
|
|
869
|
+
if (!fs.existsSync(agentsRoot))
|
|
870
|
+
return { home, changes, summary, details };
|
|
871
|
+
const defaultsFile = path.join(agentsRoot, 'defaults.json');
|
|
872
|
+
const agentFiles = fs.readdirSync(agentsRoot, { withFileTypes: true })
|
|
873
|
+
.filter(entry => entry.isDirectory() && validAid(entry.name))
|
|
874
|
+
.sort((left, right) => left.name.localeCompare(right.name))
|
|
875
|
+
.map(entry => path.join(agentsRoot, entry.name, 'config.json'))
|
|
876
|
+
.filter(file => fs.existsSync(file));
|
|
877
|
+
const parsed = new Map();
|
|
878
|
+
for (const file of [defaultsFile, ...agentFiles]) {
|
|
879
|
+
if (!fs.existsSync(file))
|
|
880
|
+
continue;
|
|
881
|
+
summary.configsScanned += 1;
|
|
882
|
+
try {
|
|
883
|
+
const loaded = readJson(file);
|
|
884
|
+
if (isRecord(loaded.value))
|
|
885
|
+
parsed.set(file, { value: loaded.value, text: loaded.text });
|
|
886
|
+
}
|
|
887
|
+
catch {
|
|
888
|
+
// 损坏的 JSON 保持原样,由各自的读取路径报告。
|
|
889
|
+
}
|
|
890
|
+
}
|
|
891
|
+
const providersFile = path.join(home, 'providers.json');
|
|
892
|
+
let providers = {};
|
|
893
|
+
if (fs.existsSync(providersFile)) {
|
|
894
|
+
try {
|
|
895
|
+
const raw = readJson(providersFile).value;
|
|
896
|
+
if (isRecord(raw) && isRecord(raw.providers))
|
|
897
|
+
providers = { ...raw.providers };
|
|
898
|
+
}
|
|
899
|
+
catch {
|
|
900
|
+
providers = {};
|
|
901
|
+
}
|
|
902
|
+
}
|
|
903
|
+
const providersBefore = fs.existsSync(providersFile) ? fs.readFileSync(providersFile, 'utf8') : null;
|
|
904
|
+
const defaultConnections = new Map();
|
|
905
|
+
const defaultBlocks = new Map();
|
|
906
|
+
const defaultsEntry = parsed.get(defaultsFile);
|
|
907
|
+
if (defaultsEntry && isRecord(defaultsEntry.value.baseagents)) {
|
|
908
|
+
for (const [name, block] of Object.entries(defaultsEntry.value.baseagents)) {
|
|
909
|
+
if (!isRecord(block))
|
|
910
|
+
continue;
|
|
911
|
+
defaultBlocks.set(name, block);
|
|
912
|
+
const serviceType = BASEAGENT_SERVICE_TYPES[name];
|
|
913
|
+
const connection = serviceType ? connectionFromBlock(block, serviceType) : undefined;
|
|
914
|
+
if (connection)
|
|
915
|
+
defaultConnections.set(name, registerConnection(providers, connection, '', summary));
|
|
916
|
+
}
|
|
917
|
+
}
|
|
918
|
+
for (const [file, entry] of parsed) {
|
|
919
|
+
const value = { ...entry.value };
|
|
920
|
+
const removed = [];
|
|
921
|
+
const isDefaults = file === defaultsFile;
|
|
922
|
+
removed.push(...stripOwnFields(value, isDefaults
|
|
923
|
+
? ['models', 'decision_model']
|
|
924
|
+
: AGENT_TOP_REMOVED_FIELDS));
|
|
925
|
+
const baseagents = isRecord(entry.value.baseagents) ? entry.value.baseagents : undefined;
|
|
926
|
+
if (baseagents) {
|
|
927
|
+
const nextBaseagents = {};
|
|
928
|
+
for (const [name, rawBlock] of Object.entries(baseagents)) {
|
|
929
|
+
if (!isRecord(rawBlock)) {
|
|
930
|
+
nextBaseagents[name] = rawBlock;
|
|
931
|
+
continue;
|
|
932
|
+
}
|
|
933
|
+
const block = { ...rawBlock };
|
|
934
|
+
const serviceType = BASEAGENT_SERVICE_TYPES[name];
|
|
935
|
+
// Agent 级块常常只写 apiKey(端点沿用 defaults),这种情况下也要单独建 provider,
|
|
936
|
+
// 否则显式凭证会在迁移里丢失。defaults 自身同样迁移旧连接字段,
|
|
937
|
+
// 但保留 model/effort/fallback 与 runner 参数。
|
|
938
|
+
const inheritedBaseUrl = typeof defaultBlocks.get(name)?.baseUrl === 'string'
|
|
939
|
+
? defaultBlocks.get(name).baseUrl
|
|
940
|
+
: undefined;
|
|
941
|
+
const own = serviceType
|
|
942
|
+
? connectionFromBlock(block, serviceType)
|
|
943
|
+
?? (normalizeProviderSecret(block.apiKey) && inheritedBaseUrl
|
|
944
|
+
? connectionFromBlock({ ...block, baseUrl: inheritedBaseUrl }, serviceType)
|
|
945
|
+
: undefined)
|
|
946
|
+
: undefined;
|
|
947
|
+
removed.push(...stripOwnFields(block, AGENT_BASEAGENT_REMOVED_FIELDS)
|
|
948
|
+
.map(field => `baseagents.${name}.${field}`));
|
|
949
|
+
if (serviceType && block.provider === undefined) {
|
|
950
|
+
const providerId = own
|
|
951
|
+
? registerConnection(providers, own, '', summary)
|
|
952
|
+
: defaultConnections.get(name);
|
|
953
|
+
if (providerId)
|
|
954
|
+
block.provider = providerId;
|
|
955
|
+
}
|
|
956
|
+
nextBaseagents[name] = block;
|
|
957
|
+
}
|
|
958
|
+
value.baseagents = nextBaseagents;
|
|
959
|
+
}
|
|
960
|
+
// decision_model migrates into Services.decision at the same scope; do not
|
|
961
|
+
// copy defaults into every Agent because the config merge already inherits it.
|
|
962
|
+
const ownDecision = isRecord(entry.value.decision_model) ? entry.value.decision_model : undefined;
|
|
963
|
+
const decisionMigrated = ownDecision ? connectionFromDecisionModel(ownDecision) : undefined;
|
|
964
|
+
let decisionSelection;
|
|
965
|
+
if (decisionMigrated) {
|
|
966
|
+
const providerId = registerConnection(providers, decisionMigrated.connection, decisionMigrated.path, summary);
|
|
967
|
+
const model = typeof ownDecision.model === 'string' ? ownDecision.model.trim() : '';
|
|
968
|
+
decisionSelection = { provider: providerId, ...(model ? { model } : {}) };
|
|
969
|
+
summary.decisionModelsMigrated += 1;
|
|
970
|
+
}
|
|
971
|
+
if (decisionSelection) {
|
|
972
|
+
const services = isRecord(value.Services) ? { ...value.Services } : {};
|
|
973
|
+
if (!isRecord(services.decision)) {
|
|
974
|
+
value.Services = { ...services, decision: decisionSelection };
|
|
975
|
+
}
|
|
976
|
+
}
|
|
977
|
+
if (isDefaults) {
|
|
978
|
+
value.$schema_version = DEFAULTS_SCHEMA_TARGET;
|
|
979
|
+
}
|
|
980
|
+
else if (typeof value.$schema_version === 'number' && value.$schema_version < AGENT_CONFIG_SCHEMA_TARGET) {
|
|
981
|
+
// 保留 access 原始值;运行时负责缺省策略,迁移不补写会改变准入行为的默认值。
|
|
982
|
+
value.$schema_version = AGENT_CONFIG_SCHEMA_TARGET;
|
|
983
|
+
}
|
|
984
|
+
summary.gatewayFieldsRemoved += removed.length;
|
|
985
|
+
const nextText = jsonText(value);
|
|
986
|
+
if (nextText === entry.text)
|
|
987
|
+
continue;
|
|
988
|
+
changes.push({ file, kind: 'agent-only-model', before: entry.text, after: nextText });
|
|
989
|
+
details.push({ file: path.relative(home, file), removed });
|
|
990
|
+
summary.filesChanged += 1;
|
|
991
|
+
}
|
|
992
|
+
if (Object.keys(providers).length > 0) {
|
|
993
|
+
const nextText = jsonText({ $schema_version: 1, providers });
|
|
994
|
+
if (nextText !== providersBefore) {
|
|
995
|
+
changes.push({ file: providersFile, kind: 'agent-only-model', before: providersBefore, after: nextText });
|
|
996
|
+
details.push({ file: 'providers.json', removed: [] });
|
|
997
|
+
summary.filesChanged += 1;
|
|
998
|
+
}
|
|
999
|
+
}
|
|
1000
|
+
return { home, changes, summary, details };
|
|
1001
|
+
}
|
|
1002
|
+
/** Plan or apply the migration that moves gateway credentials into providers.json. */
|
|
1003
|
+
export function runAgentModelProviderSchemaMigration(options = {}) {
|
|
1004
|
+
const id = 'agent-model-provider-v1';
|
|
1005
|
+
const home = path.resolve(options.home || resolvePaths().root);
|
|
1006
|
+
const release = acquireLock(home, id);
|
|
1007
|
+
try {
|
|
1008
|
+
assertDaemonStopped(home);
|
|
1009
|
+
recoverJournal(home, id);
|
|
1010
|
+
const plan = planAgentModelProviderMigration(home);
|
|
1011
|
+
const backup = options.apply ? applyMigration(plan, id) : null;
|
|
1012
|
+
return {
|
|
1013
|
+
ok: true,
|
|
1014
|
+
mode: options.apply ? 'applied' : 'dry-run',
|
|
1015
|
+
home,
|
|
1016
|
+
changedFiles: plan.changes.length,
|
|
1017
|
+
backup,
|
|
1018
|
+
summary: plan.summary,
|
|
1019
|
+
details: plan.details,
|
|
1020
|
+
};
|
|
1021
|
+
}
|
|
1022
|
+
finally {
|
|
1023
|
+
release();
|
|
1024
|
+
}
|
|
1025
|
+
}
|
|
1026
|
+
/** Apply the model-provider migration before daemon registration. */
|
|
1027
|
+
export async function ensureAgentModelProviderMigrationOnStartup() {
|
|
1028
|
+
const home = resolvePaths().root;
|
|
1029
|
+
try {
|
|
1030
|
+
const result = runAgentModelProviderSchemaMigration({ home, apply: true });
|
|
1031
|
+
if (result.changedFiles === 0)
|
|
1032
|
+
return null;
|
|
1033
|
+
return {
|
|
1034
|
+
mode: 'applied',
|
|
1035
|
+
changedFiles: result.changedFiles,
|
|
1036
|
+
backup: result.backup,
|
|
1037
|
+
summary: result.summary,
|
|
1038
|
+
details: result.details,
|
|
1039
|
+
};
|
|
1040
|
+
}
|
|
1041
|
+
catch (error) {
|
|
1042
|
+
const detail = error instanceof Error ? error.message : String(error);
|
|
1043
|
+
throw new ConfigError('AGENT_MODEL_PROVIDER_MIGRATION_FAILED', `Automatic agent model provider migration failed: ${detail}`, { cause: error });
|
|
1044
|
+
}
|
|
1045
|
+
}
|
|
1046
|
+
function planProviderServiceTypeMigration(home) {
|
|
1047
|
+
const changes = [];
|
|
1048
|
+
const details = [];
|
|
1049
|
+
const summary = { configsScanned: 0, filesChanged: 0, fieldsRemoved: 0 };
|
|
1050
|
+
const agentsRoot = path.join(home, 'agents');
|
|
1051
|
+
if (!fs.existsSync(agentsRoot))
|
|
1052
|
+
return { home, changes, summary, details };
|
|
1053
|
+
const defaultsFile = path.join(agentsRoot, 'defaults.json');
|
|
1054
|
+
const agentFiles = fs.readdirSync(agentsRoot, { withFileTypes: true })
|
|
1055
|
+
.filter(entry => entry.isDirectory() && validAid(entry.name))
|
|
1056
|
+
.sort((left, right) => left.name.localeCompare(right.name))
|
|
1057
|
+
.map(entry => path.join(agentsRoot, entry.name, 'config.json'))
|
|
1058
|
+
.filter(file => fs.existsSync(file));
|
|
1059
|
+
for (const file of [defaultsFile, ...agentFiles]) {
|
|
1060
|
+
if (!fs.existsSync(file))
|
|
1061
|
+
continue;
|
|
1062
|
+
summary.configsScanned += 1;
|
|
1063
|
+
let parsed;
|
|
1064
|
+
try {
|
|
1065
|
+
parsed = readJson(file);
|
|
1066
|
+
}
|
|
1067
|
+
catch {
|
|
1068
|
+
continue;
|
|
1069
|
+
}
|
|
1070
|
+
if (!isRecord(parsed.value) || !isRecord(parsed.value.baseagents))
|
|
1071
|
+
continue;
|
|
1072
|
+
const value = { ...parsed.value };
|
|
1073
|
+
const baseagents = {};
|
|
1074
|
+
const removed = [];
|
|
1075
|
+
for (const [baseagent, rawBlock] of Object.entries(parsed.value.baseagents)) {
|
|
1076
|
+
if (!isRecord(rawBlock) || !hasOwn(rawBlock, 'providerServiceType')) {
|
|
1077
|
+
baseagents[baseagent] = rawBlock;
|
|
1078
|
+
continue;
|
|
1079
|
+
}
|
|
1080
|
+
const block = { ...rawBlock };
|
|
1081
|
+
delete block.providerServiceType;
|
|
1082
|
+
baseagents[baseagent] = block;
|
|
1083
|
+
removed.push(`baseagents.${baseagent}.providerServiceType`);
|
|
1084
|
+
}
|
|
1085
|
+
if (removed.length === 0)
|
|
1086
|
+
continue;
|
|
1087
|
+
value.baseagents = baseagents;
|
|
1088
|
+
changes.push({ file, kind: 'provider-service-type', before: parsed.text, after: jsonText(value) });
|
|
1089
|
+
details.push({ file: path.relative(home, file), removed });
|
|
1090
|
+
summary.filesChanged += 1;
|
|
1091
|
+
summary.fieldsRemoved += removed.length;
|
|
1092
|
+
}
|
|
1093
|
+
return { home, changes, summary, details };
|
|
1094
|
+
}
|
|
1095
|
+
export function runProviderServiceTypeSchemaMigration(options = {}) {
|
|
1096
|
+
const id = 'provider-service-type-v1';
|
|
1097
|
+
const home = path.resolve(options.home || resolvePaths().root);
|
|
1098
|
+
const release = acquireLock(home, id);
|
|
1099
|
+
try {
|
|
1100
|
+
assertDaemonStopped(home);
|
|
1101
|
+
recoverJournal(home, id);
|
|
1102
|
+
const plan = planProviderServiceTypeMigration(home);
|
|
1103
|
+
const backup = options.apply ? applyMigration(plan, id) : null;
|
|
1104
|
+
return {
|
|
1105
|
+
ok: true,
|
|
1106
|
+
mode: options.apply ? 'applied' : 'dry-run',
|
|
1107
|
+
home,
|
|
1108
|
+
changedFiles: plan.changes.length,
|
|
1109
|
+
backup,
|
|
1110
|
+
summary: plan.summary,
|
|
1111
|
+
details: plan.details,
|
|
1112
|
+
};
|
|
1113
|
+
}
|
|
1114
|
+
finally {
|
|
1115
|
+
release();
|
|
1116
|
+
}
|
|
1117
|
+
}
|
|
1118
|
+
export async function ensureProviderServiceTypeMigrationOnStartup() {
|
|
1119
|
+
const home = resolvePaths().root;
|
|
1120
|
+
try {
|
|
1121
|
+
const result = runProviderServiceTypeSchemaMigration({ home, apply: true });
|
|
1122
|
+
return result.changedFiles === 0 ? null : result;
|
|
1123
|
+
}
|
|
1124
|
+
catch (error) {
|
|
1125
|
+
const detail = error instanceof Error ? error.message : String(error);
|
|
1126
|
+
throw new ConfigError('PROVIDER_SERVICE_TYPE_MIGRATION_FAILED', `Automatic provider service type migration failed: ${detail}`, { cause: error });
|
|
1127
|
+
}
|
|
1128
|
+
}
|
|
1129
|
+
// ── 关系配置版本重打:v8/v9 → v11 ────────────────────────────────────────────
|
|
1130
|
+
/**
|
|
1131
|
+
* 关系配置在 v10/v11 只删了可选字段,schema 始终 `additionalProperties: true` 且无必填项,
|
|
1132
|
+
* 所以旧版本文件的内容本来就是合法 v11;这一步只把版本号重打到当前值,
|
|
1133
|
+
* 顺带清掉早已无人读取的 `sessionIdleSec`。
|
|
1134
|
+
*/
|
|
1135
|
+
const RELATION_CONFIG_TARGET_VERSION = 11;
|
|
1136
|
+
/** 关系配置里已无运行时读取方的遗留字段(v8 的会话闲置周期,v9 起由 sessionLoop 取代)。 */
|
|
1137
|
+
const RELATION_RETIRED_FIELDS = ['sessionIdleSec'];
|
|
1138
|
+
function restampRelationConfig(input) {
|
|
1139
|
+
const value = { ...input };
|
|
1140
|
+
const removed = stripOwnFields(value, RELATION_RETIRED_FIELDS);
|
|
1141
|
+
if (typeof value.$schema_version === 'number' && value.$schema_version < RELATION_CONFIG_TARGET_VERSION) {
|
|
1142
|
+
value.$schema_version = RELATION_CONFIG_TARGET_VERSION;
|
|
1143
|
+
}
|
|
1144
|
+
return { value, removed };
|
|
1145
|
+
}
|
|
1146
|
+
function planRelationConfigVersionMigration(home) {
|
|
1147
|
+
const changes = [];
|
|
1148
|
+
const details = [];
|
|
1149
|
+
const summary = { configsScanned: 0, filesChanged: 0, fieldsRemoved: 0 };
|
|
1150
|
+
const agentsRoot = path.join(home, 'agents');
|
|
1151
|
+
if (!fs.existsSync(agentsRoot))
|
|
1152
|
+
return { home, changes, summary, details };
|
|
1153
|
+
for (const entry of fs.readdirSync(agentsRoot, { withFileTypes: true }).sort((left, right) => left.name.localeCompare(right.name))) {
|
|
1154
|
+
if (!entry.isDirectory() || !validAid(entry.name))
|
|
1155
|
+
continue;
|
|
1156
|
+
for (const file of walkRelationConfigs(path.join(agentsRoot, entry.name, 'relations'))) {
|
|
1157
|
+
summary.configsScanned += 1;
|
|
1158
|
+
// 损坏的 JSON 保持原样,由各自的读取路径报告。
|
|
1159
|
+
let parsed;
|
|
1160
|
+
try {
|
|
1161
|
+
parsed = readJson(file);
|
|
1162
|
+
}
|
|
1163
|
+
catch {
|
|
1164
|
+
continue;
|
|
1165
|
+
}
|
|
1166
|
+
if (!isRecord(parsed.value))
|
|
1167
|
+
continue;
|
|
1168
|
+
const result = restampRelationConfig(parsed.value);
|
|
1169
|
+
const nextText = jsonText(result.value);
|
|
1170
|
+
if (nextText === parsed.text)
|
|
1171
|
+
continue;
|
|
1172
|
+
changes.push({ file, kind: 'agent-only-model', before: parsed.text, after: nextText });
|
|
1173
|
+
details.push({ file: path.relative(home, file), removed: result.removed });
|
|
1174
|
+
summary.filesChanged += 1;
|
|
1175
|
+
summary.fieldsRemoved += result.removed.length;
|
|
1176
|
+
}
|
|
1177
|
+
}
|
|
1178
|
+
return { home, changes, summary, details };
|
|
1179
|
+
}
|
|
1180
|
+
/** Plan or apply the relation-config version restamp (v8/v9 → v11). */
|
|
1181
|
+
export function runRelationConfigVersionSchemaMigration(options = {}) {
|
|
1182
|
+
const id = 'relation-config-v11-v1';
|
|
1183
|
+
const home = path.resolve(options.home || resolvePaths().root);
|
|
1184
|
+
const release = acquireLock(home, id);
|
|
1185
|
+
try {
|
|
1186
|
+
assertDaemonStopped(home);
|
|
1187
|
+
recoverJournal(home, id);
|
|
1188
|
+
const plan = planRelationConfigVersionMigration(home);
|
|
1189
|
+
const backup = options.apply ? applyMigration(plan, id) : null;
|
|
1190
|
+
return {
|
|
1191
|
+
ok: true,
|
|
1192
|
+
mode: options.apply ? 'applied' : 'dry-run',
|
|
1193
|
+
home,
|
|
1194
|
+
changedFiles: plan.changes.length,
|
|
1195
|
+
backup,
|
|
1196
|
+
summary: plan.summary,
|
|
1197
|
+
details: plan.details,
|
|
1198
|
+
};
|
|
1199
|
+
}
|
|
1200
|
+
finally {
|
|
1201
|
+
release();
|
|
1202
|
+
}
|
|
1203
|
+
}
|
|
1204
|
+
/** Apply the relation-config version migration before daemon registration. */
|
|
1205
|
+
export async function ensureRelationConfigVersionMigrationOnStartup() {
|
|
1206
|
+
const home = resolvePaths().root;
|
|
1207
|
+
try {
|
|
1208
|
+
const result = runRelationConfigVersionSchemaMigration({ home, apply: true });
|
|
1209
|
+
if (result.changedFiles === 0)
|
|
1210
|
+
return null;
|
|
1211
|
+
return {
|
|
1212
|
+
mode: 'applied',
|
|
1213
|
+
changedFiles: result.changedFiles,
|
|
1214
|
+
backup: result.backup,
|
|
1215
|
+
summary: result.summary,
|
|
1216
|
+
details: result.details,
|
|
1217
|
+
};
|
|
1218
|
+
}
|
|
1219
|
+
catch (error) {
|
|
1220
|
+
const detail = error instanceof Error ? error.message : String(error);
|
|
1221
|
+
throw new ConfigError('RELATION_CONFIG_VERSION_MIGRATION_FAILED', `Automatic relation-config version migration failed: ${detail}`, { cause: error });
|
|
1222
|
+
}
|
|
1223
|
+
}
|