@shepai/cli 1.176.0 → 1.177.0-pr538.aa9ace4

package/dist/eslint.config.mjs

@@ -27,6 +27,8 @@ export default tseslint.config(
     ignores: [
         // Build outputs
         'dist/**',
+        'packages/*/dist/**',
+        'packages/*/release/**',
         'build/**',
         'web/**',
         '**/.next/**',

package/dist/packages/core/src/application/ports/output/services/git-pr-service.interface.d.ts

@@ -381,6 +381,21 @@ export interface IGitPrService {
      * @throws GitPrError with BRANCH_NOT_FOUND code if a branch does not exist
      */
     rebaseOnMain(cwd: string, featureBranch: string, baseBranch: string): Promise<void>;
+    /**
+     * Rebase the feature branch onto `origin/<targetBranch>`.
+     * Fetches the target branch from the remote first to ensure the
+     * remote-tracking ref is up-to-date, then rebases the feature branch
+     * onto it. Similar to {@link rebaseOnMain} but targets an arbitrary
+     * branch instead of the repository's default branch.
+     *
+     * @param cwd - Working directory path
+     * @param featureBranch - The feature branch to rebase
+     * @param targetBranch - The target branch name (rebase target will be origin/<targetBranch>)
+     * @throws GitPrError with GIT_ERROR code if the worktree is dirty
+     * @throws GitPrError with REBASE_CONFLICT code if conflicts are detected
+     * @throws GitPrError with BRANCH_NOT_FOUND code if a branch does not exist
+     */
+    rebaseOnBranch(cwd: string, featureBranch: string, targetBranch: string): Promise<void>;
     /**
      * Get the list of files with unresolved conflicts (unmerged paths).
      * Uses `git diff --name-only --diff-filter=U` to identify conflicted files.

package/dist/packages/core/src/application/ports/output/services/git-pr-service.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-pr-service.interface.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/ports/output/services/git-pr-service.interface.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"git-pr-service.interface.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/ports/output/services/git-pr-service.interface.ts"],"names":[],"mappings":"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"}

package/dist/packages/core/src/application/ports/output/services/i-browser-opener.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Browser Opener Interface
+ *
+ * Output port for opening URLs in the user's default browser.
+ * Infrastructure layer provides concrete implementations:
+ * - BrowserOpenerService — default, uses platform-specific commands (open, xdg-open, cmd start)
+ * - ElectronBrowserOpener — used when running inside Electron (focuses BrowserWindow or shell.openExternal)
+ *
+ * Following Clean Architecture:
+ * - Application layer depends on this interface
+ * - Infrastructure layer provides concrete implementations
+ */
+/**
+ * Port interface for opening URLs in the user's browser or app window.
+ *
+ * Implementations must:
+ * - Handle errors gracefully (log, never throw)
+ * - Degrade gracefully in non-interactive environments (CI, piped I/O)
+ */
+export interface IBrowserOpener {
+    /**
+     * Open a URL in the user's default browser or application window.
+     *
+     * @param url - The URL to open
+     */
+    open(url: string): void;
+}
+//# sourceMappingURL=i-browser-opener.d.ts.map

package/dist/packages/core/src/application/ports/output/services/i-browser-opener.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"i-browser-opener.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/ports/output/services/i-browser-opener.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH;;;;;;GAMG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;OAIG;IACH,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB"}

package/dist/packages/core/src/application/ports/output/services/i-browser-opener.js

@@ -0,0 +1,13 @@
+/**
+ * Browser Opener Interface
+ *
+ * Output port for opening URLs in the user's default browser.
+ * Infrastructure layer provides concrete implementations:
+ * - BrowserOpenerService — default, uses platform-specific commands (open, xdg-open, cmd start)
+ * - ElectronBrowserOpener — used when running inside Electron (focuses BrowserWindow or shell.openExternal)
+ *
+ * Following Clean Architecture:
+ * - Application layer depends on this interface
+ * - Infrastructure layer provides concrete implementations
+ */
+export {};

package/dist/packages/core/src/application/ports/output/services/i-desktop-notifier.d.ts

@@ -0,0 +1,29 @@
+/**
+ * Desktop Notifier Interface
+ *
+ * Output port for sending native OS desktop notifications.
+ * Infrastructure layer provides concrete implementations:
+ * - DesktopNotifier (node-notifier) — default for CLI/web contexts
+ * - ElectronDesktopNotifier — used when running inside Electron
+ *
+ * Following Clean Architecture:
+ * - Application layer depends on this interface
+ * - Infrastructure layer provides concrete implementations
+ */
+/**
+ * Port interface for sending native OS desktop notifications.
+ *
+ * Implementations must:
+ * - Sanitize input to prevent injection (shell metacharacters, length limits)
+ * - Handle errors gracefully (log, never throw)
+ */
+export interface IDesktopNotifier {
+    /**
+     * Send a native OS desktop notification.
+     *
+     * @param title - Notification title
+     * @param body - Notification body text
+     */
+    send(title: string, body: string): void;
+}
+//# sourceMappingURL=i-desktop-notifier.d.ts.map

package/dist/packages/core/src/application/ports/output/services/i-desktop-notifier.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"i-desktop-notifier.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/ports/output/services/i-desktop-notifier.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;OAKG;IACH,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACzC"}

package/dist/packages/core/src/application/ports/output/services/i-desktop-notifier.js

@@ -0,0 +1,13 @@
+/**
+ * Desktop Notifier Interface
+ *
+ * Output port for sending native OS desktop notifications.
+ * Infrastructure layer provides concrete implementations:
+ * - DesktopNotifier (node-notifier) — default for CLI/web contexts
+ * - ElectronDesktopNotifier — used when running inside Electron
+ *
+ * Following Clean Architecture:
+ * - Application layer depends on this interface
+ * - Infrastructure layer provides concrete implementations
+ */
+export {};

package/dist/packages/core/src/application/ports/output/services/index.d.ts

@@ -21,4 +21,6 @@ export type { IGitHubRepositoryService, GitHubRepo, GitHubOrganization, ListUser
 export { GitHubAuthError, GitHubCloneError, GitHubUrlParseError, GitHubRepoListError, } from './github-repository-service.interface.js';
 export type { IInteractiveSessionService, StreamChunk, UnsubscribeFn, ChatState, } from './interactive-session-service.interface.js';
 export type { ISkillInjectorService, SkillInjectionResult } from './skill-injector.interface.js';
+export type { IDesktopNotifier } from './i-desktop-notifier.js';
+export type { IBrowserOpener } from './i-browser-opener.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/packages/core/src/application/ports/output/services/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/ports/output/services/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAClG,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EACV,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,iCAAiC,CAAC;AACzC,YAAY,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,YAAY,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACnF,YAAY,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACjG,YAAY,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAChF,YAAY,EACV,aAAa,EACb,QAAQ,EACR,cAAc,EACd,WAAW,EACX,aAAa,EACb,cAAc,GACf,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC3E,YAAY,EACV,mBAAmB,EACnB,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,eAAe,GAChB,MAAM,qCAAqC,CAAC;AAC7C,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjF,YAAY,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC9F,YAAY,EACV,wBAAwB,EACxB,UAAU,EACV,kBAAkB,EAClB,2BAA2B,EAC3B,YAAY,EACZ,eAAe,GAChB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,0CAA0C,CAAC;AAClD,YAAY,EACV,0BAA0B,EAC1B,WAAW,EACX,aAAa,EACb,SAAS,GACV,MAAM,4CAA4C,CAAC;AACpD,YAAY,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/application/ports/output/services/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAClG,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EACV,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,iCAAiC,CAAC;AACzC,YAAY,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,YAAY,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACnF,YAAY,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACjG,YAAY,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAChF,YAAY,EACV,aAAa,EACb,QAAQ,EACR,cAAc,EACd,WAAW,EACX,aAAa,EACb,cAAc,GACf,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC3E,YAAY,EACV,mBAAmB,EACnB,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,eAAe,GAChB,MAAM,qCAAqC,CAAC;AAC7C,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjF,YAAY,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC9F,YAAY,EACV,wBAAwB,EACxB,UAAU,EACV,kBAAkB,EAClB,2BAA2B,EAC3B,YAAY,EACZ,eAAe,GAChB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,0CAA0C,CAAC;AAClD,YAAY,EACV,0BAA0B,EAC1B,WAAW,EACX,aAAa,EACb,SAAS,GACV,MAAM,4CAA4C,CAAC;AACpD,YAAY,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACjG,YAAY,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/packages/core/src/application/use-cases/features/check-and-unblock-features.use-case.d.ts

@@ -2,8 +2,8 @@
  * CheckAndUnblockFeaturesUseCase
  *
  * Evaluates whether blocked direct children of a parent feature are now
- * eligible to start, and if so transitions them to Started and spawns their
- * agents.
+ * eligible to start, and if so transitions them to Started, rebases their
+ * branches onto the parent branch, and spawns their agents.
  *
  * Business Rules:
  * - Only direct children of parentFeatureId are evaluated (no recursive traversal).
@@ -11,20 +11,63 @@
  * - Gate: parent lifecycle must be in POST_IMPLEMENTATION (Implementation, Review, Maintain).
  * - Idempotent: already-Started children are not touched; calling execute() twice is safe.
  * - spawn() is skipped for children missing agentRunId or specPath (defensive guard).
+ * - Auto-rebase: each blocked child's branch is rebased onto the parent branch
+ *   before spawning the agent. Rebase failures are isolated per-child and recorded
+ *   in the activity timeline. Agent spawns regardless of rebase outcome.
+ * - NFR-3: rebase is skipped if the child has an active (running) agent run.
  *
  * Called from: UpdateFeatureLifecycleUseCase after every lifecycle transition.
  */
 import type { IFeatureRepository } from '../../ports/output/repositories/feature-repository.interface.js';
 import type { IFeatureAgentProcessService } from '../../ports/output/agents/feature-agent-process.interface.js';
+import type { IGitPrService } from '../../ports/output/services/git-pr-service.interface.js';
+import type { IWorktreeService } from '../../ports/output/services/worktree-service.interface.js';
+import type { ConflictResolutionService } from '../../../infrastructure/services/agents/conflict-resolution/conflict-resolution.service.js';
+import type { IAgentRunRepository } from '../../ports/output/agents/agent-run-repository.interface.js';
+import type { IPhaseTimingRepository } from '../../ports/output/agents/phase-timing-repository.interface.js';
 export declare class CheckAndUnblockFeaturesUseCase {
     private readonly featureRepo;
     private readonly agentProcess;
-    constructor(featureRepo: IFeatureRepository, agentProcess: IFeatureAgentProcessService);
+    private readonly gitPrService;
+    private readonly worktreeService;
+    private readonly conflictResolutionService;
+    private readonly agentRunRepo;
+    private readonly phaseTimingRepo;
+    constructor(featureRepo: IFeatureRepository, agentProcess: IFeatureAgentProcessService, gitPrService: IGitPrService, worktreeService: IWorktreeService, conflictResolutionService: ConflictResolutionService, agentRunRepo: IAgentRunRepository, phaseTimingRepo: IPhaseTimingRepository);
     /**
      * Check and unblock direct children of the given parent feature.
      *
      * @param parentFeatureId - ID of the feature whose children should be evaluated.
      */
     execute(parentFeatureId: string): Promise<void>;
+    /**
+     * Rebase a child feature branch onto the parent feature branch.
+     *
+     * Creates an agent run + phase timing for activity timeline tracking.
+     * Stashes uncommitted changes before rebase and restores in finally block.
+     * Delegates to ConflictResolutionService on conflicts.
+     * Failures are recorded but do not prevent agent spawn.
+     *
+     * Skips rebase if the child has an active (running) agent run (NFR-3).
+     */
+    private rebaseChildOntoParent;
+    /**
+     * Perform the rebase with conflict resolution.
+     */
+    private performRebase;
+    /**
+     * Create a timeout promise that rejects after the specified duration.
+     */
+    private createTimeout;
+    /**
+     * Complete the phase timing and update agent run status.
+     */
+    private completeTiming;
+    /**
+     * Resolve the correct working directory for the child feature.
+     * Uses the worktree path if a worktree exists for this branch,
+     * otherwise falls back to the repository root.
+     */
+    private resolveCwd;
 }
 //# sourceMappingURL=check-and-unblock-features.use-case.d.ts.map

package/dist/packages/core/src/application/use-cases/features/check-and-unblock-features.use-case.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"check-and-unblock-features.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/features/check-and-unblock-features.use-case.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iEAAiE,CAAC;AAC1G,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,8DAA8D,CAAC;AAGhH,qBACa,8BAA8B;IAET,OAAO,CAAC,QAAQ,CAAC,WAAW;IAE1D,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFkB,WAAW,EAAE,kBAAkB,EAE7D,YAAY,EAAE,2BAA2B;IAG5D;;;;OAIG;IACG,OAAO,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CA4CtD"}
+{"version":3,"file":"check-and-unblock-features.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/features/check-and-unblock-features.use-case.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAMH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iEAAiE,CAAC;AAC1G,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,8DAA8D,CAAC;AAChH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yDAAyD,CAAC;AAK7F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAClG,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4FAA4F,CAAC;AAC5I,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6DAA6D,CAAC;AACvG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gEAAgE,CAAC;AAM7G,qBACa,8BAA8B;IAET,OAAO,CAAC,QAAQ,CAAC,WAAW;IAE1D,OAAO,CAAC,QAAQ,CAAC,YAAY;IAE7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAE7B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAEhC,OAAO,CAAC,QAAQ,CAAC,yBAAyB;IAE1C,OAAO,CAAC,QAAQ,CAAC,YAAY;IAE7B,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAZe,WAAW,EAAE,kBAAkB,EAE7D,YAAY,EAAE,2BAA2B,EAEzC,YAAY,EAAE,aAAa,EAE3B,eAAe,EAAE,gBAAgB,EAEjC,yBAAyB,EAAE,yBAAyB,EAEpD,YAAY,EAAE,mBAAmB,EAEjC,eAAe,EAAE,sBAAsB;IAG1D;;;;OAIG;IACG,OAAO,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgDrD;;;;;;;;;OASG;YACW,qBAAqB;IAwEnC;;OAEG;YACW,aAAa;IAiB3B;;OAEG;IACH,OAAO,CAAC,aAAa;IAMrB;;OAEG;YACW,cAAc;IAwB5B;;;;OAIG;YACW,UAAU;CAOzB"}

package/dist/packages/core/src/application/use-cases/features/check-and-unblock-features.use-case.js

@@ -2,8 +2,8 @@
  * CheckAndUnblockFeaturesUseCase
  *
  * Evaluates whether blocked direct children of a parent feature are now
- * eligible to start, and if so transitions them to Started and spawns their
- * agents.
+ * eligible to start, and if so transitions them to Started, rebases their
+ * branches onto the parent branch, and spawns their agents.
  *
  * Business Rules:
  * - Only direct children of parentFeatureId are evaluated (no recursive traversal).
@@ -11,6 +11,10 @@
  * - Gate: parent lifecycle must be in POST_IMPLEMENTATION (Implementation, Review, Maintain).
  * - Idempotent: already-Started children are not touched; calling execute() twice is safe.
  * - spawn() is skipped for children missing agentRunId or specPath (defensive guard).
+ * - Auto-rebase: each blocked child's branch is rebased onto the parent branch
+ *   before spawning the agent. Rebase failures are isolated per-child and recorded
+ *   in the activity timeline. Agent spawns regardless of rebase outcome.
+ * - NFR-3: rebase is skipped if the child has an active (running) agent run.
  *
  * Called from: UpdateFeatureLifecycleUseCase after every lifecycle transition.
  */
@@ -27,14 +31,28 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 import { injectable, inject } from 'tsyringe';
-import { SdlcLifecycle } from '../../../domain/generated/output.js';
+import { randomUUID } from 'node:crypto';
+import { SdlcLifecycle, AgentRunStatus, AgentType } from '../../../domain/generated/output.js';
+import { GitPrError, GitPrErrorCode, } from '../../ports/output/services/git-pr-service.interface.js';
 import { POST_IMPLEMENTATION } from '../../../domain/lifecycle-gates.js';
+/** Maximum time (ms) to wait for a single child rebase before aborting. */
+const REBASE_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes
 let CheckAndUnblockFeaturesUseCase = class CheckAndUnblockFeaturesUseCase {
     featureRepo;
     agentProcess;
-    constructor(featureRepo, agentProcess) {
+    gitPrService;
+    worktreeService;
+    conflictResolutionService;
+    agentRunRepo;
+    phaseTimingRepo;
+    constructor(featureRepo, agentProcess, gitPrService, worktreeService, conflictResolutionService, agentRunRepo, phaseTimingRepo) {
         this.featureRepo = featureRepo;
         this.agentProcess = agentProcess;
+        this.gitPrService = gitPrService;
+        this.worktreeService = worktreeService;
+        this.conflictResolutionService = conflictResolutionService;
+        this.agentRunRepo = agentRunRepo;
+        this.phaseTimingRepo = phaseTimingRepo;
     }
     /**
      * Check and unblock direct children of the given parent feature.
@@ -58,6 +76,8 @@ let CheckAndUnblockFeaturesUseCase = class CheckAndUnblockFeaturesUseCase {
             child.lifecycle = SdlcLifecycle.Started;
             child.updatedAt = new Date();
             await this.featureRepo.update(child);
+            // Rebase child branch onto parent branch (isolated per-child)
+            await this.rebaseChildOntoParent(child, parent);
             // Spawn agent using fields set at feature creation time
             if (child.agentRunId && child.specPath) {
                 this.agentProcess.spawn(child.id, child.agentRunId, child.repositoryPath, child.specPath, child.worktreePath, {
@@ -74,11 +94,139 @@ let CheckAndUnblockFeaturesUseCase = class CheckAndUnblockFeaturesUseCase {
             }
         }
     }
+    /**
+     * Rebase a child feature branch onto the parent feature branch.
+     *
+     * Creates an agent run + phase timing for activity timeline tracking.
+     * Stashes uncommitted changes before rebase and restores in finally block.
+     * Delegates to ConflictResolutionService on conflicts.
+     * Failures are recorded but do not prevent agent spawn.
+     *
+     * Skips rebase if the child has an active (running) agent run (NFR-3).
+     */
+    async rebaseChildOntoParent(child, parent) {
+        // NFR-3: skip rebase if child has an active agent run
+        if (child.agentRunId) {
+            const existingRun = await this.agentRunRepo.findById(child.agentRunId);
+            if (existingRun && existingRun.status === AgentRunStatus.running) {
+                return;
+            }
+        }
+        // Create standalone agent run + phase timing for activity timeline
+        const now = new Date().toISOString();
+        const agentRunId = randomUUID();
+        const phaseTimingId = randomUUID();
+        await this.agentRunRepo.create({
+            id: agentRunId,
+            agentType: AgentType.ClaudeCode,
+            agentName: 'rebase',
+            status: AgentRunStatus.running,
+            prompt: `Rebase ${child.branch} onto parent ${parent.branch}`,
+            threadId: agentRunId,
+            startedAt: now,
+            featureId: child.id,
+            repositoryPath: child.repositoryPath,
+            createdAt: now,
+            updatedAt: now,
+        });
+        await this.phaseTimingRepo.save({
+            id: phaseTimingId,
+            agentRunId,
+            phase: 'rebase-on-parent',
+            startedAt: now,
+            createdAt: now,
+            updatedAt: now,
+        });
+        const startMs = Date.now();
+        try {
+            // Resolve CWD — worktree path if it exists, else repo root
+            const cwd = await this.resolveCwd(child.repositoryPath, child.branch);
+            // Stash uncommitted changes (smart rebase)
+            const didStash = await this.gitPrService.stash(cwd, 'shep-rebase: auto-stash before parent rebase');
+            try {
+                // Rebase child branch onto parent branch (with timeout)
+                await Promise.race([
+                    this.performRebase(cwd, child.branch, parent.branch),
+                    this.createTimeout(REBASE_TIMEOUT_MS, child.branch),
+                ]);
+            }
+            finally {
+                // Restore stashed changes (regardless of rebase outcome)
+                if (didStash) {
+                    await this.gitPrService.stashPop(cwd);
+                }
+            }
+            // Rebase succeeded
+            await this.completeTiming(agentRunId, phaseTimingId, startMs, 'success');
+        }
+        catch (error) {
+            // Record failure in activity timeline but do not throw —
+            // agent spawn proceeds regardless of rebase outcome
+            const message = error instanceof Error ? error.message : String(error);
+            await this.completeTiming(agentRunId, phaseTimingId, startMs, 'error', message);
+        }
+    }
+    /**
+     * Perform the rebase with conflict resolution.
+     */
+    async performRebase(cwd, childBranch, parentBranch) {
+        try {
+            await this.gitPrService.rebaseOnBranch(cwd, childBranch, parentBranch);
+        }
+        catch (error) {
+            if (error instanceof GitPrError && error.code === GitPrErrorCode.REBASE_CONFLICT) {
+                // Delegate to agent-powered conflict resolution
+                await this.conflictResolutionService.resolve(cwd, childBranch, parentBranch);
+            }
+            else {
+                throw error;
+            }
+        }
+    }
+    /**
+     * Create a timeout promise that rejects after the specified duration.
+     */
+    createTimeout(ms, childBranch) {
+        return new Promise((_, reject) => {
+            setTimeout(() => reject(new Error(`Rebase timeout: ${childBranch} exceeded ${ms}ms`)), ms);
+        });
+    }
+    /**
+     * Complete the phase timing and update agent run status.
+     */
+    async completeTiming(agentRunId, phaseTimingId, startMs, exitCode, errorMessage) {
+        const completedAt = new Date().toISOString();
+        const durationMs = Date.now() - startMs;
+        await this.phaseTimingRepo.update(phaseTimingId, {
+            completedAt,
+            durationMs: BigInt(durationMs),
+            exitCode,
+            ...(errorMessage && { errorMessage }),
+        });
+        await this.agentRunRepo.updateStatus(agentRunId, exitCode === 'success' ? AgentRunStatus.completed : AgentRunStatus.failed, { completedAt, ...(errorMessage && { error: errorMessage }) });
+    }
+    /**
+     * Resolve the correct working directory for the child feature.
+     * Uses the worktree path if a worktree exists for this branch,
+     * otherwise falls back to the repository root.
+     */
+    async resolveCwd(repositoryPath, branch) {
+        const hasWorktree = await this.worktreeService.exists(repositoryPath, branch);
+        if (hasWorktree) {
+            return this.worktreeService.getWorktreePath(repositoryPath, branch);
+        }
+        return repositoryPath;
+    }
 };
 CheckAndUnblockFeaturesUseCase = __decorate([
     injectable(),
     __param(0, inject('IFeatureRepository')),
     __param(1, inject('IFeatureAgentProcessService')),
-    __metadata("design:paramtypes", [Object, Object])
+    __param(2, inject('IGitPrService')),
+    __param(3, inject('IWorktreeService')),
+    __param(4, inject('ConflictResolutionService')),
+    __param(5, inject('IAgentRunRepository')),
+    __param(6, inject('IPhaseTimingRepository')),
+    __metadata("design:paramtypes", [Object, Object, Object, Object, Function, Object, Object])
 ], CheckAndUnblockFeaturesUseCase);
 export { CheckAndUnblockFeaturesUseCase };

package/dist/packages/core/src/application/use-cases/features/reparent-feature.use-case.d.ts

@@ -0,0 +1,31 @@
+/**
+ * ReparentFeatureUseCase
+ *
+ * Updates a feature's parent dependency (or clears it). Performs validation:
+ * - Same-repository constraint (child and parent must share repositoryPath)
+ * - Cycle detection via upward ancestor walk
+ * - Lifecycle guards (cannot reparent completed/archived/deleting features)
+ * - Lifecycle state adjustment based on new parent's lifecycle
+ *
+ * After reparenting, if the new parent is post-implementation, calls
+ * CheckAndUnblockFeaturesUseCase to trigger the unblock+rebase flow
+ * for any Blocked children of the reparented feature.
+ */
+import type { IFeatureRepository } from '../../ports/output/repositories/feature-repository.interface.js';
+import { CheckAndUnblockFeaturesUseCase } from './check-and-unblock-features.use-case.js';
+export interface ReparentFeatureInput {
+    featureId: string;
+    parentId: string | null;
+}
+export declare class ReparentFeatureUseCase {
+    private readonly featureRepo;
+    private readonly checkAndUnblock;
+    constructor(featureRepo: IFeatureRepository, checkAndUnblock: CheckAndUnblockFeaturesUseCase);
+    execute(input: ReparentFeatureInput): Promise<void>;
+    /**
+     * Walk the ancestor chain from the proposed parent upward.
+     * If the child feature ID is found in the chain, a cycle exists.
+     */
+    private detectCycle;
+}
+//# sourceMappingURL=reparent-feature.use-case.d.ts.map

package/dist/packages/core/src/application/use-cases/features/reparent-feature.use-case.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"reparent-feature.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/features/reparent-feature.use-case.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iEAAiE,CAAC;AAE1G,OAAO,EAAE,8BAA8B,EAAE,MAAM,0CAA0C,CAAC;AAS1F,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,qBACa,sBAAsB;IAG/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAE5B,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAFf,WAAW,EAAE,kBAAkB,EAE/B,eAAe,EAAE,8BAA8B;IAG5D,OAAO,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0EzD;;;OAGG;YACW,WAAW;CAgB1B"}

package/dist/packages/core/src/application/use-cases/features/reparent-feature.use-case.js

@@ -0,0 +1,127 @@
+/**
+ * ReparentFeatureUseCase
+ *
+ * Updates a feature's parent dependency (or clears it). Performs validation:
+ * - Same-repository constraint (child and parent must share repositoryPath)
+ * - Cycle detection via upward ancestor walk
+ * - Lifecycle guards (cannot reparent completed/archived/deleting features)
+ * - Lifecycle state adjustment based on new parent's lifecycle
+ *
+ * After reparenting, if the new parent is post-implementation, calls
+ * CheckAndUnblockFeaturesUseCase to trigger the unblock+rebase flow
+ * for any Blocked children of the reparented feature.
+ */
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+import { injectable, inject } from 'tsyringe';
+import { SdlcLifecycle } from '../../../domain/generated/output.js';
+import { POST_IMPLEMENTATION } from '../../../domain/lifecycle-gates.js';
+import { CheckAndUnblockFeaturesUseCase } from './check-and-unblock-features.use-case.js';
+/** Lifecycle states that cannot be reparented. */
+const NON_REPARENTABLE_STATES = new Set([
+    SdlcLifecycle.Maintain,
+    SdlcLifecycle.Archived,
+    SdlcLifecycle.Deleting,
+]);
+let ReparentFeatureUseCase = class ReparentFeatureUseCase {
+    featureRepo;
+    checkAndUnblock;
+    constructor(featureRepo, checkAndUnblock) {
+        this.featureRepo = featureRepo;
+        this.checkAndUnblock = checkAndUnblock;
+    }
+    async execute(input) {
+        const { featureId, parentId } = input;
+        // Self-reparent guard
+        if (parentId !== null && featureId === parentId) {
+            throw new Error('A feature cannot be set as parent of itself.');
+        }
+        // Load child feature
+        const child = await this.featureRepo.findById(featureId);
+        if (!child) {
+            throw new Error(`Feature not found: ${featureId}`);
+        }
+        // Lifecycle guard — reject completed/terminal features
+        if (NON_REPARENTABLE_STATES.has(child.lifecycle)) {
+            throw new Error(`Cannot reparent feature "${child.name}": lifecycle is ${child.lifecycle}. ` +
+                'Only active features can be reparented.');
+        }
+        // Unparent case
+        if (parentId === null) {
+            const newLifecycle = child.lifecycle === SdlcLifecycle.Blocked ? SdlcLifecycle.Started : child.lifecycle;
+            await this.featureRepo.update({
+                ...child,
+                parentId: undefined,
+                lifecycle: newLifecycle,
+                updatedAt: new Date(),
+            });
+            return;
+        }
+        // Load parent feature
+        const parent = await this.featureRepo.findById(parentId);
+        if (!parent) {
+            throw new Error(`Parent feature not found: ${parentId}`);
+        }
+        // Same-repository constraint
+        if (child.repositoryPath !== parent.repositoryPath) {
+            throw new Error('Features must be in the same repository to form a dependency.');
+        }
+        // Cycle detection — walk from proposed parent upward
+        await this.detectCycle(featureId, parentId);
+        // Determine lifecycle adjustment based on new parent's lifecycle
+        let newLifecycle = child.lifecycle;
+        if (parent.lifecycle === SdlcLifecycle.Blocked || !POST_IMPLEMENTATION.has(parent.lifecycle)) {
+            // Parent is pre-implementation or Blocked — child should be Blocked
+            if (child.lifecycle !== SdlcLifecycle.Blocked && child.lifecycle !== SdlcLifecycle.Pending) {
+                newLifecycle = SdlcLifecycle.Blocked;
+            }
+        }
+        // Persist the reparent
+        await this.featureRepo.update({
+            ...child,
+            parentId,
+            lifecycle: newLifecycle,
+            updatedAt: new Date(),
+        });
+        // If new parent is post-implementation, trigger unblock flow for the
+        // reparented feature's own children (the feature itself may now be a parent
+        // of Blocked children that should be unblocked)
+        if (POST_IMPLEMENTATION.has(parent.lifecycle)) {
+            await this.checkAndUnblock.execute(featureId);
+        }
+    }
+    /**
+     * Walk the ancestor chain from the proposed parent upward.
+     * If the child feature ID is found in the chain, a cycle exists.
+     */
+    async detectCycle(childId, parentId) {
+        const visited = new Set([childId]);
+        let cursor = parentId;
+        while (cursor) {
+            if (visited.has(cursor)) {
+                throw new Error(`Cycle detected in feature dependency chain. ` +
+                    `Setting ${parentId} as parent of ${childId} would create a circular dependency.`);
+            }
+            visited.add(cursor);
+            const ancestor = await this.featureRepo.findById(cursor);
+            cursor = ancestor?.parentId ?? undefined;
+        }
+    }
+};
+ReparentFeatureUseCase = __decorate([
+    injectable(),
+    __param(0, inject('IFeatureRepository')),
+    __param(1, inject(CheckAndUnblockFeaturesUseCase)),
+    __metadata("design:paramtypes", [Object, CheckAndUnblockFeaturesUseCase])
+], ReparentFeatureUseCase);
+export { ReparentFeatureUseCase };

package/dist/packages/core/src/infrastructure/di/container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/infrastructure/di/container.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAyJrC;;;;;;GAMG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,OAAO,SAAS,CAAC,CAucrE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAEhD;AAED;;;GAGG;AACH,OAAO,EAAE,SAAS,EAAE,CAAC"}
+{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/infrastructure/di/container.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AA4JrC;;;;;;GAMG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,OAAO,SAAS,CAAC,CAgdrE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAEhD;AAED;;;GAGG;AACH,OAAO,EAAE,SAAS,EAAE,CAAC"}