@numa-tech/numa 1.26.4 → 1.26.6
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/README.md +10 -0
- package/dist/ai-registry/commands.js +42 -30
- package/dist/ai-registry/commands.js.map +1 -1
- package/dist/ai-registry/dependency-conflicts.d.ts +1 -0
- package/dist/ai-registry/dependency-conflicts.js +15 -0
- package/dist/ai-registry/dependency-conflicts.js.map +1 -0
- package/dist/ai-registry/skill-dependencies.d.ts +2 -1
- package/dist/ai-registry/skill-dependencies.js +16 -4
- package/dist/ai-registry/skill-dependencies.js.map +1 -1
- package/dist/ai-registry/update-commands.d.ts +3 -0
- package/dist/ai-registry/update-commands.js +23 -10
- package/dist/ai-registry/update-commands.js.map +1 -1
- package/dist/ai-registry/update-plan.d.ts +10 -0
- package/dist/ai-registry/update-plan.js +113 -43
- package/dist/ai-registry/update-plan.js.map +1 -1
- package/dist/ai-registry/update-report.js +23 -7
- package/dist/ai-registry/update-report.js.map +1 -1
- package/dist/ai-registry/update-scope.d.ts +11 -0
- package/dist/ai-registry/update-scope.js +41 -0
- package/dist/ai-registry/update-scope.js.map +1 -0
- package/dist/ai-registry/updates.d.ts +24 -0
- package/dist/ai-registry/updates.js +21 -12
- package/dist/ai-registry/updates.js.map +1 -1
- package/dist/interactive/entry.js +8 -3
- package/dist/interactive/entry.js.map +1 -1
- package/docs/module-maintenance-and-skills-updates.md +23 -2
- package/package.json +3 -3
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type InstallUi } from "../interactive/prompts.js";
|
|
1
2
|
import type { Command } from "commander";
|
|
2
3
|
import { createSkillUpdateProgress } from "./update-progress.js";
|
|
3
4
|
import { updateInstalledSkills } from "./updates.js";
|
|
@@ -6,6 +7,8 @@ export declare function registerSkillUpdateCommands(skills: Command, dependencie
|
|
|
6
7
|
clientFor?: Parameters<typeof updateInstalledSkills>[1];
|
|
7
8
|
directory?: string;
|
|
8
9
|
progress?: typeof createSkillUpdateProgress;
|
|
10
|
+
ui?: InstallUi;
|
|
11
|
+
tty?: boolean;
|
|
9
12
|
}): void;
|
|
10
13
|
declare function requireIdentity(): Promise<string>;
|
|
11
14
|
export {};
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { safeTerminal } from "../interactive/prompts.js";
|
|
1
|
+
import { safeTerminal, terminalUi, useInteractive } from "../interactive/prompts.js";
|
|
3
2
|
import { loadAppConfig } from "../app-config.js";
|
|
4
3
|
import { loadConfig } from "../config.js";
|
|
5
4
|
import { maintenanceIdentity } from "../maintenance/identity.js";
|
|
@@ -7,6 +6,7 @@ import { runMaintenance } from "../maintenance/scheduler.js";
|
|
|
7
6
|
import { maintenanceRegistryClient } from "../maintenance/modules.js";
|
|
8
7
|
import { createSkillUpdateProgress } from "./update-progress.js";
|
|
9
8
|
import { formatSkillUpdateReport, formatSkillUpdatePlan } from "./update-report.js";
|
|
9
|
+
import { chooseSkillUpdateScope } from "./update-scope.js";
|
|
10
10
|
import { adoptLockedUserSkills, createSkillUpdateTasks, readSkillUpdates, setSkillTracking, updateSkillPreferences, updateInstalledSkills } from "./updates.js";
|
|
11
11
|
export function registerSkillUpdateCommands(skills, dependencies = {}) {
|
|
12
12
|
skills.command("update [name]").description("一次性比较并升级已安装用户级 Skills 到已发布 latest;省略名称检查全部,不改变自动更新设置")
|
|
@@ -16,26 +16,39 @@ export function registerSkillUpdateCommands(skills, dependencies = {}) {
|
|
|
16
16
|
.option("--installation-id <id>", "只更新 skills updates status 中的指定安装")
|
|
17
17
|
.option("--plan", "只读预览完整依赖计划,不修改安装")
|
|
18
18
|
.option("--with-dependencies", "确认安装/升级计划中的同来源精确版本依赖(非交互模式)")
|
|
19
|
+
.option("--adopt-dependencies", "与 --with-dependencies 配合,确认接管内容与同来源已发布旧版本一致的未登记依赖")
|
|
20
|
+
.option("--interactive", "勾选已登记用户级 Skills,确认本次范围后更新")
|
|
21
|
+
.option("--no-interactive", "禁止交互;依赖变更需显式确认参数")
|
|
19
22
|
.addHelpText("after", "\nExamples:\n numa skills update\n numa skills update numa-cli --agent claude\n numa skills update --installation-id ID --json\n\n仅更新当前身份的受管用户级安装(包括 pinned/off);保留本地修改和备份。\n旧安装先用 skills updates adopt 接管;项目级安装使用 registry upgrade。\n")
|
|
20
23
|
.action(async (name, options, command) => {
|
|
21
24
|
const json = Boolean(command.optsWithGlobals().json || (await loadAppConfig()).output === "json");
|
|
25
|
+
const ui = dependencies.ui ?? terminalUi;
|
|
26
|
+
const interactive = useInteractive(options, false, json, dependencies.tty);
|
|
22
27
|
const identity = await (dependencies.identity ?? requireIdentity)();
|
|
28
|
+
let selection = { name, agent: options.agent, namespace: options.namespace, instance: options.instance, installationId: options.installationId };
|
|
29
|
+
if (interactive && !options.plan) {
|
|
30
|
+
const approved = await chooseSkillUpdateScope(identity, selection, ui, dependencies.directory);
|
|
31
|
+
if (!approved)
|
|
32
|
+
return;
|
|
33
|
+
selection = approved;
|
|
34
|
+
}
|
|
23
35
|
const controller = new AbortController();
|
|
24
36
|
const view = json ? undefined : (dependencies.progress ?? createSkillUpdateProgress)({
|
|
25
37
|
onCancel: () => controller.abort(new Error("Skills 更新已取消;已完成的更新与备份保留。")),
|
|
26
38
|
});
|
|
27
39
|
let result;
|
|
28
40
|
try {
|
|
29
|
-
result = await updateInstalledSkills(identity, dependencies.clientFor ?? maintenanceRegistryClient,
|
|
30
|
-
plan: options.plan, withDependencies: options.withDependencies,
|
|
31
|
-
...(
|
|
41
|
+
result = await updateInstalledSkills(identity, dependencies.clientFor ?? maintenanceRegistryClient, selection, dependencies.directory, { onProgress: view?.update, signal: controller.signal,
|
|
42
|
+
plan: options.plan, withDependencies: options.withDependencies, adoptDependencies: options.adoptDependencies,
|
|
43
|
+
...(useInteractive(options, true, json, dependencies.tty) ? { confirmDependencies: async (plan) => {
|
|
32
44
|
view?.pause?.();
|
|
33
45
|
try {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
46
|
+
ui.note(formatSkillUpdatePlan(plan), "依赖更新计划");
|
|
47
|
+
return await ui.confirm(safeTerminal(`${plan.packages.some(p => p.adopt) ? "确认接管上述旧依赖并更新" : "确认更新"} ${plan.name} 及其依赖?`));
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
controller.abort(error);
|
|
51
|
+
throw error;
|
|
39
52
|
}
|
|
40
53
|
finally {
|
|
41
54
|
view?.resume?.();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-commands.js","sourceRoot":"","sources":["../../src/ai-registry/update-commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"update-commands.js","sourceRoot":"","sources":["../../src/ai-registry/update-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,17 +14,27 @@ export interface SkillUpdatePlan {
|
|
|
14
14
|
path: string;
|
|
15
15
|
sha256: string;
|
|
16
16
|
action: "INSTALL" | "UPDATE" | "REUSE";
|
|
17
|
+
adopt?: boolean;
|
|
17
18
|
dependencies: SkillInstallNode["dependencies"];
|
|
18
19
|
backupPath?: string;
|
|
19
20
|
}>;
|
|
20
21
|
}
|
|
22
|
+
interface LegacyBaseline {
|
|
23
|
+
version: string;
|
|
24
|
+
contentDigest: string;
|
|
25
|
+
archiveSha256: string;
|
|
26
|
+
}
|
|
21
27
|
interface PreparedPlan {
|
|
22
28
|
plan: SkillUpdatePlan;
|
|
23
29
|
nodes: SkillInstallNode[];
|
|
24
30
|
records: Array<SkillUpdateRecord | undefined>;
|
|
31
|
+
legacy: Map<string, LegacyBaseline>;
|
|
32
|
+
approvedRoot?: SkillInstallNode;
|
|
25
33
|
}
|
|
26
34
|
/** Resolve a complete exact-version graph before asking for consent. No inventory or file writes. */
|
|
27
35
|
export declare function prepareSkillUpdate(record: SkillUpdateRecord, client: Client, directory?: string): Promise<PreparedPlan>;
|
|
36
|
+
/** Shared preflight for updates and install wizards, including verified legacy dependencies. */
|
|
37
|
+
export declare function prepareSkillGraph(record: SkillUpdateRecord, nodes: SkillInstallNode[], client: Client, directory?: string, approvedRoot?: SkillInstallNode): Promise<PreparedPlan>;
|
|
28
38
|
/** Commit the approved graph under the inventory lock; restore completed replacements on failure. */
|
|
29
39
|
export declare function applySkillUpdate(prepared: PreparedPlan, root: SkillUpdateRecord, directory: string | undefined, options: SkillUpdateRunOptions): Promise<SkillUpdatePlan>;
|
|
30
40
|
export {};
|
|
@@ -1,33 +1,80 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
1
|
+
import { skillDependencyConflictReasons } from "./dependency-conflicts.js";
|
|
2
|
+
import { createHash, randomUUID } from "node:crypto";
|
|
3
|
+
import { lstat, readFile, realpath, rename, rm } from "node:fs/promises";
|
|
4
|
+
import { dirname, join, resolve } from "node:path";
|
|
4
5
|
import { withTokenFileLock } from "@numa-tech/cli-auth";
|
|
5
6
|
import { stateLock, writeState } from "../maintenance/storage.js";
|
|
6
7
|
import { maintenanceKey } from "../maintenance/scheduler.js";
|
|
7
8
|
import { AiRegistryError } from "./errors.js";
|
|
8
9
|
import { resolveRegistryNamespace } from "./namespace.js";
|
|
9
|
-
import { assertConsumersCompatible, readSkillBundle, resolveSkillDependencies, reusableDependency } from "./skill-dependencies.js";
|
|
10
|
+
import { assertConsumersCompatible, readSkillBundle, resolveSkillDependencies, reusableDependency, canonicalPath, SkillBundleSchema } from "./skill-dependencies.js";
|
|
10
11
|
import { installSkillArchive, skillDirectoryDigest, skillArchiveContentDigest } from "./skill-installer.js";
|
|
11
12
|
import { publishedLatest, readSkillUpdates, updateStatePath } from "./updates.js";
|
|
12
13
|
const missing = (e) => { if (e.code !== "ENOENT")
|
|
13
14
|
throw e; return undefined; };
|
|
14
|
-
const conflict = () => new AiRegistryError("
|
|
15
|
+
const conflict = (name, path, reason, installedVersion, requiredVersion) => new AiRegistryError(`依赖 ${name}(${path}):${skillDependencyConflictReasons[reason] ?? "核验未通过,请检查安装记录和本地内容。"}`, "skills_dependency_local_conflict", undefined, undefined, { conflict: { name, path, reason, installedVersion, requiredVersion } });
|
|
16
|
+
/** Metadata is only a hint: adoption requires equality with the full published old tree. */
|
|
17
|
+
async function verifyLegacy(node, path, client, namespaceId) {
|
|
18
|
+
const fail = (reason, version) => conflict(node.name, path, reason, version, node.version);
|
|
19
|
+
const contentDigest = await skillDirectoryDigest(path);
|
|
20
|
+
const raw = await readFile(join(path, "numa-skill.json"), "utf8").catch(missing);
|
|
21
|
+
if (!raw)
|
|
22
|
+
throw fail("legacy_manifest_missing");
|
|
23
|
+
let parsed;
|
|
24
|
+
try {
|
|
25
|
+
parsed = SkillBundleSchema.safeParse(JSON.parse(raw));
|
|
26
|
+
}
|
|
27
|
+
catch {
|
|
28
|
+
throw fail("legacy_manifest_invalid");
|
|
29
|
+
}
|
|
30
|
+
if (!parsed.success || parsed.data.name !== node.name)
|
|
31
|
+
throw fail("legacy_manifest_invalid");
|
|
32
|
+
const version = parsed.data.version;
|
|
33
|
+
let download = node.download;
|
|
34
|
+
if (version !== node.version) {
|
|
35
|
+
const detail = await client.getSkill(namespaceId, node.name);
|
|
36
|
+
if (detail.name !== node.name || detail.enable === false || !Array.isArray(detail.versions)
|
|
37
|
+
|| !detail.versions.some(v => v && typeof v === "object" && v.version === version && v.status === "online")) {
|
|
38
|
+
throw fail("legacy_version_unpublished", version);
|
|
39
|
+
}
|
|
40
|
+
download = await client.downloadSkill(namespaceId, node.name, { version });
|
|
41
|
+
}
|
|
42
|
+
if (download.version && download.version !== version || createHash("sha256").update(download.bytes).digest("hex") !== download.sha256) {
|
|
43
|
+
throw fail("legacy_integrity_failed", version);
|
|
44
|
+
}
|
|
45
|
+
await readSkillBundle(download.bytes, { name: node.name, version });
|
|
46
|
+
if (await skillArchiveContentDigest(download.bytes) !== contentDigest)
|
|
47
|
+
throw fail("legacy_content_mismatch", version);
|
|
48
|
+
return { version, contentDigest, archiveSha256: download.sha256 };
|
|
49
|
+
}
|
|
15
50
|
/** Resolve a complete exact-version graph before asking for consent. No inventory or file writes. */
|
|
16
51
|
export async function prepareSkillUpdate(record, client, directory) {
|
|
17
52
|
if (await skillDirectoryDigest(record.path) !== record.contentDigest)
|
|
18
|
-
throw conflict();
|
|
53
|
+
throw conflict(record.name, record.path, "local_changes", record.version);
|
|
19
54
|
const context = await resolveRegistryNamespace(client, { namespace: record.namespace, instance: record.instance, requiredAction: "install" });
|
|
20
55
|
if (context.namespace.id !== record.namespaceId || context.namespace.instanceId !== record.instanceId) {
|
|
21
56
|
throw new AiRegistryError("Namespace binding changed.", "skills_update_source_changed");
|
|
22
57
|
}
|
|
23
58
|
const version = publishedLatest(await client.getSkill(record.namespaceId, record.name), record.name);
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
59
|
+
try {
|
|
60
|
+
const download = await client.downloadSkill(record.namespaceId, record.name, { version });
|
|
61
|
+
const bundle = await readSkillBundle(download.bytes, { name: record.name, version });
|
|
62
|
+
const nodes = await resolveSkillDependencies(client, record.namespaceId, { name: record.name, version, download, dependencies: bundle?.dependencies ?? [] });
|
|
63
|
+
return await prepareSkillGraph(record, nodes, client, directory);
|
|
64
|
+
}
|
|
65
|
+
catch (error) {
|
|
66
|
+
if (error instanceof AiRegistryError)
|
|
67
|
+
throw new AiRegistryError(error.message, error.code, error.status, error.requestId, { ...(error.details && typeof error.details === "object" ? error.details : {}), latestVersion: version });
|
|
68
|
+
throw error;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
/** Shared preflight for updates and install wizards, including verified legacy dependencies. */
|
|
72
|
+
export async function prepareSkillGraph(record, nodes, client, directory, approvedRoot) {
|
|
27
73
|
const state = await readSkillUpdates(directory);
|
|
28
|
-
const root = await
|
|
74
|
+
const root = await canonicalPath(dirname(record.path));
|
|
29
75
|
const plan = { name: record.name, agent: record.agent, namespace: record.namespace, instance: record.instance, packages: [] };
|
|
30
76
|
const records = [];
|
|
77
|
+
const legacy = new Map();
|
|
31
78
|
for (const node of nodes) {
|
|
32
79
|
const path = join(root, node.name);
|
|
33
80
|
const info = await lstat(path).catch(missing);
|
|
@@ -36,17 +83,30 @@ export async function prepareSkillUpdate(record, client, directory) {
|
|
|
36
83
|
if ((await realpath(r.path).catch(missing) ?? r.path) === path)
|
|
37
84
|
candidates.push(r);
|
|
38
85
|
const old = candidates[0];
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
86
|
+
const fail = (reason) => conflict(node.name, path, reason, old?.version, node.version);
|
|
87
|
+
if (info && (!info.isDirectory() || info.isSymbolicLink()))
|
|
88
|
+
throw fail("invalid_directory");
|
|
89
|
+
if (candidates.length > 1)
|
|
90
|
+
throw fail("ambiguous_inventory");
|
|
91
|
+
if (!info && old)
|
|
92
|
+
throw fail("directory_missing");
|
|
93
|
+
if (old) {
|
|
94
|
+
if (old.identity !== record.identity)
|
|
95
|
+
throw fail("identity_mismatch");
|
|
96
|
+
if (old.scope !== record.scope || old.name !== node.name || old.namespace !== record.namespace || old.instance !== record.instance
|
|
97
|
+
|| old.namespaceId !== record.namespaceId || old.instanceId !== record.instanceId)
|
|
98
|
+
throw fail("source_mismatch");
|
|
99
|
+
if (await skillDirectoryDigest(path) !== old.contentDigest)
|
|
100
|
+
throw fail("local_changes");
|
|
101
|
+
}
|
|
45
102
|
if (node.name === record.name && (!old || old.id !== record.id || old.updatedAt !== record.updatedAt))
|
|
46
|
-
throw
|
|
47
|
-
if (
|
|
103
|
+
throw fail("inventory_changed");
|
|
104
|
+
if (info && !old)
|
|
105
|
+
legacy.set(path, await verifyLegacy(node, path, client, record.namespaceId));
|
|
106
|
+
const baseline = old ?? legacy.get(path);
|
|
107
|
+
if (baseline && node.version !== baseline.version) {
|
|
48
108
|
const parts = (v) => /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/.test(v) ? v.split(".").map(Number) : undefined;
|
|
49
|
-
const a = parts(node.version), b = parts(
|
|
109
|
+
const a = parts(node.version), b = parts(baseline.version);
|
|
50
110
|
const i = a?.findIndex((n, i) => n !== b?.[i]);
|
|
51
111
|
if (!a || !b || i === undefined || i < 0 || a[i] < b[i])
|
|
52
112
|
throw new AiRegistryError("Dependency downgrade blocked.", "skills_update_downgrade_blocked");
|
|
@@ -56,20 +116,23 @@ export async function prepareSkillUpdate(record, client, directory) {
|
|
|
56
116
|
// Validate every archive before any live directory is replaced, including root.
|
|
57
117
|
await skillArchiveContentDigest(node.download.bytes);
|
|
58
118
|
records.push(old);
|
|
59
|
-
plan.packages.push({ name: node.name, ...(
|
|
60
|
-
sha256: node.download.sha256,
|
|
119
|
+
plan.packages.push({ name: node.name, ...(baseline ? { from: baseline.version } : {}), version: node.version, path,
|
|
120
|
+
sha256: node.download.sha256, ...(legacy.has(path) ? { adopt: true } : {}),
|
|
121
|
+
action: !baseline ? "INSTALL" : baseline.version === node.version ? "REUSE" : "UPDATE", dependencies: node.dependencies });
|
|
61
122
|
}
|
|
62
|
-
await validateConsumers(plan, directory);
|
|
63
|
-
return { plan, nodes, records };
|
|
123
|
+
await validateConsumers(plan, directory, approvedRoot);
|
|
124
|
+
return { plan, nodes, records, legacy, approvedRoot };
|
|
64
125
|
}
|
|
65
|
-
async function validateConsumers(plan, directory) {
|
|
126
|
+
async function validateConsumers(plan, directory, approvedRoot) {
|
|
66
127
|
const approved = new Map(plan.packages.map(p => [p.path, p.dependencies]));
|
|
128
|
+
if (approvedRoot && plan.packages.length)
|
|
129
|
+
approved.set(join(dirname(plan.packages[0].path), approvedRoot.name), approvedRoot.dependencies);
|
|
67
130
|
for (const p of plan.packages)
|
|
68
|
-
await assertConsumersCompatible(p.name, p.version, p.path, directory, approved);
|
|
131
|
+
await assertConsumersCompatible(p.name, p.version, p.path, directory, approved, plan.packages.some(item => item.adopt));
|
|
69
132
|
}
|
|
70
133
|
/** Commit the approved graph under the inventory lock; restore completed replacements on failure. */
|
|
71
134
|
export async function applySkillUpdate(prepared, root, directory, options) {
|
|
72
|
-
const { plan, nodes, records } = prepared;
|
|
135
|
+
const { plan, nodes, records, legacy, approvedRoot } = prepared;
|
|
73
136
|
return stateLock(updateStatePath(directory), async () => {
|
|
74
137
|
options.signal?.throwIfAborted();
|
|
75
138
|
const state = await readSkillUpdates(directory);
|
|
@@ -77,29 +140,36 @@ export async function applySkillUpdate(prepared, root, directory, options) {
|
|
|
77
140
|
const p = plan.packages[i], before = records[i];
|
|
78
141
|
const now = state.installations.find(r => r.path === p.path);
|
|
79
142
|
if (JSON.stringify(now) !== JSON.stringify(before))
|
|
80
|
-
throw conflict();
|
|
143
|
+
throw conflict(p.name, p.path, "inventory_changed", p.from, p.version);
|
|
81
144
|
const info = await lstat(p.path).catch(missing);
|
|
82
|
-
|
|
83
|
-
|
|
145
|
+
const baseline = before ?? legacy.get(p.path);
|
|
146
|
+
if (baseline ? !info || await skillDirectoryDigest(p.path) !== baseline.contentDigest : Boolean(info)) {
|
|
147
|
+
throw conflict(p.name, p.path, "local_changes", p.from, p.version);
|
|
148
|
+
}
|
|
84
149
|
}
|
|
85
|
-
await validateConsumers(plan, directory);
|
|
150
|
+
await validateConsumers(plan, directory, approvedRoot);
|
|
86
151
|
const done = [];
|
|
87
152
|
try {
|
|
88
153
|
for (let i = 0; i < nodes.length; i++) {
|
|
89
154
|
options.signal?.throwIfAborted();
|
|
90
155
|
const node = nodes[i], p = plan.packages[i], before = records[i];
|
|
91
|
-
if (p.action === "REUSE")
|
|
156
|
+
if (p.action === "REUSE" && !p.adopt)
|
|
92
157
|
continue;
|
|
93
|
-
const
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
158
|
+
const baseline = before ?? legacy.get(p.path);
|
|
159
|
+
const result = p.action === "REUSE"
|
|
160
|
+
? { agent: root.agent, scope: root.scope, skillName: node.name, installedPath: p.path, files: 0, expandedBytes: 0, contentDigest: baseline.contentDigest }
|
|
161
|
+
: await installSkillArchive(node.download.bytes, { ...root, skillName: node.name,
|
|
162
|
+
force: Boolean(baseline), maintenanceBackup: true, dependencyPlanVerified: true,
|
|
163
|
+
expectedInstalledPath: p.path, expectedInstalledDigest: baseline?.contentDigest,
|
|
164
|
+
onProgress: stage => { try {
|
|
165
|
+
options.onProgress?.({ type: "stage", installation: { ...root, name: node.name, version: baseline?.version ?? "未安装" }, stage, latestVersion: node.version });
|
|
166
|
+
}
|
|
167
|
+
catch { /* UI is best effort. */ } } });
|
|
168
|
+
if (p.action !== "REUSE")
|
|
169
|
+
done.push({ result, index: i });
|
|
101
170
|
const updated = { ...(before ?? root), id: before?.id ?? maintenanceKey([root.identity, root.namespace, root.instance, p.path]),
|
|
102
|
-
name: node.name, path: p.path,
|
|
171
|
+
name: node.name, path: p.path, customRoot: root.agent === "custom" ? dirname(p.path) : root.customRoot,
|
|
172
|
+
...(root.workspace ? { workspace: resolve(root.workspace) } : {}), version: node.version, archiveSha256: node.download.sha256,
|
|
103
173
|
contentDigest: result.contentDigest, policy: before?.policy ?? "pinned", backupPath: result.backupPath,
|
|
104
174
|
updatedAt: Date.now(), lastStatus: "skills_updated_reload_agent" };
|
|
105
175
|
state.installations = state.installations.filter(r => r.path !== p.path);
|
|
@@ -110,10 +180,10 @@ export async function applySkillUpdate(prepared, root, directory, options) {
|
|
|
110
180
|
for (const p of plan.packages) {
|
|
111
181
|
const r = state.installations.find(r => r.path === p.path);
|
|
112
182
|
if (await skillDirectoryDigest(p.path) !== r.contentDigest)
|
|
113
|
-
throw conflict();
|
|
183
|
+
throw conflict(p.name, p.path, "local_changes", p.from, p.version);
|
|
114
184
|
}
|
|
115
185
|
options.signal?.throwIfAborted();
|
|
116
|
-
await validateConsumers(plan, directory);
|
|
186
|
+
await validateConsumers(plan, directory, approvedRoot);
|
|
117
187
|
await writeState(updateStatePath(directory), state);
|
|
118
188
|
return plan;
|
|
119
189
|
}
|
|
@@ -123,7 +193,7 @@ export async function applySkillUpdate(prepared, root, directory, options) {
|
|
|
123
193
|
try {
|
|
124
194
|
await withTokenFileLock(join(dirname(result.installedPath), `.numa-install-${result.skillName}`), async () => {
|
|
125
195
|
if (await skillDirectoryDigest(result.installedPath) !== result.contentDigest)
|
|
126
|
-
throw conflict();
|
|
196
|
+
throw conflict(result.skillName, result.installedPath, "local_changes");
|
|
127
197
|
const discard = join(dirname(result.installedPath), `.numa-stage-rollback-${randomUUID()}`);
|
|
128
198
|
await rename(result.installedPath, discard);
|
|
129
199
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-plan.js","sourceRoot":"","sources":["../../src/ai-registry/update-plan.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"update-plan.js","sourceRoot":"","sources":["../../src/ai-registry/update-plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { skillDependencyConflictReasons } from "./dependency-conflicts.js";
|
|
1
2
|
import { safeTerminal } from "../interactive/prompts.js";
|
|
2
3
|
export function skillUpdateStatusLabel(status) {
|
|
3
4
|
return { UPDATED: "已更新", CURRENT: "无需更新", NEEDS_CONFIRMATION: "待确认依赖", PLANNED: "仅预览", FAILED: "失败" }[status];
|
|
@@ -8,6 +9,7 @@ export function skillUpdateSummary(items) {
|
|
|
8
9
|
}
|
|
9
10
|
const reasons = {
|
|
10
11
|
skills_dependency_confirmation_required: "新版依赖声明有变更,需确认依赖计划;本次未更新。",
|
|
12
|
+
skills_dependency_adoption_required: "发现内容已核验但未登记的旧依赖;需确认接管后继续更新。",
|
|
11
13
|
skills_dependency_unpublished: "计划要求的依赖精确版本尚未发布,请核对仓库中的依赖版本。",
|
|
12
14
|
skills_dependency_integrity_failed: "依赖下载版本或摘要校验未通过,安装已保留。",
|
|
13
15
|
skills_dependency_version_conflict: "其他已安装 Skill 固定了旧依赖版本,需协调依赖版本后再更新。",
|
|
@@ -22,6 +24,13 @@ const reasons = {
|
|
|
22
24
|
skills_update_restore_failed: "更新中断且部分目录无法恢复;请保留备份,使用 --json 查看 recovery 路径。",
|
|
23
25
|
skills_update_inventory_changed: "安装记录在更新期间发生变化,请重新执行更新。",
|
|
24
26
|
};
|
|
27
|
+
function dependencyConflict(item) {
|
|
28
|
+
const value = item.details?.conflict;
|
|
29
|
+
return value && typeof value.name === "string" && typeof value.path === "string" && typeof value.reason === "string"
|
|
30
|
+
? { name: value.name, path: value.path, reason: value.reason,
|
|
31
|
+
installedVersion: typeof value.installedVersion === "string" ? value.installedVersion : undefined,
|
|
32
|
+
requiredVersion: typeof value.requiredVersion === "string" ? value.requiredVersion : undefined } : undefined;
|
|
33
|
+
}
|
|
25
34
|
/** One final report; paths and diagnostic codes are kept out of successful no-op rows. */
|
|
26
35
|
export function formatSkillUpdateReport(items, options = {}) {
|
|
27
36
|
if (!items.length)
|
|
@@ -41,7 +50,11 @@ export function formatSkillUpdateReport(items, options = {}) {
|
|
|
41
50
|
lines.push(`${row[0]} (${row[1]}) · ${row[4]}`, ` 更新前 ${row[2]} · latest ${row[3]}`);
|
|
42
51
|
}
|
|
43
52
|
for (const item of items.filter(item => item.status === "NEEDS_CONFIRMATION" || item.status === "FAILED")) {
|
|
44
|
-
|
|
53
|
+
const conflict = dependencyConflict(item);
|
|
54
|
+
lines.push("", safeTerminal(`${item.name} (${item.agent}) · ${skillUpdateStatusLabel(item.status)}`), ` ${conflict ? skillDependencyConflictReasons[conflict.reason] ?? reasons[item.code] ?? "依赖核验未通过;使用 --json 查看详情。" : reasons[item.code] ?? "更新未完成;使用 --json 查看错误详情。"}`);
|
|
55
|
+
if (conflict) {
|
|
56
|
+
lines.push(safeTerminal(` 冲突 Skill:${conflict.name}${conflict.installedVersion ? ` · 现有 ${conflict.installedVersion}` : ""}${conflict.requiredVersion ? ` · 要求 ${conflict.requiredVersion}` : ""}`), safeTerminal(` 目录:${conflict.path}`));
|
|
57
|
+
}
|
|
45
58
|
for (const change of item.dependencyChanges ?? []) {
|
|
46
59
|
const detail = !change.from ? `新增 ${change.name}@${change.to}` : !change.to ? `移除 ${change.name}@${change.from}`
|
|
47
60
|
: `${change.name}: ${change.from} → ${change.to}`;
|
|
@@ -50,17 +63,20 @@ export function formatSkillUpdateReport(items, options = {}) {
|
|
|
50
63
|
if (item.planCommand) {
|
|
51
64
|
lines.push(" 查看计划(只读):", ` ${safeTerminal(item.planCommand)}`);
|
|
52
65
|
if (item.status === "NEEDS_CONFIRMATION")
|
|
53
|
-
lines.push(" 确认后执行(终端直接重试会询问):", ` ${safeTerminal(item.planCommand.replace(/ --plan$/,
|
|
66
|
+
lines.push(" 确认后执行(终端直接重试会询问):", ` ${safeTerminal(item.planCommand.replace(/ --plan$/, ` --with-dependencies${item.plan?.packages.some(p => p.adopt) ? " --adopt-dependencies" : ""}`))}`);
|
|
54
67
|
}
|
|
55
68
|
if (options.debug)
|
|
56
69
|
lines.push(` 错误码:${safeTerminal(item.code)}`, ` 路径:${safeTerminal(item.path)}`);
|
|
57
70
|
}
|
|
58
71
|
for (const item of items) {
|
|
59
|
-
if (item.plan && item.status === "PLANNED")
|
|
72
|
+
if (item.plan && (item.status === "PLANNED" || item.status === "NEEDS_CONFIRMATION"))
|
|
60
73
|
lines.push("", formatSkillUpdatePlan(item.plan).trimEnd());
|
|
61
74
|
if (item.plan && item.status === "UPDATED") {
|
|
62
|
-
|
|
63
|
-
|
|
75
|
+
const changedDependencies = item.plan.packages.filter(p => p.name !== item.name && (p.action !== "REUSE" || p.adopt));
|
|
76
|
+
if (changedDependencies.length)
|
|
77
|
+
lines.push("", safeTerminal(`${item.name} (${item.agent}) · 依赖结果`));
|
|
78
|
+
for (const p of changedDependencies) {
|
|
79
|
+
lines.push(` 依赖${p.adopt ? p.action === "REUSE" ? "已接管" : "已接管并更新" : p.action === "INSTALL" ? "已安装" : "已更新"}:${safeTerminal(p.name)} ${p.from ?? "未安装"} → ${p.version}`);
|
|
64
80
|
if (p.backupPath)
|
|
65
81
|
lines.push(` 备份:${safeTerminal(p.backupPath)}`);
|
|
66
82
|
}
|
|
@@ -76,7 +92,7 @@ export function formatSkillUpdateReport(items, options = {}) {
|
|
|
76
92
|
export function formatSkillUpdatePlan(plan) {
|
|
77
93
|
const labels = { INSTALL: "安装", UPDATE: "升级", REUSE: "复用" };
|
|
78
94
|
return [safeTerminal(`依赖更新计划 · ${plan.name} (${plan.agent}) · ${plan.namespace} / ${plan.instance}`),
|
|
79
|
-
...plan.packages.flatMap(p => [safeTerminal(` ${labels[p.action]} ${p.name} ${p.from ?? "未安装"} → ${p.version}`),
|
|
80
|
-
safeTerminal(` ${p.path}`)]), ""].join("\n");
|
|
95
|
+
...plan.packages.flatMap(p => [safeTerminal(` ${p.adopt ? p.action === "REUSE" ? "接管并复用" : "接管并升级" : labels[p.action]} ${p.name} ${p.from ?? "未安装"} → ${p.version}`),
|
|
96
|
+
safeTerminal(` ${p.path}`), ...(p.adopt ? [" 未登记的旧安装;内容已与同来源发布的旧版本核验一致"] : [])]), ""].join("\n");
|
|
81
97
|
}
|
|
82
98
|
//# sourceMappingURL=update-report.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-report.js","sourceRoot":"","sources":["../../src/ai-registry/update-report.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"update-report.js","sourceRoot":"","sources":["../../src/ai-registry/update-report.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { type InstallUi } from "../interactive/prompts.js";
|
|
2
|
+
import { type SkillUpdateSelection } from "./updates.js";
|
|
3
|
+
/** Local-only scope approval. Registry reads and installation writes start after confirmation. */
|
|
4
|
+
export declare function chooseSkillUpdateScope(identity: string, selection: SkillUpdateSelection, ui: InstallUi, directory?: string): Promise<{
|
|
5
|
+
name?: string;
|
|
6
|
+
agent?: string;
|
|
7
|
+
namespace?: string;
|
|
8
|
+
instance?: string;
|
|
9
|
+
installationId?: string;
|
|
10
|
+
installationIds: string[];
|
|
11
|
+
} | undefined>;
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { safeTerminal } from "../interactive/prompts.js";
|
|
2
|
+
import { AiRegistryError } from "./errors.js";
|
|
3
|
+
import { readSkillUpdates, selectSkillUpdateRecords } from "./updates.js";
|
|
4
|
+
/** Local-only scope approval. Registry reads and installation writes start after confirmation. */
|
|
5
|
+
export async function chooseSkillUpdateScope(identity, selection, ui, directory) {
|
|
6
|
+
const state = await readSkillUpdates(directory);
|
|
7
|
+
const records = selectSkillUpdateRecords(state.installations, identity, selection)
|
|
8
|
+
.sort((a, b) => a.agent.localeCompare(b.agent) || a.name.localeCompare(b.name) || a.path.localeCompare(b.path));
|
|
9
|
+
const projects = state.installations.filter(r => r.identity === identity && r.scope === "project").length;
|
|
10
|
+
ui.note([
|
|
11
|
+
`当前筛选范围:${records.length} 项已登记的用户级安装。`,
|
|
12
|
+
"按安装记录中的客户端、来源和目录更新;同名 Skill 在不同客户端分别列出。",
|
|
13
|
+
"未登记的旧安装、其他工具安装的 Skills 不在此范围;可用 skills updates adopt --workspace 原安装项目 核对旧安装。",
|
|
14
|
+
...(projects ? [`另有 ${projects} 项项目级安装,使用 registry upgrade 更新。`] : []),
|
|
15
|
+
"本次比较并更新到已发布 latest;保留原自动更新设置。",
|
|
16
|
+
].join("\n"), "更新范围说明");
|
|
17
|
+
if (!records.length)
|
|
18
|
+
return undefined;
|
|
19
|
+
const ids = await ui.multiple("选择本次检查并更新的 Skills(输入搜索;Tab 勾选)", records.map(r => ({
|
|
20
|
+
value: r.id, label: safeTerminal(`${r.name} · ${r.agent} · ${r.version}`),
|
|
21
|
+
hint: safeTerminal(`${r.instance} / ${r.namespace} · ${r.path}`),
|
|
22
|
+
})), records.map(r => r.id));
|
|
23
|
+
if (ids.some(id => !records.some(r => r.id === id)))
|
|
24
|
+
throw new AiRegistryError("更新范围已变化,请重新选择。", "skills_update_selection_invalid");
|
|
25
|
+
const selected = records.filter(r => ids.includes(r.id));
|
|
26
|
+
if (!selected.length) {
|
|
27
|
+
ui.note("未选择 Skill,未执行更新。", "已取消");
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
30
|
+
ui.note(selected.map(r => [
|
|
31
|
+
safeTerminal(`${r.name} · ${r.agent} · ${r.version} → latest`),
|
|
32
|
+
safeTerminal(` ${r.instance} / ${r.namespace} · 用户范围`),
|
|
33
|
+
safeTerminal(` ${r.path}`),
|
|
34
|
+
].join("\n")).join("\n\n") + "\n\n依赖需要新增、升级或接管时,将另行展示精确版本计划供确认。", "本次更新范围");
|
|
35
|
+
if (!await ui.confirm(`确认检查并更新以上 ${selected.length} 项 Skill?`)) {
|
|
36
|
+
ui.note("已取消,未执行更新。", "Skills");
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
return { ...selection, installationIds: selected.map(r => r.id) };
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=update-scope.js.map
|