chore: add stabilization delay to client's startFlow

Author: jumski

.claude/skills/restack/SKILL.md

@@ -1,6 +1,8 @@
-# Restack
-
-Use when user asks to "restack", "resolve conflicts", "gt restack", or mentions restack conflicts. Guides through gt restack conflicts with intelligent diagnostics and resolution. (project)
+---
+name: restack
+description: Use when user asks to "restack", "resolve conflicts", "gt restack", or mentions restack conflicts. Guides through gt restack conflicts with intelligent diagnostics and resolution.
+allowed-tools: Bash(gt restack:*), Bash(gt continue:*), Bash(git show:*), Bash(git diff:*), Bash(git log:*), Bash(git ls-tree:*), Bash(pnpm install:*), Bash(git status:*), Bash(gt log:*), Bash(rm pnpm-lock.yaml), Bash(gt add -A:*),
+---
 
 <critical>
 - ALWAYS check current state first (supports both: starting fresh or mid-conflict)
@@ -21,12 +23,14 @@ git status
 ```
 
 **Check for**:
+
 - "rebase in progress"
 - "You are currently rebasing"
 - "Unmerged paths"
 - "both modified:" or other conflict indicators
 
 **Outcomes**:
+
 - Already in conflict (user ran `gt restack` manually) → Skip to step 3 (Gather Diagnostics)
 - Clean state → Proceed to step 2 (Run Restack)
 
@@ -37,6 +41,7 @@ gt restack
 ```
 
 **Outcomes**:
+
 - Success → Acknowledge and exit
 - Conflicts → Proceed to step 3
 
@@ -61,11 +66,13 @@ git diff <file>
 ### 3. Explain Conflict Type
 
 **Simple conflict** (lockfile-only):
+
 - Only `pnpm-lock.yaml` in unmerged files
 - Explain: Lockfile is generated content, safe to regenerate
 - Propose: `pnpm install && gt add -A && gt continue`
 
 **Complex conflict** (multi-file):
+
 - Multiple files in unmerged files
 - Explain each file's conflict
 - Guide through resolution strategy
@@ -75,6 +82,7 @@ git diff <file>
 #### Simple Conflict Resolution
 
 Use AskUserQuestion:
+
 ```
 question: "Only pnpm-lock.yaml is conflicted. Regenerate and continue?"
 header: "Simple Resolution"
@@ -86,6 +94,7 @@ options:
 ```
 
 If confirmed → Execute → Check output of `gt continue`:
+
 - Another conflict → Loop back to step 3 (Gather Diagnostics)
 - Success message → Proceed to step 6 (Success & Reminder)
 
@@ -94,16 +103,19 @@ If confirmed → Execute → Check output of `gt continue`:
 For each non-lockfile conflict:
 
 **a) Show the conflict**:
+
 ```bash
 git diff <file>
 ```
 
 **b) Explain the conflict** (extract from diff):
+
 - What changed in base (HEAD)
 - What changed in branch (incoming)
 - Why it conflicts
 
 **c) Ask resolution strategy** using AskUserQuestion:
+
 ```
 question: "How to resolve <file>?"
 header: "Resolution"
@@ -119,17 +131,20 @@ options:
 ```
 
 **d) Execute choice**:
+
 - `--theirs`: `git checkout --theirs <file>`
 - `--ours`: `git checkout --ours <file>`
 - Manual: Wait for user confirmation
 - Show original: Display and ask again
 
 **e) After all non-lockfile conflicts resolved**:
+
 ```bash
 pnpm install && gt add -A && gt continue
 ```
 
 **f) Check output of `gt continue`**:
+
 - Another conflict → Loop back to step 3 (Gather Diagnostics)
 - Success message → Proceed to step 6 (Success & Reminder)
 
@@ -138,6 +153,7 @@ pnpm install && gt add -A && gt continue
 If diagnostics show "broken lockfile" warning:
 
 Use AskUserQuestion:
+
 ```
 question: "Lockfile is corrupted. Delete and regenerate?"
 header: "Broken Lockfile"
@@ -149,6 +165,7 @@ options:
 ```
 
 After executing choice, check output of command:
+
 - Another conflict → Loop back to step 3 (Gather Diagnostics)
 - Success message → Proceed to step 6 (Success & Reminder)
 
@@ -170,36 +187,42 @@ Note: Always use --force-with-lease for safety
 ## Quick Reference
 
 **Simple lockfile conflict**:
+
 ```bash
 pnpm install && gt add -A && gt continue
 ```
 
 **Multiple files conflicted**:
+
 ```bash
 git diff <file>                    # Inspect
 git checkout --ours/--theirs <file>  # Resolve
 pnpm install && gt add -A && gt continue
 ```
 
 **Broken lockfile**:
+
 ```bash
 rm pnpm-lock.yaml
 pnpm install && gt add -A && gt continue
 ```
 
 **Cancel restack**:
+
 ```bash
 gt abort
 ```
 
 ## Resolution Strategy Guide
 
 **When to use `--theirs` (accept main's version)**:
+
 - Style/formatting conflicts (e.g., quoted vs unquoted YAML)
 - Configuration files where consistency with main matters
 - Files you didn't intentionally change
 
 **When to use `--ours` (keep branch's version)**:
+
 - Your branch added dependencies (e.g., pnpm-workspace.yaml)
 - Feature changes you need to preserve
 - Files where your changes are the whole point

pkgs/client/__tests__/integration/concurrent-operations.test.ts

@@ -41,9 +41,6 @@ describe('Concurrent Operations Tests', () => {
       expect(run1.flow_slug).toBe(flow1.slug);
       expect(run2.flow_slug).toBe(flow2.slug);
 
-      // Give realtime subscriptions time to establish
-      await new Promise(resolve => setTimeout(resolve, 300));
-
       // Get and complete tasks from both flows
       console.log('=== Completing steps ===');
 
@@ -203,9 +200,6 @@ describe('Concurrent Operations Tests', () => {
       const uniqueRunIds = [...new Set(runIds)];
       expect(uniqueRunIds.length).toBe(3);
 
-      // Give subscriptions time to establish
-      await new Promise(resolve => setTimeout(resolve, 300));
-
       // Poll for all tasks and complete them sequentially for reliability
       const allTasks = await readAndStart(sql, sqlClient, testFlow.slug, 5, 5);
       expect(allTasks.length).toBe(3); // One task per run
@@ -280,9 +274,6 @@ describe('Concurrent Operations Tests', () => {
       const runA = await pgflowClient.startFlow(flowA.slug, { type: 'flow-a' });
       const runB = await pgflowClient.startFlow(flowB.slug, { type: 'flow-b' });
 
-      // Give subscriptions time to establish
-      await new Promise(resolve => setTimeout(resolve, 300));
-
       // Get tasks from both flows
       const tasksA = await readAndStart(sql, sqlClient, flowA.slug, 2, 5);
       const tasksB = await readAndStart(sql, sqlClient, flowB.slug, 2, 5);

pkgs/client/__tests__/integration/full-stack-dsl.test.ts

@@ -87,9 +87,6 @@ describe('Full Stack DSL Integration', () => {
       expect(run.flow_slug).toBe(SimpleFlow.slug);
       expect(run.input).toEqual(input);
 
-      // Give realtime subscription time to establish
-      await new Promise((resolve) => setTimeout(resolve, 200));
-
       // 7. Execute the complete flow lifecycle
       console.log('=== Step 1: Completing fetch step ===');
       let tasks = await readAndStart(sql, sqlClient, SimpleFlow.slug, 1, 5);

pkgs/client/__tests__/integration/happy-path-e2e.test.ts

@@ -65,9 +65,6 @@ describe('Happy Path E2E Integration', () => {
       expect(run.status).toBe(FlowRunStatus.Started);
       expect(run.input).toEqual(input);
 
-      // Give realtime subscription time to establish
-      await new Promise(resolve => setTimeout(resolve, 200));
-
       // Step 1: Complete fetch step
       console.log('=== Step 1: Completing fetch step ===');
       let tasks = await readAndStart(sql, sqlClient, testFlow.slug, 1, 5);

pkgs/client/__tests__/integration/input-validation.test.ts

@@ -215,9 +215,6 @@ describe('Input Validation', () => {
       run.on('*', runTracker.callback);
       run.step('producer').on('*', stepTracker.callback);
 
-      // Give realtime subscription time to establish
-      await new Promise(resolve => setTimeout(resolve, 100));
-
       // Execute the producer step
       const tasks = await readAndStart(sql, sqlClient, testFlow.slug, 1, 5);
       expect(tasks).toHaveLength(1);
@@ -294,9 +291,6 @@ describe('Input Validation', () => {
 
       const run = await pgflowClient.startFlow(testFlow.slug, { data: 'test' });
 
-      // Give realtime subscription time to establish
-      await new Promise(resolve => setTimeout(resolve, 100));
-
       // Execute the producer step
       const tasks = await readAndStart(sql, sqlClient, testFlow.slug, 1, 5);
       expect(tasks).toHaveLength(1);

pkgs/client/__tests__/integration/network-resilience.test.ts

@@ -44,9 +44,6 @@ describe('Network Resilience Tests', () => {
         }
       });
 
-      // Give subscription time to establish
-      await new Promise((resolve) => setTimeout(resolve, 200));
-
       // Complete first step before disconnection
       let tasks = await readAndStart(sql, sqlClient, testFlow.slug, 1, 5);
       expect(tasks).toHaveLength(1);
@@ -151,9 +148,6 @@ describe('Network Resilience Tests', () => {
         });
       }
 
-      // Give subscription time to establish
-      await new Promise((resolve) => setTimeout(resolve, 200));
-
       // Complete step while monitoring connection
       const tasks = await readAndStart(sql, sqlClient, testFlow.slug, 1, 5);
       expect(tasks).toHaveLength(1);

pkgs/client/__tests__/integration/real-flow-execution.test.ts

@@ -35,9 +35,6 @@ describe('Real Flow Execution', () => {
       expect(run.run_id).toBeDefined();
       expect(run.flow_slug).toBe(testFlow.slug);
 
-      // Give realtime subscription time to establish properly
-      await new Promise((resolve) => setTimeout(resolve, 2000));
-
       // Poll for task
       const tasks = await readAndStart(sql, sqlClient, testFlow.slug, 1, 5);
 
@@ -111,9 +108,6 @@ describe('Real Flow Execution', () => {
       const step = run.step('event_step');
       step.on('*', stepTracker.callback);
 
-      // Give realtime subscription time to establish
-      await new Promise((resolve) => setTimeout(resolve, 100));
-
       // Poll and complete task
       const tasks = await readAndStart(sql, sqlClient, testFlow.slug, 1, 5);
       await sqlClient.completeTask(tasks[0], { hello: 'world' });
@@ -217,9 +211,6 @@ describe('Real Flow Execution', () => {
       const tracker = createEventTracker();
       dependentStep.on('*', tracker.callback);
 
-      // Give realtime subscription time to establish
-      await new Promise((resolve) => setTimeout(resolve, 100));
-
       // Complete root step - this will trigger dependent_step to start
       const rootTasks = await readAndStart(sql, sqlClient, testFlow.slug, 1, 5);
       expect(rootTasks[0].step_slug).toBe('root_step');
@@ -401,9 +392,6 @@ describe('Real Flow Execution', () => {
       expect(step.status).toBe(FlowStepStatus.Started);
       expect(step.started_at).toBeDefined();
 
-      // Give realtime subscription time to establish
-      await new Promise((resolve) => setTimeout(resolve, 100));
-
       // waitForStatus should resolve immediately since step is already Started
       const waitPromise = step.waitForStatus(FlowStepStatus.Started, {
         timeoutMs: 5000,

pkgs/client/__tests__/integration/realtime-send.test.ts

@@ -37,9 +37,6 @@ describe('Realtime Send Integration', () => {
       await subscriptionPromise;
       console.log('Channel fully subscribed and ready');
 
-      // Additional wait to ensure realtime connection is stable
-      await new Promise((resolve) => setTimeout(resolve, 200));
-
       // 4. Send event via SQL realtime.send() function
       const dbPayload = {
         test_message: 'Hello from SQL realtime.send()!',

pkgs/client/__tests__/integration/reconnection.test.ts

@@ -43,9 +43,6 @@ describe('Reconnection Integration Tests', () => {
         reconnectionEvents.push(event.event_type);
       });
 
-      // Give realtime subscription time to establish
-      await new Promise((resolve) => setTimeout(resolve, 200));
-
       // Simulate network interruption by creating a new client
       // This forces the underlying channel to be recreated
       const newSupabaseClient = createTestSupabaseClient();
@@ -110,9 +107,6 @@ describe('Reconnection Integration Tests', () => {
       expect(run.status).toBe(FlowRunStatus.Started);
       expect(run.input).toEqual(input);
 
-      // Give initial subscription time to establish
-      await new Promise((resolve) => setTimeout(resolve, 200));
-
       // Simulate disconnection by disposing the client and creating a new one
       pgflowClient.dispose(run.run_id);
 
@@ -174,9 +168,6 @@ describe('Reconnection Integration Tests', () => {
       const input = { data: 'rapid-test' };
       const originalRun = await pgflowClient.startFlow(testFlow.slug, input);
 
-      // Give initial subscription time to establish
-      await new Promise((resolve) => setTimeout(resolve, 200));
-
       // Create multiple run instances rapidly (simulates rapid reconnections)
       const runs = await Promise.all([
         pgflowClient.getRun(originalRun.run_id),

pkgs/client/__tests__/integration/regressions/step-failed-event-bug.test.ts

@@ -38,9 +38,6 @@ describe('Step Failed Event Broadcasting', () => {
       step.on('*', stepTracker.callback);
       run.on('*', runTracker.callback);
 
-      // Give realtime subscription time to establish
-      await new Promise(resolve => setTimeout(resolve, 100));
-
       // Poll and start the task (uses pgmq.read_with_poll and pgflow.start_tasks internally)
       const tasks = await readAndStart(sql, sqlClient, testFlow.slug, 1, 5);
       expect(tasks).toHaveLength(1);