@trycadence/cli 0.1.18-dev.0 → 0.1.21-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.21-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 } : {};
@@ -3355,9 +3358,38 @@ async function writeAgentCheckpointAuditFile(parsed, options, audit) {
 `);
   return filePath;
 }
+async function readAgentLoopLockHolder(lockPath) {
+  try {
+    const text = await readFile(join(lockPath, "holder.json"), "utf8");
+    const parsed = JSON.parse(text);
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+function lockHolderPid(holder) {
+  const pid = holder?.pid;
+  return typeof pid === "number" && Number.isInteger(pid) && pid > 0 ? pid : null;
+}
+function processIsRunning(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    if (error && typeof error === "object" && "code" in error && error.code === "ESRCH") {
+      return false;
+    }
+    return true;
+  }
+}
 async function removeStaleAgentLoopLock(lockPath) {
   try {
     const lockStats = await stat(lockPath);
+    const holderPid = lockHolderPid(await readAgentLoopLockHolder(lockPath));
+    if (holderPid !== null && !processIsRunning(holderPid)) {
+      await rm(lockPath, { recursive: true, force: true });
+      return true;
+    }
     if (Date.now() - lockStats.mtimeMs < defaultCheckpointWorkerTimeoutMs) {
       return false;
     }
@@ -3501,6 +3533,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 +3559,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 +3568,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,
@@ -3566,18 +3634,6 @@ function shouldSkipForCooldown(state, cooldownSeconds) {
   const lastCheckpointMs = new Date(state.lastCheckpointAt).getTime();
   return !Number.isNaN(lastCheckpointMs) && Date.now() - lastCheckpointMs < cooldownSeconds * 1000;
 }
-function synthesizeAgentEventFromSession(agentSessionKeyValue, session, options) {
-  return {
-    source: session.source,
-    event: "checkpoint",
-    workspacePath: options.cwd ?? process.cwd(),
-    occurredAt: new Date().toISOString(),
-    agentSessionKey: agentSessionKeyValue,
-    ...session.lastAssistantMessage ? { lastAssistantMessage: session.lastAssistantMessage } : {},
-    ...session.recentTurns?.length ? { recentTurns: session.recentTurns } : {},
-    payloadKeys: []
-  };
-}
 var checkpointRouteActions = ["current", "noop", "intake_create", "intake_attach", "switch_existing", "needs_human"];
 var checkpointConfidenceLevels = ["low", "medium", "high"];
 var checkpointSessionActions = ["keep", "handoff", "end", "complete_ticket"];
@@ -4216,6 +4272,9 @@ function buildRoutePrompt(input) {
     "You are generating a compact Cadence dogfood routing plan for an agent-run worker.",
     "The model judges; the Cadence CLI validates and executes. Return JSON only. Do not call tools to mutate Cadence yourself.",
     "Decide where this agent session belongs before checkpoint memory is written.",
+    "First decide whether the latest request is directed at this source agent to perform work, or whether this is a meta/utility task about quoted conversation content.",
+    "If the transcript asks this agent to generate a title, branch name, label, summary, classification, or other metadata for quoted user text, treat the quoted work as reference material, not active work for this agent.",
+    "For those meta/utility cases, return route.action noop with entries [] even when the quoted text describes durable repo work.",
     "Do not include raw diffs, raw transcripts, terminal logs, tool streams, secrets, file contents, or model reasoning in server-bound fields.",
     'Return this sparse JSON shape: {"summary":"short routing summary","sessionTitle":{"text":"short GUI session title","confidence":"low|medium|high","reason":"why this title names the routed focus"},"route":{"action":"current|noop|intake_create|intake_attach|switch_existing","confidence":"low|medium|high","reason":"short reason","request":"natural language intake request when intake is needed","targetTicketId":"optional existing ticket id"},"entries":[{"kind":"intent|decision|rationale|action|verification|blocker|correction|note","summary":"short entry summary","body":"safe Cadence work-log body"}],"files":[{"path":"relative/path.ts","kind":"added|modified|deleted|renamed|unknown"}]}',
     "Generate sessionTitle only when the routed focus is durable enough to name a GUI row. Omit it for noop/filler. Keep it under 80 characters and do not reuse the latest checkpoint summary as the title.",
@@ -4252,6 +4311,8 @@ function buildRouteCandidatePrompt(input) {
     "You are resolving Cadence agent-run routing after intake returned possible existing work.",
     "Intake is retrieval, not the final decision. The model judges; the Cadence CLI validates and executes. Return JSON only.",
     "Choose whether this agent session should create a new ticket, attach/switch to one concrete candidate ticket, keep the current context, or no-op.",
+    "Before choosing a candidate, decide whether the latest request is directed at this source agent to perform work, or whether this is a meta/utility task about quoted conversation content.",
+    "If the transcript asks this agent to generate a title, branch name, label, summary, classification, or other metadata for quoted user text, return noop and do not attach/create/switch based on the quoted work.",
     "Use intake_create when the recent request is durable and the candidates are weak, adjacent, completed, or not concrete matches.",
     "Use intake_attach or switch_existing only when one candidate ticket is clearly the same work. You must include targetTicketId from the candidate list.",
     "Use current only when the saved/current Cadence context clearly fits the recent work.",
@@ -4864,6 +4925,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 = {
@@ -4883,6 +4947,11 @@ async function runAgentRunIngestStop(parsed, options, config, meta) {
     ...normalized.lastAssistantMessage ? { lastAssistantMessage: normalized.lastAssistantMessage } : {},
     ...recentTurns ? { recentTurns } : {}
   };
+  let observedEventFile;
+  const ensureObservedEventFile = async () => {
+    observedEventFile ??= await writeAgentEventFile(parsed, options, normalized);
+    return observedEventFile;
+  };
   const countedState = {
     ...state,
     sessions: {
@@ -4907,7 +4976,7 @@ async function runAgentRunIngestStop(parsed, options, config, meta) {
     };
   }
   if (!savedCadenceContext?.ticketId) {
-    const eventFile2 = await writeAgentEventFile(parsed, options, normalized);
+    const eventFile2 = await ensureObservedEventFile();
     const lockPath2 = agentLoopLockPath(parsed, options, normalized.agentSessionKey);
     const workerArgs2 = [
       "agent-run",
@@ -5009,13 +5078,24 @@ async function runAgentRunIngestStop(parsed, options, config, meta) {
     };
   }
   if (nextCount < threshold) {
-    await writeAgentLoopState(parsed, options, countedState);
+    const eventFile2 = await ensureObservedEventFile();
+    await writeAgentLoopState(parsed, options, {
+      ...state,
+      sessions: {
+        ...state.sessions,
+        [normalized.agentSessionKey]: {
+          ...observedSession,
+          lastEventFile: eventFile2
+        }
+      }
+    });
     const data2 = {
       action: duplicateTurn ? "updated" : "counted",
       ...duplicateTurn ? { reason: "duplicate_turn" } : {},
       agentSessionKey: normalized.agentSessionKey,
       stopCount: nextCount,
-      threshold
+      threshold,
+      eventFile: eventFile2
     };
     return {
       stdout: parsed.flags.json ? formatJson(successEnvelope(data2, meta)) : `${JSON.stringify(data2, null, 2)}
@@ -5077,7 +5157,7 @@ async function runAgentRunIngestStop(parsed, options, config, meta) {
       exitCode: 0
     };
   }
-  const eventFile = await writeAgentEventFile(parsed, options, normalized);
+  const eventFile = await ensureObservedEventFile();
   const lockPath = agentLoopLockPath(parsed, options, normalized.agentSessionKey);
   const workerArgs = [
     "agent-run",
@@ -5217,9 +5297,35 @@ async function runAgentRunRoute(parsed, options, config, meta) {
     });
   }
   const savedContext = sessionState.cadenceContext;
-  const currentContext = savedContext?.ticketId ? undefined : await readCurrentCadenceContext(client, projectId);
   const eventFile = parsed.options["event-file"] ?? sessionState.lastEventFile;
-  const event = eventFile ? tryParseJsonObject(await readFile(eventFile, "utf8"), eventFile) : synthesizeAgentEventFromSession(agentSessionKeyValue, sessionState, options);
+  if (!eventFile || !existsSync(eventFile)) {
+    await writeAgentLoopState(parsed, options, {
+      ...state,
+      sessions: {
+        ...state.sessions,
+        [agentSessionKeyValue]: {
+          ...sessionState,
+          stopCount: 0,
+          threshold: defaultCheckpointThresholdValue(),
+          lastAction: "skipped",
+          lastReason: "no_event_file"
+        }
+      }
+    });
+    const data = {
+      action: "skipped",
+      reason: "no_event_file",
+      agentSessionKey: agentSessionKeyValue
+    };
+    return {
+      stdout: parsed.flags.json ? formatJson(successEnvelope(data, meta)) : `${JSON.stringify(data, null, 2)}
+`,
+      stderr: "",
+      exitCode: 0
+    };
+  }
+  const event = tryParseJsonObject(await readFile(eventFile, "utf8"), eventFile);
+  const currentContext = savedContext?.ticketId ? undefined : await readCurrentCadenceContext(client, projectId);
   const checkpointSettings = await resolveCheckpointSettings(parsed, options);
   const gitStatus = gitOutput(["status", "--short"], options);
   const gitDiffStat = gitOutput(["diff", "--stat", "origin/dev..."], options);
@@ -5325,6 +5431,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 +5462,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 +5492,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 +5661,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 +5752,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,
@@ -5663,7 +5779,36 @@ async function runAgentRunCheckpoint(parsed, options, config, meta) {
     };
   }
   const eventFile = parsed.options["event-file"] ?? sessionState.lastEventFile;
-  const event = eventFile ? tryParseJsonObject(await readFile(eventFile, "utf8"), eventFile) : synthesizeAgentEventFromSession(agentSessionKeyValue, sessionState, options);
+  if (!eventFile || !existsSync(eventFile)) {
+    await writeAgentLoopState(parsed, options, {
+      ...state,
+      sessions: {
+        ...state.sessions,
+        [agentSessionKeyValue]: {
+          ...sessionState,
+          stopCount: 0,
+          threshold: defaultCheckpointThresholdValue(),
+          lastAction: "skipped",
+          lastReason: "no_event_file"
+        }
+      }
+    });
+    const data = {
+      action: "skipped",
+      reason: "no_event_file",
+      agentSessionKey: agentSessionKeyValue,
+      ...ticketId ? { ticketId } : {},
+      ...sessionId ? { sessionId } : {},
+      ...changesetId ? { changesetId } : {}
+    };
+    return {
+      stdout: parsed.flags.json ? formatJson(successEnvelope(data, meta)) : `${JSON.stringify(data, null, 2)}
+`,
+      stderr: "",
+      exitCode: 0
+    };
+  }
+  const event = tryParseJsonObject(await readFile(eventFile, "utf8"), eventFile);
   const mode = checkpointModeForCommand(parsed);
   const logKind = parseWorkLogEntryKind(parsed.options["log-kind"] ?? "note");
   const updateSummary = parseBooleanOption(parsed.options["update-summary"], false);
@@ -5934,6 +6079,8 @@ async function runAgentRunCheckpoint(parsed, options, config, meta) {
               ticketId,
               ...sessionId ? { sessionId } : {},
               ...changesetId ? { changesetId } : {},
+              ...leaseId ? { leaseId } : {},
+              ...leaseExpiresAtValue ? { leaseExpiresAt: leaseExpiresAtValue } : {},
               capturedAt: checkedAt
             },
             lastCheckpointAt: checkedAt,
@@ -5972,6 +6119,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 +6149,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 +6186,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,
@@ -6272,7 +6425,25 @@ async function runAgentRunSweep(parsed, options, config, meta) {
     for (const staleSession of staleSessions) {
       const existingSession = nextState.sessions[staleSession.agentSessionKey];
       const hasContext = Boolean(existingSession?.cadenceContext?.ticketId);
+      const eventFile = existingSession?.lastEventFile;
       if (existingSession) {
+        if (!eventFile || !existsSync(eventFile)) {
+          nextState = {
+            ...nextState,
+            sessions: {
+              ...nextState.sessions,
+              [staleSession.agentSessionKey]: {
+                ...existingSession,
+                stopCount: 0,
+                threshold: defaultCheckpointThresholdValue(),
+                lastAction: "skipped",
+                lastReason: "no_event_file"
+              }
+            }
+          };
+          await writeAgentLoopState(parsed, options, nextState);
+          continue;
+        }
         nextState = {
           ...nextState,
           sessions: {
@@ -6285,6 +6456,7 @@ async function runAgentRunSweep(parsed, options, config, meta) {
         };
         await writeAgentLoopState(parsed, options, nextState);
       }
+      const realEventFile = eventFile;
       await spawnAgentRunCheckpoint([
         "agent-run",
         hasContext ? "checkpoint" : "route",
@@ -6292,6 +6464,8 @@ async function runAgentRunSweep(parsed, options, config, meta) {
         staleSession.agentSessionKey,
         "--reason",
         hasContext ? "idle" : "missing_context",
+        "--event-file",
+        realEventFile,
         "--lock",
         agentLoopLockPath(parsed, options, staleSession.agentSessionKey),
         ...parsed.flags.project ? ["--project", parsed.flags.project] : [],

package/package.json

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