dsh-soul-forging 0.1.1 → 0.1.3

package/bin/_common.sh

@@ -6,8 +6,10 @@ set -uo pipefail
 # 直接按 $0 推上级会指到 node_modules/ 而不是包目录。必须先把链接解开。
 _SELF="$(readlink -f "${BASH_SOURCE[0]}" 2>/dev/null || echo "${BASH_SOURCE[0]}")"
 MEMKIT_ROOT="$(cd "$(dirname "$_SELF")/.." && pwd)"
-export MEMORY_DIR="${MEMORY_DIR:-$MEMKIT_ROOT/memory}"
-export BRAIN_DIR="${BRAIN_DIR:-$MEMKIT_ROOT/brain}"
+# 数据放用户目录，不放 node_modules 里 —— 那里升级会被整个换掉，而且通常没写权限
+export SOUL_DATA_DIR="${SOUL_DATA_DIR:-$HOME/.soul-forging}"
+export MEMORY_DIR="${MEMORY_DIR:-$SOUL_DATA_DIR/memory}"
+export BRAIN_DIR="${BRAIN_DIR:-$SOUL_DATA_DIR/brain}"
 export DOCS_DIR="${DOCS_DIR:-$MEMKIT_ROOT/docs}"
 export BIN_DIR="$MEMKIT_ROOT/bin"
 export BRAIN_PORT="${BRAIN_PORT:-3914}"

package/bin/brain

@@ -15,6 +15,6 @@ fi
 QENC=$("$PY" -c 'import sys,urllib.parse;print(urllib.parse.quote(sys.argv[1]))' "$Q")
 OUT=$(curl -s -m 5 "$BRAIN_URL/text?q=$QENC&n=$N" 2>/dev/null)
 if [ -z "$OUT" ] || echo "$OUT" | grep -q "Connection refused"; then
-  OUT=$("$PY" "$BRAIN_DIR/server.py" --query "$Q" -n "$N" 2>/dev/null)
+  OUT=$("$PY" "$MEMKIT_ROOT/brain/server.py" --query "$Q" -n "$N" 2>/dev/null)
 fi
 printf '%s\n' "$OUT"

package/bin/init-home

@@ -14,10 +14,12 @@ fi
 
 mkdir -p "$TARGET"
 cp -a "$MEMKIT_ROOT/memory/." "$TARGET/"
+# 数据目录也建出来（索引和服务写这里，别写进包目录）
+mkdir -p "${BRAIN_DIR:-$(dirname "$TARGET")/brain}"
 echo "✓ 空白记忆库已铺到：$TARGET"
 echo
 echo "接下来："
 echo "  1. 填 $TARGET/SOUL.md"
 echo "  2. 按 $TARGET/BOOTSTRAP.md 走一遍铸魂"
-echo "  3. 建索引：MEMORY_DIR=$TARGET python3 $MEMKIT_ROOT/brain/index.py"
-echo "  4. 起服务：MEMORY_DIR=$TARGET bash $MEMKIT_ROOT/bin/serve"
+echo "  3. 建索引：python3 $MEMKIT_ROOT/brain/index.py"
+echo "  4. 起服务：bash $MEMKIT_ROOT/bin/serve"

package/bin/serve

@@ -6,7 +6,7 @@ if curl -s -m 2 "$BRAIN_URL/health" | grep -q '"ok": true'; then
   echo "已在跑：$BRAIN_URL"; exit 0
 fi
 mkdir -p "$BRAIN_DIR"
-nohup "$PY" "$BRAIN_DIR/server.py" >"$BRAIN_DIR/server.log" 2>&1 &
+nohup "$PY" "$MEMKIT_ROOT/brain/server.py" >"$BRAIN_DIR/server.log" 2>&1 &
 sleep 1
 curl -s -m 2 "$BRAIN_URL/health" || { echo "起不来，看 $BRAIN_DIR/server.log"; exit 1; }
 echo

package/bin/sync

@@ -9,9 +9,9 @@ exec 9>"$LOCK"
 if ! flock -n 9; then echo "同步已在运行，跳过"; exit 0; fi
 
 R="$BIN_DIR/runlog"; rc=0
-$R "live-summary" -- "$PY" "$BRAIN_DIR/fix-live-summary.py"                  || rc=$((rc+1))
+$R "live-summary" -- "$PY" "$MEMKIT_ROOT/brain/fix-live-summary.py"                  || rc=$((rc+1))
 $R "archive-log"  -- "$BIN_DIR/archive-log"                                  || rc=$((rc+2))
-$R "index"        -- "$PY" "$BRAIN_DIR/index.py"                             || rc=$((rc+4))
+$R "index"        -- "$PY" "$MEMKIT_ROOT/brain/index.py"                             || rc=$((rc+4))
 $R "reload"       -- bash -c "curl -s -m 5 -X POST $BRAIN_URL/reload >/dev/null" || rc=$((rc+8))
 $R "check"        -- "$BIN_DIR/soul" check                             || rc=$((rc+16))
 [ -n "${SOUL_BACKUP_CMD:-}" ] && { $R "backup" -- bash -c "$SOUL_BACKUP_CMD" || rc=$((rc+32)); }

package/brain/index.py

@@ -16,9 +16,10 @@ import tempfile
 from datetime import datetime, timezone
 
 ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-MEM = os.environ.get("MEMORY_DIR") or os.path.join(ROOT, "memory")
+DATA_ROOT = os.environ.get("SOUL_DATA_DIR") or os.path.join(os.path.expanduser("~"), ".soul-forging")
+MEM = os.environ.get("MEMORY_DIR") or os.path.join(DATA_ROOT, "memory")
 TECH = os.environ.get("DOCS_DIR") or os.path.join(ROOT, "docs")
-BRAIN = os.environ.get("BRAIN_DIR") or os.path.join(ROOT, "brain")
+BRAIN = os.environ.get("BRAIN_DIR") or os.path.join(DATA_ROOT, "brain")
 LIVE = os.path.join(BRAIN, "live.jsonl")
 OUT = os.path.join(BRAIN, "entries.json")
 

package/brain/server.py

@@ -28,7 +28,8 @@ from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
 from urllib.parse import urlparse, parse_qs
 
 ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-BRAIN = os.environ.get("BRAIN_DIR") or os.path.join(ROOT, "brain")
+DATA_ROOT = os.environ.get("SOUL_DATA_DIR") or os.path.join(os.path.expanduser("~"), ".soul-forging")
+BRAIN = os.environ.get("BRAIN_DIR") or os.path.join(DATA_ROOT, "brain")
 ENTRIES = os.path.join(BRAIN, "entries.json")
 STATE = os.path.join(BRAIN, "state.json")
 PORT = int(os.environ.get("BRAIN_PORT") or 3914)

package/brain/soul_lib.py

@@ -10,8 +10,9 @@ import re
 from datetime import datetime, timezone
 
 ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-MEM = os.environ.get("MEMORY_DIR") or os.path.join(ROOT, "memory")
-BRAIN = os.environ.get("BRAIN_DIR") or os.path.join(ROOT, "brain")
+DATA_ROOT = os.environ.get("SOUL_DATA_DIR") or os.path.join(os.path.expanduser("~"), ".soul-forging")
+MEM = os.environ.get("MEMORY_DIR") or os.path.join(DATA_ROOT, "memory")
+BRAIN = os.environ.get("BRAIN_DIR") or os.path.join(DATA_ROOT, "brain")
 DOCS = os.environ.get("DOCS_DIR") or os.path.join(ROOT, "docs")
 LIVE = os.path.join(BRAIN, "live.jsonl")
 STATE = os.path.join(BRAIN, "state.json")

package/install.sh

@@ -21,10 +21,15 @@ else
   echo "! 没有 curl —— 检索会退化成「每次现算」，慢一点但能用"
 fi
 
-# 2) 记忆库结构
-for d in memory memory/core memory/identity memory/user memory/decisions memory/diary memory/raw brain docs/tech docs/debug; do
-  [ -d "$d" ] || { mkdir -p "$d"; echo "✓ 补建 $d"; }
-done
+# 2) 记忆库：没有就初始化到 ~/.soul-forging/memory（数据不放代码目录）
+DATA="${SOUL_DATA_DIR:-$HOME/.soul-forging}"
+if [ -d "$DATA/memory" ] && [ -n "$(ls -A "$DATA/memory" 2>/dev/null)" ]; then
+  echo "✓ 已有记忆库：$DATA/memory"
+else
+  MEMORY_DIR="$DATA/memory" bash bin/init-home || true
+fi
+mkdir -p "$DATA/brain"
+export MEMORY_DIR="$DATA/memory" BRAIN_DIR="$DATA/brain"
 
 # 3) 建索引
 echo

package/lib/plugin.js

@@ -27,7 +27,7 @@ const PARTS = ['SOUL.md', 'MEMORY.md', 'index.md', 'NOW.md']
 
 function defaultMemoryDir() {
   // 不放在 node_modules 里——升级插件会把那里整个换掉。
-  return process.env.MEMORY_DIR || join(homedir(), '.soul-forging', 'memory')
+  return process.env.MEMORY_DIR || join(process.env.SOUL_DATA_DIR || join(homedir(), '.soul-forging'), 'memory')
 }
 
 function readIf(p) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-soul-forging",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Separate Vessels, One Heart · 异体同心 —— 给 AI 的可迁移长期记忆与铸魂流程：markdown 记忆库 + 小脑检索 + 能长出来的性格。纯本地，不要服务器。",
   "license": "MIT",
   "type": "module",

package/soul.py

@@ -19,7 +19,8 @@ import os
 import sys
 
 ROOT = os.path.dirname(os.path.abspath(__file__))  # soul.py 就在仓库根目录
-MEM = os.environ.get("MEMORY_DIR") or os.path.join(ROOT, "memory")
+DATA_ROOT = os.environ.get("SOUL_DATA_DIR") or os.path.join(os.path.expanduser("~"), ".soul-forging")
+MEM = os.environ.get("MEMORY_DIR") or os.path.join(DATA_ROOT, "memory")
 
 # 注入顺序就是重要性顺序：先是谁，再是什么规矩，再是目录，最后是此刻。
 PARTS = ("SOUL.md", "MEMORY.md", "index.md", "NOW.md")