breaking-brake
diff --git a/Collapse file
‎.github/workflows/security-scan.yml‎
Copy file name to clipboardExpand all lines: .github/workflows/security-scan.yml
+1Lines changed: 1 addition & 0 deletions b/Collapse file
‎.github/workflows/security-scan.yml‎
Copy file name to clipboardExpand all lines: .github/workflows/security-scan.yml
+1Lines changed: 1 addition & 0 deletions
diff --git a/Collapse file
‎package-lock.json‎
Copy file name to clipboardExpand all lines: package-lock.json
+9-9Lines changed: 9 additions & 9 deletions b/Collapse file
‎package-lock.json‎
Copy file name to clipboardExpand all lines: package-lock.json
+9-9Lines changed: 9 additions & 9 deletions
diff --git a/Collapse file
‎resources/ai-editing-skill-template.md‎
Copy file name to clipboardExpand all lines: resources/ai-editing-skill-template.md
+5-2Lines changed: 5 additions & 2 deletions
Display the source diff
Display the rich diff b/Collapse file
‎resources/ai-editing-skill-template.md‎
Copy file name to clipboardExpand all lines: resources/ai-editing-skill-template.md
+5-2Lines changed: 5 additions & 2 deletions
Display the source diff
Display the rich diff
diff --git a/Collapse file
‎src/extension/commands/open-editor.ts‎
Copy file name to clipboardExpand all lines: src/extension/commands/open-editor.ts
+64Lines changed: 64 additions & 0 deletions b/Collapse file
‎src/extension/commands/open-editor.ts‎
Copy file name to clipboardExpand all lines: src/extension/commands/open-editor.ts
+64Lines changed: 64 additions & 0 deletions
@@ -5,6 +5,7 @@ on:
     branches: [main, production]
   pull_request:
     branches: [main, production]
+  workflow_dispatch:
   schedule:
     # 毎週月曜日 9:00 JST (00:00 UTC) に実行
     - cron: '0 0 * * 1'
 
@@ -1,13 +1,16 @@
 ---
 name: cc-workflow-ai-editor
-description: AI workflow editor for CC Workflow Studio. Create and edit visual AI agent workflows through interactive conversation using MCP tools (get_workflow_schema, get_current_workflow, apply_workflow). Use when the user wants to create a new workflow, modify an existing workflow, or edit the workflow canvas in CC Workflow Studio via the built-in MCP server.
+description: AI workflow editor for CC Workflow Studio. Create and edit visual AI agent workflows through interactive conversation using MCP tools (get_workflow_schema, get_current_workflow, apply_workflow, update_nodes). Use when the user wants to create a new workflow, modify an existing workflow, or edit the workflow canvas in CC Workflow Studio via the built-in MCP server.
 ---
 
 1. Call `get_workflow_schema` via `cc-workflow-studio` MCP server
 2. Call `get_current_workflow` via `cc-workflow-studio` MCP server
 3. Ask the user what to create or modify
 4. Generate workflow JSON: use built-in sub-agents (builtInType: explore/plan/general-purpose) by default. Only call `list_available_agents` when the user explicitly asks to use an existing custom sub-agent.
-5. Call `apply_workflow` via `cc-workflow-studio` MCP server, fix errors if any
+5. Apply changes via `cc-workflow-studio` MCP server:
+   - **New workflow or structural changes** (add/remove nodes/connections): use `apply_workflow`
+   - **Partial updates to existing nodes** (change name, position, or data): use `update_nodes` (more token-efficient)
+   - Fix errors if any
 6. Ask for feedback, repeat from step 4
 
 ## Group Node
 
@@ -5,6 +5,7 @@
  * Based on: /specs/001-cc-wf-studio/contracts/vscode-extension-api.md section 1.1
  */
 
+import * as crypto from 'node:crypto';
 import * as vscode from 'vscode';
 import type {
   AiEditingProvider,
@@ -25,6 +26,7 @@ import {
   startAntigravityTask,
 } from '../services/antigravity-extension-service';
 import { cancelGeneration } from '../services/claude-code-service';
+import { CommentarySessionManager } from '../services/commentary-session-manager';
 import { FileService } from '../services/file-service';
 import {
   getConfigTargetsForProvider,
@@ -105,6 +107,11 @@ let slackTokenManager: SlackTokenManager;
 let slackApiService: SlackApiService;
 let activeOAuthService: ReturnType<typeof createOAuthService> | null = null;
 let anthropicApiKeyManager: AnthropicApiKeyManager;
+let commentarySessionManager: CommentarySessionManager;
+let isCommentaryEnabled = false;
+let commentaryProvider: import('../../shared/types/messages').CommentaryProvider = 'claude-code';
+let commentaryCopilotModel: import('../../shared/types/messages').CopilotModel | undefined;
+let commentaryLanguage = 'English';
 
 /**
  * Import parameters for workflow import from Slack
@@ -187,6 +194,9 @@ export function registerOpenEditorCommand(
         return;
       }
 
+      // Initialize Commentary Session Manager
+      commentarySessionManager = new CommentarySessionManager();
+
       // Create new webview panel
       currentPanel = vscode.window.createWebviewPanel(
         'ccWorkflowStudio',
@@ -426,12 +436,40 @@ export function registerOpenEditorCommand(
                     // Non-fatal: continue with run even if MCP auto-start fails
                   }
 
+                  // Generate session ID for JSONL tracking (Commentary AI)
+                  const sessionId = isCommentaryEnabled ? crypto.randomUUID() : undefined;
+
                   // Run the slash command in terminal
                   const result = executeSlashCommandInTerminal({
                     workflowName: message.payload.workflow.name,
                     workingDirectory: workspacePath,
+                    sessionId,
                   });
 
+                  // Start Commentary AI if enabled
+                  if (isCommentaryEnabled && sessionId) {
+                    const slashCommandPath = exportResult.exportedFiles?.find((f) =>
+                      f.replaceAll('\\', '/').includes('/commands/')
+                    );
+                    commentarySessionManager
+                      .startCommentary(
+                        sessionId,
+                        message.payload.workflow.name,
+                        workspacePath,
+                        webview,
+                        result.terminal,
+                        commentaryProvider,
+                        commentaryCopilotModel,
+                        commentaryLanguage,
+                        slashCommandPath
+                      )
+                      .catch((err) => {
+                        log('WARN', 'Failed to start commentary', {
+                          error: err instanceof Error ? err.message : String(err),
+                        });
+                      });
+                  }
+
                   // Send success response
                   webview.postMessage({
                     type: 'RUN_AS_SLASH_COMMAND_SUCCESS',
@@ -440,6 +478,7 @@ export function registerOpenEditorCommand(
                       workflowName: message.payload.workflow.name,
                       terminalName: result.terminalName,
                       timestamp: new Date().toISOString(),
+                      sessionId,
                     },
                   });
                 } catch (error) {
@@ -1998,6 +2037,28 @@ export function registerOpenEditorCommand(
               break;
             }
 
+            case 'TOGGLE_COMMENTARY': {
+              isCommentaryEnabled = message.payload?.enabled ?? false;
+              commentaryProvider = message.payload?.provider ?? 'claude-code';
+              commentaryCopilotModel = message.payload?.copilotModel;
+              commentaryLanguage = message.payload?.language ?? 'English';
+              log('INFO', 'Commentary AI toggled', {
+                enabled: isCommentaryEnabled,
+                provider: commentaryProvider,
+                copilotModel: commentaryCopilotModel,
+                language: commentaryLanguage,
+              });
+              if (!isCommentaryEnabled) {
+                commentarySessionManager?.stopCommentary();
+              }
+              break;
+            }
+
+            case 'STOP_COMMENTARY': {
+              commentarySessionManager?.stopCommentary();
+              break;
+            }
+
             default:
               console.warn('Unknown message type:', message);
           }
@@ -2014,6 +2075,9 @@ export function registerOpenEditorCommand(
             activeOAuthService.cancelPolling();
             activeOAuthService = null;
           }
+          // Stop Commentary AI session
+          commentarySessionManager?.dispose();
+
           // Disconnect MCP server manager from webview
           const disposeManager = getMcpServerManager();
           if (disposeManager) {