feat(M4): Reusable code abstractions and dead-code removal

skills/atlassian/shared/scripts/src/cli.ts

@@ -3,6 +3,7 @@ import { pathToFileURL } from "node:url";
 
 import { Command } from "commander";
 
+import { resolveFormat } from "./command-helpers.js";
 import { createConfluenceClient } from "./confluence.js";
 import { loadConfig } from "./config.js";
 import { readWorkspaceFile } from "./files.js";
@@ -10,7 +11,7 @@ import { runHealthCheck } from "./health.js";
 import { createJiraClient } from "./jira.js";
 import { writeOutput } from "./output.js";
 import { runRawCommand } from "./raw.js";
-import type { FetchLike, OutputFormat, Writer } from "./types.js";
+import type { FetchLike, Writer } from "./types.js";
 
 type CliContext = {
   cwd?: string;
@@ -20,10 +21,6 @@ type CliContext = {
   stderr?: Writer;
 };
 
-function resolveFormat(format: string | undefined): OutputFormat {
-  return format === "text" ? "text" : "json";
-}
-
 function createRuntime(context: CliContext) {
   const cwd = context.cwd ?? process.cwd();
   const env = context.env ?? process.env;

skills/atlassian/shared/scripts/src/command-helpers.ts

@@ -0,0 +1,24 @@
+import type { CommandOutput, OutputFormat } from "./types.js";
+
+/**
+ * Produce the standard dry-run response payload for write operations.
+ *
+ * Use this when `--dry-run` is passed to skip the actual API call and
+ * echo the pending request back to the caller.
+ *
+ * @example
+ *   if (input.dryRun) return dryRunResponse(request);
+ */
+export function dryRunResponse<T>(data: T): CommandOutput<T> {
+  return { ok: true, dryRun: true, data };
+}
+
+/**
+ * Resolve the `--format` CLI option to a typed OutputFormat.
+ *
+ * Returns `"text"` only for the exact string `"text"`;
+ * all other values (including `undefined`) fall back to `"json"`.
+ */
+export function resolveFormat(format: string | undefined): OutputFormat {
+  return format === "text" ? "text" : "json";
+}

skills/atlassian/shared/scripts/src/confluence.ts

@@ -1,3 +1,4 @@
+import { dryRunResponse } from "./command-helpers.js";
 import { sendJsonRequest } from "./http.js";
 import type { AtlassianConfig, CommandOutput, FetchLike } from "./types.js";
 
@@ -177,13 +178,7 @@ export function createConfluenceClient(options: ConfluenceClientOptions) {
         },
       };
 
-      if (input.dryRun) {
-        return {
-          ok: true,
-          dryRun: true,
-          data: request,
-        };
-      }
+      if (input.dryRun) return dryRunResponse(request);
 
       const raw = await sendJsonRequest({
         config,
@@ -223,13 +218,7 @@ export function createConfluenceClient(options: ConfluenceClientOptions) {
         },
       };
 
-      if (input.dryRun) {
-        return {
-          ok: true,
-          dryRun: true,
-          data: request,
-        };
-      }
+      if (input.dryRun) return dryRunResponse(request);
 
       const raw = await sendJsonRequest({
         config,
@@ -266,13 +255,7 @@ export function createConfluenceClient(options: ConfluenceClientOptions) {
         },
       };
 
-      if (input.dryRun) {
-        return {
-          ok: true,
-          dryRun: true,
-          data: request,
-        };
-      }
+      if (input.dryRun) return dryRunResponse(request);
 
       const raw = await sendJsonRequest({
         config,

skills/atlassian/shared/scripts/src/jira.ts

@@ -1,4 +1,5 @@
 import { markdownToAdf } from "./adf.js";
+import { dryRunResponse } from "./command-helpers.js";
 import { sendJsonRequest } from "./http.js";
 import type { AtlassianConfig, CommandOutput, FetchLike, JiraIssueSummary } from "./types.js";
 
@@ -161,13 +162,7 @@ export function createJiraClient(options: JiraClientOptions) {
         },
       });
 
-      if (input.dryRun) {
-        return {
-          ok: true,
-          dryRun: true,
-          data: request,
-        };
-      }
+      if (input.dryRun) return dryRunResponse(request);
 
       const raw = await send("POST", "/rest/api/3/issue", request.body);
       return { ok: true, data: raw };
@@ -192,13 +187,7 @@ export function createJiraClient(options: JiraClientOptions) {
         fields,
       });
 
-      if (input.dryRun) {
-        return {
-          ok: true,
-          dryRun: true,
-          data: request,
-        };
-      }
+      if (input.dryRun) return dryRunResponse(request);
 
       await send("PUT", `/rest/api/3/issue/${input.issue}`, request.body);
       return {
@@ -215,13 +204,7 @@ export function createJiraClient(options: JiraClientOptions) {
         body: markdownToAdf(input.body),
       });
 
-      if (input.dryRun) {
-        return {
-          ok: true,
-          dryRun: true,
-          data: request,
-        };
-      }
+      if (input.dryRun) return dryRunResponse(request);
 
       const raw = await send("POST", `/rest/api/3/issue/${input.issue}/comment`, request.body);
       return {
@@ -242,13 +225,7 @@ export function createJiraClient(options: JiraClientOptions) {
         },
       );
 
-      if (input.dryRun) {
-        return {
-          ok: true,
-          dryRun: true,
-          data: request,
-        };
-      }
+      if (input.dryRun) return dryRunResponse(request);
 
       await send("POST", `/rest/api/3/issue/${input.issue}/transitions`, request.body);
       return {

skills/atlassian/shared/scripts/src/raw.ts

@@ -1,3 +1,4 @@
+import { dryRunResponse } from "./command-helpers.js";
 import { readWorkspaceFile } from "./files.js";
 import { sendJsonRequest } from "./http.js";
 import type { AtlassianConfig, CommandOutput, FetchLike } from "./types.js";
@@ -61,13 +62,7 @@ export async function runRawCommand(
     ...(body === undefined ? {} : { body }),
   };
 
-  if (input.dryRun) {
-    return {
-      ok: true,
-      dryRun: true,
-      data: request,
-    };
-  }
+  if (input.dryRun) return dryRunResponse(request);
 
   const data = await sendJsonRequest({
     config,

skills/atlassian/shared/scripts/tests/command-helpers.test.ts

@@ -0,0 +1,43 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+
+import { dryRunResponse, resolveFormat } from "../src/command-helpers.js";
+
+// ── dryRunResponse ────────────────────────────────────────────────────────
+
+test("dryRunResponse wraps data with ok:true and dryRun:true", () => {
+  const data = { method: "POST", url: "https://example.com/api/v2/pages" };
+  const result = dryRunResponse(data);
+  assert.equal(result.ok, true);
+  assert.equal(result.dryRun, true);
+  assert.deepEqual(result.data, data);
+});
+
+test("dryRunResponse preserves the exact data reference", () => {
+  const data = { nested: { key: "value" } };
+  const result = dryRunResponse(data);
+  assert.strictEqual(result.data, data);
+});
+
+test("dryRunResponse works with primitive data", () => {
+  const result = dryRunResponse("dry-run-string");
+  assert.equal(result.ok, true);
+  assert.equal(result.dryRun, true);
+  assert.equal(result.data, "dry-run-string");
+});
+
+// ── resolveFormat ─────────────────────────────────────────────────────────
+
+test("resolveFormat returns json by default for undefined", () => {
+  assert.equal(resolveFormat(undefined), "json");
+});
+
+test("resolveFormat returns json for unrecognised values", () => {
+  assert.equal(resolveFormat("xml"), "json");
+  assert.equal(resolveFormat(""), "json");
+  assert.equal(resolveFormat("TEXT"), "json");
+});
+
+test("resolveFormat returns text only for the exact string 'text'", () => {
+  assert.equal(resolveFormat("text"), "text");
+});