perf(init): already-installed fast-paths + progress lines + timeouts for caveman/ponytail wiring

Author: HoangP8

internal/commands/init.go

@@ -181,11 +181,12 @@ func RunInit(opts InitOptions) int {
 		wireBar.Begin(agent.Label)
 		var failed []string
 		wireOut, _ := util.CaptureLogs(func() error {
-			for _, tool := range tools {
+			for ti, tool := range tools {
 				fn, ok := tool.WireFor[agentID]
 				if !ok {
 					continue
 				}
+				wireBar.Step("installing "+tool.Label, float64(ti+1)/float64(len(tools)))
 				if tool.NeedsGit && !gitOK {
 					util.L.Err(tool.Label + " needs git — https://git-scm.com/downloads")
 					failed = append(failed, tool.Label)

internal/tools/caveman.go

@@ -1,9 +1,11 @@
 package tools
 
 import (
+	"context"
 	"os"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/HoangP8/tokless/internal/core"
 	"github.com/HoangP8/tokless/internal/util"
@@ -17,7 +19,9 @@ func cavemanExec(bin string, args []string, opts core.RunOpts, dryHint string, e
 	if isTest() {
 		return true, nil
 	}
-	r := util.Run(bin, args, util.RunOptions{Capture: true, Env: env})
+	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Minute)
+	defer cancel()
+	r := util.Run(bin, args, util.RunOptions{Capture: true, Env: env, Ctx: ctx})
 	if r.Code != 0 {
 		util.L.Err("caveman command failed: " + clip(r.Stderr))
 		return false, nil
@@ -33,6 +37,32 @@ func cavemanOpencodeInstallEnv() []string {
 	return []string{"XDG_CONFIG_HOME=" + filepath.Dir(dir)}
 }
 
+// resolveSkillsBin returns ("skills", args[1:]) if skills binary is available,
+// otherwise ("npx", original npx args).
+func resolveSkillsBin(npxArgs []string) (string, []string) {
+	if util.Which("skills") != "" {
+		return "skills", npxArgs[2:] // strip "-y skills" prefix
+	}
+	return "npx", npxArgs
+}
+
+// resolveCavemanBin returns ("caveman", cavemanArgs) if global caveman binary
+// is available, else ("npx", npxArgs).
+func resolveCavemanBin(agent string, upgrade bool) (string, []string) {
+	if util.Which("caveman") != "" {
+		args := []string{"--only", agent, "--no-mcp-shrink"}
+		if upgrade {
+			args = append(args, "--force")
+		}
+		return "caveman", args
+	}
+	args := []string{"-y", "github:JuliusBrussee/caveman", "--", "--only", agent, "--no-mcp-shrink"}
+	if upgrade {
+		args = append(args, "--force")
+	}
+	return "npx", args
+}
+
 func ensureOpencodeCommandsDir() {
 	_ = os.MkdirAll(filepath.Join(util.OpenCodePathsResolved().Dir, "commands"), 0o755)
 }
@@ -305,7 +335,18 @@ var caveman = &core.ToolManifest{
 	Channel:      core.ChannelGitHub,
 	NotTrackable: true,
 	Install: func(opts core.RunOpts) (bool, error) {
-		opts.Reportf("installed per agent", 1)
+		if !opts.DryRun && !isTest() && !opts.Upgrade && util.Which("caveman") != "" {
+			opts.Reportf("already installed", 1)
+			return true, nil
+		}
+		opts.Reportf("installing from GitHub", 0.3)
+		if !opts.DryRun && !isTest() && util.Which("npm") != "" {
+			ctx, cancel := context.WithTimeout(context.Background(), 15*time.Minute)
+			_ = util.Run("npm", []string{"install", "-g", "github:JuliusBrussee/caveman"},
+				util.RunOptions{Capture: true, Ctx: ctx})
+			cancel()
+		}
+		opts.Reportf("ready", 1)
 		return true, nil
 	},
 	WireFor: map[string]core.AgentFn{
@@ -328,19 +369,16 @@ var caveman = &core.ToolManifest{
 			return ran, err
 		},
 		"opencode": func(opts core.RunOpts) (bool, error) {
+			if !opts.Upgrade && opencodePluginInstalled() && opencodePluginFilesPresent() {
+				WriteOwner("opencode", "caveman")
+				return true, nil
+			}
 			if !opts.DryRun && !isTest() {
 				ensureOpencodeCommandsDir()
 			}
-			args := []string{"-y", "github:JuliusBrussee/caveman", "--", "--only", "opencode", "--no-mcp-shrink"}
-			if opts.Upgrade {
-				args = append(args, "--force")
-			}
-			ran, err := cavemanExec("npx", args, opts, "npx -y github:JuliusBrussee/caveman -- --only opencode --no-mcp-shrink"+func() string {
-				if opts.Upgrade {
-					return " --force"
-				}
-				return ""
-			}(), cavemanOpencodeInstallEnv()...)
+			bin, args := resolveCavemanBin("opencode", opts.Upgrade)
+			ran, err := cavemanExec(bin, args, opts, bin+" "+strings.Join(args, " "),
+				cavemanOpencodeInstallEnv()...)
 			WriteOwner("opencode", "caveman")
 			if opts.DryRun || isTest() {
 				return ran, err
@@ -353,8 +391,12 @@ var caveman = &core.ToolManifest{
 			return opencodePluginInstalled(), err
 		},
 		"codex": func(opts core.RunOpts) (bool, error) {
-			args := cavemanSkillsAddArgs("codex")
-			ran, err := cavemanExec("npx", args, opts, "npx "+strings.Join(args, ""))
+			if !opts.Upgrade && codexCavemanInstalled() {
+				WriteOwner("codex", "caveman")
+				return true, nil
+			}
+			bin, args := resolveSkillsBin(cavemanSkillsAddArgs("codex"))
+			ran, err := cavemanExec(bin, args, opts, bin+" "+strings.Join(args, " "))
 			WriteOwner("codex", "caveman")
 			if opts.DryRun || isTest() {
 				return ran, err
@@ -364,8 +406,12 @@ var caveman = &core.ToolManifest{
 			return codexCavemanInstalled(), err
 		},
 		"antigravity": func(opts core.RunOpts) (bool, error) {
-			args := cavemanSkillsAddArgs("antigravity")
-			ran, err := cavemanExec("npx", args, opts, "npx "+strings.Join(args, " "))
+			if !opts.Upgrade && antigravityCavemanInstalled() {
+				WriteOwner("antigravity", "caveman")
+				return true, nil
+			}
+			bin, args := resolveSkillsBin(cavemanSkillsAddArgs("antigravity"))
+			ran, err := cavemanExec(bin, args, opts, bin+" "+strings.Join(args, " "))
 			WriteOwner("antigravity", "caveman")
 			if opts.DryRun || isTest() {
 				return ran, err

internal/tools/ponytail.go

@@ -1,9 +1,11 @@
 package tools
 
 import (
+	"context"
 	"os"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/HoangP8/tokless/internal/core"
 	"github.com/HoangP8/tokless/internal/util"
@@ -20,7 +22,9 @@ func ponytailExec(bin string, args []string, opts core.RunOpts, dryHint string,
 	if isTest() {
 		return true, nil
 	}
-	r := util.Run(bin, args, util.RunOptions{Capture: true, Env: env})
+	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Minute)
+	defer cancel()
+	r := util.Run(bin, args, util.RunOptions{Capture: true, Env: env, Ctx: ctx})
 	if r.Code != 0 {
 		util.L.Err("ponytail command failed: " + clip(r.Stderr))
 		return false, nil
@@ -207,6 +211,10 @@ func claudePluginListHasPonytail() bool {
 
 // ponytailWireClaude installs the Claude plugin. AGENTS.md block is the floor.
 func ponytailWireClaude(opts core.RunOpts) (bool, error) {
+	if !opts.Upgrade && claudePonytailInstalled() {
+		WriteOwner("claude", "ponytail")
+		return true, nil
+	}
 	if !opts.DryRun && !isTest() && util.Which("claude") == "" {
 		util.L.Err("ponytail needs the claude CLI (`claude plugin …`); Claude Desktop alone is not enough — install the CLI and re-run")
 		return false, nil
@@ -255,8 +263,14 @@ func ponytailWireOpencode(opts core.RunOpts) (bool, error) {
 		WriteOwner("opencode", "ponytail")
 		return ponytailOpencodeInstalled(), nil
 	}
+	if !opts.Upgrade && ponytailOpencodeInstalled() && ponytailOpencodeFilesPresent() {
+		WriteOwner("opencode", "ponytail")
+		return true, nil
+	}
 	if util.Which("npm") != "" {
-		_ = util.Run("npm", []string{"install", "-g", ponytailOpencodePkg}, util.RunOptions{Capture: true})
+		ctx, cancel := context.WithTimeout(context.Background(), 15*time.Minute)
+		defer cancel()
+		_ = util.Run("npm", []string{"install", "-g", ponytailOpencodePkg}, util.RunOptions{Capture: true, Ctx: ctx})
 	}
 	registerPonytailOpencode()
 	stampPonytailVersion()
@@ -295,6 +309,10 @@ func removePonytailCodexSkillCopies() {
 // ponytailWireCodex adds the marketplace when possible and writes the baseline.
 // Final plugin install/trust is interactive in Codex (/plugins + /hooks).
 func ponytailWireCodex(opts core.RunOpts) (bool, error) {
+	if !opts.Upgrade && codexPonytailInstalled() {
+		WriteOwner("codex", "ponytail")
+		return true, nil
+	}
 	if opts.DryRun {
 		util.L.Sub("[dry-run] would run: codex plugin marketplace add " + ponytailRepo + "; then write AGENTS.md baseline; finish in /plugins + /hooks")
 		WriteOwner("codex", "ponytail")
@@ -321,6 +339,10 @@ func ponytailUnwireCodex(opts core.RunOpts) (bool, error) {
 
 // ponytailWireAntigravity installs the Antigravity extension.
 func ponytailWireAntigravity(opts core.RunOpts) (bool, error) {
+	if !opts.Upgrade && antigravityPonytailInstalled() {
+		WriteOwner("antigravity", "ponytail")
+		return true, nil
+	}
 	if opts.DryRun {
 		util.L.Sub("[dry-run] would run: agy plugin install https://github.com/" + ponytailRepo)
 		WriteOwner("antigravity", "ponytail")

internal/util/progress.go

@@ -31,6 +31,7 @@ type Progress struct {
 	out     *os.File
 	treeStyle bool
 	rows      int
+	lastNonTTY string
 }
 
 func NewProgress(title string) *Progress {
@@ -89,6 +90,7 @@ func (p *Progress) Begin(label string) {
 	p.current = label
 	p.phase = ""
 	p.frac = 0
+	p.lastNonTTY = ""
 	p.start = time.Now()
 	p.active = true
 	if p.tty {
@@ -117,7 +119,19 @@ func (p *Progress) Step(phase string, frac float64) {
 	p.frac = frac
 	if p.tty {
 		p.repaint()
+		p.mu.Unlock()
+		return
+	}
+	if phase == "" || phase == p.lastNonTTY {
+		p.mu.Unlock()
+		return
+	}
+	p.lastNonTTY = phase
+	label := p.current
+	if label == "" {
+		label = p.title
 	}
+	fmt.Fprintf(p.out, "  %s %s\n", C.Dim(pick("·", ".")), label+" — "+phase)
 	p.mu.Unlock()
 }