akm-cli 0.9.0-rc.8 → 0.9.0

package/dist/setup/detect.js

@@ -12,7 +12,8 @@ import os from "node:os";
 import path from "node:path";
 import { runManagedSubprocess } from "../core/subprocess.js";
 import { defaultWhich } from "../integrations/agent/detect.js";
-import { SESSION_LOG_HARNESSES } from "../integrations/harnesses/index.js";
+import { getBuiltinAgentProfile, OPENCODE_SDK_SERVER_BIN } from "../integrations/agent/profiles.js";
+import { AGENT_DISPATCH_HARNESSES, SESSION_LOG_HARNESSES } from "../integrations/harnesses/index.js";
 import { detectHarnessConfigs } from "./harness-config-import.js";
 let detectOverrides;
 /** TEST-ONLY. Swap the network/host probes; pass undefined to restore. */
@@ -332,26 +333,52 @@ function findGitRepoRoot(start) {
     }
 }
 /**
- * Detect the best agent harness in priority order:
- *   1. OpenCode SDK resolvable via `import('@opencode-ai/sdk')`.
- *   2. `opencode` binary on PATH.
- *   3. `claude` binary on PATH.
- *   4. none.
+ * Detect the best agent harness, preferring in-process/SDK dispatch over CLI
+ * subprocess dispatch:
+ *   1. `opencode-sdk` — the embedded SDK, when the server binary it spawns is
+ *      on PATH.
+ *   2. the first dispatch-capable CLI harness whose binary is on PATH, in
+ *      registry order (`opencode`, `claude`, `codex`, ...).
+ *   3. none.
+ *
+ * The SDK import resolving is NOT evidence the SDK path can run: `@opencode-ai/sdk`
+ * is a hard dependency of akm-cli itself, so `import()` always succeeds and an
+ * import-only check would report `opencode-sdk` on every machine — including
+ * ones where the first agentic command then dies with spawn ENOENT. The SDK
+ * runner spawns `opencode serve` (see `harnesses/opencode-sdk/sdk-runner.ts`),
+ * so the binary probe is what actually decides. The package cannot substitute
+ * for the binary under any driver: it declares `"dependencies": {}` and its
+ * own `createOpencodeServer` spawns the same `opencode serve`.
  *
  * Pure aside from the dynamic import resolution (which performs no network).
  */
 export async function detectHarness(whichFn = defaultWhich) {
-    try {
-        await import("@opencode-ai/sdk");
-        return "opencode-sdk";
+    // Probed once; reused below so the `opencode` CLI fallback doesn't repeat
+    // the identical full-PATH walk this just performed.
+    const opencodePath = whichFn(OPENCODE_SDK_SERVER_BIN);
+    if (opencodePath) {
+        try {
+            await import("@opencode-ai/sdk");
+            return "opencode-sdk";
+        }
+        catch {
+            // SDK genuinely unavailable (e.g. externalized in a standalone build).
+            // Fall through — the `opencode` CLI harness is probed below.
+        }
     }
-    catch {
-        // SDK not installed — fall through to bin probes.
+    for (const harness of AGENT_DISPATCH_HARNESSES) {
+        // The SDK harness dispatches without a CLI profile and was decided above;
+        // an explicit skip so a future BUILTINS entry for it can't silently
+        // reintroduce it here after the import guard already rejected it.
+        if (harness.id === "opencode-sdk")
+            continue;
+        const bin = getBuiltinAgentProfile(harness.id)?.bin;
+        if (!bin)
+            continue;
+        const found = bin === OPENCODE_SDK_SERVER_BIN ? opencodePath : whichFn(bin);
+        if (found)
+            return harness.id;
     }
-    if (whichFn("opencode"))
-        return "opencode";
-    if (whichFn("claude"))
-        return "claude";
     return "none";
 }
 /**

package/dist/setup/registry-stash-loader.js

@@ -30,7 +30,7 @@ const FALLBACK_STASHES = [
     {
         id: "itlackey/akm-stash",
         name: "itlackey/akm-stash",
-        description: "Official AKM onboarding stash",
+        description: "Official AKM onboarding bundle",
         url: "https://github.com/itlackey/akm-stash",
         source: "fallback",
         defaultSelected: true,
@@ -38,7 +38,7 @@ const FALLBACK_STASHES = [
     {
         id: "andrewyng/context-hub",
         name: "andrewyng/context-hub",
-        description: "Optional community prompt and context stash",
+        description: "Optional community prompt and context bundle",
         url: "https://github.com/andrewyng/context-hub",
         source: "fallback",
         defaultSelected: false,