@moretea-labs/forge 1.8.1 → 1.8.2

package/adapters/mcp/transports/http-observation.ts

@@ -1,4 +1,4 @@
-import type { Express } from 'express';
+import type { Express, Response } from 'express';
 import { NodeStreamableHTTPServerTransport } from '@modelcontextprotocol/node';
 import { createMcpToolContext } from '../server';
 import { loadMcpServiceRuntimeState, type McpHttpAuthMode } from '../auth';
@@ -20,13 +20,14 @@ import {
   repositoryIdentity,
 } from '../../../src/cli/controller/runtime-config';
 import { McpSessionRegistry } from './session-registry';
+import { reconcileFinishedMcpPosts } from './http-post-lifecycle';
 
 type McpToolContext = ReturnType<typeof createMcpToolContext>;
 type HttpSessionRegistry = McpSessionRegistry<NodeStreamableHTTPServerTransport, McpToolContext>;
 
 interface McpRuntimeStats {
   initializing: number;
-  activePosts: number;
+  activePostStartedAt: Map<Response, number>;
   rejectedOverload: number;
 }
 
@@ -190,6 +191,14 @@ export function registerMcpHttpObservationRoutes(input: McpHttpObservationRouteO
     if (health?.runtimeToolSurfaceFingerprint) res.setHeader('x-forge-runtime-tool-surface-fingerprint', health.runtimeToolSurfaceFingerprint);
     if (health?.toolSurfaceFingerprint) res.setHeader('x-forge-tool-surface-fingerprint', health.toolSurfaceFingerprint);
     const sessionSnapshot = sessionRegistry.snapshot();
+    // Legacy session age excludes modern stateless POSTs. The same response-
+    // owned admission map backs both capacity and this diagnostic; no second
+    // activity counter or release authority is introduced.
+    reconcileFinishedMcpPosts(runtimeStats.activePostStartedAt);
+    const oldestActivePostAt = runtimeStats.activePostStartedAt.size
+      ? Math.min(...runtimeStats.activePostStartedAt.values()) : undefined;
+    const oldestActivePostAgeMs = oldestActivePostAt === undefined
+      ? 0 : Math.max(0, Date.now() - oldestActivePostAt);
     const transportEvidence = runtimeControllerHome
       ? recentMcpTransportEvidence(readRecentMcpTransportEvents(runtimeControllerHome), startedAt)
       : { current: 'healthy' as const, recentStatus: 'stable' as const, gatewayStartedAt: startedAt, gatewayPid: process.pid };
@@ -237,7 +246,8 @@ export function registerMcpHttpObservationRoutes(input: McpHttpObservationRouteO
       sessions: {
         ...sessionSnapshot,
         initializing: runtimeStats.initializing,
-        activePosts: runtimeStats.activePosts,
+        activePosts: runtimeStats.activePostStartedAt.size,
+        oldestActivePostAgeMs,
         maximumActivePosts: maxActivePosts,
         rejectedOverload: runtimeStats.rejectedOverload,
       },
@@ -246,9 +256,10 @@ export function registerMcpHttpObservationRoutes(input: McpHttpObservationRouteO
 
   app.get('/transport-ready', (_req, res) => {
     const sessionSnapshot = sessionRegistry.snapshot();
+    reconcileFinishedMcpPosts(runtimeStats.activePostStartedAt);
     const sessionCapacityReady = sessionSnapshot.acceptingNewSessions
       && runtimeStats.initializing < maxInitializingSessions
-      && runtimeStats.activePosts < maxActivePosts;
+      && runtimeStats.activePostStartedAt.size < maxActivePosts;
     res.status(sessionCapacityReady ? 200 : 503).json({
       ready: sessionCapacityReady,
       profile: toolContext.policy.profile,
@@ -257,7 +268,7 @@ export function registerMcpHttpObservationRoutes(input: McpHttpObservationRouteO
       runtimeCapacity: {
         initializing: runtimeStats.initializing,
         maximumInitializing: maxInitializingSessions,
-        activePosts: runtimeStats.activePosts,
+        activePosts: runtimeStats.activePostStartedAt.size,
         maximumActivePosts: maxActivePosts,
       },
     });
@@ -266,9 +277,10 @@ export function registerMcpHttpObservationRoutes(input: McpHttpObservationRouteO
   app.get('/ready', async (_req, res) => {
     const runtimeGeneration = runtimeControllerHome ? readRuntimeGeneration(runtimeControllerHome) : undefined;
     const sessionSnapshot = sessionRegistry.snapshot();
+    reconcileFinishedMcpPosts(runtimeStats.activePostStartedAt);
     const sessionCapacityReady = sessionSnapshot.acceptingNewSessions
       && runtimeStats.initializing < maxInitializingSessions
-      && runtimeStats.activePosts < maxActivePosts;
+      && runtimeStats.activePostStartedAt.size < maxActivePosts;
     if (!runtimeControllerHome) {
       res.status(sessionCapacityReady ? 200 : 503).json({
         ready: sessionCapacityReady,

package/adapters/mcp/transports/http-post-lifecycle.ts

@@ -0,0 +1,19 @@
+import type { Response } from 'express';
+
+/**
+ * Converge the response-owned POST registry from Node's authoritative response
+ * state. Event listeners remain the hot path, but an SDK may remove or replace
+ * listeners while the terminal ServerResponse flags still remain authoritative.
+ * Request age is deliberately irrelevant: a connected unfinished response is
+ * retained for as long as it remains live.
+ */
+export function reconcileFinishedMcpPosts(activePostStartedAt: Map<Response, number>): void {
+  for (const response of activePostStartedAt.keys()) {
+    if (
+      response.writableEnded
+      || response.writableFinished
+      || response.destroyed
+      || response.closed
+    ) activePostStartedAt.delete(response);
+  }
+}

package/adapters/mcp/transports/http.ts

@@ -38,7 +38,9 @@ import {
 import { McpSessionRegistry, type ClosableMcpTransport, type McpSessionRegistryOptions, type McpSessionRoute } from './session-registry';
 import { getConfiguredPublicOrigin, getPublicOrigin, registerMcpOAuthHttpRoutes } from './oauth-http';
 import { registerMcpHttpObservationRoutes } from './http-observation';
+import { reconcileFinishedMcpPosts } from './http-post-lifecycle';
 import { RUNTIME_MCP_CUTOVER_OUTCOME_UNKNOWN } from '../../../src/runtime/root/mcp-transport';
+import { packageConnectorCutoverDrainIsActive } from '../../../src/runtime/root/package-connector-service';
 export { isAllowedMcpOAuthRedirectUri, isIncompleteOAuthAuthorizeRequest } from './oauth-http';
 import {
   connectionIdentity,
@@ -339,7 +341,8 @@ function requireMcpHttpAuth(
 
 interface McpRuntimeStats {
   initializing: number;
-  activePosts: number;
+  /** Canonical HTTP POST admission owner; one entry per unfinished response. */
+  activePostStartedAt: Map<Response, number>;
   rejectedOverload: number;
 }
 
@@ -358,8 +361,38 @@ const MCP_STREAM_LEASE_MS = positiveIntegerEnv('FORGE_MCP_STREAM_LEASE_MS', 30 *
 const MCP_SESSION_ABSOLUTE_LIFETIME_MS = positiveIntegerEnv('FORGE_MCP_SESSION_ABSOLUTE_LIFETIME_MS', 2 * 60 * 60_000);
 const MCP_ACTIVE_POST_STALL_MS = positiveIntegerEnv('FORGE_MCP_ACTIVE_POST_STALL_MS', 10 * 60_000);
 
-export function admitMcpPost(stats: McpRuntimeStats, res: Response): boolean {
-  if (stats.activePosts >= MAX_ACTIVE_POSTS) {
+function sendReleaseCutoverDraining(res: Response): void {
+  res.setHeader('retry-after', '1');
+  res.status(503).json({
+    error: 'release_cutover_draining',
+    code: 'MCP_RELEASE_CUTOVER_DRAINING',
+    message: 'This Connector is draining admitted MCP requests for a Runtime release cutover; retry shortly.',
+    recoverable: true,
+    retryable: true,
+    sessionPreserved: true,
+    action: 'retry',
+  });
+}
+
+function connectorCutoverDrainActive(req: Request, controllerHome?: string): boolean {
+  if (!controllerHome || !req.socket.localPort) return false;
+  return packageConnectorCutoverDrainIsActive(
+    controllerHome,
+    `http://127.0.0.1:${req.socket.localPort}/mcp`,
+  );
+}
+
+export function admitMcpPost(
+  stats: McpRuntimeStats,
+  res: Response,
+  cutoverDrain?: { controllerHome: string; connectorEndpoint: string },
+): boolean {
+  if (cutoverDrain && packageConnectorCutoverDrainIsActive(cutoverDrain.controllerHome, cutoverDrain.connectorEndpoint)) {
+    sendReleaseCutoverDraining(res);
+    return false;
+  }
+  reconcileFinishedMcpPosts(stats.activePostStartedAt);
+  if (stats.activePostStartedAt.size >= MAX_ACTIVE_POSTS) {
     stats.rejectedOverload += 1;
     res.setHeader('retry-after', '1');
     res.status(503).json({
@@ -374,12 +407,10 @@ export function admitMcpPost(stats: McpRuntimeStats, res: Response): boolean {
     return false;
   }
 
-  stats.activePosts += 1;
-  let released = false;
+  stats.activePostStartedAt.set(res, Date.now());
   const release = (): void => {
-    if (released) return;
-    released = true;
-    stats.activePosts = Math.max(0, stats.activePosts - 1);
+    if (!stats.activePostStartedAt.has(res)) return;
+    stats.activePostStartedAt.delete(res);
     res.off('finish', release);
     res.off('close', release);
   };
@@ -458,7 +489,12 @@ async function handleMcpPost(
     res.status(400).json({ error: 'invalid JSON request body' });
     return;
   }
-  if (!admitMcpPost(stats, res)) return;
+  const connectorEndpoint = req.socket.localPort
+    ? `http://127.0.0.1:${req.socket.localPort}/mcp`
+    : undefined;
+  if (!admitMcpPost(stats, res, baseOptions.controllerHome && connectorEndpoint
+    ? { controllerHome: baseOptions.controllerHome, connectorEndpoint }
+    : undefined)) return;
   if (modernHandler) {
     const webRequest = await toWebRequest(req, body);
     if (!(await isLegacyRequest(webRequest, body))) {
@@ -645,7 +681,12 @@ async function handleMcpGet(
   route: McpSessionRoute,
   currentToolSurfaceFingerprint: () => string | undefined,
   resolveRuntimeSchema?: (context: McpToolContext) => Promise<CanonicalRuntimeToolSchema | undefined>,
+  controllerHome?: string,
 ): Promise<void> {
+  if (connectorCutoverDrainActive(req, controllerHome)) {
+    sendReleaseCutoverDraining(res);
+    return;
+  }
   const sessionId = req.headers['mcp-session-id'] as string | undefined;
   const managed = sessionId ? registry.get(sessionId) : undefined;
   if (!managed || managed.route !== route || managed.principalId !== principalFromRequest(req)) {
@@ -740,13 +781,12 @@ export async function startMcpHttp(opts: McpHttpOptions): Promise<void> {
       });
     },
   });
-  const runtimeStats: McpRuntimeStats = { initializing: 0, activePosts: 0, rejectedOverload: 0 };
+  const runtimeStats: McpRuntimeStats = { initializing: 0, activePostStartedAt: new Map(), rejectedOverload: 0 };
   const toolContext = createMcpToolContext({ ...opts, repo: repoRoot, controllerHome, profile });
   const baseOptions: McpServerOptions = {
     repo: repoRoot,
     controllerHome,
     profile,
-    toolset: opts.toolset,
     enableChatgptBrowser: opts.enableChatgptBrowser,
     enableDevRunner: opts.enableDevRunner,
     devRunnerAgents: opts.devRunnerAgents,
@@ -844,7 +884,7 @@ export async function startMcpHttp(opts: McpHttpOptions): Promise<void> {
     });
   });
   app.get('/mcp', requireMcpHttpAuth(authMode, authToken, oauthProvider, configuredPublicOrigin), (req, res) => {
-    handleMcpGet(req, res, sessionRegistry, '/mcp', currentRuntimeToolSurfaceFingerprint, resolveRuntimeSchema).catch((error: unknown) => {
+    handleMcpGet(req, res, sessionRegistry, '/mcp', currentRuntimeToolSurfaceFingerprint, resolveRuntimeSchema, controllerHome).catch((error: unknown) => {
       if (!res.headersSent) sendMcpRequestError(res, error);
     });
   });
@@ -862,7 +902,7 @@ export async function startMcpHttp(opts: McpHttpOptions): Promise<void> {
     });
   });
   app.get('/mcp-grok', requireMcpHttpAuth(authMode, authToken, oauthProvider, configuredPublicOrigin, '/mcp-grok'), (req, res) => {
-    handleMcpGet(req, res, sessionRegistry, '/mcp-grok', currentRuntimeToolSurfaceFingerprint, resolveRuntimeSchema).catch((error: unknown) => {
+    handleMcpGet(req, res, sessionRegistry, '/mcp-grok', currentRuntimeToolSurfaceFingerprint, resolveRuntimeSchema, controllerHome).catch((error: unknown) => {
       if (!res.headersSent) sendMcpRequestError(res, error);
     });
   });
@@ -880,7 +920,7 @@ export async function startMcpHttp(opts: McpHttpOptions): Promise<void> {
     });
   });
   app.get('/mcp-bearer', requireMcpHttpAuth('bearer', authToken, null, configuredPublicOrigin), (req, res) => {
-    handleMcpGet(req, res, sessionRegistry, '/mcp-bearer', currentRuntimeToolSurfaceFingerprint, resolveRuntimeSchema).catch((error: unknown) => {
+    handleMcpGet(req, res, sessionRegistry, '/mcp-bearer', currentRuntimeToolSurfaceFingerprint, resolveRuntimeSchema, controllerHome).catch((error: unknown) => {
       if (!res.headersSent) sendMcpRequestError(res, error);
     });
   });

package/adapters/mcp/types.ts

@@ -1,12 +1,6 @@
 export type McpProfileName = 'planner' | 'executor' | 'orchestrator' | 'controller';
 export type McpPathIntent = 'read' | 'write';
 export type McpAgentRunnerName = 'codex' | 'claude';
-/** Controller MCP tools/list exposure profile.
- * - facade: explicit five-tool ChatGPT orchestration surface
- * - core/advanced (default compatibility labels): bounded stable controller surface
- * - full: compatibility mode — all legacy + runtime tools
- */
-export type McpToolset = 'facade' | 'core' | 'advanced' | 'full';
 
 export interface McpPolicy {
   profile: McpProfileName;

package/assets/hooks/lib/session-state.sh

@@ -69,41 +69,3 @@ session_state_read_count() {
 
   printf '%s' "$count"
 }
-
-session_state_codegraph_dir() {
-  printf '%s' ".claude/.codegraph-state"
-}
-
-session_state_codegraph_marker_file() {
-  local key="$1"
-  local suffix="$2"
-  local safe_key
-  safe_key="$(session_state_safe_key "$key")"
-  printf '%s/%s.%s' "$(session_state_codegraph_dir)" "$safe_key" "$suffix"
-}
-
-session_state_mark_codegraph_used() {
-  local key="$1"
-  local marker
-  marker="$(session_state_codegraph_marker_file "$key" "used")"
-  mkdir -p "$(dirname "$marker")"
-  : > "$marker"
-}
-
-session_state_codegraph_used() {
-  local key="$1"
-  [[ -f "$(session_state_codegraph_marker_file "$key" "used")" ]]
-}
-
-session_state_mark_codegraph_nudged() {
-  local key="$1"
-  local marker
-  marker="$(session_state_codegraph_marker_file "$key" "nudged")"
-  mkdir -p "$(dirname "$marker")"
-  : > "$marker"
-}
-
-session_state_codegraph_nudged() {
-  local key="$1"
-  [[ -f "$(session_state_codegraph_marker_file "$key" "nudged")" ]]
-}

package/assets/hooks/post-bash.sh

@@ -121,7 +121,7 @@ broad_command=false
 recommended_next_tool=""
 if post_bash_broad_command "$COMMAND_TEXT"; then
   broad_command=true
-  recommended_next_tool="codegraph_context"
+  recommended_next_tool="rh_context"
 fi
 output_line_count="$(post_bash_output_line_count "$TOOL_OUTPUT")"
 raw_output_bytes="$(post_bash_output_byte_count "$TOOL_OUTPUT")"

package/assets/hooks/post-tool-observer.sh

@@ -41,11 +41,6 @@ duration_ms="${duration_ms:-0}"
 run_id="${run_id:-unknown}"
 session_source="${session_source:-unknown}"
 
-case "$tool_name" in
-  mcp__codegraph__*|codegraph_*)
-    session_state_mark_codegraph_used "$SESSION_KEY" || true
-    ;;
-esac
 
 # An event source is explicit evidence. Inherited host variables are only a
 # fallback for payloads that omit it, such as local compatibility shims.

package/assets/hooks/prompt-guard.sh

@@ -566,59 +566,6 @@ emit_agentic_packaging_hint() {
   fi
 }
 
-resolve_codegraph_bin() {
-  local common_git_dir canonical_root candidate
-  if [[ -x "node_modules/.bin/codegraph" ]]; then
-    printf '%s\n' "node_modules/.bin/codegraph"
-    return 0
-  fi
-
-  # Linked worktrees normally reuse the canonical checkout's dependency tree.
-  # Resolve it before falling back to a user-global CodeGraph installation.
-  common_git_dir="$(git rev-parse --path-format=absolute --git-common-dir 2>/dev/null || true)"
-  if [[ -n "$common_git_dir" ]]; then
-    canonical_root="$(dirname "$common_git_dir")"
-    candidate="$canonical_root/node_modules/.bin/codegraph"
-    if [[ -x "$candidate" ]]; then
-      printf '%s\n' "$candidate"
-      return 0
-    fi
-  fi
-
-  command -v codegraph 2>/dev/null || return 1
-}
-
-run_codegraph_init_command() {
-  local codegraph_bin status cursor_dir_existed cursor_rules_dir_existed cursor_rule_existed
-  codegraph_bin="$(resolve_codegraph_bin)" || return 127
-
-  cursor_dir_existed=false
-  cursor_rules_dir_existed=false
-  cursor_rule_existed=false
-  [[ -d ".cursor" ]] && cursor_dir_existed=true
-  [[ -d ".cursor/rules" ]] && cursor_rules_dir_existed=true
-  [[ -e ".cursor/rules/codegraph.mdc" ]] && cursor_rule_existed=true
-
-  set +e
-  CODEGRAPH_NO_DAEMON=1 "$codegraph_bin" init -i .
-  status=$?
-  set -e
-
-  if [[ "$cursor_rule_existed" == "false" && -f ".cursor/rules/codegraph.mdc" ]]; then
-    rm -f ".cursor/rules/codegraph.mdc"
-    [[ "$cursor_rules_dir_existed" == "false" ]] && rmdir ".cursor/rules" 2>/dev/null || true
-    [[ "$cursor_dir_existed" == "false" ]] && rmdir ".cursor" 2>/dev/null || true
-  fi
-
-  return "$status"
-}
-
-emit_codegraph_route_hint() {
-  if pg_fact CODEGRAPH_ROUTE || pg_fact NONTRIVIAL_CODE_TASK; then
-    echo "[CodegraphRoute] Structural code-navigation intent detected. Prefer Forge rh_context/semantic navigation or an already-configured structural provider; do not initialize repo-local .codegraph state from a prompt hook."
-  fi
-}
-
 modern_controller_home_workflow() {
   [[ -f "forge.config.json" ]]
 }
@@ -839,7 +786,6 @@ prompt_guard_engine_call
 if modern_controller_home_workflow; then
   emit_agentic_packaging_hint
   emit_forge_route_hint
-  emit_codegraph_route_hint
   emit_modern_controller_home_guidance
   exit 0
 fi
@@ -858,7 +804,6 @@ fi
 
 emit_agentic_packaging_hint
 emit_forge_route_hint
-emit_codegraph_route_hint
 emit_pending_orchestration_discussion
 
 implement_intent=0

package/assets/partials/04-project-structure.partial.md

@@ -50,7 +50,7 @@
 - Route knowledge sync and handoff retrieval to `gbrain`.
 - Register valuable repo-authored docs in `.ai/harness/brain-manifest.json` with `sync.direction=repo-to-brain`; `.ai/harness/scripts/sync-brain-docs.sh` and the PostEdit hook mirror only those explicit entries into the default brain vault.
 - Codex automation profile is runtime-referenced, not vendored: required skills are `health`, `check`, and `mermaid` from `~/.codex/skills`.
-- CodeGraph is required agent readiness for code navigation; keep `.codegraph/` ignored and use it for P1/P2 discovery, not hook correctness.
+- Code navigation uses bounded ripgrep discovery and explicit language-service symbol navigation; no graph index is required.
 - Treat third-party host skills as optional. Their installation state must not change Forge workflow correctness.
 - Use `docs/reference-configs/agentic-development-flow.md` for routing details and `docs/reference-configs/external-tooling.md` plus `bash .ai/harness/scripts/check-agent-tooling.sh --host both --check-updates` for environment checks.
 - If repo state conflicts with the task, use an isolated `codex/<task-slug>` worktree, validate with Forge `/review`, and merge back to `main` without unrelated dirty changes.

package/assets/partials/07-footer.partial.md

@@ -35,4 +35,4 @@ CLAUDE.md is a routing card. Keep context minimal and load only what the current
 ---
 
 *Template Version: {{TEMPLATE_VERSION}}*
-*Generated by forge@{{SKILL_VERSION}}*
+*Generated by forge@{{FORGE_VERSION}}*

package/assets/partials-agents/02-operating-mode.partial.md

@@ -32,7 +32,7 @@
 - Agentic skill routing: product discovery -> gstack `office-hours`; complex engineering plans -> gstack `plan-eng-review`; design plans -> gstack `plan-design-review`; daily small/medium planning, bug hunts, and checks -> Forge `/plan`, `/hunt`, `/check`.
 - Knowledge sync and handoff retrieval -> `gbrain`.
 - Codex automation profile: required `health`, `check`, and `mermaid` from `~/.codex/skills`; do not vendor skill bodies.
-- CodeGraph readiness: required for agent code navigation; keep `.codegraph/` ignored and use `codegraph sync/context/query/callers/callees/impact` for P1/P2 discovery.
+- Code navigation uses bounded ripgrep discovery and explicit language-service definitions/references/implementations; no graph index is required.
 - External tooling reference: `docs/reference-configs/agentic-development-flow.md` for routing details, `docs/reference-configs/external-tooling.md` for install/update guidance.
 - Waza runtime boundary: Codex reads `~/.codex/skills`; `~/.agents/skills` is only skills CLI staging/cache and must be copied into Codex with verification after updates.
 - Environment check: `bash .ai/harness/scripts/check-agent-tooling.sh --host both --check-updates`.

package/assets/partials-agents/08-deep-docs.partial.md

@@ -18,7 +18,7 @@
 - Terminal plan/task history: Git history plus durable Control Plane evidence; do not create repository archive directories.
 - `docs/reference-configs/agentic-development-flow.md`: gstack/Waza routing, P1/P2/P3 reporting triggers, and daily flow
 - `docs/reference-configs/harness-overview.md`: orchestration playbook
-- `docs/reference-configs/external-tooling.md`: gstack/Waza/gbrain routing, Codex-first Waza sync, and required CodeGraph readiness commands
+- `docs/reference-configs/external-tooling.md`: gstack/Waza/gbrain routing, Codex-first Waza sync, and source-based navigation guidance
 - `docs/reference-configs/document-generation.md`: minimal docs profile and on-demand document rules
 - `docs/reference-configs/global-working-rules.md`: user-level Claude/Codex rule template
 - `docs/reference-configs/sprint-contracts.md`: contract rules

package/assets/reference-configs/agentic-development-flow.md

@@ -66,7 +66,7 @@ For small work keep this internal. For architecture, debugging, risky refactors,
 
 1. Read the current user request and current Canonical Runtime state first.
 2. Use `/direct`, `/plan`, `/debug`, `/review`, `/release`, or `/scale` according to intent.
-3. Use `rh_context`; request CodeGraph structural context when callers, dependencies, or impact matter.
+3. Use bounded rh_context search for current source, then explicit semantic_navigation for known symbols and their references.
 4. If a decision-complete plan is useful, capture it into `plans/` as a durable business/engineering artifact. It is not a second Runtime lifecycle authority.
 5. Execute bounded work through Forge repository/Process/Work primitives and collect verification evidence.
 6. Use `/review` plus focused checks before closeout. Optional peer or Waza reviews may add evidence but may not become the only pass condition.

package/assets/reference-configs/external-tooling.md

@@ -9,7 +9,6 @@ Optional enhancements:
 - `gbrain`: optional knowledge tooling;
 - `Mermaid` host skill: optional rendered diagrams; Markdown Mermaid remains sufficient;
 - Forge peer-review helpers (`codex-review`, `claude-review`): optional cross-model acceptance evidence;
-- CodeGraph host MCP/CLI: optional direct host integration. Forge's own `rh_context` structural backend uses the bundled CodeGraph runtime when available.
 
 `forge install` installs the Forge CLI/runtime and managed host adapters. It does **not** install Waza, Mermaid, or cross-review skills unless `--with-external-skills` is explicitly supplied. `forge setup` is the guided readiness workflow; `forge setup check` is the one-shot read-only report.
 
@@ -40,9 +39,6 @@ The detector intentionally avoids side-effecting commands. It does not run:
 - `npx skills update`
 - `gbrain serve`
 - `gbrain sync`
-- `codegraph init`
-- `codegraph sync`
-- `codegraph install`
 
 With `--check-updates`, Waza update checks fetch upstream GitHub raw
 `SKILL.md` and shared `rules/` files, then compare versions/hashes against each
@@ -118,12 +114,6 @@ CLI and does not ship the forge advisory command.
 check` may report its local state, but missing or stale `gbrain` must not
 create Agent repair/update actions or change the setup readiness result.
 
-### CodeGraph
-
-`CodeGraph` has two integration levels. Forge-internal structural retrieval is provided through `rh_context` and the bundled CodeGraph runtime when available. A global `codegraph` CLI or host MCP entry is optional and exists only for direct Codex/Claude use. Neither replaces workflow checks, tests, architecture evidence, or raw source reads.
-
-Forge packages a CodeGraph runtime for its own structural context provider and can ensure the repository index without requiring a user-global CLI. `forge tools configure codegraph` remains an explicit optional host integration.
-
 ### Runtime Ownership Boundary
 
 `forge setup check --target <host> --check-updates --json` reports the
@@ -151,66 +141,6 @@ script reports unsupported link-mode and tells the caller to use copy-mode.
 `rsync` is missing, the script reports unsupported copy-mode instead of a
 generic command failure.
 
-Read-only check:
-
-```bash
-codegraph status .
-```
-
-Local index mutation:
-
-```bash
-codegraph init -i .
-codegraph sync .
-```
-
-Do not ask users to copy MCP TOML or Claude JSON by hand. The user-facing path
-is one terminal command, or explicit authorization for their agent to run the
-same command:
-
-```bash
-bun add -g @colbymchenry/codegraph && forge tools configure codegraph --target codex --location global
-```
-
-This delegates host-specific MCP config to CodeGraph's target adapters for
-Codex and Claude, so do not run CodeGraph setup automatically from
-`forge install`, `forge adopt`, or explicit tooling configuration. Restart Codex after the installer
-finishes so the MCP server is discovered; Claude Code should pick up its config
-according to its own settings reload behavior. If a launch environment still
-cannot find `codegraph`, an authorized agent should diagnose `PATH` and the
-`~/.local/bin/codegraph` shim. Do not make the user hand-edit MCP config as the
-fallback.
-
-For troubleshooting only, inspect host config snippets without writing:
-
-```bash
-codegraph install --print-config codex
-codegraph install --print-config claude
-```
-
-Project-local indexes are ignored runtime state:
-
-```bash
-codegraph init -i .
-codegraph status .
-```
-
-Before non-trivial code work, agents should sync the local index and use it for
-P1/P2 discovery:
-
-```bash
-codegraph sync .
-codegraph context "<task>"
-codegraph query <symbol> --json
-codegraph callers <symbol> --json
-codegraph callees <symbol> --json
-codegraph impact <symbol> --json
-```
-
-For this repo, do not treat `codegraph affected` as an authoritative test
-selector. Many tests execute scripts by path or subprocess rather than import
-edges, so run the repo verification commands instead.
-
 ### Bash Output Evidence and RTK
 
 `forge` treats Bash output as runtime evidence, not durable task state.
@@ -267,12 +197,6 @@ gbrain check-update --json
 gbrain upgrade
 ```
 
-### CodeGraph
-
-```bash
-bun add -g @colbymchenry/codegraph@latest && codegraph sync . && codegraph status .
-```
-
 ## Manual Knowledge Sync
 
 `gbrain` stays advisory-first in this contract. Manual repo sync is allowed:

package/assets/reference-configs/release-deploy.md

@@ -35,6 +35,6 @@ evidence must record `full_test_count`, `dry_run_ratio`, `grader_pass_rate`, and
 evidence is non-authoritative, and missing eval evidence must be called out as
 unavailable. Readiness yellow flags from `forge-check` must be recorded
 with either the accepted reason or the concrete repair command, including Waza
-staging drift, gbrain warnings, CodeGraph version drift, or non-authoritative
+staging drift, gbrain warnings, or non-authoritative
 skill eval evidence. Do not rely only on npm or GitHub release metadata for this
 local audit trail.

package/assets/templates/helpers/architecture-queue.sh

@@ -307,7 +307,7 @@ classify_change() {
      [[ "$rel_path" == ".ai/harness/policy.json" ]] ||
      [[ "$rel_path" == ".ai/harness/workflow-contract.json" ]] ||
      [[ "$rel_path" == "assets/workflow-contract.v1.json" ]] ||
-     [[ "$rel_path" =~ ^scripts/(architecture-queue|context-contract-sync|workstream-sync|migrate-project-template|migrate-workflow-docs|inspect-project-state|check-skill-version|capability-resolver|capability-config|create-project-dirs|init-project|ensure-task-workflow|check-task-workflow|check-deploy-sql-order|refresh-current-status|workflow-contract|select-agent-context-blocks)\.(sh|ts)$ ]] ||
+     [[ "$rel_path" =~ ^scripts/(architecture-queue|context-contract-sync|workstream-sync|migrate-project-template|migrate-workflow-docs|inspect-project-state|capability-resolver|capability-config|create-project-dirs|init-project|ensure-task-workflow|check-task-workflow|check-deploy-sql-order|refresh-current-status|workflow-contract|select-agent-context-blocks)\.(sh|ts)$ ]] ||
      [[ "$rel_path" == "scripts/lib/project-init-lib.sh" ]]; then
     printf 'high workflow-surface\n'
     return