@dezkareid/osddt 1.11.10 → 1.11.12

package/AGENTS.md

@@ -112,7 +112,7 @@ osddt/
 │   │   └── gemini.ts              # Formats COMMAND_DEFINITIONS as TOML (.gemini/commands/osddt.<name>.toml)
 │   └── utils/
 │       ├── prompt.ts              # Inquirer prompts: askAgents() (checkbox), askRepoType() (select), askWorktreeUrl() (input)
-│       └── worktree.ts            # Shared worktree helpers: git version check, not-a-worktree check, writable check, state file init
+│       └── worktree.ts            # Shared worktree helpers: git version check, not-a-worktree check, writable check, worktree listing
 ├── dist/                          # Compiled output (single ESM bundle, gitignored)
 ├── rollup.config.js               # Bundles src/index.ts → dist/index.js (ESM, shebang injected)
 ├── tsconfig.json                  # TypeScript config
@@ -159,8 +159,8 @@ The selected agents are saved in `.osddtrc` alongside `repoType`. When `osddt up
 | `npx @dezkareid/osddt meta-info`                                                               | External      | Output current branch and date as JSON                        |
 | `osddt done <feature-name> --dir <project-path>`                                               | Local dev     | Move `working-on/<feature>` to `done/<feature>`               |
 | `npx @dezkareid/osddt done <feature-name> --dir <project-path>`                                | External      | Move `working-on/<feature>` to `done/<feature>`               |
-| `osddt done <feature-name> --dir <project-path> --worktree`                                    | Local dev     | Archive feature, remove git worktree, and clean state file    |
-| `npx @dezkareid/osddt done <feature-name> --dir <project-path> --worktree`                     | External      | Archive feature, remove git worktree, and clean state file    |
+| `osddt done <feature-name> --dir <project-path> --worktree`                                    | Local dev     | Archive feature and remove the git worktree                   |
+| `npx @dezkareid/osddt done <feature-name> --dir <project-path> --worktree`                     | External      | Archive feature and remove the git worktree                   |
 | `osddt update`                                                                                 | Local dev     | Regenerate agent command files from the existing `.osddtrc`   |
 | `npx @dezkareid/osddt update`                                                                  | External      | Regenerate agent command files from the existing `.osddtrc`   |
 | `osddt start-worktree <feature-name>`                                                          | Local dev     | Create a git worktree for a feature and scaffold working-on/  |
@@ -179,7 +179,7 @@ The selected agents are saved in `.osddtrc` alongside `repoType`. When `osddt up
 | `--worktree-repository <url>` | any git URL | Enable worktree workflow; saves URL as `"worktree-repository"` in `.osddtrc` |
 | `-d, --dir <directory>` | any path | Target directory (defaults to current working directory) |
 
-All flags are optional. Providing neither runs the fully interactive mode. When `--worktree-repository` is provided, environment checks run and `.osddt-worktrees` is initialised.
+All flags are optional. Providing neither runs the fully interactive mode. When `--worktree-repository` is provided, a bare clone is created at `.bare/`, the default branch is checked out as a linked worktree, environment checks run, and all config is written to `.osddtrc`.
 
 ### Command Templates
 
@@ -268,10 +268,37 @@ Enable worktree mode once during setup by providing the repository URL:
 npx @dezkareid/osddt setup --agents claude --repo-type single --worktree-repository https://github.com/org/repo.git
 ```
 
-From that point on, `/osddt.start` automatically uses the worktree workflow:
+This clones a bare repository into `.bare/`, checks out the default branch as a linked worktree at `.bare/main/`, and writes all config to `.osddtrc`. The resulting layout:
+
+```
+project/               ← your working directory (contains .osddtrc)
+└── .bare/
+    ├── main/          ← default branch checked out as a linked worktree
+    └── add-payment-gateway/   ← created by /osddt.start
+```
+
+From that point on, `/osddt.start` automatically uses the worktree workflow — no further configuration needed:
+
+**Single repo:**
+
+```
+/osddt.start add-payment-gateway
+# → creates .bare/add-payment-gateway/, checks out feat/add-payment-gateway
+# → scaffolds .bare/add-payment-gateway/working-on/add-payment-gateway/
+/osddt.spec
+/osddt.plan use Stripe SDK, REST endpoints
+/osddt.tasks
+/osddt.implement
+/osddt.done
+# → archives working-on/, removes .bare/add-payment-gateway/
+```
+
+**Monorepo (prompts for package path on first run):**
 
 ```
 /osddt.start add-payment-gateway
+# → prompts: "Package path (e.g. apps/my-app):" → enter apps/payments
+# → scaffolds .bare/add-payment-gateway/apps/payments/working-on/add-payment-gateway/
 /osddt.spec
 /osddt.plan use Stripe SDK, REST endpoints
 /osddt.tasks
@@ -279,12 +306,17 @@ From that point on, `/osddt.start` automatically uses the worktree workflow:
 /osddt.done
 ```
 
-The worktree is created as a sibling of the repo root (e.g. `../my-repo-add-payment-gateway`). Active worktrees are tracked in `.osddt-worktrees` (sibling to the repo root) — a JSON array with entries containing `featureName`, `branch`, `worktreePath`, `workingDir`, and `repoRoot`. `osddt.continue` and `osddt.done` read this file to resolve the correct paths. When `osddt.done` runs, it archives the planning folder **and** removes the worktree automatically.
+Worktrees are tracked by git itself (`git worktree list`). `osddt.continue` and `osddt.done` call `npx @dezkareid/osddt worktree-info <feature-name>` at runtime to resolve paths — no separate state file is required. When `osddt.done` runs, it archives the planning folder **and** removes the worktree automatically.
 
-You can customise the worktree base directory via `worktreeBase` in `.osddtrc`:
+You can customise the base directory where feature worktrees are created via `worktreeBase` in `.osddtrc` (defaults to the `bare-path`):
 
 ```json
-{ "repoType": "single", "worktree-repository": "https://github.com/org/repo.git", "worktreeBase": "/Users/me/worktrees" }
+{
+  "repoType": "single",
+  "worktree-repository": "https://github.com/org/repo.git",
+  "bare-path": "/path/to/project/.bare",
+  "worktreeBase": "/Users/me/worktrees"
+}
 ```
 
 ---
@@ -353,7 +385,7 @@ You can customise the worktree base directory via `worktreeBase` in `.osddtrc`:
   2. Lists all folders under `working-on/`. If there is only one, uses it automatically; if there are multiple, asks the user to pick one.
   3. Confirms all tasks in `osddt.tasks.md` are checked off (`- [x]`).
   4. Runs `npx @dezkareid/osddt worktree-info <feature-name>` to check if this is a worktree feature.
-     - If found: runs `npx @dezkareid/osddt done <feature-name> --dir <project-path> --worktree` (archives folder, removes worktree, cleans state file).
+     - If found: runs `npx @dezkareid/osddt done <feature-name> --dir <project-path> --worktree` (archives folder, removes worktree via `git worktree remove`).
      - If not found: runs `npx @dezkareid/osddt done <feature-name> --dir <project-path>` (existing behaviour).
 
 Note: the `osddt done` CLI command does **not** read `.osddtrc` — project path resolution is the agent's responsibility, handled in step 1 above.

package/README.md

@@ -10,10 +10,10 @@ Other spec driven development tool but for monorepo
 | `@dezkareid/osddt setup --worktree-repository <url>`                             | Setup with worktree workflow enabled                          |
 | `@dezkareid/osddt meta-info`                                                     | Output current branch and date as JSON                        |
 | `@dezkareid/osddt done <feature-name> --dir <project-path>`                      | Move `working-on/<feature>` to `done/<feature>`               |
-| `@dezkareid/osddt done <feature-name> --dir <project-path> --worktree`           | Archive feature, remove git worktree, and clean state file    |
+| `@dezkareid/osddt done <feature-name> --dir <project-path> --worktree`           | Archive feature and remove the git worktree                   |
 | `@dezkareid/osddt update`                                                        | Regenerate agent command files from the existing `.osddtrc`   |
 | `@dezkareid/osddt start-worktree <feature-name>`                                 | Create a git worktree for a feature and scaffold working-on/  |
-| `@dezkareid/osddt start-worktree <feature-name> --dir <package-path>`            | Same, specifying the package path in a monorepo               |
+| `@dezkareid/osddt start-worktree <feature-name> --dir <package-path>`            | Same, specifying the package subdirectory in a monorepo       |
 | `@dezkareid/osddt worktree-info <feature-name>`                                  | Look up worktree paths for a feature (JSON output)            |
 
 ### `osddt setup` options
@@ -25,7 +25,7 @@ Other spec driven development tool but for monorepo
 | `--worktree-repository <url>` | any git URL | Enable worktree workflow and save the repository URL |
 | `-d, --dir <directory>` | any path | Target directory (defaults to current working directory) |
 
-All flags are optional. Providing neither runs the fully interactive mode. Providing `--agents` and `--repo-type` together skips all standard prompts. Adding `--worktree-repository` also runs environment checks and initialises the worktree state file.
+All flags are optional. Providing neither runs the fully interactive mode. Providing `--agents` and `--repo-type` together skips all standard prompts. Adding `--worktree-repository` clones a bare repository, sets up the default branch worktree, runs environment checks, and writes all worktree config to `.osddtrc`.
 
 The selected agents and config are saved in `.osddtrc` so that `osddt update` can regenerate the correct files without prompting.
 
@@ -33,8 +33,15 @@ The selected agents and config are saved in `.osddtrc` so that `osddt update` ca
 // Standard mode
 { "repoType": "single", "agents": ["claude"] }
 
-// Worktree mode — the "worktree-repository" field enables the worktree workflow
-{ "repoType": "single", "agents": ["claude"], "worktree-repository": "https://github.com/org/repo.git" }
+// Worktree mode — written automatically by osddt setup --worktree-repository
+{
+  "repoType": "monorepo",
+  "agents": ["claude"],
+  "worktree-repository": "https://github.com/org/repo.git",
+  "bare-path": "/path/to/project/.bare",
+  "packageManager": "pnpm",
+  "mainBranch": "main"
+}
 ```
 
 ```bash
@@ -43,6 +50,9 @@ npx @dezkareid/osddt setup
 
 # Non-interactive (CI-friendly)
 npx @dezkareid/osddt setup --agents claude,gemini --repo-type single
+
+# Enable worktree workflow
+npx @dezkareid/osddt setup --agents claude --repo-type monorepo --worktree-repository https://github.com/org/repo.git
 ```
 
 ## Command Templates
@@ -122,38 +132,76 @@ flowchart LR
 
 #### Parallel feature workflow (git worktree)
 
-Enable worktree mode by providing the repository URL during setup:
+Enable worktree mode once during setup by providing the repository URL:
 
 ```bash
 npx @dezkareid/osddt setup --agents claude --repo-type single --worktree-repository https://github.com/org/repo.git
 ```
 
-This saves `"worktree-repository"` in `.osddtrc`, runs environment checks, and initialises the `.osddt-worktrees` state file. From that point on, `/osddt.start` automatically uses the worktree workflow:
+This clones a bare repository into `.bare/`, checks out the default branch as a linked worktree at `.bare/main/`, runs environment checks, and writes all config to `.osddtrc`. From that point on, `/osddt.start` automatically uses the worktree workflow — no further configuration needed.
+
+**Resulting directory structure after setup:**
+
+```
+project/               ← your working directory (contains .osddtrc, CLAUDE.md, GEMINI.md)
+└── .bare/
+    ├── main/          ← default branch checked out as a linked worktree
+    ├── add-payment-gateway/   ← feature worktree created by /osddt.start
+    └── fix-login-bug/         ← another feature worktree
+```
+
+For a **monorepo**, `working-on/` lives inside the package subdirectory within the worktree:
+
+```
+.bare/add-payment-gateway/
+├── apps/
+│   └── my-app/
+│       └── working-on/
+│           └── add-payment-gateway/   ← spec, plan, tasks live here
+└── packages/
+```
+
+**Example workflow (single repo):**
 
 ```
 /osddt.start add-payment-gateway
+# → creates .bare/add-payment-gateway/, checks out feat/add-payment-gateway
+# → scaffolds .bare/add-payment-gateway/working-on/add-payment-gateway/
+
 /osddt.spec
 /osddt.plan use Stripe SDK, REST endpoints
 /osddt.tasks
 /osddt.implement
 /osddt.done
+# → archives working-on/, removes the worktree from .bare/
+```
+
+**Example workflow (monorepo — prompts for package path):**
+
 ```
+/osddt.start add-payment-gateway
+# → prompts: "Package path (e.g. apps/my-app):" → enter apps/payments
+# → creates .bare/add-payment-gateway/apps/payments/working-on/add-payment-gateway/
 
-The worktree is created as a sibling of your repo (e.g. `../my-repo-add-payment-gateway`). The `working-on/` planning folder lives inside the worktree alongside the code. When `osddt.done` runs, it archives the planning folder **and** removes the worktree automatically.
+/osddt.spec
+/osddt.plan use Stripe SDK, REST endpoints
+/osddt.tasks
+/osddt.implement
+/osddt.done
+```
 
-You can customise the worktree base directory by adding `worktreeBase` to `.osddtrc`:
+You can customise the base directory where feature worktrees are created by adding `worktreeBase` to `.osddtrc` (defaults to the `bare-path`):
 
 ```json
 {
   "repoType": "single",
   "worktree-repository": "https://github.com/org/repo.git",
+  "bare-path": "/path/to/project/.bare",
   "worktreeBase": "/Users/me/worktrees"
 }
 ```
 
-Active worktrees are tracked in `.osddt-worktrees` (sibling to the repo root), a JSON array with entries containing `featureName`, `branch`, `worktreePath`, `workingDir`, and `repoRoot`. This file is the single source of truth used by `osddt.continue` and `osddt.done` to resolve the correct paths.
-
-> **Migration note**: If you previously used `osddt setup-worktree` or `/osddt.start-worktree`, those commands have been removed. Re-run `osddt setup --worktree-repository <url>` to configure the new unified workflow. Manually delete any `osddt.start-worktree.*` files from your agent command directories — `osddt update` will not regenerate them.
+Worktrees are tracked by git itself (`git worktree list`). `osddt.continue` and `osddt.done` call `npx @dezkareid/osddt worktree-info <feature-name>` at runtime to resolve the correct paths — no separate state file is required.
 
 #### Resuming after closing a session
 

package/dist/index.js

@@ -152,7 +152,7 @@ Use the following logic to determine the working directory:
 
 ## Instructions
 
-Check the working directory \`<project-path>/working-on/<feature-name>\` for the files listed below **in order** to determine the current phase. Use the first matching condition:
+Check the working directory for the files listed below **in order** to determine the current phase. Use the \`workingDir\` resolved above (from \`worktree-info\` in worktree mode, or \`{project-path}/working-on/{feature-name}\` in standard mode). Use the first matching condition:
 
 | Condition | Current phase | Run next |
 | --------- | ------------- | -------- |
@@ -1012,10 +1012,9 @@ function todayPrefix() {
 async function runDone(featureName, cwd, worktree) {
     const barePath = worktree ? await resolveBarePath(process.cwd()) : undefined;
     const worktreePath = worktree ? findWorktreeByFeature(barePath, featureName) : undefined;
-    const projectDir = worktreePath ?? cwd;
-    const src = path.join(projectDir, 'working-on', featureName);
+    const src = path.join(cwd, 'working-on', featureName);
     const destName = `${todayPrefix()}-${featureName}`;
-    const dest = path.join(projectDir, 'done', destName);
+    const dest = path.join(cwd, 'done', destName);
     if (!(await fs.pathExists(src))) {
         console.error(`Error: working-on/${featureName} does not exist.`);
         process.exit(1);
@@ -1308,13 +1307,24 @@ async function resolveWorkingDir(worktreePath, featureName) {
     if (await fs.pathExists(path.join(worktreePath, target))) {
         return path.join(worktreePath, target);
     }
-    // Search one level deep (monorepo packages)
+    // Search up to two levels deep (monorepo packages, e.g. apps/my-app or packages/my-pkg)
     try {
-        const entries = await fs.readdir(worktreePath);
-        for (const entry of entries) {
-            const candidate = path.join(worktreePath, entry, target);
-            if (await fs.pathExists(candidate)) {
-                return candidate;
+        const topEntries = await fs.readdir(worktreePath);
+        for (const top of topEntries) {
+            const topCandidate = path.join(worktreePath, top, target);
+            if (await fs.pathExists(topCandidate)) {
+                return topCandidate;
+            }
+            // Second level (e.g. apps/collectstory/working-on/...)
+            const topStat = await fs.stat(path.join(worktreePath, top)).catch(() => null);
+            if (topStat?.isDirectory()) {
+                const subEntries = await fs.readdir(path.join(worktreePath, top)).catch(() => []);
+                for (const sub of subEntries) {
+                    const subCandidate = path.join(worktreePath, top, sub, target);
+                    if (await fs.pathExists(subCandidate)) {
+                        return subCandidate;
+                    }
+                }
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dezkareid/osddt",
-  "version": "1.11.10",
+  "version": "1.11.12",
   "description": "Package for Spec-Driven Development workflow",
   "keywords": [
     "spec-driven",