@treeseed/sdk 0.4.4 → 0.4.6

package/dist/fixture-support.d.ts

@@ -4,7 +4,7 @@ export type FixtureSupportDeclaration = {
     modes: readonly FixtureInjectionMode[];
     workspaceDirName?: string;
     entrySpecifier?: string;
-    contractsShim?: 'agent';
+    contractsShim?: 'core-agent';
 };
 export type ResolveSharedFixtureOptions = {
     packageRoot?: string;

package/dist/fixture-support.js

@@ -106,15 +106,15 @@ function ensureFixtureLinkedPackage(fixtureRoot, packageName, resolvedPackageRoo
   rmSync(packageDir, { recursive: true, force: true });
   symlinkSync(resolvedPackageRoot, packageDir, "dir");
 }
-function buildAgentContractsShimPackage(fixtureRoot) {
-  const packageDir = resolve(fixtureRoot, "node_modules", "@treeseed", "agent");
+function buildCoreAgentContractsShimPackage(fixtureRoot) {
+  const packageDir = resolve(fixtureRoot, "node_modules", "@treeseed", "core");
   rmSync(packageDir, { recursive: true, force: true });
   mkdirSync(resolve(packageDir, "contracts"), { recursive: true });
   writeFileSync(
     resolve(packageDir, "package.json"),
     JSON.stringify(
       {
-        name: "@treeseed/agent",
+        name: "@treeseed/core",
         type: "module",
         exports: {
           "./runtime-types": {
@@ -315,8 +315,8 @@ function prepareFixturePackages(options) {
         satisfied = true;
         break;
       }
-      if (mode === "contracts-only" && declaration.contractsShim === "agent") {
-        buildAgentContractsShimPackage(options.fixtureRoot);
+      if (mode === "contracts-only" && declaration.contractsShim === "core-agent") {
+        buildCoreAgentContractsShimPackage(options.fixtureRoot);
         satisfied = true;
         break;
       }

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

@@ -1064,7 +1064,7 @@ function syncTreeseedRailwayEnvironment({ tenantRoot, scope = "prod", dryRun = f
     }
     const environment = service.environments?.[scope];
     const fallbackServiceName = serviceKey === "api" ? config.settings.services.railway.apiServiceName : serviceKey === "agents" ? config.settings.services.railway.agentsServiceName : "";
-    const defaultRootDir = serviceKey === "api" ? "." : "packages/agent";
+    const defaultRootDir = ["api", "manager", "worker", "workdayStart", "workdayReport"].includes(serviceKey) ? "." : "packages/core";
     return {
       service: serviceKey,
       projectName: service.railway?.projectName ?? config.settings.services.railway.projectName,

package/dist/operations/services/railway-deploy.js

@@ -26,7 +26,7 @@ function configuredRailwayServices(tenantRoot, scope) {
     if (!service || service.enabled === false || (service.provider ?? "railway") !== "railway") {
       return null;
     }
-    const defaultRootDir = serviceKey === "api" ? "." : "packages/agent";
+    const defaultRootDir = ["api", "manager", "worker", "workdayStart", "workdayReport"].includes(serviceKey) ? "." : "packages/core";
     const serviceRoot = resolve(tenantRoot, service.railway?.rootDir ?? service.rootDir ?? defaultRootDir);
     const railwayEnvironment = service.environments?.[normalizedScope]?.railwayEnvironment ?? normalizedScope;
     const publicBaseUrl = service.environments?.[normalizedScope]?.baseUrl ?? service.publicBaseUrl ?? null;

package/dist/operations/services/runtime-tools.d.ts

@@ -1,5 +1,6 @@
 export declare const packageRoot: string;
 export declare const packageScriptRoot: string;
+export declare const packageDistScriptRoot: string;
 export declare const runtimeRoot: string;
 export declare function treeseedWorkspacePackageCheckoutState(root?: string): {
     mode: string;
@@ -18,7 +19,6 @@ export declare function resolveAstroBin(): string;
 export declare function resolveWranglerBin(): string;
 export declare const corePackageRoot: string;
 export declare const sdkPackageRoot: string;
-export declare const agentPackageRoot: string;
 export declare function loadPackageJson(root?: string): any;
 export declare function isWorkspaceRoot(root?: string): boolean;
 export declare function createProductionBuildEnv(extraEnv?: {}): {

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

@@ -6,7 +6,27 @@ import { createRequire } from "node:module";
 import { parse as parseYaml } from "yaml";
 const require2 = createRequire(import.meta.url);
 const scriptRoot = dirname(fileURLToPath(import.meta.url));
-const packageRootFromSource = resolve(scriptRoot, "..", "..", "..");
+function resolveSdkPackageRoot(startDir) {
+  let currentDir = startDir;
+  while (true) {
+    const packageJsonPath = resolve(currentDir, "package.json");
+    if (existsSync(packageJsonPath)) {
+      try {
+        const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf8"));
+        if (packageJson?.name === "@treeseed/sdk") {
+          return currentDir;
+        }
+      } catch {
+      }
+    }
+    const parentDir = dirname(currentDir);
+    if (parentDir === currentDir) {
+      return resolve(startDir, "..", "..", "..");
+    }
+    currentDir = parentDir;
+  }
+}
+const packageRootFromSource = resolveSdkPackageRoot(scriptRoot);
 const treeseedRuntimeRoot = resolve(packageRootFromSource, "src", "treeseed");
 const TREESEED_DEFAULT_PLUGIN_REFERENCES = [
   {
@@ -31,7 +51,7 @@ const TREESEED_DEFAULT_PROVIDER_SELECTIONS = {
   site: "default"
 };
 const TRESEED_MANAGED_SERVICE_KEYS = ["api", "agents", "gateway", "manager", "worker", "workdayStart", "workdayReport"];
-const TRESEED_WORKSPACE_PACKAGE_DIRS = ["sdk", "core", "cli", "agent"];
+const TRESEED_WORKSPACE_PACKAGE_DIRS = ["sdk", "core", "cli"];
 const CLOUDFLARE_ACCOUNT_ID_PLACEHOLDER = "replace-with-cloudflare-account-id";
 function parseServiceEnvironmentConfig(value) {
   const record = optionalRecord(value, "service environment") ?? {};
@@ -87,6 +107,7 @@ function parseManagedServicesConfig(value) {
 }
 const packageRoot = packageRootFromSource;
 const packageScriptRoot = resolve(packageRoot, "scripts");
+const packageDistScriptRoot = resolve(packageRoot, "dist", "scripts");
 const runtimeRoot = treeseedRuntimeRoot;
 function resolvePackageBinary(packageName, binName = packageName) {
   const packageJsonPath = require2.resolve(`${packageName}/package.json`);
@@ -157,7 +178,6 @@ function resolveWranglerBin() {
 }
 const corePackageRoot = resolveTreeseedPackageRoot("@treeseed/core", "@treeseed/core/config", "core");
 const sdkPackageRoot = resolveTreeseedPackageRoot("@treeseed/sdk", "@treeseed/sdk", "sdk");
-const agentPackageRoot = resolveTreeseedPackageRoot("@treeseed/agent", "@treeseed/agent", "agent");
 function loadPackageJson(root = process.cwd()) {
   const packageJsonPath = resolve(root, "package.json");
   if (!existsSync(packageJsonPath)) {
@@ -182,7 +202,15 @@ function createProductionBuildEnv(extraEnv = {}) {
 }
 function packageScriptPath(scriptName) {
   if (extname(scriptName)) {
-    return resolve(packageScriptRoot, scriptName);
+    const directScriptPath = resolve(packageScriptRoot, scriptName);
+    if (existsSync(directScriptPath)) {
+      return directScriptPath;
+    }
+    const distScriptPath = resolve(packageDistScriptRoot, scriptName.replace(/\.(ts|mjs)$/u, ".js"));
+    if (existsSync(distScriptPath)) {
+      return distScriptPath;
+    }
+    return directScriptPath;
   }
   for (const extension of [".js", ".ts", ".mjs"]) {
     const candidate = resolve(packageScriptRoot, `${scriptName}${extension}`);
@@ -190,6 +218,12 @@ function packageScriptPath(scriptName) {
       return candidate;
     }
   }
+  for (const extension of [".js", ".mjs"]) {
+    const candidate = resolve(packageDistScriptRoot, `${scriptName}${extension}`);
+    if (existsSync(candidate)) {
+      return candidate;
+    }
+  }
   throw new Error(`Unable to resolve package script "${scriptName}".`);
 }
 function withProcessCwd(cwd, action) {
@@ -337,12 +371,12 @@ function spawnNodeBinary(binPath, args, options = {}) {
   });
 }
 export {
-  agentPackageRoot,
   corePackageRoot,
   createProductionBuildEnv,
   isWorkspaceRoot,
   loadCliDeployConfig,
   loadPackageJson,
+  packageDistScriptRoot,
   packageRoot,
   packageScriptPath,
   packageScriptRoot,

package/dist/scripts/test-scaffold.js

@@ -3,7 +3,7 @@ import { cpSync, existsSync, mkdirSync, mkdtempSync, readdirSync, readFileSync,
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { spawnSync } from 'node:child_process';
-import { agentPackageRoot, corePackageRoot, packageRoot, packageScriptPath, sdkPackageRoot } from '../operations/services/runtime-tools.js';
+import { corePackageRoot, packageRoot, packageScriptPath, sdkPackageRoot } from '../operations/services/runtime-tools.js';
 import { listTemplateProducts, validateTemplateProduct } from '../operations/services/template-registry.js';
 const npmCacheDir = process.env.TREESEED_SCAFFOLD_NPM_CACHE_DIR
     ? resolve(process.env.TREESEED_SCAFFOLD_NPM_CACHE_DIR)
@@ -11,7 +11,6 @@ const npmCacheDir = process.env.TREESEED_SCAFFOLD_NPM_CACHE_DIR
 const packageJson = JSON.parse(readFileSync(resolve(corePackageRoot, 'package.json'), 'utf8'));
 const sdkPackageJson = JSON.parse(readFileSync(resolve(sdkPackageRoot, 'package.json'), 'utf8'));
 const cliPackageJson = JSON.parse(readFileSync(resolve(packageRoot, 'package.json'), 'utf8'));
-const agentPackageJson = JSON.parse(readFileSync(resolve(agentPackageRoot, 'package.json'), 'utf8'));
 const workspaceTarballs = (() => {
     try {
         return JSON.parse(process.env.TREESEED_WORKSPACE_TARBALLS ?? '{}');
@@ -35,12 +34,7 @@ const externalCliTarball = process.env.TREESEED_SCAFFOLD_CLI_TARBALL
     : typeof workspaceTarballs['@treeseed/cli'] === 'string'
         ? resolve(workspaceTarballs['@treeseed/cli'])
         : null;
-const externalAgentTarball = process.env.TREESEED_SCAFFOLD_AGENT_TARBALL
-    ? resolve(process.env.TREESEED_SCAFFOLD_AGENT_TARBALL)
-    : typeof workspaceTarballs['@treeseed/agent'] === 'string'
-        ? resolve(workspaceTarballs['@treeseed/agent'])
-        : null;
-const reusesExternalTarballs = Boolean(externalCoreTarball || externalSdkTarball || externalCliTarball || externalAgentTarball);
+const reusesExternalTarballs = Boolean(externalCoreTarball || externalSdkTarball || externalCliTarball);
 const scaffoldChecks = new Set((process.env.TREESEED_SCAFFOLD_CHECKS ?? 'build,deploy')
     .split(',')
     .map((value) => value.trim())
@@ -177,7 +171,7 @@ function linkTreeseedBins(siteRoot) {
     mkdirSync(binRoot, { recursive: true });
     for (const [name, relativeTarget] of [
         ['treeseed', '../@treeseed/cli/dist/cli/main.js'],
-        ['treeseed-agents', '../@treeseed/agent/dist/scripts/treeseed-agents.js'],
+        ['treeseed-agents', '../@treeseed/core/dist/agents/cli.js'],
     ]) {
         symlinkSync(relativeTarget, resolve(binRoot, name));
     }
@@ -210,12 +204,11 @@ async function scaffoldSite(siteRoot) {
     }
     runStep(process.execPath, [packageScriptPath('scaffold-site'), siteRoot, '--template', 'starter-basic', '--name', 'Smoke Site', '--site-url', 'https://smoke.example.com', '--contact-email', 'hello@example.com']);
 }
-function installScaffold(siteRoot, { coreTarballPath, sdkTarballPath, cliTarballPath, agentTarballPath }) {
-    if (coreTarballPath && sdkTarballPath && cliTarballPath && agentTarballPath) {
+function installScaffold(siteRoot, { coreTarballPath, sdkTarballPath, cliTarballPath }) {
+    if (coreTarballPath && sdkTarballPath && cliTarballPath) {
         linkWorkspacePackage(siteRoot, sdkPackageJson.name, sdkPackageRoot);
         linkWorkspacePackage(siteRoot, packageJson.name, corePackageRoot);
         linkWorkspacePackage(siteRoot, cliPackageJson.name, packageRoot);
-        linkWorkspacePackage(siteRoot, agentPackageJson.name, agentPackageRoot);
         mirrorSharedNodeModules(siteRoot);
         linkTreeseedBins(siteRoot);
         return;
@@ -247,7 +240,6 @@ const siteRoot = createTempSiteRoot();
 let tarballPath = externalCoreTarball;
 let sdkTarballPath = externalSdkTarball;
 let cliTarballPath = externalCliTarball;
-let agentTarballPath = externalAgentTarball;
 try {
     if (!reusesExternalTarballs && resetScaffoldCache) {
         logStep(`resetting npm cache at ${npmCacheDir}`);
@@ -267,13 +259,6 @@ try {
     else {
         logStep(`reusing provided @treeseed/core tarball: ${tarballPath}`);
     }
-    if (!agentTarballPath) {
-        logStep('building and packing @treeseed/agent');
-        agentTarballPath = createTarball(agentPackageRoot, agentPackageJson);
-    }
-    else {
-        logStep(`reusing provided @treeseed/agent tarball: ${agentTarballPath}`);
-    }
     if (!cliTarballPath) {
         logStep('building and packing @treeseed/cli');
         cliTarballPath = createTarball(packageRoot, cliPackageJson);
@@ -292,7 +277,6 @@ try {
             coreTarballPath: tarballPath,
             sdkTarballPath,
             cliTarballPath,
-            agentTarballPath,
         });
     });
     logStep('running scaffold smoke checks');

package/dist/scripts/treeseed-release-verify.js

@@ -3,7 +3,7 @@ import { mkdtempSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { dirname, extname, join, resolve } from 'node:path';
 import { spawnSync } from 'node:child_process';
-import { agentPackageRoot, corePackageRoot, packageRoot, sdkPackageRoot } from '../operations/services/runtime-tools.js';
+import { corePackageRoot, packageRoot, sdkPackageRoot } from '../operations/services/runtime-tools.js';
 const textExtensions = new Set(['.js', '.ts', '.mjs', '.cjs', '.d.js', '.json', '.md']);
 const forbiddenPatterns = [
     /['"`]workspace:[^'"`\n]+['"`]/,
@@ -108,11 +108,11 @@ function hasWorkspacePackageSource(root) {
 run('npm', ['run', 'build']);
 scanDirectory(resolve(packageRoot, 'dist'));
 run('npm', ['test']);
-if (hasWorkspacePackageSource(sdkPackageRoot) && hasWorkspacePackageSource(corePackageRoot) && hasWorkspacePackageSource(agentPackageRoot)) {
+if (hasWorkspacePackageSource(sdkPackageRoot) && hasWorkspacePackageSource(corePackageRoot)) {
     run('npm', ['run', 'test:scaffold']);
 }
 else {
-    console.log('Skipping scaffold verification because local sdk/core/agent package sources are not available.');
+    console.log('Skipping scaffold verification because local sdk/core package sources are not available.');
 }
 const stageRoot = mkdtempSync(join(tmpdir(), 'treeseed-cli-release-'));
 const extractRoot = resolve(stageRoot, 'extract');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@treeseed/sdk",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "Shared Treeseed SDK for content-backed and D1-backed object models.",
   "license": "AGPL-3.0-only",
   "repository": {