raptor-aios 0.12.2 → 0.13.0

package/CHANGELOG.md

@@ -5,6 +5,39 @@ Format: [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+## [0.13.0] - 2026-06-18
+
+### Fixed
+
+- **`raptor new` parou de "sobrescrever" specs anteriores — resolução de feature por slug
+  exato.** `featureDir()`/`auditableDir()` casavam o slug informado por **sufixo**
+  (`d.endsWith('-'+slug)`) e devolviam o primeiro match, então um slug curto resolvia
+  silenciosamente para um diretório irmão mais longo (`home-screen` →
+  `001-dashboard-home-screen`). Os ~22 comandos a jusante (`plan`, `tasks`, `implement`,
+  `clarify`, `verify`, `status`, `audit`, …) passavam a operar sobre a feature **errada**,
+  parecendo sobrescrever os artefatos da anterior. Agora o match é **exato** (nome completo
+  `NNN-slug` ou slug após o número); múltiplos diretórios casando viram **erro de
+  ambiguidade** em vez de adivinhação.
+- **`raptor new` não quebra mais quando `.raptor/specs` não existe.** Git não versiona
+  diretórios vazios, então um clone novo (ou após `git clean`) podia não ter a pasta; o
+  `readdir` agora tolera a ausência e trata como "sem features".
+
+### Changed
+
+- **Branches de feature passam a empilhar (forkam do HEAD atual, não mais de `main`).** Com
+  `git.branch_per_feature`, cada feature nascia de uma `main` sem as specs das irmãs
+  (commitadas só nas branches delas); ao trocar de branch o Git esvaziava a pasta da spec
+  anterior (deixando só a casca `contracts/`), dando a impressão de perda de artefatos. Agora
+  a branch nova forka da **branch ativa**, então as specs anteriores são herdadas no working
+  tree e o histórico empilha. A primeira feature ainda nasce de `main` naturalmente (é onde
+  você começa); HEAD destacado cai no fallback da branch-base.
+- **Numeração `NNN` à prova de colisão entre branches.** O próximo número agora vem da
+  **união** das pastas em `.raptor/specs/` **e** dos números embutidos nos nomes de **todas
+  as branches** (locais e remotas, via novo `listBranches()` do core), eliminando o
+  `feat/002-*` duplicado que surgia quando o contador só via a árvore da branch atual. O
+  reuso-por-slug também consulta as branches, preservando a idempotência de `raptor new`
+  (re-rodar um slug que vive só em uma branch irmã volta para o número dela).
+
 ## [0.12.2] - 2026-06-16
 
 ### Changed

package/dist/_core/dist/git/repo.js

@@ -14,6 +14,15 @@ export function branchExists(exec, cwd, name) {
     });
     return r.status === 0;
 }
+export function listBranches(exec, cwd) {
+    const r = exec(["for-each-ref", "--format=%(refname:short)", "refs/heads", "refs/remotes"], { cwd });
+    if (r.status !== 0 || !r.stdout)
+        return [];
+    return r.stdout
+        .split("\n")
+        .map((s) => s.trim())
+        .filter(Boolean);
+}
 export function isWorkingTreeClean(exec, cwd) {
     const r = exec(["status", "--porcelain"], { cwd });
     return r.status === 0 && r.stdout === "";

package/dist/_core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raptor/core",
-  "version": "0.12.2",
+  "version": "0.13.0",
   "type": "module",
   "main": "dist/index.js"
 }

package/dist/commands/new.js

@@ -3,7 +3,7 @@ import { BaseCommand } from "../base-command.js";
 import { step, heading } from "../shared/ui.js";
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync, } from "node:fs";
 import { join } from "node:path";
-import { appendAuditEvent, buildCanonicalPrompt, deriveBranchName, executeWorkflow, extractFigmaRefs, hashString, inferKindFromJiraIssueType, loadAgentsConfig, mapDesignToSpecContext, mapIssueToSpecContext, parseFrontmatter, renderBundled, selectAgent, writeDesignScaffold, } from "../_core/dist/index.js";
+import { appendAuditEvent, buildCanonicalPrompt, deriveBranchName, execSyncGitExecutor, executeWorkflow, listBranches, extractFigmaRefs, hashString, inferKindFromJiraIssueType, loadAgentsConfig, mapDesignToSpecContext, mapIssueToSpecContext, parseFrontmatter, renderBundled, selectAgent, writeDesignScaffold, } from "../_core/dist/index.js";
 import { currentActor, readConfig, readInitOptions, requireProjectRoot, } from "../shared/project.js";
 import { ensureWorkItemBranch, resolveInteractive, } from "../shared/git-prompt.js";
 import { jiraConn, jiraReadyNonInteractive, openJiraClient, } from "../shared/jira.js";
@@ -14,6 +14,12 @@ import { waitForPhaseArtifact, } from "../shared/artifact-io.js";
 import { resolveWorkflow } from "../shared/workflow-resolver.js";
 import { writeFeaturePrompt } from "../shared/feature-prompt.js";
 import { cliCommandExecutor } from "../workflow/executor.js";
+function parseFeatureBranch(name) {
+    const m = /(?:^|\/)(\d{3})-(.+)$/.exec(name);
+    if (!m)
+        return null;
+    return { nnn: m[1], slug: (m[2] ?? "").split(".")[0] };
+}
 export default class New extends BaseCommand {
     static description = "Create a new feature spec in the current Raptor project";
     static examples = [
@@ -88,17 +94,25 @@ export default class New extends BaseCommand {
         if (!/^[a-z][a-z0-9-]*$/.test(args.slug)) {
             this.error("Slug must be kebab-case (lowercase letters, digits, hyphens; starts with a letter).");
         }
-        const existing = readdirSync(specsDir).filter((d) => /^\d{3}-/.test(d));
+        const existing = existsSync(specsDir)
+            ? readdirSync(specsDir).filter((d) => /^\d{3}-/.test(d))
+            : [];
+        const branchFeatures = listBranches(execSyncGitExecutor, root)
+            .map(parseFeatureBranch)
+            .filter((b) => b !== null);
         const reusedDir = existing.find((d) => d.replace(/^\d{3}-/, "") === args.slug);
-        const reusing = reusedDir !== undefined;
-        const numbers = existing
+        const reusedBranch = branchFeatures.find((b) => b.slug === args.slug);
+        const reusedNnn = reusedDir
+            ? reusedDir.slice(0, 3)
+            : reusedBranch?.nnn;
+        const reusing = reusedNnn !== undefined;
+        const dirNumbers = existing
             .map((d) => parseInt(d.slice(0, 3), 10))
             .filter((n) => !Number.isNaN(n));
-        const nextN = (numbers.length ? Math.max(...numbers) : 0) + 1;
-        const nnn = reusing
-            ? reusedDir.slice(0, 3)
-            : String(nextN).padStart(3, "0");
-        const featureName = reusing ? reusedDir : `${nnn}-${args.slug}`;
+        const branchNumbers = branchFeatures.map((b) => parseInt(b.nnn, 10));
+        const maxN = Math.max(0, ...dirNumbers, ...branchNumbers);
+        const nnn = reusing ? reusedNnn : String(maxN + 1).padStart(3, "0");
+        const featureName = reusing && reusedDir ? reusedDir : `${nnn}-${args.slug}`;
         const featureDir = join(specsDir, featureName);
         const actor0 = currentActor("human");
         runBeforeHook(this, {

package/dist/shared/git-prompt.js

@@ -21,7 +21,7 @@ export async function confirmPrompt(question) {
 }
 async function promptDirtyTree(cmd, branchName) {
     cmd.log("");
-    cmd.warn(`Your working tree has uncommitted changes, and the new branch "${branchName}" forks from the base branch.`);
+    cmd.warn(`Your working tree has uncommitted changes, and the new branch "${branchName}" will fork from the current branch.`);
     cmd.log("  How do you want to proceed?");
     cmd.log("    1) stash  — set the changes aside, branch from a clean base");
     cmd.log("    2) carry  — take the uncommitted changes onto the new branch");
@@ -86,7 +86,7 @@ export async function ensureWorkItemBranch(input) {
         }
         return { outcome: "switched", branch: branchName, base: null };
     }
-    const base = defaultBaseBranch(exec, root);
+    const base = currentBranch(exec, root) ?? defaultBaseBranch(exec, root);
     const st = createBranch(exec, root, branchName, base);
     if (st !== 0) {
         const hint = carry

package/dist/shared/project.js

@@ -59,17 +59,30 @@ export function activePresetIds(cfg) {
         ordered.push(singular);
     return ordered;
 }
-export function featureDir(root, slug) {
-    const specs = join(root, '.raptor', 'specs');
-    const dirs = existsSync(specs) ? readdirSync(specs) : [];
-    const match = dirs.find((d) => d === slug || d.endsWith(`-${slug}`));
-    if (match)
-        return join(specs, match);
+function resolveFeatureDir(base, slug) {
+    if (!existsSync(base))
+        return null;
+    const dirs = readdirSync(base);
+    const matches = dirs.filter((d) => d === slug || d.replace(/^\d{3}-/, '') === slug);
+    if (matches.length === 1)
+        return join(base, matches[0]);
+    if (matches.length > 1) {
+        throw new Error(`Ambiguous feature '${slug}' — matches ${matches
+            .sort()
+            .join(', ')}. Pass the full directory name (e.g. ${matches.sort()[0]}).`);
+    }
     if (/^\d{3}-/.test(slug)) {
-        const direct = join(specs, slug);
+        const direct = join(base, slug);
         if (existsSync(direct))
             return direct;
     }
+    return null;
+}
+export function featureDir(root, slug) {
+    const specs = join(root, '.raptor', 'specs');
+    const resolved = resolveFeatureDir(specs, slug);
+    if (resolved)
+        return resolved;
     throw new Error(`feature not found: ${slug} (under ${specs})`);
 }
 export function auditableDir(root, slug) {
@@ -78,17 +91,9 @@ export function auditableDir(root, slug) {
         join(root, '.raptor', 'hotfixes'),
     ];
     for (const base of candidates) {
-        if (!existsSync(base))
-            continue;
-        const dirs = readdirSync(base);
-        const match = dirs.find((d) => d === slug || d.endsWith(`-${slug}`));
-        if (match)
-            return join(base, match);
-        if (/^\d{3}-/.test(slug)) {
-            const direct = join(base, slug);
-            if (existsSync(direct))
-                return direct;
-        }
+        const resolved = resolveFeatureDir(base, slug);
+        if (resolved)
+            return resolved;
     }
     throw new Error(`slug not found: ${slug} (checked .raptor/specs and .raptor/hotfixes)`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "raptor-aios",
-  "version": "0.12.2",
+  "version": "0.13.0",
   "description": "Raptor — Spec-Driven Development (SDD) CLI for modern mobile apps. Constitutional gates, audit trail, real verification (a11y/perf/stores/OS matrix), and AI-agent slash commands.",
   "type": "module",
   "bin": {

package/scripts/prepare-npm.mjs

@@ -29,7 +29,7 @@ const CLI = join(ROOT, "packages", "cli");
 const CORE = join(ROOT, "packages", "core");
 const OUT = join(ROOT, "build", "npm");
 
-const VERSION = "0.12.2";
+const VERSION = "0.13.0";
 
 function log(msg) {
   process.stdout.write(`  ${msg}\n`);