comfy-pr 0.2.8 → 0.2.17

package/CHANGELOG.md

@@ -2,6 +2,49 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.2.17](https://github.com/drip-art/Comfy-Registry-PR/compare/v0.2.8...v0.2.17) (2024-06-24)
+
+### Features
+
+- **analyzePullsStatusPipeline:** also check comment in repo ([4ca14f6](https://github.com/drip-art/Comfy-Registry-PR/commit/4ca14f634fe2e0158ddc655f95d95992ccbcceb0))
+- **analyzePullsStatusPipeline:** also check comment in repo ([62f055e](https://github.com/drip-art/Comfy-Registry-PR/commit/62f055e1c6ebc64b97061d4cdd4a7bba17e079ac))
+- **main:** calculate authors ([9b0d719](https://github.com/drip-art/Comfy-Registry-PR/commit/9b0d719fa7be529e4b73d3c7a4189c7bc9da714f))
+- **main:** calculate authors ([3299c3f](https://github.com/drip-art/Comfy-Registry-PR/commit/3299c3f0997eca73ad4121db6dd183d9b92b1a47))
+- **sno-sep-apidoc:** init ([4c5a5e3](https://github.com/drip-art/Comfy-Registry-PR/commit/4c5a5e3f512696c5df4032cbd2ae5fddda99751c))
+- **sno-sep-apidoc:** init ([994c57d](https://github.com/drip-art/Comfy-Registry-PR/commit/994c57deac01c7c3b11987fa736b73aeb45b9bb4))
+- **update-follow-rule-set:** prematch comments ([34c98d5](https://github.com/drip-art/Comfy-Registry-PR/commit/34c98d55d0dd5973c457b23c44a21b576927a1c5))
+- **update-follow-rule-set:** prematch comments ([7911528](https://github.com/drip-art/Comfy-Registry-PR/commit/7911528d3ce9cf8da3618ca1d44f26c6d5b532a0))
+
+### Bug Fixes
+
+- **(dashboard):** add index ([81e4cf3](https://github.com/drip-art/Comfy-Registry-PR/commit/81e4cf372329a84069c102c2b89dce78fbc71a98))
+- **edit-toml-PR-message:** add v2 outdated template edit logic ([b7719b8](https://github.com/drip-art/Comfy-Registry-PR/commit/b7719b8c9916ccc4ba09be3ef9a57e4e696eed88))
+- **edit-toml-PR-message:** add v2 outdated template edit logic ([594976d](https://github.com/drip-art/Comfy-Registry-PR/commit/594976d309476ff289aae6027a6d4d0ec9f8c360))
+- **follow-comment:** fix existed comment logic ([bc43c22](https://github.com/drip-art/Comfy-Registry-PR/commit/bc43c223e2db97c8e55c2e286d5a64d9698cf853))
+- **ghuser:** rename ([d0cce7e](https://github.com/drip-art/Comfy-Registry-PR/commit/d0cce7e06511457ea0db3fe1c673977b6b1179a4))
+- **main:** made a fork demo for haohao ([ed58416](https://github.com/drip-art/Comfy-Registry-PR/commit/ed58416c11a7c63cc4356ffce2aee93b9fa3bb2b))
+- **main:** move ts-toolbelt to devDep ([19a46cf](https://github.com/drip-art/Comfy-Registry-PR/commit/19a46cf6d21b4009a7f02213350aa4086427dcb9))
+- **main:** move ts-toolbelt to devDep ([904dd13](https://github.com/drip-art/Comfy-Registry-PR/commit/904dd13da40c04570c17460ee8ccc96801c323c4))
+- **main:** repo ago ([e2b007b](https://github.com/drip-art/Comfy-Registry-PR/commit/e2b007bec237ba904d8f88a6a522ba4429f6f10b))
+- **main:** repo ago ([5633d0e](https://github.com/drip-art/Comfy-Registry-PR/commit/5633d0eeb77fa42859b66d7a351d66355ed17da1))
+- **mongodb-pipeline-ts:** pipeline with syntax ([246144d](https://github.com/drip-art/Comfy-Registry-PR/commit/246144d3a95c3c163a251a20c904d77891985ea6))
+- **mongodb-pipeline-ts:** pipeline with syntax ([20bf3fc](https://github.com/drip-art/Comfy-Registry-PR/commit/20bf3fc07e435857d80240465865d702f9b3dada))
+- **pipeline:** fix type-helper ([c75e6ac](https://github.com/drip-art/Comfy-Registry-PR/commit/c75e6ac12fdb1b95b218c89f2ede2c5607b7ed23))
+- **pkg:** types ([51beb33](https://github.com/drip-art/Comfy-Registry-PR/commit/51beb337ceee555ceb4827304edeed395129c179))
+- **pull-status:** updated-at ([7196c3a](https://github.com/drip-art/Comfy-Registry-PR/commit/7196c3a9b492102e820f9bba2f8216906079155e))
+- **src:** last-comment-at ([5c6b37e](https://github.com/drip-art/Comfy-Registry-PR/commit/5c6b37e7a33c72188da9c0d923cd97c43ad7e0e3))
+- **src:** last-comment-at ([8050d4a](https://github.com/drip-art/Comfy-Registry-PR/commit/8050d4adc1dbc53b8a43e53edf9b9fca094b067f))
+- **src:** outdate publishcr ([05b64bf](https://github.com/drip-art/Comfy-Registry-PR/commit/05b64bfabb7a3931416f5c2ed939763f346f9ad4))
+- **src:** outdate publishcr ([8034c71](https://github.com/drip-art/Comfy-Registry-PR/commit/8034c718898f11b1af98644986cc8fda9671d0b2))
+- **src:** peek result of runfollowruleset ([96886ec](https://github.com/drip-art/Comfy-Registry-PR/commit/96886ec832cab7c1b8333283d055417f7b808d54))
+- **src:** peek result of runfollowruleset ([e81f9d5](https://github.com/drip-art/Comfy-Registry-PR/commit/e81f9d52a9aad7826898dc2e731db999abb04d3a))
+- **src:** promise seq order ([cbd2534](https://github.com/drip-art/Comfy-Registry-PR/commit/cbd25342716efe0be9853fd599a40e93ac418228))
+- **src:** promise seq order ([304fbfd](https://github.com/drip-art/Comfy-Registry-PR/commit/304fbfddfcf90e357cce6562b5125f987ea997ee))
+- **src:** remove peeks ([4d4f2a9](https://github.com/drip-art/Comfy-Registry-PR/commit/4d4f2a9d981030bb21ea8c18cf84a617cec0eda7))
+- **src:** remove peeks ([b2a7586](https://github.com/drip-art/Comfy-Registry-PR/commit/b2a7586c5bd6279c46fa58f74572246512475dd5))
+- **src:** run action skip not matched user ([30a0219](https://github.com/drip-art/Comfy-Registry-PR/commit/30a0219a59f4edbb964352cd66688d6040ff6e16))
+- **templates:** outdate publish.yaml ([0ded9e8](https://github.com/drip-art/Comfy-Registry-PR/commit/0ded9e87dd14e268fab13071a82de7efb8382790))
+
 ### [0.2.8](https://github.com/drip-art/Comfy-Registry-PR/compare/v0.2.7...v0.2.8) (2024-06-20)
 
 ### [0.2.7](https://github.com/drip-art/Comfy-Registry-PR/compare/v0.2.5...v0.2.7) (2024-06-20)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "comfy-pr",
-  "version": "0.2.8",
+  "version": "0.2.17",
   "description": "Make PRs that publishes ComfyUI Custom Nodes to [ComfyUI Registry]( https://www.comfyregistry.org/ ).",
   "keywords": [],
   "license": "ISC",
@@ -8,10 +8,11 @@
   "type": "module",
   "exports": {
     "import": "./src/index.ts",
-    "types": "./index.ts"
+    "types": "./src/index.ts"
   },
   "main": "index.ts",
   "module": "index.ts",
+  "types": "./src/index.ts",
   "bin": {
     "comfy-pr": "./src/cli.ts"
   },
@@ -31,72 +32,55 @@
   "dependencies": {
     "@auth/mongodb-adapter": "^3.2.0",
     "@ctrl/mac-address": "^3.0.3",
-    "@keyv/mongo": "^2.2.8",
-    "@keyv/sqlite": "^3.6.7",
     "@monaco-editor/react": "^4.6.0",
-    "@slack/web-api": "^7.0.4",
-    "@snomiao/die": "^1.0.6",
+    "@slack/web-api": "^7.2.0",
+    "@snomiao/die": "^1.0.9",
     "@trpc/server": "^10.45.2",
     "@types/d3": "^7.4.3",
-    "@types/jest": "^29.5.12",
-    "@types/js-yaml": "^4.0.9",
-    "@types/minimist": "^1.2.5",
-    "@types/swagger-ui-react": "^4.18.3",
-    "@types/uuid": "^9.0.8",
-    "chatgpt-template": "^1.1.3",
     "d3": "^7.9.0",
-    "daisyui": "^4.12.2",
+    "daisyui": "^4.12.7",
     "dotenv": "^16.4.5",
     "enhanced-ms": "^3.0.0",
-    "execa": "^9.1.0",
-    "flat": "^6.0.1",
+    "globby": "^14.0.1",
     "js-yaml": "^4.1.0",
     "json-stable-stringify": "^1.1.1",
-    "json-to-zod": "^1.1.2",
     "keyv": "^4.5.4",
     "keyv-cached-with": "^0.0.13",
-    "keyv-dir-store": "^0.0.3",
-    "lefthook": "^1.6.15",
     "lodash-es": "^4.17.21",
     "md5": "^2.3.0",
     "minimist": "^1.2.8",
+    "monaco-editor": "^0.50.0",
     "mongodb": "^6.7.0",
-    "mongodb-altas-api-sdk": "^0.1.1",
     "next-auth": "^5.0.0-beta.19",
-    "nodemailer": "^6.9.13",
+    "nodemailer": "^6.9.14",
     "octokit": "^4.0.2",
     "p-map": "^7.0.2",
-    "peek-log": "^0.0.4",
+    "peek-log": "^0.0.8",
+    "pretty-ms": "^9.0.0",
     "promise-all-properties": "^4.0.0",
-    "rambda": "^9.2.0",
-    "react-hook-form": "^7.51.5",
+    "rambda": "^9.2.1",
+    "react-api-doc": "^0.0.9",
+    "react-hook-form": "^7.52.0",
     "react-markdown": "^9.0.1",
-    "react-use": "^17.5.0",
-    "snorun": "^1.4.0",
-    "swagger-ui-react": "^5.17.14",
-    "swr": "^2.2.5",
-    "timing-with": "^0.0.4",
     "toml": "^3.0.0",
     "trpc-openapi": "^1.2.0",
-    "trpc-swagger": "^1.2.6",
     "ts-pattern": "^5.2.0",
     "use-swr-component": "^0.0.5",
-    "uuid": "^10.0.0",
     "yaml": "^2.4.5",
-    "yargs": "^17.7.2",
     "zod": "^3.23.8",
-    "zx": "^8.1.2"
+    "zx": "^8.1.3"
   },
   "devDependencies": {
-    "@tanstack/react-table": "^8.17.3",
     "@types/bun": "^1.1.5",
+    "@types/js-yaml": "^4.0.9",
     "@types/json-stable-stringify": "^1.0.36",
     "@types/lodash-es": "^4.17.12",
     "@types/md5": "^2.3.5",
+    "@types/minimist": "^1.2.5",
     "@types/node": "^20",
+    "@types/nodemailer": "^6.4.15",
     "@types/react": "^18",
     "@types/react-dom": "^18",
-    "axios": "^1.6.8",
     "eslint": "^8",
     "eslint-config-next": "14.2.4",
     "next": "^14.2.4",
@@ -106,7 +90,8 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "tailwindcss": "^3.4.1",
-    "typescript": "^5.4.5"
+    "ts-toolbelt": "^9.6.0",
+    "typescript": "^5.5.2"
   },
   "peerDependencies": {
     "typescript": "^5.4.5"

package/src/CNRepos.ts

@@ -4,6 +4,7 @@ bun index.ts
 */
 import type { ObjectId, WithId } from "mongodb";
 import "react-hook-form";
+import { type Task } from "../packages/mongodb-pipeline-ts/Task";
 import { type CMNode } from "./CMNodes";
 import { type CRNode } from "./CRNodes";
 import { db } from "./db";
@@ -11,7 +12,6 @@ import { gh } from "./gh";
 import { type RelatedPull } from "./matchRelatedPulls";
 import type { GithubPullParsed } from "./parsePullsState";
 import { type SlackMsg } from "./slack/SlackMsgs";
-import { type Task } from "./utils/Task";
 
 type Email = {
   from?: string;

package/src/FollowRules.ts

@@ -1,8 +1,8 @@
 import { z } from "zod";
+import { type Task } from "../packages/mongodb-pipeline-ts/Task";
 import type { PullsStatus } from "./analyzePullsStatus";
 import { db } from "./db";
 import type { zFollowUpRules } from "./followRuleSchema";
-import { type Task } from "./utils/Task";
 
 // migrate data
 // await db.renameCollection("FollowRules", "FollowRuleSets").catch(() => null);

package/src/Totals.ts

@@ -1,7 +1,7 @@
+import { type Task } from "../packages/mongodb-pipeline-ts/Task";
 import { analyzeTotals } from "./analyzeTotals";
 import { db } from "./db";
 import { type AwaitedReturnType } from "./types/AwaitedReturnType";
-import { type Task } from "./utils/Task";
 export type Totals = AwaitedReturnType<typeof analyzeTotals>;
 export const Totals = db.collection<{
   today?: string;

package/src/analyzePullsStatus.ts

@@ -2,10 +2,10 @@ import { $pipeline } from "@/packages/mongodb-pipeline-ts/$pipeline";
 import { peekYaml } from "peek-log";
 import prettyMs from "pretty-ms";
 import type { z } from "zod";
+import type { Task } from "../packages/mongodb-pipeline-ts/Task";
 import { CNRepos, type CRPull } from "./CNRepos";
 import type { GithubIssueComment } from "./GithubIssueComments";
 import { db } from "./db";
-import type { Task } from "./utils/Task";
 import type { zPullStatus } from "./zod/zPullsStatus";
 // import { $pipeline } from "./db/$pipeline";
 // in case of dump production in local environment:
@@ -22,29 +22,20 @@ if (import.meta.main) {
 }
 
 export type PullStatus = z.infer<typeof zPullStatus>;
-export type PullsStatus = PullStatus[] &
-  {
-    lastwords: string;
-    repository: string;
-    author_email: string;
-    ownername: string;
-    on_registry: boolean;
-    state: "OPEN" | "MERGED" | "CLOSED";
-    url: string;
-    head: string;
-    comments: number;
-    updated: string;
-  }[];
-export async function analyzePullsStatus({ skip = 0, limit = 0 } = {}) {
+export type PullsStatus = PullStatus[];
+export async function analyzePullsStatus({ skip = 0, limit = 0, pipeline = analyzePullsStatusPipeline() } = {}) {
   "use server";
-  return await analyzePullsStatusPipeline()
+  return await pipeline
     .skip(skip)
     .limit(limit || 2 ** 31 - 1)
     .aggregate()
-    .map(({ updated_at, created_at, on_registry_at, ...pull }) => {
-      const updated = prettyMs(+new Date() - +new Date(updated_at), { compact: true }) + " ago";
+    .map(({ updated_at, created_at, actived_at, on_registry_at, ...pull }) => {
+      const pull_updated = prettyMs(+new Date() - +new Date(updated_at), { compact: true }) + " ago";
+      const repo_updated = prettyMs(+new Date() - +new Date(actived_at), { compact: true }) + " ago";
       return {
-        updated, //: updated === created ? "never" : updated,
+        updated: pull_updated, // @deprecated
+        pull_updated,
+        repo_updated,
         ...pull,
         lastwords: pull.lastwords?.replace(/\s+/g, " ").replace(/\*\*\*.*/g, "..."),
       };
@@ -54,8 +45,10 @@ export async function analyzePullsStatus({ skip = 0, limit = 0 } = {}) {
 export function analyzePullsStatusPipeline() {
   return (
     $pipeline(CNRepos)
+      .set({ "crPulls.data.pull.latest_comment_at": { $max: { $max: "$crPulls.data.comments.data.updated_at" } } })
       .unwind("$crPulls.data")
       .match({ "crPulls.data.comments.data": { $exists: true } })
+      .set({ "crPulls.data.pull.actived_at": { $toDate: "$info.data.updated_at" } })
       .set({ "crPulls.data.pull.repo": "$repository" })
       .set({ "crPulls.data.pull.on_registry": "$on_registry" })
       .set({ "crPulls.data.pull.type": "$crPulls.data.type" })
@@ -83,7 +76,12 @@ export function analyzePullsStatusPipeline() {
         head: { $concat: ["$user.login", ":", "$type"] },
         comments: { $size: "$comments" },
         lastwords: { $arrayElemAt: ["$comments", -1] },
+        latest_comment_at: { $toDate: "$latest_comment_at" },
+        actived_at: 1,
       })
+      // .project({ latest_comment_at: {$toDate: '$latest_comment_at'} })
+      .set({ updated_at: { $max: ["$latest_comment_at", "$updated_at"] } })
+      .project({ latest_comment_at: 0 })
       .set({ lastwords: { $concat: ["$lastwords.user.login", ": ", "$lastwords.body"] } })
       .set({ lastwords: { $ifNull: ["$lastwords", ""] } })
       // .set({ state: { $nin: ["CLOSED"] } })
@@ -98,6 +96,7 @@ export function analyzePullsStatusPipeline() {
       .as<{
         updated_at: Date;
         created_at: Date;
+        actived_at: Date;
         repository: string;
         author_email: string;
         ownername: string;

package/src/analyzeTotals.ts

@@ -20,7 +20,7 @@ if (import.meta.main) {
 export async function analyzeTotals() {
   "use server";
   const totals = await promiseAllProperties({
-    Now: new Date().toISOString(),
+    // Now: new Date().toISOString(),
     "Total Nodes": promiseAllProperties({
       "on ComfyUI Manager": CMNodes.estimatedDocumentCount(),
       "on Registry": CRNodes.estimatedDocumentCount(),
@@ -43,10 +43,16 @@ export async function analyzeTotals() {
       .match($filaten({ info: { data: { owner: { login: { $exists: true } } } } }))
       .group({
         _id: "$info.data.owner.login",
-        // author: "$info.data.owner.email",
-        "on Comfy Manager List": { $sum: { $cond: [{ $eq: [{ $type: "$cm" }, "missing"] }, 0, 1] } },
-        "on Registry": { $sum: { $cond: [{ $eq: [{ $type: "$cr" }, "missing"] }, 0, 1] } },
-        Archived: { $sum: { $cond: ["$info.data.archived", 1, 0] } },
+        // author: "$info.data.owner.login",
+        cm: { $sum: { $cond: [{ $eq: [{ $type: "$cm" }, "missing"] }, 0, 1] } },
+        cr: { $sum: { $cond: [{ $eq: [{ $type: "$cr" }, "missing"] }, 0, 1] } },
+        All: { $sum: 1 },
+      })
+      .set({ author: "$_id" })
+      .group({
+        _id: null,
+        "on Comfy Manager List": { $sum: { $cond: [{ $eq: ["$cm", 0] }, 0, 1] } },
+        "on Registry": { $sum: { $cond: [{ $eq: ["$cr", 0] }, 0, 1] } },
         All: { $sum: 1 },
       })
       .project({ _id: 0 })

package/src/cli.ts

@@ -1,9 +1,11 @@
 #!bun
 import DIE from "@snomiao/die";
 import { readFile } from "fs/promises";
-import { argv } from "zx";
+import { argv, $ as zx } from "zx";
 import { checkComfyActivated } from "./checkComfyActivated";
 import { createComfyRegistryPullRequests } from "./createComfyRegistryPullRequests";
+zx.verbose = true;
+
 if (argv.help) {
   console.log(
     `
@@ -31,9 +33,7 @@ if (argv.help) {
     [];
   const repos = (listRepos.length && listRepos) ||
     (argvRepos.length && argvRepos) ||
-    (envRepos.length && envRepos) || [
-      DIE("Missing PR target, please set env.REPO"),
-    ];
+    (envRepos.length && envRepos) || [DIE("Missing PR target, please set env.REPO")];
   for await (const upstreamUrl of repos) {
     await createComfyRegistryPullRequests(upstreamUrl);
   }

package/src/createComfyRegistryPRsFromCandidates.ts

@@ -1,12 +1,12 @@
 import { $pipeline } from "@/packages/mongodb-pipeline-ts/$pipeline";
 import pMap from "p-map";
 import { match } from "ts-pattern";
+import { $OK, TaskError, TaskOK } from "../packages/mongodb-pipeline-ts/Task";
 import { CNRepos } from "./CNRepos";
 import { createComfyRegistryPullRequests } from "./createComfyRegistryPullRequests";
 import { $filaten, $stale } from "./db";
 import { parseUrlRepoOwner, stringifyOwnerRepo } from "./parseOwnerRepo";
 import { notifySlackLinks } from "./slack/notifySlackLinks";
-import { $OK, TaskError, TaskOK } from "./utils/Task";
 import { tLog } from "./utils/tLog";
 if (import.meta.main) {
   await tLog("createComfyRegistryPRsFromCandidates", createComfyRegistryPRsFromCandidates);

package/src/index.ts

@@ -1,22 +1,21 @@
 #!/usr/bin/env bun
 import "dotenv/config";
-import { $ as zx } from "zx";
 import { checkComfyActivated } from "./checkComfyActivated";
 import { initializeFollowRules } from "./initializeFollowRules";
 import { updateCNRepos } from "./updateCNRepos";
 import { runFollowRuleSet } from "./updateFollowRuleSet";
 import { updateSlackMessages } from "./updateSlackMessages";
+import { tLog } from "./utils/tLog";
 
 if (import.meta.main) {
-  zx.verbose = true;
   await Promise.all([
     // try send msgs that didn't send in last run
     updateSlackMessages(),
     checkComfyActivated(), // needed if make pr
-    initializeFollowRules(),
-    runFollowRuleSet(),
     updateCNRepos(),
   ]);
+  await initializeFollowRules();
+  await tLog("runFollowRuleSet", runFollowRuleSet);
   console.log("All done");
   process.exit(0);
 }

package/src/updateCNRepos.ts

@@ -34,24 +34,24 @@ export async function updateCNRepos() {
       return [await notifySlack(msg, { unique: true, silent: true })];
     }),
     // stage 1: get repos
-    tLog("Update Nodes from ComfyUI Manager", updateCMNodes),
-    tLog("Update Repos from ComfyUI Manager", updateCMRepos),
-    tLog("Update Nodes from ComfyRegistry", updateCRNodes),
-    tLog("Update Repos from ComfyRegistry", updateCRRepos),
+    await tLog("Update Nodes from ComfyUI Manager", updateCMNodes),
+    await tLog("Update Repos from ComfyUI Manager", updateCMRepos),
+    await tLog("Update Nodes from ComfyRegistry", updateCRNodes),
+    await tLog("Update Repos from ComfyRegistry", updateCRRepos),
     // stage 2: update repo info & pulls
-    tLog("Update CNRepos for Repo Infos", updateCNReposInfo),
-    tLog("Update CNRepos for Github Pulls", updateCNReposPulls),
-    tLog("Update Pulls Dashboard", updateCNRepoPullsDashboard),
+    await tLog("Update CNRepos for Repo Infos", updateCNReposInfo),
+    await tLog("Update CNRepos for Github Pulls", updateCNReposPulls),
+    await tLog("Update Pulls Dashboard", updateCNRepoPullsDashboard),
     // stage 3: update related pulls and comments
-    tLog("Update CNRepos for Related Pulls", updateCNReposRelatedPulls),
-    tLog("Update Outdated Pulls Templates", updateOutdatedPullsTemplates),
+    await tLog("Update CNRepos for Related Pulls", updateCNReposRelatedPulls),
+    await tLog("Update Outdated Pulls Templates", updateOutdatedPullsTemplates),
     // stage 4: update related comments
-    tLog("Update CNRepos for Related Comments", updateCNReposCRPullsComments),
+    await tLog("Update CNRepos for Related Comments", updateCNReposCRPullsComments),
     // stage 5: mark and create PRs
-    tLog("Update CNRepos PR Candidates", updateCNReposPRCandidate),
-    tLog("Create ComfyRegistry PRs", createComfyRegistryPRsFromCandidates),
+    await tLog("Update CNRepos PR Candidates", updateCNReposPRCandidate),
+    await tLog("Create ComfyRegistry PRs", createComfyRegistryPRsFromCandidates),
     // final
-    tLog("Update Comfy Totals", updateComfyTotals),
+    await tLog("Update Comfy Totals", updateComfyTotals),
   ]);
 
   console.log("All repo updated");

package/src/updateCNReposCRPullsComments.ts

@@ -5,9 +5,9 @@ import { $fresh, $stale } from "./db";
 // import { $pipeline } from "./db/$pipeline";
 import { $filaten } from "@/packages/mongodb-pipeline-ts/$filaten";
 import { $pipeline } from "@/packages/mongodb-pipeline-ts/$pipeline";
+import { TaskError, TaskOK } from "../packages/mongodb-pipeline-ts/Task";
 import { getWorkerInstance } from "./WorkerInstances";
 import { fetchIssueComments } from "./gh/fetchIssueComments";
-import { TaskError, TaskOK } from "./utils/Task";
 
 if (import.meta.main) {
   await getWorkerInstance("updateCNReposCRPullsComments");

package/src/updateCNReposInfo.ts

@@ -1,12 +1,12 @@
 import pMap from "p-map";
 import { dissoc } from "rambda";
 import { match } from "ts-pattern";
+import { $OK, TaskError, TaskOK } from "../packages/mongodb-pipeline-ts/Task";
 import { CNRepos } from "./CNRepos";
 import { getWorkerInstance } from "./WorkerInstances";
 import { $filaten, $stale } from "./db";
 import { gh } from "./gh";
 import { parseUrlRepoOwner } from "./parseOwnerRepo";
-import { $OK, TaskError, TaskOK } from "./utils/Task";
 import { tLog } from "./utils/tLog";
 
 if (import.meta.main) {

package/src/updateCNReposPRCandidate.ts

@@ -2,11 +2,11 @@ import { $pipeline } from "@/packages/mongodb-pipeline-ts/$pipeline";
 import pMap from "p-map";
 import { peekYaml } from "peek-log";
 import { match } from "ts-pattern";
+import { $OK, TaskOK } from "../packages/mongodb-pipeline-ts/Task";
 import { CNRepos } from "./CNRepos";
 import { $filaten, $fresh, $stale } from "./db";
 import { updateCNReposPulls } from "./updateCNReposPulls";
 import { updateCNReposRelatedPulls } from "./updateCNReposRelatedPulls";
-import { $OK, TaskOK } from "./utils/Task";
 import { tLog } from "./utils/tLog";
 if (import.meta.main) {
   console.log(await updateCNReposPRCandidate());

package/src/updateCNReposPulls.ts

@@ -1,10 +1,10 @@
 import { $pipeline } from "@/packages/mongodb-pipeline-ts/$pipeline";
 import pMap from "p-map";
 import { match } from "ts-pattern";
+import { $OK, TaskError, TaskOK } from "../packages/mongodb-pipeline-ts/Task";
 import { CNRepos } from "./CNRepos";
 import { $filaten, $stale } from "./db";
 import { fetchGithubPulls } from "./gh/fetchGithubPulls";
-import { $OK, TaskError, TaskOK } from "./utils/Task";
 import { tLog } from "./utils/tLog";
 if (import.meta.main) {
   console.log(await tLog("Update CNRepos for Github Pulls", updateCNReposPulls));

package/src/updateCNReposPullsDashboard.ts

@@ -1,11 +1,11 @@
 import DIE from "@snomiao/die";
 import { match } from "ts-pattern";
+import { $OK } from "../packages/mongodb-pipeline-ts/Task";
 import { CNRepos } from "./CNRepos";
 import { $filaten, $fresh } from "./db";
 import { gh } from "./gh";
 import { ghUser } from "./ghUser";
 import { parseUrlRepoOwner, stringifyOwnerRepo } from "./parseOwnerRepo";
-import { $OK } from "./utils/Task";
 
 export async function updateCNRepoPullsDashboard() {
   if (ghUser.login !== "snomiao") return [];

package/src/updateCNReposRelatedPulls.ts

@@ -1,10 +1,10 @@
 import DIE from "@snomiao/die";
 import pMap from "p-map";
 import { match } from "ts-pattern";
+import { $OK, TaskError, TaskOK } from "../packages/mongodb-pipeline-ts/Task";
 import { CNRepos } from "./CNRepos";
 import { $filaten, $stale } from "./db";
 import { matchRelatedPulls } from "./matchRelatedPulls";
-import { $OK, TaskError, TaskOK } from "./utils/Task";
 import { tLog } from "./utils/tLog";
 if (import.meta.main) {
   await tLog("updateCNReposRelatedPulls", updateCNReposRelatedPulls);

package/src/updateCRNodes.ts

@@ -2,11 +2,11 @@ import { $pipeline } from "@/packages/mongodb-pipeline-ts/$pipeline";
 import { peekYaml } from "peek-log";
 import { filter, groupBy, values } from "rambda";
 import YAML from "yaml";
+import { TaskOK } from "../packages/mongodb-pipeline-ts/Task";
 import { CNRepos } from "./CNRepos";
 import { CRNodes } from "./CRNodes";
 import { fetchCRNodes } from "./fetchComfyRegistryNodes";
 import { notifySlack } from "./slack/notifySlack";
-import { TaskOK } from "./utils/Task";
 import { tLog } from "./utils/tLog";
 
 if (import.meta.main) {

package/src/updateComfyTotals.ts

@@ -1,11 +1,10 @@
 import { match } from "ts-pattern";
 import YAML from "yaml";
+import { $OK, TaskError, TaskOK, tsmatch } from "../packages/mongodb-pipeline-ts/Task";
 import { Totals } from "./Totals";
 import { analyzeTotals } from "./analyzeTotals";
 import { $filaten, $fresh } from "./db";
 import { notifySlack } from "./slack/notifySlack";
-import { $OK, TaskError, TaskOK } from "./utils/Task";
-import { tsmatch } from "./utils/tsmatch";
 
 if (import.meta.main) {
   await updateComfyTotals();
@@ -23,13 +22,15 @@ export async function updateComfyTotals({ notify = true, fresh = "30m" } = {}) {
   const totals = await analyzeTotals().then(TaskOK).catch(TaskError);
 
   // notify
-  notify &&
-    (await match(totals)
+  if (notify) {
+    // ignore today
+    await match(totals)
       .with($OK, async (totals) => {
         const msg = `Totals: \n${"```"}\n${YAML.stringify(totals)}\n${"```"}`;
         await notifySlack(msg, { unique: true });
       })
-      .otherwise(() => null));
+      .otherwise(() => null);
+  }
 
   const insertResult = await Totals.insertOne({ totals });
   return [

package/src/updateFollowRuleSet.ts

@@ -1,34 +1,45 @@
 "use server";
-import { TaskDataOrNull } from "@/app/(dashboard)/rules/TaskDataOrNull";
 import { $elemMatch } from "@/packages/mongodb-pipeline-ts/$elemMatch";
 import { $pipeline } from "@/packages/mongodb-pipeline-ts/$pipeline";
+import { TaskDataOrNull } from "@/packages/mongodb-pipeline-ts/Task";
 import DIE from "@snomiao/die";
 import pMap from "p-map";
+import { peekYaml } from "peek-log";
+import { TaskError, TaskOK, type Task } from "../packages/mongodb-pipeline-ts/Task";
 import { CNRepos, type CRPull } from "./CNRepos";
 import { FollowRuleSets } from "./FollowRules";
 import type { GithubIssueComment } from "./GithubIssueComments";
-import { analyzePullsStatusPipeline, type PullStatus } from "./analyzePullsStatus";
+import { analyzePullsStatus, analyzePullsStatusPipeline } from "./analyzePullsStatus";
 import { createIssueComment } from "./createIssueComment";
 import { $filaten } from "./db";
 import { zAddCommentAction, zFollowUpRules } from "./followRuleSchema";
+import { fetchIssueComments } from "./gh/fetchIssueComments";
+import { ghUser } from "./ghUser";
+import { initializeFollowRules } from "./initializeFollowRules";
+import { stringifyGithubRepoUrl } from "./parseOwnerRepo";
+import { parsePullUrl } from "./parsePullUrl";
 import { notifySlackLinks } from "./slack/notifySlackLinks";
-import { TaskError, TaskOK } from "./utils/Task";
-import { prettyMs } from "./utils/tLog";
 import { yaml } from "./utils/yaml";
 
 if (import.meta.main) {
   // updateFollowRuleSet({yaml: 'default'})
+  await FollowRuleSets.drop();
+  const defaultRuleSet = await initializeFollowRules();
+
+  await updateFollowRuleSet({ name: "default", enable: true, yaml: defaultRuleSet.yaml });
   await runFollowRuleSet();
 }
 
 export async function runFollowRuleSet({ name = "default" } = {}) {
   const ruleset = (await FollowRuleSets.findOne({ name })) ?? DIE("default ruleset not found");
-  return await updateFollowRuleSet({
-    name: ruleset.name,
-    enable: ruleset.enabled ?? DIE("Ruleset is not enabled"),
-    yaml: ruleset.yamlWhenEnabled ?? DIE("Enabled yaml is not found"),
-    runAction: true,
-  });
+  return peekYaml(
+    await updateFollowRuleSet({
+      name: ruleset.name,
+      enable: ruleset.enabled ?? DIE("Ruleset is not enabled"),
+      yaml: ruleset.yamlWhenEnabled ?? DIE("Enabled yaml is not found"),
+      runAction: true,
+    }),
+  );
 }
 export type updateFollowRuleSet = typeof updateFollowRuleSet;
 export async function updateFollowRuleSet({
@@ -59,20 +70,34 @@ export async function updateFollowRuleSet({
     const parseResult = await pMap(
       rules,
       async (rule) => {
-        const matched = await analyzePullsStatusPipeline()
-          .match(rule.$match)
-          .aggregate()
-          .map(({ updated_at, created_at, on_registry_at, ...pull }) => {
-            const updated = prettyMs(+new Date() - +new Date(updated_at), { compact: true }) + " ago";
-            return {
-              updated, //: updated === created ? "never" : updated,
-              ...pull,
-              lastwords: pull.lastwords?.replace(/\s+/g, " ").replace(/\*\*\*.*/g, "..."),
-            } as PullStatus;
-          })
-          .toArray()
+        if (runAction) {
+          // pre-fetch comments before run a rule -> match -> action, to prevent comment on a outdated pull state
+          const preMatched = await analyzePullsStatus({ pipeline: analyzePullsStatusPipeline().match(rule.$match) })
+            .then(TaskOK)
+            .catch(TaskError);
+
+          // update comments before run action
+          const matchedData = TaskDataOrNull(preMatched) ?? DIE("NO-PAYLOAD-AVAILABLE");
+          await pMap(matchedData, async (payload) => {
+            const html_url = payload.url;
+            const { owner, repo, pull_number } = parsePullUrl(payload.url);
+            const repository = stringifyGithubRepoUrl({ owner, repo });
+
+            const comments = await fetchIssueComments(repository, { number: pull_number })
+              .then(TaskOK)
+              .catch(TaskError);
+            (
+              await CNRepos.updateOne($filaten({ repository, crPulls: { data: { pull: { html_url } } } }), {
+                $set: { "crPulls.data.$.comments": comments },
+              })
+            ).matchedCount ?? DIE("pre-matched comments is not found");
+          });
+        }
+
+        const matched = await analyzePullsStatus({ pipeline: analyzePullsStatusPipeline().match(rule.$match) })
           .then(TaskOK)
           .catch(TaskError);
+
         const actions = await (async function () {
           return await pMap(
             Object.entries(rule.action),
@@ -95,19 +120,23 @@ export async function updateFollowRuleSet({
                       ),
                     };
 
-                    if (runAction) {
-                      const existedComments =
+                    if (runAction && loadedAction.by === ghUser.login) {
+                      const existedCommentsTask =
                         (await $pipeline(CNRepos)
                           .unwind("$crPulls.data")
                           .match({ "crPulls.data.pull.html_url": loadedAction.url })
                           .with<{ "crPulls.data": CRPull }>()
-                          .replaceRoot({ newRoot: "$crPulls.data.comments.data" })
-                          .as<GithubIssueComment[]>()
+                          .replaceRoot({ newRoot: "$crPulls.data.comments" })
+                          .as<Task<GithubIssueComment[]>>()
                           .aggregate()
                           .next()) ??
                         DIE("comments is not fetched before, plz check " + loadedAction.url + " in CNRepos");
 
+                      const existedComments =
+                        TaskDataOrNull(existedCommentsTask) ??
+                        DIE("NO-COMMENTS-FOUND should never happen here, bcz pipeline filtered at first");
                       const existedComment = existedComments.find((e) => e.body === loadedAction.body);
+
                       if (!existedComment) {
                         const { comments, comment } = await createIssueComment(
                           loadedAction.url,
@@ -127,7 +156,7 @@ export async function updateFollowRuleSet({
 
                     return loadedAction;
                   },
-                  { stopOnError: false, concurrency: 1 },
+                  { concurrency: 1 },
                 );
               }
             },

package/src/updateOutdatedPullsTemplates.ts

@@ -2,6 +2,7 @@ import { $elemMatch } from "@/packages/mongodb-pipeline-ts/$elemMatch";
 import DIE from "@snomiao/die";
 import pMap from "p-map";
 import { match } from "ts-pattern";
+import { $OK, TaskError, TaskOK, tsmatch } from "../packages/mongodb-pipeline-ts/Task";
 import { CNRepos, type CRPull } from "./CNRepos";
 import { $filaten, $fresh, $stale } from "./db";
 import { gh } from "./gh";
@@ -10,9 +11,7 @@ import { ghUser } from "./ghUser";
 import { parseUrlRepoOwner } from "./parseOwnerRepo";
 import { readTemplate } from "./readTemplateTitle";
 import { notifySlackLinks } from "./slack/notifySlackLinks";
-import { $OK, TaskError, TaskOK } from "./utils/Task";
 import { tLog } from "./utils/tLog";
-import { tsmatch } from "./utils/tsmatch";
 if (import.meta.main) {
   await tLog("updateOutdatedPullsTemplates", updateOutdatedPullsTemplates);
 }
@@ -21,7 +20,9 @@ export async function updateOutdatedPullsTemplates() {
   const pyproject = await readTemplate("add-toml.md");
   const publishcr = await readTemplate("add-action.md");
   const outdated_pyproject = await readTemplate("outdated/add-toml.md");
+  const outdated_pyproject_v2 = await readTemplate("outdated/add-toml-v2.md");
   const outdated_publishcr = await readTemplate("outdated/add-action.md");
+  const outdated_publishcr_v2 = await readTemplate("outdated/add-action-v2.md");
   // const templateOutdate = new Date("2024-06-13T09:02:56.630Z");
 
   await CNRepos.createIndex({
@@ -46,12 +47,21 @@ export async function updateOutdatedPullsTemplates() {
             },
             pull: {
               user: { login: ghUser.login },
-              title: outdated_pyproject.title,
-              // title: {
-              //   $in: [outdated_pyproject.title, outdated_publishcr.title],
-              // },
+              title: {
+                $in: [
+                  outdated_pyproject.title,
+                  outdated_pyproject_v2.title,
+                  outdated_publishcr.title,
+                  outdated_publishcr_v2.title,
+                ],
+              },
               body: {
-                $in: [outdated_pyproject.body, outdated_publishcr.body],
+                $in: [
+                  outdated_pyproject.body,
+                  outdated_pyproject_v2.body,
+                  outdated_publishcr.body,
+                  outdated_publishcr_v2.body,
+                ],
               },
             },
           }),
@@ -92,7 +102,9 @@ export async function updateOutdatedPullsTemplates() {
             .with(pyproject, () => DIE("is already latest template"))
             .with(publishcr, () => DIE("is already latest template"))
             .with(outdated_pyproject, () => pyproject)
+            .with(outdated_pyproject_v2, () => pyproject)
             .with(outdated_publishcr, () => publishcr)
+            .with(outdated_publishcr_v2, () => publishcr)
             // in case author clicked some task as completed, body will be different, may cause template mismatch
             .otherwise(() => DIE("Template not found: " + pull.title));
           if (!replacement) return { ...data, edited: TaskError("Template mismatch") };