@malloy-publisher/server 0.9.9 → 0.9.10

package/dist/app/index.html

@@ -16,7 +16,7 @@ SPDX-License-Identifier: MIT
          href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500&display=swap"
       />
       <title>Malloy Publisher</title>
-     <script type="module" crossorigin src="/assets/index-BK0mbcyQ.js"></script>
+     <script type="module" crossorigin src="/assets/index-BvSbJtsT.js"></script>
      <link rel="stylesheet" crossorigin href="/assets/index-DUqldpo0.css">
    </head>
    <body>

package/dist/package_load_worker.mjs

@@ -20619,6 +20619,12 @@ function ownLevelNoteTexts(annote) {
 function ownLevelNotes(annote) {
   return [...annote?.blockNotes ?? [], ...annote?.notes ?? []];
 }
+function sameNotePosition(a, b) {
+  return a.url === b.url && a.range.start.line === b.range.start.line && a.range.start.character === b.range.start.character && a.range.end.line === b.range.end.line && a.range.end.character === b.range.end.character;
+}
+function notePositionKey(at) {
+  return `${at.url}#${at.range.start.line}:${at.range.start.character}-${at.range.end.line}:${at.range.end.character}`;
+}
 
 // src/service/notebook.ts
 var ARTIFACT_NOTE = {
@@ -23480,6 +23486,9 @@ function extractSourcesFromModelDef(modelDef, givens, onParseError) {
   const authorizeMap = new Map;
   const misplacedAuthorize = [];
   const gatedSourceOwnAuthorizeNotes = new Set;
+  const gatedSourceOwnAuthorizeNoteKeys = new Set;
+  const noteKey = (note) => `${notePositionKey(note.at)}#${note.text}`;
+  const isGatedSourceOwnNote = (note) => gatedSourceOwnAuthorizeNotes.has(note) || gatedSourceOwnAuthorizeNoteKeys.has(noteKey(note));
   const authorizeNoteDeclaredBy = new Map;
   const nearMissAuthorize = [];
   const sweptStructs = [];
@@ -23491,6 +23500,7 @@ function extractSourcesFromModelDef(modelDef, givens, onParseError) {
     for (const note of ownLevelNotes(struct.annotations)) {
       if (containsAuthorizeAnnotationTag([note.text])) {
         gatedSourceOwnAuthorizeNotes.add(note);
+        gatedSourceOwnAuthorizeNoteKeys.add(noteKey(note));
         considerNoteOwner(authorizeNoteDeclaredBy, note, struct);
       }
     }
@@ -23509,6 +23519,7 @@ function extractSourcesFromModelDef(modelDef, givens, onParseError) {
     for (const note of ownLevelNotes(entry.annotations)) {
       if (containsAuthorizeAnnotationTag([note.text])) {
         gatedSourceOwnAuthorizeNotes.add(note);
+        gatedSourceOwnAuthorizeNoteKeys.add(noteKey(note));
         considerNoteOwner(authorizeNoteDeclaredBy, note, entry);
       }
     }
@@ -23607,7 +23618,7 @@ function extractSourcesFromModelDef(modelDef, givens, onParseError) {
       const fieldAuthorizeNotes = ownLevelNotes(field.annotations).filter((note) => containsAuthorizeAnnotationTag([note.text]));
       if (fieldAuthorizeNotes.length === 0)
         continue;
-      if (fieldAuthorizeNotes.every((note) => gatedSourceOwnAuthorizeNotes.has(note))) {
+      if (fieldAuthorizeNotes.every(isGatedSourceOwnNote)) {
         continue;
       }
       const fieldName = field.as || field.name;
@@ -26408,8 +26419,7 @@ async function prepareForMainThread(job, malloyConfig, load, model) {
     contents: model.model._modelDef.contents,
     getRuntime: companionRuntime
   }) ?? null : undefined;
-  if (wantsPlan && (load.planLeftToMainThread || pastDeadline())) {
-    load.planLeftToMainThread = true;
+  if (wantsPlan && load.planLeftToMainThread) {
     wantsPlan = false;
   }
   if (wantsPlan && companion !== undefined && !load.failed) {

package/dist/server.mjs

@@ -262101,11 +262101,6 @@ var require_utils93 = __commonJS((exports, module) => {
   };
 });
 
-// ../../node_modules/ssh2/lib/protocol/crypto/build/Release/sshcrypto.node
-var require_sshcrypto = __commonJS((exports, module) => {
-  module.exports = __require("./sshcrypto-cqb52edz.node");
-});
-
 // ../../node_modules/ssh2/lib/protocol/crypto/poly1305.js
 var require_poly1305 = __commonJS((exports, module) => {
   var __dirname = "/home/runner/work/publisher/publisher/node_modules/ssh2/lib/protocol/crypto", __filename = "/home/runner/work/publisher/publisher/node_modules/ssh2/lib/protocol/crypto/poly1305.js";
@@ -262592,7 +262587,7 @@ var require_crypto = __commonJS((exports, module) => {
   var ChaChaPolyDecipher;
   var GenericDecipher;
   try {
-    binding = require_sshcrypto();
+    binding = (()=>{throw new Error("Cannot require module "+"./crypto/build/Release/sshcrypto.node");})();
     ({
       AESGCMCipher,
       ChaChaPolyCipher,
@@ -336674,6 +336669,12 @@ function ownLevelNoteTexts(annote) {
 function ownLevelNotes(annote) {
   return [...annote?.blockNotes ?? [], ...annote?.notes ?? []];
 }
+function sameNotePosition(a, b) {
+  return a.url === b.url && a.range.start.line === b.range.start.line && a.range.start.character === b.range.start.character && a.range.end.line === b.range.end.line && a.range.end.character === b.range.end.character;
+}
+function notePositionKey(at) {
+  return `${at.url}#${at.range.start.line}:${at.range.start.character}-${at.range.end.line}:${at.range.end.character}`;
+}
 
 // src/service/notebook.ts
 var ARTIFACT_NOTE = {
@@ -357558,7 +357559,7 @@ source: orders_admin is orders_base extend {}
 - **Both only gate from the \`source:\` line.** The same annotation on a \`dimension:\`/\`measure:\`/\`join_*:\`/\`view:\` line, or on a top-level \`query:\`, is refused at load naming the position rather than silently protecting nothing.
 - **Every given the gate references must be declared on the entry model's own surface, and must carry no default.** In a package curated with \`index.malloy\`, "on the surface" means \`index.malloy\` imports it: import the declaring file whole, or name the given in a selective import (\`import { orders, GROUPS } from "orders.malloy"\`). A given the model cannot resolve is refused at load. So is a referenced given declared *with* a default: a caller who supplies nothing would get that default and be admitted or excluded by a value the gate's own line never shows, so it is refused rather than reasoned about case by case.
 - **A scalar/array mismatch between the operator and the given's declared type is a load-time refusal**, not a request-time warehouse error: \`org_id in $GROUPS\` requires \`GROUPS\` to be array-typed, \`region = $REGION\` requires \`REGION\` scalar. Negation is likewise refused outright, so there is no empty-given inversion surprise to warn about.
-- **Entry point only: not joined, but inherited through \`extend\`.** The gate applies to the source a query enters through. A gate on a source reached only via \`join_*\` **never fires**, at any depth, so anything ungated that joins a locked base hands the base's rows to every caller. A source that \`extend\`s a locked base and declares no gate of its own **does** carry the base's gate; declaring its own annotation replaces it. A source derived from a locked base via a query (\`source: z is locked -> { … }\`) instead **always carries the base's gate in addition to its own**: the derivation recurses into the base unconditionally, so an own gate does not replace it, and the two combine as separate AND'd entries. Pair a locked base with curated extension sources, using access modifiers (\`include { public: …, private: * }\`), so an extension re-exposes only a curated column surface, and keep sensitive sources out of ungated joins.
+- **Entry point only: not joined, but inherited through \`extend\`.** The gate applies to the source a query enters through. A gate on a source reached only via \`join_*\` **never fires**, at any depth, so anything ungated that joins a locked base hands the base's rows to every caller. A source that \`extend\`s a locked base and declares no gate of its own **does** carry the base's gate; declaring its own annotation replaces it. A source derived from a locked base via a query (\`source: z is locked -> { … }\`) instead **always carries the base's gate in addition to its own**: the derivation recurses into the base unconditionally, so an own gate does not replace it, and the two combine as separate AND'd entries. Pair a locked base with curated extension sources, using access modifiers (\`include { public: …, private: * }\`), so an extension re-exposes only a curated column surface, and keep sensitive sources out of ungated joins. A join the *caller* writes in query text is the caller entering the joined source, so that source's gate does apply to it: a lock is decided, a row filter is grafted into the join. That holds for a query source the model declares over an inline \`table(...) extend { … }\` base as much as for a table source: the join anchors on the declared source, and the derivation carries the base's gate. The author-join side has a contract of its own: when a gated entry source author-joins a tenant-scoped source, carry the tenant key in the \`on\` (\`on list_id = values.list_id and org_id = values.org_id\`), because the joined source's gate does not fire through that join and the ON is what keeps the rows to the caller's tenant. Where a join cannot be keyed that way, the entry source's own gate may reference the joined column (\`#(access_filter) values.org_id = $ORG_ID\`): that is enforced, at the cost of turning that \`join_one\` into an inner join, so a row with no match drops rather than surviving with nulls.
 - **A derivation that drops a column the gate reads fails CLOSED.** \`extend { except: org_id }\`, or an \`accept:\` that omits it, leaves the grafted filter unable to compile, so the request is denied rather than served ungated. The one hole to know: dropping the gated column and then \`rename:\`-ing a *different* column onto that exact name grafts successfully and binds the gate to the wrong column. Narrow, but real, so don't recycle a gated column's name. If a derivation's own projection needs to drop the column a row-level term would read, use a source-level term (\`'literal' in/= $GIVEN\`) instead, since it never depends on any projected column.
 - **The quoted-string and file-level forms are refused at load and no longer exist.** A quoted expression on the \`source:\` line, in either quote, a file-level \`##(…) "<expr>"\` applying to every source in the file, and the earlier \`internal dimension: authorized is <expr>\` form are all retired; the load names the rewrite. Every \`.malloy\` file in a package compiles at load and any failure aborts the package, so a retired-form gate anywhere in the package is refused. Only a declaring file *outside* the package escapes that: it loads and denies every request instead, with no compile-time hint. See your deployment's reference documentation.
 - **A gated source can be persisted, but the gating column freezes.** \`storage=\` and \`#@ preaggregate\` refuse a gated source outright; a colocated \`#@ persist\` is admitted when the gate is provably the entry point's own row filter. The gate still runs live on every query, so rows come back filtered - but the column it filters ON is frozen at build time, so a row whose access decision changes keeps being served under the old decision until the next rebuild. Pair \`#@ persist\` on a gated source with a freshness window (\`fallback="live"\`), which is the only control that bounds that - and read \`skill:malloy-materialization\` for where that window binds, because on a standalone Publisher it does not.
@@ -360467,7 +360468,7 @@ run: source -> {
 
 ## Field Paths and Joins
 
-**Use the joins the model declares.** When you answer a question over a published model, every query is rooted on one source, and you reach a joined source's fields by a dotted path within the query body (for example \`stores.region\`). Do not write \`join_one\` or \`join_many\` in an answer query, and never invent a join key. (A join written in a query does compile, and model files and notebooks use them; the rule is that an answer uses the joins the model declares.) If the field you need is on a source the model does not join, say so and ask the user to add the join to the model.
+**Use the joins the model declares.** When you answer a question over a published model, every query is rooted on one source, and you reach a joined source's fields by a dotted path within the query body (for example \`stores.region\`). Do not write \`join_one\` or \`join_many\` in an answer query, and never invent a join key. (A join written in a query does compile, and model files and notebooks use them; the rule is that an answer uses the joins the model declares.) If the field you need is on a source the model does not join, say so and ask the user to add the join to the model. If you do write a join in query text, it is gated as if you had entered that source yourself: a locked source refuses the query with a 403 that names your alias, and a row-filtered source filters the rows your join sees, so a denial on a join you wrote means the joined source refused you, not that the model is broken.
 
 The \`->\` operator separates a **source** from a **view** (query transformation). It does NOT navigate between joined sources.
 
@@ -380195,6 +380196,9 @@ function extractSourcesFromModelDef(modelDef, givens, onParseError) {
   const authorizeMap = new Map;
   const misplacedAuthorize = [];
   const gatedSourceOwnAuthorizeNotes = new Set;
+  const gatedSourceOwnAuthorizeNoteKeys = new Set;
+  const noteKey = (note) => `${notePositionKey(note.at)}#${note.text}`;
+  const isGatedSourceOwnNote = (note) => gatedSourceOwnAuthorizeNotes.has(note) || gatedSourceOwnAuthorizeNoteKeys.has(noteKey(note));
   const authorizeNoteDeclaredBy = new Map;
   const nearMissAuthorize = [];
   const sweptStructs = [];
@@ -380206,6 +380210,7 @@ function extractSourcesFromModelDef(modelDef, givens, onParseError) {
     for (const note of ownLevelNotes(struct.annotations)) {
       if (containsAuthorizeAnnotationTag([note.text])) {
         gatedSourceOwnAuthorizeNotes.add(note);
+        gatedSourceOwnAuthorizeNoteKeys.add(noteKey(note));
         considerNoteOwner(authorizeNoteDeclaredBy, note, struct);
       }
     }
@@ -380224,6 +380229,7 @@ function extractSourcesFromModelDef(modelDef, givens, onParseError) {
     for (const note of ownLevelNotes(entry.annotations)) {
       if (containsAuthorizeAnnotationTag([note.text])) {
         gatedSourceOwnAuthorizeNotes.add(note);
+        gatedSourceOwnAuthorizeNoteKeys.add(noteKey(note));
         considerNoteOwner(authorizeNoteDeclaredBy, note, entry);
       }
     }
@@ -380322,7 +380328,7 @@ function extractSourcesFromModelDef(modelDef, givens, onParseError) {
       const fieldAuthorizeNotes = ownLevelNotes(field.annotations).filter((note) => containsAuthorizeAnnotationTag([note.text]));
       if (fieldAuthorizeNotes.length === 0)
         continue;
-      if (fieldAuthorizeNotes.every((note) => gatedSourceOwnAuthorizeNotes.has(note))) {
+      if (fieldAuthorizeNotes.every(isGatedSourceOwnNote)) {
         continue;
       }
       const fieldName = field.as || field.name;
@@ -385538,12 +385544,12 @@ function resolveCallerJoin(callerJoin, compiledModelDef, region, context) {
           boundaryUnprovenAt ??= chain2.at;
         }
       }
-      return true;
+      return "caller";
     }
     const name = entry ? aliasOf(entry) : key;
     if (context.isModelSource(name)) {
       add(name, forBoundary);
-      return true;
+      return "model";
     }
     if (entry)
       return fail2(name);
@@ -385552,7 +385558,7 @@ function resolveCallerJoin(callerJoin, compiledModelDef, region, context) {
       return fail2(chain.at);
     for (const terminal of chain.terminals)
       add(terminal, forBoundary);
-    return true;
+    return "chain";
   };
   const isUnmodifiedModelQuery = (q3) => {
     if (!q3.name || !context.isModelQuery(q3.name))
@@ -385564,16 +385570,40 @@ function resolveCallerJoin(callerJoin, compiledModelDef, region, context) {
     const keys = Object.entries(compiledModelDef.contents).filter(([, value]) => isSourceDef7(value) && value.sourceID === sourceID).map(([key]) => key);
     if (keys.length === 0)
       return fail2(sourceID);
-    return keys.every((key) => byContentsKey(key, forBoundary));
+    let anchor = "model";
+    for (const key of keys) {
+      const got = byContentsKey(key, forBoundary);
+      if (!got)
+        return false;
+      if (got !== "model")
+        anchor = got;
+    }
+    return anchor;
+  };
+  const modelDeclaresSourceID = (sourceID) => {
+    const entries = Object.entries(compiledModelDef.contents).filter(([, value]) => isSourceDef7(value) && value.sourceID === sourceID);
+    return entries.length > 0 && entries.every(([key, value]) => !isCaller(value.location) && context.isModelSource(aliasOf(value) ?? key));
   };
   const resolveStruct = (struct, isJoinItself, forBoundary, depth) => {
     if (depth > RESOLVE_MAX_DEPTH)
       return fail2(callerJoin.alias);
     let anchored = false;
+    let declaredByModel = false;
     if (struct.sourceID) {
-      if (!bySourceID(struct.sourceID, forBoundary))
+      const anchor = bySourceID(struct.sourceID, forBoundary);
+      if (!anchor)
         return false;
       anchored = true;
+      declaredByModel = anchor === "model";
+    } else {
+      const extendsID = struct.extends;
+      if (extendsID && modelDeclaresSourceID(extendsID)) {
+        const anchor = bySourceID(extendsID, forBoundary);
+        if (!anchor)
+          return false;
+        anchored = true;
+        declaredByModel = anchor === "model";
+      }
     }
     if (struct.type === "composite") {
       composite = true;
@@ -385594,15 +385624,17 @@ function resolveCallerJoin(callerJoin, compiledModelDef, region, context) {
       if (isJoinItself && q3 && isUnmodifiedModelQuery(q3)) {
         curatedQuery = q3.name;
       }
-      const ref = q3?.structRef;
-      if (typeof ref === "string") {
-        if (!byContentsKey(ref, forBoundary))
-          return false;
-      } else if (ref && typeof ref === "object") {
-        if (!resolveStruct(ref, false, forBoundary, depth + 1))
-          return false;
-      } else {
-        return fail2(callerJoin.alias);
+      if (!declaredByModel) {
+        const ref = q3?.structRef;
+        if (typeof ref === "string") {
+          if (!byContentsKey(ref, forBoundary))
+            return false;
+        } else if (ref && typeof ref === "object") {
+          if (!resolveStruct(ref, false, forBoundary, depth + 1))
+            return false;
+        } else {
+          return fail2(callerJoin.alias);
+        }
       }
       anchored = true;
     }
@@ -386283,9 +386315,6 @@ function assertGraftedGateBindsToDeclaringSource(entryPointStruct, executedStruc
   }
   assertFilterConditionBindsToDeclaringSource(declaring, executedStruct, condition);
 }
-function rangesEqual(a, b3) {
-  return a.start.line === b3.start.line && a.start.character === b3.start.character && a.end.line === b3.end.line && a.end.character === b3.end.character;
-}
 function locationContains(outer, inner) {
   if (outer.url !== inner.url)
     return false;
@@ -386333,7 +386362,7 @@ function findSiblingAnnotationDeclaringSource(note, resolveSibling) {
     if (!isSourceDef8(value))
       continue;
     for (const candidate of ownLevelNotes2(value.annotations)) {
-      if (candidate.at && candidate.at.url === note.at.url && rangesEqual(candidate.at.range, note.at.range)) {
+      if (candidate.at && sameNotePosition(candidate.at, note.at)) {
         return value;
       }
     }
@@ -386381,7 +386410,7 @@ function siblingCandidateOwnsCondition(candidate, condition) {
     if (c3.code !== condition.code)
       return false;
     const candidateAt = firstFieldUsageLocation(c3);
-    return !!candidateAt && candidateAt.url === at2.url && rangesEqual(candidateAt.range, at2.range);
+    return !!candidateAt && sameNotePosition(candidateAt, at2);
   });
 }
 function conditionReadsNoField(condition) {
@@ -394137,7 +394166,7 @@ ${query}`);
   }
 }
 // package.json
-var version2 = "0.9.9";
+var version2 = "0.9.10";
 
 // src/version.ts
 var SERVER_VERSION = version2;

package/package.json

@@ -19,7 +19,7 @@
       "snowflake"
    ],
    "homepage": "https://docs.malloydata.dev/documentation/user_guides/publishing/mcp_agents",
-   "version": "0.9.9",
+   "version": "0.9.10",
    "main": "dist/server.mjs",
    "bin": {
       "malloy-publisher": "dist/server.mjs"