deepline 0.3.308 → 0.3.310

package/dist/cli/{chunk-ASWZTTKT.mjs → chunk-AV4CJWNP.mjs}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-GAMFK2ZP.mjs";
 import {
   printCommandEnvelope
-} from "./chunk-ABMGEW3C.mjs";
+} from "./chunk-OJWZADOG.mjs";
 import {
   DEFAULT_SKILL_AGENTS,
   KNOWN_SKILL_AGENTS,
@@ -22,7 +22,7 @@ import {
   sdkCliStateDirPath,
   skillsAgentPathSegment,
   writeSdkSkillsLocalVersion
-} from "./chunk-T3P4NRZU.mjs";
+} from "./chunk-M4KGWEN2.mjs";
 import {
   DeeplineError
 } from "./chunk-NXGCO4JB.mjs";
@@ -388,6 +388,8 @@ function enforceSdkCompatibilityResponse(response, options = {}) {
 }
 
 // src/cli/windows-arg-escape.ts
+import { statSync } from "fs";
+import { win32 } from "path";
 var CMD_META_CHARS = /([()\][%!^"`<>&|;, *?])/g;
 function escapeCmdArgument(arg, forBatchFile = true) {
   let escaped = arg.replace(/(\\*)"/g, '$1$1\\"');
@@ -399,16 +401,46 @@ function escapeCmdArgument(arg, forBatchFile = true) {
 function escapeCmdCommand(command) {
   return command.replace(CMD_META_CHARS, "^$1");
 }
-function resolveShellSpawn(command, args, platform2 = process.platform) {
+function resolveShellSpawn(command, args, platform2 = process.platform, env = process.env, cwd = process.cwd()) {
   if (platform2 !== "win32") {
     return { command, args: [...args], shell: false };
   }
+  const resolved = resolveWindowsExecutable(command, env, cwd);
+  const executable = resolved ?? command;
+  const batchFile = /\.(cmd|bat)$/i.test(executable) || !resolved && /^(npm|npx|pnpm)$/i.test(command);
+  if (!batchFile) {
+    if (/^bunx(?:\.exe)?$/i.test(win32.basename(executable))) {
+      const bun = resolveWindowsExecutable("bun", env, cwd);
+      if (bun && /\.exe$/i.test(bun)) {
+        return { command: bun, args: ["x", ...args], shell: false };
+      }
+    }
+    return { command: executable, args: [...args], shell: false };
+  }
   return {
-    command: escapeCmdCommand(command),
+    command: escapeCmdCommand(executable),
     args: args.map((arg) => escapeCmdArgument(arg)),
     shell: true
   };
 }
+function resolveWindowsExecutable(command, env, cwd) {
+  const extensions = win32.extname(command) ? [""] : (env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean);
+  const directories = /[\\/]/.test(command) ? [""] : [cwd, ...(env.PATH ?? "").split(";")];
+  for (const directory of directories) {
+    for (const extension of extensions) {
+      const candidate = directory ? win32.resolve(
+        cwd,
+        directory.replace(/^"|"$/g, ""),
+        command + extension
+      ) : win32.resolve(cwd, command + extension);
+      try {
+        if (statSync(candidate).isFile()) return candidate;
+      } catch {
+      }
+    }
+  }
+  return void 0;
+}
 
 // src/cli/failure-reporting.ts
 import { hostname, platform, release } from "os";
@@ -894,9 +926,13 @@ function claimOneInProgressSkillsSync(baseUrl, remoteVersion, agent, owner) {
   };
   try {
     mkdirSync2(dirname2(dir), { recursive: true });
+  } catch (error) {
+    return { state: "unavailable", error };
+  }
+  try {
     return create();
   } catch (error) {
-    if (errorCode(error) !== "EEXIST") return { state: "unavailable" };
+    if (errorCode(error) !== "EEXIST") return { state: "unavailable", error };
   }
   if (isFreshInProgressSkillsSync(readInProgressSkillsSyncLease(baseUrl, agent))) {
     return { state: "held" };
@@ -909,7 +945,7 @@ function claimOneInProgressSkillsSync(baseUrl, remoteVersion, agent, owner) {
   try {
     return create();
   } catch (error) {
-    return errorCode(error) === "EEXIST" ? { state: "held" } : { state: "unavailable" };
+    return errorCode(error) === "EEXIST" ? { state: "held" } : { state: "unavailable", error };
   }
 }
 function claimInProgressSkillsSync(baseUrl, remoteVersion, agents) {
@@ -924,16 +960,25 @@ function claimInProgressSkillsSync(baseUrl, remoteVersion, agents) {
     );
     if (claim.state !== "claimed") {
       releaseInProgressSkillsSync(baseUrl, claimTokens);
-      return { state: claim.state };
+      return claim;
     }
     claimTokens.set(agent, claim.claimToken);
   }
   return { state: "claimed", claimTokens, owner };
 }
-function claimAndSpawnDetachedSkillsSync(baseUrl, agents, remoteVersion, spawnDetached) {
+function claimAndSpawnDetachedSkillsSync(baseUrl, agents, remoteVersion, spawnDetached, shouldSpawn) {
   const claim = claimInProgressSkillsSync(baseUrl, remoteVersion, agents);
-  if (claim.state !== "claimed") return claim.state;
+  if (claim.state !== "claimed") return claim;
   const { claimTokens, owner } = claim;
+  try {
+    if (shouldSpawn && !shouldSpawn()) {
+      releaseInProgressSkillsSync(baseUrl, claimTokens);
+      return { state: "skipped" };
+    }
+  } catch (error) {
+    releaseInProgressSkillsSync(baseUrl, claimTokens);
+    throw error;
+  }
   spawnDetached([SKILLS_AUTO_SYNC_COMMAND, "--claim", owner], () => {
     releaseInProgressSkillsSync(baseUrl, claimTokens);
     if (remoteVersion !== UNRESOLVED_SKILLS_CLAIM_VERSION) {
@@ -946,7 +991,22 @@ function claimAndSpawnDetachedSkillsSync(baseUrl, agents, remoteVersion, spawnDe
       "Deepline skills refresh failed to start; run `deepline skills` to retry."
     );
   });
-  return "claimed";
+  return { state: "claimed" };
+}
+var SkillsStateUnavailableError = class extends Error {
+  constructor(baseUrl, error) {
+    const detail = error instanceof Error ? error.message : String(error);
+    super(
+      `Could not save skills state in ${sdkCliStateDirPath(baseUrl)}: ${detail}`
+    );
+    this.name = "SkillsStateUnavailableError";
+  }
+};
+function writeSkillsStateUnavailableNotice(baseUrl, agents, error) {
+  const retry = agents.length === 1 ? `deepline skills --agent ${agents[0]} --json` : "deepline skills --json";
+  writeSdkSkillsStatusLine(
+    `Automatic skills update skipped. ${new SkillsStateUnavailableError(baseUrl, error).message}. Your command will continue. Resolve this filesystem error, then run: ${retry}`
+  );
 }
 function recordOwnPidOnInProgressSkillsSync(baseUrl, leases) {
   for (const [agent, lease] of leases) {
@@ -998,8 +1058,7 @@ async function acquireSkillsInstallLease(baseUrl, agents, version, options = {
   for (; ; ) {
     const claim = claimInProgressSkillsSync(baseUrl, version, agents);
     if (claim.state === "unavailable") {
-      return { release: () => {
-      } };
+      throw new SkillsStateUnavailableError(baseUrl, claim.error);
     }
     if (claim.state === "claimed") {
       recordOwnPidOnInProgressSkillsSync(
@@ -1155,6 +1214,7 @@ function clearFailedSkillsSync(baseUrl, agents) {
 }
 function clearFailedAutomaticSkillsSync(baseUrl, agents) {
   clearFailedSkillsSync(baseUrl, agents);
+  clearUnavailableInstallerProbes(baseUrl);
 }
 function sortedUniqueSkillNames(names) {
   return [...new Set(names.map((name) => name.trim()).filter(Boolean))].sort(
@@ -1378,7 +1438,7 @@ function buildBunxSkillsInstallArgs(baseUrl, skillNames, agents) {
     agents
   });
 }
-var NEGATIVE_INSTALLER_PROBE_TTL_MS = 5 * 60 * 1e3;
+var NEGATIVE_INSTALLER_PROBE_TTL_MS = 30 * 60 * 1e3;
 function probeInstallers(timeoutMs) {
   return {
     bunx: probeCommand("bunx", timeoutMs),
@@ -1391,17 +1451,22 @@ function noInstallerProbePath(baseUrl) {
     "skills-sync-no-installer-unknown.json"
   );
 }
-function dueUnknownInstallerProbes(baseUrl, remoteVersion) {
+function cachedUnavailableInstallerProbes(baseUrl, remoteVersion, allowBoundedFailures = false) {
   const path = noInstallerProbePath(baseUrl);
   try {
     const cached = JSON.parse(readFileSync2(path, "utf-8"));
-    if (cached.version === remoteVersion && typeof cached.checkedAt === "number" && cached.checkedAt <= Date.now() && Date.now() - cached.checkedAt < NEGATIVE_INSTALLER_PROBE_TTL_MS && (cached.probes?.bunx === "missing" || cached.probes?.bunx === "failed") && (cached.probes?.npx === "missing" || cached.probes?.npx === "failed")) {
+    if (typeof cached.version === "string" && (!remoteVersion || cached.version === remoteVersion) && typeof cached.checkedAt === "number" && cached.checkedAt <= Date.now() && Date.now() - cached.checkedAt < NEGATIVE_INSTALLER_PROBE_TTL_MS && (cached.probes?.bunx === "missing" || cached.probes?.bunx === "failed") && (cached.probes?.npx === "missing" || cached.probes?.npx === "failed") && // A terminal timeout is not evidence that the unbounded child probe
+    // will fail. Older caches without probe provenance are ambiguous too.
+    (allowBoundedFailures || cached.probeTimeoutMs === null || cached.probes.bunx === "missing" && cached.probes.npx === "missing")) {
       return cached.probes;
     }
   } catch {
   }
-  const probes = probeInstallers(INSTALLER_PROBE_TIMEOUT_MS);
+  return null;
+}
+function rememberUnavailableInstallerProbes(baseUrl, remoteVersion, probes, probeTimeoutMs = null) {
   if (probes.bunx !== "available" && probes.npx !== "available") {
+    const path = noInstallerProbePath(baseUrl);
     try {
       mkdirSync2(dirname2(path), { recursive: true });
       writeFileSync2(
@@ -1409,6 +1474,7 @@ function dueUnknownInstallerProbes(baseUrl, remoteVersion) {
         JSON.stringify({
           version: remoteVersion,
           checkedAt: Date.now(),
+          probeTimeoutMs,
           probes
         }),
         "utf-8"
@@ -1416,6 +1482,23 @@ function dueUnknownInstallerProbes(baseUrl, remoteVersion) {
     } catch {
     }
   }
+}
+function clearUnavailableInstallerProbes(baseUrl) {
+  try {
+    unlinkSync(noInstallerProbePath(baseUrl));
+  } catch {
+  }
+}
+function dueUnknownInstallerProbes(baseUrl, remoteVersion) {
+  const cached = cachedUnavailableInstallerProbes(baseUrl, remoteVersion, true);
+  if (cached) return cached;
+  const probes = probeInstallers(INSTALLER_PROBE_TIMEOUT_MS);
+  rememberUnavailableInstallerProbes(
+    baseUrl,
+    remoteVersion,
+    probes,
+    INSTALLER_PROBE_TIMEOUT_MS
+  );
   return probes;
 }
 function probeCommand(command, timeoutMs) {
@@ -1443,9 +1526,10 @@ function temporarySkillsSyncSkipCommand() {
 function resolveSkillsInstallSpawn(install, platform2 = process.platform) {
   return resolveShellSpawn(install.command, install.args, platform2);
 }
-function resolveSkillsInstallCommands(baseUrl, skillNames = DEFAULT_SDK_SKILL_NAMES, agents = DEFAULT_SKILL_AGENTS) {
+function resolveSkillsInstallCommands(baseUrl, skillNames = DEFAULT_SDK_SKILL_NAMES, agents = DEFAULT_SKILL_AGENTS, knownProbes) {
   const commands = [];
-  if (hasCommand("bunx")) {
+  const probes = knownProbes ?? probeInstallers();
+  if (probes.bunx === "available") {
     const bunxArgs = buildBunxSkillsInstallArgs(baseUrl, skillNames, agents);
     commands.push({
       command: "bunx",
@@ -1453,7 +1537,7 @@ function resolveSkillsInstallCommands(baseUrl, skillNames = DEFAULT_SDK_SKILL_NA
       manualCommand: `bunx ${bunxArgs.map(shellQuote).join(" ")}`
     });
   }
-  if (hasCommand("npx")) {
+  if (probes.npx === "available") {
     const npxArgs = buildSkillsInstallArgs(baseUrl, skillNames, agents);
     commands.push({
       command: "npx",
@@ -1613,12 +1697,16 @@ async function syncSdkSkillsIfNeeded(baseUrl, options = {}) {
   if (leases) recordOwnPidOnInProgressSkillsSync(baseUrl, leases);
   const claimedVersion = leases ? claimedSkillsVersion(leases) : "";
   if (options.mode === "detached" && agents.length > 0 && options.update === void 0 && !claimedVersion) {
-    claimAndSpawnDetachedSkillsSync(
+    if (cachedUnavailableInstallerProbes(baseUrl)) return;
+    const outcome = claimAndSpawnDetachedSkillsSync(
       baseUrl,
       agents,
       UNRESOLVED_SKILLS_CLAIM_VERSION,
       options.spawnDetached ?? spawnDetachedSkillsSyncChild
     );
+    if (outcome.state === "unavailable") {
+      writeSkillsStateUnavailableNotice(baseUrl, agents, outcome.error);
+    }
     return;
   }
   try {
@@ -1643,16 +1731,24 @@ async function syncSdkSkillsIfNeeded(baseUrl, options = {}) {
       return;
     }
     if (options.mode === "detached" && agents.length > 0) {
-      if (isDefaultAgentSet(agents)) {
-        if (agents.some(
-          (agent) => isFreshInProgressSkillsSync(
-            readInProgressSkillsSyncLease(baseUrl, agent)
-          )
-        )) {
-          return;
-        }
-        const probes = dueUnknownInstallerProbes(baseUrl, update.remoteVersion);
-        if (probes.bunx !== "available" && probes.npx !== "available") {
+      if (cachedUnavailableInstallerProbes(
+        baseUrl,
+        update.remoteVersion,
+        isDefaultAgentSet(agents)
+      ))
+        return;
+      const outcome = claimAndSpawnDetachedSkillsSync(
+        baseUrl,
+        agents,
+        update.remoteVersion,
+        options.spawnDetached ?? spawnDetachedSkillsSyncChild,
+        isDefaultAgentSet(agents) ? () => {
+          const probes = dueUnknownInstallerProbes(
+            baseUrl,
+            update.remoteVersion
+          );
+          if (probes.bunx === "available" || probes.npx === "available")
+            return true;
           writeUnavailableSkillsNotice(
             baseUrl,
             update.remoteVersion,
@@ -1661,22 +1757,17 @@ async function syncSdkSkillsIfNeeded(baseUrl, options = {}) {
             writeSdkSkillsStatusLine,
             probes
           );
-          return;
-        }
-      }
-      const outcome = claimAndSpawnDetachedSkillsSync(
-        baseUrl,
-        agents,
-        update.remoteVersion,
-        options.spawnDetached ?? spawnDetachedSkillsSyncChild
+          return false;
+        } : void 0
       );
-      if (outcome === "held") return;
-      if (outcome === "claimed") {
+      if (outcome.state === "held" || outcome.state === "skipped") return;
+      if (outcome.state === "claimed") {
         writeSdkSkillsStatusLine(
           "Deepline skills are out of date; updating in the background."
         );
         return;
       }
+      writeSkillsStateUnavailableNotice(baseUrl, agents, outcome.error);
       return;
     }
     await runInlineSkillsSync(
@@ -1710,14 +1801,22 @@ async function runInlineSkillsSync(baseUrl, remoteVersion, agents, notices) {
     );
     return;
   }
-  const installs = resolveSkillsInstallCommands(baseUrl, skillNames, agents);
+  const probes = probeInstallers();
+  const installs = resolveSkillsInstallCommands(
+    baseUrl,
+    skillNames,
+    agents,
+    probes
+  );
   if (installs.length === 0) {
+    rememberUnavailableInstallerProbes(baseUrl, remoteVersion, probes);
     writeUnavailableSkillsNotice(
       baseUrl,
       update.remoteVersion,
       skillNames,
       "no-installer",
-      notice
+      notice,
+      probes
     );
     return;
   }
@@ -1785,6 +1884,7 @@ async function runInlineSkillsSync(baseUrl, remoteVersion, agents, notices) {
   }
   clearUnavailableSkillsNotice(baseUrl);
   clearFailedSkillsSync(baseUrl, agents);
+  clearUnavailableInstallerProbes(baseUrl);
   notice("Deepline agent skills are up to date.");
 }
 
@@ -1936,7 +2036,13 @@ function readSkillsInstallState(path) {
 }
 function runProcess(command, args, cwd) {
   return new Promise((resolve, reject) => {
-    const plan = resolveShellSpawn(command, args);
+    const plan = resolveShellSpawn(
+      command,
+      args,
+      process.platform,
+      process.env,
+      cwd
+    );
     const child = spawn2(plan.command, plan.args, {
       cwd,
       env: process.env,
@@ -2046,13 +2152,32 @@ async function runSkillsCommand(options, dependencies = {}) {
       )
     ]);
   }
-  const lease = scope === "global" ? await acquireSkillsInstallLease(baseUrl, agents, plan.version, {
-    waitMs: dependencies.installLeaseWaitMs ?? SKILLS_INSTALL_LEASE_WAIT_MS,
-    onWait: () => process.stderr.write(
-      "Waiting for a background Deepline skills refresh to finish...\n"
-    )
-  }) : { release: () => {
-  } };
+  let lease;
+  try {
+    lease = scope === "global" ? await acquireSkillsInstallLease(baseUrl, agents, plan.version, {
+      waitMs: dependencies.installLeaseWaitMs ?? SKILLS_INSTALL_LEASE_WAIT_MS,
+      onWait: () => process.stderr.write(
+        "Waiting for a background Deepline skills refresh to finish...\n"
+      )
+    }) : { release: () => {
+    } };
+  } catch (error) {
+    if (!(error instanceof SkillsStateUnavailableError)) throw error;
+    printCommandEnvelope(
+      {
+        ok: false,
+        status: "failed",
+        code: "SKILLS_STATE_UNAVAILABLE",
+        exitCode: 5,
+        scope,
+        agents,
+        message: error.message,
+        next: `Resolve this filesystem error, then run: deepline skills --scope ${scope} --json`
+      },
+      { json: options.json }
+    );
+    return 5;
+  }
   if (!lease) {
     printCommandEnvelope(
       {

package/dist/cli/{chunk-IFIGQWHC.js → chunk-D3HSRXCJ.js}

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
 
-var _chunkYEJMVAD3js = require('./chunk-YEJMVAD3.js');
+var _chunkRYO6353Ojs = require('./chunk-RYO6353O.js');
 
 // src/cli/commands/sessions.ts
 
@@ -420,7 +420,7 @@ function buildSessionUploadContent(raw) {
   return { encodedContent: encoded, needsChunking: true };
 }
 async function uploadPayload(path, payload) {
-  const { http } = _chunkYEJMVAD3js.getAuthedHttpClient.call(void 0, );
+  const { http } = _chunkRYO6353Ojs.getAuthedHttpClient.call(void 0, );
   return await http.post(path, payload);
 }
 async function uploadChunkedSessions(sessions, options) {
@@ -452,7 +452,7 @@ async function uploadChunkedSessions(sessions, options) {
     environments: sessions.map(() => detectShellContext()),
     ...options.rating ? { rating: options.rating } : {}
   });
-  _chunkYEJMVAD3js.printCommandEnvelope.call(void 0, 
+  _chunkRYO6353Ojs.printCommandEnvelope.call(void 0, 
     {
       ...response,
       ok: true,
@@ -481,7 +481,7 @@ async function handleSessionsSend(options) {
       filename: _path.basename.call(void 0, filePath),
       ...rating ? { rating } : {}
     });
-    _chunkYEJMVAD3js.printCommandEnvelope.call(void 0, 
+    _chunkRYO6353Ojs.printCommandEnvelope.call(void 0, 
       {
         ...response2,
         ok: true,
@@ -530,7 +530,7 @@ async function handleSessionsSend(options) {
     environment: detectShellContext(),
     ...rating ? { rating } : {}
   });
-  _chunkYEJMVAD3js.printCommandEnvelope.call(void 0, 
+  _chunkRYO6353Ojs.printCommandEnvelope.call(void 0, 
     {
       ...response,
       ok: true,
@@ -635,7 +635,7 @@ ${refreshMeta}
 </body>
 </html>`;
   _fs.writeFileSync.call(void 0, outputPath, html, "utf8");
-  _chunkYEJMVAD3js.printCommandEnvelope.call(void 0, 
+  _chunkRYO6353Ojs.printCommandEnvelope.call(void 0, 
     {
       ok: true,
       file: outputPath,