greprag 5.84.0 → 5.85.0

package/dist/hook.js

@@ -141,8 +141,8 @@ const procedure_shadow_1 = require("./procedure-shadow");
 const inline_atom_hook_1 = require("./inline-atom-hook");
 const inline_atom_background_1 = require("./inline-atom-background");
 const reminder_injector_1 = require("./reminder-injector");
-const skill_landing_1 = require("./skill-landing");
-const skill_mirror_client_1 = require("./skill-mirror-client");
+const skill_git_ingest_1 = require("./skill-git-ingest");
+const agents_1 = require("./commands/agents");
 const repodoc_client_1 = require("./repodoc-client");
 const native_skill_pending_1 = require("./native-skill-pending");
 const doc_mirror_client_1 = require("./doc-mirror-client");
@@ -851,41 +851,6 @@ async function fetchEnrichmentDown(apiUrl, apiKey) {
         return null;
     }
 }
-/** SessionStart pass: the Skill Learning Loop's LANDING leg
- *  (docs/skill-learning-loop.md — the write-back is CODE, not agent
- *  voluntarism). Fetch pending gains → auto-land reference-tier into each
- *  skill's docs/learnings.md → POST landed statuses back → return the report
- *  for the announce. Undefined on any error → announce silent, gains stay
- *  pending for the next session start. */
-async function fetchAndLandSkillGains(apiUrl, apiKey, anchor, cwd) {
-    try {
-        const res = await fetch(`${apiUrl}/v1/skillgain/${anchor.projectId}/pending`, {
-            headers: { 'Authorization': `Bearer ${apiKey}` },
-        });
-        if (!res.ok)
-            return undefined;
-        const data = await res.json();
-        const pending = (data.gains || []).filter(g => g.nodeId && g.skill && g.text);
-        if (pending.length === 0)
-            return undefined;
-        const homeDir = process.env.HOME || process.env.USERPROFILE || '';
-        const { report, statusUpdates } = (0, skill_landing_1.landPendingGains)(pending, cwd, homeDir, anchor.projectName);
-        if (statusUpdates.length > 0) {
-            try {
-                await fetch(`${apiUrl}/v1/skillgain/${anchor.projectId}/status`, {
-                    method: 'POST',
-                    headers: { 'Authorization': `Bearer ${apiKey}`, 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ projectName: anchor.projectName, updates: statusUpdates }),
-                });
-            }
-            catch { /* statuses re-sync next start — the stamp keeps lands idempotent */ }
-        }
-        return report.landed.length > 0 ? report : undefined;
-    }
-    catch {
-        return undefined;
-    }
-}
 /** Manifest-liveness policy — mirror of core's assessLiveness threshold (the CLI
  *  is a zero-dep artifact, so the tiny policy is duplicated, like
  *  DOCPTR_ANNOUNCE_LIMIT). A doc must cite ≥3 in-repo paths with ≥60% dead before
@@ -1156,19 +1121,6 @@ async function store(input, source = 'claude-code') {
         }
         catch { /* fail-open — an inline-atom miss never fails the Stop hook */ }
     }
-    // Skill mirror (docs/load-system.md Tier 3): a skill-load turn shadows that
-    // skill's current markdown into the tenant's load store — upload ONLY on
-    // change (local hash state), so an unchanged skill costs zero network.
-    // Follower semantics: files stay canonical. Best-effort, never throws.
-    if (provenance === 'skill-injection') {
-        const mirrorSkill = (0, turn_provenance_1.provenanceHint)(provenance, turn.userPrompt);
-        if (mirrorSkill) {
-            await (0, skill_mirror_client_1.maybeMirrorSkill)({
-                skill: mirrorSkill, cwd, apiUrl: cfg.apiUrl, apiKey: cfg.apiKey,
-                sessionId: input.session_id,
-            });
-        }
-    }
     // Repo chunk index (adr/node-identity-port.md): the chunks are DERIVED from a
     // document plus the node graph committed beside it, so they are rebuilt when
     // the document moves rather than when someone remembers to run a push. Same
@@ -1603,10 +1555,9 @@ async function recap(input, mode = 'plain', opts = {}) {
     // Enrichment-health signal (fix c2eb8777) — the live Gemini probe verdict.
     // Null when healthy or unreachable; a positive failure fires the outage announce.
     const enrichmentDownPromise = fetchEnrichmentDown(cfg.apiUrl, cfg.apiKey);
-    // Skill Learning Loop landing leg (docs/skill-learning-loop.md): pending
-    // gains → auto-land references into learnings docs, hold rule/scope
-    // proposals for the announce. Best-effort; undefined → announce silent.
-    const skillGainsPromise = fetchAndLandSkillGains(cfg.apiUrl, cfg.apiKey, anchor, cwd);
+    // The Skill Learning Loop no longer lands gains into skill folders: git owns
+    // skills and GrepRAG never edits their content (adr/skill-ownership-git.md).
+    const skillGainsPromise = Promise.resolve(undefined);
     // Tier-3 skill activation manifest (docs/load-system.md): fetch canonical
     // full descriptions, then omit skills this harness already advertises
     // natively. Best-effort; the renderer remains pure. The same roster is what
@@ -1614,6 +1565,20 @@ async function recap(input, mode = 'plain', opts = {}) {
     // extra round trip unless one is stale. adr: adr/skill-bundle-shape.md
     const mirroredSkillsPromise = (async () => {
         try {
+            // Git owns skills: ingest what is committed before reading the roster,
+            // so launchers and the manifest see the committed content. Cheap when
+            // nothing changed (one git ls-tree per source).
+            // adr: adr/skill-ownership-git.md
+            try {
+                const sources = (0, skill_git_ingest_1.gitSkillSources)(cwd);
+                const projectId = sources.find(source => source.scope === 'project')?.projectId;
+                const mirrorHashes = await (0, skill_git_ingest_1.fetchMirrorHashes)(cfg.apiUrl, cfg.apiKey, projectId);
+                await (0, skill_git_ingest_1.ingestCommittedSkills)({
+                    apiUrl: cfg.apiUrl, apiKey: cfg.apiKey, sources, mirrorHashes,
+                    harness: platform, sessionId: input.session_id,
+                });
+            }
+            catch { /* best effort: the next session start retries */ }
             const params = new URLSearchParams({ scope: 'effective', projectId: anchor.projectId });
             const res = await fetch(`${cfg.apiUrl}/v1/skillmirror?${params.toString()}`, {
                 headers: { 'Authorization': `Bearer ${cfg.apiKey}` },
@@ -1636,6 +1601,16 @@ async function recap(input, mode = 'plain', opts = {}) {
             return undefined;
         }
     })();
+    // The Codex/OpenCode AGENTS.md files follow ~/.claude/CLAUDE.md, the git
+    // source, and GrepRAG's read-only copy follows its last commit.
+    // adr: adr/skill-ownership-git.md
+    const instructionsPromise = (async () => {
+        try {
+            (0, agents_1.renderGlobalInstructions)();
+            await (0, agents_1.mirrorCommittedInstructions)({ apiUrl: cfg.apiUrl, apiKey: cfg.apiKey });
+        }
+        catch { /* best effort: the next session start retries */ }
+    })();
     // Equipped-loadouts signal (docs/loadout.md §activation model): the recipient's
     // self-inflating skill bundles. SessionStart fetch → the ONE advisor announce
     // line each; ALSO cached locally so the per-turn Match sensor reads it without
@@ -1727,6 +1702,7 @@ async function recap(input, mode = 'plain', opts = {}) {
         updateAvailablePromise,
         bodyPromise,
     ]);
+    await instructionsPromise;
     const equippedLoadouts = loadoutState.decls;
     // Loadout version-gate deficiency (docs/loadout.md §Version gating step 3): a
     // pending loadout whose equip floor is ABOVE the installed CLI version can't be

package/dist/index.js

@@ -1472,11 +1472,11 @@ Persona (tenant-scoped speaking instructions):
   persona show                  Show the active Persona.
   persona clear                 Remove the active Persona.
 
-GrepRAG Instructions (canonical global/repo CLAUDE.md + AGENTS.md):
-  instructions pull <file> [--scope global|repo] [--push]
-                                Pull disk instructions into canon.
-  instructions push [--scope global|repo|all] [--check] [--force]
-                                Render canon back to managed instruction files.
+Instructions (~/.claude/CLAUDE.md in the dotclaude git repo is the source):
+  instructions render [--check] Write ~/.codex/AGENTS.md and
+                                ~/.config/opencode/AGENTS.md from the git CLAUDE.md
+                                plus ~/.claude/instructions/<harness>.md.
+  instructions status           Show whether each rendered file is current.
   agents ...                    Deprecated alias for instructions.
 
 Project metadata (rename / merge / list):

package/dist/native-adapter-refresh.js

@@ -1,9 +1,9 @@
 "use strict";
-/** Keep installed native skill adapters at canon.
+/** Keep installed Codex/OpenCode launchers at canon.
  *
- *  Adapters were written only by explicit syncs (init, `skill mirror sync`,
- *  `--only`), so a canon change made anywhere — `skill mirror apply`, another
- *  session, another machine — left them behind until someone re-synced by hand.
+ *  Launchers were written only by explicit syncs (init, `skill mirror sync`),
+ *  so a canon change ingested anywhere — another session, another machine —
+ *  left them behind until someone re-synced by hand.
  *
  *  SessionStart calls this with the mirror roster it already fetched. Detection
  *  is local: each managed adapter's stamps against the roster. Only a stale
@@ -16,7 +16,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.readAdapterStamps = readAdapterStamps;
 exports.staleNativeAdapters = staleNativeAdapters;
 exports.refreshNativeAdapters = refreshNativeAdapters;
-const claude_lifecycle_cutover_1 = require("./claude-lifecycle-cutover");
 const native_skill_mirror_1 = require("./native-skill-mirror");
 const skill_mirror_files_1 = require("./skill-mirror-files");
 /** The identity stamps a generated adapter carries in its frontmatter. */
@@ -37,8 +36,7 @@ function readAdapterStamps(content) {
 function staleNativeAdapters(params) {
     const globalRoot = (0, native_skill_mirror_1.nativeSkillRoot)(params.platform, params.homeDir);
     const roots = [globalRoot];
-    // Claude adapters live only in the home root (claude-lifecycle-cutover.ts).
-    const projectRoot = params.projectDir && params.platform !== 'claude-code'
+    const projectRoot = params.projectDir
         ? (0, native_skill_mirror_1.writerOwnedProjectSkillRoot)(params.platform, params.projectDir, params.homeDir)
         : null;
     if (projectRoot)
@@ -80,10 +78,11 @@ function staleNativeAdapters(params) {
 }
 /** Rewrite each stale managed adapter of this harness from canon, through the
  *  writer the sync commands use. One adapter per write, so a diverged one holds
- *  back no other. A harness without native adapters is a no-op. */
+ *  back no other. A harness without native adapters is a no-op, Claude Code
+ *  included: it reads skills from their git folders (adr/skill-ownership-git.md). */
 async function refreshNativeAdapters(params) {
     const platform = params.platform;
-    if (platform !== 'claude-code' && platform !== 'codex' && platform !== 'opencode') {
+    if (platform !== 'codex' && platform !== 'opencode') {
         return { refreshed: 0, blocked: 0 };
     }
     const stale = staleNativeAdapters({ ...params, platform });
@@ -94,15 +93,13 @@ async function refreshNativeAdapters(params) {
         if (!skill)
             continue; // canon unreachable: the next session start retries
         try {
-            const result = platform === 'claude-code'
-                ? (0, claude_lifecycle_cutover_1.applyClaudeLifecycleCutover)({ skills: [skill], names: [skill.skillName], homeDir: params.homeDir })
-                : (0, native_skill_mirror_1.applyNativeSkillMirror)({
-                    platform,
-                    skills: [skill],
-                    homeDir: params.homeDir,
-                    projectDir: params.projectDir,
-                    prune: false,
-                });
+            const result = (0, native_skill_mirror_1.applyNativeSkillMirror)({
+                platform,
+                skills: [skill],
+                homeDir: params.homeDir,
+                projectDir: params.projectDir,
+                prune: false,
+            });
             refreshed += result.updated;
             blocked += result.blocked;
         }

package/dist/native-skill-mirror.js

@@ -321,130 +321,49 @@ function canonicalContentHash(skill) {
 function canonicalLookupArgs(skill) {
     return `--skill-id ${canonicalSkillId(skill)}`;
 }
-function canonicalWriteArgs(skill) {
-    if (skill.scope !== 'project' || !skill.projectId)
-        return '';
-    const replaces = (skill.replaces || []).map(id => ` --replaces ${id}`).join('');
-    return `--scope project --project-id ${skill.projectId}${replaces}`;
-}
-function canonicalEditArgs(skill) {
-    return [canonicalLookupArgs(skill), canonicalWriteArgs(skill)].filter(Boolean).join(' ');
-}
-function nativeCreationLocations(platform) {
-    if (platform === 'codex') {
-        return '`~/.codex/skills/<new-name>/SKILL.md` (global) or `<repo>/.agents/skills/<new-name>/SKILL.md` (project)';
-    }
-    if (platform === 'opencode') {
-        return '`~/.config/opencode/skills/<new-name>/SKILL.md` (global) or `<repo>/.opencode/skills/<new-name>/SKILL.md` (project)';
-    }
-    return '`~/.claude/skills/<new-name>/SKILL.md` (global) or `<repo>/.claude/skills/<new-name>/SKILL.md` (project)';
-}
-function renderChangeSkillLine(params) {
-    const exportCommand = `greprag skill mirror export ${params.skillName} ${params.identityArg} --to <dir>`;
-    const applyCommand = `greprag skill mirror apply <dir> --skill ${params.skillName} ${params.editArgs} --expected-hash <exported-hash> --reason "<why>"`;
-    if (params.platform === 'codex') {
-        return `- **Change this skill:** run \`greprag load skill-change\`, then \`${exportCommand}\`; patch the exported Markdown files non-interactively; run \`${applyCommand}\`; then \`${params.syncCommand}\`; then verify with \`${params.loadCommand}\`.`;
-    }
-    return `- **Change this skill:** run \`greprag load skill-change\`, then \`greprag skill edit ${params.skillName} ${params.editArgs} --reason "<why>"\`, then \`${params.syncCommand}\`, then verify with \`${params.loadCommand}\`.`;
-}
-function renderEditingSection(platform, params) {
-    const exportCommand = `greprag skill mirror export ${params.skillName} ${params.identityArg} --to <dir>`;
-    const applyCommand = `greprag skill mirror apply <dir> --skill ${params.skillName} ${params.editArgs} --expected-hash <exported-hash> --reason "<why>"`;
-    if (platform === 'codex') {
-        return `## Editing
-
-Codex agents must use the non-interactive mirror path:
-
-\`\`\`bash
-${exportCommand}
-# patch the exported Markdown files with normal file edits
-${applyCommand}
-\`\`\`
-
-Do not launch an interactive editor from Codex. If using \`greprag skill edit\` as an export helper, include \`--no-open\` and run the printed apply command after patching.
-`;
-    }
-    return `## Editing
-
-To edit this skill, run the guarded editor flow:
-
-\`\`\`bash
-greprag skill edit ${params.skillName} ${params.editArgs} --reason "<why>"
-\`\`\`
-
-Manual path:
-
-\`\`\`bash
-${exportCommand}
-${applyCommand}
-\`\`\`
-`;
+/** Where the skill's one true copy lives: git. adr: adr/skill-ownership-git.md */
+function gitSkillFolder(skill) {
+    return skill.scope === 'project'
+        ? `\`<repo>/.claude/skills/${skill.skillName}/\`${skill.projectName ? ` in the ${skill.projectName} repo` : ''}`
+        : `\`~/.claude/skills/${skill.skillName}/\` in the dotclaude repo`;
 }
 function renderAdapterBody(platform, skill) {
     const skillName = skill.skillName;
     const skillId = canonicalSkillId(skill);
     const identityArg = canonicalLookupArgs(skill);
-    const editArgs = canonicalEditArgs(skill);
-    const creationLocations = nativeCreationLocations(platform);
     const syncCommand = (0, skill_activation_manifest_1.nativeAdapterInstallCommand)(platform, [skillName]);
-    const creationLine = platform === 'claude-code'
-        ? '- **Create another skill:** use the normal native creation path and leave it unmanaged until a separate Claude cutover is approved.'
-        : `- **Create another skill:** create a normal native skill at ${creationLocations}; run \`${syncCommand} --dry-run\` and confirm it says \`adopt\`; then run \`${syncCommand}\`. GrepRAG adopts it as canon and replaces the native package with an adapter.`;
     const companions = skill.files.map(file => file.path).filter(relative => relative !== 'SKILL.md').sort();
     const harnessArg = `--harness ${platform}`;
     const loadCommand = `greprag load ${skillName} ${identityArg} ${harnessArg}`;
-    const changeSkillLine = renderChangeSkillLine({
-        platform,
-        skillName,
-        editArgs,
-        identityArg,
-        syncCommand,
-        loadCommand,
-    });
-    const editingSection = renderEditingSection(platform, { skillName, editArgs, identityArg });
     const companionLines = companions.length
         ? companions.map(relative => `- \`greprag load ${skillName} ${relative} ${identityArg} ${harnessArg}\``).join('\n')
-        : '- No companion docs are mirrored into this native adapter.';
+        : '- No companion docs are mirrored into this launcher.';
     return `# ${skillName}
 
 ## GENERATED ADAPTER — NEVER EDIT
 
-This is a disposable GrepRAG launcher for ${platform}, not canonical skill content. Never edit or copy this adapter, and never use \`greprag skill install\` to create or change a mirrored skill.
-
-Do not add or maintain project-state/doc pointers here. Current project state belongs in repo docs and the GrepRAG doc mirror; \`greprag load ${skillName} ${identityArg} ${harnessArg}\` discovers relevant state docs dynamically.
+This is a disposable GrepRAG launcher for ${platform}, not skill content. The skill lives in git at ${gitSkillFolder(skill)}; GrepRAG mirrors the committed files read-only and this launcher loads them.
 
 Required action chains:
 
 - **Use this skill:** run \`${loadCommand}\` before acting.
-${changeSkillLine}
-${creationLine}
+- **Change this skill:** edit ${gitSkillFolder(skill)} with normal file edits, commit, then run \`${syncCommand}\` (session start does it too) and verify with \`${loadCommand}\`. Uncommitted edits are never served. History and rollback are git log / git revert on that folder.
+- **Create another skill:** create \`~/.claude/skills/<new-name>/SKILL.md\` (dotclaude repo, global) or \`<repo>/.claude/skills/<new-name>/SKILL.md\` (project), commit, then run \`${syncCommand}\`.
 
 Authority: ${skillId}
 Source binding: ${sourceBindingState(skill)}
 Canonical content hash: ${canonicalContentHash(skill)}
 ${typeof skill.revision === 'number' ? `Mirror revision: ${skill.revision}` : 'Mirror revision: unknown'}
 
-${editingSection}
-
-History and rollback (every canon write keeps its bytes and reason):
-
-\`\`\`bash
-greprag skill history ${skillName} ${identityArg}
-greprag skill diff ${skillName} <revA> [<revB>] ${identityArg}
-greprag skill revert ${skillName} --to <rev> ${identityArg} --reason "<why>" --expected-hash <current-hash>
-greprag skill mirror snapshot list ${skillName} ${identityArg}
-greprag skill mirror snapshot promote ${skillName} --name <snapshot> ${editArgs} --expected-hash <current-hash> --reason "<why>"
-\`\`\`
-
 ## Mandatory Invocation
 
 When this skill activates, run:
 
 \`\`\`bash
-greprag load ${skillName} ${identityArg} ${harnessArg}
+${loadCommand}
 \`\`\`
 
-Read and follow that canonical payload before responding or taking action.
+Read and follow that payload before responding or taking action.
 
 ## Companion Docs