greprag 5.85.3 → 5.85.6

package/dist/commands/merge-guard.js

@@ -426,10 +426,9 @@ function acquiresTargetLock(dir, target) {
         return false;
     }
 }
-/** PowerShell's `try { acquire; if ($LASTEXITCODE -ne 0) { throw ... }; merge }
- * finally { release }` is a fail-closed lock sequence too. Inspect only direct
- * statements in the try body; a bare semicolon or an acquire nested in a branch
- * must not excuse a merge. */
+/** A checked PowerShell acquisition can precede the try or start its body.
+ * Inspect direct statements along that execution sequence, keeping nested
+ * blocks opaque: a conditional acquire or a caught throw cannot excuse a merge. */
 function powerShellTryTakesLock(command, mergeStart, cwd, target) {
     const masked = maskQuoted(command);
     const tryStart = /(?:^|[;\n])\s*try\s*\{/gi;
@@ -442,7 +441,10 @@ function powerShellTryTakesLock(command, mergeStart, cwd, target) {
         const finallyMatch = /^\s*finally\s*\{/.exec(suffix);
         if (!finallyMatch || matchingBrace(masked, close + 1 + finallyMatch[0].lastIndexOf('{')) < 0)
             continue;
-        const statements = powerShellStatements(command, masked, open + 1, close);
+        const statements = [
+            ...powerShellStatements(command, masked, 0, match.index),
+            ...powerShellStatements(command, masked, open + 1, close),
+        ];
         const mergeIndex = statements.findIndex(s => mergeStart >= s.start && mergeStart < s.end);
         if (mergeIndex < 2 || mergeGlobalOpts(statements[mergeIndex].text)?.length !== 0)
             continue;

package/dist/commands/skill.js

@@ -411,7 +411,7 @@ async function runSkillMirrorSync(args) {
     }
     const hashes = await (0, skill_git_ingest_1.fetchMirrorHashes)(apiUrl, apiKey, projectId);
     const ingest = await (0, skill_git_ingest_1.ingestCommittedSkills)({ apiUrl, apiKey, sources, mirrorHashes: hashes, force: args.includes('--force') });
-    console.log(`mirror: ${ingest.uploaded.length} skill(s) ingested from git${ingest.uploaded.length ? ` (${ingest.uploaded.join(', ')})` : ''}, ${ingest.current} current`);
+    console.log(`mirror: ${ingest.uploaded.length} skill(s) ingested from git${ingest.uploaded.length ? ` (${ingest.uploaded.join(', ')})` : ''}, ${ingest.retired.length} retired${ingest.retired.length ? ` (${ingest.retired.join(', ')})` : ''}, ${ingest.current} current`);
     for (const failure of ingest.failed)
         console.error(`mirror: ${failure.name} failed — ${failure.error}`);
     if (requested === 'claude-code')

package/dist/native-skill-mirror.js

@@ -583,12 +583,15 @@ function applyNativeSkillMirror(params) {
         const projectRoot = projectDir ? writerOwnedProjectSkillRoot(params.platform, projectDir, homeDir) : null;
         if (projectRoot)
             rootState(projectRoot);
+        const keepGlobal = new Set(params.globalRoster || []);
         for (const [root, entry] of roots) {
             if (params.pruneGlobalRoot === false && root === globalRoot)
                 continue;
             for (const [skillName, managed] of Object.entries(entry.state.skills)) {
                 if (entry.present.has(skillName))
                     continue;
+                if (root === globalRoot && keepGlobal.has(skillName))
+                    continue;
                 const target = targetPath(root, skillName);
                 const currentFiles = (0, skill_mirror_files_1.isSkillFolderOwnedElsewhere)(target) ? null : readManagedFiles(target, managed);
                 if (!currentFiles || (0, skill_mirror_files_1.computeSkillFileHash)(currentFiles) !== managed.hash) {
@@ -668,13 +671,25 @@ async function syncNativeSkillMirror(params) {
         throw new Error('skill mirror snapshot incomplete; existing native adapters preserved');
     }
     const skills = fetched;
+    // In a project the effective list can hide a replaced global, so the global
+    // root is pruned against the plain global list (a skill retired in git).
+    let globalRoster;
+    if (params.projectId) {
+        const globals = await fetch(`${params.apiUrl}/v1/skillmirror?scope=global`, {
+            headers: { Authorization: `Bearer ${params.apiKey}` },
+        });
+        if (!globals.ok)
+            throw new Error(`skill mirror list failed: HTTP ${globals.status}`);
+        const body = await globals.json();
+        globalRoster = (body.skills || []).map(row => row.skillName).filter((n) => typeof n === 'string');
+    }
     return applyNativeSkillMirror({
         platform: params.platform,
         skills,
         homeDir: params.homeDir,
         projectDir: params.projectDir,
         prune: true,
-        pruneGlobalRoot: !params.projectId,
+        globalRoster,
     });
 }
 function nativeSkillMirrorSummary(result) {

package/dist/opencode-plugin.bundle.js

@@ -4636,12 +4636,15 @@ function applyNativeSkillMirror(params) {
     const projectRoot = projectDir ? writerOwnedProjectSkillRoot(params.platform, projectDir, homeDir) : null;
     if (projectRoot)
       rootState(projectRoot);
+    const keepGlobal = new Set(params.globalRoster || []);
     for (const [root, entry] of roots) {
       if (params.pruneGlobalRoot === false && root === globalRoot)
         continue;
       for (const [skillName, managed] of Object.entries(entry.state.skills)) {
         if (entry.present.has(skillName))
           continue;
+        if (root === globalRoot && keepGlobal.has(skillName))
+          continue;
         const target = targetPath(root, skillName);
         const currentFiles = isSkillFolderOwnedElsewhere(target) ? null : readManagedFiles(target, managed);
         if (!currentFiles || computeSkillFileHash(currentFiles) !== managed.hash) {

package/dist/skill-git-ingest.js

@@ -52,6 +52,8 @@ exports.globalSkillSource = globalSkillSource;
 exports.projectSkillSource = projectSkillSource;
 exports.listCommittedSkills = listCommittedSkills;
 exports.readCommittedSkillFiles = readCommittedSkillFiles;
+exports.deletionCommit = deletionCommit;
+exports.deletedSkills = deletedSkills;
 exports.ingestCommittedSkills = ingestCommittedSkills;
 exports.fetchMirrorHashes = fetchMirrorHashes;
 exports.gitSkillSources = gitSkillSources;
@@ -193,6 +195,36 @@ function lastCommit(repo, folder) {
     const [hash = 'unknown', subject = ''] = out.split('\0');
     return { hash, subject };
 }
+/** The commit that deleted a skill folder's SKILL.md from the source, or null
+ *  when git never held it there (a skill mirrored from elsewhere is not
+ *  retired by a source that never owned it). */
+function deletionCommit(source, name) {
+    const out = (git(source.repo, ['log', '-1', '--diff-filter=D', '--format=%h%x00%s', 'HEAD', '--',
+        `${source.prefix}/${name}/SKILL.md`]) || '').trim();
+    if (!out)
+        return null;
+    const [hash = '', subject = ''] = out.split('\0');
+    return hash ? { hash, subject } : null;
+}
+/** Mirrored skills of this source's scope whose folder git deleted: absent at
+ *  HEAD, not bundled, not a link on disk, and deleted by a commit in this repo. */
+function deletedSkills(source, committed, mirrorNames) {
+    const present = new Set(committed.map(s => s.name));
+    const out = [];
+    for (const name of mirrorNames) {
+        if (present.has(name) || !SKILL_NAME_RE.test(name))
+            continue;
+        if (source.scope === 'global' && skill_landing_1.BUNDLED_SKILLS.includes(name))
+            continue;
+        const folder = path.join(source.repo, ...source.prefix.split('/'), name);
+        if (fs.existsSync(folder))
+            continue;
+        const commit = deletionCommit(source, name);
+        if (commit)
+            out.push({ name, commit });
+    }
+    return out;
+}
 function readState() {
     try {
         return JSON.parse(fs.readFileSync(STATE_FILE, 'utf8'));
@@ -215,10 +247,34 @@ function stateKey(source, name) {
  *  `mirrorHashes` maps `<scope>:<name>` to the mirror's contentHash. `force`
  *  re-reads folders whose tree hash is unchanged since the last run. */
 async function ingestCommittedSkills(params) {
-    const result = { uploaded: [], current: 0, failed: [] };
+    const result = { uploaded: [], retired: [], current: 0, failed: [] };
     const state = readState();
     for (const source of params.sources) {
         const all = listCommittedSkills(source);
+        const mirrorNames = [...params.mirrorHashes.keys()]
+            .filter(k => k.startsWith(`${source.scope}:`)).map(k => k.slice(source.scope.length + 1));
+        for (const gone of deletedSkills(source, all, mirrorNames)) {
+            try {
+                const res = await fetch(`${params.apiUrl}/v1/skillmirror/${encodeURIComponent(gone.name)}/retire`, {
+                    method: 'POST',
+                    headers: { 'Authorization': `Bearer ${params.apiKey}`, 'Content-Type': 'application/json' },
+                    body: JSON.stringify({
+                        scope: source.scope,
+                        ...(source.scope === 'project' ? { projectId: source.projectId } : {}),
+                        reason: `deleted in git ${gone.commit.hash}: ${gone.commit.subject}`.slice(0, 500),
+                        author: { via: 'git-ingest', commit: gone.commit.hash },
+                    }),
+                    signal: AbortSignal.timeout(15_000),
+                });
+                if (!res.ok && res.status !== 404)
+                    throw new Error(`HTTP ${res.status}`);
+                delete state[stateKey(source, gone.name)];
+                result.retired.push(gone.name);
+            }
+            catch (err) {
+                result.failed.push({ name: gone.name, error: `retire: ${err instanceof Error ? err.message : String(err)}` });
+            }
+        }
         const changed = params.force ? all : all.filter(s => state[stateKey(source, s.name)] !== s.tree);
         result.current += all.length - changed.length;
         const files = readCommittedSkillFiles(source.repo, changed);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "greprag",
-  "version": "5.85.3",
+  "version": "5.85.6",
   "description": "Private GrepRAG client for existing Claude Code, Codex, OpenCode, and Grok Build tenants.",
   "main": "dist/index.js",
   "bin": {