@lwelliott/cortex-cli 1.0.6 → 1.0.8

package/dist/services/stage-validator.js

@@ -1,32 +1,42 @@
 "use strict";
 // Stage progression validator
-// Pure function module — validates one-way forward stage progression
-// Implements AD-0031: Stage-Driven Workflow Engine
-// + FS-SS-030-0001 (stage progression engine)
-// + FS-SS-030-0003 (task stage assignment)
+// Pure function module — validates stage values case-insensitively
+// Implements AD-0031 v2: Consolidated Stage/Status Workflow Engine
+// + FS-SS-030-0001 (stage progression engine v2)
+// 6 consolidated stages, freely reversible, case-insensitive with closest-match suggestions
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CANONICAL_STAGES = void 0;
 exports.isValidStage = isValidStage;
+exports.normalizeStage = normalizeStage;
 exports.getValidStages = getValidStages;
-exports.isForward = isForward;
+exports.validateStage = validateStage;
+exports.validateStageValue = validateStage;
 exports.validateProgression = validateProgression;
 const errors_1 = require("../utils/errors");
-/** Canonical stage sequence in forward order */
+const levenshtein_1 = require("../utils/levenshtein");
+/** Canonical stage sequence — 6 consolidated stages */
 exports.CANONICAL_STAGES = [
     'Planning',
-    'Requirement',
-    'Specification',
+    'Requirement+Specification',
     'Design',
-    'Test Plan',
     'Implementation',
     'Testing',
     'Release',
 ];
+/** Lowercase mapping for case-insensitive lookup */
+const STAGE_LOWERCASE_MAP = new Map(exports.CANONICAL_STAGES.map(s => [s.toLowerCase(), s]));
 /**
- * Check if a given string is a valid stage value.
+ * Check if a given string is a valid stage value (case-insensitive).
  */
 function isValidStage(stage) {
-    return exports.CANONICAL_STAGES.includes(stage);
+    return STAGE_LOWERCASE_MAP.has(stage.toLowerCase());
+}
+/**
+ * Normalize a stage value to canonical case.
+ * Returns null if the value is not a valid stage.
+ */
+function normalizeStage(stage) {
+    return STAGE_LOWERCASE_MAP.get(stage.toLowerCase()) ?? null;
 }
 /**
  * Return the canonical stage sequence.
@@ -35,44 +45,33 @@ function getValidStages() {
     return [...exports.CANONICAL_STAGES];
 }
 /**
- * Check if target stage is strictly forward of current stage in the canonical sequence.
- * Returns true if target position > current position (allows skipping).
+ * Validate a stage value case-insensitively with closest-match suggestions.
+ *
+ * @param stage - The stage value to validate
+ * @returns The canonical stage value if valid
+ * @throws StageInvalidError with closest-match suggestions if invalid
  */
-function isForward(current, target) {
-    const currentIdx = exports.CANONICAL_STAGES.indexOf(current);
-    const targetIdx = exports.CANONICAL_STAGES.indexOf(target);
-    return targetIdx > currentIdx;
+function validateStage(stage) {
+    const normalized = normalizeStage(stage);
+    if (normalized !== null) {
+        return normalized;
+    }
+    const suggestions = (0, levenshtein_1.getClosestMatches)(stage, exports.CANONICAL_STAGES);
+    throw new errors_1.StageInvalidError(stage, suggestions);
 }
 /**
  * Validate that a stage progression is valid.
  *
- * Rules (FS-SS-030-0001):
- * - SR-001: Only forward progression (never backward)
- * - SR-002: Intermediate stages may be skipped
- * - SR-003: Release is the final stage
- * - SR-004: Dropped status locks the task — no stage changes
- * - SR-005: Same-stage transitions are rejected
+ * v2: Free stage transitions. Forward, backward, and same-stage all allowed.
+ * No forward-only enforcement. No Dropped lock. No owner-for-stage check.
  *
- * @param currentStage - The task's current stage
+ * @param currentStage - The task's current stage (unused in v2, kept for API compatibility)
  * @param targetStage - The desired target stage
- * @param taskStatus - The task's current status (to check Dropped lock)
- * @throws StageInvalidError if target is not a valid stage
- * @throws StageLockedError if task is Dropped
- * @throws StageNoProgressError if target is same as current
- * @throws StageBackwardError if target is backward of current
+ * @param taskStatus - The task's current status (unused in v2, kept for API compatibility)
  */
-function validateProgression(currentStage, targetStage, taskStatus) {
-    // Check Dropped lock first
-    if (taskStatus === 'Dropped') {
-        throw new errors_1.StageLockedError('(task)');
-    }
-    // Check same-stage no-op
-    if (currentStage === targetStage) {
-        throw new errors_1.StageNoProgressError('(task)', currentStage);
-    }
-    // Check forward progression
-    if (!isForward(currentStage, targetStage)) {
-        throw new errors_1.StageBackwardError(currentStage, targetStage);
-    }
+function validateProgression(_currentStage, _targetStage, _taskStatus) {
+    // v2: No validation restrictions. All stage transitions are freely allowed.
+    // No forward-only enforcement, no backward rejection, no same-stage rejection,
+    // no Dropped lock, no owner-for-stage check.
 }
 //# sourceMappingURL=stage-validator.js.map

package/dist/services/stage-validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"stage-validator.js","sourceRoot":"","sources":["../../src/services/stage-validator.ts"],"names":[],"mappings":";AAAA,8BAA8B;AAC9B,qEAAqE;AACrE,mDAAmD;AACnD,8CAA8C;AAC9C,2CAA2C;;;AAwB3C,oCAEC;AAKD,wCAEC;AAMD,8BAIC;AAoBD,kDAmBC;AA/ED,4CAIyB;AAEzB,gDAAgD;AACnC,QAAA,gBAAgB,GAAgB;IAC3C,UAAU;IACV,aAAa;IACb,eAAe;IACf,QAAQ;IACR,WAAW;IACX,gBAAgB;IAChB,SAAS;IACT,SAAS;CACV,CAAC;AAEF;;GAEG;AACH,SAAgB,YAAY,CAAC,KAAa;IACxC,OAAQ,wBAAsC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACjE,CAAC;AAED;;GAEG;AACH,SAAgB,cAAc;IAC5B,OAAO,CAAC,GAAG,wBAAgB,CAAC,CAAC;AAC/B,CAAC;AAED;;;GAGG;AACH,SAAgB,SAAS,CAAC,OAAkB,EAAE,MAAiB;IAC7D,MAAM,UAAU,GAAG,wBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,wBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,OAAO,SAAS,GAAG,UAAU,CAAC;AAChC,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,SAAgB,mBAAmB,CACjC,YAAuB,EACvB,WAAsB,EACtB,UAAkB;IAElB,2BAA2B;IAC3B,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,yBAAgB,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IAED,yBAAyB;IACzB,IAAI,YAAY,KAAK,WAAW,EAAE,CAAC;QACjC,MAAM,IAAI,6BAAoB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACzD,CAAC;IAED,4BAA4B;IAC5B,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,WAAW,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,2BAAkB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAC1D,CAAC;AACH,CAAC"}
+{"version":3,"file":"stage-validator.js","sourceRoot":"","sources":["../../src/services/stage-validator.ts"],"names":[],"mappings":";AAAA,8BAA8B;AAC9B,mEAAmE;AACnE,mEAAmE;AACnE,iDAAiD;AACjD,4FAA4F;;;AAwB5F,oCAEC;AAMD,wCAEC;AAKD,wCAEC;AASD,sCAQC;AAuByB,2CAAkB;AAX5C,kDAQC;AA3ED,4CAAoD;AACpD,sDAAyD;AAEzD,uDAAuD;AAC1C,QAAA,gBAAgB,GAAgB;IAC3C,UAAU;IACV,2BAA2B;IAC3B,QAAQ;IACR,gBAAgB;IAChB,SAAS;IACT,SAAS;CACV,CAAC;AAEF,oDAAoD;AACpD,MAAM,mBAAmB,GAA2B,IAAI,GAAG,CACzD,wBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,CAChD,CAAC;AAEF;;GAEG;AACH,SAAgB,YAAY,CAAC,KAAa;IACxC,OAAO,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;AACtD,CAAC;AAED;;;GAGG;AACH,SAAgB,cAAc,CAAC,KAAa;IAC1C,OAAO,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,IAAI,CAAC;AAC9D,CAAC;AAED;;GAEG;AACH,SAAgB,cAAc;IAC5B,OAAO,CAAC,GAAG,wBAAgB,CAAC,CAAC;AAC/B,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,aAAa,CAAC,KAAa;IACzC,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACzC,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,+BAAiB,EAAC,KAAK,EAAE,wBAA4B,CAAC,CAAC;IAC3E,MAAM,IAAI,0BAAiB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;AAClD,CAAC;AAED;;;;;;;;;GASG;AACH,SAAgB,mBAAmB,CACjC,aAAwB,EACxB,YAAuB,EACvB,WAAmB;IAEnB,4EAA4E;IAC5E,+EAA+E;IAC/E,6CAA6C;AAC/C,CAAC"}

package/dist/services/task.d.ts

@@ -1,30 +1,38 @@
 import type Database from 'better-sqlite3';
 import type { Task, TaskResult, TaskDetail, TaskAddOptions, TaskMoveContext, TaskUpdateFields } from '../models/task';
 import type { TaskStatus } from '../models/common';
-import { validateOwnerRole, isValidRole } from '../validators/owner-validator';
+import { validateOwnerRole } from '../validators/owner-validator';
 /**
  * Add a new task to a sprint.
  *
+ * v2: No captain-only owner validation. Any valid role can own a task in any stage.
+ *
  * @param db - Database connection
  * @param sprintId - Sprint ID
  * @param content - Task content (nullable; can be populated via --content-file)
- * @param owner - Owner role (must be valid, captain-only for Backlog)
+ * @param owner - Owner role (must be valid)
  * @param opts - Optional task properties
  * @returns The created task result
  * @throws TaskBadSprintError if sprint doesn't exist or is closed
  * @throws TaskOwnerRequiredError if owner is empty
- * @throws various owner validation errors
+ * @throws various validation errors
  */
 export declare function addTask(db: Database.Database, sprintId: string, content: string | null, owner: string, opts?: TaskAddOptions): TaskResult;
 /**
- * Move a task: status transition, stage transition, or combined.
+ * Move a task: status transition, stage transition, owner change, or combined.
  *
- * Per AD-0039: stage validation runs before status validation in combined moves.
- * Per FR-URD-034-0004: active sprint is required — no --sprint override.
+ * v2 per AD-0039 / AD-0031:
+ * - Case-insensitive validation for status, stage, owner
+ * - Closest-match suggestions via Levenshtein distance
+ * - Free stage transitions (forward, backward, same-stage all allowed)
+ * - Non-terminal Dropped (can recover to Backlog/To Do)
+ * - Dry-run mode: validate without persisting
+ * - Compulsory parameters: at least one of --to, --stage, --owner
+ * - No --sprint override; move always operates on active sprint
  *
  * @param db - Database connection
  * @param taskId - Task ID (4-digit NNNN)
- * @param opts - Move options: targetStatus, targetStage, context
+ * @param opts - Move options: targetStatus, targetStage, context, dryRun, sprintId
  * @returns Updated task result
  */
 export declare function moveTask(db: Database.Database, taskId: string, opts: {
@@ -32,32 +40,21 @@ export declare function moveTask(db: Database.Database, taskId: string, opts: {
     targetStage?: string;
     context?: TaskMoveContext;
     sprintId?: string;
+    dryRun?: boolean;
 }): TaskResult;
 /**
  * Update task metadata (content/type/priority/points/scope/acceptance).
  * Does NOT change task status, stage, owner, or sprint — use moveTask for those.
  *
  * Per AD-0038: rejects stage, owner, sprint fields at the service layer.
- *
- * @throws TaskNotFoundError if task doesn't exist
- * @throws TaskInvalidFieldError if prohibited fields are present
  */
 export declare function updateTask(db: Database.Database, taskId: string, fields: TaskUpdateFields, sprintId?: string): TaskResult;
 /**
- * Remove a task (soft delete by default per AD-0011).
- *
- * @param db - Database connection
- * @param taskId - Task ID
- * @throws TaskNotFoundError if task doesn't exist
+ * Remove a task (permanent delete).
  */
 export declare function removeTask(db: Database.Database, taskId: string, sprintId?: string): void;
 /**
  * Show detailed task information including sprint name and parent content.
- *
- * @param db - Database connection
- * @param taskId - Task ID
- * @param sprintId - Sprint ID (required for sprint-scoped lookup per URD-026)
- * @throws TaskNotFoundError if task doesn't exist or is not in the specified sprint
  */
 export declare function showTask(db: Database.Database, taskId: string, sprintId?: string): TaskDetail;
 /**
@@ -71,5 +68,5 @@ export declare function listTasks(db: Database.Database, sprintId: string, filte
  * Get task status counts for a sprint.
  */
 export declare function getTaskStatusCounts(db: Database.Database, sprintId: string): Record<string, number>;
-export { isValidRole, validateOwnerRole };
+export { validateOwnerRole };
 //# sourceMappingURL=task.d.ts.map

package/dist/services/task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task.d.ts","sourceRoot":"","sources":["../../src/services/task.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACtH,OAAO,KAAK,EAAE,UAAU,EAA+C,MAAM,kBAAkB,CAAC;AAwBhG,OAAO,EAAyB,iBAAiB,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AA4DtG;;;;;;;;;;;;GAYG;AACH,wBAAgB,OAAO,CACrB,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,KAAK,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,cAAc,GACpB,UAAU,CAoGZ;AAmBD;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CACtB,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE;IACJ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GACA,UAAU,CAgIZ;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CACxB,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,gBAAgB,EACxB,QAAQ,CAAC,EAAE,MAAM,GAChB,UAAU,CAqHZ;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,MAAM,GAChB,IAAI,CAgCN;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,UAAU,CAwB7F;AAED;;GAEG;AACH,wBAAgB,SAAS,CACvB,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GACA,IAAI,EAAE,CAuBR;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,QAAQ,EAAE,MAAM,GACf,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAaxB;AAGD,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC"}
+{"version":3,"file":"task.d.ts","sourceRoot":"","sources":["../../src/services/task.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACtH,OAAO,KAAK,EAAE,UAAU,EAA+C,MAAM,kBAAkB,CAAC;AAyBhG,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AA6DlE;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,OAAO,CACrB,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,KAAK,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,cAAc,GACpB,UAAU,CAqGZ;AAmBD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,QAAQ,CACtB,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE;IACJ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GACA,UAAU,CA2JZ;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CACxB,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,gBAAgB,EACxB,QAAQ,CAAC,EAAE,MAAM,GAChB,UAAU,CAkHZ;AAED;;GAEG;AACH,wBAAgB,UAAU,CACxB,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,MAAM,GAChB,IAAI,CA4BN;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,UAAU,CAwB7F;AAED;;GAEG;AACH,wBAAgB,SAAS,CACvB,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GACA,IAAI,EAAE,CAoBR;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,QAAQ,EAAE,MAAM,GACf,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAaxB;AAGD,OAAO,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/services/task.js

@@ -1,13 +1,12 @@
 "use strict";
 // Task service: orchestrates task/kanban lifecycle
-// Implements AD-0008: Centralized State Machines + Owner Validation
-// + AD-0011: Soft Delete for Task Removal → now permanent delete (FS-SS-005-0007 v3)
+// Implements AD-0031 v2: Consolidated Stage/Status Workflow Engine
+// + AD-0039 v2: Combined Move Validation
 // + AD-0014: Nullable Columns for State-Specific Fields
-// + AD-0031: Stage-Driven Workflow Engine
-// + FS-SS-005-0001..0012
-// + FS-SS-030-0001..0004
+// + FS-SS-005-0001..0012 v2
+// + FS-SS-030-0001..0004 v2
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateOwnerRole = exports.isValidRole = void 0;
+exports.validateOwnerRole = void 0;
 exports.addTask = addTask;
 exports.moveTask = moveTask;
 exports.updateTask = updateTask;
@@ -19,12 +18,12 @@ const errors_1 = require("../utils/errors");
 const task_state_1 = require("../state-machines/task-state");
 const owner_validator_1 = require("../validators/owner-validator");
 Object.defineProperty(exports, "validateOwnerRole", { enumerable: true, get: function () { return owner_validator_1.validateOwnerRole; } });
-Object.defineProperty(exports, "isValidRole", { enumerable: true, get: function () { return owner_validator_1.isValidRole; } });
 const state_field_recorder_1 = require("../validators/state-field-recorder");
 const stage_validator_1 = require("./stage-validator");
 const sprint_1 = require("./sprint");
 const locks_1 = require("../db/locks");
 const retry_1 = require("../db/retry");
+const levenshtein_1 = require("../utils/levenshtein");
 /** Valid task type values */
 const VALID_TASK_TYPES = ['Feature', 'Bug', 'Chore'];
 /** Valid task priority values */
@@ -71,15 +70,17 @@ function validatePriority(priority) {
 /**
  * Add a new task to a sprint.
  *
+ * v2: No captain-only owner validation. Any valid role can own a task in any stage.
+ *
  * @param db - Database connection
  * @param sprintId - Sprint ID
  * @param content - Task content (nullable; can be populated via --content-file)
- * @param owner - Owner role (must be valid, captain-only for Backlog)
+ * @param owner - Owner role (must be valid)
  * @param opts - Optional task properties
  * @returns The created task result
  * @throws TaskBadSprintError if sprint doesn't exist or is closed
  * @throws TaskOwnerRequiredError if owner is empty
- * @throws various owner validation errors
+ * @throws various validation errors
  */
 function addTask(db, sprintId, content, owner, opts) {
     // Validate sprint exists and is not closed
@@ -97,16 +98,17 @@ function addTask(db, sprintId, content, owner, opts) {
     if (sprintStatus === 'CLOSED') {
         throw new errors_1.TaskBadSprintError(sprintId, 'sprint is closed');
     }
-    // Validate owner
+    // Validate owner (v2: case-insensitive, basic role-name only)
     if (!owner || owner.trim().length === 0) {
         throw new errors_1.TaskOwnerRequiredError();
     }
-    // Default stage is Planning — captain-only for Planning stage (FS-SS-005-0010, FS-SS-030-0003)
-    const stage = opts?.stage ?? 'Planning';
-    if (!(0, stage_validator_1.isValidStage)(stage)) {
-        throw new errors_1.StageInvalidError(stage);
+    const normalizedOwner = (0, owner_validator_1.validateOwnerRole)(owner.trim());
+    // Validate stage (v2: case-insensitive)
+    const stageInput = opts?.stage ?? 'Planning';
+    if (!(0, stage_validator_1.isValidStage)(stageInput)) {
+        throw new errors_1.StageInvalidError(stageInput);
     }
-    (0, owner_validator_1.validateOwnerForStage)(owner.trim(), stage);
+    const stage = (0, stage_validator_1.validateStage)(stageInput);
     // Validate optional type
     const taskType = opts?.task_type ?? 'Feature';
     if (opts?.task_type) {
@@ -128,11 +130,10 @@ function addTask(db, sprintId, content, owner, opts) {
     const lockOwner = (0, locks_1.generateLockOwner)();
     return (0, locks_1.withLock)(db, { name: lockName, owner: lockOwner }, () => {
         return (0, retry_1.withTransaction)(db, () => {
-            // Support explicit task ID (FS-SS-028-0001: positional <id> on task add)
+            // Support explicit task ID
             let taskId;
             if (opts?.task_id) {
                 validateTaskIdFormat(opts.task_id);
-                // Check for duplicate within the same sprint (per-sprint ID policy)
                 const existing = db.prepare('SELECT id FROM tasks WHERE id = ? AND sprint_id = ?').get(opts.task_id, sprintId);
                 if (existing) {
                     throw new errors_1.TaskDuplicateIdError(opts.task_id);
@@ -146,7 +147,7 @@ function addTask(db, sprintId, content, owner, opts) {
             db.prepare(`
         INSERT INTO tasks (id, sprint_id, parent_id, content, task_type, priority, owner, points, status, stage, created_at, updated_at)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, 'Backlog', ?, ?, ?)
-      `).run(taskId, sprintId, opts?.parent_id ?? null, content?.trim() ?? null, taskType, priority, owner.trim(), opts?.points ?? 0, stage, now, now);
+      `).run(taskId, sprintId, opts?.parent_id ?? null, content?.trim() ?? null, taskType, priority, normalizedOwner, opts?.points ?? 0, stage, now, now);
             return {
                 id: taskId,
                 sprint_id: sprintId,
@@ -154,7 +155,7 @@ function addTask(db, sprintId, content, owner, opts) {
                 content: content?.trim() ?? null,
                 task_type: taskType,
                 priority: priority,
-                owner: owner.trim(),
+                owner: normalizedOwner,
                 points: opts?.points ?? 0,
                 status: 'Backlog',
                 stage: stage,
@@ -176,67 +177,97 @@ function resolveActiveSprint(db) {
     return sprint;
 }
 /**
- * Move a task: status transition, stage transition, or combined.
+ * Move a task: status transition, stage transition, owner change, or combined.
  *
- * Per AD-0039: stage validation runs before status validation in combined moves.
- * Per FR-URD-034-0004: active sprint is required — no --sprint override.
+ * v2 per AD-0039 / AD-0031:
+ * - Case-insensitive validation for status, stage, owner
+ * - Closest-match suggestions via Levenshtein distance
+ * - Free stage transitions (forward, backward, same-stage all allowed)
+ * - Non-terminal Dropped (can recover to Backlog/To Do)
+ * - Dry-run mode: validate without persisting
+ * - Compulsory parameters: at least one of --to, --stage, --owner
+ * - No --sprint override; move always operates on active sprint
  *
  * @param db - Database connection
  * @param taskId - Task ID (4-digit NNNN)
- * @param opts - Move options: targetStatus, targetStage, context
+ * @param opts - Move options: targetStatus, targetStage, context, dryRun, sprintId
  * @returns Updated task result
  */
 function moveTask(db, taskId, opts) {
     // Validate task ID format
     validateTaskIdFormat(taskId);
-    // Resolve sprint for task lookup (per-sprint ID policy)
+    // At least one of targetStatus, targetStage, or owner must be provided
+    const hasStatusTarget = opts.targetStatus !== undefined;
+    const hasStageTarget = opts.targetStage !== undefined;
+    const hasOwnerTarget = opts.context?.owner !== undefined;
+    if (!hasStatusTarget && !hasStageTarget && !hasOwnerTarget) {
+        throw new errors_1.TaskMoveNoTargetError();
+    }
+    const isDryRun = opts.dryRun === true;
+    // Resolve sprint for task lookup
     const sprintId = opts.sprintId || resolveActiveSprint(db).id;
     // Read task first (pre-lock, for validation)
-    // First try with sprint_id filter (exact match)
     let task = db.prepare('SELECT * FROM tasks WHERE id = ? AND sprint_id = ? AND removed_at IS NULL').get(taskId, sprintId);
-    // If not found in the resolved sprint, check if it exists in any sprint
-    // to give a more specific error (TaskNotInActiveSprintError vs TaskNotFoundError)
+    // Cross-sprint fallback lookup
     if (!task) {
         const taskInAnySprint = db.prepare('SELECT * FROM tasks WHERE id = ? AND removed_at IS NULL').get(taskId);
         if (taskInAnySprint) {
-            // Task exists but is in a different sprint → specific error
             throw new errors_1.TaskNotInActiveSprintError(taskId);
         }
-        // Task truly doesn't exist → generic error
         throw new errors_1.TaskNotFoundError(taskId, sprintId);
     }
-    // Active sprint enforcement: task must belong to the active sprint
+    // Active sprint enforcement
     const activeSprint = resolveActiveSprint(db);
     if (task.sprint_id !== activeSprint.id) {
         throw new errors_1.TaskNotInActiveSprintError(taskId);
     }
-    const targetStatus = opts.targetStatus;
-    const targetStage = opts.targetStage;
-    // Phase 1: Validate stage progression (runs first per AD-0039)
-    if (targetStage !== undefined) {
-        if (!(0, stage_validator_1.isValidStage)(targetStage)) {
-            throw new errors_1.StageInvalidError(targetStage);
-        }
-        (0, stage_validator_1.validateProgression)(task.stage, targetStage, task.status);
-        // Validate owner for destination stage (captain-only for Planning/Release)
-        (0, owner_validator_1.validateOwnerForStage)(task.owner, targetStage);
-    }
-    // Phase 2: Validate status transition (runs second per AD-0039)
-    if (targetStatus !== undefined) {
-        if (!(0, task_state_1.isValidTaskStatus)(targetStatus)) {
-            throw new errors_1.TaskBadStatusError(targetStatus);
+    // Case-insensitive normalize and validate target status
+    let normalizedStatus;
+    if (hasStatusTarget) {
+        if (!(0, task_state_1.isValidTaskStatus)(opts.targetStatus)) {
+            const suggestions = (0, levenshtein_1.getClosestMatches)(opts.targetStatus, [
+                'Backlog', 'To Do', 'In Progress', 'In Review', 'Done', 'Dropped',
+            ]);
+            throw new errors_1.TaskBadStatusError(opts.targetStatus, suggestions);
         }
-        if (task.status === targetStatus) {
-            throw new errors_1.TaskNoopError(taskId, task.status);
-        }
-        if (!(0, task_state_1.isValidTaskTransition)(task.status, targetStatus)) {
+        normalizedStatus = (0, task_state_1.normalizeTaskStatus)(opts.targetStatus);
+        // Validate transition
+        if (!(0, task_state_1.isValidTaskTransition)(task.status, normalizedStatus)) {
             const allowed = (0, task_state_1.getAllowedTaskTransitions)(task.status).map(s => s);
-            throw new errors_1.TaskTransitionError(taskId, task.status, targetStatus, allowed);
+            throw new errors_1.TaskInvalidTransitionError(task.status, normalizedStatus, allowed);
         }
     }
-    // At least one of targetStatus or targetStage must be provided
-    if (targetStatus === undefined && targetStage === undefined) {
-        throw new errors_1.TaskNoopError(taskId, task.status);
+    // Case-insensitive normalize and validate target stage
+    let normalizedStage;
+    if (hasStageTarget) {
+        normalizedStage = (0, stage_validator_1.validateStage)(opts.targetStage);
+    }
+    // Case-insensitive normalize and validate target owner
+    let normalizedOwner;
+    if (hasOwnerTarget) {
+        normalizedOwner = (0, owner_validator_1.validateOwnerRole)(opts.context.owner);
+    }
+    // Dry-run: validate everything but don't persist
+    if (isDryRun) {
+        const currentStatus = task.status;
+        const currentStage = task.stage;
+        const currentOwner = task.owner;
+        const targetStatusStr = normalizedStatus ?? currentStatus;
+        const targetStageStr = normalizedStage ?? currentStage;
+        const targetOwnerStr = normalizedOwner ?? currentOwner;
+        return {
+            id: taskId,
+            sprint_id: task.sprint_id,
+            parent_id: task.parent_id,
+            content: task.content,
+            task_type: task.task_type,
+            priority: task.priority,
+            owner: targetOwnerStr,
+            points: task.points,
+            status: targetStatusStr,
+            stage: targetStageStr,
+            created_at: task.created_at,
+        };
     }
     // Phase 3: Apply in atomic transaction
     const lockName = `kanban:${task.sprint_id}`;
@@ -252,26 +283,27 @@ function moveTask(db, taskId, opts) {
             const values = [];
             const now = new Date().toISOString();
             // Apply stage update if provided
-            if (targetStage !== undefined) {
+            if (normalizedStage !== undefined) {
                 columns.push('stage = ?');
-                values.push(targetStage);
+                values.push(normalizedStage);
             }
             // Apply status update and record state-specific fields if provided
-            if (targetStatus !== undefined) {
-                // Record state-specific fields inline
-                const stFields = (0, state_field_recorder_1.computeStateFields)(fresh.status, targetStatus, opts.context);
-                // build column+value pairs: stFields already includes status + updated_at
+            if (normalizedStatus !== undefined) {
+                const stFields = (0, state_field_recorder_1.computeStateFields)(fresh.status, normalizedStatus, opts.context);
                 for (let i = 0; i < stFields.columns.length; i++) {
-                    // Avoid duplicating updated_at
                     const col = stFields.columns[i];
                     if (col.startsWith('updated_at')) {
-                        // We'll add updated_at at the end
                         continue;
                     }
                     columns.push(col);
                     values.push(stFields.values[i]);
                 }
             }
+            // Apply owner update if provided
+            if (normalizedOwner !== undefined) {
+                columns.push('owner = ?');
+                values.push(normalizedOwner);
+            }
             // Always update updated_at
             columns.push('updated_at = ?');
             values.push(now);
@@ -290,9 +322,6 @@ function moveTask(db, taskId, opts) {
  * Does NOT change task status, stage, owner, or sprint — use moveTask for those.
  *
  * Per AD-0038: rejects stage, owner, sprint fields at the service layer.
- *
- * @throws TaskNotFoundError if task doesn't exist
- * @throws TaskInvalidFieldError if prohibited fields are present
  */
 function updateTask(db, taskId, fields, sprintId) {
     // Guard clause: reject prohibited fields before any DB access (AD-0038)
@@ -302,9 +331,9 @@ function updateTask(db, taskId, fields, sprintId) {
         throw new errors_1.TaskInvalidFieldError('owner');
     if ('sprint' in fields)
         throw new errors_1.TaskInvalidFieldError('sprint');
-    // Resolve sprint for task lookup (per-sprint ID policy)
+    // Resolve sprint for task lookup
     const resolvedSprintId = sprintId || resolveActiveSprint(db).id;
-    // Read task first to resolve sprint ID for per-sprint locking (AD-0015)
+    // Read task first
     const task = db.prepare('SELECT * FROM tasks WHERE id = ? AND sprint_id = ? AND removed_at IS NULL').get(taskId, resolvedSprintId);
     if (!task) {
         throw new errors_1.TaskNotFoundError(taskId, resolvedSprintId);
@@ -313,14 +342,12 @@ function updateTask(db, taskId, fields, sprintId) {
     const lockOwner = (0, locks_1.generateLockOwner)();
     return (0, locks_1.withLock)(db, { name: lockName, owner: lockOwner }, () => {
         return (0, retry_1.withTransaction)(db, () => {
-            // Re-read task inside transaction for consistency under lock
             const fresh = db.prepare('SELECT * FROM tasks WHERE id = ? AND sprint_id = ? AND removed_at IS NULL').get(taskId, resolvedSprintId);
             if (!fresh) {
                 throw new errors_1.TaskNotFoundError(taskId, resolvedSprintId);
             }
             const updates = [];
             const params = [];
-            // Handle content_file_content: store raw content from file in content column
             if (fields.content_file_content !== undefined) {
                 updates.push('content = ?');
                 params.push(fields.content_file_content);
@@ -383,33 +410,24 @@ function updateTask(db, taskId, fields, sprintId) {
             params.push(taskId);
             params.push(resolvedSprintId);
             db.prepare(`UPDATE tasks SET ${updates.join(', ')} WHERE id = ? AND sprint_id = ?`).run(...params);
-            // Re-read
             const updated = db.prepare('SELECT id, sprint_id, parent_id, content, task_type, priority, owner, points, status, stage, created_at FROM tasks WHERE id = ? AND sprint_id = ?').get(taskId, resolvedSprintId);
             return updated;
         });
     });
 }
 /**
- * Remove a task (soft delete by default per AD-0011).
- *
- * @param db - Database connection
- * @param taskId - Task ID
- * @throws TaskNotFoundError if task doesn't exist
+ * Remove a task (permanent delete).
  */
 function removeTask(db, taskId, sprintId) {
-    // Resolve sprint for task lookup (per-sprint ID policy)
     const resolvedSprintId = sprintId || resolveActiveSprint(db).id;
-    // Read task first to resolve sprint ID for per-sprint locking (AD-0015)
     const task = db.prepare('SELECT id, sprint_id FROM tasks WHERE id = ? AND sprint_id = ?').get(taskId, resolvedSprintId);
     if (!task) {
         throw new errors_1.TaskNotFoundError(taskId, resolvedSprintId);
     }
-    // FS-SS-005-0007 v3 / AD-0011: Always permanent delete
     const lockName = `kanban:${task.sprint_id}`;
     const owner = (0, locks_1.generateLockOwner)();
     (0, locks_1.withLock)(db, { name: lockName, owner }, () => {
         return (0, retry_1.withTransaction)(db, () => {
-            // Re-read inside transaction for consistency under lock
             const fresh = db.prepare('SELECT id FROM tasks WHERE id = ? AND sprint_id = ?').get(taskId, resolvedSprintId);
             if (!fresh) {
                 throw new errors_1.TaskNotFoundError(taskId, resolvedSprintId);
@@ -421,11 +439,6 @@ function removeTask(db, taskId, sprintId) {
 }
 /**
  * Show detailed task information including sprint name and parent content.
- *
- * @param db - Database connection
- * @param taskId - Task ID
- * @param sprintId - Sprint ID (required for sprint-scoped lookup per URD-026)
- * @throws TaskNotFoundError if task doesn't exist or is not in the specified sprint
  */
 function showTask(db, taskId, sprintId) {
     let sql = `SELECT t.*, s.name as sprint_name, p.content as parent_content
@@ -454,15 +467,12 @@ function showTask(db, taskId, sprintId) {
 function listTasks(db, sprintId, filters) {
     let sql = 'SELECT * FROM tasks WHERE removed_at IS NULL';
     const params = [];
-    // Sprint filter
     sql += ' AND sprint_id = ?';
     params.push(sprintId);
-    // Status filter
     if (filters?.status) {
         sql += ' AND status = ?';
         params.push(filters.status);
     }
-    // Owner filter
     if (filters?.owner) {
         sql += ' AND owner = ?';
         params.push(filters.owner);