npm - panopticon-cli - Versions diffs - 0.4.12 → 0.4.14 - Mend

panopticon-cli 0.4.12 → 0.4.14

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

package/dist/{chunk-WLL3UEYI.js → chunk-YCX7RVYW.js} +94 -53
package/dist/chunk-YCX7RVYW.js.map +1 -0
package/dist/cli/index.js +1 -1
package/dist/dashboard/public/assets/{index-Bwu9d0w1.js → index-CE4Bu8aP.js} +42 -42
package/dist/dashboard/public/index.html +1 -1
package/dist/dashboard/server.js +168 -68
package/dist/index.js +1 -1
package/package.json +1 -1
package/dist/chunk-WLL3UEYI.js.map +0 -1

package/dist/dashboard/public/index.html CHANGED Viewed

@@ -17,7 +17,7 @@
         }
       })();
     </script>
-    <script type="module" crossorigin src="/assets/index-Bwu9d0w1.js"></script>
+    <script type="module" crossorigin src="/assets/index-CE4Bu8aP.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-Bp7DyPLO.css">
   </head>
   <body class="bg-surface text-content transition-colors duration-150">

package/dist/dashboard/server.js CHANGED Viewed

@@ -51275,7 +51275,7 @@ var rally_exports = {};
 __export(rally_exports, {
   RallyTracker: () => RallyTracker
 });
-var STATE_MAP, PRIORITY_MAP, REVERSE_PRIORITY_MAP, RallyTracker;
+var STATE_MAP, QUERYABLE_TYPES, FETCH_FIELDS, PRIORITY_MAP, REVERSE_PRIORITY_MAP, RallyTracker;
 var init_rally = __esm({
   "../../lib/tracker/rally.ts"() {
     "use strict";
@@ -51287,6 +51287,27 @@ var init_rally = __esm({
       Completed: "closed",
       Accepted: "closed"
     };
+    QUERYABLE_TYPES = [
+      { type: "hierarchicalrequirement", stateField: "ScheduleState", closedStates: ["Completed", "Accepted"] },
+      { type: "defect", stateField: "State", closedStates: ["Closed"] },
+      { type: "task", stateField: "State", closedStates: ["Completed"] }
+    ];
+    FETCH_FIELDS = [
+      "ObjectID",
+      "FormattedID",
+      "Name",
+      "Description",
+      "ScheduleState",
+      "State",
+      "Tags",
+      "Owner",
+      "Priority",
+      "DueDate",
+      "CreationDate",
+      "LastUpdateDate",
+      "Parent",
+      "_type"
+    ];
     PRIORITY_MAP = {
       "Resolve Immediately": 0,
       High: 1,
@@ -51324,50 +51345,55 @@ var init_rally = __esm({
         this.workspace = config2.workspace;
         this.project = config2.project;
       }
+      /**
+       * List issues by querying each artifact type separately and merging results.
+       *
+       * Rally WSAPI cannot apply ScheduleState filters across the generic Artifact
+       * endpoint because not all subtypes have that field. We query each type with
+       * its own state field, then merge and sort. (PAN-168)
+       */
       async listIssues(filters) {
-        const queryString = this.buildQueryString(filters);
         if (process.env.DEBUG?.includes("rally")) {
           console.debug("[Rally] Query filters:", JSON.stringify(filters));
-          console.debug("[Rally] Generated query:", queryString);
-        }
-        const query = {
-          type: "artifact",
-          // Query all artifact types
-          fetch: [
-            "FormattedID",
-            "Name",
-            "Description",
-            "ScheduleState",
-            "State",
-            // For Defects
-            "Tags",
-            "Owner",
-            "Priority",
-            "DueDate",
-            "CreationDate",
-            "LastUpdateDate",
-            "Parent",
-            "_type"
-          ],
-          limit: filters?.limit ?? 50,
-          query: queryString
-        };
-        if (this.workspace) {
-          query.workspace = this.workspace;
-        }
-        if (this.project) {
-          query.project = this.project;
-          query.projectScopeDown = true;
         }
-        try {
-          const result = await this.queryRally(query);
-          return result.Results.map((artifact) => this.normalizeIssue(artifact));
-        } catch (error) {
-          if (error.message?.includes("Unauthorized") || error.message?.includes("401")) {
-            throw new TrackerAuthError("rally", "Invalid API key or insufficient permissions");
+        const limit = filters?.limit ?? 50;
+        const queries = QUERYABLE_TYPES.map(async (artifactType) => {
+          const queryString = this.buildQueryStringForType(filters, artifactType);
+          if (process.env.DEBUG?.includes("rally")) {
+            console.debug(`[Rally] ${artifactType.type} query:`, queryString);
           }
-          throw error;
-        }
+          const query = {
+            type: artifactType.type,
+            fetch: FETCH_FIELDS,
+            limit,
+            query: queryString
+          };
+          if (this.workspace) {
+            query.workspace = this.workspace;
+          }
+          if (this.project) {
+            query.project = this.project;
+            query.projectScopeDown = true;
+          }
+          try {
+            const result = await this.queryRally(query);
+            return result.Results.map((artifact) => this.normalizeIssue(artifact));
+          } catch (error) {
+            if (error.message?.includes("Unauthorized") || error.message?.includes("401")) {
+              throw new TrackerAuthError("rally", "Invalid API key or insufficient permissions");
+            }
+            if (process.env.DEBUG?.includes("rally")) {
+              console.debug(`[Rally] Failed to query ${artifactType.type}:`, error.message);
+            }
+            return [];
+          }
+        });
+        const results = await Promise.all(queries);
+        const allIssues = results.flat();
+        allIssues.sort(
+          (a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime()
+        );
+        return allIssues.slice(0, limit);
       }
       async getIssue(id) {
         try {
@@ -51552,24 +51578,31 @@ var init_rally = __esm({
       }
       // Private helper methods
       /**
-       * Build a Rally WSAPI query string from issue filters.
+       * Build a Rally WSAPI query string for a specific artifact type.
        *
-       * Rally WSAPI v2.0 requires the entire compound query expression to be wrapped
-       * in outer parentheses when multiple conditions are joined with AND/OR.
-       * Without the outer parens, the WSAPI parser fails with:
-       *   "Could not parse: Error parsing expression -- expected ")" but saw "AND" instead."
+       * Each artifact type has its own state field:
+       *   - HierarchicalRequirement: ScheduleState (Defined, In-Progress, Completed, Accepted)
+       *   - Defect: State (Submitted, Open, Fixed, Closed)
+       *   - Task: State (Defined, In-Progress, Completed)
        *
-       * Valid:   (((ScheduleState != "Completed") AND (State != "Closed")) AND (Owner.Name contains "John"))
-       * Invalid: ((ScheduleState != "Completed") AND (State != "Closed")) AND (Owner.Name contains "John")
+       * Rally WSAPI v2.0 requires binary-nested AND/OR with outer parentheses.
+       * (PAN-166, PAN-168)
        */
-      buildQueryString(filters) {
+      buildQueryStringForType(filters, artifactType) {
         const conditions = [];
         if (filters?.state && !filters.includeClosed) {
           const rallyState = this.reverseMapState(filters.state);
-          conditions.push(`((ScheduleState = "${rallyState}") OR (State = "${rallyState}"))`);
+          conditions.push(`(${artifactType.stateField} = "${rallyState}")`);
         }
         if (!filters?.includeClosed) {
-          conditions.push('(((ScheduleState != "Completed") AND (ScheduleState != "Accepted")) AND (State != "Closed"))');
+          const closedConditions = artifactType.closedStates.map(
+            (state) => `(${artifactType.stateField} != "${state}")`
+          );
+          const closedExpr = closedConditions.reduce(
+            (acc, cond) => acc ? `(${acc} AND ${cond})` : cond,
+            ""
+          );
+          conditions.push(closedExpr);
         }
         if (filters?.assignee) {
           conditions.push(`(Owner.Name contains "${filters.assignee}")`);
@@ -51591,13 +51624,21 @@ var init_rally = __esm({
         const state = this.mapState(stateValue);
         const labels = [];
         if (rallyArtifact.Tags && rallyArtifact.Tags._tagsNameArray) {
-          labels.push(...rallyArtifact.Tags._tagsNameArray);
+          for (const tag of rallyArtifact.Tags._tagsNameArray) {
+            if (typeof tag === "string") {
+              labels.push(tag);
+            } else if (tag?.Name) {
+              labels.push(tag.Name);
+            }
+          }
         }
         const priority = rallyArtifact.Priority ? PRIORITY_MAP[rallyArtifact.Priority] ?? 2 : void 0;
+        const objectId = rallyArtifact.ObjectID || rallyArtifact.FormattedID;
+        const artifactType = rallyArtifact._type || "artifact";
         const baseUrl = this.restApi.server.replace("/slm/webservice/", "");
-        const url = `${baseUrl}/#/detail/${rallyArtifact._type.toLowerCase()}/${rallyArtifact.ObjectID}`;
+        const url = `${baseUrl}/#/detail/${artifactType.toLowerCase()}/${objectId}`;
         return {
-          id: rallyArtifact.ObjectID,
+          id: String(objectId),
           ref: rallyArtifact.FormattedID,
           title: rallyArtifact.Name || "",
           description: rallyArtifact.Description || "",
@@ -67224,16 +67265,38 @@ async function postMergeCleanup(issueId, projectPath) {
   }
   const isGitHub = issueId.toUpperCase().startsWith("PAN-");
   if (isGitHub) {
+    const issueNum = issueId.replace(/^PAN-/i, "");
+    try {
+      const branchName = `feature/${issueId.toLowerCase()}`;
+      const { stdout: prListRaw } = await execAsync10(
+        `gh pr list --repo eltmon/panopticon-cli --head "${branchName}" --state open --json number --jq '.[0].number'`,
+        { cwd: projectPath, encoding: "utf-8" }
+      );
+      const prNumber = prListRaw.trim();
+      if (prNumber) {
+        await execAsync10(
+          `gh pr close ${prNumber} --repo eltmon/panopticon-cli --comment "Merged to main via Panopticon merge-agent"`,
+          { cwd: projectPath, encoding: "utf-8" }
+        );
+        console.log(`[merge-agent] \u2713 Closed PR #${prNumber} for ${issueId}`);
+        logActivity("pr_closed", `Closed PR #${prNumber} for ${issueId}`);
+      }
+    } catch (err) {
+      console.warn(`[merge-agent] Could not close PR: ${err}`);
+    }
     try {
-      const issueNum = issueId.replace(/^PAN-/i, "");
       await execAsync10(`gh issue edit ${issueNum} --remove-label "in-progress" --add-label "done" 2>/dev/null || true`, {
         cwd: projectPath,
         encoding: "utf-8"
       });
-      console.log(`[merge-agent] \u2713 Updated GitHub issue ${issueId} labels`);
-      logActivity("issue_updated", `Updated ${issueId} labels: removed in-progress, added done`);
+      await execAsync10(`gh issue close ${issueNum} --repo eltmon/panopticon-cli --comment "Merged to main" 2>/dev/null || true`, {
+        cwd: projectPath,
+        encoding: "utf-8"
+      });
+      console.log(`[merge-agent] \u2713 Updated and closed GitHub issue #${issueNum}`);
+      logActivity("issue_closed", `Closed GitHub issue #${issueNum} after merge`);
     } catch (err) {
-      console.warn(`[merge-agent] Could not update GitHub issue labels: ${err}`);
+      console.warn(`[merge-agent] Could not close GitHub issue: ${err}`);
     }
   } else {
     try {
@@ -67246,6 +67309,18 @@ async function postMergeCleanup(issueId, projectPath) {
       console.warn(`[merge-agent] Could not update Linear issue: ${err}`);
     }
   }
+  try {
+    const apiPort = process.env.API_PORT || process.env.PORT || "3011";
+    const apiUrl = process.env.DASHBOARD_URL || `http://localhost:${apiPort}`;
+    await fetch(`${apiUrl}/api/specialists/done`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ specialist: "merge", issueId, status: "passed", notes: "Merge and validation completed" })
+    });
+    console.log(`[merge-agent] \u2713 Reported merge success to dashboard API`);
+  } catch (err) {
+    console.warn(`[merge-agent] Could not report to dashboard API: ${err}`);
+  }
   await conditionalBeadsCompaction(projectPath);
   console.log(`[merge-agent] Post-merge cleanup completed for ${issueId}`);
 }
@@ -67703,12 +67778,7 @@ Report any issues or conflicts you encountered.`;
       });
       const currentHead = currentHeadRaw.trim();
       if (currentHead !== headBefore) {
-        const { stdout: commitMessageRaw } = await execAsync10("git log -1 --pretty=%s", {
-          cwd: projectPath,
-          encoding: "utf-8"
-        });
-        const commitMessage = commitMessageRaw.trim().toLowerCase();
-        if (commitMessage.includes("merge") || commitMessage.includes(sourceBranch.toLowerCase())) {
+        {
           try {
             const { stdout: remoteHeadRaw } = await execAsync10(`git rev-parse origin/${targetBranch}`, {
               cwd: projectPath,
@@ -85012,6 +85082,8 @@ function mapGitHubStateToCanonical(state, labels) {
   return "todo";
 }
 function mapRallyStateToCanonical(scheduleState) {
+  if (!scheduleState)
+    return "todo";
   const stateLower = scheduleState.toLowerCase();
   if (stateLower === "defined")
     return "todo";
@@ -85588,10 +85660,11 @@ var IssueDataService = class {
       });
       const formatted = issues.map((issue) => {
         const canonicalStatus = mapRallyStateToCanonical(issue.state);
+        const identifier = issue.ref || issue.id || "unknown";
         return {
-          id: `rally-${issue.id}`,
-          identifier: issue.ref,
-          title: issue.title,
+          id: `rally-${issue.id || identifier}`,
+          identifier,
+          title: issue.title || "",
           description: issue.description || "",
           status: canonicalStatus === "todo" ? "Todo" : canonicalStatus === "in_progress" ? "In Progress" : canonicalStatus === "done" ? "Done" : "Todo",
           priority: issue.priority ?? 3,
@@ -85599,8 +85672,8 @@ var IssueDataService = class {
             name: issue.assignee,
             email: `${issue.assignee.replace(/\s+/g, ".").toLowerCase()}@rally`
           } : void 0,
-          labels: issue.labels || [],
-          url: issue.url,
+          labels: Array.isArray(issue.labels) ? issue.labels.filter((l) => typeof l === "string") : [],
+          url: issue.url || "",
           createdAt: issue.createdAt,
           updatedAt: issue.updatedAt,
           project: {
@@ -94469,6 +94542,14 @@ app.post("/api/specialists/done", async (req, res) => {
       console.log(`[specialists/done] Cleared ${normalizedIssueId} from ${specialist}-agent queue`);
     }
   }
+  if (specialist === "merge" && status === "passed") {
+    try {
+      await closeIssueAfterMerge(normalizedIssueId);
+      console.log(`[specialists/done] Closed issue/PR for ${normalizedIssueId} after merge`);
+    } catch (err) {
+      console.warn(`[specialists/done] Failed to close issue after merge: ${err}`);
+    }
+  }
   res.json({
     success: true,
     specialist,
@@ -94878,6 +94959,25 @@ app.post("/api/workspaces/:issueId/merge", async (req, res) => {
 });
 app.post("/api/workspaces/:issueId/approve", async (req, res) => {
   const { issueId } = req.params;
+  const existingStatus = getReviewStatus(issueId);
+  if (existingStatus?.readyForMerge && existingStatus.reviewStatus === "passed" && existingStatus.testStatus === "passed") {
+    console.log(`[approve] Review+test already passed for ${issueId}, forwarding to merge endpoint...`);
+    try {
+      const apiPort = process.env.API_PORT || process.env.PORT || "3011";
+      const mergeRes = await fetch(`http://localhost:${apiPort}/api/workspaces/${issueId}/merge`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" }
+      });
+      const mergeData = await mergeRes.json();
+      if (mergeRes.ok) {
+        return res.json(mergeData);
+      } else {
+        return res.status(mergeRes.status).json(mergeData);
+      }
+    } catch (err) {
+      return res.status(500).json({ error: `Failed to forward to merge: ${err.message}` });
+    }
+  }
   const issuePrefix = issueId.split("-")[0];
   const projectPath = getProjectPath(void 0, issuePrefix);
   const issueLower = issueId.toLowerCase();

package/dist/index.js CHANGED Viewed

@@ -29,7 +29,7 @@ import {
   planSync,
   restoreBackup,
   syncHooks
-} from "./chunk-WLL3UEYI.js";
+} from "./chunk-YCX7RVYW.js";
 import {
   PROVIDERS,
   getAgentCommand,

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "panopticon-cli",
-  "version": "0.4.12",
+  "version": "0.4.14",
   "description": "Multi-agent orchestration for AI coding assistants (Claude Code, Codex, Cursor, Gemini CLI)",
   "keywords": [
     "ai-agents",