@akanjs/cli 3.0.0-beta.19 → 3.0.0-beta.20

package/{index-bwf965h6.js → index-ahemdr5n.js}

@@ -2,7 +2,7 @@
 import {
   runner,
   script
-} from "./index-qdgzsnhg.js";
+} from "./index-w2zdcw3k.js";
 import {
   AGENT_BLOCK_START,
   AGENT_BLOCK_END,
@@ -13,17 +13,17 @@ import {
   CLAUDE_COMMENT_RULE,
   AppExecutor,
   LibExecutor
-} from "./index-crmeqnmf.js";
+} from "./index-9d9bgcx4.js";
 import {
   collectRecipeSources2,
   scanRecipes2
-} from "./index-by5gpp8x.js";
+} from "./index-hj6w4ka1.js";
 import {
   AkanContextAnalyzer
-} from "./index-18zybgkc.js";
+} from "./index-ygn77a5w.js";
 import {
   Prompter2
-} from "./index-s5rhm04y.js";
+} from "./index-0bq14vr1.js";
 
 // pkgs/@akanjs/cli/agent/agent.script.ts
 import { Logger as Logger2 } from "akanjs/common";
@@ -126,7 +126,7 @@ var renderManagedBlock = async (workspace) => {
   const block = `## Workspace
 
 - Repo: ${context.repoName}
-- Apps: ${context.apps.map((app) => app.name).join(", ") || "none"}
+- Apps: ${appNames.join(", ") || "none"}
 - Libraries: ${context.libs.map((lib) => lib.name).join(", ") || "none"}
 - Packages: ${context.pkgs.map((pkg) => pkg.name).join(", ") || "none"}
 

package/{index-ab0c38ea.js → index-as7xmyz8.js}

@@ -2,16 +2,16 @@
 import {
   runner,
   script
-} from "./index-qdgzsnhg.js";
+} from "./index-w2zdcw3k.js";
 import {
-  FileSys
-} from "./index-q0y2jq9j.js";
+  FileSys2
+} from "./index-5b6tavv3.js";
 import {
   PkgExecutor
-} from "./index-crmeqnmf.js";
+} from "./index-9d9bgcx4.js";
 import {
   TypeScriptDependencyScanner2
-} from "./index-bhtmj233.js";
+} from "./index-3t7g9e4r.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,7 +129,7 @@ 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;
     }
@@ -149,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}`;
@@ -184,8 +183,9 @@ class PackageRunner extends runner("package") {
     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 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,
@@ -209,6 +209,7 @@ class PackageRunner extends runner("package") {
       });
     } else {
       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()
@@ -282,7 +283,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)"}`);
     }
@@ -291,12 +292,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`);
@@ -313,6 +311,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,
@@ -329,9 +330,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-bc88j1ry.js → index-axzjaqve.js}

@@ -3,14 +3,14 @@ import {
   getDefaultHostConfig,
   GlobalConfig,
   CloudApi
-} from "./index-srmay5jw.js";
+} from "./index-22d57v4c.js";
 import {
   runner
-} from "./index-qdgzsnhg.js";
+} from "./index-w2zdcw3k.js";
 import {
   WorkspaceExecutor,
   AppExecutor
-} from "./index-crmeqnmf.js";
+} from "./index-9d9bgcx4.js";
 import {
   openBrowser
 } from "./index-9dp031by.js";
@@ -145,6 +145,15 @@ class BunTestReport {
 class PlatformTestTarget {
   static installIdleMs = 5 * 60000;
   static testIdleMs = 2 * 60000;
+  static gitIdentityEnv = {
+    GIT_AUTHOR_NAME: "akan-test",
+    GIT_AUTHOR_EMAIL: "akan-test@localhost",
+    GIT_COMMITTER_NAME: "akan-test",
+    GIT_COMMITTER_EMAIL: "akan-test@localhost",
+    GIT_CONFIG_COUNT: "1",
+    GIT_CONFIG_KEY_0: "init.defaultBranch",
+    GIT_CONFIG_VALUE_0: "main"
+  };
   tolerateScriptFailures = [];
   async run(context) {
     const startedAt = performance.now();
@@ -204,6 +213,19 @@ class PlatformTestTarget {
   #logPath(context, name) {
     return path2.join(context.logDir, this.platform, `${name}.log`);
   }
+  static async spawnText(command, stdin) {
+    const proc = Bun.spawn(command, {
+      stdin: stdin === undefined ? "ignore" : new Response(stdin),
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    const [stdout, stderr, exitCode] = await Promise.all([
+      new Response(proc.stdout).text(),
+      new Response(proc.stderr).text(),
+      proc.exited
+    ]);
+    return { stdout, stderr, exitCode };
+  }
 }
 
 // pkgs/@akanjs/devkit/platformTest/LinuxDockerTarget.ts
@@ -227,12 +249,13 @@ class LinuxDockerTarget extends PlatformTestTarget {
     return `akan-test-linux:bun-${Bun.version}-${Bun.hash(LinuxDockerTarget.dockerfile).toString(16).slice(0, 8)}`;
   }
   async prepare(context) {
-    if ((await LinuxDockerTarget.#docker(["info"])).exitCode !== 0)
+    if ((await LinuxDockerTarget.spawnText(["docker", "info"])).exitCode !== 0)
       throw new Error("Docker is not running \u2014 start Docker Desktop, or leave linux out of --platforms");
     await this.#ensureImage();
     const container = `akan-test-${context.runId}`;
     const cpus = this.#config.cpus ?? Math.max(2, Math.floor(os.availableParallelism() / 2));
-    const started = await LinuxDockerTarget.#docker([
+    const started = await LinuxDockerTarget.spawnText([
+      "docker",
       "run",
       "-d",
       "--rm",
@@ -264,50 +287,34 @@ class LinuxDockerTarget extends PlatformTestTarget {
     const container = this.#container;
     if (!container)
       throw new Error("the linux container is not running");
-    return await new IdleWatchedProcess(["docker", "exec", ...LinuxDockerTarget.#gitIdentityEnv(), container, "sh", "-c", command], {
+    return await new IdleWatchedProcess([
+      "docker",
+      "exec",
+      ...Object.entries(PlatformTestTarget.gitIdentityEnv).flatMap(([key, value]) => ["-e", `${key}=${value}`]),
+      container,
+      "sh",
+      "-c",
+      command
+    ], {
       logPath,
       idleMs,
       onIdle: async () => {
-        await LinuxDockerTarget.#docker(["exec", container, "pkill", "-9", "bun"]);
+        await LinuxDockerTarget.spawnText(["docker", "exec", container, "pkill", "-9", "bun"]);
       }
     }).run();
   }
   async cleanup() {
     if (this.#container)
-      await LinuxDockerTarget.#docker(["rm", "-f", this.#container]);
+      await LinuxDockerTarget.spawnText(["docker", "rm", "-f", this.#container]);
     this.#container = null;
   }
   async#ensureImage() {
-    if ((await LinuxDockerTarget.#docker(["image", "inspect", this.image])).exitCode === 0)
+    if ((await LinuxDockerTarget.spawnText(["docker", "image", "inspect", this.image])).exitCode === 0)
       return;
-    const built = await LinuxDockerTarget.#docker(["build", "-t", this.image, "-"], LinuxDockerTarget.dockerfile);
+    const built = await LinuxDockerTarget.spawnText(["docker", "build", "-t", this.image, "-"], LinuxDockerTarget.dockerfile);
     if (built.exitCode !== 0)
       throw new Error(`building ${this.image} failed: ${built.stderr.trim().slice(-400)}`);
   }
-  static #gitIdentityEnv() {
-    return Object.entries({
-      GIT_AUTHOR_NAME: "akan-test",
-      GIT_AUTHOR_EMAIL: "akan-test@localhost",
-      GIT_COMMITTER_NAME: "akan-test",
-      GIT_COMMITTER_EMAIL: "akan-test@localhost",
-      GIT_CONFIG_COUNT: "1",
-      GIT_CONFIG_KEY_0: "init.defaultBranch",
-      GIT_CONFIG_VALUE_0: "main"
-    }).flatMap(([key, value]) => ["-e", `${key}=${value}`]);
-  }
-  static async#docker(args, stdin) {
-    const proc = Bun.spawn(["docker", ...args], {
-      stdin: stdin === undefined ? "ignore" : new Response(stdin),
-      stdout: "pipe",
-      stderr: "pipe"
-    });
-    const [stdout, stderr, exitCode] = await Promise.all([
-      new Response(proc.stdout).text(),
-      new Response(proc.stderr).text(),
-      proc.exited
-    ]);
-    return { stdout, stderr, exitCode };
-  }
 }
 
 // pkgs/@akanjs/devkit/platformTest/TestSnapshot.ts
@@ -433,7 +440,7 @@ class WindowsSshTarget extends PlatformTestTarget {
       [context.snapshot.tarPath, "src.tar"],
       [context.envPath, "env"]
     ]) {
-      const copied = await WindowsSshTarget.#run([
+      const copied = await WindowsSshTarget.spawnText([
         ...this.#scpBase(),
         local,
         this.#remoteScpPath(`${runDir}\\${remoteName}`)
@@ -454,13 +461,7 @@ class WindowsSshTarget extends PlatformTestTarget {
       "$ProgressPreference = 'SilentlyContinue'",
       "[Console]::OutputEncoding = [Text.Encoding]::UTF8",
       "'PID=' + $PID",
-      "$env:GIT_AUTHOR_NAME = 'akan-test'",
-      "$env:GIT_AUTHOR_EMAIL = 'akan-test@localhost'",
-      "$env:GIT_COMMITTER_NAME = 'akan-test'",
-      "$env:GIT_COMMITTER_EMAIL = 'akan-test@localhost'",
-      "$env:GIT_CONFIG_COUNT = '1'",
-      "$env:GIT_CONFIG_KEY_0 = 'init.defaultBranch'",
-      "$env:GIT_CONFIG_VALUE_0 = 'main'",
+      ...Object.entries(PlatformTestTarget.gitIdentityEnv).map(([key, value]) => `$env:${key} = '${value}'`),
       `Set-Location -LiteralPath '${runDir}\\w'`,
       `cmd /c "${command} 2>&1"`,
       "exit $LASTEXITCODE"
@@ -493,11 +494,11 @@ class WindowsSshTarget extends PlatformTestTarget {
     const vm = this.#config.utmVm;
     if (!vm || !existsSync(WindowsSshTarget.utmctlPath))
       throw new Error(`cannot reach ${this.#config.user}@${this.#host} over ssh`);
-    const status = (await WindowsSshTarget.#run([WindowsSshTarget.utmctlPath, "status", vm])).stdout.trim();
+    const status = (await WindowsSshTarget.spawnText([WindowsSshTarget.utmctlPath, "status", vm])).stdout.trim();
     if (status !== "started")
-      await WindowsSshTarget.#run([WindowsSshTarget.utmctlPath, "start", vm]);
+      await WindowsSshTarget.spawnText([WindowsSshTarget.utmctlPath, "start", vm]);
     for (let attempt = 0;attempt < 24; attempt++) {
-      const addresses = (await WindowsSshTarget.#run([WindowsSshTarget.utmctlPath, "ip-address", vm])).stdout;
+      const addresses = (await WindowsSshTarget.spawnText([WindowsSshTarget.utmctlPath, "ip-address", vm])).stdout;
       const ipv4 = addresses.split(/\s+/).find((address) => /^\d+\.\d+\.\d+\.\d+$/.test(address));
       if (ipv4)
         this.#host = ipv4;
@@ -531,16 +532,7 @@ class WindowsSshTarget extends PlatformTestTarget {
     return `${this.#config.user}@${this.#host}:/${windowsPath.replaceAll("\\", "/")}`;
   }
   async#ssh(script) {
-    return await WindowsSshTarget.#run([...this.#sshBase(), script]);
-  }
-  static async#run(command) {
-    const proc = Bun.spawn(command, { stdin: "ignore", stdout: "pipe", stderr: "pipe" });
-    const [stdout, stderr, exitCode] = await Promise.all([
-      new Response(proc.stdout).text(),
-      new Response(proc.stderr).text(),
-      proc.exited
-    ]);
-    return { stdout, stderr, exitCode };
+    return await WindowsSshTarget.spawnText([...this.#sshBase(), script]);
   }
 }
 
@@ -699,26 +691,20 @@ class CloudRunner extends runner("cloud") {
       NPM_CONFIG_REGISTRY: getNpmRegistryUrl(registryUrl)
     } : process.env;
   }
+  async#ask(message, validate) {
+    return (await input({ message, validate })).trim();
+  }
   async#addRemoteEnvServer() {
-    const name = (await input({
-      message: "Remote server name: ",
-      validate: (value) => value.trim() ? true : "Remote server name is required"
-    })).trim();
-    const host = (await input({
-      message: "Remote server host: ",
-      validate: (value) => value.trim() ? true : "Remote server host is required"
-    })).trim();
-    const username = (await input({ message: "Remote server username (optional): " })).trim() || undefined;
-    const portInput = (await input({
-      message: "Remote server SSH port (optional): ",
-      validate: (value) => {
-        const trimmed = value.trim();
-        if (!trimmed)
-          return true;
-        const port = Number(trimmed);
-        return Number.isInteger(port) && port > 0 ? true : "SSH port must be a positive integer";
-      }
-    })).trim();
+    const name = await this.#ask("Remote server name: ", (value) => !!value.trim() || "Remote server name is required");
+    const host = await this.#ask("Remote server host: ", (value) => !!value.trim() || "Remote server host is required");
+    const username = await this.#ask("Remote server username (optional): ") || undefined;
+    const portInput = await this.#ask("Remote server SSH port (optional): ", (value) => {
+      const trimmed = value.trim();
+      if (!trimmed)
+        return true;
+      const port = Number(trimmed);
+      return Number.isInteger(port) && port > 0 ? true : "SSH port must be a positive integer";
+    });
     const config = {
       host,
       ...username ? { username } : {},
@@ -737,10 +723,7 @@ class CloudRunner extends runner("cloud") {
     const selectedName = await select({
       message: "Select the remote env server",
       choices: [
-        ...serverEntries.map(([name, config]) => ({
-          name: `${name} (${config.username ? `${config.username}@` : ""}${config.host}${config.port ? `:${config.port}` : ""})`,
-          value: name
-        })),
+        ...serverEntries.map((entry) => this.#serverChoice(entry)),
         { name: "Add new remote server", value: addRemoteEnvServerValue },
         { name: "Remove remote server", value: removeRemoteEnvServerValue }
       ]
@@ -759,34 +742,22 @@ class CloudRunner extends runner("cloud") {
   async#removeRemoteEnvServer(serverEntries) {
     const selectedName = await select({
       message: "Select the remote env server to remove",
-      choices: serverEntries.map(([name, config]) => ({
-        name: `${name} (${config.username ? `${config.username}@` : ""}${config.host}${config.port ? `:${config.port}` : ""})`,
-        value: name
-      }))
+      choices: serverEntries.map((entry) => this.#serverChoice(entry))
     });
-    const shouldRemove = await confirm({
-      message: `Remove remote env server "${selectedName}"?`,
-      default: false
-    });
-    if (!shouldRemove)
+    if (!await confirm({ message: `Remove remote env server "${selectedName}"?`, default: false }))
       return;
     await GlobalConfig.removeRemoteEnvServer(selectedName);
     Logger.info(`Removed remote env server "${selectedName}"`);
   }
+  #serverChoice([name, config]) {
+    return { name: `${name} (${this.#getSshTarget(config)}${config.port ? `:${config.port}` : ""})`, value: name };
+  }
   async#getRemoteEnvServerWithUsername() {
     const remoteServer = await this.#selectRemoteEnvServer();
     if (remoteServer.config.username)
       return remoteServer;
-    const username = (await input({
-      message: `SSH username for ${remoteServer.config.host} (optional): `
-    })).trim();
-    return {
-      ...remoteServer,
-      config: {
-        ...remoteServer.config,
-        ...username ? { username } : {}
-      }
-    };
+    const username = await this.#ask(`SSH username for ${remoteServer.config.host} (optional): `);
+    return { ...remoteServer, config: { ...remoteServer.config, ...username ? { username } : {} } };
   }
   #getRemoteEnvArchivePath() {
     return `${this.#getRemoteEnvArchiveDir()}/env.tar`;
@@ -796,7 +767,7 @@ class CloudRunner extends runner("cloud") {
     return `~/secrets/${repoName}`;
   }
   #getScpTarget(config, remotePath) {
-    return `${config.username ? `${config.username}@` : ""}${config.host}:${remotePath}`;
+    return `${this.#getSshTarget(config)}:${remotePath}`;
   }
   #getSshTarget(config) {
     return `${config.username ? `${config.username}@` : ""}${config.host}`;
@@ -808,9 +779,8 @@ class CloudRunner extends runner("cloud") {
     return [...config.port ? ["-p", config.port.toString()] : [], this.#getSshTarget(config), command];
   }
   async login(host, workspace) {
-    const config = await GlobalConfig.getHostConfig(host);
-    const cloudApi = new CloudApi(workspace, config);
-    const self = config.auth ? await cloudApi.getRemoteSelf() : null;
+    const cloudApi = await CloudApi.fromHost(workspace, host);
+    const self = await cloudApi.getRemoteSelf();
     if (self) {
       Logger.rawLog(chalk2.green(`
 \u2713 Already logged in akan cloud as ${self.nickname}
@@ -844,7 +814,7 @@ ${chalk2.green("\u27A4")} Authentication Required`));
       const accessToken = await cloudApi.getRemoteAuthToken(remoteId);
       const self = await cloudApi.getRemoteSelf();
       if (accessToken && self) {
-        await GlobalConfig.setHostConfig({ host: config.host, auth: { accessToken, self } });
+        await GlobalConfig.setHostConfig({ host: cloudApi.host, auth: { accessToken, self } });
         Logger.rawLog(chalk2.green(`\r\u2713 Authentication successful!`));
         Logger.rawLog(chalk2.green.bold(`
 \u2728 Welcome aboard, ${self.nickname ?? "anonymous"}!`));
@@ -927,11 +897,12 @@ ${run.format(results)}
   }
   async#askWindowsTestTarget() {
     Logger.info("No Windows test target is configured yet; it is saved to ~/.akan/config.json once entered.");
-    const host = (await input({ message: "Windows host (ip or name): ", validate: (value) => !!value.trim() })).trim();
-    const user = (await input({ message: "SSH user: ", validate: (value) => !!value.trim() })).trim();
-    const identityFile = (await input({ message: "SSH private key path: ", validate: (value) => !!value.trim() })).trim();
-    const knownHostsFile = (await input({ message: "known_hosts file (optional): " })).trim();
-    const utmVm = (await input({ message: "UTM VM name, to start it and find its ip (optional): " })).trim();
+    const required = (value) => !!value.trim();
+    const host = await this.#ask("Windows host (ip or name): ", required);
+    const user = await this.#ask("SSH user: ", required);
+    const identityFile = await this.#ask("SSH private key path: ", required);
+    const knownHostsFile = await this.#ask("known_hosts file (optional): ");
+    const utmVm = await this.#ask("UTM VM name, to start it and find its ip (optional): ");
     return {
       host,
       user,
@@ -951,35 +922,22 @@ ${run.format(results)}
     const isOfficialRelease = !devPatchVersion;
     const targetVersionPrefix = isOfficialRelease ? `${majorVersion}.${minorVersion}` : `${majorVersion}.${minorVersion}.${patchVersion}`;
     const tag = distTag ?? (isOfficialRelease ? "latest" : patchVersion.split("-").at(1) ?? "dev");
-    const getNextVersion = async (prefix, tag) => {
-      try {
-        const latestPublishedVersion = await getLatestPackageVersion("akanjs", tag, registry);
-        const latestPatch = latestPublishedVersion.startsWith(prefix) ? parseInt(latestPublishedVersion.split(".").at(-1) ?? "-1") : -1;
-        const nextVersion = `${prefix}.${latestPatch + 1}`;
-        return { nextVersion, latestPublishedVersion };
-      } catch {
-        return { nextVersion: `${prefix}.0`, latestPublishedVersion: null };
-      }
-    };
-    const { nextVersion, latestPublishedVersion } = await getNextVersion(targetVersionPrefix, tag);
+    const latestPublishedVersion = await getLatestPackageVersion("akanjs", tag, registry).catch(() => null);
+    const latestPatch = latestPublishedVersion?.startsWith(targetVersionPrefix) ? parseInt(latestPublishedVersion.split(".").at(-1) ?? "-1") : -1;
+    const nextVersion = `${targetVersionPrefix}.${latestPatch + 1}`;
     Logger.info(`Latest published version of akanjs: ${latestPublishedVersion ?? "none"}`);
     Logger.info(`Next version of akanjs: ${nextVersion}`);
     for (const library of akanPkgs) {
       const packageJson = await workspace.readJson(`pkgs/${library}/package.json`);
-      const newPackageJsonStr = JSON.stringify(this.#normalizeAkanPackageJson(packageJson, library, nextVersion), null, 2);
-      await workspace.writeFile(`pkgs/${library}/package.json`, newPackageJsonStr);
+      const newPackageJson = this.#normalizeAkanPackageJson(packageJson, library, nextVersion);
+      await workspace.writeFile(`pkgs/${library}/package.json`, JSON.stringify(newPackageJson, null, 2));
       const distPackageJson = await workspace.readJson(`dist/pkgs/${library}/package.json`);
       const newDistPackageJson = this.#normalizeAkanPackageJson(distPackageJson, library, nextVersion);
       await workspace.writeJson(`dist/pkgs/${library}/package.json`, newDistPackageJson);
     }
-    if (confirmPublish) {
-      const isDeployConfirmed = await confirm({
-        message: "Are you sure you want to deploy the libraries?"
-      });
-      if (!isDeployConfirmed) {
-        Logger.error("Deployment cancelled");
-        return;
-      }
+    if (confirmPublish && !await confirm({ message: "Are you sure you want to deploy the libraries?" })) {
+      Logger.error("Deployment cancelled");
+      return;
     }
     if (!registry) {
       Logger.info("Logging in to npm...");
@@ -1015,14 +973,12 @@ ${run.format(results)}
     const rootPackageJson = await workspace.getPackageJson();
     if (!rootPackageJson.dependencies)
       throw new Error("No dependencies found in package.json");
-    if (rootPackageJson.dependencies.akanjs)
-      rootPackageJson.dependencies.akanjs = latestPublishedVersion;
-    if (rootPackageJson.devDependencies?.akanjs)
-      rootPackageJson.devDependencies.akanjs = latestPublishedVersion;
-    if (rootPackageJson.dependencies["@akanjs/devkit"])
-      rootPackageJson.dependencies["@akanjs/devkit"] = latestPublishedVersion;
-    if (rootPackageJson.devDependencies?.["@akanjs/devkit"])
-      rootPackageJson.devDependencies["@akanjs/devkit"] = latestPublishedVersion;
+    for (const name of ["akanjs", "@akanjs/devkit"]) {
+      if (rootPackageJson.dependencies[name])
+        rootPackageJson.dependencies[name] = latestPublishedVersion;
+      if (rootPackageJson.devDependencies?.[name])
+        rootPackageJson.devDependencies[name] = latestPublishedVersion;
+    }
     await workspace.setPackageJson(rootPackageJson);
     await workspace.spawn("bun", ["install", ...this.#getRegistryArgs(registryUrl)], {
       env: this.#getRegistryEnv(registryUrl)
@@ -1065,9 +1021,7 @@ ${run.format(results)}
         cwd: workspace.workspaceRoot,
         stdio: "inherit"
       });
-      await workspace.spawn("tar", ["-xf", envArchivePath], {
-        cwd: workspace.workspaceRoot
-      });
+      await workspace.spawn("tar", ["-xf", envArchivePath], { cwd: workspace.workspaceRoot });
       await workspace.remove(envArchivePath);
     } catch (error) {
       throw new Error(`Failed to download env archive from remote server "${remoteServer.name}"`, { cause: error });
@@ -1109,9 +1063,7 @@ ${run.format(results)}
     await workspace.remove(archivePath);
     if (envFilePaths.length === 0)
       throw new Error(scope ? `No environment files found to archive for ${appNames.join(", ") || "(no apps)"}` : "No environment files found to archive");
-    await workspace.spawn("tar", ["-cf", archivePath, ...envFilePaths], {
-      cwd: workspace.workspaceRoot
-    });
+    await workspace.spawn("tar", ["-cf", archivePath, ...envFilePaths], { cwd: workspace.workspaceRoot });
     Logger.info(`Archived ${envFilePaths.length} environment files to ${archivePath}`);
     return { files: envFilePaths, path: archivePath };
   }

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-667w0yah.js → index-c6eggbee.js}

@@ -59,12 +59,8 @@ class CodeAgentStreamPrinter2 {
           return;
         this.#streaming = true;
         return this.#write(chalk.dim(event.text));
-      case "message":
-        return;
       case "tool_start":
         return this.#line(chalk.cyan(`\u2192 ${event.tool.title}`));
-      case "tool_progress":
-        return;
       case "tool_end":
         return this.#line(CodeAgentStreamPrinter2.#toolEnd(event));
       case "session":
@@ -73,11 +69,12 @@ class CodeAgentStreamPrinter2 {
         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":
-        return;
       case "subagent":
         return;
       case "question":