@ludecker/aaac 1.1.1 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ludecker/aaac",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Agentic Architecture as Code (AAAC) — installable Cursor agent framework",
   "type": "module",
   "license": "MIT",

package/src/generators/generate-commands.mjs

@@ -50,10 +50,13 @@ function isFixCommand(cmd, entry) {
 function writeFixCmd(cmd, entry = null) {
   const canonical = entry?.alias ?? cmd;
   const isBug = canonical === "fix-bug" || cmd === "bug-fix";
-  const resolver = isBug ? "fix-bug-by-slug" : "fix-domain-by-slug";
-  const domainRequired = isBug
-    ? "Domain slug **recommended** (`cms`, `ui`, `database`, `aaac`)."
-    : "**Domain slug required** (`cms`, `ui`, `database`, `aaac`).";
+  const hasResolver = Boolean(entry?.resolver);
+  const domainLine = hasResolver
+    ? "Domain slug **recommended** when your project overlay defines domain resolvers (see `graph.project.yaml`)."
+    : "Domain slug optional.";
+  const dispatchLine = hasResolver
+    ? `3. resolver **\`${entry.resolver}\`** (project overlay in \`graph.project.yaml\`)`
+    : `3. [verb-fix orchestrator](../skills/shared/verbs/fix/orchestrator/SKILL.md) — object \`${isBug ? "feature" : "module"}\``;
   const aliasLine =
     cmd !== canonical
       ? `\n\n> Alias → \`/${canonical}\`. See [${canonical}.md](${canonical}.md).\n`
@@ -71,10 +74,10 @@ AAAC: \`/${cmd} <domain> "<intent>"\`
 
 1. [.cursor/aaac/dispatch.md](../aaac/dispatch.md)
 2. [.cursor/aaac/graph.yaml](../aaac/graph.yaml) — **\`${canonical}\`**
-3. resolver **\`${resolver}\`** → \`cms-fix-bug\` | \`ui-fix-bug\` | \`database-fix-bug\` | \`aaac-fix-bug\`
-4. [investigation/SKILL.md](../skills/shared/investigation/SKILL.md) Mode A + domain \`fix_mode\`
+${dispatchLine}
+4. [investigation/SKILL.md](../skills/shared/investigation/SKILL.md) Mode A${hasResolver ? " + domain `fix_mode` when resolver routes to a domain orchestrator" : ""}
 
-${domainRequired}
+${domainLine}
 
 ## Swarm (mandatory)
 
@@ -90,8 +93,8 @@ Contract: [${canonical}.yaml](../aaac/contracts/commands/${canonical}.yaml)
 ## Example
 
 \`\`\`text
-/${cmd} cms "Getting Started nav missing published guides"
-/${cmd} ui "DocsNav section state lost on route change"
+/${cmd} payments "Webhook handler drops events on retry"
+/${cmd} api "Auth middleware returns 500 on expired token"
 \`\`\`
 `;
   fs.writeFileSync(path.join(commandsDir, `${cmd}.md`), body);
@@ -247,6 +250,11 @@ const written = new Set();
 
 for (const [cmd, entry] of Object.entries(command_overrides)) {
   if (KEEP_EXTRA.has(`${cmd}.md`)) continue;
+  if (isFixCommand(cmd, entry)) {
+    writeFixCmd(cmd, entry);
+    written.add(cmd);
+    continue;
+  }
   writeCmd(cmd, entry);
   written.add(cmd);
 }

package/src/run-engine/advance-phase.mjs

@@ -102,7 +102,7 @@ if (
     manifest.updated_at = isoNow();
     writeJson(manifestPath, manifest);
     console.error(
-      "Website verify failed (static assets + vite build). Fix errors, then re-run:\n" +
+      "App verify failed (see project.config.json verify). Fix errors, then re-run:\n" +
         `  node .cursor/aaac/scripts/run-engine/verify-website-build.mjs --run-id ${runId}\n` +
         detail,
     );
@@ -112,7 +112,7 @@ if (
     event: "verify_website_pass",
     phase: completedPhase,
     phase_kind: manifest.phase_kind,
-    detail: "static assets + vite build",
+    detail: "app verify gate",
     level: "info",
   });
 }

package/src/run-engine/gate-write.mjs

@@ -53,10 +53,22 @@ process.stdin.on("end", () => {
   if (!conversationId) allow();
 
   const active = loadActiveRun(conversationId);
-  if (!active?.run_id || active.status === "completed") allow();
+  if (
+    !active?.run_id ||
+    active.status === "completed" ||
+    active.status === "cancelled"
+  ) {
+    allow();
+  }
 
   const manifest = loadRunManifest(active.run_id);
-  if (!manifest || manifest.status === "completed") allow();
+  if (
+    !manifest ||
+    manifest.status === "completed" ||
+    manifest.status === "cancelled"
+  ) {
+    allow();
+  }
   if (manifest.conversation_id && manifest.conversation_id !== conversationId) allow();
 
   const enforcement = loadEnforcement();

package/src/run-engine/init-run.mjs

@@ -11,6 +11,11 @@ import {
   phaseKind,
   writeJson,
   saveActiveRun,
+  loadActiveRun,
+  loadRunManifest,
+  clearActiveRun,
+  cancelRunManifest,
+  isUserStopIntent,
   conversationIdFromHook,
   promptFromHook,
 } from "./lib.mjs";
@@ -41,6 +46,42 @@ try {
 
 const prompt = process.argv[2] ?? promptFromHook(hook);
 const conversationId = conversationIdFromHook(hook);
+
+if (isUserStopIntent(prompt) && conversationId) {
+  const active = loadActiveRun(conversationId);
+  let cancelledRunId = null;
+  if (active?.run_id) {
+    const existing = loadRunManifest(active.run_id);
+    if (
+      existing &&
+      existing.status !== "completed" &&
+      existing.status !== "cancelled"
+    ) {
+      cancelRunManifest(existing, prompt.trim());
+      recordLog(existing, {
+        event: "run_cancelled",
+        phase: existing.phase,
+        phase_kind: existing.phase_kind,
+        detail: `user stop: ${prompt.trim()}`,
+        level: "info",
+      });
+      recordDecision(existing, {
+        phase: existing.phase ?? "dispatch",
+        decision: "user_stop",
+        reason: "User requested stop",
+        evidence: prompt.trim(),
+      });
+      writeJson(`${runDir(active.run_id)}/run.json`, existing);
+      cancelledRunId = active.run_id;
+    }
+    clearActiveRun(conversationId);
+  }
+  console.log(
+    JSON.stringify({ ok: true, aaac: false, cancelled: cancelledRunId }),
+  );
+  process.exit(0);
+}
+
 const parsed = parseAaacPrompt(prompt);
 
 if (!parsed) {

package/src/run-engine/lib.mjs

@@ -139,3 +139,36 @@ export function phaseKind(phase, registry) {
 export function promptFromHook(hook) {
   return hook?.prompt ?? hook?.text ?? hook?.content ?? "";
 }
+
+/** User explicitly asked to halt the current Run (short prompts only). */
+export function isUserStopIntent(text) {
+  if (!text || typeof text !== "string") return false;
+  const trimmed = text.trim();
+  if (trimmed.length > 60) return false;
+  return (
+    /^(stop|cancel|abort)([.!?]*)$/i.test(trimmed) ||
+    /^(please\s+)?(stop|cancel|abort)([.!?]*)$/i.test(trimmed) ||
+    /^(stop|cancel|abort)\s+(the\s+)?run([.!?]*)$/i.test(trimmed)
+  );
+}
+
+export function cancelRunManifest(manifest, evidence = "user_stop") {
+  manifest.status = "cancelled";
+  manifest.awaiting_approval = false;
+  manifest.blocked_reason = null;
+  manifest.updated_at = isoNow();
+  if (manifest.enforcement) {
+    manifest.enforcement.edit_allowed = true;
+  }
+  return manifest;
+}
+
+export function clearActiveRun(conversationId) {
+  if (!conversationId) return;
+  const filePath = activeRunPath(conversationId);
+  try {
+    fs.unlinkSync(filePath);
+  } catch {
+    // already cleared
+  }
+}

package/src/run-engine/record-task.mjs

@@ -34,7 +34,13 @@ process.stdin.on("end", () => {
   if (!active?.run_id) allow();
 
   const manifest = loadRunManifest(active.run_id);
-  if (!manifest || manifest.status === "completed") allow();
+  if (
+    !manifest ||
+    manifest.status === "completed" ||
+    manifest.status === "cancelled"
+  ) {
+    allow();
+  }
   if (manifest.conversation_id && manifest.conversation_id !== conversationId) allow();
 
   manifest.swarm = manifest.swarm ?? {};

package/src/run-engine/stop-check.mjs

@@ -28,7 +28,13 @@ process.stdin.on("end", () => {
   if (!active?.run_id) process.exit(0);
 
   const manifest = loadRunManifest(active.run_id);
-  if (!manifest || manifest.status === "completed") process.exit(0);
+  if (
+    !manifest ||
+    manifest.status === "completed" ||
+    manifest.status === "cancelled"
+  ) {
+    process.exit(0);
+  }
 
   const remaining = [manifest.phase, ...(manifest.pending ?? [])].filter(Boolean);
 

package/src/run-engine/verify-website-build.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
- * Verify website static assets + production build.
- * Used by advance-phase on create/update/fix verify completion.
+ * Verify app static assets + production build (project overlay).
+ * Skips when `.cursor/aaac/project.config.json` has `verify.enabled: false`.
  *
  * Usage:
  *   node verify-website-build.mjs [--run-id <run_id>] [--skip-build]
@@ -9,23 +9,42 @@
 import fs from "fs";
 import path from "path";
 import { spawnSync } from "child_process";
-import { fileURLToPath } from "url";
-import { REPO_ROOT, runDir, isoNow, writeJson } from "./lib.mjs";
+import { runDir, isoNow, writeJson, readJson } from "./lib.mjs";
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const WEBSITE_ROOT = path.join(REPO_ROOT, "apps/website");
-const INDEX_HTML = path.join(WEBSITE_ROOT, "index.html");
+const PROJECT_ROOT = process.cwd();
 
 const args = process.argv.slice(2);
 const runIdIdx = args.indexOf("--run-id");
 const runId = runIdIdx >= 0 ? args[runIdIdx + 1] : null;
 const skipBuild = args.includes("--skip-build");
 
+function loadVerifyConfig() {
+  const configPath = path.join(PROJECT_ROOT, ".cursor/aaac/project.config.json");
+  const config = readJson(configPath, { verify: { enabled: false } });
+  const verify = config.verify ?? { enabled: false };
+  if (!verify.enabled) {
+    return { enabled: false };
+  }
+  const appRootRel = verify.app_root ?? "apps/website";
+  const indexRel =
+    verify.index_html ?? path.join(appRootRel, "index.html").replace(/\\/g, "/");
+  const appRoot = path.join(PROJECT_ROOT, appRootRel);
+  const indexHtml = path.join(PROJECT_ROOT, indexRel);
+  const build = verify.build ?? { command: "pnpm", args: ["run", "build"] };
+  return { enabled: true, appRoot, indexHtml, build, appRootRel };
+}
+
+const verifyConfig = loadVerifyConfig();
+
 const results = {
   status: "pass",
   checked_at: isoNow(),
   static_assets: { status: "pass", missing: [] },
-  build: { status: skipBuild ? "skipped" : "pending", command: "pnpm --filter @ludecker/website build" },
+  build: {
+    status: skipBuild ? "skipped" : "pending",
+    command: null,
+  },
+  verify_config: verifyConfig.enabled ? "enabled" : "disabled",
 };
 
 function fail(section, detail) {
@@ -40,11 +59,11 @@ function fail(section, detail) {
   console.error(`[verify-website-build] FAIL ${section}: ${detail}`);
 }
 
-function resolveRootAsset(assetPath) {
+function resolveRootAsset(assetPath, websiteRoot, appRootRel) {
   const rel = assetPath.replace(/^\//, "");
   const candidates = [
-    path.join(WEBSITE_ROOT, "public", rel),
-    path.join(WEBSITE_ROOT, rel),
+    path.join(websiteRoot, "public", rel),
+    path.join(websiteRoot, rel),
   ];
   for (const candidate of candidates) {
     if (fs.existsSync(candidate)) {
@@ -54,13 +73,13 @@ function resolveRootAsset(assetPath) {
   return null;
 }
 
-function checkStaticAssets() {
-  if (!fs.existsSync(INDEX_HTML)) {
-    fail("static_assets", `missing index.html at ${INDEX_HTML}`);
+function checkStaticAssets(indexHtml, websiteRoot, appRootRel) {
+  if (!fs.existsSync(indexHtml)) {
+    fail("static_assets", `missing index.html at ${indexHtml}`);
     return;
   }
 
-  const html = fs.readFileSync(INDEX_HTML, "utf8");
+  const html = fs.readFileSync(indexHtml, "utf8");
   const rootRefs = [
     ...html.matchAll(/\b(?:href|src)="(\/[^"#?]+)"/g),
   ].map((match) => match[1]);
@@ -70,28 +89,28 @@ function checkStaticAssets() {
     if (seen.has(ref) || ref.startsWith("//")) continue;
     seen.add(ref);
 
-    const resolved = resolveRootAsset(ref);
+    const resolved = resolveRootAsset(ref, websiteRoot, appRootRel);
     if (!resolved) {
       fail(
         "static_assets",
-        `${ref} not found under apps/website/public/ or apps/website/ (Vite dev resolves root paths to project root)`,
+        `${ref} not found under ${appRootRel}/public/ or ${appRootRel}/`,
       );
     }
   }
 }
 
-function runBuild() {
+function runBuild(build) {
   if (skipBuild) return;
 
-  const proc = spawnSync(
-    "pnpm",
-    ["--filter", "@ludecker/website", "build"],
-    {
-      cwd: REPO_ROOT,
-      encoding: "utf8",
-      env: { ...process.env, CI: "1" },
-    },
-  );
+  const command = build.command ?? "pnpm";
+  const buildArgs = build.args ?? ["run", "build"];
+  results.build.command = [command, ...buildArgs].join(" ");
+
+  const proc = spawnSync(command, buildArgs, {
+    cwd: build.cwd ? path.join(PROJECT_ROOT, build.cwd) : PROJECT_ROOT,
+    encoding: "utf8",
+    env: { ...process.env, CI: "1" },
+  });
 
   if (proc.status !== 0) {
     const detail = [proc.stderr, proc.stdout].filter(Boolean).join("\n").trim();
@@ -114,12 +133,13 @@ function writeArtifact() {
   const yaml = [
     `status: ${results.status}`,
     `checked_at: ${results.checked_at}`,
+    `verify_config: ${results.verify_config}`,
     "static_assets:",
     `  status: ${results.static_assets.status}`,
     `  missing: ${JSON.stringify(results.static_assets.missing)}`,
     "build:",
     `  status: ${results.build.status}`,
-    `  command: ${JSON.stringify(results.build.command)}`,
+    results.build.command ? `  command: ${JSON.stringify(results.build.command)}` : null,
     results.build.exit_code != null ? `  exit_code: ${results.build.exit_code}` : null,
     results.build.detail ? `  detail: ${JSON.stringify(results.build.detail)}` : null,
   ]
@@ -140,8 +160,25 @@ function writeArtifact() {
   }
 }
 
-checkStaticAssets();
-runBuild();
+if (!verifyConfig.enabled) {
+  results.static_assets.status = "skipped";
+  results.build.status = "skipped";
+  results.build.command = null;
+  writeArtifact();
+  console.log(JSON.stringify({ ok: true, skipped: true, reason: "verify.disabled", ...results }));
+  process.exit(0);
+}
+
+results.build.command = skipBuild
+  ? null
+  : [verifyConfig.build.command, ...(verifyConfig.build.args ?? [])].join(" ");
+
+checkStaticAssets(
+  verifyConfig.indexHtml,
+  verifyConfig.appRoot,
+  verifyConfig.appRootRel,
+);
+runBuild(verifyConfig.build);
 writeArtifact();
 
 console.log(JSON.stringify({ ok: results.status === "pass", ...results }));

package/templates/cursor/aaac/capabilities/registry.json

@@ -2,44 +2,43 @@
   "version": 2,
   "capabilities": {
     "ui-design": {
-      "description": "Design tokens, component CSS, Figma alignment",
+      "description": "Presentational components, token-based styling",
       "providers": [
-        { "id": "ludecker-design-system", "type": "skill", "path": "skills/ludecker/design-system" }
+        { "id": "component", "type": "skill", "path": "skills/shared/component" }
       ]
     },
     "ux-design": {
-      "description": "Editorial readability, publish flow, navigation clarity",
+      "description": "Editorial readability, navigation clarity",
       "providers": [
-        { "id": "ludecker-user-experience", "type": "skill", "path": "skills/ludecker/user-experience" }
+        { "id": "documentation", "type": "skill", "path": "skills/shared/documentation" }
       ]
     },
     "api-design": {
       "description": "Contracts and validation at boundaries",
       "providers": [
-        { "id": "ludecker-api-first", "type": "skill", "path": "skills/ludecker/api-first" }
+        { "id": "integration", "type": "skill", "path": "skills/shared/integration" }
       ]
     },
     "database-design": {
-      "description": "Schema, migrations, RLS, type mirrors",
+      "description": "Schema, migrations, persistence boundaries",
       "providers": [
-        { "id": "ludecker-database-schema", "type": "skill", "path": "skills/ludecker/database-schema" },
-        { "id": "supabase-mcp", "type": "mcp", "optional": true, "note": "Apply migrations and RLS via Supabase MCP" }
+        { "id": "schema", "type": "skill", "path": "skills/shared/schema" }
       ]
     },
     "security": {
-      "description": "Auth, RLS, secrets, CMS gates",
+      "description": "Auth, secrets, access control at boundaries",
       "providers": [
-        { "id": "ludecker-security", "type": "skill", "path": "skills/ludecker/security" }
+        { "id": "architecture", "type": "skill", "path": "skills/shared/architecture" }
       ]
     },
     "infrastructure": {
-      "description": "Deploy, Render, env, hosting",
+      "description": "Deploy, hosting, environment configuration",
       "providers": [
-        { "id": "ludecker-infrastructure", "type": "skill", "path": "skills/ludecker/infrastructure" }
+        { "id": "integration", "type": "skill", "path": "skills/shared/integration" }
       ]
     },
     "layer-boundaries": {
-      "description": "SSOT, import direction, monorepo layers",
+      "description": "SSOT, import direction, module layers",
       "providers": [
         { "id": "architecture", "type": "skill", "path": "skills/shared/architecture" }
       ]
@@ -65,8 +64,7 @@
     "migration-model": {
       "description": "Migration scripts and apply procedure",
       "providers": [
-        { "id": "migration", "type": "skill", "path": "skills/shared/migration" },
-        { "id": "supabase-mcp", "type": "mcp", "optional": true }
+        { "id": "migration", "type": "skill", "path": "skills/shared/migration" }
       ]
     },
     "workflow-model": {
@@ -76,7 +74,7 @@
       ]
     },
     "integration-model": {
-      "description": "API routes, webhooks, MCP adapters",
+      "description": "API routes, webhooks, external adapters",
       "providers": [
         { "id": "integration", "type": "skill", "path": "skills/shared/integration" }
       ]