@proletariat/cli 0.3.25 → 0.3.27

package/dist/lib/mcp/tools/template.js

@@ -2,9 +2,9 @@
  * MCP Template Tools
  */
 import { z } from 'zod';
-import { errorResponse } from '../helpers.js';
+import { errorResponse, strictTool } from '../helpers.js';
 export function registerTemplateTools(server, ctx) {
-    server.tool('ticket_template_list', 'List ticket templates', { include_builtin: z.boolean().optional() }, async (params) => {
+    strictTool(server, 'ticket_template_list', 'List ticket templates', { include_builtin: z.boolean().optional() }, async (params) => {
         try {
             const templates = await ctx.storage.listTicketTemplates({
                 isBuiltin: params.include_builtin ? undefined : false,
@@ -28,7 +28,7 @@ export function registerTemplateTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_template_show', 'Get ticket template details', { id: z.string().describe('Template ID') }, async (params) => {
+    strictTool(server, 'ticket_template_show', 'Get ticket template details', { id: z.string().describe('Template ID') }, async (params) => {
         try {
             const template = await ctx.storage.getTicketTemplate(params.id);
             if (!template)
@@ -44,7 +44,7 @@ export function registerTemplateTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_template_create', 'Create a ticket template', {
+    strictTool(server, 'ticket_template_create', 'Create a ticket template', {
         name: z.string().describe('Template name'),
         description: z.string().optional(),
         title_pattern: z.string().optional(),
@@ -72,7 +72,7 @@ export function registerTemplateTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_template_create_from_ticket', 'Create template from existing ticket', {
+    strictTool(server, 'ticket_template_create_from_ticket', 'Create template from existing ticket', {
         ticket_id: z.string().describe('Ticket ID'),
         name: z.string().describe('Template name'),
         description: z.string().optional(),
@@ -90,7 +90,7 @@ export function registerTemplateTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_template_delete', 'Delete a ticket template', { id: z.string().describe('Template ID') }, async (params) => {
+    strictTool(server, 'ticket_template_delete', 'Delete a ticket template', { id: z.string().describe('Template ID') }, async (params) => {
         try {
             await ctx.storage.deleteTicketTemplate(params.id);
             return {

package/dist/lib/mcp/tools/ticket.js

@@ -2,9 +2,9 @@
  * MCP Ticket Tools
  */
 import { z } from 'zod';
-import { formatTicket, formatTicketFull, errorResponse } from '../helpers.js';
+import { formatTicket, formatTicketFull, errorResponse, strictTool } from '../helpers.js';
 export function registerTicketTools(server, ctx) {
-    server.tool('ticket_list', 'List tickets with optional filters', {
+    strictTool(server, 'ticket_list', 'List tickets with optional filters', {
         project: z.string().optional().describe('Project ID'),
         column: z.string().optional().describe('Filter by column/status'),
         priority: z.enum(['P0', 'P1', 'P2', 'P3']).optional().describe('Filter by priority'),
@@ -56,7 +56,7 @@ export function registerTicketTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_create', 'Create a new ticket', {
+    strictTool(server, 'ticket_create', 'Create a new ticket', {
         title: z.string().describe('Ticket title (required)'),
         project: z.string().optional().describe('Project ID'),
         description: z.string().optional().describe('Ticket description'),
@@ -100,7 +100,7 @@ export function registerTicketTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_show', 'Get detailed ticket information', { id: z.string().describe('Ticket ID') }, async (params) => {
+    strictTool(server, 'ticket_show', 'Get detailed ticket information', { id: z.string().describe('Ticket ID') }, async (params) => {
         try {
             const ticket = await ctx.storage.getTicket(params.id);
             if (!ticket)
@@ -116,7 +116,7 @@ export function registerTicketTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_update', 'Update a ticket', {
+    strictTool(server, 'ticket_update', 'Update a ticket', {
         id: z.string().describe('Ticket ID'),
         title: z.string().optional().describe('New title'),
         description: z.string().optional().describe('New description'),
@@ -154,7 +154,7 @@ export function registerTicketTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_move', 'Move ticket to a different column/status', {
+    strictTool(server, 'ticket_move', 'Move ticket to a different column/status', {
         id: z.string().describe('Ticket ID'),
         column: z.string().describe('Target column/status'),
         position: z.number().optional().describe('Position in column'),
@@ -175,7 +175,7 @@ export function registerTicketTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_delete', 'Delete a ticket', { id: z.string().describe('Ticket ID') }, async (params) => {
+    strictTool(server, 'ticket_delete', 'Delete a ticket', { id: z.string().describe('Ticket ID') }, async (params) => {
         try {
             await ctx.storage.deleteTicket(params.id);
             return {
@@ -189,7 +189,7 @@ export function registerTicketTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_move_to_project', 'Move ticket to a different project', {
+    strictTool(server, 'ticket_move_to_project', 'Move ticket to a different project', {
         id: z.string().describe('Ticket ID'),
         project: z.string().describe('Target project ID'),
     }, async (params) => {
@@ -206,7 +206,7 @@ export function registerTicketTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_add_subtask', 'Add a subtask to a ticket', {
+    strictTool(server, 'ticket_add_subtask', 'Add a subtask to a ticket', {
         ticket_id: z.string().describe('Ticket ID'),
         title: z.string().describe('Subtask title'),
     }, async (params) => {
@@ -223,7 +223,7 @@ export function registerTicketTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_toggle_subtask', 'Toggle subtask completion', {
+    strictTool(server, 'ticket_toggle_subtask', 'Toggle subtask completion', {
         ticket_id: z.string().describe('Ticket ID'),
         subtask_id: z.string().describe('Subtask ID'),
     }, async (params) => {
@@ -240,7 +240,7 @@ export function registerTicketTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_remove_subtask', 'Remove a subtask', {
+    strictTool(server, 'ticket_remove_subtask', 'Remove a subtask', {
         ticket_id: z.string().describe('Ticket ID'),
         subtask_id: z.string().describe('Subtask ID'),
     }, async (params) => {
@@ -257,7 +257,7 @@ export function registerTicketTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_add_acceptance_criterion', 'Add acceptance criterion to a ticket', {
+    strictTool(server, 'ticket_add_acceptance_criterion', 'Add acceptance criterion to a ticket', {
         ticket_id: z.string().describe('Ticket ID'),
         criterion: z.string().describe('Acceptance criterion text'),
     }, async (params) => {
@@ -274,7 +274,7 @@ export function registerTicketTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_remove_acceptance_criterion', 'Remove acceptance criterion', {
+    strictTool(server, 'ticket_remove_acceptance_criterion', 'Remove acceptance criterion', {
         ticket_id: z.string().describe('Ticket ID'),
         criterion_id: z.string().describe('Criterion ID'),
     }, async (params) => {
@@ -291,7 +291,7 @@ export function registerTicketTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_link_to_epic', 'Link ticket to an epic', {
+    strictTool(server, 'ticket_link_to_epic', 'Link ticket to an epic', {
         ticket_id: z.string().describe('Ticket ID'),
         epic_id: z.string().describe('Epic ID'),
     }, async (params) => {
@@ -308,7 +308,7 @@ export function registerTicketTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_unlink_from_epic', 'Unlink ticket from its epic', { ticket_id: z.string().describe('Ticket ID') }, async (params) => {
+    strictTool(server, 'ticket_unlink_from_epic', 'Unlink ticket from its epic', { ticket_id: z.string().describe('Ticket ID') }, async (params) => {
         try {
             await ctx.storage.unlinkTicketFromEpic(params.ticket_id);
             return {
@@ -322,7 +322,7 @@ export function registerTicketTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_link_to_spec', 'Link ticket to a spec', {
+    strictTool(server, 'ticket_link_to_spec', 'Link ticket to a spec', {
         ticket_id: z.string().describe('Ticket ID'),
         spec_id: z.string().describe('Spec ID'),
     }, async (params) => {
@@ -339,7 +339,7 @@ export function registerTicketTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_add_blocker', 'Add a blocking dependency', {
+    strictTool(server, 'ticket_add_blocker', 'Add a blocking dependency', {
         ticket_id: z.string().describe('Ticket that will be blocked'),
         blocker_id: z.string().describe('Ticket that blocks'),
     }, async (params) => {
@@ -356,7 +356,7 @@ export function registerTicketTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_remove_blocker', 'Remove a blocking dependency', {
+    strictTool(server, 'ticket_remove_blocker', 'Remove a blocking dependency', {
         ticket_id: z.string().describe('Blocked ticket'),
         blocker_id: z.string().describe('Blocking ticket'),
     }, async (params) => {
@@ -373,7 +373,7 @@ export function registerTicketTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('ticket_get_blockers', 'Get tickets blocking this ticket', { ticket_id: z.string().describe('Ticket ID') }, async (params) => {
+    strictTool(server, 'ticket_get_blockers', 'Get tickets blocking this ticket', { ticket_id: z.string().describe('Ticket ID') }, async (params) => {
         try {
             const blockers = await ctx.storage.getTicketBlockers(params.ticket_id);
             return {

package/dist/lib/mcp/tools/view.js

@@ -2,9 +2,9 @@
  * MCP View Tools
  */
 import { z } from 'zod';
-import { errorResponse } from '../helpers.js';
+import { errorResponse, strictTool } from '../helpers.js';
 export function registerViewTools(server, ctx) {
-    server.tool('view_list', 'List board views for a project', { project: z.string().optional() }, async (params) => {
+    strictTool(server, 'view_list', 'List board views for a project', { project: z.string().optional() }, async (params) => {
         try {
             const views = await ctx.storage.listBoardViews({ projectId: params.project });
             return {
@@ -27,7 +27,7 @@ export function registerViewTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('view_create', 'Create a board view', {
+    strictTool(server, 'view_create', 'Create a board view', {
         project: z.string().describe('Project ID'),
         name: z.string().describe('View name'),
         description: z.string().optional(),
@@ -59,7 +59,7 @@ export function registerViewTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('view_delete', 'Delete a board view', { id: z.string().describe('View ID') }, async (params) => {
+    strictTool(server, 'view_delete', 'Delete a board view', { id: z.string().describe('View ID') }, async (params) => {
         try {
             await ctx.storage.deleteBoardView(params.id);
             return {

package/dist/lib/mcp/tools/work.js

@@ -2,9 +2,9 @@
  * MCP Work Tools (Agent workflow)
  */
 import { z } from 'zod';
-import { formatTicket, errorResponse } from '../helpers.js';
+import { formatTicket, errorResponse, strictTool } from '../helpers.js';
 export function registerWorkTools(server, ctx) {
-    server.tool('work_status', 'Get current work status (in-progress tickets)', {}, async () => {
+    strictTool(server, 'work_status', 'Get current work status (in-progress tickets)', {}, async () => {
         try {
             const tickets = await ctx.storage.listTickets(undefined, { allProjects: true });
             const inProgress = tickets.filter((t) => t.statusCategory === 'started' && t.assignee);
@@ -31,7 +31,7 @@ export function registerWorkTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('work_start', 'Start working on a ticket (moves to In Progress)', {
+    strictTool(server, 'work_start', 'Start working on a ticket (moves to In Progress)', {
         ticket_id: z.string().describe('Ticket ID'),
         assignee: z.string().optional().describe('Who is working'),
     }, async (params) => {
@@ -60,7 +60,7 @@ export function registerWorkTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('work_complete', 'Mark ticket complete (moves to Done)', { ticket_id: z.string().describe('Ticket ID') }, async (params) => {
+    strictTool(server, 'work_complete', 'Mark ticket complete (moves to Done)', { ticket_id: z.string().describe('Ticket ID') }, async (params) => {
         try {
             const ticket = await ctx.storage.getTicket(params.ticket_id);
             if (!ticket)
@@ -83,7 +83,7 @@ export function registerWorkTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('work_ready', 'Mark ticket ready for review', { ticket_id: z.string().describe('Ticket ID') }, async (params) => {
+    strictTool(server, 'work_ready', 'Mark ticket ready for review', { ticket_id: z.string().describe('Ticket ID') }, async (params) => {
         try {
             const ticket = await ctx.storage.getTicket(params.ticket_id);
             if (!ticket)
@@ -110,7 +110,7 @@ export function registerWorkTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('work_revise', 'Send ticket back for revision', { ticket_id: z.string().describe('Ticket ID') }, async (params) => {
+    strictTool(server, 'work_revise', 'Send ticket back for revision', { ticket_id: z.string().describe('Ticket ID') }, async (params) => {
         try {
             const ticket = await ctx.storage.getTicket(params.ticket_id);
             if (!ticket)

package/dist/lib/mcp/tools/workflow.js

@@ -2,9 +2,9 @@
  * MCP Workflow Tools
  */
 import { z } from 'zod';
-import { errorResponse } from '../helpers.js';
+import { errorResponse, strictTool } from '../helpers.js';
 export function registerWorkflowTools(server, ctx) {
-    server.tool('workflow_list', 'List all workflows', { include_builtin: z.boolean().optional() }, async (params) => {
+    strictTool(server, 'workflow_list', 'List all workflows', { include_builtin: z.boolean().optional() }, async (params) => {
         try {
             const workflows = await ctx.storage.listWorkflows({
                 isBuiltin: params.include_builtin ? undefined : false,
@@ -28,7 +28,7 @@ export function registerWorkflowTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('workflow_show', 'Get workflow details with statuses', { id: z.string().describe('Workflow ID') }, async (params) => {
+    strictTool(server, 'workflow_show', 'Get workflow details with statuses', { id: z.string().describe('Workflow ID') }, async (params) => {
         try {
             const workflow = await ctx.storage.getWorkflow(params.id);
             if (!workflow)
@@ -57,7 +57,7 @@ export function registerWorkflowTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('workflow_create', 'Create a new workflow', {
+    strictTool(server, 'workflow_create', 'Create a new workflow', {
         name: z.string().describe('Workflow name'),
         description: z.string().optional(),
         statuses: z.array(z.string()).optional().describe('Status names'),
@@ -78,7 +78,7 @@ export function registerWorkflowTools(server, ctx) {
             return errorResponse(error);
         }
     });
-    server.tool('workflow_delete', 'Delete a workflow', { id: z.string().describe('Workflow ID') }, async (params) => {
+    strictTool(server, 'workflow_delete', 'Delete a workflow', { id: z.string().describe('Workflow ID') }, async (params) => {
         try {
             await ctx.storage.deleteWorkflow(params.id);
             return {

package/dist/lib/pmo/index.js

@@ -6,6 +6,7 @@ import { SQLiteStorage } from './storage-sqlite.js';
 import { createSpecFolders } from './create-spec-folders.js';
 import { slugify } from './utils.js';
 import { createDevcontainerConfig } from '../execution/devcontainer.js';
+import { getGitIdentity } from '../pr/index.js';
 // Re-export new PMO modules
 export * from './types.js';
 export * from './utils.js';
@@ -383,10 +384,13 @@ ${columns.join(', ')}
     // Create devcontainer for separate PMO (it's its own repo)
     if (location === 'separate') {
         console.log(chalk.blue('Creating devcontainer config for PMO...'));
+        const gitIdentity = getGitIdentity();
         createDevcontainerConfig({
             agentName: 'pmo',
             agentDir: pmoPath,
             repoWorktrees: [], // PMO is the repo itself, no nested worktrees
+            gitUserName: gitIdentity.name || undefined,
+            gitUserEmail: gitIdentity.email || undefined,
         });
         console.log(chalk.green('  ✓ Devcontainer config created'));
     }

package/dist/lib/pmo/storage/base.js

@@ -218,6 +218,55 @@ export function runMigrations(db) {
             // Table may already be dropped
         }
     }
+    // Migration: Reassign orphaned tickets (TKT-940)
+    // Tickets with project_id that doesn't match any existing project are "orphaned".
+    // This can happen when a 'default' project never existed or was deleted.
+    // NOTE: This runs on every init but is idempotent — if no orphaned tickets exist, it's a no-op.
+    // Kept as a runtime check rather than a one-time migration since orphaned tickets could
+    // reappear if projects are deleted in the future.
+    if (tableExists(T.tickets) && tableExists(T.projects)) {
+        try {
+            // Find orphaned tickets (project_id doesn't match any project)
+            const orphanedTickets = db.prepare(`
+        SELECT t.id, t.project_id
+        FROM ${T.tickets} t
+        LEFT JOIN ${T.projects} p ON t.project_id = p.id
+        WHERE p.id IS NULL
+      `).all();
+            if (orphanedTickets.length > 0) {
+                // Get the first available project to reassign to
+                const firstProject = db.prepare(`
+          SELECT id FROM ${T.projects} ORDER BY created_at ASC LIMIT 1
+        `).get();
+                if (firstProject) {
+                    // Get the default status for the target project's workflow
+                    const project = db.prepare(`
+            SELECT workflow_id FROM ${T.projects} WHERE id = ?
+          `).get(firstProject.id);
+                    const workflowId = project?.workflow_id || 'default';
+                    const defaultStatus = db.prepare(`
+            SELECT id FROM ${T.workflow_statuses}
+            WHERE workflow_id = ? AND is_default = 1
+          `).get(workflowId);
+                    // Reassign orphaned tickets to the first project
+                    const updateStmt = defaultStatus
+                        ? db.prepare(`UPDATE ${T.tickets} SET project_id = ?, status_id = COALESCE(status_id, ?) WHERE id = ?`)
+                        : db.prepare(`UPDATE ${T.tickets} SET project_id = ? WHERE id = ?`);
+                    for (const ticket of orphanedTickets) {
+                        if (defaultStatus) {
+                            updateStmt.run(firstProject.id, defaultStatus.id, ticket.id);
+                        }
+                        else {
+                            updateStmt.run(firstProject.id, ticket.id);
+                        }
+                    }
+                }
+            }
+        }
+        catch {
+            // Non-critical migration - don't fail initialization
+        }
+    }
 }
 /**
  * Seed built-in workflows from BUILTIN_TEMPLATES (single source of truth).

package/dist/lib/pr/index.d.ts

@@ -44,6 +44,11 @@ export declare function getGHUsername(): string | null;
  * Check if GH_TOKEN or GITHUB_TOKEN is set in environment.
  */
 export declare function isGHTokenInEnv(): boolean;
+export interface GitIdentity {
+    name: string | null;
+    email: string | null;
+}
+export declare function getGitIdentity(cwd?: string): GitIdentity;
 /**
  * Get the GitHub repository from git remote.
  * Returns format: owner/repo
@@ -51,6 +56,8 @@ export declare function isGHTokenInEnv(): boolean;
 export declare function getGitHubRepo(cwd?: string): string | null;
 /**
  * Get the default base branch (main or master).
+ * Prefers origin/main over local main to avoid stale local branches
+ * in agent worktrees where local main is never updated.
  */
 export declare function getDefaultBaseBranch(cwd?: string): string;
 /**
@@ -71,6 +78,8 @@ export declare function pushBranch(branch: string, cwd?: string): boolean;
 export declare function hasUnpushedCommits(branch: string, cwd?: string): boolean;
 /**
  * Get the commit log between base and head.
+ * Prefers origin/${base} over local ${base} to avoid stale local branches
+ * in agent worktrees where local main/master is never updated.
  */
 export declare function getCommitLog(base: string, cwd?: string): string[];
 /**

package/dist/lib/pr/index.js

@@ -53,6 +53,75 @@ export function getGHUsername() {
 export function isGHTokenInEnv() {
     return !!(process.env.GH_TOKEN || process.env.GITHUB_TOKEN);
 }
+/**
+ * Detect the user's git identity for commit attribution.
+ * Tries GitHub CLI first (gh api user), falls back to git config.
+ * Results are memoized so subprocess calls only run once per process.
+ */
+let _cachedGitIdentity;
+export function getGitIdentity(cwd) {
+    if (_cachedGitIdentity)
+        return _cachedGitIdentity;
+    let name = null;
+    let email = null;
+    // Method 1: Try gh api user (most reliable for GitHub identity)
+    try {
+        const userJson = execSync('gh api user', {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        const user = JSON.parse(userJson);
+        name = user.name || user.login || null;
+        email = user.email || null;
+        // If no public email, try GitHub emails API for primary email
+        if (!email) {
+            try {
+                const emailsJson = execSync('gh api user/emails', {
+                    encoding: 'utf-8',
+                    stdio: ['pipe', 'pipe', 'pipe'],
+                });
+                const emails = JSON.parse(emailsJson);
+                const primary = emails.find(e => e.primary);
+                if (primary) {
+                    email = primary.email;
+                }
+            }
+            catch {
+                // emails API may not be accessible with current token scope
+            }
+        }
+    }
+    catch {
+        // gh not available or not authenticated
+    }
+    // Method 2: Fall back to git config
+    if (!name) {
+        try {
+            name = execSync('git config user.name', {
+                cwd,
+                encoding: 'utf-8',
+                stdio: ['pipe', 'pipe', 'pipe'],
+            }).trim() || null;
+        }
+        catch {
+            // git config not set
+        }
+    }
+    if (!email) {
+        try {
+            email = execSync('git config user.email', {
+                cwd,
+                encoding: 'utf-8',
+                stdio: ['pipe', 'pipe', 'pipe'],
+            }).trim() || null;
+        }
+        catch {
+            // git config not set
+        }
+    }
+    _cachedGitIdentity = { name, email };
+    return _cachedGitIdentity;
+}
 // =============================================================================
 // Git Remote Detection
 // =============================================================================
@@ -85,29 +154,31 @@ export function getGitHubRepo(cwd) {
 }
 /**
  * Get the default base branch (main or master).
+ * Prefers origin/main over local main to avoid stale local branches
+ * in agent worktrees where local main is never updated.
  */
 export function getDefaultBaseBranch(cwd) {
-    try {
-        // Check if 'main' exists
-        execSync('git rev-parse --verify main', {
-            cwd,
-            stdio: ['pipe', 'pipe', 'pipe'],
-        });
-        return 'main';
-    }
-    catch {
-        // Fall back to 'master'
+    // Check origin/main first (most reliable in worktree environments)
+    // then local main, then origin/master, then local master
+    const candidates = [
+        { ref: 'origin/main', name: 'main' },
+        { ref: 'main', name: 'main' },
+        { ref: 'origin/master', name: 'master' },
+        { ref: 'master', name: 'master' },
+    ];
+    for (const { ref, name } of candidates) {
         try {
-            execSync('git rev-parse --verify master', {
+            execSync(`git rev-parse --verify ${ref}`, {
                 cwd,
                 stdio: ['pipe', 'pipe', 'pipe'],
             });
-            return 'master';
+            return name;
         }
         catch {
-            return 'main'; // Default to main even if not found
+            // Try next candidate
         }
     }
+    return 'main'; // Default to main even if not found
 }
 /**
  * Get the current branch name.
@@ -173,10 +244,26 @@ export function hasUnpushedCommits(branch, cwd) {
 }
 /**
  * Get the commit log between base and head.
+ * Prefers origin/${base} over local ${base} to avoid stale local branches
+ * in agent worktrees where local main/master is never updated.
  */
 export function getCommitLog(base, cwd) {
+    // Prefer origin/${base} for accurate comparison (local branch may be stale)
+    let ref = base;
+    if (!base.startsWith('origin/')) {
+        try {
+            execSync(`git rev-parse --verify origin/${base}`, {
+                cwd,
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
+            ref = `origin/${base}`;
+        }
+        catch {
+            // Fall back to local ref
+        }
+    }
     try {
-        const output = execSync(`git log ${base}..HEAD --oneline`, {
+        const output = execSync(`git log ${ref}..HEAD --oneline`, {
             cwd,
             encoding: 'utf-8',
             stdio: ['pipe', 'pipe', 'pipe'],

package/dist/lib/prompt-command.d.ts

@@ -83,6 +83,9 @@ export declare abstract class PromptCommand extends Command {
         default?: unknown;
         validate?: (input: unknown) => boolean | string;
         when?: boolean | ((answers: Record<string, unknown>) => boolean);
+        filter?: (input: unknown) => unknown;
+        pageSize?: number;
+        [key: string]: unknown;
     }>, jsonModeConfig?: {
         flags: JsonFlags & Record<string, unknown>;
         commandName: string;