Merge latest main and preserve teacher upgrade safeguards

shared/coding-teacher.ts

@@ -80,7 +80,11 @@ export interface TeacherRequest {
   discussionSnapshot?: unknown;
   discussionError?: string;
   replyParseError?: string;
-  /** Original answer retained when reply parsing fails; never fed back as context. */
+  /** No trustworthy complete reply could be recovered from the received text. */
+  replyIncomplete?: boolean;
+  /** New-output shortcut rejection survives later historical prose repair. */
+  replyQuickRepliesRejected?: boolean;
+  /** Original answer retained for failed or repaired parsing; never fed back as context. */
   unparsedResponse?: string;
   toolActivity?: TeacherToolActivity[];