@auvira.ai/sdk 0.3.0 → 0.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/runner/index.d.ts +2 -2
- package/dist/runner/index.d.ts.map +1 -1
- package/dist/runner/index.js +2 -2
- package/dist/runner/index.js.map +1 -1
- package/dist/runner/jobTypes.d.ts +1 -0
- package/dist/runner/jobTypes.d.ts.map +1 -1
- package/dist/runner/mapStreamEvents.d.ts +4 -2
- package/dist/runner/mapStreamEvents.d.ts.map +1 -1
- package/dist/runner/mapStreamEvents.js +38 -3
- package/dist/runner/mapStreamEvents.js.map +1 -1
- package/dist/runner/run.d.ts +3 -0
- package/dist/runner/run.d.ts.map +1 -1
- package/dist/runner/run.js +14 -2
- package/dist/runner/run.js.map +1 -1
- package/package.json +1 -1
package/dist/index.d.ts
CHANGED
|
@@ -10,6 +10,6 @@ export type { AgentRunEvent, AgentRunEventType, AgentToolName, AssistantContentB
|
|
|
10
10
|
export { AGENT_TOOL_NAMES, isToolEvent, isAssistantEvent, } from "./agent/events.js";
|
|
11
11
|
export { getAssistantEventText } from "./agent/assistantEvent.js";
|
|
12
12
|
export type { AgentRunOperation } from "./agent/AgentRun.js";
|
|
13
|
-
export { mapAuviraStreamEventToProgress, parseSandboxAuviraRunnerLine, validateSandboxJob, SandboxJobValidationError, } from "./runner/index.js";
|
|
13
|
+
export { mapAuviraStreamEventToProgress, parseSandboxAuviraRunnerLine, settleOpenToolSteps, validateSandboxJob, SandboxJobValidationError, appendSettledToolProgress, } from "./runner/index.js";
|
|
14
14
|
export type { SandboxAuviraJobInput, SandboxAuviraJobResult, SandboxAuviraRunnerEvent, HarnessProgressEvent, SerializableAgentCompletionOptions, } from "./runner/index.js";
|
|
15
15
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,YAAY,EACV,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EACtB,yBAAyB,EACzB,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAC1B,YAAY,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,YAAY,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACnG,YAAY,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAChF,YAAY,EACV,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,qBAAqB,EACrB,wBAAwB,EACxB,aAAa,EACb,gBAAgB,EAChB,YAAY,EACZ,mBAAmB,GACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,EACL,8BAA8B,EAC9B,4BAA4B,EAC5B,kBAAkB,EAClB,yBAAyB,GAC1B,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EACV,qBAAqB,EACrB,sBAAsB,EACtB,wBAAwB,EACxB,oBAAoB,EACpB,kCAAkC,GACnC,MAAM,mBAAmB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,YAAY,EACV,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EACtB,yBAAyB,EACzB,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAC1B,YAAY,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,YAAY,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACnG,YAAY,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAChF,YAAY,EACV,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,qBAAqB,EACrB,wBAAwB,EACxB,aAAa,EACb,gBAAgB,EAChB,YAAY,EACZ,mBAAmB,GACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,EACL,8BAA8B,EAC9B,4BAA4B,EAC5B,mBAAmB,EACnB,kBAAkB,EAClB,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EACV,qBAAqB,EACrB,sBAAsB,EACtB,wBAAwB,EACxB,oBAAoB,EACpB,kCAAkC,GACnC,MAAM,mBAAmB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -4,5 +4,5 @@ export { AgentConfigError, CursorAgentError, } from "./agent/types.js";
|
|
|
4
4
|
export { AgentNotFoundError } from "./agent/AgentRegistry.js";
|
|
5
5
|
export { AGENT_TOOL_NAMES, isToolEvent, isAssistantEvent, } from "./agent/events.js";
|
|
6
6
|
export { getAssistantEventText } from "./agent/assistantEvent.js";
|
|
7
|
-
export { mapAuviraStreamEventToProgress, parseSandboxAuviraRunnerLine, validateSandboxJob, SandboxJobValidationError, } from "./runner/index.js";
|
|
7
|
+
export { mapAuviraStreamEventToProgress, parseSandboxAuviraRunnerLine, settleOpenToolSteps, validateSandboxJob, SandboxJobValidationError, appendSettledToolProgress, } from "./runner/index.js";
|
|
8
8
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AA8B9D,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAGlE,OAAO,EACL,8BAA8B,EAC9B,4BAA4B,EAC5B,kBAAkB,EAClB,yBAAyB,GAC1B,MAAM,mBAAmB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AA8B9D,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAGlE,OAAO,EACL,8BAA8B,EAC9B,4BAA4B,EAC5B,mBAAmB,EACnB,kBAAkB,EAClB,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,mBAAmB,CAAC"}
|
package/dist/runner/index.d.ts
CHANGED
|
@@ -2,13 +2,13 @@ export { ABORT_POLL_MS, DEFAULT_JOBS_ROOT, DEFAULT_WORKSPACE_PATH, ENV_AGENT_API
|
|
|
2
2
|
export type { ActivityTraceEntry, HarnessProgressEvent, SandboxAuviraJobInput, SandboxAuviraJobResult, SandboxAuviraRunnerEvent, SandboxAuviraSession, SerializableAgentCompletionOptions, StepStatus, } from "./jobTypes.js";
|
|
3
3
|
export { buildRunnerFailureResult, buildSandboxJobResult, updateJobResultContext, } from "./buildJobResult.js";
|
|
4
4
|
export type { JobResultContext } from "./buildJobResult.js";
|
|
5
|
-
export { createMapStreamContext, mapAuviraStreamEventToProgress, parseSandboxAuviraRunnerLine, } from "./mapStreamEvents.js";
|
|
5
|
+
export { createMapStreamContext, mapAuviraStreamEventToProgress, parseSandboxAuviraRunnerLine, settleOpenToolSteps, } from "./mapStreamEvents.js";
|
|
6
6
|
export type { MapStreamContext } from "./mapStreamEvents.js";
|
|
7
7
|
export { appendNdjsonLine, appendRunnerEvent } from "./ndjsonWriter.js";
|
|
8
8
|
export { watchAbortFile } from "./abortPoller.js";
|
|
9
9
|
export { assertRunnerApiKey, resolveJobsRoot, resolveRunnerApiKey, resolveRunnerModel, } from "./resolveRunnerEnv.js";
|
|
10
10
|
export { createAgentFromSession, loadSandboxSession, saveSandboxSession, } from "./sessionStore.js";
|
|
11
11
|
export { SandboxJobValidationError, validateSandboxJob, } from "./validateJob.js";
|
|
12
|
-
export { parseJobId, runSandboxJob } from "./run.js";
|
|
12
|
+
export { parseJobId, runSandboxJob, appendSettledToolProgress } from "./run.js";
|
|
13
13
|
export type { RunSandboxJobOptions, RunSandboxJobOutcome } from "./run.js";
|
|
14
14
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runner/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,iBAAiB,EACjB,kBAAkB,EAClB,UAAU,EACV,WAAW,EACX,QAAQ,EACR,WAAW,GACZ,MAAM,gBAAgB,CAAC;AAExB,YAAY,EACV,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,EACrB,sBAAsB,EACtB,wBAAwB,EACxB,oBAAoB,EACpB,kCAAkC,EAClC,UAAU,GACX,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,wBAAwB,EACxB,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EACL,sBAAsB,EACtB,8BAA8B,EAC9B,4BAA4B,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runner/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,iBAAiB,EACjB,kBAAkB,EAClB,UAAU,EACV,WAAW,EACX,QAAQ,EACR,WAAW,GACZ,MAAM,gBAAgB,CAAC;AAExB,YAAY,EACV,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,EACrB,sBAAsB,EACtB,wBAAwB,EACxB,oBAAoB,EACpB,kCAAkC,EAClC,UAAU,GACX,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,wBAAwB,EACxB,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EACL,sBAAsB,EACtB,8BAA8B,EAC9B,4BAA4B,EAC5B,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,sBAAsB,EACtB,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACL,yBAAyB,EACzB,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAChF,YAAY,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC"}
|
package/dist/runner/index.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
export { ABORT_POLL_MS, DEFAULT_JOBS_ROOT, DEFAULT_WORKSPACE_PATH, ENV_AGENT_API_KEY, ENV_CURSOR_JOB_ID, ENV_JOBS_ROOT, ENV_MODEL_API_KEY, ENV_MODEL_BASE_URL, ABORT_FILE, EVENTS_FILE, JOB_FILE, RESULT_FILE, } from "./constants.js";
|
|
2
2
|
export { buildRunnerFailureResult, buildSandboxJobResult, updateJobResultContext, } from "./buildJobResult.js";
|
|
3
|
-
export { createMapStreamContext, mapAuviraStreamEventToProgress, parseSandboxAuviraRunnerLine, } from "./mapStreamEvents.js";
|
|
3
|
+
export { createMapStreamContext, mapAuviraStreamEventToProgress, parseSandboxAuviraRunnerLine, settleOpenToolSteps, } from "./mapStreamEvents.js";
|
|
4
4
|
export { appendNdjsonLine, appendRunnerEvent } from "./ndjsonWriter.js";
|
|
5
5
|
export { watchAbortFile } from "./abortPoller.js";
|
|
6
6
|
export { assertRunnerApiKey, resolveJobsRoot, resolveRunnerApiKey, resolveRunnerModel, } from "./resolveRunnerEnv.js";
|
|
7
7
|
export { createAgentFromSession, loadSandboxSession, saveSandboxSession, } from "./sessionStore.js";
|
|
8
8
|
export { SandboxJobValidationError, validateSandboxJob, } from "./validateJob.js";
|
|
9
|
-
export { parseJobId, runSandboxJob } from "./run.js";
|
|
9
|
+
export { parseJobId, runSandboxJob, appendSettledToolProgress } from "./run.js";
|
|
10
10
|
//# sourceMappingURL=index.js.map
|
package/dist/runner/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runner/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,iBAAiB,EACjB,kBAAkB,EAClB,UAAU,EACV,WAAW,EACX,QAAQ,EACR,WAAW,GACZ,MAAM,gBAAgB,CAAC;AAaxB,OAAO,EACL,wBAAwB,EACxB,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,sBAAsB,EACtB,8BAA8B,EAC9B,4BAA4B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runner/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,iBAAiB,EACjB,kBAAkB,EAClB,UAAU,EACV,WAAW,EACX,QAAQ,EACR,WAAW,GACZ,MAAM,gBAAgB,CAAC;AAaxB,OAAO,EACL,wBAAwB,EACxB,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,sBAAsB,EACtB,8BAA8B,EAC9B,4BAA4B,EAC5B,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,sBAAsB,EACtB,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACL,yBAAyB,EACzB,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobTypes.d.ts","sourceRoot":"","sources":["../../src/runner/jobTypes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"jobTypes.d.ts","sourceRoot":"","sources":["../../src/runner/jobTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import type { AgentRunEvent } from "../agent/events.js";
|
|
2
2
|
import type { JobResultContext } from "./buildJobResult.js";
|
|
3
|
-
import type { HarnessProgressEvent, SandboxAuviraRunnerEvent } from "./jobTypes.js";
|
|
3
|
+
import type { HarnessProgressEvent, SandboxAuviraRunnerEvent, StepStatus } from "./jobTypes.js";
|
|
4
4
|
/** Mutable state while mapping a stream of SDK events to host progress. */
|
|
5
5
|
export interface MapStreamContext {
|
|
6
6
|
toolSeq: number;
|
|
7
|
-
|
|
7
|
+
openToolsByName: Map<string, string[]>;
|
|
8
8
|
sessionReadyEmitted: boolean;
|
|
9
9
|
resultCtx: JobResultContext;
|
|
10
10
|
}
|
|
11
11
|
export declare function createMapStreamContext(sessionResumed: boolean): MapStreamContext;
|
|
12
|
+
/** Emits terminal step events for any still-open tool rows. */
|
|
13
|
+
export declare function settleOpenToolSteps(ctx: MapStreamContext, status: Extract<StepStatus, "completed" | "failed">): HarnessProgressEvent[];
|
|
12
14
|
/** Maps one SDK stream event to zero or more host progress events. */
|
|
13
15
|
export declare function mapAuviraStreamEventToProgress(event: AgentRunEvent, ctx: MapStreamContext): HarnessProgressEvent[];
|
|
14
16
|
/** Parses one NDJSON line from events.ndjson. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapStreamEvents.d.ts","sourceRoot":"","sources":["../../src/runner/mapStreamEvents.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"mapStreamEvents.d.ts","sourceRoot":"","sources":["../../src/runner/mapStreamEvents.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhG,2EAA2E;AAC3E,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAIhB,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACvC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,SAAS,EAAE,gBAAgB,CAAC;CAC7B;AAED,wBAAgB,sBAAsB,CACpC,cAAc,EAAE,OAAO,GACtB,gBAAgB,CAOlB;AAED,+DAA+D;AAC/D,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,gBAAgB,EACrB,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,WAAW,GAAG,QAAQ,CAAC,GAClD,oBAAoB,EAAE,CAkBxB;AAED,sEAAsE;AACtE,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,gBAAgB,GACpB,oBAAoB,EAAE,CAoLxB;AAED,iDAAiD;AACjD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,MAAM,GACX,wBAAwB,GAAG,IAAI,CAyBjC"}
|
|
@@ -3,11 +3,29 @@ import { updateJobResultContext } from "./buildJobResult.js";
|
|
|
3
3
|
export function createMapStreamContext(sessionResumed) {
|
|
4
4
|
return {
|
|
5
5
|
toolSeq: 0,
|
|
6
|
-
|
|
6
|
+
openToolsByName: new Map(),
|
|
7
7
|
sessionReadyEmitted: false,
|
|
8
8
|
resultCtx: { sessionResumed },
|
|
9
9
|
};
|
|
10
10
|
}
|
|
11
|
+
/** Emits terminal step events for any still-open tool rows. */
|
|
12
|
+
export function settleOpenToolSteps(ctx, status) {
|
|
13
|
+
const events = [];
|
|
14
|
+
for (const [toolName, queue] of ctx.openToolsByName.entries()) {
|
|
15
|
+
while (queue.length > 0) {
|
|
16
|
+
const stepId = queue.shift();
|
|
17
|
+
events.push({
|
|
18
|
+
type: "step",
|
|
19
|
+
id: stepId,
|
|
20
|
+
label: toolName,
|
|
21
|
+
status,
|
|
22
|
+
toolName,
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
ctx.openToolsByName.clear();
|
|
27
|
+
return events;
|
|
28
|
+
}
|
|
11
29
|
/** Maps one SDK stream event to zero or more host progress events. */
|
|
12
30
|
export function mapAuviraStreamEventToProgress(event, ctx) {
|
|
13
31
|
if (event.type === "run.early_finish" || event.type === "run.failed") {
|
|
@@ -34,7 +52,9 @@ export function mapAuviraStreamEventToProgress(event, ctx) {
|
|
|
34
52
|
case "tool.start": {
|
|
35
53
|
ctx.toolSeq += 1;
|
|
36
54
|
const stepId = `tool_${ctx.toolSeq}`;
|
|
37
|
-
ctx.
|
|
55
|
+
const queue = ctx.openToolsByName.get(event.name) ?? [];
|
|
56
|
+
queue.push(stepId);
|
|
57
|
+
ctx.openToolsByName.set(event.name, queue);
|
|
38
58
|
return [
|
|
39
59
|
{
|
|
40
60
|
type: "activity_trace",
|
|
@@ -43,6 +63,7 @@ export function mapAuviraStreamEventToProgress(event, ctx) {
|
|
|
43
63
|
toolName: event.name,
|
|
44
64
|
label: event.name,
|
|
45
65
|
detail: JSON.stringify(event.input).slice(0, 200),
|
|
66
|
+
stepId,
|
|
46
67
|
},
|
|
47
68
|
},
|
|
48
69
|
{
|
|
@@ -55,7 +76,18 @@ export function mapAuviraStreamEventToProgress(event, ctx) {
|
|
|
55
76
|
];
|
|
56
77
|
}
|
|
57
78
|
case "tool.end": {
|
|
58
|
-
const
|
|
79
|
+
const queue = ctx.openToolsByName.get(event.name) ?? [];
|
|
80
|
+
const stepId = queue.shift();
|
|
81
|
+
if (!stepId) {
|
|
82
|
+
console.warn(`tool.end without matching tool.start: ${event.name}`);
|
|
83
|
+
return [];
|
|
84
|
+
}
|
|
85
|
+
if (queue.length === 0) {
|
|
86
|
+
ctx.openToolsByName.delete(event.name);
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
ctx.openToolsByName.set(event.name, queue);
|
|
90
|
+
}
|
|
59
91
|
return [
|
|
60
92
|
{
|
|
61
93
|
type: "activity_trace",
|
|
@@ -64,6 +96,7 @@ export function mapAuviraStreamEventToProgress(event, ctx) {
|
|
|
64
96
|
toolName: event.name,
|
|
65
97
|
label: event.name,
|
|
66
98
|
detail: event.ok ? "completed" : "failed",
|
|
99
|
+
stepId,
|
|
67
100
|
},
|
|
68
101
|
},
|
|
69
102
|
{
|
|
@@ -116,6 +149,7 @@ export function mapAuviraStreamEventToProgress(event, ctx) {
|
|
|
116
149
|
];
|
|
117
150
|
case "run.early_finish":
|
|
118
151
|
return [
|
|
152
|
+
...settleOpenToolSteps(ctx, "completed"),
|
|
119
153
|
{
|
|
120
154
|
type: "activity_trace",
|
|
121
155
|
entry: {
|
|
@@ -127,6 +161,7 @@ export function mapAuviraStreamEventToProgress(event, ctx) {
|
|
|
127
161
|
];
|
|
128
162
|
case "run.failed":
|
|
129
163
|
return [
|
|
164
|
+
...settleOpenToolSteps(ctx, "failed"),
|
|
130
165
|
{
|
|
131
166
|
type: "activity_trace",
|
|
132
167
|
entry: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapStreamEvents.js","sourceRoot":"","sources":["../../src/runner/mapStreamEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"mapStreamEvents.js","sourceRoot":"","sources":["../../src/runner/mapStreamEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAe7D,MAAM,UAAU,sBAAsB,CACpC,cAAuB;IAEvB,OAAO;QACL,OAAO,EAAE,CAAC;QACV,eAAe,EAAE,IAAI,GAAG,EAAE;QAC1B,mBAAmB,EAAE,KAAK;QAC1B,SAAS,EAAE,EAAE,cAAc,EAAE;KAC9B,CAAC;AACJ,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,mBAAmB,CACjC,GAAqB,EACrB,MAAmD;IAEnD,MAAM,MAAM,GAA2B,EAAE,CAAC;IAE1C,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,GAAG,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC;QAC9D,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,EAAG,CAAC;YAC9B,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,MAAM;gBACZ,EAAE,EAAE,MAAM;gBACV,KAAK,EAAE,QAAQ;gBACf,MAAM;gBACN,QAAQ;aACT,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,GAAG,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;IAC5B,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,sEAAsE;AACtE,MAAM,UAAU,8BAA8B,CAC5C,KAAoB,EACpB,GAAqB;IAErB,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QACrE,sBAAsB,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,IAAI,KAAK,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;QACvE,sBAAsB,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,oBAAoB,CAAC,CAAC,CAAC;YAC1B,IAAI,GAAG,CAAC,mBAAmB,EAAE,CAAC;gBAC5B,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC;YAC/B,OAAO;gBACL;oBACE,IAAI,EAAE,MAAM;oBACZ,EAAE,EAAE,gBAAgB;oBACpB,KAAK,EAAE,oBAAoB;oBAC3B,MAAM,EAAE,WAAW;iBACpB;aACF,CAAC;QACJ,CAAC;QACD,KAAK,YAAY,CAAC,CAAC,CAAC;YAClB,GAAG,CAAC,OAAO,IAAI,CAAC,CAAC;YACjB,MAAM,MAAM,GAAG,QAAQ,GAAG,CAAC,OAAO,EAAE,CAAC;YAErC,MAAM,KAAK,GAAG,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACxD,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACnB,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAE3C,OAAO;gBACL;oBACE,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE;wBACL,IAAI,EAAE,YAAY;wBAClB,QAAQ,EAAE,KAAK,CAAC,IAAI;wBACpB,KAAK,EAAE,KAAK,CAAC,IAAI;wBACjB,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;wBACjD,MAAM;qBACP;iBACF;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,EAAE,EAAE,MAAM;oBACV,KAAK,EAAE,KAAK,CAAC,IAAI;oBACjB,MAAM,EAAE,QAAQ;oBAChB,QAAQ,EAAE,KAAK,CAAC,IAAI;iBACrB;aACF,CAAC;QACJ,CAAC;QACD,KAAK,UAAU,CAAC,CAAC,CAAC;YAChB,MAAM,KAAK,GAAG,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACxD,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;YAE7B,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO,CAAC,IAAI,CAAC,yCAAyC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;gBACpE,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvB,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzC,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC7C,CAAC;YAED,OAAO;gBACL;oBACE,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE;wBACL,IAAI,EAAE,UAAU;wBAChB,QAAQ,EAAE,KAAK,CAAC,IAAI;wBACpB,KAAK,EAAE,KAAK,CAAC,IAAI;wBACjB,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ;wBACzC,MAAM;qBACP;iBACF;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,EAAE,EAAE,MAAM;oBACV,KAAK,EAAE,KAAK,CAAC,IAAI;oBACjB,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ;oBACzC,QAAQ,EAAE,KAAK,CAAC,IAAI;iBACrB;aACF,CAAC;QACJ,CAAC;QACD,KAAK,WAAW;YACd,OAAO;gBACL;oBACE,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE;wBACL,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,KAAK,CAAC,IAAI;wBAChB,KAAK,EAAE,KAAK,CAAC,KAAK;wBAClB,SAAS,EAAE,KAAK,CAAC,SAAS;wBAC1B,KAAK,EAAE,KAAK,CAAC,IAAI;qBAClB;iBACF;aACF,CAAC;QACJ,KAAK,UAAU;YACb,OAAO;gBACL;oBACE,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE;wBACL,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,KAAK,CAAC,KAAK;wBAClB,SAAS,EAAE,KAAK,CAAC,SAAS;wBAC1B,KAAK,EAAE,aAAa;wBACpB,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;qBACtC;iBACF;aACF,CAAC;QACJ,KAAK,cAAc;YACjB,OAAO;gBACL;oBACE,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE;wBACL,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,iBAAiB;wBACxB,MAAM,EACJ,KAAK,CAAC,MAAM,KAAK,uBAAuB;4BACtC,CAAC,CAAC,uDAAuD;4BACzD,CAAC,CAAC,qBAAqB,KAAK,CAAC,MAAM,EAAE;qBAC1C;iBACF;aACF,CAAC;QACJ,KAAK,kBAAkB;YACrB,OAAO;gBACL,GAAG,mBAAmB,CAAC,GAAG,EAAE,WAAW,CAAC;gBACxC;oBACE,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE;wBACL,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,cAAc;wBACrB,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;qBAC5D;iBACF;aACF,CAAC;QACJ,KAAK,YAAY;YACf,OAAO;gBACL,GAAG,mBAAmB,CAAC,GAAG,EAAE,QAAQ,CAAC;gBACrC;oBACE,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE;wBACL,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,YAAY;wBACnB,MAAM,EAAE,KAAK,CAAC,OAAO;qBACtB;iBACF;aACF,CAAC;QACJ,KAAK,eAAe;YAClB,OAAO;gBACL;oBACE,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE;wBACL,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,YAAY;wBACnB,MAAM,EAAE,cAAc,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,WAAW,EAAE;qBAC3D;iBACF;aACF,CAAC;QACJ,KAAK,WAAW,CAAC,CAAC,CAAC;YACjB,MAAM,IAAI,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;YAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;gBACjB,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,OAAO;gBACL;oBACE,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE;wBACL,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,sBAAsB;wBAC7B,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;qBAC3B;iBACF;aACF,CAAC;QACJ,CAAC;QACD;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAED,iDAAiD;AACjD,MAAM,UAAU,4BAA4B,CAC1C,IAAY;IAEZ,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAY,CAAC;QAC9C,IACE,OAAO,MAAM,KAAK,QAAQ;YAC1B,MAAM,KAAK,IAAI;YACf,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,EACnB,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,IAAI,GAAI,MAA2B,CAAC,IAAI,CAAC;QAC/C,IAAI,IAAI,KAAK,UAAU,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;YAC7C,OAAO,MAAkC,CAAC;QAC5C,CAAC;QACD,IAAI,IAAI,KAAK,QAAQ,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;YAC5C,OAAO,MAAkC,CAAC;QAC5C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
|
package/dist/runner/run.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { SandboxAuviraJobResult } from "./jobTypes.js";
|
|
2
|
+
import type { MapStreamContext } from "./mapStreamEvents.js";
|
|
2
3
|
export interface RunSandboxJobOptions {
|
|
3
4
|
jobsRoot?: string;
|
|
4
5
|
}
|
|
@@ -8,6 +9,8 @@ export interface RunSandboxJobOutcome {
|
|
|
8
9
|
}
|
|
9
10
|
/** Parses --job from argv or AUVIRA_CURSOR_JOB_ID. */
|
|
10
11
|
export declare function parseJobId(argv: string[]): string | undefined;
|
|
12
|
+
/** Appends terminal step events for open tools before the final result line. */
|
|
13
|
+
export declare function appendSettledToolProgress(mapCtx: MapStreamContext, eventsPath: string, ok: boolean): Promise<void>;
|
|
11
14
|
/** Executes a sandbox job from jobsRoot/editJobId/job.json. */
|
|
12
15
|
export declare function runSandboxJob(editJobId: string, options?: RunSandboxJobOptions): Promise<RunSandboxJobOutcome>;
|
|
13
16
|
//# sourceMappingURL=run.d.ts.map
|
package/dist/runner/run.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/runner/run.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/runner/run.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAM5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAU7D,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,sBAAsB,CAAC;CAChC;AAED,sDAAsD;AACtD,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAU7D;AAWD,gFAAgF;AAChF,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,gBAAgB,EACxB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,OAAO,GACV,OAAO,CAAC,IAAI,CAAC,CAQf;AAED,+DAA+D;AAC/D,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,oBAAoB,CAAC,CA0F/B"}
|
package/dist/runner/run.js
CHANGED
|
@@ -4,7 +4,7 @@ import { Agent } from "../agent/Agent.js";
|
|
|
4
4
|
import { watchAbortFile } from "./abortPoller.js";
|
|
5
5
|
import { buildRunnerFailureResult, buildSandboxJobResult, } from "./buildJobResult.js";
|
|
6
6
|
import { ENV_CURSOR_JOB_ID, EVENTS_FILE, JOB_FILE, RESULT_FILE, } from "./constants.js";
|
|
7
|
-
import { createMapStreamContext, mapAuviraStreamEventToProgress, } from "./mapStreamEvents.js";
|
|
7
|
+
import { createMapStreamContext, mapAuviraStreamEventToProgress, settleOpenToolSteps, } from "./mapStreamEvents.js";
|
|
8
8
|
import { appendNdjsonLine } from "./ndjsonWriter.js";
|
|
9
9
|
import { assertRunnerApiKey, resolveJobsRoot, resolveRunnerModel, } from "./resolveRunnerEnv.js";
|
|
10
10
|
import { createAgentFromSession, saveSandboxSession } from "./sessionStore.js";
|
|
@@ -25,6 +25,13 @@ async function writeResult(jobDir, eventsPath, result) {
|
|
|
25
25
|
await writeFile(join(jobDir, RESULT_FILE), JSON.stringify(result, null, 2));
|
|
26
26
|
await appendNdjsonLine(eventsPath, { type: "result", result });
|
|
27
27
|
}
|
|
28
|
+
/** Appends terminal step events for open tools before the final result line. */
|
|
29
|
+
export async function appendSettledToolProgress(mapCtx, eventsPath, ok) {
|
|
30
|
+
const settleEvents = settleOpenToolSteps(mapCtx, ok ? "completed" : "failed");
|
|
31
|
+
for (const progress of settleEvents) {
|
|
32
|
+
await appendNdjsonLine(eventsPath, { type: "progress", event: progress });
|
|
33
|
+
}
|
|
34
|
+
}
|
|
28
35
|
/** Executes a sandbox job from jobsRoot/editJobId/job.json. */
|
|
29
36
|
export async function runSandboxJob(editJobId, options = {}) {
|
|
30
37
|
const jobsRoot = options.jobsRoot ?? resolveJobsRoot();
|
|
@@ -33,6 +40,7 @@ export async function runSandboxJob(editJobId, options = {}) {
|
|
|
33
40
|
const eventsPath = join(jobDir, EVENTS_FILE);
|
|
34
41
|
let sessionResumed = false;
|
|
35
42
|
let agentId;
|
|
43
|
+
let mapCtx;
|
|
36
44
|
try {
|
|
37
45
|
assertRunnerApiKey();
|
|
38
46
|
const rawJob = JSON.parse(await readFile(jobPath, "utf8"));
|
|
@@ -67,7 +75,7 @@ export async function runSandboxJob(editJobId, options = {}) {
|
|
|
67
75
|
reuseWorkspace: job.reuseWorkspace,
|
|
68
76
|
timeoutMs: job.validation?.timeoutMs,
|
|
69
77
|
});
|
|
70
|
-
|
|
78
|
+
mapCtx = createMapStreamContext(sessionResumed);
|
|
71
79
|
const abortWatcher = watchAbortFile(jobDir, run);
|
|
72
80
|
for await (const event of run.stream()) {
|
|
73
81
|
const progressEvents = mapAuviraStreamEventToProgress(event, mapCtx);
|
|
@@ -77,6 +85,7 @@ export async function runSandboxJob(editJobId, options = {}) {
|
|
|
77
85
|
}
|
|
78
86
|
await abortWatcher;
|
|
79
87
|
const result = await run.wait();
|
|
88
|
+
await appendSettledToolProgress(mapCtx, eventsPath, result.ok);
|
|
80
89
|
const jobResult = buildSandboxJobResult(result, mapCtx.resultCtx);
|
|
81
90
|
if (result.ok && result.status === "finished") {
|
|
82
91
|
await saveSandboxSession(jobsRoot, agent, job.workspacePath);
|
|
@@ -93,6 +102,9 @@ export async function runSandboxJob(editJobId, options = {}) {
|
|
|
93
102
|
hostTimeout: message.toLowerCase().includes("timeout"),
|
|
94
103
|
});
|
|
95
104
|
await mkdir(jobDir, { recursive: true });
|
|
105
|
+
if (mapCtx) {
|
|
106
|
+
await appendSettledToolProgress(mapCtx, eventsPath, false);
|
|
107
|
+
}
|
|
96
108
|
await writeResult(jobDir, eventsPath, failure);
|
|
97
109
|
return { exitCode: 1, result: failure };
|
|
98
110
|
}
|
package/dist/runner/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/runner/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EACL,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,iBAAiB,EACjB,WAAW,EACX,QAAQ,EACR,WAAW,GACZ,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,sBAAsB,EACtB,8BAA8B,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/runner/run.ts"],"names":[],"mappings":"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"}
|