fuli-context 0.7.4-beta.3 → 0.7.5

package/src/local-runtime/lifecycle.js

@@ -7,6 +7,8 @@ import {
   stopGraphProviders
 } from '../setup/graph-runtime.js';
 import { readJsonFile } from '../storage/json-file.js';
+import { readAdaptiveRuntimeSettings } from '../adaptive-runtime/settings.js';
+import { readAdaptiveRuntimeState } from '../adaptive-runtime/state.js';
 import {
   DEFAULT_RUNTIME_SETTINGS,
   managedProviderUrls
@@ -28,6 +30,7 @@ export async function startLocalRuntime(input, dependencies = {}) {
     port: input.port,
     lan: input.lan === true,
     runtimeSettings,
+    previousRuntimeMode: input.previousRuntimeMode,
     personalOnly: !managesDevelopmentWorkspace,
     buildProviders,
     noStart: false,
@@ -51,11 +54,14 @@ export async function stopLocalRuntime(input, dependencies = {}) {
   const managesDevelopmentWorkspace = state?.managedProviders?.includes(
     'development-workspace'
   ) || hasManagedDevelopmentWorkspace(config, runtimeSettings);
+  const activeRuntimeMode = state?.runtimeSettings?.graphRuntimeMode ??
+    runtimeSettings.graphRuntimeMode;
 
   let providers = 'not_initialized';
   if (deps.fileExists(input.paths.graphEnvPath)) {
-    deps.stopProviders(input.paths, input.paths.graphEnvPath, {
-      personalOnly: !managesDevelopmentWorkspace
+    await deps.stopProviders(input.paths, input.paths.graphEnvPath, {
+      personalOnly: !managesDevelopmentWorkspace,
+      runtimeMode: activeRuntimeMode
     });
     providers = 'stopped';
   }
@@ -70,11 +76,14 @@ export async function stopLocalRuntime(input, dependencies = {}) {
 }
 
 export async function restartLocalRuntime(input, dependencies = {}) {
+  const deps = lifecycleDependencies(dependencies);
+  const previousRuntimeMode = deps.readState(input.paths.graphRuntimeStatePath)
+    ?.runtimeSettings?.graphRuntimeMode;
   const stopped = await stopLocalRuntime(input, dependencies);
   if (stopped.status === 'partial') {
     throw new Error('Could not safely verify the existing local UI process; restart was refused.');
   }
-  const started = await startLocalRuntime(input, dependencies);
+  const started = await startLocalRuntime({ ...input, previousRuntimeMode }, dependencies);
   return { stopped, ...started, status: 'restarted' };
 }
 
@@ -90,19 +99,34 @@ export async function inspectLocalRuntime(input, dependencies = {}) {
     state.pid,
     state.version
   );
+  const adaptiveSettings = deps.readAdaptiveSettings(pathsValue(
+    input.paths.adaptiveRuntimeSettingsPath
+  ));
+  const adaptiveState = adaptiveSettings.enabled
+    ? deps.readAdaptiveState(pathsValue(input.paths.adaptiveRuntimeStatePath))
+    : null;
+  const intentionallySleeping = adaptiveSettings.enabled &&
+    ['provider-sleeping', 'sleeping'].includes(adaptiveState?.stage);
   const managedUrls = managedProviderUrls(runtimeSettings);
   const personalUrl = config?.personal?.providerUrl ?? managedUrls.personal;
   const personal = config
-    ? await deps.providerHealth(personalUrl)
+    ? intentionallySleeping
+      ? { url: personalUrl, status: 'sleeping' }
+      : await deps.providerHealth(personalUrl)
     : { url: personalUrl, status: 'not_configured' };
-  const workspaces = await Promise.all((config?.workspaces ?? []).map(async (workspace) => ({
-    ...(await deps.providerHealth(workspace.providerUrl)),
-    managedDevelopment: isManagedDevelopmentUrl(workspace, runtimeSettings)
-  })));
+  const workspaces = await Promise.all((config?.workspaces ?? []).map(async (workspace) => {
+    const managedDevelopment = isManagedDevelopmentUrl(workspace, runtimeSettings);
+    return {
+      ...(intentionallySleeping && managedDevelopment
+        ? { url: workspace.providerUrl, status: 'sleeping' }
+        : await deps.providerHealth(workspace.providerUrl)),
+      managedDevelopment
+    };
+  }));
 
   let status = 'stopped';
   if (!config && !state) status = 'not_configured';
-  else if (consoleReady && personal.status === 'ready') status = 'running';
+  else if (consoleReady && ['ready', 'sleeping'].includes(personal.status)) status = 'running';
   else if (processAlive || personal.status === 'ready') status = 'degraded';
 
   return {
@@ -120,6 +144,10 @@ export async function inspectLocalRuntime(input, dependencies = {}) {
       configured: workspaces.length > 0,
       status: publicProviderStatus(workspaces),
       providers: workspaces
+    },
+    adaptiveRuntime: {
+      enabled: adaptiveSettings.enabled,
+      stage: adaptiveSettings.enabled ? adaptiveState?.stage ?? 'unknown' : 'always-on'
     }
   };
 }
@@ -162,6 +190,10 @@ function lifecycleDependencies(overrides) {
     stopProviders: stopGraphProviders,
     consoleHealth: checkLocalConsoleHealth,
     providerHealth,
+    readAdaptiveSettings: (path) => path
+      ? readAdaptiveRuntimeSettings(path)
+      : { enabled: false },
+    readAdaptiveState: (path) => path ? readAdaptiveRuntimeState(path) : null,
     isProcessAlive,
     stopProcess,
     waitForExit,
@@ -173,6 +205,10 @@ function lifecycleDependencies(overrides) {
   };
 }
 
+function pathsValue(value) {
+  return typeof value === 'string' && value ? value : null;
+}
+
 function safeReadState(path) {
   try {
     return readJsonFile(path, null);
@@ -242,7 +278,7 @@ function isLoopbackConsoleUrl(value) {
 
 function publicProviderStatus(workspaces) {
   if (!workspaces.length) return 'not_connected';
-  const ready = workspaces.filter(({ status }) => status === 'ready').length;
+  const ready = workspaces.filter(({ status }) => ['ready', 'sleeping'].includes(status)).length;
   if (ready === workspaces.length) return 'ready';
   return ready > 0 ? 'degraded' : 'unavailable';
 }

package/src/mcp/context-resources.js

@@ -6,7 +6,9 @@ const RESOURCE_MIME_TYPE = 'text/markdown';
 const MAX_PROJECT_PURPOSE_LENGTH = 240;
 const MAX_RESOURCE_TEXT_BYTES = 32 * 1024;
 
-export function registerFuliContextResources(server, app) {
+export function registerFuliContextResources(server, app, {
+  withRuntimeLease = (_owner, operation) => operation()
+} = {}) {
   server.registerResource(
     'FULI global taste',
     GLOBAL_TASTE_RESOURCE_URI,
@@ -15,13 +17,17 @@ export function registerFuliContextResources(server, app) {
       description: 'The user\'s current evidence-backed global taste and working preferences.',
       mimeType: RESOURCE_MIME_TYPE
     },
-    (uri) => readGlobalTasteResource(app, uri)
+    (uri) => withRuntimeLease(
+      'mcp-resource:global-taste',
+      () => readGlobalTasteResource(app, uri)
+    )
   );
 
   const projectResources = new ResourceTemplate(PROJECT_RESOURCE_TEMPLATE, {
-    list: async () => ({
-      resources: await listPersonalProjectResources(app)
-    })
+    list: () => withRuntimeLease(
+      'mcp-resource:list-projects',
+      async () => ({ resources: await listPersonalProjectResources(app) })
+    )
   });
   server.registerResource(
     'fuli-personal-project',
@@ -31,7 +37,10 @@ export function registerFuliContextResources(server, app) {
       description: 'Select one exact local FULI personal project for this task.',
       mimeType: RESOURCE_MIME_TYPE
     },
-    (uri, variables) => readPersonalProjectResource(app, uri, variables)
+    (uri, variables) => withRuntimeLease(
+      'mcp-resource:project',
+      () => readPersonalProjectResource(app, uri, variables)
+    )
   );
 }
 

package/src/mcp/create-mcp-server.js

@@ -19,7 +19,8 @@ import { jsonSchemaToZod, openObjectSchema } from './tool-schema.js';
 import {
   mcpHostSessionId,
   nativeCodexThreadId,
-  normalizeAgentSessionInput
+  normalizeAgentSessionInput,
+  normalizeMcpSourceApplication
 } from './session-id.js';
 
 const TOOL_RESULT_LIMIT_BYTES = Object.freeze({
@@ -33,6 +34,24 @@ const TOOL_RESULT_LIMIT_BYTES = Object.freeze({
   discover_personal_global_preference_candidates: 32 * 1024,
   preview_personal_global_preference_decision: 32 * 1024,
   list_personal_projects: 32 * 1024,
+  list_project_agents: 32 * 1024,
+  get_project_agent: 32 * 1024,
+  list_project_agent_assignments: 32 * 1024,
+  get_project_agent_context: 64 * 1024,
+  coordinate_project_agent_task: 256 * 1024,
+  acquire_runtime_lease: 4 * 1024,
+  refresh_runtime_lease: 4 * 1024,
+  release_runtime_lease: 4 * 1024,
+  view_project_agent_task: 64 * 1024,
+  view_project_agent_activity: 64 * 1024,
+  list_project_agent_recruitments: 32 * 1024,
+  list_executors: 32 * 1024,
+  get_executor: 32 * 1024,
+  preflight_executor: 32 * 1024,
+  record_project_agent_executor_actual: 32 * 1024,
+  list_executor_routing_rules: 32 * 1024,
+  get_executor_routing_rule: 32 * 1024,
+  list_project_agent_routing_learning: 64 * 1024,
   list_knowledge_review_candidates: 32 * 1024,
   list_workflow_candidates: 32 * 1024,
   recommend_next_workflow_steps: 32 * 1024
@@ -40,7 +59,12 @@ const TOOL_RESULT_LIMIT_BYTES = Object.freeze({
 
 export function createMcpServer(
   app,
-  { env = process.env, clock = () => new Date() } = {}
+  {
+    env = process.env,
+    clock = () => new Date(),
+    sourceApplication = nativeCodexThreadId(env) ? 'codex' : 'other',
+    withRuntimeLease = (_owner, operation) => operation()
+  } = {}
 ) {
   const server = new McpServer(
     { name: 'fuli', version: FULI_VERSION },
@@ -48,15 +72,20 @@ export function createMcpServer(
   );
 
   const nativeThreadId = nativeCodexThreadId(env);
+  const authoritativeSourceApplication = normalizeMcpSourceApplication(
+    sourceApplication
+  );
   const tools = createToolMap(
     app,
     createProjectActionPreviewTokens(),
     nativeThreadId,
     mcpHostSessionId(env),
-    clock
+    clock,
+    authoritativeSourceApplication,
+    withRuntimeLease
   );
   for (const tool of tools.values()) registerTool(server, tool);
-  registerFuliContextResources(server, app);
+  registerFuliContextResources(server, app, { withRuntimeLease });
   registerCallHandler(server, tools);
   return server;
 }
@@ -66,24 +95,30 @@ function createToolMap(
   projectActionPreviews,
   nativeThreadId,
   hostSessionId,
-  clock
+  clock,
+  sourceApplication,
+  withRuntimeLease
 ) {
   const commonKnowledgePreviews = createCommonKnowledgePreviewTokens();
   return new Map(listAgentTools().map((definition) => [definition.name, {
     definition,
     schema: jsonSchemaToZod(definition.inputSchema),
-    invoke: (input) => invokeAgentTool(
-      app,
-      definition.name,
-      normalizeAgentSessionInput(
+    invoke: (input) => withRuntimeLease(
+      `mcp-tool:${definition.name}`,
+      () => invokeAgentTool(
+        app,
         definition.name,
-        input,
-        nativeThreadId,
-        hostSessionId,
-        clock
-      ),
-      projectActionPreviews,
-      commonKnowledgePreviews
+        normalizeAgentSessionInput(
+          definition.name,
+          input,
+          nativeThreadId,
+          hostSessionId,
+          clock,
+          sourceApplication
+        ),
+        projectActionPreviews,
+        commonKnowledgePreviews
+      )
     )
   }]));
 }

package/src/mcp/instructions.js

@@ -1,7 +1,9 @@
 export const MCP_INSTRUCTIONS = [
-  'Each user task: hook-provided task context from begin_task_context. Otherwise, before other tools/answer, call exactly get_collaboration_preferences with projectPath=cwd and taskPrompt=current user request as fallback; never substitute a project action. Apply all effective_preferences: personal-global everywhere, matched project, authorized inheritable parent. For taste/judgment, call get_user_taste_skill; never replaces a user-authored Skill. FULI fuli:// exposes exact projects/global taste; an @ selection is explicit and adds no project. Resolve relevant deferred_conflict first; never guess personalProjectId. Writes enforce actual payload; final text is not compliance.',
-  'Before asking user to repeat a stable project fact or method, inspect task_knowledge_recall. On miss call search_current_project_knowledge with focused action, artifact, target-system, or identifier queries; never use the whole conversational request as the only query. Search active child first, then inheritable parent via authorized PART_OF/USES_KNOWLEDGE_FROM, 2 hops; parent prefs need descendants/selected_projects; local_only/RELATED_TO never inherit; authority > distance > weight; equal conflicts defer.',
-  'Before saying unknown, call search_knowledge_graph. Use exact IDs for extra projects. RELATED_TO suggests; ask first. Use all_local_confirmed only after consent, then rg only in safe current repo/workspace; never scan outside it. Live state: monitoring/Git MCP. External/public: search_connected_knowledge; agent_decide is response-only.',
-  'Use record_decision_trace; record_knowledge_feedback on rejected/outdated/failed items. Batch durable confirmed knowledge with capture_session_knowledge; no secrets/guesses. Finish with checkpoint_task_knowledge: capture_candidates or retain_nothing. Then record_knowledge_usage.',
-  'Terminal-safe Markdown. A match is a candidate only. If it supports the answer, MUST begin with sourceMarker.leadMarkdown and append sourceMarker.markdown; otherwise use noMatchSourceMarker (empty). Keep unchanged; never wrap in HTML.'
+  'Each user task: hook-provided task context via begin_task_context; otherwise before other tools/answer call exactly get_collaboration_preferences(projectPath=cwd taskPrompt=current user request) as fallback; never substitute a project action. Apply all effective_preferences: personal-global everywhere; matched project, authorized inheritable parent. get_user_taste_skill never replaces a user-authored Skill. Resolve deferred_conflict; never guess personalProjectId. Writes use actual payload; final text not compliance.',
+  'Before asking for stable project fact or method inspect task_knowledge_recall. On miss search_current_project_knowledge with focused action, artifact, target-system, or identifier queries; never use the whole conversational request as the only query. Search active child first, then authorized inheritable parent (PART_OF/USES_KNOWLEDGE_FROM); local_only/RELATED_TO never inherit.',
+  'Before saying unknown call search_knowledge_graph; exact IDs for extra projects. RELATED_TO suggests; ask. all_local_confirmed only after consent; rg safe current repo/workspace; Never scan outside it. monitoring/Git MCP; search_connected_knowledge; agent_decide response-only.',
+  'record_decision_trace; failures record_knowledge_feedback. Batch durable confirmed knowledge: capture_session_knowledge; no secrets. checkpoint_task_knowledge: capture_candidates or retain_nothing; record_knowledge_usage.',
+  'Team: coordinate_project_agent_task gives isolated contexts; Fuli never spawns. Host: acquire_runtime_lease, start workers, report activity/executor, release_runtime_lease in finally.',
+  'Non-empty Provider executionSummary: one row/worker: occupation emoji/label, actual executor/sourceApplication, work summary, workerStatus/status. Empty/absent executionSummary: omit. Configured/allowed/available are not evidence.',
+  'Terminal-safe Markdown; never wrap in HTML. A match is a candidate only. If it supports the answer, MUST begin sourceMarker.leadMarkdown and append sourceMarker.markdown; otherwise use noMatchSourceMarker (empty). Keep unchanged.'
 ].join(' ');

package/src/mcp/runtime.js

@@ -1,16 +1,28 @@
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 
+import {
+  bindRuntimeLeaseAgentTools,
+  createRuntimeLeaseClient
+} from '../adaptive-runtime/lease-client.js';
 import { openFederatedGraphApplication } from '../graphiti/federated-application.js';
 import { createMcpServer } from './create-mcp-server.js';
 
-export async function runStdio({ runtimeConfigPath }) {
+export async function runStdio({ runtimeConfigPath, sourceApplication }) {
   const app = openFederatedGraphApplication({ runtimeConfigPath });
-  const server = createServerOrClose(app);
+  const leaseClient = createRuntimeLeaseClient({ runtimeConfigPath });
+  bindRuntimeLeaseAgentTools(app, leaseClient);
+  const server = createServerOrClose(app, createMcpServer, {
+    sourceApplication,
+    withRuntimeLease: leaseClient.withGraphLease
+  });
   const transport = new StdioServerTransport();
   const signalHandlers = new Map();
   const close = createCloseOnce({
     closeServer: () => server.close(),
-    closeApplication: () => app.close(),
+    closeApplication: async () => {
+      await leaseClient.close();
+      return app.close();
+    },
     afterClose: () => removeHandlers(signalHandlers)
   });
   const quietClose = createQuietCloser(close, () => { process.exitCode = 1; });
@@ -31,9 +43,9 @@ export async function runStdio({ runtimeConfigPath }) {
   }
 }
 
-export function createServerOrClose(app, factory = createMcpServer) {
+export function createServerOrClose(app, factory = createMcpServer, options) {
   try {
-    return factory(app);
+    return factory(app, options);
   } catch (error) {
     void app.close();
     throw error;

package/src/mcp/session-id.js

@@ -2,6 +2,17 @@ import { randomUUID } from 'node:crypto';
 
 const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 const WORKFLOW_OBSERVATION_TOOL = 'record_workflow_transition_observation';
+const PROJECT_AGENT_SOURCE_TOOLS = new Set([
+  'create_project_agent_assignment',
+  'replace_project_agent_assignment',
+  'coordinate_project_agent_task',
+  'submit_project_agent_task',
+  'get_project_agent_context',
+  'record_project_agent_task_activity',
+  'preflight_executor',
+  'report_executor_health',
+  'record_project_agent_executor_actual'
+]);
 
 const SESSION_ID_TOOLS = new Set([
   'begin_task_context',
@@ -31,7 +42,8 @@ export function normalizeAgentSessionInput(
   input,
   nativeThreadId,
   hostSessionId = nativeThreadId,
-  clock = () => new Date()
+  clock = () => new Date(),
+  sourceApplication = nativeThreadId ? 'codex' : 'other'
 ) {
   if (name === WORKFLOW_OBSERVATION_TOOL) {
     if (!hostSessionId) {
@@ -51,6 +63,24 @@ export function normalizeAgentSessionInput(
       hostObservedAt: clock().toISOString()
     };
   }
+  if (PROJECT_AGENT_SOURCE_TOOLS.has(name)) {
+    if (!hostSessionId) {
+      throw new TypeError('Project Agent calls require an MCP host session');
+    }
+    const safeSourceApplication = normalizeMcpSourceApplication(sourceApplication);
+    const {
+      sourceApplication: _sourceApplication,
+      source_application: _source_application,
+      sourceSessionId: _sourceSessionId,
+      source_session_id: _source_session_id,
+      ...safeInput
+    } = input ?? {};
+    return {
+      ...safeInput,
+      sourceApplication: safeSourceApplication,
+      sourceSessionId: hostSessionId
+    };
+  }
   if (!nativeThreadId || !SESSION_ID_TOOLS.has(name)) return input;
   if (!input || typeof input !== 'object' || Array.isArray(input)) return input;
   if (typeof input.sessionId !== 'string' || input.sessionId.trim() === nativeThreadId) {
@@ -58,3 +88,10 @@ export function normalizeAgentSessionInput(
   }
   return { ...input, sessionId: nativeThreadId };
 }
+
+export function normalizeMcpSourceApplication(value) {
+  if (!['codex', 'claude_code', 'cursor', 'kiro', 'other'].includes(value)) {
+    throw new TypeError('Unsupported MCP source application');
+  }
+  return value;
+}

package/src/mcp/tool-annotations.js

@@ -7,6 +7,19 @@ const READ_TOOLS = new Set([
   'preview_common_knowledge_promotion',
   'list_knowledge_spaces',
   'list_personal_projects',
+  'list_project_agents',
+  'get_project_agent',
+  'list_project_agent_assignments',
+  'get_project_agent_context',
+  'view_project_agent_task',
+  'view_project_agent_activity',
+  'get_project_agent_recruitment_policy',
+  'list_project_agent_recruitments',
+  'list_executors',
+  'get_executor',
+  'list_executor_routing_rules',
+  'get_executor_routing_rule',
+  'list_project_agent_routing_learning',
   'list_knowledge_review_candidates',
   'list_workflow_candidates',
   'recommend_next_workflow_steps',
@@ -36,6 +49,32 @@ const WRITE_TOOLS = new Set([
   'search_human_knowledge_changes',
   'review_human_knowledge_change',
   'upsert_personal_project',
+  'upsert_project_agent',
+  'delete_project_agent',
+  'cleanup_test_project_agents',
+  'create_project_agent_assignment',
+  'end_project_agent_assignment',
+  'replace_project_agent_assignment',
+  'coordinate_project_agent_task',
+  'acquire_runtime_lease',
+  'refresh_runtime_lease',
+  'release_runtime_lease',
+  'submit_project_agent_task',
+  'record_project_agent_task_activity',
+  'update_project_agent_recruitment_policy',
+  'decide_project_agent_recruitment',
+  'upsert_executor',
+  'delete_executor',
+  'preflight_executor',
+  'authorize_executor',
+  'report_executor_health',
+  'upsert_executor_routing_rule',
+  'update_executor_routing_rule',
+  'delete_executor_routing_rule',
+  'record_project_agent_task_outcome',
+  'record_project_agent_executor_actual',
+  'ignore_project_agent_routing_learning',
+  'reset_project_agent_routing_learning',
   'start_knowledge_review',
   'record_knowledge_review_progress',
   'finish_knowledge_review',
@@ -69,12 +108,42 @@ export function annotationsFor(name) {
     readOnlyHint: readOnly,
     destructiveHint: DESTRUCTIVE_TOOLS.has(name),
     idempotentHint: readOnly || name === 'upsert_personal_project' ||
+      name === 'upsert_project_agent' ||
+      name === 'delete_project_agent' ||
+      name === 'cleanup_test_project_agents' ||
+      name === 'create_project_agent_assignment' ||
+      name === 'coordinate_project_agent_task' ||
+      name === 'refresh_runtime_lease' ||
+      name === 'release_runtime_lease' ||
+      name === 'submit_project_agent_task' ||
+      name === 'record_project_agent_task_activity' ||
+      name === 'record_project_agent_task_outcome' ||
+      name === 'record_project_agent_executor_actual' ||
+      name === 'upsert_executor' ||
+      name === 'preflight_executor' ||
+      name === 'authorize_executor' ||
+      name === 'report_executor_health' ||
+      name === 'upsert_executor_routing_rule' ||
+      name === 'update_executor_routing_rule' ||
       name === 'publish_personal_project' || name === 'unsubscribe_public_project' ||
       name === 'record_knowledge_usage' || name === 'record_decision_trace' ||
       name === 'record_knowledge_feedback' ||
       name === 'record_workflow_transition_observation' ||
       name === 'checkpoint_task_knowledge',
     openWorldHint: name === 'capture_session_knowledge' ||
+      name === 'coordinate_project_agent_task' ||
+      name === 'submit_project_agent_task' ||
+      name === 'record_project_agent_task_activity' ||
+      name === 'preflight_executor' ||
+      name === 'record_project_agent_task_outcome' ||
+      name === 'record_project_agent_executor_actual' ||
+      name === 'upsert_executor' ||
+      name === 'delete_executor' ||
+      name === 'authorize_executor' ||
+      name === 'report_executor_health' ||
+      name === 'upsert_executor_routing_rule' ||
+      name === 'update_executor_routing_rule' ||
+      name === 'delete_executor_routing_rule' ||
       name === 'record_workflow_transition_observation' ||
       name === 'search_connected_knowledge' ||
       name === 'record_decision_trace' ||

package/src/mcp-server.js

@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 import { callAgentTool, listAgentTools } from './agent-tools.js';
+import {
+  bindRuntimeLeaseAgentTools,
+  createRuntimeLeaseClient
+} from './adaptive-runtime/lease-client.js';
 import { ApplicationError } from './app/application-error.js';
 import { openFederatedGraphApplication } from './graphiti/federated-application.js';
 import {
@@ -7,6 +11,7 @@ import {
   resolveGraphRuntimeOptions
 } from './graphiti/runtime-config.js';
 import { runStdio } from './mcp/runtime.js';
+import { normalizeMcpSourceApplication } from './mcp/session-id.js';
 import { applicationErrorMessage } from './mcp/tool-result.js';
 
 await main(process.argv.slice(2)).catch((error) => {
@@ -29,19 +34,30 @@ async function main(args) {
     await runCall({ args, runtimeConfigPath });
     return;
   }
-  await runStdio({ runtimeConfigPath });
+  const configuredSourceApplication = args.includes('--source-application')
+    ? requiredOption(args, '--source-application')
+    : null;
+  await runStdio({
+    runtimeConfigPath,
+    sourceApplication: configuredSourceApplication
+      ? normalizeMcpSourceApplication(configuredSourceApplication)
+      : undefined
+  });
 }
 
 async function runCall({ args, runtimeConfigPath }) {
   const app = openFederatedGraphApplication({ runtimeConfigPath });
+  const leaseClient = createRuntimeLeaseClient({ runtimeConfigPath });
+  bindRuntimeLeaseAgentTools(app, leaseClient);
   try {
-    const result = await callAgentTool(
-      app,
-      requiredOption(args, '--call'),
-      parseInput(args)
+    const toolName = requiredOption(args, '--call');
+    const result = await leaseClient.withGraphLease(
+      `cli-call:${toolName}`,
+      () => callAgentTool(app, toolName, parseInput(args))
     );
     process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
   } finally {
+    await leaseClient.close();
     await app.close();
   }
 }
@@ -69,7 +85,8 @@ function startupMessage(error) {
 }
 
 function helpText() {
-  return 'Usage: node src/mcp-server.js [--runtime-config <graph-runtime.json>]\n' +
+  return 'Usage: node src/mcp-server.js [--runtime-config <graph-runtime.json>] ' +
+    '[--source-application <codex|claude_code|cursor|kiro|other>]\n' +
     '       node src/mcp-server.js --tools\n' +
     '       node src/mcp-server.js --runtime-config <graph-runtime.json> ' +
     '--call <tool> [--input <json>]\n';