@shepai/cli 1.111.0 → 1.112.0-pr346.5ff956f

package/dist/packages/core/src/infrastructure/persistence/sqlite/sqlite-migration-storage.d.ts

@@ -0,0 +1,59 @@
+/**
+ * Custom umzug storage adapter for better-sqlite3.
+ *
+ * Wraps better-sqlite3's synchronous API in async methods to satisfy
+ * umzug's UmzugStorage interface. Manages the `umzug_migrations` tracking
+ * table with columns: name (TEXT PK) and created_at (TEXT NOT NULL).
+ *
+ * Includes a bootstrap seeder that auto-detects existing databases
+ * (PRAGMA user_version > 0 with empty umzug_migrations table) and seeds
+ * migration records for versions 1 through user_version.
+ */
+import type Database from 'better-sqlite3';
+import type { UmzugStorage, MigrationParams } from 'umzug';
+/**
+ * SQLite-backed migration storage for umzug.
+ *
+ * Tracks which migrations have been applied in a `umzug_migrations` table
+ * within the same SQLite database as the application data.
+ */
+export declare class SQLiteMigrationStorage implements UmzugStorage<Database.Database> {
+    private readonly db;
+    /**
+     * @param db - The better-sqlite3 database instance.
+     * @param legacyMigrationNames - Ordered list of legacy migration names (e.g.,
+     *   ['001-create-settings-table', '002-add-agent-config', ...]). When provided,
+     *   the constructor checks if this is an existing database transitioning from
+     *   PRAGMA user_version tracking and seeds the umzug_migrations table accordingly.
+     */
+    constructor(db: Database.Database, legacyMigrationNames?: string[]);
+    /**
+     * Returns the names of all executed migrations, sorted lexicographically.
+     */
+    executed(_meta: Pick<MigrationParams<Database.Database>, 'context'>): Promise<string[]>;
+    /**
+     * Records a migration as executed.
+     */
+    logMigration(params: MigrationParams<Database.Database>): Promise<void>;
+    /**
+     * Removes a migration record (marks it as pending).
+     */
+    unlogMigration(params: MigrationParams<Database.Database>): Promise<void>;
+    /**
+     * Creates the umzug_migrations table if it does not exist.
+     */
+    private ensureTable;
+    /**
+     * Auto-detects existing databases that used PRAGMA user_version tracking
+     * and seeds the umzug_migrations table so umzug does not re-apply them.
+     *
+     * Conditions for bootstrap:
+     * - PRAGMA user_version > 0 (database has been migrated before)
+     * - umzug_migrations table is empty (not yet transitioned to umzug)
+     *
+     * When both conditions are met, inserts records for migrations 1 through
+     * user_version using the provided legacy migration names.
+     */
+    private bootstrapLegacyMigrations;
+}
+//# sourceMappingURL=sqlite-migration-storage.d.ts.map

package/dist/packages/core/src/infrastructure/persistence/sqlite/sqlite-migration-storage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sqlite-migration-storage.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/persistence/sqlite/sqlite-migration-storage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAE3D;;;;;GAKG;AACH,qBAAa,sBAAuB,YAAW,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAC5E,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAoB;IAEvC;;;;;;OAMG;gBACS,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC,EAAE,MAAM,EAAE;IAQlE;;OAEG;IACG,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAO7F;;OAEG;IACG,YAAY,CAAC,MAAM,EAAE,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAM7E;;OAEG;IACG,cAAc,CAAC,MAAM,EAAE,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/E;;OAEG;IACH,OAAO,CAAC,WAAW;IASnB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,yBAAyB;CA+BlC"}

package/dist/packages/core/src/infrastructure/persistence/sqlite/sqlite-migration-storage.js

@@ -0,0 +1,98 @@
+/**
+ * Custom umzug storage adapter for better-sqlite3.
+ *
+ * Wraps better-sqlite3's synchronous API in async methods to satisfy
+ * umzug's UmzugStorage interface. Manages the `umzug_migrations` tracking
+ * table with columns: name (TEXT PK) and created_at (TEXT NOT NULL).
+ *
+ * Includes a bootstrap seeder that auto-detects existing databases
+ * (PRAGMA user_version > 0 with empty umzug_migrations table) and seeds
+ * migration records for versions 1 through user_version.
+ */
+/**
+ * SQLite-backed migration storage for umzug.
+ *
+ * Tracks which migrations have been applied in a `umzug_migrations` table
+ * within the same SQLite database as the application data.
+ */
+export class SQLiteMigrationStorage {
+    db;
+    /**
+     * @param db - The better-sqlite3 database instance.
+     * @param legacyMigrationNames - Ordered list of legacy migration names (e.g.,
+     *   ['001-create-settings-table', '002-add-agent-config', ...]). When provided,
+     *   the constructor checks if this is an existing database transitioning from
+     *   PRAGMA user_version tracking and seeds the umzug_migrations table accordingly.
+     */
+    constructor(db, legacyMigrationNames) {
+        this.db = db;
+        this.ensureTable();
+        if (legacyMigrationNames && legacyMigrationNames.length > 0) {
+            this.bootstrapLegacyMigrations(legacyMigrationNames);
+        }
+    }
+    /**
+     * Returns the names of all executed migrations, sorted lexicographically.
+     */
+    async executed(_meta) {
+        const rows = this.db.prepare('SELECT name FROM umzug_migrations ORDER BY name').all();
+        return rows.map((r) => r.name);
+    }
+    /**
+     * Records a migration as executed.
+     */
+    async logMigration(params) {
+        this.db
+            .prepare('INSERT INTO umzug_migrations (name, created_at) VALUES (?, ?)')
+            .run(params.name, new Date().toISOString());
+    }
+    /**
+     * Removes a migration record (marks it as pending).
+     */
+    async unlogMigration(params) {
+        this.db.prepare('DELETE FROM umzug_migrations WHERE name = ?').run(params.name);
+    }
+    /**
+     * Creates the umzug_migrations table if it does not exist.
+     */
+    ensureTable() {
+        this.db.exec(`
+      CREATE TABLE IF NOT EXISTS umzug_migrations (
+        name TEXT PRIMARY KEY NOT NULL,
+        created_at TEXT NOT NULL
+      )
+    `);
+    }
+    /**
+     * Auto-detects existing databases that used PRAGMA user_version tracking
+     * and seeds the umzug_migrations table so umzug does not re-apply them.
+     *
+     * Conditions for bootstrap:
+     * - PRAGMA user_version > 0 (database has been migrated before)
+     * - umzug_migrations table is empty (not yet transitioned to umzug)
+     *
+     * When both conditions are met, inserts records for migrations 1 through
+     * user_version using the provided legacy migration names.
+     */
+    bootstrapLegacyMigrations(legacyMigrationNames) {
+        const result = this.db.prepare('PRAGMA user_version').get();
+        const userVersion = result.user_version;
+        if (userVersion <= 0) {
+            return;
+        }
+        const count = this.db.prepare('SELECT COUNT(*) as count FROM umzug_migrations').get();
+        if (count.count > 0) {
+            return;
+        }
+        // Seed records for migrations 1 through user_version
+        const now = new Date().toISOString();
+        const insert = this.db.prepare('INSERT INTO umzug_migrations (name, created_at) VALUES (?, ?)');
+        const seedAll = this.db.transaction(() => {
+            const count = Math.min(userVersion, legacyMigrationNames.length);
+            for (let i = 0; i < count; i++) {
+                insert.run(legacyMigrationNames[i], now);
+            }
+        });
+        seedAll();
+    }
+}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/feature-agent-worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-agent-worker.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/feature-agent-worker.ts"],"names":[],"mappings":";AACA;;;;;;;;GAQG;AAEH,OAAO,kBAAkB,CAAC;AAe1B,OAAO,EAAkB,KAAK,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAW9E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAwE1D;AAgCD;;;GAGG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA0P/D"}
+{"version":3,"file":"feature-agent-worker.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/feature-agent-worker.ts"],"names":[],"mappings":";AACA;;;;;;;;GAQG;AAEH,OAAO,kBAAkB,CAAC;AAe1B,OAAO,EAAkB,KAAK,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAW9E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAwE1D;AAgCD;;;GAGG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAgQ/D"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/feature-agent-worker.js

@@ -294,8 +294,13 @@ export async function runWorker(args) {
         const interruptPayload = result.__interrupt__;
         if (interruptPayload && interruptPayload.length > 0) {
             const now = new Date();
+            // Extract the node name from the interrupt payload so the rejection
+            // use case can tag feedback with the correct phase (e.g. "merge").
+            const interruptValue = interruptPayload[0]?.value;
+            const interruptNode = typeof interruptValue?.node === 'string' ? interruptValue.node : undefined;
             await runRepository.updateStatus(args.runId, AgentRunStatus.waitingApproval, {
                 updatedAt: now,
+                ...(interruptNode ? { result: `node:${interruptNode}` } : {}),
             });
             log('Run paused — waiting for human approval');
             return;

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge.node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge.node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAClH,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACd,MAAM,iEAAiE,CAAC;AAkBzE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uEAAuE,CAAC;AAE3H,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,cAAc,CAAC;IACzB,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1E,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,gBAAgB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,CAAC,CAAC;IACnE;;;OAGG;IACH,WAAW,EAAE,CACX,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,eAAe,CAAC,EAAE,MAAM,KACrB,OAAO,CAAC,OAAO,CAAC,CAAC;IACtB;;OAEG;IACH,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACxD,YAAY,EAAE,aAAa,CAAC;IAC5B,6BAA6B,EAAE,IAAI,CAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC;CAC/E;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,IAGnC,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CA4S7E"}
+{"version":3,"file":"merge.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge.node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAClH,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACd,MAAM,iEAAiE,CAAC;AAkBzE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uEAAuE,CAAC;AAE3H,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,cAAc,CAAC;IACzB,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1E,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,gBAAgB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,CAAC,CAAC;IACnE;;;OAGG;IACH,WAAW,EAAE,CACX,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,eAAe,CAAC,EAAE,MAAM,KACrB,OAAO,CAAC,OAAO,CAAC,CAAC;IACtB;;OAEG;IACH,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACxD,YAAY,EAAE,aAAa,CAAC;IAC5B,6BAA6B,EAAE,IAAI,CAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC;CAC/E;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,IAGnC,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CA6S7E"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge.node.js

@@ -58,6 +58,7 @@ export function createMergeNode(deps) {
             return {
                 currentNode: 'merge',
                 messages: [`[merge] Rejected — will re-execute`],
+                error: null,
                 _approvalAction: null,
                 _rejectionFeedback: null,
                 _needsReexecution: true,

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/fast-implement.prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fast-implement.prompt.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/fast-implement.prompt.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AA+FxD;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAiEzE"}
+{"version":3,"file":"fast-implement.prompt.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/fast-implement.prompt.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAwIxD;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAoEzE"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/fast-implement.prompt.js

@@ -105,6 +105,44 @@ function extractUserQuery(specDir) {
     }
     return specContent;
 }
+/**
+ * Extract rejection feedback from spec.yaml for merge-phase rejections.
+ * Returns a formatted prompt section if feedback exists, empty string otherwise.
+ */
+function getRejectionFeedback(specDir) {
+    try {
+        const specContent = readSpecFile(specDir, 'spec.yaml');
+        if (!specContent)
+            return '';
+        const specData = yaml.load(specContent);
+        const rejectionFeedback = specData?.rejectionFeedback;
+        if (rejectionFeedback && rejectionFeedback.length > 0) {
+            const mergeRejections = rejectionFeedback.filter((e) => e.phase === 'merge');
+            if (mergeRejections.length > 0) {
+                const latest = mergeRejections[mergeRejections.length - 1];
+                const older = mergeRejections.slice(0, -1);
+                const olderSection = older.length > 0
+                    ? `\n### Earlier feedback (for context only)\n${older.map((e) => `- Iteration ${e.iteration}: ${e.message}`).join('\n')}\n`
+                    : '';
+                return `
+## CRITICAL — User Rejection Feedback (MUST ADDRESS)
+
+**YOUR PRIMARY TASK: The user rejected the previous result and gave this feedback. You MUST act on it:**
+
+> ${latest.message}
+
+(Iteration ${latest.iteration}, ${latest.timestamp})
+
+Do NOT just record this feedback — you must actually make the changes the user requested.
+${olderSection}`;
+            }
+        }
+    }
+    catch {
+        // Continue without rejection feedback
+    }
+    return '';
+}
 /**
  * Build the fast-implement prompt from user query + codebase context.
  *
@@ -124,17 +162,19 @@ export function buildFastImplementPrompt(state) {
     const claudeMd = readWorktreeFile(cwd, 'CLAUDE.md');
     const packageJson = readWorktreeFile(cwd, 'package.json');
     const dirListing = buildDirectoryListing(cwd);
+    // Check for rejection feedback from prior merge rejection
+    const rejectionSection = getRejectionFeedback(state.specDir);
     // Build sections conditionally
     const sections = [];
     sections.push(`You are a senior software engineer implementing a change directly from a user request.
-
+${rejectionSection}
 ## User Request
 
 ${userQuery}
 
 ## Implementation Instructions
 
-1. Implement the requested changes in the codebase
+1. ${rejectionSection ? 'Address the rejection feedback above by modifying the existing implementation' : 'Implement the requested changes in the codebase'}
 2. Write tests for your changes where appropriate
 3. Run the test suite and fix any failures
 4. Run the linter and fix any issues