rrce-workflow 0.1.6 → 0.2.6

package/agent-core/prompts/documentation.md

@@ -48,7 +48,7 @@ Non-Negotiables
 6. Close the loop in `meta.json` when working within a task by setting `agents.documentation.status`, refreshing `checklist`, and updating overall `status`.
 
 Path Resolution
-- Storage mode: Determined by `.rrce-workflow.yaml` → global config → default (`global`)
+- Storage mode: Determined by `config.yaml → `storage.mode`` → global config → default (`global`)
   - `global`: Data in `~/.rrce-workflow/workspaces/<workspace-name>/`
   - `workspace`: Data in `<workspace>/.rrce-workflow/`
   - `both`: **Dual storage** - data stored in BOTH locations simultaneously
@@ -56,7 +56,7 @@ Path Resolution
     - Secondary (auto-synced): `~/.rrce-workflow/workspaces/<workspace-name>/`
     - When writing, always write to `{{RRCE_DATA}}` - the system ensures both locations stay in sync
 - Data path: `{{RRCE_DATA}}` (resolves to primary storage based on mode)
-- Global home: `{{RRCE_HOME}}` (default: `~/.rrce-workflow`, customizable via `storage.globalPath` in config)
+- Global home: `{{RRCE_HOME}}` - **To resolve:** read `.rrce-workflow/config.yaml` → `storage.globalPath`, or default `~/.rrce-workflow`
 - Workspace root: `{{WORKSPACE_ROOT}}` (auto-detected or via `$RRCE_WORKSPACE`)
 - Workspace name: `{{WORKSPACE_NAME}}` (from config or directory name)
 

package/agent-core/prompts/executor.md

@@ -52,17 +52,14 @@ Non-Negotiables
 6. Update `meta.json` as you proceed so statuses stay accurate.
 
 Path Resolution
-- Storage mode: Determined by `.rrce-workflow.yaml` → global config → default (`global`)
-  - `global`: Data in `~/.rrce-workflow/workspaces/<workspace-name>/`
+- **Config file**: `.rrce-workflow/config.yaml` (read this first to resolve paths)
+- Storage mode: Determined by `config.yaml` → `storage.mode` (default: `global`)
+  - `global`: Data in `{{RRCE_HOME}}/workspaces/<workspace-name>/`
   - `workspace`: Data in `<workspace>/.rrce-workflow/`
-  - `both`: **Dual storage** - data stored in BOTH locations simultaneously
-    - Primary (for reads): `<workspace>/.rrce-workflow/`
-    - Secondary (auto-synced): `~/.rrce-workflow/workspaces/<workspace-name>/`
-    - When writing, always write to `{{RRCE_DATA}}` - the system ensures both locations stay in sync
+  - `both`: Dual storage - data in BOTH locations
 - Data path: `{{RRCE_DATA}}` (resolves to primary storage based on mode)
-- Global home: `{{RRCE_HOME}}` (default: `~/.rrce-workflow`, customizable via `storage.globalPath` in config)
-- Workspace root: `{{WORKSPACE_ROOT}}` (auto-detected or via `$RRCE_WORKSPACE`)
-- Workspace name: `{{WORKSPACE_NAME}}` (from config or directory name)
+- Global home: `{{RRCE_HOME}}` - **To resolve:** read `config.yaml` → `storage.globalPath`, or default `~/.rrce-workflow`
+- Workspace name: `{{WORKSPACE_NAME}}` (from `config.yaml` → `project.name`)
 
 Cross-Project References
 - Reference another project's context: `{{RRCE_HOME}}/workspaces/<other-project>/knowledge/`

package/agent-core/prompts/init.md

@@ -34,17 +34,18 @@ Non-Negotiables
 6. Keep output actionable and scannable; use structured sections.
 
 Path Resolution
-- Storage mode: Determined by `.rrce-workflow.yaml` → global config → default (`global`)
+- **Config file**: `.rrce-workflow/config.yaml` (read this first to resolve paths)
+- Storage mode: Determined by `config.yaml` → `storage.mode` (default: `global`)
   - `global`: Data stored in `{{RRCE_HOME}}/workspaces/<workspace-name>/`
   - `workspace`: Data stored in `<workspace>/.rrce-workflow/`
-  - `both`: **Dual storage** - data stored in BOTH locations simultaneously
-    - Primary (for reads): `<workspace>/.rrce-workflow/`
-    - Secondary (auto-synced): `{{RRCE_HOME}}/workspaces/<workspace-name>/`
-    - When writing, always write to `{{RRCE_DATA}}` - the system ensures both locations stay in sync
+  - `both`: **Dual storage** - data in BOTH locations
 - Data path: `{{RRCE_DATA}}` (resolves to primary storage based on mode)
-- Global home: `{{RRCE_HOME}}` (default: `~/.rrce-workflow`, can be customized via `storage.globalPath` in `.rrce-workflow.yaml`)
+- Global home: `{{RRCE_HOME}}` - **To resolve:**
+  1. Read `.rrce-workflow/config.yaml`
+  2. If `storage.globalPath` exists, use that value
+  3. Otherwise, default to `~/.rrce-workflow`
 - Workspace root: `{{WORKSPACE_ROOT}}` (auto-detected or via `$RRCE_WORKSPACE`)
-- Workspace name: `{{WORKSPACE_NAME}}` (from config or directory name)
+- Workspace name: `{{WORKSPACE_NAME}}` (from `config.yaml` → `project.name` or directory name)
 
 Cross-Project References
 - To reference another project's context: `{{RRCE_HOME}}/workspaces/<other-project-name>/knowledge/`

package/agent-core/prompts/planning_orchestrator.md

@@ -44,7 +44,7 @@ Non-Negotiables
 6. Keep the written plan under 500 lines and reference supporting materials explicitly.
 
 Path Resolution
-- Storage mode: Determined by `.rrce-workflow.yaml` → global config → default (`global`)
+- Storage mode: Determined by `config.yaml → `storage.mode`` → global config → default (`global`)
   - `global`: Data in `~/.rrce-workflow/workspaces/<workspace-name>/`
   - `workspace`: Data in `<workspace>/.rrce-workflow/`
   - `both`: **Dual storage** - data stored in BOTH locations simultaneously
@@ -52,7 +52,7 @@ Path Resolution
     - Secondary (auto-synced): `~/.rrce-workflow/workspaces/<workspace-name>/`
     - When writing, always write to `{{RRCE_DATA}}` - the system ensures both locations stay in sync
 - Data path: `{{RRCE_DATA}}` (resolves to primary storage based on mode)
-- Global home: `{{RRCE_HOME}}` (default: `~/.rrce-workflow`, customizable via `storage.globalPath` in config)
+- Global home: `{{RRCE_HOME}}` - **To resolve:** read `.rrce-workflow/config.yaml` → `storage.globalPath`, or default `~/.rrce-workflow`
 - Workspace root: `{{WORKSPACE_ROOT}}` (auto-detected or via `$RRCE_WORKSPACE`)
 - Workspace name: `{{WORKSPACE_NAME}}` (from config or directory name)
 

package/agent-core/prompts/research_discussion.md

@@ -38,7 +38,7 @@ Non-Negotiables
 6. Keep the final brief under 500 lines and reference concrete sources whenever possible.
 
 Path Resolution
-- Storage mode: Determined by `.rrce-workflow.yaml` → global config → default (`global`)
+- Storage mode: Determined by `config.yaml → `storage.mode`` → global config → default (`global`)
   - `global`: Data in `~/.rrce-workflow/workspaces/<workspace-name>/`
   - `workspace`: Data in `<workspace>/.rrce-workflow/`
   - `both`: **Dual storage** - data stored in BOTH locations simultaneously
@@ -46,7 +46,7 @@ Path Resolution
     - Secondary (auto-synced): `~/.rrce-workflow/workspaces/<workspace-name>/`
     - When writing, always write to `{{RRCE_DATA}}` - the system ensures both locations stay in sync
 - Data path: `{{RRCE_DATA}}` (resolves to primary storage based on mode)
-- Global home: `{{RRCE_HOME}}` (default: `~/.rrce-workflow`, customizable via `storage.globalPath` in config)
+- Global home: `{{RRCE_HOME}}` - **To resolve:** read `.rrce-workflow/config.yaml` → `storage.globalPath`, or default `~/.rrce-workflow`
 - Workspace root: `{{WORKSPACE_ROOT}}` (auto-detected or via `$RRCE_WORKSPACE`)
 - Workspace name: `{{WORKSPACE_NAME}}` (from config or directory name)
 

package/agent-core/prompts/sync.md

@@ -38,7 +38,7 @@ Non-Negotiables
 5. Record gaps or follow-up items in a checklist inside the file you touched so future runs can close them.
 
 Path Resolution
-- Storage mode: Determined by `.rrce-workflow.yaml` → global config → default (`global`)
+- Storage mode: Determined by `config.yaml → `storage.mode`` → global config → default (`global`)
   - `global`: Data in `~/.rrce-workflow/workspaces/<workspace-name>/`
   - `workspace`: Data in `<workspace>/.rrce-workflow/`
   - `both`: **Dual storage** - data stored in BOTH locations simultaneously
@@ -46,7 +46,7 @@ Path Resolution
     - Secondary (auto-synced): `~/.rrce-workflow/workspaces/<workspace-name>/`
     - When writing, always write to `{{RRCE_DATA}}` - the system ensures both locations stay in sync
 - Data path: `{{RRCE_DATA}}` (resolves to primary storage based on mode)
-- Global home: `{{RRCE_HOME}}` (default: `~/.rrce-workflow`, customizable via `storage.globalPath` in config)
+- Global home: `{{RRCE_HOME}}` - **To resolve:** read `.rrce-workflow/config.yaml` → `storage.globalPath`, or default `~/.rrce-workflow`
 - Workspace root: `{{WORKSPACE_ROOT}}` (auto-detected or via `$RRCE_WORKSPACE`)
 - Workspace name: `{{WORKSPACE_NAME}}` (from config or directory name)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rrce-workflow",
-  "version": "0.1.6",
+  "version": "0.2.6",
   "description": "RRCE-Workflow TUI - Agentic code workflow generator for AI-assisted development",
   "author": "RRCE Team",
   "license": "MIT",

package/src/commands/wizard/index.ts

@@ -1,13 +1,13 @@
 import { intro, select, spinner, note, outro, cancel, isCancel } from '@clack/prompts';
 import pc from 'picocolors';
 import * as fs from 'fs';
-import * as path from 'path';
 import { getGitUser } from '../../lib/git';
 import { 
   detectWorkspaceRoot, 
   getWorkspaceName, 
   listGlobalProjects, 
-  getLocalWorkspacePath 
+  getLocalWorkspacePath,
+  getConfigPath
 } from '../../lib/paths';
 
 // Import flows
@@ -38,8 +38,8 @@ Workspace: ${pc.bold(workspaceName)}`,
   // Check for existing projects in global storage
   const existingProjects = listGlobalProjects(workspaceName);
   
-  // Check if already configured
-  const configFilePath = path.join(workspacePath, '.rrce-workflow.yaml');
+  // Check if already configured (using getConfigPath for new/legacy support)
+  const configFilePath = getConfigPath(workspacePath);
   const isAlreadyConfigured = fs.existsSync(configFilePath);
   
   // Check current storage mode from config

package/src/commands/wizard/link-flow.ts

@@ -1,8 +1,7 @@
 import { multiselect, spinner, note, outro, cancel, isCancel } from '@clack/prompts';
 import pc from 'picocolors';
 import * as fs from 'fs';
-import * as path from 'path';
-import { listGlobalProjects, getEffectiveRRCEHome } from '../../lib/paths';
+import { listGlobalProjects, getEffectiveRRCEHome, getConfigPath } from '../../lib/paths';
 import { generateVSCodeWorkspace } from './vscode';
 
 /**
@@ -48,8 +47,8 @@ export async function runLinkProjectsFlow(
   const s = spinner();
   s.start('Linking projects');
 
-  // Update .rrce-workflow.yaml with linked projects
-  const configFilePath = path.join(workspacePath, '.rrce-workflow.yaml');
+  // Update config.yaml with linked projects
+  const configFilePath = getConfigPath(workspacePath);
   let configContent = fs.readFileSync(configFilePath, 'utf-8');
 
   // Check if linked_projects section exists

package/src/commands/wizard/setup-flow.ts

@@ -290,8 +290,10 @@ async function generateConfiguration(
     copyPromptsToDir(prompts, antigravityPath, '.md');
   }
 
-  // Create workspace config
-  const workspaceConfigPath = path.join(workspacePath, '.rrce-workflow.yaml');
+  // Create workspace config (inside .rrce-workflow folder)
+  const workspaceConfigPath = path.join(workspacePath, '.rrce-workflow', 'config.yaml');
+  ensureDir(path.dirname(workspaceConfigPath));
+  
   let configContent = `# RRCE-Workflow Configuration
 version: 1
 

package/src/commands/wizard/sync-flow.ts

@@ -6,7 +6,8 @@ import {
   ensureDir, 
   getLocalWorkspacePath, 
   getGlobalWorkspacePath,
-  getEffectiveRRCEHome
+  getEffectiveRRCEHome,
+  getConfigPath
 } from '../../lib/paths';
 import { copyDirRecursive } from './utils';
 
@@ -63,7 +64,7 @@ export async function runSyncToGlobalFlow(workspacePath: string, workspaceName:
     }
 
     // Update the config to reflect 'both' mode
-    const configFilePath = path.join(workspacePath, '.rrce-workflow.yaml');
+    const configFilePath = getConfigPath(workspacePath);
     let configContent = fs.readFileSync(configFilePath, 'utf-8');
     configContent = configContent.replace(/mode:\s*workspace/, 'mode: both');
     fs.writeFileSync(configFilePath, configContent);

package/src/commands/wizard/update-flow.ts

@@ -8,7 +8,8 @@ import {
   resolveAllDataPaths, 
   getAgentPromptPath,
   copyDirToAllStoragePaths,
-  getEffectiveRRCEHome 
+  getEffectiveRRCEHome,
+  getConfigPath
 } from '../../lib/paths';
 import { loadPromptsFromDir, getAgentCorePromptsDir, getAgentCoreDir } from '../../lib/prompts';
 import { copyPromptsToDir } from './utils';
@@ -67,7 +68,7 @@ export async function runUpdateFlow(
     }
 
     // Also update tool-specific locations if configured
-    const configFilePath = path.join(workspacePath, '.rrce-workflow.yaml');
+    const configFilePath = getConfigPath(workspacePath);
     const configContent = fs.readFileSync(configFilePath, 'utf-8');
 
     if (configContent.includes('copilot: true')) {

package/src/lib/paths.ts

@@ -18,8 +18,10 @@ export function detectWorkspaceRoot(): string {
   let current = process.cwd();
   
   while (current !== '/') {
-    // Check for .git or .rrce-workflow.yaml
+    // Check for .git or .rrce-workflow/config.yaml (new location)
+    // Also check legacy .rrce-workflow.yaml for backwards compatibility
     if (fs.existsSync(path.join(current, '.git')) || 
+        fs.existsSync(path.join(current, '.rrce-workflow', 'config.yaml')) ||
         fs.existsSync(path.join(current, '.rrce-workflow.yaml'))) {
       return current;
     }
@@ -29,6 +31,27 @@ export function detectWorkspaceRoot(): string {
   return process.cwd();
 }
 
+/**
+ * Get the config file path for a workspace
+ * New location: .rrce-workflow/config.yaml
+ * Legacy location: .rrce-workflow.yaml (for backwards compatibility)
+ */
+export function getConfigPath(workspaceRoot: string): string {
+  const newPath = path.join(workspaceRoot, '.rrce-workflow', 'config.yaml');
+  const legacyPath = path.join(workspaceRoot, '.rrce-workflow.yaml');
+  
+  // Prefer new location, fall back to legacy
+  if (fs.existsSync(newPath)) {
+    return newPath;
+  }
+  if (fs.existsSync(legacyPath)) {
+    return legacyPath;
+  }
+  
+  // Default to new location for new configs
+  return newPath;
+}
+
 /**
  * Get workspace name from directory or config
  */
@@ -139,13 +162,10 @@ export function ensureDir(dirPath: string): void {
 
 /**
  * Get path for agent prompts based on tool
+ * Now consolidated under .rrce-workflow/prompts/<tool>/
  */
 export function getAgentPromptPath(workspaceRoot: string, tool: 'copilot' | 'antigravity'): string {
-  if (tool === 'copilot') {
-    return path.join(workspaceRoot, '.github', 'agents');
-  } else {
-    return path.join(workspaceRoot, '.agent', 'workflows');
-  }
+  return path.join(workspaceRoot, '.rrce-workflow', 'prompts', tool);
 }
 
 /**
@@ -289,7 +309,7 @@ export function getSuggestedGlobalPaths(): Array<{ path: string; label: string;
 export function getEffectiveRRCEHome(workspaceRoot?: string): string {
   // Check workspace config for custom globalPath
   if (workspaceRoot) {
-    const configPath = path.join(workspaceRoot, '.rrce-workflow.yaml');
+    const configPath = getConfigPath(workspaceRoot);
     if (fs.existsSync(configPath)) {
       try {
         const content = fs.readFileSync(configPath, 'utf-8');