specweave 1.0.464 → 1.0.466

package/plugins/specweave-github/lib/github-feature-sync.ts

@@ -18,8 +18,8 @@ import { GitHubClientV2 } from './github-client-v2.js';
 import { UserStoryIssueBuilder } from './user-story-issue-builder.js';
 import { CompletionCalculator } from './completion-calculator.js';
 import { DuplicateDetector } from './duplicate-detector.js';
-import { execFileNoThrow } from '../../../src/utils/execFileNoThrow.js';
-import { getGitHubAuthFromProject } from '../../../src/utils/auth-helpers.js';
+import { execFileNoThrow } from '../../specweave/lib/vendor/utils/execFileNoThrow.js';
+import { getGitHubAuthFromProject } from '../../specweave/lib/vendor/utils/auth-helpers.js';
 
 interface FeatureFrontmatter {
   id: string;
@@ -1374,7 +1374,16 @@ export class GitHubFeatureSync {
 
     const frontmatter = yaml.parse(match[1]);
 
-    // Update external.github
+    // Update external_tools.github (consistent with JIRA/ADO write-back)
+    if (!frontmatter.external_tools) {
+      frontmatter.external_tools = {};
+    }
+    if (!frontmatter.external_tools.github) {
+      frontmatter.external_tools.github = {};
+    }
+    frontmatter.external_tools.github.issue = issueNumber;
+    frontmatter.external_tools.github.url = `https://github.com/${this.client.getOwner()}/${this.client.getRepo()}/issues/${issueNumber}`;
+    // Also keep legacy external.github for backwards compatibility
     if (!frontmatter.external) {
       frontmatter.external = {};
     }
@@ -1382,7 +1391,7 @@ export class GitHubFeatureSync {
       frontmatter.external.github = {};
     }
     frontmatter.external.github.issue = issueNumber;
-    frontmatter.external.github.url = `https://github.com/${this.client.getOwner()}/${this.client.getRepo()}/issues/${issueNumber}`;
+    frontmatter.external.github.url = frontmatter.external_tools.github.url;
 
     // Rebuild content
     const newFrontmatter = yaml.stringify(frontmatter);

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

@@ -239,7 +239,7 @@ class JiraACCheckboxSync {
         const match = fileContent.match(/^---\n([\s\S]*?)\n---/);
         if (match) {
           const fm = yaml.parse(match[1]);
-          const externalTools = fm.external_tools || fm.external;
+          const externalTools = { ...fm.external || {}, ...fm.external_tools || {} };
           usFiles.push({
             id: fm.id,
             title: fm.title,

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

@@ -315,7 +315,7 @@ export class JiraACCheckboxSync {
         const match = fileContent.match(/^---\n([\s\S]*?)\n---/);
         if (match) {
           const fm = yaml.parse(match[1]);
-          const externalTools = fm.external_tools || fm.external;
+          const externalTools = { ...(fm.external || {}), ...(fm.external_tools || {}) };
           usFiles.push({
             id: fm.id,
             title: fm.title,

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

@@ -10,7 +10,7 @@ import { getEpicLinkFieldForProject } from "./jira-field-discovery.js";
 import { searchAllIssues } from "./jira-paginated-search.js";
 import axios from "axios";
 function buildStoryDescription(us) {
-  const acList = us.acceptanceCriteria.map((ac) => `${ac.status === "done" ? "[x]" : "[ ]"} ${ac.description}`).join("\n");
+  const acList = us.acceptanceCriteria.map((ac) => `${ac.status === "done" ? "[x]" : "[ ]"} ${ac.id}: ${ac.description}`).join("\n");
   return `
 h2. User Story
 

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

@@ -38,7 +38,7 @@ import axios, { AxiosInstance } from 'axios';
  */
 export function buildStoryDescription(us: UserStory): string {
   const acList = us.acceptanceCriteria
-    .map(ac => `${ac.status === 'done' ? '[x]' : '[ ]'} ${ac.description}`)
+    .map(ac => `${ac.status === 'done' ? '[x]' : '[ ]'} ${ac.id}: ${ac.description}`)
     .join('\n');
 
   return `