yugoo-design 0.1.2 → 0.2.0

package/payload/shared/scripts/{server-BoVIQm2J.mjs → server-BBHB9EQr.mjs}

@@ -1,11 +1,10 @@
-import { i as unknownDeliveryError, n as requireThreadId, r as notificationErrorResponse, t as createCodexConnection } from "./codex-connection-DuV2wtkn.mjs";
-import { $ as DesignKnowledgeRevision, A as DesignContentStore, At as validatorFromSchemaYaml, B as parseDesignClarityReported, C as DesignAdvisoryJournal, Ct as readConfinedText, D as OFFICIAL_REFLECTION_PROFILE, Dt as writeConfinedText, E as OFFICIAL_GROUNDING_PROFILE, Et as writeConfinedBytes, F as readDesignClarityAuthority, Ft as ProjectContentTransaction, G as advanceDesignKnowledgePublication, I as writeDesignClarityAuthority, J as refreshDesignKnowledge, K as readDesignKnowledgePublication, L as designClarityDigest, M as pendingMustEditAuthorityForSave, Mt as DesignProjectManager, N as DesignExecutionHandoffJournal, Nt as nodeDesignProjectSpawn, O as officialAdvisoryProfile, P as DesignJournalStorage, Pt as parseDesignProjectJson, R as designClarityInputMatches, Rt as GitVersioning, S as queryKnowledgeSnapshot, St as readConfinedBytes, T as OFFICIAL_ALIGNMENT_PROFILE, Tt as resolveConfinedFilePath, U as restoreDesignKnowledgeRecords, W as saveDesignKnowledgeRecords, X as readSourceDesignKnowledge, Y as storedKnowledgeGraph, Z as readCompleteDesignKnowledge, _ as DESIGN_EXECUTOR_EVIDENCE_GUIDANCE, _t as resolveSemanticCapability, a as autoPanelGenerationPrompt, at as projectBundleOverrides, b as knowledgeQueryFilters, c as resolveAutoPanel, ct as createDirectoryBundleResolver, d as knowledgeReviewSchema, dt as parseFrontmatter, et as commitDesignProjectRecords, f as publishKnowledgeReview, g as DESIGN_CORE_CLARITY_RUBRIC_PROMPT, gt as reviewSupportOf, h as DESIGN_CLARITY_OUTPUT_SCHEMA, ht as designOntologyCoverage, i as writeDesignReviewPolicy, it as latestInstalledKit, j as validateSkillDesign, k as deriveCurrentDesignExecutionGate, kt as parseSchemaYaml, l as retainResolvedAutoPanel, lt as loadDesignBundle, m as readAdvisoryDesignKnowledge, mt as resolveDesignKitPackage, n as DesignReviewPublicationQueue, nt as ProjectContentMigration, o as publishAutoPanelComponents, ot as projectKitContentHash, p as splitKnowledgeReviewResult, q as readPublishedDesignKnowledge, r as readDesignReviewPolicy, rt as composeProjectKit, s as assertResolvedAutoPanelSave, st as sameProjectContentPin, t as DesignContinuousReviewClock, u as knowledgeReviewGuidance, ut as loadDesignKit, v as DESIGN_WORKER_EVIDENCE_GUIDANCE, w as renderAdvisoryReviewMemory, wt as removeConfinedFile, x as knowledgeReadResult, xt as requireDesignFileRelativePath, y as KNOWLEDGE_AGENTIC_GUIDANCE, z as parseDesignClarityInput, zt as designProjectRecordsRoot } from "./core-entry-B6zaTh1o.mjs";
+import { i as notificationErrorResponse, n as requireThreadId, o as unknownDeliveryError, t as createCodexConnection } from "./codex-connection-1RvU1XCj.mjs";
+import { $ as storedKnowledgeGraph, A as validateSkillDesign, At as writeConfinedText, B as writeDesignClarityAuthority, Bt as designProjectRecordsRoot, C as DesignAdvisoryJournal, D as OFFICIAL_REFLECTION_PROFILE, Dt as removeConfinedFile, E as OFFICIAL_GROUNDING_PROFILE, Et as readConfinedText, F as pendingMustEditAuthorityForSave, Ft as DesignProjectManager, H as designClarityInputMatches, I as DesignExecutionHandoffJournal, It as nodeDesignProjectSpawn, J as saveDesignKnowledgeRecords, L as DesignJournalStorage, M as applyPanelEdit, Mt as parseSchemaYaml, N as buildPanelSaveNote, Nt as validatorFromSchemaYaml, O as officialAdvisoryProfile, Ot as resolveConfinedFilePath, P as parsePanelArtifacts, Q as refreshDesignKnowledge, R as readCommittedDesignClarityAuthority, S as queryKnowledgeSnapshot, T as OFFICIAL_ALIGNMENT_PROFILE, Tt as readConfinedBytes, U as parseDesignClarityInput, V as designClarityDigest, W as parseDesignClarityReported, X as readDesignKnowledgePublication, Y as advanceDesignKnowledgePublication, Z as readPublishedDesignKnowledge, _ as DESIGN_EXECUTOR_EVIDENCE_GUIDANCE, _t as resolveDesignKitPackage, a as autoPanelGenerationPrompt, at as ensureProjectKit, b as knowledgeQueryFilters, bt as resolveSemanticCapability, c as resolveAutoPanel, ct as projectBundleOverrides, d as knowledgeReviewSchema, dt as createDirectoryBundleResolver, et as readSourceDesignKnowledge, f as publishKnowledgeReview, ft as loadDesignBundle, g as DESIGN_CORE_CLARITY_RUBRIC_PROMPT, h as DESIGN_CLARITY_OUTPUT_SCHEMA, i as writeDesignReviewPolicy, j as DESIGN_PANEL_SAVE_ASSESSMENT_GUIDANCE, k as deriveCurrentDesignExecutionGate, kt as writeConfinedBytes, l as retainResolvedAutoPanel, lt as projectKitContentHash, m as readAdvisoryDesignKnowledge, mt as parseFrontmatter, n as DesignReviewPublicationQueue, nt as DesignKnowledgeRevision, o as publishAutoPanelComponents, ot as DesignContentStore, p as splitKnowledgeReviewResult, pt as loadDesignKit, q as restoreDesignKnowledgeRecords, r as readDesignReviewPolicy, rt as commitDesignProjectRecords, s as assertResolvedAutoPanelSave, st as composeProjectKit, t as DesignContinuousReviewClock, tt as readCompleteDesignKnowledge, u as knowledgeReviewGuidance, ut as sameProjectContentPin, v as DESIGN_WORKER_EVIDENCE_GUIDANCE, vt as designOntologyCoverage, w as renderAdvisoryReviewMemory, wt as requireDesignFileRelativePath, x as knowledgeReadResult, y as KNOWLEDGE_AGENTIC_GUIDANCE, yt as reviewSupportOf, z as readDesignClarityAuthority, zt as GitVersioning } from "./core-entry-DESmwP78.mjs";
 import { i as readDesignGit } from "./design-git-read-BUV0s4TT.mjs";
-import { n as createStudioPanelDrafts, r as StudioKitDraftService, t as createStudioDraftPorts } from "./studio-panel-drafts-Cu48ih5u.mjs";
-import { a as createWindowsProcessInspector, c as withWindowsInspection, n as ensureWindowsPrivateDirectory, o as windowsCommandArgs, s as windowsProcess } from "./windows-private-storage-DRAXaqae.mjs";
-import { t as loadStudioKit } from "./load-DE29wyw0.mjs";
-import { t as finalizeStudioPanelPreview } from "./panel-preview-CPGv8nTe.mjs";
-import { TextDecoder as TextDecoder$1, isDeepStrictEqual } from "node:util";
+import { l as withWindowsInspection, o as windowsProcess, r as windowsCommandArgs, t as createWindowsProcessInspector } from "./windows-native-platform-DLm-tedp.mjs";
+import { r as normalizeStudioInstanceChanges, t as createStudioDraftPorts } from "./studio-panel-drafts-Dq171F6x.mjs";
+import { t as loadStudioKit } from "./load-C-RwS23Y.mjs";
+import { TextDecoder, isDeepStrictEqual } from "node:util";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep, win32 } from "node:path";
 import { fileURLToPath } from "node:url";
 import { link, lstat, mkdir, mkdtemp, open, readFile, readdir, readlink, realpath, rename, rm, rmdir, stat, unlink, writeFile } from "node:fs/promises";
@@ -19,7 +18,7 @@ import { createServer } from "node:http";
 import { StringDecoder } from "node:string_decoder";
 //#region packages/companion/src/workbuddy-background.mjs
 /** WorkBuddy 5.8.3 public Agent/TaskOutput native receipts. No Host settings or launches. */
-const object$1 = (value) => value && typeof value === "object" && !Array.isArray(value);
+const object$2 = (value) => value && typeof value === "object" && !Array.isArray(value);
 const text = (value) => typeof value === "string" && value.length > 0 && value.length <= 512;
 function args(event) {
 	try {
@@ -47,7 +46,7 @@ function receiptError(code, message, issues = [], observedMode = "unknown") {
 		observedMode
 	});
 }
-function diagnostic$1(call, event, issues = []) {
+function diagnostic(call, event, issues = []) {
 	const native = event?.providerData?.toolResult?.subAgent;
 	return {
 		...text(call?.callId) ? { callId: call.callId } : {},
@@ -115,7 +114,7 @@ function workBuddyBackgroundReadiness(events, parentSessionId, { since } = {}) {
 		if (!Number.isFinite(receiptAt) || receiptAt < since) continue;
 		const native = event.providerData?.toolResult?.subAgent;
 		const runId = native?.sessionId;
-		if (!object$1(native?.descriptor)) {
+		if (!object$2(native?.descriptor)) {
 			const synchronous = event.status === "completed" && text(runId) && text(native?.lastId) && native.descriptor === void 0;
 			if (synchronous) proof = void 0;
 			observation = {
@@ -123,7 +122,7 @@ function workBuddyBackgroundReadiness(events, parentSessionId, { since } = {}) {
 				canAttemptReadiness: false,
 				reasonCode: synchronous ? "native-synchronous-result" : "native-background-transport-missing",
 				observedMode: synchronous ? "synchronous" : "unknown",
-				diagnostics: diagnostic$1(call, event, [issue("subAgent.descriptor", "version-1 background descriptor", native?.descriptor, true)]),
+				diagnostics: diagnostic(call, event, [issue("subAgent.descriptor", "version-1 background descriptor", native?.descriptor, true)]),
 				reason: synchronous ? "The current WorkBuddy background request returned a synchronous child result without a background descriptor. Background GRA remains unavailable; do not repeat READY probes. Verify the normal Host Agent Teams/background capability and invocation mode." : "The current WorkBuddy background request has no complete native transport observation. Background execution is unverified, not a confirmed synchronous fallback. Inspect that existing request; do not launch another readiness probe."
 			};
 			continue;
@@ -142,7 +141,7 @@ function workBuddyBackgroundReadiness(events, parentSessionId, { since } = {}) {
 				canAttemptReadiness: false,
 				reasonCode: "native-background-stale",
 				observedMode: "background",
-				diagnostics: diagnostic$1(call, event, [issue("descriptor.createdAt", "at or after current connection opening", native.descriptor.createdAt)]),
+				diagnostics: diagnostic(call, event, [issue("descriptor.createdAt", "at or after current connection opening", native.descriptor.createdAt)]),
 				reason: "The observed WorkBuddy descriptor predates this exact connection. It is not current readiness proof. Inspect the existing native request instead of repeating READY probes."
 			};
 		} catch (error) {
@@ -152,7 +151,7 @@ function workBuddyBackgroundReadiness(events, parentSessionId, { since } = {}) {
 				canAttemptReadiness: false,
 				reasonCode: error.code ?? "native-background-descriptor-invalid",
 				observedMode: error.observedMode ?? "unknown",
-				diagnostics: diagnostic$1(call, event, error.issues ?? []),
+				diagnostics: diagnostic(call, event, error.issues ?? []),
 				reason: error.code === "native-attached-result" ? "The existing native request returned an attached Agent result, not background execution. Background GRA remains unavailable. This receipt does not identify a Host setting; inspect the existing result without another probe." : "The current WorkBuddy background descriptor does not match its native parent call. Background execution remains unverified; inspect the reported fields in the existing request instead of repeating READY probes."
 			};
 		}
@@ -189,7 +188,7 @@ function workBuddyBackgroundReceipt(events, runId, parentSessionId, { notBefore,
 		const native = event.providerData?.toolResult;
 		if (event.name === "Agent" && native?.subAgent?.sessionId === runId) {
 			const descriptor = native.subAgent.descriptor;
-			if (!object$1(descriptor)) continue;
+			if (!object$2(descriptor)) continue;
 			const issues = [];
 			const check = (field, valid, expected, value, content = false) => {
 				if (!valid) issues.push(issue(field, expected, value, content));
@@ -232,7 +231,7 @@ function workBuddyBackgroundReceipt(events, runId, parentSessionId, { notBefore,
 				status = "unknown";
 				continue;
 			}
-			if (!object$1(value) || value.taskId !== runId) throw new Error("WorkBuddy TaskOutput receipt belongs to another background task.");
+			if (!object$2(value) || value.taskId !== runId) throw new Error("WorkBuddy TaskOutput receipt belongs to another background task.");
 			status = {
 				pending: "running",
 				running: "running",
@@ -1103,7 +1102,7 @@ const verifyQwenWorkChild = verifyQoderChild;
 //#region packages/companion/src/qwenwork-background.mjs
 /** Version-pinned QwenWork native receipts. Read-only; never launches or configures a Host. */
 const blocks$1 = (event) => Array.isArray(event.message?.content) ? event.message.content : [];
-const object = (value) => value && typeof value === "object" && !Array.isArray(value);
+const object$1 = (value) => value && typeof value === "object" && !Array.isArray(value);
 const millis$1 = (value) => typeof value === "number" ? value : Date.parse(value);
 const unavailable = "No current bound-session QwenWork asynchronous Agent receipt and matching native task descriptor.";
 const statuses = /* @__PURE__ */ new Set([
@@ -1199,7 +1198,7 @@ async function readSession(options) {
 		if (block.type !== "tool_result" || !calls.has(block.tool_use_id)) continue;
 		const call = calls.get(block.tool_use_id);
 		const native = block.toolUseResult ?? (blocks$1(event).filter((x) => x.type === "tool_result").length === 1 ? event.toolUseResult : void 0);
-		const async = block.is_error !== true && call.block.input?.run_in_background === true && object(native) && native.isAsync === true && native.status === "async_launched" && typeof native.agentId === "string" && typeof native.outputFile === "string" && native.outputFile.length > 0 && typeof native.description === "string" && typeof native.prompt === "string";
+		const async = block.is_error !== true && call.block.input?.run_in_background === true && object$1(native) && native.isAsync === true && native.status === "async_launched" && typeof native.agentId === "string" && typeof native.outputFile === "string" && native.outputFile.length > 0 && typeof native.description === "string" && typeof native.prompt === "string";
 		launches.push({
 			callId: block.tool_use_id,
 			call,
@@ -1222,7 +1221,7 @@ async function descriptorFor(options, session, launch, taskPath, transcriptPath)
 	requireNativeId("qwenwork", launch.native.agentId);
 	if (await realpath(dirname(taskPath)) !== await realpath(session.folder)) throw Error("QwenWork task is outside this exact native session.");
 	const task = JSON.parse(await readRegular$1(taskPath, 2097152));
-	if (!object(task) || typeof task.taskId !== "string" || !/^[a-zA-Z0-9][\w-]{0,127}$/.test(task.taskId) || basename(taskPath) !== `task-${task.taskId}.json` || task.sessionId !== sessionId || task.agentId !== launch.native.agentId || task.parentToolUseId !== launch.callId || task.completionBehavior !== "notify" || !Number.isSafeInteger(task.executionId) || task.executionId < 1 || !Number.isFinite(task.createdAt) || !Number.isFinite(task.updatedAt) || task.createdAt < readinessSince || task.updatedAt < task.createdAt || !statuses.has(task.status)) throw Error("QwenWork asynchronous task descriptor does not match its actual parent Agent call.");
+	if (!object$1(task) || typeof task.taskId !== "string" || !/^[a-zA-Z0-9][\w-]{0,127}$/.test(task.taskId) || basename(taskPath) !== `task-${task.taskId}.json` || task.sessionId !== sessionId || task.agentId !== launch.native.agentId || task.parentToolUseId !== launch.callId || task.completionBehavior !== "notify" || !Number.isSafeInteger(task.executionId) || task.executionId < 1 || !Number.isFinite(task.createdAt) || !Number.isFinite(task.updatedAt) || task.createdAt < readinessSince || task.updatedAt < task.createdAt || !statuses.has(task.status)) throw Error("QwenWork asynchronous task descriptor does not match its actual parent Agent call.");
 	const expected = join(session.folder, `agent-${task.agentId}.jsonl`);
 	if (!isAbsolute(task.transcriptPath ?? "") || await realpath(task.transcriptPath) !== await realpath(expected) || transcriptPath && await realpath(transcriptPath) !== await realpath(expected) || !isAbsolute(task.outputPath ?? "") || await realpath(task.outputPath) !== await realpath(launch.native.outputFile)) throw Error("QwenWork asynchronous task paths do not match the native receipt.");
 	const log = await verifyQwenWorkChild({
@@ -2610,182 +2609,6 @@ var DesignFilesStore = class {
 	}
 };
 //#endregion
-//#region packages/core/src/project-content-guard.ts
-var ProjectContentPanelGuard = class {
-	projectId;
-	lifetimeMs;
-	now;
-	pages = /* @__PURE__ */ new Map();
-	closedSequences = /* @__PURE__ */ new Map();
-	constructor(projectId, lifetimeMs = 3e4, now = Date.now) {
-		this.projectId = projectId;
-		this.lifetimeMs = lifetimeMs;
-		this.now = now;
-	}
-	observe(input) {
-		if (input.projectId !== this.projectId || !/^[a-f0-9-]{36}$/u.test(input.pageId) || !Number.isSafeInteger(input.sequence) || input.sequence < 1 || typeof input.dirty !== "boolean" || typeof input.saving !== "boolean" || input.lifecycle && ![
-			"opened",
-			"observed",
-			"closed"
-		].includes(input.lifecycle)) throw new Error("content upgrade: invalid bound Panel observation");
-		const prior = this.pages.get(input.pageId);
-		if (input.sequence <= (prior?.sequence ?? this.closedSequences.get(input.pageId) ?? 0)) throw new Error("content upgrade: stale Panel observation");
-		if (input.lifecycle === "closed") {
-			if (!prior?.observed || prior.dirty || prior.saving || input.dirty || input.saving) throw new Error("content upgrade: closing a page cannot discard an unknown or unsaved draft");
-			this.pages.delete(input.pageId);
-			this.rememberClosed(input.pageId, input.sequence);
-			return;
-		}
-		if (!prior && this.pages.size >= 64) throw new Error("content upgrade: too many Panel pages");
-		this.pages.set(input.pageId, input.lifecycle === "opened" ? {
-			sequence: input.sequence,
-			dirty: prior?.dirty ?? false,
-			saving: prior?.saving ?? false,
-			observed: false,
-			observedAt: this.now()
-		} : {
-			...input,
-			observed: true,
-			observedAt: this.now()
-		});
-	}
-	rememberClosed(pageId, sequence) {
-		this.closedSequences.delete(pageId);
-		this.closedSequences.set(pageId, sequence);
-		while (this.closedSequences.size > 256) this.closedSequences.delete(this.closedSequences.keys().next().value);
-	}
-	disconnected() {
-		return [...this.pages].filter(([, page]) => this.now() - page.observedAt >= this.lifetimeMs).map(([pageId, page]) => ({
-			pageId,
-			sequence: page.sequence
-		}));
-	}
-	/** Call only after actual user confirmation, using the exact displayed snapshot. */
-	discardDisconnected(snapshot) {
-		for (const item of snapshot) {
-			const current = this.pages.get(item.pageId);
-			if (!current || current.sequence !== item.sequence || this.now() - current.observedAt < this.lifetimeMs) throw new Error("content upgrade: disconnected page changed; no draft was discarded");
-		}
-		for (const item of snapshot) {
-			this.pages.delete(item.pageId);
-			this.rememberClosed(item.pageId, item.sequence);
-		}
-	}
-	assertQuiescent() {
-		for (const page of this.pages.values()) {
-			if (this.now() - page.observedAt >= this.lifetimeMs) throw new Error("content upgrade: a Panel page disconnected; reconnect it or explicitly discard its abandoned draft");
-			if (!page.observed) throw new Error("content upgrade: Panel draft observation is missing; reconnect its page");
-			if (page.dirty || page.saving) throw new Error("content upgrade: preserve or settle every Panel draft before upgrading");
-		}
-	}
-};
-//#endregion
-//#region packages/core/src/project-content-journal.ts
-/** Append to the existing journal exactly once, including crash replay after append. */
-async function recordProjectContentAdoption(storage, conversation, receipt, pin) {
-	if (receipt.contentHash !== pin.contentHash) throw new Error("content upgrade: journal receipt differs from the committed pin");
-	await storage.atomicMutate(conversation, (current) => {
-		const prior = current.records.find((record) => record.type === "design/kit-selected" && record.data.adoption?.operationId === receipt.operationId);
-		if (prior?.type === "design/kit-selected") {
-			if (JSON.stringify(prior.data.adoption) !== JSON.stringify(receipt)) throw new Error("content upgrade: conflicting journal replay");
-			return;
-		}
-		return {
-			type: "design/kit-selected",
-			data: {
-				kit: pin.name,
-				version: pin.version,
-				operation: "upgrade",
-				adoption: receipt
-			}
-		};
-	});
-}
-//#endregion
-//#region packages/core/src/panel-save.ts
-/** Decode bounded Panel attachment transport; store enforces path ownership. */
-function parsePanelArtifacts(skill, value) {
-	if (value === void 0) return void 0;
-	if (!Array.isArray(value) || value.length > 64) throw new Error("design panel: artifacts must be a list of at most 64 files");
-	const artifacts = {};
-	let totalBytes = 0;
-	for (const raw of value) {
-		if (typeof raw !== "object" || raw === null || Array.isArray(raw)) throw new Error("design panel: each artifact must be an object");
-		const entry = raw;
-		const path = entry.path;
-		const content = entry.content;
-		if (typeof path !== "string" || typeof content !== "string") throw new Error("design panel: each artifact requires string path and content");
-		const encoding = entry.encoding;
-		if (encoding !== void 0 && encoding !== "base64") throw new Error("design panel: artifact encoding must be base64 when present");
-		if (Object.keys(entry).some((key) => key !== "path" && key !== "content" && key !== "encoding")) throw new Error("design panel: artifact entries accept only path, content and encoding");
-		if (Object.hasOwn(artifacts, path)) throw new Error(`design panel: duplicate artifact path ${JSON.stringify(path)}`);
-		let prepared = content;
-		let bytes = Buffer.byteLength(content, "utf8");
-		if (encoding === "base64") {
-			if (content === "" || !/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/u.test(content)) throw new Error(`design panel: artifact ${JSON.stringify(path)} is not canonical base64`);
-			const decoded = Buffer.from(content, "base64");
-			if (decoded.toString("base64") !== content) throw new Error(`design panel: artifact ${JSON.stringify(path)} is not canonical base64`);
-			prepared = Uint8Array.from(decoded);
-			bytes = decoded.byteLength;
-		}
-		if (bytes > 16777216) throw new Error(`design panel: artifact ${JSON.stringify(path)} exceeds 16 MiB`);
-		totalBytes += bytes;
-		if (totalBytes > 67108864) throw new Error("design panel: artifacts exceed 64 MiB in total");
-		artifacts[path] = prepared;
-	}
-	return Object.freeze(artifacts);
-}
-/**
-* Build the model-facing note that carries the authoritative git diff.
-* @param skill - the skill whose panel was saved.
-* @param diff - the unified diff of the save commit.
-* @returns the `<panel_save_context>` note text.
-*/
-function buildPanelSaveNote(skill, diff, clarityInput) {
-	return [
-		"<panel_save_context>",
-		`The backend has already persisted the "${skill}" panel edits. The raw Git diff below is the authoritative change record. Do not call a write tool to apply it again.`,
-		"<git_diff>",
-		diff,
-		"</git_diff>",
-		`This is a change diff, not the complete "${skill}" state. Reuse it and the evidence already available; read the saved JSON or a referenced artifact only when needed context is absent or the diff is insufficient.`,
-		...clarityInput === void 0 ? [] : [
-			`Assess this saved checkpoint in the ordinary main conversation when useful. To persist an assessment, call report_design_clarity with input=${JSON.stringify(clarityInput)} and evidence-based U/S/T for the latest saved Design state and agreed user scope. No second evaluator is required for this save to count as completed.`,
-			"The current assembly supplies design_clarity_input for project, saved commit and Kit content. Use current user intent to decide whether the saved reasoning needs reassessment; conversational scope is not an identity ticket.",
-			"Several saved edits may be assessed together. Reuse a score only when its evidence and reasoning remain applicable; corrections and same-turn reassessment are allowed. Reporting failure does not undo the save or block authorized work, and old scores are not fresh evidence."
-		],
-		"</panel_save_context>"
-	].join("\n");
-}
-/**
-* Apply one panel edit: validate, persist, version, and build the agent note.
-* @param store - the session's Design Files store.
-* @param edit - the panel save (owning skill + post-edit state).
-* @param settleEvent - awaited plugin Journal settlement after commit.
-* @param validate - write-time schema validator (fail loud).
-* @param artifacts - deterministic files prepared by the runtime driver.
-* @param ownedArtifacts - complete artifact set retained by this Bundle.
-* @param signal - cancellation before transaction acceptance.
-* @returns the commit, diff, and the note to inject into the next turn.
-*/
-async function applyPanelEdit(store, edit, settleEvent, validate, artifacts, ownedArtifacts, signal, audit) {
-	const { commit, diff } = await store.write(edit.skill, edit.state, {
-		origin: "panel",
-		...validate === void 0 ? {} : { validate },
-		...artifacts === void 0 ? {} : { artifacts },
-		...ownedArtifacts === void 0 ? {} : { ownedArtifacts },
-		...signal === void 0 ? {} : { signal },
-		...audit === void 0 ? {} : { audit },
-		settleEvent
-	});
-	return {
-		skill: edit.skill,
-		commit,
-		diff,
-		note: buildPanelSaveNote(edit.skill, diff)
-	};
-}
-//#endregion
 //#region packages/core/src/panel-worktree.ts
 /** Shared live-file projection; no Host session, transport or Agent dependency. */
 const WORKTREE_REVISION_PREFIX = "worktree:";
@@ -3309,6 +3132,7 @@ async function createNativeRuns({ project, stateRoot, threadId, nativeCwd = proj
 		if (!skill) throw new Error("Unknown Bundle in the pinned Kit.");
 		return skill;
 	};
+	const definitionRevision = () => project.definitionRevision ?? projectKitContentHash(project.kit);
 	const observer = (binding) => {
 		if (!observers.has(binding.runId)) observers.set(binding.runId, createObserver({
 			path: binding.transcriptPath,
@@ -3412,7 +3236,8 @@ async function createNativeRuns({ project, stateRoot, threadId, nativeCwd = proj
 					mode: "main",
 					kit: project.kit.name,
 					kitVersion: project.kit.version,
-					bundleVersion: skillFor(skill).version
+					bundleVersion: skillFor(skill).version,
+					definitionRevision: definitionRevision()
 				};
 				await persistMain([...mainInvocations, invocation]);
 				return { ...invocation };
@@ -3511,7 +3336,8 @@ async function createNativeRuns({ project, stateRoot, threadId, nativeCwd = proj
 						skill: invocation.skill,
 						invocationId,
 						scope,
-						outcome
+						outcome,
+						definitionRevision: invocation.definitionRevision
 					});
 				} catch (error) {
 					return committedRecovery(error);
@@ -3568,6 +3394,7 @@ async function createNativeRuns({ project, stateRoot, threadId, nativeCwd = proj
 					taskPath,
 					projectRoot: nativeCwd
 				});
+				const existing = bindings.find((item) => item.runId === runId);
 				const next = {
 					runId,
 					parentRunId,
@@ -3580,9 +3407,9 @@ async function createNativeRuns({ project, stateRoot, threadId, nativeCwd = proj
 					...artifactFile ? { artifactFile } : {},
 					invocationId: main?.invocationId ?? parent?.invocationId ?? nativeInvocationId(host, threadId, runId),
 					attemptId: runId,
-					projectId: project.project.metadata.id
+					projectId: project.project.metadata.id,
+					definitionRevision: existing?.definitionRevision ?? main?.definitionRevision ?? parent?.definitionRevision ?? definitionRevision()
 				};
-				const existing = bindings.find((item) => item.runId === runId);
 				if (existing) {
 					for (const [key, value] of Object.entries(next)) if (existing[key] !== value) throw new Error("Native run cannot be rebound to another target.");
 					return {
@@ -3655,7 +3482,8 @@ async function createNativeRuns({ project, stateRoot, threadId, nativeCwd = proj
 						skill: binding.skill,
 						invocationId: binding.invocationId,
 						scope,
-						outcome
+						outcome,
+						definitionRevision: binding.definitionRevision
 					}) : void 0;
 				} catch (error) {
 					return committedRecovery(error);
@@ -4318,9 +4146,7 @@ function createCompanionMainContext({ project, reviews, knowledge }) {
 	async function matches(input, captured) {
 		return !!input && input.projectId === projectId && input.kitContentHash === captured.input.kitContentHash && typeof input.assessedCheckpoint === "string" && /^[a-f0-9]{40}(?:[a-f0-9]{24})?$/.test(input.assessedCheckpoint) && await project.store.sameDesignEvidenceAt(input.assessedCheckpoint, captured.input.assessedCheckpoint);
 	}
-	async function currentAssessment(captured) {
-		await guardRecords();
-		const authority = await readDesignClarityAuthority(root, projectId);
+	async function assessmentState(captured, authority) {
 		const current = !!authority && designClarityInputMatches(authority.report, {
 			kit: captured.kit.name,
 			version: captured.kit.version,
@@ -4335,7 +4161,8 @@ function createCompanionMainContext({ project, reviews, knowledge }) {
 	}
 	async function context({ includeKnowledge = true } = {}) {
 		const captured = await capture();
-		const clarity = await currentAssessment(captured);
+		await guardRecords();
+		const clarity = await assessmentState(captured, await readCommittedDesignClarityAuthority(projectRoot, projectId));
 		const status = includeKnowledge && knowledge ? await knowledge.status().catch(() => ({ state: "unavailable" })) : void 0;
 		return {
 			project: projectId,
@@ -4357,8 +4184,12 @@ function createCompanionMainContext({ project, reviews, knowledge }) {
 		input: async () => (await capture()).input,
 		context,
 		async notification(saved) {
-			if (saved?.commit && !await project.store.sameDesignEvidenceAt(saved.commit, await project.store.head())) return "Newer Design evidence exists. Read design_main_context for the current saved context.";
-			return "The saved files are durable. Read design_main_context and update U/S/T when useful for the agreed scope. Assessment, KAG and GRA do not block continuing the authorized task.";
+			return [
+				saved?.commit && !await project.store.sameDesignEvidenceAt(saved.commit, await project.store.head()) ? "Newer Design evidence exists." : "The saved files are durable.",
+				"Read design_main_context for the current saved evidence, assessment and report input.",
+				DESIGN_PANEL_SAVE_ASSESSMENT_GUIDANCE,
+				"Assessment, KAG and GRA do not block independently authorized Design work."
+			].join(" ");
 		},
 		async report({ input, ...value }) {
 			const assessment = parseDesignClarityInput(value);
@@ -4372,7 +4203,8 @@ function createCompanionMainContext({ project, reviews, knowledge }) {
 				const captured = await capture();
 				if (!await matches(input, captured)) throw new Error("Clarity input is no longer current. Read design_main_context and assess the current project, Kit and Design evidence.");
 				const digest = designClarityDigest(assessment, captured.kit.name, captured.kit.version);
-				const prior = await currentAssessment(captured);
+				await guardRecords();
+				const prior = await assessmentState(captured, await readDesignClarityAuthority(root, projectId));
 				const replayed = !prior.needsReassessment && prior.assessment.digest === digest;
 				const report = replayed ? prior.assessment : parseDesignClarityReported({
 					...assessment,
@@ -4773,7 +4605,7 @@ function createNativeHookTransport({ host, label, noticeFile, inspectProcess, na
 	const resumeRetentionMs = 864e5;
 	const marker = `design-system-${prefix}-hook:`;
 	const defaultRoot = () => join(homedir(), ".local/state/design-system", `${prefix}-hooks`);
-	const windowsStorage = process.platform === "win32" ? import("./windows-private-storage-_g0Kdp0U.mjs") : void 0;
+	const windowsStorage = process.platform === "win32" ? import("./windows-private-storage-Q0cTolE3.mjs") : void 0;
 	async function assertPrivate(path, stat) {
 		if (windowsStorage) {
 			const checked = await (await windowsStorage).assertWindowsPrivate(path);
@@ -5165,7 +4997,7 @@ async function createDesktopInputConnection({ sessionId, nativeCwd, request, ver
 }
 async function createQwenWorkDesktopInput(options) {
 	if (process.platform !== "win32" || !process.env.APPDATA) throw Error("Native Windows QwenWork desktop input required.");
-	const { assertWindowsPrivate } = await import("./windows-private-storage-_g0Kdp0U.mjs");
+	const { assertWindowsPrivate } = await import("./windows-private-storage-Q0cTolE3.mjs");
 	const root = join(process.env.APPDATA, "QwenWorkCN");
 	const endpointFile = join(root, "cli-control/endpoint.json");
 	await assertWindowsPrivate(endpointFile);
@@ -5233,6 +5065,226 @@ async function createQwenWorkDesktopInput(options) {
 	}
 }
 //#endregion
+//#region packages/companion/src/studio-conversation.mjs
+/** Studio target metadata only. Source, candidate and save authority stay in S2. */
+const object = (value, keys) => value && typeof value === "object" && !Array.isArray(value) && Object.keys(value).every((key) => keys.includes(key));
+const identity = (value) => typeof value === "string" && /^[\w.-]{1,128}$/.test(value);
+const samePin = (a, b) => a?.name === b?.name && a?.version === b?.version;
+const changed = () => Object.assign(Error("Studio connection or working copy changed. Reopen its current binding; your unsent message is preserved."), { code: "STUDIO_BINDING_CHANGED" });
+function studioConversationTarget(value) {
+	if (!object(value, [
+		"bindingId",
+		"threadId",
+		"id",
+		"expectedRevision",
+		"bundle"
+	]) || !identity(value.bindingId) || !identity(value.threadId) || !identity(value.id) || !Number.isSafeInteger(value.expectedRevision) || value.expectedRevision < 0) throw Error("Invalid Studio conversation target.");
+	if (value.bundle !== void 0 && (!object(value.bundle, ["name", "version"]) || !/^[a-z][a-z0-9_]*$/.test(value.bundle.name) || typeof value.bundle.version !== "string" || !/^\d+\.\d+$/.test(value.bundle.version))) throw Error("Invalid Studio preview Bundle pin.");
+	return Object.freeze({
+		bindingId: value.bindingId,
+		threadId: value.threadId,
+		id: value.id,
+		expectedRevision: value.expectedRevision,
+		...value.bundle === void 0 ? {} : { bundle: Object.freeze({
+			name: value.bundle.name,
+			version: value.bundle.version
+		}) }
+	});
+}
+/** Editing hints only; source scope and candidate identity remain the exact target. */
+function studioEditingContext(value) {
+	if (value === void 0) return void 0;
+	if (!object(value, ["intent", "currentFile"]) || !["create", "edit"].includes(value.intent) || value.currentFile !== void 0 && (typeof value.currentFile !== "string" || !value.currentFile || value.currentFile.length > 1024)) throw Error("Invalid Studio editing context.");
+	return Object.freeze({
+		intent: value.intent,
+		...value.currentFile === void 0 ? {} : { currentFile: value.currentFile }
+	});
+}
+/** Read the exact copy in the existing service; never resolve a latest object. */
+async function readStudioConversationTarget({ target, binding, readInstance, context }) {
+	const selected = studioConversationTarget(target);
+	const editing = studioEditingContext(context);
+	if (selected.bindingId !== binding.bindingId || selected.threadId !== binding.threadId) throw changed();
+	const record = await readInstance({ id: selected.id });
+	if (record?.id !== selected.id || record.revision !== selected.expectedRevision || record.deletedAt || !["kit", "bundle"].includes(record.kind)) throw changed();
+	if (selected.bundle && !(record.kind === "bundle" ? samePin(selected.bundle, record.bundle ?? record.source?.bundle) : record.mounts?.some((mount) => samePin(selected.bundle, mount.bundle)))) throw changed();
+	if (editing?.currentFile && !record.files?.some((file) => file.path === editing.currentFile)) throw changed();
+	return {
+		...selected,
+		kind: record.kind,
+		title: record.title,
+		...editing ? { context: editing } : {}
+	};
+}
+//#endregion
+//#region packages/companion/src/studio-conversation-requests.mjs
+/** Bounded, service-lifetime correlation of conversation requests with exact S2 receipts. */
+function createStudioConversationRequests({ binding, readInstance, prepareChanges }) {
+	const entries = /* @__PURE__ */ new Map();
+	const maximumBytes = 25165824, maximumRequests = 16;
+	let closed = false;
+	const requireOpen = () => {
+		if (closed) throw Error("Studio conversation service is closed.");
+	};
+	const identity = (value) => typeof value === "string" && /^[\w.-]{1,128}$/.test(value);
+	const requireEntry = async (requestId, target) => {
+		requireOpen();
+		const selected = studioConversationTarget(target), entry = entries.get(requestId);
+		if (!entry) throw Error("Unknown Studio authoring request. Select the working copy and send a new request explicitly.");
+		if (JSON.stringify(selected) !== JSON.stringify(entry.studio)) throw Error("Studio request target changed. Reopen the current working copy; do not reuse this request.");
+		await readStudioConversationTarget({
+			target: selected,
+			binding,
+			readInstance
+		});
+		return entry;
+	};
+	const service = {
+		async register({ requestId, studio, context }) {
+			requireOpen();
+			if (!identity(requestId)) throw Error("An exact Studio request ID is required.");
+			const target = studioConversationTarget(studio);
+			const record = await readStudioConversationTarget({
+				target,
+				binding,
+				readInstance,
+				context
+			});
+			requireOpen();
+			if (entries.has(requestId)) throw Error("Studio request already submitted. Check the original conversation; do not resend.");
+			if (entries.size >= maximumRequests) throw Error("Studio request correlation limit reached. No pending or reviewed request was evicted; finish this service lifecycle before opening more requests.");
+			entries.set(requestId, {
+				studio: target,
+				kind: record.kind,
+				prepared: null,
+				bytes: 0
+			});
+			return record;
+		},
+		async prepare({ authoringRequestId, ...input }) {
+			if (!identity(authoringRequestId)) throw Error("An exact authoringRequestId is required.");
+			requireOpen();
+			const stored = entries.get(authoringRequestId);
+			if (!stored) throw Error("Unknown Studio authoring request; no candidate was associated.");
+			const request = normalizeStudioInstanceChanges(input);
+			if (request.id !== stored.studio.id || request.expectedRevision !== stored.studio.expectedRevision) throw Error("Candidate does not match the exact Studio request target or base revision.");
+			if (stored.studio.bundle && (stored.kind === "kit" || request.bundle !== void 0) && (request.bundle?.name !== stored.studio.bundle.name || request.bundle?.version !== stored.studio.bundle.version)) throw Error("Candidate preview Bundle does not match the exact Studio request pin.");
+			const entry = await requireEntry(authoringRequestId, stored.studio);
+			if (entry.prepared) {
+				if (JSON.stringify(entry.prepared.request) !== JSON.stringify(request)) throw Error("This Studio request already has a different candidate source request. Send a new explicit request for another proposal.");
+				return structuredClone(entry.prepared.candidate);
+			}
+			const requestKey = createHash("sha256").update(JSON.stringify(request)).digest("hex");
+			if (entry.pending && entry.pending.requestKey !== requestKey) throw Error("This Studio request already has a different candidate source request. Send a new explicit request for another proposal.");
+			if (!entry.pending) entry.pending = {
+				requestKey,
+				promise: (async () => {
+					const candidate = await prepareChanges(request);
+					await requireEntry(authoringRequestId, entry.studio);
+					if (candidate?.id !== request.id || candidate.baseRevision !== request.expectedRevision || candidate.revision !== request.expectedRevision + 1 || !/^[a-f0-9]{64}$/.test(candidate.digest) || candidate.preview && candidate.preview.revision !== candidate.revision) throw Error("S2 returned a mismatched candidate receipt.");
+					const prepared = structuredClone({
+						request,
+						candidate
+					}), bytes = Buffer.byteLength(JSON.stringify(prepared));
+					if (bytes + [...entries.values()].reduce((n, item) => n + (item === entry ? 0 : item.bytes), 0) > maximumBytes) throw Error("Studio candidate correlation exceeds its 24 MiB memory budget.");
+					entry.prepared = prepared;
+					entry.bytes = bytes;
+					return candidate;
+				})()
+			};
+			try {
+				return structuredClone(await entry.pending.promise);
+			} finally {
+				entry.pending = void 0;
+			}
+		},
+		/** An authoring purpose, not proof of caller identity. Original RPC auth owns access. */
+		async prepareForConversation(input) {
+			requireOpen();
+			if (!input || Object.keys(input).some((key) => ![
+				"id",
+				"expectedRevision",
+				"changes",
+				"bundle",
+				"sampleSource"
+			].includes(key))) throw Error("Invalid Studio authoring preparation request.");
+			const request = normalizeStudioInstanceChanges(input);
+			const record = await readInstance({ id: request.id });
+			const bundle = request.bundle ?? (record?.kind === "bundle" ? record.bundle ?? record.source?.bundle : void 0);
+			const studio = studioConversationTarget({
+				...binding,
+				id: request.id,
+				expectedRevision: request.expectedRevision,
+				...bundle ? { bundle } : {}
+			});
+			await readStudioConversationTarget({
+				target: studio,
+				binding,
+				readInstance
+			});
+			requireOpen();
+			const key = createHash("sha256").update(JSON.stringify({
+				studio,
+				request
+			})).digest("hex");
+			let pair = [...entries].find(([, entry]) => entry.conversationRequestKey === key);
+			if (!pair) {
+				if (entries.size >= maximumRequests) throw Error("Studio request correlation limit reached. No pending or reviewed request was evicted; finish this service lifecycle before opening more requests.");
+				const requestId = `host-${randomUUID()}`;
+				const entry = {
+					studio,
+					kind: record.kind,
+					prepared: null,
+					bytes: 0,
+					conversationRequestKey: key
+				};
+				entries.set(requestId, entry);
+				pair = [requestId, entry];
+			}
+			const [requestId, entry] = pair;
+			return {
+				...await service.prepare({
+					...request,
+					authoringRequestId: requestId
+				}),
+				authoring: {
+					requestId,
+					studio: structuredClone(entry.studio)
+				}
+			};
+		},
+		async list({ studio }) {
+			requireOpen();
+			const selected = studioConversationTarget(studio);
+			await readStudioConversationTarget({
+				target: selected,
+				binding,
+				readInstance
+			});
+			requireOpen();
+			return { candidates: [...entries].filter(([, entry]) => entry.prepared && JSON.stringify(entry.studio) === JSON.stringify(selected)).map(([requestId, entry]) => ({
+				requestId,
+				studio: structuredClone(entry.studio),
+				digest: entry.prepared.candidate.digest,
+				changedFiles: entry.prepared.candidate.diff.map((file) => file.path)
+			})) };
+		},
+		async read({ requestId, studio }) {
+			const entry = await requireEntry(requestId, studio);
+			return structuredClone({
+				requestId,
+				studio: entry.studio,
+				prepared: entry.prepared
+			});
+		},
+		close() {
+			closed = true;
+			entries.clear();
+		}
+	};
+	return service;
+}
+//#endregion
 //#region packages/companion/src/static-asset-request.mjs
 const MIME_TYPES = Object.freeze({
 	".html": "text/html",
@@ -5292,7 +5344,6 @@ const browserMethods = /* @__PURE__ */ new Set([
 	"readSettings",
 	"readReviewPolicy",
 	"savePanel",
-	"observePanelDraft",
 	"retainAutoPanel",
 	"sendPrompt",
 	"decideAdvisory",
@@ -5310,38 +5361,27 @@ const browserMethods = /* @__PURE__ */ new Set([
 	"studioInstanceList",
 	"studioInstanceRead",
 	"studioInstanceCopy",
+	"studioInstanceEditCurrent",
+	"studioInstanceCreate",
 	"studioInstanceRename",
+	"studioInstanceImportSources",
 	"studioInstanceRemove",
 	"studioInstanceFile",
 	"studioInstanceSave",
 	"studioInstancePreview",
 	"studioInstanceMounts",
+	"studioInstancePrepareChanges",
+	"studioInstanceSaveChanges",
+	"studioAuthoringCandidateList",
+	"studioAuthoringCandidateRead",
 	"studioTrialAvailability",
 	"studioTrialStart",
 	"studioTrialList",
 	"studioTrialRead",
 	"studioTrialStop",
 	"studioTrialRemove",
-	"studioDraftList",
-	"studioDraftRead",
-	"studioDraftPreview",
-	"studioDraftCreate",
-	"studioDraftSave",
-	"studioDraftConfirm",
-	"studioDraftFork",
-	"studioKitDraftList",
-	"studioKitDraftRead",
-	"studioKitDraftValidate",
-	"studioKitDraftPreview",
-	"studioKitDraftCreate",
-	"studioKitDraftSave",
-	"studioKitDraftConfirm",
-	"studioKitDraftFork",
 	"studioContentExport",
-	"studioContentImport",
-	"studioContentImportRead",
-	"studioContentImportList",
-	"studioContentImportAdopt"
+	"studioContentReadArchive"
 ]);
 function browserRequestAllowed(headers, origin) {
 	return headers.origin === origin && headers["x-design-browser"] === "1" && (headers["sec-fetch-site"] === void 0 || headers["sec-fetch-site"] === "same-origin") && /^application\/json(?:\s*;|\s*$)/i.test(headers["content-type"] ?? "");
@@ -5478,7 +5518,7 @@ function loadPackagedCssAssets(packageRoot, prefix) {
 	const root = realpathSync(packageRoot);
 	const folder = `css-assets/${prefix.split("/")[2]}`;
 	const manifestBytes = ownedRead(root, `${folder}/manifest.json`, 262144);
-	const manifest = JSON.parse(new TextDecoder$1("utf-8", { fatal: true }).decode(manifestBytes));
+	const manifest = JSON.parse(new TextDecoder("utf-8", { fatal: true }).decode(manifestBytes));
 	if (manifest?.schema !== "design-system-css-assets-v1" || manifest.prefix !== prefix || !Array.isArray(manifest.assets) || manifest.assets.length > 512) throw Error("Invalid packaged CSS asset manifest");
 	const seen = /* @__PURE__ */ new Set(), assets = [];
 	let total = 0;
@@ -5509,51 +5549,6 @@ function loadPackagedCssAssets(packageRoot, prefix) {
 	};
 }
 //#endregion
-//#region packages/companion/src/content-import-legacy.mjs
-/** Reuse Core's legacy migration before comparing immutable imported content. */
-/** Caller owns stagingRoot and removes it on both success and failure. */
-async function normalizeLegacyKitImport(staged, { stagingRoot, sourceId }) {
-	const legacy = staged.find((unit) => unit.kind === "kit" && !unit.files.some((file) => file.path === "kit.yaml"));
-	if (!legacy) return staged;
-	if (staged.length !== 1) throw new Error("Legacy Kit import must contain one complete Kit unit.");
-	const migrationRoot = await mkdtemp(join(stagingRoot, "legacy-normalization-"));
-	const kit = await new DesignContentStore(migrationRoot).retainKitClosure(legacy.rootDir, { sourceId });
-	if (kit.name !== legacy.pin.name || String(kit.version) !== legacy.pin.version) throw new Error("Legacy Kit identity changed during normalization.");
-	let count = 0, total = 0;
-	const capture = async (kind, pin, rootDir) => {
-		const files = [];
-		const walk = async (directory) => {
-			for (const entry of (await readdir(directory, { withFileTypes: true })).sort((a, b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0)) {
-				const path = join(directory, entry.name);
-				if (entry.isDirectory()) await walk(path);
-				else if (entry.isFile()) {
-					const bytes = await readFile(path);
-					if (++count > 4096 || (total += bytes.length) > 16777216) throw new Error("Normalized content exceeds bounded archive limits.");
-					files.push({
-						path: relative(rootDir, path).split(sep).join("/"),
-						base64: bytes.toString("base64"),
-						bytes: bytes.length,
-						sha256: createHash("sha256").update(bytes).digest("hex")
-					});
-				} else throw new Error("Normalized imported content must contain only regular files.");
-			}
-		};
-		await walk(rootDir);
-		return {
-			kind,
-			pin,
-			rootDir,
-			files
-		};
-	};
-	const normalized = [await capture("kit", legacy.pin, kit.sourceRoot)];
-	for (const skill of kit.skills) normalized.push(await capture("bundle", {
-		name: skill.catalogName ?? skill.name,
-		version: String(skill.version)
-	}, skill.resourceRoot));
-	return normalized;
-}
-//#endregion
 //#region packages/companion/src/content-library.mjs
 /** Companion adapter over the shared Core content authority, not a second store. */
 const SOURCE_ID = "companion:explicit-kit";
@@ -5574,16 +5569,16 @@ function assertCompanionKitContributions(target, installed) {
 	});
 	const key = (contribution) => JSON.stringify(contribution);
 	const available = new Set(contributions(installed).map(key));
-	for (const contribution of contributions(target)) if (!available.has(key(contribution))) throw new Error(`Install and verify the required Host ${contribution.kind} contribution ${contribution.id} for Bundle authority ${contribution.authority} before selecting or upgrading this Kit.`);
+	for (const contribution of contributions(target)) if (!available.has(key(contribution))) throw new Error(`Install and verify the required Host ${contribution.kind} contribution ${contribution.id} for Bundle authority ${contribution.authority} before selecting this Kit.`);
 }
 /** Sources are host-selected; authored manifests cannot grant installation trust. */
 function createCompanionContentLibrary({ fs, kitRoot, stateRoot, trustedContentSources }) {
 	const store = new DesignContentStore(stateRoot);
 	let installed;
+	let studio;
 	const loadInstalled = async () => {
 		const location = await resolveDesignKitPackage(fs, kitRoot) ?? kitRoot;
 		const ownedRoot = typeof location === "string" ? location : location.rootDir;
-		if (await fs.readText(typeof location === "string" ? join(ownedRoot, "kit.yaml") : location.manifestPath ?? join(ownedRoot, "kit.yaml")) === void 0) return loadDesignKit(fs, location, { sourceId: SOURCE_ID });
 		const bundleRoot = typeof location !== "string" && location.bundlesDir ? location.bundlesDir : join(dirname(dirname(ownedRoot)), "bundles");
 		const resolveBundle = trustedContentSources ? async (pin) => {
 			const source = trustedContentSources.bundles.find((entry) => entry.name === pin.name && entry.version === pin.version);
@@ -5592,25 +5587,11 @@ function createCompanionContentLibrary({ fs, kitRoot, stateRoot, trustedContentS
 			rootDir: bundleRoot,
 			sourceId: SOURCE_ID
 		}]);
-		return store.retainKitClosure(location, {
+		return loadDesignKit(fs, location, {
 			sourceId: trustedContentSources?.sourceId ?? SOURCE_ID,
 			resolveBundle
 		});
 	};
-	const sameFiles = async (root, files) => {
-		const actual = /* @__PURE__ */ new Map();
-		const walk = async (dir) => {
-			for (const entry of await readdir(dir, { withFileTypes: true })) {
-				const path = join(dir, entry.name);
-				if (entry.isSymbolicLink()) throw new Error("Retained content contains a symlink.");
-				if (entry.isDirectory()) await walk(path);
-				else if (entry.isFile()) actual.set(relative(root, path).split(sep).join("/"), await readFile(path));
-				else throw new Error("Retained content contains a non-regular resource.");
-			}
-		};
-		await walk(root);
-		return actual.size === files.length && files.every((file) => actual.get(file.path)?.equals(Buffer.from(file.base64, "base64")));
-	};
 	return {
 		store,
 		loadInstalled: () => installed ??= loadInstalled().catch((error) => {
@@ -5622,9 +5603,19 @@ function createCompanionContentLibrary({ fs, kitRoot, stateRoot, trustedContentS
 			installed = Promise.resolve(value);
 			return value;
 		},
+		/** The shared Studio store owns current library edits; projects take a copy. */
+		async studio() {
+			return studio ??= import("./studio-CS5TyoYn.mjs").then(({ createCompanionStudio }) => createCompanionStudio(() => this.loadInstalled(), kitRoot, stateRoot, this)).catch((error) => {
+				studio = void 0;
+				throw error;
+			});
+		},
+		async loadCurrentKit(pin) {
+			return (await this.studio()).loadCurrentKit(pin);
+		},
 		/** Discovery labels only: no Bundle loading, validation or immutable retention. */
 		async availableMindsetNames() {
-			const names = (await store.listKits()).map((pin) => pin.name);
+			const names = (await (await this.studio()).listInstances({ kind: "kit" })).flatMap((record) => record.kit ? [record.kit.name] : []);
 			const location = await resolveDesignKitPackage(fs, kitRoot) ?? kitRoot;
 			const sourceRoot = typeof location === "string" ? location : location.rootDir;
 			const path = typeof location === "string" ? join(location, "mindset.md") : location.mindsetPath;
@@ -5643,88 +5634,21 @@ function createCompanionContentLibrary({ fs, kitRoot, stateRoot, trustedContentS
 			}
 			return [...new Set(names)].sort();
 		},
-		/** One latest complete closure per catalog name, including explicitly adopted Kits. */
+		/** Current library identities; old retained definitions only seed old projects. */
 		async availableKits() {
-			const kits = [await this.loadInstalled(), ...(await Promise.all((await store.listKits()).map((pin) => store.loadRetainedKit(pin)))).filter(Boolean)];
-			return [...new Set(kits.map((kit) => kit.name))].map((name) => latestInstalledKit(kits, name));
+			const base = await this.loadInstalled();
+			const entries = /* @__PURE__ */ new Map([[base.name, base]]);
+			for (const record of await (await this.studio()).listInstances({ kind: "kit" })) if (record.kit) entries.set(record.kit.name, {
+				...record.kit,
+				description: record.description
+			});
+			return [...entries.values()];
 		},
-		/** New selection only; an existing project always resolves its retained exact pin. */
+		/** New selection only; existing projects read their own current source tree. */
 		async latestInstalled(name) {
 			const selectedName = name ?? (await this.loadInstalled()).name;
-			return (await this.availableKits()).find((kit) => kit.name === selectedName);
-		},
-		/** Prepared inert bytes only: staging is private and never runs dependency scripts. */
-		async adoptPrepared(prepared) {
-			if (!prepared.validation?.valid || !prepared.contents?.length) throw new Error("Only a validated content archive can be adopted.");
-			await mkdir(stateRoot, { recursive: true });
-			const staging = await mkdtemp(join(stateRoot, "content-import-"));
-			const sourceId = `import:${createHash("sha256").update(JSON.stringify(prepared.archive)).digest("hex")}`;
-			let staged = [];
-			let total = 0, count = 0;
-			try {
-				for (const [index, unit] of prepared.contents.entries()) {
-					const rootDir = join(staging, String(index));
-					await mkdir(rootDir);
-					for (const file of unit.files) {
-						if (typeof file.path !== "string" || /[\\:\u0000]/.test(file.path) || file.path.split("/").some((part) => !part || [
-							".",
-							"..",
-							".git",
-							"node_modules"
-						].includes(part))) throw new Error("Unsafe imported resource path.");
-						const target = resolve(rootDir, file.path), rel = relative(rootDir, target);
-						if (isAbsolute(rel) || rel.startsWith(`..${sep}`) || rel === "..") throw new Error("Imported resource escapes its content root.");
-						const bytes = Buffer.from(file.base64, "base64");
-						if (++count > 4096 || (total += bytes.length) > 16777216) throw new Error("Imported content exceeds bounded archive limits.");
-						await mkdir(dirname(target), { recursive: true });
-						await writeFile(target, bytes, {
-							flag: "wx",
-							mode: 384
-						});
-					}
-					staged.push({
-						...unit,
-						rootDir
-					});
-				}
-				staged = await normalizeLegacyKitImport(staged, {
-					stagingRoot: staging,
-					sourceId
-				});
-				const bundles = /* @__PURE__ */ new Map();
-				for (const unit of staged.filter((unit) => unit.kind === "bundle")) {
-					const existing = await store.resolveBundle(unit.pin);
-					if (existing && !await sameFiles(existing.resourceRoot, unit.files)) throw new Error("Imported Bundle conflicts with an existing exact version.");
-					const content = existing ?? await loadDesignBundle(fs, {
-						rootDir: unit.rootDir,
-						sourceId
-					}, unit.pin);
-					bundles.set(`${unit.pin.name}@${unit.pin.version}`, content);
-				}
-				const kit = staged.find((unit) => unit.kind === "kit");
-				if (kit) {
-					const existing = await store.loadRetainedKit(kit.pin);
-					if (existing && !await sameFiles(existing.sourceRoot, kit.files)) throw new Error("Imported Kit conflicts with an existing exact version.");
-					if (!existing) await store.retainKitClosure(kit.rootDir, {
-						sourceId,
-						resolveBundle: (pin) => bundles.get(`${pin.name}@${pin.version}`)
-					});
-				} else for (const unit of staged) {
-					const existing = await store.resolveBundle(unit.pin);
-					if (existing) {
-						if (!await sameFiles(existing.resourceRoot, unit.files)) throw new Error("Imported Bundle conflicts with an existing exact version.");
-					} else await store.retainBundle(unit.rootDir, { sourceId }, unit.pin);
-				}
-				return {
-					contents: staged.map(({ kind, pin }) => ({
-						kind,
-						pin
-					})),
-					executionGranted: false
-				};
-			} finally {
-				if ((await lstat(staging)).isDirectory()) await rm(staging, { recursive: true });
-			}
+			const pin = (await this.availableKits()).find((kit) => kit.name === selectedName);
+			return pin ? this.loadCurrentKit(pin) : void 0;
 		},
 		async resolveProject(pin) {
 			if (pin) {
@@ -6166,18 +6090,6 @@ const companionFs = {
 };
 const gitSpawn = nodeDesignProjectSpawn;
 async function openCompanionProject({ projectRoot, kitRoot, stateRoot, connection, getConnectionPath, statusEntryPath, trustedContentSources, workbuddyProducer = false, getMainAssessmentContext, nativeCwd, transcriptPath }) {
-	const adoptionGit = new GitVersioning(gitSpawn, projectRoot);
-	const recordAdoption = async (receipt, journalOwner) => {
-		const metadata = parseDesignProjectJson(await adoptionGit.readTextAt(receipt.checkpoint, "project.json"));
-		if (metadata.id !== receipt.projectId || !metadata.kit) throw new Error("Content adoption receipt/project mismatch.");
-		await recordProjectContentAdoption(new DesignJournalStorage(join(stateRoot, metadata.id)), journalOwner ?? `${connection.host ?? "codex"}:${connection.threadId}`, receipt, metadata.kit);
-	};
-	await new ProjectContentTransaction({
-		root: projectRoot,
-		spawn: gitSpawn,
-		mutate: (operation) => operation(),
-		record: recordAdoption
-	}).recover();
 	let project = await new DesignProjectManager().open(projectRoot);
 	const fs = companionFs;
 	const contentLibrary = createCompanionContentLibrary({
@@ -6186,9 +6098,13 @@ async function openCompanionProject({ projectRoot, kitRoot, stateRoot, connectio
 		stateRoot,
 		trustedContentSources
 	});
-	let kit = await contentLibrary.resolveProject(project.metadata.kit);
-	const definitionRevision = projectKitContentHash;
-	let kitRevision = definitionRevision(kit);
+	const readDefinition = async (metadata) => metadata.kit ? ensureProjectKit(projectRoot, { loadSource: () => contentLibrary.resolveExactProject(metadata.kit) }) : contentLibrary.loadInstalled().then((kit) => ({
+		kit,
+		revision: projectKitContentHash(kit)
+	}));
+	const initialDefinition = await readDefinition(project.metadata);
+	let kit = initialDefinition.kit;
+	let kitRevision = initialDefinition.revision;
 	let kitReload = {
 		status: "ready",
 		revision: kitRevision
@@ -6196,7 +6112,7 @@ async function openCompanionProject({ projectRoot, kitRoot, stateRoot, connectio
 	const accessFor = (pin) => !pin ? {
 		mode: "unconfigured",
 		writable: false
-	} : pin.name === kit.name && pin.version === kit.version ? {
+	} : pin.name === kit.name ? {
 		mode: "writable",
 		writable: true,
 		kit: { ...pin }
@@ -6208,15 +6124,16 @@ async function openCompanionProject({ projectRoot, kitRoot, stateRoot, connectio
 	let access = accessFor(project.metadata.kit);
 	const assertWritable = () => {
 		if (access.writable) return kit;
-		throw new Error(access.mode === "unconfigured" ? "No Kit is active. Select a mindset in the native Design command before starting Bundle work; this Panel can remain open." : `The pinned Kit ${access.kit.name}@${access.kit.version} is unavailable. Restore that exact Kit before editing. No implicit upgrade is allowed.`);
+		throw new Error(access.mode === "unconfigured" ? "No Kit is active. Select a mindset in the native Design command before starting Bundle work; this Panel can remain open." : `The project's Kit ${access.kit.name} is unavailable. Check its project-local definition files before editing.`);
 	};
 	const refreshAccess = async (displayOnly = false) => {
 		const manager = new DesignProjectManager();
 		const current = displayOnly ? await manager.readMetadata(projectRoot) : await manager.open(projectRoot);
 		if (current.metadata.id !== project.metadata.id) throw new Error("Project identity changed. Reopen the Companion explicitly.");
-		if (!sameProjectContentPin(current.metadata.kit, project.metadata.kit)) {
-			kit = await contentLibrary.resolveProject(current.metadata.kit);
-			kitRevision = definitionRevision(kit);
+		const resolved = await readDefinition(current.metadata);
+		if (resolved.revision !== kitRevision || !sameProjectContentPin(current.metadata.kit, project.metadata.kit)) {
+			kit = resolved.kit;
+			kitRevision = resolved.revision;
 			projection = void 0;
 			continuationCache = void 0;
 			publishedSnapshot = void 0;
@@ -6262,7 +6179,7 @@ async function openCompanionProject({ projectRoot, kitRoot, stateRoot, connectio
 	const requireSkill = (name) => {
 		assertWritable();
 		const skill = kit.skills.find((item) => item.name === name);
-		if (!skill) throw new Error("Unknown Bundle in the pinned Kit.");
+		if (!skill) throw new Error("Unknown Bundle in the project Kit.");
 		return skill;
 	};
 	const requireArtifact = (path) => {
@@ -6318,6 +6235,9 @@ async function openCompanionProject({ projectRoot, kitRoot, stateRoot, connectio
 		refreshAccess,
 		requireWritable,
 		contentLibrary,
+		get definitionRevision() {
+			return kitRevision;
+		},
 		mutateKnowledge: mutate,
 		mutateAssessment: mutate,
 		async readGit(params, signal) {
@@ -6333,57 +6253,15 @@ async function openCompanionProject({ projectRoot, kitRoot, stateRoot, connectio
 			signal?.throwIfAborted();
 			return result;
 		},
-		createContentMigration({ assertQuiescent, verifyNativeProducer }) {
-			return new ProjectContentMigration({
-				root: project.root,
-				stateRoot: join(stateRoot, project.metadata.id),
-				spawn: gitSpawn,
-				mutate,
-				journalOwner: journalId,
-				resolveKit: (pin) => contentLibrary.resolveExactProject(pin),
-				assertQuiescent,
-				verifyNativeProducer,
-				record: recordAdoption,
-				assertCompatible(target) {
-					assertCompanionKitContributions(target, kit);
-				},
-				async validate(target, files) {
-					for (const path of files.keys()) {
-						const canonical = /^design_files\/([^/]+)\/\1\.json$/u.exec(path);
-						if (canonical && !target.skills.some((skill) => skill.name === canonical[1])) throw new Error(`Upgrade cannot orphan saved canonical source ${path}.`);
-					}
-					for (const skill of target.skills) {
-						const bytes = files.get(`design_files/${skill.name}/${skill.name}.json`);
-						if (!bytes) continue;
-						const state = JSON.parse(Buffer.from(bytes).toString("utf8"));
-						const issues = await validateSkillDesign(skill, state, {
-							scopes: ["state"],
-							artifactText: async (path) => {
-								const bytes = files.get(`design_files/${path}`);
-								return bytes === void 0 ? void 0 : Buffer.from(bytes).toString("utf8");
-							}
-						});
-						if (issues.length) throw new Error(JSON.stringify(issues));
-					}
-				}
-			});
-		},
 		prepareAutoPanel: (request) => autoTickets.prepare(request),
 		submitAutoPanel: (request) => autoTickets.submit(request),
 		async reloadKit() {
 			return mutate(async () => {
 				try {
-					await contentLibrary.reloadInstalled();
-					const candidate = await contentLibrary.resolveProject(project.metadata.kit);
-					if (candidate.name !== kit.name || candidate.version !== kit.version) throw new Error("Kit identity/version changed. Reopen explicitly; content reload cannot upgrade the pinned Kit.");
-					const revision = definitionRevision(candidate);
-					const changed = revision !== kitRevision;
-					if (changed) {
-						kit = candidate;
-						kitRevision = revision;
-					}
+					const previous = kitRevision;
+					await refreshAccess();
 					kitReload = {
-						status: changed ? "updated" : "unchanged",
+						status: previous !== kitRevision ? "updated" : "unchanged",
 						revision: kitRevision
 					};
 				} catch (error) {
@@ -6409,7 +6287,7 @@ async function openCompanionProject({ projectRoot, kitRoot, stateRoot, connectio
 				skill: name,
 				projectRoot: project.root,
 				designFiles: project.designFilesRoot,
-				kitRoot,
+				kitRoot: kit.sourceRoot,
 				stateRoot,
 				cliEntry: statusEntryPath
 			});
@@ -6422,14 +6300,15 @@ async function openCompanionProject({ projectRoot, kitRoot, stateRoot, connectio
 				},
 				designFiles: project.designFilesRoot,
 				resources: skill.resourceRoot ?? join(kitRoot, "skills", name),
-				mindset: join(kit.sourceRoot ?? kitRoot, "mindset.md"),
+				mindset: kit.sourceLocation?.mindsetPath ?? join(kit.sourceRoot ?? kitRoot, "mindset.md"),
 				executionContract,
-				method: `${executionContract.instructions}\n\n# Version-pinned Bundle method (unaltered)\n\n${skill.content}`,
+				definitionRevision: kitRevision,
+				method: `${executionContract.instructions}\n\n# Current project Bundle method (unaltered)\n\n${skill.content}`,
 				host: `${connection.host ?? "codex"}-native`,
 				execution
 			};
 		},
-		async settleBundle({ skill: name, invocationId, scope = "completion", outcome }) {
+		async settleBundle({ skill: name, invocationId, scope = "completion", outcome, definitionRevision }) {
 			return mutate(async () => {
 				await requireWritable();
 				const skill = requireSkill(name);
@@ -6442,6 +6321,10 @@ async function openCompanionProject({ projectRoot, kitRoot, stateRoot, connectio
 					eventId: invocationId,
 					outcome
 				});
+				const checkDefinition = () => {
+					if (definitionRevision !== void 0 && definitionRevision !== kitRevision) throw new Error("The project Bundle definitions changed during this invocation. Re-read the current method and repair the existing files before starting another invocation.");
+				};
+				checkDefinition();
 				if (!["state", "completion"].includes(scope)) throw new Error("Invalid validation scope.");
 				const state = await store.read(name);
 				if (!state) throw new Error("Canonical Design JSON is missing.");
@@ -6460,6 +6343,8 @@ async function openCompanionProject({ projectRoot, kitRoot, stateRoot, connectio
 					handoff: scope === "state" ? skill.execution.handoff : "none",
 					outcome: scope === "state" ? "pause" : "complete"
 				};
+				await refreshAccess();
+				checkDefinition();
 				return store.write(name, state, {
 					origin: "agent",
 					artifacts,
@@ -6825,7 +6710,7 @@ async function openCompanionProject({ projectRoot, kitRoot, stateRoot, connectio
 				byteLength: bytes?.length ?? 0
 			};
 		},
-		async sendPrompt({ text, requestId, saved }) {
+		async sendPrompt({ text, requestId, saved, studio, verifyStudio }) {
 			await refreshAccess();
 			if (typeof text !== "string" || !text.trim()) throw new Error("Message is required.");
 			if (/^\/(?:yugoo|design)(?:\s|$)/u.test(text)) throw new Error("Project management commands are not connected in this first companion slice. Use the bound project.");
@@ -6833,7 +6718,7 @@ async function openCompanionProject({ projectRoot, kitRoot, stateRoot, connectio
 			const attempt = await savedContinuation.begin({
 				text,
 				requestId,
-				saved,
+				saved: studio ? [] : saved,
 				kitHash
 			});
 			if (attempt.prior) return attempt.prior;
@@ -6848,8 +6733,28 @@ async function openCompanionProject({ projectRoot, kitRoot, stateRoot, connectio
 				const assessment = getMainAssessmentContext && attempt.entries.length ? await getMainAssessmentContext(attempt.entries) : void 0;
 				await refreshAccess();
 				if (notificationKitHash() !== kitHash) throw Error("Project Kit changed before notification. Reopen the current project.");
+				if (studio) {
+					if (typeof verifyStudio !== "function") throw Error("Studio context must be verified by the bound service.");
+					await verifyStudio();
+				}
 				dispatched = true;
-				result = await connection.send([
+				const studioPrompt = studio ? [
+					"Studio Kit/Bundle customization in this exact main conversation. This request concerns reusable authoring source, not the running Design Project or its Design Files.",
+					`Working-copy target: ${JSON.stringify({
+						id: studio.id,
+						expectedRevision: studio.expectedRevision,
+						kind: studio.kind,
+						title: studio.title,
+						...studio.bundle ? { bundle: studio.bundle } : {}
+					})}. Read this exact copy with design_studio_customize before proposing changes; a changed revision or preview pin requires reopening, never guessing another target. For a Kit, include the exact selected preview Bundle pin only when this request has one. Kit-owned source authoring may omit it; never select a first or latest mount to fill an absent pin.`,
+					...studio.context ? [`Current editing intent: ${JSON.stringify(studio.context)}. This is editor focus, not additional file/save authority. Read the current saved file through the exact working-copy tools; preserve human edits and ask for clarification if their intended scope is unclear.`] : [],
+					"Read the installed design-bundle-creator skill for Bundle changes or design-kit-creator for Kit changes; use design-skill-creator when revising professional methods and output contracts. These are authoring methods; the working copy's SKILL.md describes execution of that Bundle and is not a substitute. Read relevant saved methods/contracts through the exact working-copy file list instead of guessing paths. For Panel/component changes, use design-component and design_list_panel_components to discover the actual installed vocabulary, then its exact name with reference=contract/docs/examples for parameters and guidance. If a required tool or authoring method is unavailable, report that limit rather than inventing APIs or component parameters.",
+					`Use design_studio_customize with action prepareChanges and top-level authoringRequestId ${JSON.stringify(attempt.requestId)} so the same S2 candidate can be reviewed in Studio. Preparation does not save. Save only when the user explicitly authorizes it, using the same request and digest through saveChanges. Do not publish, install, edit the running Design Files, launch a Bundle/GRA, or create another model/session.`,
+					...connectionPath ? [`Exact Companion connection file: ${JSON.stringify(connectionPath)}. Pass only this path to the tool; never read or expose its contents or choose a latest connection.`] : [],
+					"If the customization tool is unavailable in this host, report that limitation. Message acceptance is not proof that authoring or saving completed.",
+					text
+				] : void 0;
+				result = await connection.send(studioPrompt ? studioPrompt.join("\n\n") : [
 					`Design Project: ${project.metadata.name}\nDesign Files: ${project.designFilesRoot}\nKit: ${project.metadata.kit ? `${project.metadata.kit.name}@${project.metadata.kit.version}` : "not selected"}\nAccess: ${access.mode}`,
 					...!access.writable ? ["Select an available Kit for an unconfigured project, or restore the exact pinned Kit for recovery. Do not start Bundle generation or reviews until workspace access is writable."] : [],
 					connection.host === "workbuddy" && workbuddyProducer ? "WorkBuddy supports serial foreground native Producers through its yugoo Skill bootstrap/register/resume sequence. Follow the exact declared Bundle execution mode. Workers remain unsupported; GRA follows the shared execution choice, not Bundle placement. Do not launch replacement models." : connection.host === "workbuddy" ? "WorkBuddy adapter currently supports explicitly main-mode Bundles only. Native Producer/Worker execution is unavailable; do not launch replacements or change Bundle execution mode. Use the exact connection for main Bundle prepare/begin/finish and saved-state readback. GRA follows the separate shared execution choice." : connection.host === "qwenwork" ? "Follow the QwenWork native-execution reference for the declared foreground Bundle path and GRA. Read this exact connection's design_status.hostCapabilities and reviewPolicy; only current ready capability and an authorized dispatch reference permit a background launch." : "Use the Design Panel plugin native-execution reference for Bundle work: native Producer/Worker subagents, not DSH-only tool names. GRA is never a prerequisite for foreground design work.",
@@ -6857,7 +6762,7 @@ async function openCompanionProject({ projectRoot, kitRoot, stateRoot, connectio
 					...notes.map(([, note]) => note),
 					...assessment ? [assessment] : [],
 					...connectionPath ? [`Exact Companion connection file: ${JSON.stringify(connectionPath)}. Pass the path only; do not read, print, or copy its token or file contents. Never search for a latest/global connection.`, ...statusEntryPath ? [`If design_status is not available in this host, use the existing installed CLI: node ${JSON.stringify(statusEntryPath)} call --connection ${JSON.stringify(connectionPath)} --request /absolute/temporary-status-request.json. The temporary request must contain {"method":"readWorkspace","params":{}}; inspect reviews and reviewPolicy once. Do not install tools or scan unrelated connections.`] : []] : [],
-					...notes.length ? ["After this Panel save, read design_status once. Continue the authorized design task using the saved changes; assess U/S/T at a meaningful task boundary rather than before and after every intermediate revision. Complete planned edits before preparing a manual review batch. A due review is not an instruction to start another review or repeatedly ask for consent. Follow the native-execution reference and the user's execution choice; do not wait for background GRA, busy-poll, or automatically retry failed reviews."] : [],
+					...notes.length ? [...assessment ? [] : [DESIGN_PANEL_SAVE_ASSESSMENT_GUIDANCE], "After this Panel save, read design_status once. Complete planned edits before preparing a manual review batch. A due review is not an instruction to start another review or repeatedly ask for consent. Follow the native-execution reference and the user's execution choice; do not wait for background GRA, busy-poll, or automatically retry failed reviews."] : [],
 					"Read the current Design Files when this notification has no save diff (for example after restarting the companion). File bytes are authoritative; do not reapply already saved edits.",
 					text
 				].join("\n\n"), {
@@ -6885,7 +6790,7 @@ async function openCompanionProject({ projectRoot, kitRoot, stateRoot, connectio
 			await refreshAccess();
 			return {
 				mindset: access.writable ? kit.name : void 0,
-				mindsetMethod: access.writable ? join(kit.sourceRoot ?? kitRoot, "mindset.md") : void 0,
+				mindsetMethod: access.writable ? kit.sourceLocation?.mindsetPath ?? join(kit.sourceRoot ?? kitRoot, "mindset.md") : void 0,
 				skills: (access.writable ? kit.skills : []).map((skill) => ({
 					id: skill.name,
 					description: skill.description,
@@ -7661,7 +7566,7 @@ function createCompanionReviews({ project, stateRoot, threadId, host = "codex",
 		}));
 	};
 	const readClarity = async (workspace) => {
-		const authority = await readDesignClarityAuthority(recordsRoot, projectId);
+		const authority = await readCommittedDesignClarityAuthority(project.project.root, projectId);
 		if (!authority) return {
 			assessment: null,
 			needsReassessment: true
@@ -8227,912 +8132,6 @@ async function createCompanionSettings(stateRoot) {
 	};
 }
 //#endregion
-//#region packages/studio/src/composition.ts
-function pinKey(name, version) {
-	return `${name}\u0000${version}`;
-}
-function comparePins(left, right) {
-	if (left.name !== right.name) return left.name < right.name ? -1 : 1;
-	if (left.version === right.version) return 0;
-	return left.version < right.version ? -1 : 1;
-}
-/**
-* Derive the flat searchable Bundle catalog and reverse dependencies.
-* @param snapshot - authoritative Core-compiled installed catalog snapshot.
-* @returns a frozen derived catalog; identical Bundle pins are coalesced.
-*/
-function buildStudioCompositionCatalog(snapshot) {
-	const entries = /* @__PURE__ */ new Map();
-	const kits = [];
-	for (const bundle of snapshot.bundles ?? []) {
-		const key = pinKey(bundle.name, bundle.version);
-		if (entries.has(key)) throw new Error(`studio.duplicate_bundle: ${bundle.name}@${bundle.version}`);
-		entries.set(key, {
-			bundle,
-			usedBy: []
-		});
-	}
-	for (const kit of snapshot.kits) {
-		const kitPin = Object.freeze({
-			name: kit.name,
-			version: kit.version
-		});
-		kits.push(kitPin);
-		for (const bundle of kit.bundles) {
-			const key = pinKey(bundle.name, bundle.version);
-			const current = entries.get(key);
-			if (current === void 0 && snapshot.bundles !== void 0) throw new Error(`studio.missing_bundle: ${kit.name}@${kit.version} references ${bundle.name}@${bundle.version}`);
-			if (current === void 0) entries.set(key, {
-				bundle,
-				usedBy: [kitPin]
-			});
-			else current.usedBy.push(kitPin);
-		}
-	}
-	const bundles = [...entries.values()].map(({ bundle, usedBy }) => Object.freeze({
-		name: bundle.name,
-		version: bundle.version,
-		definition: bundle.definition,
-		usedBy: Object.freeze([...usedBy].sort(comparePins))
-	})).sort(comparePins);
-	return Object.freeze({
-		bundles: Object.freeze(bundles),
-		kits: Object.freeze(kits.sort(comparePins))
-	});
-}
-/**
-* Search Bundle name and description in deterministic catalog order.
-* @param catalog - derived flat catalog.
-* @param query - case-insensitive trimmed text; empty returns the full catalog.
-* @returns matching immutable catalog entries.
-*/
-function searchStudioBundles(catalog, query) {
-	const normalized = query.trim().toLowerCase();
-	if (normalized === "") return catalog.bundles;
-	return Object.freeze(catalog.bundles.filter((entry) => entry.name.toLowerCase().includes(normalized) || entry.definition.description.toLowerCase().includes(normalized) || Object.values(entry.definition.title ?? {}).some((text) => text.toLowerCase().includes(normalized)) || Object.values(entry.definition.pickerDescription ?? {}).some((text) => text.toLowerCase().includes(normalized))));
-}
-//#endregion
-//#region packages/studio/src/management.ts
-function utf8ByteLength$1(text) {
-	return new TextEncoder().encode(text).length;
-}
-/**
-* JSON-facing read-only Kit catalog and workspace inspection over the
-* authoritative Core-compiled catalog. The Studio never mutates installed
-* content: source files and the Design Core loader remain the only authorities.
-*/
-var StudioManagementService = class {
-	#catalog;
-	/** @param catalog - current authoritative installed Kit snapshot provider. */
-	constructor(catalog) {
-		this.#catalog = catalog;
-	}
-	/**
-	* Build a detached, frozen, JSON-only browser view.
-	* @param query - optional Bundle name/description search.
-	* @returns current published Kit pins and the searched Bundle catalog.
-	*/
-	async workspace(query = "") {
-		const snapshot = await this.#catalog.snapshot();
-		const composition = buildStudioCompositionCatalog(snapshot);
-		const normalizedQuery = query.trim();
-		const kits = Object.freeze(composition.kits.map((kit) => {
-			const definition = snapshot.kits.find((entry) => entry.name === kit.name && entry.version === kit.version).definition;
-			return Object.freeze({
-				name: kit.name,
-				version: kit.version,
-				...definition.description === void 0 ? {} : { description: definition.description },
-				...definition.pickerDescription ? { displayDescription: Object.freeze({ ...definition.pickerDescription }) } : {}
-			});
-		}));
-		const bundles = Object.freeze(searchStudioBundles(composition, normalizedQuery).map((bundle) => Object.freeze({
-			name: bundle.name,
-			version: bundle.version,
-			description: bundle.definition.description,
-			...bundle.definition.title ? { title: Object.freeze({ ...bundle.definition.title }) } : {},
-			...bundle.definition.pickerDescription ? { displayDescription: Object.freeze({ ...bundle.definition.pickerDescription }) } : {},
-			usedBy: Object.freeze(bundle.usedBy.map((kit) => Object.freeze({
-				name: kit.name,
-				version: kit.version
-			})))
-		})));
-		return Object.freeze({
-			query: normalizedQuery,
-			kits,
-			bundles
-		});
-	}
-	/**
-	* Read the Kit workspace view model for one exact installed Kit version.
-	*
-	* The view is JSON-only: the complete raw mindset.md source is exposed for
-	* reading, mounts carry exact version pins plus their reverse Kit
-	* references, and resources project only the paths the Core loader compiled
-	* into the version. No Core-compiled definition object crosses into the view.
-	* @param name - the Kit id.
-	* @param version - exact installed Kit version.
-	* @returns the frozen workspace view, or resolution diagnostics.
-	*/
-	async readKitWorkspace(name, version) {
-		const snapshot = await this.#catalog.snapshot();
-		const entry = snapshot.kits.find((kit) => kit.name === name && kit.version === version);
-		if (entry === void 0) {
-			const installed = snapshot.kits.filter((kit) => kit.name === name).map((kit) => kit.version);
-			if (installed.length === 0) return Object.freeze({ diagnostics: Object.freeze([Object.freeze({
-				code: "workspace.kit_missing",
-				message: `Kit ${JSON.stringify(name)} is not installed`,
-				subject: name
-			})]) });
-			return Object.freeze({ diagnostics: Object.freeze([Object.freeze({
-				code: "workspace.version_missing",
-				message: `Kit ${JSON.stringify(name)} version ${JSON.stringify(version)} is not installed; the installed versions are ${installed.map((candidate) => JSON.stringify(candidate)).join(", ")}`,
-				subject: version
-			})]) });
-		}
-		const definition = entry.definition;
-		const mounts = Object.freeze(entry.bundles.map((bundle) => Object.freeze({
-			name: bundle.name,
-			version: bundle.version,
-			description: bundle.definition.description,
-			...bundle.definition.title ? { title: Object.freeze({ ...bundle.definition.title }) } : {},
-			...bundle.definition.pickerDescription ? { displayDescription: Object.freeze({ ...bundle.definition.pickerDescription }) } : {},
-			mountedBy: Object.freeze(snapshot.kits.filter((kit) => kit.bundles.some((candidate) => candidate.name === bundle.name && candidate.version === bundle.version)).map((kit) => Object.freeze({
-				name: kit.name,
-				version: kit.version
-			})))
-		})));
-		const resources = Object.freeze(Object.entries(definition.resources).map(([path, content]) => Object.freeze({
-			path,
-			bytes: utf8ByteLength$1(content)
-		})).sort((left, right) => left.path < right.path ? -1 : left.path > right.path ? 1 : 0));
-		return Object.freeze({
-			workspace: Object.freeze({
-				name: entry.name,
-				version: entry.version,
-				description: definition.description ?? "",
-				...definition.pickerDescription ? { displayDescription: Object.freeze({ ...definition.pickerDescription }) } : {},
-				mindsetSource: definition.mindsetSource,
-				mounts,
-				resources,
-				relationVocabulary: Object.freeze({
-					schemaVersion: 1,
-					pin: definition.relationVocabulary?.revision ?? "legacy-unavailable",
-					relations: Object.freeze((definition.relationVocabulary?.relations ?? []).map((relation) => Object.freeze({
-						type: relation.type,
-						meaning: relation.meaning,
-						direction: relation.direction,
-						label: Object.freeze({ ...relation.label }),
-						description: Object.freeze({ ...relation.description }),
-						...relation.domain ? { domain: Object.freeze([...relation.domain]) } : {},
-						...relation.range ? { range: Object.freeze([...relation.range]) } : {},
-						...relation.inverse ? { inverse: relation.inverse } : {},
-						...relation.cardinality ? { cardinality: Object.freeze({ ...relation.cardinality }) } : {},
-						...relation.reasoning ? { reasoning: Object.freeze({ ...relation.reasoning }) } : {},
-						...relation.evidence ? { evidence: Object.freeze({ ...relation.evidence }) } : {}
-					})))
-				})
-			}),
-			diagnostics: Object.freeze([])
-		});
-	}
-};
-//#endregion
-//#region packages/studio/src/types.ts
-/**
-* Thrown by a Bundle source port when a file exists but is not decodable
-* UTF-8 text. The Studio surfaces binary content as an explicit diagnostic
-* instead of lossy-decoding it into a text viewer.
-*/
-var StudioBinaryContentError = class extends Error {
-	/** The path whose content is not UTF-8 text. */
-	path;
-	/** @param path - absolute path of the non-text file. */
-	constructor(path) {
-		super(`design studio: ${JSON.stringify(path)} is not UTF-8 text`);
-		this.name = "StudioBinaryContentError";
-		this.path = path;
-	}
-};
-//#endregion
-//#region packages/studio/src/bundle-source.ts
-/**
-* Read-only inspection of real Bundle source files.
-*
-* The Bundle content authority is the Kit source directory on disk. The read
-* model exposes the physical file tree, byte-exact text content, and the
-* loader-compiled manifest/schema/validation summaries with Panel
-* classification. Identity is reconciled against the host's Core-compiled
-* catalog by exact Kit and Bundle name+version; an ambiguous physical source
-* or a catalog/source disagreement fails loud instead of guessing. The Studio
-* never writes: traversal, `.git`, directories, and binary content are
-* rejected, and no mutation port exists.
-*/
-function diagnostic(code, message, subject) {
-	return Object.freeze([Object.freeze(subject === void 0 ? {
-		code,
-		message
-	} : {
-		code,
-		message,
-		subject
-	})]);
-}
-function jsonProject(value) {
-	if (typeof value !== "object" || value === null || Array.isArray(value)) return void 0;
-	return Object.freeze(JSON.parse(JSON.stringify(value)));
-}
-function utf8ByteLength(content) {
-	return new TextEncoder().encode(content).length;
-}
-/**
-* Split one relative file path into safe segments. Rejects absolute paths,
-* empty/`.`/`..`/`.git` segments, backslashes, and control characters.
-* @param path - candidate slash-separated relative path.
-* @returns the segments, or undefined when the shape is unsafe.
-*/
-function safeSegments(path) {
-	if (path === "" || path.startsWith("/") || path.endsWith("/") || path.includes("\\") || /[\u0000-\u001f\u007f]/u.test(path)) return;
-	const parts = path.split("/");
-	if (parts.some((part) => part === "" || part === "." || part === ".." || part === ".git")) return void 0;
-	return parts;
-}
-function panelOf(manifest) {
-	const presentation = manifest?.presentation;
-	if (typeof presentation !== "object" || presentation === null || Array.isArray(presentation)) return void 0;
-	const { mode, renderer } = presentation;
-	if (mode === "native") return Object.freeze(typeof renderer === "string" ? {
-		kind: "native",
-		renderer
-	} : { kind: "native" });
-	if (mode === "declarative") return Object.freeze({ kind: "declarative" });
-}
-function validationOf(skill) {
-	const document = skill.metadata?.validationDocument;
-	if (document === void 0 || !Array.isArray(document.rules)) return void 0;
-	const drivers = /* @__PURE__ */ new Set();
-	for (const rule of document.rules) if (typeof rule.check?.driver === "string") drivers.add(rule.check.driver);
-	return Object.freeze({
-		rules: document.rules.length,
-		drivers: Object.freeze([...drivers].sort())
-	});
-}
-/**
-* Read-only Bundle inspection over real Kit source files, reconciled against
-* the host's Core-compiled catalog. The injected port owns the physical
-* filesystem; this service owns resolution, path safety, identity
-* reconciliation, and the JSON-only read models.
-*/
-var StudioBundleSourceService = class {
-	#catalog;
-	#source;
-	/**
-	* @param catalog - current authoritative installed Kit snapshot provider.
-	* @param source - host-supplied read-only physical source operations.
-	*/
-	constructor(catalog, source) {
-		this.#catalog = catalog;
-		this.#source = source;
-	}
-	/**
-	* Read one Bundle's workspace: physical file tree, loader-compiled
-	* manifest/schema/validation summaries, and Panel classification.
-	* @param name - the Bundle id.
-	* @returns the workspace, or resolution/reconciliation diagnostics.
-	*/
-	async readBundleWorkspace(name, version) {
-		const resolved = await this.#resolve(name, version);
-		if ("diagnostics" in resolved) return resolved;
-		const { kitRoot, bundleRoot } = resolved;
-		let skill;
-		let kitName;
-		let kitVersion;
-		try {
-			if (resolved.skill) skill = resolved.skill;
-			else {
-				const kit = await loadStudioKit(this.#source, kitRoot);
-				const found = kit.skills.find((candidate) => candidate.name === name);
-				if (found === void 0) return Object.freeze({ diagnostics: diagnostic("bundle.not_in_catalog", `Bundle ${JSON.stringify(name)} is not referenced by the Mindset <design_skills> catalog`, name) });
-				skill = found;
-				kitName = kit.name;
-				kitVersion = String(kit.version);
-			}
-		} catch (error) {
-			return Object.freeze({ diagnostics: diagnostic("kit.load", error instanceof Error ? error.message : String(error), name) });
-		}
-		const bundleVersion = String(skill.version);
-		const catalogKit = (await this.#catalog.snapshot()).kits.find((kit) => kit.name === kitName && kit.version === kitVersion);
-		if (!resolved.skill && catalogKit === void 0) return Object.freeze({ diagnostics: diagnostic("studio.source_catalog_mismatch", `source Kit ${JSON.stringify(kitName)}@${JSON.stringify(kitVersion)} is not present in the compiled catalog`, name) });
-		if (!resolved.skill && !catalogKit?.bundles.some((bundle) => bundle.name === name && bundle.version === bundleVersion)) return Object.freeze({ diagnostics: diagnostic("studio.source_catalog_mismatch", `source Bundle ${JSON.stringify(name)}@${JSON.stringify(bundleVersion)} disagrees with the compiled catalog`, name) });
-		const files = [];
-		for (const path of await this.#source.listFiles(bundleRoot)) {
-			let content;
-			try {
-				content = await this.#source.readText(join(bundleRoot, path));
-			} catch (error) {
-				if (error instanceof StudioBinaryContentError) continue;
-				throw error;
-			}
-			if (content === void 0) continue;
-			files.push(Object.freeze({
-				path,
-				bytes: utf8ByteLength(content)
-			}));
-		}
-		const manifest = jsonProject(skill.metadata?.skillManifest);
-		const schema = jsonProject(skill.metadata?.schemaDocument);
-		const validation = validationOf(skill);
-		const panel = panelOf(manifest);
-		return Object.freeze({
-			workspace: Object.freeze({
-				name,
-				version: bundleVersion,
-				...kitName === void 0 ? {} : { kit: kitName },
-				description: skill.description,
-				...skill.pickerDescription ? { displayDescription: Object.freeze({ ...skill.pickerDescription }) } : {},
-				files: Object.freeze(files),
-				...manifest === void 0 ? {} : { manifest },
-				...schema === void 0 ? {} : { schema },
-				...validation === void 0 ? {} : { validation },
-				...panel === void 0 ? {} : { panel }
-			}),
-			diagnostics: Object.freeze([])
-		});
-	}
-	/**
-	* Read one complete Bundle file byte-exactly as UTF-8 text.
-	* @param input - Bundle id and Bundle-relative path.
-	* @returns the file content, or resolution diagnostics.
-	*/
-	async readBundleFile(input) {
-		const located = await this.#locate(input.name, input.path, input.version);
-		if ("diagnostics" in located) return located;
-		let content;
-		try {
-			content = await this.#source.readText(located.absolute);
-		} catch (error) {
-			if (error instanceof StudioBinaryContentError) return Object.freeze({ diagnostics: diagnostic("bundle_file.binary", `Bundle ${JSON.stringify(input.name)} file ${JSON.stringify(input.path)} is not UTF-8 text`, input.path) });
-			throw error;
-		}
-		if (content === void 0) return Object.freeze({ diagnostics: diagnostic("bundle_file.missing", `Bundle ${JSON.stringify(input.name)} has no file ${JSON.stringify(input.path)}`, input.path) });
-		return Object.freeze({
-			file: Object.freeze({
-				path: input.path,
-				content
-			}),
-			diagnostics: Object.freeze([])
-		});
-	}
-	/** Resolve one Bundle id to exactly one physical root; same-name multi-root fails loud. */
-	async #resolve(name, version) {
-		if (this.#source.resolveBundleRoot) {
-			const candidates = ((await this.#catalog.snapshot()).bundles ?? []).filter((bundle) => bundle.name === name && (version === void 0 || bundle.version === version));
-			if (candidates.length !== 1) return { diagnostics: diagnostic(candidates.length ? "studio.ambiguous_version" : "bundle.missing", `Select one registered exact version of Bundle ${JSON.stringify(name)}`, name) };
-			const selected = candidates[0];
-			const root = await this.#source.resolveBundleRoot({
-				name,
-				version: selected.version
-			});
-			if (!root) return { diagnostics: diagnostic("bundle.missing", `Missing retained source for ${name}@${selected.version}`, name) };
-			if ((selected.definition.catalogName ?? selected.definition.name) !== name || String(selected.definition.version) !== selected.version) return { diagnostics: diagnostic("studio.source_catalog_mismatch", "Independent Bundle definition disagrees with its exact pin", name) };
-			return {
-				bundleRoot: root,
-				skill: selected.definition
-			};
-		}
-		const matches = [];
-		for (const kitRoot of await this.#source.listKitRoots()) {
-			const root = resolve(kitRoot);
-			const bundleRoot = join(root, "skills", name);
-			if (await this.#source.isDirectory(bundleRoot)) matches.push({
-				kitRoot: root,
-				bundleRoot
-			});
-		}
-		if (matches.length === 0) return { diagnostics: diagnostic("bundle.missing", `no source Bundle named ${JSON.stringify(name)}`, name) };
-		if (matches.length > 1) return { diagnostics: diagnostic("studio.duplicate_source", `Bundle ${JSON.stringify(name)} exists in ${matches.length} configured Kit sources: ${matches.map((match) => JSON.stringify(match.bundleRoot)).join(", ")}`, name) };
-		const match = matches[0];
-		if (version !== void 0) try {
-			const kit = await loadStudioKit(this.#source, match.kitRoot);
-			const skill = kit.skills.find((candidate) => candidate.name === name);
-			if (skill === void 0 || String(skill.version) !== version) return { diagnostics: diagnostic("bundle.version_missing", `Source does not provide Bundle ${JSON.stringify(name)}@${JSON.stringify(version)}`, version) };
-			if (!(await this.#catalog.snapshot()).kits.find((candidate) => candidate.name === kit.name && candidate.version === String(kit.version))?.bundles.some((bundle) => bundle.name === name && bundle.version === version)) return { diagnostics: diagnostic("studio.source_catalog_mismatch", "Legacy source does not match the registered exact Bundle version", name) };
-		} catch (error) {
-			return { diagnostics: diagnostic("kit.load", error instanceof Error ? error.message : String(error), name) };
-		}
-		return match;
-	}
-	/** Resolve and path-check one Bundle file target against the physical file tree. */
-	async #locate(name, path, version) {
-		const resolved = await this.#resolve(name, version);
-		if ("diagnostics" in resolved) return resolved;
-		if (safeSegments(path) === void 0) return { diagnostics: diagnostic("bundle_file.path_forbidden", `path must stay inside the Bundle directory: ${JSON.stringify(path)}`, path) };
-		if (!(await this.#source.listFiles(resolved.bundleRoot)).includes(path)) return { diagnostics: diagnostic("bundle_file.missing", `Bundle ${JSON.stringify(name)} has no regular file ${JSON.stringify(path)}`, path) };
-		return { absolute: join(resolved.bundleRoot, path) };
-	}
-};
-//#endregion
-//#region packages/studio/src/snapshot.ts
-/**
-* Project one Core-compiled Kit into its version-addressed snapshot form.
-* @param kit - compiled Kit from the host catalog authority.
-* @returns the frozen snapshot entry retaining the definition by reference.
-*/
-function snapshotKit(kit) {
-	return Object.freeze({
-		name: kit.name,
-		version: String(kit.version),
-		definition: kit,
-		bundles: Object.freeze(kit.skills.map((skill) => Object.freeze({
-			name: skill.catalogName ?? skill.name,
-			version: String(skill.version),
-			definition: skill
-		})))
-	});
-}
-//#endregion
-//#region packages/companion/src/studio.mjs
-/** Thin read-only port for the existing Studio domain; no second catalog. */
-async function createCompanionStudio(kit, kitRoot, stateRoot, contentLibrary) {
-	const currentKit = () => typeof kit === "function" ? kit() : kit;
-	const root = await realpath(currentKit().sourceRoot ?? kitRoot);
-	let kitSnapshot, bundleSnapshot, catalogKit = currentKit();
-	const invalidateCatalog = () => {
-		kitSnapshot = void 0;
-		bundleSnapshot = void 0;
-	};
-	const checkCatalogKit = () => {
-		const selected = currentKit();
-		if (selected !== catalogKit) {
-			invalidateCatalog();
-			catalogKit = selected;
-		}
-	};
-	const installedKits = () => {
-		checkCatalogKit();
-		return kitSnapshot ??= (async () => {
-			const selected = currentKit(), entries = /* @__PURE__ */ new Map([[`${selected.name}@${selected.version}`, selected]]);
-			if (contentLibrary) for (const pin of await contentLibrary.store.listKits()) {
-				const retained = await contentLibrary.store.loadRetainedKit(pin);
-				if (retained) entries.set(`${pin.name}@${pin.version}`, retained);
-			}
-			return [...entries.values()];
-		})().catch((error) => {
-			kitSnapshot = void 0;
-			throw error;
-		});
-	};
-	const selectedKit = async (pin) => {
-		const selected = (await installedKits()).find((item) => item.name === pin.name && String(item.version) === pin.version);
-		if (!selected) throw new Error("Select the exact registered Kit version.");
-		return selected;
-	};
-	const installedBundles = () => {
-		checkCatalogKit();
-		return bundleSnapshot ??= readInstalledBundles().catch((error) => {
-			bundleSnapshot = void 0;
-			throw error;
-		});
-	};
-	const readInstalledBundles = async () => {
-		const entries = new Map(currentKit().skills.map((skill) => [`${skill.catalogName ?? skill.name}@${skill.version}`, skill]));
-		if (contentLibrary) for (const pin of await contentLibrary.store.listBundles()) {
-			const retained = await contentLibrary.store.resolveBundle(pin);
-			if (retained) entries.set(`${pin.name}@${pin.version}`, retained.skill);
-		}
-		return [...entries.values()];
-	};
-	const catalog = { snapshot: async () => {
-		if (!contentLibrary) invalidateCatalog();
-		return {
-			kits: (await installedKits()).map(snapshotKit),
-			bundles: (await installedBundles()).map((skill) => ({
-				name: skill.catalogName ?? skill.name,
-				version: String(skill.version),
-				definition: skill
-			}))
-		};
-	} };
-	const safe = async (path) => {
-		const owner = [
-			root,
-			...(await installedKits()).map((kit) => kit.sourceRoot).filter(Boolean),
-			...(await installedBundles()).map((skill) => skill.resourceRoot).filter(Boolean)
-		].find((base) => {
-			const rel = relative(base, resolve(path));
-			return !isAbsolute(rel) && rel !== ".." && !rel.startsWith(`..${sep}`);
-		});
-		if (!owner) throw new Error("Studio path outside registered content.");
-		const rel = relative(owner, resolve(path));
-		if (rel.split(sep).some((part) => [".git", "node_modules"].includes(part))) throw new Error("Studio path outside registered content.");
-		let current = owner;
-		for (const part of rel.split(sep).filter(Boolean)) {
-			current = join(current, part);
-			if ((await lstat(current)).isSymbolicLink()) throw new Error("Studio does not follow source symlinks.");
-		}
-		return current;
-	};
-	const source = {
-		listKitRoots: async () => [root],
-		resolveBundleRoot: async (pin) => (await installedBundles()).find((skill) => (skill.catalogName ?? skill.name) === pin.name && String(skill.version) === pin.version)?.resourceRoot,
-		readText: async (path) => {
-			try {
-				const file = await safe(path);
-				if (!(await lstat(file)).isFile()) throw new Error("Studio expects a regular file.");
-				const bytes = await readFile(file);
-				try {
-					const text = new TextDecoder("utf-8", { fatal: true }).decode(bytes);
-					if (text.includes("\0")) throw new Error("binary");
-					return text;
-				} catch {
-					throw new StudioBinaryContentError(path);
-				}
-			} catch (error) {
-				if (error.code === "ENOENT") return void 0;
-				throw error;
-			}
-		},
-		listDir: async (path) => {
-			try {
-				return (await readdir(await safe(path))).filter((name) => ![".git", "node_modules"].includes(name));
-			} catch (error) {
-				if (error.code === "ENOENT") return [];
-				throw error;
-			}
-		},
-		isDirectory: async (path) => {
-			try {
-				return (await lstat(await safe(path))).isDirectory();
-			} catch (error) {
-				if (error.code === "ENOENT") return false;
-				throw error;
-			}
-		},
-		listFiles: async (path) => {
-			const base = await safe(path), files = [];
-			const visit = async (dir) => {
-				for (const entry of await readdir(dir, { withFileTypes: true })) {
-					if ([".git", "node_modules"].includes(entry.name) || entry.isSymbolicLink()) continue;
-					const next = join(dir, entry.name);
-					if (entry.isDirectory()) await visit(next);
-					else if (entry.isFile()) files.push(relative(base, next).split(sep).join("/"));
-				}
-			};
-			await visit(base);
-			return files.sort();
-		}
-	};
-	const management = new StudioManagementService(catalog);
-	const bundles = new StudioBundleSourceService(catalog, source);
-	const previewInstalledPanel = async (input) => {
-		const diagnostic = (code, message) => ({ diagnostics: [{
-			code,
-			message
-		}] });
-		if (!input || !Number.isSafeInteger(input.revision) || input.revision < 0 || input.kit !== void 0 && (typeof input.kit?.name !== "string" || typeof input.kit?.version !== "string") || typeof input.bundle?.name !== "string" || typeof input.bundle?.version !== "string" || !/^[a-z][a-z0-9_]*$/.test(input.bundle.name) || input.sampleSource !== void 0 && typeof input.sampleSource !== "string") return diagnostic("preview.request", "Select exact Kit and Bundle pins and a non-negative preview revision.");
-		const kitPin = { ...input.kit }, bundlePin = { ...input.bundle }, revision = input.revision;
-		const requestedSample = input.sampleSource;
-		if (requestedSample !== void 0 && Buffer.byteLength(requestedSample) > 262144) return diagnostic("preview.size", "Sample JSON is limited to 256 KiB.");
-		try {
-			if (input.kit === void 0) {
-				const selected = (await installedBundles()).find((skill) => (skill.catalogName ?? skill.name) === bundlePin.name && String(skill.version) === bundlePin.version);
-				if (!selected) throw new Error("Select the exact registered Bundle version.");
-				const retained = contentLibrary ? await contentLibrary.store.resolveBundle(bundlePin) : void 0;
-				const base = retained?.resourceRoot ?? selected.resourceRoot;
-				if (!base) throw new Error("Independent Bundle source is unavailable.");
-				const { createStudioInstanceAdapters } = await import("./studio-instance-composition-ClAJ72-M.mjs");
-				const { composition } = createStudioInstanceAdapters({
-					listBundles: async () => [bundlePin],
-					captureKit: async () => {
-						throw new Error("Standalone preview has no Kit.");
-					},
-					captureBundle: async () => {
-						throw new Error("Standalone preview uses only its captured source.");
-					}
-				});
-				return composition.preview({
-					kind: "bundle",
-					bundle: bundlePin,
-					runtimeName: selected.name,
-					bundleFiles: await captureRegisteredTree(base),
-					sourceId: retained?.sourceId ?? "companion:explicit-kit",
-					revision,
-					...requestedSample === void 0 ? {} : { sampleSource: requestedSample }
-				});
-			}
-			const selected = await selectedKit(kitPin);
-			const root = selected.sourceRoot ?? kitRoot;
-			const locations = [];
-			for (const skill of selected.skills) {
-				const pin = {
-					name: skill.catalogName ?? skill.name,
-					version: String(skill.version)
-				};
-				const retained = contentLibrary ? await contentLibrary.store.resolveBundle(pin) : void 0;
-				locations.push({
-					...pin,
-					rootDir: retained?.resourceRoot ?? skill.resourceRoot ?? join(root, "skills", skill.name),
-					sourceId: retained?.sourceId ?? "companion:explicit-kit"
-				});
-			}
-			const loadOptions = {
-				sourceId: "companion:explicit-kit",
-				bundles: locations
-			};
-			const capturedRoots = [.../* @__PURE__ */ new Set([root, ...locations.map((location) => location.rootDir)])];
-			const files = [];
-			for (const base of capturedRoots) for (const path of await source.listFiles(base)) files.push({
-				base,
-				path
-			});
-			if (files.length > 4096) throw new Error("Installed preview source exceeds 4096 files.");
-			const texts = /* @__PURE__ */ new Map(), binary = /* @__PURE__ */ new Set(), directories = new Set(capturedRoots);
-			let bytes = 0;
-			for (const { base, path } of files) {
-				const absolute = join(base, path), info = await lstat(await safe(absolute));
-				bytes += info.size;
-				if (bytes > 16777216) throw new Error("Installed preview source exceeds 16 MiB.");
-				try {
-					const text = await source.readText(absolute);
-					if (text !== void 0) texts.set(absolute, text);
-					if (text !== void 0 && Buffer.byteLength(text) > info.size) {
-						bytes += Buffer.byteLength(text) - info.size;
-						if (bytes > 16777216) throw new Error("Installed preview source exceeds 16 MiB.");
-					}
-				} catch (error) {
-					if (error instanceof StudioBinaryContentError) binary.add(absolute);
-					else throw error;
-				}
-				const parts = path.split("/");
-				for (let count = 1; count < parts.length; count++) directories.add(join(base, ...parts.slice(0, count)));
-			}
-			const paths = /* @__PURE__ */ new Set([
-				...texts.keys(),
-				...binary,
-				...directories
-			]);
-			const installed = await loadStudioKit({
-				readText: async (path) => {
-					const key = resolve(path);
-					if (binary.has(key)) throw new StudioBinaryContentError(key);
-					return texts.get(key);
-				},
-				isDirectory: async (path) => directories.has(resolve(path)),
-				listDir: async (path) => {
-					const base = resolve(path);
-					return [...new Set([...paths].filter((key) => key !== base && relative(base, key).split(sep).length === 1 && !relative(base, key).startsWith("..")).map((key) => relative(base, key)))].sort();
-				}
-			}, root, loadOptions);
-			if (installed.name !== kitPin.name || String(installed.version) !== kitPin.version) return diagnostic("preview.kit_pin", "Source does not match the selected Kit version.");
-			const bundle = installed.skills.find((entry) => (entry.catalogName ?? entry.name) === bundlePin.name && String(entry.version) === bundlePin.version);
-			if (!bundle) return diagnostic("preview.bundle_pin", "Source does not match the selected Bundle version.");
-			if (typeof bundle.metadata?.panelYaml !== "string") return diagnostic("preview.not_declarative", "This Bundle has no declarative Panel preview.");
-			const bundleRoot = bundle.resourceRoot ?? join(root, "skills", bundle.name);
-			const panelSource = texts.get(join(bundleRoot, "panel.yaml"));
-			if (panelSource === void 0) return diagnostic("preview.definition", "Panel source is missing.");
-			if (Buffer.byteLength(panelSource) > 1048576) return diagnostic("preview.size", "Panel source is limited to 1 MiB and sample JSON to 256 KiB.");
-			const initial = bundle.metadata.panelManifest?.initial_values;
-			const example = texts.get(join(bundleRoot, "reference", "preview.json"));
-			if (requestedSample === void 0 && example === void 0 && initial === void 0) return diagnostic("preview.sample_missing", "No preview sample is provided. Add reference/preview.json to this Bundle or supply isolated sample JSON.");
-			const sampleSource = requestedSample ?? example ?? JSON.stringify(initial);
-			return finalizeStudioPanelPreview({
-				compiled: bundle,
-				kit: kitPin,
-				bundle: bundlePin,
-				revision,
-				sampleSource
-			});
-		} catch (error) {
-			return diagnostic("preview.definition", error instanceof Error ? error.message : String(error));
-		}
-	};
-	const hasBundle = async (name) => (await installedBundles()).some((skill) => (skill.catalogName ?? skill.name) === name);
-	const unknownBundle = (name) => ({ diagnostics: [{
-		code: "bundle.missing",
-		message: "Select an installed Bundle by its exact name.",
-		subject: String(name)
-	}] });
-	let draftService;
-	const drafts = () => {
-		if (!stateRoot) throw new Error("Studio authoring storage is not configured.");
-		return draftService ??= createStudioPanelDrafts({
-			stateRoot,
-			kitRoot: root,
-			readInstalledKit: currentKit,
-			readInstalledBundle: (pin) => contentLibrary?.store.resolveBundle(pin)
-		});
-	};
-	let kitDraftService;
-	let kitDraftPorts;
-	const kitPorts = () => {
-		if (!stateRoot) throw new Error("Studio authoring storage is not configured.");
-		return kitDraftPorts ??= createStudioDraftPorts({
-			stateRoot,
-			kitRoot: root,
-			readInstalledKit: currentKit,
-			readInstalledBundle: (pin) => contentLibrary?.store.resolveBundle(pin)
-		}, "kit");
-	};
-	const kitDrafts = () => {
-		return kitDraftService ??= kitPorts().then(({ repository, sources }) => new StudioKitDraftService(repository, sources));
-	};
-	let contentArchiveService;
-	let instanceService;
-	const captureRegisteredTree = async (base) => {
-		const paths = await source.listFiles(base);
-		if (paths.length > 4096) throw new Error("Content snapshot exceeds 4096 files.");
-		const entries = [];
-		let total = 0;
-		for (const path of paths) {
-			const file = await safe(join(base, path)), info = await lstat(file);
-			if (!info.isFile() || total + info.size > 16777216) throw new Error("Content snapshot exceeds 16 MiB or contains an invalid file.");
-			const bytes = await readFile(file);
-			total += bytes.length;
-			if (total > 16777216) throw new Error("Content snapshot exceeds 16 MiB.");
-			entries.push({
-				path,
-				base64: bytes.toString("base64")
-			});
-		}
-		return entries;
-	};
-	const instances = () => {
-		if (!stateRoot) throw new Error("Studio authoring storage is not configured.");
-		return instanceService ??= Promise.all([import("./studio-instances-DKW4R37b.mjs"), import("./studio-instance-composition-ClAJ72-M.mjs")]).then(async ([{ createStudioInstances }, { createStudioInstanceAdapters }]) => {
-			return createStudioInstances({
-				stateRoot,
-				...createStudioInstanceAdapters({
-					listBundles: async () => (await installedBundles()).map((skill) => ({
-						name: skill.catalogName ?? skill.name,
-						version: String(skill.version)
-					})),
-					captureKit: async (pin) => {
-						const selected = await selectedKit(pin);
-						return {
-							files: await captureRegisteredTree(selected.sourceRoot ?? root),
-							title: selected.title
-						};
-					},
-					captureBundle: async (pin) => {
-						const selected = (await installedBundles()).find((skill) => (skill.catalogName ?? skill.name) === pin.name && String(skill.version) === pin.version);
-						if (!selected) throw new Error("Select the exact registered Bundle.");
-						const retained = contentLibrary ? await contentLibrary.store.resolveBundle(pin) : void 0;
-						const base = retained?.resourceRoot ?? selected.resourceRoot ?? join(root, "skills", selected.name);
-						return {
-							files: await captureRegisteredTree(base),
-							sourceId: retained?.sourceId ?? "companion:explicit-kit"
-						};
-					}
-				})
-			});
-		}).catch((error) => {
-			instanceService = void 0;
-			throw error;
-		});
-	};
-	const contentArchives = () => {
-		if (!stateRoot) throw new Error("Studio import storage is not configured.");
-		return contentArchiveService ??= import("./studio-content-archive-CNUz472H.mjs").then(async ({ createStudioContentArchives }) => {
-			const statePath = resolve(stateRoot);
-			if (!(await lstat(statePath)).isDirectory()) throw new Error("Studio archive state must be an existing canonical directory.");
-			const state = await realpath(statePath);
-			const privateRoot = join(state, "studio-content-state");
-			const inside = (base, target) => {
-				const rel = relative(base, target);
-				return !isAbsolute(rel) && rel !== ".." && !rel.startsWith(`..${sep}`);
-			};
-			if (inside(root, privateRoot) || inside(privateRoot, root)) throw new Error("Studio archive state and installed Kit must not be nested.");
-			if (process.platform === "win32") await ensureWindowsPrivateDirectory(privateRoot);
-			else await mkdir(privateRoot, { mode: 448 }).catch((error) => {
-				if (error.code !== "EEXIST") throw error;
-			});
-			const bundles = [];
-			for (const skill of await installedBundles()) {
-				const pin = {
-					name: skill.catalogName ?? skill.name,
-					version: String(skill.version)
-				};
-				const retained = contentLibrary ? await contentLibrary.store.resolveBundle(pin) : void 0;
-				bundles.push({
-					...pin,
-					rootDir: retained?.resourceRoot ?? skill.resourceRoot ?? join(root, "skills", skill.name),
-					sourceId: retained?.sourceId ?? "companion:explicit-kit"
-				});
-			}
-			return createStudioContentArchives({
-				stateRoot: privateRoot,
-				kitRoot: root,
-				readInstalledKit: currentKit,
-				sourceId: "companion:explicit-kit",
-				bundles
-			});
-		});
-	};
-	return {
-		listInstances: async (input) => (await instances()).list(input),
-		readInstance: async (input) => (await instances()).read(input),
-		copyInstance: async (input) => (await instances()).copy(input),
-		renameInstance: async (input) => (await instances()).rename(input),
-		removeInstance: async (input) => (await instances()).remove(input),
-		updateInstanceMounts: async (input) => (await instances()).updateMounts(input),
-		readInstanceFile: async (input) => (await instances()).readFile(input),
-		saveInstanceFile: async (input) => (await instances()).saveFile(input),
-		previewInstance: async (input) => (await instances()).preview(input),
-		workspace: ({ query = "" }) => {
-			invalidateCatalog();
-			return management.workspace(query);
-		},
-		readKitFiles: async ({ name, version }) => {
-			const current = await selectedKit({
-				name,
-				version
-			});
-			return source.listFiles(current.sourceRoot ?? root);
-		},
-		readKitFile: async ({ name, version, path }) => {
-			const current = await selectedKit({
-				name,
-				version
-			});
-			if (typeof path !== "string" || !path || /[\\\\:\u0000]/.test(path) || path.split("/").some((part) => !part || part === "." || part === "..")) throw new Error("Invalid Kit file path.");
-			const target = await safe(join(current.sourceRoot ?? root, path));
-			if ((await lstat(target)).size > 1048576) throw new Error("This file is too large for the text viewer.");
-			const content = await source.readText(target);
-			if (content === void 0) throw new Error("Kit file not found.");
-			return { content };
-		},
-		readKitWorkspace: ({ name, version }) => management.readKitWorkspace(name, version),
-		readBundleWorkspace: async ({ name, version }) => await hasBundle(name) ? bundles.readBundleWorkspace(name, version) : unknownBundle(name),
-		readBundleFile: async (input) => await hasBundle(input.name) ? bundles.readBundleFile(input) : unknownBundle(input.name),
-		previewInstalledPanel,
-		createPanelDraft: async (input) => (await drafts()).create(input),
-		listPanelDrafts: async () => (await drafts()).list(),
-		readPanelDraft: async ({ id }) => (await drafts()).read(id),
-		savePanelDraft: async (input) => (await drafts()).save(input),
-		previewPanelDraft: async (input) => (await drafts()).preview(input),
-		confirmPanelDraft: async (input) => (await drafts()).confirm(input),
-		forkPanelDraft: async ({ id }) => (await drafts()).fork(id),
-		createKitDraft: async (input) => (await kitDrafts()).create(input),
-		listKitDrafts: async () => (await kitDrafts()).list(),
-		readKitDraft: async ({ id }) => (await kitDrafts()).read(id),
-		saveKitDraft: async (input) => (await kitDrafts()).save(input),
-		validateKitDraft: async (input) => (await kitDrafts()).validate(input),
-		previewKitDraft: async (input) => (await kitDrafts()).preview(input),
-		confirmKitDraft: async (input) => (await kitDrafts()).confirm(input),
-		forkKitDraft: async ({ id }) => (await kitDrafts()).fork(id),
-		exportContentArchive: async (input) => (await contentArchives()).exportArchive(input),
-		prepareContentImport: async (input) => (await contentArchives()).prepareImport(input),
-		readContentImport: async ({ id }) => (await contentArchives()).readImport(id),
-		listContentImports: async () => (await contentArchives()).listImports(),
-		adoptContentImport: async ({ id }) => {
-			const record = await (await contentArchives()).readImport(id);
-			const prepared = await (await contentArchives()).revalidateImport(id);
-			if (!prepared.validation.valid) throw new Error(`Imported definition is invalid: ${prepared.validation.diagnostics.map((item) => item.message).join("; ")}`);
-			if (!contentLibrary) throw new Error("Independent content installation is not configured.");
-			const adopted = await contentLibrary.adoptPrepared(prepared);
-			invalidateCatalog();
-			contentArchiveService = void 0;
-			let draft;
-			if (record.archive.kind === "kit") {
-				const retained = await contentLibrary.store.loadRetainedKit(prepared.archive.pin);
-				const ports = await createStudioDraftPorts({
-					stateRoot,
-					kitRoot: retained.sourceRoot,
-					readInstalledKit: () => retained,
-					readInstalledBundle: (pin) => contentLibrary.store.resolveBundle(pin)
-				}, "kit");
-				draft = await new StudioKitDraftService(ports.repository, ports.sources).create({ kit: prepared.archive.pin });
-			}
-			return {
-				importId: id,
-				...adopted,
-				...draft ? { draft } : {},
-				executionGranted: false,
-				requiresTrustReview: prepared.requiresTrustReview
-			};
-		}
-	};
-}
-//#endregion
 //#region packages/companion/src/studio-trials.mjs
 /** Isolated Studio trials over existing project, snapshot and native transport ports. */
 const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/;
@@ -9477,7 +8476,7 @@ async function createStudioTrials({ stateRoot, kitRoot, readInstalledKit, readIn
 						...current,
 						status: current.dispatchAttempted ? "unknown" : "failed",
 						terminalVerified: !current.dispatchAttempted,
-						message: current.dispatchAttempted ? "Native delivery is unverified; no automatic retry." : "Trial preparation failed before native dispatch."
+						message: current.dispatchAttempted ? "Native delivery is unverified; no automatic retry." : `Trial preparation failed before native dispatch: ${String(error.message ?? error).slice(0, 2048)}`
 					}));
 					if (!record.dispatchAttempted) try {
 						await host?.close();
@@ -11397,7 +10396,16 @@ async function startCompanion(options) {
 		});
 		const resolveRun = (input) => backgroundAdapter?.resolveRun ? backgroundAdapter.resolveRun(input) : resolveExecutionRun(input);
 		const settings = await createCompanionSettings(options.stateRoot);
-		const studio = await createCompanionStudio(() => project.installedKit, options.kitRoot, options.stateRoot, project.contentLibrary);
+		const studio = () => project.contentLibrary.studio();
+		const studioConversationBinding = {
+			bindingId: randomBytes(16).toString("hex"),
+			threadId: connection.threadId
+		};
+		const studioConversationRequests = options.studioTrial ? void 0 : createStudioConversationRequests({
+			binding: studioConversationBinding,
+			readInstance: async (input) => (await studio()).readInstance(input),
+			prepareChanges: async (input) => (await studio()).prepareInstanceChanges(input)
+		});
 		let trials;
 		const getTrials = () => {
 			if (codexDesktop) throw new Error("Codex desktop Studio trial execution is not verified yet.");
@@ -11405,7 +10413,7 @@ async function startCompanion(options) {
 			return trials ??= createStudioTrials({
 				stateRoot: options.stateRoot,
 				kitRoot: options.kitRoot,
-				readInstalledKit: () => project.installedKit,
+				readInstalledKit: () => project.contentLibrary.loadInstalled(),
 				readInstalledBundle: (pin) => project.contentLibrary.store.resolveBundle(pin),
 				connection,
 				startCompanion,
@@ -11505,37 +10513,6 @@ async function startCompanion(options) {
 			skill: run.skill,
 			artifactFile: null
 		}))];
-		const panelDrafts = new ProjectContentPanelGuard(project.project.metadata.id);
-		const upgradeAdapter = options.contentUpgradeAdapter;
-		const requireUpgradeAdapter = () => {
-			if (typeof upgradeAdapter?.assertProjectQuiescent !== "function" || typeof upgradeAdapter?.verifyNativeConfinement !== "function") throw new Error("This native host has no verified project-wide draft/run guard and confined migration Producer adapter. Content upgrade is unavailable; current project pins and files are unchanged.");
-			return upgradeAdapter;
-		};
-		const contentMigration = project.createContentMigration({
-			async assertQuiescent() {
-				const adapter = requireUpgradeAdapter();
-				panelDrafts.assertQuiescent();
-				const native = await nativeRuns.read();
-				if (native.activeMainBundles.length || native.executionAttempts.some((run) => ["queued", "working"].includes(run.phase))) throw new Error("Settle the running native Producer/Worker/main Bundle before upgrading.");
-				if ((await reviews.readReviewStatus({
-					workspace: await project.readWorkspace(),
-					activeWork: observedWork(native)
-				})).some((review) => ["running", "unknown"].includes(review.status) || review.nativeStatus === "unknown")) throw new Error("Settle the native background review before upgrading.");
-				await adapter.assertProjectQuiescent(project.project.metadata.id);
-			},
-			async verifyNativeProducer(proof, candidateRoot) {
-				const adapter = requireUpgradeAdapter();
-				const binding = await resolveRun(proof);
-				if (binding.parentRunId !== connection.threadId) throw new Error("Content migration must belong to this exact main conversation.");
-				const log = await verifyChild({
-					...binding,
-					projectRoot: nativeCwd
-				});
-				if (log.recordedStatus !== "completed") throw new Error("Wait for the real native migration Producer to finish before adopting.");
-				if (!log.rows.filter((row) => row.role === "user").map((row) => row.text).join("\n").includes(candidateRoot)) throw new Error("Native migration receipt does not identify the exact isolated candidate.");
-				await adapter.verifyNativeConfinement(binding, candidateRoot);
-			}
-		});
 		const reviewStatus = async (workspace, native) => {
 			workspace ??= await project.readWorkspace();
 			if (!workspace.access?.writable) return [];
@@ -11686,11 +10663,6 @@ async function startCompanion(options) {
 						} : fullPresentation;
 						return send(response, 200, Object.hasOwn(params, "knownRevision") ? workspacePollResult(presentation, params.knownRevision) : presentation);
 					}
-					if (method === "recoverContentUpgrade") {
-						const receipt = await contentMigration.recover();
-						await project.refreshAccess();
-						return send(response, 200, { recovered: receipt ?? null });
-					}
 					const ownsAccessCheck = [
 						"savePanel",
 						"sendPrompt",
@@ -11760,6 +10732,7 @@ async function startCompanion(options) {
 						host,
 						threadId: connection.threadId,
 						projectName: project.project.metadata.name,
+						...studioConversationRequests ? { studioConversation: studioConversationBinding } : {},
 						...trialEmbedOrigin === void 0 ? {} : { trialPanel: {
 							trialId: options.trialInput.id,
 							parentOrigin: trialEmbedOrigin,
@@ -11767,55 +10740,6 @@ async function startCompanion(options) {
 						} }
 					});
 					if (method === "reloadKit") return send(response, 200, await project.reloadKit());
-					if (method === "observePanelDraft") {
-						panelDrafts.observe(params);
-						return send(response, 200, { observed: true });
-					}
-					if (method === "prepareContentUpgrade") {
-						await project.requireWritable();
-						return send(response, 200, await contentMigration.prepare(params.target));
-					}
-					if ([
-						"readContentUpgradeDefinition",
-						"listContentUpgradeFiles",
-						"readContentUpgradeFile",
-						"writeContentUpgradeFile",
-						"validateContentUpgrade"
-					].includes(method)) {
-						requireUpgradeAdapter();
-						const candidate = await contentMigration.candidate(params.id);
-						if (method === "readContentUpgradeDefinition") return send(response, 200, await candidate.readDefinition(params.side, params.offset, params.resource));
-						if (method === "listContentUpgradeFiles") return send(response, 200, { files: await candidate.list() });
-						if (method === "readContentUpgradeFile") return send(response, 200, await candidate.read(params.path, params.offset));
-						if (method === "writeContentUpgradeFile") {
-							if (typeof params.content !== "string") throw new Error("Candidate content must be UTF-8 text.");
-							await candidate.write(params.path, params.content);
-							return send(response, 200, { candidateUpdated: true });
-						}
-						candidate.assertDefinitionsRead();
-						try {
-							await contentMigration.validateCandidate(params.id, params.evidence);
-							return send(response, 200, {
-								accepted: true,
-								published: false
-							});
-						} catch (error) {
-							return send(response, 200, {
-								accepted: false,
-								diagnostics: [String(error.message ?? error)],
-								next: "Repair this candidate in the same attached native Agent. Do not change saved facts to satisfy a validator."
-							});
-						}
-					}
-					if (method === "finishContentUpgrade") {
-						(await contentMigration.candidate(params.id)).assertDefinitionsRead();
-						const receipt = await contentMigration.finish(params.id, params.native, params.evidence);
-						await project.refreshAccess();
-						return send(response, 200, await withReviewStatus({
-							...receipt,
-							commit: receipt.checkpoint
-						}));
-					}
 					if (method === "readGraph") try {
 						const result = await knowledgeReads.read(project.project.metadata.id, () => knowledge.readGraph(), () => knowledge.recoveryStatus());
 						return send(response, 200, result.value ?? { content: JSON.stringify({
@@ -11953,8 +10877,12 @@ async function startCompanion(options) {
 								"unavailable",
 								"unknown"
 							].includes(result?.status) ? result.status : "unknown" });
-						} catch {
-							return send(response, 200, { status: "unavailable" });
+						} catch (error) {
+							const receipt = notificationErrorResponse(error);
+							return send(response, 200, {
+								status: "unavailable",
+								...receipt?.delivery === "not-submitted" ? receipt : {}
+							});
 						}
 					}
 					const trialMethods = {
@@ -11977,37 +10905,69 @@ async function startCompanion(options) {
 						studioInstanceList: "listInstances",
 						studioInstanceRead: "readInstance",
 						studioInstanceCopy: "copyInstance",
+						studioInstanceCreate: "createInstance",
+						studioInstanceImportSources: "importInstanceSources",
+						studioInstanceEditCurrent: "editCurrentInstance",
 						studioInstanceRename: "renameInstance",
 						studioInstanceRemove: "removeInstance",
 						studioInstanceFile: "readInstanceFile",
 						studioInstanceSave: "saveInstanceFile",
 						studioInstancePreview: "previewInstance",
+						studioInstancePrepareChanges: "prepareInstanceChanges",
+						studioInstanceSaveChanges: "saveInstanceChanges",
 						studioInstanceMounts: "updateInstanceMounts",
 						studioKitFiles: "readKitFiles",
 						studioKitFile: "readKitFile",
 						studioInstalledPreview: "previewInstalledPanel",
-						studioDraftCreate: "createPanelDraft",
-						studioDraftList: "listPanelDrafts",
-						studioDraftRead: "readPanelDraft",
-						studioDraftSave: "savePanelDraft",
-						studioDraftPreview: "previewPanelDraft",
-						studioDraftConfirm: "confirmPanelDraft",
-						studioDraftFork: "forkPanelDraft",
-						studioKitDraftCreate: "createKitDraft",
-						studioKitDraftList: "listKitDrafts",
-						studioKitDraftRead: "readKitDraft",
-						studioKitDraftSave: "saveKitDraft",
-						studioKitDraftValidate: "validateKitDraft",
-						studioKitDraftPreview: "previewKitDraft",
-						studioKitDraftConfirm: "confirmKitDraft",
-						studioKitDraftFork: "forkKitDraft",
 						studioContentExport: "exportContentArchive",
-						studioContentImport: "prepareContentImport",
-						studioContentImportRead: "readContentImport",
-						studioContentImportList: "listContentImports",
-						studioContentImportAdopt: "adoptContentImport"
+						studioContentReadArchive: "readArchive"
 					};
-					if (Object.hasOwn(studioMethods, method)) return send(response, 200, await studio[studioMethods[method]](params));
+					if (method === "studioAuthoringPrepareChanges") {
+						if (!studioConversationRequests) throw Error("Studio authoring is unavailable in a trial service.");
+						const candidate = await studioConversationRequests.prepareForConversation(params);
+						const url = new URL(browserAccess === "local" ? `${origin}${browserBase}` : `${origin}/`);
+						url.searchParams.set("view", "studio");
+						url.searchParams.set("presentation", "conversation");
+						url.searchParams.set("studioTarget", JSON.stringify(candidate.authoring.studio));
+						url.searchParams.set("studioRequest", candidate.authoring.requestId);
+						return send(response, 200, {
+							...candidate,
+							authoring: {
+								...candidate.authoring,
+								url: url.href
+							}
+						});
+					}
+					if (method === "studioAuthoringCandidateList" || method === "studioAuthoringCandidateRead") {
+						if (!studioConversationRequests) throw Error("Studio authoring is unavailable in a trial service.");
+						return send(response, 200, await studioConversationRequests[method === "studioAuthoringCandidateList" ? "list" : "read"](params));
+					}
+					if (Object.hasOwn(studioMethods, method)) {
+						if (Object.hasOwn(params, "authoringRequestId")) {
+							if (method !== "studioInstancePrepareChanges" || !studioConversationRequests) throw Error("Only prepareChanges can associate a Studio authoring request.");
+							return send(response, 200, await studioConversationRequests.prepare(params));
+						}
+						return send(response, 200, await (await studio())[studioMethods[method]](params));
+					}
+					if (method === "sendPrompt" && Object.hasOwn(params, "studio")) {
+						if (!studioConversationRequests || Object.keys(params).some((key) => ![
+							"text",
+							"requestId",
+							"studio",
+							"context"
+						].includes(key)) || typeof params.text !== "string" || !params.text.trim() || Buffer.byteLength(params.text) > 32768) throw Error("Invalid Studio conversation request.");
+						const target = await studioConversationRequests.register(params);
+						return send(response, 200, await project.sendPrompt({
+							text: params.text,
+							requestId: params.requestId,
+							saved: [],
+							studio: target,
+							verifyStudio: () => studioConversationRequests.read({
+								requestId: params.requestId,
+								studio: params.studio
+							})
+						}));
+					}
 					if (method === "updateSettings") return send(response, 200, await settings.write(params));
 					if (method === "readReview") return send(response, 200, reviewRequest);
 					if (method === "prepareReview" || method === "prepareReviews") {
@@ -12222,6 +11182,7 @@ async function startCompanion(options) {
 				return lastAuthenticatedActivityAt;
 			},
 			async close() {
+				studioConversationRequests?.close();
 				let trialCloseError;
 				try {
 					if (trials) await (await trials).close();