@backendkit-labs/agent-core 0.37.0 → 0.37.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agent-discovery/RemoteAgentRegistry.d.ts.map +1 -1
- package/dist/agent-discovery/RemoteAgentRegistry.js +4 -1
- package/dist/agent-discovery/RemoteAgentRegistry.js.map +1 -1
- package/dist/agent-discovery/download-guard.d.ts +20 -0
- package/dist/agent-discovery/download-guard.d.ts.map +1 -0
- package/dist/agent-discovery/download-guard.js +84 -0
- package/dist/agent-discovery/download-guard.js.map +1 -0
- package/dist/context/pipeline.d.ts +9 -0
- package/dist/context/pipeline.d.ts.map +1 -1
- package/dist/context/pipeline.js +20 -4
- package/dist/context/pipeline.js.map +1 -1
- package/dist/shared/utils/atomic-write.d.ts.map +1 -1
- package/dist/shared/utils/atomic-write.js +5 -2
- package/dist/shared/utils/atomic-write.js.map +1 -1
- package/dist/shared/utils/project-key.d.ts.map +1 -1
- package/dist/shared/utils/project-key.js +8 -1
- package/dist/shared/utils/project-key.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RemoteAgentRegistry.d.ts","sourceRoot":"","sources":["../../src/agent-discovery/RemoteAgentRegistry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RemoteAgentRegistry.d.ts","sourceRoot":"","sources":["../../src/agent-discovery/RemoteAgentRegistry.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,KAAK,EAAE,mBAAmB,EAAwB,MAAM,SAAS,CAAC;AAIzE;;;;;;;;;;;;;GAaG;AACH,qBAAa,mBAAmB;IAExB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBADR,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM;IAKrC,oDAAoD;IAC9C,UAAU,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAsBhD;;;OAGG;IACG,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;YA6BzD,gBAAgB;IAmB9B,OAAO,CAAC,cAAc;CAazB"}
|
|
@@ -5,6 +5,7 @@ const fs_1 = require("fs");
|
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const yaml_1 = require("yaml");
|
|
7
7
|
const atomic_write_1 = require("../shared/utils/atomic-write");
|
|
8
|
+
const download_guard_1 = require("./download-guard");
|
|
8
9
|
const INDEX_CACHE_TTL_MS = 60 * 60 * 1000; // 1 hour
|
|
9
10
|
/**
|
|
10
11
|
* Fetches and caches agent packages from a remote registry.
|
|
@@ -74,7 +75,9 @@ class RemoteAgentRegistry {
|
|
|
74
75
|
}
|
|
75
76
|
// ── Private ────────────────────────────────────────────────────────────────
|
|
76
77
|
async downloadAndCache(pkg, packageDir, agentPath) {
|
|
77
|
-
|
|
78
|
+
// downloadUrl comes from the registry index: check it, and refuse redirects (they skip the check).
|
|
79
|
+
await (0, download_guard_1.assertSafeDownloadUrl)(pkg.downloadUrl, this.registryUrl);
|
|
80
|
+
const resp = await fetch(pkg.downloadUrl, { redirect: 'error' });
|
|
78
81
|
if (!resp.ok) {
|
|
79
82
|
throw new Error(`Download failed for "${pkg.name}" (${resp.status}): ${resp.statusText}`);
|
|
80
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RemoteAgentRegistry.js","sourceRoot":"","sources":["../../src/agent-discovery/RemoteAgentRegistry.ts"],"names":[],"mappings":";;;AAAA,2BAAyD;AACzD,+BAA4B;AAC5B,+BAA0C;AAC1C,+DAA+D;
|
|
1
|
+
{"version":3,"file":"RemoteAgentRegistry.js","sourceRoot":"","sources":["../../src/agent-discovery/RemoteAgentRegistry.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* SSRF guard for the download URLs of a remote agent registry.
|
|
3
|
+
*
|
|
4
|
+
* The `downloadUrl` of every package comes from the registry index, which is data fetched over the
|
|
5
|
+
* network, so it is not trusted: it may point at localhost, the cloud metadata endpoint
|
|
6
|
+
* (169.254.169.254) or an internal service. A URL is accepted when:
|
|
7
|
+
* - the protocol is http or https, and
|
|
8
|
+
* - it has the same origin as the registry itself (the operator configured that host, so a registry
|
|
9
|
+
* inside the company network keeps working), or every address its host resolves to is public.
|
|
10
|
+
*
|
|
11
|
+
* Not covered: a host whose DNS answer changes between this check and the request (DNS rebinding).
|
|
12
|
+
* Redirects are refused by the caller (`redirect: 'error'`), since they would skip this check.
|
|
13
|
+
*/
|
|
14
|
+
export type LookupFn = (host: string) => Promise<Array<{
|
|
15
|
+
address: string;
|
|
16
|
+
}>>;
|
|
17
|
+
/** True for loopback, private, link-local, CGNAT, unspecified and other non-public addresses. */
|
|
18
|
+
export declare function isPrivateIp(ip: string): boolean;
|
|
19
|
+
export declare function assertSafeDownloadUrl(raw: string, registryUrl: string, resolve?: LookupFn): Promise<void>;
|
|
20
|
+
//# sourceMappingURL=download-guard.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"download-guard.d.ts","sourceRoot":"","sources":["../../src/agent-discovery/download-guard.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;GAYG;AAEH,MAAM,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,KAAK,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAAC;AAM7E,iGAAiG;AACjG,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAoB/C;AAcD,wBAAsB,qBAAqB,CACvC,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE,QAAwB,GAClC,OAAO,CAAC,IAAI,CAAC,CA4Bf"}
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isPrivateIp = isPrivateIp;
|
|
4
|
+
exports.assertSafeDownloadUrl = assertSafeDownloadUrl;
|
|
5
|
+
const net_1 = require("net");
|
|
6
|
+
const promises_1 = require("dns/promises");
|
|
7
|
+
const defaultLookup = (host) => (0, promises_1.lookup)(host, { all: true });
|
|
8
|
+
const BLOCKED_HOSTS = /(^|\.)(localhost|local|internal|localdomain)$/;
|
|
9
|
+
/** True for loopback, private, link-local, CGNAT, unspecified and other non-public addresses. */
|
|
10
|
+
function isPrivateIp(ip) {
|
|
11
|
+
const v = ip.toLowerCase().replace(/^\[|\]$/g, '');
|
|
12
|
+
if ((0, net_1.isIPv4)(v))
|
|
13
|
+
return isPrivateV4(v.split('.').map(Number));
|
|
14
|
+
if (!(0, net_1.isIPv6)(v))
|
|
15
|
+
return true; // not an IP we understand: refuse
|
|
16
|
+
// IPv4-mapped (::ffff:a.b.c.d or ::ffff:7f00:1): judge the embedded IPv4 address.
|
|
17
|
+
const mappedDotted = /^::ffff:(\d+\.\d+\.\d+\.\d+)$/.exec(v);
|
|
18
|
+
if (mappedDotted)
|
|
19
|
+
return isPrivateV4(mappedDotted[1].split('.').map(Number));
|
|
20
|
+
const mappedHex = /^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/.exec(v);
|
|
21
|
+
if (mappedHex) {
|
|
22
|
+
const hi = parseInt(mappedHex[1], 16);
|
|
23
|
+
const lo = parseInt(mappedHex[2], 16);
|
|
24
|
+
return isPrivateV4([hi >> 8, hi & 255, lo >> 8, lo & 255]);
|
|
25
|
+
}
|
|
26
|
+
if (v === '::' || v === '::1')
|
|
27
|
+
return true;
|
|
28
|
+
const first = parseInt(v.split(':')[0] || '0', 16);
|
|
29
|
+
if ((first & 0xfe00) === 0xfc00)
|
|
30
|
+
return true; // fc00::/7 unique local
|
|
31
|
+
if ((first & 0xffc0) === 0xfe80)
|
|
32
|
+
return true; // fe80::/10 link-local
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
function isPrivateV4([a, b, c]) {
|
|
36
|
+
if (a === 0 || a === 10 || a === 127)
|
|
37
|
+
return true;
|
|
38
|
+
if (a === 100 && b >= 64 && b <= 127)
|
|
39
|
+
return true; // CGNAT
|
|
40
|
+
if (a === 169 && b === 254)
|
|
41
|
+
return true; // link-local, cloud metadata
|
|
42
|
+
if (a === 172 && b >= 16 && b <= 31)
|
|
43
|
+
return true;
|
|
44
|
+
if (a === 192 && b === 168)
|
|
45
|
+
return true;
|
|
46
|
+
if (a === 192 && b === 0 && c === 0)
|
|
47
|
+
return true;
|
|
48
|
+
if (a === 198 && (b === 18 || b === 19))
|
|
49
|
+
return true; // benchmarking
|
|
50
|
+
if (a >= 224)
|
|
51
|
+
return true; // multicast, reserved, broadcast
|
|
52
|
+
return false;
|
|
53
|
+
}
|
|
54
|
+
async function assertSafeDownloadUrl(raw, registryUrl, resolve = defaultLookup) {
|
|
55
|
+
let url;
|
|
56
|
+
try {
|
|
57
|
+
url = new URL(raw);
|
|
58
|
+
}
|
|
59
|
+
catch {
|
|
60
|
+
throw new Error(`Unsafe download URL (invalid): ${raw}`);
|
|
61
|
+
}
|
|
62
|
+
if (url.protocol !== 'https:' && url.protocol !== 'http:') {
|
|
63
|
+
throw new Error(`Unsafe download URL (protocol ${url.protocol} not allowed): ${raw}`);
|
|
64
|
+
}
|
|
65
|
+
try {
|
|
66
|
+
if (new URL(registryUrl).origin === url.origin)
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
catch { /* an invalid registry URL cannot vouch for anything */ }
|
|
70
|
+
const host = url.hostname.toLowerCase().replace(/^\[|\]$/g, '');
|
|
71
|
+
if (BLOCKED_HOSTS.test(host) || host === 'metadata') {
|
|
72
|
+
throw new Error(`Unsafe download URL (host ${host} is internal): ${raw}`);
|
|
73
|
+
}
|
|
74
|
+
const addresses = (0, net_1.isIPv4)(host) || (0, net_1.isIPv6)(host) ? [{ address: host }] : await resolve(host);
|
|
75
|
+
if (addresses.length === 0) {
|
|
76
|
+
throw new Error(`Unsafe download URL (${host} did not resolve): ${raw}`);
|
|
77
|
+
}
|
|
78
|
+
for (const { address } of addresses) {
|
|
79
|
+
if (isPrivateIp(address)) {
|
|
80
|
+
throw new Error(`Unsafe download URL (${host} resolves to non-public address ${address}): ${raw}`);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
//# sourceMappingURL=download-guard.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"download-guard.js","sourceRoot":"","sources":["../../src/agent-discovery/download-guard.ts"],"names":[],"mappings":";;AAwBA,kCAoBC;AAcD,sDAgCC;AA1FD,6BAAqC;AACrC,2CAAsC;AAkBtC,MAAM,aAAa,GAAa,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,iBAAM,EAAC,IAAI,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;AAEtE,MAAM,aAAa,GAAG,+CAA+C,CAAC;AAEtE,iGAAiG;AACjG,SAAgB,WAAW,CAAC,EAAU;IAClC,MAAM,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACnD,IAAI,IAAA,YAAM,EAAC,CAAC,CAAC;QAAE,OAAO,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5D,IAAI,CAAC,IAAA,YAAM,EAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC,CAAC,kCAAkC;IAE/D,kFAAkF;IAClF,MAAM,YAAY,GAAG,+BAA+B,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC7D,IAAI,YAAY;QAAE,OAAO,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7E,MAAM,SAAS,GAAG,0CAA0C,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACrE,IAAI,SAAS,EAAE,CAAC;QACZ,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACtC,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACtC,OAAO,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,GAAG,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,KAAK;QAAE,OAAO,IAAI,CAAC;IAC3C,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC;IACnD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC,CAAC,wBAAwB;IACtE,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC,CAAC,uBAAuB;IACrE,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAW;IACpC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG;QAAE,OAAO,IAAI,CAAC;IAClD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,GAAG;QAAE,OAAO,IAAI,CAAC,CAAW,QAAQ;IACrE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG;QAAE,OAAO,IAAI,CAAC,CAAqB,6BAA6B;IAC1F,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE;QAAE,OAAO,IAAI,CAAC;IACjD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG;QAAE,OAAO,IAAI,CAAC;IACxC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACjD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;QAAE,OAAO,IAAI,CAAC,CAAO,eAAe;IAC3E,IAAI,CAAC,IAAI,GAAG;QAAE,OAAO,IAAI,CAAC,CAAmC,iCAAiC;IAC9F,OAAO,KAAK,CAAC;AACjB,CAAC;AAEM,KAAK,UAAU,qBAAqB,CACvC,GAAW,EACX,WAAmB,EACnB,UAAoB,aAAa;IAEjC,IAAI,GAAQ,CAAC;IACb,IAAI,CAAC;QACD,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC;IAAC,MAAM,CAAC;QACL,MAAM,IAAI,KAAK,CAAC,kCAAkC,GAAG,EAAE,CAAC,CAAC;IAC7D,CAAC;IACD,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,CAAC,QAAQ,kBAAkB,GAAG,EAAE,CAAC,CAAC;IAC1F,CAAC;IAED,IAAI,CAAC;QACD,IAAI,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,GAAG,CAAC,MAAM;YAAE,OAAO;IAC3D,CAAC;IAAC,MAAM,CAAC,CAAC,uDAAuD,CAAC,CAAC;IAEnE,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAChE,IAAI,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,kBAAkB,GAAG,EAAE,CAAC,CAAC;IAC9E,CAAC;IACD,MAAM,SAAS,GAAG,IAAA,YAAM,EAAC,IAAI,CAAC,IAAI,IAAA,YAAM,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3F,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,wBAAwB,IAAI,sBAAsB,GAAG,EAAE,CAAC,CAAC;IAC7E,CAAC;IACD,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,SAAS,EAAE,CAAC;QAClC,IAAI,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,wBAAwB,IAAI,mCAAmC,OAAO,MAAM,GAAG,EAAE,CAAC,CAAC;QACvG,CAAC;IACL,CAAC;AACL,CAAC"}
|
|
@@ -42,5 +42,14 @@ export interface PipelineConfig {
|
|
|
42
42
|
forceRefresh?: boolean;
|
|
43
43
|
}
|
|
44
44
|
export declare function runContextPipeline(config: PipelineConfig): Promise<Result<PipelineResult, Error>>;
|
|
45
|
+
/**
|
|
46
|
+
* Files on disk (AGENT.md, USER.md, project context, session notes, lessons) end up inside the
|
|
47
|
+
* system prompt and anyone who can write a file in the repo can write them. Remove what lets a
|
|
48
|
+
* file impersonate the conversation: chat-template delimiters ([INST], <<SYS>>, <|im_start|>),
|
|
49
|
+
* role tags (<system>, <assistant>...) and line-leading role prefixes (SYSTEM:, ASSISTANT:, USER:).
|
|
50
|
+
* Ordinary markup and generics (Promise<void>, <details>) are kept, and so are the instructions
|
|
51
|
+
* themselves: AGENT.md is meant to guide the agent.
|
|
52
|
+
*/
|
|
53
|
+
export declare function sanitizeDiskContent(content: string): string;
|
|
45
54
|
export declare function formatPipelineForPrompt(result: PipelineResult): string[];
|
|
46
55
|
//# sourceMappingURL=pipeline.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../src/context/pipeline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAwB,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACvF,OAAO,EAAmB,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAmB,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAoB,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAmB,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAExE,YAAY,EAAE,MAAM,EAAE,CAAC;AAEvB,MAAM,WAAW,cAAc;IAC3B,YAAY,EAAE,kBAAkB,CAAC;IACjC,OAAO,EAAE,aAAa,CAAC;IACvB,OAAO,EAAE,aAAa,CAAC;IACvB,QAAQ,EAAE,cAAc,CAAC;IACzB,OAAO,EAAE,aAAa,CAAC;IACvB,IAAI,EAAE;QACF,UAAU,EAAE,MAAM,CAAC;QACnB,aAAa,EAAE,MAAM,EAAE,CAAC;QACxB,SAAS,EAAE,MAAM,CAAC;KACrB,CAAC;CACL;AAED,MAAM,WAAW,iBAAiB;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,eAAe,CAAC,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,CAAC,CAAC;CACX;AAED,qBAAa,UAAU;IACnB,OAAO,CAAC,KAAK,CAA+C;IAE5D,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,IAAI;IAK9C,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI;IAIpD,YAAY,IAAI,iBAAiB;CASpC;AAED,MAAM,WAAW,cAAc;IAC3B,kGAAkG;IAClG,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC,CAqDvG;AA0BD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,EAAE,CA0BxE"}
|
|
1
|
+
{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../src/context/pipeline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAwB,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACvF,OAAO,EAAmB,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAmB,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAoB,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAmB,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAExE,YAAY,EAAE,MAAM,EAAE,CAAC;AAEvB,MAAM,WAAW,cAAc;IAC3B,YAAY,EAAE,kBAAkB,CAAC;IACjC,OAAO,EAAE,aAAa,CAAC;IACvB,OAAO,EAAE,aAAa,CAAC;IACvB,QAAQ,EAAE,cAAc,CAAC;IACzB,OAAO,EAAE,aAAa,CAAC;IACvB,IAAI,EAAE;QACF,UAAU,EAAE,MAAM,CAAC;QACnB,aAAa,EAAE,MAAM,EAAE,CAAC;QACxB,SAAS,EAAE,MAAM,CAAC;KACrB,CAAC;CACL;AAED,MAAM,WAAW,iBAAiB;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,eAAe,CAAC,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,CAAC,CAAC;CACX;AAED,qBAAa,UAAU;IACnB,OAAO,CAAC,KAAK,CAA+C;IAE5D,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,IAAI;IAK9C,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI;IAIpD,YAAY,IAAI,iBAAiB;CASpC;AAED,MAAM,WAAW,cAAc;IAC3B,kGAAkG;IAClG,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC,CAqDvG;AA0BD;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAM3D;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,EAAE,CA0BxE"}
|
package/dist/context/pipeline.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.StageCache = void 0;
|
|
4
4
|
exports.runContextPipeline = runContextPipeline;
|
|
5
|
+
exports.sanitizeDiskContent = sanitizeDiskContent;
|
|
5
6
|
exports.formatPipelineForPrompt = formatPipelineForPrompt;
|
|
6
7
|
const result_1 = require("@backendkit-labs/result");
|
|
7
8
|
const stage_instructions_1 = require("./stages/stage-instructions");
|
|
@@ -73,19 +74,34 @@ async function runStageWithCache(key, cache, forceRefresh, runner, onChanged) {
|
|
|
73
74
|
onChanged();
|
|
74
75
|
return fresh.data;
|
|
75
76
|
}
|
|
77
|
+
/**
|
|
78
|
+
* Files on disk (AGENT.md, USER.md, project context, session notes, lessons) end up inside the
|
|
79
|
+
* system prompt and anyone who can write a file in the repo can write them. Remove what lets a
|
|
80
|
+
* file impersonate the conversation: chat-template delimiters ([INST], <<SYS>>, <|im_start|>),
|
|
81
|
+
* role tags (<system>, <assistant>...) and line-leading role prefixes (SYSTEM:, ASSISTANT:, USER:).
|
|
82
|
+
* Ordinary markup and generics (Promise<void>, <details>) are kept, and so are the instructions
|
|
83
|
+
* themselves: AGENT.md is meant to guide the agent.
|
|
84
|
+
*/
|
|
85
|
+
function sanitizeDiskContent(content) {
|
|
86
|
+
return content
|
|
87
|
+
.replace(/\[\/?INST\]|<<\/?SYS>>/g, '')
|
|
88
|
+
.replace(/<\|[a-z_]+\|>/gi, '')
|
|
89
|
+
.replace(/<\/?(?:system|assistant|user|human|instructions?|tool_call|function_calls?)\b[^>]*>/gi, '')
|
|
90
|
+
.replace(/^(?:SYSTEM|ASSISTANT|USER|HUMAN):[ \t]*/gim, '');
|
|
91
|
+
}
|
|
76
92
|
function formatPipelineForPrompt(result) {
|
|
77
93
|
const sections = [];
|
|
78
94
|
if (result.instructions.agentMd) {
|
|
79
|
-
sections.push(formatSection('Project Instructions (AGENT.md)', result.instructions.agentMd));
|
|
95
|
+
sections.push(formatSection('Project Instructions (AGENT.md)', sanitizeDiskContent(result.instructions.agentMd)));
|
|
80
96
|
}
|
|
81
97
|
if (result.instructions.userMd) {
|
|
82
|
-
sections.push(formatSection('Developer Preferences (USER.md)', result.instructions.userMd));
|
|
98
|
+
sections.push(formatSection('Developer Preferences (USER.md)', sanitizeDiskContent(result.instructions.userMd)));
|
|
83
99
|
}
|
|
84
100
|
if (result.project.content) {
|
|
85
|
-
sections.push(formatSection('Project Context', result.project.content));
|
|
101
|
+
sections.push(formatSection('Project Context', sanitizeDiskContent(result.project.content)));
|
|
86
102
|
}
|
|
87
103
|
if (result.session.content) {
|
|
88
|
-
sections.push(formatSection('Active Session', result.session.content));
|
|
104
|
+
sections.push(formatSection('Active Session', sanitizeDiskContent(result.session.content)));
|
|
89
105
|
}
|
|
90
106
|
if (result.lessons.memo) {
|
|
91
107
|
const sanitized = result.lessons.memo
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../src/context/pipeline.ts"],"names":[],"mappings":";;;AAkEA,gDAqDC;
|
|
1
|
+
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../src/context/pipeline.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atomic-write.d.ts","sourceRoot":"","sources":["../../../src/shared/utils/atomic-write.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"atomic-write.d.ts","sourceRoot":"","sources":["../../../src/shared/utils/atomic-write.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAWH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAcvE;AAED,wBAAsB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAclF"}
|
|
@@ -9,8 +9,11 @@ exports.atomicWrite = atomicWrite;
|
|
|
9
9
|
const fs_1 = require("fs");
|
|
10
10
|
const promises_1 = require("fs/promises");
|
|
11
11
|
const path_1 = require("path");
|
|
12
|
+
const crypto_1 = require("crypto");
|
|
13
|
+
// One temp file per write (pid + random): concurrent writers of the same file do not collide.
|
|
14
|
+
const tmpPath = (filePath) => `${filePath}.${process.pid}.${(0, crypto_1.randomBytes)(6).toString('hex')}.tmp`;
|
|
12
15
|
function atomicWriteSync(filePath, content) {
|
|
13
|
-
const tmp =
|
|
16
|
+
const tmp = tmpPath(filePath);
|
|
14
17
|
(0, fs_1.writeFileSync)(tmp, content, 'utf-8');
|
|
15
18
|
try {
|
|
16
19
|
(0, fs_1.renameSync)(tmp, filePath);
|
|
@@ -30,7 +33,7 @@ function atomicWriteSync(filePath, content) {
|
|
|
30
33
|
}
|
|
31
34
|
}
|
|
32
35
|
async function atomicWrite(filePath, content) {
|
|
33
|
-
const tmp =
|
|
36
|
+
const tmp = tmpPath(filePath);
|
|
34
37
|
await (0, promises_1.writeFile)(tmp, content, 'utf-8');
|
|
35
38
|
try {
|
|
36
39
|
await (0, promises_1.rename)(tmp, filePath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atomic-write.js","sourceRoot":"","sources":["../../../src/shared/utils/atomic-write.ts"],"names":[],"mappings":";AAAA;;;GAGG;;
|
|
1
|
+
{"version":3,"file":"atomic-write.js","sourceRoot":"","sources":["../../../src/shared/utils/atomic-write.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAWH,0CAcC;AAED,kCAcC;AAvCD,2BAAoF;AACpF,0CAAyE;AACzE,+BAA+B;AAC/B,mCAAqC;AAErC,8FAA8F;AAC9F,MAAM,OAAO,GAAG,CAAC,QAAgB,EAAU,EAAE,CAC3C,GAAG,QAAQ,IAAI,OAAO,CAAC,GAAG,IAAI,IAAA,oBAAW,EAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;AAErE,SAAgB,eAAe,CAAC,QAAgB,EAAE,OAAe;IAC/D,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC9B,IAAA,kBAAa,EAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACrC,IAAI,CAAC;QACH,IAAA,eAAU,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC5B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAK,CAA2B,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAClD,IAAA,cAAS,EAAC,IAAA,cAAO,EAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAClD,IAAA,iBAAY,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC5B,IAAI,CAAC;gBAAC,IAAA,eAAU,EAAC,GAAG,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,QAAgB,EAAE,OAAe;IACjE,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC9B,MAAM,IAAA,oBAAS,EAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACvC,IAAI,CAAC;QACH,MAAM,IAAA,iBAAM,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAK,CAA2B,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAClD,MAAM,IAAA,gBAAK,EAAC,IAAA,cAAO,EAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACpD,MAAM,IAAA,mBAAQ,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC9B,IAAI,CAAC;gBAAC,MAAM,IAAA,iBAAM,EAAC,GAAG,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-key.d.ts","sourceRoot":"","sources":["../../../src/shared/utils/project-key.ts"],"names":[],"mappings":"AAGA,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKnD;
|
|
1
|
+
{"version":3,"file":"project-key.d.ts","sourceRoot":"","sources":["../../../src/shared/utils/project-key.ts"],"names":[],"mappings":"AAGA,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKnD;AAUD,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGvD;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,GAAE,MAAsB,GAAG,MAAM,CAElF"}
|
|
@@ -44,9 +44,16 @@ function cwdToProjectKey(cwd) {
|
|
|
44
44
|
.replace(/:[/\\]/g, '--')
|
|
45
45
|
.replace(/[^a-zA-Z0-9-]/g, '-');
|
|
46
46
|
}
|
|
47
|
+
/** The app name becomes a directory under the home dir: only [a-zA-Z0-9_-] so it cannot climb out of it. */
|
|
48
|
+
function assertSafeAppName(appName) {
|
|
49
|
+
if (!/^[a-zA-Z0-9_-]+$/.test(appName)) {
|
|
50
|
+
throw new Error(`Invalid appName: "${appName}" (only letters, digits, hyphen and underscore)`);
|
|
51
|
+
}
|
|
52
|
+
return appName;
|
|
53
|
+
}
|
|
47
54
|
function getFrameworkDir(appName) {
|
|
48
55
|
const home = process.env.USERPROFILE ?? process.env.HOME ?? os.homedir();
|
|
49
|
-
return path.join(home, `.${appName}`);
|
|
56
|
+
return path.join(home, `.${assertSafeAppName(appName)}`);
|
|
50
57
|
}
|
|
51
58
|
function getProjectDir(appName, cwd = process.cwd()) {
|
|
52
59
|
return path.join(getFrameworkDir(appName), 'projects', cwdToProjectKey(cwd));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-key.js","sourceRoot":"","sources":["../../../src/shared/utils/project-key.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,0CAKC;
|
|
1
|
+
{"version":3,"file":"project-key.js","sourceRoot":"","sources":["../../../src/shared/utils/project-key.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,0CAKC;AAUD,0CAGC;AAED,sCAEC;AAzBD,uCAAyB;AACzB,2CAA6B;AAE7B,SAAgB,eAAe,CAAC,GAAW;IACvC,OAAO,GAAG;SACL,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;SACrB,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC;SACxB,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;AACxC,CAAC;AAED,4GAA4G;AAC5G,SAAS,iBAAiB,CAAC,OAAe;IACtC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,qBAAqB,OAAO,iDAAiD,CAAC,CAAC;IACnG,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,SAAgB,eAAe,CAAC,OAAe;IAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;IACzE,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAC7D,CAAC;AAED,SAAgB,aAAa,CAAC,OAAe,EAAE,MAAc,OAAO,CAAC,GAAG,EAAE;IACtE,OAAO,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;AACjF,CAAC"}
|