@geraldmaron/construct 1.2.3 → 1.3.1

package/lib/embed/recommendation-store.mjs

@@ -24,8 +24,9 @@ import { cxDir } from '../paths.mjs';
 const DEFAULT_SUPPRESS_DAYS = 7;
 const SUPERSEDE_WITHIN_HOURS = 72;
 
-function recommendationPaths() {
-  const storeDir = join(cxDir(), 'intake');
+function recommendationPaths({ rootDir, project } = {}) {
+  const baseDir = rootDir || project;
+  const storeDir = baseDir ? join(baseDir, '.cx', 'intake') : join(cxDir(), 'intake');
   return {
     storeDir,
     logFile: join(storeDir, 'recommendations.jsonl'),
@@ -36,16 +37,16 @@ function recommendationPaths() {
 /**
  * Ensure store directory exists.
  */
-function ensureDir() {
-  const { storeDir } = recommendationPaths();
+function ensureDir(opts = {}) {
+  const { storeDir } = recommendationPaths(opts);
   if (!existsSync(storeDir)) mkdirSync(storeDir, { recursive: true });
 }
 
 /**
  * Read the index (fast lookup).
  */
-function readIndex() {
-  const { indexFile } = recommendationPaths();
+function readIndex(opts = {}) {
+  const { indexFile } = recommendationPaths(opts);
   if (!existsSync(indexFile)) return {};
   try {
     return JSON.parse(readFileSync(indexFile, 'utf8'));
@@ -57,9 +58,9 @@ function readIndex() {
 /**
  * Write the index.
  */
-function writeIndex(index) {
-  const { indexFile } = recommendationPaths();
-  ensureDir();
+function writeIndex(index, opts = {}) {
+  const { indexFile } = recommendationPaths(opts);
+  ensureDir(opts);
   writeFileSync(indexFile, JSON.stringify(index, null, 2) + '\n');
 }
 
@@ -86,9 +87,10 @@ function dedupKey(type, title) {
 export function createRecommendation({ type, title, reason, signalCount = 1, customerImpact = 0, recencyBonus = 0, strategicBonus = 0, sourceSignalIds = [], lane, project, env }) {
   if (!type || !title) throw new Error('type and title are required');
 
-  ensureDir();
+  const pathOpts = { rootDir: project };
+  ensureDir(pathOpts);
   const key = dedupKey(type, title);
-  const index = readIndex();
+  const index = readIndex(pathOpts);
 
   if (index[key]) {
     const existing = index[key];
@@ -106,7 +108,7 @@ export function createRecommendation({ type, title, reason, signalCount = 1, cus
       updated.score = score;
       updated.priority = priorityTier(score);
       index[key] = updated;
-      writeIndex(index);
+      writeIndex(index, pathOpts);
 
       return { id: existing.id, dedupKey: key, priority: updated.priority, score, existing: true, updatedAt: updated.lastSeen };
     }
@@ -139,10 +141,10 @@ export function createRecommendation({ type, title, reason, signalCount = 1, cus
     enrichedBy: null,
   };
 
-  appendFileSync(recommendationPaths().logFile, JSON.stringify(rec) + '\n', 'utf8');
+  appendFileSync(recommendationPaths(pathOpts).logFile, JSON.stringify(rec) + '\n', 'utf8');
 
   index[key] = rec;
-  writeIndex(index);
+  writeIndex(index, pathOpts);
 
   emitBestEffort('recommendation.generated', {
     project: project || '',
@@ -202,7 +204,7 @@ export function supersedeRecommendation(dedupKey, supersedingId) {
  * List active recommendations (filesystem-only).
  */
 export function listActiveRecommendations({ type, priority, limit = 20, project, env } = {}) {
-  const index = readIndex();
+  const index = readIndex({ rootDir: project });
   const now = new Date();
   let results = Object.values(index).filter(rec => {
     if (rec.dismissedAt) {
@@ -222,8 +224,9 @@ export function listActiveRecommendations({ type, priority, limit = 20, project,
     .slice(0, limit);
 }
 
-export function autoSuppressStale() {
-  const index = readIndex();
+export function autoSuppressStale({ project } = {}) {
+  const pathOpts = { rootDir: project };
+  const index = readIndex(pathOpts);
   const now = Date.now();
   let suppressed = 0;
 
@@ -255,7 +258,7 @@ export function autoSuppressStale() {
     }
   }
 
-  if (suppressed) writeIndex(index);
+  if (suppressed) writeIndex(index, pathOpts);
   return suppressed;
 }
 
@@ -291,8 +294,8 @@ export function reviveRecommendation(dedupKey, { signalCount = 1, sourceSignalId
   return { success: true };
 }
 
-export function recommendationStats() {
-  const index = readIndex();
+export function recommendationStats({ project } = {}) {
+  const index = readIndex({ rootDir: project });
   const entries = Object.values(index);
   const byPriority = {};
   let active = 0, dismissed = 0, superseded = 0;
@@ -314,9 +317,9 @@ export function recommendationStats() {
   };
 }
 
-export function isRecommendationActive(type, title) {
+export function isRecommendationActive(type, title, { project } = {}) {
   const key = dedupKey(type, title);
-  const index = readIndex();
+  const index = readIndex({ rootDir: project });
   const rec = index[key];
   if (!rec) return { active: false, existing: null };
   if (rec.dismissedAt || rec.supersededAt) return { active: false, existing: rec };

package/lib/embed/role-framing.mjs

@@ -7,22 +7,17 @@
  *   3. Renders a "Role Lens" section for inclusion in snapshots/roadmaps
  */
 
-import { readFileSync } from 'node:fs';
-import { join, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const REGISTRY_PATH = join(__dirname, '..', '..', 'specialists', 'registry.json');
+import { loadRegistry as loadAssembledRegistry } from '../registry/loader.mjs';
 
 let _registryCache = null;
 
 function loadRegistry() {
   if (_registryCache) return _registryCache;
   try {
-    _registryCache = JSON.parse(readFileSync(REGISTRY_PATH, 'utf8'));
+    _registryCache = loadAssembledRegistry();
   } catch (err) {
     process.stderr.write('[role-framing.mjs] loadRegistry: ' + (err?.message ?? String(err)) + '\n');
-    _registryCache = { specialists: [] };
+    _registryCache = { specialists: {} };
   }
   return _registryCache;
 }
@@ -35,7 +30,7 @@ function loadRegistry() {
 export function getOrientation(roleName) {
   if (!roleName) return null;
   const registry = loadRegistry();
-  const agent = (registry.specialists ?? []).find((a) => a.name === roleName);
+  const agent = Object.values(registry.specialists ?? {}).find((a) => a.name === roleName);
   return agent?.embedOrientation ?? null;
 }
 

package/lib/embedded-contract/capability.mjs

@@ -23,6 +23,7 @@ import { resolveModelTiers } from '../model-registry.mjs';
 import { readSkillFrontmatter } from '../sync/skill-frontmatter.mjs';
 import { loadPluginRegistry } from '../plugin-registry.mjs';
 import { listWorkflowDefs } from './workflow-defs.mjs';
+import { loadRegistry } from '../registry/loader.mjs';
 import { APPROVAL_MODES } from './audit.mjs';
 
 const REPO_ROOT = join(dirname(fileURLToPath(import.meta.url)), '..', '..');
@@ -111,8 +112,9 @@ function buildModels(env) {
 
 function buildPolicies(rootDir, warnings) {
   try {
-    const raw = JSON.parse(readFileSync(join(rootDir, 'specialists', 'policy-inventory.json'), 'utf8'));
-    const arr = Array.isArray(raw) ? raw : (raw.policies || Object.values(raw));
+    const registry = loadRegistry({ rootDir, skipValidation: true });
+    const policies = registry.policies || {};
+    const arr = Array.isArray(policies) ? policies : Object.values(policies);
     return arr.map((p) => ({ id: p.id, enforcement: p.enforcement, mode: p.mode, description: p.description }));
   } catch (err) {
     warnings.push(`Policy inventory unavailable: ${err.message}`);

package/lib/embedded-contract/contract-version.mjs

@@ -8,7 +8,7 @@
  * CONTRACT_VERSION so an embedding application can negotiate compatibility
  * without reading internal registries.
  *
- * Distinct from specialists/contracts.json `version` (handoff contracts) and
+ * Distinct from specialists/org `version` (handoff contracts) and
  * lib/plugin-registry.mjs `MANIFEST_VERSION` (plugin manifests); those version
  * unrelated internal surfaces.
  */

package/lib/env-config.mjs

@@ -88,7 +88,7 @@ const ENV_SHADOW_IGNORE = new Set([
  */
 const ENV_SHADOW_WARN = new Set([
   'OPENROUTER_API_KEY', 'ANTHROPIC_API_KEY', 'OPENAI_API_KEY',
-  'DASHBOARD_PORT', 'MEMORY_PORT', 'BRIDGE_PORT',
+  'MEMORY_PORT', 'BRIDGE_PORT',
   'CONSTRUCT_INSTANCE_ID',
   'CONSTRUCT_DEPLOYMENT_MODE',
 ]);
@@ -155,7 +155,7 @@ export function loadConstructEnv({ rootDir, homeDir = os.homedir(), env = proces
   }
 
   // process.env is the base; .env-file values override shell values so that
-  // credentials set in the dashboard always win over stale shell exports.
+  // credentials set in config.env always win over stale shell exports.
   // Materialized credentials from `op run` (or an explicit export) win over stored
   // op:// references so one 1Password auth per invocation is enough.
   const merged = { ...env, ...fileEnv };

package/lib/flavors/loader.mjs

@@ -2,12 +2,12 @@
  * lib/flavors/loader.mjs — Role flavor overlay loader and validator.
  *
  * Reads frontmatter from skills/roles/<role>.<flavor>.md files, exposes:
- *   - listFlavors(role?, profile?) — overlays that apply to role and profile
+ *   - listFlavors(role?, scope?) — overlays that apply to role and scope
  *   - validateFlavor(path) — frontmatter conformance check against the schema
- *   - perRoleFlavorCount(profile) — flavor counts per role for cap enforcement
+ *   - perRoleFlavorCount(scope) — flavor counts per role for cap enforcement
  *
- * The cap is enforced at sync time and in lint-profiles.
- * Six flavors per role per profile is the current ceiling; bumping requires
+ * The cap is enforced at sync time and in lint-scopes.
+ * Six flavors per role per scope is the current ceiling; bumping requires
  * an ADR. Existing roles like qa already have 6, so the cap is set tight.
  */
 import fs from 'node:fs';
@@ -18,7 +18,8 @@ const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
 const REPO_ROOT = path.resolve(MODULE_DIR, '..', '..');
 const FLAVORS_DIR = path.join(REPO_ROOT, 'skills', 'roles');
 
-export const FLAVOR_CAP_PER_ROLE_PER_PROFILE = 6;
+export const FLAVOR_CAP_PER_ROLE_PER_SCOPE = 6;
+export const FLAVOR_CAP_PER_ROLE_PER_PROFILE = FLAVOR_CAP_PER_ROLE_PER_SCOPE;
 
 // Files may start with an HTML comment block before the YAML frontmatter.
 // The /m flag lets ^ match line-start so we find the YAML wherever it sits.
@@ -79,30 +80,26 @@ export function listAllFlavors() {
  * Return overlays that match the given role (any-flavor for that role) and
  * apply to the given profile. Pass undefined for either to skip that filter.
  */
-export function listFlavors({ role, profile } = {}) {
+export function listFlavors({ role, scope, profile } = {}) {
+  const scopeId = scope ?? profile;
   return listAllFlavors().filter(({ frontmatter }) => {
     if (role) {
       const roleId = frontmatter.role || '';
       const baseRole = roleId.split('.')[0];
       if (baseRole !== role && roleId !== role) return false;
     }
-    if (profile) {
-      const profiles = frontmatter.profiles;
-      if (!Array.isArray(profiles) || profiles.length === 0) return true;
-      if (!profiles.includes(profile)) return false;
+    if (scopeId) {
+      const scopes = frontmatter.scopes ?? frontmatter.profiles;
+      if (!Array.isArray(scopes) || scopes.length === 0) return true;
+      if (!scopes.includes(scopeId)) return false;
     }
     return true;
   });
 }
 
-/**
- * Count flavor overlays per base role for a given profile.
- * Returns { [baseRole]: count }. Excludes the canonical base file (e.g.
- * architect.md) so only true flavors count toward the cap.
- */
-export function perRoleFlavorCount(profile = 'rnd') {
+export function perRoleFlavorCount(scope = 'rnd') {
   const counts = {};
-  for (const entry of listFlavors({ profile })) {
+  for (const entry of listFlavors({ scope })) {
     const roleId = entry.frontmatter.role || '';
     const isFlavor = roleId.includes('.');
     if (!isFlavor) continue;
@@ -129,8 +126,13 @@ export function validateFlavor(filePath) {
   if (!Array.isArray(fm.applies_to) || fm.applies_to.length === 0) {
     errors.push(`${filePath}: applies_to must be a non-empty array`);
   }
-  if (!Array.isArray(fm.profiles) || fm.profiles.length === 0) {
-    errors.push(`${filePath}: profiles must be a non-empty array; add a frontmatter line like \`profiles: [rnd]\``);
+  if (!Array.isArray(fm.scopes) && !Array.isArray(fm.profiles)) {
+    errors.push(`${filePath}: scopes must be a non-empty array; add \`scopes: [rnd]\``);
+  } else {
+    const scopes = fm.scopes ?? fm.profiles;
+    if (!Array.isArray(scopes) || scopes.length === 0) {
+      errors.push(`${filePath}: scopes must be a non-empty array; add \`scopes: [rnd]\``);
+    }
   }
   return errors;
 }

package/lib/graph/build-from-registry.mjs

@@ -3,7 +3,7 @@
  * authoritative declarative catalogs.
  *
  * Ingests registry/capabilities.json, lib/embedded-contract/workflow-defs.mjs,
- * and specialists/contracts.json into typed nodes and directed edges:
+ * and specialists/org into typed nodes and directed edges:
  *   capability --embeds-->     workflow      (embeddedWorkflow)
  *   test       --validates-->  capability    (verification.functional / hostEmulation / per-surface test)
  *   capability --uses-->       skill | rule  (skill + dependencies.skills/.rules)
@@ -16,6 +16,7 @@
  */
 
 import { existsSync, readFileSync, statSync } from 'node:fs';
+import { loadRegistry } from '../registry/loader.mjs';
 import path from 'node:path';
 import { createHash } from 'node:crypto';
 
@@ -31,6 +32,23 @@ function existsRel(rootDir, rel) {
   return !!rel && existsSync(path.join(rootDir, rel));
 }
 
+function declarationImplFiles(cap, rootDir) {
+  const files = [];
+  if (cap.kind === 'workflow') {
+    files.push('lib/embedded-contract/workflow-invoke.mjs', 'lib/embedded-contract/workflow-defs.mjs');
+  }
+  if (cap.kind === 'document-type') {
+    files.push('lib/artifact-release-gate.mjs', 'lib/artifact-manifest.mjs');
+  }
+  if (cap.id === 'ingest.docling') {
+    files.push('lib/document-extract/docling-client.mjs', 'lib/ingest/docling-remote.mjs');
+  }
+  if (cap.id === 'mcp.tool-budget.trim') {
+    files.push('lib/mcp/tool-budget.mjs');
+  }
+  return [...new Set(files.filter((rel) => existsRel(rootDir, rel)))];
+}
+
 function hashFiles(rootDir, rels) {
   const h = createHash('sha256');
   for (const rel of rels) {
@@ -66,11 +84,11 @@ export function buildFromRegistry({ rootDir }) {
     });
   }
 
-  const contractsDoc = readJsonSafe(path.join(rootDir, 'specialists', 'contracts.json'));
-  for (const c of contractsDoc?.contracts ?? []) {
-    if (!c?.id) continue;
-    node('contract', c.id, c.id, { producer: c.producer ?? null, consumer: c.consumer ?? null });
-  }
+  const contractsDoc = loadRegistry({ rootDir });
+   for (const { id, producer, consumer } of Object.values(contractsDoc?.contracts ?? {})) {
+     if (!id) continue;
+     node('contract', id, id, { producer: producer ?? null, consumer: consumer ?? null });
+   }
 
   const registry = loadCapabilityRegistry({ rootDir });
   for (const cap of registry.capabilities ?? []) {
@@ -122,11 +140,17 @@ export function buildFromRegistry({ rootDir }) {
       node('contract', cid, cid, {});
       edge(capNode, 'governed_by', nodeId('contract', cid));
     }
+
+    for (const implRel of declarationImplFiles(cap, rootDir)) {
+      const fileNode = nodeId('file', implRel);
+      node('file', implRel, implRel, { path: implRel, exists: true, source: 'declaration' });
+      edge(fileNode, 'realizes', capNode);
+    }
   }
 
   const sourceHash = hashFiles(rootDir, [
     'registry/capabilities.json',
-    'specialists/contracts.json',
+    'specialists/org',
     'lib/embedded-contract/workflow-defs.mjs',
   ]);
 

package/lib/graph/staleness.mjs

@@ -11,7 +11,7 @@ import { loadGraph } from './store.mjs';
 
 export const GRAPH_SEED_FILES = [
   'registry/capabilities.json',
-  'specialists/contracts.json',
+  'specialists/org',
   'lib/embedded-contract/workflow-defs.mjs',
 ];
 

package/lib/headhunt.mjs

@@ -13,15 +13,19 @@ import os from 'node:os';
 import path from 'node:path';
 import { createInterface } from 'node:readline';
 import { selectOption } from './tty-prompts.mjs';
+import { resolveActiveScope } from './scopes/loader.mjs';
+import { classifyObjectiveForScope } from './scopes/teams.mjs';
+import { loadRegistry } from './registry/loader.mjs';
 
 const OVERLAY_DIRNAME = 'domain-overlays';
 const PROMOTION_DIRNAME = 'promotion-requests';
-const TEAMS_FILE = 'specialists/teams.json';
 
 function loadTeamTemplates(root) {
   try {
-    const teamsPath = path.join(root, TEAMS_FILE);
-    return JSON.parse(fs.readFileSync(teamsPath, 'utf8'));
+    const registry = loadRegistry({ rootDir: root });
+    return {
+      templates: registry.teams || {},
+    };
   } catch {
     return null;
   }
@@ -63,37 +67,70 @@ function promptQuestion(rl, question) {
   return new Promise((resolve) => rl.question(question, resolve));
 }
 
-function classifyOverlay(objective = '', explicitTeam = '') {
+export function classifyOverlay(objective = '', explicitTeam = '', { cwd = process.cwd() } = {}) {
   if (explicitTeam) {
     return {
       focus: 'custom',
       attachTo: explicitTeam.split(',').map((value) => value.trim()).filter(Boolean),
+      teamFocus: 'custom-team',
     };
   }
 
+  const profile = resolveActiveScope(cwd);
+  const profileMatch = classifyObjectiveForScope(objective, profile);
+  if (profileMatch) return profileMatch;
+
   const text = objective.toLowerCase();
+  
+  // NEW: Team-first classification returns both team id and specialist roles
   if (/security|policy|compliance|secrets|iam|threat|audit/.test(text)) {
-    return { focus: 'security', attachTo: ['cx-security', 'cx-architect'] };
+    return {
+      focus: 'security',
+      attachTo: ['cx-security', 'cx-architect'],
+      teamFocus: 'governance-group',
+      recommendedTeam: 'governance-group',
+    };
   }
   if (/implement|build|module|deploy|pipeline|ci\/cd|apply|code/.test(text)) {
-    return { focus: 'implementation', attachTo: ['cx-engineer', 'cx-architect'] };
+    return {
+      focus: 'implementation',
+      attachTo: ['cx-engineer', 'cx-architect'],
+      teamFocus: 'engineering-group',
+      recommendedTeam: 'engineering-group',
+    };
   }
   if (/runbook|docs|documentation|guide|onboard/.test(text)) {
-    return { focus: 'documentation', attachTo: ['cx-docs-keeper', 'cx-researcher'] };
+    return {
+      focus: 'documentation',
+      attachTo: ['cx-docs-keeper', 'cx-researcher'],
+      teamFocus: 'operations-group',
+      recommendedTeam: 'operations-group',
+    };
   }
   if (/research|compare|recent|latest|best practices|upgrade|migration/.test(text)) {
-    return { focus: 'research', attachTo: ['cx-researcher', 'cx-architect'] };
+    return {
+      focus: 'research',
+      attachTo: ['cx-researcher', 'cx-architect'],
+      teamFocus: 'strategy-group',
+      recommendedTeam: 'strategy-group',
+    };
   }
-  return { focus: 'architecture', attachTo: ['cx-architect', 'cx-researcher'] };
+  return {
+    focus: 'architecture',
+    attachTo: ['cx-architect', 'cx-researcher'],
+    teamFocus: 'engineering-group',
+    recommendedTeam: 'engineering-group',
+  };
 }
 
-function buildOverlayPrompt({ domain, objective, scope, permanence, focus, freshness }) {
+function buildOverlayPrompt({ domain, objective, scope, permanence, focus, freshness, teamFocus = '' }) {
   return [
     `Domain overlay: ${domain}`,
     `Objective: ${objective}`,
     scope ? `Scope: ${scope}` : null,
     `Permanence: ${permanence}`,
     `Primary focus: ${focus}`,
+    teamFocus ? `Team focus: ${teamFocus}` : null,
     `Freshness requirement: ${freshness}`,
     'Rules:',
     '- Treat this as an internal Construct overlay, not a permanent public role.',
@@ -102,6 +139,7 @@ function buildOverlayPrompt({ domain, objective, scope, permanence, focus, fresh
     '- Separate confirmed facts from inference.',
     '- Respect existing Construct workflow, security, and validation boundaries.',
     '- Do not broaden tool permissions just because the domain is specialized.',
+    '- NEW: Team-first approach — work within the team structure and escalation paths defined in your organization.',
   ].filter(Boolean).join('\n');
 }
 
@@ -342,7 +380,7 @@ export async function runHeadhunt({ args = [], cwd = process.cwd(), homeDir = os
     if (!templateName) { listTeamTemplates(cwd); return; }
     const root = findConstructRoot(cwd);
     const teams = loadTeamTemplates(root);
-    if (!teams) throw new Error('specialists/teams.json not found. Run from the Construct root.');
+     if (!teams) throw new Error('specialists/org not found. Run from the Construct root.');
     const tpl = teams.templates[templateName];
     if (!tpl) throw new Error(`Unknown template: ${templateName}. Run 'construct headhunt template' to list available templates.`);
     const objective = typeof flags.for === 'string' ? flags.for.trim() : rest.slice(1).join(' ').trim();
@@ -354,29 +392,30 @@ export async function runHeadhunt({ args = [], cwd = process.cwd(), homeDir = os
     const overlayDir = getOverlayDir(root);
     const expiresAt = permanence === 'temporary' ? new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000).toISOString() : null;
 
-    const overlay = {
-      id: overlayId,
-      type: 'domain-overlay',
-      domain: templateName,
-      objective,
-      scope: typeof flags.scope === 'string' ? flags.scope.trim() : null,
-      permanence,
-      focus: tpl.focus,
-      attachTo: tpl.members,
-      freshness,
-      teamTemplate: templateName,
-      teamId: overlayId,
-      createdAt: now.toISOString(),
-      expiresAt,
-      project: path.basename(root),
-      workflowId: null,
-      taskKey: null,
-      status: 'active',
-      prompt: buildOverlayPrompt({ domain: templateName, objective, scope: typeof flags.scope === 'string' ? flags.scope : '', permanence, focus: tpl.focus, freshness }),
-      skills: tpl.skills ?? [],
-      promotionGates: tpl.promotionGates ?? buildPromotionGates(),
-      challenge: null,
-    };
+     const overlay = {
+       id: overlayId,
+       type: 'domain-overlay',
+       domain: templateName,
+       objective,
+       scope: typeof flags.scope === 'string' ? flags.scope.trim() : null,
+       permanence,
+       focus: tpl.focus,
+       attachTo: tpl.members,
+       freshness,
+       teamTemplate: templateName,
+       teamId: overlayId,
+       teamFocus: tpl.focus,
+       createdAt: now.toISOString(),
+       expiresAt,
+       project: path.basename(root),
+       workflowId: null,
+       taskKey: null,
+       status: 'active',
+       prompt: buildOverlayPrompt({ domain: templateName, objective, scope: typeof flags.scope === 'string' ? flags.scope : '', permanence, focus: tpl.focus, freshness, teamFocus: tpl.focus }),
+       skills: tpl.skills ?? [],
+       promotionGates: tpl.promotionGates ?? buildPromotionGates(),
+       challenge: null,
+     };
 
     const overlayJsonPath = path.join(overlayDir, `${overlayId}.json`);
     const overlayMdPath = path.join(overlayDir, `${overlayId}.md`);
@@ -448,7 +487,11 @@ export async function runHeadhunt({ args = [], cwd = process.cwd(), homeDir = os
     }
 
     const freshness = typeof flags.freshness === 'string' ? flags.freshness : 'current';
-    const classification = classifyOverlay(objective, typeof flags.team === 'string' ? flags.team : '');
+    const classification = classifyOverlay(
+      objective,
+      typeof flags.team === 'string' ? flags.team : '',
+      { cwd },
+    );
     const now = new Date();
     const root = findConstructRoot(cwd);
     const overlayId = `${slugify(domain)}-${now.toISOString().replace(/[:.]/g, '-')}`;
@@ -473,6 +516,9 @@ export async function runHeadhunt({ args = [], cwd = process.cwd(), homeDir = os
       taskKey: null,
       status: permanence === 'temporary' ? 'active' : 'promotion_requested',
       teamId: overlayId,
+      teamFocus: classification.teamFocus || classification.focus,
+      recommendedTeam: classification.recommendedTeam || null,
+      scopeTeamSource: classification.scopeTeamSource || null,
       sourceStrategy: [
         'official docs',
         'release notes/changelogs',
@@ -488,6 +534,7 @@ export async function runHeadhunt({ args = [], cwd = process.cwd(), homeDir = os
         permanence,
         focus: classification.focus,
         freshness,
+        teamFocus: classification.teamFocus,
       }),
       promotionGates: buildPromotionGates(),
       challenge: permanence === 'temporary' ? null : {

package/lib/hooks/agent-tracker.mjs

@@ -155,10 +155,10 @@ try {
     if (success !== null) {
       try {
         const { recordOutcome } = await import('../outcomes/record.mjs');
-        const { resolveActiveProfile } = await import('../profiles/loader.mjs');
+        const { resolveActiveScope } = await import('../scopes/loader.mjs');
         const roleId = agentName.replace(/^cx-/, '');
         const projectCwd = input?.cwd || process.cwd();
-        const activeProfile = resolveActiveProfile(projectCwd);
+        const activeProfile = resolveActiveScope(projectCwd);
         recordOutcome(projectCwd, {
           role: roleId,
           success,

package/lib/hooks/config-protection.mjs

@@ -52,7 +52,7 @@ const PROTECTED = [
 ];
 
 const META_FILES = [
-  /(?:^|\/)specialists\/registry\.json$/,
+  /(?:^|\/)specialists\/org(?:\/|$)/,
   /(?:^|\/)lib\/setup\.mjs$/,
   /(?:^|\/)bin\/construct-postinstall\.mjs$/,
   /(?:^|\/)claude\/settings\.template\.json$/,

package/lib/hooks/registry-sync.mjs

@@ -3,11 +3,11 @@
  * lib/hooks/registry-sync.mjs — Registry-change reminder hook.
  *
  * PostToolUse on Write|Edit. Fires only when the edited file is
- * specialists/registry.json (the construct repo) or an installed
+ * specialists/org/ (the construct repo) or an installed
  * agents/registry.json mirror. Emits a one-line reminder on stderr telling
  * the developer to run `construct sync` when they're ready. Does NOT
  * auto-execute sync — auto-execution during tests (which legitimately
- * mutate registry.json) races test cleanup and regenerates platform state
+ * mutate the registry) races test cleanup and regenerates platform state
  * mid-suite. The dev decides when to sync, the same way ordinary code
  * changes don't auto-build.
  *
@@ -30,7 +30,7 @@ const input = readHookInput();
 const filePath = input?.tool_input?.file_path || process.env.TOOL_INPUT_FILE_PATH || '';
 const matchesRegistry =
   filePath.endsWith(path.join('agents', 'registry.json')) ||
-  filePath.endsWith('/specialists/registry.json');
+  filePath.includes(`${path.sep}specialists${path.sep}org`);
 if (!matchesRegistry) process.exit(0);
 
 const isNonInteractive =