@kitman-sh/cli 0.10.68 → 0.10.70

package/dist/{chunk-9pp1w29g.js → chunk-8w7d269h.js}

@@ -12,7 +12,7 @@ import {
   herdrCoreLayer2,
   herdrCoreTransportLayer2,
   updateHerdrCore2
-} from "./chunk-fc0y8kn7.js";
+} from "./chunk-x7g0rzqj.js";
 import"./chunk-dk0ftqwg.js";
 import"./chunk-d3ksv8y1.js";
 export {

package/dist/{chunk-t6w469gd.js → chunk-9hr71e7c.js}

@@ -4,9 +4,9 @@ import {
   runnerRpcUrl2,
   makeRunnerRpcClient2,
   makeProgramRpcClient2
-} from "./chunk-p8akhcme.js";
-import"./chunk-2z450w92.js";
-import"./chunk-fc0y8kn7.js";
+} from "./chunk-h0sw8tks.js";
+import"./chunk-fgecj3t0.js";
+import"./chunk-x7g0rzqj.js";
 import"./chunk-rrnee9mk.js";
 import"./chunk-v01c0k6j.js";
 import"./chunk-dk0ftqwg.js";

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

@@ -197,7 +197,7 @@ import {
   harnessNames,
   herdrRunnerCapabilities2,
   declaredChecks
-} from "./chunk-fc0y8kn7.js";
+} from "./chunk-x7g0rzqj.js";
 import {
   Id
 } from "./chunk-rrnee9mk.js";
@@ -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-8w7d269h.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-8w7d269h.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-f8qqmcgy.js"));
   const harnesses = yield* syncTargets(input.harness);
   const chain = yield* input.client.getKitChain(input.workspaceId);
   for (const { name, problem } of chain.skipped)
@@ -1651,7 +1651,7 @@ var package_default = {
 };
 
 // apps/cli/src/scaffold.ts
-var cliVersion = "0.10.68";
+var cliVersion = "0.10.70";
 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-e5dq8dbz.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-9hr71e7c.js"));
     return yield* makeRunnerRpcClient({
       runnerId: options.runnerId,
       bearer: options.bearer,
@@ -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-8ttdzwa3.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-7jh6atr0.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-7jh6atr0.js")), (build) => build.buildKit(directory))
 });
 var uploadKit = (client, workspaceId, built) => gen(function* () {
   yield* client.uploadKitBundle(workspaceId, built.digest, { bundle: encode2(built.bundle) });

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

@@ -225,7 +225,7 @@ import {
   installCommand,
   checkServicesFile,
   checkServices
-} from "./chunk-fc0y8kn7.js";
+} from "./chunk-x7g0rzqj.js";
 import {
   join,
   interrupt,
@@ -281,8 +281,8 @@ import {
   applyAgentEnvironmentMaterialization2,
   isPathWithin2,
   skillIdentity2
-} from "./chunk-fsbpm71s.js";
-import"./chunk-cctfnp4r.js";
+} from "./chunk-2wkdq54x.js";
+import"./chunk-pq9bkyj6.js";
 import {
   sliceBytes2,
   maxLineBytes2,
@@ -302,8 +302,8 @@ import {
   rpcRunFiles,
   programHostsEnv,
   undeclaredHostsEnv
-} from "./chunk-gfr11y10.js";
-import"./chunk-p8akhcme.js";
+} from "./chunk-1j1jh211.js";
+import"./chunk-h0sw8tks.js";
 import {
   nextInt
 } from "./chunk-q3c7vmby.js";
@@ -311,7 +311,7 @@ import {
   ChildProcessSpawner,
   make3
 } from "./chunk-1rry0tsn.js";
-import"./chunk-2z450w92.js";
+import"./chunk-fgecj3t0.js";
 
 // packages/core/src/sync-kit.ts
 import { createHash } from "crypto";
@@ -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;

package/dist/{chunk-n0h0z7yh.js → chunk-f8qqmcgy.js}

@@ -26,15 +26,15 @@ import {
   tomlKeyPath2,
   kitmanSkillEntry,
   isPathWithin2
-} from "./chunk-fsbpm71s.js";
+} from "./chunk-2wkdq54x.js";
 import {
   instructionsStart,
   instructionsEnd,
   renderMcpServer,
   materializeKitSetup,
   tomlInline
-} from "./chunk-fc0y8kn7.js";
-import"./chunk-cctfnp4r.js";
+} from "./chunk-x7g0rzqj.js";
+import"./chunk-pq9bkyj6.js";
 import"./chunk-1rry0tsn.js";
 
 // packages/agent-runtime/src/kit-setup-sync.ts

package/dist/{chunk-2z450w92.js → chunk-fgecj3t0.js}

@@ -123,7 +123,7 @@ import {
   ParseOptions,
   RpcClientDefect,
   RpcClientError
-} from "./chunk-fc0y8kn7.js";
+} from "./chunk-x7g0rzqj.js";
 
 // node_modules/.bun/effect@4.1.2/node_modules/effect/dist/workers/Transferable.js
 class Collector extends (/* @__PURE__ */ Service2()("effect/workers/Transferable/Collector")) {

package/dist/{chunk-p8akhcme.js → chunk-h0sw8tks.js}

@@ -19,13 +19,13 @@ import {
   RunnerReplicaRpcs,
   RunnerRunFileRpcs,
   ProgramRpcs
-} from "./chunk-fc0y8kn7.js";
+} from "./chunk-x7g0rzqj.js";
 import {
   layerJson,
   make4,
   withHeaders,
   layerProtocolSocket
-} from "./chunk-2z450w92.js";
+} from "./chunk-fgecj3t0.js";
 
 // packages/live/src/rpc/runner-client.ts
 var proxiedWebSocket = (proxy) => succeed5(WebSocketConstructor)((target) => {

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

@@ -38,7 +38,7 @@ import {
   get2,
   layer4,
   KitDigest
-} from "./chunk-fc0y8kn7.js";
+} from "./chunk-x7g0rzqj.js";
 
 // packages/core/src/npm-registry.ts
 var KitManifest = Struct({

package/dist/{chunk-fc0y8kn7.js → chunk-x7g0rzqj.js}

@@ -5915,6 +5915,12 @@ var RunWaiting = Union([
     name: String4.check(isMinLength(1)),
     verificationId: Id
   }),
+  Struct({
+    kind: Literal("claim"),
+    name: String4.check(isMinLength(1)),
+    resource: String4.check(isMinLength(1)),
+    holder: optionalKey(Struct({ runId: Id, loopId: String4 }))
+  }),
   Struct({
     kind: Literal("queue"),
     name: String4.check(isMinLength(1)),
@@ -13865,6 +13871,7 @@ class RunnerCapabilityRpcs extends make7(make6("PutQuestion", {
     revision: optionalKey(String4),
     checks: optional(ArraySchema(String4)),
     suggested: optionalKey(ArraySchema(ApprovedCheck)),
+    rerunFailed: optionalKey(Boolean2),
     measure: optionalKey(Struct({
       base: optionalKey(String4),
       plan: MeasurePlan,
@@ -14006,7 +14013,19 @@ class RunnerCapabilityRpcs extends make7(make6("PutQuestion", {
       logTail: optionalKey(String4)
     })),
     readAt: optionalKey(String4),
-    runnerChecks: optionalKey(ArraySchema(String4))
+    runnerChecks: optionalKey(ArraySchema(String4)),
+    approved: optionalKey(String4),
+    repository: optionalKey(String4),
+    target: optionalKey(Struct({
+      branch: String4,
+      head: String4,
+      jobs: ArraySchema(Struct({
+        name: String4,
+        status: Literals(["running", "success", "failed", "skipped"]),
+        url: optionalKey(String4),
+        logTail: optionalKey(String4)
+      }))
+    }))
   }),
   error: RunnerRpcError
 }), make6("ReportPipeline", {

package/dist/index.js

@@ -14,6 +14,6 @@ if (args[0] === "srt") {
   const { runOpencodeReader } = await import("./chunk-60333x3q.js");
   runOpencodeReader();
 } else {
-  const { runCli } = await import("./chunk-fdy3jce3.js");
+  const { runCli } = await import("./chunk-dena9bpd.js");
   runCli(args);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitman-sh/cli",
-  "version": "0.10.68",
+  "version": "0.10.70",
   "type": "module",
   "license": "UNLICENSED",
   "bin": {