diff --git a/CHANGELOG.md b/CHANGELOG.md index 579c623bb..66eb87e64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 2026.1.11-3 + +### Fixes +- CLI: avoid top-level await warnings in the entrypoint on fresh installs. +- CLI: show a commit hash in the banner for npm installs (package.json gitHead fallback). + ## 2026.1.11-2 ### Fixes diff --git a/apps/android/app/build.gradle.kts b/apps/android/app/build.gradle.kts index 14e1e563a..49eeb8fc6 100644 --- a/apps/android/app/build.gradle.kts +++ b/apps/android/app/build.gradle.kts @@ -21,8 +21,8 @@ android { applicationId = "com.clawdbot.android" minSdk = 31 targetSdk = 36 - versionCode = 202601112 - versionName = "2026.1.11-2" + versionCode = 202601113 + versionName = "2026.1.11-3" } buildTypes { diff --git a/apps/ios/Sources/Info.plist b/apps/ios/Sources/Info.plist index 33aa35afd..8e3cb7f34 100644 --- a/apps/ios/Sources/Info.plist +++ b/apps/ios/Sources/Info.plist @@ -19,9 +19,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2026.1.11-2 + 2026.1.11-3 CFBundleVersion - 202601112 + 202601113 NSAppTransportSecurity NSAllowsArbitraryLoadsInWebContent diff --git a/apps/ios/Tests/Info.plist b/apps/ios/Tests/Info.plist index b6aa2acf4..63aad9d63 100644 --- a/apps/ios/Tests/Info.plist +++ b/apps/ios/Tests/Info.plist @@ -17,8 +17,8 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 2026.1.11-2 + 2026.1.11-3 CFBundleVersion - 202601112 + 202601113 diff --git a/apps/macos/Sources/Clawdbot/Resources/Info.plist b/apps/macos/Sources/Clawdbot/Resources/Info.plist index f1e8ae32c..eab3c550e 100644 --- a/apps/macos/Sources/Clawdbot/Resources/Info.plist +++ b/apps/macos/Sources/Clawdbot/Resources/Info.plist @@ -15,9 +15,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2026.1.11-2 + 2026.1.11-3 CFBundleVersion - 202601112 + 202601113 CFBundleIconFile Clawdbot CFBundleURLTypes diff --git a/docs/platforms/mac/release.md b/docs/platforms/mac/release.md index 52d98fd3b..f1dd183d4 100644 --- a/docs/platforms/mac/release.md +++ b/docs/platforms/mac/release.md @@ -29,17 +29,17 @@ Notes: # From repo root; set release IDs so Sparkle feed is enabled. # APP_BUILD must be numeric + monotonic for Sparkle compare. BUNDLE_ID=com.clawdbot.mac \ -APP_VERSION=2026.1.11-2 \ +APP_VERSION=2026.1.11-3 \ APP_BUILD="$(git rev-list --count HEAD)" \ BUILD_CONFIG=release \ SIGN_IDENTITY="Developer ID Application: Peter Steinberger (Y5PE65HELJ)" \ scripts/package-mac-app.sh # Zip for distribution (includes resource forks for Sparkle delta support) -ditto -c -k --sequesterRsrc --keepParent dist/Clawdbot.app dist/Clawdbot-2026.1.11-2.zip +ditto -c -k --sequesterRsrc --keepParent dist/Clawdbot.app dist/Clawdbot-2026.1.11-3.zip # Optional: also build a styled DMG for humans (drag to /Applications) -scripts/create-dmg.sh dist/Clawdbot.app dist/Clawdbot-2026.1.11-2.dmg +scripts/create-dmg.sh dist/Clawdbot.app dist/Clawdbot-2026.1.11-3.dmg # Recommended: build + notarize/staple zip + DMG # First, create a keychain profile once: @@ -47,26 +47,26 @@ scripts/create-dmg.sh dist/Clawdbot.app dist/Clawdbot-2026.1.11-2.dmg # --apple-id "" --team-id "" --password "" NOTARIZE=1 NOTARYTOOL_PROFILE=clawdbot-notary \ BUNDLE_ID=com.clawdbot.mac \ -APP_VERSION=2026.1.11-2 \ +APP_VERSION=2026.1.11-3 \ APP_BUILD="$(git rev-list --count HEAD)" \ BUILD_CONFIG=release \ SIGN_IDENTITY="Developer ID Application: Peter Steinberger (Y5PE65HELJ)" \ scripts/package-mac-dist.sh # Optional: ship dSYM alongside the release -ditto -c -k --keepParent apps/macos/.build/release/Clawdbot.app.dSYM dist/Clawdbot-2026.1.11-2.dSYM.zip +ditto -c -k --keepParent apps/macos/.build/release/Clawdbot.app.dSYM dist/Clawdbot-2026.1.11-3.dSYM.zip ``` ## Appcast entry Use the release note generator so Sparkle renders formatted HTML notes: ```bash -SPARKLE_PRIVATE_KEY_FILE=/Users/steipete/Library/CloudStorage/Dropbox/Backup/Sparkle/ed25519-private-key scripts/make_appcast.sh dist/Clawdbot-2026.1.11-2.zip https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml +SPARKLE_PRIVATE_KEY_FILE=/Users/steipete/Library/CloudStorage/Dropbox/Backup/Sparkle/ed25519-private-key scripts/make_appcast.sh dist/Clawdbot-2026.1.11-3.zip https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml ``` Generates HTML release notes from `CHANGELOG.md` (via [`scripts/changelog-to-html.sh`](https://github.com/clawdbot/clawdbot/blob/main/scripts/changelog-to-html.sh)) and embeds them in the appcast entry. Commit the updated `appcast.xml` alongside the release assets (zip + dSYM) when publishing. ## Publish & verify -- Upload `Clawdbot-2026.1.11-2.zip` (and `Clawdbot-2026.1.11-2.dSYM.zip`) to the GitHub release for tag `v2026.1.11-2`. +- Upload `Clawdbot-2026.1.11-3.zip` (and `Clawdbot-2026.1.11-3.dSYM.zip`) to the GitHub release for tag `v2026.1.11-3`. - Ensure the raw appcast URL matches the baked feed: `https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml`. - Sanity checks: - `curl -I https://raw.githubusercontent.com/clawdbot/clawdbot/main/appcast.xml` returns 200. diff --git a/package.json b/package.json index 3c9fee8d7..6d6638dec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "clawdbot", - "version": "2026.1.11-2", + "version": "2026.1.11-3", "description": "WhatsApp gateway CLI (Baileys web) with Pi RPC agent", "type": "module", "main": "dist/index.js", diff --git a/src/entry.ts b/src/entry.ts index fd44bd5bd..50953fa18 100644 --- a/src/entry.ts +++ b/src/entry.ts @@ -21,5 +21,12 @@ if (parsed.profile) { process.argv = parsed.argv; } -const { runCli } = await import("./cli/run-main.js"); -await runCli(process.argv); +import("./cli/run-main.js") + .then(({ runCli }) => runCli(process.argv)) + .catch((error) => { + console.error( + "[clawdbot] Failed to start CLI:", + error instanceof Error ? error.stack ?? error.message : error, + ); + process.exitCode = 1; + }); diff --git a/src/infra/git-commit.ts b/src/infra/git-commit.ts index 435c702ed..10032841b 100644 --- a/src/infra/git-commit.ts +++ b/src/infra/git-commit.ts @@ -1,5 +1,6 @@ import fs from "node:fs"; import path from "node:path"; +import { createRequire } from "node:module"; const formatCommit = (value?: string | null) => { if (!value) return null; @@ -37,6 +38,19 @@ const resolveGitHead = (startDir: string) => { let cachedCommit: string | null | undefined; +const readCommitFromPackageJson = () => { + try { + const require = createRequire(import.meta.url); + const pkg = require("../package.json") as { + gitHead?: string; + githead?: string; + }; + return formatCommit(pkg.gitHead ?? pkg.githead ?? null); + } catch { + return null; + } +}; + export const resolveCommitHash = ( options: { cwd?: string; env?: NodeJS.ProcessEnv } = {}, ) => { @@ -48,6 +62,11 @@ export const resolveCommitHash = ( cachedCommit = normalized; return cachedCommit; } + const pkgCommit = readCommitFromPackageJson(); + if (pkgCommit) { + cachedCommit = pkgCommit; + return cachedCommit; + } try { const headPath = resolveGitHead(options.cwd ?? process.cwd()); if (!headPath) {