@akanjs/cli 3.0.0-beta.8 → 3.0.0

package/index-7md2g9vw.js

@@ -0,0 +1,6 @@
+// @bun
+// pkgs/@akanjs/devkit/stripAnsi.ts
+var ansi = new RegExp(`${String.fromCharCode(27)}(?:[@-Z\\\\-_]|\\[[\\s\\S]*?[@-~])`, "g");
+var stripAnsi = (text) => text.replace(ansi, "");
+
+export { stripAnsi };

package/{index-04bk599g.js → index-93j60em0.js}

@@ -5,33 +5,26 @@ import {
   writeGeneratedSyncState,
   createRepairReport,
   renderRepairReport
-} from "./index-gyd220p2.js";
+} from "./index-y3mphr1m.js";
 import {
   AkanContextAnalyzer
-} from "./index-ktb5njgy.js";
+} from "./index-9z771ptz.js";
 import {
   runner
-} from "./index-0g7r8xz3.js";
+} from "./index-vpj42xwt.js";
 
 // pkgs/@akanjs/cli/repair/repair.runner.ts
-var commandForShell = (command) => command.startsWith("akan ") ? `bun run ${command}` : command;
+var spawnShell = async (workspace, command) => await workspace.spawn("bash", ["-lc", command.startsWith("akan ") ? `bun run ${command}` : command], {
+  cwd: workspace.workspaceRoot
+});
 var defaultExecutor = (workspace) => async (command) => {
+  const base = { command: command.command, reason: command.reason };
   try {
-    const stdout = await workspace.spawn("bash", ["-lc", commandForShell(command.command)], {
-      cwd: workspace.workspaceRoot
-    });
-    return {
-      command: command.command,
-      reason: command.reason,
-      status: "passed",
-      exitCode: 0,
-      stdout
-    };
+    return { ...base, status: "passed", exitCode: 0, stdout: await spawnShell(workspace, command.command) };
   } catch (error) {
     const commandError = error;
     return {
-      command: command.command,
-      reason: command.reason,
+      ...base,
       status: "failed",
       exitCode: commandError.code ?? 1,
       stdout: commandError.stdout,
@@ -158,4 +151,4 @@ class RepairRunner extends runner("repair") {
   }
 }
 
-export { RepairRunner };
+export { spawnShell, RepairRunner };

package/index-94s080qm.js

@@ -0,0 +1,266 @@
+// @bun
+import {
+  FileSys2
+} from "./index-52w0fvh8.js";
+import {
+  ConfigLock
+} from "./index-3hx1z96c.js";
+
+// pkgs/@akanjs/devkit/cloud/globalConfig.ts
+import { mkdir, rm, writeFile } from "fs/promises";
+import dayjs from "dayjs";
+
+// pkgs/@akanjs/devkit/cloud/constants.ts
+import path from "path";
+var basePath = path.join(Bun.env.HOME ?? Bun.env.USERPROFILE ?? "", ".akan");
+var configPath = path.join(basePath, "config.json");
+var getDefaultHostConfig = (host = GlobalConfig.akanCloudHost) => ({ host });
+var defaultAkanGlobalConfig = {
+  cloudHost: {},
+  remoteEnvServers: {},
+  testTargets: {}
+};
+
+// pkgs/@akanjs/devkit/cloud/globalConfig.ts
+class GlobalConfig {
+  static akanCloudHost = process.env.USE_AKANJS_PKGS === "true" ? `http://localhost:${process.env.CLOUD_HOST_PORT ?? 8283}` : "https://cloud.akanjs.com";
+  static async#getAkanGlobalConfig() {
+    const exists = await FileSys2.fileExists(configPath);
+    const akanConfig = exists ? await FileSys2.readJson(configPath) : {};
+    return {
+      ...defaultAkanGlobalConfig,
+      ...akanConfig,
+      cloudHost: akanConfig.cloudHost ?? defaultAkanGlobalConfig.cloudHost,
+      remoteEnvServers: akanConfig.remoteEnvServers ?? defaultAkanGlobalConfig.remoteEnvServers,
+      testTargets: akanConfig.testTargets ?? defaultAkanGlobalConfig.testTargets
+    };
+  }
+  static async#setAkanGlobalConfig(akanConfig) {
+    await mkdir(basePath, { recursive: true, mode: 448 });
+    const temp = `${configPath}.${process.pid}.${crypto.randomUUID()}.tmp`;
+    try {
+      await writeFile(temp, JSON.stringify(akanConfig, null, 2), { mode: 384 });
+      await FileSys2.replace(temp, configPath);
+    } catch (error) {
+      await rm(temp, { force: true });
+      throw error;
+    }
+  }
+  static #lockPath = `${configPath}.lock`;
+  static async#update(mutate) {
+    await ConfigLock.run(GlobalConfig.#lockPath, async () => {
+      await GlobalConfig.#setAkanGlobalConfig(mutate(await GlobalConfig.#getAkanGlobalConfig()));
+    });
+  }
+  static async getHostConfig(host = GlobalConfig.akanCloudHost) {
+    const akanConfig = await GlobalConfig.#getAkanGlobalConfig();
+    return GlobalConfig.toHostConfig(akanConfig.cloudHost[host] ?? getDefaultHostConfig(host));
+  }
+  static async setHostConfig(config = getDefaultHostConfig()) {
+    await GlobalConfig.#update((akanConfig) => GlobalConfig.#withHost(akanConfig, config));
+  }
+  static #withHost(akanConfig, config) {
+    return {
+      ...akanConfig,
+      cloudHost: { ...akanConfig.cloudHost, [config.host]: GlobalConfig.toHostConfigDto(config) }
+    };
+  }
+  static async refreshHostAuth(host, refresh) {
+    try {
+      return await ConfigLock.run(GlobalConfig.#lockPath, async () => {
+        const akanConfig = await GlobalConfig.#getAkanGlobalConfig();
+        const current = GlobalConfig.toHostConfig(akanConfig.cloudHost[host] ?? getDefaultHostConfig(host));
+        const accessToken = current.auth?.accessToken;
+        const refreshToken = accessToken?.refreshToken;
+        if (!accessToken || !refreshToken || !GlobalConfig.needRefreshToken(accessToken))
+          return current;
+        const claimed = {
+          ...current,
+          auth: { ...current.auth, accessToken: { ...accessToken, refreshToken: null } }
+        };
+        await GlobalConfig.#setAkanGlobalConfig(GlobalConfig.#withHost(akanConfig, claimed));
+        const next = await refresh(refreshToken).catch(() => null);
+        if (!next?.jwt)
+          return claimed;
+        const refreshed = { ...current, auth: { ...current.auth, accessToken: next } };
+        await GlobalConfig.#setAkanGlobalConfig(GlobalConfig.#withHost(await GlobalConfig.#getAkanGlobalConfig(), refreshed));
+        return refreshed;
+      });
+    } catch {
+      return await GlobalConfig.getHostConfig(host);
+    }
+  }
+  static async getRemoteEnvServers() {
+    return (await GlobalConfig.#getAkanGlobalConfig()).remoteEnvServers;
+  }
+  static async setRemoteEnvServer(name, config) {
+    await GlobalConfig.#update((akanConfig) => ({
+      ...akanConfig,
+      remoteEnvServers: { ...akanConfig.remoteEnvServers, [name]: config }
+    }));
+  }
+  static async removeRemoteEnvServer(name) {
+    await GlobalConfig.#update((akanConfig) => {
+      const { [name]: _, ...remoteEnvServers } = akanConfig.remoteEnvServers;
+      return { ...akanConfig, remoteEnvServers };
+    });
+  }
+  static async getTestTargets() {
+    return (await GlobalConfig.#getAkanGlobalConfig()).testTargets;
+  }
+  static async setTestTargets(testTargets) {
+    await GlobalConfig.#update((akanConfig) => ({
+      ...akanConfig,
+      testTargets: { ...akanConfig.testTargets, ...testTargets }
+    }));
+  }
+  static needRefreshToken(accessToken) {
+    return !!accessToken?.expiresAt?.isBefore(dayjs().add(1, "hour"));
+  }
+  static toAccessToken(accessToken) {
+    return {
+      jwt: accessToken.jwt,
+      refreshToken: accessToken.refreshToken ?? null,
+      expiresAt: accessToken.expiresAt ? dayjs(accessToken.expiresAt) : null
+    };
+  }
+  static toAccessTokenDto(accessToken) {
+    return {
+      jwt: accessToken.jwt,
+      refreshToken: accessToken.refreshToken ?? null,
+      expiresAt: accessToken.expiresAt?.toString() ?? null
+    };
+  }
+  static toHostConfigDto(hostConfig) {
+    return {
+      host: hostConfig.host,
+      auth: {
+        accessToken: hostConfig.auth?.accessToken ? GlobalConfig.toAccessTokenDto(hostConfig.auth.accessToken) : undefined,
+        self: hostConfig.auth?.self
+      }
+    };
+  }
+  static toHostConfig(hostConfigDto) {
+    return {
+      host: hostConfigDto.host,
+      auth: {
+        accessToken: hostConfigDto.auth?.accessToken ? GlobalConfig.toAccessToken(hostConfigDto.auth.accessToken) : undefined,
+        self: hostConfigDto.auth?.self
+      }
+    };
+  }
+}
+
+// pkgs/@akanjs/devkit/cloud/cloudApi.ts
+class HttpClient {
+  baseUrl;
+  headers = {};
+  constructor(baseUrl, headers = {}) {
+    this.baseUrl = baseUrl;
+    this.headers = headers;
+  }
+  async get(url, { headers, signal } = {}) {
+    const response = await fetch(`${this.baseUrl}${url}`, {
+      headers: { "Content-Type": "application/json", ...this.headers, ...headers },
+      ...signal ? { signal } : {}
+    });
+    return await HttpClient.#body(response, url);
+  }
+  async getFile(url, localPath, headers) {
+    const response = await fetch(`${this.baseUrl}${url}`, {
+      headers: { ...this.headers, ...headers }
+    });
+    if (!response.ok)
+      throw new Error(`Failed to download file: ${response.status} ${response.statusText}`);
+    await Bun.write(localPath, response);
+  }
+  async post(url, data, { headers, signal } = {}) {
+    const isFormData = data instanceof FormData;
+    const response = await fetch(`${this.baseUrl}${url}`, {
+      method: "POST",
+      body: isFormData ? data : JSON.stringify(data),
+      headers: isFormData ? { ...this.headers, ...headers } : { "Content-Type": "application/json", ...this.headers, ...headers },
+      ...signal ? { signal } : {}
+    });
+    return await HttpClient.#body(response, url);
+  }
+  static async#body(response, url) {
+    const text = await response.text();
+    if (!response.ok)
+      throw new Error(`${response.status} ${response.statusText} from ${url}: ${text.slice(0, 200)}`);
+    return JSON.parse(text);
+  }
+  setHeaders(headers) {
+    Object.assign(this.headers, headers);
+    return this;
+  }
+}
+
+class CloudApi {
+  #api;
+  #accessToken = null;
+  #workspace;
+  host;
+  url;
+  static async fromHost(workspace, host) {
+    const hostConfig = await GlobalConfig.getHostConfig(host);
+    const accessToken = hostConfig.auth?.accessToken;
+    if (!accessToken || !GlobalConfig.needRefreshToken(accessToken))
+      return new CloudApi(workspace, hostConfig);
+    const tokenless = new CloudApi(workspace, hostConfig);
+    const refreshed = await GlobalConfig.refreshHostAuth(hostConfig.host, (refreshToken) => tokenless.refreshAuthToken(refreshToken));
+    return new CloudApi(workspace, refreshed);
+  }
+  constructor(workspace, hostConfig) {
+    this.#workspace = workspace;
+    this.#accessToken = hostConfig.auth?.accessToken ?? null;
+    this.host = hostConfig.host;
+    this.url = `${this.host}/api`;
+    this.#api = new HttpClient(this.url);
+    if (this.#accessToken && !GlobalConfig.needRefreshToken(this.#accessToken))
+      this.#api.setHeaders({ Authorization: `Bearer ${this.#accessToken.jwt}` });
+  }
+  #authorize(accessTokenDto) {
+    this.#accessToken = GlobalConfig.toAccessToken(accessTokenDto);
+    this.#api.setHeaders({ Authorization: `Bearer ${this.#accessToken.jwt}` });
+    return this.#accessToken;
+  }
+  async uploadEnv(devProjectId, file) {
+    const formData = new FormData;
+    formData.append("devProjectId", devProjectId);
+    formData.append("file", file);
+    return await this.#api.post(`/uploadEnv/${devProjectId}`, formData);
+  }
+  async downloadEnv(devProjectId) {
+    const localPath = `${this.#workspace.workspaceRoot}/local/env.tar`;
+    await this.#api.getFile(`/downloadEnv/${devProjectId}`, localPath);
+    return localPath;
+  }
+  async getRemoteAuthToken(remoteId) {
+    try {
+      return this.#authorize(await this.#api.get(`/getRemoteAuthToken/${remoteId}`));
+    } catch (_) {
+      return null;
+    }
+  }
+  async refreshAuthToken(refreshToken) {
+    return this.#authorize(await this.#api.post(`/refreshAuthToken`, { refreshToken }, { signal: AbortSignal.timeout(20000) }));
+  }
+  async requestTunnel(input) {
+    return await this.#api.post(`/tunnel/requestTunnel`, input);
+  }
+  async tunnelListInSelf() {
+    return await this.#api.get(`/tunnel/tunnelListInSelf`);
+  }
+  async revokeTunnel(code) {
+    return await this.#api.post(`/tunnel/revokeTunnel`, { code }, { signal: AbortSignal.timeout(5000) });
+  }
+  async getRemoteSelf() {
+    try {
+      return await this.#api.get(`/getRemoteSelf`);
+    } catch {
+      return null;
+    }
+  }
+}
+export { getDefaultHostConfig, GlobalConfig, CloudApi };

package/index-9dp031by.js

@@ -0,0 +1,12 @@
+// @bun
+// pkgs/@akanjs/cli/openBrowser.ts
+import { spawn } from "child_process";
+function openBrowser(url) {
+  const command = process.platform === "darwin" ? ["open", url] : process.platform === "win32" ? ["cmd", "/c", "start", "", url] : ["xdg-open", url];
+  const child = spawn(command[0], command.slice(1), { detached: true, stdio: "ignore" });
+  child.on("error", () => {});
+  child.unref();
+  return Promise.resolve();
+}
+
+export { openBrowser };

package/{index-ktb5njgy.js → index-9z771ptz.js}

@@ -4,27 +4,29 @@ import {
   readDevkitVersion,
   rootAllowedFiles,
   rootAllowedDirs,
+  rootEntryHintOf,
   isScannedRootEntry,
   AppExecutor,
   LibExecutor
-} from "./index-2tv3fdx4.js";
+} from "./index-3w94e7n3.js";
 import {
-  FileSys
-} from "./index-q0y2jq9j.js";
+  FileSys2
+} from "./index-52w0fvh8.js";
 import {
   collectRecipeSources2,
   scanRecipes2,
   findInlineRecipeDuplicates2
-} from "./index-by5gpp8x.js";
+} from "./index-hj6w4ka1.js";
 import {
+  workflowPathsForPlan,
   workflowRunArtifactPath,
   workflowSyncDir
-} from "./index-gyd220p2.js";
+} from "./index-y3mphr1m.js";
 
 // pkgs/@akanjs/devkit/akanContext.ts
 import { readdir } from "fs/promises";
 import path from "path";
-import { capitalize } from "akanjs/common";
+import { capitalize, isRecord } from "akanjs/common";
 var guidelineResourceUri = (name) => `akan://guidelines/${name}`;
 var staticResourceList = [
   { uri: "akan://docs/framework", name: "Akan framework guide", mimeType: "text/markdown" },
@@ -52,16 +54,13 @@ var akanMcpInstallConfigPaths = {
 var cursorWorkspaceFolder = "$" + "{workspaceFolder}";
 var claudeProjectDir = "$CLAUDE_PROJECT_DIR";
 var akanMcpCommand = (mode, { cd } = {}) => cd ? `cd "${cd}" && akan mcp --mode ${mode}` : `akan mcp --mode ${mode}`;
-var createAkanCursorMcpServer = (mode = "readonly") => ({
+var bashMcpServer = (mode, cd) => ({
   type: "stdio",
   command: "bash",
-  args: ["-lc", akanMcpCommand(mode, { cd: cursorWorkspaceFolder })]
-});
-var createAkanClaudeMcpServer = (mode = "readonly") => ({
-  type: "stdio",
-  command: "bash",
-  args: ["-lc", akanMcpCommand(mode, { cd: claudeProjectDir })]
+  args: ["-lc", akanMcpCommand(mode, { cd })]
 });
+var createAkanCursorMcpServer = (mode = "readonly") => bashMcpServer(mode, cursorWorkspaceFolder);
+var createAkanClaudeMcpServer = (mode = "readonly") => bashMcpServer(mode, claudeProjectDir);
 var createAkanMcpServer = (target, mode = "readonly") => target === "cursor" ? createAkanCursorMcpServer(mode) : createAkanClaudeMcpServer(mode);
 var akanCursorMcpServer = createAkanCursorMcpServer();
 var codexMcpServerTableHeader = "[mcp_servers.akan]";
@@ -164,41 +163,13 @@ var moduleShapeFiles = (module) => {
   ];
 };
 var constantFieldNames = (content) => [...content.matchAll(/\b([A-Za-z_$][\w$]*)\s*:\s*field\(/g)].map((match) => match[1]).filter(Boolean);
-var safeReadDir = async (dirPath) => {
-  try {
-    return (await readdir(dirPath, { withFileTypes: true })).sort((a, b) => a.name.localeCompare(b.name));
-  } catch {
-    return [];
-  }
-};
-var safeReadText = async (filePath) => {
-  try {
-    return await FileSys.readText(filePath);
-  } catch {
-    return null;
-  }
-};
-var safeReadJson = async (filePath) => {
-  try {
-    return await FileSys.readJson(filePath);
-  } catch {
-    return null;
-  }
-};
-var isWorkflowPlan = (value) => typeof value === "object" && value !== null && ("schemaVersion" in value) && value.schemaVersion === 1 && ("mode" in value) && value.mode === "plan";
-var isWorkflowApplyReport = (value) => typeof value === "object" && value !== null && ("schemaVersion" in value) && value.schemaVersion === 1 && ("mode" in value) && (value.mode === "apply" || value.mode === "dry-run");
+var safeReadDir = async (dirPath) => (await readdir(dirPath, { withFileTypes: true }).catch(() => [])).sort((a, b) => a.name.localeCompare(b.name));
+var safeReadText = (filePath) => FileSys2.readText(filePath).catch(() => null);
+var safeReadJson = (filePath) => FileSys2.readJson(filePath).catch(() => null);
+var isWorkflowPlan = (value) => typeof value === "object" && value !== null && ("schemaVersion" in value) && value.schemaVersion === 1 && ("mode" in value) && value.mode === "plan" && ("inputs" in value) && isRecord(value.inputs) && ("predictedChanges" in value) && Array.isArray(value.predictedChanges) && value.predictedChanges.every((change) => isRecord(change) && typeof change.target === "string");
+var isPathList = (value) => Array.isArray(value) && value.every((file) => isRecord(file) && typeof file.path === "string");
+var isWorkflowApplyReport = (value) => typeof value === "object" && value !== null && ("schemaVersion" in value) && value.schemaVersion === 1 && ("mode" in value) && (value.mode === "apply" || value.mode === "dry-run") && ("changedFiles" in value) && isPathList(value.changedFiles) && ("generatedFiles" in value) && isPathList(value.generatedFiles) && ("plan" in value) && isWorkflowPlan(value.plan);
 var isWorkflowRunArtifact = (value) => typeof value === "object" && value !== null && ("schemaVersion" in value) && value.schemaVersion === 1;
-var planInputString = (plan, key) => {
-  const value = plan.inputs[key];
-  return typeof value === "string" ? value : "";
-};
-var expandWorkflowTarget = (target, plan) => {
-  const app = planInputString(plan, "app");
-  const module = planInputString(plan, "module");
-  const moduleClass = module ? capitalize(module) : "<Module>";
-  return target.replace(/^\*\//, app ? `apps/${app}/` : "").replaceAll("<module>", module || "<module>").replaceAll("<Module>", moduleClass);
-};
-var workflowPathsForPlan = (plan) => plan.predictedChanges.map((change) => expandWorkflowTarget(change.target, plan));
 var workflowPathsForArtifact = (artifact) => {
   if (isWorkflowPlan(artifact))
     return workflowPathsForPlan(artifact);
@@ -209,7 +180,7 @@ var workflowPathsForArtifact = (artifact) => {
       ...workflowPathsForPlan(artifact.plan)
     ];
   }
-  if ("mode" in artifact && artifact.mode === "validate" && artifact.plan)
+  if ("mode" in artifact && artifact.mode === "validate" && isWorkflowPlan(artifact.plan))
     return workflowPathsForPlan(artifact.plan);
   return [];
 };
@@ -310,13 +281,13 @@ var getSysModules = async (workspace, sys, {
       const serviceName = entry.name.replace(/^_+/, "");
       if (moduleFilter && moduleFilter !== serviceName && moduleFilter !== entry.name)
         continue;
-      if (!await FileSys.fileExists(path.join(libPath, entry.name, `${serviceName}.service.ts`)))
+      if (!await FileSys2.fileExists(path.join(libPath, entry.name, `${serviceName}.service.ts`)))
         continue;
       modules.push(await createModuleContext(workspace, sys, "service", entry.name, serviceName, includeAbstractContent));
     } else {
       if (moduleFilter && moduleFilter !== entry.name)
         continue;
-      if (!await FileSys.fileExists(path.join(libPath, entry.name, `${entry.name}.constant.ts`)))
+      if (!await FileSys2.fileExists(path.join(libPath, entry.name, `${entry.name}.constant.ts`)))
         continue;
       modules.push(await createModuleContext(workspace, sys, "domain", entry.name, entry.name, includeAbstractContent));
     }
@@ -327,7 +298,7 @@ var getSysModules = async (workspace, sys, {
       continue;
     if (moduleFilter && moduleFilter !== entry.name)
       continue;
-    if (!await FileSys.fileExists(path.join(scalarRoot, entry.name, `${entry.name}.constant.ts`)))
+    if (!await FileSys2.fileExists(path.join(scalarRoot, entry.name, `${entry.name}.constant.ts`)))
       continue;
     modules.push(await createModuleContext(workspace, sys, "scalar", entry.name, entry.name, includeAbstractContent));
   }
@@ -339,7 +310,7 @@ var getSysContext = async (workspace, type, name, options) => {
     type,
     name,
     path: `${type}s/${name}`,
-    hasConfig: await FileSys.fileExists(path.join(sys.cwdPath, "akan.config.ts")),
+    hasConfig: await FileSys2.fileExists(path.join(sys.cwdPath, "akan.config.ts")),
     modules: await getSysModules(workspace, sys, {
       includeAbstractContent: options.includeAbstractContent,
       module: options.module
@@ -411,62 +382,47 @@ class AkanContextAnalyzer {
       repairAction("generated", "akan repair generated --app <app-or-lib>", "Refresh generated Akan files.", true),
       repairAction("format", "akan repair format --target <app-or-lib-or-pkg>", "Run the formatter/linter repair path.", true)
     ];
+    const report = (diagnostic, action) => {
+      diagnostics.push({ ...diagnostic, repairActions: [action] });
+      repairActions.push(action);
+    };
     for (const sys of [...context.apps, ...context.libs]) {
       const sysPath = path.join(workspace.workspaceRoot, sys.path);
       for (const entry of await safeReadDir(sysPath)) {
         if (!isScannedRootEntry(sys.type, entry.name))
           continue;
         const allowed = entry.isDirectory() ? rootAllowedDirs[sys.type].has(entry.name) : rootAllowedFiles[sys.type].has(entry.name);
-        if (!allowed) {
-          const action = repairAction("module-shape", `akan repair module-shape --app ${sys.name}`, `Review ${sys.type} root shape and remove or move the unknown entry.`, false);
-          diagnostics.push({
+        const rootEntryHint = rootEntryHintOf(sys.type, entry.name);
+        if (!allowed)
+          report({
             severity: "error",
             code: `${sys.type}-root-unknown-entry`,
             path: `${sys.path}/${entry.name}`,
-            message: `Unexpected ${entry.isDirectory() ? "folder" : "file"} in ${sys.type} root: ${sys.path}/${entry.name}`,
-            repairActions: [action]
-          });
-          repairActions.push(action);
-        }
+            message: `Unexpected ${entry.isDirectory() ? "folder" : "file"} in ${sys.type} root: ${sys.path}/${entry.name}${rootEntryHint ? ` (${rootEntryHint})` : ""}`
+          }, repairAction("module-shape", `akan repair module-shape --app ${sys.name}`, `Review ${sys.type} root shape and remove or move the unknown entry.`, false));
       }
     }
     const agentDrift = await AkanContextAnalyzer.#agentGuideDrift(workspace);
-    if (agentDrift) {
-      const action = repairAction("generated", "akan agent install agents-md", agentDrift.hint, true);
-      diagnostics.push({
-        severity: "warning",
-        code: agentDrift.code,
-        path: "AGENTS.md",
-        message: agentDrift.message,
-        repairActions: [action]
-      });
-      repairActions.push(action);
-    }
+    if (agentDrift)
+      report({ severity: "warning", code: agentDrift.code, path: "AGENTS.md", message: agentDrift.message }, repairAction("generated", "akan agent install agents-md", agentDrift.hint, true));
     for (const sys of [...context.apps, ...context.libs]) {
       for (const module of sys.modules) {
-        if (!module.abstract.exists) {
-          const action = repairAction("module-shape", `akan repair module-shape --app ${sys.name} --module ${module.name}`, "Create the missing module abstract or inspect required source files.", false);
-          diagnostics.push({
+        const moduleShapeCommand = `akan repair module-shape --app ${sys.name} --module ${module.name}`;
+        if (!module.abstract.exists)
+          report({
             severity: strict ? "error" : "warning",
             code: "module-abstract-missing",
             path: module.abstract.path,
-            message: `${capitalize(module.kind)} module ${sys.name}:${module.name} should include ${module.abstract.path}`,
-            repairActions: [action]
-          });
-          repairActions.push(action);
-        }
+            message: `${capitalize(module.kind)} module ${sys.name}:${module.name} should include ${module.abstract.path}`
+          }, repairAction("module-shape", moduleShapeCommand, "Create the missing module abstract or inspect required source files.", false));
         const missingFiles = moduleShapeFiles(module).filter((filename) => !module.files.includes(filename));
-        if (missingFiles.length) {
-          const action = repairAction("module-shape", `akan repair module-shape --app ${sys.name} --module ${module.name}`, "Review missing required module source files.", false);
-          diagnostics.push({
+        if (missingFiles.length)
+          report({
             severity: "error",
             code: "module-shape-invalid",
             path: module.path,
-            message: `${capitalize(module.kind)} module ${sys.name}:${module.name} is missing required files: ${missingFiles.join(", ")}`,
-            repairActions: [action]
-          });
-          repairActions.push(action);
-        }
+            message: `${capitalize(module.kind)} module ${sys.name}:${module.name} is missing required files: ${missingFiles.join(", ")}`
+          }, repairAction("module-shape", moduleShapeCommand, "Review missing required module source files.", false));
         if (module.kind !== "service" && module.files.includes(`${module.name}.dictionary.ts`)) {
           const constantPath = path.join(workspace.workspaceRoot, module.path, `${module.name}.constant.ts`);
           const dictionaryPath = path.join(workspace.workspaceRoot, module.path, `${module.name}.dictionary.ts`);
@@ -478,15 +434,12 @@ class AkanContextAnalyzer {
             for (const fieldName of constantFieldNames(constantContent)) {
               if (new RegExp(`\\b${fieldName}\\s*:`).test(dictionaryContent))
                 continue;
-              const action = repairAction("dictionary", `akan repair dictionary --app ${sys.name} --module ${module.name}`, "Add missing dictionary labels for source constant fields.", false);
-              diagnostics.push({
+              report({
                 severity: "warning",
                 code: "dictionary-label-missing",
                 path: `${module.path}/${module.name}.dictionary.ts`,
-                message: `Dictionary labels for ${sys.name}:${module.name}.${fieldName} were not found.`,
-                repairActions: [action]
-              });
-              repairActions.push(action);
+                message: `Dictionary labels for ${sys.name}:${module.name}.${fieldName} were not found.`
+              }, repairAction("dictionary", `akan repair dictionary --app ${sys.name} --module ${module.name}`, "Add missing dictionary labels for source constant fields.", false));
             }
           }
         }
@@ -554,19 +507,16 @@ class AkanContextAnalyzer {
     const pushIndexDiagnostic = (indexPath, missing, stale, repairCommand) => {
       if (missing.length === 0 && stale.length === 0)
         return;
-      const action = repairAction("generated", repairCommand, "Regenerate the recipe index from the scanned recipes.", true);
       const parts = [
         missing.length > 0 ? `${missing.length} declared but unlisted (${missing.slice(0, 5).join(", ")})` : "",
         stale.length > 0 ? `${stale.length} listed but gone (${stale.slice(0, 5).join(", ")})` : ""
       ].filter(Boolean);
-      diagnostics.push({
+      report({
         severity: "error",
         code: "recipe-index-stale",
         path: indexPath,
-        message: `${indexPath} recipe index is out of date \u2014 ${parts.join("; ")}. Agents read this list as authoritative.`,
-        repairActions: [action]
-      });
-      repairActions.push(action);
+        message: `${indexPath} recipe index is out of date \u2014 ${parts.join("; ")}. Agents read this list as authoritative.`
+      }, repairAction("generated", repairCommand, "Regenerate the recipe index from the scanned recipes.", true));
     };
     const frameworkDeclared = declaredByImport.get("akanjs/ui") ?? new Set;
     if (frameworkDeclared.size > 0) {