diff --git a/CHANGELOG.md b/CHANGELOG.md index 66eb87e64..8b89198c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 2026.1.11-4 + +### Fixes +- CLI: read the git commit hash from the package root so npm installs show it. + ## 2026.1.11-3 ### Fixes diff --git a/apps/android/app/build.gradle.kts b/apps/android/app/build.gradle.kts index 49eeb8fc6..99b517e3c 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 = 202601113 - versionName = "2026.1.11-3" + versionCode = 202601114 + versionName = "2026.1.11-4" } buildTypes { diff --git a/apps/ios/Sources/Info.plist b/apps/ios/Sources/Info.plist index 8e3cb7f34..a75e27741 100644 --- a/apps/ios/Sources/Info.plist +++ b/apps/ios/Sources/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2026.1.11-3 + 2026.1.11-4 CFBundleVersion 202601113 NSAppTransportSecurity diff --git a/apps/ios/Tests/Info.plist b/apps/ios/Tests/Info.plist index 63aad9d63..0213b646b 100644 --- a/apps/ios/Tests/Info.plist +++ b/apps/ios/Tests/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 2026.1.11-3 + 2026.1.11-4 CFBundleVersion 202601113 diff --git a/apps/macos/Sources/Clawdbot/Resources/Info.plist b/apps/macos/Sources/Clawdbot/Resources/Info.plist index eab3c550e..77501e4d1 100644 --- a/apps/macos/Sources/Clawdbot/Resources/Info.plist +++ b/apps/macos/Sources/Clawdbot/Resources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2026.1.11-3 + 2026.1.11-4 CFBundleVersion 202601113 CFBundleIconFile diff --git a/docs/platforms/mac/release.md b/docs/platforms/mac/release.md index f1dd183d4..0380a17df 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-3 \ +APP_VERSION=2026.1.11-4 \ 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-3.zip +ditto -c -k --sequesterRsrc --keepParent dist/Clawdbot.app dist/Clawdbot-2026.1.11-4.zip # Optional: also build a styled DMG for humans (drag to /Applications) -scripts/create-dmg.sh dist/Clawdbot.app dist/Clawdbot-2026.1.11-3.dmg +scripts/create-dmg.sh dist/Clawdbot.app dist/Clawdbot-2026.1.11-4.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-3.dmg # --apple-id "" --team-id "" --password "" NOTARIZE=1 NOTARYTOOL_PROFILE=clawdbot-notary \ BUNDLE_ID=com.clawdbot.mac \ -APP_VERSION=2026.1.11-3 \ +APP_VERSION=2026.1.11-4 \ 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-3.dSYM.zip +ditto -c -k --keepParent apps/macos/.build/release/Clawdbot.app.dSYM dist/Clawdbot-2026.1.11-4.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-3.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-4.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-3.zip` (and `Clawdbot-2026.1.11-3.dSYM.zip`) to the GitHub release for tag `v2026.1.11-3`. +- Upload `Clawdbot-2026.1.11-4.zip` (and `Clawdbot-2026.1.11-4.dSYM.zip`) to the GitHub release for tag `v2026.1.11-4`. - 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 6d6638dec..663f1f36b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "clawdbot", - "version": "2026.1.11-3", + "version": "2026.1.11-4", "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 50953fa18..97692756d 100644 --- a/src/entry.ts +++ b/src/entry.ts @@ -26,7 +26,7 @@ import("./cli/run-main.js") .catch((error) => { console.error( "[clawdbot] Failed to start CLI:", - error instanceof Error ? error.stack ?? error.message : error, + 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 10032841b..4fea5fc5b 100644 --- a/src/infra/git-commit.ts +++ b/src/infra/git-commit.ts @@ -1,6 +1,6 @@ import fs from "node:fs"; -import path from "node:path"; import { createRequire } from "node:module"; +import path from "node:path"; const formatCommit = (value?: string | null) => { if (!value) return null; @@ -41,7 +41,7 @@ let cachedCommit: string | null | undefined; const readCommitFromPackageJson = () => { try { const require = createRequire(import.meta.url); - const pkg = require("../package.json") as { + const pkg = require("../../package.json") as { gitHead?: string; githead?: string; };