@h-rig/core 0.0.6-alpha.144 → 0.0.6-alpha.146

package/dist/src/index.js

@@ -423,7 +423,6 @@ function buildRigInitConfigSource(input) {
   const lines = [`import { defineConfig } from "@rig/core/config";`];
   if (input.useStandardPlugin) {
     lines.push(`import { standardPlugins } from "@rig/standard-plugin/bundle";`);
-    lines.push(`import { createRigCliSurfacePlugin } from "@rig/cli/surface-plugin";`);
     if (input.taskSource.kind === "github-issues") {
       lines.push(`import { createStateGitHubCredentialProvider } from "@rig/standard-plugin";`);
     }
@@ -432,7 +431,7 @@ function buildRigInitConfigSource(input) {
   const projectRepo = input.projectRepo ?? (input.taskSource.kind === "github-issues" ? `${input.taskSource.owner}/${input.taskSource.repo}` : undefined);
   lines.push(projectRepo ? `  project: { name: ${JSON.stringify(input.projectName)}, repo: ${JSON.stringify(projectRepo)} },` : `  project: { name: ${JSON.stringify(input.projectName)} },`);
   if (input.useStandardPlugin && input.taskSource.kind === "github-issues") {
-    lines.push(`  plugins: [createRigCliSurfacePlugin(), ...standardPlugins({`);
+    lines.push(`  plugins: [...standardPlugins({`);
     lines.push(`    taskSources: {`);
     lines.push(`      githubCredentialProvider: createStateGitHubCredentialProvider(),`);
     lines.push(`      githubWorkspaceId: ${JSON.stringify(`${input.taskSource.owner}/${input.taskSource.repo}`)},`);
@@ -440,7 +439,7 @@ function buildRigInitConfigSource(input) {
     lines.push(`    },`);
     lines.push(`  })],`);
   } else {
-    lines.push(`  plugins: [${input.useStandardPlugin ? "createRigCliSurfacePlugin(), ...standardPlugins()" : ""}],`);
+    lines.push(`  plugins: [${input.useStandardPlugin ? "...standardPlugins()" : ""}],`);
   }
   if (input.taskSource.kind === "github-issues") {
     lines.push(`  taskSource: {`);

package/dist/src/load-config.js

@@ -88,6 +88,35 @@ function exportTargetFromPackageJson(pkg, subpath) {
     return target;
   return subpath === "." && typeof pkg.module === "string" ? pkg.module : subpath === "." && typeof pkg.main === "string" ? pkg.main : null;
 }
+function resolvePackageDirFromBunStore(packageName, nodeModulesDir) {
+  const storeDir = join(nodeModulesDir, ".bun");
+  if (!existsSync(storeDir))
+    return null;
+  const encoded = packageName.replace("/", "+");
+  try {
+    const candidates = readdirSync(storeDir).filter((entry) => entry.startsWith(`${encoded}@`)).map((entry) => {
+      const candidateDir = join(storeDir, entry, "node_modules", packageName);
+      const packageJsonPath = join(candidateDir, "package.json");
+      if (!existsSync(packageJsonPath))
+        return null;
+      try {
+        const pkg = JSON.parse(readFileSync(packageJsonPath, "utf8"));
+        return {
+          dir: candidateDir,
+          sortKey: pkg.version?.trim() || entry
+        };
+      } catch {
+        return {
+          dir: candidateDir,
+          sortKey: entry
+        };
+      }
+    }).filter((candidate) => candidate !== null).sort((a, b) => b.sortKey.localeCompare(a.sortKey, undefined, { numeric: true, sensitivity: "base" }));
+    return candidates[0]?.dir ?? null;
+  } catch {
+    return null;
+  }
+}
 function resolveDirectoryModulePath(directoryPath) {
   const packageJsonPath = join(directoryPath, "package.json");
   if (existsSync(packageJsonPath)) {
@@ -128,6 +157,38 @@ function resolveModulePath(candidatePath) {
   }
   return null;
 }
+function resolvePackageExportFromDir(packageDir, subpath) {
+  const packageJsonPath = join(packageDir, "package.json");
+  if (existsSync(packageJsonPath)) {
+    try {
+      const pkg = JSON.parse(readFileSync(packageJsonPath, "utf8"));
+      const target = exportTargetFromPackageJson(pkg, subpath);
+      if (target) {
+        const resolved = resolveModulePath(join(packageDir, target));
+        if (resolved)
+          return resolved;
+      }
+    } catch {
+      return null;
+    }
+  }
+  if (subpath !== ".") {
+    const legacySubpath = subpath.replace(/^\.\//, "");
+    for (const candidate of [
+      join(packageDir, legacySubpath),
+      join(packageDir, `${legacySubpath}.js`),
+      join(packageDir, `${legacySubpath}.mjs`),
+      join(packageDir, `${legacySubpath}.cjs`),
+      join(packageDir, `${legacySubpath}.ts`),
+      join(packageDir, `${legacySubpath}.json`)
+    ]) {
+      const resolved = resolveModulePath(candidate);
+      if (resolved)
+        return resolved;
+    }
+  }
+  return subpath === "." ? resolveDirectoryModulePath(packageDir) : null;
+}
 var runtimeBundleQueue = Promise.resolve();
 function enqueueRuntimeBundle(operation) {
   const next = runtimeBundleQueue.then(operation, operation);
@@ -150,6 +211,15 @@ function resolvedFilePath(path, rootPath) {
     return null;
   return rootPath && !isWithinDir(resolved, rootPath) ? null : resolved;
 }
+function resolveProjectRigPackageImport(specifier, configDir) {
+  const parsed = packageNameAndSubpath(specifier);
+  if (!parsed?.packageName.startsWith("@rig/"))
+    return null;
+  const nodeModulesDir = join(configDir, "node_modules");
+  const directPackageDir = join(nodeModulesDir, parsed.packageName);
+  const packageDir = existsSync(join(directPackageDir, "package.json")) ? directPackageDir : resolvePackageDirFromBunStore(parsed.packageName, nodeModulesDir);
+  return packageDir ? resolvePackageExportFromDir(packageDir, parsed.subpath) : null;
+}
 async function importConfigViaRuntimeBundleUnserialized(configPath) {
   const bun = globalThis.Bun;
   if (!bun?.build) {
@@ -164,6 +234,9 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
         const directFilePath = resolvedFilePath(args.path, configDir);
         if (directFilePath)
           return { path: directFilePath };
+        const projectRigPackagePath = resolveProjectRigPackageImport(args.path, configDir);
+        if (projectRigPackagePath)
+          return { path: projectRigPackagePath, external: true };
         if (/^(?:node|bun):/.test(args.path) || isBuiltin(args.path) || packageNameAndSubpath(args.path))
           return;
         const parentCandidates = args.path.startsWith(".") ? [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null, configDir].filter((value) => Boolean(value)) : [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : configDir];

package/dist/src/rig-init-builder.js

@@ -4,7 +4,6 @@ function buildRigInitConfigSource(input) {
   const lines = [`import { defineConfig } from "@rig/core/config";`];
   if (input.useStandardPlugin) {
     lines.push(`import { standardPlugins } from "@rig/standard-plugin/bundle";`);
-    lines.push(`import { createRigCliSurfacePlugin } from "@rig/cli/surface-plugin";`);
     if (input.taskSource.kind === "github-issues") {
       lines.push(`import { createStateGitHubCredentialProvider } from "@rig/standard-plugin";`);
     }
@@ -13,7 +12,7 @@ function buildRigInitConfigSource(input) {
   const projectRepo = input.projectRepo ?? (input.taskSource.kind === "github-issues" ? `${input.taskSource.owner}/${input.taskSource.repo}` : undefined);
   lines.push(projectRepo ? `  project: { name: ${JSON.stringify(input.projectName)}, repo: ${JSON.stringify(projectRepo)} },` : `  project: { name: ${JSON.stringify(input.projectName)} },`);
   if (input.useStandardPlugin && input.taskSource.kind === "github-issues") {
-    lines.push(`  plugins: [createRigCliSurfacePlugin(), ...standardPlugins({`);
+    lines.push(`  plugins: [...standardPlugins({`);
     lines.push(`    taskSources: {`);
     lines.push(`      githubCredentialProvider: createStateGitHubCredentialProvider(),`);
     lines.push(`      githubWorkspaceId: ${JSON.stringify(`${input.taskSource.owner}/${input.taskSource.repo}`)},`);
@@ -21,7 +20,7 @@ function buildRigInitConfigSource(input) {
     lines.push(`    },`);
     lines.push(`  })],`);
   } else {
-    lines.push(`  plugins: [${input.useStandardPlugin ? "createRigCliSurfacePlugin(), ...standardPlugins()" : ""}],`);
+    lines.push(`  plugins: [${input.useStandardPlugin ? "...standardPlugins()" : ""}],`);
   }
   if (input.taskSource.kind === "github-issues") {
     lines.push(`  taskSource: {`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/core",
-  "version": "0.0.6-alpha.144",
+  "version": "0.0.6-alpha.146",
   "type": "module",
   "description": "Config and plugin composition library for Rig's OMP extension ecosystem; not a product host/runtime.",
   "license": "UNLICENSED",
@@ -49,7 +49,7 @@
   "module": "./dist/src/index.js",
   "types": "./dist/src/index.d.ts",
   "dependencies": {
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.144",
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.146",
     "effect": "4.0.0-beta.90"
   }
 }