@kevin5251984/guild 0.2.20 → 0.2.22

package/src/handlers.ts

@@ -75,6 +75,8 @@ export type HandlerExtras = {
   turn?: (input: Parameters<typeof chatReply>[0]) => Promise<ChatReply>;
   /** Bot ids the client already resolved from @mentions. */
   mentions?: string[];
+  /** Hermes: cron child sessions cannot manage cron. */
+  cronRun?: boolean;
 };
 
 export function healthPayload(): HealthResponse {
@@ -522,6 +524,7 @@ export function workspace(store: GuildStore) {
         startedAt: turn.startedAt || "",
         thinking: turn.thinking,
         steps: turn.steps,
+        ...(turn.paused ? { paused: true } : {}),
       },
     ];
   });
@@ -913,6 +916,8 @@ export function chatTurnForBot(
     history,
     userMessage,
     dataDir: store.dataDir,
+    roomId,
+    botId,
     model: detail.model ?? null,
     skills: mergeSkillRefs(
       staffedSkills(store, botId),
@@ -996,6 +1001,7 @@ function publicLiveTurn(live: LiveTurn): LiveTurn {
     thinking: live.thinking,
     steps: live.steps,
     startedAt: live.startedAt,
+    ...(live.paused ? { paused: true } : {}),
   };
 }
 
@@ -1085,6 +1091,84 @@ export function abortLiveTurn(
   return { ok: true };
 }
 
+export function pauseLiveTurn(
+  store: GuildStore,
+  roomId: string,
+  botId?: string,
+) {
+  if (!store.getRoom(roomId)) throw new StoreError(404, "room not found");
+  const live = botId
+    ? store.getLiveBotTurn(roomId, botId)
+    : store.getLiveTurn(roomId);
+  if (live?.paused) return { ok: true, paused: true as const };
+  const had = store.pauseTurn(roomId, botId);
+  if (!live && !had) throw new StoreError(409, "no live turn");
+  return { ok: true, paused: true as const };
+}
+
+function resumeSteer(live: LiveTurn): string {
+  const lines = [
+    "Paused mid-turn so the user could switch models. Continue from here. Do not redo finished tools unless you need a different result.",
+  ];
+  const thinking = (live.thinking || "").trim();
+  if (thinking) lines.push(`Thinking so far:\n${thinking.slice(0, 6000)}`);
+  const tools = (live.traces || []).filter((tr) => tr.name && tr.name !== "think");
+  if (tools.length) {
+    lines.push(
+      "Tools already run:\n" +
+        tools
+          .slice(-20)
+          .map((tr) => {
+            const bit = String(tr.text || "")
+              .replace(/\s+/g, " ")
+              .trim()
+              .slice(0, 400);
+            return `- ${tr.name}${bit ? `: ${bit}` : ""}`;
+          })
+          .join("\n"),
+    );
+  }
+  return lines.join("\n\n");
+}
+
+export async function continueLiveTurn(
+  store: GuildStore,
+  roomId: string,
+  botId: string,
+  env: NodeJS.ProcessEnv = process.env,
+  extras: HandlerExtras = {},
+) {
+  if (!store.getRoom(roomId)) throw new StoreError(404, "room not found");
+  const id = botId.trim();
+  if (!id) throw new StoreError(400, "botId is required");
+  const live = store.getLiveBotTurn(roomId, id);
+  if (!live?.paused) throw new StoreError(409, "no paused turn");
+  const messages = store.listMessages(roomId);
+  let userIndex = messages.length - 1;
+  while (userIndex >= 0 && messages[userIndex].author !== "you") userIndex -= 1;
+  if (userIndex < 0) throw new StoreError(400, "no user message to continue");
+  const userMessage = messages[userIndex];
+  const asked = live.asked?.trim() || userMessage.body.trim();
+  if (!asked) throw new StoreError(409, "nothing to continue");
+  const history = messages.slice(0, userIndex).map(toHistoryItem);
+  const parent = parentMessage(messages.slice(0, userIndex), userMessage.replyTo);
+  const room = store.getRoom(roomId);
+  store.setLiveTurn(roomId, { ...live, paused: false });
+  store.pushSteer(roomId, resumeSteer(live), id);
+  const replies = await generateReplies(
+    store,
+    roomId,
+    room?.memberIds ?? [id],
+    { ...userMessage, body: asked },
+    history,
+    id,
+    env,
+    parent,
+    extras,
+  );
+  return { replies };
+}
+
 function isAbortError(err: unknown): boolean {
   return Boolean(
     err &&
@@ -1169,14 +1253,19 @@ async function generateReplies(
     if (!memberIds.includes(botId)) return;
     if (signal.aborted) return;
     const prev = store.getLiveBotTurn(roomId, botId);
+    if (!prev || prev.paused) return;
     const startedAt = prev?.startedAt || new Date().toISOString();
     store.dropLastFailedReply(roomId, botId);
     store.setLiveTurn(roomId, {
       botId,
       thinking: prev?.thinking || "",
       steps: prev?.steps || [],
+      traces: prev?.traces,
+      asked: turnAsked,
       startedAt,
+      paused: false,
     });
+    const botSignal = store.armBotTurn(roomId, botId, signal);
     let generated;
     try {
       generated = await (extras.turn ?? chatReply)({
@@ -1189,10 +1278,12 @@ async function generateReplies(
           userMessage.body,
         ),
         env,
-        signal,
+        signal: botSignal,
         mcpTools,
+        ...(extras.cronRun ? { cronRun: true } : {}),
         onProgress: (update) => {
           const prev = store.getLiveBotTurn(roomId, botId);
+          if (prev?.paused) return;
           const next = toLiveTurn(botId, update);
           const handoff = (prev?.steps || []).find((step) => step.name === "handoff");
           const pendingSteers = store.peekSteers(roomId, botId).map((text) => ({
@@ -1209,14 +1300,16 @@ async function generateReplies(
           );
           store.setLiveTurn(roomId, {
             ...next,
+            asked: prev?.asked || turnAsked,
             startedAt: prev?.startedAt || startedAt,
+            paused: false,
             steps: [...(handoff ? [handoff] : []), ...keptSteer, ...rest].slice(0, 5),
           });
         },
         pullSteers: () => store.drainSteers(roomId, botId),
       });
     } catch (err) {
-      if (isAbortError(err) || signal.aborted) return;
+      if (isAbortError(err) || botSignal.aborted || signal.aborted) return;
       throw err;
     }
     const usage = { ...(generated.usage || {}), startedAt };
@@ -1406,11 +1499,15 @@ function plantLiveTurns(
     if (!botId) continue;
     if (!memberIds.includes(botId)) continue;
     store.dropLastFailedReply(roomId, botId);
+    const prev = store.getLiveBotTurn(roomId, botId);
     store.setLiveTurn(roomId, {
       botId,
-      thinking: "",
-      steps: [],
-      startedAt,
+      thinking: prev?.thinking || "",
+      steps: prev?.steps || [],
+      traces: prev?.traces,
+      asked: prev?.asked,
+      startedAt: prev?.startedAt || startedAt,
+      paused: false,
     });
   }
   return startedAt;

package/src/harness.ts

@@ -133,6 +133,23 @@ export function pathInsideWorkspace(target: string, workspace: string): boolean
   return rel === "" || (rel !== ".." && !rel.startsWith(`..${sep}`) && !isAbsolute(rel));
 }
 
+/** Scratch dirs `workspace_write` may also read / write / run-cwd. Not `$HOME`. */
+export function extraWriteRoots(dataDir?: string): string[] {
+  const roots = [resolve("/tmp")];
+  const home = dataDir?.trim();
+  if (home) roots.push(resolve(home, "cache"));
+  return roots;
+}
+
+export function allowedWorkspaceWritePath(
+  target: string,
+  workspace: string,
+  dataDir?: string,
+): boolean {
+  if (pathInsideWorkspace(target, workspace)) return true;
+  return extraWriteRoots(dataDir).some((root) => pathInsideWorkspace(target, root));
+}
+
 export function mutatingTool(name: string): boolean {
   return (
     name === "run" ||
@@ -150,6 +167,7 @@ export function gateTool(
   input: {
     sandbox?: Sandbox;
     workspace?: string;
+    dataDir?: string;
   } = {},
 ): SandboxRefusal | null {
   const sandbox = parseSandbox(input.sandbox);
@@ -161,7 +179,8 @@ export function gateTool(
       name === "list" ||
       name === "skill" ||
       name === "spawn" ||
-      name === "read_spawn"
+      name === "read_spawn" ||
+      name === "cronjob"
     ) {
       return null;
     }
@@ -187,7 +206,7 @@ export function gateTool(
     const raw = typeof args.path === "string" ? args.path : "";
     if (name === "list" && !raw.trim()) return null;
     const target = resolveToolPath(raw, workspace);
-    if (!pathInsideWorkspace(target, workspace)) {
+    if (!allowedWorkspaceWritePath(target, workspace, input.dataDir)) {
       return {
         text: `sandbox=workspace_write refused ${name} outside workspace: ${target}`,
         isError: true,
@@ -199,7 +218,8 @@ export function gateTool(
   if (
     name === "skill" ||
     name === "spawn" ||
-    name === "read_spawn"
+    name === "read_spawn" ||
+    name === "cronjob"
   ) {
     return null;
   }
@@ -208,7 +228,7 @@ export function gateTool(
     const raw = typeof args.path === "string" ? args.path : "";
     if (!raw.trim()) return null;
     const target = resolveToolPath(raw, workspace);
-    if (!pathInsideWorkspace(target, workspace)) {
+    if (!allowedWorkspaceWritePath(target, workspace, input.dataDir)) {
       return {
         text: `sandbox=workspace_write refused write outside workspace: ${target}`,
         isError: true,
@@ -220,7 +240,7 @@ export function gateTool(
   if (name === "run") {
     const workdir = typeof args.workdir === "string" ? args.workdir.trim() : "";
     const cwd = workdir ? resolveToolPath(workdir, workspace) : workspace;
-    if (!pathInsideWorkspace(cwd, workspace)) {
+    if (!allowedWorkspaceWritePath(cwd, workspace, input.dataDir)) {
       return {
         text: `sandbox=workspace_write refused run cwd outside workspace: ${cwd}`,
         isError: true,

package/src/llm.ts

@@ -496,7 +496,7 @@ export async function llmComplete(input: {
   };
   const file = readModelsFile(input.dataDir);
   const effort = clampEffort(
-    file.fast ? "low" : file.reasoning,
+    file.fast ? "low" : input.prefer ? input.prefer.reasoning : file.reasoning,
     reasoningFor(target.providerId, target.model),
     Boolean(file.fast),
   );

package/src/plugins/cron.ts

@@ -0,0 +1,26 @@
+import { Service, type Context } from "cordis";
+import { CRON_TICK_MS } from "../cron-schedule.ts";
+import { executeCronjob, tickCronJobs } from "../cron.ts";
+import { guildEnvOf } from "../start.ts";
+
+export class CronService extends Service {
+  static inject = ["store", "tools"];
+
+  constructor(ctx: Context) {
+    super(ctx, "cron");
+    ctx.tools.register("cronjob", (args, toolCtx) =>
+      executeCronjob(this.ctx.store.guild, args, toolCtx),
+    );
+    const tick = () => {
+      void tickCronJobs(this.ctx.store.guild, guildEnvOf(this.ctx));
+    };
+    const interval = setInterval(tick, CRON_TICK_MS);
+    interval.unref();
+    ctx.effect(() => () => clearInterval(interval));
+    const boot = setTimeout(tick, 1500);
+    boot.unref();
+    ctx.effect(() => () => clearTimeout(boot));
+  }
+}
+
+export default CronService;

package/src/public/chat.css

@@ -257,6 +257,57 @@ body.resizing-sidebar iframe { pointer-events: none; }
   font-size: 0.72rem;
   letter-spacing: 0.12em;
 }
+.nav-sec {
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+}
+.nav-sec[data-nav-sec="dms"],
+.nav-sec[data-nav-sec="cron"] {
+  flex: 1 1 0;
+}
+.nav-sec.folded {
+  flex: 0 0 auto;
+}
+.nav-sec.folded .navlist,
+.nav-sec.folded .create-row {
+  display: none !important;
+}
+.sec-fold {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  flex: 1;
+  min-width: 0;
+  margin: 0;
+  padding: 0;
+  border: 0;
+  background: transparent;
+  color: inherit;
+  font: inherit;
+  letter-spacing: inherit;
+  font-weight: inherit;
+  text-shadow: inherit;
+  text-align: left;
+  cursor: pointer;
+}
+.sec-fold:hover { color: var(--text); }
+.sec-chev {
+  display: inline-block;
+  width: 0.9em;
+  flex: none;
+  font-size: 0.8em;
+  line-height: 1;
+  transition: transform var(--press-ms) var(--ease-out);
+}
+.nav-sec.folded .sec-chev { transform: rotate(-90deg); }
+.nav-empty {
+  list-style: none;
+  margin: 0;
+  padding: 0.35rem 0.9rem 0.7rem;
+  color: var(--muted);
+  font-size: 0.78rem;
+}
 .add-ch {
   margin: 0;
   width: 22px;
@@ -367,6 +418,7 @@ body.resizing-sidebar iframe { pointer-events: none; }
 }
 @media (prefers-reduced-motion: reduce) {
   .busy-flash { animation: none; }
+  .sec-chev { transition: none; }
 }
 .navlist a.nav-row:hover { background: var(--lift); }
 .navlist a.nav-row.on { background: var(--bubble); }
@@ -648,6 +700,8 @@ body.grok .sidebar .section-h {
   font-weight: 700;
   text-shadow: 0 1px 0 #0008;
 }
+body.grok .sidebar .sec-fold:hover { color: #F4E3A4; }
+body.grok .sidebar .nav-empty { color: #B08960; }
 body.grok .sidebar .add-ch {
   color: var(--pin);
   border-radius: 2px;
@@ -890,7 +944,8 @@ body.grok #channels li.nav-quest:has(a.on) .notice-party .members-stack .avatar,
 body.grok #channels li.nav-quest:hover .notice-party .members-stack .avatar {
   border-color: var(--plaque-on);
 }
-body.grok #dms.navlist {
+body.grok #dms.navlist,
+body.grok #cron-nav.navlist {
   flex-grow: 1;
   flex-shrink: 1;
   flex-basis: 0;
@@ -901,25 +956,30 @@ body.grok #dms.navlist {
   scrollbar-width: thin;
   scrollbar-color: #8A623C transparent;
 }
-body.grok #dms a.nav-row {
+body.grok #dms a.nav-row,
+body.grok #cron-nav a.nav-row {
   color: #F0E2C8;
   border-radius: 2px;
   border: 1px solid transparent;
   background: color-mix(in srgb, #16100B 35%, transparent);
 }
-body.grok #dms a.nav-row:hover {
+body.grok #dms a.nav-row:hover,
+body.grok #cron-nav a.nav-row:hover {
   background: color-mix(in srgb, #EDE6D6 12%, transparent);
   border-color: color-mix(in srgb, var(--board-edge) 45%, transparent);
 }
-body.grok #dms a.nav-row.on {
+body.grok #dms a.nav-row.on,
+body.grok #cron-nav a.nav-row.on {
   background: color-mix(in srgb, #EDE6D6 18%, transparent);
   border-color: color-mix(in srgb, var(--pin) 40%, transparent);
 }
-body.grok #dms .nav-chip {
+body.grok #dms .nav-chip,
+body.grok #cron-nav .nav-chip {
   color: #E8C48A;
   background: #16100B;
 }
-body.grok #dms .busy-flash { box-shadow: 0 0 0 2px #16100B; }
+body.grok #dms .busy-flash,
+body.grok #cron-nav .busy-flash { box-shadow: 0 0 0 2px #16100B; }
 body.grok .sidebar .side-foot {
   position: absolute;
   left: 0;
@@ -1578,7 +1638,8 @@ a.invite-btn:hover { text-decoration: none; }
   min-height: 240px;
   height: 360px;
   border: 0;
-  background: #fff;
+  background: transparent;
+  color-scheme: dark;
   border-radius: 0 0 12px 12px;
 }
 .assistant-text .md-html-preview[data-view="code"] .md-html-frame { display: none; }
@@ -1894,6 +1955,10 @@ a.invite-btn:hover { text-decoration: none; }
 .turn-actions .turn-stop {
   color: var(--danger);
 }
+.turn-actions .turn-pause,
+.turn-actions .turn-continue {
+  color: var(--steel);
+}
 .turn-actions .turn-steer {
   color: #b4c8e8;
 }
@@ -1907,6 +1972,8 @@ body.grok .turn-actions button:hover {
   color: #f2eadf;
 }
 body.grok .turn-actions .turn-stop { color: #d4a090; }
+body.grok .turn-actions .turn-pause,
+body.grok .turn-actions .turn-continue { color: #c4b090; }
 body.grok .turn-actions .turn-steer { color: #c4b090; }
 .turn-status .clock {
   margin-left: 8px;
@@ -2931,6 +2998,38 @@ dialog p { margin: 0 0 0.8rem; color: var(--muted); font-size: 0.9rem; }
   color: var(--muted);
   font-size: 0.8rem;
 }
+.cron-list {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  max-height: 40vh;
+  overflow: auto;
+  margin: 0 0 1rem;
+}
+.cron-row {
+  display: grid;
+  grid-template-columns: 1fr auto;
+  gap: 8px;
+  padding: 8px 10px;
+  border: 1px solid var(--line);
+  border-radius: 12px;
+  background: var(--fill);
+}
+.cron-row b { display: block; font-size: 0.92rem; }
+.cron-row span { color: var(--muted); font-size: 0.78rem; }
+.cron-row .cron-acts { display: flex; gap: 4px; align-items: center; }
+.cron-row .cron-acts button {
+  margin: 0;
+  padding: 0.15rem 0.45rem;
+  font-size: 0.72rem;
+}
+#cron-dialog label { display: block; margin: 0.6rem 0 0.2rem; font-size: 0.8rem; color: var(--muted); }
+#cron-dialog input,
+#cron-dialog select,
+#cron-dialog textarea {
+  width: 100%;
+  box-sizing: border-box;
+}
 .dialog-actions { display: flex; justify-content: flex-end; gap: 0.4rem; }
 .dialog-actions button {
   margin: 0;
@@ -3107,13 +3206,23 @@ dialog p { margin: 0 0 0.8rem; color: var(--muted); font-size: 0.9rem; }
   line-height: 1.45;
 }
 .traj-empty { color: #8b8b8b; padding: 1.2rem; }
+.md-img-link {
+  display: inline-block;
+  max-width: 22rem;
+  margin: 0.45rem 0;
+  line-height: 0;
+  border-radius: 12px;
+}
 .md-img,
 .row-card.image .md-img {
   display: block;
-  max-width: min(100%, 48rem);
+  max-width: 22rem;
+  max-height: min(16rem, 40vh);
+  width: auto;
   height: auto;
+  object-fit: contain;
   border-radius: 12px;
-  margin: 0.45rem 0;
+  margin: 0;
   background: #111;
 }
 .row-card.image .term-out {