惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com
爱范儿
爱范儿
H
Help Net Security
V
Visual Studio Blog
J
Java Code Geeks
Stack Overflow Blog
Stack Overflow Blog
Microsoft Security Blog
Microsoft Security Blog
Apple Machine Learning Research
Apple Machine Learning Research
MyScale Blog
MyScale Blog
The Cloudflare Blog
Martin Fowler
Martin Fowler
D
Docker
腾讯CDC
F
Fortinet All Blogs
雷峰网
雷峰网
GbyAI
GbyAI
G
Google Developers Blog
Cyber Security Advisories - MS-ISAC
Cyber Security Advisories - MS-ISAC
Recent Announcements
Recent Announcements
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
Blog — PlanetScale
Blog — PlanetScale
Engineering at Meta
Engineering at Meta
博客园 - 聂微东
博客园 - 叶小钗

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
refactor: dedupe migrate selection helpers · openclaw/ope...
vincentkoc · 2026-05-29 · via Recent Commits to openclaw:main

@@ -71,12 +71,13 @@ function formatSelectionRefList(values: readonly string[]): string {

7171

return values.map((value) => `"${value}"`).join(", ");

7272

}

737374-

function buildSkillSelectionIndex(

74+

function buildSelectionIndex(

7575

items: readonly MigrationItem[],

76+

refsForItem: (item: MigrationItem) => readonly string[],

7677

): Map<string, ReadonlySet<string>> {

7778

const index = new Map<string, Set<string>>();

7879

for (const item of items) {

79-

for (const ref of migrationSkillRefs(item)) {

80+

for (const ref of refsForItem(item)) {

8081

const normalized = normalizeSelectionRef(ref);

8182

if (!normalized) {

8283

continue;

@@ -89,33 +90,19 @@ function buildSkillSelectionIndex(

8990

return index;

9091

}

919292-

function buildPluginSelectionIndex(

93-

items: readonly MigrationItem[],

94-

): Map<string, ReadonlySet<string>> {

95-

const index = new Map<string, Set<string>>();

96-

for (const item of items) {

97-

for (const ref of migrationPluginRefs(item)) {

98-

const normalized = normalizeSelectionRef(ref);

99-

if (!normalized) {

100-

continue;

101-

}

102-

const existing = index.get(normalized) ?? new Set<string>();

103-

existing.add(item.id);

104-

index.set(normalized, existing);

105-

}

106-

}

107-

return index;

108-

}

109-110-

function resolveSelectedSkillItemIds(

111-

items: readonly MigrationItem[],

112-

selectedRefs: readonly string[],

113-

): Set<string> {

114-

const index = buildSkillSelectionIndex(items);

93+

function resolveSelectedMigrationItemIds(params: {

94+

items: readonly MigrationItem[];

95+

selectedRefs: readonly string[];

96+

refsForItem: (item: MigrationItem) => readonly string[];

97+

formatSelectionLabel: (item: MigrationItem) => string;

98+

kindLabel: "skill" | "plugin";

99+

availableLabel: "skills" | "plugins";

100+

}): Set<string> {

101+

const index = buildSelectionIndex(params.items, params.refsForItem);

115102

const selectedIds = new Set<string>();

116103

const unknownRefs: string[] = [];

117104

const ambiguousRefs: string[] = [];

118-

for (const ref of selectedRefs) {

105+

for (const ref of params.selectedRefs) {

119106

const normalized = normalizeSelectionRef(ref);

120107

if (!normalized) {

121108

continue;

@@ -136,67 +123,54 @@ function resolveSelectedSkillItemIds(

136123

}

137124138125

if (unknownRefs.length > 0 || ambiguousRefs.length > 0) {

139-

const available = items

140-

.map(formatMigrationSkillSelectionLabel)

126+

const available = params.items

127+

.map(params.formatSelectionLabel)

141128

.toSorted((a, b) => a.localeCompare(b));

129+

const titleKind = params.kindLabel[0].toUpperCase() + params.kindLabel.slice(1);

142130

const parts: string[] = [];

143131

if (unknownRefs.length > 0) {

144-

parts.push(`No migratable skill matched ${formatSelectionRefList(unknownRefs)}.`);

132+

parts.push(

133+

`No migratable ${params.kindLabel} matched ${formatSelectionRefList(unknownRefs)}.`,

134+

);

145135

}

146136

if (ambiguousRefs.length > 0) {

147-

parts.push(`Skill selection ${formatSelectionRefList(ambiguousRefs)} was ambiguous.`);

137+

parts.push(`${titleKind} selection ${formatSelectionRefList(ambiguousRefs)} was ambiguous.`);

148138

}

149-

parts.push(`Available skills: ${available.length > 0 ? available.join(", ") : "none"}.`);

139+

parts.push(

140+

`Available ${params.availableLabel}: ${available.length > 0 ? available.join(", ") : "none"}.`,

141+

);

150142

throw new Error(parts.join(" "));

151143

}

152144153145

return selectedIds;

154146

}

155147156-

function resolveSelectedPluginItemIds(

148+

function resolveSelectedSkillItemIds(

157149

items: readonly MigrationItem[],

158150

selectedRefs: readonly string[],

159151

): Set<string> {

160-

const index = buildPluginSelectionIndex(items);

161-

const selectedIds = new Set<string>();

162-

const unknownRefs: string[] = [];

163-

const ambiguousRefs: string[] = [];

164-

for (const ref of selectedRefs) {

165-

const normalized = normalizeSelectionRef(ref);

166-

if (!normalized) {

167-

continue;

168-

}

169-

const matches = index.get(normalized);

170-

if (!matches) {

171-

unknownRefs.push(ref);

172-

continue;

173-

}

174-

if (matches.size > 1) {

175-

ambiguousRefs.push(ref);

176-

continue;

177-

}

178-

const [id] = matches;

179-

if (id) {

180-

selectedIds.add(id);

181-

}

182-

}

183-184-

if (unknownRefs.length > 0 || ambiguousRefs.length > 0) {

185-

const available = items

186-

.map(formatMigrationPluginSelectionLabel)

187-

.toSorted((a, b) => a.localeCompare(b));

188-

const parts: string[] = [];

189-

if (unknownRefs.length > 0) {

190-

parts.push(`No migratable plugin matched ${formatSelectionRefList(unknownRefs)}.`);

191-

}

192-

if (ambiguousRefs.length > 0) {

193-

parts.push(`Plugin selection ${formatSelectionRefList(ambiguousRefs)} was ambiguous.`);

194-

}

195-

parts.push(`Available plugins: ${available.length > 0 ? available.join(", ") : "none"}.`);

196-

throw new Error(parts.join(" "));

197-

}

152+

return resolveSelectedMigrationItemIds({

153+

items,

154+

selectedRefs,

155+

refsForItem: migrationSkillRefs,

156+

formatSelectionLabel: formatMigrationSkillSelectionLabel,

157+

kindLabel: "skill",

158+

availableLabel: "skills",

159+

});

160+

}

198161199-

return selectedIds;

162+

function resolveSelectedPluginItemIds(

163+

items: readonly MigrationItem[],

164+

selectedRefs: readonly string[],

165+

): Set<string> {

166+

return resolveSelectedMigrationItemIds({

167+

items,

168+

selectedRefs,

169+

refsForItem: migrationPluginRefs,

170+

formatSelectionLabel: formatMigrationPluginSelectionLabel,

171+

kindLabel: "plugin",

172+

availableLabel: "plugins",

173+

});

200174

}

201175202176

export function getSelectableMigrationSkillItems(plan: MigrationPlan): MigrationItem[] {

@@ -427,6 +401,29 @@ function resolveInteractiveMigrationSelection(

427401

};

428402

}

429403404+

function isMigrationSelectionToggleValue(value: string): boolean {

405+

return (

406+

value === MIGRATION_SELECTION_TOGGLE_ALL_ON || value === MIGRATION_SELECTION_TOGGLE_ALL_OFF

407+

);

408+

}

409+410+

function selectedMigrationItemValues(selectedValues: readonly string[]): string[] {

411+

return selectedValues.filter((value) => !isMigrationSelectionToggleValue(value));

412+

}

413+414+

function resolveMigrationSelectionBulkToggleValues(

415+

activatedValue: string | undefined,

416+

selectableValues: readonly string[],

417+

): string[] | undefined {

418+

if (activatedValue === MIGRATION_SELECTION_TOGGLE_ALL_ON) {

419+

return [MIGRATION_SELECTION_TOGGLE_ALL_ON, ...selectableValues];

420+

}

421+

if (activatedValue === MIGRATION_SELECTION_TOGGLE_ALL_OFF) {

422+

return [MIGRATION_SELECTION_TOGGLE_ALL_OFF];

423+

}

424+

return undefined;

425+

}

426+430427

export function resolveInteractiveMigrationSkillSelection(

431428

items: readonly MigrationItem[],

432429

selectedValues: readonly string[],

@@ -454,17 +451,12 @@ export function reconcileInteractiveMigrationSkillToggleValues(

454451

activatedValue: string | undefined,

455452

selectableValues: readonly string[],

456453

): string[] {

457-

if (activatedValue === MIGRATION_SELECTION_TOGGLE_ALL_ON) {

458-

return [MIGRATION_SELECTION_TOGGLE_ALL_ON, ...selectableValues];

459-

}

460-

if (activatedValue === MIGRATION_SELECTION_TOGGLE_ALL_OFF) {

461-

return [MIGRATION_SELECTION_TOGGLE_ALL_OFF];

454+

const bulkValues = resolveMigrationSelectionBulkToggleValues(activatedValue, selectableValues);

455+

if (bulkValues !== undefined) {

456+

return bulkValues;

462457

}

463458

if (activatedValue !== undefined && selectableValues.includes(activatedValue)) {

464-

return selectedValues.filter(

465-

(value) =>

466-

value !== MIGRATION_SELECTION_TOGGLE_ALL_ON && value !== MIGRATION_SELECTION_TOGGLE_ALL_OFF,

467-

);

459+

return selectedMigrationItemValues(selectedValues);

468460

}

469461

return selectedValues.filter(

470462

(value) =>

@@ -479,17 +471,12 @@ export function reconcileInteractiveMigrationEnterValues(

479471

selectableValues: readonly string[],

480472

opts: { preserveDeselectedActivatedValue?: boolean } = {},

481473

): string[] {

482-

if (activatedValue === MIGRATION_SELECTION_TOGGLE_ALL_ON) {

483-

return [MIGRATION_SELECTION_TOGGLE_ALL_ON, ...selectableValues];

484-

}

485-

if (activatedValue === MIGRATION_SELECTION_TOGGLE_ALL_OFF) {

486-

return [MIGRATION_SELECTION_TOGGLE_ALL_OFF];

474+

const bulkValues = resolveMigrationSelectionBulkToggleValues(activatedValue, selectableValues);

475+

if (bulkValues !== undefined) {

476+

return bulkValues;

487477

}

488478

if (activatedValue !== undefined && selectableValues.includes(activatedValue)) {

489-

const selectedSelectableValues = selectedValues.filter(

490-

(value) =>

491-

value !== MIGRATION_SELECTION_TOGGLE_ALL_ON && value !== MIGRATION_SELECTION_TOGGLE_ALL_OFF,

492-

);

479+

const selectedSelectableValues = selectedMigrationItemValues(selectedValues);

493480

if (opts.preserveDeselectedActivatedValue && !selectedValues.includes(activatedValue)) {

494481

return selectedSelectableValues;

495482

}