@dharma-ai-labs/agent-fabric 0.2.173 → 0.2.174
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/index.d.ts +15 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +74 -1
- package/dist/index.js.map +1 -1
- package/dist/repositorySourceReconciliation.d.ts +44 -4
- package/dist/repositorySourceReconciliation.d.ts.map +1 -1
- package/dist/repositorySourceReconciliation.js +74 -5
- package/dist/repositorySourceReconciliation.js.map +1 -1
- package/dist/repositorySourceReconciliation.test.js +82 -2
- package/dist/repositorySourceReconciliation.test.js.map +1 -1
- package/dist/repositorySourceResolutionCommand.test.d.ts +2 -0
- package/dist/repositorySourceResolutionCommand.test.d.ts.map +1 -0
- package/dist/repositorySourceResolutionCommand.test.js +178 -0
- package/dist/repositorySourceResolutionCommand.test.js.map +1 -0
- package/dist/repositorySourceResolutionStore.d.ts +18 -0
- package/dist/repositorySourceResolutionStore.d.ts.map +1 -0
- package/dist/repositorySourceResolutionStore.js +170 -0
- package/dist/repositorySourceResolutionStore.js.map +1 -0
- package/dist/repositorySourceResolutionStore.test.d.ts +2 -0
- package/dist/repositorySourceResolutionStore.test.d.ts.map +1 -0
- package/dist/repositorySourceResolutionStore.test.js +109 -0
- package/dist/repositorySourceResolutionStore.test.js.map +1 -0
- package/dist/repositorySourceSync.d.ts +2 -0
- package/dist/repositorySourceSync.d.ts.map +1 -1
- package/dist/repositorySourceSync.js +33 -4
- package/dist/repositorySourceSync.js.map +1 -1
- package/dist/repositorySourceSync.test.js +104 -0
- package/dist/repositorySourceSync.test.js.map +1 -1
- package/dist/schemas/repository-source-resolution.schema.json +41 -0
- package/dist/usage.d.ts.map +1 -1
- package/dist/usage.js +2 -1
- package/dist/usage.js.map +1 -1
- package/dist/usage.test.js +10 -1
- package/dist/usage.test.js.map +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { RepositorySourceResolution, RepositorySourceResolutionPlan } from './repositorySourceReconciliation.js';
|
|
2
|
+
export declare function saveRepositorySourceResolutionPlan(workspace: string, proposed: {
|
|
3
|
+
plan: RepositorySourceResolutionPlan;
|
|
4
|
+
planHash: string;
|
|
5
|
+
}): Promise<{
|
|
6
|
+
planHash: string;
|
|
7
|
+
expiresAt: string;
|
|
8
|
+
}>;
|
|
9
|
+
export declare function readRepositorySourceResolutionPlan(workspace: string, hash: string): Promise<{
|
|
10
|
+
plan: RepositorySourceResolutionPlan;
|
|
11
|
+
planHash: string;
|
|
12
|
+
}>;
|
|
13
|
+
export declare function activateRepositorySourceResolution(workspace: string, proposed: RepositorySourceResolution): Promise<{
|
|
14
|
+
planHash: string;
|
|
15
|
+
expiresAt: string;
|
|
16
|
+
}>;
|
|
17
|
+
export declare function readActiveRepositorySourceResolution(workspace: string): Promise<RepositorySourceResolution | null>;
|
|
18
|
+
//# sourceMappingURL=repositorySourceResolutionStore.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"repositorySourceResolutionStore.d.ts","sourceRoot":"","sources":["../src/repositorySourceResolutionStore.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,0BAA0B,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAoFtH,wBAAsB,kCAAkC,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE;IAAE,IAAI,EAAE,8BAA8B,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE;;;GAgB/I;AAED,wBAAsB,kCAAkC,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;;;GAQvF;AAED,wBAAsB,kCAAkC,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,0BAA0B;;;GAoB/G;AAED,wBAAsB,oCAAoC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,0BAA0B,GAAG,IAAI,CAAC,CASxH"}
|
|
@@ -0,0 +1,170 @@
|
|
|
1
|
+
import { createHash, randomUUID } from 'node:crypto';
|
|
2
|
+
import { constants } from 'node:fs';
|
|
3
|
+
import { lstat, mkdir, open, readFile, realpath, rename, unlink } from 'node:fs/promises';
|
|
4
|
+
import { resolve } from 'node:path';
|
|
5
|
+
import { Ajv2020 } from 'ajv/dist/2020.js';
|
|
6
|
+
import { canonicalize } from '@dharma-ai-labs/agent-fabric-contracts';
|
|
7
|
+
import { currentBootstrapHostScope } from './bootstrapHostScope.js';
|
|
8
|
+
import { repositorySourcePathSafe } from './repositorySourceAuthorization.js';
|
|
9
|
+
const HASH = /^sha256:[a-f0-9]{64}$(?![\s\S])/;
|
|
10
|
+
const LIMIT = 1024 * 1024;
|
|
11
|
+
const digest = (value) => `sha256:${createHash('sha256').update(canonicalize(value)).digest('hex')}`;
|
|
12
|
+
let validator;
|
|
13
|
+
async function checkedPlan(value, hash) {
|
|
14
|
+
validator ??= readFile(new URL('./schemas/repository-source-resolution.schema.json', import.meta.url), 'utf8')
|
|
15
|
+
.then(bytes => new Ajv2020({ strict: true }).compile(JSON.parse(bytes)));
|
|
16
|
+
if (!HASH.test(hash) || !(await validator)(value) || digest(value) !== hash) {
|
|
17
|
+
throw new Error('repository_source_resolution_plan_invalid');
|
|
18
|
+
}
|
|
19
|
+
const plan = value;
|
|
20
|
+
const created = new Date(plan.createdAt), expires = new Date(plan.expiresAt);
|
|
21
|
+
if (!Number.isFinite(created.getTime()) || !Number.isFinite(expires.getTime())
|
|
22
|
+
|| created.toISOString() !== plan.createdAt || expires.toISOString() !== plan.expiresAt
|
|
23
|
+
|| expires.getTime() - created.getTime() !== 15 * 60_000
|
|
24
|
+
|| plan.conflicts.some(conflict => !repositorySourcePathSafe(conflict.path))) {
|
|
25
|
+
throw new Error('repository_source_resolution_plan_invalid');
|
|
26
|
+
}
|
|
27
|
+
return plan;
|
|
28
|
+
}
|
|
29
|
+
async function step(fn) {
|
|
30
|
+
const scope = currentBootstrapHostScope();
|
|
31
|
+
return scope ? scope.step(fn) : fn();
|
|
32
|
+
}
|
|
33
|
+
async function directory(workspace, create) {
|
|
34
|
+
const requested = resolve(workspace);
|
|
35
|
+
const workspaceEntry = await step(() => lstat(requested));
|
|
36
|
+
if (!workspaceEntry.isDirectory() || workspaceEntry.isSymbolicLink()) {
|
|
37
|
+
throw new Error('repository_source_resolution_path_invalid');
|
|
38
|
+
}
|
|
39
|
+
// Canonicalize OS parent aliases (for example macOS /var -> /private/var),
|
|
40
|
+
// then reject every redirected component underneath the workspace itself.
|
|
41
|
+
const anchor = await step(() => realpath(requested));
|
|
42
|
+
const canonicalEntry = await step(() => lstat(anchor));
|
|
43
|
+
if (!canonicalEntry.isDirectory() || canonicalEntry.isSymbolicLink()
|
|
44
|
+
|| canonicalEntry.dev !== workspaceEntry.dev || canonicalEntry.ino !== workspaceEntry.ino) {
|
|
45
|
+
throw new Error('repository_source_resolution_path_changed');
|
|
46
|
+
}
|
|
47
|
+
let path = anchor;
|
|
48
|
+
for (const part of ['.dharma', 'repository-source', 'resolutions']) {
|
|
49
|
+
path = resolve(path, part);
|
|
50
|
+
if (create)
|
|
51
|
+
await step(() => mkdir(path, { mode: 0o700 })).catch(error => { if (error.code !== 'EEXIST')
|
|
52
|
+
throw error; });
|
|
53
|
+
const entry = await step(() => lstat(path)).catch(error => {
|
|
54
|
+
if (!create && error.code === 'ENOENT')
|
|
55
|
+
return null;
|
|
56
|
+
throw error;
|
|
57
|
+
});
|
|
58
|
+
if (!entry)
|
|
59
|
+
return null;
|
|
60
|
+
if (!entry.isDirectory() || entry.isSymbolicLink() || await step(() => realpath(path)) !== path) {
|
|
61
|
+
throw new Error('repository_source_resolution_path_invalid');
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
return path;
|
|
65
|
+
}
|
|
66
|
+
async function readRegular(path, limit) {
|
|
67
|
+
const before = await step(() => lstat(path));
|
|
68
|
+
if (!before.isFile() || before.isSymbolicLink() || before.nlink !== 1 || before.size > limit) {
|
|
69
|
+
throw new Error('repository_source_resolution_file_invalid');
|
|
70
|
+
}
|
|
71
|
+
const file = await step(() => open(path, constants.O_RDONLY | (constants.O_NOFOLLOW || 0) | (constants.O_NONBLOCK || 0)));
|
|
72
|
+
try {
|
|
73
|
+
const actual = await step(() => file.stat());
|
|
74
|
+
if (actual.dev !== before.dev || actual.ino !== before.ino || actual.size !== before.size || !actual.isFile()) {
|
|
75
|
+
throw new Error('repository_source_resolution_file_changed');
|
|
76
|
+
}
|
|
77
|
+
const bytes = Buffer.alloc(limit + 1);
|
|
78
|
+
let count = 0;
|
|
79
|
+
while (count < bytes.length) {
|
|
80
|
+
const result = await step(() => file.read(bytes, count, bytes.length - count, count));
|
|
81
|
+
if (!result.bytesRead)
|
|
82
|
+
break;
|
|
83
|
+
count += result.bytesRead;
|
|
84
|
+
}
|
|
85
|
+
const after = await step(() => file.stat());
|
|
86
|
+
if (count > limit || count !== actual.size || after.size !== actual.size || after.mtimeMs !== actual.mtimeMs
|
|
87
|
+
|| after.ctimeMs !== actual.ctimeMs || after.nlink !== 1) {
|
|
88
|
+
throw new Error('repository_source_resolution_file_changed');
|
|
89
|
+
}
|
|
90
|
+
return bytes.subarray(0, count).toString('utf8');
|
|
91
|
+
}
|
|
92
|
+
finally {
|
|
93
|
+
await file.close();
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
export async function saveRepositorySourceResolutionPlan(workspace, proposed) {
|
|
97
|
+
const plan = structuredClone(proposed.plan), hash = proposed.planHash;
|
|
98
|
+
const bytes = canonicalize(await checkedPlan(plan, hash));
|
|
99
|
+
if (Buffer.byteLength(bytes) > LIMIT)
|
|
100
|
+
throw new Error('repository_source_resolution_plan_invalid');
|
|
101
|
+
const root = (await directory(workspace, true));
|
|
102
|
+
const path = resolve(root, hash.slice(7) + '.json');
|
|
103
|
+
let file;
|
|
104
|
+
try {
|
|
105
|
+
file = await step(() => open(path, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | (constants.O_NOFOLLOW || 0), 0o600));
|
|
106
|
+
await step(() => file.writeFile(bytes));
|
|
107
|
+
await step(() => file.sync());
|
|
108
|
+
}
|
|
109
|
+
catch (error) {
|
|
110
|
+
if (error.code !== 'EEXIST' || await readRegular(path, LIMIT) !== bytes)
|
|
111
|
+
throw error;
|
|
112
|
+
}
|
|
113
|
+
finally {
|
|
114
|
+
await file?.close();
|
|
115
|
+
}
|
|
116
|
+
if (await directory(workspace, false) !== root)
|
|
117
|
+
throw new Error('repository_source_resolution_path_changed');
|
|
118
|
+
return { planHash: hash, expiresAt: plan.expiresAt };
|
|
119
|
+
}
|
|
120
|
+
export async function readRepositorySourceResolutionPlan(workspace, hash) {
|
|
121
|
+
if (!HASH.test(hash))
|
|
122
|
+
throw new Error('repository_source_resolution_hash_invalid');
|
|
123
|
+
const root = await directory(workspace, false);
|
|
124
|
+
if (!root)
|
|
125
|
+
throw new Error('repository_source_resolution_plan_missing');
|
|
126
|
+
const value = JSON.parse(await readRegular(resolve(root, hash.slice(7) + '.json'), LIMIT));
|
|
127
|
+
const plan = await checkedPlan(value, hash);
|
|
128
|
+
if (await directory(workspace, false) !== root)
|
|
129
|
+
throw new Error('repository_source_resolution_path_changed');
|
|
130
|
+
return { plan, planHash: hash };
|
|
131
|
+
}
|
|
132
|
+
export async function activateRepositorySourceResolution(workspace, proposed) {
|
|
133
|
+
const { plan, planHash } = await readRepositorySourceResolutionPlan(workspace, proposed.planHash);
|
|
134
|
+
if (canonicalize(plan) !== canonicalize(proposed.plan))
|
|
135
|
+
throw new Error('repository_source_resolution_context_changed');
|
|
136
|
+
const now = proposed.now ?? new Date();
|
|
137
|
+
if (!Number.isFinite(now.getTime()) || Date.parse(plan.createdAt) > now.getTime() || Date.parse(plan.expiresAt) <= now.getTime()) {
|
|
138
|
+
throw new Error('repository_source_resolution_expired_or_invalid');
|
|
139
|
+
}
|
|
140
|
+
const root = (await directory(workspace, false)), path = resolve(root, 'ACTIVE');
|
|
141
|
+
const temporary = resolve(root, `active-${process.pid}-${randomUUID()}.tmp`);
|
|
142
|
+
const file = await step(() => open(temporary, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | (constants.O_NOFOLLOW || 0), 0o600));
|
|
143
|
+
try {
|
|
144
|
+
await step(() => file.writeFile(planHash));
|
|
145
|
+
await step(() => file.sync());
|
|
146
|
+
if (await directory(workspace, false) !== root)
|
|
147
|
+
throw new Error('repository_source_resolution_path_changed');
|
|
148
|
+
await step(() => rename(temporary, path));
|
|
149
|
+
}
|
|
150
|
+
finally {
|
|
151
|
+
await file.close();
|
|
152
|
+
await step(() => unlink(temporary)).catch(error => { if (error.code !== 'ENOENT')
|
|
153
|
+
throw error; });
|
|
154
|
+
}
|
|
155
|
+
return { planHash, expiresAt: plan.expiresAt };
|
|
156
|
+
}
|
|
157
|
+
export async function readActiveRepositorySourceResolution(workspace) {
|
|
158
|
+
const root = await directory(workspace, false);
|
|
159
|
+
if (!root)
|
|
160
|
+
return null;
|
|
161
|
+
const hash = await readRegular(resolve(root, 'ACTIVE'), 71).catch(error => {
|
|
162
|
+
if (error.code === 'ENOENT')
|
|
163
|
+
return null;
|
|
164
|
+
throw error;
|
|
165
|
+
});
|
|
166
|
+
if (hash === null)
|
|
167
|
+
return null;
|
|
168
|
+
return readRepositorySourceResolutionPlan(workspace, hash);
|
|
169
|
+
}
|
|
170
|
+
//# sourceMappingURL=repositorySourceResolutionStore.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"repositorySourceResolutionStore.js","sourceRoot":"","sources":["../src/repositorySourceResolutionStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"repositorySourceResolutionStore.test.d.ts","sourceRoot":"","sources":["../src/repositorySourceResolutionStore.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import { createHash } from 'node:crypto';
|
|
3
|
+
import { link, mkdir, mkdtemp, readFile, readdir, rm, symlink, writeFile } from 'node:fs/promises';
|
|
4
|
+
import { tmpdir } from 'node:os';
|
|
5
|
+
import { resolve } from 'node:path';
|
|
6
|
+
import test from 'node:test';
|
|
7
|
+
import { canonicalize } from '@dharma-ai-labs/agent-fabric-contracts';
|
|
8
|
+
import { activateRepositorySourceResolution, readActiveRepositorySourceResolution, readRepositorySourceResolutionPlan, saveRepositorySourceResolutionPlan } from './repositorySourceResolutionStore.js';
|
|
9
|
+
const digest = (value) => `sha256:${createHash('sha256').update(canonicalize(value)).digest('hex')}`;
|
|
10
|
+
const hash = `sha256:${'a'.repeat(64)}`;
|
|
11
|
+
const now = new Date('2026-10-08T03:00:00.000Z');
|
|
12
|
+
function proposed() {
|
|
13
|
+
const plan = {
|
|
14
|
+
schema: 'dharma.repository-source-resolution/v1', organizationId: 'org_fixture',
|
|
15
|
+
workspaceId: '11111111-1111-4111-8111-111111111111',
|
|
16
|
+
repositoryBindingId: '22222222-2222-4222-8222-222222222222',
|
|
17
|
+
repositoryAgentId: '33333333-3333-4333-8333-333333333333',
|
|
18
|
+
policyGenerationId: '44444444-4444-4444-8444-444444444444', policyHash: hash,
|
|
19
|
+
baselineSnapshotHash: hash, localSnapshotHash: hash, publishedFingerprint: hash, publishedInventoryHash: hash,
|
|
20
|
+
createdAt: now.toISOString(), expiresAt: new Date(now.getTime() + 900000).toISOString(),
|
|
21
|
+
conflicts: [{ kind: 'file', path: 'src/taskprocessor.ts', baselineHash: hash, localHash: hash, publishedHash: hash }],
|
|
22
|
+
};
|
|
23
|
+
return { plan, planHash: digest(plan), now };
|
|
24
|
+
}
|
|
25
|
+
async function fixture(t) {
|
|
26
|
+
const workspace = await mkdtemp(resolve(tmpdir(), 'source-resolution-store-'));
|
|
27
|
+
t.after(() => rm(workspace, { recursive: true, force: true }));
|
|
28
|
+
return { workspace, root: resolve(workspace, '.dharma/repository-source/resolutions') };
|
|
29
|
+
}
|
|
30
|
+
test('plan preparation is immutable and does not activate; activation is explicit and idempotent', async (t) => {
|
|
31
|
+
const f = await fixture(t), value = proposed();
|
|
32
|
+
assert.equal(await readActiveRepositorySourceResolution(f.workspace), null);
|
|
33
|
+
await saveRepositorySourceResolutionPlan(f.workspace, value);
|
|
34
|
+
await saveRepositorySourceResolutionPlan(f.workspace, value);
|
|
35
|
+
assert.equal(await readActiveRepositorySourceResolution(f.workspace), null);
|
|
36
|
+
assert.deepEqual(await readRepositorySourceResolutionPlan(f.workspace, value.planHash), { plan: value.plan, planHash: value.planHash });
|
|
37
|
+
await activateRepositorySourceResolution(f.workspace, value);
|
|
38
|
+
await activateRepositorySourceResolution(f.workspace, value);
|
|
39
|
+
assert.equal((await readActiveRepositorySourceResolution(f.workspace))?.planHash, value.planHash);
|
|
40
|
+
assert.deepEqual((await readdir(f.root)).sort(), [value.planHash.slice(7) + '.json', 'ACTIVE'].sort());
|
|
41
|
+
});
|
|
42
|
+
test('store rejects additional fields, path controls, invalid dates, extended lifetime and hash mismatch', async (t) => {
|
|
43
|
+
const f = await fixture(t), value = proposed();
|
|
44
|
+
const plans = [
|
|
45
|
+
{ ...value.plan, credential: 'SYNTHETIC_NOT_A_SECRET' },
|
|
46
|
+
{ ...value.plan, createdAt: '2026-02-30T03:00:00.000Z' },
|
|
47
|
+
{ ...value.plan, expiresAt: '2026-10-08T03:16:00.000Z' },
|
|
48
|
+
...['src\\file.ts', 'src/\nfile.ts', 'src/\u0000file.ts', '../outside', '/absolute/file'].map(path => ({ ...value.plan,
|
|
49
|
+
conflicts: [{ ...value.plan.conflicts[0], path }] })),
|
|
50
|
+
];
|
|
51
|
+
for (const plan of plans) {
|
|
52
|
+
await assert.rejects(saveRepositorySourceResolutionPlan(f.workspace, { plan, planHash: digest(plan) }), /plan_invalid/);
|
|
53
|
+
}
|
|
54
|
+
await assert.rejects(saveRepositorySourceResolutionPlan(f.workspace, { ...value, planHash: `sha256:${'b'.repeat(64)}` }), /plan_invalid/);
|
|
55
|
+
assert.equal(await readActiveRepositorySourceResolution(f.workspace), null);
|
|
56
|
+
});
|
|
57
|
+
test('expired, future-dated, invalid-clock or altered proposals cannot activate', async (t) => {
|
|
58
|
+
const f = await fixture(t), value = proposed();
|
|
59
|
+
await saveRepositorySourceResolutionPlan(f.workspace, value);
|
|
60
|
+
for (const at of [new Date(now.getTime() - 1), new Date(now.getTime() + 900000), new Date(NaN)]) {
|
|
61
|
+
await assert.rejects(activateRepositorySourceResolution(f.workspace, { ...value, now: at }), /expired_or_invalid/);
|
|
62
|
+
}
|
|
63
|
+
await assert.rejects(activateRepositorySourceResolution(f.workspace, { ...value,
|
|
64
|
+
plan: { ...value.plan, organizationId: 'org_other' } }), /context_changed/);
|
|
65
|
+
assert.equal(await readActiveRepositorySourceResolution(f.workspace), null);
|
|
66
|
+
});
|
|
67
|
+
test('corrupted, oversized, hard-linked and malformed active files fail closed', async (t) => {
|
|
68
|
+
const f = await fixture(t), value = proposed();
|
|
69
|
+
await saveRepositorySourceResolutionPlan(f.workspace, value);
|
|
70
|
+
const path = resolve(f.root, value.planHash.slice(7) + '.json');
|
|
71
|
+
await writeFile(path, '{}');
|
|
72
|
+
await assert.rejects(readRepositorySourceResolutionPlan(f.workspace, value.planHash), /plan_invalid/);
|
|
73
|
+
await writeFile(path, Buffer.alloc(1024 * 1024 + 1));
|
|
74
|
+
await assert.rejects(readRepositorySourceResolutionPlan(f.workspace, value.planHash), /file_invalid/);
|
|
75
|
+
await writeFile(path, canonicalize(value.plan));
|
|
76
|
+
await link(path, resolve(f.root, 'extra-link'));
|
|
77
|
+
await assert.rejects(readRepositorySourceResolutionPlan(f.workspace, value.planHash), /file_invalid/);
|
|
78
|
+
await writeFile(resolve(f.root, 'ACTIVE'), '../outside');
|
|
79
|
+
await assert.rejects(readActiveRepositorySourceResolution(f.workspace), /hash_invalid/);
|
|
80
|
+
await writeFile(resolve(f.root, 'ACTIVE'), 'x'.repeat(72));
|
|
81
|
+
await assert.rejects(readActiveRepositorySourceResolution(f.workspace), /file_invalid/);
|
|
82
|
+
});
|
|
83
|
+
test('resolution directories cannot redirect writes through junctions or symbolic links', async (t) => {
|
|
84
|
+
const f = await fixture(t), outside = await fixture(t), value = proposed();
|
|
85
|
+
await symlink(outside.workspace, resolve(f.workspace, '.dharma'), process.platform === 'win32' ? 'junction' : 'dir');
|
|
86
|
+
await assert.rejects(saveRepositorySourceResolutionPlan(f.workspace, value), /path_invalid/);
|
|
87
|
+
assert.deepEqual(await readdir(outside.workspace), []);
|
|
88
|
+
});
|
|
89
|
+
test('canonical parent aliases are accepted without accepting a symbolic workspace leaf', async (t) => {
|
|
90
|
+
const f = await fixture(t), value = proposed();
|
|
91
|
+
const physical = resolve(f.workspace, 'physical');
|
|
92
|
+
await mkdir(resolve(physical, 'checkout'), { recursive: true });
|
|
93
|
+
const alias = resolve(f.workspace, 'parent-alias');
|
|
94
|
+
await symlink(physical, alias, process.platform === 'win32' ? 'junction' : 'dir');
|
|
95
|
+
await saveRepositorySourceResolutionPlan(resolve(alias, 'checkout'), value);
|
|
96
|
+
assert.equal((await readRepositorySourceResolutionPlan(resolve(physical, 'checkout'), value.planHash)).planHash, value.planHash);
|
|
97
|
+
const leaf = resolve(f.workspace, 'workspace-alias');
|
|
98
|
+
await symlink(resolve(physical, 'checkout'), leaf, process.platform === 'win32' ? 'junction' : 'dir');
|
|
99
|
+
await assert.rejects(saveRepositorySourceResolutionPlan(leaf, value), /path_invalid/);
|
|
100
|
+
});
|
|
101
|
+
test('an existing plan filename is never overwritten with untrusted bytes', async (t) => {
|
|
102
|
+
const f = await fixture(t), value = proposed();
|
|
103
|
+
await mkdir(f.root, { recursive: true });
|
|
104
|
+
const path = resolve(f.root, value.planHash.slice(7) + '.json');
|
|
105
|
+
await writeFile(path, 'preserve-existing-invalid-file');
|
|
106
|
+
await assert.rejects(saveRepositorySourceResolutionPlan(f.workspace, value), /EEXIST/);
|
|
107
|
+
assert.equal(await readFile(path, 'utf8'), 'preserve-existing-invalid-file');
|
|
108
|
+
});
|
|
109
|
+
//# sourceMappingURL=repositorySourceResolutionStore.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"repositorySourceResolutionStore.test.js","sourceRoot":"","sources":["../src/repositorySourceResolutionStore.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { type RepositorySourceScope } from './repositorySourceAuthorization.js';
|
|
2
2
|
import type { RepositoryPackageSnapshot } from './repositoryPackage.js';
|
|
3
|
+
import { type RepositorySourceResolution } from './repositorySourceReconciliation.js';
|
|
3
4
|
type SourceTransport = {
|
|
4
5
|
signedGet(route: string): Promise<Record<string, unknown>>;
|
|
5
6
|
};
|
|
@@ -82,6 +83,7 @@ export declare function scanRepositorySourceChanges(input: BoundRepositorySource
|
|
|
82
83
|
manifestBytes: Buffer;
|
|
83
84
|
} | null>;
|
|
84
85
|
loadPublishedLocalBaseline?: () => Promise<RepositoryPackageSnapshot | null>;
|
|
86
|
+
loadResolution?: () => Promise<RepositorySourceResolution | null>;
|
|
85
87
|
submitCandidate?: (snapshot: RepositoryPackageSnapshot, expectedLatestSourceFingerprint?: string) => Promise<Record<string, unknown>>;
|
|
86
88
|
}): Promise<{
|
|
87
89
|
state: "unchanged" | "debouncing";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repositorySourceSync.d.ts","sourceRoot":"","sources":["../src/repositorySourceSync.ts"],"names":[],"mappings":"AAIA,OAAO,EAA8E,KAAK,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC5J,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"repositorySourceSync.d.ts","sourceRoot":"","sources":["../src/repositorySourceSync.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { canonicalize } from '@dharma-ai-labs/agent-fabric-contracts';
|
|
|
3
3
|
import { inventoryRepositoryPackage, readRepositoryPackageSnapshot, readRepositorySourceBaselineSnapshot, writeRepositoryPackageSnapshot } from './repositoryPackage.js';
|
|
4
4
|
import { parseRepositorySourcePolicyResponse, validateRepositorySourceAuthorization } from './repositorySourceAuthorization.js';
|
|
5
5
|
import { fetchPublishedRepositorySource } from './repositorySourceInventoryClient.js';
|
|
6
|
-
import { reconcileRepositorySourceSnapshot } from './repositorySourceReconciliation.js';
|
|
6
|
+
import { reconcileRepositorySourceSnapshot, RepositorySourceConflictError } from './repositorySourceReconciliation.js';
|
|
7
7
|
export function repositorySourceComparisonBaseline(record, publishedLocalSnapshotHash) {
|
|
8
8
|
// Joining a published repository captures a local comparison base, not a
|
|
9
9
|
// publication receipt. Keep those identities separate while merging deltas.
|
|
@@ -170,9 +170,30 @@ export async function scanRepositorySourceChanges(input) {
|
|
|
170
170
|
const published = input.loadPublishedLocalBaseline
|
|
171
171
|
? await fetchPublishedRepositorySource({ transport: input.transport, scope: input,
|
|
172
172
|
authorization, local }) : null;
|
|
173
|
-
const
|
|
174
|
-
|
|
175
|
-
|
|
173
|
+
const previousLocal = input.loadPublishedLocalBaseline ? await input.loadPublishedLocalBaseline() : null;
|
|
174
|
+
const sourceInput = { local, previousLocal, published };
|
|
175
|
+
let resolution = null;
|
|
176
|
+
let snapshot = local;
|
|
177
|
+
if (input.loadPublishedLocalBaseline) {
|
|
178
|
+
try {
|
|
179
|
+
snapshot = reconcileRepositorySourceSnapshot(sourceInput);
|
|
180
|
+
}
|
|
181
|
+
catch (error) {
|
|
182
|
+
if (!(error instanceof RepositorySourceConflictError))
|
|
183
|
+
throw error;
|
|
184
|
+
resolution = await input.loadResolution?.() ?? null;
|
|
185
|
+
if (!resolution)
|
|
186
|
+
throw error;
|
|
187
|
+
snapshot = reconcileRepositorySourceSnapshot({ ...sourceInput, resolution });
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
if (resolution) {
|
|
191
|
+
const active = await input.loadResolution?.();
|
|
192
|
+
if (!active || active.planHash !== resolution.planHash || canonicalize(active.plan) !== canonicalize(resolution.plan)) {
|
|
193
|
+
throw new Error('repository_source_resolution_withdrawn');
|
|
194
|
+
}
|
|
195
|
+
reconcileRepositorySourceSnapshot({ ...sourceInput, resolution: active });
|
|
196
|
+
}
|
|
176
197
|
const persisted = await writeRepositoryPackageSnapshot({ workspace: input.workspace, snapshot: local,
|
|
177
198
|
candidateOnly: true });
|
|
178
199
|
if (published && snapshot.manifest.sourceFingerprint === published.sourceFingerprint) {
|
|
@@ -184,6 +205,14 @@ export async function scanRepositorySourceChanges(input) {
|
|
|
184
205
|
if (snapshot.manifest.snapshotHash !== local.manifest.snapshotHash) {
|
|
185
206
|
await writeRepositoryPackageSnapshot({ workspace: input.workspace, snapshot, candidateOnly: true });
|
|
186
207
|
}
|
|
208
|
+
if (resolution) {
|
|
209
|
+
const active = await input.loadResolution?.();
|
|
210
|
+
if (!active || active.planHash !== resolution.planHash || canonicalize(active.plan) !== canonicalize(resolution.plan)) {
|
|
211
|
+
throw new Error('repository_source_resolution_withdrawn');
|
|
212
|
+
}
|
|
213
|
+
const latestLocal = await inventoryRepositoryPackage({ ...input, retainedKnowledge, sourceAuthorization: authorization });
|
|
214
|
+
reconcileRepositorySourceSnapshot({ local: latestLocal, previousLocal, published, resolution: active });
|
|
215
|
+
}
|
|
187
216
|
const candidate = input.submitCandidate
|
|
188
217
|
? await input.submitCandidate(snapshot, published?.sourceFingerprint) : null;
|
|
189
218
|
input.watcher.complete(fingerprint);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repositorySourceSync.js","sourceRoot":"","sources":["../src/repositorySourceSync.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"repositorySourceSync.js","sourceRoot":"","sources":["../src/repositorySourceSync.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,8 @@ import { canonicalize } from '@dharma-ai-labs/agent-fabric-contracts';
|
|
|
8
8
|
import { initializeRepositoryKnowledge } from './repositoryKnowledge.js';
|
|
9
9
|
import { inventoryRepositoryPackage, readRepositoryPackageSnapshot, rebuildRepositoryPackageSnapshot, writeRepositoryPackageSnapshot } from './repositoryPackage.js';
|
|
10
10
|
import { advanceRepositorySourceBaseline, BlockedRepositorySourceRetry, fetchRepositorySourceAuthorization, recoverPublishedLocalSourceBaseline, repositorySourceComparisonBaseline, repositorySourcePollInvalidatesWatcher, RepositorySourceWatcher, scanRepositorySourceChanges, seedRepositorySourceWatcher } from './repositorySourceSync.js';
|
|
11
|
+
import { planRepositorySourceResolution } from './repositorySourceReconciliation.js';
|
|
12
|
+
import { activateRepositorySourceResolution, readActiveRepositorySourceResolution, saveRepositorySourceResolutionPlan } from './repositorySourceResolutionStore.js';
|
|
11
13
|
const scope = { organizationId: 'org_source_sync_fixture', workspaceId: '056b63dc-ebed-48ed-85d8-02c72f623ea8',
|
|
12
14
|
repositoryBindingId: '73a95988-fd64-41ba-a0b9-6c8867d03788', repositoryAgentId: '57f61652-a5eb-46e4-930c-9478cd4a9c31' };
|
|
13
15
|
const A = `sha256:${'a'.repeat(64)}`, B = `sha256:${'b'.repeat(64)}`;
|
|
@@ -91,6 +93,7 @@ test('relay merges another workspace report before signing its own candidate', a
|
|
|
91
93
|
const submissions = [];
|
|
92
94
|
const input = { ...f.input, transport,
|
|
93
95
|
loadPublishedLocalBaseline: async () => baseline,
|
|
96
|
+
loadResolution: async () => { throw new Error('Nonconflicting updates must not consult stale approvals.'); },
|
|
94
97
|
submitCandidate: async (snapshot, parent) => {
|
|
95
98
|
submissions.push({ paths: snapshot.manifest.files.filter(file => file.role !== 'knowledge').map(file => file.path),
|
|
96
99
|
parent, hash: snapshot.manifest.snapshotHash });
|
|
@@ -110,6 +113,107 @@ test('an incomplete repository identity cannot dispatch a source-policy read', a
|
|
|
110
113
|
await assert.rejects(fetchRepositorySourceAuthorization({ signedGet: async () => { calls++; return response(); } }, { ...scope, repositoryBindingId: '' }), /complete bound identity/);
|
|
111
114
|
assert.equal(calls, 0);
|
|
112
115
|
});
|
|
116
|
+
async function conflictFixture(t) {
|
|
117
|
+
const f = await fixture(t);
|
|
118
|
+
const authorization = await fetchRepositorySourceAuthorization(f.input.transport, scope);
|
|
119
|
+
const baseline = await inventoryRepositoryPackage({ ...scope, workspace: f.input.workspace, sourceAuthorization: authorization });
|
|
120
|
+
const remoteBytes = Buffer.from('# Remote reviewed version\n');
|
|
121
|
+
const remoteFile = { path: 'README.md', role: 'repository_content',
|
|
122
|
+
sha256: `sha256:${createHash('sha256').update(remoteBytes).digest('hex')}`, sizeBytes: remoteBytes.length };
|
|
123
|
+
const remote = rebuildRepositoryPackageSnapshot(baseline, {
|
|
124
|
+
files: baseline.manifest.files.map(file => file.path === remoteFile.path ? remoteFile : file), skills: baseline.manifest.skills,
|
|
125
|
+
blobs: [...baseline.blobs.filter(blob => blob.sha256 !== baseline.manifest.files.find(file => file.path === remoteFile.path).sha256),
|
|
126
|
+
{ sha256: remoteFile.sha256, contentBase64: remoteBytes.toString('base64') }],
|
|
127
|
+
});
|
|
128
|
+
await f.put('README.md', '# Reviewed local merge\n');
|
|
129
|
+
const local = await inventoryRepositoryPackage({ ...scope, workspace: f.input.workspace, sourceAuthorization: authorization });
|
|
130
|
+
const candidateId = '99999999-9999-4999-8999-999999999999';
|
|
131
|
+
const files = remote.manifest.files.filter(file => file.role !== 'knowledge');
|
|
132
|
+
const published = { files, skills: remote.manifest.skills, blobs: remote.blobs.filter(blob => files.some(file => file.sha256 === blob.sha256)),
|
|
133
|
+
sourceFingerprint: remote.manifest.sourceFingerprint };
|
|
134
|
+
const metadata = { ok: true, organizationId: scope.organizationId, repositoryBindingId: scope.repositoryBindingId,
|
|
135
|
+
repositoryAgentId: scope.repositoryAgentId, policyGenerationId: authorization.generationId, workspaceBaseline: null,
|
|
136
|
+
source: { candidateId, workspaceId: '88888888-8888-4888-8888-888888888888', sourceSnapshotHash: remote.manifest.snapshotHash,
|
|
137
|
+
sourceManifestHash: `sha256:${createHash('sha256').update(canonicalize(remote.manifest)).digest('hex')}`,
|
|
138
|
+
sourceFingerprint: remote.manifest.sourceFingerprint, files, skills: remote.manifest.skills } };
|
|
139
|
+
const transport = { signedGet: async (route) => {
|
|
140
|
+
if (route.startsWith('/agent-fabric/repository-source-policy'))
|
|
141
|
+
return response();
|
|
142
|
+
if (route.includes('/blobs/'))
|
|
143
|
+
return { ok: true, organizationId: scope.organizationId,
|
|
144
|
+
repositoryBindingId: scope.repositoryBindingId, repositoryAgentId: scope.repositoryAgentId,
|
|
145
|
+
candidateId, sourceSnapshotHash: remote.manifest.snapshotHash, sourceFingerprint: remote.manifest.sourceFingerprint,
|
|
146
|
+
...remoteFile, contentBase64: remoteBytes.toString('base64') };
|
|
147
|
+
return metadata;
|
|
148
|
+
} };
|
|
149
|
+
const approved = planRepositorySourceResolution({ local, previousLocal: baseline, published });
|
|
150
|
+
let active = approved;
|
|
151
|
+
const submitted = [];
|
|
152
|
+
const input = { ...f.input, transport, loadPublishedLocalBaseline: async () => baseline,
|
|
153
|
+
loadResolution: async () => active,
|
|
154
|
+
submitCandidate: async (snapshot, parent) => {
|
|
155
|
+
submitted.push({ hash: snapshot.manifest.snapshotHash, parent });
|
|
156
|
+
return { state: 'accepted' };
|
|
157
|
+
} };
|
|
158
|
+
return { ...f, input, local, remote, approved, submitted, setActive: (value) => { active = value; } };
|
|
159
|
+
}
|
|
160
|
+
test('relay accepts only the exact active resolution and keeps the remote CAS precondition', async (t) => {
|
|
161
|
+
const f = await conflictFixture(t);
|
|
162
|
+
assert.equal((await scanRepositorySourceChanges(f.input)).state, 'debouncing');
|
|
163
|
+
f.setNow(1000);
|
|
164
|
+
assert.equal((await scanRepositorySourceChanges(f.input)).state, 'local_candidate_collected');
|
|
165
|
+
assert.equal(f.submitted.length, 1);
|
|
166
|
+
assert.equal(f.submitted[0].parent, f.remote.manifest.sourceFingerprint);
|
|
167
|
+
assert.equal((await scanRepositorySourceChanges(f.input)).state, 'unchanged');
|
|
168
|
+
assert.equal(f.submitted.length, 1, 'Completed local fingerprints must not be resubmitted.');
|
|
169
|
+
});
|
|
170
|
+
test('prepared metadata stays inactive and durable activation survives a fresh reader without changing source inventory', async (t) => {
|
|
171
|
+
const f = await conflictFixture(t);
|
|
172
|
+
await saveRepositorySourceResolutionPlan(f.input.workspace, f.approved);
|
|
173
|
+
assert.equal(await readActiveRepositorySourceResolution(f.input.workspace), null);
|
|
174
|
+
const authorization = await fetchRepositorySourceAuthorization(f.input.transport, scope);
|
|
175
|
+
const after = await inventoryRepositoryPackage({ ...scope, workspace: f.input.workspace, sourceAuthorization: authorization });
|
|
176
|
+
assert.equal(after.manifest.snapshotHash, f.local.manifest.snapshotHash);
|
|
177
|
+
await activateRepositorySourceResolution(f.input.workspace, f.approved);
|
|
178
|
+
f.input.loadResolution = () => readActiveRepositorySourceResolution(f.input.workspace);
|
|
179
|
+
await scanRepositorySourceChanges(f.input);
|
|
180
|
+
f.setNow(1000);
|
|
181
|
+
assert.equal((await scanRepositorySourceChanges(f.input)).state, 'local_candidate_collected');
|
|
182
|
+
assert.equal(f.submitted.length, 1);
|
|
183
|
+
});
|
|
184
|
+
test('relay cannot submit missing, expired, modified or withdrawn resolution plans', async (t) => {
|
|
185
|
+
for (const mode of ['missing', 'expired', 'modified', 'withdrawn'])
|
|
186
|
+
await t.test(mode, async (t) => {
|
|
187
|
+
const f = await conflictFixture(t);
|
|
188
|
+
if (mode === 'missing')
|
|
189
|
+
f.setActive(null);
|
|
190
|
+
if (mode === 'expired')
|
|
191
|
+
f.setActive({ ...f.approved, now: new Date(Date.parse(f.approved.plan.expiresAt)) });
|
|
192
|
+
if (mode === 'modified')
|
|
193
|
+
f.setActive({ ...f.approved, plan: { ...f.approved.plan, workspaceId: 'different' } });
|
|
194
|
+
let reads = 0;
|
|
195
|
+
if (mode === 'withdrawn')
|
|
196
|
+
f.input.loadResolution = async () => ++reads === 1 ? f.approved : null;
|
|
197
|
+
await scanRepositorySourceChanges(f.input);
|
|
198
|
+
f.setNow(1000);
|
|
199
|
+
await assert.rejects(scanRepositorySourceChanges(f.input), /changed concurrently|expired_or_invalid|context_changed|withdrawn/);
|
|
200
|
+
assert.deepEqual(f.submitted, []);
|
|
201
|
+
await assert.rejects(readRepositoryPackageSnapshot(f.input.workspace, f.local.manifest.snapshotHash), /ENOENT/);
|
|
202
|
+
});
|
|
203
|
+
});
|
|
204
|
+
test('source changes during approval readback cannot be submitted', async (t) => {
|
|
205
|
+
const f = await conflictFixture(t);
|
|
206
|
+
let reads = 0;
|
|
207
|
+
f.input.loadResolution = async () => {
|
|
208
|
+
if (++reads === 2)
|
|
209
|
+
await f.put('README.md', '# Changed after approval\n');
|
|
210
|
+
return f.approved;
|
|
211
|
+
};
|
|
212
|
+
await scanRepositorySourceChanges(f.input);
|
|
213
|
+
f.setNow(1000);
|
|
214
|
+
await assert.rejects(scanRepositorySourceChanges(f.input), /context_changed/);
|
|
215
|
+
assert.deepEqual(f.submitted, []);
|
|
216
|
+
});
|
|
113
217
|
test('source policy fetch rejects a foreign repository binding', async () => {
|
|
114
218
|
const view = response();
|
|
115
219
|
view.policy.repositoryBindingId = 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa';
|