c204d87b47
Three independent v0.5.3 polish items surfaced during manual WSL smoke testing,
bundled into one commit since they're all string/UX touches with no behavior change.
1. v0.4 lease-prompt tightening (`internal/session/{lease,run,run_preflight}.go`,
`cmd/entry.go`): when ctask is about to enter direct mode on a workspace that
already has a live tmux session, the "Continue anyway?" prompt now suggests
`ctask attach <slug>` as the reattach path. Threaded via
`PreflightOpts.ActiveLeaseHint` / `LaunchOpts.ActiveLeaseHint`; computed in
`cmd/entry.go::directModeTmuxHint` (best-effort: silent when no tmux on PATH
or no session for the workspace). Closes the footgun where a user forgot to
`export CTASK_SESSION_MODE=persistent` in a second terminal and hit the v0.4
coexistence prompt without realizing tmux passive-reattach was the intended
path.
2. Invocation-name in user-facing command hints (`cmd/invocation.go` new,
`cmd/{persistent,entry,resume,doctor}.go`): the binary name printed in
bypass / restore / "create one with" suggestions now reflects
`filepath.Base(os.Args[0])` instead of a hard-coded "ctask". Local-build
PowerShell users running `.\ctask.exe` see `ctask.exe new <ws> --direct`,
matching what they need to type. Installed contexts continue to see `ctask`.
Test seam (`invocationNameOverride`) pins the name to "ctask" in unit tests
so substring assertions stay stable across Go test binary names. Descriptive
prose ("ctask persistent mode requires...") and the ssh-remote hint
(`ssh -t <host> ctask <subcmd>`) intentionally keep the literal "ctask" —
they refer to the program identity / remote invocation, not the local
command form. Affected tests: `cmd/{persistent,resume}_test.go` tightened to
check the full `"<binary> <subcmd> <workspace> --direct"` form.
3. Smoke-checklist fixes (`docs/.../2026-05-08-v0.5.3-smoke-test-checklist.md`):
six issues caught during the run -- S2 now exports CTASK_SESSION_MODE in
both terminals (previously only WSL-A had it, which routed WSL-B's
secondary resume through direct mode instead of passive reattach); O3/A2
tmux-ls expectations corrected (tmux doesn't emit a literal "(detached)"
token); P2 expected behavior rewritten (passive reattach detach returns to
prompt immediately -- AttachExisting calls only shell.AttachSession with
no PollSessionEnd, the owner is responsible for finalize); A1 no longer
asks for Ctrl-C in WSL-B; A6 path now uses a glob (was hardcoded to the
checklist's authoring date, broke on v0.5.1 local-time directory naming);
M1 PATH-hide rewritten to `$HOME/.local/bin` only (was `:/bin` which is a
symlink to /usr/bin on usrmerge systems, did not hide tmux) and uses
`command -v` instead of `which` (which is itself in /usr/bin, unreachable
under the minimal PATH); M3/M4 reordered so the no-workspace verification
runs after PATH is restored (was silently failing under minimal PATH);
T1 wording made "substring match" explicit; T2 wording made N/A
unambiguous; section 10 split into 10a-10f, each a separate input, to
work around PSReadLine multi-line paste parsing.
227 lines
7.9 KiB
Go
227 lines
7.9 KiB
Go
package cmd
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"runtime"
|
|
|
|
"github.com/warrenronsiek/ctask/internal/config"
|
|
"github.com/warrenronsiek/ctask/internal/session"
|
|
"github.com/warrenronsiek/ctask/internal/shell"
|
|
"github.com/warrenronsiek/ctask/internal/workspace"
|
|
)
|
|
|
|
// WorkspaceEntryOptions captures everything the persistent-mode dispatcher
|
|
// needs to enter a workspace. Callers (runNew, runResume, runOpen,
|
|
// runAttach) populate this struct after they have resolved or created the
|
|
// workspace, then call runWorkspaceEntry. The helper handles preflight
|
|
// (when not pre-resolved), session-name computation, lease inspection,
|
|
// dispatch decision, and the fresh_remote confirmation prompt.
|
|
type WorkspaceEntryOptions struct {
|
|
WsPath string // absolute workspace directory
|
|
WsRoot string // top-level root (used for CTASK_ROOT env var)
|
|
WsMeta *workspace.TaskMeta // workspace metadata
|
|
Agent string
|
|
Shell bool // launch interactive shell (open / new --shell)
|
|
Force bool // bypass v0.4 Layer 1/3 prompts (owner-create only)
|
|
Direct bool // user passed --direct
|
|
AlwaysPersistent bool // ctask attach: ignore CTASK_SESSION_MODE
|
|
CommandName string // for hint rendering: "new" | "resume" | "open" | "attach"
|
|
TmuxPath string // pre-resolved tmux path; if empty in persistent mode, runWorkspaceEntry resolves
|
|
NewlyCreated bool // forwarded to LaunchOpts.NewlyCreated
|
|
}
|
|
|
|
// runWorkspaceEntry is the test seam for the persistent-mode dispatcher.
|
|
// Production code calls defaultRunWorkspaceEntry; tests override this
|
|
// variable to capture invocations or simulate the dispatch outcome.
|
|
//
|
|
// Do NOT mark tests that override this in t.Parallel() — it is a package
|
|
// global. Each test must restore via t.Cleanup.
|
|
var runWorkspaceEntry = defaultRunWorkspaceEntry
|
|
|
|
// dispatchDecision enumerates the three persistent-mode entry paths.
|
|
type dispatchDecision int
|
|
|
|
const (
|
|
dispatchOwnerCreate dispatchDecision = iota
|
|
dispatchPassive
|
|
dispatchAdopted
|
|
)
|
|
|
|
// dispatchPersistent is the pure decision function — no I/O, no globals,
|
|
// trivially testable.
|
|
func dispatchPersistent(hasTmuxSession bool, leaseState session.LeaseState) dispatchDecision {
|
|
if !hasTmuxSession {
|
|
return dispatchOwnerCreate
|
|
}
|
|
if leaseState == session.LeaseStateFreshLocal {
|
|
return dispatchPassive
|
|
}
|
|
return dispatchAdopted
|
|
}
|
|
|
|
func defaultRunWorkspaceEntry(opts WorkspaceEntryOptions) error {
|
|
mode := config.ResolveSessionMode()
|
|
persistent := opts.AlwaysPersistent || (mode == "persistent" && !opts.Direct)
|
|
|
|
// Direct flag with persistent env: confirm if a tmux session exists.
|
|
if !persistent && mode == "persistent" && opts.Direct {
|
|
if err := confirmDirectBypass(opts); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
if !persistent {
|
|
return invokeDirectRun(opts)
|
|
}
|
|
|
|
tmuxPath := opts.TmuxPath
|
|
if tmuxPath == "" {
|
|
var err error
|
|
tmuxPath, err = preflightPersistentEntry(opts.CommandName)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
absWs, _ := filepath.Abs(opts.WsPath)
|
|
sessionName := session.SessionName(opts.WsMeta.Category, opts.WsMeta.Slug, absWs)
|
|
hasSession := shell.HasSession(tmuxPath, sessionName)
|
|
leaseState := session.InspectLease(opts.WsPath)
|
|
|
|
switch dispatchPersistent(hasSession, leaseState) {
|
|
case dispatchOwnerCreate:
|
|
return invokePersistentRun(opts, tmuxPath, sessionName)
|
|
case dispatchPassive:
|
|
return session.AttachExisting(tmuxPath, sessionName)
|
|
case dispatchAdopted:
|
|
if leaseState == session.LeaseStateFreshRemote {
|
|
if err := confirmFreshRemoteAdoption(opts.WsPath); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return invokePersistentAdoption(opts, tmuxPath, sessionName)
|
|
}
|
|
return fmt.Errorf("internal: unreachable persistent dispatch")
|
|
}
|
|
|
|
func entryEnvVars(opts WorkspaceEntryOptions) map[string]string {
|
|
return config.EnvVars(
|
|
opts.WsMeta.Slug, opts.WsMeta.Mode,
|
|
opts.WsRoot, opts.WsPath,
|
|
opts.WsMeta.Category, workspace.EffectiveType(opts.WsMeta),
|
|
opts.WsMeta.LaunchDir,
|
|
)
|
|
}
|
|
|
|
func invokeDirectRun(opts WorkspaceEntryOptions) error {
|
|
return session.Run(session.LaunchOpts{
|
|
WsDir: opts.WsPath,
|
|
EnvVars: entryEnvVars(opts),
|
|
Agent: opts.Agent,
|
|
Mode: opts.WsMeta.Mode,
|
|
Slug: opts.WsMeta.Slug,
|
|
Shell: opts.Shell,
|
|
LaunchDir: opts.WsMeta.LaunchDir,
|
|
Category: opts.WsMeta.Category,
|
|
Force: opts.Force,
|
|
NewlyCreated: opts.NewlyCreated,
|
|
ActiveLeaseHint: directModeTmuxHint(opts),
|
|
})
|
|
}
|
|
|
|
// directModeTmuxHint returns a Layer-1 prompt suggestion when ctask is
|
|
// about to enter direct mode on a workspace that already has a live tmux
|
|
// session — pointing the user at `ctask attach <slug>` as the reattach
|
|
// path. Returns "" when no hint is appropriate (no tmux on PATH, no
|
|
// session for this workspace, or native Windows without WSL).
|
|
//
|
|
// This is a best-effort UX nudge: the lookup is silent on error so a
|
|
// missing/broken tmux never blocks the direct-mode path.
|
|
func directModeTmuxHint(opts WorkspaceEntryOptions) string {
|
|
if runtime.GOOS == "windows" && os.Getenv("WSL_DISTRO_NAME") == "" {
|
|
return ""
|
|
}
|
|
tmuxPath, err := exec.LookPath("tmux")
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
absWs, _ := filepath.Abs(opts.WsPath)
|
|
sessionName := session.SessionName(opts.WsMeta.Category, opts.WsMeta.Slug, absWs)
|
|
if !shell.HasSession(tmuxPath, sessionName) {
|
|
return ""
|
|
}
|
|
return fmt.Sprintf(
|
|
"Tip: a tmux session exists for this workspace.\nTo reattach instead of starting a second direct-mode session, run:\n %s attach %s",
|
|
invocationName(), opts.WsMeta.Slug)
|
|
}
|
|
|
|
func invokePersistentRun(opts WorkspaceEntryOptions, tmuxPath, sessionName string) error {
|
|
return session.Run(session.LaunchOpts{
|
|
WsDir: opts.WsPath,
|
|
EnvVars: entryEnvVars(opts),
|
|
Agent: opts.Agent,
|
|
Mode: opts.WsMeta.Mode,
|
|
Slug: opts.WsMeta.Slug,
|
|
Shell: opts.Shell,
|
|
LaunchDir: opts.WsMeta.LaunchDir,
|
|
Category: opts.WsMeta.Category,
|
|
SessionMode: "persistent",
|
|
SessionName: sessionName,
|
|
TmuxPath: tmuxPath,
|
|
Force: opts.Force,
|
|
NewlyCreated: opts.NewlyCreated,
|
|
})
|
|
}
|
|
|
|
func invokePersistentAdoption(opts WorkspaceEntryOptions, tmuxPath, sessionName string) error {
|
|
return session.AdoptExistingPersistentSession(tmuxPath, sessionName, opts.WsPath, session.LaunchOpts{
|
|
WsDir: opts.WsPath,
|
|
EnvVars: entryEnvVars(opts),
|
|
Agent: opts.Agent,
|
|
Mode: opts.WsMeta.Mode,
|
|
Slug: opts.WsMeta.Slug,
|
|
Shell: opts.Shell,
|
|
LaunchDir: opts.WsMeta.LaunchDir,
|
|
Category: opts.WsMeta.Category,
|
|
SessionMode: "persistent",
|
|
SessionName: sessionName,
|
|
TmuxPath: tmuxPath,
|
|
})
|
|
}
|
|
|
|
// confirmDirectBypass is invoked when the user passes --direct under
|
|
// persistent mode. If a tmux session exists for the workspace, prompt for
|
|
// confirmation. Otherwise, print a one-line warning and proceed.
|
|
func confirmDirectBypass(opts WorkspaceEntryOptions) error {
|
|
// Native Windows / no WSL: no tmux can exist; silent proceed.
|
|
if runtime.GOOS == "windows" && os.Getenv("WSL_DISTRO_NAME") == "" {
|
|
return nil
|
|
}
|
|
tmuxPath, err := exec.LookPath("tmux")
|
|
if err != nil {
|
|
fmt.Fprintln(os.Stderr,
|
|
"[ctask] warning: --direct bypassing persistent mode (no tmux session exists for this workspace)")
|
|
return nil
|
|
}
|
|
absWs, _ := filepath.Abs(opts.WsPath)
|
|
sessionName := session.SessionName(opts.WsMeta.Category, opts.WsMeta.Slug, absWs)
|
|
if !shell.HasSession(tmuxPath, sessionName) {
|
|
fmt.Fprintln(os.Stderr,
|
|
"[ctask] warning: --direct bypassing persistent mode (no tmux session exists for this workspace)")
|
|
return nil
|
|
}
|
|
fmt.Fprintf(os.Stderr,
|
|
"A persistent tmux session exists for this workspace:\n %s\n\n"+
|
|
"Opening a direct-mode shell may create conflicting workspace activity.\n"+
|
|
"The recommended path is:\n %s attach %s\n\n"+
|
|
"Continue with --direct anyway? [y/N] ",
|
|
sessionName, invocationName(), opts.WsMeta.Slug)
|
|
if !session.ConfirmYN(os.Stdin, os.Stderr, "", false) {
|
|
return fmt.Errorf("canceled by user")
|
|
}
|
|
return nil
|
|
}
|