@shundoo-ai/dsh-cosmic 1.0.3-alpha.0 → 1.0.4-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shundoo-ai/dsh-cosmic",
-  "version": "1.0.3-alpha.0",
+  "version": "1.0.4-alpha.0",
   "type": "module",
   "files": [
     ".config",

package/skills/cosmic-build/skills/cosmic-vibe-coding/SKILL.md

@@ -10,7 +10,7 @@ description: >
 | 职责 | 内容 | 载体 |
 |------|------|------|
 | ① 开启热部署 | 开 `jar_deploy_enable` 开关、连 IDEA MCP、生成 `dev.json` | `scripts/dev.py` + `assets/dev.json` |
-| ② 热加载 | 不重启、不碰 mc，把 jar 注入运行中 cosmic | `assets/kd-reloadjar-agent.jar` |
+| ② 热加载 | 不重启、不碰 mc，把 jar 注入运行中 cosmic | `assets/kd-reloadjar-agent.jar`（**需先复制到机器级缓存再用**，见职责②§3） |
 | ③ build + 热部署 | 构建 jar（MCP 定位编译错误）→ 热加载 | IDEA MCP / gradle + agent |
 
 ## 触发场景
@@ -128,9 +128,23 @@ pwsh -File {SKILL_DIR}\scripts\cosmic-hotdeploy.ps1 -Module <模块名> -WhatIf
 
 ### 3. 热部署
 
+> ⚠️ **别直接用 preset 里的 `{SKILL_DIR}/assets/kd-reloadjar-agent.jar`** —— 先把 agent jar 复制到**机器级缓存**再用（`{AGENT}`，见下）。原因：Attacher 会把这个 jar **载入运行中的 cosmic JVM**，而 JVM 的 classloader 会**长期持有**该文件句柄；preset 一旦升级，包管理器要**整目录替换**（每个文件都得能删/改名）→ 必然在这个 jar 上失败（Windows 报 `os error 32`／拒绝访问）。
+>
+> `{AGENT}` = `$DSH_HOME/cache/cosmic/agent/kd-reloadjar-agent-<sha1前8位>.jar`（**带内容哈希命名**，所以新版永远不会覆盖可能已被 JVM 载入的旧副本）。`init-python.{sh,ps1}` 会预先复制；`cosmic-hotdeploy.ps1` 也会自动解析并复制。手工操作时：
+
+```bash
+# 先把 preset 里的原件复制到机器级缓存（哈希命名），再用缓存路径
+AGENT_DIR="${DSH_HOME:-$HOME/.dsh}/cache/cosmic/agent"
+SRC="{SKILL_DIR}/assets/kd-reloadjar-agent.jar"
+HASH=$( (shasum -a 1 "$SRC" 2>/dev/null || sha1sum "$SRC") | cut -c1-8 )
+AGENT="$AGENT_DIR/kd-reloadjar-agent-$HASH.jar"
+mkdir -p "$AGENT_DIR" && [ -f "$AGENT" ] || cp "$SRC" "$AGENT"
+```
+
 ```bash
-<java_home>/bin/java -cp <java_home>/lib/tools.jar:{SKILL_DIR}/assets/kd-reloadjar-agent.jar kd.reloadjar.Attacher \
-     <cosmicPID> {SKILL_DIR}/assets/kd-reloadjar-agent.jar \
+# 用缓存副本调 Attacher（Windows 上把 : 换成 ;）
+<java_home>/bin/java -cp <java_home>/lib/tools.jar:"$AGENT" kd.reloadjar.Attacher \
+     <cosmicPID> "$AGENT" \
      "<jar绝对路径1>,<jar绝对路径2>" \
      <account_id> <tenant_id> \
      <可选logFile绝对路径>
@@ -140,6 +154,7 @@ pwsh -File {SKILL_DIR}\scripts\cosmic-hotdeploy.ps1 -Module <模块名> -WhatIf
 - jar 路径可直接用构建产物 `build/libs/xxx.jar`，**无需拷到 lib/cus**。
 - 最后一个参数 `logFile` **可选**：填了则在开发机侧写成功/失败标记日志（`status=SUCCESS/FAILED`）。
 - classpath 分隔符：macOS/Linux 用 `:`，Windows 用 `;`。
+- **Windows 直接用**「Windows：一条命令走完全程」里的 `cosmic-hotdeploy.ps1`（它已内置上述缓存逻辑）。
 
 ### 4. 验证
 
@@ -225,4 +240,4 @@ agent（`kd.reloadjar.ReloadAgent`）在 cosmic 进程内自动执行这两步
 | `assets/dev.json` | ① 开启热部署 | 空配置模板（`dev.py` 读它作字段基础，生成工作区 `.dsh/cosmic/config/dev.json`） |
 | `scripts/dev.py` | ① 开启热部署 | 环境配置脚本（`init`=读 `.kd/config.json` 覆盖 dev.json；`read`=只读；`__file__` 反推 skill 根） |
 | `scripts/cosmic-hotdeploy.ps1` | ②③ 热加载 / 构建+热部署 | **Windows 一键封装**（可移植：工作区自动推断、无硬编码路径）：体检 / `-Module` 构建+热部署 / `-Clean` / `-Jar` 直传 / `-WhatIf`。见「Windows：一条命令走完全程」 |
-| `assets/kd-reloadjar-agent.jar` | ② 热加载 | 热重载 agent（含 `kd.reloadjar.ReloadAgent` + `Attacher`） |
+| `assets/kd-reloadjar-agent.jar` | ② 热加载 | 热重载 agent（含 `kd.reloadjar.ReloadAgent` + `Attacher`）。⚠️ **原件不要直接加载** —— 先复制到 `$DSH_HOME/cache/cosmic/agent/kd-reloadjar-agent-<sha1前8位>.jar` 再用（避免 preset 升级时被 JVM 锁住，见职责②§3） |

package/skills/cosmic-build/skills/cosmic-vibe-coding/scripts/cosmic-hotdeploy.ps1

@@ -68,8 +68,41 @@ if (-not $PresetDir) {
 if (-not $PresetDir) {
     throw "Cannot locate the cosmic skill bundle. Set DSH_PROFILE_DIR/DSH_HOME, or pass -PresetDir <path containing skills\cosmic-build>."
 }
-$agent = Join-Path $PresetDir 'skills\cosmic-build\skills\cosmic-vibe-coding\assets\kd-reloadjar-agent.jar'
-if (-not (Test-Path $agent)) { throw "Missing reload agent: $agent" }
+$srcAgent = Join-Path $PresetDir 'skills\cosmic-build\skills\cosmic-vibe-coding\assets\kd-reloadjar-agent.jar'
+if (-not (Test-Path $srcAgent)) { throw "Missing reload agent: $srcAgent" }
+
+# ---- 0.2 Agent jar: use a machine-level, content-hashed COPY -- never load it from the preset ----
+#   Why: the Attacher loads this jar into the running cosmic JVM, and the JVM's classloader keeps
+#   the JarFile handle open for the JVM's lifetime. npm/pnpm upgrades replace the *whole package
+#   directory* (move the old dir away, put the new one in), which requires every file inside to be
+#   deletable/renamable -> the upgrade always fails on this jar (Windows: os error 32 / access
+#   denied). The old git-based layout never hit this because git only rewrites files whose content
+#   actually changed, and this jar rarely changes.
+#   Naming the copy with the content hash means a *new* preset version never overwrites an old copy
+#   that may already be loaded by a JVM.
+$dshHome = if ($env:DSH_HOME) { $env:DSH_HOME }
+           elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dsh' }
+           elseif ($env:HOME) { Join-Path $env:HOME '.dsh' }
+           else { $null }
+$agent = $srcAgent
+if ($dshHome) {
+    $agentHash = (Get-FileHash $srcAgent -Algorithm SHA1).Hash.Substring(0, 8).ToLower()
+    $agentDir = Join-Path (Join-Path $dshHome 'cache\cosmic') 'agent'
+    $cachedAgent = Join-Path $agentDir "kd-reloadjar-agent-$agentHash.jar"
+    try {
+        if (-not (Test-Path $cachedAgent)) {
+            New-Item -ItemType Directory -Force -Path $agentDir | Out-Null
+            Copy-Item $srcAgent $cachedAgent -Force
+        }
+        $agent = $cachedAgent
+        # best-effort housekeeping: keep only the newest few hashed copies
+        Get-ChildItem $agentDir -Filter 'kd-reloadjar-agent-*.jar' -ErrorAction SilentlyContinue |
+            Sort-Object LastWriteTime -Descending | Select-Object -Skip 5 |
+            Remove-Item -Force -ErrorAction SilentlyContinue
+    } catch {
+        Write-Host "[agent] WARN cannot use the cached copy ($($_.Exception.Message)); falling back to the preset copy (preset upgrades may then hit a file lock)."
+    }
+}
 $devScript = Join-Path $PresetDir 'skills\cosmic-build\skills\cosmic-vibe-coding\scripts\dev.py'
 
 # ---- 1. Read dev.json (env config produced by dev.py init) ----
@@ -142,6 +175,11 @@ Write-Host "[env] erp_url    = $($dev.erp_url)  (port $effPort)"
 Write-Host "[env] cosmic PID = $targetPid (owner=$owner)"
 Write-Host "[env] attacher JDK = $attacherJdk"
 Write-Host "[env] accountId  = $accountId / tenantId = $tenantId"
+if ($agent -ne $srcAgent) {
+    Write-Host "[agent] $agent  (cached copy; the preset original is never loaded)"
+} else {
+    Write-Host "[agent] $agent  (PRESET ORIGINAL -- preset upgrades may hit a file lock while cosmic runs)"
+}
 
 # ---- 4. Optional: build first ----
 if ($Module) {

package/skills/erp-analysis/scripts/init-python.ps1

@@ -47,3 +47,25 @@ Write-Host "==> 验证导入"
 uv run --python $VENV python -c "import pandas, numpy, plotly, jinja2, requests; print('OK', pandas.__version__, numpy.__version__, plotly.__version__, jinja2.__version__, 'requests', requests.__version__)"
 
 Write-Host "==> init-python 完成"
+
+# 顺带把热部署用的 agent jar 预复制到机器级缓存（与 venv 同理：**不要把会被外部进程独占
+# 加载的文件留在 preset 里**）。Attacher 会把这个 jar 载入运行中的 cosmic JVM，JVM 长期持有
+# 其句柄；preset 升级要整目录替换 → 会在这个 jar 上失败（Windows os error 32 / 拒绝访问）。
+# 文件名带内容哈希：新版不会覆盖可能已被 JVM 载入的旧副本。幂等。
+$AgentSrc = Join-Path $ROOT "skills\cosmic-build\skills\cosmic-vibe-coding\assets\kd-reloadjar-agent.jar"
+if (Test-Path $AgentSrc) {
+    $AgentDir = Join-Path $DshHome "cache\cosmic\agent"
+    $AgentHash = (Get-FileHash $AgentSrc -Algorithm SHA1).Hash.Substring(0, 8).ToLower()
+    $AgentDst = Join-Path $AgentDir "kd-reloadjar-agent-$AgentHash.jar"
+    if (-not (Test-Path $AgentDir)) { New-Item -ItemType Directory -Force -Path $AgentDir | Out-Null }
+    if (Test-Path $AgentDst) {
+        Write-Host "==> agent 缓存已存在: $AgentDst"
+    } else {
+        Copy-Item $AgentSrc $AgentDst -Force
+        Write-Host "==> agent 已缓存: $AgentDst"
+    }
+    # 只保留最近 5 份哈希副本（best-effort）
+    Get-ChildItem $AgentDir -Filter "kd-reloadjar-agent-*.jar" -ErrorAction SilentlyContinue |
+        Sort-Object LastWriteTime -Descending | Select-Object -Skip 5 |
+        Remove-Item -Force -ErrorAction SilentlyContinue
+}

package/skills/erp-analysis/scripts/init-python.sh

@@ -48,3 +48,22 @@ echo "==> 验证导入"
 uv run --python "$VENV" python -c 'import pandas, numpy, plotly, jinja2, requests; print("OK", pandas.__version__, numpy.__version__, plotly.__version__, jinja2.__version__, "requests", requests.__version__)'
 
 echo "==> init-python 完成"
+
+# 4) 顺带把热部署用的 agent jar 预复制到机器级缓存（与 venv 同理：**不要把会被外部进程
+#    独占加载的文件留在 preset 里**）。Attacher 会把这个 jar 载入运行中的 cosmic JVM，
+#    JVM 长期持有其句柄；preset 升级要整目录替换 → 会在这个 jar 上失败（Windows os error 32）。
+#    文件名带内容哈希：新版不会覆盖可能已被 JVM 载入的旧副本。幂等。
+AGENT_SRC="$ROOT/skills/cosmic-build/skills/cosmic-vibe-coding/assets/kd-reloadjar-agent.jar"
+if [ -f "$AGENT_SRC" ]; then
+  AGENT_DIR="$DSH_HOME/cache/cosmic/agent"
+  AGENT_HASH="$( (shasum -a 1 "$AGENT_SRC" 2>/dev/null || sha1sum "$AGENT_SRC") | cut -c1-8 )"
+  AGENT_DST="$AGENT_DIR/kd-reloadjar-agent-$AGENT_HASH.jar"
+  mkdir -p "$AGENT_DIR"
+  if [ -f "$AGENT_DST" ]; then
+    echo "==> agent 缓存已存在: $AGENT_DST"
+  else
+    cp "$AGENT_SRC" "$AGENT_DST" && echo "==> agent 已缓存: $AGENT_DST"
+  fi
+  # 只保留最近 5 份哈希副本（best-effort）
+  ls -1t "$AGENT_DIR"/kd-reloadjar-agent-*.jar 2>/dev/null | tail -n +6 | while read -r old; do rm -f "$old" 2>/dev/null || true; done
+fi