specweave 1.0.459 → 1.0.461

package/plugins/specweave-ado/lib/ado-spec-sync.js

@@ -4,6 +4,14 @@ import axios from "axios";
 class AdoSpecSync {
   constructor(config, projectRoot = process.cwd(), projectId) {
     this.availableTypes = null;
+    /**
+     * Resolve a work item state name for the given type.
+     * Basic process (Issue type) uses: "To Do", "Doing", "Done"
+     * Agile/Scrum process uses: "New", "Active", "Closed" / "Resolved" / "Done"
+     *
+     * Maps canonical states: 'New' → todo, 'Active' → in-progress, 'Closed' → done
+     */
+    this.stateCache = /* @__PURE__ */ new Map();
     this.specManager = new SpecMetadataManager(projectRoot, projectId);
     this.config = config;
     this.client = axios.create({
@@ -50,6 +58,31 @@ class AdoSpecSync {
     }
     return desiredType;
   }
+  async resolveWorkItemState(workItemType, canonicalState) {
+    if (!this.stateCache.has(workItemType)) {
+      try {
+        const resp = await this.client.get(
+          `/wit/workitemtypes/${encodeURIComponent(workItemType)}/states?api-version=7.0`,
+          { headers: { "Accept": "application/json" } }
+        );
+        const states = new Set(resp.data.value.map((s) => s.name));
+        this.stateCache.set(workItemType, states);
+      } catch {
+        this.stateCache.set(workItemType, /* @__PURE__ */ new Set(["New", "Active", "Resolved", "Closed"]));
+      }
+    }
+    const validStates = this.stateCache.get(workItemType);
+    const candidates = {
+      "New": ["To Do", "New", "Open"],
+      "Active": ["Doing", "Active", "In Progress", "In-Progress"],
+      "Closed": ["Done", "Closed", "Resolved", "Completed"]
+    };
+    for (const candidate of candidates[canonicalState]) {
+      if (validStates.has(candidate)) return candidate;
+    }
+    const arr = [...validStates];
+    return canonicalState === "Closed" ? arr[arr.length - 1] ?? canonicalState : arr[0] ?? canonicalState;
+  }
   /**
    * Sync spec to ADO Feature (CREATE or UPDATE)
    */
@@ -268,10 +301,13 @@ class AdoSpecSync {
       const storyDescription = this.generateStoryDescription(us);
       const existingStory = await this.findStoryByTitle(us.id);
       if (existingStory) {
+        const resolvedStoryType = await this.resolveWorkItemType("User Story");
+        const canonicalState = us.status === "done" ? "Closed" : us.status === "in-progress" ? "Active" : "New";
+        const resolvedState = await this.resolveWorkItemState(resolvedStoryType, canonicalState);
         await this.updateStory(existingStory.id, {
           title: storyTitle,
           description: storyDescription,
-          state: us.status === "done" ? "Closed" : us.status === "in-progress" ? "Active" : "New",
+          state: resolvedState,
           parentId: featureId
         });
         updated.push(us.id);
@@ -291,10 +327,12 @@ class AdoSpecSync {
     const allDone = spec.metadata.userStories.every((us) => us.status === "done");
     if (allDone && spec.metadata.userStories.length > 0 && created.length === 0) {
       try {
+        const epicType = await this.resolveWorkItemType("Feature");
+        const epicClosedState = await this.resolveWorkItemState(epicType, "Closed");
         await this.client.patch(`/wit/workitems/${featureId}?api-version=7.0`, [
-          { op: "replace", path: "/fields/System.State", value: "Closed" }
+          { op: "replace", path: "/fields/System.State", value: epicClosedState }
         ], { headers: { "Content-Type": "application/json-patch+json" } });
-        console.log(`   \u2705 All stories done \u2014 closed parent Epic #${featureId}`);
+        console.log(`   \u2705 All stories done \u2014 closed parent Epic #${featureId} (state: ${epicClosedState})`);
       } catch {
       }
     }

package/plugins/specweave-ado/lib/ado-spec-sync.ts

@@ -116,6 +116,45 @@ export class AdoSpecSync {
     return desiredType; // Let ADO reject if truly unavailable
   }
 
+  /**
+   * Resolve a work item state name for the given type.
+   * Basic process (Issue type) uses: "To Do", "Doing", "Done"
+   * Agile/Scrum process uses: "New", "Active", "Closed" / "Resolved" / "Done"
+   *
+   * Maps canonical states: 'New' → todo, 'Active' → in-progress, 'Closed' → done
+   */
+  private stateCache = new Map<string, Set<string>>();
+  private async resolveWorkItemState(workItemType: string, canonicalState: 'New' | 'Active' | 'Closed'): Promise<string> {
+    if (!this.stateCache.has(workItemType)) {
+      try {
+        const resp = await this.client.get(
+          `/wit/workitemtypes/${encodeURIComponent(workItemType)}/states?api-version=7.0`,
+          { headers: { 'Accept': 'application/json' } }
+        );
+        const states = new Set<string>(resp.data.value.map((s: { name: string }) => s.name));
+        this.stateCache.set(workItemType, states);
+      } catch {
+        // Fallback: assume Agile states
+        this.stateCache.set(workItemType, new Set(['New', 'Active', 'Resolved', 'Closed']));
+      }
+    }
+    const validStates = this.stateCache.get(workItemType)!;
+
+    // Preferred state names per canonical state, in priority order
+    const candidates: Record<string, string[]> = {
+      'New':    ['To Do', 'New', 'Open'],
+      'Active': ['Doing', 'Active', 'In Progress', 'In-Progress'],
+      'Closed': ['Done', 'Closed', 'Resolved', 'Completed'],
+    };
+
+    for (const candidate of candidates[canonicalState]) {
+      if (validStates.has(candidate)) return candidate;
+    }
+    // Last resort: return first available state for 'New', last for 'Closed'
+    const arr = [...validStates];
+    return canonicalState === 'Closed' ? (arr[arr.length - 1] ?? canonicalState) : (arr[0] ?? canonicalState);
+  }
+
   /**
    * Sync spec to ADO Feature (CREATE or UPDATE)
    */
@@ -391,11 +430,14 @@ export class AdoSpecSync {
       const existingStory = await this.findStoryByTitle(us.id);
 
       if (existingStory) {
+        const resolvedStoryType = await this.resolveWorkItemType('User Story');
+        const canonicalState = us.status === 'done' ? 'Closed' : us.status === 'in-progress' ? 'Active' : 'New';
+        const resolvedState = await this.resolveWorkItemState(resolvedStoryType, canonicalState);
         // UPDATE existing story (also re-apply parent to fix orphaned stories)
         await this.updateStory(existingStory.id, {
           title: storyTitle,
           description: storyDescription,
-          state: us.status === 'done' ? 'Closed' : us.status === 'in-progress' ? 'Active' : 'New',
+          state: resolvedState,
           parentId: featureId
         });
 
@@ -420,10 +462,12 @@ export class AdoSpecSync {
     const allDone = spec.metadata.userStories.every(us => us.status === 'done');
     if (allDone && spec.metadata.userStories.length > 0 && created.length === 0) {
       try {
+        const epicType = await this.resolveWorkItemType('Feature');
+        const epicClosedState = await this.resolveWorkItemState(epicType, 'Closed');
         await this.client.patch(`/wit/workitems/${featureId}?api-version=7.0`, [
-          { op: 'replace', path: '/fields/System.State', value: 'Closed' }
+          { op: 'replace', path: '/fields/System.State', value: epicClosedState }
         ], { headers: { 'Content-Type': 'application/json-patch+json' } });
-        console.log(`   ✅ All stories done — closed parent Epic #${featureId}`);
+        console.log(`   ✅ All stories done — closed parent Epic #${featureId} (state: ${epicClosedState})`);
       } catch {
         // Non-blocking — state transition may not be valid for all ADO project configs
       }

package/plugins/specweave-github/lib/github-ac-checkbox-sync.js

@@ -2,16 +2,16 @@ import { promises as fs, existsSync } from "fs";
 import path from "path";
 import yaml from "yaml";
 import { GitHubClientV2 } from "./github-client-v2.js";
-import { consoleLogger } from "../../../src/utils/logger.js";
-import { autoDetectProjectIdSync } from "../../../src/utils/project-detection.js";
-import { deriveFeatureId } from "../../../src/utils/feature-id-derivation.js";
+import { consoleLogger } from "../../specweave/lib/vendor/utils/logger.js";
+import { autoDetectProjectIdSync } from "../../specweave/lib/vendor/utils/project-detection.js";
+import { deriveFeatureId } from "../../specweave/lib/vendor/utils/feature-id-derivation.js";
 import {
   ProviderRouter
-} from "../../../src/sync/provider-router.js";
+} from "../../specweave/lib/vendor/sync/provider-router.js";
 import {
   isProviderEnabled
-} from "../../../src/sync/status-mapper.js";
-import { resolvePermissions } from "../../../src/sync/config.js";
+} from "../../specweave/lib/vendor/sync/status-mapper.js";
+import { resolvePermissions } from "../../specweave/lib/vendor/sync/config.js";
 class GitHubACCheckboxSync {
   constructor(options) {
     this.projectRoot = options.projectRoot;

package/plugins/specweave-github/lib/github-ac-checkbox-sync.ts

@@ -12,17 +12,17 @@ import { promises as fs, existsSync } from 'fs';
 import path from 'path';
 import yaml from 'yaml';
 import { GitHubClientV2 } from './github-client-v2.js';
-import { Logger, consoleLogger } from '../../../src/utils/logger.js';
-import { autoDetectProjectIdSync } from '../../../src/utils/project-detection.js';
-import { deriveFeatureId } from '../../../src/utils/feature-id-derivation.js';
+import { Logger, consoleLogger } from '../../specweave/lib/vendor/utils/logger.js';
+import { autoDetectProjectIdSync } from '../../specweave/lib/vendor/utils/project-detection.js';
+import { deriveFeatureId } from '../../specweave/lib/vendor/utils/feature-id-derivation.js';
 import {
   ProviderRouter,
   GitHubRepoConfig,
-} from '../../../src/sync/provider-router.js';
+} from '../../specweave/lib/vendor/sync/provider-router.js';
 import {
   isProviderEnabled,
-} from '../../../src/sync/status-mapper.js';
-import { resolvePermissions, SyncPreset } from '../../../src/sync/config.js';
+} from '../../specweave/lib/vendor/sync/status-mapper.js';
+import { resolvePermissions, SyncPreset } from '../../specweave/lib/vendor/sync/config.js';
 import type { SpecWeaveConfig } from '../../../src/core/config/types.js';
 import type { LivingDocsUSFile } from '../../../src/types/living-docs-us-file.js';
 

package/plugins/specweave-jira/lib/jira-ac-checkbox-sync.js

@@ -2,9 +2,9 @@ import { promises as fs, existsSync } from "fs";
 import path from "path";
 import yaml from "yaml";
 import axios from "axios";
-import { consoleLogger } from "../../../src/utils/logger.js";
-import { autoDetectProjectIdSync } from "../../../src/utils/project-detection.js";
-import { deriveFeatureId } from "../../../src/utils/feature-id-derivation.js";
+import { consoleLogger } from "../../specweave/lib/vendor/utils/logger.js";
+import { autoDetectProjectIdSync } from "../../specweave/lib/vendor/utils/project-detection.js";
+import { deriveFeatureId } from "../../specweave/lib/vendor/utils/feature-id-derivation.js";
 import { getApiBaseUrl } from "./jira-deployment-detector.js";
 import { GitHubACCheckboxSync } from "../../specweave-github/lib/github-ac-checkbox-sync.js";
 class JiraACCheckboxSync {

package/plugins/specweave-jira/lib/jira-ac-checkbox-sync.ts

@@ -15,9 +15,9 @@ import { promises as fs, existsSync } from 'fs';
 import path from 'path';
 import yaml from 'yaml';
 import axios, { AxiosInstance } from 'axios';
-import { Logger, consoleLogger } from '../../../src/utils/logger.js';
-import { autoDetectProjectIdSync } from '../../../src/utils/project-detection.js';
-import { deriveFeatureId } from '../../../src/utils/feature-id-derivation.js';
+import { Logger, consoleLogger } from '../../specweave/lib/vendor/utils/logger.js';
+import { autoDetectProjectIdSync } from '../../specweave/lib/vendor/utils/project-detection.js';
+import { deriveFeatureId } from '../../specweave/lib/vendor/utils/feature-id-derivation.js';
 import { detectDeploymentType, getApiBaseUrl } from './jira-deployment-detector.js';
 import type { SpecWeaveConfig } from '../../../src/core/config/types.js';
 import type { LivingDocsUSFile } from '../../../src/types/living-docs-us-file.js';