@kontextmind/kxm 0.7.174 → 0.7.176

package/plugins/kxm/src/harness.ts

@@ -1449,13 +1449,24 @@ function argsFor(entry: HarnessCatalogEntry, scope: Exclude<HarnessUpdateScope,
   return entry.update.models;
 }
 
+function detectedHarnesses(
+  inventory: HarnessInventory,
+  requestedHarness?: string,
+): HarnessStatus[] {
+  if (requestedHarness) return inventory.harnesses.filter((entry) => entry.id === requestedHarness);
+  const detected = inventory.harnesses.filter((entry) => entry.detected);
+  const preferred = inventory.defaultHarness;
+  return [
+    ...detected.filter((entry) => entry.id === preferred),
+    ...detected.filter((entry) => entry.id !== preferred),
+  ];
+}
+
 export function planHarnessUpdate(
   inventory: HarnessInventory,
   requested: { harness?: string; scope: HarnessUpdateScope },
 ): HarnessUpdateStep[] {
-  const selected = requested.harness
-    ? inventory.harnesses.filter((entry) => entry.id === requested.harness)
-    : inventory.harnesses.filter((entry) => entry.detected);
+  const selected = detectedHarnesses(inventory, requested.harness);
   if (requested.harness && selected.length === 0) {
     return [{
       harness: requested.harness,
@@ -1466,36 +1477,46 @@ export function planHarnessUpdate(
       detail: isKnownHarnessId(requested.harness) ? "not_detected" : "unknown_harness",
     }];
   }
+  const waves: Exclude<HarnessUpdateScope, "all">[] = requested.scope === "all"
+    ? ["self", "extensions", "models"]
+    : [requested.scope];
   const steps: HarnessUpdateStep[] = [];
-  for (const status of selected) {
-    const entry = BUILTIN_HARNESSES.find((candidate) => candidate.id === status.id);
-    if (!entry) continue;
-    const scopes = scopesFor(requested.scope, entry);
-    if (scopes.length === 0) {
-      steps.push({
-        harness: status.id,
-        scope: requested.scope === "all" ? "self" : requested.scope,
-        command: status.command ?? entry.commands[0]!,
-        args: [],
-        outcome: "skipped",
-        detail: "no_updater",
-      });
-      continue;
-    }
-    if (!status.detected || !status.command) {
+  for (const scope of waves) {
+    for (const status of selected) {
+      const entry = BUILTIN_HARNESSES.find((candidate) => candidate.id === status.id);
+      if (!entry) continue;
+      const supported = scopesFor(requested.scope === "all" ? "all" : scope, entry);
+      if (!supported.includes(scope)) {
+        if (requested.scope !== "all") {
+          steps.push({
+            harness: status.id,
+            scope,
+            command: status.command ?? entry.commands[0]!,
+            args: [],
+            outcome: "skipped",
+            detail: "no_updater",
+          });
+        }
+        continue;
+      }
+      if (!status.detected || !status.command) {
+        steps.push({
+          harness: status.id,
+          scope,
+          command: entry.commands[0]!,
+          args: argsFor(entry, scope) ?? [],
+          outcome: "skipped",
+          detail: "not_detected",
+        });
+        continue;
+      }
       steps.push({
         harness: status.id,
-        scope: scopes[0]!,
-        command: entry.commands[0]!,
-        args: argsFor(entry, scopes[0]!) ?? [],
-        outcome: "skipped",
-        detail: "not_detected",
+        scope,
+        command: status.command,
+        args: argsFor(entry, scope) ?? [],
+        outcome: "would",
       });
-      continue;
-    }
-    for (const scope of scopes) {
-      const args = argsFor(entry, scope) ?? [];
-      steps.push({ harness: status.id, scope, command: status.command, args, outcome: "would" });
     }
   }
   return steps;

package/plugins/kxm/src/kxm-install-kind.ts

@@ -19,6 +19,12 @@ export interface InstallKindReport {
   instruction: string;
 }
 
+export function kxmSourceCheckoutRoot(dir: string): string | undefined {
+  if (!existsSync(join(dir, ".git"))) return undefined;
+  if (!packageIsKxm(dir)) return undefined;
+  return dir;
+}
+
 function packageIsKxm(root: string): boolean {
   try {
     const pkg = JSON.parse(readFileSync(join(root, "package.json"), "utf8")) as { name?: unknown };

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

@@ -10,7 +10,7 @@ import { kxmUserStateRoot } from "./bindings.ts";
 
 export function loadKxmUpdateConfig(env: NodeJS.ProcessEnv = process.env): KxmUpdateConfig {
   const path = join(kxmUserStateRoot({ env }), "update.yaml");
-  if (!existsSync(path)) return { schema: KXM_UPDATE_SCHEMA, auto: false, source: "github" };
+  if (!existsSync(path)) return { schema: KXM_UPDATE_SCHEMA, auto: false, source: "npm" };
   let parsed: unknown;
   try {
     parsed = parseYaml(readFileSync(path, "utf8"));
@@ -31,7 +31,7 @@ export function loadKxmUpdateConfig(env: NodeJS.ProcessEnv = process.env): KxmUp
   if (typeof row.auto !== "boolean") {
     throw new KxmUpdateConfigError("update.yaml auto must be a boolean");
   }
-  const source = row.source === undefined ? "github" : row.source;
+  const source = row.source === undefined ? "npm" : row.source;
   if (source !== "npm" && source !== "github") {
     throw new KxmUpdateConfigError("update.yaml source must be npm or github");
   }

package/plugins/kxm/src/kxm-update.ts

@@ -10,6 +10,7 @@ const CACHE_TTL_MS = 6 * 60 * 60 * 1000;
 const SHA256_DIGEST = /^sha256:([0-9a-fA-F]{64})$/;
 
 export type KxmUpdateSource = "npm" | "github";
+export type KxmApplySource = KxmUpdateSource | "local";
 
 export interface KxmReleaseAsset {
   name: string;
@@ -27,9 +28,10 @@ export interface KxmUpdateNotice {
   latest?: string;
   available: boolean;
   auto: boolean;
-  source: KxmUpdateSource;
+  source: KxmApplySource;
   message: string;
   asset?: KxmReleaseAsset;
+  localRoot?: string;
 }
 
 export class KxmUpdateConfigError extends Error {
@@ -100,7 +102,7 @@ export function compareSemver(left: string, right: string): number | undefined {
 
 export function formatKxmUpdateNotice(notice: KxmUpdateNotice): string {
   if (!notice.available) return notice.message;
-  const apply = notice.auto ? "kxm update --kxm (auto)" : "kxm update --kxm";
+  const apply = notice.auto ? "kxm update (auto)" : "kxm update";
   return `kxm ${notice.current} → ${notice.latest} available · ${apply}`;
 }
 
@@ -243,14 +245,19 @@ export function verifyReleaseAssetDigest(path: string, sha256: string): boolean
   }
 }
 
-/** npm registry apply is for after the public package exists. npm verifies registry integrity itself; do not duplicate that check here. Git installs use GitHub release tarballs. */
+/** npm is the default source and npm verifies registry integrity itself. "local" installs this repository's checkout. "github" downloads the release tarball (gh, or curl without gh) and verifies its sha256. */
 export function planKxmPackageUpdate(
-  source: KxmUpdateSource,
+  source: KxmApplySource,
   latest: string,
   releaseDir: string,
   asset?: KxmReleaseAsset,
   downloader: "gh" | "curl" = "gh",
+  localRoot?: string,
 ): KxmPackageUpdateStep[] {
+  if (source === "local") {
+    if (!localRoot) return [];
+    return [{ kind: "install", command: "npm", args: ["install", "--global", "--omit=peer", localRoot] }];
+  }
   if (source === "npm") {
     return [{ kind: "install", command: "npm", args: ["install", "--global", "--omit=peer", `@kontextmind/kxm@${latest}`] }];
   }

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

@@ -11,7 +11,7 @@ import { deliverInboxNotification } from "./inbox.ts";
 import type { HubEvent, MessageRecord } from "./protocol.ts";
 import { sessionTokenFixHint } from "./session-token-hint.ts";
 
-const VERSION = "0.7.174";
+const VERSION = "0.7.176";
 const CONFIGURE_PLUGIN = "/plugin configure kxm@kxm";
 const inbox = new Map<string, MessageRecord>();
 const notifiedInbox = new Set<string>();

package/scripts/docker-install-smoke.mjs

@@ -14,6 +14,7 @@ import { chmodSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "nod
 import { homedir, tmpdir } from "node:os";
 import { join, resolve } from "node:path";
 
+import { npmPackArtifacts } from "./npm-pack-json.mjs";
 const repoRoot = resolve(import.meta.dirname, "..");
 
 const vault = process.env.KXM_SMOKE_VAULT ?? "AI Provider Keys";
@@ -92,7 +93,7 @@ function main() {
     //    commit gate (`npm run verify` -> check:generated) enforces that.
     process.stdout.write("==> npm pack\n");
     const packed = run("npm", ["pack", "--pack-destination", scratch, "--json"], { cwd: repoRoot });
-    const filename = JSON.parse(packed.stdout)[0]?.filename;
+    const filename = npmPackArtifacts(packed.stdout)[0]?.filename;
     if (!filename) die("npm pack produced no tarball");
     const tarball = join(scratch, filename);
 

package/scripts/npm-pack-json.d.mts

@@ -0,0 +1,4 @@
+export function npmPackArtifacts(stdout: string): Array<{
+  filename?: string;
+  files?: Array<{ path: string }>;
+}>;

package/scripts/npm-pack-json.mjs

@@ -0,0 +1,15 @@
+/**
+ * `npm pack --json` is a one-element array through npm 11. npm 12 returns
+ * one object keyed by package name. Both shapes carry `filename` and `files`.
+ */
+export function npmPackArtifacts(stdout) {
+  const parsed = JSON.parse(stdout);
+  if (Array.isArray(parsed)) return parsed;
+  if (parsed && typeof parsed === "object") {
+    const values = Object.values(parsed);
+    if (values.length > 0 && values.every((value) => value && typeof value === "object" && !Array.isArray(value))) {
+      return values;
+    }
+  }
+  throw new Error(`unexpected npm pack JSON: ${String(stdout).slice(0, 200)}`);
+}

package/scripts/pr-land.mjs

@@ -8,7 +8,7 @@
 
 import { spawnSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
-import { join, resolve } from "node:path";
+import { delimiter, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const STAGES = Object.freeze([
@@ -67,13 +67,55 @@ function childEnv() {
   return env;
 }
 
+function pathValue(env) {
+  const key = Object.keys(env).find((name) => name.toUpperCase() === "PATH");
+  return key ? env[key] : "";
+}
+
+function comSpec(env) {
+  const key = Object.keys(env).find((name) => name.toUpperCase() === "COMSPEC");
+  return (key && env[key].trim()) || "cmd.exe";
+}
+
+/** CreateProcess does not run `npm.cmd`. Prefer a real `.exe`; otherwise launch the `.cmd`/`.bat` through cmd. */
+function windowsScriptOnPath(command, env) {
+  if (process.platform !== "win32") return undefined;
+  if (/\.(?:exe|com)$/i.test(command) || /[\\/]/.test(command)) return undefined;
+  if (/\.(?:cmd|bat)$/i.test(command)) return command;
+  for (const dir of pathValue(env).split(delimiter)) {
+    if (!dir) continue;
+    if (existsSync(join(dir, `${command}.exe`))) return undefined;
+    const cmd = join(dir, `${command}.cmd`);
+    if (existsSync(cmd)) return cmd;
+    const bat = join(dir, `${command}.bat`);
+    if (existsSync(bat)) return bat;
+  }
+  return undefined;
+}
+
+function quoteCmdArg(value) {
+  const text = String(value);
+  if (/[\0\r\n"%!]/.test(text)) {
+    throw new Error(`cannot pass ${JSON.stringify(text)} to a Windows command script`);
+  }
+  return `"${text}"`;
+}
+
 function run(command, args, timeout = 120_000) {
-  const result = spawnSync(command, args, {
+  const env = childEnv();
+  const script = windowsScriptOnPath(command, env);
+  const windowsCommandScript = Boolean(script);
+  const launchCommand = windowsCommandScript ? comSpec(env) : command;
+  const launchArgs = windowsCommandScript
+    ? ["/d", "/s", "/v:off", "/c", `"${[script, ...args].map(quoteCmdArg).join(" ")}"`]
+    : args;
+  const result = spawnSync(launchCommand, launchArgs, {
     cwd: root,
     encoding: "utf8",
-    env: childEnv(),
+    env,
     timeout,
     windowsHide: true,
+    windowsVerbatimArguments: windowsCommandScript,
   });
   return {
     status: result.status ?? 1,