@thiagodiogo/pscode 2.1.1 → 2.2.0

package/dist/cli/index.js

@@ -76,6 +76,8 @@ program
     .option('--tools <tools>', toolsOptionDescription)
     .option('--force', 'Auto-cleanup legacy files without prompting')
     .option('--profile <profile>', 'Workflow profile to use (core, full, trello)')
+    .option('--pr', 'Enable PR workflow config without interactive prompts (uses defaults: branch=feat/{change-name}, title=[{type}] {change-name})')
+    .option('--no-pr', 'Disable PR workflow config without interactive prompts')
     .action(async (targetPath = '.', options) => {
     try {
         // Validate that the path is a valid directory
@@ -103,6 +105,7 @@ program
             tools: options?.tools,
             force: options?.force,
             profile: options?.profile,
+            pr: options?.pr,
         });
         await initCommand.execute(targetPath);
     }

package/dist/core/completions/command-registry.js

@@ -22,6 +22,14 @@ export const COMMAND_REGISTRY = [
                 takesValue: true,
                 values: ['standard', 'dixi'],
             },
+            {
+                name: 'pr',
+                description: 'Enable PR workflow config without interactive prompts',
+            },
+            {
+                name: 'no-pr',
+                description: 'Disable PR workflow config without interactive prompts',
+            },
         ],
     },
     {

package/dist/core/config-prompts.d.ts

@@ -2,7 +2,7 @@ import type { ProjectConfig } from './project-config.js';
 /**
  * Serialize config to YAML string with helpful comments.
  *
- * @param config - Partial config object (schema required, context/rules optional)
+ * @param config - Partial config object (schema required, context/rules/pr optional)
  * @returns YAML string ready to write to file
  */
 export declare function serializeConfig(config: Partial<ProjectConfig>): string;

package/dist/core/config-prompts.js

@@ -1,7 +1,8 @@
+import { stringify as stringifyYaml } from 'yaml';
 /**
  * Serialize config to YAML string with helpful comments.
  *
- * @param config - Partial config object (schema required, context/rules optional)
+ * @param config - Partial config object (schema required, context/rules/pr optional)
  * @returns YAML string ready to write to file
  */
 export function serializeConfig(config) {
@@ -9,6 +10,12 @@ export function serializeConfig(config) {
     // Schema (required)
     lines.push(`schema: ${config.schema}`);
     lines.push('');
+    // PR workflow config (if present)
+    if (config.pr !== undefined) {
+        const prYaml = stringifyYaml({ pr: config.pr }, { lineWidth: 0 });
+        lines.push(prYaml.trimEnd());
+        lines.push('');
+    }
     // Context section with comments
     lines.push('# Project context (optional)');
     lines.push('# This is shown to AI when creating artifacts.');

package/dist/core/init.d.ts

@@ -9,12 +9,14 @@ type InitCommandOptions = {
     force?: boolean;
     interactive?: boolean;
     profile?: string;
+    pr?: boolean;
 };
 export declare class InitCommand {
     private readonly toolsArg?;
     private readonly force;
     private readonly interactiveOption?;
     private readonly profileOverride?;
+    private readonly prFlag?;
     constructor(options?: InitCommandOptions);
     execute(targetPath: string): Promise<void>;
     private validate;
@@ -28,6 +30,7 @@ export declare class InitCommand {
     private resolveToolsArg;
     private validateTools;
     private handleTrelloSetup;
+    private handlePrSetup;
     private createDirectoryStructure;
     private generateSkillsAndCommands;
     private createConfig;

package/dist/core/init.js

@@ -24,8 +24,10 @@ import { getGlobalConfig } from './global-config.js';
 import { getProfileWorkflows, isValidProfile, DEFAULT_PROFILE, PROFILES, ALL_WORKFLOWS } from './profiles.js';
 import { detectDixiStack, getDixiStackFamily, getDixiStackLabel, installDixiExtras } from './presets/dixi.js';
 import { stringify as stringifyYaml } from 'yaml';
+import { parse as parseYaml } from 'yaml';
 import { getAvailableTools } from './available-tools.js';
 import { migrateIfNeeded } from './migration.js';
+import { runPrInitPrompt } from './pr-init-prompt.js';
 const require = createRequire(import.meta.url);
 const { version: PSCODE_VERSION } = require('../../package.json');
 // -----------------------------------------------------------------------------
@@ -50,6 +52,8 @@ const WORKFLOW_TO_SKILL_DIR = {
     // Trello-specific workflows
     'trello-setup': 'pscode-trello-setup',
     'draft': 'pscode-trello-draft',
+    // Productivity workflows
+    'handoff': 'pscode-handoff',
     // Dixi-specific workflows
     'rfc': 'pscode-dixi-rfc',
     'design': 'pscode-dixi-design',
@@ -67,11 +71,13 @@ export class InitCommand {
     force;
     interactiveOption;
     profileOverride;
+    prFlag;
     constructor(options = {}) {
         this.toolsArg = options.tools;
         this.force = options.force ?? false;
         this.interactiveOption = options.interactive;
         this.profileOverride = options.profile;
+        this.prFlag = options.pr;
     }
     async execute(targetPath) {
         const projectPath = path.resolve(targetPath);
@@ -108,6 +114,8 @@ export class InitCommand {
         await this.createDirectoryStructure(pscodePath, extendMode);
         // Trello integration setup (interactive mode only)
         const trelloConfigured = await this.handleTrelloSetup(pscodePath);
+        // PR workflow setup (interactive or via flags)
+        const prConfig = await this.handlePrSetup(pscodePath, extendMode);
         // Generate skills and commands for each tool
         const results = await this.generateSkillsAndCommands(projectPath, validatedTools);
         // Dixi profile extras: stack detection and .pscode-dixi.yaml
@@ -118,7 +126,7 @@ export class InitCommand {
             await this.generateJiraFiles(projectPath);
         }
         // Create config.yaml if needed
-        const configStatus = await this.createConfig(pscodePath, extendMode);
+        const configStatus = await this.createConfig(pscodePath, extendMode, prConfig ?? undefined);
         // Display success message
         this.displaySuccessMessage(projectPath, validatedTools, results, configStatus, trelloConfigured);
     }
@@ -405,6 +413,51 @@ export class InitCommand {
         }
     }
     // ═══════════════════════════════════════════════════════════
+    // PR WORKFLOW SETUP
+    // ═══════════════════════════════════════════════════════════
+    async handlePrSetup(pscodePath, extendMode) {
+        // --pr flag: enable PR without prompts (default values)
+        if (this.prFlag === true) {
+            return {
+                enabled: true,
+                branch: { pattern: 'feat/{change-name}' },
+                title: { template: '[{type}] {change-name}' },
+                description: { template: '## O que foi feito\n\n\n## Como testar\n\n\n## Referências\n' },
+                comments: { linkInTask: true },
+            };
+        }
+        // --no-pr flag: disable PR without prompts
+        if (this.prFlag === false) {
+            return { enabled: false };
+        }
+        // Non-interactive mode with no flag: skip PR config
+        if (!this.canPromptInteractively()) {
+            return null;
+        }
+        // Interactive mode: if config exists, ask if user wants to reconfigure PR
+        if (extendMode) {
+            const configPath = path.join(pscodePath, 'config.yaml');
+            const configYmlPath = path.join(pscodePath, 'config.yml');
+            const configExists = fs.existsSync(configPath) || fs.existsSync(configYmlPath);
+            if (configExists) {
+                const { confirm } = await import('@inquirer/prompts');
+                const wantsReconfigure = await confirm({
+                    message: 'Reconfigurar preferências de PR?',
+                    default: false,
+                });
+                if (!wantsReconfigure) {
+                    return null; // Preserve existing PR config
+                }
+            }
+        }
+        try {
+            return await runPrInitPrompt();
+        }
+        catch {
+            return null;
+        }
+    }
+    // ═══════════════════════════════════════════════════════════
     // DIRECTORY STRUCTURE
     // ═══════════════════════════════════════════════════════════
     async createDirectoryStructure(pscodePath, extendMode) {
@@ -522,19 +575,36 @@ export class InitCommand {
     // ═══════════════════════════════════════════════════════════
     // CONFIG FILE
     // ═══════════════════════════════════════════════════════════
-    async createConfig(pscodePath, extendMode) {
+    async createConfig(pscodePath, extendMode, prConfig) {
         const configPath = path.join(pscodePath, 'config.yaml');
         const configYmlPath = path.join(pscodePath, 'config.yml');
         const configYamlExists = fs.existsSync(configPath);
         const configYmlExists = fs.existsSync(configYmlPath);
         if (configYamlExists || configYmlExists) {
+            // If PR config was provided, merge it into the existing file
+            if (prConfig !== undefined) {
+                try {
+                    const existingPath = configYamlExists ? configPath : configYmlPath;
+                    const raw = parseYaml(fs.readFileSync(existingPath, 'utf-8'));
+                    const existingSchema = (raw && typeof raw.schema === 'string') ? raw.schema : DEFAULT_SCHEMA;
+                    const globalConfig = getGlobalConfig();
+                    const resolvedProfile = this.resolveProfileOverride() ?? (isValidProfile(globalConfig.profile ?? '') ? globalConfig.profile : DEFAULT_PROFILE);
+                    const schema = existingSchema || (resolvedProfile === 'dixi' ? 'pstld-workflow' : DEFAULT_SCHEMA);
+                    const yamlContent = serializeConfig({ schema, pr: prConfig });
+                    await FileSystemUtils.writeFile(configPath, yamlContent);
+                    return 'updated';
+                }
+                catch {
+                    return 'exists';
+                }
+            }
             return 'exists';
         }
         try {
             const globalConfig = getGlobalConfig();
             const resolvedProfile = this.resolveProfileOverride() ?? (isValidProfile(globalConfig.profile ?? '') ? globalConfig.profile : DEFAULT_PROFILE);
             const schema = resolvedProfile === 'dixi' ? 'pstld-workflow' : DEFAULT_SCHEMA;
-            const yamlContent = serializeConfig({ schema });
+            const yamlContent = serializeConfig({ schema, pr: prConfig });
             await FileSystemUtils.writeFile(configPath, yamlContent);
             return 'created';
         }
@@ -597,6 +667,9 @@ export class InitCommand {
             const createdSchema = profileForSchema === 'dixi' ? 'pstld-workflow' : DEFAULT_SCHEMA;
             console.log(`Config: pscode/config.yaml (schema: ${createdSchema})`);
         }
+        else if (configStatus === 'updated') {
+            console.log(`Config: pscode/config.yaml (updated with PR config)`);
+        }
         else if (configStatus === 'exists') {
             // Show actual filename (config.yaml or config.yml)
             const configYaml = path.join(projectPath, PSCODE_DIR_NAME, 'config.yaml');

package/dist/core/pr-init-prompt.d.ts

@@ -0,0 +1,13 @@
+/**
+ * PR Init Prompt
+ *
+ * Handles the interactive PR workflow configuration questions during `pscode init`.
+ * Collects branch pattern, PR title/description templates, and tracker comment settings.
+ */
+import type { PrConfig } from './project-config.js';
+/**
+ * Runs the interactive PR configuration questions during `pscode init`.
+ * Returns the collected PrConfig, or null if the user opts out.
+ */
+export declare function runPrInitPrompt(): Promise<PrConfig | null>;
+//# sourceMappingURL=pr-init-prompt.d.ts.map

package/dist/core/pr-init-prompt.js

@@ -0,0 +1,76 @@
+/**
+ * PR Init Prompt
+ *
+ * Handles the interactive PR workflow configuration questions during `pscode init`.
+ * Collects branch pattern, PR title/description templates, and tracker comment settings.
+ */
+import chalk from 'chalk';
+const DEFAULT_BRANCH_PATTERN = 'feat/{change-name}';
+const DEFAULT_TITLE_TEMPLATE = '[{type}] {change-name}';
+const DEFAULT_DESCRIPTION_TEMPLATE = '## O que foi feito\n\n\n## Como testar\n\n\n## Referências\n';
+/**
+ * Runs the interactive PR configuration questions during `pscode init`.
+ * Returns the collected PrConfig, or null if the user opts out.
+ */
+export async function runPrInitPrompt() {
+    const { confirm, input } = await import('@inquirer/prompts');
+    console.log();
+    console.log(chalk.bold('Workflow de PR'));
+    console.log(chalk.dim('  Configure padrões de branch, título e descrição para Pull Requests.'));
+    console.log(chalk.dim('  Template variables: {change-name}, {type}, {ticket}'));
+    console.log();
+    const wantsPr = await confirm({
+        message: 'Usar workflow de PR neste projeto? (branch dedicada + PR obrigatório)',
+        default: false,
+    });
+    if (!wantsPr) {
+        return { enabled: false };
+    }
+    const branchPattern = await input({
+        message: 'Padrão de nome de branch:',
+        default: DEFAULT_BRANCH_PATTERN,
+    });
+    const titleTemplate = await input({
+        message: 'Template de título do PR:',
+        default: DEFAULT_TITLE_TEMPLATE,
+    });
+    const useDefaultDescription = await confirm({
+        message: 'Usar template padrão de descrição de PR?',
+        default: true,
+    });
+    let descriptionTemplate;
+    if (useDefaultDescription) {
+        descriptionTemplate = DEFAULT_DESCRIPTION_TEMPLATE;
+    }
+    else {
+        const customDesc = await input({
+            message: 'Caminho para arquivo .md com template de descrição (ou deixe vazio para usar o padrão):',
+            default: '',
+        });
+        if (customDesc.trim()) {
+            try {
+                const { readFileSync } = await import('fs');
+                descriptionTemplate = readFileSync(customDesc.trim(), 'utf-8');
+            }
+            catch {
+                console.log(chalk.yellow(`  Arquivo não encontrado — usando template padrão.`));
+                descriptionTemplate = DEFAULT_DESCRIPTION_TEMPLATE;
+            }
+        }
+        else {
+            descriptionTemplate = DEFAULT_DESCRIPTION_TEMPLATE;
+        }
+    }
+    const linkInTask = await confirm({
+        message: 'Comentar link do PR na tarefa (Trello/Jira)?',
+        default: true,
+    });
+    return {
+        enabled: true,
+        branch: { pattern: branchPattern.trim() || DEFAULT_BRANCH_PATTERN },
+        title: { template: titleTemplate.trim() || DEFAULT_TITLE_TEMPLATE },
+        description: { template: descriptionTemplate },
+        comments: { linkInTask },
+    };
+}
+//# sourceMappingURL=pr-init-prompt.js.map

package/dist/core/profile-sync-drift.js

@@ -21,6 +21,8 @@ export const WORKFLOW_TO_SKILL_DIR = {
     // Trello-specific workflows
     'trello-setup': 'pscode-trello-setup',
     'draft': 'pscode-trello-draft',
+    // Productivity workflows
+    'handoff': 'pscode-handoff',
     // Dixi-specific workflows
     'rfc': 'pscode-dixi-rfc',
     'design': 'pscode-dixi-design',

package/dist/core/profiles.d.ts

@@ -5,7 +5,7 @@
  * `pscode init --profile <name>` or `pscode config profile <name>`.
  * The workflow lists are fixed in code — users cannot customise them.
  */
-export declare const ALL_WORKFLOWS: readonly ["propose", "explore", "new", "continue", "apply", "ff", "complete", "bulk-archive", "verify", "onboard", "trello-setup", "draft", "rfc", "design", "tasks", "arch-check", "adr", "jira-sync", "dod"];
+export declare const ALL_WORKFLOWS: readonly ["propose", "explore", "new", "continue", "apply", "ff", "complete", "bulk-archive", "verify", "onboard", "trello-setup", "draft", "rfc", "design", "tasks", "arch-check", "adr", "jira-sync", "dod", "handoff"];
 export type WorkflowId = (typeof ALL_WORKFLOWS)[number];
 export interface ProfileDefinition {
     description: string;
@@ -14,11 +14,11 @@ export interface ProfileDefinition {
 export declare const PROFILES: {
     readonly standard: {
         readonly description: "Padrão — propose, explore, apply, complete";
-        readonly workflows: readonly ["propose", "explore", "apply", "complete", "trello-setup", "draft"];
+        readonly workflows: readonly ["propose", "explore", "apply", "complete", "trello-setup", "draft", "handoff"];
     };
     readonly dixi: {
         readonly description: "Dixi — propose, explore, apply, complete com guardrails para Java/Spring e React/Next.js";
-        readonly workflows: readonly ["propose", "explore", "apply", "complete", "trello-setup", "draft"];
+        readonly workflows: readonly ["propose", "explore", "apply", "complete", "trello-setup", "draft", "handoff"];
     };
 };
 export type ProfileName = keyof typeof PROFILES;

package/dist/core/profiles.js

@@ -25,15 +25,16 @@ export const ALL_WORKFLOWS = [
     'adr',
     'jira-sync',
     'dod',
+    'handoff',
 ];
 export const PROFILES = {
     standard: {
         description: 'Padrão — propose, explore, apply, complete',
-        workflows: ['propose', 'explore', 'apply', 'complete', 'trello-setup', 'draft'],
+        workflows: ['propose', 'explore', 'apply', 'complete', 'trello-setup', 'draft', 'handoff'],
     },
     dixi: {
         description: 'Dixi — propose, explore, apply, complete com guardrails para Java/Spring e React/Next.js',
-        workflows: ['propose', 'explore', 'apply', 'complete', 'trello-setup', 'draft'],
+        workflows: ['propose', 'explore', 'apply', 'complete', 'trello-setup', 'draft', 'handoff'],
     },
 };
 export const DEFAULT_PROFILE = 'standard';

package/dist/core/project-config.d.ts

@@ -1,4 +1,20 @@
 import { z } from 'zod';
+export declare const PrConfigSchema: z.ZodObject<{
+    enabled: z.ZodBoolean;
+    branch: z.ZodOptional<z.ZodObject<{
+        pattern: z.ZodString;
+    }, z.core.$strip>>;
+    title: z.ZodOptional<z.ZodObject<{
+        template: z.ZodString;
+    }, z.core.$strip>>;
+    description: z.ZodOptional<z.ZodObject<{
+        template: z.ZodString;
+    }, z.core.$strip>>;
+    comments: z.ZodOptional<z.ZodObject<{
+        linkInTask: z.ZodBoolean;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
+export type PrConfig = z.infer<typeof PrConfigSchema>;
 /**
  * Zod schema for project configuration.
  *
@@ -16,6 +32,21 @@ export declare const ProjectConfigSchema: z.ZodObject<{
     schema: z.ZodString;
     context: z.ZodOptional<z.ZodString>;
     rules: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString>>>;
+    pr: z.ZodOptional<z.ZodObject<{
+        enabled: z.ZodBoolean;
+        branch: z.ZodOptional<z.ZodObject<{
+            pattern: z.ZodString;
+        }, z.core.$strip>>;
+        title: z.ZodOptional<z.ZodObject<{
+            template: z.ZodString;
+        }, z.core.$strip>>;
+        description: z.ZodOptional<z.ZodObject<{
+            template: z.ZodString;
+        }, z.core.$strip>>;
+        comments: z.ZodOptional<z.ZodObject<{
+            linkInTask: z.ZodBoolean;
+        }, z.core.$strip>>;
+    }, z.core.$strip>>;
 }, z.core.$strip>;
 export type ProjectConfig = z.infer<typeof ProjectConfigSchema>;
 /**

package/dist/core/project-config.js

@@ -2,6 +2,13 @@ import { existsSync, readFileSync } from 'fs';
 import path from 'path';
 import { parse as parseYaml } from 'yaml';
 import { z } from 'zod';
+export const PrConfigSchema = z.object({
+    enabled: z.boolean(),
+    branch: z.object({ pattern: z.string() }).optional(),
+    title: z.object({ template: z.string() }).optional(),
+    description: z.object({ template: z.string() }).optional(),
+    comments: z.object({ linkInTask: z.boolean() }).optional(),
+});
 /**
  * Zod schema for project configuration.
  *
@@ -34,6 +41,8 @@ export const ProjectConfigSchema = z.object({
     )
         .optional()
         .describe('Per-artifact rules, keyed by artifact ID'),
+    // Optional: PR workflow configuration
+    pr: PrConfigSchema.optional().describe('PR workflow configuration'),
 });
 const MAX_CONTEXT_SIZE = 50 * 1024; // 50KB hard limit
 /**
@@ -99,6 +108,21 @@ export function readProjectConfig(projectRoot) {
                 console.warn(`Invalid 'context' field in config (must be string)`);
             }
         }
+        // Parse pr field using Zod safeParse
+        if (raw.pr !== undefined) {
+            if (typeof raw.pr === 'object' && raw.pr !== null) {
+                const prResult = PrConfigSchema.safeParse(raw.pr);
+                if (prResult.success) {
+                    config.pr = prResult.data;
+                }
+                else {
+                    console.warn(`Invalid 'pr' field in config: ${prResult.error.issues.map((i) => i.message).join(', ')}`);
+                }
+            }
+            else {
+                console.warn(`Invalid 'pr' field in config (must be object)`);
+            }
+        }
         // Parse rules field using Zod
         if (raw.rules !== undefined) {
             const rulesField = z.record(z.string(), z.array(z.string()));

package/dist/core/shared/skill-generation.js

@@ -3,7 +3,7 @@
  *
  * Shared utilities for generating skill and command files.
  */
-import { getExploreSkillTemplate, getNewChangeSkillTemplate, getContinueChangeSkillTemplate, getApplyChangeSkillTemplate, getFfChangeSkillTemplate, getCompleteChangeSkillTemplate, getBulkArchiveChangeSkillTemplate, getVerifyChangeSkillTemplate, getOnboardSkillTemplate, getProposeSkillTemplate, getTrelloSetupSkillTemplate, getTrelloDraftSkillTemplate, getPsExploreCommandTemplate, getPsNewCommandTemplate, getPsContinueCommandTemplate, getPsApplyCommandTemplate, getPsFfCommandTemplate, getPsCompleteCommandTemplate, getPsBulkArchiveCommandTemplate, getPsVerifyCommandTemplate, getPsOnboardCommandTemplate, getPsProposeCommandTemplate, getTrelloSetupCommandTemplate, getTrelloDraftCommandTemplate, } from '../templates/skill-templates.js';
+import { getExploreSkillTemplate, getNewChangeSkillTemplate, getContinueChangeSkillTemplate, getApplyChangeSkillTemplate, getFfChangeSkillTemplate, getCompleteChangeSkillTemplate, getBulkArchiveChangeSkillTemplate, getVerifyChangeSkillTemplate, getOnboardSkillTemplate, getProposeSkillTemplate, getTrelloSetupSkillTemplate, getTrelloDraftSkillTemplate, getHandoffSkillTemplate, getPsExploreCommandTemplate, getPsNewCommandTemplate, getPsContinueCommandTemplate, getPsApplyCommandTemplate, getPsFfCommandTemplate, getPsCompleteCommandTemplate, getPsBulkArchiveCommandTemplate, getPsVerifyCommandTemplate, getPsOnboardCommandTemplate, getPsProposeCommandTemplate, getTrelloSetupCommandTemplate, getTrelloDraftCommandTemplate, getHandoffCommandTemplate, } from '../templates/skill-templates.js';
 /**
  * Gets skill templates with their directory names, optionally filtered by workflow IDs.
  *
@@ -24,6 +24,8 @@ export function getSkillTemplates(workflowFilter) {
         // Trello-specific workflows
         { template: getTrelloSetupSkillTemplate(), dirName: 'pscode-trello-setup', workflowId: 'trello-setup' },
         { template: getTrelloDraftSkillTemplate(), dirName: 'pscode-trello-draft', workflowId: 'draft' },
+        // Productivity workflows
+        { template: getHandoffSkillTemplate(), dirName: 'pscode-handoff', workflowId: 'handoff' },
     ];
     if (!workflowFilter)
         return all;
@@ -50,6 +52,8 @@ export function getCommandTemplates(workflowFilter) {
         // Trello-specific workflows
         { template: getTrelloSetupCommandTemplate(), id: 'trello-setup' },
         { template: getTrelloDraftCommandTemplate(), id: 'draft' },
+        // Productivity workflows
+        { template: getHandoffCommandTemplate(), id: 'handoff' },
     ];
     if (!workflowFilter)
         return all;
@@ -86,7 +90,6 @@ export function generateSkillContent(template, generatedByVersion, transformInst
     return `---
 name: ${template.name}
 description: ${template.description}
-license: ${template.license || 'MIT'}
 compatibility: ${template.compatibility || 'Requires pscode CLI.'}
 metadata:
   author: ${template.metadata?.author || 'pscode'}

package/dist/core/templates/skill-templates.d.ts

@@ -17,4 +17,5 @@ export { getProposeSkillTemplate, getPsProposeCommandTemplate } from './workflow
 export { getFeedbackSkillTemplate } from './workflows/feedback.js';
 export { getTrelloSetupSkillTemplate, getTrelloSetupCommandTemplate } from './workflows/trello-setup.js';
 export { getTrelloDraftSkillTemplate, getTrelloDraftCommandTemplate } from './workflows/trello-draft.js';
+export { getHandoffSkillTemplate, getHandoffCommandTemplate } from './workflows/handoff.js';
 //# sourceMappingURL=skill-templates.d.ts.map

package/dist/core/templates/skill-templates.js

@@ -17,4 +17,6 @@ export { getFeedbackSkillTemplate } from './workflows/feedback.js';
 // Trello-specific workflows
 export { getTrelloSetupSkillTemplate, getTrelloSetupCommandTemplate } from './workflows/trello-setup.js';
 export { getTrelloDraftSkillTemplate, getTrelloDraftCommandTemplate } from './workflows/trello-draft.js';
+// Productivity workflows
+export { getHandoffSkillTemplate, getHandoffCommandTemplate } from './workflows/handoff.js';
 //# sourceMappingURL=skill-templates.js.map

package/dist/core/templates/types.d.ts

@@ -5,7 +5,6 @@ export interface SkillTemplate {
     name: string;
     description: string;
     instructions: string;
-    license?: string;
     compatibility?: string;
     metadata?: Record<string, string>;
 }

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

@@ -1,9 +1,9 @@
+import { buildNextStepComment } from './trello-next-step-comment.js';
 export function getApplyChangeSkillTemplate() {
     return {
         name: 'pscode-apply-change',
         description: 'Implement tasks from an Pscode change. Use when the user wants to start implementing, continue implementation, or work through tasks.',
         instructions: getApplyInstructions(),
-        license: 'MIT',
         compatibility: 'Requires pscode CLI.',
         metadata: { author: 'pscode', version: '1.0' },
     };
@@ -18,6 +18,13 @@ export function getPsApplyCommandTemplate() {
     };
 }
 function getApplyInstructions() {
+    // Pre-filled next-step comment (card title interpolated), shared via the
+    // trello-next-step-comment utility and indented to sit inside the Trello
+    // comment `text: |` block in the testing phase below.
+    const completeNextStep = buildNextStepComment('<card title>', '/ps:complete')
+        .split('\n')
+        .map((line) => (line.length > 0 ? `          ${line}` : ''))
+        .join('\n');
     return `Implement tasks from a Pscode change.
 
 **Input**: Optionally specify a change name (e.g., \`/ps:apply add-auth\`). If omitted, check if it can be inferred from conversation context. If vague or ambiguous you MUST prompt for available changes.
@@ -94,10 +101,27 @@ function getApplyInstructions() {
 
    **Workspace guard:** If status JSON reports \`actionContext.mode: "workspace-planning"\` and \`allowedEditRoots\` is empty, explain that full workspace apply is not supported in this slice. Treat linked repos and folders as read-only context, ask the user to select an affected area, and STOP before editing files.
 
-5. **Read context files**
+5. **Read context files and PR config**
 
    Read every file path listed under \`contextFiles\` from the apply instructions output.
 
+   Additionally, use the **Read tool** to read \`pscode/config.yaml\` from the current working directory.
+
+   **If \`pscode/config.yaml\` exists and \`pr.enabled: true\`:**
+
+   Before starting any implementation, inform the user of the PR workflow requirements:
+
+   > 🔀 **Workflow de PR ativo** — este projeto requer branches dedicadas e Pull Requests.
+   > - Branch: crie uma branch com o padrão \`<pr.branch.pattern>\` antes de codificar
+   > - Título do PR: \`<pr.title.template>\`
+   > - 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.
+
 6. **Show current progress**
 
    Display:
@@ -182,7 +206,7 @@ function getApplyInstructions() {
           Testado por: <usuario / Claude>
           Status: Funcionando
 
-          Proximo passo: /ps:complete <name> para arquivar a change.
+${completeNextStep}
       \`\`\`
 
    If any Trello call fails, continue — Trello is auxiliary, never blocking.

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

@@ -3,7 +3,6 @@ export function getCompleteChangeSkillTemplate() {
         name: 'pscode-archive-change',
         description: 'Complete a completed change. Use when the user wants to finalize and complete a change after implementation is complete.',
         instructions: getArchiveInstructions(),
-        license: 'MIT',
         compatibility: 'Requires pscode CLI.',
         metadata: { author: 'pscode', version: '1.0' },
     };

package/dist/core/templates/workflows/bulk-archive-change.js

@@ -239,7 +239,6 @@ No active changes found. Create a new change to get started.
 - Preserve .pscode.yaml when moving to archive
 - Archive directory target uses current date: YYYY-MM-DD-<name>
 - If archive target exists, fail that change but continue with others`,
-        license: 'MIT',
         compatibility: 'Requires pscode CLI.',
         metadata: { author: 'pscode', version: '1.0' },
     };

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

@@ -110,7 +110,6 @@ For other schemas, follow the \`instruction\` field from the CLI output.
 - **IMPORTANT**: \`context\` and \`rules\` are constraints for YOU, not content for the file
   - Do NOT copy \`<context>\`, \`<rules>\`, \`<project_context>\` blocks into the artifact
   - These guide what you write, but should never appear in the output`,
-        license: 'MIT',
         compatibility: 'Requires pscode CLI.',
         metadata: { author: 'pscode', version: '1.0' },
     };

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

@@ -426,7 +426,6 @@ Do NOT move the card. End the loop.
 - **Do question assumptions** - Including the user's and your own
 - **Always run the refinement loop after propose** - When exploration leads to a proposal, the refinement validation loop (Steps RF1–RF3) is mandatory, not optional
 - **Preserve the loop** - Do not exit until the user explicitly approves or cancels`,
-        license: 'MIT',
         compatibility: 'Requires pscode CLI.',
         metadata: { author: 'pscode', version: '1.0' },
     };

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

@@ -100,7 +100,6 @@ Does this look good? I can modify it if you'd like, or submit it as-is.
 \`\`\`
 
 Only proceed with submission after user confirms.`,
-        license: 'MIT',
         compatibility: 'Requires pscode CLI.',
         metadata: { author: 'pscode', version: '1.0' },
     };

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

@@ -93,7 +93,6 @@ After completing all artifacts, summarize:
 - If context is critically unclear, ask the user - but prefer making reasonable decisions to keep momentum
 - If a change with that name already exists, suggest continuing that change instead
 - Verify each artifact file exists after writing before proceeding to next`,
-        license: 'MIT',
         compatibility: 'Requires pscode CLI.',
         metadata: { author: 'pscode', version: '1.0' },
     };

package/dist/core/templates/workflows/handoff.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Handoff Skill / Command Template
+ *
+ * Compacts the current conversation into a handoff document so a fresh agent
+ * (or the same user in a new session) can continue the work seamlessly.
+ */
+import type { SkillTemplate, CommandTemplate } from '../types.js';
+export declare function getHandoffSkillTemplate(): SkillTemplate;
+export declare function getHandoffCommandTemplate(): CommandTemplate;
+//# sourceMappingURL=handoff.d.ts.map

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

@@ -0,0 +1,31 @@
+export function getHandoffSkillTemplate() {
+    return {
+        name: 'pscode-handoff',
+        description: 'Compact the current conversation into a handoff document for another agent to pick up. Use when the user wants to hand off work to a new session or agent.',
+        instructions: getHandoffInstructions(),
+        compatibility: 'Works with any pscode project.',
+        metadata: { author: 'pscode', version: '1.0' },
+    };
+}
+function getHandoffInstructions() {
+    return `Write a handoff document summarising the current conversation so a fresh agent can continue the work. Save to the temporary directory of the user's OS — not the current workspace.
+
+Include a "suggested skills" section in the document, which suggests skills that the agent should invoke.
+
+Do not duplicate content already captured in other artifacts (PRDs, plans, ADRs, issues, commits, diffs, pscode change files). Reference them by path or URL instead.
+
+Redact any sensitive information, such as API keys, passwords, or personally identifiable information.
+
+If the user passed arguments, treat them as a description of what the next session will focus on and tailor the doc accordingly.
+`;
+}
+export function getHandoffCommandTemplate() {
+    return {
+        name: 'PS: Handoff',
+        description: 'Compact the current conversation into a handoff document for another agent to pick up',
+        category: 'Workflow',
+        tags: ['handoff', 'sessao', 'continuacao', 'workflow'],
+        content: getHandoffInstructions(),
+    };
+}
+//# sourceMappingURL=handoff.js.map

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

@@ -65,7 +65,6 @@ After completing the steps, summarize:
 - If the name is invalid (not kebab-case), ask for a valid name
 - If a change with that name already exists, suggest continuing that change instead
 - Pass --schema if using a non-default workflow`,
-        license: 'MIT',
         compatibility: 'Requires pscode CLI.',
         metadata: { author: 'pscode', version: '1.0' },
     };

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

@@ -3,7 +3,6 @@ export function getOnboardSkillTemplate() {
         name: 'pscode-onboard',
         description: 'Guided onboarding for Pscode - walk through a complete workflow cycle with narration and real codebase work.',
         instructions: getOnboardInstructions(),
-        license: 'MIT',
         compatibility: 'Requires pscode CLI.',
         metadata: { author: 'pscode', version: '1.0' },
     };

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

@@ -1,9 +1,9 @@
+import { buildNextStepComment } from './trello-next-step-comment.js';
 export function getProposeSkillTemplate() {
     return {
         name: 'pscode-propose',
         description: 'Propose a new change with all artifacts generated in one step. Use when the user wants to quickly describe what they want to build and get a complete proposal with design, specs, and tasks ready for implementation.',
         instructions: getProposeInstructions(),
-        license: 'MIT',
         compatibility: 'Requires pscode CLI.',
         metadata: { author: 'pscode', version: '1.0' },
     };
@@ -18,6 +18,13 @@ export function getPsProposeCommandTemplate() {
     };
 }
 function getProposeInstructions() {
+    // Pre-filled next-step comment (card title interpolated), shared via the
+    // trello-next-step-comment utility and indented to sit inside the Trello
+    // comment `text: |` blocks below.
+    const applyNextStep = buildNextStepComment('<card title>', '/ps:apply')
+        .split('\n')
+        .map((line) => (line.length > 0 ? `       ${line}` : ''))
+        .join('\n');
     return `Propose a new change - create the change and generate all artifacts in one step.
 
 I'll create a change with artifacts:
@@ -25,7 +32,7 @@ I'll create a change with artifacts:
 - design.md (how)
 - tasks.md (implementation steps)
 
-After artifacts are created, a **refinement validation loop** runs: the user reviews the plan, gives feedback, and when satisfied the Trello card is moved to Ready to Dev.
+After artifacts are created, a **refinement validation loop** runs: the Trello card is updated with the refined plan, the user reviews it, gives feedback, and when satisfied the card is moved to Ready to Dev.
 
 When ready to implement, run /ps:apply
 
@@ -203,22 +210,10 @@ Para iniciar a implementação quando aprovado:
 
 ---
 
-### Step R2 — Ask for user approval
-
-Use **AskUserQuestion** to ask:
-
-> "A implementação e o planejamento estão de acordo com o esperado?"
+### Step R1b — Update Trello card (before asking for approval)
 
-Options:
-- ✅ Sim, está refinada — mover para Ready to Dev
-- 🔄 Não, quero ajustar o plano
-- ❌ Cancelar (manter em refinamento)
-
-**Do NOT update the Trello card description or add any comment before the user approves.**
-
----
-
-### Step R2a — If APPROVED (Sim, está refinada)
+So the user can use the Trello card itself as a visual reference when deciding,
+update the card with the refinement content **before** asking for approval.
 
 1. **Update Trello card description** (if \`cardId\` exists):
    Build the description from the artifacts already read in Step R1:
@@ -237,7 +232,7 @@ Options:
        **Artefatos:** pscode/changes/<name>/
    \`\`\`
 
-2. **Add a comment** in Portuguese (if \`cardId\` exists):
+2. **Add a refinement comment** in Portuguese (if \`cardId\` exists):
    \`\`\`tool
    mcp__claude_ai_Trello_Custom__add_comment
      card_id: "<cardId>"
@@ -250,22 +245,44 @@ Options:
        ### Resumo
        <2-3 line summary of what will be built>
 
-       ### Para iniciar a implementação
-       \`\`\`
-       /ps:apply <name>
-       \`\`\`
+${applyNextStep}
 
        _Aguardando aprovação para mover para Ready to Dev._
    \`\`\`
 
-3. **Move the Trello card to the ready list** (if \`lists.ready\` is configured and \`cardId\` exists):
+If any Trello call fails, continue — Trello is auxiliary, never blocking.
+
+---
+
+### Step R2 — Ask for user approval
+
+Use **AskUserQuestion** to ask:
+
+> "A implementação e o planejamento estão de acordo com o esperado?"
+
+Options:
+- ✅ Sim, está refinada — mover para Ready to Dev
+- 🔄 Não, quero ajustar o plano
+- ❌ Cancelar (manter em refinamento)
+
+At this point the Trello card already reflects the current refinement (Step R1b),
+so the user can review it before deciding.
+
+---
+
+### Step R2a — If APPROVED (Sim, está refinada)
+
+The card description and refinement comment were already added in Step R1b.
+Now just move the card and register the explicit approval.
+
+1. **Move the Trello card to the ready list** (if \`lists.ready\` is configured and \`cardId\` exists):
    \`\`\`tool
    mcp__claude_ai_Trello_Custom__update_card
      card_id: "<cardId>"
      list_id: "<lists.ready.id>"
    \`\`\`
 
-4. **Add a final Trello comment** (if cardId exists):
+2. **Add a final Trello comment** (if cardId exists):
    \`\`\`tool
    mcp__claude_ai_Trello_Custom__add_comment
      card_id: "<cardId>"
@@ -274,13 +291,10 @@ Options:
 
        O planejamento foi revisado e aprovado.
 
-       ### Próximo passo
-       \`\`\`
-       /ps:apply <name>
-       \`\`\`
+${applyNextStep}
    \`\`\`
 
-5. **Show success message:**
+3. **Show success message:**
    \`\`\`markdown
    ## ✅ Pronto para desenvolvimento!
 
@@ -305,9 +319,9 @@ Options:
    - 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.
+3. **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.
-   **Do NOT update the Trello description or add comments until the user approves.**
 
 ---
 

package/dist/core/templates/workflows/trello-draft.js

@@ -1,9 +1,9 @@
+import { getNextStepCommentInstructionBlock } from './trello-next-step-comment.js';
 export function getTrelloDraftSkillTemplate() {
     return {
         name: 'pscode-trello-draft',
         description: 'Capture a raw idea or concept into the Backlog Trello list. Use when the user wants to quickly record something without refining it into a task yet.',
         instructions: getTrelloDraftInstructions(),
-        license: 'MIT',
         compatibility: 'Requires pscode CLI and Trello MCP server configured via /ps:trello-setup.',
         metadata: { author: 'pscode', version: '1.0' },
     };
@@ -141,22 +141,10 @@ Save the returned card \`id\` as \`cardId\` and \`url\` as \`cardUrl\`.
 ## Step 7 — Add next-step comment
 
 Add a comment to the card with the command to take this task to the next stage,
-formatted in Markdown so it is easy to copy and paste.
+with the card title (\`<title>\` from Step 3) pre-filled as the quoted argument so
+it is ready to copy and paste.
 
-\`\`\`tool
-mcp__claude_ai_Trello_Custom__add_comment
-  card_id: "<cardId>"
-  text: |
-    ## Próximo passo
-
-    Para refinar e gerar os artefatos da change, rode:
-
-    \`\`\`
-    /ps:propose
-    \`\`\`
-\`\`\`
-
-If this call fails, log the error and continue — the comment is auxiliary, never blocking.
+${getNextStepCommentInstructionBlock('<title>', '/ps:propose')}
 
 ---
 

package/dist/core/templates/workflows/trello-next-step-comment.d.ts

@@ -1,26 +1,33 @@
 /**
  * Trello Next-Step Comment Utility
  *
- * Builds and posts a Trello comment at the end of each workflow step,
- * showing the exact command (with card title pre-filled) to advance
- * to the next stage.
+ * Builds the Trello comment posted at the end of each workflow step, showing
+ * the exact command (with the card title pre-filled as a quoted argument) to
+ * advance to the next stage — so the dev can copy/paste without typing the name.
  *
- * Usage: import buildNextStepComment and call it with the current stage
- * and card title. Post the result via mcp__claude_ai_Trello_Custom__add_comment.
+ * Pure functions, no side effects and no Trello API calls: the card title is
+ * already available in each skill's flow. Shared across the ps:draft, ps:propose
+ * and ps:apply skill templates to avoid drift in the comment format.
  */
-export type WorkflowStage = 'draft' | 'explore' | 'propose' | 'apply';
 /**
- * Returns the markdown text for the next-step comment.
- * Paste this into mcp__claude_ai_Trello_Custom__add_comment as `text`.
+ * Returns the Markdown text for the next-step comment: a header, a description
+ * line, and a code block with the command and pre-filled, quoted card title.
+ * Paste the result into mcp__claude_ai_Trello_Custom__add_comment as `text`.
+ *
+ * @param cardName          The card title to interpolate as the argument.
+ * @param nextCommand       The command to advance the workflow (e.g. "/ps:apply").
+ * @param fallbackChangeName Optional kebab-case change name used when `cardName`
+ *                           is null, undefined or empty.
  */
-export declare function buildNextStepComment(stage: WorkflowStage, cardTitle: string): string;
+export declare function buildNextStepComment(cardName: string, nextCommand: string, fallbackChangeName?: string): string;
 /**
- * Returns the instruction block to be embedded inside a workflow template.
- * Tells the AI agent how and when to post the next-step comment.
+ * Returns the instruction block embedded inside a workflow skill template. It
+ * tells the AI agent to post a next-step comment built via `buildNextStepComment`,
+ * with the card title pre-filled as the command argument.
  *
- * @param stage   The current workflow stage (determines which command appears)
- * @param titleVar The template variable name that holds the card title at runtime
- *                 (e.g. "<title>", "<cardTitle>"). Default: "<title>"
+ * @param cardName    Placeholder (or literal) card title shown in the generated
+ *                    command (e.g. "<título do card>").
+ * @param nextCommand The command to advance the workflow (e.g. "/ps:apply").
  */
-export declare function getNextStepCommentInstructionBlock(stage: WorkflowStage, titleVar?: string): string;
+export declare function getNextStepCommentInstructionBlock(cardName: string, nextCommand: string): string;
 //# sourceMappingURL=trello-next-step-comment.d.ts.map

package/dist/core/templates/workflows/trello-next-step-comment.js

@@ -1,56 +1,94 @@
 /**
  * Trello Next-Step Comment Utility
  *
- * Builds and posts a Trello comment at the end of each workflow step,
- * showing the exact command (with card title pre-filled) to advance
- * to the next stage.
+ * Builds the Trello comment posted at the end of each workflow step, showing
+ * the exact command (with the card title pre-filled as a quoted argument) to
+ * advance to the next stage — so the dev can copy/paste without typing the name.
  *
- * Usage: import buildNextStepComment and call it with the current stage
- * and card title. Post the result via mcp__claude_ai_Trello_Custom__add_comment.
+ * Pure functions, no side effects and no Trello API calls: the card title is
+ * already available in each skill's flow. Shared across the ps:draft, ps:propose
+ * and ps:apply skill templates to avoid drift in the comment format.
  */
-const NEXT_STEP = {
-    draft: { command: 'ps:propose', label: 'Refinar e gerar os artefatos da change' },
-    explore: { command: 'ps:propose', label: 'Propor a change com todos os artefatos' },
-    propose: { command: 'ps:apply', label: 'Implementar as tasks da change' },
-    apply: { command: 'ps:complete', label: 'Finalizar e sincronizar a change' },
+/** Human-readable label describing what the next command does. */
+const NEXT_STEP_LABELS = {
+    '/ps:propose': 'Para refinar e gerar os artefatos da change',
+    '/ps:apply': 'Para implementar as tasks da change',
+    '/ps:complete': 'Para finalizar e arquivar a change',
 };
+/** Normalizes a command so it always starts with a single leading slash. */
+function normalizeCommand(nextCommand) {
+    const trimmed = (nextCommand ?? '').trim();
+    if (trimmed.length === 0)
+        return '';
+    return trimmed.startsWith('/') ? trimmed : `/${trimmed}`;
+}
+/** Converts an arbitrary string into a kebab-case identifier. */
+function toKebabCase(value) {
+    return (value ?? '')
+        .normalize('NFD')
+        .replace(/[̀-ͯ]/g, '')
+        .trim()
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, '-')
+        .replace(/^-+|-+$/g, '');
+}
+/**
+ * Resolves the argument placed after the command. Uses the card title when
+ * available, otherwise falls back to the kebab-case change identifier. Internal
+ * double quotes are escaped so the generated command stays valid.
+ */
+function resolveArgument(cardName, fallbackChangeName) {
+    const name = (cardName ?? '').trim();
+    const resolved = name.length > 0 ? name : toKebabCase(fallbackChangeName) || 'nova-change';
+    return resolved.replace(/"/g, '\\"');
+}
 /**
- * Returns the markdown text for the next-step comment.
- * Paste this into mcp__claude_ai_Trello_Custom__add_comment as `text`.
+ * Returns the Markdown text for the next-step comment: a header, a description
+ * line, and a code block with the command and pre-filled, quoted card title.
+ * Paste the result into mcp__claude_ai_Trello_Custom__add_comment as `text`.
+ *
+ * @param cardName          The card title to interpolate as the argument.
+ * @param nextCommand       The command to advance the workflow (e.g. "/ps:apply").
+ * @param fallbackChangeName Optional kebab-case change name used when `cardName`
+ *                           is null, undefined or empty.
  */
-export function buildNextStepComment(stage, cardTitle) {
-    const next = NEXT_STEP[stage];
-    const escapedTitle = cardTitle.replace(/"/g, '\\"');
-    return `**Avançar etapa:** ${next.label}
+export function buildNextStepComment(cardName, nextCommand, fallbackChangeName = '') {
+    const command = normalizeCommand(nextCommand);
+    const label = NEXT_STEP_LABELS[command] ?? 'Para avançar para a próxima etapa';
+    const argument = resolveArgument(cardName, fallbackChangeName);
+    return `## Próximo passo
+
+${label}, rode:
 
 \`\`\`
-/${next.command} "${escapedTitle}"
+${command} "${argument}"
 \`\`\``;
 }
 /**
- * Returns the instruction block to be embedded inside a workflow template.
- * Tells the AI agent how and when to post the next-step comment.
+ * Returns the instruction block embedded inside a workflow skill template. It
+ * tells the AI agent to post a next-step comment built via `buildNextStepComment`,
+ * with the card title pre-filled as the command argument.
  *
- * @param stage   The current workflow stage (determines which command appears)
- * @param titleVar The template variable name that holds the card title at runtime
- *                 (e.g. "<title>", "<cardTitle>"). Default: "<title>"
+ * @param cardName    Placeholder (or literal) card title shown in the generated
+ *                    command (e.g. "<título do card>").
+ * @param nextCommand The command to advance the workflow (e.g. "/ps:apply").
  */
-export function getNextStepCommentInstructionBlock(stage, titleVar = '<title>') {
-    const next = NEXT_STEP[stage];
-    const escapedTitleVar = titleVar.replace(/"/g, '\\"');
+export function getNextStepCommentInstructionBlock(cardName, nextCommand) {
+    const comment = buildNextStepComment(cardName, nextCommand);
+    const indented = comment
+        .split('\n')
+        .map((line) => (line.length > 0 ? `    ${line}` : ''))
+        .join('\n');
     return `## Step — Add next-step comment
 
-Post a comment on the card so the team always has the ready-to-paste command for the next stage.
+Post a comment on the card with the ready-to-paste command for the next stage,
+using \`buildNextStepComment\` so the card title is pre-filled as the quoted argument:
 
 \`\`\`tool
 mcp__claude_ai_Trello_Custom__add_comment
   card_id: "<cardId>"
   text: |
-    **Avançar etapa:** ${next.label}
-
-    \`\`\`
-    /${next.command} "${escapedTitleVar}"
-    \`\`\`
+${indented}
 \`\`\`
 
 If this call fails, log the error and continue — the comment is auxiliary, never blocking.`;

package/dist/core/templates/workflows/trello-setup.js

@@ -3,7 +3,6 @@ export function getTrelloSetupSkillTemplate() {
         name: 'pscode-trello-setup',
         description: 'Configure Trello integration for your Pscode workflow. Checks MCP availability, reads or creates a Trello board, and writes pscode/trello.yaml with your stage-to-list mapping.',
         instructions: getTrelloSetupInstructions(),
-        license: 'MIT',
         compatibility: 'Requires pscode CLI and the Trello MCP server.',
         metadata: { author: 'pscode', version: '1.0' },
     };

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

@@ -162,7 +162,6 @@ Use clear markdown with:
 - Code references in format: \`file.ts:123\`
 - Specific, actionable recommendations
 - No vague suggestions like "consider reviewing"`,
-        license: 'MIT',
         compatibility: 'Requires pscode CLI.',
         metadata: { author: 'pscode', version: '1.0' },
     };

package/package.json

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