setup-agent 0.0.6 → 0.0.7

package/src/host.test.ts

@@ -163,6 +163,70 @@ describe("CheckoutHost", () => {
 });
 
 describe("plans", () => {
+  it.each([
+    { decision: "approve" },
+    { decision: "revise", feedback: "Use pnpm" },
+  ] satisfies Checkout.PlanDecision[])(
+    "rejects a $decision decision for a superseded revision",
+    async (decision) => {
+      const host = mount();
+      await host.commands["checkout/create"](seed);
+      await host.commands["checkout/begin-plan"]();
+      await host.commands["agent/plan"]({ markdown: "Install chat" });
+      const pending = { ...decision, id: seed.id, revision: 1 };
+      await host.commands["agent/plan"]({ markdown: "Replace the API route" });
+
+      expect(await reason(host.commands["checkout/plan"](pending))).toEqual({
+        reason: "stale-plan",
+      });
+      expect(currentPlan(host.state)).toMatchObject({
+        revision: 2,
+        status: "proposed",
+      });
+      expect(host.state.status).toBe("planning");
+      expect(currentPlan(host.state)?.feedback).toBeUndefined();
+
+      await host.commands["checkout/plan"]({ ...pending, revision: 2 });
+      expect(currentPlan(host.state)?.status).toBe(
+        decision.decision === "approve" ? "approved" : "changes-requested",
+      );
+    },
+  );
+
+  it("rejects a decision from an earlier setup with the same plan revision", async () => {
+    const host = mount();
+    await host.commands["checkout/create"](seed);
+    await host.commands["checkout/begin-plan"]();
+    await host.commands["agent/plan"]({ markdown: "Install chat" });
+    await host.commands["checkout/cancel"]({ id: seed.id });
+    await host.commands["checkout/create"]({ ...seed, id: "replacement" });
+    await host.commands["checkout/begin-plan"]();
+    await host.commands["agent/plan"]({ markdown: "Install cloud" });
+
+    expect(
+      await reason(
+        host.commands["checkout/plan"]({
+          decision: "approve",
+          id: seed.id,
+          revision: 1,
+        }),
+      ),
+    ).toEqual({ reason: "stale-plan" });
+    expect(currentPlan(host.state)).toMatchObject({
+      revision: 1,
+      status: "proposed",
+    });
+    expect(host.state.status).toBe("planning");
+
+    await host.commands["checkout/plan"]({
+      decision: "approve",
+      id: "replacement",
+      revision: 1,
+    });
+    expect(currentPlan(host.state)?.status).toBe("approved");
+    expect(host.state.status).toBe("installing");
+  });
+
   it("refuses steps until the user approves a plan", async () => {
     const host = mount();
     await host.commands["checkout/create"](seed);
@@ -606,6 +670,46 @@ describe("inputs", () => {
 describe("model inputs", () => {
   const answer = { provider: "openai", model: "gpt-test" };
 
+  it("stores a valid redeem hash only on model inputs", async () => {
+    const host = mount();
+    await host.commands["checkout/create"](seed);
+    await host.commands["checkout/begin-plan"]();
+    const hash = "a".repeat(64);
+    const { inputId } = await host.commands["agent/ask"]({
+      ...presetInput("llm-provider"),
+      redeemKeyHash: hash,
+    });
+    expect(
+      host.state.inputs.find((input) => input.id === inputId)?.redeemKeyHash,
+    ).toBe(hash);
+    await host.commands["checkout/answer"]({
+      inputId,
+      answer: JSON.stringify(answer),
+    });
+    expect(
+      host.state.inputs.find((input) => input.id === inputId)?.redeemKeyHash,
+    ).toBe(hash);
+    for (const redeemKeyHash of [
+      "A".repeat(64),
+      "a".repeat(63),
+      "not-a-hash",
+    ]) {
+      expect(
+        await reason(
+          host.commands["agent/ask"]({
+            ...presetInput("llm-provider"),
+            redeemKeyHash,
+          }),
+        ),
+      ).toEqual({ reason: "invalid-input" });
+    }
+    expect(
+      await reason(
+        host.commands["agent/ask"]({ prompt: "Name?", redeemKeyHash: hash }),
+      ),
+    ).toEqual({ reason: "invalid-input" });
+  });
+
   it("parses a model answer and rejects malformed ones", () => {
     expect(parseModelAnswer(JSON.stringify(answer))).toEqual(answer);
     expect(

package/src/host.ts

@@ -86,6 +86,12 @@ const useCheckoutHost = (restored: unknown) => {
 
   const ask = (seed: Checkout.InputSeed & { stepId?: string }) => {
     const kind = seed.kind ?? "text";
+    if (
+      seed.redeemKeyHash !== undefined &&
+      (kind !== "model" || !/^[0-9a-f]{64}$/.test(seed.redeemKeyHash))
+    ) {
+      throw reject("invalid-input", "invalid model redeem key hash");
+    }
     const options =
       kind === "entry-point"
         ? parseEntryPointOptions(seed.options)
@@ -166,6 +172,9 @@ const useCheckoutHost = (restored: unknown) => {
       ...(kind === "product" && { product: seed.product }),
       ...(seed.default !== undefined && { default: seed.default }),
       ...(seed.help !== undefined && { help: seed.help }),
+      ...(seed.redeemKeyHash !== undefined && {
+        redeemKeyHash: seed.redeemKeyHash,
+      }),
       optional: seed.optional ?? false,
       status: "open",
       ...(stepId !== undefined && { stepId }),
@@ -331,6 +340,15 @@ const useCheckoutHost = (restored: unknown) => {
       if (plan === undefined) {
         throw reject("no-plan", "the agent has not proposed a plan yet");
       }
+      if (
+        (params.id !== undefined && params.id !== state.id) ||
+        (params.revision !== undefined && params.revision !== plan.revision)
+      ) {
+        throw reject(
+          "stale-plan",
+          "review the current setup plan before deciding",
+        );
+      }
       if (plan.status !== "proposed") {
         throw reject("plan-decided", `the plan is already ${plan.status}`);
       }

package/src/protocol.ts

@@ -101,6 +101,7 @@ export namespace Checkout {
     product?: string;
     default?: string;
     help?: InputHelp;
+    redeemKeyHash?: string;
     optional: boolean;
     status: InputStatus;
     answer?: string;
@@ -192,12 +193,16 @@ export namespace Checkout {
     product?: string;
     default?: string;
     help?: InputHelp;
+    redeemKeyHash?: string;
     optional?: boolean;
   };
 
-  export type PlanDecision =
-    | { decision: "approve" }
-    | { decision: "revise"; feedback: string };
+  export type PlanDecision = {
+    /** The setup the browser reviewed; omitted by legacy clients. */
+    id?: string;
+    /** The plan revision the browser reviewed; omitted by legacy clients. */
+    revision?: number;
+  } & ({ decision: "approve" } | { decision: "revise"; feedback: string });
 
   export type Commands = {
     "checkout/create": (params: {
@@ -254,6 +259,7 @@ export namespace Checkout {
     | "plan-required"
     | "no-plan"
     | "plan-decided"
+    | "stale-plan"
     | "finish-not-proposed"
     | "feedback-required"
     | "empty-plan"