@oisincoveney/pipeline 3.19.2 → 3.19.3

package/dist/runner-command/dynamic-command.js

@@ -20,7 +20,11 @@ function runScopedDynamicRunnerCommand(schema, rawOptions, runEffect) {
 		stderr.write(`${parsed.error.message}\n`);
 		return Promise.resolve(DYNAMIC_COMMAND_EXIT.validation);
 	}
-	return Effect.runPromise(Effect.provide(Effect.scoped(runEffect(parsed.data)), RunnerCommandIoServiceLive));
+	const options = {
+		...parsed.data,
+		stderr
+	};
+	return Effect.runPromise(Effect.provide(Effect.scoped(runEffect(options)), RunnerCommandIoServiceLive));
 }
 function dynamicRunnerContextEffect(options) {
 	return Effect.gen(function* () {

package/dist/runner-command/pre-schedule.js

@@ -1,3 +1,4 @@
+import { resolveFileReference } from "../path-refs.js";
 import { parseTicketPlanEffect, ticketPlanSchema } from "../tickets/ticket-plan.js";
 import { runLaunchPlan } from "../runner/subprocess.js";
 import { createRunnerLaunchPlan } from "../runner.js";
@@ -9,6 +10,7 @@ import { runnerTaskTextEffect } from "./run.js";
 import { DYNAMIC_COMMAND_EXIT, dynamicRunnerCommandErrorExit, dynamicRunnerContextEffect, runScopedDynamicRunnerCommand } from "./dynamic-command.js";
 import { Effect } from "effect";
 import { z } from "zod";
+import { readFile } from "node:fs/promises";
 //#region src/runner-command/pre-schedule.ts
 const PRE_SCHEDULE_NODE_IDS = [
 	"pre-research",
@@ -30,6 +32,7 @@ const PHASE_PROFILES = {
 	"pre-research": "moka-researcher"
 };
 const MAX_DYNAMIC_SCHEDULE_WAVES = 90;
+const JSON_CODE_FENCE_RE = /^```(?:json)?\s*([\s\S]*?)\s*```$/i;
 const researchOutputSchema = z.object({
 	ac: z.array(z.string()),
 	files: z.array(z.string()).optional(),
@@ -89,7 +92,7 @@ function runAgentPhaseEffect(options, context) {
 		const plan = createRunnerLaunchPlan(context.config, {
 			nodeId: PHASE_NODE_IDS[phase],
 			profileId: PHASE_PROFILES[phase],
-			prompt: agentPhasePrompt(phase, context),
+			prompt: yield* agentPhasePromptEffect(phase, context),
 			worktreePath: context.worktreePath
 		});
 		const executor = options.executor ?? runLaunchPlan;
@@ -98,7 +101,7 @@ function runAgentPhaseEffect(options, context) {
 			try: async () => await executor(plan, {})
 		});
 		const normalized = normalizeRunnerOutput(plan, agentResult.stdout);
-		const output = normalized.output;
+		const output = agentResult.exitCode === 0 ? yield* validatedAgentPhaseOutputEffect(phase, normalized.output) : normalized.output;
 		if (phase === "pre-planning" && agentResult.exitCode === 0) yield* parseTicketPlanEffect(output);
 		if (phase === "pre-research" && agentResult.exitCode === 0) yield* Effect.try({
 			catch: (error) => error,
@@ -177,8 +180,26 @@ function recordPhaseResultEffect(context, result) {
 		});
 	});
 }
-function agentPhasePrompt(phase, context) {
+function agentPhasePromptEffect(phase, context) {
+	return Effect.gen(function* () {
+		const profileId = PHASE_PROFILES[phase];
+		const profile = context.config.profiles[profileId];
+		return agentPhasePrompt(phase, context, yield* profileInstructionsEffect(context.worktreePath, profile?.instructions));
+	});
+}
+function profileInstructionsEffect(worktreePath, instructions) {
+	if (!instructions) return Effect.succeed("");
+	if (instructions.inline) return Effect.succeed(instructions.inline);
+	const instructionPath = instructions.path;
+	if (!instructionPath) return Effect.succeed("");
+	return Effect.tryPromise({
+		catch: (error) => error,
+		try: () => readFile(resolveFileReference(worktreePath, instructionPath), { encoding: "utf8" })
+	});
+}
+function agentPhasePrompt(phase, context, profileInstructions) {
 	if (phase === "pre-research") return [
+		...remotePhaseContract("research", profileInstructions),
 		"Research this task before scheduling.",
 		"Return only JSON matching .pipeline/schemas/research.schema.json.",
 		"",
@@ -187,6 +208,7 @@ function agentPhasePrompt(phase, context) {
 	].join("\n");
 	const research = context.persistence.durableStore.get(context.payload.run.id, "pre-research");
 	return [
+		...remotePhaseContract("ticket scoping", profileInstructions),
 		"Scope this task into an implementation-ready ticket plan before scheduling.",
 		"Return only JSON matching .pipeline/schemas/ticket-plan.schema.json.",
 		"",
@@ -197,6 +219,68 @@ function agentPhasePrompt(phase, context) {
 		research?.result.output ?? "No pre-research output recorded."
 	].join("\n");
 }
+function remotePhaseContract(label, profileInstructions) {
+	return [
+		`Automated remote pre-schedule ${label} phase.`,
+		"The phase contract below overrides any conflicting profile instruction.",
+		"",
+		"Phase contract:",
+		"- Do not edit files.",
+		"- Do not spawn subagents or delegate to task tools.",
+		"- Do not call goal or plan tools.",
+		"- Keep inspection bounded to files directly relevant to this task.",
+		"- Return exactly one JSON object with no Markdown fences and no prose.",
+		"",
+		"Profile instructions:",
+		profileInstructions.trim() || "(none)",
+		""
+	];
+}
+function validatedAgentPhaseOutputEffect(phase, output) {
+	return Effect.gen(function* () {
+		const json = yield* Effect.try({
+			catch: (error) => /* @__PURE__ */ new Error(`${phase} returned invalid JSON: ${errorMessage(error)}. Output excerpt: ${outputExcerpt(output)}`),
+			try: () => parseJsonObjectOutput(output)
+		});
+		if (phase === "pre-research") {
+			const parsed = researchOutputSchema.safeParse(json);
+			if (!parsed.success) return yield* Effect.fail(phaseSchemaError(phase, "research.schema.json", parsed.error, output));
+			return JSON.stringify(parsed.data);
+		}
+		const parsed = ticketPlanSchema.safeParse(json);
+		if (!parsed.success) return yield* Effect.fail(phaseSchemaError(phase, "ticket-plan.schema.json", parsed.error, output));
+		return JSON.stringify(parsed.data);
+	});
+}
+function phaseSchemaError(phase, schemaName, error, output) {
+	return /* @__PURE__ */ new Error(`${phase} returned JSON that does not match ${schemaName}: ${error.message}. Output excerpt: ${outputExcerpt(output)}`);
+}
+function parseJsonObjectOutput(output) {
+	const errors = [];
+	for (const candidate of jsonObjectCandidates(output)) try {
+		return JSON.parse(candidate);
+	} catch (error) {
+		errors.push(errorMessage(error));
+	}
+	throw new Error(errors.at(-1) ?? "no JSON object candidate found");
+}
+function jsonObjectCandidates(output) {
+	const trimmed = output.trim();
+	const candidates = /* @__PURE__ */ new Set();
+	if (trimmed.length > 0) candidates.add(trimmed);
+	const fenced = trimmed.match(JSON_CODE_FENCE_RE)?.[1];
+	if (fenced?.trim()) candidates.add(fenced.trim());
+	const firstBrace = trimmed.indexOf("{");
+	const lastBrace = trimmed.lastIndexOf("}");
+	if (firstBrace !== -1 && lastBrace > firstBrace) candidates.add(trimmed.slice(firstBrace, lastBrace + 1));
+	return [...candidates];
+}
+function errorMessage(error) {
+	return error instanceof Error ? error.message : String(error);
+}
+function outputExcerpt(output) {
+	return output.trim().replace(/\s+/g, " ").slice(0, 500);
+}
 function scheduleEntrypointId(payload) {
 	if (payload.submission.kind !== "graph") throw new Error("Pre-schedule generation requires a graph submission.");
 	return payload.submission.mode === "quick" ? "quick" : "execute";

package/dist/runtime/opencode-session-executor.js

@@ -201,10 +201,12 @@ function promptBody(plan) {
 	};
 }
 const FLAGS_TAKING_VALUE = new Set([
-	"--model",
+	"--agent",
 	"--dir",
 	"--file",
-	"--format"
+	"--format",
+	"--model",
+	"--variant"
 ]);
 /**
 * The launch plan carries the prompt inside the CLI argv (`run <prompt>` or

package/package.json

@@ -132,7 +132,7 @@
     "prepack": "nub run build:cli"
   },
   "type": "module",
-  "version": "3.19.2",
+  "version": "3.19.3",
   "description": "Config-driven multi-agent pipeline runner for repository work",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",