@prismatic-io/lux 0.0.2-preview.38 → 0.0.2-preview.39
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/lib/assertions/core/safe-regex.d.ts.map +1 -1
- package/lib/assertions/core/safe-regex.js +7 -1
- package/lib/assertions/core/safe-regex.js.map +1 -1
- package/lib/assertions/rubric/evidence.d.ts.map +1 -1
- package/lib/assertions/rubric/evidence.js +9 -0
- package/lib/assertions/rubric/evidence.js.map +1 -1
- package/lib/assertions/rubric/index.js +2 -2
- package/lib/assertions/rubric/index.js.map +1 -1
- package/lib/container/driver.d.ts.map +1 -1
- package/lib/container/driver.js +10 -8
- package/lib/container/driver.js.map +1 -1
- package/lib/container/paths.d.ts +3 -0
- package/lib/container/paths.d.ts.map +1 -0
- package/lib/container/paths.js +27 -0
- package/lib/container/paths.js.map +1 -0
- package/lib/container/resources.d.ts +2 -0
- package/lib/container/resources.d.ts.map +1 -1
- package/lib/container/resources.js +17 -9
- package/lib/container/resources.js.map +1 -1
- package/lib/core/platform-process.d.ts +2 -2
- package/lib/core/platform-process.d.ts.map +1 -1
- package/lib/core/platform-process.js +8 -8
- package/lib/core/platform-process.js.map +1 -1
- package/package.json +1 -1
- package/skills/lux-answerer/SKILL.md +1 -1
- package/src/assertions/core/safe-regex.ts +16 -6
- package/src/assertions/rubric/evidence.ts +9 -0
- package/src/assertions/rubric/index.ts +2 -2
- package/src/container/driver.ts +10 -8
- package/src/container/paths.ts +29 -0
- package/src/container/resources.ts +21 -9
- package/src/core/platform-process.ts +9 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safe-regex.d.ts","sourceRoot":"","sources":["../../../src/assertions/core/safe-regex.ts"],"names":[],"mappings":"AAiGA,MAAM,MAAM,sBAAsB,GAAG;IACnC,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAAE,YAAY,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhF,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;
|
|
1
|
+
{"version":3,"file":"safe-regex.d.ts","sourceRoot":"","sources":["../../../src/assertions/core/safe-regex.ts"],"names":[],"mappings":"AAiGA,MAAM,MAAM,sBAAsB,GAAG;IACnC,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAAE,YAAY,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhF,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AA0DF,eAAO,MAAM,aAAa,YACf,MAAM,SACR,MAAM,QACP,MAAM,YACF,sBAAsB,KAC/B,OAAO,CAAC,OAAO,CACkE,CAAC;AAErF,eAAO,MAAM,gBAAgB,aACjB,MAAM,EAAE,SACX,MAAM,QACP,MAAM,YACF,sBAAsB,KAC/B,OAAO,CAAC,OAAO,EAAE,CACkE,CAAC;AAEvF,eAAO,MAAM,kBAAkB,aACnB,MAAM,EAAE,SACX,MAAM,YACH,sBAAsB,KAC/B,OAAO,CAAC,mBAAmB,EAAE,CACgE,CAAC;AAEjG,eAAO,MAAM,mBAAmB,WACtB,cAAc,EAAE,YACd,sBAAsB,KAC/B,OAAO,CAAC,OAAO,EAAE,EAAE,CACsD,CAAC;AAE7E,eAAO,MAAM,cAAc,YAChB,MAAM,SACR,MAAM,QACP,MAAM,aACD,MAAM,YACP,sBAAsB,KAC/B,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAIzC,CAAC"}
|
|
@@ -72,7 +72,13 @@ const evaluateRegex = async (task, options = {}) => await new Promise((resolve,
|
|
|
72
72
|
void worker.terminate();
|
|
73
73
|
};
|
|
74
74
|
const abort = () => finish(() => reject(options.abortSignal?.reason ?? new Error("regex evaluation aborted")));
|
|
75
|
-
|
|
75
|
+
let timeout = setTimeout(() => finish(() => reject(new Error("regex worker startup exceeded 30000ms"))), 30_000);
|
|
76
|
+
worker.once("online", () => {
|
|
77
|
+
if (settled)
|
|
78
|
+
return;
|
|
79
|
+
clearTimeout(timeout);
|
|
80
|
+
timeout = setTimeout(() => finish(() => reject(new Error(`regex evaluation exceeded ${options.timeoutMs ?? REGEX_TIMEOUT_MS}ms`))), options.timeoutMs ?? REGEX_TIMEOUT_MS);
|
|
81
|
+
});
|
|
76
82
|
worker.once("message", (response) => {
|
|
77
83
|
finish(() => {
|
|
78
84
|
if (response.ok)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safe-regex.js","sourceRoot":"","sources":["../../../src/assertions/core/safe-regex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAE/B,yEAAyE;AACzE,+EAA+E;AAC/E,MAAM,mBAAmB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqD3B,CAAC;AAmDF,MAAM,aAAa,GAAG,KAAK,EACzB,IAAe,EACf,OAAO,GAA2B,EAAE,EACxB,EAAE,CACd,MAAM,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IACvC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,mBAAmB,EAAE;QAC7C,IAAI,EAAE,IAAI;QACV,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IACH,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,MAAM,GAAG,CAAC,MAAkB,EAAE,EAAE;QACpC,IAAI,OAAO;YAAE,OAAO;QACpB,OAAO,GAAG,IAAI,CAAC;QACf,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACzD,MAAM,EAAE,CAAC;QACT,KAAK,MAAM,CAAC,SAAS,EAAE,CAAC;IAC1B,CAAC,CAAC;IACF,MAAM,KAAK,GAAG,GAAG,EAAE,CACjB,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,IAAI,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC;IAC7F,MAAM,OAAO,GAAG,UAAU,
|
|
1
|
+
{"version":3,"file":"safe-regex.js","sourceRoot":"","sources":["../../../src/assertions/core/safe-regex.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evidence.d.ts","sourceRoot":"","sources":["../../../src/assertions/rubric/evidence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"evidence.d.ts","sourceRoot":"","sources":["../../../src/assertions/rubric/evidence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAwExB,gGAAgG;AAChG,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAQJ,CAAC;AAE9B,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AACnE,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}
|
|
@@ -22,6 +22,15 @@ const defaults = {
|
|
|
22
22
|
toolInvocations: "recent",
|
|
23
23
|
maxInvocationChars: 120_000,
|
|
24
24
|
artifactPatterns: ["**/*"],
|
|
25
|
+
artifactExcludes: [
|
|
26
|
+
"**/node_modules/**",
|
|
27
|
+
"**/.git/**",
|
|
28
|
+
"**/package-lock.json",
|
|
29
|
+
"**/yarn.lock",
|
|
30
|
+
"**/pnpm-lock.yaml",
|
|
31
|
+
"**/bun.lock",
|
|
32
|
+
"**/bun.lockb",
|
|
33
|
+
],
|
|
25
34
|
includeArtifactContents: true,
|
|
26
35
|
maxEvents: 30,
|
|
27
36
|
maxAgentChars: 30_000,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evidence.js","sourceRoot":"","sources":["../../../src/assertions/rubric/evidence.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"evidence.js","sourceRoot":"","sources":["../../../src/assertions/rubric/evidence.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,8 +34,8 @@ export const RubricConfigSchema = z
|
|
|
34
34
|
timeout: DurationSchema.default("2 minutes"),
|
|
35
35
|
/** Override the default judge prompt template. */
|
|
36
36
|
promptOverride: z.string().max(120_000).optional(),
|
|
37
|
-
/** Cap
|
|
38
|
-
maxArtifactExcerpt: z.number().int().positive().max(20_000).default(
|
|
37
|
+
/** Cap per file; the total evidence budget still bounds the complete prompt. */
|
|
38
|
+
maxArtifactExcerpt: z.number().int().positive().max(20_000).default(20_000),
|
|
39
39
|
/** Select and bound the run evidence sent to the judge. */
|
|
40
40
|
evidence: RubricEvidenceSchema,
|
|
41
41
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/assertions/rubric/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAGL,mBAAmB,EAInB,sBAAsB,EACtB,qBAAqB,EACrB,YAAY,EACZ,QAAQ,GAET,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EACL,kBAAkB,EAClB,4BAA4B,EAC5B,qBAAqB,GACtB,MAAM,eAAe,CAAC;AAEvB;;;GAGG;AAEH,gFAAgF;AAChF,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAC7B,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAElC,OAAO,EAAiD,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAEpG,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC;KAChC,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACzB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC;IACtC,oFAAoF;IACpF,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;IAC1C,6CAA6C;IAC7C,QAAQ,EAAE,sBAAsB,CAAC,QAAQ,EAAE;IAC3C,yEAAyE;IACzE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,GAAG,mBAAmB;IACtB,4EAA4E;IAC5E,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,UAAU,EAAE,wBAAwB,CAAC,QAAQ,EAAE;IAC/C,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAChD,6EAA6E;IAC7E,eAAe,EAAE,qBAAqB,CAAC,QAAQ,EAAE;IACjD,qDAAqD;IACrD,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC;IAC5C,kDAAkD;IAClD,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE;IAClD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/assertions/rubric/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/container/driver.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC7F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EACL,KAAK,MAAM,EAKX,KAAK,UAAU,EAEhB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/container/driver.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC7F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EACL,KAAK,MAAM,EAKX,KAAK,UAAU,EAEhB,MAAM,mBAAmB,CAAC;AAQ3B,qBAAa,eAAgB,SAAQ,YAAY,CAAC,cAAc,CAAE,YAAW,WAAW;IACtF,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,SAAS,CAA2D;IAC5E,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,OAAO,CAGX;IACJ,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAEpB;IAEF,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqB;IAC/C,YAAY,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAUvE;IAED,OAAO,CAAC,IAAI,CAOV;IAEF,OAAO,CAAC,OAAO,CA+Bb;IAEF,OAAO,CAAC,GAAG,CA2BN;IAEC,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,CAkDlD;IAEK,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3C;IACK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAE7B;IACK,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,CAenC;IACD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAerB;CACF"}
|
package/lib/container/driver.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { realpath } from "node:fs/promises";
|
|
2
|
-
import {
|
|
2
|
+
import { posix } from "node:path";
|
|
3
3
|
import { TypedEmitter } from "../core/emitter.js";
|
|
4
4
|
import { DoneSchema, ErrorEventSchema, InterruptSchema, ProgressSchema, ReadyStateSchema, } from "../core/events.js";
|
|
5
5
|
import { spawnManagedProcess } from "../core/exec.js";
|
|
6
6
|
import { walkArtifacts } from "../drivers/shared/artifacts.js";
|
|
7
7
|
import { LUX_VERSION } from "../orchestrator/package-version.js";
|
|
8
|
+
import { containerPaths } from "./paths.js";
|
|
8
9
|
import { readMessages, writeMessage } from "./protocol.js";
|
|
9
10
|
import { prepareContainer } from "./resources.js";
|
|
10
11
|
export class ContainerDriver extends TypedEmitter {
|
|
@@ -131,13 +132,13 @@ export class ContainerDriver extends TypedEmitter {
|
|
|
131
132
|
const ready = ReadyStateSchema.parse(await this.rpc("start", {
|
|
132
133
|
version: LUX_VERSION,
|
|
133
134
|
name: this.name,
|
|
134
|
-
config: this.config,
|
|
135
|
+
config: containerPaths(this.config, this.resources.pathMappings),
|
|
135
136
|
module: this.execution.driverModule,
|
|
136
137
|
context: {
|
|
137
|
-
...context,
|
|
138
|
-
artifactsDir: this.resources.
|
|
138
|
+
...containerPaths(context, this.resources.pathMappings),
|
|
139
|
+
artifactsDir: this.resources.containerRoot,
|
|
139
140
|
...(context.fixtures
|
|
140
|
-
? { fixtures: { ...context.fixtures, rootDir: this.resources.
|
|
141
|
+
? { fixtures: { ...context.fixtures, rootDir: this.resources.containerRoot } }
|
|
141
142
|
: {}),
|
|
142
143
|
runDir: "/tmp/lux-run",
|
|
143
144
|
runsRoot: "/tmp/lux-runs",
|
|
@@ -161,13 +162,14 @@ export class ContainerDriver extends TypedEmitter {
|
|
|
161
162
|
}
|
|
162
163
|
async collect() {
|
|
163
164
|
const root = this.resources?.root;
|
|
164
|
-
|
|
165
|
+
const containerRoot = this.resources?.containerRoot;
|
|
166
|
+
if (!root || !containerRoot)
|
|
165
167
|
return [];
|
|
166
168
|
try {
|
|
167
169
|
const artifacts = (await this.rpc("collect"));
|
|
168
170
|
for (const artifact of artifacts) {
|
|
169
|
-
const path = resolve(artifact.root ??
|
|
170
|
-
if (path !==
|
|
171
|
+
const path = posix.resolve(artifact.root ?? containerRoot, artifact.path);
|
|
172
|
+
if (path !== containerRoot && !path.startsWith(`${containerRoot}/`))
|
|
171
173
|
throw new Error("container driver returned artifacts outside its mounted workspace");
|
|
172
174
|
}
|
|
173
175
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../src/container/driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../src/container/driver.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/container/paths.ts"],"names":[],"mappings":"AAAA,oFAAoF;AACpF,eAAO,MAAM,cAAc,GAAI,CAAC,SACvB,CAAC,YACE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,KAC/C,CAwBF,CAAC"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/** Translate only mounted host paths; unrelated configuration remains untouched. */
|
|
2
|
+
export const containerPaths = (value, mappings) => {
|
|
3
|
+
const ordered = [...mappings].sort(([a], [b]) => b.length - a.length);
|
|
4
|
+
const visit = (entry) => {
|
|
5
|
+
if (typeof entry === "string") {
|
|
6
|
+
let text = entry;
|
|
7
|
+
for (const [source, target] of ordered) {
|
|
8
|
+
if (source === target)
|
|
9
|
+
continue;
|
|
10
|
+
if (text === source)
|
|
11
|
+
return target;
|
|
12
|
+
if (text.startsWith(`${source}\\`) || text.startsWith(`${source}/`))
|
|
13
|
+
return target + text.slice(source.length).replaceAll("\\", "/");
|
|
14
|
+
const escaped = source.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
15
|
+
text = text.replace(new RegExp(`${escaped}([\\\\/][^\\s"']*)?(?=$|[\\s"'])`, "g"), (_match, suffix) => target + (suffix ?? "").replaceAll("\\", "/"));
|
|
16
|
+
}
|
|
17
|
+
return text;
|
|
18
|
+
}
|
|
19
|
+
if (Array.isArray(entry))
|
|
20
|
+
return entry.map(visit);
|
|
21
|
+
if (entry && typeof entry === "object")
|
|
22
|
+
return Object.fromEntries(Object.entries(entry).map(([key, item]) => [key, visit(item)]));
|
|
23
|
+
return entry;
|
|
24
|
+
};
|
|
25
|
+
return visit(value);
|
|
26
|
+
};
|
|
27
|
+
//# sourceMappingURL=paths.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/container/paths.ts"],"names":[],"mappings":"AAAA,oFAAoF;AACpF,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,KAAQ,EACR,QAAgD,EAC7C,EAAE;IACL,MAAM,OAAO,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;IACtE,MAAM,KAAK,GAAG,CAAC,KAAc,EAAW,EAAE;QACxC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,IAAI,IAAI,GAAG,KAAK,CAAC;YACjB,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;gBACvC,IAAI,MAAM,KAAK,MAAM;oBAAE,SAAS;gBAChC,IAAI,IAAI,KAAK,MAAM;oBAAE,OAAO,MAAM,CAAC;gBACnC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,MAAM,GAAG,CAAC;oBACjE,OAAO,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBAClE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;gBAC9D,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,IAAI,MAAM,CAAC,GAAG,OAAO,kCAAkC,EAAE,GAAG,CAAC,EAC7D,CAAC,MAAM,EAAE,MAA0B,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CACtF,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;YACpC,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5F,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IACF,OAAO,KAAK,CAAC,KAAK,CAAM,CAAC;AAC3B,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../src/container/resources.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../src/container/resources.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAetE,eAAO,MAAM,gBAAgB,WAAkB,kBAAkB,aAAa,MAAM;;;;;;;;;;;EAiJnF,CAAC"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
2
|
import { chmod, copyFile, lstat, mkdir, mkdtemp, realpath, rm, writeFile } from "node:fs/promises";
|
|
3
3
|
import { tmpdir } from "node:os";
|
|
4
|
-
import { dirname, isAbsolute, join, resolve } from "node:path";
|
|
4
|
+
import { dirname, isAbsolute, join, posix, resolve } from "node:path";
|
|
5
5
|
import { exec } from "../core/exec.js";
|
|
6
6
|
const mount = (source, target, readOnly = false) => {
|
|
7
|
-
if (
|
|
7
|
+
if (!isAbsolute(source) ||
|
|
8
|
+
!posix.isAbsolute(target) ||
|
|
9
|
+
[source, target].some((path) => /[,\r\n\0]/u.test(path)))
|
|
8
10
|
throw new Error("container mount paths must be absolute and contain no commas or control characters");
|
|
9
11
|
return `type=bind,source=${source},target=${target}${readOnly ? ",readonly" : ""}`;
|
|
10
12
|
};
|
|
@@ -53,6 +55,8 @@ export const prepareContainer = async (config, workspace) => {
|
|
|
53
55
|
await chmod(target, 0o600);
|
|
54
56
|
}
|
|
55
57
|
const root = await realpath(workspace);
|
|
58
|
+
const containerRoot = process.platform === "win32" ? "/lux-workspace" : root;
|
|
59
|
+
const pathMappings = [[root, containerRoot]];
|
|
56
60
|
const args = [
|
|
57
61
|
"run",
|
|
58
62
|
"--init",
|
|
@@ -79,9 +83,9 @@ export const prepareContainer = async (config, workspace) => {
|
|
|
79
83
|
"--tmpfs",
|
|
80
84
|
"/tmp:rw,nosuid,nodev,exec,size=1g,mode=1777",
|
|
81
85
|
"--workdir",
|
|
82
|
-
|
|
86
|
+
containerRoot,
|
|
83
87
|
"--mount",
|
|
84
|
-
mount(root,
|
|
88
|
+
mount(root, containerRoot),
|
|
85
89
|
"--mount",
|
|
86
90
|
mount(await realpath(home), "/home/lux"),
|
|
87
91
|
"--env",
|
|
@@ -91,7 +95,10 @@ export const prepareContainer = async (config, workspace) => {
|
|
|
91
95
|
];
|
|
92
96
|
for (const entry of config.mounts ?? []) {
|
|
93
97
|
const source = await realpath(entry.source);
|
|
94
|
-
const
|
|
98
|
+
const requested = entry.target ?? source;
|
|
99
|
+
if (!posix.isAbsolute(requested))
|
|
100
|
+
throw new Error("container mount target must be an absolute Linux path and must not overlap host paths");
|
|
101
|
+
const target = posix.normalize(requested);
|
|
95
102
|
if ([
|
|
96
103
|
"/",
|
|
97
104
|
"/home",
|
|
@@ -106,11 +113,12 @@ export const prepareContainer = async (config, workspace) => {
|
|
|
106
113
|
"/sys",
|
|
107
114
|
"/dev",
|
|
108
115
|
].some((reserved) => target === reserved || (reserved !== "/" && target.startsWith(`${reserved}/`))) ||
|
|
109
|
-
target ===
|
|
110
|
-
|
|
111
|
-
target.startsWith(`${
|
|
116
|
+
target === containerRoot ||
|
|
117
|
+
containerRoot.startsWith(`${target}/`) ||
|
|
118
|
+
target.startsWith(`${containerRoot}/`))
|
|
112
119
|
throw new Error("additional container mounts must not overlap the workspace or runtime paths");
|
|
113
120
|
args.push("--mount", mount(source, target, entry.readOnly ?? true));
|
|
121
|
+
pathMappings.push([resolve(entry.source), target], [source, target]);
|
|
114
122
|
}
|
|
115
123
|
const env = { ...process.env };
|
|
116
124
|
for (const key of new Set([...(config.passEnv ?? []), ...Object.keys(config.env ?? {})])) {
|
|
@@ -123,7 +131,7 @@ export const prepareContainer = async (config, workspace) => {
|
|
|
123
131
|
args.push("--env", key);
|
|
124
132
|
}
|
|
125
133
|
args.push("--entrypoint", "node", image, config.worker ?? "/opt/lux/lib/container/worker.js");
|
|
126
|
-
return { command, args, env, image, root, cleanup };
|
|
134
|
+
return { command, args, env, image, root, containerRoot, pathMappings, cleanup };
|
|
127
135
|
}
|
|
128
136
|
catch (error) {
|
|
129
137
|
await rm(home, { recursive: true, force: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../src/container/resources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACnG,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../src/container/resources.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,9 +30,9 @@ export declare const windowsDescendants: (rootPid: number, processes: readonly I
|
|
|
30
30
|
pid: number;
|
|
31
31
|
ppid: number;
|
|
32
32
|
}) => IProcessInfo[];
|
|
33
|
-
export declare const forceWindowsTree: (pid: number, discover?: (pid: number) => Promise<IProcessInfo[]>, signal?: (pid: number) => void, discoveryTimeoutMs?: number) => Promise<void>;
|
|
33
|
+
export declare const forceWindowsTree: (pid: number, discover?: (pid: number) => Promise<IProcessInfo[]>, signal?: (pid: number) => void, discoveryTimeoutMs?: number, stillOwned?: () => boolean) => Promise<void>;
|
|
34
34
|
export declare const posixProcessPlatform: (signalGroup?: (child: ChildProcess, signal: NodeJS.Signals) => void) => ProcessPlatform;
|
|
35
|
-
export declare const windowsProcessPlatform: (forceTree?: (pid: number) => Promise<void>) => ProcessPlatform;
|
|
35
|
+
export declare const windowsProcessPlatform: (forceTree?: (pid: number, stillOwned: () => boolean) => Promise<void>) => ProcessPlatform;
|
|
36
36
|
export declare const processTreeFor: (child: ChildProcess) => ProcessTree;
|
|
37
37
|
export {};
|
|
38
38
|
//# sourceMappingURL=platform-process.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform-process.d.ts","sourceRoot":"","sources":["../../src/core/platform-process.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,8BAA8B,EAGpC,MAAM,oBAAoB,CAAC;AAG5B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAGjE,KAAK,iBAAiB,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;AAEvD,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,6EAA6E;IAC7E,QAAQ,CAAC,sBAAsB,EAAE,OAAO,CAAC;IACzC,iDAAiD;IACjD,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,2DAA2D;IAC3D,cAAc,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,cAAc,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,WAAW,CAAC;CACtD,CAAC;AAoBF,eAAO,MAAM,uBAAuB,cACvB,MAAM,CAAC,UAAU,aACjB,MAAM,CAAC,UAAU,GAAG,SAAS,aAC9B,iBAAiB,KAC1B,MAAM,CAAC,UAWT,CAAC;AAiBF,eAAO,MAAM,iBAAiB,YACnB,MAAM,gBACF,MAAM,CAAC,UAAU,aACpB,iBAAiB,QACtB,MAAM,KACV,MAAM,GAAG,SA2BX,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,YACf,MAAM,QACT,SAAS,MAAM,EAAE,WACd,oBAAoB,KAC5B,8BAgCF,CAAC;AAmCF,eAAO,MAAM,kBAAkB,YACpB,MAAM,aACJ,SAAS,YAAY,EAAE,UAC3B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,KACnC,YAAY,EAwBd,CAAC;AASF,eAAO,MAAM,gBAAgB,QACtB,MAAM,aACD,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,YAAY,EAAE,CAAC,WAC1C,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"platform-process.d.ts","sourceRoot":"","sources":["../../src/core/platform-process.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,8BAA8B,EAGpC,MAAM,oBAAoB,CAAC;AAG5B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAGjE,KAAK,iBAAiB,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;AAEvD,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,6EAA6E;IAC7E,QAAQ,CAAC,sBAAsB,EAAE,OAAO,CAAC;IACzC,iDAAiD;IACjD,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,2DAA2D;IAC3D,cAAc,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,cAAc,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,WAAW,CAAC;CACtD,CAAC;AAoBF,eAAO,MAAM,uBAAuB,cACvB,MAAM,CAAC,UAAU,aACjB,MAAM,CAAC,UAAU,GAAG,SAAS,aAC9B,iBAAiB,KAC1B,MAAM,CAAC,UAWT,CAAC;AAiBF,eAAO,MAAM,iBAAiB,YACnB,MAAM,gBACF,MAAM,CAAC,UAAU,aACpB,iBAAiB,QACtB,MAAM,KACV,MAAM,GAAG,SA2BX,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,YACf,MAAM,QACT,SAAS,MAAM,EAAE,WACd,oBAAoB,KAC5B,8BAgCF,CAAC;AAmCF,eAAO,MAAM,kBAAkB,YACpB,MAAM,aACJ,SAAS,YAAY,EAAE,UAC3B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,KACnC,YAAY,EAwBd,CAAC;AASF,eAAO,MAAM,gBAAgB,QACtB,MAAM,aACD,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,YAAY,EAAE,CAAC,WAC1C,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,4CAEjB,MAAM,OAAO,KACxB,OAAO,CAAC,IAAI,CA+Bd,CAAC;AAgBF,eAAO,MAAM,oBAAoB,iBAClB,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,KACjE,eAgBD,CAAC;AAEH,eAAO,MAAM,sBAAsB,eACtB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,KAEnE,eAoBD,CAAC;AAKH,eAAO,MAAM,cAAc,UAAW,YAAY,KAAG,WACT,CAAC"}
|
|
@@ -162,8 +162,8 @@ const windowsProcessList = async () => {
|
|
|
162
162
|
getAllProcesses(resolve);
|
|
163
163
|
});
|
|
164
164
|
};
|
|
165
|
-
export const forceWindowsTree = async (pid, discover = windowsProcessList, signal = signalWindowsProcess, discoveryTimeoutMs = 2_000) => {
|
|
166
|
-
if (!safeWindowsSignalTarget(pid))
|
|
165
|
+
export const forceWindowsTree = async (pid, discover = windowsProcessList, signal = signalWindowsProcess, discoveryTimeoutMs = 2_000, stillOwned = () => true) => {
|
|
166
|
+
if (!stillOwned() || !safeWindowsSignalTarget(pid))
|
|
167
167
|
return;
|
|
168
168
|
let processes = [];
|
|
169
169
|
let timer;
|
|
@@ -182,7 +182,8 @@ export const forceWindowsTree = async (pid, discover = windowsProcessList, signa
|
|
|
182
182
|
if (timer)
|
|
183
183
|
clearTimeout(timer);
|
|
184
184
|
}
|
|
185
|
-
|
|
185
|
+
// Discovery is asynchronous; an exited leader can already have a recycled PID.
|
|
186
|
+
if (!stillOwned() || windowsAncestorPids(processes, process).has(pid))
|
|
186
187
|
return;
|
|
187
188
|
const descendants = windowsDescendants(pid, processes);
|
|
188
189
|
for (const process of descendants.toReversed()) {
|
|
@@ -222,20 +223,19 @@ export const posixProcessPlatform = (signalGroup = signalPosixGroup) => ({
|
|
|
222
223
|
};
|
|
223
224
|
},
|
|
224
225
|
});
|
|
225
|
-
export const windowsProcessPlatform = (forceTree = forceWindowsTree) => ({
|
|
226
|
+
export const windowsProcessPlatform = (forceTree = (pid, stillOwned) => forceWindowsTree(pid, undefined, undefined, undefined, stillOwned)) => ({
|
|
226
227
|
detached: false,
|
|
227
228
|
processTreeFor: (child) => {
|
|
228
229
|
const pid = child.pid;
|
|
229
230
|
let forced;
|
|
231
|
+
const stillOwned = () => child.exitCode == null && child.signalCode == null;
|
|
230
232
|
const forceOnce = () => {
|
|
231
233
|
if (forced)
|
|
232
234
|
return forced;
|
|
233
|
-
|
|
234
|
-
(child.signalCode !== null && child.signalCode !== undefined);
|
|
235
|
-
if (pid === undefined || leaderHasExited)
|
|
235
|
+
if (pid === undefined || !stillOwned())
|
|
236
236
|
forced = Promise.resolve();
|
|
237
237
|
else
|
|
238
|
-
forced = forceTree(pid);
|
|
238
|
+
forced = forceTree(pid, stillOwned);
|
|
239
239
|
return forced;
|
|
240
240
|
};
|
|
241
241
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform-process.js","sourceRoot":"","sources":["../../src/core/platform-process.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"platform-process.js","sourceRoot":"","sources":["../../src/core/platform-process.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prismatic-io/lux",
|
|
3
|
-
"version": "0.0.2-preview.
|
|
3
|
+
"version": "0.0.2-preview.39",
|
|
4
4
|
"description": "Coding-agent evaluation and improvement with deterministic assertions, optional LLM judges, and first-class human-in-the-loop runs.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://github.com/prismatic-io/lux",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
---
|
|
2
2
|
name: lux-answerer
|
|
3
|
-
version: 0.0.2-preview.
|
|
3
|
+
version: 0.0.2-preview.39
|
|
4
4
|
description: Play the persona for a running Lux orchestrator that uses the claude-code answerer. Read structured events on stdout, decide answers from persona + context, write JSON to its answer channel.
|
|
5
5
|
user-invocable: false
|
|
6
6
|
allowed-tools: Bash, Read
|
|
@@ -128,13 +128,23 @@ const evaluateRegex = async <T>(
|
|
|
128
128
|
};
|
|
129
129
|
const abort = () =>
|
|
130
130
|
finish(() => reject(options.abortSignal?.reason ?? new Error("regex evaluation aborted")));
|
|
131
|
-
|
|
132
|
-
() =>
|
|
133
|
-
|
|
134
|
-
reject(new Error(`regex evaluation exceeded ${options.timeoutMs ?? REGEX_TIMEOUT_MS}ms`)),
|
|
135
|
-
),
|
|
136
|
-
options.timeoutMs ?? REGEX_TIMEOUT_MS,
|
|
131
|
+
let timeout = setTimeout(
|
|
132
|
+
() => finish(() => reject(new Error("regex worker startup exceeded 30000ms"))),
|
|
133
|
+
30_000,
|
|
137
134
|
);
|
|
135
|
+
worker.once("online", () => {
|
|
136
|
+
if (settled) return;
|
|
137
|
+
clearTimeout(timeout);
|
|
138
|
+
timeout = setTimeout(
|
|
139
|
+
() =>
|
|
140
|
+
finish(() =>
|
|
141
|
+
reject(
|
|
142
|
+
new Error(`regex evaluation exceeded ${options.timeoutMs ?? REGEX_TIMEOUT_MS}ms`),
|
|
143
|
+
),
|
|
144
|
+
),
|
|
145
|
+
options.timeoutMs ?? REGEX_TIMEOUT_MS,
|
|
146
|
+
);
|
|
147
|
+
});
|
|
138
148
|
worker.once("message", (response: WorkerResponse<T>) => {
|
|
139
149
|
finish(() => {
|
|
140
150
|
if (response.ok) resolve(response.value);
|
|
@@ -28,6 +28,15 @@ const defaults: Evidence = {
|
|
|
28
28
|
toolInvocations: "recent",
|
|
29
29
|
maxInvocationChars: 120_000,
|
|
30
30
|
artifactPatterns: ["**/*"],
|
|
31
|
+
artifactExcludes: [
|
|
32
|
+
"**/node_modules/**",
|
|
33
|
+
"**/.git/**",
|
|
34
|
+
"**/package-lock.json",
|
|
35
|
+
"**/yarn.lock",
|
|
36
|
+
"**/pnpm-lock.yaml",
|
|
37
|
+
"**/bun.lock",
|
|
38
|
+
"**/bun.lockb",
|
|
39
|
+
],
|
|
31
40
|
includeArtifactContents: true,
|
|
32
41
|
maxEvents: 30,
|
|
33
42
|
maxAgentChars: 30_000,
|
|
@@ -54,8 +54,8 @@ export const RubricConfigSchema = z
|
|
|
54
54
|
timeout: DurationSchema.default("2 minutes"),
|
|
55
55
|
/** Override the default judge prompt template. */
|
|
56
56
|
promptOverride: z.string().max(120_000).optional(),
|
|
57
|
-
/** Cap
|
|
58
|
-
maxArtifactExcerpt: z.number().int().positive().max(20_000).default(
|
|
57
|
+
/** Cap per file; the total evidence budget still bounds the complete prompt. */
|
|
58
|
+
maxArtifactExcerpt: z.number().int().positive().max(20_000).default(20_000),
|
|
59
59
|
/** Select and bound the run evidence sent to the judge. */
|
|
60
60
|
evidence: RubricEvidenceSchema,
|
|
61
61
|
})
|
package/src/container/driver.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { realpath } from "node:fs/promises";
|
|
2
|
-
import {
|
|
2
|
+
import { posix } from "node:path";
|
|
3
3
|
import type { AgentDriver, Artifact, DriverEventMap, StartContext } from "../core/driver.js";
|
|
4
4
|
import type { ContainerExecution } from "../core/driver-execution.js";
|
|
5
5
|
import { TypedEmitter } from "../core/emitter.js";
|
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
import { type ManagedProcess, spawnManagedProcess } from "../core/exec.js";
|
|
16
16
|
import { walkArtifacts } from "../drivers/shared/artifacts.js";
|
|
17
17
|
import { LUX_VERSION } from "../orchestrator/package-version.js";
|
|
18
|
+
import { containerPaths } from "./paths.js";
|
|
18
19
|
import { type Message, readMessages, writeMessage } from "./protocol.js";
|
|
19
20
|
import { prepareContainer } from "./resources.js";
|
|
20
21
|
|
|
@@ -146,13 +147,13 @@ export class ContainerDriver extends TypedEmitter<DriverEventMap> implements Age
|
|
|
146
147
|
{
|
|
147
148
|
version: LUX_VERSION,
|
|
148
149
|
name: this.name,
|
|
149
|
-
config: this.config,
|
|
150
|
+
config: containerPaths(this.config, this.resources.pathMappings),
|
|
150
151
|
module: this.execution.driverModule,
|
|
151
152
|
context: {
|
|
152
|
-
...context,
|
|
153
|
-
artifactsDir: this.resources.
|
|
153
|
+
...containerPaths(context, this.resources.pathMappings),
|
|
154
|
+
artifactsDir: this.resources.containerRoot,
|
|
154
155
|
...(context.fixtures
|
|
155
|
-
? { fixtures: { ...context.fixtures, rootDir: this.resources.
|
|
156
|
+
? { fixtures: { ...context.fixtures, rootDir: this.resources.containerRoot } }
|
|
156
157
|
: {}),
|
|
157
158
|
runDir: "/tmp/lux-run",
|
|
158
159
|
runsRoot: "/tmp/lux-runs",
|
|
@@ -179,12 +180,13 @@ export class ContainerDriver extends TypedEmitter<DriverEventMap> implements Age
|
|
|
179
180
|
}
|
|
180
181
|
async collect(): Promise<Artifact[]> {
|
|
181
182
|
const root = this.resources?.root;
|
|
182
|
-
|
|
183
|
+
const containerRoot = this.resources?.containerRoot;
|
|
184
|
+
if (!root || !containerRoot) return [];
|
|
183
185
|
try {
|
|
184
186
|
const artifacts = (await this.rpc("collect")) as Artifact[];
|
|
185
187
|
for (const artifact of artifacts) {
|
|
186
|
-
const path = resolve(artifact.root ??
|
|
187
|
-
if (path !==
|
|
188
|
+
const path = posix.resolve(artifact.root ?? containerRoot, artifact.path);
|
|
189
|
+
if (path !== containerRoot && !path.startsWith(`${containerRoot}/`))
|
|
188
190
|
throw new Error("container driver returned artifacts outside its mounted workspace");
|
|
189
191
|
}
|
|
190
192
|
} finally {
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
/** Translate only mounted host paths; unrelated configuration remains untouched. */
|
|
2
|
+
export const containerPaths = <T>(
|
|
3
|
+
value: T,
|
|
4
|
+
mappings: readonly (readonly [string, string])[],
|
|
5
|
+
): T => {
|
|
6
|
+
const ordered = [...mappings].sort(([a], [b]) => b.length - a.length);
|
|
7
|
+
const visit = (entry: unknown): unknown => {
|
|
8
|
+
if (typeof entry === "string") {
|
|
9
|
+
let text = entry;
|
|
10
|
+
for (const [source, target] of ordered) {
|
|
11
|
+
if (source === target) continue;
|
|
12
|
+
if (text === source) return target;
|
|
13
|
+
if (text.startsWith(`${source}\\`) || text.startsWith(`${source}/`))
|
|
14
|
+
return target + text.slice(source.length).replaceAll("\\", "/");
|
|
15
|
+
const escaped = source.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
16
|
+
text = text.replace(
|
|
17
|
+
new RegExp(`${escaped}([\\\\/][^\\s"']*)?(?=$|[\\s"'])`, "g"),
|
|
18
|
+
(_match, suffix: string | undefined) => target + (suffix ?? "").replaceAll("\\", "/"),
|
|
19
|
+
);
|
|
20
|
+
}
|
|
21
|
+
return text;
|
|
22
|
+
}
|
|
23
|
+
if (Array.isArray(entry)) return entry.map(visit);
|
|
24
|
+
if (entry && typeof entry === "object")
|
|
25
|
+
return Object.fromEntries(Object.entries(entry).map(([key, item]) => [key, visit(item)]));
|
|
26
|
+
return entry;
|
|
27
|
+
};
|
|
28
|
+
return visit(value) as T;
|
|
29
|
+
};
|
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
2
|
import { chmod, copyFile, lstat, mkdir, mkdtemp, realpath, rm, writeFile } from "node:fs/promises";
|
|
3
3
|
import { tmpdir } from "node:os";
|
|
4
|
-
import { dirname, isAbsolute, join, resolve } from "node:path";
|
|
4
|
+
import { dirname, isAbsolute, join, posix, resolve } from "node:path";
|
|
5
5
|
import type { ContainerExecution } from "../core/driver-execution.js";
|
|
6
6
|
import { exec } from "../core/exec.js";
|
|
7
7
|
|
|
8
8
|
const mount = (source: string, target: string, readOnly = false): string => {
|
|
9
|
-
if (
|
|
9
|
+
if (
|
|
10
|
+
!isAbsolute(source) ||
|
|
11
|
+
!posix.isAbsolute(target) ||
|
|
12
|
+
[source, target].some((path) => /[,\r\n\0]/u.test(path))
|
|
13
|
+
)
|
|
10
14
|
throw new Error(
|
|
11
15
|
"container mount paths must be absolute and contain no commas or control characters",
|
|
12
16
|
);
|
|
@@ -69,6 +73,8 @@ export const prepareContainer = async (config: ContainerExecution, workspace: st
|
|
|
69
73
|
await chmod(target, 0o600);
|
|
70
74
|
}
|
|
71
75
|
const root = await realpath(workspace);
|
|
76
|
+
const containerRoot = process.platform === "win32" ? "/lux-workspace" : root;
|
|
77
|
+
const pathMappings: [string, string][] = [[root, containerRoot]];
|
|
72
78
|
const args = [
|
|
73
79
|
"run",
|
|
74
80
|
"--init",
|
|
@@ -95,9 +101,9 @@ export const prepareContainer = async (config: ContainerExecution, workspace: st
|
|
|
95
101
|
"--tmpfs",
|
|
96
102
|
"/tmp:rw,nosuid,nodev,exec,size=1g,mode=1777",
|
|
97
103
|
"--workdir",
|
|
98
|
-
|
|
104
|
+
containerRoot,
|
|
99
105
|
"--mount",
|
|
100
|
-
mount(root,
|
|
106
|
+
mount(root, containerRoot),
|
|
101
107
|
"--mount",
|
|
102
108
|
mount(await realpath(home), "/home/lux"),
|
|
103
109
|
"--env",
|
|
@@ -107,7 +113,12 @@ export const prepareContainer = async (config: ContainerExecution, workspace: st
|
|
|
107
113
|
];
|
|
108
114
|
for (const entry of config.mounts ?? []) {
|
|
109
115
|
const source = await realpath(entry.source);
|
|
110
|
-
const
|
|
116
|
+
const requested = entry.target ?? source;
|
|
117
|
+
if (!posix.isAbsolute(requested))
|
|
118
|
+
throw new Error(
|
|
119
|
+
"container mount target must be an absolute Linux path and must not overlap host paths",
|
|
120
|
+
);
|
|
121
|
+
const target = posix.normalize(requested);
|
|
111
122
|
if (
|
|
112
123
|
[
|
|
113
124
|
"/",
|
|
@@ -126,14 +137,15 @@ export const prepareContainer = async (config: ContainerExecution, workspace: st
|
|
|
126
137
|
(reserved) =>
|
|
127
138
|
target === reserved || (reserved !== "/" && target.startsWith(`${reserved}/`)),
|
|
128
139
|
) ||
|
|
129
|
-
target ===
|
|
130
|
-
|
|
131
|
-
target.startsWith(`${
|
|
140
|
+
target === containerRoot ||
|
|
141
|
+
containerRoot.startsWith(`${target}/`) ||
|
|
142
|
+
target.startsWith(`${containerRoot}/`)
|
|
132
143
|
)
|
|
133
144
|
throw new Error(
|
|
134
145
|
"additional container mounts must not overlap the workspace or runtime paths",
|
|
135
146
|
);
|
|
136
147
|
args.push("--mount", mount(source, target, entry.readOnly ?? true));
|
|
148
|
+
pathMappings.push([resolve(entry.source), target], [source, target]);
|
|
137
149
|
}
|
|
138
150
|
const env = { ...process.env };
|
|
139
151
|
for (const key of new Set([...(config.passEnv ?? []), ...Object.keys(config.env ?? {})])) {
|
|
@@ -145,7 +157,7 @@ export const prepareContainer = async (config: ContainerExecution, workspace: st
|
|
|
145
157
|
args.push("--env", key);
|
|
146
158
|
}
|
|
147
159
|
args.push("--entrypoint", "node", image, config.worker ?? "/opt/lux/lib/container/worker.js");
|
|
148
|
-
return { command, args, env, image, root, cleanup };
|
|
160
|
+
return { command, args, env, image, root, containerRoot, pathMappings, cleanup };
|
|
149
161
|
} catch (error) {
|
|
150
162
|
await rm(home, { recursive: true, force: true });
|
|
151
163
|
throw error;
|
|
@@ -233,8 +233,9 @@ export const forceWindowsTree = async (
|
|
|
233
233
|
discover: (pid: number) => Promise<IProcessInfo[]> = windowsProcessList,
|
|
234
234
|
signal: (pid: number) => void = signalWindowsProcess,
|
|
235
235
|
discoveryTimeoutMs = 2_000,
|
|
236
|
+
stillOwned: () => boolean = () => true,
|
|
236
237
|
): Promise<void> => {
|
|
237
|
-
if (!safeWindowsSignalTarget(pid)) return;
|
|
238
|
+
if (!stillOwned() || !safeWindowsSignalTarget(pid)) return;
|
|
238
239
|
let processes: IProcessInfo[] = [];
|
|
239
240
|
let timer: NodeJS.Timeout | undefined;
|
|
240
241
|
try {
|
|
@@ -257,7 +258,8 @@ export const forceWindowsTree = async (
|
|
|
257
258
|
} finally {
|
|
258
259
|
if (timer) clearTimeout(timer);
|
|
259
260
|
}
|
|
260
|
-
|
|
261
|
+
// Discovery is asynchronous; an exited leader can already have a recycled PID.
|
|
262
|
+
if (!stillOwned() || windowsAncestorPids(processes, process).has(pid)) return;
|
|
261
263
|
const descendants = windowsDescendants(pid, processes);
|
|
262
264
|
for (const process of descendants.toReversed()) {
|
|
263
265
|
if (safeWindowsSignalTarget(process.pid)) signal(process.pid);
|
|
@@ -300,19 +302,18 @@ export const posixProcessPlatform = (
|
|
|
300
302
|
});
|
|
301
303
|
|
|
302
304
|
export const windowsProcessPlatform = (
|
|
303
|
-
forceTree: (pid: number) => Promise<void> =
|
|
305
|
+
forceTree: (pid: number, stillOwned: () => boolean) => Promise<void> = (pid, stillOwned) =>
|
|
306
|
+
forceWindowsTree(pid, undefined, undefined, undefined, stillOwned),
|
|
304
307
|
): ProcessPlatform => ({
|
|
305
308
|
detached: false,
|
|
306
309
|
processTreeFor: (child) => {
|
|
307
310
|
const pid = child.pid;
|
|
308
311
|
let forced: Promise<void> | undefined;
|
|
312
|
+
const stillOwned = (): boolean => child.exitCode == null && child.signalCode == null;
|
|
309
313
|
const forceOnce = (): Promise<void> => {
|
|
310
314
|
if (forced) return forced;
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
(child.signalCode !== null && child.signalCode !== undefined);
|
|
314
|
-
if (pid === undefined || leaderHasExited) forced = Promise.resolve();
|
|
315
|
-
else forced = forceTree(pid);
|
|
315
|
+
if (pid === undefined || !stillOwned()) forced = Promise.resolve();
|
|
316
|
+
else forced = forceTree(pid, stillOwned);
|
|
316
317
|
return forced;
|
|
317
318
|
};
|
|
318
319
|
return {
|