kith-coord 0.1.0 → 0.1.2

package/dist/cli/index.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 // src/version.ts
-var KITH_VERSION = "0.1.0";
-var KITH_PROTOCOL_VERSION = "1.0.0";
+var KITH_VERSION = "0.1.2";
+var KITH_PROTOCOL_VERSION = "1.1.0";
 
 // src/cli/setup-ledger.ts
 import fs2 from "fs";
@@ -14,6 +14,7 @@ import { execFileSync } from "child_process";
 import fs from "fs";
 import path from "path";
 function physicalPath(input) {
+  if (process.platform === "win32") input = input.replaceAll("/", path.sep);
   const absolute = path.isAbsolute(input) ? input : process.cwd() + path.sep + input;
   let current = path.parse(absolute).root;
   for (const component of absolute.slice(current.length).split(path.sep)) {
@@ -44,7 +45,7 @@ function isWithin(root, target) {
   return relative !== ".." && !relative.startsWith(".." + path.sep) && !path.isAbsolute(relative);
 }
 function repositoryFile(root, file) {
-  if (!file || /[\\\x00-\x1f\x7f]/u.test(file)) throw new Error(`Invalid file path: ${file}`);
+  if (!file || /[\x00-\x1f\x7f]/u.test(file) || process.platform !== "win32" && file.includes("\\")) throw new Error(`Invalid file path: ${file}`);
   const canonicalRoot = physicalPath(root);
   const target = physicalPath(path.isAbsolute(file) ? file : canonicalRoot + path.sep + file);
   if (!isWithin(canonicalRoot, target) || target === canonicalRoot) {
@@ -140,7 +141,7 @@ function persist(root, coordDir, ledger) {
     fs2.closeSync(fd);
   }
   fs2.renameSync(temp, file);
-  for (const parent of [path2.dirname(file), coordDir]) {
+  for (const parent of process.platform === "win32" ? [] : [path2.dirname(file), coordDir]) {
     const dir = fs2.openSync(parent, "r");
     try {
       fs2.fsyncSync(dir);
@@ -174,7 +175,7 @@ function applySetupPlan(root, coordDir, plan, warnings) {
         before: previous ? previous.before : current,
         after: Buffer.from(planned.content).toString("base64"),
         beforeMode: previous ? previous.beforeMode : mode,
-        afterMode: mode ?? (planned.mode ?? 438) & ~process.umask()
+        afterMode: mode ?? (process.platform === "win32" ? 438 : (planned.mode ?? 438) & ~process.umask())
       };
     }
     persist(root, coordDir, ledger);
@@ -892,7 +893,7 @@ function doctorReport(directory = process.cwd()) {
   const check = (name, ok, detail) => checks.push({ name, ok, detail });
   const [major, minor] = process.versions.node.split(".").map(Number);
   check("node", major === 22 && minor >= 13 || major >= 24, process.version);
-  check("platform", process.platform === "darwin" || process.platform === "linux", process.platform === "win32" ? "Windows ownership and process-group supervision are not validated" : process.platform);
+  check("platform", process.platform === "darwin" || process.platform === "linux", process.platform === "win32" ? "Native Windows is limited to MCP coordination; supervised mutex commands and shell hooks require macOS/Linux or WSL" : process.platform);
   try {
     const version = execFileSync3("git", ["--version"], { encoding: "utf8", timeout: 2e3 }).trim();
     const parts = /\b(\d+)\.(\d+)/.exec(version);
@@ -960,6 +961,7 @@ function doctorReport(directory = process.cwd()) {
 import { execFileSync as execFileSync4 } from "child_process";
 import crypto2 from "crypto";
 import fs6 from "fs";
+import path6 from "path";
 var SessionOwnershipError = class extends Error {
   constructor(agentId) {
     super(`No valid active session capability for '${agentId}'. Start a session, or resume it with its session token.`);
@@ -985,6 +987,7 @@ var FencingAndAgentManager = class _FencingAndAgentManager {
   coordDb;
   static DEFAULT_LEASE_MS = 5 * 60 * 1e3;
   capabilities = /* @__PURE__ */ new Map();
+  static ownWindowsStart = null;
   static validateLease(duration) {
     if (!Number.isSafeInteger(duration) || duration < 100 || duration > 864e5) {
       throw new Error("Lease duration must be an integer between 100 and 86400000 milliseconds");
@@ -999,6 +1002,24 @@ var FencingAndAgentManager = class _FencingAndAgentManager {
         const stat = fs6.readFileSync(`/proc/${pid}/stat`, "utf8");
         return `linux:${stat.slice(stat.lastIndexOf(")") + 2).split(" ")[19]}`;
       }
+      if (process.platform === "win32") {
+        if (pid === process.pid && this.ownWindowsStart) return this.ownWindowsStart;
+        const powershell = path6.join(process.env.SystemRoot ?? "C:\\Windows", "System32", "WindowsPowerShell", "v1.0", "powershell.exe");
+        const ticks = execFileSync4(
+          powershell,
+          [
+            "-NoProfile",
+            "-NonInteractive",
+            "-Command",
+            `(Get-Process -Id ${pid} -ErrorAction Stop).StartTime.ToUniversalTime().Ticks.ToString([System.Globalization.CultureInfo]::InvariantCulture)`
+          ],
+          { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 5e3, windowsHide: true }
+        ).trim();
+        if (!/^\d+$/.test(ticks)) return null;
+        const identity = `windows:${ticks}`;
+        if (pid === process.pid) this.ownWindowsStart = identity;
+        return identity;
+      }
       const out = execFileSync4("ps", ["-o", "lstart=", "-p", String(pid)], {
         encoding: "utf8",
         stdio: ["ignore", "pipe", "ignore"],
@@ -1167,12 +1188,12 @@ var FencingAndAgentManager = class _FencingAndAgentManager {
 
 // src/core/engine.ts
 import fs15 from "fs";
-import path13 from "path";
+import path14 from "path";
 
 // src/core/ast-analyzer.ts
 import crypto3 from "crypto";
 import fs7 from "fs";
-import path6 from "path";
+import path7 from "path";
 var AstAnalyzer = class _AstAnalyzer {
   /**
    * Analyzes a source file's content to extract exported contracts (functions, types,
@@ -1180,7 +1201,7 @@ var AstAnalyzer = class _AstAnalyzer {
    */
   static analyzeSource(repoRoot, filePath, sourceContent) {
     const relPath = repositoryFile(repoRoot, filePath);
-    const absPath = path6.join(repoRoot, relPath);
+    const absPath = path7.join(repoRoot, relPath);
     const content = sourceContent ?? (fs7.existsSync(absPath) ? fs7.readFileSync(absPath, "utf8") : "");
     const fileHash = crypto3.createHash("sha256").update(content).digest("hex").slice(0, 16);
     const exports = _AstAnalyzer.extractExports(content);
@@ -1373,17 +1394,17 @@ var AstAnalyzer = class _AstAnalyzer {
     if (!specifier.startsWith(".")) {
       return null;
     }
-    const sourceDir = path6.dirname(path6.join(repoRoot, sourceRelPath));
-    const baseTarget = path6.resolve(sourceDir, specifier.replace(/\.(js|jsx|mjs|cjs)$/, ""));
+    const sourceDir = path7.dirname(path7.join(repoRoot, sourceRelPath));
+    const baseTarget = path7.resolve(sourceDir, specifier.replace(/\.(js|jsx|mjs|cjs)$/, ""));
     const candidates = [
-      path6.resolve(sourceDir, specifier),
+      path7.resolve(sourceDir, specifier),
       `${baseTarget}.ts`,
       `${baseTarget}.tsx`,
       `${baseTarget}.js`,
       `${baseTarget}.mjs`,
-      path6.join(baseTarget, "index.ts"),
-      path6.join(baseTarget, "index.tsx"),
-      path6.join(baseTarget, "index.js")
+      path7.join(baseTarget, "index.ts"),
+      path7.join(baseTarget, "index.tsx"),
+      path7.join(baseTarget, "index.js")
     ];
     for (const candidate of candidates) {
       if (fs7.existsSync(candidate) && fs7.statSync(candidate).isFile()) {
@@ -1448,12 +1469,12 @@ var AstAnalyzer = class _AstAnalyzer {
 // src/core/bash-guard.ts
 import crypto5 from "crypto";
 import fs9 from "fs";
-import path8 from "path";
+import path9 from "path";
 
 // src/core/locks.ts
 import crypto4 from "crypto";
 import fs8 from "fs";
-import path7 from "path";
+import path8 from "path";
 
 // src/core/glob.ts
 function scopeSegments(pattern, literal = false) {
@@ -1543,9 +1564,9 @@ var LockEngine = class _LockEngine {
     const parts = rawPattern.split("/");
     const magic = parts.findIndex((p) => /[?*]/u.test(p));
     const prefix = magic < 0 ? rawPattern : parts.slice(0, magic).join("/") || ".";
-    const absolute = physicalPath(path7.isAbsolute(prefix) ? prefix : root + "/" + prefix);
+    const absolute = physicalPath(path8.isAbsolute(prefix) ? prefix : root + "/" + prefix);
     if (!isWithin(root, absolute)) throw new Error(`Scope is outside repository: ${rawPattern}`);
-    const relative = path7.relative(root, absolute).split(path7.sep).join("/");
+    const relative = path8.relative(root, absolute).split(path8.sep).join("/");
     const suffix = magic < 0 ? "" : parts.slice(magic).join("/");
     const normalized = [relative, suffix].filter(Boolean).join("/");
     scopeSegments(normalized);
@@ -1580,7 +1601,7 @@ var LockEngine = class _LockEngine {
     let budget = 1e4;
     while (pending.length) {
       const { root, relative } = pending.pop();
-      const dir = path7.join(root, relative);
+      const dir = path8.join(root, relative);
       let entries;
       try {
         entries = fs8.readdirSync(dir, { withFileTypes: true });
@@ -1839,7 +1860,7 @@ var BashMerkleGuard = class {
   getSnapshotFilePath(agentId) {
     const epoch = this.fencing.assertSession(agentId);
     const safeId = crypto5.createHash("sha256").update(`${agentId}:${epoch}`).digest("hex");
-    return path8.join(this.coordDb.coordDir, "snapshots", `${safeId}.json`);
+    return path9.join(this.coordDb.coordDir, "snapshots", `${safeId}.json`);
   }
   /**
    * Captures a Merkle snapshot of workspace files before a Bash tool execution.
@@ -1851,7 +1872,7 @@ var BashMerkleGuard = class {
     const entries = {};
     const files = this.walkWorkspaceFiles(rootDir);
     for (const absPath of files) {
-      const relPath = path8.relative(rootDir, absPath).replace(/\\/g, "/");
+      const relPath = path9.relative(rootDir, absPath).replace(/\\/g, "/");
       const stat = fs9.statSync(absPath);
       if (stat.size > 5 * 1024 * 1024) continue;
       const buf = fs9.readFileSync(absPath);
@@ -1894,7 +1915,7 @@ var BashMerkleGuard = class {
     const authorizedModifiedFiles = [];
     const quarantinedViolations = [];
     for (const absPath of currentFiles) {
-      const relPath = path8.relative(rootDir, absPath).replace(/\\/g, "/");
+      const relPath = path9.relative(rootDir, absPath).replace(/\\/g, "/");
       seenCurrentRelPaths.add(relPath);
       const stat = fs9.statSync(absPath);
       if (stat.size > 5 * 1024 * 1024) continue;
@@ -1956,7 +1977,7 @@ var BashMerkleGuard = class {
     }
     if (authorizedModifiedFiles.length > 0) {
       for (const relFile of authorizedModifiedFiles) {
-        const absFile = path8.join(rootDir, relFile);
+        const absFile = path9.join(rootDir, relFile);
         if (fs9.existsSync(absFile) && /\.(ts|tsx|js|jsx|mjs|py)$/.test(relFile)) {
           this.depGraph.recordFileModification(params.agentId, relFile, fs9.readFileSync(absFile, "utf8"));
         }
@@ -1977,7 +1998,7 @@ var BashMerkleGuard = class {
     const id = `quar_${crypto5.randomBytes(6).toString("hex")}`;
     const now = Date.now();
     const safeName = params.relPath.replace(/[^a-zA-Z0-9._-]/g, "_");
-    const patchPath = path8.join(
+    const patchPath = path9.join(
       this.coordDb.coordDir,
       "quarantine",
       `${id}_${safeName}.quarantine`
@@ -1991,13 +2012,13 @@ var BashMerkleGuard = class {
     if (params.prevEntry?.backupContentBase64 !== void 0) {
       fs9.writeFileSync(patchPath + ".before", Buffer.from(params.prevEntry.backupContentBase64, "base64"), { mode: 384 });
     }
-    const absTarget = path8.join(params.rootDir, params.relPath);
+    const absTarget = path9.join(params.rootDir, params.relPath);
     if (params.restoreLockedFiles && params.prevEntry === null) {
       if (fs9.existsSync(absTarget)) {
         fs9.unlinkSync(absTarget);
       }
     } else if (params.restoreLockedFiles && params.prevEntry?.backupContentBase64 !== void 0) {
-      fs9.mkdirSync(path8.dirname(absTarget), { recursive: true });
+      fs9.mkdirSync(path9.dirname(absTarget), { recursive: true });
       fs9.writeFileSync(
         absTarget,
         Buffer.from(params.prevEntry.backupContentBase64, "base64")
@@ -2041,7 +2062,7 @@ var BashMerkleGuard = class {
       if (entry.name === ".git" || entry.name === ".coord" || entry.name === "node_modules" || entry.name === "dist" || entry.name === "coverage" || entry.name === ".next" || entry.name === "target") {
         continue;
       }
-      const fullPath = path8.join(dir, entry.name);
+      const fullPath = path9.join(dir, entry.name);
       if (entry.isDirectory()) {
         this.walkWorkspaceFiles(fullPath, acc);
       } else if (entry.isFile()) {
@@ -2478,7 +2499,7 @@ function delay(ms) {
 // src/core/dep-graph.ts
 import crypto7 from "crypto";
 import fs11 from "fs";
-import path9 from "path";
+import path10 from "path";
 var DependencyAndContractEngine = class {
   constructor(coordDb, lockEngine, fencing) {
     this.coordDb = coordDb;
@@ -2501,13 +2522,13 @@ var DependencyAndContractEngine = class {
     return indexedCount;
   }
   walkSourceFiles(dir, acc = []) {
-    if (!fs11.existsSync(dir) || dir !== this.coordDb.repoRoot && fs11.existsSync(path9.join(dir, ".git"))) return acc;
+    if (!fs11.existsSync(dir) || dir !== this.coordDb.repoRoot && fs11.existsSync(path10.join(dir, ".git"))) return acc;
     const entries = fs11.readdirSync(dir, { withFileTypes: true });
     for (const entry of entries) {
       if (entry.name.startsWith(".") || entry.name === "node_modules" || entry.name === "dist" || entry.name === "build" || entry.name === "target" || entry.name === "coverage") {
         continue;
       }
-      const fullPath = path9.join(dir, entry.name);
+      const fullPath = path10.join(dir, entry.name);
       if (entry.isDirectory()) {
         this.walkSourceFiles(fullPath, acc);
       } else if (entry.isFile() && /\.(ts|tsx|js|jsx|mjs|py)$/.test(entry.name) && !entry.name.endsWith(".d.ts")) {
@@ -2568,6 +2589,7 @@ var DependencyAndContractEngine = class {
       }
       for (const exp of analysis.exports) {
         const prev = existingBySymbol.get(exp.symbolName);
+        if (prev && prev.kind === exp.kind && prev.signature === exp.signature && prev.ast_hash === exp.astHash && prev.params_fingerprint === exp.paramsFingerprint && prev.doc_comment === exp.docComment) continue;
         const isBreaking = prev !== void 0 && prev.ast_hash !== exp.astHash;
         if (isBreaking && prev) {
           changedSymbols.push({
@@ -3039,7 +3061,7 @@ var IntentAndTaskEngine = class {
 import { execFileSync as execFileSync5, execSync } from "child_process";
 import crypto9 from "crypto";
 import fs12 from "fs";
-import path10 from "path";
+import path11 from "path";
 var SpeculativeMergeTrain = class {
   constructor(coordDb, fencing) {
     this.coordDb = coordDb;
@@ -3078,8 +3100,8 @@ var SpeculativeMergeTrain = class {
         now
       );
     });
-    const stageDir = path10.join(this.coordDb.coordDir, "worktrees", `_merge_train_${id}`);
-    const lockPath = path10.join(this.coordDb.coordDir, "merge-train.lock");
+    const stageDir = path11.join(this.coordDb.coordDir, "worktrees", `_merge_train_${id}`);
+    const lockPath = path11.join(this.coordDb.coordDir, "merge-train.lock");
     let lockFd;
     try {
       try {
@@ -3130,8 +3152,8 @@ var SpeculativeMergeTrain = class {
         cwd: this.coordDb.repoRoot,
         stdio: "ignore"
       });
-      const rootNodeModules = path10.join(this.coordDb.repoRoot, "node_modules");
-      const stageNodeModules = path10.join(stageDir, "node_modules");
+      const rootNodeModules = path11.join(this.coordDb.repoRoot, "node_modules");
+      const stageNodeModules = path11.join(stageDir, "node_modules");
       const hydratedNodeModules = fs12.existsSync(rootNodeModules) && !fs12.existsSync(stageNodeModules);
       if (hydratedNodeModules) {
         fs12.symlinkSync(rootNodeModules, stageNodeModules, "dir");
@@ -3296,7 +3318,7 @@ ${combined}`
 import { execFileSync as execFileSync6 } from "child_process";
 import crypto10 from "crypto";
 import fs13 from "fs";
-import path11 from "path";
+import path12 from "path";
 var ShadowGitEngine = class {
   constructor(coordDb, fencing) {
     this.coordDb = coordDb;
@@ -3329,7 +3351,7 @@ var ShadowGitEngine = class {
   getShadowIndexPath(agentId) {
     const safeId = agentId.replace(/[^a-zA-Z0-9_-]/g, "_");
     const epoch = this.fencing.assertSession(agentId);
-    return path11.join(this.coordDb.coordDir, "shadow-index", `${safeId}-${epoch}.index`);
+    return path12.join(this.coordDb.coordDir, "shadow-index", `${safeId}-${epoch}.index`);
   }
   /**
    * Updates an agent's ephemeral shadow Git index (`.coord/shadow-index/<agent-id>.index`)
@@ -3366,7 +3388,7 @@ var ShadowGitEngine = class {
     } else if (params.modifiedFiles && params.modifiedFiles.length > 0) {
       for (const mod of params.modifiedFiles) {
         const relPath = LockEngine.normalizeFile(targetDir, mod.filePath);
-        const absPath = path11.join(targetDir, relPath);
+        const absPath = path12.join(targetDir, relPath);
         const content = mod.content ?? (fs13.existsSync(absPath) ? fs13.readFileSync(absPath, "utf8") : null);
         if (content === null) {
           {
@@ -3567,7 +3589,7 @@ var ShadowGitEngine = class {
 // src/core/worktree-cow.ts
 import { execFileSync as execFileSync7 } from "child_process";
 import fs14 from "fs";
-import path12 from "path";
+import path13 from "path";
 var CoWWorktreeManager = class _CoWWorktreeManager {
   constructor(coordDb, fencing) {
     this.coordDb = coordDb;
@@ -3587,13 +3609,13 @@ var CoWWorktreeManager = class _CoWWorktreeManager {
     const safeId = params.agentId.replace(/[^a-zA-Z0-9_-]/g, "-");
     const branch = params.branch ?? `kith/${safeId}`;
     const baseRef = params.baseRef ?? "HEAD";
-    const worktreePath = path12.join(this.coordDb.coordDir, "worktrees", safeId);
+    const worktreePath = path13.join(this.coordDb.coordDir, "worktrees", safeId);
     if (!this.fencing.getAgent(params.agentId)) throw new Error(`Unknown agent: ${params.agentId}`);
     if (!safeId || safeId === "." || safeId === "..") throw new Error("Invalid agent ID");
     if (fs14.existsSync(worktreePath)) {
       throw new Error(`Worktree already exists: ${worktreePath}. Commit or preserve its work before removing it.`);
     }
-    fs14.mkdirSync(path12.dirname(worktreePath), { recursive: true });
+    fs14.mkdirSync(path13.dirname(worktreePath), { recursive: true });
     execFileSync7("git", ["worktree", "add", "-b", branch, worktreePath, baseRef], {
       cwd: this.coordDb.repoRoot,
       stdio: "ignore"
@@ -3601,16 +3623,16 @@ var CoWWorktreeManager = class _CoWWorktreeManager {
     const hydratedDirs = [];
     let hydrationMethod = "none";
     for (const dirName of _CoWWorktreeManager.HYDRATABLE_DIRS) {
-      const srcDir = path12.join(this.coordDb.repoRoot, dirName);
-      const destDir = path12.join(worktreePath, dirName);
+      const srcDir = path13.join(this.coordDb.repoRoot, dirName);
+      const destDir = path13.join(worktreePath, dirName);
       if (!fs14.existsSync(srcDir) || fs14.existsSync(destDir)) continue;
       const method = this.cloneDirectoryCoW(srcDir, destDir);
       hydrationMethod = method;
       hydratedDirs.push(dirName);
     }
     for (const envName of _CoWWorktreeManager.ENV_FILES) {
-      const srcEnv = path12.join(this.coordDb.repoRoot, envName);
-      const destEnv = path12.join(worktreePath, envName);
+      const srcEnv = path13.join(this.coordDb.repoRoot, envName);
+      const destEnv = path13.join(worktreePath, envName);
       if (fs14.existsSync(srcEnv) && !fs14.existsSync(destEnv)) {
         fs14.copyFileSync(srcEnv, destEnv);
       }
@@ -3661,7 +3683,7 @@ var CoWWorktreeManager = class _CoWWorktreeManager {
   removeWorktree(agentId) {
     this.fencing.assertSession(agentId);
     const safeId = agentId.replace(/[^a-zA-Z0-9_-]/g, "-");
-    const worktreePath = path12.join(this.coordDb.coordDir, "worktrees", safeId);
+    const worktreePath = path13.join(this.coordDb.coordDir, "worktrees", safeId);
     if (!fs14.existsSync(worktreePath)) return false;
     const registered = this.fencing.getAgent(agentId)?.worktree_path;
     if (!registered || physicalPath(registered) !== physicalPath(worktreePath) || this.fencing.listAgents(true).some((agent) => agent.id !== agentId && agent.worktree_path && physicalPath(agent.worktree_path) === physicalPath(worktreePath))) {
@@ -3752,7 +3774,7 @@ var KithEngine = class {
     const file = LockEngine.normalizeFile(targetRoot, params.filePath);
     const access = this.locks.checkFileWriteAccess({ agentId: params.agentId, filePath: file });
     if (!access.allowed) throw new Error(access.reason);
-    const content = params.content ?? (fs15.existsSync(path13.join(targetRoot, file)) ? fs15.readFileSync(path13.join(targetRoot, file), "utf8") : "");
+    const content = params.content ?? (fs15.existsSync(path14.join(targetRoot, file)) ? fs15.readFileSync(path14.join(targetRoot, file), "utf8") : "");
     const contractReport = this.depGraph.recordFileModification(
       params.agentId,
       file,
@@ -3894,13 +3916,13 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z } from "zod";
 import fs16 from "fs";
-import path14 from "path";
+import path15 from "path";
 function createKithMcpServer(repoRoot = process.cwd()) {
   const engine = new KithEngine(repoRoot);
   const server = new McpServer({
     name: "kith-coordinator",
     version: KITH_VERSION
-  }, { instructions: "Kith coordinates work claims, isolated worktrees, local resources and verified integration for cooperating coding agents. State stays local; no hosted service or model API key is required. Recommended workflow: one isolated worktree per parallel agent. Call kith_begin_work with isolateWorktree:true and explicit scopeGlobs; edit only the returned worktreePath, call kith_record_file_edit, run literal argv with kith_run_with_mutex, and finish with kith_complete_work plus a project verificationCmd. Heartbeat before the session expires. " + (process.env.KITH_AGENT_ID ? `This server shares a session with CLI/hooks. Use agentId '${process.env.KITH_AGENT_ID}'. Its inherited capability is handled internally; do not request or log it.` : "Start with kith_begin_work or kith_start_session and a unique agentId. This connection retains its granted capability. Another connection needs the session token to resume that ID. Keep tokens private.") });
+  }, { instructions: "Kith coordinates work claims, isolated worktrees, local resources and verified integration for cooperating coding agents. State stays local; no hosted service or model API key is required. Recommended workflow: one isolated worktree per parallel agent. Call kith_begin_work with isolateWorktree:true and explicit scopeGlobs; edit only the returned worktreePath, call kith_record_file_edit, run literal argv with kith_run_with_mutex, and finish with kith_complete_work plus a project verificationCmd. Heartbeat before the session expires. " + (process.env.KITH_AGENT_ID ? `This server shares a session with CLI/hooks. Use agentId '${process.env.KITH_AGENT_ID}'. Its inherited capability is handled internally; do not request or log it.` : "Start with kith_begin_work or kith_start_session and a unique agentId. This connection retains its granted capability. Omit sessionToken on subsequent calls on this connection; only another connection needs it to resume that ID. Initial grant/resume replies contain the token and client transcripts may record it. Keep transcripts private.") });
   const tokenFor = (args) => args.sessionToken ?? (process.env.KITH_AGENT_ID === args.agentId ? process.env.KITH_SESSION_TOKEN : void 0);
   const owned = /* @__PURE__ */ new Set();
   const register = (args) => {
@@ -3985,7 +4007,7 @@ function createKithMcpServer(repoRoot = process.cwd()) {
       const contracts = engine.depGraph.listContracts().slice(0, 30);
       return formatReply(args.agentId, {
         ok: intentRes.ok,
-        agent: reg.agent,
+        agent: engine.fencing.getAgent(args.agentId),
         sessionToken: reg.sessionToken,
         fencingToken: intentRes.fencingToken,
         task: intentRes.task,
@@ -4112,9 +4134,9 @@ function createKithMcpServer(repoRoot = process.cwd()) {
     async (args, extra) => {
       authorize(args);
       const root = fs16.realpathSync(engine.fencing.getAgent(args.agentId)?.worktree_path ?? engine.coordDb.repoRoot);
-      const cwd = fs16.realpathSync(path14.resolve(root, args.cwd ?? "."));
-      const relative = path14.relative(root, cwd);
-      if (relative === ".." || relative.startsWith(".." + path14.sep) || path14.isAbsolute(relative)) {
+      const cwd = fs16.realpathSync(path15.resolve(root, args.cwd ?? "."));
+      const relative = path15.relative(root, cwd);
+      if (relative === ".." || relative.startsWith(".." + path15.sep) || path15.isAbsolute(relative)) {
         throw new Error("Command cwd must be inside the registered worktree or repository");
       }
       const execution = engine.broker.executeWithMutex({
@@ -4142,12 +4164,18 @@ function createKithMcpServer(repoRoot = process.cwd()) {
     "Retrieve coordination state, FIFO waiters and guarded commands, plus worktree paths, actual branches, dirty-file overlaps, commit age and ahead/behind against the current integration target HEAD. Normal engine startup may reap expired ownership.",
     {
       agentId: z.string().optional(),
-      sessionToken: z.string().optional()
+      sessionToken: z.string().optional(),
+      includeContracts: z.boolean().optional().describe("Include the full contract registry. Default false keeps frequent status polls compact; contractCount always reports its size.")
     },
     async (args) => {
       if (args.agentId) authorize({ ...args, agentId: args.agentId });
       const state = engine.getStatus();
-      return formatReply(args.agentId, state);
+      return formatReply(args.agentId, {
+        ...state,
+        contracts: args.includeContracts ? state.contracts : [],
+        contractCount: state.contracts.length,
+        contractsIncluded: args.includeContracts ?? false
+      });
     }
   );
   server.tool(
@@ -4167,7 +4195,7 @@ function createKithMcpServer(repoRoot = process.cwd()) {
       sessionToken: z.string().optional(),
       taskId: z.string().optional(),
       fencingToken: z.number().optional(),
-      mergeBranch: z.string().optional().describe("If work was done on a worktree/branch, run Speculative Merge Train to integrate it"),
+      mergeBranch: z.string().optional().describe("Source branch to integrate, not the destination. Defaults to the registered agent branch; destination is the selected repository checkout current branch. Omit for claims-only work without a registered branch."),
       verificationCmd: z.string().optional().describe('Command to run in speculative merge tree (e.g. "npm run typecheck")')
     },
     async (args) => {
@@ -4384,7 +4412,8 @@ var HookHandler = class {
 // src/cli/init.ts
 import { execFileSync as execFileSync9 } from "child_process";
 import fs18 from "fs";
-import path15 from "path";
+import path16 from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
 import { parse as parseToml2, stringify as stringifyToml } from "smol-toml";
 var INTEGRATIONS = ["claude", "codex", "cursor", "agents", "git", "shims"];
 function object(value, label) {
@@ -4416,11 +4445,14 @@ function initializeKithRepository(repoRoot = process.cwd(), cliBinaryCommand = "
   for (const integration of selected) {
     if (!INTEGRATIONS.includes(integration)) throw new Error(`Unknown integration: ${integration}`);
   }
+  if (process.platform === "win32" && !mcpOnly && ["claude", "cursor", "git", "shims"].some((name) => selected.has(name))) {
+    throw new Error("Native Windows setup supports MCP-only configuration; use --mcp-only or WSL for shell hooks and shims.");
+  }
   if (!fs18.statSync(absRoot).isDirectory()) throw new Error(`Not a directory: ${absRoot}`);
   const plan = /* @__PURE__ */ new Map();
   const warnings = [];
   const add = (name, content, mode2) => {
-    const target = path15.isAbsolute(name) ? name : path15.join(absRoot, name);
+    const target = path16.isAbsolute(name) ? name : path16.join(absRoot, name);
     if (!isWithin(absRoot, physicalPath(target))) throw new Error(`Configuration path leaves repository: ${name}`);
     if (!fs18.existsSync(target) || fs18.readFileSync(target, "utf8") !== content) {
       plan.set(name, { content, mode: mode2 });
@@ -4428,14 +4460,16 @@ function initializeKithRepository(repoRoot = process.cwd(), cliBinaryCommand = "
   };
   const json = (name, value) => add(name, JSON.stringify(value, null, 2) + "\n");
   const hookCommand = `${cliBinaryCommand} --repo ${shellQuote(absRoot)} hook`;
-  const server = { command: "kith", args: ["mcp", "--repo", absRoot] };
-  const ignorePath = path15.join(absRoot, ".gitignore");
+  const windowsCli = process.platform === "win32" ? ["./cli/index.js", "./index.js", "../../dist/cli/index.js"].map((relative) => fileURLToPath2(new URL(relative, import.meta.url))).find((file) => fs18.existsSync(file)) : void 0;
+  if (process.platform === "win32" && !windowsCli) throw new Error("Build Kith before generating native Windows MCP configuration");
+  const server = windowsCli ? { command: process.execPath, args: [windowsCli, "mcp", "--repo", absRoot] } : { command: "kith", args: ["mcp", "--repo", absRoot] };
+  const ignorePath = path16.join(absRoot, ".gitignore");
   const ignore = fs18.existsSync(ignorePath) ? fs18.readFileSync(ignorePath, "utf8") : "";
   if (!ignore.split(/\r?\n/).some((line) => [".coord/", "/.coord/"].includes(line.trim()))) {
     add(".gitignore", ignore + (ignore && !ignore.endsWith("\n") ? "\n" : "") + "\n# Kith local state and worktrees\n.coord/\n");
   }
   if (selected.has("claude")) {
-    const settings = readConfig(path15.join(absRoot, ".claude/settings.json"));
+    const settings = readConfig(path16.join(absRoot, ".claude/settings.json"));
     const hooks = object(settings.hooks ?? {}, "Claude hooks");
     if (mcpOnly && ["PreToolUse", "PostToolUse"].some((event) => Array.isArray(hooks[event]) && hooks[event].length)) {
       warnings.push("Existing Claude tool hooks preserved. Review whether they require inherited KITH credentials; --mcp-only does not disable guards.");
@@ -4462,12 +4496,12 @@ function initializeKithRepository(repoRoot = process.cwd(), cliBinaryCommand = "
       settings.hooks = hooks;
       json(".claude/settings.json", settings);
     }
-    const mcp = readConfig(path15.join(absRoot, ".mcp.json"));
+    const mcp = readConfig(path16.join(absRoot, ".mcp.json"));
     mcp.mcpServers = { ...object(mcp.mcpServers ?? {}, "Claude MCP servers"), kith: server };
     json(".mcp.json", mcp);
   }
   if (selected.has("codex")) {
-    const file = path15.join(absRoot, ".codex/config.toml");
+    const file = path16.join(absRoot, ".codex/config.toml");
     const original = fs18.existsSync(file) ? fs18.readFileSync(file, "utf8") : "";
     let config;
     try {
@@ -4492,10 +4526,10 @@ function initializeKithRepository(repoRoot = process.cwd(), cliBinaryCommand = "
     }
   }
   if (selected.has("cursor")) {
-    const mcp = readConfig(path15.join(absRoot, ".cursor/mcp.json"));
+    const mcp = readConfig(path16.join(absRoot, ".cursor/mcp.json"));
     mcp.mcpServers = { ...object(mcp.mcpServers ?? {}, "Cursor MCP servers"), kith: server };
     json(".cursor/mcp.json", mcp);
-    const existingCursorHooks = readConfig(path15.join(absRoot, ".cursor/hooks.json"));
+    const existingCursorHooks = readConfig(path16.join(absRoot, ".cursor/hooks.json"));
     if (mcpOnly && ["preToolUse", "postToolUse"].some((event) => Array.isArray(existingCursorHooks.hooks?.[event]) && existingCursorHooks.hooks[event].length)) warnings.push("Existing Cursor hooks preserved; review their inherited session requirements.");
     if (!mcpOnly) {
       const config = existingCursorHooks;
@@ -4514,7 +4548,7 @@ function initializeKithRepository(repoRoot = process.cwd(), cliBinaryCommand = "
     }
   }
   if (selected.has("agents")) {
-    const file = path15.join(absRoot, "AGENTS.md");
+    const file = path16.join(absRoot, "AGENTS.md");
     let content = fs18.existsSync(file) ? fs18.readFileSync(file, "utf8") : "# Repository Agent Instructions\n";
     const block = `<!-- KITH:START -->
 ## Parallel Agent Coordination (kith)
@@ -4529,7 +4563,7 @@ Use Kith MCP to claim work, isolate changes in worktrees, share local resources
 4. Renew idle sessions with \`kith_heartbeat\` before their lease expires (every two minutes for the default five-minute lease; sooner for a shorter lease). Inspect \`kith_get_status\`.
 5. Complete with \`kith_complete_work\` and a project-specific \`verificationCmd\`. Failed verification keeps the integration target unchanged. Successful worktrees are retained for inspection.
 
-The MCP connection retains its capability; do not copy or log session tokens. A new connection needs a valid capability to resume an existing ID. Locks coordinate cooperating writers; hooks are not an OS security sandbox.
+The MCP connection retains its capability; omit \`sessionToken\` on subsequent calls on that connection. Initial grant/resume replies contain the token, so keep client transcripts private. Do not copy tokens into shell commands or public reports. A new connection needs a valid capability to resume an existing ID. Locks coordinate cooperating writers; hooks are not an OS security sandbox.
 
 If Claude/Cursor edit hooks or CLI commands are also enabled, launch the client from a persistent shell after \`eval "$(kith session start --agent <id> --owner-pid "$$" --shell)"\`. CLI, hooks and MCP must inherit the same KITH_AGENT_ID/KITH_SESSION_TOKEN and use the same agent ID. Separate stateless shell calls do not preserve these exports or the owning shell. MCP-only setup skips new native edit hooks and preserves existing ones.
 <!-- KITH:END -->`;
@@ -4547,10 +4581,10 @@ If Claude/Cursor edit hooks or CLI commands are also enabled, launch the client
         encoding: "utf8",
         stdio: ["ignore", "pipe", "ignore"]
       }).trim();
-      const hook = path15.join(hooksDir, "pre-commit");
+      const hook = path16.join(hooksDir, "pre-commit");
       const physicalHooks = fs18.existsSync(hooksDir) ? fs18.realpathSync(hooksDir) : hooksDir;
-      const relativeHooks = path15.relative(fs18.realpathSync(absRoot), physicalHooks);
-      if (relativeHooks === ".." || relativeHooks.startsWith(".." + path15.sep) || path15.isAbsolute(relativeHooks)) {
+      const relativeHooks = path16.relative(fs18.realpathSync(absRoot), physicalHooks);
+      if (relativeHooks === ".." || relativeHooks.startsWith(".." + path16.sep) || path16.isAbsolute(relativeHooks)) {
         warnings.push("Git hook skipped: hooks directory is outside this repository. Integrate the guard manually.");
       } else {
         const script = (arg) => `#!/usr/bin/env sh