@fractary/faber-cli 1.5.24 → 1.5.26

package/README.md

@@ -52,7 +52,6 @@ See [GitHub App Setup Guide](../docs/github-app-setup.md) for detailed manual in
 ### 3. Initialize a FABER project
 
 ```bash
-fractary-faber configure
 fractary-faber config init
 fractary-faber config init --autonomy guarded
 ```

package/dist/commands/plan/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/plan/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAqDpC;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAqB3C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/plan/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsDpC;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAqB3C"}

package/dist/commands/plan/index.js

@@ -10,6 +10,7 @@ import { RepoClient } from '../../lib/repo-client.js';
 import { ConfigManager } from '../../lib/config.js';
 import { prompt } from '../../utils/prompt.js';
 import { validateWorkIds, validateLabels, validateWorkflowName, validatePlanId, } from '../../utils/validation.js';
+import { getRunDir, getPlanPath } from '@fractary/faber';
 import fs from 'fs/promises';
 import path from 'path';
 /**
@@ -391,12 +392,9 @@ async function planSingleIssue(issue, config, repoClient, anthropicClient, optio
     if (!options.noWorktree) {
         // Validate plan ID format (prevent path traversal via malicious plan IDs)
         validatePlanId(planId);
-        const planDir = path.join(worktreePath, '.fractary', 'plans');
-        await fs.mkdir(planDir, { recursive: true });
-        // Construct and validate path
-        const planPath = path.join(planDir, `${planId}.json`);
-        // Note: path.join automatically normalizes and prevents basic traversal,
-        // but we validate the plan ID format as an additional layer of defense
+        const runDir = getRunDir(planId, worktreePath);
+        await fs.mkdir(runDir, { recursive: true });
+        const planPath = getPlanPath(planId, worktreePath);
         await fs.writeFile(planPath, JSON.stringify(plan, null, 2));
         if (outputFormat === 'text') {
             console.log(chalk.gray(`  → Plan written to ${planPath}`));
@@ -486,7 +484,7 @@ function generatePlanComment(plan, workflow, worktreePath, planId, issueNumber)
     }
     comment += `---\n\n`;
     comment += `### Plan Location\n\n`;
-    const planPath = `${worktreePath}/.fractary/plans/${planId}.json`;
+    const planPath = `${worktreePath}/.fractary/faber/runs/${planId}/plan.json`;
     comment += `| File | Path |\n`;
     comment += `|------|------|\n`;
     comment += `| Plan | \`${planPath}\` |\n\n`;

package/dist/lib/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAE,WAAW,EAAiB,eAAe,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGpG;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAc;IAE5B,OAAO;IAIP;;;OAGG;WACU,IAAI,IAAI,OAAO,CAAC,WAAW,GAAG;QAAE,SAAS,CAAC,EAAE,eAAe,CAAC;QAAC,MAAM,CAAC,EAAE,YAAY,CAAA;KAAE,CAAC;IA8GlG;;;OAGG;mBACkB,cAAc;IAwBnC;;OAEG;mBACkB,8BAA8B;IAoBnD;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAyBnC;;OAEG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,WAAW,GAAG,GAAG;CAGjC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAE,WAAW,EAAiB,eAAe,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGpG;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAc;IAE5B,OAAO;IAIP;;;OAGG;WACU,IAAI,IAAI,OAAO,CAAC,WAAW,GAAG;QAAE,SAAS,CAAC,EAAE,eAAe,CAAC;QAAC,MAAM,CAAC,EAAE,YAAY,CAAA;KAAE,CAAC;IAsHlG;;;OAGG;mBACkB,cAAc;IAwBnC;;OAEG;mBACkB,8BAA8B;IAoBnD;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAyBnC;;OAEG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,WAAW,GAAG,GAAG;CAGjC"}

package/dist/lib/config.js

@@ -73,14 +73,22 @@ export class ConfigManager {
             repo: unifiedConfig.github?.repo,
             app: unifiedConfig.github?.app,
         };
-        // Extract FABER-specific config
+        // Extract FABER-specific config, supporting both v2.1 (workflows/runs) and legacy (workflow/worktree)
         const faberConfig = unifiedConfig.faber || {};
+        // Normalize: map v2.1 format to internal representation, with legacy fallback
+        const resolvedWorkflow = faberConfig.workflow || {};
+        if (faberConfig.workflows) {
+            resolvedWorkflow.default = resolvedWorkflow.default || faberConfig.workflows.default;
+            resolvedWorkflow.config_path = resolvedWorkflow.config_path || faberConfig.workflows.path;
+        }
         // Build the result config (keeping anthropic and github for backward compatibility)
         const config = {
             anthropic,
             github,
             worktree: faberConfig.worktree,
-            workflow: faberConfig.workflow,
+            workflow: resolvedWorkflow,
+            workflows: faberConfig.workflows,
+            runs: faberConfig.runs,
             backlog_management: faberConfig.backlog_management,
         };
         // Read Claude Code configuration for worktree location
@@ -101,7 +109,6 @@ export class ConfigManager {
             };
         }
         if (!config.workflow?.config_path) {
-            // Always use the canonical workflow path - no legacy fallback
             const workflowPath = path.join(process.cwd(), '.fractary', 'faber', 'workflows');
             config.workflow = {
                 ...config.workflow,

package/dist/lib/yaml-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"yaml-config.d.ts","sourceRoot":"","sources":["../../src/lib/yaml-config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,YAAY,EACV,eAAe,EACf,eAAe,EACf,YAAY,EACZ,cAAc,EACd,cAAc,EACd,uBAAuB,EACvB,WAAW,EACX,aAAa,EACb,iBAAiB,GAClB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AA8F3E;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,OAAO,GAAE,iBAAsB,GAAG,aAAa,GAAG,IAAI,CAoDpF;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,EACrB,WAAW,CAAC,EAAE,MAAM,GACnB,IAAI,CAkBN;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,UAAO,GAAG,MAAM,CAgD7E;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,QAAQ,GAAE,MAAsB,GAAG,MAAM,CAoDxE;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAI1D;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAG1D;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAI/D;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAG/D"}
+{"version":3,"file":"yaml-config.d.ts","sourceRoot":"","sources":["../../src/lib/yaml-config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,YAAY,EACV,eAAe,EACf,eAAe,EACf,YAAY,EACZ,cAAc,EACd,cAAc,EACd,uBAAuB,EACvB,WAAW,EACX,aAAa,EACb,iBAAiB,GAClB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAgH3E;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,OAAO,GAAE,iBAAsB,GAAG,aAAa,GAAG,IAAI,CAoDpF;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,EACrB,WAAW,CAAC,EAAE,MAAM,GACnB,IAAI,CAkBN;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,UAAO,GAAG,MAAM,CAgD7E;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,QAAQ,GAAE,MAAsB,GAAG,MAAM,CAoDxE;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAI1D;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAG1D;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAI/D;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAG/D"}

package/dist/lib/yaml-config.js

@@ -51,6 +51,24 @@ const unifiedConfigSchema = {
         faber: {
             type: 'object',
             properties: {
+                // Current format (v2.1) - created by fractary-faber config init
+                workflows: {
+                    type: 'object',
+                    properties: {
+                        path: { type: 'string' },
+                        default: { type: 'string' },
+                        autonomy: { type: 'string', enum: ['dry-run', 'assisted', 'guarded', 'autonomous'] },
+                    },
+                    additionalProperties: false,
+                },
+                runs: {
+                    type: 'object',
+                    properties: {
+                        path: { type: 'string' },
+                    },
+                    additionalProperties: false,
+                },
+                // Legacy format (v2.0) - kept for backward compatibility
                 worktree: {
                     type: 'object',
                     properties: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fractary/faber-cli",
-  "version": "1.5.24",
+  "version": "1.5.26",
   "description": "FABER CLI - Command-line interface for FABER development toolkit",
   "main": "dist/index.js",
   "bin": {