@thiagodiogo/pscode 2.4.0 → 2.6.0

package/dist/core/templates/workflows/apply-change.js

@@ -118,10 +118,35 @@ function getApplyInstructions() {
    > - Descrição do PR: use o template definido em \`pr.description.template\`
    > - Ao abrir o PR: \`<"comente o link do PR nesta task" se pr.comments.linkInTask: true, senão omita>\`
 
-   The agent MUST create the branch with the configured pattern before making any code changes.
    Template variables available: \`{change-name}\` = current change name, \`{type}\` = feat/fix/chore, \`{ticket}\` = ticket ID if available.
 
-   **If \`pscode/config.yaml\` does not exist, or \`pr.enabled: false\`, or file not found:** continue normally without any PR instructions.
+   **Detect whether a PR already exists for this change** (it may have been opened in \`/ps:propose\`). Resolve the branch name from \`pr.branch.pattern\`, then check the current branch and its PR:
+   \`\`\`bash
+   git checkout <branch>   # if it already exists; otherwise it will be created below
+   gh pr view --json state,url
+   \`\`\`
+
+   - **If a PR already exists** (the \`gh pr view\` returns an open PR): do NOT open another — just continue working on the existing PR. Save its URL as \`prUrl\`.
+
+   - **If NO PR exists:** open one in **DRAFT automatically, without asking the user**:
+     1. Create the branch with the configured \`pr.branch.pattern\` if it does not exist yet (\`git checkout -b <branch>\`) — the agent MUST be on this branch before making any code changes.
+     2. Commit any pending planning artifacts: \`git add -A && git commit -m "chore(<change-name>): planning artifacts"\` (skip if nothing to commit).
+     3. Push and set upstream: \`git push -u origin <branch>\`.
+     4. Open the PR in DRAFT, deriving the title from \`pr.title.template\` and the body from \`pr.description.template\`:
+        \`gh pr create --draft --title "<resolved title>" --body "<resolved description>"\`.
+     5. Capture the PR URL as \`prUrl\`.
+
+   **Comentário do link no tracker:** after opening a PR (or detecting an existing one just opened), if \`pr.comments.linkInTask: true\` and a Trello \`cardId\` was saved in Step 2, comment the PR link on the card:
+   \`\`\`tool
+   mcp__claude_ai_Trello_Custom__add_comment
+     card_id: "<cardId>"
+     text: |
+       🔀 Pull Request (DRAFT): <prUrl>
+   \`\`\`
+
+   **Tratamento de falha (não-bloqueante):** if \`gh\` or \`git\` fails — \`gh\` not installed, not authenticated, or no GitHub remote — **do NOT block**: state what failed and how to fix it (e.g., \`gh auth login\`), ask whether the user wants the agent to resolve it in parallel, and **continue the implementation regardless**. The branch and local commits are preserved.
+
+   **If \`pscode/config.yaml\` does not exist, or \`pr.enabled: false\`, or file not found:** continue normally without any PR instructions — no branch, no PR.
 
 6. **Show current progress**
 

package/dist/core/templates/workflows/complete-change.js

@@ -44,9 +44,8 @@ function getArchiveInstructions() {
    If status reports \`actionContext.mode: "workspace-planning"\`, explain that workspace archive is not supported in this slice and STOP.
 
    **If any artifacts are not \`done\`:**
-   - Display warning listing incomplete artifacts
-   - Use **AskUserQuestion tool** to confirm user wants to proceed
-   - Proceed if user confirms
+   - Record a warning listing the incomplete artifacts (to surface in the final summary)
+   - Proceed automatically — do NOT use \`AskUserQuestion\` and do NOT block on this
 
 3. **Check task completion status**
 
@@ -55,26 +54,20 @@ function getArchiveInstructions() {
    Count tasks marked with \`- [ ]\` (incomplete) vs \`- [x]\` (complete).
 
    **If incomplete tasks found:**
-   - Display warning showing count of incomplete tasks
-   - Use **AskUserQuestion tool** to confirm user wants to proceed
-   - Proceed if user confirms
+   - Record a warning showing the count of incomplete tasks (to surface in the final summary)
+   - Proceed automatically — do NOT use \`AskUserQuestion\` and do NOT block on this
 
    **If no tasks file exists:** Proceed without task-related warning.
 
-4. **Assess delta spec sync state**
+4. **Sync delta specs into main specs automatically**
 
-   Use \`artifactPaths.specs.existingOutputPaths\` from status JSON to check for delta specs. If none exist, proceed without sync prompt.
+   Use \`artifactPaths.specs.existingOutputPaths\` from status JSON to check for delta specs. If none exist, proceed directly to the archive step — there is nothing to sync.
 
-   **If delta specs exist:**
-   - Compare each delta spec with its corresponding main spec at \`pscode/specs/<capability>/spec.md\`
-   - Determine what changes would be applied (adds, modifications, removals, renames)
-   - Show a combined summary before prompting
-
-   **Prompt options:**
-   - If changes needed: "Sync now (recommended)", "Archive without syncing"
-   - If already synced: "Archive now", "Sync anyway", "Cancel"
-
-   If user chooses sync, use Task tool (subagent_type: "general-purpose", prompt: "Use Skill tool to invoke pscode-sync-specs for change '<name>'. Delta spec analysis: <include the analyzed delta spec summary>"). Proceed to archive regardless of choice.
+   **If delta specs exist, sync them inline yourself (no prompt, no subagent):**
+   - For each delta spec, read it and compare it with its corresponding main spec at \`pscode/specs/<capability>/spec.md\` (create the main spec if it does not exist yet).
+   - Apply the delta directly to the main spec: \`## ADDED Requirements\` are inserted, \`## MODIFIED Requirements\` replace the matching requirement, \`## REMOVED Requirements\` are deleted, and renames update the heading. Use the **Edit/Write tools** to apply the changes.
+   - Do NOT use \`AskUserQuestion\` and do NOT delegate to a \`pscode-sync-specs\` skill (it does not exist) — perform the merge inline.
+   - After applying, keep an informative summary of what was synced (adds, modifications, removals, renames) to show in the final summary. This summary is informational only — never blocking.
 
 5. **Perform the archive**
 
@@ -144,7 +137,7 @@ function getArchiveInstructions() {
        Change: <change-name>
        Schema: <schema-name>
        Arquivada em: <archive-path>
-       Specs: <sincronizado / sem delta specs / sync pulado>
+       Specs: <sincronizado / sem delta specs>
        Tasks: <N>/<N> concluidas
 
        Fluxo encerrado. Nenhuma acao adicional necessaria.
@@ -158,8 +151,8 @@ function getArchiveInstructions() {
    - Change name
    - Schema that was used
    - Archive location
-   - Spec sync status (synced / sync skipped / no delta specs)
-   - Note about any warnings (incomplete artifacts/tasks)
+   - Spec sync status (synced / no delta specs)
+   - Note about any warnings (incomplete artifacts/tasks that were archived anyway)
    - Trello: mention if card was moved to "Concluído"
 
 **Output On Success**
@@ -184,13 +177,12 @@ All artifacts complete. All tasks complete.
 **Change:** <change-name>
 **Schema:** <schema-name>
 **Archived to:** <archive-path>
-**Specs:** Sync skipped (user chose to skip)
+**Specs:** ✓ Synced to main specs
 **Trello:** Card moved to ✅ Concluído    ← only shown if Trello is configured
 
 **Warnings:**
 - Archived with 2 incomplete artifacts
 - Archived with 3 incomplete tasks
-- Delta spec sync was skipped
 
 Review the archive if this was not intentional.
 \`\`\`
@@ -212,13 +204,13 @@ Target archive directory already exists.
 \`\`\`
 
 **Guardrails**
-- Always prompt for change selection if not provided
+- Change selection (Step 1) is the ONLY interactive point — prompt for it only when no name is provided
+- Never use \`AskUserQuestion\` to confirm sync or archiving; sync and archive run automatically
 - Use artifact graph (pscode status --json) for completion checking
-- Don't block archive on warnings — just inform and confirm
+- Don't block archive on warnings — record them and surface in the final summary
 - Preserve .pscode.yaml when moving to archive (it moves with the directory)
 - Show clear summary of what happened
-- If sync is requested, use pscode-sync-specs approach (agent-driven)
-- If delta specs exist, always run the sync assessment and show the combined summary before prompting
+- If delta specs exist, sync them inline yourself (agent-driven merge into main specs) — there is no \`pscode-sync-specs\` skill
 - If Trello tools fail, continue normally — Trello is auxiliary, not blocking
 - All content written to Trello must be in Portuguese
 `;

package/dist/core/templates/workflows/propose.js

@@ -64,12 +64,52 @@ When ready to implement, run /ps:apply
 
    Os artefatos gerados a partir do Passo 2 SHALL refletir esse entendimento refinado.
 
+1c. **PR Integration — abrir PR draft no início (opcional)**
+
+   Use the **Read tool** (NOT a shell command) to read \`pscode/config.yaml\` from the current working directory.
+   If the Read tool returns an error (file not found), or \`pr.enabled\` is not \`true\`, **skip this step entirely** — no PR, no branch, no checkpoint commits — and continue to Step 2. Opening the PR is then left to \`/ps:apply\`. Set \`PR_OPENED = false\`.
+
+   **If \`pscode/config.yaml\` exists and \`pr.enabled: true\`:**
+
+   Ask **once**, using the **AskUserQuestion tool**, whether to open the draft PR now:
+   > "Quer abrir o Pull Request em DRAFT agora? O PR nasce em draft e cresce junto com o refinamento."
+   > - ✅ Sim, abrir o PR draft agora (Recomendada)
+   > - ❌ Não, deixar para o apply
+
+   **If the user declines (Não):** continue the normal flow from Step 2 without any PR steps. Do NOT create a branch or commit automatically. The PR will be opened later by \`/ps:apply\`. Set \`PR_OPENED = false\`.
+
+   **If the user accepts (Sim):** proceed **without asking for any further authorization**:
+   1. Resolve the branch name from \`pr.branch.pattern\`, substituting \`{change-name}\` with the change name, \`{type}\` with feat/fix/chore (infer from the change; default \`feat\`), and \`{ticket}\` with the ticket ID if available.
+   2. Create and switch to the branch: \`git checkout -b <branch>\`.
+   3. Create the change scaffold (this is Step 2): \`pscode new change "<name>"\`.
+   4. Stage and commit the scaffold: \`git add -A && git commit -m "chore(<name>): scaffold change"\`.
+   5. Push and set upstream: \`git push -u origin <branch>\`.
+   6. Open the PR in **DRAFT**, deriving the title from \`pr.title.template\` and the body from \`pr.description.template\` (substitute \`{change-name}\`/\`{type}\`/\`{ticket}\`):
+      \`gh pr create --draft --title "<resolved title>" --body "<resolved description>"\`.
+   7. Capture the PR URL from the \`gh\` output, save it as \`prUrl\`, and set \`PR_OPENED = true\`.
+
+   **Comentário do link no tracker:** after the PR is opened, if \`pr.comments.linkInTask: true\` and a Trello \`cardId\` exists, comment the PR link on the card:
+   \`\`\`tool
+   mcp__claude_ai_Trello_Custom__add_comment
+     card_id: "<cardId>"
+     text: |
+       🔀 Pull Request (DRAFT) aberto: <prUrl>
+   \`\`\`
+   The \`cardId\` is resolved in Step 3 — if it is not available yet when the PR is opened, post this comment right after Step 3 instead.
+
+   **Tratamento de falha (não-bloqueante):** if \`gh\` or \`git\` fails — \`gh\` not installed, not authenticated, or no GitHub remote — **do NOT block**:
+   - Clearly state what failed and how to fix it (e.g., "instale o \`gh\` CLI", "rode \`gh auth login\`", "configure um remote GitHub").
+   - Ask whether the user wants the agent to resolve it in parallel (e.g., run \`gh auth login\`).
+   - **Continue the propose flow regardless.** Any branch already created and local commits are preserved; set \`PR_OPENED = true\` only if the PR was actually opened.
+
 2. **Create the change directory**
    \`\`\`bash
    pscode new change "<name>"
    \`\`\`
    This creates a scaffolded change in the planning home resolved by the CLI with \`.pscode.yaml\`.
 
+   **If you already created the change scaffold in Step 1c** (PR accepted), skip this step — the change directory already exists.
+
 3. **Trello Integration (optional)**
 
    Use the **Read tool** (NOT a shell command) to read \`pscode/trello.yaml\` from the current working directory.
@@ -190,6 +230,14 @@ When ready to implement, run /ps:apply
    pscode status --change "<name>"
    \`\`\`
 
+7. **Checkpoint commit — após gerar os artefatos (only if \`PR_OPENED = true\`)**
+
+   If a draft PR was opened in Step 1c, commit and push the generated artifacts as a checkpoint so the PR reflects the refined plan:
+   \`\`\`bash
+   git add -A && git commit -m "docs(<name>): add planning artifacts" && git push
+   \`\`\`
+   If \`PR_OPENED = false\`, skip — no automatic commits. Failures here are non-blocking (same handling as Step 1c).
+
 ---
 
 ## Refinement Validation Loop
@@ -334,7 +382,14 @@ ${applyNextStep}
    - Changes to technical approach → update \`design.md\`
    - Changes to tasks → update \`tasks.md\`
 
-3. **Go back to Step R1** and show the updated refinement summary, then **re-run Step R1b**
+3. **Checkpoint commit — após o ajuste (only if \`PR_OPENED = true\`)**:
+   If a draft PR was opened in Step 1c, commit and push the adjusted artifacts as a checkpoint:
+   \`\`\`bash
+   git add -A && git commit -m "docs(<name>): refine plan" && git push
+   \`\`\`
+   If \`PR_OPENED = false\`, skip. Failures here are non-blocking (same handling as Step 1c).
+
+4. **Go back to Step R1** and show the updated refinement summary, then **re-run Step R1b**
    so the Trello card description and comment reflect the adjusted plan before asking again.
    Keep looping until the user approves or cancels.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thiagodiogo/pscode",
-  "version": "2.4.0",
+  "version": "2.6.0",
   "description": "AI-native system for spec-driven development",
   "keywords": [
     "pscode",