@dezkareid/osddt 1.11.13 → 1.11.14

package/dist/index.js

@@ -603,21 +603,13 @@ ${npxCommand} worktree-info <feature-name>
 
    **If it exits with code 0 (worktree feature):** parse the JSON to get \`worktreePath\` and \`branch\`, derive \`<project-path>\` from \`workingDir\`, then continue below.
 
-4. Run the done command with the \`--worktree\` flag:
-   \`\`\`
-   ${npxCommand} done <feature-name> --dir <project-path> --worktree
-   \`\`\`
-
-5. The command will automatically prefix the destination folder name with today's date in \`YYYY-MM-DD\` format.
-   For example, \`working-on/feature-a\` will be moved to \`done/YYYY-MM-DD-feature-a\`.
-
-6. Check for uncommitted changes inside the worktree:
+4. Check for uncommitted changes inside the worktree:
 
    \`\`\`
    git -C <worktreePath> status --porcelain
    \`\`\`
 
-7. If there are **uncommitted changes**:
+5. If there are **uncommitted changes**:
    1. Run \`git -C <worktreePath> diff\` to inspect them.
    2. Derive a concise commit message in **conventional commit** format (e.g. \`feat: add payment gateway integration\`) based on the diff.
    3. Present the proposed message to the user: _"Use this commit message, or provide your own?"_
@@ -627,12 +619,20 @@ ${npxCommand} worktree-info <feature-name>
       git -C <worktreePath> commit -m "<confirmed-message>"
       \`\`\`
 
-8. Push the branch to remote (covers both first push and subsequent pushes):
+6. Push the branch to remote (covers both first push and subsequent pushes):
 
    \`\`\`
    git -C <worktreePath> push --set-upstream origin <branch>
    \`\`\`
 
+7. Run the done command with the \`--worktree\` flag:
+   \`\`\`
+   ${npxCommand} done <feature-name> --dir <project-path> --worktree
+   \`\`\`
+
+8. The command will automatically prefix the destination folder name with today's date in \`YYYY-MM-DD\` format.
+   For example, \`working-on/feature-a\` will be moved to \`done/YYYY-MM-DD-feature-a\`.
+
 9. Report the result of the command, including the full destination path
 
 ${getCustomContextStep(npxCommand, 'done')}`,
@@ -1019,6 +1019,19 @@ async function runDone(featureName, cwd, worktree) {
         console.error(`Error: working-on/${featureName} does not exist.`);
         process.exit(1);
     }
+    if (worktree && worktreePath && (await fs.pathExists(worktreePath))) {
+        try {
+            const status = execSync('git status --porcelain', { cwd: worktreePath, encoding: 'utf8', stdio: 'pipe' });
+            if (status.trim().length > 0) {
+                console.error('Error: Worktree has uncommitted changes. Commit or stash them before running osddt done.');
+                process.exit(1);
+            }
+        }
+        catch {
+            console.error('Error: Could not verify worktree status. Ensure the worktree is a valid git repository and has no uncommitted changes before proceeding.');
+            process.exit(1);
+        }
+    }
     await fs.ensureDir(path.dirname(dest));
     await fs.move(src, dest);
     console.log(`Moved: working-on/${featureName} → done/${destName}`);

package/package.json

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