npm - @kevin5251984/guild - Versions diffs - 0.2.21 → 0.2.22 - Mend

@kevin5251984/guild 0.2.21 → 0.2.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/src/public/md.js CHANGED Viewed

@@ -19,22 +19,39 @@ function isFileCode(text) {
   return /[A-Za-z0-9]\/[A-Za-z0-9._@+-]/.test(s);
 }
+function localImgSrc(href) {
+  const raw = String(href || "")
+    .trim()
+    .replace(/"/g, "");
+  if (!raw) return "";
+  if (/^\/generated\/[A-Za-z0-9._-]+$/.test(raw)) return raw;
+  if (/^https?:\/\//i.test(raw)) return raw;
+  let path = raw;
+  if (/^file:\/\//i.test(path)) path = path.replace(/^file:\/\//i, "");
+  if (!path.startsWith("/") || path.startsWith("//") || path.includes("..")) {
+    return "";
+  }
+  if (!/\.(?:png|jpe?g|gif|webp)$/i.test(path)) return "";
+  return "/local?p=" + encodeURIComponent(path);
+}
 function inlineMd(text) {
   let out = escapeMd(text);
-  out = out.replace(
-    /!\[([^\]]*)\]\((\/generated\/[A-Za-z0-9._-]+|https?:[^)\s]+)\)/g,
-    function (_m, alt, href) {
-      const src = String(href).replace(/"/g, "");
-      const label = alt || "image";
-      return (
-        '<img class="md-img" src="' +
-        src +
-        '" alt="' +
-        label +
-        '" loading="lazy">'
-      );
-    },
-  );
+  out = out.replace(/!\[([^\]]*)\]\(([^)\s]+)\)/g, function (m, alt, href) {
+    const src = localImgSrc(href);
+    if (!src) return m;
+    const label = alt || "image";
+    return (
+      '<a class="md-img-link" href="' +
+      src +
+      '" target="_blank" rel="noopener noreferrer">' +
+      '<img class="md-img" src="' +
+      src +
+      '" alt="' +
+      label +
+      '" loading="lazy"></a>'
+    );
+  });
   out = out.replace(/\[([^\]]+)\]\((https?:[^)\s]+)\)/g, function (_m, label, href) {
     return (
       '<a href="' +
@@ -327,23 +344,83 @@ function renderMarkdown(raw) {
   return html.join("");
 }
+function htmlPreviewSrcdoc(raw, lang) {
+  const text = String(raw || "");
+  if (/svg/i.test(String(lang || ""))) {
+    return (
+      '<!doctype html><html><body style="margin:0;background:#fff">' +
+      text +
+      "</body></html>"
+    );
+  }
+  if (/<!doctype html|<html[\s>]/i.test(text)) return text;
+  return (
+    '<!doctype html><html><body style="margin:0;background:transparent">' +
+    text +
+    "</body></html>"
+  );
+}
 function hydrateHtmlPreviews(root) {
   if (!root || typeof root.querySelectorAll !== "function") return;
   root.querySelectorAll(".md-html-preview").forEach((box) => {
     const src = box.querySelector(".md-html-src");
     const frame = box.querySelector(".md-html-frame");
-    if (!src || !frame || frame.dataset.ready) return;
-    frame.dataset.ready = "1";
+    if (!src || !frame) return;
     const raw = src.value;
     const lang = (box.querySelector(".md-fence-lang") || {}).textContent || "";
-    frame.srcdoc = /svg/i.test(lang)
-      ? '<!doctype html><html><body style="margin:0;background:#fff">' +
-        raw +
-        "</body></html>"
-      : raw;
+    const doc = htmlPreviewSrcdoc(raw, lang);
+    if (frame.dataset.ready && frame.srcdoc === doc) return;
+    frame.dataset.ready = "1";
+    frame.srcdoc = doc;
+  });
+}
+function holdHtmlFrames(root) {
+  const frames = [];
+  if (!root || typeof root.querySelectorAll !== "function") return frames;
+  root.querySelectorAll("article.msg .md-html-preview").forEach((box) => {
+    const article = box.closest("article.msg[data-id]");
+    const frame = box.querySelector(".md-html-frame");
+    const src = box.querySelector(".md-html-src");
+    if (!article || !frame || !src || !frame.dataset.ready) return;
+    frames.push({
+      id: article.getAttribute("data-id"),
+      src: src.value,
+      view: box.getAttribute("data-view") || "preview",
+      frame: frame,
+    });
+  });
+  return frames;
+}
+function putHtmlFrames(root, frames) {
+  if (!root || typeof root.querySelector !== "function") return;
+  (frames || []).forEach((item) => {
+    const article = root.querySelector(
+      'article.msg[data-id="' + CSS.escape(item.id) + '"]',
+    );
+    const box = article && article.querySelector(".md-html-preview");
+    const src = box && box.querySelector(".md-html-src");
+    const fresh = box && box.querySelector(".md-html-frame");
+    if (!box || !src || !fresh || src.value !== item.src) return;
+    item.frame.dataset.ready = "1";
+    fresh.replaceWith(item.frame);
+    box.setAttribute("data-view", item.view);
+    box.querySelectorAll("[data-html-view]").forEach((tab) => {
+      tab.classList.toggle("on", tab.getAttribute("data-html-view") === item.view);
+    });
   });
 }
 if (typeof module !== "undefined" && module.exports) {
-  module.exports = { renderMarkdown, inlineMd, hydrateHtmlPreviews };
+  module.exports = {
+    renderMarkdown,
+    inlineMd,
+    hydrateHtmlPreviews,
+    htmlPreviewSrcdoc,
+    holdHtmlFrames,
+    putHtmlFrames,
+    localImgSrc,
+  };
 }

package/src/public/mobile.css CHANGED Viewed

@@ -391,7 +391,8 @@ textarea:focus-visible {
   min-height: 220px;
   height: 52vh;
   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; }
@@ -441,8 +442,17 @@ textarea:focus-visible {
   border-radius: 16px;
   background: #fff;
 }
-.assistant-text img.md-img {
+.assistant-text .md-img-link {
+  display: inline-block;
   max-width: 100%;
+  line-height: 0;
+}
+.assistant-text img.md-img {
+  max-width: min(100%, 22rem);
+  max-height: min(16rem, 40vh);
+  width: auto;
+  height: auto;
+  object-fit: contain;
   border-radius: 10px;
 }
 .turn-live {

package/src/public/mobile.html CHANGED Viewed

@@ -9,7 +9,7 @@
     <link rel="icon" href="/favicon-32.png" type="image/png" sizes="32x32" />
     <link rel="icon" href="/favicon-16.png" type="image/png" sizes="16x16" />
     <title>Guild — 外出</title>
-    <link rel="stylesheet" href="/mobile.css?v=html-preview" />
+    <link rel="stylesheet" href="/mobile.css?v=html-frame" />
     <script src="/i18n.js"></script>
     <script src="/md.js"></script>
   </head>
@@ -484,6 +484,8 @@
           return (
             '<article class="msg' +
             (you ? " you" : " bot") +
+            '" data-id="' +
+            escapeHtml(msg.id || "") +
             '"><span class="avatar" style="' +
             avStyle +
             '">' +
@@ -520,7 +522,10 @@
               escapeHtml(t("mobile.recent", { n: cap })) +
               "</div>"
             : "";
+          const keptHtml =
+            typeof holdHtmlFrames === "function" ? holdHtmlFrames(root) : [];
           root.innerHTML = notice + rows.map(msgHtml).join("") + turnStatusHtml();
+          if (typeof putHtmlFrames === "function") putHtmlFrames(root, keptHtml);
           if (typeof hydrateHtmlPreviews === "function") {
             hydrateHtmlPreviews(root);
           }
@@ -662,12 +667,25 @@
           renderList();
           if (state.kind) renderHead();
         }
+        function sameMessages(next) {
+          const prev = state.messages || [];
+          if (prev.length !== next.length) return false;
+          return next.every(
+            (msg, i) =>
+              prev[i].id === msg.id &&
+              prev[i].body === msg.body &&
+              Boolean(prev[i].finishedAt) === Boolean(msg.finishedAt),
+          );
+        }
         async function loadMessages(opts) {
           if (!state.kind) return;
           const res = await fetch(roomMessagesUrl());
           const body = await res.json().catch(() => []);
           if (!res.ok) throw new Error(body.error || "load failed");
-          state.messages = Array.isArray(body) ? body : [];
+          const incoming = Array.isArray(body) ? body : [];
+          const unchanged = sameMessages(incoming);
+          state.messages = incoming;
+          if (opts && opts.merge && unchanged) return;
           renderThread({ pinBottom: !(opts && opts.merge) });
         }
         async function pollLive() {
@@ -684,10 +702,10 @@
             state.lives = lives;
             if (!lives.length && !state.posting) {
               if (was) await loadMessages({ merge: true }).catch(() => {});
-              else renderThread();
+            } else if (now !== was) {
+              await loadMessages({ merge: true }).catch(() => {});
             } else {
-              if (now !== was) await loadMessages({ merge: true }).catch(() => {});
-              else renderThread();
+              renderThread();
             }
             syncComposer();
           } catch {

package/src/router.ts CHANGED Viewed

@@ -1,5 +1,6 @@
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync, readFileSync, statSync } from "node:fs";
 import type { IncomingMessage, ServerResponse } from "node:http";
+import { extname } from "node:path";
 import { fileURLToPath } from "node:url";
 import type { LibraryKind, ModelRef, ModelsFile } from "@guild/protocol";
 import {
@@ -66,6 +67,30 @@ import { hostGit, hostList, hostRead, hostTree } from "./host-browse.ts";
 import { listHostSkills } from "./host-skills.ts";
 import { listHostAgents } from "./host-agents.ts";
 import { generatedDir, isSafeGeneratedName } from "./image-gen.ts";
+import {
+  createCronJob,
+  fireCronJob,
+  pauseCronJob,
+  publicCronJob,
+  removeCronJob,
+  resumeCronJob,
+} from "./cron.ts";
+import {
+  allowedWorkspaceWritePath,
+  resolveToolPath,
+  workspaceFromEnv,
+} from "./harness.ts";
+const LOCAL_IMAGE_CAP = 12 * 1024 * 1024;
+function localImageType(path: string): string | null {
+  const ext = extname(path).toLowerCase();
+  if (ext === ".png") return "image/png";
+  if (ext === ".jpg" || ext === ".jpeg") return "image/jpeg";
+  if (ext === ".gif") return "image/gif";
+  if (ext === ".webp") return "image/webp";
+  return null;
+}
 const PUBLIC = fileURLToPath(new URL("./public/", import.meta.url));
@@ -391,6 +416,38 @@ export async function handleRequest(
       return;
     }
+    if (method === "GET" && path === "/local") {
+      const raw = requestUrl(req).searchParams.get("p") || "";
+      const type = localImageType(raw);
+      if (!raw.startsWith("/") || raw.includes("\0") || raw.includes("..") || !type) {
+        json(res, 404, { error: "not_found", path });
+        return;
+      }
+      const target = resolveToolPath(raw);
+      if (!allowedWorkspaceWritePath(target, workspaceFromEnv(env), store.dataDir)) {
+        json(res, 404, { error: "not_found", path });
+        return;
+      }
+      if (!existsSync(target)) {
+        json(res, 404, { error: "not_found", path });
+        return;
+      }
+      const st = statSync(target);
+      if (!st.isFile() || st.size > LOCAL_IMAGE_CAP) {
+        json(res, 404, { error: "not_found", path });
+        return;
+      }
+      const bytes = readFileSync(target);
+      res.writeHead(200, {
+        "content-type": type,
+        "content-length": bytes.length,
+        "cache-control": "private, max-age=60",
+        "x-content-type-options": "nosniff",
+      });
+      res.end(bytes);
+      return;
+    }
     if (method === "GET" && path.startsWith("/generated/")) {
       const name = decodeURIComponent(path.slice("/generated/".length));
       if (!isSafeGeneratedName(name)) {
@@ -444,6 +501,45 @@ export async function handleRequest(
       return;
     }
+    if (path === "/cron" && method === "GET") {
+      const room = requestUrl(req).searchParams.get("room") || "";
+      json(res, 200, {
+        jobs: store.listCronJobs(room || undefined).map(publicCronJob),
+      });
+      return;
+    }
+    if (path === "/cron" && method === "POST") {
+      const body = asRecord(await readJson(req));
+      const job = createCronJob(store, {
+        roomId: str(body, "roomId") || str(body, "room_id"),
+        botId: str(body, "botId") || str(body, "bot_id"),
+        prompt: str(body, "prompt"),
+        schedule: str(body, "schedule"),
+        name: str(body, "name"),
+      });
+      json(res, 201, publicCronJob(job));
+      return;
+    }
+    const cronAct = path.match(/^\/cron\/([^/]+)\/(pause|resume|run)$/);
+    if (cronAct && method === "POST") {
+      const id = decodeURIComponent(cronAct[1]);
+      if (cronAct[2] === "pause") {
+        json(res, 200, publicCronJob(pauseCronJob(store, id)));
+        return;
+      }
+      if (cronAct[2] === "resume") {
+        json(res, 200, publicCronJob(resumeCronJob(store, id)));
+        return;
+      }
+      json(res, 200, await fireCronJob(store, id, env));
+      return;
+    }
+    const cronOne = path.match(/^\/cron\/([^/]+)$/);
+    if (cronOne && method === "DELETE") {
+      json(res, 200, removeCronJob(store, decodeURIComponent(cronOne[1])));
+      return;
+    }
     if (method === "GET" && (path === "/bots" || path === "/bench")) {
       json(res, 200, listBench(store));
       return;

package/src/store.ts CHANGED Viewed

@@ -10,7 +10,7 @@ import type { TrajectoryDraft, TrajectoryEvent } from "./trajectory.ts";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { randomUUID } from "node:crypto";
-import { closeGuildDb, openGuildDb, type GuildDb } from "./db.ts";
+import { closeGuildDb, openGuildDb, type CronJobRow, type GuildDb } from "./db.ts";
 import type {
   Bot,
   ChatAttachment,
@@ -1329,6 +1329,27 @@ export class GuildStore {
     if (!this.getRoom(roomId)) throw new StoreError(404, "room not found");
     this.db.writeCompact(roomId, compact);
   }
+  listCronJobs(roomId?: string) {
+    if (roomId && !this.getRoom(roomId)) throw new StoreError(404, "room not found");
+    return this.db.listCronJobs(roomId);
+  }
+  getCronJob(id: string) {
+    const job = this.db.getCronJob(id);
+    if (!job) throw new StoreError(404, "cron job not found");
+    return job;
+  }
+  writeCronJob(job: CronJobRow): void {
+    if (!this.getRoom(job.roomId)) throw new StoreError(404, "room not found");
+    if (!this.getBot(job.botId)) throw new StoreError(400, "bot not found");
+    this.db.upsertCronJob(job);
+  }
+  deleteCronJob(id: string): boolean {
+    return this.db.deleteCronJob(id);
+  }
 }
 function normalizePortrait(raw: string | null | undefined): string | undefined {

package/src/subagent.ts CHANGED Viewed

@@ -373,6 +373,9 @@ export async function spawnSubagent(input: {
       allowWrite: child.allowWrite,
       sandbox: child.sandbox,
       workspace: input.ctx.workspace,
+      roomId: input.ctx.roomId,
+      botId: input.ctx.botId,
+      cronRun: input.ctx.cronRun,
       dispatch: input.ctx.dispatch,
       signal: input.ctx.signal,
     },

package/src/tools.ts CHANGED Viewed

@@ -78,6 +78,12 @@ export type ToolContext = {
   ) => Promise<ToolOutcome>;
   /** Devin-style background spawn handles for this turn. Same Map across dispatch clones. */
   spawnHandles?: Map<string, SpawnHandle>;
+  /** Channel or DM this turn is in. Cron jobs default here. */
+  roomId?: string;
+  /** Seat running this turn. cronjob create defaults here. */
+  botId?: string;
+  /** Hermes: cron child sessions cannot manage cron. */
+  cronRun?: boolean;
 };
 export type SpawnHandle = {
@@ -191,6 +197,33 @@ export function guildTools(
       (tool) => tool.name !== "image_gen" && tool.name !== "browser",
     );
   }
+  if (!ctx.cronRun) {
+    tools.push({
+      name: "cronjob",
+      description:
+        "Schedule a later hall turn (Hermes cronjob). Fresh @handle turn with a self-contained prompt. Actions: create, list, pause, resume, run, remove. schedule may be natural language (每10分鐘, 10分鐘後, 每天9點, in 30 minutes, every 2h, 0 9 * * *, ISO). Split when vs task: schedule is the time phrase, prompt is the work. bot_id defaults to this seat. Do not create cron jobs from a cron run.",
+      parameters: Type.Object({
+        action: Type.String({
+          description: "create | list | pause | resume | run | remove",
+        }),
+        schedule: Type.Optional(
+          Type.String({
+            description:
+              "Natural language or Hermes form: 每10分鐘, in 30m, every 2h, 每天9點, 0 9 * * *, ISO",
+          }),
+        ),
+        prompt: Type.Optional(
+          Type.String({ description: "Self-contained task for the seat" }),
+        ),
+        name: Type.Optional(Type.String({ description: "Short job name" })),
+        job_id: Type.Optional(Type.String({ description: "Job id or name" })),
+        bot_id: Type.Optional(Type.String({ description: "Seat to run" })),
+        room_id: Type.Optional(
+          Type.String({ description: "Room id. Defaults to this hall." }),
+        ),
+      }),
+    });
+  }
   tools.push({
     name: "skill",
     description: `Load a staffed skill's full instructions by name.${available}`,
@@ -387,6 +420,21 @@ function openaiParameters(name: string): {
       required: ["prompt"],
     };
   }
+  if (name === "cronjob") {
+    return {
+      type: "object",
+      properties: {
+        action: { type: "string", description: "create | list | pause | resume | run | remove" },
+        schedule: { type: "string" },
+        prompt: { type: "string" },
+        name: { type: "string" },
+        job_id: { type: "string" },
+        bot_id: { type: "string" },
+        room_id: { type: "string" },
+      },
+      required: ["action"],
+    };
+  }
   if (name === "browser") {
     return {
       type: "object",
@@ -437,6 +485,7 @@ export const BUILTIN_TOOL_NAMES = [
   "read_spawn",
   "image_gen",
   "browser",
+  "cronjob",
 ] as const;
 export async function executeTool(
@@ -512,6 +561,12 @@ export async function builtinExecute(
         env: ctx.env,
       });
     }
+    if (name === "cronjob") {
+      return {
+        text: "cronjob needs guildd (the cron plugin)",
+        isError: true,
+      };
+    }
     if (name === "browser") {
       const { runBrowser } = await import("./browser.ts");
       return runBrowser(args, {
@@ -817,7 +872,7 @@ export function nextToolRound(round: number): ToolRoundPhase {
 }
 export const TOOL_SYSTEM = `You ARE already running on the user's local computer (Guild, same design as Pi / DeepSeek Harness).
-Tools: run, read, write, list, skill, spawn, image_gen, browser, plus any connected MCP tools (names start with mcp__).
+Tools: run, read, write, list, skill, spawn, image_gen, browser, cronjob, plus any connected MCP tools (names start with mcp__).
 You can inspect RAM, disk, CPU, processes, files, and run shell commands.
 Never say you cannot access this machine. Never tell the user to run the command themselves.
 When the question is about this computer, call tools first, then answer with evidence from the output.
@@ -827,4 +882,5 @@ You stay coordinator. Spawn is the specialist, not a last resort (Devin run_suba
 Independent tool calls in one round also run in parallel — fire several reads/searches together.
 Check the [exit code: N] marker on every run result; investigate failures before moving on. Prefer the workdir argument over cd.
 To follow a staffed skill, call skill with its exact name (or slug) before applying it. Relative paths in a skill resolve against that skill's base directory.
+When the user asks to 排程 / schedule a later hall turn — including natural-language times like 每10分鐘, 10分鐘後, tomorrow 9am — call cronjob create. schedule is the time phrase; prompt is the self-contained task (the job will not see this live turn). bot_id defaults to you. Also accepts in 30m, every 2h, 0 9 * * *, ISO. A cron run cannot create more cron jobs.
 Prefer small commands. macOS RAM: sysctl hw.memsize ; memory_pressure. Disk: df -h.`;