Integration

.github/ISSUE_TEMPLATE/upstream-sync-conflict.md

@@ -0,0 +1,70 @@
+---
+name: Upstream Sync Conflict
+about: Automatically created when upstream sync encounters conflicts
+title: "[Upstream Sync] Merge conflict with {{ tag }}"
+labels: upstream-sync, needs-manual-review
+assignees: ""
+---
+
+## Upstream Sync Conflict Report
+
+**Trigger**: Upstream sync at {{ timestamp }}
+**Upstream Tag**: {{ tag }}
+**Upstream SHA**: {{ upstream_sha }}
+**Integration SHA**: {{ integration_sha }}
+
+### Conflicting Files
+
+{{ conflict_list }}
+
+### Recommended Actions
+
+1. Checkout integration branch locally
+2. Run: `git fetch origin && git merge origin/dev`
+3. Resolve conflicts manually
+4. Run validation:
+   ```bash
+   bun install
+   bun turbo typecheck
+   bun turbo test
+   ```
+5. Push resolved integration branch
+6. Close this issue
+
+### Resolution Strategies
+
+| File Pattern                    | Resolution Strategy                             |
+| ------------------------------- | ----------------------------------------------- |
+| `bun.lock`                      | Regenerate from merged manifest: `bun install`  |
+| `*.md` (docs)                   | Accept upstream: `git checkout --theirs <file>` |
+| `package.json`                  | Manual review required                          |
+| `.github/*` (workflow configs)  | Keep ours: `git checkout --ours <file>`         |
+| Shared code with custom changes | Manual review required                          |
+
+### Manual Sync Commands
+
+```bash
+git fetch origin
+git checkout integration
+git merge origin/dev
+
+# Resolve conflicts...
+
+bun install
+bun turbo typecheck
+bun turbo test
+bun turbo build
+
+git add .
+git commit -m "sync: resolve conflicts with {{ tag }}"
+git push origin integration
+```
+
+### Logs
+
+<details>
+<summary>Merge output</summary>
+
+{{ merge_output }}
+
+</details>

.github/last-synced-tag

@@ -0,0 +1 @@
+v1.0.110

.github/workflows/snapshot.yml

@@ -4,18 +4,21 @@ on:
   push:
     branches:
       - dev
-      - fix-snapshot-2
-      - v0
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}
 
+permissions:
+  contents: write
+  workflows: write
+
 jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
+          token: ${{ secrets.PAT_TOKEN }}
 
       - run: git fetch --force --tags
 
@@ -31,5 +34,5 @@ jobs:
         run: |
           ./script/publish.ts
         env:
-          GITHUB_TOKEN: ${{ secrets.SST_GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
           NPM_CONFIG_TOKEN: ${{ secrets.NPM_TOKEN }}