work-kit-cli 0.2.5 → 0.2.6

package/cli/src/commands/cancel.ts

@@ -0,0 +1,103 @@
+import { execFileSync } from "node:child_process";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { readState, findWorktreeRoot, stateDir } from "../state/store.js";
+
+export interface CancelResult {
+  action: "cancelled" | "error";
+  slug?: string;
+  branch?: string;
+  worktreeRemoved: boolean;
+  branchDeleted: boolean;
+  message: string;
+}
+
+function resolveMainRepoRoot(worktreeRoot: string): string {
+  try {
+    const output = execFileSync("git", ["worktree", "list", "--porcelain"], {
+      cwd: worktreeRoot,
+      encoding: "utf-8",
+      timeout: 5000,
+    });
+    const firstLine = output.split("\n").find(l => l.startsWith("worktree "));
+    if (firstLine) return firstLine.slice("worktree ".length).trim();
+  } catch {
+    // fallback
+  }
+  return worktreeRoot;
+}
+
+export function cancelCommand(worktreeRoot?: string): CancelResult {
+  const root = worktreeRoot || findWorktreeRoot();
+  if (!root) {
+    return {
+      action: "error",
+      worktreeRemoved: false,
+      branchDeleted: false,
+      message: "No work-kit state found. Nothing to cancel.",
+    };
+  }
+
+  const state = readState(root);
+
+  if (state.status === "completed") {
+    return {
+      action: "error",
+      slug: state.slug,
+      worktreeRemoved: false,
+      branchDeleted: false,
+      message: `${state.slug} is already completed. Nothing to cancel.`,
+    };
+  }
+
+  const slug = state.slug;
+  const branch = state.branch;
+  const mainRoot = resolveMainRepoRoot(root);
+  const isWorktree = path.resolve(root) !== path.resolve(mainRoot);
+
+  let worktreeRemoved = false;
+  let branchDeleted = false;
+
+  // Remove .work-kit/ state directory
+  const stDir = stateDir(root);
+  if (fs.existsSync(stDir)) {
+    fs.rmSync(stDir, { recursive: true, force: true });
+  }
+
+  // Remove the worktree (if we're in one)
+  if (isWorktree) {
+    try {
+      execFileSync("git", ["worktree", "remove", root, "--force"], {
+        cwd: mainRoot,
+        encoding: "utf-8",
+        timeout: 10000,
+      });
+      worktreeRemoved = true;
+    } catch {
+      // Worktree removal failed — may need manual cleanup
+    }
+  }
+
+  // Delete the feature branch
+  if (branch) {
+    try {
+      execFileSync("git", ["branch", "-D", branch], {
+        cwd: mainRoot,
+        encoding: "utf-8",
+        timeout: 5000,
+      });
+      branchDeleted = true;
+    } catch {
+      // Branch may not exist or may be checked out elsewhere
+    }
+  }
+
+  return {
+    action: "cancelled",
+    slug,
+    branch,
+    worktreeRemoved,
+    branchDeleted,
+    message: `Cancelled ${slug}.${worktreeRemoved ? " Worktree removed." : ""}${branchDeleted ? " Branch deleted." : ""}`,
+  };
+}

package/cli/src/index.ts

@@ -16,6 +16,7 @@ import { completionsCommand } from "./commands/completions.js";
 import { observeCommand } from "./commands/observe.js";
 import { uninstallCommand } from "./commands/uninstall.js";
 import { bootstrapCommand } from "./commands/bootstrap.js";
+import { cancelCommand } from "./commands/cancel.js";
 import { bold, green, yellow, red } from "./utils/colors.js";
 import type { Classification, PhaseName } from "./state/schema.js";
 
@@ -269,4 +270,21 @@ program
     }
   });
 
+// ── cancel ──────────────────────────────────────────────────────────
+
+program
+  .command("cancel")
+  .description("Cancel the active work-kit, remove worktree and branch")
+  .option("--worktree-root <path>", "Override worktree root")
+  .action((opts) => {
+    try {
+      const result = cancelCommand(opts.worktreeRoot);
+      console.log(JSON.stringify(result, null, 2));
+      process.exit(result.action === "error" ? 1 : 0);
+    } catch (e: any) {
+      console.error(JSON.stringify({ action: "error", message: e.message }));
+      process.exit(1);
+    }
+  });
+
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "work-kit-cli",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Structured development workflow for Claude Code. Two modes, 6 phases, 27 sub-stages.",
   "type": "module",
   "bin": {

package/skills/cancel-kit/SKILL.md

@@ -0,0 +1,34 @@
+---
+name: cancel-kit
+description: "Cancel the active work-kit session. Removes state, worktree, and feature branch."
+user-invocable: true
+allowed-tools: Bash, Read
+---
+
+# Cancel Kit
+
+Cancels the active work-kit session and cleans up all artifacts.
+
+## What it does
+
+1. Finds the active work-kit session (via `bootstrap`)
+2. Confirms with the user before proceeding
+3. Runs `npx work-kit-cli cancel` to:
+   - Remove `.work-kit/` state directory
+   - Remove the git worktree
+   - Delete the feature branch
+4. Reports what was cleaned up
+
+## Instructions
+
+1. Run `npx work-kit-cli bootstrap` to detect the active session
+2. If no active session: tell the user there's nothing to cancel
+3. If active: show the user what will be cancelled:
+   - Slug and branch name
+   - Current phase and sub-stage
+   - Any uncommitted work in the worktree will be lost
+4. **Ask the user to confirm** — do not proceed without explicit confirmation
+5. `cd` into the worktree directory
+6. Run `npx work-kit-cli cancel`
+7. `cd` back to the main repo root
+8. Report the result to the user