@tokenbooks/wt 0.2.2 → 0.3.0

package/dist/schemas/config.schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.schema.js","sourceRoot":"","sources":["../../src/schemas/config.schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,MAAM,WAAW,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAU,CAAC;AAElE,6CAA6C;AAChC,QAAA,WAAW,GAAG,OAAC,CAAC,MAAM,CAAC;IAClC,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACtB,IAAI,EAAE,OAAC,CAAC,IAAI,CAAC,WAAW,CAAC;IACzB,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAC;AAEH,+CAA+C;AAClC,QAAA,aAAa,GAAG,OAAC,CAAC,MAAM,CAAC;IACpC,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACvB,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;CACzC,CAAC,CAAC;AAEH,+CAA+C;AAClC,QAAA,aAAa,GAAG,OAAC,CAAC,MAAM,CAAC;IACpC,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,OAAO,EAAE,OAAC,CAAC,KAAK,CAAC,mBAAW,CAAC;CAC9B,CAAC,CAAC;AAEH,gCAAgC;AACnB,QAAA,YAAY,GAAG,OAAC,CAAC,MAAM,CAAC;IACnC,gBAAgB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACnC,gBAAgB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC;IACzD,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC;IACpD,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IACrD,QAAQ,EAAE,OAAC,CAAC,KAAK,CAAC,qBAAa,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACvC,QAAQ,EAAE,OAAC,CAAC,KAAK,CAAC,qBAAa,CAAC;IAChC,SAAS,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IAC1C,WAAW,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;CACvC,CAAC,CAAC"}
+{"version":3,"file":"config.schema.js","sourceRoot":"","sources":["../../src/schemas/config.schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,MAAM,WAAW,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAU,CAAC;AAElE,6CAA6C;AAChC,QAAA,WAAW,GAAG,OAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE;IACtD,OAAC,CAAC,MAAM,CAAC;QACP,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACtB,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;KAChC,CAAC;IACF,OAAC,CAAC,MAAM,CAAC;QACP,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACtB,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAC/B,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;KAC3B,CAAC;IACF,OAAC,CAAC,MAAM,CAAC;QACP,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACtB,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAC/B,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;KAC3B,CAAC;IACF,OAAC,CAAC,MAAM,CAAC;QACP,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACtB,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAC/B,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;KAC3B,CAAC;CACH,CAAC,CAAC;AAEH,+CAA+C;AAClC,QAAA,aAAa,GAAG,OAAC,CAAC,MAAM,CAAC;IACpC,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACvB,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;CACzC,CAAC,CAAC;AAEH,+CAA+C;AAClC,QAAA,aAAa,GAAG,OAAC,CAAC,MAAM,CAAC;IACpC,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,OAAO,EAAE,OAAC,CAAC,KAAK,CAAC,mBAAW,CAAC;CAC9B,CAAC,CAAC;AAEH,gCAAgC;AACnB,QAAA,YAAY,GAAG,OAAC,CAAC,MAAM,CAAC;IACnC,gBAAgB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACnC,gBAAgB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC;IACzD,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC;IACpD,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IAC7C,QAAQ,EAAE,OAAC,CAAC,KAAK,CAAC,qBAAa,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACvC,QAAQ,EAAE,OAAC,CAAC,KAAK,CAAC,qBAAa,CAAC;IAChC,SAAS,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IAC1C,WAAW,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;CACvC,CAAC,CAAC"}

package/dist/schemas/registry.schema.d.ts

@@ -4,7 +4,8 @@ export declare const allocationSchema: z.ZodObject<{
     worktreePath: z.ZodString;
     branchName: z.ZodString;
     dbName: z.ZodString;
-    redisDb: z.ZodNumber;
+    redisDb: z.ZodOptional<z.ZodNumber>;
+    redisContainerName: z.ZodOptional<z.ZodString>;
     ports: z.ZodRecord<z.ZodString, z.ZodNumber>;
     createdAt: z.ZodString;
 }, z.core.$strip>;
@@ -15,7 +16,8 @@ export declare const registrySchema: z.ZodObject<{
         worktreePath: z.ZodString;
         branchName: z.ZodString;
         dbName: z.ZodString;
-        redisDb: z.ZodNumber;
+        redisDb: z.ZodOptional<z.ZodNumber>;
+        redisContainerName: z.ZodOptional<z.ZodString>;
         ports: z.ZodRecord<z.ZodString, z.ZodNumber>;
         createdAt: z.ZodString;
     }, z.core.$strip>>;

package/dist/schemas/registry.schema.js

@@ -7,7 +7,8 @@ exports.allocationSchema = zod_1.z.object({
     worktreePath: zod_1.z.string().min(1),
     branchName: zod_1.z.string().min(1),
     dbName: zod_1.z.string().min(1),
-    redisDb: zod_1.z.number().int().min(1),
+    redisDb: zod_1.z.number().int().min(0).optional(),
+    redisContainerName: zod_1.z.string().min(1).optional(),
     ports: zod_1.z.record(zod_1.z.string(), zod_1.z.number().int().positive()),
     createdAt: zod_1.z.string().datetime(),
 });

package/dist/schemas/registry.schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry.schema.js","sourceRoot":"","sources":["../../src/schemas/registry.schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,8CAA8C;AACjC,QAAA,gBAAgB,GAAG,OAAC,CAAC,MAAM,CAAC;IACvC,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/B,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7B,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAChC,KAAK,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;IACxD,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAEH,yCAAyC;AAC5B,QAAA,cAAc,GAAG,OAAC,CAAC,MAAM,CAAC;IACrC,OAAO,EAAE,OAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACrB,WAAW,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,wBAAgB,CAAC;CACpD,CAAC,CAAC"}
+{"version":3,"file":"registry.schema.js","sourceRoot":"","sources":["../../src/schemas/registry.schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,8CAA8C;AACjC,QAAA,gBAAgB,GAAG,OAAC,CAAC,MAAM,CAAC;IACvC,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/B,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7B,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC3C,kBAAkB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAChD,KAAK,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;IACxD,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAEH,yCAAyC;AAC5B,QAAA,cAAc,GAAG,OAAC,CAAC,MAAM,CAAC;IACrC,OAAO,EAAE,OAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACrB,WAAW,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,wBAAgB,CAAC;CACpD,CAAC,CAAC"}

package/dist/types.d.ts

@@ -12,7 +12,7 @@ export type Allocation = z.infer<typeof allocationSchema>;
 /** Context passed to env patcher with computed values for a slot */
 export interface PatchContext {
     readonly dbName: string;
-    readonly redisDb: number;
+    readonly redisPort?: number;
     readonly ports: Record<string, number>;
 }
 /** Result of CLI operations for --json output */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenbooks/wt",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "Git worktree environment isolation CLI",
   "license": "MIT",
   "repository": {
@@ -39,6 +39,7 @@
     "build": "tsc && node scripts/link-cli.js",
     "dev": "tsc --watch",
     "test": "jest",
+    "test:docker": "node scripts/test-docker.js",
     "lint": "eslint 'src/**/*.ts' '__tests__/**/*.ts'",
     "release": "node scripts/release.js",
     "release:patch": "node scripts/release.js patch",

package/skills/wt/SKILL.md

@@ -1,13 +1,13 @@
 ---
 name: wt
-description: Manage git worktree isolation — create, list, remove worktrees with isolated databases, Redis, and ports
-argument-hint: "[new|open|list|remove|doctor|setup|init] [args...]"
+description: Manage git worktree isolation — create, list, remove, and prune worktrees with isolated databases, managed Redis, and ports
+argument-hint: "[new|open|list|remove|prune|doctor|setup|init] [args...]"
 allowed-tools: Bash, Read, Write, Edit, Grep, Glob
 ---
 
 # wt — Git Worktree Isolation
 
-You are managing git worktrees with isolated Postgres databases, Redis DB indexes, and ports using the `wt` CLI.
+You are managing git worktrees with isolated Postgres databases, managed Redis Docker containers, and ports using the `wt` CLI.
 
 ## Routing
 
@@ -22,7 +22,7 @@ The user wants to set up `wt` in their project for the first time. Follow these
 Search the repository to find:
 - All `.env` files (not `.env.example`): `find . -name '.env' -not -path '*/node_modules/*' -not -path '*/.git/*'`
 - The `DATABASE_URL` value to extract the base database name (path segment after the port, before `?`)
-- Any `REDIS_URL` values and their format (with or without trailing `/0`)
+- Any `REDIS_URL` values and their base port/auth format
 - All services and their default ports — check `package.json` scripts, `docker-compose.yml`, framework config files
 - The package manager in use (`pnpm`, `npm`, `yarn`) — check for lockfiles
 
@@ -33,7 +33,7 @@ For each `.env` file, examine every variable and classify:
 | Variable contains | Patch type | Needs `service`? |
 |---|---|---|
 | Postgres connection URL (`postgresql://...`) | `database` | No |
-| Redis connection URL (`redis://...`) | `redis` | No |
+| Redis connection URL (`redis://...`) | `redis` | Yes (`redis`) |
 | Just a port number | `port` | Yes |
 | A URL containing a service port (`http://localhost:3000/...`) | `url` | Yes |
 | Anything else (API keys, secrets, flags) | Skip — do not patch | — |
@@ -47,9 +47,10 @@ Build the config file at the repository root:
   "baseDatabaseName": "<extracted from DATABASE_URL>",
   "baseWorktreePath": ".worktrees",
   "portStride": 100,
-  "maxSlots": 15,
+  "maxSlots": 50,
   "services": [
-    { "name": "<service>", "defaultPort": <port> }
+    { "name": "<service>", "defaultPort": <port> },
+    { "name": "redis", "defaultPort": <port from REDIS_URL or 6379> }
   ],
   "envFiles": [
     {
@@ -65,9 +66,10 @@ Build the config file at the repository root:
 ```
 
 Validation rules:
-- Every `port` and `url` patch must have a `service` that exists in `services`
+- Every `redis`, `port`, and `url` patch must have a `service` that exists in `services`
 - `portStride` * `maxSlots` + max default port must be < 65535
 - `baseDatabaseName` must match the actual DB name in `DATABASE_URL`
+- If using a `redis` patch, Docker must be available locally
 
 **Step 4: Install wt**
 
@@ -129,7 +131,8 @@ wt list                              # Should show "No worktree allocations foun
 wt doctor                            # Should show "All checks passed."
 wt new test/wt-smoke --no-install    # Create a test worktree
 wt list                              # Should show the allocation
-wt remove test-wt-smoke              # Clean up
+wt remove .worktrees/test-wt-smoke   # Clean up
+wt prune --dry-run                   # Should show no Git-prunable worktrees
 ```
 
 Present the results to the user.
@@ -157,7 +160,7 @@ wt new $1
 ```
 
 If it fails, check `wt doctor` for diagnostics. Common issues:
-- All slots occupied → suggest `wt list` to find stale ones, then `wt remove`
+- All slots occupied → suggest `wt list` to find stale ones, then `wt remove` or `wt prune`
 - Database connection failed → check that Postgres is running and `DATABASE_URL` in root `.env` is correct
 
 ---
@@ -178,7 +181,7 @@ Run:
 wt remove $@
 ```
 
-Accepts paths or slots, including batch slot formats:
+Accepts paths or slots, not branch names, including batch slot formats:
 - `wt remove 1 2`
 - `wt remove 1,2`
 - `wt remove "1, 2"`
@@ -188,6 +191,21 @@ If the user wants to keep the database, use `--keep-db`.
 
 ---
 
+### `prune` — Prune Git-prunable worktrees
+
+Run:
+```bash
+wt prune $@
+```
+
+Use this when worktree directories were deleted manually and Git already marks them as prunable.
+
+Flags:
+- `--dry-run` to preview what would be pruned
+- `--keep-db` to keep databases for matching managed allocations
+
+---
+
 ### `doctor` — Diagnose issues
 
 Run:
@@ -220,10 +238,11 @@ Show a brief help:
 ```
 Available commands:
   /wt init              — Set up wt in a new repository (discovers env files, generates config)
-  /wt new <branch>      — Create a worktree with isolated DB, Redis, and ports
+  /wt new <branch>      — Create a worktree with isolated DB, managed Redis, and ports
   /wt open <slot|branch> — Open a worktree by slot or branch (creates if not found)
   /wt list              — List all worktree allocations
   /wt remove <targets...>|--all — Remove one or more worktrees and clean up resources
+  /wt prune [--dry-run] — Prune Git-prunable worktrees and clean up matching managed resources
   /wt doctor            — Diagnose and fix environment issues
   /wt setup [path]      — Set up an existing worktree
 ```