camox 0.77.0 → 0.79.0

package/dist/features/memory/VoiceGroup.js

@@ -0,0 +1,350 @@
+import { useDraftScope } from "../../lib/draft-scope.js";
+import { useNavigate } from "../navigation/navigation.js";
+import { reads, useReadQuery, useStudioCache } from "../../lib/studio-reads.js";
+import { memoryMutations } from "../../lib/queries.js";
+import { previewStore } from "../preview/previewStore.js";
+import { useWebsiteHref } from "../studio/components/Navbar.js";
+import { c } from "react/compiler-runtime";
+import * as React from "react";
+import { jsx, jsxs } from "react/jsx-runtime";
+import { useMutation } from "@tanstack/react-query";
+import { Button } from "@camox/ui/button";
+import { Skeleton } from "@camox/ui/skeleton";
+import { Spinner } from "@camox/ui/spinner";
+import { VOICE_AXES } from "@camox/api-contract/voice";
+import { Slider } from "@camox/ui/slider";
+
+//#region src/features/memory/VoiceGroup.tsx
+/**
+* The Voice group, at the top of the Memory Section (ADR 0051): a slider per Voice Axis, showing
+* its chosen step and that step's definition, as models read it. Moving sliders saves nothing:
+* Save shows while they differ from the saved Voice, and saves every moved axis as one change.
+* Like any memory edit, saving while viewing Live starts a draft. "Save and rewrite", beside it,
+* also asks Camox's agent, as the member, to rewrite the site's copy in the new Voice, and shows
+* the draft with its thread beside the Canvas, where the rewrite happens.
+*/
+function VoiceGroup(t0) {
+	const $ = c(31);
+	const { projectId } = t0;
+	let t1;
+	if ($[0] !== projectId) {
+		t1 = reads.voice({ projectId });
+		$[0] = projectId;
+		$[1] = t1;
+	} else t1 = $[1];
+	const { data: saved } = useReadQuery(t1);
+	let t2;
+	if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
+		t2 = {};
+		$[2] = t2;
+	} else t2 = $[2];
+	const [moved, setMoved] = React.useState(t2);
+	const cache = useStudioCache();
+	const draftScope = useDraftScope();
+	const navigate = useNavigate();
+	const websiteHref = useWebsiteHref();
+	let t3;
+	if ($[3] === Symbol.for("react.memo_cache_sentinel")) {
+		t3 = memoryMutations.saveVoice();
+		$[3] = t3;
+	} else t3 = $[3];
+	let t4;
+	if ($[4] !== cache || $[5] !== draftScope || $[6] !== navigate || $[7] !== projectId || $[8] !== websiteHref) {
+		t4 = {
+			...t3,
+			onSuccess: (_voice, t5) => {
+				const { rewrite } = t5;
+				setMoved({});
+				cache.invalidate(reads.voice({ projectId }));
+				if (!rewrite) return;
+				previewStore.send({ type: "showCanvas" });
+				navigate({
+					to: websiteHref(),
+					draft: draftScope.current() ?? void 0
+				});
+			}
+		};
+		$[4] = cache;
+		$[5] = draftScope;
+		$[6] = navigate;
+		$[7] = projectId;
+		$[8] = websiteHref;
+		$[9] = t4;
+	} else t4 = $[9];
+	const save = useMutation(t4);
+	if (!saved) {
+		let t5;
+		if ($[10] === Symbol.for("react.memo_cache_sentinel")) {
+			t5 = /* @__PURE__ */ jsx(Skeleton, { className: "h-72" });
+			$[10] = t5;
+		} else t5 = $[10];
+		return t5;
+	}
+	let t5;
+	let voice;
+	if ($[11] !== moved || $[12] !== saved) {
+		voice = {
+			...saved,
+			...moved
+		};
+		t5 = changedAxes(saved, voice);
+		$[11] = moved;
+		$[12] = saved;
+		$[13] = t5;
+		$[14] = voice;
+	} else {
+		t5 = $[13];
+		voice = $[14];
+	}
+	const changed = t5;
+	let t6;
+	if ($[15] === Symbol.for("react.memo_cache_sentinel")) {
+		t6 = /* @__PURE__ */ jsxs("header", {
+			className: "flex flex-col gap-1",
+			children: [/* @__PURE__ */ jsx("h2", {
+				id: "camox-voice-title",
+				className: "text-sm font-semibold",
+				children: "Voice"
+			}), /* @__PURE__ */ jsx("p", {
+				className: "text-muted-foreground text-xs",
+				children: "How the website speaks. Every model that writes for visitors keeps to it."
+			})]
+		});
+		$[15] = t6;
+	} else t6 = $[15];
+	let t7;
+	if ($[16] !== save || $[17] !== voice) {
+		t7 = VOICE_AXES.map((axis) => /* @__PURE__ */ jsx(VoiceAxisRow, {
+			axis,
+			step: voice[axis.key],
+			disabled: save.isPending,
+			onStep: (step) => {
+				setMoved((current) => ({
+					...current,
+					[axis.key]: step
+				}));
+				save.reset();
+			}
+		}, axis.key));
+		$[16] = save;
+		$[17] = voice;
+		$[18] = t7;
+	} else t7 = $[18];
+	let t8;
+	if ($[19] !== t7) {
+		t8 = /* @__PURE__ */ jsx("ul", {
+			className: "flex flex-col gap-5",
+			children: t7
+		});
+		$[19] = t7;
+		$[20] = t8;
+	} else t8 = $[20];
+	let t9;
+	if ($[21] !== save.error) {
+		t9 = save.error && /* @__PURE__ */ jsx("p", {
+			"data-voice-error": true,
+			className: "text-destructive text-xs",
+			children: save.error.message
+		});
+		$[21] = save.error;
+		$[22] = t9;
+	} else t9 = $[22];
+	let t10;
+	if ($[23] !== changed || $[24] !== projectId || $[25] !== save) {
+		t10 = Object.keys(changed).length > 0 && /* @__PURE__ */ jsxs("div", {
+			className: "flex flex-wrap gap-2",
+			children: [/* @__PURE__ */ jsxs(Button, {
+				disabled: save.isPending,
+				onClick: () => save.mutate({
+					projectId,
+					steps: changed
+				}),
+				children: [save.isPending && !save.variables?.rewrite && /* @__PURE__ */ jsx(Spinner, {}), "Save"]
+			}), /* @__PURE__ */ jsxs(Button, {
+				variant: "outline",
+				disabled: save.isPending,
+				onClick: () => save.mutate({
+					projectId,
+					steps: changed,
+					rewrite: true
+				}),
+				children: [save.isPending && save.variables?.rewrite && /* @__PURE__ */ jsx(Spinner, {}), "Save and rewrite"]
+			})]
+		});
+		$[23] = changed;
+		$[24] = projectId;
+		$[25] = save;
+		$[26] = t10;
+	} else t10 = $[26];
+	let t11;
+	if ($[27] !== t10 || $[28] !== t8 || $[29] !== t9) {
+		t11 = /* @__PURE__ */ jsxs("section", {
+			"data-voice": true,
+			"aria-labelledby": "camox-voice-title",
+			className: "flex flex-col gap-5 rounded-lg border p-4",
+			children: [
+				t6,
+				t8,
+				t9,
+				t10
+			]
+		});
+		$[27] = t10;
+		$[28] = t8;
+		$[29] = t9;
+		$[30] = t11;
+	} else t11 = $[30];
+	return t11;
+}
+/** The axes `voice` moves away from `saved`, with their new steps. */
+function changedAxes(saved, voice) {
+	const changed = {};
+	for (const { key } of VOICE_AXES) if (voice[key] !== saved[key]) changed[key] = voice[key];
+	return changed;
+}
+const sentenceCase = (text) => text.charAt(0).toUpperCase() + text.slice(1);
+/** One Voice Axis: its name, its chosen step and that step's definition, over a slider. */
+function VoiceAxisRow(t0) {
+	const $ = c(39);
+	const { axis, step, disabled, onStep } = t0;
+	const steps = axis.steps;
+	let t1;
+	if ($[0] !== step || $[1] !== steps) {
+		let t2;
+		if ($[3] !== step) {
+			t2 = (candidate) => candidate.key === step;
+			$[3] = step;
+			$[4] = t2;
+		} else t2 = $[4];
+		t1 = steps.findIndex(t2);
+		$[0] = step;
+		$[1] = steps;
+		$[2] = t1;
+	} else t1 = $[2];
+	const index = Math.max(t1, 0);
+	const chosen = steps[index];
+	let t2;
+	if ($[5] !== axis.name) {
+		t2 = /* @__PURE__ */ jsx("span", {
+			"data-voice-axis-name": true,
+			className: "font-medium",
+			children: axis.name
+		});
+		$[5] = axis.name;
+		$[6] = t2;
+	} else t2 = $[6];
+	let t3;
+	if ($[7] !== chosen.name) {
+		t3 = /* @__PURE__ */ jsx("span", {
+			"data-voice-step": true,
+			children: chosen.name
+		});
+		$[7] = chosen.name;
+		$[8] = t3;
+	} else t3 = $[8];
+	let t4;
+	if ($[9] !== t2 || $[10] !== t3) {
+		t4 = /* @__PURE__ */ jsxs("div", {
+			className: "flex items-baseline justify-between gap-3 text-sm",
+			children: [t2, t3]
+		});
+		$[9] = t2;
+		$[10] = t3;
+		$[11] = t4;
+	} else t4 = $[11];
+	const t5 = steps.length - 1;
+	let t6;
+	if ($[12] !== onStep || $[13] !== steps) {
+		t6 = (value) => {
+			const next = steps[value];
+			if (next) onStep(next.key);
+		};
+		$[12] = onStep;
+		$[13] = steps;
+		$[14] = t6;
+	} else t6 = $[14];
+	let t7;
+	if ($[15] !== axis.name || $[16] !== chosen.name || $[17] !== disabled || $[18] !== index || $[19] !== steps.length || $[20] !== t5 || $[21] !== t6) {
+		t7 = /* @__PURE__ */ jsx(Slider, {
+			label: axis.name,
+			valueText: chosen.name,
+			min: 0,
+			max: t5,
+			step: 1,
+			marks: steps.length,
+			value: index,
+			disabled,
+			onValueChange: t6
+		});
+		$[15] = axis.name;
+		$[16] = chosen.name;
+		$[17] = disabled;
+		$[18] = index;
+		$[19] = steps.length;
+		$[20] = t5;
+		$[21] = t6;
+		$[22] = t7;
+	} else t7 = $[22];
+	let t8;
+	if ($[23] !== steps[0].name) {
+		t8 = /* @__PURE__ */ jsx("span", { children: steps[0].name });
+		$[23] = steps[0].name;
+		$[24] = t8;
+	} else t8 = $[24];
+	const t9 = steps[steps.length - 1];
+	let t10;
+	if ($[25] !== t9.name) {
+		t10 = /* @__PURE__ */ jsx("span", { children: t9.name });
+		$[25] = t9.name;
+		$[26] = t10;
+	} else t10 = $[26];
+	let t11;
+	if ($[27] !== t10 || $[28] !== t8) {
+		t11 = /* @__PURE__ */ jsxs("div", {
+			"aria-hidden": true,
+			className: "text-muted-foreground flex justify-between text-[11px]",
+			children: [t8, t10]
+		});
+		$[27] = t10;
+		$[28] = t8;
+		$[29] = t11;
+	} else t11 = $[29];
+	let t12;
+	if ($[30] !== chosen.definition) {
+		t12 = sentenceCase(chosen.definition);
+		$[30] = chosen.definition;
+		$[31] = t12;
+	} else t12 = $[31];
+	let t13;
+	if ($[32] !== t12) {
+		t13 = /* @__PURE__ */ jsx("p", {
+			"data-voice-definition": true,
+			className: "text-muted-foreground text-xs",
+			children: t12
+		});
+		$[32] = t12;
+		$[33] = t13;
+	} else t13 = $[33];
+	let t14;
+	if ($[34] !== t11 || $[35] !== t13 || $[36] !== t4 || $[37] !== t7) {
+		t14 = /* @__PURE__ */ jsxs("li", {
+			"data-voice-axis": true,
+			className: "flex flex-col gap-2",
+			children: [
+				t4,
+				t7,
+				t11,
+				t13
+			]
+		});
+		$[34] = t11;
+		$[35] = t13;
+		$[36] = t4;
+		$[37] = t7;
+		$[38] = t14;
+	} else t14 = $[38];
+	return t14;
+}
+
+//#endregion
+export { VoiceGroup };

package/dist/features/preview/EditablePageExperience.js

@@ -3,6 +3,7 @@ import { CamoxContent } from "../content/CamoxContent.js";
 import { AuthenticatedCamoxProvider } from "../provider/AuthenticatedCamoxProvider.js";
 import { CamoxStudio } from "../studio/CamoxStudio.js";
 import { CompleteBlockEditingRuntimeProvider } from "../../core/editing/CompleteBlockEditingRuntime.js";
+import { CamoxMemory } from "../memory/CamoxMemory.js";
 import { CamoxSettings } from "../settings/CamoxSettings.js";
 import { c } from "react/compiler-runtime";
 import { jsx } from "react/jsx-runtime";
@@ -11,6 +12,7 @@ import { jsx } from "react/jsx-runtime";
 /** The studio section each studio route shows. */
 const STUDIO_SECTIONS = {
 	"studio-content": CamoxContent,
+	"studio-memory": CamoxMemory,
 	"studio-settings": CamoxSettings
 };
 function EditablePageExperience(t0) {

package/dist/features/runtime/publicCache.d.ts

@@ -16,6 +16,8 @@ export declare function readLiveCacheKey(apiUrl: string, projectUuid: string): P
 /**
  * Answers a public request from the cache, or renders it and keeps the render when it may be
  * shared. Without a Live cache key, it renders without the cache: nothing tells when Live changed.
+ * A key slower than `RENDER_HEAD_START_MS` starts the render before it arrives; should the cache
+ * have the page after all, that render is dropped.
  */
 export declare function respondThroughPublicCache(request: Request, publicCache: PublicCache, render: () => Promise<Response | null>): Promise<Response | null>;
 //#endregion

package/dist/features/runtime/publicCache.js

@@ -9,6 +9,13 @@ const EDGE_MAX_AGE = 86400;
 const VISITOR_CACHE_CONTROL = "public, max-age=0, must-revalidate";
 /** The search parameter the cache key adds to a request's URL. */
 const CACHE_KEY_PARAM = "__camox_cache";
+/**
+* How long a render waits for the Live cache key before it starts anyway. The edge answers a key
+* it keeps within a few milliseconds. One it doesn't keep, the API mints, which often takes a
+* second while an API isolate starts, and no render is kept under a key just minted, so the page
+* renders either way: it starts while the key is on its way.
+*/
+const RENDER_HEAD_START_MS = 50;
 /** The project's Live cache key, as the API serves it from its edge cache. */
 async function readLiveCacheKey(apiUrl, projectUuid) {
 	try {
@@ -21,10 +28,26 @@ async function readLiveCacheKey(apiUrl, projectUuid) {
 /**
 * Answers a public request from the cache, or renders it and keeps the render when it may be
 * shared. Without a Live cache key, it renders without the cache: nothing tells when Live changed.
+* A key slower than `RENDER_HEAD_START_MS` starts the render before it arrives; should the cache
+* have the page after all, that render is dropped.
 */
 async function respondThroughPublicCache(request, publicCache, render) {
-	const liveCacheKey = await publicCache.liveCacheKey();
-	if (!liveCacheKey) return render();
+	let rendering;
+	const renderOnce = () => {
+		if (!rendering) {
+			rendering = render();
+			rendering.catch(() => void 0);
+		}
+		return rendering;
+	};
+	const headStart = setTimeout(renderOnce, 50);
+	let liveCacheKey;
+	try {
+		liveCacheKey = await publicCache.liveCacheKey();
+	} finally {
+		clearTimeout(headStart);
+	}
+	if (!liveCacheKey) return renderOnce();
 	const key = cacheKeyOf(request, `${liveCacheKey}.${publicCache.build}`);
 	let cache;
 	let cached;
@@ -33,10 +56,10 @@ async function respondThroughPublicCache(request, publicCache, render) {
 		cached = await cache.match(withValidators(key, request));
 	} catch (error) {
 		console.error("The edge cache couldn't be read: the page renders without it", error);
-		return render();
+		return renderOnce();
 	}
 	if (cached) return forVisitors(cached, request);
-	const response = await render();
+	const response = await renderOnce();
 	if (!response || !mayBeShared(response)) return response;
 	publicCache.waitUntil((async () => cache.put(key, forEdge(response.clone())))().catch((error) => {
 		console.error("The edge cache couldn't keep a render", error);

package/dist/features/runtime/runtime.d.ts

@@ -11,7 +11,7 @@ import { LookPlaceholderHeight } from "@camox/api-contract/drafts";
 import { UseHeadInput } from "unhead/types";
 //#region src/features/runtime/runtime.d.ts
 /** The studio's own routes, rather than a page or the Canvas. */
-declare const STUDIO_ROUTE_KINDS: readonly ["studio", "studio-content", "studio-settings", "studio-nested"];
+declare const STUDIO_ROUTE_KINDS: readonly ["studio", "studio-content", "studio-memory", "studio-settings", "studio-nested"];
 export type StudioRouteKind = (typeof STUDIO_ROUTE_KINDS)[number];
 export type RuntimeRouteKind = RuntimeOwnedRouteKind | "canvas" | "page" | StudioRouteKind;
 export interface RuntimeRouteMatch {

package/dist/features/runtime/runtime.js

@@ -8,7 +8,7 @@ import { ARTIFACTS_PATH_PREFIX, RUNTIME_ROUTE_PATHS, matchRuntimeOwnedRoute } fr
 import { reads } from "../../lib/studio-reads.js";
 import { recordMarkdownTemplate } from "../../core/recordItem.js";
 import { PLATFORM_SCRIPT } from "../../lib/platform.js";
-import { STUDIO_ASSETS_PATH, STUDIO_CANVAS_PATH, STUDIO_CONTENT_PATH, STUDIO_SETTINGS_PATH, matchCollectionContentPath } from "../studio/routes.js";
+import { STUDIO_ASSETS_PATH, STUDIO_CANVAS_PATH, STUDIO_CONTENT_PATH, STUDIO_MEMORY_PATH, STUDIO_SETTINGS_PATH, matchCollectionContentPath } from "../studio/routes.js";
 import { STUDIO_THEME_SCRIPT } from "../studio/studioTheme.js";
 import { DefaultPageImage, renderPageImage } from "../og/pageImage.js";
 import { discoverLayoutPages } from "../../core/derivedRoutes.js";
@@ -39,6 +39,7 @@ const DEFAULT_RUNTIME_BASE_PATH = "";
 const STUDIO_ROUTE_KINDS = [
 	"studio",
 	"studio-content",
+	"studio-memory",
 	"studio-settings",
 	"studio-nested"
 ];
@@ -122,6 +123,10 @@ function matchRuntimeRoute(pathname) {
 		kind: "studio-content",
 		pathname
 	};
+	if (pathname === "/camox/memory" || pathname === `${"/camox/memory"}/`) return {
+		kind: "studio-memory",
+		pathname
+	};
 	if (pathname === "/camox/settings" || pathname === `${"/camox/settings"}/`) return {
 		kind: "studio-settings",
 		pathname
@@ -1687,21 +1692,35 @@ async function handleCamoxRequest(request, options = {}) {
 		if (signedIn) return signedIn;
 	}
 	const { apiUrl, projectUuid } = options;
+	if (!apiUrl || !projectUuid) return respondInLocale(options, request, pathname);
 	const markdownPathname = parseMarkdownPath(pathname);
-	if (apiUrl && projectUuid && (markdownPathname || prefersMarkdown(request.headers.get("Accept") ?? ""))) {
-		const markdownResponse = await createPageMarkdownResponse({
-			...options,
-			apiUrl,
-			projectUuid
-		}, {
-			pathname: markdownPathname ?? pathname,
-			request,
-			pagesOnly: !markdownPathname
-		});
-		if (markdownResponse) return markdownResponse;
-		if (markdownPathname) return new Response("Page not found", { status: 404 });
-	}
-	return respondInLocale(options, request, pathname);
+	if (markdownPathname) return await createPageMarkdownResponse({
+		...options,
+		apiUrl,
+		projectUuid
+	}, {
+		pathname: markdownPathname,
+		request,
+		pagesOnly: false
+	}) ?? new Response("Page not found", { status: 404 });
+	return varyingByAccept((prefersMarkdown(request.headers.get("Accept") ?? "") ? await createPageMarkdownResponse({
+		...options,
+		apiUrl,
+		projectUuid
+	}, {
+		pathname,
+		request,
+		pagesOnly: true
+	}) : null) ?? await respondInLocale(options, request, pathname));
+}
+/**
+* A response its URL answers in HTML or Markdown, by what the request accepts: it says so, so no
+* cache answers one with the other.
+*/
+function varyingByAccept(response) {
+	const varying = new Response(response.body, response);
+	varying.headers.append("Vary", "Accept");
+	return varying;
 }
 /**
 * Answers a path under its locale's prefix: the Canvas, a studio route or a page, in that locale.

package/dist/features/studio/FollowAgentProvider.js

@@ -4,9 +4,9 @@ import { useLocation, useNavigate } from "../navigation/navigation.js";
 import { useProjectUuid } from "../../lib/auth.js";
 import { reads, useReadQueries, useReadQuery } from "../../lib/studio-reads.js";
 import { useRoutableLayouts } from "../../lib/studio-definitions.js";
+import { canvasPageId, getCanvasPages } from "../canvas/canvasPages.js";
 import { STUDIO_CANVAS_PATH } from "./routes.js";
 import { FollowAgentContext } from "./followAgentContext.js";
-import { canvasPageId, getCanvasPages } from "../canvas/canvasPages.js";
 import { selectedCanvasPage } from "../canvas/canvasSelection.js";
 import { useDiscoveredPreviewPaths } from "../canvas/useDiscoveredPreviewPaths.js";
 import { EditorWhereContext } from "./editorWhereContext.js";

package/dist/features/studio/components/AgentSidebar.js

@@ -1,5 +1,6 @@
 import { cn } from "../../../lib/utils.js";
 import { SIDEBAR_GUTTER } from "../../preview/components/SidebarStack.js";
+import { useCanvasLayout } from "../../canvas/useCanvasLayout.js";
 import { ChatWidget } from "./ChatWidget.js";
 import { Specialists } from "./Specialists.js";
 import { c } from "react/compiler-runtime";
@@ -14,30 +15,34 @@ import { jsx, jsxs } from "react/jsx-runtime";
 * and the Preview and Studio pages follow the editor's runs too.
 */
 function AgentSidebar(t0) {
-	const $ = c(6);
+	const $ = c(8);
 	const { hidden: t1 } = t0;
 	const hidden = t1 === void 0 ? false : t1;
+	const { sidebarWidth } = useCanvasLayout();
 	let t2;
+	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
+		t2 = cn("absolute inset-y-0 right-0 z-10 flex flex-col gap-2 py-2 max-md:hidden", SIDEBAR_GUTTER);
+		$[0] = t2;
+	} else t2 = $[0];
 	let t3;
+	if ($[1] !== sidebarWidth) {
+		t3 = { width: sidebarWidth };
+		$[1] = sidebarWidth;
+		$[2] = t3;
+	} else t3 = $[2];
 	let t4;
 	let t5;
-	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
-		t2 = cn("absolute inset-y-0 right-0 z-10 flex flex-col gap-2 py-2 max-md:hidden", SIDEBAR_GUTTER);
-		t3 = { width: 265 };
+	if ($[3] === Symbol.for("react.memo_cache_sentinel")) {
 		t4 = /* @__PURE__ */ jsx(Specialists, { className: "min-h-0 flex-[0_1_auto]" });
 		t5 = /* @__PURE__ */ jsx(ChatWidget, { className: "min-h-0 flex-[7_1_0]" });
-		$[0] = t2;
-		$[1] = t3;
-		$[2] = t4;
-		$[3] = t5;
+		$[3] = t4;
+		$[4] = t5;
 	} else {
-		t2 = $[0];
-		t3 = $[1];
-		t4 = $[2];
-		t5 = $[3];
+		t4 = $[3];
+		t5 = $[4];
 	}
 	let t6;
-	if ($[4] !== hidden) {
+	if ($[5] !== hidden || $[6] !== t3) {
 		t6 = /* @__PURE__ */ jsxs("aside", {
 			"aria-label": "Agent",
 			"data-agent-sidebar": true,
@@ -46,9 +51,10 @@ function AgentSidebar(t0) {
 			style: t3,
 			children: [t4, t5]
 		});
-		$[4] = hidden;
-		$[5] = t6;
-	} else t6 = $[5];
+		$[5] = hidden;
+		$[6] = t3;
+		$[7] = t6;
+	} else t6 = $[7];
 	return t6;
 }