@cat-factory/agents 0.62.3 → 0.62.5
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.
|
@@ -36,12 +36,26 @@ export declare class SkillRunResolver {
|
|
|
36
36
|
skillSourceRepository: SkillSourceRepository;
|
|
37
37
|
githubClient: GitHubClient;
|
|
38
38
|
resolveInstallationId: ResolveSkillInstallationId;
|
|
39
|
+
/**
|
|
40
|
+
* Re-sync one source, used by the dispatch-time freshness probe (slice 4). Wired to
|
|
41
|
+
* {@link SkillSourceService.sync} by the composition root. Absent ⇒ no dispatch-time
|
|
42
|
+
* probe (the push-webhook fan-out is then the only freshness path).
|
|
43
|
+
*/
|
|
44
|
+
syncSource?: (accountId: string, sourceId: string) => Promise<unknown>;
|
|
39
45
|
});
|
|
40
46
|
/** Per-resource body cap; larger files are referenced by path, not materialised. */
|
|
41
47
|
private static readonly MAX_RESOURCE_BYTES;
|
|
42
48
|
/** Aggregate body cap across all of a skill's resources. */
|
|
43
49
|
private static readonly MAX_TOTAL_BYTES;
|
|
44
50
|
resolveForRun(workspaceId: string, skillId: string): Promise<ResolvedSkillForRun>;
|
|
51
|
+
/**
|
|
52
|
+
* If the skill's source dir advanced since the last sync, re-sync it and return the refreshed
|
|
53
|
+
* catalog record; otherwise (or on ANY failure, or when the probe/re-sync isn't wired) return
|
|
54
|
+
* the last-synced record unchanged. A self-verifying freshness probe — the run never DEPENDS on
|
|
55
|
+
* it: the worst case is running one push behind, never a failure. Costs one `latestCommitSha`
|
|
56
|
+
* read on the unchanged path (the common case), plus a re-sync only when the head actually moved.
|
|
57
|
+
*/
|
|
58
|
+
private refreshIfStale;
|
|
45
59
|
/**
|
|
46
60
|
* Fetch the skill's resource bodies at its pinned commit, bounded. Never throws — every
|
|
47
61
|
* failure mode (missing source/installation, oversized/binary/unreadable file, GitHub error)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SkillRunResolver.d.ts","sourceRoot":"","sources":["../../src/skillLibrary/SkillRunResolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,eAAe,EACf,YAAY,EACZ,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"SkillRunResolver.d.ts","sourceRoot":"","sources":["../../src/skillLibrary/SkillRunResolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,eAAe,EACf,YAAY,EACZ,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,qBAAqB,CAAA;AAG5B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAA;AAEzE,0FAA0F;AAC1F,MAAM,WAAW,mBAAmB;IAClC,oGAAoG;IACpG,KAAK,EAAE,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAA;IAC5C,kGAAkG;IAClG,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CACjE;AAKD;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,IAAI;IADvB,YACmB,IAAI,EAAE;QACrB,mBAAmB,EAAE,mBAAmB,CAAA;QACxC,cAAc,EAAE,mBAAmB,CAAA;QACnC,qBAAqB,EAAE,qBAAqB,CAAA;QAC5C,YAAY,EAAE,YAAY,CAAA;QAC1B,qBAAqB,EAAE,0BAA0B,CAAA;QACjD;;;;WAIG;QACH,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;KACvE,EACC;IAEJ,oFAAoF;IACpF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAY;IACtD,4DAA4D;IAC5D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAa;IAE9C,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CA8BtF;IAED;;;;;;OAMG;YACW,cAAc;IA4B5B;;;;OAIG;YACW,gBAAgB;CAqD/B"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ValidationError } from '@cat-factory/kernel';
|
|
2
|
+
import { probeRepoSourceStatus } from '../repoSourceSync/repo-source-sync.js';
|
|
2
3
|
/** Null byte — the binary-file heuristic for a body we decline to materialise. */
|
|
3
4
|
const NUL = '\u0000';
|
|
4
5
|
/**
|
|
@@ -31,10 +32,16 @@ export class SkillRunResolver {
|
|
|
31
32
|
if (!accountId) {
|
|
32
33
|
throw new ValidationError(`Cannot resolve skill '${skillId}': workspace ${workspaceId} has no account.`);
|
|
33
34
|
}
|
|
34
|
-
const
|
|
35
|
-
if (!
|
|
35
|
+
const cached = await this.deps.catalogService.get(accountId, skillId);
|
|
36
|
+
if (!cached) {
|
|
36
37
|
throw new ValidationError(`Skill '${skillId}' is no longer available (removed or its source was unlinked). Update the pipeline step to a current skill.`);
|
|
37
38
|
}
|
|
39
|
+
// Freshness backstop: if the source dir advanced since the last sync, re-sync so the run
|
|
40
|
+
// uses current instructions rather than a stale snapshot (the layered freshness story —
|
|
41
|
+
// the push-webhook fan-out keeps it warm, this probe is the self-verifying catch at
|
|
42
|
+
// dispatch). Bounded to ONE head-commit probe on the happy path; degrades to the
|
|
43
|
+
// last-synced record on ANY failure, never wedging a run over a transient GitHub error.
|
|
44
|
+
const record = await this.refreshIfStale(accountId, cached);
|
|
38
45
|
const resources = await this.resolveResources(record);
|
|
39
46
|
return {
|
|
40
47
|
skill: {
|
|
@@ -47,6 +54,42 @@ export class SkillRunResolver {
|
|
|
47
54
|
version: { skillId: record.skillId, commit: record.pinnedCommit, sha: record.sourceSha },
|
|
48
55
|
};
|
|
49
56
|
}
|
|
57
|
+
/**
|
|
58
|
+
* If the skill's source dir advanced since the last sync, re-sync it and return the refreshed
|
|
59
|
+
* catalog record; otherwise (or on ANY failure, or when the probe/re-sync isn't wired) return
|
|
60
|
+
* the last-synced record unchanged. A self-verifying freshness probe — the run never DEPENDS on
|
|
61
|
+
* it: the worst case is running one push behind, never a failure. Costs one `latestCommitSha`
|
|
62
|
+
* read on the unchanged path (the common case), plus a re-sync only when the head actually moved.
|
|
63
|
+
*/
|
|
64
|
+
async refreshIfStale(accountId, record) {
|
|
65
|
+
const syncSource = this.deps.syncSource;
|
|
66
|
+
if (!syncSource)
|
|
67
|
+
return record;
|
|
68
|
+
try {
|
|
69
|
+
const source = await this.deps.skillSourceRepository.get(record.sourceId);
|
|
70
|
+
if (!source || source.deletedAt !== null)
|
|
71
|
+
return record;
|
|
72
|
+
const installationId = await this.deps.resolveInstallationId(accountId);
|
|
73
|
+
if (installationId === null)
|
|
74
|
+
return record;
|
|
75
|
+
const status = await probeRepoSourceStatus({
|
|
76
|
+
source,
|
|
77
|
+
installationId,
|
|
78
|
+
githubClient: this.deps.githubClient,
|
|
79
|
+
});
|
|
80
|
+
if (!status.changed)
|
|
81
|
+
return record;
|
|
82
|
+
await syncSource(accountId, record.sourceId);
|
|
83
|
+
// Re-read the (now-current) record. A re-sync that tombstoned this skill (its dir was
|
|
84
|
+
// renamed/removed upstream) leaves nothing to read — keep the last-synced record so the
|
|
85
|
+
// run still proceeds; a genuinely gone skill fails later at the pipeline-validation gate.
|
|
86
|
+
const refreshed = await this.deps.catalogService.get(accountId, record.skillId);
|
|
87
|
+
return refreshed ?? record;
|
|
88
|
+
}
|
|
89
|
+
catch {
|
|
90
|
+
return record;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
50
93
|
/**
|
|
51
94
|
* Fetch the skill's resource bodies at its pinned commit, bounded. Never throws — every
|
|
52
95
|
* failure mode (missing source/installation, oversized/binary/unreadable file, GitHub error)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SkillRunResolver.js","sourceRoot":"","sources":["../../src/skillLibrary/SkillRunResolver.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"SkillRunResolver.js","sourceRoot":"","sources":["../../src/skillLibrary/SkillRunResolver.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cat-factory/agents",
|
|
3
|
-
"version": "0.62.
|
|
3
|
+
"version": "0.62.5",
|
|
4
4
|
"description": "Agent catalog, routing, prompts and fragment library for the Agent Architecture Board.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,14 +31,14 @@
|
|
|
31
31
|
"ai": "^6.0.224",
|
|
32
32
|
"handlebars": "^4.7.9",
|
|
33
33
|
"valibot": "^1.4.2",
|
|
34
|
-
"@cat-factory/contracts": "0.
|
|
35
|
-
"@cat-factory/kernel": "0.
|
|
36
|
-
"@cat-factory/prompt-fragments": "0.13.
|
|
34
|
+
"@cat-factory/contracts": "0.144.0",
|
|
35
|
+
"@cat-factory/kernel": "0.137.1",
|
|
36
|
+
"@cat-factory/prompt-fragments": "0.13.33"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
39
|
"typescript": "7.0.2",
|
|
40
40
|
"vitest": "^4.1.10",
|
|
41
|
-
"@cat-factory/caching": "0.10.
|
|
41
|
+
"@cat-factory/caching": "0.10.2"
|
|
42
42
|
},
|
|
43
43
|
"scripts": {
|
|
44
44
|
"build": "tsc -b tsconfig.build.json",
|