Fix kubectl plugin completion for zsh

This commit fixes two issues with kubectl plugin completion:

1. Zsh completion was truncating the completion function because it
   removed everything after the compdef line instead of just that line

2. kubectl_coco (plugin form) was not registered in the #compdef
   directive, so 'kubectl coco <TAB>' didn't work

Co-Authored-By: Claude Sonnet 4.5 <[email protected]>
Signed-off-by: Pradipta Banerjee <[email protected]>

Author: bpradipt

Makefile

@@ -44,12 +44,14 @@ install: build
 	@mkdir -p $(INSTALL_PATH)
 	@cp $(BINARY_NAME) $(INSTALL_PATH)/
 	@chmod +x $(INSTALL_PATH)/$(BINARY_NAME)
+	@ln -sf $(INSTALL_PATH)/$(BINARY_NAME) $(INSTALL_PATH)/kubectl_complete-coco
 	@echo "Installation complete. You can now use: kubectl coco"
 
 ## uninstall: Remove kubectl-coco from $(INSTALL_PATH)
 uninstall:
 	@echo "Uninstalling $(BINARY_NAME)..."
 	@rm -f $(INSTALL_PATH)/$(BINARY_NAME)
+	@rm -f $(INSTALL_PATH)/kubectl_complete-coco
 	@echo "Uninstall complete"
 
 ## clean: Remove build artifacts

README.md

@@ -38,6 +38,7 @@ curl -LO "https://github.com/confidential-devhub/cococtl/releases/latest/downloa
 
 # Install
 sudo install -m 0755 kubectl-coco-${OS}-${ARCH} /usr/local/bin/kubectl-coco
+sudo ln -sf /usr/local/bin/kubectl-coco /usr/local/bin/kubectl_complete-coco
 
 # Verify
 kubectl coco --version
@@ -127,12 +128,14 @@ For detailed information, see [TRANSFORMATIONS.md](TRANSFORMATIONS.md).
    System-wide (requires sudo):
    ```bash
    sudo install -m 0755 kubectl-coco-${OS}-${ARCH} /usr/local/bin/kubectl-coco
+   sudo ln -sf /usr/local/bin/kubectl-coco /usr/local/bin/kubectl_complete-coco
    ```
 
    Or user directory:
    ```bash
    mkdir -p ~/.local/bin
    install -m 0755 kubectl-coco-${OS}-${ARCH} ~/.local/bin/kubectl-coco
+   ln -sf ~/.local/bin/kubectl-coco ~/.local/bin/kubectl_complete-coco
    export PATH=$PATH:~/.local/bin  # Add to ~/.bashrc or ~/.zshrc
    ```
 
@@ -227,6 +230,12 @@ kubectl-coco completion zsh > "${fpath[1]}/_kubectl-coco"
 
 Start a new shell for completion to take effect.
 
+**Note:** The `kubectl_complete-coco` symlink (created during installation) enables `kubectl coco` plugin completion. If `kubectl coco <TAB>` doesn't work, verify:
+```bash
+ls -la /usr/local/bin/kubectl_complete-coco
+# Should point to kubectl-coco
+```
+
 ## Usage
 
 ### Initialize Configuration

cmd/completion.go

@@ -136,30 +136,14 @@ func genZshCompletionWithPlugin(out io.Writer) error {
 
 	completion := buf.String()
 
-	// Find and remove the last compdef line
-	lastCompdefIdx := strings.LastIndex(completion, "compdef _kubectl-coco kubectl-coco")
-	if lastCompdefIdx > 0 {
-		// Find the start of this line
-		lineStart := strings.LastIndex(completion[:lastCompdefIdx], "\n")
-		if lineStart < 0 {
-			lineStart = 0
-		} else {
-			lineStart++ // Move past the newline
-		}
-		completion = completion[:lineStart]
-	}
+	// Replace both compdef lines to include kubectl_coco for plugin support
+	// 1. #compdef directive (line 1) - used when file is in fpath
+	completion = strings.Replace(completion, "#compdef kubectl-coco", "#compdef kubectl-coco kubectl_coco", 1)
+	// 2. compdef command - used when sourcing file directly
+	completion = strings.Replace(completion, "compdef _kubectl-coco kubectl-coco", "compdef _kubectl-coco kubectl-coco kubectl_coco", 1)
 
 	// Write the modified completion
-	if _, err := fmt.Fprint(out, completion); err != nil {
-		return err
-	}
-
-	// Add kubectl plugin completion (kubectl coco and kubectl-coco)
-	pluginCompletion := `
-# kubectl plugin completion
-compdef _kubectl-coco kubectl-coco kubectl_coco
-`
-	_, err := fmt.Fprint(out, pluginCompletion)
+	_, err := fmt.Fprint(out, completion)
 	return err
 }
 

main.go

@@ -3,11 +3,22 @@ package main
 
 import (
 	"os"
+	"path/filepath"
+	"strings"
 
 	"github.com/confidential-devhub/cococtl/cmd"
 )
 
 func main() {
+	// Handle kubectl plugin completion
+	// When kubectl calls kubectl_complete-coco, it doesn't pass __complete
+	// but cobra needs it to trigger completion mode
+	binaryName := filepath.Base(os.Args[0])
+	if strings.Contains(binaryName, "kubectl_complete-") {
+		// Inject __complete as the first argument
+		os.Args = append([]string{os.Args[0], "__complete"}, os.Args[1:]...)
+	}
+
 	if err := cmd.Execute(); err != nil {
 		os.Exit(1)
 	}