@lucid-agents/taskmarket 1.18.0 → 1.19.0

package/dist/{launch-C5HUFUU2.js → launch-I3NCB5FV.js}

@@ -7,7 +7,7 @@ import {
   recordSessionEnd,
   recordSessionStart,
   uploadPlan
-} from "./chunk-ESPAXW2P.js";
+} from "./chunk-3HCDMHXW.js";
 import {
   TaskOperationError,
   authorizeUploads,
@@ -27,7 +27,7 @@ import {
   signReadAuth,
   submitUploadedArtifacts,
   taskAccessGrantHeaders
-} from "./chunk-JJUF3KZY.js";
+} from "./chunk-F2SZG7TC.js";
 import {
   terminalPrompter
 } from "./chunk-ZIC2YCLV.js";
@@ -67,7 +67,7 @@ import {
   sha256Hex,
   specHash,
   taskStage
-} from "./chunk-L6ZVRENW.js";
+} from "./chunk-RKGRXJ5X.js";
 import {
   BrokerConnector,
   OutputLimitError,
@@ -79,7 +79,7 @@ import {
   serveSandboxChannel,
   withFileLock,
   writeAtomic
-} from "./chunk-64HQ7ZF2.js";
+} from "./chunk-MJR2CZWZ.js";
 import {
   applyComputeCreditSetup,
   atomicToUsd,
@@ -89,7 +89,7 @@ import {
   planComputeCreditSetup,
   readComputeCreditBalance,
   usdToAtomic
-} from "./chunk-W7CXEYST.js";
+} from "./chunk-6KJ5EFBN.js";
 import {
   MAX_RETIRED_RAILS,
   WORKSPACE_CONSENT_VERSION,
@@ -109,7 +109,7 @@ import {
   routeOfCatalogRow,
   saveAgentPolicy,
   settledRetiredRails
-} from "./chunk-MO5KMUTL.js";
+} from "./chunk-7Y7IOFKT.js";
 import {
   BASE_CHANNEL_RAIL_ID,
   createBaseChannelPayer,
@@ -122,7 +122,7 @@ import {
   parseX402Policy,
   saveX402Policy,
   x402SpendWindowAvailability
-} from "./chunk-S4A6V3J3.js";
+} from "./chunk-VMSV4EYS.js";
 import {
   IntentStatusResponseSchema,
   apiUrl,
@@ -132,7 +132,7 @@ import {
   keystoreExists,
   loadKeystore,
   selectedNetwork
-} from "./chunk-75LS6XS6.js";
+} from "./chunk-PGXPZFVY.js";
 import {
   AGENT_VIEW_VERSION,
   formatUsdc

package/dist/pi-extensions/xgate.cjs

@@ -2269,11 +2269,11 @@ function registerBudgetUi(pi2, channel) {
           ctx.ui.notify("Buying compute credit needs the interactive session", "error");
           return;
         }
-        const approved = await ctx.ui.confirm(
+        const approved2 = await ctx.ui.confirm(
           "Buy compute credit",
           `Buy $${size.amountUsd} of compute credit (${size.credits} credits at $${offer.usdPerCredit} each) in USDC from your compute allocation? Its daily and monthly caps apply.`
         );
-        if (!approved) return;
+        if (!approved2) return;
         const bought = await channel.buyCredits(size.amountUsd);
         ctx.ui.notify(
           `Bought ${bought?.purchase?.credits ?? size.credits} credits; ${bought?.balance?.availableCredits ?? "?"} available`,
@@ -2533,9 +2533,9 @@ var ChannelXgateTransport = class _ChannelXgateTransport {
    * The person's answer to an action's dialog. Not abortable from the tool call: once sent, the
    * controller finishes (and journals) what it started.
    */
-  async marketActionAnswer(actionId, approved) {
+  async marketActionAnswer(actionId, approved2) {
     return (await this.view(
-      { op: "market_action", phase: approved ? "confirm" : "decline", actionId },
+      { op: "market_action", phase: approved2 ? "confirm" : "decline", actionId },
       void 0,
       ACTION_TIMEOUT_MS
     )).value;
@@ -3149,13 +3149,13 @@ function marketActionToolDefinitions(channel) {
         } catch {
           choice = void 0;
         }
-        const approved = choice === proposal.approveLabel && !signal?.aborted;
+        const approved2 = choice === proposal.approveLabel && !signal?.aborted;
         let value;
         try {
-          value = await channel.marketActionAnswer(proposal.actionId, approved);
+          value = await channel.marketActionAnswer(proposal.actionId, approved2);
         } catch (error) {
           const code = errorCode3(error);
-          if (!approved) {
+          if (!approved2) {
             ctx.ui.notify("Declined. Nothing was signed or sent.", "info");
             throw new Error(actionFailure("declined_nothing_sent"));
           }
@@ -3333,6 +3333,34 @@ function registerMarketTools(pi2, channel) {
   for (const tool of marketToolDefinitions(channel)) pi2.registerTool(tool);
 }
 
+// src/lib/agent/provider-guard.ts
+init_cjs_shims();
+var XGATE_PROVIDER = "xgate";
+var XGATE_ONLY_TEXT = "taskmarket agent offers only the xgate models your policy approves";
+var NO_APPROVED_MODEL_TEXT = `${XGATE_ONLY_TEXT}; choose one with /model before the next turn`;
+function approved(model) {
+  return model?.provider === XGATE_PROVIDER;
+}
+function registerProviderGuard(pi2) {
+  pi2.on("model_select", async (event, ctx) => {
+    if (approved(event.model)) return;
+    const fallback = approved(event.previousModel) ? event.previousModel : ctx.modelRegistry.getAvailable().find(approved);
+    const restored = fallback ? await pi2.setModel(fallback) : false;
+    ctx.ui.notify(restored ? XGATE_ONLY_TEXT : NO_APPROVED_MODEL_TEXT, "warning");
+  });
+  pi2.on("input", async (_event, ctx) => {
+    if (approved(ctx.model)) return { action: "continue" };
+    ctx.ui.notify(NO_APPROVED_MODEL_TEXT, "error");
+    return { action: "handled" };
+  });
+  pi2.on("before_provider_request", async (_event, ctx) => {
+    if (approved(ctx.model)) return void 0;
+    ctx.abort();
+    ctx.ui.notify(NO_APPROVED_MODEL_TEXT, "error");
+    return void 0;
+  });
+}
+
 // src/lib/agent/sync-ui.ts
 init_cjs_shims();
 
@@ -3569,11 +3597,6 @@ async function taskmarketXgate(pi2) {
   registerMarketTools(pi2, channel);
   registerMarketActionTools(pi2, channel);
   registerTaskRunUi(pi2, channel);
-  pi2.on("model_select", async (event, ctx) => {
-    if (event.model.provider === "xgate") return;
-    const fallback = event.previousModel?.provider === "xgate" ? event.previousModel : ctx.modelRegistry.getAvailable().find((model) => model.provider === "xgate");
-    if (fallback) await pi2.setModel(fallback);
-    ctx.ui.notify("taskmarket agent offers only the xgate models your policy approves", "warning");
-  });
+  registerProviderGuard(pi2);
 }
 module.exports = module.exports.default;

package/dist/{reconcile-Q7XFHDQQ.js → reconcile-UHDI4QCY.js}

@@ -3,14 +3,14 @@ import {
   channelView,
   openAgentChannels,
   selectChannel
-} from "./chunk-MO5KMUTL.js";
+} from "./chunk-7Y7IOFKT.js";
 import {
   BASE_CHANNEL_RAIL_ID,
   X402_INVOCATION_ID_PATTERN,
   getX402JournalPath,
   listX402Payments
-} from "./chunk-S4A6V3J3.js";
-import "./chunk-75LS6XS6.js";
+} from "./chunk-VMSV4EYS.js";
+import "./chunk-PGXPZFVY.js";
 import {
   AGENT_VIEW_VERSION,
   LOST_RESPONSE_TEXT,

package/dist/{status-SDLSTJIA.js → status-GNY7YXPE.js}

@@ -7,13 +7,13 @@ import {
   statusLines,
   syncLines,
   taskLines
-} from "./chunk-2QJMUHDT.js";
-import "./chunk-L6ZVRENW.js";
-import "./chunk-64HQ7ZF2.js";
-import "./chunk-W7CXEYST.js";
-import "./chunk-MO5KMUTL.js";
-import "./chunk-S4A6V3J3.js";
-import "./chunk-75LS6XS6.js";
+} from "./chunk-U5F3Z2BR.js";
+import "./chunk-RKGRXJ5X.js";
+import "./chunk-MJR2CZWZ.js";
+import "./chunk-6KJ5EFBN.js";
+import "./chunk-7Y7IOFKT.js";
+import "./chunk-VMSV4EYS.js";
+import "./chunk-PGXPZFVY.js";
 import "./chunk-EB6OJBF5.js";
 import "./chunk-YM4S6IE4.js";
 import "./chunk-S7SJMJ2I.js";

package/dist/{sync-pull-TKM4EDGH.js → sync-pull-6PWR6CJS.js}

@@ -11,9 +11,10 @@ import {
   savedWorkspace,
   summarize,
   unsavedPaths
-} from "./chunk-ESPAXW2P.js";
+} from "./chunk-3HCDMHXW.js";
 import {
   BrokerConnector,
+  SandboxUnavailableError,
   SshSandboxBackend,
   applyChanges,
   captureProblem,
@@ -26,11 +27,11 @@ import {
   releaseClaim,
   unresolvedCount,
   updateSyncState
-} from "./chunk-64HQ7ZF2.js";
+} from "./chunk-MJR2CZWZ.js";
 import {
   apiUrl,
   loadKeystore
-} from "./chunk-75LS6XS6.js";
+} from "./chunk-PGXPZFVY.js";
 import {
   AgentLaunchError
 } from "./chunk-YM4S6IE4.js";
@@ -41,6 +42,10 @@ import { randomUUID } from "crypto";
 import { promises as fs } from "fs";
 var NONE = { clean: 0, conflict: 0, blocked: 0 };
 var RECOVER_TIMEOUT_MS = 3e5;
+var RECOVER_BUSY_WAITS_MS = [5e3, 1e4, 2e4];
+function sandboxBusy(error) {
+  return error instanceof SandboxUnavailableError && /\(409\): busy\b/.test(error.reason);
+}
 async function brokerSandbox(sandboxId) {
   const keystore = await loadKeystore();
   const broker = new BrokerConnector({
@@ -173,14 +178,31 @@ async function pullClaimed(options, io, project, initial) {
       );
     }
     let opened;
-    try {
-      opened = await (io.openSandbox ?? brokerSandbox)(target.sandboxId);
-      await opened.backend.connect();
-    } catch (error) {
-      throw new AgentLaunchError(
-        "sync_recover_unavailable",
-        `Sandbox ${target.sandboxId} cannot be reached (${error.message}); if it is gone, its changes are too. Drop the record with taskmarket agent pull --discard.`
-      );
+    const waits = [...RECOVER_BUSY_WAITS_MS];
+    while (!opened) {
+      let attempt;
+      try {
+        attempt = await (io.openSandbox ?? brokerSandbox)(target.sandboxId);
+        await attempt.backend.connect();
+        opened = attempt;
+      } catch (error) {
+        await attempt?.close().catch(() => void 0);
+        if (!sandboxBusy(error)) {
+          throw new AgentLaunchError(
+            "sync_recover_unavailable",
+            `Sandbox ${target.sandboxId} cannot be reached (${error.message}); if it is gone, its changes are too. Drop the record with taskmarket agent pull --discard.`
+          );
+        }
+        const wait = waits.shift();
+        if (wait === void 0) {
+          throw new AgentLaunchError(
+            "sync_recover_busy",
+            `Sandbox ${target.sandboxId} is still busy with another request, so its changes are still there. Run taskmarket agent pull --recover again in a minute; do not discard them.`
+          );
+        }
+        io.say([`Sandbox ${target.sandboxId} is busy; trying again in ${wait / 1e3} s.`]);
+        await (io.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms))))(wait);
+      }
     }
     let outcome;
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucid-agents/taskmarket",
-  "version": "1.18.0",
+  "version": "1.19.0",
   "type": "module",
   "bin": {
     "taskmarket": "./dist/index.js"