@dezkareid/osddt 1.11.8 → 1.11.10

package/dist/index.js

@@ -135,9 +135,11 @@ Use the following logic to determine the working directory:
 1. If arguments were provided, derive the feature name from them:
    - If the argument looks like a branch name (no spaces, kebab-case or slash-separated), use the last segment (after the last \`/\`, or the full value if no \`/\` is present).
    - Otherwise convert it to a feature name following the Feature Name Constraints.
-2. Run \`${npxCommand} worktree-info\` (pass \`<feature-name>\` as argument if one was derived, otherwise run without arguments):
-   - exit code **0**: parse the JSON and use the returned \`workingDir\` as the working directory.
-   - exit code **1**: display the error output from \`worktree-info\` to the user, then **stop** and instruct them to re-run the command with the chosen feature name as an explicit argument (e.g. \`/osddt.continue <feature-name>\`).
+2. Run \`${npxCommand} worktree-info\` (pass \`<feature-name>\` as argument if one was derived, otherwise run without arguments). Parse the JSON from **stdout** and handle based on the output:
+   - JSON contains \`workingDir\`: use it as the working directory and continue.
+   - JSON contains \`{ "error": "multiple", "worktrees": [...] }\`: present the list to the user and ask them to choose a feature, then use the chosen entry's details as the working context — do not re-run the command.
+   - JSON contains \`{ "error": "none" }\`: inform the user that no feature worktrees were found and stop.
+   - JSON contains \`{ "error": "not-found" }\`: inform the user that the specified feature was not found in any worktree and stop.
 
 **If \`worktree-repository\` is absent in \`.osddtrc\` (standard mode):**
 
@@ -800,7 +802,9 @@ function listFeatureWorktrees(barePath, mainBranch) {
         const featureName = path.basename(worktreePath);
         if (featureName === mainBranch)
             continue;
-        const branch = branchMatch ? branchMatch[1].trim().replace(/^refs\/heads\//, '') : featureName;
+        if (!branchMatch)
+            continue;
+        const branch = branchMatch[1].trim().replace(/^refs\/heads\//, '');
         const workingDir = path.join(worktreePath, 'working-on', featureName);
         entries.push({ featureName, branch, worktreePath, workingDir });
     }
@@ -1298,6 +1302,27 @@ function startWorktreeCommand() {
     return cmd;
 }
 
+async function resolveWorkingDir(worktreePath, featureName) {
+    const target = path.join('working-on', featureName);
+    // Check root first (single repo)
+    if (await fs.pathExists(path.join(worktreePath, target))) {
+        return path.join(worktreePath, target);
+    }
+    // Search one level deep (monorepo packages)
+    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;
+            }
+        }
+    }
+    catch {
+        // worktreePath not accessible — fall through to default
+    }
+    return path.join(worktreePath, target);
+}
 async function runWorktreeInfo(featureName) {
     const cwd = process.cwd();
     const barePath = await resolveBarePath(cwd);
@@ -1313,25 +1338,25 @@ async function runWorktreeInfo(featureName) {
     if (featureName) {
         entry = entries.find(e => e.featureName === featureName);
         if (!entry) {
-            console.error(`No worktree found for feature: ${featureName}`);
+            console.log(JSON.stringify({ error: 'not-found', featureName }));
             process.exit(1);
         }
     }
     else {
         if (entries.length === 0) {
-            console.error('No feature worktrees found.');
+            console.log(JSON.stringify({ error: 'none' }));
             process.exit(1);
         }
         else if (entries.length === 1) {
             entry = entries[0];
         }
         else {
-            console.error('Multiple feature worktrees found. Re-run with a feature name:');
-            entries.forEach(e => console.error(`  - ${e.featureName} (${e.branch})`));
+            console.log(JSON.stringify({ error: 'multiple', worktrees: entries.map(e => ({ featureName: e.featureName, branch: e.branch })) }));
             process.exit(1);
         }
     }
-    console.log(JSON.stringify({ worktreePath: entry.worktreePath, workingDir: entry.workingDir, branch: entry.branch }));
+    const workingDir = await resolveWorkingDir(entry.worktreePath, entry.featureName);
+    console.log(JSON.stringify({ worktreePath: entry.worktreePath, workingDir, branch: entry.branch }));
 }
 function worktreeInfoCommand() {
     const cmd = new Command('worktree-info');

package/package.json

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