@jxsuite/studio 2.0.0 → 2.0.1

package/dist/chunks/{studio-568nx4t5.js.map → studio-zp7jncs8.js.map}

@@ -9,6 +9,6 @@
     "/// <reference lib=\"dom\" />\n/**\n * Pull orchestration that keeps project sync from being blocked by Studio's own automated package\n * updates. The on-open @jxsuite update rewrites package.json and bun.lock without committing, so a\n * teammate pushing the same update makes a later `git pull` refuse to merge. Since those local\n * changes are machine-generated and reproducible, we discard them, pull, and re-run the package\n * sync (re-apply the update if the pulled project is still behind, or `bun install` if the pull\n * brought it). Detection is state-based (git status + content comparison against `@{u}`), never git\n * stderr parsing, so it works identically across backends and locales.\n */\n\nimport { errorMessage } from \"@jxsuite/schema/parse\";\nimport { getPlatform } from \"../platform\";\nimport { showConfirmDialog } from \"../ui/layers\";\nimport { showProgressModal } from \"../ui/progress-modal\";\nimport { statusMessage } from \"../panels/statusbar\";\nimport { applyJxsuiteUpdate, checkJxsuiteUpdate } from \"./jxsuite-update\";\nimport type { GitStatusResult } from \"../types\";\n\nconst PKG_PATHS = [\"package.json\", \"bun.lock\", \"bun.lockb\"];\n\n/** Untracked markers across backends: desktop porcelain v1 emits \"??\", server porcelain v2 \"U\". */\nconst UNTRACKED_STATUSES = new Set([\"??\", \"U\"]);\n\n/** Above this many dirty files, skip the per-file upstream comparison and leave the error as-is. */\nconst MAX_CONFLICT_SCAN = 25;\n\nconst JXSUITE_PREFIX = \"@jxsuite/\";\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n  return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\nfunction sortKeys(value: unknown): unknown {\n  if (Array.isArray(value)) {\n    return value.map((entry) => sortKeys(entry));\n  }\n  if (isRecord(value)) {\n    const out: Record<string, unknown> = {};\n    for (const key of Object.keys(value).toSorted()) {\n      out[key] = sortKeys(value[key]);\n    }\n    return out;\n  }\n  return value;\n}\n\n/** Replace every @jxsuite/* version in dependencies/devDependencies so they compare equal. */\nfunction maskJxsuiteVersions(pkg: Record<string, unknown>): Record<string, unknown> {\n  const out = { ...pkg };\n  for (const section of [\"dependencies\", \"devDependencies\"]) {\n    const deps = out[section];\n    if (!isRecord(deps)) {\n      continue;\n    }\n    const masked = { ...deps };\n    for (const name of Object.keys(masked)) {\n      if (name.startsWith(JXSUITE_PREFIX)) {\n        masked[name] = \"*\";\n      }\n    }\n    out[section] = masked;\n  }\n  return out;\n}\n\n/**\n * True when the working package.json differs from the HEAD copy only in the version strings of\n * jxsuite-scoped entries — i.e. exactly what Studio's automated update writes. Added/removed deps\n * or any other edit means a human touched the file.\n */\nexport function isAutomatedPackageDiff(\n  headText: string | null,\n  workingText: string | null,\n): boolean {\n  if (headText === null || workingText === null) {\n    return false;\n  }\n  let head: unknown;\n  let working: unknown;\n  try {\n    head = JSON.parse(headText);\n    working = JSON.parse(workingText);\n  } catch {\n    return false;\n  }\n  if (!isRecord(head) || !isRecord(working)) {\n    return false;\n  }\n  return (\n    JSON.stringify(sortKeys(maskJxsuiteVersions(head))) ===\n    JSON.stringify(sortKeys(maskJxsuiteVersions(working)))\n  );\n}\n\nasync function tryShow(path: string, ref: string): Promise<string | null> {\n  try {\n    return await getPlatform().gitShow({ path, ref });\n  } catch {\n    return null;\n  }\n}\n\nasync function tryRead(path: string): Promise<string | null> {\n  try {\n    return await getPlatform().readFile(path);\n  } catch {\n    return null;\n  }\n}\n\nexport interface PackagePullPlan {\n  /** Tracked dirty package files whose upstream (@{u}) content differs from HEAD. */\n  discard: string[];\n  /** Untracked package files that exist at @{u} (\"untracked would be overwritten\" case). */\n  removeUntracked: string[];\n  /** Whether the package.json working copy diverges from HEAD only by automated @jxsuite bumps. */\n  automated: boolean;\n}\n\n/**\n * Decide which local package files stand in the way of a merge. Only files the upstream actually\n * changed can block the pull, so files whose @{u} content matches HEAD are left alone.\n */\nexport async function planPackageDiscard(status: GitStatusResult): Promise<PackagePullPlan> {\n  const discard: string[] = [];\n  const removeUntracked: string[] = [];\n  let automated = true;\n  for (const path of PKG_PATHS) {\n    const entries = status.files.filter((f) => f.path === path);\n    if (entries.length === 0) {\n      continue;\n    }\n    const upstream = await tryShow(path, \"@{u}\");\n    if (entries.every((f) => UNTRACKED_STATUSES.has(f.status))) {\n      if (upstream !== null) {\n        removeUntracked.push(path);\n      }\n      continue;\n    }\n    const head = await tryShow(path, \"HEAD\");\n    if (upstream === null || upstream === head) {\n      continue;\n    }\n    discard.push(path);\n    if (path === \"package.json\") {\n      automated &&= isAutomatedPackageDiff(head, await tryRead(path));\n    }\n  }\n  return { automated, discard, removeUntracked };\n}\n\nfunction planIsEmpty(plan: PackagePullPlan): boolean {\n  return plan.discard.length === 0 && plan.removeUntracked.length === 0;\n}\n\n/** True when a dirty non-package file also differs upstream — recovery can't unblock that pull. */\nasync function otherFilesConflict(status: GitStatusResult): Promise<boolean> {\n  const paths = [\n    ...new Set(status.files.filter((f) => !PKG_PATHS.includes(f.path)).map((f) => f.path)),\n  ];\n  if (paths.length > MAX_CONFLICT_SCAN) {\n    return true;\n  }\n  for (const path of paths) {\n    const upstream = await tryShow(path, \"@{u}\");\n    if (upstream !== null && upstream !== (await tryShow(path, \"HEAD\"))) {\n      return true;\n    }\n  }\n  return false;\n}\n\nasync function applyDiscard(plan: PackagePullPlan): Promise<void> {\n  const platform = getPlatform();\n  if (plan.discard.length > 0) {\n    // Unstage unconditionally: desktop porcelain v1 doesn't report a staged flag.\n    // Restoring an unstaged tracked file is a no-op.\n    await platform.gitUnstage(plan.discard);\n    await platform.gitDiscard(plan.discard);\n  }\n  for (const path of plan.removeUntracked) {\n    await platform.deleteFile(path);\n  }\n}\n\n/**\n * Bring packages back in line after a pull that touched (or followed a discard of) package files:\n * re-apply the @jxsuite update if the pulled project is still behind, otherwise `bun install` so\n * node_modules matches the pulled lockfile. Never throws — a successful pull must not turn into an\n * error banner; failures surface through the progress modal.\n */\nasync function syncPackagesAfterPull(): Promise<void> {\n  const platform = getPlatform();\n  let check: Awaited<ReturnType<typeof checkJxsuiteUpdate>> = null;\n  try {\n    check = await checkJxsuiteUpdate();\n  } catch {\n    check = null;\n  }\n  if (check && platform.setPackageVersions) {\n    // No re-prompt: the discarded local changes came from an update the user already accepted.\n    await applyJxsuiteUpdate(check.outdated, check.target);\n    return;\n  }\n  if (!platform.installDependencies) {\n    return;\n  }\n  const progress = showProgressModal({\n    status: \"Running bun install…\",\n    title: \"Syncing dependencies\",\n  });\n  try {\n    const result = await platform.installDependencies();\n    if (result.ok) {\n      progress.done();\n    } else {\n      progress.fail(result.log ?? \"bun install failed\");\n    }\n  } catch (error) {\n    progress.fail(errorMessage(error));\n  }\n}\n\n/**\n * Discard per plan, pull, and re-sync. A discard is always followed by a package re-sync — even\n * when the pull fails — so the project is never stranded without the update it had before.\n */\nasync function discardPullAndSync(plan: PackagePullPlan): Promise<void> {\n  const platform = getPlatform();\n  try {\n    await applyDiscard(plan);\n  } catch (error) {\n    throw new Error(`Could not reset local package files: ${errorMessage(error)}`, {\n      cause: error,\n    });\n  }\n  try {\n    await platform.gitPull();\n  } catch (error) {\n    await syncPackagesAfterPull();\n    throw error;\n  }\n  statusMessage(\"Local package updates were superseded by pulled changes\");\n  await syncPackagesAfterPull();\n}\n\nasync function recoverAfterFailedPull(original: unknown): Promise<void> {\n  const platform = getPlatform();\n  let status: GitStatusResult;\n  try {\n    status = await platform.gitStatus();\n  } catch {\n    throw original;\n  }\n  if (!(status.behind > 0)) {\n    throw original;\n  }\n  const plan = await planPackageDiscard(status);\n  if (planIsEmpty(plan) || (await otherFilesConflict(status))) {\n    throw original;\n  }\n  if (!plan.automated) {\n    const confirmed = await showConfirmDialog(\n      \"Discard local package changes?\",\n      \"package.json / bun.lock have local edits that conflict with incoming changes. Discard them, pull, and re-sync packages?\",\n      { confirmLabel: \"Discard and pull\", destructive: true },\n    );\n    if (!confirmed) {\n      throw original;\n    }\n  }\n  await discardPullAndSync(plan);\n}\n\n/**\n * Snapshot the package files (aligned to PKG_PATHS). Lists the root once and reads only the files\n * that exist, so absent lockfiles (cloud projects don't commit one) never trigger a console 404\n * from a blind read. Listing failure falls back to probing all paths.\n */\n/**\n * Snapshot the package files (aligned to PKG_PATHS). Lists the root once and reads only the files\n * that exist, so absent lockfiles (cloud projects don't commit one) never trigger a console 404\n * from a blind read. Listing failure falls back to probing all paths.\n */\nasync function snapshotPackageFiles(): Promise<(string | null)[]> {\n  let present: Set<string>;\n  try {\n    const entries = await getPlatform().listDirectory(\"\");\n    present = new Set(entries.filter((e) => e.type === \"file\").map((e) => e.name));\n  } catch {\n    present = new Set(PKG_PATHS);\n  }\n  return Promise.all(\n    PKG_PATHS.map((path) => (present.has(path) ? tryRead(path) : Promise.resolve(null))),\n  );\n}\n\n/**\n * Pull with automatic recovery from conflicts caused by Studio's own package updates. Throws only\n * when the pull genuinely fails for reasons recovery can't (or shouldn't) fix.\n */\nexport async function pullWithPackageSync(): Promise<void> {\n  const platform = getPlatform();\n  const before = await snapshotPackageFiles();\n\n  // Preemptive: fetch so `behind` is current, then reset automated package edits that would\n  // Block the merge — manual package.json edits fall through to the plain pull + confirm path.\n  let status: GitStatusResult | null = null;\n  try {\n    await platform.gitFetch();\n    status = await platform.gitStatus();\n  } catch {\n    status = null; // Offline or status failure — the plain pull will report the real error\n  }\n  if (status && status.behind > 0) {\n    const plan = await planPackageDiscard(status);\n    if (!planIsEmpty(plan) && plan.automated) {\n      await discardPullAndSync(plan);\n      return;\n    }\n  }\n\n  try {\n    await platform.gitPull();\n  } catch (error) {\n    await recoverAfterFailedPull(error);\n    return;\n  }\n  const after = await snapshotPackageFiles();\n  if (before.some((content, i) => content !== after[i])) {\n    await syncPackagesAfterPull();\n  }\n}\n\n/**\n * Pull remote changes as soon as a project opens, ahead of the install check and update prompt, so\n * a session starts from the current remote state. Never throws and never blocks the open — failures\n * (offline, no upstream, unrelated conflicts) surface as a status message only.\n */\nexport async function autoSyncProjectOnOpen(): Promise<void> {\n  const platform = getPlatform();\n  let status: GitStatusResult;\n  try {\n    status = await platform.gitStatus();\n  } catch {\n    return;\n  }\n  if (!status?.isRepo || (status.remotes?.length ?? 0) === 0) {\n    return;\n  }\n  statusMessage(\"Syncing project…\");\n  try {\n    await pullWithPackageSync();\n  } catch (error) {\n    statusMessage(`Sync skipped: ${errorMessage(error)}`);\n  }\n}\n"
   ],
   "mappings": "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",
-  "debugId": "62E0BBB309184E0B64756E2164756E21",
+  "debugId": "88C48B6EB01A9FE764756E2164756E21",
   "names": []
 }

package/dist/studio.js

@@ -51,7 +51,7 @@ import {
   stringify1 as stringify2,
   stringifyPosition,
   whitespace
-} from "./chunks/studio-n9zmpxjg.js";
+} from "./chunks/studio-jm0z592w.js";
 import {
   getCfToken,
   hydrateSettings,
@@ -109,7 +109,7 @@ import {
 import {
   registerFormControl,
   renderFieldRow
-} from "./chunks/studio-zmy7241e.js";
+} from "./chunks/studio-yfcstdzy.js";
 import {
   addFieldFormTpl,
   detectFieldFormat,
@@ -122,7 +122,7 @@ import {
   schemaForType,
   schemeOfQuery,
   yamlDefault
-} from "./chunks/studio-j6gqyjf4.js";
+} from "./chunks/studio-m2t4mdg5.js";
 import {
   ROW_KEY_FIELD,
   addRecentProject,
@@ -162,7 +162,7 @@ import {
   setupTreeKeyboard,
   startFsSync,
   trackRecentFile
-} from "./chunks/studio-d77qm3pk.js";
+} from "./chunks/studio-4d8hzcz5.js";
 import {
   MEDIA_EXTENSIONS,
   UPLOAD_ACCEPT,
@@ -245,13 +245,13 @@ import {
   updateActivePanelHeaders,
   updateSiteConfig,
   uploadAssets
-} from "./chunks/studio-ygzav7z5.js";
+} from "./chunks/studio-v7jkjqng.js";
 import {
   buildComponentInstance,
   componentRegistry,
   computeRelativePath,
   loadComponentRegistry
-} from "./chunks/studio-hhj92gcr.js";
+} from "./chunks/studio-esrewxap.js";
 import {
   classMap,
   ifDefined,
@@ -262,7 +262,7 @@ import {
   platformSupportsClone,
   refreshGitStatus,
   renderGitPanel
-} from "./chunks/studio-wd6ewdvd.js";
+} from "./chunks/studio-n4p11dfy.js";
 import {
   repeat
 } from "./chunks/studio-xq0t7n5t.js";
@@ -277,7 +277,7 @@ import {
   VERSION,
   autoSyncProjectOnOpen,
   maybePromptJxsuiteUpdate
-} from "./chunks/studio-568nx4t5.js";
+} from "./chunks/studio-zp7jncs8.js";
 import {
   applyPanelCollapse,
   errorMessage,
@@ -295,7 +295,7 @@ import {
   showSaveDiscardDialog,
   statusMessage,
   view
-} from "./chunks/studio-asvf0j9e.js";
+} from "./chunks/studio-0xgs7xrs.js";
 import {
   COMMON_SELECTORS,
   VOID_ELEMENTS,
@@ -392,7 +392,7 @@ import {
   updateUi,
   varDisplayName,
   workspace
-} from "./chunks/studio-rq0vxb19.js";
+} from "./chunks/studio-sjh1wt1a.js";
 import {
   AsyncDirective,
   PartType,
@@ -416,7 +416,7 @@ import {
   loadedMonaco,
   refreshExtensionUi,
   refreshFormats
-} from "./chunks/studio-97qcgvdn.js";
+} from "./chunks/studio-gs6kqdt1.js";
 import {
   getPlatform,
   hasPlatform,
@@ -19573,7 +19573,7 @@ function renderSiteLevelImports(renderLeftPanel) {
       const platform = getPlatform();
       await platform.removePackage(pkg);
       const updatedElements = siteElements.filter((e) => typeof e !== "string" || !e.startsWith(`${pkg}/`));
-      const { loadComponentRegistry: loadComponentRegistry2 } = await import("./chunks/components-0hzentwq.js");
+      const { loadComponentRegistry: loadComponentRegistry2 } = await import("./chunks/components-799jpvhm.js");
       await loadComponentRegistry2();
       await updateSiteConfig({
         $elements: updatedElements
@@ -19643,7 +19643,7 @@ function renderSiteLevelImports(renderLeftPanel) {
     try {
       const platform = getPlatform();
       await platform.addPackage(name);
-      const { loadComponentRegistry: loadComponentRegistry2 } = await import("./chunks/components-0hzentwq.js");
+      const { loadComponentRegistry: loadComponentRegistry2 } = await import("./chunks/components-799jpvhm.js");
       await loadComponentRegistry2();
       renderLeftPanel();
     } catch (error) {
@@ -19665,7 +19665,7 @@ function renderSiteLevelImports(renderLeftPanel) {
     try {
       const platform = getPlatform();
       await platform.addPackage(name);
-      const { loadComponentRegistry: loadComponentRegistry2 } = await import("./chunks/components-0hzentwq.js");
+      const { loadComponentRegistry: loadComponentRegistry2 } = await import("./chunks/components-799jpvhm.js");
       await loadComponentRegistry2();
       renderLeftPanel();
     } catch (error) {
@@ -23908,11 +23908,27 @@ var cache2 = null;
 var proxyConfigured = false;
 var proxyManaged = false;
 var proxyDefaultModel = "";
+var proxyProbe = null;
+var probeListeners = new Set;
 function invalidateModelCache() {
   cache2 = null;
   proxyConfigured = false;
   proxyManaged = false;
   proxyDefaultModel = "";
+  proxyProbe = null;
+}
+function ensureProxyProbe(onSettled) {
+  if (onSettled) {
+    probeListeners.add(onSettled);
+  }
+  proxyProbe ??= fetchAvailableModels({ force: true }).catch(() => {}).then(() => {
+    for (const notify of probeListeners) {
+      notify();
+    }
+  });
+}
+function hasAiCredentials() {
+  return hasOpenAiKey() || isProxyConfigured();
 }
 function isProxyConfigured() {
   return proxyConfigured;
@@ -24074,6 +24090,54 @@ function createAiCredentialsForm(opts) {
   }
   return { render: render5, startEdit };
 }
+
+// src/ui/ai-managed-connect.ts
+function createManagedConnect(opts) {
+  let busy = false;
+  let connectError = "";
+  function canOffer() {
+    return isManagedProxy() && !isProxyConfigured() && hasPlatform() && Boolean(getPlatform().cfConnect);
+  }
+  function ensureProbe() {
+    ensureProxyProbe(opts.requestRender);
+  }
+  async function connect() {
+    if (busy) {
+      return;
+    }
+    busy = true;
+    connectError = "";
+    opts.requestRender();
+    try {
+      const connection = await getPlatform().cfConnect?.();
+      if (connection) {
+        await fetchAvailableModels({ force: true });
+      } else {
+        connectError = "Cloudflare connection was not completed.";
+      }
+    } catch (error) {
+      connectError = error instanceof Error ? error.message : String(error);
+    }
+    busy = false;
+    opts.requestRender();
+  }
+  function render5() {
+    if (!canOffer()) {
+      return nothing;
+    }
+    return html`
+      <div class="ai-managed-connect">
+        <div>Use Workers AI on your own Cloudflare account — no API key needed.</div>
+        <sp-button size="s" ?disabled=${busy} @click=${() => void connect()}>
+          ${busy ? "Connecting…" : "Connect Cloudflare"}
+        </sp-button>
+        ${connectError ? html`<div class="ai-managed-connect-error">${connectError}</div>` : nothing}
+        <div class="ai-managed-connect-divider">— or bring your own key —</div>
+      </div>
+    `;
+  }
+  return { canOffer, ensureProbe, render: render5 };
+}
 // ../../node_modules/@ungap/structured-clone/esm/types.js
 var VOID = -1;
 var PRIMITIVE = 0;
@@ -36471,12 +36535,6 @@ function renderSessionsList(opts) {
 // src/panels/ai-panel.ts
 var mounted = false;
 var keyEditing = false;
-var proxyProbe = null;
-function ensureProxyProbe() {
-  proxyProbe ??= fetchAvailableModels({ force: true }).catch(() => {}).then(() => {
-    scheduleAiRender();
-  });
-}
 var view2 = "chat";
 var assistant = createDocumentAssistant();
 globalThis.assistant = assistant;
@@ -36551,49 +36609,11 @@ function startEditApiKey() {
   keyEditing = true;
   credsForm.startEdit();
 }
-var cfConnectBusy = false;
-var cfConnectError = "";
-function canOfferManagedConnect() {
-  return isManagedProxy() && !isProxyConfigured() && Boolean(getPlatform().cfConnect);
-}
-async function connectCloudflareForAi() {
-  if (cfConnectBusy) {
-    return;
-  }
-  cfConnectBusy = true;
-  cfConnectError = "";
-  scheduleAiRender();
-  try {
-    const connection = await getPlatform().cfConnect?.();
-    if (connection) {
-      await fetchAvailableModels({ force: true });
-    } else {
-      cfConnectError = "Cloudflare connection was not completed.";
-    }
-  } catch (error) {
-    cfConnectError = error instanceof Error ? error.message : String(error);
-  }
-  cfConnectBusy = false;
-  scheduleAiRender();
-}
-function renderManagedConnect() {
-  return html`
-    <div class="ai-managed-connect">
-      <div>Use Workers AI on your own Cloudflare account — no API key needed.</div>
-      <sp-button size="s" ?disabled=${cfConnectBusy} @click=${() => void connectCloudflareForAi()}>
-        ${cfConnectBusy ? "Connecting…" : "Connect Cloudflare"}
-      </sp-button>
-      ${cfConnectError ? html`<div class="ai-managed-connect-error">${cfConnectError}</div>` : nothing}
-      <div class="ai-managed-connect-divider">— or bring your own key —</div>
-    </div>
-  `;
-}
+var managedConnect = createManagedConnect({ requestRender: scheduleAiRender });
 function renderKeyGate() {
   return html`
     <div class="ai-tab-body">
-      <div class="ai-status-center">
-        ${canOfferManagedConnect() ? renderManagedConnect() : nothing} ${credsForm.render()}
-      </div>
+      <div class="ai-status-center">${managedConnect.render()} ${credsForm.render()}</div>
     </div>
   `;
 }
@@ -36678,9 +36698,9 @@ var composer = createComposer({
   requestRender: scheduleAiRender
 });
 function renderAiPanelTemplate() {
-  if (!hasOpenAiKey() && !isProxyConfigured() || keyEditing) {
+  if (!hasAiCredentials() || keyEditing) {
     if (!keyEditing) {
-      ensureProxyProbe();
+      managedConnect.ensureProbe();
     }
     return renderKeyGate();
   }
@@ -65568,13 +65588,13 @@ function renderImportStatus() {
   `;
 }
 function renderImportSource(ctx) {
-  if (!hasOpenAiKey()) {
+  if (!ctx.aiGateOpen()) {
     return html`
       <div class="new-project-tab-intro">
-        Importing uses an AI-guided pipeline to clone an existing site. Add an OpenAI-compatible API
-        key to continue.
+        Importing uses an AI-guided pipeline to clone an existing site.
+        ${ctx.managedConnect.canOffer() ? "Connect Cloudflare, or add an OpenAI-compatible API key, to continue." : "Add an OpenAI-compatible API key to continue."}
       </div>
-      <div class="new-project-creds">${ctx.credsForm.render()}</div>
+      <div class="new-project-creds">${ctx.managedConnect.render()} ${ctx.credsForm.render()}</div>
     `;
   }
   return html`
@@ -65669,21 +65689,30 @@ var _creating = false;
 var _starters = [];
 var _resolve2 = null;
 var _credsForm = null;
+function rerenderIfOpen() {
+  if (_handle5) {
+    renderModal3();
+  }
+}
 function credsForm2() {
   _credsForm ??= createAiCredentialsForm({
-    onSaved: () => {
-      if (_handle5) {
-        renderModal3();
-      }
-    },
-    requestRender: () => {
-      if (_handle5) {
-        renderModal3();
-      }
-    }
+    onSaved: rerenderIfOpen,
+    requestRender: rerenderIfOpen
   });
   return _credsForm;
 }
+var _managedConnect = null;
+function managedConnect2() {
+  _managedConnect ??= createManagedConnect({ requestRender: rerenderIfOpen });
+  return _managedConnect;
+}
+function aiGateOpen() {
+  if (hasAiCredentials()) {
+    return true;
+  }
+  managedConnect2().ensureProbe();
+  return false;
+}
 function openNewProjectModal(options) {
   if (_handle5) {
     return Promise.resolve(null);
@@ -65776,8 +65805,10 @@ function sourceLabel() {
 function renderModal3() {
   const platform = getPlatform();
   const importCtx = {
+    aiGateOpen,
     credsForm: credsForm2(),
     form: _form2,
+    managedConnect: managedConnect2(),
     onDone: finish2,
     rerender: renderModal3,
     resolveDestination: () => validateParams()
@@ -65968,13 +65999,13 @@ function renderModal3() {
           </div>
         ` : html`<div class="new-project-tab-intro">No starter sites are available.</div>`;
   const agentSourceTpl = () => {
-    if (!hasOpenAiKey()) {
+    if (!aiGateOpen()) {
       return html`
         <div class="new-project-tab-intro">
-          The agent uses your AI provider to build the site. Add an OpenAI-compatible API key to
-          continue.
+          The agent uses your AI provider to build the site.
+          ${managedConnect2().canOffer() ? "Connect Cloudflare, or add an OpenAI-compatible API key, to continue." : "Add an OpenAI-compatible API key to continue."}
         </div>
-        <div class="new-project-creds">${credsForm2().render()}</div>
+        <div class="new-project-creds">${managedConnect2().render()} ${credsForm2().render()}</div>
       `;
     }
     return html`
@@ -66080,7 +66111,7 @@ function renderModal3() {
       `;
     }
     if (_step === "source") {
-      const gated = (_tab === "import" || _tab === "agent") && !hasOpenAiKey();
+      const gated = (_tab === "import" || _tab === "agent") && !aiGateOpen();
       return html`
         <sp-button variant="secondary" @click=${closeNewProjectModal}>Cancel</sp-button>
         ${gated ? "" : html`<sp-button variant="accent" @click=${goNext}>Next</sp-button>`}
@@ -73138,5 +73169,5 @@ export {
   hasUnsavedTabs
 };
 
-//# debugId=176D3065B75AF29064756E2164756E21
+//# debugId=ADA5809F71C01E1464756E2164756E21
 //# sourceMappingURL=studio.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jxsuite/studio",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Jx Studio — visual builder for Jx documents",
   "license": "MIT",
   "repository": {

package/src/new-project/import-tab.ts

@@ -1,13 +1,14 @@
 /**
  * The New Project modal's Import source step: an AI-guided clone of an existing site. Gated behind
- * the AI credentials form when no key is stored; otherwise a URL + crawl-options form. The
- * name/directory parameters live on the modal's shared Parameters step; the running pipeline
- * streams its progress into a log here and resolves the modal with the imported project.
+ * the AI credentials gate (key form + the keyless Cloudflare option) until AI is usable — a local
+ * key, or a backend holding its own; otherwise a URL + crawl-options form. The name/directory
+ * parameters live on the modal's shared Parameters step; the running pipeline streams its progress
+ * into a log here and resolves the modal with the imported project.
  */
 
 import { html } from "lit-html";
 import { getPlatform } from "../platform";
-import { getBaseUrl, getModel, getOpenAiKey, hasOpenAiKey } from "../services/ai-settings";
+import { getBaseUrl, getModel, getOpenAiKey } from "../services/ai-settings";
 import { errorMessage } from "@jxsuite/schema/parse";
 import { destinationPath } from "./location-fields";
 import type { TemplateResult } from "lit-html";
@@ -20,6 +21,12 @@ export interface CredsFormLike {
   startEdit: () => void;
 }
 
+/** Structural view of src/ui/ai-managed-connect's controller (the keyless option beside the form). */
+export interface ManagedConnectLike {
+  canOffer: () => boolean;
+  render: () => unknown;
+}
+
 export interface ImportTabCtx {
   /** The modal's shared name/directory state (the import destination slug). */
   form: { name: string; directory: string };
@@ -32,8 +39,15 @@ export interface ImportTabCtx {
   rerender: () => void;
   /** Called with the imported project; the modal resolves and closes. */
   onDone: (result: { root: string; config: ProjectConfig }) => void;
-  /** The modal's shared credentials-form instance, rendered while no key is stored. */
+  /** The modal's shared credentials-form instance, rendered while the gate is closed. */
   credsForm: CredsFormLike;
+  /**
+   * Whether AI is usable — a local key OR a backend holding credentials of its own. Also fires the
+   * capability probe while closed, so a managed platform's Cloudflare option can appear.
+   */
+  aiGateOpen: () => boolean;
+  /** The modal's shared keyless "Connect Cloudflare" controller, rendered beside the form. */
+  managedConnect: ManagedConnectLike;
 }
 
 let _url = "";
@@ -253,13 +267,17 @@ export function renderImportStatus(): TemplateResult {
 }
 
 export function renderImportSource(ctx: ImportTabCtx): TemplateResult {
-  if (!hasOpenAiKey()) {
+  if (!ctx.aiGateOpen()) {
     return html`
       <div class="new-project-tab-intro">
-        Importing uses an AI-guided pipeline to clone an existing site. Add an OpenAI-compatible API
-        key to continue.
+        Importing uses an AI-guided pipeline to clone an existing site.
+        ${
+          ctx.managedConnect.canOffer()
+            ? "Connect Cloudflare, or add an OpenAI-compatible API key, to continue."
+            : "Add an OpenAI-compatible API key to continue."
+        }
       </div>
-      <div class="new-project-creds">${ctx.credsForm.render()}</div>
+      <div class="new-project-creds">${ctx.managedConnect.render()} ${ctx.credsForm.render()}</div>
     `;
   }
 

package/src/new-project/new-project-modal.ts

@@ -6,7 +6,10 @@
  * (colors, fonts, logo, breakpoints — a creation-time subset of the settings modal), prefilled from
  * the chosen source and customizable before anything is written.
  *
- * Import and Agent are gated behind the AI credentials form until a key is stored.
+ * Import and Agent need working AI, so both are gated until credentials exist — a key stored in
+ * this browser, or a backend that holds its own (managed cloud platforms, env-keyed dev servers).
+ * While gated they offer the same two paths as the assistant sidebar: connect Cloudflare for
+ * Workers AI, or bring a key.
  */
 
 import { html } from "lit-html";
@@ -14,9 +17,10 @@ import { errorMessage } from "@jxsuite/schema/parse";
 import { openModal } from "../ui/layers";
 import { getPlatform } from "../platform";
 import { installUrlOf } from "../platform-errors";
-import { hasOpenAiKey } from "../services/ai-settings";
+import { hasAiCredentials } from "../services/ai-models";
 import { setPendingAgentPrompt } from "../services/agent-seed";
 import { createAiCredentialsForm } from "../ui/ai-credentials-form";
+import { createManagedConnect } from "../ui/ai-managed-connect";
 import { PROJECT_TEMPLATES } from "./templates";
 import { collectDesign, renderDesignFields, resetDesignFields } from "./design-fields";
 import {
@@ -98,22 +102,44 @@ let _resolve: ((result: { root: string; config: ProjectConfig } | null) => void)
 // Before a platform is registered (the form fetches models through the platform on edit).
 let _credsForm: ReturnType<typeof createAiCredentialsForm> | null = null;
 
+function rerenderIfOpen() {
+  if (_handle) {
+    renderModal();
+  }
+}
+
 function credsForm() {
   _credsForm ??= createAiCredentialsForm({
-    onSaved: () => {
-      if (_handle) {
-        renderModal();
-      }
-    },
-    requestRender: () => {
-      if (_handle) {
-        renderModal();
-      }
-    },
+    onSaved: rerenderIfOpen,
+    requestRender: rerenderIfOpen,
   });
   return _credsForm;
 }
 
+/**
+ * The keyless "Connect Cloudflare" option shown beside the key form on managed platforms — the same
+ * controller the assistant sidebar uses. Lazy for the same reason as the form above.
+ */
+let _managedConnect: ReturnType<typeof createManagedConnect> | null = null;
+
+function managedConnect() {
+  _managedConnect ??= createManagedConnect({ requestRender: rerenderIfOpen });
+  return _managedConnect;
+}
+
+/**
+ * The Import and Agent tabs need working AI, which a managed platform can supply without any local
+ * key. Probe on every gated render so the Cloudflare option appears as soon as the backend
+ * answers.
+ */
+function aiGateOpen(): boolean {
+  if (hasAiCredentials()) {
+    return true;
+  }
+  managedConnect().ensureProbe();
+  return false;
+}
+
 /**
  * Open the New Project modal. Returns a promise that resolves with the created project info (or
  * null if cancelled).
@@ -235,8 +261,10 @@ function sourceLabel(): string {
 function renderModal() {
   const platform = getPlatform();
   const importCtx: ImportTabCtx = {
+    aiGateOpen,
     credsForm: credsForm(),
     form: _form,
+    managedConnect: managedConnect(),
     onDone: finish,
     rerender: renderModal,
     resolveDestination: () => validateParams(),
@@ -469,13 +497,17 @@ function renderModal() {
       : html`<div class="new-project-tab-intro">No starter sites are available.</div>`;
 
   const agentSourceTpl = () => {
-    if (!hasOpenAiKey()) {
+    if (!aiGateOpen()) {
       return html`
         <div class="new-project-tab-intro">
-          The agent uses your AI provider to build the site. Add an OpenAI-compatible API key to
-          continue.
+          The agent uses your AI provider to build the site.
+          ${
+            managedConnect().canOffer()
+              ? "Connect Cloudflare, or add an OpenAI-compatible API key, to continue."
+              : "Add an OpenAI-compatible API key to continue."
+          }
         </div>
-        <div class="new-project-creds">${credsForm().render()}</div>
+        <div class="new-project-creds">${managedConnect().render()} ${credsForm().render()}</div>
       `;
     }
     return html`
@@ -597,7 +629,7 @@ function renderModal() {
       `;
     }
     if (_step === "source") {
-      const gated = (_tab === "import" || _tab === "agent") && !hasOpenAiKey();
+      const gated = (_tab === "import" || _tab === "agent") && !aiGateOpen();
       return html`
         <sp-button variant="secondary" @click=${closeNewProjectModal}>Cancel</sp-button>
         ${gated ? "" : html`<sp-button variant="accent" @click=${goNext}>Next</sp-button>`}