@moretea-labs/forge 1.8.1 → 1.8.2

package/scripts/install-ios-hid-toolchain.sh

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+# Install the one Controller-owned physical-iPhone HID Python toolchain.
+# Execute only with an authorized ForgeInstance host process:exec grant.
+set -euo pipefail
+
+if [[ $# -ne 1 || ! -d "$1" ]]; then
+  echo "Usage: $0 <existing-controller-home>" >&2
+  exit 2
+fi
+if [[ "$(uname -s)" != "Darwin" ]]; then
+  echo "The CoreDevice HID toolchain requires macOS." >&2
+  exit 2
+fi
+
+repo_root="$(cd "$(dirname "$0")/.." && pwd -P)"
+controller_home="$(cd "$1" && pwd -P)"
+version="11.24.0"
+# The provider source is the sole runtime version authority. Refuse a stale installer.
+if ! grep -Fq "export const IOS_HID_TOOLCHAIN_VERSION = '$version';" \
+  "$repo_root/src/runtime/plugins/ios/remote-xpc-hid.ts"; then
+  echo "Installer version no longer matches the RemoteXPC provider pin." >&2
+  exit 2
+fi
+
+toolchains="$controller_home/toolchains"
+mkdir -p "$toolchains"
+target="$toolchains/pymobiledevice3-$version"
+lock="$toolchains/.pymobiledevice3-$version-install.lock"
+if ! mkdir "$lock" 2>/dev/null; then
+  echo "The pinned HID toolchain is already being installed; no parallel writer." >&2
+  exit 1
+fi
+
+created=false
+completed=false
+cleanup() {
+  if [[ "$created" == true && "$completed" != true ]]; then
+    rm -rf -- "$target"
+  fi
+  rmdir "$lock" 2>/dev/null || true
+}
+trap cleanup EXIT
+
+verify() {
+  "$1" -c "from importlib.metadata import version; from pymobiledevice3.remote.remote_service_discovery import RemoteServiceDiscoveryService; from pymobiledevice3.remote.core_device.pasteboard_service import PasteboardService; from pymobiledevice3.remote.core_device.hid_service import UniversalHIDServiceService, touch_session; actual=version('pymobiledevice3'); assert actual == '$version', (actual, '$version'); print('pymobiledevice3 ' + actual + ' verified')"
+}
+
+if [[ -e "$target" ]]; then
+  verify "$target/bin/python"
+  completed=true
+  exit 0
+fi
+
+# A newly created target is owned by this invocation. Never alter an old toolchain.
+created=true
+python3 -m venv "$target"
+"$target/bin/python" -m pip install --disable-pip-version-check --no-input "pymobiledevice3==$version"
+verify "$target/bin/python"
+completed=true
+printf 'Installed Controller-owned HID toolchain: %s\n' "$target"

package/scripts/install-standalone-recovery.ts

@@ -2,7 +2,7 @@ import { createHash } from 'crypto';
 import { isAbsolute, join, resolve } from 'path';
 import { hostname } from 'os';
 import { systemdUserUnitName } from '../src/cli/controller/systemd-user';
-import { openAiSecureTunnelConnectArgs } from '../src/cli/mcp/openai-secure-tunnel';
+import { openAiSecureTunnelConnectArgs } from '../adapters/mcp/tunnels/openai-secure-tunnel';
 import type { OpenAiSecureTunnelServiceConfig, PrimaryConnectorServiceConfig, PublicTunnelServiceConfig, RecoveryTunnelServiceConfig } from '../src/runtime/standalone-recovery/core';
 import { installStandaloneRecovery } from '../src/runtime/standalone-recovery/installer';
 

package/scripts/lib/project-init-lib.sh

@@ -1029,7 +1029,7 @@ pi_install_helpers() {
   local target_dir="$1"
   local helpers_dir="$2"
   local mode="${3:-apply}"
-  local helper_names="${4:-new-spec.sh new-sprint.sh new-plan.sh capture-plan.sh plan-to-todo.sh contract-run.ts contract-worktree.sh ship-worktrees.sh archive-workflow.sh refresh-current-status.sh prepare-handoff.sh verify-contract.sh summarize-failures.sh verify-sprint.sh sprint-backlog.sh check-task-sync.sh check-deploy-sql-order.sh check-architecture-sync.sh check-agent-tooling.sh check-context-files.sh check-brain-manifest.sh sync-brain-docs.sh check-skill-version.ts select-agent-context-blocks.sh ensure-task-workflow.sh check-task-workflow.sh switch-plan.sh workflow-contract.ts inspect-project-state.ts migrate-workflow-docs.ts migrate-project-template.sh capability-resolver.ts architecture-event.ts capability-config.ts architecture-queue.sh context-contract-sync.sh workstream-sync.sh prepare-codex-handoff.sh codex-handoff-resume.sh}"
+  local helper_names="${4:-new-spec.sh new-sprint.sh new-plan.sh capture-plan.sh plan-to-todo.sh contract-run.ts contract-worktree.sh ship-worktrees.sh archive-workflow.sh refresh-current-status.sh prepare-handoff.sh verify-contract.sh summarize-failures.sh verify-sprint.sh sprint-backlog.sh check-task-sync.sh check-deploy-sql-order.sh check-architecture-sync.sh check-agent-tooling.sh check-context-files.sh check-brain-manifest.sh sync-brain-docs.sh select-agent-context-blocks.sh ensure-task-workflow.sh check-task-workflow.sh switch-plan.sh workflow-contract.ts inspect-project-state.ts migrate-workflow-docs.ts migrate-project-template.sh capability-resolver.ts architecture-event.ts capability-config.ts architecture-queue.sh context-contract-sync.sh workstream-sync.sh prepare-codex-handoff.sh codex-handoff-resume.sh}"
   local scripts_dir="$target_dir/scripts"
   local runtime_dir="$target_dir/.ai/harness/scripts"
   local helper_name
@@ -1283,7 +1283,7 @@ pi_external_tooling_defaults_summary() {
 - Mode: optional-enhancements
 - Detection: setup/readiness only
 - Waza/gstack/gbrain/Mermaid: optional host enhancements; never required for Forge correctness
-- CodeGraph: Forge bundled structural backend; global CLI/MCP is optional host integration
+- Code location: ripgrep lexical source search with explicit language-service definition/reference navigation; no managed graph index
 - Auto-actions: never install, upgrade, serve, sync, or enable unrelated third-party tooling automatically
 EOF_EXTERNAL_TOOLING_DEFAULTS
 }
@@ -1424,7 +1424,7 @@ pi_forge_version_for_refs() {
     printf '%s\n' "unknown"
     return 0
   fi
-  local version_file="$root_dir/assets/skill-version.json"
+  local version_file="$root_dir/package.json"
 
   if [[ -f "$version_file" ]]; then
     sed -n 's/^[[:space:]]*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' "$version_file" | head -n 1

package/scripts/migrate-windows-wsl-controller-home.ts

@@ -12,6 +12,7 @@ import {
 import { homedir } from 'os';
 import { basename, dirname, join, resolve } from 'path';
 import { spawnSync } from 'child_process';
+import { assertRuntimeReleaseExecutionCanaries } from '../src/runtime/root/release-execution-canary';
 import { stageRuntimeRelease } from '../src/runtime/root/release-materialize';
 import { publishRuntimeRelease } from '../src/runtime/root/release-store';
 
@@ -254,6 +255,7 @@ try {
   // the clean source checkout before any canonical unit starts.
   preserveLegacyReleaseAuthority(destination, timestamp);
   const stagedRelease = stageRuntimeRelease({ controllerHome: destination, sourceRoot });
+  assertRuntimeReleaseExecutionCanaries(stagedRelease.manifestPath, destination);
   publishRuntimeRelease(destination, stagedRelease.manifestPath, `windows-wsl-controller-home-migration-${timestamp}`);
   const release = readActiveRelease(destination);
   atomicWrite(unitPath(units.canonicalRuntime), renderRuntimeUnit(destination, units.canonicalRuntime, release), 0o644);

package/scripts/open-source-audit-allowlist.txt

@@ -17,7 +17,6 @@ tests/readme-dx.test.ts
 
 # Runtime proxy bypass intentionally includes Tailscale's standardized CGNAT CIDR.
 adapters/mcp/proxy-env.ts
-src/cli/mcp/proxy-env.ts
 
 # Scanner / redaction implementations intentionally embed pattern samples.
 scripts/public-release.ts

package/scripts/run-governed-gate.ts

@@ -27,6 +27,8 @@ export function stepsFor(gate: Gate): Step[] {
   ];
   if (gate === 'main') return [
     { label: 'focused task receipt', gate: 'task' },
+    { label: 'frozen MCP tool contract', command: 'bun', args: ['run', 'check:mcp-compatibility'], timeoutMs: 2 * 60_000 },
+    { label: 'quality harness benchmark', command: 'bun', args: ['run', 'check:quality-harness'], timeoutMs: 2 * 60_000 },
     { label: 'core regression', command: 'bun', args: ['run', 'test:core'], timeoutMs: 20 * 60_000 },
     { label: 'runtime smoke', command: 'bun', args: ['run', 'check:smoke'], timeoutMs: 10 * 60_000 },
   ];

package/scripts/smoke-ios-physical-device.ts

@@ -1,6 +1,7 @@
-import { existsSync } from 'fs';
+import { existsSync, readFileSync } from 'fs';
+import { createHash } from 'crypto';
 import { spawnSync } from 'child_process';
-import { executeIosPluginAction } from '../src/runtime/plugins/ios-adapter';
+import { computerPluginAdapter } from '../src/runtime/plugins/computer-registration';
 import { resolveRepoPreferredControllerHome } from '../src/cli/repositories/controller-home';
 
 const repoRoot = process.cwd();
@@ -29,12 +30,12 @@ const common = {
   controllerHome,
   repoId,
   repoRoot,
-  pluginId: 'ios',
+  pluginId: 'computer',
   origin: { surface: 'local-ui' as const, actor: 'physical-ios-live-smoke' },
 };
 
 async function invoke(actionId: string, args: Record<string, unknown>) {
-  return executeIosPluginAction({
+  return computerPluginAdapter.executeAction({
     ...common,
     actionId,
     args,
@@ -43,6 +44,7 @@ async function invoke(actionId: string, args: Record<string, unknown>) {
 }
 
 let interactionId: string | undefined;
+let reusedSession = false;
 try {
   const listed = await invoke('physical_device_list', {});
   const devices = Array.isArray(listed.devices) ? listed.devices as Array<Record<string, unknown>> : [];
@@ -50,6 +52,9 @@ try {
     entry.identifier === deviceSelector || entry.udid === deviceSelector || entry.name === deviceSelector);
   if (matches.length !== 1) throw new Error(`Expected exactly one physical iPhone for selector ${deviceSelector}; found ${matches.length}.`);
   const device = matches[0]!;
+  if (device.connected !== true || device.screenshotAvailable !== true) {
+    throw new Error(`The selected iPhone ${deviceSelector} has no connected CoreDevice screenshot transport. No app inspection or activation was attempted.`);
+  }
   const info = await invoke('physical_device_info', { device: device.identifier });
   const apps = await invoke('physical_device_apps', { device: device.identifier, bundle_id: bundleId });
   const installed = Array.isArray(apps.apps) ? apps.apps as Array<Record<string, unknown>> : [];
@@ -58,11 +63,15 @@ try {
   const opened = await invoke('physical_device_open', {
     device: device.identifier,
     bundle_id: bundleId,
-    relaunch: true,
+    relaunch: false,
+    observe_after_open: true,
+    // This is a one-shot open/capture receipt; do not retain a HID worker.
+    prewarm_input: false,
   });
   const interaction = opened.interaction as Record<string, unknown> | undefined;
   interactionId = typeof interaction?.interactionId === 'string' ? interaction.interactionId : undefined;
   if (!interactionId) throw new Error('The physical provider did not return an interaction id.');
+  reusedSession = opened.reusedSession === true;
 
   const screenshot = await invoke('physical_device_screenshot', {
     interaction_id: interactionId,
@@ -71,17 +80,29 @@ try {
   const artifacts = Array.isArray(screenshot.artifactCandidates)
     ? screenshot.artifactCandidates as Array<Record<string, unknown>>
     : [];
-  const path = typeof artifacts[0]?.path === 'string' ? artifacts[0].path : '';
+  const artifact = artifacts[0];
+  const path = typeof artifact?.path === 'string' ? artifact.path : '';
   if (!path || !existsSync(path)) throw new Error('The physical provider did not create a screenshot artifact.');
+  // Bind the local evidence to this exact CoreDevice observation without
+  // claiming what App, SKU or checkout price is actually visible.
+  const observation = screenshot.observation as Record<string, unknown> | undefined;
+  const image = readFileSync(path);
+  const screenshotSha256 = createHash('sha256').update(image).digest('hex');
+  const observationId = typeof observation?.observationId === 'string' ? observation.observationId : undefined;
+  if (!observationId || artifact?.sha256 !== screenshotSha256 || artifact?.bytes !== image.length
+    || observation?.screenshotSha256 !== screenshotSha256 || observation?.screenshotBytes !== image.length) {
+    throw new Error('The screenshot file and CoreDevice observation receipts do not match.');
+  }
   const metadata = spawnSync('sips', ['-g', 'pixelWidth', '-g', 'pixelHeight', '-g', 'format', path], { encoding: 'utf8' }).stdout;
   const width = metadata.match(/pixelWidth:\s*(\d+)/)?.[1];
   const height = metadata.match(/pixelHeight:\s*(\d+)/)?.[1];
   const format = metadata.match(/format:\s*(\S+)/)?.[1];
 
-  const closed = await invoke('physical_device_close', { interaction_id: interactionId });
+  const closed = reusedSession ? undefined : await invoke('physical_device_close', { interaction_id: interactionId });
   interactionId = undefined;
   const app = installed[0]!;
   console.log(JSON.stringify({
+    verificationLevel: 'source_computer_adapter_open_and_capture_only',
     device: {
       name: device.name,
       model: device.model,
@@ -97,20 +118,27 @@ try {
       version: app.version,
     },
     launchStatus: interaction?.status,
+    reusedSession,
     controlPlane: opened.controlPlane,
     coreDeviceCapabilities: info.capabilities,
     screenViewingURLAvailable: typeof info.screenViewingURL === 'string',
     screenshot: {
       created: true,
+      path,
+      sha256: screenshotSha256,
+      bytes: image.length,
+      observationId,
+      observedAt: observation?.observedAt,
+      semanticPriceVerified: false,
       width: width ? Number(width) : undefined,
       height: height ? Number(height) : undefined,
       format,
     },
-    closeStatus: (closed.interaction as Record<string, unknown> | undefined)?.status,
-    deviceUnmodified: closed.deviceUnmodified === true,
+    closeStatus: (closed?.interaction as Record<string, unknown> | undefined)?.status,
+    deviceUnmodified: closed?.deviceUnmodified === true,
   }, null, 2));
 } finally {
-  if (interactionId) {
+  if (interactionId && !reusedSession) {
     try { await invoke('physical_device_close', { interaction_id: interactionId }); } catch {}
   }
 }

package/scripts/smoke-mcp-http-runtime.ts

@@ -6,13 +6,12 @@ import { join } from 'path';
 import { registerRepository } from '../src/cli/repositories/registry';
 import { readForgeRuntimeStatus } from '../src/runtime/control-plane/runtime-status-client';
 import { FORGE_TOOL_SURFACE } from '../src/cli/controller/runtime-config';
-import { CORE_CONTROLLER_TOOL_NAMES } from '../src/cli/mcp/toolset';
+import { controllerExposureSnapshot } from '../adapters/mcp/toolset';
 import { writeMcpServiceLocalConfig } from '../adapters/mcp/auth';
-import { buildMcpToolDefinitions } from '../src/cli/mcp/tools';
-import { runtimePolicy } from '../src/cli/mcp/multi-repository';
-import { resolveControllerToolsetSelection } from '../src/cli/mcp/toolset-selection';
+import { buildMcpToolDefinitions } from '../adapters/mcp/tool-mapping/tools';
+import { runtimePolicy } from '../adapters/mcp/multi-repository';
 import { RUNTIME_WRITE_CLAIM_ENV } from '../src/runtime/root/write-fence';
-import { createMcpToolContext, readCanonicalRuntimeToolSchema } from '../src/cli/mcp/server';
+import { createMcpToolContext, readCanonicalRuntimeToolSchema } from '../adapters/mcp/server';
 
 const root = mkdtempSync(join(tmpdir(), 'forge-mcp-http-smoke-'));
 const repoRoot = join(root, 'repo');
@@ -160,8 +159,8 @@ try {
     enableDevRunner: true,
     devRunnerAgents: 'codex,claude',
   });
-  // Unmarked Controller startup intentionally preserves the Advanced compatibility label.
-  const expectedToolset = resolveControllerToolsetSelection(null).toolset;
+  // Every Controller session exposes the same complete capability registry.
+  const expectedToolset = 'full';
   if (health.body.toolset !== expectedToolset) throw new Error(`TOOLSET_CHANGED: ${String(health.body.toolset)}`);
   if (health.body.toolSurface !== FORGE_TOOL_SURFACE) throw new Error(`TOOL_SURFACE_CHANGED: ${String(health.body.toolSurface)}`);
   const expectedCompatibilityToolCount = buildMcpToolDefinitions(expectedPolicy).length;
@@ -184,7 +183,7 @@ try {
     devRunnerAgents: 'codex,claude',
   });
   const runtimeSchema = await readCanonicalRuntimeToolSchema(runtimeContext);
-  const expectedRuntimeNames = [...CORE_CONTROLLER_TOOL_NAMES].sort();
+  const expectedRuntimeNames = [...controllerExposureSnapshot(runtimeContext).actualToolNames].sort();
   if (JSON.stringify(runtimeSchema.toolNames) !== JSON.stringify(expectedRuntimeNames)) {
     throw new Error(`RUNTIME_TOOL_SCHEMA_CHANGED: ${JSON.stringify(runtimeSchema.toolNames)}`);
   }

package/scripts/smoke-mcp-tool-surface.ts

@@ -3,27 +3,34 @@
  * Focused smoke: local MCP tool surface + connector freshness semantics.
  * Does not require a live ChatGPT connector session.
  */
-import { getMcpPolicy } from '../src/cli/mcp/policy';
-import { controllerExpectedToolNames } from '../src/cli/mcp/legacy-tool-service';
+import { getMcpPolicy } from '../adapters/mcp/policy';
 import {
-  ADVANCED_CONTROLLER_TOOL_NAMES,
-  DEFAULT_CONTROLLER_TOOL_NAMES,
+  PREFERRED_CONTROLLER_TOOL_NAMES,
   PREFERRED_FACADE_TOOL_NAMES,
   exposedControllerToolDefinitions,
-} from '../src/cli/mcp/toolset';
+} from '../adapters/mcp/toolset';
 import {
   EXPECTED_FACADE_TOOLS,
   OPTIONAL_INTERACTIVE_DEVELOPMENT_TOOLS,
   evaluateConnectorFreshness,
 } from '../src/cli/local-bridge/connector-freshness';
-import type { MultiRepositoryMcpToolContext } from '../src/cli/mcp/multi-repository';
+import type { MultiRepositoryMcpToolContext } from '../adapters/mcp/multi-repository';
 
 function assert(condition: unknown, message: string): asserts condition {
   if (!condition) throw new Error(`SMOKE_FAIL: ${message}`);
 }
 
 const policy = getMcpPolicy('controller');
-const expected = controllerExpectedToolNames(policy);
+const fullCtx = {
+  policy,
+  toolset: 'full' as const,
+  controllerHome: process.cwd(),
+  repoRoot: process.cwd(),
+  enableChatgptBrowser: false,
+  audit: () => undefined,
+} as unknown as MultiRepositoryMcpToolContext;
+const fullExposed = exposedControllerToolDefinitions(fullCtx).map((tool) => tool.name);
+const expected = fullExposed;
 
 assert(
   JSON.stringify([...PREFERRED_FACADE_TOOL_NAMES]) === JSON.stringify([...EXPECTED_FACADE_TOOLS]),
@@ -32,7 +39,7 @@ assert(
 
 for (const name of EXPECTED_FACADE_TOOLS) {
   assert(
-    (DEFAULT_CONTROLLER_TOOL_NAMES as readonly string[]).includes(name),
+    (PREFERRED_CONTROLLER_TOOL_NAMES as readonly string[]).includes(name),
     `default exposure missing ${name}`,
   );
   assert(expected.includes(name), `expectedTools missing ${name}`);
@@ -40,41 +47,21 @@ for (const name of EXPECTED_FACADE_TOOLS) {
 
 for (const name of OPTIONAL_INTERACTIVE_DEVELOPMENT_TOOLS) {
   assert(
-    (ADVANCED_CONTROLLER_TOOL_NAMES as readonly string[]).includes(name),
-    `interactive tool ${name} missing from ADVANCED_CONTROLLER_TOOL_NAMES`,
+    (PREFERRED_CONTROLLER_TOOL_NAMES as readonly string[]).includes(name),
+    `interactive tool ${name} missing from the preferred capability list`,
   );
   assert(
-    (DEFAULT_CONTROLLER_TOOL_NAMES as readonly string[]).includes(name),
-    `interactive tool ${name} missing from the stable default tools/list`,
+    (PREFERRED_CONTROLLER_TOOL_NAMES as readonly string[]).includes(name),
+    `interactive tool ${name} missing from the preferred routing list`,
   );
 }
 
-const coreCtx = {
-  policy,
-  toolset: 'core' as const,
-  enableChatgptBrowser: false,
-  audit: () => undefined,
-} as unknown as MultiRepositoryMcpToolContext;
-const advancedCtx = { ...coreCtx, toolset: 'advanced' as const };
-
-const coreExposed = exposedControllerToolDefinitions(coreCtx).map((tool) => tool.name);
-const advancedExposed = exposedControllerToolDefinitions(advancedCtx).map((tool) => tool.name);
-for (const name of EXPECTED_FACADE_TOOLS) {
-  assert(coreExposed.includes(name), `exposed core tools missing ${name}`);
-}
-assert(coreExposed.includes('repository_list'), 'default surface missing repository_list');
-assert(!coreExposed.includes('repository_bootstrap_local_project'), 'default stable surface must not expose legacy bootstrap tool');
-assert(!advancedExposed.includes('repository_bootstrap_local_project'), 'advanced stable alias must not expose legacy bootstrap tool');
-assert(coreExposed.length === DEFAULT_CONTROLLER_TOOL_NAMES.length, `core stable tool count changed: ${coreExposed.length}`);
-assert(advancedExposed.length === DEFAULT_CONTROLLER_TOOL_NAMES.length, `advanced stable tool count changed: ${advancedExposed.length}`);
-assert(
-  JSON.stringify(coreExposed) === JSON.stringify(advancedExposed),
-  'Core and Advanced must remain schema-stable aliases of the same bounded tool surface',
-);
-for (const name of OPTIONAL_INTERACTIVE_DEVELOPMENT_TOOLS) {
-  assert(coreExposed.includes(name), `stable surface missing interactive ${name}`);
-  assert(advancedExposed.includes(name), `advanced alias missing interactive ${name}`);
+for (const name of PREFERRED_CONTROLLER_TOOL_NAMES) {
+  assert(fullExposed.includes(name), `complete registry missing preferred capability ${name}`);
 }
+assert(fullExposed.includes('repository_bootstrap_local_project'), 'complete registry missing repository bootstrap');
+assert(fullExposed.includes('git_commit_paths'), 'complete registry missing canonical Git operation');
+assert(fullExposed.length > PREFERRED_CONTROLLER_TOOL_NAMES.length, 'complete registry must include every registered operation');
 
 const unable = evaluateConnectorFreshness({ localToolNames: expected });
 assert(unable.status === 'unable_to_verify_chatgpt_snapshot', `expected unable_to_verify, got ${unable.status}`);
@@ -103,11 +90,10 @@ console.log(JSON.stringify({
   ok: true,
   expectedFacadeTools: EXPECTED_FACADE_TOOLS,
   preferredTools: PREFERRED_FACADE_TOOL_NAMES,
-  defaultToolCount: coreExposed.length,
-  advancedToolCount: advancedExposed.length,
+  exposedToolCount: fullExposed.length,
+  preferredToolCount: PREFERRED_CONTROLLER_TOOL_NAMES.length,
   expectedToolsHasFacade: EXPECTED_FACADE_TOOLS.every((name) => expected.includes(name)),
-  advancedHasInteractive: OPTIONAL_INTERACTIVE_DEVELOPMENT_TOOLS.every((name) =>
-    (ADVANCED_CONTROLLER_TOOL_NAMES as readonly string[]).includes(name)),
+  fullHasInteractive: OPTIONAL_INTERACTIVE_DEVELOPMENT_TOOLS.every((name) => fullExposed.includes(name)),
   states: {
     unable: unable.status,
     missingSnap: missingSnap.status,

package/scripts/smoke-workflow-supervisor-chrome-adapter.ts

@@ -73,10 +73,13 @@ try {
   assert.equal(browserCore.parseConversation(conversationUrl)?.conversationId, conversationId);
   assert.equal(browserCore.parseConversation(`https://example.com/c/${conversationId}`), null);
   const extensionManifest = JSON.parse(readFileSync(resolve('adapters/computer/chrome-extension/manifest.json'), 'utf8')) as { permissions?: string[] };
-  assert.equal(extensionManifest.permissions?.includes('storage'), false);
+  assert.equal(extensionManifest.permissions?.includes('storage'), true);
   const backgroundSource = readFileSync(resolve('adapters/computer/chrome-extension/background.js'), 'utf8');
-  assert.ok(backgroundSource.includes('const PROVIDER_INSTANCE_ID = randomId()'));
-  assert.equal(backgroundSource.includes('chrome.storage'), false);
+  assert.ok(backgroundSource.includes("chrome.storage.local.get('forgeComputerProviderInstanceId')"));
+  assert.ok(backgroundSource.includes('const instanceId = await providerInstanceId();'));
+  assert.ok(backgroundSource.includes('source: `chrome-extension:${instanceId}`'));
+  assert.equal(backgroundSource.includes('PROVIDER_INSTANCE_ID'), false);
+  assert.ok(backgroundSource.includes('chrome.storage.local.set({ forgeComputerProviderInstanceId: instanceId })'));
   assert.ok(backgroundSource.includes("nativeRpc('computer_extension_heartbeat'"));
   assert.ok(backgroundSource.includes('providerInstanceId: instanceId'));
   assert.ok(backgroundSource.includes("nativeRpc('computer_extension_claim', { provider_instance_id: instanceId })"));

package/scripts/sync-generated-authority.mjs

@@ -92,7 +92,6 @@ function shellCompatibilityWrapper(name) {
 }
 
 const MODULE_HELPERS = new Set([
-  'check-skill-version.ts',
   'workflow-contract.ts',
   'inspect-project-state.ts',
   'migrate-workflow-docs.ts',

package/src/cli/agent-jobs/executor-health.ts

@@ -1,5 +1,5 @@
 import type { GitHubStatus } from "../github/contracts";
-import type { McpAgentRunnerName } from "../mcp/types";
+import type { McpAgentRunnerName } from "../../../adapters/mcp/types";
 import type { ControllerAgent } from "../controller/types";
 
 export type ExecutorHealthStatus =

package/src/cli/agent-jobs/integration.ts

@@ -13,8 +13,8 @@ import {
   type EditOperation,
   type EditSession,
 } from "../editing/edit-session";
-import { resolveMcpPath } from "../mcp/paths";
-import type { McpPolicy } from "../mcp/types";
+import { resolveMcpPath } from "../../../adapters/mcp/paths";
+import type { McpPolicy } from "../../../adapters/mcp/types";
 import { getAgentJob, markAgentJobClosure, markAgentJobIntegrated, markAgentJobIntegrationReview } from "./job-manager";
 import type { AgentJobMeta, AgentJobPreservationReason } from "./types";
 import { assertRuntimeMayWriteOrThrow, isRuntimeWriteFenceError } from "../../runtime/root/write-fence";

package/src/cli/chatgpt-browser/file-policy.ts

@@ -1,8 +1,8 @@
 import { createHash } from 'crypto';
 import { existsSync, readFileSync, statSync } from 'fs';
 import { isAbsolute, resolve } from 'path';
-import { resolveMcpPath } from '../mcp/paths';
-import type { McpPolicy } from '../mcp/types';
+import { resolveMcpPath } from '../../../adapters/mcp/paths';
+import type { McpPolicy } from '../../../adapters/mcp/types';
 import type { BrowserWriteOutputPolicy, PromptBundleFile } from './types';
 
 const READ_ALLOW_GLOBS = [

package/src/cli/commands/doctor.ts

@@ -2,7 +2,7 @@
  * `forge doctor` — read-only readiness diagnostics.
  *
  * Built-in checks: PATH resolution, CLI version, per-host install detection,
- * Codex user-level trust state count, and target-aware CodeGraph readiness.
+ * Codex user-level trust state count, and current-source tool readiness.
  * Never mutates.
  */
 
@@ -11,7 +11,6 @@ import * as os from 'os';
 import * as path from 'path';
 import { spawnSync } from 'child_process';
 import { ALL_TARGETS } from '../installer/targets/registry';
-import { checkCodegraph, type CodegraphCheckResult } from '../tools/codegraph';
 import { CLI_VERSION } from './status';
 import { runSecurityScan, type SecurityScanReport } from './security';
 import { isOptIn, resolveHooksDir, resolveRepoRoot } from '../hook/runtime';
@@ -225,142 +224,6 @@ function checkCodexTrustState(): DoctorCheckResult {
   }
 }
 
-function doctorStatusForCodegraph(status: CodegraphCheckResult['status']): CheckStatus {
-  if (status === 'present') return 'ok';
-  if (status === 'missing') return 'fail';
-  return 'warn';
-}
-
-function formatCodegraphDetail(result: CodegraphCheckResult): string {
-  const raw = result.raw as Record<string, any>;
-  const indexStatus = raw.project_index?.status ?? 'unknown';
-  const codexMcpStatus = raw.mcp_hosts?.codex?.status ?? 'unknown';
-  const claudeMcpStatus = raw.mcp_hosts?.claude?.status ?? 'unknown';
-  const bits = [
-    result.reason,
-    `source=${result.resolution.source}`,
-    `version=${result.resolution.version ?? 'unknown'}`,
-    `codex-mcp=${codexMcpStatus}`,
-    `claude-mcp=${claudeMcpStatus}`,
-    `index=${indexStatus}`,
-  ];
-  if (result.resolution.globalFallbackUsed) bits.push('global-fallback=true');
-  const remediation = codegraphRemediation(result);
-  if (remediation) bits.push(`remediation=${remediation}`);
-  return bits.join('; ');
-}
-
-function codegraphRemediation(result: CodegraphCheckResult): string | null {
-  if (result.status === 'present') return null;
-
-  const raw = result.raw as Record<string, any>;
-  if (result.resolution.source === 'missing') {
-    return String(raw.install_command ?? 'bash scripts/ensure-codegraph.sh');
-  }
-  if (result.resolution.globalFallbackUsed) {
-    return String(raw.install_command ?? 'bun install');
-  }
-  if (raw.mcp_hosts?.codex?.status !== 'configured' || raw.mcp_hosts?.claude?.status !== 'configured') {
-    return String(raw.mcp_install_command ?? 'forge tools configure codegraph --target both --location global');
-  }
-  if (raw.project_index?.status === 'not-initialized') {
-    return String(raw.init_command ?? 'bash scripts/ensure-codegraph.sh --init');
-  }
-  if (raw.project_index?.status === 'stale') {
-    return String(raw.sync_command ?? 'bash scripts/ensure-codegraph.sh --sync');
-  }
-  return String(raw.ensure_command ?? raw.sync_command ?? 'bash scripts/ensure-codegraph.sh --check');
-}
-
-interface CodegraphProbe {
-  result?: CodegraphCheckResult;
-  error?: Error;
-}
-
-function probeCodegraph(cwd: string): CodegraphProbe {
-  try {
-    return { result: checkCodegraph({ repoRoot: cwd, host: 'both' }) };
-  } catch (err) {
-    return { error: err as Error };
-  }
-}
-
-function checkCodegraphReadiness(probe: CodegraphProbe): DoctorCheckResult {
-  const id = 'codegraph-readiness';
-  const describe = 'CodeGraph CLI, MCP, and project index readiness';
-  if (probe.result) {
-    return {
-      id,
-      describe,
-      status: doctorStatusForCodegraph(probe.result.status),
-      detail: formatCodegraphDetail(probe.result),
-    };
-  }
-  return {
-    id,
-    describe,
-    status: 'fail',
-    detail: `error checking CodeGraph readiness: ${probe.error?.message ?? 'unknown error'}`,
-  };
-}
-
-function checkCodegraphMcpHost(probe: CodegraphProbe, host: 'codex' | 'claude'): DoctorCheckResult {
-  const id = `${host}-codegraph-mcp`;
-  const describe = `${host === 'codex' ? 'Codex' : 'Claude Code'} CodeGraph MCP config`;
-  if (!probe.result) {
-    return {
-      id,
-      describe,
-      status: 'fail',
-      detail: `error checking CodeGraph MCP config: ${probe.error?.message ?? 'unknown error'}`,
-    };
-  }
-
-  const raw = probe.result.raw as Record<string, any>;
-  const entry = raw.mcp_hosts?.[host];
-  if (entry?.status === 'configured') {
-    return { id, describe, status: 'ok', detail: entry.reason ?? 'configured' };
-  }
-  return {
-    id,
-    describe,
-    status: 'warn',
-    detail: `${entry?.reason ?? 'missing'}; remediation=forge tools configure codegraph --target ${host} --location global`,
-  };
-}
-
-function checkCodegraphIndex(probe: CodegraphProbe): DoctorCheckResult {
-  const id = 'codegraph-index';
-  const describe = 'CodeGraph project index';
-  if (!probe.result) {
-    return {
-      id,
-      describe,
-      status: 'fail',
-      detail: `error checking CodeGraph index: ${probe.error?.message ?? 'unknown error'}`,
-    };
-  }
-
-  const raw = probe.result.raw as Record<string, any>;
-  const indexStatus = raw.project_index?.status ?? 'unknown';
-  const status: CheckStatus = indexStatus === 'up-to-date'
-    ? 'ok'
-    : indexStatus === 'stale' || indexStatus === 'unknown'
-      ? 'warn'
-      : 'fail';
-  const remediation = indexStatus === 'not-initialized'
-    ? raw.init_command
-    : indexStatus === 'stale'
-      ? raw.sync_command
-      : raw.ensure_command;
-  return {
-    id,
-    describe,
-    status,
-    detail: `index=${indexStatus}${remediation ? `; remediation=${remediation}` : ''}`,
-  };
-}
-
 function checkSecurityConfig(report: SecurityScanReport): DoctorCheckResult {
   const id = 'security-config';
   const describe = 'Local hook and VS Code automatic task security scan';
@@ -451,7 +314,6 @@ function checkHookScriptDrift(cwd: string): DoctorCheckResult {
 
 export function runDoctor(cwd: string = process.cwd()): DoctorReport {
   const checks: DoctorCheckResult[] = [];
-  const codegraphProbe = probeCodegraph(cwd);
   const securityReport = runSecurityScan({ cwd });
   checks.push(checkPath());
   checks.push(checkVersion());
@@ -462,10 +324,6 @@ export function runDoctor(cwd: string = process.cwd()): DoctorReport {
     }
   }
   checks.push(checkCodexTrustState());
-  checks.push(checkCodegraphReadiness(codegraphProbe));
-  checks.push(checkCodegraphMcpHost(codegraphProbe, 'codex'));
-  checks.push(checkCodegraphMcpHost(codegraphProbe, 'claude'));
-  checks.push(checkCodegraphIndex(codegraphProbe));
   checks.push(checkSecurityConfig(securityReport));
   checks.push(checkHookScriptDrift(cwd));
   checks.push(checkBootstrapLifecycle());