cruo-agent 0.1.15 → 0.1.16

package/dist/VERSION

@@ -1 +1 @@
-0.1.15
+0.1.16

package/dist/cli.js

@@ -15233,6 +15233,15 @@ var init_identity = __esm({
   }
 });
 
+// ../../packages/core/dist/attachments.js
+var MAX_ATTACHMENT_BYTES;
+var init_attachments = __esm({
+  "../../packages/core/dist/attachments.js"() {
+    "use strict";
+    MAX_ATTACHMENT_BYTES = 25 * 1024 * 1024;
+  }
+});
+
 // ../../packages/core/dist/effort.js
 var init_effort = __esm({
   "../../packages/core/dist/effort.js"() {
@@ -15298,6 +15307,7 @@ var init_dist = __esm({
     init_schemas3();
     init_rank();
     init_identity();
+    init_attachments();
     init_effort();
     init_plans();
     init_reports();
@@ -36793,16 +36803,41 @@ var init_dist6 = __esm({
 });
 
 // ../../packages/mcp-kit/dist/context.js
+function decodeJwtExpiry(token) {
+  const parts = token.split(".");
+  if (parts.length !== 3)
+    return null;
+  try {
+    const payload = JSON.parse(Buffer.from(parts[1], "base64url").toString("utf8"));
+    return typeof payload.exp === "number" ? payload.exp * 1e3 : null;
+  } catch {
+    return null;
+  }
+}
+function isExpiredSessionError(error51) {
+  if (!error51)
+    return false;
+  if (error51.code === "PGRST301" || error51.code === "PGRST303")
+    return true;
+  const message = (error51.message ?? "").toLowerCase();
+  return message.includes("jwt expired") || message.includes("jwt is expired") || message.includes("invalid jwt") || message.includes("jws error") || message.includes("token is expired");
+}
+async function resolveContext(options2) {
+  return resolve(options2);
+}
+function refreshBy(ctx) {
+  return ctx.expiresAt != null ? ctx.expiresAt - 6e4 : Date.now() + ASSUMED_SESSION_LIFETIME_MS;
+}
 function createContextResolver(options2) {
   let cached2 = null;
   let inflight = null;
   return async function getContext2() {
-    if (cached2 && cached2.expiresAt > Date.now() + 6e4)
+    if (cached2 && cached2.refreshBy > Date.now())
       return cached2.ctx;
     if (inflight)
       return inflight;
     const attempt = resolve(options2).then((ctx) => {
-      cached2 = { ctx, expiresAt: Date.now() + 50 * 6e4 };
+      cached2 = { ctx, refreshBy: refreshBy(ctx) };
       return ctx;
     });
     inflight = attempt;
@@ -36928,13 +36963,13 @@ function createRemoteContextResolver(options2) {
   let cached2 = null;
   let inflight = null;
   return async function getContext2() {
-    if (cached2 && cached2.expiresAt > Date.now() + 6e4)
+    if (cached2 && cached2.refreshBy > Date.now())
       return cached2.ctx;
     if (inflight)
       return inflight;
     const attempt = fetchDelegatedSession(options2.endpoint, options2.token).then((session) => {
       const ctx = contextFromSession(options2.schema, session);
-      cached2 = { ctx, expiresAt: Date.now() + 50 * 6e4 };
+      cached2 = { ctx, refreshBy: refreshBy(ctx) };
       return ctx;
     });
     inflight = attempt;
@@ -36974,7 +37009,8 @@ function contextFromSession(schema, session) {
     userId: session.userId,
     email: session.email,
     workspaceId: session.workspaceId,
-    workspaceName: session.workspaceName
+    workspaceName: session.workspaceName,
+    expiresAt: decodeJwtExpiry(session.accessToken)
   };
 }
 async function mintContext(options2) {
@@ -36985,7 +37021,8 @@ async function mintContext(options2) {
     userId: principal.userId,
     email: principal.email,
     workspaceId: principal.workspaceId,
-    workspaceName: principal.workspaceName
+    workspaceName: principal.workspaceName,
+    expiresAt: decodeJwtExpiry(accessToken)
   };
 }
 async function resolve(options2) {
@@ -36993,7 +37030,7 @@ async function resolve(options2) {
   const principal = await authenticate({ config: config3, token, product, mintedAt });
   return mintContext({ config: config3, principal, schema });
 }
-var TokenRefused, sessionInFlight, MINT_ATTEMPTS, DELEGATED_SESSION_ENV;
+var TokenRefused, ASSUMED_SESSION_LIFETIME_MS, sessionInFlight, MINT_ATTEMPTS, DELEGATED_SESSION_ENV;
 var init_context = __esm({
   "../../packages/mcp-kit/dist/context.js"() {
     "use strict";
@@ -37005,6 +37042,7 @@ var init_context = __esm({
         this.name = "TokenRefused";
       }
     };
+    ASSUMED_SESSION_LIFETIME_MS = 50 * 6e4;
     sessionInFlight = /* @__PURE__ */ new Map();
     MINT_ATTEMPTS = 3;
     DELEGATED_SESSION_ENV = "CRUO_SESSION";
@@ -46270,6 +46308,11 @@ function getContext() {
   });
   return stdioResolver();
 }
+async function refreshContext() {
+  const token = readToken({ mintedAt: MINTED_AT });
+  const endpoint = sessionEndpoint();
+  return endpoint ? contextFromSession("pm", await fetchDelegatedSession(endpoint, token)) : resolveContext({ config: config2, token, product: "projects", schema: "pm", mintedAt: MINTED_AT });
+}
 function sessionEndpoint() {
   const raw = process.env.CRUO_SESSION_URL;
   if (raw && raw.trim()) return raw.trim();
@@ -46527,6 +46570,56 @@ var init_usage = __esm({
   }
 });
 
+// src/session-renewal.ts
+async function withFreshSession(ctx, attempt, renewal) {
+  const first = await attempt();
+  if (!first.error || !isExpiredSessionError(first.error)) {
+    warnedThisOutage = false;
+    return first;
+  }
+  try {
+    const fresh = await renewal.renew();
+    ctx.client = fresh.client;
+    ctx.userId = fresh.userId;
+    ctx.email = fresh.email;
+    ctx.workspaceId = fresh.workspaceId;
+    ctx.workspaceName = fresh.workspaceName;
+    ctx.expiresAt = fresh.expiresAt;
+    warnedThisOutage = false;
+    return await attempt();
+  } catch (error51) {
+    if (!warnedThisOutage) {
+      warnedThisOutage = true;
+      renewal.log(
+        `! this agent's session expired and could not be renewed: ${error51 instanceof Error ? error51.message : String(error51)}`
+      );
+      renewal.log(
+        `  board writes will keep failing until this is fixed \u2014 the run in progress is not killed for it.`
+      );
+    }
+    return first;
+  }
+}
+var warnedThisOutage;
+var init_session_renewal = __esm({
+  "src/session-renewal.ts"() {
+    "use strict";
+    init_dist7();
+    warnedThisOutage = false;
+  }
+});
+
+// src/claim.ts
+function interpretClaim(data, error51) {
+  if (error51) return { taken: false, heldElsewhere: false, message: error51.message };
+  return data === true ? { taken: true } : { taken: false, heldElsewhere: true };
+}
+var init_claim = __esm({
+  "src/claim.ts"() {
+    "use strict";
+  }
+});
+
 // src/harness-signal.ts
 function refusalIn(stdout) {
   if (!stdout.trim()) return null;
@@ -46725,6 +46818,48 @@ var init_pacing = __esm({
   }
 });
 
+// src/wake-clock.ts
+function tickWakeClock(clock, now, tickMs, timeoutMs) {
+  const elapsed = now - clock.lastTickAt;
+  const sleepThresholdMs = tickMs * 4;
+  const asleep = elapsed > sleepThresholdMs;
+  const creditedMs = asleep ? tickMs : Math.max(elapsed, 0);
+  const awakeMs = clock.awakeMs + creditedMs;
+  const wokeAfterMs = asleep ? elapsed - tickMs : null;
+  return {
+    next: {
+      awakeMs,
+      lastTickAt: now,
+      sawSleep: clock.sawSleep || asleep
+    },
+    wokeAfterMs,
+    timedOut: awakeMs >= timeoutMs
+  };
+}
+function killSaysNothingAboutCard(run) {
+  return run.killed && run.sawSleep;
+}
+function humanDuration(ms2) {
+  const totalSeconds = Math.max(0, Math.round(ms2 / 1e3));
+  const h = Math.floor(totalSeconds / 3600);
+  const m = Math.floor(totalSeconds % 3600 / 60);
+  const s = totalSeconds % 60;
+  if (h > 0) return `${h}h${m}m`;
+  if (m > 0) return `${m}m${s}s`;
+  return `${s}s`;
+}
+var freshWakeClock;
+var init_wake_clock = __esm({
+  "src/wake-clock.ts"() {
+    "use strict";
+    freshWakeClock = (now) => ({
+      awakeMs: 0,
+      lastTickAt: now,
+      sawSleep: false
+    });
+  }
+});
+
 // src/queries.ts
 function blocksAgentPickup(state) {
   return state.requires_human === true;
@@ -47042,15 +47177,19 @@ async function pollMentions(ctx, identity) {
 }
 async function claim(ctx, hit) {
   const ttlMs = options.harnessTimeoutMs + 3e4;
-  const { data, error: error51 } = await ctx.client.schema("public").rpc("claim_issue", {
-    issue: hit.issue.id,
-    ttl_ms: ttlMs
-  });
-  if (error51) {
-    log(`  could not claim ${hit.ref}: ${error51.message} \u2014 leaving it`);
-    return false;
+  const { data, error: error51 } = await withFreshSession(
+    ctx,
+    () => ctx.client.schema("public").rpc("claim_issue", {
+      issue: hit.issue.id,
+      ttl_ms: ttlMs
+    }),
+    sessionRenewal
+  );
+  const outcome = interpretClaim(data, error51);
+  if (!outcome.taken && !outcome.heldElsewhere) {
+    log(`  could not claim ${hit.ref}: ${outcome.message} \u2014 leaving it`);
   }
-  return data === true;
+  return outcome;
 }
 async function claimedElsewhere(ctx, hits) {
   if (hits.length === 0) return /* @__PURE__ */ new Set();
@@ -47062,12 +47201,20 @@ async function claimedElsewhere(ctx, hits) {
   return new Set((data ?? []).map((r) => r.issue_id));
 }
 async function release(ctx, hit) {
-  const { error: error51 } = await ctx.client.schema("pm").from("issue_claims").delete().eq("issue_id", hit.issue.id).eq("claimed_by", ctx.userId);
+  const { error: error51 } = await withFreshSession(
+    ctx,
+    () => ctx.client.schema("pm").from("issue_claims").delete().eq("issue_id", hit.issue.id).eq("claimed_by", ctx.userId),
+    sessionRenewal
+  );
   if (error51) log(`  could not release ${hit.ref}: ${error51.message}`);
 }
 async function markRead(ctx, notificationIds) {
   if (notificationIds.length === 0) return;
-  const { error: error51 } = await ctx.client.schema("public").from("notifications").update({ read_at: (/* @__PURE__ */ new Date()).toISOString() }).in("id", notificationIds);
+  const { error: error51 } = await withFreshSession(
+    ctx,
+    () => ctx.client.schema("public").from("notifications").update({ read_at: (/* @__PURE__ */ new Date()).toISOString() }).in("id", notificationIds),
+    sessionRenewal
+  );
   if (error51) log(`  could not mark ${notificationIds.length} mention(s) read: ${error51.message}`);
 }
 async function writeMcpConfig() {
@@ -47351,14 +47498,29 @@ async function invokeHarness(ctx, identity, hit, worktree) {
       });
       child.stderr?.on("data", (c) => process.stderr.write(c));
       let killed = false;
-      const timer = setTimeout(() => {
-        killed = true;
-        log(`  harness exceeded ${options.harnessTimeoutMs / 1e3}s \u2014 killing it`);
-        child.kill("SIGTERM");
-        setTimeout(() => child.kill("SIGKILL"), 1e4).unref();
-      }, options.harnessTimeoutMs);
+      const WAKE_TICK_MS = 5e3;
+      let wakeClock = freshWakeClock(Date.now());
+      const wakeTimer = setInterval(() => {
+        const step = tickWakeClock(wakeClock, Date.now(), WAKE_TICK_MS, options.harnessTimeoutMs);
+        wakeClock = step.next;
+        if (step.wokeAfterMs !== null) {
+          log(`  machine slept for ${humanDuration(step.wokeAfterMs)} \u2014 not counted against ${hit.ref}`);
+          void claim(ctx, hit).catch(() => {
+          });
+        }
+        if (step.timedOut && !killed) {
+          killed = true;
+          clearInterval(wakeTimer);
+          log(
+            `  harness exceeded ${options.harnessTimeoutMs / 1e3}s awake` + (wakeClock.sawSleep ? " (excluding sleep) \u2014 killing it" : " \u2014 killing it")
+          );
+          child.kill("SIGTERM");
+          setTimeout(() => child.kill("SIGKILL"), 1e4).unref();
+        }
+      }, WAKE_TICK_MS);
+      wakeTimer.unref?.();
       child.on("error", (e) => {
-        clearTimeout(timer);
+        clearInterval(wakeTimer);
         log(`  harness failed to start: ${e.message}`);
         resolve2({
           code: 127,
@@ -47367,6 +47529,7 @@ async function invokeHarness(ctx, identity, hit, worktree) {
           durationMs: Date.now() - startedAtMs,
           usage: null,
           killed,
+          sawSleep: wakeClock.sawSleep,
           stdoutHead: headFor(head2),
           openingContext: null,
           systemPromptChars: systemPromptText.length,
@@ -47374,7 +47537,7 @@ async function invokeHarness(ctx, identity, hit, worktree) {
         });
       });
       child.on("close", (code) => {
-        clearTimeout(timer);
+        clearInterval(wakeTimer);
         if (streaming && pending.trim() !== "") {
           tail = pending;
           if (openingContext === null) openingContext = turnUsageIn(pending);
@@ -47390,6 +47553,7 @@ async function invokeHarness(ctx, identity, hit, worktree) {
           durationMs: Date.now() - startedAtMs,
           usage: usageIn(tail),
           killed,
+          sawSleep: wakeClock.sawSleep,
           stdoutHead: headFor(head2),
           openingContext,
           systemPromptChars: systemPromptText.length,
@@ -47414,25 +47578,33 @@ async function loadAttempts(ctx, hits) {
 }
 async function recordAttempt(ctx, hit, outcome, previous) {
   const attempts = previous + 1;
-  const { error: error51 } = await ctx.client.from("issue_attempts").upsert(
-    {
-      issue_id: hit.issue.id,
-      agent_id: ctx.userId,
-      reason: hit.reason,
-      attempts,
-      last_tried_at: (/* @__PURE__ */ new Date()).toISOString(),
-      last_outcome: outcome,
-      // Stamped at the moment the budget runs out, so the board can say when
-      // the automation gave up rather than only that it did.
-      set_aside_at: attempts >= options.maxAttempts ? (/* @__PURE__ */ new Date()).toISOString() : null
-    },
-    { onConflict: "issue_id,agent_id,reason" }
+  const { error: error51 } = await withFreshSession(
+    ctx,
+    () => ctx.client.from("issue_attempts").upsert(
+      {
+        issue_id: hit.issue.id,
+        agent_id: ctx.userId,
+        reason: hit.reason,
+        attempts,
+        last_tried_at: (/* @__PURE__ */ new Date()).toISOString(),
+        last_outcome: outcome,
+        // Stamped at the moment the budget runs out, so the board can say when
+        // the automation gave up rather than only that it did.
+        set_aside_at: attempts >= options.maxAttempts ? (/* @__PURE__ */ new Date()).toISOString() : null
+      },
+      { onConflict: "issue_id,agent_id,reason" }
+    ),
+    sessionRenewal
   );
   if (error51) log(`  could not record the attempt on ${hit.ref}: ${error51.message}`);
   return attempts;
 }
 async function clearAttempts(ctx, hit) {
-  const { error: error51 } = await ctx.client.from("issue_attempts").delete().eq("issue_id", hit.issue.id).eq("agent_id", ctx.userId).eq("reason", hit.reason);
+  const { error: error51 } = await withFreshSession(
+    ctx,
+    () => ctx.client.from("issue_attempts").delete().eq("issue_id", hit.issue.id).eq("agent_id", ctx.userId).eq("reason", hit.reason),
+    sessionRenewal
+  );
   if (error51) log(`  could not clear attempts on ${hit.ref}: ${error51.message}`);
 }
 async function repliedSince(ctx, hit, since2) {
@@ -47464,20 +47636,24 @@ async function publish(ctx, hit, worktree) {
   }
 }
 async function beat(ctx, fields) {
-  const { error: error51 } = await ctx.client.from("agent_heartbeats").upsert(
-    {
-      user_id: ctx.userId,
-      workspace_id: ctx.workspaceId,
-      last_seen_at: (/* @__PURE__ */ new Date()).toISOString(),
-      holding: fields.holding,
-      dead_ticks: fields.deadTicks,
-      poll_interval_ms: fields.intervalMs,
-      // CRA-102. Without this the board cannot tell an agent someone paused
-      // from one that is wading through a backlog, nor one stopped on purpose
-      // from one whose laptop shut its lid — all of them simply went quiet.
-      status: fields.status ?? (paused ? "paused" : "running")
-    },
-    { onConflict: "user_id,workspace_id" }
+  const { error: error51 } = await withFreshSession(
+    ctx,
+    () => ctx.client.from("agent_heartbeats").upsert(
+      {
+        user_id: ctx.userId,
+        workspace_id: ctx.workspaceId,
+        last_seen_at: (/* @__PURE__ */ new Date()).toISOString(),
+        holding: fields.holding,
+        dead_ticks: fields.deadTicks,
+        poll_interval_ms: fields.intervalMs,
+        // CRA-102. Without this the board cannot tell an agent someone paused
+        // from one that is wading through a backlog, nor one stopped on purpose
+        // from one whose laptop shut its lid — all of them simply went quiet.
+        status: fields.status ?? (paused ? "paused" : "running")
+      },
+      { onConflict: "user_id,workspace_id" }
+    ),
+    sessionRenewal
   );
   if (error51) log(`  could not record a heartbeat: ${error51.message}`);
   lastHolding = fields.holding;
@@ -47506,28 +47682,32 @@ function beatWhileBusy(ctx, deadTicks) {
   return () => clearInterval(timer);
 }
 async function recordRun(ctx, hit, run, outcome) {
-  const { error: error51 } = await ctx.client.from("harness_runs").insert({
-    agent_id: ctx.userId,
-    workspace_id: ctx.workspaceId,
-    issue_id: hit.issue.id,
-    reason: hit.reason,
-    duration_ms: run.durationMs,
-    exit_code: run.code,
-    stdout_bytes: run.stdoutBytes,
-    stdout_head: run.stdoutHead,
-    outcome,
-    model: run.usage?.model ?? null,
-    input_tokens: run.usage?.inputTokens ?? null,
-    output_tokens: run.usage?.outputTokens ?? null,
-    cache_read_tokens: run.usage?.cacheReadTokens ?? null,
-    cache_write_tokens: run.usage?.cacheWriteTokens ?? null,
-    cost_usd: run.usage?.costUsd ?? null,
-    opening_context_input_tokens: run.openingContext?.inputTokens ?? null,
-    opening_context_cache_read_tokens: run.openingContext?.cacheReadTokens ?? null,
-    opening_context_cache_write_tokens: run.openingContext?.cacheWriteTokens ?? null,
-    system_prompt_chars: run.systemPromptChars,
-    user_prompt_chars: run.userPromptChars
-  });
+  const { error: error51 } = await withFreshSession(
+    ctx,
+    () => ctx.client.from("harness_runs").insert({
+      agent_id: ctx.userId,
+      workspace_id: ctx.workspaceId,
+      issue_id: hit.issue.id,
+      reason: hit.reason,
+      duration_ms: run.durationMs,
+      exit_code: run.code,
+      stdout_bytes: run.stdoutBytes,
+      stdout_head: run.stdoutHead,
+      outcome,
+      model: run.usage?.model ?? null,
+      input_tokens: run.usage?.inputTokens ?? null,
+      output_tokens: run.usage?.outputTokens ?? null,
+      cache_read_tokens: run.usage?.cacheReadTokens ?? null,
+      cache_write_tokens: run.usage?.cacheWriteTokens ?? null,
+      cost_usd: run.usage?.costUsd ?? null,
+      opening_context_input_tokens: run.openingContext?.inputTokens ?? null,
+      opening_context_cache_read_tokens: run.openingContext?.cacheReadTokens ?? null,
+      opening_context_cache_write_tokens: run.openingContext?.cacheWriteTokens ?? null,
+      system_prompt_chars: run.systemPromptChars,
+      user_prompt_chars: run.userPromptChars
+    }),
+    sessionRenewal
+  );
   if (error51 && !warnedAboutSpendTable) {
     warnedAboutSpendTable = true;
     log(`  (not recording run costs: ${error51.message})`);
@@ -47597,8 +47777,9 @@ async function tick(ctx, identity, deadTicks, allowance) {
     invoked += 1;
     const before = { status: hit.issue.status_id, assignee: hit.issue.assignee_id };
     const startedAt = (/* @__PURE__ */ new Date()).toISOString();
-    if (!await claim(ctx, hit)) {
-      log(`  ${hit.ref} is being worked by another agent \u2014 skipping`);
+    const claimed = await claim(ctx, hit);
+    if (!claimed.taken) {
+      if (claimed.heldElsewhere) log(`  ${hit.ref} is being worked by another agent \u2014 skipping`);
       continue;
     }
     let worktree = null;
@@ -47679,6 +47860,9 @@ async function tick(ctx, identity, deadTicks, allowance) {
       } else {
         log(`  ${hit.ref} handed on (harness exit ${code})`);
       }
+    } else if (killSaysNothingAboutCard(run)) {
+      const note = salvaged ? `killed after the machine slept mid-run (exit ${code}); cut short, work saved as ${salvaged.slice(0, 8)}` : `killed after the machine slept mid-run (exit ${code})`;
+      log(`  ${hit.ref} ${note} \u2014 not counted against this issue`);
     } else {
       const what = hit.reason === "mention" ? "no reply written" : "unchanged";
       const note = salvaged ? `${what} (exit ${code}); cut short, work saved as ${salvaged.slice(0, 8)}` : `${what} (exit ${code})`;
@@ -47910,7 +48094,7 @@ to catch: a second supervisor nothing could see or stop.
     if (stopping) return;
   }
 }
-var argv, flag, opt, num2, ms, readOptions, options, log, worktreeConfig, lastRefusal, CONFIG_DIR_PREFIX, CRUO_OWNED_ENV, HEAD_STORED, lastHolding, warnedAboutSpendTable, stopping, paused, stopRequestedAt, currentRun, pendingWait;
+var argv, flag, opt, num2, ms, readOptions, options, log, sessionRenewal, worktreeConfig, lastRefusal, CONFIG_DIR_PREFIX, CRUO_OWNED_ENV, HEAD_STORED, lastHolding, warnedAboutSpendTable, stopping, paused, stopRequestedAt, currentRun, pendingWait;
 var init_supervisor = __esm({
   "src/supervisor.ts"() {
     "use strict";
@@ -47918,10 +48102,13 @@ var init_supervisor = __esm({
     init_dist7();
     init_env2();
     init_auth();
+    init_session_renewal();
+    init_claim();
     init_options();
     init_harness_signal();
     init_process();
     init_pacing();
+    init_wake_clock();
     init_queries();
     init_worktree();
     argv = process.argv.slice(2);
@@ -48079,6 +48266,7 @@ cruo-supervisor: ${error51.message}
       }
     })();
     log = (...parts) => console.log(`[${(/* @__PURE__ */ new Date()).toLocaleTimeString("en-GB", { hour12: false })}]`, ...parts);
+    sessionRenewal = { renew: refreshContext, log };
     worktreeConfig = null;
     lastRefusal = null;
     CONFIG_DIR_PREFIX = "cruo-sup-";