Merge story-32: Multi-Instance Worktree Support

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> # Conflicts: # .story_kit/stories/archived/32_multi_instance_worktree_support.md # .story_kit/stories/current/30_worktree_agent_orchestration.md # .story_kit/stories/current/32_multi_instance_worktree_support.md # .story_kit/stories/current/36_enforce_story_front_matter.md # .story_kit/stories/upcoming/29_directory_based_workflow_coordination.md # .story_kit/stories/upcoming/32_worktree_agent_orchestration.md # .story_kit/stories/upcoming/33_worktree_diff_and_editor_integration.md # .story_kit/stories/upcoming/34_agent_configuration_and_roles.md # .story_kit/stories/upcoming/35_agent_security_and_sandboxing.md
2026-02-19 17:17:21 +00:00
parent 12542f10a8 e54209eb5a
commit f7902c3569
11 changed files with 123 additions and 33 deletions
--- a/.story_kit/stories/upcoming/29_directory_based_workflow_coordination.md
+++ b/.story_kit/stories/upcoming/29_directory_based_workflow_coordination.md
@@ -2,7 +2,6 @@
 name: Directory-Based Workflow Coordination and Locks
 test_plan: pending
 ---
-
 # Story 29: Directory-Based Workflow Coordination and Locks

 ## User Story
@@ -17,4 +16,4 @@ As a user, I want directory-based story workflow coordination with lock tracking
 ## Out of Scope
 - Implementing the lock mechanism or agents in code.
 - Enforcing locks at runtime.
- Multi-agent orchestration beyond documenting the workflow.
+- Multi-agent orchestration beyond documenting the workflow.
--- a/.story_kit/stories/upcoming/33_worktree_diff_and_editor_integration.md
+++ b/.story_kit/stories/upcoming/33_worktree_diff_and_editor_integration.md
@@ -2,7 +2,6 @@
 name: Worktree Diff Inspection and Editor Integration
 test_plan: pending
 ---
-
 # Story 33: Worktree Diff Inspection and Editor Integration

 ## User Story
--- a/.story_kit/stories/upcoming/34_agent_configuration_and_roles.md
+++ b/.story_kit/stories/upcoming/34_agent_configuration_and_roles.md
@@ -2,7 +2,6 @@
 name: Per-Project Agent Configuration and Role Definitions
 test_plan: pending
 ---
-
 # Story 34: Per-Project Agent Configuration and Role Definitions

 ## User Story
--- a/.story_kit/stories/upcoming/35_agent_security_and_sandboxing.md
+++ b/.story_kit/stories/upcoming/35_agent_security_and_sandboxing.md
@@ -2,8 +2,7 @@
 name: Agent Security and Sandboxing
 test_plan: pending
 ---
-
-# Story 35: Agent Security and Sandboxing
+# Story 34: Agent Security and Sandboxing

 ## User Story
 **As a** supervisor orchestrating multiple autonomous agents,