@lightward/mechanic-cli 0.1.6 → 0.1.9

package/README.md

@@ -56,7 +56,17 @@ prompted:
 mechanic init --shop example.myshopify.com
 ```
 
-Pull existing Mechanic tasks into local JSON files:
+Choose how to start.
+
+To bring one existing task into local files, find its remote task ID, then pull
+that task:
+
+```bash
+mechanic tasks list --verbose
+mechanic tasks pull <remote-task-id>
+```
+
+To intentionally bootstrap a repo with every task in the shop:
 
 ```bash
 mechanic tasks pull
@@ -70,15 +80,14 @@ initialized CLI project; it does not require a fresh repository:
 mechanic tasks new order-tagger
 ```
 
-For most Liquid or documentation edits, unbundle one task into helper files,
-edit those files, then bundle the helper directory back into its canonical JSON
-file. The JSON file remains the deployable source of truth; the helper directory
-is the comfortable editing view beside it. Tasks created with `tasks new`
-already have both files, so you can start editing the helper directory
-immediately.
+For most Liquid or documentation edits, use the helper directory beside the JSON
+file. Existing pulled tasks can be unbundled first; tasks created with
+`tasks new` already have the helper directory.
 
 ```bash
+# for an existing pulled task only
 mechanic tasks unbundle order-tagger
+
 # edit tasks/order-tagger/script.liquid, docs.md, or task.json
 mechanic tasks bundle order-tagger
 mechanic tasks status
@@ -88,6 +97,10 @@ mechanic tasks publish order-tagger --dry-run
 mechanic tasks publish order-tagger
 ```
 
+For example, edit `tasks/order-tagger/docs.md` or
+`tasks/order-tagger/script.liquid`, bundle it, preview it, then publish only
+when the diff and dry-run plan look right.
+
 For normal setup, paste the token into the masked prompt or run
 `mechanic auth login` after `mechanic init`. In CI, store the token as
 `MECHANIC_API_TOKEN`. The `--token` flag exists for controlled automation, but
@@ -184,10 +197,11 @@ the fast offline check for JSON validity, link state, and helper-folder drift.
 Add `--json` when an editor integration needs task readiness, link state, and
 remote sync state without parsing table output.
 
-`tasks diff` compares the current remote task to your local file, groups output
-by changed field, and only shows nearby changed lines. Differences are
-informational by default; add `--exit-code` when a script or CI job should treat
-differences as a nonzero result.
+`tasks diff` compares current Mechanic with your local file, groups output by
+changed field, and only shows nearby changed lines. In diff output, `-` means
+current Mechanic and `+` means local file. Differences are informational by
+default; add `--exit-code` when a script or CI job should treat differences as a
+nonzero result.
 
 `tasks preview` is the confidence check before publishing. It sends one local
 task to Mechanic's preview engine without saving it, then reports whether the
@@ -412,12 +426,15 @@ Mechanic app or by another local checkout.
 
 - `tasks pull` records the latest remote content hash in `.mechanic/links.json`.
 - `tasks pull <task>` can refresh a linked local file without `--force` when the
-  local file still matches the last pulled hash. If local edits would be lost,
+  local file still matches the last synced hash. If local edits would be lost,
   it stops and asks for an explicit `--force`.
 - `tasks publish` sends that hash as `previous_content_hash`.
 - The API rejects stale publishes with a conflict.
-- `tasks diff` warns when the remote task changed since your last pull, then
-  compares the current Mechanic task with your local file.
+- `tasks diff` warns when Mechanic changed since the file was last synced, then
+  compares current Mechanic with your local file. If only Mechanic changed, pull
+  normally to update your local file. If both Mechanic and your local file
+  changed, choose explicitly: pull with `--force` to replace local with
+  Mechanic, or publish with `--force` to overwrite Mechanic with local.
 - `tasks publish --all` checks every linked remote task before writing anything,
   so one stale task blocks the whole publish instead of partially publishing
   earlier files first.

package/dist/commands/github/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/github/init.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAKpD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,WAAW;IACjD,OAAgB,OAAO,SAA4E;IACnG,OAAgB,WAAW,SAAiH;IAE5I,OAAgB,KAAK;;MAEnB;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA2C3B"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/github/init.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAKpD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,WAAW;IACjD,OAAgB,OAAO,SAAqF;IAC5G,OAAgB,WAAW,SAA0H;IAErJ,OAAgB,KAAK;;MAEnB;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA2C3B"}

package/dist/commands/github/init.js

@@ -5,8 +5,8 @@ import { CliError } from "../../errors.js";
 import { ensureDir, pathExists, writeText } from "../../fs.js";
 import { githubWorkflowFiles } from "../../github-workflows.js";
 export default class GithubInit extends BaseCommand {
-    static summary = "Create GitHub Actions workflows for single-shop Mechanic task updates.";
-    static description = "Create validation, manual deploy, and pull-from-app GitHub Actions workflows for this Mechanic CLI project.";
+    static summary = "Create optional GitHub Actions workflows for single-shop Mechanic task updates.";
+    static description = "Create optional validation, manual deploy, and pull-from-app GitHub Actions workflows for this Mechanic CLI project.";
     static flags = {
         force: Flags.boolean({ description: "Overwrite existing Mechanic GitHub workflow files." }),
     };

package/dist/commands/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AASjD,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW;IAC3C,OAAgB,WAAW,SAAkD;IAE7E,OAAgB,KAAK;;;;;;MAQnB;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAgE3B"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AASjD,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW;IAC3C,OAAgB,WAAW,SAAkD;IAE7E,OAAgB,KAAK;;;;;;MAQnB;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAiE3B"}

package/dist/commands/init.js

@@ -59,6 +59,7 @@ export default class Init extends BaseCommand {
         this.log("");
         this.log("Next steps:");
         if (!storedToken) {
+            this.log("  create an API token in Mechanic: Settings -> API tokens");
             this.log(`  ${this.taskName("mechanic auth login")}`);
         }
         this.log(`  ${this.taskName("mechanic tasks pull")}`);

package/dist/commands/tasks/diff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../../src/commands/tasks/diff.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAYpD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW;IAChD,OAAgB,OAAO,SAA2D;IAClF,OAAgB,WAAW,SAA6G;IAExI,OAAgB,IAAI;;MAElB;IAEF,OAAgB,KAAK;;;;MAMnB;IAEF,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IA2BzB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA4H3B"}
+{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../../src/commands/tasks/diff.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAapD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW;IAChD,OAAgB,OAAO,SAA2D;IAClF,OAAgB,WAAW,SAA6G;IAExI,OAAgB,IAAI;;MAElB;IAEF,OAAgB,KAAK;;;;MAMnB;IAEF,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IA2BzB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAwI3B"}

package/dist/commands/tasks/diff.js

@@ -1,7 +1,7 @@
 import { Args, Flags } from "@oclif/core";
 import { BaseCommand } from "../../base-command.js";
 import { linkForSlug } from "../../config.js";
-import { diffTasks, displayTaskPath, readTaskFile, remoteChangedSinceLastPull, selectedTaskFiles, slugFromTaskFile, taskForPush, } from "../../tasks.js";
+import { diffTasks, displayTaskPath, localChangedSinceLastSync, readTaskFile, remoteChangedSinceLastPull, selectedTaskFiles, slugFromTaskFile, taskForPush, } from "../../tasks.js";
 export default class TasksDiff extends BaseCommand {
     static summary = "Diff one task, or use --all to diff every local task.";
     static description = "Compare one local task with its linked remote task, or use --all to compare every local task JSON file.";
@@ -51,6 +51,7 @@ export default class TasksDiff extends BaseCommand {
             const relativeFile = displayTaskPath(project, file);
             if (!link) {
                 hasUnlinkedTasks = true;
+                const message = `No remote task is linked yet. Run "mechanic tasks publish ${slug} --dry-run" to review the disabled create plan.`;
                 results.push({
                     file: relativeFile,
                     slug,
@@ -59,9 +60,9 @@ export default class TasksDiff extends BaseCommand {
                     remote_changed: false,
                     field_differences: false,
                     diff: null,
-                    message: "Task is not linked to a remote task.",
+                    message,
                 });
-                differences.push(`# ${relativeFile}\nTask is not linked to a remote task.`);
+                differences.push(`# ${relativeFile}\n${message}`);
                 continue;
             }
             const localTask = taskForPush(await readTaskFile(file));
@@ -69,6 +70,7 @@ export default class TasksDiff extends BaseCommand {
             const remoteTask = taskForPush(remote.task);
             const diff = diffTasks(localTask, remoteTask);
             const remoteChanged = remoteChangedSinceLastPull(link, remote);
+            const localChanged = localChangedSinceLastSync(link, localTask);
             const hasDiff = Boolean(diff);
             if (remoteChanged) {
                 hasRemoteChanges = true;
@@ -88,13 +90,23 @@ export default class TasksDiff extends BaseCommand {
             if (remoteChanged || diff) {
                 const section = [`# ${relativeFile}`];
                 if (remoteChanged) {
-                    section.push(this.color("yellow", "Remote changed since your last pull."), this.muted("Showing what would change if your local file replaced the current Mechanic task."), this.muted("Diff legend: - current Mechanic, + local file."), this.muted(`Run "mechanic tasks pull ${link.remote_id}" to keep the Mechanic version, or use --force only if the local file should win.`), "");
+                    section.push(this.color("yellow", localChanged
+                        ? "Mechanic and your local file both changed since this file was last synced."
+                        : "Mechanic changed since this file was last synced."), this.muted("Showing current Mechanic compared with your local file."), this.muted("Diff legend: - current Mechanic, + local file."), ...(localChanged ? [
+                        this.muted("This compares the current versions; it does not show edit history."),
+                        this.muted("A normal pull will stop because local changes would be overwritten."),
+                        this.muted(`Run "mechanic tasks pull ${link.remote_id} --force" only if current Mechanic should replace your local file.`),
+                        this.muted(`Run "mechanic tasks publish ${relativeFile} --force" only if your local file should overwrite Mechanic.`),
+                    ] : [
+                        this.muted("Your local file has no unsynced changes."),
+                        this.muted(`Run "mechanic tasks pull ${link.remote_id}" to update your local file from current Mechanic.`),
+                    ]), "");
                 }
                 if (diff) {
                     section.push(diff);
                 }
                 else {
-                    section.push("No field differences between the current remote task and your local file.");
+                    section.push("No field differences between current Mechanic and your local file.");
                 }
                 differences.push(this.colorDiff(section.join("\n")));
             }
@@ -123,7 +135,7 @@ export default class TasksDiff extends BaseCommand {
             summary = "Remote changes found.";
         }
         else if (!hasFieldDifferences && hasUnlinkedTasks) {
-            summary = "Unlinked tasks found.";
+            summary = "No remote task linked yet.";
         }
         this.log(summary);
         if (flags["exit-code"]) {

package/dist/commands/tasks/new.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../../src/commands/tasks/new.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAwCpD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,WAAW;IAC/C,OAAgB,OAAO,SAAoC;IAC3D,OAAgB,WAAW,SAAiJ;IAC5K,OAAgB,QAAQ,WAGtB;IAEF,OAAgB,IAAI;;MAElB;IAEF,OAAgB,KAAK;;;MAGnB;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YA0CZ,kBAAkB;CA2BjC"}
+{"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../../src/commands/tasks/new.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAyCpD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,WAAW;IAC/C,OAAgB,OAAO,SAAoC;IAC3D,OAAgB,WAAW,SAAiJ;IAC5K,OAAgB,QAAQ,WAGtB;IAEF,OAAgB,IAAI;;MAElB;IAEF,OAAgB,KAAK;;;MAGnB;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YA0CZ,kBAAkB;CAoCjC"}

package/dist/commands/tasks/new.js

@@ -1,6 +1,7 @@
 import { Args, Flags } from "@oclif/core";
 import path from "node:path";
 import { BaseCommand } from "../../base-command.js";
+import { linkForSlug } from "../../config.js";
 import { CliError } from "../../errors.js";
 import { pathExists } from "../../fs.js";
 import { displayTaskPath, taskPath, taskSlug, unbundleTask, writeTaskFilePath } from "../../tasks.js";
@@ -59,7 +60,7 @@ export default class TasksNew extends BaseCommand {
         const name = taskNameFromInput(requestedName);
         const filePath = taskPath(project, slug);
         const helperDir = filePath.replace(/\.json$/i, "");
-        await this.checkExistingPaths(project, filePath, helperDir, Boolean(flags.force));
+        await this.checkExistingPaths(project, slug, filePath, helperDir, Boolean(flags.force));
         await writeTaskFilePath(filePath, starterTask(name));
         await unbundleTask(filePath, helperDir);
         const fileDisplay = displayTaskPath(project, filePath);
@@ -83,7 +84,14 @@ export default class TasksNew extends BaseCommand {
         this.log(`  mechanic tasks bundle ${this.taskName(slug)}`);
         this.log(`  mechanic tasks publish ${this.taskName(slug)}`);
     }
-    async checkExistingPaths(project, filePath, helperDir, force) {
+    async checkExistingPaths(project, slug, filePath, helperDir, force) {
+        const link = linkForSlug(project, slug);
+        if (link) {
+            throw new CliError([
+                `${slug} is already linked to a Mechanic task.`,
+                `Run "mechanic tasks pull ${link.remote_id}" to refresh it, or choose another name for a new task.`,
+            ].join("\n"), 2);
+        }
         if (force) {
             return;
         }

package/dist/commands/tasks/pull.js

@@ -68,7 +68,7 @@ export default class TasksPull extends BaseCommand {
                         throw new CliError([
                             `${displayTaskPath(project, filePath)} has local changes that would be overwritten.`,
                             `Run "mechanic tasks diff ${displayTaskPath(project, filePath)}" to review them.`,
-                            `Re-run "mechanic tasks pull ${envelope.id} --force" only if the remote version should replace the local file.`,
+                            `Re-run "mechanic tasks pull ${envelope.id} --force" only if current Mechanic should replace your local file.`,
                         ].join("\n"), 2);
                     }
                 }

package/dist/commands/tasks/push.d.ts

@@ -18,6 +18,7 @@ type PushRow = {
     task_id: string | null;
     content_hash: string | null;
     details: string;
+    enabled?: boolean | null;
     url?: string;
 };
 type CreateCollision = {
@@ -55,7 +56,7 @@ export default class TasksPush extends BaseCommand {
         rows: PushRow[];
     }>;
     pushRowsToTable(project: Project, statusHeader: string, rows: PushRow[], label: (status: string) => string): string[][];
-    printCreatedTaskLinks(rows: PushRow[]): void;
+    printPublishedTaskLinks(rows: PushRow[]): void;
     planLabel(plan: string): string;
 }
 export {};

package/dist/commands/tasks/push.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../src/commands/tasks/push.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../src/commands/tasks/push.ts"],"names":[],"mappings":"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"}

package/dist/commands/tasks/push.js

@@ -5,7 +5,7 @@ import { linkForSlug, saveLinks, taskAdminUrl, updateLink } from "../../config.j
 import { CliError } from "../../errors.js";
 import { contentHash } from "../../hash.js";
 import { stableStringify } from "../../json.js";
-import { displayTaskPath, remoteChangedSinceLastPull, remoteChangedSinceLastPullDetails, remoteChangedSinceLastPullMessage, selectedTaskFiles, readRawTaskFile, slugFromTaskFile, taskForPush, taskSlug, unbundledHelperDirForTaskFile, validateTaskForPush, writeTaskFilePathAndRefreshHelper, } from "../../tasks.js";
+import { displayTaskPath, localChangedSinceLastSync, remoteChangedSinceLastPull, remoteChangedSinceLastPullDetails, remoteChangedSinceLastPullMessage, selectedTaskFiles, readRawTaskFile, slugFromTaskFile, taskForPush, taskSlug, unbundledHelperDirForTaskFile, validateTaskForPush, writeTaskFilePathAndRefreshHelper, } from "../../tasks.js";
 function createTaskIdempotencyKey(shopDomain, slug) {
     const hex = createHash("sha256")
         .update(`mechanic-cli-task-create\0${shopDomain}\0${slug}`)
@@ -18,6 +18,25 @@ function createTaskIdempotencyKey(shopDomain, slug) {
         hex.slice(20, 32),
     ].join("-");
 }
+function remoteTaskEnabled(envelope) {
+    if (typeof envelope.enabled === "boolean") {
+        return envelope.enabled;
+    }
+    if (typeof envelope.task.enabled === "boolean") {
+        return envelope.task.enabled;
+    }
+    return null;
+}
+function remoteTaskStateDetail(envelope) {
+    const enabled = remoteTaskEnabled(envelope);
+    if (enabled === true) {
+        return "currently enabled";
+    }
+    if (enabled === false) {
+        return "currently disabled";
+    }
+    return "";
+}
 export default class TasksPush extends BaseCommand {
     static hidden = true;
     static summary = "Publish one local task, or use --all to publish every local task.";
@@ -68,7 +87,7 @@ export default class TasksPush extends BaseCommand {
             return;
         }
         this.table(this.pushRowsToTable(project, "Action", rows, (status) => this.actionLabel(status)));
-        this.printCreatedTaskLinks(rows);
+        this.printPublishedTaskLinks(rows);
     }
     async publishTasks(project, preparation, force) {
         const client = await this.verifiedClientForProject(project);
@@ -91,22 +110,25 @@ export default class TasksPush extends BaseCommand {
                     task_id: created.id,
                     content_hash: created.content_hash,
                     details: "created disabled; enable in Mechanic",
+                    enabled: remoteTaskEnabled(created),
                     url: taskAdminUrl(project, created.id),
                 });
                 continue;
             }
-            if (!force) {
-                const remote = remoteBySlug.get(slug) || await client.getTask(link.remote_id);
-                if (stableStringify(task) === stableStringify(taskForPush(remote.task))) {
-                    rows.push({
-                        file: relativeFile,
-                        status: "skipped",
-                        task_id: remote.id,
-                        content_hash: remote.content_hash,
-                        details: "",
-                    });
-                    continue;
-                }
+            const remote = force
+                ? await client.getTask(link.remote_id)
+                : remoteBySlug.get(slug) || await client.getTask(link.remote_id);
+            if (stableStringify(task) === stableStringify(taskForPush(remote.task))) {
+                rows.push({
+                    file: relativeFile,
+                    status: "skipped",
+                    task_id: remote.id,
+                    content_hash: remote.content_hash,
+                    details: remoteTaskStateDetail(remote),
+                    enabled: remoteTaskEnabled(remote),
+                    url: taskAdminUrl(project, remote.id),
+                });
+                continue;
             }
             const updated = await client.updateTask(link.remote_id, {
                 task,
@@ -120,7 +142,8 @@ export default class TasksPush extends BaseCommand {
                 status: force ? "forced" : "updated",
                 task_id: updated.id,
                 content_hash: updated.content_hash,
-                details: "",
+                details: remoteTaskStateDetail(updated),
+                enabled: remoteTaskEnabled(updated),
                 url: taskAdminUrl(project, updated.id),
             });
         }
@@ -129,7 +152,7 @@ export default class TasksPush extends BaseCommand {
     async preflightRemoteChanges(client, project, links, preparedTasks) {
         const remoteBySlug = new Map();
         const conflicts = [];
-        for (const { slug, relativeFile } of preparedTasks) {
+        for (const { slug, relativeFile, task } of preparedTasks) {
             const link = linkForSlug({ ...project, links }, slug);
             if (!link) {
                 continue;
@@ -137,12 +160,12 @@ export default class TasksPush extends BaseCommand {
             const remote = await client.getTask(link.remote_id);
             remoteBySlug.set(slug, remote);
             if (remoteChangedSinceLastPull(link, remote)) {
-                conflicts.push(remoteChangedSinceLastPullMessage(relativeFile, link.remote_id));
+                conflicts.push(remoteChangedSinceLastPullMessage(relativeFile, link.remote_id, localChangedSinceLastSync(link, task)));
             }
         }
         if (conflicts.length > 0) {
             throw new CliError([
-                "Remote changes found before publishing. Nothing was published.",
+                "Mechanic changes found before publishing. Nothing was published.",
                 "",
                 ...conflicts.map((conflict) => `- ${conflict}`),
             ].join("\n"), 2);
@@ -326,7 +349,7 @@ export default class TasksPush extends BaseCommand {
                     status: "conflict",
                     task_id: remote.id,
                     content_hash: remote.content_hash,
-                    details: remoteChangedSinceLastPullDetails(),
+                    details: remoteChangedSinceLastPullMessage(relativeFile, remote.id, localChangedSinceLastSync(link, task)),
                 });
                 continue;
             }
@@ -356,14 +379,14 @@ export default class TasksPush extends BaseCommand {
             ]),
         ];
     }
-    printCreatedTaskLinks(rows) {
-        const createdRows = rows.filter((row) => row.status === "created" && row.url);
-        if (createdRows.length === 0) {
+    printPublishedTaskLinks(rows) {
+        const publishedRows = rows.filter((row) => ["created", "updated", "forced"].includes(row.status) && row.url);
+        if (publishedRows.length === 0) {
             return;
         }
         this.log("");
-        this.log(this.accent(createdRows.length === 1 ? "Open created task:" : "Open created tasks:"));
-        for (const row of createdRows) {
+        this.log(this.accent(publishedRows.length === 1 ? "Open task:" : "Open published tasks:"));
+        for (const row of publishedRows) {
             this.log(`  ${this.taskName(row.file)}  ${this.taskName(row.url || "")}`);
         }
     }

package/dist/commands/tasks/status.d.ts

@@ -7,6 +7,25 @@ type HelperStatus = {
     blocked: boolean;
     details?: string;
 };
+type TaskStatusResult = {
+    file: string;
+    slug: string;
+    link: {
+        linked: boolean;
+        remote_id: string | null;
+    };
+    local: HelperStatus;
+    remote: {
+        label: string;
+        details?: string;
+        task_id?: string;
+        task_name?: string;
+        updated_at?: string | null;
+        enabled?: boolean | null;
+        url?: string;
+    } | null;
+    details: string[];
+};
 export default class TasksStatus extends BaseCommand {
     static summary: string;
     static description: string;
@@ -19,12 +38,11 @@ export default class TasksStatus extends BaseCommand {
     };
     run(): Promise<void>;
     helperStatus(project: Project, file: string, task: JsonObject): Promise<HelperStatus>;
-    remoteStatus(client: MechanicClient | null, task: JsonObject, link: ReturnType<typeof linkForSlug>): Promise<{
-        label: string;
-        details?: string;
-    }>;
+    remoteStatus(project: Project, client: MechanicClient | null, task: JsonObject, link: ReturnType<typeof linkForSlug>, relativeFile: string): Promise<TaskStatusResult["remote"]>;
+    printSingleTaskInfo(project: Project, statuses: TaskStatusResult[], checkRemote: boolean): void;
     localLabel(label: string): string;
     remoteLabel(label: string): string;
+    enabledLabel(enabled: boolean | null | undefined): string;
 }
 export {};
 //# sourceMappingURL=status.d.ts.map

package/dist/commands/tasks/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/commands/tasks/status.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAe9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAE1D,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAuBF,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,WAAW;IAClD,OAAgB,OAAO,SAAwE;IAC/F,OAAgB,WAAW,SAA+Q;IAE1S,OAAgB,IAAI;;MAElB;IAEF,OAAgB,KAAK;;;MAOnB;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAsHpB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC;IA4BrF,YAAY,CAChB,MAAM,EAAE,cAAc,GAAG,IAAI,EAC7B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,GACnC,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAsB/C,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAejC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CAgBnC"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/commands/tasks/status.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAgB,MAAM,iBAAiB,CAAC;AAgB5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAgB,MAAM,gBAAgB,CAAC;AAExE,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE;QACJ,MAAM,EAAE,OAAO,CAAC;QAChB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;KAC1B,CAAC;IACF,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3B,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;QACzB,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,GAAG,IAAI,CAAC;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA0BF,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,WAAW;IAClD,OAAgB,OAAO,SAAwE;IAC/F,OAAgB,WAAW,SAA+Q;IAE1S,OAAgB,IAAI;;MAElB;IAEF,OAAgB,KAAK;;;MAOnB;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAuHpB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC;IA4BrF,YAAY,CAChB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,cAAc,GAAG,IAAI,EAC7B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,EACpC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAiCtC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,EAAE,WAAW,EAAE,OAAO,GAAG,IAAI;IAwB/F,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAejC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAmBlC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM;CAW1D"}

package/dist/commands/tasks/status.js

@@ -1,14 +1,28 @@
 import { Args, Flags } from "@oclif/core";
 import path from "node:path";
 import { BaseCommand } from "../../base-command.js";
-import { linkForSlug } from "../../config.js";
+import { linkForSlug, taskAdminUrl } from "../../config.js";
 import { pathExists } from "../../fs.js";
 import { stableStringify } from "../../json.js";
-import { displayTaskPath, helperDirForTaskFile, readRawTaskFile, remoteChangedSinceLastPull, remoteChangedSinceLastPullDetails, selectedTaskFiles, slugFromTaskFile, taskForPush, unbundledHelperDirForTaskFile, validateTaskForPush, } from "../../tasks.js";
+import { displayTaskPath, helperDirForTaskFile, localChangedSinceLastSync, readRawTaskFile, remoteChangedSinceLastPull, remoteChangedSinceLastPullMessage, selectedTaskFiles, slugFromTaskFile, taskForPush, unbundledHelperDirForTaskFile, validateTaskForPush, } from "../../tasks.js";
 const IMPLICIT_REMOTE_CHECK_LIMIT = 25;
 function errorMessage(error) {
     return error instanceof Error ? error.message : String(error);
 }
+function remoteTaskEnabled(envelope) {
+    if (typeof envelope.enabled === "boolean") {
+        return envelope.enabled;
+    }
+    if (typeof envelope.task.enabled === "boolean") {
+        return envelope.task.enabled;
+    }
+    return null;
+}
+function remoteTaskName(envelope) {
+    return typeof envelope.task.name === "string" && envelope.task.name.trim()
+        ? envelope.task.name
+        : envelope.id;
+}
 export default class TasksStatus extends BaseCommand {
     static summary = "Show whether local task files are ready and in sync with Mechanic.";
     static description = `Show whether local task files are linked, ready to publish, and in sync with their remote Mechanic tasks. Repo-wide status checks remote state for up to ${IMPLICIT_REMOTE_CHECK_LIMIT} tasks; larger projects show local status only. Use --local to skip remote checks.`;
@@ -67,13 +81,13 @@ export default class TasksStatus extends BaseCommand {
                 details.push(helperStatus.details);
             }
             const remote = checkRemote && task && !helperStatus.blocked
-                ? await this.remoteStatus(link ? await getClient() : null, task, link)
+                ? await this.remoteStatus(project, link ? await getClient() : null, task, link, relativeFile)
                 : checkRemote ? { label: "skipped", details: undefined } : null;
             if (remote?.details) {
                 details.push(remote.details);
             }
             else if (!link && task && !helperStatus.blocked) {
-                details.push("publish will create disabled task");
+                details.push("run publish --dry-run to check create plan");
             }
             statuses.push({
                 file: relativeFile,
@@ -121,6 +135,7 @@ export default class TasksStatus extends BaseCommand {
             this.log("");
         }
         this.table(rows);
+        this.printSingleTaskInfo(project, statuses, checkRemote);
     }
     async helperStatus(project, file, task) {
         const helperDir = helperDirForTaskFile(file);
@@ -146,21 +161,52 @@ export default class TasksStatus extends BaseCommand {
         }
         return { label: "ready", blocked: false };
     }
-    async remoteStatus(client, task, link) {
+    async remoteStatus(project, client, task, link, relativeFile) {
         if (!link) {
-            return { label: "will create", details: "publish will create disabled task" };
+            return { label: "unlinked", details: "run publish --dry-run to check create plan" };
         }
         if (!client) {
             return { label: "not checked" };
         }
         const remote = await client.getTask(link.remote_id);
+        const taskDetails = {
+            task_id: remote.id,
+            task_name: remoteTaskName(remote),
+            updated_at: remote.updated_at || null,
+            enabled: remoteTaskEnabled(remote),
+            url: taskAdminUrl(project, remote.id),
+        };
         if (remoteChangedSinceLastPull(link, remote)) {
-            return { label: "conflict", details: remoteChangedSinceLastPullDetails() };
+            return {
+                label: "conflict",
+                details: remoteChangedSinceLastPullMessage(relativeFile, link.remote_id, localChangedSinceLastSync(link, task)),
+                ...taskDetails,
+            };
         }
         if (stableStringify(taskForPush(task)) !== stableStringify(taskForPush(remote.task))) {
-            return { label: "local changes", details: "publish would update" };
+            return { label: "local changes", details: "publish would update", ...taskDetails };
+        }
+        return { label: "no change", ...taskDetails };
+    }
+    printSingleTaskInfo(project, statuses, checkRemote) {
+        if (!checkRemote || statuses.length !== 1) {
+            return;
+        }
+        const status = statuses[0];
+        const remote = status.remote;
+        if (!remote?.task_id) {
+            return;
         }
-        return { label: "no change" };
+        this.log("");
+        this.log(this.accent("Task details"));
+        this.table([
+            ["Field", "Value"],
+            ["Name", this.taskName(remote.task_name || remote.task_id)],
+            ["State", this.enabledLabel(remote.enabled)],
+            ["Updated", this.muted(remote.updated_at || "--")],
+            ["Task ID", this.taskId(project, remote.task_id)],
+            ["URL", this.taskName(remote.url || taskAdminUrl(project, remote.task_id))],
+        ]);
     }
     localLabel(label) {
         switch (label) {
@@ -185,6 +231,8 @@ export default class TasksStatus extends BaseCommand {
                 return this.color("cyan", label);
             case "conflict":
                 return this.color("red", label);
+            case "unlinked":
+                return this.color("yellow", label);
             case "skipped":
             case "not checked":
                 return this.muted(label);
@@ -192,4 +240,13 @@ export default class TasksStatus extends BaseCommand {
                 return label;
         }
     }
+    enabledLabel(enabled) {
+        if (enabled === true) {
+            return this.success("enabled");
+        }
+        if (enabled === false) {
+            return this.color("yellow", "disabled");
+        }
+        return this.muted("unknown");
+    }
 }

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAEhF,eAAO,MAAM,oBAAoB,QAAkE,CAAC;AA0BpG,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAyBzD;AA+BD,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,SAA4B,GAAG,MAAM,CAG9F;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAMrE;AAED,wBAAgB,aAAa,CAC3B,UAAU,EAAE,MAAM,EAClB,UAAU,SAAuB,EACjC,MAAM,SAA4D,GACjE,cAAc,CAOhB;AAED,wBAAgB,UAAU,IAAI,SAAS,CAEtC;AA6ED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM,EACf,KAAK,UAAQ,GACZ,OAAO,CAAC,OAAO,CAAC,CA2BlB;AAED,wBAAsB,4BAA4B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA0BhF;AAED,wBAAsB,WAAW,CAAC,GAAG,SAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAkCvE;AAED,wBAAsB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAGjF;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAE5E;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEjF;AAyBD,wBAAgB,UAAU,CACxB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,gBAAgB,CAAC,EAAE,MAAM,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,SAAS,CAmBX"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAEhF,eAAO,MAAM,oBAAoB,QAAkE,CAAC;AAwEpG,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAyBzD;AA+BD,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,SAA4B,GAAG,MAAM,CAG9F;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAMrE;AAED,wBAAgB,aAAa,CAC3B,UAAU,EAAE,MAAM,EAClB,UAAU,SAAuB,EACjC,MAAM,SAA4D,GACjE,cAAc,CAOhB;AAED,wBAAgB,UAAU,IAAI,SAAS,CAEtC;AA6ED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM,EACf,KAAK,UAAQ,GACZ,OAAO,CAAC,OAAO,CAAC,CA2BlB;AAED,wBAAsB,4BAA4B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA0BhF;AAED,wBAAsB,WAAW,CAAC,GAAG,SAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAkCvE;AAED,wBAAsB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAGjF;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAE5E;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEjF;AAyBD,wBAAgB,UAAU,CACxB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,gBAAgB,CAAC,EAAE,MAAM,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,SAAS,CAmBX"}

package/dist/config.js

@@ -26,6 +26,37 @@ function parseConfigUrl(value, label) {
         throw new CliError(`${label} must be a valid URL.`);
     }
 }
+function normalizeRelativeProjectPath(value, label) {
+    const normalizedInput = value.trim().replace(/\\/g, "/");
+    if (!normalizedInput
+        || path.posix.isAbsolute(normalizedInput)
+        || path.win32.isAbsolute(value)) {
+        throw new CliError(`${label} must be a relative path inside this Mechanic CLI project.`);
+    }
+    const normalized = path.posix.normalize(normalizedInput).replace(/\/+$/, "");
+    if (normalized === "."
+        || normalized === ".."
+        || normalized.startsWith("../")
+        || path.posix.isAbsolute(normalized)) {
+        throw new CliError(`${label} must be a relative path inside this Mechanic CLI project.`);
+    }
+    return normalized;
+}
+function normalizeTasksDirName(value) {
+    return normalizeRelativeProjectPath(value || DEFAULT_TASKS_DIR, "tasks_dir");
+}
+function normalizeLinkFile(slug, file, tasksDirName) {
+    const normalizedTasksDir = normalizeTasksDirName(tasksDirName);
+    const normalizedFile = normalizeRelativeProjectPath(file || `${normalizedTasksDir}/${slug}.json`, `.mechanic/links.json file for ${slug}`);
+    const relativeToTasksDir = path.posix.relative(normalizedTasksDir, normalizedFile);
+    if (relativeToTasksDir === ""
+        || relativeToTasksDir === ".."
+        || relativeToTasksDir.startsWith("../")
+        || path.posix.isAbsolute(relativeToTasksDir)) {
+        throw new CliError(`.mechanic/links.json file for ${slug} must be inside ${normalizedTasksDir}.`);
+    }
+    return normalizedFile;
+}
 export function normalizeApiBaseUrl(value) {
     const url = parseConfigUrl(value, "api_base_url");
     const hostname = url.hostname.toLowerCase();
@@ -93,7 +124,7 @@ function normalizeLinkEntry(slug, entry, tasksDirName) {
         return null;
     }
     const normalized = {
-        file: entry.file || `${tasksDirName}/${slug}.json`,
+        file: normalizeLinkFile(slug, entry.file, tasksDirName),
         remote_id: entry.remote_id,
         last_remote_content_hash: entry.last_remote_content_hash,
     };
@@ -107,7 +138,7 @@ function normalizeLegacyLinkEntry(slug, entry, tasksDirName) {
         return null;
     }
     return [slug, {
-            file: `${tasksDirName}/${slug}.json`,
+            file: normalizeLinkFile(slug, undefined, tasksDirName),
             remote_id: entry.task_id,
             last_remote_content_hash: entry.last_remote_hash,
         }];
@@ -193,7 +224,7 @@ export async function loadProject(cwd = process.cwd()) {
     if (!config.api_base_url) {
         throw new CliError("mechanic.json must include api_base_url");
     }
-    const tasksDirName = config.tasks_dir || DEFAULT_TASKS_DIR;
+    const tasksDirName = normalizeTasksDirName(config.tasks_dir);
     const linksPath = path.join(cwd, ".mechanic", "links.json");
     const links = normalizeLinks(await readJson(linksPath, emptyLinks()), config.shop_domain, tasksDirName);
     const apiBaseUrl = normalizeApiBaseUrl(process.env.MECHANIC_API_BASE_URL || config.api_base_url);

package/dist/tasks.d.ts

@@ -26,8 +26,9 @@ export declare function writeTaskFile(project: Project, slug: string, task: Json
 export declare function resolveTaskSelector(project: Project, input: string, options?: ResolveTaskSelectorOptions): Promise<ResolvedTaskSelector>;
 export declare function selectedTaskFiles(project: Project, input: string | undefined, all: boolean): Promise<string[]>;
 export declare function remoteChangedSinceLastPull(link: LinkEntry, remote: Pick<TaskEnvelope, "content_hash">): boolean;
+export declare function localChangedSinceLastSync(link: LinkEntry, task: JsonObject): boolean;
 export declare function remoteChangedSinceLastPullDetails(force?: boolean): string;
-export declare function remoteChangedSinceLastPullMessage(relativeFile: string, remoteId: string): string;
+export declare function remoteChangedSinceLastPullMessage(relativeFile: string, remoteId: string, localChanged?: boolean): string;
 export declare function taskForPush(task: JsonObject): JsonObject;
 export declare function nextAvailableSlug(project: Project, baseSlug: string): Promise<string>;
 export declare function taskFromHelperDir(dirPath: string): Promise<JsonObject>;

package/dist/tasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"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"}

package/dist/tasks.js

@@ -2,6 +2,7 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import { CliError } from "./errors.js";
 import { ensureDir, pathExists, readJson, readText, removeFile, writeJson, writeText } from "./fs.js";
+import { contentHash } from "./hash.js";
 import { stableStringify } from "./json.js";
 const SPLIT_FILES = [
     ["script", "script.liquid"],
@@ -318,11 +319,19 @@ export async function selectedTaskFiles(project, input, all) {
 export function remoteChangedSinceLastPull(link, remote) {
     return remote.content_hash !== link.last_remote_content_hash;
 }
+export function localChangedSinceLastSync(link, task) {
+    const localHash = contentHash(taskForPush(task));
+    return (localHash !== link.last_remote_content_hash
+        && localHash !== link.last_local_content_hash);
+}
 export function remoteChangedSinceLastPullDetails(force = false) {
-    return force ? "remote changed since last pull; --force set" : "remote changed since last pull";
+    return force ? "Mechanic changed since last sync; --force set" : "Mechanic changed since last sync";
 }
-export function remoteChangedSinceLastPullMessage(relativeFile, remoteId) {
-    return `${relativeFile} has changes in Mechanic since the last pull. Run "mechanic tasks diff ${relativeFile}" to review, then "mechanic tasks pull ${remoteId}" to keep the Mechanic version, or re-run with --force only if the local file should win.`;
+export function remoteChangedSinceLastPullMessage(relativeFile, remoteId, localChanged = false) {
+    if (localChanged) {
+        return `${relativeFile} has changes in Mechanic and local changes since this file was last synced. Run "mechanic tasks diff ${relativeFile}" to review. Then run "mechanic tasks pull ${remoteId} --force" only if current Mechanic should replace your local file, or run "mechanic tasks publish ${relativeFile} --force" only if your local file should overwrite Mechanic.`;
+    }
+    return `${relativeFile} has changes in Mechanic since this file was last synced. Run "mechanic tasks diff ${relativeFile}" to review, then "mechanic tasks pull ${remoteId}" to update your local file from current Mechanic before publishing.`;
 }
 export function taskForPush(task) {
     const { enabled: _enabled, id: _id, remote_id: _remoteId, ...payload } = task;
@@ -549,7 +558,7 @@ export function diffTasks(local, remote) {
     }
     const sections = [`Changed fields: ${changedFields.join(", ")}`];
     for (const field of changedFields) {
-        sections.push("", `## ${field}`, "--- remote", "+++ local", ...formattedValueDiff(comparableRemote[field], comparableLocal[field]));
+        sections.push("", `## ${field}`, "--- current Mechanic", "+++ local file", ...formattedValueDiff(comparableRemote[field], comparableLocal[field]));
     }
     return sections.join("\n");
 }

package/dist/types.d.ts

@@ -29,6 +29,7 @@ export type TaskEnvelope = {
     id: string;
     updated_at?: string;
     content_hash: string;
+    enabled?: boolean | null;
     task: JsonObject;
 };
 export type TaskListResponse = {

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEjD,MAAM,MAAM,cAAc,GAAG;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,wBAAwB,EAAE,MAAM,CAAC;IACjC,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,SAAS,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,IAAI,EAAE,UAAU,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,YAAY,EAAE,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,IAAI,EAAE;QACJ,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACpC,8BAA8B,EAAE,MAAM,EAAE,CAAC;KAC1C,CAAC;IACF,MAAM,EAAE;QACN,IAAI,EAAE,aAAa,GAAG,+BAA+B,GAAG,gBAAgB,CAAC;QACzE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACxB,SAAS,EAAE,OAAO,CAAC;QACnB,cAAc,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;KACjC,CAAC;IACF,OAAO,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,gBAAgB,EAAE,MAAM,CAAC;QACzB,kBAAkB,EAAE,MAAM,CAAC;QAC3B,2BAA2B,EAAE,OAAO,CAAC;KACtC,CAAC;IACF,WAAW,EAAE;QACX,mBAAmB,EAAE,MAAM,EAAE,CAAC;QAC9B,OAAO,EAAE;YACP,GAAG,EAAE,MAAM,EAAE,CAAC;YACd,YAAY,EAAE,MAAM,EAAE,CAAC;SACxB,CAAC;QACF,OAAO,EAAE;YACP,GAAG,EAAE,MAAM,EAAE,CAAC;YACd,YAAY,EAAE,MAAM,EAAE,CAAC;SACxB,CAAC;QACF,QAAQ,EAAE;YACR,QAAQ,EAAE,OAAO,CAAC;YAClB,oBAAoB,EAAE,OAAO,CAAC;YAC9B,MAAM,EAAE,MAAM,CAAC;YACf,OAAO,EAAE,MAAM,CAAC;SACjB,CAAC;QACF,QAAQ,EAAE,MAAM,EAAE,CAAC;KACpB,CAAC;IACF,WAAW,CAAC,EAAE,KAAK,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;QACvC,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC,CAAC;IACH,MAAM,EAAE,KAAK,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC5B,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;QACjC,SAAS,EAAE,KAAK,CAAC;YACf,EAAE,EAAE,OAAO,GAAG,IAAI,CAAC;YACnB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;YACtB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;YACvB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;YAC7C,WAAW,EAAE,KAAK,CAAC;gBACjB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;gBAC5B,EAAE,EAAE,OAAO,GAAG,IAAI,CAAC;gBACnB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;gBACtB,MAAM,CAAC,EAAE,OAAO,CAAC;gBACjB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;aAC9C,CAAC,CAAC;SACJ,CAAC,CAAC;KACJ,CAAC,CAAC;CACJ,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE;QACJ,cAAc,EAAE,MAAM,CAAC;KACxB,CAAC;IACF,KAAK,EAAE;QACL,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QACvB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QACvB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;QACjC,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;IACF,OAAO,EAAE;QACP,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;KAC5B,CAAC;IACF,OAAO,EAAE;QACP,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3B,cAAc,EAAE;YAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAChE,OAAO,EAAE;YAAE,OAAO,EAAE,MAAM,CAAC;YAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QACzE,SAAS,EAAE;YAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;YAAC,OAAO,EAAE,MAAM,CAAC;YAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;KACxG,CAAC;IACF,GAAG,EAAE;QACH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;QAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;KAC9B,CAAC;IACF,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightward/mechanic-cli",
-  "version": "0.1.6",
+  "version": "0.1.9",
   "description": "Develop, preview, diff, and publish Mechanic Shopify automation tasks from local files",
   "type": "module",
   "keywords": [
@@ -18,6 +18,13 @@
   ],
   "author": "Lightward",
   "homepage": "https://learn.mechanic.dev/platform/mechanic-cli",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lightward/mechanic-cli.git"
+  },
+  "bugs": {
+    "url": "https://github.com/lightward/mechanic-cli/issues"
+  },
   "bin": {
     "mechanic": "./bin/mechanic.js"
   },
@@ -40,7 +47,7 @@
         "description": "Manage the stored API token for this project."
       },
       "github": {
-        "description": "Generate GitHub Actions workflows for Mechanic task updates."
+        "description": "Generate optional GitHub Actions workflows for Mechanic task updates."
       },
       "shop": {
         "description": "Inspect this shop's Mechanic queue and backlog."