Skip to content

Commit 8ea41d6

Browse files
xu75claude
andcommitted
docs: add local-patches tracking for upstream divergence
Records which commits are local customizations (feishu QR bind) vs PR'd upstream (admin hint zts212653#308), with sync rebase checklist. [宪宪/Opus-46🐾] Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 80824d6 commit 8ea41d6

1 file changed

Lines changed: 63 additions & 0 deletions

File tree

docs/local-patches.md

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
---
2+
doc_kind: tracking
3+
created: 2026-03-30
4+
---
5+
6+
# Local Patches (upstream divergence tracking)
7+
8+
Tracks commits that are **local customizations** not intended for upstream.
9+
During `sync` from upstream, these need to be rebased or re-applied.
10+
11+
## Active Patches
12+
13+
### Feishu QR Code Bind Flow
14+
15+
> **Status**: active | **Since**: 2026-03-29 | **Branch**: feat/feishu-qr-bind
16+
17+
飞书扫码绑定 connector 的完整流程,Clowder 特有业务功能。
18+
19+
**Commits** (oldest first):
20+
| Commit | Description |
21+
|--------|-------------|
22+
| `d85f0fb` | feat(connector): support feishu qr bind flow in hub |
23+
| `2beb523` | fix(ci): format HubConnectorConfigTab for biome |
24+
| `321e8c7` | fix(review): tighten connector save hint and stabilize feishu qr polling |
25+
| `09391f9` | fix(test): isolate env vars in Feishu QR credential-persist test |
26+
27+
**Files touched** (conflict risk during sync):
28+
- `packages/api/src/routes/connector-hub.ts` — 215 lines added (new routes)
29+
- `packages/web/src/components/HubConnectorConfigTab.tsx` — import + render changes
30+
- `packages/web/src/components/FeishuQrPanel.tsx` — new file
31+
- `packages/api/test/connector-hub-route.test.js` — new test
32+
- `packages/web/src/components/__tests__/feishu-qr-panel.test.tsx` — new test
33+
- `packages/web/src/components/__tests__/hub-connector-config-tab.test.tsx` — new test
34+
35+
### Connector Admin Hint
36+
37+
> **Status**: PR'd upstream (zts212653/clowder-ai#308) | **Since**: 2026-03-30
38+
39+
管理员权限报错时显示 open_id hint。
40+
41+
**Commits**:
42+
| Commit | Description |
43+
|--------|-------------|
44+
| `80824d6` | fix(connector): show open_id hint when non-admin uses permission commands |
45+
46+
**Files touched**:
47+
- `packages/api/src/infrastructure/connectors/ConnectorCommandLayer.ts`
48+
49+
**Action**: upstream 合并后,下次 sync 自动消除。可在 sync 后从此文档移除。
50+
51+
## Resolved Patches
52+
53+
_None yet._
54+
55+
---
56+
57+
## Sync Checklist
58+
59+
每次从上游 sync 后:
60+
1. `git rebase` active patches onto new sync commit
61+
2. 解决冲突时参照上面的 files-touched 列表
62+
3. 检查 PR'd 的 patch 是否已被上游合并 → 移到 Resolved
63+
4.`pnpm check && pnpm lint && pnpm test` 确认无回归

0 commit comments

Comments
 (0)