@microsoft/agentrc 2.0.1-8 → 2.0.1-9

package/dist/index.js

@@ -3052,7 +3052,7 @@ var require_main = __commonJS({
     exports.createMessageConnection = exports.createServerSocketTransport = exports.createClientSocketTransport = exports.createServerPipeTransport = exports.createClientPipeTransport = exports.generateRandomPipeName = exports.StreamMessageWriter = exports.StreamMessageReader = exports.SocketMessageWriter = exports.SocketMessageReader = exports.PortMessageWriter = exports.PortMessageReader = exports.IPCMessageWriter = exports.IPCMessageReader = void 0;
     var ril_1 = require_ril();
     ril_1.default.install();
-    var path21 = __require("path");
+    var path23 = __require("path");
     var os2 = __require("os");
     var crypto_1 = __require("crypto");
     var net_1 = __require("net");
@@ -3188,9 +3188,9 @@ var require_main = __commonJS({
       }
       let result;
       if (XDG_RUNTIME_DIR) {
-        result = path21.join(XDG_RUNTIME_DIR, `vscode-ipc-${randomSuffix}.sock`);
+        result = path23.join(XDG_RUNTIME_DIR, `vscode-ipc-${randomSuffix}.sock`);
       } else {
-        result = path21.join(os2.tmpdir(), `vscode-${randomSuffix}.sock`);
+        result = path23.join(os2.tmpdir(), `vscode-${randomSuffix}.sock`);
       }
       const limit = safeIpcPathLengths.get(process.platform);
       if (limit !== void 0 && result.length > limit) {
@@ -6674,7 +6674,7 @@ async function checkReposForInstructions(token, repos, onProgress) {
 }
 
 // packages/core/src/services/batch.ts
-import path9 from "path";
+import path10 from "path";
 
 // packages/core/src/utils/pr.ts
 function buildInstructionsPrBody() {
@@ -6958,7 +6958,7 @@ async function checkReposForInstructions2(token, repos, onProgress) {
 
 // packages/core/src/services/instructions.ts
 import fs5 from "fs/promises";
-import path6 from "path";
+import path7 from "path";
 
 // packages/core/src/services/copilot.ts
 import fs4 from "fs/promises";
@@ -7378,6 +7378,25 @@ async function createCopilotClient(cliConfig) {
   }
 }
 
+// packages/core/src/services/skills.ts
+import path6 from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+var overrideSkillsDir;
+function getBuiltinSkillsDir() {
+  if (overrideSkillsDir) {
+    return overrideSkillsDir;
+  }
+  const thisFile = fileURLToPath2(import.meta.url);
+  const thisDir = path6.dirname(thisFile);
+  if (thisDir.includes(path6.join("packages", "core", "src"))) {
+    return path6.resolve(thisDir, "..", "..", "..", "..", "plugin", "skills");
+  }
+  return path6.resolve(thisDir, "skills");
+}
+function getSkillDirectory(_skillName) {
+  return getBuiltinSkillsDir();
+}
+
 // packages/core/src/services/instructions.ts
 async function detectExistingInstructions(repoPath, detailDirName = ".agents") {
   const { agentsMdFiles, claudeMdFiles } = await findInstructionMarkerFiles(repoPath);
@@ -7401,7 +7420,7 @@ async function findInstructionMarkerFiles(repoPath) {
           claudeMdFiles.push(relPath ? `${relPath}/${entry.name}` : entry.name);
         }
       } else if (entry.isDirectory()) {
-        await walk(path6.join(dir, entry.name), relPath ? `${relPath}/${entry.name}` : entry.name);
+        await walk(path7.join(dir, entry.name), relPath ? `${relPath}/${entry.name}` : entry.name);
       }
     }
   }
@@ -7409,7 +7428,7 @@ async function findInstructionMarkerFiles(repoPath) {
   return { agentsMdFiles: agentsMdFiles.sort(), claudeMdFiles: claudeMdFiles.sort() };
 }
 async function findModularInstructionFiles(repoPath) {
-  const dir = path6.join(repoPath, ".github", "instructions");
+  const dir = path7.join(repoPath, ".github", "instructions");
   const entries = await fs5.readdir(dir, { withFileTypes: true }).catch(() => []);
   return entries.filter((e) => !e.isSymbolicLink() && e.isFile() && e.name.endsWith(".instructions.md")).map((e) => `.github/instructions/${e.name}`).sort();
 }
@@ -7423,7 +7442,7 @@ async function findDetailFiles(repoPath, detailDirName) {
       if (entry.isSymbolicLink()) continue;
       if (entry.isDirectory()) {
         if (entry.name === detailDirName) {
-          const detailDir = path6.join(dir, entry.name);
+          const detailDir = path7.join(dir, entry.name);
           const detailEntries = await fs5.readdir(detailDir, { withFileTypes: true }).catch(() => []);
           for (const de of detailEntries) {
             if (!de.isSymbolicLink() && de.isFile() && de.name.endsWith(".md")) {
@@ -7432,7 +7451,7 @@ async function findDetailFiles(repoPath, detailDirName) {
             }
           }
         } else {
-          await walk(path6.join(dir, entry.name), relPath ? `${relPath}/${entry.name}` : entry.name);
+          await walk(path7.join(dir, entry.name), relPath ? `${relPath}/${entry.name}` : entry.name);
         }
       }
     }
@@ -7514,11 +7533,11 @@ function isCopilotAuthError(error) {
   return error instanceof Error && error.message.includes("Copilot CLI not logged in.");
 }
 function resolveAreaWorkingDirectory(repoPath, area) {
-  const repoRoot = path6.resolve(repoPath);
+  const repoRoot = path7.resolve(repoPath);
   const rawWorkingDirectory = area?.workingDirectory ?? area?.path;
   if (!rawWorkingDirectory) return repoRoot;
-  const resolved = area?.workingDirectory ? path6.resolve(repoRoot, rawWorkingDirectory) : path6.isAbsolute(rawWorkingDirectory) ? path6.resolve(rawWorkingDirectory) : path6.resolve(repoRoot, rawWorkingDirectory);
-  if (resolved !== repoRoot && !resolved.startsWith(repoRoot + path6.sep)) {
+  const resolved = area?.workingDirectory ? path7.resolve(repoRoot, rawWorkingDirectory) : path7.isAbsolute(rawWorkingDirectory) ? path7.resolve(rawWorkingDirectory) : path7.resolve(repoRoot, rawWorkingDirectory);
+  if (resolved !== repoRoot && !resolved.startsWith(repoRoot + path7.sep)) {
     throw new Error(`Invalid workingDirectory "${rawWorkingDirectory}": escapes repo boundary`);
   }
   return resolved;
@@ -7550,6 +7569,7 @@ async function generateCopilotInstructions(options) {
     const preferredModel = options.model ?? DEFAULT_MODEL;
     const systemContent = hasExistingInstructions ? "You are an expert codebase analyst. Your task is to generate a concise .github/copilot-instructions.md that complements existing instruction files. Use the available tools (glob, view, grep) to explore the codebase. When done, call the emit_file_content tool with the final markdown." : "You are an expert codebase analyst. Your task is to generate a concise .github/copilot-instructions.md file. Use the available tools (glob, view, grep) to explore the codebase. When done, call the emit_file_content tool with the final markdown.";
     const { tool: emitTool, getContent } = await createEmitTool();
+    const rootSkillDir = getSkillDirectory("root-instructions");
     const session = await client.createSession({
       model: preferredModel,
       streaming: true,
@@ -7560,7 +7580,8 @@ async function generateCopilotInstructions(options) {
       tools: [emitTool],
       excludedTools: INSTRUCTION_GENERATION_EXCLUDED_TOOLS,
       onPermissionRequest: READ_ONLY_PERMISSION_HANDLER,
-      infiniteSessions: { enabled: false }
+      infiniteSessions: { enabled: false },
+      skillDirectories: [rootSkillDir]
     });
     await trySetAutopilot(session);
     let content = "";
@@ -7581,22 +7602,8 @@ async function generateCopilotInstructions(options) {
         sessionError = getSessionError(errorMsg);
       }
     });
-    const prompt = `Analyze this codebase and generate a .github/copilot-instructions.md file.
-
-Fan out multiple Explore subagents to map out the codebase in parallel:
-1. Check for existing instruction files: glob for **/{.github/copilot-instructions.md,AGENT.md,CLAUDE.md,.cursorrules,README.md}
-2. Identify the tech stack: look at package.json, tsconfig.json, pyproject.toml, Cargo.toml, go.mod, *.csproj, *.fsproj, *.sln, global.json, build.gradle, pom.xml, etc.
-3. Understand the structure: list key directories
-4. Detect monorepo structures: check for workspace configs (npm/pnpm/yarn workspaces, Cargo.toml [workspace], go.work, .sln solution files, settings.gradle include directives, pom.xml modules)
-
-Generate concise instructions (~20-50 lines) covering:
-- Tech stack and architecture
-- Build/test commands
-- Project-specific conventions
-- Key files/directories
-- Monorepo structure and per-app layout (if this is a monorepo, describe the workspace organization, how apps relate to each other, and any shared libraries)
-${existingSection}
-When you have the complete markdown content, call the \`emit_file_content\` tool with it. Do NOT output the file content directly in chat.`;
+    const prompt = `/root-instructions Analyze this codebase and generate a .github/copilot-instructions.md file.
+${existingSection}`;
     progress("Analyzing codebase...");
     let sendError;
     try {
@@ -7633,6 +7640,7 @@ async function generateAreaInstructions(options) {
     const preferredModel = options.model ?? DEFAULT_MODEL;
     const areaSystemContent = hasExistingInstructions ? `You are an expert codebase analyst. Your task is to generate a concise .instructions.md file for a specific area of a codebase. This file will be used as an area instruction in VS Code, automatically applied when working on files matching certain patterns. This file should complement, not duplicate, existing instruction files. Use the Explore subagents and read-only tools to explore the codebase. When done, call the emit_file_content tool with the final markdown.` : `You are an expert codebase analyst. Your task is to generate a concise .instructions.md file for a specific area of a codebase. This file will be used as an area instruction in VS Code, automatically applied when working on files matching certain patterns. Use the Explore subagents and read-only tools to explore the codebase. When done, call the emit_file_content tool with the final markdown.`;
     const { tool: emitTool, getContent } = await createEmitTool();
+    const areaSkillDir = getSkillDirectory("area-instructions");
     const session = await client.createSession({
       model: preferredModel,
       streaming: true,
@@ -7643,7 +7651,8 @@ async function generateAreaInstructions(options) {
       tools: [emitTool],
       excludedTools: INSTRUCTION_GENERATION_EXCLUDED_TOOLS,
       onPermissionRequest: READ_ONLY_PERMISSION_HANDLER,
-      infiniteSessions: { enabled: false }
+      infiniteSessions: { enabled: false },
+      skillDirectories: [areaSkillDir]
     });
     await trySetAutopilot(session);
     let content = "";
@@ -7664,30 +7673,13 @@ async function generateAreaInstructions(options) {
         sessionError = getSessionError(errorMsg);
       }
     });
-    const prompt = `Analyze the "${area.name}" area of this codebase and generate an area instruction file.
+    const prompt = `/area-instructions Analyze the "${area.name}" area of this codebase and generate an area instruction file.
 
 This area covers files matching: ${applyToStr}
 ${area.description ? `Description: ${area.description}` : ""}
-
-Use tools to explore ONLY the files and directories within this area:
-1. List the key files: glob for ${applyToPatterns.map((p) => `"${p}"`).join(", ")}
-2. Identify the tech stack, dependencies, and frameworks used in this area
-3. Look at key source files to understand patterns and conventions specific to this area
-
-Generate concise instructions (~10-30 lines) covering:
-- What this area does and its role in the overall project
-- Area-specific tech stack, dependencies, and frameworks
-- Coding conventions and patterns specific to this area
-- Build/test commands relevant to this area (if different from root)
-- Key files and directory structure within this area
-
-IMPORTANT:
-- Focus ONLY on this specific area, not the whole repo
-- Do NOT repeat repo-wide information (that goes in the root copilot-instructions.md)
-- Keep it complementary to root instructions
-${existingSection ? `- Do NOT duplicate content already covered by existing instruction files
-${existingSection}` : ""}
-- When you have the complete markdown content, call the \`emit_file_content\` tool with it. Do NOT output the file content directly in chat.`;
+${existingSection ? `
+Do NOT duplicate content already covered by existing instruction files
+${existingSection}` : ""}`;
     progress(`Analyzing area "${area.name}"...`);
     let sendError;
     try {
@@ -7724,7 +7716,7 @@ ${body}
 `;
 }
 function areaInstructionPath(repoPath, area) {
-  return path6.join(
+  return path7.join(
     repoPath,
     ".github",
     "instructions",
@@ -7734,7 +7726,7 @@ function areaInstructionPath(repoPath, area) {
 async function writeAreaInstruction(repoPath, area, body, force) {
   const filePath = areaInstructionPath(repoPath, area);
   if (!body.trim()) return { status: "empty", filePath };
-  await ensureDir(path6.dirname(filePath));
+  await ensureDir(path7.dirname(filePath));
   const { wrote, reason } = await safeWriteFile(
     filePath,
     buildAreaInstructionContent(area, body),
@@ -7746,13 +7738,13 @@ async function writeAreaInstruction(repoPath, area, body, force) {
   return { status: "written", filePath };
 }
 async function writeInstructionFile(repoPath, relativePath, content, force) {
-  const resolvedRoot = path6.resolve(repoPath);
-  const filePath = path6.resolve(repoPath, relativePath);
-  if (!filePath.startsWith(resolvedRoot + path6.sep) && filePath !== resolvedRoot) {
+  const resolvedRoot = path7.resolve(repoPath);
+  const filePath = path7.resolve(repoPath, relativePath);
+  if (!filePath.startsWith(resolvedRoot + path7.sep) && filePath !== resolvedRoot) {
     throw new Error(`Invalid path: escapes repository root (${relativePath})`);
   }
   if (!content.trim()) return { status: "empty", filePath };
-  await ensureDir(path6.dirname(filePath));
+  await ensureDir(path7.dirname(filePath));
   const { wrote, reason } = await safeWriteFile(filePath, content, Boolean(force));
   if (!wrote) {
     return { status: reason === "symlink" ? "symlink" : "skipped", filePath };
@@ -7836,6 +7828,7 @@ async function generateNestedHub(client, options) {
   const existingCtx = await detectExistingInstructions(options.repoPath, options.detailDir);
   const existingSection = buildExistingInstructionsSection(existingCtx);
   const { tool: emitTool, getContent } = await createEmitTool();
+  const nestedSkillDir = getSkillDirectory("nested-hub");
   const session = await client.createSession({
     model,
     streaming: true,
@@ -7846,7 +7839,8 @@ async function generateNestedHub(client, options) {
     tools: [emitTool],
     excludedTools: INSTRUCTION_GENERATION_EXCLUDED_TOOLS,
     onPermissionRequest: READ_ONLY_PERMISSION_HANDLER,
-    infiniteSessions: { enabled: false }
+    infiniteSessions: { enabled: false },
+    skillDirectories: [nestedSkillDir]
   });
   await trySetAutopilot(session);
   let content = "";
@@ -7878,29 +7872,14 @@ ${options.childAreas.map((c) => `- ${c.name} (${c.path ?? "unknown path"})`).joi
 Include a "## Sub-Projects" section with links to each child's AGENTS.md.` : "";
   const parentContext = options.area?.parentArea ? `
 This is a sub-project of "${options.area.parentArea}". Include a note linking back to the parent area.` : "";
-  const prompt = `Analyze this codebase and generate a lean AGENTS.md hub file (~90-120 lines).${areaContext}${parentContext}
-
-Use tools to explore the codebase structure, tech stack, and conventions.
+  const prompt = `/nested-hub Generate a lean AGENTS.md hub file (~90-120 lines).${areaContext}${parentContext}
 
-The hub should contain:
-- Project overview and purpose
-- Key concepts and architecture
-- Coding conventions and guardrails
-- A "## Detailed Instructions" section listing links to detail files in \`${options.detailDir}/\`${childContext}
+Detail files go in \`${options.detailDir}/\`.${childContext}
 
-At the END of your output, emit a fenced JSON block with recommended topics for detail files:
-\`\`\`json
-[{"slug":"testing","title":"Testing Guide","description":"How to write and run tests"},{"slug":"architecture","title":"Architecture","description":"Codebase structure and patterns"}]
-\`\`\`
-
-Recommend 3-5 topics that would benefit from deep-dive detail files. Each slug becomes a filename: \`${options.detailDir}/{slug}.md\`.
-
-IMPORTANT:
-- Keep the hub LEAN \u2014 overview and guardrails only, details go in separate files
-- The JSON block will be parsed and removed from the final output
-${existingSection ? `- Do NOT duplicate content from existing instruction files
-${existingSection}` : ""}
-- When you have the complete markdown content (including the trailing JSON topic block), call the \`emit_file_content\` tool with it. Do NOT output the content directly in chat.`;
+Recommend 3-5 topics for deep-dive detail files. Each slug becomes: \`${options.detailDir}/{slug}.md\`.
+${existingSection ? `
+Do NOT duplicate content from existing instruction files
+${existingSection}` : ""}`;
   let sendError;
   try {
     await session.sendAndWait({ prompt }, 18e4);
@@ -7924,6 +7903,7 @@ async function generateNestedDetail(client, options) {
   });
   const model = options.model ?? DEFAULT_MODEL;
   const { tool: emitTool, getContent } = await createEmitTool();
+  const detailSkillDir = getSkillDirectory("nested-detail");
   const session = await client.createSession({
     model,
     streaming: true,
@@ -7934,7 +7914,8 @@ async function generateNestedDetail(client, options) {
     tools: [emitTool],
     excludedTools: INSTRUCTION_GENERATION_EXCLUDED_TOOLS,
     onPermissionRequest: READ_ONLY_PERMISSION_HANDLER,
-    infiniteSessions: { enabled: false }
+    infiniteSessions: { enabled: false },
+    skillDirectories: [detailSkillDir]
   });
   await trySetAutopilot(session);
   let content = "";
@@ -7956,22 +7937,11 @@ async function generateNestedDetail(client, options) {
     }
   });
   const areaContext = options.area ? `Focus on the "${options.area.name}" area (files matching: ${Array.isArray(options.area.applyTo) ? options.area.applyTo.join(", ") : options.area.applyTo}).` : "Focus on the entire repository.";
-  const prompt = `Generate a deep-dive instruction file about "${options.topic.title}" for this codebase.
+  const prompt = `/nested-detail Generate a deep-dive instruction file about "${options.topic.title}" for this codebase.
 ${areaContext}
 
 Topic: ${options.topic.title}
-Description: ${options.topic.description}
-
-Use tools to explore the codebase and understand the specific patterns, APIs, and conventions related to this topic.
-
-The file should:
-- Start with \`# ${options.topic.title}\`
-- Include \`**When to read:** {one-line trigger condition}\` right after the heading
-- Cover ~50-100 lines of practical, actionable guidance
-- Include code patterns and examples found in the actual codebase
-- Be specific to this codebase, not generic advice
-
-When you have the complete markdown content, call the \`emit_file_content\` tool with it. Do NOT output the content directly in chat.`;
+Description: ${options.topic.description}`;
   let sendError;
   try {
     await session.sendAndWait({ prompt }, 18e4);
@@ -8006,7 +7976,7 @@ async function generateNestedInstructions(options) {
       onProgress: options.onProgress
     });
     const basePath = options.area?.path ?? ".";
-    const hubRelativePath = path6.join(basePath, "AGENTS.md");
+    const hubRelativePath = path7.join(basePath, "AGENTS.md");
     let finalHubContent = hubContent;
     if (options.area) {
       finalHubContent = `${buildAreaFrontmatter(options.area)}
@@ -8030,7 +8000,7 @@ ${hubContent}`;
         });
         if (detailContent) {
           result.details.push({
-            relativePath: path6.join(basePath, options.detailDir, `${topic.slug}.md`),
+            relativePath: path7.join(basePath, options.detailDir, `${topic.slug}.md`),
             content: detailContent,
             topic: topic.title
           });
@@ -8045,7 +8015,7 @@ ${hubContent}`;
     }
     if (options.claudeMd) {
       result.claudeMd = {
-        relativePath: path6.join(basePath, "CLAUDE.md"),
+        relativePath: path7.join(basePath, "CLAUDE.md"),
         content: "@AGENTS.md\n"
       };
     }
@@ -8068,11 +8038,11 @@ async function generateNestedAreaInstructions(options) {
 
 // packages/core/src/services/readiness.ts
 import fs7 from "fs/promises";
-import path8 from "path";
+import path9 from "path";
 
 // packages/core/src/services/policy.ts
 import fs6 from "fs/promises";
-import path7 from "path";
+import path8 from "path";
 var DEFAULT_PASS_RATE = 0.8;
 function validatePolicyConfig(obj, source, format = "module") {
   if (typeof obj !== "object" || obj === null) {
@@ -8165,8 +8135,8 @@ function parsePolicySources(raw) {
 }
 async function loadPolicy(source, options) {
   const jsonOnly = options?.jsonOnly ?? false;
-  if (source.startsWith(".") || path7.isAbsolute(source)) {
-    const resolved = path7.resolve(source);
+  if (source.startsWith(".") || path8.isAbsolute(source)) {
+    const resolved = path8.resolve(source);
     if (resolved.endsWith(".json")) {
       const data = await readJson(resolved);
       if (!data) {
@@ -8797,7 +8767,7 @@ async function runReadinessReport(options) {
   const repoPath = options.repoPath;
   const analysis = await analyzeRepo(repoPath);
   const rootFiles = await safeReadDir(repoPath);
-  const rootPackageJson = await readJson(path8.join(repoPath, "package.json"));
+  const rootPackageJson = await readJson(path9.join(repoPath, "package.json"));
   const apps = analysis.apps?.length ? analysis.apps : [];
   const context = {
     repoPath,
@@ -9106,7 +9076,7 @@ function buildCriteria() {
       impact: "medium",
       effort: "low",
       check: async (context) => {
-        const found = await fileExists(path8.join(context.repoPath, "CONTRIBUTING.md"));
+        const found = await fileExists(path9.join(context.repoPath, "CONTRIBUTING.md"));
         return {
           status: found ? "pass" : "fail",
           reason: found ? void 0 : "Missing CONTRIBUTING.md for contributor workflows."
@@ -9207,7 +9177,7 @@ function buildCriteria() {
       impact: "high",
       effort: "low",
       check: async (context) => {
-        const found = await fileExists(path8.join(context.repoPath, "SECURITY.md"));
+        const found = await fileExists(path9.join(context.repoPath, "SECURITY.md"));
         return {
           status: found ? "pass" : "fail",
           reason: found ? void 0 : "Missing SECURITY.md policy."
@@ -9223,7 +9193,7 @@ function buildCriteria() {
       impact: "medium",
       effort: "medium",
       check: async (context) => {
-        const found = await fileExists(path8.join(context.repoPath, ".github", "dependabot.yml"));
+        const found = await fileExists(path9.join(context.repoPath, ".github", "dependabot.yml"));
         return {
           status: found ? "pass" : "fail",
           reason: found ? void 0 : "Missing .github/dependabot.yml configuration."
@@ -9429,7 +9399,7 @@ function buildCriteria() {
         if (area?.scripts?.build) {
           return { status: "pass" };
         }
-        const pkgPath = path8.join(context.areaPath, "package.json");
+        const pkgPath = path9.join(context.areaPath, "package.json");
         const pkg = await readJson(pkgPath);
         const scripts = pkg?.scripts ?? {};
         const found = Boolean(scripts.build);
@@ -9454,7 +9424,7 @@ function buildCriteria() {
         if (area?.scripts?.test) {
           return { status: "pass" };
         }
-        const pkgPath = path8.join(context.areaPath, "package.json");
+        const pkgPath = path9.join(context.areaPath, "package.json");
         const pkg = await readJson(pkgPath);
         const scripts = pkg?.scripts ?? {};
         const found = Boolean(scripts.test);
@@ -9477,7 +9447,7 @@ function buildCriteria() {
           return { status: "skip", reason: "No area context." };
         }
         const sanitized = sanitizeAreaName(area.name);
-        const instructionPath = path8.join(
+        const instructionPath = path9.join(
           context.repoPath,
           ".github",
           "instructions",
@@ -9498,7 +9468,7 @@ function buildExtras() {
       id: "agents-doc",
       title: "AGENTS.md present",
       check: async (context) => {
-        const found = await fileExists(path8.join(context.repoPath, "AGENTS.md"));
+        const found = await fileExists(path9.join(context.repoPath, "AGENTS.md"));
         return {
           status: found ? "pass" : "fail",
           reason: found ? void 0 : "Missing AGENTS.md to guide coding agents."
@@ -9663,11 +9633,11 @@ async function hasTypecheckConfig(repoPath) {
   ]);
 }
 async function hasGithubWorkflows(repoPath) {
-  return fileExists(path8.join(repoPath, ".github", "workflows"));
+  return fileExists(path9.join(repoPath, ".github", "workflows"));
 }
 async function hasCodeowners(repoPath) {
-  const root = await fileExists(path8.join(repoPath, "CODEOWNERS"));
-  const github = await fileExists(path8.join(repoPath, ".github", "CODEOWNERS"));
+  const root = await fileExists(path9.join(repoPath, "CODEOWNERS"));
+  const github = await fileExists(path9.join(repoPath, ".github", "CODEOWNERS"));
   return root || github;
 }
 async function hasLicense(repoPath) {
@@ -9675,9 +9645,9 @@ async function hasLicense(repoPath) {
   return files.some((file) => file.toLowerCase().startsWith("license"));
 }
 async function hasPullRequestTemplate(repoPath) {
-  const direct = await fileExists(path8.join(repoPath, ".github", "PULL_REQUEST_TEMPLATE.md"));
+  const direct = await fileExists(path9.join(repoPath, ".github", "PULL_REQUEST_TEMPLATE.md"));
   if (direct) return true;
-  const dir = path8.join(repoPath, ".github", "PULL_REQUEST_TEMPLATE");
+  const dir = path9.join(repoPath, ".github", "PULL_REQUEST_TEMPLATE");
   try {
     const entries = await fs7.readdir(dir);
     return entries.some((entry) => entry.toLowerCase().endsWith(".md"));
@@ -9686,14 +9656,14 @@ async function hasPullRequestTemplate(repoPath) {
   }
 }
 async function hasPrecommitConfig(repoPath) {
-  const precommit = await fileExists(path8.join(repoPath, ".pre-commit-config.yaml"));
+  const precommit = await fileExists(path9.join(repoPath, ".pre-commit-config.yaml"));
   if (precommit) return true;
-  return fileExists(path8.join(repoPath, ".husky"));
+  return fileExists(path9.join(repoPath, ".husky"));
 }
 async function hasArchitectureDoc(repoPath) {
   const files = await safeReadDir(repoPath);
   if (files.some((file) => file.toLowerCase() === "architecture.md")) return true;
-  return fileExists(path8.join(repoPath, "docs", "architecture.md"));
+  return fileExists(path9.join(repoPath, "docs", "architecture.md"));
 }
 async function hasCustomInstructions(repoPath) {
   const found = [];
@@ -9710,14 +9680,14 @@ async function hasCustomInstructions(repoPath) {
     "copilot-instructions.md"
   ];
   for (const candidate of candidates) {
-    if (await fileExists(path8.join(repoPath, candidate))) {
+    if (await fileExists(path9.join(repoPath, candidate))) {
       found.push(candidate);
     }
   }
   return found;
 }
 async function hasFileBasedInstructions(repoPath) {
-  const instructionsDir = path8.join(repoPath, ".github", "instructions");
+  const instructionsDir = path9.join(repoPath, ".github", "instructions");
   try {
     const entries = await fs7.readdir(instructionsDir);
     return entries.filter((e) => e.endsWith(".instructions.md")).map((e) => `.github/instructions/${e}`);
@@ -9745,7 +9715,7 @@ async function checkInstructionConsistency(repoPath, foundFiles) {
   }
   const realPathMap = /* @__PURE__ */ new Map();
   for (const file of foundFiles) {
-    const fullPath = path8.join(repoPath, file);
+    const fullPath = path9.join(repoPath, file);
     try {
       const real = await fs7.realpath(fullPath);
       const group = realPathMap.get(real) ?? [];
@@ -9762,7 +9732,7 @@ async function checkInstructionConsistency(repoPath, foundFiles) {
   const contents = [];
   for (const group of groups) {
     try {
-      contents.push(await fs7.readFile(path8.join(repoPath, group[0]), "utf8"));
+      contents.push(await fs7.readFile(path9.join(repoPath, group[0]), "utf8"));
     } catch {
       contents.push("");
     }
@@ -9781,17 +9751,17 @@ async function checkInstructionConsistency(repoPath, foundFiles) {
 }
 async function hasMcpConfig(repoPath) {
   const found = [];
-  if (await fileExists(path8.join(repoPath, ".vscode", "mcp.json"))) {
+  if (await fileExists(path9.join(repoPath, ".vscode", "mcp.json"))) {
     found.push(".vscode/mcp.json");
   }
-  if (await fileExists(path8.join(repoPath, "mcp.json"))) {
+  if (await fileExists(path9.join(repoPath, "mcp.json"))) {
     found.push("mcp.json");
   }
-  const settings = await readJson(path8.join(repoPath, ".vscode", "settings.json"));
+  const settings = await readJson(path9.join(repoPath, ".vscode", "settings.json"));
   if (settings && (settings["mcp"] || settings["github.copilot.chat.mcp.enabled"])) {
     found.push(".vscode/settings.json (mcp section)");
   }
-  if (await fileExists(path8.join(repoPath, ".claude", "mcp.json"))) {
+  if (await fileExists(path9.join(repoPath, ".claude", "mcp.json"))) {
     found.push(".claude/mcp.json");
   }
   return found;
@@ -9800,13 +9770,13 @@ async function hasCustomAgents(repoPath) {
   const found = [];
   const agentDirs = [".github/agents", ".copilot/agents", ".github/copilot/agents"];
   for (const dir of agentDirs) {
-    if (await fileExists(path8.join(repoPath, dir))) {
+    if (await fileExists(path9.join(repoPath, dir))) {
       found.push(dir);
     }
   }
   const agentFiles = [".github/copilot-agents.yml", ".github/copilot-agents.yaml"];
   for (const agentFile of agentFiles) {
-    if (await fileExists(path8.join(repoPath, agentFile))) {
+    if (await fileExists(path9.join(repoPath, agentFile))) {
       found.push(agentFile);
     }
   }
@@ -9821,7 +9791,7 @@ async function hasCopilotSkills(repoPath) {
     ".github/copilot/skills"
   ];
   for (const dir of skillDirs) {
-    if (await fileExists(path8.join(repoPath, dir))) {
+    if (await fileExists(path9.join(repoPath, dir))) {
       found.push(dir);
     }
   }
@@ -9874,7 +9844,7 @@ async function processRepo(params) {
   } = params;
   try {
     progress?.update(`${label}: Cloning...`);
-    const cacheRoot = path9.join(process.cwd(), ".agentrc-cache");
+    const cacheRoot = path10.join(process.cwd(), ".agentrc-cache");
     const repoPath = validateCachePath(cacheRoot, ...cacheParts);
     await ensureDir(repoPath);
     if (!await isGitRepo(repoPath)) {
@@ -9900,8 +9870,8 @@ async function processRepo(params) {
     if (!instructions.trim()) {
       throw new Error("Generated instructions were empty");
     }
-    const instructionsPath = path9.join(repoPath, ".github", "copilot-instructions.md");
-    await ensureDir(path9.dirname(instructionsPath));
+    const instructionsPath = path10.join(repoPath, ".github", "copilot-instructions.md");
+    await ensureDir(path10.dirname(instructionsPath));
     const { wrote, reason } = await safeWriteFile(instructionsPath, instructions, true);
     if (!wrote) {
       throw new Error(
@@ -10038,7 +10008,7 @@ async function processBatchReadinessRepo(options) {
   try {
     progress(`Cloning ${repo.fullName}...`);
     const authedUrl = buildAuthedUrl(repo.cloneUrl, token, "github");
-    await ensureDir(path9.dirname(repoDir));
+    await ensureDir(path10.dirname(repoDir));
     await cloneRepo(authedUrl, repoDir, { shallow: true });
     await setRemoteUrl(repoDir, repo.cloneUrl).catch(() => {
     });
@@ -11088,7 +11058,7 @@ import { render as render2 } from "ink";
 // src/ui/BatchReadinessTui.tsx
 import fs8 from "fs/promises";
 import os from "os";
-import path10 from "path";
+import path11 from "path";
 
 // packages/core/src/services/visualReport.ts
 function generateVisualReport(options) {
@@ -12114,7 +12084,7 @@ function BatchReadinessTui({ token, outputPath, policies }) {
     setStatus("processing");
     const selectedRepos = Array.from(selectedRepoIndices).map((i) => repos[i]);
     const results2 = [];
-    const tmpDir = path10.join(os.tmpdir(), `agentrc-batch-readiness-${Date.now()}`);
+    const tmpDir = path11.join(os.tmpdir(), `agentrc-batch-readiness-${Date.now()}`);
     try {
       await ensureDir(tmpDir);
       for (let i = 0; i < selectedRepos.length; i++) {
@@ -12151,7 +12121,7 @@ function BatchReadinessTui({ token, outputPath, policies }) {
         title: "Batch Readiness Report",
         generatedAt: (/* @__PURE__ */ new Date()).toISOString()
       });
-      const finalOutputPath = outputPath ?? path10.join(process.cwd(), "batch-readiness-report.html");
+      const finalOutputPath = outputPath ?? path11.join(process.cwd(), "batch-readiness-report.html");
       const { wrote, reason } = await safeWriteFile(finalOutputPath, html, true);
       if (!wrote) throw new Error(reason === "symlink" ? "Path is a symlink" : "Write failed");
       setStatus("complete");
@@ -12333,7 +12303,7 @@ async function batchReadinessCommand(options) {
 }
 
 // src/commands/eval.ts
-import path12 from "path";
+import path13 from "path";
 
 // packages/core/src/services/evalScaffold.ts
 var EVAL_SCAFFOLD_TIMEOUT_MS = 6e5;
@@ -12516,17 +12486,17 @@ function normalizeEvalConfig(parsed, count) {
 
 // packages/core/src/services/evaluator.ts
 import fs9 from "fs/promises";
-import path11 from "path";
+import path12 from "path";
 var DEFAULT_SYSTEM_MESSAGE = "You are answering questions about this repository. Use tools to inspect the repo and cite its files. Avoid generic Copilot CLI details unless the prompt explicitly asks for them.";
 async function runEval(options) {
   const config = await loadConfig(options.configPath);
   const instructionFile = config.instructionFile ?? ".github/copilot-instructions.md";
-  const instructionPath = path11.resolve(options.repoPath, instructionFile);
+  const instructionPath = path12.resolve(options.repoPath, instructionFile);
   const instructionText = await readOptionalFile(instructionPath);
   const baseSystemMessage = config.systemMessage ?? DEFAULT_SYSTEM_MESSAGE;
   const progress = options.onProgress ?? (() => {
   });
-  const defaultOutputPath = path11.resolve(
+  const defaultOutputPath = path12.resolve(
     options.repoPath,
     ".agentrc",
     "evals",
@@ -12546,9 +12516,9 @@ async function runEval(options) {
       const caseStartedAt = Date.now();
       let caseWorkingDir;
       if (testCase.workingDirectory) {
-        const resolved = path11.resolve(options.repoPath, testCase.workingDirectory);
-        const root = path11.resolve(options.repoPath);
-        if (resolved !== root && !resolved.startsWith(root + path11.sep)) {
+        const resolved = path12.resolve(options.repoPath, testCase.workingDirectory);
+        const root = path12.resolve(options.repoPath);
+        if (resolved !== root && !resolved.startsWith(root + path12.sep)) {
           throw new Error(
             `Invalid workingDirectory "${testCase.workingDirectory}": escapes repo boundary`
           );
@@ -12620,7 +12590,7 @@ async function runEval(options) {
     };
     let viewerPath;
     if (outputPath) {
-      await fs9.mkdir(path11.dirname(outputPath), { recursive: true });
+      await fs9.mkdir(path12.dirname(outputPath), { recursive: true });
       await safeWriteFile(outputPath, JSON.stringify(output, null, 2), true);
       viewerPath = buildViewerPath(outputPath);
       await safeWriteFile(viewerPath, buildTrajectoryViewerHtml(output), true);
@@ -12934,7 +12904,7 @@ function formatTokenUsage(usage) {
 function resolveOutputPath(repoPath, override, configValue) {
   const chosen = override ?? configValue;
   if (!chosen) return void 0;
-  return path11.isAbsolute(chosen) ? chosen : path11.resolve(repoPath, chosen);
+  return path12.isAbsolute(chosen) ? chosen : path12.resolve(repoPath, chosen);
 }
 function buildViewerPath(outputPath) {
   if (outputPath.endsWith(".json")) {
@@ -13289,7 +13259,7 @@ function sanitizeValue(value, depth) {
 
 // src/commands/eval.ts
 async function evalCommand(configPathArg, options) {
-  const repoPath = path12.resolve(options.repo ?? process.cwd());
+  const repoPath = path13.resolve(options.repo ?? process.cwd());
   if (options.listModels) {
     try {
       const models = await listCopilotModels();
@@ -13325,7 +13295,7 @@ async function evalCommand(configPathArg, options) {
     return;
   }
   if (options.init) {
-    const outputPath = path12.join(repoPath, "agentrc.eval.json");
+    const outputPath = path13.join(repoPath, "agentrc.eval.json");
     const desiredCount = Math.max(1, Number.parseInt(options.count ?? "5", 10) || 5);
     try {
       const progress = createProgressReporter(!shouldLog(options));
@@ -13367,7 +13337,7 @@ async function evalCommand(configPathArg, options) {
     }
     return;
   }
-  const configPath = path12.resolve(configPathArg ?? path12.join(repoPath, "agentrc.eval.json"));
+  const configPath = path13.resolve(configPathArg ?? path13.join(repoPath, "agentrc.eval.json"));
   try {
     const progress = createProgressReporter(!shouldLog(options));
     const { summary, results, viewerPath } = await runEval({
@@ -13414,30 +13384,30 @@ async function evalCommand(configPathArg, options) {
 }
 
 // src/commands/generate.ts
-import path15 from "path";
+import path16 from "path";
 
 // packages/core/src/services/generator.ts
-import path13 from "path";
+import path14 from "path";
 async function generateConfigs(options) {
   const { repoPath, analysis, selections, force } = options;
   const files = [];
   if (selections.includes("mcp")) {
-    const filePath = path13.join(repoPath, ".vscode", "mcp.json");
-    await ensureDir(path13.dirname(filePath));
+    const filePath = path14.join(repoPath, ".vscode", "mcp.json");
+    await ensureDir(path14.dirname(filePath));
     const content = renderMcp();
     const { wrote } = await safeWriteFile(filePath, content, force);
     files.push({
-      path: path13.relative(process.cwd(), filePath),
+      path: path14.relative(process.cwd(), filePath),
       action: wrote ? "wrote" : "skipped"
     });
   }
   if (selections.includes("vscode")) {
-    const filePath = path13.join(repoPath, ".vscode", "settings.json");
-    await ensureDir(path13.dirname(filePath));
+    const filePath = path14.join(repoPath, ".vscode", "settings.json");
+    await ensureDir(path14.dirname(filePath));
     const content = renderVscodeSettings(analysis);
     const { wrote } = await safeWriteFile(filePath, content, force);
     files.push({
-      path: path13.relative(process.cwd(), filePath),
+      path: path14.relative(process.cwd(), filePath),
       action: wrote ? "wrote" : "skipped"
     });
   }
@@ -13488,16 +13458,16 @@ function renderVscodeSettings(analysis) {
 }
 
 // src/commands/instructions.ts
-import path14 from "path";
+import path15 from "path";
 function skipReason(action) {
   if (action === "symlink") return "symlink";
   if (action === "empty") return "empty content";
   return "exists, use --force";
 }
 async function instructionsCommand(options) {
-  const repoPath = path14.resolve(options.repo ?? process.cwd());
-  const outputPath = path14.resolve(
-    options.output ?? path14.join(repoPath, ".github", "copilot-instructions.md")
+  const repoPath = path15.resolve(options.repo ?? process.cwd());
+  const outputPath = path15.resolve(
+    options.output ?? path15.join(repoPath, ".github", "copilot-instructions.md")
   );
   const progress = createProgressReporter(!shouldLog(options));
   const wantAreas = options.areas || options.areasOnly || options.area;
@@ -13544,7 +13514,7 @@ async function instructionsCommand(options) {
               ] : []
             ];
             for (const file of dryFiles) {
-              const relPath = path14.relative(process.cwd(), path14.join(repoPath, file.path));
+              const relPath = path15.relative(process.cwd(), path15.join(repoPath, file.path));
               if (shouldLog(options)) {
                 progress.update(
                   `[dry-run] Would write ${relPath} (${Buffer.byteLength(file.content, "utf8")} bytes)`
@@ -13565,7 +13535,7 @@ async function instructionsCommand(options) {
           } else {
             const actions = await writeNestedInstructions(repoPath, nestedResult, options.force);
             for (const action of actions) {
-              const relPath = path14.relative(process.cwd(), action.path);
+              const relPath = path15.relative(process.cwd(), action.path);
               if (action.action === "wrote") {
                 if (shouldLog(options)) progress.succeed(`Wrote ${relPath}`);
               } else if (shouldLog(options)) {
@@ -13608,8 +13578,8 @@ async function instructionsCommand(options) {
         }
         if (content) {
           if (options.dryRun) {
-            const relPath = path14.relative(repoPath, outputPath);
-            const displayPath = path14.relative(process.cwd(), outputPath);
+            const relPath = path15.relative(repoPath, outputPath);
+            const displayPath = path15.relative(process.cwd(), outputPath);
             const byteCount = Buffer.byteLength(content, "utf8");
             if (shouldLog(options)) {
               progress.update(`[dry-run] Would write ${displayPath} (${byteCount} bytes)`);
@@ -13618,14 +13588,14 @@ async function instructionsCommand(options) {
               dryRunFiles.push({ path: relPath, bytes: byteCount });
             }
           } else {
-            await ensureDir(path14.dirname(outputPath));
+            await ensureDir(path15.dirname(outputPath));
             const { wrote, reason } = await safeWriteFile(
               outputPath,
               content,
               Boolean(options.force)
             );
             if (!wrote) {
-              const relPath = path14.relative(process.cwd(), outputPath);
+              const relPath = path15.relative(process.cwd(), outputPath);
               const why = reason === "symlink" ? "path is a symlink" : "file exists (use --force)";
               if (options.json) {
                 const result = {
@@ -13647,7 +13617,7 @@ async function instructionsCommand(options) {
                 };
                 outputResult(result, true);
               } else if (shouldLog(options)) {
-                progress.succeed(`Updated ${path14.relative(process.cwd(), outputPath)}`);
+                progress.succeed(`Updated ${path15.relative(process.cwd(), outputPath)}`);
               }
             }
           }
@@ -13714,7 +13684,7 @@ async function instructionsCommand(options) {
                 ] : []
               ];
               for (const file of dryFiles) {
-                const relPath = path14.relative(process.cwd(), path14.join(repoPath, file.path));
+                const relPath = path15.relative(process.cwd(), path15.join(repoPath, file.path));
                 if (shouldLog(options)) {
                   progress.update(
                     `[dry-run] Would write ${relPath} (${Buffer.byteLength(file.content, "utf8")} bytes)`
@@ -13732,7 +13702,7 @@ async function instructionsCommand(options) {
             } else {
               const actions = await writeNestedInstructions(repoPath, nestedResult, options.force);
               for (const action of actions) {
-                const relPath = path14.relative(process.cwd(), action.path);
+                const relPath = path15.relative(process.cwd(), action.path);
                 if (action.action === "wrote") {
                   if (shouldLog(options)) progress.succeed(`Wrote ${relPath}`);
                 } else if (shouldLog(options)) {
@@ -13764,7 +13734,7 @@ async function instructionsCommand(options) {
               }
               if (options.json) {
                 dryRunFiles.push({
-                  path: path14.relative(repoPath, areaInstructionPath(repoPath, area)),
+                  path: path15.relative(repoPath, areaInstructionPath(repoPath, area)),
                   bytes: Buffer.byteLength(body, "utf8")
                 });
               }
@@ -13785,7 +13755,7 @@ async function instructionsCommand(options) {
                 continue;
               }
               if (shouldLog(options)) {
-                progress.succeed(`Wrote ${path14.relative(process.cwd(), result.filePath)}`);
+                progress.succeed(`Wrote ${path15.relative(process.cwd(), result.filePath)}`);
               }
             }
           }
@@ -13820,7 +13790,7 @@ async function instructionsCommand(options) {
 
 // src/commands/generate.ts
 async function generateCommand(type, repoPathArg, options) {
-  const repoPath = path15.resolve(repoPathArg ?? process.cwd());
+  const repoPath = path16.resolve(repoPathArg ?? process.cwd());
   if (type === "instructions" || type === "agents") {
     if (!options.quiet) {
       process.stderr.write(
@@ -13834,7 +13804,7 @@ async function generateCommand(type, repoPathArg, options) {
 `
       );
     }
-    const output = type === "agents" ? path15.join(repoPath, "AGENTS.md") : void 0;
+    const output = type === "agents" ? path16.join(repoPath, "AGENTS.md") : void 0;
     await instructionsCommand({
       repo: repoPath,
       output,
@@ -13896,10 +13866,37 @@ async function generateCommand(type, repoPathArg, options) {
 }
 
 // src/commands/init.ts
-import path16 from "path";
+import path18 from "path";
+
+// packages/core/src/services/configScaffold.ts
+import path17 from "path";
+async function scaffoldAgentrcConfig(repoPath, areas, force = false) {
+  if (areas.length === 0) return null;
+  const configPath = path17.join(repoPath, "agentrc.config.json");
+  const workspaces = await detectWorkspaces(repoPath, areas);
+  const workspacePaths = workspaces.map((ws) => ws.path + "/");
+  const standaloneAreas = areas.filter((a) => {
+    if (!a.path) return true;
+    const rel = path17.relative(repoPath, a.path).replace(/\\/gu, "/");
+    return !workspacePaths.some((prefix) => rel.startsWith(prefix));
+  }).map((a) => ({
+    name: a.name,
+    applyTo: a.applyTo,
+    ...a.description ? { description: a.description } : {}
+  }));
+  const agentrcConfig = {};
+  if (workspaces.length > 0) agentrcConfig.workspaces = workspaces;
+  if (standaloneAreas.length > 0) agentrcConfig.areas = standaloneAreas;
+  if (!agentrcConfig.workspaces && !agentrcConfig.areas) return null;
+  const configContent = JSON.stringify(agentrcConfig, null, 2) + "\n";
+  const { wrote } = await safeWriteFile(configPath, configContent, force);
+  return { wrote, configPath };
+}
+
+// src/commands/init.ts
 import { checkbox, select } from "@inquirer/prompts";
 async function initCommand(repoPathArg, options) {
-  let repoPath = path16.resolve(repoPathArg ?? process.cwd());
+  let repoPath = path18.resolve(repoPathArg ?? process.cwd());
   const provider = options.provider ?? (options.github ? "github" : void 0);
   if (provider && provider !== "github" && provider !== "azure") {
     outputError("Invalid provider. Use github or azure.", Boolean(options.json));
@@ -13937,7 +13934,7 @@ async function initCommand(repoPathArg, options) {
         value: repo
       }))
     });
-    const cacheRoot = path16.join(process.cwd(), ".agentrc-cache");
+    const cacheRoot = path18.join(process.cwd(), ".agentrc-cache");
     repoPath = validateCachePath(cacheRoot, selection.owner, selection.name);
     await ensureDir(repoPath);
     const hasGit = await isGitRepo(repoPath);
@@ -13990,7 +13987,7 @@ async function initCommand(repoPathArg, options) {
         value: repo
       }))
     });
-    const cacheRoot = path16.join(process.cwd(), ".agentrc-cache");
+    const cacheRoot = path18.join(process.cwd(), ".agentrc-cache");
     repoPath = validateCachePath(
       cacheRoot,
       orgSelection.name,
@@ -14029,17 +14026,17 @@ async function initCommand(repoPathArg, options) {
   });
   const allFiles = [];
   if (selections.includes("instructions")) {
-    const outputPath = path16.join(repoPath, ".github", "copilot-instructions.md");
-    await ensureDir(path16.dirname(outputPath));
+    const outputPath = path18.join(repoPath, ".github", "copilot-instructions.md");
+    await ensureDir(path18.dirname(outputPath));
     try {
       const content = await generateCopilotInstructions({ repoPath, model: options.model });
       const { wrote } = await safeWriteFile(outputPath, content, Boolean(options.force));
       allFiles.push({
-        path: path16.relative(process.cwd(), outputPath),
+        path: path18.relative(process.cwd(), outputPath),
         action: wrote ? "wrote" : "skipped"
       });
       if (shouldLog(options)) {
-        const rel = path16.relative(process.cwd(), outputPath);
+        const rel = path18.relative(process.cwd(), outputPath);
         process.stderr.write((wrote ? `Wrote ${rel}` : `Skipped ${rel} (exists)`) + "\n");
       }
     } catch (error) {
@@ -14067,28 +14064,12 @@ async function initCommand(repoPathArg, options) {
   }
   allFiles.push(...genResult.files);
   if (analysis.areas && analysis.areas.length > 0) {
-    const configPath = path16.join(repoPath, "agentrc.config.json");
-    const workspaces = await detectWorkspaces(repoPath, analysis.areas);
-    const workspacePaths = workspaces.map((ws) => ws.path + "/");
-    const standaloneAreas = analysis.areas.filter((a) => {
-      if (!a.path) return true;
-      const rel = path16.relative(repoPath, a.path).replace(/\\/gu, "/");
-      return !workspacePaths.some((prefix) => rel.startsWith(prefix));
-    }).map((a) => ({
-      name: a.name,
-      applyTo: a.applyTo,
-      ...a.description ? { description: a.description } : {}
-    }));
-    const agentrcConfig = {};
-    if (workspaces.length > 0) agentrcConfig.workspaces = workspaces;
-    if (standaloneAreas.length > 0) agentrcConfig.areas = standaloneAreas;
-    if (agentrcConfig.workspaces || agentrcConfig.areas) {
-      const configContent = JSON.stringify(agentrcConfig, null, 2) + "\n";
-      const { wrote } = await safeWriteFile(configPath, configContent, Boolean(options.force));
-      const rel = path16.relative(process.cwd(), configPath);
-      allFiles.push({ path: rel, action: wrote ? "wrote" : "skipped" });
+    const result = await scaffoldAgentrcConfig(repoPath, analysis.areas, Boolean(options.force));
+    if (result) {
+      const rel = path18.relative(process.cwd(), result.configPath);
+      allFiles.push({ path: rel, action: result.wrote ? "wrote" : "skipped" });
       if (shouldLog(options)) {
-        process.stderr.write((wrote ? `Wrote ${rel}` : `Skipped ${rel} (exists)`) + "\n");
+        process.stderr.write((result.wrote ? `Wrote ${rel}` : `Skipped ${rel} (exists)`) + "\n");
       }
     }
   }
@@ -14115,7 +14096,7 @@ async function initCommand(repoPathArg, options) {
 }
 
 // src/commands/pr.ts
-import path17 from "path";
+import path19 from "path";
 var DEFAULT_PR_BRANCH = "agentrc/add-ai-config";
 async function prCommand(repo, options) {
   const provider = options.provider ?? "github";
@@ -14149,7 +14130,7 @@ async function prCommand(repo, options) {
     try {
       progress.update("Fetching repo info...");
       const repoInfo = await getRepo(token2, organization, project, name2);
-      const cacheRoot = path17.join(process.cwd(), ".agentrc-cache");
+      const cacheRoot = path19.join(process.cwd(), ".agentrc-cache");
       const repoPath = validateCachePath(cacheRoot, organization, project, name2);
       await ensureDir(repoPath);
       if (!await isGitRepo(repoPath)) {
@@ -14163,8 +14144,8 @@ async function prCommand(repo, options) {
       await checkoutBranch(repoPath, branch);
       progress.update("Generating instructions...");
       const instructions = await generateCopilotInstructions({ repoPath, model: options.model });
-      const instructionsPath = path17.join(repoPath, ".github", "copilot-instructions.md");
-      await ensureDir(path17.dirname(instructionsPath));
+      const instructionsPath = path19.join(repoPath, ".github", "copilot-instructions.md");
+      await ensureDir(path19.dirname(instructionsPath));
       const { wrote, reason } = await safeWriteFile(instructionsPath, instructions, true);
       if (!wrote) {
         throw new Error(
@@ -14231,7 +14212,7 @@ async function prCommand(repo, options) {
   try {
     progress.update("Fetching repo info...");
     const repoInfo = await getRepo2(token, owner, name);
-    const cacheRoot = path17.join(process.cwd(), ".agentrc-cache");
+    const cacheRoot = path19.join(process.cwd(), ".agentrc-cache");
     const repoPath = validateCachePath(cacheRoot, owner, name);
     await ensureDir(repoPath);
     if (!await isGitRepo(repoPath)) {
@@ -14243,8 +14224,8 @@ async function prCommand(repo, options) {
     await checkoutBranch(repoPath, branch);
     progress.update("Generating instructions...");
     const instructions = await generateCopilotInstructions({ repoPath, model: options.model });
-    const instructionsPath = path17.join(repoPath, ".github", "copilot-instructions.md");
-    await ensureDir(path17.dirname(instructionsPath));
+    const instructionsPath = path19.join(repoPath, ".github", "copilot-instructions.md");
+    await ensureDir(path19.dirname(instructionsPath));
     const { wrote, reason } = await safeWriteFile(instructionsPath, instructions, true);
     if (!wrote) {
       throw new Error(
@@ -14293,13 +14274,13 @@ async function prCommand(repo, options) {
 }
 
 // src/commands/readiness.ts
-import path18 from "path";
+import path20 from "path";
 import chalk3 from "chalk";
 async function readinessCommand(repoPathArg, options) {
-  const repoPath = path18.resolve(repoPathArg ?? process.cwd());
-  const repoName = path18.basename(repoPath);
-  const resolvedOutputPath = options.output ? path18.resolve(options.output) : "";
-  const outputExt = options.output ? path18.extname(options.output).toLowerCase() : "";
+  const repoPath = path20.resolve(repoPathArg ?? process.cwd());
+  const repoName = path20.basename(repoPath);
+  const resolvedOutputPath = options.output ? path20.resolve(options.output) : "";
+  const outputExt = options.output ? path20.extname(options.output).toLowerCase() : "";
   let failLevelError;
   let report;
   try {
@@ -14361,7 +14342,7 @@ async function readinessCommand(repoPathArg, options) {
       title: `Readiness Report: ${repoName}`,
       generatedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
-    const outputPath = options.output ? resolvedOutputPath : path18.join(repoPath, "readiness-report.html");
+    const outputPath = options.output ? resolvedOutputPath : path20.join(repoPath, "readiness-report.html");
     const { wrote, reason } = await safeWriteFile(outputPath, html, Boolean(options.force));
     if (!wrote) {
       const why = reason === "symlink" ? "path is a symlink" : "file exists (use --force)";
@@ -14596,26 +14577,32 @@ function formatReadinessMarkdown(report, repoName) {
 }
 
 // src/commands/tui.tsx
-import path20 from "path";
+import path22 from "path";
 import { render as render3 } from "ink";
 
 // src/ui/tui.tsx
 import fs10 from "fs/promises";
-import path19 from "path";
+import path21 from "path";
 import { Box as Box5, Text as Text5, useApp as useApp4, useInput as useInput4, useStdout, useIsScreenReaderEnabled as useIsScreenReaderEnabled5 } from "ink";
 import { useEffect as useEffect5, useMemo, useState as useState5 } from "react";
 import { Fragment, jsx as jsx7, jsxs as jsxs4 } from "react/jsx-runtime";
 var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 function useTerminalColumns() {
   const { stdout } = useStdout();
+  const accessible = useIsScreenReaderEnabled5();
   const [columns, setColumns] = useState5(stdout.columns ?? 80);
   useEffect5(() => {
-    const onResize = () => setColumns(stdout.columns ?? 80);
-    stdout.on("resize", onResize);
+    const onResize = () => {
+      if (!accessible) {
+        stdout.write("\x1B[2J\x1B[H");
+      }
+      setColumns(stdout.columns ?? 80);
+    };
+    stdout.prependListener("resize", onResize);
     return () => {
       stdout.off("resize", onResize);
     };
-  }, [stdout]);
+  }, [stdout, accessible]);
   return columns;
 }
 function useSpinner(active) {
@@ -14700,6 +14687,7 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
   const [modelPickTarget, setModelPickTarget] = useState5("eval");
   const [modelCursor, setModelCursor] = useState5(0);
   const [hasEvalConfig, setHasEvalConfig] = useState5(null);
+  const [hasAgentrcConfig, setHasAgentrcConfig] = useState5(null);
   const [activityLog, setActivityLog] = useState5([]);
   const [generateTarget, setGenerateTarget] = useState5(
     "copilot-instructions"
@@ -14709,7 +14697,7 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
   const [isMonorepo, setIsMonorepo] = useState5(false);
   const [repoAreas, setRepoAreas] = useState5([]);
   const [areaCursor, setAreaCursor] = useState5(0);
-  const repoLabel = useMemo(() => path19.basename(repoPath), [repoPath]);
+  const repoLabel = useMemo(() => path21.basename(repoPath), [repoPath]);
   const repoFull = useMemo(() => repoPath, [repoPath]);
   const isLoading = status === "generating" || status === "bootstrapping" || status === "evaluating" || status === "generating-areas" || status === "readiness-running";
   const isMenu = status === "model-pick" || status === "eval-pick" || status === "batch-pick" || status === "generate-pick" || status === "generate-app-pick" || status === "generate-area-pick";
@@ -14721,14 +14709,24 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
     setStatus("idle");
   };
   useEffect5(() => {
-    const configPath = path19.join(repoPath, "agentrc.eval.json");
+    const configPath = path21.join(repoPath, "agentrc.eval.json");
     fs10.access(configPath).then(() => setHasEvalConfig(true)).catch(() => setHasEvalConfig(false));
+    const agentrcConfigCandidates = [
+      path21.join(repoPath, "agentrc.config.json"),
+      path21.join(repoPath, ".github", "agentrc.config.json")
+    ];
+    Promise.all(
+      agentrcConfigCandidates.map(
+        (p) => fs10.access(p).then(() => true).catch(() => false)
+      )
+    ).then((results) => setHasAgentrcConfig(results.some(Boolean))).catch(() => setHasAgentrcConfig(false));
     analyzeRepo(repoPath).then((analysis) => {
       const apps = analysis.apps ?? [];
       setRepoApps(apps);
       setIsMonorepo(analysis.isMonorepo ?? false);
       setRepoAreas(analysis.areas ?? []);
     }).catch((err) => {
+      setRepoAreas([]);
       addLog(`Repo analysis failed: ${err instanceof Error ? err.message : "unknown"}`, "error");
     });
   }, [repoPath]);
@@ -14782,7 +14780,7 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
   };
   useEffect5(() => {
     let active = true;
-    const configPath = path19.join(repoPath, "agentrc.eval.json");
+    const configPath = path21.join(repoPath, "agentrc.eval.json");
     fs10.readFile(configPath, "utf8").then((raw) => {
       if (!active) return;
       const parsed = JSON.parse(raw);
@@ -14797,7 +14795,7 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
     };
   }, [repoPath]);
   const bootstrapEvalConfig = async (count, force) => {
-    const configPath = path19.join(repoPath, "agentrc.eval.json");
+    const configPath = path21.join(repoPath, "agentrc.eval.json");
     try {
       setStatus("bootstrapping");
       setMessage("Generating eval cases with Copilot SDK...");
@@ -14836,13 +14834,13 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
           if (status === "preview") {
             if (input.toLowerCase() === "s") {
               try {
-                const outputPath = generateSavePath || path19.join(repoPath, ".github", "copilot-instructions.md");
-                await fs10.mkdir(path19.dirname(outputPath), { recursive: true });
+                const outputPath = generateSavePath || path21.join(repoPath, ".github", "copilot-instructions.md");
+                await fs10.mkdir(path21.dirname(outputPath), { recursive: true });
                 const { wrote, reason } = await safeWriteFile(outputPath, generatedContent, true);
                 if (!wrote)
                   throw new Error(reason === "symlink" ? "Path is a symlink" : "Write failed");
                 setStatus("done");
-                const relPath = path19.relative(repoPath, outputPath);
+                const relPath = path21.relative(repoPath, outputPath);
                 const msg = `Saved to ${relPath}`;
                 setMessage(msg);
                 addLog(msg, "success");
@@ -14876,7 +14874,7 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
                 setMessage("Enter a positive number of eval cases, then press Enter.");
                 return;
               }
-              const configPath = path19.join(repoPath, "agentrc.eval.json");
+              const configPath = path21.join(repoPath, "agentrc.eval.json");
               setEvalBootstrapCount(count);
               try {
                 await fs10.access(configPath);
@@ -14935,7 +14933,7 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
                 setStatus("generate-app-pick");
                 setMessage("Generate for root or per-app?");
               } else {
-                const savePath = path19.join(repoPath, ".github", "copilot-instructions.md");
+                const savePath = path21.join(repoPath, ".github", "copilot-instructions.md");
                 setGenerateSavePath(savePath);
                 await doGenerate(repoPath, savePath, "copilot-instructions");
               }
@@ -14947,7 +14945,7 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
                 setStatus("generate-app-pick");
                 setMessage("Generate for root or per-app?");
               } else {
-                const savePath = path19.join(repoPath, "AGENTS.md");
+                const savePath = path21.join(repoPath, "AGENTS.md");
                 setGenerateSavePath(savePath);
                 await doGenerate(repoPath, savePath, "agents-md");
               }
@@ -14972,7 +14970,7 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
           }
           if (status === "generate-app-pick") {
             if (input.toLowerCase() === "r") {
-              const savePath = generateTarget === "copilot-instructions" ? path19.join(repoPath, ".github", "copilot-instructions.md") : path19.join(repoPath, "AGENTS.md");
+              const savePath = generateTarget === "copilot-instructions" ? path21.join(repoPath, ".github", "copilot-instructions.md") : path21.join(repoPath, "AGENTS.md");
               setGenerateSavePath(savePath);
               await doGenerate(repoPath, savePath, generateTarget);
               return;
@@ -14982,7 +14980,7 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
               addLog(`Generating ${generateTarget} for ${repoApps.length} apps...`, "progress");
               let count = 0;
               for (const app2 of repoApps) {
-                const savePath = generateTarget === "copilot-instructions" ? path19.join(app2.path, ".github", "copilot-instructions.md") : path19.join(app2.path, "AGENTS.md");
+                const savePath = generateTarget === "copilot-instructions" ? path21.join(app2.path, ".github", "copilot-instructions.md") : path21.join(app2.path, "AGENTS.md");
                 setMessage(`Generating for ${app2.name} (${count + 1}/${repoApps.length})...`);
                 try {
                   const content = await generateCopilotInstructions({
@@ -14990,11 +14988,11 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
                     onProgress: (msg) => setMessage(`${app2.name}: ${msg}`)
                   });
                   if (content.trim()) {
-                    await fs10.mkdir(path19.dirname(savePath), { recursive: true });
+                    await fs10.mkdir(path21.dirname(savePath), { recursive: true });
                     const { wrote: saved } = await safeWriteFile(savePath, content, true);
                     if (!saved) continue;
                     count++;
-                    addLog(`${app2.name}: saved ${path19.basename(savePath)}`, "success");
+                    addLog(`${app2.name}: saved ${path21.basename(savePath)}`, "success");
                   }
                 } catch (error) {
                   const msg = error instanceof Error ? error.message : "Failed.";
@@ -15008,7 +15006,7 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
             const num = Number.parseInt(input, 10);
             if (Number.isFinite(num) && num >= 1 && num <= repoApps.length) {
               const app2 = repoApps[num - 1];
-              const savePath = generateTarget === "copilot-instructions" ? path19.join(app2.path, ".github", "copilot-instructions.md") : path19.join(app2.path, "AGENTS.md");
+              const savePath = generateTarget === "copilot-instructions" ? path21.join(app2.path, ".github", "copilot-instructions.md") : path21.join(app2.path, "AGENTS.md");
               setGenerateSavePath(savePath);
               await doGenerate(app2.path, savePath, generateTarget);
               return;
@@ -15036,7 +15034,7 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
                   const result = await writeAreaInstruction(repoPath, area, body);
                   if (result.status === "written") {
                     written++;
-                    addLog(`${area.name}: saved ${path19.basename(result.filePath)}`, "success");
+                    addLog(`${area.name}: saved ${path21.basename(result.filePath)}`, "success");
                   } else if (result.status === "skipped") {
                     addLog(`${area.name}: skipped (file exists)`, "info");
                   }
@@ -15130,8 +15128,8 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
           }
           if (status === "eval-pick") {
             if (input.toLowerCase() === "r") {
-              const configPath = path19.join(repoPath, "agentrc.eval.json");
-              const outputPath = path19.join(
+              const configPath = path21.join(repoPath, "agentrc.eval.json");
+              const outputPath = path21.join(
                 repoPath,
                 ".agentrc",
                 "evals",
@@ -15275,6 +15273,44 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
               setMessage("Select eval action.");
               return;
             }
+            if (input.toLowerCase() === "c") {
+              if (hasAgentrcConfig) {
+                setMessage("agentrc.config.json already exists.");
+                return;
+              }
+              if (repoAreas.length === 0) {
+                setMessage("No areas detected. Cannot scaffold agentrc.config.json.");
+                return;
+              }
+              setStatus("generating");
+              setMessage("Creating agentrc.config.json...");
+              addLog("Scaffolding agentrc.config.json...", "progress");
+              try {
+                const result = await scaffoldAgentrcConfig(repoPath, repoAreas);
+                if (!result) {
+                  setStatus("idle");
+                  setMessage("Nothing to scaffold \u2014 no areas or workspaces detected.");
+                  addLog("No areas to scaffold into config.", "info");
+                } else if (result.wrote) {
+                  setHasAgentrcConfig(true);
+                  setStatus("done");
+                  const msg = `Created agentrc.config.json`;
+                  setMessage(msg);
+                  addLog(msg, "success");
+                } else {
+                  setHasAgentrcConfig(true);
+                  setStatus("idle");
+                  setMessage("agentrc.config.json already exists (skipped).");
+                  addLog("agentrc.config.json already exists.", "info");
+                }
+              } catch (error) {
+                setStatus("error");
+                const msg = error instanceof Error ? error.message : "Failed to create config.";
+                setMessage(msg);
+                addLog(msg, "error");
+              }
+              return;
+            }
             if (input.toLowerCase() === "m") {
               if (hideModelPicker) {
                 setMessage(
@@ -15389,6 +15425,10 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
           /* @__PURE__ */ jsxs4(Text5, { children: [
             /* @__PURE__ */ jsx7(Text5, { color: "gray", children: "Eval " }),
             hasEvalConfig === null ? /* @__PURE__ */ jsx7(Text5, { color: "gray", dimColor: true, children: "checking..." }) : hasEvalConfig ? /* @__PURE__ */ jsx7(Text5, { color: "green", children: "agentrc.eval.json found" }) : /* @__PURE__ */ jsx7(Text5, { color: "yellow", children: "no eval config \u2014 press [I] to create" })
+          ] }),
+          /* @__PURE__ */ jsxs4(Text5, { children: [
+            /* @__PURE__ */ jsx7(Text5, { color: "gray", children: "Config " }),
+            hasAgentrcConfig === null ? /* @__PURE__ */ jsx7(Text5, { color: "gray", dimColor: true, children: "checking..." }) : hasAgentrcConfig ? /* @__PURE__ */ jsx7(Text5, { color: "green", children: "agentrc.config.json found" }) : /* @__PURE__ */ jsx7(Text5, { color: "yellow", children: "no config \u2014 press [C] to create" })
           ] })
         ] }),
         /* @__PURE__ */ jsx7(Divider, { columns: terminalColumns, label: "Activity", accessible }),
@@ -15464,7 +15504,7 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
             /* @__PURE__ */ jsx7(Text5, { color: "white", children: app2.name }),
             /* @__PURE__ */ jsxs4(Text5, { color: "gray", dimColor: true, children: [
               " ",
-              path19.relative(repoPath, app2.path)
+              path21.relative(repoPath, app2.path)
             ] })
           ] }, app2.name)) })
         ] }),
@@ -15498,7 +15538,7 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
             children: [
               /* @__PURE__ */ jsxs4(Text5, { color: "cyan", bold: true, children: [
                 "Preview (",
-                path19.relative(repoPath, generateSavePath) || generateTarget,
+                path21.relative(repoPath, generateSavePath) || generateTarget,
                 ")"
               ] }),
               /* @__PURE__ */ jsx7(Text5, { color: "gray", children: truncatedPreview })
@@ -15595,6 +15635,7 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
           /* @__PURE__ */ jsxs4(Box5, { children: [
             /* @__PURE__ */ jsx7(KeyHint, { k: "M", label: "Model" }),
             /* @__PURE__ */ jsx7(KeyHint, { k: "J", label: "Judge" }),
+            hasAgentrcConfig === false && /* @__PURE__ */ jsx7(KeyHint, { k: "C", label: "Create config" }),
             /* @__PURE__ */ jsx7(KeyHint, { k: "Q", label: "Quit" })
           ] })
         ] }) })
@@ -15606,7 +15647,7 @@ function AgentRCTui({ repoPath, skipAnimation = false }) {
 // src/commands/tui.tsx
 import { jsx as jsx8 } from "react/jsx-runtime";
 async function tuiCommand(options) {
-  const repoPath = path20.resolve(options.repo ?? process.cwd());
+  const repoPath = path22.resolve(options.repo ?? process.cwd());
   const skipAnimation = options.animation === false;
   try {
     const accessible = options.accessible ? true : void 0;