majlis 0.8.2 → 0.8.4

package/dist/cli.js

@@ -2447,7 +2447,7 @@ ${contextJson}
 \`\`\`
 
 ${taskPrompt}`;
-  const systemPrompt = 'You are a Synthesis Agent. Be concrete: which decisions failed, which assumptions broke, what constraints must the next approach satisfy. CRITICAL: Your LAST line of output MUST be a <!-- majlis-json --> block. The framework parses this programmatically \u2014 if you omit it, the pipeline breaks. Format: <!-- majlis-json {"guidance": "your guidance here"} -->';
+  const systemPrompt = 'You are a Synthesis Agent. Be concrete: which decisions failed, which assumptions broke, what constraints must the next approach satisfy.\n\nIf any approach from this iteration is PROVABLY dead (not just needs refinement \u2014 structurally impossible or fundamentally wrong), flag it on its own line as:\n[DEAD-APPROACH] approach name: why it cannot work\n\nOnly use [DEAD-APPROACH] for approaches that are mathematically impossible, violate invariants, or have been empirically proven to fail. Do NOT flag approaches that merely need adjustment.\n\nCRITICAL: Your LAST line of output MUST be a <!-- majlis-json --> block. The framework parses this programmatically \u2014 if you omit it, the pipeline breaks. Format: <!-- majlis-json {"guidance": "your guidance here"} -->';
   console.log(`[synthesiser] Spawning (maxTurns: ${maxTurns})...`);
   const { text: markdown, costUsd, truncated } = await runQuery({
     prompt,
@@ -4517,6 +4517,41 @@ var init_metrics = __esm({
 });
 
 // src/resolve.ts
+function accumulateGuidance(existing, newGuidance) {
+  const iterationNums = existing?.match(/### Iteration (\d+)/g)?.map((m) => parseInt(m.replace("### Iteration ", ""), 10)) ?? [];
+  const maxExisting = iterationNums.length > 0 ? Math.max(...iterationNums) : 0;
+  const iterationNum = maxExisting + 1;
+  const header2 = `### Iteration ${iterationNum} (latest)`;
+  const newBlock = `${header2}
+${newGuidance}`;
+  if (!existing) return newBlock;
+  const cleaned = existing.replace(/ \(latest\)/g, "");
+  const accumulated = `${newBlock}
+
+---
+
+${cleaned}`;
+  if (accumulated.length <= GUIDANCE_MAX_CHARS) return accumulated;
+  const sections = accumulated.split(/(?=^### Iteration \d+)/m);
+  let result = "";
+  for (const section of sections) {
+    if (result.length + section.length > GUIDANCE_MAX_CHARS && result.length > 0) {
+      result += "\n\n[Earlier iterations truncated]";
+      break;
+    }
+    result += section;
+  }
+  return result;
+}
+function parseSynthesiserDeadApproaches(output) {
+  const results = [];
+  const regex = /\[DEAD-APPROACH\]\s*(.+?):\s*(.+)/g;
+  let match;
+  while ((match = regex.exec(output)) !== null) {
+    results.push({ approach: match[1].trim(), reason: match[2].trim() });
+  }
+  return results;
+}
 function worstGrade(grades) {
   if (grades.length === 0) {
     throw new Error("Cannot determine grade from empty verification set \u2014 this indicates a data integrity issue");
@@ -4551,11 +4586,12 @@ async function resolve2(db, exp, projectRoot) {
       warn(`  ${v.fixture} / ${v.metric}: ${v.before} \u2192 ${v.after} (${v.delta > 0 ? "+" : ""}${v.delta})`);
     }
     updateExperimentStatus(db, exp.id, "resolved");
-    const guidanceText = `Gate fixture regression blocks merge. Fix these regressions before re-attempting:
+    const gateGuidance = `Gate fixture regression blocks merge. Fix these regressions before re-attempting:
 ` + gateViolations.map((v) => `- ${v.fixture} / ${v.metric}: was ${v.before}, now ${v.after}`).join("\n");
+    const accumulatedGate = accumulateGuidance(exp.builder_guidance, gateGuidance);
     transition("resolved" /* RESOLVED */, "building" /* BUILDING */);
     db.transaction(() => {
-      storeBuilderGuidance(db, exp.id, guidanceText);
+      storeBuilderGuidance(db, exp.id, accumulatedGate);
       updateExperimentStatus(db, exp.id, "building");
       if (exp.sub_type) {
         incrementSubTypeFailure(db, exp.sub_type, exp.id, "weak");
@@ -4598,16 +4634,47 @@ async function resolve2(db, exp, projectRoot) {
         confirmedDoubts,
         taskPrompt: "Synthesise the verification report, confirmed doubts, and adversarial case results into specific, actionable guidance for the builder's next attempt. Be concrete: which specific decisions need revisiting, which assumptions broke, and what constraints must the next approach satisfy."
       }, projectRoot);
-      const guidanceText = guidance.structured?.guidance ?? guidance.output;
+      const rawGuidance = guidance.structured?.guidance ?? guidance.output;
+      const accumulated = accumulateGuidance(exp.builder_guidance, rawGuidance);
       transition("resolved" /* RESOLVED */, "building" /* BUILDING */);
       db.transaction(() => {
-        storeBuilderGuidance(db, exp.id, guidanceText);
+        storeBuilderGuidance(db, exp.id, accumulated);
         updateExperimentStatus(db, exp.id, "building");
         if (exp.sub_type) {
           incrementSubTypeFailure(db, exp.sub_type, exp.id, "weak");
         }
+        const rejectedInWeak = grades.filter((g) => g.grade === "rejected");
+        for (const rc of rejectedInWeak) {
+          insertDeadEnd(
+            db,
+            exp.id,
+            `${rc.component} (iteration within ${exp.slug})`,
+            rc.notes ?? "rejected by verifier",
+            `Component ${rc.component} rejected: ${rc.notes ?? "approach does not work"}`,
+            exp.sub_type,
+            "structural"
+          );
+        }
+        if (rejectedInWeak.length > 0) {
+          info(`Registered ${rejectedInWeak.length} component-level dead-end(s) from weak verification.`);
+        }
+        const deadApproaches = parseSynthesiserDeadApproaches(guidance.output);
+        for (const da of deadApproaches) {
+          insertDeadEnd(
+            db,
+            exp.id,
+            da.approach,
+            da.reason,
+            da.reason,
+            exp.sub_type,
+            "structural"
+          );
+        }
+        if (deadApproaches.length > 0) {
+          info(`Registered ${deadApproaches.length} dead approach(es) from synthesiser.`);
+        }
       })();
-      warn(`Experiment ${exp.slug} CYCLING BACK (weak). Guidance generated for builder.`);
+      warn(`Experiment ${exp.slug} CYCLING BACK (weak). Guidance accumulated for builder.`);
       break;
     }
     case "rejected": {
@@ -4660,11 +4727,12 @@ async function resolveDbOnly(db, exp, projectRoot) {
       warn(`  ${v.fixture} / ${v.metric}: ${v.before} \u2192 ${v.after} (${v.delta > 0 ? "+" : ""}${v.delta})`);
     }
     updateExperimentStatus(db, exp.id, "resolved");
-    const guidanceText = `Gate fixture regression blocks merge. Fix these regressions before re-attempting:
+    const swarmGateGuidance = `Gate fixture regression blocks merge. Fix these regressions before re-attempting:
 ` + gateViolations.map((v) => `- ${v.fixture} / ${v.metric}: was ${v.before}, now ${v.after}`).join("\n");
+    const accumulatedSwarmGate = accumulateGuidance(exp.builder_guidance, swarmGateGuidance);
     transition("resolved" /* RESOLVED */, "building" /* BUILDING */);
     db.transaction(() => {
-      storeBuilderGuidance(db, exp.id, guidanceText);
+      storeBuilderGuidance(db, exp.id, accumulatedSwarmGate);
       updateExperimentStatus(db, exp.id, "building");
       if (exp.sub_type) {
         incrementSubTypeFailure(db, exp.sub_type, exp.id, "weak");
@@ -4703,16 +4771,47 @@ async function resolveDbOnly(db, exp, projectRoot) {
         confirmedDoubts,
         taskPrompt: "Synthesise the verification report, confirmed doubts, and adversarial case results into specific, actionable guidance for the builder's next attempt. Be concrete: which specific decisions need revisiting, which assumptions broke, and what constraints must the next approach satisfy."
       }, projectRoot);
-      const guidanceText = guidance.structured?.guidance ?? guidance.output;
+      const rawGuidance = guidance.structured?.guidance ?? guidance.output;
+      const accumulated = accumulateGuidance(exp.builder_guidance, rawGuidance);
       transition("resolved" /* RESOLVED */, "building" /* BUILDING */);
       db.transaction(() => {
-        storeBuilderGuidance(db, exp.id, guidanceText);
+        storeBuilderGuidance(db, exp.id, accumulated);
         updateExperimentStatus(db, exp.id, "building");
         if (exp.sub_type) {
           incrementSubTypeFailure(db, exp.sub_type, exp.id, "weak");
         }
+        const rejectedInWeak = grades.filter((g) => g.grade === "rejected");
+        for (const rc of rejectedInWeak) {
+          insertDeadEnd(
+            db,
+            exp.id,
+            `${rc.component} (iteration within ${exp.slug})`,
+            rc.notes ?? "rejected by verifier",
+            `Component ${rc.component} rejected: ${rc.notes ?? "approach does not work"}`,
+            exp.sub_type,
+            "structural"
+          );
+        }
+        if (rejectedInWeak.length > 0) {
+          info(`Registered ${rejectedInWeak.length} component-level dead-end(s) from weak verification.`);
+        }
+        const deadApproaches = parseSynthesiserDeadApproaches(guidance.output);
+        for (const da of deadApproaches) {
+          insertDeadEnd(
+            db,
+            exp.id,
+            da.approach,
+            da.reason,
+            da.reason,
+            exp.sub_type,
+            "structural"
+          );
+        }
+        if (deadApproaches.length > 0) {
+          info(`Registered ${deadApproaches.length} dead approach(es) from synthesiser.`);
+        }
       })();
-      warn(`Experiment ${exp.slug} CYCLING BACK (weak). Guidance generated.`);
+      warn(`Experiment ${exp.slug} CYCLING BACK (weak). Guidance accumulated.`);
       break;
     }
     case "rejected": {
@@ -4805,7 +4904,7 @@ ${gaps}
 `;
   fs10.writeFileSync(fragPath, content + entry);
 }
-var fs10, path10, import_node_child_process4;
+var fs10, path10, import_node_child_process4, GUIDANCE_MAX_CHARS;
 var init_resolve = __esm({
   "src/resolve.ts"() {
     "use strict";
@@ -4820,6 +4919,7 @@ var init_resolve = __esm({
     import_node_child_process4 = require("child_process");
     init_git();
     init_format();
+    GUIDANCE_MAX_CHARS = 12e3;
   }
 });
 
@@ -5424,11 +5524,15 @@ function gitCommitBuild(exp, cwd) {
       info("No code changes to commit.");
       return;
     }
-    const msg = `EXP-${String(exp.id).padStart(3, "0")}: ${exp.slug}
+    const guidance = exp.builder_guidance ?? "";
+    const iterationNums = guidance.match(/### Iteration (\d+)/g)?.map((m) => parseInt(m.replace("### Iteration ", ""), 10)) ?? [];
+    const iterNum = iterationNums.length > 0 ? Math.max(...iterationNums) + 1 : 1;
+    const iterTag = iterNum > 1 ? ` [iter ${iterNum}]` : "";
+    const msg = `EXP-${String(exp.id).padStart(3, "0")}: ${exp.slug}${iterTag}
 
 ${exp.hypothesis ?? ""}`;
     (0, import_node_child_process5.execFileSync)("git", ["commit", "-m", msg], { cwd, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
-    info(`Committed builder changes on ${exp.branch}.`);
+    info(`Committed builder changes on ${exp.branch}${iterTag}.`);
   } catch {
     warn("Could not auto-commit builder changes \u2014 commit manually before resolving.");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "majlis",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "description": "Multi-agent workflow CLI for structured doubt, independent verification, and compressed knowledge",
   "bin": {
     "majlis": "./dist/cli.js"