@dv.nghiem/flowdeck 0.4.9 → 0.4.11

package/dist/lib/confirmation.d.ts

@@ -2,8 +2,9 @@ export interface ConfirmationResponse {
     success: boolean;
     message: string;
     status: "AWAITING_CONFIRM";
-    confirm_mode: "y/n";
+    confirm_mode: "y/n" | "multi-choice";
     operation: string;
+    choices?: string[];
     [key: string]: unknown;
 }
 /**
@@ -12,6 +13,13 @@ export interface ConfirmationResponse {
  * @param message - User-facing prompt message
  */
 export declare function confirmPrompt(operation: string, message: string): ConfirmationResponse;
+/**
+ * Generate AWAITING_CONFIRM response for multi-choice prompt.
+ * @param operation - Short identifier for the operation
+ * @param message - User-facing prompt message
+ * @param choices - Array of choice strings (e.g., ["show conflict", "attempt resolution", "abort"])
+ */
+export declare function multiChoiceConfirm(operation: string, message: string, choices: string[]): ConfirmationResponse;
 /**
  * Generate skip response when user says "no".
  * @param operation - Short identifier for the operation

package/dist/lib/confirmation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"confirmation.d.ts","sourceRoot":"","sources":["../../src/lib/confirmation.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,kBAAkB,CAAA;IAC1B,YAAY,EAAE,KAAK,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,oBAAoB,CAQtF;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAOvE"}
+{"version":3,"file":"confirmation.d.ts","sourceRoot":"","sources":["../../src/lib/confirmation.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,kBAAkB,CAAA;IAC1B,YAAY,EAAE,KAAK,GAAG,cAAc,CAAA;IACpC,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,oBAAoB,CAQtF;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAS9G;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAOvE"}

package/dist/mcp/index.d.ts

@@ -10,7 +10,14 @@
  * Local stdio MCPs (when installed):
  *   - codegraph   codegraph serve --mcp          (code knowledge graph — symbol search, call graphs, impact analysis)
  *
- * Disable individual MCPs with: FLOWDECK_DISABLE_MCP=context7,websearch,grep_app,github,codegraph
+ * Additional local stdio MCPs (enabled by default):
+ *   - memory                 npx -y @modelcontextprotocol/server-memory
+ *   - sequential-thinking    npx -y @modelcontextprotocol/server-sequential-thinking
+ *   - magic                  npx -y @magicuidesign/mcp@latest
+ *   - playwright             npx -y @playwright/mcp --browser chrome
+ *   - token-optimizer        npx -y token-optimizer-mcp
+ *
+ * Disable individual MCPs with: FLOWDECK_DISABLE_MCP=context7,websearch,grep_app,github,codegraph,memory,sequential-thinking,magic,playwright,token-optimizer
  */
 type RemoteMcp = {
     type: "remote";

package/dist/mcp/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAIH,KAAK,SAAS,GAAG;IACf,IAAI,EAAE,QAAQ,CAAA;IACd,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChC,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AAED,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,OAAO,CAAA;IACb,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACpC,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAOD,wBAAgB,kBAAkB,IAAI,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC,CA+DzE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAKH,KAAK,SAAS,GAAG;IACf,IAAI,EAAE,QAAQ,CAAA;IACd,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChC,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AAED,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,OAAO,CAAA;IACb,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACpC,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAoBD,wBAAgB,kBAAkB,IAAI,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC,CAuGzE"}

package/dist/services/event-logger.d.ts

@@ -12,7 +12,10 @@ export interface ToolEvent {
 }
 export declare function getCurrentAgent(): string | null;
 export declare function setCurrentAgent(agent: string | null): void;
+export declare function isEventLogHealthy(): boolean;
+export declare function getLastPersistenceError(): string | null;
+export declare function resetEventLogHealth(): void;
 export declare function sanitizeArgs(args: unknown): Record<string, unknown>;
-export declare function logEvent(directory: string, event: ToolEvent, log?: (msg: string) => void): void;
+export declare function logEvent(directory: string, event: ToolEvent, log?: (msg: string) => void): boolean;
 export declare function formatEventForStderr(event: ToolEvent): string;
 //# sourceMappingURL=event-logger.d.ts.map

package/dist/services/event-logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event-logger.d.ts","sourceRoot":"","sources":["../../src/services/event-logger.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,aAAa,GAAG,YAAY,GAAG,iBAAiB,GAAG,cAAc,GAAG,eAAe,CAAA;IACzF,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAA;IACxC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAUD,wBAAgB,eAAe,IAAI,MAAM,GAAG,IAAI,CAE/C;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAE1D;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAmBnE;AAkBD,wBAAgB,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAqB/F;AAqBD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAqD7D"}
+{"version":3,"file":"event-logger.d.ts","sourceRoot":"","sources":["../../src/services/event-logger.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,aAAa,GAAG,YAAY,GAAG,iBAAiB,GAAG,cAAc,GAAG,eAAe,CAAA;IACzF,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAA;IACxC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAYD,wBAAgB,eAAe,IAAI,MAAM,GAAG,IAAI,CAE/C;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAE1D;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C;AAED,wBAAgB,uBAAuB,IAAI,MAAM,GAAG,IAAI,CAEvD;AAED,wBAAgB,mBAAmB,IAAI,IAAI,CAG1C;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAmBnE;AAkBD,wBAAgB,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CA+BlG;AAwBD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAqD7D"}

package/dist/services/loop-detector.d.ts

@@ -0,0 +1,47 @@
+export type LoopResult = {
+    action: "allow";
+} | {
+    action: "block";
+    reason: string;
+    escalationMessage: string;
+} | {
+    action: "warn";
+    message: string;
+};
+export interface LoopDetectorConfig {
+    enabled: boolean;
+    maxRepeats: number;
+    similarityThreshold: number;
+    historySize: number;
+}
+export interface ActionRecord {
+    toolName: string;
+    normalizedKey: string;
+    args: Record<string, unknown>;
+    outputHash: string;
+    outputPreview: string;
+    status: "success" | "error" | "blocked";
+    timestamp: number;
+    callCount: number;
+    consecutiveSameResultCount: number;
+}
+export declare function normalizeAction(toolName: string, args: Record<string, unknown>): string;
+export declare class LoopDetector {
+    private config;
+    private appLog?;
+    private history;
+    private persistenceHealthy;
+    private persistenceWarningLogged;
+    constructor(config?: Partial<LoopDetectorConfig>, appLog?: (msg: string) => void);
+    setPersistenceHealthy(healthy: boolean): void;
+    getHistory(sessionId: string): ActionRecord[];
+    clearSession(sessionId: string): void;
+    checkBefore(toolName: string, args: Record<string, unknown>, sessionId: string): LoopResult;
+    recordAfter(toolName: string, args: Record<string, unknown>, output: unknown, sessionId: string, status?: "success" | "error" | "blocked"): void;
+    private getSessionRecord;
+    private setSessionRecord;
+    private evictOldest;
+    private isNoProgressMarker;
+    private buildEscalationMessage;
+}
+//# sourceMappingURL=loop-detector.d.ts.map

package/dist/services/loop-detector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loop-detector.d.ts","sourceRoot":"","sources":["../../src/services/loop-detector.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,UAAU,GAClB;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,GACnB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAA;CAAE,GAC9D;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAA;AAEvC,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;IACrB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,CAAA;IACrB,MAAM,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAA;IACvC,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,0BAA0B,EAAE,MAAM,CAAA;CACnC;AA4FD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAmCvF;AA2FD,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,MAAM,CAAC,CAAuB;IACtC,OAAO,CAAC,OAAO,CAAoD;IACnE,OAAO,CAAC,kBAAkB,CAAO;IACjC,OAAO,CAAC,wBAAwB,CAAoB;gBAExC,MAAM,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI;IAKhF,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAU7C,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,EAAE;IAM7C,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAIrC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,UAAU;IAiE3F,WAAW,CACT,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,MAAM,GAAE,SAAS,GAAG,OAAO,GAAG,SAAqB,GAClD,IAAI;IAiEP,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,gBAAgB;IAkBxB,OAAO,CAAC,WAAW;IAcnB,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,sBAAsB;CAU/B"}

package/dist/tools/merge-assist.d.ts

@@ -0,0 +1,54 @@
+import { type ToolDefinition } from "@opencode-ai/plugin";
+export interface MergeAssistSession {
+    id: string;
+    targetBranch: string;
+    sourceBranch: string;
+    featureDescription: string;
+    integrationBranch?: string;
+    status: "clarifying" | "inspecting" | "planning" | "awaiting_confirmation" | "executing" | "conflict" | "completed" | "aborted";
+    candidateCommits: CandidateCommit[];
+    selectedCommits: string[];
+    dependentCommits: string[];
+    mergePlan?: MergePlan;
+    confirmations: ConfirmationRecord[];
+    conflicts?: ConflictInfo[];
+    createdAt: string;
+    updatedAt: string;
+}
+export interface CandidateCommit {
+    sha: string;
+    subject: string;
+    author: string;
+    date: string;
+    files: string[];
+    isLikelyFeature: boolean;
+    confidence: "high" | "medium" | "low";
+}
+export interface MergePlan {
+    targetBranch: string;
+    sourceBranch: string;
+    integrationBranch: string;
+    selectedCommits: string[];
+    method: "cherry-pick" | "cherry-pick-range" | "manual-port" | "abort";
+    risks: string[];
+    recommendedCommands: string[];
+    dryRun: boolean;
+}
+export interface ConfirmationRecord {
+    step: string;
+    prompt: string;
+    status: "pending" | "approved" | "rejected";
+    requestedAt: string;
+    resolvedAt?: string;
+}
+export interface ConflictInfo {
+    file: string;
+    commitSha: string;
+    description: string;
+}
+export declare function findCandidateCommits(cwd: string, sourceBranch: string, targetBranch: string): CandidateCommit[];
+export declare function detectDependencies(candidateCommits: CandidateCommit[]): string[];
+export declare function recommendMethod(candidateCommits: CandidateCommit[], selectedCommits: string[]): MergePlan["method"];
+export declare function generateRecommendedCommands(plan: MergePlan): string[];
+export declare const mergeAssistTool: ToolDefinition;
+//# sourceMappingURL=merge-assist.d.ts.map

package/dist/tools/merge-assist.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-assist.d.ts","sourceRoot":"","sources":["../../src/tools/merge-assist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAW/D,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAA;IACV,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,MAAM,EAAE,YAAY,GAAG,YAAY,GAAG,UAAU,GAAG,uBAAuB,GAAG,WAAW,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,CAAA;IAC/H,gBAAgB,EAAE,eAAe,EAAE,CAAA;IACnC,eAAe,EAAE,MAAM,EAAE,CAAA;IACzB,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,aAAa,EAAE,kBAAkB,EAAE,CAAA;IACnC,SAAS,CAAC,EAAE,YAAY,EAAE,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,eAAe,EAAE,OAAO,CAAA;IACxB,UAAU,EAAE,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAA;CACtC;AAED,MAAM,WAAW,SAAS;IACxB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;IACzB,eAAe,EAAE,MAAM,EAAE,CAAA;IACzB,MAAM,EAAE,aAAa,GAAG,mBAAmB,GAAG,aAAa,GAAG,OAAO,CAAA;IACrE,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,mBAAmB,EAAE,MAAM,EAAE,CAAA;IAC7B,MAAM,EAAE,OAAO,CAAA;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,UAAU,CAAA;IAC3C,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;CACpB;AAsHD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,eAAe,EAAE,CAwB/G;AAED,wBAAgB,kBAAkB,CAAC,gBAAgB,EAAE,eAAe,EAAE,GAAG,MAAM,EAAE,CA4BhF;AAED,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,eAAe,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,CAmBnH;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,EAAE,CAqCrE;AA8CD,eAAO,MAAM,eAAe,EAAE,cA2N5B,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dv.nghiem/flowdeck",
-  "version": "0.4.9",
+  "version": "0.4.11",
   "description": "FlowDeck — structured planning and execution workflows for OpenCode",
   "type": "module",
   "main": "./dist/index.js",

package/src/commands/fd-execute.md

@@ -44,6 +44,12 @@ If research is stale or missing:
 - Log which sources were consulted and what evidence was gathered
 
 > **MCP integration:** When implementation requires external library knowledge, invoke configured MCP tools as part of the research pass.
+> - **context7** — library docs lookup (first choice for API/docs questions)
+> - **sequential-thinking** — break down complex implementation steps
+> - **memory** — retrieve prior context from planning or earlier phases
+> - **magic** — UI/design system reference for frontend tasks
+> - **playwright** — verify browser behavior for frontend implementations
+> - **token-optimizer** — compress large context when passing research to implementation agents
 
 ### Step 1: Guard Check
 

package/src/commands/fd-fix-bug.md

@@ -60,7 +60,13 @@ If research is stale or missing:
 - Persist results to STATE.md for future reuse
 - Log which sources were consulted and what evidence was gathered
 
-> **MCP integration:** When the bug involves external APIs or libraries, invoke configured MCP tools (websearch, docs MCP) to research known failure modes.
+> **MCP integration:** When the bug involves external APIs or libraries, invoke configured MCP tools to research known failure modes.
+> - **context7** — library docs lookup (first choice for API/docs questions)
+> - **sequential-thinking** — stepwise root cause analysis for complex bugs
+> - **memory** — retrieve prior bug fixes or related context
+> - **magic** — design system issues for UI bugs
+> - **playwright** — reproduce and verify browser-specific bugs
+> - **token-optimizer** — compress large stack traces or logs before analysis
 
 ### Steps 1-2: Explore & Research
 

package/src/commands/fd-merge-assist.md

@@ -0,0 +1,180 @@
+---
+description: Start a human-in-the-loop selective merge workflow to bring a specific feature from one branch to another
+argument-hint: [feature description or source branch]
+---
+
+# Merge Assist
+
+Bring a specific feature from one branch to another using selective cherry-pick or manual port, with mandatory human confirmation at every gate.
+
+**Input:** $ARGUMENTS — feature description, source branch name, or both (e.g., "OAuth login from feature/oauth")
+
+## Pre-flight
+
+1. Verify this is a git repository. If not, error:
+   > "This command requires a git repository."
+
+2. Parse $ARGUMENTS to identify:
+   - **Feature description** — what is being moved
+   - **Source branch** — where it currently lives
+   - **Target branch** — where it should land (default: current branch or `main`)
+
+   If $ARGUMENTS is ambiguous, ask:
+    > "Which branch contains the feature you want to bring?"
+    > "Which branch should it land on?"
+
+## Credential Safety
+
+The agent MUST NOT ask for GitHub tokens, passwords, SSH keys, or any authentication secrets.
+
+If a step requires remote authentication (e.g., `git push`, `gh pr create`):
+1. Explain that the step requires authentication
+2. Offer three options:
+   - **Stop** — end the workflow here; the human can finish manually
+   - **Defer** — complete local steps only; skip remote steps
+   - **Manual** — the human runs the remote step themselves
+3. Do NOT ask for credentials, tokens, or passwords
+
+## Process
+
+### Step 1: Start Session
+
+Use the `merge-assist` tool with action `start`:
+```json
+{
+  "action": "start",
+  "targetBranch": "<target>",
+  "sourceBranch": "<source>",
+  "featureDescription": "<description>"
+}
+```
+
+If branches do not exist, report the error and stop.
+
+### Step 2: Branch Selection Gate
+
+Present the session details and ask for confirmation:
+> "Merge Assist: bring '<description>' from `<source>` → `<target>`.
+> Confirm these branches? (y/n)"
+
+Use `merge-assist` action `confirm` with `step: "branch_selection"` and `approved: true/false`.
+
+If rejected, offer to abort or correct branch names.
+
+### Step 3: Inspect Commits
+
+Use `merge-assist` action `inspect` with the session ID.
+
+Present candidate commits:
+```
+Found <N> candidate commit(s) on <source> not in <target>:
+
+SHA       | Subject                 | Author | Files | Confidence
+----------|-------------------------|--------|-------|------------
+<sha-1>   | feat: add OAuth         | alice  | 3     | high
+<sha-2>   | refactor: extract auth  | alice  | 2     | medium
+```
+
+Highlight dependent commits if detected.
+
+### Step 4: Commit Selection Gate
+
+Ask the user to select commits:
+> "Which commits represent the feature? Provide SHAs (space-separated) or say 'all'.
+> Include dependent commits? (y/n)"
+
+Record the selection. Use `merge-assist` action `confirm` with `step: "commit_selection"`.
+
+### Step 5: Build Plan
+
+Use `merge-assist` action `plan` with `selectedCommits`.
+
+Present the plan:
+```
+Merge Plan
+----------
+Integration branch: <branch-name>
+Method: <cherry-pick | cherry-pick-range | manual-port>
+Commits: <sha-1> <sha-2> ...
+Risks:
+  - <risk-1>
+  - <risk-2>
+```
+
+### Step 6: Planning Gates
+
+Confirm each planning detail:
+
+1. Integration branch name:
+   > "Use integration branch `<branch>`? (y/n)"
+   → `confirm` with `step: "integration_branch"`
+
+2. Merge method:
+   > "Use method `<method>`? (y/n)"
+   → `confirm` with `step: "method_selection"`
+
+3. Dependencies:
+   > "Include dependent commits? (y/n)"
+   → `confirm` with `step: "dependency_inclusion"`
+
+If any gate is rejected, offer to revise or abort.
+
+### Step 7: Execute Gate
+
+Present the recommended commands:
+```bash
+Recommended commands:
+  git fetch origin
+  git checkout -b <branch> <target>
+  git cherry-pick <sha-1> <sha-2>
+  git push -u origin <branch>
+  gh pr create --base <target> --head <branch> ...
+```
+
+Ask:
+> "Execute these commands? (y/n)"
+→ `confirm` with `step: "execute_plan"`
+
+**Important:** The agent MUST NOT execute these commands. Only the human should run them.
+
+### Step 8: Handle Conflicts (if any)
+
+If the human reports a conflict:
+
+1. Stop the workflow.
+2. Explain which file/commit caused the conflict.
+3. Use `multiChoiceConfirm` to offer options:
+   - "Show conflict details"
+   - "Attempt resolution"
+   - "Switch to manual port"
+   - "Abort session"
+4. Wait for human decision.
+
+### Step 9: Push / PR Gate
+
+After successful execution:
+> "Push the branch and open a PR? This step requires GitHub authentication. (y/n)"
+
+If the user is unsure about authentication or says no:
+> "Remote push/PR requires authentication. Options:
+> 1. Stop here — the integration branch is ready locally
+> 2. Defer — skip push/PR for now
+> 3. Manual — run `git push` and `gh pr create` yourself when ready"
+
+→ `confirm` with `step: "push_pr"`
+
+### Step 10: Complete
+
+If `push_pr` is approved, mark the session complete:
+> "Merge Assist complete. Branch `<branch>` pushed. PR created."
+
+## Aborting
+
+At any point, the user can abort. Use `merge-assist` action `abort` with the session ID.
+
+## Error Handling
+
+- Branch not found: report which branch is missing, offer to list branches
+- No candidate commits: report that the source branch has no unique commits vs target
+- No commits selected: error "At least one commit must be selected"
+- Session not found: error "Session <id> not found. Start a new session with `start`"

package/src/commands/fd-plan.md

@@ -46,7 +46,13 @@ If research is stale or missing:
 - Persist results to STATE.md for future reuse
 - Log which sources were consulted and what evidence was gathered
 
-> **MCP integration:** When library, API, or external knowledge is needed, invoke configured MCP tools (websearch, docs MCP, code search MCP) as part of the research pass.
+> **MCP integration:** When library, API, or external knowledge is needed, invoke configured MCP tools as part of the research pass.
+> - **context7** — library docs lookup (first choice for API/docs questions)
+> - **sequential-thinking** — stepwise planning for complex or ambiguous tasks
+> - **memory** — retrieve prior context when available
+> - **magic** — UI/design system research
+> - **playwright** — verify browser behavior for frontend tasks
+> - **token-optimizer** — compress large research context before planning
 
 ### Step 1: Guard Check
 

package/src/skills/merge-assist/SKILL.md

@@ -0,0 +1,232 @@
+---
+name: merge-assist
+description: Human-in-the-loop selective branch integration. Helps bring a specific feature from one branch to another using cherry-pick or manual port, with mandatory confirmation gates.
+origin: FlowDeck
+---
+
+# Merge Assist Skill
+
+Selective, human-approved branch integration. Never auto-merge. Never auto-push.
+
+## When to Activate
+
+Activate when:
+- The user wants to move a specific feature from one branch to another
+- The user asks to cherry-pick selectively from a branch
+- The user wants to avoid merging an entire branch (e.g., avoid bringing in unrelated changes)
+- The user needs help porting commits across diverged branches
+- The user says things like "bring this feature to main", "cherry-pick these changes", "port this PR"
+
+## Core Principles
+
+1. **Human approval is mandatory** — Every gate requires explicit y/n confirmation. No silent execution.
+2. **Never assume feature boundaries** — Ask the user which commits represent the feature. Do not guess.
+3. **Prefer selective methods** — Cherry-pick over full merge. Manual port over blind cherry-pick when conflicts are likely.
+4. **Ask on every ambiguity** — If commit history is unclear, stop and ask. Do not proceed on assumptions.
+5. **No autonomous merge authority** — The agent MUST NOT run `git merge`, `git cherry-pick`, `git push`, `git commit`, `git checkout`, `git branch -D`, `git reset`, or `git revert` without human confirmation.
+6. **Never ask for credentials** — The agent MUST NOT ask for GitHub tokens, passwords, SSH keys, or any authentication secrets. If a remote action requires authentication, explain this and offer options: stop, defer, or let the human perform that step manually.
+
+## Workflow Steps
+
+### Step 1: Clarification
+
+Ask the user to confirm:
+- **Target branch** — where the feature should land (e.g., `main`)
+- **Source branch** — where the feature currently lives (e.g., `feature/auth-refactor`)
+- **Feature description** — one-sentence summary of what is being moved
+
+If the user only provides a branch name, infer the other branch from context or ask.
+
+Use the `merge-assist` tool with action `start` to create the session.
+
+### Step 2: Branch Verification
+
+The tool verifies both branches exist. If not, report the error and stop.
+
+Confirmation gate: `branch_selection`
+
+Prompt example:
+> "Confirm: integrate feature 'OAuth login' from `feature/oauth` into `main`? (y/n)"
+
+### Step 3: Inspection
+
+Use the `merge-assist` tool with action `inspect` to analyze the source branch history.
+
+The tool returns:
+- Candidate commits (SHA, subject, author, date, files)
+- Heuristic confidence for whether each commit is part of the feature
+- Dependent commits detected via shared files or message keywords
+
+Present the candidate commits to the user in a clear table:
+
+```
+SHA     | Subject                    | Author    | Confidence | Feature?
+--------|----------------------------|-----------|------------|----------
+abc1234 | feat(auth): add OAuth flow | alice     | high       | yes
+def5678 | refactor(auth): extract  | alice     | medium     | maybe
+```
+
+### Step 4: Commit Selection
+
+Ask the user to identify which commits represent the feature.
+
+Confirmation gate: `commit_selection`
+
+Prompt example:
+> "Which commits represent the OAuth feature? Provide SHAs (space-separated) or say 'all'.
+> Dependent commits detected: def5678. Include them? (y/n)"
+
+### Step 5: Plan Creation
+
+Use the `merge-assist` tool with action `plan` with the selected commits.
+
+The tool builds a merge plan including:
+- Recommended method: `cherry-pick`, `cherry-pick-range`, `manual-port`, or `abort`
+- Integration branch name (default: `merge-assist/<source>-to-<target>`)
+- Risk assessment
+- Recommended commands (as strings — NOT executed)
+
+### Step 6: Planning Confirmations
+
+Three gates must be confirmed before proceeding:
+
+1. **integration_branch** — Confirm the integration branch name
+2. **method_selection** — Confirm the merge method
+3. **dependency_inclusion** — Confirm whether to include dependent commits
+
+Prompt example:
+> "Integration branch: `merge-assist/feature-oauth-to-main`. OK? (y/n)"
+> "Method: cherry-pick-range (commits abc1234..def5678). OK? (y/n)"
+> "Include dependent commit def5678 (refactor prep)? (y/n)"
+
+### Step 7: Execute Confirmation
+
+Confirmation gate: `execute_plan`
+
+Present the recommended commands to the user. Do NOT run them.
+
+Prompt example:
+> "Ready to execute. Recommended commands:
+> ```
+> git fetch origin
+> git checkout -b merge-assist/feature-oauth-to-main main
+> git cherry-pick abc1234^..def5678
+> git push -u origin merge-assist/feature-oauth-to-main
+> ```
+> Execute these commands? (y/n)"
+
+### Step 8: Human Execution
+
+If approved, the human (or agent with explicit permission) runs the commands.
+
+**The agent MUST NOT run these commands autonomously.**
+
+### Step 9: Push / PR Confirmation
+
+After successful execution, confirm pushing and PR creation.
+
+Confirmation gate: `push_pr`
+
+Prompt example:
+> "Push branch and open PR? (y/n)"
+
+## Confirmation Gates
+
+Every gate requires human approval. The tool tracks each gate in the session state.
+
+| # | Gate | Trigger | Prompt Style |
+|---|------|---------|-------------|
+| 1 | `branch_selection` | After start | y/n |
+| 2 | `commit_selection` | After inspect | Provide SHAs + y/n on deps |
+| 3 | `integration_branch` | During plan | y/n |
+| 4 | `method_selection` | During plan | y/n |
+| 5 | `dependency_inclusion` | During plan | y/n |
+| 6 | `execute_plan` | After plan approved | y/n |
+| 7 | `push_pr` | After execute | y/n |
+
+If any gate is rejected:
+- Stop the workflow
+- Offer to `abort` the session or revise the selection
+
+## Conflict Handling
+
+If a conflict occurs during human execution:
+
+1. **Stop immediately** — Do not proceed past the conflict.
+2. **Explain the conflict** — File path, commit SHA, and what changed.
+3. **Propose options** — Use `multiChoiceConfirm` with choices like:
+   - "Show conflict details"
+   - "Attempt resolution"
+   - "Abort and try manual port"
+   - "Abort session"
+4. **Wait for human decision** — Do not auto-resolve. Do not guess.
+
+Update the session with conflict info if available:
+```
+conflicts: [
+  { file: "src/auth.ts", commitSha: "abc1234", description: "Both branches modified login() signature" }
+]
+```
+
+## Anti-Patterns
+
+The following are explicitly forbidden:
+
+- **Auto-merge** — Never run `git merge` without confirmation
+- **Auto-push** — Never run `git push` without confirmation
+- **Assume commits** — Never guess which commits belong to a feature
+- **Silent cherry-pick** — Never cherry-pick without showing the user what will happen
+- **Ignore conflicts** — Never proceed past a conflict without human input
+- **Skip confirmation gates** — Every gate must be explicitly approved or rejected
+- **Execute state-changing git commands in the tool** — The tool only READS git history
+- **Ask for credentials** — Never request GitHub tokens, passwords, SSH keys, or other secrets from the user
+
+## Examples
+
+### Example 1: Simple cherry-pick
+
+User: "Bring the OAuth feature from feature/oauth to main"
+
+Agent:
+> "Starting merge-assist workflow. Target: `main`, Source: `feature/oauth`, Feature: OAuth login.
+> Confirm: integrate from `feature/oauth` into `main`? (y/n)"
+
+[User confirms]
+
+Agent:
+> "Found 3 candidate commits:
+> - abc1234 feat(auth): add OAuth flow (high confidence)
+> - def5678 refactor(auth): extract auth module (medium — shared files)
+> - ghi9012 test(auth): add OAuth tests (medium — test only)
+> Which commits represent the feature? (provide SHAs or 'all')"
+
+[User selects abc1234 def5678]
+
+Agent:
+> "Plan: cherry-pick-range `abc1234^..def5678` into `merge-assist/feature-oauth-to-main`.
+> Risks: refactor prep commit included.
+> Execute? (y/n)"
+
+### Example 2: Conflict detected
+
+User: "It conflicted on src/auth.ts"
+
+Agent:
+> "Conflict detected in `src/auth.ts` during cherry-pick of `abc1234`.
+> Options:
+> 1. Show conflict details
+> 2. Attempt resolution
+> 3. Abort and try manual port
+> 4. Abort session
+> What would you like to do?"
+
+## Tool Reference
+
+Use the `merge-assist` tool with these actions:
+- `start` — Initialize session
+- `inspect` — Analyze git history
+- `plan` — Build merge plan from selected commits
+- `confirm` — Record approval/rejection for a step
+- `abort` — Abort session
+- `status` — Get current session state
+- `list` — List all sessions