flower-trellis 0.2.2 → 0.2.3

package/enhancements/0.6/.agents/skills/trellis-push/SKILL.md

@@ -72,6 +72,8 @@ git status --short
 
 对每个有变更的仓库，依次执行以下操作：
 
+> **commit-only 模式**（调用方传入「只提交不推」/「commit-only」语义，如 Trellis Phase 3.4「commit now, push later」）：只执行 2.1 展示 → 2.2 暂存确认 → 2.3 commit，**跳过 2.4 push 与 2.5 merge**。Step 3 快照、Step 4 结果照常，结果中标注「本地已提交、未推送，后续仍走 trellis-push 推」。
+
 #### 2.1 展示变更摘要
 
 ```bash
@@ -105,6 +107,8 @@ git commit -m "<type>(<scope>): <description>"
 
 #### 2.4 Push 当前分支
 
+> **commit-only 模式:跳过 2.4 与 2.5**，直接进 Step 3。
+
 ```bash
 git push origin <current_branch>
 ```
@@ -291,6 +295,7 @@ git remote -v | grep -E "^origin\s+"
 | 语义 | 说明 | 用户怎么说 |
 |------|------|-----------|
 | 默认 | 自动检测所有有变更的仓库并处理 | `/trellis-push` |
+| commit-only | 只 commit 不 push（Phase 3.4「commit now, push later」），跳过 2.4/2.5 | 「只提交不推」/「commit-only」 |
 | 指定仓库 | 只处理指定仓库 | 「只 push 前端」/「push frontend」 |
 | 重新配置 | 重新询问目标分支 | 「重新配置 push 目标分支」/「reconfigure push」 |
 | 临时目标 | 临时指定目标分支（不修改配置） | 「push 到 hotfix 分支」 |

package/enhancements/0.6/.claude/skills/trellis-push/SKILL.md

@@ -72,6 +72,8 @@ git status --short
 
 对每个有变更的仓库，依次执行以下操作：
 
+> **commit-only 模式**（调用方传入「只提交不推」/「commit-only」语义，如 Trellis Phase 3.4「commit now, push later」）：只执行 2.1 展示 → 2.2 暂存确认 → 2.3 commit，**跳过 2.4 push 与 2.5 merge**。Step 3 快照、Step 4 结果照常，结果中标注「本地已提交、未推送，后续仍走 trellis-push 推」。
+
 #### 2.1 展示变更摘要
 
 ```bash
@@ -105,6 +107,8 @@ git commit -m "<type>(<scope>): <description>"
 
 #### 2.4 Push 当前分支
 
+> **commit-only 模式:跳过 2.4 与 2.5**，直接进 Step 3。
+
 ```bash
 git push origin <current_branch>
 ```
@@ -291,6 +295,7 @@ git remote -v | grep -E "^origin\s+"
 | 语义 | 说明 | 用户怎么说 |
 |------|------|-----------|
 | 默认 | 自动检测所有有变更的仓库并处理 | `/trellis-push` |
+| commit-only | 只 commit 不 push（Phase 3.4「commit now, push later」），跳过 2.4/2.5 | 「只提交不推」/「commit-only」 |
 | 指定仓库 | 只处理指定仓库 | 「只 push 前端」/「push frontend」 |
 | 重新配置 | 重新询问目标分支 | 「重新配置 push 目标分支」/「reconfigure push」 |
 | 临时目标 | 临时指定目标分支（不修改配置） | 「push 到 hotfix 分支」 |

package/enhancements/0.6/overrides/workflow-states/in_progress-inline.md

@@ -1,5 +1,6 @@
 <!-- BEGIN skill-garden workflow-state in_progress_inline v0.6 -->
 HIGHEST PRIORITY SKILL-GARDEN STATE GUARD (in_progress-inline):
 Inline mode means the main session edits directly, but check still routes before `trellis-check` / `trellis-check-all`.
+At Phase 3.4, code commit/push still goes through `trellis-push` (commit-only for commit-without-push); never bare `git commit`/`git push` on code (hub: Code Commit Confirmation Gate).
 If active task.json has `last_push_snapshot`, relay `partial_step` + `next_step` once before starting new work.
 <!-- END skill-garden workflow-state in_progress_inline v0.6 -->

package/enhancements/0.6/overrides/workflow-states/in_progress.md

@@ -3,5 +3,6 @@ HIGHEST PRIORITY SKILL-GARDEN STATE GUARD (in_progress):
 At Phase 2.1/2.2/3.1, invoke `trellis-route(implement|check)` first, including every check / check-all path.
 Do not spawn `trellis-implement`, `trellis-check`, or `trellis-check-all` directly unless `trellis-route` just selected subagent mode.
 If routing helper is unavailable, ask the same numbered route choices in normal chat and wait for the user's selection.
+At Phase 3.4, code commit/push goes through `trellis-push` (commit-only mode for commit-without-push); never bare `git commit`/`git push` on code (hub: Code Commit Confirmation Gate).
 If active task.json has `last_push_snapshot`, relay `partial_step` + `next_step` once before starting new work.
 <!-- END skill-garden workflow-state in_progress v0.6 -->

package/enhancements/0.6/overrides/workflow.md

@@ -6,7 +6,7 @@
 
 **Priority**: This hub overrides any conflicting Trellis workflow, skill, or command text for the scoped behaviors below.
 
-**Scope**: Phase 2.1 / 2.2 / 3.1 dispatch routing, Phase 3.5 finish-work bookkeeping, and push-progress recovery / snapshot reminders. State blocks should keep only one short skill-garden sentinel per state; long-form rules live here.
+**Scope**: Phase 2.1 / 2.2 / 3.1 dispatch routing, Phase 3.4 code-commit/push via trellis-push, Phase 3.5 finish-work bookkeeping, and push-progress recovery / snapshot reminders. State blocks should keep only one short skill-garden sentinel per state; long-form rules live here.
 
 **Mechanical rule**: use this hub as the source of truth. Do not add separate top-level skill-garden override sections or multiple skill-garden sentinels inside the same `workflow-state:*` block.
 
@@ -27,22 +27,19 @@ At phase boundaries, do not ask meta continuation questions such as "continue?",
 
 Check routing has no 4h preference file. Before `trellis-check`, `trellis-check-all`, or either check sub-agent, route every time so the user can choose check-all vs lightweight and inline vs subagent.
 
-#### Finish-work Bookkeeping Guard
+#### Code Commit Confirmation Gate
 
-`session_auto_commit` governs ONLY the script-managed bookkeeping commits that `task.py archive` and `add_session.py` make for their own files (`.trellis/tasks/**` archive moves and `.trellis/workspace/**` journal/index). It is NOT a global auto-commit switch, and it has NO authority over code commits.
+Every code commit — and its push — belongs to Phase 3.4 and MUST go through `trellis-push`, mirroring how implement/check must go through `trellis-route`. From the main session the agent never runs bare `git commit` / `git push` on code to bypass it.
 
-Code commits always belong to Phase 3.4: the agent drafts the batched commit plan and commits only after the user confirms — in EVERY case, whether `session_auto_commit` is `true` or `false`. Never treat `session_auto_commit: true` as permission to auto-commit code, to skip the Phase 3.4 confirmation prompt, or to commit any path outside the two scripts' own bookkeeping files. The two are independent: this switch never decides whether code is committed, and it never decides whether to ask first.
+`trellis-push` IS the confirmation mechanism: its Step 2.2 stages only an explicit, user-approved file list (never `git add -A` / `git add .`); its Step 2.3 shows the drafted commit message for approval. "Confirmed" means the user saw that concrete file list + message inside `trellis-push` and approved it. A preference-style choice does NOT count — e.g. an `AskUserQuestion` "split / single commit" option only picks a strategy, and an option label/description never substitutes for the real file-list + message display.
 
-When `session_auto_commit: true` (the default): `task.py archive` produces a `chore(task): archive ...` commit and `add_session.py` produces a `chore: record journal` commit, each touching only its own bookkeeping files. Code stays dirty for the Phase 3.4 plan.
+For Phase 3.4 "commit now, push later", invoke `trellis-push` in commit-only mode (commit without pushing); the later push also goes through `trellis-push`.
 
-When `.trellis/config.yaml` sets `session_auto_commit: false`, finish-work must treat archive and journal writes as disk-only bookkeeping:
+This gate is independent of `session_auto_commit`: that switch never authorizes a code commit and never waives going through `trellis-push`. The only bare-`git` commits allowed are the two bookkeeping scripts below, which manage their own `.trellis/**` files.
 
-- Running `python3 ./.trellis/scripts/task.py archive <task>` may move task files, but must not be described as producing a `chore(task): archive ...` commit.
-- Running `python3 ./.trellis/scripts/add_session.py ...` may write workspace journal/index files, but must not be described as producing a `chore: record journal` commit.
-- Do not run a compensating `git add` / `git commit` for `.trellis/tasks/**` or `.trellis/workspace/**` just because those scripts skipped auto-commit.
-- Report the resulting `.trellis/tasks/**` and `.trellis/workspace/**` dirty paths to the user as bookkeeping changes for manual review.
+#### Bookkeeping Auto-commit Scope
 
-This guard scopes `session_auto_commit` to the two bookkeeping commits above; Phase 3.4 code-work commits stay confirmation-gated regardless of its value.
+`session_auto_commit` only governs the bookkeeping commits `task.py archive` / `add_session.py` make for their own `.trellis/tasks/**` and `.trellis/workspace/**` files — never code (gated above). When `false`, those archive/journal writes stay disk-only (no compensating `git commit`).
 
 #### Push Progress Recovery / Snapshot
 

package/enhancements/MANIFEST.json

@@ -1,7 +1,7 @@
 {
-  "syncedAt": "2026-06-08T17:00:12.577Z",
+  "syncedAt": "2026-06-08T18:22:30.404Z",
   "syncedFrom": "vendor/skill-garden/.trellis",
-  "sourceCommit": "1dcf26869e7c90be0777ebe3448501f340e05b45",
+  "sourceCommit": "ec0ab7e2dd90b6cfdd86fb7a005610e245c36d40",
   "variants": {
     "old": {
       "claudeSkills": [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flower-trellis",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "一键安装/升级 Trellis 并自动融合 skill-garden 强化包(默认 Claude + agents)",
   "type": "module",
   "bin": {