lee-spec-kit 0.6.3 → 0.6.4

package/README.en.md

@@ -217,6 +217,7 @@ Error payloads (`status: "error"`) include `reasonCode` and labeled `suggestions
 ### Built-in Docs
 
 If you do not restore `agents.md` into project docs, fetch CLI-managed guides directly:
+`docs get create-issue|issue-template|create-pr|pr-template --json` also returns `contract` (required sections / artifact rules).
 
 ```bash
 # list built-in docs
@@ -285,6 +286,9 @@ npx lee-spec-kit github issue F001 --create --confirm OK --labels enhancement,fr
 # Generate PR body
 npx lee-spec-kit github pr F001
 
+# Generate PR body (force screenshots/Mermaid sections)
+npx lee-spec-kit github pr F001 --screenshots on --mermaid on
+
 # Generate + create PR + sync tasks.md metadata + merge with retry
 npx lee-spec-kit github pr F001 --create --merge --confirm OK --labels enhancement,frontend
 ```
@@ -295,6 +299,7 @@ Key points:
 - Labels are validated (at least one required).
 - `--create`/`--merge` are remote operations and require `--confirm OK`.
 - PR helper can sync `tasks.md` PR URL/PR Status automatically (`--no-sync-tasks` to skip).
+- PR artifact sections are controlled by `--screenshots (auto|on|off)` and `--mermaid (auto|on|off)`.
 - Merge includes retry and automatic head-branch refresh (fetch/rebase/force-push) on out-of-date failures.
 
 ### Status

package/README.md

@@ -239,6 +239,7 @@ npx lee-spec-kit context F001 --approve A --execute --execute-strict
 ### CLI 내장 문서 조회
 
 `agents.md`를 프로젝트에 복구하지 않는 환경에서는 아래 명령으로 내장 가이드를 직접 조회할 수 있습니다.
+`docs get create-issue|issue-template|create-pr|pr-template --json` 응답에는 `contract`(필수 섹션/아티팩트 규칙)도 포함됩니다.
 
 ```bash
 # 조회 가능한 내장 문서 목록
@@ -307,6 +308,9 @@ npx lee-spec-kit github issue F001 --create --confirm OK --labels enhancement,fr
 # PR 본문 생성
 npx lee-spec-kit github pr F001
 
+# PR 본문 생성 (스크린샷/Mermaid 섹션 강제 포함)
+npx lee-spec-kit github pr F001 --screenshots on --mermaid on
+
 # PR 본문 생성 + PR 생성 + tasks.md 메타데이터 동기화 + merge 재시도
 npx lee-spec-kit github pr F001 --create --merge --confirm OK --labels enhancement,frontend
 ```
@@ -317,6 +321,7 @@ npx lee-spec-kit github pr F001 --create --merge --confirm OK --labels enhanceme
 - 라벨은 최소 1개 이상 필수입니다.
 - `--create`/`--merge`는 원격 작업이므로 `--confirm OK`가 필요합니다.
 - PR helper는 기본적으로 `tasks.md`의 `PR`/`PR Status`를 동기화합니다. (`--no-sync-tasks`로 비활성화)
+- PR helper의 아티팩트 섹션은 `--screenshots (auto|on|off)`, `--mermaid (auto|on|off)`로 제어할 수 있습니다.
 - merge 시 head 브랜치가 뒤쳐진 경우 fetch/rebase/force-push 후 재시도합니다.
 
 ### 상태 확인

package/dist/index.js

@@ -134,6 +134,8 @@ var I18N = {
       "context.checkPolicyHint": "\u2139\uFE0F  \uC0AC\uC6A9\uC790 \uD655\uC778 \uC815\uCC45\uC740 `npx lee-spec-kit docs get agents --json`\uC73C\uB85C \uBA3C\uC800 \uD655\uC778\uD558\uC138\uC694. (git push/merge/merge commit \uD3EC\uD568) [\uD655\uC778 \uD544\uC694]\uAC00 \uC788\uC73C\uBA74 \uC0AC\uC6A9\uC790\uC5D0\uAC8C `<\uB77C\uBCA8>` \uB610\uB294 `<\uB77C\uBCA8> OK` (\uC608: `A`, `A OK`) \uC751\uB2F5\uC744 \uBC1B\uC740 \uB4A4 \uC9C4\uD589 (config: approval\uB85C \uC870\uC815 \uAC00\uB2A5)",
       "context.actionOptionHint": "\uC2B9\uC778 \uC751\uB2F5 \uD615\uC2DD: `<\uB77C\uBCA8>` \uB610\uB294 `<\uB77C\uBCA8> OK` (\uC608: `A`, `A OK`)",
       "context.actionExplainHint": "\uC2B9\uC778 \uC694\uCCAD \uC804, \uAC01 \uB77C\uBCA8\uC774 \uBB34\uC5C7\uC744 \uC2E4\uD589/\uBCC0\uACBD\uD558\uB294\uC9C0 \uD55C \uC904 \uC694\uC57D\uACFC \uD568\uAED8 \uC124\uBA85\uD558\uC138\uC694.",
+      "context.finalLabelPrompt": "\uD604\uC7AC \uC120\uD0DD \uAC00\uB2A5\uD55C \uB77C\uBCA8: {labels}. \uB9C8\uC9C0\uB9C9 \uC751\uB2F5\uC740 `<\uB77C\uBCA8>` \uB610\uB294 `<\uB77C\uBCA8> OK` \uD615\uC2DD\uC73C\uB85C \uBC1B\uC73C\uC138\uC694. (\uC608: {example})",
+      "context.finalLabelCommandHint": "\uB77C\uBCA8\uC744 \uBC1B\uC73C\uBA74 \uBC14\uB85C \uC2E4\uD589: {command}",
       "context.readBuiltinDocFirst": "\uBA3C\uC800 \uB0B4\uC7A5 \uBB38\uC11C\uB97C \uD655\uC778\uD558\uC138\uC694: {command}",
       "context.tipDocsCommitRules": "\uCEE4\uBC0B \uBA54\uC2DC\uC9C0 \uADDC\uCE59\uC740 `npx lee-spec-kit docs get git-workflow --json`\uC73C\uB85C \uD655\uC778\uD558\uC138\uC694.",
       "context.list.docsCommitNeeded": "\uBB38\uC11C \uCEE4\uBC0B \uD544\uC694",
@@ -218,6 +220,8 @@ var I18N = {
       "github.optPrMerge": "\uC7AC\uC2DC\uB3C4/\uD5E4\uB4DC \uAC31\uC2E0\uACFC \uD568\uAED8 PR merge \uC218\uD589",
       "github.optPrConfirm": "\uC6D0\uACA9 \uC791\uC5C5(--create/--merge)\uC6A9 \uBA85\uC2DC\uC801 \uC2B9\uC778 \uD1A0\uD070. \uC0AC\uC6A9\uAC12: OK",
       "github.optPrRetry": "merge \uC7AC\uC2DC\uB3C4 \uD69F\uC218 (\uAE30\uBCF8: 3)",
+      "github.optPrScreenshots": "PR \uC2A4\uD06C\uB9B0\uC0F7 \uC139\uC158 \uBAA8\uB4DC (auto|on|off, \uAE30\uBCF8: auto)",
+      "github.optPrMermaid": "PR Mermaid \uC139\uC158 \uBAA8\uB4DC (auto|on|off, \uAE30\uBCF8: auto)",
       "github.optPrNoSyncTasks": "tasks.md PR URL/PR \uC0C1\uD0DC \uB3D9\uAE30\uD654\uB97C \uAC74\uB108\uB700",
       "github.optPrCommitSync": "tasks.md \uB3D9\uAE30\uD654 \uBCC0\uACBD\uC744 \uC790\uB3D9 commit/push",
       "github.invalidRepoComponentMismatch": "`--repo`\uC640 `--component`\uB97C \uD568\uAED8 \uC4F8 \uB54C\uB294 \uAC19\uC740 \uAC12\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4.",
@@ -227,6 +231,12 @@ var I18N = {
       "github.ghEmptyJson": "GitHub CLI JSON \uCD9C\uB825\uC774 \uBE44\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.",
       "github.ghInvalidJson": "GitHub CLI JSON \uD30C\uC2F1\uC5D0 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4: {snippet}",
       "github.sectionsMissing": "{kind} \uBCF8\uBB38\uC5D0 \uD544\uC218 \uC139\uC158\uC774 \uC5C6\uC2B5\uB2C8\uB2E4: {sections}",
+      "github.todoPlaceholdersRemain": "{kind} \uBCF8\uBB38\uC5D0 TODO \uD56D\uBAA9\uC774 \uB0A8\uC544 \uC788\uC2B5\uB2C8\uB2E4. \uBAA9\uD45C/\uC644\uB8CC \uAE30\uC900 \uB4F1\uC744 \uCC44\uC6B4 \uB4A4 \uB2E4\uC2DC \uC2E4\uD589\uD558\uC138\uC694.",
+      "github.artifactModeInvalid": "`--{kind}` \uAC12\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4: {value}. \uD5C8\uC6A9\uAC12: auto,on,off",
+      "github.prScreenshotsSectionMissing": "PR \uBCF8\uBB38\uC5D0 \uD544\uC218 \uC139\uC158\uC774 \uC5C6\uC2B5\uB2C8\uB2E4: {section}",
+      "github.prScreenshotImageMissing": "PR \uBCF8\uBB38\uC758 `{section}` \uC139\uC158\uC5D0 \uC774\uBBF8\uC9C0 \uB9C8\uD06C\uB2E4\uC6B4(`![](...)`)\uC744 \uCD94\uAC00\uD558\uC138\uC694.",
+      "github.prMermaidSectionMissing": "PR \uBCF8\uBB38\uC5D0 \uD544\uC218 \uC139\uC158\uC774 \uC5C6\uC2B5\uB2C8\uB2E4: {section}",
+      "github.prMermaidBlockMissing": "PR \uBCF8\uBB38\uC758 `{section}` \uC139\uC158\uC5D0 ```mermaid \uCF54\uB4DC \uBE14\uB85D\uC744 \uCD94\uAC00\uD558\uC138\uC694.",
       "github.docsMissing": "\uAD00\uB828 \uBB38\uC11C \uACBD\uB85C\uAC00 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4: {paths}",
       "github.noFeatures": "Feature\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.",
       "github.multipleFeaturesMatched": "\uC5EC\uB7EC Feature\uAC00 \uB9E4\uCE6D\uB418\uC5C8\uC2B5\uB2C8\uB2E4. feature \uC774\uB984(slug | F001 | F001-slug)\uC744 \uBA85\uC2DC\uD558\uC138\uC694.",
@@ -383,7 +393,7 @@ var I18N = {
       tasksImprove: "tasks.md\uB97C \uBCF4\uC644\uD558\uACE0 \uBB38\uC11C \uC0C1\uD0DC\uB97C Review\uB85C \uBCC0\uACBD\uD558\uC138\uC694.",
       tasksApproval: "tasks.md \uB0B4\uC6A9\uC744 \uC0AC\uC6A9\uC790\uC5D0\uAC8C \uACF5\uC720\uD558\uACE0 \uC9C4\uD589 \uC2B9\uC778(`A` \uB610\uB294 `A OK` \uD615\uC2DD)\uC744 \uBC1B\uC73C\uC138\uC694. (\uC2B9\uC778 \uD6C4 \uBB38\uC11C \uC0C1\uD0DC\uB97C Approved\uB85C \uBCC0\uACBD)",
       docsCommitPlanning: 'cd "{docsGitCwd}" && git add "{featurePath}" && git commit -m "docs(planning): {folderName} \uAE30\uD68D \uBB38\uC11C"',
-      issueCreateAndWrite: "`npx lee-spec-kit docs get create-issue --json`\uC73C\uB85C \uC808\uCC28\uB97C \uD655\uC778\uD55C \uB4A4, `npx lee-spec-kit github issue {featureRef} --json`\uC73C\uB85C \uCD08\uC548\uC744 \uC0DD\uC131\uD558\uC138\uC694. TODO\uB97C \uCC44\uC6B0\uACE0 \uC0AC\uC6A9\uC790 \uC2B9\uC778(OK) \uD6C4 `--create --confirm OK`\uB85C \uC0DD\uC131\uD55C \uB2E4\uC74C, spec.md/tasks.md\uC758 \uC774\uC288 \uBC88\uD638\uB97C \uCC44\uC6B0\uACE0 \uBB38\uC11C \uCEE4\uBC0B\uC744 \uC900\uBE44\uD558\uC138\uC694.",
+      issueCreateAndWrite: "`npx lee-spec-kit docs get create-issue --json`\uC73C\uB85C \uC808\uCC28\uB97C \uD655\uC778\uD55C \uB4A4, `npx lee-spec-kit github issue {featureRef} --json`\uC73C\uB85C \uCD08\uC548\uC744 \uC0DD\uC131\uD558\uC138\uC694. \uBAA9\uD45C/\uC644\uB8CC \uAE30\uC900\uC744 \uAC80\uD1A0\xB7\uBCF4\uC644\uD558\uACE0 \uC0AC\uC6A9\uC790 \uC2B9\uC778(OK) \uD6C4 `--create --confirm OK`\uB85C \uC0DD\uC131\uD55C \uB2E4\uC74C, spec.md/tasks.md\uC758 \uC774\uC288 \uBC88\uD638\uB97C \uCC44\uC6B0\uACE0 \uBB38\uC11C \uCEE4\uBC0B\uC744 \uC900\uBE44\uD558\uC138\uC694.",
       docsCommitIssueUpdate: 'cd "{docsGitCwd}" && git add "{featurePath}" && git commit -m "docs(#{issueNumber}): {folderName} \uBB38\uC11C \uC5C5\uB370\uC774\uD2B8"',
       docsCommitUpdate: 'cd "{docsGitCwd}" && git add "{featurePath}" && git commit -m "docs: {folderName} \uBB38\uC11C \uC5C5\uB370\uC774\uD2B8"',
       projectCommitIssueUpdate: 'cd "{projectGitCwd}" && git add -A && git commit -m "feat(#{issueNumber}): {folderName} \uAD6C\uD604 \uC5C5\uB370\uC774\uD2B8"',
@@ -400,7 +410,7 @@ var I18N = {
       prePrReviewRun: "PR \uC0DD\uC131 \uC804 \uC0AC\uC804 \uCF54\uB4DC\uB9AC\uBDF0\uB97C \uC9C4\uD589\uD558\uC138\uC694. \uC6B0\uC120\uC21C\uC704 \uC2A4\uD0AC: {skills} (\uC124\uCE58\uB41C \uB354 \uC801\uD569\uD55C \uC2A4\uD0AC\uC774 \uC788\uB2E4\uBA74 \uBA3C\uC800 \uC81C\uC548 \uD6C4 \uC0AC\uC6A9). \uC2A4\uD0AC\uC744 \uC4F8 \uC218 \uC5C6\uC73C\uBA74 `{fallback}` \uC815\uCC45\uC73C\uB85C \uC9C4\uD589\uD558\uACE0 `PR \uC804 \uB9AC\uBDF0`\uB97C Done\uC73C\uB85C \uC5C5\uB370\uC774\uD2B8\uD558\uC138\uC694. Findings \uC815\uCC45: {findingsPolicy}",
       prePrReviewFindingsBlock: "\uC911\uC694 \uC774\uC288\uB294 \uC218\uC815/\uD569\uC758 \uD6C4\uC5D0\uB9CC PR \uC0DD\uC131",
       prePrReviewFindingsWarn: "\uB9AC\uC2A4\uD06C\uB97C \uACF5\uC720\uD558\uBA74 PR \uC0DD\uC131 \uC9C4\uD589 \uAC00\uB2A5",
-      prCreate: "`npx lee-spec-kit docs get create-pr --json`\uC73C\uB85C \uC808\uCC28\uB97C \uD655\uC778\uD55C \uB4A4, `npx lee-spec-kit github pr {featureRef} --json`\uC73C\uB85C \uCD08\uC548\uC744 \uC0DD\uC131\uD558\uC138\uC694. TODO\uB97C \uCC44\uC6B0\uACE0 \uC0AC\uC6A9\uC790 \uC2B9\uC778(OK) \uD6C4 `--create --confirm OK`\uB85C \uC0DD\uC131\uD55C \uB2E4\uC74C tasks.md\uC5D0 PR \uB9C1\uD06C\uB97C \uAE30\uB85D\uD558\uC138\uC694.",
+      prCreate: "`npx lee-spec-kit docs get create-pr --json`\uC73C\uB85C \uC808\uCC28\uB97C \uD655\uC778\uD55C \uB4A4, `npx lee-spec-kit github pr {featureRef} --json`\uC73C\uB85C \uCD08\uC548\uC744 \uC0DD\uC131\uD558\uC138\uC694. \uBCC0\uACBD \uC0AC\uD56D/\uD14C\uC2A4\uD2B8 \uC139\uC158\uC744 \uAC80\uD1A0\xB7\uBCF4\uC644\uD558\uACE0 \uC0AC\uC6A9\uC790 \uC2B9\uC778(OK) \uD6C4 `--create --confirm OK`\uB85C \uC0DD\uC131\uD55C \uB2E4\uC74C tasks.md\uC5D0 PR \uB9C1\uD06C\uB97C \uAE30\uB85D\uD558\uC138\uC694.",
       prFillStatus: "tasks.md\uC758 PR \uC0C1\uD0DC\uB97C Review/Approved \uC911 \uD558\uB098\uB85C \uC124\uC815\uD558\uC138\uC694. (merge \uD6C4 Approved\uB85C \uC5C5\uB370\uC774\uD2B8)",
       prResolveReview: "\uB9AC\uBDF0 \uCF54\uBA58\uD2B8\uB97C \uD574\uACB0\uD558\uACE0 PR \uC0C1\uD0DC\uB97C \uC5C5\uB370\uC774\uD2B8\uD558\uC138\uC694. (PR \uC0C1\uD0DC: Review \u2192 Approved)",
       prRequestReview: "\uB9AC\uBDF0\uC5B4\uC5D0\uAC8C \uB9AC\uBDF0\uB97C \uC694\uCCAD\uD558\uACE0 PR \uC0C1\uD0DC\uB97C Review\uB85C \uC5C5\uB370\uC774\uD2B8\uD558\uC138\uC694.",
@@ -500,6 +510,8 @@ var I18N = {
       "context.checkPolicyHint": "\u2139\uFE0F  Check user-approval policy first with `npx lee-spec-kit docs get agents --json` (includes git push/merge and merge commits). If you see [CHECK required], wait for `<label>` or `<label> OK` (e.g. `A`, `A OK`) before proceeding (config: approval can override)",
       "context.actionOptionHint": "Approval reply format: `<label>` or `<label> OK` (e.g. `A`, `A OK`)",
       "context.actionExplainHint": "Before requesting approval, explain what each label will run/change with a one-line summary.",
+      "context.finalLabelPrompt": "Available labels now: {labels}. End with a label request in `<label>` or `<label> OK` format. (e.g. {example})",
+      "context.finalLabelCommandHint": "When a label is provided, run immediately: {command}",
       "context.readBuiltinDocFirst": "Read built-in docs first: {command}",
       "context.tipDocsCommitRules": "Check commit message rules with `npx lee-spec-kit docs get git-workflow --json`.",
       "context.list.docsCommitNeeded": "Commit docs changes",
@@ -584,6 +596,8 @@ var I18N = {
       "github.optPrMerge": "Merge PR with retry and head-branch refresh",
       "github.optPrConfirm": "Explicit user approval token for remote operations (--create/--merge). Use: OK",
       "github.optPrRetry": "Retry count for merge (default: 3)",
+      "github.optPrScreenshots": "PR screenshots section mode (auto|on|off, default: auto)",
+      "github.optPrMermaid": "PR Mermaid section mode (auto|on|off, default: auto)",
       "github.optPrNoSyncTasks": "Do not sync PR URL/PR status into tasks.md",
       "github.optPrCommitSync": "Commit and push tasks.md metadata sync automatically",
       "github.invalidRepoComponentMismatch": "`--repo` and `--component` must reference the same value when both are provided.",
@@ -593,6 +607,12 @@ var I18N = {
       "github.ghEmptyJson": "GitHub CLI returned empty JSON output.",
       "github.ghInvalidJson": "GitHub CLI returned invalid JSON: {snippet}",
       "github.sectionsMissing": "{kind} body is missing required sections: {sections}",
+      "github.todoPlaceholdersRemain": "{kind} body still contains TODO placeholders. Fill goals/completion criteria before creating remotely.",
+      "github.artifactModeInvalid": "Invalid value for `--{kind}`: {value}. Allowed: auto,on,off",
+      "github.prScreenshotsSectionMissing": "PR body is missing required section: {section}",
+      "github.prScreenshotImageMissing": "Add image markdown (`![](...)`) to the `{section}` section in PR body.",
+      "github.prMermaidSectionMissing": "PR body is missing required section: {section}",
+      "github.prMermaidBlockMissing": "Add a ```mermaid code block to the `{section}` section in PR body.",
       "github.docsMissing": "Related document paths do not exist: {paths}",
       "github.noFeatures": "No features found.",
       "github.multipleFeaturesMatched": "Multiple features matched. Specify feature name (slug | F001 | F001-slug).",
@@ -749,7 +769,7 @@ var I18N = {
       tasksImprove: "Improve tasks.md and change Doc Status to Review.",
       tasksApproval: "Share tasks.md with the user and get progress approval (`A` or `A OK` format). (Then set Doc Status to Approved)",
       docsCommitPlanning: 'cd "{docsGitCwd}" && git add "{featurePath}" && git commit -m "docs(planning): {folderName} planning docs"',
-      issueCreateAndWrite: "Review procedure with `npx lee-spec-kit docs get create-issue --json`, then generate a draft via `npx lee-spec-kit github issue {featureRef} --json`. Fill TODOs, get explicit user OK, run `--create --confirm OK`, then update issue number in spec.md/tasks.md and prepare a docs commit.",
+      issueCreateAndWrite: "Review procedure with `npx lee-spec-kit docs get create-issue --json`, then generate a draft via `npx lee-spec-kit github issue {featureRef} --json`. Refine goals/completion criteria, get explicit user OK, run `--create --confirm OK`, then update issue number in spec.md/tasks.md and prepare a docs commit.",
       docsCommitIssueUpdate: 'cd "{docsGitCwd}" && git add "{featurePath}" && git commit -m "docs(#{issueNumber}): {folderName} docs update"',
       docsCommitUpdate: 'cd "{docsGitCwd}" && git add "{featurePath}" && git commit -m "docs: {folderName} docs update"',
       projectCommitIssueUpdate: 'cd "{projectGitCwd}" && git add -A && git commit -m "feat(#{issueNumber}): {folderName} implementation update"',
@@ -766,7 +786,7 @@ var I18N = {
       prePrReviewRun: "Run a pre-PR code review before creating the PR. Preferred skills: {skills} (if a better installed skill fits this change, propose it first). If no skill can run, use `{fallback}` and set `Pre-PR Review` to Done in tasks.md. Findings policy: {findingsPolicy}",
       prePrReviewFindingsBlock: "major findings must be fixed/aligned before PR creation",
       prePrReviewFindingsWarn: "you may proceed after sharing the risks",
-      prCreate: "Review procedure with `npx lee-spec-kit docs get create-pr --json`, then generate a draft via `npx lee-spec-kit github pr {featureRef} --json`. Fill TODOs, get explicit user OK, run `--create --confirm OK`, then record the PR link in tasks.md.",
+      prCreate: "Review procedure with `npx lee-spec-kit docs get create-pr --json`, then generate a draft via `npx lee-spec-kit github pr {featureRef} --json`. Refine changes/tests sections, get explicit user OK, run `--create --confirm OK`, then record the PR link in tasks.md.",
       prFillStatus: "Set PR Status in tasks.md to Review/Approved. (After merge, update it to Approved.)",
       prResolveReview: "Resolve review comments and update PR Status. (PR Status: Review \u2192 Approved)",
       prRequestReview: "Request review and update PR Status to Review.",
@@ -4673,6 +4693,25 @@ function listLabels(actionOptions) {
   if (actionOptions.length === 0) return "-";
   return actionOptions.map((o) => o.label).join(", ");
 }
+function resolveFeatureRefForApproval(state, featureName) {
+  const raw = featureName?.trim() || state.matchedFeature?.folderName || "<slug|F001|F001-slug>";
+  return raw;
+}
+function buildApprovalCommand(state, featureName, selectedComponent, execute) {
+  const featureRef = resolveFeatureRefForApproval(state, featureName);
+  const componentArg = selectedComponent ? ` --component ${selectedComponent}` : "";
+  const executeArg = execute ? " --execute" : "";
+  return `npx lee-spec-kit context ${featureRef}${componentArg} --approve <LABEL>${executeArg}`;
+}
+function buildFinalApprovalPrompt(lang, actionOptions) {
+  if (actionOptions.length === 0) return "";
+  const labels = listLabels(actionOptions);
+  const example = actionOptions[0]?.label || "A";
+  return tr(lang, "cli", "context.finalLabelPrompt", {
+    labels,
+    example
+  });
+}
 function formatActionSummary2(action) {
   if (action.type === "command") {
     return `(${action.scope}) ${action.cmd}`;
@@ -4848,6 +4887,19 @@ async function runContext(featureName, options) {
   }
   if (options.json) {
     const primaryAction = state.actionOptions[0] ?? null;
+    const finalApprovalPrompt = buildFinalApprovalPrompt(lang, state.actionOptions);
+    const approveCommand = buildApprovalCommand(
+      state,
+      featureName,
+      selectedComponent,
+      false
+    );
+    const executeCommand = buildApprovalCommand(
+      state,
+      featureName,
+      selectedComponent,
+      true
+    );
     const result = {
       status: state.status,
       reasonCode: toReasonCode(state.status),
@@ -4888,6 +4940,10 @@ async function runContext(featureName, options) {
       },
       approvalRequest: {
         guidance: "Present each label with summary (e.g. `A: <summary>`) before asking for approval.",
+        finalPrompt: finalApprovalPrompt,
+        labels: state.actionOptions.map((o) => o.label),
+        approveCommand,
+        executeCommand,
         options: state.actionOptions.map((o) => ({
           label: o.label,
           summary: o.summary,
@@ -5151,6 +5207,23 @@ async function runContext(featureName, options) {
       );
     }
   }
+  if (actionOptions.length > 0) {
+    const finalApprovalPrompt = buildFinalApprovalPrompt(lang, actionOptions);
+    const executeCommand = buildApprovalCommand(
+      state,
+      featureName,
+      selectedComponent,
+      true
+    );
+    console.log(chalk6.cyan(`   \u21B3 ${finalApprovalPrompt}`));
+    console.log(
+      chalk6.gray(
+        `   \u21B3 ${tr(lang, "cli", "context.finalLabelCommandHint", {
+          command: executeCommand
+        })}`
+      )
+    );
+  }
   console.log();
 }
 async function runApprovedOption(state, config, lang, featureName, selectionOptions, options) {
@@ -6245,6 +6318,70 @@ async function runFlow(featureName, options) {
   console.log(chalk6.gray("Tip: add --approve <LABEL> [--execute] to run the selected atomic action."));
   console.log();
 }
+
+// src/utils/github-draft-contract.ts
+var ISSUE_CONTRACT = {
+  kind: "issue",
+  requiredSections: {
+    ko: ["\uAC1C\uC694", "\uBAA9\uD45C", "\uC644\uB8CC \uAE30\uC900", "\uAD00\uB828 \uBB38\uC11C", "\uB77C\uBCA8"],
+    en: ["Overview", "Goals", "Completion Criteria", "Related Documents", "Labels"]
+  },
+  artifacts: []
+};
+var PR_CONTRACT = {
+  kind: "pr",
+  requiredSections: {
+    ko: ["\uAC1C\uC694", "\uBCC0\uACBD \uC0AC\uD56D", "\uD14C\uC2A4\uD2B8", "\uAD00\uB828 \uBB38\uC11C"],
+    en: ["Overview", "Changes", "Tests", "Related Documents"]
+  },
+  artifacts: [
+    {
+      id: "screenshots",
+      headings: { ko: "\uC2A4\uD06C\uB9B0\uC0F7", en: "Screenshots" },
+      bodyRule: "image-markdown"
+    },
+    {
+      id: "mermaid",
+      headings: { ko: "\uC544\uD0A4\uD14D\uCC98 \uB2E4\uC774\uC5B4\uADF8\uB7A8", en: "Architecture Diagram" },
+      bodyRule: "mermaid-fence"
+    }
+  ]
+};
+var CONTRACTS = {
+  issue: ISSUE_CONTRACT,
+  pr: PR_CONTRACT
+};
+function getGithubDraftRequiredSections(kind, lang) {
+  return [...CONTRACTS[kind].requiredSections[lang]];
+}
+function getGithubDraftArtifactHeading(kind, artifactId, lang) {
+  const artifact = CONTRACTS[kind].artifacts.find((item) => item.id === artifactId);
+  if (!artifact) return null;
+  return artifact.headings[lang];
+}
+function getGithubDraftContractView(kind, lang) {
+  const definition = CONTRACTS[kind];
+  return {
+    kind: definition.kind,
+    requiredSections: [...definition.requiredSections[lang]],
+    artifacts: definition.artifacts.map((artifact) => ({
+      id: artifact.id,
+      section: artifact.headings[lang],
+      bodyRule: artifact.bodyRule
+    }))
+  };
+}
+function getGithubDraftContractForBuiltinDoc(docId, lang) {
+  if (docId === "create-issue" || docId === "issue-template") {
+    return getGithubDraftContractView("issue", lang);
+  }
+  if (docId === "create-pr" || docId === "pr-template") {
+    return getGithubDraftContractView("pr", lang);
+  }
+  return null;
+}
+
+// src/commands/github.ts
 function tg(lang, key, vars = {}) {
   return tr(lang, "cli", `github.${key}`, vars);
 }
@@ -6402,6 +6539,55 @@ function toBodyFilePath(raw, kind, docsDir, component) {
   const selected = raw?.trim() || path17.join(os.tmpdir(), buildDefaultBodyFileName(kind, docsDir, component));
   return path17.resolve(selected);
 }
+function toProjectRootDocsPath(relativePathFromDocs) {
+  const normalized = relativePathFromDocs.replace(/\\/g, "/").replace(/^\.\//, "").replace(/^\/+/, "");
+  if (normalized.startsWith("docs/")) return normalized;
+  return `docs/${normalized}`;
+}
+function toBodyDocPaths(paths) {
+  return {
+    ...paths,
+    specPath: toProjectRootDocsPath(paths.specPath),
+    planPath: toProjectRootDocsPath(paths.planPath),
+    tasksPath: toProjectRootDocsPath(paths.tasksPath)
+  };
+}
+var TODO_PLACEHOLDER_PATTERN = /(^|\n)\s*-\s*\[[ xX]\]\s*TODO:/m;
+function ensureNoTodoPlaceholders(body, kind, lang) {
+  if (!TODO_PLACEHOLDER_PATTERN.test(body)) return;
+  throw createCliError(
+    "PRECONDITION_FAILED",
+    tg(lang, "todoPlaceholdersRemain", { kind })
+  );
+}
+function parsePrArtifactMode(raw, kind, lang) {
+  const value = (raw || "auto").trim().toLowerCase();
+  if (value === "auto" || value === "on" || value === "off") {
+    return value;
+  }
+  throw createCliError(
+    "INVALID_ARGUMENT",
+    tg(lang, "artifactModeInvalid", { kind, value })
+  );
+}
+function resolvePrArtifactPolicy(config, feature, options) {
+  const screenshotsMode = parsePrArtifactMode(
+    options.screenshots,
+    "screenshots",
+    config.lang
+  );
+  const mermaidMode = parsePrArtifactMode(
+    options.mermaid,
+    "mermaid",
+    config.lang
+  );
+  const includeScreenshots = screenshotsMode === "on" ? true : screenshotsMode === "off" ? false : config.pr?.screenshots?.upload ?? false;
+  const includeMermaid = mermaidMode === "on" ? true : mermaidMode === "off" ? false : feature.type === "be";
+  return {
+    includeScreenshots,
+    includeMermaid
+  };
+}
 async function resolveFeatureOrThrow(featureName, options, lang) {
   const config = await getConfig(process.cwd());
   if (!config) {
@@ -6440,27 +6626,38 @@ function getFeatureDocPaths(feature) {
 function normalizeHeading(value) {
   return value.trim().replace(/\s+/g, " ").toLowerCase();
 }
-function extractMarkdownSection(content, headings) {
+function extractMarkdownByHeadings(content, headings, levels) {
   const targets = new Set(headings.map((heading) => normalizeHeading(heading)));
   const lines = content.split("\n");
   let start = -1;
+  let startLevel = 0;
+  const levelSet = new Set(levels);
   for (let i = 0; i < lines.length; i++) {
-    const match = lines[i].match(/^\s*##\s+(.+?)\s*$/);
+    const match = lines[i].match(/^\s*(#{2,6})\s+(.+?)\s*$/);
     if (!match) continue;
-    if (!targets.has(normalizeHeading(match[1]))) continue;
+    const level = match[1].length;
+    if (!levelSet.has(level)) continue;
+    if (!targets.has(normalizeHeading(match[2]))) continue;
     start = i + 1;
+    startLevel = level;
     break;
   }
   if (start < 0) return void 0;
   let end = lines.length;
   for (let i = start; i < lines.length; i++) {
-    if (/^\s*##\s+/.test(lines[i])) {
+    const heading = lines[i].match(/^\s*(#{2,6})\s+(.+?)\s*$/);
+    if (!heading) continue;
+    const level = heading[1].length;
+    if (level <= startLevel) {
       end = i;
       break;
     }
   }
   return lines.slice(start, end).join("\n");
 }
+function extractMarkdownSection(content, headings) {
+  return extractMarkdownByHeadings(content, headings, [2]);
+}
 function isTemplateLine(line) {
   const trimmed = line.trim();
   if (!trimmed) return true;
@@ -6476,6 +6673,337 @@ function sanitizeOverviewSection(raw) {
   if (lines.length === 0) return void 0;
   return lines.slice(0, 5).join("\n");
 }
+function sanitizeDraftItem(raw) {
+  const trimmed = raw.replace(/^\s*-\s*\[[ xX]\]\s*/, "").replace(/^\s*-\s+/, "").replace(/^\s*###\s+/, "").trim();
+  const plain = trimmed.replace(/\*\*/g, "").trim();
+  if (!plain) return void 0;
+  if (isTemplateLine(plain)) return void 0;
+  if (/^todo:/i.test(plain)) return void 0;
+  if (/\{[^}]*\}/.test(plain)) return void 0;
+  if (/^(as a|i want|so that)\b/i.test(plain)) return void 0;
+  if (/^acceptance criteria:?$/i.test(plain)) return void 0;
+  return plain.replace(/\s+/g, " ");
+}
+function uniqItems(items) {
+  const seen = /* @__PURE__ */ new Set();
+  const ordered = [];
+  for (const item of items) {
+    const normalized = item.trim().toLowerCase();
+    if (!normalized || seen.has(normalized)) continue;
+    seen.add(normalized);
+    ordered.push(item.trim());
+  }
+  return ordered;
+}
+function normalizeSemanticKey(value) {
+  return value.toLowerCase().replace(/[`'"(){}\[\].,:;!?/\\\-_|]/g, " ").replace(/\s+/g, " ").trim().replace(/\s/g, "");
+}
+function uniqItemsByContainment(items) {
+  const kept = [];
+  const keys = [];
+  for (const item of items) {
+    const clean = item.trim();
+    if (!clean) continue;
+    const key = normalizeSemanticKey(clean);
+    if (!key) continue;
+    let replaced = false;
+    for (let i = 0; i < keys.length; i++) {
+      const current = keys[i];
+      if (!current.includes(key) && !key.includes(current)) continue;
+      if (key.length > current.length) {
+        keys[i] = key;
+        kept[i] = clean;
+      }
+      replaced = true;
+      break;
+    }
+    if (!replaced) {
+      keys.push(key);
+      kept.push(clean);
+    }
+  }
+  return kept;
+}
+function extractSectionLines(raw) {
+  if (!raw) return [];
+  return uniqItems(
+    raw.split("\n").map((line) => sanitizeDraftItem(line)).filter((line) => !!line)
+  );
+}
+function extractSectionHeadings(raw) {
+  if (!raw) return [];
+  return uniqItems(
+    raw.split("\n").map((line) => line.match(/^\s*###\s+(.+?)\s*$/)?.[1] || "").map((line) => sanitizeDraftItem(line)).filter((line) => !!line).map((line) => line.replace(/^FR-\d+:\s*/i, "").trim())
+  );
+}
+function toChecklistLines(items) {
+  return items.map((item) => `- [ ] ${item}`).join("\n");
+}
+function extractChecklistItems(raw) {
+  if (!raw) return [];
+  return uniqItems(
+    raw.split("\n").map((line) => {
+      const match = line.match(/^\s*-\s*\[[ xX]\]\s+(.+?)\s*$/);
+      if (!match) return void 0;
+      return sanitizeDraftItem(match[1]);
+    }).filter((line) => !!line)
+  );
+}
+function extractTaskTitles(tasksContent) {
+  return uniqItems(
+    tasksContent.split("\n").map((line) => {
+      const match = line.match(
+        /^\s*-\s*\[(?:TODO|DOING|DONE)\][^\n]*?\s+(?:T-[A-Z0-9-]+\s+)?(.+?)\s*$/
+      );
+      if (!match) return void 0;
+      return sanitizeDraftItem(match[1]);
+    }).filter((line) => !!line)
+  );
+}
+function extractTasksAcceptanceItems(tasksContent) {
+  const lines = tasksContent.split("\n");
+  const accepted = [];
+  let inAcceptance = false;
+  for (const line of lines) {
+    if (/^\s*-\s*Acceptance\s*:\s*$/i.test(line)) {
+      inAcceptance = true;
+      continue;
+    }
+    if (inAcceptance && /^\s*-\s*Checklist\s*:\s*$/i.test(line)) {
+      inAcceptance = false;
+      continue;
+    }
+    if (!inAcceptance) continue;
+    const match = line.match(/^\s*-\s*\[[ xX]\]\s+(.+?)\s*$/) || line.match(/^\s*-\s+(.+?)\s*$/);
+    if (!match) continue;
+    const item = sanitizeDraftItem(match[1]);
+    if (!item) continue;
+    accepted.push(item);
+  }
+  return uniqItems(accepted);
+}
+function extractScopeItemsFromPlan(planContent, lang) {
+  const section = extractMarkdownSection(
+    planContent,
+    ["\uBC94\uC704(\uBA85\uD655\uD654)", "\uBC94\uC704", "Scope", "Scope Clarification"]
+  );
+  if (!section) return { include: [], exclude: [] };
+  const lines = section.split("\n");
+  const include = [];
+  const exclude = [];
+  let mode = null;
+  const includePatterns = lang === "ko" ? [/포함/] : [/in\s*scope/i, /^include$/i, /included/i];
+  const excludePatterns = lang === "ko" ? [/비포함/, /제외/] : [/out\s*of\s*scope/i, /^exclude$/i, /excluded/i];
+  for (const line of lines) {
+    const plain = line.replace(/\*\*/g, "").trim();
+    if (!plain) continue;
+    if (excludePatterns.some((re) => re.test(plain))) {
+      mode = "exclude";
+      continue;
+    }
+    if (includePatterns.some((re) => re.test(plain))) {
+      mode = "include";
+      continue;
+    }
+    const bullet = line.match(/^\s*-\s+(.+?)\s*$/)?.[1];
+    if (!bullet) continue;
+    const item = sanitizeDraftItem(bullet);
+    if (!item) continue;
+    if (mode === "include") {
+      include.push(item);
+    } else if (mode === "exclude") {
+      exclude.push(item);
+    }
+  }
+  return {
+    include: uniqItems(include),
+    exclude: uniqItems(exclude)
+  };
+}
+function getIssueGoalsAndCriteria(specContent, planContent, tasksContent, overview, lang) {
+  const purposeLines = extractSectionLines(
+    extractMarkdownSection(specContent, ["\uBAA9\uC801", "Purpose"])
+  );
+  const requirementHeadings = extractSectionHeadings(
+    extractMarkdownSection(specContent, ["\uAE30\uB2A5 \uC694\uAD6C\uC0AC\uD56D", "Functional Requirements"])
+  );
+  const userStoryChecklist = extractChecklistItems(
+    extractMarkdownSection(specContent, ["\uC0AC\uC6A9\uC790 \uC2A4\uD1A0\uB9AC", "User Stories"])
+  );
+  const tasksAcceptance = extractTasksAcceptanceItems(tasksContent);
+  const scopeFromPlan = extractScopeItemsFromPlan(planContent, lang);
+  const taskTitles = extractTaskTitles(tasksContent);
+  const goals = uniqItemsByContainment(uniqItems([
+    ...requirementHeadings,
+    ...scopeFromPlan.include,
+    ...purposeLines.slice(0, 1),
+    sanitizeDraftItem(overview) || ""
+  ])).slice(0, 5);
+  while (goals.length < 3) {
+    goals.push(
+      lang === "ko" ? goals.length === 0 ? "spec.md \uBAA9\uC801\uC5D0 \uB9DE\uCDB0 \uAD6C\uD604 \uBC94\uC704\uB97C \uD655\uC815\uD55C\uB2E4." : goals.length === 1 ? "\uD3EC\uD568/\uC81C\uC678 \uBC94\uC704\uB97C \uBA85\uD655\uD788 \uC815\uC758\uD558\uACE0 \uBB38\uC11C\uC640 \uAD6C\uD604\uC744 \uC77C\uCE58\uC2DC\uD0A8\uB2E4." : "\uAD00\uB828 \uD14C\uC2A4\uD2B8 \uBC0F \uAC80\uC99D \uACBD\uB85C\uB97C \uD3EC\uD568\uD574 \uAE30\uB2A5 \uC644\uC131\uB3C4\uB97C \uD655\uBCF4\uD55C\uB2E4." : goals.length === 0 ? "Define implementation scope aligned with spec.md purpose." : goals.length === 1 ? "Clarify in-scope and out-of-scope boundaries and keep docs/code aligned." : "Ensure feature completeness with concrete validation paths."
+    );
+  }
+  const criteria = uniqItemsByContainment(
+    uniqItems([...userStoryChecklist, ...tasksAcceptance])
+  ).slice(0, 6);
+  while (criteria.length < 4) {
+    criteria.push(
+      lang === "ko" ? criteria.length === 0 ? "\uD575\uC2EC \uC0AC\uC6A9\uC790 \uC2DC\uB098\uB9AC\uC624\uC5D0\uC11C \uBAA9\uD45C \uB3D9\uC791\uC774 \uC7AC\uD604\uB41C\uB2E4." : criteria.length === 1 ? "\uC694\uAD6C\uC0AC\uD56D\uBCC4 \uC218\uC6A9 \uAE30\uC900\uC774 \uBAA8\uB450 \uCDA9\uC871\uB41C\uB2E4." : criteria.length === 2 ? "\uAC80\uC99D \uBC29\uBC95(\uD14C\uC2A4\uD2B8/\uC218\uB3D9 \uC2DC\uB098\uB9AC\uC624)\uC744 \uAE30\uB85D\uD574 \uC644\uB8CC\uB97C \uD655\uC778\uD560 \uC218 \uC788\uB2E4." : "\uD68C\uADC0 \uC5C6\uC774 \uAE30\uC874 \uB3D9\uC791\uACFC\uC758 \uD638\uD658\uC131\uC744 \uC720\uC9C0\uD55C\uB2E4." : criteria.length === 0 ? "Core user scenarios reproduce expected behavior." : criteria.length === 1 ? "All requirement-level acceptance criteria are satisfied." : criteria.length === 2 ? "Validation method (tests/manual scenarios) is documented for completion checks." : "Compatibility is preserved without regressions."
+    );
+  }
+  const scope = uniqItemsByContainment(
+    uniqItems([...scopeFromPlan.include, ...taskTitles])
+  ).slice(0, 6);
+  return {
+    goals: goals.slice(0, 5),
+    criteria: criteria.slice(0, 6),
+    scope
+  };
+}
+function extractPlanChangeTargets(planContent, lang) {
+  const section = extractMarkdownSection(
+    planContent,
+    [
+      "\uBCC0\uACBD \uB300\uC0C1(\uC608\uC0C1)",
+      "\uBCC0\uACBD \uB300\uC0C1",
+      "Changed Files",
+      "Change Targets",
+      "Expected Changes"
+    ]
+  );
+  if (!section) return [];
+  const lines = section.split("\n");
+  const out = [];
+  let inCode = false;
+  for (const line of lines) {
+    if (/^\s*```/.test(line)) {
+      inCode = !inCode;
+      continue;
+    }
+    if (inCode) {
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+      if (!/[\\/]/.test(trimmed)) continue;
+      out.push(
+        lang === "ko" ? `\`${trimmed}\` \uBCC0\uACBD` : `Update \`${trimmed}\``
+      );
+      continue;
+    }
+    const bullet = line.match(/^\s*-\s+(.+?)\s*$/)?.[1];
+    if (!bullet) continue;
+    const item = sanitizeDraftItem(bullet);
+    if (!item) continue;
+    out.push(item);
+  }
+  return uniqItemsByContainment(uniqItems(out));
+}
+function extractCommandsFromSection(raw) {
+  if (!raw) return [];
+  const commands = [];
+  for (const match of raw.matchAll(/`([^`]+)`/g)) {
+    const candidate = match[1].trim();
+    if (!candidate) continue;
+    if (/\{[^}]*\}/.test(candidate)) continue;
+    if (!/\b(pnpm|npm|yarn|bun|vitest|jest|tsx?|node)\b/.test(candidate)) continue;
+    commands.push(candidate);
+  }
+  for (const line of raw.split("\n")) {
+    const trimmed = line.trim().replace(/^-+\s*/, "");
+    if (!trimmed) continue;
+    if (!/\b(pnpm|npm|yarn|bun|vitest|jest|tsx?|node)\b/.test(trimmed)) continue;
+    if (/\{[^}]*\}/.test(trimmed)) continue;
+    commands.push(trimmed);
+  }
+  return uniqItems(commands);
+}
+function extractRecordedTestLines(tasksContent, planContent, lang) {
+  const section = extractMarkdownByHeadings(
+    tasksContent,
+    ["\uD14C\uC2A4\uD2B8 \uC2E4\uD589 \uAE30\uB85D", "Tests Run", "Test Run Log", "Test Execution Log"],
+    [3, 2]
+  );
+  const records = [];
+  if (section) {
+    for (const line of section.split("\n")) {
+      if (!line.trim().startsWith("|")) continue;
+      const cells = line.split("|").slice(1, -1).map((cell) => cell.trim().replace(/`/g, ""));
+      if (cells.length < 3) continue;
+      const [cmd, time, result] = cells;
+      if (!cmd || /^명령어$/i.test(cmd) || /^command$/i.test(cmd) || /^-+$/.test(cmd)) continue;
+      if (/\{[^}]*\}/.test(cmd) || /\{[^}]*\}/.test(result || "")) continue;
+      const renderedResult = result || (lang === "ko" ? "\uBBF8\uAE30\uB85D" : "not recorded");
+      const renderedTime = time && time !== "-" ? ` (${time})` : "";
+      records.push(`\`${cmd}\` \u2014 ${renderedResult}${renderedTime}`);
+    }
+    const lines = section.split("\n");
+    for (let i = 0; i < lines.length; i++) {
+      const commandMatch = lines[i].match(/^\s*-\s*(?:명령어|Command)\s*:\s*`?([^`]+?)`?\s*$/i);
+      if (!commandMatch) continue;
+      const command = commandMatch[1].trim();
+      if (!command || /\{[^}]*\}/.test(command)) continue;
+      let result = "";
+      for (let j = i + 1; j < Math.min(lines.length, i + 5); j++) {
+        const resultMatch = lines[j].match(/^\s*-\s*(?:결과|Result)\s*:\s*(.+?)\s*$/i);
+        if (!resultMatch) continue;
+        result = resultMatch[1].replace(/`/g, "").trim();
+        break;
+      }
+      if (!result || /\{[^}]*\}/.test(result)) continue;
+      records.push(`\`${command}\` \u2014 ${result}`);
+    }
+  }
+  if (records.length > 0) {
+    return uniqItemsByContainment(uniqItems(records));
+  }
+  const plannedCommands = extractCommandsFromSection(
+    extractMarkdownByHeadings(
+      planContent,
+      ["\uAC80\uC99D \uBA85\uB839(\uC608\uC815)", "Validation Commands", "Verification Commands"],
+      [3, 2]
+    )
+  );
+  if (plannedCommands.length > 0) {
+    return plannedCommands.map(
+      (command) => lang === "ko" ? `\`${command}\` \u2014 \uC2E4\uD589 \uACB0\uACFC\uB97C \uAE30\uB85D\uD558\uC138\uC694.` : `\`${command}\` \u2014 record execution result.`
+    );
+  }
+  return [];
+}
+function getPrChangesAndTests(specContent, planContent, tasksContent, overview, lang) {
+  const requirementHeadings = extractSectionHeadings(
+    extractMarkdownSection(specContent, ["\uAE30\uB2A5 \uC694\uAD6C\uC0AC\uD56D", "Functional Requirements"])
+  );
+  const scopeFromPlan = extractScopeItemsFromPlan(planContent, lang).include;
+  const planTargets = extractPlanChangeTargets(planContent, lang);
+  const taskTitles = extractTaskTitles(tasksContent);
+  const changes = uniqItemsByContainment(
+    uniqItems([
+      ...taskTitles,
+      ...scopeFromPlan,
+      ...requirementHeadings,
+      ...planTargets,
+      sanitizeDraftItem(overview) || ""
+    ])
+  ).slice(0, 6);
+  while (changes.length < 3) {
+    changes.push(
+      lang === "ko" ? changes.length === 0 ? "\uD575\uC2EC \uAD6C\uD604 \uBCC0\uACBD \uC0AC\uD56D\uC744 \uC694\uC57D\uD574 \uBC18\uC601\uD55C\uB2E4." : changes.length === 1 ? "\uC601\uD5A5 \uBC94\uC704(\uD638\uD658\uC131/\uB9C8\uC774\uADF8\uB808\uC774\uC158 \uD3EC\uD568)\uB97C \uBA85\uC2DC\uD55C\uB2E4." : "\uBB38\uC11C\uC640 \uAD6C\uD604 \uAC04 \uBD88\uC77C\uCE58\uAC00 \uC5C6\uB3C4\uB85D \uC815\uD569\uC131\uC744 \uC810\uAC80\uD55C\uB2E4." : changes.length === 0 ? "Summarize key implementation changes." : changes.length === 1 ? "Document impact scope (including compatibility/migration)." : "Verify document and implementation consistency."
+    );
+  }
+  const tests = uniqItemsByContainment(
+    uniqItems(extractRecordedTestLines(tasksContent, planContent, lang))
+  ).slice(0, 4);
+  while (tests.length < 2) {
+    tests.push(
+      lang === "ko" ? tests.length === 0 ? "\uAD00\uB828 \uD14C\uC2A4\uD2B8\uB97C \uC2E4\uD589\uD558\uACE0 \uACB0\uACFC\uB97C \uAE30\uB85D\uD55C\uB2E4." : "\uBBF8\uC2E4\uD589 \uD14C\uC2A4\uD2B8\uAC00 \uC788\uC73C\uBA74 \uC0AC\uC720\uC640 \uB9AC\uC2A4\uD06C\uB97C \uAE30\uB85D\uD55C\uB2E4." : tests.length === 0 ? "Run relevant tests and record results." : "If tests were not run, record rationale and risk."
+    );
+  }
+  return {
+    changes: changes.slice(0, 6),
+    tests: tests.slice(0, 4)
+  };
+}
 function resolveOverviewFromSpec(specContent, feature, lang) {
   const fromPurpose = sanitizeOverviewSection(
     extractMarkdownSection(specContent, ["\uBAA9\uC801", "Purpose"])
@@ -6487,7 +7015,112 @@ function resolveOverviewFromSpec(specContent, feature, lang) {
   if (fromOverview) return fromOverview;
   return lang === "ko" ? `\`${feature.folderName}\` \uAE30\uB2A5 \uAC1C\uC694\uB97C spec.md \uAE30\uC900\uC73C\uB85C \uC791\uC131\uD558\uC138\uC694.` : `Summarize feature \`${feature.folderName}\` from spec.md.`;
 }
-function buildIssueBody(overview, labels, paths, lang) {
+function getPrScreenshotsHeading(lang) {
+  return getGithubDraftArtifactHeading("pr", "screenshots", lang) || (lang === "ko" ? "\uC2A4\uD06C\uB9B0\uC0F7" : "Screenshots");
+}
+function getPrMermaidHeading(lang) {
+  return getGithubDraftArtifactHeading("pr", "mermaid", lang) || (lang === "ko" ? "\uC544\uD0A4\uD14D\uCC98 \uB2E4\uC774\uC5B4\uADF8\uB7A8" : "Architecture Diagram");
+}
+function buildPrScreenshotsSection(lang) {
+  if (lang === "ko") {
+    return `
+## \uC2A4\uD06C\uB9B0\uC0F7
+
+- [ ] \uC5C5\uB85C\uB4DC\uD55C \uC2A4\uD06C\uB9B0\uC0F7 URL\uC744 \uD3EC\uD568\uD558\uC138\uC694. (\uC608: \`![](https://...)\`)
+`;
+  }
+  return `
+## Screenshots
+
+- [ ] Include uploaded screenshot URL(s). (e.g. \`![](https://...)\`)
+`;
+}
+function buildPrMermaidSection(lang) {
+  if (lang === "ko") {
+    return `
+## \uC544\uD0A4\uD14D\uCC98 \uB2E4\uC774\uC5B4\uADF8\uB7A8
+
+\`\`\`mermaid
+sequenceDiagram
+  participant Client
+  participant API
+  participant Service
+  participant DB
+  Client->>API: Request
+  API->>Service: Execute
+  Service->>DB: Query/Command
+  DB-->>Service: Result
+  Service-->>API: Response DTO
+  API-->>Client: Response
+\`\`\`
+`;
+  }
+  return `
+## Architecture Diagram
+
+\`\`\`mermaid
+sequenceDiagram
+  participant Client
+  participant API
+  participant Service
+  participant DB
+  Client->>API: Request
+  API->>Service: Execute
+  Service->>DB: Query/Command
+  DB-->>Service: Result
+  Service-->>API: Response DTO
+  API-->>Client: Response
+\`\`\`
+`;
+}
+function ensurePrArtifacts(body, policy, lang) {
+  if (policy.includeScreenshots) {
+    const heading = getPrScreenshotsHeading(lang);
+    const section = extractMarkdownByHeadings(body, [heading], [2]);
+    if (!section) {
+      throw createCliError(
+        "PRECONDITION_FAILED",
+        tg(lang, "prScreenshotsSectionMissing", { section: heading })
+      );
+    }
+    if (!/!\[[^\]]*]\((?!\s*\))[^)]+\)/m.test(section)) {
+      throw createCliError(
+        "PRECONDITION_FAILED",
+        tg(lang, "prScreenshotImageMissing", { section: heading })
+      );
+    }
+  }
+  if (policy.includeMermaid) {
+    const heading = getPrMermaidHeading(lang);
+    const section = extractMarkdownByHeadings(body, [heading], [2]);
+    if (!section) {
+      throw createCliError(
+        "PRECONDITION_FAILED",
+        tg(lang, "prMermaidSectionMissing", { section: heading })
+      );
+    }
+    if (!/```mermaid[\s\S]*?```/m.test(section)) {
+      throw createCliError(
+        "PRECONDITION_FAILED",
+        tg(lang, "prMermaidBlockMissing", { section: heading })
+      );
+    }
+  }
+}
+function buildIssueBody(specContent, planContent, tasksContent, overview, labels, paths, lang) {
+  const bodyPaths = toBodyDocPaths(paths);
+  const draft = getIssueGoalsAndCriteria(specContent, planContent, tasksContent, overview, lang);
+  const goals = toChecklistLines(draft.goals);
+  const criteria = toChecklistLines(draft.criteria);
+  const scopeSection = draft.scope.length > 0 ? lang === "ko" ? `
+## \uC791\uC5C5 \uBC94\uC704(\uC608\uC815)
+
+${draft.scope.map((item) => `- ${item}`).join("\n")}
+` : `
+## Planned Scope
+
+${draft.scope.map((item) => `- ${item}`).join("\n")}
+` : "";
   if (lang === "ko") {
     return `## \uAC1C\uC694
 
@@ -6495,19 +7128,18 @@ ${overview}
 
 ## \uBAA9\uD45C
 
-- [ ] TODO: spec.md \uBAA9\uC801/\uBC94\uC704\uB97C \uBC14\uD0D5\uC73C\uB85C \uBAA9\uD45C\uB97C \uC791\uC131\uD558\uC138\uC694.
-- [ ] TODO: \uAD6C\uD604 \uBC94\uC704(\uD3EC\uD568/\uC81C\uC678)\uB97C \uAD6C\uCCB4\uC801\uC73C\uB85C \uC791\uC131\uD558\uC138\uC694.
+${goals}
 
 ## \uC644\uB8CC \uAE30\uC900
 
-- [ ] TODO: \uAC80\uC99D \uAC00\uB2A5\uD55C \uC644\uB8CC \uAE30\uC900\uC744 \uC791\uC131\uD558\uC138\uC694.
-- [ ] TODO: \uC644\uB8CC \uD655\uC778 \uBC29\uBC95(\uD14C\uC2A4\uD2B8/\uC2DC\uB098\uB9AC\uC624)\uC744 \uC791\uC131\uD558\uC138\uC694.
+${criteria}
+${scopeSection}
 
 ## \uAD00\uB828 \uBB38\uC11C
 
-- **Spec**: \`${paths.specPath}\`
-- **Plan**: \`${paths.planPath}\`
-- **Tasks**: \`${paths.tasksPath}\`
+- **Spec**: \`${bodyPaths.specPath}\`
+- **Plan**: \`${bodyPaths.planPath}\`
+- **Tasks**: \`${bodyPaths.tasksPath}\`
 
 ## \uB77C\uBCA8
 
@@ -6520,29 +7152,40 @@ ${overview}
 
 ## Goals
 
-- [ ] TODO: Fill concrete goals based on spec.md.
-- [ ] TODO: Clarify in-scope and out-of-scope boundaries.
+${goals}
 
 ## Completion Criteria
 
-- [ ] TODO: Define verifiable completion criteria.
-- [ ] TODO: Add validation/test conditions for completion.
+${criteria}
+${scopeSection}
 
 ## Related Documents
 
-- **Spec**: \`${paths.specPath}\`
-- **Plan**: \`${paths.planPath}\`
-- **Tasks**: \`${paths.tasksPath}\`
+- **Spec**: \`${bodyPaths.specPath}\`
+- **Plan**: \`${bodyPaths.planPath}\`
+- **Tasks**: \`${bodyPaths.tasksPath}\`
 
 ## Labels
 
 ${labels.map((label) => `- \`${label}\``).join("\n")}
 `;
 }
-function buildPrBody(feature, overview, paths, lang) {
+function buildPrBody(feature, specContent, planContent, tasksContent, overview, paths, artifactPolicy, lang) {
+  const bodyPaths = toBodyDocPaths(paths);
   const closes = feature.issueNumber ? `
 Closes #${feature.issueNumber}
 ` : "\n";
+  const draft = getPrChangesAndTests(
+    specContent,
+    planContent,
+    tasksContent,
+    overview,
+    lang
+  );
+  const changes = toChecklistLines(draft.changes);
+  const tests = toChecklistLines(draft.tests);
+  const screenshotsSection = artifactPolicy.includeScreenshots ? buildPrScreenshotsSection(lang) : "";
+  const mermaidSection = artifactPolicy.includeMermaid ? buildPrMermaidSection(lang) : "";
   if (lang === "ko") {
     return `## \uAC1C\uC694
 
@@ -6550,20 +7193,20 @@ ${overview}
 
 ## \uBCC0\uACBD \uC0AC\uD56D
 
-- [ ] TODO: \uD575\uC2EC \uCF54\uB4DC \uBCC0\uACBD \uC0AC\uD56D\uC744 \uC694\uC57D\uD558\uC138\uC694.
-- [ ] TODO: \uC601\uD5A5 \uBC94\uC704/\uD638\uD658\uC131(\uB9C8\uC774\uADF8\uB808\uC774\uC158 \uD3EC\uD568)\uC744 \uC791\uC131\uD558\uC138\uC694.
+${changes}
 
 ## \uD14C\uC2A4\uD2B8
 
 ### \uC2E4\uD589\uD55C \uD14C\uC2A4\uD2B8
 
-- [ ] TODO: \`<\uC2E4\uD589\uD55C \uD14C\uC2A4\uD2B8 \uBA85\uB839\uC5B4>\` \u2014 PASS/FAIL
-- [ ] TODO: \uBBF8\uC2E4\uD589 \uD14C\uC2A4\uD2B8\uAC00 \uC788\uB2E4\uBA74 \uC0AC\uC720\uB97C \uC791\uC131\uD558\uC138\uC694.
+${tests}
+${screenshotsSection}
+${mermaidSection}
 
 ## \uAD00\uB828 \uBB38\uC11C
 
-- **Spec**: \`${paths.specPath}\`
-- **Tasks**: \`${paths.tasksPath}\`${closes}`;
+- **Spec**: \`${bodyPaths.specPath}\`
+- **Tasks**: \`${bodyPaths.tasksPath}\`${closes}`;
   }
   return `## Overview
 
@@ -6571,26 +7214,26 @@ ${overview}
 
 ## Changes
 
-- [ ] TODO: Summarize key code changes in this PR.
-- [ ] TODO: Describe impact/scope (including migration if any).
+${changes}
 
 ## Tests
 
 ### Tests Run
 
-- [ ] TODO: \`<test command>\` \u2014 PASS/FAIL
-- [ ] TODO: If tests were not run, explain why.
+${tests}
+${screenshotsSection}
+${mermaidSection}
 
 ## Related Documents
 
-- **Spec**: \`${paths.specPath}\`
-- **Tasks**: \`${paths.tasksPath}\`${closes}`;
+- **Spec**: \`${bodyPaths.specPath}\`
+- **Tasks**: \`${bodyPaths.tasksPath}\`${closes}`;
 }
 function getRequiredIssueSections(lang) {
-  return lang === "ko" ? ["\uAC1C\uC694", "\uBAA9\uD45C", "\uC644\uB8CC \uAE30\uC900", "\uAD00\uB828 \uBB38\uC11C", "\uB77C\uBCA8"] : ["Overview", "Goals", "Completion Criteria", "Related Documents", "Labels"];
+  return getGithubDraftRequiredSections("issue", lang);
 }
 function getRequiredPrSections(lang) {
-  return lang === "ko" ? ["\uAC1C\uC694", "\uBCC0\uACBD \uC0AC\uD56D", "\uD14C\uC2A4\uD2B8", "\uAD00\uB828 \uBB38\uC11C"] : ["Overview", "Changes", "Tests", "Related Documents"];
+  return getGithubDraftRequiredSections("pr", lang);
 }
 function replaceListField(content, keys, value) {
   for (const key of keys) {
@@ -6809,14 +7452,24 @@ function githubCommand(program2) {
         config.lang
       );
       const specContent = await fs15.readFile(path17.join(config.docsDir, paths.specPath), "utf-8");
+      const planContent = await fs15.readFile(path17.join(config.docsDir, paths.planPath), "utf-8");
+      const tasksContent = await fs15.readFile(path17.join(config.docsDir, paths.tasksPath), "utf-8");
       const overview = resolveOverviewFromSpec(specContent, feature, config.lang);
       const title = options.title?.trim() || tg(config.lang, "issueDefaultTitle", {
         slug: feature.slug,
         folder: feature.folderName
       });
-      const body = buildIssueBody(overview, labels, paths, config.lang);
+      const generatedBody = buildIssueBody(
+        specContent,
+        planContent,
+        tasksContent,
+        overview,
+        labels,
+        paths,
+        config.lang
+      );
       ensureSections(
-        body,
+        generatedBody,
         getRequiredIssueSections(config.lang),
         tg(config.lang, "kindIssue"),
         config.lang
@@ -6827,10 +7480,23 @@ function githubCommand(program2) {
         config.docsDir,
         feature.type
       );
-      await fs15.ensureDir(path17.dirname(bodyFile));
-      await fs15.writeFile(bodyFile, body, "utf-8");
+      const explicitBodyFile = (options.bodyFile || "").trim();
+      let body = generatedBody;
+      if (options.create && explicitBodyFile && await fs15.pathExists(bodyFile)) {
+        body = await fs15.readFile(bodyFile, "utf-8");
+        ensureSections(
+          body,
+          getRequiredIssueSections(config.lang),
+          tg(config.lang, "kindIssue"),
+          config.lang
+        );
+      } else {
+        await fs15.ensureDir(path17.dirname(bodyFile));
+        await fs15.writeFile(bodyFile, generatedBody, "utf-8");
+      }
       let issueUrl;
       if (options.create) {
+        ensureNoTodoPlaceholders(body, tg(config.lang, "kindIssue"), config.lang);
         assertRemoteApproval(
           options.confirm,
           tg(config.lang, "operationIssueCreate"),
@@ -6914,7 +7580,7 @@ function githubCommand(program2) {
   github.command("pr [feature-name]").description(tg(commandLang, "cmdPrDescription")).option("--json", tg(commandLang, "optJson")).option("--repo <repo>", tg(commandLang, "optRepo")).option("--component <component>", tg(commandLang, "optComponent")).option("--title <title>", tg(commandLang, "optPrTitle")).option("--labels <labels>", tg(commandLang, "optLabels")).option("--body-file <path>", tg(commandLang, "optPrBodyFile")).option("--assignee <assignee>", tg(commandLang, "optPrAssignee")).option("--base <branch>", tg(commandLang, "optPrBase"), "main").option("--create", tg(commandLang, "optPrCreate")).option("--pr <ref>", tg(commandLang, "optPrRef")).option("--merge", tg(commandLang, "optPrMerge")).option(
     "--confirm <reply>",
     tg(commandLang, "optPrConfirm")
-  ).option("--retry <count>", tg(commandLang, "optPrRetry")).option("--no-sync-tasks", tg(commandLang, "optPrNoSyncTasks")).option("--commit-sync", tg(commandLang, "optPrCommitSync")).action(async (featureName, options) => {
+  ).option("--retry <count>", tg(commandLang, "optPrRetry")).option("--screenshots <mode>", tg(commandLang, "optPrScreenshots"), "auto").option("--mermaid <mode>", tg(commandLang, "optPrMermaid"), "auto").option("--no-sync-tasks", tg(commandLang, "optPrNoSyncTasks")).option("--commit-sync", tg(commandLang, "optPrCommitSync")).action(async (featureName, options) => {
     try {
       const selectedComponent = resolveComponentOption4(options, commandLang);
       const { config, feature } = await resolveFeatureOrThrow(featureName, {
@@ -6924,6 +7590,9 @@ function githubCommand(program2) {
       const paths = getFeatureDocPaths(feature);
       ensureDocsExist(config.docsDir, [paths.specPath, paths.tasksPath], config.lang);
       const specContent = await fs15.readFile(path17.join(config.docsDir, paths.specPath), "utf-8");
+      const planPath = path17.join(config.docsDir, paths.planPath);
+      const planContent = await fs15.pathExists(planPath) ? await fs15.readFile(planPath, "utf-8") : "";
+      const tasksContent = await fs15.readFile(path17.join(config.docsDir, paths.tasksPath), "utf-8");
       const overview = resolveOverviewFromSpec(specContent, feature, config.lang);
       const defaultTitle = feature.issueNumber ? tg(config.lang, "prDefaultTitleWithIssue", {
         issue: feature.issueNumber,
@@ -6932,9 +7601,19 @@ function githubCommand(program2) {
         slug: feature.slug
       });
       const title = options.title?.trim() || defaultTitle;
-      const body = buildPrBody(feature, overview, paths, config.lang);
+      const artifactPolicy = resolvePrArtifactPolicy(config, feature, options);
+      const generatedBody = buildPrBody(
+        feature,
+        specContent,
+        planContent,
+        tasksContent,
+        overview,
+        paths,
+        artifactPolicy,
+        config.lang
+      );
       ensureSections(
-        body,
+        generatedBody,
         getRequiredPrSections(config.lang),
         tg(config.lang, "kindPr"),
         config.lang
@@ -6945,13 +7624,27 @@ function githubCommand(program2) {
         config.docsDir,
         feature.type
       );
-      await fs15.ensureDir(path17.dirname(bodyFile));
-      await fs15.writeFile(bodyFile, body, "utf-8");
+      const explicitBodyFile = (options.bodyFile || "").trim();
+      let body = generatedBody;
+      if (options.create && explicitBodyFile && await fs15.pathExists(bodyFile)) {
+        body = await fs15.readFile(bodyFile, "utf-8");
+        ensureSections(
+          body,
+          getRequiredPrSections(config.lang),
+          tg(config.lang, "kindPr"),
+          config.lang
+        );
+      } else {
+        await fs15.ensureDir(path17.dirname(bodyFile));
+        await fs15.writeFile(bodyFile, generatedBody, "utf-8");
+      }
       const retryCount = toRetryCount(options.retry, config.lang);
       let prUrl = options.pr?.trim() || "";
       let mergedAttempts;
       let syncChanged = false;
       if (options.create) {
+        ensureNoTodoPlaceholders(body, tg(config.lang, "kindPr"), config.lang);
+        ensurePrArtifacts(body, artifactPolicy, config.lang);
         assertRemoteApproval(
           options.confirm,
           tg(config.lang, "operationPrCreate"),
@@ -7046,6 +7739,10 @@ function githubCommand(program2) {
               labels,
               body,
               bodyFile,
+              artifactPolicy: {
+                screenshots: artifactPolicy.includeScreenshots,
+                mermaid: artifactPolicy.includeMermaid
+              },
               prUrl: prUrl || void 0,
               syncChanged,
               merged: !!options.merge,
@@ -7187,6 +7884,7 @@ function docsCommand(program2) {
         id,
         command: toBuiltinDocCommand(id)
       }));
+      const contract = getGithubDraftContractForBuiltinDoc(docId, config.lang);
       if (options.json) {
         console.log(
           JSON.stringify(
@@ -7202,7 +7900,8 @@ function docsCommand(program2) {
                 hash: loaded.hash,
                 content: loaded.content
               },
-              requiredDocs: followups
+              requiredDocs: followups,
+              contract: contract || void 0
             },
             null,
             2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lee-spec-kit",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Project documentation structure generator for AI-assisted development",
   "type": "module",
   "bin": {

package/templates/en/common/agents/skills/create-issue.md

@@ -47,7 +47,7 @@ Before creating issue, share and wait for explicit approval (OK):
 - Full body draft (from `body`)
 - Labels
 
-Also fill all `TODO` items in Goals/Completion Criteria before creating.
+Also refine Goals/Completion Criteria based on spec before creating.
 
 ### 3. Create Issue
 

package/templates/en/common/agents/skills/create-pr.md

@@ -26,6 +26,9 @@ npx lee-spec-kit docs get pr-template --json
 
 # 2) Generate draft body (no remote action)
 npx lee-spec-kit github pr F001 --json
+# - Force screenshots section: --screenshots on
+# - Force Mermaid section: --mermaid on
+# - Auto policy (default): --screenshots auto --mermaid auto
 ```
 
 Use `docs get pr-template --json` output as the section policy,
@@ -131,7 +134,7 @@ Before creating PR, share the following **in a code block** and wait for **expli
 - Full body draft (from `body`)
 - Labels (at least 1; cannot be empty)
 
-Before approval/create, fill all `TODO` items in the generated draft.
+Before approval/create, refine the generated draft's Changes/Tests sections based on actual work.
 
 ### 5. Create PR
 

package/templates/ko/common/agents/skills/create-issue.md

@@ -47,7 +47,7 @@ npx lee-spec-kit github issue F001 --json
 - 본문 전체 초안 (`body` 기준)
 - 라벨
 
-생성 전 목표/완료 기준 섹션의 `TODO` 항목을 모두 채우세요.
+생성 전 목표/완료 기준을 spec 기준으로 구체화하고 검토하세요.
 
 ### 3. 이슈 생성
 

package/templates/ko/common/agents/skills/create-pr.md

@@ -26,6 +26,9 @@ npx lee-spec-kit docs get pr-template --json
 
 # 2) 초안 본문 생성 (원격 작업 아님)
 npx lee-spec-kit github pr F001 --json
+# - 스크린샷 강제 포함: --screenshots on
+# - Mermaid 강제 포함: --mermaid on
+# - 자동 정책(기본): --screenshots auto --mermaid auto
 ```
 
 `docs get pr-template --json` 출력은 섹션 정책으로 보고,
@@ -131,7 +134,7 @@ PR 생성 전 다음 내용을 **코드블록으로** 사용자에게 공유하
 - 본문 전체 초안 (`body` 기준)
 - 라벨(최소 1개, 비워둘 수 없음)
 
-승인/생성 전에 생성된 초안의 `TODO` 항목을 모두 채우세요.
+승인/생성 전에 생성된 초안의 변경 사항/테스트 섹션을 실제 작업 기준으로 보완하세요.
 
 ### 5. PR 생성