@moretea-labs/forge 1.8.0 → 1.8.2

package/adapters/mcp/toolset-names.ts

@@ -4,12 +4,11 @@ import { FACADE_TOOLS } from '../../src/runtime/control-plane/facade/types';
 export const PREFERRED_FACADE_TOOL_NAMES = [...FACADE_TOOLS] as const;
 
 /**
- * Default ChatGPT-facing MCP surface. The Runtime keeps every internal atomic
- * handler and the full compatibility profile; ChatGPT only needs this bounded
- * execution surface. Atomic Git / issue-task / edit-session / plugin
- * tools remain registered and reachable through `toolset=full`.
+ * Preferred public tool names for model routing and connector freshness.
+ * Not an exposure profile: every registered MCP tool is always discoverable.
+ * Removal of an obsolete public handler is a source migration, not a toolset switch.
  */
-export const DEFAULT_CONTROLLER_TOOL_NAMES = [
+export const PREFERRED_CONTROLLER_TOOL_NAMES = [
   ...PREFERRED_FACADE_TOOL_NAMES,
 
   // Repository selection / bootstrap.
@@ -17,11 +16,11 @@ export const DEFAULT_CONTROLLER_TOOL_NAMES = [
   'repository_get',
   'repository_register',
 
-  // Generic repository-scoped command (readonly fast path, mutation, destructive gate).
-  'repository_command_execute',
+  // Unified terminal entry; scope determines its authorized execution target.
+  'execute_command',
 
   // Source inspection and bounded Direct Edit. Code location is routed through
-  // rh_context.search; the low-level search_repository handler remains in full.
+  // rh_context.search; the direct search_repository action remains available.
   'read_repository_file',
   'repository_safe_patch_apply',
 
@@ -29,46 +28,21 @@ export const DEFAULT_CONTROLLER_TOOL_NAMES = [
   'run_check',
 
   // Protected Computer preparation/input use typed direct-non-persistent actions
-  // behind the stable plugin dispatcher. Their full-profile atomic tools remain
-  // registered only for compatibility clients and are not part of this frozen ABI.
+  // behind the stable plugin dispatcher. Distinct OS actions remain public.
 
   // One typed plugin dispatcher. Plugin discovery/action schemas stay routed
   // through rh_context(capability_id=plugin.<plugin>.<action>) to avoid widening
-  // the default surface with list/get plugin atomics.
+  // the preferred list with every plugin atomic.
   'plugin_action_execute',
 
   // Managed Process Runtime lifecycle (attach / poll / cancel — never re-exec).
+  // Host execution requires execute_command(scope=host) with explicit process:exec Grant.
   'process_get',
   'process_wait',
   'process_logs',
   'process_cancel',
 
-  // Evidence. Approval resolution is available through rh_access/rh_work and
-  // the explicit full compatibility profile; it does not need a top-level
-  // default tool.
+  // Evidence. The complete registry also exposes exact typed approval actions.
   'result_read',
   'result_search',
 ] as const;
-
-/** Minimal bootstrap subset retained for diagnostics and constrained clients. */
-export const BOOTSTRAP_CONTROLLER_TOOL_NAMES = [
-  ...PREFERRED_FACADE_TOOL_NAMES,
-  'repository_access_get',
-  'repository_list',
-  'repository_get',
-  'repository_register',
-  'repository_latest_source_diagnose',
-  'repository_bootstrap_local_project',
-] as const;
-
-/**
- * Stable ChatGPT connector schema. Keep this identical to the bounded default
- * Runtime surface so discovery never advertises atomic tools that the default
- * Forge build will reject. The exhaustive `full` profile is assembled directly
- * from registered definitions and remains available for explicit compatibility
- * clients without widening the normal connector schema.
- */
-export const STABLE_CONTROLLER_TOOL_NAMES = DEFAULT_CONTROLLER_TOOL_NAMES;
-
-/** Core is a compatibility label for the bounded default Controller surface. */
-export const CORE_CONTROLLER_TOOL_NAMES = DEFAULT_CONTROLLER_TOOL_NAMES;

package/adapters/mcp/toolset.ts

@@ -11,19 +11,18 @@ import { runtimeToolDefinitions } from './runtime-gateway/runtime-tool-definitio
 import { executionToolDefinitions } from './runtime-gateway/execution-tools';
 import { processToolDefinitions } from './runtime-gateway/process-tools';
 import { injectDurableCommandFields } from './runtime-gateway/router';
-import { DEFAULT_CONTROLLER_TOOL_NAMES, PREFERRED_FACADE_TOOL_NAMES, STABLE_CONTROLLER_TOOL_NAMES } from './toolset-names';
-export { BOOTSTRAP_CONTROLLER_TOOL_NAMES, CORE_CONTROLLER_TOOL_NAMES, DEFAULT_CONTROLLER_TOOL_NAMES, PREFERRED_FACADE_TOOL_NAMES, STABLE_CONTROLLER_TOOL_NAMES } from './toolset-names';
-import type { McpToolset } from './types';
+import { injectCognitionSettlementFields } from './runtime-gateway/cognition-settlement';
+import { PREFERRED_FACADE_TOOL_NAMES } from './toolset-names';
+export { PREFERRED_CONTROLLER_TOOL_NAMES, PREFERRED_FACADE_TOOL_NAMES } from './toolset-names';
 import { forgeToolSurfaceFingerprint } from '../../src/cli/controller/runtime-config';
 
-export type ToolExposureClass = 'facade' | 'advanced' | 'internal' | 'compatibility';
-export type ControllerToolProfile = 'facade' | 'core' | 'advanced' | 'full';
+export type ControllerToolProfile = 'full';
 
 export interface ControllerToolInventoryEntry {
   name: string;
   profile: ControllerToolProfile;
   capability: string;
-  exposedVia: 'facade' | 'core' | 'advanced' | 'full';
+  exposedVia: 'facade' | 'full';
 }
 
 /**
@@ -33,7 +32,7 @@ export interface ControllerToolInventoryEntry {
  */
 export interface ControllerExposureSnapshot {
   access: ControllerAccessState;
-  toolset: McpToolset;
+  toolset: 'full';
   profile: ControllerToolProfile;
   definitions: McpToolDefinition[];
   toolNames: string[];
@@ -64,17 +63,6 @@ export interface ControllerToolSurfaceStatus {
   ready: boolean;
 }
 
-/**
- * Core and Advanced expose the same bounded default ChatGPT surface
- * (DEFAULT_CONTROLLER_TOOL_NAMES). Full remains the exhaustive compatibility
- * surface for legacy integrations; internal atomic handlers are never deleted.
- */
-
-/** Historical Advanced name retained for compatibility. */
-export const ADVANCED_CONTROLLER_TOOL_NAMES = DEFAULT_CONTROLLER_TOOL_NAMES;
-
-const DEFAULT_CONTROLLER_TOOL_SET = new Set<string>(DEFAULT_CONTROLLER_TOOL_NAMES);
-
 interface StaticControllerExposureSnapshot {
   definitions: McpToolDefinition[];
   toolNames: string[];
@@ -99,32 +87,12 @@ function pruneStaticExposureCache(): void {
   }
 }
 
-export function normalizeMcpToolset(value: unknown): McpToolset {
-  if (value === 'full' || value === 'advanced' || value === 'core' || value === 'facade') return value;
-  return 'advanced';
-}
-
-/**
- * null means expose every registered definition. Profile membership only
- * changes schema discovery; authorization remains an independent policy.
- */
-export function controllerToolNamesForToolset(
-  toolset: McpToolset,
-  _ctx?: MultiRepositoryMcpToolContext,
-): readonly string[] | null {
-  if (toolset === 'full') return null;
-  if (toolset === 'facade') return PREFERRED_FACADE_TOOL_NAMES;
-  return DEFAULT_CONTROLLER_TOOL_NAMES;
-}
-
 export function resolveControllerAccessStateForContext(
   ctx: MultiRepositoryMcpToolContext,
 ): ControllerAccessState {
   return resolveControllerAccessState({
     controllerHome: ctx.controllerHome,
     repoRoot: ctx.explicitRepository?.canonicalRoot,
-    toolsetOverride: ctx.toolset,
-    toolsetLocked: ctx.toolsetLocked ?? false,
   });
 }
 
@@ -162,7 +130,6 @@ function staticExposureCacheKey(ctx: MultiRepositoryMcpToolContext): string {
     controllerHome: ctx.controllerHome,
     repoRoot: ctx.repoRoot,
     explicitRepositoryId: ctx.explicitRepository?.repoId,
-    toolset: ctx.toolset,
     profile: ctx.policy.profile,
     enableChatgptBrowser: ctx.enableChatgptBrowser === true,
     devAgentRunner: ctx.policy.execution.agentRunner,
@@ -181,26 +148,20 @@ function buildStaticControllerExposureSnapshot(
     accessToolDefinitions,
     repositoryToolDefinitions,
   );
-  const rawDefinitions = ctx.toolset === 'full'
-    ? currentDefinitions.concat(
-      buildMultiRepositoryToolDefinitions(ctx).filter(
-        (legacy) => !currentDefinitions.some((current) => current.name === legacy.name),
-      ),
-    )
-    : currentDefinitions;
+  const rawDefinitions = currentDefinitions.concat(
+    buildMultiRepositoryToolDefinitions(ctx).filter(
+      (legacy) => !currentDefinitions.some((current) => current.name === legacy.name),
+    ),
+  );
   const unique = uniqueDefinitions(rawDefinitions);
-  const allowed = controllerToolNamesForToolset(ctx.toolset, ctx);
-  const expectedToolNames = allowed === null
-    ? unique.definitions.map((tool) => tool.name)
-    : [...new Set(allowed)];
+  const expectedToolNames = unique.definitions.map((tool) => tool.name);
   const definitionByName = new Map(unique.definitions.map((definition) => [definition.name, definition]));
   const definitions = expectedToolNames
     .map((name) => definitionByName.get(name))
     .filter((definition): definition is McpToolDefinition => Boolean(definition))
-    // Fingerprint the definitions that ListTools actually returns. The server
-    // adds durable command fields to every object schema, so calculating the
-    // fence from the pre-injection form would miss a change to those fields.
-    .map(injectDurableCommandFields);
+    // Fingerprint the exact definitions that ListTools returns. Shared transport
+    // contracts are injected here once rather than re-declared by domain registries.
+    .map((definition) => injectCognitionSettlementFields(injectDurableCommandFields(definition)));
   const actualToolNames = definitions.map((tool) => tool.name);
   const actualSet = new Set(actualToolNames);
   const expectedSet = new Set(expectedToolNames);
@@ -248,15 +209,10 @@ function capabilityForToolName(name: string): string {
   return 'compatibility';
 }
 
-function profileForToolset(toolset: McpToolset): ControllerToolProfile {
-  return toolset === 'full' ? 'full' : toolset === 'facade' ? 'facade' : toolset === 'core' ? 'core' : 'advanced';
-}
-
 export function controllerToolInventory(
   toolNames: readonly string[],
-  toolset: McpToolset,
 ): ControllerToolInventoryEntry[] {
-  const profile = profileForToolset(toolset);
+  const profile = 'full' as const;
   return toolNames.map((name) => ({
     name,
     profile,
@@ -269,19 +225,13 @@ export function clearControllerExposureCacheForTest(): void {
   staticControllerExposureCache.clear();
 }
 
-export function allControllerToolDefinitions(ctx: MultiRepositoryMcpToolContext): McpToolDefinition[] {
-  return uniqueDefinitions(
-    runtimeToolDefinitions.concat(executionToolDefinitions, processToolDefinitions, accessToolDefinitions, repositoryToolDefinitions, buildMultiRepositoryToolDefinitions(ctx)),
-  ).definitions;
-}
-
 export function controllerExposureSnapshot(ctx: MultiRepositoryMcpToolContext): ControllerExposureSnapshot {
   const staticSnapshot = staticControllerExposureSnapshot(ctx);
   return {
     access: resolveControllerAccessStateForContext(ctx),
-    toolset: ctx.toolset,
-    profile: profileForToolset(ctx.toolset),
-    inventory: controllerToolInventory(staticSnapshot.actualToolNames, ctx.toolset),
+    toolset: 'full',
+    profile: 'full',
+    inventory: controllerToolInventory(staticSnapshot.actualToolNames),
     ...staticSnapshot,
   };
 }
@@ -304,29 +254,6 @@ export function controllerExposedToolNames(ctx: MultiRepositoryMcpToolContext):
   return controllerExposureSnapshot(ctx).actualToolNames;
 }
 
-export function classifyControllerToolExposure(toolName: string): ToolExposureClass {
-  if ((PREFERRED_FACADE_TOOL_NAMES as readonly string[]).includes(toolName)) return 'facade';
-  if (toolName.startsWith('rh_')) return 'facade';
-  if (DEFAULT_CONTROLLER_TOOL_SET.has(toolName)) return 'advanced';
-  return 'compatibility';
-}
-
-export function controllerToolExposureMetadata(toolNames: readonly string[]): {
-  preferredTools: string[];
-  advancedTools: string[];
-  compatibilityTools: string[];
-  classification: Record<string, ToolExposureClass>;
-} {
-  const classification: Record<string, ToolExposureClass> = {};
-  for (const name of toolNames) classification[name] = classifyControllerToolExposure(name);
-  return {
-    preferredTools: toolNames.filter((name) => classification[name] === 'facade'),
-    advancedTools: toolNames.filter((name) => classification[name] === 'advanced'),
-    compatibilityTools: toolNames.filter((name) => classification[name] === 'compatibility'),
-    classification,
-  };
-}
-
 export function exposedControllerToolDefinitions(ctx: MultiRepositoryMcpToolContext): McpToolDefinition[] {
   return controllerExposureSnapshot(ctx).definitions;
 }

package/{src/cli → adapters}/mcp/transports/AGENTS.md

@@ -5,21 +5,21 @@ Keep this file focused on the local contract for this primary functional block.
 <!-- BEGIN ARCHITECTURE CONTRACT -->
 ## Architecture Contract
 
-- Functional block: `src/cli/mcp/transports`
+- Functional block: `adapters/mcp/transports`
 - Capability ID: `mcp-http-transport-lifecycle`
-- Matched prefix: `src/cli/mcp/transports`
+- Matched prefix: `adapters/mcp/transports`
 - Architecture domain: `controller-runtime`
 - Architecture capability: `transport-lifecycle`
 - Architecture module: `docs/architecture/modules/controller-runtime/transport-lifecycle.md`
 - Last architecture event: 2026-07-18T07:08:47.902Z
-- Last changed path: `src/cli/mcp/transports`
+- Last changed path: `adapters/mcp/transports`
 - Severity: medium
 - Change type: capability-config
 - Module responsibility: Keep this block aligned with the local boundary described by surrounding human-owned context.
-- Entrypoints: `src/cli/mcp/transports`
+- Entrypoints: `adapters/mcp/transports`
 - Allowed dependencies: Follow root `AGENTS.md` / `CLAUDE.md` and this local contract.
 - Forbidden dependencies: Do not cross sibling app/service/package boundaries without an architecture snapshot or explicit plan.
-- Runtime path: `src/cli/mcp/transports`
+- Runtime path: `adapters/mcp/transports`
 - LSP/tooling profile: `typescript-lsp`
 - Verification: Use root required checks plus local commands recorded in this capability contract.
 - Latest snapshot: `(none yet)`

package/{src/cli → adapters}/mcp/transports/CLAUDE.md

@@ -5,21 +5,21 @@ Keep this file focused on the local contract for this primary functional block.
 <!-- BEGIN ARCHITECTURE CONTRACT -->
 ## Architecture Contract
 
-- Functional block: `src/cli/mcp/transports`
+- Functional block: `adapters/mcp/transports`
 - Capability ID: `mcp-http-transport-lifecycle`
-- Matched prefix: `src/cli/mcp/transports`
+- Matched prefix: `adapters/mcp/transports`
 - Architecture domain: `controller-runtime`
 - Architecture capability: `transport-lifecycle`
 - Architecture module: `docs/architecture/modules/controller-runtime/transport-lifecycle.md`
 - Last architecture event: 2026-07-18T07:08:47.902Z
-- Last changed path: `src/cli/mcp/transports`
+- Last changed path: `adapters/mcp/transports`
 - Severity: medium
 - Change type: capability-config
 - Module responsibility: Keep this block aligned with the local boundary described by surrounding human-owned context.
-- Entrypoints: `src/cli/mcp/transports`
+- Entrypoints: `adapters/mcp/transports`
 - Allowed dependencies: Follow root `AGENTS.md` / `CLAUDE.md` and this local contract.
 - Forbidden dependencies: Do not cross sibling app/service/package boundaries without an architecture snapshot or explicit plan.
-- Runtime path: `src/cli/mcp/transports`
+- Runtime path: `adapters/mcp/transports`
 - LSP/tooling profile: `typescript-lsp`
 - Verification: Use root required checks plus local commands recorded in this capability contract.
 - Latest snapshot: `(none yet)`