Skip to content

Commit 31fd584

Browse files
fix: show effective tokens (ET) in discussion footer (#24320)
1 parent 374ed78 commit 31fd584

1 file changed

Lines changed: 13 additions & 8 deletions

File tree

actions/setup/js/create_discussion.cjs

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ const { createAuthenticatedGitHubClient } = require("./handler_auth.cjs");
1616
const { removeDuplicateTitleFromDescription } = require("./remove_duplicate_title.cjs");
1717
const { getErrorMessage } = require("./error_helpers.cjs");
1818
const { ERR_VALIDATION } = require("./error_codes.cjs");
19-
const { createExpirationLine, generateFooterWithExpiration } = require("./ephemerals.cjs");
19+
const { createExpirationLine, generateFooterWithExpiration, addExpirationToFooter } = require("./ephemerals.cjs");
20+
const { generateFooterWithMessages } = require("./messages_footer.cjs");
2021
const { generateWorkflowIdMarker, generateWorkflowCallIdMarker, generateCloseKeyMarker, normalizeCloseOlderKey } = require("./generate_footer.cjs");
2122
const { sanitizeLabelContent } = require("./sanitize_label_content.cjs");
2223
const { tryEnforceArrayLimit } = require("./limit_enforcement_helpers.cjs");
@@ -25,7 +26,7 @@ const { isStagedMode } = require("./safe_output_helpers.cjs");
2526
const { closeOlderDiscussions: closeOlderDiscussionsFunc } = require("./close_older_discussions.cjs");
2627
const { parseBoolTemplatable } = require("./templatable.cjs");
2728
const { buildWorkflowRunUrl } = require("./workflow_metadata_helpers.cjs");
28-
const { generateHistoryLink } = require("./generate_history_link.cjs");
29+
const { generateHistoryLink, generateHistoryUrl } = require("./generate_history_link.cjs");
2930
const { MAX_LABELS } = require("./constants.cjs");
3031
const { fetchAllRepoLabels } = require("./github_api_helpers.cjs");
3132

@@ -512,20 +513,24 @@ async function main(config = {}) {
512513
// Generate footer with expiration using helper
513514
// When footer is disabled, only add XML markers (no visible footer content)
514515
if (includeFooter) {
515-
const historyLink = generateHistoryLink({
516+
const historyUrl = generateHistoryUrl({
516517
owner: repoParts.owner,
517518
repo: repoParts.repo,
518519
itemType: "discussion",
519520
workflowCallId: callerWorkflowId,
520521
workflowId,
521522
serverUrl: context.serverUrl,
522523
});
523-
const footerText = historyLink ? `> AI generated by [${workflowName}](${runUrl}) · ${historyLink}` : `> AI generated by [${workflowName}](${runUrl})`;
524-
const footer = generateFooterWithExpiration({
525-
footerText,
524+
const workflowSource = process.env.GH_AW_WORKFLOW_SOURCE ?? "";
525+
const workflowSourceURL = process.env.GH_AW_WORKFLOW_SOURCE_URL ?? "";
526+
const triggeringIssueNumber = context.payload?.issue?.number && !context.payload?.issue?.pull_request ? context.payload.issue.number : undefined;
527+
const triggeringPRNumber = context.payload?.pull_request?.number || (context.payload?.issue?.pull_request ? context.payload.issue.number : undefined);
528+
const triggeringDiscussionNumber = context.payload?.discussion?.number;
529+
const footer = addExpirationToFooter(
530+
generateFooterWithMessages(workflowName, runUrl, workflowSource, workflowSourceURL, triggeringIssueNumber, triggeringPRNumber, triggeringDiscussionNumber, historyUrl).trimEnd(),
526531
expiresHours,
527-
entityType: "Discussion",
528-
});
532+
"Discussion"
533+
);
529534
bodyLines.push(``, ``, footer);
530535
}
531536

0 commit comments

Comments
 (0)