npm - ework-web - Versions diffs - 0.10.65 → 0.10.66 - Mend

ework-web 0.10.65 → 0.10.66

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 (5) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "ework-web",
-  "version": "0.10.65",
+  "version": "0.10.66",
   "type": "module",
   "description": "ework-web — standalone multi-project issue tracker. Local SQLite-backed, no external API dependency. Bun + TypeScript + SSR HTML.",
   "license": "MIT",

package/src/index.ts CHANGED Viewed

@@ -2189,7 +2189,9 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
       const project = await getProject(owner, repo);
       if (!project) return html(errorPage("404", "项目不存在"), 404);
       if (!(await canReadProject(project.id, ctx.user))) return html(errorPage("404", "项目不存在"), 404);
-      const { html: body } = await buildIssueThread(cfg, owner, repo, number, ctx.user?.login);
+      const dispatchCfg = await getConfigAll();
+      const projectDispatchOff = dispatchCfg[`dispatchOff:${owner}/${repo}`] === "1";
+      const { html: body } = await buildIssueThread(cfg, owner, repo, number, ctx.user?.login, projectDispatchOff);
       return html(body);
     } catch (e) {
       const status = e instanceof StoreError ? e.status : 500;

package/src/render/layout.ts CHANGED Viewed

@@ -18,6 +18,7 @@ export interface LayoutProps {
   labels?: { id: number; name: string; color: string }[];
   canEditLabels?: boolean;
   aiStatus?: string;
+  projectDispatchOff?: boolean;
   viewerLogin?: string;
   viewerIsAdmin?: boolean;
   customActions?: IssueAction[];
@@ -192,9 +193,11 @@ export function renderLayout(props: LayoutProps, inner: string, initialItems: st
       : `<button type="button" class="action-btn" data-action-href="${escapeAttr(repoIssuesHref)}/${props.issueNumber}/halt" data-action-confirm="确认停止 AI 处理？" title="停止 AI 处理">⏹ 停止</button>`
     : "";
   const dispatchBtnHtml = showActions
-    ? props.aiStatus === "dispatch_off"
-      ? `<button type="button" class="action-btn dispatch-btn" data-action-href="${escapeAttr(repoIssuesHref)}/${props.issueNumber}/dispatch-on" title="允许自动接单">🔔 接单</button>`
-      : `<button type="button" class="action-btn dispatch-btn" data-action-href="${escapeAttr(repoIssuesHref)}/${props.issueNumber}/dispatch-off" data-action-confirm="设为不自动接单？" title="设为不自动接单">🔕 不接单</button>`
+    ? props.projectDispatchOff
+      ? `<span class="action-btn dispatch-btn" style="opacity:.5;cursor:not-allowed" title="项目已关闭自动接单">🔕 项目不接单</span>`
+      : props.aiStatus === "dispatch_off"
+        ? `<button type="button" class="action-btn dispatch-btn" data-action-href="${escapeAttr(repoIssuesHref)}/${props.issueNumber}/dispatch-on" title="允许自动接单">🔔 接单</button>`
+        : `<button type="button" class="action-btn dispatch-btn" data-action-href="${escapeAttr(repoIssuesHref)}/${props.issueNumber}/dispatch-off" data-action-confirm="设为不自动接单？" title="设为不自动接单">🔕 不接单</button>`
     : "";
   return `<!doctype html>
 <html lang="zh">

package/src/views/issueThread.ts CHANGED Viewed

@@ -91,7 +91,8 @@ export async function buildIssueThread(
   owner: string,
   repo: string,
   number: number,
-  viewerLogin?: string
+  viewerLogin?: string,
+  projectDispatchOff?: boolean
 ): Promise<{ html: string }> {
   const project = await getProject(owner, repo);
   if (!project) throw new StoreError(404, `项目 ${owner}/${repo} 不存在`);
@@ -150,6 +151,7 @@ export async function buildIssueThread(
       labels: labels.map((l) => ({ id: l.id, name: l.name, color: l.color })),
       canEditLabels: cfg.writesEnabled !== false,
       aiStatus: issue.ai_status ?? "",
+      projectDispatchOff: projectDispatchOff ?? false,
       viewerLogin,
       viewerIsAdmin,
       customActions,

package/src/webhooks.ts CHANGED Viewed

@@ -16,7 +16,7 @@
 //   the full retry trail rather than an opaque final status.
 import { createHmac, randomUUID } from "node:crypto";
-import { getDB, getConfigAll } from "./db";
+import { getDB } from "./db";
 import { log } from "./logger";
 import { loadConfig } from "./config";
 import {
@@ -28,7 +28,6 @@ import {
   resolveModel,
   listLabelsForIssue,
   getUserByLogin,
-  canWriteProject,
   type IssueRow,
   type ProjectRow,
   type CommentRow,
@@ -301,6 +300,7 @@ interface PayloadComment {
   created_at: string;
   updated_at: string;
   user: PayloadUser;
+  author_kind?: string;
 }
 interface IssueEventPayload {
@@ -636,25 +636,11 @@ export async function emitIssueEvent(
     const project = await getProjectById(projectId);
     if (!project) return;
     const issue = await getIssueById(issueId);
-    if (!issue) return;
-    if (action === "opened") {
-      const cfg = await getConfigAll();
-      const scopeKey = `${project.owner}/${project.name}`;
-      if (cfg["dispatchEnabled"] === "false") {
-        log.info(`webhook: global dispatch disabled — skipping opened for ${scopeKey}#${issue.number}`);
-        return;
-      }
-      if (cfg[`dispatchOff:${scopeKey}`] === "1") {
-        log.info(`webhook: project dispatch disabled — skipping opened for ${scopeKey}#${issue.number}`);
-        return;
-      }
-      if ((issue as IssueRow).ai_status === "dispatch_off") {
-        log.info(`webhook: issue dispatch disabled — skipping opened for ${scopeKey}#${issue.number}`);
-        return;
-      }
-    }
+    if (!issue) { log.warn(`emitIssueEvent: issue ${issueId} not found — silent skip prevented`); return; }
+    // Web is a dumb message bus — always fan out. Wake policy is enforced
+    // downstream (daemon handleEvent). Web only suppresses for subscription-
+    // level concerns (none currently).
     const commentCount = await countCommentsSafe(issueId);
     // Resolve model: project override > global default. Empty string = no
     // override (daemon omits --model, lets opencode pick). globalDefault
@@ -689,48 +675,16 @@ export async function emitCommentEvent(
     if (!issue) return;
     const comment = await getCommentByIdSafe(commentId);
     if (!comment) return;
-    const cfg = await getConfigAll();
-    const scopeKey = `${project.owner}/${project.name}`;
-    // Issue-level dispatch_off is a per-issue explicit close — block comments entirely (same as halted).
-    if ((issue as IssueRow).ai_status === "dispatch_off") {
-      log.info(`webhook: issue dispatch disabled — skipping comment_created (author=${comment.author}) for ${scopeKey}#${issue.number}`);
-      return;
-    }
+    // Web is a dumb message bus — always fan out. Wake policy is enforced
+    // downstream (daemon handleEvent checks author_kind, ai_status, env config).
     const authorUser = await getUserByLogin(comment.author);
-    const dispatchOff = cfg["dispatchEnabled"] === "false" || cfg[`dispatchOff:${scopeKey}`] === "1";
-    if (dispatchOff && authorUser && authorUser.kind !== "human") {
-      log.info(`webhook: dispatch disabled — non-human comment blocked (author=${comment.author} kind=${authorUser.kind}) for ${scopeKey}#${issue.number}`);
-      return;
-    }
-    if (dispatchOff) {
-      log.info(`webhook: dispatch disabled but human comment waking AI (author=${comment.author}) for ${scopeKey}#${issue.number}`);
-    }
-    const appCfg = await loadConfig();
-    const cfgList = (k: string, d: string) =>
-      (cfg[k] ?? d).split(",").map((s) => s.trim()).filter(Boolean);
-    const noWake = cfgList("noWakeLogins", appCfg.daemonBotLogin);
-    const okLogins = cfgList("wakeLogins", "");
-    const okKinds = cfgList("wakeKinds", "human");
-    const author = comment.author;
-    const denied =
-      noWake.includes(author) ? "deny-list" :
-      okLogins.includes(author) ? null :
-      (authorUser && !okKinds.includes(authorUser.kind)) ? `kind=${authorUser.kind}` :
-      null;
-    if (denied) {
-      log.info(`webhook: comment wake denied (author=${author} reason=${denied}) for ${scopeKey}#${issue.number}`);
-      return;
-    }
-    if (authorUser && !(await canWriteProject(projectId, { login: comment.author, is_admin: authorUser.is_admin }))) {
-      log.info(`webhook: comment wake denied (author=${comment.author} not project member) for ${scopeKey}#${issue.number}`);
-      return;
-    }
     const commentCount = await countCommentsSafe(issueId);
     const globalDefault = (await loadConfig()).defaultModel;
     const model = resolveModel(project.model, globalDefault);
     const labels = await toPayloadLabels(issueId);
     const payload = buildCommentPayload(issue, comment, project, commentCount, origin, model, labels);
     (payload as CommentEventPayload).event_id = randomUUID();
+    (payload as CommentEventPayload).comment.author_kind = authorUser?.kind ?? "human";
     const rawBody = JSON.stringify(payload);
     await fanOut(projectId, "issue_comment", rawBody);
   } catch (e) {