Merge pull request #72 from Blazity/revert-70-feat/jira-app

Revert "feat/jira-app"

Author: woywro

.env.example

@@ -13,15 +13,6 @@ COLUMN_BACKLOG=Backlog
 # Without this, dispatch falls back to ~60s cron polling on every ticket.
 JIRA_WEBHOOK_SECRET=
 
-# Forge bridge (alternative to JIRA_WEBHOOK_SECRET; replaces the personal
-# API-token comment author with the ai-workflow-jira-app Forge app user).
-# Set both when running the companion ai-workflow-jira-app:
-#   - FORGE_SHARED_SECRET: same value passed to `forge variables set --encrypt SHARED_SECRET ...`
-#   - FORGE_COMMENT_URL:   the `post-comment` URL printed by `forge webtrigger`
-# When unset, /jira/dispatch returns 503 and postComment uses Basic auth.
-FORGE_SHARED_SECRET=
-FORGE_COMMENT_URL=
-
 # VCS — choose one provider by setting VCS_KIND to "github" or "gitlab".
 # Only ONE VCS_KIND line should be active in this file.
 VCS_KIND=github

env.ts

@@ -116,13 +116,6 @@ export const env = createEnv({
     // Jira Webhook
     JIRA_WEBHOOK_SECRET: z.string().min(1).optional(),
 
-    // Forge bridge — when both are set, /jira/dispatch authenticates the
-    // X-Forge-Secret header and JiraAdapter.postComment routes through the
-    // ai-workflow-jira-app Forge web trigger so comments are authored by
-    // the Forge app user instead of a personal Atlassian account.
-    FORGE_SHARED_SECRET: z.string().min(1).optional(),
-    FORGE_COMMENT_URL: z.string().url().optional(),
-
     // Redis (run registry)
     AI_WORKFLOW_KV_REST_API_URL: z.string().url(),
     AI_WORKFLOW_KV_REST_API_TOKEN: z.string().min(1),

src/adapters/issue-tracker/jira.test.ts

@@ -493,109 +493,4 @@ describe("JiraAdapter", () => {
       expect(collectText(body.body)).not.toContain("\n");
     });
   });
-
-  describe("postComment via Forge bridge", () => {
-    function forgeAdapter() {
-      return new JiraAdapter({
-        baseUrl: "https://test.atlassian.net",
-        email: "test@example.com",
-        apiToken: "token",
-        projectKey: "PROJ",
-        forgeCommentUrl: "https://forge.example/x/post-comment",
-        forgeSharedSecret: "shh",
-      });
-    }
-
-    it("POSTs to the Forge web trigger with shared-secret header and plain-text body", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        status: 200,
-        statusText: "OK",
-        json: async () => ({ id: "55555", permalinkPath: "?focusedCommentId=55555" }),
-      });
-
-      const url = await forgeAdapter().postComment("PROJ-1", "hello\nworld");
-
-      expect(mockFetch).toHaveBeenCalledTimes(1);
-      const [calledUrl, init] = mockFetch.mock.calls[0];
-      expect(calledUrl).toBe("https://forge.example/x/post-comment");
-      const headers = init.headers as Record<string, string>;
-      expect(headers["x-shared-secret"]).toBe("shh");
-      expect(headers["Content-Type"]).toBe("application/json");
-      expect(JSON.parse(init.body)).toEqual({
-        issueKey: "PROJ-1",
-        body: "hello\nworld",
-      });
-      expect(url).toBe(
-        "https://test.atlassian.net/browse/PROJ-1?focusedCommentId=55555",
-      );
-    });
-
-    it("returns null when Forge response omits id or permalinkPath", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        status: 200,
-        statusText: "OK",
-        json: async () => ({ id: null, permalinkPath: null }),
-      });
-
-      const url = await forgeAdapter().postComment("PROJ-1", "hi");
-      expect(url).toBeNull();
-    });
-
-    it("maps 404 from Forge to IssueTrackerNotFoundError", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: false,
-        status: 404,
-        statusText: "Not Found",
-        json: async () => ({ error: "jira_error", status: 404 }),
-      });
-
-      await expect(forgeAdapter().postComment("PROJ-9", "x")).rejects.toBeInstanceOf(
-        IssueTrackerNotFoundError,
-      );
-    });
-
-    it("throws on other non-2xx Forge responses", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: false,
-        status: 502,
-        statusText: "Bad Gateway",
-        json: async () => ({ error: "jira_error", status: 500 }),
-      });
-
-      await expect(forgeAdapter().postComment("PROJ-1", "x")).rejects.toThrow(
-        /Forge postComment error: 502/,
-      );
-    });
-
-    it("falls back to direct Basic-auth path when only one Forge field is set", async () => {
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        json: async () => ({ id: "98765" }),
-      });
-
-      const adapter = new JiraAdapter({
-        baseUrl: "https://test.atlassian.net",
-        email: "test@example.com",
-        apiToken: "token",
-        projectKey: "PROJ",
-        forgeCommentUrl: "https://forge.example/x/post-comment",
-        // forgeSharedSecret intentionally omitted
-      });
-
-      const url = await adapter.postComment("PROJ-1", "hi");
-
-      const [calledUrl, init] = mockFetch.mock.calls[0];
-      expect(calledUrl).toBe(
-        "https://test.atlassian.net/rest/api/3/issue/PROJ-1/comment",
-      );
-      expect((init.headers as Record<string, string>).Authorization).toMatch(
-        /^Basic /,
-      );
-      expect(url).toBe(
-        "https://test.atlassian.net/browse/PROJ-1?focusedCommentId=98765",
-      );
-    });
-  });
 });

src/adapters/issue-tracker/jira.ts

@@ -11,8 +11,6 @@ export interface JiraConfig {
   email: string;
   apiToken: string;
   projectKey: string;
-  forgeCommentUrl?: string;
-  forgeSharedSecret?: string;
 }
 
 export class JiraAdapter implements IssueTrackerAdapter {
@@ -41,9 +39,7 @@ export class JiraAdapter implements IssueTrackerAdapter {
       if (res.status === 404) {
         throw new IssueTrackerNotFoundError("Jira resource", path);
       }
-      throw new Error(
-        `Jira API error: ${res.status} ${res.statusText} on ${path}`,
-      );
+      throw new Error(`Jira API error: ${res.status} ${res.statusText} on ${path}`);
     }
     if (res.status === 204) return null;
     try {
@@ -73,19 +69,17 @@ export class JiraAdapter implements IssueTrackerAdapter {
       ),
       labels: data.fields.labels ?? [],
       trackerStatus: data.fields.status?.name ?? "",
-      attachments: (data.fields.attachment ?? []).map(
-        (a: any): TicketAttachment => {
-          const contentUrl =
-            a.content == null ? undefined : String(a.content).trim();
-          return {
-            id: String(a.id),
-            filename: a.filename ?? "",
-            mimeType: a.mimeType ?? "application/octet-stream",
-            size: sanitizeAttachmentSize(a.size),
-            contentUrl: contentUrl || undefined,
-          };
-        },
-      ),
+      attachments: (data.fields.attachment ?? []).map((a: any): TicketAttachment => {
+        const contentUrl =
+          a.content == null ? undefined : String(a.content).trim();
+        return {
+          id: String(a.id),
+          filename: a.filename ?? "",
+          mimeType: a.mimeType ?? "application/octet-stream",
+          size: sanitizeAttachmentSize(a.size),
+          contentUrl: contentUrl || undefined,
+        };
+      }),
     };
   }
 
@@ -106,9 +100,6 @@ export class JiraAdapter implements IssueTrackerAdapter {
   }
 
   async postComment(id: string, comment: string): Promise<string | null> {
-    if (this.config.forgeCommentUrl && this.config.forgeSharedSecret) {
-      return this.postCommentViaForge(id, comment);
-    }
     const data = await this.request(`/rest/api/3/issue/${id}/comment`, {
       method: "POST",
       body: JSON.stringify({
@@ -124,34 +115,6 @@ export class JiraAdapter implements IssueTrackerAdapter {
     return `${this.baseUrl}/browse/${encodeURIComponent(id)}?focusedCommentId=${encodeURIComponent(commentId)}`;
   }
 
-  private async postCommentViaForge(
-    id: string,
-    comment: string,
-  ): Promise<string | null> {
-    const res = await fetch(this.config.forgeCommentUrl!, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "x-shared-secret": this.config.forgeSharedSecret!,
-      },
-      body: JSON.stringify({ issueKey: id, body: comment }),
-    });
-    if (res.status === 404) {
-      throw new IssueTrackerNotFoundError("Jira issue", id);
-    }
-    if (!res.ok) {
-      throw new Error(
-        `Forge postComment error: ${res.status} ${res.statusText}`,
-      );
-    }
-    const data = (await res.json()) as {
-      id?: string | null;
-      permalinkPath?: string | null;
-    };
-    if (!data?.id || !data?.permalinkPath) return null;
-    return `${this.baseUrl}/browse/${encodeURIComponent(id)}${data.permalinkPath}`;
-  }
-
   async downloadAttachment(
     url: string,
     opts: { timeoutMs?: number } = {},
@@ -238,9 +201,7 @@ function extractAdfText(adf: any): string {
 
 function extractAcceptanceCriteria(description: any): string {
   const text = extractAdfText(description);
-  const match = text.match(
-    /acceptance criteria[:\s]*([\s\S]*?)(?:\n\n|\n#|$)/i,
-  );
+  const match = text.match(/acceptance criteria[:\s]*([\s\S]*?)(?:\n\n|\n#|$)/i);
   return match?.[1]?.trim() ?? "";
 }
 

src/lib/adapters.ts

@@ -40,8 +40,6 @@ export function createAdapters(): Adapters {
       email: env.JIRA_EMAIL,
       apiToken: env.JIRA_API_TOKEN,
       projectKey: env.JIRA_PROJECT_KEY,
-      forgeCommentUrl: env.FORGE_COMMENT_URL,
-      forgeSharedSecret: env.FORGE_SHARED_SECRET,
     }),
     vcs: createVCS(),
     messaging,

src/lib/step-adapters.ts

@@ -37,8 +37,6 @@ export function createStepAdapters(): StepAdapters {
       email: env.JIRA_EMAIL,
       apiToken: env.JIRA_API_TOKEN,
       projectKey: env.JIRA_PROJECT_KEY,
-      forgeCommentUrl: env.FORGE_COMMENT_URL,
-      forgeSharedSecret: env.FORGE_SHARED_SECRET,
     }),
     vcs: createVCS(),
     messaging,