greprag 5.84.0 → 5.85.1

package/dist/commands/init.js

@@ -74,29 +74,20 @@ async function trySyncNativeSkillMirror(apiKey, platform, cwd = process.cwd()) {
         return `Native skill mirror unavailable; existing skills preserved (${message})`;
     }
 }
-async function tryBootstrapAgentDoctrine(apiKey, harness) {
+/** Render the Codex/OpenCode AGENTS.md files from ~/.claude/CLAUDE.md (the git
+ *  source) and say what happened. adr: adr/skill-ownership-git.md */
+function renderInstructionsSummary() {
     try {
-        return await (0, agents_1.bootstrapAgentDoctrine)(apiKey, harness);
+        const results = (0, agents_1.renderGlobalInstructions)();
+        if (results.every(r => r.status === 'no-source'))
+            return 'AGENTS.md render: no ~/.claude/CLAUDE.md yet';
+        const written = results.filter(r => r.status === 'written').length;
+        return written ? `AGENTS.md render: ${written} file(s) rewritten from ~/.claude/CLAUDE.md` : 'AGENTS.md render: current';
     }
     catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.warn(`  GrepRAG Instructions materialization skipped: ${message}`);
-        return null;
+        return `AGENTS.md render skipped: ${error instanceof Error ? error.message : String(error)}`;
     }
 }
-function doctrineBootstrapSummary(result) {
-    if (!result)
-        return 'GrepRAG Instructions: materialization unavailable; existing files preserved';
-    if (result.canonicalScopes.length === 0)
-        return 'GrepRAG Instructions: no canonical scopes adopted yet';
-    const state = result.changedFollowers > 0
-        ? `${result.changedFollowers} follower(s) materialized`
-        : `${result.currentFollowers} follower(s) already current`;
-    const blocked = result.blockedFollowers > 0
-        ? `; ${result.blockedFollowers} existing follower(s) preserved (run greprag instructions push explicitly)`
-        : '';
-    return `GrepRAG Instructions (${result.canonicalScopes.join(' + ')}): ${state}${blocked}`;
-}
 function hasEnvPrefix(prefix) {
     return Object.keys(process.env).some(k => k.startsWith(prefix));
 }
@@ -344,13 +335,11 @@ async function runInit(opts) {
     // chip-spawn POINTER announce names the trigger + the command). One less
     // install-time file write, and it works in every project, not just where the
     // file happened to be installed.
-    // Step 7: Materialize canonical doctrine for Claude. Once global canon
-    // exists, it owns ~/.claude/CLAUDE.md; running the legacy direct patch after
-    // sync would immediately diverge the materialized follower. Pre-adoption
-    // tenants retain the old patch path unchanged.
-    const doctrine = await tryBootstrapAgentDoctrine(apiKey, 'claude-code');
-    changes.push(doctrineBootstrapSummary(doctrine));
-    if (!doctrine?.canonicalScopes.includes('global')) {
+    // Step 7: ~/.claude/CLAUDE.md. A file committed in git is its owner's to
+    // edit, so init leaves it alone; an untracked one gets the greprag CLI
+    // section as before. adr: adr/skill-ownership-git.md
+    changes.push(renderInstructionsSummary());
+    if ((0, agents_1.committedInstructionSource)() === null) {
         const claudeMdPatched = patchGlobalClaudeMd();
         changes.push(claudeMdPatched
             ? 'Patched ~/.claude/CLAUDE.md greprag CLI section'
@@ -525,13 +514,13 @@ async function runOpenCodeInit(opts) {
         console.warn('  Plugin bundle not found (build issue) — run `npm run build` in packages/cli and retry');
     }
     envChanges.push(await trySyncNativeSkillMirror(apiKey, 'opencode'));
-    const doctrine = await tryBootstrapAgentDoctrine(apiKey, 'opencode');
+    const instructionsSummary = renderInstructionsSummary();
     // Summary
     console.log('\n  Setup complete!\n');
     for (const c of envChanges)
         console.log(`    - ${c}`);
     console.log(`    - Project anchor: ${anchor.anchorPath} (source: ${anchor.source})`);
-    console.log(`    - ${doctrineBootstrapSummary(doctrine)}`);
+    console.log(`    - ${instructionsSummary}`);
     if (pluginInstalled)
         console.log(`    - Plugin: ${pluginMain}`);
     console.log(`    - Shared env: ${getGrepragEnvPath()}`);
@@ -583,8 +572,7 @@ async function runCodexInit(opts) {
     if (codexSkill)
         changes.push(`Skill: installed → ${codexSkill}`);
     changes.push(await trySyncNativeSkillMirror(apiKey, 'codex'));
-    const doctrine = await tryBootstrapAgentDoctrine(apiKey, 'codex');
-    changes.push(doctrineBootstrapSummary(doctrine));
+    changes.push(renderInstructionsSummary());
     try {
         const res = await fetch(`${API_URL}/v1/inbox/projects/register`, {
             method: 'POST',

package/dist/commands/load.js

@@ -60,7 +60,6 @@ const os = __importStar(require("os"));
 const harness_1 = require("../harness");
 const skill_activation_manifest_1 = require("../skill-activation-manifest");
 const project_anchor_1 = require("../project-anchor");
-const skill_landing_1 = require("../skill-landing");
 const skill_mirror_files_1 = require("../skill-mirror-files");
 const proc_1 = require("../proc");
 const skill_staleness_1 = require("../skill-staleness");
@@ -91,7 +90,7 @@ const LIBRARY = {
     },
     'skill-change': {
         files: ['skill/templates/skill-change.md'],
-        purpose: 'Internal bundled schema for safely updating a skill after a run: when to edit, Convention A/B shapes, and when to propose instead.',
+        purpose: 'How to change a skill after a run: edit its git folder and commit (GrepRAG only mirrors it), Convention A/B shapes, and when to propose instead.',
     },
     mechanic: {
         files: ['skill/mechanic/SKILL.md', 'skill/mechanic/docs/skill-fix-conventions.md'],
@@ -109,10 +108,10 @@ const LIBRARY = {
         files: ['skill/templates/chip-leader-opencode.md'],
         purpose: 'Plan a MULTI-CHIP mission for opencode (integration branch, seams, merge order). Loaded from chip-bootloader when ≥2 chips are needed.',
     },
-    // adr: adr/prompt-audit-canon.md — the audit lands through `instructions pull --push`, never a follower edit.
+    // adr: adr/prompt-audit-canon.md — the audit lands as an edit to ~/.claude/CLAUDE.md in git, never to a rendered AGENTS.md.
     'prompt-audit': {
         files: ['skill/templates/prompt-audit.md'],
-        purpose: 'Audit canonical CLAUDE.md/AGENTS.md instructions for dated-model cruft (shipped rubric) and land accepted edits through `instructions pull --push`, never a follower edit.',
+        purpose: 'Audit CLAUDE.md instructions for dated-model cruft (shipped rubric) and land accepted edits in ~/.claude/CLAUDE.md (git); the AGENTS.md files are rendered from it.',
     },
 };
 /** Absolute path to a payload shipped in the package. */
@@ -189,7 +188,7 @@ async function printCatalog() {
     for (const name of names) {
         console.log(`  ${name.padEnd(width)}  ${LIBRARY[name].purpose}`);
     }
-    console.log(`  ${'instructions'.padEnd(width)}  Canonical global + repo GrepRAG Instructions; CLAUDE.md/AGENTS.md are rendered followers.`);
+    console.log(`  ${'instructions'.padEnd(width)}  Read-only copy of ~/.claude/CLAUDE.md (git is the source; AGENTS.md files are rendered from it).`);
     console.log(`  ${'agents'.padEnd(width)}  Deprecated alias for instructions.`);
     // Tier-3 section: the operator's own skills, auto-mirrored from use.
     const data = await mirrorGet('/v1/skillmirror');
@@ -201,20 +200,18 @@ async function printCatalog() {
         // A mirrored skill with no native adapter on this harness never reaches the
         // harness's own skill list — the agent can only reach it through this
         // catalog. Mark the gap here and name the command that closes it.
-        // A hand-kept copy does reach that list, but the harness runs the copy and
-        // never sees canon move on, so it is marked too (with `~`).
         const platform = (0, harness_1.inferCurrentHarness)() || '';
         const native = platform
             ? (0, skill_activation_manifest_1.readNativeSkillNames)({ platform, cwd: process.cwd(), homeDir: os.homedir() })
             : new Map();
-        const { missing, localCopies } = (0, skill_activation_manifest_1.nativeAdapterGap)(platform, skills, native);
+        const { missing } = (0, skill_activation_manifest_1.nativeAdapterGap)(platform, skills, native);
         const w = Math.max(...skills.map((s) => (s.skillName || '').length), 8);
-        console.log('\nYour mirrored skills (auto-fresh from use — work on any machine/harness):\n');
+        console.log('\nYour mirrored skills (copied from git commits — work on any machine/harness):\n');
         for (const s of skills) {
             if (!s.skillName)
                 continue;
             const scope = s.scope === 'project' && s.projectId ? ` [project:${s.projectId.slice(0, 8)}]` : '';
-            const gap = missing.includes(s.skillName) ? ' *' : localCopies.includes(s.skillName) ? ' ~' : '';
+            const gap = missing.includes(s.skillName) ? ' *' : '';
             console.log(`  ${(s.skillName + scope + gap).padEnd(w + 20)}  ${(s.description || '').slice(0, 110)}`);
         }
         const installCommand = (0, skill_activation_manifest_1.nativeAdapterInstallCommand)(platform, missing);
@@ -223,13 +220,6 @@ async function printCatalog() {
             console.log('    in this harness\'s own skill list. Install the adapters with:\n');
             console.log(`      ${installCommand}\n`);
         }
-        const cutoverCommand = (0, skill_activation_manifest_1.localCopyCutoverCommand)(platform, localCopies);
-        if (cutoverCommand) {
-            console.log(`\n  ~ ${localCopies.length} skill(s) run from a hand-kept copy in ${platform}, not an adapter — the harness`);
-            console.log('    keeps running that copy when the mirrored skill changes. Replacing a copy is a per-skill');
-            console.log('    call; its SKILL.md is backed up first:\n');
-            console.log(`      ${cutoverCommand}\n`);
-        }
     }
     console.log('\n  greprag load <name>            print the full entry / mirrored skill');
     console.log('  greprag load /<name>           print a user-named slash skill');
@@ -451,13 +441,13 @@ async function printMirroredSkill(name, args) {
     // adr: adr/skill-adapter-never-canon.md
     if ((0, skill_mirror_files_1.isGeneratedSkillAdapter)(file.content)) {
         const identityArg = args.skillId ? ` --skill-id ${args.skillId}` : '';
-        console.error(`Mirrored skill "${name}" has no canonical body — the mirror is holding the generated adapter.\n` +
-            `Refusing to serve it: the adapter is the launcher that sent you here, not the skill.\n\n` +
-            `Restore the real body from an earlier revision or the pre-adoption snapshot:\n` +
+        console.error(`Mirrored skill "${name}" has no body — the mirror is holding a generated launcher.\n` +
+            `Refusing to serve it: the launcher is what sent you here, not the skill.\n\n` +
+            `The skill lives in git. Restore SKILL.md in its folder (~/.claude/skills/${name}/ in the dotclaude repo, ` +
+            `or <repo>/.claude/skills/${name}/), commit, then run \`greprag skill mirror sync\`. Earlier mirrored ` +
+            `bytes stay readable:\n` +
             `  greprag skill history ${name}${identityArg}\n` +
-            `  greprag skill revert ${name} --to <rev>${identityArg} --reason "<why>" --expected-hash <current-hash>\n` +
-            `  greprag skill mirror snapshot list ${name}${identityArg}\n` +
-            `  greprag skill mirror snapshot promote ${name} --name <snapshot>${identityArg} --expected-hash <current-hash> --reason "<why>"\n`);
+            `  greprag skill mirror snapshot restore ${name} --name <snapshot>${identityArg} --to <dir>\n`);
         process.exitCode = 1;
         return true;
     }
@@ -473,18 +463,6 @@ async function printMirroredSkill(name, args) {
     }
     process.stdout.write(file.content.endsWith('\n') ? file.content : file.content + '\n');
     if (!args.docPath) {
-        // A mirror-managed skill's SKILL.md is a generated adapter, so the Skill
-        // Learning Loop cannot land a fuse there without fighting the mirror for
-        // the file. Its pending gains ride the load payload instead — this is the
-        // moment the agent reads the skill. adr: adr/skill-fuse-delivery.md
-        try {
-            const pending = await mirrorGet('/v1/skillgain/pending');
-            const gains = pending?.gains || [];
-            const block = (0, skill_landing_1.buildLoadFuseBlock)(name, gains);
-            if (block)
-                process.stdout.write(block);
-        }
-        catch { /* a gain that fails to surface must never break the skill load */ }
         await printStateDocHints(name, file.content);
         const companions = files.map((f) => f.path).filter((p) => p !== 'SKILL.md');
         if (companions.length > 0) {
@@ -506,7 +484,7 @@ async function runLoad(args) {
     if (name === 'instructions' || name === 'agents') {
         if (await printGrepRagInstructions(args.slice(1)))
             return;
-        console.error('No canonical GrepRAG Instructions found. Seed them with `greprag instructions adopt <CLAUDE.md|AGENTS.md>`.');
+        console.error('No mirrored instructions yet. `greprag instructions render` mirrors the committed ~/.claude/CLAUDE.md.');
         process.exit(1);
     }
     // An explicit --skill-id names one mirrored skill, so it outranks a bundled

package/dist/commands/parity.js

@@ -254,7 +254,7 @@ async function tableCmd(args) {
         console.log(`  reconciled: ${u.lastReconcile ? u.lastReconcile.slice(0, 10) : 'never'}`);
         console.log('');
     }
-    console.log('Load-canonical GrepRAG Instructions reconcile with `greprag instructions push`; other units use a parity fix chip.');
+    console.log('Instruction files reconcile with `greprag instructions render`; other units use a parity fix chip.');
 }
 // ---------- Dispatch ------------------------------------------------------------
 async function runParity(args) {

package/dist/commands/skill-mirror-reminder.js

@@ -18,28 +18,12 @@ function renderEntry(skill) {
 function buildSkillMirrorAnnounce(m, platform) {
     if (!m || m.count <= 0)
         return null;
-    // A hand-kept copy is in the native skill list, so it is not in the trigger
-    // list below, but the harness runs that copy and never sees canon move on.
-    // Name each one; replacing a live copy is the user's call, skill by skill.
-    const cutoverCommand = (0, skill_activation_manifest_1.localCopyCutoverCommand)(platform || '', m.localCopies);
-    const copies = m.localCopies.length === 1 ? 'one mirrored skill' : `${m.localCopies.length} mirrored skills`;
-    const copySection = cutoverCommand ? [
-        '### Hand-Kept Copies',
-        `This harness lists ${copies} from a hand-kept copy instead of an adapter, `
-            + `so it keeps running that copy when the mirrored skill changes: ${m.localCopies.join(', ')}. `
-            + 'Replacing a copy with its adapter is the user\'s call, one skill at a time (the old SKILL.md is backed up first):',
-        '',
-        `    ${cutoverCommand}`,
-        '',
-        'Offer that command when the user asks why a skill behaves out of date, or when you needed one of them this session.',
-        '',
-    ] : [];
     if (m.skills.length === 0) {
         const line = '[greprag skills: slash skills are available. '
             + 'When discussing skills with the user, say use/create/update/refresh `/skill`; '
             + 'keep storage mechanics internal unless diagnosing a failure or the user asks how it works. '
             + 'Use `greprag load <skill>` to read skill instructions.]';
-        return [line, '', ...copySection].join('\n').trimEnd();
+        return line;
     }
     // Mirrored skills with no native package never reach the native skill list.
     // Name the gap and the one command that closes it, or it stays invisible
@@ -64,7 +48,6 @@ function buildSkillMirrorAnnounce(m, platform) {
         'When discussing skills with the user, say use/create/update/refresh `/skill`; keep storage mechanics internal unless diagnosing a failure or the user asks how it works.',
         '',
         ...gapSection,
-        ...copySection,
         '### Trigger Rules',
         'If the user names a skill (with or without `/`) OR the request clearly matches a skill\'s description below, '
             + 'you MUST activate that skill for the current turn. Match meaning, not exact keywords.',