@akanjs/cli 3.0.0-alpha.4 → 3.0.0-alpha.41

package/incrementalBuilder.proc.js

@@ -8,7 +8,7 @@ import {
   DevGeneratedIndexSync,
   GraphClientEntryDiscovery,
   RouteClientBuilder
-} from "./index-rh16j3c7.js";
+} from "./index-qnv0aqmm.js";
 import {
   HmrWatcher,
   WatchRootResolver
@@ -16,10 +16,11 @@ import {
 import {
   AppExecutor,
   WorkspaceExecutor
-} from "./index-jtm86byd.js";
-import"./index-6pz1j0zj.js";
+} from "./index-8vkkm7v0.js";
+import"./index-mxvakhsm.js";
+import"./index-1577bej2.js";
 import"./index-67546d0j.js";
-import"./index-r24hmh0q.js";
+import"./index-yb2wsc7f.js";
 
 // pkgs/@akanjs/devkit/incrementalBuilder/incrementalBuilder.proc.ts
 import path2 from "path";
@@ -249,7 +250,7 @@ class IncrementalBuilder {
       return;
     this.#shuttingDown = true;
     const started = Date.now();
-    this.#logger.info(`shutdown requested (${reason}); draining ${this.#inFlight} work item(s)`);
+    this.#logger.debug(`shutdown requested (${reason}); draining ${this.#inFlight} work item(s)`);
     if (this.#cssRebuildTimer) {
       clearTimeout(this.#cssRebuildTimer);
       this.#cssRebuildTimer = null;
@@ -262,7 +263,7 @@ class IncrementalBuilder {
       return;
     });
     const flushed = await BuilderChannel.drain();
-    this.#logger.info(`drained in ${Date.now() - started}ms${flushed ? ` after flushing ${flushed} ipc write(s)` : ""}; exiting for recycle`);
+    this.#logger.debug(`drained in ${Date.now() - started}ms${flushed ? ` after flushing ${flushed} ipc write(s)` : ""}; exiting for recycle`);
     process.exit(0);
   }
   get shuttingDown() {

package/{index-1s71fwrq.js → index-0h212yqe.js}

@@ -1,22 +1,22 @@
 // @bun
 import {
   RepairRunner
-} from "./index-b978vs2e.js";
+} from "./index-xyrb7pk5.js";
 import {
   WorkflowRunner
-} from "./index-csqk9z5j.js";
+} from "./index-3dp7x6rc.js";
+import {
+  ScalarScript
+} from "./index-x33gnap3.js";
 import {
   PrimitiveScript
-} from "./index-r4w8cry5.js";
+} from "./index-9jsnb4vw.js";
 import {
   ModuleScript
-} from "./index-vhv3xnjz.js";
-import {
-  ScalarScript
-} from "./index-fmgbwsr5.js";
+} from "./index-mykmf6wd.js";
 import {
   isPlaceholderAppId
-} from "./index-y0k42k04.js";
+} from "./index-mz5jtaq7.js";
 import {
   AkanContextAnalyzer,
   akanMcpInstallConfigPaths,
@@ -27,17 +27,17 @@ import {
   renderDoctorText,
   resourceList,
   upsertCodexMcpServerBlock
-} from "./index-4yp06pn1.js";
+} from "./index-g9e2fhw2.js";
 import {
   buildAkanModuleContextIndex,
   createWorkflowBaselineSummary,
   createWorkflowStepRegistry,
   jsonText,
   toolingRolloutGate
-} from "./index-4zgs8g1w.js";
+} from "./index-tsmjxph2.js";
 import {
   Prompter
-} from "./index-xwgm94zr.js";
+} from "./index-j37qq1f2.js";
 import {
   getMobileTargets
 } from "./index-76rn3g2c.js";
@@ -45,10 +45,10 @@ import {
   CommandContainer,
   runner,
   script
-} from "./index-jk9q6pse.js";
+} from "./index-n706txcv.js";
 import {
   AppExecutor
-} from "./index-jtm86byd.js";
+} from "./index-8vkkm7v0.js";
 
 // pkgs/@akanjs/cli/context/context.script.ts
 import { Logger } from "akanjs/common";

package/index-1577bej2.js

@@ -0,0 +1,7 @@
+// @bun
+// pkgs/@akanjs/devkit/getDirname.ts
+import path from "path";
+import { fileURLToPath } from "url";
+var getDirname = (url) => path.dirname(fileURLToPath(url));
+
+export { getDirname };

package/{index-e3qskyt2.js → index-33zce8gt.js}

@@ -2,10 +2,10 @@
 import {
   runner,
   script
-} from "./index-jk9q6pse.js";
+} from "./index-n706txcv.js";
 import {
   PkgExecutor
-} from "./index-jtm86byd.js";
+} from "./index-8vkkm7v0.js";
 import {
   TypeScriptDependencyScanner
 } from "./index-46tjzh6s.js";
@@ -163,13 +163,17 @@ class PackageRunner extends runner("package") {
         "tailwind-scrollbar"
       ].filter((dep) => dep !== "akanjs" && dep !== "@akanjs/devkit");
     }
-    const bundledRuntimeDeps = new Set(pkg.name === "@akanjs/cli" ? ["@akanjs/devkit"] : []);
+    const packageBundledRuntimeDependencies = {
+      "@akanjs/cli": ["@akanjs/devkit"],
+      akanjs: ["use-agentic"]
+    };
+    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));
+    const packageRuntimeDevDeps = [...new Set([...npmDevDeps, ...forcedRuntimeDevDeps])].filter((dep) => !optionalPeerDeps.has(dep) && !bundledRuntimeDeps.has(dep));
     const rootDeps = { ...rootPackageJson.dependencies, ...rootPackageJson.devDependencies };
     const missingForcedDeps = forcedRuntimeDeps.filter((dep) => !rootDeps[dep]);
     const missingForcedDevDeps = forcedRuntimeDevDeps.filter((dep) => !rootDeps[dep]);

package/{index-csqk9z5j.js → index-3dp7x6rc.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   AkanContextAnalyzer
-} from "./index-4yp06pn1.js";
+} from "./index-g9e2fhw2.js";
 import {
   WorkflowExecutor,
   compactWorkflowInputs,
@@ -23,10 +23,10 @@ import {
   workflowCommandsForPlan,
   workflowPlanApproval,
   writeWorkflowRunArtifact
-} from "./index-4zgs8g1w.js";
+} from "./index-tsmjxph2.js";
 import {
   runner
-} from "./index-jk9q6pse.js";
+} from "./index-n706txcv.js";
 
 // pkgs/@akanjs/cli/workflow/workflow.runner.ts
 import { mkdir, readFile, writeFile } from "fs/promises";

package/{index-cn24dcqn.js → index-73rnbwgg.js}

@@ -2,16 +2,17 @@
 import {
   runner,
   script
-} from "./index-jk9q6pse.js";
+} from "./index-n706txcv.js";
 import {
   LibExecutor
-} from "./index-jtm86byd.js";
+} from "./index-8vkkm7v0.js";
 
 // pkgs/@akanjs/cli/semver.ts
-function parseVersion(version) {
+var stripRangeOperator = (version) => version.replace(/^[\s^~>=<v]+/, "").trim();
+var parseVersion = (version) => {
   return version.replace(/^[^\d]*/, "").split(/[.-]/).map((part) => Number.parseInt(part, 10)).map((part) => Number.isFinite(part) ? part : 0);
-}
-function compareSemver(a, b) {
+};
+var compareNumeric = (a, b) => {
   const left = parseVersion(a);
   const right = parseVersion(b);
   const length = Math.max(left.length, right.length);
@@ -21,7 +22,14 @@ function compareSemver(a, b) {
       return diff > 0 ? 1 : -1;
   }
   return 0;
-}
+};
+var compareSemver = (a, b) => {
+  try {
+    return Bun.semver.order(stripRangeOperator(a), stripRangeOperator(b));
+  } catch {
+    return compareNumeric(a, b);
+  }
+};
 
 // pkgs/@akanjs/cli/library/library.runner.ts
 class LibraryRunner extends runner("library") {
@@ -70,7 +78,7 @@ class LibraryRunner extends runner("library") {
       return [dep, newerVersion];
     }));
     Object.keys(allDependencies).sort().forEach((dep) => {
-      if (!!libPackageJson.dependencies?.[dep] || !!rootPackageJson.dependencies?.[dep])
+      if (libPackageJson.dependencies?.[dep] || rootPackageJson.dependencies?.[dep])
         dependencies[dep] = allDependencies[dep];
       else
         devDependencies[dep] = allDependencies[dep];

package/{index-tq1y56tp.js → index-8d2sv6pw.js}

@@ -1,14 +1,14 @@
 // @bun
+import {
+  LibraryScript
+} from "./index-73rnbwgg.js";
 import {
   resolveMobileTargets
 } from "./index-76rn3g2c.js";
-import {
-  LibraryScript
-} from "./index-cn24dcqn.js";
 import {
   runner,
   script
-} from "./index-jk9q6pse.js";
+} from "./index-n706txcv.js";
 import {
   HmrWatcher,
   WatchRootResolver
@@ -18,10 +18,10 @@ import {
   LibExecutor,
   PkgExecutor,
   WorkspaceExecutor
-} from "./index-jtm86byd.js";
+} from "./index-8vkkm7v0.js";
 import {
   __require
-} from "./index-r24hmh0q.js";
+} from "./index-yb2wsc7f.js";
 
 // pkgs/@akanjs/devkit/applicationBuildReporter.ts
 import { Logger } from "akanjs/common";
@@ -350,7 +350,7 @@ class IncrementalBuilderHost {
       return false;
     this.#recycleRequested = true;
     this.#status = "recycling";
-    this.logger.info(`recycling builder pid=${proc.pid} (${reason})`);
+    this.logger.debug(`recycling builder pid=${proc.pid} (${reason})`);
     this.#recycleTimer = setTimeout(() => {
       this.#recycleTimer = null;
       if (this.#proc !== proc)
@@ -1898,10 +1898,10 @@ function openBrowser(url) {
 }
 
 // pkgs/@akanjs/cli/application/application.runner.ts
-var loadBuildRunner = async () => (await import("./applicationBuildRunner-cwk52sb7.js")).ApplicationBuildRunner;
-var loadReleasePackager = async () => (await import("./applicationReleasePackager-yrrhbkv3.js")).ApplicationReleasePackager;
-var loadCapacitorApp = async () => (await import("./capacitorApp-j357ak1g.js")).CapacitorApp;
-var loadAbstractCompactor = async () => (await import("./abstractCompactor-rk6twzvj.js")).AbstractCompactor;
+var loadBuildRunner = async () => (await import("./applicationBuildRunner-7gnfz7ww.js")).ApplicationBuildRunner;
+var loadReleasePackager = async () => (await import("./applicationReleasePackager-93nzdfsy.js")).ApplicationReleasePackager;
+var loadCapacitorApp = async () => (await import("./capacitorApp-qv7g3dp2.js")).CapacitorApp;
+var loadAbstractCompactor = async () => (await import("./abstractCompactor-20e0cwbs.js")).AbstractCompactor;
 var loadPrompts = async () => await import("@inquirer/prompts");
 
 class ApplicationRunner extends runner("application") {
@@ -2241,6 +2241,7 @@ ${detail}`
 
 // pkgs/@akanjs/cli/application/application.script.ts
 class ApplicationScript extends script("application", [ApplicationRunner, LibraryScript]) {
+  static dbShutdownTimeoutMs = 20000;
   async confirmDatabaseModeDependencyInstall(databaseMode, installSpecs) {
     return await confirm({
       message: [
@@ -2418,10 +2419,7 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
     if (app.getEnv() === "local" && dbup && databaseMode !== "single") {
       const wasDbAlreadyUp = await this.dbup(app.workspace, databaseMode);
       if (!wasDbAlreadyUp)
-        process.on("SIGINT", async () => {
-          await this.dbdown(app.workspace);
-          process.exit(0);
-        });
+        this.#stopDatabaseOnInterrupt(app.workspace);
     }
     const spinner = app.spinning("Preparing backend...");
     const akanAppHost = await this.applicationRunner.start(app, {
@@ -2518,9 +2516,34 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
   }
   async dbdown(workspace) {
     const spinner = workspace.spinning("Stopping local database...");
-    await this.applicationRunner.dbdown(workspace);
+    try {
+      await this.applicationRunner.dbdown(workspace);
+    } catch (error) {
+      spinner.fail("Local database failed to stop");
+      throw error;
+    }
     spinner.succeed("Local database (/local/docker-compose.yaml) is down");
   }
+  #stopDatabaseOnInterrupt(workspace) {
+    let stopping = false;
+    process.on("SIGINT", () => {
+      if (stopping) {
+        Logger5.rawLog("Abandoning the local database teardown; containers are left running.", undefined, "error");
+        process.exit(130);
+      }
+      stopping = true;
+      this.#stopDatabase(workspace).finally(() => process.exit(0));
+    });
+  }
+  async#stopDatabase(workspace) {
+    const timeout = new Promise((resolve) => setTimeout(() => resolve("timeout"), ApplicationScript.dbShutdownTimeoutMs));
+    const result = await Promise.race([this.dbdown(workspace).catch(() => {
+      return;
+    }), timeout]);
+    if (result !== "timeout")
+      return;
+    Logger5.rawLog(`Local database did not stop within ${ApplicationScript.dbShutdownTimeoutMs}ms; run \`akan dbdown\` once Docker responds.`, undefined, "error");
+  }
   async testSys(sys) {
     if (sys.type === "app")
       await this.testApplication(sys);