@akanjs/cli 3.0.0-beta.3 → 3.0.0-beta.31

package/{index-ws5e0j51.js → index-arnkqb6f.js}

@@ -2,16 +2,16 @@
 import {
   runner,
   script
-} from "./index-mak3cd28.js";
+} from "./index-1skctzbq.js";
 import {
-  FileSys
-} from "./index-q0y2jq9j.js";
+  FileSys2
+} from "./index-52w0fvh8.js";
 import {
   PkgExecutor
-} from "./index-2tv3fdx4.js";
+} from "./index-e52z7psd.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) {

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-c6eggbee.js

@@ -0,0 +1,123 @@
+// @bun
+// pkgs/@akanjs/devkit/codeAgent/agent/akanCodeModel.ts
+var akanCodeDefaultModel2 = { provider: "deepseek", id: "deepseek-flash" };
+var catalogueMissesImages = new Set(["deepseek/deepseek-v4-flash"]);
+var correctInputs = (model) => {
+  if (!model || model.input.includes("image"))
+    return model;
+  if (!catalogueMissesImages.has(`${model.provider}/${model.id}`))
+    return model;
+  return { ...model, input: [...model.input, "image"] };
+};
+var akanCodeModel2 = async (runtime, ref) => {
+  if (ref) {
+    const requested = runtime.getModel(ref.provider, ref.id);
+    if (!requested)
+      throw new Error(`Unknown model: ${ref.provider}/${ref.id}`);
+    if (!runtime.hasConfiguredAuth(ref.provider))
+      throw new Error(`No API key configured for ${ref.provider}. Set ${ref.provider.toUpperCase()}_API_KEY.`);
+    return correctInputs(requested);
+  }
+  const fallback = runtime.getModel(akanCodeDefaultModel2.provider, akanCodeDefaultModel2.id);
+  if (fallback && runtime.hasConfiguredAuth(fallback.provider))
+    return correctInputs(fallback);
+  return correctInputs((await runtime.getAvailable())[0]);
+};
+var akanCodeModelSupportsImages2 = (model) => !!model?.input.includes("image");
+var akanCodeModelWarnings2 = (model, compactionFloor) => {
+  if (!model)
+    return [];
+  if (model.contextWindow >= compactionFloor)
+    return [];
+  return [
+    `${model.provider}/${model.id} declares a ${model.contextWindow}-token context window, below the ${compactionFloor} the compaction policy needs, so every turn will compact immediately. Check the model entry in ~/.akan/code/models.json.`
+  ];
+};
+
+// pkgs/@akanjs/devkit/codeAgent/agent/CodeAgentStreamPrinter.ts
+import { codeAgentEventLabel } from "akanjs/common";
+import chalk from "chalk";
+
+class CodeAgentStreamPrinter2 {
+  #options;
+  #write;
+  #streaming = false;
+  constructor(options = {}) {
+    this.#options = options;
+    this.#write = options.write ?? ((text) => process.stdout.write(text));
+  }
+  print(event) {
+    if (this.#options.json)
+      return this.#write(`${JSON.stringify(event)}
+`);
+    switch (event.type) {
+      case "text_delta":
+        this.#streaming = true;
+        return this.#write(event.text);
+      case "thinking_delta":
+        if (!this.#options.thinking)
+          return;
+        this.#streaming = true;
+        return this.#write(chalk.dim(event.text));
+      case "tool_start":
+        return this.#line(chalk.cyan(`\u2192 ${event.tool.title}`));
+      case "tool_end":
+        return this.#line(CodeAgentStreamPrinter2.#toolEnd(event));
+      case "session":
+        return this.#line(chalk.dim(codeAgentEventLabel(event)));
+      case "turn_end":
+        if (event.stopReason === "truncated")
+          return this.#line(chalk.yellow(codeAgentEventLabel(event)));
+        return;
+      case "message":
+      case "tool_progress":
+      case "turn_start":
+      case "idle":
+      case "queue":
+      case "context":
+      case "subagent":
+        return;
+      case "question":
+        return this.#line(chalk.yellow(`? ${event.question.prompt}`));
+      case "approval":
+        return this.#line(chalk.yellow(`approve? ${event.request.summary}`));
+      case "notice":
+        return this.#line(CodeAgentStreamPrinter2.#notice(event.level, event.message));
+      case "error":
+        return this.#line(chalk.red(`error: ${event.message}`));
+      default:
+        return this.#line(chalk.dim(codeAgentEventLabel(event)));
+    }
+  }
+  finish() {
+    if (this.#streaming)
+      this.#write(`
+`);
+    this.#streaming = false;
+  }
+  #line(text) {
+    if (this.#streaming)
+      this.#write(`
+`);
+    this.#streaming = false;
+    this.#write(`${text}
+`);
+  }
+  static #toolEnd(event) {
+    if (event.outcome === "ok")
+      return chalk.green(`\u2713 ${event.tool.title}`);
+    if (event.outcome === "blocked")
+      return chalk.yellow(`\u29B8 ${event.tool.title} \u2014 ${event.output}`);
+    return chalk.red(`\u2717 ${event.tool.title} \u2014 ${event.output.split(`
+`)[0] ?? ""}`);
+  }
+  static #notice(level, message) {
+    if (level === "error")
+      return chalk.red(message);
+    if (level === "warning")
+      return chalk.yellow(message);
+    return chalk.dim(message);
+  }
+}
+
+export { akanCodeDefaultModel2, akanCodeModel2, akanCodeModelSupportsImages2, akanCodeModelWarnings2, CodeAgentStreamPrinter2 };