@mytegroupinc/myte-core 0.0.45 → 0.0.46

package/cli.js

@@ -235,12 +235,6 @@ function printHelp() {
     "  - Set MYTE_API_KEY in a workspace .env (or env var)",
     "  - Set MYTEAI_API_KEY in a workspace .env (or env var) for `myte ai`",
     "",
-    "Live write approval:",
-    "  - Live project-key mutations require --confirm-write --approval-artifact <path>",
-    "  - The artifact must be a local .md, .yml/.yaml, or .json file shown to and approved by the user before the command is rerun",
-    "  - Batch artifacts must enumerate every feedback id, mission id, suggestion id, request id, or PRD item",
-    "  - Read/sync/query/validate, --print-context, and --dry-run commands do not require write approval",
-    "",
     "bootstrap contract:",
     "  - Run from any workspace where you want local MyteCommandCenter data written",
     "  - Writes MyteCommandCenter/data/project.yml plus phases, epics, stories, and missions locally",
@@ -402,8 +396,6 @@ function printHelp() {
     "  --wait                Poll batch status until terminal completion for run-qaqc",
     "  --sync                After run-qaqc completes, refresh local QAQC file",
     "  --force               Allow run-qaqc to bypass stale-state protection when supported",
-    "  --confirm-write       Confirm the user explicitly approved a live Myte project-key mutation",
-    "  --approval-artifact   Local .md/.yml/.json approval artifact shown to and approved by the user",
     "  --no-sync             Skip automatic post-mutation sync for suggestions, missions, and feedback mutations",
     "  --print-context       Print JSON payload and exit (no query call)",
     "  --no-fetch            Don't git fetch origin main/master before diff",
@@ -701,164 +693,6 @@ async function fetchJsonWithTimeout(fetchFn, url, options, timeoutMs) {
   }
 }
 
-const WRITE_APPROVAL_TRANSPORT_KEYS = new Set(["write_approval", "client_session_id"]);
-
-function canonicalizeWritePayload(value) {
-  if (Array.isArray(value)) {
-    return value.map((item) => canonicalizeWritePayload(item));
-  }
-  if (value && typeof value === "object") {
-    return Object.fromEntries(
-      Object.keys(value)
-        .filter((key) => !WRITE_APPROVAL_TRANSPORT_KEYS.has(String(key)))
-        .sort()
-        .map((key) => [key, canonicalizeWritePayload(value[key])])
-    );
-  }
-  return value;
-}
-
-function projectApiWritePayloadHash(payload) {
-  return createHash("sha256")
-    .update(pythonJsonDumpsCompatible(canonicalizeWritePayload(payload || {})))
-    .digest("hex");
-}
-
-function isConfirmWrite(args) {
-  return Boolean(args["confirm-write"] || args.confirmWrite || args.confirm_write);
-}
-
-function resolveWriteApprovalArtifactPath(args) {
-  const explicit = firstNonEmptyString(args["approval-artifact"], args.approvalArtifact, args.approval_artifact);
-  if (!explicit) return "";
-  const resolved = path.resolve(process.cwd(), explicit);
-  if (!fs.existsSync(resolved) || !fs.statSync(resolved).isFile()) {
-    console.error(`Approval artifact not found: ${resolved}`);
-    process.exit(1);
-  }
-  return resolved;
-}
-
-function inferApprovalArtifactKind(filePath, fallbackKind) {
-  const ext = path.extname(String(filePath || "")).toLowerCase();
-  if (ext === ".md" || ext === ".markdown") return "markdown";
-  if (ext === ".yml" || ext === ".yaml") return "yaml";
-  if (ext === ".json") return "json";
-  return fallbackKind || "artifact";
-}
-
-function normalizeApprovalTargets(targets) {
-  return toStringArray(targets).map((item) => item.trim()).filter(Boolean);
-}
-
-function writePayloadItems(payload) {
-  if (Array.isArray(payload?.items)) return payload.items;
-  if (Array.isArray(payload)) return payload;
-  return payload && typeof payload === "object" ? [payload] : [];
-}
-
-function suggestionApprovalTargets(payload) {
-  return writePayloadItems(payload).map((item, index) => {
-    if (!item || typeof item !== "object") return `index:${index}`;
-    return firstNonEmptyString(
-      item.suggestion_id,
-      item.id,
-      item._id,
-      item.mission_id,
-      item.target_mission_id,
-      item.title ? `${item.change_type || "suggestion"}:${item.title}` : ""
-    ) || `index:${index}`;
-  });
-}
-
-function prdApprovalTargets(payload) {
-  return writePayloadItems(payload).map((item, index) => {
-    if (!item || typeof item !== "object") return `index:${index}`;
-    return firstNonEmptyString(item.client_ref, item.title) || `index:${index}`;
-  });
-}
-
-function requireWriteApproval(args, payload, { operation, artifactKind, targets = [], batchCount = null } = {}) {
-  const payloadSha256 = projectApiWritePayloadHash(payload || {});
-  const targetValues = normalizeApprovalTargets(targets);
-  const expectedBatchCount = batchCount !== null && batchCount !== undefined
-    ? Number(batchCount)
-    : targetValues.length > 1
-      ? targetValues.length
-      : null;
-
-  if (!isConfirmWrite(args)) {
-    console.error("Refusing live Myte write without explicit human approval.");
-    console.error(`Operation: ${operation || "unknown"}`);
-    console.error(`Payload SHA256: ${payloadSha256}`);
-    if (targetValues.length) console.error(`Targets: ${targetValues.join(", ")}`);
-    if (expectedBatchCount !== null) console.error(`Batch count: ${expectedBatchCount}`);
-    console.error("Create a local .md/.yml/.json approval artifact that lists the exact operation, payload summary, and every target.");
-    console.error("Show that artifact to the user and ask for explicit approval.");
-    console.error("Then rerun with --confirm-write --approval-artifact <path>.");
-    process.exit(1);
-  }
-
-  const artifactPath = resolveWriteApprovalArtifactPath(args);
-  if (!artifactPath) {
-    console.error("Missing --approval-artifact <path> for approved Myte write.");
-    console.error(`Payload SHA256: ${payloadSha256}`);
-    console.error("The artifact must be a local .md/.yml/.json file shown to and explicitly approved by the user.");
-    process.exit(1);
-  }
-
-  return {
-    approved: true,
-    source: "explicit_user_approval",
-    artifact_path: artifactPath,
-    artifact_kind: inferApprovalArtifactKind(artifactPath, artifactKind),
-    payload_sha256: payloadSha256,
-    targets: targetValues,
-    batch_count: expectedBatchCount,
-  };
-}
-
-function writeApprovalHeaders(writeApproval) {
-  if (!writeApproval) return {};
-  const headers = {
-    "X-Myte-Write-Approval": "explicit_user_approval",
-    "X-Myte-Approval-Artifact": String(writeApproval.artifact_path || ""),
-    "X-Myte-Approval-Artifact-Kind": String(writeApproval.artifact_kind || ""),
-    "X-Myte-Approval-Payload-SHA256": String(writeApproval.payload_sha256 || ""),
-  };
-  if (writeApproval.batch_count !== null && writeApproval.batch_count !== undefined) {
-    headers["X-Myte-Approval-Batch-Count"] = String(writeApproval.batch_count);
-  }
-  if (Array.isArray(writeApproval.targets) && writeApproval.targets.length) {
-    headers["X-Myte-Approval-Targets"] = writeApproval.targets.join(",");
-  }
-  return headers;
-}
-
-function formatProjectApiErrorMessage(body, fallback) {
-  const message = body?.message || fallback;
-  const data = body?.data || {};
-  const code = String(data?.code || "");
-  if (!code.startsWith("myte_write_approval")) {
-    return message;
-  }
-  const lines = [
-    message,
-    `Approval error: ${code}`,
-  ];
-  if (data.operation) lines.push(`Operation: ${data.operation}`);
-  if (data.payload_sha256) lines.push(`Payload SHA256: ${data.payload_sha256}`);
-  if (Array.isArray(data.targets) && data.targets.length) lines.push(`Targets: ${data.targets.join(", ")}`);
-  if (data.batch_count !== undefined && data.batch_count !== null) lines.push(`Batch count: ${data.batch_count}`);
-  if (Array.isArray(data.required_agent_steps) && data.required_agent_steps.length) {
-    lines.push("Required agent steps:");
-    for (const step of data.required_agent_steps) {
-      lines.push(`- ${step}`);
-    }
-  }
-  return lines.join("\n");
-}
-
 function summarizeDiffDiagnosticsForContext(diagnostics) {
   if (!diagnostics) return null;
   const repos = Array.isArray(diagnostics.repo_summaries)
@@ -1922,7 +1756,7 @@ async function fetchFeedbackHistory({ apiBase, key, timeoutMs, feedbackId }) {
   return body.data || {};
 }
 
-async function postFeedbackRefinement({ apiBase, key, timeoutMs, feedbackId, mode, payload, idempotencyKey, clientSessionId, writeApproval }) {
+async function postFeedbackRefinement({ apiBase, key, timeoutMs, feedbackId, mode, payload, idempotencyKey, clientSessionId }) {
   const fetchFn = await getFetch();
   const action = String(mode || "").trim();
   const url = `${apiBase}/project-assistant/feedback/${encodeURIComponent(String(feedbackId || ""))}/refinement/${action}`;
@@ -1930,7 +1764,6 @@ async function postFeedbackRefinement({ apiBase, key, timeoutMs, feedbackId, mod
     "Content-Type": "application/json",
     Authorization: `Bearer ${key}`,
     ...(String(clientSessionId || "").trim() ? { "X-Client-Session-Id": String(clientSessionId).trim() } : {}),
-    ...writeApprovalHeaders(writeApproval),
   };
   if (idempotencyKey) {
     headers["X-Idempotency-Key"] = String(idempotencyKey).trim();
@@ -1947,7 +1780,7 @@ async function postFeedbackRefinement({ apiBase, key, timeoutMs, feedbackId, mod
   );
 
   if (!resp.ok || body.status !== "success") {
-    const msg = formatProjectApiErrorMessage(body, `Feedback refinement ${action} failed (${resp.status})`);
+    const msg = body?.message || `Feedback refinement ${action} failed (${resp.status})`;
     const err = new Error(msg);
     err.status = resp.status;
     err.data = body?.data;
@@ -2026,7 +1859,7 @@ async function fetchFeedbackEvents({ apiBase, key, timeoutMs, feedbackId, limit
   return body.data || {};
 }
 
-async function postFeedbackReviewSubmission({ apiBase, key, timeoutMs, feedbackId, payload, idempotencyKey, clientSessionId, writeApproval }) {
+async function postFeedbackReviewSubmission({ apiBase, key, timeoutMs, feedbackId, payload, idempotencyKey, clientSessionId }) {
   const fetchFn = await getFetch();
   const url = `${apiBase}/project-assistant/feedback/${encodeURIComponent(String(feedbackId || ""))}/refinement/requests`;
   const { resp, body } = await fetchJsonWithTimeout(
@@ -2039,7 +1872,6 @@ async function postFeedbackReviewSubmission({ apiBase, key, timeoutMs, feedbackI
         Authorization: `Bearer ${key}`,
         "X-Idempotency-Key": String(idempotencyKey || "").trim(),
         ...(String(clientSessionId || "").trim() ? { "X-Client-Session-Id": String(clientSessionId).trim() } : {}),
-        ...writeApprovalHeaders(writeApproval),
       },
       body: JSON.stringify(payload || {}),
     },
@@ -2047,7 +1879,7 @@ async function postFeedbackReviewSubmission({ apiBase, key, timeoutMs, feedbackI
   );
 
   if (!resp.ok || body.status !== "success") {
-    const msg = formatProjectApiErrorMessage(body, `Feedback review submission failed (${resp.status})`);
+    const msg = body?.message || `Feedback review submission failed (${resp.status})`;
     const err = new Error(msg);
     err.status = resp.status;
     err.data = body?.data;
@@ -2056,7 +1888,7 @@ async function postFeedbackReviewSubmission({ apiBase, key, timeoutMs, feedbackI
   return body.data || {};
 }
 
-async function postFeedbackReviewRequestMutation({ apiBase, key, timeoutMs, requestId, endpointAction, payload, idempotencyKey, clientSessionId, writeApproval }) {
+async function postFeedbackReviewRequestMutation({ apiBase, key, timeoutMs, requestId, endpointAction, payload, idempotencyKey, clientSessionId }) {
   const fetchFn = await getFetch();
   const url = `${apiBase}/project-assistant/feedback-review-requests/${encodeURIComponent(String(requestId || ""))}/${endpointAction}`;
   const { resp, body } = await fetchJsonWithTimeout(
@@ -2069,7 +1901,6 @@ async function postFeedbackReviewRequestMutation({ apiBase, key, timeoutMs, requ
         Authorization: `Bearer ${key}`,
         "X-Idempotency-Key": String(idempotencyKey || "").trim(),
         ...(String(clientSessionId || "").trim() ? { "X-Client-Session-Id": String(clientSessionId).trim() } : {}),
-        ...writeApprovalHeaders(writeApproval),
       },
       body: JSON.stringify(payload || {}),
     },
@@ -2077,7 +1908,7 @@ async function postFeedbackReviewRequestMutation({ apiBase, key, timeoutMs, requ
   );
 
   if (!resp.ok || body.status !== "success") {
-    const msg = formatProjectApiErrorMessage(body, `Feedback review ${endpointAction} failed (${resp.status})`);
+    const msg = body?.message || `Feedback review ${endpointAction} failed (${resp.status})`;
     const err = new Error(msg);
     err.status = resp.status;
     err.data = body?.data;
@@ -2086,7 +1917,7 @@ async function postFeedbackReviewRequestMutation({ apiBase, key, timeoutMs, requ
   return body.data || {};
 }
 
-async function postFeedbackBatchReviewMutation({ apiBase, key, timeoutMs, payload, idempotencyKey, clientSessionId, writeApproval }) {
+async function postFeedbackBatchReviewMutation({ apiBase, key, timeoutMs, payload, idempotencyKey, clientSessionId }) {
   const fetchFn = await getFetch();
   const url = `${apiBase}/project-assistant/feedback-review-requests/batch-review`;
   const { resp, body } = await fetchJsonWithTimeout(
@@ -2099,7 +1930,6 @@ async function postFeedbackBatchReviewMutation({ apiBase, key, timeoutMs, payloa
         Authorization: `Bearer ${key}`,
         "X-Idempotency-Key": String(idempotencyKey || "").trim(),
         ...(String(clientSessionId || "").trim() ? { "X-Client-Session-Id": String(clientSessionId).trim() } : {}),
-        ...writeApprovalHeaders(writeApproval),
       },
       body: JSON.stringify(payload || {}),
     },
@@ -2107,7 +1937,7 @@ async function postFeedbackBatchReviewMutation({ apiBase, key, timeoutMs, payloa
   );
 
   if (!resp.ok || body.status !== "success") {
-    const msg = formatProjectApiErrorMessage(body, `Feedback batch review failed (${resp.status})`);
+    const msg = body?.message || `Feedback batch review failed (${resp.status})`;
     const err = new Error(msg);
     err.status = resp.status;
     err.data = body?.data;
@@ -2116,7 +1946,7 @@ async function postFeedbackBatchReviewMutation({ apiBase, key, timeoutMs, payloa
   return body.data || {};
 }
 
-async function postFeedbackBoardMutation({ apiBase, key, timeoutMs, feedbackId, endpoint, payload, idempotencyKey, clientSessionId, writeApproval }) {
+async function postFeedbackBoardMutation({ apiBase, key, timeoutMs, feedbackId, endpoint, payload, idempotencyKey, clientSessionId }) {
   const fetchFn = await getFetch();
   const url = `${apiBase}/project-assistant/feedback/${encodeURIComponent(String(feedbackId || ""))}/${endpoint}`;
   const { resp, body } = await fetchJsonWithTimeout(
@@ -2129,7 +1959,6 @@ async function postFeedbackBoardMutation({ apiBase, key, timeoutMs, feedbackId,
         Authorization: `Bearer ${key}`,
         "X-Idempotency-Key": String(idempotencyKey || "").trim(),
         ...(String(clientSessionId || "").trim() ? { "X-Client-Session-Id": String(clientSessionId).trim() } : {}),
-        ...writeApprovalHeaders(writeApproval),
       },
       body: JSON.stringify(payload || {}),
     },
@@ -2137,7 +1966,7 @@ async function postFeedbackBoardMutation({ apiBase, key, timeoutMs, feedbackId,
   );
 
   if (!resp.ok || body.status !== "success") {
-    const msg = formatProjectApiErrorMessage(body, `Feedback board mutation failed (${resp.status})`);
+    const msg = body?.message || `Feedback board mutation failed (${resp.status})`;
     const err = new Error(msg);
     err.status = resp.status;
     err.data = body?.data;
@@ -2146,7 +1975,7 @@ async function postFeedbackBoardMutation({ apiBase, key, timeoutMs, feedbackId,
   return body.data || {};
 }
 
-async function postFeedbackBatchBoardMutation({ apiBase, key, timeoutMs, payload, idempotencyKey, clientSessionId, writeApproval }) {
+async function postFeedbackBatchBoardMutation({ apiBase, key, timeoutMs, payload, idempotencyKey, clientSessionId }) {
   const fetchFn = await getFetch();
   const url = `${apiBase}/project-assistant/feedback/batch-board-move`;
   const { resp, body } = await fetchJsonWithTimeout(
@@ -2159,7 +1988,6 @@ async function postFeedbackBatchBoardMutation({ apiBase, key, timeoutMs, payload
         Authorization: `Bearer ${key}`,
         "X-Idempotency-Key": String(idempotencyKey || "").trim(),
         ...(String(clientSessionId || "").trim() ? { "X-Client-Session-Id": String(clientSessionId).trim() } : {}),
-        ...writeApprovalHeaders(writeApproval),
       },
       body: JSON.stringify(payload || {}),
     },
@@ -2167,7 +1995,7 @@ async function postFeedbackBatchBoardMutation({ apiBase, key, timeoutMs, payload
   );
 
   if (!resp.ok || body.status !== "success") {
-    const msg = formatProjectApiErrorMessage(body, `Feedback batch board mutation failed (${resp.status})`);
+    const msg = body?.message || `Feedback batch board mutation failed (${resp.status})`;
     const err = new Error(msg);
     err.status = resp.status;
     err.data = body?.data;
@@ -2176,7 +2004,7 @@ async function postFeedbackBatchBoardMutation({ apiBase, key, timeoutMs, payload
   return body.data || {};
 }
 
-async function postFeedbackComment({ apiBase, key, timeoutMs, feedbackId, payload, idempotencyKey, clientSessionId, writeApproval }) {
+async function postFeedbackComment({ apiBase, key, timeoutMs, feedbackId, payload, idempotencyKey, clientSessionId }) {
   const fetchFn = await getFetch();
   const url = `${apiBase}/project-assistant/feedback/${encodeURIComponent(String(feedbackId || ""))}/comments`;
   const { resp, body } = await fetchJsonWithTimeout(
@@ -2189,7 +2017,6 @@ async function postFeedbackComment({ apiBase, key, timeoutMs, feedbackId, payloa
         Authorization: `Bearer ${key}`,
         "X-Idempotency-Key": String(idempotencyKey || "").trim(),
         ...(String(clientSessionId || "").trim() ? { "X-Client-Session-Id": String(clientSessionId).trim() } : {}),
-        ...writeApprovalHeaders(writeApproval),
       },
       body: JSON.stringify(payload || {}),
     },
@@ -2197,7 +2024,7 @@ async function postFeedbackComment({ apiBase, key, timeoutMs, feedbackId, payloa
   );
 
   if (!resp.ok || body.status !== "success") {
-    const msg = formatProjectApiErrorMessage(body, `Feedback comment failed (${resp.status})`);
+    const msg = body?.message || `Feedback comment failed (${resp.status})`;
     const err = new Error(msg);
     err.status = resp.status;
     err.data = body?.data;
@@ -2303,7 +2130,7 @@ function resolveProjectMutationIdempotencyKey({ args, operation, payload }) {
   return createHash("sha256").update(fingerprint).digest("hex");
 }
 
-async function postSuggestionsMutation({ apiBase, key, timeoutMs, endpoint, payload, idempotencyKey, clientSessionId, writeApproval }) {
+async function postSuggestionsMutation({ apiBase, key, timeoutMs, endpoint, payload, idempotencyKey, clientSessionId }) {
   const fetchFn = await getFetch();
   const url = `${apiBase}${endpoint}`;
   const { resp, body } = await fetchJsonWithTimeout(
@@ -2316,7 +2143,6 @@ async function postSuggestionsMutation({ apiBase, key, timeoutMs, endpoint, payl
         Authorization: `Bearer ${key}`,
         "X-Idempotency-Key": String(idempotencyKey || "").trim(),
         ...(String(clientSessionId || "").trim() ? { "X-Client-Session-Id": String(clientSessionId).trim() } : {}),
-        ...writeApprovalHeaders(writeApproval),
       },
       body: JSON.stringify(payload),
     },
@@ -2324,16 +2150,15 @@ async function postSuggestionsMutation({ apiBase, key, timeoutMs, endpoint, payl
   );
 
   if (!resp.ok || body.status !== "success") {
-    const msg = formatProjectApiErrorMessage(body, `Mission suggestions request failed (${resp.status})`);
+    const msg = body?.message || `Mission suggestions request failed (${resp.status})`;
     const err = new Error(msg);
     err.status = resp.status;
-    err.data = body?.data;
     throw err;
   }
   return body.data || {};
 }
 
-async function createRunQaqcBatch({ apiBase, key, timeoutMs, payload, idempotencyKey, clientSessionId, writeApproval }) {
+async function createRunQaqcBatch({ apiBase, key, timeoutMs, payload, idempotencyKey, clientSessionId }) {
   const fetchFn = await getFetch();
   const url = `${apiBase}/project-assistant/run-qaqc`;
   const { resp, body } = await fetchJsonWithTimeout(
@@ -2346,7 +2171,6 @@ async function createRunQaqcBatch({ apiBase, key, timeoutMs, payload, idempotenc
         Authorization: `Bearer ${key}`,
         "X-Idempotency-Key": String(idempotencyKey || "").trim(),
         ...(String(clientSessionId || "").trim() ? { "X-Client-Session-Id": String(clientSessionId).trim() } : {}),
-        ...writeApprovalHeaders(writeApproval),
       },
       body: JSON.stringify(payload),
     },
@@ -2354,16 +2178,15 @@ async function createRunQaqcBatch({ apiBase, key, timeoutMs, payload, idempotenc
   );
 
   if (!resp.ok || body.status !== "success") {
-    const msg = formatProjectApiErrorMessage(body, `Run QAQC request failed (${resp.status})`);
+    const msg = body?.message || `Run QAQC request failed (${resp.status})`;
     const err = new Error(msg);
     err.status = resp.status;
-    err.data = body?.data;
     throw err;
   }
   return body.data || {};
 }
 
-async function createMissionStatusUpdate({ apiBase, key, timeoutMs, payload, idempotencyKey, clientSessionId, writeApproval }) {
+async function createMissionStatusUpdate({ apiBase, key, timeoutMs, payload, idempotencyKey, clientSessionId }) {
   const fetchFn = await getFetch();
   const url = `${apiBase}/project-assistant/mission-status-update`;
   const { resp, body } = await fetchJsonWithTimeout(
@@ -2376,7 +2199,6 @@ async function createMissionStatusUpdate({ apiBase, key, timeoutMs, payload, ide
         Authorization: `Bearer ${key}`,
         "X-Idempotency-Key": String(idempotencyKey || "").trim(),
         ...(String(clientSessionId || "").trim() ? { "X-Client-Session-Id": String(clientSessionId).trim() } : {}),
-        ...writeApprovalHeaders(writeApproval),
       },
       body: JSON.stringify(payload),
     },
@@ -2384,16 +2206,15 @@ async function createMissionStatusUpdate({ apiBase, key, timeoutMs, payload, ide
   );
 
   if (!resp.ok || body.status !== "success") {
-    const msg = formatProjectApiErrorMessage(body, `Mission status update request failed (${resp.status})`);
+    const msg = body?.message || `Mission status update request failed (${resp.status})`;
     const err = new Error(msg);
     err.status = resp.status;
-    err.data = body?.data;
     throw err;
   }
   return body.data || {};
 }
 
-async function createMissionArchiveUpdate({ apiBase, key, timeoutMs, endpoint, payload, idempotencyKey, clientSessionId, writeApproval }) {
+async function createMissionArchiveUpdate({ apiBase, key, timeoutMs, endpoint, payload, idempotencyKey, clientSessionId }) {
   const fetchFn = await getFetch();
   const url = `${apiBase}${endpoint}`;
   const { resp, body } = await fetchJsonWithTimeout(
@@ -2406,7 +2227,6 @@ async function createMissionArchiveUpdate({ apiBase, key, timeoutMs, endpoint, p
         Authorization: `Bearer ${key}`,
         "X-Idempotency-Key": String(idempotencyKey || "").trim(),
         ...(String(clientSessionId || "").trim() ? { "X-Client-Session-Id": String(clientSessionId).trim() } : {}),
-        ...writeApprovalHeaders(writeApproval),
       },
       body: JSON.stringify(payload),
     },
@@ -2414,10 +2234,9 @@ async function createMissionArchiveUpdate({ apiBase, key, timeoutMs, endpoint, p
   );
 
   if (!resp.ok || body.status !== "success") {
-    const msg = formatProjectApiErrorMessage(body, `Mission archive request failed (${resp.status})`);
+    const msg = body?.message || `Mission archive request failed (${resp.status})`;
     const err = new Error(msg);
     err.status = resp.status;
-    err.data = body?.data;
     throw err;
   }
   return body.data || {};
@@ -2530,15 +2349,20 @@ async function runRunQaqc(args) {
     process.exit(1);
   }
 
-  const payload = {
-    mission_ids: missionIds,
-    force: Boolean(args.force),
-  };
-  const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
-  if (clientSessionId) payload.client_session_id = clientSessionId;
-  const idempotencyKey = resolveProjectMutationIdempotencyKey({
-    args,
-    operation: "run-qaqc",
+  let payload = {
+    mission_ids: missionIds,
+    force: Boolean(args.force),
+  };
+  const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
+  if (clientSessionId) payload.client_session_id = clientSessionId;
+  payload = withWriteApproval(args, payload, {
+    artifactKind: "yaml",
+    targets: missionIds,
+    batchCount: missionIds.length > 1 ? missionIds.length : null,
+  });
+  const idempotencyKey = resolveProjectMutationIdempotencyKey({
+    args,
+    operation: "run-qaqc",
     payload,
   });
 
@@ -2551,12 +2375,6 @@ async function runRunQaqc(args) {
   const apiBase = resolveApiBase(args);
   const shouldWait = Boolean(args.wait || args.sync);
   const shouldSync = Boolean(args.sync);
-  const writeApproval = requireWriteApproval(args, payload, {
-    operation: "run-qaqc",
-    artifactKind: "yaml",
-    targets: missionIds,
-    batchCount: missionIds.length,
-  });
 
   let data;
   try {
@@ -2567,7 +2385,6 @@ async function runRunQaqc(args) {
       payload,
       idempotencyKey,
       clientSessionId,
-      writeApproval,
     });
   } catch (err) {
     if (err?.name === "AbortError") {
@@ -2692,15 +2509,20 @@ async function runMissionStatus(args) {
     process.exit(1);
   }
 
-  const payload = {
-    mission_ids: missionIds,
-    new_status: newStatus,
-  };
-  const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
-  if (clientSessionId) payload.client_session_id = clientSessionId;
-  const idempotencyKey = resolveProjectMutationIdempotencyKey({
-    args,
-    operation: "mission-status-update",
+  let payload = {
+    mission_ids: missionIds,
+    new_status: newStatus,
+  };
+  const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
+  if (clientSessionId) payload.client_session_id = clientSessionId;
+  payload = withWriteApproval(args, payload, {
+    artifactKind: "yaml",
+    targets: missionIds,
+    batchCount: missionIds.length > 1 ? missionIds.length : null,
+  });
+  const idempotencyKey = resolveProjectMutationIdempotencyKey({
+    args,
+    operation: "mission-status-update",
     payload,
   });
 
@@ -2711,12 +2533,6 @@ async function runMissionStatus(args) {
 
   const timeoutMs = resolveTimeoutMs(args);
   const apiBase = resolveApiBase(args);
-  const writeApproval = requireWriteApproval(args, payload, {
-    operation: "mission-status-update",
-    artifactKind: "yaml",
-    targets: missionIds,
-    batchCount: missionIds.length,
-  });
 
   let data;
   try {
@@ -2727,7 +2543,6 @@ async function runMissionStatus(args) {
       payload,
       idempotencyKey,
       clientSessionId,
-      writeApproval,
     });
   } catch (err) {
     if (err?.name === "AbortError") {
@@ -2802,13 +2617,18 @@ async function runMissionArchiveCommand(args) {
     process.exit(1);
   }
 
-  const payload = {
-    mission_ids: missionIds,
-  };
-  const reason = firstNonEmptyString(args.reason);
-  if (reason) payload.reason = reason;
-  const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
-  if (clientSessionId) payload.client_session_id = clientSessionId;
+  let payload = {
+    mission_ids: missionIds,
+  };
+  const reason = firstNonEmptyString(args.reason);
+  if (reason) payload.reason = reason;
+  const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
+  if (clientSessionId) payload.client_session_id = clientSessionId;
+  payload = withWriteApproval(args, payload, {
+    artifactKind: "yaml",
+    targets: missionIds,
+    batchCount: missionIds.length > 1 ? missionIds.length : null,
+  });
 
   const operation = "mission-archive";
   const idempotencyKey = resolveProjectMutationIdempotencyKey({
@@ -2825,12 +2645,6 @@ async function runMissionArchiveCommand(args) {
   const timeoutMs = resolveTimeoutMs(args);
   const apiBase = resolveApiBase(args);
   const endpoint = "/project-assistant/mission-archive";
-  const writeApproval = requireWriteApproval(args, payload, {
-    operation: "mission-archive",
-    artifactKind: "yaml",
-    targets: missionIds,
-    batchCount: missionIds.length,
-  });
 
   let data;
   try {
@@ -2842,7 +2656,6 @@ async function runMissionArchiveCommand(args) {
       payload,
       idempotencyKey,
       clientSessionId,
-      writeApproval,
     });
   } catch (err) {
     if (err?.name === "AbortError") {
@@ -2924,9 +2737,9 @@ async function runUpdateTeam(args) {
     process.exit(1);
   }
 
-  const payload = {
-    content: await resolveTeamUpdateContent(args),
-  };
+  let payload = {
+    content: await resolveTeamUpdateContent(args),
+  };
 
   if (args["print-context"] || args.printContext || args["dry-run"] || args.dryRun) {
     console.log(JSON.stringify(payload, null, 2));
@@ -2934,18 +2747,18 @@ async function runUpdateTeam(args) {
   }
 
   const timeoutMs = resolveTimeoutMs(args);
-  const apiBase = resolveApiBase(args);
-  const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
-  if (clientSessionId) payload.client_session_id = clientSessionId;
-  const idempotencyKey = resolveProjectMutationIdempotencyKey({
+  const apiBase = resolveApiBase(args);
+  const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
+  if (clientSessionId) payload.client_session_id = clientSessionId;
+  payload = withWriteApproval(args, payload, {
+    artifactKind: "markdown",
+    targets: ["project"],
+  });
+  const idempotencyKey = resolveProjectMutationIdempotencyKey({
     args,
     operation: "update_team",
     payload,
   });
-  const writeApproval = requireWriteApproval(args, payload, {
-    operation: "update_team",
-    artifactKind: "markdown",
-  });
 
   let data;
   try {
@@ -2957,7 +2770,6 @@ async function runUpdateTeam(args) {
       endpoint: "/project-assistant/project-comment",
       idempotencyKey,
       clientSessionId,
-      writeApproval,
     });
   } catch (err) {
     if (err?.name === "AbortError") {
@@ -2997,10 +2809,10 @@ async function runUpdateOwner(args) {
     process.exit(1);
   }
 
-  const payload = {
-    subject,
-    body_markdown: await resolveOwnerUpdateBody(args),
-  };
+  let payload = {
+    subject,
+    body_markdown: await resolveOwnerUpdateBody(args),
+  };
 
   if (args["print-context"] || args.printContext || args["dry-run"] || args.dryRun) {
     console.log(JSON.stringify(payload, null, 2));
@@ -3008,18 +2820,18 @@ async function runUpdateOwner(args) {
   }
 
   const timeoutMs = resolveTimeoutMs(args);
-  const apiBase = resolveApiBase(args);
-  const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
-  if (clientSessionId) payload.client_session_id = clientSessionId;
-  const idempotencyKey = resolveProjectMutationIdempotencyKey({
+  const apiBase = resolveApiBase(args);
+  const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
+  if (clientSessionId) payload.client_session_id = clientSessionId;
+  payload = withWriteApproval(args, payload, {
+    artifactKind: "markdown",
+    targets: ["project"],
+  });
+  const idempotencyKey = resolveProjectMutationIdempotencyKey({
     args,
     operation: "update_owner",
     payload,
   });
-  const writeApproval = requireWriteApproval(args, payload, {
-    operation: "update_owner",
-    artifactKind: "markdown",
-  });
 
   let data;
   try {
@@ -3031,7 +2843,6 @@ async function runUpdateOwner(args) {
       endpoint: "/project-assistant/update-owner",
       idempotencyKey,
       clientSessionId,
-      writeApproval,
     });
   } catch (err) {
     if (err?.name === "AbortError") {
@@ -3079,11 +2890,11 @@ async function runUpdateClient(args) {
     process.exit(1);
   }
 
-  const payload = {
-    subject,
-    body_markdown: await resolveClientUpdateBody(args),
-    target_contact_ids: resolveTargetContactIds(args),
-  };
+  let payload = {
+    subject,
+    body_markdown: await resolveClientUpdateBody(args),
+    target_contact_ids: resolveTargetContactIds(args),
+  };
 
   if (args["print-context"] || args.printContext || args["dry-run"] || args.dryRun) {
     console.log(JSON.stringify(payload, null, 2));
@@ -3091,18 +2902,18 @@ async function runUpdateClient(args) {
   }
 
   const timeoutMs = resolveTimeoutMs(args);
-  const apiBase = resolveApiBase(args);
-  const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
-  if (clientSessionId) payload.client_session_id = clientSessionId;
-  const idempotencyKey = resolveProjectMutationIdempotencyKey({
+  const apiBase = resolveApiBase(args);
+  const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
+  if (clientSessionId) payload.client_session_id = clientSessionId;
+  payload = withWriteApproval(args, payload, {
+    artifactKind: "markdown",
+    targets: ["project"],
+  });
+  const idempotencyKey = resolveProjectMutationIdempotencyKey({
     args,
     operation: "update_client",
     payload,
   });
-  const writeApproval = requireWriteApproval(args, payload, {
-    operation: "update_client",
-    artifactKind: "markdown",
-  });
 
   let data;
   try {
@@ -3114,7 +2925,6 @@ async function runUpdateClient(args) {
       endpoint: "/project-assistant/client-update-drafts",
       idempotencyKey,
       clientSessionId,
-      writeApproval,
     });
   } catch (err) {
     if (err?.name === "AbortError") {
@@ -3210,7 +3020,7 @@ function stringifyYaml(value) {
 function stableJsonStringify(value) {
   if (Array.isArray(value)) {
     return `[${value.map((item) => stableJsonStringify(item)).join(",")}]`;
-  }
+  }
   if (value && typeof value === "object") {
     const entries = Object.keys(value)
       .sort()
@@ -3220,38 +3030,125 @@ function stableJsonStringify(value) {
   return JSON.stringify(value);
 }
 
-function jsonStringifyEnsureAscii(value) {
+function pythonJsonStringify(value) {
+  if (Array.isArray(value)) {
+    return `[${value.map((item) => pythonJsonStringify(item)).join(", ")}]`;
+  }
+  if (value && typeof value === "object") {
+    const entries = Object.keys(value)
+      .filter((key) => value[key] !== undefined)
+      .sort()
+      .map((key) => `${jsonStringEnsureAscii(key)}: ${pythonJsonStringify(value[key])}`);
+    return `{${entries.join(", ")}}`;
+  }
+  if (typeof value === "string") return jsonStringEnsureAscii(value);
+  if (value === undefined) return "null";
+  return JSON.stringify(value);
+}
+
+function jsonStringEnsureAscii(value) {
   return JSON.stringify(String(value)).replace(/[^\x00-\x7F]/g, (char) => {
     const code = char.charCodeAt(0);
     return `\\u${code.toString(16).padStart(4, "0")}`;
   });
 }
 
-function pythonJsonDumpsCompatible(value) {
+function canonicalizeWritePayload(value) {
   if (Array.isArray(value)) {
-    return `[${value.map((item) => pythonJsonDumpsCompatible(item)).join(", ")}]`;
+    return value.map((item) => canonicalizeWritePayload(item));
   }
   if (value && typeof value === "object") {
-    const entries = Object.keys(value)
-      .sort()
-      .map((key) => `${jsonStringifyEnsureAscii(key)}: ${pythonJsonDumpsCompatible(value[key])}`);
-    return `{${entries.join(", ")}}`;
+    const next = {};
+    for (const key of Object.keys(value)) {
+      if (key === "write_approval" || key === "client_session_id") continue;
+      if (value[key] === undefined) continue;
+      next[key] = canonicalizeWritePayload(value[key]);
+    }
+    return next;
+  }
+  return value;
+}
+
+function projectWritePayloadHash(payload) {
+  const canonical = canonicalizeWritePayload(payload || {});
+  return createHash("sha256").update(pythonJsonStringify(canonical)).digest("hex");
+}
+
+function approvalArtifactKind(artifactPath, fallback = "yaml") {
+  const ext = path.extname(String(artifactPath || "")).toLowerCase();
+  if (ext === ".md" || ext === ".markdown") return "markdown";
+  if (ext === ".json") return "json";
+  if (ext === ".yml" || ext === ".yaml") return "yaml";
+  return fallback || "yaml";
+}
+
+function resolveWriteApprovalArtifact(args) {
+  const artifactPath = firstNonEmptyString(
+    args["approval-artifact"],
+    args.approvalArtifact,
+    args.approval_artifact
+  );
+  if (!artifactPath) {
+    console.error("Missing --approval-artifact for confirmed live Myte write.");
+    process.exit(1);
+  }
+  const absPath = path.resolve(String(artifactPath));
+  if (!fs.existsSync(absPath) || !fs.statSync(absPath).isFile()) {
+    console.error(`Approval artifact not found: ${absPath}`);
+    process.exit(1);
   }
-  if (value === null) return "null";
-  if (typeof value === "boolean") return value ? "true" : "false";
-  if (typeof value === "number") {
-    if (Number.isNaN(value)) return "NaN";
-    if (value === Infinity) return "Infinity";
-    if (value === -Infinity) return "-Infinity";
-    return JSON.stringify(value);
+  const ext = path.extname(absPath).toLowerCase();
+  if (![".md", ".markdown", ".yml", ".yaml", ".json"].includes(ext)) {
+    console.error("Approval artifact must be a local .md, .yml, .yaml, or .json file.");
+    process.exit(1);
   }
-  return jsonStringifyEnsureAscii(value);
+  return { displayPath: String(artifactPath), absPath };
+}
+
+function approvalTargets(values) {
+  return uniqueNormalizedStrings(Array.isArray(values) ? values : [values]);
+}
+
+function withWriteApproval(args, payload, { artifactKind = "yaml", targets = [], batchCount = null } = {}) {
+  const confirmed = Boolean(args["confirm-write"] || args.confirmWrite || args.confirm_write);
+  if (!confirmed) return payload;
+  const { displayPath } = resolveWriteApprovalArtifact(args);
+  const nextPayload = { ...(payload || {}) };
+  const normalizedTargets = approvalTargets(targets);
+  const approval = {
+    approved: true,
+    source: "explicit_user_approval",
+    artifact_path: displayPath,
+    artifact_kind: approvalArtifactKind(displayPath, artifactKind),
+    payload_sha256: projectWritePayloadHash(nextPayload),
+  };
+  if (normalizedTargets.length) approval.targets = normalizedTargets;
+  if (batchCount !== undefined && batchCount !== null) approval.batch_count = Number(batchCount);
+  nextPayload.write_approval = approval;
+  return nextPayload;
+}
+
+function suggestionWriteTargets(items) {
+  return (Array.isArray(items) ? items : [])
+    .map((item, index) => {
+      if (!item || typeof item !== "object") return `index:${index}`;
+      const changeType = String(item.change_type || item.action || "suggestion").trim().toLowerCase() || "suggestion";
+      const changeSet = item.change_set && typeof item.change_set === "object" ? item.change_set : item;
+      return firstNonEmptyString(
+        item.suggestion_id,
+        item.mission_id,
+        item.client_ref,
+        changeSet.title ? `${changeType}:${String(changeSet.title).slice(0, 80)}` : "",
+        `index:${index}`
+      );
+    })
+    .filter(Boolean);
 }
 
 function parseYaml(text) {
-  const raw = String(text || "").trim();
-  if (!raw) return null;
-  if (raw.startsWith("{") || raw.startsWith("[")) {
+  const raw = String(text || "").trim();
+  if (!raw) return null;
+  if (raw.startsWith("{") || raw.startsWith("[")) {
     return JSON.parse(raw);
   }
   return parseSimpleYaml(raw);
@@ -4514,7 +4411,7 @@ async function fetchSuggestionsSyncSnapshot({ apiBase, key, timeoutMs, actorScop
   return body.data || {};
 }
 
-async function createProjectSuggestions({ apiBase, key, timeoutMs, payload, idempotencyKey, clientSessionId, writeApproval }) {
+async function createProjectSuggestions({ apiBase, key, timeoutMs, payload, idempotencyKey, clientSessionId }) {
   return postSuggestionsMutation({
     apiBase,
     key,
@@ -4523,11 +4420,10 @@ async function createProjectSuggestions({ apiBase, key, timeoutMs, payload, idem
     payload,
     idempotencyKey,
     clientSessionId,
-    writeApproval,
   });
 }
 
-async function reviseProjectSuggestions({ apiBase, key, timeoutMs, payload, idempotencyKey, clientSessionId, writeApproval }) {
+async function reviseProjectSuggestions({ apiBase, key, timeoutMs, payload, idempotencyKey, clientSessionId }) {
   return postSuggestionsMutation({
     apiBase,
     key,
@@ -4536,11 +4432,10 @@ async function reviseProjectSuggestions({ apiBase, key, timeoutMs, payload, idem
     payload,
     idempotencyKey,
     clientSessionId,
-    writeApproval,
   });
 }
 
-async function reviewProjectSuggestions({ apiBase, key, timeoutMs, payload, idempotencyKey, clientSessionId, writeApproval }) {
+async function reviewProjectSuggestions({ apiBase, key, timeoutMs, payload, idempotencyKey, clientSessionId }) {
   return postSuggestionsMutation({
     apiBase,
     key,
@@ -4549,7 +4444,6 @@ async function reviewProjectSuggestions({ apiBase, key, timeoutMs, payload, idem
     payload,
     idempotencyKey,
     clientSessionId,
-    writeApproval,
   });
 }
 
@@ -4658,20 +4552,19 @@ async function runCreatePrd(args) {
 
   const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
 
-  if (payloads.length === 1) {
-    let data;
-    const payload = payloads[0];
-    if (clientSessionId) payload.client_session_id = clientSessionId;
-    const idempotencyKey = resolveProjectMutationIdempotencyKey({
-      args,
-      operation: "create_prd",
+  if (payloads.length === 1) {
+    let data;
+    let payload = payloads[0];
+    if (clientSessionId) payload.client_session_id = clientSessionId;
+    payload = withWriteApproval(args, payload, {
+      artifactKind: "markdown",
+      targets: [firstNonEmptyString(payload.client_ref, payload.title, "create-prd")],
+    });
+    const idempotencyKey = resolveProjectMutationIdempotencyKey({
+      args,
+      operation: "create_prd",
       payload,
     });
-    const writeApproval = requireWriteApproval(args, payload, {
-      operation: "create_prd",
-      artifactKind: "markdown",
-      targets: prdApprovalTargets(payload),
-    });
     try {
       data = await postSuggestionsMutation({
         apiBase,
@@ -4681,7 +4574,6 @@ async function runCreatePrd(args) {
         endpoint: "/project-assistant/create-prd",
         idempotencyKey,
         clientSessionId,
-        writeApproval,
       });
     } catch (err) {
       if (err?.name === "AbortError") {
@@ -4723,22 +4615,20 @@ async function runCreatePrd(args) {
     failed_count: 0,
     items: [],
   };
-
-  try {
-    const payload = { items: payloads };
-    if (clientSessionId) payload.client_session_id = clientSessionId;
-    const idempotencyKey = resolveProjectMutationIdempotencyKey({
-      args,
-      operation: "create_prds",
+
+  try {
+    let payload = { items: payloads };
+    if (clientSessionId) payload.client_session_id = clientSessionId;
+    payload = withWriteApproval(args, payload, {
+      artifactKind: "markdown",
+      targets: payloads.map((item, index) => firstNonEmptyString(item.client_ref, item.title, `index:${index}`)),
+      batchCount: payloads.length,
+    });
+    const idempotencyKey = resolveProjectMutationIdempotencyKey({
+      args,
+      operation: "create_prds",
       payload,
     });
-    const prdTargets = prdApprovalTargets(payload);
-    const writeApproval = requireWriteApproval(args, payload, {
-      operation: "create_prds",
-      artifactKind: "markdown",
-      targets: prdTargets,
-      batchCount: prdTargets.length,
-    });
     const data = await postSuggestionsMutation({
       apiBase,
       key,
@@ -4747,7 +4637,6 @@ async function runCreatePrd(args) {
       endpoint: "/project-assistant/create-prds",
       idempotencyKey,
       clientSessionId,
-      writeApproval,
     });
     aggregated.project_id = data.project_id || null;
     aggregated.created_count = Number(data.created_count || 0);
@@ -5304,7 +5193,8 @@ async function runFeedbackValidateOrApply(args, mode) {
     console.error("Missing MYTE_API_KEY (project key) in environment/.env");
     process.exit(1);
   }
-  const { absPath, payload } = readFeedbackRefinementArtifact(args);
+  const { absPath, payload: artifactPayload } = readFeedbackRefinementArtifact(args);
+  let payload = artifactPayload;
   const feedbackId = firstNonEmptyString(args["feedback-id"], args.feedbackId, args.feedback_id, payload.feedback_id);
   if (!feedbackId) {
     console.error("Feedback refinement artifact is missing feedback_id.");
@@ -5314,26 +5204,25 @@ async function runFeedbackValidateOrApply(args, mode) {
 
   const timeoutMs = resolveTimeoutMs(args);
   const apiBase = resolveApiBase(args);
-  const clientSessionId = firstNonEmptyString(
+  const clientSessionId = firstNonEmptyString(
     args["client-session-id"],
     args.clientSessionId,
     args.client_session_id,
     payload.client_session_id
-  );
-  const idempotencyKey = mode === "apply"
+  );
+  if (mode === "apply") {
+    payload = withWriteApproval(args, payload, {
+      artifactKind: "yaml",
+      targets: [feedbackId],
+    });
+  }
+  const idempotencyKey = mode === "apply"
     ? resolveProjectMutationIdempotencyKey({
         args,
         operation: `feedback_refinement_apply:${feedbackId}`,
         payload,
       })
     : null;
-  const writeApproval = mode === "apply"
-    ? requireWriteApproval(args, payload, {
-        operation: `feedback_refinement_apply:${feedbackId}`,
-        artifactKind: "yaml",
-        targets: [feedbackId],
-      })
-    : null;
 
   let data;
   try {
@@ -5346,7 +5235,6 @@ async function runFeedbackValidateOrApply(args, mode) {
       payload,
       idempotencyKey,
       clientSessionId,
-      writeApproval,
     });
   } catch (err) {
     if (args.json) {
@@ -5458,7 +5346,8 @@ async function runFeedbackSubmit(args) {
     console.error("Missing MYTE_API_KEY (project key) in environment/.env");
     process.exit(1);
   }
-  const { absPath, payload } = readFeedbackRefinementArtifact(args);
+  const { absPath, payload: artifactPayload } = readFeedbackRefinementArtifact(args);
+  let payload = artifactPayload;
   const feedbackId = firstNonEmptyString(args["feedback-id"], args.feedbackId, args.feedback_id, payload.feedback_id);
   if (!feedbackId) {
     console.error("Feedback refinement artifact is missing feedback_id.");
@@ -5466,22 +5355,21 @@ async function runFeedbackSubmit(args) {
   }
   const timeoutMs = resolveTimeoutMs(args);
   const apiBase = resolveApiBase(args);
-  const clientSessionId = firstNonEmptyString(
+  const clientSessionId = firstNonEmptyString(
     args["client-session-id"],
     args.clientSessionId,
     args.client_session_id,
     payload.client_session_id
-  );
-  const idempotencyKey = resolveProjectMutationIdempotencyKey({
+  );
+  payload = withWriteApproval(args, payload, {
+    artifactKind: "yaml",
+    targets: [feedbackId],
+  });
+  const idempotencyKey = resolveProjectMutationIdempotencyKey({
     args,
     operation: `feedback_refinement_request_submit:${feedbackId}`,
     payload,
   });
-  const writeApproval = requireWriteApproval(args, payload, {
-    operation: `feedback_refinement_request_submit:${feedbackId}`,
-    artifactKind: "yaml",
-    targets: [feedbackId],
-  });
 
   let data;
   try {
@@ -5493,7 +5381,6 @@ async function runFeedbackSubmit(args) {
       payload,
       idempotencyKey,
       clientSessionId,
-      writeApproval,
     });
   } catch (err) {
     if (args.json) {
@@ -5535,25 +5422,25 @@ async function runFeedbackRevise(args) {
     console.error("Missing --request-id.");
     process.exit(1);
   }
-  const { absPath, payload } = readFeedbackRefinementArtifact(args);
+  const { absPath, payload: artifactPayload } = readFeedbackRefinementArtifact(args);
+  let payload = artifactPayload;
   const timeoutMs = resolveTimeoutMs(args);
   const apiBase = resolveApiBase(args);
-  const clientSessionId = firstNonEmptyString(
+  const clientSessionId = firstNonEmptyString(
     args["client-session-id"],
     args.clientSessionId,
     args.client_session_id,
     payload.client_session_id
-  );
-  const idempotencyKey = resolveProjectMutationIdempotencyKey({
+  );
+  payload = withWriteApproval(args, payload, {
+    artifactKind: "yaml",
+    targets: [requestId],
+  });
+  const idempotencyKey = resolveProjectMutationIdempotencyKey({
     args,
     operation: `feedback_refinement_request_revise:${requestId}`,
     payload,
   });
-  const writeApproval = requireWriteApproval(args, payload, {
-    operation: `feedback_refinement_request_revise:${requestId}`,
-    artifactKind: "yaml",
-    targets: [requestId],
-  });
 
   let data;
   try {
@@ -5566,7 +5453,6 @@ async function runFeedbackRevise(args) {
       payload,
       idempotencyKey,
       clientSessionId,
-      writeApproval,
     });
   } catch (err) {
     if (args.json) {
@@ -5684,13 +5570,18 @@ async function runFeedbackReviewDecision(args) {
       process.exit(1);
     }
     const reason = firstNonEmptyString(args.reason, args["review-note"], args.reviewNote, args.review_note);
-    const payload = {
-      ...(isPlainObject(filePayload) && !Array.isArray(filePayload) ? filePayload : {}),
-      items,
-      action,
-      reason: reason || undefined,
-    };
-    const timeoutMs = resolveTimeoutMs(args);
+    let payload = {
+      ...(isPlainObject(filePayload) && !Array.isArray(filePayload) ? filePayload : {}),
+      items,
+      action,
+      reason: reason || undefined,
+    };
+    payload = withWriteApproval(args, payload, {
+      artifactKind: "yaml",
+      targets: items.map((item) => item.request_id || item.id).filter(Boolean),
+      batchCount: items.length,
+    });
+    const timeoutMs = resolveTimeoutMs(args);
     const apiBase = resolveApiBase(args);
     const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id, payload.client_session_id);
     const idempotencyKey = resolveProjectMutationIdempotencyKey({
@@ -5698,15 +5589,6 @@ async function runFeedbackReviewDecision(args) {
       operation: `feedback_review_batch:${action}:${items.map((item) => item.request_id || item.id || "").join(",")}`,
       payload,
     });
-    const requestTargets = items
-      .map((item, index) => firstNonEmptyString(item.request_id, item.id, item._id) || `index:${index}`)
-      .filter(Boolean);
-    const writeApproval = requireWriteApproval(args, payload, {
-      operation: `feedback_review_batch:${action}`,
-      artifactKind: "yaml",
-      targets: requestTargets,
-      batchCount: items.length,
-    });
 
     let data;
     try {
@@ -5717,7 +5599,6 @@ async function runFeedbackReviewDecision(args) {
         payload,
         idempotencyKey,
         clientSessionId,
-        writeApproval,
       });
     } catch (err) {
       if (args.json) {
@@ -5745,8 +5626,8 @@ async function runFeedbackReviewDecision(args) {
     process.exit(1);
   }
 
-  let payload;
-  try {
+  let payload;
+  try {
     payload = filePayload && !Array.isArray(filePayload?.items)
       ? buildFeedbackReviewDecisionPayload({ ...args, file: "" }, action)
       : buildFeedbackReviewDecisionPayload(args, action);
@@ -5757,8 +5638,12 @@ async function runFeedbackReviewDecision(args) {
     console.error(err?.message || err);
     process.exit(1);
   }
-  const endpointAction = action === "request_changes" ? "request-changes" : action === "cancel" ? "cancel" : "review";
-  const timeoutMs = resolveTimeoutMs(args);
+  const endpointAction = action === "request_changes" ? "request-changes" : action === "cancel" ? "cancel" : "review";
+  payload = withWriteApproval(args, payload, {
+    artifactKind: "yaml",
+    targets: [requestId],
+  });
+  const timeoutMs = resolveTimeoutMs(args);
   const apiBase = resolveApiBase(args);
   const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id, payload.client_session_id);
   const operationAction = action === "request_changes" ? "request_changes" : action;
@@ -5767,11 +5652,6 @@ async function runFeedbackReviewDecision(args) {
     operation: `feedback_review_request_${operationAction}:${requestId}`,
     payload,
   });
-  const writeApproval = requireWriteApproval(args, payload, {
-    operation: `feedback_review_request_${operationAction}:${requestId}`,
-    artifactKind: "yaml",
-    targets: [requestId],
-  });
 
   let data;
   try {
@@ -5784,7 +5664,6 @@ async function runFeedbackReviewDecision(args) {
       payload,
       idempotencyKey,
       clientSessionId,
-      writeApproval,
     });
   } catch (err) {
     if (args.json) {
@@ -5823,32 +5702,31 @@ async function runFeedbackMove(args) {
     process.exit(1);
   }
   const fromState = firstNonEmptyString(args["from-state"], args.fromState, args.from_state) || undefined;
-  const payload = {
-    to_state: toState,
-    reason: firstNonEmptyString(args.reason) || undefined,
-  };
+  let payload = {
+    to_state: toState,
+    reason: firstNonEmptyString(args.reason) || undefined,
+  };
   const timeoutMs = resolveTimeoutMs(args);
   const apiBase = resolveApiBase(args);
   const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
   const isBatch = feedbackIds.length > 1 || Boolean(firstNonEmptyString(args["feedback-ids"], args.feedbackIds, args.feedback_ids));
-  if (isBatch) {
-    payload.feedback_ids = feedbackIds;
+  if (isBatch) {
+    payload.feedback_ids = feedbackIds;
     if (fromState) {
       payload.from_states = Object.fromEntries(feedbackIds.map((id) => [id, fromState]));
     }
     const batchId = firstNonEmptyString(args["batch-id"], args.batchId, args.batch_id);
-    if (batchId) payload.batch_id = batchId;
-    const idempotencyKey = resolveProjectMutationIdempotencyKey({
+    if (batchId) payload.batch_id = batchId;
+    payload = withWriteApproval(args, payload, {
+      artifactKind: "yaml",
+      targets: feedbackIds,
+      batchCount: feedbackIds.length,
+    });
+    const idempotencyKey = resolveProjectMutationIdempotencyKey({
       args,
       operation: `feedback_board_batch_move:${toState}:${feedbackIds.join(",")}`,
       payload,
     });
-    const writeApproval = requireWriteApproval(args, payload, {
-      operation: `feedback_board_batch_move:${toState}`,
-      artifactKind: "yaml",
-      targets: feedbackIds,
-      batchCount: feedbackIds.length,
-    });
     let data;
     try {
       data = await postFeedbackBatchBoardMutation({
@@ -5858,7 +5736,6 @@ async function runFeedbackMove(args) {
         payload,
         idempotencyKey,
         clientSessionId,
-        writeApproval,
       });
     } catch (err) {
       if (args.json) {
@@ -5879,18 +5756,17 @@ async function runFeedbackMove(args) {
     if (postSync?.error) console.error(`Feedback sync warning: ${postSync.error}`);
     return;
   }
-
-  payload.from_state = fromState;
-  const idempotencyKey = resolveProjectMutationIdempotencyKey({
+
+  payload.from_state = fromState;
+  payload = withWriteApproval(args, payload, {
+    artifactKind: "yaml",
+    targets: [feedbackId],
+  });
+  const idempotencyKey = resolveProjectMutationIdempotencyKey({
     args,
     operation: `feedback_board_move:${feedbackId}`,
     payload,
   });
-  const writeApproval = requireWriteApproval(args, payload, {
-    operation: `feedback_board_move:${feedbackId}`,
-    artifactKind: "yaml",
-    targets: [feedbackId],
-  });
 
   let data;
   try {
@@ -5903,7 +5779,6 @@ async function runFeedbackMove(args) {
       payload,
       idempotencyKey,
       clientSessionId,
-      writeApproval,
     });
   } catch (err) {
     if (args.json) {
@@ -5944,12 +5819,16 @@ async function runFeedbackComment(args) {
     process.exit(1);
   }
 
-  const payload = { content };
-  const timeoutMs = resolveTimeoutMs(args);
-  const apiBase = resolveApiBase(args);
-  const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
-  if (clientSessionId) payload.client_session_id = clientSessionId;
-  const idempotencyKey = resolveProjectMutationIdempotencyKey({
+  let payload = { content };
+  const timeoutMs = resolveTimeoutMs(args);
+  const apiBase = resolveApiBase(args);
+  const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
+  if (clientSessionId) payload.client_session_id = clientSessionId;
+  payload = withWriteApproval(args, payload, {
+    artifactKind: "markdown",
+    targets: [feedbackId],
+  });
+  const idempotencyKey = resolveProjectMutationIdempotencyKey({
     args,
     operation: `feedback_comment_create:${feedbackId}`,
     payload,
@@ -5960,12 +5839,6 @@ async function runFeedbackComment(args) {
     return;
   }
 
-  const writeApproval = requireWriteApproval(args, payload, {
-    operation: `feedback_comment_create:${feedbackId}`,
-    artifactKind: "markdown",
-    targets: [feedbackId],
-  });
-
   let data;
   try {
     data = await postFeedbackComment({
@@ -5976,7 +5849,6 @@ async function runFeedbackComment(args) {
       payload,
       idempotencyKey,
       clientSessionId,
-      writeApproval,
     });
   } catch (err) {
     if (args.json) {
@@ -6025,27 +5897,20 @@ async function runFeedbackUndo(args) {
     console.error("Missing --event-id.");
     process.exit(1);
   }
-  const payload = { reason: firstNonEmptyString(args.reason) || undefined };
-  const timeoutMs = resolveTimeoutMs(args);
-  const apiBase = resolveApiBase(args);
-  const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
-  const idempotencyKey = resolveProjectMutationIdempotencyKey({
+  let payload = { reason: firstNonEmptyString(args.reason) || undefined };
+  const timeoutMs = resolveTimeoutMs(args);
+  const apiBase = resolveApiBase(args);
+  const clientSessionId = firstNonEmptyString(args["client-session-id"], args.clientSessionId, args.client_session_id);
+  payload = withWriteApproval(args, payload, {
+    artifactKind: "yaml",
+    targets: [feedbackId, eventId],
+  });
+  const idempotencyKey = resolveProjectMutationIdempotencyKey({
     args,
     operation: `feedback_event_undo:${feedbackId}:${eventId}`,
     payload,
   });
 
-  if (args["print-context"] || args.printContext || args["dry-run"] || args.dryRun) {
-    console.log(JSON.stringify(payload, null, 2));
-    return;
-  }
-
-  const writeApproval = requireWriteApproval(args, payload, {
-    operation: `feedback_event_undo:${feedbackId}:${eventId}`,
-    artifactKind: "yaml",
-    targets: [feedbackId, eventId],
-  });
-
   let data;
   try {
     data = await postFeedbackBoardMutation({
@@ -6057,7 +5922,6 @@ async function runFeedbackUndo(args) {
       payload,
       idempotencyKey,
       clientSessionId,
-      writeApproval,
     });
   } catch (err) {
     if (args.json) {
@@ -6343,14 +6207,20 @@ async function buildSuggestionsMutationContext(args, mode) {
   if (clientSessionId && !payload.client_session_id) {
     payload.client_session_id = clientSessionId;
   }
-  if (mode === "create") {
-    validateSuggestionsCreatePayload(payload);
-  } else if (mode === "revise") {
-    validateSuggestionsRevisePayload(payload);
-  }
-  const idempotencyKey = resolveSuggestionsIdempotencyKey({
-    args,
-    mode,
+  if (mode === "create") {
+    validateSuggestionsCreatePayload(payload);
+  } else if (mode === "revise") {
+    validateSuggestionsRevisePayload(payload);
+  }
+  const items = Array.isArray(payload?.items) ? payload.items : [];
+  payload = withWriteApproval(args, payload, {
+    artifactKind: "yaml",
+    targets: suggestionWriteTargets(items),
+    batchCount: items.length > 1 ? items.length : null,
+  });
+  const idempotencyKey = resolveSuggestionsIdempotencyKey({
+    args,
+    mode,
     actorScope,
     payload,
   });
@@ -6436,14 +6306,6 @@ async function runSuggestionsCreate(args) {
     return;
   }
 
-  const createTargets = suggestionApprovalTargets(context.payload);
-  const writeApproval = requireWriteApproval(args, context.payload, {
-    operation: "suggestions.create",
-    artifactKind: "yaml",
-    targets: createTargets,
-    batchCount: createTargets.length > 1 ? createTargets.length : null,
-  });
-
   let data;
   try {
     data = await createProjectSuggestions({
@@ -6453,7 +6315,6 @@ async function runSuggestionsCreate(args) {
       payload: context.payload,
       idempotencyKey: context.idempotencyKey,
       clientSessionId: context.clientSessionId,
-      writeApproval,
     });
   } catch (err) {
     console.error("Suggestions create failed:", err?.message || err);
@@ -6530,14 +6391,6 @@ async function runSuggestionsRevise(args) {
     return;
   }
 
-  const reviseTargets = suggestionApprovalTargets(context.payload);
-  const writeApproval = requireWriteApproval(args, context.payload, {
-    operation: "suggestions.revise",
-    artifactKind: "yaml",
-    targets: reviseTargets,
-    batchCount: reviseTargets.length > 1 ? reviseTargets.length : null,
-  });
-
   let data;
   try {
     data = await reviseProjectSuggestions({
@@ -6547,7 +6400,6 @@ async function runSuggestionsRevise(args) {
       payload: context.payload,
       idempotencyKey: context.idempotencyKey,
       clientSessionId: context.clientSessionId,
-      writeApproval,
     });
   } catch (err) {
     console.error("Suggestions revise failed:", err?.message || err);
@@ -6622,14 +6474,6 @@ async function runSuggestionsReview(args) {
     return;
   }
 
-  const reviewTargets = suggestionApprovalTargets(context.payload);
-  const writeApproval = requireWriteApproval(args, context.payload, {
-    operation: "suggestions.review",
-    artifactKind: "yaml",
-    targets: reviewTargets,
-    batchCount: reviewTargets.length > 1 ? reviewTargets.length : null,
-  });
-
   let data;
   try {
     data = await reviewProjectSuggestions({
@@ -6639,7 +6483,6 @@ async function runSuggestionsReview(args) {
       payload: context.payload,
       idempotencyKey: context.idempotencyKey,
       clientSessionId: context.clientSessionId,
-      writeApproval,
     });
   } catch (err) {
     console.error("Suggestions review failed:", err?.message || err);