@trycadence/cli 0.1.18-dev.0 → 0.1.19-dev.0

package/dist/cadence

@@ -1488,6 +1488,7 @@ function createCadenceClient(options = {}) {
       current: (input) => rpc.sessions.current.query(input),
       leases: {
         create: (input) => rpc.sessions.leases.create.mutate(input),
+        renew: (input) => rpc.sessions.leases.renew.mutate(input),
         release: (input) => rpc.sessions.leases.release.mutate(input)
       }
     },
@@ -1520,7 +1521,7 @@ import { createInterface } from "readline/promises";
 // package.json
 var package_default = {
   name: "@trycadence/cli",
-  version: "0.1.18-dev.0",
+  version: "0.1.19-dev.0",
   private: false,
   type: "module",
   bin: {
@@ -3308,6 +3309,8 @@ function readAgentSessionCadenceContext(record) {
     ...typeof contextRecord.ticketId === "string" ? { ticketId: contextRecord.ticketId } : {},
     ...typeof contextRecord.sessionId === "string" ? { sessionId: contextRecord.sessionId } : {},
     ...typeof contextRecord.changesetId === "string" ? { changesetId: contextRecord.changesetId } : {},
+    ...typeof contextRecord.leaseId === "string" ? { leaseId: contextRecord.leaseId } : {},
+    ...typeof contextRecord.leaseExpiresAt === "string" ? { leaseExpiresAt: contextRecord.leaseExpiresAt } : {},
     ...typeof contextRecord.capturedAt === "string" ? { capturedAt: contextRecord.capturedAt } : {}
   };
   return cadenceContext.ticketId || cadenceContext.sessionId || cadenceContext.changesetId ? { cadenceContext } : {};
@@ -3501,6 +3504,8 @@ function activeSessionFromCurrent(current) {
       ...sessionId ? { id: sessionId } : {},
       ticketId: leaseRecord.ticketId,
       ...typeof leaseRecord.changesetId === "string" ? { changesetId: leaseRecord.changesetId } : typeof sessionRecord.changesetId === "string" ? { changesetId: sessionRecord.changesetId } : {},
+      ...typeof leaseRecord.id === "string" ? { leaseId: leaseRecord.id } : {},
+      ...typeof leaseRecord.expiresAt === "string" ? { leaseExpiresAt: leaseRecord.expiresAt } : {},
       status: "active"
     };
   }
@@ -3525,6 +3530,8 @@ function cadenceContextFromCurrent(current) {
   const ticketId = typeof activeSession.ticketId === "string" ? activeSession.ticketId : undefined;
   const sessionId = typeof activeSession.id === "string" ? activeSession.id : undefined;
   const changesetId = typeof activeSession.changesetId === "string" ? activeSession.changesetId : undefined;
+  const leaseId = typeof activeSession.leaseId === "string" ? activeSession.leaseId : undefined;
+  const leaseExpiresAt2 = typeof activeSession.leaseExpiresAt === "string" ? activeSession.leaseExpiresAt : undefined;
   if (!ticketId && !sessionId && !changesetId) {
     return;
   }
@@ -3532,9 +3539,41 @@ function cadenceContextFromCurrent(current) {
     ...ticketId ? { ticketId } : {},
     ...sessionId ? { sessionId } : {},
     ...changesetId ? { changesetId } : {},
+    ...leaseId ? { leaseId } : {},
+    ...leaseExpiresAt2 ? { leaseExpiresAt: leaseExpiresAt2 } : {},
     capturedAt: new Date().toISOString()
   };
 }
+function leaseExpiresAtFromResponse(value) {
+  return value && typeof value === "object" && "expiresAt" in value && typeof value.expiresAt === "string" ? value.expiresAt : undefined;
+}
+async function renewAgentSessionLease(client, projectId, context) {
+  if (!context?.leaseId) {
+    return context;
+  }
+  const expiresAt = leaseExpiresAt(defaultLeaseTtlSeconds);
+  const renewed = await client.sessions.leases.renew({
+    projectId,
+    leaseId: context.leaseId,
+    lease: {
+      expiresAt,
+      ...commandMetadata()
+    }
+  });
+  return {
+    ...context,
+    leaseId: objectStringId(renewed) ?? context.leaseId,
+    leaseExpiresAt: leaseExpiresAtFromResponse(renewed) ?? expiresAt,
+    capturedAt: new Date().toISOString()
+  };
+}
+async function renewAgentSessionLeaseBestEffort(client, projectId, context) {
+  try {
+    return await renewAgentSessionLease(client, projectId, context);
+  } catch {
+    return context;
+  }
+}
 async function readCurrentCadenceContext(client, projectId) {
   const current = await client.sessions.current({
     projectId,
@@ -4864,6 +4903,9 @@ async function runAgentRunIngestStop(parsed, options, config, meta) {
     try {
       const client = await createClient(config, options);
       cadenceContext = await readCurrentCadenceContext(client, projectId) ?? cadenceContext;
+      if (!duplicateTurn) {
+        cadenceContext = await renewAgentSessionLeaseBestEffort(client, projectId, cadenceContext);
+      }
     } catch {}
   }
   const observedSession = {
@@ -5325,6 +5367,8 @@ async function runAgentRunRoute(parsed, options, config, meta) {
     let targetTicketId = currentTicketId;
     let targetSessionId = currentSessionId;
     let targetChangesetId = currentChangesetId;
+    let targetLeaseId = savedContext?.leaseId ?? currentContext?.leaseId;
+    let targetLeaseExpiresAt = savedContext?.leaseExpiresAt ?? currentContext?.leaseExpiresAt;
     let intakeResult;
     let selectedTicket;
     let summary = routePlan.summary ?? routePlan.entries[0]?.summary ?? routePlan.route.reason ?? "Agent run route";
@@ -5354,6 +5398,8 @@ async function runAgentRunRoute(parsed, options, config, meta) {
         ...targetTicketId ? { ticketId: targetTicketId } : {},
         ...targetSessionId ? { sessionId: targetSessionId } : {},
         ...targetChangesetId ? { changesetId: targetChangesetId } : {},
+        ...targetLeaseId ? { leaseId: targetLeaseId } : {},
+        ...targetLeaseExpiresAt ? { leaseExpiresAt: targetLeaseExpiresAt } : {},
         ...eventFile ? { eventFile } : {},
         event,
         prompt,
@@ -5382,6 +5428,8 @@ async function runAgentRunRoute(parsed, options, config, meta) {
             ticketId: targetTicketId,
             ...targetSessionId ? { sessionId: targetSessionId } : {},
             ...targetChangesetId ? { changesetId: targetChangesetId } : {},
+            ...targetLeaseId ? { leaseId: targetLeaseId } : {},
+            ...targetLeaseExpiresAt ? { leaseExpiresAt: targetLeaseExpiresAt } : {},
             capturedAt: checkedAt
           }
         } : {},
@@ -5549,6 +5597,8 @@ async function runAgentRunRoute(parsed, options, config, meta) {
             ...commandMetadata()
           }
         });
+        targetLeaseId = objectStringId(lease);
+        targetLeaseExpiresAt = leaseExpiresAtFromResponse(lease);
         lifecycleOperations.push(checkpointLifecycleOperation("lease.claimed", true, { ticketId: targetTicketId, sessionId: targetSessionId, lease }));
       }
       if (targetSessionId) {
@@ -5638,6 +5688,8 @@ async function runAgentRunCheckpoint(parsed, options, config, meta) {
   const ticketId = parsed.options.ticket ?? savedContext?.ticketId ?? currentContext?.ticketId;
   const sessionId = parsed.options.session ?? savedContext?.sessionId ?? currentContext?.sessionId;
   const changesetId = parsed.options.changeset ?? savedContext?.changesetId ?? currentContext?.changesetId;
+  const leaseId = savedContext?.leaseId ?? currentContext?.leaseId;
+  const leaseExpiresAtValue = savedContext?.leaseExpiresAt ?? currentContext?.leaseExpiresAt;
   if (!ticketId) {
     await writeAgentLoopState(parsed, options, {
       ...state,
@@ -5934,6 +5986,8 @@ async function runAgentRunCheckpoint(parsed, options, config, meta) {
               ticketId,
               ...sessionId ? { sessionId } : {},
               ...changesetId ? { changesetId } : {},
+              ...leaseId ? { leaseId } : {},
+              ...leaseExpiresAtValue ? { leaseExpiresAt: leaseExpiresAtValue } : {},
               capturedAt: checkedAt
             },
             lastCheckpointAt: checkedAt,
@@ -5972,6 +6026,8 @@ async function runAgentRunCheckpoint(parsed, options, config, meta) {
     let targetTicketId = ticketId;
     let targetSessionId = sessionId;
     let targetChangesetId = changesetId;
+    let targetLeaseId = leaseId;
+    let targetLeaseExpiresAt = leaseExpiresAtValue;
     const cadenceWrites = [];
     const lifecycleOperations = [];
     let intakeResult;
@@ -6000,6 +6056,8 @@ async function runAgentRunCheckpoint(parsed, options, config, meta) {
         ticketId: targetTicketId,
         ...targetSessionId ? { sessionId: targetSessionId } : {},
         ...targetChangesetId ? { changesetId: targetChangesetId } : {},
+        ...targetLeaseId ? { leaseId: targetLeaseId } : {},
+        ...targetLeaseExpiresAt ? { leaseExpiresAt: targetLeaseExpiresAt } : {},
         ...eventFile ? { eventFile } : {},
         event,
         prompt,
@@ -6035,6 +6093,8 @@ async function runAgentRunCheckpoint(parsed, options, config, meta) {
               ticketId: targetTicketId,
               ...targetSessionId ? { sessionId: targetSessionId } : {},
               ...targetChangesetId ? { changesetId: targetChangesetId } : {},
+              ...targetLeaseId ? { leaseId: targetLeaseId } : {},
+              ...targetLeaseExpiresAt ? { leaseExpiresAt: targetLeaseExpiresAt } : {},
               capturedAt: checkedAt
             },
             lastCheckpointAt: checkedAt,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trycadence/cli",
-  "version": "0.1.18-dev.0",
+  "version": "0.1.19-dev.0",
   "private": false,
   "type": "module",
   "bin": {