@shepai/cli 1.136.0-pr396.e077930 → 1.136.0-pr440.bb6800a

package/dist/packages/core/src/infrastructure/di/container.js

@@ -83,11 +83,9 @@ import { ListGitHubRepositoriesUseCase } from '../../application/use-cases/repos
 import { CheckAndUnblockFeaturesUseCase } from '../../application/use-cases/features/check-and-unblock-features.use-case.js';
 import { UpdateFeatureLifecycleUseCase } from '../../application/use-cases/features/update/update-feature-lifecycle.use-case.js';
 import { CleanupFeatureWorktreeUseCase } from '../../application/use-cases/features/cleanup-feature-worktree.use-case.js';
+import { ArchiveFeatureUseCase } from '../../application/use-cases/features/archive-feature.use-case.js';
+import { UnarchiveFeatureUseCase } from '../../application/use-cases/features/unarchive-feature.use-case.js';
 import { UpgradeCliUseCase } from '../../application/use-cases/upgrade/upgrade-cli.use-case.js';
-import { SyncRepositoryMainUseCase } from '../../application/use-cases/repositories/sync-repository-main.use-case.js';
-import { RebaseFeatureOnMainUseCase } from '../../application/use-cases/features/rebase-feature-on-main.use-case.js';
-import { GetBranchSyncStatusUseCase } from '../../application/use-cases/features/get-branch-sync-status.use-case.js';
-import { ConflictResolutionService } from '../services/agents/conflict-resolution/conflict-resolution.service.js';
 // Session listing
 import { ClaudeCodeSessionRepository } from '../services/agents/sessions/claude-code-session.repository.js';
 import { StubSessionRepository } from '../services/agents/sessions/stub-session.repository.js';
@@ -308,14 +306,9 @@ export async function initializeContainer() {
     container.registerSingleton(CheckAndUnblockFeaturesUseCase);
     container.registerSingleton(UpdateFeatureLifecycleUseCase);
     container.registerSingleton(CleanupFeatureWorktreeUseCase);
+    container.registerSingleton(ArchiveFeatureUseCase);
+    container.registerSingleton(UnarchiveFeatureUseCase);
     container.registerSingleton(UpgradeCliUseCase);
-    container.registerSingleton(ConflictResolutionService);
-    container.register('ConflictResolutionService', {
-        useFactory: (c) => c.resolve(ConflictResolutionService),
-    });
-    container.registerSingleton(SyncRepositoryMainUseCase);
-    container.registerSingleton(RebaseFeatureOnMainUseCase);
-    container.registerSingleton(GetBranchSyncStatusUseCase);
     // Session repositories (per-AgentType string tokens)
     container.register(`IAgentSessionRepository:${AgentType.ClaudeCode}`, {
         useFactory: () => new ClaudeCodeSessionRepository(),
@@ -412,17 +405,14 @@ export async function initializeContainer() {
     container.register('CleanupFeatureWorktreeUseCase', {
         useFactory: (c) => c.resolve(CleanupFeatureWorktreeUseCase),
     });
-    container.register('UpgradeCliUseCase', {
-        useFactory: (c) => c.resolve(UpgradeCliUseCase),
-    });
-    container.register('SyncRepositoryMainUseCase', {
-        useFactory: (c) => c.resolve(SyncRepositoryMainUseCase),
+    container.register('ArchiveFeatureUseCase', {
+        useFactory: (c) => c.resolve(ArchiveFeatureUseCase),
     });
-    container.register('RebaseFeatureOnMainUseCase', {
-        useFactory: (c) => c.resolve(RebaseFeatureOnMainUseCase),
+    container.register('UnarchiveFeatureUseCase', {
+        useFactory: (c) => c.resolve(UnarchiveFeatureUseCase),
     });
-    container.register('GetBranchSyncStatusUseCase', {
-        useFactory: (c) => c.resolve(GetBranchSyncStatusUseCase),
+    container.register('UpgradeCliUseCase', {
+        useFactory: (c) => c.resolve(UpgradeCliUseCase),
     });
     _initialized = true;
     return container;

package/dist/packages/core/src/infrastructure/persistence/sqlite/mappers/feature.mapper.d.ts

@@ -50,6 +50,7 @@ export interface FeatureRow {
     ci_fix_history: string | null;
     pr_mergeable: number | null;
     parent_id: string | null;
+    previous_lifecycle: string | null;
     attachments: string;
     deleted_at: number | null;
     created_at: number;

package/dist/packages/core/src/infrastructure/persistence/sqlite/mappers/feature.mapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature.mapper.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/persistence/sqlite/mappers/feature.mapper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wCAAwC,CAAC;AAGtE;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAEzB,IAAI,EAAE,MAAM,CAAC;IAEb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAE7B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAE7B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAEzB,WAAW,EAAE,MAAM,CAAC;IAEpB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,UAAU,CAgDvD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAkDrD"}
+{"version":3,"file":"feature.mapper.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/persistence/sqlite/mappers/feature.mapper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wCAAwC,CAAC;AAGtE;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAEzB,IAAI,EAAE,MAAM,CAAC;IAEb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAE7B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAE7B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAEzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAElC,WAAW,EAAE,MAAM,CAAC;IAEpB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,UAAU,CAkDvD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAsDrD"}

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

@@ -58,6 +58,8 @@ export function toDatabase(feature) {
         pr_mergeable: feature.pr?.mergeable !== undefined ? (feature.pr.mergeable ? 1 : 0) : null,
         // Feature dependency
         parent_id: feature.parentId ?? null,
+        // Archive state
+        previous_lifecycle: feature.previousLifecycle ?? null,
         // User attachments
         attachments: JSON.stringify((feature.attachments ?? []).map((a) => ({ ...a, size: Number(a.size) }))),
         // Soft delete
@@ -118,6 +120,10 @@ export function fromDatabase(row) {
         }),
         // Feature dependency
         ...(row.parent_id != null && { parentId: row.parent_id }),
+        // Archive state
+        ...(row.previous_lifecycle != null && {
+            previousLifecycle: row.previous_lifecycle,
+        }),
         // User attachments
         attachments: JSON.parse(row.attachments ?? '[]'),
         // Soft delete

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

@@ -74,7 +74,6 @@ export interface SettingsRow {
     feature_flag_debug: number;
     feature_flag_github_import: number;
     feature_flag_adopt_branch: number;
-    feature_flag_git_rebase_sync: number;
     feature_flag_react_file_manager: number;
 }
 /**

package/dist/packages/core/src/infrastructure/persistence/sqlite/mappers/settings.mapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings.mapper.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/persistence/sqlite/mappers/settings.mapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings.mapper.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/persistence/sqlite/mappers/settings.mapper.ts"],"names":[],"mappings":"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"}

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

@@ -95,7 +95,6 @@ export function toDatabase(settings) {
         feature_flag_debug: settings.featureFlags?.debug ? 1 : 0,
         feature_flag_github_import: settings.featureFlags?.githubImport ? 1 : 0,
         feature_flag_adopt_branch: settings.featureFlags?.adoptBranch ? 1 : 0,
-        feature_flag_git_rebase_sync: settings.featureFlags?.gitRebaseSync ? 1 : 0,
         feature_flag_react_file_manager: settings.featureFlags?.reactFileManager ? 1 : 0,
     };
 }
@@ -217,7 +216,6 @@ export function fromDatabase(row) {
             debug: row.feature_flag_debug === 1,
             githubImport: row.feature_flag_github_import === 1,
             adoptBranch: row.feature_flag_adopt_branch === 1,
-            gitRebaseSync: row.feature_flag_git_rebase_sync === 1,
             reactFileManager: row.feature_flag_react_file_manager === 1,
         },
         // Onboarding (INTEGER → boolean)

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations/044-add-previous-lifecycle.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Migration 044: Add previous_lifecycle column to features table.
+ *
+ * Stores the lifecycle state prior to archiving so it can be restored
+ * when a feature is unarchived. Nullable TEXT — only populated when
+ * the feature lifecycle is Archived.
+ */
+import type { MigrationParams } from 'umzug';
+import type Database from 'better-sqlite3';
+export declare function up({ context: db }: MigrationParams<Database.Database>): Promise<void>;
+export declare function down({ context: db }: MigrationParams<Database.Database>): Promise<void>;
+//# sourceMappingURL=044-add-previous-lifecycle.d.ts.map

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations/044-add-previous-lifecycle.d.ts.map

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

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations/044-add-previous-lifecycle.js

@@ -0,0 +1,16 @@
+/**
+ * Migration 044: Add previous_lifecycle column to features table.
+ *
+ * Stores the lifecycle state prior to archiving so it can be restored
+ * when a feature is unarchived. Nullable TEXT — only populated when
+ * the feature lifecycle is Archived.
+ */
+export async function up({ context: db }) {
+    const columns = db.pragma('table_info(features)');
+    if (!columns.some((c) => c.name === 'previous_lifecycle')) {
+        db.exec('ALTER TABLE features ADD COLUMN previous_lifecycle TEXT');
+    }
+}
+export async function down({ context: db }) {
+    void db;
+}

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

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

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

@@ -36,7 +36,7 @@ let SQLiteFeatureRepository = class SQLiteFeatureRepository {
         push, open_pr, auto_merge, allow_prd, allow_plan, allow_merge,
         pr_url, pr_number, pr_status, commit_hash, ci_status,
         ci_fix_attempts, ci_fix_history, pr_mergeable,
-        parent_id,
+        parent_id, previous_lifecycle,
         created_at, updated_at
       ) VALUES (
         @id, @name, @slug, @description, @user_query, @repository_path, @branch,
@@ -46,7 +46,7 @@ let SQLiteFeatureRepository = class SQLiteFeatureRepository {
         @push, @open_pr, @auto_merge, @allow_prd, @allow_plan, @allow_merge,
         @pr_url, @pr_number, @pr_status, @commit_hash, @ci_status,
         @ci_fix_attempts, @ci_fix_history, @pr_mergeable,
-        @parent_id,
+        @parent_id, @previous_lifecycle,
         @created_at, @updated_at
       )
     `);
@@ -92,6 +92,10 @@ let SQLiteFeatureRepository = class SQLiteFeatureRepository {
         if (!filters?.includeDeleted) {
             conditions.push('deleted_at IS NULL');
         }
+        if (!filters?.includeArchived && !filters?.lifecycle) {
+            conditions.push('lifecycle != ?');
+            params.push('Archived');
+        }
         if (filters?.repositoryPath) {
             conditions.push("REPLACE(repository_path, '\\', '/') = ?");
             params.push(filters.repositoryPath.replace(/\\/g, '/'));
@@ -142,6 +146,7 @@ let SQLiteFeatureRepository = class SQLiteFeatureRepository {
         ci_fix_history = @ci_fix_history,
         pr_mergeable = @pr_mergeable,
         parent_id = @parent_id,
+        previous_lifecycle = @previous_lifecycle,
         deleted_at = @deleted_at,
         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;IAuEnD;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAgBtC;;;;;OAKG;IACG,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAkFhD"}
+{"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;IAuEnD;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAgBtC;;;;;OAKG;IACG,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAiFhD"}

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

@@ -64,7 +64,7 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         onboarding_complete,
         approval_gate_allow_prd, approval_gate_allow_plan,
         approval_gate_allow_merge, approval_gate_push_on_impl_complete,
-        feature_flag_skills, feature_flag_env_deploy, feature_flag_debug, feature_flag_github_import, feature_flag_adopt_branch, feature_flag_git_rebase_sync,
+        feature_flag_skills, feature_flag_env_deploy, feature_flag_debug, feature_flag_github_import, feature_flag_adopt_branch,
         feature_flag_react_file_manager,
         workflow_enable_evidence, workflow_commit_evidence,
         hide_ci_status
@@ -90,7 +90,7 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         @onboarding_complete,
         @approval_gate_allow_prd, @approval_gate_allow_plan,
         @approval_gate_allow_merge, @approval_gate_push_on_impl_complete,
-        @feature_flag_skills, @feature_flag_env_deploy, @feature_flag_debug, @feature_flag_github_import, @feature_flag_adopt_branch, @feature_flag_git_rebase_sync,
+        @feature_flag_skills, @feature_flag_env_deploy, @feature_flag_debug, @feature_flag_github_import, @feature_flag_adopt_branch,
         @feature_flag_react_file_manager,
         @workflow_enable_evidence, @workflow_commit_evidence,
         @hide_ci_status
@@ -186,7 +186,6 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         feature_flag_debug = @feature_flag_debug,
         feature_flag_github_import = @feature_flag_github_import,
         feature_flag_adopt_branch = @feature_flag_adopt_branch,
-        feature_flag_git_rebase_sync = @feature_flag_git_rebase_sync,
         feature_flag_react_file_manager = @feature_flag_react_file_manager,
         workflow_enable_evidence = @workflow_enable_evidence,
         workflow_commit_evidence = @workflow_commit_evidence,

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.d.ts

@@ -45,15 +45,5 @@ export declare class GitPrService implements IGitPrService {
     private parseGhError;
     private parsePrNumberFromUrl;
     private parseDiffStat;
-    syncMain(cwd: string, baseBranch: string): Promise<void>;
-    rebaseOnMain(cwd: string, featureBranch: string, baseBranch: string): Promise<void>;
-    getConflictedFiles(cwd: string): Promise<string[]>;
-    stageFiles(cwd: string, files: string[]): Promise<void>;
-    rebaseContinue(cwd: string): Promise<void>;
-    rebaseAbort(cwd: string): Promise<void>;
-    getBranchSyncStatus(cwd: string, featureBranch: string, baseBranch: string): Promise<{
-        ahead: number;
-        behind: number;
-    }>;
 }
 //# sourceMappingURL=git-pr.service.d.ts.map

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.d.ts.map

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

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.js

@@ -617,14 +617,6 @@ let GitPrService = class GitPrService {
     parseGitError(error) {
         const message = error instanceof Error ? error.message : String(error);
         const cause = error instanceof Error ? error : undefined;
-        // Rebase-specific: detect "CONFLICT" during rebase operations
-        if (message.includes('CONFLICT') && message.includes('rebase')) {
-            return new GitPrError(message, GitPrErrorCode.REBASE_CONFLICT, cause);
-        }
-        // Sync-specific: non-fast-forward or diverged branch
-        if (message.includes('non-fast-forward') || message.includes('diverged')) {
-            return new GitPrError(message, GitPrErrorCode.SYNC_FAILED, cause);
-        }
         if (message.includes('rejected') || message.includes('conflict')) {
             return new GitPrError(message, GitPrErrorCode.MERGE_CONFLICT, cause);
         }
@@ -665,148 +657,6 @@ let GitPrService = class GitPrService {
             commitCount,
         };
     }
-    // --- Rebase & Sync operations ---
-    async syncMain(cwd, baseBranch) {
-        try {
-            // Detect current branch
-            const { stdout } = await this.execFile('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { cwd });
-            const currentBranch = stdout.trim();
-            if (currentBranch === baseBranch) {
-                // On the base branch — use git pull --ff-only
-                await this.execFile('git', ['pull', '--ff-only', 'origin', baseBranch], { cwd });
-            }
-            else {
-                // On a different branch — fetch the remote ref only (updates origin/<baseBranch>).
-                // We intentionally do NOT update the local <baseBranch> ref because it may be
-                // checked out in another worktree, which causes git to refuse the update with:
-                //   "fatal: refusing to fetch into branch 'refs/heads/main' checked out at ..."
-                await this.execFile('git', ['fetch', 'origin', baseBranch], { cwd });
-            }
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            const cause = error instanceof Error ? error : undefined;
-            if (message.includes('non-fast-forward') ||
-                message.includes('Not possible to fast-forward') ||
-                message.includes('diverged')) {
-                throw new GitPrError(`Cannot fast-forward '${baseBranch}': local branch has diverged from remote. ` +
-                    `Resolve the divergence manually with 'git checkout ${baseBranch} && git reset --hard origin/${baseBranch}' ` +
-                    `if you want to discard local changes on ${baseBranch}.`, GitPrErrorCode.SYNC_FAILED, cause);
-            }
-            throw new GitPrError(`Failed to sync '${baseBranch}' with remote: ${message}`, GitPrErrorCode.GIT_ERROR, cause);
-        }
-    }
-    async rebaseOnMain(cwd, featureBranch, baseBranch) {
-        // Check for dirty worktree before starting
-        const dirty = await this.hasUncommittedChanges(cwd);
-        if (dirty) {
-            throw new GitPrError(`Cannot rebase: working directory has uncommitted changes. ` +
-                `Please commit or stash your changes before rebasing.`, GitPrErrorCode.GIT_ERROR);
-        }
-        // Checkout the feature branch
-        try {
-            await this.execFile('git', ['checkout', featureBranch], { cwd });
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            const cause = error instanceof Error ? error : undefined;
-            if (message.includes('did not match') ||
-                message.includes('not a commit') ||
-                message.includes('pathspec')) {
-                throw new GitPrError(`Branch '${featureBranch}' not found.`, GitPrErrorCode.BRANCH_NOT_FOUND, cause);
-            }
-            throw new GitPrError(`Failed to checkout '${featureBranch}': ${message}`, GitPrErrorCode.GIT_ERROR, cause);
-        }
-        // Rebase onto origin/<baseBranch> (the remote-tracking ref).
-        // We use origin/<baseBranch> rather than the local <baseBranch> because:
-        // 1. syncMain fetches origin/<baseBranch> — it's always up-to-date
-        // 2. The local <baseBranch> may be checked out in another worktree and stale
-        const rebaseTarget = `origin/${baseBranch}`;
-        try {
-            await this.execFile('git', ['rebase', rebaseTarget], { cwd });
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            const cause = error instanceof Error ? error : undefined;
-            // Detect rebase conflict from git stderr/exit code
-            if (message.includes('CONFLICT') || message.includes('could not apply')) {
-                // Get the list of conflicted files to include in the error message
-                let conflictedFiles = [];
-                try {
-                    conflictedFiles = await this.getConflictedFiles(cwd);
-                }
-                catch {
-                    // Failed to get conflicted files — still report the conflict
-                }
-                const fileList = conflictedFiles.length > 0 ? ` Conflicted files: ${conflictedFiles.join(', ')}` : '';
-                throw new GitPrError(`Rebase of '${featureBranch}' onto '${baseBranch}' encountered conflicts.${fileList}`, GitPrErrorCode.REBASE_CONFLICT, cause);
-            }
-            throw new GitPrError(`Rebase of '${featureBranch}' onto '${baseBranch}' failed: ${message}`, GitPrErrorCode.GIT_ERROR, cause);
-        }
-    }
-    async getConflictedFiles(cwd) {
-        try {
-            const { stdout } = await this.execFile('git', ['diff', '--name-only', '--diff-filter=U'], {
-                cwd,
-            });
-            return stdout
-                .trim()
-                .split('\n')
-                .filter((f) => f.length > 0)
-                .map((f) => f.replace(/\\/g, '/'));
-        }
-        catch (error) {
-            throw this.parseGitError(error);
-        }
-    }
-    async stageFiles(cwd, files) {
-        try {
-            await this.execFile('git', ['add', ...files], { cwd });
-        }
-        catch (error) {
-            throw this.parseGitError(error);
-        }
-    }
-    async rebaseContinue(cwd) {
-        try {
-            await this.execFile('git', ['rebase', '--continue'], {
-                cwd,
-                env: { ...process.env, GIT_EDITOR: 'true' },
-            });
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            const cause = error instanceof Error ? error : undefined;
-            if (message.includes('CONFLICT') || message.includes('could not apply')) {
-                throw new GitPrError(`Rebase continue encountered new conflicts: ${message}`, GitPrErrorCode.REBASE_CONFLICT, cause);
-            }
-            throw this.parseGitError(error);
-        }
-    }
-    async rebaseAbort(cwd) {
-        try {
-            await this.execFile('git', ['rebase', '--abort'], { cwd });
-        }
-        catch (error) {
-            throw this.parseGitError(error);
-        }
-    }
-    async getBranchSyncStatus(cwd, featureBranch, baseBranch) {
-        try {
-            const remoteRef = `origin/${baseBranch}`;
-            const [aheadResult, behindResult] = await Promise.all([
-                this.execFile('git', ['rev-list', '--count', `${remoteRef}..${featureBranch}`], { cwd }),
-                this.execFile('git', ['rev-list', '--count', `${featureBranch}..${remoteRef}`], { cwd }),
-            ]);
-            return {
-                ahead: parseInt(aheadResult.stdout.trim(), 10) || 0,
-                behind: parseInt(behindResult.stdout.trim(), 10) || 0,
-            };
-        }
-        catch (error) {
-            throw this.parseGitError(error);
-        }
-    }
 };
 GitPrService = __decorate([
     injectable(),

package/dist/src/presentation/cli/commands/feat/archive.command.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Feature Archive Command
+ *
+ * Archives a feature to hide it from the canvas without deleting it.
+ * Stores the current lifecycle state for restoration on unarchive.
+ *
+ * Usage: shep feat archive <id> [--force]
+ *
+ * @example
+ * $ shep feat archive feat-123
+ * $ shep feat archive feat-123 --force
+ */
+import { Command } from 'commander';
+/**
+ * Create the feat archive command
+ */
+export declare function createArchiveCommand(): Command;
+//# sourceMappingURL=archive.command.d.ts.map

package/dist/src/presentation/cli/commands/feat/archive.command.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"archive.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/archive.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAWpC;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,OAAO,CAkC9C"}

package/dist/src/presentation/cli/commands/feat/archive.command.js

@@ -0,0 +1,54 @@
+/**
+ * Feature Archive Command
+ *
+ * Archives a feature to hide it from the canvas without deleting it.
+ * Stores the current lifecycle state for restoration on unarchive.
+ *
+ * Usage: shep feat archive <id> [--force]
+ *
+ * @example
+ * $ shep feat archive feat-123
+ * $ shep feat archive feat-123 --force
+ */
+import { Command } from 'commander';
+import { container } from '../../../../../packages/core/src/infrastructure/di/container.js';
+import { ShowFeatureUseCase } from '../../../../../packages/core/src/application/use-cases/features/show-feature.use-case.js';
+import { ArchiveFeatureUseCase } from '../../../../../packages/core/src/application/use-cases/features/archive-feature.use-case.js';
+import { colors, messages } from '../../ui/index.js';
+import { confirm } from '@inquirer/prompts';
+/**
+ * Create the feat archive command
+ */
+export function createArchiveCommand() {
+    return new Command('archive')
+        .description('Archive a feature to hide it from the canvas')
+        .argument('<id>', 'Feature ID or prefix')
+        .option('-f, --force', 'Skip confirmation prompt')
+        .action(async (featureId, options) => {
+        try {
+            const showUseCase = container.resolve(ShowFeatureUseCase);
+            const feature = await showUseCase.execute(featureId);
+            if (!options.force) {
+                const confirmed = await confirm({
+                    message: `Archive feature "${feature.name}"?`,
+                    default: false,
+                });
+                if (!confirmed) {
+                    messages.info('Cancelled');
+                    return;
+                }
+            }
+            const archiveUseCase = container.resolve(ArchiveFeatureUseCase);
+            await archiveUseCase.execute(feature.id);
+            messages.newline();
+            messages.success('Feature archived');
+            console.log(`  ${colors.muted('Name:')} ${feature.name}`);
+            messages.newline();
+        }
+        catch (error) {
+            const err = error instanceof Error ? error : new Error(String(error));
+            messages.error('Failed to archive feature', err);
+            process.exitCode = 1;
+        }
+    });
+}

package/dist/src/presentation/cli/commands/feat/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAapC;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAc3C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAepC;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAgB3C"}

package/dist/src/presentation/cli/commands/feat/index.js

@@ -21,6 +21,8 @@ import { createApproveCommand } from './approve.command.js';
 import { createRejectCommand } from './reject.command.js';
 import { createLogsCommand } from './logs.command.js';
 import { createAdoptCommand } from './adopt.command.js';
+import { createArchiveCommand } from './archive.command.js';
+import { createUnarchiveCommand } from './unarchive.command.js';
 /**
  * Create the feat command group
  */
@@ -37,5 +39,7 @@ export function createFeatCommand() {
         .addCommand(createApproveCommand())
         .addCommand(createRejectCommand())
         .addCommand(createLogsCommand())
-        .addCommand(createAdoptCommand());
+        .addCommand(createAdoptCommand())
+        .addCommand(createArchiveCommand())
+        .addCommand(createUnarchiveCommand());
 }

package/dist/src/presentation/cli/commands/feat/ls.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ls.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/ls.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA6KpC,wBAAgB,eAAe,IAAI,OAAO,CAsGzC"}
+{"version":3,"file":"ls.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/ls.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkLpC,wBAAgB,eAAe,IAAI,OAAO,CAwGzC"}

package/dist/src/presentation/cli/commands/feat/ls.command.js

@@ -48,6 +48,9 @@ const STATUS_PRIORITY = {
  */
 function formatStatus(feature, run) {
     // Blocked features show "Waiting" — the parent relationship is conveyed by tree indentation
+    if (feature.lifecycle === 'Archived') {
+        return `${colors.muted(symbols.dotEmpty)} ${colors.muted('Archived')}`;
+    }
     if (feature.lifecycle === 'Deleting') {
         return `${colors.muted(symbols.spinner[0])} ${colors.muted('Deleting')}`;
     }
@@ -168,6 +171,7 @@ export function createLsCommand() {
         .description('List features')
         .option('-r, --repo <path>', 'Filter by repository path')
         .option('--include-deleted', 'Include soft-deleted features')
+        .option('--show-archived', 'Include archived features')
         .action(async (options) => {
         try {
             const useCase = container.resolve(ListFeaturesUseCase);
@@ -176,6 +180,7 @@ export function createLsCommand() {
             const filters = {
                 ...(options.repo && { repositoryPath: options.repo }),
                 ...(options.includeDeleted && { includeDeleted: true }),
+                ...(options.showArchived && { includeArchived: true }),
             };
             const features = await useCase.execute(Object.keys(filters).length > 0 ? filters : undefined);
             // Load agent runs and phase timings for all features in parallel

package/dist/src/presentation/cli/commands/feat/unarchive.command.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Feature Unarchive Command
+ *
+ * Restores an archived feature to its previous lifecycle state.
+ * No confirmation needed — unarchive is always safe and non-destructive.
+ *
+ * Usage: shep feat unarchive <id>
+ *
+ * @example
+ * $ shep feat unarchive feat-123
+ */
+import { Command } from 'commander';
+/**
+ * Create the feat unarchive command
+ */
+export declare function createUnarchiveCommand(): Command;
+//# sourceMappingURL=unarchive.command.d.ts.map

package/dist/src/presentation/cli/commands/feat/unarchive.command.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"unarchive.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/unarchive.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAuBhD"}