spawnfile 0.1.24 → 0.1.27

package/dist/compiler/training/plan/load.js

@@ -1,3 +1,4 @@
+import { checkTrainingFilename } from "../../../shared/index.js";
 import { lstat, readFile, realpath, stat } from "node:fs/promises";
 import { createHash } from "node:crypto";
 import path from "node:path";
@@ -65,6 +66,7 @@ const loadDataFileSource = async (root, file, declaredBy) => {
     const context = `Invalid training file ${file} declared by ${declaredBy}:`;
     if (!inside(root, file))
         invalidTraining(`${context} must be inside project root ${root}`);
+    checkTrainingFilename(file);
     const realPath = await realpath(file).catch((error) => invalidTraining(`${context} must be an existing regular file: ${reason(error)}`));
     if (!inside(root, realPath))
         invalidTraining(`${context} must be inside project root ${root} (no symlink escape)`);

package/dist/compiler/training/preparation/assets/Dockerfile

@@ -48,12 +48,6 @@ RUN mkdir -p /run/training/inputs /run/training/output /run/training/slots \
 COPY claude/package.json claude/package-lock.json /opt/training/claude/
 RUN cd /opt/training/claude && npm ci --omit=dev
 
-WORKDIR /opt/training/paideia
-COPY paideia/package.json paideia/package-lock.json ./
-RUN npm ci --omit=dev --omit=peer --ignore-scripts \
- && mkdir -p node_modules/@noopolis \
- && ln -s /opt/spawnfile/runtime-installs/daimon/node_modules/@noopolis/daimon node_modules/@noopolis/daimon
-
 WORKDIR /opt/training/spawnfile
 COPY spawnfile/package.json spawnfile/package-lock.json ./
 RUN npm ci --omit=dev --ignore-scripts
@@ -62,10 +56,10 @@ WORKDIR /opt/training/compiler
 COPY compiler/package.json compiler/package-lock.json ./
 RUN npm ci --omit=dev --ignore-scripts
 
-COPY bridge/requirements.lock /opt/training/paideia/bridges/dspy/requirements.lock
-RUN /opt/python/bin/python3 -m venv /opt/training/paideia/bridges/dspy/.venv \
- && /opt/training/paideia/bridges/dspy/.venv/bin/pip install --no-cache-dir -r /opt/training/paideia/bridges/dspy/requirements.lock \
- && /opt/training/paideia/bridges/dspy/.venv/bin/pip install --no-cache-dir setuptools==80.9.0
+COPY spawnfile/dist/training/dspy/requirements.lock /opt/training/spawnfile/dist/training/dspy/requirements.lock
+RUN /opt/python/bin/python3 -m venv /opt/training/spawnfile/dist/training/dspy/.venv \
+ && /opt/training/spawnfile/dist/training/dspy/.venv/bin/pip install --no-cache-dir -r /opt/training/spawnfile/dist/training/dspy/requirements.lock \
+ && /opt/training/spawnfile/dist/training/dspy/.venv/bin/pip install --no-cache-dir setuptools==80.9.0
 
 # Exactly `chmod -R a+rX /opt/training`, but only entries that need a change are
 # touched, so unchanged lower-layer files are never copied up into a new layer.
@@ -79,18 +73,16 @@ RUN find /opt/training \( \( -type d ! -perm -0555 \) -o \( ! -type d ! -type l
  && install -o root -g root -m 0555 /opt/spawnfile/runtime-installs/daimon/bin/grok /usr/local/bin/grok \
  && install -o root -g root -m 0555 /opt/spawnfile/runtime-installs/daimon/bin/daimon-engine-broker /opt/daimon/bin/daimon-engine-broker \
  && ln -s /opt/training/claude/node_modules/.bin/claude /opt/training/bin/claude \
- && ln -s /opt/training/paideia/dist/src/cli/main.js /opt/training/bin/paideia \
  && ln -s /opt/training/spawnfile/dist/cli/index.js /opt/training/bin/spawnfile \
  && mkdir -p /opt/training/integration/node_modules/@noopolis \
- && ln -s /opt/training/paideia /opt/training/integration/node_modules/@noopolis/paideia \
  && ln -s /opt/training/spawnfile /opt/training/integration/node_modules/spawnfile \
  && ln -s /opt/spawnfile/runtime-installs/daimon/node_modules/@noopolis/daimon /opt/training/integration/node_modules/@noopolis/daimon \
  && mkdir -p /opt/training/spawnfile/node_modules/@noopolis \
  && ln -s /opt/spawnfile/runtime-installs/daimon/node_modules/@noopolis/daimon /opt/training/spawnfile/node_modules/@noopolis/daimon
 
-COPY bridge /opt/training/paideia/bridges/dspy
-RUN /opt/training/paideia/bridges/dspy/.venv/bin/pip install --no-deps --no-build-isolation -e /opt/training/paideia/bridges/dspy \
- && find /opt/training/paideia/bridges/dspy \( \( -type d ! -perm -0555 \) -o \( ! -type d ! -type l \( ! -perm -0444 -o \( \( -perm -0100 -o -perm -0010 -o -perm -0001 \) ! -perm -0111 \) \) \) \) -exec chmod a+rX {} +
+COPY spawnfile/dist/training/dspy /opt/training/spawnfile/dist/training/dspy
+RUN /opt/training/spawnfile/dist/training/dspy/.venv/bin/pip install --no-deps --no-build-isolation -e /opt/training/spawnfile/dist/training/dspy \
+ && find /opt/training/spawnfile/dist/training/dspy \( \( -type d ! -perm -0555 \) -o \( ! -type d ! -type l \( ! -perm -0444 -o \( \( -perm -0100 -o -perm -0010 -o -perm -0001 \) ! -perm -0111 \) \) \) \) -exec chmod a+rX {} +
 
 # No Grok binary: `spawnfile.training-container.v3` runs the native parent's pinned
 # /usr/local/bin/grok through the broker, so a second copy could only be an unattested build.
@@ -101,9 +93,8 @@ COPY spawnfile/runtimes.yaml spawnfile/moltnet-releases.json /opt/training/spawn
 COPY compiler/dist /opt/training/compiler/dist
 COPY integration /opt/training/integration
 COPY bootstrap /opt/training/bootstrap
-COPY paideia/dist /opt/training/paideia/dist
 COPY spawnfile/dist /opt/training/spawnfile/dist
-ENV PATH=/opt/training/bin:/opt/training/paideia/bridges/dspy/.venv/bin:/opt/spawnfile/runtime-installs/daimon/bin:/usr/local/bin:/usr/bin:/bin
+ENV PATH=/opt/training/bin:/opt/training/spawnfile/dist/training/dspy/.venv/bin:/opt/spawnfile/runtime-installs/daimon/bin:/usr/local/bin:/usr/bin:/bin
 ENV HOME=/home/training
 WORKDIR /work
 ENTRYPOINT ["/opt/training/bin/train"]