@dezkareid/osddt 1.11.7 → 1.11.9

package/dist/index.js

@@ -135,17 +135,19 @@ 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**: no matching worktree found — fall back to the standard resolution below.
+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), or after a worktree-info fallback:**
+**If \`worktree-repository\` is absent in \`.osddtrc\` (standard mode):**
 
 1. If arguments were provided, derive the feature name (same rules as above).
 2. If **no arguments were provided**:
    - List all folders under \`<project-path>/working-on/\`.
    - If there is **only one folder**, use it automatically and inform the user.
-   - If there are **multiple folders**, present the list to the user and ask them to pick one.
+   - If there are **multiple folders**, display the list as a numbered enumeration, then **stop** and instruct the user to re-run the command with the chosen feature name as an explicit argument (e.g. \`/osddt.continue <feature-name>\`).
    - If there are **no folders**, inform the user that no in-progress features were found and stop.
 
 ## Instructions
@@ -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 });
     }
@@ -1196,7 +1200,7 @@ function remoteBranchExists(branch, cwd) {
         return false;
     }
 }
-async function prompt$1(question) {
+async function prompt(question) {
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     return new Promise((resolve) => {
         rl.question(question, (answer) => {
@@ -1208,7 +1212,7 @@ async function prompt$1(question) {
 async function createWorktree(branch, worktreePath, repoRoot, mainBranch) {
     if (await fs.pathExists(worktreePath)) {
         console.log(`\nDirectory already exists at: ${worktreePath}`);
-        const answer = await prompt$1('Resume or Abort? [R/a] ');
+        const answer = await prompt('Resume or Abort? [R/a] ');
         if (answer.toLowerCase() === 'a') {
             console.log('Aborted.');
             process.exit(0);
@@ -1219,7 +1223,7 @@ async function createWorktree(branch, worktreePath, repoRoot, mainBranch) {
     const remoteExists = !localExists && remoteBranchExists(branch, repoRoot);
     if (localExists || remoteExists) {
         console.log(`\nBranch "${branch}" already exists ${localExists ? 'locally' : 'on remote'}.`);
-        const answer = await prompt$1('Resume or Abort? [R/a] ');
+        const answer = await prompt('Resume or Abort? [R/a] ');
         if (answer.toLowerCase() === 'a') {
             console.log('Aborted.');
             process.exit(0);
@@ -1253,7 +1257,7 @@ async function runStartWorktree(featureName, options) {
     if (existingPath) {
         const workingDir = path.join(existingPath, 'working-on', featureName);
         console.log(`\nWorktree for "${featureName}" already exists at: ${existingPath}`);
-        const answer = await prompt$1('Resume or Abort? [R/a] ');
+        const answer = await prompt('Resume or Abort? [R/a] ');
         if (answer.toLowerCase() === 'a') {
             console.log('Aborted.');
             process.exit(0);
@@ -1272,7 +1276,7 @@ async function runStartWorktree(featureName, options) {
     // Resolve working dir
     let projectPath;
     if (rc['repoType'] === 'monorepo') {
-        const pkg = options.dir ?? await prompt$1('Package path (e.g. packages/my-package): ');
+        const pkg = options.dir ?? await prompt('Package path (e.g. packages/my-package): ');
         projectPath = path.join(worktreePath, pkg);
     }
     else {
@@ -1298,28 +1302,6 @@ function startWorktreeCommand() {
     return cmd;
 }
 
-async function prompt(question) {
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    return new Promise((resolve) => {
-        rl.question(question, (answer) => {
-            rl.close();
-            resolve(answer.trim());
-        });
-    });
-}
-async function selectWorktree(entries) {
-    console.log('\nMultiple feature worktrees found:');
-    entries.forEach((e, i) => {
-        console.log(`  ${i + 1}) ${e.featureName} (${e.branch})`);
-    });
-    const answer = await prompt(`Select a feature [1-${entries.length}]: `);
-    const index = parseInt(answer, 10) - 1;
-    if (index < 0 || index >= entries.length || isNaN(index)) {
-        console.error('Invalid selection.');
-        process.exit(1);
-    }
-    return entries[index];
-}
 async function runWorktreeInfo(featureName) {
     const cwd = process.cwd();
     const barePath = await resolveBarePath(cwd);
@@ -1335,20 +1317,21 @@ 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 {
-            entry = await selectWorktree(entries);
+            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 }));

package/package.json

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