openclaw-multi-auto 1.7.5 → 1.7.6

package/scripts/create-instance.sh

@@ -50,6 +50,12 @@ fi
 # 实例基础目录：~/openclaws
 INSTANCES_BASE="$HOME/openclaws"
 
+# 实例根目录
+INSTANCE_DIR="$INSTANCES_BASE/${INSTANCE_NAME}"
+
+# dist 目录：实例根目录（不使用子目录，避免 root-alias.cjs 路径解析问题）
+DIST_DIR="${INSTANCE_DIR}"
+
 # --- 2. 获取实例名称 ---
 INSTANCE_NAME="${1:-}"
 if [ -z "$INSTANCE_NAME" ]; then
@@ -67,7 +73,6 @@ fi
 
 # --- 4. 定义实例目录并清理旧残留 ---
 INSTANCE_DIR="$INSTANCES_BASE/${INSTANCE_NAME}"
-DIST_DIR="${INSTANCE_DIR}/dist"
 
 echo -e "${BLUE}🏗️  正在深度初始化实例: ${INSTANCE_NAME} (端口 ${PORT})${NC}"
 echo "SOURCE_CODE = $SOURCE_CODE"
@@ -99,17 +104,16 @@ else
     echo -e "${YELLOW}⚠️  未找到 package.json，使用兜底版本: ${CURRENT_VERSION}${NC}"
 fi
 
-# --- 7. 核心代码同步 (从源码复制到 dist) ---
-echo -e "${BLUE}🔄 正在从源码复制文件到实例 dist 目录...${NC}"
+# --- 7. 核心代码同步 (从源码复制到实例根目录) ---
+echo -e "${BLUE}🔄 正在从源码复制文件到实例根目录...${NC}"
 echo -e "${YELLOW}源码路径: ${SOURCE_CODE}${NC}"
-echo -e "${YELLOW}目标路径: ${DIST_DIR}${NC}"
+echo -e "${YELLOW}目标路径: ${INSTANCE_DIR}${NC}"
 
-# 清理并创建 dist 目录
-rm -rf "$DIST_DIR"
-mkdir -p "$DIST_DIR"
+# 清理实例目录
+rm -rf "$INSTANCE_DIR"
 
-# 复制源码所有内容到 dist 目录
-if cp -r "${SOURCE_CODE}/." "${DIST_DIR}/"; then
+# 复制源码所有内容到实例根目录
+if cp -r "${SOURCE_CODE}/." "${INSTANCE_DIR}/"; then
     echo -e "${GREEN}✅ 源码复制成功${NC}"
 else
     echo -e "${RED}❌ 错误: 源码复制失败${NC}"
@@ -117,8 +121,8 @@ else
 fi
 
 # 验证关键文件是否存在
-if [ ! -f "${DIST_DIR}/package.json" ]; then
-    echo -e "${RED}❌ 错误: dist 目录中未找到 package.json${NC}"
+if [ ! -f "${INSTANCE_DIR}/package.json" ]; then
+    echo -e "${RED}❌ 错误: 实例目录中未找到 package.json${NC}"
     exit 1
 fi
 
@@ -126,12 +130,6 @@ fi
 # 注意：npm/pnpm 发布的包不包含 node_modules，需要在实例中安装
 echo -e "${BLUE}📦 正在安装依赖...${NC}"
 
-# 复制 package.json 和 pnpm-lock.yaml 到实例根目录（用于依赖安装）
-cp "${DIST_DIR}/package.json" "${INSTANCE_DIR}/package.json"
-if [ -f "${DIST_DIR}/pnpm-lock.yaml" ]; then
-    cp "${DIST_DIR}/pnpm-lock.yaml" "${INSTANCE_DIR}/pnpm-lock.yaml"
-fi
-
 cd "${INSTANCE_DIR}"
 
 # 临时清理可能干扰的 workspace 配置
@@ -156,13 +154,13 @@ if [ ! -d "node_modules" ]; then
 fi
 echo -e "${GREEN}✅ 依赖安装成功${NC}"
 
-# --- 安装扩展到 dist/extensions ---
+# --- 安装扩展到实例根目录 ---
 echo -e "${BLUE}📦 正在安装扩展 page-action-cache...${NC}"
 
-# 确保 dist/extensions 目录存在
-mkdir -p "${DIST_DIR}/extensions"
+# 确保 extensions 目录存在
+mkdir -p "${INSTANCE_DIR}/extensions"
 
-cd "${DIST_DIR}/extensions"
+cd "${INSTANCE_DIR}/extensions"
 
 # 下载 page-action-cache tarball 并解压到临时目录
 TEMP_EXT_DIR=$(mktemp -d)
@@ -172,8 +170,8 @@ if npm pack page-action-cache --registry=https://registry.npmmirror.com --quiet
     # 解压到临时目录
     tar -xzf "$TARBALL"
     # 移动到 extensions/page-action-cache
-    rm -rf "${DIST_DIR}/extensions/page-action-cache"
-    mv package "${DIST_DIR}/extensions/page-action-cache"
+    rm -rf "${INSTANCE_DIR}/extensions/page-action-cache"
+    mv package "${INSTANCE_DIR}/extensions/page-action-cache"
     echo -e "${GREEN}✅ page-action-cache 安装成功${NC}"
 else
     echo -e "${YELLOW}⚠️  page-action-cache 下载失败${NC}"
@@ -305,14 +303,7 @@ cat > "${INSTANCE_DIR}/config/openclaw.json" << EOF
     }
   },
   "commands": { "native": "auto", "restart": false },
-  "gateway": { "port": ${PORT}, "mode": "local" },
-  "plugins": {
-    "entries": {
-      "page-action-cache": {
-        "enabled": true
-      }
-    }
-  }
+  "gateway": { "port": ${PORT}, "mode": "local" }
 }
 EOF
 
@@ -399,22 +390,13 @@ cat > "${INSTANCE_DIR}/start.sh" << 'EOF'
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 INSTANCE_NAME=$(basename "$SCRIPT_DIR")
 
-# dist 目录：源码复制位置
-DIST_DIR="$SCRIPT_DIR/dist"
-
-# 检查 dist 目录是否存在
-if [ ! -d "$DIST_DIR" ]; then
-    echo -e "\033[0;31m❌ 错误: dist 目录不存在: $DIST_DIR\033[0m"
+# 检查实例根目录中是否有关键文件
+if [ ! -f "$SCRIPT_DIR/package.json" ]; then
+    echo -e "\033[0;31m❌ 错误: 实例目录中未找到 package.json\033[0m"
     echo -e "\033[1;33m请重新运行 create-instance.sh 脚本\033[0m"
     exit 1
 fi
 
-# 检查 dist 目录中是否有关键文件
-if [ ! -f "$DIST_DIR/package.json" ]; then
-    echo -e "\033[0;31m❌ 错误: dist 目录中未找到 package.json\033[0m"
-    exit 1
-fi
-
 # 检查实例根目录中是否包含 node_modules（依赖已安装）
 if [ ! -d "$SCRIPT_DIR/node_modules" ]; then
     echo -e "\033[0;31m❌ 错误: 实例目录中未找到 node_modules\033[0m"
@@ -430,6 +412,10 @@ export OPENCLAW_STATE_DIR="$SCRIPT_DIR/state"
 # 设置 NODE_PATH 以使用实例根目录下的 node_modules
 export NODE_PATH="$SCRIPT_DIR/node_modules:$NODE_PATH"
 
+# 定义可执行文件路径：使用实例根目录中的 dist 代码
+DIST_DIR="$SCRIPT_DIR/dist"
+OPENCLAW_EXEC="node $DIST_DIR/dist/index.js"
+
 # 从配置中提取 workspace 路径并导出
 if [ -f "$OPENCLAW_CONFIG_PATH" ]; then
     export OPENCLAW_WORKSPACE=$(node -e "
@@ -459,9 +445,6 @@ EOP
     fi
 fi
 
-# 定义可执行文件路径：使用 dist 目录中的代码
-OPENCLAW_EXEC="node $DIST_DIR/dist/index.js"
-
 # 验证可执行文件是否存在
 if [ ! -f "$DIST_DIR/dist/index.js" ]; then
     echo -e "\033[0;31m❌ 错误: 未找到可执行文件 $DIST_DIR/dist/index.js\033[0m"

package/dist/register.configure-CPWCrXrC.js

@@ -1,87 +0,0 @@
-import "./paths-tuenh9TL.js";
-import { A as theme, p as defaultRuntime } from "./subsystem-G54saDcg.js";
-import "./utils-B8zCe27d.js";
-import "./reply-Cf5Mm7vB.js";
-import "./agent-scope-DmTcOjk4.js";
-import "./openclaw-root-B5jXk2td.js";
-import "./logger-BohkHL0S.js";
-import "./exec-CNtAq7Md.js";
-import "./github-copilot-token-Ff890Vmh.js";
-import "./boolean-B938tROv.js";
-import "./env-CQxWwTMn.js";
-import "./env-overrides-BYyMsIvB.js";
-import "./registry-aHEgjCIQ.js";
-import "./skills-Jz-BSwRd.js";
-import "./frontmatter-BngyYhS0.js";
-import "./plugins-om7vnHk0.js";
-import "./query-expansion-BNb6Vys6.js";
-import "./redact-owRpqMhM.js";
-import "./path-alias-guards-BEqdGdn9.js";
-import "./fetch-CGW2R_wh.js";
-import "./errors-DNKaAVHN.js";
-import "./cmd-argv-BdNFwuhe.js";
-import "./restart-stale-pids-ZfbSMILU.js";
-import "./delivery-queue-B7zSt4zY.js";
-import "./paths-CfmKJcO5.js";
-import "./session-cost-usage-C2jrTKxW.js";
-import "./prompt-style-DlcWUCNR.js";
-import { t as formatDocsLink } from "./links-BpKafJs4.js";
-import { n as runCommandWithRuntime } from "./cli-utils-BSURvrmb.js";
-import "./channel-web-D7txUcfH.js";
-import "./send-CHZ7WuOb.js";
-import "./session-CXOhppV3.js";
-import "./login-BLC4Op_m.js";
-import "./runtime-guard-C4h47dl7.js";
-import "./skills-status-PMeXzDbC.js";
-import "./provider-env-vars-UMPrp98I.js";
-import "./note-DOFTT6QH.js";
-import "./clack-prompter-COY2Efgu.js";
-import "./enable-BSbXEyXD.js";
-import "./install-safe-path-BvwKN_9n.js";
-import "./npm-pack-install-DI_0G-Ju.js";
-import "./skill-scanner-BzjuMMKN.js";
-import "./installs-BC5ieRDB.js";
-import "./plugin-install-plan-q0pKUAmp.js";
-import "./onboard-channels-Dub92d1X.js";
-import "./auth-choice.apply-helpers-BFZ8hPRq.js";
-import "./issue-format-34LidjQQ.js";
-import "./daemon-install-plan.shared-BfFSRwqA.js";
-import "./gateway-install-token-C40ge2lh.js";
-import "./runtime-parse-l56zRsXX.js";
-import "./launchd-BLFV2ME0.js";
-import "./service-RXVSlLiU.js";
-import "./systemd-D47rkLi7.js";
-import "./widearea-dns-clEQGTnj.js";
-import "./bonjour-discovery-Cnl-PHZ4.js";
-import "./health-D_dD9-ET.js";
-import "./control-ui-assets-D5CuaZfV.js";
-import "./onboarding.secret-input-OwIXA7An.js";
-import "./skills-install-DFkV3GsC.js";
-import "./provider-auth-helpers-Dzq3SbTh.js";
-import "./logging-DPEdtuNl.js";
-import "./openai-codex-oauth-BUnBFHjs.js";
-import "./auth-token-CnWG4-cB.js";
-import "./oauth-tls-preflight-cdkLewAv.js";
-import "./provider-wizard-CRYUkbUG.js";
-import "./auth-choice-options-C_poWj2I.js";
-import "./auth-choice-prompt-Bjt463U7.js";
-import "./auth-choice-CuOI0DLZ.js";
-import "./auth-choice.preferred-provider-CzDq9Lvp.js";
-import "./model-picker-C5sQCeTo.js";
-import "./systemd-linger-DwmFZpci.js";
-import "./onboard-custom-iC39HaRY.js";
-import "./ipv4-CwqOzc5W.js";
-import "./health-format-DjMu3Zty.js";
-import "./onboard-remote-Cyc407f2.js";
-import "./onboard-skills-BqnqjDI3.js";
-import { configureCommandFromSectionsArg, t as CONFIGURE_WIZARD_SECTIONS } from "./configure--3s3LTcF.js";
-//#region src/cli/program/register.configure.ts
-function registerConfigureCommand(program) {
-	program.command("configure").description("Interactive setup wizard for credentials, channels, gateway, and agent defaults").addHelpText("after", () => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/configure", "docs.openclaw.ai/cli/configure")}\n`).option("--section <section>", `Configuration sections (repeatable). Options: ${CONFIGURE_WIZARD_SECTIONS.join(", ")}`, (value, previous) => [...previous, value], []).action(async (opts) => {
-		await runCommandWithRuntime(defaultRuntime, async () => {
-			await configureCommandFromSectionsArg(opts.section, defaultRuntime);
-		});
-	});
-}
-//#endregion
-export { registerConfigureCommand };