fix: writes

Author: flyingrobots

.github/workflows/shiplog-sign.yml

@@ -29,6 +29,8 @@ permissions:
 jobs:
   sign-entry:
     runs-on: ubuntu-latest
+    environment:
+      name: ${{ github.event_name == 'workflow_dispatch' && inputs.env || 'prod' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -45,7 +47,7 @@ jobs:
       - name: Configure SSH signing (CI)
         env:
           CI_SSH_PRIVATE_KEY: ${{ secrets.CI_SSH_PRIVATE_KEY }}
-          CI_SSH_PUBLIC_KEY: ${{ env.CI_SSH_PUBLIC_KEY }}
+          CI_SSH_PUBLIC_KEY: ${{ vars.CI_SSH_PUBLIC_KEY }}
         run: |
           set -euo pipefail
           [ -n "${CI_SSH_PRIVATE_KEY:-}" ] || { echo "Missing CI_SSH_PRIVATE_KEY secret" >&2; exit 1; }
@@ -94,4 +96,3 @@ jobs:
         run: |
           set -euo pipefail
           git push origin "refs/_shiplog/journal/${SHIPLOG_ENV}"
-

docs/features/write.md

@@ -5,20 +5,25 @@
 
 ## Usage
 ```bash
-git shiplog write [ENV]
-# non-interactive
-SHIPLOG_BORING=1 git shiplog --yes write prod
+git shiplog write [ENV] \
+  [--service NAME] [--status success|failed|in_progress|skipped|override|revert|finalize] \
+  [--reason TEXT] [--ticket ID] \
+  [--region R] [--cluster C] [--namespace NS] \
+  [--image IMG] [--tag TAG] [--run-url URL]
+
+# Non-interactive
+SHIPLOG_BORING=1 git shiplog --yes write prod --service release --reason "MVP release"
 ```
 
 ## Behavior
 - Validates the author against the resolved allowlist and performs a signing precheck when signatures are required.
-- Prompts for service, status, change details, and artifact information; respects the `SHIPLOG_*` environment overrides listed below.
+- Prompts for service, status, change details, and artifact information. You can prefill or bypass prompts with flags (`--service`, `--reason`, etc.) or environment variables listed below.
 - Generates both a human-readable header and a JSON trailer; optionally attaches NDJSON logs via `SHIPLOG_LOG`.
 - Accepts `--yes` to skip confirmation prompts (sets `SHIPLOG_ASSUME_YES=1`).
 - Fast-forwards the journal ref; aborts if the ref is missing or would require a force update.
 - Automatically pushes the updated journal (and attached notes) to `origin` when available; disable with `SHIPLOG_AUTO_PUSH=0` or `--no-push`.
 
-## Environment Overrides
+## Flags and Environment Overrides
 | Variable | Purpose | Accepted values | Default | Example |
 |----------|---------|-----------------|---------|---------|
 | `SHIPLOG_ENV` | Target environment when `[ENV]` argument omitted | Any journal name | `prod` | `SHIPLOG_ENV=staging` |

lib/commands.sh

@@ -176,7 +176,45 @@ cmd_init() {
 
 cmd_write() {
   ensure_in_repo
-  local env="${1:-$DEFAULT_ENV}"
+  local env="$DEFAULT_ENV"
+  local args=()
+  local opt
+
+  # Parse positional ENV and optional flags to prefill prompts
+  while [ $# -gt 0 ]; do
+    case "$1" in
+      --env)
+        shift; env="${1:-$env}"; shift; continue ;;
+      --env=*)
+        env="${1#*=}"; shift; continue ;;
+      --service) shift; SHIPLOG_SERVICE="${1:-}"; export SHIPLOG_SERVICE; shift; continue ;;
+      --service=*) SHIPLOG_SERVICE="${1#*=}"; export SHIPLOG_SERVICE; shift; continue ;;
+      --status) shift; SHIPLOG_STATUS="${1:-}"; export SHIPLOG_STATUS; shift; continue ;;
+      --status=*) SHIPLOG_STATUS="${1#*=}"; export SHIPLOG_STATUS; shift; continue ;;
+      --reason) shift; SHIPLOG_REASON="${1:-}"; export SHIPLOG_REASON; shift; continue ;;
+      --reason=*) SHIPLOG_REASON="${1#*=}"; export SHIPLOG_REASON; shift; continue ;;
+      --ticket) shift; SHIPLOG_TICKET="${1:-}"; export SHIPLOG_TICKET; shift; continue ;;
+      --ticket=*) SHIPLOG_TICKET="${1#*=}"; export SHIPLOG_TICKET; shift; continue ;;
+      --region) shift; SHIPLOG_REGION="${1:-}"; export SHIPLOG_REGION; shift; continue ;;
+      --region=*) SHIPLOG_REGION="${1#*=}"; export SHIPLOG_REGION; shift; continue ;;
+      --cluster) shift; SHIPLOG_CLUSTER="${1:-}"; export SHIPLOG_CLUSTER; shift; continue ;;
+      --cluster=*) SHIPLOG_CLUSTER="${1#*=}"; export SHIPLOG_CLUSTER; shift; continue ;;
+      --namespace) shift; SHIPLOG_NAMESPACE="${1:-}"; export SHIPLOG_NAMESPACE; shift; continue ;;
+      --namespace=*) SHIPLOG_NAMESPACE="${1#*=}"; export SHIPLOG_NAMESPACE; shift; continue ;;
+      --image) shift; SHIPLOG_IMAGE="${1:-}"; export SHIPLOG_IMAGE; shift; continue ;;
+      --image=*) SHIPLOG_IMAGE="${1#*=}"; export SHIPLOG_IMAGE; shift; continue ;;
+      --tag) shift; SHIPLOG_TAG="${1:-}"; export SHIPLOG_TAG; shift; continue ;;
+      --tag=*) SHIPLOG_TAG="${1#*=}"; export SHIPLOG_TAG; shift; continue ;;
+      --run-url) shift; SHIPLOG_RUN_URL="${1:-}"; export SHIPLOG_RUN_URL; shift; continue ;;
+      --run-url=*) SHIPLOG_RUN_URL="${1#*=}"; export SHIPLOG_RUN_URL; shift; continue ;;
+      --) shift; break ;;
+      -*) args+=("$1"); shift; continue ;;
+      *)
+        # First non-flag positional argument is ENV if not set by --env
+        if [ "$env" = "$DEFAULT_ENV" ]; then env="$1"; shift; continue; else args+=("$1"); shift; continue; fi
+        ;;
+    esac
+  done
 
   require_allowed_author
   require_allowed_signer

lib/common.sh

@@ -112,11 +112,20 @@ shiplog_prompt_input() {
   if is_boring; then
     printf '%s\n' "$value"
   else
-    shiplog_require_bosun
-    local result
-    local bosun
-    bosun=$(shiplog_bosun_bin)
-    result=$("$bosun" input --placeholder "$placeholder" --value "$value")
+    local result=""
+    if shiplog_have_bosun; then
+      local bosun
+      bosun=$(shiplog_bosun_bin)
+      if result=$("$bosun" input --placeholder "$placeholder" --value "$value" 2>/dev/null); then
+        printf '%s\n' "$result"
+        _log_prompt_interaction prompt "$placeholder" "$result"
+        return
+      fi
+    fi
+    # Fallback to POSIX prompt
+    printf '%s ' "$placeholder" >&2
+    IFS= read -r result || result="$value"
+    [ -n "$result" ] || result="$value"
     printf '%s\n' "$result"
     _log_prompt_interaction prompt "$placeholder" "$result"
   fi
@@ -138,14 +147,21 @@ shiplog_prompt_choice() {
   if is_boring; then
     printf '%s\n' "$value"
   else
-    shiplog_require_bosun
-    local result
-    local bosun
-    bosun=$(shiplog_bosun_bin)
-    if [ -n "$value" ]; then
-      result=$("$bosun" choose --header "$header" --default "$value" "${options[@]}")
-    else
-      result=$("$bosun" choose --header "$header" "${options[@]}")
+    local result=""
+    if shiplog_have_bosun; then
+      local bosun
+      bosun=$(shiplog_bosun_bin)
+      if [ -n "$value" ]; then
+        result=$("$bosun" choose --header "$header" --default "$value" "${options[@]}" 2>/dev/null) || true
+      else
+        result=$("$bosun" choose --header "$header" "${options[@]}" 2>/dev/null) || true
+      fi
+    fi
+    if [ -z "$result" ]; then
+      # Fallback: print options and read a line
+      printf '%s [%s] ' "$header" "${options[*]}" >&2
+      IFS= read -r result || result="$value"
+      [ -n "$result" ] || result="$value"
     fi
     printf '%s\n' "$result"
     _log_prompt_interaction prompt "$header" "$result"
@@ -159,13 +175,17 @@ shiplog_confirm() {
     return 0
   fi
   _log_prompt_interaction confirmation "$prompt" null raw
-  shiplog_require_bosun
-  local bosun
-  bosun=$(shiplog_bosun_bin)
-  if "$bosun" confirm "$prompt"; then
+  if shiplog_have_bosun && "$(shiplog_bosun_bin)" confirm "$prompt"; then
     _log_prompt_interaction confirmation "$prompt" true raw
     return 0
   fi
+  # Fallback
+  printf '%s [y/N] ' "$prompt" >&2
+  local ans
+  IFS= read -r ans || ans=""
+  case "$(printf '%s' "$ans" | tr '[:upper:]' '[:lower:]')" in
+    y|yes) _log_prompt_interaction confirmation "$prompt" true raw; return 0 ;;
+  esac
   _log_prompt_interaction confirmation "$prompt" false raw
   return 1
 }

lib/git.sh

@@ -154,13 +154,20 @@ sign_commit() {
   local sign_mode="${SHIPLOG_SIGN_EFFECTIVE:-0}"
   GIT_AUTHOR_NAME="${GIT_AUTHOR_NAME:-${SHIPLOG_AUTHOR_NAME:-$(git config user.name || echo 'Shiplog Bot')}}"
   GIT_AUTHOR_EMAIL="${GIT_AUTHOR_EMAIL:-${SHIPLOG_AUTHOR_EMAIL:-$(git config user.email || echo 'shiplog-bot@local')}}"
-  local signer_flag=()
+
+  # Build commit-tree command safely without expanding an empty array under set -u
+  local -a cmd
+  cmd=(git commit-tree "$tree")
   case "$sign_mode" in
-    0|false|no|off) ;;
-    *) signer_flag=(-S) ;;
+    0|false|no|off) : ;;
+    *) cmd+=(-S) ;;
   esac
+  # Append remaining arguments (e.g., -p <parent>)
+  if [ "$#" -gt 0 ]; then
+    cmd+=("$@")
+  fi
   GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME" GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL" \
-    git commit-tree "$tree" "$@" "${signer_flag[@]}"
+    "${cmd[@]}"
 }
 
 attach_note_if_present() {