openclaw-multi-auto 1.6.0 → 1.6.2

package/scripts/create-instance.sh

@@ -94,41 +94,45 @@ else
     echo -e "${YELLOW}⚠️  未找到 package.json，使用兜底版本: ${CURRENT_VERSION}${NC}"
 fi
 
-# --- 7. 核心代码同步 (完整复制) ---
-echo -e "${BLUE}🔄 完整复制 OpenClaw 源码目录...${NC}"
-
-# 定义需要复制的目录和文件
-DIRS_TO_COPY="dist extensions scripts skills docs ui assets"
-FILES_TO_COPY="package.json openclaw.mjs"
-
-# 复制所有必要目录
-for dir in $DIRS_TO_COPY; do
-    if [ -d "${SOURCE_CODE}/${dir}" ]; then
-        echo -ne "${YELLOW}📁 复制 ${dir}...${NC}"
-        cp -r "${SOURCE_CODE}/${dir}" "${INSTANCE_DIR}/"
-        echo -e "${GREEN} [完成]${NC}"
-    else
-        echo -e "${YELLOW}⚠️  跳过 ${dir} (不存在)${NC}"
-    fi
-done
-
-# 复制所有必要文件
-for file in $FILES_TO_COPY; do
-    if [ -f "${SOURCE_CODE}/${file}" ]; then
-        echo -ne "${YELLOW}📄 复制 ${file}...${NC}"
-        cp "${SOURCE_CODE}/${file}" "${INSTANCE_DIR}/"
-        echo -e "${GREEN} [完成]${NC}"
-    else
-        echo -e "${YELLOW}⚠️  跳过 ${file} (不存在)${NC}"
+# --- 7. 核心代码同步 (物理对齐) ---
+echo -e "${BLUE}🔄 分发代码产物...${NC}"
+rm -rf "$DIST_DIR" && mkdir -p "$DIST_DIR"
+if [ -d "${SOURCE_CODE}/dist" ]; then
+    cp -r "${SOURCE_CODE}/dist/." "${DIST_DIR}/"
+    echo "cp exit code: $?"
+
+    if [ -f "${DIST_DIR}/index.js" ]; then
+        for chunk in $(grep -oE "utils-[A-Za-z0-9]+\.js" "${DIST_DIR}/index.js" 2>/dev/null | sort -u); do
+            if [ ! -f "${DIST_DIR}/${chunk}" ]; then
+                echo -e "${RED}❌ 致命错误: dist 缺失关键模块 ${chunk}${NC}"
+                echo -e "${YELLOW}请在源码端执行: rm -rf dist && pnpm build && npm publish${NC}"
+                exit 1
+            fi
+        done
     fi
-done
+else
+    echo -e "${RED}❌ 错误: 母本 dist 不存在${NC}"
+    exit 1
+fi
 
-# 复制 pnpm-lock.yaml (如果存在)
-if [ -f "${SOURCE_CODE}/pnpm-lock.yaml" ]; then
-    cp "${SOURCE_CODE}/pnpm-lock.yaml" "${INSTANCE_DIR}/"
+cp "${SOURCE_CODE}/package.json" "${INSTANCE_DIR}/package.json"
+[ -f "${SOURCE_CODE}/pnpm-lock.yaml" ] && cp "${SOURCE_CODE}/pnpm-lock.yaml" "${INSTANCE_DIR}/pnpm-lock.yaml"
+
+# 复制 extensions 目录到实例的 .openclaw 目录（包含 page-action-cache, feishu 等）
+# 多实例架构：每个实例完全隔离，扩展在 ~/.openclaws/<实例>/.openclaw/extensions
+INSTANCE_OPENCLAW_DIR="${INSTANCE_DIR}/.openclaw"
+if [ -d "${SOURCE_CODE}/extensions" ]; then
+    echo -e "${YELLOW}📁 复制 extensions 目录到实例 .openclaw 目录...${NC}"
+    mkdir -p "$INSTANCE_OPENCLAW_DIR"
+    cp -r "${SOURCE_CODE}/extensions/" "${INSTANCE_OPENCLAW_DIR}/"
+    echo -e "${GREEN}✅ extensions 目录复制完成${NC}"
+    echo -e "${BLUE}📂 实例扩展目录: ${INSTANCE_OPENCLAW_DIR}${NC}"
 fi
 
-echo -e "${GREEN}✅ 核心代码复制完成${NC}"
+# 复制 control-ui（如果存在）
+if [ -d "${SOURCE_CODE}/dist/control-ui" ]; then
+    cp -r "${SOURCE_CODE}/dist/control-ui" "${INSTANCE_DIR}/dist/"
+fi
 
 export SHARP_BINARY_HOST="https://npmmirror.com/mirrors/sharp"
 export SHARP_LIBVIPS_BINARY_HOST="https://npmmirror.com/mirrors/sharp-libvips"
@@ -141,7 +145,6 @@ if [ -f "${INSTANCES_BASE}/pnpm-workspace.yaml" ]; then
     mv "${INSTANCES_BASE}/pnpm-workspace.yaml" "${INSTANCES_BASE}/pnpm-workspace.yaml.bak.$(date +%s)"
 fi
 
-echo -e "${BLUE}📦 安装依赖包...${NC}"
 pnpm install --shamefully-hoist --ignore-workspace --registry=https://registry.npmmirror.com --no-frozen-lockfile
 
 if [ ! -d "node_modules" ]; then
@@ -150,90 +153,7 @@ if [ ! -d "node_modules" ]; then
 fi
 echo -e "${GREEN}✅ 依赖安装成功，node_modules 已生成在实例目录${NC}"
 
-# --- 8.5. 安装 page-action-cache 扩展到 openclaw-multi-auto ---
-echo -e "${BLUE}🤖 正在安装 page-action-cache 扩展到 openclaw-multi-auto...${NC}"
-
-# 全局目录路径
-GLOBAL_DIR="$HOME/openclaw-runtime"
-echo -e "${BLUE}📂 全局目录: $GLOBAL_DIR${NC}"
-
-# openclaw-multi-auto 扩展目录
-OPENCLAW_DIR="$GLOBAL_DIR/node_modules/openclaw-multi-auto"
-OPENCLAW_EXTENSIONS_DIR="$OPENCLAW_DIR/extensions"
-
-# 检测可用的包管理器
-if command -v pnpm &> /dev/null; then
-    PACKAGE_MANAGER="pnpm"
-    echo -e "${BLUE}📦 检测到包管理器: pnpm${NC}"
-elif command -v npm &> /dev/null; then
-    PACKAGE_MANAGER="npm"
-    echo -e "${BLUE}📦 检测到包管理器: npm${NC}"
-else
-    echo -e "${RED}❌ 未找到 npm 或 pnpm 命令${NC}"
-    echo -e "${YELLOW}💡 请先安装 Node.js 和包管理器${NC}"
-    exit 1
-fi
-
-# 确定包名
-PACKAGE_NAME="page-action-cache"
-
-# 安装 page-action-cache 到 openclaw-multi-auto/extensions
-echo -e "${YELLOW}📦 正在安装 $PACKAGE_NAME 到 openclaw-multi-auto/extensions...${NC}"
-cd "$GLOBAL_DIR"
-
-# 检查扩展目录
-if [ ! -d "$OPENCLAW_EXTENSIONS_DIR" ]; then
-    echo -e "${YELLOW}📁 创建 openclaw-multi-auto/extensions 目录...${NC}"
-    mkdir -p "$OPENCLAW_EXTENSIONS_DIR"
-fi
-
-# 检查全局安装状态
-if [ -d "$OPENCLAW_EXTENSIONS_DIR/$PACKAGE_NAME" ]; then
-    echo -e "${YELLOW}⚠️  $PACKAGE_NAME 已在 openclaw-multi-auto 安装${NC}"
-    echo -e "${YELLOW}💡 如需更新，请手动更新${NC}"
-else
-    # 尝试从 npm 安装
-    echo -ne "${YELLOW}📦 尝试从 npm registry 安装 $PACKAGE_NAME...${NC}"
-    if [ "$PACKAGE_MANAGER" = "pnpm" ]; then
-        pnpm add $PACKAGE_NAME --registry=https://registry.npmmirror.com 2>&1
-    else
-        npm install $PACKAGE_NAME --registry=https://registry.npmmirror.com --no-save 2>&1
-    fi
-
-    if [ $? -eq 0 ]; then
-        echo -e "${GREEN}✅ $PACKAGE_NAME 安装成功${NC}"
-        # 复制到扩展目录
-        if [ -d "node_modules/$PACKAGE_NAME" ]; then
-            echo -e "${YELLOW}📁 复制 $PACKAGE_NAME 到 openclaw-multi-auto/extensions...${NC}"
-            cp -r "node_modules/$PACKAGE_NAME" "$OPENCLAW_EXTENSIONS_DIR/"
-            echo -e "${GREEN}✅ 复制完成${NC}"
-        fi
-    else
-        echo -e "${RED}❌ $PACKAGE_NAME 安装失败${NC}"
-        echo -e "${YELLOW}💡 提示: 请检查网络连接或包名是否正确${NC}"
-    fi
-fi
-
-# 检查全局安装结果
-INSTALLED=$($PACKAGE_MANAGER list $PACKAGE_NAME 2>&1 | grep -q "$PACKAGE_NAME")
-if [ $? -eq 0 ]; then
-    echo -e "${GREEN}✅ $PACKAGE_NAME 已安装到全局目录${NC}"
-
-    # 获取安装信息
-    PACKAGE_INFO=$($PACKAGE_MANAGER list $PACKAGE_NAME 2>&1)
-    echo -e "${BLUE}📦 $PACKAGE_NAME 全局安装信息:${NC}"
-    echo "$PACKAGE_INFO"
-else
-    echo -e "${YELLOW}⚠️  $PACKAGE_NAME 安装状态不确定${NC}"
-    echo -e "${YELLOW}💡 提示: 请手动检查安装状态: $PACKAGE_MANAGER list $PACKAGE_NAME --global${NC}"
-fi
-
-echo -e "${GREEN}✅ page-action-cache 全局扩展安装完成${NC}"
-echo -e "${BLUE}📝 yunwei 实例将从全局目录复制代码和依赖${NC}"
-echo -e "${YELLOW}🔄 多实例架构：全局运行时 + 实例从运行时复制${NC}"
-
-# 返回到实例目录
-cd "${INSTANCE_DIR}"
+# --- 8. 参数与交互式获取 ---
 MODEL_PROVIDER="${3:-}"
 if [ -z "$MODEL_PROVIDER" ]; then
     echo -e "${BLUE}--- 请选择模型供应商 ---${NC}"
@@ -492,15 +412,7 @@ fi
 if command -v openclaw &> /dev/null; then
     OPENCLAW_EXEC="openclaw"
 else
-    # 使用完整复制的目录中的 openclaw.mjs 或 dist/index.js
-    if [ -f "$SCRIPT_DIR/openclaw.mjs" ]; then
-        OPENCLAW_EXEC="node $SCRIPT_DIR/openclaw.mjs"
-    elif [ -f "$SCRIPT_DIR/dist/index.js" ]; then
-        OPENCLAW_EXEC="node $SCRIPT_DIR/dist/index.js"
-    else
-        echo -e "${RED}❌ 错误: 未找到可执行文件${NC}"
-        exit 1
-    fi
+    OPENCLAW_EXEC="node $SCRIPT_DIR/dist/index.js"
 fi
 
 # 根据命令行参数执行对应操作