@treeseed/sdk 0.6.8 → 0.6.9

package/dist/operations/services/config-runtime.js

@@ -1411,9 +1411,14 @@ function collectTreeseedConfigSeedValues(tenantRoot, scope, env = process.env) {
   }
   return filterEnvironmentValuesByRegistry({
     ...machineValues,
-    ...Object.fromEntries(Object.entries(env).map(([key, value]) => [key, value ?? void 0]))
+    ...nonEmptyEnvironmentValues(env)
   }, registry, scope);
 }
+function nonEmptyEnvironmentValues(env = process.env) {
+  return Object.fromEntries(
+    Object.entries(env).filter(([, value]) => typeof value === "string" && value.length > 0)
+  );
+}
 function collectTreeseedConfigSeedValueSources(tenantRoot, scope, env = process.env) {
   warnDeprecatedTreeseedLocalEnvFiles(tenantRoot);
   const registry = collectTreeseedEnvironmentContext(tenantRoot);
@@ -1458,7 +1463,8 @@ function resolveTreeseedLaunchEnvironment({
     }
   }
   const registry = collectTreeseedEnvironmentContext(tenantRoot);
-  const seedValues = scope === "local" ? { ...baseEnv, ...machineValues } : { ...machineValues, ...baseEnv };
+  const baseValues = nonEmptyEnvironmentValues(baseEnv);
+  const seedValues = scope === "local" ? { ...baseValues, ...machineValues } : { ...machineValues, ...baseValues };
   const suggestedValues = getTreeseedEnvironmentSuggestedValues({
     scope,
     purpose: "deploy",
@@ -1470,7 +1476,7 @@ function resolveTreeseedLaunchEnvironment({
   const nonSecretSuggestedValues = Object.fromEntries(
     registry.entries.filter((entry) => entry.sensitivity !== "secret" && typeof suggestedValues[entry.id] === "string" && suggestedValues[entry.id].length > 0).map((entry) => [entry.id, suggestedValues[entry.id]])
   );
-  const scopedValues = scope === "local" ? { ...nonSecretSuggestedValues, ...baseEnv, ...machineValues } : { ...nonSecretSuggestedValues, ...machineValues, ...baseEnv };
+  const scopedValues = scope === "local" ? { ...nonSecretSuggestedValues, ...baseValues, ...machineValues } : { ...nonSecretSuggestedValues, ...machineValues, ...baseValues };
   return {
     ...scopedValues,
     ...overrides

package/dist/operations/services/package-reference-policy.js

@@ -224,10 +224,26 @@ function collectInternalDevReferenceIssues(root = workspaceRoot(), packageNames
     for (const lockName of ["package-lock.json", "npm-shrinkwrap.json"]) {
       const lockPath = resolve(lockRoot.dir, lockName);
       if (!existsSync(lockPath)) continue;
-      const source = readFileSync(lockPath, "utf8");
+      const lockfile = readJson(lockPath);
+      const packageEntries = lockfile.packages && typeof lockfile.packages === "object" ? Object.values(lockfile.packages) : [];
       for (const packageName of packageNames) {
-        if (source.includes(`${packageName}.git#`) || source.includes(`${packageName}#`) || /-dev\.[0-9A-Za-z.-]+/u.test(source)) {
-          issues.push({ repoName: lockRoot.name, filePath: lockPath, spec: packageName, reason: "lockfile-dev-ref" });
+        const entries = [
+          lockfile.dependencies?.[packageName],
+          ...packageEntries.map((entry) => entry && typeof entry === "object" ? entry.dependencies?.[packageName] : null)
+        ];
+        for (const entry of entries) {
+          if (!entry || typeof entry !== "object") continue;
+          const record = entry;
+          const spec = [
+            record.version,
+            record.resolved,
+            record.from
+          ].map((value) => typeof value === "string" ? value : "").find(
+            (value) => isGitDependencySpec(value) || devTagFromDependencySpec(value) || isPrereleaseVersion(value)
+          );
+          if (spec) {
+            issues.push({ repoName: lockRoot.name, filePath: lockPath, spec, reason: "lockfile-dev-ref", dependencyName: packageName });
+          }
         }
       }
     }

package/dist/scripts/prepare.js

@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+
+import { spawnSync } from 'node:child_process';
+
+if (process.env.TREESEED_SKIP_PACKAGE_PREPARE === '1') {
+	process.exit(0);
+}
+
+const result = spawnSync('npm', ['run', 'build:dist'], {
+	stdio: 'inherit',
+	shell: process.platform === 'win32',
+});
+
+process.exit(result.status ?? 1);

package/dist/verification.js

@@ -51,6 +51,21 @@ function createActArgs(eventName, workflowPath) {
 }
 function createWorkspaceActWorkflow(options) {
   const relativePackageRoot = relative(options.workspaceRoot, options.packageRoot).replace(/\\/g, "/");
+  const siblingLinkCommands = options.localTreeseedSiblingDependencies.map((packageName) => {
+    const [, packageShortName] = packageName.split("/");
+    const packageDir = `packages/${packageShortName}`;
+    const packageScope = packageName.split("/")[0];
+    const linkParent = `node_modules/${packageScope}`;
+    const linkTarget = relative(
+      resolve(options.packageRoot, linkParent),
+      resolve(options.workspaceRoot, packageDir)
+    ).replace(/\\/g, "/");
+    return [
+      `mkdir -p ${linkParent}`,
+      `rm -rf ${linkParent}/${packageShortName}`,
+      `ln -s ${linkTarget} ${linkParent}/${packageShortName}`
+    ].join("\n");
+  }).join("\n");
   const siblingPreparationCommands = options.localTreeseedSiblingDependencies.map((packageName) => {
     const packageDir = `packages/${packageName.split("/")[1]}`;
     const manifest = readPackageManifest(resolve(options.workspaceRoot, packageDir, "package.json"));
@@ -111,13 +126,19 @@ ${siblingPreparationCommands.split("\n").map((line) => `          ${line}`).join
 
 ` : ""}      - name: Install dependencies
         run: |
+          node -e "const fs = require('fs'); const p = JSON.parse(fs.readFileSync('package.json', 'utf8')); if (p.scripts) delete p.scripts.prepare; fs.writeFileSync('package.json', JSON.stringify(p, null, '\\t') + '\\n');"
           if test -f package-lock.json; then
             npm ci --workspaces=false
           else
             npm install --workspaces=false --no-audit --no-fund
           fi
+          git checkout -- package.json || true
 
-      - name: Verify package
+${siblingLinkCommands ? `      - name: Link local Treeseed dependencies
+        run: |
+${siblingLinkCommands.split("\n").map((line) => `          ${line}`).join("\n")}
+
+` : ""}      - name: Verify package
         run: npm run verify:direct
 `,
     "utf8"

package/dist/workflow/operations.js

@@ -752,20 +752,24 @@ function findAutoResumableReleaseRun(root, branch, rootRepo, packageReports) {
     if (journal.command !== "release" || !journal.resumable || journal.session.branchName !== STAGING_BRANCH) {
       return false;
     }
+    const releasePlan = stringRecord(journal.steps.find((step) => step.id === "release-plan")?.data);
+    const nextStep = nextPendingJournalStep(journal);
     if (releaseRunHasCompletedMutation(journal)) {
+      if (nextStep?.id === "release-root" && releasePlanHead(releasePlan ?? {}, rootRepo.name) !== rootRepo.commitSha) {
+        return false;
+      }
       return true;
     }
-    const releasePlan = stringRecord(journal.steps.find((step) => step.id === "release-plan")?.data);
     return releasePlan ? releasePlanMatchesCurrentHeads(releasePlan, rootRepo, packageReports) : true;
   }) ?? null;
 }
-async function executeJournalStep(root, runId, stepId, action) {
+async function executeJournalStep(root, runId, stepId, action, options = {}) {
   const current = readWorkflowRunJournal(root, runId);
   const step = current?.steps.find((entry) => entry.id === stepId) ?? null;
   if (!current || !step) {
     throw new Error(`Unknown workflow step "${stepId}" for run ${runId}.`);
   }
-  if (step.status === "completed") {
+  if (step.status === "completed" && !options.rerunCompleted) {
     return step.data ?? null;
   }
   const data = await Promise.resolve(action());
@@ -918,7 +922,7 @@ function runReleaseNpmInstall(repoDir, options = {}) {
   if (shouldSkipReleaseInstall()) {
     return { status: "skipped", reason: "stubbed" };
   }
-  const args = repoDir === options.workspaceRoot ? ["install"] : ["install", "--workspaces=false"];
+  const args = repoDir === options.workspaceRoot ? ["install", "--package-lock-only", "--ignore-scripts"] : ["install", "--package-lock-only", "--ignore-scripts", "--workspaces=false"];
   run("npm", args, { cwd: repoDir });
   return { status: "completed", reason: null };
 }
@@ -976,7 +980,7 @@ function buildReleasePlanSnapshot(input) {
     plannedPublishWaits: input.packageSelection.selected.map((name) => ({
       name,
       workflow: "publish.yml",
-      branch: PRODUCTION_BRANCH,
+      branch: String(plannedVersions[name] ?? PRODUCTION_BRANCH),
       status: "planned"
     })),
     touchedPackages: input.packageSelection.selected,
@@ -2806,7 +2810,7 @@ async function workflowRelease(helpers, input) {
             replacedDevReferences: replacedDevReferences2,
             releaseInstalls: releaseInstalls2
           };
-        });
+        }, { rerunCompleted: workflowRun.resumed });
         const replacedDevReferences = Array.isArray(metadata?.replacedDevReferences) ? metadata.replacedDevReferences : [];
         const releaseInstalls = Array.isArray(metadata?.releaseInstalls) ? metadata.releaseInstalls : [];
         const releasedPackageDevTags = new Map(Object.entries(metadata?.releasedPackageDevTags ?? {}).map(([name, version]) => [name, String(version)]));
@@ -2842,7 +2846,7 @@ async function workflowRelease(helpers, input) {
             const publish = await waitForGitHubWorkflowCompletion(pkg.dir, {
               workflow: "publish.yml",
               headSha: mergeResult.commitSha,
-              branch: PRODUCTION_BRANCH
+              branch: tagName
             });
             assertReleaseGitHubWorkflowSucceeded(pkg.name, publish);
             syncBranchWithOrigin(pkg.dir, STAGING_BRANCH);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@treeseed/sdk",
-  "version": "0.6.8",
+  "version": "0.6.9",
   "description": "Shared Treeseed SDK for content-backed and D1-backed object models.",
   "license": "AGPL-3.0-only",
   "repository": {
@@ -34,7 +34,7 @@
     "setup:ci": "npm ci",
     "build": "npm run build:dist",
     "build:dist": "node ./scripts/run-ts.mjs ./scripts/build-dist.ts",
-    "prepare": "npm run build:dist",
+    "prepare": "node ./scripts/prepare.mjs",
     "prepack": "npm run build:dist",
     "test": "npm run test:unit",
     "test:unit": "vitest run --config ./vitest.config.ts",

package/templates/github/deploy.workflow.yml

@@ -150,7 +150,14 @@ jobs:
           cache-dependency-path: __CACHE_DEPENDENCY_PATH__
 
       - name: Install dependencies
-        run: npm ci --ignore-scripts
+        run: |
+          node -e "const fs = require('fs'); for (const file of ['packages/sdk/package.json', 'packages/core/package.json', 'packages/cli/package.json']) { if (!fs.existsSync(file)) continue; const p = JSON.parse(fs.readFileSync(file, 'utf8')); if (p.scripts) delete p.scripts.prepare; fs.writeFileSync(file, JSON.stringify(p, null, '\t') + '\n'); }"
+          npm ci
+          for dir in packages/sdk packages/core packages/cli; do
+            if test -d "${dir}/.git" || git -C "${dir}" rev-parse --git-dir >/dev/null 2>&1; then
+              git -C "${dir}" checkout -- package.json
+            fi
+          done
 
       - name: Verify workspace
         shell: bash
@@ -263,7 +270,14 @@ __WORKING_DIRECTORY_BLOCK__
           cache-dependency-path: __CACHE_DEPENDENCY_PATH__
 
       - name: Install dependencies
-        run: npm ci --ignore-scripts
+        run: |
+          node -e "const fs = require('fs'); for (const file of ['packages/sdk/package.json', 'packages/core/package.json', 'packages/cli/package.json']) { if (!fs.existsSync(file)) continue; const p = JSON.parse(fs.readFileSync(file, 'utf8')); if (p.scripts) delete p.scripts.prepare; fs.writeFileSync(file, JSON.stringify(p, null, '\t') + '\n'); }"
+          npm ci
+          for dir in packages/sdk packages/core packages/cli; do
+            if test -d "${dir}/.git" || git -C "${dir}" rev-parse --git-dir >/dev/null 2>&1; then
+              git -C "${dir}" checkout -- package.json
+            fi
+          done
 
       - name: Install Railway CLI
         run: npm install -g @railway/cli
@@ -384,7 +398,14 @@ __WORKING_DIRECTORY_BLOCK__
           cache-dependency-path: __CACHE_DEPENDENCY_PATH__
 
       - name: Install dependencies
-        run: npm ci --ignore-scripts
+        run: |
+          node -e "const fs = require('fs'); for (const file of ['packages/sdk/package.json', 'packages/core/package.json', 'packages/cli/package.json']) { if (!fs.existsSync(file)) continue; const p = JSON.parse(fs.readFileSync(file, 'utf8')); if (p.scripts) delete p.scripts.prepare; fs.writeFileSync(file, JSON.stringify(p, null, '\t') + '\n'); }"
+          npm ci
+          for dir in packages/sdk packages/core packages/cli; do
+            if test -d "${dir}/.git" || git -C "${dir}" rev-parse --git-dir >/dev/null 2>&1; then
+              git -C "${dir}" checkout -- package.json
+            fi
+          done
 
       - name: Install Railway CLI
         run: npm install -g @railway/cli
@@ -497,7 +518,14 @@ __WORKING_DIRECTORY_BLOCK__
           cache-dependency-path: __CACHE_DEPENDENCY_PATH__
 
       - name: Install dependencies
-        run: npm ci --ignore-scripts
+        run: |
+          node -e "const fs = require('fs'); for (const file of ['packages/sdk/package.json', 'packages/core/package.json', 'packages/cli/package.json']) { if (!fs.existsSync(file)) continue; const p = JSON.parse(fs.readFileSync(file, 'utf8')); if (p.scripts) delete p.scripts.prepare; fs.writeFileSync(file, JSON.stringify(p, null, '\t') + '\n'); }"
+          npm ci
+          for dir in packages/sdk packages/core packages/cli; do
+            if test -d "${dir}/.git" || git -C "${dir}" rev-parse --git-dir >/dev/null 2>&1; then
+              git -C "${dir}" checkout -- package.json
+            fi
+          done
 
       - name: Install Railway CLI
         run: npm install -g @railway/cli
@@ -590,7 +618,14 @@ __WORKING_DIRECTORY_BLOCK__
           cache-dependency-path: __CACHE_DEPENDENCY_PATH__
 
       - name: Install dependencies
-        run: npm ci --ignore-scripts
+        run: |
+          node -e "const fs = require('fs'); for (const file of ['packages/sdk/package.json', 'packages/core/package.json', 'packages/cli/package.json']) { if (!fs.existsSync(file)) continue; const p = JSON.parse(fs.readFileSync(file, 'utf8')); if (p.scripts) delete p.scripts.prepare; fs.writeFileSync(file, JSON.stringify(p, null, '\t') + '\n'); }"
+          npm ci
+          for dir in packages/sdk packages/core packages/cli; do
+            if test -d "${dir}/.git" || git -C "${dir}" rev-parse --git-dir >/dev/null 2>&1; then
+              git -C "${dir}" checkout -- package.json
+            fi
+          done
 
       - name: Download Treeseed deployment state
         uses: actions/download-artifact@v4