@akanjs/cli 3.0.0-alpha.10 → 3.0.0-alpha.100

package/{index-qzdjd4ct.js → index-srdssqj7.js}

@@ -1,32 +1,32 @@
 // @bun
 import {
-  AkanContextAnalyzer
-} from "./index-774gcx29.js";
-import {
-  WorkflowExecutor,
-  compactWorkflowInputs,
-  createDryRunWorkflowApplyReport,
+  jsonText,
+  workflowPlanApproval,
   createWorkflowApplyReport,
+  workflowCommandsForPlan,
+  writeWorkflowRunArtifact,
+  readWorkflowRunArtifact,
   createWorkflowBaselineSummary,
-  createWorkflowPlan,
   createWorkflowValidationRunReport,
-  getWorkflowSpec,
-  jsonText,
+  createDryRunWorkflowApplyReport,
+  WorkflowExecutor,
   listWorkflowSpecs,
-  readWorkflowRunArtifact,
-  renderWorkflowApply,
-  renderWorkflowExplain,
+  getWorkflowSpec,
+  compactWorkflowInputs,
+  createWorkflowPlan,
   renderWorkflowList,
+  renderWorkflowExplain,
   renderWorkflowPlan,
-  renderWorkflowRunArtifact,
+  renderWorkflowApply,
   renderWorkflowValidation,
-  workflowCommandsForPlan,
-  workflowPlanApproval,
-  writeWorkflowRunArtifact
-} from "./index-rxkpk7n4.js";
+  renderWorkflowRunArtifact
+} from "./index-fc1bh0a7.js";
+import {
+  AkanContextAnalyzer
+} from "./index-gtmz74tj.js";
 import {
   runner
-} from "./index-kdh76j26.js";
+} from "./index-znynzt5w.js";
 
 // pkgs/@akanjs/cli/workflow/workflow.runner.ts
 import { mkdir, readFile, writeFile } from "fs/promises";

package/{index-j9cxndc0.js → index-w8kmx1b6.js}

@@ -1,4 +1,8 @@
 // @bun
+import {
+  FileSys
+} from "./index-q0y2jq9j.js";
+
 // pkgs/@akanjs/devkit/frontendBuild/clientEntryDiscovery.ts
 import path3 from "path";
 
@@ -349,7 +353,7 @@ var resolveNodePackageExport = async (workspaceRoot, specifier) => {
     const subpath = specifier === packageName ? "." : `.${specifier.slice(packageName.length)}`;
     const exported = resolvePackageExport(pkgJson.exports, subpath);
     const rel = exported ?? (subpath === "." ? pkgJson.module ?? pkgJson.main ?? "index.js" : null);
-    if (!rel || !rel.startsWith("."))
+    if (!rel?.startsWith("."))
       return null;
     const entryFile = await resolveFileCandidate(path2.resolve(pkgDir, rel));
     if (!entryFile)
@@ -849,6 +853,7 @@ class ClientEntriesBundler {
   #externalSubpaths;
   #externalAliases;
   #command;
+  #target;
   #outputSubdir;
   #reactFastRefresh;
   #artifactDir;
@@ -870,6 +875,7 @@ class ClientEntriesBundler {
     this.#externalSubpaths = options.externalSubpaths ?? [];
     this.#externalAliases = options.externalAliases ?? {};
     this.#command = options.command ?? "start";
+    this.#target = options.target ?? "browser";
     this.#outputSubdir = options.outputSubdir ?? "client";
     this.#reactFastRefresh = options.reactFastRefresh ?? false;
     this.#artifactDir = `${this.#command === "build" ? this.#app.dist.cwdPath : this.#app.cwdPath}/.akan/artifact`;
@@ -883,7 +889,7 @@ class ClientEntriesBundler {
       entrypoints: this.#opaqueEntries.entries,
       outdir: this.#outdir,
       splitting: true,
-      target: "browser",
+      target: this.#target,
       format: "esm",
       naming: CLIENT_BUNDLE_NAMING,
       metafile: true,
@@ -1117,7 +1123,8 @@ var VENDOR_SPECIFIERS = [
   "akanjs/store",
   "akanjs/base",
   "akanjs/common",
-  "akanjs/constant"
+  "akanjs/constant",
+  "akanjs/fetch"
 ];
 
 // pkgs/@akanjs/devkit/frontendBuild/routeClientBuilder.ts
@@ -1226,12 +1233,11 @@ class RouteClientBuilder {
     }).bundle();
   }
   async#buildSsrBundle(bootstrapEntries) {
-    const externalOptions = RouteClientBuilder.resolveSsrClientExternalOptions(this.#command);
     return new ClientEntriesBundler({
       app: this.#app,
       entries: bootstrapEntries.buildEntries,
       plugins: [await createBarrelImportsPlugin(this.#app)],
-      ...externalOptions,
+      ...RouteClientBuilder.resolveSsrClientBundleOptions(this.#command),
       outputSubdir: "client-ssr",
       command: this.#command
     }).bundle();
@@ -1293,15 +1299,16 @@ ${defaultNames.map((name) => `export default ${name};`).join(`
     const serverEntry = RouteClientBuilder.resolveAkanServerEntry();
     return { [Bun.resolveSync("akanjs/fetch", serverEntry)]: "akanjs/fetch" };
   }
-  static resolveSsrClientExternalOptions(command) {
+  static resolveSsrClientBundleOptions(command) {
     if (command === "start") {
       return {
+        target: "bun",
         external: SSR_CLIENT_EXTERNALS,
         externalSubpaths: ["akanjs/fetch"],
         externalAliases: RouteClientBuilder.resolveSsrClientRuntimeAliases()
       };
     }
-    return { external: SSR_CLIENT_ALIAS_EXTERNALS };
+    return { target: "bun", external: SSR_CLIENT_ALIAS_EXTERNALS };
   }
   static resolveAkanServerEntry() {
     try {
@@ -1337,7 +1344,7 @@ ${defaultNames.map((name) => `export default ${name};`).join(`
 }
 
 // pkgs/@akanjs/devkit/frontendBuild/autoImportSync.ts
-import { readdir, readFile, stat, writeFile } from "fs/promises";
+import { readdir, readFile, stat } from "fs/promises";
 import path7 from "path";
 import ts2 from "typescript";
 var TEST_FILE_RE = /\.(test|spec)\.(ts|tsx)$/;
@@ -1515,6 +1522,8 @@ class AutoImportSync {
     const [scope, project, facet] = parts;
     if (scope !== "apps" && scope !== "libs" || !project || !facet)
       return null;
+    if (facet === "lib" && parts[3] === "__lib")
+      return null;
     const role = roleFor(facet, base);
     if (!role)
       return null;
@@ -1529,7 +1538,7 @@ class AutoImportSync {
     const next = transformSource(source, abs, ctx, resolveExtra);
     if (next === null || next === source)
       return false;
-    await writeFile(abs, next);
+    await FileSys.writeTextAtomic(abs, next);
     return true;
   }
   async#extraResolverFor(abs, ctx) {
@@ -2010,7 +2019,7 @@ class DevChangePlanner {
 var uniqueResolved = (files) => [...new Set(files.map((file) => path8.resolve(file)))].sort();
 
 // pkgs/@akanjs/devkit/frontendBuild/devGeneratedIndexSync.ts
-import { mkdir as mkdir2, readdir as readdir2, readFile as readFile2, rm, stat as stat2, writeFile as writeFile2 } from "fs/promises";
+import { mkdir as mkdir2, readdir as readdir2, readFile as readFile2, rm, stat as stat2 } from "fs/promises";
 import path9 from "path";
 var BARREL_FACETS2 = new Set(["common", "srvkit", "ui", "webkit", "plugin"]);
 var FACET_SOURCE_FILE_RE = /\.(ts|tsx)$/;
@@ -2102,7 +2111,7 @@ class DevGeneratedIndexSync {
     if (current === content)
       return false;
     await mkdir2(dir, { recursive: true });
-    await writeFile2(indexPath, content);
+    await FileSys.writeTextAtomic(indexPath, content);
     return true;
   }
   async#contentForIndex(indexPath) {

package/{index-82jrh4hj.js → index-yks023mb.js}

@@ -1,24 +1,24 @@
 // @bun
 import {
-  CloudRunner
-} from "./index-4m0bphac.js";
+  GlobalConfig,
+  CloudApi,
+  AiSession
+} from "./index-c69j78kk.js";
 import {
-  PackageScript
-} from "./index-gcv8ncfh.js";
+  PkgExecutor
+} from "./index-qsq3q8fy.js";
 import {
-  AiSession,
-  CloudApi,
-  GlobalConfig
-} from "./index-0cj2zxbm.js";
+  script
+} from "./index-znynzt5w.js";
 import {
   ApplicationScript
-} from "./index-62955kn5.js";
+} from "./index-zz5jyd94.js";
 import {
-  script
-} from "./index-kdh76j26.js";
+  PackageScript
+} from "./index-7d6vny25.js";
 import {
-  PkgExecutor
-} from "./index-z8ptfkzv.js";
+  CloudRunner
+} from "./index-zxgr3s8s.js";
 
 // pkgs/@akanjs/cli/cloud/cloud.script.ts
 import { Logger } from "akanjs/common";

package/{index-5sn5w2mt.js → index-yza7zkpt.js}

@@ -1,54 +1,54 @@
 // @bun
 import {
-  RepairRunner
-} from "./index-jf2ya7r2.js";
-import {
-  WorkflowRunner
-} from "./index-qzdjd4ct.js";
-import {
-  ScalarScript
-} from "./index-y4vkyhvv.js";
-import {
-  PrimitiveScript
-} from "./index-3vta1tqa.js";
-import {
-  ModuleScript
-} from "./index-jhpa13zj.js";
+  AppExecutor
+} from "./index-qsq3q8fy.js";
 import {
-  isPlaceholderAppId
-} from "./index-779ske1y.js";
+  jsonText,
+  createWorkflowBaselineSummary,
+  buildAkanModuleContextIndex,
+  createWorkflowStepRegistry,
+  toolingRolloutGate
+} from "./index-fc1bh0a7.js";
 import {
-  AkanContextAnalyzer,
-  akanMcpInstallConfigPaths,
-  akanMcpInstallTargets,
+  buildResourceList,
   codexMcpConfigPath,
-  createAkanCodexMcpServerBlock,
+  akanMcpInstallTargets,
+  akanMcpInstallConfigPaths,
   createAkanMcpServer,
+  createAkanCodexMcpServerBlock,
+  upsertCodexMcpServerBlock,
   renderDoctorText,
-  resourceList,
-  upsertCodexMcpServerBlock
-} from "./index-774gcx29.js";
+  AkanContextAnalyzer
+} from "./index-gtmz74tj.js";
 import {
-  buildAkanModuleContextIndex,
-  createWorkflowBaselineSummary,
-  createWorkflowStepRegistry,
-  jsonText,
-  toolingRolloutGate
-} from "./index-rxkpk7n4.js";
+  CommandContainer,
+  runner,
+  script
+} from "./index-znynzt5w.js";
+import {
+  isPlaceholderAppId2
+} from "./index-1yxtbmbj.js";
 import {
   Prompter
-} from "./index-j37qq1f2.js";
+} from "./index-h7yw2z9n.js";
 import {
-  getMobileTargets
-} from "./index-76rn3g2c.js";
+  RepairRunner
+} from "./index-0amdxycf.js";
 import {
-  CommandContainer,
-  runner,
-  script
-} from "./index-kdh76j26.js";
+  WorkflowRunner
+} from "./index-srdssqj7.js";
 import {
-  AppExecutor
-} from "./index-z8ptfkzv.js";
+  ModuleScript
+} from "./index-zmjppp25.js";
+import {
+  PrimitiveScript
+} from "./index-qkk27bk6.js";
+import {
+  ScalarScript
+} from "./index-8p8p0cf8.js";
+import {
+  getMobileTargets
+} from "./index-47pj3aee.js";
 
 // pkgs/@akanjs/cli/context/context.script.ts
 import { Logger } from "akanjs/common";
@@ -380,12 +380,15 @@ var applyMcpTools = [
     }
   }
 ];
-var listAkanMcpTools = (mode = "readonly") => {
-  if (mode === "readonly")
-    return readonlyMcpTools;
-  if (mode === "plan")
-    return [...readonlyMcpTools, ...planMcpTools];
-  return [...readonlyMcpTools, ...planMcpTools, ...applyMcpTools];
+var listAkanMcpTools = (mode = "readonly", { guidelineNames = [] } = {}) => {
+  const tools = mode === "readonly" ? readonlyMcpTools : mode === "plan" ? [...readonlyMcpTools, ...planMcpTools] : [...readonlyMcpTools, ...planMcpTools, ...applyMcpTools];
+  if (guidelineNames.length === 0)
+    return tools;
+  return tools.map((tool) => tool.name === "get_guideline" ? {
+    ...tool,
+    description: `${tool.description ?? ""} One of: ${guidelineNames.join(", ")}.`.trim(),
+    inputSchema: { ...tool.inputSchema, properties: { name: { type: "string", enum: [...guidelineNames] } } }
+  } : tool);
 };
 var createAkanValidationContract = (listTools = listAkanMcpTools) => ({
   schemaVersion: 1,
@@ -604,6 +607,10 @@ var createCliWorkflowStepRegistry = (workspace) => createWorkflowStepRegistry({
 });
 
 // pkgs/@akanjs/cli/context/context.runner.ts
+var toolErrorText = (error) => {
+  const message = error instanceof Error ? error.message : String(error);
+  return message.replace(/\/(?:[^\s"'/]+\/)*(?=(?:pkgs|apps|libs|infra)\/)/g, "<workspace>/");
+};
 var workflowDiagnosticFromContext = (diagnostic) => ({
   severity: diagnostic.severity,
   code: diagnostic.code,
@@ -662,7 +669,7 @@ class ContextRunner extends runner("context") {
       if (!config.hasMobileConfig)
         continue;
       for (const { name, config: target } of await getMobileTargets(app)) {
-        if (!isPlaceholderAppId(target.appId))
+        if (!isPlaceholderAppId2(target.appId))
           continue;
         diagnostics.push({
           severity: "warning",
@@ -720,8 +727,8 @@ class ContextRunner extends runner("context") {
     await workspace.writeFile(codexMcpConfigPath, merged);
     return codexMcpConfigPath;
   }
-  listMcpTools(mode = "readonly") {
-    return listAkanMcpTools(mode);
+  listMcpTools(mode = "readonly", { guidelineNames = [] } = {}) {
+    return listAkanMcpTools(mode, { guidelineNames });
   }
   async callMcpTool(workspace, name, args = {}, { mode = "readonly" } = {}) {
     const availableTools = this.listMcpTools(mode);
@@ -776,7 +783,7 @@ class ContextRunner extends runner("context") {
     if (name === "explain_command")
       return this.explainCommand(stringArg(args, "command"));
     if (name === "get_validation_contract")
-      return createAkanValidationContract((mode2) => this.listMcpTools(mode2));
+      return createAkanValidationContract((mode) => this.listMcpTools(mode));
     if (name === "list_workflows")
       return parseJsonOutput(new WorkflowRunner().list({ format: "json" }));
     if (name === "explain_workflow")
@@ -851,17 +858,20 @@ class ContextRunner extends runner("context") {
 ${payload}`);
     };
     const respond = (id, result, framing) => {
-      writeMessage({ jsonrpc: "2.0", id, result }, framing);
+      writeMessage({ jsonrpc: "2.0", id: id ?? null, result }, framing);
     };
     const respondError = (id, code, message, framing) => {
-      writeMessage({ jsonrpc: "2.0", id, error: { code, message } }, framing);
+      writeMessage({ jsonrpc: "2.0", id: id ?? null, error: { code, message } }, framing);
     };
+    const guidelineNames = await Prompter.listGuidelines();
+    const resources = buildResourceList(guidelineNames);
     const readResource = async (uri) => {
-      const context = await AkanContextAnalyzer.analyze(workspace);
-      if (uri === "akan://docs/framework" || uri === "akan://guidelines/framework")
+      if (uri === "akan://docs/framework")
         return { uri, mimeType: "text/markdown", text: await Prompter.getInstruction("framework") };
-      if (uri === "akan://guidelines/modelSignal")
-        return { uri, mimeType: "text/markdown", text: await Prompter.getInstruction("modelSignal") };
+      const guideline = /^akan:\/\/guidelines\/(.+)$/.exec(uri)?.[1];
+      if (guideline)
+        return { uri, mimeType: "text/markdown", text: await Prompter.getInstruction(guideline) };
+      const context = await AkanContextAnalyzer.analyze(workspace);
       if (uri === "akan://workspace/summary")
         return { uri, mimeType: "application/json", text: jsonText(context, { trailingNewline: false }) };
       if (uri === "akan://workspace/apps")
@@ -883,7 +893,7 @@ ${payload}`);
       }
       throw new Error(`Unknown resource: ${uri}`);
     };
-    const handle = async (request, framing) => {
+    const handleRequest = async (request, framing) => {
       const params = request.params ?? {};
       if (request.method === "initialize") {
         respond(request.id, {
@@ -893,7 +903,7 @@ ${payload}`);
         }, framing);
       } else if (request.method === "tools/list") {
         respond(request.id, {
-          tools: this.listMcpTools(mode)
+          tools: this.listMcpTools(mode, { guidelineNames })
         }, framing);
       } else if (request.method === "tools/call") {
         const name = params.name;
@@ -909,16 +919,39 @@ ${payload}`);
             ]
           }, framing);
         } catch (error) {
-          respondError(request.id, -32602, error instanceof Error ? error.message : String(error), framing);
+          respond(request.id, { content: [{ type: "text", text: toolErrorText(error) }], isError: true }, framing);
         }
       } else if (request.method === "resources/list") {
-        respond(request.id, { resources: resourceList }, framing);
+        respond(request.id, { resources }, framing);
       } else if (request.method === "resources/read") {
         respond(request.id, { contents: [await readResource(params.uri)] }, framing);
-      } else if (!request.method.endsWith("/initialized")) {
+      } else {
         respondError(request.id, -32601, `Unknown method: ${request.method}`, framing);
       }
     };
+    const handle = async (request, framing) => {
+      if (request.id === undefined || request.id === null)
+        return;
+      try {
+        await handleRequest(request, framing);
+      } catch (error) {
+        respondError(request.id, -32603, error instanceof Error ? error.message : String(error), framing);
+      }
+    };
+    const handleFrame = async (payload, framing) => {
+      let request;
+      try {
+        request = JSON.parse(payload);
+      } catch (error) {
+        respondError(null, -32700, error instanceof Error ? error.message : String(error), framing);
+        return;
+      }
+      if (!request || typeof request !== "object" || typeof request.method !== "string") {
+        respondError(null, -32600, "Invalid Request: expected a JSON-RPC 2.0 object with a method", framing);
+        return;
+      }
+      await handle(request, framing);
+    };
     const parseContentLengthMessage = async () => {
       const headerEnd = buffer.indexOf(`\r
 \r
@@ -938,7 +971,7 @@ ${payload}`);
         return false;
       const body = buffer.slice(bodyStart, bodyEnd);
       buffer = buffer.slice(bodyEnd);
-      await handle(JSON.parse(body), "content-length");
+      await handleFrame(body, "content-length");
       return true;
     };
     const parseLineMessage = async () => {
@@ -950,7 +983,7 @@ ${payload}`);
       buffer = buffer.slice(lineEnd + 1);
       if (!line)
         return true;
-      await handle(JSON.parse(line), "newline");
+      await handleFrame(line, "newline");
       return true;
     };
     const parse = async () => {

package/{index-jhpa13zj.js → index-zmjppp25.js}

@@ -1,34 +1,34 @@
 // @bun
 import {
-  pluralizeName
-} from "./index-ss469dec.js";
-import {
-  PageScript
-} from "./index-xmmzf150.js";
+  FileSys
+} from "./index-q0y2jq9j.js";
 import {
   AiSession
-} from "./index-0cj2zxbm.js";
+} from "./index-c69j78kk.js";
 import {
-  bilingualDescriptionForField,
-  bilingualLabelForField,
-  createPassedPrimitiveReport,
-  generatedFilesForSync,
-  moduleSourcePaths,
-  sourceFile
-} from "./index-rxkpk7n4.js";
-import {
-  Prompter
-} from "./index-j37qq1f2.js";
+  ModuleExecutor
+} from "./index-qsq3q8fy.js";
 import {
   runner,
   script
-} from "./index-kdh76j26.js";
+} from "./index-znynzt5w.js";
 import {
-  ModuleExecutor
-} from "./index-z8ptfkzv.js";
+  sourceFile,
+  moduleSourcePaths,
+  generatedFilesForSync,
+  createPassedPrimitiveReport,
+  bilingualLabelForField,
+  bilingualDescriptionForField
+} from "./index-fc1bh0a7.js";
 import {
-  FileSys
-} from "./index-67546d0j.js";
+  PageScript
+} from "./index-hyywke0f.js";
+import {
+  Prompter
+} from "./index-h7yw2z9n.js";
+import {
+  pluralizeName
+} from "./index-nz8prx9g.js";
 
 // pkgs/@akanjs/devkit/getRelatedCnsts.ts
 import { readFileSync, realpathSync } from "fs";
@@ -662,39 +662,39 @@ class ModuleRunner extends runner("module") {
 }
 
 // pkgs/@akanjs/cli/module/module.script.ts
-var moduleChangedFiles = (sys2, moduleName, files) => Object.values(files).map((file) => sourceFile(sys2, `lib/${moduleName}/${file.filename}`, "create", "Module source file was created."));
+var moduleChangedFiles = (sys, moduleName, files) => Object.values(files).map((file) => sourceFile(sys, `lib/${moduleName}/${file.filename}`, "create", "Module source file was created."));
 
 class ModuleScript extends script("module", [ModuleRunner, PageScript]) {
-  async createModuleTemplate(sys2, name, { page = false } = {}) {
-    const mod = ModuleExecutor.from(sys2, name);
+  async createModuleTemplate(sys, name, { page = false } = {}) {
+    const mod = ModuleExecutor.from(sys, name);
     const files = await this.moduleRunner.createModuleTemplate(mod);
-    if (page && sys2.type === "app")
-      await this.pageScript.createCrudPage(mod, { app: sys2, basePath: null, single: false });
-    await sys2.scan();
+    if (page && sys.type === "app")
+      await this.pageScript.createCrudPage(mod, { app: sys, basePath: null, single: false });
+    await sys.scan();
     return createPassedPrimitiveReport({
       command: "create-module",
-      changedFiles: moduleChangedFiles(sys2, name, files),
-      generatedFiles: generatedFilesForSync(sys2, "Generated files were refreshed after module creation."),
-      target: sys2.name
+      changedFiles: moduleChangedFiles(sys, name, files),
+      generatedFiles: generatedFilesForSync(sys, "Generated files were refreshed after module creation."),
+      target: sys.name
     });
   }
-  async createModule(sys2, name, {
+  async createModule(sys, name, {
     page = false,
     description,
     schemaDescription
   } = {}) {
-    const isContinued = await sys2.exists(`lib/${name}/${name}.constant.ts`);
-    const session = new AiSession("createModule", { workspace: sys2.workspace, cacheKey: name, isContinued });
-    const moduleConstantExampleFiles = await sys2.workspace.getConstantFiles();
-    const executor = ModuleExecutor.from(sys2, name);
+    const isContinued = await sys.exists(`lib/${name}/${name}.constant.ts`);
+    const session = new AiSession("createModule", { workspace: sys.workspace, cacheKey: name, isContinued });
+    const moduleConstantExampleFiles = await sys.workspace.getConstantFiles();
+    const executor = ModuleExecutor.from(sys, name);
     const files = await this.moduleRunner.createModuleTemplate(executor);
     const { constant, dictionary } = files;
-    if (page && sys2.type === "app")
-      await this.pageScript.createCrudPage(executor, { app: sys2, basePath: null, single: false });
+    if (page && sys.type === "app")
+      await this.pageScript.createCrudPage(executor, { app: sys, basePath: null, single: false });
     const modelDesc = description ?? await input({ message: "description of module" });
     const modelSchemaDesign = schemaDescription ?? await input({ message: "schema description of module" });
-    const config = await sys2.getConfig();
-    const moduleRequest = new ModuleRequest({ sysType: sys2.type, sysName: sys2.name, modelName: name, config });
+    const config = await sys.getConfig();
+    const moduleRequest = new ModuleRequest({ sysType: sys.type, sysName: sys.name, modelName: name, config });
     const constantRequestPrompt = await moduleRequest.requestModelConstant({
       modelDesc,
       modelSchemaDesign,
@@ -702,38 +702,38 @@ class ModuleScript extends script("module", [ModuleRunner, PageScript]) {
       exampleFiles: randomPicks(moduleConstantExampleFiles, Math.min(10, moduleConstantExampleFiles.length))
     });
     const constantGuide = await ModuleRequest.getGuideJson("modelConstant");
-    const constantWrites = await session.writeTypescripts(constantRequestPrompt, sys2, {
+    const constantWrites = await session.writeTypescripts(constantRequestPrompt, sys, {
       validate: constantGuide.update.rules
     });
     for (const scalarName of this.#getCreatedScalarNames(constantWrites.map(({ filePath }) => filePath))) {
-      await sys2.applyTemplate({
+      await sys.applyTemplate({
         basePath: "./lib/__scalar",
         template: "__scalar",
-        dict: { model: scalarName, models: pluralizeName(scalarName), sysName: sys2.name },
+        dict: { model: scalarName, models: pluralizeName(scalarName), sysName: sys.name },
         overwrite: false
       });
     }
-    const constantContent = await sys2.readFile(`lib/${name}/${name}.constant.ts`);
+    const constantContent = await sys.readFile(`lib/${name}/${name}.constant.ts`);
     const dictionaryGuide = await ModuleRequest.getGuideJson("modelDictionary");
     await session.writeTypescripts(requestDictionary({
-      sysName: sys2.name,
+      sysName: sys.name,
       modelName: name,
       constant: constantContent,
       modelDesc,
       modelSchemaDesign,
       boilerplate: dictionary.content,
       exampleFiles: randomPicks(moduleConstantExampleFiles, Math.min(10, moduleConstantExampleFiles.length))
-    }), sys2, { validate: dictionaryGuide.update.rules });
-    await sys2.scan();
-    sys2.log(`Module ${name} created in ${sys2.type}s/${sys2.name}/lib/${name}`);
+    }), sys, { validate: dictionaryGuide.update.rules });
+    await sys.scan();
+    sys.log(`Module ${name} created in ${sys.type}s/${sys.name}/lib/${name}`);
     return createPassedPrimitiveReport({
       command: "create-module",
       changedFiles: [
-        ...moduleChangedFiles(sys2, name, files),
-        ...constantWrites.map((write) => sourceFile(sys2, write.filePath, "modify", "AI-assisted module constant source was updated."))
+        ...moduleChangedFiles(sys, name, files),
+        ...constantWrites.map((write) => sourceFile(sys, write.filePath, "modify", "AI-assisted module constant source was updated."))
       ],
-      generatedFiles: generatedFilesForSync(sys2, "Generated files were refreshed after module creation."),
-      target: sys2.name
+      generatedFiles: generatedFilesForSync(sys, "Generated files were refreshed after module creation."),
+      target: sys.name
     });
   }
   #getCreatedScalarNames(filePaths) {
@@ -744,15 +744,15 @@ class ModuleScript extends script("module", [ModuleRunner, PageScript]) {
   async removeModule(mod) {
     await this.moduleRunner.removeModule(mod);
   }
-  async createService(sys2, name) {
-    const service = ModuleExecutor.from(sys2, `_${name}`);
+  async createService(sys, name) {
+    const service = ModuleExecutor.from(sys, `_${name}`);
     const files = await this.moduleRunner.createService(service);
-    await sys2.scan();
+    await sys.scan();
     return createPassedPrimitiveReport({
       command: "create-service",
-      changedFiles: moduleChangedFiles(sys2, `_${name}`, files),
-      generatedFiles: generatedFilesForSync(sys2, "Generated files were refreshed after service creation."),
-      target: sys2.name
+      changedFiles: moduleChangedFiles(sys, `_${name}`, files),
+      generatedFiles: generatedFilesForSync(sys, "Generated files were refreshed after service creation."),
+      target: sys.name
     });
   }
   async createTest(workspace, name) {}