@akanjs/cli 3.0.0-beta.8 → 3.0.0

package/{index-y6n8nmny.js → index-abxpehf8.js}

@@ -1,60 +1,45 @@
 // @bun
 import {
   AppExecutor
-} from "./index-2tv3fdx4.js";
+} from "./index-3w94e7n3.js";
 import {
   jsonText,
   createWorkflowBaselineSummary,
   buildAkanModuleContextIndex,
-  createWorkflowStepRegistry,
   toolingRolloutGate
-} from "./index-gyd220p2.js";
+} from "./index-y3mphr1m.js";
 import {
   buildResourceList,
   codexMcpConfigPath,
-  akanMcpInstallTargets,
   akanMcpInstallConfigPaths,
   createAkanMcpServer,
   createAkanCodexMcpServerBlock,
   upsertCodexMcpServerBlock,
   renderDoctorText,
   AkanContextAnalyzer
-} from "./index-ktb5njgy.js";
+} from "./index-9z771ptz.js";
 import {
-  CommandContainer,
-  runner,
-  script
-} from "./index-0g7r8xz3.js";
+  runner
+} from "./index-vpj42xwt.js";
 import {
-  isPlaceholderAppId2
-} from "./index-wt7qrtd4.js";
+  getMobileTargets,
+  appIdsOf,
+  NativeApp,
+  isPlaceholderAppId
+} from "./index-gbggbqcp.js";
 import {
-  Prompter
-} from "./index-h7yw2z9n.js";
+  Prompter2
+} from "./index-zzvvc845.js";
 import {
   RepairRunner
-} from "./index-04bk599g.js";
+} from "./index-93j60em0.js";
 import {
   WorkflowRunner
-} from "./index-ffvk10zz.js";
-import {
-  ModuleScript
-} from "./index-5ystnsd5.js";
-import {
-  PrimitiveScript
-} from "./index-d43r08tf.js";
-import {
-  ScalarScript
-} from "./index-a17x49vg.js";
-import {
-  getMobileTargets
-} from "./index-47pj3aee.js";
-
-// pkgs/@akanjs/cli/context/context.script.ts
-import { Logger } from "akanjs/common";
+} from "./index-f3c78nd6.js";
 
 // pkgs/@akanjs/devkit/akanMcpContract.ts
 import path from "path";
+import { isRecord } from "akanjs/common";
 var emptySchema = { type: "object", properties: {} };
 var stringProperty = { type: "string" };
 var booleanProperty = { type: "boolean" };
@@ -138,18 +123,11 @@ var inspectAkanContextInputSchema = {
   },
   required: ["question", "draft", "review", "request"]
 };
-var isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 var slugPart = (value) => typeof value === "string" ? value.trim().replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-+|-+$/g, "").toLowerCase() : "";
 var optionalString = (args, key) => {
   const value = args[key];
   return typeof value === "string" && value ? value : undefined;
 };
-var nestedStringArg = (args, key) => {
-  const value = args[key];
-  if (typeof value !== "string" || !value)
-    throw new Error(`MCP tool argument "${key}" is required.`);
-  return value;
-};
 var isInspectAkanContextRequestType = (value) => typeof value === "string" && inspectAkanContextRequestTypes.includes(value);
 var parseJsonOutput = (output) => JSON.parse(output);
 var workspacePath = (workspace, filePath) => path.isAbsolute(filePath) ? filePath : path.join(workspace.workspaceRoot, filePath);
@@ -204,50 +182,31 @@ var inspectAkanContextPropsArg = (args) => {
   if (!isInspectAkanContextRequestType(args.request.type)) {
     throw new Error('MCP tool argument "request.type" must be a supported inspect_akan_context request type.');
   }
-  const draft = { reason: nestedStringArg(args.draft, "reason"), type: args.draft.type };
+  const base = { question, draft: { reason: stringArg(args.draft, "reason"), type: args.draft.type }, review };
   const request = args.request;
   if (request.type === "workspaceOverview")
-    return { question, draft, review, request: { type: request.type } };
+    return { ...base, request: { type: request.type } };
   if (request.type === "moduleContext")
     return {
-      question,
-      draft,
-      review,
-      request: {
-        type: request.type,
-        app: nestedStringArg(request, "app"),
-        module: nestedStringArg(request, "module")
-      }
+      ...base,
+      request: { type: request.type, app: stringArg(request, "app"), module: stringArg(request, "module") }
     };
   if (request.type === "fieldInsertionContext")
     return {
-      question,
-      draft,
-      review,
+      ...base,
       request: {
         type: request.type,
-        app: nestedStringArg(request, "app"),
-        module: nestedStringArg(request, "module"),
-        field: nestedStringArg(request, "field"),
-        fieldType: nestedStringArg(request, "fieldType")
+        app: stringArg(request, "app"),
+        module: stringArg(request, "module"),
+        field: stringArg(request, "field"),
+        fieldType: stringArg(request, "fieldType")
       }
     };
   if (request.type === "workflowDiagnostics")
-    return {
-      question,
-      draft,
-      review,
-      request: { type: request.type, runIdOrPlan: nestedStringArg(request, "runIdOrPlan") }
-    };
+    return { ...base, request: { type: request.type, runIdOrPlan: stringArg(request, "runIdOrPlan") } };
   return {
-    question,
-    draft,
-    review,
-    request: {
-      type: "escape",
-      reason: nestedStringArg(request, "reason"),
-      nextStep: optionalString(request, "nextStep")
-    }
+    ...base,
+    request: { type: "escape", reason: stringArg(request, "reason"), nextStep: optionalString(request, "nextStep") }
   };
 };
 var inspectDiagnostic = (severity, code, message) => ({ severity, code, message });
@@ -471,22 +430,11 @@ var inspectAkanContext = async (workspace, args) => {
       strict: true,
       runIdOrPlan: workspacePath(workspace, props.request.runIdOrPlan)
     });
-    const baselineSummary = createWorkflowBaselineSummary((doctor.baselineDiagnostics ?? []).map((diagnostic) => ({
-      severity: diagnostic.severity,
-      code: diagnostic.code,
-      message: diagnostic.message,
-      scope: diagnostic.scope,
-      context: diagnostic.context
-    })), { detailsIncluded: false });
-    diagnostics.push(...(doctor.workflowDiagnostics ?? doctor.diagnostics).map((diagnostic) => ({
-      severity: diagnostic.severity,
-      code: diagnostic.code,
-      message: diagnostic.message,
-      scope: diagnostic.scope,
-      context: {
-        ...diagnostic.context,
-        ...diagnostic.path ? { paths: [diagnostic.path] } : {}
-      }
+    const toWorkflowDiagnostic = ({ severity, code, message, scope }, context) => ({ severity, code, message, scope, context });
+    const baselineSummary = createWorkflowBaselineSummary((doctor.baselineDiagnostics ?? []).map((diagnostic) => toWorkflowDiagnostic(diagnostic, diagnostic.context)), { detailsIncluded: false });
+    diagnostics.push(...(doctor.workflowDiagnostics ?? doctor.diagnostics).map((diagnostic) => toWorkflowDiagnostic(diagnostic, {
+      ...diagnostic.context,
+      ...diagnostic.path ? { paths: [diagnostic.path] } : {}
     })));
     return baseResult("workflowDiagnostics", [
       {
@@ -504,9 +452,10 @@ var inspectAkanContext = async (workspace, args) => {
       workflowDiagnostics: doctor.workflowDiagnostics?.length ?? 0
     });
   }
+  const moduleRequest = props.request.type === "moduleContext" || props.request.type === "fieldInsertionContext" ? props.request : null;
   const context = await AkanContextAnalyzer.analyze(workspace, {
-    app: props.request.type === "moduleContext" || props.request.type === "fieldInsertionContext" ? props.request.app : null,
-    module: props.request.type === "moduleContext" || props.request.type === "fieldInsertionContext" ? props.request.module : null,
+    app: moduleRequest?.app ?? null,
+    module: moduleRequest?.module ?? null,
     includeAbstractContent: false
   });
   if (props.request.type === "workspaceOverview") {
@@ -594,41 +543,22 @@ var inspectAkanContext = async (workspace, args) => {
   });
 };
 
-// pkgs/@akanjs/cli/context/context.workflowRegistry.ts
-var createCliWorkflowStepRegistry = (workspace) => createWorkflowStepRegistry({
-  workspace,
-  createModule: (sys, module) => CommandContainer.get(ModuleScript).createModuleTemplate(sys, module),
-  createScalar: (sys, scalar) => CommandContainer.get(ScalarScript).createScalar(sys, scalar),
-  createUi: (input) => CommandContainer.get(PrimitiveScript).createUi(workspace, input),
-  addField: (input) => CommandContainer.get(PrimitiveScript).addField(workspace, input),
-  addEnumField: (input) => CommandContainer.get(PrimitiveScript).addEnumField(workspace, input),
-  addMutation: (input) => CommandContainer.get(PrimitiveScript).addMutation(workspace, input),
-  addSlice: (input) => CommandContainer.get(PrimitiveScript).addSlice(workspace, input)
-});
-
 // 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,
-  message: diagnostic.message,
-  scope: diagnostic.scope,
-  context: diagnostic.context
-});
 var compactDoctorWorkspaceResult = (result, includeBaselineDetails) => {
   const baselineDiagnostics = result.baselineDiagnostics ?? [];
-  if (baselineDiagnostics.length === 0) {
-    return {
-      ...result,
-      baselineSummary: createWorkflowBaselineSummary([], { detailsIncluded: includeBaselineDetails })
-    };
-  }
-  const baselineSummary = createWorkflowBaselineSummary(baselineDiagnostics.map(workflowDiagnosticFromContext), {
-    detailsIncluded: includeBaselineDetails
-  });
+  const baselineSummary = createWorkflowBaselineSummary(baselineDiagnostics.map(({ severity, code, message, scope, context }) => ({
+    severity,
+    code,
+    message,
+    scope,
+    context
+  })), { detailsIncluded: includeBaselineDetails });
+  if (baselineDiagnostics.length === 0)
+    return { ...result, baselineSummary };
   return {
     ...result,
     baselineSummary,
@@ -637,17 +567,13 @@ var compactDoctorWorkspaceResult = (result, includeBaselineDetails) => {
   };
 };
 
-class ContextRunner extends runner("context") {
+class ContextRunner2 extends runner("context") {
   async getContext(workspace, {
     format = "markdown",
     app = null,
     module = null
   } = {}) {
-    const context = await AkanContextAnalyzer.analyze(workspace, {
-      app,
-      module,
-      includeAbstractContent: !!module
-    });
+    const context = await AkanContextAnalyzer.analyze(workspace, { app, module, includeAbstractContent: !!module });
     return format === "json" ? jsonText(context) : AkanContextAnalyzer.renderMarkdown(context, { module });
   }
   async doctor(workspace, {
@@ -663,19 +589,32 @@ class ContextRunner extends runner("context") {
   async#doctorIos(workspace, format) {
     const appNames = await workspace.getApps();
     const diagnostics = [];
+    let toolchainChecked = false;
     for (const appName of appNames) {
       const app = AppExecutor.from(workspace, appName);
       const config = await app.getConfig();
-      if (!config.hasMobileConfig)
+      if (!config.hasNativeConfig)
         continue;
+      if (!toolchainChecked) {
+        toolchainChecked = true;
+        const report = await NativeApp.doctor(app.cwdPath, ["ios"]);
+        for (const check of report.checks.filter((check) => !check.ok || check.warn))
+          diagnostics.push({
+            severity: check.ok ? "warning" : "error",
+            code: "native-toolchain",
+            path: `${check.group} \u203A ${check.name}`,
+            message: [check.detail, check.hint].filter(Boolean).join(" ")
+          });
+      }
       for (const { name, config: target } of await getMobileTargets(app)) {
-        if (!isPlaceholderAppId2(target.appId))
+        const placeholder = appIdsOf(target.appId).find(isPlaceholderAppId);
+        if (!placeholder)
           continue;
         diagnostics.push({
           severity: "warning",
           code: "mobile-appid-placeholder",
           path: `apps/${appName}/akan.config.ts`,
-          message: `Mobile target '${name}' uses placeholder bundle id '${target.appId}'. Apple's developer portal almost always already claims it, so signing to a physical device fails with "cannot be registered to your development team". Set a unique mobile.appId (reverse-DNS of your org).`
+          message: `Native target '${name}' uses placeholder bundle id '${placeholder}'. Apple's developer portal almost always already claims it, so signing to a physical device fails with "cannot be registered to your development team". Set a unique native.appId (reverse-DNS of your org).`
         });
       }
     }
@@ -684,7 +623,7 @@ class ContextRunner extends runner("context") {
       return jsonText({ schemaVersion: 1, kind: "ios", status, diagnostics });
     const lines = [`Akan iOS diagnostics for ${workspace.repoName}`];
     if (diagnostics.length === 0)
-      lines.push("  No mobile configuration issues found.");
+      lines.push("  No native configuration issues found.");
     else
       for (const diagnostic of diagnostics) {
         lines.push(`  [${diagnostic.severity}] ${diagnostic.code}: ${diagnostic.message}`);
@@ -694,7 +633,7 @@ class ContextRunner extends runner("context") {
 `);
   }
   async getGuidelineResource(name) {
-    return await Prompter.getInstruction(name);
+    return await Prompter2.getInstruction(name);
   }
   async installMcp(workspace, target, { force = false, mode = "readonly" } = {}) {
     if (target === "codex")
@@ -710,13 +649,7 @@ class ContextRunner extends runner("context") {
     if (currentAkanServer && !force && JSON.stringify(currentAkanServer) !== JSON.stringify(nextAkanServer)) {
       throw new Error(`${configPath} already has an "akan" MCP server. Re-run with --force to overwrite it.`);
     }
-    const nextConfig = {
-      ...existing,
-      mcpServers: {
-        ...mcpServers,
-        akan: nextAkanServer
-      }
-    };
+    const nextConfig = { ...existing, mcpServers: { ...mcpServers, akan: nextAkanServer } };
     await workspace.writeFile(configPath, `${JSON.stringify(nextConfig, null, 2)}
 `);
     return configPath;
@@ -773,7 +706,7 @@ class ContextRunner extends runner("context") {
       return modules;
     }
     if (name === "get_guideline")
-      return await Prompter.getInstruction(stringArg(args, "name"));
+      return await Prompter2.getInstruction(stringArg(args, "name"));
     if (name === "doctor_workspace")
       return compactDoctorWorkspaceResult(await AkanContextAnalyzer.doctor(workspace, {
         strict: !!args.strict,
@@ -809,7 +742,7 @@ class ContextRunner extends runner("context") {
         format: "json",
         dryRun: !!args.dryRun,
         workspace,
-        registry: createCliWorkflowStepRegistry(workspace)
+        registry: WorkflowRunner.stepRegistry(workspace)
       }));
       const validationTarget = typeof report.validationTarget === "string" ? report.validationTarget : typeof report.applyReportPath === "string" ? report.applyReportPath : stringArg(args, "planPath");
       return {
@@ -863,14 +796,14 @@ ${payload}`);
     const respondError = (id, code, message, framing) => {
       writeMessage({ jsonrpc: "2.0", id: id ?? null, error: { code, message } }, framing);
     };
-    const guidelineNames = await Prompter.listGuidelines();
+    const guidelineNames = await Prompter2.listGuidelines();
     const resources = buildResourceList(guidelineNames);
     const readResource = async (uri) => {
       if (uri === "akan://docs/framework")
-        return { uri, mimeType: "text/markdown", text: await Prompter.getInstruction("framework") };
+        return { uri, mimeType: "text/markdown", text: await Prompter2.getInstruction("framework") };
       const guideline = /^akan:\/\/guidelines\/(.+)$/.exec(uri)?.[1];
       if (guideline)
-        return { uri, mimeType: "text/markdown", text: await Prompter.getInstruction(guideline) };
+        return { uri, mimeType: "text/markdown", text: await Prompter2.getInstruction(guideline) };
       const context = await AkanContextAnalyzer.analyze(workspace);
       if (uri === "akan://workspace/summary")
         return { uri, mimeType: "application/json", text: jsonText(context, { trailingNewline: false }) };
@@ -902,22 +835,14 @@ ${payload}`);
           serverInfo: { name: "akan", version: process.env.AKAN_VERSION ?? "0.0.0" }
         }, framing);
       } else if (request.method === "tools/list") {
-        respond(request.id, {
-          tools: this.listMcpTools(mode, { guidelineNames })
-        }, framing);
+        respond(request.id, { tools: this.listMcpTools(mode, { guidelineNames }) }, framing);
       } else if (request.method === "tools/call") {
         const name = params.name;
         const args = params.arguments ?? {};
         try {
           const result = await this.callMcpTool(workspace, name, args, { mode });
-          respond(request.id, {
-            content: [
-              {
-                type: "text",
-                text: typeof result === "string" ? result : jsonText(result, { trailingNewline: false })
-              }
-            ]
-          }, framing);
+          const text = typeof result === "string" ? result : jsonText(result, { trailingNewline: false });
+          respond(request.id, { content: [{ type: "text", text }] }, framing);
         } catch (error) {
           respond(request.id, { content: [{ type: "text", text: toolErrorText(error) }], isError: true }, framing);
         }
@@ -1026,7 +951,7 @@ ${payload}`);
       test: "`akan test <app-or-lib-or-pkg>` prepares the target and runs its tests.",
       build: "`akan build <app-name>` creates a production build after preparing generated files.",
       doctor: "`akan doctor --strict --format json` reports agent-readable workspace convention diagnostics and validation hints.",
-      "guideline show": "`akan guideline show <name>` prints an Akan codegen guideline instruction.",
+      "guideline show": "`akan guideline show <name>` prints an Akan guideline instruction.",
       workflow: "`akan workflow list|explain|plan|apply|validate|report` lists, plans, applies, validates, and reports agent-readable Akan workflows.",
       "workflow list": "`akan workflow list` lists parseable read-only workflow specs.",
       "workflow explain": "`akan workflow explain <workflow>` explains inputs, optional surfaces, steps, and validation.",
@@ -1049,57 +974,4 @@ ${payload}`);
   }
 }
 
-// pkgs/@akanjs/cli/context/context.script.ts
-var resolveMcpInstallTargets = (target) => {
-  if (!target || target === "all")
-    return [...akanMcpInstallTargets];
-  if (akanMcpInstallTargets.includes(target))
-    return [target];
-  throw new Error(`Unknown MCP install target: ${target}. Use cursor, claude, codex, or all.`);
-};
-var mcpTargetLabels = {
-  cursor: "Cursor",
-  claude: "Claude Code",
-  codex: "Codex"
-};
-
-class ContextScript extends script("context", [ContextRunner]) {
-  async context(workspace, options = {}) {
-    Logger.rawLog(await this.contextRunner.getContext(workspace, options));
-  }
-  async doctor(workspace, options = {}) {
-    Logger.rawLog(await this.contextRunner.doctor(workspace, options));
-  }
-  async mcpInstall(workspace, target, { force = false, mode = "apply" } = {}) {
-    const targets = resolveMcpInstallTargets(target);
-    const written = [];
-    for (const t of targets) {
-      const configPath = await this.contextRunner.installMcp(workspace, t, { force, mode });
-      written.push(`${mcpTargetLabels[t]}: ${configPath}`);
-    }
-    Logger.rawLog(`Akan MCP server installed (${mode} mode):
-${written.map((line) => `- ${line}`).join(`
-`)}`);
-  }
-  async mcp(workspace, { mode = "apply" } = {}) {
-    await this.contextRunner.runMcp(workspace, { mode });
-  }
-  async mcpCall(workspace, tool, {
-    mode = "readonly",
-    args = null,
-    format = "json"
-  } = {}) {
-    let parsedArgs = {};
-    if (args) {
-      const parsed = JSON.parse(args);
-      if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-        throw new Error("MCP call args must be a JSON object.");
-      }
-      parsedArgs = parsed;
-    }
-    const result = await this.contextRunner.callMcpTool(workspace, tool, parsedArgs, { mode });
-    Logger.rawLog(format === "json" ? jsonText(result) : String(result));
-  }
-}
-
-export { ContextScript };
+export { ContextRunner2 };

package/{index-3d9y066c.js → index-bjwxs904.js}

@@ -14,25 +14,26 @@ class LibSource {
     const relative = file.slice(this.#prefix.length);
     return !LibSource.unhashedDirs.includes(relative.split("/")[0] ?? "");
   }
-  async#hashableContent(file) {
-    const content = await this.#lib.workspace.readFile(file);
-    if (file !== `${this.#prefix}package.json`)
-      return content;
-    const manifest = JSON.parse(content);
+  static unstamped(manifestContent) {
+    const manifest = JSON.parse(manifestContent);
     delete manifest[LibSource.manifestKey];
     return JSON.stringify(manifest);
   }
-  async computeHash() {
-    const files = (await this.#lib.workspace.listGitFiles([`libs/${this.#lib.name}`], { untracked: true })).filter((file) => this.#isHashed(file));
+  static async hashFiles(files, manifestFile, read) {
     const hasher = new Bun.CryptoHasher("sha256");
     for (const file of files) {
+      const content = await read(file);
       hasher.update(file);
       hasher.update("\x00");
-      hasher.update(await this.#hashableContent(file));
+      hasher.update(file === manifestFile ? LibSource.unstamped(content) : content);
       hasher.update("\x00");
     }
     return hasher.digest("hex").slice(0, 32);
   }
+  async computeHash() {
+    const files = (await this.#lib.workspace.listGitFiles([`libs/${this.#lib.name}`], { untracked: true })).filter((file) => this.#isHashed(file));
+    return await LibSource.hashFiles(files, `${this.#prefix}package.json`, (file) => this.#lib.workspace.readFile(file));
+  }
   async read() {
     const manifest = await this.#lib.getPackageJson();
     const akan = manifest[LibSource.manifestKey];

package/{index-9077wzd2.js → index-by9pxkr0.js}

@@ -2,16 +2,16 @@
 import {
   runner,
   script
-} from "./index-0g7r8xz3.js";
+} from "./index-vpj42xwt.js";
 import {
-  FileSys
-} from "./index-q0y2jq9j.js";
+  FileSys2
+} from "./index-52w0fvh8.js";
 import {
   PkgExecutor
-} from "./index-2tv3fdx4.js";
+} from "./index-3w94e7n3.js";
 import {
   TypeScriptDependencyScanner2
-} from "./index-kcxmv48c.js";
+} from "./index-2ahj896a.js";
 
 // pkgs/@akanjs/cli/package/package.runner.ts
 import path2 from "path";
@@ -112,7 +112,7 @@ class PackageRunner extends runner("package") {
     "create-akan-workspace"
   ];
   async version(workspace, { log = true } = {}) {
-    const pkgJson = process.env.USE_AKANJS_PKGS === "true" ? await FileSys.readJson(`${workspace?.workspaceRoot ?? process.cwd()}/pkgs/akanjs/package.json`) : await this.#getInstalledPackageJson();
+    const pkgJson = process.env.USE_AKANJS_PKGS === "true" ? await FileSys2.readJson(`${workspace?.workspaceRoot ?? process.cwd()}/pkgs/akanjs/package.json`) : await this.#getInstalledPackageJson();
     const version = pkgJson.name === "akanjs" ? pkgJson.version : pkgJson.dependencies?.akanjs ?? pkgJson.version;
     if (log)
       Logger.rawLog(`akanjs@${version}`);
@@ -129,14 +129,19 @@ class PackageRunner extends runner("package") {
     for (const packageJsonPath of packageJsonCandidates) {
       if (!await Bun.file(packageJsonPath).exists())
         continue;
-      const packageJson = await FileSys.readJson(packageJsonPath);
+      const packageJson = await FileSys2.readJson(packageJsonPath);
       if (packageJson.name === "akanjs" || packageJson.name === "@akanjs/cli")
         return packageJson;
     }
     throw new Error(`[package] failed to locate akanjs package.json from ${path2.dirname(Bun.main)}`);
   }
   async createPackage(workspace, pkgName) {
-    await workspace.applyTemplate({ basePath: `pkgs/${pkgName}`, template: "pkgRoot", dict: { pkgName } });
+    const workspaceRootPath = ["pkgs", ...pkgName.split("/")].map(() => "..").join("/");
+    await workspace.applyTemplate({
+      basePath: `pkgs/${pkgName}`,
+      template: "pkgRoot",
+      dict: { pkgName, workspaceRootPath }
+    });
     await workspace.setPkgTsPaths(pkgName);
   }
   async removePackage(pkg) {
@@ -144,8 +149,7 @@ class PackageRunner extends runner("package") {
     await pkg.workspace.unsetPkgTsPaths(pkg.name);
   }
   async scanSync(pkg) {
-    const scanResult = await pkg.scan();
-    return scanResult;
+    return await pkg.scan();
   }
   async buildPackage(pkg) {
     await $`rm -rf ${pkg.dist.cwdPath}`;
@@ -153,7 +157,14 @@ class PackageRunner extends runner("package") {
     const scanner = await TypeScriptDependencyScanner2.from(pkg);
     const { npmDeps, npmDevDeps, missingDeps } = await scanner.getPackageBuildDependencies(pkg.name);
     const packageRuntimeDependencies = {
-      "@akanjs/devkit": ["tailwind-scrollbar"]
+      "@akanjs/devkit": [
+        "tailwind-scrollbar",
+        "@earendil-works/chord",
+        "@earendil-works/pi-agent-core",
+        "@earendil-works/pi-ai",
+        "@earendil-works/pi-telemetry",
+        "@earendil-works/pi-tui"
+      ]
     };
     const packageRuntimeDevDependencies = { akanjs: ["@biomejs/biome", "@types/bun"] };
     if (pkg.name === "@akanjs/cli") {
@@ -164,17 +175,23 @@ class PackageRunner extends runner("package") {
       ].filter((dep) => dep !== "akanjs" && dep !== "@akanjs/devkit");
     }
     const packageBundledRuntimeDependencies = {
-      "@akanjs/cli": ["@akanjs/devkit"],
-      akanjs: ["use-agentic"]
+      "@akanjs/cli": ["@akanjs/devkit", "@akanjs/native"],
+      "@akanjs/devkit": ["@akanjs/native"],
+      akanjs: ["use-agentic", "@akanjs/native"]
     };
     const bundledRuntimeDeps = new Set(packageBundledRuntimeDependencies[pkg.name] ?? []);
     const forcedRuntimeDeps = packageRuntimeDependencies[pkg.name] ?? [];
     const forcedRuntimeDevDeps = packageRuntimeDevDependencies[pkg.name] ?? [];
     const [rootPackageJson, pkgJson] = await Promise.all([pkg.workspace.getPackageJson(), pkg.getPackageJson()]);
     const optionalPeerDeps = new Set(Object.entries(pkgJson.peerDependenciesMeta ?? {}).filter(([, meta]) => meta.optional).map(([dep]) => dep));
-    const packageRuntimeDeps = [...new Set([...npmDeps, ...forcedRuntimeDeps])].filter((dep) => !optionalPeerDeps.has(dep) && !bundledRuntimeDeps.has(dep));
-    const packageRuntimeDevDeps = [...new Set([...npmDevDeps, ...forcedRuntimeDevDeps])].filter((dep) => !optionalPeerDeps.has(dep) && !bundledRuntimeDeps.has(dep));
-    const rootDeps = { ...rootPackageJson.dependencies, ...rootPackageJson.devDependencies };
+    const isShipped = (dep) => !optionalPeerDeps.has(dep) && !bundledRuntimeDeps.has(dep);
+    const packageRuntimeDeps = [...new Set([...npmDeps, ...forcedRuntimeDeps])].filter(isShipped);
+    const packageRuntimeDevDeps = [...new Set([...npmDevDeps, ...forcedRuntimeDevDeps])].filter(isShipped);
+    const rootDeps = {
+      ...rootPackageJson.overrides,
+      ...rootPackageJson.dependencies,
+      ...rootPackageJson.devDependencies
+    };
     const missingForcedDeps = forcedRuntimeDeps.filter((dep) => !rootDeps[dep]);
     const missingForcedDevDeps = forcedRuntimeDevDeps.filter((dep) => !rootDeps[dep]);
     const requiredMissingDeps = missingDeps.filter((dep) => !optionalPeerDeps.has(dep));
@@ -192,7 +209,8 @@ class PackageRunner extends runner("package") {
         stdio: "inherit"
       });
     } else {
-      await $`cp -r ${pkg.cwdPath}/. ${pkg.dist.cwdPath}`;
+      await pkg.dist.cp(pkg.cwdPath, pkg.dist.cwdPath);
+      await $`rm -rf ${pkg.dist.cwdPath}/local`;
       await Promise.all([
         pkg.generateDistPackageJson(packageRuntimeDeps, packageRuntimeDevDeps),
         pkg.generateTsconfigJson()
@@ -266,7 +284,7 @@ class PackageRunner extends runner("package") {
     if (!await Bun.file(distPackageJsonPath).exists()) {
       throw new Error(`[package] dist package not found for ${pkg.name}. Run build-package first.`);
     }
-    const pkgJson = await FileSys.readJson(distPackageJsonPath);
+    const pkgJson = await FileSys2.readJson(distPackageJsonPath);
     if (pkgJson.name !== pkg.name) {
       throw new Error(`[package] dist package name mismatch: expected ${pkg.name}, got ${pkgJson.name ?? "(missing)"}`);
     }
@@ -275,12 +293,9 @@ class PackageRunner extends runner("package") {
     if (pkgJson.publishConfig?.access !== "public") {
       throw new Error(`[package] ${pkg.name} must publish with publishConfig.access=public`);
     }
-    if (!await Bun.file(`${pkg.dist.cwdPath}/README.md`).exists()) {
-      throw new Error(`[package] README.md is missing from dist package ${pkg.name}`);
-    }
-    if (!await Bun.file(`${pkg.dist.cwdPath}/README.ko.md`).exists()) {
-      throw new Error(`[package] README.ko.md is missing from dist package ${pkg.name}`);
-    }
+    for (const readme of ["README.md", "README.ko.md"])
+      if (!await Bun.file(`${pkg.dist.cwdPath}/${readme}`).exists())
+        throw new Error(`[package] ${readme} is missing from dist package ${pkg.name}`);
     const binEntries = typeof pkgJson.bin === "string" ? [pkgJson.bin] : Object.values(pkgJson.bin ?? {});
     if (binEntries.some((binPath) => binPath.endsWith(".ts"))) {
       throw new Error(`[package] ${pkg.name} dist bin entries must not point at TypeScript sources`);
@@ -297,6 +312,9 @@ class PackageRunner extends runner("package") {
       cwd: pkg.workspace.workspaceRoot
     });
     const [packResult] = JSON.parse(packOutput);
+    const localFiles = (packResult?.files ?? []).filter((file) => file.path?.startsWith("local/"));
+    if (localFiles.length > 0)
+      throw new Error(`[package] ${pkg.name} would publish ${localFiles.length} test-run files under local/`);
     return {
       name: pkg.name,
       version: pkgJson.version,
@@ -313,9 +331,8 @@ class PackageRunner extends runner("package") {
       peerExportsMaps.set(pkg.name, await PackageExportsMap.from(pkg.dist.cwdPath));
     }
     const results = [];
-    for (const pkg of pkgs) {
+    for (const pkg of pkgs)
       results.push(await this.verifyDistPackage(pkg, { peerExportsMaps }));
-    }
     return results;
   }
   async#copyPackageReadmes(pkg) {