Merge branch 'main' into skill/apple-container

This commit is contained in:
github-actions[bot]
2026-03-11 10:25:35 +00:00
11 changed files with 51 additions and 11 deletions

View File

@@ -39,7 +39,11 @@ git remote add discord https://github.com/qwibitai/nanoclaw-discord.git
```bash ```bash
git fetch discord main git fetch discord main
git merge discord/main git merge discord/main || {
git checkout --theirs package-lock.json
git add package-lock.json
git merge --continue
}
``` ```
This merges in: This merges in:

View File

@@ -40,7 +40,11 @@ git remote add gmail https://github.com/qwibitai/nanoclaw-gmail.git
```bash ```bash
git fetch gmail main git fetch gmail main
git merge gmail/main git merge gmail/main || {
git checkout --theirs package-lock.json
git add package-lock.json
git merge --continue
}
``` ```
This merges in: This merges in:

View File

@@ -32,7 +32,11 @@ git remote add whatsapp https://github.com/qwibitai/nanoclaw-whatsapp.git
```bash ```bash
git fetch whatsapp skill/image-vision git fetch whatsapp skill/image-vision
git merge whatsapp/skill/image-vision git merge whatsapp/skill/image-vision || {
git checkout --theirs package-lock.json
git add package-lock.json
git merge --continue
}
``` ```
This merges in: This merges in:

View File

@@ -30,7 +30,11 @@ git remote add whatsapp https://github.com/qwibitai/nanoclaw-whatsapp.git
```bash ```bash
git fetch whatsapp skill/pdf-reader git fetch whatsapp skill/pdf-reader
git merge whatsapp/skill/pdf-reader git merge whatsapp/skill/pdf-reader || {
git checkout --theirs package-lock.json
git add package-lock.json
git merge --continue
}
``` ```
This merges in: This merges in:

View File

@@ -37,7 +37,11 @@ git remote add whatsapp https://github.com/qwibitai/nanoclaw-whatsapp.git
```bash ```bash
git fetch whatsapp skill/reactions git fetch whatsapp skill/reactions
git merge whatsapp/skill/reactions git merge whatsapp/skill/reactions || {
git checkout --theirs package-lock.json
git add package-lock.json
git merge --continue
}
``` ```
This adds: This adds:

View File

@@ -35,7 +35,11 @@ git remote add slack https://github.com/qwibitai/nanoclaw-slack.git
```bash ```bash
git fetch slack main git fetch slack main
git merge slack/main git merge slack/main || {
git checkout --theirs package-lock.json
git add package-lock.json
git merge --continue
}
``` ```
This merges in: This merges in:

View File

@@ -39,7 +39,11 @@ git remote add telegram https://github.com/qwibitai/nanoclaw-telegram.git
```bash ```bash
git fetch telegram main git fetch telegram main
git merge telegram/main git merge telegram/main || {
git checkout --theirs package-lock.json
git add package-lock.json
git merge --continue
}
``` ```
This merges in: This merges in:

View File

@@ -41,7 +41,11 @@ git remote add whatsapp https://github.com/qwibitai/nanoclaw-whatsapp.git
```bash ```bash
git fetch whatsapp skill/voice-transcription git fetch whatsapp skill/voice-transcription
git merge whatsapp/skill/voice-transcription git merge whatsapp/skill/voice-transcription || {
git checkout --theirs package-lock.json
git add package-lock.json
git merge --continue
}
``` ```
This merges in: This merges in:

View File

@@ -62,7 +62,11 @@ git remote add whatsapp https://github.com/qwibitai/nanoclaw-whatsapp.git
```bash ```bash
git fetch whatsapp main git fetch whatsapp main
git merge whatsapp/main git merge whatsapp/main || {
git checkout --theirs package-lock.json
git add package-lock.json
git merge --continue
}
``` ```
This merges in: This merges in:

View File

@@ -75,7 +75,11 @@ git remote add whatsapp https://github.com/qwibitai/nanoclaw-whatsapp.git
```bash ```bash
git fetch whatsapp skill/local-whisper git fetch whatsapp skill/local-whisper
git merge whatsapp/skill/local-whisper git merge whatsapp/skill/local-whisper || {
git checkout --theirs package-lock.json
git add package-lock.json
git merge --continue
}
``` ```
This modifies `src/transcription.ts` to use the `whisper-cli` binary instead of the OpenAI API. This modifies `src/transcription.ts` to use the `whisper-cli` binary instead of the OpenAI API.

View File

@@ -57,7 +57,7 @@ systemctl --user restart nanoclaw
## Troubleshooting ## Troubleshooting
**WhatsApp not connecting after upgrade:** WhatsApp is now a separate channel fork, not bundled in core. Run `/add-whatsapp` (or `git remote add whatsapp https://github.com/qwibitai/nanoclaw-whatsapp.git && git fetch whatsapp main && git merge whatsapp/main && npm run build`) to install it. Existing auth credentials and groups are preserved. **WhatsApp not connecting after upgrade:** WhatsApp is now a separate channel fork, not bundled in core. Run `/add-whatsapp` (or `git remote add whatsapp https://github.com/qwibitai/nanoclaw-whatsapp.git && git fetch whatsapp main && (git merge whatsapp/main || { git checkout --theirs package-lock.json && git add package-lock.json && git merge --continue; }) && npm run build`) to install it. Existing auth credentials and groups are preserved.
## Container Build Cache ## Container Build Cache