@rowan-agent/agent 0.23.0 → 0.24.0

package/dist/index.d.ts

@@ -319,6 +319,8 @@ declare class InMemoryExtensionHost implements ExtensionHost {
  * - Tool registration support
  */
 
+/** The Resource Source an Extension registration lands in: Global (`[]`) is `rowan.extensions`, any other Scope `rowan.extensions:<scopeToKey(scope)>`. */
+declare function extensionSourceId(scope?: ScopeRef): string;
 type ExtensionRunnerOptions = {
     entryPhaseId?: string | null;
     cwd?: string;
@@ -452,12 +454,14 @@ declare class ExtensionRunner {
     }): void;
     getPhase(name: string): Phase | undefined;
     getPhases(): Phase[];
+    getRegisteredPhases(): readonly RegisteredPhase[];
     createPhaseRegistry(input?: {
         entryPhaseId?: string | null;
     }): PhaseRegistry;
     /** Adapt an extension RegisteredPhase to the core Phase type. */
-    private adaptToPhase;
+    adaptToPhase(reg: RegisteredPhase): Phase;
     getSkills(): Skill[];
+    getRegisteredSkills(): readonly RegisteredSkill[];
     /**
      * Bind the runner — flushes pending provider registrations and
      * replaces runtime stubs with real implementations.
@@ -498,6 +502,7 @@ declare class ExtensionRunner {
         agentId?: string;
         toolCallId?: string;
         metadata?: Readonly<Record<string, unknown>>;
+        agentMetadata?: Readonly<Record<string, unknown>>;
         answer?: unknown;
         scope?: ScopeRef;
         turn?: JsonObject;
@@ -601,7 +606,9 @@ declare class RuntimeExtensionLifetime {
     activate(extensions: readonly LoadedExtension[]): Promise<ExtensionActivationResult>;
     tools(): readonly RegisteredTool[];
     phases(): readonly Phase[];
+    registeredPhases(): readonly RegisteredPhase[];
     skills(): readonly Skill[];
+    registeredSkills(): readonly RegisteredSkill[];
     get extensionRunner(): ExtensionRunner;
     get extensionHost(): ExtensionHost;
     onResourceChange(listener: (kind: "tool" | "phase" | "skill") => Promise<void> | void): () => void;
@@ -611,7 +618,7 @@ declare class RuntimeExtensionLifetime {
 /** Bootstrap-only Registry facade; its Extension method disappears after init. */
 declare class RuntimeBootstrapRegistry extends ResourceRegistry {
     private readonly extensions;
-    private readonly extensionSourceId;
+    private readonly knownSources;
     private commitQueue;
     constructor(extensions?: RuntimeExtensionLifetime);
     private recommit;
@@ -1339,10 +1346,28 @@ interface SourceInfo {
     baseDir?: string;
     displayName?: string;
 }
+/** A loaded directory Bundle used by an extension. */
+type PhaseDefinition = Phase;
 /** Register a Phase by directory path or Phase object; PHASE.md and direct child Skills are loaded atomically when a path is supplied. */
 type PhaseRegistration = string | Phase;
+type RegisteredPhase = {
+    definition: PhaseDefinition;
+    source: {
+        extensionPath: string;
+    };
+    sourceId: string;
+    scope?: ScopeRef;
+};
 /** Register a Skill directory (containing SKILL.md) or a Skill object. Registering an existing name replaces it. */
 type SkillRegistration = string | Skill;
+type RegisteredSkill = {
+    definition: Skill;
+    source: {
+        extensionPath: string;
+    };
+    sourceId: string;
+    scope?: ScopeRef;
+};
 /**
  * Tool definition for registering LLM-callable tools via `api.tools.register()`.
  *
@@ -1400,6 +1425,8 @@ interface ToolDefinition {
 interface RegisteredTool {
     definition: ToolDefinition;
     sourceInfo: SourceInfo;
+    sourceId: string;
+    scope?: ScopeRef;
 }
 /**
  * Structured extension error with attribution.
@@ -1514,9 +1541,9 @@ interface ExtensionAPI {
     /** Tool capabilities — register and unregister custom tools. */
     tools: {
         /** Register a custom LLM-callable tool. */
-        register(tool: ToolDefinition): Promise<void>;
+        register(tool: ToolDefinition, scope?: ScopeRef): Promise<void>;
         /** Unregister a previously registered tool by name. */
-        unregister(toolName: string): Promise<void>;
+        unregister(toolName: string, scope?: ScopeRef): Promise<void>;
     };
     /** Capability contributions — advertise tools or features to the host. */
     capabilities: {
@@ -1533,9 +1560,9 @@ interface ExtensionAPI {
     /** Phase execution capabilities — provides Phase In/Out, phase identity, phase routing, and registration. */
     phases: {
         /** Register a Phase directory bundle or Phase object. */
-        register(phase: PhaseRegistration): Promise<void>;
+        register(phase: PhaseRegistration, scope?: ScopeRef): Promise<void>;
         /** Unregister a previously registered phase by name. */
-        unregister(phaseName: string): void;
+        unregister(phaseName: string, scope?: ScopeRef): Promise<void> | void;
         /** Phase In: get payload from previous phase */
         getPayload(): unknown;
         /** Phase Out: set payload for next phase */
@@ -1554,9 +1581,9 @@ interface ExtensionAPI {
     /** Skill capabilities — register and unregister standalone skills. */
     skills: {
         /** Register a Skill directory (containing SKILL.md) or a Skill object. Registering an existing name replaces it. */
-        register(skill: SkillRegistration): Promise<void>;
+        register(skill: SkillRegistration, scope?: ScopeRef): Promise<void>;
         /** Unregister a previously registered Skill by name. */
-        unregister(skillName: string): void;
+        unregister(skillName: string, scope?: ScopeRef): Promise<void> | void;
     };
     /** Extension manifest from package.json `rowan` field. */
     manifest?: ExtensionManifest;
@@ -1800,6 +1827,8 @@ interface BeforeToolCallEvent {
     readonly agentId?: string;
     readonly toolCallId?: string;
     readonly metadata?: Readonly<Record<string, unknown>>;
+    /** The invoking Agent's metadata, as the Tool's own call context carries it. */
+    readonly agentMetadata?: Readonly<Record<string, unknown>>;
     readonly answer?: unknown;
     readonly scope?: ScopeRef;
     readonly turn?: JsonObject;
@@ -3357,4 +3386,4 @@ declare function parseFrontmatter<T = Record<string, unknown>>(raw: string): Fro
 
 declare function createCoreTools(input?: CoreToolContext): Tool$1[];
 
-export { type AfterToolCall, type AgentConfiguration, type AgentDefinition, type AgentId, type AgentListCursor, type AgentRecord, type AgentRun, AgentRuntime, type AgentRuntimeOptions, type AgentSummary, type AnyRuntimeError, type AssistantContent, type AssistantMessage, type BeforeToolCall, COMPACT_PHASE_ID, type ConfigProvider, type ConfigPutResult, type ConfigResolution, type ConfigToken, type ConfigurationSnapshot, type ContextCandidate, type ContextCompactionRecord, type ContextStatus, type CoreToolContext, DEFAULT_PHASE_ID, type DefinitionLayer, type DurableConsumer, type DurableRunEvent, type DurableStore, type DurableToolResult, type EntryPhaseSpec, type EventCursor, type EventId, type ExecutionCheckpoint, type ExecutionId, type ExecutionToken, type ExtensionAPI, type ExtensionActivationError, type ExtensionActivationResult, type ExtensionCapability, type ExtensionCapabilityContribution, type ExtensionContribution, type ExtensionDisposer, type ExtensionFactory, type ExtensionFactoryResult, type ExtensionHost, ExtensionLifetimeError, type ExtensionLifetimeErrorCode, type ExtensionLoadInput, type ExtensionStateStore, type ExtensionToolContribution, type FrontmatterResult, type HistorySeed, type HookEvent, type HookEventType, type HookHandler, type HostApiExtension, InMemoryConfigProvider, InMemoryExtensionHost, InMemoryStore, type InteractionRecord, type InvocationCatalogEntry, type InvocationSource, type JsonObject, type JsonPrimitive, type JsonValue, type LiveInteractionEvent, type LoadExtensionsResult, type LoadInput, type LoadResult, type LoadedExtension, type Message, type MessageBase, type MessageCommitted, type MessageContent, type MessageDelta, type MessageId, type MessageRevised, type MessageRevisionResult, type Metadata, type ModelRetry, type OpaqueId, type Outcome$1 as Outcome, type OwnerLease, type OwnerToken, type Page, type Phase, type PhaseContext, type PhaseContribution, type PhaseExecution, type PhaseExecutionIdentity, type PhaseInput, type PhaseInvocation, type PhaseMessageManager, type PhaseOutput, type PhaseRegistry, type PhaseRegistrySelection, type PhaseState, type PhaseStatus, type PhaseStatusState, type ResolvedResourceView, type ResourceDiagnostic, type ResourceKind, type ResourceRef, ResourceRegistry, ResourceRegistryError, type ResourceRegistryErrorCode, type ResourceSourceId, type ResourceView, type RetentionResult, type RunBoundary, type RunClaim, type RunEndEvent, type RunEvent, type RunFailure, type RunId, type RunInteraction, RunInteractionBoundary, RunInteractionCancelledError, type RunInteractionDriver, type RunInteractionKind, type RunInteractionRequest, type RunInteractionState, type RunInteractionStatus, type RunListCursor, type RunRecord, type RunSnapshot, type RunStartEvent, type RunState, type RunStateChanged, type RunSummary, RuntimeBootstrapRegistry, RuntimeError, type RuntimeErrorCode, type RuntimeErrorDetails, RuntimeExtensionLifetime, STOP_PHASE_ID, type SettingsBadge, type SettingsControl, type SettingsDefinition, type SettingsItem, type SettingsOption, type SettingsSection, type Skill, type SkillRegistration, SqliteStore, type TextContent, type ThinkingContent, type ThinkingDelta, type Tool$1 as Tool, type ToolCallContext, type ToolCallDelta, type ToolCallId, type ToolCallPresentationInput, type ToolCallPresentationOutput, type ToolCallSnapshot, type ToolCallState, type ToolContribution, type ToolDefinition, type ToolExecutionResult, type ToolInvocationContext, type ToolMessage, type ToolMessageContent, type ToolResultContent, type ToolStateChanged, type ToolUseContent, type UserContent, type UserInput, type UserMessage, type WithdrawnUserInput, brandConfigToken, createCompactPhase, createCorePhases, createCoreTools, createDefaultPhase, createStopPhase, isConfigurationSnapshot, isRuntimeError, loadExtensionsFromPath as loadExtensions, loadPhase, loadPhases, loadSkill, loadSkills, mergeToolCall, parseAgentDefinition, parseFrontmatter, resolveConfigurationSnapshot };
+export { type AfterToolCall, type AgentConfiguration, type AgentDefinition, type AgentId, type AgentListCursor, type AgentRecord, type AgentRun, AgentRuntime, type AgentRuntimeOptions, type AgentSummary, type AnyRuntimeError, type AssistantContent, type AssistantMessage, type BeforeToolCall, COMPACT_PHASE_ID, type ConfigProvider, type ConfigPutResult, type ConfigResolution, type ConfigToken, type ConfigurationSnapshot, type ContextCandidate, type ContextCompactionRecord, type ContextStatus, type CoreToolContext, DEFAULT_PHASE_ID, type DefinitionLayer, type DurableConsumer, type DurableRunEvent, type DurableStore, type DurableToolResult, type EntryPhaseSpec, type EventCursor, type EventId, type ExecutionCheckpoint, type ExecutionId, type ExecutionToken, type ExtensionAPI, type ExtensionActivationError, type ExtensionActivationResult, type ExtensionCapability, type ExtensionCapabilityContribution, type ExtensionContribution, type ExtensionDisposer, type ExtensionFactory, type ExtensionFactoryResult, type ExtensionHost, ExtensionLifetimeError, type ExtensionLifetimeErrorCode, type ExtensionLoadInput, type ExtensionStateStore, type ExtensionToolContribution, type FrontmatterResult, type HistorySeed, type HookEvent, type HookEventType, type HookHandler, type HostApiExtension, InMemoryConfigProvider, InMemoryExtensionHost, InMemoryStore, type InteractionRecord, type InvocationCatalogEntry, type InvocationSource, type JsonObject, type JsonPrimitive, type JsonValue, type LiveInteractionEvent, type LoadExtensionsResult, type LoadInput, type LoadResult, type LoadedExtension, type Message, type MessageBase, type MessageCommitted, type MessageContent, type MessageDelta, type MessageId, type MessageRevised, type MessageRevisionResult, type Metadata, type ModelRetry, type OpaqueId, type Outcome$1 as Outcome, type OwnerLease, type OwnerToken, type Page, type Phase, type PhaseContext, type PhaseContribution, type PhaseExecution, type PhaseExecutionIdentity, type PhaseInput, type PhaseInvocation, type PhaseMessageManager, type PhaseOutput, type PhaseRegistry, type PhaseRegistrySelection, type PhaseState, type PhaseStatus, type PhaseStatusState, type ResolvedResourceView, type ResourceDiagnostic, type ResourceKind, type ResourceRef, ResourceRegistry, ResourceRegistryError, type ResourceRegistryErrorCode, type ResourceSourceId, type ResourceView, type RetentionResult, type RunBoundary, type RunClaim, type RunEndEvent, type RunEvent, type RunFailure, type RunId, type RunInteraction, RunInteractionBoundary, RunInteractionCancelledError, type RunInteractionDriver, type RunInteractionKind, type RunInteractionRequest, type RunInteractionState, type RunInteractionStatus, type RunListCursor, type RunRecord, type RunSnapshot, type RunStartEvent, type RunState, type RunStateChanged, type RunSummary, RuntimeBootstrapRegistry, RuntimeError, type RuntimeErrorCode, type RuntimeErrorDetails, RuntimeExtensionLifetime, STOP_PHASE_ID, type SettingsBadge, type SettingsControl, type SettingsDefinition, type SettingsItem, type SettingsOption, type SettingsSection, type Skill, type SkillRegistration, SqliteStore, type TextContent, type ThinkingContent, type ThinkingDelta, type Tool$1 as Tool, type ToolCallContext, type ToolCallDelta, type ToolCallId, type ToolCallPresentationInput, type ToolCallPresentationOutput, type ToolCallSnapshot, type ToolCallState, type ToolContribution, type ToolDefinition, type ToolExecutionResult, type ToolInvocationContext, type ToolMessage, type ToolMessageContent, type ToolResultContent, type ToolStateChanged, type ToolUseContent, type UserContent, type UserInput, type UserMessage, type WithdrawnUserInput, brandConfigToken, createCompactPhase, createCorePhases, createCoreTools, createDefaultPhase, createStopPhase, extensionSourceId, isConfigurationSnapshot, isRuntimeError, loadExtensionsFromPath as loadExtensions, loadPhase, loadPhases, loadSkill, loadSkills, mergeToolCall, parseAgentDefinition, parseFrontmatter, resolveConfigurationSnapshot };

package/dist/index.js

@@ -1702,13 +1702,13 @@ function createExtensionAPI(hooks, options, runtime, eventBus) {
       }
     },
     tools: {
-      register: (tool) => {
+      register: (tool, scope) => {
         assertActive();
-        return Promise.resolve(options?.registerTool?.(tool));
+        return Promise.resolve(options?.registerTool?.(tool, scope));
       },
-      unregister: (toolName) => {
+      unregister: (toolName, scope) => {
         assertActive();
-        return Promise.resolve(options?.unregisterTool?.(toolName));
+        return Promise.resolve(options?.unregisterTool?.(toolName, scope));
       }
     },
     capabilities: {
@@ -1762,13 +1762,13 @@ function createExtensionAPI(hooks, options, runtime, eventBus) {
     }, emit: () => {
     }, has: () => false, count: () => 0 },
     phases: {
-      register: async (registration) => {
+      register: async (registration, scope) => {
         assertActive();
-        await options?.registerPhase?.(registration);
+        await options?.registerPhase?.(registration, scope);
       },
-      unregister: (phaseName) => {
+      unregister: (phaseName, scope) => {
         assertActive();
-        return options?.unregisterPhase?.(phaseName);
+        return options?.unregisterPhase?.(phaseName, scope);
       },
       getPayload: () => outputPayload,
       setPayload: (p) => {
@@ -1785,13 +1785,13 @@ function createExtensionAPI(hooks, options, runtime, eventBus) {
       getMessage: () => outputMessage
     },
     skills: {
-      register: async (skill) => {
+      register: async (skill, scope) => {
         assertActive();
-        await options?.registerSkill?.(skill);
+        await options?.registerSkill?.(skill, scope);
       },
-      unregister: (skillName) => {
+      unregister: (skillName, scope) => {
         assertActive();
-        return options?.unregisterSkill?.(skillName);
+        return options?.unregisterSkill?.(skillName, scope);
       }
     }
   };
@@ -5187,6 +5187,7 @@ function assembleRegisteredExtensions(snapshot, runner, options = {}) {
         agentId: input.context.agentId,
         toolCallId: input.context.toolCallId,
         metadata: input.context.runMetadata,
+        ...input.context.agentMetadata === void 0 ? {} : { agentMetadata: input.context.agentMetadata },
         answer: input.answer,
         scope: input.context.scope,
         turn: input.context.turn
@@ -6039,6 +6040,10 @@ function createEventBus() {
 }
 
 // src/extensions/runner.ts
+function extensionSourceId(scope) {
+  if (!scope || scope.length === 0) return "rowan.extensions";
+  return `rowan.extensions:${scopeToKey(scope)}`;
+}
 async function execCommand(command, args, cwd, options) {
   return new Promise((resolve9, reject) => {
     const child = execFile(
@@ -6350,8 +6355,9 @@ var ExtensionRunner = class {
    */
   getToolDefinition(toolName) {
     for (const ext of this.extensions) {
-      const tool = ext.tools.get(toolName);
-      if (tool) return tool.definition;
+      for (const tool of ext.tools.values()) {
+        if (tool.definition.name === toolName) return tool.definition;
+      }
     }
     return void 0;
   }
@@ -6402,20 +6408,24 @@ var ExtensionRunner = class {
   // Phase management
   // ---------------------------------------------------------------------------
   getPhase(name) {
-    const reg = this.getRegisteredPhase(name);
-    if (!reg) return void 0;
-    return this.adaptToPhase(reg);
+    for (const reg of this.collectRegisteredPhases().values()) {
+      if (reg.definition.name === name) return this.adaptToPhase(reg);
+    }
+    return void 0;
   }
   getPhases() {
     return [...this.collectRegisteredPhases().values()].map(
       (p) => this.adaptToPhase(p)
     );
   }
+  getRegisteredPhases() {
+    return [...this.collectRegisteredPhases().values()];
+  }
   createPhaseRegistry(input = {}) {
     const registered = this.collectRegisteredPhases();
     const phases = /* @__PURE__ */ new Map();
-    for (const [name, reg] of registered) {
-      phases.set(name, this.adaptToPhase(reg));
+    for (const reg of registered.values()) {
+      phases.set(reg.definition.name, this.adaptToPhase(reg));
     }
     const entryPhaseId = input.entryPhaseId ?? null;
     return { phases, entryPhaseId };
@@ -6436,6 +6446,9 @@ var ExtensionRunner = class {
   getSkills() {
     return [...this.skills.values()].map((s) => s.definition);
   }
+  getRegisteredSkills() {
+    return [...this.skills.values()];
+  }
   // ---------------------------------------------------------------------------
   // Lifecycle
   // ---------------------------------------------------------------------------
@@ -6531,6 +6544,7 @@ var ExtensionRunner = class {
       ...context?.agentId !== void 0 ? { agentId: context.agentId } : {},
       ...context?.toolCallId !== void 0 ? { toolCallId: context.toolCallId } : {},
       ...context?.metadata !== void 0 ? { metadata: context.metadata } : {},
+      ...context?.agentMetadata !== void 0 ? { agentMetadata: context.agentMetadata } : {},
       ...context?.answer !== void 0 ? { answer: context.answer } : {},
       scope,
       turn
@@ -6611,14 +6625,14 @@ var ExtensionRunner = class {
       }
     };
     return createExtensionAPI(this.hooks, {
-      registerPhase: (registration) => this.registerPhase(extension, registration),
-      unregisterPhase: (phaseName) => this.unregisterPhase(extension, phaseName),
-      registerSkill: (registration) => this.registerSkill(extension, registration),
-      unregisterSkill: (skillName) => this.unregisterSkill(extension, skillName),
+      registerPhase: (registration, scope) => this.registerPhase(extension, registration, scope),
+      unregisterPhase: (phaseName, scope) => this.unregisterPhase(extension, phaseName, scope),
+      registerSkill: (registration, scope) => this.registerSkill(extension, registration, scope),
+      unregisterSkill: (skillName, scope) => this.unregisterSkill(extension, skillName, scope),
       registerProvider: (config) => this.registerProvider(config),
       unregisterProvider: (name) => this.unregisterProvider(name),
-      registerTool: (tool) => this.registerTool(extension, tool),
-      unregisterTool: (toolName) => this.unregisterTool(extension, toolName),
+      registerTool: (tool, scope) => this.registerTool(extension, tool, scope),
+      unregisterTool: (toolName, scope) => this.unregisterTool(extension, toolName, scope),
       contributeCapability: (contribution) => this.contributeCapability(extension, contribution),
       context: extContext,
       manifest,
@@ -6666,12 +6680,14 @@ var ExtensionRunner = class {
   }
   // Validation stays synchronous so a duplicate throws at the call site even
   // when the caller does not await the Registry re-commit.
-  registerTool(extension, tool) {
-    if (extension.tools.has(tool.name)) {
+  registerTool(extension, tool, scope) {
+    const sourceId = extensionSourceId(scope);
+    const regKey = `${sourceId}::${tool.name}`;
+    if (extension.tools.has(regKey)) {
       throw new Error(`Duplicate Tool name "${tool.name}" in extension ${extension.path}.`);
     }
     for (const ext of this.extensions) {
-      if (ext.tools.has(tool.name)) {
+      if (ext.tools.has(regKey)) {
         const message = `Duplicate Tool name "${tool.name}" from extensions ${ext.path} and ${extension.path}.`;
         this.emitError({
           extensionPath: extension.path,
@@ -6682,14 +6698,18 @@ var ExtensionRunner = class {
       }
     }
     const sourceInfo = createSourceInfo(extension.path);
-    extension.tools.set(tool.name, {
+    extension.tools.set(regKey, {
       definition: tool,
-      sourceInfo
+      sourceInfo,
+      sourceId,
+      scope
     });
     return this.notifyResourceChange("tool");
   }
-  unregisterTool(extension, toolName) {
-    if (!extension.tools.delete(toolName)) return Promise.resolve();
+  unregisterTool(extension, toolName, scope) {
+    const sourceId = extensionSourceId(scope);
+    const regKey = `${sourceId}::${toolName}`;
+    if (!extension.tools.delete(regKey)) return Promise.resolve();
     return this.notifyResourceChange("tool");
   }
   contributeCapability(extension, contribution) {
@@ -6732,89 +6752,101 @@ var ExtensionRunner = class {
       }
     }
   }
-  async registerPhase(extension, registration) {
+  async registerPhase(extension, registration, scope) {
     if (typeof registration === "string") {
       if (registration.length === 0) {
         throw new Error(`Phase registration requires a directory path.`);
       }
-      return this.loadRegisteredPhase(extension, registration);
+      return this.loadRegisteredPhase(extension, registration, scope);
     }
     if (typeof registration === "object" && registration !== null && "name" in registration) {
-      return this.registerPhaseDefinition(extension, registration);
+      return this.registerPhaseDefinition(extension, registration, scope);
     }
     throw new Error(`Phase registration requires a directory path or Phase object.`);
   }
-  async registerPhaseDefinition(extension, phase) {
+  async registerPhaseDefinition(extension, phase, scope) {
+    const sourceId = extensionSourceId(scope);
     const name = phase.name;
-    if (this.phases.has(name)) {
+    const regKey = `${sourceId}::${name}`;
+    if (this.phases.has(regKey)) {
       throw new Error(`Duplicate phase name: ${name}`);
     }
     const registered = {
       definition: phase,
-      source: { extensionPath: extension.path }
+      source: { extensionPath: extension.path },
+      sourceId,
+      scope
     };
-    this.phases.set(name, registered);
-    extension.phases.add(name);
+    this.phases.set(regKey, registered);
+    extension.phases.add(regKey);
     this._phaseCache = null;
     await this.notifyResourceChange("phase");
   }
-  async unregisterPhase(extension, phaseName) {
-    const registered = this.phases.get(phaseName);
+  async unregisterPhase(extension, phaseName, scope) {
+    const sourceId = extensionSourceId(scope);
+    const regKey = `${sourceId}::${phaseName}`;
+    const registered = this.phases.get(regKey);
     if (registered && registered.source.extensionPath === extension.path) {
-      this.phases.delete(phaseName);
-      extension.phases.delete(phaseName);
+      this.phases.delete(regKey);
+      extension.phases.delete(regKey);
       this._phaseCache = null;
       await this.notifyResourceChange("phase");
     }
   }
-  async loadRegisteredPhase(extension, registration) {
+  async loadRegisteredPhase(extension, registration, scope) {
     const extensionBase = extension.path.startsWith("<") ? this.cwd : dirname6(extension.path);
     const phase = await loadPhase(resolve5(extensionBase, registration));
-    await this.registerPhaseDefinition(extension, phase);
+    await this.registerPhaseDefinition(extension, phase, scope);
   }
-  async registerSkill(extension, registration) {
+  async registerSkill(extension, registration, scope) {
     if (typeof registration === "string") {
       if (registration.length === 0) {
         throw new Error(`Skill registration requires a directory path.`);
       }
-      return this.loadRegisteredSkill(extension, registration);
+      return this.loadRegisteredSkill(extension, registration, scope);
     }
     if (typeof registration === "object" && registration !== null && "name" in registration) {
-      return this.registerSkillDefinition(extension, registration);
+      return this.registerSkillDefinition(extension, registration, scope);
     }
     throw new Error(`Skill registration requires a directory path or Skill object.`);
   }
-  async registerSkillDefinition(extension, skill) {
+  async registerSkillDefinition(extension, skill, scope) {
+    const sourceId = extensionSourceId(scope);
     const name = skill.name;
-    const existing = this.skills.get(name);
+    const regKey = `${sourceId}::${name}`;
+    const existing = this.skills.get(regKey);
     if (existing && existing.source.extensionPath !== extension.path) {
       for (const ext of this.extensions) {
         if (ext.path === existing.source.extensionPath) {
-          ext.skills.delete(name);
+          ext.skills.delete(regKey);
           break;
         }
       }
     }
     const registered = {
       definition: skill,
-      source: { extensionPath: extension.path }
+      source: { extensionPath: extension.path },
+      sourceId,
+      scope
     };
-    this.skills.set(name, registered);
-    extension.skills.add(name);
+    this.skills.set(regKey, registered);
+    extension.skills.add(regKey);
     await this.notifyResourceChange("skill");
   }
-  async unregisterSkill(extension, skillName) {
-    const registered = this.skills.get(skillName);
+  async unregisterSkill(extension, skillName, scope) {
+    const sourceId = extensionSourceId(scope);
+    const regKey = `${sourceId}::${skillName}`;
+    const registered = this.skills.get(regKey);
     if (registered && registered.source.extensionPath === extension.path) {
-      this.skills.delete(skillName);
-      extension.skills.delete(skillName);
+      this.skills.delete(regKey);
+      extension.skills.delete(regKey);
       await this.notifyResourceChange("skill");
     }
   }
-  async loadRegisteredSkill(extension, registration) {
+  async loadRegisteredSkill(extension, registration, scope) {
     const extensionBase = extension.path.startsWith("<") ? this.cwd : dirname6(extension.path);
     const skill = await loadSkill(resolve5(extensionBase, registration));
-    await this.registerSkillDefinition(extension, skill);
+    await this.registerSkillDefinition(extension, skill, scope);
   }
   registerProvider(config) {
     if (this.bound) {
@@ -7063,7 +7095,7 @@ var ResourceRegistryError = class extends Error {
   }
 };
 var RESOURCE_NAME = /^[A-Za-z0-9][A-Za-z0-9._:-]*$/;
-var SOURCE_ID = /^[A-Za-z0-9][A-Za-z0-9._:-]*$/;
+var SOURCE_ID = /^[A-Za-z0-9][A-Za-z0-9._:/-]*$/;
 var ResourceRegistry = class {
   sources = /* @__PURE__ */ new Map();
   /** Sources registered by the bootstrap boundary (currently Extensions). */
@@ -7156,15 +7188,7 @@ var ResourceRegistry = class {
   }
   withImplicit(kind, sourceIds) {
     const combined = [...sourceIds];
-    let hasCore = false;
-    for (const sourceId of this.implicitSources.get(kind) ?? []) {
-      if (sourceId === "rowan.core") {
-        hasCore = true;
-      } else if (!combined.includes(sourceId)) {
-        combined.push(sourceId);
-      }
-    }
-    if (hasCore && !combined.includes("rowan.core")) {
+    if (this.hasImplicit(kind, "rowan.core") && !combined.includes("rowan.core")) {
       combined.push("rowan.core");
     }
     return combined;
@@ -7239,9 +7263,6 @@ var ResourceRegistry = class {
           if (source.sourceId === "rowan.core") {
             continue;
           }
-          if (source.sourceId === "rowan.extensions" && isCoreResourceName(kind, value.name)) {
-            continue;
-          }
           throw new ResourceRegistryError(
             "resource_collision",
             `Duplicate ${capitalize(kind)} resource "${value.name}" in Resource View.`
@@ -7265,9 +7286,6 @@ var ResourceRegistry = class {
           if (source.sourceId === "rowan.core") {
             continue;
           }
-          if (source.sourceId === "rowan.extensions" && isCoreResourceName(kind, value.name)) {
-            continue;
-          }
           throw new ResourceRegistryError("resource_collision", `Duplicate ${capitalize(kind)} resource "${value.name}" in Resource View.`);
         }
         seenNames.add(value.name);
@@ -7286,10 +7304,7 @@ var ResourceRegistry = class {
       seen.add(sourceId);
       const source = bySource?.get(sourceId);
       if (!source) {
-        throw new ResourceRegistryError(
-          "unknown_resource_source",
-          `Unknown resource source "${sourceId}" for ${kind}.`
-        );
+        continue;
       }
       sources.push(source);
     }
@@ -7341,9 +7356,6 @@ function capitalize(value) {
 function isImplicitCoreName(kind, name) {
   return kind === "tool" && name === "route";
 }
-function isCoreResourceName(kind, name) {
-  return kind === "tool" && CORE_TOOL_NAMES.has(name) || kind === "phase" && CORE_PHASE_NAMES.has(name);
-}
 async function loadDirectoryValues(kind, directory, sourceId) {
   const root = resolve7(directory);
   let rootInfo;
@@ -7507,9 +7519,15 @@ var RuntimeExtensionLifetime = class {
   phases() {
     return this.runner.getPhases();
   }
+  registeredPhases() {
+    return this.runner.getRegisteredPhases();
+  }
   skills() {
     return this.runner.getSkills();
   }
+  registeredSkills() {
+    return this.runner.getRegisteredSkills();
+  }
   get extensionRunner() {
     return this.runner;
   }
@@ -7535,16 +7553,25 @@ var RuntimeBootstrapRegistry = class extends ResourceRegistry {
     this.extensions.onResourceChange((kind) => this.recommit(kind));
   }
   extensions;
-  extensionSourceId = "rowan.extensions";
+  knownSources = /* @__PURE__ */ new Map();
   commitQueue = Promise.resolve();
   recommit(kind) {
     const next = this.commitQueue.then(async () => {
-      if (kind === "tool") {
-        await this.replaceImplicit("tool", this.extensionSourceId, this.extensions.tools().map(adaptExtensionTool));
-      } else if (kind === "phase") {
-        await this.replaceImplicit("phase", this.extensionSourceId, [...this.extensions.phases()]);
-      } else if (kind === "skill") {
-        await this.replaceImplicit("skill", this.extensionSourceId, [...this.extensions.skills()]);
+      const entries = kind === "tool" ? this.extensions.tools().map((tool) => [tool.sourceId, adaptExtensionTool(tool)]) : kind === "phase" ? this.extensions.registeredPhases().map((reg) => [reg.sourceId, this.extensions.extensionRunner.adaptToPhase(reg)]) : this.extensions.registeredSkills().map((reg) => [reg.sourceId, reg.definition]);
+      const bySource = /* @__PURE__ */ new Map();
+      for (const [sourceId, value] of entries) bySource.set(sourceId, [...bySource.get(sourceId) ?? [], value]);
+      const known = this.knownSources.get(kind) ?? /* @__PURE__ */ new Set();
+      this.knownSources.set(kind, known);
+      for (const [sourceId, values] of bySource) {
+        known.add(sourceId);
+        if (kind === "tool") await this.loadTools({ sourceId, values });
+        else if (kind === "phase") await this.loadPhases({ sourceId, values });
+        else await this.loadSkills({ sourceId, values });
+      }
+      for (const sourceId of [...known]) {
+        if (bySource.has(sourceId)) continue;
+        known.delete(sourceId);
+        await this.unload({ kind, sourceId });
       }
     });
     this.commitQueue = next.catch(() => void 0);
@@ -13106,6 +13133,7 @@ export {
   createCoreTools2 as createCoreTools,
   createDefaultPhase,
   createStopPhase,
+  extensionSourceId,
   isConfigurationSnapshot,
   isRuntimeError,
   loadExtensionsFromPath as loadExtensions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowan-agent/agent",
-  "version": "0.23.0",
+  "version": "0.24.0",
   "license": "MIT",
   "repository": {
     "type": "git",