@kontextmind/kxm 0.7.20 → 0.7.22

package/plugins/kxm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kxm-claude-plugin",
-  "version": "0.7.20",
+  "version": "0.7.22",
   "private": true,
   "type": "module",
   "engines": {

package/plugins/kxm/src/cli/system.ts

@@ -2,9 +2,8 @@ import { spawnSync } from "node:child_process";
 import { createHash } from "node:crypto";
 import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
-import { dirname, join, resolve } from "node:path";
+import { join, resolve } from "node:path";
 import { createInterface } from "node:readline";
-import { fileURLToPath } from "node:url";
 import { verifyArtifactExists } from "../artifacts-exist.ts";
 import { parseWorkflowDefinitions } from "../workflow.ts";
 import { redactSecrets } from "../redact.ts";
@@ -99,8 +98,8 @@ import {
   warnIgnoredProjectUpdateYaml,
   refreshKxmUpdateNotice,
 } from "./hub.ts";
+import { findKxmRepoRoot } from "../repo-root.ts";
 
-const repoRoot = resolve(fileURLToPath(new URL("../../../../", import.meta.url)));
 
 export function cliSpawn(runtime: Runtime, command: string, args: readonly string[], extra?: { timeout?: number }): CliSpawnResult {
   if (runtime.io.spawnSync) return runtime.io.spawnSync(command, args);
@@ -297,7 +296,7 @@ export async function cmdUpdate(runtime: Runtime, harness: string | undefined, o
   warnIgnoredProjectUpdateYaml(runtime);
   const probe = installProbeFrom(runtime);
   const classified = classifyInstallRoot(probe);
-  const current = readInstalledKxmVersion(repoRoot);
+  const current = readInstalledKxmVersion(findKxmRepoRoot(import.meta.url));
   let notice: KxmUpdateNotice;
   let kindReport = classified;
   if (classified.kind === "source") {

package/plugins/kxm/src/cli/types.ts

@@ -1,6 +1,6 @@
 import { spawn } from "node:child_process";
 import { join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
+import { findKxmRepoRoot } from "../repo-root.ts";
 import type { Command } from "commander";
 import { redactSecrets } from "../redact.ts";
 import { appendTelemetry, inferImprovementTarget, makeTelemetryEvent, telemetryPath } from "../telemetry.ts";
@@ -61,11 +61,9 @@ export interface Runtime extends CliContext, Required<Pick<GlobalOpts, "json" |
   fetchImpl: typeof fetch;
 }
 
-const repoRoot = resolve(fileURLToPath(new URL("../../../../", import.meta.url)));
-
 export function spawnScript(scriptName: string, extraEnv: NodeJS.ProcessEnv = {}): Promise<number> {
   return new Promise((resolveExit) => {
-    const child = spawn(process.execPath, [join(repoRoot, "scripts", scriptName)], {
+    const child = spawn(process.execPath, [join(findKxmRepoRoot(import.meta.url), "scripts", scriptName)], {
       stdio: "inherit",
       env: { ...process.env, ...extraEnv },
     });

package/plugins/kxm/src/cli/vnext.ts

@@ -1,9 +1,8 @@
 import { createHash } from "node:crypto";
 import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
-import { dirname, join, resolve } from "node:path";
+import { join, resolve } from "node:path";
 import { createInterface } from "node:readline";
-import { fileURLToPath } from "node:url";
 import { createBackup, restoreBackup } from "../database.ts";
 import { refreshModelInventory } from "../model-inventory.ts";
 import { listInventoryModels, listRoleBindings, loadProducerPolicy, setModelState, updateProducer } from "../producers.ts";
@@ -48,8 +47,6 @@ export const vnextDriveCliSeams: {
   runtimeRequest?: typeof vnextRuntimeRequest;
 } = {};
 
-const repoRoot = resolve(fileURLToPath(new URL("../../../../", import.meta.url)));
-
 export function initPlanPayload(plan: VnextInitializationPlan): Record<string, unknown> {
   return {
     mode: plan.mode,

package/plugins/kxm/src/cli.ts

@@ -16,7 +16,9 @@ import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { Command, CommanderError } from "commander";
 import { readInstalledKxmVersion } from "./kxm-update.ts";
+import { findKxmRepoRoot } from "./repo-root.ts";
 import { HubClient } from "./client.ts";
+import { readHubEnvRecord } from "./hub-env.ts";
 import { defaultProjectName } from "./project-name.ts";
 import {
   AGENT_COMMANDS_MAP,
@@ -155,7 +157,16 @@ export type { CliIo, CliSpawnResult };
 export { hubContextPost };
 
 const CLI_NAME = "kxm";
-const repoRoot = resolve(fileURLToPath(new URL("../../../", import.meta.url)));
+
+/** Authenticate CLI hub clients: explicit KXM_AUTH_TOKEN first, then the
+ * persisted hub env record (project token for this project, then the admin
+ * token), matching the credential precedence `kxm hub start` prints. */
+function resolveCliAuthToken(runtime: Runtime, project: string): string | undefined {
+  const envToken = runtime.env.KXM_AUTH_TOKEN?.trim();
+  if (envToken) return envToken;
+  const record = readHubEnvRecord(runtime.env);
+  return record?.projectTokens?.[project]?.trim() || record?.authToken?.trim() || undefined;
+}
 
 const USAGE_ERROR_CODES = new Set([
   "commander.help",
@@ -183,12 +194,13 @@ async function ensureCliClient(runtime: Runtime): Promise<HubClient> {
   const project = defaultProjectName(runtime.cwd, runtime.env);
   const name = runtime.env.KXM_AGENT_NAME?.trim() || `cli-${process.pid}`;
   const purpose = runtime.env.KXM_AGENT_PURPOSE?.trim() || "CLI agent client";
-  const authToken = runtime.env.KXM_AUTH_TOKEN?.trim();
+  const authToken = resolveCliAuthToken(runtime, project);
   const client = new HubClient({
     serverUrl,
     name,
     project,
     purpose,
+    fetchImpl: runtime.fetchImpl,
     ...(authToken ? { authToken } : {}),
   });
   await client.start(() => {});
@@ -321,7 +333,7 @@ function createProgram(ctx: CliContext, result: { code: number }): Command {
   const program = new Command(CLI_NAME);
   program
     .description("KontextMind local-first orchestration CLI")
-    .version(readInstalledKxmVersion(repoRoot), "-V, --version", "Print the installed kxm version")
+    .version(readInstalledKxmVersion(findKxmRepoRoot(import.meta.url)), "-V, --version", "Print the installed kxm version")
     .exitOverride()
     .configureOutput({
       writeOut: (text) => ctx.io.stdout(text),

package/plugins/kxm/src/client.ts

@@ -55,6 +55,8 @@ export interface HubClientOptions {
   heartbeatMs?: number;
   reconnectMs?: number;
   requestTimeoutMs?: number;
+  /** Injectable fetch for CLI/tests; defaults to global fetch. */
+  fetchImpl?: typeof fetch;
 }
 
 export interface SendOptions {
@@ -493,7 +495,7 @@ export class HubClient {
     while (!this.stopped && this.agent) {
       this.eventsAbort = new AbortController();
       try {
-        const response = await fetch(
+        const response = await (this.options.fetchImpl ?? fetch)(
           `${this.options.serverUrl.replace(/\/$/, "")}/v1/events?agentId=${encodeURIComponent(this.agent.id)}`,
           {
             headers: this.headers(),
@@ -578,7 +580,7 @@ export class HubClient {
     const signal = init.signal ? AbortSignal.any([init.signal, timeoutSignal]) : timeoutSignal;
     let response: Response;
     try {
-      response = await fetch(`${this.options.serverUrl.replace(/\/$/, "")}${path}`, {
+      response = await (this.options.fetchImpl ?? fetch)(`${this.options.serverUrl.replace(/\/$/, "")}${path}`, {
         ...init,
         signal,
         headers: { ...this.headers(includeIdentity), ...(init.headers ?? {}) },

package/plugins/kxm/src/hub-autostart.ts

@@ -1,9 +1,9 @@
 import { spawn } from "node:child_process";
 import { closeSync, mkdirSync, openSync, readFileSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
+import { join, resolve } from "node:path";
 import { probeHubHealth, readHubBinding } from "./hub-binding.ts";
 import { resolveHubCredentials } from "./hub-env.ts";
+import { findKxmRepoRoot } from "./repo-root.ts";
 import { redactSecrets } from "./redact.ts";
 
 /** Background hub auto-start for harness extensions (Pi TUI, one-shot CLIs).
@@ -99,11 +99,11 @@ export function readLiveHubClaim(stateDir: string, processExists: (pid: number)
   };
 }
 
-/** The hub wrapper script next to the checked-out KXM repo. The extension and
+/** The hub wrapper script at the KXM repo/package root. The extension and
  * the CLI both resolve the same path so auto-start launches the identical
  * supervision wrapper as `kxm hub start`. */
 export function defaultHubWrapperScriptPath(moduleUrl: string = import.meta.url): string {
-  return resolve(dirname(fileURLToPath(moduleUrl)), "../../../scripts/kxm-hub.mjs");
+  return join(findKxmRepoRoot(moduleUrl), "scripts", "kxm-hub.mjs");
 }
 
 function defaultHubSpawner(command: string, args: readonly string[], options: HubSpawnOptions): HubSpawned {

package/plugins/kxm/src/mcp-server.ts

@@ -7,7 +7,7 @@ import { AGENT_COMMANDS_MAP, enforceToolPolicy, getMcpTools, reconcileInbox } fr
 import { deliverInboxNotification } from "./inbox.ts";
 import type { HubEvent, MessageRecord } from "./protocol.ts";
 
-const VERSION = "0.7.20";
+const VERSION = "0.7.22";
 const inbox = new Map<string, MessageRecord>();
 const notifiedInbox = new Set<string>();
 let meshClient: HubClient | undefined;

package/plugins/kxm/src/repo-root.ts

@@ -0,0 +1,29 @@
+import { existsSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+/** Files that only exist at the KXM repo/package root. */
+const ROOT_MARKERS = ["scripts/kxm-hub.mjs", "scripts/kxm.mjs"] as const;
+const MAX_WALK_DEPTH = 10;
+
+/**
+ * Locate the KXM repo/package root by walking up from `fromUrl` until a
+ * directory contains a root marker. Fixed-depth `../..` resolution breaks
+ * because the same module runs from both the source tree
+ * (`plugins/kxm/src/...`) and the flat bundled `plugins/kxm/dist/...`
+ * layout; marker discovery is correct in both, and in npm-installed
+ * layouts, which also ship `scripts/`.
+ */
+export function findKxmRepoRoot(fromUrl: string = import.meta.url): string {
+  let dir = dirname(fileURLToPath(fromUrl));
+  for (let depth = 0; depth < MAX_WALK_DEPTH; depth += 1) {
+    if (ROOT_MARKERS.some((marker) => existsSync(join(dir, marker)))) return dir;
+    const parent = dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  throw new Error(
+    `kxm: cannot locate the KXM repo root from ${fileURLToPath(fromUrl)} ` +
+      `(walked ${MAX_WALK_DEPTH} levels looking for ${ROOT_MARKERS[0]})`,
+  );
+}

package/plugins/kxm/src/vnext-config.ts

@@ -2,7 +2,6 @@ import { spawnSync } from "node:child_process";
 import { createHash } from "node:crypto";
 import { existsSync, lstatSync, readFileSync, readdirSync, realpathSync } from "node:fs";
 import { basename, dirname, extname, isAbsolute, join, relative, resolve, sep } from "node:path";
-import { fileURLToPath } from "node:url";
 import { Ajv2020, type ErrorObject, type ValidateFunction } from "ajv/dist/2020.js";
 import {
   RestrictedYamlError,
@@ -11,6 +10,7 @@ import {
   type VnextYamlLimits,
 } from "./restricted-yaml.mjs";
 import { resolveVnextTemplateBaseline } from "./vnext-template.ts";
+import { findKxmRepoRoot } from "./repo-root.ts";
 import { BUILTIN_HARNESS_IDS, DEFAULT_HARNESS, validateHarnessModelPair } from "./vnext-harness.ts";
 
 export type JsonValue = null | boolean | number | string | JsonValue[] | { [key: string]: JsonValue };
@@ -86,8 +86,10 @@ export interface VnextInitializationPlan {
   configRevision?: string;
 }
 
-const PACKAGE_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "../../..");
-const DEFAULT_SCHEMA_DIR = join(PACKAGE_ROOT, "schemas", "vnext");
+function defaultVnextSchemaDir(): string {
+  return join(findKxmRepoRoot(import.meta.url), "schemas", "vnext");
+}
+const DEFAULT_SCHEMA_DIR = defaultVnextSchemaDir();
 const RESOURCE_SCHEMA: Readonly<Record<VnextResourceKind, { identity: string; file: string }>> = Object.freeze({
   project: { identity: "kxm.project.v1", file: "project.schema.json" },
   repository: { identity: "kxm.repository.v1", file: "repository.schema.json" },

package/plugins/kxm/src/vnext-runtime-supervisor.ts

@@ -2,10 +2,9 @@ import { spawn } from "node:child_process";
 import { createHash, createHmac, randomBytes, timingSafeEqual } from "node:crypto";
 import { chmodSync, existsSync, lstatSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { createServer, type IncomingMessage, type Server, type ServerResponse } from "node:http";
-import { dirname, isAbsolute, join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
+import { dirname, isAbsolute, join } from "node:path";
+import { findKxmRepoRoot } from "./repo-root.ts";
 import { loadVnextProject, VnextConfigError, type VnextConfigOptions } from "./vnext-config.ts";
-const repoRoot = resolve(fileURLToPath(new URL("../../../", import.meta.url)));
 import {
   VnextRuntimeRegistry,
   projectRuntimeKey,
@@ -201,7 +200,7 @@ export async function ensureVnextSupervisor(
 
   // Auto-start: claim the singleton, spawn detached, wait for readiness.
   clearSupervisorError(paths);
-  const scriptPath = join(repoRoot, "scripts", "kxm-runtime-supervisor.mjs");
+  const scriptPath = join(findKxmRepoRoot(import.meta.url), "scripts", "kxm-runtime-supervisor.mjs");
   const spawnImpl = options.spawnImpl ?? ((script: string, env: NodeJS.ProcessEnv): number => {
     const child = spawn(process.execPath, [script], {
       detached: true,