@uzysjung/agent-harness 26.159.0 → 26.160.0

package/dist/index.js

@@ -5,6 +5,7 @@ import {
   CATEGORY_TITLES,
   CLI_BASES,
   CONTINUOUS_SKILLS,
+  CONTINUOUS_SKILLS_HEADING,
   DEFAULT_OPTIONS,
   EXTERNAL_ASSETS,
   HARNESS_ANCHOR_FILE,
@@ -57,6 +58,7 @@ import {
   listFilesRecursive,
   mergeExternalFiles,
   readInstallLog,
+  renderContinuousSkillsNote,
   renderFillScaffold,
   residentCost,
   resolveBundleRoot,
@@ -67,7 +69,7 @@ import {
   upsertHarnessImport,
   withContinuousSkillsNote,
   writeInstallLog
-} from "./chunk-FTL34NT4.js";
+} from "./chunk-ZXWOY5VO.js";
 
 // node_modules/sisteransi/src/index.js
 var require_src = __commonJS({
@@ -752,7 +754,7 @@ var cac = (name = "") => new CAC(name);
 // package.json
 var package_default = {
   name: "@uzysjung/agent-harness",
-  version: "26.159.0",
+  version: "26.160.0",
   description: "Curate vetted AI-coding skills & plugins by your tech stack \u2014 install only what you need, across Claude Code, Codex, OpenCode & Antigravity",
   type: "module",
   publishConfig: {
@@ -1084,11 +1086,137 @@ import { basename, join as join6 } from "path";
 
 // src/codex/agents-md.ts
 init_esm_shims();
+
+// src/agents-md-merge.ts
+init_esm_shims();
+var marker = (name) => ({
+  start: `<!-- uzys-harness:${name}:start -->`,
+  end: `<!-- uzys-harness:${name}:end -->`
+});
+var ANCHOR_BLOCK = marker("anchor");
+var SKILLS_BLOCK = marker("skills");
+var CONTEXT_SECTION = "Project Context";
+var RULES_SECTION = "Project Rules";
+function wrapHarnessBlock(m, body) {
+  return `${m.start}
+${body}
+${m.end}`;
+}
+function withMarkedContinuousSkillsNote(scaffold, selectedInternalSkills) {
+  const note = renderContinuousSkillsNote(selectedInternalSkills);
+  return note ? `${scaffold}
+
+${wrapHarnessBlock(SKILLS_BLOCK, note)}` : scaffold;
+}
+function sectionNames(template) {
+  return new Set([...template.matchAll(/^## (.+)$/gm)].map((m) => (m[1] ?? "").trim()));
+}
+function headingName(line, names) {
+  const name = /^## (.+?)\s*$/.exec(line.replace(/\r$/, ""))?.[1];
+  return name !== void 0 && names.has(name) ? name : null;
+}
+function sectionBody(text, names, want) {
+  const lines = text.split("\n");
+  let start = -1;
+  for (const [i, line] of lines.entries()) {
+    const name = headingName(line, names);
+    if (name === null) continue;
+    if (start === -1) {
+      if (name === want) start = i;
+    } else {
+      return lines.slice(start + 1, i);
+    }
+  }
+  return start === -1 ? null : lines.slice(start + 1);
+}
+function assemble(rendered, names, bodies) {
+  const out = [];
+  let replacing = false;
+  for (const line of rendered.split("\n")) {
+    const name = headingName(line, names);
+    if (name !== null) {
+      out.push(line);
+      const override = bodies.get(name);
+      replacing = override !== void 0;
+      if (override !== void 0) out.push(...override);
+      continue;
+    }
+    if (!replacing) out.push(line);
+  }
+  return out.join("\n");
+}
+function blockRange(lines, m) {
+  const start = lines.findIndex((l) => l.trim() === m.start);
+  if (start === -1) return null;
+  const end = lines.findIndex((l, i) => i > start && l.trim() === m.end);
+  return end === -1 ? null : [start, end];
+}
+function trimTrailingBlanks(lines) {
+  const out = [...lines];
+  while (out.length > 0 && (out.at(-1) ?? "").trim() === "") out.pop();
+  return out;
+}
+function refreshBlock(existing, rendered, m, legacyHeading) {
+  const at2 = blockRange(rendered, m);
+  const fresh = at2 === null ? null : rendered.slice(at2[0], at2[1] + 1);
+  const here = blockRange(existing, m);
+  if (here !== null) {
+    const head2 = existing.slice(0, here[0]);
+    const tail2 = existing.slice(here[1] + 1);
+    if (fresh === null) {
+      const kept = trimTrailingBlanks(head2);
+      return tail2.length > 0 ? [...kept, ...tail2] : [...kept, ""];
+    }
+    return [...head2, ...fresh, ...tail2];
+  }
+  const legacyAt = legacyHeading === void 0 ? -1 : existing.findIndex((l) => l.replace(/\r$/, "").trim() === legacyHeading);
+  if (legacyAt === -1) {
+    const kept = trimTrailingBlanks(existing);
+    return fresh === null ? [...kept, ""] : [...kept, "", ...fresh, ""];
+  }
+  const head = trimTrailingBlanks(existing.slice(0, legacyAt));
+  const tail = existing.slice(legacyNoteEnd(existing, legacyAt));
+  while (tail.length > 0 && (tail[0] ?? "").trim() === "") tail.shift();
+  const body = fresh === null ? [...head] : [...head, "", ...fresh];
+  return tail.length > 0 ? [...body, "", ...tail] : [...body, ""];
+}
+function legacyNoteEnd(lines, headingAt) {
+  let i = headingAt + 1;
+  while (i < lines.length) {
+    const l = (lines[i] ?? "").replace(/\r$/, "").trim();
+    const isNote = l === "" || l.startsWith("- `") || l.startsWith("These installed skills apply");
+    if (!isNote) break;
+    i++;
+  }
+  return i;
+}
+function mergeAgentsMd(params) {
+  const { rendered, existing, template } = params;
+  if (existing === null) return rendered;
+  const names = sectionNames(template);
+  const bodies = /* @__PURE__ */ new Map();
+  const contextNow = sectionBody(existing, names, CONTEXT_SECTION);
+  const contextNew = sectionBody(rendered, names, CONTEXT_SECTION);
+  if (contextNow !== null && contextNew !== null) {
+    bodies.set(
+      CONTEXT_SECTION,
+      refreshBlock(contextNow, contextNew, SKILLS_BLOCK, CONTINUOUS_SKILLS_HEADING)
+    );
+  }
+  const rulesNow = sectionBody(existing, names, RULES_SECTION);
+  const rulesNew = sectionBody(rendered, names, RULES_SECTION);
+  if (rulesNow !== null && rulesNew !== null && blockRange(rulesNow, ANCHOR_BLOCK) !== null) {
+    bodies.set(RULES_SECTION, refreshBlock(rulesNow, rulesNew, ANCHOR_BLOCK));
+  }
+  return bodies.size === 0 ? rendered : assemble(rendered, names, bodies);
+}
+
+// src/codex/agents-md.ts
 function renameSlashes(text) {
   return text.replaceAll("/uzys:", "/uzys-");
 }
 function renderAgentsMd(params) {
-  const body = params.claudeMd.replace(/^#\s+.*\r?\n/, "").trim();
+  const body = wrapHarnessBlock(ANCHOR_BLOCK, params.claudeMd.replace(/^#\s+.*\r?\n/, "").trim());
   const replaced = params.template.replaceAll("{PROJECT_NAME}", params.projectName).replaceAll("{PROJECT_RULES}", body).replaceAll("{PROJECT_CONTEXT}", params.projectContext).replaceAll("{HARNESS_RULES}", params.harnessRules ?? "");
   return renameSlashes(replaced);
 }
@@ -1312,7 +1440,8 @@ function writeRules(harnessRoot, projectDir, writer, selectedInternalSkills) {
       selectedInternalSkills
     )
   });
-  return writer.write(target, rulesOut) ? target : null;
+  const withoutMarkers = rulesOut.split("\n").filter((l) => !/^<!-- uzys-harness:(?:anchor|skills):(?:start|end) -->$/.test(l.trim())).join("\n");
+  return writer.write(target, withoutMarkers) ? target : null;
 }
 
 // src/codex/opt-in.ts
@@ -1457,14 +1586,22 @@ function runCodexTransform(params) {
     claudeMd,
     projectName,
     // ADR-085 — 상시 스킬 안내는 앵커가 아니라 여기(프로젝트 맥락)에, 깔린 것만.
-    projectContext: withContinuousSkillsNote(
+    // #503 — 그 조각은 설치자 소유 절 안에 사니 마커로 감싼다.
+    projectContext: withMarkedContinuousSkillsNote(
       renderFillScaffold("agents-md"),
       selectedInternalSkills
     ),
     // Codex 는 룰 디렉터리가 없다 — 룰이 AGENTS.md 본문에 들어가야 도달한다(§Harness Rules).
     harnessRules: renderRulesBlock(portRules(harnessRoot, rules))
   });
-  writer.write(agentsMdPath, agentsMdOut);
+  writer.write(
+    agentsMdPath,
+    mergeAgentsMd({
+      rendered: agentsMdOut,
+      existing: existsSync8(agentsMdPath) ? readFileSync7(agentsMdPath, "utf8") : null,
+      template: agentsTemplate
+    })
+  );
   const configTomlPath = join8(projectDir, ".codex/config.toml");
   writer.write(
     configTomlPath,
@@ -1530,7 +1667,7 @@ function renameSlashes2(text) {
   return text.replaceAll("/uzys:", "/uzys-");
 }
 function renderAgentsMd2(params) {
-  const body = params.claudeMd.replace(/^#\s+.*\r?\n/, "").trim();
+  const body = wrapHarnessBlock(ANCHOR_BLOCK, params.claudeMd.replace(/^#\s+.*\r?\n/, "").trim());
   const replaced = params.template.replaceAll("{PROJECT_NAME}", params.projectName).replaceAll("{PROJECT_RULES}", body).replaceAll("{PROJECT_CONTEXT}", params.projectContext).replaceAll("{HARNESS_RULES}", params.harnessRules ?? "");
   return renameSlashes2(replaced);
 }
@@ -1579,7 +1716,8 @@ function runOpencodeTransform(params) {
     claudeMd,
     projectName,
     // ADR-085 — 상시 스킬 안내는 앵커가 아니라 여기(프로젝트 맥락)에, 깔린 것만.
-    projectContext: withContinuousSkillsNote(
+    // #503 — 그 조각은 설치자 소유 절 안에 사니 마커로 감싼다 (codex 와 같은 마커).
+    projectContext: withMarkedContinuousSkillsNote(
       renderFillScaffold("agents-md"),
       selectedInternalSkills
     ),
@@ -1588,7 +1726,14 @@ function runOpencodeTransform(params) {
     // (독립 검증 C-1 실측). 같은 내용을 쓰면 순서가 결과를 바꾸지 않는다.
     harnessRules: renderRulesBlock(portRules(harnessRoot, rules))
   });
-  writer.write(agentsMdPath, agentsMdOut);
+  writer.write(
+    agentsMdPath,
+    mergeAgentsMd({
+      rendered: agentsMdOut,
+      existing: existsSync9(agentsMdPath) ? readFileSync8(agentsMdPath, "utf8") : null,
+      template: agentsTemplate
+    })
+  );
   const opencodeJsonPath = join9(projectDir, "opencode.json");
   writer.write(opencodeJsonPath, renderOpencodeJson({ template: opencodeTemplate, mcp }));
   const skillFiles = writeBundledSkillDirs({
@@ -2366,11 +2511,13 @@ function installNewSkillDirs(projectDir, templatesDir, tracks) {
   const foreignOwned = [];
   const log = readInstallLog(projectDir);
   const excluded = new Set(log?.spec.baselineExclude ?? []);
+  const skillExcluded = new Set(log?.spec.skillExclude ?? []);
   if (!(log?.spec.cli ?? ["claude"]).includes("claude")) return { installed, foreignOwned };
   const spec = buildAssetSpec({ tracks, options: DEFAULT_OPTIONS });
   for (const entry of buildManifest(spec)) {
     if (entry.type !== "dir" || !entry.target.startsWith(".claude/skills/")) continue;
     if (!entry.applies(spec) || isBaselineExcluded(entry.target, excluded)) continue;
+    if (skillExcluded.has(entry.target.slice(".claude/skills/".length))) continue;
     const target = join12(projectDir, entry.target);
     const foreign = foreignOwnedTarget(projectDir, entry.target);
     if (foreign !== null) {
@@ -2473,6 +2620,11 @@ function recordAnchorBaseline(projectDir, anchor) {
   } catch {
   }
 }
+function installedBundledSkills(projectDir) {
+  return INTERNAL_BUNDLED_SKILL_IDS.filter(
+    (id) => existsSync13(join12(projectDir, ".claude/skills", id)) || existsSync13(join12(projectDir, ".agents/skills", id))
+  );
+}
 function refreshExternalCli(projectDir, harnessRoot) {
   const log = readInstallLog(projectDir);
   const baselineExcluded = new Set(log?.spec.baselineExclude ?? []);
@@ -2480,8 +2632,11 @@ function refreshExternalCli(projectDir, harnessRoot) {
     harnessRoot,
     projectDir,
     cli: ALL_CLI_TARGETS,
-    selectedInternalSkills: INTERNAL_BUNDLED_SKILL_IDS,
-    // 스킬은 **전부** 넘긴다 — 안 깔린 스킬은 대상 파일이 없어 refreshOnly 가 건너뛴다.
+    // 스킬은 **디스크에 있는 것만** 넘긴다. 스킬 *파일*은 전체 목록을 넘겨도 refreshOnly 가
+    // 없는 것을 건너뛰지만, `AGENTS.md` 의 상시 스킬 안내(ADR-085)는 이 목록 그대로 렌더돼
+    // `--without` 으로 뺀 스킬(#505)·opt-in 스킬을 "열어라"고 적었다(실측 2026-09-21). 판정은
+    // `upsertRootImport` 와 같다 — `.claude/skills/<id>` 또는 `.agents/skills/<id>` 가 있으면 깔린 것.
+    selectedInternalSkills: installedBundledSkills(projectDir),
     rules: ALL_RULES.filter((r) => !isBaselineExcluded(`.claude/rules/${r}.md`, baselineExcluded)),
     previousExternal: log?.externalFiles ?? [],
     refreshOnly: true
@@ -4107,10 +4262,10 @@ function formatAssetRows(assets) {
   const idWidth = Math.max(0, ...assets.map((a) => a.id.length));
   const methodWidth = Math.max(0, ...assets.map((a) => a.method.length));
   return assets.map((a) => {
-    const marker = a.scope === "global" ? c.yellow("!") : c.green("\u2713");
+    const marker2 = a.scope === "global" ? c.yellow("!") : c.green("\u2713");
     const version = a.version ? c.dim(` v${a.version}`) : "";
     const note = a.scope === "global" ? c.yellow("  (manual removal \u2014 D16)") : "";
-    return `    ${marker} ${padDisplay(a.id, idWidth)}  ${c.dim(padDisplay(a.method, methodWidth))}  ${c.dim(a.scope)}${version}${note}`;
+    return `    ${marker2} ${padDisplay(a.id, idWidth)}  ${c.dim(padDisplay(a.method, methodWidth))}  ${c.dim(a.scope)}${version}${note}`;
   });
 }
 function formatTemplateRows(log, projectDir) {