@kitman-sh/cli 0.10.68 → 0.10.69

package/dist/{chunk-fdy3jce3.js → chunk-jjeawksh.js}

@@ -6,7 +6,7 @@ import {
   getOrUndefined,
   Reference,
   TaggedError,
-  make16,
+  make15,
   _await,
   fail5,
   succeed5,
@@ -85,7 +85,7 @@ import {
   decodeJsonString,
   encodeJsonStringSync,
   encodePrettyJsonString
-} from "./chunk-d3ksv8y1.js";
+} from "./chunk-677etczq.js";
 import {
   tap,
   mapError,
@@ -97,7 +97,7 @@ import {
   withDefault,
   option,
   String2
-} from "./chunk-dk0ftqwg.js";
+} from "./chunk-qdyqc4nz.js";
 import {
   currentTimeMillis,
   SecureRandom,
@@ -135,7 +135,7 @@ import {
   digestSha256,
   sha256Hasher,
   raw,
-  make5,
+  make4,
   get,
   put,
   HttpClient,
@@ -197,10 +197,10 @@ import {
   harnessNames,
   herdrRunnerCapabilities2,
   declaredChecks
-} from "./chunk-fc0y8kn7.js";
+} from "./chunk-n0pm4rtm.js";
 import {
   Id
-} from "./chunk-rrnee9mk.js";
+} from "./chunk-wnwyp9qn.js";
 import {
   toJsonValue,
   isOneOf,
@@ -210,11 +210,11 @@ import {
   isObject,
   isJsonObject,
   isString
-} from "./chunk-v01c0k6j.js";
+} from "./chunk-h6360r1c.js";
 import {
   ChildProcessSpawner,
-  make3
-} from "./chunk-1rry0tsn.js";
+  make2
+} from "./chunk-tf5yxkpy.js";
 
 // apps/cli/src/cli-error.ts
 function cliErrorCode(error, status) {
@@ -504,10 +504,10 @@ var checkDockerImageSetting = pinnedImage;
 var checkRegistryImageSetting = pinnedImage;
 var herdrCoreSession = (runnerId, personal) => personal ? undefined : `kitman-${sha2562(runnerId).slice(0, 16)}`;
 var OpenHerdrCore = Reference("kitman/cli/OpenHerdrCore", {
-  defaultValue: () => (options) => flatMap3(promise(() => import("./chunk-9pp1w29g.js")), ({ HerdrCore, herdrCoreLayer }) => provide3(service(HerdrCore), herdrCoreLayer(options)))
+  defaultValue: () => (options) => flatMap3(promise(() => import("./chunk-t0rnf6ch.js")), ({ HerdrCore, herdrCoreLayer }) => provide3(service(HerdrCore), herdrCoreLayer(options)))
 });
 var UpdateHerdrCore = Reference("kitman/cli/UpdateHerdrCore", {
-  defaultValue: () => (options) => flatMap3(promise(() => import("./chunk-9pp1w29g.js")), (module) => module.updateHerdrCore(options))
+  defaultValue: () => (options) => flatMap3(promise(() => import("./chunk-t0rnf6ch.js")), (module) => module.updateHerdrCore(options))
 });
 var herdrCoreMissing = (error) => {
   if (isTagged(error, "HerdrCoreMissing"))
@@ -733,7 +733,7 @@ var syncTargets = (harness) => gen(function* () {
 });
 var syncKits = (input) => gen(function* () {
   const fs = yield* FileSystem;
-  const { syncKitSetup } = yield* promise(() => import("./chunk-n0h0z7yh.js"));
+  const { syncKitSetup } = yield* promise(() => import("./chunk-drsawp1s.js"));
   const harnesses = yield* syncTargets(input.harness);
   const chain = yield* input.client.getKitChain(input.workspaceId);
   for (const { name, problem } of chain.skipped)
@@ -1249,7 +1249,7 @@ var ServiceManager = Reference("kitman/cli/ServiceManager", {
     run: (command, args) => runCommand2(command, args),
     attach: (command, args) => gen(function* () {
       const spawner = yield* ChildProcessSpawner;
-      const handle = yield* spawner.spawn(make3(command, args, { stdin: "inherit", stdout: "inherit", stderr: "inherit" }));
+      const handle = yield* spawner.spawn(make2(command, args, { stdin: "inherit", stdout: "inherit", stderr: "inherit" }));
       const exitCode = yield* handle.exitCode;
       if (exitCode !== 0)
         return yield* new CommandFailed2({ command, reason: `exit code ${exitCode}` });
@@ -1651,7 +1651,7 @@ var package_default = {
 };
 
 // apps/cli/src/scaffold.ts
-var cliVersion = "0.10.68";
+var cliVersion = "0.10.69";
 var packageJson = (name, scaffold) => `${JSON.stringify({
   name,
   private: true,
@@ -1901,7 +1901,7 @@ var Usage = [
   "Every run, loop, agent, verify, constraint, secret, claim, deploy, dev and kit command takes --json."
 ].join(`
 `);
-var agentRuntime = promise(() => import("./chunk-b90vtscf.js"));
+var agentRuntime = promise(() => import("./chunk-kqcrxea1.js"));
 var TuiLauncher = Reference("kitman/cli/TuiLauncher", {
   defaultValue: () => gen(function* () {
     const tui = yield* tryPromise({
@@ -2756,7 +2756,7 @@ var SandboxHostProbe = Reference("kitman/cli/SandboxHostProbe", {
 });
 var OpenRunnerRpc = Reference("kitman/cli/OpenRunnerRpc", {
   defaultValue: () => (options) => gen(function* () {
-    const { makeRunnerRpcClient, runnerRpcUrl, runnerWebSocketProtocol } = yield* promise(() => import("./chunk-t6w469gd.js"));
+    const { makeRunnerRpcClient, runnerRpcUrl, runnerWebSocketProtocol } = yield* promise(() => import("./chunk-9m14d9d8.js"));
     return yield* makeRunnerRpcClient({
       runnerId: options.runnerId,
       bearer: options.bearer,
@@ -2951,7 +2951,7 @@ function startCanonicalHerdrRunnerCommand(input) {
         });
         const checkouts = runCheckouts(path.join(runnerRootDir, ".kitman"), rpc.gitCredential);
         const platform = yield* context();
-        const updated = yield* make16();
+        const updated = yield* make15();
         const scope = yield* scope2;
         yield* listenForSignals({
           rpc,
@@ -3140,7 +3140,7 @@ function mcpCommand(args) {
     if (command.action === "run") {
       if (command.args.length > 0)
         return yield* new CliError({ message: `Unknown command: ${args.join(" ")}` });
-      const { runMcpServerCommand } = yield* promise(() => import("./chunk-8mj0z3hb.js"));
+      const { runMcpServerCommand } = yield* promise(() => import("./chunk-20qadzgw.js"));
       return yield* runMcpServerCommand({ flags: command.flags });
     }
     if (command.action !== "setup")
@@ -4342,9 +4342,9 @@ function claimCommand(args) {
     }
   });
 }
-var KitWriter = map8(promise(() => import("./chunk-qp5cdtsr.js")), (build) => build.writeKit);
+var KitWriter = map8(promise(() => import("./chunk-j4pmjnyd.js")), (build) => build.writeKit);
 var KitBuilder = Reference("kitman/cli/KitBuilder", {
-  defaultValue: () => (directory) => flatMap3(promise(() => import("./chunk-qp5cdtsr.js")), (build) => build.buildKit(directory))
+  defaultValue: () => (directory) => flatMap3(promise(() => import("./chunk-j4pmjnyd.js")), (build) => build.buildKit(directory))
 });
 var uploadKit = (client, workspaceId, built) => gen(function* () {
   yield* client.uploadKitBundle(workspaceId, built.digest, { bundle: encode2(built.bundle) });
@@ -5102,7 +5102,7 @@ function downloadPresignedAsset(download, outputPath) {
   return gen(function* () {
     const fs = yield* FileSystem;
     const failed = (cause) => new CliError({ message: `Asset download failed: ${String(cause)}` });
-    const response = yield* send(make5(download.method)(download.url), failed);
+    const response = yield* send(make4(download.method)(download.url), failed);
     if (response.status < 200 || response.status >= 300)
       return yield* new CliError({ message: `Asset download failed with ${response.status}` });
     const body = yield* response.arrayBuffer.pipe(mapError2((error) => failed(error.message)));

package/dist/{chunk-cctfnp4r.js → chunk-k7mn104k.js}

@@ -24,11 +24,11 @@ import {
   Record,
   Int,
   fromJsonString
-} from "./chunk-d3ksv8y1.js";
+} from "./chunk-677etczq.js";
 import {
   withDefault,
   String2
-} from "./chunk-dk0ftqwg.js";
+} from "./chunk-qdyqc4nz.js";
 import {
   digestSha256,
   digestSha512,
@@ -38,7 +38,7 @@ import {
   get2,
   layer4,
   KitDigest
-} from "./chunk-fc0y8kn7.js";
+} from "./chunk-n0pm4rtm.js";
 
 // packages/core/src/npm-registry.ts
 var KitManifest = Struct({

package/dist/{chunk-b90vtscf.js → chunk-kqcrxea1.js}

@@ -5,7 +5,7 @@ import {
   isObject,
   isJsonObject,
   isString
-} from "./chunk-v01c0k6j.js";
+} from "./chunk-h6360r1c.js";
 import {
   pipeArguments,
   dual,
@@ -42,7 +42,7 @@ import {
   isFailure2,
   hasInterrupts,
   makeUnsafe5,
-  make16,
+  make15,
   _await,
   fail5,
   isDoneUnsafe,
@@ -156,11 +156,11 @@ import {
   encodePrettyJsonString,
   decodeJsonStringSync,
   encodeUnknownJsonStringSync
-} from "./chunk-d3ksv8y1.js";
+} from "./chunk-677etczq.js";
 import {
   Id,
   secretReference
-} from "./chunk-rrnee9mk.js";
+} from "./chunk-wnwyp9qn.js";
 import {
   currentTimeMillis,
   SecureRandom,
@@ -225,7 +225,7 @@ import {
   installCommand,
   checkServicesFile,
   checkServices
-} from "./chunk-fc0y8kn7.js";
+} from "./chunk-n0pm4rtm.js";
 import {
   join,
   interrupt,
@@ -234,7 +234,7 @@ import {
   unbounded2,
   offer,
   makeUnsafe3,
-  make11,
+  make10,
   fromQueue,
   fromPubSub,
   map2,
@@ -265,7 +265,7 @@ import {
   writeSrtSettings2,
   srtStepArgv2,
   srtArgv2
-} from "./chunk-dk0ftqwg.js";
+} from "./chunk-qdyqc4nz.js";
 import {
   writeAgentEnvironmentConfigFile2,
   readManifestSkillPaths2,
@@ -281,8 +281,8 @@ import {
   applyAgentEnvironmentMaterialization2,
   isPathWithin2,
   skillIdentity2
-} from "./chunk-fsbpm71s.js";
-import"./chunk-cctfnp4r.js";
+} from "./chunk-gswz7ngm.js";
+import"./chunk-k7mn104k.js";
 import {
   sliceBytes2,
   maxLineBytes2,
@@ -290,28 +290,28 @@ import {
   decodedOption2,
   decoded2,
   readOpencode2
-} from "./chunk-csbf77zs.js";
+} from "./chunk-zdctyf0w.js";
 import {
   writeSecretRegistry,
   secretRefusalLog,
   parseSecretRefusals
-} from "./chunk-1w81w56v.js";
+} from "./chunk-rzr11xyn.js";
 import {
   uploadRunFile,
   programLease,
   rpcRunFiles,
   programHostsEnv,
   undeclaredHostsEnv
-} from "./chunk-gfr11y10.js";
-import"./chunk-p8akhcme.js";
+} from "./chunk-q9n4jkcp.js";
+import"./chunk-qpg9t7he.js";
 import {
   nextInt
-} from "./chunk-q3c7vmby.js";
+} from "./chunk-p23kedha.js";
 import {
   ChildProcessSpawner,
-  make3
-} from "./chunk-1rry0tsn.js";
-import"./chunk-2z450w92.js";
+  make2
+} from "./chunk-tf5yxkpy.js";
+import"./chunk-q26gt71y.js";
 
 // packages/core/src/sync-kit.ts
 import { createHash } from "crypto";
@@ -5836,7 +5836,7 @@ var codexAppServer = (binary = "codex") => (env) => gen(function* () {
   const input = yield* unbounded2();
   const pending = new Map;
   let lastId = 0;
-  const handle = yield* spawner.spawn(make3(binary, ["app-server"], {
+  const handle = yield* spawner.spawn(make2(binary, ["app-server"], {
     cwd: env.home,
     extendEnv: true,
     env: { HOME: env.home, CODEX_HOME: env.codexHome },
@@ -5859,7 +5859,7 @@ var codexAppServer = (binary = "codex") => (env) => gen(function* () {
   return {
     request: (method, params) => gen(function* () {
       const id = ++lastId;
-      const deferred = yield* make16();
+      const deferred = yield* make15();
       pending.set(id, deferred);
       yield* send({ id, method, params });
       return yield* _await(deferred).pipe(mapError2((error) => new CodexAppServerFailed({ reason: `${method}: ${error.message}` })));
@@ -5999,10 +5999,10 @@ var handshake = [
 `).join("");
 var kitmanMcpPreflight = (mcp) => gen(function* () {
   const spawner = yield* ChildProcessSpawner;
-  const server = yield* spawner.spawn(make3(mcp.command, [...mcp.args], {
+  const server = yield* spawner.spawn(make2(mcp.command, [...mcp.args], {
     extendEnv: true,
     env: mcp.env,
-    stdin: { stream: make11(new TextEncoder().encode(handshake)), endOnDone: false },
+    stdin: { stream: make10(new TextEncoder().encode(handshake)), endOnDone: false },
     stderr: "ignore"
   }));
   const reply = yield* server.stdout.pipe(decodeText, splitLines, map2((line) => getOrUndefined(decodeJsonStringOption(line))), filter((message) => isJsonObject(message) && message.id === 2), runHead);
@@ -6075,8 +6075,8 @@ var programProcessExecutor = (input) => (work) => gen(function* () {
   };
   const exitCode = sandbox === undefined ? yield* gen(function* () {
     const spawner = yield* ChildProcessSpawner;
-    const handle = yield* spawner.spawn(make3(input.bun ?? process.execPath, [file], {
-      stdin: make11(new TextEncoder().encode(stdin)),
+    const handle = yield* spawner.spawn(make2(input.bun ?? process.execPath, [file], {
+      stdin: make10(new TextEncoder().encode(stdin)),
       stdout: "inherit",
       stderr: "inherit",
       extendEnv: false,
@@ -6443,15 +6443,115 @@ class InstallFailed extends TaggedError("InstallFailed") {
     return `\`${this.command}\` failed, so nothing could run in the checkout: ${this.output}`;
   }
 }
+var closing = /(?:\s|\/\/[^\n]*|\/\*[\s\S]*?\*\/)*[}\]]/y;
+var closesNext = (text, at) => {
+  closing.lastIndex = at;
+  return closing.test(text);
+};
+var jsonFromJsonc = (text) => {
+  let json = "";
+  for (let at = 0;at < text.length; at++) {
+    const char = text[at];
+    if (char === '"') {
+      const from = at;
+      for (at++;at < text.length && text[at] !== '"'; at++)
+        if (text[at] === "\\")
+          at++;
+      json += text.slice(from, at + 1);
+    } else if (char === "/" && text[at + 1] === "/") {
+      while (at < text.length && text[at] !== `
+`)
+        at++;
+    } else if (char === "/" && text[at + 1] === "*") {
+      at = text.indexOf("*/", at + 2);
+      if (at === -1)
+        return json;
+      at++;
+    } else if (char !== "," || !closesNext(text, at + 1))
+      json += char;
+  }
+  return json;
+};
+var declaredNames = (manifest, fields) => {
+  if (!isJsonObject(manifest))
+    return [];
+  const optional = isJsonObject(manifest.optionalDependencies) ? Object.keys(manifest.optionalDependencies) : [];
+  return fields.flatMap((field) => {
+    const declared = manifest[field];
+    return isJsonObject(declared) ? Object.keys(declared).filter((name) => !optional.includes(name)) : [];
+  });
+};
+var unresolvedDependencies = (worktree) => gen(function* () {
+  const fs = yield* FileSystem;
+  const path = yield* Path;
+  const lockfile = path.join(worktree, "bun.lock");
+  if (!(yield* fs.exists(lockfile)))
+    return [];
+  const parsed = getOrUndefined(decodeJsonStringOption(jsonFromJsonc(yield* fs.readFileString(lockfile))));
+  if (!isJsonObject(parsed))
+    return yield* new InstallFailed({ command: "reading bun.lock", output: "bun.lock is not valid JSONC" });
+  const workspaces = isJsonObject(parsed.workspaces) ? parsed.workspaces : {};
+  const store = path.join(worktree, "node_modules", ".bun");
+  const within = (root, dir) => !path.relative(root, dir).startsWith("..");
+  const linkedWithin = (dir) => within(store, dir) ? path.join(store, path.relative(store, dir).split(path.sep)[0] ?? "") : worktree;
+  const located = (dir, name, root) => gen(function* () {
+    const candidate = path.join(dir, "node_modules", name);
+    if (yield* fs.exists(path.join(candidate, "package.json")))
+      return yield* fs.realPath(candidate);
+    const parent = path.dirname(dir);
+    return dir === root || parent === dir || !within(root, parent) ? undefined : yield* located(parent, name, root);
+  }).pipe(orElseSucceed(() => {
+    return;
+  }));
+  const manifestAt = (dir) => fs.readFileString(path.join(dir, "package.json")).pipe(map8((text) => getOrUndefined(decodeJsonStringOption(text))), orElseSucceed(() => {
+    return;
+  }));
+  const unresolved = [];
+  const visited = new Set;
+  let due = [];
+  for (const [dir, workspace] of Object.entries(workspaces))
+    due.push({
+      from: path.join(worktree, dir),
+      label: dir === "" ? "." : dir,
+      names: declaredNames(workspace, ["dependencies", "devDependencies"])
+    });
+  while (due.length > 0) {
+    const next = [];
+    yield* forEach(due, ({ from, label, names }) => forEach(names, (name) => gen(function* () {
+      const found = yield* located(from, name, linkedWithin(from));
+      if (found === undefined)
+        return unresolved.push(`${label} cannot resolve ${name}`);
+      if (visited.has(found))
+        return;
+      visited.add(found);
+      next.push({
+        from: found,
+        label: name,
+        names: declaredNames(yield* manifestAt(found), ["dependencies"])
+      });
+    }), { discard: true }), { concurrency: 16, discard: true });
+    due = next;
+  }
+  return unresolved.toSorted();
+});
 var installIn = (worktree, run) => gen(function* () {
   const files = yield* FileSystem;
   const install = installCommand(yield* files.readDirectory(worktree));
   if (install === undefined)
     return;
   const filesDir = yield* files.makeTempDirectoryScoped({ prefix: "kitman-check-files-" });
-  const installed = yield* run({ command: install, cwd: worktree, filesDir });
-  if (installed.exitCode !== 0)
-    return yield* new InstallFailed({ command: install, output: redactedOutputTail(installed.output, 2000) });
+  const installWith = (command) => gen(function* () {
+    const installed = yield* run({ command, cwd: worktree, filesDir });
+    if (installed.exitCode !== 0)
+      return yield* new InstallFailed({ command, output: redactedOutputTail(installed.output, 2000) });
+    return yield* unresolvedDependencies(worktree);
+  });
+  if ((yield* installWith(install)).length === 0 || !install.startsWith("bun install"))
+    return;
+  const forced = `${install} --force`;
+  const unresolved = yield* installWith(forced);
+  if (unresolved.length > 0)
+    return yield* new InstallFailed({ command: forced, output: unresolved.join("; ") });
 });
 var runChecks = (worktree, checks, tree, known, run, keeper, services) => gen(function* () {
   const path = yield* Path;