@shepai/cli 1.169.1 → 1.170.0-pr513.cff27cb

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations/053-add-exploration-max-iterations.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Migration 053: Add exploration_max_iterations column to the settings table.
+ *
+ * Adds a nullable INTEGER column for the maximum number of feedback iterations
+ * in exploration mode. When NULL, the default of 10 is applied at the application layer.
+ * Guards against duplicate column using PRAGMA table_info.
+ */
+import type { MigrationParams } from 'umzug';
+import type Database from 'better-sqlite3';
+export declare function up({ context: db }: MigrationParams<Database.Database>): Promise<void>;
+export declare function down({ context: db }: MigrationParams<Database.Database>): Promise<void>;
+//# sourceMappingURL=053-add-exploration-max-iterations.d.ts.map

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations/053-add-exploration-max-iterations.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"053-add-exploration-max-iterations.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/persistence/sqlite/migrations/053-add-exploration-max-iterations.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,wBAAsB,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAO3F;AAED,wBAAsB,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAE7F"}

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations/053-add-exploration-max-iterations.js

@@ -0,0 +1,17 @@
+/**
+ * Migration 053: Add exploration_max_iterations column to the settings table.
+ *
+ * Adds a nullable INTEGER column for the maximum number of feedback iterations
+ * in exploration mode. When NULL, the default of 10 is applied at the application layer.
+ * Guards against duplicate column using PRAGMA table_info.
+ */
+export async function up({ context: db }) {
+    const columns = db.pragma('table_info(settings)');
+    const names = new Set(columns.map((c) => c.name));
+    if (!names.has('exploration_max_iterations')) {
+        db.exec('ALTER TABLE settings ADD COLUMN exploration_max_iterations INTEGER');
+    }
+}
+export async function down({ context: db }) {
+    void db;
+}

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations/053-add-skill-injection-config.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Migration 050: Add skill injection config columns to the settings table.
+ *
+ * Adds two new columns for configuring skill injection during feature creation:
+ *  - skill_injection_enabled (INTEGER DEFAULT 0): whether skill injection is active
+ *  - skill_injection_skills (TEXT, nullable): JSON array of SkillSource objects
+ *
+ * Default value of 0 means skill injection is opt-in (disabled by default).
+ * Guards against duplicate column errors using table_info pragma.
+ */
+import type { MigrationParams } from 'umzug';
+import type Database from 'better-sqlite3';
+export declare function up({ context: db }: MigrationParams<Database.Database>): Promise<void>;
+export declare function down({ context: db }: MigrationParams<Database.Database>): Promise<void>;
+//# sourceMappingURL=053-add-skill-injection-config.d.ts.map

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations/053-add-skill-injection-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"053-add-skill-injection-config.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/persistence/sqlite/migrations/053-add-skill-injection-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,wBAAsB,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAW3F;AAED,wBAAsB,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAE7F"}

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations/053-add-skill-injection-config.js

@@ -0,0 +1,23 @@
+/**
+ * Migration 050: Add skill injection config columns to the settings table.
+ *
+ * Adds two new columns for configuring skill injection during feature creation:
+ *  - skill_injection_enabled (INTEGER DEFAULT 0): whether skill injection is active
+ *  - skill_injection_skills (TEXT, nullable): JSON array of SkillSource objects
+ *
+ * Default value of 0 means skill injection is opt-in (disabled by default).
+ * Guards against duplicate column errors using table_info pragma.
+ */
+export async function up({ context: db }) {
+    const columns = db.pragma('table_info(settings)');
+    const names = new Set(columns.map((c) => c.name));
+    if (!names.has('skill_injection_enabled')) {
+        db.exec('ALTER TABLE settings ADD COLUMN skill_injection_enabled INTEGER NOT NULL DEFAULT 0');
+    }
+    if (!names.has('skill_injection_skills')) {
+        db.exec('ALTER TABLE settings ADD COLUMN skill_injection_skills TEXT');
+    }
+}
+export async function down({ context: db }) {
+    void db;
+}

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations/054-add-injected-skills-to-features.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Migration 054: Add inject_skills and injected_skills columns to features table.
+ *
+ * inject_skills: boolean flag indicating skill injection was enabled for this feature.
+ * injected_skills: JSON array of skill names that were injected into the worktree.
+ */
+import type { MigrationParams } from 'umzug';
+import type Database from 'better-sqlite3';
+export declare function up({ context: db }: MigrationParams<Database.Database>): Promise<void>;
+export declare function down({ context: db }: MigrationParams<Database.Database>): Promise<void>;
+//# sourceMappingURL=054-add-injected-skills-to-features.d.ts.map

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations/054-add-injected-skills-to-features.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"054-add-injected-skills-to-features.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/persistence/sqlite/migrations/054-add-injected-skills-to-features.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,wBAAsB,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAU3F;AAED,wBAAsB,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAE7F"}

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations/054-add-injected-skills-to-features.js

@@ -0,0 +1,19 @@
+/**
+ * Migration 054: Add inject_skills and injected_skills columns to features table.
+ *
+ * inject_skills: boolean flag indicating skill injection was enabled for this feature.
+ * injected_skills: JSON array of skill names that were injected into the worktree.
+ */
+export async function up({ context: db }) {
+    const columns = db.pragma('table_info(features)');
+    const names = new Set(columns.map((c) => c.name));
+    if (!names.has('inject_skills')) {
+        db.exec('ALTER TABLE features ADD COLUMN inject_skills INTEGER NOT NULL DEFAULT 0');
+    }
+    if (!names.has('injected_skills')) {
+        db.exec('ALTER TABLE features ADD COLUMN injected_skills TEXT');
+    }
+}
+export async function down({ context: db }) {
+    void db;
+}

package/dist/packages/core/src/infrastructure/repositories/sqlite-feature.repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sqlite-feature.repository.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/infrastructure/repositories/sqlite-feature.repository.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,OAAO,KAAK,EACV,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,6EAA6E,CAAC;AACrF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAOhE;;;GAGG;AACH,qBACa,uBAAwB,YAAW,kBAAkB;IACpD,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,QAAQ,CAAC,QAAQ;IAE5C,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCvC,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAW7C,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAcvD,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAazE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAa7E,IAAI,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IA8BtD,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAQpD,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAqDvC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjC,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAK5C"}
+{"version":3,"file":"sqlite-feature.repository.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/infrastructure/repositories/sqlite-feature.repository.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,OAAO,KAAK,EACV,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,6EAA6E,CAAC;AACrF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAOhE;;;GAGG;AACH,qBACa,uBAAwB,YAAW,kBAAkB;IACpD,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,QAAQ,CAAC,QAAQ;IAE5C,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAwCvC,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAW7C,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAcvD,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAazE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAa7E,IAAI,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IA8BtD,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAQpD,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyDvC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjC,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAK5C"}

package/dist/packages/core/src/infrastructure/repositories/sqlite-feature.repository.js

@@ -32,7 +32,7 @@ let SQLiteFeatureRepository = class SQLiteFeatureRepository {
         id, name, slug, description, user_query, repository_path, branch,
         lifecycle, messages, plan, related_artifacts,
         agent_run_id, spec_path,
-        fast,
+        mode, iteration_count, max_iterations,
         push, open_pr, fork_and_pr, commit_specs,
         ci_watch_enabled, enable_evidence, commit_evidence,
         auto_merge, allow_prd, allow_plan, allow_merge,
@@ -40,13 +40,14 @@ let SQLiteFeatureRepository = class SQLiteFeatureRepository {
         pr_url, pr_number, pr_status, commit_hash, ci_status,
         ci_fix_attempts, ci_fix_history, pr_mergeable,
         upstream_pr_url, upstream_pr_number, upstream_pr_status,
-        parent_id, previous_lifecycle, attachments, deleted_at,
-        created_at, updated_at
+        parent_id, previous_lifecycle, attachments,
+        inject_skills, injected_skills,
+        deleted_at, created_at, updated_at
       ) VALUES (
         @id, @name, @slug, @description, @user_query, @repository_path, @branch,
         @lifecycle, @messages, @plan, @related_artifacts,
         @agent_run_id, @spec_path,
-        @fast,
+        @mode, @iteration_count, @max_iterations,
         @push, @open_pr, @fork_and_pr, @commit_specs,
         @ci_watch_enabled, @enable_evidence, @commit_evidence,
         @auto_merge, @allow_prd, @allow_plan, @allow_merge,
@@ -54,8 +55,9 @@ let SQLiteFeatureRepository = class SQLiteFeatureRepository {
         @pr_url, @pr_number, @pr_status, @commit_hash, @ci_status,
         @ci_fix_attempts, @ci_fix_history, @pr_mergeable,
         @upstream_pr_url, @upstream_pr_number, @upstream_pr_status,
-        @parent_id, @previous_lifecycle, @attachments, @deleted_at,
-        @created_at, @updated_at
+        @parent_id, @previous_lifecycle, @attachments,
+        @inject_skills, @injected_skills,
+        @deleted_at, @created_at, @updated_at
       )
     `);
         stmt.run(row);
@@ -138,7 +140,9 @@ let SQLiteFeatureRepository = class SQLiteFeatureRepository {
         related_artifacts = @related_artifacts,
         agent_run_id = @agent_run_id,
         spec_path = @spec_path,
-        fast = @fast,
+        mode = @mode,
+        iteration_count = @iteration_count,
+        max_iterations = @max_iterations,
         push = @push,
         open_pr = @open_pr,
         fork_and_pr = @fork_and_pr,
@@ -166,6 +170,8 @@ let SQLiteFeatureRepository = class SQLiteFeatureRepository {
         parent_id = @parent_id,
         previous_lifecycle = @previous_lifecycle,
         attachments = @attachments,
+        inject_skills = @inject_skills,
+        injected_skills = @injected_skills,
         deleted_at = @deleted_at,
         updated_at = @updated_at
       WHERE id = @id

package/dist/packages/core/src/infrastructure/repositories/sqlite-settings.repository.js

@@ -68,7 +68,7 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         feature_flag_react_file_manager,
         feature_flag_inventory,
         workflow_enable_evidence, workflow_commit_evidence,
-        hide_ci_status, default_fast_mode,
+        hide_ci_status, default_mode,
         interactive_agent_enabled, interactive_agent_auto_timeout_minutes,
         interactive_agent_max_concurrent_sessions,
         auto_archive_delay_minutes,
@@ -100,7 +100,7 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         @feature_flag_react_file_manager,
         @feature_flag_inventory,
         @workflow_enable_evidence, @workflow_commit_evidence,
-        @hide_ci_status, @default_fast_mode,
+        @hide_ci_status, @default_mode,
         @interactive_agent_enabled, @interactive_agent_auto_timeout_minutes,
         @interactive_agent_max_concurrent_sessions,
         @auto_archive_delay_minutes,
@@ -205,7 +205,7 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         workflow_enable_evidence = @workflow_enable_evidence,
         workflow_commit_evidence = @workflow_commit_evidence,
         hide_ci_status = @hide_ci_status,
-        default_fast_mode = @default_fast_mode,
+        default_mode = @default_mode,
         interactive_agent_enabled = @interactive_agent_enabled,
         interactive_agent_auto_timeout_minutes = @interactive_agent_auto_timeout_minutes,
         interactive_agent_max_concurrent_sessions = @interactive_agent_max_concurrent_sessions,

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.prompt.d.ts

@@ -32,4 +32,25 @@ export interface ConflictResolutionPromptParams {
  * all conflict markers by editing files in the working directory.
  */
 export declare function buildConflictResolutionPrompt(params: ConflictResolutionPromptParams): string;
+export interface StashPopResolutionPromptParams {
+    /** Files with conflict markers from stash pop */
+    conflictedFiles: ConflictedFile[];
+    /** The feature branch */
+    featureBranch: string;
+    /** The base branch the feature was rebased onto */
+    baseBranch: string;
+    /** 1-based attempt number */
+    attemptNumber: number;
+    /** Maximum allowed attempts */
+    maxAttempts: number;
+    /** Feedback from previous failed attempt */
+    previousFeedback?: string;
+}
+/**
+ * Build a prompt for resolving stash pop conflicts.
+ *
+ * Stash pop conflicts occur when rebased code conflicts with uncommitted
+ * changes that were stashed before the rebase.
+ */
+export declare function buildStashPopResolutionPrompt(params: StashPopResolutionPromptParams): string;
 //# sourceMappingURL=conflict-resolution.prompt.d.ts.map

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conflict-resolution.prompt.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.prompt.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,WAAW,cAAc;IAC7B,wCAAwC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,oDAAoD;IACpD,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,8BAA8B;IAC7C,kCAAkC;IAClC,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,uCAAuC;IACvC,aAAa,EAAE,MAAM,CAAC;IACtB,yCAAyC;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,6BAA6B;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,+BAA+B;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,qEAAqE;IACrE,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,8BAA8B,GAAG,MAAM,CAgE5F"}
+{"version":3,"file":"conflict-resolution.prompt.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.prompt.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,WAAW,cAAc;IAC7B,wCAAwC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,oDAAoD;IACpD,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,8BAA8B;IAC7C,kCAAkC;IAClC,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,uCAAuC;IACvC,aAAa,EAAE,MAAM,CAAC;IACtB,yCAAyC;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,6BAA6B;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,+BAA+B;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,qEAAqE;IACrE,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,8BAA8B,GAAG,MAAM,CAgE5F;AAED,MAAM,WAAW,8BAA8B;IAC7C,iDAAiD;IACjD,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,yBAAyB;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,mDAAmD;IACnD,UAAU,EAAE,MAAM,CAAC;IACnB,6BAA6B;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,+BAA+B;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,4CAA4C;IAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,8BAA8B,GAAG,MAAM,CAkE5F"}

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.prompt.js

@@ -64,3 +64,64 @@ ${fileSection}
 - Do NOT run tests, builds, or linters — only resolve the conflict markers
 - Every conflicted file must have zero remaining conflict markers when you are done`;
 }
+/**
+ * Build a prompt for resolving stash pop conflicts.
+ *
+ * Stash pop conflicts occur when rebased code conflicts with uncommitted
+ * changes that were stashed before the rebase.
+ */
+export function buildStashPopResolutionPrompt(params) {
+    const { conflictedFiles, featureBranch, baseBranch, attemptNumber, maxAttempts, previousFeedback, } = params;
+    const fileSection = conflictedFiles
+        .map((f) => `### \`${f.path}\`
+
+\`\`\`
+${f.content}
+\`\`\``)
+        .join('\n\n');
+    const feedbackSection = previousFeedback
+        ? `
+## Previous Attempt Feedback
+
+Your previous resolution attempt (${attemptNumber - 1}/${maxAttempts}) was incomplete:
+
+${previousFeedback}
+
+You MUST resolve all remaining conflict markers in this attempt.
+`
+        : '';
+    return `You are resolving git stash pop conflicts (attempt ${attemptNumber}/${maxAttempts}).
+
+## Context
+
+- Feature branch: \`${featureBranch}\`
+- Base branch: \`${baseBranch}\`
+- The feature branch was just rebased onto \`${baseBranch}\`.
+- Uncommitted changes were stashed before the rebase and are now being restored via stash pop.
+- The stash pop caused conflicts because the rebased code modified the same files as the stashed uncommitted changes.
+${feedbackSection}
+## Conflicted Files
+
+The following files contain conflict markers from the stash pop:
+
+${fileSection}
+
+## Instructions
+
+1. Read each conflicted file listed above
+2. Resolve ALL conflict markers (\`<<<<<<<\`, \`=======\`, \`>>>>>>>\`) by editing the files
+3. For each conflict:
+   - The \`<<<<<<< Updated upstream\` section contains the rebased code (current branch state after rebase)
+   - The \`>>>>>>> Stashed changes\` section contains the user's uncommitted work-in-progress
+4. Preserve the user's uncommitted changes where possible — these are work-in-progress edits the user was actively developing
+5. Integrate the rebased code changes that don't conflict with the user's intent
+
+## Constraints
+
+- Edit ONLY the conflicted files listed above — do NOT modify any other files
+- Remove ALL conflict markers (\`<<<<<<<\`, \`=======\`, \`>>>>>>>\`) from every conflicted file
+- Do NOT add new files or delete files
+- Do NOT run git commands — only edit files to resolve conflicts
+- Do NOT run tests, builds, or linters — only resolve the conflict markers
+- Every conflicted file must have zero remaining conflict markers when you are done`;
+}

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.service.d.ts

@@ -26,6 +26,22 @@ export declare class ConflictResolutionService {
      * @param baseBranch - Base branch being rebased onto
      */
     resolve(cwd: string, featureBranch: string, baseBranch: string): Promise<void>;
+    /**
+     * Resolve conflicts from a failed stash pop.
+     *
+     * After a rebase, stash pop may fail if the rebased code conflicts with
+     * stashed uncommitted changes. This method invokes the agent to resolve
+     * those conflicts, validates, and stages the resolved files.
+     *
+     * Unlike resolve(), this does NOT call rebaseContinue — the rebase is
+     * already complete. On success, the caller is responsible for dropping
+     * the stash entry.
+     *
+     * @param cwd - Working directory (repo root or worktree path)
+     * @param featureBranch - Feature branch name
+     * @param baseBranch - Base branch name
+     */
+    resolveStashPop(cwd: string, featureBranch: string, baseBranch: string): Promise<void>;
     /**
      * Read the contents of conflicted files from the working directory.
      */

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conflict-resolution.service.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wEAAwE,CAAC;AACrH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iEAAiE,CAAC;AAerG,qBACa,yBAAyB;IAGlC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAE9B,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,aAAa,EAAE,sBAAsB,EAErC,YAAY,EAAE,aAAa;IAG9C;;;;;;;;;;;;;OAaG;IACG,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkEpF;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAWlC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAgB1B;;OAEG;IACH,OAAO,CAAC,iCAAiC;CAyB1C"}
+{"version":3,"file":"conflict-resolution.service.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wEAAwE,CAAC;AACrH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iEAAiE,CAAC;AAgBrG,qBACa,yBAAyB;IAGlC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAE9B,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,aAAa,EAAE,sBAAsB,EAErC,YAAY,EAAE,aAAa;IAG9C;;;;;;;;;;;;;OAaG;IACG,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkEpF;;;;;;;;;;;;;;OAcG;IACG,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuC5F;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAWlC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAgB1B;;OAEG;IACH,OAAO,CAAC,iCAAiC;CAyB1C"}

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.service.js

@@ -21,7 +21,7 @@ import { injectable, inject } from 'tsyringe';
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { GitPrError, GitPrErrorCode, } from '../../../../application/ports/output/services/git-pr-service.interface.js';
-import { buildConflictResolutionPrompt, } from './conflict-resolution.prompt.js';
+import { buildConflictResolutionPrompt, buildStashPopResolutionPrompt, } from './conflict-resolution.prompt.js';
 const MAX_RETRIES_PER_COMMIT = 3;
 /** Conflict markers that indicate unresolved conflicts */
 const CONFLICT_MARKERS = ['<<<<<<<', '=======', '>>>>>>>'];
@@ -86,9 +86,9 @@ let ConflictResolutionService = class ConflictResolutionService {
             await this.gitPrService.stageFiles(cwd, conflictedFiles);
             try {
                 await this.gitPrService.rebaseContinue(cwd);
-                // rebaseContinue succeeded — check if there are more conflicts
-                // from subsequent commits (loop continues)
-                return; // No more conflicts
+                // rebaseContinue succeeded — loop back to check if subsequent
+                // commits have conflicts (getConflictedFiles at top of while loop)
+                continue;
             }
             catch (error) {
                 if (error instanceof GitPrError && error.code === GitPrErrorCode.REBASE_CONFLICT) {
@@ -99,6 +99,49 @@ let ConflictResolutionService = class ConflictResolutionService {
             }
         }
     }
+    /**
+     * Resolve conflicts from a failed stash pop.
+     *
+     * After a rebase, stash pop may fail if the rebased code conflicts with
+     * stashed uncommitted changes. This method invokes the agent to resolve
+     * those conflicts, validates, and stages the resolved files.
+     *
+     * Unlike resolve(), this does NOT call rebaseContinue — the rebase is
+     * already complete. On success, the caller is responsible for dropping
+     * the stash entry.
+     *
+     * @param cwd - Working directory (repo root or worktree path)
+     * @param featureBranch - Feature branch name
+     * @param baseBranch - Base branch name
+     */
+    async resolveStashPop(cwd, featureBranch, baseBranch) {
+        const conflictedFiles = await this.gitPrService.getConflictedFiles(cwd);
+        if (conflictedFiles.length === 0) {
+            return;
+        }
+        const executor = await this.agentProvider.getExecutor();
+        for (let attempt = 1; attempt <= MAX_RETRIES_PER_COMMIT; attempt++) {
+            const fileContents = this.readConflictedFileContents(cwd, conflictedFiles);
+            const previousFeedback = attempt > 1 ? this.buildFeedbackFromRemainingMarkers(cwd, conflictedFiles) : undefined;
+            const prompt = buildStashPopResolutionPrompt({
+                conflictedFiles: fileContents,
+                featureBranch,
+                baseBranch,
+                attemptNumber: attempt,
+                maxAttempts: MAX_RETRIES_PER_COMMIT,
+                previousFeedback,
+            });
+            await executor.execute(prompt, { cwd });
+            if (this.validateResolution(cwd, conflictedFiles)) {
+                await this.gitPrService.stageFiles(cwd, conflictedFiles);
+                return;
+            }
+        }
+        const remaining = conflictedFiles.join(', ');
+        throw new Error(`Failed to resolve stash pop conflicts after ${MAX_RETRIES_PER_COMMIT} attempts. ` +
+            `Unresolved files: ${remaining}. Your stash entry is preserved — ` +
+            `run \`git stash pop\` manually to resolve.`);
+    }
     /**
      * Read the contents of conflicted files from the working directory.
      */