From 84ed61ac97518675db4958aa40610ccfcfb14488 Mon Sep 17 00:00:00 2001 From: lanrtop Date: Sat, 4 Jul 2026 21:05:13 +0900 Subject: [PATCH] chore(release): bump version to 0.1.19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit docs(git-workflow): 分支策略升级为复杂度感知模型 v1.3.0(单文件小改直推主分支,功能性改动开 feat/* + PR) --- docs/ai-context/git-workflow.md | 21 ++++++++++++--------- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/docs/ai-context/git-workflow.md b/docs/ai-context/git-workflow.md index 56b421c..13754ef 100644 --- a/docs/ai-context/git-workflow.md +++ b/docs/ai-context/git-workflow.md @@ -3,19 +3,22 @@ > 把此文件粘贴给任何 AI Agent,让它了解本项目的 git 工作方式。由炼境接入包分发。 > `ONBOARDING_MANAGED` 标记块由炼境版本化管理(重跑接入包可原位升级),块外可自由补充项目特有约定。 - + -## 分支策略 +## 分支策略(复杂度感知) ``` -dev ← 日常开发在这里 commit/push - ↓ -main ← 稳定分支,通过 PR 合入(合入时触发 CI code review) +main/master ← 主分支,保持稳定 + ↑ + ├── 简单改动 → 直接 push main/master + └── 功能性改动 → feat/ 分支 → PR → main/master ``` -- 小改动可直接 push `dev` -- 功能完整后开 PR(dev → main) -- 不要直接 push `main`,除非紧急热修复 +**简单改动(直接推主分支)**:bug fix、chore、docs、style、单文件小改,行为对外无变化。 + +**功能性改动(开 feat/* 分支 + PR)**:新功能、重构、涉及多模块的 refactor。由 agent 根据改动文件数和性质自判,无需蓝图标签。 + +分支命名:`feat/<功能简述>`,如 `feat/login-sms`、`feat/order-pagination`。 ## Commit 规范(lefthook 强制) @@ -81,7 +84,7 @@ PR 别攒太大(建议每 3~5 个 commit 或几百行内就开一次),否 ``` 1. Read .claude/liangjing.json → 取出 project_id 2. 调用 MCP 工具 create_pull_request: - { "project_id": "", "head": "dev", "base": "main", + { "project_id": "", "head": "feat/", "base": "main", "title": "", "body": "<变更摘要>" } 3. 炼境内部用存储的 Gitea 凭证调 API,返回 pr_url ``` diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index beb0f27..9c98071 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dev-manager-tauri" -version = "0.1.18" +version = "0.1.19" description = "A Tauri App" authors = ["you"] edition = "2021" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index c8a475d..32aa107 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "dev-manager-tauri", - "version": "0.1.18", + "version": "0.1.19", "identifier": "com.yangzhixiang.dev-manager-tauri", "build": { "beforeDevCommand": "pnpm dev",