Merge remote-tracking branch 'origin/master' into hermes/wechat

# Conflicts:
#	.hermes/shared-memory/pitfalls.md
#	.hermes/todos/【后端架构】api-server能力模块化与图片资产Adapter收口计划-2026-05-14.md
This commit is contained in:
2026-05-15 01:28:04 +08:00
266 changed files with 23417 additions and 4373 deletions

View File

@@ -106,6 +106,11 @@ NODE
resolve_dev_stack_ports() {
local key
local value
local spacetime_port_args=()
if [[ "${SKIP_SPACETIME}" -ne 1 ]]; then
spacetime_port_args+=("spacetime:${SPACETIME_HOST}:${SPACETIME_PORT}")
fi
while IFS='=' read -r key value; do
case "${key}" in
@@ -115,7 +120,7 @@ resolve_dev_stack_ports() {
esac
done < <(
node "${REPO_ROOT}/scripts/dev-stack-port-utils.mjs" resolve-dev-stack \
"spacetime:${SPACETIME_HOST}:${SPACETIME_PORT}" \
"${spacetime_port_args[@]}" \
"api:${API_TARGET_HOST}:${API_PORT}" \
"web:${WEB_HOST}:${WEB_PORT}" \
"adminWeb:${ADMIN_WEB_TARGET_HOST}:${ADMIN_WEB_PORT}"