@oisincoveney/pipeline 1.27.10 → 1.27.11
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/config.d.ts +5 -5
- package/dist/hooks.d.ts +1 -1
- package/dist/moka-submit.d.ts +1 -1
- package/dist/runner-command-contract.d.ts +2 -2
- package/dist/schedule-planner.js +95 -43
- package/package.json +1 -1
package/dist/config.d.ts
CHANGED
|
@@ -452,7 +452,6 @@ declare const configSchema: z.ZodObject<{
|
|
|
452
452
|
skills: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
453
453
|
timeout_ms: z.ZodOptional<z.ZodNumber>;
|
|
454
454
|
tools: z.ZodOptional<z.ZodArray<z.ZodEnum<{
|
|
455
|
-
task: "task";
|
|
456
455
|
read: "read";
|
|
457
456
|
list: "list";
|
|
458
457
|
grep: "grep";
|
|
@@ -460,6 +459,7 @@ declare const configSchema: z.ZodObject<{
|
|
|
460
459
|
bash: "bash";
|
|
461
460
|
edit: "edit";
|
|
462
461
|
write: "write";
|
|
462
|
+
task: "task";
|
|
463
463
|
}>>>;
|
|
464
464
|
}, z.core.$strict>>>;
|
|
465
465
|
runner_command: z.ZodDefault<z.ZodObject<{
|
|
@@ -485,8 +485,8 @@ declare const configSchema: z.ZodObject<{
|
|
|
485
485
|
rules: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
486
486
|
path: z.ZodString;
|
|
487
487
|
source_root: z.ZodDefault<z.ZodEnum<{
|
|
488
|
-
project: "project";
|
|
489
488
|
package: "package";
|
|
489
|
+
project: "project";
|
|
490
490
|
}>>;
|
|
491
491
|
}, z.core.$strict>>>;
|
|
492
492
|
runners: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
@@ -511,7 +511,6 @@ declare const configSchema: z.ZodObject<{
|
|
|
511
511
|
rules: z.ZodOptional<z.ZodBoolean>;
|
|
512
512
|
skills: z.ZodOptional<z.ZodBoolean>;
|
|
513
513
|
tools: z.ZodOptional<z.ZodArray<z.ZodEnum<{
|
|
514
|
-
task: "task";
|
|
515
514
|
read: "read";
|
|
516
515
|
list: "list";
|
|
517
516
|
grep: "grep";
|
|
@@ -519,6 +518,7 @@ declare const configSchema: z.ZodObject<{
|
|
|
519
518
|
bash: "bash";
|
|
520
519
|
edit: "edit";
|
|
521
520
|
write: "write";
|
|
521
|
+
task: "task";
|
|
522
522
|
}>>>;
|
|
523
523
|
}, z.core.$strict>;
|
|
524
524
|
command: z.ZodOptional<z.ZodString>;
|
|
@@ -613,8 +613,8 @@ declare const configSchema: z.ZodObject<{
|
|
|
613
613
|
schedules: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
614
614
|
description: z.ZodOptional<z.ZodString>;
|
|
615
615
|
baseline: z.ZodEnum<{
|
|
616
|
-
quick: "quick";
|
|
617
616
|
execute: "execute";
|
|
617
|
+
quick: "quick";
|
|
618
618
|
}>;
|
|
619
619
|
max_parallel_nodes: z.ZodOptional<z.ZodNumber>;
|
|
620
620
|
node_catalog: z.ZodOptional<z.ZodString>;
|
|
@@ -626,8 +626,8 @@ declare const configSchema: z.ZodObject<{
|
|
|
626
626
|
skills: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
627
627
|
path: z.ZodString;
|
|
628
628
|
source_root: z.ZodDefault<z.ZodEnum<{
|
|
629
|
-
project: "project";
|
|
630
629
|
package: "package";
|
|
630
|
+
project: "project";
|
|
631
631
|
}>>;
|
|
632
632
|
}, z.core.$strict>>>;
|
|
633
633
|
task_context: z.ZodOptional<z.ZodObject<{
|
package/dist/hooks.d.ts
CHANGED
|
@@ -13,8 +13,8 @@ declare const hookResultSchema: z.ZodObject<{
|
|
|
13
13
|
taskContext: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
|
|
14
14
|
}, z.core.$strict>>;
|
|
15
15
|
status: z.ZodEnum<{
|
|
16
|
-
fail: "fail";
|
|
17
16
|
pass: "pass";
|
|
17
|
+
fail: "fail";
|
|
18
18
|
skip: "skip";
|
|
19
19
|
}>;
|
|
20
20
|
summary: z.ZodOptional<z.ZodString>;
|
package/dist/moka-submit.d.ts
CHANGED
|
@@ -160,8 +160,8 @@ declare const mokaSubmitOptionsSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
|
160
160
|
}, z.core.$strict>>;
|
|
161
161
|
serviceAccountName: z.ZodDefault<z.ZodString>;
|
|
162
162
|
mode: z.ZodEnum<{
|
|
163
|
-
full: "full";
|
|
164
163
|
quick: "quick";
|
|
164
|
+
full: "full";
|
|
165
165
|
}>;
|
|
166
166
|
schedulePath: z.ZodOptional<z.ZodString>;
|
|
167
167
|
scheduleYaml: z.ZodOptional<z.ZodString>;
|
|
@@ -43,8 +43,8 @@ declare const runnerDeliverySchema: z.ZodObject<{
|
|
|
43
43
|
declare const mokaSubmissionSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
44
44
|
kind: z.ZodLiteral<"graph">;
|
|
45
45
|
mode: z.ZodEnum<{
|
|
46
|
-
full: "full";
|
|
47
46
|
quick: "quick";
|
|
47
|
+
full: "full";
|
|
48
48
|
}>;
|
|
49
49
|
}, z.core.$strict>, z.ZodObject<{
|
|
50
50
|
argv: z.ZodArray<z.ZodString>;
|
|
@@ -104,8 +104,8 @@ declare const runnerCommandPayloadSchema: z.ZodObject<{
|
|
|
104
104
|
submission: z.ZodDefault<z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
105
105
|
kind: z.ZodLiteral<"graph">;
|
|
106
106
|
mode: z.ZodEnum<{
|
|
107
|
-
full: "full";
|
|
108
107
|
quick: "quick";
|
|
108
|
+
full: "full";
|
|
109
109
|
}>;
|
|
110
110
|
}, z.core.$strict>, z.ZodObject<{
|
|
111
111
|
argv: z.ZodArray<z.ZodString>;
|
package/dist/schedule-planner.js
CHANGED
|
@@ -485,35 +485,71 @@ function executeBaselineWorkflow() {
|
|
|
485
485
|
} };
|
|
486
486
|
}
|
|
487
487
|
async function planScheduleArtifact(baseline, plannerProfile, options, planningContext) {
|
|
488
|
-
|
|
489
|
-
const source = await runSchedulePlanner(
|
|
490
|
-
if (!source) throw new ScheduleArtifactError("schedule planner returned empty output");
|
|
488
|
+
const requiredPlannerProfile = requireSchedulePlannerProfile(plannerProfile, options.entrypointId);
|
|
489
|
+
const source = requireSchedulePlannerSource(await runSchedulePlanner(requiredPlannerProfile, plannerPrompt(options.entrypointId, options.task, baseline, options.config, planningContext), options));
|
|
491
490
|
const initial = acceptedGeneratedSchedule(parseGeneratedSchedule(source, "planner output"));
|
|
492
491
|
if (initial.ok) return initial.artifact;
|
|
493
|
-
|
|
494
|
-
|
|
492
|
+
return scheduleArtifactAfterRepair(await repairInvalidScheduleArtifact({
|
|
493
|
+
baseline,
|
|
494
|
+
initialFailure: initial.error,
|
|
495
|
+
initialSource: source,
|
|
496
|
+
options,
|
|
497
|
+
plannerProfile: requiredPlannerProfile
|
|
498
|
+
}), baseline, initial.error, source);
|
|
499
|
+
}
|
|
500
|
+
function requireSchedulePlannerProfile(plannerProfile, entrypointId) {
|
|
501
|
+
if (plannerProfile) return plannerProfile;
|
|
502
|
+
throw new ScheduleArtifactError(`schedule '${entrypointId}' requires planner_profile`);
|
|
503
|
+
}
|
|
504
|
+
function requireSchedulePlannerSource(source) {
|
|
505
|
+
if (source) return source;
|
|
506
|
+
throw new ScheduleArtifactError("schedule planner returned empty output");
|
|
507
|
+
}
|
|
508
|
+
function scheduleArtifactAfterRepair(repair, baseline, initialFailure, initialSource) {
|
|
509
|
+
if (repair.kind === "accepted") return repair.artifact;
|
|
510
|
+
if (repair.kind === "fallback") return baseline;
|
|
511
|
+
throw new ScheduleArtifactError([
|
|
512
|
+
"Schedule planner produced invalid output after repair.",
|
|
513
|
+
initialFailure.message,
|
|
514
|
+
"Original planner output:",
|
|
515
|
+
initialSource,
|
|
516
|
+
repair.latestFailure.message,
|
|
517
|
+
"Planner repair output:",
|
|
518
|
+
repair.latestSource
|
|
519
|
+
].join("\n"));
|
|
520
|
+
}
|
|
521
|
+
async function repairInvalidScheduleArtifact(input) {
|
|
522
|
+
let latestFailure = input.initialFailure;
|
|
523
|
+
let latestSource = input.initialSource;
|
|
495
524
|
for (let attempt = 1; attempt <= SCHEDULE_PLANNER_REPAIR_ATTEMPTS; attempt += 1) {
|
|
496
|
-
const repairedSource = await
|
|
497
|
-
|
|
498
|
-
baseline,
|
|
499
|
-
error: latestFailure,
|
|
500
|
-
source: latestSource
|
|
501
|
-
}), options, "schedule-plan-repair");
|
|
502
|
-
if (!repairedSource) throw new ScheduleArtifactError(`schedule planner repair returned empty output after invalid schedule\n${latestFailure.message}\nPlanner output:\n${latestSource}`);
|
|
525
|
+
const repairedSource = await runScheduleRepair(input, latestFailure, latestSource, attempt);
|
|
526
|
+
if (!repairedSource) return { kind: "fallback" };
|
|
503
527
|
const repaired = acceptedGeneratedSchedule(parseGeneratedSchedule(repairedSource, "planner repair output"));
|
|
504
|
-
if (repaired.ok) return
|
|
528
|
+
if (repaired.ok) return {
|
|
529
|
+
artifact: repaired.artifact,
|
|
530
|
+
kind: "accepted"
|
|
531
|
+
};
|
|
505
532
|
latestFailure = repaired.error;
|
|
506
533
|
latestSource = repairedSource;
|
|
507
534
|
}
|
|
508
|
-
|
|
509
|
-
"
|
|
510
|
-
|
|
511
|
-
"Original planner output:",
|
|
512
|
-
source,
|
|
513
|
-
latestFailure.message,
|
|
514
|
-
"Planner repair output:",
|
|
535
|
+
return {
|
|
536
|
+
kind: "invalid",
|
|
537
|
+
latestFailure,
|
|
515
538
|
latestSource
|
|
516
|
-
|
|
539
|
+
};
|
|
540
|
+
}
|
|
541
|
+
async function runScheduleRepair(input, latestFailure, latestSource, attempt) {
|
|
542
|
+
try {
|
|
543
|
+
return await runSchedulePlanner(input.plannerProfile, plannerRepairPrompt({
|
|
544
|
+
attempt,
|
|
545
|
+
baseline: input.baseline,
|
|
546
|
+
error: latestFailure,
|
|
547
|
+
source: latestSource
|
|
548
|
+
}), input.options, "schedule-plan-repair");
|
|
549
|
+
} catch (err) {
|
|
550
|
+
if (err instanceof ScheduleArtifactError) return;
|
|
551
|
+
throw err;
|
|
552
|
+
}
|
|
517
553
|
}
|
|
518
554
|
function parseGeneratedSchedule(source, sourcePath) {
|
|
519
555
|
const parseableSource = normalizeGeneratedScheduleSource(source);
|
|
@@ -644,18 +680,43 @@ function plannerRepairPrompt(inputs) {
|
|
|
644
680
|
function allowedProfilePromptLine(config, id) {
|
|
645
681
|
const profile = config.profiles[id];
|
|
646
682
|
const runner = config.runners[profile.runner];
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
683
|
+
return `- ${id} (${profilePromptFields(config, id, profile, runner).join("; ")})`;
|
|
684
|
+
}
|
|
685
|
+
function profilePromptFields(config, id, profile, runner) {
|
|
686
|
+
return definedProfilePromptFields([
|
|
687
|
+
requiredProfilePromptField("runner", profile.runner),
|
|
688
|
+
optionalProfilePromptField("model", profileModel(profile, runner)),
|
|
689
|
+
optionalProfilePromptField("scheduling_roles", effectiveSchedulingRoles(config, id).join(", ")),
|
|
690
|
+
optionalProfilePromptField("description", profile.description),
|
|
691
|
+
optionalProfilePromptField("tools", profileTools(profile)),
|
|
692
|
+
optionalProfilePromptField("filesystem", profileFilesystemMode(profile)),
|
|
693
|
+
optionalProfilePromptField("network", profileNetworkMode(profile)),
|
|
694
|
+
requiredProfilePromptField("output", profileOutputFormat(profile))
|
|
695
|
+
]);
|
|
696
|
+
}
|
|
697
|
+
function profileModel(profile, runner) {
|
|
698
|
+
return profile.model ?? runner?.model;
|
|
699
|
+
}
|
|
700
|
+
function profileTools(profile) {
|
|
701
|
+
return profile.tools?.join(", ");
|
|
702
|
+
}
|
|
703
|
+
function profileFilesystemMode(profile) {
|
|
704
|
+
return profile.filesystem?.mode;
|
|
705
|
+
}
|
|
706
|
+
function profileNetworkMode(profile) {
|
|
707
|
+
return profile.network?.mode;
|
|
708
|
+
}
|
|
709
|
+
function profileOutputFormat(profile) {
|
|
710
|
+
return profile.output?.format ?? "text";
|
|
711
|
+
}
|
|
712
|
+
function requiredProfilePromptField(label, value) {
|
|
713
|
+
return `${label}: ${value}`;
|
|
714
|
+
}
|
|
715
|
+
function optionalProfilePromptField(label, value) {
|
|
716
|
+
return value ? requiredProfilePromptField(label, value) : void 0;
|
|
717
|
+
}
|
|
718
|
+
function definedProfilePromptFields(fields) {
|
|
719
|
+
return fields.filter((field) => Boolean(field));
|
|
659
720
|
}
|
|
660
721
|
function schedulerCatalogPrompt(config, entrypointId) {
|
|
661
722
|
const catalog = resolveSchedulerCatalog(config, entrypointId);
|
|
@@ -837,16 +898,7 @@ function nodesByAssignedWorkUnit(nodes) {
|
|
|
837
898
|
return grouped;
|
|
838
899
|
}
|
|
839
900
|
function hasPathToNode(sourceId, targetId, dependentsByNeed) {
|
|
840
|
-
|
|
841
|
-
const seen = /* @__PURE__ */ new Set();
|
|
842
|
-
while (queue.length > 0) {
|
|
843
|
-
const node = queue.shift();
|
|
844
|
-
if (!node || seen.has(node.id)) continue;
|
|
845
|
-
if (node.id === targetId) return true;
|
|
846
|
-
seen.add(node.id);
|
|
847
|
-
queue.push(...dependentsByNeed.get(node.id) ?? []);
|
|
848
|
-
}
|
|
849
|
-
return false;
|
|
901
|
+
return hasReachableDependent(sourceId, dependentsByNeed, (node) => node.id === targetId);
|
|
850
902
|
}
|
|
851
903
|
function unsupportedGeneratedBuiltinIssues(artifact) {
|
|
852
904
|
const allowed = new Set(SCHEDULE_BUILTINS);
|
package/package.json
CHANGED
|
@@ -120,7 +120,7 @@
|
|
|
120
120
|
"prepack": "bun run build:cli"
|
|
121
121
|
},
|
|
122
122
|
"type": "module",
|
|
123
|
-
"version": "1.27.
|
|
123
|
+
"version": "1.27.11",
|
|
124
124
|
"description": "Config-driven multi-agent pipeline runner for repository work",
|
|
125
125
|
"main": "./dist/index.js",
|
|
126
126
|
"types": "./dist/index.d.ts",
|