claude-code-workflow 6.3.11 → 6.3.12

package/.claude/CLAUDE.md

@@ -1,33 +1,33 @@
-# Claude Instructions
-
-- **CLI Tools Usage**: @~/.claude/workflows/cli-tools-usage.md
-- **Coding Philosophy**: @~/.claude/workflows/coding-philosophy.md
-- **Context Requirements**: @~/.claude/workflows/context-tools.md
-- **File Modification**: @~/.claude/workflows/file-modification.md
-- **CLI Endpoints Config**: @.claude/cli-tools.json
-
-## CLI Endpoints
-
-**Strictly follow the @.claude/cli-tools.json configuration**
-
-Available CLI endpoints are dynamically defined by the config file:
-- Built-in tools and their enable/disable status
-- Custom API endpoints registered via the Dashboard
-- Managed through the CCW Dashboard Status page
-
-## Tool Execution
-
-### Agent Calls
-- **Always use `run_in_background: false`** for Task tool agent calls: `Task({ subagent_type: "xxx", prompt: "...", run_in_background: false })` to ensure synchronous execution and immediate result visibility
-- **TaskOutput usage**: Only use `TaskOutput({ task_id: "xxx", block: false })` + sleep loop to poll completion status. NEVER read intermediate output during agent/CLI execution - wait for final result only
-
-### CLI Tool Calls (ccw cli)
-- **Always use `run_in_background: true`** for Bash tool when calling ccw cli:
-  ```
-  Bash({ command: "ccw cli -p '...' --tool gemini", run_in_background: true })
-  ```
-- **After CLI call**: If no other tasks, stop immediately - let CLI execute in background, do NOT poll with TaskOutput
-
-## Code Diagnostics
-
-- **Prefer `mcp__ide__getDiagnostics`** for code error checking over shell-based TypeScript compilation
+# Claude Instructions
+
+- **CLI Tools Usage**: @~/.claude/workflows/cli-tools-usage.md
+- **Coding Philosophy**: @~/.claude/workflows/coding-philosophy.md
+- **Context Requirements**: @~/.claude/workflows/context-tools.md
+- **File Modification**: @~/.claude/workflows/file-modification.md
+- **CLI Endpoints Config**: @.claude/cli-tools.json
+
+## CLI Endpoints
+
+**Strictly follow the @.claude/cli-tools.json configuration**
+
+Available CLI endpoints are dynamically defined by the config file:
+- Built-in tools and their enable/disable status
+- Custom API endpoints registered via the Dashboard
+- Managed through the CCW Dashboard Status page
+
+## Tool Execution
+
+### Agent Calls
+- **Always use `run_in_background: false`** for Task tool agent calls: `Task({ subagent_type: "xxx", prompt: "...", run_in_background: false })` to ensure synchronous execution and immediate result visibility
+- **TaskOutput usage**: Only use `TaskOutput({ task_id: "xxx", block: false })` + sleep loop to poll completion status. NEVER read intermediate output during agent/CLI execution - wait for final result only
+
+### CLI Tool Calls (ccw cli)
+- **Always use `run_in_background: true`** for Bash tool when calling ccw cli:
+  ```
+  Bash({ command: "ccw cli -p '...' --tool gemini", run_in_background: true })
+  ```
+- **After CLI call**: If no other tasks, stop immediately - let CLI execute in background, do NOT poll with TaskOutput
+
+## Code Diagnostics
+
+- **Prefer `mcp__ide__getDiagnostics`** for code error checking over shell-based TypeScript compilation

package/.claude/commands/issue/queue.md

@@ -329,10 +329,83 @@ const result = Task(
 const summary = JSON.parse(result);
 ```
 
-### Phase 5: Summary & Status Update
+### Phase 5: Validation & Status Update
 
 ```javascript
-// Agent already generated queue files, use summary
+// ============ VALIDATION: Prevent "next returns empty" issues ============
+
+const queuesDir = '.workflow/issues/queues';
+const indexPath = `${queuesDir}/index.json`;
+const queuePath = `${queuesDir}/${queueId}.json`;
+
+// 1. Validate index.json has active_queue_id
+const indexContent = Bash(`cat "${indexPath}" 2>/dev/null || echo '{}'`);
+const index = JSON.parse(indexContent);
+
+if (index.active_queue_id !== queueId) {
+  console.log(`⚠ Fixing: index.json active_queue_id not set to ${queueId}`);
+  index.active_queue_id = queueId;
+  // Ensure queue entry exists in index
+  if (!index.queues) index.queues = [];
+  const existing = index.queues.find(q => q.id === queueId);
+  if (!existing) {
+    index.queues.unshift({
+      id: queueId,
+      status: 'active',
+      issue_ids: summary.issues_queued,
+      total_solutions: summary.total_solutions,
+      completed_solutions: 0,
+      created_at: new Date().toISOString()
+    });
+  }
+  Bash(`echo '${JSON.stringify(index, null, 2)}' > "${indexPath}"`);
+  console.log(`✓ Fixed: index.json updated with active_queue_id: ${queueId}`);
+}
+
+// 2. Validate queue file exists and has correct structure
+const queueContent = Bash(`cat "${queuePath}" 2>/dev/null || echo '{}'`);
+const queue = JSON.parse(queueContent);
+
+if (!queue.solutions || queue.solutions.length === 0) {
+  console.error(`✗ ERROR: Queue file ${queuePath} has no solutions array`);
+  console.error('  Agent did not generate queue correctly. Aborting.');
+  return;
+}
+
+// 3. Validate all solutions have status: "pending" (not "queued" or other)
+let statusFixed = 0;
+for (const sol of queue.solutions) {
+  if (sol.status !== 'pending' && sol.status !== 'executing' && sol.status !== 'completed') {
+    console.log(`⚠ Fixing: ${sol.item_id} status "${sol.status}" → "pending"`);
+    sol.status = 'pending';
+    statusFixed++;
+  }
+}
+
+// 4. Validate at least one item has no dependencies (DAG entry point)
+const entryPoints = queue.solutions.filter(s =>
+  s.status === 'pending' && (!s.depends_on || s.depends_on.length === 0)
+);
+
+if (entryPoints.length === 0) {
+  console.error(`✗ ERROR: No entry points found (all items have dependencies)`);
+  console.error('  This will cause "ccw issue next" to return empty.');
+  console.error('  Check depends_on fields for circular dependencies.');
+  // Try to fix by clearing first item's dependencies
+  if (queue.solutions.length > 0) {
+    console.log(`⚠ Fixing: Clearing depends_on for first item ${queue.solutions[0].item_id}`);
+    queue.solutions[0].depends_on = [];
+  }
+}
+
+// Write back fixed queue if any changes made
+if (statusFixed > 0 || entryPoints.length === 0) {
+  Bash(`echo '${JSON.stringify(queue, null, 2)}' > "${queuePath}"`);
+  console.log(`✓ Queue file updated with ${statusFixed} status fixes`);
+}
+
+// ============ OUTPUT SUMMARY ============
+
 console.log(`
 ## Queue Formed: ${summary.queue_id}
 
@@ -341,15 +414,20 @@ console.log(`
 **Issues**: ${summary.issues_queued.join(', ')}
 **Groups**: ${summary.execution_groups.map(g => `${g.id}(${g.count})`).join(', ')}
 **Conflicts Resolved**: ${summary.conflicts_resolved}
+**Entry Points**: ${entryPoints.length} (items ready for immediate execution)
 
-Next: \`/issue:execute\`
+Next: \`/issue:execute\` or \`ccw issue next\`
 `);
 
-// Update issue statuses via CLI (use `update` for pure field changes)
-// Note: `queue add` has its own logic; here we only need status update
+// Update issue statuses via CLI
 for (const issueId of summary.issues_queued) {
   Bash(`ccw issue update ${issueId} --status queued`);
 }
+
+// Final verification
+const verifyResult = Bash(`ccw issue queue dag 2>/dev/null | head -20`);
+console.log('\n### Verification (DAG Preview):');
+console.log(verifyResult);
 ```
 
 ## Error Handling
@@ -360,6 +438,10 @@ for (const issueId of summary.issues_queued) {
 | Circular dependency | List cycles, abort queue formation |
 | Unresolved conflicts | Agent resolves using ordering rules |
 | Invalid task reference | Skip and warn |
+| **index.json not updated** | Auto-fix: Set active_queue_id to new queue |
+| **Wrong status value** | Auto-fix: Convert non-pending status to "pending" |
+| **No entry points (all have deps)** | Auto-fix: Clear depends_on for first item |
+| **Queue file missing solutions** | Abort with error, agent must regenerate |
 
 ## Related Commands