Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.project-docs/20-architecture/module-map.md
#	src/pages/ImageCanvas/DesignConversationPane.tsx
#	tests/unit/image-canvas-page.test.tsx

shared/image-workspace.ts

@@ -448,9 +448,35 @@ export type DesignAssistantDeltaEvent = {
   delta: string;
 };
 
+export type DesignAssistantProgressStage =
+  | 'understanding'
+  | 'reviewing_context'
+  | 'validating'
+  | 'composing';
+
+export type DesignAssistantProgressEvent = {
+  id: string;
+  type: 'design.assistant.progress';
+  workspaceId: string;
+  directionId: string;
+  clientOperationId: string;
+  stage: DesignAssistantProgressStage;
+  message: string;
+};
+
+export type DesignCommandTerminalEvent = {
+  id: string;
+  type: 'command.completed' | 'command.failed' | 'command.cancelled';
+  workspaceId: string;
+  clientOperationId: string;
+  outcome: 'succeeded' | 'failed' | 'cancelled';
+  errorCode: string | null;
+};
+
 export type DesignDirectionUpdatedEvent = {
   id: string;
   type: 'design.direction.updated';
+  clientOperationId: string;
   replayed: boolean;
   operation: DesignInteractionOutcome;
   form: DesignForm;
@@ -480,7 +506,9 @@ export type DesignWorkspaceUpdatedEvent = {
 
 export type DesignWorkspaceEvent =
   | DesignSessionSnapshotEvent
+  | DesignAssistantProgressEvent
   | DesignAssistantDeltaEvent
+  | DesignCommandTerminalEvent
   | DesignDirectionUpdatedEvent
   | DesignQuoteBlockedEvent
   | DesignWorkspaceUpdatedEvent;