skillwiki 0.10.23 → 0.10.25

package/dist/vault-sync/scripts/wiki-pull-with-auto-resolve.sh

@@ -100,44 +100,57 @@ acquire_pull_lock() {
 drop_or_preserve_untracked_remote_overlaps() {
     local removed=0
     local preserved=0
-    local path remote_blob
-    local collision_root backup_path backup_dir
+    local path remote_blob identical
+    local collision_root=""
+    local backup_path backup_dir
 
     while IFS= read -r -d '' path; do
-        if ! git cat-file -e "$REMOTE/$BRANCH:$path" 2>/dev/null; then
+        if ! git cat-file -e "$TARGET_OID:$path" 2>/dev/null; then
             continue
         fi
 
         remote_blob="$(mktemp)"
-        if git show "$REMOTE/$BRANCH:$path" >"$remote_blob" 2>/dev/null && cmp -s "$path" "$remote_blob"; then
+        identical=0
+        if git show "$TARGET_OID:$path" >"$remote_blob" 2>/dev/null && cmp -s "$path" "$remote_blob"; then
+            identical=1
+        fi
+        rm -f "$remote_blob"
+
+        if [ "$identical" -eq 1 ]; then
             if rm -f -- "$path"; then
                 removed=$((removed + 1))
             else
-                rm -f "$remote_blob"
                 log "FAIL could not remove untracked remote duplicate before pull: $path"
                 return 1
             fi
+            continue
+        fi
+
+        if [ -z "$collision_root" ]; then
+            collision_root="$(platform_cache_dir)/untracked-collisions/$(date -u +%Y%m%dT%H%M%SZ)-$$"
+        fi
+        backup_path="$collision_root/$path"
+        backup_dir="$(dirname "$backup_path")"
+        if ! mkdir -p "$backup_dir" || ! cp -p "$path" "$backup_path"; then
+            log "FAIL could not preserve divergent untracked remote overlap before pull: $path"
+            return 1
+        fi
+        if rm -f -- "$path"; then
+            preserved=$((preserved + 1))
+            log "PRESERVE divergent untracked remote overlap before pull: $path -> $backup_path"
         else
-            rm -f "$remote_blob"
-            if [ -z "${collision_root:-}" ]; then
-                collision_root="$(platform_cache_dir)/untracked-collisions/$(date -u +%Y%m%dT%H%M%SZ)-$$"
-            fi
-            backup_path="$collision_root/$path"
-            backup_dir="$(dirname "$backup_path")"
-            if ! mkdir -p "$backup_dir" || ! cp -p "$path" "$backup_path"; then
-                log "FAIL could not preserve divergent untracked remote overlap before pull: $path"
-                return 1
-            fi
-            if rm -f -- "$path"; then
-                preserved=$((preserved + 1))
-                log "PRESERVE divergent untracked remote overlap before pull: $path -> $backup_path"
-            else
-                log "FAIL could not remove preserved divergent untracked remote overlap before pull: $path"
-                return 1
-            fi
+            log "FAIL could not remove preserved divergent untracked remote overlap before pull: $path"
+            return 1
         fi
-        rm -f "$remote_blob"
-    done < <(git ls-files --others --exclude-standard -z)
+    done < <(
+        git ls-files --others --exclude-standard -z
+        # `stash -u` excludes ignored paths. Protect only ignored typed-page
+        # Markdown, without sweeping unrelated ignored caches into the operation.
+        git ls-files --others --ignored --exclude-standard -z -- \
+            ':(glob)queries/**/*.md' \
+            ':(glob)concepts/**/*.md' \
+            ':(glob)entities/**/*.md'
+    )
 
     if [ "$removed" -gt 0 ]; then
         log "DROP $removed identical untracked remote duplicate(s) before pull"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skillwiki",
-  "version": "0.10.23",
+  "version": "0.10.25",
   "type": "module",
   "bin": {
     "skillwiki": "dist/cli.js",

package/skills/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "skillwiki",
-  "version": "0.10.23",
+  "version": "0.10.25",
   "skills": "./",
   "description": "Project-aware Karpathy-style knowledge base for Claude Code: 19 prompt-only skills (wiki-*, proj-*, using-skillwiki) backed by the deterministic `skillwiki` CLI.",
   "author": {

package/skills/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "skillwiki",
-  "version": "0.10.23",
+  "version": "0.10.25",
   "description": "Project-aware Karpathy-style knowledge base for Codex with 19 prompt-only skills backed by the deterministic skillwiki CLI.",
   "author": {
     "name": "karlorz",

package/skills/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skillwiki/skills",
-  "version": "0.10.23",
+  "version": "0.10.25",
   "private": true,
   "files": [
     "wiki-*",