diff --git a/.github/workflows/install-smoke.yml b/.github/workflows/install-smoke.yml index 16eba4eed..0347c7810 100644 --- a/.github/workflows/install-smoke.yml +++ b/.github/workflows/install-smoke.yml @@ -37,5 +37,5 @@ jobs: CLAWDBOT_NO_ONBOARD: "1" CLAWDBOT_INSTALL_SMOKE_SKIP_CLI: "1" CLAWDBOT_INSTALL_SMOKE_SKIP_NONROOT: ${{ github.event_name == 'pull_request' && '1' || '0' }} - CLAWDBOT_INSTALL_SMOKE_PREVIOUS: "2026.1.11-4" + CLAWDBOT_INSTALL_SMOKE_SKIP_PREVIOUS: "1" run: pnpm test:install:smoke diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 82f0a96e2..4f35c2612 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -314,17 +314,17 @@ importers: specifier: ^10.5.0 version: 10.5.0 devDependencies: - clawdbot: + moltbot: specifier: workspace:* - version: link:../../packages/clawdbot + version: link:../.. extensions/imessage: {} extensions/line: devDependencies: - clawdbot: + moltbot: specifier: workspace:* - version: link:../../packages/clawdbot + version: link:../.. extensions/llm-task: {} @@ -348,17 +348,17 @@ importers: specifier: ^4.3.6 version: 4.3.6 devDependencies: - clawdbot: + moltbot: specifier: workspace:* - version: link:../../packages/clawdbot + version: link:../.. extensions/mattermost: {} extensions/memory-core: dependencies: - clawdbot: - specifier: '>=2026.1.24-3' - version: 2026.1.24-3(@types/express@5.0.6)(audio-decode@2.2.3)(devtools-protocol@0.0.1561482)(typescript@5.9.3) + moltbot: + specifier: '>=2026.1.26' + version: link:../.. extensions/memory-lancedb: dependencies: @@ -383,9 +383,9 @@ importers: '@microsoft/agents-hosting-extensions-teams': specifier: ^1.2.2 version: 1.2.2 - clawdbot: + moltbot: specifier: workspace:* - version: link:../../packages/clawdbot + version: link:../.. express: specifier: ^5.2.1 version: 5.2.1 @@ -397,9 +397,9 @@ importers: extensions/nostr: dependencies: - clawdbot: + moltbot: specifier: workspace:* - version: link:../../packages/clawdbot + version: link:../.. nostr-tools: specifier: ^2.20.0 version: 2.20.0(typescript@5.9.3) @@ -439,9 +439,9 @@ importers: specifier: ^4.3.5 version: 4.3.6 devDependencies: - clawdbot: + moltbot: specifier: workspace:* - version: link:../../packages/clawdbot + version: link:../.. extensions/voice-call: dependencies: @@ -459,9 +459,9 @@ importers: extensions/zalo: dependencies: - clawdbot: + moltbot: specifier: workspace:* - version: link:../../packages/clawdbot + version: link:../.. undici: specifier: 7.19.0 version: 7.19.0 @@ -471,9 +471,9 @@ importers: '@sinclair/typebox': specifier: 0.34.47 version: 0.34.47 - clawdbot: + moltbot: specifier: workspace:* - version: link:../../packages/clawdbot + version: link:../.. packages/clawdbot: dependencies: diff --git a/scripts/bundle-a2ui.sh b/scripts/bundle-a2ui.sh index a1cf7ff2b..304002324 100755 --- a/scripts/bundle-a2ui.sh +++ b/scripts/bundle-a2ui.sh @@ -10,12 +10,21 @@ trap on_error ERR ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" HASH_FILE="$ROOT_DIR/src/canvas-host/a2ui/.bundle.hash" OUTPUT_FILE="$ROOT_DIR/src/canvas-host/a2ui/a2ui.bundle.js" +A2UI_RENDERER_DIR="$ROOT_DIR/vendor/a2ui/renderers/lit" +A2UI_APP_DIR="$ROOT_DIR/apps/shared/ClawdbotKit/Tools/CanvasA2UI" + +# Docker builds exclude vendor/apps via .dockerignore. +# In that environment we must keep the prebuilt bundle. +if [[ ! -d "$A2UI_RENDERER_DIR" || ! -d "$A2UI_APP_DIR" ]]; then + echo "A2UI sources missing; keeping prebuilt bundle." + exit 0 +fi INPUT_PATHS=( "$ROOT_DIR/package.json" "$ROOT_DIR/pnpm-lock.yaml" - "$ROOT_DIR/vendor/a2ui/renderers/lit" - "$ROOT_DIR/apps/shared/ClawdbotKit/Tools/CanvasA2UI" + "$A2UI_RENDERER_DIR" + "$A2UI_APP_DIR" ) collect_files() { @@ -46,7 +55,7 @@ if [[ -f "$HASH_FILE" ]]; then fi fi -pnpm -s exec tsc -p vendor/a2ui/renderers/lit/tsconfig.json -rolldown -c apps/shared/ClawdbotKit/Tools/CanvasA2UI/rolldown.config.mjs +pnpm -s exec tsc -p "$A2UI_RENDERER_DIR/tsconfig.json" +rolldown -c "$A2UI_APP_DIR/rolldown.config.mjs" echo "$current_hash" > "$HASH_FILE" diff --git a/scripts/docker/install-sh-nonroot/run.sh b/scripts/docker/install-sh-nonroot/run.sh index a689498e0..58a8fc3e7 100644 --- a/scripts/docker/install-sh-nonroot/run.sh +++ b/scripts/docker/install-sh-nonroot/run.sh @@ -2,6 +2,16 @@ set -euo pipefail INSTALL_URL="${CLAWDBOT_INSTALL_URL:-https://molt.bot/install.sh}" +DEFAULT_PACKAGE="moltbot" +if [[ -z "${CLAWDBOT_INSTALL_PACKAGE:-}" && "$INSTALL_URL" == *"clawd.bot"* ]]; then + DEFAULT_PACKAGE="clawdbot" +fi +PACKAGE_NAME="${CLAWDBOT_INSTALL_PACKAGE:-$DEFAULT_PACKAGE}" +if [[ "$PACKAGE_NAME" == "moltbot" ]]; then + ALT_PACKAGE_NAME="clawdbot" +else + ALT_PACKAGE_NAME="moltbot" +fi echo "==> Pre-flight: ensure git absent" if command -v git >/dev/null; then @@ -18,26 +28,39 @@ export PATH="$HOME/.npm-global/bin:$PATH" echo "==> Verify git installed" command -v git >/dev/null -echo "==> Verify moltbot installed" EXPECTED_VERSION="${CLAWDBOT_INSTALL_EXPECT_VERSION:-}" if [[ -n "$EXPECTED_VERSION" ]]; then LATEST_VERSION="$EXPECTED_VERSION" else - LATEST_VERSION="$(npm view moltbot version)" + LATEST_VERSION="$(npm view "$PACKAGE_NAME" version)" fi -CMD_PATH="$(command -v moltbot || true)" -if [[ -z "$CMD_PATH" && -x "$HOME/.npm-global/bin/moltbot" ]]; then - CMD_PATH="$HOME/.npm-global/bin/moltbot" +CLI_NAME="$PACKAGE_NAME" +CMD_PATH="$(command -v "$CLI_NAME" || true)" +if [[ -z "$CMD_PATH" ]]; then + CLI_NAME="$ALT_PACKAGE_NAME" + CMD_PATH="$(command -v "$CLI_NAME" || true)" +fi +if [[ -z "$CMD_PATH" && -x "$HOME/.npm-global/bin/$PACKAGE_NAME" ]]; then + CLI_NAME="$PACKAGE_NAME" + CMD_PATH="$HOME/.npm-global/bin/$PACKAGE_NAME" +fi +if [[ -z "$CMD_PATH" && -x "$HOME/.npm-global/bin/$ALT_PACKAGE_NAME" ]]; then + CLI_NAME="$ALT_PACKAGE_NAME" + CMD_PATH="$HOME/.npm-global/bin/$ALT_PACKAGE_NAME" fi if [[ -z "$CMD_PATH" ]]; then - echo "moltbot not on PATH" >&2 + echo "Neither $PACKAGE_NAME nor $ALT_PACKAGE_NAME is on PATH" >&2 exit 1 fi +if [[ -z "$EXPECTED_VERSION" && "$CLI_NAME" != "$PACKAGE_NAME" ]]; then + LATEST_VERSION="$(npm view "$CLI_NAME" version)" +fi +echo "==> Verify CLI installed: $CLI_NAME" INSTALLED_VERSION="$("$CMD_PATH" --version 2>/dev/null | head -n 1 | tr -d '\r')" -echo "installed=$INSTALLED_VERSION expected=$LATEST_VERSION" +echo "cli=$CLI_NAME installed=$INSTALLED_VERSION expected=$LATEST_VERSION" if [[ "$INSTALLED_VERSION" != "$LATEST_VERSION" ]]; then - echo "ERROR: expected moltbot@$LATEST_VERSION, got @$INSTALLED_VERSION" >&2 + echo "ERROR: expected ${CLI_NAME}@${LATEST_VERSION}, got ${CLI_NAME}@${INSTALLED_VERSION}" >&2 exit 1 fi diff --git a/scripts/docker/install-sh-smoke/run.sh b/scripts/docker/install-sh-smoke/run.sh index 9c8870b2b..09a597de8 100755 --- a/scripts/docker/install-sh-smoke/run.sh +++ b/scripts/docker/install-sh-smoke/run.sh @@ -4,15 +4,26 @@ set -euo pipefail INSTALL_URL="${CLAWDBOT_INSTALL_URL:-https://molt.bot/install.sh}" SMOKE_PREVIOUS_VERSION="${CLAWDBOT_INSTALL_SMOKE_PREVIOUS:-}" SKIP_PREVIOUS="${CLAWDBOT_INSTALL_SMOKE_SKIP_PREVIOUS:-0}" +DEFAULT_PACKAGE="moltbot" +if [[ -z "${CLAWDBOT_INSTALL_PACKAGE:-}" && "$INSTALL_URL" == *"clawd.bot"* ]]; then + DEFAULT_PACKAGE="clawdbot" +fi +PACKAGE_NAME="${CLAWDBOT_INSTALL_PACKAGE:-$DEFAULT_PACKAGE}" +if [[ "$PACKAGE_NAME" == "moltbot" ]]; then + ALT_PACKAGE_NAME="clawdbot" +else + ALT_PACKAGE_NAME="moltbot" +fi echo "==> Resolve npm versions" +LATEST_VERSION="$(npm view "$PACKAGE_NAME" version)" if [[ -n "$SMOKE_PREVIOUS_VERSION" ]]; then - LATEST_VERSION="$(npm view moltbot version)" PREVIOUS_VERSION="$SMOKE_PREVIOUS_VERSION" else - VERSIONS_JSON="$(npm view moltbot versions --json)" - versions_line="$(node - <<'NODE' + VERSIONS_JSON="$(npm view "$PACKAGE_NAME" versions --json)" + PREVIOUS_VERSION="$(VERSIONS_JSON="$VERSIONS_JSON" LATEST_VERSION="$LATEST_VERSION" node - <<'NODE' const raw = process.env.VERSIONS_JSON || "[]"; +const latest = process.env.LATEST_VERSION || ""; let versions; try { versions = JSON.parse(raw); @@ -25,41 +36,52 @@ if (!Array.isArray(versions)) { if (versions.length === 0) { process.exit(1); } -const latest = versions[versions.length - 1]; -const previous = versions.length >= 2 ? versions[versions.length - 2] : latest; -process.stdout.write(`${latest} ${previous}`); +const latestIndex = latest ? versions.lastIndexOf(latest) : -1; +if (latestIndex > 0) { + process.stdout.write(String(versions[latestIndex - 1])); + process.exit(0); +} +process.stdout.write(String(latest || versions[versions.length - 1])); NODE )" - LATEST_VERSION="${versions_line%% *}" - PREVIOUS_VERSION="${versions_line#* }" fi -if [[ -n "${CLAWDBOT_INSTALL_LATEST_OUT:-}" ]]; then - printf "%s" "$LATEST_VERSION" > "$CLAWDBOT_INSTALL_LATEST_OUT" -fi - -echo "latest=$LATEST_VERSION previous=$PREVIOUS_VERSION" +echo "package=$PACKAGE_NAME latest=$LATEST_VERSION previous=$PREVIOUS_VERSION" if [[ "$SKIP_PREVIOUS" == "1" ]]; then echo "==> Skip preinstall previous (CLAWDBOT_INSTALL_SMOKE_SKIP_PREVIOUS=1)" else echo "==> Preinstall previous (forces installer upgrade path)" - npm install -g "moltbot@${PREVIOUS_VERSION}" + npm install -g "${PACKAGE_NAME}@${PREVIOUS_VERSION}" fi echo "==> Run official installer one-liner" curl -fsSL "$INSTALL_URL" | bash echo "==> Verify installed version" -INSTALLED_VERSION="$(moltbot --version 2>/dev/null | head -n 1 | tr -d '\r')" -echo "installed=$INSTALLED_VERSION expected=$LATEST_VERSION" +CLI_NAME="$PACKAGE_NAME" +if ! command -v "$CLI_NAME" >/dev/null 2>&1; then + if command -v "$ALT_PACKAGE_NAME" >/dev/null 2>&1; then + CLI_NAME="$ALT_PACKAGE_NAME" + LATEST_VERSION="$(npm view "$CLI_NAME" version)" + echo "==> Detected alternate CLI: $CLI_NAME" + else + echo "ERROR: neither $PACKAGE_NAME nor $ALT_PACKAGE_NAME is on PATH" >&2 + exit 1 + fi +fi +if [[ -n "${CLAWDBOT_INSTALL_LATEST_OUT:-}" ]]; then + printf "%s" "$LATEST_VERSION" > "$CLAWDBOT_INSTALL_LATEST_OUT" +fi +INSTALLED_VERSION="$("$CLI_NAME" --version 2>/dev/null | head -n 1 | tr -d '\r')" +echo "cli=$CLI_NAME installed=$INSTALLED_VERSION expected=$LATEST_VERSION" if [[ "$INSTALLED_VERSION" != "$LATEST_VERSION" ]]; then - echo "ERROR: expected moltbot@$LATEST_VERSION, got moltbot@$INSTALLED_VERSION" >&2 + echo "ERROR: expected ${CLI_NAME}@${LATEST_VERSION}, got ${CLI_NAME}@${INSTALLED_VERSION}" >&2 exit 1 fi echo "==> Sanity: CLI runs" -moltbot --help >/dev/null +"$CLI_NAME" --help >/dev/null echo "OK"