@zhixuan92/multi-model-agent-core 2.7.5 → 3.0.0
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/batch-cache.d.ts +27 -0
- package/dist/batch-cache.d.ts.map +1 -0
- package/dist/batch-cache.js +73 -0
- package/dist/batch-cache.js.map +1 -0
- package/dist/batch-registry.d.ts +60 -0
- package/dist/batch-registry.d.ts.map +1 -0
- package/dist/batch-registry.js +146 -0
- package/dist/batch-registry.js.map +1 -0
- package/dist/config/load.d.ts +8 -0
- package/dist/config/load.d.ts.map +1 -1
- package/dist/config/load.js +12 -0
- package/dist/config/load.js.map +1 -1
- package/dist/config/schema.d.ts +41 -1
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/config/schema.js +55 -1
- package/dist/config/schema.js.map +1 -1
- package/dist/context/context-block-store.d.ts +10 -0
- package/dist/context/context-block-store.d.ts.map +1 -1
- package/dist/context/context-block-store.js +29 -2
- package/dist/context/context-block-store.js.map +1 -1
- package/dist/diagnostics/disconnect-log.d.ts +38 -2
- package/dist/diagnostics/disconnect-log.d.ts.map +1 -1
- package/dist/diagnostics/disconnect-log.js +79 -3
- package/dist/diagnostics/disconnect-log.js.map +1 -1
- package/dist/executors/audit.d.ts +7 -0
- package/dist/executors/audit.d.ts.map +1 -0
- package/dist/executors/audit.js +140 -0
- package/dist/executors/audit.js.map +1 -0
- package/dist/executors/debug.d.ts +7 -0
- package/dist/executors/debug.d.ts.map +1 -0
- package/dist/executors/debug.js +65 -0
- package/dist/executors/debug.js.map +1 -0
- package/dist/executors/delegate.d.ts +28 -0
- package/dist/executors/delegate.d.ts.map +1 -0
- package/dist/executors/delegate.js +76 -0
- package/dist/executors/delegate.js.map +1 -0
- package/dist/executors/execute-plan.d.ts +11 -0
- package/dist/executors/execute-plan.d.ts.map +1 -0
- package/dist/executors/execute-plan.js +128 -0
- package/dist/executors/execute-plan.js.map +1 -0
- package/dist/executors/index.d.ts +9 -0
- package/dist/executors/index.d.ts.map +1 -0
- package/dist/executors/index.js +10 -0
- package/dist/executors/index.js.map +1 -0
- package/dist/executors/retry.d.ts +20 -0
- package/dist/executors/retry.d.ts.map +1 -0
- package/dist/executors/retry.js +65 -0
- package/dist/executors/retry.js.map +1 -0
- package/dist/executors/review.d.ts +7 -0
- package/dist/executors/review.d.ts.map +1 -0
- package/dist/executors/review.js +128 -0
- package/dist/executors/review.js.map +1 -0
- package/dist/executors/shared-compute.d.ts +4 -0
- package/dist/executors/shared-compute.d.ts.map +1 -0
- package/dist/executors/shared-compute.js +19 -0
- package/dist/executors/shared-compute.js.map +1 -0
- package/dist/executors/types.d.ts +65 -0
- package/dist/executors/types.d.ts.map +1 -0
- package/dist/executors/types.js +2 -0
- package/dist/executors/types.js.map +1 -0
- package/dist/executors/verify.d.ts +7 -0
- package/dist/executors/verify.d.ts.map +1 -0
- package/dist/executors/verify.js +105 -0
- package/dist/executors/verify.js.map +1 -0
- package/dist/index.d.ts +8 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +8 -2
- package/dist/index.js.map +1 -1
- package/dist/intake/clarification-store.d.ts +2 -0
- package/dist/intake/clarification-store.d.ts.map +1 -1
- package/dist/intake/clarification-store.js +6 -0
- package/dist/intake/clarification-store.js.map +1 -1
- package/dist/project-context.d.ts +19 -0
- package/dist/project-context.d.ts.map +1 -0
- package/dist/project-context.js +18 -0
- package/dist/project-context.js.map +1 -0
- package/dist/tool-schemas/audit.d.ts +27 -0
- package/dist/tool-schemas/audit.d.ts.map +1 -0
- package/dist/tool-schemas/audit.js +24 -0
- package/dist/tool-schemas/audit.js.map +1 -0
- package/dist/tool-schemas/debug.d.ts +17 -0
- package/dist/tool-schemas/debug.d.ts.map +1 -0
- package/dist/tool-schemas/debug.js +21 -0
- package/dist/tool-schemas/debug.js.map +1 -0
- package/dist/tool-schemas/delegate.d.ts +19 -0
- package/dist/tool-schemas/delegate.d.ts.map +1 -0
- package/dist/tool-schemas/delegate.js +23 -0
- package/dist/tool-schemas/delegate.js.map +1 -0
- package/dist/tool-schemas/execute-plan.d.ts +16 -0
- package/dist/tool-schemas/execute-plan.d.ts.map +1 -0
- package/dist/tool-schemas/execute-plan.js +23 -0
- package/dist/tool-schemas/execute-plan.js.map +1 -0
- package/dist/tool-schemas/index.d.ts +8 -0
- package/dist/tool-schemas/index.d.ts.map +1 -0
- package/dist/tool-schemas/index.js +9 -0
- package/dist/tool-schemas/index.js.map +1 -0
- package/dist/tool-schemas/retry.d.ts +14 -0
- package/dist/tool-schemas/retry.d.ts.map +1 -0
- package/dist/tool-schemas/retry.js +17 -0
- package/dist/tool-schemas/retry.js.map +1 -0
- package/dist/tool-schemas/review.d.ts +21 -0
- package/dist/tool-schemas/review.d.ts.map +1 -0
- package/dist/tool-schemas/review.js +21 -0
- package/dist/tool-schemas/review.js.map +1 -0
- package/dist/tool-schemas/verify.d.ts +16 -0
- package/dist/tool-schemas/verify.d.ts.map +1 -0
- package/dist/tool-schemas/verify.js +21 -0
- package/dist/tool-schemas/verify.js.map +1 -0
- package/dist/types.d.ts +19 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/package.json +77 -1
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import type { TaskSpec, RunResult } from './types.js';
|
|
2
|
+
export type BatchEntryStatus = 'pending' | 'complete' | 'aborted';
|
|
3
|
+
export interface BatchEntry {
|
|
4
|
+
readonly tasks: TaskSpec[];
|
|
5
|
+
status: BatchEntryStatus;
|
|
6
|
+
results: RunResult[] | undefined;
|
|
7
|
+
readonly expiresAt: number;
|
|
8
|
+
}
|
|
9
|
+
export interface BatchCacheOptions {
|
|
10
|
+
ttlMs?: number;
|
|
11
|
+
max?: number;
|
|
12
|
+
}
|
|
13
|
+
export declare class BatchCache {
|
|
14
|
+
private readonly map;
|
|
15
|
+
private readonly ttlMs;
|
|
16
|
+
private readonly max;
|
|
17
|
+
constructor(options?: BatchCacheOptions);
|
|
18
|
+
remember(tasks: TaskSpec[]): string;
|
|
19
|
+
complete(batchId: string, results: RunResult[]): void;
|
|
20
|
+
abort(batchId: string): void;
|
|
21
|
+
get(batchId: string): BatchEntry | undefined;
|
|
22
|
+
/** Re-inserts the entry at the tail of iteration order for LRU purposes. Does NOT refresh TTL. */
|
|
23
|
+
touch(batchId: string): void;
|
|
24
|
+
clear(): void;
|
|
25
|
+
get size(): number;
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=batch-cache.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"batch-cache.d.ts","sourceRoot":"","sources":["../src/batch-cache.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEtD,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,UAAU,GAAG,SAAS,CAAC;AAElE,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC;IAC3B,MAAM,EAAE,gBAAgB,CAAC;IACzB,OAAO,EAAE,SAAS,EAAE,GAAG,SAAS,CAAC;IACjC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAKD,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAiC;IACrD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;gBAEjB,OAAO,CAAC,EAAE,iBAAiB;IAKvC,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAM;IAiBnC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI;IAUrD,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAS5B,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAU5C,kGAAkG;IAClG,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAO5B,KAAK,IAAI,IAAI;IAIb,IAAI,IAAI,IAAI,MAAM,CAEjB;CACF"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
const DEFAULT_TTL_MS = 30 * 60 * 1000;
|
|
3
|
+
const DEFAULT_MAX = 100;
|
|
4
|
+
export class BatchCache {
|
|
5
|
+
map = new Map();
|
|
6
|
+
ttlMs;
|
|
7
|
+
max;
|
|
8
|
+
constructor(options) {
|
|
9
|
+
this.ttlMs = options?.ttlMs ?? DEFAULT_TTL_MS;
|
|
10
|
+
this.max = options?.max ?? DEFAULT_MAX;
|
|
11
|
+
}
|
|
12
|
+
remember(tasks) {
|
|
13
|
+
const id = randomUUID();
|
|
14
|
+
const entry = {
|
|
15
|
+
tasks,
|
|
16
|
+
status: 'pending',
|
|
17
|
+
results: undefined,
|
|
18
|
+
expiresAt: Date.now() + this.ttlMs,
|
|
19
|
+
};
|
|
20
|
+
this.map.set(id, entry);
|
|
21
|
+
while (this.map.size > this.max) {
|
|
22
|
+
const lru = this.map.keys().next().value;
|
|
23
|
+
if (lru === undefined)
|
|
24
|
+
break;
|
|
25
|
+
this.map.delete(lru);
|
|
26
|
+
}
|
|
27
|
+
return id;
|
|
28
|
+
}
|
|
29
|
+
complete(batchId, results) {
|
|
30
|
+
const entry = this.map.get(batchId);
|
|
31
|
+
if (!entry)
|
|
32
|
+
throw new Error(`batch "${batchId}" not found`);
|
|
33
|
+
if (entry.status !== 'pending') {
|
|
34
|
+
throw new Error(`batch "${batchId}" already ${entry.status}; cannot complete`);
|
|
35
|
+
}
|
|
36
|
+
entry.status = 'complete';
|
|
37
|
+
entry.results = results;
|
|
38
|
+
}
|
|
39
|
+
abort(batchId) {
|
|
40
|
+
const entry = this.map.get(batchId);
|
|
41
|
+
if (!entry)
|
|
42
|
+
throw new Error(`batch "${batchId}" not found`);
|
|
43
|
+
if (entry.status !== 'pending') {
|
|
44
|
+
throw new Error(`batch "${batchId}" already ${entry.status}; cannot abort`);
|
|
45
|
+
}
|
|
46
|
+
entry.status = 'aborted';
|
|
47
|
+
}
|
|
48
|
+
get(batchId) {
|
|
49
|
+
const entry = this.map.get(batchId);
|
|
50
|
+
if (!entry)
|
|
51
|
+
return undefined;
|
|
52
|
+
if (entry.expiresAt < Date.now()) {
|
|
53
|
+
this.map.delete(batchId);
|
|
54
|
+
return undefined;
|
|
55
|
+
}
|
|
56
|
+
return entry;
|
|
57
|
+
}
|
|
58
|
+
/** Re-inserts the entry at the tail of iteration order for LRU purposes. Does NOT refresh TTL. */
|
|
59
|
+
touch(batchId) {
|
|
60
|
+
const entry = this.map.get(batchId);
|
|
61
|
+
if (!entry)
|
|
62
|
+
return;
|
|
63
|
+
this.map.delete(batchId);
|
|
64
|
+
this.map.set(batchId, entry);
|
|
65
|
+
}
|
|
66
|
+
clear() {
|
|
67
|
+
this.map.clear();
|
|
68
|
+
}
|
|
69
|
+
get size() {
|
|
70
|
+
return this.map.size;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=batch-cache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"batch-cache.js","sourceRoot":"","sources":["../src/batch-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
export type BatchState = 'pending' | 'awaiting_clarification' | 'complete' | 'failed' | 'expired';
|
|
2
|
+
export declare function isTerminal(s: BatchState): boolean;
|
|
3
|
+
export interface BatchEntry<Result = unknown> {
|
|
4
|
+
batchId: string;
|
|
5
|
+
projectCwd: string;
|
|
6
|
+
tool: string;
|
|
7
|
+
state: BatchState;
|
|
8
|
+
result?: Result;
|
|
9
|
+
error?: {
|
|
10
|
+
code: string;
|
|
11
|
+
message: string;
|
|
12
|
+
stack?: string;
|
|
13
|
+
};
|
|
14
|
+
proposedInterpretation?: string;
|
|
15
|
+
confirmedInterpretation?: string;
|
|
16
|
+
resolveClarification?: (interpretation: string) => void;
|
|
17
|
+
startedAt: number;
|
|
18
|
+
stateChangedAt: number;
|
|
19
|
+
blockIds: string[];
|
|
20
|
+
blocksReleased: boolean;
|
|
21
|
+
expiredAt?: number;
|
|
22
|
+
}
|
|
23
|
+
export interface BatchRegistryOptions {
|
|
24
|
+
clarificationTimeoutMs?: number;
|
|
25
|
+
batchTtlMs?: number;
|
|
26
|
+
}
|
|
27
|
+
export interface BatchRegistryDeps {
|
|
28
|
+
contextBlockStore?: {
|
|
29
|
+
pin(id: string): void;
|
|
30
|
+
unpin(id: string): void;
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
export declare class InvalidBatchStateError extends Error {
|
|
34
|
+
currentState: BatchState;
|
|
35
|
+
constructor(currentState: BatchState);
|
|
36
|
+
}
|
|
37
|
+
export declare class BatchRegistry {
|
|
38
|
+
private map;
|
|
39
|
+
private options;
|
|
40
|
+
private deps;
|
|
41
|
+
constructor(options?: BatchRegistryOptions, deps?: BatchRegistryDeps);
|
|
42
|
+
register(entry: BatchEntry): void;
|
|
43
|
+
get(batchId: string): BatchEntry | undefined;
|
|
44
|
+
delete(batchId: string): boolean;
|
|
45
|
+
size(): number;
|
|
46
|
+
entries(): IterableIterator<BatchEntry>;
|
|
47
|
+
complete<R>(batchId: string, result: R): void;
|
|
48
|
+
fail(batchId: string, error: {
|
|
49
|
+
code: string;
|
|
50
|
+
message: string;
|
|
51
|
+
stack?: string;
|
|
52
|
+
}): void;
|
|
53
|
+
requestClarification(batchId: string, proposal: string): void;
|
|
54
|
+
resumeFromClarification(batchId: string, interpretation: string): void;
|
|
55
|
+
runClarificationTimeoutSweep(): void;
|
|
56
|
+
runExpirySweep(): void;
|
|
57
|
+
countActiveForProject(cwd: string): number;
|
|
58
|
+
private release;
|
|
59
|
+
}
|
|
60
|
+
//# sourceMappingURL=batch-registry.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"batch-registry.d.ts","sourceRoot":"","sources":["../src/batch-registry.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,wBAAwB,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC;AAElG,wBAAgB,UAAU,CAAC,CAAC,EAAE,UAAU,GAAG,OAAO,CAEjD;AAED,MAAM,WAAW,UAAU,CAAC,MAAM,GAAG,OAAO;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1D,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,oBAAoB,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;IACxD,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,cAAc,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,iBAAiB,CAAC,EAAE;QAClB,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;QACtB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;KACzB,CAAC;CACH;AAED,qBAAa,sBAAuB,SAAQ,KAAK;IAC5B,YAAY,EAAE,UAAU;gBAAxB,YAAY,EAAE,UAAU;CAI5C;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,GAAG,CAAiC;IAC5C,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,IAAI,CAAoB;gBAEpB,OAAO,GAAE,oBAAyB,EAAE,IAAI,GAAE,iBAAsB;IAQ5E,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IASjC,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAI5C,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIhC,IAAI,IAAI,MAAM;IAId,OAAO,IAAI,gBAAgB,CAAC,UAAU,CAAC;IAIvC,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI;IAU7C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAUrF,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAS7D,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI;IAgBtE,4BAA4B,IAAI,IAAI;IAepC,cAAc,IAAI,IAAI;IAuBtB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAU1C,OAAO,CAAC,OAAO;CAShB"}
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
export function isTerminal(s) {
|
|
2
|
+
return s === 'complete' || s === 'failed' || s === 'expired';
|
|
3
|
+
}
|
|
4
|
+
export class InvalidBatchStateError extends Error {
|
|
5
|
+
currentState;
|
|
6
|
+
constructor(currentState) {
|
|
7
|
+
super(`invalid_batch_state: currently ${currentState}`);
|
|
8
|
+
this.currentState = currentState;
|
|
9
|
+
this.name = 'InvalidBatchStateError';
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
export class BatchRegistry {
|
|
13
|
+
map = new Map();
|
|
14
|
+
options;
|
|
15
|
+
deps;
|
|
16
|
+
constructor(options = {}, deps = {}) {
|
|
17
|
+
this.options = {
|
|
18
|
+
clarificationTimeoutMs: options.clarificationTimeoutMs ?? 24 * 60 * 60 * 1000,
|
|
19
|
+
batchTtlMs: options.batchTtlMs ?? 60 * 60 * 1000,
|
|
20
|
+
};
|
|
21
|
+
this.deps = deps;
|
|
22
|
+
}
|
|
23
|
+
register(entry) {
|
|
24
|
+
this.map.set(entry.batchId, entry);
|
|
25
|
+
if (this.deps.contextBlockStore) {
|
|
26
|
+
for (const bid of entry.blockIds) {
|
|
27
|
+
this.deps.contextBlockStore.pin(bid);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
get(batchId) {
|
|
32
|
+
return this.map.get(batchId);
|
|
33
|
+
}
|
|
34
|
+
delete(batchId) {
|
|
35
|
+
return this.map.delete(batchId);
|
|
36
|
+
}
|
|
37
|
+
size() {
|
|
38
|
+
return this.map.size;
|
|
39
|
+
}
|
|
40
|
+
entries() {
|
|
41
|
+
return this.map.values();
|
|
42
|
+
}
|
|
43
|
+
complete(batchId, result) {
|
|
44
|
+
const entry = this.map.get(batchId);
|
|
45
|
+
if (!entry)
|
|
46
|
+
return;
|
|
47
|
+
if (isTerminal(entry.state))
|
|
48
|
+
return; // idempotent
|
|
49
|
+
entry.state = 'complete';
|
|
50
|
+
entry.result = result;
|
|
51
|
+
entry.stateChangedAt = Date.now();
|
|
52
|
+
this.release(entry);
|
|
53
|
+
}
|
|
54
|
+
fail(batchId, error) {
|
|
55
|
+
const entry = this.map.get(batchId);
|
|
56
|
+
if (!entry)
|
|
57
|
+
return;
|
|
58
|
+
if (isTerminal(entry.state))
|
|
59
|
+
return; // idempotent
|
|
60
|
+
entry.state = 'failed';
|
|
61
|
+
entry.error = error;
|
|
62
|
+
entry.stateChangedAt = Date.now();
|
|
63
|
+
this.release(entry);
|
|
64
|
+
}
|
|
65
|
+
requestClarification(batchId, proposal) {
|
|
66
|
+
const entry = this.map.get(batchId);
|
|
67
|
+
if (!entry)
|
|
68
|
+
return;
|
|
69
|
+
if (entry.state !== 'pending')
|
|
70
|
+
throw new InvalidBatchStateError(entry.state);
|
|
71
|
+
entry.state = 'awaiting_clarification';
|
|
72
|
+
entry.proposedInterpretation = proposal;
|
|
73
|
+
entry.stateChangedAt = Date.now();
|
|
74
|
+
}
|
|
75
|
+
resumeFromClarification(batchId, interpretation) {
|
|
76
|
+
const entry = this.map.get(batchId);
|
|
77
|
+
if (!entry)
|
|
78
|
+
return;
|
|
79
|
+
if (entry.state !== 'awaiting_clarification') {
|
|
80
|
+
// idempotency: if already resumed with THIS interpretation, no-op
|
|
81
|
+
if (entry.confirmedInterpretation === interpretation)
|
|
82
|
+
return;
|
|
83
|
+
throw new InvalidBatchStateError(entry.state);
|
|
84
|
+
}
|
|
85
|
+
entry.confirmedInterpretation = interpretation;
|
|
86
|
+
entry.state = 'pending';
|
|
87
|
+
entry.stateChangedAt = Date.now();
|
|
88
|
+
const resolver = entry.resolveClarification;
|
|
89
|
+
entry.resolveClarification = undefined;
|
|
90
|
+
if (resolver)
|
|
91
|
+
resolver(interpretation);
|
|
92
|
+
}
|
|
93
|
+
runClarificationTimeoutSweep() {
|
|
94
|
+
const now = Date.now();
|
|
95
|
+
for (const entry of this.map.values()) {
|
|
96
|
+
if (entry.state === 'awaiting_clarification' &&
|
|
97
|
+
now - entry.stateChangedAt > this.options.clarificationTimeoutMs) {
|
|
98
|
+
entry.state = 'failed';
|
|
99
|
+
entry.error = { code: 'clarification_abandoned', message: 'Clarification not received within timeout' };
|
|
100
|
+
entry.stateChangedAt = now;
|
|
101
|
+
this.release(entry);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
runExpirySweep() {
|
|
106
|
+
const now = Date.now();
|
|
107
|
+
const toDelete = [];
|
|
108
|
+
for (const entry of this.map.values()) {
|
|
109
|
+
if (entry.state === 'expired') {
|
|
110
|
+
// second-pass: delete entries that were already marked expired
|
|
111
|
+
toDelete.push(entry.batchId);
|
|
112
|
+
}
|
|
113
|
+
else if ((entry.state === 'complete' || entry.state === 'failed') &&
|
|
114
|
+
now - entry.stateChangedAt > this.options.batchTtlMs) {
|
|
115
|
+
// first-pass: transition terminal entries to expired
|
|
116
|
+
entry.state = 'expired';
|
|
117
|
+
entry.expiredAt = now;
|
|
118
|
+
entry.stateChangedAt = now;
|
|
119
|
+
this.release(entry);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
for (const batchId of toDelete) {
|
|
123
|
+
this.map.delete(batchId);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
countActiveForProject(cwd) {
|
|
127
|
+
let count = 0;
|
|
128
|
+
for (const entry of this.map.values()) {
|
|
129
|
+
if (entry.projectCwd === cwd && !isTerminal(entry.state)) {
|
|
130
|
+
count++;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
return count;
|
|
134
|
+
}
|
|
135
|
+
release(entry) {
|
|
136
|
+
if (entry.blocksReleased)
|
|
137
|
+
return;
|
|
138
|
+
if (this.deps.contextBlockStore) {
|
|
139
|
+
for (const bid of entry.blockIds) {
|
|
140
|
+
this.deps.contextBlockStore.unpin(bid);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
entry.blocksReleased = true;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
//# sourceMappingURL=batch-registry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"batch-registry.js","sourceRoot":"","sources":["../src/batch-registry.ts"],"names":[],"mappings":"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"}
|
package/dist/config/load.d.ts
CHANGED
|
@@ -1,4 +1,12 @@
|
|
|
1
1
|
import type { MultiModelConfig } from '../types.js';
|
|
2
|
+
/**
|
|
3
|
+
* Load the auth token for the HTTP server.
|
|
4
|
+
* If `MMAGENT_AUTH_TOKEN` is set in the environment, it wins over any file.
|
|
5
|
+
* Otherwise reads and returns the file at `opts.tokenFile`.
|
|
6
|
+
*/
|
|
7
|
+
export declare function loadAuthToken(opts: {
|
|
8
|
+
tokenFile: string;
|
|
9
|
+
}): string;
|
|
2
10
|
/**
|
|
3
11
|
* Load and parse a config file by path.
|
|
4
12
|
* No auto-lookup — callers must provide the path.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../src/config/load.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../src/config/load.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAMjE;AA6BD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAiBhF"}
|
package/dist/config/load.js
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
2
|
import { multiModelConfigSchema } from './schema.js';
|
|
3
|
+
/**
|
|
4
|
+
* Load the auth token for the HTTP server.
|
|
5
|
+
* If `MMAGENT_AUTH_TOKEN` is set in the environment, it wins over any file.
|
|
6
|
+
* Otherwise reads and returns the file at `opts.tokenFile`.
|
|
7
|
+
*/
|
|
8
|
+
export function loadAuthToken(opts) {
|
|
9
|
+
const envToken = process.env['MMAGENT_AUTH_TOKEN'];
|
|
10
|
+
if (envToken && envToken.length > 0) {
|
|
11
|
+
return envToken;
|
|
12
|
+
}
|
|
13
|
+
return fs.readFileSync(opts.tokenFile, 'utf-8').trim();
|
|
14
|
+
}
|
|
3
15
|
/**
|
|
4
16
|
* Warn if any openai-compatible agent in the parsed config carries an
|
|
5
17
|
* inline `apiKey` instead of using `apiKeyEnv`. The schema permits both,
|
package/dist/config/load.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.js","sourceRoot":"","sources":["../../src/config/load.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAGrD;;;;;;GAMG;AACH,SAAS,kBAAkB,CAAC,MAAwB,EAAE,UAAkB;IACtE,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1D,IACE,KAAK,CAAC,IAAI,KAAK,mBAAmB;YAClC,OAAQ,KAA8B,CAAC,MAAM,KAAK,QAAQ,EAC1D,CAAC;YACD,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,sCAAsC;QACtC,OAAO,CAAC,IAAI,CACV,gCAAgC,UAAU,mCAAmC;YAC3E,aAAa,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,0CAA0C;YAC3E,oEAAoE,CACvE,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,IAAY;IACnD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YACvC,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,CAAC,IAAI,KAAK,CAAC,0BAA0B,IAAI,EAAE,CAAC,CAAC,CAAC;gBACpD,OAAO;YACT,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC7B,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACjD,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACjC,OAAO,CAAC,MAAM,CAAC,CAAC;YAClB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,CAAC,IAAI,KAAK,CAAC,qBAAqB,IAAI,KAAK,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAChG,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
1
|
+
{"version":3,"file":"load.js","sourceRoot":"","sources":["../../src/config/load.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAGrD;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,IAA2B;IACvD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACnD,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpC,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,OAAO,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;AACzD,CAAC;AAED;;;;;;GAMG;AACH,SAAS,kBAAkB,CAAC,MAAwB,EAAE,UAAkB;IACtE,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1D,IACE,KAAK,CAAC,IAAI,KAAK,mBAAmB;YAClC,OAAQ,KAA8B,CAAC,MAAM,KAAK,QAAQ,EAC1D,CAAC;YACD,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,sCAAsC;QACtC,OAAO,CAAC,IAAI,CACV,gCAAgC,UAAU,mCAAmC;YAC3E,aAAa,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,0CAA0C;YAC3E,oEAAoE,CACvE,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,IAAY;IACnD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YACvC,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,CAAC,IAAI,KAAK,CAAC,0BAA0B,IAAI,EAAE,CAAC,CAAC,CAAC;gBACpD,OAAO;YACT,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC7B,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACjD,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACjC,OAAO,CAAC,MAAM,CAAC,CAAC;YAClB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,CAAC,IAAI,KAAK,CAAC,qBAAqB,IAAI,KAAK,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAChG,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/config/schema.d.ts
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
import type { MultiModelConfig } from '../types.js';
|
|
3
|
+
export declare const serverConfigSchema: z.ZodObject<{
|
|
4
|
+
server: z.ZodDefault<z.ZodObject<{
|
|
5
|
+
bind: z.ZodDefault<z.ZodString>;
|
|
6
|
+
port: z.ZodDefault<z.ZodNumber>;
|
|
7
|
+
auth: z.ZodDefault<z.ZodObject<{
|
|
8
|
+
tokenFile: z.ZodDefault<z.ZodString>;
|
|
9
|
+
}, z.core.$strip>>;
|
|
10
|
+
limits: z.ZodDefault<z.ZodObject<{
|
|
11
|
+
maxBodyBytes: z.ZodDefault<z.ZodNumber>;
|
|
12
|
+
batchTtlMs: z.ZodDefault<z.ZodNumber>;
|
|
13
|
+
idleProjectTimeoutMs: z.ZodDefault<z.ZodNumber>;
|
|
14
|
+
clarificationTimeoutMs: z.ZodDefault<z.ZodNumber>;
|
|
15
|
+
projectCap: z.ZodDefault<z.ZodNumber>;
|
|
16
|
+
maxBatchCacheSize: z.ZodDefault<z.ZodNumber>;
|
|
17
|
+
maxContextBlockBytes: z.ZodDefault<z.ZodNumber>;
|
|
18
|
+
maxContextBlocksPerProject: z.ZodDefault<z.ZodNumber>;
|
|
19
|
+
shutdownDrainMs: z.ZodDefault<z.ZodNumber>;
|
|
20
|
+
}, z.core.$strip>>;
|
|
21
|
+
}, z.core.$strip>>;
|
|
22
|
+
}, z.core.$strict>;
|
|
3
23
|
export declare const multiModelConfigSchema: z.ZodObject<{
|
|
4
24
|
agents: z.ZodObject<{
|
|
5
25
|
standard: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
@@ -183,7 +203,27 @@ export declare const multiModelConfigSchema: z.ZodObject<{
|
|
|
183
203
|
log: z.ZodDefault<z.ZodBoolean>;
|
|
184
204
|
logDir: z.ZodOptional<z.ZodString>;
|
|
185
205
|
}, z.core.$strip>>;
|
|
186
|
-
|
|
206
|
+
server: z.ZodDefault<z.ZodObject<{
|
|
207
|
+
bind: z.ZodDefault<z.ZodString>;
|
|
208
|
+
port: z.ZodDefault<z.ZodNumber>;
|
|
209
|
+
auth: z.ZodDefault<z.ZodObject<{
|
|
210
|
+
tokenFile: z.ZodDefault<z.ZodString>;
|
|
211
|
+
}, z.core.$strip>>;
|
|
212
|
+
limits: z.ZodDefault<z.ZodObject<{
|
|
213
|
+
maxBodyBytes: z.ZodDefault<z.ZodNumber>;
|
|
214
|
+
batchTtlMs: z.ZodDefault<z.ZodNumber>;
|
|
215
|
+
idleProjectTimeoutMs: z.ZodDefault<z.ZodNumber>;
|
|
216
|
+
clarificationTimeoutMs: z.ZodDefault<z.ZodNumber>;
|
|
217
|
+
projectCap: z.ZodDefault<z.ZodNumber>;
|
|
218
|
+
maxBatchCacheSize: z.ZodDefault<z.ZodNumber>;
|
|
219
|
+
maxContextBlockBytes: z.ZodDefault<z.ZodNumber>;
|
|
220
|
+
maxContextBlocksPerProject: z.ZodDefault<z.ZodNumber>;
|
|
221
|
+
shutdownDrainMs: z.ZodDefault<z.ZodNumber>;
|
|
222
|
+
}, z.core.$strip>>;
|
|
223
|
+
}, z.core.$strip>>;
|
|
224
|
+
}, z.core.$strict>;
|
|
225
|
+
/** Inferred type for the standalone server configuration block. */
|
|
226
|
+
export type ServerConfig = z.infer<typeof serverConfigSchema>;
|
|
187
227
|
export interface ParsedConfigSuccess {
|
|
188
228
|
config: MultiModelConfig;
|
|
189
229
|
success: true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EACV,gBAAgB,EACjB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EACV,gBAAgB,EACjB,MAAM,aAAa,CAAC;AA6GrB,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;kBASpB,CAAC;AAEZ,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAkBxB,CAAC;AAEZ,mEAAmE;AACnE,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9D,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,gBAAgB,CAAA;IACxB,OAAO,EAAE,IAAI,CAAA;CACd;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,KAAK,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,GAAG,mBAAmB,CAAA;AAEzE;;;GAGG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,CAE1D"}
|
package/dist/config/schema.js
CHANGED
|
@@ -56,6 +56,52 @@ const defaultsSchema = z.object({
|
|
|
56
56
|
tools: 'full',
|
|
57
57
|
sandboxPolicy: 'cwd-only',
|
|
58
58
|
}));
|
|
59
|
+
// Named constants are the single source of truth for server defaults.
|
|
60
|
+
// Each .default(() => ({...})) references the same constant so changing a
|
|
61
|
+
// value here = one edit, not three. Zod 4 requires explicit defaults at each
|
|
62
|
+
// wrapper level when the parent field is omitted; `.default({})` alone does
|
|
63
|
+
// not cascade to fill in leaf defaults.
|
|
64
|
+
const DEFAULT_SERVER_AUTH = {
|
|
65
|
+
tokenFile: '~/.multi-model/auth-token',
|
|
66
|
+
};
|
|
67
|
+
const DEFAULT_SERVER_LIMITS = {
|
|
68
|
+
maxBodyBytes: 10_485_760,
|
|
69
|
+
batchTtlMs: 3_600_000,
|
|
70
|
+
idleProjectTimeoutMs: 1_800_000,
|
|
71
|
+
clarificationTimeoutMs: 86_400_000,
|
|
72
|
+
projectCap: 200,
|
|
73
|
+
maxBatchCacheSize: 500,
|
|
74
|
+
maxContextBlockBytes: 524_288,
|
|
75
|
+
maxContextBlocksPerProject: 32,
|
|
76
|
+
shutdownDrainMs: 30_000,
|
|
77
|
+
};
|
|
78
|
+
const DEFAULT_SERVER = {
|
|
79
|
+
bind: '127.0.0.1',
|
|
80
|
+
port: 7337,
|
|
81
|
+
auth: DEFAULT_SERVER_AUTH,
|
|
82
|
+
limits: DEFAULT_SERVER_LIMITS,
|
|
83
|
+
};
|
|
84
|
+
const serverLimitsSchema = z.object({
|
|
85
|
+
maxBodyBytes: z.number().int().positive().default(DEFAULT_SERVER_LIMITS.maxBodyBytes),
|
|
86
|
+
batchTtlMs: z.number().int().positive().default(DEFAULT_SERVER_LIMITS.batchTtlMs),
|
|
87
|
+
idleProjectTimeoutMs: z.number().int().positive().default(DEFAULT_SERVER_LIMITS.idleProjectTimeoutMs),
|
|
88
|
+
clarificationTimeoutMs: z.number().int().positive().default(DEFAULT_SERVER_LIMITS.clarificationTimeoutMs),
|
|
89
|
+
projectCap: z.number().int().positive().default(DEFAULT_SERVER_LIMITS.projectCap),
|
|
90
|
+
maxBatchCacheSize: z.number().int().positive().default(DEFAULT_SERVER_LIMITS.maxBatchCacheSize),
|
|
91
|
+
maxContextBlockBytes: z.number().int().positive().default(DEFAULT_SERVER_LIMITS.maxContextBlockBytes),
|
|
92
|
+
maxContextBlocksPerProject: z.number().int().positive().default(DEFAULT_SERVER_LIMITS.maxContextBlocksPerProject),
|
|
93
|
+
shutdownDrainMs: z.number().int().positive().default(DEFAULT_SERVER_LIMITS.shutdownDrainMs),
|
|
94
|
+
}).default(() => DEFAULT_SERVER_LIMITS);
|
|
95
|
+
export const serverConfigSchema = z.object({
|
|
96
|
+
server: z.object({
|
|
97
|
+
bind: z.string().default(DEFAULT_SERVER.bind),
|
|
98
|
+
port: z.number().int().nonnegative().default(DEFAULT_SERVER.port),
|
|
99
|
+
auth: z.object({
|
|
100
|
+
tokenFile: z.string().default(DEFAULT_SERVER_AUTH.tokenFile),
|
|
101
|
+
}).default(() => DEFAULT_SERVER_AUTH),
|
|
102
|
+
limits: serverLimitsSchema,
|
|
103
|
+
}).default(() => DEFAULT_SERVER),
|
|
104
|
+
}).strict();
|
|
59
105
|
export const multiModelConfigSchema = z.object({
|
|
60
106
|
agents: z.object({
|
|
61
107
|
standard: agentConfigSchema,
|
|
@@ -66,7 +112,15 @@ export const multiModelConfigSchema = z.object({
|
|
|
66
112
|
log: z.boolean().default(false),
|
|
67
113
|
logDir: z.string().min(1).optional(),
|
|
68
114
|
}).optional(),
|
|
69
|
-
|
|
115
|
+
server: z.object({
|
|
116
|
+
bind: z.string().default(DEFAULT_SERVER.bind),
|
|
117
|
+
port: z.number().int().nonnegative().default(DEFAULT_SERVER.port),
|
|
118
|
+
auth: z.object({
|
|
119
|
+
tokenFile: z.string().default(DEFAULT_SERVER_AUTH.tokenFile),
|
|
120
|
+
}).default(() => DEFAULT_SERVER_AUTH),
|
|
121
|
+
limits: serverLimitsSchema,
|
|
122
|
+
}).default(() => DEFAULT_SERVER),
|
|
123
|
+
}).strict();
|
|
70
124
|
/**
|
|
71
125
|
* Parse a raw config object — validates schema, no side effects.
|
|
72
126
|
* Does NOT load from disk.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,+BAA+B;AAE/B,MAAM,YAAY,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;AAC/D,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC;AAClG,MAAM,iCAAiC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AAC1E,MAAM,mBAAmB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;AACpE,6EAA6E;AAC7E,yEAAyE;AACzE,+BAA+B;AAC/B,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC;AAErE,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;AAEnF,MAAM,eAAe,GAAG;IACtB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,YAAY,EAAE,kBAAkB;IAChC,MAAM,EAAE,YAAY,CAAC,QAAQ,EAAE;IAC/B,gBAAgB,EAAE,eAAe;IACjC,iBAAiB,EAAE,eAAe;IAClC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IACjD,aAAa,EAAE,mBAAmB;IAClC,mBAAmB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;CAC5D,CAAC;AAEF,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC;IACpC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,kDAAkD,CAAC;IAC9E,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAChC,WAAW,EAAE,iCAAiC,CAAC,QAAQ,EAAE;IACzD,GAAG,eAAe;CACnB,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACzB,WAAW,EAAE,iBAAiB,CAAC,QAAQ,EAAE;IACzC,GAAG,eAAe;CACnB,CAAC,CAAC,MAAM,EAAE,CAAC;AAEZ,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IAChC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;IACxB,WAAW,EAAE,iBAAiB,CAAC,QAAQ,EAAE;IACzC,GAAG,eAAe;CACnB,CAAC,CAAC,MAAM,EAAE,CAAC;AAEZ,MAAM,iBAAiB,GAAG,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE;IACrD,2BAA2B;IAC3B,iBAAiB;IACjB,gBAAgB;CACjB,CAAC,CAAC;AAEH,kCAAkC;AAElC,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC;IACzD,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;IAChD,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACvE,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;IAC/D,2BAA2B,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IACnE,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CAC1C,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAChB,SAAS,EAAE,SAAS;IACpB,UAAU,EAAE,EAAE;IACd,KAAK,EAAE,MAAe;IACtB,aAAa,EAAE,UAAmB;CACnC,CAAC,CAAC,CAAC;AAEJ,sEAAsE;AACtE,0EAA0E;AAC1E,6EAA6E;AAC7E,4EAA4E;AAC5E,wCAAwC;AACxC,MAAM,mBAAmB,GAAG;IAC1B,SAAS,EAAE,2BAA2B;CACvC,CAAC;AAEF,MAAM,qBAAqB,GAAG;IAC5B,YAAY,EAAE,UAAU;IACxB,UAAU,EAAE,SAAS;IACrB,oBAAoB,EAAE,SAAS;IAC/B,sBAAsB,EAAE,UAAU;IAClC,UAAU,EAAE,GAAG;IACf,iBAAiB,EAAE,GAAG;IACtB,oBAAoB,EAAE,OAAO;IAC7B,0BAA0B,EAAE,EAAE;IAC9B,eAAe,EAAE,MAAM;CACxB,CAAC;AAEF,MAAM,cAAc,GAAG;IACrB,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,mBAAmB;IACzB,MAAM,EAAE,qBAAqB;CAC9B,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IAClC,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,YAAY,CAAC;IACrF,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,UAAU,CAAC;IACjF,oBAAoB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,oBAAoB,CAAC;IACrG,sBAAsB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,sBAAsB,CAAC;IACzG,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,UAAU,CAAC;IACjF,iBAAiB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,iBAAiB,CAAC;IAC/F,oBAAoB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,oBAAoB,CAAC;IACrG,0BAA0B,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,0BAA0B,CAAC;IACjH,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,eAAe,CAAC;CAC5F,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,qBAAqB,CAAC,CAAC;AAExC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC;QAC7C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC;QACjE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;YACb,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC;SAC7D,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC;QACrC,MAAM,EAAE,kBAAkB;KAC3B,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC;CACjC,CAAC,CAAC,MAAM,EAAE,CAAC;AAEZ,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7C,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE,iBAAiB;KAC3B,CAAC;IACF,QAAQ,EAAE,cAAc;IACxB,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC;QACpB,GAAG,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;QAC/B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;KACrC,CAAC,CAAC,QAAQ,EAAE;IACb,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC;QAC7C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC;QACjE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;YACb,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC;SAC7D,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC;QACrC,MAAM,EAAE,kBAAkB;KAC3B,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC;CACjC,CAAC,CAAC,MAAM,EAAE,CAAC;AAiBZ;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,GAAY;IACtC,OAAO,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAC3C,CAAC"}
|
|
@@ -70,6 +70,16 @@ export declare class InMemoryContextBlockStore implements ContextBlockStore {
|
|
|
70
70
|
}): RegisteredBlock;
|
|
71
71
|
get(id: string): string | undefined;
|
|
72
72
|
delete(id: string): boolean;
|
|
73
|
+
/** Increment the pin (reference) count for an entry. Pinned entries are
|
|
74
|
+
* skipped during LRU eviction. No-op if the entry is unknown. */
|
|
75
|
+
pin(id: string): void;
|
|
76
|
+
/** Decrement the pin count for an entry. No-op if the entry is unknown or
|
|
77
|
+
* the count is already zero. */
|
|
78
|
+
unpin(id: string): void;
|
|
79
|
+
/** Return the current pin count for an entry, or 0 if unknown. */
|
|
80
|
+
refcount(id: string): number;
|
|
81
|
+
get size(): number;
|
|
82
|
+
clear(): void;
|
|
73
83
|
private evictIfOverBound;
|
|
74
84
|
}
|
|
75
85
|
//# sourceMappingURL=context-block-store.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-block-store.d.ts","sourceRoot":"","sources":["../../src/context/context-block-store.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB;IAChC;yDACqD;IACrD,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,eAAe,CAAC;IACnE;yEACqE;IACrE,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACpC,4DAA4D;IAC5D,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;CAC7B;AAED;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,KAAK;aACtB,EAAE,EAAE,MAAM;gBAAV,EAAE,EAAE,MAAM;CAQvC;
|
|
1
|
+
{"version":3,"file":"context-block-store.d.ts","sourceRoot":"","sources":["../../src/context/context-block-store.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB;IAChC;yDACqD;IACrD,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,eAAe,CAAC;IACnE;yEACqE;IACrE,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACpC,4DAA4D;IAC5D,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;CAC7B;AAED;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,KAAK;aACtB,EAAE,EAAE,MAAM;gBAAV,EAAE,EAAE,MAAM;CAQvC;AAiBD,MAAM,WAAW,gCAAgC;IAC/C,mDAAmD;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,kEAAkE;IAClE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,yBAA0B,YAAW,iBAAiB;IACjE,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,IAAI,CAAK;gBAEL,IAAI,GAAE,gCAAqC;IAKvD,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,eAAe;IAYtE,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAenC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAI3B;sEACkE;IAClE,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAKrB;qCACiC;IACjC,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAKvB,kEAAkE;IAClE,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAI5B,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,KAAK,IAAI,IAAI;IAIb,OAAO,CAAC,gBAAgB;CAgBzB"}
|
|
@@ -41,7 +41,7 @@ export class InMemoryContextBlockStore {
|
|
|
41
41
|
register(content, opts = {}) {
|
|
42
42
|
const id = opts.id ?? randomUUID();
|
|
43
43
|
const now = Date.now();
|
|
44
|
-
this.entries.set(id, { content, addedAtMs: now, lastAccessTick: ++this.tick });
|
|
44
|
+
this.entries.set(id, { content, addedAtMs: now, lastAccessTick: ++this.tick, pinCount: 0 });
|
|
45
45
|
this.evictIfOverBound();
|
|
46
46
|
return {
|
|
47
47
|
id,
|
|
@@ -67,11 +67,38 @@ export class InMemoryContextBlockStore {
|
|
|
67
67
|
delete(id) {
|
|
68
68
|
return this.entries.delete(id);
|
|
69
69
|
}
|
|
70
|
+
/** Increment the pin (reference) count for an entry. Pinned entries are
|
|
71
|
+
* skipped during LRU eviction. No-op if the entry is unknown. */
|
|
72
|
+
pin(id) {
|
|
73
|
+
const entry = this.entries.get(id);
|
|
74
|
+
if (entry)
|
|
75
|
+
entry.pinCount += 1;
|
|
76
|
+
}
|
|
77
|
+
/** Decrement the pin count for an entry. No-op if the entry is unknown or
|
|
78
|
+
* the count is already zero. */
|
|
79
|
+
unpin(id) {
|
|
80
|
+
const entry = this.entries.get(id);
|
|
81
|
+
if (entry && entry.pinCount > 0)
|
|
82
|
+
entry.pinCount -= 1;
|
|
83
|
+
}
|
|
84
|
+
/** Return the current pin count for an entry, or 0 if unknown. */
|
|
85
|
+
refcount(id) {
|
|
86
|
+
return this.entries.get(id)?.pinCount ?? 0;
|
|
87
|
+
}
|
|
88
|
+
get size() {
|
|
89
|
+
return this.entries.size;
|
|
90
|
+
}
|
|
91
|
+
clear() {
|
|
92
|
+
this.entries.clear();
|
|
93
|
+
}
|
|
70
94
|
evictIfOverBound() {
|
|
71
95
|
while (this.entries.size > this.maxEntries) {
|
|
72
96
|
let oldestId;
|
|
73
97
|
let oldestTick = Infinity;
|
|
74
98
|
for (const [id, entry] of this.entries) {
|
|
99
|
+
// Skip pinned entries — they are held by active BatchRegistry entries
|
|
100
|
+
if (entry.pinCount > 0)
|
|
101
|
+
continue;
|
|
75
102
|
if (entry.lastAccessTick < oldestTick) {
|
|
76
103
|
oldestTick = entry.lastAccessTick;
|
|
77
104
|
oldestId = id;
|
|
@@ -80,7 +107,7 @@ export class InMemoryContextBlockStore {
|
|
|
80
107
|
if (oldestId)
|
|
81
108
|
this.entries.delete(oldestId);
|
|
82
109
|
else
|
|
83
|
-
break;
|
|
110
|
+
break; // all entries pinned — cannot evict
|
|
84
111
|
}
|
|
85
112
|
}
|
|
86
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-block-store.js","sourceRoot":"","sources":["../../src/context/context-block-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAiCrD;;;;;GAKG;AACH,MAAM,OAAO,yBAA0B,SAAQ,KAAK;IACtB;IAA5B,YAA4B,EAAU;QACpC,KAAK,CACH,kBAAkB,EAAE,2BAA2B;YAC/C,4DAA4D;YAC5D,kFAAkF,CACnF,CAAC;QALwB,OAAE,GAAF,EAAE,CAAQ;QAMpC,IAAI,CAAC,IAAI,GAAG,2BAA2B,CAAC;IAC1C,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"context-block-store.js","sourceRoot":"","sources":["../../src/context/context-block-store.ts"],"names":[],"mappings":"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"}
|