@botbotgo/agent-harness 0.0.319 → 0.0.320

package/README.md

@@ -500,18 +500,20 @@ spec:
       - npm://@acme/agent-tools
     skills:
       - file://./resources/skills
+      - npm://@acme/agent-skills
       - https://example.com/skills/review/SKILL.md
 ```
 
 Tool-source rules:
 
 - `file://...` scans only the configured folder
-- `npm://...` resolves one package, auto-installs it when missing, and discovers exported `tool({...})` definitions from the package entry
+- `npm://...` resolves one package, auto-installs it when missing, and discovers tools from `package/tools/`
 - tool discovery never traverses `node_modules/**`
 
 Skill-source rules:
 
 - `file://...` accepts a skill collection folder, a single skill root, or a direct `SKILL.md` path
+- `npm://...` resolves one package, auto-installs it when missing, and discovers skills from `package/skills/`
 - `http://...` and `https://...` currently accept a single remote `SKILL.md`
 
 `runtime.spec.resources` remains supported as a compatibility path for attached resource packages.
@@ -867,11 +869,12 @@ Important fields:
 `sources.tools` controls which tool roots or packages participate in workspace discovery:
 
 - `file://...` for folder scanning
-- `npm://...` for package-entry discovery and auto-install when missing
+- `npm://...` for package discovery under `tools/` plus auto-install when missing
 
 `sources.skills` controls which skill folders or skill documents participate in workspace discovery:
 
 - `file://...` for local folders, skill roots, or direct `SKILL.md`
+- `npm://...` for package discovery under `skills/` plus auto-install when missing
 - `http://...` / `https://...` for one remote `SKILL.md`
 
 `toolModuleDiscovery.scope` controls how local `resources/tools/`-style file discovery walks tool directories:

package/README.zh.md

@@ -495,18 +495,20 @@ spec:
       - npm://@acme/agent-tools
     skills:
       - file://./resources/skills
+      - npm://@acme/agent-skills
       - https://example.com/skills/review/SKILL.md
 ```
 
 tool source 规则：
 
 - `file://...` 只扫描显式配置的目录
-- `npm://...` 只解析单个包；本地缺失时会自动安装，再从包入口发现导出的 `tool({...})`
+- `npm://...` 只解析单个包；本地缺失时会自动安装，再从 `package/tools/` 发现工具
 - tool 发现永远不会遍历 `node_modules/**`
 
 skill source 规则：
 
 - `file://...` 可以指向 skill 集合目录、单个 skill root，或直接指向 `SKILL.md`
+- `npm://...` 只解析单个包；本地缺失时会自动安装，再从 `package/skills/` 发现 skills
 - `http://...` 与 `https://...` 当前只支持一个远程 `SKILL.md`
 
 `runtime.spec.resources` 仍保留为兼容旧 attached resource package 的路径。
@@ -834,11 +836,12 @@ await stop(runtime);
 `sources.tools` 用来声明哪些 tool root 或 package 参与工作区发现：
 
 - `file://...` 用于目录扫描
-- `npm://...` 用于包入口发现；本地缺失时自动安装
+- `npm://...` 用于 `tools/` 目录发现；本地缺失时自动安装
 
 `sources.skills` 用来声明哪些 skill 目录或 skill 文档参与工作区发现：
 
 - `file://...` 用于本地目录、skill root 或直接 `SKILL.md`
+- `npm://...` 用于 `skills/` 目录发现；本地缺失时自动安装
 - `http://...` / `https://...` 用于单个远程 `SKILL.md`
 
 `toolModuleDiscovery.scope` 用来控制本地 `resources/tools/` 风格 file source 的发现范围：

package/dist/package-version.d.ts

@@ -1 +1 @@
-export declare const AGENT_HARNESS_VERSION = "0.0.318";
+export declare const AGENT_HARNESS_VERSION = "0.0.319";

package/dist/package-version.js

@@ -1 +1 @@
-export const AGENT_HARNESS_VERSION = "0.0.318";
+export const AGENT_HARNESS_VERSION = "0.0.319";

package/dist/workspace/compile.js

@@ -15,7 +15,7 @@ import { getRoutingDefaultAgentId, getRuntimeSources, getRuntimeResources, getRu
 import { hydrateAgentMcpTools, hydrateResourceAndExternalTools } from "./tool-hydration.js";
 import { traceStartupStage } from "../runtime/startup-tracing.js";
 import { shouldSkipScanDirectory } from "../utils/fs.js";
-import { ensureRemoteSkillSource, ensureToolPackageSource, isFileSourceUri, isHttpSourceUri, isNpmSourceUri, resolveFileSourcePath, } from "./support/source-protocols.js";
+import { ensurePackageSource, ensureRemoteSkillSource, isFileSourceUri, isHttpSourceUri, isNpmSourceUri, resolveFileSourcePath, } from "./support/source-protocols.js";
 import { discoverToolModuleDefinitions } from "../tooling/module-loader.js";
 function mergeObjectValues(base, override) {
     if (override === undefined) {
@@ -195,7 +195,12 @@ async function resolveConfiguredSkillSourceRoots(sources, workspaceRoot) {
             resolved.push(await ensureRemoteSkillSource(source));
             continue;
         }
-        throw new Error(`Unsupported skill source ${source}. Use file:// or https://.`);
+        if (isNpmSourceUri(source)) {
+            const installed = await ensurePackageSource(source, workspaceRoot);
+            resolved.push(path.join(installed.packageRoot, "skills"));
+            continue;
+        }
+        throw new Error(`Unsupported skill source ${source}. Use file://, npm://, or https://.`);
     }
     return resolved;
 }
@@ -219,8 +224,16 @@ async function registerToolFolderSource(tools, folderRoot, toolModuleDiscoverySc
         tools.set(parsed.id, mergeParsedToolObject(tools.get(parsed.id), parsed));
     }
 }
-async function registerToolPackageSource(tools, source, workspaceRoot) {
-    const installed = await ensureToolPackageSource(source, workspaceRoot);
+async function registerToolPackageSource(tools, source, workspaceRoot, toolModuleDiscoveryScope) {
+    const installed = await ensurePackageSource(source, workspaceRoot);
+    const toolsRoot = path.join(installed.packageRoot, "tools");
+    if (existsSync(toolsRoot)) {
+        await registerToolFolderSource(tools, toolsRoot, toolModuleDiscoveryScope);
+        return;
+    }
+    if (!installed.entryPath) {
+        return;
+    }
     const imported = await import(pathToFileURL(installed.entryPath).href);
     const definitions = discoverToolModuleDefinitions("", imported);
     for (const definition of definitions) {
@@ -347,7 +360,7 @@ export async function loadWorkspace(workspaceRoot, options = {}) {
             continue;
         }
         if (isNpmSourceUri(source)) {
-            await traceStartupStage("workspace.register.toolPackageSource", () => registerToolPackageSource(tools, source, workspaceRoot), {
+            await traceStartupStage("workspace.register.toolPackageSource", () => registerToolPackageSource(tools, source, workspaceRoot, toolModuleDiscoveryConfig.scope), {
                 workspaceRoot,
                 source,
             });
@@ -402,6 +415,7 @@ export async function loadWorkspace(workspaceRoot, options = {}) {
     const resources = Array.from(new Set([
         ...(localResourceRoot ? [localResourceRoot] : []),
         ...runtimeSources.tools.filter((source) => isNpmSourceUri(source)),
+        ...runtimeSources.skills.filter((source) => isNpmSourceUri(source)),
         ...collectedResources,
     ]));
     await traceStartupStage("workspace.validate.resources", async () => {

package/dist/workspace/support/source-protocols.d.ts

@@ -4,8 +4,8 @@ export type RuntimeSourceConfig = {
     tools: string[];
     skills: string[];
 };
-type ToolPackageInstallation = {
-    entryPath: string;
+type PackageSourceInstallation = {
+    entryPath?: string;
     packageRoot: string;
     packageName: string;
 };
@@ -14,6 +14,6 @@ export declare function isFileSourceUri(value: string): boolean;
 export declare function isNpmSourceUri(value: string): boolean;
 export declare function isHttpSourceUri(value: string): boolean;
 export declare function resolveFileSourcePath(uri: string, workspaceRoot: string): string;
-export declare function ensureToolPackageSource(uri: string, workspaceRoot: string): Promise<ToolPackageInstallation>;
+export declare function ensurePackageSource(uri: string, workspaceRoot: string): Promise<PackageSourceInstallation>;
 export declare function ensureRemoteSkillSource(uri: string): Promise<string>;
 export {};

package/dist/workspace/support/source-protocols.js

@@ -113,7 +113,7 @@ function resolveInstalledPackageRoot(packageName, workspaceRoot) {
     }
     return null;
 }
-async function installPackageToolSource(spec, workspaceRoot) {
+async function installPackageSource(spec, workspaceRoot) {
     const packageName = parseToolPackageName(spec, workspaceRoot);
     const installRoot = packageInstallCacheRoot(spec);
     const packageJsonPath = path.join(installRoot, "package.json");
@@ -136,7 +136,7 @@ async function installPackageToolSource(spec, workspaceRoot) {
         entryPath: resolvePackageEntry(installedRoot, packageJson),
     };
 }
-export async function ensureToolPackageSource(uri, workspaceRoot) {
+export async function ensurePackageSource(uri, workspaceRoot) {
     if (!isNpmSourceUri(uri)) {
         throw new Error(`Unsupported package source URI ${uri}`);
     }
@@ -154,7 +154,7 @@ export async function ensureToolPackageSource(uri, workspaceRoot) {
             entryPath: resolvePackageEntry(installedRoot, packageJson),
         };
     }
-    return installPackageToolSource(spec, workspaceRoot);
+    return installPackageSource(spec, workspaceRoot);
 }
 function parseSkillFrontmatterName(document) {
     const match = document.match(/^---\s*\n([\s\S]*?)\n---\s*(?:\n|$)/);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botbotgo/agent-harness",
-  "version": "0.0.319",
+  "version": "0.0.320",
   "description": "Workspace runtime for multi-agent applications",
   "license": "MIT",
   "type": "module",