[pull] main from withastro:main

.agents/skills/merge/SKILL.md

@@ -0,0 +1,14 @@
+---
+name: merge
+description: Handle main-to-next merge tasks including conflict resolution, changeset cleanup, and CI fix-ups. Use when merging main into next.
+---
+
+# Merge
+
+Handle the main-to-next merge process. This skill has sub-skills for each stage:
+
+- [resolve-conflicts.md](resolve-conflicts.md) — Resolve git merge conflicts
+- [fix-ci.md](fix-ci.md) — Fix build errors, type errors, and test failures
+- [clean-changesets.md](clean-changesets.md) — Remove stale changeset files
+
+When invoked, check the `step` argument to determine which sub-skill to run, then read and follow that file's instructions.

.flue/workflows/fix-verification.ts

@@ -117,7 +117,7 @@ Return your classification.`,
 	}
 
 	// Use the astro-pr-writer skill to generate a good PR title and body.
-	const { data: prContent } = await session.skill('astro-pr-writer/SKILL.md', {
+	const { data: prContent } = await session.skill('astro-pr-writer', {
 		args: {
 			issueNumber,
 			issueDetails,

.flue/workflows/issue-triage.ts

@@ -178,8 +178,14 @@ async function runTriagePipeline(
 	fixed: boolean;
 	commitMessage: string | null;
 }> {
-	const { data: reproduceResult } = await session.skill('triage/reproduce.md', {
-		args: { issueNumber, issueDetails },
+	const { data: reproduceResult } = await session.skill('triage', {
+		args: {
+			issueNumber,
+			issueDetails,
+			step: 'reproduce',
+			instructions:
+				'Run only the "reproduce" sub-skill from reproduce.md. Do not continue to diagnose, verify, or fix steps.',
+		},
 		result: v.object({
 			reproducible: v.pipe(
 				v.boolean(),
@@ -206,17 +212,26 @@ async function runTriagePipeline(
 		};
 	}
 
-	const { data: diagnoseResult } = await session.skill('triage/diagnose.md', {
-		args: { issueDetails },
+	const { data: diagnoseResult } = await session.skill('triage', {
+		args: {
+			issueDetails,
+			step: 'diagnose',
+			instructions:
+				'Run only the "diagnose" sub-skill from diagnose.md. Do not continue to verify or fix steps.',
+		},
 		result: v.object({
 			confidence: v.pipe(
 				v.nullable(v.picklist(['high', 'medium', 'low'])),
 				v.description('Diagnosis confidence level, null if not attempted'),
 			),
 		}),
 	});
-	const { data: verifyResult } = await session.skill('triage/verify.md', {
-		args: { issueDetails },
+	const { data: verifyResult } = await session.skill('triage', {
+		args: {
+			issueDetails,
+			step: 'verify',
+			instructions: 'Run only the "verify" sub-skill from verify.md. Do not continue to fix step.',
+		},
 		result: v.object({
 			verdict: v.pipe(
 				v.picklist(['bug', 'intended-behavior', 'unclear']),
@@ -241,8 +256,8 @@ async function runTriagePipeline(
 		};
 	}
 
-	const { data: fixResult } = await session.skill('triage/fix.md', {
-		args: { issueDetails },
+	const { data: fixResult } = await session.skill('triage', {
+		args: { issueDetails, step: 'fix', instructions: 'Run only the "fix" sub-skill from fix.md.' },
 		result: v.object({
 			fixed: v.pipe(
 				v.boolean(),
@@ -334,8 +349,16 @@ export async function run({ init, payload }: FlueContext) {
 	assert(packageLabels.length > 0, 'no package labels found');
 
 	const branchName = isPushed ? branch : null;
-	const { data: comment } = await session.skill('triage/comment.md', {
-		args: { branchName, priorityLabels, issueDetails, previewRelease },
+	const { data: comment } = await session.skill('triage', {
+		args: {
+			branchName,
+			priorityLabels,
+			issueDetails,
+			previewRelease,
+			step: 'comment',
+			instructions:
+				'Run only the "comment" sub-skill from comment.md. Generate the GitHub comment from triage findings.',
+		},
 		result: v.pipe(
 			v.string(),
 			v.description(

.flue/workflows/merge-fix/WORKFLOW.ts

@@ -35,8 +35,13 @@ export async function run({ init, payload }: FlueContext) {
 	// Conflicts have already been resolved by the merge-resolve workflow.
 	// Dependencies are installed but packages may NOT be built yet — the skill
 	// handles building and fixing any errors that come up.
-	const { data: fixResult } = await session.skill('merge/fix-ci.md', {
-		args: { prNumber, ciLogs },
+	const { data: fixResult } = await session.skill('merge', {
+		args: {
+			prNumber,
+			ciLogs,
+			step: 'fix-ci',
+			instructions: 'Run only the "fix-ci" sub-skill from fix-ci.md.',
+		},
 		result: v.object({
 			ciPass: v.pipe(v.boolean(), v.description('true if build + tests pass after fixes')),
 			fixedFiles: v.pipe(

.flue/workflows/merge-resolve/WORKFLOW.ts

@@ -31,8 +31,13 @@ export async function run({ init, payload }: FlueContext) {
 	// conflicts, the working tree has conflict markers in all affected files.
 	// This skill resolves them intelligently — keeping next-side versions but
 	// preserving important changes from main (new deps, bug fixes, etc.)
-	const { data: resolveResult } = await session.skill('merge/resolve-conflicts.md', {
-		args: { branch, hasConflicts },
+	const { data: resolveResult } = await session.skill('merge', {
+		args: {
+			branch,
+			hasConflicts,
+			step: 'resolve-conflicts',
+			instructions: 'Run only the "resolve-conflicts" sub-skill from resolve-conflicts.md.',
+		},
 		result: v.object({
 			resolvedFiles: v.pipe(
 				v.array(v.string()),
@@ -42,8 +47,11 @@ export async function run({ init, payload }: FlueContext) {
 	});
 
 	// Step 2: Remove stale changesets that were already released on main
-	const { data: changesetResult } = await session.skill('merge/clean-changesets.md', {
-		args: {},
+	const { data: changesetResult } = await session.skill('merge', {
+		args: {
+			step: 'clean-changesets',
+			instructions: 'Run only the "clean-changesets" sub-skill from clean-changesets.md.',
+		},
 		result: v.object({
 			removedChangesets: v.pipe(
 				v.array(v.string()),

examples/advanced-routing/package.json

@@ -13,8 +13,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/node": "^10.1.3",
-    "astro": "^6.4.4",
+    "@astrojs/node": "^10.1.4",
+    "astro": "^6.4.5",
     "hono": "^4.12.14"
   }
 }

examples/basics/package.json

@@ -13,6 +13,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^6.4.4"
+    "astro": "^6.4.5"
   }
 }

examples/blog/package.json

@@ -13,10 +13,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^6.0.2",
+    "@astrojs/mdx": "^6.0.3",
     "@astrojs/rss": "^4.0.18",
     "@astrojs/sitemap": "^3.7.3",
-    "astro": "^6.4.4",
+    "astro": "^6.4.5",
     "sharp": "^0.34.3"
   }
 }

examples/component/package.json

@@ -18,7 +18,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^6.4.4"
+    "astro": "^6.4.5"
   },
   "peerDependencies": {
     "astro": "^5.0.0 || ^6.0.0"

examples/container-with-vitest/package.json

@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@astrojs/react": "^5.0.7",
-    "astro": "^6.4.4",
+    "astro": "^6.4.5",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "vitest": "^4.1.0"

examples/framework-alpine/package.json

@@ -16,6 +16,6 @@
     "@astrojs/alpinejs": "^0.5.0",
     "@types/alpinejs": "^3.13.11",
     "alpinejs": "^3.15.8",
-    "astro": "^6.4.4"
+    "astro": "^6.4.5"
   }
 }

examples/framework-multiple/package.json

@@ -20,7 +20,7 @@
     "@astrojs/vue": "^6.0.1",
     "@types/react": "^18.3.28",
     "@types/react-dom": "^18.3.7",
-    "astro": "^6.4.4",
+    "astro": "^6.4.5",
     "preact": "^10.28.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

examples/framework-preact/package.json

@@ -15,7 +15,7 @@
   "dependencies": {
     "@astrojs/preact": "^5.1.5",
     "@preact/signals": "^2.8.1",
-    "astro": "^6.4.4",
+    "astro": "^6.4.5",
     "preact": "^10.28.4"
   }
 }

examples/framework-react/package.json

@@ -16,7 +16,7 @@
     "@astrojs/react": "^5.0.7",
     "@types/react": "^18.3.28",
     "@types/react-dom": "^18.3.7",
-    "astro": "^6.4.4",
+    "astro": "^6.4.5",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   }

examples/framework-solid/package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^6.0.1",
-    "astro": "^6.4.4",
+    "astro": "^6.4.5",
     "solid-js": "^1.9.11"
   }
 }

examples/framework-svelte/package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^8.1.2",
-    "astro": "^6.4.4",
+    "astro": "^6.4.5",
     "svelte": "^5.53.5"
   }
 }

examples/framework-vue/package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^6.0.1",
-    "astro": "^6.4.4",
+    "astro": "^6.4.5",
     "vue": "^3.5.29"
   }
 }

examples/hackernews/package.json

@@ -13,7 +13,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/node": "^10.1.3",
-    "astro": "^6.4.4"
+    "@astrojs/node": "^10.1.4",
+    "astro": "^6.4.5"
   }
 }

examples/integration/package.json

@@ -18,7 +18,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^6.4.4"
+    "astro": "^6.4.5"
   },
   "peerDependencies": {
     "astro": "^4.0.0"

examples/minimal/package.json

@@ -13,6 +13,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^6.4.4"
+    "astro": "^6.4.5"
   }
 }

examples/portfolio/package.json

@@ -13,6 +13,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^6.4.4"
+    "astro": "^6.4.5"
   }
 }

examples/ssr/package.json

@@ -14,9 +14,9 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "@astrojs/node": "^10.1.3",
+    "@astrojs/node": "^10.1.4",
     "@astrojs/svelte": "^8.1.2",
-    "astro": "^6.4.4",
+    "astro": "^6.4.5",
     "svelte": "^5.53.5"
   }
 }

examples/starlog/package.json

@@ -9,7 +9,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^6.4.4",
+    "astro": "^6.4.5",
     "sass": "^1.97.3",
     "sharp": "^0.34.3"
   },

examples/toolbar-app/package.json

@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@types/node": "^22.10.6",
-    "astro": "^6.4.4"
+    "astro": "^6.4.5"
   },
   "engines": {
     "node": ">=22.12.0"

examples/with-markdoc/package.json

@@ -14,6 +14,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^1.0.6",
-    "astro": "^6.4.4"
+    "astro": "^6.4.5"
   }
 }

examples/with-mdx/package.json

@@ -13,9 +13,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^6.0.2",
+    "@astrojs/mdx": "^6.0.3",
     "@astrojs/preact": "^5.1.5",
-    "astro": "^6.4.4",
+    "astro": "^6.4.5",
     "preact": "^10.28.4"
   }
 }

examples/with-nanostores/package.json

@@ -15,7 +15,7 @@
   "dependencies": {
     "@astrojs/preact": "^5.1.5",
     "@nanostores/preact": "^1.0.0",
-    "astro": "^6.4.4",
+    "astro": "^6.4.5",
     "nanostores": "^1.1.1",
     "preact": "^10.28.4"
   }