@avocadostudio-ai/orchestrator-core 0.4.0 → 0.5.0

package/dist/agent/agent-logger.js

@@ -4,7 +4,8 @@
  */
 import { appendFileSync } from "node:fs";
 import { resolve } from "node:path";
-const LOG_PATH = resolve(process.cwd(), "../../.data/agent-log.ndjson");
+import { resolveDataDir } from "../state/data-dir.js";
+const LOG_PATH = resolve(resolveDataDir(), "agent-log.ndjson");
 export function logAgent(streamId, event, detail, startedAt) {
     const entry = {
         ts: Date.now(),

package/dist/handler/create-orchestrator.js

@@ -51,6 +51,7 @@ import { createCmsBootstrapCache } from "../cms/bootstrap.js";
 import { resolveCapabilities } from "../cms/adapter.js";
 import { mediaSourceFromUnknown } from "../cms/media-sources.js";
 import { isAccessGateEnabled, mintAccessToken, verifyAccessPassword } from "../http/access-tokens.js";
+import { declareLibraryMount, observeLibraryMount } from "./library-mount.js";
 import { checkAuth, resolveAuth } from "./auth.js";
 import { setSiteAssetLister, invalidateSiteAssets } from "../state/site-assets.js";
 const defaultModelLookup = () => ({
@@ -416,16 +417,40 @@ export function createOrchestrator(config = {}) {
     const gateLogger = config.logger ?? consoleLogger();
     {
         const resolved = resolveAuth(config.auth);
-        const line = `[auth] library mode: ${resolved.mode} — ${resolved.reason}`;
+        /*
+         * `next build` evaluates this route module to collect its exports, with
+         * `NODE_ENV=production` and none of the deployment's environment. With no
+         * credential configured the gate resolves to `closed` and this printed a
+         * red `[error]` in the middle of an otherwise clean, *successful* build —
+         * about a request that is not being served, on a machine that is not the
+         * deployment.
+         *
+         * It is still the only notice anyone gets of a real problem, so it is not
+         * silenced: during a build it is a warning that says which state it is
+         * describing. At runtime it stays an error, because then it means every
+         * request is actually being refused.
+         */
+        const building = process.env.NEXT_PHASE === "phase-production-build";
+        const line = building
+            ? `[auth] library mode: ${resolved.mode} — ${resolved.reason} ` +
+                `(evaluated during the build; set ACCESS_PASSWORD_HASH or ` +
+                `ORCHESTRATOR_ACCESS_TOKEN in the deployment's environment, not here)`
+            : `[auth] library mode: ${resolved.mode} — ${resolved.reason}`;
         if (resolved.mode === "closed")
-            gateLogger.error(line);
+            building ? gateLogger.warn(line) : gateLogger.error(line);
         else if (resolved.mode === "open-dev")
             gateLogger.warn(line);
         else
             gateLogger.info(line);
     }
+    // Tell the SDK's draft fetch where we are, so it stops defaulting to the
+    // standalone orchestrator on :4200 that a library-mode site does not run.
+    // See `library-mount.ts` for why this is not simply a config value.
+    if (config.previewUrl)
+        declareLibraryMount(`${config.previewUrl.replace(/\/+$/, "")}${basePath}`);
     const handler = async function handler(request) {
         const url = new URL(request.url);
+        observeLibraryMount(`${url.origin}${basePath}`);
         const path = stripBasePath(url.pathname, basePath);
         const cors = corsHeadersFor(request, config);
         if (request.method === "OPTIONS") {

package/dist/handler/library-mount.d.ts

@@ -0,0 +1,6 @@
+export declare const LIBRARY_MOUNT_KEY = "__avocado_library_mount__";
+/** Called at construction, from `previewUrl` + `basePath`. */
+export declare function declareLibraryMount(url: string): void;
+/** Called on each request, from the URL the runtime actually received. */
+export declare function observeLibraryMount(url: string): void;
+export declare function getLibraryMount(): string | null;

package/dist/handler/library-mount.js

@@ -0,0 +1,45 @@
+/*
+ * Where this process's own orchestrator is mounted, if it has one.
+ *
+ * In library mode the orchestrator is a route inside the site's own Next app,
+ * and the SDK's draft fetch had no way to know that: with `ORCHESTRATOR_URL`
+ * unset it fell back to `http://127.0.0.1:4200`, the *standalone* orchestrator,
+ * which a library-mode site by definition does not run. The failure is silent
+ * when nothing is listening there (the draft fetch fails, the preview falls back
+ * to published content, and every edit appears to do nothing) and worse when
+ * something is — the fetch succeeds against a foreign process and the preview
+ * renders another project's pages. Anyone integrating is likely to have a :4200
+ * up, because that is what the standalone stack runs on.
+ *
+ * So the handler records its own address, and `getOrchestratorUrl()` in the SDK
+ * reads it through the same `globalThis` key. The key is a string on both sides
+ * rather than an import because `@avocadostudio-ai/orchestrator-core` is an
+ * *optional* peer of the SDK — a site that is not in library mode does not have
+ * it installed, and neither package may require the other.
+ *
+ * Two sources, in order of trust:
+ *   - the origin of a real request this handler served, which cannot be wrong;
+ *   - `config.previewUrl + basePath` at construction time, which is available
+ *     before any request and is what covers a preview page that renders before
+ *     the orchestrator route module has ever been evaluated.
+ */
+export const LIBRARY_MOUNT_KEY = "__avocado_library_mount__";
+function slot() {
+    const g = globalThis;
+    return g[LIBRARY_MOUNT_KEY] ?? (g[LIBRARY_MOUNT_KEY] = {});
+}
+/** Called at construction, from `previewUrl` + `basePath`. */
+export function declareLibraryMount(url) {
+    slot().declared = url.replace(/\/+$/, "");
+}
+/** Called on each request, from the URL the runtime actually received. */
+export function observeLibraryMount(url) {
+    const s = slot();
+    const next = url.replace(/\/+$/, "");
+    if (s.observed !== next)
+        s.observed = next;
+}
+export function getLibraryMount() {
+    const s = slot();
+    return s.observed ?? s.declared ?? null;
+}

package/dist/image/image-helpers.js

@@ -1,6 +1,7 @@
 import { mkdir, writeFile } from "node:fs/promises";
 import { resolve } from "node:path";
 import OpenAI from "openai";
+import { resolveDataDir } from "../state/data-dir.js";
 import { listImages, fileNameToAlt, resolveGdriveFolderId } from "./gdrive-client.js";
 // ---------------------------------------------------------------------------
 // Image generation timing — rolling average for progress estimation
@@ -218,7 +219,7 @@ export async function generateVariationImageWithOpenAI(args) {
     const background = args.background ?? "auto";
     const outputFormat = args.outputFormat ?? "png";
     const client = new OpenAI({ apiKey: process.env.OPENAI_API_KEY });
-    const generatedImageDir = process.env.ORCHESTRATOR_GENERATED_IMAGE_DIR ?? resolve(process.cwd(), "../../.data/generated-images");
+    const generatedImageDir = process.env.ORCHESTRATOR_GENERATED_IMAGE_DIR ?? resolve(resolveDataDir(), "generated-images");
     const orchestratorPublicOrigin = (process.env.ORCHESTRATOR_PUBLIC_ORIGIN ?? "http://localhost:4200").replace(/\/+$/, "");
     args.log?.info({ event: "openai_image_start", model, size, background, outputFormat, promptLength: args.prompt.length }, "Starting OpenAI image generation");
     const genStartMs = Date.now();
@@ -270,7 +271,7 @@ export async function generateVariationImageWithOpenAI(args) {
 // Shared image save utility
 // ---------------------------------------------------------------------------
 export async function saveGeneratedImage(bytes, prefix = "gen", ext = "png") {
-    const generatedImageDir = process.env.ORCHESTRATOR_GENERATED_IMAGE_DIR ?? resolve(process.cwd(), "../../.data/generated-images");
+    const generatedImageDir = process.env.ORCHESTRATOR_GENERATED_IMAGE_DIR ?? resolve(resolveDataDir(), "generated-images");
     const orchestratorPublicOrigin = (process.env.ORCHESTRATOR_PUBLIC_ORIGIN ?? "http://localhost:4200").replace(/\/+$/, "");
     const fileName = `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}.${ext}`;
     await mkdir(generatedImageDir, { recursive: true });

package/dist/publish/publish-helpers.js

@@ -4,6 +4,7 @@ import { existsSync } from "node:fs";
 import { copyFile, mkdir, readFile, writeFile } from "node:fs/promises";
 import { promisify } from "node:util";
 import { resolve } from "node:path";
+import { resolveDataDir } from "../state/data-dir.js";
 import { pageDocSchema } from "@avocadostudio-ai/shared";
 import { draftPages, versions, ensureHeroImageProps, persistStateNow, getSessionPages, getSiteConfig, isLegacySiteId } from "../state/session-state.js";
 import { toErrorDetail } from "../ops/ops-engine.js";
@@ -413,7 +414,7 @@ export async function publishViaGit(session, content) {
     let copiedImages = false;
     if (imageUrlMap.size > 0) {
         const generatedImageDir = process.env.ORCHESTRATOR_GENERATED_IMAGE_DIR ??
-            resolve(process.cwd(), "../../.data/generated-images");
+            resolve(resolveDataDir(), "generated-images");
         await mkdir(imageDestDir, { recursive: true });
         for (const [, fileName] of imageUrlMap) {
             const src = resolve(generatedImageDir, fileName);

package/dist/state/data-dir.d.ts

@@ -0,0 +1,6 @@
+export declare function isLegacyMonorepoLayout(cwd?: string): boolean;
+/**
+ * The `.data` directory for this process, or the legacy monorepo one when this
+ * really is a package inside the monorepo and that directory already exists.
+ */
+export declare function resolveDataDir(cwd?: string): string;

package/dist/state/data-dir.js

@@ -0,0 +1,35 @@
+import { existsSync } from "node:fs";
+import { resolve } from "node:path";
+/*
+ * Where this process keeps its own files: the database, generated images, the
+ * agent log.
+ *
+ * The answer is `<cwd>/.data`. It used to be `<cwd>/../../.data`, which is
+ * `apps/orchestrator`'s position in *this* repo and nobody else's — a
+ * library-mode host runs from its own project root, so it wrote two directories
+ * above itself, outside the project and outside version control, into a
+ * directory shared with every sibling checkout that made the same mistake.
+ *
+ * The legacy location is still honoured for an existing monorepo checkout, but
+ * only on proof of workspace membership. The first version of that back-compat
+ * check asked `existsSync(legacy)` alone — "has anyone ever created that file",
+ * not "am I a package in the workspace that owns it" — so one mistaken write
+ * captured every unrelated project under that parent, permanently, because the
+ * bug is what created the file that re-triggered it.
+ */
+export function isLegacyMonorepoLayout(cwd = process.cwd()) {
+    return (existsSync(resolve(cwd, "../../pnpm-workspace.yaml")) &&
+        existsSync(resolve(cwd, "package.json")));
+}
+/**
+ * The `.data` directory for this process, or the legacy monorepo one when this
+ * really is a package inside the monorepo and that directory already exists.
+ */
+export function resolveDataDir(cwd = process.cwd()) {
+    if (isLegacyMonorepoLayout(cwd)) {
+        const legacy = resolve(cwd, "../../.data");
+        if (existsSync(legacy))
+            return legacy;
+    }
+    return resolve(cwd, ".data");
+}

package/dist/state/sqlite-store-singleton.js

@@ -2,6 +2,7 @@ import { existsSync } from "node:fs";
 import { rename, readFile, readdir, stat, unlink } from "node:fs/promises";
 import { basename, dirname, resolve } from "node:path";
 import { SqliteStore } from "./sqlite-store.js";
+import { resolveDataDir } from "./data-dir.js";
 // ---------------------------------------------------------------------------
 // Config
 // ---------------------------------------------------------------------------
@@ -17,23 +18,8 @@ export function resolveDbFile() {
         return ":memory:";
     if (process.env.NODE_ENV === "test")
         return ":memory:";
-    /*
-     * `../../.data` is this monorepo's shape, not a general default.
-     *
-     * It is right for `apps/orchestrator`, whose cwd is two levels under the repo
-     * root, and wrong for everyone else: a library-mode host running from its own
-     * project root writes two directories *above* itself. PBA's landed in
-     * `~/Projects/.data` — outside the project, outside version control, and
-     * shared with any sibling checkout that made the same mistake.
-     *
-     * The default is now the host's own `.data/`. The legacy path still wins when
-     * a database is already sitting there, so an existing monorepo checkout keeps
-     * its state without an env var and without a migration step.
-     */
-    const legacy = resolve(process.cwd(), "../../.data/orchestrator.db");
-    if (existsSync(legacy))
-        return legacy;
-    return resolve(process.cwd(), ".data/orchestrator.db");
+    // `resolveDataDir` carries the whole story of why this is not `../../.data`.
+    return resolve(resolveDataDir(), "orchestrator.db");
 }
 export function resolveJsonMigrationTtlDays() {
     const raw = Number(process.env.ORCHESTRATOR_JSON_MIGRATION_TTL_DAYS ?? 14);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avocadostudio-ai/orchestrator-core",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "type": "module",
   "exports": {
     "./package.json": "./package.json",
@@ -23,8 +23,8 @@
     "openai": "^4.87.1",
     "sharp": "^0.34.5",
     "zod": "^4.3.6",
-    "@avocadostudio-ai/migration-sdk": "^0.4.0",
-    "@avocadostudio-ai/shared": "^0.4.0"
+    "@avocadostudio-ai/migration-sdk": "^0.5.0",
+    "@avocadostudio-ai/shared": "^0.5.0"
   },
   "devDependencies": {
     "@google/genai": "^1.46.0",