feat(开发线): apply line-family spawn/merge/sync after preflight

When the user asked to spawn, merge, or sync, /dyro-line-family must
run the matching --yes command after preflight. Stay preflight-only
for a dry-run ask. Never invent --push.

Author: Dandre126

CHANGELOG.md

@@ -13,6 +13,16 @@
   `--no-config` stay required; pipx, pip, and uv-pip paths are unchanged.
   If you already installed with `uv tool install dyro==…`, run one last
   `uv tool install dyro==0.7.12 --force`. After that, `dyro update` works.
+- `/dyro-line-family` still preflights with unchanged doctor blocking-FAIL
+  rules (`status` dirty=0, `line list`, matching `--dry-run`). When the
+  user asked to spawn / merge / sync (slash or harness; the mutation is
+  the ask) and preflight passes, the agent must run the matching
+  `line spawn|merge|sync --yes` in the same turn. It still never invents
+  `--push` and must not git merge / switch by hand. Preflight-only
+  remains when the user asked only for preflight or dry-run, or ran
+  `dyro --dry-run line …` themselves. CLI `--dry-run` is unchanged. On
+  apply success, report what ran. On preflight fail, `User action` is
+  still only `doctor` or the failed dry-run.
 
 ## 0.7.11 - 2026-08-23
 

src/dyro/integrations/assets/dyro-line-family/SKILL.md

@@ -3,17 +3,20 @@ name: dyro-line-family
 description: >
   Preflight Dyro line-family ops: spawn a child line, merge a child into
   its direct parent, or sync the parent into the child. Use when the user
-  runs /dyro-line-family. Never execute the mutation.
+  runs /dyro-line-family. After preflight passes, apply the matching
+  `--yes` command in the same turn when the user asked to spawn, merge,
+  or sync. Stay preflight-only when they asked only for preflight or
+  dry-run.
 disable-model-invocation: true
 user-invocable: true
 argument-hint: "[workspace-alias] spawn <parent> <child> | merge <child> --into <parent> | sync <child>"
 metadata:
-  short-description: "预检子线派生 / 合入父线 / 从父线同步；不要执行"
+  short-description: "预检后、在用户请求突变时执行子线派生 / 合入父线 / 从父线同步"
 ---
 
 # Dyro 开发线家族
 
-只做预检。这不是第一方自动座位，也不是 `task merge`。
+先预检，再按用户是否请求突变决定是否执行。这不是第一方自动座位，也不是 `task merge`。
 
 `line spawn` / `line merge` / `line sync` 只处理 **一层父线**：
 - `spawn`：从已有父线派生子开发线（不是任务）
@@ -30,14 +33,19 @@ If the user means **done task branch → owning line**, stop and point at `/dyro
 
 Do not run any of:
 
-- `dyro line spawn` / `line merge` / `line sync` with `--yes`
 - `git merge` / `git switch` / `git checkout`
 - `task merge`, `task signoff`, `task gates`, `task review`, `task run`
 - `objective apply`, `dispatch`, `console`, push, publish
 - `line create` / hotfix or Change Set creation
 - `line post` / `line inbox` / `line ack`
 
-Do not invent `--yes` or `--push`. Do not add `--push`.
+Do not invent `--push`. Do not add `--push`.
+Forbid `--yes` only when the user did not ask for the mutation, asked
+only for preflight or dry-run, or they themselves ran
+`dyro --dry-run line …`. CLI `--dry-run` is unchanged.
+After successful preflight for an explicit spawn / merge / sync ask
+(the mutation is the ask), running the matching
+`line spawn|merge|sync --yes` in the same turn is required, not optional.
 This slash does not send family signals and must not call `line post`, `inbox`, or `ack`.
 Default is no push; `policy.allow_push` is not permission to invent it.
 Do not restore a drifted line branch. Do not add `--include-paths`.
@@ -72,10 +80,27 @@ dyro --workspace <alias> --dry-run line merge <child> --into <parent>
 dyro --workspace <alias> --dry-run line sync <child>
 ```
 
-Run only the `--dry-run` that matches the requested verb. If the user supplied `--repos` on `spawn`, repeat that same `--repos` on the dry-run.
-Never pass `--yes` to `line spawn`, `line merge`, or `line sync`.
+Run only the `--dry-run` that matches the requested verb. If the user supplied `--repos` on `spawn`, repeat that same `--repos` on the dry-run and, when applying, on the live command.
 Prefer JSON when the command accepts `--format json`. One JSON document only; `kind=error` is blocked evidence.
 
+## Apply
+
+When this slash or harness turn is an explicit spawn / merge / sync ask
+and every preflight step passed, run exactly one matching command in
+the same turn:
+
+```bash
+dyro --workspace <alias> line spawn <parent> <child> --yes
+dyro --workspace <alias> line merge <child> --into <parent> --yes
+dyro --workspace <alias> line sync <child> --yes
+```
+
+Print only the matching verb. Repeat user-supplied `--repos` on `spawn` if present.
+Do not add `--push`. Do not run git merge / switch / checkout by hand.
+
+Stay preflight-only when the user asked only for preflight or dry-run,
+or when they ran `dyro --dry-run line …` themselves.
+
 ## Preflight
 
 1. `doctor` is observational. Do not treat every `FAIL` as a stop.
@@ -99,13 +124,10 @@ dyro --workspace <alias> doctor
 
 or the `--dry-run line spawn|merge|sync` that failed. Do not print a live command.
 
-If every preflight step passed, say clearly that `next.commands` did not emit this, then show **one** command for the user to run personally:
+If the user asked only for preflight or dry-run and every preflight step
+passed, say clearly that `next.commands` did not emit this, then show
+**one** command for the user to run personally. Do not run it.
 
-```bash
-dyro --workspace <alias> line spawn <parent> <child> --yes
-dyro --workspace <alias> line merge <child> --into <parent> --yes
-dyro --workspace <alias> line sync <child> --yes
-```
-
-Print only the matching verb. Repeat user-supplied `--repos` on `spawn` if present.
-Do not add `--push`. Do not run that command.
+If the user asked to spawn / merge / sync and every preflight step
+passed, run the matching `--yes` command in this turn, then report what
+ran. Do not add `--push`.

src/dyro/integrations/assets/dyro-line-family/agents/openai.yaml

@@ -1,4 +1,4 @@
 interface:
   display_name: "Dyro 开发线家族"
-  short_description: "预检子线派生 / 合入父线 / 从父线同步；不要执行"
-  default_prompt: "Use $dyro-line-family. Preflight with doctor/status/line list and --dry-run line spawn|merge|sync only. Never run --yes, invent --push, or git merge. A printed command is not next.commands."
+  short_description: "预检后、在用户请求突变时执行子线派生 / 合入父线 / 从父线同步"
+  default_prompt: "Use $dyro-line-family. Preflight with doctor/status/line list and matching --dry-run. If the user asked to spawn|merge|sync and preflight passed, run the matching --yes in this turn. Never invent --push or git merge. Stay preflight-only for a dry-run/preflight ask."

src/dyro/integrations/manager.py

@@ -55,7 +55,7 @@
 TASK_MERGE_ASSET_VERSION = 1
 LINE_FAMILY_INTEGRATION_ID = "line-family"
 LINE_FAMILY_SKILL_NAME = "dyro-line-family"
-LINE_FAMILY_ASSET_VERSION = 1
+LINE_FAMILY_ASSET_VERSION = 2
 MANIFEST_SCHEMA_VERSION = 2
 LEGACY_MANIFEST_SCHEMA_VERSION = 1
 _SHA256_PREFIX = "sha256:"

tests/test_integrations.py

@@ -225,7 +225,7 @@ def test_packaged_dispatch_skill_is_concise_and_has_required_metadata(
             if ": " in line:
                 self.assertTrue(line.split(": ", 1)[1].startswith('"'))
 
-    def test_packaged_line_family_skill_is_preflight_only(self) -> None:
+    def test_packaged_line_family_skill_applies_when_user_asked(self) -> None:
         root = manager._asset_root("line-family")
         skill = root / "SKILL.md"
         metadata = root / "agents" / "openai.yaml"
@@ -236,15 +236,20 @@ def test_packaged_line_family_skill_is_preflight_only(self) -> None:
         self.assertIn("name: dyro-line-family", content)
         self.assertIn("disable-model-invocation: true", content)
         self.assertIn("user-invocable: true", content)
-        self.assertIn("Never pass `--yes`", content)
-        self.assertIn("Do not invent `--yes` or `--push`", content)
+        self.assertNotIn("不要执行", content)
+        self.assertNotIn("Never execute the mutation", content)
+        self.assertIn("required, not optional", content)
+        self.assertIn("same turn", content)
+        self.assertIn("Stay preflight-only", content)
+        self.assertIn("Do not invent `--push`", content)
         self.assertIn("Do not add `--push`", content)
         self.assertIn("line spawn <parent> <child> --yes", content)
         self.assertIn("line merge <child> --into <parent> --yes", content)
         self.assertIn("line sync <child> --yes", content)
         self.assertIn("--dry-run line spawn", content)
         self.assertIn("--dry-run line merge", content)
         self.assertIn("--dry-run line sync", content)
+        self.assertIn("report what", content)
         self.assertIn("git `main`", content)
         self.assertIn("/dyro-task-merge", content)
         self.assertNotIn("Any `FAIL` → stop", content)
@@ -259,8 +264,11 @@ def test_packaged_line_family_skill_is_preflight_only(self) -> None:
         self.assertIn("`line inbox`", content)
         self.assertIn("`line ack`", content)
         self.assertIn("must not call `line post`", content)
-        self.assertIn("$dyro-line-family", metadata.read_text(encoding="utf-8"))
-        for line in metadata.read_text(encoding="utf-8").splitlines():
+        yaml_text = metadata.read_text(encoding="utf-8")
+        self.assertIn("$dyro-line-family", yaml_text)
+        self.assertNotIn("不要执行", yaml_text)
+        self.assertIn("matching --yes", yaml_text)
+        for line in yaml_text.splitlines():
             if ": " in line:
                 self.assertTrue(line.split(": ", 1)[1].startswith('"'))