@doist/automations-cli 1.21.0 → 1.21.1

package/dist/index.js

@@ -6899,7 +6899,7 @@ import { fileURLToPath } from "node:url";
 // package.json
 var package_default = {
   name: "@doist/automations-cli",
-  version: "1.21.0",
+  version: "1.21.1",
   description: "Command-line client for Todoist Automations",
   type: "module",
   bin: {
@@ -6944,7 +6944,7 @@ var package_default = {
   },
   dependencies: {
     "@doist/cli-core": "1.7.0",
-    "@napi-rs/keyring": "2.1.0",
+    "@napi-rs/keyring": "2.1.1",
     ai: "7.0.137",
     commander: "15.0.0",
     oauth4webapi: "3.8.8",
@@ -32872,6 +32872,313 @@ async function findAutomationsUsingConnection(api, connectionId, options) {
   }
 }
 
+// ../../packages/sdk/dist/esm/drafts/draft-api.js
+function bindDraftApi(api, workspaceId, { signal } = {}) {
+  const createOptions = { signal, translate: false };
+  const listConnections = (args) => api.connections.list(args, { signal });
+  if (workspaceId === null) {
+    return {
+      workspaceId: null,
+      get: (draftId) => api.automationDrafts.get(draftId, { signal }),
+      create: (manifest) => api.automationDrafts.create(manifest, createOptions),
+      update: (draftId, manifest) => api.automationDrafts.update(draftId, manifest, { signal }),
+      createAutomationDraft: (automationId) => api.automations.createDraft(automationId, { signal }),
+      upsertConnection: (draftId, body) => api.automationDraftConnections.upsert(draftId, body, { signal }),
+      getConnectionStatus: async (draftId) => (await api.automationDraftConnections.getStatus(draftId, { signal })).validation,
+      listConnections,
+      finalize: (draftId) => api.automationDrafts.finalize(draftId, { signal }),
+      getAutomation: (automationId) => api.automations.get(automationId, { signal }),
+      test: (draftId, request2) => api.automationDrafts.test(draftId, request2, { signal }),
+      getTestRun: (draftId, runId, args, requestSignal) => api.automationDrafts.getTestRun(draftId, runId, args, {
+        signal: requestSignal ?? signal
+      })
+    };
+  }
+  return {
+    workspaceId,
+    get: (draftId) => api.workspaceAutomationDrafts.get(workspaceId, draftId, { signal }),
+    create: (manifest) => api.workspaceAutomationDrafts.create(workspaceId, manifest, createOptions),
+    update: (draftId, manifest) => api.workspaceAutomationDrafts.update(workspaceId, draftId, manifest, { signal }),
+    createAutomationDraft: (automationId) => api.workspaceAutomations.createDraft(workspaceId, automationId, { signal }),
+    upsertConnection: (draftId, body) => api.workspaceAutomationDraftConnections.upsert(workspaceId, draftId, body, { signal }),
+    getConnectionStatus: async (draftId) => (await api.workspaceAutomationDraftConnections.getStatus(workspaceId, draftId, {
+      signal
+    })).validation,
+    listConnections,
+    finalize: (draftId) => api.workspaceAutomationDrafts.finalize(workspaceId, draftId, { signal }),
+    getAutomation: (automationId) => api.workspaceAutomations.get(workspaceId, automationId, { signal }),
+    test: (draftId, request2) => api.workspaceAutomationDrafts.test(workspaceId, draftId, request2, { signal }),
+    getTestRun: (draftId, runId, args, requestSignal) => api.workspaceAutomationDrafts.getTestRun(workspaceId, draftId, runId, args, {
+      signal: requestSignal ?? signal
+    })
+  };
+}
+
+// ../../packages/sdk/dist/esm/drafts/draft-workflow-error.js
+var DraftWorkflowError = class extends Error {
+  code;
+  draftId;
+  automationId;
+  constructor(code, message, options = {}) {
+    super(message, { cause: options.cause });
+    this.name = "DraftWorkflowError";
+    this.code = code;
+    this.draftId = options.draftId;
+    this.automationId = options.automationId;
+  }
+};
+function getErrorMessage(error62) {
+  return error62 instanceof Error ? error62.message : String(error62);
+}
+
+// ../../packages/sdk/dist/esm/drafts/draft-changes.js
+async function createDraft(draftApi, { manifest, automationId }) {
+  const partialManifest = parsePartialManifest(manifest);
+  if (automationId === void 0) {
+    const result = await draftApi.create(partialManifest);
+    return { action: "created", target: toDraftTarget(result.draft), ...result };
+  }
+  const { draft } = await openEditDraft(draftApi, automationId);
+  try {
+    const result = await draftApi.update(draft.id, partialManifest);
+    return { action: "created", target: toDraftTarget(result.draft), ...result };
+  } catch (error62) {
+    if (!isManifestRejection(error62))
+      throw error62;
+    throw new DraftWorkflowError("draft_manifest_rejected", `Opened draft ${draft.id} for automation ${automationId}, but the manifest was rejected: ${getErrorMessage(error62)}`, { draftId: draft.id, automationId, cause: error62 });
+  }
+}
+async function updateDraft(draftApi, { draftId, manifest }) {
+  const partialManifest = parsePartialManifest(manifest);
+  const result = await draftApi.update(draftId, partialManifest);
+  return { action: "updated", target: toDraftTarget(result.draft), ...result };
+}
+function toDraftTarget(draft) {
+  return draft.automationId === null ? { kind: "new" } : { kind: "automation", automationId: draft.automationId };
+}
+function parsePartialManifest(value) {
+  const validation = validatePartialManifest(value);
+  if (!validation.isValid) {
+    throw new DraftWorkflowError("manifest_invalid", `Manifest is invalid: ${validation.errors.join("; ")}`);
+  }
+  return validation.data;
+}
+async function openEditDraft(draftApi, automationId) {
+  try {
+    return await draftApi.createAutomationDraft(automationId);
+  } catch (error62) {
+    const conflict = getOpenDraftConflictError(error62);
+    if (!conflict)
+      throw error62;
+    throw new DraftWorkflowError("draft_conflict", `Automation ${automationId} already has an open draft ${conflict.draftId}.`, { draftId: conflict.draftId, automationId, cause: error62 });
+  }
+}
+function isManifestRejection(error62) {
+  return error62 instanceof AutomationsRequestError && (error62.httpStatusCode === 400 || error62.httpStatusCode === 422);
+}
+
+// ../../packages/sdk/dist/esm/drafts/connect-draft.js
+async function connectDraft(draftApi, { draftId, selections, auto }) {
+  const bound = [];
+  const required2 = selections.length > 0 ? getRequiredConnectorsFromManifest((await draftApi.get(draftId)).draft.partialManifest) : /* @__PURE__ */ new Map();
+  const explicit = selections.flatMap((selection) => {
+    const types = required2.get(selection.connectorId);
+    if (!types || selection.connectionType && !types.has(selection.connectionType)) {
+      const slot = selection.connectionType ? `${selection.connectorId} (${selection.connectionType})` : selection.connectorId;
+      throw new DraftWorkflowError("connector_not_required", `Connector ${slot} is not used by draft ${draftId}. Required: ${describeRequired(required2)}.`, { draftId });
+    }
+    const connectionTypes = selection.connectionType ? [selection.connectionType] : [...types];
+    return connectionTypes.map((connectionType) => ({ ...selection, connectionType }));
+  });
+  for (const { connectorId, connectionType, connectionId } of explicit) {
+    await draftApi.upsertConnection(draftId, { connectorId, connectionType, connectionId });
+    bound.push({ connectorId, connectionType, connectionId, mode: "explicit" });
+  }
+  const unresolved = [];
+  if (auto) {
+    const status = await draftApi.getConnectionStatus(draftId);
+    for (const connector of status.connectors) {
+      for (const connectionType of ["mcp", "trigger"]) {
+        const slot = connector[connectionType];
+        if (!slot.required || slot.status !== "missing")
+          continue;
+        const { connections } = await draftApi.listConnections({
+          connectorId: connector.id,
+          capability: connectionType,
+          status: "authorized"
+        });
+        const [only] = connections;
+        if (connections.length === 1 && only) {
+          await draftApi.upsertConnection(draftId, {
+            connectorId: connector.id,
+            connectionType,
+            connectionId: only.id
+          });
+          bound.push({
+            connectorId: connector.id,
+            connectionType,
+            connectionId: only.id,
+            mode: "auto"
+          });
+          continue;
+        }
+        unresolved.push({
+          connectorId: connector.id,
+          connectionType,
+          reason: connections.length === 0 ? "no_connection" : "multiple_connections",
+          candidateConnectionIds: connections.map((connection) => connection.id)
+        });
+      }
+    }
+  }
+  const { isValid, missing } = await draftApi.getConnectionStatus(draftId);
+  return { action: "connected", draftId, bound, unresolved, isValid, missing };
+}
+function describeRequired(required2) {
+  if (required2.size === 0)
+    return "none";
+  return [...required2].map(([connectorId, types]) => `${connectorId} (${[...types].join(", ")})`).join(", ");
+}
+
+// ../../packages/sdk/dist/esm/drafts/manifest-diff.js
+function stableStringify(value) {
+  return JSON.stringify(sortKeys(value));
+}
+function isDeepEqual(left, right) {
+  return stableStringify(left) === stableStringify(right);
+}
+function diffManifests(before, after) {
+  const previous = asManifest(before);
+  const next = asManifest(after);
+  const changedProperties = [.../* @__PURE__ */ new Set([...Object.keys(previous), ...Object.keys(next)])].filter((key) => key !== "steps").filter((key) => !isDeepEqual(previous[key], next[key])).sort();
+  const previousSteps = stepsById(previous.steps);
+  const nextSteps = stepsById(next.steps);
+  const added = [...nextSteps.keys()].filter((id) => !previousSteps.has(id));
+  const removed = [...previousSteps.keys()].filter((id) => !nextSteps.has(id));
+  const changed = [...nextSteps].filter(([id, step]) => previousSteps.has(id) && !isDeepEqual(previousSteps.get(id), step)).map(([id]) => id);
+  const sharedBefore = [...previousSteps.keys()].filter((id) => nextSteps.has(id));
+  const sharedAfter = [...nextSteps.keys()].filter((id) => previousSteps.has(id));
+  const reordered = sharedBefore.some((id, index) => sharedAfter[index] !== id);
+  return {
+    changedProperties,
+    steps: { added, removed, changed, reordered },
+    isEmpty: changedProperties.length === 0 && added.length === 0 && removed.length === 0 && changed.length === 0 && !reordered
+  };
+}
+function asManifest(value) {
+  return isManifestRecord(value) ? value : {};
+}
+function stepsById(steps) {
+  const byId = /* @__PURE__ */ new Map();
+  if (!Array.isArray(steps))
+    return byId;
+  steps.forEach((step, index) => {
+    const id = isManifestRecord(step) && typeof step.id === "string" ? step.id : `#${index}`;
+    byId.set(id, step);
+  });
+  return byId;
+}
+function sortKeys(value) {
+  if (Array.isArray(value))
+    return value.map(sortKeys);
+  if (!isManifestRecord(value))
+    return value;
+  return Object.fromEntries(Object.keys(value).sort().map((key) => [key, sortKeys(value[key])]));
+}
+
+// ../../packages/sdk/dist/esm/drafts/publish-draft.js
+async function publishDraft(draftApi, { draftId, confirmed }) {
+  const { summary, manifest } = await summarizeForPublish(draftApi, draftId);
+  if (!confirmed) {
+    return { action: "publish_preview", summary };
+  }
+  let published;
+  try {
+    published = await draftApi.finalize(draftId);
+  } catch (error62) {
+    const notReady = getDraftNotReadyError(error62);
+    if (!notReady)
+      throw error62;
+    throw new DraftWorkflowError("draft_not_ready", notReady.message, {
+      draftId,
+      cause: error62
+    });
+  }
+  let automation;
+  try {
+    automation = await draftApi.getAutomation(published.automation.id);
+  } catch (error62) {
+    return {
+      action: "published",
+      summary,
+      automation: published.automation,
+      verification: { status: "unavailable", reason: getErrorMessage(error62) }
+    };
+  }
+  const expected = normaliseManifest(manifest);
+  const actual = normaliseManifest(automation.manifest);
+  return {
+    action: "published",
+    summary,
+    automation,
+    verification: isDeepEqual(expected, actual) ? { status: "matched" } : { status: "mismatched", mismatch: diffManifests(expected, actual) }
+  };
+}
+async function summarizeForPublish(draftApi, draftId) {
+  const [detail, connections] = await Promise.all([
+    draftApi.get(draftId),
+    draftApi.getConnectionStatus(draftId)
+  ]);
+  const { draft } = detail;
+  const target = toDraftTarget(draft);
+  const published = target.kind === "automation" ? await draftApi.getAutomation(target.automationId) : null;
+  const diff = published ? diffManifests(normaliseManifest(published.manifest), normaliseManifest(draft.partialManifest)) : null;
+  const summary = {
+    draftId,
+    name: readManifestName(draft.partialManifest),
+    scope: draft.workspaceId === null ? { kind: "personal" } : {
+      kind: "workspace",
+      workspaceId: draft.workspaceId,
+      // A new workspace automation publishes team-visible; an
+      // edit keeps whatever the automation already has.
+      visibility: published?.visibility ?? "workspace"
+    },
+    target,
+    enabled: published?.enabled ?? true,
+    validation: { state: detail.state, issues: detail.issues },
+    connections: {
+      isValid: connections.isValid,
+      connected: connections.connected.map(({ connectorId, connectionType, connectionId }) => ({
+        connectorId,
+        connectionType,
+        connectionId
+      })),
+      missing: connections.missing
+    },
+    schedule: describeSchedule(draft.partialManifest),
+    diff
+  };
+  return { summary, manifest: draft.partialManifest };
+}
+function describeSchedule(manifest) {
+  if (!hasTriggerType(manifest))
+    return null;
+  const schedule = getManifestTriggers(manifest).find((trigger) => trigger.type === "schedule");
+  if (!schedule || schedule.type !== "schedule")
+    return null;
+  return getScheduleTriggerDescription({ value: schedule.value, timeFormat: "24h" });
+}
+function normaliseManifest(manifest) {
+  const parsed = manifestSchema.safeParse(manifest);
+  return parsed.success ? parsed.data : manifest;
+}
+function readManifestName(manifest) {
+  if (!isManifestRecord(manifest))
+    return "(unnamed)";
+  const { name } = manifest;
+  return typeof name === "string" && name.trim() ? name : "(unnamed)";
+}
+
 // src/lib/auth-environment.ts
 import { InvalidArgumentError } from "commander";
 var ENVIRONMENTS = {
@@ -33095,7 +33402,7 @@ function createAutomationsTokenStore(options = {}) {
 }
 
 // src/lib/credentials.ts
-import { CliError, getConfigPath as getConfigPath3, getErrorMessage as getErrorMessage3 } from "@doist/cli-core";
+import { CliError, getConfigPath as getConfigPath3, getErrorMessage as getErrorMessage4 } from "@doist/cli-core";
 import { refreshAccessToken } from "@doist/cli-core/auth";
 
 // src/lib/auth-scopes.ts
@@ -33185,7 +33492,7 @@ function formatScopesHelp() {
 }
 
 // src/lib/auth-provider.ts
-import { getErrorMessage } from "@doist/cli-core";
+import { getErrorMessage as getErrorMessage2 } from "@doist/cli-core";
 import { createPkceProvider } from "@doist/cli-core/auth";
 var ERROR_HINTS = ["Try again: tda auth login"];
 function createAutomationsAuthProvider() {
@@ -33225,7 +33532,7 @@ async function fetchTodoistUser(token, todoistApiUrl) {
     });
   } catch (error62) {
     throw new Error(
-      `Could not reach Todoist to identify the account: ${getErrorMessage(error62)}`
+      `Could not reach Todoist to identify the account: ${getErrorMessage2(error62)}`
     );
   }
   if (!response.ok) {
@@ -33238,7 +33545,7 @@ async function fetchTodoistUser(token, todoistApiUrl) {
     user = await response.json();
   } catch (error62) {
     throw new Error(
-      `Todoist returned an unreadable identity response: ${getErrorMessage(error62)}`
+      `Todoist returned an unreadable identity response: ${getErrorMessage2(error62)}`
     );
   }
   return { id: requireUserId(user.id), email: typeof user.email === "string" ? user.email : "" };
@@ -33250,13 +33557,13 @@ function requireUserId(id) {
 }
 
 // src/lib/errors.ts
-import { getErrorMessage as getErrorMessage2 } from "@doist/cli-core";
+import { getErrorMessage as getErrorMessage3 } from "@doist/cli-core";
 function getErrorCode(error62) {
   return typeof error62 === "object" && error62 !== null && "code" in error62 ? String(error62.code) : void 0;
 }
 function formatError2(error62) {
   const hints = errorHints(error62);
-  return [getErrorMessage2(error62), ...hints.map((hint) => `  - ${hint}`)].join("\n");
+  return [getErrorMessage3(error62), ...hints.map((hint) => `  - ${hint}`)].join("\n");
 }
 function errorHints(error62) {
   if (typeof error62 !== "object" || error62 === null || !("hints" in error62)) return [];
@@ -33336,7 +33643,7 @@ function accessTokenAfterFailedRefresh(error62, snapshot) {
       if (hasTokenLifeLeft(snapshot)) return snapshot.bundle.accessToken;
       throw new CredentialError(
         "REFRESH_FAILED",
-        `Could not refresh your access token: ${getErrorMessage3(error62)}`,
+        `Could not refresh your access token: ${getErrorMessage4(error62)}`,
         ["Check your network connection and try again."]
       );
   }
@@ -33364,19 +33671,19 @@ function resolveAfterStoreFailure(error62) {
   if (code !== "AUTH_STORE_READ_FAILED") {
     throw new CredentialError(
       "CREDENTIAL_UNREADABLE",
-      `Could not read the stored credential: ${getErrorMessage3(error62)}`,
+      `Could not read the stored credential: ${getErrorMessage4(error62)}`,
       ["Run `tda auth logout` and then `tda auth login` to replace it."]
     );
   }
   const fallback = fromEnvironment();
   if (fallback) {
     process.stderr.write(
-      `Warning: could not read the stored credential (${getErrorMessage3(error62)}). Using ${TOKEN_ENV_VAR}.
+      `Warning: could not read the stored credential (${getErrorMessage4(error62)}). Using ${TOKEN_ENV_VAR}.
 `
     );
     return fallback;
   }
-  throw new CredentialError("CREDENTIAL_UNREADABLE", getErrorMessage3(error62), [
+  throw new CredentialError("CREDENTIAL_UNREADABLE", getErrorMessage4(error62), [
     `Set ${TOKEN_ENV_VAR} to bypass the credential store.`,
     "Or re-run `tda auth login --credential-store plaintext`."
   ]);
@@ -34039,7 +34346,7 @@ function attachAutomationsLoginCommand(auth) {
 }
 
 // src/commands/auth/logout.ts
-import { getErrorMessage as getErrorMessage4 } from "@doist/cli-core";
+import { getErrorMessage as getErrorMessage5 } from "@doist/cli-core";
 import { attachLogoutCommand } from "@doist/cli-core/auth";
 
 // src/lib/spinner.ts
@@ -34087,7 +34394,7 @@ async function revokeToken(token) {
     });
     return response.ok ? void 0 : `HTTP ${response.status}`;
   } catch (error62) {
-    return getErrorMessage4(error62);
+    return getErrorMessage5(error62);
   }
 }
 
@@ -34218,7 +34525,7 @@ function parsePositiveInteger(value) {
 }
 
 // src/lib/command-error.ts
-import { formatJson as formatJson4, formatNdjson as formatNdjson4, getErrorMessage as getErrorMessage5 } from "@doist/cli-core";
+import { formatJson as formatJson4, formatNdjson as formatNdjson4, getErrorMessage as getErrorMessage6 } from "@doist/cli-core";
 
 // src/lib/billing-errors.ts
 import { CliError as CliError2 } from "@doist/cli-core";
@@ -34297,7 +34604,7 @@ function renderFailure(error62, context = {}) {
   const explained = explainBillingFailure(authExplained);
   const code = getErrorCode(explained);
   return {
-    message: getErrorMessage5(explained),
+    message: getErrorMessage6(explained),
     humanMessage: formatError2(explained),
     ...code ? { code } : {}
   };
@@ -36955,7 +37262,7 @@ function registerConnectorCommand(program) {
 }
 
 // src/lib/manifest-input.ts
-import { CliError as CliError3, getErrorMessage as getErrorMessage6 } from "@doist/cli-core";
+import { CliError as CliError3, getErrorMessage as getErrorMessage7 } from "@doist/cli-core";
 import { Option as Option6 } from "commander";
 import { readFile as readFile2 } from "node:fs/promises";
 import { text } from "node:stream/consumers";
@@ -36971,20 +37278,10 @@ async function readManifestInput(options, input2 = process.stdin) {
   } catch (error62) {
     throw new CliError3(
       "MANIFEST_UNREADABLE",
-      `${source.label} is not valid JSON: ${getErrorMessage6(error62)}`
+      `${source.label} is not valid JSON: ${getErrorMessage7(error62)}`
     );
   }
 }
-function parsePartialManifestInput(value) {
-  const validation = validatePartialManifest(value);
-  if (!validation.isValid) {
-    throw new CliError3(
-      "MANIFEST_INVALID",
-      `Manifest is invalid: ${validation.errors.join("; ")}`
-    );
-  }
-  return validation.data;
-}
 async function readSource(options, input2) {
   if (options.file !== void 0) {
     try {
@@ -36992,7 +37289,7 @@ async function readSource(options, input2) {
     } catch (error62) {
       throw new CliError3(
         "MANIFEST_UNREADABLE",
-        `Could not read ${options.file}: ${getErrorMessage6(error62)}`
+        `Could not read ${options.file}: ${getErrorMessage7(error62)}`
       );
     }
   }
@@ -37002,7 +37299,7 @@ async function readSource(options, input2) {
     } catch (error62) {
       throw new CliError3(
         "MANIFEST_UNREADABLE",
-        `Could not read standard input: ${getErrorMessage6(error62)}`
+        `Could not read standard input: ${getErrorMessage7(error62)}`
       );
     }
   }
@@ -37010,134 +37307,56 @@ async function readSource(options, input2) {
 }
 
 // src/commands/draft/draft-service.ts
-import { CliError as CliError4, getErrorMessage as getErrorMessage7 } from "@doist/cli-core";
+import { CliError as CliError4, getErrorMessage as getErrorMessage8 } from "@doist/cli-core";
 import { readFile as readFile3 } from "node:fs/promises";
 import { setTimeout as wait2 } from "node:timers/promises";
-
-// src/lib/manifest-diff.ts
-function stableStringify(value) {
-  return JSON.stringify(sortKeys(value));
+function createDraft2(draftApi, input2) {
+  return withRecoveryHints(draftApi, createDraft(draftApi, input2));
 }
-function isDeepEqual(left, right) {
-  return stableStringify(left) === stableStringify(right);
+function updateDraft2(draftApi, input2) {
+  return withRecoveryHints(draftApi, updateDraft(draftApi, input2));
 }
-function diffManifests(before, after) {
-  const previous = asManifest(before);
-  const next = asManifest(after);
-  const changedProperties = [.../* @__PURE__ */ new Set([...Object.keys(previous), ...Object.keys(next)])].filter((key) => key !== "steps").filter((key) => !isDeepEqual(previous[key], next[key])).sort();
-  const previousSteps = stepsById(previous.steps);
-  const nextSteps = stepsById(next.steps);
-  const added = [...nextSteps.keys()].filter((id) => !previousSteps.has(id));
-  const removed = [...previousSteps.keys()].filter((id) => !nextSteps.has(id));
-  const changed = [...nextSteps].filter(([id, step]) => previousSteps.has(id) && !isDeepEqual(previousSteps.get(id), step)).map(([id]) => id);
-  const sharedBefore = [...previousSteps.keys()].filter((id) => nextSteps.has(id));
-  const sharedAfter = [...nextSteps.keys()].filter((id) => previousSteps.has(id));
-  const reordered = sharedBefore.some((id, index) => sharedAfter[index] !== id);
-  return {
-    changedProperties,
-    steps: { added, removed, changed, reordered },
-    isEmpty: changedProperties.length === 0 && added.length === 0 && removed.length === 0 && changed.length === 0 && !reordered
-  };
-}
-function asManifest(value) {
-  return isRecord3(value) ? value : {};
-}
-function stepsById(steps) {
-  const byId = /* @__PURE__ */ new Map();
-  if (!Array.isArray(steps)) return byId;
-  steps.forEach((step, index) => {
-    const id = isRecord3(step) && typeof step.id === "string" ? step.id : `#${index}`;
-    byId.set(id, step);
-  });
-  return byId;
-}
-function sortKeys(value) {
-  if (Array.isArray(value)) return value.map(sortKeys);
-  if (!isRecord3(value)) return value;
-  return Object.fromEntries(
-    Object.keys(value).sort().map((key) => [key, sortKeys(value[key])])
-  );
+function connectDraft2(draftApi, input2) {
+  return withRecoveryHints(draftApi, connectDraft(draftApi, input2));
 }
-function isRecord3(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
-// src/commands/draft/draft-service.ts
-function resolveDraftApi(api, workspaceId, signal) {
-  const createOptions = { signal, translate: false };
-  if (workspaceId === null) {
-    return {
-      scope: null,
-      get: (draftId) => api.automationDrafts.get(draftId, { signal }),
-      create: (manifest) => api.automationDrafts.create(manifest, createOptions),
-      update: (draftId, manifest) => api.automationDrafts.update(draftId, manifest, { signal }),
-      createAutomationDraft: (automationId) => api.automations.createDraft(automationId, { signal }),
-      upsertConnection: (draftId, body) => api.automationDraftConnections.upsert(draftId, body, { signal }),
-      getConnectionStatus: async (draftId) => (await api.automationDraftConnections.getStatus(draftId, { signal })).validation,
-      finalize: (draftId) => api.automationDrafts.finalize(draftId, { signal }),
-      getAutomation: (automationId) => api.automations.get(automationId, { signal }),
-      test: (draftId, request2) => api.automationDrafts.test(draftId, request2, { signal }),
-      getTestRun: (draftId, runId, args, requestSignal) => api.automationDrafts.getTestRun(draftId, runId, args, {
-        signal: requestSignal ?? signal
-      })
-    };
-  }
+async function publishDraft2(draftApi, input2) {
+  const result = await withRecoveryHints(draftApi, publishDraft(draftApi, input2));
+  if (result.action === "publish_preview") return result;
+  const { verification } = result;
+  if (verification.status !== "unavailable") return { ...result, verification };
   return {
-    scope: workspaceId,
-    get: (draftId) => api.workspaceAutomationDrafts.get(workspaceId, draftId, { signal }),
-    create: (manifest) => api.workspaceAutomationDrafts.create(workspaceId, manifest, createOptions),
-    update: (draftId, manifest) => api.workspaceAutomationDrafts.update(workspaceId, draftId, manifest, { signal }),
-    createAutomationDraft: (automationId) => api.workspaceAutomations.createDraft(workspaceId, automationId, { signal }),
-    upsertConnection: (draftId, body) => api.workspaceAutomationDraftConnections.upsert(workspaceId, draftId, body, { signal }),
-    getConnectionStatus: async (draftId) => (await api.workspaceAutomationDraftConnections.getStatus(workspaceId, draftId, {
-      signal
-    })).validation,
-    finalize: (draftId) => api.workspaceAutomationDrafts.finalize(workspaceId, draftId, { signal }),
-    getAutomation: (automationId) => api.workspaceAutomations.get(workspaceId, automationId, { signal }),
-    test: (draftId, request2) => api.workspaceAutomationDrafts.test(workspaceId, draftId, request2, { signal }),
-    getTestRun: (draftId, runId, args, requestSignal) => api.workspaceAutomationDrafts.getTestRun(workspaceId, draftId, runId, args, {
-      signal: requestSignal ?? signal
-    })
+    ...result,
+    verification: {
+      ...verification,
+      command: `tda automation view ${result.automation.id} ${scopeFlag(draftApi.workspaceId)}`
+    }
   };
 }
-async function createDraft(draftApi, { manifest, automationId }) {
-  const partialManifest = parsePartialManifestInput(manifest);
-  if (automationId === void 0) {
-    const result = await draftApi.create(partialManifest);
-    return { action: "created", target: toTarget(result.draft), ...result };
-  }
-  const { draft } = await openEditDraft(draftApi, automationId);
+async function withRecoveryHints(draftApi, operation) {
   try {
-    const result = await draftApi.update(draft.id, partialManifest);
-    return { action: "created", target: toTarget(result.draft), ...result };
+    return await operation;
   } catch (error62) {
-    if (!isManifestRejection(error62)) throw error62;
-    throw new CliError4(
-      "DRAFT_MANIFEST_REJECTED",
-      `Opened draft ${draft.id} for automation ${automationId}, but the manifest was rejected: ${getErrorMessage7(error62)}`,
-      { hints: draftHints(draftApi.scope, draft.id) }
-    );
-  }
-}
-function isManifestRejection(error62) {
-  return error62 instanceof AutomationsRequestError && (error62.httpStatusCode === 400 || error62.httpStatusCode === 422);
-}
-async function updateDraft(draftApi, { draftId, manifest }) {
-  const partialManifest = parsePartialManifestInput(manifest);
-  const result = await draftApi.update(draftId, partialManifest);
-  return { action: "updated", target: toTarget(result.draft), ...result };
-}
-async function openEditDraft(draftApi, automationId) {
-  try {
-    return await draftApi.createAutomationDraft(automationId);
-  } catch (error62) {
-    const conflict = getOpenDraftConflictError(error62);
-    if (!conflict) throw error62;
-    throw new CliError4(
-      "DRAFT_CONFLICT",
-      `Automation ${automationId} already has an open draft ${conflict.draftId}.`,
-      { hints: draftHints(draftApi.scope, conflict.draftId) }
-    );
+    if (!(error62 instanceof DraftWorkflowError)) throw error62;
+    const scope = draftApi.workspaceId;
+    const draftId = error62.draftId ?? "<draft-id>";
+    switch (error62.code) {
+      case "manifest_invalid":
+        throw new CliError4("MANIFEST_INVALID", error62.message);
+      case "draft_conflict":
+        throw new CliError4("DRAFT_CONFLICT", error62.message, {
+          hints: draftHints(scope, draftId)
+        });
+      case "draft_manifest_rejected":
+        throw new CliError4("DRAFT_MANIFEST_REJECTED", error62.message, {
+          hints: draftHints(scope, draftId)
+        });
+      case "draft_not_ready":
+        throw draftNotReadyError(error62.message, draftId, scope);
+      case "connector_not_required":
+        throw new Error(error62.message);
+      default:
+        throw error62;
+    }
   }
 }
 function draftHints(scope, draftId) {
@@ -37149,168 +37368,6 @@ function draftHints(scope, draftId) {
 function scopeFlag(scope) {
   return scope === null ? "--personal" : `--workspace ${scope}`;
 }
-function toTarget(draft) {
-  return draft.automationId === null ? { kind: "new" } : { kind: "automation", automationId: draft.automationId };
-}
-async function connectDraft(draftApi, api, {
-  draftId,
-  selections,
-  auto
-}) {
-  const bound = [];
-  const required2 = selections.length > 0 ? getRequiredConnectorsFromManifest(
-    (await draftApi.get(draftId)).draft.partialManifest
-  ) : /* @__PURE__ */ new Map();
-  for (const selection of selections) {
-    const types = required2.get(selection.connectorId);
-    if (!types || selection.connectionType && !types.has(selection.connectionType)) {
-      const slot = selection.connectionType ? `${selection.connectorId} (${selection.connectionType})` : selection.connectorId;
-      throw new Error(
-        `Connector ${slot} is not used by draft ${draftId}. Required: ${describeRequired(required2)}.`
-      );
-    }
-    const connectionTypes = selection.connectionType ? [selection.connectionType] : [...types];
-    for (const connectionType of connectionTypes) {
-      await draftApi.upsertConnection(draftId, {
-        connectorId: selection.connectorId,
-        connectionType,
-        connectionId: selection.connectionId
-      });
-      bound.push({ ...selection, connectionType, mode: "explicit" });
-    }
-  }
-  const unresolved = [];
-  if (auto) {
-    const status = await draftApi.getConnectionStatus(draftId);
-    for (const connector of status.connectors) {
-      for (const connectionType of ["mcp", "trigger"]) {
-        const slot = connector[connectionType];
-        if (!slot.required || slot.status !== "missing") continue;
-        const { connections } = await api.connections.list({
-          connectorId: connector.id,
-          capability: connectionType,
-          status: "authorized"
-        });
-        const [only] = connections;
-        if (connections.length === 1 && only) {
-          await draftApi.upsertConnection(draftId, {
-            connectorId: connector.id,
-            connectionType,
-            connectionId: only.id
-          });
-          bound.push({
-            connectorId: connector.id,
-            connectionType,
-            connectionId: only.id,
-            mode: "auto"
-          });
-          continue;
-        }
-        unresolved.push({
-          connectorId: connector.id,
-          connectionType,
-          reason: connections.length === 0 ? "no_connection" : "multiple_connections",
-          candidateConnectionIds: connections.map((connection) => connection.id)
-        });
-      }
-    }
-  }
-  const { isValid, missing } = await draftApi.getConnectionStatus(draftId);
-  return { action: "connected", draftId, bound, unresolved, isValid, missing };
-}
-function describeRequired(required2) {
-  if (required2.size === 0) return "none";
-  return [...required2].map(([connectorId, types]) => `${connectorId} (${[...types].join(", ")})`).join(", ");
-}
-async function publishDraft(draftApi, { draftId, confirmed }) {
-  const { summary, manifest } = await summarizeForPublish(draftApi, draftId);
-  if (!confirmed) {
-    return { action: "publish_preview", summary };
-  }
-  let published;
-  try {
-    published = await draftApi.finalize(draftId);
-  } catch (error62) {
-    const notReady = getDraftNotReadyError(error62);
-    if (!notReady) throw error62;
-    throw draftNotReadyError(notReady.message, draftId, draftApi.scope);
-  }
-  const automationId = published.automation.id;
-  let automation;
-  try {
-    automation = await draftApi.getAutomation(automationId);
-  } catch (error62) {
-    return {
-      action: "published",
-      summary,
-      automation: published.automation,
-      verification: {
-        status: "unavailable",
-        reason: getErrorMessage7(error62),
-        command: `tda automation view ${automationId} ${scopeFlag(draftApi.scope)}`
-      }
-    };
-  }
-  const expected = normaliseManifest(manifest);
-  const actual = normaliseManifest(automation.manifest);
-  return {
-    action: "published",
-    summary,
-    automation,
-    verification: isDeepEqual(expected, actual) ? { status: "matched" } : { status: "mismatched", mismatch: diffManifests(expected, actual) }
-  };
-}
-async function summarizeForPublish(draftApi, draftId) {
-  const [detail, connections] = await Promise.all([
-    draftApi.get(draftId),
-    draftApi.getConnectionStatus(draftId)
-  ]);
-  const { draft } = detail;
-  const target = toTarget(draft);
-  const published = target.kind === "automation" ? await draftApi.getAutomation(target.automationId) : null;
-  const diff = published ? diffManifests(
-    normaliseManifest(published.manifest),
-    normaliseManifest(draft.partialManifest)
-  ) : null;
-  const summary = {
-    draftId,
-    name: getResourceName(draft.partialManifest),
-    scope: draft.workspaceId === null ? { kind: "personal" } : {
-      kind: "workspace",
-      workspaceId: draft.workspaceId,
-      // A new workspace automation publishes team-visible; an
-      // edit keeps whatever the automation already has.
-      visibility: published?.visibility ?? "workspace"
-    },
-    target,
-    enabled: published?.enabled ?? true,
-    validation: { state: detail.state, issues: detail.issues },
-    connections: {
-      isValid: connections.isValid,
-      connected: connections.connected.map(
-        ({ connectorId, connectionType, connectionId }) => ({
-          connectorId,
-          connectionType,
-          connectionId
-        })
-      ),
-      missing: connections.missing
-    },
-    schedule: describeSchedule(draft.partialManifest),
-    diff
-  };
-  return { summary, manifest: draft.partialManifest };
-}
-function describeSchedule(manifest) {
-  if (!hasTriggerType(manifest)) return null;
-  const schedule = getManifestTriggers(manifest).find((trigger) => trigger.type === "schedule");
-  if (!schedule || schedule.type !== "schedule") return null;
-  return getScheduleTriggerDescription({ value: schedule.value, timeFormat: "24h" });
-}
-function normaliseManifest(manifest) {
-  const parsed = manifestSchema.safeParse(manifest);
-  return parsed.success ? parsed.data : manifest;
-}
 var DEFAULT_POLL_INTERVALS_MS = { first: 2e3, max: 1e4 };
 var STATUS_REQUEST_GRACE_MS = 1e4;
 var OPEN_RUN_STATUSES = /* @__PURE__ */ new Set([
@@ -37329,14 +37386,14 @@ async function startDraftTest(draftApi, {
   } catch (error62) {
     const refusal = getDraftTestRequestError(error62);
     if (!refusal) throw error62;
-    throw toDraftTestCliError(refusal, draftId, draftApi.scope);
+    throw toDraftTestCliError(refusal, draftId, draftApi.workspaceId);
   }
   const base = {
     draftId,
     testRunId: started.testRunId,
     trigger: started.trigger,
     connectorCalls: started.connectorCalls,
-    command: `tda draft test-run ${draftId} ${started.testRunId} ${scopeFlag(draftApi.scope)}`
+    command: `tda draft test-run ${draftId} ${started.testRunId} ${scopeFlag(draftApi.workspaceId)}`
   };
   if (!waitFor) {
     return { action: "test_started", ...base, status: started.status };
@@ -37429,7 +37486,7 @@ async function readTestPayloadFile(path) {
   } catch (error62) {
     throw new CliError4(
       "PAYLOAD_UNREADABLE",
-      `Could not read ${path}: ${getErrorMessage7(error62)}`
+      `Could not read ${path}: ${getErrorMessage8(error62)}`
     );
   }
   try {
@@ -37437,7 +37494,7 @@ async function readTestPayloadFile(path) {
   } catch (error62) {
     throw new CliError4(
       "PAYLOAD_UNREADABLE",
-      `${path} is not valid JSON: ${getErrorMessage7(error62)}`
+      `${path} is not valid JSON: ${getErrorMessage8(error62)}`
     );
   }
 }
@@ -37730,8 +37787,8 @@ function registerDraftCommand(program) {
       command,
       async ({ api, signal }) => {
         const manifest = await readManifestInput(options);
-        const draftApi = resolveDraftApi(api, await resolveWorkspaceScope(options), signal);
-        return createDraft(draftApi, { manifest, automationId: options.automation });
+        const draftApi = bindDraftApi(api, await resolveWorkspaceScope(options), { signal });
+        return createDraft2(draftApi, { manifest, automationId: options.automation });
       },
       { human: formatDraftChange },
       { spinner: "Creating draft..." }
@@ -37746,8 +37803,8 @@ function registerDraftCommand(program) {
       command,
       async ({ api, signal }) => {
         const manifest = await readManifestInput(options);
-        const draftApi = resolveDraftApi(api, await resolveWorkspaceScope(options), signal);
-        return updateDraft(draftApi, { draftId, manifest });
+        const draftApi = bindDraftApi(api, await resolveWorkspaceScope(options), { signal });
+        return updateDraft2(draftApi, { draftId, manifest });
       },
       { human: formatDraftChange },
       { spinner: "Updating draft..." }
@@ -37773,8 +37830,8 @@ function registerDraftCommand(program) {
           );
         }
         const selections = options.connection.map(parseConnectionSelectionOption);
-        const draftApi = resolveDraftApi(api, await resolveWorkspaceScope(options), signal);
-        return connectDraft(draftApi, api, {
+        const draftApi = bindDraftApi(api, await resolveWorkspaceScope(options), { signal });
+        return connectDraft2(draftApi, {
           draftId,
           selections,
           auto: options.auto === true
@@ -37790,8 +37847,8 @@ function registerDraftCommand(program) {
     await runApiCommand(
       command,
       async ({ api, signal }) => {
-        const draftApi = resolveDraftApi(api, await resolveWorkspaceScope(options), signal);
-        return publishDraft(draftApi, { draftId, confirmed: options.yes === true });
+        const draftApi = bindDraftApi(api, await resolveWorkspaceScope(options), { signal });
+        return publishDraft2(draftApi, { draftId, confirmed: options.yes === true });
       },
       { human: formatDraftPublish, json: summarizeDraftPublish },
       { spinner: options.yes === true ? "Publishing..." : "Loading draft..." }
@@ -37816,7 +37873,7 @@ function registerDraftCommand(program) {
           throw new Error("--timeout only applies with --wait.");
         }
         const timeoutMs = parseTestTimeout(options.timeout ?? DEFAULT_TEST_WAIT);
-        const draftApi = resolveDraftApi(api, await resolveWorkspaceScope(options), signal);
+        const draftApi = bindDraftApi(api, await resolveWorkspaceScope(options), { signal });
         return startDraftTest(draftApi, {
           draftId,
           request: {
@@ -37841,7 +37898,7 @@ function registerDraftCommand(program) {
     await runApiCommand(
       command,
       async ({ api, signal }) => {
-        const draftApi = resolveDraftApi(api, await resolveWorkspaceScope(options), signal);
+        const draftApi = bindDraftApi(api, await resolveWorkspaceScope(options), { signal });
         return draftApi.getTestRun(draftId, runId, {
           includeGeneratedCode: options.full === true,
           includeToolCallPreviews: true