omp-conductor 0.3.12 → 0.3.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omp-conductor",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "type": "module",
   "license": "MIT",
   "description": "A 24/7 dispatcher that takes ready GitHub issues to green, mergeable PRs using omp coding sessions, with tiered escalation first to an orchestrator session and then to a human.",

package/src/brief-upgrade.ts

@@ -40,29 +40,138 @@ export const COMPOSE_BANNER = [
 /**
  * A brief split into the package's half and the operator's half.
  *
- * `shipped` runs to the end of the banner line; `owned` is everything after it.
- * Concatenating them reproduces the input byte for byte, which is what makes a
- * merge safe to write back.
+ * `shipped` runs through the full contiguous HTML-comment banner that contains
+ * {@link EDIT_BANNER}; `owned` is everything after that block. Concatenating
+ * them reproduces the input byte for byte, which is what makes a merge safe to
+ * write back.
  */
 export interface BriefHalves {
   shipped: string;
   owned: string;
 }
 
+/** True when a line is a single HTML comment (the banner's only vocabulary). */
+export function isHtmlCommentLine(line: string): boolean {
+  const trimmed = line.trim();
+  return trimmed.startsWith("<!--") && trimmed.endsWith("-->");
+}
+
+/**
+ * Substrings that identify **package** banner chrome phrases, never operator
+ * notes and never a bare decorative separator.
+ *
+ * Matched case-insensitively inside an HTML comment. Keep this list tight: a
+ * false positive would delete fleet-owned POLICY prose.
+ */
+const BANNER_CHROME_MARKERS = [
+  EDIT_BANNER,
+  "never reads this file back",
+  "live copy of POLICY.md",
+  "regenerated from package floor",
+  "hand-edits above or below",
+] as const;
+
+/** `<!-- ====...==== -->` / dash separators that *frame* the banner. */
+const BANNER_SEPARATOR = /^<!--\s*[=-]{3,}\s*-->$/;
+
+/** True when a line is a decorative `<!-- === -->` / `<!-- --- -->` separator. */
+export function isBannerSeparatorLine(line: string): boolean {
+  return BANNER_SEPARATOR.test(line.trim());
+}
+
+/**
+ * True when a line is a package banner **phrase** comment (YOURS TO EDIT /
+ * never-reads footer / compose-banner wording) — not a bare separator.
+ */
+export function isPhraseChromeLine(line: string): boolean {
+  const trimmed = line.trim();
+  if (!isHtmlCommentLine(trimmed)) return false;
+  if (isBannerSeparatorLine(trimmed)) return false;
+  const lower = trimmed.toLowerCase();
+  return BANNER_CHROME_MARKERS.some((marker) => lower.includes(marker.toLowerCase()));
+}
+
+/**
+ * @deprecated Prefer {@link isPhraseChromeLine}. Separators alone are not chrome.
+ */
+export function isKnownBannerChromeLine(line: string): boolean {
+  return isPhraseChromeLine(line);
+}
+
+/**
+ * Drop a leading **known package footer fragment** from an owned half / POLICY.md.
+ *
+ * Only strips when the leading blank+comment prefix contains at least one
+ * package phrase marker (e.g. "never reads this file back"). Separators like
+ * `<!-- ==== -->` strip only as companions to that phrase — a POLICY that
+ * legitimately starts with a decorative separator alone is left untouched.
+ * Stops at the first non-blank line that is neither a phrase nor a separator,
+ * so `<!-- operator notes -->` survive.
+ */
+export function stripLeadingBannerCrumbs(text: string): string {
+  const lines = text.split("\n");
+
+  // Peek: does the leading blank/comment prefix carry a package phrase?
+  let j = 0;
+  let phraseInPrefix = false;
+  while (j < lines.length) {
+    const line = lines[j];
+    if (line === undefined) break;
+    const trimmed = line.trim();
+    if (trimmed === "") {
+      j += 1;
+      continue;
+    }
+    if (!isHtmlCommentLine(line)) break;
+    if (isPhraseChromeLine(line)) phraseInPrefix = true;
+    j += 1;
+  }
+  // Separator-only (or operator-comment-only) prefixes are fleet-owned — keep.
+  if (!phraseInPrefix) return text;
+
+  // Strip blanks, phrase chrome, and separators that framed that phrase.
+  let i = 0;
+  while (i < lines.length) {
+    const line = lines[i];
+    if (line === undefined) break;
+    const trimmed = line.trim();
+    if (trimmed === "" || isPhraseChromeLine(line) || isBannerSeparatorLine(line)) {
+      i += 1;
+      continue;
+    }
+    break;
+  }
+  return lines.slice(i).join("\n");
+}
+
+/** @deprecated Use {@link stripLeadingBannerCrumbs}. Kept for call-site stability. */
+export const stripLeadingHtmlComments = stripLeadingBannerCrumbs;
+
 /**
  * Splits on the banner, or returns `undefined` when there is none.
  *
  * `undefined` is a real answer, not a failure: it means this brief cannot be
  * merged mechanically, and every caller is expected to degrade to reporting
  * rather than to assume a boundary.
+ *
+ * The cut is the end of the **whole contiguous HTML-comment block** that
+ * contains `YOURS TO EDIT`, not merely the line with that substring. Legacy and
+ * compose banners both trail the marker with more `<!-- … -->` lines; leaving
+ * those in `owned` would write package chrome into POLICY.md.
  */
 export function splitBrief(text: string): BriefHalves | undefined {
   const at = text.indexOf(EDIT_BANNER);
   if (at < 0) return undefined;
-  // Keep the whole banner line on the shipped side: the operator's half starts
-  // at the first line they own, so a merge never has to reconstruct the banner.
+  // End of the line that carries YOURS TO EDIT…
   const lineEnd = text.indexOf("\n", at);
-  const cut = lineEnd < 0 ? text.length : lineEnd + 1;
+  let cut = lineEnd < 0 ? text.length : lineEnd + 1;
+  // …then every contiguous HTML-comment line after it (footer / closer).
+  while (cut < text.length) {
+    const nextNl = text.indexOf("\n", cut);
+    const nextLine = nextNl < 0 ? text.slice(cut) : text.slice(cut, nextNl);
+    if (!isHtmlCommentLine(nextLine)) break;
+    cut = nextNl < 0 ? text.length : nextNl + 1;
+  }
   return { shipped: text.slice(0, cut), owned: text.slice(cut) };
 }
 
@@ -296,7 +405,9 @@ export function migrateToPolicy(opts: {
   if (owned === undefined) {
     throw new Error(`cannot migrate ${opts.orchestratorPath}: no ${EDIT_BANNER} banner`);
   }
-  const policyBody = owned.replace(/^\s+/, "");
+  // Strip banner footers that an older split may have left in owned — never let
+  // package chrome become fleet policy.
+  const policyBody = stripLeadingBannerCrumbs(owned).replace(/^\s+/, "");
   const policyBackup = writeWithBackup(opts.policyPath, policyBody.endsWith("\n") ? policyBody : `${policyBody}\n`);
   const composed = composeOrchestrator(opts.floor, readFileSync(opts.policyPath, "utf8"));
   const orchestratorBackup = writeWithBackup(opts.orchestratorPath, composed);
@@ -309,6 +420,37 @@ export function migrateToPolicy(opts: {
   };
 }
 
+/**
+ * Strip leading banner-comment crumbs from an existing POLICY.md and recompose.
+ *
+ * For fleets that already migrated under the line-only split: `--migrate --apply`
+ * on an active overlay repairs POLICY.md in place rather than no-opping.
+ */
+export function repairPolicyBannerCrumbs(opts: {
+  orchestratorPath: string;
+  policyPath: string;
+  floor: string;
+}): MigrateResult | undefined {
+  if (!existsSync(opts.policyPath)) return undefined;
+  const before = readFileSync(opts.policyPath, "utf8");
+  const cleaned = stripLeadingBannerCrumbs(before);
+  if (cleaned === before) {
+    // Still recompose so the floor matches this package even when POLICY was clean.
+    writeFileSync(opts.orchestratorPath, composeOrchestrator(opts.floor, before));
+    return undefined;
+  }
+  const policyBackup = writeWithBackup(opts.policyPath, cleaned.endsWith("\n") ? cleaned : `${cleaned}\n`);
+  const composed = composeOrchestrator(opts.floor, readFileSync(opts.policyPath, "utf8"));
+  const orchestratorBackup = writeWithBackup(opts.orchestratorPath, composed);
+  return {
+    policyPath: opts.policyPath,
+    orchestratorPath: opts.orchestratorPath,
+    policyBackup,
+    orchestratorBackup,
+    ownedBytes: cleaned.length,
+  };
+}
+
 /**
  * Refresh composed ORCHESTRATOR.md from rendered floor + existing POLICY.md.
  * Creates nothing when POLICY.md is absent (caller should migrate first).

package/src/cli.ts

@@ -17,6 +17,7 @@ import {
   inspectBriefLayout,
   migrateToPolicy,
   proposeRetrofit,
+  repairPolicyBannerCrumbs,
   writeMergedBrief,
 } from "./brief-upgrade.ts";
 import { findProject, loadConfig, resolveCaps, stateDir } from "./config.ts";
@@ -593,7 +594,32 @@ try {
 
       if (argv.includes("--migrate")) {
         if (layout.kind === "overlay") {
-          process.stdout.write(`${formatBriefStatus(path, layout)}\n`);
+          if (!argv.includes("--apply")) {
+            process.stdout.write(
+              `${formatBriefStatus(path, layout)}\n\n` +
+                "POLICY.md already present. --migrate --apply will strip any leading\n" +
+                "banner-comment crumbs from POLICY.md and recompose ORCHESTRATOR.md.\n",
+            );
+            break;
+          }
+          if (project === undefined) {
+            process.stderr.write(
+              "omp-conductor: repairing an overlay needs --project (or a config) so the floor renders.\n",
+            );
+            process.exit(1);
+          }
+          const repaired = repairPolicyBannerCrumbs({
+            orchestratorPath: layout.orchestratorPath,
+            policyPath: layout.policyPath,
+            floor: renderFloorForProject(project),
+          });
+          if (repaired === undefined) {
+            process.stdout.write(
+              `${formatBriefStatus(path, layout)}\n\nrecomposed ORCHESTRATOR.md — POLICY.md needed no crumb strip.\n`,
+            );
+          } else {
+            process.stdout.write(`${formatMigrateResult(repaired)}\n`);
+          }
           break;
         }
         if (layout.kind === "missing") {

package/src/plugin.ts

@@ -18,6 +18,7 @@ import {
   formatMigrateResult,
   inspectBriefLayout,
   migrateToPolicy,
+  repairPolicyBannerCrumbs,
   writeMergedBrief,
 } from "./brief-upgrade.ts";
 import { configPath, expandHome, findProject, loadConfig, saveConfig } from "./config.ts";
@@ -957,6 +958,23 @@ export default function conductorPlugin(pi: PluginApi): void {
                 }),
                 "info",
               );
+              const repair = await ctx.ui.confirm(
+                "Repair POLICY.md banner crumbs and recompose?",
+                "Strips any leading HTML-comment leftovers from a pre-fix migrate, then recomposes ORCHESTRATOR.md from the package floor + POLICY.md.",
+              );
+              if (repair) {
+                const repaired = repairPolicyBannerCrumbs({
+                  orchestratorPath: layout.orchestratorPath,
+                  policyPath: layout.policyPath,
+                  floor: renderFloorForProject(p),
+                });
+                ctx.ui.notify(
+                  repaired === undefined
+                    ? "Recomposed ORCHESTRATOR.md — POLICY.md needed no crumb strip."
+                    : formatMigrateResult(repaired),
+                  "info",
+                );
+              }
               break;
             }
             if (layout.kind === "legacy-bannered") {