git-worktree-pool 0.1.4 → 0.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. package/README.md +26 -3
  2. package/dist/cli/commands/assign.js +19 -1
  3. package/dist/cli/commands/assign.js.map +1 -1
  4. package/dist/cli/commands/delete.js +16 -4
  5. package/dist/cli/commands/delete.js.map +1 -1
  6. package/dist/cli/commands/free.js +14 -2
  7. package/dist/cli/commands/free.js.map +1 -1
  8. package/dist/cli/commands/help.js +3 -3
  9. package/dist/cli/lifecycle.js +113 -0
  10. package/dist/cli/lifecycle.js.map +1 -0
  11. package/dist/cli/main.js +2 -0
  12. package/dist/cli/main.js.map +1 -1
  13. package/dist/core/delete.js +11 -5
  14. package/dist/core/delete.js.map +1 -1
  15. package/dist/core/free.js +17 -4
  16. package/dist/core/free.js.map +1 -1
  17. package/dist/core/lifecycle.js +121 -0
  18. package/dist/core/lifecycle.js.map +1 -0
  19. package/dist/platform/git-bash.js +23 -0
  20. package/dist/platform/git-bash.js.map +1 -0
  21. package/dist/platform/launchers.js +1 -1
  22. package/dist/platform/script-run.js +101 -0
  23. package/dist/platform/script-run.js.map +1 -0
  24. package/dist/platform/script-shell.js +48 -0
  25. package/dist/platform/script-shell.js.map +1 -0
  26. package/dist/platform/shell-init.js +5 -4
  27. package/dist/platform/shell-init.js.map +1 -1
  28. package/dist/tui/App.js +117 -12
  29. package/dist/tui/App.js.map +1 -1
  30. package/dist/tui/Popup.js +1 -1
  31. package/dist/tui/Popup.js.map +1 -1
  32. package/dist/tui/run.js +18 -6
  33. package/dist/tui/run.js.map +1 -1
  34. package/dist/ui/ansi.js +8 -0
  35. package/dist/ui/ansi.js.map +1 -1
  36. package/dist/ui/glyphs.js +2 -0
  37. package/dist/ui/glyphs.js.map +1 -1
  38. package/launchers/wtp +1 -1
  39. package/launchers/wtp.cmd +3 -1
  40. package/launchers/wtp.ps1 +19 -6
  41. package/package.json +8 -8
package/README.md CHANGED
@@ -53,10 +53,10 @@ wtp works from the clone, from the pool folder, and from any slot.
53
53
  |---|---|
54
54
  | `wtp` | Opens the TUI. |
55
55
  | `wtp list`, `wtp ls` | Prints the slot table. `--json` prints the data. `--no-changes` skips the change counts. |
56
- | `wtp assign <branch>` | Gives the branch a slot, copies the path, and moves the shell there. `--no-cd` only copies. When the branch is already in a slot, wtp offers to switch there. |
56
+ | `wtp assign <branch>` | Gives the branch a slot, copies the path, and moves the shell there. `--no-cd` only copies. `--no-setup` skips the setup script. When the branch is already in a slot, wtp offers to switch there. |
57
57
  | `wtp switch <index\|branch>` | Copies the slot path and moves the shell there. A branch name must match exactly. It also reaches a worktree outside the pool. |
58
- | `wtp free <index>` | Asks, then discards uncommitted changes, releases the branch, and marks the slot free. `--yes` skips the question. `--force` frees a locked slot. |
59
- | `wtp delete <index>` | Asks, then discards uncommitted changes and removes the slot folder. `--yes` skips the question. `--branch` also deletes the local branch. `--force` allows unmerged branches and locked slots. |
58
+ | `wtp free <index>` | Asks, then discards uncommitted changes, releases the branch, and marks the slot free. `--yes` skips the question. `--force` frees a locked slot. `--no-teardown` skips the teardown script. |
59
+ | `wtp delete <index>` | Asks, then discards uncommitted changes and removes the slot folder. `--yes` skips the question. `--branch` also deletes the local branch. `--force` allows unmerged branches and locked slots. `--no-teardown` skips the teardown script. |
60
60
  | `wtp path <index\|branch>` | Prints the slot path. |
61
61
  | `wtp doctor` | Reports pool problems and repairs the safe ones. |
62
62
 
@@ -88,6 +88,29 @@ Per-repo settings live in git config:
88
88
 
89
89
  For example: `git config wtp.base develop`.
90
90
 
91
+ ## Setup and teardown scripts
92
+
93
+ wtp runs a repo's [Superset](https://docs.superset.sh/setup-teardown-scripts) scripts, so one `.superset/` folder serves both tools. A minimal `.superset/config.json`:
94
+
95
+ ```json
96
+ { "setup": ["npm install"] }
97
+ ```
98
+
99
+ | Event | Runs |
100
+ |---|---|
101
+ | `assign` (new or reused slot) | `setup`, after the branch is checked out |
102
+ | `free`, `delete` of an active slot | `teardown`, before wtp frees or removes the slot |
103
+
104
+ * wtp joins the commands with `&&` and runs them in the shell you called wtp from: cmd, PowerShell, bash, zsh or fish. A team on several systems should write `npm run <script>` and keep the logic in `package.json`.
105
+ * Without a `setup` or `teardown` key, wtp runs `.superset/setup.sh` or `teardown.sh` through bash (Git Bash on Windows).
106
+ * The scripts get `SUPERSET_ROOT_PATH` (the clone), `SUPERSET_WORKSPACE_NAME` (the branch), `SUPERSET_WORKSPACE_PATH` (the slot), and `WTP_SLOT` (the slot index).
107
+ * If setup fails, the slot stays assigned and wtp still moves you there. `wtp assign` then exits with code 4.
108
+ * If teardown fails, wtp warns and frees or deletes the slot anyway. The TUI asks first. Teardown stops after 60 seconds.
109
+ * `--no-setup` and `--no-teardown` skip the scripts.
110
+ * The user override (`~/.superset/projects/<repo path>/config.json`) and `config.local.json` work as in Superset. On Windows, the drive letter has no colon: `~/.superset/projects/C/Dev/my-repo/config.json`.
111
+ * A reused slot keeps ignored files, so a personal `.superset/config.local.json` left in a slot also applies to the next branch there.
112
+ * The shell rule needs the current launchers. After an update, run `worktree-pool setup` again; `wtp doctor` says when a launcher is old. With an old launcher, wtp uses cmd on Windows and `$SHELL` elsewhere.
113
+
91
114
  ## Notes
92
115
 
93
116
  * Slot 0 is your clone. wtp never frees or deletes it.
@@ -2,6 +2,7 @@ import { assign } from "../../core/assign.js";
2
2
  import { resolveContext } from "../../core/context.js";
3
3
  import { BranchInUseError, UserError } from "../../core/errors.js";
4
4
  import { loadPool } from "../../core/pool.js";
5
+ import { cliFailure, runLifecycle, SCRIPT_FAILED_EXIT, withSigint } from "../lifecycle.js";
5
6
  import { assignSummary } from "../../ui/labels.js";
6
7
  import { moveShellTo } from "../move.js";
7
8
  import { renderPlainTable } from "./list.js";
@@ -33,9 +34,26 @@ export async function assignCommand(args, io) {
33
34
  for (const w of r.warnings)
34
35
  io.stderr.write(`! ${w}\n`);
35
36
  io.stderr.write(`${assignSummary(name, r)}\n`);
37
+ // A failed setup keeps the slot, and the shell still moves there, so the user can fix it in place.
38
+ let failed = false;
39
+ if (!args.values["no-setup"]) {
40
+ const setup = await withSigint((signal) => runLifecycle("setup", { root: ctx.root, index: r.index, path: r.path, branch: name }, {
41
+ env: io.env,
42
+ platform: io.platform,
43
+ home: io.home,
44
+ output: "inherit",
45
+ signal,
46
+ onStart: (display) => io.stderr.write(`setup: ${display}\n`),
47
+ warn: (w) => io.stderr.write(`! ${w}\n`)
48
+ }));
49
+ if (setup.status === "failed") {
50
+ cliFailure("setup", setup, io);
51
+ failed = true;
52
+ }
53
+ }
36
54
  const cd = !args.values["no-cd"];
37
55
  await moveShellTo(r.path, io, { copy: true, cd });
38
56
  io.stdout.write(renderPlainTable(await loadPool({ ...ctx, cwd: cd ? r.path : ctx.cwd }, { changes: true }), io));
39
- return 0;
57
+ return failed ? SCRIPT_FAILED_EXIT : 0;
40
58
  }
41
59
  //# sourceMappingURL=assign.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"assign.js","sourceRoot":"","sources":["../../../src/cli/commands/assign.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"assign.js","sourceRoot":"","sources":["../../../src/cli/commands/assign.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,13 @@
1
1
  import path from "node:path";
2
2
  import { resolveContext } from "../../core/context.js";
3
- import { deleteSlot } from "../../core/delete.js";
3
+ import { assertDeletable, deleteSlot } from "../../core/delete.js";
4
4
  import { UserError } from "../../core/errors.js";
5
5
  import { describeLoss, inspectSlot } from "../../core/free.js";
6
6
  import { isInside } from "../../core/naming.js";
7
7
  import { loadPool, requireSlot } from "../../core/pool.js";
8
8
  import { deletedText } from "../../ui/labels.js";
9
9
  import { parseIndex } from "../args.js";
10
+ import { afterTeardown, cliTeardown } from "../lifecycle.js";
10
11
  import { showPoolAfter } from "../move.js";
11
12
  export async function deleteCommand(args, io) {
12
13
  const index = parseIndex(args.positionals[0], "wtp delete <index>");
@@ -41,11 +42,22 @@ export async function deleteCommand(args, io) {
41
42
  return 1;
42
43
  }
43
44
  }
44
- const r = await deleteSlot(ctx, index, {
45
+ const tore = slot.state === "active" && !args.values["no-teardown"];
46
+ let teardown = "skipped";
47
+ if (tore) {
48
+ assertDeletable(slot, index, force);
49
+ teardown = await cliTeardown(ctx.root, slot, io);
50
+ if (teardown === "interrupted") {
51
+ io.stderr.write(`Teardown interrupted. Slot ${index} was not deleted.\n`);
52
+ return 1;
53
+ }
54
+ }
55
+ const r = await afterTeardown(teardown === "ran", () => deleteSlot(ctx, index, {
45
56
  discard: true,
46
57
  unlock: force,
47
- deleteBranch: args.values.branch ? (force ? "force" : "safe") : false
48
- });
58
+ deleteBranch: args.values.branch ? (force ? "force" : "safe") : false,
59
+ expectBranch: tore ? slot.branch : undefined
60
+ }));
49
61
  for (const w of r.warnings)
50
62
  io.stderr.write(`! ${w}\n`);
51
63
  io.stderr.write(`${deletedText(index, r.branchDeleted ? r.branch : null)}\n`);
@@ -1 +1 @@
1
- {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/cli/commands/delete.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/cli/commands/delete.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,10 @@
1
1
  import path from "node:path";
2
2
  import { resolveContext } from "../../core/context.js";
3
- import { describeLoss, free, inspectSlot } from "../../core/free.js";
3
+ import { assertFreeable, describeLoss, free, inspectSlot } from "../../core/free.js";
4
4
  import { loadPool, requireSlot } from "../../core/pool.js";
5
5
  import { freedText } from "../../ui/labels.js";
6
6
  import { parseIndex } from "../args.js";
7
+ import { afterTeardown, cliTeardown } from "../lifecycle.js";
7
8
  import { showPoolAfter } from "../move.js";
8
9
  export async function freeCommand(args, io) {
9
10
  const index = parseIndex(args.positionals[0], "wtp free <index>");
@@ -23,7 +24,18 @@ export async function freeCommand(args, io) {
23
24
  return 1;
24
25
  }
25
26
  }
26
- await free(ctx, index, { force: Boolean(args.values.force) });
27
+ const force = Boolean(args.values.force);
28
+ const tore = slot.state === "active" && !args.values["no-teardown"];
29
+ let teardown = "skipped";
30
+ if (tore) {
31
+ assertFreeable(slot, index, force);
32
+ teardown = await cliTeardown(ctx.root, slot, io);
33
+ if (teardown === "interrupted") {
34
+ io.stderr.write(`Teardown interrupted. Slot ${index} was not freed.\n`);
35
+ return 1;
36
+ }
37
+ }
38
+ await afterTeardown(teardown === "ran", () => free(ctx, index, { force, expectBranch: tore ? slot.branch : undefined }));
27
39
  io.stderr.write(`${freedText(index)}\n`);
28
40
  await showPoolAfter(ctx, slot.path, io);
29
41
  return 0;
@@ -1 +1 @@
1
- {"version":3,"file":"free.js","sourceRoot":"","sources":["../../../src/cli/commands/free.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAGxC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,IAAU,EAAE,EAAM;IAChD,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAClE,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,QAAQ,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7D,IAAI,IAAI,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;QACxB,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,KAAK,qBAAqB,CAAC,CAAC;QACpD,OAAO,CAAC,CAAC;IACb,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,KAAK,KAAK,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,IAAI,UAAU,MAAM,CAAC,CAAC;QACrG,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC;YAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC;QACtE,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC;YAC3C,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC/C,OAAO,CAAC,CAAC;QACb,CAAC;IACL,CAAC;IAED,MAAM,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC9D,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACxC,OAAO,CAAC,CAAC;AACb,CAAC"}
1
+ {"version":3,"file":"free.js","sourceRoot":"","sources":["../../../src/cli/commands/free.ts"],"names":[],"mappings":"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"}
@@ -3,10 +3,10 @@ const HELP = `wtp - a pool of reusable git worktrees
3
3
  Usage:
4
4
  wtp open the TUI (plain list when not in a terminal)
5
5
  wtp list | ls print the slot table [--json] [--no-changes]
6
- wtp assign <branch> give a branch a slot, copy its path, cd to it [--no-cd]
6
+ wtp assign <branch> give a branch a slot, copy its path, cd to it [--no-cd] [--no-setup]
7
7
  wtp switch <index|branch> copy the slot path and cd to it
8
- wtp free <index> reset a slot and mark it free [--yes] [--force]
9
- wtp delete <index> remove a slot [--yes] [--branch] [--force]
8
+ wtp free <index> reset a slot and mark it free [--yes] [--force] [--no-teardown]
9
+ wtp delete <index> remove a slot [--yes] [--branch] [--force] [--no-teardown]
10
10
  wtp path <index|branch> print a slot path
11
11
  wtp setup set up the wtp command for your shells, once [--yes] [--remove]
12
12
  wtp doctor report and repair pool problems
@@ -0,0 +1,113 @@
1
+ import { existsSync } from "node:fs";
2
+ import { UserError } from "../core/errors.js";
3
+ import { resolveLifecycle } from "../core/lifecycle.js";
4
+ import { findGitBash } from "../platform/git-bash.js";
5
+ import { runSpawn } from "../platform/script-run.js";
6
+ import { composeSpawn, pickShell } from "../platform/script-shell.js";
7
+ // Runs a slot's Superset setup or teardown: resolve the config, pick the calling shell, run the line.
8
+ export const SCRIPT_FAILED_EXIT = 4;
9
+ // Superset's TEARDOWN_TIMEOUT_MS. Setup has no timeout, as in Superset.
10
+ export const TEARDOWN_TIMEOUT_MS = 60_000;
11
+ export async function runLifecycle(key, target, deps) {
12
+ const { script, warnings } = await resolveLifecycle(key, { root: target.root, slot: target.path, home: deps.home, platform: deps.platform });
13
+ for (const w of warnings)
14
+ deps.warn(w);
15
+ if (!script)
16
+ return { status: "skipped" };
17
+ const picked = pickShell(deps.env, deps.platform);
18
+ if (picked.warning)
19
+ deps.warn(picked.warning);
20
+ const win = deps.platform === "win32";
21
+ // On Windows, "bash" on PATH can be WSL's launcher, so use the bash that ships with Git.
22
+ const bashExe = win ? await findGitBash({ platform: deps.platform }) : "bash";
23
+ const shell = win && picked.shell.exe === "bash" && bashExe ? { ...picked.shell, exe: bashExe } : picked.shell;
24
+ const spec = composeSpawn(script, shell, bashExe);
25
+ if (!spec) {
26
+ deps.warn(`skipped ${script.kind === "script" ? script.scriptPath : key}: Git Bash was not found`);
27
+ return { status: "skipped" };
28
+ }
29
+ const env = {
30
+ ...deps.env,
31
+ SUPERSET_ROOT_PATH: target.root,
32
+ SUPERSET_WORKSPACE_NAME: target.branch ?? "",
33
+ SUPERSET_WORKSPACE_PATH: target.path,
34
+ WTP_SLOT: String(target.index)
35
+ };
36
+ // A script that runs wtp must not write this process's folder handoff file.
37
+ delete env.WTP_CWD_FILE;
38
+ deps.onStart?.(spec.display);
39
+ // Node reports a missing cwd as "spawn cmd.exe ENOENT", which reads as a missing shell.
40
+ if (!existsSync(script.cwd)) {
41
+ return { status: "failed", display: spec.display, code: null, timedOut: false, interrupted: false, tail: `cwd ${script.cwd} does not exist` };
42
+ }
43
+ const r = await runSpawn(spec, {
44
+ cwd: script.cwd,
45
+ env,
46
+ output: deps.output,
47
+ signal: deps.signal,
48
+ timeoutMs: key === "teardown" ? TEARDOWN_TIMEOUT_MS : undefined
49
+ });
50
+ if (r.code === 0 && !r.timedOut && !r.interrupted)
51
+ return { status: "ok", display: spec.display };
52
+ return { status: "failed", display: spec.display, ...r };
53
+ }
54
+ export function failureText(key, f) {
55
+ if (f.timedOut)
56
+ return `${key} timed out after ${TEARDOWN_TIMEOUT_MS / 1000} s`;
57
+ if (f.interrupted)
58
+ return `${key} was interrupted`;
59
+ return f.code === null ? `${key} failed` : `${key} failed with exit code ${f.code}`;
60
+ }
61
+ // While a script runs, Ctrl+C reaches it through the console. wtp must outlive it to finish the
62
+ // command (hand off the folder, or abort a free), so SIGINT aborts the script instead of ending wtp.
63
+ export async function withSigint(job) {
64
+ const ac = new AbortController();
65
+ const onSigint = () => ac.abort();
66
+ process.on("SIGINT", onSigint);
67
+ try {
68
+ return await job(ac.signal);
69
+ }
70
+ finally {
71
+ process.off("SIGINT", onSigint);
72
+ }
73
+ }
74
+ // The plain CLI's failure line. A script that never started has its reason only in the tail,
75
+ // because the CLI streams the output and keeps no tail of its own.
76
+ export function cliFailure(key, f, io) {
77
+ io.stderr.write(`! ${failureText(key, f)}\n`);
78
+ if (f.code === null && !f.timedOut && !f.interrupted && f.tail)
79
+ io.stderr.write(`! ${f.tail.trim()}\n`);
80
+ }
81
+ // The plain CLI's teardown before free or delete. A failure only warns, as in Superset's CLI.
82
+ // "interrupted": Ctrl+C stopped it, and the command must change nothing else.
83
+ export async function cliTeardown(root, slot, io) {
84
+ const r = await withSigint((signal) => runLifecycle("teardown", { root, ...slot }, {
85
+ env: io.env,
86
+ platform: io.platform,
87
+ home: io.home,
88
+ output: "inherit",
89
+ signal,
90
+ onStart: (display) => io.stderr.write(`teardown: ${display}\n`),
91
+ warn: (w) => io.stderr.write(`! ${w}\n`)
92
+ }));
93
+ if (r.status === "skipped")
94
+ return "skipped";
95
+ if (r.status === "ok")
96
+ return "ran";
97
+ if (r.interrupted)
98
+ return "interrupted";
99
+ cliFailure("teardown", r, io);
100
+ return "ran";
101
+ }
102
+ // A refusal after teardown leaves the slot active but torn down. Say so.
103
+ export async function afterTeardown(ran, job) {
104
+ try {
105
+ return await job();
106
+ }
107
+ catch (e) {
108
+ if (ran && e instanceof UserError && !/teardown/.test(e.message))
109
+ throw new UserError(`${e.message} Its teardown already ran.`);
110
+ throw e;
111
+ }
112
+ }
113
+ //# sourceMappingURL=lifecycle.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../src/cli/lifecycle.ts"],"names":[],"mappings":"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"}
package/dist/cli/main.js CHANGED
@@ -20,6 +20,8 @@ const OPTIONS = {
20
20
  "force": { type: "boolean" },
21
21
  "branch": { type: "boolean" },
22
22
  "no-cd": { type: "boolean" },
23
+ "no-setup": { type: "boolean" },
24
+ "no-teardown": { type: "boolean" },
23
25
  "remove": { type: "boolean" },
24
26
  "help": { type: "boolean", short: "h" },
25
27
  "version": { type: "boolean", short: "v" }
@@ -1 +1 @@
1
- {"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { rename, rm } from "node:fs/promises";
2
2
  import { GitError, UserError } from "./errors.js";
3
+ import { assertUnchanged } from "./free.js";
3
4
  import { runGit, tryGit } from "./git.js";
4
5
  import { withPoolLock } from "./lock.js";
5
6
  import { markerPath } from "./naming.js";
@@ -55,14 +56,19 @@ async function removeWorktree(ctx, dir, index, opts) {
55
56
  throw new UserError(`git removed slot ${index}, but files in ${dir} are still in use. Close the program that holds them, then delete the folder by hand.`);
56
57
  }
57
58
  }
59
+ // The refusals that need no lock. The command layer runs them before teardown, so a refusal comes first.
60
+ export function assertDeletable(slot, index, unlock) {
61
+ if (slot.problem === "unregistered") {
62
+ throw new UserError(`${slot.path} is not a registered worktree. wtp does not delete it. Check what it holds and remove it by hand.`);
63
+ }
64
+ if (slot.locked && !unlock)
65
+ throw new UserError(`Slot ${index} is locked by git worktree lock. Pass --force to delete it.`);
66
+ }
58
67
  export async function deleteSlot(ctx, index, opts = {}) {
59
68
  return withPoolLock(ctx.poolRoot, async () => {
60
69
  const slot = requireSlot(await loadPool(ctx), index, "delete");
61
- if (slot.problem === "unregistered") {
62
- throw new UserError(`${slot.path} is not a registered worktree. wtp does not delete it. Check what it holds and remove it by hand.`);
63
- }
64
- if (slot.locked && !opts.unlock)
65
- throw new UserError(`Slot ${index} is locked by git worktree lock. Pass --force to delete it.`);
70
+ assertUnchanged(slot, index, opts.expectBranch);
71
+ assertDeletable(slot, index, Boolean(opts.unlock));
66
72
  const branch = slot.state === "active" ? slot.branch : null;
67
73
  if (slot.problem === "missing")
68
74
  await runGit(["worktree", "prune"], ctx.root);
@@ -1 +1 @@
1
- {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../src/core/delete.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../src/core/delete.ts"],"names":[],"mappings":"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"}
package/dist/core/free.js CHANGED
@@ -32,15 +32,28 @@ export function describeLoss(info) {
32
32
  lines.push("Ignored files (node_modules, build output) stay.");
33
33
  return lines;
34
34
  }
35
+ // The refusals that need no lock. The command layer runs them before teardown, so a refusal comes first.
36
+ export function assertFreeable(slot, index, force) {
37
+ if (slot.state === "broken")
38
+ throw new UserError(`Slot ${index} is broken (${problemLabel(slot.problem)}). Run wtp doctor.`);
39
+ if (slot.locked && !force)
40
+ throw new UserError(`Slot ${index} is locked by git worktree lock. Pass --force to free it.`);
41
+ }
42
+ // Teardown runs outside the lock. After it, the slot must still hold the branch that the teardown saw.
43
+ export function assertUnchanged(slot, index, expectBranch) {
44
+ if (expectBranch === undefined)
45
+ return;
46
+ if (slot.state !== "active" || slot.branch !== expectBranch) {
47
+ throw new UserError(`Slot ${index} changed while its teardown ran. Nothing else changed.`);
48
+ }
49
+ }
35
50
  export async function free(ctx, index, opts = {}) {
36
51
  return withPoolLock(ctx.poolRoot, async () => {
37
52
  const slot = requireSlot(await loadPool(ctx), index, "free");
53
+ assertUnchanged(slot, index, opts.expectBranch);
38
54
  if (slot.state === "free")
39
55
  return { index, path: slot.path, alreadyFree: true };
40
- if (slot.state === "broken")
41
- throw new UserError(`Slot ${index} is broken (${problemLabel(slot.problem)}). Run wtp doctor.`);
42
- if (slot.locked && !opts.force)
43
- throw new UserError(`Slot ${index} is locked by git worktree lock. Pass --force to free it.`);
56
+ assertFreeable(slot, index, Boolean(opts.force));
44
57
  await runGit(["reset", "--hard", "--quiet"], slot.path);
45
58
  await runGit(["clean", "-fd", "--quiet"], slot.path);
46
59
  await runGit(["switch", "--detach", "--quiet"], slot.path);
@@ -1 +1 @@
1
- {"version":3,"file":"free.js","sourceRoot":"","sources":["../../src/core/free.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"free.js","sourceRoot":"","sources":["../../src/core/free.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,121 @@
1
+ import { existsSync } from "node:fs";
2
+ import { readFile } from "node:fs/promises";
3
+ import path from "node:path";
4
+ const SCRIPT_KEYS = ["setup", "teardown", "run", "start"];
5
+ const isStrings = (v) => Array.isArray(v) && v.every((x) => typeof x === "string");
6
+ const isObject = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
7
+ const configFile = (dir, name) => path.join(dir, ".superset", name);
8
+ // Superset has no Windows rule. Its path.join would put "C:" inside the path, so drop the colon.
9
+ export function userOverridePath(home, root, platform) {
10
+ const p = platform === "win32" ? path.win32 : path.posix;
11
+ const parts = root.split(/[\\/]+/).filter(Boolean).map((s) => s.replace(/:$/, ""));
12
+ return p.join(home, ".superset", "projects", ...parts, "config.json");
13
+ }
14
+ // Missing: null, silently. Unreadable or invalid: null, with a warning. Superset logs the same cases and goes on.
15
+ async function readJson(file, warnings) {
16
+ if (!existsSync(file))
17
+ return null;
18
+ try {
19
+ const text = await readFile(file, "utf8");
20
+ // Notepad saves UTF-8 with a BOM, and JSON.parse rejects it.
21
+ return JSON.parse(text.charCodeAt(0) === 0xfeff ? text.slice(1) : text);
22
+ }
23
+ catch (e) {
24
+ warnings.push(`ignored ${file}: ${e.message}`);
25
+ return null;
26
+ }
27
+ }
28
+ async function readBase(file, warnings) {
29
+ const parsed = await readJson(file, warnings);
30
+ if (parsed === null)
31
+ return null;
32
+ const bad = (why) => {
33
+ warnings.push(`ignored ${file}: ${why}`);
34
+ return null;
35
+ };
36
+ if (!isObject(parsed))
37
+ return bad("it is not a JSON object");
38
+ const out = {};
39
+ if (parsed.cwd !== undefined) {
40
+ if (typeof parsed.cwd !== "string" || parsed.cwd.trim() === "")
41
+ return bad("'cwd' must be a non-empty string");
42
+ out.cwd = parsed.cwd.trim();
43
+ }
44
+ for (const key of SCRIPT_KEYS) {
45
+ const v = parsed[key];
46
+ if (v === undefined)
47
+ continue;
48
+ if (!isStrings(v))
49
+ return bad(`'${key}' must be an array of strings`);
50
+ out[key] = v;
51
+ }
52
+ return out;
53
+ }
54
+ async function readLocal(file, warnings) {
55
+ const parsed = await readJson(file, warnings);
56
+ if (parsed === null)
57
+ return null;
58
+ const bad = (why) => {
59
+ warnings.push(`ignored ${file}: ${why}`);
60
+ return null;
61
+ };
62
+ if (!isObject(parsed))
63
+ return bad("it is not a JSON object");
64
+ const out = {};
65
+ for (const key of SCRIPT_KEYS) {
66
+ const v = parsed[key];
67
+ if (v === undefined)
68
+ continue;
69
+ if (isStrings(v)) {
70
+ out[key] = v;
71
+ continue;
72
+ }
73
+ if (!isObject(v))
74
+ return bad(`'${key}' must be an array or {before, after}`);
75
+ if (v.before !== undefined && !isStrings(v.before))
76
+ return bad(`'${key}.before' must be an array of strings`);
77
+ if (v.after !== undefined && !isStrings(v.after))
78
+ return bad(`'${key}.after' must be an array of strings`);
79
+ out[key] = { before: v.before, after: v.after };
80
+ }
81
+ return out;
82
+ }
83
+ // Per key, the later config wins when it defines the key. An empty array counts as defined.
84
+ function merge(lower, higher) {
85
+ if (!lower)
86
+ return higher;
87
+ if (!higher)
88
+ return lower;
89
+ const out = { cwd: higher.cwd ?? lower.cwd };
90
+ for (const key of SCRIPT_KEYS)
91
+ out[key] = higher[key] ?? lower[key];
92
+ return out;
93
+ }
94
+ export async function resolveLifecycle(key, at) {
95
+ const warnings = [];
96
+ const repo = await readBase(configFile(at.root, "config.json"), warnings);
97
+ const worktree = await readBase(configFile(at.slot, "config.json"), warnings);
98
+ const user = await readBase(userOverridePath(at.home, at.root, at.platform), warnings);
99
+ const base = merge(merge(repo, worktree), user);
100
+ let list = base?.[key];
101
+ if (base) {
102
+ const local = (await readLocal(configFile(at.slot, "config.local.json"), warnings))
103
+ ?? (await readLocal(configFile(at.root, "config.local.json"), warnings));
104
+ const overlay = local?.[key];
105
+ if (Array.isArray(overlay))
106
+ list = overlay;
107
+ else if (overlay)
108
+ list = [...(overlay.before ?? []), ...(list ?? []), ...(overlay.after ?? [])];
109
+ }
110
+ const cwd = base?.cwd ? path.resolve(at.slot, base.cwd) : at.slot;
111
+ const commands = (list ?? []).filter((c) => c.trim() !== "");
112
+ if (commands.length > 0)
113
+ return { script: { kind: "commands", commands, cwd }, warnings };
114
+ for (const dir of [at.slot, at.root]) {
115
+ const scriptPath = configFile(dir, `${key}.sh`);
116
+ if (existsSync(scriptPath))
117
+ return { script: { kind: "script", scriptPath, cwd }, warnings };
118
+ }
119
+ return { script: null, warnings };
120
+ }
121
+ //# sourceMappingURL=lifecycle.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../src/core/lifecycle.ts"],"names":[],"mappings":"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"}