@ondrej-svec/hog 1.20.0 → 1.21.0

package/dist/fetch-worker.js

@@ -8,172 +8,6 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// src/api.ts
-var BASE_URL, TickTickClient;
-var init_api = __esm({
-  "src/api.ts"() {
-    "use strict";
-    BASE_URL = "https://api.ticktick.com/open/v1";
-    TickTickClient = class {
-      token;
-      constructor(token) {
-        this.token = token;
-      }
-      async request(method, path, body) {
-        const url = `${BASE_URL}${path}`;
-        const init = {
-          method,
-          headers: {
-            Authorization: `Bearer ${this.token}`,
-            "Content-Type": "application/json"
-          }
-        };
-        if (body !== void 0) {
-          init.body = JSON.stringify(body);
-        }
-        const res = await fetch(url, init);
-        if (!res.ok) {
-          const text2 = await res.text();
-          throw new Error(`TickTick API error ${res.status}: ${text2}`);
-        }
-        const text = await res.text();
-        if (!text) return null;
-        return JSON.parse(text);
-      }
-      async listProjects() {
-        return await this.request("GET", "/project") ?? [];
-      }
-      async getProject(projectId) {
-        const result = await this.request("GET", `/project/${projectId}`);
-        if (!result) throw new Error(`TickTick API returned empty response for project ${projectId}`);
-        return result;
-      }
-      async getProjectData(projectId) {
-        const result = await this.request("GET", `/project/${projectId}/data`);
-        if (!result)
-          throw new Error(`TickTick API returned empty response for project data ${projectId}`);
-        return result;
-      }
-      async listTasks(projectId) {
-        const data = await this.getProjectData(projectId);
-        return data.tasks ?? [];
-      }
-      async getTask(projectId, taskId) {
-        const result = await this.request("GET", `/project/${projectId}/task/${taskId}`);
-        if (!result) throw new Error(`TickTick API returned empty response for task ${taskId}`);
-        return result;
-      }
-      async createTask(input) {
-        const result = await this.request("POST", "/task", input);
-        if (!result) throw new Error("TickTick API returned empty response for createTask");
-        return result;
-      }
-      async updateTask(input) {
-        const result = await this.request("POST", `/task/${input.id}`, input);
-        if (!result) throw new Error(`TickTick API returned empty response for updateTask ${input.id}`);
-        return result;
-      }
-      async completeTask(projectId, taskId) {
-        await this.request("POST", `/project/${projectId}/task/${taskId}/complete`);
-      }
-      async deleteTask(projectId, taskId) {
-        await this.request("DELETE", `/project/${projectId}/task/${taskId}`);
-      }
-    };
-  }
-});
-
-// src/config.ts
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
-import { homedir } from "os";
-import { isAbsolute, join, normalize } from "path";
-import { z } from "zod";
-function getAuth() {
-  if (!existsSync(AUTH_FILE)) return null;
-  try {
-    const raw = JSON.parse(readFileSync(AUTH_FILE, "utf-8"));
-    const result = AUTH_SCHEMA.safeParse(raw);
-    return result.success ? result.data : null;
-  } catch {
-    return null;
-  }
-}
-function requireAuth() {
-  const auth = getAuth();
-  if (!auth) {
-    console.error("Not authenticated. Run `hog init` first.");
-    process.exit(1);
-  }
-  return auth;
-}
-var CONFIG_DIR, AUTH_FILE, CONFIG_FILE, AUTH_SCHEMA, COMPLETION_ACTION_SCHEMA, REPO_NAME_PATTERN, CLAUDE_START_COMMAND_SCHEMA, REPO_CONFIG_SCHEMA, BOARD_CONFIG_SCHEMA, TICKTICK_CONFIG_SCHEMA, PROFILE_SCHEMA, HOG_CONFIG_SCHEMA;
-var init_config = __esm({
-  "src/config.ts"() {
-    "use strict";
-    CONFIG_DIR = join(homedir(), ".config", "hog");
-    AUTH_FILE = join(CONFIG_DIR, "auth.json");
-    CONFIG_FILE = join(CONFIG_DIR, "config.json");
-    AUTH_SCHEMA = z.object({
-      accessToken: z.string(),
-      clientId: z.string(),
-      clientSecret: z.string(),
-      openrouterApiKey: z.string().optional()
-    });
-    COMPLETION_ACTION_SCHEMA = z.discriminatedUnion("type", [
-      z.object({ type: z.literal("updateProjectStatus"), optionId: z.string() }),
-      z.object({ type: z.literal("closeIssue") }),
-      z.object({ type: z.literal("addLabel"), label: z.string() })
-    ]);
-    REPO_NAME_PATTERN = /^[\w.-]+\/[\w.-]+$/;
-    CLAUDE_START_COMMAND_SCHEMA = z.object({
-      command: z.string().min(1),
-      extraArgs: z.array(z.string())
-    });
-    REPO_CONFIG_SCHEMA = z.object({
-      name: z.string().regex(REPO_NAME_PATTERN, "Must be owner/repo format"),
-      shortName: z.string().min(1),
-      projectNumber: z.number().int().positive(),
-      statusFieldId: z.string().min(1),
-      dueDateFieldId: z.string().optional(),
-      completionAction: COMPLETION_ACTION_SCHEMA,
-      statusGroups: z.array(z.string()).optional(),
-      localPath: z.string().refine((p) => isAbsolute(p), { message: "localPath must be an absolute path" }).refine((p) => normalize(p) === p, {
-        message: "localPath must be normalized (no .. segments)"
-      }).refine((p) => !p.includes("\0"), { message: "localPath must not contain null bytes" }).optional(),
-      claudeStartCommand: CLAUDE_START_COMMAND_SCHEMA.optional(),
-      claudePrompt: z.string().optional()
-    });
-    BOARD_CONFIG_SCHEMA = z.object({
-      refreshInterval: z.number().int().min(10).default(60),
-      backlogLimit: z.number().int().min(1).default(20),
-      assignee: z.string().min(1),
-      focusDuration: z.number().int().min(60).default(1500),
-      claudeStartCommand: CLAUDE_START_COMMAND_SCHEMA.optional(),
-      claudePrompt: z.string().optional(),
-      claudeLaunchMode: z.enum(["auto", "tmux", "terminal"]).optional(),
-      claudeTerminalApp: z.enum(["Terminal", "iTerm", "Ghostty", "WezTerm", "Kitty", "Alacritty"]).optional()
-    });
-    TICKTICK_CONFIG_SCHEMA = z.object({
-      enabled: z.boolean().default(true)
-    });
-    PROFILE_SCHEMA = z.object({
-      repos: z.array(REPO_CONFIG_SCHEMA).default([]),
-      board: BOARD_CONFIG_SCHEMA,
-      ticktick: TICKTICK_CONFIG_SCHEMA.default({ enabled: true })
-    });
-    HOG_CONFIG_SCHEMA = z.object({
-      version: z.number().int().default(3),
-      defaultProjectId: z.string().optional(),
-      defaultProjectName: z.string().optional(),
-      repos: z.array(REPO_CONFIG_SCHEMA).default([]),
-      board: BOARD_CONFIG_SCHEMA,
-      ticktick: TICKTICK_CONFIG_SCHEMA.default({ enabled: true }),
-      profiles: z.record(z.string(), PROFILE_SCHEMA).default({}),
-      defaultProfile: z.string().optional()
-    });
-  }
-});
-
 // src/github.ts
 import { execFile, execFileSync } from "child_process";
 import { promisify } from "util";
@@ -184,6 +18,23 @@ function runGhJson(args) {
   const output = runGh(args);
   return JSON.parse(output);
 }
+function runGhGraphQL(args) {
+  try {
+    return runGhJson(args);
+  } catch (err) {
+    if (err && typeof err === "object" && "stdout" in err) {
+      const stdout = err.stdout;
+      const output = typeof stdout === "string" ? stdout : stdout?.toString("utf-8");
+      if (output) {
+        try {
+          return JSON.parse(output.trim());
+        } catch {
+        }
+      }
+    }
+    throw err;
+  }
+}
 function fetchRepoIssues(repo, options2 = {}) {
   const { state = "open", limit = 100 } = options2;
   const args = [
@@ -206,41 +57,37 @@ function fetchRepoIssues(repo, options2 = {}) {
 function fetchProjectEnrichment(repo, projectNumber) {
   const [owner] = repo.split("/");
   if (!owner) return /* @__PURE__ */ new Map();
-  const query = `
-    query($owner: String!, $projectNumber: Int!, $cursor: String) {
-      organization(login: $owner) {
-        projectV2(number: $projectNumber) {
-          items(first: 100, after: $cursor) {
-            pageInfo { hasNextPage endCursor }
+  const projectItemsFragment = `
+    projectV2(number: $projectNumber) {
+      items(first: 100, after: $cursor) {
+        pageInfo { hasNextPage endCursor }
+        nodes {
+          content {
+            ... on Issue {
+              number
+            }
+          }
+          fieldValues(first: 20) {
             nodes {
-              content {
-                ... on Issue {
-                  number
-                }
+              ... on ProjectV2ItemFieldDateValue {
+                field { ... on ProjectV2Field { name } }
+                date
+              }
+              ... on ProjectV2ItemFieldSingleSelectValue {
+                field { ... on ProjectV2SingleSelectField { name } }
+                name
+              }
+              ... on ProjectV2ItemFieldTextValue {
+                field { ... on ProjectV2Field { name } }
+                text
+              }
+              ... on ProjectV2ItemFieldNumberValue {
+                field { ... on ProjectV2Field { name } }
+                number
               }
-              fieldValues(first: 20) {
-                nodes {
-                  ... on ProjectV2ItemFieldDateValue {
-                    field { ... on ProjectV2Field { name } }
-                    date
-                  }
-                  ... on ProjectV2ItemFieldSingleSelectValue {
-                    field { ... on ProjectV2SingleSelectField { name } }
-                    name
-                  }
-                  ... on ProjectV2ItemFieldTextValue {
-                    field { ... on ProjectV2Field { name } }
-                    text
-                  }
-                  ... on ProjectV2ItemFieldNumberValue {
-                    field { ... on ProjectV2Field { name } }
-                    number
-                  }
-                  ... on ProjectV2ItemFieldIterationValue {
-                    field { ... on ProjectV2IterationField { name } }
-                    title
-                  }
-                }
+              ... on ProjectV2ItemFieldIterationValue {
+                field { ... on ProjectV2IterationField { name } }
+                title
               }
             }
           }
@@ -248,6 +95,12 @@ function fetchProjectEnrichment(repo, projectNumber) {
       }
     }
   `;
+  const query = `
+    query($owner: String!, $projectNumber: Int!, $cursor: String) {
+      organization(login: $owner) { ${projectItemsFragment} }
+      user(login: $owner) { ${projectItemsFragment} }
+    }
+  `;
   try {
     const enrichMap = /* @__PURE__ */ new Map();
     let cursor = null;
@@ -263,8 +116,9 @@ function fetchProjectEnrichment(repo, projectNumber) {
         `projectNumber=${String(projectNumber)}`
       ];
       if (cursor) args.push("-f", `cursor=${cursor}`);
-      const result = runGhJson(args);
-      const page = result?.data?.organization?.projectV2?.items;
+      const result = runGhGraphQL(args);
+      const ownerNode = result?.data?.organization ?? result?.data?.user;
+      const page = ownerNode?.projectV2?.items;
       const nodes = page?.nodes ?? [];
       for (const item of nodes) {
         if (!item?.content?.number) continue;
@@ -298,24 +152,26 @@ function fetchProjectEnrichment(repo, projectNumber) {
 function fetchProjectStatusOptions(repo, projectNumber, _statusFieldId) {
   const [owner] = repo.split("/");
   if (!owner) return [];
-  const query = `
-    query($owner: String!, $projectNumber: Int!) {
-      organization(login: $owner) {
-        projectV2(number: $projectNumber) {
-          field(name: "Status") {
-            ... on ProjectV2SingleSelectField {
-              options {
-                id
-                name
-              }
-            }
+  const statusFragment = `
+    projectV2(number: $projectNumber) {
+      field(name: "Status") {
+        ... on ProjectV2SingleSelectField {
+          options {
+            id
+            name
           }
         }
       }
     }
   `;
+  const query = `
+    query($owner: String!, $projectNumber: Int!) {
+      organization(login: $owner) { ${statusFragment} }
+      user(login: $owner) { ${statusFragment} }
+    }
+  `;
   try {
-    const result = runGhJson([
+    const result = runGhGraphQL([
       "api",
       "graphql",
       "-f",
@@ -325,7 +181,8 @@ function fetchProjectStatusOptions(repo, projectNumber, _statusFieldId) {
       "-F",
       `projectNumber=${String(projectNumber)}`
     ]);
-    return result?.data?.organization?.projectV2?.field?.options ?? [];
+    const ownerNode = result?.data?.organization ?? result?.data?.user;
+    return ownerNode?.projectV2?.field?.options ?? [];
   } catch {
     return [];
   }
@@ -339,13 +196,6 @@ var init_github = __esm({
   }
 });
 
-// src/types.ts
-var init_types = __esm({
-  "src/types.ts"() {
-    "use strict";
-  }
-});
-
 // src/utils.ts
 function formatError(err) {
   return err instanceof Error ? err.message : String(err);
@@ -360,6 +210,8 @@ var init_utils = __esm({
 var fetch_exports = {};
 __export(fetch_exports, {
   SLACK_URL_RE: () => SLACK_URL_RE,
+  extractIssueNumbersFromBranch: () => extractIssueNumbersFromBranch,
+  extractLinkedIssueNumbers: () => extractLinkedIssueNumbers,
   extractSlackUrl: () => extractSlackUrl,
   fetchDashboard: () => fetchDashboard,
   fetchRecentActivity: () => fetchRecentActivity
@@ -370,6 +222,17 @@ function extractSlackUrl(body) {
   const match = body.match(SLACK_URL_RE);
   return match?.[0];
 }
+function extractIssueNumbersFromBranch(branchName) {
+  const matches = branchName.match(/\b(\d{1,5})\b/g);
+  if (!matches) return [];
+  return [...new Set(matches.map((m) => parseInt(m, 10)).filter((n) => n > 0))];
+}
+function extractLinkedIssueNumbers(title, body) {
+  const text = `${title ?? ""} ${body ?? ""}`;
+  const matches = text.match(/#(\d{1,5})\b/g);
+  if (!matches) return [];
+  return [...new Set(matches.map((m) => parseInt(m.slice(1), 10)).filter((n) => n > 0))];
+}
 function fetchRecentActivity(repoName, shortName) {
   try {
     const output = execFileSync2(
@@ -377,9 +240,10 @@ function fetchRecentActivity(repoName, shortName) {
       [
         "api",
         `repos/${repoName}/events`,
-        "--paginate",
+        "-f",
+        "per_page=30",
         "-q",
-        '.[] | select(.type == "IssuesEvent" or .type == "IssueCommentEvent" or .type == "PullRequestEvent") | {type: .type, actor: .actor.login, action: .payload.action, number: (.payload.issue.number // .payload.pull_request.number), title: (.payload.issue.title // .payload.pull_request.title), body: .payload.comment.body, created_at: .created_at}'
+        '.[] | select(.type == "IssuesEvent" or .type == "IssueCommentEvent" or .type == "PullRequestEvent" or .type == "CreateEvent") | {type: .type, actor: .actor.login, action: .payload.action, number: (.payload.issue.number // .payload.pull_request.number), title: (.payload.issue.title // .payload.pull_request.title), body: (.payload.comment.body // .payload.pull_request.body), created_at: .created_at, ref: .payload.ref, ref_type: .payload.ref_type, merged: .payload.pull_request.merged}'
       ],
       { encoding: "utf-8", timeout: 15e3 }
     );
@@ -391,9 +255,26 @@ function fetchRecentActivity(repoName, shortName) {
         const ev = JSON.parse(line);
         const timestamp = new Date(ev.created_at);
         if (timestamp.getTime() < cutoff) continue;
+        if (ev.type === "CreateEvent") {
+          if (ev.ref_type !== "branch" || !ev.ref) continue;
+          const issueNumbers = extractIssueNumbersFromBranch(ev.ref);
+          for (const num of issueNumbers) {
+            events.push({
+              type: "branch_created",
+              repoShortName: shortName,
+              issueNumber: num,
+              actor: ev.actor,
+              summary: `created branch ${ev.ref}`,
+              timestamp,
+              branchName: ev.ref
+            });
+          }
+          continue;
+        }
         if (!ev.number) continue;
         let eventType;
         let summary;
+        let extras = {};
         if (ev.type === "IssueCommentEvent") {
           eventType = "comment";
           const preview = ev.body ? ev.body.slice(0, 60).replace(/\n/g, " ") : "";
@@ -419,6 +300,45 @@ function fetchRecentActivity(repoName, shortName) {
             default:
               continue;
           }
+        } else if (ev.type === "PullRequestEvent") {
+          const prNumber = ev.number;
+          extras = { prNumber };
+          if (ev.action === "opened") {
+            eventType = "pr_opened";
+            summary = `opened PR #${prNumber}: ${ev.title ?? ""}`;
+          } else if (ev.action === "closed" && ev.merged) {
+            eventType = "pr_merged";
+            summary = `merged PR #${prNumber}: ${ev.title ?? ""}`;
+          } else if (ev.action === "closed") {
+            eventType = "pr_closed";
+            summary = `closed PR #${prNumber}`;
+          } else {
+            continue;
+          }
+          const linkedIssues = extractLinkedIssueNumbers(ev.title, ev.body);
+          for (const issueNum of linkedIssues) {
+            events.push({
+              type: eventType,
+              repoShortName: shortName,
+              issueNumber: issueNum,
+              actor: ev.actor,
+              summary,
+              timestamp,
+              prNumber
+            });
+          }
+          if (linkedIssues.length === 0) {
+            events.push({
+              type: eventType,
+              repoShortName: shortName,
+              issueNumber: prNumber,
+              actor: ev.actor,
+              summary,
+              timestamp,
+              prNumber
+            });
+          }
+          continue;
         } else {
           continue;
         }
@@ -428,7 +348,8 @@ function fetchRecentActivity(repoName, shortName) {
           issueNumber: ev.number,
           actor: ev.actor,
           summary,
-          timestamp
+          timestamp,
+          ...extras
         });
       } catch {
       }
@@ -480,20 +401,6 @@ async function fetchDashboard(config2, options2 = {}) {
       return { repo, issues: [], statusOptions: [], error: formatError(err) };
     }
   });
-  let ticktick = [];
-  let ticktickError = null;
-  if (config2.ticktick.enabled) {
-    try {
-      const auth = requireAuth();
-      const api = new TickTickClient(auth.accessToken);
-      if (config2.defaultProjectId) {
-        const tasks = await api.listTasks(config2.defaultProjectId);
-        ticktick = tasks.filter((t) => t.status !== 2 /* Completed */);
-      }
-    } catch (err) {
-      ticktickError = formatError(err);
-    }
-  }
   const activity = [];
   for (const repo of repos) {
     const events = fetchRecentActivity(repo.name, repo.shortName);
@@ -502,8 +409,6 @@ async function fetchDashboard(config2, options2 = {}) {
   activity.sort((a, b) => b.timestamp.getTime() - a.timestamp.getTime());
   return {
     repos: repoData,
-    ticktick,
-    ticktickError,
     activity: activity.slice(0, 15),
     fetchedAt: /* @__PURE__ */ new Date()
   };
@@ -512,10 +417,7 @@ var SLACK_URL_RE;
 var init_fetch = __esm({
   "src/board/fetch.ts"() {
     "use strict";
-    init_api();
-    init_config();
     init_github();
-    init_types();
     init_utils();
     SLACK_URL_RE = /https:\/\/[^/]+\.slack\.com\/archives\/[A-Z0-9]+\/p[0-9]+/i;
   }