paperclip-github-plugin 0.4.4 → 0.4.6

package/dist/worker.js

@@ -44,7 +44,7 @@ var projectNumberProperty = {
 };
 var llmModelProperty = {
   type: "string",
-  description: "Exact LLM name used to draft the comment. Required so the plugin can append the mandatory AI-authorship footer."
+  description: "Exact LLM name used to draft the GitHub content. When provided, the plugin includes it in the mandatory AI-authorship footer."
 };
 var issueTargetSchema = {
   anyOf: [
@@ -158,7 +158,7 @@ var GITHUB_AGENT_TOOLS = [
   {
     name: "update_issue",
     displayName: "Update Issue",
-    description: "Update GitHub issue fields such as title, body, state, labels, assignees, or milestone.",
+    description: "Update GitHub issue fields such as title, body, state, labels, assignees, or milestone. When a non-empty body is provided, the plugin appends an AI-authorship footer and includes llmModel when supplied.",
     parametersSchema: {
       type: "object",
       additionalProperties: false,
@@ -171,8 +171,10 @@ var GITHUB_AGENT_TOOLS = [
           type: "string"
         },
         body: {
-          type: "string"
+          type: "string",
+          description: "Optional human-facing issue description body. If provided, it must remain non-empty after trimming and removing any existing AI footer."
         },
+        llmModel: llmModelProperty,
         state: {
           type: "string",
           enum: ["open", "closed"]
@@ -224,11 +226,11 @@ var GITHUB_AGENT_TOOLS = [
   {
     name: "add_issue_comment",
     displayName: "Add Issue Comment",
-    description: "Post a comment on a GitHub issue or pull request. Provide only the human-facing message body; include llmModel so the plugin can append the required AI-authorship footer.",
+    description: "Post a comment on a GitHub issue or pull request. Provide only the human-facing message body; it must remain non-empty after trimming and removing any existing AI footer. The plugin appends the required AI-authorship footer and includes llmModel when supplied.",
     parametersSchema: {
       type: "object",
       additionalProperties: false,
-      required: ["body", "llmModel"],
+      required: ["body"],
       ...issueTargetSchema,
       properties: {
         repository: repositoryProperty,
@@ -236,7 +238,8 @@ var GITHUB_AGENT_TOOLS = [
         paperclipIssueId: paperclipIssueIdProperty,
         body: {
           type: "string",
-          description: "Human-facing comment body without the AI footer."
+          minLength: 1,
+          description: "Human-facing comment body without the AI footer. It must remain non-empty after trimming and removing any existing AI footer."
         },
         llmModel: llmModelProperty
       }
@@ -245,7 +248,7 @@ var GITHUB_AGENT_TOOLS = [
   {
     name: "create_pull_request",
     displayName: "Create Pull Request",
-    description: "Open a GitHub pull request once the implementation branch is pushed.",
+    description: "Open a GitHub pull request once the implementation branch is pushed. When a non-empty body is provided, the plugin appends an AI-authorship footer and includes llmModel when supplied.",
     parametersSchema: {
       type: "object",
       additionalProperties: false,
@@ -264,8 +267,10 @@ var GITHUB_AGENT_TOOLS = [
           type: "string"
         },
         body: {
-          type: "string"
+          type: "string",
+          description: "Optional human-facing pull request description. If provided, it must remain non-empty after trimming and removing any existing AI footer."
         },
+        llmModel: llmModelProperty,
         draft: {
           type: "boolean"
         }
@@ -290,7 +295,7 @@ var GITHUB_AGENT_TOOLS = [
   {
     name: "update_pull_request",
     displayName: "Update Pull Request",
-    description: "Edit pull request title, body, base branch, open or close it, or convert between draft and ready for review.",
+    description: "Edit pull request title, body, base branch, open or close it, or convert between draft and ready for review. When a non-empty body is provided, the plugin appends an AI-authorship footer and includes llmModel when supplied.",
     parametersSchema: {
       type: "object",
       additionalProperties: false,
@@ -303,8 +308,10 @@ var GITHUB_AGENT_TOOLS = [
           type: "string"
         },
         body: {
-          type: "string"
+          type: "string",
+          description: "Optional human-facing pull request description. If provided, it must remain non-empty after trimming and removing any existing AI footer."
         },
+        llmModel: llmModelProperty,
         base: {
           type: "string"
         },
@@ -367,11 +374,11 @@ var GITHUB_AGENT_TOOLS = [
   {
     name: "reply_to_review_thread",
     displayName: "Reply To Review Thread",
-    description: "Reply to an existing pull request review thread. Provide only the human-facing body; include llmModel so the plugin can append the required AI-authorship footer.",
+    description: "Reply to an existing pull request review thread. Provide only the human-facing body; the plugin appends the required AI-authorship footer and includes llmModel when supplied.",
     parametersSchema: {
       type: "object",
       additionalProperties: false,
-      required: ["threadId", "body", "llmModel"],
+      required: ["threadId", "body"],
       properties: {
         threadId: {
           type: "string",
@@ -379,7 +386,8 @@ var GITHUB_AGENT_TOOLS = [
         },
         body: {
           type: "string",
-          description: "Human-facing reply body without the AI footer."
+          minLength: 1,
+          description: "Human-facing reply body without the AI footer. It must remain non-empty after trimming and removing any existing AI footer."
         },
         llmModel: llmModelProperty
       }
@@ -463,7 +471,7 @@ var GITHUB_AGENT_TOOLS = [
   {
     name: "list_organization_projects",
     displayName: "List Organization Projects",
-    description: "List GitHub organization-level Projects so an agent can choose where to associate pull requests.",
+    description: "Search or list GitHub organization-level Projects so an agent can choose where to associate pull requests.",
     parametersSchema: {
       type: "object",
       additionalProperties: false,
@@ -615,6 +623,8 @@ var GITHUB_TOKEN_PERMISSION_AUDIT_CACHE_TTL_MS = 5 * 6e4;
 var MANUAL_SYNC_RESPONSE_GRACE_PERIOD_MS = 500;
 var RUNNING_SYNC_MESSAGE = "GitHub sync is running in the background. This page will update when it finishes.";
 var CANCELLING_SYNC_MESSAGE = "Cancellation requested. GitHub sync will stop after the current step finishes.";
+var INTERRUPTED_SYNC_MESSAGE = "GitHub sync stopped unexpectedly before it finished. The worker restarted while the sync was running.";
+var INTERRUPTED_SYNC_ACTION = "Run GitHub sync again. If it stops on the same repository or issue, retry that narrower scope to isolate the failing step.";
 var SYNC_PROGRESS_PERSIST_INTERVAL_MS = 250;
 var MAX_SYNC_FAILURE_LOG_ENTRIES = 25;
 var GITHUB_SECONDARY_RATE_LIMIT_FALLBACK_MS = 6e4;
@@ -629,7 +639,9 @@ var IMPORTED_ISSUE_WAKE_REASON = "GitHub Sync imported an assigned issue that is
 var ISSUE_LINK_ENTITY_TYPE = "paperclip-github-plugin.issue-link";
 var PULL_REQUEST_LINK_ENTITY_TYPE = "paperclip-github-plugin.pull-request-link";
 var COMMENT_ANNOTATION_ENTITY_TYPE = "paperclip-github-plugin.comment-annotation";
-var AI_AUTHORED_COMMENT_FOOTER_PREFIX = "Created by a Paperclip AI agent using ";
+var AI_AUTHORED_FOOTER_MARKDOWN_PREFIX = "###### \u2728 This ";
+var AI_AUTHORED_LEGACY_FOOTER_PATTERN = /\n\n---\nCreated by a Paperclip AI agent(?: using [^\n]+)?\.\s*$/;
+var AI_AUTHORED_MARKDOWN_FOOTER_PATTERN = /\n\n---\n###### ✨ This (?:comment|issue description|pull request description) was AI-generated(?: using [^\n]+)?\s*$/;
 var HIDDEN_GITHUB_IMPORT_MARKER_PREFIX = "<!-- paperclip-github-plugin-imported-from: ";
 var HIDDEN_GITHUB_IMPORT_MARKER_SUFFIX = " -->";
 var EMPTY_GITHUB_ISSUE_DESCRIPTION_PLACEHOLDER = "_No description provided on GitHub._";
@@ -2885,6 +2897,97 @@ async function getSyncCancellationRequest(ctx) {
   }
   return normalizeSyncCancellationRequest(await ctx.state.get(SYNC_CANCELLATION_SCOPE));
 }
+function buildInterruptedSyncMessage(progress) {
+  const completedIssueCount = typeof progress?.completedIssueCount === "number" ? Math.max(0, progress.completedIssueCount) : void 0;
+  const totalIssueCount = typeof progress?.totalIssueCount === "number" ? Math.max(0, progress.totalIssueCount) : void 0;
+  const completionSummary = completedIssueCount !== void 0 && totalIssueCount !== void 0 ? ` Completed ${Math.min(completedIssueCount, totalIssueCount)} of ${totalIssueCount} issues before the worker restarted.` : "";
+  return `${INTERRUPTED_SYNC_MESSAGE}${completionSummary}`;
+}
+function getInterruptedSyncFailurePhase(progress) {
+  switch (progress?.phase) {
+    case "preparing":
+      return "building_import_plan";
+    case "importing":
+      return "importing_issue";
+    case "syncing":
+      return "evaluating_github_status";
+    default:
+      return void 0;
+  }
+}
+function getActiveRunningSyncForScope(companyId) {
+  const normalizedCompanyId = normalizeCompanyId(companyId);
+  if (activeRunningSyncState?.syncState.status !== "running") {
+    return null;
+  }
+  const activeSyncMatchesScope = normalizedCompanyId === void 0 || activeRunningSyncCompanyId === void 0 || activeRunningSyncCompanyId === normalizedCompanyId;
+  if (!activeSyncMatchesScope) {
+    return null;
+  }
+  return materializeScopedSettings(activeRunningSyncState, null, normalizedCompanyId);
+}
+async function reconcileOrphanedRunningSyncState(ctx, companyId, resolution = "error") {
+  const normalizedCompanyId = normalizeCompanyId(companyId);
+  const activeRunningSync = getActiveRunningSyncForScope(normalizedCompanyId);
+  if (activeRunningSync) {
+    return activeRunningSync;
+  }
+  const current = normalizeSettings(await ctx.state.get(SETTINGS_SCOPE));
+  const scopedSyncState = getScopedSyncState(current, normalizedCompanyId);
+  if (scopedSyncState.status !== "running") {
+    return materializeScopedSettings(current, null, normalizedCompanyId);
+  }
+  const trigger = scopedSyncState.lastRunTrigger ?? "manual";
+  const progress = normalizeSyncProgress(scopedSyncState.progress);
+  const syncCounts = {
+    syncedIssuesCount: scopedSyncState.syncedIssuesCount ?? 0,
+    createdIssuesCount: scopedSyncState.createdIssuesCount ?? 0,
+    skippedIssuesCount: scopedSyncState.skippedIssuesCount ?? 0,
+    erroredIssuesCount: scopedSyncState.erroredIssuesCount ?? 0
+  };
+  const nextSyncState = resolution === "cancelled" || Boolean(scopedSyncState.cancelRequestedAt?.trim()) ? createCancelledSyncState({
+    message: buildCancelledSyncMessage(void 0, progress),
+    trigger,
+    ...syncCounts,
+    ...progress ? { progress } : {}
+  }) : (() => {
+    const errorDetails = normalizeSyncErrorDetails({
+      ...getInterruptedSyncFailurePhase(progress) ? { phase: getInterruptedSyncFailurePhase(progress) } : {},
+      ...progress?.currentRepositoryUrl ? { repositoryUrl: progress.currentRepositoryUrl } : {},
+      ...typeof progress?.currentIssueNumber === "number" ? { githubIssueNumber: progress.currentIssueNumber } : {},
+      rawMessage: INTERRUPTED_SYNC_MESSAGE,
+      suggestedAction: INTERRUPTED_SYNC_ACTION
+    });
+    const message = buildInterruptedSyncMessage(progress);
+    return createErrorSyncState({
+      message,
+      trigger,
+      ...syncCounts,
+      ...progress ? { progress } : {},
+      ...errorDetails ? { errorDetails } : {},
+      recentFailures: appendRecentSyncFailureLogEntry(
+        scopedSyncState.recentFailures,
+        createSyncFailureLogEntry({
+          message,
+          ...errorDetails ? { errorDetails } : {}
+        })
+      )
+    });
+  })();
+  const next = await saveSettingsSyncState(ctx, current, nextSyncState, normalizedCompanyId);
+  await setSyncCancellationRequest(ctx, null);
+  return next;
+}
+function resolvePersistedRunningSyncCompanyId(settings) {
+  if (normalizeSyncState(settings.syncState).status === "running") {
+    return void 0;
+  }
+  const runningCompanyIds = Object.entries(settings.syncStateByCompanyId ?? {}).flatMap(([companyId, syncState]) => {
+    const normalizedCompanyId = normalizeCompanyId(companyId);
+    return normalizedCompanyId && normalizeSyncState(syncState).status === "running" ? [normalizedCompanyId] : [];
+  });
+  return runningCompanyIds.length === 1 ? runningCompanyIds[0] : null;
+}
 function buildCancelledSyncMessage(target, progress) {
   const completedIssueCount = typeof progress?.completedIssueCount === "number" ? Math.max(0, progress.completedIssueCount) : void 0;
   const totalIssueCount = typeof progress?.totalIssueCount === "number" ? Math.max(0, progress.totalIssueCount) : void 0;
@@ -2939,11 +3042,11 @@ async function waitForSyncResultWithinGracePeriod(promise, timeoutMs) {
 }
 async function getActiveOrCurrentSyncState(ctx, companyId) {
   const normalizedCompanyId = normalizeCompanyId(companyId);
-  if (activeRunningSyncState?.syncState.status === "running" && activeRunningSyncCompanyId === normalizedCompanyId) {
-    return materializeScopedSettings(activeRunningSyncState, null, normalizedCompanyId);
+  const activeRunningSync = getActiveRunningSyncForScope(normalizedCompanyId);
+  if (activeRunningSync) {
+    return activeRunningSync;
   }
-  const current = normalizeSettings(await ctx.state.get(SETTINGS_SCOPE));
-  return materializeScopedSettings(current, null, normalizedCompanyId);
+  return reconcileOrphanedRunningSyncState(ctx, normalizedCompanyId);
 }
 function updateSyncFailureContext(current, next) {
   if ("phase" in next) {
@@ -7183,22 +7286,36 @@ async function getGitHubPullRequestProjectItems(octokit, repository, pullRequest
     projectItems
   };
 }
-function formatAiAuthorshipFooter(llmModel) {
+function stripAiAuthorshipFooter(body) {
+  let strippedBody = body;
+  while (true) {
+    const nextBody = strippedBody.replace(AI_AUTHORED_LEGACY_FOOTER_PATTERN, "").replace(AI_AUTHORED_MARKDOWN_FOOTER_PATTERN, "");
+    if (nextBody === strippedBody) {
+      return strippedBody;
+    }
+    strippedBody = nextBody;
+  }
+}
+function formatAiAuthorshipFooter(subject, llmModel) {
+  const trimmedModel = llmModel?.trim();
   return `
 
 ---
-${AI_AUTHORED_COMMENT_FOOTER_PREFIX}${llmModel.trim()}.`;
+${AI_AUTHORED_FOOTER_MARKDOWN_PREFIX}${subject} was AI-generated${trimmedModel ? ` using ${trimmedModel}` : ""}`;
 }
-function appendAiAuthorshipFooter(body, llmModel) {
-  const trimmedBody = body.trim();
+function appendAiAuthorshipFooter(body, subject, llmModel) {
+  const trimmedBody = stripAiAuthorshipFooter(body).trim();
   if (!trimmedBody) {
     throw new Error("Comment body cannot be empty.");
   }
-  const trimmedModel = llmModel.trim();
-  if (!trimmedModel) {
-    throw new Error("llmModel is required when posting a GitHub comment.");
+  return `${trimmedBody}${formatAiAuthorshipFooter(subject, llmModel)}`;
+}
+function appendOptionalAiAuthorshipFooter(body, subject, llmModel) {
+  const trimmedBody = stripAiAuthorshipFooter(body).trim();
+  if (!trimmedBody) {
+    return void 0;
   }
-  return `${trimmedBody}${formatAiAuthorshipFooter(trimmedModel)}`;
+  return `${trimmedBody}${formatAiAuthorshipFooter(subject, llmModel)}`;
 }
 async function listAllGitHubIssueComments(octokit, repository, issueNumber) {
   const comments = [];
@@ -9443,6 +9560,9 @@ function shouldRunScheduledSync(settings, scheduledAt) {
   if (getActiveGitHubRateLimitPause(settings.syncState, now)) {
     return false;
   }
+  if (settings.syncState.status === "running") {
+    return false;
+  }
   if (!settings.syncState.checkedAt) {
     return true;
   }
@@ -10002,6 +10122,7 @@ async function startSync(ctx, trigger, options = {}) {
     );
     return quickResult2 ?? await getActiveOrCurrentSyncState(ctx);
   }
+  await reconcileOrphanedRunningSyncState(ctx, options.target?.companyId);
   const [config, persistedSettings] = await Promise.all([
     getResolvedConfig(ctx),
     ctx.state.get(SETTINGS_SCOPE).then((value) => normalizeSettings(value))
@@ -10262,7 +10383,8 @@ function registerGitHubAgentTools(ctx) {
         removeValues: normalizeToolStringArray(input.removeAssignees)
       });
       const title = Object.prototype.hasOwnProperty.call(input, "title") && typeof input.title === "string" ? input.title : void 0;
-      const body = Object.prototype.hasOwnProperty.call(input, "body") && typeof input.body === "string" ? input.body : void 0;
+      const llmModel = normalizeOptionalToolString(input.llmModel);
+      const body = Object.prototype.hasOwnProperty.call(input, "body") && typeof input.body === "string" ? appendOptionalAiAuthorshipFooter(input.body, "issue description", llmModel) : void 0;
       const state = input.state === "open" || input.state === "closed" ? input.state : void 0;
       const milestoneNumber = Object.prototype.hasOwnProperty.call(input, "milestoneNumber") ? input.milestoneNumber === null ? null : normalizeToolPositiveInteger(input.milestoneNumber) : void 0;
       const hasChanges = title !== void 0 || body !== void 0 || state !== void 0 || Object.prototype.hasOwnProperty.call(input, "milestoneNumber") || normalizeToolStringArray(input.setLabels).length > 0 || normalizeToolStringArray(input.addLabels).length > 0 || normalizeToolStringArray(input.removeLabels).length > 0 || normalizeToolStringArray(input.setAssignees).length > 0 || normalizeToolStringArray(input.addAssignees).length > 0 || normalizeToolStringArray(input.removeAssignees).length > 0;
@@ -10312,7 +10434,7 @@ function registerGitHubAgentTools(ctx) {
       const input = getToolInputRecord(params);
       const target = await resolveGitHubIssueToolTarget(ctx, runCtx, input);
       const octokit = await createGitHubToolOctokit(ctx, runCtx.companyId);
-      const body = appendAiAuthorshipFooter(String(input.body ?? ""), normalizeOptionalToolString(input.llmModel) ?? "");
+      const body = appendAiAuthorshipFooter(String(input.body ?? ""), "comment", normalizeOptionalToolString(input.llmModel));
       const response = await octokit.rest.issues.createComment({
         owner: target.repository.owner,
         repo: target.repository.repo,
@@ -10350,6 +10472,11 @@ function registerGitHubAgentTools(ctx) {
       if (!head || !base || !title) {
         throw new Error("head, base, and title are required.");
       }
+      const body = typeof input.body === "string" ? appendOptionalAiAuthorshipFooter(
+        input.body,
+        "pull request description",
+        normalizeOptionalToolString(input.llmModel)
+      ) : void 0;
       const octokit = await createGitHubToolOctokit(ctx, runCtx.companyId);
       const response = await octokit.rest.pulls.create({
         owner: repository.owner,
@@ -10357,7 +10484,7 @@ function registerGitHubAgentTools(ctx) {
         head,
         base,
         title,
-        ...typeof input.body === "string" ? { body: input.body } : {},
+        ...body !== void 0 ? { body } : {},
         ...typeof input.draft === "boolean" ? { draft: input.draft } : {},
         headers: {
           "X-GitHub-Api-Version": GITHUB_API_VERSION
@@ -10445,7 +10572,8 @@ function registerGitHubAgentTools(ctx) {
         }
       });
       const title = Object.prototype.hasOwnProperty.call(input, "title") && typeof input.title === "string" ? input.title : void 0;
-      const body = Object.prototype.hasOwnProperty.call(input, "body") && typeof input.body === "string" ? input.body : void 0;
+      const llmModel = normalizeOptionalToolString(input.llmModel);
+      const body = Object.prototype.hasOwnProperty.call(input, "body") && typeof input.body === "string" ? appendOptionalAiAuthorshipFooter(input.body, "pull request description", llmModel) : void 0;
       const base = normalizeOptionalToolString(input.base);
       const state = input.state === "open" || input.state === "closed" ? input.state : void 0;
       const isDraft = typeof input.isDraft === "boolean" ? input.isDraft : void 0;
@@ -10637,7 +10765,7 @@ function registerGitHubAgentTools(ctx) {
       if (!threadId) {
         throw new Error("threadId is required.");
       }
-      const body = appendAiAuthorshipFooter(String(input.body ?? ""), normalizeOptionalToolString(input.llmModel) ?? "");
+      const body = appendAiAuthorshipFooter(String(input.body ?? ""), "comment", normalizeOptionalToolString(input.llmModel));
       const octokit = await createGitHubToolOctokit(ctx, runCtx.companyId);
       const response = await octokit.graphql(
         GITHUB_ADD_PULL_REQUEST_REVIEW_THREAD_REPLY_MUTATION,
@@ -10862,6 +10990,7 @@ var plugin = definePlugin({
       const record = input && typeof input === "object" ? input : {};
       const requestedCompanyId = normalizeCompanyId(record.companyId);
       const includeAssignees = Boolean(requestedCompanyId && record.includeAssignees === true);
+      await reconcileOrphanedRunningSyncState(ctx, requestedCompanyId);
       const saved = await ctx.state.get(SETTINGS_SCOPE);
       const importRegistry = normalizeImportRegistry(await ctx.state.get(IMPORT_REGISTRY_SCOPE));
       const normalizedSettings = normalizeSettings(saved);
@@ -11148,7 +11277,12 @@ var plugin = definePlugin({
       });
     });
     ctx.actions.register("sync.cancel", async () => {
-      const currentSettings = await getActiveOrCurrentSyncState(ctx, activeRunningSyncCompanyId);
+      const persistedRunningSyncCompanyId = activeRunningSyncState?.syncState.status === "running" ? activeRunningSyncCompanyId : resolvePersistedRunningSyncCompanyId(normalizeSettings(await ctx.state.get(SETTINGS_SCOPE)));
+      const currentSettings = await reconcileOrphanedRunningSyncState(
+        ctx,
+        persistedRunningSyncCompanyId === null ? void 0 : persistedRunningSyncCompanyId,
+        "cancelled"
+      );
       if (currentSettings.syncState.status !== "running") {
         return currentSettings;
       }
@@ -11169,7 +11303,7 @@ var plugin = definePlugin({
           message: CANCELLING_SYNC_MESSAGE,
           cancelRequestedAt: cancellationRequest.requestedAt
         }),
-        activeRunningSyncCompanyId
+        persistedRunningSyncCompanyId === null ? void 0 : persistedRunningSyncCompanyId
       );
       activeRunningSyncState = next;
       return next;
@@ -11180,14 +11314,15 @@ var plugin = definePlugin({
       const trigger = job.trigger === "retry" ? "retry" : "schedule";
       const scheduledTargets = listScheduledSyncTargets(settings);
       if (scheduledTargets.length === 0) {
-        if (job.trigger === "schedule" && !shouldRunScheduledSync(settings, job.scheduledAt)) {
+        const reconciledSettings = await reconcileOrphanedRunningSyncState(ctx);
+        if (job.trigger === "schedule" && !shouldRunScheduledSync(reconciledSettings, job.scheduledAt)) {
           return;
         }
         await startSync(ctx, trigger);
         return;
       }
       for (const target of scheduledTargets) {
-        const scopedSettings = materializeScopedSettings(settings, null, target?.companyId);
+        const scopedSettings = await reconcileOrphanedRunningSyncState(ctx, target?.companyId);
         if (job.trigger === "schedule" && !shouldRunScheduledSync(scopedSettings, job.scheduledAt)) {
           continue;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paperclip-github-plugin",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "Paperclip plugin for synchronizing GitHub issues into Paperclip projects.",
   "license": "Apache-2.0",
   "type": "module",