@kafka0102/onespec 0.1.2 → 0.2.2

package/assets/skills/onespec/scripts/onespec-closeout.sh

@@ -26,7 +26,9 @@ change_dir() {
 
 state_file() {
   local change="$1"
-  printf '%s/.onespec.yaml\n' "$(change_dir "$change")"
+  local script_root
+  script_root="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd -P)"
+  "${BASH:-bash}" "$script_root/onespec-state.sh" path "$change"
 }
 
 field_value() {
@@ -62,6 +64,18 @@ current_workspace_path() {
   pwd -P
 }
 
+state_workspace_path() {
+  local change="$1"
+  local state
+  state="$(state_file "$change")"
+  [ -f "$state" ] || die "state not found: $state"
+  cd "$(dirname "$state")/../../.." && pwd -P
+}
+
+script_dir() {
+  cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd -P
+}
+
 canonicalize_path() {
   local input="$1"
   if [ -z "$input" ] || [ "$input" = "unknown" ] || [ ! -d "$input" ]; then
@@ -87,22 +101,20 @@ selected_actions_csv() {
   printf '%s\n' "$joined"
 }
 
-state_destination_in_origin() {
-  local change="$1"
-  local origin_path
-  origin_path="$(canonicalize_path "$(get_state_value "$change" origin_workspace_path)")"
-  [ -n "$origin_path" ] || die "origin workspace path is empty"
-  [ "$origin_path" != "unknown" ] || die "origin workspace path is unknown"
-  printf '%s/openspec/changes/%s/.onespec.yaml\n' "$origin_path" "$change"
+origin_workspace_path_for_change() {
+  canonicalize_path "$(get_state_value "$1" origin_workspace_path)"
 }
 
 normalize_action() {
   case "$1" in
-    delete-worktree|drop-worktree|cleanup-worktree)
-      echo "delete-worktree"
+    archive-then-merge-worktree|merge-after-archive|archive-then-merge|merge-worktree|merge|accept-worktree|accept)
+      echo "archive-then-merge-worktree"
       ;;
-    archive|run-archive)
-      echo "archive"
+    archive-only|archive|run-archive)
+      echo "archive-only"
+      ;;
+    discard-worktree|discard|drop-code|delete-worktree|drop-worktree|cleanup-worktree)
+      echo "discard-worktree"
       ;;
     "")
       echo ""
@@ -121,8 +133,9 @@ temporary_worktree_status() {
   origin_path="$(get_state_value "$change" origin_workspace_path)"
   origin_mode="$(get_state_value "$change" origin_workspace_mode)"
   origin_path="$(canonicalize_path "$origin_path")"
-  current_path="$(current_workspace_path)"
-  current_head="$(current_branch)"
+  current_path="$(state_workspace_path "$change")"
+  current_head="$(git -C "$current_path" branch --show-current 2>/dev/null || true)"
+  current_head="${current_head:-detached}"
   temporary="false"
   reason="none"
 
@@ -163,10 +176,10 @@ recommended_combination() {
   reason="review-only"
 
   if [ "$temporary" = "true" ]; then
-    recommendation="delete-worktree,archive"
-    reason="temporary-worktree-can-be-cleaned-before-or-with-archive"
+    recommendation="archive-then-merge-worktree"
+    reason="temporary-worktree-targets-base-branch"
   else
-    recommendation="archive"
+    recommendation="archive-only"
     reason="already-on-target-path"
   fi
 
@@ -186,6 +199,8 @@ cmd_inspect() {
 cleanup_local_branch_after_merge: true
 cleanup_local_worktree_after_merge: true
 cleanup_remote_branch_after_merge: false
+cleanup_local_branch_after_discard: true
+cleanup_local_worktree_after_discard: true
 cleanup_local_branch_after_preserve: false
 cleanup_local_worktree_after_preserve: false
 EOF
@@ -208,8 +223,9 @@ cmd_validate_actions() {
   local -a selected=()
   local action normalized
   local already_selected
-  local has_delete_worktree="false"
-  local has_archive="false"
+  local has_archive_then_merge="false"
+  local has_archive_only="false"
+  local has_discard_worktree="false"
   local current_head origin_branch temporary valid message
 
   for action in "$@"; do
@@ -229,8 +245,9 @@ cmd_validate_actions() {
 
   for action in "${selected[@]}"; do
     case "$action" in
-      delete-worktree) has_delete_worktree="true" ;;
-      archive) has_archive="true" ;;
+      archive-then-merge-worktree) has_archive_then_merge="true" ;;
+      archive-only) has_archive_only="true" ;;
+      discard-worktree) has_discard_worktree="true" ;;
     esac
   done
 
@@ -240,22 +257,27 @@ cmd_validate_actions() {
   origin_branch="$(get_state_value "$change" origin_branch)"
   temporary="$(temporary_worktree_status "$change" | awk -F ': ' '$1 == "temporary_worktree" { print $2 }')"
 
-  if [ "$has_delete_worktree" = "true" ] && [ "$temporary" != "true" ]; then
+  if [ "${#selected[@]}" -gt 1 ]; then
+    valid="false"
+    message="当前收尾菜单一次只允许选择一个动作。"
+  elif [ "$has_archive_then_merge" = "true" ] && [ "$temporary" != "true" ]; then
     valid="false"
-    message="不能删除 worktree：当前不在临时 worktree。"
-  elif [ "$has_archive" = "true" ] && [ "$has_delete_worktree" = "true" ]; then
-    message="允许先删除临时 worktree，再继续归档。"
-  elif [ "$has_delete_worktree" = "true" ] && [ "$has_archive" != "true" ]; then
-    message="允许仅删除临时 worktree；之后仍可单独执行归档。"
-  elif [ "$has_archive" = "true" ] && [ "$has_delete_worktree" != "true" ]; then
-    if [ "$temporary" = "true" ] || { [ "$origin_branch" != "unknown" ] && [ "$current_head" != "$origin_branch" ]; }; then
-      valid="false"
-      message="不能单独执行归档：当前代码尚未确认位于目标分支。"
+    message="不能先归档再合并：当前不在临时 worktree。"
+  elif [ "$has_discard_worktree" = "true" ] && [ "$temporary" != "true" ]; then
+    valid="false"
+    message="不能废弃 worktree：当前不在临时 worktree。"
+  elif [ "$has_archive_then_merge" = "true" ]; then
+    message="允许先归档当前 change，再把临时 worktree 合并到 ${origin_branch} 并删除 worktree。"
+  elif [ "$has_discard_worktree" = "true" ]; then
+    message="允许删除临时 worktree 并废弃对应本地分支代码；废弃后不归档。"
+  elif [ "$has_archive_only" = "true" ]; then
+    if [ "$temporary" != "true" ]; then
+      message="允许直接归档当前 change；当前不在临时 worktree，当前分支 ${current_head} 已是目标分支，无需额外合并分支，也不会删除工作区。"
     else
-      message="允许单独执行归档：当前已在目标分支路径上。"
+      message="允许直接归档当前 change，不合并到 base 分支，也不自动删除当前 worktree。"
     fi
   elif [ "${#selected[@]}" -eq 0 ]; then
-    message="本次不删除 worktree 或归档；之后仍可再次进入收尾。"
+    message="本次保持当前评审阶段不变；之后仍可再次进入收尾。"
   fi
 
   cat <<EOF
@@ -269,21 +291,33 @@ EOF
 }
 
 run_archive_command() {
-  local change="$1"
+  local workspace="$1"
+  local change="$2"
   local archive_bin="${ONESPEC_ARCHIVE_BIN:-openspec}"
-  "$archive_bin" archive "$change" --yes
+  (
+    cd "$workspace"
+    "$archive_bin" archive "$change" --yes
+  )
 }
 
-preserve_runtime_state_in_origin() {
-  local change="$1"
-  local source_file destination_file destination_dir
-  source_file="$(state_file "$change")"
-  destination_file="$(state_destination_in_origin "$change")"
-  destination_dir="$(dirname "$destination_file")"
+run_state_set_in_workspace() {
+  local workspace="$1"
+  local change="$2"
+  local key="$3"
+  local value="$4"
+  (
+    cd "$workspace"
+    "${BASH:-bash}" "$(script_dir)/onespec-state.sh" set "$change" "$key" "$value"
+  )
+}
 
-  mkdir -p "$destination_dir"
-  cp "$source_file" "$destination_file"
-  printf '%s\n' "$destination_file"
+run_cleanup_runtime_in_workspace() {
+  local workspace="$1"
+  local change="$2"
+  (
+    cd "$workspace"
+    "${BASH:-bash}" "$(script_dir)/onespec-closeout.sh" cleanup-runtime "$change" >/dev/null
+  )
 }
 
 delete_current_worktree() {
@@ -294,58 +328,177 @@ delete_current_worktree() {
   printf '%s\n' "$current_path"
 }
 
+merge_current_worktree_to_origin() {
+  local change="$1"
+  local cached_origin_branch="${2:-}"
+  local cached_origin_workspace="${3:-}"
+  local current_path current_head origin_branch origin_workspace origin_head
+
+  current_path="$(current_workspace_path)"
+  current_head="$(current_branch)"
+  if [ -n "$cached_origin_branch" ]; then
+    origin_branch="$cached_origin_branch"
+  else
+    origin_branch="$(get_state_value "$change" origin_branch)"
+  fi
+  if [ -n "$cached_origin_workspace" ]; then
+    origin_workspace="$cached_origin_workspace"
+  else
+    origin_workspace="$(origin_workspace_path_for_change "$change")"
+  fi
+
+  [ -n "$origin_workspace" ] || die "origin workspace path is empty"
+  [ "$origin_workspace" != "unknown" ] || die "origin workspace path is unknown"
+  [ "$origin_workspace" != "$current_path" ] || die "current workspace is already the origin workspace"
+  [ "$current_head" != "detached" ] || die "cannot merge a detached worktree"
+
+  origin_head="$(git -C "$origin_workspace" branch --show-current 2>/dev/null || true)"
+  [ "$origin_head" = "$origin_branch" ] || die "origin workspace is on ${origin_head:-detached}, expected $origin_branch"
+
+  if [ -n "$(git -C "$origin_workspace" status --porcelain=v1 --untracked-files=no)" ]; then
+    die "origin workspace has tracked uncommitted changes: $origin_workspace"
+  fi
+
+  git -C "$origin_workspace" merge "$current_head"
+
+  cat <<EOF
+merged_branch: $current_head
+merged_into: $origin_branch
+origin_workspace_path: $origin_workspace
+EOF
+}
+
+delete_current_worktree_branch() {
+  local current_head common_dir current_path parent_path
+  current_head="$(current_branch)"
+  [ "$current_head" != "detached" ] || die "cannot delete a detached worktree branch"
+  common_dir="$(git_common_dir)"
+  current_path="$(current_workspace_path)"
+  parent_path="$(dirname "$current_path")"
+  delete_current_worktree >/dev/null
+  git -C "$parent_path" --git-dir="$common_dir" branch -D "$current_head" >/dev/null
+  printf '%s\n' "$current_head"
+}
+
+delete_current_worktree_and_merged_branch() {
+  local current_head common_dir current_path parent_path
+  current_head="$(current_branch)"
+  [ "$current_head" != "detached" ] || die "cannot delete a detached worktree branch"
+  common_dir="$(git_common_dir)"
+  current_path="$(current_workspace_path)"
+  parent_path="$(dirname "$current_path")"
+  delete_current_worktree >/dev/null
+  git -C "$parent_path" --git-dir="$common_dir" branch -d "$current_head" >/dev/null
+  printf '%s\n' "$current_path"
+}
+
+commit_field() {
+  local payload="$1"
+  local key="$2"
+  printf '%s\n' "$payload" | awk -F ': ' -v key="$key" '$1 == key { sub(/^[^:]+: /, ""); print; exit }'
+}
+
+run_commit_related() {
+  local workspace="$1"
+  local change="$2"
+  local context="$3"
+  (
+    cd "$workspace"
+    "${BASH:-bash}" "$(script_dir)/onespec-commit.sh" commit-related "$change" "$context"
+  )
+}
+
 cmd_run_actions() {
   local change="$1"
   shift
   valid_change "$change"
   ensure_git_repo
 
-  local validation selected valid archive_selected delete_selected preserved_state removed_worktree
+  local validation selected valid archive_then_merge_selected archive_only_selected removed_worktree
+  local discard_selected merged_branch discarded_branch merge_result
+  local pre_closeout_commit post_archive_commit preserved_state_commit
+  local origin_branch_cached origin_workspace_cached
+  local action_workspace archive_workspace
   validation="$(cmd_validate_actions "$change" "$@")"
   selected="$(printf '%s\n' "$validation" | awk -F ': ' '$1 == "selected_actions" { print $2 }')"
   valid="$(printf '%s\n' "$validation" | awk -F ': ' '$1 == "valid" { print $2 }')"
 
   [ "$valid" = "true" ] || die "$(printf '%s\n' "$validation" | awk -F ': ' '$1 == "message" { print $2 }')"
   [ -n "$selected" ] || die "run-actions requires at least one closeout action"
-
-  archive_selected="false"
-  delete_selected="false"
-  if printf '%s\n' "$selected" | grep -Eq '(^|,)archive($|,)'; then
-    archive_selected="true"
+  action_workspace="$(current_workspace_path)"
+  archive_workspace="$action_workspace"
+  origin_branch_cached="$(get_state_value "$change" origin_branch)"
+  origin_workspace_cached="$(origin_workspace_path_for_change "$change")"
+
+  archive_then_merge_selected="false"
+  archive_only_selected="false"
+  discard_selected="false"
+  if printf '%s\n' "$selected" | grep -Eq '(^|,)archive-then-merge-worktree($|,)'; then
+    archive_then_merge_selected="true"
+  fi
+  if printf '%s\n' "$selected" | grep -Eq '(^|,)archive-only($|,)'; then
+    archive_only_selected="true"
   fi
-  if printf '%s\n' "$selected" | grep -Eq '(^|,)delete-worktree($|,)'; then
-    delete_selected="true"
+  if printf '%s\n' "$selected" | grep -Eq '(^|,)discard-worktree($|,)'; then
+    discard_selected="true"
   fi
 
-  preserved_state=""
   removed_worktree=""
+  merged_branch="none"
+  discarded_branch="none"
+  merge_result=""
+  if [ "$discard_selected" = "true" ]; then
+    pre_closeout_commit='commit_created: false
+commit_context: closeout
+commit_sha: none
+commit_message: none'
+  else
+    pre_closeout_commit="$(run_commit_related "$action_workspace" "$change" closeout)"
+  fi
+  post_archive_commit='commit_created: false
+commit_context: archive
+commit_sha: none
+commit_message: none'
+  preserved_state_commit='commit_created: false
+commit_context: preserve-state
+commit_sha: none
+commit_message: none'
+
+  if [ "$discard_selected" = "true" ]; then
+    discarded_branch="$(current_branch)"
+    removed_worktree="$(current_workspace_path)"
+    delete_current_worktree_branch >/dev/null
+  fi
 
-  # Safe order: archive first, then delete the temporary worktree.
-  if [ "$archive_selected" = "true" ]; then
-    run_archive_command "$change"
-    local script_dir
-    script_dir="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd -P)"
-    "${BASH:-bash}" "$script_dir/onespec-state.sh" set "$change" phase archived
-    "${BASH:-bash}" "$script_dir/onespec-state.sh" set "$change" archive archived
-    "${BASH:-bash}" "$script_dir/onespec-closeout.sh" cleanup-runtime "$change" >/dev/null
+  if [ "$archive_then_merge_selected" = "true" ] || [ "$archive_only_selected" = "true" ]; then
+    run_archive_command "$archive_workspace" "$change"
+    run_state_set_in_workspace "$archive_workspace" "$change" phase archived
+    run_state_set_in_workspace "$archive_workspace" "$change" archive archived
+    run_cleanup_runtime_in_workspace "$archive_workspace" "$change"
+    post_archive_commit="$(run_commit_related "$archive_workspace" "$change" archive)"
   fi
 
-  if [ "$delete_selected" = "true" ]; then
-    if [ "$archive_selected" != "true" ]; then
-      local script_dir
-      script_dir="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd -P)"
-      "${BASH:-bash}" "$script_dir/onespec-state.sh" set "$change" phase done
-      "${BASH:-bash}" "$script_dir/onespec-state.sh" set "$change" archive skipped
-      preserved_state="$(preserve_runtime_state_in_origin "$change")"
-    fi
-    removed_worktree="$(delete_current_worktree)"
+  if [ "$archive_then_merge_selected" = "true" ]; then
+    merge_result="$(merge_current_worktree_to_origin "$change" "$origin_branch_cached" "$origin_workspace_cached")"
+    merged_branch="$(commit_field "$merge_result" merged_branch)"
+    removed_worktree="$(delete_current_worktree_and_merged_branch)"
   fi
 
   cat <<EOF
 selected_actions: $selected
-archive_executed: $archive_selected
-worktree_deleted: $delete_selected
-preserved_state_file: ${preserved_state:-none}
+worktree_merged: $archive_then_merge_selected
+merged_branch: $merged_branch
+worktree_discarded: $discard_selected
+discarded_branch: $discarded_branch
+archive_executed: $(if [ "$archive_then_merge_selected" = "true" ] || [ "$archive_only_selected" = "true" ]; then echo "true"; else echo "false"; fi)
+worktree_deleted: $(if [ "$archive_then_merge_selected" = "true" ] || [ "$discard_selected" = "true" ]; then echo "true"; else echo "false"; fi)
+pre_closeout_commit_created: $(commit_field "$pre_closeout_commit" commit_created)
+pre_closeout_commit_sha: $(commit_field "$pre_closeout_commit" commit_sha)
+post_archive_commit_created: $(commit_field "$post_archive_commit" commit_created)
+post_archive_commit_sha: $(commit_field "$post_archive_commit" commit_sha)
+preserved_state_commit_created: $(commit_field "$preserved_state_commit" commit_created)
+preserved_state_commit_sha: $(commit_field "$preserved_state_commit" commit_sha)
+preserved_state_file: none
 deleted_worktree_path: ${removed_worktree:-none}
 EOF
 }
@@ -354,11 +507,19 @@ cmd_cleanup_runtime() {
   local change="$1"
   valid_change "$change"
 
-  local file
+  local file display
   file="$(state_file "$change")"
   if [ -f "$file" ]; then
     rm -f "$file"
-    echo "$file"
+    case "$file" in
+      */openspec/*)
+        display="openspec/${file##*/openspec/}"
+        ;;
+      *)
+        display="$file"
+        ;;
+    esac
+    echo "$display"
   fi
 }
 
@@ -367,8 +528,8 @@ usage() {
 用法:
   onespec-closeout.sh inspect <change>
   onespec-closeout.sh recommend-actions <change>
-  onespec-closeout.sh validate-actions <change> [delete-worktree] [archive]
-  onespec-closeout.sh run-actions <change> [delete-worktree] [archive]
+  onespec-closeout.sh validate-actions <change> [archive-then-merge-worktree] [archive-only] [discard-worktree]
+  onespec-closeout.sh run-actions <change> [archive-then-merge-worktree] [archive-only] [discard-worktree]
   onespec-closeout.sh cleanup-runtime <change>
 EOF
 }