aerocoding 0.1.24 → 0.1.26

package/README.md

@@ -14,11 +14,13 @@ npm install -g aerocoding
 # 1. Login (once)
 aerocoding login
 
-# 2. Initialize project (once per project)
-aerocoding init
+# 2. Create a new project
+aerocoding create
 
-# 3. Generate code (anytime)
-aerocoding generate
+# 3. Make changes in the diagram editor on aerocoding.dev
+
+# 4. Update your code incrementally
+aerocoding update
 ```
 
 ## Commands
@@ -31,46 +33,57 @@ Authenticate with your AeroCoding account. Opens browser for secure OAuth authen
 aerocoding login
 ```
 
-### `aerocoding init`
+### `aerocoding create [name]`
 
-Interactive wizard to configure code generation for your project. Creates a `.aerocodingrc.json` config file.
+Interactive wizard to create a new AeroCoding project with full architecture generation.
 
 ```bash
-aerocoding init
+# Interactive (recommended)
+aerocoding create
+
+# With custom directory name
+aerocoding create my-project
 ```
 
 Options:
+- `-t, --template <id>` - Skip template selection
 - `-p, --project <id>` - Skip project selection
-- `-f, --force` - Overwrite existing config
+- `-f, --force` - Overwrite existing directory without asking
 
-### `aerocoding generate`
+Creates:
+- `aerocoding.json` - Project configuration
+- `aerocoding-manifest.json` - File tracking manifest (auto-generated)
+- `backend/` - Generated backend code
 
-Generate code based on your config file or CLI options.
+### `aerocoding update`
+
+Incrementally update generated code while preserving your changes.
 
 ```bash
-# Using config file (recommended)
-aerocoding generate
+aerocoding update
+```
+
+Options:
+- `-f, --force` - Overwrite modified files without merging
+- `-v, --verbose` - Show detailed file operations
+- `--dry-run` - Preview changes without writing files
+
+Features:
+- Three-way merge to preserve your custom code
+- Creates `.new` and `.conflict` files when merge fails
+- Syncs manifest to cloud for backup
 
-# With CLI overrides
-aerocoding generate --no-testing
-aerocoding generate -y  # Skip confirmation
+### `aerocoding resolve`
+
+Clean up conflict files after manual resolution.
+
+```bash
+aerocoding resolve
 ```
 
 Options:
-- `-p, --project <id>` - Project ID (overrides config)
-- `-t, --targets <targets...>` - Generation targets
-- `-o, --output <dir>` - Output directory (default: `./generated`)
-- `--backend-preset <preset>` - Backend architecture preset
-- `--frontend-preset <preset>` - Frontend architecture preset
-- `--backend-layers <layers...>` - Backend layers to generate
-- `--frontend-layers <layers...>` - Frontend layers to generate
-- `--no-validations` - Exclude validation code
-- `--no-comments` - Exclude comments
-- `--no-annotations` - Exclude annotations/decorators
-- `--no-logging` - Exclude logging
-- `--no-testing` - Exclude test files
-- `--validation-lib <lib>` - Validation library (e.g., `fluentvalidation`, `zod`)
-- `-y, --yes` - Skip confirmation prompt
+- `-v, --verbose` - Show detailed resolution info
+- `-a, --all` - Resolve all conflicts without confirmation
 
 ### `aerocoding whoami`
 
@@ -80,34 +93,61 @@ Show current authenticated user.
 
 Clear stored credentials.
 
-## Config File
+## Configuration Files
 
-The `aerocoding init` command creates a `.aerocodingrc.json` file:
+### `aerocoding.json`
+
+Project configuration (user-editable):
 
 ```json
 {
-  "$schema": "https://aerocoding.dev/schemas/aerocodingrc.json",
-  "project": "your-project-id",
-  "output": "./.aerocoding",
-  "backend": {
-    "preset": "clean-architecture-dotnet",
-    "layers": ["entities", "dtos", "validators", "repositories"]
-  },
-  "frontend": {
-    "preset": "feature-based",
-    "layers": ["models", "services"]
-  },
-  "codeStyle": {
-    "includeValidations": true,
-    "includeComments": true,
-    "includeAnnotations": true,
-    "includeLogging": true,
-    "includeTesting": false
+  "$schema": "https://aerocoding.dev/schema.json",
+  "projectId": "your-project-id",
+  "templateId": "clean-arch-dotnet",
+  "templateVersion": "1.0.0",
+  "namespace": "MegaStore",
+  "organizationId": "your-org-id",
+  "output": {
+    "backend": "./backend",
+    "frontend": "./frontend"
   }
 }
 ```
 
-CLI arguments override config file values.
+### `aerocoding-manifest.json`
+
+Auto-generated file tracking (do not edit):
+
+```json
+{
+  "version": "1.0.0",
+  "lastSync": "2024-01-15T10:30:00Z",
+  "files": {
+    "backend/src/Domain/Customer.cs": {
+      "hash": "sha256:abc123...",
+      "mtime": 1705312200000,
+      "size": 2847,
+      "type": "entity"
+    }
+  }
+}
+```
+
+## Incremental Generation
+
+AeroCoding uses smart merging to preserve your custom code:
+
+1. **Unchanged files**: Silently updated
+2. **Modified files**: Three-way merge attempted
+3. **Conflicts**: Creates `.new` and `.conflict` files for manual resolution
+
+```
+Customer.cs           <- Your version (unchanged)
+Customer.cs.new       <- New generated version
+Customer.cs.conflict  <- Diff showing conflicts
+```
+
+After resolving conflicts manually, run `aerocoding resolve` to clean up.
 
 ## Security