@documentation-robotics/cli 0.2.0 → 0.3.0

package/dist/commands/delete.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/commands/delete.ts"],
-  "sourcesContent": ["/**\n * Delete an element\n */\n\nimport { confirm } from \"@clack/prompts\";\nimport ansis from \"ansis\";\nimport { Model } from \"../core/model.js\";\nimport { MutationHandler } from \"../core/mutation-handler.js\";\nimport { ReferenceRegistry } from \"../core/reference-registry.js\";\nimport { DependencyTracker, TraceDirection } from \"../core/dependency-tracker.js\";\nimport { findElementLayer } from \"../utils/element-utils.js\";\nimport { CLIError, handleError, handleSuccess, handleInfo, ErrorCategory, ModelNotFoundError } from \"../utils/errors.js\";\nimport { startSpan, endSpan } from \"../telemetry/index.js\";\nimport { getErrorMessage } from \"../utils/errors.js\";\n\ndeclare const TELEMETRY_ENABLED: boolean | undefined;\nconst isTelemetryEnabled = typeof TELEMETRY_ENABLED !== \"undefined\" ? TELEMETRY_ENABLED : false;\n\nexport interface DeleteOptions {\n  model?: string;\n  force?: boolean;\n  verbose?: boolean;\n  debug?: boolean;\n  cascade?: boolean;\n  dryRun?: boolean;\n}\n\nexport async function deleteCommand(id: string, options: DeleteOptions): Promise<void> {\n  const span = isTelemetryEnabled\n    ? startSpan(\"element.delete\", {\n        \"element.id\": id,\n        \"element.force\": !!options.force,\n        \"element.cascade\": !!options.cascade,\n        \"element.dryRun\": !!options.dryRun,\n      })\n    : null;\n\n  try {\n    // Load model (with error handling for missing models)\n    let model: Model;\n    try {\n      model = await Model.load(options.model || process.cwd());\n    } catch (error) {\n      const message = getErrorMessage(error);\n      if (message.includes(\"No DR project\") || message.includes(\"Model not found\")) {\n        throw new ModelNotFoundError();\n      }\n      throw error;\n    }\n\n    // Find element\n    const layerName = await findElementLayer(model, id);\n    if (!layerName) {\n      throw new CLIError(`Element ${id} not found`, ErrorCategory.USER, [\n        `Use \"dr search ${id}\" to find similar elements`,\n        'Use \"dr list <layer>\" to list all elements in a layer',\n      ]);\n    }\n\n    const layer = (await model.getLayer(layerName))!;\n    const element = layer.getElement(id);\n\n    if (!element) {\n      throw new CLIError(`Element ${id} not found`, ErrorCategory.USER, [\n        `Use \"dr search ${id}\" to find similar elements`,\n        'Use \"dr list <layer>\" to list all elements in a layer',\n      ]);\n    }\n\n    // Build reference registry to track dependencies\n    const registry = new ReferenceRegistry();\n    for (const layer of model.layers.values()) {\n      for (const element of layer.listElements()) {\n        registry.registerElement(element);\n      }\n    }\n\n    // Create dependency tracker\n    const tracker = new DependencyTracker(registry, model);\n\n    // Find all elements that depend on this element (would be orphaned)\n    const dependents = tracker.traceDependencies(id, TraceDirection.DOWN, null);\n\n    // Display element information\n    handleInfo(\"\");\n    handleInfo(ansis.bold(`Removing element: ${ansis.yellow(id)}`), {\n      Layer: layerName,\n      Type: element.type || \"unknown\",\n      ...(element.name ? { Name: element.name } : {}),\n    });\n\n    // Display dependencies if any exist\n    if (dependents.length > 0) {\n      handleInfo(\"\");\n      handleInfo(\n        ansis.yellow(`\u26A0 Warning: This element has ${dependents.length} dependent element(s):`)\n      );\n\n      const directDependents = tracker.traceDependencies(id, TraceDirection.DOWN, 1);\n\n      // Show direct dependents\n      for (const dep of directDependents.slice(0, 5)) {\n        const depElement = model.getElementById(dep);\n        const depLayer = depElement?.layer || \"unknown\";\n        handleInfo(ansis.dim(`  - ${dep} (${depLayer})`));\n      }\n\n      if (directDependents.length > 5) {\n        handleInfo(ansis.dim(`  ... and ${directDependents.length - 5} more direct dependents`));\n      }\n\n      if (dependents.length > directDependents.length) {\n        handleInfo(\n          ansis.dim(\n            `  (${dependents.length - directDependents.length} transitive dependents not shown)`\n          )\n        );\n      }\n\n      // Check if cascade or force is enabled\n      if (!options.cascade && !options.force) {\n        handleInfo(\"\");\n        handleInfo(ansis.red(\"\u2717 Cannot remove element with dependencies.\"));\n        handleInfo(ansis.dim(\"Use --cascade to remove all dependent elements\"));\n        handleInfo(ansis.dim(\"or --force to skip dependency checks\"));\n        const suggestions = [\n          `Use --dry-run with --cascade to preview what would be deleted`,\n          'Review dependencies before deletion using \"dr show <element>\"',\n          \"Use --cascade to automatically remove all dependent elements\",\n          \"Or use --force to remove only this element (dependencies will reference a non-existent element)\",\n        ];\n        throw new CLIError(\"Element has dependencies\", ErrorCategory.USER, suggestions, {\n          operation: \"delete\",\n          relatedElements: directDependents.slice(0, 10),\n          context: `Element ${id} has ${dependents.length} dependent elements`,\n        });\n      }\n    }\n\n    // Calculate total elements to remove\n    const elementsToRemove = options.cascade ? [id, ...dependents] : [id];\n\n    // Display dry-run summary\n    if (options.dryRun) {\n      handleInfo(\"\");\n      handleInfo(ansis.yellow(`Dry run - not removing`));\n      handleInfo(ansis.dim(`Would remove ${elementsToRemove.length} element(s)`));\n\n      if (options.cascade && dependents.length > 0) {\n        handleInfo(\"\");\n        handleInfo(ansis.dim(\"Elements that would be removed:\"));\n        handleInfo(ansis.dim(`  - ${id} (target)`));\n        for (const dep of dependents.slice(0, 10)) {\n          handleInfo(ansis.dim(`  - ${dep} (dependent)`));\n        }\n        if (dependents.length > 10) {\n          handleInfo(ansis.dim(`  ... and ${dependents.length - 10} more`));\n        }\n      }\n\n      handleSuccess(\n        `Dry run: would remove ${elementsToRemove.length} element(s)`,\n        {\n          elementId: id,\n          layer: layerName!,\n          dryRun: true,\n          elementsToRemoveCount: 1,\n          dependentElementsToRemoveCount: dependents.length,\n        },\n        { verbose: options.verbose }\n      );\n      return;\n    }\n\n    // Confirm deletion unless --force\n    if (!options.force) {\n      const isInteractive = process.stdin.isTTY && process.stdout.isTTY;\n      if (!isInteractive) {\n        handleInfo(ansis.dim(\"Non-interactive environment detected - proceeding without confirmation\"));\n      } else {\n        const message =\n          options.cascade && dependents.length > 0\n            ? `Delete ${ansis.bold(id)} and ${ansis.bold(String(dependents.length))} dependent element(s)? This cannot be undone.`\n            : `Delete element ${ansis.bold(id)}? This cannot be undone.`;\n\n        const confirmed = await confirm({\n          message,\n          initialValue: false,\n        });\n\n        if (!confirmed) {\n          handleSuccess(\n            \"Deletion cancelled\",\n            {\n              status: \"cancelled\",\n              elementId: id,\n              layer: layerName!,\n            },\n            { verbose: options.verbose }\n          );\n          return;\n        }\n      }\n    }\n\n    // Execute deletion with error recovery guidance\n    let deletedCount = 0;\n    try {\n      if (options.cascade && dependents.length > 0) {\n        // Delete dependents first (reverse dependency order to avoid orphaned references)\n        const sortedDependents = [...dependents].reverse();\n\n        for (const depId of sortedDependents) {\n          try {\n            const depLayerName = await findElementLayer(model, depId);\n            if (!depLayerName) continue;\n\n            const depLayer = (await model.getLayer(depLayerName))!;\n            const depElement = depLayer.getElement(depId)!;\n\n            const handler = new MutationHandler(model, depId, depLayerName);\n            await handler.executeDelete(depElement);\n            deletedCount++;\n\n            if (options.verbose) {\n              handleInfo(ansis.dim(`  Deleted dependent: ${depId}`));\n            }\n          } catch (depError) {\n            // Track partial progress for error recovery\n            const suggestions = [\n              `${deletedCount} dependent element(s) were deleted before the error`,\n              'Check the model state with \"dr validate\" to identify any broken references',\n              'You may need to manually delete remaining elements or use \"dr show\" to inspect',\n            ];\n            throw new CLIError(\n              `Failed to delete dependent element ${depId}`,\n              ErrorCategory.SYSTEM,\n              suggestions,\n              {\n                operation: \"delete (cascade)\",\n                partialProgress: { completed: deletedCount, total: sortedDependents.length },\n                relatedElements: [id, ...sortedDependents.slice(0, 5)],\n              }\n            );\n          }\n        }\n      }\n    } catch (error) {\n      // If we're in the middle of cascade deletion, provide recovery info\n      if (options.cascade && deletedCount > 0 && !(error instanceof CLIError)) {\n        const suggestions = [\n          `${deletedCount} dependent element(s) were successfully deleted`,\n          'Use \"dr validate\" to check for broken references',\n          \"The target element was not deleted - you can retry the operation\",\n        ];\n        throw new CLIError(\n          \"Cascade deletion was partially completed but encountered an error\",\n          ErrorCategory.SYSTEM,\n          suggestions,\n          {\n            operation: \"delete (cascade)\",\n            partialProgress: { completed: deletedCount, total: dependents.length },\n          }\n        );\n      }\n      throw error;\n    }\n\n    // Delete the target element\n    const handler = new MutationHandler(model, id, layerName);\n    await handler.executeDelete(element);\n\n    if (isTelemetryEnabled && span) {\n      (span as any).setAttribute(\"layer.name\", layerName);\n      (span as any).setAttribute(\"element.dependents\", dependents.length);\n      (span as any).setAttribute(\"element.totalDeleted\", elementsToRemove.length);\n    }\n\n    // Check if operation was staged or applied to base model\n    const beforeState = handler.getBeforeState();\n    if (beforeState) {\n      // Check if we went through staging path\n      const stagingManager = handler.getStagingManager();\n      const activeChangeset = await stagingManager.getActive();\n      if (activeChangeset && activeChangeset.status === \"staged\") {\n        // Staging path\n        handleSuccess(\n          `Staged deletion of element ${ansis.bold(id)} to ${ansis.bold(activeChangeset.name)}`,\n          {\n            elementId: id,\n            layer: layerName!,\n            changesetStatus: \"staged\",\n            changeset: activeChangeset.name,\n            totalElementsDeleted: elementsToRemove.length,\n          },\n          { verbose: options.verbose }\n        );\n      } else {\n        // Base model path: purge any stale relationships MutationHandler may have missed\n        const staleBase = elementsToRemove.reduce(\n          (n, eid) => n + model.relationships.deleteForElement(eid), 0\n        );\n        if (staleBase > 0) await model.saveRelationships();\n\n        // Report deletion with cascade confirmation\n        showDeletionSuccess();\n      }\n    } else {\n      // Fallback success message if before state is not available\n      // This should rarely occur, but ensures user always gets feedback\n      const staleFallback = elementsToRemove.reduce(\n        (n, eid) => n + model.relationships.deleteForElement(eid), 0\n      );\n      if (staleFallback > 0) await model.saveRelationships();\n\n      // Report deletion with cascade confirmation\n      showDeletionSuccess();\n    }\n\n    function showDeletionSuccess(): void {\n      const details: Record<string, unknown> = {\n        elementId: id,\n        layer: layerName!,\n        totalElementsDeleted: elementsToRemove.length,\n      };\n      handleSuccess(`Deleted element ${ansis.bold(id)}`, details, { verbose: options.verbose });\n\n      // Show cascade confirmation when cascade is active\n      if (options.cascade && dependents.length > 0) {\n        handleInfo(ansis.green(`\u2713 Deleted ${dependents.length} dependent element(s)`));\n      }\n    }\n  } catch (error) {\n    if (isTelemetryEnabled && span) {\n      (span as any).recordException(error as Error);\n      (span as any).setStatus({ code: 2, message: (error as Error).message });\n    }\n    handleError(error);\n  } finally {\n    if (isTelemetryEnabled) {\n      endSpan(span);\n    }\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["/**\n * Delete an element\n */\n\nimport { confirm } from \"@clack/prompts\";\nimport ansis from \"ansis\";\nimport { Model } from \"../core/model.js\";\nimport { MutationHandler } from \"../core/mutation-handler.js\";\nimport { ReferenceRegistry } from \"../core/reference-registry.js\";\nimport { DependencyTracker, TraceDirection } from \"../core/dependency-tracker.js\";\nimport { findElementLayer } from \"../utils/element-utils.js\";\nimport { elementIdentifiers } from \"../core/relationships.js\";\nimport { CLIError, handleError, handleSuccess, handleInfo, ErrorCategory, ModelNotFoundError } from \"../utils/errors.js\";\nimport { startSpan, endSpan } from \"../telemetry/index.js\";\nimport { getErrorMessage } from \"../utils/errors.js\";\n\ndeclare const TELEMETRY_ENABLED: boolean | undefined;\nconst isTelemetryEnabled = typeof TELEMETRY_ENABLED !== \"undefined\" ? TELEMETRY_ENABLED : false;\n\nexport interface DeleteOptions {\n  model?: string;\n  force?: boolean;\n  verbose?: boolean;\n  debug?: boolean;\n  cascade?: boolean;\n  dryRun?: boolean;\n}\n\nexport async function deleteCommand(id: string, options: DeleteOptions): Promise<void> {\n  const span = isTelemetryEnabled\n    ? startSpan(\"element.delete\", {\n        \"element.id\": id,\n        \"element.force\": !!options.force,\n        \"element.cascade\": !!options.cascade,\n        \"element.dryRun\": !!options.dryRun,\n      })\n    : null;\n\n  try {\n    // Load model (with error handling for missing models)\n    let model: Model;\n    try {\n      model = await Model.load(options.model);\n    } catch (error) {\n      const message = getErrorMessage(error);\n      if (message.includes(\"No DR project\") || message.includes(\"Model not found\")) {\n        throw new ModelNotFoundError();\n      }\n      throw error;\n    }\n\n    // Find element\n    const layerName = await findElementLayer(model, id);\n    if (!layerName) {\n      throw new CLIError(`Element ${id} not found`, ErrorCategory.USER, [\n        `Use \"dr search ${id}\" to find similar elements`,\n        'Use \"dr list <layer>\" to list all elements in a layer',\n      ]);\n    }\n\n    const layer = (await model.getLayer(layerName))!;\n    const element = layer.getElement(id);\n\n    if (!element) {\n      throw new CLIError(`Element ${id} not found`, ErrorCategory.USER, [\n        `Use \"dr search ${id}\" to find similar elements`,\n        'Use \"dr list <layer>\" to list all elements in a layer',\n      ]);\n    }\n\n    // Build reference registry to track dependencies\n    const registry = new ReferenceRegistry();\n    for (const layer of model.layers.values()) {\n      for (const element of layer.listElements()) {\n        registry.registerElement(element);\n      }\n    }\n\n    // Create dependency tracker\n    const tracker = new DependencyTracker(registry, model);\n\n    // Find all elements that depend on this element (would be orphaned)\n    const dependents = tracker.traceDependencies(id, TraceDirection.DOWN, null);\n\n    // Display element information\n    handleInfo(\"\");\n    handleInfo(ansis.bold(`Removing element: ${ansis.yellow(id)}`), {\n      Layer: layerName,\n      Type: element.type || \"unknown\",\n      ...(element.name ? { Name: element.name } : {}),\n    });\n\n    // Display dependencies if any exist\n    if (dependents.length > 0) {\n      handleInfo(\"\");\n      handleInfo(\n        ansis.yellow(`\u26A0 Warning: This element has ${dependents.length} dependent element(s):`)\n      );\n\n      const directDependents = tracker.traceDependencies(id, TraceDirection.DOWN, 1);\n\n      // Show direct dependents\n      for (const dep of directDependents.slice(0, 5)) {\n        const depElement = model.getElementById(dep);\n        const depLayer = depElement?.layer || \"unknown\";\n        handleInfo(ansis.dim(`  - ${dep} (${depLayer})`));\n      }\n\n      if (directDependents.length > 5) {\n        handleInfo(ansis.dim(`  ... and ${directDependents.length - 5} more direct dependents`));\n      }\n\n      if (dependents.length > directDependents.length) {\n        handleInfo(\n          ansis.dim(\n            `  (${dependents.length - directDependents.length} transitive dependents not shown)`\n          )\n        );\n      }\n\n      // Check if cascade or force is enabled\n      if (!options.cascade && !options.force) {\n        handleInfo(\"\");\n        handleInfo(ansis.red(\"\u2717 Cannot remove element with dependencies.\"));\n        handleInfo(ansis.dim(\"Use --cascade to remove all dependent elements\"));\n        handleInfo(ansis.dim(\"or --force to skip dependency checks\"));\n        const suggestions = [\n          `Use --dry-run with --cascade to preview what would be deleted`,\n          'Review dependencies before deletion using \"dr show <element>\"',\n          \"Use --cascade to automatically remove all dependent elements\",\n          \"Or use --force to remove only this element (dependencies will reference a non-existent element)\",\n        ];\n        throw new CLIError(\"Element has dependencies\", ErrorCategory.USER, suggestions, {\n          operation: \"delete\",\n          relatedElements: directDependents.slice(0, 10),\n          context: `Element ${id} has ${dependents.length} dependent elements`,\n        });\n      }\n    }\n\n    // Calculate total elements to remove\n    const elementsToRemove = options.cascade ? [id, ...dependents] : [id];\n\n    // Every identifier relationships.yaml may use for the elements being removed\n    // (UUID id and dotted path), captured before they are deleted from the model.\n    const relationshipIdentifiers = new Set<string>();\n    for (const eid of elementsToRemove) {\n      const target = eid === id ? element : model.getElementById(eid);\n      for (const identifier of elementIdentifiers(target ?? {}, eid)) {\n        relationshipIdentifiers.add(identifier);\n      }\n    }\n\n    // Display dry-run summary\n    if (options.dryRun) {\n      handleInfo(\"\");\n      handleInfo(ansis.yellow(`Dry run - not removing`));\n      handleInfo(ansis.dim(`Would remove ${elementsToRemove.length} element(s)`));\n\n      if (options.cascade && dependents.length > 0) {\n        handleInfo(\"\");\n        handleInfo(ansis.dim(\"Elements that would be removed:\"));\n        handleInfo(ansis.dim(`  - ${id} (target)`));\n        for (const dep of dependents.slice(0, 10)) {\n          handleInfo(ansis.dim(`  - ${dep} (dependent)`));\n        }\n        if (dependents.length > 10) {\n          handleInfo(ansis.dim(`  ... and ${dependents.length - 10} more`));\n        }\n      }\n\n      handleSuccess(\n        `Dry run: would remove ${elementsToRemove.length} element(s)`,\n        {\n          elementId: id,\n          layer: layerName!,\n          dryRun: true,\n          elementsToRemoveCount: 1,\n          dependentElementsToRemoveCount: dependents.length,\n        },\n        { verbose: options.verbose }\n      );\n      return;\n    }\n\n    // Confirm deletion unless --force\n    if (!options.force) {\n      const isInteractive = process.stdin.isTTY && process.stdout.isTTY;\n      if (!isInteractive) {\n        handleInfo(ansis.dim(\"Non-interactive environment detected - proceeding without confirmation\"));\n      } else {\n        const message =\n          options.cascade && dependents.length > 0\n            ? `Delete ${ansis.bold(id)} and ${ansis.bold(String(dependents.length))} dependent element(s)? This cannot be undone.`\n            : `Delete element ${ansis.bold(id)}? This cannot be undone.`;\n\n        const confirmed = await confirm({\n          message,\n          initialValue: false,\n        });\n\n        if (!confirmed) {\n          handleSuccess(\n            \"Deletion cancelled\",\n            {\n              status: \"cancelled\",\n              elementId: id,\n              layer: layerName!,\n            },\n            { verbose: options.verbose }\n          );\n          return;\n        }\n      }\n    }\n\n    // Execute deletion with error recovery guidance\n    let deletedCount = 0;\n    try {\n      if (options.cascade && dependents.length > 0) {\n        // Delete dependents first (reverse dependency order to avoid orphaned references)\n        const sortedDependents = [...dependents].reverse();\n\n        for (const depId of sortedDependents) {\n          try {\n            const depLayerName = await findElementLayer(model, depId);\n            if (!depLayerName) continue;\n\n            const depLayer = (await model.getLayer(depLayerName))!;\n            const depElement = depLayer.getElement(depId)!;\n\n            const handler = new MutationHandler(model, depId, depLayerName);\n            await handler.executeDelete(depElement);\n            deletedCount++;\n\n            if (options.verbose) {\n              handleInfo(ansis.dim(`  Deleted dependent: ${depId}`));\n            }\n          } catch (depError) {\n            // Track partial progress for error recovery\n            const suggestions = [\n              `${deletedCount} dependent element(s) were deleted before the error`,\n              'Check the model state with \"dr validate\" to identify any broken references',\n              'You may need to manually delete remaining elements or use \"dr show\" to inspect',\n            ];\n            throw new CLIError(\n              `Failed to delete dependent element ${depId}`,\n              ErrorCategory.SYSTEM,\n              suggestions,\n              {\n                operation: \"delete (cascade)\",\n                partialProgress: { completed: deletedCount, total: sortedDependents.length },\n                relatedElements: [id, ...sortedDependents.slice(0, 5)],\n              }\n            );\n          }\n        }\n      }\n    } catch (error) {\n      // If we're in the middle of cascade deletion, provide recovery info\n      if (options.cascade && deletedCount > 0 && !(error instanceof CLIError)) {\n        const suggestions = [\n          `${deletedCount} dependent element(s) were successfully deleted`,\n          'Use \"dr validate\" to check for broken references',\n          \"The target element was not deleted - you can retry the operation\",\n        ];\n        throw new CLIError(\n          \"Cascade deletion was partially completed but encountered an error\",\n          ErrorCategory.SYSTEM,\n          suggestions,\n          {\n            operation: \"delete (cascade)\",\n            partialProgress: { completed: deletedCount, total: dependents.length },\n          }\n        );\n      }\n      throw error;\n    }\n\n    // Delete the target element\n    const handler = new MutationHandler(model, id, layerName);\n    await handler.executeDelete(element);\n\n    if (isTelemetryEnabled && span) {\n      (span as any).setAttribute(\"layer.name\", layerName);\n      (span as any).setAttribute(\"element.dependents\", dependents.length);\n      (span as any).setAttribute(\"element.totalDeleted\", elementsToRemove.length);\n    }\n\n    // Check if operation was staged or applied to base model\n    const beforeState = handler.getBeforeState();\n    if (beforeState) {\n      // Check if we went through staging path\n      const stagingManager = handler.getStagingManager();\n      const activeChangeset = await stagingManager.getActive();\n      if (activeChangeset && activeChangeset.status === \"staged\") {\n        // Staging path\n        handleSuccess(\n          `Staged deletion of element ${ansis.bold(id)} to ${ansis.bold(activeChangeset.name)}`,\n          {\n            elementId: id,\n            layer: layerName!,\n            changesetStatus: \"staged\",\n            changeset: activeChangeset.name,\n            totalElementsDeleted: elementsToRemove.length,\n          },\n          { verbose: options.verbose }\n        );\n      } else {\n        // Base model path: purge any stale relationships MutationHandler may have missed\n        const staleBase = model.relationships.deleteForElement([...relationshipIdentifiers]);\n        if (staleBase > 0) await model.saveRelationships();\n\n        // Report deletion with cascade confirmation\n        showDeletionSuccess();\n      }\n    } else {\n      // Fallback success message if before state is not available\n      // This should rarely occur, but ensures user always gets feedback\n      const staleFallback = model.relationships.deleteForElement([...relationshipIdentifiers]);\n      if (staleFallback > 0) await model.saveRelationships();\n\n      // Report deletion with cascade confirmation\n      showDeletionSuccess();\n    }\n\n    function showDeletionSuccess(): void {\n      const details: Record<string, unknown> = {\n        elementId: id,\n        layer: layerName!,\n        totalElementsDeleted: elementsToRemove.length,\n      };\n      handleSuccess(`Deleted element ${ansis.bold(id)}`, details, { verbose: options.verbose });\n\n      // Show cascade confirmation when cascade is active\n      if (options.cascade && dependents.length > 0) {\n        handleInfo(ansis.green(`\u2713 Deleted ${dependents.length} dependent element(s)`));\n      }\n    }\n  } catch (error) {\n    if (isTelemetryEnabled && span) {\n      (span as any).recordException(error as Error);\n      (span as any).setStatus({ code: 2, message: (error as Error).message });\n    }\n    handleError(error);\n  } finally {\n    if (isTelemetryEnabled) {\n      endSpan(span);\n    }\n  }\n}\n"],
+  "mappings": "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",
   "names": ["showDeletionSuccess", "layer", "element"]
 }

package/dist/commands/farm.js

@@ -2,25 +2,76 @@ import ansis from "ansis";
 import path from "path";
 import { rm } from "fs/promises";
 import { FarmManifest } from "../core/farm-manifest.js";
-import { findFarmRoot } from "../utils/project-paths.js";
+import { findFarmRoot, resolveModelDirectory } from "../utils/project-paths.js";
 import { fileExists } from "../utils/file-io.js";
 import { execSync, execFileSync } from "child_process";
 import * as prompts from "@clack/prompts";
-import { getErrorMessage, handleSuccess, handleInfo } from "../utils/errors.js";
+import { getErrorMessage, handleSuccess, handleInfo, handleWarning } from "../utils/errors.js";
 import { isJson } from "../utils/globals.js";
 import { isTelemetryEnabled, startSpan, endSpan } from "../telemetry/index.js";
 import { Model } from "../core/model.js";
 import { ComposedReferenceValidator } from "../validators/composed-reference-validator.js";
 import { ValidationFormatter } from "../validators/validation-formatter.js";
 import { FarmSyncEngine } from "../core/farm-sync-engine.js";
-function isGitRepository(cwd) {
+import { FarmSyncState, FarmSyncStateNotFoundError } from "../core/farm-sync-state.js";
+function checkGitRepository(cwd) {
   try {
-    return execSync("git rev-parse --git-dir", { cwd, stdio: "pipe" }), !0;
+    return execSync("git rev-parse --git-dir", { cwd, stdio: "pipe" }), { isRepo: !0 };
   } catch (error) {
     const errorMsg = getErrorMessage(error);
-    return errorMsg.toLowerCase().includes("not a git repository") || process.env.DEBUG && console.warn(`Warning: Unexpected error checking git repository at ${cwd}: ${errorMsg}`), !1;
+    return errorMsg.toLowerCase().includes("not a git repository") ? { isRepo: !1 } : { isRepo: !1, error: errorMsg.trim() };
   }
 }
+function uncommittedChangeWarning(what, farmRoot, gitError) {
+  return `${what} was saved but not committed: could not check git repository at ${farmRoot}: ${gitError}`;
+}
+function gitTopLevel(cwd) {
+  try {
+    return execSync("git rev-parse --show-toplevel", { cwd, stdio: "pipe", encoding: "utf-8" }).trim() || null;
+  } catch {
+    return null;
+  }
+}
+function isInSameGitRepository(farmRoot, target) {
+  const farmTop = gitTopLevel(farmRoot);
+  return farmTop !== null && farmTop === gitTopLevel(target);
+}
+function farmRelativePath(farmRoot, target) {
+  const rel = path.relative(farmRoot, target);
+  return rel === "" ? "." : rel.split(path.sep).join("/");
+}
+function isWithinPath(target, parent) {
+  return target === parent || target.startsWith(parent + path.sep);
+}
+async function resolveProjectModel(name, input) {
+  const { farmRoot, codebaseFullPath, explicitModel, forceNewModel } = input;
+  if (explicitModel) {
+    const explicitFullPath = path.resolve(farmRoot, explicitModel), resolved = await resolveModelDirectory(explicitFullPath, { requireManifest: !0 });
+    if (!resolved)
+      throw new Error(`No model found at '${explicitModel}': expected manifest.yaml in ${explicitFullPath}, ${path.join(explicitFullPath, "model")} or ${path.join(explicitFullPath, "documentation-robotics", "model")}. Omit --model to scaffold a new model at ${name}-model.`);
+    return {
+      modelFolder: farmRelativePath(farmRoot, resolved.modelDir),
+      modelFullPath: resolved.modelDir,
+      adopted: !0
+    };
+  }
+  const detected = codebaseFullPath === farmRoot ? null : await resolveModelDirectory(codebaseFullPath, { requireManifest: !0 });
+  if (detected && !forceNewModel)
+    return {
+      modelFolder: farmRelativePath(farmRoot, detected.modelDir),
+      modelFullPath: detected.modelDir,
+      adopted: !0
+    };
+  const modelFolder = `${name}-model`, modelFullPath = path.resolve(path.join(farmRoot, modelFolder));
+  if (!modelFullPath.startsWith(farmRoot + path.sep))
+    throw new Error(`Invalid model path: would escape farm root. Path: ${modelFolder}`);
+  return {
+    modelFolder,
+    modelFullPath,
+    adopted: !1,
+    ...detected ? { ignoredModelPath: farmRelativePath(farmRoot, detected.modelDir) } : {}
+  };
+}
 async function farmInitCommand(options) {
   const span = isTelemetryEnabled ? startSpan("farm.init") : null;
   try {
@@ -73,6 +124,8 @@ async function farmInitCommand(options) {
 async function farmAddCommand(name, options) {
   const span = isTelemetryEnabled ? startSpan("farm.add", { "project.name": name }) : null, useJson = options.format === "json" || isJson();
   try {
+    if (options.model && options.newModel)
+      throw new Error("--model and --new-model cannot be combined: --model registers an existing model, --new-model scaffolds a fresh one");
     const farmRoot = await findFarmRoot();
     if (!farmRoot)
       throw new Error("Not in a farm directory. Run 'dr farm init' first.");
@@ -80,8 +133,10 @@ async function farmAddCommand(name, options) {
     if (manifest.getProject(name))
       throw new Error(`Project '${name}' already exists in this farm`);
     let codebasePath = options.codebase || name;
+    const codebaseFullPath = path.resolve(path.join(farmRoot, codebasePath)), farmRootResolved = path.resolve(farmRoot);
     if (options.remote) {
-      const codebaseFullPath = path.join(farmRoot, codebasePath);
+      if (!codebaseFullPath.startsWith(farmRootResolved + path.sep))
+        throw new Error(`Invalid codebase path: would escape farm root. Path: ${codebasePath}`);
       if (await fileExists(codebaseFullPath))
         throw new Error(`Codebase directory '${codebasePath}' already exists`);
       useJson || handleInfo(`Cloning ${options.remote} to ${codebasePath}...`);
@@ -93,8 +148,17 @@ async function farmAddCommand(name, options) {
         throw new Error(`Failed to clone repository: ${getErrorMessage(error)}`);
       }
     }
-    const modelFolder = `${name}-model`, modelFullPath = path.join(farmRoot, modelFolder);
-    if (await fileExists(modelFullPath) || (await Model.init(modelFullPath, {
+    const registration = await resolveProjectModel(name, {
+      farmRoot: farmRootResolved,
+      codebaseFullPath,
+      explicitModel: options.model,
+      forceNewModel: options.newModel ?? !1
+    }), modelFolder = registration.modelFolder;
+    if (registration.ignoredModelPath) {
+      const ignoredWarning = `Codebase '${codebasePath}' already has a model at ${registration.ignoredModelPath}; ignoring it and scaffolding a new model at ${modelFolder} (--new-model)`;
+      registration.warning = ignoredWarning, useJson || handleWarning(ignoredWarning);
+    }
+    registration.adopted ? useJson || handleInfo(`Using existing model at ${registration.modelFullPath}; nothing was created`) : await fileExists(registration.modelFullPath) || (await Model.init(registration.modelFullPath, {
       name,
       version: "0.1.0",
       description: void 0,
@@ -106,25 +170,42 @@ async function farmAddCommand(name, options) {
       source: codebasePath,
       model: modelFolder,
       remote: options.remote
-    }), await manifest.save(farmYamlPath), isGitRepository(farmRoot))
+    }), await manifest.save(farmYamlPath);
+    const gitCheck = checkGitRepository(farmRoot);
+    let gitCommitted = !1, gitWarning;
+    if (gitCheck.error)
+      gitWarning = uncommittedChangeWarning("farm.yaml", farmRoot, gitCheck.error), useJson || handleWarning(gitWarning);
+    else if (gitCheck.isRepo)
       try {
         execSync("git add farm.yaml", { cwd: farmRoot, stdio: "pipe" }), execFileSync("git", ["commit", "-m", `Add project: ${name}`], {
           cwd: farmRoot,
           stdio: useJson ? "pipe" : "inherit"
-        });
+        }), gitCommitted = !0;
       } catch (commitError) {
         const errorMsg = getErrorMessage(commitError);
         if (!errorMsg.includes("nothing to commit"))
           throw new Error(`Failed to commit farm changes: ${errorMsg}`);
       }
-    useJson ? console.log(JSON.stringify({
-      status: "ok",
-      project: name,
-      source: codebasePath,
-      model: modelFolder
-    })) : handleSuccess(`Project added to farm: ${ansis.bold(name)}
+    if (useJson)
+      console.log(JSON.stringify({
+        status: "ok",
+        project: name,
+        source: codebasePath,
+        model: modelFolder,
+        model_path: registration.modelFullPath,
+        model_adopted: registration.adopted,
+        ...registration.ignoredModelPath ? { ignored_model: registration.ignoredModelPath } : {},
+        ...registration.warning ? { warning: registration.warning } : {},
+        git_committed: gitCommitted,
+        ...gitWarning ? { git_warning: gitWarning } : {}
+      }));
+    else {
+      const modelNote = registration.adopted ? " (existing model, adopted in place)" : "";
+      handleSuccess(`Project added to farm: ${ansis.bold(name)}
   Codebase: ${codebasePath}
-  Model: ${modelFolder}`), span && endSpan(span);
+  Model: ${modelFolder}${modelNote}`);
+    }
+    span && endSpan(span);
   } catch (error) {
     useJson ? console.log(JSON.stringify({
       status: "error",
@@ -142,23 +223,29 @@ async function farmRemoveCommand(name, options) {
     const farmYamlPath = path.join(farmRoot, "farm.yaml"), manifest = await FarmManifest.load(farmYamlPath), project = manifest.getProject(name);
     if (!project)
       throw new Error(`Project '${name}' not found in farm`);
+    let modelDeleted = !1, modelKeptReason;
     if (options.deleteModel) {
-      const modelFullPath = path.resolve(path.join(farmRoot, project.model)), farmRootResolved = path.resolve(farmRoot);
-      if (!modelFullPath.startsWith(farmRootResolved + path.sep))
-        throw new Error(`Invalid model path: would escape farm root. Path: ${project.model}`);
-      if (await fileExists(modelFullPath))
+      const modelFullPath = path.resolve(path.join(farmRoot, project.model)), farmRootResolved = path.resolve(farmRoot), codebaseFullPath = path.resolve(path.join(farmRoot, project.source));
+      if (modelFullPath.startsWith(farmRootResolved + path.sep) ? isWithinPath(modelFullPath, codebaseFullPath) && (modelKeptReason = `model '${project.model}' is the codebase's own model (inside '${project.source}')`) : modelKeptReason = `model '${project.model}' lies outside the farm root and is not managed by the farm`, modelKeptReason)
+        useJson || handleWarning(`Model folder not deleted: ${modelKeptReason}. Remove it by hand if that is what you want.`);
+      else if (await fileExists(modelFullPath))
         try {
-          await rm(modelFullPath, { recursive: !0, force: !1 }), useJson || handleInfo(`Deleted model folder: ${project.model}`);
+          await rm(modelFullPath, { recursive: !0, force: !1 }), modelDeleted = !0, useJson || handleInfo(`Deleted model folder: ${project.model}`);
         } catch (error) {
           throw new Error(`Failed to delete model folder: ${getErrorMessage(error)}`);
         }
     }
-    if (manifest.removeProject(name), await manifest.save(farmYamlPath), isGitRepository(farmRoot))
+    manifest.removeProject(name), await manifest.save(farmYamlPath);
+    const gitCheck = checkGitRepository(farmRoot);
+    let gitCommitted = !1, gitWarning;
+    if (gitCheck.error)
+      gitWarning = uncommittedChangeWarning("farm.yaml", farmRoot, gitCheck.error), useJson || handleWarning(gitWarning);
+    else if (gitCheck.isRepo)
       try {
         execSync("git add farm.yaml", { cwd: farmRoot, stdio: "pipe" }), execFileSync("git", ["commit", "-m", `Remove project: ${name}`], {
           cwd: farmRoot,
           stdio: useJson ? "pipe" : "inherit"
-        });
+        }), gitCommitted = !0;
       } catch (commitError) {
         const errorMsg = getErrorMessage(commitError);
         if (!errorMsg.includes("nothing to commit"))
@@ -167,7 +254,11 @@ async function farmRemoveCommand(name, options) {
     useJson ? console.log(JSON.stringify({
       status: "ok",
       project: name,
-      modelDeleted: options.deleteModel ?? !1
+      model: project.model,
+      modelDeleted,
+      ...modelKeptReason ? { model_kept_reason: modelKeptReason } : {},
+      git_committed: gitCommitted,
+      ...gitWarning ? { git_warning: gitWarning } : {}
     })) : handleSuccess(`Project removed from farm: ${ansis.bold(name)}`), span && endSpan(span);
   } catch (error) {
     useJson ? console.log(JSON.stringify({
@@ -183,33 +274,34 @@ async function farmStatusCommand(options) {
     const farmRoot = await findFarmRoot();
     if (!farmRoot)
       throw new Error("Not in a farm directory.");
-    const farmYamlPath = path.join(farmRoot, "farm.yaml"), manifest = await FarmManifest.load(farmYamlPath), projects = manifest.getAllProjects(), engine = new FarmSyncEngine(farmRoot), projectsWithStatus = await Promise.all(projects.map(async (p) => {
+    const farmYamlPath = path.join(farmRoot, "farm.yaml"), manifest = await FarmManifest.load(farmYamlPath), projects = manifest.getAllProjects(), engine = new FarmSyncEngine(farmRoot), useJson = options.format === "json" || isJson(), projectsWithStatus = await Promise.all(projects.map(async (p) => {
+      const result = {
+        name: p.name,
+        source: p.source,
+        model: p.model,
+        remote: p.remote,
+        last_sync_commit: void 0,
+        current_commit: void 0,
+        has_pending_changes: void 0
+      };
+      let lastSyncCommit;
       try {
-        const syncStatePath = path.join(farmRoot, p.model, ".farm-sync.yaml"), syncState = await (await import("../core/farm-sync-state.js")).FarmSyncState.loadOrCreate(syncStatePath, p.name), currentCommit = await engine.getCurrentCommit(p.source), lastSyncCommit = syncState.lastSyncCommit, hasPendingChanges = !!(lastSyncCommit && lastSyncCommit !== currentCommit);
-        return {
-          name: p.name,
-          source: p.source,
-          model: p.model,
-          remote: p.remote,
-          last_sync_commit: lastSyncCommit,
-          current_commit: currentCommit,
-          has_pending_changes: hasPendingChanges
-        };
+        const syncStatePath = path.join(farmRoot, p.model, ".farm-sync.yaml");
+        lastSyncCommit = (await FarmSyncState.loadOrCreate(syncStatePath, p.name)).lastSyncCommit, result.last_sync_commit = lastSyncCommit;
       } catch (error) {
-        const errorMsg = getErrorMessage(error);
-        return !errorMsg.includes("not found") && !errorMsg.includes("does not exist") && !errorMsg.includes("ENOENT") && console.error(`Warning: Error reading sync state for ${p.name}: ${errorMsg}`), {
-          name: p.name,
-          source: p.source,
-          model: p.model,
-          remote: p.remote,
-          last_sync_commit: void 0,
-          current_commit: void 0,
-          has_pending_changes: !1
-        };
+        return error instanceof FarmSyncStateNotFoundError ? (result.has_pending_changes = !1, result) : (result.sync_state_error = getErrorMessage(error), useJson || handleWarning(`${p.name}: could not read sync state: ${result.sync_state_error}`), result);
       }
-    }));
-    options.format === "json" || isJson() ? console.log(JSON.stringify({
-      status: "ok",
+      try {
+        const currentCommit = await engine.getCurrentCommit(p.source);
+        result.current_commit = currentCommit, result.has_pending_changes = !!(lastSyncCommit && lastSyncCommit !== currentCommit);
+      } catch (error) {
+        result.codebase_error = getErrorMessage(error), useJson || handleWarning(`${p.name}: ${result.codebase_error}`);
+      }
+      return result;
+    })), projectsWithErrors = projectsWithStatus.filter((p) => p.sync_state_error !== void 0 || p.codebase_error !== void 0), allHealthy = projectsWithErrors.length === 0;
+    useJson ? console.log(JSON.stringify({
+      status: allHealthy ? "ok" : "error",
+      code: allHealthy ? 0 : 1,
       farm: {
         name: manifest.name,
         path: farmRoot,
@@ -221,8 +313,9 @@ async function farmStatusCommand(options) {
       project_count: projects.length
     })) : (console.log(ansis.bold(`Farm: ${manifest.name}`)), console.log(`Location: ${farmRoot}`), manifest.platform_view && console.log(`Platform-View: ${ansis.green("enabled")}`), console.log(`Projects: ${projects.length}
 `), projects.length === 0 ? console.log(ansis.dim("No projects registered yet.")) : projectsWithStatus.forEach((project) => {
-      console.log(`  ${ansis.cyan(project.name)}`), console.log(`    Codebase: ${project.source}`), console.log(`    Model:    ${project.model}`), project.remote && console.log(`    Remote:   ${project.remote}`), project.has_pending_changes ? console.log(`    Status:   ${ansis.yellow("\u26A0 Pending changes")}`) : project.last_sync_commit ? console.log(`    Status:   ${ansis.green("\u2713 Up to date")}`) : console.log(`    Status:   ${ansis.dim("Not synced yet")}`);
-    })), span && endSpan(span);
+      console.log(`  ${ansis.cyan(project.name)}`), console.log(`    Codebase: ${project.source}`), console.log(`    Model:    ${project.model}`), project.remote && console.log(`    Remote:   ${project.remote}`), project.sync_state_error ? (console.log(`    Status:   ${ansis.red("\u2717 Sync state corrupted")}`), console.log(`    Error:    ${project.sync_state_error}`)) : project.codebase_error ? (console.log(`    Status:   ${ansis.red("\u2717 Codebase unavailable")}`), console.log(`    Error:    ${project.codebase_error}`)) : project.has_pending_changes ? console.log(`    Status:   ${ansis.yellow("\u26A0 Pending changes")}`) : project.last_sync_commit ? console.log(`    Status:   ${ansis.green("\u2713 Up to date")}`) : console.log(`    Status:   ${ansis.dim("Not synced yet")}`);
+    }), allHealthy || console.error(ansis.red(`
+${projectsWithErrors.length} project(s) could not be checked (see errors above)`))), span && endSpan(span), allHealthy || process.exit(1);
   } catch (error) {
     options.format === "json" || isJson() ? console.log(JSON.stringify({
       status: "error",
@@ -465,6 +558,11 @@ async function farmSyncCommand(options) {
       throw new Error("Concurrency must be a positive number");
     if (options.autoCommit && concurrency > 1)
       throw new Error("Cannot use --auto-commit with --concurrency > 1: concurrent git operations would cause race conditions. Use --concurrency 1 for auto-commit, or remove --auto-commit for parallel processing.");
+    if (options.output) {
+      const outputExt = path.extname(options.output).toLowerCase();
+      if (outputExt !== ".json")
+        throw new Error(`Unsupported output format: ${outputExt || "(no extension)"}. Use .json`);
+    }
     const useJson = options.format === "json" || isJson();
     !useJson && !options.verbose && handleInfo(`Syncing ${projectsToSync.length} project(s) (concurrency: ${concurrency})...`);
     const allResults = [], processSyncProject = async (project) => {
@@ -492,17 +590,26 @@ async function farmSyncCommand(options) {
           };
           if (options.autoCommit && result.changesetId && result.changeCount > 0 && !options.dryRun)
             try {
-              const projectModelPath = path.join(farmRoot, project.model), commitResult = await new (await import("../core/staging-area.js")).StagingAreaManager(projectModelPath, model).commit(model, result.changesetId);
-              if (resultEntry.auto_committed = !0, resultEntry.committed_changes = commitResult.committed, isGitRepository(farmRoot))
+              const commitResult = await new (await import("../core/staging-area.js")).StagingAreaManager(model.rootPath, model).commit(model, result.changesetId);
+              resultEntry.auto_committed = !0, resultEntry.committed_changes = commitResult.committed;
+              const gitCheck = checkGitRepository(farmRoot);
+              if (gitCheck.error)
+                resultEntry.git_committed = !1, resultEntry.git_warning = uncommittedChangeWarning(`Model '${project.model}'`, farmRoot, gitCheck.error), useJson || handleWarning(`${project.name}: ${resultEntry.git_warning}`);
+              else if (gitCheck.isRepo && !isInSameGitRepository(farmRoot, modelPath))
+                resultEntry.git_committed = !1, resultEntry.git_warning = `Model '${project.model}' is outside the farm git repository at ${farmRoot}: the synced changes were saved but not committed. Commit them in the model's own repository.`, useJson || handleWarning(`${project.name}: ${resultEntry.git_warning}`);
+              else if (gitCheck.isRepo)
                 try {
-                  execFileSync("git", ["add", project.model], { cwd: farmRoot, stdio: "pipe" }), execFileSync("git", ["commit", "-m", `Sync: ${result.changesetId} - ${commitResult.committed} change(s)`], { cwd: farmRoot, stdio: "pipe" });
+                  execFileSync("git", ["add", project.model], { cwd: farmRoot, stdio: "pipe" }), execFileSync("git", ["commit", "-m", `Sync: ${result.changesetId} - ${commitResult.committed} change(s)`], { cwd: farmRoot, stdio: "pipe" }), resultEntry.git_committed = !0;
                 } catch (gitCommitError) {
                   if (!getErrorMessage(gitCommitError).includes("nothing to commit"))
                     throw gitCommitError;
+                  resultEntry.git_committed = !0;
                 }
+              else
+                resultEntry.git_committed = !1;
               options.verbose && !useJson && handleInfo(`  Auto-committed: ${commitResult.committed} change(s)`);
             } catch (commitError) {
-              resultEntry.auto_committed = !1, resultEntry.commit_error = getErrorMessage(commitError), resultEntry.status = "error", useJson || handleInfo(`  Auto-commit failed: ${getErrorMessage(commitError)}`);
+              resultEntry.auto_committed = !1, resultEntry.commit_error = getErrorMessage(commitError), resultEntry.status = "error", useJson || handleWarning(`${project.name}: auto-commit failed: ${getErrorMessage(commitError)}`);
             }
           if (allResults.push(resultEntry), options.verbose && !useJson) {
             handleInfo(`
@@ -559,11 +666,11 @@ Project: ${project.name}`);
     }
     if (options.output) {
       const { writeFile } = await import("../utils/file-io.js");
-      path.extname(options.output).toLowerCase() === ".json" && await writeFile(options.output, JSON.stringify({
+      await writeFile(options.output, JSON.stringify({
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
         farm_root: farmRoot,
         projects: allResults
-      }, null, 2));
+      }, null, 2)), useJson || handleInfo(`Report written to ${options.output}`);
     }
     span && endSpan(span), allSucceeded || process.exit(1);
   } catch (error) {
@@ -588,12 +695,21 @@ Notes:
   the aggregation hub. When validating this project with 'dr farm validate --project platform-view',
   the CLI will automatically resolve cross-model references from all farm projects.`).action(async (options) => {
     await farmInitCommand(options);
-  }), farmGroup.command("add <name>").description("Add a project to the farm").option("--remote <url>", "Git remote URL to clone").option("--codebase <path>", "Path to codebase folder (defaults to project name)").option("--format <format>", "Output format: text, json", "text").addHelpText("after", `
+  }), farmGroup.command("add <name>").description("Add a project to the farm").option("--remote <url>", "Git remote URL to clone").option("--codebase <path>", "Path to codebase folder, relative to the farm root (defaults to project name; may point outside the farm root unless --remote is used)").option("--model <path>", "Register an existing model at this path (relative to the farm root) instead of detecting or scaffolding one").option("--new-model", "Always scaffold a fresh <name>-model, even when the codebase already carries a model").option("--format <format>", "Output format: text, json", "text").addHelpText("after", `
 Examples:
   $ dr farm add my-service
   $ dr farm add my-service --remote https://github.com/org/my-service.git
   $ dr farm add my-service --codebase ./services/my-service
-  $ dr farm add my-service --format json`).action(async (name, options) => {
+  $ dr farm add my-service --codebase ../my-service   # sibling checkout outside the farm root
+  $ dr farm add my-service --codebase ../my-service --new-model
+  $ dr farm add my-service --model ../shared-models/my-service
+  $ dr farm add my-service --format json
+
+Model detection:
+  If the codebase already holds a model (documentation-robotics/model/manifest.yaml, model/manifest.yaml
+  or manifest.yaml at the codebase path itself), that model is adopted in place and nothing is
+  created; farm.yaml records its path (which may lie outside the farm root). Use --new-model to
+  scaffold a separate <name>-model regardless, or --model to point at a model explicitly.`).action(async (name, options) => {
     await farmAddCommand(name, options);
   }), farmGroup.command("remove <name>").description("Remove a project from the farm").option("--delete-model", "Also delete the model folder").option("--format <format>", "Output format: text, json", "text").addHelpText("after", `
 Examples:
@@ -626,7 +742,7 @@ Examples:
   $ dr farm pull --verbose
   $ dr farm pull --format json`).action(async (options) => {
     await farmPullCommand(options);
-  }), farmGroup.command("sync").description("Sync farm projects with their models (generates staged changesets)").option("--project <name>", "Sync only a specific project (default: all)").option("--verbose", "Show verbose output").option("--dry-run", "Preview without creating changesets").option("--force", "Proceed despite ambiguous file-to-element mappings").option("--output <path>", "Export sync report to file (JSON)").option("--format <format>", "Output format: text, json", "text").option("--auto-commit", "Automatically commit changes (bypasses staged review)").option("--concurrency <n>", "Process multiple projects in parallel (default: 1)", "1").addHelpText("after", `
+  }), farmGroup.command("sync").description("Sync farm projects with their models (generates staged changesets)").option("--project <name>", "Sync only a specific project (default: all)").option("--verbose", "Show verbose output").option("--dry-run", "Preview without creating changesets").option("--force", "Proceed despite ambiguous file-to-element mappings").option("--output <path>", "Export sync report to file (.json only)").option("--format <format>", "Output format: text, json", "text").option("--auto-commit", "Automatically commit changes (bypasses staged review)").option("--concurrency <n>", "Process multiple projects in parallel (default: 1)", "1").addHelpText("after", `
 Examples:
   $ dr farm sync
   $ dr farm sync --project my-service