Modify test_gp_1752976117

.kiro/steering/product.md

@@ -0,0 +1,23 @@
+# Product Overview
+
+This repository contains **getpkg** - a command-line package manager for the dropshell ecosystem, along with a collection of developer tools.
+
+## Core Product
+- **getpkg**: Package manager that installs tools to `~/.getpkg/` with symlinks in `~/.local/bin/getpkg/`
+- Supports multiple architectures (x86_64, aarch64, universal)
+- Tools are published to and downloaded from `getpkg.xyz`
+
+## Tool Collection
+The repository includes several utility tools:
+- **bb64**: Bash-compatible base64 encoder/decoder with custom character set
+- **dehydrate**: Converts files/directories to C++ source code for embedding
+- **whatsdirty**: Git repository status checker
+- **sos**: Simple object storage client
+- **gp**: Git push utility
+
+## Key Features
+- Cross-platform tool distribution
+- Automated installation with PATH setup
+- Bash completion support
+- Architecture-aware downloads with fallbacks
+- Publishing system with authentication tokens

.kiro/steering/structure.md

@@ -0,0 +1,72 @@
+# Project Structure
+
+## Repository Layout
+```
+├── buildtestpublish_all.sh    # Master build script for all projects
+├── clean.sh                   # Global cleanup script
+├── README.md                  # Main project documentation
+└── <tool-name>/               # Individual tool directories
+```
+
+## Tool Directory Structure
+
+### C++ Projects (CMake-based)
+```
+<tool-name>/
+├── CMakeLists.txt             # CMake configuration
+├── build.sh                   # Build script
+├── test.sh                    # Test script  
+├── clean.sh                   # Cleanup script
+├── publish.sh                 # Publishing script
+├── install.sh                 # Installation script
+├── README.md                  # Tool documentation
+├── Dockerfile.dropshell-build # Docker build configuration
+├── src/                       # Source code
+│   ├── <tool>.cpp            # Main source file
+│   ├── version.hpp.in        # Version template
+│   └── ...                   # Additional sources
+├── build/                     # Build artifacts (generated)
+├── output/                    # Final executables (generated)
+└── .vscode/                   # VS Code configuration
+```
+
+### Shell Script Projects
+```
+<tool-name>/
+├── <tool-name>               # Executable shell script
+├── build.sh                  # Build script (may be no-op)
+├── test.sh                   # Test script
+├── clean.sh                  # Cleanup script
+├── publish.sh                # Publishing script
+└── setup_script.sh           # Post-install setup (optional)
+```
+
+## Standard Files
+
+### Required Scripts
+- **build.sh**: Builds the project (Docker for C++, no-op for shell)
+- **test.sh**: Runs project tests
+- **clean.sh**: Removes build artifacts
+- **publish.sh**: Publishes to getpkg.xyz registry
+
+### Optional Files
+- **install.sh**: System-wide installation script
+- **setup_script.sh**: Post-install setup for getpkg
+- **cmake_prebuild.sh**: Pre-build setup for CMake projects
+
+### Generated Directories
+- **build/**: CMake build artifacts (C++ projects)
+- **output/**: Final executables ready for distribution
+- **test_*/**: Test-specific directories
+
+## Naming Conventions
+- Tool directories match executable names
+- C++ source files typically match project name
+- Version templates use `.hpp.in` extension
+- Docker files use `Dockerfile.dropshell-build` pattern
+- Test directories prefixed with `test_`
+
+## Configuration Files
+- **.gitignore**: Standard ignore patterns for build artifacts
+- **.vscode/**: VS Code workspace settings
+- **CMakeLists.txt**: Follows standard template with PROJECT_NAME parameter

.kiro/steering/tech.md

@@ -0,0 +1,70 @@
+# Technology Stack
+
+## Build System
+- **CMake 3.16+** with Ninja generator for C++ projects
+- **Docker** containerized builds using `gitea.jde.nz/public/dropshell-build-base:latest`
+- **Static linking** for all C++ executables (`-static` flag)
+
+## Languages & Standards
+- **C++23** standard for all C++ projects
+- **Bash** for shell scripts and simple tools
+- **Shell scripts** follow `set -euo pipefail` pattern
+
+## Dependencies
+- **nlohmann_json** for JSON handling in C++ projects
+- **CPR (static)** for HTTP requests in getpkg
+- Custom modules in `/usr/local/share/cmake/Modules`
+
+## Common Build Patterns
+
+### C++ Projects (CMake)
+```bash
+# Standard build command
+cmake -G Ninja -S . -B ./build -DCMAKE_BUILD_TYPE=Debug -DPROJECT_NAME=<project>
+cmake --build ./build
+```
+
+### Docker Build (for C++ tools)
+```bash
+# Uses Dockerfile.dropshell-build pattern
+docker build -t <project>-build -f Dockerfile.dropshell-build --build-arg PROJECT=<project> --output ./output .
+```
+
+### Shell Tools
+- No build step required
+- Executable shell scripts with proper shebang
+- Use `chmod +x` for permissions
+
+## Common Commands
+
+### Build
+```bash
+./build.sh          # Build individual project
+./buildtestpublish_all.sh  # Build all projects
+```
+
+### Test
+```bash
+./test.sh           # Run tests for individual project
+```
+
+### Clean
+```bash
+./clean.sh          # Clean build artifacts
+```
+
+### Publish
+```bash
+./publish.sh        # Publish to getpkg.xyz (requires SOS_WRITE_TOKEN)
+```
+
+## Version Management
+- Automatic timestamp-based versioning: `YYYY.MMDD.HHMM`
+- Version configured via `version.hpp.in` template files
+- Pre-build scripts (`cmake_prebuild.sh`) for additional setup
+
+## Environment Variables
+- `CMAKE_BUILD_TYPE`: Debug/Release (default: Debug)
+- `SOS_WRITE_TOKEN`: Authentication for publishing
+- `NO_CACHE`: Skip Docker cache when set to "true"
+- `PROJECT`: Project name for build scripts

README.md

@@ -1,192 +1,86 @@
-# getpkg - Package Manager for Dropshell Tools
-
-getpkg is a command-line package manager that simplifies tool installation, management, and publishing for the dropshell ecosystem. Tools are installed to `~/.getpkg/` with executable symlinks in `~/.local/bin/getpkg/` and automatically added to your PATH with bash completion.
-
-## Installation
-
-Install getpkg with a single command:
-
-```bash
-curl https://getbin.xyz/getpkg-install | bash
-```
-
-After installation, restart your shell or run `source ~/.bashrc` to enable the new PATH and completion settings.
-
-## Basic Usage
-
-### Installing Tools
-
-Install any tool from the getpkg registry:
-
-```bash
-# Install a tool
-getpkg install whatsdirty
-```
-
-### Managing Installed Tools
-
-```bash
-# List all available commands
-getpkg help
-
-# Update all installed tools
-getpkg update
-
-# Uninstall a tool
-getpkg uninstall whatsdirty
-
-# Check getpkg version
-getpkg version
-```
-
-## Available Commands
-
-### Core Package Management
-
-- **`getpkg install <tool_name>`** - Install or update a tool
-- **`getpkg uninstall <tool_name>`** - Remove an installed tool
-- **`getpkg update`** - Update getpkg and all installed tools
-
-### Publishing (Requires SOS_WRITE_TOKEN)
-
-- **`getpkg publish <tool_name[:ARCH]> <folder>`** - Upload a tool to getpkg.xyz
-- **`getpkg unpublish <tool_name[:ARCH]>`** - Remove a published tool
-- **`getpkg unpublish <hash>`** - Remove a published tool by hash
-
-### Development Tools
-
-- **`getpkg create <tool_name> <directory>`** - Create a new tool project
-- **`getpkg hash <file_or_directory>`** - Calculate hash of files/directories
-
-### Information
-
-- **`getpkg list`** - List all available packages with status
-- **`getpkg clean`** - Clean up orphaned configs and symlinks  
-- **`getpkg version`** - Show getpkg version
-- **`getpkg help`** - Show detailed help
-- **`getpkg autocomplete`** - Show available commands for completion
-
-## How It Works
-
-### Installation Process
-
-When you install a tool, getpkg:
-
-1. **Downloads** the tool archive from getpkg.xyz
-2. **Extracts** it to `~/.getpkg/<tool_name>/`
-3. **Creates symlinks** for all executables in `~/.local/bin/getpkg/`
-4. **Ensures PATH** includes `~/.local/bin/getpkg` (one-time setup)
-5. **Enables completion** for the tool
-6. **Runs setup** if a `setup_script.sh` exists
-7. **Stores metadata** in `~/.config/getpkg/<tool_name>.json`
-
-### Architecture Support
-
-getpkg supports multiple architectures:
-- `x86_64` (Intel/AMD 64-bit)
-- `aarch64` (ARM 64-bit)  
-- `universal` (cross-platform tools)
-
-Tools are automatically downloaded for your architecture, with fallback to universal versions.
-
-### File Locations
-
-- **Tool files**: `~/.getpkg/<tool_name>/` (actual tool installation)
-- **Executable symlinks**: `~/.local/bin/getpkg/` (in your PATH)
-- **Configuration**: `~/.config/getpkg/`
-- **PATH setup**: `~/.bashrc_getpkg` (sourced by `~/.bashrc`)
-
-## Examples
-
-### Installing Popular Tools
-
-```bash
-# Install available tools
-getpkg install dehydrate      # File to C++ code generator
-getpkg install bb64           # Bash base64 encoder/decoder
-
-# Development tools (for repository development)
-getpkg install whatsdirty     # Check git repo status
-getpkg install sos            # Simple object storage client
-getpkg install gp             # Git push utility
-```
-
-### Publishing Your Own Tools
-
-```bash
-# Set your publishing token
-export SOS_WRITE_TOKEN="your-token-here"
-
-# Create a new tool project
-getpkg create mytool ./mytool-project
-
-# Publish architecture-specific build
-getpkg publish mytool:x86_64 ./build/
-
-# Publish universal tool
-getpkg publish mytool ./build/
-
-# Remove published tool
-getpkg unpublish mytool:x86_64
-```
-
-### Development Workflow
-
-```bash
-# Create tool structure
-getpkg create awesome-tool ./awesome-tool
-cd awesome-tool
-
-# Build your tool...
-# Add executable to the directory
-
-# Test locally
-./awesome-tool --version
-
-# Publish when ready
-getpkg publish awesome-tool:x86_64 .
-```
-
-## Environment Variables
-
-- **`SOS_WRITE_TOKEN`** - Authentication token for publishing tools
-
-## Troubleshooting
-
-### Tool Not Found
-If a tool isn't found after installation, ensure your shell has loaded the new PATH:
-```bash
-source ~/.bashrc
-```
-
-### Permission Issues
-getpkg installs to your home directory and doesn't require root access. If you encounter permission issues, check that `~/.local/bin/` is writable.
-
-### Network Issues
-All tools are downloaded from `getpkg.xyz`. Ensure you have internet connectivity and the domain is accessible.
-
-## Development
-
-### Building getpkg
-
-```bash
-# Build debug version
-cd getpkg && ./build.sh
-
-# Run tests  
-cd getpkg && ./test.sh
-
-# Publish (requires SOS_WRITE_TOKEN)
-cd getpkg && ./publish.sh
-```
-
-### Tool Development
-
-When creating tools for getpkg:
-
-1. Create a directory with your tool binary
-2. Optionally include a `setup_script.sh` for post-install setup
-3. The tool should support `version` and `autocomplete` subcommands
-4. Use `getpkg publish` to upload to the registry
-
-For more details, see the development documentation in each tool's directory.
+# getpkg - Simple Package Manager
+
+getpkg is a command-line package manager that makes it easy to install and manage developer tools. Tools are automatically installed to your home directory and added to your PATH.
+
+## Quick Start
+
+Install getpkg with one command:
+
+```bash
+curl https://getbin.xyz/getpkg-install | bash
+```
+
+After installation, restart your shell or run:
+```bash
+source ~/.bashrc
+```
+
+## Basic Commands
+
+### Install Tools
+```bash
+getpkg install <tool_name>    # Install a tool
+getpkg list                   # See all available tools
+getpkg update                 # Update all installed tools
+```
+
+### Manage Tools
+```bash
+getpkg uninstall <tool_name>  # Remove a tool
+getpkg version                # Check getpkg version
+getpkg help                   # Show all commands
+```
+
+## Popular Tools
+
+Install these useful developer tools:
+
+```bash
+getpkg install bb64           # Bash-compatible base64 encoder/decoder
+getpkg install dehydrate      # Convert files to C++ source code
+getpkg install whatsdirty     # Check git repository status
+getpkg install sos            # Simple object storage client
+getpkg install gp             # Git push utility
+```
+
+## How It Works
+
+When you install a tool:
+1. Downloads from getpkg.xyz
+2. Installs to `~/.getpkg/<tool_name>/`
+3. Creates shortcuts in `~/.local/bin/getpkg/`
+4. Adds to your PATH automatically
+5. Enables bash completion
+
+## File Locations
+
+- **Installed tools**: `~/.getpkg/<tool_name>/`
+- **Shortcuts**: `~/.local/bin/getpkg/` (in your PATH)
+- **Settings**: `~/.config/getpkg/`
+
+## Architecture Support
+
+getpkg automatically downloads the right version for your system:
+- Intel/AMD 64-bit (`x86_64`)
+- ARM 64-bit (`aarch64`)
+- Universal (works everywhere)
+
+## Troubleshooting
+
+**Tool not found after install?**
+```bash
+source ~/.bashrc
+```
+
+**Permission errors?**
+getpkg installs to your home directory - no root access needed.
+
+**Network issues?**
+Check your internet connection to `getpkg.xyz`.
+
+## Need Help?
+
+```bash
+getpkg help                   # Show detailed help
+getpkg list                   # See what's available
+```

getpkg/README.md

@@ -0,0 +1,207 @@
+# getpkg - Package Manager for Dropshell Tools
+
+getpkg is a command-line package manager that simplifies tool installation, management, and publishing for the dropshell ecosystem. Tools are installed to `~/.getpkg/` with executable symlinks in `~/.local/bin/getpkg/` and automatically added to your PATH with bash completion.
+
+## Installation
+
+Install getpkg with a single command:
+
+```bash
+curl https://getbin.xyz/getpkg-install | bash
+```
+
+After installation, restart your shell or run `source ~/.bashrc` to enable the new PATH and completion settings.
+
+## Basic Usage
+
+### Installing Tools
+
+Install any tool from the getpkg registry:
+
+```bash
+# Install a tool
+getpkg install whatsdirty
+```
+
+### Managing Installed Tools
+
+```bash
+# List all available commands
+getpkg help
+
+# Update all installed tools
+getpkg update
+
+# Uninstall a tool
+getpkg uninstall whatsdirty
+
+# Check getpkg version
+getpkg version
+```
+
+## Available Commands
+
+### Core Package Management
+
+- **`getpkg install <tool_name>`** - Install or update a tool
+- **`getpkg uninstall <tool_name>`** - Remove an installed tool
+- **`getpkg update`** - Update getpkg and all installed tools
+
+### Publishing (Requires SOS_WRITE_TOKEN)
+
+- **`getpkg publish <tool_name[:ARCH]> <folder>`** - Upload a tool to getpkg.xyz
+- **`getpkg unpublish <tool_name[:ARCH]>`** - Remove a published tool
+- **`getpkg unpublish <hash>`** - Remove a published tool by hash
+
+### Development Tools
+
+- **`getpkg create <tool_name> <directory>`** - Create a new tool project
+- **`getpkg hash <file_or_directory>`** - Calculate hash of files/directories
+
+### Information
+
+- **`getpkg list`** - List all available packages with status
+- **`getpkg clean`** - Clean up orphaned configs and symlinks  
+- **`getpkg version`** - Show getpkg version
+- **`getpkg help`** - Show detailed help
+- **`getpkg autocomplete`** - Show available commands for completion
+
+## How It Works
+
+### Installation Process
+
+When you install a tool, getpkg:
+
+1. **Downloads** the tool archive from getpkg.xyz
+2. **Extracts** it to `~/.getpkg/<tool_name>/`
+3. **Creates symlinks** for all executables in `~/.local/bin/getpkg/`
+4. **Ensures PATH** includes `~/.local/bin/getpkg` (one-time setup)
+5. **Enables bash completion** for the tool
+6. **Runs setup** if a `setup_script.sh` exists
+7. **Stores metadata** in `~/.config/getpkg/<tool_name>.json`
+
+### Architecture Support
+
+getpkg supports multiple architectures:
+- `x86_64` (Intel/AMD 64-bit)
+- `aarch64` (ARM 64-bit)  
+- `universal` (cross-platform tools)
+
+Tools are automatically downloaded for your architecture, with fallback to universal versions.
+
+### File Locations
+
+- **Tool files**: `~/.getpkg/<tool_name>/` (actual tool installation)
+- **Executable symlinks**: `~/.local/bin/getpkg/` (in your PATH)
+- **Configuration**: `~/.config/getpkg/`
+- **PATH setup**: `~/.bashrc_getpkg` (sourced by `~/.bashrc`)
+
+## Examples
+
+### Installing Popular Tools
+
+```bash
+# Install available tools
+getpkg install dehydrate      # File to C++ code generator
+getpkg install bb64           # Bash base64 encoder/decoder
+
+# Development tools (for repository development)
+getpkg install whatsdirty     # Check git repo status
+getpkg install sos            # Simple object storage client
+getpkg install gp             # Git push utility
+```
+
+### Publishing Your Own Tools
+
+```bash
+# Set your publishing token
+export SOS_WRITE_TOKEN="your-token-here"
+
+# Create a new tool project
+getpkg create mytool ./mytool-project
+
+# Publish architecture-specific build
+getpkg publish mytool:x86_64 ./build/
+
+# Publish universal tool
+getpkg publish mytool ./build/
+
+# Remove published tool
+getpkg unpublish mytool:x86_64
+```
+
+### Development Workflow
+
+```bash
+# Create tool structure
+getpkg create awesome-tool ./awesome-tool
+cd awesome-tool
+
+# Build your tool...
+# Add executable to the directory
+
+# Test locally
+./awesome-tool --version
+
+# Publish when ready
+getpkg publish awesome-tool:x86_64 .
+```
+
+## Environment Variables
+
+- **`SOS_WRITE_TOKEN`** - Authentication token for publishing tools
+
+## Troubleshooting
+
+### Tool Not Found
+If a tool isn't found after installation, ensure your shell has loaded the new PATH:
+```bash
+source ~/.bashrc
+```
+
+### Permission Issues
+getpkg installs to your home directory and doesn't require root access. If you encounter permission issues, check that `~/.local/bin/` is writable.
+
+### Network Issues
+All tools are downloaded from `getpkg.xyz`. Ensure you have internet connectivity and the domain is accessible.
+
+## Development
+
+### Building getpkg
+
+```bash
+# Build debug version
+cd getpkg && ./build.sh
+
+# Run tests  
+cd getpkg && ./test.sh
+
+# Publish (requires SOS_WRITE_TOKEN)
+cd getpkg && ./publish.sh
+```
+
+### Tool Development
+
+When creating tools for getpkg:
+
+1. Create a directory with your tool binary
+2. Optionally include a `setup_script.sh` for post-install setup
+3. The tool should support `version` and `autocomplete` subcommands
+4. Use `getpkg publish` to upload to the registry
+
+### Testing
+
+The test script creates all temporary files and directories in `test_temp/` to keep the main directory clean:
+
+```bash
+# Run tests
+./test.sh
+
+# Clean up orphaned test files from old test runs (one-time)
+bash cleanup_old_test_files.sh
+
+# Clean up orphaned test packages from getpkg.xyz
+bash cleanup_test_packages.sh
+```
+
+For more details, see the development documentation in each tool's directory.

getpkg/cleanup_test_packages.sh

@@ -0,0 +1,98 @@
+#!/bin/bash
+
+# Cleanup script for orphaned test packages from getpkg testing
+# This script removes test packages that start with "test-" from getpkg.xyz
+# Run from the getpkg directory: bash cleanup_test_packages.sh
+
+set -euo pipefail
+
+GETPKG="./output/getpkg"
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+echo -e "${YELLOW}Cleaning up orphaned test packages...${NC}"
+
+# Check if getpkg binary exists
+if [ ! -f "$GETPKG" ]; then
+    echo -e "${RED}Error: getpkg binary not found at $GETPKG${NC}"
+    echo "Please run ./build.sh first to build getpkg"
+    exit 1
+fi
+
+# Check if SOS_WRITE_TOKEN is set
+if [ -z "${SOS_WRITE_TOKEN:-}" ]; then
+    echo -e "${RED}Error: SOS_WRITE_TOKEN environment variable is not set${NC}"
+    echo "This token is required to unpublish packages from getpkg.xyz"
+    exit 1
+fi
+
+echo "Using getpkg binary: $GETPKG"
+echo "SOS_WRITE_TOKEN is set (${#SOS_WRITE_TOKEN} characters)"
+
+# Get list of all packages from /dir endpoint
+echo "Fetching package list from getpkg.xyz/dir..."
+DIR_RESPONSE=$(curl -s "https://getpkg.xyz/dir" 2>/dev/null || echo "")
+
+if [ -z "$DIR_RESPONSE" ]; then
+    echo -e "${RED}Failed to fetch package list from server${NC}"
+    exit 1
+fi
+
+# Extract test package labeltags from JSON response
+# Try with jq first, fallback to grep/sed if jq is not available
+if command -v jq >/dev/null 2>&1; then
+    TEST_PACKAGES=$(echo "$DIR_RESPONSE" | jq -r '.entries[]?.labeltags[]? // empty' 2>/dev/null | grep "^test-" | sort -u || echo "")
+else
+    # Fallback: extract labeltags using grep and sed (less reliable but works without jq)
+    TEST_PACKAGES=$(echo "$DIR_RESPONSE" | grep -o '"test-[^"]*"' | sed 's/"//g' | sort -u || echo "")
+fi
+
+if [ -z "$TEST_PACKAGES" ]; then
+    echo -e "${GREEN}No test packages found to clean up${NC}"
+    exit 0
+fi
+
+echo -e "\n${YELLOW}Found test packages to clean up:${NC}"
+echo "$TEST_PACKAGES" | while read -r package; do
+    echo "  - $package"
+done
+
+echo -e "\n${YELLOW}Cleaning up test packages...${NC}"
+
+CLEANED_COUNT=0
+FAILED_COUNT=0
+
+# Use process substitution to avoid subshell issues
+while IFS= read -r package; do
+    if [ -n "$package" ]; then
+        echo -n "Cleaning up $package... "
+        
+        # Try to unpublish the package (temporarily disable set -e)
+        set +e
+        $GETPKG unpublish "$package" >/dev/null 2>&1
+        UNPUBLISH_RESULT=$?
+        set -e
+        
+        if [ $UNPUBLISH_RESULT -eq 0 ]; then
+            echo -e "${GREEN}OK${NC}"
+            ((CLEANED_COUNT++))
+        else
+            echo -e "${RED}FAILED${NC}"
+            ((FAILED_COUNT++))
+        fi
+    fi
+done <<< "$TEST_PACKAGES"
+
+echo -e "\n${YELLOW}Cleanup Summary:${NC}"
+echo "Packages cleaned: $CLEANED_COUNT"
+echo "Failed cleanups: $FAILED_COUNT"
+
+if [ $FAILED_COUNT -eq 0 ]; then
+    echo -e "${GREEN}All test packages cleaned up successfully!${NC}"
+else
+    echo -e "${YELLOW}Some packages failed to clean up. They may need manual removal.${NC}"
+fi

getpkg/debug_test.txt

@@ -1 +0,0 @@
-Debug content

getpkg/temp_test.txt

@@ -1 +0,0 @@
-test

getpkg/test-uninstall/test-uninstall

@@ -1,7 +0,0 @@
-#\!/bin/bash
-if [ "$1" = "version" ]; then
-  echo "1.0.0"
-elif [ "$1" = "autocomplete" ]; then
-  echo "help"
-  echo "version"
-fi

getpkg/test-uninstall/test-uninstall-dir/test-uninstall

@@ -1,7 +0,0 @@
-#\!/bin/bash
-if [ "$1" = "version" ]; then
-  echo "1.0.0"
-elif [ "$1" = "autocomplete" ]; then
-  echo "help"
-  echo "version"
-fi

getpkg/test.sh

@@ -68,6 +68,28 @@ cleanup() {
         # Clean up noarch variant
         $GETPKG unpublish "${TEST_TOOL_NAME}-noarch:universal" 2>/dev/null || true
         
+        # Clean up any remaining test packages that start with "test-"
+        echo "Cleaning up any remaining test packages..."
+        DIR_RESPONSE=$(curl -s "https://getpkg.xyz/dir" 2>/dev/null || echo "")
+        if [ -n "$DIR_RESPONSE" ]; then
+            # Extract test package labeltags from JSON response
+            if command -v jq >/dev/null 2>&1; then
+                TEST_PACKAGES=$(echo "$DIR_RESPONSE" | jq -r '.entries[]?.labeltags[]? // empty' 2>/dev/null | grep "^test-" | sort -u || echo "")
+            else
+                # Fallback: extract labeltags using grep and sed
+                TEST_PACKAGES=$(echo "$DIR_RESPONSE" | grep -o '"test-[^"]*"' | sed 's/"//g' | sort -u || echo "")
+            fi
+            
+            if [ -n "$TEST_PACKAGES" ]; then
+                echo "$TEST_PACKAGES" | while read -r package; do
+                    if [ -n "$package" ]; then
+                        echo "  Cleaning up orphaned test package: $package"
+                        $GETPKG unpublish "$package" 2>/dev/null || true
+                    fi
+                done
+            fi
+        fi
+        
         echo "Cleaned up test tools from getpkg.xyz"
     else
         echo "Note: SOS_WRITE_TOKEN not set, cannot clean up remote test objects"

getpkg/test_debug/debug-test

@@ -1 +0,0 @@
-#!/bin/bash\necho debug

getpkg/test_debug2/debug-test2

@@ -1 +0,0 @@
-#!/bin/bash\necho debug2

getpkg/test_display/test-display

@@ -1 +0,0 @@
-#!/bin/bash\necho display test

getpkg/test_multi/test-multi

@@ -1 +0,0 @@
-#!/bin/bash\necho multi arch

getpkg/test_robust/test-robust

@@ -1 +0,0 @@
-#!/bin/bash\necho robust test

getpkg/test_upload.txt

@@ -1 +0,0 @@
-test content

gp/gp

@@ -225,19 +225,77 @@ show_status_and_confirm() {
     
     # Show staged changes
     if ! git diff --cached --quiet; then
-        print_info "Staged changes:"
-        git diff --cached --name-only -- | while IFS= read -r line; do echo "  $line"; done
+        local staged_modified=""
+        local staged_deleted=""
+        local staged_added=""
+        
+        # Get staged file status and categorize
+        while IFS=$'\t' read -r status file; do
+            [ -z "$status" ] && continue
+            case "${status:0:1}" in
+                A) staged_added="${staged_added}${file}\n" ;;
+                M) staged_modified="${staged_modified}${file}\n" ;;
+                D) staged_deleted="${staged_deleted}${file}\n" ;;
+                *) staged_modified="${staged_modified}${file}\n" ;;  # Default to modified for other statuses
+            esac
+        done < <(git diff --cached --name-status)
+        
+        # Show staged added files
+        if [ -n "$staged_added" ]; then
+            print_info "Staged new files:"
+            echo -e "$staged_added" | grep -v '^$' | while IFS= read -r line; do echo "  $line"; done
+        fi
+        
+        # Show staged modified files
+        if [ -n "$staged_modified" ]; then
+            print_info "Staged modified files:"
+            echo -e "$staged_modified" | grep -v '^$' | while IFS= read -r line; do echo "  $line"; done
+        fi
+        
+        # Show staged deleted files
+        if [ -n "$staged_deleted" ]; then
+            print_info "Staged deleted files:"
+            echo -e "$staged_deleted" | grep -v '^$' | while IFS= read -r line; do echo "  $line"; done
+        fi
+        
         has_staged_changes=true
     fi
     
     # Show unstaged changes
     if ! git diff --quiet; then
-        if [ "$ADD_ALL" = true ]; then
-            print_info "Modified files (will be added):"
-        else
-            print_info "Modified files (unstaged, will NOT be included):"
+        local modified_files=""
+        local deleted_files=""
+        
+        # Get file status and categorize
+        while IFS=$'\t' read -r status file; do
+            [ -z "$status" ] && continue
+            case "${status:0:1}" in
+                M) modified_files="${modified_files}${file}\n" ;;
+                D) deleted_files="${deleted_files}${file}\n" ;;
+                *) modified_files="${modified_files}${file}\n" ;;  # Default to modified for other statuses
+            esac
+        done < <(git diff --name-status)
+        
+        # Show modified files
+        if [ -n "$modified_files" ]; then
+            if [ "$ADD_ALL" = true ]; then
+                print_info "Modified files (will be added):"
+            else
+                print_info "Modified files (unstaged, will NOT be included):"
+            fi
+            echo -e "$modified_files" | grep -v '^$' | while IFS= read -r line; do echo "  $line"; done
         fi
-        git diff --name-only -- | while IFS= read -r line; do echo "  $line"; done
+        
+        # Show deleted files
+        if [ -n "$deleted_files" ]; then
+            if [ "$ADD_ALL" = true ]; then
+                print_info "Deleted files (will be removed):"
+            else
+                print_info "Deleted files (unstaged, will NOT be included):"
+            fi
+            echo -e "$deleted_files" | grep -v '^$' | while IFS= read -r line; do echo "  $line"; done
+        fi
+        
         has_unstaged_changes=true
     fi
     

whatsdirty/publish.sh

@@ -25,6 +25,7 @@ GETPKG="${SCRIPT_DIR}/../getpkg/output/getpkg"
 TOOLDIR="${SCRIPT_DIR}/tool"
 mkdir -p "${TOOLDIR}"
 cp "${SCRIPT_DIR}/whatsdirty" "${TOOLDIR}/whatsdirty"   
+cp "${SCRIPT_DIR}/setup_script.sh" "${TOOLDIR}/"
 
 # publish universal tool.
 "${GETPKG}" publish "whatsdirty" "${TOOLDIR}"