claude code agent 227
8d8ecaed82
Agent suggestion-edits (comments with suggestedText, #315) piled up: Apply auto-resolved the thread, cluttering the resolved tab, and the anchors stayed in the document. Make them ephemeral: resolving (Apply OR the new Dismiss) makes the comment DISAPPEAR — hard-delete + remove the Yjs `comment` mark — UNLESS the thread has replies, in which case resolve it (preserve the discussion). Manual Resolve is unchanged. Scope: only comments with `suggestedText`. Server: - New collab event `deleteCommentMark` (collaboration.handler) mirroring resolveCommentMark, wiring the existing removeYjsMarkByAttribute to strip the anchor from the doc. - `finalizeAppliedSuggestion` forks on `hasChildren`: replies → apply + resolve (outcome 'resolved'); none → apply + hard-delete + mark removal (outcome 'deleted'). - New `dismissSuggestion` (validates top-level + suggestedText + not applied/not resolved) with the same fork; permission `canComment` (NOT canEdit — dismiss doesn't change page text); audit COMMENT_SUGGESTION_DISMISSED. New POST /comments/dismiss-suggestion; apply stays canEdit. - Both return `{ outcome: 'deleted' | 'resolved' }` so the client picks the optimistic action. Data-integrity (review F1): the shared `deleteEphemeralSuggestion` removes the anchor mark FIRST and FATALLY, then deletes the DB row only on success. The row delete is irreversible, so a mark-removal failure — including the COLLAB_DISABLE_REDIS "no live instance" hard-error — must abort the whole operation (→ 5xx, repeatable) rather than swallow the error and leave a permanent orphan anchor pointing at a deleted comment. `deleteCommentMark` is no longer best-effort (unlike resolve, where the row is kept and a failed mark is recoverable). Client: - `canShowDismiss` (canComment) alongside `canShowApply` (canEdit); a "Dismiss" button next to Apply in the suggestion block. - `useApplySuggestionMutation`/`useDismissSuggestionMutation` reconcile the cache on `outcome` ('deleted' → remove; 'resolved' → relocate to the resolved tab). - Idempotent races (review F2): BOTH apply and dismiss onError reduce 404/400 to success (comment already gone/resolved), dropping it from the cache instead of a red error — restores the #315 apply idempotency the ephemeral delete would otherwise break. - i18n Dismiss / "Не применять" (ru/en). Not done (flagged): deleteCommentMark on the normal /comments/delete path — left out (would change every non-suggestion delete + needs gateway injection; the interactive client already strips the mark via unsetComment). Out of scope per the issue. Tests: server — apply/dismiss delete-vs-resolve fork, all four dismiss state guards, the deleteCommentMark handler, controller authz (dismiss=canComment, apply=canEdit), AND a mark-removal-failure test proving the row is NOT deleted + the error propagates (F1). client — Dismiss show-conditions, outcome cache reconciliation, and 404 idempotent race for BOTH dismiss and apply (F2). Verified: server tsc clean; comment+collaboration jest 144 passed. client tsc clean; vitest 905 passed | 1 expected-fail. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
62 lines
1.9 KiB
TypeScript
62 lines
1.9 KiB
TypeScript
import api from "@/lib/api-client";
|
|
import {
|
|
ICommentParams,
|
|
IComment,
|
|
IResolveComment,
|
|
ISuggestionOutcome,
|
|
} from "@/features/comment/types/comment.types";
|
|
import { IPagination } from "@/lib/types.ts";
|
|
|
|
export async function createComment(
|
|
data: Partial<IComment>,
|
|
): Promise<IComment> {
|
|
const req = await api.post<IComment>("/comments/create", data);
|
|
return req.data;
|
|
}
|
|
|
|
export async function resolveComment(data: IResolveComment): Promise<IComment> {
|
|
const req = await api.post<IComment>(`/comments/resolve`, data);
|
|
return req.data;
|
|
}
|
|
|
|
export async function applySuggestion(
|
|
commentId: string,
|
|
): Promise<ISuggestionOutcome> {
|
|
// Mirrors resolveComment: let axios reject on non-2xx so the mutation can read
|
|
// the 409 body (`{ message, currentText }`) off err.response.data.
|
|
const req = await api.post("/comments/apply-suggestion", { commentId });
|
|
return req.data.data ?? req.data;
|
|
}
|
|
|
|
export async function dismissSuggestion(
|
|
commentId: string,
|
|
): Promise<ISuggestionOutcome> {
|
|
// Dismiss ("Не применять") a suggested edit (#329): the server hard-deletes
|
|
// the comment (or resolves it when it has replies) and returns the outcome.
|
|
const req = await api.post("/comments/dismiss-suggestion", { commentId });
|
|
return req.data.data ?? req.data;
|
|
}
|
|
|
|
export async function updateComment(
|
|
data: Partial<IComment>,
|
|
): Promise<IComment> {
|
|
const req = await api.post<IComment>(`/comments/update`, data);
|
|
return req.data;
|
|
}
|
|
|
|
export async function getCommentById(commentId: string): Promise<IComment> {
|
|
const req = await api.post<IComment>("/comments/info", { commentId });
|
|
return req.data;
|
|
}
|
|
|
|
export async function getPageComments(
|
|
data: ICommentParams,
|
|
): Promise<IPagination<IComment>> {
|
|
const req = await api.post("/comments", data);
|
|
return req.data;
|
|
}
|
|
|
|
export async function deleteComment(commentId: string): Promise<void> {
|
|
await api.post("/comments/delete", { commentId });
|
|
}
|