@shepai/cli 1.29.1 → 1.31.0

package/dist/packages/core/src/infrastructure/persistence/sqlite/mappers/settings.mapper.js

@@ -51,6 +51,11 @@ export function toDatabase(settings) {
         notif_evt_waiting_approval: settings.notifications.events.waitingApproval ? 1 : 0,
         notif_evt_agent_completed: settings.notifications.events.agentCompleted ? 1 : 0,
         notif_evt_agent_failed: settings.notifications.events.agentFailed ? 1 : 0,
+        // WorkflowConfig (boolean → INTEGER)
+        workflow_open_pr_on_impl_complete: settings.workflow.openPrOnImplementationComplete ? 1 : 0,
+        workflow_auto_merge_on_impl_complete: settings.workflow.autoMergeOnImplementationComplete
+            ? 1
+            : 0,
     };
 }
 /**
@@ -108,5 +113,10 @@ export function fromDatabase(row) {
                 agentFailed: row.notif_evt_agent_failed === 1,
             },
         },
+        // WorkflowConfig (INTEGER → boolean)
+        workflow: {
+            openPrOnImplementationComplete: row.workflow_open_pr_on_impl_complete === 1,
+            autoMergeOnImplementationComplete: row.workflow_auto_merge_on_impl_complete === 1,
+        },
     };
 }

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/persistence/sqlite/migrations.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AA0K3C;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAuB9E"}
+{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/persistence/sqlite/migrations.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAqM3C;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAuB9E"}

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations.js

@@ -163,6 +163,33 @@ ALTER TABLE settings ADD COLUMN notif_evt_phase_completed INTEGER NOT NULL DEFAU
 ALTER TABLE settings ADD COLUMN notif_evt_waiting_approval INTEGER NOT NULL DEFAULT 1;
 ALTER TABLE settings ADD COLUMN notif_evt_agent_completed INTEGER NOT NULL DEFAULT 1;
 ALTER TABLE settings ADD COLUMN notif_evt_agent_failed INTEGER NOT NULL DEFAULT 1;
+`,
+    },
+    {
+        version: 10,
+        sql: `
+-- Migration 010: Add workflow flags, PR tracking to features; workflow config to settings; lifecycle migration
+
+-- Workflow configuration flags on features
+ALTER TABLE features ADD COLUMN open_pr INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE features ADD COLUMN auto_merge INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE features ADD COLUMN allow_prd INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE features ADD COLUMN allow_plan INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE features ADD COLUMN allow_merge INTEGER NOT NULL DEFAULT 0;
+
+-- PR tracking state on features
+ALTER TABLE features ADD COLUMN pr_url TEXT;
+ALTER TABLE features ADD COLUMN pr_number INTEGER;
+ALTER TABLE features ADD COLUMN pr_status TEXT;
+ALTER TABLE features ADD COLUMN commit_hash TEXT;
+ALTER TABLE features ADD COLUMN ci_status TEXT;
+
+-- Workflow defaults on settings
+ALTER TABLE settings ADD COLUMN workflow_open_pr_on_impl_complete INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE settings ADD COLUMN workflow_auto_merge_on_impl_complete INTEGER NOT NULL DEFAULT 0;
+
+-- Migrate existing features with DeployAndQA lifecycle to Maintain
+UPDATE features SET lifecycle = 'Maintain' WHERE lifecycle = 'Deploy & QA';
 `,
     },
 ];

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;;;;;GAKG;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;IAkBvC,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;IAWzE,IAAI,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAqBtD,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBvC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAIxC"}
+{"version":3,"file":"sqlite-feature.repository.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/infrastructure/repositories/sqlite-feature.repository.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;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;IAwBvC,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;IAWzE,IAAI,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAqBtD,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAiCvC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAIxC"}

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

@@ -30,11 +30,17 @@ let SQLiteFeatureRepository = class SQLiteFeatureRepository {
       INSERT INTO features (
         id, name, slug, description, repository_path, branch,
         lifecycle, messages, plan, related_artifacts,
-        agent_run_id, spec_path, created_at, updated_at
+        agent_run_id, spec_path,
+        open_pr, auto_merge, allow_prd, allow_plan, allow_merge,
+        pr_url, pr_number, pr_status, commit_hash, ci_status,
+        created_at, updated_at
       ) VALUES (
         @id, @name, @slug, @description, @repository_path, @branch,
         @lifecycle, @messages, @plan, @related_artifacts,
-        @agent_run_id, @spec_path, @created_at, @updated_at
+        @agent_run_id, @spec_path,
+        @open_pr, @auto_merge, @allow_prd, @allow_plan, @allow_merge,
+        @pr_url, @pr_number, @pr_status, @commit_hash, @ci_status,
+        @created_at, @updated_at
       )
     `);
         stmt.run(row);
@@ -96,6 +102,16 @@ let SQLiteFeatureRepository = class SQLiteFeatureRepository {
         related_artifacts = @related_artifacts,
         agent_run_id = @agent_run_id,
         spec_path = @spec_path,
+        open_pr = @open_pr,
+        auto_merge = @auto_merge,
+        allow_prd = @allow_prd,
+        allow_plan = @allow_plan,
+        allow_merge = @allow_merge,
+        pr_url = @pr_url,
+        pr_number = @pr_number,
+        pr_status = @pr_status,
+        commit_hash = @commit_hash,
+        ci_status = @ci_status,
         updated_at = @updated_at
       WHERE id = @id
     `);

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

@@ -1 +1 @@
-{"version":3,"file":"sqlite-settings.repository.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/infrastructure/repositories/sqlite-settings.repository.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8EAA8E,CAAC;AACxH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAOjE;;;GAGG;AACH,qBACa,wBAAyB,YAAW,mBAAmB;IACtD,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,QAAQ,CAAC,QAAQ;IAElD;;;;;;OAMG;IACG,UAAU,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCnD;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAgBtC;;;;;OAKG;IACG,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAgDhD"}
+{"version":3,"file":"sqlite-settings.repository.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/infrastructure/repositories/sqlite-settings.repository.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8EAA8E,CAAC;AACxH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAOjE;;;GAGG;AACH,qBACa,wBAAyB,YAAW,mBAAmB;IACtD,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,QAAQ,CAAC,QAAQ;IAElD;;;;;;OAMG;IACG,UAAU,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAyCnD;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAgBtC;;;;;OAKG;IACG,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAkDhD"}

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

@@ -51,7 +51,8 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         agent_type, agent_auth_method, agent_token,
         notif_in_app_enabled, notif_browser_enabled, notif_desktop_enabled,
         notif_evt_agent_started, notif_evt_phase_completed, notif_evt_waiting_approval,
-        notif_evt_agent_completed, notif_evt_agent_failed
+        notif_evt_agent_completed, notif_evt_agent_failed,
+        workflow_open_pr_on_impl_complete, workflow_auto_merge_on_impl_complete
       ) VALUES (
         @id, @created_at, @updated_at,
         @model_analyze, @model_requirements, @model_plan, @model_implement,
@@ -61,7 +62,8 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         @agent_type, @agent_auth_method, @agent_token,
         @notif_in_app_enabled, @notif_browser_enabled, @notif_desktop_enabled,
         @notif_evt_agent_started, @notif_evt_phase_completed, @notif_evt_waiting_approval,
-        @notif_evt_agent_completed, @notif_evt_agent_failed
+        @notif_evt_agent_completed, @notif_evt_agent_failed,
+        @workflow_open_pr_on_impl_complete, @workflow_auto_merge_on_impl_complete
       )
     `);
         // Execute with named parameters (safe from SQL injection)
@@ -124,7 +126,9 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         notif_evt_phase_completed = @notif_evt_phase_completed,
         notif_evt_waiting_approval = @notif_evt_waiting_approval,
         notif_evt_agent_completed = @notif_evt_agent_completed,
-        notif_evt_agent_failed = @notif_evt_agent_failed
+        notif_evt_agent_failed = @notif_evt_agent_failed,
+        workflow_open_pr_on_impl_complete = @workflow_open_pr_on_impl_complete,
+        workflow_auto_merge_on_impl_complete = @workflow_auto_merge_on_impl_complete
       WHERE id = @id
     `);
         // Execute with named parameters (safe from SQL injection)

package/dist/packages/core/src/infrastructure/services/agents/common/executors/claude-code-executor.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-code-executor.service.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/common/executors/claude-code-executor.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzF,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EACrB,oBAAoB,EACpB,yBAAyB,EAC1B,MAAM,4EAA4E,CAAC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAUjD;;;GAGG;AACH,qBAAa,yBAA0B,YAAW,cAAc;IAMlD,OAAO,CAAC,QAAQ,CAAC,KAAK;IALlC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAA8B;IAE3D,4EAA4E;IAC5E,OAAO,CAAC,MAAM,CAAS;gBAEM,KAAK,EAAE,aAAa;IAEjD,4EAA4E;IAC5E,OAAO,CAAC,GAAG;IAML,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAmHtF,aAAa,CAClB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,qBAAqB,GAC9B,aAAa,CAAC,yBAAyB,CAAC;IA+F3C;;;OAGG;IACH,OAAO,CAAC,cAAc;IAmCtB,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO;IAI/C,OAAO,CAAC,SAAS;IAajB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,eAAe;IAiCvB,OAAO,CAAC,eAAe;CAkExB"}
+{"version":3,"file":"claude-code-executor.service.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/common/executors/claude-code-executor.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzF,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EACrB,oBAAoB,EACpB,yBAAyB,EAC1B,MAAM,4EAA4E,CAAC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAUjD;;;GAGG;AACH,qBAAa,yBAA0B,YAAW,cAAc;IAMlD,OAAO,CAAC,QAAQ,CAAC,KAAK;IALlC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAA8B;IAE3D,4EAA4E;IAC5E,OAAO,CAAC,MAAM,CAAS;gBAEM,KAAK,EAAE,aAAa;IAEjD,4EAA4E;IAC5E,OAAO,CAAC,GAAG;IAML,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAmHtF,aAAa,CAClB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,qBAAqB,GAC9B,aAAa,CAAC,yBAAyB,CAAC;IA+F3C;;;OAGG;IACH,OAAO,CAAC,cAAc;IAmCtB,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO;IAI/C,OAAO,CAAC,SAAS;IAajB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,eAAe;IAiCvB,OAAO,CAAC,eAAe;CAkExB"}

package/dist/packages/core/src/infrastructure/services/agents/common/executors/claude-code-executor.service.js

@@ -289,6 +289,11 @@ export class ClaudeCodeExecutorService {
         const spawnOpts = {};
         if (options?.cwd)
             spawnOpts.cwd = options.cwd;
+        // Strip CLAUDECODE env var to prevent "nested session" error when shep
+        // is invoked from within a Claude Code session. The claude CLI checks for
+        // this variable and refuses to start if it's set.
+        const { CLAUDECODE: _, ...cleanEnv } = process.env;
+        spawnOpts.env = cleanEnv;
         return spawnOpts;
     }
     parseJsonResult(stdout) {

package/dist/packages/core/src/infrastructure/services/agents/common/executors/cursor-executor.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cursor-executor.service.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/common/executors/cursor-executor.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzF,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EACrB,oBAAoB,EACpB,yBAAyB,EAC1B,MAAM,4EAA4E,CAAC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD;;;GAGG;AACH,qBAAa,qBAAsB,YAAW,cAAc;IAM9C,OAAO,CAAC,QAAQ,CAAC,KAAK;IALlC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAyB;IAEtD,4EAA4E;IAC5E,OAAO,CAAC,MAAM,CAAS;gBAEM,KAAK,EAAE,aAAa;IAEjD,4EAA4E;IAC5E,OAAO,CAAC,GAAG;IAMX,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO;IAIzC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAkGtF,aAAa,CAClB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,qBAAqB,GAC9B,aAAa,CAAC,yBAAyB,CAAC;IA8E3C;;OAEG;IACH,OAAO,CAAC,cAAc;IAkCtB,OAAO,CAAC,SAAS;IASjB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,eAAe;CAgDxB"}
+{"version":3,"file":"cursor-executor.service.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/common/executors/cursor-executor.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzF,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EACrB,oBAAoB,EACpB,yBAAyB,EAC1B,MAAM,4EAA4E,CAAC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD;;;GAGG;AACH,qBAAa,qBAAsB,YAAW,cAAc;IAM9C,OAAO,CAAC,QAAQ,CAAC,KAAK;IALlC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAyB;IAEtD,4EAA4E;IAC5E,OAAO,CAAC,MAAM,CAAS;gBAEM,KAAK,EAAE,aAAa;IAEjD,4EAA4E;IAC5E,OAAO,CAAC,GAAG;IAMX,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO;IAIzC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAkGtF,aAAa,CAClB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,qBAAqB,GAC9B,aAAa,CAAC,yBAAyB,CAAC;IA8E3C;;OAEG;IACH,OAAO,CAAC,cAAc;IAkCtB,OAAO,CAAC,SAAS;IASjB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,eAAe;CAgDxB"}

package/dist/packages/core/src/infrastructure/services/agents/common/executors/cursor-executor.service.js

@@ -249,6 +249,10 @@ export class CursorExecutorService {
         const spawnOpts = {};
         if (options?.cwd)
             spawnOpts.cwd = options.cwd;
+        // Strip CLAUDECODE env var to prevent "nested session" error when shep
+        // is invoked from within a Claude Code session.
+        const { CLAUDECODE: _, ...cleanEnv } = process.env;
+        spawnOpts.env = cleanEnv;
         return spawnOpts;
     }
     parseStreamLine(line) {

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

@@ -1,20 +1,29 @@
 import { type BaseCheckpointSaver } from '@langchain/langgraph';
 import type { IAgentExecutor } from '../../../../application/ports/output/agents/agent-executor.interface.js';
+import { type MergeNodeDeps } from './nodes/merge.node.js';
 export { FeatureAgentAnnotation, type FeatureAgentState } from './state.js';
+/**
+ * Dependencies needed to build the feature agent graph.
+ * Injected by the worker so the graph factory stays testable.
+ */
+export interface FeatureAgentGraphDeps {
+    executor: IAgentExecutor;
+    mergeNodeDeps: MergeNodeDeps;
+}
 /**
  * Factory function that creates and compiles the feature-agent LangGraph.
  *
  * The graph defines a linear SDLC workflow with validation gates:
- *   analyze → validate → requirements → validate → research → validate → plan → validate → implement
+ *   analyze → validate → requirements → validate → research → validate → plan → validate → implement → merge
  *
  * Each YAML-producing node is followed by a validate/repair loop that ensures
  * the output YAML conforms to its schema before proceeding.
  *
- * @param executor - The agent executor to delegate prompt execution to
+ * @param depsOrExecutor - Graph dependencies or a legacy executor
  * @param checkpointer - Optional checkpoint saver for state persistence
  * @returns A compiled LangGraph ready to be invoked
  */
-export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkpointer?: BaseCheckpointSaver): import("@langchain/langgraph").CompiledStateGraph<{
+export declare function createFeatureAgentGraph(depsOrExecutor: FeatureAgentGraphDeps | IAgentExecutor, checkpointer?: BaseCheckpointSaver): import("@langchain/langgraph").CompiledStateGraph<{
     featureId: string;
     repositoryPath: string;
     specDir: string;
@@ -26,6 +35,14 @@ export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkp
     validationRetries: number;
     lastValidationTarget: string;
     lastValidationErrors: string[];
+    prUrl: string | null;
+    prNumber: number | null;
+    commitHash: string | null;
+    ciStatus: string | null;
+    push: boolean;
+    openPr: boolean;
+    autoMerge: boolean;
+    allowMerge: boolean;
 }, {
     featureId?: string | undefined;
     repositoryPath?: string | undefined;
@@ -38,6 +55,14 @@ export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkp
     validationRetries?: number | undefined;
     lastValidationTarget?: string | undefined;
     lastValidationErrors?: string[] | undefined;
+    prUrl?: string | null | undefined;
+    prNumber?: number | null | undefined;
+    commitHash?: string | null | undefined;
+    ciStatus?: string | null | undefined;
+    push?: boolean | undefined;
+    openPr?: boolean | undefined;
+    autoMerge?: boolean | undefined;
+    allowMerge?: boolean | undefined;
 }, "__start__" | "analyze" | "requirements" | "plan" | "implement" | "research" | "validate_spec_analyze" | "validate_spec_requirements" | "validate_research" | "validate_plan_tasks" | "repair_spec_analyze" | "repair_spec_requirements" | "repair_research" | "repair_plan_tasks", {
     featureId: {
         (): import("@langchain/langgraph").LastValue<string>;
@@ -70,6 +95,14 @@ export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkp
     validationRetries: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
     lastValidationTarget: import("@langchain/langgraph").BinaryOperatorAggregate<string, string>;
     lastValidationErrors: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
+    prUrl: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+    prNumber: import("@langchain/langgraph").BinaryOperatorAggregate<number | null, number | null>;
+    commitHash: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+    ciStatus: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+    push: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+    openPr: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+    autoMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+    allowMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
 }, {
     featureId: {
         (): import("@langchain/langgraph").LastValue<string>;
@@ -102,6 +135,14 @@ export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkp
     validationRetries: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
     lastValidationTarget: import("@langchain/langgraph").BinaryOperatorAggregate<string, string>;
     lastValidationErrors: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
+    prUrl: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+    prNumber: import("@langchain/langgraph").BinaryOperatorAggregate<number | null, number | null>;
+    commitHash: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+    ciStatus: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+    push: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+    openPr: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+    autoMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+    allowMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
 }, import("@langchain/langgraph").StateDefinition, {
     analyze: Partial<import("@langchain/langgraph").StateType<{
         featureId: {
@@ -135,6 +176,14 @@ export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkp
         validationRetries: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
         lastValidationTarget: import("@langchain/langgraph").BinaryOperatorAggregate<string, string>;
         lastValidationErrors: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
+        prUrl: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        prNumber: import("@langchain/langgraph").BinaryOperatorAggregate<number | null, number | null>;
+        commitHash: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        ciStatus: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        push: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        openPr: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        autoMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        allowMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
     }>>;
     requirements: Partial<import("@langchain/langgraph").StateType<{
         featureId: {
@@ -168,6 +217,14 @@ export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkp
         validationRetries: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
         lastValidationTarget: import("@langchain/langgraph").BinaryOperatorAggregate<string, string>;
         lastValidationErrors: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
+        prUrl: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        prNumber: import("@langchain/langgraph").BinaryOperatorAggregate<number | null, number | null>;
+        commitHash: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        ciStatus: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        push: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        openPr: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        autoMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        allowMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
     }>>;
     research: Partial<import("@langchain/langgraph").StateType<{
         featureId: {
@@ -201,6 +258,14 @@ export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkp
         validationRetries: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
         lastValidationTarget: import("@langchain/langgraph").BinaryOperatorAggregate<string, string>;
         lastValidationErrors: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
+        prUrl: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        prNumber: import("@langchain/langgraph").BinaryOperatorAggregate<number | null, number | null>;
+        commitHash: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        ciStatus: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        push: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        openPr: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        autoMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        allowMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
     }>>;
     plan: Partial<import("@langchain/langgraph").StateType<{
         featureId: {
@@ -234,6 +299,14 @@ export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkp
         validationRetries: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
         lastValidationTarget: import("@langchain/langgraph").BinaryOperatorAggregate<string, string>;
         lastValidationErrors: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
+        prUrl: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        prNumber: import("@langchain/langgraph").BinaryOperatorAggregate<number | null, number | null>;
+        commitHash: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        ciStatus: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        push: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        openPr: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        autoMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        allowMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
     }>>;
     implement: Partial<import("@langchain/langgraph").StateType<{
         featureId: {
@@ -267,6 +340,14 @@ export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkp
         validationRetries: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
         lastValidationTarget: import("@langchain/langgraph").BinaryOperatorAggregate<string, string>;
         lastValidationErrors: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
+        prUrl: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        prNumber: import("@langchain/langgraph").BinaryOperatorAggregate<number | null, number | null>;
+        commitHash: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        ciStatus: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        push: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        openPr: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        autoMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        allowMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
     }>>;
     validate_spec_analyze: Partial<import("@langchain/langgraph").StateType<{
         featureId: {
@@ -300,6 +381,14 @@ export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkp
         validationRetries: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
         lastValidationTarget: import("@langchain/langgraph").BinaryOperatorAggregate<string, string>;
         lastValidationErrors: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
+        prUrl: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        prNumber: import("@langchain/langgraph").BinaryOperatorAggregate<number | null, number | null>;
+        commitHash: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        ciStatus: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        push: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        openPr: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        autoMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        allowMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
     }>>;
     validate_spec_requirements: Partial<import("@langchain/langgraph").StateType<{
         featureId: {
@@ -333,6 +422,14 @@ export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkp
         validationRetries: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
         lastValidationTarget: import("@langchain/langgraph").BinaryOperatorAggregate<string, string>;
         lastValidationErrors: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
+        prUrl: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        prNumber: import("@langchain/langgraph").BinaryOperatorAggregate<number | null, number | null>;
+        commitHash: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        ciStatus: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        push: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        openPr: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        autoMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        allowMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
     }>>;
     validate_research: Partial<import("@langchain/langgraph").StateType<{
         featureId: {
@@ -366,6 +463,14 @@ export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkp
         validationRetries: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
         lastValidationTarget: import("@langchain/langgraph").BinaryOperatorAggregate<string, string>;
         lastValidationErrors: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
+        prUrl: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        prNumber: import("@langchain/langgraph").BinaryOperatorAggregate<number | null, number | null>;
+        commitHash: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        ciStatus: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        push: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        openPr: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        autoMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        allowMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
     }>>;
     validate_plan_tasks: Partial<import("@langchain/langgraph").StateType<{
         featureId: {
@@ -399,6 +504,14 @@ export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkp
         validationRetries: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
         lastValidationTarget: import("@langchain/langgraph").BinaryOperatorAggregate<string, string>;
         lastValidationErrors: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
+        prUrl: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        prNumber: import("@langchain/langgraph").BinaryOperatorAggregate<number | null, number | null>;
+        commitHash: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        ciStatus: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        push: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        openPr: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        autoMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        allowMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
     }>>;
     repair_spec_analyze: Partial<import("@langchain/langgraph").StateType<{
         featureId: {
@@ -432,6 +545,14 @@ export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkp
         validationRetries: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
         lastValidationTarget: import("@langchain/langgraph").BinaryOperatorAggregate<string, string>;
         lastValidationErrors: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
+        prUrl: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        prNumber: import("@langchain/langgraph").BinaryOperatorAggregate<number | null, number | null>;
+        commitHash: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        ciStatus: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        push: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        openPr: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        autoMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        allowMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
     }>>;
     repair_spec_requirements: Partial<import("@langchain/langgraph").StateType<{
         featureId: {
@@ -465,6 +586,14 @@ export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkp
         validationRetries: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
         lastValidationTarget: import("@langchain/langgraph").BinaryOperatorAggregate<string, string>;
         lastValidationErrors: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
+        prUrl: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        prNumber: import("@langchain/langgraph").BinaryOperatorAggregate<number | null, number | null>;
+        commitHash: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        ciStatus: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        push: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        openPr: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        autoMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        allowMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
     }>>;
     repair_research: Partial<import("@langchain/langgraph").StateType<{
         featureId: {
@@ -498,6 +627,14 @@ export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkp
         validationRetries: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
         lastValidationTarget: import("@langchain/langgraph").BinaryOperatorAggregate<string, string>;
         lastValidationErrors: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
+        prUrl: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        prNumber: import("@langchain/langgraph").BinaryOperatorAggregate<number | null, number | null>;
+        commitHash: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        ciStatus: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        push: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        openPr: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        autoMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        allowMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
     }>>;
     repair_plan_tasks: Partial<import("@langchain/langgraph").StateType<{
         featureId: {
@@ -531,6 +668,14 @@ export declare function createFeatureAgentGraph(executor: IAgentExecutor, checkp
         validationRetries: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
         lastValidationTarget: import("@langchain/langgraph").BinaryOperatorAggregate<string, string>;
         lastValidationErrors: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
+        prUrl: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        prNumber: import("@langchain/langgraph").BinaryOperatorAggregate<number | null, number | null>;
+        commitHash: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        ciStatus: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+        push: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        openPr: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        autoMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
+        allowMerge: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
     }>>;
 }, unknown, unknown>;
 //# sourceMappingURL=feature-agent-graph.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"feature-agent-graph.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/feature-agent-graph.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AAepG,OAAO,EAAE,sBAAsB,EAAE,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAuG5E;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,cAAc,EACxB,YAAY,CAAC,EAAE,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBAoDnC"}
+{"version":3,"file":"feature-agent-graph.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/feature-agent-graph.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AAOpG,OAAO,EAAmB,KAAK,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAS5E,OAAO,EAAE,sBAAsB,EAAE,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE5E;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,cAAc,CAAC;IACzB,aAAa,EAAE,aAAa,CAAC;CAC9B;AAuGD;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,qBAAqB,GAAG,cAAc,EACtD,YAAY,CAAC,EAAE,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBAmEnC"}

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

@@ -5,6 +5,7 @@ import { createRequirementsNode } from './nodes/requirements.node.js';
 import { createResearchNode } from './nodes/research.node.js';
 import { createPlanNode } from './nodes/plan.node.js';
 import { createImplementNode } from './nodes/implement.node.js';
+import { createMergeNode } from './nodes/merge.node.js';
 import { createValidateNode } from './nodes/validate.node.js';
 import { createRepairNode } from './nodes/repair.node.js';
 import { validateSpecAnalyze, validateSpecRequirements } from './nodes/schemas/spec.schema.js';
@@ -107,16 +108,21 @@ function createPlanTasksValidator() {
  * Factory function that creates and compiles the feature-agent LangGraph.
  *
  * The graph defines a linear SDLC workflow with validation gates:
- *   analyze → validate → requirements → validate → research → validate → plan → validate → implement
+ *   analyze → validate → requirements → validate → research → validate → plan → validate → implement → merge
  *
  * Each YAML-producing node is followed by a validate/repair loop that ensures
  * the output YAML conforms to its schema before proceeding.
  *
- * @param executor - The agent executor to delegate prompt execution to
+ * @param depsOrExecutor - Graph dependencies or a legacy executor
  * @param checkpointer - Optional checkpoint saver for state persistence
  * @returns A compiled LangGraph ready to be invoked
  */
-export function createFeatureAgentGraph(executor, checkpointer) {
+export function createFeatureAgentGraph(depsOrExecutor, checkpointer) {
+    // Support legacy signature: createFeatureAgentGraph(executor, checkpointer)
+    const deps = 'execute' in depsOrExecutor
+        ? { executor: depsOrExecutor, mergeNodeDeps: undefined }
+        : depsOrExecutor;
+    const { executor } = deps;
     const graph = new StateGraph(FeatureAgentAnnotation)
         // --- Producer nodes ---
         .addNode('analyze', createAnalyzeNode(executor))
@@ -147,7 +153,16 @@ export function createFeatureAgentGraph(executor, checkpointer) {
         .addEdge('repair_research', 'validate_research')
         .addEdge('plan', 'validate_plan_tasks')
         .addConditionalEdges('validate_plan_tasks', routeValidation('implement', 'repair_plan_tasks'))
-        .addEdge('repair_plan_tasks', 'validate_plan_tasks')
-        .addEdge('implement', END);
+        .addEdge('repair_plan_tasks', 'validate_plan_tasks');
+    // --- Merge node: wired when deps are provided ---
+    if (deps.mergeNodeDeps) {
+        graph
+            .addNode('merge', createMergeNode(deps.mergeNodeDeps))
+            .addEdge('implement', 'merge')
+            .addEdge('merge', END);
+    }
+    else {
+        graph.addEdge('implement', END);
+    }
     return graph.compile({ checkpointer });
 }

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/feature-agent-process.service.d.ts

@@ -16,6 +16,10 @@ export declare class FeatureAgentProcessService implements IFeatureAgentProcessS
         resume?: boolean;
         threadId?: string;
         resumeFromInterrupt?: boolean;
+        push?: boolean;
+        openPr?: boolean;
+        autoMerge?: boolean;
+        allowMerge?: boolean;
     }): number;
     isAlive(pid: number): boolean;
     checkAndMarkCrashed(runId: string): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"feature-agent-process.service.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/feature-agent-process.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AASH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sEAAsE,CAAC;AACxH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qEAAqE,CAAC;AAC/G,OAAO,EAAkB,KAAK,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAYlF,qBAAa,0BAA2B,YAAW,2BAA2B;IAChE,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,mBAAmB;IAE/D,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,YAAY,CAAC,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE;QACR,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;KAC/B,GACA,MAAM;IAkDT,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IASvB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAexD"}
+{"version":3,"file":"feature-agent-process.service.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/feature-agent-process.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AASH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sEAAsE,CAAC;AACxH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qEAAqE,CAAC;AAC/G,OAAO,EAAkB,KAAK,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAYlF,qBAAa,0BAA2B,YAAW,2BAA2B;IAChE,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,mBAAmB;IAE/D,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,YAAY,CAAC,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE;QACR,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,IAAI,CAAC,EAAE,OAAO,CAAC;QACf,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB,GACA,MAAM;IA8DT,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IASvB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAexD"}

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

@@ -53,6 +53,18 @@ export class FeatureAgentProcessService {
         if (options?.resumeFromInterrupt) {
             args.push('--resume-from-interrupt');
         }
+        if (options?.push) {
+            args.push('--push');
+        }
+        if (options?.openPr) {
+            args.push('--open-pr');
+        }
+        if (options?.autoMerge) {
+            args.push('--auto-merge');
+        }
+        if (options?.allowMerge) {
+            args.push('--allow-merge');
+        }
         // Create log file for worker output (for debugging)
         const logsDir = join(homedir(), '.shep', 'logs');
         mkdirSync(logsDir, { recursive: true });

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

@@ -20,6 +20,10 @@ export interface WorkerArgs {
     resume?: boolean;
     threadId?: string;
     resumeFromInterrupt?: boolean;
+    push?: boolean;
+    openPr?: boolean;
+    autoMerge?: boolean;
+    allowMerge?: boolean;
 }
 /**
  * Parse CLI arguments into a WorkerArgs object.

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;AAgB1B,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;CAC/B;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CA0C1D;AAgCD;;;GAGG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAsI/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;AAoB1B,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,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAkD1D;AAgCD;;;GAGG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA2J/D"}