Garry's Opinionated OpenClaw/Hermes Agent Brain
TypeScript
fix: pre-landing review fixes for train K's safe skillpack update
garrytan2d62b0020067
diff --git a/src/core/skillpack/safe-update.ts b/src/core/skillpack/safe-update.tsindex 6a70446aa1..120ec81abc 100644--- a/src/core/skillpack/safe-update.ts+++ b/src/core/skillpack/safe-update.ts@@ -181,7 +181,7 @@ export function classifySkill(ctx: ClassifyContext, slug: string): SkillOutcomeslug, result: 'current', pinned: record?.pinned === true, changes: [], historical: files.filter(f => f.state === 'historical').map(f => f.rel), notes, files,};const skillMd = files.find(f => f.rel === `${slug}/SKILL.md`);- if (!record && skillMd?.pre === null) return { ...outcome, result: 'not_installed', historical: [] };+ if (!Object.keys(record?.files ?? {}).length && skillMd?.pre === null) return { ...outcome, result: 'not_installed', historical: [] };const changed = files.filter(f => f.state !== 'unchanged');outcome.changes = changed.map(f => f.rel);if (changed.length === 0 && !unsafe) return outcome;@@ -358,7 +358,14 @@ export async function runSkillpackUpdate(opts: UpdateOptions): Promise<UpdateResrecords: loadState({ statePath: opts.statePath }).roots?.[opts.skillsRoot] ?? {},acceptHistorical: opts.acceptHistorical === true, noDiff: opts.noDiff === true,};- const outcomes = slugs.map(slug => classifySkill(ctx, slug));+ const claimed = new Set<string>();+ const outcomes = slugs.map(slug => classifySkill(ctx, slug)).map((o): SkillOutcome => {+ if (o.result !== 'would_update') return o;+ const files = o.files.filter(f => !(f.sharedDep && f.state !== 'unchanged' && claimed.has(f.rel)));+ for (const f of files) if (f.sharedDep && f.state !== 'unchanged') claimed.add(f.rel);+ const changes = files.filter(f => f.state !== 'unchanged').map(f => f.rel);+ return changes.length ? { ...o, files, changes } : { ...o, files, changes, result: 'current' };+ });const base = {dry_run: opts.dryRun === true, skills_root: opts.skillsRoot,history: history.ok ? { verified: true } : { verified: false, reason: history.reason },@@ -447,7 +454,9 @@ export async function setSkillPinned(skillsRoot: string, slug: string, pinned: bconst record = root[slug];if ((record?.pinned === true) === pinned) return { state: null, result: false };const { pinned: _old, ...rest } = record ?? { files: {}, recorded_at: new Date().toISOString() };- root[slug] = pinned ? { ...rest, pinned: true } : rest;+ if (pinned) root[slug] = { ...rest, pinned: true };+ else if (Object.keys(rest.files).length) root[slug] = rest;+ else delete root[slug];return { state: { ...state, roots: { ...state.roots, [skillsRoot]: root } }, result: true };}, { statePath: opts.statePath });}diff --git a/test/skillpack-safe-update.test.ts b/test/skillpack-safe-update.test.tsindex 3046f87717..bc39c30553 100644--- a/test/skillpack-safe-update.test.ts+++ b/test/skillpack-safe-update.test.ts@@ -57,12 +57,12 @@ function release(gbrainRoot: string, files: Record<string, string>): void {interface Env { gbrainRoot: string; ws: string; home: string; statePath: string; backups: string; skillsRoot: string }-function setup(): Env {+function setup(opts: { sharedDeps?: string[]; first?: Record<string, string> } = {}): Env {const gbrainRoot = tmp('sp-safe-gbrain-');mkdirSync(join(gbrainRoot, 'src'), { recursive: true });writeFileSync(join(gbrainRoot, 'src', 'cli.ts'), '// stub\n');- writeFileSync(join(gbrainRoot, 'openclaw.plugin.json'), JSON.stringify({ name: 'gbrain-test', version: '0.0.1', skills: ['skills/demo', 'skills/other'], shared_deps: [] }));- release(gbrainRoot, V1);+ writeFileSync(join(gbrainRoot, 'openclaw.plugin.json'), JSON.stringify({ name: 'gbrain-test', version: '0.0.1', skills: ['skills/demo', 'skills/other'], shared_deps: opts.sharedDeps ?? [] }));+ release(gbrainRoot, opts.first ?? V1);const ws = tmp('sp-safe-ws-');const home = tmp('sp-safe-home-');const gb = join(home, '.gbrain');@@ -150,6 +150,34 @@ describe('base recording and whole-skill update', () => {expect(read(env, 'demo/SKILL.md')).toBe(V1['demo/SKILL.md']);});+ test('pinning then unpinning a skill that was never installed does not install it', async () => {+ const env = setup();+ release(env.gbrainRoot, V2);+ expect(outcome(await update(env), 'demo').result).toBe('not_installed');+ await setSkillPinned(env.skillsRoot, 'demo', true, { statePath: env.statePath });+ await setSkillPinned(env.skillsRoot, 'demo', false, { statePath: env.statePath });+ const result = await update(env);+ expect(outcome(result, 'demo').result).toBe('not_installed');+ expect(existsSync(join(env.ws, 'skills', 'demo/SKILL.md'))).toBe(false);+ expect(loadState({ statePath: env.statePath }).roots?.[env.skillsRoot]?.demo).toBeUndefined();+ });++ test('a release that adds a shared dependency updates every skill once, and restore puts it all back', async () => {+ const env = setup({ sharedDeps: ['skills/conventions'], first: { ...V1, 'conventions/a.md': 'a v1\n' } });+ await scaffold(env);+ release(env.gbrainRoot, { ...V2, 'conventions/b.md': 'b v2\n' });+ const result = await update(env);+ expect(result.summary).toMatchObject({ updated: 2, failed: 0 });+ expect(result.restore_command).toBeNull();+ expect(read(env, 'conventions/b.md')).toBe('b v2\n');+ expect(read(env, 'other/SKILL.md')).toBe(V2['other/SKILL.md']);+ const [journal] = listJournals(env.backups);+ expect(journal!.skills.flatMap(s => s.files.map(f => f.rel)).filter(rel => rel === 'conventions/b.md')).toHaveLength(1);+ await runSkillpackRestore({ id: journal!.id, statePath: env.statePath, backups: env.backups });+ expect(existsSync(join(env.ws, 'skills', 'conventions/b.md'))).toBe(false);+ expect(read(env, 'other/SKILL.md')).toBe(V1['other/SKILL.md']);+ });+test('a pinned skill is skipped until unpinned', async () => {const env = setup();await scaffold(env);