@mestreyoda/fabrica 0.2.19 → 0.2.20

package/dist/index.js

@@ -113905,8 +113905,8 @@ import fsSync from "node:fs";
 import path5 from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 function getCurrentVersion() {
-  if ("0.2.19") {
-    return "0.2.19";
+  if ("0.2.20") {
+    return "0.2.20";
   }
   try {
     const pkgPath = path5.join(THIS_DIR, "..", "..", "package.json");
@@ -126282,6 +126282,25 @@ async function validatePrExistsForDeveloper(issueId, repoPath, provider, runComm
     const branchPrIsReviewable = !!branchPr?.url && branchPr.state !== PrState.MERGED && branchPr.state !== PrState.CLOSED;
     const prStatus = preferIssuePr ? issuePrIsReviewable ? issuePr : branchPr ?? issuePr : branchPrIsReviewable ? branchPr : issuePr;
     if (!prStatus.url || prStatus.state === PrState.MERGED || prStatus.state === PrState.CLOSED) {
+      if (preferIssuePr && isCurrentProjectBaseBranch(branchName, baseBranch)) {
+        const currentBase = branchName || baseBranch || "main";
+        const suggestedBranch = `feature/${issueId}-${projectSlug.replace(/[^a-z0-9]+/g, "-").slice(0, 40)}`;
+        throw new Error(
+          `Cannot mark work_finish(done) while on the base branch ("${currentBase}") without an open PR.
+
+You must implement changes on a feature branch and open a PR before calling work_finish.
+
+Steps to fix:
+  1. git worktree add ../${projectSlug}.worktrees/${suggestedBranch} -b ${suggestedBranch}
+  2. cd ../${projectSlug}.worktrees/${suggestedBranch}
+  3. Implement the changes there, commit, push, and create a PR:
+     git push -u origin ${suggestedBranch}
+     gh pr create --base ${baseBranch ?? "main"} --head ${suggestedBranch} --title "feat: ..." --body "Closes #${issueId}"
+  4. Then call work_finish again.
+
+If the worktree already exists, cd into it and continue from there.`
+        );
+      }
       const currentBranch = branchName || "current-branch";
       const reason = !prStatus.url ? `\u2717 No PR found for branch: ${currentBranch}` : prStatus.state === PrState.MERGED ? `\u2717 Last linked PR is already merged: ${prStatus.url}` : `\u2717 Last linked PR is closed and not reviewable: ${prStatus.url}`;
       throw new Error(
@@ -126290,7 +126309,7 @@ async function validatePrExistsForDeveloper(issueId, repoPath, provider, runComm
 ${reason}
 
 Please create a PR first:
-  gh pr create --base main --head ${currentBranch} --title "..." --body "..."
+  gh pr create --base ${baseBranch ?? "main"} --head ${currentBranch} --title "..." --body "Closes #${issueId}"
 
 Then call work_finish again.`
       );
@@ -139671,11 +139690,44 @@ var createTaskStep = {
 };
 
 // lib/intake/lib/triage-logic.ts
-function calculateEffort(filesChanged, acCount) {
-  if (filesChanged <= 3 && acCount <= 3) return "small";
-  if (filesChanged <= 10 && acCount <= 7) return "medium";
-  if (filesChanged <= 25 && acCount <= 15) return "large";
-  return "xlarge";
+function detectRawIdeaComplexity(rawIdea) {
+  const text = rawIdea.toLowerCase();
+  const signals = [];
+  const subsystemPatterns = [
+    [/\b(worker|background.?job|queue|celery|bull|sidekiq|task.?runner)\b/i, "background-worker"],
+    [/\b(websocket|server.?sent|sse|real.?time|realtime|socket\.io|push.?notif)\b/i, "realtime"],
+    [/\b(auth|oauth|jwt|login|register|session|user.?account|signup)\b/i, "auth"],
+    [/\b(notif|alert|email|sms|webhook|subscription|subscribe)\b/i, "notifications"],
+    [/\b(database|banco|db|postgres|mysql|mongodb|redis|sqlite|orm)\b/i, "database"],
+    [/\b(api\s+rest|rest\s+api|endpoint|rota|route|graphql|grpc)\b/i, "api-layer"],
+    [/\b(docker|kubernetes|k8s|deploy|ci|cd|pipeline)\b/i, "infra"],
+    [/\b(dashboard|frontend|interface|ui|tela|p[aá]gina)\b/i, "frontend"]
+  ];
+  for (const [regex, label] of subsystemPatterns) {
+    if (regex.test(text)) signals.push(label);
+  }
+  let floor = null;
+  if (signals.length >= 4) floor = "large";
+  else if (signals.length >= 3) floor = "medium";
+  else if (signals.length >= 2) floor = "medium";
+  return { floor, signals };
+}
+function calculateEffort(filesChanged, acCount, rawIdea) {
+  let effort;
+  if (filesChanged <= 3 && acCount <= 3) effort = "small";
+  else if (filesChanged <= 10 && acCount <= 7) effort = "medium";
+  else if (filesChanged <= 25 && acCount <= 15) effort = "large";
+  else effort = "xlarge";
+  if (rawIdea) {
+    const { floor } = detectRawIdeaComplexity(rawIdea);
+    if (floor) {
+      const ORDER = ["small", "medium", "large", "xlarge"];
+      if (ORDER.indexOf(floor) > ORDER.indexOf(effort)) {
+        effort = floor;
+      }
+    }
+  }
+  return effort;
 }
 function calculatePriority(type, effort, totalRisks, matrix) {
   for (const rule of matrix.priority_rules_v2) {
@@ -139742,7 +139794,7 @@ function determineLevel(effort, targetState) {
   return level;
 }
 function runTriageLogic(input, matrix) {
-  const effort = calculateEffort(input.filesChanged, input.acCount);
+  const effort = calculateEffort(input.filesChanged, input.acCount, input.rawIdea);
   const { priority, label: priorityLabel } = calculatePriority(input.type, effort, input.totalRisks, matrix);
   const effortLabel = matrix.effort_rules[effort]?.label ?? `effort:${effort}`;
   const typeLabel = matrix.auto_labels[input.type] ?? "";
@@ -140996,6 +141048,22 @@ var BOOTSTRAP_MESSAGES = {
     pt: "Como voc\xEA quer chamar o projeto? Se preferir, posso escolher um nome.",
     en: "What do you want to name the project? If you prefer, I can pick one."
   },
+  clarifyScope: {
+    pt: (idea) => `Recebi! Seu pedido envolve v\xE1rios subsistemas (autentica\xE7\xE3o, notifica\xE7\xF5es, worker, banco de dados...). Para montar uma spec de qualidade, preciso de algumas defini\xE7\xF5es:
+
+1. **Stack/linguagem**: qual prefere? (Python/FastAPI, Node.js/Express, Go...)
+2. **Banco de dados**: PostgreSQL, MongoDB, Redis, outro?
+3. **Autentica\xE7\xE3o**: JWT, OAuth2, sess\xE3o?
+
+Se preferir deixar a escolha comigo, responda "livre" e eu decido.`,
+    en: (idea) => `Got it! Your request involves multiple subsystems (auth, notifications, background worker, DB...). To produce a quality spec, I need a few decisions:
+
+1. **Stack/language**: which do you prefer? (Python/FastAPI, Node.js/Express, Go...)
+2. **Database**: PostgreSQL, MongoDB, Redis, other?
+3. **Auth**: JWT, OAuth2, session?
+
+If you want me to choose, reply "your call" and I'll decide.`
+  },
   registered: {
     pt: (name, link) => `Projeto "${name}" registrado.
 Vou continuar o fluxo em ${link}`,
@@ -141003,6 +141071,28 @@ Vou continuar o fluxo em ${link}`,
 I'll continue the flow at ${link}`
   }
 };
+function detectScopeAmbiguity(rawIdea, stackHint) {
+  const text = rawIdea.toLowerCase();
+  if (/\b(livre|free.?choice|your.?call|pode.?escolher|voc[eê].?decide|qualquer)\b/i.test(text)) {
+    return false;
+  }
+  const subsystems = [
+    /\b(worker|background.?job|queue|task.?runner|celery|bull)\b/i,
+    /\b(websocket|sse|real.?time|realtime|push.?notif)\b/i,
+    /\b(auth|oauth|jwt|login|register|signup|autenticac)\b/i,
+    /\b(notif|alert|assinatura|subscription|subscribe|email|sms)\b/i,
+    /\b(banco|database|db|postgres|mysql|mongodb|redis|sqlite)\b/i,
+    /\b(api\s+rest|rest\s+api|endpoint|graphql|grpc)\b/i,
+    /\b(dashboard|frontend|interface|ui|tela)\b/i
+  ];
+  const matchedSubsystems = subsystems.filter((r2) => r2.test(text)).length;
+  if (matchedSubsystems < 3) return false;
+  const hasExplicitDB = /\b(postgres(ql)?|mysql|mongodb|mongo|redis|sqlite|supabase|dynamodb|cockroach)\b/i.test(text);
+  const hasExplicitAuth = /\b(jwt|oauth2?|basic.?auth|api.?key|session.?based|cookie.?auth)\b/i.test(text);
+  const hasExplicitStack = !!stackHint && !["api", "rest-api", "backend"].includes(stackHint);
+  const unspecifiedDimensions = [!hasExplicitDB, !hasExplicitAuth, !hasExplicitStack].filter(Boolean).length;
+  return unspecifiedDimensions >= 2;
+}
 function inferProjectSlug(text) {
   let cleaned = text.replace(/^(create|build|crie|cria|criar|fazer?|quero|i need|i want)\s+(uma|um|me\s+a?|an|a)?\s*/i, "").replace(/\s+(that|which|que|para|for|pra)\s+.*/i, "").trim();
   if (!cleaned) cleaned = text;
@@ -141471,6 +141561,27 @@ async function handleTelegramBootstrapDmMessage(ctx, rawConversationId, content)
     ));
     return;
   }
+  if (detectScopeAmbiguity(content, parsed.stackHint)) {
+    const existingSession2 = await readTelegramBootstrapSession(workspaceDir, conversationId);
+    const alreadyAskedScope = existingSession2?.pendingClarification === "scope";
+    if (!alreadyAskedScope) {
+      await upsertTelegramBootstrapSession(workspaceDir, {
+        conversationId,
+        rawIdea: content,
+        stackHint: parsed.stackHint ?? void 0,
+        projectName: parsed.projectSlug ?? void 0,
+        status: "clarifying",
+        pendingClarification: "scope",
+        language
+      });
+      const clarifyMsg = BOOTSTRAP_MESSAGES.clarifyScope[language](content);
+      await sendTelegramText(ctx, rawConversationId, clarifyMsg);
+      return;
+    }
+    if (existingSession2?.stackHint) {
+      incomingRequest.stackHint = existingSession2.stackHint;
+    }
+  }
   const handled = await runBootstrapPreflightOrFail(
     ctx,
     conversationId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mestreyoda/fabrica",
-  "version": "0.2.19",
+  "version": "0.2.20",
   "description": "Autonomous software engineering pipeline for OpenClaw. Turns ideas into deployed code via intake, dispatch, review, test, and merge.",
   "type": "module",
   "main": "./dist/index.js",