majlis 0.6.0 → 0.6.1

package/dist/cli.js

@@ -1903,6 +1903,16 @@ function truncateContext(content, limit) {
   if (content.length <= limit) return content;
   return content.slice(0, limit) + "\n[TRUNCATED]";
 }
+function readLatestDiagnosis(projectRoot) {
+  const dir = path3.join(projectRoot, "docs", "diagnosis");
+  try {
+    const files = fs3.readdirSync(dir).filter((f) => f.startsWith("diagnosis-") && f.endsWith(".md")).sort().reverse();
+    if (files.length === 0) return "";
+    return fs3.readFileSync(path3.join(dir, files[0]), "utf-8");
+  } catch {
+    return "";
+  }
+}
 var fs3, path3, DEFAULT_CONFIG2, _cachedConfig, _cachedRoot, CONTEXT_LIMITS;
 var init_config = __esm({
   "src/config.ts"() {
@@ -2417,8 +2427,10 @@ ${taskPrompt}`;
   }
   return { output: markdown, structured, truncated };
 }
-async function spawnSynthesiser(context, projectRoot) {
+async function spawnSynthesiser(context, projectRoot, opts) {
   const root = projectRoot ?? findProjectRoot() ?? process.cwd();
+  const maxTurns = opts?.maxTurns ?? 5;
+  const tools = opts?.tools ?? ["Read", "Glob", "Grep"];
   const contextJson = JSON.stringify(context);
   const taskPrompt = context.taskPrompt ?? "Synthesise the findings into actionable builder guidance.";
   const prompt = `Here is your context:
@@ -2429,14 +2441,14 @@ ${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"} -->';
-  console.log(`[synthesiser] Spawning (maxTurns: 5)...`);
+  console.log(`[synthesiser] Spawning (maxTurns: ${maxTurns})...`);
   const { text: markdown, costUsd, truncated } = await runQuery({
     prompt,
     model: "sonnet",
-    tools: ["Read", "Glob", "Grep"],
+    tools,
     systemPrompt,
     cwd: root,
-    maxTurns: 5,
+    maxTurns,
     label: "synthesiser",
     role: "synthesiser"
   });
@@ -2663,6 +2675,38 @@ var init_spawn = __esm({
   }
 });
 
+// src/git.ts
+function autoCommit(root, message) {
+  try {
+    (0, import_node_child_process.execSync)("git add docs/ .majlis/scripts/ 2>/dev/null; true", {
+      cwd: root,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    const diff = (0, import_node_child_process.execSync)("git diff --cached --stat", {
+      cwd: root,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    if (!diff) return;
+    (0, import_node_child_process.execSync)(`git commit -m ${JSON.stringify(`[majlis] ${message}`)}`, {
+      cwd: root,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    info(`Auto-committed: ${message}`);
+  } catch {
+  }
+}
+var import_node_child_process;
+var init_git = __esm({
+  "src/git.ts"() {
+    "use strict";
+    import_node_child_process = require("child_process");
+    init_format();
+  }
+});
+
 // src/metrics.ts
 function compareMetrics(db, experimentId, config) {
   const before = getMetricsByExperimentAndPhase(db, experimentId, "before");
@@ -2752,7 +2796,7 @@ async function captureMetrics(phase, args) {
   if (config.build.pre_measure) {
     info(`Running pre-measure: ${config.build.pre_measure}`);
     try {
-      (0, import_node_child_process.execSync)(config.build.pre_measure, { cwd: root, encoding: "utf-8", stdio: "inherit" });
+      (0, import_node_child_process2.execSync)(config.build.pre_measure, { cwd: root, encoding: "utf-8", stdio: "inherit" });
     } catch {
       warn("Pre-measure command failed \u2014 continuing anyway.");
     }
@@ -2763,7 +2807,7 @@ async function captureMetrics(phase, args) {
   info(`Running metrics: ${config.metrics.command}`);
   let metricsOutput;
   try {
-    metricsOutput = (0, import_node_child_process.execSync)(config.metrics.command, {
+    metricsOutput = (0, import_node_child_process2.execSync)(config.metrics.command, {
       cwd: root,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
@@ -2782,7 +2826,7 @@ async function captureMetrics(phase, args) {
   success(`Captured ${parsed.length} metric(s) for ${exp.slug} (phase: ${phase})`);
   if (config.build.post_measure) {
     try {
-      (0, import_node_child_process.execSync)(config.build.post_measure, { cwd: root, encoding: "utf-8", stdio: "inherit" });
+      (0, import_node_child_process2.execSync)(config.build.post_measure, { cwd: root, encoding: "utf-8", stdio: "inherit" });
     } catch {
       warn("Post-measure command failed.");
     }
@@ -2833,11 +2877,11 @@ function formatDelta(delta) {
   const prefix = delta > 0 ? "+" : "";
   return `${prefix}${delta.toFixed(4)}`;
 }
-var import_node_child_process;
+var import_node_child_process2;
 var init_measure = __esm({
   "src/commands/measure.ts"() {
     "use strict";
-    import_node_child_process = require("child_process");
+    import_node_child_process2 = require("child_process");
     init_connection();
     init_queries();
     init_metrics();
@@ -2870,7 +2914,7 @@ async function newExperiment(args) {
   const paddedNum = String(num).padStart(3, "0");
   const branch = `exp/${paddedNum}-${slug}`;
   try {
-    (0, import_node_child_process2.execSync)(`git checkout -b ${branch}`, {
+    (0, import_node_child_process3.execSync)(`git checkout -b ${branch}`, {
       cwd: root,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
@@ -2891,6 +2935,7 @@ async function newExperiment(args) {
     fs5.writeFileSync(logPath, logContent);
     info(`Created experiment log: docs/experiments/${paddedNum}-${slug}.md`);
   }
+  autoCommit(root, `new: ${slug}`);
   if (config.cycle.auto_baseline_on_new_experiment && config.metrics.command) {
     info("Auto-baselining... (run `majlis baseline` to do this manually)");
     try {
@@ -2927,12 +2972,12 @@ async function revert(args) {
   );
   updateExperimentStatus(db, exp.id, "dead_end");
   try {
-    const currentBranch = (0, import_node_child_process2.execSync)("git rev-parse --abbrev-ref HEAD", {
+    const currentBranch = (0, import_node_child_process3.execSync)("git rev-parse --abbrev-ref HEAD", {
       cwd: root,
       encoding: "utf-8"
     }).trim();
     if (currentBranch === exp.branch) {
-      (0, import_node_child_process2.execSync)("git checkout main 2>/dev/null || git checkout master", {
+      (0, import_node_child_process3.execSync)("git checkout main 2>/dev/null || git checkout master", {
         cwd: root,
         encoding: "utf-8",
         stdio: ["pipe", "pipe", "pipe"]
@@ -2943,17 +2988,18 @@ async function revert(args) {
   }
   info(`Experiment ${exp.slug} reverted to dead-end. Reason: ${reason}`);
 }
-var fs5, path5, import_node_child_process2;
+var fs5, path5, import_node_child_process3;
 var init_experiment = __esm({
   "src/commands/experiment.ts"() {
     "use strict";
     fs5 = __toESM(require("fs"));
     path5 = __toESM(require("path"));
-    import_node_child_process2 = require("child_process");
+    import_node_child_process3 = require("child_process");
     init_connection();
     init_queries();
     init_config();
     init_spawn();
+    init_git();
     init_format();
   }
 });
@@ -3301,6 +3347,7 @@ async function resolve(db, exp, projectRoot) {
       gitMerge(exp.branch, projectRoot);
       const gaps = grades.filter((g) => g.grade === "good").map((g) => `- **${g.component}**: ${g.notes ?? "minor gaps"}`).join("\n");
       appendToFragilityMap(projectRoot, exp.slug, gaps);
+      autoCommit(projectRoot, `resolve: fragility gaps from ${exp.slug}`);
       updateExperimentStatus(db, exp.id, "merged");
       success(`Experiment ${exp.slug} MERGED (good, ${grades.filter((g) => g.grade === "good").length} gaps added to fragility map).`);
       break;
@@ -3435,7 +3482,12 @@ async function resolveDbOnly(db, exp, projectRoot) {
 }
 function gitMerge(branch, cwd) {
   try {
-    (0, import_node_child_process3.execSync)(`git merge ${branch} --no-ff -m "Merge experiment branch ${branch}"`, {
+    (0, import_node_child_process4.execSync)("git checkout main 2>/dev/null || git checkout master", {
+      cwd,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    (0, import_node_child_process4.execSync)(`git merge ${branch} --no-ff -m "Merge experiment branch ${branch}"`, {
       cwd,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
@@ -3446,16 +3498,16 @@ function gitMerge(branch, cwd) {
 }
 function gitRevert(branch, cwd) {
   try {
-    const currentBranch = (0, import_node_child_process3.execSync)("git rev-parse --abbrev-ref HEAD", {
+    const currentBranch = (0, import_node_child_process4.execSync)("git rev-parse --abbrev-ref HEAD", {
       cwd,
       encoding: "utf-8"
     }).trim();
     if (currentBranch === branch) {
       try {
-        (0, import_node_child_process3.execSync)("git checkout -- .", { cwd, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
+        (0, import_node_child_process4.execSync)("git checkout -- .", { cwd, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
       } catch {
       }
-      (0, import_node_child_process3.execSync)("git checkout main 2>/dev/null || git checkout master", {
+      (0, import_node_child_process4.execSync)("git checkout main 2>/dev/null || git checkout master", {
         cwd,
         encoding: "utf-8",
         stdio: ["pipe", "pipe", "pipe"]
@@ -3477,7 +3529,7 @@ ${gaps}
 `;
   fs7.writeFileSync(fragPath, content + entry);
 }
-var fs7, path7, import_node_child_process3;
+var fs7, path7, import_node_child_process4;
 var init_resolve = __esm({
   "src/resolve.ts"() {
     "use strict";
@@ -3486,7 +3538,8 @@ var init_resolve = __esm({
     init_types2();
     init_queries();
     init_spawn();
-    import_node_child_process3 = require("child_process");
+    import_node_child_process4 = require("child_process");
+    init_git();
     init_format();
   }
 });
@@ -3605,7 +3658,7 @@ async function doBuild(db, exp, root) {
   const existingBaseline = getMetricsByExperimentAndPhase(db, exp.id, "before");
   if (config.metrics?.command && existingBaseline.length === 0) {
     try {
-      const output = (0, import_node_child_process4.execSync)(config.metrics.command, {
+      const output = (0, import_node_child_process5.execSync)(config.metrics.command, {
         cwd: root,
         encoding: "utf-8",
         timeout: 6e4,
@@ -3662,7 +3715,7 @@ Build the experiment: ${exp.hypothesis}` : `Build the experiment: ${exp.hypothes
   } else {
     if (config.metrics?.command) {
       try {
-        const output = (0, import_node_child_process4.execSync)(config.metrics.command, {
+        const output = (0, import_node_child_process5.execSync)(config.metrics.command, {
           cwd: root,
           encoding: "utf-8",
           timeout: 6e4,
@@ -3686,7 +3739,7 @@ async function doChallenge(db, exp, root) {
   transition(exp.status, "challenged" /* CHALLENGED */);
   let gitDiff = "";
   try {
-    gitDiff = (0, import_node_child_process4.execSync)('git diff main -- . ":!.majlis/"', {
+    gitDiff = (0, import_node_child_process5.execSync)('git diff main -- . ":!.majlis/"', {
       cwd: root,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
@@ -3898,12 +3951,13 @@ async function doCompress(db, root) {
   }, root);
   const sizeAfter = fs8.existsSync(synthesisPath) ? fs8.statSync(synthesisPath).size : 0;
   recordCompression(db, sessionCount, sizeBefore, sizeAfter);
+  autoCommit(root, "compress: update synthesis");
   success(`Compression complete. Synthesis: ${sizeBefore}B \u2192 ${sizeAfter}B`);
 }
 function gitCommitBuild(exp, cwd) {
   try {
-    (0, import_node_child_process4.execSync)('git add -A -- ":!.majlis/"', { cwd, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
-    const diff = (0, import_node_child_process4.execSync)("git diff --cached --stat", { cwd, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim();
+    (0, import_node_child_process5.execSync)('git add -A -- ":!.majlis/"', { cwd, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
+    const diff = (0, import_node_child_process5.execSync)("git diff --cached --stat", { cwd, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim();
     if (!diff) {
       info("No code changes to commit.");
       return;
@@ -3911,7 +3965,7 @@ function gitCommitBuild(exp, cwd) {
     const msg = `EXP-${String(exp.id).padStart(3, "0")}: ${exp.slug}
 
 ${exp.hypothesis ?? ""}`;
-    (0, import_node_child_process4.execSync)(`git commit -m ${JSON.stringify(msg)}`, { cwd, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
+    (0, import_node_child_process5.execSync)(`git commit -m ${JSON.stringify(msg)}`, { cwd, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
     info(`Committed builder changes on ${exp.branch}.`);
   } catch {
     warn("Could not auto-commit builder changes \u2014 commit manually before resolving.");
@@ -3987,13 +4041,13 @@ function ingestStructuredOutput(db, experimentId, structured) {
     info(`Ingested ${structured.findings.length} finding(s)`);
   }
 }
-var fs8, path8, import_node_child_process4;
+var fs8, path8, import_node_child_process5;
 var init_cycle = __esm({
   "src/commands/cycle.ts"() {
     "use strict";
     fs8 = __toESM(require("fs"));
     path8 = __toESM(require("path"));
-    import_node_child_process4 = require("child_process");
+    import_node_child_process5 = require("child_process");
     init_connection();
     init_queries();
     init_machine();
@@ -4002,6 +4056,7 @@ var init_cycle = __esm({
     init_resolve();
     init_config();
     init_metrics();
+    init_git();
     init_format();
   }
 });
@@ -4035,6 +4090,7 @@ ${deadEnds}
 
 Write the classification to docs/classification/ following the template.`
   }, root);
+  autoCommit(root, `classify: ${domain.slice(0, 60)}`);
   success("Classification complete. Check docs/classification/ for the output.");
 }
 async function reframe(args) {
@@ -4077,6 +4133,7 @@ ${deadEnds}
 Independently propose a decomposition. Compare with the existing classification. Flag structural divergences \u2014 these are the most valuable signals.
 Write to docs/reframes/.`
   }, root);
+  autoCommit(root, `reframe: ${target.slice(0, 60)}`);
   success("Reframe complete. Check docs/reframes/ for the output.");
 }
 var fs9, path9;
@@ -4087,6 +4144,7 @@ var init_classify = __esm({
     path9 = __toESM(require("path"));
     init_connection();
     init_spawn();
+    init_git();
     init_format();
   }
 });
@@ -4398,6 +4456,7 @@ async function run(args) {
       usedHypotheses.add(hypothesis);
       info(`Next hypothesis: ${hypothesis}`);
       exp = await createNewExperiment(db, root, hypothesis);
+      autoCommit(root, `new: ${exp.slug}`);
       success(`Created experiment #${exp.id}: ${exp.slug}`);
     }
     if (isTerminal(exp.status)) {
@@ -4449,12 +4508,13 @@ async function deriveNextHypothesis(goal, root, db) {
   const synthesis = truncateContext(readFileOrEmpty(path11.join(root, "docs", "synthesis", "current.md")), CONTEXT_LIMITS.synthesis);
   const fragility = truncateContext(readFileOrEmpty(path11.join(root, "docs", "synthesis", "fragility.md")), CONTEXT_LIMITS.fragility);
   const deadEndsDoc = truncateContext(readFileOrEmpty(path11.join(root, "docs", "synthesis", "dead-ends.md")), CONTEXT_LIMITS.deadEnds);
+  const diagnosis = truncateContext(readLatestDiagnosis(root), CONTEXT_LIMITS.synthesis);
   const deadEnds = listAllDeadEnds(db);
   const config = loadConfig(root);
   let metricsOutput = "";
   if (config.metrics?.command) {
     try {
-      metricsOutput = (0, import_node_child_process5.execSync)(config.metrics.command, {
+      metricsOutput = (0, import_node_child_process6.execSync)(config.metrics.command, {
         cwd: root,
         encoding: "utf-8",
         timeout: 6e4,
@@ -4469,7 +4529,10 @@ async function deriveNextHypothesis(goal, root, db) {
 
 ## Goal
 ${goal}
-
+${diagnosis ? `
+## Latest Diagnosis Report (PRIORITISE \u2014 deep analysis from diagnostician agent)
+${diagnosis}
+` : ""}
 ## Current Metrics
 ${metricsOutput || "(no metrics configured)"}
 
@@ -4489,6 +4552,8 @@ Note: [structural] dead ends are HARD CONSTRAINTS \u2014 your hypothesis MUST NO
 [procedural] dead ends are process failures \u2014 the approach may still be valid if executed differently.
 
 ## Your Task
+DO NOT read source code or use tools. All context you need is above. Plan from the synthesis and dead-end registry.
+
 1. Assess: based on the metrics and synthesis, has the goal been met? Be specific.
 2. If YES \u2014 output the JSON block below with goal_met: true.
 3. If NO \u2014 propose the SINGLE most promising next experiment hypothesis.
@@ -4504,7 +4569,7 @@ CRITICAL: Your LAST line of output MUST be EXACTLY this format (on its own line,
 
 If the goal is met:
 <!-- majlis-json {"goal_met": true, "hypothesis": null} -->`
-  }, root);
+  }, root, { maxTurns: 2, tools: [] });
   const structured = result.structured;
   if (structured?.goal_met === true) {
     return null;
@@ -4530,7 +4595,7 @@ If the goal is met:
 ${result.output.slice(-2e3)}
 
 <!-- majlis-json {"goal_met": false, "hypothesis": "your hypothesis"} -->`
-  }, root);
+  }, root, { maxTurns: 1, tools: [] });
   if (retry.structured?.hypothesis) return retry.structured.hypothesis;
   warn("Could not extract hypothesis. Using goal as fallback.");
   return goal;
@@ -4548,7 +4613,7 @@ async function createNewExperiment(db, root, hypothesis) {
   const paddedNum = String(num).padStart(3, "0");
   const branch = `exp/${paddedNum}-${finalSlug}`;
   try {
-    (0, import_node_child_process5.execSync)(`git checkout -b ${branch}`, {
+    (0, import_node_child_process6.execSync)(`git checkout -b ${branch}`, {
       cwd: root,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
@@ -4571,13 +4636,13 @@ async function createNewExperiment(db, root, hypothesis) {
   }
   return exp;
 }
-var fs11, path11, import_node_child_process5;
+var fs11, path11, import_node_child_process6;
 var init_run = __esm({
   "src/commands/run.ts"() {
     "use strict";
     fs11 = __toESM(require("fs"));
     path11 = __toESM(require("path"));
-    import_node_child_process5 = require("child_process");
+    import_node_child_process6 = require("child_process");
     init_connection();
     init_queries();
     init_machine();
@@ -4586,6 +4651,7 @@ var init_run = __esm({
     init_spawn();
     init_config();
     init_shutdown();
+    init_git();
     init_format();
   }
 });
@@ -4596,7 +4662,7 @@ function createWorktree(mainRoot, slug, paddedNum) {
   const worktreeName = `${projectName}-swarm-${paddedNum}-${slug}`;
   const worktreePath = path12.join(path12.dirname(mainRoot), worktreeName);
   const branch = `swarm/${paddedNum}-${slug}`;
-  (0, import_node_child_process6.execSync)(`git worktree add ${JSON.stringify(worktreePath)} -b ${branch}`, {
+  (0, import_node_child_process7.execSync)(`git worktree add ${JSON.stringify(worktreePath)} -b ${branch}`, {
     cwd: mainRoot,
     encoding: "utf-8",
     stdio: ["pipe", "pipe", "pipe"]
@@ -4647,7 +4713,7 @@ function initializeWorktree(mainRoot, worktreePath) {
 }
 function cleanupWorktree(mainRoot, wt) {
   try {
-    (0, import_node_child_process6.execSync)(`git worktree remove ${JSON.stringify(wt.path)} --force`, {
+    (0, import_node_child_process7.execSync)(`git worktree remove ${JSON.stringify(wt.path)} --force`, {
       cwd: mainRoot,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
@@ -4656,7 +4722,7 @@ function cleanupWorktree(mainRoot, wt) {
     warn(`Could not remove worktree ${wt.path} \u2014 remove manually.`);
   }
   try {
-    (0, import_node_child_process6.execSync)(`git branch -D ${wt.branch}`, {
+    (0, import_node_child_process7.execSync)(`git branch -D ${wt.branch}`, {
       cwd: mainRoot,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
@@ -4664,7 +4730,7 @@ function cleanupWorktree(mainRoot, wt) {
   } catch {
   }
   try {
-    (0, import_node_child_process6.execSync)("git worktree prune", {
+    (0, import_node_child_process7.execSync)("git worktree prune", {
       cwd: mainRoot,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
@@ -4672,13 +4738,13 @@ function cleanupWorktree(mainRoot, wt) {
   } catch {
   }
 }
-var fs12, path12, import_node_child_process6;
+var fs12, path12, import_node_child_process7;
 var init_worktree = __esm({
   "src/swarm/worktree.ts"() {
     "use strict";
     fs12 = __toESM(require("fs"));
     path12 = __toESM(require("path"));
-    import_node_child_process6 = require("child_process");
+    import_node_child_process7 = require("child_process");
     init_connection();
     init_format();
   }
@@ -4983,7 +5049,7 @@ async function swarm(args) {
     MAX_PARALLEL
   );
   try {
-    const status2 = (0, import_node_child_process7.execSync)("git status --porcelain", {
+    const status2 = (0, import_node_child_process8.execSync)("git status --porcelain", {
       cwd: root,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
@@ -5067,7 +5133,7 @@ async function swarm(args) {
     const best = summary.bestExperiment;
     info(`Best experiment: ${best.worktree.slug} (${best.overallGrade})`);
     try {
-      (0, import_node_child_process7.execSync)(
+      (0, import_node_child_process8.execSync)(
         `git merge ${best.worktree.branch} --no-ff -m "Merge swarm winner: ${best.worktree.slug}"`,
         { cwd: root, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }
       );
@@ -5126,13 +5192,14 @@ async function deriveMultipleHypotheses(goal, root, count) {
     readFileOrEmpty(path14.join(root, "docs", "synthesis", "dead-ends.md")),
     CONTEXT_LIMITS.deadEnds
   );
+  const diagnosis = truncateContext(readLatestDiagnosis(root), CONTEXT_LIMITS.synthesis);
   const db = getDb(root);
   const deadEnds = listAllDeadEnds(db);
   const config = loadConfig(root);
   let metricsOutput = "";
   if (config.metrics?.command) {
     try {
-      metricsOutput = (0, import_node_child_process7.execSync)(config.metrics.command, {
+      metricsOutput = (0, import_node_child_process8.execSync)(config.metrics.command, {
         cwd: root,
         encoding: "utf-8",
         timeout: 6e4,
@@ -5147,7 +5214,10 @@ async function deriveMultipleHypotheses(goal, root, count) {
 
 ## Goal
 ${goal}
-
+${diagnosis ? `
+## Latest Diagnosis Report (PRIORITISE \u2014 deep analysis from diagnostician agent)
+${diagnosis}
+` : ""}
 ## Current Metrics
 ${metricsOutput || "(no metrics configured)"}
 
@@ -5167,6 +5237,8 @@ Note: [structural] dead ends are HARD CONSTRAINTS \u2014 hypotheses MUST NOT rep
 [procedural] dead ends are process failures \u2014 the approach may still be valid if executed differently.
 
 ## Your Task
+DO NOT read source code or use tools. All context you need is above. Plan from the synthesis and dead-end registry.
+
 1. Assess: based on the metrics and synthesis, has the goal been met? Be specific.
 2. If YES \u2014 output the JSON block below with goal_met: true.
 3. If NO \u2014 generate exactly ${count} DIVERSE hypotheses for parallel testing.
@@ -5184,7 +5256,7 @@ CRITICAL: Your LAST line of output MUST be EXACTLY this format (on its own line,
 
 If the goal is met:
 <!-- majlis-json {"goal_met": true, "hypotheses": []} -->`
-  }, root);
+  }, root, { maxTurns: 2, tools: [] });
   if (result.structured?.goal_met === true) return [];
   if (result.structured?.hypotheses && Array.isArray(result.structured.hypotheses)) {
     return result.structured.hypotheses.filter(
@@ -5207,12 +5279,12 @@ If the goal is met:
   warn("Planner did not return structured hypotheses. Using goal as single hypothesis.");
   return [goal];
 }
-var path14, import_node_child_process7, MAX_PARALLEL, DEFAULT_PARALLEL;
+var path14, import_node_child_process8, MAX_PARALLEL, DEFAULT_PARALLEL;
 var init_swarm = __esm({
   "src/commands/swarm.ts"() {
     "use strict";
     path14 = __toESM(require("path"));
-    import_node_child_process7 = require("child_process");
+    import_node_child_process8 = require("child_process");
     init_connection();
     init_queries();
     init_spawn();
@@ -5251,7 +5323,7 @@ async function diagnose(args) {
   let metricsOutput = "";
   if (config.metrics?.command) {
     try {
-      metricsOutput = (0, import_node_child_process8.execSync)(config.metrics.command, {
+      metricsOutput = (0, import_node_child_process9.execSync)(config.metrics.command, {
         cwd: root,
         encoding: "utf-8",
         timeout: 6e4,
@@ -5330,19 +5402,21 @@ Remember: you may write files ONLY to .majlis/scripts/. You cannot modify projec
   if (result.truncated) {
     warn("Diagnostician was truncated (hit 60 turn limit).");
   }
+  autoCommit(root, `diagnosis: ${focus || "general"}`);
   success("Diagnosis complete.");
 }
-var fs14, path15, import_node_child_process8;
+var fs14, path15, import_node_child_process9;
 var init_diagnose = __esm({
   "src/commands/diagnose.ts"() {
     "use strict";
     fs14 = __toESM(require("fs"));
     path15 = __toESM(require("path"));
-    import_node_child_process8 = require("child_process");
+    import_node_child_process9 = require("child_process");
     init_connection();
     init_queries();
     init_spawn();
     init_config();
+    init_git();
     init_format();
   }
 });

package/package.json

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