feat: add voice message transcription support

.claude/skills/add-telegram/SKILL.md

@@ -32,7 +32,7 @@ git remote -v
 If `telegram` is missing, add it:
 
 ```bash
-git remote add telegram https://github.com/qwibitai/nanoclaw-telegram.git
+git remote add telegram https://github.com/kky/nanoclaw-telegram.git
 ```
 
 ### Merge the skill branch

.env.example

@@ -1 +1 @@
-
+TELEGRAM_BOT_TOKEN=

.github/workflows/merge-forward-skills.yml → .github/workflows/fork-sync-skills.yml

@@ -1,22 +1,40 @@
-name: Merge-forward skill branches
+name: Sync upstream & merge-forward skill branches
 
 on:
+  # Triggered by upstream repo via repository_dispatch
+  repository_dispatch:
+    types: [upstream-main-updated]
+  # Fallback: run on a schedule in case dispatch isn't configured
+  schedule:
+    - cron: '0 */6 * * *'  # every 6 hours
+  # Also run when fork's main is pushed directly
   push:
     branches: [main]
+  workflow_dispatch:
 
 permissions:
   contents: write
   issues: write
 
+concurrency:
+  group: fork-sync
+  cancel-in-progress: true
+
 jobs:
-  merge-forward:
-    if: github.repository == 'qwibitai/nanoclaw'
+  sync-and-merge:
+    if: github.repository != 'qwibitai/nanoclaw'
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ steps.app-token.outputs.token }}
 
       - uses: actions/setup-node@v4
         with:
@@ -28,9 +46,56 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
-      - name: Merge main into each skill branch
+      - name: Sync with upstream main
+        id: sync
+        run: |
+          # Add upstream remote
+          git remote add upstream https://github.com/qwibitai/nanoclaw.git
+          git fetch upstream main
+
+          # Check if upstream has new commits
+          if git merge-base --is-ancestor upstream/main HEAD; then
+            echo "Already up to date with upstream main."
+            echo "synced=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          # Merge upstream main into fork's main
+          if ! git merge upstream/main --no-edit; then
+            echo "::error::Failed to merge upstream/main into fork main — conflicts detected"
+            git merge --abort
+            echo "synced=false" >> "$GITHUB_OUTPUT"
+            echo "sync_failed=true" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          # Validate build
+          npm ci
+          if ! npm run build; then
+            echo "::error::Build failed after merging upstream/main"
+            git reset --hard "origin/main"
+            echo "synced=false" >> "$GITHUB_OUTPUT"
+            echo "sync_failed=true" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          if ! npm test 2>/dev/null; then
+            echo "::error::Tests failed after merging upstream/main"
+            git reset --hard "origin/main"
+            echo "synced=false" >> "$GITHUB_OUTPUT"
+            echo "sync_failed=true" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          git push origin main
+          echo "synced=true" >> "$GITHUB_OUTPUT"
+
+      - name: Merge main into skill branches
         id: merge
         run: |
+          # Re-fetch to pick up any changes pushed since job start
+          git fetch origin
+
           FAILED=""
           SUCCEEDED=""
 
@@ -47,10 +112,8 @@ jobs:
             echo ""
             echo "=== Processing $BRANCH ==="
 
-            # Checkout the skill branch
             git checkout -B "$BRANCH" "origin/$BRANCH"
 
-            # Attempt merge
             if ! git merge main --no-edit; then
               echo "::warning::Merge conflict in $BRANCH"
               git merge --abort
@@ -65,7 +128,6 @@ jobs:
               continue
             fi
 
-            # Install deps and validate
             npm ci
 
             if ! npm run build; then
@@ -82,7 +144,6 @@ jobs:
               continue
             fi
 
-            # Push the updated branch
             git push origin "$BRANCH"
             SUCCEEDED="$SUCCEEDED $SKILL_NAME"
             echo "$BRANCH merged and pushed successfully."
@@ -93,19 +154,43 @@ jobs:
           echo "Succeeded: $SUCCEEDED"
           echo "Failed: $FAILED"
 
-          # Export for issue creation
           echo "failed=$FAILED" >> "$GITHUB_OUTPUT"
           echo "succeeded=$SUCCEEDED" >> "$GITHUB_OUTPUT"
 
-      - name: Open issue for failed merges
+      - name: Open issue for upstream sync failure
+        if: steps.sync.outputs.sync_failed == 'true'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            await github.rest.issues.create({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              title: `Upstream sync failed — merge conflict or build failure`,
+              body: [
+                'The automated sync with `qwibitai/nanoclaw` main failed.',
+                '',
+                'This usually means upstream made changes that conflict with this fork\'s channel code.',
+                '',
+                'To resolve manually:',
+                '```bash',
+                'git fetch upstream main',
+                'git merge upstream/main',
+                '# resolve conflicts',
+                'npm run build && npm test',
+                'git push',
+                '```',
+              ].join('\n'),
+              labels: ['upstream-sync']
+            });
+
+      - name: Open issue for failed skill merges
         if: steps.merge.outputs.failed != ''
         uses: actions/github-script@v7
         with:
           script: |
             const failed = '${{ steps.merge.outputs.failed }}'.trim().split(/\s+/);
-            const sha = context.sha.substring(0, 7);
             const body = [
-              `The merge-forward workflow failed to merge \`main\` (${sha}) into the following skill branches:`,
+              `The merge-forward workflow failed to merge \`main\` into the following skill branches:`,
               '',
               ...failed.map(s => `- \`skill/${s}\`: merge conflict, build failure, or test failure`),
               '',
@@ -118,43 +203,12 @@ jobs:
                 ''
               ]).flat(),
               '```',
-              '',
-              `Triggered by push to main: ${context.sha}`
             ].join('\n');
 
             await github.rest.issues.create({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              title: `Merge-forward failed for ${failed.length} skill branch(es) after ${sha}`,
+              title: `Merge-forward failed for ${failed.length} skill branch(es)`,
               body,
               labels: ['skill-maintenance']
-            });
-
-      - name: Notify channel forks
-        if: always()
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.FORK_DISPATCH_TOKEN || secrets.GITHUB_TOKEN }}
-          script: |
-            const forks = [
-              'nanoclaw-whatsapp',
-              'nanoclaw-telegram',
-              'nanoclaw-discord',
-              'nanoclaw-slack',
-              'nanoclaw-gmail',
-              'nanoclaw-docker-sandboxes',
-            ];
-            const sha = context.sha.substring(0, 7);
-            for (const repo of forks) {
-              try {
-                await github.rest.repos.createDispatchEvent({
-                  owner: 'qwibitai',
-                  repo,
-                  event_type: 'upstream-main-updated',
-                  client_payload: { sha: context.sha },
-                });
-                console.log(`Notified ${repo}`);
-              } catch (e) {
-                console.log(`Failed to notify ${repo}: ${e.message}`);
-              }
-            }
+            });