@sherwoodagent/cli 0.59.12 → 0.59.13

package/dist/index.js

@@ -4291,7 +4291,7 @@ function registerProposalCommands(program2) {
         );
         console.error(
           DIM2(
-            "\n  Other states have their own recovery path:\n    Draft/Pending    \u2192 sherwood proposal cancel --id <id>\n    Approved         \u2192 sherwood proposal veto <id>\n    Expired          \u2192 vault is not locked, nothing to do\n    Settled          \u2192 already settled\n    Cancelled        \u2192 governor upgrade required (issue #177)\n"
+            "\n  Other states have their own recovery path:\n    Draft/Pending/GuardianReview/Approved \u2192 sherwood proposal cancel --id <id> (proposer)\n    Draft/Pending (vault owner)           \u2192 sherwood proposal cancel --id <id> --emergency\n    Pending (vault owner)                 \u2192 sherwood proposal veto --id <id>\n    Expired          \u2192 vault is not locked, nothing to do\n    Settled          \u2192 already settled\n    Cancelled        \u2192 governor upgrade required (issue #177)\n"
           )
         );
         process.exit(1);
@@ -4406,14 +4406,32 @@ function registerProposalCommands(program2) {
         spinner.fail(`Proposal is already ${PROPOSAL_STATES[state]}`);
         process.exit(1);
       }
+      const PROPOSER_CANCELLABLE = /* @__PURE__ */ new Set([
+        PROPOSAL_STATE.Draft,
+        PROPOSAL_STATE.Pending,
+        PROPOSAL_STATE.GuardianReview,
+        PROPOSAL_STATE.Approved
+      ]);
+      const OWNER_EMERGENCY_CANCELLABLE = /* @__PURE__ */ new Set([
+        PROPOSAL_STATE.Draft,
+        PROPOSAL_STATE.Pending
+      ]);
       let hash;
       if (opts.emergency) {
+        if (!OWNER_EMERGENCY_CANCELLABLE.has(state)) {
+          spinner.fail(
+            `Proposal is ${PROPOSAL_STATES[state] || "Unknown"} \u2014 emergencyCancel only works in Draft or Pending. For GuardianReview / Approved, the proposer can run: sherwood proposal cancel --id ${proposalId}`
+          );
+          process.exit(1);
+        }
         spinner.text = W2("Emergency cancelling...");
         hash = await emergencyCancel(proposalId);
         spinner.succeed(G2("Emergency cancelled"));
       } else {
-        if (state !== PROPOSAL_STATE.Draft && state !== PROPOSAL_STATE.Pending) {
-          spinner.fail(`Proposal is ${PROPOSAL_STATES[state] || "Unknown"} \u2014 use --emergency for non-pending/approved`);
+        if (!PROPOSER_CANCELLABLE.has(state)) {
+          spinner.fail(
+            `Proposal is ${PROPOSAL_STATES[state] || "Unknown"} \u2014 not cancellable in this state. cancelProposal accepts Draft / Pending / GuardianReview / Approved (proposer only).`
+          );
           process.exit(1);
         }
         spinner.text = W2("Cancelling proposal...");