@osfactory/har 0.37.0 → 0.38.0

package/dist/templates/har-boilerplate-ios/agent-slot.sh

@@ -158,8 +158,8 @@ slot_dirty_summary() {
   echo "dirty (${count} changed)"
 }
 
-# Print a warning before replacing an occupied slot (stdout — visible to agents).
-print_slot_replace_warning() {
+# Print details about an occupied slot (stdout — visible to agents).
+print_slot_occupied_warning() {
   local agent_id="$1"
   local reg wt branch work_dir created status last_error dirty_summary head
   reg="$(slot_registry_file "$agent_id")"
@@ -175,7 +175,7 @@ print_slot_replace_warning() {
   fi
 
   echo "" >&2
-  echo "⚠ Slot ${agent_id} is already in use — replacing will REMOVE the worktree." >&2
+  echo "⚠ Slot ${agent_id} is already in use." >&2
   [ -n "$wt" ] && echo "  Worktree:  ${wt}" >&2
   [ -n "$work_dir" ] && echo "  Work dir:  ${work_dir}" >&2
   [ -n "$branch" ] && echo "  Branch:    ${branch}${head:+ @ ${head}}" >&2
@@ -191,54 +191,21 @@ print_slot_replace_warning() {
     base_sha="$(git -C "$base_root" rev-parse --short HEAD 2>/dev/null || true)"
     echo "  New session will be based on: ${base_branch}${base_sha:+ @ ${base_sha}}" >&2
     echo "  (HEAD of ${base_root})" >&2
-    echo "  --replace does not choose this base — switch that checkout first for a new unrelated task." >&2
+    echo "  Switch that checkout to your intended base before launching a new session." >&2
     echo "" >&2
   fi
-  echo "  Prefer complete/teardown when the previous task is finished, then launch." >&2
-  echo "  The session branch is kept only if you committed. Gitignored paths" >&2
-  echo "  (state/, runs/, local clones, .env.local) are NOT preserved." >&2
-  echo "" >&2
-}
-
-# Require explicit confirmation before replacing an occupied slot.
-#   $1 agent_id  $2 force(true/false)  $3 replace(true/false)
-# Exits 1 when replacement must not proceed.
-require_slot_replace_confirm() {
-  local agent_id="$1"
-  local force="$2"
-  local replace="$3"
-  local wt
-
-  slot_is_occupied "$agent_id" || return 0
-
-  print_slot_replace_warning "$agent_id"
-  wt="$(existing_slot_worktree "$agent_id")"
-
-  if [ -n "$wt" ] && slot_worktree_dirty "$wt" && [ "$force" != true ]; then
-    echo "ERROR: previous session for slot ${agent_id} has uncommitted changes." >&2
-    echo "  Commit them in the worktree (branch is kept on teardown), or pass --force to discard." >&2
-    echo "  --force destroys uncommitted work — only use after explicit user approval." >&2
-    exit 1
+  if [ "$dirty_summary" != "clean" ] && [ "$dirty_summary" != "unknown" ]; then
+    echo "  Commit or discard changes in the worktree, then teardown/complete the slot:" >&2
+  else
+    echo "  Free the slot, then launch again:" >&2
   fi
-
-  if [ "$replace" = true ] || [ "${HAR_CONFIRM_REPLACE:-}" = "1" ]; then
-    return 0
-  fi
-
-  if [ -t 0 ] && [ -t 1 ]; then
-    local answer
-    read -r -p "Replace slot ${agent_id}? Uncommitted work is lost unless committed. [y/N] " answer
-    if [[ "$answer" =~ ^[Yy]$ ]]; then
-      return 0
-    fi
-    echo "Aborted — slot ${agent_id} left unchanged." >&2
-    exit 2
-  fi
-
-  echo "ERROR: slot ${agent_id} is occupied." >&2
-  echo "  Pass --replace (or set HAR_CONFIRM_REPLACE=1) after reviewing the warning above." >&2
-  echo "  If the worktree is dirty, also pass --force (only after explicit user approval)." >&2
-  exit 2
+  echo "    har env complete ${agent_id}   # or: har env teardown ${agent_id}" >&2
+  echo "    har env launch ${agent_id}" >&2
+  echo "" >&2
+  echo "  complete/teardown remove the worktree. The session branch is kept only if" >&2
+  echo "  you committed. Gitignored paths (state/, runs/, local clones, .env.local)" >&2
+  echo "  are NOT preserved." >&2
+  echo "" >&2
 }
 
 git_common_dir() {

package/dist/templates/har-boilerplate-ios/launch.sh

@@ -2,8 +2,9 @@
 # Launch an agent slot for iOS mobile app repos (git worktree by default).
 # Every launch starts a FRESH session: any previous session for the slot is torn
 # down (its branch is kept) and a new suffixed worktree is created from HEAD.
+# Occupied slots always block: run ./.har/teardown.sh (or complete it) first, then relaunch.
 #
-# Usage: ./.har/launch.sh <agent-id> [--no-worktree] [--replace] [--force]
+# Usage: ./.har/launch.sh <agent-id> [--no-worktree]
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -16,8 +17,6 @@ source "$SCRIPT_DIR/agent-slot.sh"
 
 AGENT_ID="${1:-}"
 USE_WORKTREE="${HARNESS_USE_WORKTREE:-true}"
-FORCE=false
-REPLACE=false
 WORK_UNIT_ID="${HAR_WORK_UNIT_ID:-}"
 ATTEMPT_ID="${HAR_ATTEMPT_ID:-}"
 
@@ -25,8 +24,6 @@ for arg in "$@"; do
   case "$arg" in
     --no-worktree) USE_WORKTREE=false ;;
     --worktree) USE_WORKTREE=true ;;
-    --replace)  REPLACE=true ;;
-    --force)    FORCE=true ;;
     --work-id=*) WORK_UNIT_ID="${arg#*=}" ;;
     --attempt-id=*) ATTEMPT_ID="${arg#*=}" ;;
   esac
@@ -40,7 +37,7 @@ export SLOT_ATTEMPT_ID="$ATTEMPT_ID"
 
 if [[ -z "$AGENT_ID" ]]; then
   har_load_agent_slot_limits
-  echo "Usage: $0 <agent-id> [--no-worktree] [--replace] [--force] " >&2
+  echo "Usage: $0 <agent-id> [--no-worktree]" >&2
   echo "  agent-id must be between ${HARNESS_AGENT_SLOT_MIN} and ${HARNESS_AGENT_SLOT_MAX}" >&2
   exit 1
 fi
@@ -49,11 +46,12 @@ validate_agent_id "$AGENT_ID"
 
 log() { echo "==> [agent-$AGENT_ID] $*" >&2; }
 
-# Replace any previous session for this slot — requires explicit confirmation.
+# Occupied slots always block a new launch — teardown/complete first, then relaunch.
 if slot_is_occupied "$AGENT_ID"; then
-  require_slot_replace_confirm "$AGENT_ID" "$FORCE" "$REPLACE"
-  log "Replacing previous session for slot ${AGENT_ID}..."
-  "$SCRIPT_DIR/teardown.sh" "$AGENT_ID" >&2
+  print_slot_occupied_warning "$AGENT_ID"
+  echo "ERROR: slot ${AGENT_ID} is occupied." >&2
+  echo "  Free it first: har env teardown ${AGENT_ID} (or complete ${AGENT_ID}), then har env launch ${AGENT_ID}." >&2
+  exit 2
 fi
 
 "$SCRIPT_DIR/setup-infra.sh"
@@ -122,7 +120,7 @@ mark_slot_failed() {
       write_slot_registry
     log "  Work dir:  ${WORK_DIR}"
     log "  Env file:  ${ENV_FILE}"
-    log "  Recovery:  fix the failure, then relaunch with --replace when ready."
+    log "  Recovery:  fix the failure, then: har env teardown ${AGENT_ID} (or complete), then har env launch ${AGENT_ID}."
   fi
 }
 trap mark_slot_failed EXIT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osfactory/har",
-  "version": "0.37.0",
+  "version": "0.38.0",
   "description": "LLM-powered CLI for reproducible agent development environments",
   "keywords": [
     "har",