sophhub 0.4.57 → 0.4.59

package/agents/ai-dept-admin/.config.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.3",
+  "version": "1.0.4",
   "agent_id": "ai-dept-admin",
   "description": "部门管理主 Agent：部门知识库、人员档案与绩效、会议（单次/周期/查询）、待办与复盘记录",
   "bot_api_enabled": false,
@@ -33,5 +33,5 @@
       "auto_install": true
     }
   ],
-  "llm": "GLM-5"
+  "llm": "DeepSeek-V4-Pro"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sophhub",
-  "version": "0.4.57",
+  "version": "0.4.59",
   "description": "SophHub CLI - Manage and download AI Agent skills and agents",
   "type": "module",
   "bin": {

package/skills/agent-install/skill.json

@@ -1,12 +1,33 @@
 {
   "name": "agent-install",
-  "version": "0.1.12",
+  "version": "0.1.15",
   "types": [
     "store"
   ],
   "displayName": "Agent安装",
   "description": "安装或升级 Sophclaw Agent（含占位替换、备份、post_install 脚本与自动安装 skill）。",
   "changelog": [
+    {
+      "changes": [
+        "修复 update_openclaw.py 新建实例时覆盖原实例的严重 BUG：改为按目标 openclaw_id 定位条目，新建时追加、不覆盖同源原实例"
+      ],
+      "date": "2026-07-09",
+      "version": "0.1.15"
+    },
+    {
+      "changes": [
+        "安装汇总以 openclaw_id（实例标识）为主，不再展示源 agent_id，避免与实例标识混淆"
+      ],
+      "date": "2026-07-09",
+      "version": "0.1.14"
+    },
+    {
+      "changes": [
+        "新增 resolve_new_instance.py：新建实例时确定生成下一个可用的 openclaw_id 和 workspace，不再依赖 LLM 手动生成"
+      ],
+      "date": "2026-07-09",
+      "version": "0.1.13"
+    },
     {
       "changes": [
         "新建实例时仅询问 agent_name，openclaw_id 和 workspace 按规则自动生成"

package/skills/agent-install/src/SKILL.md

@@ -61,9 +61,15 @@ uv run {baseDir}/scripts/resolve_install_params.py \
 
 确认 `openclaw_id`、`workspace`、`agent_name`。有 `placeholder_catalog` 时让用户确认替换文案，用户可覆盖默认值。
 
-用户选择「新建实例」时，仅询问 `agent_name`（显示名称），`openclaw_id` 和 `workspace` 按规则自动生成：
-- `openclaw_id`：`{agent_id}-{N}`，N 为递增序号（如已存在 `agent_id` 和 `agent_id-2`，则用 `agent_id-3`）
-- `workspace`：基础 workspace 路径末尾追加 `-{N}`（如 `/home/node/.openclaw/workspace-dept-2`）
+用户选择「新建实例」时，**仅询问 `agent_name`**（显示名称），`openclaw_id` 和 `workspace` 由脚本确定生成，不向用户索要：
+
+```bash
+uv run {baseDir}/scripts/resolve_new_instance.py \
+  --agent-id "{agent_id}" \
+  --path "/home/node/.openclaw/workspace"
+```
+
+取返回的 `openclaw_id`（形如 `{agent_id}-{N}`）和 `workspace`（实例 #1 workspace 末尾追加 `-{N}`），后续步骤按此传入 `--openclaw-id` / `--workspace`。
 
 **2）按需替换 .md 中的占位符**（有 `placeholders` 时）
 
@@ -158,7 +164,7 @@ uv run {baseDir}/scripts/update_openclaw.py \
 
 脚本自动处理 `auto_generate_image_description`、`heartbeat`（仅当 `.config.json` 显式配置时写入）、`bot-api` 账号等，输出中包含对应字段便于核对。
 
-完成后汇总：agent_id、结果（新装/升级/重置）、workspace、备份目录、skill 列表、bot-api（密钥走安全渠道）。
+完成后汇总（以实例标识 `openclaw_id` 为主，不展示源 `agent_id` 以免与实例标识混淆）：openclaw_id、结果（新装/升级/重置/新建实例）、workspace、显示名称、备份目录、skill 列表、bot-api（密钥走安全渠道）。
 
 ---
 

package/skills/agent-install/src/scripts/resolve_new_instance.py

@@ -0,0 +1,94 @@
+#!/usr/bin/env python3
+"""为「新建实例」确定性地生成下一个可用的 openclaw_id 和 workspace。
+
+读取 openclaw.json，扫描 agents.list 中所有匹配 ^{agent_id}(-(\d+))?$ 的条目，
+取最大编号 + 1 作为新实例编号，输出 openclaw_id 与 workspace。
+"""
+from __future__ import annotations
+
+import argparse
+import json
+import re
+import sys
+from pathlib import Path
+
+from common import (
+    default_openclaw_config_path,
+    find_agent_entry,
+    load_agent_definition,
+    load_openclaw_config,
+)
+
+
+def next_instance_number(existing_ids: list[str], agent_id: str) -> int:
+    """从已有 id 列表算出下一个实例编号。裸 agent_id 视为 1，agent_id-N 视为 N。"""
+    pattern = re.compile(rf"^{re.escape(agent_id)}(?:-(\d+))?$")
+    numbers: set[int] = set()
+    for eid in existing_ids:
+        if not isinstance(eid, str):
+            continue
+        match = pattern.fullmatch(eid)
+        if match is None:
+            continue
+        suffix = match.group(1)
+        numbers.add(int(suffix) if suffix else 1)
+    if not numbers:
+        return 2
+    return max(numbers) + 1
+
+
+def base_workspace_for(agent_id: str, agent_def: dict, config: dict) -> str:
+    """实例 #1 的实际 workspace 作为新实例 workspace 的基。取不到则回退到 .config.json 的 workspace。"""
+    entry = find_agent_entry(config, agent_id)
+    if entry and isinstance(entry.get("workspace"), str) and entry["workspace"].strip():
+        return entry["workspace"].rstrip("/")
+    configured = agent_def.get("install", {}).get("workspace") or agent_def.get("workspace")
+    if isinstance(configured, str) and configured.strip():
+        return configured.rstrip("/")
+    return f"/home/node/.openclaw/workspace-{agent_id}"
+
+
+def resolve_new_instance(agent_id: str, source_path: Path, config_path: Path) -> dict[str, object]:
+    agent_def = load_agent_definition(agent_id, source_path)
+    openclaw = load_openclaw_config(config_path)
+    agents_list = openclaw.get("agents", {}).get("list", []) or []
+    existing_ids = [a.get("id") for a in agents_list if isinstance(a, dict)]
+
+    next_n = next_instance_number(existing_ids, agent_id)
+    new_openclaw_id = f"{agent_id}-{next_n}"
+    base_ws = base_workspace_for(agent_id, agent_def, openclaw)
+    new_workspace = f"{base_ws}-{next_n}"
+
+    return {
+        "ok": True,
+        "agent_id": agent_id,
+        "openclaw_id": new_openclaw_id,
+        "workspace": new_workspace,
+        "instance_number": next_n,
+        "message": f"新实例参数：openclaw_id={new_openclaw_id}，workspace={new_workspace}",
+    }
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser(description="为新建实例生成下一个可用的 openclaw_id 和 workspace")
+    parser.add_argument("--agent-id", required=True, help="Agent ID")
+    parser.add_argument("--path", required=True, help="Agent 下载目录（sophhub agent download 的 --path）")
+    parser.add_argument(
+        "--config",
+        default=str(default_openclaw_config_path()),
+        help="openclaw.json 路径",
+    )
+    args = parser.parse_args()
+
+    result = resolve_new_instance(
+        args.agent_id,
+        Path(args.path).expanduser().resolve(),
+        Path(args.config).expanduser().resolve(),
+    )
+    json.dump(result, sys.stdout, indent=2, ensure_ascii=False)
+    sys.stdout.write("\n")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

package/skills/agent-install/src/scripts/update_openclaw.py

@@ -14,6 +14,7 @@ from common import (
     deep_merge_dict,
     default_openclaw_config_path,
     dump_json,
+    entry_matches_source_agent,
     find_agent_entry,
     find_bot_api_accounts_by_agent_id,
     find_agent_by_workspace,
@@ -165,15 +166,18 @@ def update_openclaw(
     config = load_openclaw_config(config_path)
     main_migration = _ensure_main_agent_in_list(config, config_path)
     desired_workspace = resolved_workspace or agent_def.get("install", {}).get("workspace") or agent_def.get("workspace")
-    previous = resolve_existing_agent_entry(config_path, config, agent_id, desired_workspace)
-    if previous is None and resolved_openclaw_id:
-        existing_by_target_id = find_agent_entry(config, resolved_openclaw_id)
-        if existing_by_target_id is not None:
-            raise ValueError(f"目标 openclaw id 已存在且不属于当前 Agent: {resolved_openclaw_id}")
-    if previous is not None:
-        target_agent_id = previous.get("id") if previous.get("id") else agent_id
+    # 确定目标实例 id：显式传入的 openclaw_id 优先（支持新建/指定实例更新）
+    resolved_previous = resolve_existing_agent_entry(config_path, config, agent_id, desired_workspace)
+    if resolved_openclaw_id:
+        target_agent_id = resolved_openclaw_id
+    elif resolved_previous is not None:
+        target_agent_id = resolved_previous.get("id") or agent_id
     else:
-        target_agent_id = resolved_openclaw_id or agent_id
+        target_agent_id = agent_id
+    # previous = 目标 id 对应的已有条目（更新场景）；校验若已被不同源 agent 占用则报错
+    previous = find_agent_entry(config, target_agent_id)
+    if previous is not None and not entry_matches_source_agent(config_path, previous, agent_id):
+        raise ValueError(f"目标 openclaw id 已存在且不属于当前 Agent: {target_agent_id}")
 
     entry = build_agent_entry(
         agent_def,