@mestreyoda/fabrica 0.2.18 → 0.2.19

package/defaults/fabrica/prompts/developer.md

@@ -42,7 +42,7 @@ fi
 
 The `.worktrees/` directory sits NEXT TO the repo folder (not inside it). This keeps the main checkout clean for the orchestrator and other workers. If the assigned worktree already exists from a previous task on the same branch, verify it's clean and reuse it.
 
-Never create or implement the project under `~/.openclaw/workspace/<slug>` unless the task message explicitly says that directory is the canonical repo path. Once you are in the assigned worktree, stay there for the rest of the task and do not switch back to the main checkout.
+Never create or implement the project under `~/.openclaw/workspace/<slug>` unless the task message explicitly says that directory is the canonical repo path. If the repo already contains scaffolded files, do not re-initialize the project with `npm init`, `uv init`, `cargo init`, or a second skeleton generator — keep the existing stack and modify the scaffold inside the assigned worktree. Once you are in the assigned worktree, stay there for the rest of the task and do not switch back to the main checkout.
 
 ### 2. Implement the changes
 
@@ -115,16 +115,16 @@ When your task message includes a **PR Feedback** section, it means a reviewer r
 
 1. Check out the existing branch from the PR (the branch name is in the feedback context)
 2. If a worktree already exists for that branch, `cd` into it
-3. If not, create a worktree from the existing remote branch:
+3. If not, create a local worktree that tracks the existing remote branch:
    ```bash
-   REPO_ROOT="$(git rev-parse --show-toplevel)"
+   REPO_ROOT="/absolute/path/from-task-message"
    BRANCH="<branch-from-pr>"
    WORKTREE="${REPO_ROOT}.worktrees/${BRANCH}"
    git fetch origin "$BRANCH"
-   git worktree add "$WORKTREE" "origin/$BRANCH"
+   git worktree add -b "$BRANCH" "$WORKTREE" "origin/$BRANCH"
    cd "$WORKTREE"
    ```
-4. Address **only** the reviewer's comments — do not re-implement the original issue from scratch
+4. Address **only** the reviewer's comments on that same PR branch — do not switch to a new canonical issue branch and do not re-implement the original issue from scratch
 5. Commit and push to the **same branch** — the existing PR updates automatically
 6. End your response with the canonical developer result line described below
 

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.18") {
-    return "0.2.18";
+  if ("0.2.19") {
+    return "0.2.19";
   }
   try {
     const pkgPath = path5.join(THIS_DIR, "..", "..", "package.json");
@@ -128040,6 +128040,9 @@ async function resolveEffectiveModelForGateway(requested, runCommand) {
 
 // lib/dispatch/message-builder.ts
 init_roles();
+function toBranchSlug(value) {
+  return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 48) || "task";
+}
 function buildTaskMessage(opts) {
   const {
     projectName,
@@ -128054,6 +128057,8 @@ function buildTaskMessage(opts) {
   } = opts;
   const repoDisplay = repo;
   const isFeedbackCycle = !!opts.prFeedback;
+  const branchName = opts.prFeedback?.branchName?.trim() ? opts.prFeedback.branchName.trim() : `feature/${issueId}-${toBranchSlug(projectName)}`;
+  const worktreePath = `${repoDisplay}.worktrees/${branchName}`;
   const parts = [
     `${role.toUpperCase()} task for project "${projectName}" \u2014 Issue #${issueId}`,
     ``,
@@ -128070,6 +128075,17 @@ ${issueDescription}` : ""
       `> When feedback conflicts with the original description, follow the PR feedback.`
     );
   }
+  parts.push(
+    ``,
+    `## Execution Setup (do this before editing files)`,
+    `Repo: ${repoDisplay} | Base branch: ${baseBranch} | ${issueUrl}`,
+    `Execution path: ${repoDisplay}`,
+    `Required branch: ${branchName}`,
+    `Required worktree: ${worktreePath}`,
+    `Before editing any file, create or reuse the required worktree above and work only there.`,
+    `Do not re-initialize or replace the scaffold in the main checkout (for example: do not run npm init, cargo init, uv init, or create a second project skeleton) when the repo already contains scaffolded files. Modify the existing scaffold inside the worktree instead.`,
+    `If the repo path is missing or inaccessible, return the canonical blocked result instead of improvising in ~/.openclaw/workspace.`
+  );
   if (opts.followUpPrRequired) {
     parts.push(
       ``,
@@ -128115,10 +128131,7 @@ ${issueDescription}` : ""
   if (opts.attachmentContext) parts.push(opts.attachmentContext);
   parts.push(
     ``,
-    `Repo: ${repoDisplay} | Branch: ${baseBranch} | ${issueUrl}`,
-    `Project: ${projectName} | Channel: ${channelId}`,
-    `Execution path: ${repoDisplay}`,
-    `Start by changing into the canonical repo path above before creating or reusing a worktree. Do not create or implement the project under ~/.openclaw/workspace unless the repo path itself points there.`
+    `Project: ${projectName} | Channel: ${channelId}`
   );
   parts.push(...buildCompletionContract(role));
   return parts.join("\n");
@@ -128136,6 +128149,8 @@ function buildConflictFixMessage(opts) {
     prFeedback
   } = opts;
   const repoDisplay = repo;
+  const branchName = prFeedback.branchName?.trim() ? prFeedback.branchName.trim() : `feature/${issueId}-${toBranchSlug(projectName)}`;
+  const worktreePath = `${repoDisplay}.worktrees/${branchName}`;
   const parts = [
     `${role.toUpperCase()} task for project "${projectName}" \u2014 Issue #${issueId}`,
     ``,
@@ -128146,10 +128161,12 @@ function buildConflictFixMessage(opts) {
   parts.push(...formatPrFeedback(prFeedback, baseBranch));
   parts.push(
     ``,
-    `Repo: ${repoDisplay} | Branch: ${baseBranch} | ${issueUrl}`,
+    `Repo: ${repoDisplay} | Base branch: ${baseBranch} | ${issueUrl}`,
     `Project: ${projectName} | Channel: ${channelId}`,
     `Execution path: ${repoDisplay}`,
-    `Start by changing into the canonical repo path above before reusing the PR branch or creating its worktree. Do not resolve the issue inside ~/.openclaw/workspace unless the repo path itself points there.`
+    `Required branch: ${branchName}`,
+    `Required worktree: ${worktreePath}`,
+    `Start by changing into the canonical repo path above before reusing the PR branch or creating its worktree. Reuse the exact PR branch named above; do not switch to a new canonical issue branch during a feedback cycle. Do not resolve the issue inside ~/.openclaw/workspace unless the repo path itself points there.`
   );
   parts.push(...buildCompletionContract(role));
   return parts.join("\n");
@@ -138138,7 +138155,7 @@ var EXPRESS_GATES = {
 };
 var NODE_CLI_GATES = {
   lint: "npm run lint",
-  types: "npm run build -- --noEmit",
+  types: "npm run typecheck",
   security: "npm audit --audit-level=moderate",
   tests: "npm test",
   coverage: "npm run coverage"
@@ -139047,7 +139064,6 @@ fi
 }
 
 // lib/intake/steps/scaffold.ts
-var PYTHON_STACKS3 = /* @__PURE__ */ new Set(["python-cli", "fastapi", "flask", "django"]);
 var scaffoldStep = {
   name: "scaffold",
   shouldRun: (payload) => payload.impact?.is_greenfield === true && !payload.dry_run,
@@ -139073,7 +139089,7 @@ var scaffoldStep = {
           mode: "scaffold",
           runCommand: ctx.runCommand
         });
-        if (scaffold.stack && PYTHON_STACKS3.has(scaffold.stack) && payload.spec) {
+        if (scaffold.stack && payload.spec) {
           try {
             const contract = generateQaContract({
               spec: payload.spec,

package/genesis/scripts/scaffold-project.sh

@@ -348,7 +348,7 @@ $objective
 
 \`\`\`bash
 $(case "$stack" in
-  nextjs|express) echo "npm install" ;;
+  nextjs|express|node-cli) echo "npm install" ;;
   fastapi|flask|django) echo "python -m venv .venv && source .venv/bin/activate && pip install -r requirements.txt" ;;
   python-cli) echo "python -m venv .venv && source .venv/bin/activate && pip install -e '.[dev]'" ;;
 esac)
@@ -360,6 +360,7 @@ esac)
 $(case "$stack" in
   nextjs) echo "npm run dev" ;;
   express) echo "npm run dev" ;;
+  node-cli) echo "npm run dev -- \"Hello World CLI\"" ;;
   fastapi) echo "uvicorn app.main:app --reload" ;;
   flask) echo "flask run --debug" ;;
   django) echo "python manage.py runserver" ;;
@@ -460,21 +461,26 @@ scaffold_node_cli() {
   "scripts": {
     "dev": "tsx src/index.ts",
     "build": "tsc",
+    "typecheck": "tsc --noEmit",
     "start": "node dist/index.js",
-    "lint": "eslint src/",
+    "lint": "eslint .",
     "test": "vitest run",
-    "test:watch": "vitest"
+    "test:watch": "vitest",
+    "coverage": "vitest run --coverage --coverage.thresholds.lines=80"
   },
   "dependencies": {
     "commander": "^14.0.0"
   },
   "devDependencies": {
+    "@eslint/js": "^9.0.0",
     "@types/node": "^22.0.0",
+    "@vitest/coverage-v8": "^3.0.0",
     "eslint": "^9.0.0",
-    "typescript": "^5.7.0",
+    "globals": "^15.0.0",
     "tsx": "^4.0.0",
-    "vitest": "^3.0.0",
-    "@vitest/coverage-v8": "^3.0.0"
+    "typescript": "^5.7.0",
+    "typescript-eslint": "^8.0.0",
+    "vitest": "^3.0.0"
   }
 }
 EOF
@@ -489,62 +495,127 @@ EOF
     "module": "ESNext",
     "moduleResolution": "bundler",
     "outDir": "dist",
-    "rootDir": "src",
+    "rootDir": ".",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
     "resolveJsonModule": true,
-    "declaration": true
+    "declaration": true,
+    "types": ["node"]
   },
-  "include": ["src"],
-  "exclude": ["node_modules", "dist", "tests"]
+  "include": ["src", "tests"],
+  "exclude": ["node_modules", "dist"]
 }
 EOF
   FILES_CREATED+=("tsconfig.json")
 
+  cat > eslint.config.mjs <<'EOF'
+import js from '@eslint/js';
+import globals from 'globals';
+import tseslint from 'typescript-eslint';
+
+export default tseslint.config(
+  js.configs.recommended,
+  ...tseslint.configs.recommended,
+  {
+    files: ['src/**/*.ts', 'tests/**/*.ts'],
+    languageOptions: {
+      globals: {
+        ...globals.node,
+      },
+    },
+    rules: {
+      'no-console': 'off',
+    },
+  },
+);
+EOF
+  FILES_CREATED+=("eslint.config.mjs")
+
   mkdir -p src
   cat > src/index.ts <<'EOF'
 #!/usr/bin/env node
 import { Command } from 'commander';
+import { pathToFileURL } from 'node:url';
+
+export function toKebabCase(input: string): string {
+  return input
+    .trim()
+    .replace(/([a-z0-9])([A-Z])/g, '$1-$2')
+    .replace(/[\s_]+/g, '-')
+    .replace(/-+/g, '-')
+    .replace(/^-|-$/g, '')
+    .toLowerCase();
+}
+
+export function createProgram(): Command {
+  return new Command()
+    .name(process.env.npm_package_name ?? 'cli')
+    .version(process.env.npm_package_version ?? '0.1.0')
+    .description('Convert a text argument to kebab-case')
+    .argument('<text>', 'text to convert')
+    .action((text: string) => {
+      console.log(toKebabCase(text));
+    });
+}
 
-const program = new Command();
+export function main(argv = process.argv): void {
+  createProgram().parse(argv);
+}
 
-program
-  .name(process.env.npm_package_name ?? 'cli')
-  .version(process.env.npm_package_version ?? '0.1.0')
-  .description('CLI tool')
-  .argument('[args...]', 'arguments')
-  .action((args: string[]) => {
-    console.log('Hello from CLI', args.length ? args.join(' ') : '');
-  });
+const isDirectRun = process.argv[1]
+  ? import.meta.url === pathToFileURL(process.argv[1]).href
+  : false;
 
-program.parse();
+if (isDirectRun) {
+  main();
+}
 EOF
   FILES_CREATED+=("src/index.ts")
 
   mkdir -p tests
   cat > tests/main.test.ts <<'EOF'
-import { describe, it, expect } from 'vitest';
 import { execFileSync } from 'node:child_process';
-import { resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { createProgram, main, toKebabCase } from '../src/index.js';
 
-const cli = resolve(__dirname, '../src/index.ts');
+const cli = fileURLToPath(new URL('../src/index.ts', import.meta.url));
 
-function run(...args: string[]): string {
-  return execFileSync('npx', ['tsx', cli, ...args], {
-    encoding: 'utf-8',
-    env: { ...process.env, NODE_NO_WARNINGS: '1' },
-  }).trim();
-}
+describe('toKebabCase', () => {
+  it('converts text with spaces and casing', () => {
+    expect(toKebabCase('Hello World CLI')).toBe('hello-world-cli');
+    expect(toKebabCase('Some_Mixed Case Text')).toBe('some-mixed-case-text');
+    expect(toKebabCase('  already-kebab  ')).toBe('already-kebab');
+  });
+});
+
+describe('main', () => {
+  const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
+
+  afterEach(() => {
+    logSpy.mockClear();
+  });
+
+  it('prints the kebab-case output', () => {
+    main(['node', 'hyphenator-cli', 'Hello World Example']);
+    expect(logSpy).toHaveBeenCalledWith('hello-world-example');
+  });
 
-describe('CLI', () => {
-  it('should print hello message', () => {
-    const output = run();
-    expect(output).toContain('Hello from CLI');
+  it('builds a command with metadata', () => {
+    const program = createProgram();
+    expect(program.name()).toBeTruthy();
+    expect(program.description()).toContain('kebab-case');
   });
+});
+
+describe('CLI smoke', () => {
+  it('shows version with --version', () => {
+    const output = execFileSync('npx', ['tsx', cli, '--version'], {
+      encoding: 'utf-8',
+      env: { ...process.env, NODE_NO_WARNINGS: '1' },
+    }).trim();
 
-  it('should show version with --version', () => {
-    const output = run('--version');
     expect(output).toMatch(/\d+\.\d+\.\d+/);
   });
 });
@@ -559,23 +630,19 @@ echo "=== QA Gate ==="
 FAIL=0
 
 echo "--- Lint ---"
-npx eslint src/ 2>&1 || { echo "LINT FAILED"; FAIL=1; }
+npm run lint 2>&1 || { echo "LINT FAILED"; FAIL=1; }
 
 echo "--- TypeScript ---"
-npx tsc --noEmit 2>&1 || { echo "TSC FAILED"; FAIL=1; }
+npm run typecheck 2>&1 || { echo "TSC FAILED"; FAIL=1; }
 
 echo "--- Tests ---"
-npx vitest run 2>&1 || { echo "TESTS FAILED"; FAIL=1; }
+npm test 2>&1 || { echo "TESTS FAILED"; FAIL=1; }
 
 echo "--- Coverage (>=80%) ---"
-npx vitest run --coverage --coverage.thresholds.lines=80 2>&1 || { echo "COVERAGE FAILED"; FAIL=1; }
+npm run coverage 2>&1 || { echo "COVERAGE FAILED"; FAIL=1; }
 
-echo "--- Secrets scan ---"
-if grep -rn 'password\s*=\s*"[^"]\+"\|api_key\s*=\s*"[^"]\+"\|secret\s*=\s*"[^"]\+"' --include="*.ts" --include="*.js" src/ 2>/dev/null; then
-  echo "SECRETS FOUND — FAIL"; FAIL=1
-else
-  echo "No hardcoded secrets found"
-fi
+echo "--- Security audit ---"
+npm audit --audit-level=moderate 2>&1 || { echo "AUDIT FAILED"; FAIL=1; }
 
 exit $FAIL
 QAEOF

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mestreyoda/fabrica",
-  "version": "0.2.18",
+  "version": "0.2.19",
   "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",