@yadsh/dsh-web-fetch-authenticated 0.2.0 → 0.3.1

package/lib/client.js

@@ -5086,6 +5086,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				"outcome": string().readonly(),
 				"detail": string().readonly().optional(),
 				"preview": string().readonly().optional(),
+				"adapter": string().readonly().optional(),
 				"truncated": boolean().readonly()
 			})).readonly(),
 			"unmatchedPolicy": literal("block").readonly()
@@ -5135,6 +5136,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			"outcome": string().readonly(),
 			"detail": string().readonly().optional(),
 			"preview": string().readonly().optional(),
+			"adapter": string().readonly().optional(),
 			"truncated": boolean().readonly()
 		});
 		const TYPERT_REMOTE = {
@@ -5163,7 +5165,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-web-fetch-authenticated/src/index.ts",
-						"line": 145,
+						"line": 147,
 						"column": 9
 					}
 				},
@@ -5181,7 +5183,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-web-fetch-authenticated/src/index.ts",
-						"line": 114,
+						"line": 116,
 						"column": 9
 					}
 				},
@@ -5218,7 +5220,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/dsh-web-fetch-authenticated/src/index.ts",
-						"line": 135,
+						"line": 137,
 						"column": 9
 					}
 				}
@@ -5598,6 +5600,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				}
 				for (const pattern of patterns) if (typeof pattern !== "string" || compilePathPattern(pattern) === void 0) errors.push(`${label}: malformed ${field} pattern "${String(pattern)}" (must start with "/")`);
 			}
+			errors.push(...validateAdapter(rule.adapter, label));
 			errors.push(...validateAuth(rule.auth, label));
 			errors.push(...validateNetworkPolicy(rule.networkPolicy, label));
 			errors.push(...validateRedirectPolicy(rule.redirects, label));
@@ -5615,6 +5618,19 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			}
 			return errors;
 		}
+		function validateAdapter(adapter, label) {
+			if (adapter === void 0) return [];
+			const errors = [];
+			const type = adapter.type;
+			if (type !== void 0 && type !== "none" && type !== "jira" && type !== "confluence") errors.push(`${label}: unsupported adapter type "${String(type)}"`);
+			const flavor = adapter.jiraFlavor;
+			if (flavor !== void 0 && flavor !== "server" && flavor !== "cloud") errors.push(`${label}: adapter.jiraFlavor must be "server" or "cloud"`);
+			for (const field of ["includeComments", "includeLinks"]) {
+				const value = adapter[field];
+				if (value !== void 0 && typeof value !== "boolean") errors.push(`${label}: adapter.${field} must be a boolean`);
+			}
+			return errors;
+		}
 		function validateAuth(auth, label) {
 			const errors = [];
 			if (auth === void 0 || typeof auth !== "object") {
@@ -6036,6 +6052,7 @@ textarea.wfa-control{resize:vertical}
 		}
 		function ruleToDraft(rule) {
 			const auth = rule.auth;
+			const adapter = rule.adapter;
 			return {
 				id: rule.id,
 				name: rule.name,
@@ -6054,6 +6071,10 @@ textarea.wfa-control{resize:vertical}
 				headerName: auth.type === "header" ? auth.headerName : "",
 				headerRef: auth.type === "header" ? auth.credential : "",
 				headerPrefix: auth.type === "header" ? auth.prefix ?? "" : "",
+				adapterType: adapter?.type ?? "none",
+				jiraFlavor: adapter?.jiraFlavor ?? "server",
+				includeComments: adapter?.includeComments ?? false,
+				includeLinks: adapter?.includeLinks ?? false,
 				network: networkToDraft(rule.networkPolicy),
 				redirectMode: rule.redirects?.mode ?? "same-origin",
 				maxRedirects: rule.redirects?.maxRedirects === void 0 ? "" : String(rule.redirects.maxRedirects),
@@ -6082,6 +6103,10 @@ textarea.wfa-control{resize:vertical}
 				headerName: "",
 				headerRef: "",
 				headerPrefix: "",
+				adapterType: "none",
+				jiraFlavor: "server",
+				includeComments: false,
+				includeLinks: false,
 				network: networkToDraft(void 0),
 				redirectMode: "same-origin",
 				maxRedirects: "",
@@ -6137,6 +6162,12 @@ textarea.wfa-control{resize:vertical}
 				},
 				limits: buildLimits(draft, errors)
 			};
+			if (draft.adapterType !== "none") rule.adapter = draft.adapterType === "jira" ? {
+				type: "jira",
+				...draft.jiraFlavor !== "server" ? { jiraFlavor: draft.jiraFlavor } : {},
+				...draft.includeComments ? { includeComments: true } : {},
+				...draft.includeLinks ? { includeLinks: true } : {}
+			} : { type: "confluence" };
 			if (draft.description.trim().length > 0) rule.description = draft.description.trim();
 			if (draft.testUrl.trim().length > 0) rule.testUrl = draft.testUrl.trim();
 			errors.push(...validateRule(rule, 0));
@@ -6172,10 +6203,10 @@ textarea.wfa-control{resize:vertical}
 					return;
 				}
 				let cancelled = false;
-				credentials.describe({ refs: [refName] }).then((response) => {
+				credentials.describe([refName]).then((response) => {
 					if (cancelled) return;
-					if (response.result.ok) {
-						const view = response.result.value.credentials[refName];
+					if (response.ok) {
+						const view = response.value[refName];
 						setState({
 							configured: view?.configured ?? false,
 							writable: view?.writable ?? true
@@ -6191,14 +6222,14 @@ textarea.wfa-control{resize:vertical}
 				setBusy(true);
 				setMessage(void 0);
 				try {
-					await credentials.set({
-						ref: refName,
-						value: secret
-					});
+					if (!(await credentials.set(refName, secret)).ok) {
+						setMessage("The Host refused the write (read-only source?).");
+						return;
+					}
 					setSecret("");
-					const response = await credentials.describe({ refs: [refName] });
-					if (response.result.ok) {
-						const view = response.result.value.credentials[refName];
+					const response = await credentials.describe([refName]);
+					if (response.ok) {
+						const view = response.value[refName];
 						setState({
 							configured: view?.configured ?? false,
 							writable: view?.writable ?? true
@@ -6219,10 +6250,13 @@ textarea.wfa-control{resize:vertical}
 				setBusy(true);
 				setMessage(void 0);
 				try {
-					await credentials.unset({ ref: refName });
-					const response = await credentials.describe({ refs: [refName] });
-					if (response.result.ok) {
-						const view = response.result.value.credentials[refName];
+					if (!(await credentials.unset(refName)).ok) {
+						setMessage("The Host refused the removal.");
+						return;
+					}
+					const response = await credentials.describe([refName]);
+					if (response.ok) {
+						const view = response.value[refName];
 						setState({
 							configured: view?.configured ?? false,
 							writable: view?.writable ?? true
@@ -6485,6 +6519,79 @@ textarea.wfa-control{resize:vertical}
 						},
 						credentials
 					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "wfa-grid",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
+							label: "Content adapter",
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
+								className: "wfa-control",
+								value: draft.adapterType,
+								onChange: (event) => {
+									patch({ adapterType: event.target.value });
+								},
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+										value: "none",
+										children: "Raw HTTP/HTML"
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+										value: "jira",
+										children: "Jira issue (REST → clean text)"
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+										value: "confluence",
+										children: "Confluence page (REST → clean text)"
+									})
+								]
+							})
+						}), draft.adapterType === "jira" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
+							label: "Jira flavor",
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
+								className: "wfa-control",
+								value: draft.jiraFlavor,
+								onChange: (event) => {
+									patch({ jiraFlavor: event.target.value });
+								},
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+									value: "server",
+									children: "Server / Data Center (REST v2, wiki markup)"
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+									value: "cloud",
+									children: "Cloud (REST v3, Atlassian Document Format)"
+								})]
+							})
+						})]
+					}),
+					draft.adapterType === "jira" && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "wfa-checks",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+							className: "wfa-check",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+								type: "checkbox",
+								checked: draft.includeComments,
+								onChange: (event) => {
+									patch({ includeComments: event.target.checked });
+								}
+							}), "Include comments"]
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+							className: "wfa-check",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+								type: "checkbox",
+								checked: draft.includeLinks,
+								onChange: (event) => {
+									patch({ includeLinks: event.target.checked });
+								}
+							}), "Include issue links"]
+						})]
+					}),
+					draft.adapterType !== "none" && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
+						className: "wfa-note",
+						children: [
+							"Recognized URLs (",
+							draft.adapterType === "jira" ? "/browse/ISSUE-KEY" : "/pages/<id>, /display/SPACE/Title",
+							") are fetched from the product REST API with the same credentials and policy and returned as clean Markdown text; everything else falls back to raw HTTP/HTML."
+						]
+					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("details", {
 						className: "wfa-advanced",
 						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("summary", { children: "Network policy, redirects, and limits" }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -6684,7 +6791,7 @@ textarea.wfa-control{resize:vertical}
 							className: "wfa-control",
 							style: { flex: 1 },
 							value: url,
-							placeholder: "https://jira.example.corp/browse/MDC-123",
+							placeholder: "https://jira.example.corp/browse/PROJ-123",
 							onChange: (event) => {
 								setUrl(event.target.value);
 							}
@@ -6743,6 +6850,12 @@ textarea.wfa-control{resize:vertical}
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("b", { children: "Auth applied:" }),
 						" ",
 						report.authApplied ? "yes" : "no",
+						report.adapter !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+							" · ",
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("b", { children: "Adapter:" }),
+							" ",
+							report.adapter
+						] }),
 						report.credentialState !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
 							" · ",
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("b", { children: "Credential" }),
@@ -6789,7 +6902,7 @@ textarea.wfa-control{resize:vertical}
 							className: "wfa-control",
 							style: { flex: 1 },
 							value: url,
-							placeholder: "https://jira.example.corp/browse/MDC-123",
+							placeholder: "https://jira.example.corp/browse/PROJ-123",
 							onChange: (event) => {
 								setUrl(event.target.value);
 							}
@@ -6917,13 +7030,20 @@ textarea.wfa-control{resize:vertical}
 									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 										className: "wfa-actions",
 										style: { gap: 5 },
-										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Pill, {
-											tone: rule.enabled ? "ok" : "warn",
-											children: rule.enabled ? "enabled" : "disabled"
-										}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Pill, {
-											tone: "warn",
-											children: authSummary(rule.auth)
-										})]
+										children: [
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Pill, {
+												tone: rule.enabled ? "ok" : "warn",
+												children: rule.enabled ? "enabled" : "disabled"
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Pill, {
+												tone: "warn",
+												children: authSummary(rule.auth)
+											}),
+											rule.adapter !== void 0 && rule.adapter.type !== "none" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Pill, {
+												tone: "ok",
+												children: rule.adapter.type
+											})
+										]
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 										className: "wfa-actions",
@@ -7105,8 +7225,8 @@ textarea.wfa-control{resize:vertical}
 		const inject = [
 			"slots",
 			"settingsScope",
-			"connection",
-			"remote"
+			"remote",
+			"remote.credentials"
 		];
 		/** Mount the generated Remote contribution and register the native Settings card. */
 		async function apply(ctx) {
@@ -7119,7 +7239,7 @@ textarea.wfa-control{resize:vertical}
 						status: () => injectedRemote.webFetchAuth.status(),
 						testRule: (ruleId, url) => injectedRemote.webFetchAuth.testRule(ruleId, url),
 						diagnose: (url) => injectedRemote.webFetchAuth.diagnose(url),
-						credentials: remoteCtx.connection?.api?.credentials
+						credentials: injectedRemote.credentials
 					};
 					return registerSettingsCard(remoteCtx, {
 						key: SETTINGS_NAMESPACE,