@apilift/cli 1.5.0 → 1.5.1

package/dist/apilift-collector.js

@@ -28011,8 +28011,8 @@ var init_schema = __esm({
       if (v2.generated && (v2.path !== void 0 || v2.fields !== void 0))
         ctx.addIssue({ code: "custom", message: "generated excludes path and fields" });
     });
-    proofPointer = pointerSchema.refine((value) => !/\{(?:input|result|generated)\.[^{}]*\}/u.test(value), "JSON Pointers are literal; use proof.select to find an item by input or result");
-    proofComparison = external_exports.union([external_exports.strictObject({ path: proofPointer, input: inputNameSchema }), external_exports.strictObject({ path: proofPointer, result: proofPointer }), external_exports.strictObject({ path: proofPointer, value: valueSchema })]);
+    proofPointer = pointerSchema.refine((value) => value.split("/").every((part) => !/\{(?:input|result|generated)\./u.test(part) || /^\{input\.[A-Za-z][A-Za-z0-9_-]*\}$/u.test(part)), "A dynamic JSON Pointer segment must be exactly {input.name}");
+    proofComparison = external_exports.union([external_exports.strictObject({ path: proofPointer, input: inputNameSchema }), external_exports.strictObject({ path: proofPointer, result: pointerSchema }), external_exports.strictObject({ path: proofPointer, value: valueSchema })]);
     proofSchema = external_exports.strictObject({ request: requestSchema, effect: external_exports.literal("read").optional(), select: external_exports.strictObject({ path: proofPointer, where: external_exports.array(proofComparison).min(1) }).optional(), equals: external_exports.array(proofComparison).min(1).optional(), absent: external_exports.literal(true).optional() }).superRefine((v2, ctx) => {
       if (!!v2.equals === !!v2.absent)
         ctx.addIssue({ code: "custom", message: "Exactly one of equals and absent is required" });
@@ -28092,7 +28092,9 @@ var init_schema = __esm({
         if (!v2.allowedOrigins.includes(origin))
           ctx.addIssue({ code: "custom", path: ["probes", origin], message: "Probe origin must be allowed" });
         const probeUrl = parseUrl(probe.request.url);
-        if (!["GET", "HEAD"].includes(probe.request.method) || probeUrl && probeUrl.origin !== origin)
+        if (!probe.effect && !["GET", "HEAD"].includes(probe.request.method))
+          ctx.addIssue({ code: "custom", path: ["probes", origin, "request", "method"], message: "Non-GET/HEAD read probes require effect: read" });
+        if (probeUrl && probeUrl.origin !== origin)
           ctx.addIssue({ code: "custom", path: ["probes", origin, "request"], message: "Probe must be a read request to its origin" });
       }
     });
@@ -28354,7 +28356,7 @@ function createCliApi(baseUrl, fetcher = fetch, token, sessionId) {
   const transport = async (input2, init) => {
     const method = init?.method ?? "GET";
     const headers = new Headers(init?.headers);
-    headers.set("Apilift-Capabilities", "distributed-rollouts-v1,discovery-proof-v2");
+    headers.set("Apilift-Capabilities", "distributed-rollouts-v1,discovery-proof-v2,dynamic-bindings-v1");
     headers.set("Apilift-Client", `cli/${cliVersion}`);
     if (token) headers.set("Authorization", `Bearer ${token}`);
     if (sessionId) headers.set("Apilift-Session", sessionId);

package/dist/apilift-native-host.js

@@ -29457,8 +29457,8 @@ var responseSchema = external_exports.strictObject({ schema: jsonSchema.optional
   if (v.generated && (v.path !== void 0 || v.fields !== void 0))
     ctx.addIssue({ code: "custom", message: "generated excludes path and fields" });
 });
-var proofPointer = pointerSchema.refine((value) => !/\{(?:input|result|generated)\.[^{}]*\}/u.test(value), "JSON Pointers are literal; use proof.select to find an item by input or result");
-var proofComparison = external_exports.union([external_exports.strictObject({ path: proofPointer, input: inputNameSchema }), external_exports.strictObject({ path: proofPointer, result: proofPointer }), external_exports.strictObject({ path: proofPointer, value: valueSchema })]);
+var proofPointer = pointerSchema.refine((value) => value.split("/").every((part) => !/\{(?:input|result|generated)\./u.test(part) || /^\{input\.[A-Za-z][A-Za-z0-9_-]*\}$/u.test(part)), "A dynamic JSON Pointer segment must be exactly {input.name}");
+var proofComparison = external_exports.union([external_exports.strictObject({ path: proofPointer, input: inputNameSchema }), external_exports.strictObject({ path: proofPointer, result: pointerSchema }), external_exports.strictObject({ path: proofPointer, value: valueSchema })]);
 var proofSchema = external_exports.strictObject({ request: requestSchema, effect: external_exports.literal("read").optional(), select: external_exports.strictObject({ path: proofPointer, where: external_exports.array(proofComparison).min(1) }).optional(), equals: external_exports.array(proofComparison).min(1).optional(), absent: external_exports.literal(true).optional() }).superRefine((v, ctx) => {
   if (!!v.equals === !!v.absent)
     ctx.addIssue({ code: "custom", message: "Exactly one of equals and absent is required" });
@@ -29538,7 +29538,9 @@ var transportDefinitionSchema = external_exports.strictObject({ title, descripti
     if (!v.allowedOrigins.includes(origin))
       ctx.addIssue({ code: "custom", path: ["probes", origin], message: "Probe origin must be allowed" });
     const probeUrl = parseUrl(probe.request.url);
-    if (!["GET", "HEAD"].includes(probe.request.method) || probeUrl && probeUrl.origin !== origin)
+    if (!probe.effect && !["GET", "HEAD"].includes(probe.request.method))
+      ctx.addIssue({ code: "custom", path: ["probes", origin, "request", "method"], message: "Non-GET/HEAD read probes require effect: read" });
+    if (probeUrl && probeUrl.origin !== origin)
       ctx.addIssue({ code: "custom", path: ["probes", origin, "request"], message: "Probe must be a read request to its origin" });
   }
 });
@@ -29587,8 +29589,13 @@ function inspectRequest(request2, inputs, generated, proof, base2, issues) {
       issues.push({ path: path2, message: "Unknown binding" });
       return;
     }
-    for (const [key, child] of entries)
+    for (const [key, child] of entries) {
+      if ((path2 === `${base2}/body` || path2.startsWith(`${base2}/body/`)) && /\{(?:input|generated|result|unresolved)\./u.test(key))
+        inspectText(key, `${path2}/${key}`);
+      else if (/\{(?:input|generated|result)\./u.test(key))
+        issues.push({ path: `${path2}/${key}`, message: "Dynamic keys are supported only in JSON request bodies" });
       walk(child, `${path2}/${key}`);
+    }
   };
   inspectText(request2.url, `${base2}/url`);
   for (const [header, value] of Object.entries(request2.headers ?? {})) {
@@ -29637,6 +29644,11 @@ function validateDefinition(kind, name, value) {
     for (const [i, comparison] of (definition2.proof?.select?.where ?? []).entries())
       if ("input" in comparison && !names2.includes(comparison.input))
         issues.push({ path: `/proof/select/where/${i}/input`, message: "Unknown input" });
+    const proofPaths = [...definition2.proof?.equals ?? [], ...definition2.proof?.select?.where ?? [], ...definition2.proof?.select ? [definition2.proof.select] : []];
+    for (const item of proofPaths)
+      for (const match of item.path.matchAll(/\{input\.([^{}]+)\}/gu))
+        if (!names2.includes(match[1]))
+          issues.push({ path: "/proof", message: `Unknown pointer input ${match[1]}` });
     if (definition2.response?.generated && !generated.has(definition2.response.generated))
       issues.push({ path: "/response/generated", message: "Unknown generated value" });
   }
@@ -29821,7 +29833,7 @@ function createCliApi(baseUrl, fetcher = fetch, token, sessionId) {
   const transport = async (input2, init) => {
     const method = init?.method ?? "GET";
     const headers = new Headers(init?.headers);
-    headers.set("Apilift-Capabilities", "distributed-rollouts-v1,discovery-proof-v2");
+    headers.set("Apilift-Capabilities", "distributed-rollouts-v1,discovery-proof-v2,dynamic-bindings-v1");
     headers.set("Apilift-Client", `cli/${cliVersion}`);
     if (token) headers.set("Authorization", `Bearer ${token}`);
     if (sessionId) headers.set("Apilift-Session", sessionId);

package/dist/apilift.js

@@ -28075,8 +28075,8 @@ var init_schema = __esm({
       if (v.generated && (v.path !== void 0 || v.fields !== void 0))
         ctx.addIssue({ code: "custom", message: "generated excludes path and fields" });
     });
-    proofPointer = pointerSchema.refine((value) => !/\{(?:input|result|generated)\.[^{}]*\}/u.test(value), "JSON Pointers are literal; use proof.select to find an item by input or result");
-    proofComparison = external_exports.union([external_exports.strictObject({ path: proofPointer, input: inputNameSchema }), external_exports.strictObject({ path: proofPointer, result: proofPointer }), external_exports.strictObject({ path: proofPointer, value: valueSchema })]);
+    proofPointer = pointerSchema.refine((value) => value.split("/").every((part) => !/\{(?:input|result|generated)\./u.test(part) || /^\{input\.[A-Za-z][A-Za-z0-9_-]*\}$/u.test(part)), "A dynamic JSON Pointer segment must be exactly {input.name}");
+    proofComparison = external_exports.union([external_exports.strictObject({ path: proofPointer, input: inputNameSchema }), external_exports.strictObject({ path: proofPointer, result: pointerSchema }), external_exports.strictObject({ path: proofPointer, value: valueSchema })]);
     proofSchema = external_exports.strictObject({ request: requestSchema, effect: external_exports.literal("read").optional(), select: external_exports.strictObject({ path: proofPointer, where: external_exports.array(proofComparison).min(1) }).optional(), equals: external_exports.array(proofComparison).min(1).optional(), absent: external_exports.literal(true).optional() }).superRefine((v, ctx) => {
       if (!!v.equals === !!v.absent)
         ctx.addIssue({ code: "custom", message: "Exactly one of equals and absent is required" });
@@ -28156,7 +28156,9 @@ var init_schema = __esm({
         if (!v.allowedOrigins.includes(origin))
           ctx.addIssue({ code: "custom", path: ["probes", origin], message: "Probe origin must be allowed" });
         const probeUrl = parseUrl(probe.request.url);
-        if (!["GET", "HEAD"].includes(probe.request.method) || probeUrl && probeUrl.origin !== origin)
+        if (!probe.effect && !["GET", "HEAD"].includes(probe.request.method))
+          ctx.addIssue({ code: "custom", path: ["probes", origin, "request", "method"], message: "Non-GET/HEAD read probes require effect: read" });
+        if (probeUrl && probeUrl.origin !== origin)
           ctx.addIssue({ code: "custom", path: ["probes", origin, "request"], message: "Probe must be a read request to its origin" });
       }
     });
@@ -28439,8 +28441,13 @@ function inspectRequest(request2, inputs, generated, proof, base2, issues) {
       issues.push({ path: path2, message: "Unknown binding" });
       return;
     }
-    for (const [key, child] of entries)
+    for (const [key, child] of entries) {
+      if ((path2 === `${base2}/body` || path2.startsWith(`${base2}/body/`)) && /\{(?:input|generated|result|unresolved)\./u.test(key))
+        inspectText(key, `${path2}/${key}`);
+      else if (/\{(?:input|generated|result)\./u.test(key))
+        issues.push({ path: `${path2}/${key}`, message: "Dynamic keys are supported only in JSON request bodies" });
       walk(child, `${path2}/${key}`);
+    }
   };
   inspectText(request2.url, `${base2}/url`);
   for (const [header, value] of Object.entries(request2.headers ?? {})) {
@@ -28489,6 +28496,11 @@ function validateDefinition(kind, name, value) {
     for (const [i, comparison] of (definition2.proof?.select?.where ?? []).entries())
       if ("input" in comparison && !names2.includes(comparison.input))
         issues.push({ path: `/proof/select/where/${i}/input`, message: "Unknown input" });
+    const proofPaths = [...definition2.proof?.equals ?? [], ...definition2.proof?.select?.where ?? [], ...definition2.proof?.select ? [definition2.proof.select] : []];
+    for (const item of proofPaths)
+      for (const match of item.path.matchAll(/\{input\.([^{}]+)\}/gu))
+        if (!names2.includes(match[1]))
+          issues.push({ path: "/proof", message: `Unknown pointer input ${match[1]}` });
     if (definition2.response?.generated && !generated.has(definition2.response.generated))
       issues.push({ path: "/response/generated", message: "Unknown generated value" });
   }
@@ -28813,7 +28825,7 @@ function createCliApi(baseUrl, fetcher = fetch, token, sessionId) {
   const transport = async (input2, init) => {
     const method = init?.method ?? "GET";
     const headers = new Headers(init?.headers);
-    headers.set("Apilift-Capabilities", "distributed-rollouts-v1,discovery-proof-v2");
+    headers.set("Apilift-Capabilities", "distributed-rollouts-v1,discovery-proof-v2,dynamic-bindings-v1");
     headers.set("Apilift-Client", `cli/${cliVersion}`);
     if (token) headers.set("Authorization", `Bearer ${token}`);
     if (sessionId) headers.set("Apilift-Session", sessionId);
@@ -30782,7 +30794,7 @@ function draftTemplate(kind) {
   const probeGuidance = kind === "transport" ? [
     "// probes maps every exact allowedOrigins origin to a harmless documented read request and response contract.",
     '// Shape for each origin: { "request": { "method": "GET", "url": "<documented read URL>" }, "response": {} }',
-    "// The origin key has no path or trailing slash. request.method is GET or HEAD; request.url may be relative to baseUrl or an absolute URL at that origin.",
+    '// The origin key has no path or trailing slash. request.method is GET or HEAD, or set effect: "read" on that probe for a documented/observed read through POST or another method; request.url may be relative to baseUrl or an absolute URL at that origin.',
     "// response may be empty, or contain schema (JSON Schema) and path (JSON Pointer selecting the result). It has no status, body or json fields.",
     "// A documented HTML or plain-text read can use response: {}; a successful non-JSON body is reported only as a format/status summary, never copied into verification output.",
     "// A non-JSON summary proves reachability only; inspect the signed-in UI and confirm the page's meaning before accepting verification.review.",
@@ -30794,7 +30806,7 @@ function draftTemplate(kind) {
     ""
   ].join("\n") : "";
   const tabGuidance = ["action", "transport"].includes(kind) ? "// capture.tab is a selector returned by browser tabs; it selects the same signed-in Chrome tab for capture and discover run, including connection probes. Leave other sessions' tabs untouched.\n" : "";
-  const captureGuidance = kind === "action" ? '// Public descriptions explain behavior, consequences and limits; do not instruct consumers to repeat runtime proof or browser checks. Author verification is separate from consumer judgment.\n// Request JSON/query uses typed {"$input":"name"} bindings; URL segments use {input.name}. Resolve every {unresolved.N} marker from retained evidence before running.\n// Discovery-only mutation proof compares a readback path with exactly one input, primary result path or internal JSON value: equals: [{"path":"/ready","value":true}]. Public literals require semantic review; fixed proof expectations are not caller flags.\n// Proof URLs bind returned identifiers with {result./id}; JSON bodies/query use {"$result":"/id"}. Pointers are literal, never templates.\n// For one member of a nested list: select: {"path":"/ticket/fields","where":[{"path":"/id","result":"/id"}]}; equals paths then refer to the single matching member. Compare identity and meaningful changed fields, not entire objects.\n// Repair a failed response/proof with discover run --proof-only; it reuses the saved primary response and sends only the readback. Publication still needs a successful test and accepted semantic review.\n// For large collections, investigate native search/filter/detail routes before enumeration. Search saved results locally and inspect only matching records; preserve structured dynamic fields.\n// After selecting a captured request, discover capture auth runs a bounded default search without authField or authScope. Set either only to narrow an observed field or location; browser-managed cookies need no locator.\n' : "";
+  const captureGuidance = kind === "action" ? '// Public descriptions explain behavior, consequences and limits; do not instruct consumers to repeat runtime proof or browser checks. Author verification is separate from consumer judgment.\n// Request JSON/query uses typed {"$input":"name"} bindings; URL segments use {input.name}. Resolve every {unresolved.N} marker from retained evidence before running.\n// A readback through POST requires proof.effect: "read" alongside proof.request; HTTP method alone does not determine semantic effect.\n// JSON object keys may use {input.name}, e.g. {"{input.attribute_id}":{"$input":"value"}}.\n// Discovery-only mutation proof compares a readback path with exactly one input, primary result path or internal JSON value: equals: [{"path":"/ready","value":true}]. Public literals require semantic review; fixed proof expectations are not caller flags.\n// Proof URLs bind returned identifiers with {result./id}; JSON bodies/query use {"$result":"/id"}. Readback pointers may use a complete {input.name} segment for a dynamic key; slashes and tildes in its value are escaped.\n// For one member of a nested list: select: {"path":"/ticket/fields","where":[{"path":"/id","result":"/id"}]}; equals paths then refer to the single matching member. Compare identity and meaningful changed fields, not entire objects.\n// Repair a failed response/proof with discover run --proof-only; it reuses the saved primary response and sends only the readback. Publication still needs a successful test and accepted semantic review.\n// For large collections, investigate native search/filter/detail routes before enumeration. Search saved results locally and inspect only matching records; preserve structured dynamic fields.\n// After selecting a captured request, discover capture auth runs a bounded default search without authField or authScope. Set either only to narrow an observed field or location; browser-managed cookies need no locator.\n' : "";
   return `${head}${probeGuidance}${tabGuidance}${captureGuidance}${JSON.stringify(templates[kind], null, 2)}
 `;
 }
@@ -30813,7 +30825,7 @@ var init_envelope = __esm({
 
 // src/discovery/drafts.ts
 import { randomUUID as randomUUID4 } from "node:crypto";
-import { chmodSync as chmodSync4, existsSync as existsSync2, mkdirSync as mkdirSync5, readFileSync as readFileSync4, renameSync, unlinkSync as unlinkSync2, writeFileSync as writeFileSync5 } from "node:fs";
+import { chmodSync as chmodSync4, existsSync as existsSync2, mkdirSync as mkdirSync5, readFileSync as readFileSync4, renameSync, rmSync as rmSync3, rmdirSync, writeFileSync as writeFileSync5 } from "node:fs";
 import { basename, dirname as dirname2, join as join5 } from "node:path";
 function pathFor(root, appSlug, kind, name) {
   if (!slugPattern.test(appSlug)) throw new Error("App slug is invalid");
@@ -30845,6 +30857,7 @@ var init_drafts = __esm({
         this.state = state;
         this.root = root;
         this.state.db.exec("CREATE TABLE IF NOT EXISTS discovery_draft (id TEXT PRIMARY KEY, app_slug TEXT NOT NULL, app_id TEXT, kind TEXT NOT NULL, name TEXT NOT NULL, owner_session_id TEXT, file_path TEXT NOT NULL, base_version INTEGER, UNIQUE(app_slug,kind,name)); CREATE TABLE IF NOT EXISTS selected_discovery_draft (session_id TEXT PRIMARY KEY, draft_id TEXT NOT NULL REFERENCES discovery_draft(id) ON DELETE CASCADE); CREATE TABLE IF NOT EXISTS discovery_session (session_id TEXT PRIMARY KEY, app_slug TEXT NOT NULL, app_id TEXT, title TEXT NOT NULL); CREATE TABLE IF NOT EXISTS discovery_publication (draft_id TEXT PRIMARY KEY REFERENCES discovery_draft(id) ON DELETE CASCADE, request_id TEXT NOT NULL, request_body TEXT NOT NULL); CREATE TABLE IF NOT EXISTS discovery_evidence (draft_id TEXT PRIMARY KEY REFERENCES discovery_draft(id) ON DELETE CASCADE, fingerprint TEXT NOT NULL, verified_at TEXT NOT NULL, result_path TEXT NOT NULL, data_json TEXT NOT NULL); CREATE TABLE IF NOT EXISTS discovery_attempt (draft_id TEXT PRIMARY KEY REFERENCES discovery_draft(id) ON DELETE CASCADE, fingerprint TEXT NOT NULL, state TEXT NOT NULL, recorded_at TEXT NOT NULL)");
+        this.state.db.exec("CREATE TABLE IF NOT EXISTS discovery_deferred (draft_id TEXT PRIMARY KEY REFERENCES discovery_draft(id) ON DELETE CASCADE, session_id TEXT NOT NULL); CREATE INDEX IF NOT EXISTS discovery_deferred_session ON discovery_deferred(session_id); CREATE TABLE IF NOT EXISTS discovery_finished (session_id TEXT PRIMARY KEY, result_json TEXT NOT NULL); CREATE TABLE IF NOT EXISTS discovery_cleanup (draft_id TEXT PRIMARY KEY, file_path TEXT NOT NULL UNIQUE, paths_json TEXT NOT NULL, scope_id TEXT)");
         this.state.db.exec("SAVEPOINT discovery_draft_schema");
         try {
           this.state.db.prepare("UPDATE discovery_draft SET id=id WHERE 0").run();
@@ -30933,7 +30946,24 @@ var init_drafts = __esm({
       close(sessionId) {
         const current = this.session(sessionId);
         if (!current) return null;
-        this.defer(sessionId);
+        this.discard(sessionId);
+        while (true) {
+          this.state.db.exec("BEGIN IMMEDIATE");
+          let next;
+          try {
+            next = this.state.db.prepare("SELECT d.id FROM discovery_draft d JOIN discovery_deferred r ON r.draft_id=d.id WHERE r.session_id=? AND d.owner_session_id IS NULL LIMIT 1").get(sessionId);
+            if (next) {
+              this.state.db.prepare("UPDATE discovery_draft SET owner_session_id=? WHERE id=?").run(sessionId, next.id);
+              this.state.db.prepare("INSERT INTO selected_discovery_draft (session_id,draft_id) VALUES (?,?)").run(sessionId, next.id);
+            }
+            this.state.db.exec("COMMIT");
+          } catch (error62) {
+            this.state.db.exec("ROLLBACK");
+            throw error62;
+          }
+          if (!next) break;
+          this.discard(sessionId);
+        }
         this.state.db.prepare("DELETE FROM discovery_session WHERE session_id=?").run(sessionId);
         return current;
       }
@@ -30984,40 +31014,64 @@ var init_drafts = __esm({
         this.requestAttempts();
         this.state.db.prepare("INSERT INTO discovery_request_attempt (draft_id,fingerprint,state,response_path,response_digest) VALUES (?,?,?,?,?) ON CONFLICT(draft_id,fingerprint) DO UPDATE SET state=excluded.state,response_path=COALESCE(excluded.response_path,discovery_request_attempt.response_path),response_digest=COALESCE(excluded.response_digest,discovery_request_attempt.response_digest)").run(draftId, fingerprint2, state, responsePath ?? null, responseDigest ?? null);
       }
-      discard(sessionId) {
+      artifactPath(draftId, name) {
+        const directory = join5(this.root, "draft-evidence", draftId, randomUUID4());
+        mkdirSync5(directory, { recursive: true, mode: 448 });
+        return join5(directory, name);
+      }
+      finished(sessionId) {
+        const row = this.state.db.prepare("SELECT result_json FROM discovery_finished WHERE session_id=?").get(sessionId);
+        return row ? JSON.parse(row.result_json) : null;
+      }
+      retire(sessionId, publishedResult) {
         const draft = this.selected(sessionId);
         if (!draft) return null;
-        if (this.publication(draft.id)) throw new DraftConflict("selected-draft", "A publication request may have been sent; reconcile it before discarding this draft");
+        if (publishedResult === void 0 && this.publication(draft.id)) throw new DraftConflict("selected-draft", "A publication request may have been sent; reconcile it before discarding this draft");
         withBaselines(this.root, (baselines) => baselines.closeObservation(draft.id, "released"));
+        const paths2 = [draft.filePath, `${draft.filePath}.current.json`, join5(this.root, "draft-evidence", draft.id)];
+        const evidence = this.evidence(draft.id);
+        if (evidence) paths2.push(evidence.resultPath);
+        if (this.hasTable("discovery_request_attempt")) for (const row of this.state.db.prepare("SELECT response_path FROM discovery_request_attempt WHERE draft_id=? AND response_path IS NOT NULL").all(draft.id)) paths2.push(row.response_path);
+        const scope2 = this.hasTable("discovery_capture") ? this.state.db.prepare("SELECT evidence_scope_id FROM discovery_capture WHERE draft_id=?").get(draft.id) : null;
         this.state.db.exec("BEGIN IMMEDIATE");
         try {
-          this.state.db.prepare("DELETE FROM selected_discovery_draft WHERE session_id=?").run(sessionId);
+          this.state.db.prepare("INSERT INTO discovery_cleanup (draft_id,file_path,paths_json,scope_id) VALUES (?,?,?,?)").run(draft.id, draft.filePath, JSON.stringify(paths2), scope2?.evidence_scope_id ?? null);
+          if (publishedResult !== void 0) this.state.db.prepare("INSERT INTO discovery_finished (session_id,result_json) VALUES (?,?) ON CONFLICT(session_id) DO UPDATE SET result_json=excluded.result_json").run(sessionId, JSON.stringify(publishedResult));
+          if (this.hasTable("discovery_capture")) this.state.db.prepare("DELETE FROM discovery_capture WHERE draft_id=?").run(draft.id);
           this.state.db.prepare("DELETE FROM discovery_draft WHERE id=? AND owner_session_id=?").run(draft.id, sessionId);
           this.state.db.exec("COMMIT");
-          try {
-            unlinkSync2(draft.filePath);
-          } catch {
-          }
           return draft;
         } catch (error62) {
           this.state.db.exec("ROLLBACK");
           throw error62;
         }
       }
-      published(sessionId, version2) {
-        const draft = this.selected(sessionId);
-        if (!draft) return null;
-        withBaselines(this.root, (baselines) => baselines.closeObservation(draft.id, "released"));
-        this.state.db.exec("BEGIN IMMEDIATE");
-        try {
-          this.state.db.prepare("DELETE FROM selected_discovery_draft WHERE session_id=?").run(sessionId);
-          this.state.db.prepare("DELETE FROM discovery_publication WHERE draft_id=?").run(draft.id);
-          this.state.db.prepare("UPDATE discovery_draft SET base_version=?,owner_session_id=NULL WHERE id=?").run(version2, draft.id);
-          this.state.db.exec("COMMIT");
-          return draft;
-        } catch (error62) {
-          this.state.db.exec("ROLLBACK");
-          throw error62;
+      discard(sessionId) {
+        return this.retire(sessionId);
+      }
+      published(sessionId, result3) {
+        return this.retire(sessionId, result3);
+      }
+      hasCleanup() {
+        return Boolean(this.state.db.prepare("SELECT 1 FROM discovery_cleanup LIMIT 1").get());
+      }
+      /** Durable retirement precedes filesystem/broker cleanup, so a retry never republishes. */
+      async cleanup(closeScope) {
+        for (const row of this.state.db.prepare("SELECT * FROM discovery_cleanup").all()) {
+          for (const path2 of new Set(JSON.parse(row.paths_json))) {
+            rmSync3(path2, { force: true, recursive: path2 === join5(this.root, "draft-evidence", row.draft_id) });
+            let parent = dirname2(path2);
+            while (parent !== this.root && parent.startsWith(`${join5(this.root, "drafts")}/`)) {
+              try {
+                rmdirSync(parent);
+                parent = dirname2(parent);
+              } catch {
+                break;
+              }
+            }
+          }
+          if (row.scope_id) await closeScope(row.scope_id);
+          this.state.db.prepare("DELETE FROM discovery_cleanup WHERE draft_id=?").run(row.draft_id);
         }
       }
       selected(sessionId) {
@@ -31029,6 +31083,7 @@ var init_drafts = __esm({
         let filePath = pathFor(this.root, input2.appSlug, input2.kind, name);
         this.state.db.exec("BEGIN IMMEDIATE");
         try {
+          if (this.state.db.prepare("SELECT 1 FROM discovery_cleanup WHERE file_path=?").get(filePath)) throw new DraftConflict("selected-draft", "Draft cleanup is pending; finish cleanup before reopening this resource");
           const selected = this.selected(input2.sessionId);
           if (selected && (selected.appSlug !== input2.appSlug || selected.kind !== input2.kind || selected.name !== name)) throw new DraftConflict("selected-draft", `This agent already selected ${selected.kind} ${selected.name}; defer or finish it before opening another resource`);
           const existing = this.state.db.prepare("SELECT * FROM discovery_draft WHERE app_slug=? AND kind=? AND name=?").get(input2.appSlug, input2.kind, name);
@@ -31038,6 +31093,7 @@ var init_drafts = __esm({
           const id2 = existing ? String(existing.id) : randomUUID4();
           if (!existing) this.state.db.prepare("INSERT INTO discovery_draft (id,app_slug,app_id,kind,name,owner_session_id,file_path,base_version) VALUES (?,?,?,?,?,?,?,?)").run(id2, input2.appSlug, input2.appId ?? null, input2.kind, name, input2.sessionId, filePath, input2.baseVersion ?? null);
           else this.state.db.prepare("UPDATE discovery_draft SET owner_session_id=? WHERE id=?").run(input2.sessionId, id2);
+          this.state.db.prepare("DELETE FROM discovery_deferred WHERE draft_id=?").run(id2);
           this.state.db.prepare("INSERT INTO selected_discovery_draft (session_id,draft_id) VALUES (?,?) ON CONFLICT(session_id) DO UPDATE SET draft_id=excluded.draft_id").run(input2.sessionId, id2);
           mkdirSync5(dirname2(filePath), { recursive: true, mode: 448 });
           if (!existsSync2(filePath) && existing?.intent !== "remove") writeFileSync5(filePath, draftTemplate(input2.kind), { flag: "wx", mode: 384 });
@@ -31054,6 +31110,7 @@ var init_drafts = __esm({
         const filePath = pathFor(this.root, input2.appSlug, input2.kind, input2.name).replace(/\.jsonc$/, ".delete.jsonc");
         this.state.db.exec("BEGIN IMMEDIATE");
         try {
+          if (this.state.db.prepare("SELECT 1 FROM discovery_cleanup WHERE file_path=?").get(filePath)) throw new DraftConflict("selected-draft", "Draft cleanup is pending; finish cleanup before reopening this resource");
           const selected = this.selected(input2.sessionId);
           const existing = this.state.db.prepare("SELECT * FROM discovery_draft WHERE app_slug=? AND kind=? AND name=?").get(input2.appSlug, input2.kind, input2.name);
           if (selected && selected.id !== existing?.id) throw new DraftConflict("selected-draft", "Finish or defer the selected draft before preparing a removal");
@@ -31085,6 +31142,7 @@ ${JSON.stringify({ remove: true, expectedVersion: input2.baseVersion }, null, 2)
           const draft = this.selected(sessionId);
           if (draft) {
             withBaselines(this.root, (baselines) => baselines.closeObservation(draft.id, "released"));
+            this.state.db.prepare("INSERT INTO discovery_deferred (draft_id,session_id) VALUES (?,?) ON CONFLICT(draft_id) DO UPDATE SET session_id=excluded.session_id").run(draft.id, sessionId);
             this.state.db.prepare("DELETE FROM selected_discovery_draft WHERE session_id=?").run(sessionId);
             this.state.db.prepare("UPDATE discovery_draft SET owner_session_id=NULL WHERE id=? AND owner_session_id=?").run(draft.id, sessionId);
           }
@@ -31710,7 +31768,7 @@ var init_process = __esm({
 
 // src/capture-server/client.ts
 import { createHash as createHash4 } from "node:crypto";
-import { chmodSync as chmodSync5, existsSync as existsSync3, mkdirSync as mkdirSync6, readFileSync as readFileSync6, rmSync as rmSync3 } from "node:fs";
+import { chmodSync as chmodSync5, existsSync as existsSync3, mkdirSync as mkdirSync6, readFileSync as readFileSync6, rmSync as rmSync4 } from "node:fs";
 import { dirname as dirname3, join as join6 } from "node:path";
 import { DatabaseSync as DatabaseSync3 } from "node:sqlite";
 function knownLegacyBroker(version2) {
@@ -31800,7 +31858,7 @@ async function ensureCaptureServerUnderUpdateLock(options2) {
         if (error62.code === "capture-server-busy") throw error62;
       }
       try {
-        rmSync3(join6(root, "server.json"));
+        rmSync4(join6(root, "server.json"));
       } catch {
       }
     }
@@ -32443,7 +32501,7 @@ var init_vault = __esm({
 
 // src/commands/run.ts
 import { randomUUID as randomUUID7 } from "node:crypto";
-import { readFileSync as readFileSync7, renameSync as renameSync2, unlinkSync as unlinkSync3, writeFileSync as writeFileSync6, mkdirSync as mkdirSync8 } from "node:fs";
+import { readFileSync as readFileSync7, renameSync as renameSync2, unlinkSync as unlinkSync2, writeFileSync as writeFileSync6, mkdirSync as mkdirSync8 } from "node:fs";
 import { dirname as dirname5, resolve as resolve4, join as join10 } from "node:path";
 function pointer2(value, path2) {
   if (path2 === "") return value;
@@ -32569,10 +32627,18 @@ function bind(value, inputs, generated, output2, insideArray = false) {
       if (typeof object4.$generated === "string") return generated[object4.$generated];
       if (typeof object4.$result === "string") return pointer2(output2, object4.$result);
     }
-    const target = {};
+    const target = /* @__PURE__ */ Object.create(null);
     for (const [name, item] of Object.entries(object4)) {
       const resolved = bind(item, inputs, generated, output2);
-      if (resolved !== omit2) target[name] = resolved;
+      if (resolved !== omit2) {
+        const key = name.replace(/\{(input|generated|result)\.([^{}]*)\}/gu, (_, kind, ref) => {
+          const selected = kind === "input" ? inputs[ref] : kind === "generated" ? generated[ref] : pointer2(output2, ref);
+          if (typeof selected !== "string" && typeof selected !== "number") throw new Error(`Object key ${kind}.${ref} needs a string or number`);
+          return String(selected);
+        });
+        if (Object.hasOwn(target, key)) throw new Error("Object key bindings collide");
+        target[key] = resolved;
+      }
     }
     if (!Object.keys(target).length && Object.keys(object4).length && !insideArray) return omit2;
     return target;
@@ -32663,7 +32729,7 @@ function writeOutput(path2, content) {
     renameSync2(pending, path2);
   } catch (error62) {
     try {
-      unlinkSync3(pending);
+      unlinkSync2(pending);
     } catch {
     }
     throw error62;
@@ -32776,6 +32842,13 @@ async function sendBrowser(root, appId, contextName, pageOrigin, effect2, transp
     if (!selection.execution) await client.closeScope(scope2.id);
   }
 }
+function proofPath(path2, inputs) {
+  return path2.replace(/\{input\.([^{}]+)\}/gu, (_, name) => {
+    const value = inputs[name];
+    if (typeof value !== "string" && typeof value !== "number") throw new Error(`Pointer input ${name} needs a string or number`);
+    return String(value).replaceAll("~", "~0").replaceAll("/", "~1");
+  });
+}
 function confirmProof(proof, body, primary, inputs, status) {
   if (proof.absent) {
     if (status !== 404) throw new ResponseContractFailure(`Absence proof expected HTTP 404; received HTTP ${status}`);
@@ -32786,7 +32859,7 @@ function confirmProof(proof, body, primary, inputs, status) {
     const expected = "input" in comparison ? inputs[comparison.input] : "result" in comparison ? pointer2(primary, comparison.result) : comparison.value;
     let actual;
     try {
-      actual = pointer2(selected2, comparison.path);
+      actual = pointer2(selected2, proofPath(comparison.path, inputs));
     } catch (error62) {
       if (missingIsMismatch) return false;
       throw error62;
@@ -32795,7 +32868,7 @@ function confirmProof(proof, body, primary, inputs, status) {
   };
   let selected = body;
   if (proof.select) {
-    const collection = pointer2(body, proof.select.path);
+    const collection = pointer2(body, proofPath(proof.select.path, inputs));
     if (!Array.isArray(collection)) throw new ResponseContractFailure(`Readback selection ${proof.select.path || "/"} must be an array`);
     const found = collection.filter((item) => proof.select.where.every((comparison) => matches(comparison, item, true)));
     if (found.length !== 1) throw new ResponseContractFailure(`Readback selection matched ${found.length} items; expected exactly one`);
@@ -32999,7 +33072,7 @@ Inspect saved entries: ${prefix(`credentials list ${appName} ${action.transport}
 `);
       } else output2 = result(serialized, true);
       try {
-        unlinkSync3(recoveryPath);
+        unlinkSync2(recoveryPath);
       } catch {
       }
     } catch (error62) {
@@ -33047,6 +33120,7 @@ async function executeDraftVerification(input2) {
   const generated = input2.primaryEvidence?.generated ?? (input2.kind === "action" && action && "generated" in action ? Object.fromEntries(Object.entries(action.generated ?? {}).map(([name, spec]) => [name, `${spec.prefix ?? ""}${randomUUID7()}`])) : {});
   try {
     values = effectiveInputs(schema, input2.primaryEvidence?.inputs ?? input2.sampleInputs, {}, true).values;
+    if (action && "proof" in action && action.proof) for (const item of [...action.proof.equals ?? [], ...action.proof.select?.where ?? [], ...action.proof.select ? [action.proof.select] : []]) proofPath(item.path, values);
     const request2 = input2.kind === "action" ? action.request : probe.request;
     prepared = prepareRequest(request2, input2.kind === "transport" && input2.probeOrigin ? { ...transport, baseUrl: input2.probeOrigin } : transport, values, generated);
   } catch (error62) {
@@ -33863,7 +33937,10 @@ function deriveRequest(entry2, inputs) {
     if (name) return { $input: name };
     if (value === null) return null;
     if (Array.isArray(value)) return value.map((child, index) => bind2(child, `${path3}/${index}`, wireText));
-    if (value && typeof value === "object") return Object.fromEntries(Object.entries(value).map(([key, child]) => [key, sensitive.test(key) ? pending(`${path3}/${key}`) : bind2(child, `${path3}/${key}`)]));
+    if (value && typeof value === "object") return Object.fromEntries(Object.entries(value).map(([key, child]) => {
+      const keyInput = match(key, true);
+      return [keyInput ? `{input.${keyInput}}` : key, sensitive.test(key) ? pending(`${path3}/${key}`) : bind2(child, `${path3}/${key}`)];
+    }));
     return pending(path3);
   };
   const path2 = url3.pathname.split("/").map((segment, index) => {
@@ -33955,14 +34032,38 @@ function inferResponseSchema(value, limit = 2e4) {
   };
   return { schema: visit4(value, 0), complete };
 }
-function rankCandidates(entries, inputs) {
-  const samples = Object.values(inputs).filter((value) => ["string", "number"].includes(typeof value) && String(value).length > 1).map(String);
+function rankCandidates(entries, inputs, effect2, allowedOrigins = []) {
+  const samples = [...new Set(Object.values(inputs).filter((value) => ["string", "number", "boolean"].includes(typeof value)).map((value) => canonicalJson(value)))];
   const score = ({ entry: entry2 }) => {
     let value = 0;
     const url3 = String(entry2.url ?? ""), body = typeof entry2.reqBody === "string" ? entry2.reqBody : "";
-    if (samples.some((sample) => url3.includes(encodeURIComponent(sample)) || body.includes(JSON.stringify(sample)))) value += 100;
+    const observed = /* @__PURE__ */ new Set();
+    const collect = (item) => {
+      if (Array.isArray(item)) item.forEach(collect);
+      else if (item && typeof item === "object") for (const [key, child] of Object.entries(item)) {
+        observed.add(canonicalJson(key));
+        collect(child);
+      }
+      else observed.add(canonicalJson(item));
+    };
+    try {
+      collect(JSON.parse(body));
+    } catch {
+    }
+    try {
+      const target = new URL(url3);
+      if (allowedOrigins.includes(target.origin)) value += 25;
+      for (const item of [...target.pathname.split("/").map(decodeURIComponent), ...target.searchParams.values()]) {
+        observed.add(canonicalJson(item));
+        for (const sample of samples) if (String(JSON.parse(sample)) === item) observed.add(sample);
+      }
+    } catch {
+    }
+    value += samples.filter((sample) => observed.has(sample)).length * 100;
+    const methods = effect2 === "create" ? ["POST"] : effect2 === "update" ? ["PATCH", "PUT", "POST"] : effect2 === "delete" ? ["DELETE"] : [];
+    if (methods.includes(String(entry2.method))) value += effect2 === "update" && entry2.method === "POST" ? 10 : 30;
     const contentType = Object.entries(entry2.resHeaders ?? {}).find(([key]) => key.toLowerCase() === "content-type")?.[1];
-    if (String(contentType ?? "").includes("json") || entry2.resBodyArtifact || typeof entry2.resBody === "string" && /^\s*(?:\[|{)/.test(entry2.resBody)) value += 20;
+    if (String(contentType ?? "").includes("json") || typeof entry2.resBody === "string" && /^\s*(?:\[|{)/.test(entry2.resBody)) value += 20;
     if (Number(entry2.status) >= 200 && Number(entry2.status) < 300) value += 5;
     if (/\.(?:js|css|png|jpg|svg|woff2?)(?:[?#]|$)/i.test(url3)) value -= 50;
     if (entry2.method === "OPTIONS") value -= 50;
@@ -33982,9 +34083,8 @@ var init_capture_derivation = __esm({
 });
 
 // src/commands/discover.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync9, mkdtempSync as mkdtempSync2, readFileSync as readFileSync8, renameSync as renameSync3, writeFileSync as writeFileSync8 } from "node:fs";
+import { existsSync as existsSync4, mkdirSync as mkdirSync9, readFileSync as readFileSync8, renameSync as renameSync3, writeFileSync as writeFileSync8 } from "node:fs";
 import { createHash as createHash5, randomUUID as randomUUID9 } from "node:crypto";
-import { tmpdir as tmpdir2 } from "node:os";
 import { dirname as dirname6, join as join12 } from "node:path";
 async function currentResource(api, appId, kind, name) {
   try {
@@ -34116,7 +34216,7 @@ Abandon removal: ${command4(invocation, "discover discard")}
   const local = `Check edits: ${command4(invocation, "discover check")}
 Publish: ${command4(invocation, "discover publish")}
 Recover this file: ${command4(invocation, "discover status")}
-Keep for later: ${command4(invocation, "discover defer")}
+Keep for later (including evidence): ${command4(invocation, "discover defer")}
 Abandon unpublished edits: ${command4(invocation, "discover discard")}
 `;
   if (draft.kind === "app") return `Created an app draft for ${draft.appSlug}. Nothing has been published.
@@ -34124,7 +34224,7 @@ Edit: ${draft.filePath}
 
 Fill the display name, product description, main website, category and visibility. The file lists supported fields and allowed values. Do not put credentials or local context values in this definition.
 
-${local}Leave discovery: ${command4(invocation, "discover close")}
+${local}Close and abandon this session\u2019s drafts: ${command4(invocation, "discover close")}. Deferred drafts survive action switches until discovery closes.
 `;
   if (draft.kind === "action" && unavailable) return `Editing documented unavailability for ${draft.name}.
 Edit: ${draft.filePath}
@@ -34305,7 +34405,8 @@ async function handleDiscover(invocation, api, state, session, fetcher, root, in
   if (!session) return sessionRequired(invocation);
   let release;
   try {
-    release = lockDiscovery(root, session.id);
+    release = ["appsHistory", "discoverCaptureShow", "discoverCaptureList"].includes(invocation.key) ? () => {
+    } : lockDiscovery(root, session.id);
   } catch (error62) {
     return fail5(`${error62 instanceof Error ? error62.message : "discovery-command-busy"}. No state changed.
 `, 8);
@@ -34364,7 +34465,7 @@ Inspect prior publications for this app:
   ${command4(invocation, `apps history ${app2.slug}`)}
 Narrow history to a known published resource with --resource <kind:name>.
 Resume current work: ${command4(invocation, "discover status")}
-Leave discovery: ${command4(invocation, "discover close")}
+Close and abandon this session\u2019s drafts: ${command4(invocation, "discover close")}. Deferred drafts survive action switches until discovery closes.
 `);
     }
     if (invocation.key === "appsHistory") {
@@ -34409,7 +34510,7 @@ ${pending ? `A publication request may have been sent. Restore the original inte
 ` : `Nothing has been removed.
 Check dependencies: ${command4(invocation, "discover check")}
 Publish removal: ${command4(invocation, "discover publish")}
-Keep for later: ${command4(invocation, "discover defer")}
+Keep for later (including evidence): ${command4(invocation, "discover defer")}
 Abandon removal: ${command4(invocation, "discover discard")}
 `}`);
         }
@@ -34423,7 +34524,7 @@ ${evidence ? `Latest saved execution: ${evidence.resultPath}
 ` : ""}
 Check: ${command4(invocation, "discover check")}
 Publish: ${command4(invocation, "discover publish")}
-Keep for later: ${command4(invocation, "discover defer")}
+Keep for later (including evidence): ${command4(invocation, "discover defer")}
 Abandon unpublished edits: ${command4(invocation, "discover discard")}
 `);
       }
@@ -34441,23 +34542,38 @@ ${retained.map((item) => `  ${item.kind} ${item.name}: ${item.filePath}
       if (store.publication(store.selected(session.id)?.id ?? "")) return fail5(`A publication request may have been sent. Reconcile with ${command4(invocation, "discover publish")} before deferring.
 `);
       const draft = store.defer(session.id);
-      return draft ? ok4(`Kept ${draft.name} and its selected evidence; released editing ownership.
+      return draft ? ok4(`Kept ${draft.name} and its selected evidence until discovery closes; released editing ownership.
 Resume: ${command4(invocation, `discover ${draft.intent === "remove" ? "remove" : "draft"} ${draft.kind}${draft.kind === "app" ? "" : ` ${draft.name}`}`)}
 `) : fail5("No owned draft is selected.\n");
     }
     if (invocation.key === "discoverDiscard") {
       if (captureRow(state, store.selected(session.id)?.id ?? "")?.scope_id) return fail5(`A recording is active. Stop it with ${command4(invocation, "discover capture stop")} or cancel it with ${command4(invocation, "discover capture cancel")} before discarding.
 `);
-      const evidenceScope = captureRow(state, store.selected(session.id)?.id ?? "")?.evidence_scope_id;
+      const pending = store.hasCleanup();
       const draft = store.discard(session.id);
-      if (draft && evidenceScope) await (await captureClient(root)).closeScope(evidenceScope);
+      try {
+        await store.cleanup(async (id2) => (await captureClient(root, false)).closeScope(id2));
+      } catch {
+        return fail5(`local-state-error \u2014 Draft retirement is saved; cleanup remains pending. Retry ${command4(invocation, "discover discard")}.
+`, 12);
+      }
+      if (!draft && pending) return ok4("Discard cleanup completed.\n");
       return draft ? ok4(`Discarded the owned unpublished draft for ${draft.name}. Its published definition is unchanged.
 Start again: ${command4(invocation, `discover ${draft.intent === "remove" ? "remove" : "draft"} ${draft.kind}${draft.kind === "app" ? "" : ` ${draft.name}`}`)}
 `) : fail5("No owned draft is selected.\n");
     }
     if (invocation.key === "discoverClose") {
       const current = store.session(session.id);
-      if (!current) return fail5("No discovery session is open.\n");
+      if (!current) {
+        if (!store.hasCleanup()) return fail5("No discovery session is open.\n");
+        try {
+          await store.cleanup(async (id2) => (await captureClient(root, false)).closeScope(id2));
+        } catch {
+          return fail5(`local-state-error \u2014 Discovery is closed; cleanup remains pending. Retry ${command4(invocation, "discover close")}.
+`, 12);
+        }
+        return ok4("Closed discovery cleanup completed.\n");
+      }
       if (store.publication(store.selected(session.id)?.id ?? "")) return fail5(`A publication request may be in flight. Reconcile with ${command4(invocation, "discover publish")} before closing.
 `);
       if (captureRow(state, store.selected(session.id)?.id ?? "")?.scope_id) return fail5(`A recording is active. Stop it with ${command4(invocation, "discover capture stop")} or cancel it with ${command4(invocation, "discover capture cancel")} before closing.
@@ -34465,7 +34581,13 @@ Start again: ${command4(invocation, `discover ${draft.intent === "remove" ? "rem
       const installation = state.installation();
       if (installation) await api.call("releaseSession", { params: { id: apiSessionId(installation.id, session) } });
       store.close(session.id);
-      return ok4(`Closed discovery for ${current.title}. Published actions remain usable.
+      try {
+        await store.cleanup(async (id2) => (await captureClient(root, false)).closeScope(id2));
+      } catch {
+        return fail5(`local-state-error \u2014 Discovery is closed; cleanup remains pending. Retry ${command4(invocation, "discover close")}.
+`, 12);
+      }
+      return ok4(`Closed discovery for ${current.title}; discarded this session\u2019s selected and deferred drafts. Published actions remain usable.
 To continue later: ${command4(invocation, `apps update ${current.appSlug}`)}
 `);
     }
@@ -34498,16 +34620,12 @@ Abandon removal: ${command4(invocation, "discover discard")}
     if (invocation.key === "discoverPublish") {
       if (captureRow(state, store.selected(session.id)?.id ?? "")?.scope_id) return fail5(`A recording is active. Stop or cancel it before publication. No app request was sent.
 `);
-      const draftId = store.selected(session.id)?.id;
-      const result3 = await publishDraft(invocation, api, store, session, root);
-      if (result3.exitCode === 0 && draftId && !store.selected(session.id)) {
-        const evidenceScope = captureRow(state, draftId)?.evidence_scope_id;
-        try {
-          if (evidenceScope) await (await captureClient(root)).closeScope(evidenceScope);
-          state.db.prepare("DELETE FROM discovery_capture WHERE draft_id=?").run(draftId);
-        } catch {
-          result3.stderr += "Publication succeeded; private capture cleanup remains pending. No app request was repeated.\n";
-        }
+      const result3 = !store.selected(session.id) && store.finished(session.id) ? store.finished(session.id) : await publishDraft(invocation, api, store, session, root);
+      try {
+        await store.cleanup(async (id2) => (await captureClient(root, false)).closeScope(id2));
+      } catch {
+        return fail5(`local-state-error \u2014 Publication result is retained; cleanup remains pending. Retry ${command4(invocation, "discover publish")} to finish cleanup without publishing again.
+`, 12, result3.dispatched);
       }
       return result3;
     }
@@ -34565,6 +34683,10 @@ File: ${checked.draft.filePath}
   }
   const { draft } = checked;
   const removing = draft.intent === "remove";
+  const complete = (result3) => {
+    store.published(session.id, result3);
+    return result3;
+  };
   if (!removing && !checked.definition) return fail5(`The file is incomplete: ${draft.filePath}
 `);
   let verification;
@@ -34639,13 +34761,12 @@ Fix the named issue, then ${command4(invocation, "discover check")} and ${comman
     }
     const appId = String(created.id);
     store.setAppId(draft.appSlug, appId);
-    store.published(session.id, 1);
-    return ok4(`Published ${checked.definition && "title" in checked.definition ? checked.definition.title : draft.appSlug}'s metadata. No executable action exists yet.
+    return complete(ok4(`Published ${checked.definition && "title" in checked.definition ? checked.definition.title : draft.appSlug}'s metadata. No executable action exists yet.
 ${actionNameHelp}
 Check the requested operation in official API and access documentation:
   ${command4(invocation, "discover api assess <entity.verb>")}
 If no usable public route is found, record the evidence and use browser transport.
-`, true);
+`, true));
   }
   let published;
   try {
@@ -34653,29 +34774,28 @@ If no usable public route is found, record the evidence and use browser transpor
   } catch (error62) {
     return publicationError(error62);
   }
-  store.published(session.id, published.resource.version);
   if (!removing && draft.kind === "action" && published.executableHash) withBaselines(root, (baselines) => baselines.published(draft.id, draft.name, published.executableHash, /* @__PURE__ */ new Date(), published.resource.version));
-  if (published.distribution && published.distribution.state !== "available") return ok4(`Published ${label(draft.kind)} ${draft.name}. Distribution is ${published.distribution.state}. ${published.distribution.reason === "confirmed-defect" ? "This executable revision was withdrawn. Continue developing and submit a corrected definition." : "You can continue developing and using your accepted revision. Wider distribution advances automatically as independent workspaces use it."}${published.distribution.until ? ` Protective pause ends ${published.distribution.until}.` : ""}
+  if (published.distribution && published.distribution.state !== "available") return complete(ok4(`Published ${label(draft.kind)} ${draft.name}. Distribution is ${published.distribution.state}. ${published.distribution.reason === "confirmed-defect" ? "This executable revision was withdrawn. Continue developing and submit a corrected definition." : "You can continue developing and using your accepted revision. Wider distribution advances automatically as independent workspaces use it."}${published.distribution.until ? ` Protective pause ends ${published.distribution.until}.` : ""}
 Inspect distribution: ${command4(invocation, `apps history ${draft.appSlug} --resource ${backendKind(draft.kind)}:${draft.name}`)}
-`, true);
-  if (removing) return ok4(`Removed ${draft.kind} ${draft.name} from the published interface. App records were unchanged.
-`, true);
-  if (draft.kind === "action" && checked.definition && "unavailable" in checked.definition) return ok4(`Published the documented unavailability of ${draft.name}. No app request was sent and this action is not executable.
+`, true));
+  if (removing) return complete(ok4(`Removed ${draft.kind} ${draft.name} from the published interface. App records were unchanged.
+`, true));
+  if (draft.kind === "action" && checked.definition && "unavailable" in checked.definition) return complete(ok4(`Published the documented unavailability of ${draft.name}. No app request was sent and this action is not executable.
 Inspect the finding: ${command4(invocation, `actions show ${draft.appSlug} ${draft.name}`)}
 When finished authoring: ${command4(invocation, "discover close")}
-`, true);
-  if (draft.kind === "action") return ok4(`Published ${draft.name}. Its reviewed test already returned the requested data; use the saved result instead of executing again.
+`, true));
+  if (draft.kind === "action") return complete(ok4(`Published ${draft.name}. Its reviewed test already returned the requested data. Temporary draft and verification files were cleared; do not repeat the test.
 Inspect arguments for future use: ${command4(invocation, `actions show ${draft.appSlug} ${draft.name}`)}
 When finished authoring: ${command4(invocation, "discover close")}
-`, true);
-  if (draft.kind === "transport") return ok4(`Published connection ${draft.name}. Credential values and local test inputs were not shared.
+`, true));
+  if (draft.kind === "transport") return complete(ok4(`Published connection ${draft.name}. Credential values and local test inputs were not shared.
 ${actionNameHelp}
 Create an operation that uses it: ${command4(invocation, "discover draft action <entity.verb>")}
 Set dependencies.transport to ${draft.name} in that action file.
-`, true);
-  return ok4(`Published ${label(draft.kind)} ${draft.name}.
+`, true));
+  return complete(ok4(`Published ${label(draft.kind)} ${draft.name}.
 Continue with ${command4(invocation, "discover draft <kind> <name>")} or ${command4(invocation, "discover close")}
-`, true);
+`, true));
 }
 async function rebaseDraft(invocation, api, store, session) {
   const draft = store.selected(session.id);
@@ -34695,7 +34815,7 @@ async function rebaseDraft(invocation, api, store, session) {
     if (checked.issues.length) return checkResponse(checked, invocation);
     const source = readFileSync8(draft.filePath, "utf8");
     const updated = applyEdits(source, modify(source, ["expectedVersion"], current.version, { formattingOptions: { insertSpaces: true, tabSize: 2 } }));
-    const temporary = `${draft.filePath}.${randomUUID9()}.tmp`;
+    const temporary = store.artifactPath(draft.id, "rebase.jsonc");
     writeFileSync8(temporary, updated, { flag: "wx", mode: 384 });
     renameSync3(temporary, draft.filePath);
     store.setBaseVersion(draft.id, current.version);
@@ -34765,8 +34885,7 @@ Review it and publish; no app request was sent.
   let responsePath = previous?.responsePath;
   let readbackPath;
   const savePrivate = (value, name) => {
-    const directory = mkdtempSync2(join12(tmpdir2(), "apilift-discover-"));
-    const path2 = join12(directory, name);
+    const path2 = store.artifactPath(draft.id, name);
     writeFileSync8(path2, `${JSON.stringify(value, null, 2)}
 `, { flag: "wx", mode: 384 });
     return path2;
@@ -34791,8 +34910,7 @@ ${responsePath ? `Saved primary response and test inputs: ${responsePath}
   }
   withBaselines(root, (baselines) => baselines.finishPreparation(session.id, draft.appSlug, draft.appId, transport.mode));
   if (write) store.saveRequestAttempt(draft.id, primaryFingerprint, "success");
-  const dir = mkdtempSync2(join12(tmpdir2(), "apilift-discover-"));
-  const resultPath = join12(dir, "verification.json");
+  const resultPath = store.artifactPath(draft.id, "verification.json");
   writeFileSync8(resultPath, `${JSON.stringify(executed.output, null, 2)}
 `, { flag: "wx", mode: 384 });
   const prior = store.evidence(draft.id);
@@ -34816,6 +34934,7 @@ function captureTable(state) {
     state.db.exec("CREATE TABLE IF NOT EXISTS discovery_capture (draft_id TEXT PRIMARY KEY REFERENCES discovery_draft(id) ON DELETE CASCADE, scope_id TEXT, job_id TEXT, phase TEXT NOT NULL, entries_json TEXT)");
     state.db.prepare("UPDATE discovery_capture SET draft_id=draft_id WHERE 0").run();
     const columns = state.db.prepare("PRAGMA table_info(discovery_capture)").all();
+    if (!columns.some((column) => column.name === "origins_json")) state.db.exec("ALTER TABLE discovery_capture ADD COLUMN origins_json TEXT");
     if (!columns.some((column) => column.name === "evidence_scope_id")) state.db.exec("ALTER TABLE discovery_capture ADD COLUMN evidence_scope_id TEXT");
     state.db.exec("RELEASE discovery_capture_schema");
   } catch (error62) {
@@ -35104,7 +35223,7 @@ ${detail}
     if (previousEvidence) await client.closeScope(previousEvidence);
     const id2 = randomUUID9();
     state.db.prepare("INSERT INTO discovery_capture (draft_id,scope_id,job_id,phase,entries_json) VALUES (?,?,?,?,NULL) ON CONFLICT(draft_id) DO UPDATE SET scope_id=excluded.scope_id,job_id=excluded.job_id,phase=excluded.phase,entries_json=NULL,evidence_scope_id=excluded.scope_id").run(draft.id, scope2.id, id2, "starting");
-    state.db.prepare("UPDATE discovery_capture SET evidence_scope_id=? WHERE draft_id=?").run(scope2.id, draft.id);
+    state.db.prepare("UPDATE discovery_capture SET evidence_scope_id=?,origins_json=? WHERE draft_id=?").run(scope2.id, JSON.stringify(transport.allowedOrigins), draft.id);
     await client.enqueueJob(scope2.id, { job: { id: id2, kind: "begin", label: draft.name, entity: nameParts[0], operation: nameParts[1], effect: effect2, inputs: envelope.verification.inputs } });
     const job = await awaitCaptureJob(client, id2);
     if (job.status !== "delivered" || job.result?.state !== "recording") return fail5(`Recording start is unconfirmed (${job.status}). Do not operate the app. Retry ${command4(invocation, "discover capture start")} after inspecting ${command4(invocation, "discover status")}.
@@ -35182,7 +35301,7 @@ Review: ${command4(invocation, "discover status")}
     }
     withBaselines(root, (baselines) => baselines.stopCapture(draft.id));
     return ok4(`Recording stopped; admission is confirmed closed. ${entries2.length} requests captured; showing up to five ranked candidates. Ranking is a review aid; all metadata remains available.
-${rankCandidates(entries2, parseDraftEnvelope(source).envelope?.verification?.inputs ?? {}).map(candidateLine).join("\n")}
+${rankCandidates(entries2, parseDraftEnvelope(source).envelope?.verification?.inputs ?? {}, String(parseDraftEnvelope(source).envelope?.definition.effect ?? ""), row.origins_json ? JSON.parse(row.origins_json) : []).map(candidateLine).join("\n")}
 Use a cN candidate ID returned in this recording:
 Inspect its retained request or response: ${command4(invocation, "discover capture show <candidate>")}
 Select the causal request for the draft: ${command4(invocation, "discover capture select <candidate>")}
@@ -35262,7 +35381,7 @@ Inspect a returned candidate: ${command4(invocation, `discover capture show c${p
       const result3 = await awaitCaptureJob(client, id2);
       if (result3.status !== "delivered") return fail5(`Auth source probe is ${result3.status}; no source was confirmed. Retry only this probe while evidence is live.
 `, 12);
-      const path2 = join12(mkdtempSync2(join12(tmpdir2(), "apilift-auth-source-")), "source.json");
+      const path2 = store.artifactPath(draft.id, "source.json");
       writeFileSync8(path2, `${JSON.stringify(result3.result, null, 2)}
 `, { mode: 384 });
       await client.acknowledgeJob(id2);
@@ -35320,7 +35439,7 @@ var init_discover = __esm({
 // src/output.ts
 import { randomUUID as randomUUID10 } from "node:crypto";
 import { chmod, mkdtemp, open as open3, rename } from "node:fs/promises";
-import { tmpdir as tmpdir3 } from "node:os";
+import { tmpdir as tmpdir2 } from "node:os";
 import { join as join13 } from "node:path";
 async function completedFile(directory, name, content) {
   const target = join13(directory, name);
@@ -35336,7 +35455,7 @@ async function completedFile(directory, name, content) {
   await chmod(target, 384);
   return target;
 }
-async function finalizeOutput(output2, sink, directory = tmpdir3()) {
+async function finalizeOutput(output2, sink, directory = tmpdir2()) {
   let stdout = output2.stdout;
   let stderr = output2.stderr;
   const size = () => Buffer.byteLength(stdout) + Buffer.byteLength(stderr);
@@ -35783,7 +35902,7 @@ var init_main2 = __esm({
 
 // src/plugin.ts
 import { createHash as createHash6 } from "node:crypto";
-import { cpSync, existsSync as existsSync5, mkdirSync as mkdirSync10, readFileSync as readFileSync9, readdirSync, renameSync as renameSync4, rmSync as rmSync4, writeFileSync as writeFileSync9 } from "node:fs";
+import { cpSync, existsSync as existsSync5, mkdirSync as mkdirSync10, readFileSync as readFileSync9, readdirSync, renameSync as renameSync4, rmSync as rmSync5, writeFileSync as writeFileSync9 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { dirname as dirname8, join as join14, resolve as resolve7 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
@@ -35885,7 +36004,7 @@ function ensureAgentPlugin(agent2, env, sourceOverride) {
   const current = marker?.bundleDigest === bundleDigest && marker.version === version2 && completeCopy(source, plugin);
   if (!current) {
     const staging = `${plugin}.stage-${process.pid}`;
-    rmSync4(staging, { recursive: true, force: true });
+    rmSync5(staging, { recursive: true, force: true });
     mkdirSync10(dirname8(staging), { recursive: true });
     cpSync(source, staging, { recursive: true });
     const manifestPath = join14(staging, `.${agent2}-plugin`, "plugin.json");
@@ -35902,7 +36021,7 @@ function ensureAgentPlugin(agent2, env, sourceOverride) {
       if (existsSync5(backup)) renameSync4(backup, plugin);
       throw error62;
     }
-    rmSync4(backup, { recursive: true, force: true });
+    rmSync5(backup, { recursive: true, force: true });
   }
   const marketplacePath = join14(marketplace, "marketplace.json");
   const document = readJson(marketplacePath) ?? { name: "personal", interface: { displayName: "Personal" }, plugins: [] };
@@ -36129,7 +36248,7 @@ var init_analytics2 = __esm({
 });
 
 // src/usage/ownership.ts
-import { mkdirSync as mkdirSync11, chmodSync as chmodSync7, existsSync as existsSync6, readFileSync as readFileSync10, writeFileSync as writeFileSync10, renameSync as renameSync5, unlinkSync as unlinkSync4, statSync as statSync3 } from "node:fs";
+import { mkdirSync as mkdirSync11, chmodSync as chmodSync7, existsSync as existsSync6, readFileSync as readFileSync10, writeFileSync as writeFileSync10, renameSync as renameSync5, unlinkSync as unlinkSync3, statSync as statSync3 } from "node:fs";
 import { createHash as createHash7, randomUUID as randomUUID12 } from "node:crypto";
 import { join as join15, dirname as dirname9, isAbsolute as isAbsolute2 } from "node:path";
 import { DatabaseSync as DatabaseSync6 } from "node:sqlite";
@@ -36143,7 +36262,7 @@ function requestCollectorTarget(root, entry2, env) {
     renameSync5(pending, targetFile(root));
   } finally {
     try {
-      unlinkSync4(pending);
+      unlinkSync3(pending);
     } catch {
     }
   }

package/dist/plugin/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "apilift",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Use logged-in apps and discover missing actions with Apilift.",
   "author": {
     "name": "Apilift"

package/dist/plugin/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "apilift",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Use logged-in apps and discover missing actions with Apilift.",
   "author": {
     "name": "Apilift"

package/dist/plugin/skills/discover/SKILL.md

@@ -21,6 +21,6 @@ Check the selected file with `apilift discover check`; it sends no app request a
 
 ## Recover and finish
 
-Use `apilift discover status` to recover the selected draft, result path, recording phase, or pending publication. A lost publication response is reconciled with the exact retained `discover publish` request before editing, deferring, or discarding. `discover rebase` is for a version conflict after reviewing the current resource. `discover defer` retains owned work, `discover discard` abandons only its unpublished draft, and `discover close` leaves the app when owned in-flight work has settled. A stopped recording must be confirmed or canceled before changing drafts or tabs. Follow [recovery.md](references/recovery.md) before treating a failed route as a terminal blocker.
+Use `apilift discover status` to recover the selected draft, result path, recording phase, or pending publication. A lost publication response is reconciled with the exact retained `discover publish` request before editing, deferring, or discarding. `discover rebase` is for a version conflict after reviewing the current resource. `discover defer` retains owned work, `discover discard` abandons only its unpublished draft, and `discover close` abandons that session’s selected and deferred drafts and leaves the app when owned in-flight work has settled. Publication and abandonment delete that draft and temporary verification/capture evidence. Use `discover defer` before switching resources to preserve unfinished work and its evidence while discovery stays open; resuming it requires no new capture. Closing discovery ends that retention and preserves other sessions’ drafts. A stopped recording must be confirmed or canceled before changing drafts or tabs. Follow [recovery.md](references/recovery.md) before treating a failed route as a terminal blocker.
 
 Completion means the requested actions are published and the original authorized outcome is handled, or a specific human-only or external prerequisite is identified. Review consumer descriptions for behavior, consequences and limits: author verification establishes publication evidence, while published execution validates its response without automatic readback. Do not prescribe routine browser inspection. Consumers decide whether their task needs additional verification. Inspect published consumer help from a fresh session and obtain required values through its published source actions; the author's local verification inputs are not consumer coverage. Do not send an extra mutation merely to demonstrate publication. Report actual verification, authorized test state, one optional cleanup attempt if relevant, and remaining gaps.

package/dist/plugin/skills/discover/references/operation-contract.md

@@ -12,7 +12,7 @@ Select the useful response subtree with `response.path` when needed and validate
 
 During discovery, a mutation needs a separate read-only proof request and meaningful comparisons to the intended state. A proof failure leaves the write possibly applied. Repair the proof and use `apilift discover run --proof-only` against the saved primary response; this sends only the readback. Never repeat a possibly sent write just to get stronger proof. For a delete, an explicit absence proof may establish success. A readback or probe using POST may declare semantic `effect: "read"`; method alone is not the effect.
 
-Bind a returned identifier in the proof URL with `{result./id}`, or in its JSON body/query with `{"$result":"/id"}`; result pointers refer to the projected primary result. For a nested collection, use `proof.select: {"path":"/ticket/fields","where":[{"path":"/id","result":"/id"}]}` and compare `equals` paths relative to its single matching member. The selector must match exactly one item. Check identity and the fields that establish the intended effect, not an entire server-maintained object or a fixed array position. JSON Pointers are literal, not templates. Prefer a targeted detail or search read; absence from a partial list does not prove deletion.
+Bind a returned identifier in the proof URL with `{result./id}`, or in its JSON body/query with `{"$result":"/id"}`; result pointers refer to the projected primary result. For a nested collection, use `proof.select: {"path":"/ticket/fields","where":[{"path":"/id","result":"/id"}]}` and compare `equals` paths relative to its single matching member. The selector must match exactly one item. Check identity and the fields that establish the intended effect, not an entire server-maintained object or a fixed array position. For a dynamic object key, use `{"attributes":{"{input.attribute_id}":{"$input":"value"}}}` in the request body. A proof path such as `/attributes/{input.attribute_id}` substitutes one complete pointer segment and escapes `/` and `~` in its value; other pointer segments remain literal. Prefer a targeted detail or search read; absence from a partial list does not prove deletion.
 
 When the task needs a few records from a large collection, look for native search, filters or a detail endpoint in documentation or observed UI requests before enumerating the list. Expose observed parameters and verify that they narrow the results. If only a full response is available, search its saved file and extract matching records or fields; do not load the entire catalog into context. Keep stable identity and summary fields in list results; inspect variable configuration only for the selected item. Preserve dynamic configuration as structured JSON with an appropriate schema, rather than enumerating catalog entries or removing validation to pass.
 

package/dist/plugin/skills/discover/references/recovery.md

@@ -4,4 +4,4 @@
 2. Read the complete bounded diagnostic and exact continuation. Use `apilift doctor`, selected CLI help or the editable file only for the uncertainty at hand. Retry after a relevant state change or an explicitly safe recovery instruction; never infer success from a shell wrapper without the process exit status.
 3. Reassess the requested outcome. A local command, browser or credential failure is evidence about that route, not proof that the app lacks the capability. Continue through another authorized documented route or independent action when it can advance the outcome without weakening proof or policy.
 4. Ask the person only for login, MFA, CAPTCHA, WebAuthn, credential provisioning in the secure UI, new permission or a material scope choice they alone can supply. Do not ask them to paste a secret into chat or a command.
-5. If no authorized route remains, report the precise missing outcome, retained owned state, materially different routes checked and exact prerequisite. Use `discover defer` to retain retryable work and `discover close` only after selected in-flight work is settled.
+5. If no authorized route remains, report the precise missing outcome, retained owned state, materially different routes checked and exact prerequisite. Use `discover defer` to retain retryable work while continuing discovery. `discover close` abandons the session’s selected and deferred drafts after selected in-flight work is settled.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apilift/cli",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "private": false,
   "type": "module",
   "bin": {
@@ -36,7 +36,7 @@
   "engines": {
     "node": ">=24.16.0 <27"
   },
-  "gitHead": "c42fa5b76367755fd456e083943e10356591aa33",
+  "gitHead": "7fcce0197a43f41c8f4e5dfa909650baf4be49de",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/egor-sergeev/apilift.git",