@clickraft/cli 0.8.5 → 0.8.6

package/dist/index.js

@@ -636,6 +636,47 @@ function errorMessage(err) {
   if (err instanceof Error) return err.message;
   return String(err);
 }
+async function applyWorkflowWithRetry(params) {
+  try {
+    return await patch(params);
+  } catch (err) {
+    if (!(err instanceof ApiError)) throw err;
+    const isRevConflict = err.code === "CANVAS_REV_MISMATCH" || err.meta.status === 409 && err.meta.details != null;
+    if (!isRevConflict || !params.autoRev) throw err;
+    const snapshot = await params.client.request({
+      method: "GET",
+      path: `/workflows/${encodeURIComponent(params.id)}`,
+      responseSchema: params.schemas.detail,
+      signal: params.signal
+    });
+    const retryResult = await patch({
+      ...params,
+      canvasRev: snapshot.canvas_rev,
+      // Fresh key — the body changed (different canvas_rev), so reusing the
+      // caller's key would trigger IDEMPOTENCY_KEY_CONFLICT.
+      idempotencyKey: void 0
+    });
+    return { ...retryResult, retriedWithRev: snapshot.canvas_rev };
+  }
+}
+async function patch(params) {
+  const data = await params.client.request({
+    method: "PATCH",
+    path: `/workflows/${encodeURIComponent(params.id)}`,
+    body: {
+      canvas_rev: params.canvasRev,
+      operations: params.operations
+    },
+    idempotencyKey: params.idempotencyKey,
+    responseSchema: params.schemas.mutate,
+    signal: params.signal
+  });
+  return {
+    canvasRev: data.canvas_rev,
+    applied: data.applied,
+    workflow: data.workflow
+  };
+}
 
 // src/errors/codes.ts
 var LOGIN_HINT = "Run `clickraft login` to authenticate.";
@@ -3087,54 +3128,19 @@ async function buildWorkflowClient(opts) {
   });
 }
 
-// src/commands/workflow/get.ts
-async function getWorkflow(opts) {
-  const client = opts.client ?? await buildWorkflowClient(opts);
-  return client.request({
-    method: "GET",
-    path: `/workflows/${encodeURIComponent(opts.id)}`,
-    responseSchema: WorkflowDetailSchema,
-    signal: opts.signal
-  });
-}
-
 // src/commands/workflow/apply.ts
 async function applyWorkflow(opts) {
   const client = opts.client ?? await buildWorkflowClient(opts);
-  try {
-    return await patchWorkflow(client, opts);
-  } catch (err) {
-    if (!(err instanceof ApiError)) throw err;
-    const isRevConflict = err.code === "CANVAS_REV_MISMATCH" || err.meta.status === 409 && err.meta.details != null;
-    if (!isRevConflict || !opts.autoRev) throw err;
-    const snapshot = await getWorkflow({ id: opts.id, client, signal: opts.signal });
-    const retryResult = await patchWorkflow(client, {
-      ...opts,
-      canvasRev: snapshot.canvas_rev,
-      // Fresh key — the body changed (different canvas_rev), so reusing
-      // the caller's key would trigger IDEMPOTENCY_KEY_CONFLICT.
-      idempotencyKey: void 0
-    });
-    return { ...retryResult, retriedWithRev: snapshot.canvas_rev };
-  }
-}
-async function patchWorkflow(client, opts) {
-  const data = await client.request({
-    method: "PATCH",
-    path: `/workflows/${encodeURIComponent(opts.id)}`,
-    body: {
-      canvas_rev: opts.canvasRev,
-      operations: opts.operations
-    },
+  return applyWorkflowWithRetry({
+    client,
+    id: opts.id,
+    canvasRev: opts.canvasRev,
+    operations: opts.operations,
     idempotencyKey: opts.idempotencyKey,
-    responseSchema: WorkflowMutateResponseSchema,
-    signal: opts.signal
+    autoRev: opts.autoRev,
+    signal: opts.signal,
+    schemas: { mutate: WorkflowMutateResponseSchema, detail: WorkflowDetailSchema }
   });
-  return {
-    canvasRev: data.canvas_rev,
-    applied: data.applied,
-    workflow: data.workflow
-  };
 }
 
 // src/commands/workflow/create.ts
@@ -3165,6 +3171,17 @@ async function createWorkflow(opts) {
   });
 }
 
+// src/commands/workflow/get.ts
+async function getWorkflow(opts) {
+  const client = opts.client ?? await buildWorkflowClient(opts);
+  return client.request({
+    method: "GET",
+    path: `/workflows/${encodeURIComponent(opts.id)}`,
+    responseSchema: WorkflowDetailSchema,
+    signal: opts.signal
+  });
+}
+
 // src/commands/workflow/list.ts
 async function listWorkflows(opts) {
   const client = opts.client ?? await buildWorkflowClient(opts);